Added translation for "recommended" string

1 files changed, 4092 insertions, 3324 deletions

diff --git a/perl-install/share/po/th.po b/perl-install/share/po/th.po
index 3aadb9604..f64c79e12 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-10-07 21:57+0200\n"
+"POT-Creation-Date: 2005-02-24 14:10+0100\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"
@@ -31,7 +31,7 @@ msgstr ""
 
 #: ../move/move.pm:448 ../move/move.pm:460
 #, c-format
-msgid "Key isn't writable"
+msgid "Key is not writable"
 msgstr ""
 
 #: ../move/move.pm:450
@@ -42,9 +42,9 @@ msgid ""
 msgstr ""
 
 #: ../move/move.pm:452
-#, fuzzy, c-format
+#, c-format
 msgid "Retry"
-msgstr "เรียกคืนจากไฟล์"
+msgstr "ลองใหม่"
 
 #: ../move/move.pm:453 ../move/move.pm:497
 #, c-format
@@ -54,7 +54,7 @@ msgstr ""
 #: ../move/move.pm:462
 #, c-format
 msgid ""
-"The USB key seems to have write protection enabled, but we can't safely\n"
+"The USB key seems to have write protection enabled, but we can not safely\n"
 "unplug it now.\n"
 "\n"
 "\n"
@@ -62,15 +62,15 @@ msgid ""
 "plug the key again, and launch Mandrake Move again."
 msgstr ""
 
-#: ../move/move.pm:468 help.pm:409 install_steps_interactive.pm:1353
+#: ../move/move.pm:468 help.pm:409 install_steps_interactive.pm:1317
 #, c-format
 msgid "Reboot"
-msgstr "Reboot"
+msgstr ""
 
 #: ../move/move.pm:473
 #, c-format
 msgid ""
-"Your USB key doesn't have any valid Windows (FAT) partitions.\n"
+"Your USB key does not have any valid Windows (FAT) partitions.\n"
 "We need one to continue (beside, it's more standard so that you\n"
 "will be able to move and access your files from machines\n"
 "running Windows). Please plug in an USB key containing a\n"
@@ -85,7 +85,7 @@ msgstr ""
 #: ../move/move.pm:483
 #, c-format
 msgid ""
-"We didn't detect any USB key on your system. If you\n"
+"We did not detect any USB key on your system. If you\n"
 "plug in an USB key now, Mandrake Move will have the ability\n"
 "to transparently save the data in your home directory and\n"
 "system wide configuration, for next boot on this computer\n"
@@ -134,58 +134,61 @@ msgid "Please wait, detecting and configuring devices..."
 msgstr "เลือกระดับระบบรักษาความปลอดภัย"
 
 #: ../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
+#: diskdrake/dav.pm:75 diskdrake/hd_gtk.pm:116 diskdrake/interactive.pm:227
+#: diskdrake/interactive.pm:240 diskdrake/interactive.pm:393
+#: diskdrake/interactive.pm:411 diskdrake/interactive.pm:541
+#: diskdrake/interactive.pm:546 diskdrake/smbnfs_gtk.pm:42 fsedit.pm:183
+#: install_any.pm:1564 install_any.pm:1587 install_steps.pm:82
+#: install_steps_interactive.pm:38 interactive/http.pm:117
+#: interactive/http.pm:118 network/netconnect.pm:1037
+#: network/netconnect.pm:1041 network/netconnect.pm:1046
+#: network/netconnect.pm:1072 network/netconnect.pm:1141
+#: network/netconnect.pm:1145 network/netconnect.pm:1283
+#: network/netconnect.pm:1288 network/netconnect.pm:1306
+#: network/netconnect.pm:1491 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
+#: printer/printerdrake.pm:508 printer/printerdrake.pm:635
+#: printer/printerdrake.pm:1288 printer/printerdrake.pm:1335
+#: printer/printerdrake.pm:1372 printer/printerdrake.pm:1416
+#: printer/printerdrake.pm:1420 printer/printerdrake.pm:1434
+#: printer/printerdrake.pm:1524 printer/printerdrake.pm:1605
+#: printer/printerdrake.pm:1609 printer/printerdrake.pm:1613
+#: printer/printerdrake.pm:1662 printer/printerdrake.pm:1719
+#: printer/printerdrake.pm:1723 printer/printerdrake.pm:1737
+#: printer/printerdrake.pm:1848 printer/printerdrake.pm:1852
+#: printer/printerdrake.pm:1889 printer/printerdrake.pm:1957
+#: printer/printerdrake.pm:1975 printer/printerdrake.pm:1984
+#: printer/printerdrake.pm:1993 printer/printerdrake.pm:2004
+#: printer/printerdrake.pm:2066 printer/printerdrake.pm:2159
+#: printer/printerdrake.pm:2678 printer/printerdrake.pm:2949
+#: printer/printerdrake.pm:2955 printer/printerdrake.pm:3501
+#: printer/printerdrake.pm:3505 printer/printerdrake.pm:3509
+#: printer/printerdrake.pm:3965 printer/printerdrake.pm:4205
+#: printer/printerdrake.pm:4225 printer/printerdrake.pm:4301
+#: printer/printerdrake.pm:4366 printer/printerdrake.pm:4483
+#: standalone/drakTermServ:392 standalone/drakTermServ:753
+#: standalone/drakTermServ:760 standalone/drakTermServ:779
+#: standalone/drakTermServ:998 standalone/drakTermServ:1478
+#: standalone/drakTermServ:1483 standalone/drakTermServ:1490
+#: standalone/drakTermServ:1502 standalone/drakTermServ:1523
+#: standalone/drakauth:35 standalone/drakbackup:511 standalone/drakbackup:625
+#: standalone/drakbackup:1127 standalone/drakbackup:1160
+#: standalone/drakbackup:1671 standalone/drakbackup:1827
+#: standalone/drakbackup:2421 standalone/drakbackup:4110
+#: standalone/drakbackup:4330 standalone/drakbug:191 standalone/drakclock:124
+#: standalone/drakconnect:649 standalone/drakconnect:652
+#: standalone/drakconnect:671 standalone/drakfloppy:297
+#: standalone/drakfloppy:300 standalone/drakfloppy:306 standalone/drakfont:209
+#: standalone/drakfont:222 standalone/drakfont:258 standalone/drakfont:604
+#: standalone/draksplash:21 standalone/draksplash:501 standalone/drakxtv:107
+#: standalone/finish-install:39 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
+#: standalone/scannerdrake:202 standalone/scannerdrake:261
+#: standalone/scannerdrake:715 standalone/scannerdrake:726
+#: standalone/scannerdrake:865 standalone/scannerdrake:876
+#: standalone/scannerdrake:946 wizards.pm:95 wizards.pm:99 wizards.pm:121
 #, c-format
 msgid "Error"
 msgstr "ผิดพลาด"
@@ -193,7 +196,7 @@ msgstr "ผิดพลาด"
 #: ../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"
+"An error occurred, but I do not know how to handle it nicely.\n"
 "Continue at your own risk."
 msgstr ""
 "มีความผิดพลาดเกิดขึ้น แต่โปรแกรมไม่สามารถแก้ไขได้\n"
@@ -250,8 +253,8 @@ msgid "No CDROM support"
 msgstr ""
 
 #: ../move/tree/mdk_totem:76 diskdrake/hd_gtk.pm:95
-#: diskdrake/interactive.pm:1005 diskdrake/interactive.pm:1015
-#: diskdrake/interactive.pm:1068
+#: diskdrake/interactive.pm:1020 diskdrake/interactive.pm:1030
+#: diskdrake/interactive.pm:1083
 #, c-format
 msgid "Read carefully!"
 msgstr "โปรดอ่านอย่างถี่ถ้วน!"
@@ -259,7 +262,7 @@ msgstr "โปรดอ่านอย่างถี่ถ้วน!"
 #: ../move/tree/mdk_totem:77
 #, c-format
 msgid ""
-"You can't use another CDROM when the following programs are running: \n"
+"You can not use another CDROM when the following programs are running: \n"
 "%s"
 msgstr ""
 
@@ -313,22 +316,22 @@ msgstr "32 MB"
 msgid "64 MB or more"
 msgstr "64 MB หรือมากกว่า"
 
-#: Xconfig/card.pm:155
+#: Xconfig/card.pm:159
 #, c-format
 msgid "X server"
 msgstr "X เซิร์ฟเวอร์"
 
-#: Xconfig/card.pm:156
+#: Xconfig/card.pm:160
 #, fuzzy, c-format
 msgid "Choose an X server"
 msgstr "เลือก X เซิร์ฟเวอร์"
 
-#: Xconfig/card.pm:188
+#: Xconfig/card.pm:192
 #, c-format
 msgid "Multi-head configuration"
 msgstr "Multi-head configuration"
 
-#: Xconfig/card.pm:189
+#: Xconfig/card.pm:193
 #, fuzzy, c-format
 msgid ""
 "Your system supports multiple head configuration.\n"
@@ -337,62 +340,62 @@ msgstr ""
 "เครื่องของคุณสนับสนุนการคอนฟิกแบบ multihead \n"
 "คุณต้องการทำอะไร?"
 
-#: Xconfig/card.pm:255
+#: Xconfig/card.pm:262
 #, fuzzy, c-format
-msgid "Can't install Xorg package: %s"
+msgid "Can not install Xorg package: %s"
 msgstr "กำลังติดตั้งแพ็คเก็จ %s"
 
-#: Xconfig/card.pm:265
+#: Xconfig/card.pm:272
 #, c-format
 msgid "Select the memory size of your graphics card"
 msgstr "เลือกขนาดหน่วยความจำของกราฟฟิคการ์ด"
 
-#: Xconfig/card.pm:352
+#: Xconfig/card.pm:349
 #, c-format
 msgid "Xorg configuration"
 msgstr "การคอนฟิก Xorg"
 
-#: Xconfig/card.pm:354
+#: Xconfig/card.pm:351
 #, c-format
 msgid "Which configuration of Xorg do you want to have?"
 msgstr "Xorg ชนิดใหนที่คุณต้องการมี"
 
-#: Xconfig/card.pm:387
+#: Xconfig/card.pm:384
 #, c-format
 msgid "Configure all heads independently"
 msgstr "Configure all heads independently"
 
-#: Xconfig/card.pm:388
+#: Xconfig/card.pm:385
 #, c-format
 msgid "Use Xinerama extension"
 msgstr "Use Xinerama extension"
 
-#: Xconfig/card.pm:393
+#: Xconfig/card.pm:390
 #, fuzzy, c-format
 msgid "Configure only card \"%s\"%s"
 msgstr "คอนฟิกเฉพาะการ์ด \"%s\" (%s)"
 
-#: Xconfig/card.pm:405 Xconfig/various.pm:23
+#: Xconfig/card.pm:402 Xconfig/various.pm:23
 #, c-format
 msgid "Xorg %s"
 msgstr "Xorg %s"
 
-#: Xconfig/card.pm:412 Xconfig/various.pm:22
+#: Xconfig/card.pm:409 Xconfig/various.pm:22
 #, c-format
 msgid "Xorg %s with 3D hardware acceleration"
 msgstr "Xorg %s with 3D hardware acceleration"
 
-#: Xconfig/card.pm:414
+#: Xconfig/card.pm:411
 #, c-format
 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:420
+#: Xconfig/card.pm:417
 #, c-format
 msgid "Xorg %s with EXPERIMENTAL 3D hardware acceleration"
 msgstr "Xorg %s with EXPERIMENTAL 3D hardware acceleration"
 
-#: Xconfig/card.pm:422
+#: Xconfig/card.pm:419
 #, c-format
 msgid ""
 "Your card can have 3D hardware acceleration support with Xorg %s,\n"
@@ -401,16 +404,16 @@ msgstr ""
 "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:116 any.pm:912
+#: Xconfig/main.pm:90 Xconfig/main.pm:91 Xconfig/monitor.pm:117 any.pm:914
 #, c-format
 msgid "Custom"
 msgstr "แบบปรับแก้ได้ (Customized) "
 
 #: 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
+#: install_steps_interactive.pm:86 printer/printerdrake.pm:737
+#: printer/printerdrake.pm:4296 printer/printerdrake.pm:4742
+#: standalone/draksplash:120 standalone/logdrake:174 standalone/net_applet:183
+#: standalone/scannerdrake:477
 #, c-format
 msgid "Quit"
 msgstr "ออก"
@@ -420,12 +423,12 @@ msgstr "ออก"
 msgid "Graphic Card"
 msgstr "กราฟฟิคการ์ด"
 
-#: Xconfig/main.pm:120 Xconfig/monitor.pm:110
+#: Xconfig/main.pm:120 Xconfig/monitor.pm:111
 #, c-format
 msgid "Monitor"
 msgstr "จอภาพ"
 
-#: Xconfig/main.pm:123 Xconfig/resolution_and_depth.pm:222
+#: Xconfig/main.pm:123 Xconfig/resolution_and_depth.pm:221
 #, c-format
 msgid "Resolution"
 msgstr "ขนาดจอภาพ"
@@ -433,21 +436,21 @@ msgstr "ขนาดจอภาพ"
 #: Xconfig/main.pm:128
 #, c-format
 msgid "Test"
-msgstr ""
+msgstr "ทดสอบ"
 
-#: Xconfig/main.pm:133 diskdrake/dav.pm:65 diskdrake/interactive.pm:418
+#: Xconfig/main.pm:133 diskdrake/dav.pm:65 diskdrake/interactive.pm:437
 #: diskdrake/removable.pm:24 diskdrake/smbnfs_gtk.pm:80
-#: standalone/drakfont:494 standalone/drakfont:556 standalone/harddrake2:262
+#: standalone/drakfont:493 standalone/drakfont:555
 #, c-format
 msgid "Options"
 msgstr "อ็อปชั่น"
 
-#: Xconfig/main.pm:167
+#: Xconfig/main.pm:168
 #, c-format
 msgid "Your Xorg configuration file is broken, we will ignore it."
 msgstr ""
 
-#: Xconfig/main.pm:184
+#: Xconfig/main.pm:186
 #, c-format
 msgid ""
 "Keep the changes?\n"
@@ -460,38 +463,38 @@ msgstr ""
 "\n"
 "%s"
 
-#: Xconfig/monitor.pm:111
+#: Xconfig/monitor.pm:112
 #, fuzzy, c-format
 msgid "Choose a monitor for head #%d"
 msgstr "เลือกจอภาพ"
 
-#: Xconfig/monitor.pm:111
+#: Xconfig/monitor.pm:112
 #, c-format
 msgid "Choose a monitor"
 msgstr "เลือกจอภาพ"
 
-#: Xconfig/monitor.pm:117
+#: Xconfig/monitor.pm:118
 #, c-format
 msgid "Plug'n Play"
 msgstr ""
 
-#: Xconfig/monitor.pm:118 mouse.pm:49
+#: Xconfig/monitor.pm:119 mouse.pm:49
 #, c-format
 msgid "Generic"
 msgstr "Generic"
 
-#: Xconfig/monitor.pm:119 standalone/drakconnect:567 standalone/harddrake2:49
-#: standalone/harddrake2:83
-#, fuzzy, c-format
+#: Xconfig/monitor.pm:120 standalone/drakconnect:569 standalone/harddrake2:52
+#: standalone/harddrake2:86
+#, c-format
 msgid "Vendor"
-msgstr "ยกเลิก"
+msgstr "เวนเดอร์"
 
-#: Xconfig/monitor.pm:129
+#: Xconfig/monitor.pm:130
 #, c-format
 msgid "Plug'n Play probing failed. Please select the correct monitor"
 msgstr ""
 
-#: Xconfig/monitor.pm:134
+#: Xconfig/monitor.pm:135
 #, c-format
 msgid ""
 "The two critical parameters are the vertical refresh rate, which is the "
@@ -512,12 +515,12 @@ msgstr ""
 "ไม่เกินความสามารถของจอภาพ ไม่เช่นนั้นอาจเกิดความเสียหายกับจอภาพได้\n"
 "หากไม่แน่ใจโปรดเลือกเซ็ตอัพแบบมาตรฐาน"
 
-#: Xconfig/monitor.pm:141
+#: Xconfig/monitor.pm:142
 #, c-format
 msgid "Horizontal refresh rate"
 msgstr "อัตราการรีเฟรชตามแนวนอน"
 
-#: Xconfig/monitor.pm:142
+#: Xconfig/monitor.pm:143
 #, c-format
 msgid "Vertical refresh rate"
 msgstr "อัตราการรีเฟรชตามแนวตั้ง"
@@ -542,7 +545,7 @@ msgstr "หกหมื่นห้าพันสี (16 บิต)"
 msgid "16 million colors (24 bits)"
 msgstr "สิบหกล้านสี (24 บิต)"
 
-#: Xconfig/resolution_and_depth.pm:135
+#: Xconfig/resolution_and_depth.pm:133
 #, c-format
 msgid "Resolutions"
 msgstr "ความละเอียด"
@@ -557,45 +560,45 @@ msgstr "เลือกขนาดจอภาพและความละเ
 msgid "Graphics card: %s"
 msgstr "กราฟฟิคการ์ด: %s"
 
-#: Xconfig/resolution_and_depth.pm:284 interactive.pm:403
-#: interactive/gtk.pm:766 interactive/http.pm:103 interactive/http.pm:156
+#: Xconfig/resolution_and_depth.pm:285 interactive.pm:424
+#: interactive/gtk.pm:768 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/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
+#: standalone/drakTermServ:199 standalone/drakTermServ:490
+#: standalone/drakbackup:3967 standalone/drakbackup:4027
+#: standalone/drakbackup:4071 standalone/drakconnect:165
+#: standalone/drakconnect:849 standalone/drakconnect:936
+#: standalone/drakconnect:1035 standalone/drakfont:576 standalone/drakroam:388
+#: standalone/drakups:208 standalone/net_monitor:344 ugtk2.pm:409 ugtk2.pm:506
+#: ugtk2.pm:900 ugtk2.pm:923
 #, c-format
 msgid "Ok"
 msgstr "ตกลง"
 
-#: 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
+#: Xconfig/resolution_and_depth.pm:285 diskdrake/smbnfs_gtk.pm:81 help.pm:89
+#: help.pm:444 install_steps_gtk.pm:480 install_steps_interactive.pm:422
+#: install_steps_interactive.pm:826 interactive.pm:425 interactive/gtk.pm:772
 #: 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
+#: interactive/stdio.pm:176 printer/printerdrake.pm:3579
+#: standalone/drakautoinst:217 standalone/drakbackup:3893
+#: standalone/drakbackup:3897 standalone/drakbackup:3955
+#: standalone/drakconnect:164 standalone/drakconnect:934
+#: standalone/drakconnect:1034 standalone/drakfont:668 standalone/drakfont:745
+#: standalone/drakups:215 standalone/logdrake:174 standalone/net_monitor:343
+#: ugtk2.pm:403 ugtk2.pm:504 ugtk2.pm:513 ugtk2.pm:900
 #, c-format
 msgid "Cancel"
 msgstr "ยกเลิก"
 
-#: 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
+#: Xconfig/resolution_and_depth.pm:285 diskdrake/hd_gtk.pm:153
+#: install_steps_gtk.pm:228 install_steps_gtk.pm:629 interactive.pm:519
+#: interactive/gtk.pm:638 interactive/gtk.pm:640 standalone/drakTermServ:284
+#: standalone/drakbackup:3889 standalone/drakbug:104
 #: 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
+#: standalone/drakfont:511 standalone/drakperm:134 standalone/draksec:336
+#: standalone/draksec:338 standalone/draksec:356 standalone/draksec:358
+#: ugtk2.pm:1031 ugtk2.pm:1032
 #, c-format
 msgid "Help"
 msgstr "ความช่วยเหลือ"
@@ -623,12 +626,12 @@ msgid ""
 "Try to change some parameters"
 msgstr ""
 
-#: Xconfig/test.pm:133
+#: Xconfig/test.pm:129
 #, fuzzy, c-format
 msgid "Leaving in %d seconds"
 msgstr "%d วินาที"
 
-#: Xconfig/test.pm:133
+#: Xconfig/test.pm:129
 #, fuzzy, c-format
 msgid "Is this the correct setting?"
 msgstr "ถูกต้องหรือไม่?"
@@ -721,20 +724,20 @@ msgstr ""
 msgid "What norm is your TV using?"
 msgstr "การติดต่อแบบ ISDN ของคุณเป็นแบบใด"
 
-#: 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
+#: any.pm:140 harddrake/sound.pm:191 install_any.pm:652 interactive.pm:462
+#: standalone/drakconnect:167 standalone/drakconnect:613 standalone/draksec:68
+#: standalone/drakups:101 standalone/drakxtv:92 standalone/harddrake2:231
+#: standalone/service_harddrake:204
 #, c-format
 msgid "Please wait"
 msgstr "โปรดรอสักครู่"
 
-#: any.pm:116
+#: any.pm:140
 #, fuzzy, c-format
 msgid "Bootloader installation in progress"
 msgstr "การติดตั้ง Bootloader"
 
-#: any.pm:127
+#: any.pm:151
 #, c-format
 msgid ""
 "LILO wants to assign a new Volume ID to drive %s.  However, changing\n"
@@ -745,23 +748,23 @@ msgid ""
 "Assign a new Volume ID?"
 msgstr ""
 
-#: any.pm:138
+#: any.pm:162
 #, c-format
 msgid "Installation of bootloader failed. The following error occurred:"
 msgstr "การติดตั้ง bootloader ล้มเหลว ต่อไปนี้เป็นข้อผิดพลาดที่เกิดขึ้น"
 
-#: any.pm:144
+#: any.pm:168
 #, 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"
+" enable the bootloader.  If you do not 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
+#: any.pm:206
 #, c-format
 msgid ""
 "You decided to install the bootloader on a partition.\n"
@@ -771,259 +774,257 @@ msgid ""
 "On which drive are you booting?"
 msgstr ""
 
-#: any.pm:204 help.pm:739
+#: any.pm:229 help.pm:739
 #, c-format
 msgid "First sector of drive (MBR)"
 msgstr "เซ็กเตอร์แรกของไดรว์ (MBR)"
 
-#: any.pm:205
+#: any.pm:230
 #, fuzzy, c-format
 msgid "First sector of the root partition"
 msgstr "เซ็กเตอร์แรกของบูตพาร์ติชั่น"
 
-#: any.pm:207
+#: any.pm:232
 #, fuzzy, c-format
 msgid "On Floppy"
 msgstr "บันทึกลงแผ่นฟล้อปปี้"
 
-#: any.pm:209 help.pm:739 printer/printerdrake.pm:3603
+#: any.pm:234 help.pm:739 printer/printerdrake.pm:3962
 #, c-format
 msgid "Skip"
 msgstr "ข้ามไป"
 
-#: any.pm:213
+#: any.pm:238
 #, c-format
 msgid "LILO/grub Installation"
 msgstr "การติดตั้ง LILO/grub"
 
-#: any.pm:214
+#: any.pm:239
 #, c-format
 msgid "Where do you want to install the bootloader?"
 msgstr "คุณจะติดตั้งบูตโหลดเดอร์ไว้ที่ไหน?"
 
-#: any.pm:239 standalone/drakboot:307
+#: any.pm:264 standalone/drakboot:307
 #, c-format
 msgid "Boot Style Configuration"
 msgstr "Boot Style Configuration"
 
-#: any.pm:241 any.pm:275
+#: any.pm:266 any.pm:298
 #, c-format
 msgid "Bootloader main options"
 msgstr "อ๊อปชั่นหลักของ Bootloader"
 
-#: any.pm:245
+#: any.pm:270
 #, c-format
 msgid "Give the ram size in MB"
 msgstr "ให้ป้อนข้อมูลของขนาดหน่วยความจำเป็น Mb"
 
-#: any.pm:247
+#: any.pm:272
 #, c-format
 msgid ""
 "Option ``Restrict command line options'' is of no use without a password"
 msgstr "อ็อปชั่น ``อ๊อปชั่นจำเพาะที่ใช้กับคอมมานด์ไลน์'' จะต้องใส่รหัสผ่านด้วย"
 
-#: any.pm:248 any.pm:586 install_steps_interactive.pm:1215
+#: any.pm:273 any.pm:606 authentication.pm:176
 #, c-format
 msgid "The passwords do not match"
 msgstr "รหัสผ่านไม่เหมือนกัน"
 
-#: any.pm:248 any.pm:586 diskdrake/interactive.pm:1261
-#: install_steps_interactive.pm:1215
+#: any.pm:273 any.pm:606 authentication.pm:176 diskdrake/interactive.pm:1270
 #, c-format
 msgid "Please try again"
 msgstr "โปรดลองอีกครั้ง"
 
-#: any.pm:253 any.pm:278
+#: any.pm:278 any.pm:301
 #, c-format
 msgid "Bootloader to use"
 msgstr "Bootloader ที่จะใช้"
 
-#: any.pm:255 any.pm:280
+#: any.pm:280 any.pm:303
 #, c-format
 msgid "Boot device"
 msgstr "อุปกรณ์บูต"
 
-#: any.pm:257
+#: any.pm:282
 #, c-format
 msgid "Delay before booting default image"
 msgstr "หน่วงเวลาก่อนทำการบูตอิมเมจที่ใช้"
 
-#: any.pm:258
+#: any.pm:283
 #, fuzzy, c-format
 msgid "Enable ACPI"
 msgstr "Enable CD Boot?"
 
-#: any.pm:260
+#: any.pm:285
 #, c-format
 msgid "Force no APIC"
 msgstr ""
 
-#: any.pm:262
+#: any.pm:287
 #, c-format
 msgid "Force No Local APIC"
 msgstr ""
 
-#: 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
+#: any.pm:289 any.pm:633 authentication.pm:181 diskdrake/smbnfs_gtk.pm:180
+#: network/netconnect.pm:633 printer/printerdrake.pm:1596
+#: printer/printerdrake.pm:1716 standalone/drakbackup:1653
+#: standalone/drakbackup:3495 standalone/drakups:295
 #, c-format
 msgid "Password"
 msgstr "รหัสผ่าน"
 
-#: any.pm:265 any.pm:614 install_steps_interactive.pm:1221
+#: any.pm:290 any.pm:634 authentication.pm:182
 #, c-format
 msgid "Password (again)"
 msgstr "รหัสผ่าน (ใส่อีกครั้ง)"
 
-#: any.pm:266
+#: any.pm:291
 #, c-format
 msgid "Restrict command line options"
 msgstr "อ็อปชั่นจำเพาะที่ใช้กับคอมมานด์ไลน์"
 
-#: any.pm:266
+#: any.pm:291
 #, c-format
 msgid "restrict"
 msgstr "จำเพาะ"
 
-#: any.pm:268
+#: any.pm:293
 #, c-format
 msgid "Clean /tmp at each boot"
 msgstr "ลบ /tmp ตอน boot ทุกครั้ง"
 
-#: any.pm:269
+#: any.pm:294
 #, c-format
 msgid "Precise RAM size if needed (found %d MB)"
 msgstr "กำหนดค่าหน่วยความจำ (RAM) ให้ถูกต้องถ้าต้องการ (ระบบพบ %d MB)"
 
-#: any.pm:279
+#: any.pm:302
 #, c-format
 msgid "Init Message"
 msgstr "ข้อความ init"
 
-#: any.pm:281
+#: any.pm:304
 #, c-format
 msgid "Open Firmware Delay"
 msgstr "Open Firmware Delay"
 
-#: any.pm:282
+#: any.pm:305
 #, c-format
 msgid "Kernel Boot Timeout"
 msgstr "Kernel Boot Timeout"
 
-#: any.pm:283
+#: any.pm:306
 #, c-format
 msgid "Enable CD Boot?"
 msgstr "Enable CD Boot?"
 
-#: any.pm:284
+#: any.pm:307
 #, c-format
 msgid "Enable OF Boot?"
 msgstr "Enable OF Boot?"
 
-#: any.pm:285
+#: any.pm:308
 #, c-format
 msgid "Default OS?"
 msgstr "Default OS?"
 
-#: any.pm:338
+#: any.pm:361
 #, c-format
 msgid "Image"
 msgstr "Image"
 
-#: any.pm:339 any.pm:349
+#: any.pm:362 any.pm:372
 #, c-format
 msgid "Root"
 msgstr "Root"
 
-#: any.pm:340 any.pm:362
+#: any.pm:363 any.pm:385
 #, c-format
 msgid "Append"
 msgstr "Append"
 
-#: any.pm:342 standalone/drakboot:309 standalone/drakboot:313
+#: any.pm:365 standalone/drakboot:309 standalone/drakboot:313
 #, c-format
 msgid "Video mode"
 msgstr "โหมดของการแสดงผล"
 
-#: any.pm:344
+#: any.pm:367
 #, c-format
 msgid "Initrd"
 msgstr "Initrd"
 
-#: any.pm:345
+#: any.pm:368
 #, fuzzy, c-format
 msgid "Network profile"
 msgstr "โปรแกรมค้นหาเครือข่าย"
 
-#: any.pm:354 any.pm:359 any.pm:361
+#: any.pm:377 any.pm:382 any.pm:384
 #, c-format
 msgid "Label"
 msgstr "Label"
 
-#: any.pm:356 any.pm:366 harddrake/v4l.pm:275 standalone/drakfloppy:84
+#: any.pm:379 any.pm:389 harddrake/v4l.pm:275 standalone/drakfloppy:84
 #: standalone/drakfloppy:90 standalone/draksec:52
 #, c-format
 msgid "Default"
 msgstr "Default"
 
-#: any.pm:363
+#: any.pm:386
 #, c-format
 msgid "Initrd-size"
 msgstr "Initrd-size"
 
-#: any.pm:365
+#: any.pm:388
 #, c-format
 msgid "NoVideo"
 msgstr "NoVideo"
 
-#: any.pm:376
+#: any.pm:399
 #, c-format
 msgid "Empty label not allowed"
 msgstr "ไม่อนุญาตให้มีหัวข้อว่าง"
 
-#: any.pm:377
+#: any.pm:400
 #, c-format
 msgid "You must specify a kernel image"
 msgstr ""
 
-#: any.pm:377
+#: any.pm:400
 #, fuzzy, c-format
 msgid "You must specify a root partition"
 msgstr "คุณจะต้องมีพาร์ติชั่นสวอป"
 
-#: any.pm:378
+#: any.pm:401
 #, c-format
 msgid "This label is already used"
 msgstr "หัวข้อนี้ถูกใช้ไปเรียบร้อยแล้ว"
 
-#: any.pm:392
+#: any.pm:415
 #, c-format
 msgid "Which type of entry do you want to add?"
 msgstr "ข้อมูลประเภทใดที่คุณต้องการเพิ่ม"
 
-#: any.pm:393
+#: any.pm:416
 #, c-format
 msgid "Linux"
 msgstr "ลีนุกซ์"
 
-#: any.pm:393
+#: any.pm:416
 #, c-format
 msgid "Other OS (SunOS...)"
 msgstr "ระบบปฏิบัติการอื่นๆ (SunOS...)"
 
-#: any.pm:394
+#: any.pm:417
 #, c-format
 msgid "Other OS (MacOS...)"
 msgstr "ระบบปฏิบัติการอื่นๆ (Mac OS...)"
 
-#: any.pm:394
+#: any.pm:417
 #, c-format
 msgid "Other OS (Windows...)"
 msgstr "ระบบปฏิบัติการอื่นๆ (วินโดวส์...)"
 
-#: any.pm:422
+#: any.pm:445
 #, c-format
 msgid ""
 "Here are the entries on your boot menu so far.\n"
@@ -1032,73 +1033,73 @@ msgstr ""
 "ต่อไปนี้เป็นข้อมูลต่างๆ\n"
 "คุณสามารถเพิ่มข้อมูลหรือแก้ไขข้อมูลที่มีได้"
 
-#: any.pm:572
+#: any.pm:592
 #, c-format
 msgid "access to X programs"
 msgstr ""
 
-#: any.pm:573
+#: any.pm:593
 #, c-format
 msgid "access to rpm tools"
 msgstr ""
 
-#: any.pm:574
+#: any.pm:594
 #, c-format
 msgid "allow \"su\""
 msgstr ""
 
-#: any.pm:575
+#: any.pm:595
 #, c-format
 msgid "access to administrative files"
 msgstr ""
 
-#: any.pm:576
+#: any.pm:596
 #, c-format
 msgid "access to network tools"
 msgstr ""
 
-#: any.pm:577
+#: any.pm:597
 #, c-format
 msgid "access to compilation tools"
 msgstr ""
 
-#: any.pm:582
+#: any.pm:602
 #, c-format
 msgid "(already added %s)"
 msgstr "(เพิ่ม %s เรียบร้อยแล้ว)"
 
-#: any.pm:587
+#: any.pm:607
 #, c-format
 msgid "This password is too simple"
 msgstr "รหัสผ่านนี้ง่ายต่อการเดา"
 
-#: any.pm:588
+#: any.pm:608
 #, c-format
 msgid "Please give a user name"
 msgstr "โปรดป้อนชื่อผู้ใช้"
 
-#: any.pm:589
+#: any.pm:609
 #, c-format
 msgid ""
 "The user name must contain only lower cased letters, numbers, `-' and `_'"
 msgstr "ชื่อผู้ใช้จะสามารถมีได้เฉพาะตัวอักษรตัวเล็ก ตัวเลข '-' และ '_'"
 
-#: any.pm:590
-#, fuzzy, c-format
+#: any.pm:610
+#, c-format
 msgid "The user name is too long"
-msgstr "ชื่อผู้ใช้นี้ได้ถูกเพิ่มลงไปในระบบเรียบร้อยแล้ว"
+msgstr "ชื่อผู้ใช้ยาวเกินไป"
 
-#: any.pm:591
+#: any.pm:611
 #, c-format
 msgid "This user name has already been added"
 msgstr "ชื่อผู้ใช้นี้ได้ถูกเพิ่มลงไปในระบบเรียบร้อยแล้ว"
 
-#: any.pm:595
+#: any.pm:615
 #, c-format
 msgid "Add user"
 msgstr "เพิ่มผู้ใช้"
 
-#: any.pm:596
+#: any.pm:616
 #, c-format
 msgid ""
 "Enter a user\n"
@@ -1107,79 +1108,79 @@ msgstr ""
 "ให้ใส่ผู้ใช้\n"
 "%s"
 
-#: any.pm:599 diskdrake/dav.pm:66 diskdrake/hd_gtk.pm:157
+#: any.pm:619 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
+#: printer/printerdrake.pm:376 printer/printerdrake.pm:4742
+#: standalone/drakbackup:2708 standalone/scannerdrake:668
+#: standalone/scannerdrake:818
 #, c-format
 msgid "Done"
 msgstr "ทำเรียบร้อยแล้ว"
 
-#: any.pm:600 help.pm:51
+#: any.pm:620 help.pm:51
 #, c-format
 msgid "Accept user"
 msgstr "ยอมรับผู้ใช้"
 
-#: any.pm:611
+#: any.pm:631
 #, c-format
 msgid "Real name"
 msgstr "ชื่อเต็ม"
 
-#: any.pm:612 standalone/drakbackup:1642
+#: any.pm:632 standalone/drakbackup:1648
 #, fuzzy, c-format
 msgid "Login name"
 msgstr "ชื่อโดเมน"
 
-#: any.pm:615
+#: any.pm:635
 #, c-format
 msgid "Shell"
 msgstr "เชลล์ที่ใช้"
 
-#: any.pm:617
+#: any.pm:637
 #, c-format
 msgid "Icon"
 msgstr "Icon"
 
-#: any.pm:664 security/l10n.pm:14
+#: any.pm:684 security/l10n.pm:14
 #, c-format
 msgid "Autologin"
 msgstr "Autologin"
 
-#: any.pm:665
+#: any.pm:685
 #, fuzzy, c-format
 msgid "I can set up your computer to automatically log on one user."
 msgstr ""
 "ผมไม่สามารถทำให้ท่านเข้าทำงานโดยใช้ชื่อคนคนหนึ่งแบบอัตโนมัติ\n"
 "ถ้าคุณไม่ต้องการใช้งานรูปแบบนี้กรุณากดปุ่มยกเลิก"
 
-#: any.pm:666 help.pm:51
+#: any.pm:686 help.pm:51
 #, fuzzy, c-format
 msgid "Do you want to use this feature?"
 msgstr "คุณต้องการใช้ aboot หรือไม่"
 
-#: any.pm:667
+#: any.pm:687
 #, c-format
 msgid "Choose the default user:"
 msgstr "เลือกผู้ใช้ default"
 
-#: any.pm:668
+#: any.pm:688
 #, c-format
 msgid "Choose the window manager to run:"
 msgstr "เลือก window manager:"
 
-#: any.pm:680
+#: any.pm:700
 #, fuzzy, c-format
 msgid "Please choose a language to use."
 msgstr "กรุณาเลือกภาษาที่ต้องการใช้"
 
-#: any.pm:681
+#: any.pm:701
 #, fuzzy, c-format
 msgid "Language choice"
 msgstr "เลือกภาษาที่คุณใช้"
 
-#: any.pm:707
+#: any.pm:727
 #, c-format
 msgid ""
 "Mandrakelinux can support multiple languages. Select\n"
@@ -1187,57 +1188,59 @@ msgid ""
 "when your installation is complete and you restart your system."
 msgstr "คุณสามารถเลือกภาษาอื่นซึ่งจะสามารถใช้ได้หลังติดตั้ง"
 
-#: any.pm:725 help.pm:647
+#: any.pm:746 help.pm:647
 #, c-format
 msgid "Use Unicode by default"
 msgstr ""
 
-#: any.pm:726 help.pm:647
+#: any.pm:747 help.pm:647
 #, fuzzy, c-format
 msgid "All languages"
 msgstr "เลือกภาษาที่คุณใช้"
 
-#: any.pm:765 help.pm:566 help.pm:855 install_steps_interactive.pm:960
+#: any.pm:786 help.pm:566 help.pm:855 install_steps_interactive.pm:946
 #, fuzzy, c-format
 msgid "Country / Region"
 msgstr "ขนาดจอภาพ"
 
-#: any.pm:766
+#: any.pm:787
 #, fuzzy, c-format
 msgid "Please choose your country."
 msgstr "คุณมีเม้าส์ชนิดใด"
 
-#: any.pm:768
+#: any.pm:789
 #, fuzzy, c-format
 msgid "Here is the full list of available countries"
 msgstr "ต่อไปนี้คือ keyboard ที่ใช้ได้"
 
-#: any.pm:769
+#: any.pm:790
 #, fuzzy, c-format
 msgid "Other Countries"
 msgstr "กำลังตรวจสอบพอร์ต"
 
-#: any.pm:777
+#: any.pm:798
 #, c-format
 msgid "Input method:"
 msgstr ""
 
-#: any.pm:778 install_any.pm:420 printer/printerdrake.pm:99
-#, fuzzy, c-format
+#: any.pm:799 install_any.pm:388 network/netconnect.pm:323
+#: network/netconnect.pm:328 printer/printerdrake.pm:99
+#: printer/printerdrake.pm:2111
+#, c-format
 msgid "None"
-msgstr "ทำเรียบร้อยแล้ว"
+msgstr "ไม่มี"
 
-#: any.pm:912
+#: any.pm:914
 #, fuzzy, c-format
 msgid "No sharing"
 msgstr "ไม่มีเครื่องพิมพ์"
 
-#: any.pm:912
+#: any.pm:914
 #, fuzzy, c-format
 msgid "Allow all users"
 msgstr "เพิ่มผู้ใช้"
 
-#: any.pm:916
+#: any.pm:918
 #, c-format
 msgid ""
 "Would you like to allow users to share some of their directories?\n"
@@ -1247,42 +1250,42 @@ msgid ""
 "\"Custom\" permit a per-user granularity.\n"
 msgstr ""
 
-#: any.pm:928
+#: any.pm:930
 #, c-format
 msgid ""
 "NFS: the traditional Unix file sharing system, with less support on Mac and "
 "Windows."
 msgstr ""
 
-#: any.pm:931
+#: any.pm:933
 #, c-format
 msgid ""
 "SMB: a file sharing system used by Windows, Mac OS X and many modern Linux "
 "systems."
 msgstr ""
 
-#: any.pm:939
+#: any.pm:941
 #, c-format
 msgid ""
 "You can export using NFS or SMB. Please select which you would like to use."
 msgstr ""
 
-#: any.pm:964
+#: any.pm:966
 #, c-format
 msgid "Launch userdrake"
 msgstr ""
 
-#: 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
+#: any.pm:966 printer/printerdrake.pm:3802 printer/printerdrake.pm:3805
+#: printer/printerdrake.pm:3806 printer/printerdrake.pm:3807
+#: printer/printerdrake.pm:5036 standalone/drakTermServ:294
+#: standalone/drakbackup:4089 standalone/drakbug:126 standalone/drakfont:499
+#: standalone/drakfont:595 standalone/net_monitor:123
+#: standalone/printerdrake:547
+#, c-format
 msgid "Close"
-msgstr "Mouse"
+msgstr "ปิด"
 
-#: any.pm:966
+#: any.pm:968
 #, c-format
 msgid ""
 "The per-user sharing uses the group \"fileshare\". \n"
@@ -1304,176 +1307,182 @@ msgstr ""
 msgid "NIS"
 msgstr "ใช้ NIS"
 
-#: authentication.pm:19 authentication.pm:127
+#: authentication.pm:19
+#, c-format
+msgid "Smart Card"
+msgstr ""
+
+#: authentication.pm:20 authentication.pm:148
 #, fuzzy, c-format
 msgid "Windows Domain"
 msgstr "โดเมน NIS"
 
-#: authentication.pm:20
+#: authentication.pm:21
 #, c-format
 msgid "Active Directory with SFU"
 msgstr ""
 
-#: authentication.pm:21
+#: authentication.pm:22
 #, c-format
 msgid "Active Directory with Winbind"
 msgstr ""
 
-#: authentication.pm:30
+#: authentication.pm:51
 #, fuzzy, c-format
 msgid "Local file:"
 msgstr "เครื่องพิมพ์โลคอล (ต่อติดกับตัวเครื่อง):"
 
-#: authentication.pm:30
+#: authentication.pm:51
 #, c-format
 msgid ""
 "Use local for all authentication and information user tell in local file"
 msgstr ""
 
-#: authentication.pm:31
+#: authentication.pm:52
 #, c-format
 msgid "LDAP:"
 msgstr ":"
 
-#: authentication.pm:31
+#: authentication.pm:52
 #, 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
+#: authentication.pm:53
 #, fuzzy, c-format
 msgid "NIS:"
 msgstr "ใช้ NIS:"
 
-#: authentication.pm:32
+#: authentication.pm:53
 #, 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
+#: authentication.pm:54
 #, fuzzy, c-format
 msgid "Windows Domain:"
 msgstr "โดเมน NIS:"
 
-#: authentication.pm:33
+#: authentication.pm:54
 #, c-format
 msgid ""
 "Winbind allows the system to retrieve information and authenticate users in "
 "a Windows domain."
 msgstr ""
 
-#: authentication.pm:34
+#: authentication.pm:55
 #, c-format
 msgid "Active Directory with SFU:"
 msgstr ""
 
-#: authentication.pm:34 authentication.pm:35
+#: authentication.pm:55 authentication.pm:56
 #, c-format
 msgid ""
 "Kerberos is a secure system for providing network authentication services."
 msgstr ""
 
-#: authentication.pm:35
+#: authentication.pm:56
 #, c-format
 msgid "Active Directory with Winbind:"
 msgstr ""
 
-#: authentication.pm:60
+#: authentication.pm:81
 #, fuzzy, c-format
 msgid "Authentication LDAP"
 msgstr "การตรวจสอบสิทธิ์การใช้งาน"
 
-#: authentication.pm:61
+#: authentication.pm:82
 #, c-format
 msgid "LDAP Base dn"
 msgstr ""
 
-#: authentication.pm:62 share/compssUsers.pl:101
+#: authentication.pm:83 share/compssUsers.pl:101
 #, fuzzy, c-format
 msgid "LDAP Server"
 msgstr "เซิร์ฟเวอร์ NIS"
 
-#: authentication.pm:75 fsedit.pm:21
+#: authentication.pm:96 fsedit.pm:21
 #, c-format
 msgid "simple"
 msgstr "ง่าย"
 
-#: authentication.pm:76
+#: authentication.pm:97
 #, c-format
 msgid "TLS"
-msgstr ""
+msgstr "TLS"
 
-#: authentication.pm:77
+#: authentication.pm:98
 #, c-format
 msgid "SSL"
-msgstr ""
+msgstr "SSL"
 
-#: authentication.pm:78
+#: authentication.pm:99
 #, c-format
 msgid "security layout (SASL/Kerberos)"
 msgstr ""
 
-#: authentication.pm:85 authentication.pm:123
+#: authentication.pm:106 authentication.pm:144
 #, fuzzy, c-format
 msgid "Authentication Active Directory"
 msgstr "การตรวจสอบสิทธิ์การใช้งาน"
 
-#: authentication.pm:86 authentication.pm:125 diskdrake/smbnfs_gtk.pm:181
-#, fuzzy, c-format
+#: authentication.pm:107 authentication.pm:146 diskdrake/smbnfs_gtk.pm:181
+#, c-format
 msgid "Domain"
-msgstr "โดเมน NIS"
+msgstr "โดเมน"
 
-#: authentication.pm:88 diskdrake/dav.pm:63 help.pm:146
+#: authentication.pm:109 diskdrake/dav.pm:63 help.pm:146
 #: printer/printerdrake.pm:135 share/compssUsers.pl:81
+#: standalone/drakTermServ:269
 #, c-format
 msgid "Server"
 msgstr "เซิร์ฟเวอร์"
 
-#: authentication.pm:89
+#: authentication.pm:110
 #, fuzzy, c-format
 msgid "LDAP users database"
 msgstr "ชื่อเซิร์ฟเวอร์ของพรินเตอร์"
 
-#: authentication.pm:90
+#: authentication.pm:111
 #, c-format
 msgid "Use Anonymous BIND "
 msgstr ""
 
-#: authentication.pm:91
+#: authentication.pm:112
 #, c-format
 msgid "LDAP user allowed to browse the Active Directory"
 msgstr ""
 
-#: authentication.pm:92
+#: authentication.pm:113
 #, fuzzy, c-format
 msgid "Password for user"
 msgstr "รหัสผ่าน"
 
-#: authentication.pm:93
-#, fuzzy, c-format
+#: authentication.pm:114
+#, c-format
 msgid "Encryption"
-msgstr "การตรวจสอบสิทธิ์การใช้งาน"
+msgstr "การเช้ารหัส"
 
-#: authentication.pm:104
+#: authentication.pm:125
 #, fuzzy, c-format
 msgid "Authentication NIS"
 msgstr "การตรวจสอบสิทธิ์การใช้งานของ NIS"
 
-#: authentication.pm:105
+#: authentication.pm:126
 #, c-format
 msgid "NIS Domain"
 msgstr "โดเมน NIS"
 
-#: authentication.pm:106
+#: authentication.pm:127
 #, c-format
 msgid "NIS Server"
 msgstr "เซิร์ฟเวอร์ NIS"
 
-#: authentication.pm:111
+#: authentication.pm:132
 #, c-format
 msgid ""
 "For this to work for a W2K PDC, you will probably need to have the admin "
@@ -1490,34 +1499,66 @@ msgid ""
 "good."
 msgstr ""
 
-#: authentication.pm:123
+#: authentication.pm:144
 #, fuzzy, c-format
 msgid "Authentication Windows Domain"
 msgstr "การตรวจสอบสิทธิ์การใช้งาน"
 
-#: authentication.pm:128
+#: authentication.pm:149
 #, fuzzy, c-format
 msgid "Domain Admin User Name"
 msgstr "ชื่อโดเมน"
 
-#: authentication.pm:129
+#: authentication.pm:150
 #, c-format
 msgid "Domain Admin Password"
 msgstr ""
 
-#: authentication.pm:130
+#: authentication.pm:151
 #, c-format
 msgid "Use Idmap for store UID/SID "
 msgstr ""
 
-#: authentication.pm:131
+#: authentication.pm:152
 #, fuzzy, c-format
 msgid "Default Idmap "
 msgstr "Default"
 
-#: authentication.pm:231
+#: authentication.pm:165
+#, c-format
+msgid "Set administrator (root) password and network authentication methods"
+msgstr ""
+
+#: authentication.pm:166
+#, fuzzy, c-format
+msgid "Set administrator (root) password"
+msgstr "เซ็ตรหัสผ่านรูท"
+
+#: authentication.pm:167 standalone/drakvpn:1125
+#, fuzzy, c-format
+msgid "Authentication method"
+msgstr "การตรวจสอบสิทธิ์การใช้งาน"
+
+#. -PO: keep this short or else the buttons will not fit in the window
+#: authentication.pm:172 help.pm:722
+#, c-format
+msgid "No password"
+msgstr "ไม่มีรหัสผ่าน"
+
+#: authentication.pm:178
 #, c-format
-msgid "Can't use broadcast with no NIS domain"
+msgid "This password is too short (it must be at least %d characters long)"
+msgstr "รหัสลับง่ายเกินไป (ต้องมีอย่างน้อย %d ตัวอักษร)"
+
+#: authentication.pm:183 network/netconnect.pm:328 network/netconnect.pm:634
+#: standalone/drakauth:23 standalone/drakauth:25 standalone/drakconnect:459
+#, c-format
+msgid "Authentication"
+msgstr "การตรวจสอบสิทธิ์การใช้งาน"
+
+#: authentication.pm:296
+#, c-format
+msgid "Can not use broadcast with no NIS domain"
 msgstr ""
 
 # NOTE: this message will be displayed at boot time; that is
@@ -1525,7 +1566,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:673
+#: bootloader.pm:728
 #, c-format
 msgid ""
 "Welcome to the operating system chooser!\n"
@@ -1535,51 +1576,51 @@ msgid ""
 "\n"
 msgstr ""
 
-#: bootloader.pm:787
+#: bootloader.pm:815
 #, c-format
 msgid "LILO with graphical menu"
 msgstr "LILO แบบ graphical menu"
 
-#: bootloader.pm:788
+#: bootloader.pm:816
 #, c-format
 msgid "LILO with text menu"
 msgstr "LILO แบบ text menu"
 
-#: bootloader.pm:789
+#: bootloader.pm:817
 #, c-format
 msgid "Grub"
 msgstr "Grub"
 
-#: bootloader.pm:790
+#: bootloader.pm:818
 #, c-format
 msgid "Yaboot"
 msgstr "Yaboot"
 
-#: bootloader.pm:852
+#: bootloader.pm:881
 #, c-format
 msgid "not enough room in /boot"
 msgstr "ไม่มีที่พอใน /boot"
 
-#: bootloader.pm:1266
+#: bootloader.pm:1295
 #, fuzzy, c-format
-msgid "You can't install the bootloader on a %s partition\n"
+msgid "You can not install the bootloader on a %s partition\n"
 msgstr "คุณจะติดตั้งบูตโหลดเดอร์ไว้ที่ไหน?"
 
-#: bootloader.pm:1311
+#: bootloader.pm:1340
 #, c-format
 msgid ""
 "Your bootloader configuration must be updated because partition has been "
 "renumbered"
 msgstr ""
 
-#: bootloader.pm:1326
+#: bootloader.pm:1355
 #, c-format
 msgid ""
-"The bootloader can't be installed correctly. You have to boot rescue and "
+"The bootloader can not be installed correctly. You have to boot rescue and "
 "choose \"%s\""
 msgstr ""
 
-#: bootloader.pm:1327
+#: bootloader.pm:1356
 #, fuzzy, c-format
 msgid "Re-install Boot Loader"
 msgstr "ติดตั้งบูตโหลดเดอร์"
@@ -1619,94 +1660,115 @@ msgstr "1 นาที"
 msgid "%d seconds"
 msgstr "%d วินาที"
 
-#: common.pm:197
-#, fuzzy, c-format
-msgid "Can't make screenshots before partitioning"
-msgstr "โปรแกรมไม่สามารถเพิ่มพาร์ติชั่นได้อีก"
-
-#: common.pm:204
-#, fuzzy, c-format
-msgid "Screenshots will be available after install in %s"
-msgstr "คุณสามารถเลือกภาษาอื่นซึ่งจะสามารถใช้ได้หลังติดตั้ง"
-
-#: common.pm:269
+#: common.pm:240
 #, c-format
 msgid "kdesu missing"
 msgstr "ไม่มี kdesu "
 
-#: common.pm:272
+#: common.pm:243
 #, c-format
 msgid "consolehelper missing"
 msgstr ""
 
-#: 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:14 crypto.pm:43 lang.pm:202 network/adsl_consts.pm:50
+#: network/adsl_consts.pm:58 network/adsl_consts.pm:66
+#, c-format
+msgid "Austria"
+msgstr "ออสเตรีย"
 
-#: crypto.pm:15 lang.pm:229
+#: crypto.pm:15 crypto.pm:34 lang.pm:209 network/adsl_consts.pm:74
+#: network/adsl_consts.pm:82 network/adsl_consts.pm:93
+#: network/adsl_consts.pm:101 network/netconnect.pm:50
+#, c-format
+msgid "Belgium"
+msgstr "เบลเยียม"
+
+#: crypto.pm:16 lang.pm:230 network/adsl_consts.pm:780
+#: network/adsl_consts.pm:788 network/adsl_consts.pm:798
+#, c-format
+msgid "Switzerland"
+msgstr ""
+
+#: crypto.pm:17 lang.pm:237
 #, c-format
 msgid "Costa Rica"
 msgstr "คอสตาริกา"
 
-#: 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:235
+#: crypto.pm:18 crypto.pm:35 lang.pm:243 network/adsl_consts.pm:319
 #, c-format
 msgid "Czech Republic"
 msgstr "สาธารณรัฐเช็ค"
 
-#: crypto.pm:18 crypto.pm:31 lang.pm:236 network/adsl_consts.pm:410
-#: network/adsl_consts.pm:418
-#, fuzzy, c-format
+#: crypto.pm:19 crypto.pm:36 lang.pm:244 network/adsl_consts.pm:437
+#: network/adsl_consts.pm:445
+#, c-format
 msgid "Germany"
-msgstr "เยอรมัน"
+msgstr "เยอรมนี"
 
-#: crypto.pm:19 crypto.pm:32 lang.pm:267 network/adsl_consts.pm:428
-#, fuzzy, c-format
+#: crypto.pm:20 crypto.pm:33 lang.pm:262 network/adsl_consts.pm:343
+#: network/adsl_consts.pm:354 network/adsl_consts.pm:365
+#: network/adsl_consts.pm:375 network/adsl_consts.pm:385
+#: network/adsl_consts.pm:396 network/adsl_consts.pm:407
+#: network/adsl_consts.pm:417 network/adsl_consts.pm:427
+#: network/netconnect.pm:47
+#, c-format
+msgid "France"
+msgstr "ฝรั่งเศส"
+
+#: crypto.pm:21 crypto.pm:37 lang.pm:275 network/adsl_consts.pm:455
+#, c-format
 msgid "Greece"
-msgstr "กรีก"
+msgstr "กรืซ"
 
-#: crypto.pm:20 crypto.pm:33 lang.pm:340
+#: crypto.pm:22 lang.pm:286 network/adsl_consts.pm:463
 #, fuzzy, c-format
-msgid "Norway"
-msgstr "นอร์เวย์"
+msgid "Hungary"
+msgstr "อังการี"
 
-#: crypto.pm:21 crypto.pm:34 lang.pm:369 network/adsl_consts.pm:561
-#, fuzzy, c-format
-msgid "Sweden"
-msgstr "สวีเดน"
+#: crypto.pm:23 crypto.pm:42 lang.pm:295 network/adsl_consts.pm:489
+#: network/adsl_consts.pm:499 network/adsl_consts.pm:509
+#: network/adsl_consts.pm:517 network/netconnect.pm:49 standalone/drakxtv:47
+#, c-format
+msgid "Italy"
+msgstr "อิตาลี"
 
-#: crypto.pm:22 crypto.pm:36 lang.pm:339 network/adsl_consts.pm:495
-#: network/netconnect.pm:48
+#: crypto.pm:24 crypto.pm:41 lang.pm:347 network/adsl_consts.pm:545
+#: network/adsl_consts.pm:553 network/adsl_consts.pm:561
+#: network/adsl_consts.pm:569 network/netconnect.pm:48
 #, c-format
 msgid "Netherlands"
 msgstr "เนเธอร์แลนด์"
 
-#: 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:25 crypto.pm:38 lang.pm:348 network/adsl_consts.pm:577
+#: network/adsl_consts.pm:582 network/adsl_consts.pm:587
+#: network/adsl_consts.pm:592 network/adsl_consts.pm:597
+#: network/adsl_consts.pm:602 network/adsl_consts.pm:607
+#, c-format
+msgid "Norway"
+msgstr "นอร์เวย์"
+
+#: crypto.pm:26 lang.pm:360 network/adsl_consts.pm:614
+#: network/adsl_consts.pm:624
+#, c-format
+msgid "Poland"
+msgstr "โปแลนด๋"
 
-#: crypto.pm:24 crypto.pm:38 lang.pm:194 network/adsl_consts.pm:36
-#: network/adsl_consts.pm:44 network/adsl_consts.pm:52
+#: crypto.pm:27 crypto.pm:39 lang.pm:377 network/adsl_consts.pm:772
+#, c-format
+msgid "Sweden"
+msgstr "สวีเดน"
+
+#: crypto.pm:28 lang.pm:382
 #, fuzzy, c-format
-msgid "Austria"
-msgstr "พอร์ตอนุกรม"
+msgid "Slovakia"
+msgstr "สโลวาเนีย"
 
-#: crypto.pm:35 crypto.pm:65 lang.pm:403 network/netconnect.pm:51
+#: crypto.pm:29 lang.pm:406
+#, c-format
+msgid "Taiwan"
+msgstr "ไต้หวัน"
+
+#: crypto.pm:40 crypto.pm:75 lang.pm:411 network/netconnect.pm:51
 #, c-format
 msgid "United States"
 msgstr "สหรัฐอเมริกา"
@@ -1721,22 +1783,22 @@ msgid ""
 msgstr ""
 
 #: diskdrake/dav.pm:25
-#, fuzzy, c-format
+#, c-format
 msgid "New"
 msgstr "ใหม่"
 
-#: diskdrake/dav.pm:61 diskdrake/interactive.pm:425 diskdrake/smbnfs_gtk.pm:75
+#: diskdrake/dav.pm:61 diskdrake/interactive.pm:443 diskdrake/smbnfs_gtk.pm:75
 #, c-format
 msgid "Unmount"
 msgstr "เลิกเม้าท์์ระบบไฟล์"
 
-#: diskdrake/dav.pm:62 diskdrake/interactive.pm:422 diskdrake/smbnfs_gtk.pm:76
+#: diskdrake/dav.pm:62 diskdrake/interactive.pm:440 diskdrake/smbnfs_gtk.pm:76
 #, c-format
 msgid "Mount"
 msgstr "เม้าท์"
 
-#: diskdrake/dav.pm:64 diskdrake/interactive.pm:416
-#: diskdrake/interactive.pm:627 diskdrake/interactive.pm:646
+#: diskdrake/dav.pm:64 diskdrake/interactive.pm:435
+#: diskdrake/interactive.pm:653 diskdrake/interactive.pm:672
 #: diskdrake/removable.pm:23 diskdrake/smbnfs_gtk.pm:79
 #, c-format
 msgid "Mount point"
@@ -1753,17 +1815,17 @@ msgid "The URL must begin with http:// or https://"
 msgstr ""
 
 #: diskdrake/dav.pm:109
-#, fuzzy, c-format
+#, c-format
 msgid "Server: "
-msgstr "เซิร์ฟเวอร์"
+msgstr "เซิร์ฟเวอร์: "
 
-#: diskdrake/dav.pm:110 diskdrake/interactive.pm:479
-#: diskdrake/interactive.pm:1155 diskdrake/interactive.pm:1232
+#: diskdrake/dav.pm:110 diskdrake/interactive.pm:504
+#: diskdrake/interactive.pm:1166 diskdrake/interactive.pm:1241
 #, c-format
 msgid "Mount point: "
 msgstr "จุดเม้าท์: "
 
-#: diskdrake/dav.pm:111 diskdrake/interactive.pm:1239
+#: diskdrake/dav.pm:111 diskdrake/interactive.pm:1248
 #, fuzzy, c-format
 msgid "Options: %s"
 msgstr "พาร์ติชั่น %s"
@@ -1810,8 +1872,8 @@ msgstr ""
 msgid "Please click on a partition"
 msgstr "โปรดเลือกพาร์ติชั่น"
 
-#: diskdrake/hd_gtk.pm:208 diskdrake/smbnfs_gtk.pm:63 install_steps_gtk.pm:474
-#: standalone/drakbackup:2938 standalone/drakbackup:2998
+#: diskdrake/hd_gtk.pm:208 diskdrake/smbnfs_gtk.pm:63 install_steps_gtk.pm:482
+#: standalone/drakbackup:2943 standalone/drakbackup:3003
 #, c-format
 msgid "Details"
 msgstr "รายละเอียด"
@@ -1821,169 +1883,177 @@ msgstr "รายละเอียด"
 msgid "No hard drives found"
 msgstr "เครื่องพิมพ์โลคอล (ต่อติดกับตัวเครื่อง)"
 
-#: diskdrake/hd_gtk.pm:325
+#: diskdrake/hd_gtk.pm:338
 #, c-format
 msgid "Ext2"
 msgstr "Ext2"
 
-#: diskdrake/hd_gtk.pm:325
+#: diskdrake/hd_gtk.pm:338
 #, fuzzy, c-format
 msgid "Journalised FS"
 msgstr "การเม้าท์ล้มเหลว"
 
-#: diskdrake/hd_gtk.pm:325
+#: diskdrake/hd_gtk.pm:338
 #, c-format
 msgid "Swap"
 msgstr "สวอป"
 
-#: diskdrake/hd_gtk.pm:325
+#: diskdrake/hd_gtk.pm:338
 #, c-format
 msgid "SunOS"
 msgstr "SunOS"
 
-#: diskdrake/hd_gtk.pm:325
+#: diskdrake/hd_gtk.pm:338
 #, c-format
 msgid "HFS"
 msgstr "HFS"
 
-#: diskdrake/hd_gtk.pm:325
-#, fuzzy, c-format
+#: diskdrake/hd_gtk.pm:338
+#, c-format
 msgid "Windows"
-msgstr "โดเมน NIS"
+msgstr "หน้าต่าง"
 
-#: diskdrake/hd_gtk.pm:326 install_steps_gtk.pm:298 mouse.pm:168
-#: services.pm:164 standalone/drakbackup:1603 standalone/drakperm:250
+#: diskdrake/hd_gtk.pm:339 install_steps_gtk.pm:284 mouse.pm:168
+#: services.pm:162 standalone/drakbackup:1609 standalone/drakperm:250
 #, c-format
 msgid "Other"
 msgstr "อื่นๆ"
 
-#: diskdrake/hd_gtk.pm:326 diskdrake/interactive.pm:1172
+#: diskdrake/hd_gtk.pm:339 diskdrake/interactive.pm:1181
 #, c-format
 msgid "Empty"
 msgstr "ว่าง"
 
-#: diskdrake/hd_gtk.pm:330
+#: diskdrake/hd_gtk.pm:343
 #, c-format
 msgid "Filesystem types:"
 msgstr "ประเภทของระบบไฟล์:"
 
-#: diskdrake/hd_gtk.pm:347 diskdrake/hd_gtk.pm:349 diskdrake/hd_gtk.pm:352
+#: diskdrake/hd_gtk.pm:360 diskdrake/hd_gtk.pm:362 diskdrake/hd_gtk.pm:368
 #, c-format
 msgid "Use ``%s'' instead"
 msgstr "ใช้ ``%s'' แทน"
 
-#: diskdrake/hd_gtk.pm:347 diskdrake/hd_gtk.pm:352
-#: diskdrake/interactive.pm:417 diskdrake/interactive.pm:580
+#: diskdrake/hd_gtk.pm:360 diskdrake/interactive.pm:459
+#, c-format
+msgid "Create"
+msgstr "สร้าง"
+
+#: diskdrake/hd_gtk.pm:360 diskdrake/hd_gtk.pm:368
+#: diskdrake/interactive.pm:436 diskdrake/interactive.pm:606
 #: diskdrake/removable.pm:25 diskdrake/removable.pm:48
-#: standalone/harddrake2:101
+#: standalone/harddrake2:106 standalone/harddrake2:115
 #, c-format
 msgid "Type"
 msgstr "ประเภท"
 
-#: 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:349 diskdrake/interactive.pm:426
-#: standalone/drakperm:124 standalone/printerdrake:242
+#: diskdrake/hd_gtk.pm:362 diskdrake/interactive.pm:444
+#: standalone/drakperm:124 standalone/printerdrake:235
 #, c-format
 msgid "Delete"
 msgstr "ลบ"
 
-#: diskdrake/hd_gtk.pm:352
+#: diskdrake/hd_gtk.pm:368
 #, c-format
 msgid "Use ``Unmount'' first"
 msgstr "ใช้ ``Unmount'' ก่อน"
 
-#: diskdrake/interactive.pm:187
+#: diskdrake/interactive.pm:191
 #, fuzzy, c-format
 msgid "Choose another partition"
 msgstr "สร้างพาร์ติชั่นใหม่"
 
-#: diskdrake/interactive.pm:187
+#: diskdrake/interactive.pm:191
 #, fuzzy, c-format
 msgid "Choose a partition"
 msgstr "เลือกกิจกรรม"
 
-#: diskdrake/interactive.pm:216
-#, fuzzy, c-format
+#: diskdrake/interactive.pm:220
+#, c-format
 msgid "Exit"
-msgstr "Ext2"
+msgstr "เลิกทำงาน"
 
-#: diskdrake/interactive.pm:249 help.pm:530
+#: diskdrake/interactive.pm:253 help.pm:530
 #, c-format
 msgid "Undo"
 msgstr "ยกเลิก"
 
-#: diskdrake/interactive.pm:249
+#: diskdrake/interactive.pm:253
 #, c-format
 msgid "Toggle to normal mode"
 msgstr "สำหรับผู้ชำนาญ > ปกติ"
 
-#: diskdrake/interactive.pm:249
+#: diskdrake/interactive.pm:253
 #, c-format
 msgid "Toggle to expert mode"
 msgstr "ปกติ > สำหรับผู้ชำนาญ"
 
-#: diskdrake/interactive.pm:268
+#: diskdrake/interactive.pm:272
 #, c-format
 msgid "Continue anyway?"
 msgstr "ทำงานต่อหรือไม่?"
 
-#: diskdrake/interactive.pm:273
+#: diskdrake/interactive.pm:275
+#, c-format
+msgid ""
+"You should format partition %s.\n"
+"Otherwise no entry for mount point %s will be written in fstab.\n"
+"Quit anyway?"
+msgstr ""
+
+#: diskdrake/interactive.pm:282
 #, c-format
 msgid "Quit without saving"
 msgstr "ออกโดยไม่ต้องบันทึก"
 
-#: diskdrake/interactive.pm:273
+#: diskdrake/interactive.pm:282
 #, c-format
 msgid "Quit without writing the partition table?"
 msgstr "ออกโดยไม่ต้องเขียนตารางพาร์ติชั่น"
 
-#: diskdrake/interactive.pm:278
+#: diskdrake/interactive.pm:287
 #, fuzzy, c-format
 msgid "Do you want to save /etc/fstab modifications"
 msgstr "คุณต้องการทดสอบการคอนฟิกหรือไม่"
 
-#: diskdrake/interactive.pm:285 install_steps_interactive.pm:313
+#: diskdrake/interactive.pm:294 install_steps_interactive.pm:329
 #, c-format
 msgid "You need to reboot for the partition table modifications to take place"
 msgstr "คุณต้องทำการรีบูตระบบให้เครื่องรับทราบการเปลี่ยนแปลงตารางพาร์ติชั่น"
 
-#: diskdrake/interactive.pm:298 help.pm:530
+#: diskdrake/interactive.pm:307 help.pm:530
 #, c-format
 msgid "Clear all"
 msgstr "ล้างทั้งหมด"
 
-#: diskdrake/interactive.pm:299 help.pm:530
+#: diskdrake/interactive.pm:308 help.pm:530
 #, c-format
 msgid "Auto allocate"
 msgstr "กำหนดแบบอัตโนมัติ"
 
-#: diskdrake/interactive.pm:300 help.pm:530 help.pm:566 help.pm:606
-#: help.pm:855 install_steps_interactive.pm:124
+#: diskdrake/interactive.pm:309 help.pm:530 help.pm:566 help.pm:606
+#: help.pm:855 install_steps_interactive.pm:122
 #, c-format
 msgid "More"
 msgstr "More"
 
-#: diskdrake/interactive.pm:305
+#: diskdrake/interactive.pm:314
 #, fuzzy, c-format
 msgid "Hard drive information"
 msgstr "การตรวจหาฮาร์ดไดรว์"
 
-#: diskdrake/interactive.pm:337
+#: diskdrake/interactive.pm:346
 #, c-format
 msgid "All primary partitions are used"
 msgstr "พาร์ติชั่นแบบ primary ถูกใช้ทั้งหมดแล้ว"
 
-#: diskdrake/interactive.pm:338
+#: diskdrake/interactive.pm:347
 #, c-format
-msgid "I can't add any more partitions"
+msgid "I can not add any more partitions"
 msgstr "โปรแกรมไม่สามารถเพิ่มพาร์ติชั่นได้อีก"
 
-#: diskdrake/interactive.pm:339
+#: diskdrake/interactive.pm:348
 #, c-format
 msgid ""
 "To have more partitions, please delete one to be able to create an extended "
@@ -1992,37 +2062,37 @@ msgstr ""
 "หากต้องการเพิ่มพาร์ติชั่น โปรดลบพาร์ติชั่นทิ้งหนึ่งพาร์ติชั่นเพื่อสร้าง\n"
 "พาร์ติชั่นแบบ extended ได้"
 
-#: diskdrake/interactive.pm:350 help.pm:530
+#: diskdrake/interactive.pm:359 help.pm:530
 #, fuzzy, c-format
 msgid "Save partition table"
 msgstr "บันทึกตารางพาร์ติชั่น"
 
-#: diskdrake/interactive.pm:351 help.pm:530
+#: diskdrake/interactive.pm:360 help.pm:530
 #, fuzzy, c-format
 msgid "Restore partition table"
 msgstr "กู้ตารางพาร์ติชั่น"
 
-#: diskdrake/interactive.pm:352 help.pm:530
+#: diskdrake/interactive.pm:361 help.pm:530
 #, c-format
 msgid "Rescue partition table"
 msgstr "กู้ตารางพาร์ติชั่น"
 
-#: diskdrake/interactive.pm:354 help.pm:530
+#: diskdrake/interactive.pm:363 help.pm:530
 #, fuzzy, c-format
 msgid "Reload partition table"
 msgstr "กู้ตารางพาร์ติชั่น"
 
-#: diskdrake/interactive.pm:356
+#: diskdrake/interactive.pm:365
 #, c-format
 msgid "Removable media automounting"
 msgstr ""
 
-#: diskdrake/interactive.pm:365 diskdrake/interactive.pm:385
+#: diskdrake/interactive.pm:376 diskdrake/interactive.pm:402
 #, c-format
 msgid "Select file"
 msgstr "เลือกไฟล์"
 
-#: diskdrake/interactive.pm:372
+#: diskdrake/interactive.pm:388
 #, c-format
 msgid ""
 "The backup partition table has not the same size\n"
@@ -2031,463 +2101,413 @@ msgstr ""
 "พาร์ติชั่นแบ็คอัพไม่มีขนาดเท่ากัน\n"
 "ต้องการทำต่อหรือไม่?"
 
-#: 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:387
-#, c-format
-msgid ""
-"Insert a floppy in drive\n"
-"All data on this floppy will be lost"
-msgstr ""
-"กรุณาใส่แผ่นฟล้อปปี้ในไดรว์\n"
-"ข้อมูลทั้งหมดบนแผ่นฟล้อปปี้จะถูกลบ"
-
-#: diskdrake/interactive.pm:398
+#: diskdrake/interactive.pm:417
 #, c-format
 msgid "Trying to rescue partition table"
 msgstr "กำลังพยายามกู้ตารางพาร์ติชั่นคืน"
 
-#: diskdrake/interactive.pm:404
+#: diskdrake/interactive.pm:423
 #, fuzzy, c-format
 msgid "Detailed information"
 msgstr "แสดงข้อมูล"
 
-#: diskdrake/interactive.pm:419 diskdrake/interactive.pm:717
+#: diskdrake/interactive.pm:438 diskdrake/interactive.pm:743
 #, c-format
 msgid "Resize"
 msgstr "เปลี่ยนขนาด"
 
-#: diskdrake/interactive.pm:420 diskdrake/interactive.pm:783
-#, c-format
-msgid "Move"
-msgstr "ย้าย"
-
-#: diskdrake/interactive.pm:421
+#: diskdrake/interactive.pm:439
 #, c-format
 msgid "Format"
 msgstr "ฟอร์แมต"
 
-#: diskdrake/interactive.pm:423
+#: diskdrake/interactive.pm:441
 #, c-format
 msgid "Add to RAID"
 msgstr "เพิ่มให้ RAID"
 
-#: diskdrake/interactive.pm:424
+#: diskdrake/interactive.pm:442
 #, c-format
 msgid "Add to LVM"
 msgstr "เพิ่มให้ LVM"
 
-#: diskdrake/interactive.pm:427
+#: diskdrake/interactive.pm:445
 #, c-format
 msgid "Remove from RAID"
 msgstr "ลบออกจาก RAID"
 
-#: diskdrake/interactive.pm:428
+#: diskdrake/interactive.pm:446
 #, c-format
 msgid "Remove from LVM"
 msgstr "ลบออกจาก LVM"
 
-#: diskdrake/interactive.pm:429
+#: diskdrake/interactive.pm:447
 #, c-format
 msgid "Modify RAID"
 msgstr "แก้ไข RAID"
 
-#: diskdrake/interactive.pm:430
+#: diskdrake/interactive.pm:448
 #, c-format
 msgid "Use for loopback"
 msgstr "ใช้สำหรับ loopback"
 
-#: diskdrake/interactive.pm:472
+#: diskdrake/interactive.pm:497
 #, c-format
 msgid "Create a new partition"
 msgstr "สร้างพาร์ติชั่นใหม่"
 
-#: diskdrake/interactive.pm:475
+#: diskdrake/interactive.pm:500
 #, c-format
 msgid "Start sector: "
 msgstr "เริ่มเซ็กเตอร์: "
 
-#: diskdrake/interactive.pm:477 diskdrake/interactive.pm:884
+#: diskdrake/interactive.pm:502 diskdrake/interactive.pm:899
 #, c-format
 msgid "Size in MB: "
 msgstr "ขนาดเป็น MB: "
 
-#: diskdrake/interactive.pm:478 diskdrake/interactive.pm:885
+#: diskdrake/interactive.pm:503 diskdrake/interactive.pm:900
 #, c-format
 msgid "Filesystem type: "
 msgstr "ประเภทของระบบไฟล์: "
 
-#: diskdrake/interactive.pm:483
+#: diskdrake/interactive.pm:508
 #, c-format
 msgid "Preference: "
 msgstr "ข้อกำหนด: "
 
-#: diskdrake/interactive.pm:486
+#: diskdrake/interactive.pm:511
 #, fuzzy, c-format
 msgid "Logical volume name "
 msgstr "เครื่องพิมพ์โลคอล (ต่อติดกับตัวเครื่อง)"
 
-#: diskdrake/interactive.pm:515
+#: diskdrake/interactive.pm:541
 #, c-format
 msgid ""
-"You can't create a new partition\n"
+"You can not create a new partition\n"
 "(since you reached the maximal number of primary partitions).\n"
 "First remove a primary partition and create an extended partition."
 msgstr ""
 
-#: diskdrake/interactive.pm:545
+#: diskdrake/interactive.pm:571
 #, fuzzy, c-format
 msgid "Remove the loopback file?"
 msgstr "ฟอร์แมต loopback file %s"
 
-#: diskdrake/interactive.pm:564
+#: diskdrake/interactive.pm:590
 #, c-format
 msgid ""
 "After changing type of partition %s, all data on this partition will be lost"
 msgstr "การเปลี่ยนชนิดพาร์ติชั่น %s ข้อมูลทั้งหมดในพาร์ติชั่นนี้จะถูกลบทิ้ง"
 
-#: diskdrake/interactive.pm:576
+#: diskdrake/interactive.pm:602
 #, c-format
 msgid "Change partition type"
 msgstr "เปลี่ยนประเภทพาร์ติชั่น"
 
-#: diskdrake/interactive.pm:577 diskdrake/removable.pm:47
+#: diskdrake/interactive.pm:603 diskdrake/removable.pm:47
 #, c-format
 msgid "Which filesystem do you want?"
 msgstr "คุณต้องการเลือก filesystem ใด"
 
-#: diskdrake/interactive.pm:585
+#: diskdrake/interactive.pm:611
 #, c-format
 msgid "Switching from ext2 to ext3"
 msgstr ""
 
-#: diskdrake/interactive.pm:614
+#: diskdrake/interactive.pm:640
 #, fuzzy, c-format
 msgid "Where do you want to mount the loopback file %s?"
 msgstr "คุณต้องการเม้าท์ loopback file %s ไว้ที่ใด?"
 
-#: diskdrake/interactive.pm:615
+#: diskdrake/interactive.pm:641
 #, c-format
 msgid "Where do you want to mount device %s?"
 msgstr "คุณต้องการเม้าท์อุปกรณ์ %s ไว้ที่ใด?"
 
-#: diskdrake/interactive.pm:620
+#: diskdrake/interactive.pm:646
 #, c-format
 msgid ""
-"Can't unset mount point as this partition is used for loop back.\n"
+"Can not unset mount point as this partition is used for loop back.\n"
 "Remove the loopback first"
 msgstr ""
-"Can't unset mount point as this partition is used for loop back.\n"
+"Can not unset mount point as this partition is used for loop back.\n"
 "Remove the loopback first"
 
-#: diskdrake/interactive.pm:645
+#: diskdrake/interactive.pm:671
 #, fuzzy, c-format
 msgid "Where do you want to mount %s?"
 msgstr "คุณต้องการเม้าท์อุปกรณ์ %s ไว้ที่ใด?"
 
-#: diskdrake/interactive.pm:669 diskdrake/interactive.pm:748
+#: diskdrake/interactive.pm:695 diskdrake/interactive.pm:774
 #: install_interactive.pm:156 install_interactive.pm:188
 #, c-format
 msgid "Resizing"
 msgstr "ปรับขนาด"
 
-#: diskdrake/interactive.pm:669
+#: diskdrake/interactive.pm:695
 #, c-format
 msgid "Computing FAT filesystem bounds"
 msgstr "คำนวณขอบเขตของระบบไฟล์"
 
-#: diskdrake/interactive.pm:705
+#: diskdrake/interactive.pm:731
 #, c-format
 msgid "This partition is not resizeable"
 msgstr "พาร์ติชั่นนี้ไม่สามารถเปลี่ยนขนาดได้"
 
-#: diskdrake/interactive.pm:710
+#: diskdrake/interactive.pm:736
 #, c-format
 msgid "All data on this partition should be backed-up"
 msgstr "ข้อมูลทั้งหมดในพาร์ติชั่นนี้ควรจะทำการสำรองไว้"
 
-#: diskdrake/interactive.pm:712
+#: diskdrake/interactive.pm:738
 #, c-format
 msgid "After resizing partition %s, all data on this partition will be lost"
 msgstr "หลังจากเปลี่ยนขนาดพาร์ติชั่น %s ข้อมูลทั้งหมดในพาร์ติชั่นนี้จะหายไป"
 
-#: diskdrake/interactive.pm:717
+#: diskdrake/interactive.pm:743
 #, c-format
 msgid "Choose the new size"
 msgstr "เลือกขนาดใหม่"
 
-#: diskdrake/interactive.pm:718
+#: diskdrake/interactive.pm:744
 #, fuzzy, c-format
 msgid "New size in MB: "
 msgstr "ขนาดเป็น MB: "
 
-#: diskdrake/interactive.pm:761 install_interactive.pm:196
+#: diskdrake/interactive.pm:787 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:784
-#, c-format
-msgid "Which disk do you want to move it to?"
-msgstr "คุณต้องการจะย้ายไปดิสก์ไหน"
-
-#: diskdrake/interactive.pm:785
-#, c-format
-msgid "Sector"
-msgstr "เซ็กเตอร์"
-
-#: diskdrake/interactive.pm:786
-#, c-format
-msgid "Which sector do you want to move it to?"
-msgstr "คุณต้องการย้ายไปเซ็กเตอร์ไหน"
-
-#: diskdrake/interactive.pm:789
-#, c-format
-msgid "Moving"
-msgstr "ย้าย"
-
-#: diskdrake/interactive.pm:789
-#, c-format
-msgid "Moving partition..."
-msgstr "ย้ายพาร์ติชั่น..."
-
-#: diskdrake/interactive.pm:810
+#: diskdrake/interactive.pm:825
 #, c-format
 msgid "Choose an existing RAID to add to"
 msgstr "เลือก RAID เพื่อเพิ่มเข้าไป"
 
-#: diskdrake/interactive.pm:812 diskdrake/interactive.pm:828
+#: diskdrake/interactive.pm:827 diskdrake/interactive.pm:844
 #, c-format
 msgid "new"
 msgstr "ใหม่"
 
-#: diskdrake/interactive.pm:826
+#: diskdrake/interactive.pm:842
 #, c-format
 msgid "Choose an existing LVM to add to"
 msgstr "เลือก LVM ที่มีอยู่เพื่อเพิ่มเข้าไป"
 
-#: diskdrake/interactive.pm:832
+#: diskdrake/interactive.pm:848
 #, c-format
 msgid "LVM name?"
 msgstr "ชื่อ LVM"
 
-#: diskdrake/interactive.pm:869
+#: diskdrake/interactive.pm:884
 #, c-format
-msgid "This partition can't be used for loopback"
+msgid "This partition can not be used for loopback"
 msgstr "พาร์ติชั่นนี้ไม่สามารถใช้กับ loopback"
 
-#: diskdrake/interactive.pm:882
+#: diskdrake/interactive.pm:897
 #, c-format
 msgid "Loopback"
 msgstr "Loopback"
 
-#: diskdrake/interactive.pm:883
+#: diskdrake/interactive.pm:898
 #, c-format
 msgid "Loopback file name: "
 msgstr "ชื่อ Loopback file: "
 
-#: diskdrake/interactive.pm:888
+#: diskdrake/interactive.pm:903
 #, fuzzy, c-format
 msgid "Give a file name"
 msgstr "ชื่อเต็ม"
 
-#: diskdrake/interactive.pm:891
+#: diskdrake/interactive.pm:906
 #, 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:892
+#: diskdrake/interactive.pm:907
 #, c-format
 msgid "File already exists. Use it?"
 msgstr "ไฟล์มีอยู่แล้ว ต้องการใช้?"
 
-#: diskdrake/interactive.pm:915
+#: diskdrake/interactive.pm:930
 #, fuzzy, c-format
 msgid "Mount options"
 msgstr "อ๊อปชั่นของโมดูล:"
 
-#: diskdrake/interactive.pm:922
+#: diskdrake/interactive.pm:937
 #, c-format
 msgid "Various"
 msgstr ""
 
-#: diskdrake/interactive.pm:987
+#: diskdrake/interactive.pm:1002
 #, c-format
 msgid "device"
 msgstr "อุปกรณ์"
 
-#: diskdrake/interactive.pm:988
+#: diskdrake/interactive.pm:1003
 #, c-format
 msgid "level"
 msgstr "ระดับ"
 
-#: diskdrake/interactive.pm:989
+#: diskdrake/interactive.pm:1004
 #, fuzzy, c-format
 msgid "chunk size in KiB"
 msgstr "ขนาดของ chunk"
 
-#: diskdrake/interactive.pm:1006
+#: diskdrake/interactive.pm:1021
 #, c-format
 msgid "Be careful: this operation is dangerous."
 msgstr "ระวัง การทำงานนี้อันตราย"
 
-#: diskdrake/interactive.pm:1021
+#: diskdrake/interactive.pm:1036
 #, c-format
 msgid "What type of partitioning?"
 msgstr "การทำ partitioning ชนิดใด?"
 
-#: diskdrake/interactive.pm:1059
+#: diskdrake/interactive.pm:1074
 #, c-format
 msgid "You'll need to reboot before the modification can take place"
 msgstr "คุณจะต้องทำการรีบูตระบบก่อนที่จะทำการแก้ไข"
 
-#: diskdrake/interactive.pm:1068
+#: diskdrake/interactive.pm:1083
 #, c-format
 msgid "Partition table of drive %s is going to be written to disk!"
 msgstr "ตารางพาร์ติชั่นของไดรฟ์ %s จะถูกบันทึกลงไปในดิสก์"
 
-#: diskdrake/interactive.pm:1081
+#: diskdrake/interactive.pm:1096
 #, c-format
 msgid "After formatting partition %s, all data on this partition will be lost"
 msgstr "หลังจาก format พาร์ติชั่น %s ข้อมูลทั้งหมดในพาร์ติชั่นนี้จะถูกลบทิ้ง"
 
-#: diskdrake/interactive.pm:1101
+#: diskdrake/interactive.pm:1112
 #, fuzzy, c-format
 msgid "Move files to the new partition"
 msgstr "ไม่มีพื้นที่เพียงพอสำหรับ พาร์ติชั่น ใหม่"
 
-#: diskdrake/interactive.pm:1101
+#: diskdrake/interactive.pm:1112
 #, fuzzy, c-format
 msgid "Hide files"
 msgstr "mkraid failed"
 
-#: diskdrake/interactive.pm:1102
+#: diskdrake/interactive.pm:1113
 #, c-format
 msgid ""
 "Directory %s already contains data\n"
 "(%s)"
 msgstr ""
 
-#: diskdrake/interactive.pm:1113
+#: diskdrake/interactive.pm:1124
 #, fuzzy, c-format
 msgid "Moving files to the new partition"
 msgstr "ไม่มีพื้นที่เพียงพอสำหรับ พาร์ติชั่น ใหม่"
 
-#: diskdrake/interactive.pm:1117
+#: diskdrake/interactive.pm:1128
 #, c-format
 msgid "Copying %s"
 msgstr ""
 
-#: diskdrake/interactive.pm:1121
+#: diskdrake/interactive.pm:1132
 #, fuzzy, c-format
 msgid "Removing %s"
 msgstr "ความละเอียดของภาพ %s\n"
 
-#: diskdrake/interactive.pm:1135
+#: diskdrake/interactive.pm:1146
 #, c-format
 msgid "partition %s is now known as %s"
 msgstr ""
 
-#: diskdrake/interactive.pm:1156 diskdrake/interactive.pm:1217
+#: diskdrake/interactive.pm:1147
+#, c-format
+msgid "Partitions have been renumbered: "
+msgstr ""
+
+#: diskdrake/interactive.pm:1167 diskdrake/interactive.pm:1226
 #, c-format
 msgid "Device: "
 msgstr "อุปกรณ์: "
 
-#: diskdrake/interactive.pm:1157
+#: diskdrake/interactive.pm:1168
 #, fuzzy, c-format
 msgid "Devfs name: "
 msgstr "ชื่อโฮสต์:"
 
-#: diskdrake/interactive.pm:1158
+#: diskdrake/interactive.pm:1169
 #, c-format
 msgid "Volume label: "
 msgstr ""
 
-#: diskdrake/interactive.pm:1159
+#: diskdrake/interactive.pm:1170
 #, c-format
 msgid "DOS drive letter: %s (just a guess)\n"
 msgstr "อักษรไดรว์แบบดอส: %s (เป็นการคาดเดา)\n"
 
-#: diskdrake/interactive.pm:1163 diskdrake/interactive.pm:1170
-#: diskdrake/interactive.pm:1235
+#: diskdrake/interactive.pm:1174 diskdrake/interactive.pm:1183
+#: diskdrake/interactive.pm:1244
 #, c-format
 msgid "Type: "
 msgstr "ประเภท: "
 
-#: diskdrake/interactive.pm:1167 install_steps_gtk.pm:310
+#: diskdrake/interactive.pm:1178 install_steps_gtk.pm:296
 #, c-format
 msgid "Name: "
 msgstr "ชื่อ: "
 
-#: diskdrake/interactive.pm:1174
+#: diskdrake/interactive.pm:1185
 #, c-format
 msgid "Start: sector %s\n"
 msgstr "เริ่มต้น: เซ็กเตอร์ %s\n"
 
-#: diskdrake/interactive.pm:1175
+#: diskdrake/interactive.pm:1186
 #, c-format
 msgid "Size: %s"
 msgstr "ขนาด: %s"
 
-#: diskdrake/interactive.pm:1177
+#: diskdrake/interactive.pm:1188
 #, c-format
 msgid ", %s sectors"
 msgstr ", %s เซ็กเตอร์"
 
-#: diskdrake/interactive.pm:1179
+#: diskdrake/interactive.pm:1190
 #, fuzzy, c-format
 msgid "Cylinder %d to %d\n"
 msgstr "ไซลินเดอร์ %d เป็น ไซลินเดอร์ %d\n"
 
-#: diskdrake/interactive.pm:1180
+#: diskdrake/interactive.pm:1191
 #, c-format
 msgid "Number of logical extents: %d"
 msgstr ""
 
-#: diskdrake/interactive.pm:1181
+#: diskdrake/interactive.pm:1192
 #, c-format
 msgid "Formatted\n"
 msgstr "ฟอร์แมต\n"
 
-#: diskdrake/interactive.pm:1182
+#: diskdrake/interactive.pm:1193
 #, c-format
 msgid "Not formatted\n"
 msgstr "ยังไม่ได้ฟอร์แมต\n"
 
-#: diskdrake/interactive.pm:1183
+#: diskdrake/interactive.pm:1194
 #, c-format
 msgid "Mounted\n"
 msgstr "เม้าท์\n"
 
-#: diskdrake/interactive.pm:1184
+#: diskdrake/interactive.pm:1195
 #, c-format
 msgid "RAID %s\n"
 msgstr "RAID %s\n"
 
-#: diskdrake/interactive.pm:1186
+#: diskdrake/interactive.pm:1197
 #, fuzzy, c-format
 msgid ""
 "Loopback file(s):\n"
 "   %s\n"
 msgstr "Loopback file(s): %s\n"
 
-#: diskdrake/interactive.pm:1187
+#: diskdrake/interactive.pm:1198
 #, c-format
 msgid ""
 "Partition booted by default\n"
@@ -2496,27 +2516,27 @@ msgstr ""
 "พาร์ติชั่นที่กำหนดให้บูตซึ่งกำหนดไว้แล้ว\n"
 "    (สำหรับบูตของ MS-DOS ไม่ใช่ lilo)\n"
 
-#: diskdrake/interactive.pm:1189
+#: diskdrake/interactive.pm:1200
 #, c-format
 msgid "Level %s\n"
 msgstr "ระดับ %s\n"
 
-#: diskdrake/interactive.pm:1190
+#: diskdrake/interactive.pm:1201
 #, fuzzy, c-format
 msgid "Chunk size %d KiB\n"
 msgstr "ขนาดของ Chunk %s\n"
 
-#: diskdrake/interactive.pm:1191
+#: diskdrake/interactive.pm:1202
 #, c-format
 msgid "RAID-disks %s\n"
 msgstr "ดิสก์แบบ RAID %s\n"
 
-#: diskdrake/interactive.pm:1193
+#: diskdrake/interactive.pm:1204
 #, c-format
 msgid "Loopback file name: %s"
 msgstr "Loopback file name: %s"
 
-#: diskdrake/interactive.pm:1196
+#: diskdrake/interactive.pm:1207
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -2529,7 +2549,7 @@ msgstr ""
 "เป็นพาร์ติชั่นของไดรเวอร์ คุณควรที่จะ\n"
 "ปล่อยมันทิ้งไว้แบบนี้\n"
 
-#: diskdrake/interactive.pm:1199
+#: diskdrake/interactive.pm:1210
 #, c-format
 msgid ""
 "\n"
@@ -2542,68 +2562,68 @@ msgstr ""
 "partition is for\n"
 "dual-booting your system.\n"
 
-#: diskdrake/interactive.pm:1218
+#: diskdrake/interactive.pm:1227
 #, c-format
 msgid "Read-only"
-msgstr ""
+msgstr "อ่านได้อย่างเดียว"
 
-#: diskdrake/interactive.pm:1219
+#: diskdrake/interactive.pm:1228
 #, c-format
 msgid "Size: %s\n"
 msgstr "ขนาด: %s\n"
 
-#: diskdrake/interactive.pm:1220
+#: diskdrake/interactive.pm:1229
 #, c-format
 msgid "Geometry: %s cylinders, %s heads, %s sectors\n"
 msgstr "ข้อมูลทางกายภาพ: %s ไซลินเดอร์, %s หัวอ่าน, %s เซ้กเตอร์\n"
 
-#: diskdrake/interactive.pm:1221
+#: diskdrake/interactive.pm:1230
 #, c-format
 msgid "Info: "
 msgstr "ข้อมูล: "
 
-#: diskdrake/interactive.pm:1222
+#: diskdrake/interactive.pm:1231
 #, c-format
 msgid "LVM-disks %s\n"
 msgstr "LVM-disks %s\n"
 
-#: diskdrake/interactive.pm:1223
+#: diskdrake/interactive.pm:1232
 #, c-format
 msgid "Partition table type: %s\n"
 msgstr "ชนิดตารางพาร์ติชั่น: %s\n"
 
-#: diskdrake/interactive.pm:1224
+#: diskdrake/interactive.pm:1233
 #, fuzzy, c-format
 msgid "on channel %d id %d\n"
 msgstr "บนบัส %d id %d\n"
 
-#: diskdrake/interactive.pm:1256
+#: diskdrake/interactive.pm:1265
 #, fuzzy, c-format
 msgid "Filesystem encryption key"
 msgstr "ประเภทของระบบไฟล์: "
 
-#: diskdrake/interactive.pm:1257
+#: diskdrake/interactive.pm:1266
 #, c-format
 msgid "Choose your filesystem encryption key"
 msgstr ""
 
-#: diskdrake/interactive.pm:1260
+#: diskdrake/interactive.pm:1269
 #, fuzzy, c-format
 msgid "This encryption key is too simple (must be at least %d characters long)"
 msgstr "รหัสลับง่ายเกินไป (ต้องมีอย่างน้อย %d ตัวอักษร)"
 
-#: diskdrake/interactive.pm:1261
+#: diskdrake/interactive.pm:1270
 #, fuzzy, c-format
 msgid "The encryption keys do not match"
 msgstr "รหัสผ่านไม่เหมือนกัน"
 
-#: diskdrake/interactive.pm:1264 network/netconnect.pm:1040
-#: standalone/drakconnect:395
+#: diskdrake/interactive.pm:1273 network/netconnect.pm:1136
+#: standalone/drakconnect:397
 #, c-format
 msgid "Encryption key"
 msgstr ""
 
-#: diskdrake/interactive.pm:1265
+#: diskdrake/interactive.pm:1274
 #, c-format
 msgid "Encryption key (again)"
 msgstr ""
@@ -2615,7 +2635,7 @@ msgstr "เปลี่ยนประเภทพาร์ติชั่น"
 
 #: diskdrake/smbnfs_gtk.pm:163
 #, c-format
-msgid "Can't login using username %s (bad password?)"
+msgid "Can not login using username %s (bad password?)"
 msgstr ""
 
 #: diskdrake/smbnfs_gtk.pm:167 diskdrake/smbnfs_gtk.pm:176
@@ -2639,8 +2659,8 @@ msgid ""
 "Please enter your username, password and domain name to access this host."
 msgstr ""
 
-#: diskdrake/smbnfs_gtk.pm:179 standalone/drakbackup:3489
-#, fuzzy, c-format
+#: diskdrake/smbnfs_gtk.pm:179 standalone/drakbackup:3494
+#, c-format
 msgid "Username"
 msgstr "ชื่อผู้ใช้"
 
@@ -2671,52 +2691,52 @@ msgstr ""
 msgid "Installing packages..."
 msgstr "กำลังติดตั้งแพ็คเก็จ %s"
 
-#: do_pkgs.pm:216
+#: do_pkgs.pm:217
 #, fuzzy, c-format
 msgid "Removing packages..."
 msgstr "ความละเอียดของภาพ %s\n"
 
-#: fs.pm:445 fs.pm:494
+#: fs.pm:487 fs.pm:536
 #, fuzzy, c-format
 msgid "Mounting partition %s"
 msgstr "ฟอร์แมตพาร์ติชั่น %s"
 
-#: fs.pm:446 fs.pm:495
+#: fs.pm:488 fs.pm:537
 #, c-format
 msgid "mounting partition %s in directory %s failed"
 msgstr ""
 
-#: fs.pm:466 fs.pm:473
+#: fs.pm:508 fs.pm:515
 #, fuzzy, c-format
 msgid "Checking %s"
 msgstr "ความละเอียดของภาพ %s\n"
 
-#: fs.pm:511 partition_table.pm:387
+#: fs.pm:553 partition_table.pm:391
 #, c-format
 msgid "error unmounting %s: %s"
 msgstr "ผิดพลาดยกเลิกการเม้าท์ %s: %s"
 
-#: fs.pm:543
+#: fs.pm:585
 #, fuzzy, c-format
 msgid "Enabling swap partition %s"
 msgstr "ฟอร์แมตพาร์ติชั่น %s"
 
-#: fs/format.pm:39 fs/format.pm:46
+#: fs/format.pm:44 fs/format.pm:51
 #, c-format
 msgid "Formatting partition %s"
 msgstr "ฟอร์แมตพาร์ติชั่น %s"
 
-#: fs/format.pm:43
+#: fs/format.pm:48
 #, c-format
 msgid "Creating and formatting file %s"
 msgstr "กำลังสร้างและ format ไฟล์ %s"
 
-#: fs/format.pm:78
+#: fs/format.pm:83
 #, c-format
-msgid "I don't know how to format %s in type %s"
+msgid "I do not know how to format %s in type %s"
 msgstr "ไม่ทราบว่าจะฟอร์แมต %s เป็นชนิด %s ได้อย่างไร"
 
-#: fs/format.pm:80
+#: fs/format.pm:88 fs/format.pm:90
 #, c-format
 msgid "%s formatting of %s failed"
 msgstr "กำลังฟอร์แมต %s ของ %s ที่มีปัญหา"
@@ -2787,14 +2807,14 @@ msgstr ""
 msgid "Give read-only access to ordinary users"
 msgstr ""
 
-#: fs/type.pm:364
+#: fs/type.pm:370
 #, c-format
-msgid "You can't use JFS for partitions smaller than 16MB"
+msgid "You can not use JFS for partitions smaller than 16MB"
 msgstr "คุณไม่สามารถใช้ JFS สำหรับพาร์ติชั่นที่น้อยกว่า 16MB ได้"
 
-#: fs/type.pm:365
+#: fs/type.pm:371
 #, c-format
-msgid "You can't use ReiserFS for partitions smaller than 32MB"
+msgid "You can not use ReiserFS for partitions smaller than 32MB"
 msgstr "คุณไม่สามารถใช้ ReiserFS สำหรับพาร์ติชั่นที่น้อยกว่า 32MB ได้"
 
 #: fsedit.pm:25
@@ -2807,10 +2827,11 @@ msgstr ""
 msgid "server"
 msgstr "เซิร์ฟเวอร์"
 
-#: fsedit.pm:168
+#: fsedit.pm:184
 #, fuzzy, c-format
 msgid ""
-"I can't read the partition table of device %s, it's too corrupted for me :(\n"
+"I can not read the partition table of device %s, it's too corrupted for me :"
+"(\n"
 "I can try to go on, erasing over bad partitions (ALL DATA will be lost!).\n"
 "The other solution is to not allow DrakX to modify the partition table.\n"
 "(the error is %s)\n"
@@ -2824,22 +2845,22 @@ msgstr ""
 "\n"
 "คุณแน่ใจว่าจะยอมให้พาร์ติชั่นทั้งหมดถูกลบไป\n"
 
-#: fsedit.pm:385
+#: fsedit.pm:401
 #, c-format
 msgid "Mount points must begin with a leading /"
 msgstr "จุดเม้าท์จะต้องเริ่มด้วย /"
 
-#: fsedit.pm:386
+#: fsedit.pm:402
 #, c-format
 msgid "Mount points should contain only alphanumerical characters"
 msgstr ""
 
-#: fsedit.pm:387
+#: fsedit.pm:403
 #, c-format
 msgid "There is already a partition with mount point %s\n"
 msgstr "มีพาร์ติชั่นที่เป็นจุดเม้าท์ที่ %s เรียบร้อยแล้ว\n"
 
-#: fsedit.pm:389
+#: fsedit.pm:405
 #, fuzzy, c-format
 msgid ""
 "You've selected a software RAID partition as root (/).\n"
@@ -2850,12 +2871,12 @@ msgstr ""
 "bootloader ไม่สามารถทำงานโดยไม่มี /boot พาร์ติชั่น \n"
 "เพราะฉนั้นจำเป็นต้องเพิ่ม /boot พาร์ติชั่น"
 
-#: fsedit.pm:392
+#: fsedit.pm:408
 #, c-format
-msgid "You can't use a LVM Logical Volume for mount point %s"
+msgid "You can not use a LVM Logical Volume for mount point %s"
 msgstr "คุณไม่สามารถใช้ LVM Logical Volume สำหรับ %s"
 
-#: fsedit.pm:394
+#: fsedit.pm:410
 #, fuzzy, c-format
 msgid ""
 "You've selected a LVM Logical Volume as root (/).\n"
@@ -2866,61 +2887,56 @@ msgstr ""
 "bootloader ไม่สามารถทำงานโดยไม่มี /boot พาร์ติชั่น \n"
 "เพราะฉนั้นจำเป็นต้องเพิ่ม /boot พาร์ติชั่น"
 
-#: fsedit.pm:397
+#: fsedit.pm:413
 #, c-format
 msgid ""
-"You may not be able to install lilo (since lilo doesn't handle a LV on "
+"You may not be able to install lilo (since lilo does not handle a LV on "
 "multiple PVs)"
 msgstr ""
 
-#: fsedit.pm:400 fsedit.pm:402
+#: fsedit.pm:416 fsedit.pm:418
 #, c-format
 msgid "This directory should remain within the root filesystem"
 msgstr "This directory should remain within the root filesystem"
 
-#: fsedit.pm:404 fsedit.pm:406
+#: fsedit.pm:420 fsedit.pm:422
 #, 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:408
+#: fsedit.pm:424
 #, fuzzy, c-format
-msgid "You can't use an encrypted file system for mount point %s"
+msgid "You can not use an encrypted file system for mount point %s"
 msgstr "คุณไม่สามารถใช้ LVM Logical Volume สำหรับ %s"
 
-#: fsedit.pm:469
+#: fsedit.pm:485
 #, fuzzy, c-format
 msgid "Not enough free space for auto-allocating"
 msgstr "ไม่มีพื้นที่เพียงพอสำหรับการแบ่งสัดส่วนพาร์ติชั่นแบบออโต้"
 
-#: fsedit.pm:471
+#: fsedit.pm:487
 #, c-format
 msgid "Nothing to do"
 msgstr ""
 
-#: fsedit.pm:569
+#: harddrake/data.pm:61 install_any.pm:1505
 #, c-format
-msgid "Error opening %s for writing: %s"
-msgstr "เกิดข้อผิดพลาดในการเปิด %s สำหรับการเขียน: %s"
-
-#: harddrake/data.pm:61
-#, fuzzy, c-format
 msgid "Floppy"
-msgstr "บันทึกลงแผ่นฟล้อปปี้"
+msgstr "ฟล้อปปี้"
 
 #: harddrake/data.pm:71
 #, c-format
 msgid "Zip"
 msgstr "ซิปไดร์ฟ"
 
-#: harddrake/data.pm:81
+#: harddrake/data.pm:81 install_any.pm:1506
 #, fuzzy, c-format
-msgid "Disk"
+msgid "Hard Disk"
 msgstr "เดนมาร์ก"
 
-#: harddrake/data.pm:90
+#: harddrake/data.pm:90 install_any.pm:1507
 #, c-format
 msgid "CDROM"
 msgstr ""
@@ -2935,7 +2951,7 @@ msgstr ""
 msgid "DVD-ROM"
 msgstr "ซีดี-รอม"
 
-#: harddrake/data.pm:120 standalone/drakbackup:2045
+#: harddrake/data.pm:120 standalone/drakbackup:2051
 #, fuzzy, c-format
 msgid "Tape"
 msgstr "ประเภท"
@@ -2956,163 +2972,171 @@ msgid "Other MultiMedia devices"
 msgstr "อื่นๆ"
 
 #: harddrake/data.pm:157
-#, fuzzy, c-format
+#, c-format
 msgid "Soundcard"
-msgstr "Sound card"
+msgstr "การ์ดเสียง"
 
 #: harddrake/data.pm:166
 #, c-format
 msgid "Webcam"
 msgstr ""
 
-#: harddrake/data.pm:181
+#: harddrake/data.pm:180
 #, c-format
 msgid "Processors"
 msgstr ""
 
-#: harddrake/data.pm:191
+#: harddrake/data.pm:190
 #, fuzzy, c-format
 msgid "ISDN adapters"
 msgstr "Internal ISDN card"
 
-#: harddrake/data.pm:201
+#: harddrake/data.pm:200
 #, fuzzy, c-format
 msgid "Ethernetcard"
 msgstr "Ethernet Card"
 
-#: harddrake/data.pm:219 network/netconnect.pm:484
-#, fuzzy, c-format
+#: harddrake/data.pm:218 network/netconnect.pm:518
+#, c-format
 msgid "Modem"
-msgstr "Mouse"
+msgstr "โมเด็ม"
 
-#: harddrake/data.pm:229
+#: harddrake/data.pm:228
 #, c-format
 msgid "ADSL adapters"
 msgstr ""
 
-#: harddrake/data.pm:243
+#: harddrake/data.pm:242
 #, c-format
-msgid "AGP controllers"
-msgstr ""
+msgid "Memory"
+msgstr "หน่วยความจำ"
 
-#: harddrake/data.pm:252
+#: harddrake/data.pm:251
 #, c-format
-msgid "Bridges and system controllers"
+msgid "AGP controllers"
 msgstr ""
 
-#: harddrake/data.pm:261 help.pm:186 help.pm:855
-#: install_steps_interactive.pm:992 printer/printerdrake.pm:875
+#: harddrake/data.pm:260 help.pm:186 help.pm:855
+#: install_steps_interactive.pm:978
 #, c-format
 msgid "Printer"
 msgstr "เครื่องพิมพ์"
 
-#: harddrake/data.pm:271
+#: harddrake/data.pm:270
 #, c-format
 msgid "Joystick"
-msgstr ""
+msgstr "Joystick"
 
-#: harddrake/data.pm:281
+#: harddrake/data.pm:280
 #, c-format
 msgid "(E)IDE/ATA controllers"
 msgstr ""
 
-#: harddrake/data.pm:290
+#: harddrake/data.pm:289
 #, c-format
 msgid "SATA controllers"
 msgstr ""
 
-#: harddrake/data.pm:299
+#: harddrake/data.pm:298
 #, c-format
 msgid "Firewire controllers"
 msgstr ""
 
-#: harddrake/data.pm:308
+#: harddrake/data.pm:307
 #, c-format
 msgid "PCMCIA controllers"
 msgstr ""
 
-#: harddrake/data.pm:321
+#: harddrake/data.pm:316
 #, c-format
 msgid "SCSI controllers"
 msgstr ""
 
-#: harddrake/data.pm:330
+#: harddrake/data.pm:325
 #, c-format
 msgid "USB controllers"
 msgstr ""
 
-#: harddrake/data.pm:339
+#: harddrake/data.pm:334
 #, fuzzy, c-format
 msgid "USB ports"
 msgstr "ไม่มีเครื่องพิมพ์"
 
-#: harddrake/data.pm:348
+#: harddrake/data.pm:343
 #, c-format
 msgid "SMBus controllers"
 msgstr ""
 
-#: harddrake/data.pm:357
+#: harddrake/data.pm:352
+#, c-format
+msgid "Bridges and system controllers"
+msgstr ""
+
+#: harddrake/data.pm:361
 #, 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
+#: harddrake/data.pm:370 help.pm:855 install_steps_interactive.pm:118
+#: install_steps_interactive.pm:938 standalone/keyboarddrake:28
 #, c-format
 msgid "Keyboard"
 msgstr "คีย์บอร์ด"
 
-#: harddrake/data.pm:379 help.pm:855 install_steps_interactive.pm:985
+#: harddrake/data.pm:383 help.pm:855 install_steps_interactive.pm:971
 #, c-format
 msgid "Mouse"
 msgstr "Mouse"
 
-#: harddrake/data.pm:393
+#: harddrake/data.pm:397
 #, fuzzy, c-format
 msgid "Scanner"
 msgstr "เลือกกราฟฟิคการ์ด"
 
-#: harddrake/data.pm:403 standalone/harddrake2:431
+#: harddrake/data.pm:407 standalone/harddrake2:439
 #, fuzzy, c-format
 msgid "Unknown/Others"
 msgstr "Generic"
 
-#: harddrake/data.pm:431
+#: harddrake/data.pm:435
 #, c-format
 msgid "cpu # "
 msgstr ""
 
-#: harddrake/sound.pm:170 standalone/drakconnect:169
-#: standalone/drakconnect:613
+#: harddrake/sound.pm:191 standalone/drakconnect:169
+#: standalone/drakconnect:615
 #, c-format
 msgid "Please Wait... Applying the configuration"
 msgstr "กรุณารอสักครู่ ..."
 
-#: harddrake/sound.pm:206
+#: harddrake/sound.pm:227
 #, c-format
 msgid "No alternative driver"
 msgstr ""
 
-#: harddrake/sound.pm:207
+#: harddrake/sound.pm:228
 #, c-format
 msgid ""
 "There's no known OSS/ALSA alternative driver for your sound card (%s) which "
 "currently uses \"%s\""
 msgstr ""
 
-#: harddrake/sound.pm:213
+#: harddrake/sound.pm:234
 #, fuzzy, c-format
 msgid "Sound configuration"
 msgstr "การปรับแต่ง LAN"
 
-#: harddrake/sound.pm:215
+#: harddrake/sound.pm:236
 #, c-format
 msgid ""
 "Here you can select an alternative driver (either OSS or ALSA) for your "
 "sound card (%s)."
 msgstr ""
 
-#: harddrake/sound.pm:217
+#. -PO: here the first %s is either "OSS" or "ALSA", 
+#. -PO: the second %s is the name of the current driver
+#. -PO: and the third %s is the name of the default driver
+#: harddrake/sound.pm:241
 #, c-format
 msgid ""
 "\n"
@@ -3121,7 +3145,7 @@ msgid ""
 "\"%s\")"
 msgstr ""
 
-#: harddrake/sound.pm:219
+#: harddrake/sound.pm:243
 #, c-format
 msgid ""
 "OSS (Open Sound System) was the first sound API. It's an OS independent "
@@ -3141,17 +3165,34 @@ msgid ""
 "the ALSA library.\n"
 msgstr ""
 
-#: harddrake/sound.pm:233 harddrake/sound.pm:318 standalone/drakups:146
+#: harddrake/sound.pm:257 harddrake/sound.pm:342 standalone/drakups:146
 #, fuzzy, c-format
 msgid "Driver:"
 msgstr "Driver"
 
-#: harddrake/sound.pm:238
+#: harddrake/sound.pm:262
 #, c-format
 msgid "Trouble shooting"
 msgstr ""
 
-#: harddrake/sound.pm:246
+#: harddrake/sound.pm:270 keyboard.pm:391 lang.pm:1039
+#: network/netconnect.pm:504 printer/printerdrake.pm:1142
+#: printer/printerdrake.pm:2142 printer/printerdrake.pm:2228
+#: printer/printerdrake.pm:2274 printer/printerdrake.pm:2341
+#: printer/printerdrake.pm:2376 printer/printerdrake.pm:2684
+#: printer/printerdrake.pm:2691 printer/printerdrake.pm:3643
+#: printer/printerdrake.pm:3970 printer/printerdrake.pm:4092
+#: printer/printerdrake.pm:5183 standalone/drakTermServ:325
+#: standalone/drakTermServ:1111 standalone/drakTermServ:1172
+#: standalone/drakTermServ:1821 standalone/drakbackup:510
+#: standalone/drakbackup:609 standalone/drakboot:165 standalone/drakclock:224
+#: standalone/drakconnect:971 standalone/drakfloppy:291 standalone/drakups:27
+#: standalone/scannerdrake:51 standalone/scannerdrake:940
+#, c-format
+msgid "Warning"
+msgstr "คำเตือน"
+
+#: harddrake/sound.pm:270
 #, c-format
 msgid ""
 "The old \"%s\" driver is blacklisted.\n"
@@ -3161,45 +3202,45 @@ msgid ""
 "The new \"%s\" driver will only be used on next bootstrap."
 msgstr ""
 
-#: harddrake/sound.pm:254
+#: harddrake/sound.pm:278
 #, c-format
 msgid "No open source driver"
 msgstr ""
 
-#: harddrake/sound.pm:255
+#: harddrake/sound.pm:279
 #, 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:258
+#: harddrake/sound.pm:282
 #, c-format
 msgid "No known driver"
 msgstr ""
 
-#: harddrake/sound.pm:259
+#: harddrake/sound.pm:283
 #, c-format
 msgid "There's no known driver for your sound card (%s)"
 msgstr ""
 
-#: harddrake/sound.pm:263
+#: harddrake/sound.pm:287
 #, c-format
 msgid "Unknown driver"
 msgstr ""
 
-#: harddrake/sound.pm:264
+#: harddrake/sound.pm:288
 #, c-format
 msgid "Error: The \"%s\" driver for your sound card is unlisted"
 msgstr ""
 
-#: harddrake/sound.pm:278
+#: harddrake/sound.pm:302
 #, c-format
 msgid "Sound trouble shooting"
 msgstr ""
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: harddrake/sound.pm:281
+#: harddrake/sound.pm:305
 #, c-format
 msgid ""
 "The classic bug sound tester is to run the following commands:\n"
@@ -3223,18 +3264,18 @@ msgid ""
 "- \"/sbin/fuser -v /dev/dsp\" will tell which program uses the sound card.\n"
 msgstr ""
 
-#: harddrake/sound.pm:307
+#: harddrake/sound.pm:331
 #, c-format
 msgid "Let me pick any driver"
 msgstr ""
 
-#: harddrake/sound.pm:310
+#: harddrake/sound.pm:334
 #, c-format
 msgid "Choosing an arbitrary driver"
 msgstr ""
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: harddrake/sound.pm:313
+#: harddrake/sound.pm:337
 #, c-format
 msgid ""
 "If you really think that you know which driver is the right one for your "
@@ -3245,9 +3286,9 @@ msgid ""
 msgstr ""
 
 #: harddrake/v4l.pm:14
-#, fuzzy, c-format
+#, c-format
 msgid "Auto-detect"
-msgstr "ใช้ auto detection"
+msgstr "ตรวจสอบอัตโนมัติ"
 
 #: harddrake/v4l.pm:72 harddrake/v4l.pm:235
 #, fuzzy, c-format
@@ -3317,8 +3358,8 @@ msgid ""
 "button will reboot your computer."
 msgstr ""
 
-#: help.pm:14 install_steps_gtk.pm:567 install_steps_interactive.pm:94
-#: install_steps_interactive.pm:745 standalone/drakautoinst:216
+#: help.pm:14 install_steps_gtk.pm:552 install_steps_interactive.pm:92
+#: install_steps_interactive.pm:731 standalone/drakautoinst:216
 #, c-format
 msgid "Accept"
 msgstr "ยอมรับ"
@@ -3328,16 +3369,17 @@ msgstr "ยอมรับ"
 msgid ""
 "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"
+"system administrator, the users you add at this point will not 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"
+"mistake could mean that your system will not 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"
+"lose some information, but you will not 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"
@@ -3358,28 +3400,28 @@ msgid ""
 "\n"
 "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"
+"you're interested in that feature (and do not 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:51 printer/printerdrake.pm:1488 printer/printerdrake.pm:1608
+#: help.pm:51 printer/printerdrake.pm:1595 printer/printerdrake.pm:1715
 #, 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
+#: help.pm:51 help.pm:431 help.pm:681 install_steps_gtk.pm:233
+#: install_steps_gtk.pm:689 interactive.pm:424 interactive/newt.pm:317
+#: network/netconnect.pm:278 network/tools.pm:182 printer/printerdrake.pm:3581
+#: standalone/drakTermServ:382 standalone/drakbackup:3946
+#: standalone/drakbackup:4040 standalone/drakbackup:4057
+#: standalone/drakbackup:4075 ugtk2.pm:506
 #, c-format
 msgid "Next"
 msgstr "Next"
 
 #: help.pm:51 help.pm:409 help.pm:431 help.pm:647 help.pm:722
-#: interactive.pm:371
+#: interactive.pm:385
 #, c-format
 msgid "Advanced"
 msgstr "Advanced"
@@ -3504,15 +3546,15 @@ msgstr "พัฒนาซอฟท์แวร์ (Development)"
 msgid "Graphical Environment"
 msgstr "การทำงานแบบกราฟฟิก"
 
-#: help.pm:146 install_steps_gtk.pm:242 install_steps_interactive.pm:646
+#: help.pm:146 install_steps_gtk.pm:231 install_steps_interactive.pm:642
 #, c-format
 msgid "Individual package selection"
 msgstr "Individual package selection"
 
 #: help.pm:146 help.pm:588
-#, fuzzy, c-format
+#, c-format
 msgid "Upgrade"
-msgstr "Update"
+msgstr "อัพเกรด"
 
 #: help.pm:146 install_steps_interactive.pm:600
 #, c-format
@@ -3547,7 +3589,8 @@ msgid ""
 "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\n"
 "security holes were discovered after this version of Mandrakelinux was\n"
-"finalized. If you don't know what a particular service is supposed to do or\n"
+"finalized. If you do not 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"
@@ -3566,19 +3609,20 @@ msgid ""
 "such a floppy."
 msgstr ""
 
-#: 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
+#: help.pm:180 help.pm:285 help.pm:313 help.pm:444 install_any.pm:792
+#: interactive.pm:149 modules/interactive.pm:71 standalone/drakbackup:2508
+#: standalone/draksec:54 standalone/harddrake2:306 standalone/net_applet:255
+#: ugtk2.pm:899 wizards.pm:156
 #, c-format
 msgid "No"
 msgstr "ไม่ต้อง"
 
-#: 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
+#: help.pm:180 help.pm:285 help.pm:444 install_any.pm:792 interactive.pm:149
+#: modules/interactive.pm:71 printer/printerdrake.pm:736
+#: standalone/drakbackup:2508 standalone/drakgw:287 standalone/drakgw:288
+#: standalone/drakgw:296 standalone/drakgw:306 standalone/draksec:55
+#: standalone/harddrake2:305 standalone/net_applet:259 ugtk2.pm:899
+#: wizards.pm:156
 #, c-format
 msgid "Yes"
 msgstr "ใช่"
@@ -3597,9 +3641,9 @@ msgid ""
 "manual is similar to the one used during installation."
 msgstr ""
 
-#: 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
+#: help.pm:186 help.pm:566 help.pm:855 install_steps_gtk.pm:607
+#: standalone/drakbackup:2333 standalone/drakbackup:2337
+#: standalone/drakbackup:2341 standalone/drakbackup:2345
 #, c-format
 msgid "Configure"
 msgstr "การปรับแต่ง"
@@ -3611,7 +3655,7 @@ msgid ""
 "time.\n"
 "\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"
+"each one of them carefully and uncheck those which are not needed at boot\n"
 "time.\n"
 "\n"
 "A short explanatory text will be displayed about a service when it is\n"
@@ -3619,7 +3663,8 @@ msgid ""
 "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 probably don't want to start any services which you don't need.\n"
+"server: you probably do not want to start any services which you do not "
+"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 ""
@@ -3641,7 +3686,7 @@ msgid ""
 "server which can be used by other machines on your local network as well."
 msgstr ""
 
-#: help.pm:217 install_steps_interactive.pm:887
+#: help.pm:217 install_steps_interactive.pm:873
 #, fuzzy, c-format
 msgid "Hardware clock set to GMT"
 msgstr "คุณต้องการให้เซ็ตนาฬิกาฮาร์ดแวร์เป็น GMT?"
@@ -3810,7 +3855,8 @@ msgid ""
 "\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"
+"this option. Be careful, because you will not 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"
@@ -3863,7 +3909,7 @@ msgstr "กำลังพาร์ติชั่น Custom disk"
 #, c-format
 msgid ""
 "There you are. Installation is now complete and your GNU/Linux system is\n"
-"ready to be used. Just click on \"%s\" to reboot the system. Don't forget\n"
+"ready to be used. Just click on \"%s\" to reboot the system. Do not 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"
 "boot-loader menu, giving you the choice of which operating system to start.\n"
@@ -3902,17 +3948,17 @@ msgstr ""
 msgid "Generate auto-install floppy"
 msgstr "สร้างfloppyสำหรับการติดตั้งแบบออโตเมติก"
 
-#: help.pm:409 install_steps_interactive.pm:1363
+#: help.pm:409 install_steps_interactive.pm:1328
 #, c-format
 msgid "Replay"
 msgstr "เรียกอีกครั้ง"
 
-#: help.pm:409 install_steps_interactive.pm:1363
+#: help.pm:409 install_steps_interactive.pm:1328
 #, c-format
 msgid "Automated"
 msgstr "อัตโนมัติ"
 
-#: help.pm:409 install_steps_interactive.pm:1366
+#: help.pm:409 install_steps_interactive.pm:1331
 #, c-format
 msgid "Save packages selection"
 msgstr "บันทึกกลุ่มแพ็คเก็จที่เลือก"
@@ -3926,12 +3972,13 @@ msgid ""
 "\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 don't have to reformat\n"
+"system (such as \"/\", \"/usr\" or \"/var\") but you do not have to "
+"reformat\n"
 "partitions containing data that you wish to keep (typically \"/home\").\n"
 "\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"
+"will not be able to recover it.\n"
 "\n"
 "Click on \"%s\" when you're ready to format the partitions.\n"
 "\n"
@@ -3942,11 +3989,11 @@ msgid ""
 "bad blocks on the disk."
 msgstr ""
 
-#: 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
+#: help.pm:431 install_steps_gtk.pm:388 interactive.pm:425
+#: interactive/newt.pm:316 printer/printerdrake.pm:3579
+#: standalone/drakTermServ:361 standalone/drakbackup:3906
+#: standalone/drakbackup:3945 standalone/drakbackup:4056
+#: standalone/drakbackup:4071 ugtk2.pm:504
 #, c-format
 msgid "Previous"
 msgstr "ก่อน"
@@ -3967,8 +4014,8 @@ msgid ""
 "the selected package(s), or \"%s\" to abort."
 msgstr ""
 
-#: help.pm:444 help.pm:588 install_steps_gtk.pm:401
-#: install_steps_interactive.pm:158 standalone/drakbackup:4098
+#: help.pm:444 help.pm:588 install_steps_gtk.pm:387
+#: install_steps_interactive.pm:156 standalone/drakbackup:4103
 #, c-format
 msgid "Install"
 msgstr "ติดตั้ง"
@@ -3982,7 +4029,7 @@ msgid ""
 "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 don't know what to choose, keep the default option. You'll be able\n"
+"If you do not 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"
@@ -4025,7 +4072,7 @@ msgid ""
 "floppy disk.\n"
 "\n"
 " * \"%s\": if your partition table is damaged, you can try to recover it\n"
-"using this option. Please be careful and remember that it doesn't always\n"
+"using this option. Please be careful and remember that it does not always\n"
 "work.\n"
 "\n"
 " * \"%s\": discards all changes and reloads the partition table that was\n"
@@ -4118,7 +4165,8 @@ msgstr ""
 #, c-format
 msgid ""
 "\"%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"
+"click on the \"%s\" button and choose another. If your country is not in "
+"the\n"
 "list shown, click on the \"%s\" button to get the complete country list."
 msgstr ""
 
@@ -4139,7 +4187,7 @@ msgid ""
 "\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"
+"scheme and user data will not 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"
@@ -4158,7 +4206,7 @@ msgid ""
 "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 don't match. In either case, this installation step\n"
+"country-set keyboard do not 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 shown a list of supported keyboards.\n"
@@ -4291,10 +4339,11 @@ msgid ""
 "characters long. Never write down the \"root\" password -- it makes it far\n"
 "too easy to compromise your system.\n"
 "\n"
-"One caveat: don't make the password too long or too complicated because you\n"
+"One caveat: do not make the password too long or too complicated because "
+"you\n"
 "must be able to remember it!\n"
 "\n"
-"The password won't be displayed on screen as you type it. To reduce the\n"
+"The password will not 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"
@@ -4303,7 +4352,7 @@ msgid ""
 "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 don't know which\n"
+"services, select the appropriate one for \"%s\". If you do not know which\n"
 "one to use, you should ask your network administrator.\n"
 "\n"
 "If you happen to have problems with remembering passwords, or if your\n"
@@ -4316,12 +4365,6 @@ msgstr ""
 msgid "authentication"
 msgstr "การตรวจสอบสิทธิ์การใช้งาน"
 
-#. -PO: keep this short or else the buttons will not fit in the window
-#: help.pm:722 install_steps_interactive.pm:1211
-#, c-format
-msgid "No password"
-msgstr "ไม่มีรหัสผ่าน"
-
 #: help.pm:725
 #, c-format
 msgid ""
@@ -4336,9 +4379,10 @@ msgid ""
 "\n"
 " * if a GRUB or LILO boot sector is found, it'll replace it with a new one.\n"
 "\n"
-"If DrakX can't determine where to place the boot sector, it'll ask you\n"
+"If DrakX can not 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"
+"Choosing \"%s\" will not install any boot loader. Use this option only if "
+"you\n"
 "know what you're doing."
 msgstr ""
 
@@ -4349,9 +4393,9 @@ msgid ""
 "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"
+" * \"%s\" -- which is an acronym for ``print, do not 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 don't have networked printers. (\"%s\"\n"
+"panic out of printer jams, and you do not have networked printers. (\"%s\"\n"
 "will handle only very simple network cases and is somewhat slow when used\n"
 "within networks.) It's recommended that you use \"pdq\" if this is your\n"
 "first experience with GNU/Linux.\n"
@@ -4366,7 +4410,7 @@ msgid ""
 "\"%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"
+"If you make a choice now, and later find that you do not like your printing\n"
 "system you may change it by running PrinterDrake from the Mandrakelinux\n"
 "Control Center and clicking on the \"%s\" button."
 msgstr ""
@@ -4376,7 +4420,7 @@ msgstr ""
 msgid "pdq"
 msgstr ""
 
-#: help.pm:765 printer/cups.pm:115 printer/data.pm:104
+#: help.pm:765 printer/cups.pm:115 printer/data.pm:118
 #, c-format
 msgid "CUPS"
 msgstr ""
@@ -4430,12 +4474,12 @@ msgstr ""
 #, c-format
 msgid ""
 "\"%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"
+"here. If you notice the sound card is not the one actually present on your\n"
 "system, you can click on the button and choose a different driver."
 msgstr ""
 
-#: help.pm:788 help.pm:855 install_steps_interactive.pm:1019
-#: install_steps_interactive.pm:1036
+#: help.pm:788 help.pm:855 install_steps_interactive.pm:1005
+#: install_steps_interactive.pm:1022
 #, c-format
 msgid "Sound card"
 msgstr "Sound card"
@@ -4454,7 +4498,7 @@ msgid ""
 "\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"
+"is not 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"
@@ -4470,18 +4514,18 @@ msgid ""
 "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'll be displayed\n"
-"here. If you notice the sound card isn't the one actually present on your\n"
+"here. If you notice the sound card is not 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"
+"configuration will be displayed. If you have a TV card and it is not\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 doesn't suit you, click on\n"
+"\"800x600\" or \"1024x768\" resolution. If that does not suit you, click on\n"
 "\"%s\" to reconfigure your graphical interface.\n"
 "\n"
 " * \"%s\": if you wish to configure your Internet or local network access,\n"
@@ -4510,12 +4554,12 @@ msgid ""
 "idea to review this setup."
 msgstr ""
 
-#: help.pm:855 install_steps_interactive.pm:978 standalone/drakclock:101
+#: help.pm:855 install_steps_interactive.pm:964 standalone/drakclock:100
 #, c-format
 msgid "Timezone"
 msgstr "โซนเวลา"
 
-#: help.pm:855 install_steps_interactive.pm:1052
+#: help.pm:855 install_steps_interactive.pm:1038
 #, c-format
 msgid "TV card"
 msgstr "TV card"
@@ -4530,35 +4574,36 @@ msgstr "Internal ISDN card"
 msgid "Graphical Interface"
 msgstr "ให้เป็นกราฟฟิคเมื่อเริ่มต้น"
 
-#: help.pm:855 install_steps_interactive.pm:1070 standalone/drakbackup:2030
-#, fuzzy, c-format
+#: help.pm:855 install_any.pm:1528 install_steps_interactive.pm:1056
+#: standalone/drakbackup:2036
+#, c-format
 msgid "Network"
-msgstr "Network interface"
+msgstr "ระบบเครือข่าย"
 
-#: help.pm:855 install_steps_interactive.pm:1085
+#: help.pm:855 install_steps_interactive.pm:1071
 #, fuzzy, c-format
 msgid "Proxies"
 msgstr "Profile: "
 
-#: help.pm:855 install_steps_interactive.pm:1096
-#, fuzzy, c-format
+#: help.pm:855 install_steps_interactive.pm:1082
+#, c-format
 msgid "Security Level"
-msgstr "เลือกระดับระบบรักษาความปลอดภัย"
+msgstr "ระดับความปลอดภัย"
 
-#: help.pm:855 install_steps_interactive.pm:1110
+#: help.pm:855 install_steps_interactive.pm:1096
 #, c-format
 msgid "Firewall"
 msgstr ""
 
-#: help.pm:855 install_steps_interactive.pm:1124
+#: help.pm:855 install_steps_interactive.pm:1110
 #, fuzzy, c-format
 msgid "Bootloader"
 msgstr "Bootloader ที่จะใช้"
 
-#: help.pm:855 install_steps_interactive.pm:1137 services.pm:195
-#, fuzzy, c-format
+#: help.pm:855 install_steps_interactive.pm:1123 services.pm:193
+#, c-format
 msgid "Services"
-msgstr "อุปกรณ์"
+msgstr "บริการ"
 
 #: help.pm:858
 #, fuzzy, c-format
@@ -4601,7 +4646,7 @@ msgstr "<- ก่อน"
 #: install2.pm:117
 #, c-format
 msgid ""
-"Can't access kernel modules corresponding to your kernel (file %s is "
+"Can not access kernel modules corresponding to your kernel (file %s is "
 "missing), this generally means your boot floppy in not in sync with the "
 "Installation medium (please create a newer boot floppy)"
 msgstr ""
@@ -4611,20 +4656,13 @@ msgstr ""
 msgid "You must also format %s"
 msgstr ""
 
-#: 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
+#: install_any.pm:376
 #, 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
+#: install_any.pm:379
 #, fuzzy, c-format
 msgid ""
 "The following media have been found and will be used during install: %s.\n"
@@ -4633,57 +4671,80 @@ msgid ""
 "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
+#: install_any.pm:388 printer/printerdrake.pm:2929
+#: printer/printerdrake.pm:2936 standalone/scannerdrake:182
+#: standalone/scannerdrake:190 standalone/scannerdrake:241
+#: standalone/scannerdrake:248
 #, c-format
 msgid "CD-ROM"
 msgstr "ซีดี-รอม"
 
-#: install_any.pm:420
+#: install_any.pm:388
 #, fuzzy, c-format
 msgid "Network (http)"
 msgstr "Network interface"
 
-#: install_any.pm:420
+#: install_any.pm:388
 #, fuzzy, c-format
 msgid "Network (ftp)"
 msgstr "Network interface"
 
-#: install_any.pm:464 standalone/drakbackup:112
+#: install_any.pm:436 standalone/drakbackup:112
 #, fuzzy, c-format
 msgid "No device found"
 msgstr "เครื่องพิมพ์โลคอล (ต่อติดกับตัวเครื่อง)"
 
-#: install_any.pm:468
+#: install_any.pm:440
 #, c-format
 msgid "Insert the CD"
 msgstr ""
 
-#: install_any.pm:492
+#: install_any.pm:445
+#, fuzzy, c-format
+msgid "Unable to mount CD-ROM"
+msgstr "ไม่สามารถ forkได้.%s"
+
+#: install_any.pm:468
 #, c-format
 msgid "Insert the CD 1 again"
 msgstr ""
 
-#: install_any.pm:502 install_any.pm:506
+#: install_any.pm:478 install_any.pm:482
 #, c-format
 msgid "URL of the mirror?"
 msgstr ""
 
-#: install_any.pm:532
+#: install_any.pm:515
 #, fuzzy, c-format
-msgid "Can't find hdlist file on this mirror"
+msgid ""
+"Can't find a package list file on this mirror. Make sure the location is "
+"correct."
 msgstr "Adapter %s: %s"
 
+#: install_any.pm:633
+#, c-format
+msgid ""
+"Change your Cd-Rom!\n"
+"Please insert the Cd-Rom labelled \"%s\" in your drive and press Ok when "
+"done."
+msgstr ""
+"เปลี่ยน  CD-ROM\n"
+"\n"
+"กรุณาใส่ CD-ROM \"%s\" และกด OK"
+
+#: install_any.pm:652
+#, fuzzy, c-format
+msgid "Copying in progress"
+msgstr "ค้นหาเจอบน port %s"
+
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: install_any.pm:713
+#: install_any.pm:783
 #, c-format
 msgid ""
 "You have selected the following server(s): %s\n"
 "\n"
 "\n"
-"These servers are activated by default. They don't have any known security\n"
+"These servers are activated by default. They do not have any known security\n"
 "issues, but some new ones could be found. In that case, you must make sure\n"
 "to upgrade as soon as possible.\n"
 "\n"
@@ -4692,7 +4753,7 @@ msgid ""
 msgstr ""
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: install_any.pm:736
+#: install_any.pm:806
 #, c-format
 msgid ""
 "The following packages will be removed to allow upgrading your system: %s\n"
@@ -4701,36 +4762,22 @@ msgid ""
 "Do you really want to remove these packages?\n"
 msgstr ""
 
-#: install_any.pm:1116
-#, c-format
-msgid "Insert a FAT formatted floppy in drive %s"
-msgstr "ให้ใส่แผ่นฟล้อปปี้ที่ format แบบ FAT ลงในไดรว์ %s"
-
-#: install_any.pm:1120
-#, c-format
-msgid "This floppy is not FAT formatted"
-msgstr "่แผ่นฟล้อปปี้นี้ ไม่ใช่ แบบFAT"
-
-#: install_any.pm:1132
-#, c-format
-msgid ""
-"To use this saved packages selection, boot installation with ``linux "
-"defcfg=floppy''"
-msgstr ""
-"To use this saved packages selection, boot installation with ``linux "
-"defcfg=floppy''"
-
-#: install_any.pm:1160 partition_table.pm:595
+#: install_any.pm:1214 partition_table.pm:603
 #, c-format
 msgid "Error reading file %s"
 msgstr "มีปัญหากับการอ่านข้อมูลในไฟล์ %s"
 
-#: install_any.pm:1361
+#: install_any.pm:1425
 #, fuzzy, c-format
-msgid "%s (was %s)"
-msgstr "Port"
+msgid "The following disk(s) were renamed:"
+msgstr "แพ็คเก็จเหล่านี้กำลังจะถูกติดตั้ง"
 
-#: install_any.pm:1396
+#: install_any.pm:1427
+#, c-format
+msgid "%s (previously named as %s)"
+msgstr ""
+
+#: install_any.pm:1465
 #, c-format
 msgid ""
 "An error occurred - no valid devices were found on which to create new "
@@ -4739,12 +4786,52 @@ msgstr ""
 "เกิดข้อผิดพลาดขึ้น - ไม่พบอุปกรณ์ที่ถูกต้องเพื่อจะสร้างระบบไฟล์ใหม่ "
 "โปรดตรวจสอบฮาร์ดแวร์ของท่านเพื่อแก้ไขปัญหานี้"
 
-#: install_gtk.pm:160
+#: install_any.pm:1509
+#, c-format
+msgid "HTTP"
+msgstr "HTTP"
+
+#: install_any.pm:1509
+#, fuzzy, c-format
+msgid "FTP"
+msgstr "gFTP"
+
+#: install_any.pm:1509
+#, c-format
+msgid "NFS"
+msgstr "NFS"
+
+#: install_any.pm:1532
+#, fuzzy, c-format
+msgid "Please choose a media"
+msgstr "กรุณาเลือก"
+
+#: install_any.pm:1564
+#, fuzzy, c-format
+msgid "Bad media %s"
+msgstr "อุปกรณ์ที่ถูกเพิ่มเข้ามา %s"
+
+#: install_any.pm:1576
+#, fuzzy, c-format
+msgid "File already exists. Overwrite it?"
+msgstr "ไฟล์มีอยู่แล้ว ต้องการใช้?"
+
+#: install_any.pm:1627
+#, fuzzy, c-format
+msgid "Can not make screenshots before partitioning"
+msgstr "โปรแกรมไม่สามารถเพิ่มพาร์ติชั่นได้อีก"
+
+#: install_any.pm:1634
+#, fuzzy, c-format
+msgid "Screenshots will be available after install in %s"
+msgstr "คุณสามารถเลือกภาษาอื่นซึ่งจะสามารถใช้ได้หลังติดตั้ง"
+
+#: install_gtk.pm:136
 #, fuzzy, c-format
 msgid "System installation"
 msgstr "การติดตั้ง SILO"
 
-#: install_gtk.pm:163
+#: install_gtk.pm:139
 #, fuzzy, c-format
 msgid "System configuration"
 msgstr "การคอนฟิก"
@@ -4772,7 +4859,7 @@ msgstr ""
 #: install_interactive.pm:67
 #, c-format
 msgid ""
-"You don't have a swap partition.\n"
+"You do not have a swap partition.\n"
 "\n"
 "Continue anyway?"
 msgstr ""
@@ -4928,14 +5015,14 @@ msgstr "ใช้ fdisk"
 #, c-format
 msgid ""
 "You can now partition %s.\n"
-"When you are done, don't forget to save using `w'"
+"When you are done, do not forget to save using `w'"
 msgstr ""
 "คุณสามารถพาร์ติชั่น %s เดี๋ยวนี้\n"
 "เมื่อเสร็จแล้วอย่าลืมบันทึกโดยใช้ `w'"
 
 #: install_interactive.pm:271
 #, c-format
-msgid "I can't find any room for installing"
+msgid "I can not find any room for installing"
 msgstr "ผมไม่สามารถหาพื้นที่ว่างเพื่อทำการติดตั้ง"
 
 #: install_interactive.pm:275
@@ -5287,10 +5374,10 @@ msgstr "http://www.mandrakelinux.com/en/101errata.php3"
 msgid "Duplicate mount point %s"
 msgstr "ทำซ้ำจุดเม้าท์ %s"
 
-#: install_steps.pm:477
+#: install_steps.pm:479
 #, c-format
 msgid ""
-"Some important packages didn't get installed properly.\n"
+"Some important packages did not get installed properly.\n"
 "Either your cdrom drive or your cdrom is defective.\n"
 "Check the cdrom on an installed computer using \"rpm -qpl media/main/*.rpm"
 "\"\n"
@@ -5300,7 +5387,7 @@ msgstr ""
 "กรุณาตรวจสอบ cdrom ในเครื่องคอมพิวเตอร์ที่มีการติดตั้งแล้ว\n"
 "โดยใช้ \"rpm -qpl media/main/*.rpm\"\n"
 
-#: install_steps.pm:603
+#: install_steps.pm:599
 #, c-format
 msgid "No floppy drive available"
 msgstr "ไม่มีไดรว์ฟล้อปปี็เหลืออยู่"
@@ -5310,7 +5397,7 @@ msgstr "ไม่มีไดรว์ฟล้อปปี็เหลืออ
 msgid "Entering step `%s'\n"
 msgstr "เข้าสู่ขั้นตอน `%s'\n"
 
-#: install_steps_gtk.pm:184
+#: install_steps_gtk.pm:177
 #, c-format
 msgid ""
 "Your system is low on resources. You may have some problem installing\n"
@@ -5322,93 +5409,94 @@ msgstr ""
 "Mandrakelinux  ถ้าเป็นเช่นนั้น กรุณาทดลองติดตั้งแบบ text \n"
 "กรุณากด F1 ขณะ boot จาก cdrom แล้วพิมพ์ text"
 
-#: install_steps_gtk.pm:235 install_steps_interactive.pm:628
+#: install_steps_gtk.pm:224 install_steps_interactive.pm:624
 #, c-format
 msgid "Package Group Selection"
 msgstr "เลือกกลุ่มแพ็คเก็จ"
 
-#: install_steps_gtk.pm:264 install_steps_interactive.pm:567
+#: install_steps_gtk.pm:250 install_steps_interactive.pm:567
 #, c-format
 msgid "Total size: %d / %d MB"
 msgstr "ขนาดรวม: %d / %d MB "
 
-#: install_steps_gtk.pm:309
+#: install_steps_gtk.pm:295
 #, c-format
 msgid "Bad package"
 msgstr "แพ็คเก็จชำรุด"
 
-#: install_steps_gtk.pm:311
-#, fuzzy, c-format
+#: install_steps_gtk.pm:297
+#, c-format
 msgid "Version: "
-msgstr "เวอร์ชั่น: %s\n"
+msgstr "เวอร์ชัน:"
 
-#: install_steps_gtk.pm:312
-#, fuzzy, c-format
+#: install_steps_gtk.pm:298
+#, c-format
 msgid "Size: "
-msgstr "ขนาด: %s"
+msgstr "ขนาด:"
 
-#: install_steps_gtk.pm:312
+#: install_steps_gtk.pm:298
 #, fuzzy, c-format
 msgid "%d KB\n"
 msgstr "ขนาด: %d KB\n"
 
-#: install_steps_gtk.pm:313
-#, fuzzy, c-format
+#: install_steps_gtk.pm:299
+#, c-format
 msgid "Importance: "
-msgstr "ความสำคัญ: %s\n"
+msgstr "ความสำคัญ:"
 
-#: install_steps_gtk.pm:346
+#: install_steps_gtk.pm:332
 #, c-format
-msgid "You can't select/unselect this package"
+msgid "You can not select/unselect this package"
 msgstr "คุณไม่สามารถเลือก/ไม่เลือกแพกเกจนี้"
 
-#: install_steps_gtk.pm:350
+#: install_steps_gtk.pm:336
 #, fuzzy, c-format
 msgid "due to missing %s"
 msgstr "ไม่มี kdesu "
 
-#: install_steps_gtk.pm:351
+#: install_steps_gtk.pm:337
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr ""
 
-#: install_steps_gtk.pm:352
+#: install_steps_gtk.pm:338
 #, c-format
 msgid "trying to promote %s"
 msgstr ""
 
-#: install_steps_gtk.pm:353
+#: install_steps_gtk.pm:339
 #, c-format
 msgid "in order to keep %s"
 msgstr ""
 
-#: install_steps_gtk.pm:358
+#: install_steps_gtk.pm:344
 #, c-format
 msgid ""
-"You can't select this package as there is not enough space left to install it"
+"You can not select this package as there is not enough space left to install "
+"it"
 msgstr "คุณไม่สามารถเลือก package นี้เนื่องจากคุณมีพื้นที่ไม่เพียงพอ"
 
-#: install_steps_gtk.pm:361
+#: install_steps_gtk.pm:347
 #, c-format
 msgid "The following packages are going to be installed"
 msgstr "แพ็คเก็จเหล่านี้กำลังจะถูกติดตั้ง"
 
-#: install_steps_gtk.pm:362
+#: install_steps_gtk.pm:348
 #, c-format
 msgid "The following packages are going to be removed"
 msgstr "แพ็คเก็จเหล่านี้กำลังจะถูกลบ"
 
-#: install_steps_gtk.pm:386
+#: install_steps_gtk.pm:372
 #, c-format
-msgid "This is a mandatory package, it can't be unselected"
+msgid "This is a mandatory package, it can not be unselected"
 msgstr "นี่คือแพกเกจที่ต้องติดตั้ง ไม่สามารถไม่เลือก"
 
-#: install_steps_gtk.pm:388
+#: install_steps_gtk.pm:374
 #, c-format
-msgid "You can't unselect this package. It is already installed"
+msgid "You can not unselect this package. It is already installed"
 msgstr "คุณไม่สามารถไม่เลือกแพกเกจนี้เพราะมันได้ถูกติดตั้งไปแล้ว"
 
-#: install_steps_gtk.pm:391
+#: install_steps_gtk.pm:377
 #, c-format
 msgid ""
 "This package must be upgraded.\n"
@@ -5417,320 +5505,329 @@ msgstr ""
 "แพกเกจนี้จำเป็นต้องถูก upgrade\n"
 "คุณแน่ใจว่าจะไม่เลือกมันหรือ"
 
-#: install_steps_gtk.pm:394
+#: install_steps_gtk.pm:380
 #, c-format
-msgid "You can't unselect this package. It must be upgraded"
+msgid "You can not unselect this package. It must be upgraded"
 msgstr "คุณไม่สามารถไม่เลือกแพกเกจนี้  มันจำเป็นที่จะต้องถูก upgrade"
 
-#: install_steps_gtk.pm:399
+#: install_steps_gtk.pm:385
 #, c-format
 msgid "Show automatically selected packages"
 msgstr ""
 
-#: install_steps_gtk.pm:404
+#: install_steps_gtk.pm:390
 #, fuzzy, c-format
-msgid "Load/Save on floppy"
-msgstr "บันทึกลงแผ่นฟล้อปปี้"
+msgid "Load/Save selection"
+msgstr "เลือกกลุ่มแพ็คเก็จ"
 
-#: install_steps_gtk.pm:405
+#: install_steps_gtk.pm:391
 #, fuzzy, c-format
 msgid "Updating package selection"
 msgstr "บันทึกกลุ่มแพ็คเก็จที่เลือก"
 
-#: install_steps_gtk.pm:410
+#: install_steps_gtk.pm:396
 #, fuzzy, c-format
 msgid "Minimal install"
 msgstr "ออกจากการติดตั้ง"
 
-#: install_steps_gtk.pm:424 install_steps_interactive.pm:481
+#: install_steps_gtk.pm:410 install_steps_interactive.pm:483
 #, c-format
 msgid "Choose the packages you want to install"
 msgstr "เลือกแพ็คเก็จที่คุณต้องการติดตั้ง"
 
-#: install_steps_gtk.pm:440 install_steps_interactive.pm:720
+#: install_steps_gtk.pm:426 install_steps_interactive.pm:706
 #, c-format
 msgid "Installing"
 msgstr "กำลังติดตั้ง"
 
-#: install_steps_gtk.pm:447
+#: install_steps_gtk.pm:433
 #, c-format
 msgid "Estimating"
 msgstr "การประเมิน"
 
-#: install_steps_gtk.pm:453
+#: install_steps_gtk.pm:482
+#, fuzzy, c-format
+msgid "No details"
+msgstr "รายละเอียด"
+
+#: install_steps_gtk.pm:490
 #, c-format
 msgid "Time remaining "
 msgstr "เวลาที่เหลือ "
 
-#: install_steps_gtk.pm:464
+#: install_steps_gtk.pm:497
 #, c-format
 msgid "Please wait, preparing installation..."
 msgstr "กำลังเตรียมการติดตั้ง"
 
-#: install_steps_gtk.pm:474
-#, fuzzy, c-format
-msgid "No details"
-msgstr "รายละเอียด"
-
-#: install_steps_gtk.pm:527
+#: install_steps_gtk.pm:512
 #, c-format
 msgid "%d packages"
 msgstr "แพ็คเก็จ %d ชุด"
 
-#: install_steps_gtk.pm:532
+#: install_steps_gtk.pm:517
 #, c-format
 msgid "Installing package %s"
 msgstr "กำลังติดตั้งแพ็คเก็จ %s"
 
-#: install_steps_gtk.pm:567 install_steps_interactive.pm:94
-#: install_steps_interactive.pm:745
+#: install_steps_gtk.pm:552 install_steps_interactive.pm:92
+#: install_steps_interactive.pm:731
 #, c-format
 msgid "Refuse"
 msgstr "ไม่ยอมรับ"
 
-#: install_steps_gtk.pm:571 install_steps_interactive.pm:749
-#, fuzzy, c-format
+#: install_steps_gtk.pm:556 install_steps_interactive.pm:735
+#, c-format
 msgid ""
 "Change your Cd-Rom!\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."
+"If you do not have it, press Cancel to avoid installation from this Cd-Rom."
 msgstr ""
 "เปลี่ยน  CD-ROM\n"
 "\n"
 "กรุณาใส่ CD-ROM \"%s\" และกด OK\n"
 "ถ้่าคุณไม่มี กรุณากด ยกเลิก (cancel) เพื่อหลีกเลี่ยงการติดตั้งจาก CD-ROM นี้"
 
-#: install_steps_gtk.pm:586 install_steps_interactive.pm:760
+#: install_steps_gtk.pm:571 install_steps_interactive.pm:746
 #, c-format
 msgid "There was an error ordering packages:"
 msgstr "มีปัญหาการลำดับของแพ็คเก็จ:"
 
-#: install_steps_gtk.pm:586 install_steps_gtk.pm:590
-#: install_steps_interactive.pm:760 install_steps_interactive.pm:764
+#: install_steps_gtk.pm:571 install_steps_gtk.pm:575
+#: install_steps_interactive.pm:746 install_steps_interactive.pm:750
 #, c-format
 msgid "Go on anyway?"
 msgstr "ทำงานต่อหรือไม่?"
 
-#: install_steps_gtk.pm:590 install_steps_interactive.pm:764
+#: install_steps_gtk.pm:575 install_steps_interactive.pm:750
 #, c-format
 msgid "There was an error installing packages:"
 msgstr "มีปัญหาการติดตั้งของแพ็คเก็จ:"
 
-#: install_steps_gtk.pm:632 install_steps_interactive.pm:934
-#: install_steps_interactive.pm:1086
+#: install_steps_gtk.pm:617 install_steps_interactive.pm:920
+#: install_steps_interactive.pm:1072
 #, fuzzy, c-format
 msgid "not configured"
 msgstr "คอนฟิกใหม่"
 
-#: install_steps_interactive.pm:86
-#, fuzzy, c-format
-msgid "Do you want to recover your system?"
-msgstr "คุณต้องการใช้ aboot หรือไม่"
+#: install_steps_gtk.pm:680
+#, c-format
+msgid ""
+"The following installation media have been found.\n"
+"If you want to skip some of them, you can unselect them now."
+msgstr ""
+
+#: install_steps_gtk.pm:684
+#, c-format
+msgid ""
+"You have the option to copy the contents of the CDs onto the hard drive "
+"before installation.\n"
+"It will then continue from the hard drive and the packages will remain "
+"available once the system is fully installed."
+msgstr ""
 
-#: install_steps_interactive.pm:87
+#: install_steps_gtk.pm:686
+#, c-format
+msgid "Copy whole CDs"
+msgstr ""
+
+#: install_steps_interactive.pm:85
 #, c-format
 msgid "License agreement"
 msgstr "License agreement"
 
-#: install_steps_interactive.pm:91
+#: install_steps_interactive.pm:89
 #, fuzzy, c-format
 msgid "Release Notes"
 msgstr "โปรดรอสักครู่"
 
-#: install_steps_interactive.pm:121
+#: install_steps_interactive.pm:119
 #, fuzzy, c-format
 msgid "Please choose your keyboard layout."
 msgstr "คุณต้องการเลือกคีย์บอร์ดเลย์เอ้าท์แบบใด "
 
-#: install_steps_interactive.pm:123
+#: install_steps_interactive.pm:121
 #, fuzzy, c-format
 msgid "Here is the full list of available keyboards"
 msgstr "ต่อไปนี้คือ keyboard ที่ใช้ได้"
 
-#: install_steps_interactive.pm:153
+#: install_steps_interactive.pm:151
 #, fuzzy, c-format
 msgid "Install/Upgrade"
 msgstr "ติดตั้ง/อัพเกรด "
 
-#: install_steps_interactive.pm:154
+#: install_steps_interactive.pm:152
 #, fuzzy, c-format
 msgid "Is this an install or an upgrade?"
 msgstr "นี่เป็นการติดตั้งหรือการอัพเกรด"
 
-#: install_steps_interactive.pm:160
+#: install_steps_interactive.pm:158
 #, fuzzy, c-format
 msgid "Upgrade %s"
 msgstr "Update"
 
-#: install_steps_interactive.pm:170
+#: install_steps_interactive.pm:168
 #, fuzzy, c-format
 msgid "Encryption key for %s"
 msgstr "รหัสผ่านไม่เหมือนกัน"
 
-#: install_steps_interactive.pm:187
+#: install_steps_interactive.pm:185
 #, fuzzy, c-format
 msgid "Please choose your type of mouse."
 msgstr "คุณมีเม้าส์ชนิดใด"
 
-#: install_steps_interactive.pm:196 standalone/mousedrake:46
+#: install_steps_interactive.pm:194 standalone/mousedrake:46
 #, c-format
 msgid "Mouse Port"
 msgstr "พอร์ตของเม้าส์"
 
-#: install_steps_interactive.pm:197 standalone/mousedrake:47
+#: install_steps_interactive.pm:195 standalone/mousedrake:47
 #, c-format
 msgid "Please choose which serial port your mouse is connected to."
 msgstr "เม้าส์ของคุณต่อเข้ากับพอร์ตอนุกรมใด"
 
-#: install_steps_interactive.pm:207
+#: install_steps_interactive.pm:205
 #, c-format
 msgid "Buttons emulation"
 msgstr ""
 
-#: install_steps_interactive.pm:209
+#: install_steps_interactive.pm:207
 #, c-format
 msgid "Button 2 Emulation"
 msgstr ""
 
-#: install_steps_interactive.pm:210
+#: install_steps_interactive.pm:208
 #, c-format
 msgid "Button 3 Emulation"
 msgstr ""
 
-#: install_steps_interactive.pm:231
+#: install_steps_interactive.pm:229
 #, c-format
 msgid "PCMCIA"
 msgstr "PCMCIA"
 
-#: install_steps_interactive.pm:231
+#: install_steps_interactive.pm:229
 #, c-format
 msgid "Configuring PCMCIA cards..."
 msgstr "กำลังคอนฟิกการ์ด PCMCIA..."
 
-#: install_steps_interactive.pm:238
+#: install_steps_interactive.pm:236
 #, c-format
 msgid "IDE"
 msgstr "IDE"
 
-#: install_steps_interactive.pm:238
+#: install_steps_interactive.pm:236
 #, c-format
 msgid "Configuring IDE"
 msgstr "คอนฟิก IDE"
 
-#: install_steps_interactive.pm:258 network/tools.pm:187
+#: install_steps_interactive.pm:256 network/tools.pm:172
 #, c-format
 msgid "No partition available"
 msgstr "ไม่มีพาร์ติชั่นเหลือ"
 
-#: install_steps_interactive.pm:261
+#: install_steps_interactive.pm:259
 #, c-format
 msgid "Scanning partitions to find mount points"
 msgstr "Scanning partitions to find mount points"
 
-#: install_steps_interactive.pm:268
+#: install_steps_interactive.pm:266
 #, c-format
 msgid "Choose the mount points"
 msgstr "เลือกจุดเม้าท์"
 
-#: install_steps_interactive.pm:300
+#: install_steps_interactive.pm:312
 #, 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:337
+#: install_steps_interactive.pm:317
+#, c-format
+msgid ""
+"You'll need to create a PPC PReP Boot bootstrap! Install will continue, but "
+"to boot your system, you'll need to create the bootstrap partition in "
+"DiskDrake"
+msgstr ""
+
+#: install_steps_interactive.pm:353
 #, c-format
 msgid "Choose the partitions you want to format"
 msgstr "เลือกพาร์ติชั่นที่คุณต้องการฟอร์แมต"
 
-#: install_steps_interactive.pm:339
+#: install_steps_interactive.pm:355
 #, c-format
 msgid "Check bad blocks?"
 msgstr "ตรวจสอบ bad blocks"
 
-#: install_steps_interactive.pm:371
+#: install_steps_interactive.pm:383
 #, 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:374
+#: install_steps_interactive.pm:386
 #, c-format
 msgid "Not enough swap space to fulfill installation, please add some"
 msgstr "ไม่มีพื้นที่สวอปเพียงพอกับการติดตั้ง โปรดเพิ่มเนื้อที่"
 
-#: install_steps_interactive.pm:381
+#: install_steps_interactive.pm:393
 #, fuzzy, c-format
 msgid "Looking for available packages and rebuilding rpm database..."
 msgstr "กำลังหาแพ็คเก็จที่มีอยู่"
 
-#: install_steps_interactive.pm:382 install_steps_interactive.pm:442
+#: install_steps_interactive.pm:394 install_steps_interactive.pm:452
 #, c-format
 msgid "Looking for available packages..."
 msgstr "กำลังหาแพ็คเก็จที่มีอยู่"
 
-#: install_steps_interactive.pm:385
+#: install_steps_interactive.pm:397
 #, fuzzy, c-format
 msgid "Looking at packages already installed..."
 msgstr "คุณไม่สามารถไม่เลือกแพกเกจนี้เพราะมันได้ถูกติดตั้งไปแล้ว"
 
-#: install_steps_interactive.pm:389
+#: install_steps_interactive.pm:401
 #, c-format
 msgid "Finding packages to upgrade..."
 msgstr "กำลังหาแพ็คเก็จที่จะทำการอัพเกรด"
 
-#: 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
+#: install_steps_interactive.pm:421 install_steps_interactive.pm:825
 #, c-format
 msgid "Choose a mirror from which to get the packages"
 msgstr "เลือกมิลเรอร์ไซต์ที่จะใช้ในการดาวน์โหลดแพ็คเก็จ"
 
-#: install_steps_interactive.pm:451
+#: install_steps_interactive.pm:461
 #, 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:493
+#: install_steps_interactive.pm:495
 #, c-format
 msgid ""
-"Please choose load or save package selection on floppy.\n"
-"The format is the same as auto_install generated floppies."
+"Please choose load or save package selection.\n"
+"The format is the same as auto_install generated files."
 msgstr ""
 
-#: install_steps_interactive.pm:495
-#, fuzzy, c-format
-msgid "Load from floppy"
-msgstr "เรียกคืนจากแผ่นฟล้อปปี้"
-
-#: install_steps_interactive.pm:495
+#: install_steps_interactive.pm:497
 #, c-format
-msgid "Save on floppy"
-msgstr "บันทึกลงแผ่นฟล้อปปี้"
+msgid "Load"
+msgstr "โหลด"
 
-#: install_steps_interactive.pm:499
-#, fuzzy, c-format
-msgid "Package selection"
-msgstr "เลือกกลุ่มแพ็คเก็จ"
+#: install_steps_interactive.pm:497 standalone/drakbackup:3924
+#: standalone/drakbackup:3997 standalone/logdrake:173
+#, c-format
+msgid "Save"
+msgstr "บันทึก"
 
-#: install_steps_interactive.pm:499
+#: install_steps_interactive.pm:505
 #, fuzzy, c-format
-msgid "Loading from floppy"
-msgstr "เรียกคืนจากแผ่นฟล้อปปี้"
-
-#: install_steps_interactive.pm:504
-#, fuzzy, c-format
-msgid "Insert a floppy containing package selection"
-msgstr "ให้ใส่แผ่นฟล้อปปี้ลงในไดรว์ %s"
+msgid "Bad file"
+msgstr "เปิดแฟ้ม"
 
 #: install_steps_interactive.pm:581
 #, c-format
@@ -5745,7 +5842,7 @@ msgstr ""
 #: install_steps_interactive.pm:597
 #, c-format
 msgid ""
-"You haven't selected any group of packages.\n"
+"You have not selected any group of packages.\n"
 "Please choose the minimal installation you want:"
 msgstr ""
 
@@ -5759,12 +5856,12 @@ msgstr ""
 msgid "Truly minimal install (especially no urpmi)"
 msgstr ""
 
-#: install_steps_interactive.pm:645 standalone/drakxtv:52
+#: install_steps_interactive.pm:641 standalone/drakxtv:52
 #, c-format
 msgid "All"
 msgstr "ทั้งหมด"
 
-#: install_steps_interactive.pm:694
+#: install_steps_interactive.pm:680
 #, c-format
 msgid ""
 "If you have all the CDs in the list below, click Ok.\n"
@@ -5775,17 +5872,17 @@ msgstr ""
 "ถ้าไม่มีเลย กด ยกเลิก (cancel)\n"
 "ถ้ามีแค่บางแผ่น เลือกเท่าที่มีแล้วกด OK"
 
-#: install_steps_interactive.pm:699
+#: install_steps_interactive.pm:685
 #, c-format
 msgid "Cd-Rom labeled \"%s\""
 msgstr "Cd-Rom labeled \"%s\""
 
-#: install_steps_interactive.pm:720
+#: install_steps_interactive.pm:706
 #, c-format
 msgid "Preparing installation"
 msgstr "กำลังเตรียมการติดตั้ง"
 
-#: install_steps_interactive.pm:729
+#: install_steps_interactive.pm:715
 #, c-format
 msgid ""
 "Installing package %s\n"
@@ -5794,17 +5891,17 @@ msgstr ""
 "กำลังติดตั้งแพ็คเก็จ %s\n"
 "%d%%"
 
-#: install_steps_interactive.pm:778
+#: install_steps_interactive.pm:764
 #, c-format
 msgid "Post-install configuration"
 msgstr "การคอนฟิกหลังการติดตั้ง"
 
-#: install_steps_interactive.pm:784
+#: install_steps_interactive.pm:770
 #, fuzzy, c-format
 msgid "Please insert the Update Modules floppy in drive %s"
 msgstr "ให้ใส่แผ่นฟล้อปปี้ลงในไดรว์ %s "
 
-#: install_steps_interactive.pm:813
+#: install_steps_interactive.pm:799
 #, c-format
 msgid ""
 "You now have the opportunity to download updated packages. These packages\n"
@@ -5817,176 +5914,161 @@ msgid ""
 "Do you want to install the updates?"
 msgstr ""
 
-#: install_steps_interactive.pm:853
+#: install_steps_interactive.pm:820
+#, fuzzy, c-format
+msgid ""
+"Contacting Mandrakelinux web site to get the list of available mirrors..."
+msgstr "กำลังติดต่อกับมิลเรอร์ไซต์เพื่อหารายการของแพ็คเก็จที่มีให้"
+
+#: install_steps_interactive.pm:839
 #, c-format
 msgid "Contacting the mirror to get the list of available packages..."
 msgstr "กำลังติดต่อกับมิลเรอร์ไซต์เพื่อหารายการของแพ็คเก็จที่มีให้"
 
-#: install_steps_interactive.pm:857
+#: install_steps_interactive.pm:843
 #, fuzzy, c-format
 msgid "Unable to contact mirror %s"
 msgstr "ไม่สามารถ forkได้.%s"
 
-#: install_steps_interactive.pm:857
+#: install_steps_interactive.pm:843
 #, fuzzy, c-format
 msgid "Would you like to try again?"
 msgstr "คุณต้องการคอนฟิกเครื่องพิมพ์ด้วยหรือไม่"
 
-#: install_steps_interactive.pm:883 standalone/drakclock:46
+#: install_steps_interactive.pm:869 standalone/drakclock:45
 #, c-format
 msgid "Which is your timezone?"
 msgstr "คุณใช้ย่านเวลาใด? "
 
-#: install_steps_interactive.pm:888
+#: install_steps_interactive.pm:874
 #, c-format
 msgid "Automatic time synchronization (using NTP)"
 msgstr ""
 
-#: install_steps_interactive.pm:896
+#: install_steps_interactive.pm:882
 #, fuzzy, c-format
 msgid "NTP Server"
 msgstr "เซิร์ฟเวอร์ NIS"
 
-#: install_steps_interactive.pm:938 steps.pm:30
+#: install_steps_interactive.pm:924 steps.pm:30
 #, c-format
 msgid "Summary"
 msgstr "รวมความ"
 
-#: 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
+#: install_steps_interactive.pm:937 install_steps_interactive.pm:945
+#: install_steps_interactive.pm:963 install_steps_interactive.pm:970
+#: install_steps_interactive.pm:1122 services.pm:133
+#: standalone/drakbackup:1599
+#, c-format
 msgid "System"
-msgstr "System mode"
+msgstr "ระบบ"
 
-#: 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
+#: install_steps_interactive.pm:977 install_steps_interactive.pm:1004
+#: install_steps_interactive.pm:1021 install_steps_interactive.pm:1037
+#: install_steps_interactive.pm:1048
 #, c-format
 msgid "Hardware"
 msgstr "ฮาร์ดแวร์"
 
-#: install_steps_interactive.pm:997 install_steps_interactive.pm:1006
+#: install_steps_interactive.pm:983 install_steps_interactive.pm:992
 #, c-format
 msgid "Remote CUPS server"
 msgstr "Remote CUPS server"
 
-#: install_steps_interactive.pm:997
+#: install_steps_interactive.pm:983
 #, c-format
 msgid "No printer"
 msgstr "ไม่มีเครื่องพิมพ์"
 
-#: install_steps_interactive.pm:1039
+#: install_steps_interactive.pm:1025
 #, fuzzy, c-format
 msgid "Do you have an ISA sound card?"
 msgstr "คุณมีอันอื่นๆอีกหรือไม่?"
 
-#: install_steps_interactive.pm:1041
+#: install_steps_interactive.pm:1027
 #, c-format
 msgid ""
 "Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
 "card"
 msgstr ""
 
-#: install_steps_interactive.pm:1043
+#: install_steps_interactive.pm:1029
 #, c-format
 msgid "No sound card detected. Try \"harddrake\" after installation"
 msgstr ""
 
-#: install_steps_interactive.pm:1063
+#: install_steps_interactive.pm:1049
 #, fuzzy, c-format
 msgid "Graphical interface"
 msgstr "ให้เป็นกราฟฟิคเมื่อเริ่มต้น"
 
-#: install_steps_interactive.pm:1069 install_steps_interactive.pm:1084
-#, fuzzy, c-format
+#: install_steps_interactive.pm:1055 install_steps_interactive.pm:1070
+#, c-format
 msgid "Network & Internet"
-msgstr "Network interface"
+msgstr "เน็ตเวิร์คกับอินเตอร์เน็ต"
 
-#: install_steps_interactive.pm:1086
+#: install_steps_interactive.pm:1072
 #, fuzzy, c-format
 msgid "configured"
 msgstr "คอนฟิกใหม่"
 
-#: install_steps_interactive.pm:1095 install_steps_interactive.pm:1109
+#: install_steps_interactive.pm:1081 install_steps_interactive.pm:1095
 #: steps.pm:20
 #, c-format
 msgid "Security"
 msgstr "ระบบความป้องกัน"
 
-#: install_steps_interactive.pm:1114
+#: install_steps_interactive.pm:1100
 #, fuzzy, c-format
 msgid "activated"
 msgstr "แอ็คทีฟ"
 
-#: install_steps_interactive.pm:1114
-#, fuzzy, c-format
+#: install_steps_interactive.pm:1100
+#, c-format
 msgid "disabled"
-msgstr "disable"
+msgstr "ไม่ใช้งาน"
 
-#: install_steps_interactive.pm:1123
-#, fuzzy, c-format
+#: install_steps_interactive.pm:1109
+#, c-format
 msgid "Boot"
-msgstr "Root"
+msgstr "บู๊ต"
 
 #. -PO: example: lilo-graphic on /dev/hda1
-#: install_steps_interactive.pm:1127
-#, fuzzy, c-format
+#: install_steps_interactive.pm:1113
+#, c-format
 msgid "%s on %s"
-msgstr "Port"
+msgstr "%s บน %s"
 
-#: install_steps_interactive.pm:1141 services.pm:177
+#: install_steps_interactive.pm:1127 services.pm:175
 #, c-format
 msgid "Services: %d activated for %d registered"
 msgstr ""
 
-#: install_steps_interactive.pm:1151
+#: install_steps_interactive.pm:1137
 #, c-format
 msgid "You have not configured X. Are you sure you really want this?"
 msgstr ""
 
-#: install_steps_interactive.pm:1205
-#, c-format
-msgid "Set root password and network authentication methods"
-msgstr ""
-
-#: install_steps_interactive.pm:1206
-#, c-format
-msgid "Set root password"
-msgstr "เซ็ตรหัสผ่านรูท"
-
 #: 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:1222 network/netconnect.pm:596
-#: standalone/drakauth:25 standalone/drakauth:27 standalone/drakconnect:457
-#, c-format
-msgid "Authentication"
-msgstr "การตรวจสอบสิทธิ์การใช้งาน"
-
-#: install_steps_interactive.pm:1254
-#, c-format
 msgid "Preparing bootloader..."
 msgstr "กำลังเตรียมบูตโหลดเดอร์"
 
-#: install_steps_interactive.pm:1264
+#: install_steps_interactive.pm:1227
 #, c-format
 msgid ""
-"You appear to have an OldWorld or Unknown\n"
-" machine, the yaboot bootloader will not work for you.\n"
-"The install will continue, but you'll\n"
-" need to use BootX or some other means to boot your machine"
+"You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
+"will not work for you. The install will continue, but you'll need to use "
+"BootX or some other means to boot your machine. The kernel argument for the "
+"root fs is: root=%s"
 msgstr ""
 
-#: install_steps_interactive.pm:1270
+#: install_steps_interactive.pm:1233
 #, c-format
 msgid "Do you want to use aboot?"
 msgstr "คุณต้องการใช้ aboot หรือไม่"
 
-#: install_steps_interactive.pm:1273
+#: install_steps_interactive.pm:1236
 #, c-format
 msgid ""
 "Error installing aboot, \n"
@@ -5995,29 +6077,29 @@ msgstr ""
 "การติดตั้ง aboot ล้มเหลว\n"
 "พยายามติดตั้งถึงแม้พาติชั่นแรกอาจจะเสียหาย?"
 
-#: install_steps_interactive.pm:1294
+#: install_steps_interactive.pm:1257
 #, 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:1322 standalone/drakautoinst:76
+#: install_steps_interactive.pm:1286 standalone/drakautoinst:76
 #, c-format
 msgid "Insert a blank floppy in drive %s"
 msgstr "ให้ใส่แผ่นฟล้อปปี้ลงในไดรว์ %s "
 
-#: install_steps_interactive.pm:1327
+#: install_steps_interactive.pm:1291
 #, fuzzy, c-format
 msgid "Please insert another floppy for drivers disk"
 msgstr "ให้ใส่แผ่นฟล้อปปี้ลงในไดรว์ %s"
 
-#: install_steps_interactive.pm:1329
+#: install_steps_interactive.pm:1293
 #, c-format
 msgid "Creating auto install floppy..."
 msgstr "กำลังเตรียมการติดตั้งลงบน floppy"
 
-#: install_steps_interactive.pm:1341
+#: install_steps_interactive.pm:1305
 #, c-format
 msgid ""
 "Some steps are not completed.\n"
@@ -6028,12 +6110,12 @@ msgstr ""
 "\n"
 "คุณต้องการออกจากการติดตั้งจริงๆหรือไม่?"
 
-#: install_steps_interactive.pm:1356
+#: install_steps_interactive.pm:1321
 #, c-format
 msgid "Generate auto install floppy"
 msgstr "สร้างfloppyสำหรับการติดตั้งแบบออโตเมติก"
 
-#: install_steps_interactive.pm:1358
+#: install_steps_interactive.pm:1323
 #, c-format
 msgid ""
 "The auto install can be fully automated if wanted,\n"
@@ -6059,37 +6141,37 @@ msgid ""
 "  <Tab>/<Alt-Tab> between elements  | <Space> selects | <F12> next screen "
 msgstr "  <Tab>/<Alt-Tab> ระหว่างตัวเลือก | <Space> เลือก | <F12> หน้าถัดไป "
 
-#: interactive.pm:170
+#: interactive.pm:184
 #, fuzzy, c-format
 msgid "Choose a file"
 msgstr "เลือกกิจกรรม"
 
-#: interactive.pm:295 interactive/gtk.pm:482 standalone/drakbackup:1534
-#: standalone/drakfont:592 standalone/drakfont:659 standalone/drakups:297
+#: interactive.pm:309 interactive/gtk.pm:489 standalone/drakbackup:1540
+#: standalone/drakfont:593 standalone/drakfont:660 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
+#: interactive.pm:309 interactive/gtk.pm:489
+#, c-format
 msgid "Modify"
-msgstr "แก้ไข RAID"
+msgstr "แก้ไข"
 
-#: interactive.pm:295 interactive/gtk.pm:482 standalone/drakups:299
+#: interactive.pm:309 interactive/gtk.pm:489 standalone/drakups:299
 #: standalone/drakups:359 standalone/drakups:379 standalone/drakvpn:333
 #: standalone/drakvpn:694
-#, fuzzy, c-format
+#, c-format
 msgid "Remove"
-msgstr "เครื่องพิมพ์แบบรีโมท"
+msgstr "เอาออก"
 
-#: interactive.pm:372
+#: interactive.pm:386
 #, c-format
 msgid "Basic"
-msgstr ""
+msgstr "พื้นฐาน"
 
-#: interactive.pm:403 interactive/newt.pm:317 ugtk2.pm:515
+#: interactive.pm:424 interactive/newt.pm:317 ugtk2.pm:506
 #, c-format
 msgid "Finish"
 msgstr "เสร็จแล้ว"
@@ -6166,765 +6248,870 @@ msgstr ""
 msgid "Re-submit"
 msgstr ""
 
-#: keyboard.pm:163 keyboard.pm:194
+#: keyboard.pm:170 keyboard.pm:204
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Czech (QWERTZ)"
 msgstr "เชคโกสโลวาเกีย (QWERTZ)"
 
-#: keyboard.pm:164 keyboard.pm:196
+#: keyboard.pm:171 keyboard.pm:206
 #, c-format
 msgid ""
 "_: keyboard\n"
 "German"
 msgstr "เยอรมัน"
 
-#: keyboard.pm:165
+#: keyboard.pm:172
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak"
 msgstr "Dvorak"
 
-#: keyboard.pm:166 keyboard.pm:206
+#: keyboard.pm:173 keyboard.pm:223
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Spanish"
 msgstr "สเปน"
 
-#: keyboard.pm:167 keyboard.pm:207
+#: keyboard.pm:174 keyboard.pm:224
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Finnish"
 msgstr "ฟินแลนด์"
 
-#: keyboard.pm:168 keyboard.pm:208
+#: keyboard.pm:175 keyboard.pm:227
 #, c-format
 msgid ""
 "_: keyboard\n"
 "French"
 msgstr "ฝรั่งเศษ"
 
-#: keyboard.pm:169 keyboard.pm:254
+#: keyboard.pm:176 keyboard.pm:275
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Norwegian"
 msgstr "นอร์เวย์"
 
-#: keyboard.pm:170
+#: keyboard.pm:177
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Polish"
 msgstr "โปแลนด์"
 
-#: keyboard.pm:171 keyboard.pm:264
+#: keyboard.pm:178 keyboard.pm:287
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Russian"
 msgstr "รัสเซีย"
 
-#: keyboard.pm:173 keyboard.pm:268
+#: keyboard.pm:180 keyboard.pm:293
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Swedish"
 msgstr "สวีเดน"
 
-#: keyboard.pm:174 keyboard.pm:287
+#: keyboard.pm:181 keyboard.pm:320
 #, c-format
 msgid "UK keyboard"
 msgstr "อังกฤษ"
 
-#: keyboard.pm:175 keyboard.pm:288
+#: keyboard.pm:182 keyboard.pm:323
 #, c-format
 msgid "US keyboard"
 msgstr "อเมริกา"
 
-#: keyboard.pm:177
+#: keyboard.pm:184
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Albanian"
 msgstr "Iranian"
 
-#: keyboard.pm:178
+#: keyboard.pm:185
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Armenian (old)"
 msgstr "อาร์เมเนียน (เก่า)"
 
-#: keyboard.pm:179
+#: keyboard.pm:186
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Armenian (typewriter)"
 msgstr "อาร์เมเนียน (พิมพ์ดีด)"
 
-#: keyboard.pm:180
+#: keyboard.pm:187
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Armenian (phonetic)"
 msgstr "อาร์เมเนียน (โฟเนติค)"
 
-#: keyboard.pm:181
+#: keyboard.pm:188
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Arabic"
 msgstr ""
 
-#: keyboard.pm:182
+#: keyboard.pm:189
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Azerbaidjani (latin)"
 msgstr "Azerbaidjani (latin)"
 
-#: keyboard.pm:183
+#: keyboard.pm:190
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Belgian"
 msgstr "เบลเยี่ยม"
 
-#: keyboard.pm:184
+#: keyboard.pm:191
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
-"Bengali"
-msgstr "enable"
+"Bengali (Inscript-layout)"
+msgstr "อาร์เมเนียน (พิมพ์ดีด)"
 
-#: keyboard.pm:185
+#: keyboard.pm:192
+#, fuzzy, c-format
+msgid ""
+"_: keyboard\n"
+"Bengali (Probhat)"
+msgstr "เบลเยี่ยม"
+
+#: keyboard.pm:193
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Bulgarian (phonetic)"
 msgstr "อาร์เมเนียน (โฟเนติค)"
 
-#: keyboard.pm:186
+#: keyboard.pm:194
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Bulgarian (BDS)"
 msgstr "บัลกาเรีย"
 
-#: keyboard.pm:187
+#: keyboard.pm:195
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Brazilian (ABNT-2)"
 msgstr "บราซิล"
 
-#: keyboard.pm:188
+#: keyboard.pm:196
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Bosnian"
 msgstr "Estonian"
 
-#: keyboard.pm:189
+#: keyboard.pm:197
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Belarusian"
 msgstr "Belarusian"
 
-#: keyboard.pm:191
+#: keyboard.pm:199
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Swiss (German layout)"
 msgstr "สวิส (เลย์เอ้าท์ตามเยอรมัน)"
 
-#: keyboard.pm:193
+#: keyboard.pm:201
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Swiss (French layout)"
 msgstr "สวิส (เลย์เอ้าท์ตามฝรั่งเศษ)"
 
-#: keyboard.pm:195
+#: keyboard.pm:203
+#, fuzzy, c-format
+msgid ""
+"_: keyboard\n"
+"Cherokee syllabics"
+msgstr "Azerbaidjani (cyrillic)"
+
+#: keyboard.pm:205
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Czech (QWERTY)"
 msgstr "เชคโกสโลวาเกีย (QWERTY)"
 
-#: keyboard.pm:197
+#: keyboard.pm:207
 #, c-format
 msgid ""
 "_: keyboard\n"
 "German (no dead keys)"
 msgstr "German (no dead keys)"
 
-#: keyboard.pm:198
+#: keyboard.pm:208
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Devanagari"
 msgstr ""
 
-#: keyboard.pm:199
+#: keyboard.pm:209
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Danish"
 msgstr "เดนมาร์ก"
 
-#: keyboard.pm:200
+#: keyboard.pm:210
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (US)"
 msgstr "Dvorak (US)"
 
-#: keyboard.pm:201
+#: keyboard.pm:212
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Esperanto)"
 msgstr "Dvorak (Norwegian)"
 
-#: keyboard.pm:202
+#: keyboard.pm:214
+#, fuzzy, c-format
+msgid ""
+"_: keyboard\n"
+"Dvorak (French)"
+msgstr "Dvorak (Norwegian)"
+
+#: keyboard.pm:216
+#, fuzzy, c-format
+msgid ""
+"_: keyboard\n"
+"Dvorak (UK)"
+msgstr "Dvorak (US)"
+
+#: keyboard.pm:217
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Norwegian)"
 msgstr "Dvorak (Norwegian)"
 
-#: keyboard.pm:203
+#: keyboard.pm:219
+#, fuzzy, c-format
+msgid ""
+"_: keyboard\n"
+"Dvorak (Polish)"
+msgstr "Dvorak (US)"
+
+#: keyboard.pm:220
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Swedish)"
 msgstr "Dvorak (US)"
 
-#: keyboard.pm:205
+#: keyboard.pm:221
+#, fuzzy, c-format
+msgid ""
+"_: keyboard\n"
+"Dzongkha/Tibetan"
+msgstr "Estonian"
+
+#: keyboard.pm:222
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Estonian"
 msgstr "Estonian"
 
-#: keyboard.pm:209
+#: keyboard.pm:226
+#, fuzzy, c-format
+msgid ""
+"_: keyboard\n"
+"Faroese"
+msgstr "กรีก"
+
+#: keyboard.pm:228
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Georgian (\"Russian\" layout)"
 msgstr "จอร์เจีย (เลย์เอ้าท์แบบรัสเซีย)"
 
-#: keyboard.pm:210
+#: keyboard.pm:229
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Georgian (\"Latin\" layout)"
 msgstr "จอร์เจีย (เลย์เอ้าท์แบบละติน)"
 
-#: keyboard.pm:211
+#: keyboard.pm:230
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Greek"
 msgstr "กรีก"
 
-#: keyboard.pm:212
+#: keyboard.pm:231
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Greek (polytonic)"
 msgstr ""
 
-#: keyboard.pm:213
+#: keyboard.pm:232
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Gujarati"
 msgstr ""
 
-#: keyboard.pm:214
+#: keyboard.pm:233
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Gurmukhi"
 msgstr ""
 
-#: keyboard.pm:216
+#: keyboard.pm:235
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Hungarian"
 msgstr "อังการี"
 
-#: keyboard.pm:217
+#: keyboard.pm:236
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Croatian"
 msgstr "Croatian"
 
-#: keyboard.pm:218
+#: keyboard.pm:237
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Irish"
 msgstr ""
 
-#: keyboard.pm:219
+#: keyboard.pm:238
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Israeli"
 msgstr "อิสราเอล"
 
-#: keyboard.pm:220
+#: keyboard.pm:239
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Israeli (phonetic)"
 msgstr "อิลราเอล (โฟเนติค)"
 
-#: keyboard.pm:221
+#: keyboard.pm:240
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Iranian"
 msgstr "Iranian"
 
-#: keyboard.pm:222
+#: keyboard.pm:241
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Icelandic"
 msgstr "ไอซ์แลนด์"
 
-#: keyboard.pm:223
+#: keyboard.pm:242
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Italian"
 msgstr "อิตาลี"
 
-#: keyboard.pm:224
+#: keyboard.pm:243
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Inuktitut"
 msgstr ""
 
-#: keyboard.pm:229
+#: keyboard.pm:248
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Japanese 106 keys"
 msgstr "Japanese 106 keys"
 
-#: keyboard.pm:230
+#: keyboard.pm:249
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Kannada"
 msgstr "ปฎิทิน"
 
-#: keyboard.pm:233
+#: keyboard.pm:252
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Korean"
 msgstr "Korean keyboard"
 
-#: keyboard.pm:234
+#: keyboard.pm:254
+#, fuzzy, c-format
+msgid ""
+"_: keyboard\n"
+"Kurdish (arabic script)"
+msgstr "อาร์เมเนียน (โฟเนติค)"
+
+#: keyboard.pm:255
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Kyrgyz"
 msgstr "อังกฤษ"
 
-#: keyboard.pm:235
+#: keyboard.pm:256
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Latin American"
 msgstr "ละตินอเมริกา"
 
-#: keyboard.pm:236
+#: keyboard.pm:257
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Laotian"
 msgstr "ตำแหน่ง"
 
-#: keyboard.pm:238
+#: keyboard.pm:259
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Lithuanian AZERTY (old)"
 msgstr "Lithuanian AZERTY (old)"
 
-#: keyboard.pm:241
+#: keyboard.pm:262
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Lithuanian AZERTY (new)"
 msgstr "Lithuanian AZERTY (new)"
 
-#: keyboard.pm:243
+#: keyboard.pm:264
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Lithuanian \"number row\" QWERTY"
 msgstr "ลิธัวเนีย \"แถวตัวเลข\" QWERTY"
 
-#: keyboard.pm:245
+#: keyboard.pm:266
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Lithuanian \"phonetic\" QWERTY"
 msgstr "ลิธัวเนีย \"โฟเนติค\" QWERTY"
 
-#: keyboard.pm:246
+#: keyboard.pm:267
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Latvian"
 msgstr "ตำแหน่ง"
 
-#: keyboard.pm:247
+#: keyboard.pm:268
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Malayalam"
 msgstr ""
 
-#: keyboard.pm:248
+#: keyboard.pm:269
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Macedonian"
 msgstr "Macedonian"
 
-#: keyboard.pm:249
+#: keyboard.pm:270
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Myanmar (Burmese)"
 msgstr ""
 
-#: keyboard.pm:250
+#: keyboard.pm:271
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Mongolian (cyrillic)"
 msgstr "Azerbaidjani (cyrillic)"
 
-#: keyboard.pm:251
+#: keyboard.pm:272
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Maltese (UK)"
 msgstr ""
 
-#: keyboard.pm:252
+#: keyboard.pm:273
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Maltese (US)"
 msgstr ""
 
-#: keyboard.pm:253
+#: keyboard.pm:274
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dutch"
 msgstr "ฮอลแลนด์"
 
-#: keyboard.pm:255
+#: keyboard.pm:276
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Oriya"
 msgstr ""
 
-#: keyboard.pm:256
+#: keyboard.pm:277
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Polish (qwerty layout)"
 msgstr "Polish (qwerty layout)"
 
-#: keyboard.pm:257
+#: keyboard.pm:278
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Polish (qwertz layout)"
 msgstr "Polish (qwertz layout)"
 
-#: keyboard.pm:258
+#: keyboard.pm:280
+#, fuzzy, c-format
+msgid ""
+"_: keyboard\n"
+"Pashto"
+msgstr "โปแลนด์"
+
+#: keyboard.pm:281
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Portuguese"
 msgstr "โปรตุเกส"
 
-#: keyboard.pm:260
+#: keyboard.pm:283
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Canadian (Quebec)"
 msgstr "คานาดา (ควิเบค)"
 
-#: keyboard.pm:262
+#: keyboard.pm:285
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Romanian (qwertz)"
 msgstr ""
 
-#: keyboard.pm:263
+#: keyboard.pm:286
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Romanian (qwerty)"
 msgstr ""
 
-#: keyboard.pm:265
+#: keyboard.pm:288
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Russian (phonetic)"
 msgstr "รัสเซีย (โฟเนติค)"
 
-#: keyboard.pm:266
+#: keyboard.pm:289
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Saami (norwegian)"
 msgstr "Dvorak (Norwegian)"
 
-#: keyboard.pm:267
+#: keyboard.pm:290
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Saami (swedish/finnish)"
 msgstr ""
 
-#: keyboard.pm:269
+#: keyboard.pm:292
+#, fuzzy, c-format
+msgid ""
+"_: keyboard\n"
+"Sindhi"
+msgstr "ไทย"
+
+#: keyboard.pm:294
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Slovenian"
 msgstr "สโลวาเนีย"
 
-#: keyboard.pm:270
+#: keyboard.pm:295
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Slovakian (QWERTZ)"
 msgstr "สโลวาเกีย (QWERTZ)"
 
-#: keyboard.pm:271
+#: keyboard.pm:296
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Slovakian (QWERTY)"
 msgstr "สโลวาเกีย (QWERTY)"
 
-#: keyboard.pm:273
+#: keyboard.pm:298
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Serbian (cyrillic)"
 msgstr "Azerbaidjani (cyrillic)"
 
-#: keyboard.pm:274
+#: keyboard.pm:299
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Syriac"
 msgstr "พอร์ตอนุกรม"
 
-#: keyboard.pm:275
+#: keyboard.pm:300
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Syriac (phonetic)"
 msgstr "อาร์เมเนียน (โฟเนติค)"
 
-#: keyboard.pm:276
+#: keyboard.pm:301
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Telugu"
 msgstr "เบลเยี่ยม"
 
-#: keyboard.pm:278
+#: keyboard.pm:303
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tamil (ISCII-layout)"
 msgstr ""
 
-#: keyboard.pm:279
+#: keyboard.pm:304
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Tamil (Typewriter-layout)"
 msgstr "อาร์เมเนียน (พิมพ์ดีด)"
 
-#: keyboard.pm:280
-#, c-format
+#: keyboard.pm:305
+#, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
-"Thai"
+"Thai (Kedmanee)"
 msgstr "ไทย"
 
-#: keyboard.pm:282
+#: keyboard.pm:306
+#, fuzzy, c-format
+msgid ""
+"_: keyboard\n"
+"Thai (TIS-820)"
+msgstr "ไทย"
+
+#: keyboard.pm:308
+#, fuzzy, c-format
+msgid ""
+"_: keyboard\n"
+"Thai (Pattachote)"
+msgstr "ไทย"
+
+#: keyboard.pm:311
+#, fuzzy, c-format
+msgid ""
+"_: keyboard\n"
+"Tifinagh (+latin/arabic)"
+msgstr "ยูโกสลาเวีย (เลย์เอ้าท์แบบละติน)"
+
+#: keyboard.pm:313
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Tajik"
 msgstr "ไทย"
 
-#: keyboard.pm:283
+#: keyboard.pm:315
+#, fuzzy, c-format
+msgid ""
+"_: keyboard\n"
+"Turkmen"
+msgstr "เยอรมัน"
+
+#: keyboard.pm:316
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Turkish (traditional \"F\" model)"
 msgstr "ตุรกี (โมเดลแบบแผน \"F\")"
 
-#: keyboard.pm:284
+#: keyboard.pm:317
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Turkish (modern \"Q\" model)"
 msgstr "ตุรกี (โมเดลสมัยใหม่ \"Q\")"
 
-#: keyboard.pm:286
+#: keyboard.pm:319
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Ukrainian"
 msgstr "ยูเครน"
 
-#: keyboard.pm:289
+#: keyboard.pm:322
+#, fuzzy, c-format
+msgid ""
+"_: keyboard\n"
+"Urdu keyboard"
+msgstr "Korean keyboard"
+
+#: keyboard.pm:324
 #, c-format
 msgid "US keyboard (international)"
 msgstr "คีย์บอร์ดอเมริกัน (นานาชาติ)"
 
-#: keyboard.pm:290
+#: keyboard.pm:325
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Uzbek (cyrillic)"
 msgstr "Azerbaidjani (cyrillic)"
 
-#: keyboard.pm:292
+#: keyboard.pm:327
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Vietnamese \"numeric row\" QWERTY"
 msgstr "Vietnamese \"numeric row\" QWERTY"
 
-#: keyboard.pm:293
+#: keyboard.pm:328
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Yugoslavian (latin)"
 msgstr "ยูโกสลาเวีย (เลย์เอ้าท์แบบละติน)"
 
-#: keyboard.pm:300
+#: keyboard.pm:335
 #, c-format
 msgid "Right Alt key"
 msgstr ""
 
-#: keyboard.pm:301
+#: keyboard.pm:336
 #, c-format
 msgid "Both Shift keys simultaneously"
 msgstr ""
 
-#: keyboard.pm:302
+#: keyboard.pm:337
 #, c-format
 msgid "Control and Shift keys simultaneously"
 msgstr ""
 
-#: keyboard.pm:303
+#: keyboard.pm:338
 #, c-format
 msgid "CapsLock key"
 msgstr ""
 
-#: keyboard.pm:304
+#: keyboard.pm:339
 #, c-format
 msgid "Shift and CapsLock keys simultaneously"
 msgstr ""
 
-#: keyboard.pm:305
+#: keyboard.pm:340
 #, c-format
 msgid "Ctrl and Alt keys simultaneously"
 msgstr ""
 
-#: keyboard.pm:306
+#: keyboard.pm:341
 #, c-format
 msgid "Alt and Shift keys simultaneously"
 msgstr ""
 
-#: keyboard.pm:307
+#: keyboard.pm:342
 #, c-format
 msgid "\"Menu\" key"
 msgstr ""
 
-#: keyboard.pm:308
+#: keyboard.pm:343
 #, c-format
 msgid "Left \"Windows\" key"
 msgstr ""
 
-#: keyboard.pm:309
+#: keyboard.pm:344
 #, c-format
 msgid "Right \"Windows\" key"
 msgstr ""
 
-#: keyboard.pm:310
+#: keyboard.pm:345
 #, c-format
 msgid "Both Control keys simultaneously"
 msgstr ""
 
-#: keyboard.pm:311
+#: keyboard.pm:346
 #, c-format
 msgid "Both Alt keys simultaneously"
 msgstr ""
 
-#: keyboard.pm:312
+#: keyboard.pm:347
 #, c-format
 msgid "Left Shift key"
 msgstr ""
 
-#: keyboard.pm:313
+#: keyboard.pm:348
 #, c-format
 msgid "Right Shift key"
 msgstr ""
 
-#: keyboard.pm:314
+#: keyboard.pm:349
 #, c-format
 msgid "Left Alt key"
 msgstr ""
 
-#: keyboard.pm:315
+#: keyboard.pm:350
 #, fuzzy, c-format
 msgid "Left Control key"
 msgstr "เครื่องพิมพ์แบบรีโมท"
 
-#: keyboard.pm:316
+#: keyboard.pm:351
 #, fuzzy, c-format
 msgid "Right Control key"
 msgstr "เครื่องพิมพ์แบบรีโมท"
 
-#: keyboard.pm:347
+#: keyboard.pm:387
 #, c-format
 msgid ""
 "Here you can choose the key or key combination that will \n"
@@ -6932,7 +7119,7 @@ msgid ""
 "(eg: latin and non latin)"
 msgstr ""
 
-#: keyboard.pm:352
+#: keyboard.pm:392
 #, c-format
 msgid ""
 "This setting will be activated after the installation.\n"
@@ -6943,1165 +7130,1145 @@ msgstr ""
 #. -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
+#: lang.pm:173
 #, c-format
 msgid "default:LTR"
 msgstr "default:LTR"
 
-#: lang.pm:182
+#: lang.pm:190
 #, fuzzy, c-format
 msgid "Andorra"
 msgstr "ยกเลิก"
 
-#: lang.pm:183
+#: lang.pm:191 network/adsl_consts.pm:826
 #, c-format
 msgid "United Arab Emirates"
 msgstr ""
 
-#: lang.pm:184
+#: lang.pm:192
 #, fuzzy, c-format
 msgid "Afghanistan"
 msgstr "Iranian"
 
-#: lang.pm:185
+#: lang.pm:193
 #, c-format
 msgid "Antigua and Barbuda"
 msgstr ""
 
-#: lang.pm:186
+#: lang.pm:194
 #, c-format
 msgid "Anguilla"
 msgstr ""
 
-#: lang.pm:187
+#: lang.pm:195
 #, fuzzy, c-format
 msgid "Albania"
 msgstr "Iranian"
 
-#: lang.pm:188
+#: lang.pm:196
 #, fuzzy, c-format
 msgid "Armenia"
 msgstr "อาร์เมเนียน (เก่า)"
 
-#: lang.pm:189
+#: lang.pm:197
 #, c-format
 msgid "Netherlands Antilles"
 msgstr ""
 
-#: lang.pm:190
+#: lang.pm:198
 #, c-format
 msgid "Angola"
 msgstr ""
 
-#: lang.pm:191
+#: lang.pm:199
 #, c-format
 msgid "Antarctica"
 msgstr ""
 
-#: lang.pm:192 network/adsl_consts.pm:28 standalone/drakxtv:50
+#: lang.pm:200 network/adsl_consts.pm:40 standalone/drakxtv:50
 #, c-format
 msgid "Argentina"
 msgstr ""
 
-#: lang.pm:193
+#: lang.pm:201
 #, c-format
 msgid "American Samoa"
 msgstr ""
 
-#: lang.pm:195 standalone/drakxtv:48
-#, fuzzy, c-format
+#: lang.pm:203 standalone/drakxtv:48
+#, c-format
 msgid "Australia"
-msgstr "พอร์ตอนุกรม"
+msgstr "ออสเตรเลีย"
 
-#: lang.pm:196
+#: lang.pm:204
 #, fuzzy, c-format
 msgid "Aruba"
 msgstr "Grub"
 
-#: lang.pm:197
+#: lang.pm:205
 #, fuzzy, c-format
 msgid "Azerbaijan"
 msgstr "Iranian"
 
-#: lang.pm:198
+#: lang.pm:206
 #, c-format
 msgid "Bosnia and Herzegovina"
 msgstr ""
 
-#: lang.pm:199
+#: lang.pm:207
 #, c-format
 msgid "Barbados"
 msgstr ""
 
-#: lang.pm:200
+#: lang.pm:208
 #, c-format
 msgid "Bangladesh"
 msgstr ""
 
-#: lang.pm:202
+#: lang.pm:210
 #, c-format
 msgid "Burkina Faso"
 msgstr ""
 
-#: lang.pm:203 network/adsl_consts.pm:126 network/adsl_consts.pm:134
+#: lang.pm:211 network/adsl_consts.pm:143 network/adsl_consts.pm:151
 #, fuzzy, c-format
 msgid "Bulgaria"
 msgstr "อังการี"
 
-#: lang.pm:204
+#: lang.pm:212
 #, c-format
 msgid "Bahrain"
 msgstr ""
 
-#: lang.pm:205
+#: lang.pm:213
 #, c-format
 msgid "Burundi"
 msgstr ""
 
-#: lang.pm:206
+#: lang.pm:214
 #, fuzzy, c-format
 msgid "Benin"
 msgstr "เบลเยี่ยม"
 
-#: lang.pm:207
+#: lang.pm:215
 #, fuzzy, c-format
 msgid "Bermuda"
 msgstr "เยอรมัน"
 
-#: lang.pm:208
+#: lang.pm:216
 #, c-format
 msgid "Brunei Darussalam"
 msgstr ""
 
-#: lang.pm:209
+#: lang.pm:217
 #, c-format
 msgid "Bolivia"
 msgstr ""
 
-#: lang.pm:210 network/adsl_consts.pm:92 network/adsl_consts.pm:102
-#: network/adsl_consts.pm:110 network/adsl_consts.pm:118
+#: lang.pm:218 network/adsl_consts.pm:109 network/adsl_consts.pm:119
+#: network/adsl_consts.pm:127 network/adsl_consts.pm:135
 #, c-format
 msgid "Brazil"
 msgstr "บราซิล"
 
-#: lang.pm:211
+#: lang.pm:219
 #, c-format
 msgid "Bahamas"
 msgstr ""
 
-#: lang.pm:212
+#: lang.pm:220
 #, c-format
 msgid "Bhutan"
 msgstr ""
 
-#: lang.pm:213
+#: lang.pm:221
 #, c-format
 msgid "Bouvet Island"
 msgstr ""
 
-#: lang.pm:214
+#: lang.pm:222
 #, fuzzy, c-format
 msgid "Botswana"
 msgstr "Estonian"
 
-#: lang.pm:215
+#: lang.pm:223
 #, fuzzy, c-format
 msgid "Belarus"
 msgstr "Belarusian"
 
-#: lang.pm:216
+#: lang.pm:224
 #, fuzzy, c-format
 msgid "Belize"
 msgstr "เปลี่ยนขนาด"
 
-#: lang.pm:217
-#, fuzzy, c-format
+#: lang.pm:225
+#, c-format
 msgid "Canada"
-msgstr "ปฎิทิน"
+msgstr "แคนาดา"
 
-#: lang.pm:218
+#: lang.pm:226
 #, c-format
 msgid "Cocos (Keeling) Islands"
 msgstr ""
 
-#: lang.pm:219
+#: lang.pm:227
 #, c-format
 msgid "Congo (Kinshasa)"
 msgstr ""
 
-#: lang.pm:220
+#: lang.pm:228
 #, c-format
 msgid "Central African Republic"
 msgstr ""
 
-#: lang.pm:221
+#: lang.pm:229
 #, c-format
 msgid "Congo (Brazzaville)"
 msgstr ""
 
-#: lang.pm:222 network/adsl_consts.pm:568 network/adsl_consts.pm:575
-#, c-format
-msgid "Switzerland"
-msgstr ""
-
-#: lang.pm:223
+#: lang.pm:231
 #, c-format
 msgid "Cote d'Ivoire"
 msgstr ""
 
-#: lang.pm:224
+#: lang.pm:232
 #, c-format
 msgid "Cook Islands"
 msgstr ""
 
-#: lang.pm:225
+#: lang.pm:233
 #, fuzzy, c-format
 msgid "Chile"
 msgstr "เลือก file"
 
-#: lang.pm:226
+#: lang.pm:234
 #, c-format
 msgid "Cameroon"
 msgstr ""
 
-#: 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
+#: lang.pm:235 network/adsl_consts.pm:159 network/adsl_consts.pm:167
+#: network/adsl_consts.pm:175 network/adsl_consts.pm:183
+#: network/adsl_consts.pm:191 network/adsl_consts.pm:199
+#: network/adsl_consts.pm:207 network/adsl_consts.pm:215
+#: network/adsl_consts.pm:223 network/adsl_consts.pm:231
+#: network/adsl_consts.pm:239 network/adsl_consts.pm:247
+#: network/adsl_consts.pm:255 network/adsl_consts.pm:263
+#: network/adsl_consts.pm:271 network/adsl_consts.pm:279
+#: network/adsl_consts.pm:287 network/adsl_consts.pm:295
+#: network/adsl_consts.pm:303 network/adsl_consts.pm:311
 #, c-format
 msgid "China"
 msgstr "จีน"
 
-#: lang.pm:228
+#: lang.pm:236
 #, c-format
 msgid "Colombia"
 msgstr ""
 
-#: lang.pm:230
+#: lang.pm:238
 #, c-format
 msgid "Serbia & Montenegro"
 msgstr ""
 
-#: lang.pm:231
+#: lang.pm:239
 #, c-format
 msgid "Cuba"
 msgstr ""
 
-#: lang.pm:232
+#: lang.pm:240
 #, fuzzy, c-format
 msgid "Cape Verde"
 msgstr "ยุบ tree"
 
-#: lang.pm:233
+#: lang.pm:241
 #, c-format
 msgid "Christmas Island"
 msgstr ""
 
-#: lang.pm:234
+#: lang.pm:242
 #, c-format
 msgid "Cyprus"
 msgstr ""
 
-#: lang.pm:237
+#: lang.pm:245
 #, fuzzy, c-format
 msgid "Djibouti"
 msgstr "เลิก"
 
-#: lang.pm:238 network/adsl_consts.pm:302
+#: lang.pm:246 network/adsl_consts.pm:327
 #, c-format
 msgid "Denmark"
 msgstr ""
 
-#: lang.pm:239
+#: lang.pm:247
 #, fuzzy, c-format
 msgid "Dominica"
 msgstr "โดเมน NIS"
 
-#: lang.pm:240
+#: lang.pm:248
 #, c-format
 msgid "Dominican Republic"
 msgstr ""
 
-#: lang.pm:241
+#: lang.pm:249 network/adsl_consts.pm:30
 #, fuzzy, c-format
 msgid "Algeria"
 msgstr "พอร์ตอนุกรม"
 
-#: lang.pm:242
+#: lang.pm:250
 #, c-format
 msgid "Ecuador"
 msgstr ""
 
-#: lang.pm:243
+#: lang.pm:251
 #, fuzzy, c-format
 msgid "Estonia"
 msgstr "Estonian"
 
-#: lang.pm:244
+#: lang.pm:252
 #, fuzzy, c-format
 msgid "Egypt"
 msgstr "ว่าง"
 
-#: lang.pm:245
+#: lang.pm:253
 #, c-format
 msgid "Western Sahara"
 msgstr ""
 
-#: lang.pm:246
+#: lang.pm:254
 #, fuzzy, c-format
 msgid "Eritrea"
 msgstr "ส่วนของผู้เชี่ยวชาญ"
 
-#: lang.pm:247 network/adsl_consts.pm:531 network/adsl_consts.pm:540
-#: network/adsl_consts.pm:551
-#, fuzzy, c-format
+#: lang.pm:255 network/adsl_consts.pm:663 network/adsl_consts.pm:672
+#: network/adsl_consts.pm:682 network/adsl_consts.pm:692
+#: network/adsl_consts.pm:700 network/adsl_consts.pm:708
+#: network/adsl_consts.pm:716 network/adsl_consts.pm:724
+#: network/adsl_consts.pm:732 network/adsl_consts.pm:740
+#: network/adsl_consts.pm:748 network/adsl_consts.pm:756
+#: network/adsl_consts.pm:764
+#, c-format
 msgid "Spain"
 msgstr "สเปน"
 
-#: lang.pm:248
+#: lang.pm:256
 #, fuzzy, c-format
 msgid "Ethiopia"
 msgstr "Estonian"
 
-#: lang.pm:249 network/adsl_consts.pm:402
+#: lang.pm:257 network/adsl_consts.pm:335
 #, c-format
 msgid "Finland"
 msgstr "ฟินแลนด์"
 
-#: lang.pm:250
+#: lang.pm:258
 #, fuzzy, c-format
 msgid "Fiji"
 msgstr "ฟินแลนด์"
 
-#: lang.pm:251
+#: lang.pm:259
 #, c-format
 msgid "Falkland Islands (Malvinas)"
 msgstr ""
 
-#: lang.pm:252
+#: lang.pm:260
 #, fuzzy, c-format
 msgid "Micronesia"
 msgstr "Macedonian"
 
-#: lang.pm:253
+#: lang.pm:261
 #, fuzzy, c-format
 msgid "Faroe Islands"
 msgstr "ไอซ์แลนด์"
 
-#: lang.pm:255
+#: lang.pm:263
 #, c-format
 msgid "Gabon"
 msgstr ""
 
-#: lang.pm:256 network/adsl_consts.pm:593 network/adsl_consts.pm:601
+#: lang.pm:264 network/adsl_consts.pm:836 network/adsl_consts.pm:846
 #: network/netconnect.pm:52
 #, c-format
 msgid "United Kingdom"
 msgstr "อังกฤษ"
 
-#: lang.pm:257
+#: lang.pm:265
 #, c-format
 msgid "Grenada"
 msgstr ""
 
-#: lang.pm:258
+#: lang.pm:266
 #, fuzzy, c-format
 msgid "Georgia"
 msgstr "นอร์เวย์"
 
-#: lang.pm:259
+#: lang.pm:267
 #, fuzzy, c-format
 msgid "French Guiana"
 msgstr "ฝรั่งเศษ"
 
-#: lang.pm:260
+#: lang.pm:268
 #, c-format
 msgid "Ghana"
 msgstr ""
 
-#: lang.pm:261
+#: lang.pm:269
 #, c-format
 msgid "Gibraltar"
 msgstr ""
 
-#: lang.pm:262
+#: lang.pm:270
 #, fuzzy, c-format
 msgid "Greenland"
 msgstr "ไอซ์แลนด์"
 
-#: lang.pm:263
+#: lang.pm:271
 #, c-format
 msgid "Gambia"
 msgstr ""
 
-#: lang.pm:264
+#: lang.pm:272
 #, fuzzy, c-format
 msgid "Guinea"
 msgstr "ทั่วไป"
 
-#: lang.pm:265
+#: lang.pm:273
 #, c-format
 msgid "Guadeloupe"
 msgstr ""
 
-#: lang.pm:266
+#: lang.pm:274
 #, c-format
 msgid "Equatorial Guinea"
 msgstr ""
 
-#: lang.pm:268
+#: lang.pm:276
 #, c-format
 msgid "South Georgia and the South Sandwich Islands"
 msgstr ""
 
-#: lang.pm:269
+#: lang.pm:277
 #, fuzzy, c-format
 msgid "Guatemala"
 msgstr "เกตเวย์"
 
-#: lang.pm:270
+#: lang.pm:278
 #, c-format
 msgid "Guam"
 msgstr ""
 
-#: lang.pm:271
+#: lang.pm:279
 #, c-format
 msgid "Guinea-Bissau"
 msgstr ""
 
-#: lang.pm:272
+#: lang.pm:280
 #, c-format
 msgid "Guyana"
 msgstr ""
 
-#: lang.pm:273
+#: lang.pm:281
 #, c-format
 msgid "Hong Kong SAR (China)"
 msgstr ""
 
-#: lang.pm:274
+#: lang.pm:282
 #, c-format
 msgid "Heard and McDonald Islands"
 msgstr ""
 
-#: lang.pm:275
+#: lang.pm:283
 #, c-format
 msgid "Honduras"
 msgstr ""
 
-#: lang.pm:276
+#: lang.pm:284
 #, fuzzy, c-format
 msgid "Croatia"
 msgstr "Croatian"
 
-#: lang.pm:277
+#: lang.pm:285
 #, c-format
 msgid "Haiti"
 msgstr ""
 
-#: lang.pm:278 network/adsl_consts.pm:436
-#, fuzzy, c-format
-msgid "Hungary"
-msgstr "อังการี"
-
-#: lang.pm:279
+#: lang.pm:287
 #, fuzzy, c-format
 msgid "Indonesia"
 msgstr "ไม่มี"
 
-#: lang.pm:280 network/adsl_consts.pm:444 standalone/drakxtv:47
+#: lang.pm:288 network/adsl_consts.pm:471 standalone/drakxtv:47
 #, fuzzy, c-format
 msgid "Ireland"
 msgstr "ไอซ์แลนด์"
 
-#: lang.pm:281
-#, fuzzy, c-format
+#: lang.pm:289 network/adsl_consts.pm:479
+#, c-format
 msgid "Israel"
 msgstr "อิสราเอล"
 
-#: lang.pm:282
+#: lang.pm:290
 #, fuzzy, c-format
 msgid "India"
 msgstr "Iranian"
 
-#: lang.pm:283
+#: lang.pm:291
 #, c-format
 msgid "British Indian Ocean Territory"
 msgstr ""
 
-#: lang.pm:284
+#: lang.pm:292
 #, c-format
 msgid "Iraq"
 msgstr ""
 
-#: lang.pm:285
+#: lang.pm:293
 #, fuzzy, c-format
 msgid "Iran"
 msgstr "Iranian"
 
-#: lang.pm:286
+#: lang.pm:294
 #, fuzzy, c-format
 msgid "Iceland"
 msgstr "ไอซ์แลนด์"
 
-#: lang.pm:288
+#: lang.pm:296
 #, c-format
 msgid "Jamaica"
 msgstr ""
 
-#: lang.pm:289
+#: lang.pm:297
 #, fuzzy, c-format
 msgid "Jordan"
 msgstr "Iranian"
 
-#: lang.pm:290
+#: lang.pm:298
 #, c-format
 msgid "Japan"
 msgstr "ญี่ปุ่น"
 
-#: lang.pm:291
+#: lang.pm:299
 #, fuzzy, c-format
 msgid "Kenya"
 msgstr "คีย์บอร์ด"
 
-#: lang.pm:292
+#: lang.pm:300
 #, c-format
 msgid "Kyrgyzstan"
 msgstr ""
 
-#: lang.pm:293
+#: lang.pm:301
 #, c-format
 msgid "Cambodia"
 msgstr ""
 
-#: lang.pm:294
+#: lang.pm:302
 #, c-format
 msgid "Kiribati"
 msgstr ""
 
-#: lang.pm:295
+#: lang.pm:303
 #, c-format
 msgid "Comoros"
 msgstr ""
 
-#: lang.pm:296
+#: lang.pm:304
 #, c-format
 msgid "Saint Kitts and Nevis"
 msgstr ""
 
-#: lang.pm:297
+#: lang.pm:305
 #, c-format
 msgid "Korea (North)"
 msgstr ""
 
-#: lang.pm:298
-#, fuzzy, c-format
+#: lang.pm:306
+#, c-format
 msgid "Korea"
-msgstr "More"
+msgstr "เกาหลี"
 
-#: lang.pm:299
+#: lang.pm:307
 #, fuzzy, c-format
 msgid "Kuwait"
 msgstr "ออก"
 
-#: lang.pm:300
+#: lang.pm:308
 #, c-format
 msgid "Cayman Islands"
 msgstr ""
 
-#: lang.pm:301
+#: lang.pm:309
 #, c-format
 msgid "Kazakhstan"
 msgstr ""
 
-#: lang.pm:302
+#: lang.pm:310
 #, c-format
 msgid "Laos"
 msgstr ""
 
-#: lang.pm:303
+#: lang.pm:311
 #, c-format
 msgid "Lebanon"
 msgstr ""
 
-#: lang.pm:304
+#: lang.pm:312
 #, c-format
 msgid "Saint Lucia"
 msgstr ""
 
-#: lang.pm:305
+#: lang.pm:313
 #, c-format
 msgid "Liechtenstein"
 msgstr ""
 
-#: lang.pm:306
+#: lang.pm:314
 #, c-format
 msgid "Sri Lanka"
 msgstr ""
 
-#: lang.pm:307
+#: lang.pm:315
 #, fuzzy, c-format
 msgid "Liberia"
 msgstr "พอร์ตอนุกรม"
 
-#: lang.pm:308
+#: lang.pm:316
 #, c-format
 msgid "Lesotho"
 msgstr ""
 
-#: lang.pm:309 network/adsl_consts.pm:479
+#: lang.pm:317 network/adsl_consts.pm:527
 #, c-format
 msgid "Lithuania"
 msgstr ""
 
-#: lang.pm:310
+#: lang.pm:318
 #, c-format
 msgid "Luxembourg"
 msgstr ""
 
-#: lang.pm:311
+#: lang.pm:319
 #, fuzzy, c-format
 msgid "Latvia"
 msgstr "ตำแหน่ง"
 
-#: lang.pm:312
+#: lang.pm:320
 #, c-format
 msgid "Libya"
 msgstr ""
 
-#: lang.pm:313 network/adsl_consts.pm:487
+#: lang.pm:321 network/adsl_consts.pm:535
 #, c-format
 msgid "Morocco"
 msgstr ""
 
-#: lang.pm:314
+#: lang.pm:322
 #, fuzzy, c-format
 msgid "Monaco"
 msgstr "จอภาพ"
 
-#: lang.pm:315
+#: lang.pm:323
 #, c-format
 msgid "Moldova"
 msgstr ""
 
-#: lang.pm:316
+#: lang.pm:324
 #, c-format
 msgid "Madagascar"
 msgstr ""
 
-#: lang.pm:317
+#: lang.pm:325
 #, c-format
 msgid "Marshall Islands"
 msgstr ""
 
-#: lang.pm:318
+#: lang.pm:326
 #, fuzzy, c-format
 msgid "Macedonia"
 msgstr "Macedonian"
 
-#: lang.pm:319
+#: lang.pm:327
 #, c-format
 msgid "Mali"
 msgstr ""
 
-#: lang.pm:320
+#: lang.pm:328
 #, c-format
 msgid "Myanmar"
-msgstr ""
+msgstr "พม่า"
 
-#: lang.pm:321
+#: lang.pm:329
 #, c-format
 msgid "Mongolia"
 msgstr ""
 
-#: lang.pm:322
+#: lang.pm:330
 #, c-format
 msgid "Northern Mariana Islands"
 msgstr ""
 
-#: lang.pm:323
+#: lang.pm:331
 #, c-format
 msgid "Martinique"
 msgstr ""
 
-#: lang.pm:324
+#: lang.pm:332
 #, c-format
 msgid "Mauritania"
 msgstr ""
 
-#: lang.pm:325
+#: lang.pm:333
 #, fuzzy, c-format
 msgid "Montserrat"
 msgstr "พอร์ตของเม้าส์"
 
-#: lang.pm:326
+#: lang.pm:334
 #, c-format
 msgid "Malta"
 msgstr ""
 
-#: lang.pm:327
+#: lang.pm:335
 #, c-format
 msgid "Mauritius"
 msgstr ""
 
-#: lang.pm:328
+#: lang.pm:336
 #, c-format
 msgid "Maldives"
 msgstr ""
 
-#: lang.pm:329
+#: lang.pm:337
 #, c-format
 msgid "Malawi"
 msgstr ""
 
-#: lang.pm:330
+#: lang.pm:338
 #, fuzzy, c-format
 msgid "Mexico"
 msgstr "Mouse"
 
-#: lang.pm:331
+#: lang.pm:339
 #, c-format
 msgid "Malaysia"
 msgstr ""
 
-#: lang.pm:332
+#: lang.pm:340
 #, c-format
 msgid "Mozambique"
 msgstr ""
 
-#: lang.pm:333
+#: lang.pm:341
 #, c-format
 msgid "Namibia"
 msgstr ""
 
-#: lang.pm:334
+#: lang.pm:342
 #, fuzzy, c-format
 msgid "New Caledonia"
 msgstr "Macedonian"
 
-#: lang.pm:335
+#: lang.pm:343
 #, fuzzy, c-format
 msgid "Niger"
 msgstr "สูง"
 
-#: lang.pm:336
+#: lang.pm:344
 #, c-format
 msgid "Norfolk Island"
 msgstr ""
 
-#: lang.pm:337
+#: lang.pm:345
 #, fuzzy, c-format
 msgid "Nigeria"
 msgstr "พอร์ตอนุกรม"
 
-#: lang.pm:338
+#: lang.pm:346
 #, c-format
 msgid "Nicaragua"
 msgstr ""
 
-#: lang.pm:341
+#: lang.pm:349
 #, c-format
 msgid "Nepal"
 msgstr ""
 
-#: lang.pm:342
+#: lang.pm:350
 #, c-format
 msgid "Nauru"
 msgstr ""
 
-#: lang.pm:343
+#: lang.pm:351
 #, fuzzy, c-format
 msgid "Niue"
 msgstr "NoVideo"
 
-#: lang.pm:344
+#: lang.pm:352
 #, c-format
 msgid "New Zealand"
 msgstr ""
 
-#: lang.pm:345
+#: lang.pm:353
 #, fuzzy, c-format
 msgid "Oman"
 msgstr "โดเมน NIS"
 
-#: lang.pm:346
+#: lang.pm:354
 #, c-format
 msgid "Panama"
 msgstr ""
 
-#: lang.pm:347
+#: lang.pm:355
 #, c-format
 msgid "Peru"
 msgstr ""
 
-#: lang.pm:348
+#: lang.pm:356
 #, c-format
 msgid "French Polynesia"
 msgstr ""
 
-#: lang.pm:349
+#: lang.pm:357
 #, c-format
 msgid "Papua New Guinea"
 msgstr ""
 
-#: lang.pm:350
+#: lang.pm:358
 #, c-format
 msgid "Philippines"
 msgstr ""
 
-#: lang.pm:351
+#: lang.pm:359
 #, c-format
 msgid "Pakistan"
 msgstr ""
 
-#: lang.pm:352 network/adsl_consts.pm:503
-#, fuzzy, c-format
-msgid "Poland"
-msgstr "ไอซ์แลนด์"
-
-#: lang.pm:353
+#: lang.pm:361
 #, c-format
 msgid "Saint Pierre and Miquelon"
 msgstr ""
 
-#: lang.pm:354
+#: lang.pm:362
 #, fuzzy, c-format
 msgid "Pitcairn"
 msgstr "เครื่องพิมพ์"
 
-#: lang.pm:355
+#: lang.pm:363
 #, fuzzy, c-format
 msgid "Puerto Rico"
 msgstr "Protocol"
 
-#: lang.pm:356
+#: lang.pm:364
 #, fuzzy, c-format
 msgid "Palestine"
 msgstr "บันทึกกลุ่มแพ็คเก็จที่เลือก"
 
-#: lang.pm:357 network/adsl_consts.pm:513
-#, fuzzy, c-format
+#: lang.pm:365 network/adsl_consts.pm:634
+#, c-format
 msgid "Portugal"
-msgstr "Port"
+msgstr "โปรตุเกส"
 
-#: lang.pm:358
+#: lang.pm:366
 #, c-format
 msgid "Paraguay"
 msgstr ""
 
-#: lang.pm:359
+#: lang.pm:367
 #, c-format
 msgid "Palau"
 msgstr ""
 
-#: lang.pm:360
+#: lang.pm:368
 #, fuzzy, c-format
 msgid "Qatar"
 msgstr "สถานะ:"
 
-#: lang.pm:361
+#: lang.pm:369
 #, fuzzy, c-format
 msgid "Reunion"
 msgstr "ขนาดจอภาพ"
 
-#: lang.pm:362
+#: lang.pm:370
 #, fuzzy, c-format
 msgid "Romania"
 msgstr "โดเมน NIS"
 
-#: lang.pm:363
-#, fuzzy, c-format
+#: lang.pm:371 network/adsl_consts.pm:642
+#, c-format
 msgid "Russia"
 msgstr "รัสเซีย"
 
-#: lang.pm:364
+#: lang.pm:372
 #, c-format
 msgid "Rwanda"
 msgstr ""
 
-#: lang.pm:365
+#: lang.pm:373
 #, c-format
 msgid "Saudi Arabia"
 msgstr ""
 
-#: lang.pm:366
+#: lang.pm:374
 #, c-format
 msgid "Solomon Islands"
 msgstr ""
 
-#: lang.pm:367
+#: lang.pm:375
 #, fuzzy, c-format
 msgid "Seychelles"
 msgstr "เชลล์ที่ใช้"
 
-#: lang.pm:368
+#: lang.pm:376
 #, fuzzy, c-format
 msgid "Sudan"
 msgstr "SunOS"
 
-#: lang.pm:370
+#: lang.pm:378
 #, c-format
 msgid "Singapore"
 msgstr ""
 
-#: lang.pm:371
+#: lang.pm:379
 #, c-format
 msgid "Saint Helena"
 msgstr ""
 
-#: lang.pm:372 network/adsl_consts.pm:520
+#: lang.pm:380 network/adsl_consts.pm:652
 #, fuzzy, c-format
 msgid "Slovenia"
 msgstr "สโลวาเนีย"
 
-#: lang.pm:373
+#: lang.pm:381
 #, c-format
 msgid "Svalbard and Jan Mayen Islands"
 msgstr ""
 
-#: lang.pm:374
-#, fuzzy, c-format
-msgid "Slovakia"
-msgstr "สโลวาเนีย"
-
-#: lang.pm:375
+#: lang.pm:383
 #, c-format
 msgid "Sierra Leone"
 msgstr ""
 
-#: lang.pm:376
+#: lang.pm:384
 #, c-format
 msgid "San Marino"
 msgstr ""
 
-#: lang.pm:377
+#: lang.pm:385
 #, fuzzy, c-format
 msgid "Senegal"
 msgstr "enable"
 
-#: lang.pm:378
+#: lang.pm:386
 #, fuzzy, c-format
 msgid "Somalia"
 msgstr "โดเมน NIS"
 
-#: lang.pm:379
+#: lang.pm:387
 #, fuzzy, c-format
 msgid "Suriname"
 msgstr "ชื่อที่ใช้ในกรุ๊ป (sharename)"
 
-#: lang.pm:380
+#: lang.pm:388
 #, c-format
 msgid "Sao Tome and Principe"
 msgstr ""
 
-#: lang.pm:381
+#: lang.pm:389
 #, c-format
 msgid "El Salvador"
 msgstr ""
 
-#: lang.pm:382
+#: lang.pm:390
 #, c-format
 msgid "Syria"
 msgstr ""
 
-#: lang.pm:383
+#: lang.pm:391
 #, c-format
 msgid "Swaziland"
 msgstr ""
 
-#: lang.pm:384
+#: lang.pm:392
 #, c-format
 msgid "Turks and Caicos Islands"
 msgstr ""
 
-#: lang.pm:385
+#: lang.pm:393
 #, c-format
 msgid "Chad"
 msgstr ""
 
-#: lang.pm:386
+#: lang.pm:394
 #, c-format
 msgid "French Southern Territories"
 msgstr ""
 
-#: lang.pm:387
+#: lang.pm:395
 #, c-format
 msgid "Togo"
 msgstr ""
 
-#: lang.pm:388 network/adsl_consts.pm:585
+#: lang.pm:396 network/adsl_consts.pm:806
 #, c-format
 msgid "Thailand"
 msgstr ""
 
-#: lang.pm:389
+#: lang.pm:397
 #, c-format
 msgid "Tajikistan"
 msgstr ""
 
-#: lang.pm:390
+#: lang.pm:398
 #, c-format
 msgid "Tokelau"
 msgstr ""
 
-#: lang.pm:391
+#: lang.pm:399
 #, c-format
 msgid "East Timor"
 msgstr ""
 
-#: lang.pm:392
+#: lang.pm:400
 #, c-format
 msgid "Turkmenistan"
 msgstr ""
 
-#: lang.pm:393
+#: lang.pm:401 network/adsl_consts.pm:816
 #, c-format
 msgid "Tunisia"
 msgstr ""
 
-#: lang.pm:394
+#: lang.pm:402
 #, c-format
 msgid "Tonga"
 msgstr ""
 
-#: lang.pm:395
+#: lang.pm:403
 #, c-format
 msgid "Turkey"
 msgstr ""
 
-#: lang.pm:396
+#: lang.pm:404
 #, c-format
 msgid "Trinidad and Tobago"
 msgstr ""
 
-#: lang.pm:397
+#: lang.pm:405
 #, c-format
 msgid "Tuvalu"
 msgstr ""
 
-#: lang.pm:398
-#, fuzzy, c-format
-msgid "Taiwan"
-msgstr "ตำแหน่ง"
-
-#: lang.pm:399
+#: lang.pm:407
 #, c-format
 msgid "Tanzania"
 msgstr ""
 
-#: lang.pm:400
+#: lang.pm:408
 #, fuzzy, c-format
 msgid "Ukraine"
 msgstr "ยูเครน"
 
-#: lang.pm:401
+#: lang.pm:409
 #, fuzzy, c-format
 msgid "Uganda"
 msgstr "Update"
 
-#: lang.pm:402
+#: lang.pm:410
 #, c-format
 msgid "United States Minor Outlying Islands"
 msgstr ""
 
-#: lang.pm:404
+#: lang.pm:412
 #, c-format
 msgid "Uruguay"
 msgstr ""
 
-#: lang.pm:405
+#: lang.pm:413
 #, c-format
 msgid "Uzbekistan"
 msgstr ""
 
-#: lang.pm:406
+#: lang.pm:414
 #, fuzzy, c-format
 msgid "Vatican"
 msgstr "ตำแหน่ง"
 
-#: lang.pm:407
+#: lang.pm:415
 #, c-format
 msgid "Saint Vincent and the Grenadines"
 msgstr ""
 
-#: lang.pm:408
+#: lang.pm:416
 #, c-format
 msgid "Venezuela"
 msgstr ""
 
-#: lang.pm:409
+#: lang.pm:417
 #, c-format
 msgid "Virgin Islands (British)"
 msgstr ""
 
-#: lang.pm:410
+#: lang.pm:418
 #, c-format
 msgid "Virgin Islands (U.S.)"
 msgstr ""
 
-#: lang.pm:411
+#: lang.pm:419
 #, c-format
 msgid "Vietnam"
 msgstr ""
 
-#: lang.pm:412
+#: lang.pm:420
 #, c-format
 msgid "Vanuatu"
 msgstr ""
 
-#: lang.pm:413
+#: lang.pm:421
 #, c-format
 msgid "Wallis and Futuna"
 msgstr ""
 
-#: lang.pm:414
+#: lang.pm:422
 #, c-format
 msgid "Samoa"
 msgstr ""
 
-#: lang.pm:415
+#: lang.pm:423
 #, c-format
 msgid "Yemen"
 msgstr ""
 
-#: lang.pm:416
+#: lang.pm:424
 #, c-format
 msgid "Mayotte"
 msgstr ""
 
-#: lang.pm:417 standalone/drakxtv:49
+#: lang.pm:425 standalone/drakxtv:49
 #, c-format
 msgid "South Africa"
 msgstr ""
 
-#: lang.pm:418
+#: lang.pm:426
 #, c-format
 msgid "Zambia"
 msgstr ""
 
-#: lang.pm:419
+#: lang.pm:427
 #, fuzzy, c-format
 msgid "Zimbabwe"
 msgstr "อาจจะ"
 
-#: lang.pm:1047
+#: lang.pm:1040
 #, 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
+#: lang.pm:1043 standalone/scannerdrake:135
 #, c-format
 msgid ", "
-msgstr ""
+msgstr ", "
 
-#: lang.pm:1101
+#: lang.pm:1094
 #, c-format
 msgid "Welcome to %s"
 msgstr "ยินดีต้อนรับสู่ %s"
@@ -8111,12 +8278,12 @@ msgstr "ยินดีต้อนรับสู่ %s"
 msgid "Circular mounts %s\n"
 msgstr "Circular mounts %s\n"
 
-#: lvm.pm:116
+#: lvm.pm:111
 #, c-format
 msgid "Remove the logical volumes first\n"
 msgstr "ลบ logical volume ก่อน\n"
 
-#: modules/interactive.pm:21 standalone/drakconnect:1033
+#: modules/interactive.pm:21 standalone/drakconnect:1032
 #, c-format
 msgid "Parameters"
 msgstr "Parameters"
@@ -8156,26 +8323,46 @@ msgstr "คุณมีอินเทอร์เฟส %s จำนวนเ�
 msgid "See hardware info"
 msgstr "อ่านต่อข้อมูลของฮาร์ดแวร์"
 
+#: modules/interactive.pm:82
+#, fuzzy, c-format
+msgid "Installing driver for USB controller"
+msgstr "ติดตั้งไดรเวอร์สำหรับ %s การ์ด %s"
+
+#: modules/interactive.pm:83
+#, fuzzy, c-format
+msgid "Installing driver for firewire controller %s"
+msgstr "ติดตั้งไดรเวอร์สำหรับ %s การ์ด %s"
+
+#: modules/interactive.pm:84
+#, fuzzy, c-format
+msgid "Installing driver for hard drive controller %s"
+msgstr "ติดตั้งไดรเวอร์สำหรับ %s การ์ด %s"
+
+#: modules/interactive.pm:85
+#, fuzzy, c-format
+msgid "Installing driver for ethernet controller %s"
+msgstr "ติดตั้งไดรเวอร์สำหรับ %s การ์ด %s"
+
 #. -PO: the first %s is the card type (scsi, network, sound,...)
 #. -PO: the second is the vendor+model name
-#: modules/interactive.pm:87
+#: modules/interactive.pm:96
 #, c-format
 msgid "Installing driver for %s card %s"
 msgstr "ติดตั้งไดรเวอร์สำหรับ %s การ์ด %s"
 
-#: modules/interactive.pm:87
+#: modules/interactive.pm:99
 #, c-format
 msgid "(module %s)"
 msgstr "(โมดูล %s)"
 
-#: modules/interactive.pm:98
+#: modules/interactive.pm:109
 #, c-format
 msgid ""
 "You may now provide options to module %s.\n"
 "Note that any address should be entered with the prefix 0x like '0x123'"
 msgstr ""
 
-#: modules/interactive.pm:104
+#: modules/interactive.pm:115
 #, c-format
 msgid ""
 "You may now provide options to module %s.\n"
@@ -8186,18 +8373,18 @@ msgstr ""
 "อ๊อปชั่นจะอยู่ในรูปแบบ ``name=value name2=value2 ...''\n"
 "ตัวอย่างเช่น, ``io=0x300 irq=7''"
 
-#: modules/interactive.pm:106
+#: modules/interactive.pm:117
 #, c-format
 msgid "Module options:"
 msgstr "อ๊อปชั่นของโมดูล:"
 
 #. -PO: the %s is the driver type (scsi, network, sound,...)
-#: modules/interactive.pm:119
+#: modules/interactive.pm:130
 #, c-format
 msgid "Which %s driver should I try?"
 msgstr "ต้องการให้โปรแกรมทดลองใช้ไดรเวอร์ %s ชนิดใด?"
 
-#: modules/interactive.pm:128
+#: modules/interactive.pm:139
 #, c-format
 msgid ""
 "In some cases, the %s driver needs to have extra information to work\n"
@@ -8214,17 +8401,17 @@ msgstr ""
 "ตรวจหาข้อมูลที่จำเป็นต้องใช้? ในบางกรณีการตรวจหาอาจทำให้คอมพิวเตอร์แฮงค์\n"
 "แต่จะไม่เป็นอันตรายกับคอมพิวเตอร์"
 
-#: modules/interactive.pm:132
+#: modules/interactive.pm:143
 #, c-format
 msgid "Autoprobe"
 msgstr "ตรวจหาอัตโนมัติ"
 
-#: modules/interactive.pm:132
+#: modules/interactive.pm:143
 #, c-format
 msgid "Specify options"
 msgstr "ระบุอ๊อปชั่น"
 
-#: modules/interactive.pm:144
+#: modules/interactive.pm:155
 #, c-format
 msgid ""
 "Loading module %s failed.\n"
@@ -8283,14 +8470,14 @@ msgstr "Generic PS2 Wheel Mouse"
 msgid "GlidePoint"
 msgstr "GlidePoint"
 
-#: 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
+#: mouse.pm:36 network/modem.pm:58 network/modem.pm:59 network/modem.pm:60
+#: network/modem.pm:85 network/modem.pm:99 network/modem.pm:104
+#: network/modem.pm:137 network/netconnect.pm:645 network/netconnect.pm:650
+#: network/netconnect.pm:662 network/netconnect.pm:667
+#: network/netconnect.pm:683 network/netconnect.pm:685
+#, c-format
 msgid "Automatic"
-msgstr "กำหนดค่า IP แบบอัตโนมัติ"
+msgstr "อัตโนมัติ"
 
 #: mouse.pm:39 mouse.pm:73
 #, c-format
@@ -8437,7 +8624,7 @@ msgstr ""
 msgid "Synaptics Touchpad"
 msgstr ""
 
-#: mouse.pm:93 standalone/drakconnect:358 standalone/drakvpn:1140
+#: mouse.pm:93 standalone/drakconnect:360 standalone/drakvpn:1140
 #, c-format
 msgid "none"
 msgstr "ไม่มี"
@@ -8497,23 +8684,23 @@ msgstr ""
 msgid "Sagem (using DHCP) USB"
 msgstr ""
 
-#: network/adsl.pm:35 network/netconnect.pm:799
+#: network/adsl.pm:35 network/netconnect.pm:839
 #, c-format
 msgid "Connect to the Internet"
 msgstr "ต่อเข้า Internet "
 
-#: network/adsl.pm:36 network/netconnect.pm:800
+#: network/adsl.pm:36 network/netconnect.pm:840
 #, 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'"
+"If you do not know, choose 'use PPPoE'"
 msgstr ""
 "การติดต่อโดยทั่วไปของ adsl คือ pppoe.\n"
 "บางครั้งอาจใช้  pptp มีน้อยคนที่ใช้  DHCP.\n"
 "ถ้าคุณไม่ทราบ เลือก 'use PPPoE'"
 
-#: network/adsl.pm:41 network/netconnect.pm:804
+#: network/adsl.pm:41 network/netconnect.pm:844
 #, fuzzy, c-format
 msgid "ADSL connection type:"
 msgstr "LAN connection"
@@ -8534,9 +8721,9 @@ msgid "SSH server"
 msgstr "เซิร์ฟเวอร์ NIS"
 
 #: network/drakfirewall.pm:27
-#, fuzzy, c-format
+#, c-format
 msgid "FTP server"
-msgstr "เซิร์ฟเวอร์ NIS"
+msgstr "เซอร์เวอร์ FTP"
 
 #: network/drakfirewall.pm:32
 #, fuzzy, c-format
@@ -8554,9 +8741,9 @@ msgid "Telnet server"
 msgstr "X เซิร์ฟเวอร์"
 
 #: network/drakfirewall.pm:48
-#, fuzzy, c-format
-msgid "Samba server"
-msgstr "เซิร์ฟเวอร์ NIS"
+#, c-format
+msgid "Windows Files Sharing (SMB)"
+msgstr ""
 
 #: network/drakfirewall.pm:54
 #, fuzzy, c-format
@@ -8630,107 +8817,107 @@ msgstr ""
 msgid "Other ports"
 msgstr "กำลังตรวจสอบพอร์ต"
 
-#: network/isdn.pm:125 network/netconnect.pm:456 network/netconnect.pm:564
-#: network/netconnect.pm:567
+#: network/isdn.pm:125 network/netconnect.pm:490 network/netconnect.pm:602
+#: network/netconnect.pm:605
 #, c-format
 msgid "Unlisted - edit manually"
 msgstr ""
 
-#: network/isdn.pm:168 network/netconnect.pm:388
+#: network/isdn.pm:168 network/netconnect.pm:422
 #, c-format
 msgid "ISA / PCMCIA"
 msgstr "ISA / PCMCIA"
 
-#: network/isdn.pm:168 network/netconnect.pm:388
+#: network/isdn.pm:168 network/netconnect.pm:422
 #, c-format
-msgid "I don't know"
+msgid "I do not know"
 msgstr "ผมไม่ทราบ"
 
-#: network/isdn.pm:169 network/netconnect.pm:388
+#: network/isdn.pm:169 network/netconnect.pm:422
 #, c-format
 msgid "PCI"
 msgstr "PCI"
 
-#: network/isdn.pm:170 network/netconnect.pm:388
+#: network/isdn.pm:170 network/netconnect.pm:422
 #, c-format
 msgid "USB"
-msgstr ""
+msgstr "USB"
 
-#: 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
+#: network/modem.pm:58 network/modem.pm:59 network/modem.pm:60
+#: network/netconnect.pm:650 network/netconnect.pm:667
+#: network/netconnect.pm:683
+#, c-format
 msgid "Manual"
-msgstr "เลือกภาษาที่คุณใช้"
+msgstr "_ระบุค่า"
 
-#: network/netconnect.pm:89 network/netconnect.pm:485
-#: network/netconnect.pm:489
+#: network/netconnect.pm:90 network/netconnect.pm:519
+#: network/netconnect.pm:523
 #, fuzzy, c-format
 msgid "Manual choice"
 msgstr "เลือกภาษาที่คุณใช้"
 
-#: network/netconnect.pm:89
+#: network/netconnect.pm:90
 #, c-format
 msgid "Internal ISDN card"
 msgstr "Internal ISDN card"
 
-#: network/netconnect.pm:98
+#: network/netconnect.pm:100
 #, c-format
 msgid "Ad-hoc"
 msgstr ""
 
-#: network/netconnect.pm:99
+#: network/netconnect.pm:101
 #, fuzzy, c-format
 msgid "Managed"
 msgstr "เลือกภาษาที่คุณใช้"
 
-#: network/netconnect.pm:100
+#: network/netconnect.pm:102
 #, fuzzy, c-format
 msgid "Master"
 msgstr "Mouse"
 
-#: network/netconnect.pm:101
+#: network/netconnect.pm:103
 #, fuzzy, c-format
 msgid "Repeater"
 msgstr "เรียกคืนจากไฟล์"
 
-#: network/netconnect.pm:102
-#, fuzzy, c-format
+#: network/netconnect.pm:104
+#, c-format
 msgid "Secondary"
-msgstr "%d วินาที"
+msgstr "รอง (Secondary)"
 
-#: network/netconnect.pm:103
-#, fuzzy, c-format
+#: network/netconnect.pm:105
+#, c-format
 msgid "Auto"
-msgstr "เลิก"
+msgstr "อัตโนมัติ"
 
-#: network/netconnect.pm:106 printer/printerdrake.pm:1248
+#: network/netconnect.pm:108 printer/printerdrake.pm:1354
 #: standalone/drakups:75
 #, fuzzy, c-format
 msgid "Manual configuration"
 msgstr "การคอนฟิก"
 
-#: network/netconnect.pm:107
+#: network/netconnect.pm:109
 #, fuzzy, c-format
 msgid "Automatic IP (BOOTP/DHCP)"
 msgstr "กำหนดค่า IP แบบอัตโนมัติ"
 
-#: network/netconnect.pm:109
+#: network/netconnect.pm:111
 #, c-format
 msgid "Automatic IP (BOOTP/DHCP/Zeroconf)"
 msgstr ""
 
-#: network/netconnect.pm:112
+#: network/netconnect.pm:114
 #, fuzzy, c-format
 msgid "Protocol for the rest of the world"
 msgstr "Rest of the world"
 
-#: network/netconnect.pm:114 standalone/drakconnect:539
+#: network/netconnect.pm:116 standalone/drakconnect:541
 #, fuzzy, c-format
 msgid "European protocol (EDSS1)"
 msgstr "ยุโรป (EDS11)"
 
-#: network/netconnect.pm:115 standalone/drakconnect:540
+#: network/netconnect.pm:117 standalone/drakconnect:542
 #, fuzzy, c-format
 msgid ""
 "Protocol for the rest of the world\n"
@@ -8739,168 +8926,168 @@ msgstr ""
 "Rest of the world \n"
 "No D-Channel (leased lines)"
 
-#: network/netconnect.pm:151
+#: network/netconnect.pm:153
 #, fuzzy, c-format
 msgid "Alcatel speedtouch USB modem"
 msgstr "กรุณาทดสอบเม้าส์"
 
-#: network/netconnect.pm:152
+#: network/netconnect.pm:154
 #, fuzzy, c-format
 msgid "Sagem USB modem"
 msgstr "System mode"
 
-#: network/netconnect.pm:153
+#: network/netconnect.pm:155
 #, c-format
 msgid "Bewan modem"
 msgstr ""
 
-#: network/netconnect.pm:154
+#: network/netconnect.pm:156
 #, c-format
 msgid "ECI Hi-Focus modem"
 msgstr ""
 
-#: network/netconnect.pm:158
+#: network/netconnect.pm:160
 #, c-format
 msgid "Dynamic Host Configuration Protocol (DHCP)"
 msgstr ""
 
-#: network/netconnect.pm:159
+#: network/netconnect.pm:161
 #, fuzzy, c-format
 msgid "Manual TCP/IP configuration"
 msgstr "การคอนฟิก"
 
-#: network/netconnect.pm:160
+#: network/netconnect.pm:162
 #, c-format
 msgid "Point to Point Tunneling Protocol (PPTP)"
 msgstr ""
 
-#: network/netconnect.pm:161
+#: network/netconnect.pm:163
 #, c-format
 msgid "PPP over Ethernet (PPPoE)"
 msgstr ""
 
-#: network/netconnect.pm:162
+#: network/netconnect.pm:164
 #, c-format
 msgid "PPP over ATM (PPPoA)"
 msgstr ""
 
-#: network/netconnect.pm:163
+#: network/netconnect.pm:165
 #, c-format
 msgid "DSL over CAPI"
 msgstr ""
 
-#: network/netconnect.pm:167
+#: network/netconnect.pm:169
 #, fuzzy, c-format
 msgid "Bridged Ethernet LLC"
 msgstr "Ethernet Card"
 
-#: network/netconnect.pm:168
+#: network/netconnect.pm:170
 #, fuzzy, c-format
 msgid "Bridged Ethernet VC"
 msgstr "Ethernet Card"
 
-#: network/netconnect.pm:169
+#: network/netconnect.pm:171
 #, c-format
 msgid "Routed IP LLC"
 msgstr ""
 
-#: network/netconnect.pm:170
+#: network/netconnect.pm:172
 #, c-format
 msgid "Routed IP VC"
 msgstr ""
 
-#: network/netconnect.pm:171
+#: network/netconnect.pm:173
 #, c-format
 msgid "PPPoA LLC"
 msgstr ""
 
-#: network/netconnect.pm:172
+#: network/netconnect.pm:174
 #, c-format
 msgid "PPPoA VC"
 msgstr ""
 
-#: network/netconnect.pm:176 standalone/drakconnect:474
+#: network/netconnect.pm:178 standalone/drakconnect:476
 #, c-format
 msgid "Script-based"
 msgstr "รูปแบบสคริปต์"
 
-#: network/netconnect.pm:177 standalone/drakconnect:474
+#: network/netconnect.pm:179 standalone/drakconnect:476
 #, c-format
 msgid "PAP"
 msgstr "PAP"
 
-#: network/netconnect.pm:178 standalone/drakconnect:474
+#: network/netconnect.pm:180 standalone/drakconnect:476
 #, c-format
 msgid "Terminal-based"
 msgstr "รูปแบบเทอร์มินอล"
 
-#: network/netconnect.pm:179 standalone/drakconnect:474
+#: network/netconnect.pm:181 standalone/drakconnect:476
 #, c-format
 msgid "CHAP"
-msgstr ""
+msgstr "CHAP"
 
-#: network/netconnect.pm:180 standalone/drakconnect:474
+#: network/netconnect.pm:182 standalone/drakconnect:476
 #, c-format
 msgid "PAP/CHAP"
-msgstr ""
+msgstr "PAP/CHAP"
 
-#: network/netconnect.pm:236 standalone/drakconnect:59
+#: network/netconnect.pm:238 standalone/drakconnect:59
 #, fuzzy, c-format
 msgid "Network & Internet Configuration"
 msgstr "การคอนฟิกระบบเน็ตเวิร์ก"
 
-#: network/netconnect.pm:242
+#: network/netconnect.pm:244
 #, 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:244
+#: network/netconnect.pm:246
 #, fuzzy, c-format
 msgid "(detected %s)"
 msgstr "ค้นพบ %s"
 
-#: network/netconnect.pm:244
+#: network/netconnect.pm:246
 #, fuzzy, c-format
 msgid "(detected)"
 msgstr "ค้นพบ %s"
 
-#: network/netconnect.pm:246
-#, fuzzy, c-format
+#: network/netconnect.pm:248
+#, c-format
 msgid "Modem connection"
-msgstr "การติดต่อโดยใช้ Modem ธรรมดา"
+msgstr "โมเด็ม"
 
-#: network/netconnect.pm:247
+#: network/netconnect.pm:249
 #, c-format
 msgid "ISDN connection"
 msgstr "การติดต่อโดยใช้ ISDN"
 
-#: network/netconnect.pm:248
+#: network/netconnect.pm:250
 #, fuzzy, c-format
 msgid "ADSL connection"
 msgstr "LAN connection"
 
-#: network/netconnect.pm:249
+#: network/netconnect.pm:251
 #, c-format
 msgid "Cable connection"
 msgstr "cable connection"
 
-#: network/netconnect.pm:250
+#: network/netconnect.pm:252
 #, c-format
 msgid "LAN connection"
 msgstr "LAN connection"
 
-#: network/netconnect.pm:251 network/netconnect.pm:265
-#, fuzzy, c-format
+#: network/netconnect.pm:253 network/netconnect.pm:267
+#, c-format
 msgid "Wireless connection"
-msgstr "cable connection"
+msgstr "ไร้สาย"
 
-#: network/netconnect.pm:261
+#: network/netconnect.pm:263
 #, fuzzy, c-format
 msgid "Choose the connection you want to configure"
 msgstr "เลือกเครื่องมือที่คุณต้องการใช้"
 
-#: network/netconnect.pm:279
+#: network/netconnect.pm:277
 #, fuzzy, c-format
 msgid ""
 "We are now going to configure the %s connection.\n"
@@ -8911,130 +9098,141 @@ msgstr ""
 "\n"
 "คุณสามารถเลิกติดต่อหรือทำการปรับแต่งการติดต่อของคุณใหม่"
 
-#: network/netconnect.pm:287 network/netconnect.pm:839
+#: network/netconnect.pm:285 network/netconnect.pm:879
 #, c-format
 msgid "Connection Configuration"
 msgstr "การคอนฟิก Connection"
 
-#: network/netconnect.pm:288 network/netconnect.pm:840
+#: network/netconnect.pm:286 network/netconnect.pm:880
 #, c-format
 msgid "Please fill or check the field below"
 msgstr "กรุณาเลือกช่องข้างล่างนี้"
 
-#: network/netconnect.pm:295 standalone/drakconnect:530
+#: network/netconnect.pm:293 standalone/drakconnect:532
 #, c-format
 msgid "Card IRQ"
 msgstr "Card IRQ"
 
-#: network/netconnect.pm:296 standalone/drakconnect:531
+#: network/netconnect.pm:294 standalone/drakconnect:533
 #, c-format
 msgid "Card mem (DMA)"
 msgstr "Card mem (DMA)"
 
-#: network/netconnect.pm:297 standalone/drakconnect:532
+#: network/netconnect.pm:295 standalone/drakconnect:534
 #, c-format
 msgid "Card IO"
 msgstr "Card IO"
 
-#: network/netconnect.pm:298 standalone/drakconnect:533
+#: network/netconnect.pm:296 standalone/drakconnect:535
 #, c-format
 msgid "Card IO_0"
 msgstr "Card IO_0"
 
-#: network/netconnect.pm:299
+#: network/netconnect.pm:297
 #, c-format
 msgid "Card IO_1"
 msgstr "Card IO_1"
 
-#: network/netconnect.pm:300
+#: network/netconnect.pm:298
 #, c-format
 msgid "Your personal phone number"
 msgstr "เบอร์โทรศัพท์ส่วนตัว"
 
-#: network/netconnect.pm:301 network/netconnect.pm:843
+#: network/netconnect.pm:299 network/netconnect.pm:883
 #, c-format
 msgid "Provider name (ex provider.net)"
 msgstr "ชื่อผู้ให้บริการ (ex KSC)"
 
-#: network/netconnect.pm:302 standalone/drakconnect:469
+#: network/netconnect.pm:300 standalone/drakconnect:471
 #, c-format
 msgid "Provider phone number"
 msgstr "หมายเลขโทรศัพท์"
 
-#: network/netconnect.pm:303
+#: network/netconnect.pm:301
 #, fuzzy, c-format
 msgid "Provider DNS 1 (optional)"
 msgstr "ผู้ให้บริการ dns 1 (optional)"
 
-#: network/netconnect.pm:304
+#: network/netconnect.pm:302
 #, fuzzy, c-format
 msgid "Provider DNS 2 (optional)"
 msgstr "ผู้ให้บริการ dns 2 (optional)"
 
-#: network/netconnect.pm:305 standalone/drakconnect:420
+#: network/netconnect.pm:303 standalone/drakconnect:422
 #, c-format
 msgid "Dialing mode"
 msgstr "การหมุนโทรศัพท์ด้วยโมเด็ม"
 
-#: network/netconnect.pm:306 standalone/drakconnect:425
-#: standalone/drakconnect:493
+#: network/netconnect.pm:304 standalone/drakconnect:427
+#: standalone/drakconnect:495
 #, fuzzy, c-format
 msgid "Connection speed"
 msgstr "ชนิดการเชื่อมต่อ"
 
-#: network/netconnect.pm:307 standalone/drakconnect:430
+#: network/netconnect.pm:305 standalone/drakconnect:432
 #, fuzzy, c-format
 msgid "Connection timeout (in sec)"
 msgstr "ชนิดการเชื่อมต่อ"
 
-#: network/netconnect.pm:310 network/netconnect.pm:846
-#: standalone/drakconnect:467
+#: network/netconnect.pm:308 network/netconnect.pm:329
+#: network/netconnect.pm:886 standalone/drakconnect:469
 #, c-format
 msgid "Account Login (user name)"
 msgstr "Account Login (user name)"
 
-#: network/netconnect.pm:311 network/netconnect.pm:847
-#: standalone/drakconnect:468
+#: network/netconnect.pm:309 network/netconnect.pm:330
+#: network/netconnect.pm:887 standalone/drakconnect:470
 #, c-format
 msgid "Account Password"
 msgstr "รหัสผ่าน"
 
-#: network/netconnect.pm:328 network/netconnect.pm:677
-#: network/netconnect.pm:880
+#: network/netconnect.pm:325
+#, fuzzy, c-format
+msgid "Cable: account options"
+msgstr "อ็อปชั่นของการหมุนโทรศัพท์"
+
+#: network/netconnect.pm:328
+#, c-format
+msgid "Use BPALogin (needed for Telstra)"
+msgstr ""
+
+#: network/netconnect.pm:362 network/netconnect.pm:715
+#: network/netconnect.pm:920
 #, fuzzy, c-format
 msgid "Select the network interface to configure:"
 msgstr "เลือก network interface"
 
-#: 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
+#: network/netconnect.pm:364 network/netconnect.pm:412
+#: network/netconnect.pm:716 network/netconnect.pm:922
+#: network/netconnect.pm:1091 network/shorewall.pm:98
+#: standalone/drakconnect:684 standalone/drakgw:224 standalone/drakvpn:221
 #, fuzzy, c-format
 msgid "Net Device"
 msgstr "ชื่อเซิร์ฟเวอร์ของพรินเตอร์"
 
-#: network/netconnect.pm:331 network/netconnect.pm:339
+#: network/netconnect.pm:365 network/netconnect.pm:373
 #, c-format
 msgid "External ISDN modem"
 msgstr "External ISDN modem"
 
-#: network/netconnect.pm:377 standalone/harddrake2:192
+#: network/netconnect.pm:411 standalone/harddrake2:210
 #, fuzzy, c-format
 msgid "Select a device!"
 msgstr "เลือกกราฟฟิคการ์ด"
 
-#: network/netconnect.pm:386 network/netconnect.pm:396
-#: network/netconnect.pm:406 network/netconnect.pm:439
-#: network/netconnect.pm:453
+#: network/netconnect.pm:420 network/netconnect.pm:430
+#: network/netconnect.pm:440 network/netconnect.pm:473
+#: network/netconnect.pm:487
 #, c-format
 msgid "ISDN Configuration"
 msgstr "การคอนฟิก ISDN"
 
-#: network/netconnect.pm:387
+#: network/netconnect.pm:421
 #, c-format
 msgid "What kind of card do you have?"
 msgstr "คุณมีการ์ดชนิดใด?"
 
-#: network/netconnect.pm:397
+#: network/netconnect.pm:431
 #, c-format
 msgid ""
 "\n"
@@ -9048,22 +9246,22 @@ msgstr ""
 "\n"
 "ถ้าคุณมีการ์ด PCMCIA คุณต้องรู้ irq และ io ของการ์ดของคุณ\n"
 
-#: network/netconnect.pm:401
+#: network/netconnect.pm:435
 #, c-format
 msgid "Continue"
 msgstr "ทำงานต่อหรือไม่?"
 
-#: network/netconnect.pm:401
+#: network/netconnect.pm:435
 #, c-format
 msgid "Abort"
 msgstr "เลิก"
 
-#: network/netconnect.pm:407
+#: network/netconnect.pm:441
 #, fuzzy, c-format
 msgid "Which of the following is your ISDN card?"
 msgstr "คุณใช้การ์ด ISDN ใด?"
 
-#: network/netconnect.pm:425
+#: network/netconnect.pm:459
 #, c-format
 msgid ""
 "A CAPI driver is available for this modem. This CAPI driver can offer more "
@@ -9071,157 +9269,157 @@ msgid ""
 "want to use?"
 msgstr ""
 
-#: network/netconnect.pm:427 standalone/drakconnect:116 standalone/drakups:247
-#: standalone/harddrake2:117
+#: network/netconnect.pm:461 standalone/drakconnect:116 standalone/drakups:247
+#: standalone/harddrake2:131
 #, c-format
 msgid "Driver"
 msgstr "Driver"
 
-#: network/netconnect.pm:439
+#: network/netconnect.pm:473
 #, c-format
 msgid "Which protocol do you want to use?"
 msgstr "Protocol ไหนที่คุณต้องการ"
 
-#: network/netconnect.pm:441 standalone/drakconnect:116
-#: standalone/drakconnect:309 standalone/drakconnect:538
+#: network/netconnect.pm:475 standalone/drakconnect:116
+#: standalone/drakconnect:309 standalone/drakconnect:540
 #: standalone/drakvpn:1142
 #, c-format
 msgid "Protocol"
 msgstr "Protocol"
 
-#: network/netconnect.pm:453
+#: network/netconnect.pm:487
 #, c-format
 msgid ""
 "Select your provider.\n"
-"If it isn't listed, choose Unlisted."
+"If it is not listed, choose Unlisted."
 msgstr ""
 "เลือกผู้ให้บริการ\n"
 "ถ้าไม่มีเลือก ไม่มี (unlisted)"
 
-#: network/netconnect.pm:455 network/netconnect.pm:563
-#: network/netconnect.pm:719
+#: network/netconnect.pm:489 network/netconnect.pm:601
+#: network/netconnect.pm:757
 #, fuzzy, c-format
 msgid "Provider:"
 msgstr "Profile: "
 
-#: network/netconnect.pm:470
+#: network/netconnect.pm:504
 #, c-format
 msgid ""
-"Your modem isn't supported by the system.\n"
+"Your modem is not supported by the system.\n"
 "Take a look at http://www.linmodems.org"
 msgstr ""
 
-#: network/netconnect.pm:482
+#: network/netconnect.pm:516
 #, fuzzy, c-format
 msgid "Select the modem to configure:"
 msgstr "เลือก network interface"
 
-#: network/netconnect.pm:530
+#: network/netconnect.pm:568
 #, c-format
 msgid "Please choose which serial port your modem is connected to."
 msgstr "คุณต้องการให้โมเด็มของคุณต่อกับพอร์ตอนุกรมใด?"
 
-#: network/netconnect.pm:561
+#: network/netconnect.pm:599
 #, fuzzy, c-format
 msgid "Select your provider:"
 msgstr "เลือกการเชื่อมต่อกับเครื่องพิมพ์"
 
-#: network/netconnect.pm:589
+#: network/netconnect.pm:627
 #, fuzzy, c-format
 msgid "Dialup: account options"
 msgstr "อ็อปชั่นของการหมุนโทรศัพท์"
 
-#: network/netconnect.pm:592
+#: network/netconnect.pm:630
 #, c-format
 msgid "Connection name"
 msgstr "ชื่อการเชื่อมต่อ"
 
-#: network/netconnect.pm:593
+#: network/netconnect.pm:631
 #, c-format
 msgid "Phone number"
 msgstr "หมายเลขโทรศัพท์"
 
-#: network/netconnect.pm:594
+#: network/netconnect.pm:632
 #, c-format
 msgid "Login ID"
 msgstr "หมายเลขประจำตัวการล็อกอิน"
 
-#: network/netconnect.pm:609 network/netconnect.pm:642
+#: network/netconnect.pm:647 network/netconnect.pm:680
 #, fuzzy, c-format
 msgid "Dialup: IP parameters"
 msgstr "Parameters"
 
-#: network/netconnect.pm:612
+#: network/netconnect.pm:650
 #, fuzzy, c-format
 msgid "IP parameters"
 msgstr "Parameters"
 
-#: network/netconnect.pm:613 network/netconnect.pm:976
+#: network/netconnect.pm:651 network/netconnect.pm:1018
 #: printer/printerdrake.pm:454 standalone/drakconnect:116
-#: standalone/drakconnect:323 standalone/drakconnect:880
+#: standalone/drakconnect:325 standalone/drakconnect:879
 #: standalone/drakups:282
 #, c-format
 msgid "IP address"
 msgstr "ค่า IP"
 
-#: network/netconnect.pm:614
+#: network/netconnect.pm:652
 #, fuzzy, c-format
 msgid "Subnet mask"
 msgstr "เน็ตมาสก์"
 
-#: network/netconnect.pm:626
+#: network/netconnect.pm:664
 #, c-format
 msgid "Dialup: DNS parameters"
 msgstr ""
 
-#: network/netconnect.pm:629
-#, fuzzy, c-format
+#: network/netconnect.pm:667
+#, c-format
 msgid "DNS"
-msgstr "ใช้ NIS"
+msgstr "DNS"
 
-#: network/netconnect.pm:630
+#: network/netconnect.pm:668
 #, c-format
 msgid "Domain name"
 msgstr "ชื่อโดเมน"
 
-#: network/netconnect.pm:631 network/netconnect.pm:844
-#: standalone/drakconnect:998
+#: network/netconnect.pm:669 network/netconnect.pm:884
+#: standalone/drakconnect:997
 #, c-format
 msgid "First DNS Server (optional)"
 msgstr "เซิรฟ์เวอร์ DNS เครื่องแรก (optional)"
 
-#: network/netconnect.pm:632 network/netconnect.pm:845
-#: standalone/drakconnect:999
+#: network/netconnect.pm:670 network/netconnect.pm:885
+#: standalone/drakconnect:998
 #, c-format
 msgid "Second DNS Server (optional)"
 msgstr "เซิรฟ์เวอร์ DNS เครื่องที่สอง (optional)"
 
-#: network/netconnect.pm:633
+#: network/netconnect.pm:671
 #, fuzzy, c-format
 msgid "Set hostname from IP"
 msgstr "ชื่อของเครื่องพิมพ์"
 
-#: network/netconnect.pm:645 standalone/drakconnect:334
+#: network/netconnect.pm:683 standalone/drakconnect:336
 #, c-format
 msgid "Gateway"
 msgstr "เกตเวย์"
 
-#: network/netconnect.pm:646
+#: network/netconnect.pm:684
 #, fuzzy, c-format
 msgid "Gateway IP address"
 msgstr "ค่า IP"
 
-#: network/netconnect.pm:677
+#: network/netconnect.pm:715
 #, fuzzy, c-format
 msgid "ADSL configuration"
 msgstr "การปรับแต่ง LAN"
 
-#: network/netconnect.pm:717
+#: network/netconnect.pm:755
 #, fuzzy, c-format
 msgid "Please choose your ADSL provider"
 msgstr "คุณมีเม้าส์ชนิดใด"
 
-#: network/netconnect.pm:735
+#: network/netconnect.pm:773
 #, c-format
 msgid ""
 "You need the Alcatel microcode.\n"
@@ -9229,32 +9427,32 @@ msgid ""
 "or skip and do it later."
 msgstr ""
 
-#: network/netconnect.pm:739 network/netconnect.pm:744
+#: network/netconnect.pm:777 network/netconnect.pm:782
 #, fuzzy, c-format
 msgid "Use a floppy"
 msgstr "บันทึกลงแผ่นฟล้อปปี้"
 
-#: network/netconnect.pm:739 network/netconnect.pm:748
+#: network/netconnect.pm:777 network/netconnect.pm:786
 #, fuzzy, c-format
 msgid "Use my Windows partition"
 msgstr "คำนวณขอบเขตของระบบไฟล์ Windows"
 
-#: network/netconnect.pm:739 network/netconnect.pm:751
+#: network/netconnect.pm:777 network/netconnect.pm:789
 #, c-format
 msgid "Do it later"
 msgstr ""
 
-#: network/netconnect.pm:758
+#: network/netconnect.pm:796
 #, c-format
 msgid "Firmware copy failed, file %s not found"
 msgstr ""
 
-#: network/netconnect.pm:765
+#: network/netconnect.pm:803
 #, c-format
 msgid "Firmware copy succeeded"
 msgstr ""
 
-#: network/netconnect.pm:780
+#: network/netconnect.pm:818
 #, c-format
 msgid ""
 "You need the Alcatel microcode.\n"
@@ -9263,22 +9461,22 @@ msgid ""
 "and copy the mgmt.o in /usr/share/speedtouch"
 msgstr ""
 
-#: network/netconnect.pm:849
+#: network/netconnect.pm:889
 #, c-format
 msgid "Virtual Path ID (VPI):"
 msgstr ""
 
-#: network/netconnect.pm:850
+#: network/netconnect.pm:890
 #, c-format
 msgid "Virtual Circuit ID (VCI):"
 msgstr ""
 
-#: network/netconnect.pm:853
+#: network/netconnect.pm:893
 #, fuzzy, c-format
 msgid "Encapsulation:"
 msgstr "ขอแสดงความยินดี"
 
-#: network/netconnect.pm:870
+#: network/netconnect.pm:910
 #, c-format
 msgid ""
 "The ECI Hi-Focus modem cannot be supported due to binary driver distribution "
@@ -9287,12 +9485,17 @@ msgid ""
 "You can find a driver on http://eciadsl.flashtux.org/"
 msgstr ""
 
-#: network/netconnect.pm:882
+#: network/netconnect.pm:922
 #, c-format
 msgid "Manually load a driver"
 msgstr ""
 
-#: network/netconnect.pm:898
+#: network/netconnect.pm:922
+#, c-format
+msgid "Use a Windows driver (with ndiswrapper)"
+msgstr ""
+
+#: network/netconnect.pm:940
 #, fuzzy, c-format
 msgid ""
 "WARNING: this device has been previously configured to connect to the "
@@ -9304,7 +9507,7 @@ msgstr ""
 "คุณสามารถยอมรับค่าต่างๆหรือทำการแก้ใขค่าต่างๆข้างล่างนี้\n"
 " "
 
-#: network/netconnect.pm:912 network/netconnect.pm:1340
+#: network/netconnect.pm:954 network/netconnect.pm:1436
 #, fuzzy, c-format
 msgid ""
 "Congratulations, the network and Internet configuration is finished.\n"
@@ -9314,24 +9517,24 @@ msgstr ""
 "\n"
 "ค่าต่างๆจะถูกนำไปใช้เดี๋ยวนี้\n"
 
-#: network/netconnect.pm:929
+#: network/netconnect.pm:971
 #, fuzzy, c-format
 msgid "Zeroconf hostname resolution"
 msgstr "ชื่อโฮสต์:"
 
-#: network/netconnect.pm:930 network/netconnect.pm:963
+#: network/netconnect.pm:972 network/netconnect.pm:1005
 #, fuzzy, c-format
 msgid "Configuring network device %s (driver %s)"
 msgstr "กำลังคอนฟิกอุปกรณ์เน็ตเวิร์ก %s"
 
-#: network/netconnect.pm:931
+#: network/netconnect.pm:973
 #, 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:964
+#: network/netconnect.pm:1006
 #, c-format
 msgid ""
 "Please enter the IP configuration for this machine.\n"
@@ -9342,114 +9545,139 @@ msgstr ""
 "ข้อมูลแต่ละอย่างสามารถใส่เข้าไปได้โดยใช้ค่า IP ในรูปแบบตัวเลขคั่นด้วยจุด\n"
 "(dotted-decimal notation) ตัวอย่างเช่น 1.2.3.4"
 
-#: network/netconnect.pm:971
+#: network/netconnect.pm:1013
 #, fuzzy, c-format
 msgid "Assign host name from DHCP address"
 msgstr "กรุณาทดสอบเม้าส์"
 
-#: network/netconnect.pm:972
+#: network/netconnect.pm:1014
 #, fuzzy, c-format
 msgid "DHCP host name"
 msgstr "ชื่อโฮสต์:"
 
-#: network/netconnect.pm:977 standalone/drakconnect:328
-#: standalone/drakconnect:881 standalone/drakgw:323
+#: network/netconnect.pm:1019 standalone/drakconnect:330
+#: standalone/drakconnect:880 standalone/drakgw:320
 #, c-format
 msgid "Netmask"
 msgstr "เน็ตมาสก์"
 
-#: network/netconnect.pm:979 standalone/drakconnect:413
+#: network/netconnect.pm:1021 standalone/drakconnect:415
 #, c-format
 msgid "Track network card id (useful for laptops)"
 msgstr ""
 
-#: network/netconnect.pm:980 standalone/drakconnect:414
+#: network/netconnect.pm:1022 standalone/drakconnect:416
 #, fuzzy, c-format
 msgid "Network Hotplugging"
 msgstr "การคอนฟิกระบบเน็ตเวิร์ก"
 
-#: network/netconnect.pm:982 standalone/drakconnect:408
+#: network/netconnect.pm:1024 standalone/drakconnect:410
 #, fuzzy, c-format
 msgid "Start at boot"
 msgstr "เริ่มทำงานตอน boot"
 
-#: network/netconnect.pm:985 standalone/drakconnect:884
+#: network/netconnect.pm:1027 standalone/drakconnect:883
 #, c-format
 msgid "DHCP client"
 msgstr "DHCP client"
 
-#: network/netconnect.pm:995 printer/printerdrake.pm:1498
-#: standalone/drakconnect:648
+#: network/netconnect.pm:1037 printer/printerdrake.pm:1605
+#: standalone/drakconnect:649
 #, c-format
 msgid "IP address should be in format 1.2.3.4"
 msgstr "ค่าของ IP ควรอยู่ในรูปแบบ 1.2.3.4"
 
-#: network/netconnect.pm:999
+#: network/netconnect.pm:1041
 #, c-format
 msgid "Warning: IP address %s is usually reserved!"
 msgstr ""
 
-#: network/netconnect.pm:1004 standalone/drakTermServ:1690
-#: standalone/drakTermServ:1691 standalone/drakTermServ:1692
+#: network/netconnect.pm:1046 standalone/drakTermServ:1742
+#: standalone/drakTermServ:1743 standalone/drakTermServ:1744
 #, c-format
 msgid "%s already in use\n"
 msgstr ""
 
-#: network/netconnect.pm:1030 network/netconnect.pm:1059
+#: network/netconnect.pm:1067
+#, fuzzy, c-format
+msgid "Choose an ndiswrapper driver"
+msgstr "เลือก X เซิร์ฟเวอร์"
+
+#: network/netconnect.pm:1068 network/netconnect.pm:1075
+#, fuzzy, c-format
+msgid "Install a new driver"
+msgstr "ติดตั้งระบบ"
+
+#: network/netconnect.pm:1068
+#, fuzzy, c-format
+msgid "Use already installed driver (%s)"
+msgstr "ข้อมูลเฉพาะตัวของผู้ใช้สำหรับ ssh ได้ถูกติดตั้งแล้ว"
+
+#: network/netconnect.pm:1072 printer/printerdrake.pm:3644
+#, fuzzy, c-format
+msgid "Could not install the %s package!"
+msgstr "กำลังติดตั้งแพ็คเก็จ %s"
+
+#: network/netconnect.pm:1076
+#, c-format
+msgid "Please select the Windows driver (.inf file)"
+msgstr ""
+
+#: network/netconnect.pm:1126 network/netconnect.pm:1155
 #, c-format
 msgid "Please enter the wireless parameters for this card:"
 msgstr ""
 
-#: network/netconnect.pm:1033 standalone/drakconnect:380
+#: network/netconnect.pm:1129 standalone/drakconnect:382
 #, fuzzy, c-format
 msgid "Operating Mode"
 msgstr "โหมดผู้เชี่ยวชาญ"
 
-#: network/netconnect.pm:1035 standalone/drakconnect:381
+#: network/netconnect.pm:1131 standalone/drakconnect:383
 #, c-format
 msgid "Network name (ESSID)"
 msgstr ""
 
-#: network/netconnect.pm:1036 standalone/drakconnect:382
+#: network/netconnect.pm:1132 standalone/drakconnect:384
 #, fuzzy, c-format
 msgid "Network ID"
 msgstr "Network interface"
 
-#: network/netconnect.pm:1037 standalone/drakconnect:383
+#: network/netconnect.pm:1133 standalone/drakconnect:385
 #, c-format
 msgid "Operating frequency"
 msgstr ""
 
-#: network/netconnect.pm:1038 standalone/drakconnect:384
+#: network/netconnect.pm:1134 standalone/drakconnect:386
 #, c-format
 msgid "Sensitivity threshold"
 msgstr ""
 
-#: network/netconnect.pm:1039 standalone/drakconnect:385
+#: network/netconnect.pm:1135 standalone/drakconnect:387
 #, c-format
 msgid "Bitrate (in b/s)"
 msgstr ""
 
-#: network/netconnect.pm:1045
+#: network/netconnect.pm:1141
 #, 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:1049
+#: network/netconnect.pm:1145
 #, 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:1062 standalone/drakconnect:396
+#: network/netconnect.pm:1158 standalone/drakconnect:398
 #, c-format
 msgid "RTS/CTS"
 msgstr ""
 
-#: network/netconnect.pm:1063
+#: network/netconnect.pm:1159
 #, c-format
 msgid ""
 "RTS/CTS adds a handshake before each packet transmission to make sure that "
@@ -9463,17 +9691,17 @@ msgid ""
 "or off."
 msgstr ""
 
-#: network/netconnect.pm:1070 standalone/drakconnect:397
+#: network/netconnect.pm:1166 standalone/drakconnect:399
 #, fuzzy, c-format
 msgid "Fragmentation"
 msgstr "Workstation ที่ทำงาน"
 
-#: network/netconnect.pm:1071 standalone/drakconnect:398
+#: network/netconnect.pm:1167 standalone/drakconnect:400
 #, c-format
 msgid "Iwconfig command extra arguments"
 msgstr ""
 
-#: network/netconnect.pm:1072
+#: network/netconnect.pm:1168
 #, c-format
 msgid ""
 "Here, one can configure some extra wireless parameters such as:\n"
@@ -9484,12 +9712,12 @@ msgid ""
 msgstr ""
 
 #. -PO: split the "xyz command extra argument" translated string into two lines if it's bigger than the english one
-#: network/netconnect.pm:1079 standalone/drakconnect:399
+#: network/netconnect.pm:1175 standalone/drakconnect:401
 #, c-format
 msgid "Iwspy command extra arguments"
 msgstr ""
 
-#: network/netconnect.pm:1080
+#: network/netconnect.pm:1176
 #, c-format
 msgid ""
 "Iwspy is used to set a list of addresses in a wireless network\n"
@@ -9501,12 +9729,12 @@ msgid ""
 "See iwpspy(8) man page for further information."
 msgstr ""
 
-#: network/netconnect.pm:1088 standalone/drakconnect:400
+#: network/netconnect.pm:1184 standalone/drakconnect:402
 #, c-format
 msgid "Iwpriv command extra arguments"
 msgstr ""
 
-#: network/netconnect.pm:1089
+#: network/netconnect.pm:1185
 #, c-format
 msgid ""
 "Iwpriv enable to set up optionals (private) parameters of a wireless "
@@ -9524,7 +9752,7 @@ msgid ""
 "See iwpriv(8) man page for further information."
 msgstr ""
 
-#: network/netconnect.pm:1163
+#: network/netconnect.pm:1259
 #, c-format
 msgid ""
 "Please enter your host name.\n"
@@ -9537,67 +9765,67 @@ msgstr ""
 "ตัวอย่างเช่น ``mybox.mylab.yco.com''\n"
 "คุณอาจจะใส่ค่า IP ของเกตเวย์ด้วยถ้าคุณมีเครื่องที่ทำหน้าที่เป็นเกตเวย์อยู่"
 
-#: network/netconnect.pm:1167
+#: network/netconnect.pm:1263
 #, c-format
 msgid "Last but not least you can also type in your DNS server IP addresses."
 msgstr ""
 
-#: network/netconnect.pm:1169 standalone/drakconnect:997
+#: network/netconnect.pm:1265 standalone/drakconnect:996
 #, fuzzy, c-format
 msgid "Host name (optional)"
 msgstr "การคอนฟิก"
 
-#: network/netconnect.pm:1169
+#: network/netconnect.pm:1265
 #, c-format
 msgid "Host name"
 msgstr "ชื่อโฮสต์:"
 
-#: network/netconnect.pm:1171
+#: network/netconnect.pm:1267
 #, fuzzy, c-format
 msgid "DNS server 1"
 msgstr "เซิร์ฟเวอร์ DNS"
 
-#: network/netconnect.pm:1172
+#: network/netconnect.pm:1268
 #, fuzzy, c-format
 msgid "DNS server 2"
 msgstr "เซิร์ฟเวอร์ DNS"
 
-#: network/netconnect.pm:1173
+#: network/netconnect.pm:1269
 #, fuzzy, c-format
 msgid "DNS server 3"
 msgstr "เซิร์ฟเวอร์ DNS"
 
-#: network/netconnect.pm:1174
+#: network/netconnect.pm:1270
 #, fuzzy, c-format
 msgid "Search domain"
 msgstr "โดเมน NIS"
 
-#: network/netconnect.pm:1175
+#: network/netconnect.pm:1271
 #, c-format
 msgid "By default search domain will be set from the fully-qualified host name"
 msgstr ""
 
-#: network/netconnect.pm:1176
+#: network/netconnect.pm:1272
 #, c-format
 msgid "Gateway (e.g. %s)"
 msgstr ""
 
-#: network/netconnect.pm:1178
+#: network/netconnect.pm:1274
 #, c-format
 msgid "Gateway device"
 msgstr "อุปกรณ์เกตเวย์"
 
-#: network/netconnect.pm:1187
+#: network/netconnect.pm:1283
 #, fuzzy, c-format
 msgid "DNS server address should be in format 1.2.3.4"
 msgstr "ค่าของ IP ควรอยู่ในรูปแบบ 1.2.3.4"
 
-#: network/netconnect.pm:1192 standalone/drakconnect:651
+#: network/netconnect.pm:1288 standalone/drakconnect:652
 #, fuzzy, c-format
 msgid "Gateway address should be in format 1.2.3.4"
 msgstr "ค่าของ IP ควรอยู่ในรูปแบบ 1.2.3.4"
 
-#: network/netconnect.pm:1203
+#: network/netconnect.pm:1299
 #, c-format
 msgid ""
 "If desired, enter a Zeroconf hostname.\n"
@@ -9606,17 +9834,17 @@ msgid ""
 "It is not necessary on most networks."
 msgstr ""
 
-#: network/netconnect.pm:1207
+#: network/netconnect.pm:1303
 #, fuzzy, c-format
 msgid "Zeroconf Host name"
 msgstr "ชื่อโฮสต์:"
 
-#: network/netconnect.pm:1210
+#: network/netconnect.pm:1306
 #, c-format
 msgid "Zeroconf host name must not contain a ."
 msgstr ""
 
-#: network/netconnect.pm:1220
+#: network/netconnect.pm:1316
 #, c-format
 msgid ""
 "You have configured multiple ways to connect to the Internet.\n"
@@ -9624,54 +9852,54 @@ msgid ""
 "\n"
 msgstr ""
 
-#: network/netconnect.pm:1222
+#: network/netconnect.pm:1318
 #, fuzzy, c-format
 msgid "Internet connection"
 msgstr "การเชื่อมต่อกับ Internet แบบ sharing"
 
-#: network/netconnect.pm:1230
+#: network/netconnect.pm:1326
 #, fuzzy, c-format
 msgid "Configuration is complete, do you want to apply settings?"
 msgstr "Xorg ชนิดใหนที่คุณต้องการมี"
 
-#: network/netconnect.pm:1240
+#: network/netconnect.pm:1336
 #, c-format
 msgid "Do you want to start the connection at boot?"
 msgstr "คุณต้องการต่อตอน boot หรือไม่"
 
-#: network/netconnect.pm:1258
+#: network/netconnect.pm:1354
 #, fuzzy, c-format
 msgid "Automatically at boot"
 msgstr "เริ่มทำงานตอน boot"
 
-#: network/netconnect.pm:1260
+#: network/netconnect.pm:1356
 #, c-format
 msgid "By using Net Applet in the system tray"
 msgstr ""
 
-#: network/netconnect.pm:1262
+#: network/netconnect.pm:1358
 #, c-format
 msgid "Manually (the interface would still be activated at boot)"
 msgstr ""
 
-#: network/netconnect.pm:1271
+#: network/netconnect.pm:1367
 #, fuzzy, c-format
 msgid "How do you want to dial this connection?"
 msgstr "คุณต้องการต่อตอน boot หรือไม่"
 
-#: network/netconnect.pm:1284
+#: network/netconnect.pm:1380
 #, fuzzy, c-format
 msgid "The network needs to be restarted. Do you want to restart it?"
 msgstr ""
 "แพกเกจนี้จำเป็นต้องถูก upgrade\n"
 "คุณแน่ใจว่าจะไม่เลือกมันหรือ"
 
-#: network/netconnect.pm:1291 network/netconnect.pm:1356
+#: network/netconnect.pm:1387 network/netconnect.pm:1452
 #, c-format
 msgid "Network Configuration"
 msgstr "การคอนฟิกระบบเน็ตเวิร์ก"
 
-#: network/netconnect.pm:1292
+#: network/netconnect.pm:1388
 #, fuzzy, c-format
 msgid ""
 "A problem occurred while restarting the network: \n"
@@ -9679,36 +9907,36 @@ msgid ""
 "%s"
 msgstr "คุณต้องการเริ่มทำงาน Network ใหม่หรือไม่"
 
-#: network/netconnect.pm:1300
+#: network/netconnect.pm:1396
 #, c-format
 msgid "Do you want to try to connect to the Internet now?"
 msgstr "คุณต้องการทดสอบต่อเข้า Internet เดี๋ยวนี้หรือไม่"
 
-#: network/netconnect.pm:1308 standalone/drakconnect:1029
+#: network/netconnect.pm:1404 standalone/drakconnect:1028
 #, c-format
 msgid "Testing your connection..."
 msgstr "ทดสอบ connection..."
 
-#: network/netconnect.pm:1324
+#: network/netconnect.pm:1420
 #, fuzzy, c-format
 msgid "The system is now connected to the Internet."
 msgstr "ติดต่อเข้า Internet เรียบร้อย"
 
-#: network/netconnect.pm:1325
+#: network/netconnect.pm:1421
 #, fuzzy, c-format
 msgid "For security reasons, it will be disconnected now."
 msgstr "เพื่อความปลอดภัย มันจะหยุดการติดต่อเดี๋ยวนี้"
 
-#: network/netconnect.pm:1326
+#: network/netconnect.pm:1422
 #, fuzzy, c-format
 msgid ""
-"The system doesn't seem to be connected to the Internet.\n"
+"The system does not seem to be connected to the Internet.\n"
 "Try to reconfigure your connection."
 msgstr ""
 "ไม่สามารถต่อเข้า Internet \n"
 "ลองทำการคอนฟิกใหม่อีกครั้ง"
 
-#: network/netconnect.pm:1343
+#: network/netconnect.pm:1439
 #, c-format
 msgid ""
 "After this is done, we recommend that you restart your X environment to "
@@ -9717,15 +9945,15 @@ msgstr ""
 "เมื่อทุกอย่างเสร็จสิ้น ผมแนะนำให้ท่านเริ่มทำงาน X windows ใหม่\n"
 "เพื่อป้องกันปัญหา hostname ที่อาจเกิดขึ้นได้"
 
-#: network/netconnect.pm:1344
+#: network/netconnect.pm:1440
 #, c-format
 msgid ""
 "Problems occurred during configuration.\n"
-"Test your connection via net_monitor or mcc. If your connection doesn't "
+"Test your connection via net_monitor or mcc. If your connection does not "
 "work, you might want to relaunch the configuration."
 msgstr ""
 
-#: network/netconnect.pm:1357
+#: network/netconnect.pm:1453
 #, c-format
 msgid ""
 "Because you are doing a network installation, your network is already "
@@ -9736,51 +9964,51 @@ msgstr ""
 "เนื่องจากคุณใช้การติดตั้งแบบ network ระบบ network จึงใช้ได้อยู่แล้ว\n"
 "กด OK เพื่อรักษาค่าคอนฟิกเดิมไว้ หรือเลือก ยกเลิกเพื่อปรับแต่งใหม่\n"
 
-#: network/netconnect.pm:1393
+#: network/netconnect.pm:1491
 #, c-format
 msgid ""
 "An unexpected error has happened:\n"
 "%s"
 msgstr ""
 
-#: network/network.pm:316
+#: network/network.pm:319
 #, c-format
 msgid "Proxies configuration"
 msgstr "การคอนฟิก Proxies"
 
-#: network/network.pm:317
+#: network/network.pm:320
 #, c-format
 msgid "HTTP proxy"
 msgstr "HTTP proxy"
 
-#: network/network.pm:318
+#: network/network.pm:321
 #, c-format
 msgid "FTP proxy"
 msgstr "FTP proxy"
 
-#: network/network.pm:321
+#: network/network.pm:324
 #, c-format
 msgid "Proxy should be http://..."
 msgstr "ค่าของ Proxy ควรจะเป็น http://..."
 
-#: network/network.pm:322
+#: network/network.pm:325
 #, fuzzy, c-format
 msgid "URL should begin with 'ftp:' or 'http:'"
 msgstr "ค่าของ Proxy ควรจะเป็น http://..."
 
-#: network/shorewall.pm:28
+#: network/shorewall.pm:25
 #, c-format
 msgid "Firewalling configuration detected!"
 msgstr "ตรวจพบคอนฟิกของ Firewall"
 
-#: network/shorewall.pm:29
+#: network/shorewall.pm:26
 #, c-format
 msgid ""
 "Warning! An existing firewalling configuration has been detected. You may "
 "need some manual fixes after installation."
 msgstr ""
 
-#: network/shorewall.pm:78 standalone/drakgw:220 standalone/drakvpn:214
+#: network/shorewall.pm:91 standalone/drakgw:217 standalone/drakvpn:214
 #, c-format
 msgid ""
 "Please enter the name of the interface connected to the internet.\n"
@@ -9791,59 +10019,59 @@ msgid ""
 "\t\tippp+ for a isdn connection.\n"
 msgstr ""
 
-#: network/tools.pm:197
+#: network/tools.pm:181
 #, fuzzy, c-format
 msgid "Insert floppy"
 msgstr "ให้ใส่แผ่นฟล้อปปี้ลงในไดรว์ %s"
 
-#: network/tools.pm:198
+#: network/tools.pm:182
 #, 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:199
+#: network/tools.pm:187
 #, fuzzy, c-format
 msgid "Floppy access error, unable to mount device %s"
 msgstr "คุณต้องการเม้าท์อุปกรณ์ %s ไว้ที่ใด?"
 
-#: partition_table.pm:393
+#: partition_table.pm:397
 #, c-format
 msgid "mount failed: "
 msgstr "การเม้าท์ล้มเหลว: "
 
-#: partition_table.pm:498
+#: partition_table.pm:502
 #, c-format
 msgid "Extended partition not supported on this platform"
 msgstr "Extended partition not supported on this platform"
 
-#: partition_table.pm:516
+#: partition_table.pm:520
 #, c-format
 msgid ""
-"You have a hole in your partition table but I can't use it.\n"
+"You have a hole in your partition table but I can not use it.\n"
 "The only solution is to move your primary partitions to have the hole next "
 "to the extended partitions."
 msgstr ""
 "คุณมีช่องว่างในตารางพาร์ติชั่น  แต่โปรแกรมจะไม่ใช้งานช่องว่างนั้น\n"
 "การแก้ไขปัญหาสามารถทำได้โดยย้ายไพรมารีพาร์ติชั่น เพื่อให้ช่องว่าไปต่อท้ายพาร์ติชั่นแบบ extended"
 
-#: partition_table.pm:602
+#: partition_table.pm:611
 #, c-format
 msgid "Restoring from file %s failed: %s"
 msgstr "การกู้คืนจากไฟล์ %s ล้มเหลว: %s"
 
-#: partition_table.pm:604
+#: partition_table.pm:613
 #, c-format
 msgid "Bad backup file"
 msgstr "ไฟล์แบ็คอัพมีปัญหา"
 
-#: partition_table.pm:624
+#: partition_table.pm:633
 #, c-format
 msgid "Error writing to file %s"
 msgstr "ข้อผิดพลาดถูกบันทึกในไฟล์ %s"
 
-#: partition_table/raw.pm:238
+#: partition_table/raw.pm:240
 #, fuzzy, c-format
 msgid ""
 "Something bad is happening on your drive. \n"
@@ -9890,7 +10118,7 @@ msgstr "(โมดูล %s)"
 msgid "(on this machine)"
 msgstr ""
 
-#: printer/cups.pm:115 standalone/printerdrake:203
+#: printer/cups.pm:115 standalone/printerdrake:187
 #, fuzzy, c-format
 msgid "Configured on other machines"
 msgstr "ปรับแต่งการบริการต่างๆ"
@@ -9900,60 +10128,60 @@ msgstr "ปรับแต่งการบริการต่างๆ"
 msgid "On CUPS server \"%s\""
 msgstr "ค่า IP ของ CUPS เซิร์ฟเวอร์"
 
-#: printer/cups.pm:117 printer/printerdrake.pm:4290
-#: printer/printerdrake.pm:4300 printer/printerdrake.pm:4445
-#: printer/printerdrake.pm:4456 printer/printerdrake.pm:4651
+#: printer/cups.pm:117 printer/printerdrake.pm:4650
+#: printer/printerdrake.pm:4660 printer/printerdrake.pm:4805
+#: printer/printerdrake.pm:4816 printer/printerdrake.pm:5011
 #, c-format
 msgid " (Default)"
 msgstr " (Default)"
 
-#: printer/data.pm:40
+#: printer/data.pm:56
 #, c-format
-msgid "PDQ - Print, Don't Queue"
+msgid "PDQ - Print, Do not Queue"
 msgstr ""
 
-#: printer/data.pm:41
+#: printer/data.pm:57
 #, c-format
 msgid "PDQ"
 msgstr ""
 
-#: printer/data.pm:53
+#: printer/data.pm:69
 #, c-format
 msgid "LPD - Line Printer Daemon"
 msgstr ""
 
-#: printer/data.pm:54
+#: printer/data.pm:70
 #, c-format
 msgid "LPD"
 msgstr ""
 
-#: printer/data.pm:76
+#: printer/data.pm:91
 #, c-format
 msgid "LPRng - LPR New Generation"
 msgstr ""
 
-#: printer/data.pm:77
+#: printer/data.pm:92
 #, c-format
 msgid "LPRng"
 msgstr ""
 
-#: printer/data.pm:103
+#: printer/data.pm:117
 #, c-format
 msgid "CUPS - Common Unix Printing System"
 msgstr ""
 
-#: printer/data.pm:132
+#: printer/data.pm:147
 #, c-format
 msgid "CUPS - Common Unix Printing System (remote server)"
 msgstr ""
 
-#: printer/data.pm:133
+#: printer/data.pm:148
 #, 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/detect.pm:153 printer/detect.pm:236 printer/detect.pm:438
+#: printer/detect.pm:475
 #, c-format
 msgid "Unknown Model"
 msgstr ""
@@ -9973,7 +10201,7 @@ msgstr "เครื่องพิมพ์แบบรีโมท"
 msgid "Printer on remote CUPS server"
 msgstr "Remote CUPS server"
 
-#: printer/main.pm:30 printer/printerdrake.pm:1521
+#: printer/main.pm:30 printer/printerdrake.pm:1628
 #, fuzzy, c-format
 msgid "Printer on remote lpd server"
 msgstr "รีโมต lpd"
@@ -9993,7 +10221,7 @@ msgstr "SMB/วินโดวส์ 95/98/NT"
 msgid "Printer on NetWare server"
 msgstr "ชื่อเซิร์ฟเวอร์ของพรินเตอร์"
 
-#: printer/main.pm:34 printer/printerdrake.pm:1525
+#: printer/main.pm:34 printer/printerdrake.pm:1632
 #, fuzzy, c-format
 msgid "Enter a printer device URI"
 msgstr "อุปกรณ์เครื่องพิมพ์ URI"
@@ -10003,192 +10231,238 @@ msgstr "อุปกรณ์เครื่องพิมพ์ URI"
 msgid "Pipe job into a command"
 msgstr ""
 
-#: 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
+#. Translation of the "(recommended)" in printer driver entries
+#: printer/main.pm:45
+#, fuzzy, c-format
+msgid "recommended"
+msgstr "รหัสพื้นที่"
+
+#: printer/main.pm:324 printer/main.pm:629 printer/main.pm:1664
+#: printer/main.pm:2699 printer/main.pm:2708 printer/printerdrake.pm:903
+#: printer/printerdrake.pm:2094 printer/printerdrake.pm:5048
 #, c-format
 msgid "Unknown model"
 msgstr ""
 
-#: printer/main.pm:346 standalone/printerdrake:202
+#: printer/main.pm:349 standalone/printerdrake:186
 #, fuzzy, c-format
 msgid "Configured on this machine"
 msgstr "คอนฟิกเม้าส์"
 
-#: printer/main.pm:352 printer/printerdrake.pm:1069
+#: printer/main.pm:355 printer/printerdrake.pm:1175
 #, c-format
 msgid " on parallel port #%s"
 msgstr ""
 
-#: printer/main.pm:355 printer/printerdrake.pm:1072
+#: printer/main.pm:358 printer/printerdrake.pm:1178
 #, c-format
 msgid ", USB printer #%s"
 msgstr ""
 
-#: printer/main.pm:357
+#: printer/main.pm:360
 #, fuzzy, c-format
 msgid ", USB printer"
 msgstr "ไม่มีเครื่องพิมพ์"
 
-#: printer/main.pm:362
+#: printer/main.pm:364
+#, fuzzy, c-format
+msgid ", HP printer on a parallel port"
+msgstr "ชื่อของเครื่องพิมพ์"
+
+#: printer/main.pm:366
+#, fuzzy, c-format
+msgid ", HP printer on USB"
+msgstr "ไม่มีเครื่องพิมพ์"
+
+#: printer/main.pm:368
+#, c-format
+msgid ", HP printer on HP JetDirect"
+msgstr ""
+
+#: printer/main.pm:370
+#, fuzzy, c-format
+msgid ", HP printer"
+msgstr "ไม่มีเครื่องพิมพ์"
+
+#: printer/main.pm:376
 #, c-format
 msgid ", multi-function device on parallel port #%s"
 msgstr ""
 
-#: printer/main.pm:365
+#: printer/main.pm:379
 #, fuzzy, c-format
 msgid ", multi-function device on a parallel port"
 msgstr "ชื่อของเครื่องพิมพ์"
 
-#: printer/main.pm:367
+#: printer/main.pm:381
 #, c-format
 msgid ", multi-function device on USB"
 msgstr ""
 
-#: printer/main.pm:369
+#: printer/main.pm:383
 #, c-format
 msgid ", multi-function device on HP JetDirect"
 msgstr ""
 
-#: printer/main.pm:371
+#: printer/main.pm:385
 #, c-format
 msgid ", multi-function device"
 msgstr ""
 
-#: printer/main.pm:375
+#: printer/main.pm:389
 #, fuzzy, c-format
 msgid ", printing to %s"
 msgstr "ข้อผิดพลาดถูกบันทึกในไฟล์ %s"
 
-#: printer/main.pm:378
+#: printer/main.pm:392
 #, c-format
 msgid " on LPD server \"%s\", printer \"%s\""
 msgstr ""
 
-#: printer/main.pm:381
+#: printer/main.pm:395
 #, c-format
 msgid ", TCP/IP host \"%s\", port %s"
 msgstr ""
 
-#: printer/main.pm:386
+#: printer/main.pm:400
 #, c-format
 msgid " on SMB/Windows server \"%s\", share \"%s\""
 msgstr ""
 
-#: printer/main.pm:391
+#: printer/main.pm:405
 #, c-format
 msgid " on Novell server \"%s\", printer \"%s\""
 msgstr ""
 
-#: printer/main.pm:394
+#: printer/main.pm:408
 #, c-format
 msgid ", using command %s"
 msgstr ""
 
-#: printer/main.pm:409
+#: printer/main.pm:423
 #, fuzzy, c-format
 msgid "Parallel port #%s"
 msgstr "ชื่อของเครื่องพิมพ์"
 
-#: printer/main.pm:412 printer/printerdrake.pm:1090
-#: printer/printerdrake.pm:1117 printer/printerdrake.pm:1135
+#: printer/main.pm:426 printer/printerdrake.pm:1196
+#: printer/printerdrake.pm:1223 printer/printerdrake.pm:1241
 #, fuzzy, c-format
 msgid "USB printer #%s"
 msgstr "ไม่มีเครื่องพิมพ์"
 
-#: printer/main.pm:414
+#: printer/main.pm:428
 #, fuzzy, c-format
 msgid "USB printer"
 msgstr "ไม่มีเครื่องพิมพ์"
 
-#: printer/main.pm:419
+#: printer/main.pm:432
+#, fuzzy, c-format
+msgid "HP printer on a parallel port"
+msgstr "ชื่อของเครื่องพิมพ์"
+
+#: printer/main.pm:434
+#, fuzzy, c-format
+msgid "HP printer on USB"
+msgstr "มุมมองสัญลักษ์ของเครื่องพิมพ์"
+
+#: printer/main.pm:436
+#, fuzzy, c-format
+msgid "HP printer on HP JetDirect"
+msgstr "มุมมองสัญลักษ์ของเครื่องพิมพ์"
+
+#: printer/main.pm:438
+#, fuzzy, c-format
+msgid "HP printer"
+msgstr "เครื่องพิมพ์"
+
+#: printer/main.pm:444
 #, fuzzy, c-format
 msgid "Multi-function device on parallel port #%s"
 msgstr "ชื่อของเครื่องพิมพ์"
 
-#: printer/main.pm:422
+#: printer/main.pm:447
 #, fuzzy, c-format
 msgid "Multi-function device on a parallel port"
 msgstr "ชื่อของเครื่องพิมพ์"
 
-#: printer/main.pm:424
+#: printer/main.pm:449
 #, c-format
 msgid "Multi-function device on USB"
 msgstr ""
 
-#: printer/main.pm:426
+#: printer/main.pm:451
 #, c-format
 msgid "Multi-function device on HP JetDirect"
 msgstr ""
 
-#: printer/main.pm:428
+#: printer/main.pm:453
 #, c-format
 msgid "Multi-function device"
 msgstr ""
 
-#: printer/main.pm:432
+#: printer/main.pm:457
 #, fuzzy, c-format
 msgid "Prints into %s"
 msgstr "ข้อผิดพลาดถูกบันทึกในไฟล์ %s"
 
-#: printer/main.pm:435
+#: printer/main.pm:460
 #, fuzzy, c-format
 msgid "LPD server \"%s\", printer \"%s\""
 msgstr "ระบบเน็ตเวิร์กกำลังจะหยุดทำงาน"
 
-#: printer/main.pm:438
+#: printer/main.pm:463
 #, c-format
 msgid "TCP/IP host \"%s\", port %s"
 msgstr ""
 
-#: printer/main.pm:443
+#: printer/main.pm:468
 #, fuzzy, c-format
 msgid "SMB/Windows server \"%s\", share \"%s\""
 msgstr "SMB/วินโดวส์ 95/98/NT"
 
-#: printer/main.pm:448
+#: printer/main.pm:473
 #, fuzzy, c-format
 msgid "Novell server \"%s\", printer \"%s\""
 msgstr "เครื่องพิมพ์ในระบบ Network (TCP/Socket)"
 
-#: printer/main.pm:451
+#: printer/main.pm:476
 #, fuzzy, c-format
 msgid "Uses command %s"
 msgstr "Port"
 
-#: printer/main.pm:453
+#: printer/main.pm:478
 #, c-format
 msgid "URI: %s"
 msgstr ""
 
-#: printer/main.pm:601 printer/printerdrake.pm:820
-#: printer/printerdrake.pm:2584
+#: printer/main.pm:626 printer/printerdrake.pm:849
+#: printer/printerdrake.pm:2861
 #, c-format
 msgid "Raw printer (No driver)"
 msgstr ""
 
-#: printer/main.pm:1147 printer/printerdrake.pm:205
+#: printer/main.pm:1176 printer/printerdrake.pm:205
 #: printer/printerdrake.pm:217
 #, fuzzy, c-format
 msgid "Local network(s)"
 msgstr "ไม่พบการ์ดเน็ตเวิร์ก"
 
-#: printer/main.pm:1149 printer/printerdrake.pm:221
+#: printer/main.pm:1178 printer/printerdrake.pm:221
 #, fuzzy, c-format
 msgid "Interface \"%s\""
 msgstr "Interface %s"
 
-#: printer/main.pm:1151
+#: printer/main.pm:1180
 #, fuzzy, c-format
 msgid "Network %s"
 msgstr "Network interface"
 
-#: printer/main.pm:1153
+#: printer/main.pm:1182
 #, fuzzy, c-format
 msgid "Host %s"
 msgstr "ชื่อโฮสต์:"
 
-#: printer/main.pm:1182
+#: printer/main.pm:1211
 #, fuzzy, c-format
 msgid "%s (Port %s)"
 msgstr "Port"
@@ -10244,8 +10518,8 @@ msgstr "เครื่องพิมพ์"
 msgid "Custom configuration"
 msgstr "การคอนฟิก"
 
-#: printer/printerdrake.pm:83 standalone/scannerdrake:562
-#: standalone/scannerdrake:579
+#: printer/printerdrake.pm:83 standalone/scannerdrake:593
+#: standalone/scannerdrake:610
 #, fuzzy, c-format
 msgid "No remote machines"
 msgstr "เครื่องพิมพ์แบบรีโมท"
@@ -10308,21 +10582,21 @@ msgid ""
 msgstr ""
 
 #: printer/printerdrake.pm:132 printer/printerdrake.pm:500
-#: printer/printerdrake.pm:3933
+#: printer/printerdrake.pm:4292
 #, c-format
 msgid "Remote CUPS server and no local CUPS daemon"
 msgstr ""
 
 #: printer/printerdrake.pm:135
-#, fuzzy, c-format
+#, c-format
 msgid "On"
-msgstr "โดเมน NIS"
+msgstr "เปิด"
 
 #: printer/printerdrake.pm:137 printer/printerdrake.pm:492
 #: printer/printerdrake.pm:519
 #, c-format
 msgid "Off"
-msgstr ""
+msgstr "ปิด"
 
 #: printer/printerdrake.pm:138 printer/printerdrake.pm:501
 #, c-format
@@ -10442,7 +10716,7 @@ msgstr "ชื่อของเครื่องพิมพ์"
 msgid "The entered IP is not correct.\n"
 msgstr "ถูกต้องหรือไม่?"
 
-#: printer/printerdrake.pm:434 printer/printerdrake.pm:1744
+#: printer/printerdrake.pm:434 printer/printerdrake.pm:1852
 #, fuzzy, c-format
 msgid "The port number should be an integer!"
 msgstr "Port number ควรเป็นตัวเลข"
@@ -10452,8 +10726,8 @@ msgstr "Port number ควรเป็นตัวเลข"
 msgid "This server is already in the list, it cannot be added again.\n"
 msgstr ""
 
-#: printer/printerdrake.pm:456 printer/printerdrake.pm:1765
-#: standalone/drakups:247 standalone/harddrake2:47
+#: printer/printerdrake.pm:456 printer/printerdrake.pm:1873
+#: standalone/drakups:247 standalone/harddrake2:50
 #, c-format
 msgid "Port"
 msgstr "Port"
@@ -10465,40 +10739,41 @@ msgstr "Port"
 msgid "On, Name or IP of remote server:"
 msgstr "รีโมต lpd"
 
-#: printer/printerdrake.pm:508 printer/printerdrake.pm:3942
-#: printer/printerdrake.pm:4007
+#: printer/printerdrake.pm:508 printer/printerdrake.pm:4301
+#: printer/printerdrake.pm:4366
 #, 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
+#: printer/printerdrake.pm:673 printer/printerdrake.pm:739
+#: printer/printerdrake.pm:766 printer/printerdrake.pm:825
+#: printer/printerdrake.pm:867 printer/printerdrake.pm:877
+#: printer/printerdrake.pm:1926 printer/printerdrake.pm:2137
+#: printer/printerdrake.pm:2169 printer/printerdrake.pm:2217
+#: printer/printerdrake.pm:2269 printer/printerdrake.pm:2286
+#: printer/printerdrake.pm:2330 printer/printerdrake.pm:2370
+#: printer/printerdrake.pm:2420 printer/printerdrake.pm:2454
+#: printer/printerdrake.pm:2464 printer/printerdrake.pm:2714
+#: printer/printerdrake.pm:2719 printer/printerdrake.pm:2856
+#: printer/printerdrake.pm:2966 printer/printerdrake.pm:3560
+#: printer/printerdrake.pm:3625 printer/printerdrake.pm:3674
+#: printer/printerdrake.pm:3677 printer/printerdrake.pm:3808
+#: printer/printerdrake.pm:3908 printer/printerdrake.pm:3980
+#: printer/printerdrake.pm:4001 printer/printerdrake.pm:4010
+#: printer/printerdrake.pm:4104 printer/printerdrake.pm:4196
+#: printer/printerdrake.pm:4202 printer/printerdrake.pm:4222
+#: printer/printerdrake.pm:4328 printer/printerdrake.pm:4435
+#: printer/printerdrake.pm:4454 printer/printerdrake.pm:4463
+#: printer/printerdrake.pm:4477 printer/printerdrake.pm:4673
+#: printer/printerdrake.pm:5109 printer/printerdrake.pm:5186
+#: standalone/printerdrake:67 standalone/printerdrake:554
 #, fuzzy, c-format
 msgid "Printerdrake"
 msgstr "เครื่องพิมพ์"
 
-#: printer/printerdrake.pm:561 printer/printerdrake.pm:3550
-#: printer/printerdrake.pm:4077
+#: printer/printerdrake.pm:561 printer/printerdrake.pm:3909
+#: printer/printerdrake.pm:4436
 #, fuzzy, c-format
 msgid "Reading printer data..."
 msgstr "อ่าน CUPS drivers database..."
@@ -10508,17 +10783,17 @@ msgstr "อ่าน CUPS drivers database..."
 msgid "Restarting CUPS..."
 msgstr "จำเพาะ"
 
-#: printer/printerdrake.pm:606
+#: printer/printerdrake.pm:608 printer/printerdrake.pm:628
 #, c-format
 msgid "Select Printer Connection"
 msgstr "เลือกการเชื่อมต่อกับเครื่องพิมพ์"
 
-#: printer/printerdrake.pm:607
+#: printer/printerdrake.pm:609
 #, c-format
 msgid "How is the printer connected?"
 msgstr "เครื่องพิมพ์เชื่อมต่ออย่างไร?"
 
-#: printer/printerdrake.pm:609
+#: printer/printerdrake.pm:611
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -10529,7 +10804,7 @@ msgstr ""
 "ในตอนนี้  เครื่องพิมพ์จะถูกค้นหาเอง\n"
 "กรณีมีข้อสงสัย กรุณาเลือก \"Remote CUPS server\""
 
-#: printer/printerdrake.pm:612 printer/printerdrake.pm:4315
+#: printer/printerdrake.pm:614 printer/printerdrake.pm:4675
 #, c-format
 msgid ""
 "\n"
@@ -10537,28 +10812,51 @@ msgid ""
 "detected nor tested!"
 msgstr ""
 
-#: printer/printerdrake.pm:619
+#: printer/printerdrake.pm:621
 #, c-format
 msgid ""
 "Printer auto-detection (Local, TCP/Socket, SMB printers, and device URI)"
 msgstr ""
 
-#: printer/printerdrake.pm:649
+#: printer/printerdrake.pm:623
+#, c-format
+msgid "Modify timeout for network printer auto-detection"
+msgstr ""
+
+#: printer/printerdrake.pm:629
+#, c-format
+msgid "Enter the timeout for network printer auto-detection (in msec) here. "
+msgstr ""
+
+#: printer/printerdrake.pm:631
+#, c-format
+msgid ""
+"The longer you choose the timeout, the more reliable the detections of "
+"network printers will be, but the scan can take longer then, especially if "
+"there are many machines with local firewalls in the network. "
+msgstr ""
+
+#: printer/printerdrake.pm:635
+#, fuzzy, c-format
+msgid "The timeout must be a positive integer number!"
+msgstr "หมายเลขผู้ใช้ควรเป็นเลขจำนวนเต็มบวก"
+
+#: printer/printerdrake.pm:673
 #, fuzzy, c-format
 msgid "Checking your system..."
 msgstr "ประเภทของการพิมพ์ชนิดไหนที่คุณต้องการ"
 
-#: printer/printerdrake.pm:665
+#: printer/printerdrake.pm:690
 #, fuzzy, c-format
 msgid "and one unknown printer"
 msgstr "ไม่มีเครื่องพิมพ์"
 
-#: printer/printerdrake.pm:667
+#: printer/printerdrake.pm:692
 #, fuzzy, c-format
 msgid "and %d unknown printers"
 msgstr "ไม่มีเครื่องพิมพ์"
 
-#: printer/printerdrake.pm:671
+#: printer/printerdrake.pm:696
 #, fuzzy, c-format
 msgid ""
 "The following printers\n"
@@ -10567,7 +10865,7 @@ msgid ""
 "are directly connected to your system"
 msgstr "ไม่มีอุปกรณ์ Network บนเครื่องคุณ"
 
-#: printer/printerdrake.pm:673
+#: printer/printerdrake.pm:698
 #, fuzzy, c-format
 msgid ""
 "The following printer\n"
@@ -10576,7 +10874,7 @@ msgid ""
 "are directly connected to your system"
 msgstr "ไม่มีอุปกรณ์ Network บนเครื่องคุณ"
 
-#: printer/printerdrake.pm:674
+#: printer/printerdrake.pm:699
 #, fuzzy, c-format
 msgid ""
 "The following printer\n"
@@ -10585,96 +10883,96 @@ msgid ""
 "is directly connected to your system"
 msgstr "ไม่มีอุปกรณ์ Network บนเครื่องคุณ"
 
-#: printer/printerdrake.pm:678
+#: printer/printerdrake.pm:703
 #, c-format
 msgid ""
 "\n"
 "There is one unknown printer directly connected to your system"
 msgstr ""
 
-#: printer/printerdrake.pm:679
+#: printer/printerdrake.pm:704
 #, c-format
 msgid ""
 "\n"
 "There are %d unknown printers directly connected to your system"
 msgstr ""
 
-#: printer/printerdrake.pm:682
+#: printer/printerdrake.pm:707
 #, c-format
 msgid ""
 "There are no printers found which are directly connected to your machine"
 msgstr ""
 
-#: printer/printerdrake.pm:685
+#: printer/printerdrake.pm:710
 #, fuzzy, c-format
 msgid " (Make sure that all your printers are connected and turned on).\n"
 msgstr "คุณต้องการให้โมเด็มของคุณต่อกับพอร์ตอนุกรมใด?"
 
-#: printer/printerdrake.pm:698
+#: printer/printerdrake.pm:723
 #, 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:699
+#: printer/printerdrake.pm:724
 #, fuzzy, c-format
 msgid "Do you want to enable printing on printers in the local network?\n"
 msgstr "คุณต้องการพิมพ์ทดสอบหรือไม่?"
 
-#: printer/printerdrake.pm:701
+#: printer/printerdrake.pm:726
 #, fuzzy, c-format
 msgid "Do you want to enable printing on the printers mentioned above?\n"
 msgstr "คุณต้องการต่อตอน boot หรือไม่"
 
-#: printer/printerdrake.pm:702
+#: printer/printerdrake.pm:727
 #, c-format
 msgid "Are you sure that you want to set up printing on this machine?\n"
 msgstr ""
 
-#: printer/printerdrake.pm:703
+#: printer/printerdrake.pm:728
 #, 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:742
+#: printer/printerdrake.pm:767
 #, fuzzy, c-format
 msgid "Searching for new printers..."
 msgstr "เครื่องพิมพ์โลคอล (ต่อติดกับตัวเครื่อง)"
 
-#: printer/printerdrake.pm:797
+#: printer/printerdrake.pm:826
 #, fuzzy, c-format
 msgid "Found printer on %s..."
 msgstr "อ่าน CUPS drivers database..."
 
-#: printer/printerdrake.pm:822
+#: printer/printerdrake.pm:851
 #, c-format
 msgid "("
-msgstr ""
+msgstr "("
 
-#: printer/printerdrake.pm:823
+#: printer/printerdrake.pm:852
 #, c-format
 msgid " on "
 msgstr ""
 
-#: printer/printerdrake.pm:824 standalone/scannerdrake:137
+#: printer/printerdrake.pm:853 standalone/scannerdrake:137
 #, c-format
 msgid ")"
-msgstr ""
+msgstr ")"
 
-#: printer/printerdrake.pm:829 printer/printerdrake.pm:2591
+#: printer/printerdrake.pm:858 printer/printerdrake.pm:2868
 #, fuzzy, c-format
 msgid "Printer model selection"
 msgstr "เลือกการเชื่อมต่อกับเครื่องพิมพ์"
 
-#: printer/printerdrake.pm:830 printer/printerdrake.pm:2592
+#: printer/printerdrake.pm:859 printer/printerdrake.pm:2869
 #, fuzzy, c-format
 msgid "Which printer model do you have?"
 msgstr "คุณมีเครื่องพิมพ์ชนิดใด?"
 
-#: printer/printerdrake.pm:831
+#: printer/printerdrake.pm:860
 #, c-format
 msgid ""
 "\n"
@@ -10683,31 +10981,32 @@ msgid ""
 "choose the correct model from the list."
 msgstr ""
 
-#: printer/printerdrake.pm:834 printer/printerdrake.pm:2597
+#: printer/printerdrake.pm:863 printer/printerdrake.pm:2874
 #, c-format
 msgid ""
 "If your printer is not listed, choose a compatible (see printer manual) or a "
 "similar one."
 msgstr ""
 
-#: printer/printerdrake.pm:839
+#: printer/printerdrake.pm:868
 #, fuzzy, c-format
 msgid "Configuring printer on %s..."
 msgstr "การคอนฟิกเครื่องพิมพ์"
 
-#: printer/printerdrake.pm:849 printer/printerdrake.pm:4096
+#: printer/printerdrake.pm:878 printer/printerdrake.pm:4455
 #, fuzzy, c-format
 msgid "Configuring printer \"%s\"..."
 msgstr "การคอนฟิกเครื่องพิมพ์"
 
-#: printer/printerdrake.pm:932 printer/printerdrake.pm:944
-#: printer/printerdrake.pm:1002 printer/printerdrake.pm:1987
-#: printer/printerdrake.pm:4332 printer/printerdrake.pm:4501
+#: printer/printerdrake.pm:1036 printer/printerdrake.pm:1048
+#: printer/printerdrake.pm:1107 printer/printerdrake.pm:2103
+#: printer/printerdrake.pm:2118 printer/printerdrake.pm:2188
+#: printer/printerdrake.pm:4692 printer/printerdrake.pm:4861
 #, fuzzy, c-format
 msgid "Add a new printer"
 msgstr "ไม่มีเครื่องพิมพ์"
 
-#: printer/printerdrake.pm:933
+#: printer/printerdrake.pm:1037
 #, c-format
 msgid ""
 "\n"
@@ -10721,7 +11020,7 @@ msgid ""
 "connection types."
 msgstr ""
 
-#: printer/printerdrake.pm:946
+#: printer/printerdrake.pm:1050
 #, c-format
 msgid ""
 "\n"
@@ -10736,14 +11035,14 @@ msgid ""
 "\n"
 "Note that auto-detecting printers on the network takes longer than the auto-"
 "detection of only the printers connected to this machine. So turn off the "
-"auto-detection of network and/or Windows-hosted printers when you don't need "
-"it.\n"
+"auto-detection of network and/or Windows-hosted printers when you do not "
+"need it.\n"
 "\n"
 " Click on \"Next\" when you are ready, and on \"Cancel\" if you do not want "
 "to set up your printer(s) now."
 msgstr ""
 
-#: printer/printerdrake.pm:955
+#: printer/printerdrake.pm:1059
 #, c-format
 msgid ""
 "\n"
@@ -10759,7 +11058,7 @@ msgid ""
 "to set up your printer(s) now."
 msgstr ""
 
-#: printer/printerdrake.pm:963
+#: printer/printerdrake.pm:1067
 #, c-format
 msgid ""
 "\n"
@@ -10774,13 +11073,13 @@ msgid ""
 "\n"
 "Note that auto-detecting printers on the network takes longer than the auto-"
 "detection of only the printers connected to this machine. So turn off the "
-"auto-detection of network printers when you don't need it.\n"
+"auto-detection of network printers when you do not need it.\n"
 "\n"
 " Click on \"Next\" when you are ready, and on \"Cancel\" if you do not want "
 "to set up your printer(s) now."
 msgstr ""
 
-#: printer/printerdrake.pm:972
+#: printer/printerdrake.pm:1076
 #, c-format
 msgid ""
 "\n"
@@ -10796,22 +11095,22 @@ msgid ""
 "to set up your printer(s) now."
 msgstr ""
 
-#: printer/printerdrake.pm:981
+#: printer/printerdrake.pm:1085
 #, fuzzy, c-format
 msgid "Auto-detect printers connected to this machine"
 msgstr "เครื่องพิมพ์แบบรีโมท"
 
-#: printer/printerdrake.pm:984
+#: printer/printerdrake.pm:1088
 #, c-format
 msgid "Auto-detect printers connected directly to the local network"
 msgstr ""
 
-#: printer/printerdrake.pm:987
+#: printer/printerdrake.pm:1091
 #, c-format
 msgid "Auto-detect printers connected to machines running Microsoft Windows"
 msgstr ""
 
-#: printer/printerdrake.pm:1003
+#: printer/printerdrake.pm:1108
 #, c-format
 msgid ""
 "\n"
@@ -10825,70 +11124,71 @@ msgid ""
 "select \"Printer\" in the \"Hardware\" section of the %s Control Center."
 msgstr ""
 
-#: 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
+#: printer/printerdrake.pm:1143 printer/printerdrake.pm:1373
+#: printer/printerdrake.pm:1435 printer/printerdrake.pm:1525
+#: printer/printerdrake.pm:1663 printer/printerdrake.pm:1738
+#: printer/printerdrake.pm:1890 printer/printerdrake.pm:1976
+#: printer/printerdrake.pm:1985 printer/printerdrake.pm:1994
+#: printer/printerdrake.pm:2005 printer/printerdrake.pm:2143
+#: printer/printerdrake.pm:2229 printer/printerdrake.pm:2275
+#: printer/printerdrake.pm:2342 printer/printerdrake.pm:2377
 #, fuzzy, c-format
 msgid "Could not install the %s packages!"
 msgstr "กำลังติดตั้งแพ็คเก็จ %s"
 
-#: printer/printerdrake.pm:1040
+#: printer/printerdrake.pm:1145
 #, c-format
 msgid "Skipping Windows/SMB server auto-detection"
 msgstr ""
 
-#: printer/printerdrake.pm:1046 printer/printerdrake.pm:1190
-#: printer/printerdrake.pm:1425 printer/printerdrake.pm:1678
+#: printer/printerdrake.pm:1151 printer/printerdrake.pm:1296
+#: printer/printerdrake.pm:1531 printer/printerdrake.pm:1785
 #, fuzzy, c-format
 msgid "Printer auto-detection"
 msgstr "ใช้ auto detection"
 
-#: printer/printerdrake.pm:1046
+#: printer/printerdrake.pm:1151
 #, c-format
 msgid "Detecting devices..."
 msgstr "กำลังตรวจสอบอุปกรณ์..."
 
-#: printer/printerdrake.pm:1075
+#: printer/printerdrake.pm:1181
 #, c-format
 msgid ", network printer \"%s\", port %s"
 msgstr ""
 
-#: printer/printerdrake.pm:1078
+#: printer/printerdrake.pm:1184
 #, fuzzy, c-format
 msgid ", printer \"%s\" on SMB/Windows server \"%s\""
 msgstr "SMB/วินโดวส์ 95/98/NT"
 
-#: printer/printerdrake.pm:1082
+#: printer/printerdrake.pm:1188
 #, fuzzy, c-format
 msgid "Detected %s"
 msgstr "ค้นพบ %s"
 
-#: printer/printerdrake.pm:1087 printer/printerdrake.pm:1114
-#: printer/printerdrake.pm:1132
+#: printer/printerdrake.pm:1193 printer/printerdrake.pm:1220
+#: printer/printerdrake.pm:1238
 #, fuzzy, c-format
 msgid "Printer on parallel port #%s"
 msgstr "ชื่อของเครื่องพิมพ์"
 
-#: printer/printerdrake.pm:1093
+#: printer/printerdrake.pm:1199
 #, fuzzy, c-format
 msgid "Network printer \"%s\", port %s"
 msgstr "เครื่องพิมพ์ในระบบ Network (TCP/Socket)"
 
-#: printer/printerdrake.pm:1096
+#: printer/printerdrake.pm:1202
 #, fuzzy, c-format
 msgid "Printer \"%s\" on SMB/Windows server \"%s\""
 msgstr "SMB/วินโดวส์ 95/98/NT"
 
-#: printer/printerdrake.pm:1177
+#: printer/printerdrake.pm:1283
 #, fuzzy, c-format
 msgid "Local Printer"
 msgstr "เครื่องพิมพ์โลคอล (ต่อติดกับตัวเครื่อง)"
 
-#: printer/printerdrake.pm:1178
+#: printer/printerdrake.pm:1284
 #, c-format
 msgid ""
 "No local printer found! To manually install a printer enter a device name/"
@@ -10897,64 +11197,64 @@ msgid ""
 "printer: /dev/usb/lp1, ...)."
 msgstr ""
 
-#: printer/printerdrake.pm:1182
+#: printer/printerdrake.pm:1288
 #, fuzzy, c-format
 msgid "You must enter a device or file name!"
 msgstr "อุปกรณ์เครื่องพิมพ์ URI"
 
-#: printer/printerdrake.pm:1191
+#: printer/printerdrake.pm:1297
 #, fuzzy, c-format
 msgid "No printer found!"
 msgstr "เครื่องพิมพ์โลคอล (ต่อติดกับตัวเครื่อง)"
 
-#: printer/printerdrake.pm:1199
+#: printer/printerdrake.pm:1305
 #, fuzzy, c-format
 msgid "Local Printers"
 msgstr "เครื่องพิมพ์โลคอล (ต่อติดกับตัวเครื่อง)"
 
-#: printer/printerdrake.pm:1200
+#: printer/printerdrake.pm:1306
 #, fuzzy, c-format
 msgid "Available printers"
 msgstr "เครื่องพิมพ์โลคอล (ต่อติดกับตัวเครื่อง)"
 
-#: printer/printerdrake.pm:1204 printer/printerdrake.pm:1213
+#: printer/printerdrake.pm:1310 printer/printerdrake.pm:1319
 #, fuzzy, c-format
 msgid "The following printer was auto-detected. "
 msgstr "แพ็คเก็จเหล่านี้กำลังจะถูกลบ"
 
-#: printer/printerdrake.pm:1206
+#: printer/printerdrake.pm:1312
 #, 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:1207
+#: printer/printerdrake.pm:1313
 #, c-format
 msgid ""
 "Alternatively, you can specify a device name/file name in the input line"
 msgstr ""
 
-#: printer/printerdrake.pm:1208 printer/printerdrake.pm:1217
+#: printer/printerdrake.pm:1314 printer/printerdrake.pm:1323
 #, c-format
 msgid "Here is a list of all auto-detected printers. "
 msgstr ""
 
-#: printer/printerdrake.pm:1210
+#: printer/printerdrake.pm:1316
 #, 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:1211
+#: printer/printerdrake.pm:1317
 #, 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:1215
+#: printer/printerdrake.pm:1321
 #, c-format
 msgid ""
 "The configuration of the printer will work fully automatically. If your "
@@ -10962,12 +11262,12 @@ msgid ""
 "configuration, turn on \"Manual configuration\"."
 msgstr ""
 
-#: printer/printerdrake.pm:1216
+#: printer/printerdrake.pm:1322
 #, c-format
 msgid "Currently, no alternative possibility is available"
 msgstr ""
 
-#: printer/printerdrake.pm:1219
+#: printer/printerdrake.pm:1325
 #, c-format
 msgid ""
 "Please choose the printer you want to set up. The configuration of the "
@@ -10976,50 +11276,50 @@ msgid ""
 "\"Manual configuration\"."
 msgstr ""
 
-#: printer/printerdrake.pm:1220
+#: printer/printerdrake.pm:1326
 #, fuzzy, c-format
 msgid "Please choose the printer to which the print jobs should go."
 msgstr "คุณต้องการให้โมเด็มของคุณต่อกับพอร์ตอนุกรมใด?"
 
-#: printer/printerdrake.pm:1222
+#: printer/printerdrake.pm:1328
 #, 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:1223
+#: printer/printerdrake.pm:1329
 #, fuzzy, c-format
 msgid "Please choose the port that your printer is connected to."
 msgstr "คุณต้องการให้โมเด็มของคุณต่อกับพอร์ตอนุกรมใด?"
 
-#: printer/printerdrake.pm:1225
+#: printer/printerdrake.pm:1331
 #, 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:1229
+#: printer/printerdrake.pm:1335
 #, fuzzy, c-format
 msgid "You must choose/enter a printer/device!"
 msgstr "อุปกรณ์เครื่องพิมพ์ URI"
 
-#: 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
+#: printer/printerdrake.pm:1375 printer/printerdrake.pm:1437
+#: printer/printerdrake.pm:1527 printer/printerdrake.pm:1665
+#: printer/printerdrake.pm:1740 printer/printerdrake.pm:1892
+#: printer/printerdrake.pm:1978 printer/printerdrake.pm:1987
+#: printer/printerdrake.pm:1996 printer/printerdrake.pm:2007
 #, fuzzy, c-format
 msgid "Aborting"
 msgstr "เลิก"
 
-#: printer/printerdrake.pm:1304
+#: printer/printerdrake.pm:1410
 #, c-format
 msgid "Remote lpd Printer Options"
 msgstr "อ๊อปชั่นของเครื่องพิมพ์แบบรีโมท"
 
-#: printer/printerdrake.pm:1305
+#: printer/printerdrake.pm:1411
 #, fuzzy, c-format
 msgid ""
 "To use a remote lpd printer, you need to supply the hostname of the printer "
@@ -11029,63 +11329,63 @@ msgstr ""
 "ของชื่อโฮสต์ที่ให้บริการเครื่องพิมพ์นั้น และชื่อคิวของเซิร์ฟเวอร์นั้น\n"
 "ซึ่งเป็นที่ๆงานพิมพ์จะถูกเก็บไว้"
 
-#: printer/printerdrake.pm:1306
+#: printer/printerdrake.pm:1412
 #, fuzzy, c-format
 msgid "Remote host name"
 msgstr "ชื่อโฮสต์รีโมท"
 
-#: printer/printerdrake.pm:1307
+#: printer/printerdrake.pm:1413
 #, fuzzy, c-format
 msgid "Remote printer name"
 msgstr "เครื่องพิมพ์แบบรีโมท"
 
-#: printer/printerdrake.pm:1310
+#: printer/printerdrake.pm:1416
 #, fuzzy, c-format
 msgid "Remote host name missing!"
 msgstr "ชื่อโฮสต์รีโมท"
 
-#: printer/printerdrake.pm:1314
+#: printer/printerdrake.pm:1420
 #, fuzzy, c-format
 msgid "Remote printer name missing!"
 msgstr "ชื่อโฮสต์รีโมท"
 
-#: 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
+#: printer/printerdrake.pm:1449 printer/printerdrake.pm:2025
+#: standalone/drakTermServ:445 standalone/drakTermServ:747
+#: standalone/drakTermServ:764 standalone/drakTermServ:1480
+#: standalone/drakTermServ:1488 standalone/drakTermServ:1500
+#: standalone/drakbackup:512 standalone/drakbackup:618
+#: standalone/drakbackup:653 standalone/drakbackup:773
+#: standalone/harddrake2:256
+#, c-format
 msgid "Information"
-msgstr "แสดงข้อมูล"
+msgstr "ข้อมูล"
 
-#: printer/printerdrake.pm:1343 printer/printerdrake.pm:1914
+#: printer/printerdrake.pm:1449 printer/printerdrake.pm:2025
 #, fuzzy, c-format
 msgid "Detected model: %s %s"
 msgstr "ค้นพบ %s"
 
-#: printer/printerdrake.pm:1425 printer/printerdrake.pm:1678
+#: printer/printerdrake.pm:1531 printer/printerdrake.pm:1785
 #, fuzzy, c-format
 msgid "Scanning network..."
 msgstr "ทดสอบ connection..."
 
-#: printer/printerdrake.pm:1436 printer/printerdrake.pm:1457
+#: printer/printerdrake.pm:1543 printer/printerdrake.pm:1564
 #, c-format
 msgid ", printer \"%s\" on server \"%s\""
 msgstr ""
 
-#: printer/printerdrake.pm:1439 printer/printerdrake.pm:1460
+#: printer/printerdrake.pm:1546 printer/printerdrake.pm:1567
 #, fuzzy, c-format
 msgid "Printer \"%s\" on server \"%s\""
 msgstr "ระบบเน็ตเวิร์กกำลังจะหยุดทำงาน"
 
-#: printer/printerdrake.pm:1481
+#: printer/printerdrake.pm:1588
 #, c-format
 msgid "SMB (Windows 9x/NT) Printer Options"
 msgstr "อ๊อปชั่นของเครื่องพิมพ์แบบ SMB (เครื่องพิมพ์ในระบบวินโดวส์ 9x/NT)"
 
-#: printer/printerdrake.pm:1482
+#: printer/printerdrake.pm:1589
 #, fuzzy, c-format
 msgid ""
 "To print to a SMB printer, you need to provide the SMB host name (Note! It "
@@ -11099,54 +11399,54 @@ msgstr ""
 "ชื่อของเครื่องพิมพ์ที่ต้องการใช้ (share name) และชื่อของผู้ใช้ (username)\n"
 "รหัสผ่าน (password) และข้อมูลของเวิร์คกรุ๊ป (workgroup) ด้วย"
 
-#: printer/printerdrake.pm:1483
+#: printer/printerdrake.pm:1590
 #, 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:1485
+#: printer/printerdrake.pm:1592
 #, c-format
 msgid "SMB server host"
 msgstr "ชื่อโฮสต์ของ SMB server"
 
-#: printer/printerdrake.pm:1486
+#: printer/printerdrake.pm:1593
 #, c-format
 msgid "SMB server IP"
 msgstr "ค่า IP ของ SMB เซิร์ฟเวอร์"
 
-#: printer/printerdrake.pm:1487
+#: printer/printerdrake.pm:1594
 #, c-format
 msgid "Share name"
 msgstr "ชื่อที่ใช้ในกรุ๊ป (sharename)"
 
-#: printer/printerdrake.pm:1490
+#: printer/printerdrake.pm:1597
 #, c-format
 msgid "Workgroup"
 msgstr "เวิร์กกรุ๊ป (workgroup)"
 
-#: printer/printerdrake.pm:1492
+#: printer/printerdrake.pm:1599
 #, fuzzy, c-format
 msgid "Auto-detected"
 msgstr "ใช้ auto detection"
 
-#: printer/printerdrake.pm:1502
+#: printer/printerdrake.pm:1609
 #, c-format
 msgid "Either the server name or the server's IP must be given!"
 msgstr ""
 
-#: printer/printerdrake.pm:1506
+#: printer/printerdrake.pm:1613
 #, c-format
 msgid "Samba share name missing!"
 msgstr ""
 
-#: printer/printerdrake.pm:1512
+#: printer/printerdrake.pm:1619
 #, c-format
 msgid "SECURITY WARNING!"
 msgstr ""
 
-#: printer/printerdrake.pm:1513
+#: printer/printerdrake.pm:1620
 #, c-format
 msgid ""
 "You are about to set up printing to a Windows account with password. Due to "
@@ -11170,7 +11470,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: printer/printerdrake.pm:1523
+#: printer/printerdrake.pm:1630
 #, c-format
 msgid ""
 "Set up your Windows server to make the printer available under the IPP "
@@ -11179,7 +11479,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: printer/printerdrake.pm:1526
+#: printer/printerdrake.pm:1633
 #, c-format
 msgid ""
 "Connect your printer to a Linux server and let your Windows machine(s) "
@@ -11188,12 +11488,12 @@ msgid ""
 "Do you really want to continue setting up this printer as you are doing now?"
 msgstr ""
 
-#: printer/printerdrake.pm:1604
+#: printer/printerdrake.pm:1711
 #, c-format
 msgid "NetWare Printer Options"
 msgstr "อ๊อปชั่นของเครื่องพิมพ์ในระบบเน็ตแวร์"
 
-#: printer/printerdrake.pm:1605
+#: printer/printerdrake.pm:1712
 #, fuzzy, c-format
 msgid ""
 "To print on a NetWare printer, you need to provide the NetWare print server "
@@ -11206,49 +11506,49 @@ msgstr ""
 "โฮสต์แบบ TCP/IP) และข้อมูลชื่อคิวของเครื่องพิมพ์ที่ต้องการใช้\n"
 "รวมทั้งชื่อผู้ใช้และรหัสผ่านด้วย"
 
-#: printer/printerdrake.pm:1606
+#: printer/printerdrake.pm:1713
 #, c-format
 msgid "Printer Server"
 msgstr "ชื่อเซิร์ฟเวอร์ของพรินเตอร์"
 
-#: printer/printerdrake.pm:1607
+#: printer/printerdrake.pm:1714
 #, c-format
 msgid "Print Queue Name"
 msgstr "ชื่อพรินต์คิว"
 
-#: printer/printerdrake.pm:1612
+#: printer/printerdrake.pm:1719
 #, c-format
 msgid "NCP server name missing!"
 msgstr ""
 
-#: printer/printerdrake.pm:1616
+#: printer/printerdrake.pm:1723
 #, c-format
 msgid "NCP queue name missing!"
 msgstr ""
 
-#: printer/printerdrake.pm:1689 printer/printerdrake.pm:1709
+#: printer/printerdrake.pm:1797 printer/printerdrake.pm:1817
 #, c-format
 msgid ", host \"%s\", port %s"
 msgstr ""
 
-#: printer/printerdrake.pm:1692 printer/printerdrake.pm:1712
+#: printer/printerdrake.pm:1800 printer/printerdrake.pm:1820
 #, c-format
 msgid "Host \"%s\", port %s"
 msgstr ""
 
-#: printer/printerdrake.pm:1733
+#: printer/printerdrake.pm:1841
 #, fuzzy, c-format
 msgid "TCP/Socket Printer Options"
 msgstr "อ็อปชั่นของเครื่องพิมพ์โลคอล"
 
-#: printer/printerdrake.pm:1735
+#: printer/printerdrake.pm:1843
 #, 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:1736
+#: printer/printerdrake.pm:1844
 #, fuzzy, c-format
 msgid ""
 "To print to a TCP or socket printer, you need to provide the host name or IP "
@@ -11259,27 +11559,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:1740
+#: printer/printerdrake.pm:1848
 #, fuzzy, c-format
 msgid "Printer host name or IP missing!"
 msgstr "ชื่อของเครื่องพิมพ์"
 
-#: printer/printerdrake.pm:1763
+#: printer/printerdrake.pm:1871
 #, fuzzy, c-format
 msgid "Printer host name or IP"
 msgstr "ชื่อของเครื่องพิมพ์"
 
-#: printer/printerdrake.pm:1819
+#: printer/printerdrake.pm:1927
 #, fuzzy, c-format
 msgid "Refreshing Device URI list..."
 msgstr "อ่าน CUPS drivers database..."
 
-#: printer/printerdrake.pm:1822 printer/printerdrake.pm:1824
+#: printer/printerdrake.pm:1930 printer/printerdrake.pm:1932
 #, c-format
 msgid "Printer Device URI"
 msgstr "อุปกรณ์เครื่องพิมพ์ URI"
 
-#: printer/printerdrake.pm:1823
+#: printer/printerdrake.pm:1931
 #, c-format
 msgid ""
 "You can specify directly the URI to access the printer. The URI must fulfill "
@@ -11287,150 +11587,233 @@ msgid ""
 "are supported by all the spoolers."
 msgstr ""
 
-#: printer/printerdrake.pm:1846
+#: printer/printerdrake.pm:1957
 #, c-format
 msgid "A valid URI must be entered!"
 msgstr ""
 
-#: printer/printerdrake.pm:1949
+#: printer/printerdrake.pm:2060
 #, c-format
 msgid "Pipe into command"
 msgstr ""
 
-#: printer/printerdrake.pm:1950
+#: printer/printerdrake.pm:2061
 #, 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:1951
-#, fuzzy, c-format
+#: printer/printerdrake.pm:2062
+#, c-format
 msgid "Command line"
-msgstr "ชื่อโดเมน"
+msgstr "บรรทัดคำสั่ง"
 
-#: printer/printerdrake.pm:1955
+#: printer/printerdrake.pm:2066
 #, c-format
 msgid "A command line must be entered!"
 msgstr ""
 
-#: printer/printerdrake.pm:1988
+#: printer/printerdrake.pm:2104
+#, c-format
+msgid ""
+"On many HP printers there are special functions available, maintenance (ink "
+"level checking, nozzle cleaning. head alignment, ...) on all not too old "
+"inkjets, scanning on multi-function devices, and memory card access on "
+"printers with card readers. "
+msgstr ""
+
+#: printer/printerdrake.pm:2106
+#, c-format
+msgid ""
+"To access these extra functions on your HP printer, it must be set up with "
+"the appropriate software: "
+msgstr ""
+
+#: printer/printerdrake.pm:2107
+#, c-format
+msgid ""
+"Either with the newer HPLIP which allows printer maintenance through the "
+"easy-to-use graphical application \"Toolbox\" and four-edge full-bleed on "
+"newer PhotoSmart models "
+msgstr ""
+
+#: printer/printerdrake.pm:2108
+#, c-format
+msgid ""
+"or with the older HPOJ which allows only scanner and memory card access, but "
+"could help you in case of failure of HPLIP. "
+msgstr ""
+
+#: printer/printerdrake.pm:2110
+#, c-format
+msgid "What is your choice (choose \"None\" for non-HP printers)? "
+msgstr ""
+
+#: printer/printerdrake.pm:2111 printer/printerdrake.pm:2112
+#: printer/printerdrake.pm:2138 printer/printerdrake.pm:2144
+#: printer/printerdrake.pm:2170
+#, fuzzy, c-format
+msgid "HPLIP"
+msgstr "PL_IP"
+
+#: printer/printerdrake.pm:2111 printer/printerdrake.pm:2114
+#: printer/printerdrake.pm:2270 printer/printerdrake.pm:2276
+#: printer/printerdrake.pm:2287
+#, c-format
+msgid "HPOJ"
+msgstr ""
+
+#: printer/printerdrake.pm:2119
 #, c-format
 msgid ""
 "Is your printer a multi-function device from HP or Sony (OfficeJet, PSC, "
-"LaserJet 1100/1200/1220/3200/3300 with scanner, DeskJet 450, Sony IJP-V100), "
-"an HP PhotoSmart or an HP LaserJet 2200?"
+"LaserJet 1100/1200/1220/3000/3200/3300/4345 with scanner, DeskJet 450, Sony "
+"IJP-V100), an HP PhotoSmart or an HP LaserJet 2200?"
 msgstr ""
 
-#: printer/printerdrake.pm:2005
+#: printer/printerdrake.pm:2138 printer/printerdrake.pm:2270
 #, fuzzy, c-format
-msgid "Installing HPOJ package..."
+msgid "Installing %s package..."
 msgstr "กำลังติดตั้งแพ็คเก็จ %s"
 
-#: printer/printerdrake.pm:2012
+#: printer/printerdrake.pm:2145 printer/printerdrake.pm:2277
 #, c-format
 msgid "Only printing will be possible on the %s."
 msgstr ""
 
-#: printer/printerdrake.pm:2022 printer/printerdrake.pm:2148
+#: printer/printerdrake.pm:2160
+#, fuzzy, c-format
+msgid "Could not remove your old HPOJ configuration file %s for your %s! "
+msgstr "ไม่สามารถสร้างโฟลเดอร์เก็บค่าปรับ gnome ส่วนตัวที่ '%s': %s\n"
+
+#: printer/printerdrake.pm:2162
 #, c-format
-msgid "Checking device and configuring HPOJ..."
+msgid "Please remove the file manually and restart HPOJ."
 msgstr ""
 
-#: printer/printerdrake.pm:2065
+#: printer/printerdrake.pm:2170 printer/printerdrake.pm:2287
+#, c-format
+msgid "Checking device and configuring %s..."
+msgstr ""
+
+#: printer/printerdrake.pm:2189
+#, fuzzy, c-format
+msgid "Which printer do you want to set up with HPLIP?"
+msgstr "คุณต้องการย้ายไปเซ็กเตอร์ไหน"
+
+#: printer/printerdrake.pm:2218 printer/printerdrake.pm:2331
 #, fuzzy, c-format
 msgid "Installing SANE packages..."
 msgstr "กำลังติดตั้งแพ็คเก็จ %s"
 
-#: printer/printerdrake.pm:2078
+#: printer/printerdrake.pm:2231 printer/printerdrake.pm:2344
 #, c-format
 msgid "Scanning on the %s will not be possible."
 msgstr ""
 
-#: printer/printerdrake.pm:2105
+#: printer/printerdrake.pm:2246
+#, c-format
+msgid "Using and Maintaining your %s"
+msgstr ""
+
+#: printer/printerdrake.pm:2371
 #, fuzzy, c-format
 msgid "Installing mtools packages..."
 msgstr "กำลังติดตั้งแพ็คเก็จ %s"
 
-#: printer/printerdrake.pm:2113
+#: printer/printerdrake.pm:2379
 #, c-format
 msgid "Photo memory card access on the %s will not be possible."
 msgstr ""
 
-#: printer/printerdrake.pm:2128
+#: printer/printerdrake.pm:2395
 #, c-format
 msgid "Scanning on your HP multi-function device"
 msgstr ""
 
-#: printer/printerdrake.pm:2136
+#: printer/printerdrake.pm:2404
 #, c-format
 msgid "Photo memory card access on your HP multi-function device"
 msgstr ""
 
-#: printer/printerdrake.pm:2185
+#: printer/printerdrake.pm:2421
+#, fuzzy, c-format
+msgid "Configuring device..."
+msgstr "กำลังทำการคอนฟิก"
+
+#: printer/printerdrake.pm:2455
 #, c-format
 msgid "Making printer port available for CUPS..."
 msgstr ""
 
-#: printer/printerdrake.pm:2194 printer/printerdrake.pm:2438
-#: printer/printerdrake.pm:2580
+#: printer/printerdrake.pm:2464 printer/printerdrake.pm:2715
+#: printer/printerdrake.pm:2857
 #, fuzzy, c-format
 msgid "Reading printer database..."
 msgstr "อ่าน CUPS drivers database..."
 
-#: printer/printerdrake.pm:2404
+#: printer/printerdrake.pm:2674
 #, c-format
 msgid "Enter Printer Name and Comments"
 msgstr ""
 
-#: printer/printerdrake.pm:2408 printer/printerdrake.pm:3606
+#: printer/printerdrake.pm:2678 printer/printerdrake.pm:3965
 #, c-format
 msgid "Name of printer should contain only letters, numbers and the underscore"
 msgstr ""
 
-#: printer/printerdrake.pm:2414 printer/printerdrake.pm:3611
+#: printer/printerdrake.pm:2684 printer/printerdrake.pm:3970
 #, c-format
 msgid ""
 "The printer \"%s\" already exists,\n"
 "do you really want to overwrite its configuration?"
 msgstr ""
 
-#: printer/printerdrake.pm:2423
+#: printer/printerdrake.pm:2691
+#, c-format
+msgid ""
+"The printer name \"%s\" has more than 12 characters which can make the "
+"printer unaccessible from Windows clients. Do you really want to use this "
+"name?"
+msgstr ""
+
+#: printer/printerdrake.pm:2700
 #, 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:2424
+#: printer/printerdrake.pm:2701
 #, c-format
 msgid "Name of printer"
 msgstr "ชื่อเครื่องพิมพ์"
 
-#: printer/printerdrake.pm:2425 standalone/drakconnect:568
-#: standalone/harddrake2:34 standalone/printerdrake:218
-#: standalone/printerdrake:225
+#: printer/printerdrake.pm:2702 standalone/drakconnect:570
+#: standalone/harddrake2:37 standalone/printerdrake:211
+#: standalone/printerdrake:218
 #, c-format
 msgid "Description"
 msgstr "รายละเอียด"
 
-#: printer/printerdrake.pm:2426 standalone/printerdrake:218
-#: standalone/printerdrake:225
+#: printer/printerdrake.pm:2703 standalone/printerdrake:211
+#: standalone/printerdrake:218
 #, c-format
 msgid "Location"
 msgstr "ตำแหน่ง"
 
-#: printer/printerdrake.pm:2443
+#: printer/printerdrake.pm:2720
 #, fuzzy, c-format
 msgid "Preparing printer database..."
 msgstr "อ่าน CUPS drivers database..."
 
-#: printer/printerdrake.pm:2559
+#: printer/printerdrake.pm:2836
 #, fuzzy, c-format
 msgid "Your printer model"
 msgstr "เครื่องพิมพ์แบบรีโมท"
 
-#: printer/printerdrake.pm:2560
+#: printer/printerdrake.pm:2837
 #, c-format
 msgid ""
 "Printerdrake has compared the model name resulting from the printer auto-"
@@ -11445,18 +11828,18 @@ msgid ""
 "%s"
 msgstr ""
 
-#: printer/printerdrake.pm:2565 printer/printerdrake.pm:2568
+#: printer/printerdrake.pm:2842 printer/printerdrake.pm:2845
 #, fuzzy, c-format
 msgid "The model is correct"
 msgstr "ถูกต้องหรือไม่?"
 
-#: printer/printerdrake.pm:2566 printer/printerdrake.pm:2567
-#: printer/printerdrake.pm:2570
+#: printer/printerdrake.pm:2843 printer/printerdrake.pm:2844
+#: printer/printerdrake.pm:2847
 #, fuzzy, c-format
 msgid "Select model manually"
 msgstr "เครื่องพิมพ์แบบรีโมท"
 
-#: printer/printerdrake.pm:2593
+#: printer/printerdrake.pm:2870
 #, c-format
 msgid ""
 "\n"
@@ -11466,38 +11849,38 @@ msgid ""
 "\"Raw printer\" is highlighted."
 msgstr ""
 
-#: printer/printerdrake.pm:2612
+#: printer/printerdrake.pm:2889
 #, c-format
 msgid "Install a manufacturer-supplied PPD file"
 msgstr ""
 
-#: printer/printerdrake.pm:2643
+#: printer/printerdrake.pm:2920
 #, c-format
 msgid ""
 "Every PostScript printer is delivered with a PPD file which describes the "
 "printer's options and features."
 msgstr ""
 
-#: printer/printerdrake.pm:2644
+#: printer/printerdrake.pm:2921
 #, 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:2645
+#: printer/printerdrake.pm:2922
 #, c-format
 msgid "You can find the PPD files also on the manufacturer's web sites."
 msgstr ""
 
-#: printer/printerdrake.pm:2646
+#: printer/printerdrake.pm:2923
 #, 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:2647
+#: printer/printerdrake.pm:2924
 #, c-format
 msgid ""
 "Installing the printer's PPD file and using it when setting up the printer "
@@ -11505,58 +11888,58 @@ msgid ""
 "printer's hardware"
 msgstr ""
 
-#: printer/printerdrake.pm:2648
+#: printer/printerdrake.pm:2925
 #, 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:2650
+#: printer/printerdrake.pm:2927
 #, fuzzy, c-format
 msgid "Install PPD file from"
 msgstr "ติดตั้ง"
 
-#: printer/printerdrake.pm:2653 printer/printerdrake.pm:2661
-#: standalone/scannerdrake:177 standalone/scannerdrake:186
-#: standalone/scannerdrake:236 standalone/scannerdrake:244
+#: printer/printerdrake.pm:2930 printer/printerdrake.pm:2938
+#: standalone/scannerdrake:183 standalone/scannerdrake:192
+#: standalone/scannerdrake:242 standalone/scannerdrake:250
 #, fuzzy, c-format
 msgid "Floppy Disk"
 msgstr "บันทึกลงแผ่นฟล้อปปี้"
 
-#: printer/printerdrake.pm:2654 printer/printerdrake.pm:2663
-#: standalone/scannerdrake:178 standalone/scannerdrake:188
-#: standalone/scannerdrake:237 standalone/scannerdrake:246
+#: printer/printerdrake.pm:2931 printer/printerdrake.pm:2940
+#: standalone/scannerdrake:184 standalone/scannerdrake:194
+#: standalone/scannerdrake:243 standalone/scannerdrake:252
 #, fuzzy, c-format
 msgid "Other place"
 msgstr "กำลังตรวจสอบพอร์ต"
 
-#: printer/printerdrake.pm:2669
+#: printer/printerdrake.pm:2946
 #, fuzzy, c-format
 msgid "Select PPD file"
 msgstr "เลือกไฟล์"
 
-#: printer/printerdrake.pm:2673
+#: printer/printerdrake.pm:2950
 #, c-format
 msgid "The PPD file %s does not exist or is unreadable!"
 msgstr ""
 
-#: printer/printerdrake.pm:2679
+#: printer/printerdrake.pm:2956
 #, c-format
 msgid "The PPD file %s does not conform with the PPD specifications!"
 msgstr ""
 
-#: printer/printerdrake.pm:2690
+#: printer/printerdrake.pm:2967
 #, fuzzy, c-format
 msgid "Installing PPD file..."
 msgstr "กำลังติดตั้งแพ็คเก็จ %s"
 
-#: printer/printerdrake.pm:2807
+#: printer/printerdrake.pm:3084
 #, fuzzy, c-format
 msgid "OKI winprinter configuration"
 msgstr "การคอนฟิก Internet"
 
-#: printer/printerdrake.pm:2808
+#: printer/printerdrake.pm:3085
 #, c-format
 msgid ""
 "You are configuring an OKI laser winprinter. These printers\n"
@@ -11567,12 +11950,12 @@ msgid ""
 "not work. Your connection type setting will be ignored by the driver."
 msgstr ""
 
-#: printer/printerdrake.pm:2833 printer/printerdrake.pm:2863
+#: printer/printerdrake.pm:3110 printer/printerdrake.pm:3140
 #, fuzzy, c-format
 msgid "Lexmark inkjet configuration"
 msgstr "การคอนฟิก Internet"
 
-#: printer/printerdrake.pm:2834
+#: printer/printerdrake.pm:3111
 #, c-format
 msgid ""
 "The inkjet printer drivers provided by Lexmark only support local printers, "
@@ -11581,7 +11964,7 @@ msgid ""
 "to."
 msgstr ""
 
-#: printer/printerdrake.pm:2864
+#: printer/printerdrake.pm:3141
 #, c-format
 msgid ""
 "To be able to print with your Lexmark inkjet and this configuration, you "
@@ -11594,12 +11977,12 @@ msgid ""
 "adjust the head alignment settings with this program."
 msgstr ""
 
-#: printer/printerdrake.pm:2874
+#: printer/printerdrake.pm:3151
 #, fuzzy, c-format
 msgid "Lexmark X125 configuration"
 msgstr "การคอนฟิก Internet"
 
-#: printer/printerdrake.pm:2875
+#: printer/printerdrake.pm:3152
 #, c-format
 msgid ""
 "The driver for this printer only supports printers locally connected via "
@@ -11608,12 +11991,12 @@ msgid ""
 "connected to."
 msgstr ""
 
-#: printer/printerdrake.pm:2897
+#: printer/printerdrake.pm:3174
 #, fuzzy, c-format
 msgid "Samsung ML/QL-85G configuration"
 msgstr "การปรับแต่ง LAN"
 
-#: printer/printerdrake.pm:2898 printer/printerdrake.pm:2925
+#: printer/printerdrake.pm:3175 printer/printerdrake.pm:3202
 #, c-format
 msgid ""
 "The driver for this printer only supports printers locally connected on the "
@@ -11622,17 +12005,17 @@ msgid ""
 "port or configure it on the machine where it is connected to."
 msgstr ""
 
-#: printer/printerdrake.pm:2924
+#: printer/printerdrake.pm:3201
 #, fuzzy, c-format
 msgid "Canon LBP-460/660 configuration"
 msgstr "การคอนฟิก"
 
-#: printer/printerdrake.pm:2943
+#: printer/printerdrake.pm:3220
 #, c-format
 msgid "Firmware-Upload for HP LaserJet 1000"
 msgstr ""
 
-#: printer/printerdrake.pm:3056
+#: printer/printerdrake.pm:3369
 #, c-format
 msgid ""
 "Printer default settings\n"
@@ -11643,39 +12026,39 @@ msgid ""
 "printout quality/resolution printing can get substantially slower."
 msgstr ""
 
-#: printer/printerdrake.pm:3181
+#: printer/printerdrake.pm:3494
 #, fuzzy, c-format
 msgid "Printer default settings"
 msgstr "เลือกการเชื่อมต่อกับเครื่องพิมพ์"
 
-#: printer/printerdrake.pm:3188
+#: printer/printerdrake.pm:3501
 #, c-format
 msgid "Option %s must be an integer number!"
 msgstr ""
 
-#: printer/printerdrake.pm:3192
+#: printer/printerdrake.pm:3505
 #, c-format
 msgid "Option %s must be a number!"
 msgstr ""
 
-#: printer/printerdrake.pm:3196
+#: printer/printerdrake.pm:3509
 #, c-format
 msgid "Option %s out of range!"
 msgstr ""
 
-#: printer/printerdrake.pm:3247
+#: printer/printerdrake.pm:3560
 #, fuzzy, c-format
 msgid ""
 "Do you want to set this printer (\"%s\")\n"
 "as the default printer?"
 msgstr "คุณต้องการพิมพ์ทดสอบหรือไม่?"
 
-#: printer/printerdrake.pm:3262
+#: printer/printerdrake.pm:3575
 #, fuzzy, c-format
 msgid "Test pages"
 msgstr "กำลังตรวจสอบพอร์ต"
 
-#: printer/printerdrake.pm:3263
+#: printer/printerdrake.pm:3576
 #, c-format
 msgid ""
 "Please select the test pages you want to print.\n"
@@ -11684,57 +12067,52 @@ msgid ""
 "it is enough to print the standard test page."
 msgstr ""
 
-#: printer/printerdrake.pm:3267
+#: printer/printerdrake.pm:3580
 #, fuzzy, c-format
 msgid "No test pages"
 msgstr "ใช้ ให้พิมพ์กระดาษทดสอบทั้งสองแบบ"
 
-#: printer/printerdrake.pm:3268
-#, fuzzy, c-format
+#: printer/printerdrake.pm:3581
+#, c-format
 msgid "Print"
-msgstr "เครื่องพิมพ์"
+msgstr "พิมพ์"
 
-#: printer/printerdrake.pm:3293
+#: printer/printerdrake.pm:3606
 #, fuzzy, c-format
 msgid "Standard test page"
 msgstr "เครื่องมีอ Standard"
 
-#: printer/printerdrake.pm:3296
+#: printer/printerdrake.pm:3609
 #, c-format
 msgid "Alternative test page (Letter)"
 msgstr ""
 
-#: printer/printerdrake.pm:3299
+#: printer/printerdrake.pm:3612
 #, fuzzy, c-format
 msgid "Alternative test page (A4)"
 msgstr "กำลังพิมพ์กระดาษทดสอบ"
 
-#: printer/printerdrake.pm:3301
+#: printer/printerdrake.pm:3614
 #, fuzzy, c-format
 msgid "Photo test page"
 msgstr "กำลังพิมพ์กระดาษทดสอบ"
 
-#: printer/printerdrake.pm:3305
+#: printer/printerdrake.pm:3618
 #, fuzzy, c-format
 msgid "Do not print any test page"
 msgstr "กำลังพิมพ์กระดาษทดสอบ"
 
-#: printer/printerdrake.pm:3313 printer/printerdrake.pm:3485
+#: printer/printerdrake.pm:3626 printer/printerdrake.pm:3809
 #, c-format
 msgid "Printing test page(s)..."
 msgstr "กำลังพิมพ์กระดาษทดสอบ"
 
-#: printer/printerdrake.pm:3331
-#, fuzzy, c-format
-msgid "Could not install the %s package!"
-msgstr "กำลังติดตั้งแพ็คเก็จ %s"
-
-#: printer/printerdrake.pm:3333
+#: printer/printerdrake.pm:3646
 #, fuzzy, c-format
 msgid "Skipping photo test page."
 msgstr "กำลังพิมพ์กระดาษทดสอบ"
 
-#: printer/printerdrake.pm:3350
+#: printer/printerdrake.pm:3663
 #, fuzzy, c-format
 msgid ""
 "Test page(s) have been sent to the printer.\n"
@@ -11750,7 +12128,7 @@ msgstr ""
 "\n"
 "มันทำงานถูกต้องใหมครับ"
 
-#: printer/printerdrake.pm:3354
+#: printer/printerdrake.pm:3667
 #, fuzzy, c-format
 msgid ""
 "Test page(s) have been sent to the printer.\n"
@@ -11760,17 +12138,17 @@ msgstr ""
 "กรุณารอสักครู่\n"
 "มันทำงานถูกต้องใหมครับ"
 
-#: printer/printerdrake.pm:3364
+#: printer/printerdrake.pm:3677
 #, c-format
 msgid "Did it work properly?"
 msgstr ""
 
-#: printer/printerdrake.pm:3386 printer/printerdrake.pm:4689
-#, fuzzy, c-format
+#: printer/printerdrake.pm:3700 printer/printerdrake.pm:5049
+#, c-format
 msgid "Raw printer"
-msgstr "ไม่มีเครื่องพิมพ์"
+msgstr "เครื่องพิมพ์ธรรมดา"
 
-#: printer/printerdrake.pm:3416
+#: printer/printerdrake.pm:3738
 #, c-format
 msgid ""
 "To print a file from the command line (terminal window) you can either use "
@@ -11779,7 +12157,7 @@ msgid ""
 "to modify the option settings easily.\n"
 msgstr ""
 
-#: printer/printerdrake.pm:3418
+#: printer/printerdrake.pm:3740
 #, c-format
 msgid ""
 "These commands you can also use in the \"Printing command\" field of the "
@@ -11787,8 +12165,8 @@ msgid ""
 "because the file to print is provided by the application.\n"
 msgstr ""
 
-#: printer/printerdrake.pm:3421 printer/printerdrake.pm:3438
-#: printer/printerdrake.pm:3448
+#: printer/printerdrake.pm:3743 printer/printerdrake.pm:3760
+#: printer/printerdrake.pm:3770
 #, c-format
 msgid ""
 "\n"
@@ -11797,7 +12175,7 @@ msgid ""
 "line, e. g. \"%s <file>\". "
 msgstr ""
 
-#: printer/printerdrake.pm:3424 printer/printerdrake.pm:3464
+#: printer/printerdrake.pm:3746 printer/printerdrake.pm:3786
 #, c-format
 msgid ""
 "To know about the options available for the current printer read either the "
@@ -11805,22 +12183,22 @@ msgid ""
 "\n"
 msgstr ""
 
-#: printer/printerdrake.pm:3428
+#: printer/printerdrake.pm:3750
 #, c-format
 msgid ""
 "Here is a list of the available printing options for the current printer:\n"
 "\n"
 msgstr ""
 
-#: printer/printerdrake.pm:3433 printer/printerdrake.pm:3443
+#: printer/printerdrake.pm:3755 printer/printerdrake.pm:3765
 #, c-format
 msgid ""
 "To print a file from the command line (terminal window) use the command \"%s "
 "<file>\".\n"
 msgstr ""
 
-#: printer/printerdrake.pm:3435 printer/printerdrake.pm:3445
-#: printer/printerdrake.pm:3455
+#: printer/printerdrake.pm:3757 printer/printerdrake.pm:3767
+#: printer/printerdrake.pm:3777
 #, c-format
 msgid ""
 "This command you can also use in the \"Printing command\" field of the "
@@ -11828,21 +12206,21 @@ msgid ""
 "because the file to print is provided by the application.\n"
 msgstr ""
 
-#: printer/printerdrake.pm:3440 printer/printerdrake.pm:3450
+#: printer/printerdrake.pm:3762 printer/printerdrake.pm:3772
 #, 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:3453
+#: printer/printerdrake.pm:3775
 #, 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:3457
+#: printer/printerdrake.pm:3779
 #, c-format
 msgid ""
 "You can also use the graphical interface \"xpdq\" for setting options and "
@@ -11853,7 +12231,7 @@ msgid ""
 "jams.\n"
 msgstr ""
 
-#: printer/printerdrake.pm:3461
+#: printer/printerdrake.pm:3783
 #, c-format
 msgid ""
 "\n"
@@ -11862,32 +12240,119 @@ msgid ""
 "line, e. g. \"%s <file>\".\n"
 msgstr ""
 
-#: printer/printerdrake.pm:3471
+#: printer/printerdrake.pm:3793
 #, fuzzy, c-format
 msgid "Printing/Scanning/Photo Cards on \"%s\""
 msgstr "ระบบเน็ตเวิร์กกำลังจะหยุดทำงาน"
 
-#: printer/printerdrake.pm:3472
+#: printer/printerdrake.pm:3794
 #, fuzzy, c-format
 msgid "Printing/Scanning on \"%s\""
 msgstr "ระบบเน็ตเวิร์กกำลังจะหยุดทำงาน"
 
-#: printer/printerdrake.pm:3474
+#: printer/printerdrake.pm:3796
 #, fuzzy, c-format
 msgid "Printing/Photo Card Access on \"%s\""
 msgstr "ระบบเน็ตเวิร์กกำลังจะหยุดทำงาน"
 
-#: printer/printerdrake.pm:3475
+#: printer/printerdrake.pm:3798
+#, fuzzy, c-format
+msgid "Using/Maintaining the printer \"%s\""
+msgstr "ระบบเน็ตเวิร์กกำลังจะหยุดทำงาน"
+
+#: printer/printerdrake.pm:3799
 #, fuzzy, c-format
 msgid "Printing on the printer \"%s\""
 msgstr "ระบบเน็ตเวิร์กกำลังจะหยุดทำงาน"
 
-#: printer/printerdrake.pm:3481
+#: printer/printerdrake.pm:3805
 #, fuzzy, c-format
 msgid "Print option list"
 msgstr "อ๊อปชั่นของเครื่องพิมพ์"
 
-#: printer/printerdrake.pm:3502
+#: printer/printerdrake.pm:3827
+#, c-format
+msgid ""
+"Your %s is set up with HP's HPLIP driver software. This way many special "
+"features of your printer are supported.\n"
+"\n"
+msgstr ""
+
+#: printer/printerdrake.pm:3830
+#, c-format
+msgid ""
+"The scanner in your printer can be used with the usual SANE software, for "
+"example Kooka or XSane (Both in the Multimedia/Graphics menu). "
+msgstr ""
+
+#: printer/printerdrake.pm:3831
+#, c-format
+msgid ""
+"Run Scannerdrake (Hardware/Scanner in Mandrakelinux Control Center) to share "
+"your scanner on the network.\n"
+"\n"
+msgstr ""
+
+#: printer/printerdrake.pm:3835
+#, c-format
+msgid ""
+"The memory card readers in your printer can be accessed like a usual USB "
+"mass storage device. "
+msgstr ""
+
+#: printer/printerdrake.pm:3836
+#, c-format
+msgid ""
+"After inserting a card a hard disk icon to access the card should appear on "
+"your desktop.\n"
+"\n"
+msgstr ""
+
+#: printer/printerdrake.pm:3838
+#, c-format
+msgid ""
+"The memory card readers in your printer can be accessed using HP's Printer "
+"Toolbox (Menu: System/Monitoring/HP Printer Toolbox) clicking the \"Access "
+"Photo Cards...\" button on the \"Functions\" tab. "
+msgstr ""
+
+#: printer/printerdrake.pm:3839
+#, c-format
+msgid ""
+"Note that this is very slow, reading the pictures from the camera or a USB "
+"card reader is usually faster.\n"
+"\n"
+msgstr ""
+
+#: printer/printerdrake.pm:3842
+#, c-format
+msgid ""
+"HP's Printer Toolbox (Menu: System/Monitoring/HP Printer Toolbox) offers a "
+"lot of status monitoring and maintenance functions for your %s:\n"
+"\n"
+msgstr ""
+
+#: printer/printerdrake.pm:3843
+#, c-format
+msgid " - Ink level/status info\n"
+msgstr ""
+
+#: printer/printerdrake.pm:3844
+#, c-format
+msgid " - Ink nozzle cleaning\n"
+msgstr ""
+
+#: printer/printerdrake.pm:3845
+#, c-format
+msgid " - Print head alignment\n"
+msgstr ""
+
+#: printer/printerdrake.pm:3846
+#, fuzzy, c-format
+msgid " - Color calibration\n"
+msgstr "การคอนฟิก"
+
+#: printer/printerdrake.pm:3861
 #, c-format
 msgid ""
 "Your multi-function device was configured automatically to be able to scan. "
@@ -11903,7 +12368,7 @@ msgid ""
 "scanner on the network."
 msgstr ""
 
-#: printer/printerdrake.pm:3528
+#: printer/printerdrake.pm:3887
 #, c-format
 msgid ""
 "Your printer was configured automatically to give you access to the photo "
@@ -11917,13 +12382,13 @@ msgid ""
 "of the file lists."
 msgstr ""
 
-#: printer/printerdrake.pm:3570 printer/printerdrake.pm:3597
-#: printer/printerdrake.pm:3632
+#: printer/printerdrake.pm:3929 printer/printerdrake.pm:3956
+#: printer/printerdrake.pm:3991
 #, fuzzy, c-format
 msgid "Transfer printer configuration"
 msgstr "การคอนฟิก Internet"
 
-#: printer/printerdrake.pm:3571
+#: printer/printerdrake.pm:3930
 #, c-format
 msgid ""
 "You can copy the printer configuration which you have done for the spooler %"
@@ -11933,33 +12398,33 @@ msgid ""
 "Not all queues can be transferred due to the following reasons:\n"
 msgstr ""
 
-#: printer/printerdrake.pm:3574
+#: printer/printerdrake.pm:3933
 #, 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:3576
+#: printer/printerdrake.pm:3935
 #, c-format
 msgid ""
 "PDQ only supports local printers, remote LPD printers, and Socket/TCP "
 "printers.\n"
 msgstr ""
 
-#: printer/printerdrake.pm:3578
+#: printer/printerdrake.pm:3937
 #, c-format
 msgid "LPD and LPRng do not support IPP printers.\n"
 msgstr ""
 
-#: printer/printerdrake.pm:3580
+#: printer/printerdrake.pm:3939
 #, c-format
 msgid ""
 "In addition, queues not created with this program or \"foomatic-configure\" "
 "cannot be transferred."
 msgstr ""
 
-#: printer/printerdrake.pm:3581
+#: printer/printerdrake.pm:3940
 #, c-format
 msgid ""
 "\n"
@@ -11967,7 +12432,7 @@ msgid ""
 "or with native CUPS drivers cannot be transferred."
 msgstr ""
 
-#: printer/printerdrake.pm:3582
+#: printer/printerdrake.pm:3941
 #, c-format
 msgid ""
 "\n"
@@ -11975,17 +12440,17 @@ msgid ""
 "\"Transfer\"."
 msgstr ""
 
-#: printer/printerdrake.pm:3585
+#: printer/printerdrake.pm:3944
 #, c-format
 msgid "Do not transfer printers"
 msgstr ""
 
-#: printer/printerdrake.pm:3586 printer/printerdrake.pm:3602
+#: printer/printerdrake.pm:3945 printer/printerdrake.pm:3961
 #, c-format
 msgid "Transfer"
 msgstr ""
 
-#: printer/printerdrake.pm:3598
+#: printer/printerdrake.pm:3957
 #, c-format
 msgid ""
 "A printer named \"%s\" already exists under %s. \n"
@@ -11993,45 +12458,45 @@ msgid ""
 "You can also type a new name or skip this printer."
 msgstr ""
 
-#: printer/printerdrake.pm:3619
+#: printer/printerdrake.pm:3978
 #, fuzzy, c-format
 msgid "New printer name"
 msgstr "ไม่มีเครื่องพิมพ์"
 
-#: printer/printerdrake.pm:3622
+#: printer/printerdrake.pm:3981
 #, c-format
 msgid "Transferring %s..."
 msgstr ""
 
-#: printer/printerdrake.pm:3633
+#: printer/printerdrake.pm:3992
 #, 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:3643
+#: printer/printerdrake.pm:4002
 #, fuzzy, c-format
 msgid "Refreshing printer data..."
 msgstr "อ่าน CUPS drivers database..."
 
-#: printer/printerdrake.pm:3652
+#: printer/printerdrake.pm:4011
 #, fuzzy, c-format
 msgid "Starting network..."
 msgstr "ทดสอบ connection..."
 
-#: printer/printerdrake.pm:3695 printer/printerdrake.pm:3699
-#: printer/printerdrake.pm:3701
+#: printer/printerdrake.pm:4054 printer/printerdrake.pm:4058
+#: printer/printerdrake.pm:4060
 #, fuzzy, c-format
 msgid "Configure the network now"
 msgstr "คอนฟิกระบบเน็ตเวิร์ก"
 
-#: printer/printerdrake.pm:3696
+#: printer/printerdrake.pm:4055
 #, fuzzy, c-format
 msgid "Network functionality not configured"
 msgstr "ไม่มีการคอนฟิกจอภาพ"
 
-#: printer/printerdrake.pm:3697
+#: printer/printerdrake.pm:4056
 #, c-format
 msgid ""
 "You are going to configure a remote printer. This needs working network "
@@ -12040,12 +12505,12 @@ msgid ""
 "configuring now. How do you want to proceed?"
 msgstr ""
 
-#: printer/printerdrake.pm:3700
+#: printer/printerdrake.pm:4059
 #, fuzzy, c-format
 msgid "Go on without configuring the network"
 msgstr "กำลังคอนฟิกระบบเน็ตเวิร์ก"
 
-#: printer/printerdrake.pm:3735
+#: printer/printerdrake.pm:4094
 #, c-format
 msgid ""
 "The network configuration done during the installation cannot be started "
@@ -12055,7 +12520,7 @@ msgid ""
 "also using the %s Control Center, section \"Hardware\"/\"Printer\""
 msgstr ""
 
-#: printer/printerdrake.pm:3736
+#: printer/printerdrake.pm:4095
 #, c-format
 msgid ""
 "The network access was not running and could not be started. Please check "
@@ -12063,27 +12528,27 @@ msgid ""
 "printer again."
 msgstr ""
 
-#: printer/printerdrake.pm:3746
+#: printer/printerdrake.pm:4105
 #, fuzzy, c-format
 msgid "Restarting printing system..."
 msgstr "ประเภทของการพิมพ์ชนิดไหนที่คุณต้องการ"
 
-#: printer/printerdrake.pm:3776
+#: printer/printerdrake.pm:4135
 #, fuzzy, c-format
 msgid "high"
 msgstr "สูง"
 
-#: printer/printerdrake.pm:3776
+#: printer/printerdrake.pm:4135
 #, fuzzy, c-format
 msgid "paranoid"
 msgstr "Paranoid"
 
-#: printer/printerdrake.pm:3778
+#: printer/printerdrake.pm:4137
 #, c-format
 msgid "Installing a printing system in the %s security level"
 msgstr ""
 
-#: printer/printerdrake.pm:3779
+#: printer/printerdrake.pm:4138
 #, c-format
 msgid ""
 "You are about to install the printing system %s on a system running in the %"
@@ -12098,12 +12563,12 @@ msgid ""
 "Do you really want to configure printing on this machine?"
 msgstr ""
 
-#: printer/printerdrake.pm:3814
+#: printer/printerdrake.pm:4173
 #, fuzzy, c-format
 msgid "Starting the printing system at boot time"
 msgstr "ประเภทของการพิมพ์ชนิดไหนที่คุณต้องการ"
 
-#: printer/printerdrake.pm:3815
+#: printer/printerdrake.pm:4174
 #, c-format
 msgid ""
 "The printing system (%s) will not be started automatically when the machine "
@@ -12117,32 +12582,32 @@ msgid ""
 "again?"
 msgstr ""
 
-#: printer/printerdrake.pm:3837
+#: printer/printerdrake.pm:4196
 #, c-format
 msgid "Checking installed software..."
 msgstr ""
 
-#: printer/printerdrake.pm:3843
+#: printer/printerdrake.pm:4202
 #, fuzzy, c-format
 msgid "Removing %s..."
 msgstr "ความละเอียดของภาพ %s\n"
 
-#: printer/printerdrake.pm:3847
+#: printer/printerdrake.pm:4206
 #, fuzzy, c-format
 msgid "Could not remove the %s printing system!"
 msgstr "คอนฟิกระบบเน็ตเวิร์ก"
 
-#: printer/printerdrake.pm:3863
+#: printer/printerdrake.pm:4222
 #, fuzzy, c-format
 msgid "Installing %s..."
 msgstr "กำลังติดตั้งแพ็คเก็จ %s"
 
-#: printer/printerdrake.pm:3867
+#: printer/printerdrake.pm:4226
 #, fuzzy, c-format
 msgid "Could not install the %s printing system!"
 msgstr "คอนฟิกระบบเน็ตเวิร์ก"
 
-#: printer/printerdrake.pm:3934
+#: printer/printerdrake.pm:4293
 #, c-format
 msgid ""
 "In this mode there is no local printing system, all printing requests go "
@@ -12151,46 +12616,46 @@ msgid ""
 "be printed at all from this machine."
 msgstr ""
 
-#: printer/printerdrake.pm:3936
+#: printer/printerdrake.pm:4295
 #, 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
+#: printer/printerdrake.pm:4309
 #, fuzzy, c-format
 msgid "Name or IP of remote server:"
 msgstr "รีโมต lpd"
 
-#: printer/printerdrake.pm:3970
+#: printer/printerdrake.pm:4329
 #, fuzzy, c-format
 msgid "Setting Default Printer..."
 msgstr "เครื่องพิมพ์โลคอล (ต่อติดกับตัวเครื่อง)"
 
-#: printer/printerdrake.pm:3989
+#: printer/printerdrake.pm:4348
 #, fuzzy, c-format
 msgid "Local CUPS printing system or remote CUPS server?"
 msgstr "Remote CUPS server"
 
-#: printer/printerdrake.pm:3990
+#: printer/printerdrake.pm:4349
 #, c-format
 msgid "The CUPS printing system can be used in two ways: "
 msgstr ""
 
-#: printer/printerdrake.pm:3992
+#: printer/printerdrake.pm:4351
 #, c-format
 msgid "1. The CUPS printing system can run locally. "
 msgstr ""
 
-#: printer/printerdrake.pm:3993
+#: printer/printerdrake.pm:4352
 #, 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
+#: printer/printerdrake.pm:4353
 #, c-format
 msgid ""
 "Disadvantage of this approach is, that more resources on the local machine "
@@ -12199,12 +12664,12 @@ msgid ""
 "(port 631) is opened. "
 msgstr ""
 
-#: printer/printerdrake.pm:3996
+#: printer/printerdrake.pm:4355
 #, c-format
 msgid "2. All printing requests are immediately sent to a remote CUPS server. "
 msgstr ""
 
-#: printer/printerdrake.pm:3997
+#: printer/printerdrake.pm:4356
 #, c-format
 msgid ""
 "Here local resource occupation is reduced to a minimum. No CUPS daemon is "
@@ -12212,55 +12677,55 @@ msgid ""
 "print queues is installed, so less memory and disk space is used. "
 msgstr ""
 
-#: printer/printerdrake.pm:3998
+#: printer/printerdrake.pm:4357
 #, 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
+#: printer/printerdrake.pm:4359
 #, 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
+#: printer/printerdrake.pm:4363 printer/printerdrake.pm:4378
+#: printer/printerdrake.pm:4382 printer/printerdrake.pm:4388
 #, c-format
 msgid "Remote server, specify Name or IP here:"
 msgstr ""
 
-#: printer/printerdrake.pm:4018
+#: printer/printerdrake.pm:4377
 #, fuzzy, c-format
 msgid "Local CUPS printing system"
 msgstr "คอนฟิกระบบเน็ตเวิร์ก"
 
-#: printer/printerdrake.pm:4056
+#: printer/printerdrake.pm:4415
 #, fuzzy, c-format
 msgid "Select Printer Spooler"
 msgstr "เลือกการเชื่อมต่อกับเครื่องพิมพ์"
 
-#: printer/printerdrake.pm:4057
+#: printer/printerdrake.pm:4416
 #, fuzzy, c-format
 msgid "Which printing system (spooler) do you want to use?"
 msgstr "ประเภทของการพิมพ์ชนิดไหนที่คุณต้องการ"
 
-#: printer/printerdrake.pm:4105
+#: printer/printerdrake.pm:4464
 #, fuzzy, c-format
 msgid "Failed to configure printer \"%s\"!"
 msgstr "การคอนฟิกเครื่องพิมพ์"
 
-#: printer/printerdrake.pm:4118
+#: printer/printerdrake.pm:4478
 #, fuzzy, c-format
 msgid "Installing Foomatic..."
 msgstr "กำลังติดตั้งแพ็คเก็จ %s"
 
-#: printer/printerdrake.pm:4124
+#: printer/printerdrake.pm:4484
 #, c-format
 msgid "Could not install %s packages, %s cannot be started!"
 msgstr ""
 
-#: printer/printerdrake.pm:4314
+#: printer/printerdrake.pm:4674
 #, fuzzy, c-format
 msgid ""
 "The following printers are configured. Double-click on a printer to change "
@@ -12270,157 +12735,157 @@ msgstr ""
 "ต่อไปนี้เป็นข้อมูลรอการพิมพ์\n"
 "คุณสามารถเพิ่มข้อมูลหรือแก้ไขข้อมูลที่มีได้"
 
-#: printer/printerdrake.pm:4344
+#: printer/printerdrake.pm:4704
 #, c-format
 msgid "Display all available remote CUPS printers"
 msgstr ""
 
-#: printer/printerdrake.pm:4345
+#: printer/printerdrake.pm:4705
 #, c-format
 msgid "Refresh printer list (to display all available remote CUPS printers)"
 msgstr ""
 
-#: printer/printerdrake.pm:4356
+#: printer/printerdrake.pm:4716
 #, fuzzy, c-format
 msgid "CUPS configuration"
 msgstr "การปรับแต่ง LAN"
 
-#: printer/printerdrake.pm:4368
+#: printer/printerdrake.pm:4728
 #, fuzzy, c-format
 msgid "Change the printing system"
 msgstr "คอนฟิกระบบเน็ตเวิร์ก"
 
-#: printer/printerdrake.pm:4377
+#: printer/printerdrake.pm:4737
 #, c-format
 msgid "Normal Mode"
 msgstr "โหมดธรรมดา"
 
-#: printer/printerdrake.pm:4378
+#: printer/printerdrake.pm:4738
 #, c-format
 msgid "Expert Mode"
 msgstr "โหมดผู้เชี่ยวชาญ"
 
-#: printer/printerdrake.pm:4632 printer/printerdrake.pm:4690
-#: printer/printerdrake.pm:4768 printer/printerdrake.pm:4777
+#: printer/printerdrake.pm:4992 printer/printerdrake.pm:5050
+#: printer/printerdrake.pm:5128 printer/printerdrake.pm:5137
 #, c-format
 msgid "Printer options"
 msgstr "อ๊อปชั่นของเครื่องพิมพ์"
 
-#: printer/printerdrake.pm:4668
+#: printer/printerdrake.pm:5028
 #, fuzzy, c-format
 msgid "Modify printer configuration"
 msgstr "การคอนฟิก Internet"
 
-#: printer/printerdrake.pm:4670
+#: printer/printerdrake.pm:5030
 #, fuzzy, c-format
 msgid ""
 "Printer %s%s\n"
 "What do you want to modify on this printer?"
 msgstr "คุณต้องการทดสอบการคอนฟิกหรือไม่"
 
-#: printer/printerdrake.pm:4675
+#: printer/printerdrake.pm:5035
 #, fuzzy, c-format
 msgid "This printer is disabled"
 msgstr "พาร์ติชั่นนี้ไม่สามารถเปลี่ยนขนาดได้"
 
-#: printer/printerdrake.pm:4677
+#: printer/printerdrake.pm:5037
 #, c-format
 msgid "Do it!"
 msgstr ""
 
-#: printer/printerdrake.pm:4682 printer/printerdrake.pm:4737
+#: printer/printerdrake.pm:5042 printer/printerdrake.pm:5097
 #, fuzzy, c-format
 msgid "Printer connection type"
 msgstr "การเชื่อมต่อกับ Internet แบบ sharing"
 
-#: printer/printerdrake.pm:4683 printer/printerdrake.pm:4743
+#: printer/printerdrake.pm:5043 printer/printerdrake.pm:5103
 #, fuzzy, c-format
 msgid "Printer name, description, location"
 msgstr "เลือกการเชื่อมต่อกับเครื่องพิมพ์"
 
-#: printer/printerdrake.pm:4685 printer/printerdrake.pm:4761
+#: printer/printerdrake.pm:5045 printer/printerdrake.pm:5121
 #, c-format
 msgid "Printer manufacturer, model, driver"
 msgstr ""
 
-#: printer/printerdrake.pm:4686 printer/printerdrake.pm:4762
+#: printer/printerdrake.pm:5046 printer/printerdrake.pm:5122
 #, c-format
 msgid "Printer manufacturer, model"
 msgstr ""
 
-#: printer/printerdrake.pm:4692 printer/printerdrake.pm:4772
+#: printer/printerdrake.pm:5052 printer/printerdrake.pm:5132
 #, c-format
 msgid "Set this printer as the default"
 msgstr ""
 
-#: printer/printerdrake.pm:4697 printer/printerdrake.pm:4778
-#: printer/printerdrake.pm:4780
+#: printer/printerdrake.pm:5057 printer/printerdrake.pm:5138
+#: printer/printerdrake.pm:5140
 #, fuzzy, c-format
 msgid "Enable Printer"
 msgstr "ชื่อเซิร์ฟเวอร์ของพรินเตอร์"
 
-#: printer/printerdrake.pm:4700 printer/printerdrake.pm:4783
-#: printer/printerdrake.pm:4785
+#: printer/printerdrake.pm:5060 printer/printerdrake.pm:5143
+#: printer/printerdrake.pm:5145
 #, fuzzy, c-format
 msgid "Disable Printer"
 msgstr "ชื่อเซิร์ฟเวอร์ของพรินเตอร์"
 
-#: printer/printerdrake.pm:4701 printer/printerdrake.pm:4788
+#: printer/printerdrake.pm:5061 printer/printerdrake.pm:5148
 #, fuzzy, c-format
 msgid "Print test pages"
 msgstr "กำลังพิมพ์กระดาษทดสอบ"
 
-#: printer/printerdrake.pm:4702 printer/printerdrake.pm:4790
+#: printer/printerdrake.pm:5062 printer/printerdrake.pm:5150
 #, fuzzy, c-format
 msgid "Learn how to use this printer"
 msgstr "คุณต้องการทดสอบการคอนฟิกหรือไม่"
 
-#: printer/printerdrake.pm:4703 printer/printerdrake.pm:4792
+#: printer/printerdrake.pm:5063 printer/printerdrake.pm:5152
 #, fuzzy, c-format
 msgid "Remove printer"
 msgstr "เครื่องพิมพ์แบบรีโมท"
 
-#: printer/printerdrake.pm:4750
+#: printer/printerdrake.pm:5110
 #, fuzzy, c-format
 msgid "Removing old printer \"%s\"..."
 msgstr "อ่าน CUPS drivers database..."
 
-#: printer/printerdrake.pm:4781
+#: printer/printerdrake.pm:5141
 #, fuzzy, c-format
 msgid "Printer \"%s\" is now enabled."
 msgstr "ระบบเน็ตเวิร์กกำลังจะหยุดทำงาน"
 
-#: printer/printerdrake.pm:4786
+#: printer/printerdrake.pm:5146
 #, fuzzy, c-format
 msgid "Printer \"%s\" is now disabled."
 msgstr "การเชื่อมต่อกับ Internet แบบ sharing ถูกยกเลิกแล้ว"
 
-#: printer/printerdrake.pm:4823
+#: printer/printerdrake.pm:5183
 #, fuzzy, c-format
 msgid "Do you really want to remove the printer \"%s\"?"
 msgstr "คุณต้องการเริ่มทำงาน Network ใหม่หรือไม่"
 
-#: printer/printerdrake.pm:4827
+#: printer/printerdrake.pm:5187
 #, fuzzy, c-format
 msgid "Removing printer \"%s\"..."
 msgstr "อ่าน CUPS drivers database..."
 
-#: printer/printerdrake.pm:4851
+#: printer/printerdrake.pm:5211
 #, fuzzy, c-format
 msgid "Default printer"
 msgstr "เครื่องพิมพ์โลคอล (ต่อติดกับตัวเครื่อง)"
 
-#: printer/printerdrake.pm:4852
+#: printer/printerdrake.pm:5212
 #, c-format
 msgid "The printer \"%s\" is set as the default printer now."
 msgstr ""
 
-#: raid.pm:36
+#: raid.pm:42
 #, fuzzy, c-format
-msgid "Can't add a partition to _formatted_ RAID %s"
+msgid "Can not add a partition to _formatted_ RAID %s"
 msgstr "ไม่สามารถเพิ่มพาร์ติชั่นเป็น _formatted_ RAID md%d"
 
-#: raid.pm:132
+#: raid.pm:144
 #, c-format
 msgid "Not enough partitions for RAID level %d\n"
 msgstr "ไม่มีพาร์ติชั่นพอสำหรับ RAID ระดับ %d\n"
@@ -12446,15 +12911,15 @@ msgid "Could not set permissions of firmware file %s!"
 msgstr ""
 
 #: 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
+#: standalone/scannerdrake:78 standalone/scannerdrake:346
+#: standalone/scannerdrake:382 standalone/scannerdrake:446
+#: standalone/scannerdrake:490 standalone/scannerdrake:494
+#: standalone/scannerdrake:516 standalone/scannerdrake:581
 #, fuzzy, c-format
 msgid "Scannerdrake"
 msgstr "เลือกกราฟฟิคการ์ด"
 
-#: scanner.pm:201 standalone/scannerdrake:916
+#: scanner.pm:201 standalone/scannerdrake:947
 #, c-format
 msgid "Could not install the packages needed to share your scanner(s)."
 msgstr ""
@@ -13351,9 +13816,9 @@ msgstr ""
 #, c-format
 msgid ""
 "PCMCIA support is usually to support things like ethernet and\n"
-"modems in laptops.  It won't get started unless configured so it is safe to "
-"have\n"
-"it installed on machines that don't need it."
+"modems in laptops.  It will not get started unless configured so it is safe "
+"to have\n"
+"it installed on machines that do not need it."
 msgstr ""
 "PCMCIA สนับสนุนการทำงานของอุปกรณ์หลายๆอย่างเช่น\n"
 "ethernet หรือ modem ในคอมพิวเตอร์แบบพกพา"
@@ -13444,52 +13909,52 @@ msgstr ""
 msgid "Starts the X Font Server (this is mandatory for Xorg to run)."
 msgstr "เริ่มและหยุด X Font Server ตอน boot และ เลิก"
 
-#: services.pm:117 services.pm:159
+#: services.pm:115 services.pm:157
 #, c-format
 msgid "Choose which services should be automatically started at boot time"
 msgstr "เลือกการบริการที่ต้องการให้เริ่มตั้งแต่การเริ่มทำงานของเครื่อง"
 
-#: services.pm:129
-#, fuzzy, c-format
+#: services.pm:127
+#, c-format
 msgid "Printing"
-msgstr "เครื่องพิมพ์"
+msgstr "กำลังพิมพ์"
 
-#: services.pm:130
+#: services.pm:128
 #, c-format
 msgid "Internet"
 msgstr "เฎ?เฏ?เฎฃเฎฏเฎฎเฎ?"
 
-#: services.pm:133
+#: services.pm:131
 #, c-format
 msgid "File sharing"
 msgstr ""
 
-#: services.pm:140
+#: services.pm:138
 #, fuzzy, c-format
 msgid "Remote Administration"
 msgstr "อ๊อปชั่นของเครื่องพิมพ์แบบรีโมท"
 
-#: services.pm:148
+#: services.pm:146
 #, fuzzy, c-format
 msgid "Database Server"
 msgstr "ชื่อเซิร์ฟเวอร์ของพรินเตอร์"
 
-#: services.pm:211
+#: services.pm:209
 #, c-format
 msgid "running"
 msgstr "กำลังทำงาน"
 
-#: services.pm:211
+#: services.pm:209
 #, c-format
 msgid "stopped"
 msgstr "หยุด"
 
-#: services.pm:215
+#: services.pm:213
 #, c-format
 msgid "Services and daemons"
 msgstr ""
 
-#: services.pm:221
+#: services.pm:219
 #, c-format
 msgid ""
 "No additional information\n"
@@ -13498,30 +13963,30 @@ msgstr ""
 "ไม่มีข้อมูลเพิ่มเติม\n"
 "สำหรับการบริการนี้ ขอโทษครับ"
 
-#: services.pm:226 ugtk2.pm:1214
+#: services.pm:224 ugtk2.pm:1010
 #, c-format
 msgid "Info"
 msgstr "ข้อมูล"
 
-#: services.pm:229
+#: services.pm:227
 #, c-format
 msgid "Start when requested"
 msgstr ""
 
-#: services.pm:229
+#: services.pm:227
 #, c-format
 msgid "On boot"
 msgstr "ขณะ boot"
 
-#: services.pm:246
-#, fuzzy, c-format
+#: services.pm:244
+#, c-format
 msgid "Start"
-msgstr "สถานะ:"
+msgstr "เริ่ม"
 
-#: services.pm:246
-#, fuzzy, c-format
+#: services.pm:244
+#, c-format
 msgid "Stop"
-msgstr "เซ็กเตอร์"
+msgstr "หยุด"
 
 #: share/advertising/01.pl:13
 #, c-format
@@ -13640,7 +14105,7 @@ msgstr ""
 #, 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:"
+"source. Therefore, you will not find in the Download version:"
 msgstr ""
 
 #: share/advertising/05.pl:18
@@ -13659,7 +14124,7 @@ msgstr ""
 #: share/advertising/05.pl:21
 #, c-format
 msgid ""
-"You won't have access to the <b>services included</b> in the other "
+"You will not have access to the <b>services included</b> in the other "
 "Mandrakesoft products either."
 msgstr ""
 
@@ -13774,7 +14239,7 @@ msgstr ""
 #, c-format
 msgid ""
 "\t* <b>Move</b>, a Mandrakelinux distribution that runs entirely from a "
-"bootable CD-Rom."
+"bootable CD-ROM."
 msgstr ""
 
 #: share/advertising/10.pl:17
@@ -13827,7 +14292,7 @@ msgstr ""
 #, c-format
 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!"
+"will not ever think of running another operating system!"
 msgstr ""
 
 #: share/advertising/12.pl:19
@@ -14457,9 +14922,9 @@ msgid "Clients for different protocols including ssh"
 msgstr "Clients for different protocols including ssh"
 
 #: share/compssUsers.pl:54
-#, fuzzy, c-format
+#, c-format
 msgid "Configuration"
-msgstr "การปรับแต่ง LAN"
+msgstr "ปรับแต่งค่า"
 
 #: share/compssUsers.pl:55
 #, c-format
@@ -14482,9 +14947,9 @@ msgid "C and C++ development libraries, programs and include files"
 msgstr ""
 
 #: share/compssUsers.pl:69 share/compssUsers.pl:169
-#, fuzzy, c-format
+#, c-format
 msgid "Documentation"
-msgstr "ตำแหน่ง"
+msgstr "คู่มือ"
 
 #: share/compssUsers.pl:70 share/compssUsers.pl:170
 #, c-format
@@ -14572,9 +15037,9 @@ msgid "NFS Server, Samba server"
 msgstr "เซิร์ฟเวอร์ NIS"
 
 #: share/compssUsers.pl:116 share/compssUsers.pl:129
-#, fuzzy, c-format
+#, c-format
 msgid "Database"
-msgstr "ชื่อเซิร์ฟเวอร์ของพรินเตอร์"
+msgstr "ฐานข้อมูล"
 
 #: share/compssUsers.pl:117
 #, c-format
@@ -14592,9 +15057,9 @@ msgid "Apache, Pro-ftpd"
 msgstr ""
 
 #: share/compssUsers.pl:125
-#, fuzzy, c-format
+#, c-format
 msgid "Mail"
-msgstr "เลือกภาษาที่คุณใช้"
+msgstr "จดหมาย"
 
 #: share/compssUsers.pl:126
 #, fuzzy, c-format
@@ -14682,7 +15147,7 @@ msgstr ""
 
 #: share/compssUsers.pl:196
 #, fuzzy, c-format
-msgid "MandrakeSoft Wizards"
+msgid "Mandrakesoft Wizards"
 msgstr "Control Center"
 
 #: share/compssUsers.pl:197
@@ -14813,7 +15278,7 @@ msgid ""
 "--disconnect : disconnect to internet if already connected\n"
 "--force : used with (dis)connect : force (dis)connection.\n"
 "--status : returns 1 if connected 0 otherwise, then exit.\n"
-"--quiet : don't be interactive. To be used with (dis)connect."
+"--quiet : do not be interactive. To be used with (dis)connect."
 msgstr ""
 
 #: standalone.pm:107
@@ -14825,9 +15290,9 @@ msgstr ""
 #, c-format
 msgid ""
 "[OPTION]...\n"
-"  --no-confirmation      don't ask first confirmation question in "
+"  --no-confirmation      do not ask first confirmation question in "
 "MandrakeUpdate mode\n"
-"  --no-verify-rpm        don't verify packages signatures\n"
+"  --no-verify-rpm        do not verify packages signatures\n"
 "  --changelog-first      display changelog before filelist in the "
 "description window\n"
 "  --merge-all-rpmnew     propose to merge all .rpmnew/.rpmsave files found"
@@ -14856,94 +15321,109 @@ msgid ""
 "testing] [-v|--version] "
 msgstr ""
 
-#: standalone/XFdrake:85
+#: standalone/XFdrake:61
+#, fuzzy, c-format
+msgid "You need to reboot for changes to take effect"
+msgstr "คุณจะต้องทำการรีบูตระบบก่อนที่จะทำการแก้ไข"
+
+#: standalone/XFdrake:92
 #, c-format
 msgid "Please log out and then use Ctrl-Alt-BackSpace"
 msgstr "กรุณาออกไปและใช้ Ctrl-Alt-BackSpace"
 
-#: standalone/XFdrake:89
+#: standalone/XFdrake:96
 #, c-format
 msgid "You need to log out and back in again for changes to take effect"
 msgstr ""
 
-#: standalone/drakTermServ:76
+#: standalone/drakTermServ:74
 #, c-format
 msgid "Useless without Terminal Server"
 msgstr ""
 
-#: standalone/drakTermServ:108 standalone/drakTermServ:114
+#: standalone/drakTermServ:106 standalone/drakTermServ:112
 #, c-format
 msgid "%s: %s requires a username...\n"
 msgstr ""
 
-#: standalone/drakTermServ:125
+#: standalone/drakTermServ:123
 #, 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:131
+#: standalone/drakTermServ:129
 #, c-format
 msgid "%s: %s requires hostname...\n"
 msgstr ""
 
-#: standalone/drakTermServ:213 standalone/drakTermServ:216
+#: standalone/drakTermServ:211 standalone/drakTermServ:214
 #, fuzzy, c-format
 msgid "Terminal Server Configuration"
 msgstr "การคอนฟิก Internet"
 
-#: standalone/drakTermServ:231
+#: standalone/drakTermServ:220
 #, fuzzy, c-format
 msgid "Enable Server"
 msgstr "ชื่อเซิร์ฟเวอร์ของพรินเตอร์"
 
-#: standalone/drakTermServ:237
+#: standalone/drakTermServ:226
 #, fuzzy, c-format
 msgid "Disable Server"
 msgstr "ชื่อเซิร์ฟเวอร์ของพรินเตอร์"
 
-#: standalone/drakTermServ:245
+#: standalone/drakTermServ:232
 #, fuzzy, c-format
 msgid "Start Server"
 msgstr "เซิร์ฟเวอร์ NIS"
 
-#: standalone/drakTermServ:251
+#: standalone/drakTermServ:238
 #, fuzzy, c-format
 msgid "Stop Server"
 msgstr "เซิร์ฟเวอร์ NIS"
 
-#: standalone/drakTermServ:259
+#: standalone/drakTermServ:247
 #, c-format
 msgid "Etherboot Floppy/ISO"
 msgstr ""
 
-#: standalone/drakTermServ:263
+#: standalone/drakTermServ:251
 #, c-format
 msgid "Net Boot Images"
 msgstr ""
 
-#: standalone/drakTermServ:269
+#: standalone/drakTermServ:258
 #, fuzzy, c-format
 msgid "Add/Del Users"
 msgstr "เพิ่มผู้ใช้"
 
-#: standalone/drakTermServ:273
+#: standalone/drakTermServ:262
 #, fuzzy, c-format
 msgid "Add/Del Clients"
 msgstr "DHCP Client"
 
-#: standalone/drakTermServ:284 standalone/drakbug:47
+#: standalone/drakTermServ:270
+#, c-format
+msgid "Images"
+msgstr "แฟ้มภาพ"
+
+#: standalone/drakTermServ:271
+#, c-format
+msgid "Clients/Users"
+msgstr ""
+
+#: standalone/drakTermServ:289 standalone/drakbug:47
 #, c-format
 msgid "First Time Wizard"
 msgstr ""
 
-#: standalone/drakTermServ:315 standalone/drakTermServ:316
+#: standalone/drakTermServ:325 standalone/drakTermServ:326
 #, c-format
 msgid "%s defined as dm, adding gdm user to /etc/passwd$$CLIENT$$"
 msgstr ""
 
-#: standalone/drakTermServ:322
+#: standalone/drakTermServ:332
 #, c-format
 msgid ""
 "\n"
@@ -14966,22 +15446,27 @@ msgid ""
 "    f) If it's thin clients, ask if you want to restart KDM.\n"
 msgstr ""
 
-#: standalone/drakTermServ:367
+#: standalone/drakTermServ:377
 #, fuzzy, c-format
 msgid "Cancel Wizard"
 msgstr "Wizard"
 
-#: standalone/drakTermServ:379
+#: standalone/drakTermServ:392
 #, c-format
 msgid "Please save dhcpd config!"
 msgstr ""
 
-#: standalone/drakTermServ:407
+#: standalone/drakTermServ:420
 #, fuzzy, c-format
 msgid "Use thin clients."
 msgstr "DHCP Client"
 
-#: standalone/drakTermServ:409
+#: standalone/drakTermServ:422
+#, c-format
+msgid "Sync client X keyboard settings with server."
+msgstr ""
+
+#: standalone/drakTermServ:424
 #, c-format
 msgid ""
 "Please select default client type.\n"
@@ -14990,45 +15475,40 @@ msgid ""
 "    'Fat' clients use their own CPU/RAM but the server's filesystem."
 msgstr ""
 
-#: standalone/drakTermServ:421 standalone/drakTermServ:1034
-#, c-format
-msgid "Sync client X keyboard settings with server."
-msgstr ""
-
-#: standalone/drakTermServ:428
+#: standalone/drakTermServ:444
 #, c-format
 msgid "Creating net boot images for all kernels"
 msgstr ""
 
-#: standalone/drakTermServ:429 standalone/drakTermServ:726
-#: standalone/drakTermServ:742
+#: standalone/drakTermServ:445 standalone/drakTermServ:747
+#: standalone/drakTermServ:764
 #, c-format
 msgid "This will take a few minutes."
 msgstr ""
 
-#: standalone/drakTermServ:433 standalone/drakTermServ:452
+#: standalone/drakTermServ:449 standalone/drakTermServ:468
 #, fuzzy, c-format
 msgid "Done!"
 msgstr "ทำเรียบร้อยแล้ว"
 
-#: standalone/drakTermServ:438
+#: standalone/drakTermServ:454
 #, c-format
 msgid "Syncing server user list with client list, including root."
 msgstr ""
 
-#: standalone/drakTermServ:458
+#: standalone/drakTermServ:474
 #, c-format
 msgid ""
 "In order to enable changes made for thin clients, the display manager must "
 "be restarted. Restart now?"
 msgstr ""
 
-#: standalone/drakTermServ:493
+#: standalone/drakTermServ:509
 #, fuzzy, c-format
 msgid "Terminal Server Overview"
 msgstr "การคอนฟิก Internet"
 
-#: standalone/drakTermServ:494
+#: standalone/drakTermServ:510
 #, c-format
 msgid ""
 "        - Create Etherboot Enabled Boot Images:\n"
@@ -15044,7 +15524,7 @@ msgid ""
 "one full kernel."
 msgstr ""
 
-#: standalone/drakTermServ:500
+#: standalone/drakTermServ:516
 #, c-format
 msgid ""
 "        - Maintain /etc/dhcpd.conf:\n"
@@ -15064,7 +15544,7 @@ msgid ""
 "like:"
 msgstr ""
 
-#: standalone/drakTermServ:518
+#: standalone/drakTermServ:534
 #, c-format
 msgid ""
 "        While you can use a pool of IP addresses, rather than setup a "
@@ -15103,7 +15583,7 @@ msgid ""
 "clients."
 msgstr ""
 
-#: standalone/drakTermServ:538
+#: standalone/drakTermServ:554
 #, c-format
 msgid ""
 "        - Maintain /etc/exports:\n"
@@ -15121,7 +15601,7 @@ msgid ""
 "        \tWith SUBNET/MASK being defined for your network."
 msgstr ""
 
-#: standalone/drakTermServ:550
+#: standalone/drakTermServ:566
 #, c-format
 msgid ""
 "        - Maintain %s:\n"
@@ -15132,7 +15612,7 @@ msgid ""
 "file."
 msgstr ""
 
-#: standalone/drakTermServ:554
+#: standalone/drakTermServ:570
 #, c-format
 msgid ""
 "        - Per client %s:\n"
@@ -15143,7 +15623,7 @@ msgid ""
 "        \tdrakTermServ will help create these files."
 msgstr ""
 
-#: standalone/drakTermServ:559
+#: standalone/drakTermServ:575
 #, c-format
 msgid ""
 "        - Per client system configuration files:\n"
@@ -15163,7 +15643,7 @@ msgid ""
 "machine is configured."
 msgstr ""
 
-#: standalone/drakTermServ:568
+#: standalone/drakTermServ:584
 #, c-format
 msgid ""
 "        - /etc/xinetd.d/tftp:\n"
@@ -15193,7 +15673,7 @@ msgid ""
 "        \tputs its images."
 msgstr ""
 
-#: standalone/drakTermServ:589
+#: standalone/drakTermServ:605
 #, c-format
 msgid ""
 "        - Create etherboot floppies/CDs:\n"
@@ -15211,62 +15691,72 @@ msgid ""
 "        \t\t/usr/lib/etherboot/zimg/3c509.zimg > /dev/fd0"
 msgstr ""
 
-#: standalone/drakTermServ:624
+#: standalone/drakTermServ:640
 #, c-format
 msgid "Boot Floppy"
 msgstr ""
 
-#: standalone/drakTermServ:626
+#: standalone/drakTermServ:642
 #, c-format
 msgid "Boot ISO"
 msgstr ""
 
-#: standalone/drakTermServ:628
+#: standalone/drakTermServ:644
 #, fuzzy, c-format
 msgid "PXE Image"
 msgstr "Image"
 
-#: standalone/drakTermServ:696
+#: standalone/drakTermServ:712
 #, fuzzy, c-format
 msgid "Default kernel version"
 msgstr "kernel version"
 
-#: standalone/drakTermServ:724
+#: standalone/drakTermServ:715
+#, c-format
+msgid "Create PXE images."
+msgstr ""
+
+#: standalone/drakTermServ:745
 #, c-format
 msgid "Build Whole Kernel -->"
 msgstr ""
 
-#: standalone/drakTermServ:731
+#: standalone/drakTermServ:753
 #, c-format
 msgid "No kernel selected!"
 msgstr ""
 
-#: standalone/drakTermServ:734
+#: standalone/drakTermServ:756
 #, c-format
 msgid "Build Single NIC -->"
 msgstr ""
 
-#: standalone/drakTermServ:738
+#: standalone/drakTermServ:760
 #, fuzzy, c-format
 msgid "No NIC selected!"
 msgstr "ไม่เชื่อมต่อ"
 
-#: standalone/drakTermServ:741
+#: standalone/drakTermServ:763
 #, c-format
 msgid "Build All Kernels -->"
 msgstr ""
 
-#: standalone/drakTermServ:749
+#: standalone/drakTermServ:774
 #, fuzzy, c-format
 msgid "<-- Delete"
 msgstr "ลบ"
 
-#: standalone/drakTermServ:756
+#: standalone/drakTermServ:779
+#, fuzzy, c-format
+msgid "No image selected!"
+msgstr "ไม่เชื่อมต่อ"
+
+#: standalone/drakTermServ:782
 #, fuzzy, c-format
 msgid "Delete All NBIs"
 msgstr "เลือกไฟล์"
 
-#: standalone/drakTermServ:843
+#: standalone/drakTermServ:908
 #, c-format
 msgid ""
 "!!! Indicates the password in the system database is different than\n"
@@ -15274,171 +15764,178 @@ msgid ""
 "Delete/re-add the user to the Terminal Server to enable login."
 msgstr ""
 
-#: standalone/drakTermServ:848
+#: standalone/drakTermServ:913
 #, fuzzy, c-format
 msgid "Add User -->"
 msgstr "เพิ่มผู้ใช้"
 
-#: standalone/drakTermServ:854
+#: standalone/drakTermServ:919
 #, c-format
 msgid "<-- Del User"
 msgstr ""
 
-#: standalone/drakTermServ:890
+#: standalone/drakTermServ:955
 #, fuzzy, c-format
 msgid "type: %s"
 msgstr "ประเภท: "
 
-#: standalone/drakTermServ:894
+#: standalone/drakTermServ:959
 #, c-format
 msgid "local config: %s"
 msgstr ""
 
-#: standalone/drakTermServ:924
+#: standalone/drakTermServ:989
 #, fuzzy, c-format
 msgid ""
 "Allow local hardware\n"
 "configuration."
 msgstr "Boot Style Configuration"
 
-#: standalone/drakTermServ:933
+#: standalone/drakTermServ:998
 #, c-format
 msgid "No net boot images created!"
 msgstr ""
 
-#: standalone/drakTermServ:951
+#: standalone/drakTermServ:1017
 #, fuzzy, c-format
 msgid "Thin Client"
 msgstr "DHCP Client"
 
-#: standalone/drakTermServ:955
+#: standalone/drakTermServ:1021
 #, fuzzy, c-format
 msgid "Allow Thin Clients"
 msgstr "DHCP Client"
 
-#: standalone/drakTermServ:956
+#: standalone/drakTermServ:1022
+#, c-format
+msgid ""
+"Sync client X keyboard\n"
+" settings with server."
+msgstr ""
+
+#: standalone/drakTermServ:1023
 #, c-format
 msgid "Add Client -->"
 msgstr ""
 
-#: standalone/drakTermServ:970
+#: standalone/drakTermServ:1037
 #, fuzzy, c-format
 msgid "type: fat"
 msgstr "ประเภท: "
 
-#: standalone/drakTermServ:971
+#: standalone/drakTermServ:1038
 #, fuzzy, c-format
 msgid "type: thin"
 msgstr "ประเภท: "
 
-#: standalone/drakTermServ:978
+#: standalone/drakTermServ:1045
 #, fuzzy, c-format
 msgid "local config: false"
 msgstr "เครื่องพิมพ์โลคอล (ต่อติดกับตัวเครื่อง)"
 
-#: standalone/drakTermServ:979
+#: standalone/drakTermServ:1046
 #, fuzzy, c-format
 msgid "local config: true"
 msgstr "คอนฟิกใหม่"
 
-#: standalone/drakTermServ:987
+#: standalone/drakTermServ:1054
 #, fuzzy, c-format
 msgid "<-- Edit Client"
 msgstr "DHCP Client"
 
-#: standalone/drakTermServ:1013
+#: standalone/drakTermServ:1080
 #, c-format
 msgid "Disable Local Config"
 msgstr ""
 
-#: standalone/drakTermServ:1020
+#: standalone/drakTermServ:1087
 #, fuzzy, c-format
 msgid "Delete Client"
 msgstr "DHCP Client"
 
-#: standalone/drakTermServ:1029
+#: standalone/drakTermServ:1096
 #, fuzzy, c-format
 msgid "dhcpd Config..."
 msgstr "กำลังทำการคอนฟิก"
 
-#: standalone/drakTermServ:1045
+#: standalone/drakTermServ:1111
 #, 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:1085
+#: standalone/drakTermServ:1156
 #, c-format
-msgid "Thin clients won't work with autologin. Disable autologin?"
+msgid "Thin clients will not work with autologin. Disable autologin?"
 msgstr ""
 
-#: standalone/drakTermServ:1101
+#: standalone/drakTermServ:1172
 #, c-format
 msgid "All clients will use %s"
 msgstr ""
 
-#: standalone/drakTermServ:1133
+#: standalone/drakTermServ:1204
 #, c-format
 msgid "Subnet:"
 msgstr ""
 
-#: standalone/drakTermServ:1140
-#, fuzzy, c-format
+#: standalone/drakTermServ:1211
+#, c-format
 msgid "Netmask:"
-msgstr "เน็ตมาสก์"
+msgstr "เน็ตแมสก์:"
 
-#: standalone/drakTermServ:1147
+#: standalone/drakTermServ:1218
 #, c-format
 msgid "Routers:"
 msgstr ""
 
-#: standalone/drakTermServ:1154
+#: standalone/drakTermServ:1225
 #, c-format
 msgid "Subnet Mask:"
-msgstr ""
+msgstr "Subnet Mask:"
 
-#: standalone/drakTermServ:1161
+#: standalone/drakTermServ:1232
 #, c-format
 msgid "Broadcast Address:"
 msgstr ""
 
-#: standalone/drakTermServ:1168
+#: standalone/drakTermServ:1239
 #, fuzzy, c-format
 msgid "Domain Name:"
 msgstr "ชื่อโดเมน"
 
-#: standalone/drakTermServ:1176
+#: standalone/drakTermServ:1247
 #, fuzzy, c-format
 msgid "Name Servers:"
 msgstr "เซิร์ฟเวอร์ NIS"
 
-#: standalone/drakTermServ:1187
+#: standalone/drakTermServ:1258
 #, c-format
 msgid "IP Range Start:"
 msgstr ""
 
-#: standalone/drakTermServ:1188
+#: standalone/drakTermServ:1259
 #, c-format
 msgid "IP Range End:"
 msgstr ""
 
-#: standalone/drakTermServ:1230
+#: standalone/drakTermServ:1301
 #, c-format
 msgid "Append TS Includes To Existing Config"
 msgstr ""
 
-#: standalone/drakTermServ:1232
+#: standalone/drakTermServ:1303
 #, fuzzy, c-format
 msgid "Write Config"
 msgstr "คอนฟิกใหม่"
 
-#: standalone/drakTermServ:1248
+#: standalone/drakTermServ:1319
 #, fuzzy, c-format
 msgid "dhcpd Server Configuration"
 msgstr "การปรับแต่ง LAN"
 
-#: standalone/drakTermServ:1249
+#: standalone/drakTermServ:1320
 #, c-format
 msgid ""
 "Most of these values were extracted\n"
@@ -15446,109 +15943,109 @@ msgid ""
 "You can modify as needed."
 msgstr ""
 
-#: standalone/drakTermServ:1252
+#: standalone/drakTermServ:1323
 #, c-format
 msgid "Dynamic IP Address Pool:"
 msgstr ""
 
-#: standalone/drakTermServ:1399
+#: standalone/drakTermServ:1474
 #, fuzzy, c-format
 msgid "Please insert floppy disk:"
 msgstr "ให้ใส่แผ่นฟล้อปปี้ลงในไดรว์ %s"
 
-#: standalone/drakTermServ:1403
+#: standalone/drakTermServ:1478
 #, c-format
-msgid "Couldn't access the floppy!"
+msgid "Could not access the floppy!"
 msgstr ""
 
-#: standalone/drakTermServ:1405
+#: standalone/drakTermServ:1480
 #, c-format
 msgid "Floppy can be removed now"
 msgstr ""
 
-#: standalone/drakTermServ:1408
+#: standalone/drakTermServ:1483
 #, fuzzy, c-format
 msgid "No floppy drive available!"
 msgstr "ไม่มีไดรว์ฟล้อปปี็เหลืออยู่"
 
-#: standalone/drakTermServ:1413
+#: standalone/drakTermServ:1488
 #, c-format
 msgid "PXE image is %s/%s"
 msgstr ""
 
-#: standalone/drakTermServ:1415
+#: standalone/drakTermServ:1490
 #, fuzzy, c-format
 msgid "Error writing %s/%s"
 msgstr "ข้อผิดพลาดถูกบันทึกในไฟล์ %s"
 
-#: standalone/drakTermServ:1424
+#: standalone/drakTermServ:1500
 #, c-format
 msgid "Etherboot ISO image is %s"
 msgstr ""
 
-#: standalone/drakTermServ:1426
+#: standalone/drakTermServ:1502
 #, c-format
 msgid "Something went wrong! - Is mkisofs installed?"
 msgstr ""
 
-#: standalone/drakTermServ:1447
+#: standalone/drakTermServ:1523
 #, c-format
 msgid "Need to create /etc/dhcpd.conf first!"
 msgstr ""
 
-#: standalone/drakTermServ:1602
+#: standalone/drakTermServ:1683
 #, c-format
 msgid "%s passwd bad in Terminal Server - rewriting...\n"
 msgstr ""
 
-#: standalone/drakTermServ:1615
+#: standalone/drakTermServ:1696
 #, fuzzy, c-format
 msgid "%s is not a user..\n"
 msgstr "ไม่พบการ์ดเน็ตเวิร์ก"
 
-#: standalone/drakTermServ:1616
+#: standalone/drakTermServ:1697
 #, c-format
 msgid "%s is already a Terminal Server user\n"
 msgstr ""
 
-#: standalone/drakTermServ:1618
+#: standalone/drakTermServ:1699
 #, c-format
 msgid "Addition of %s to Terminal Server failed!\n"
 msgstr ""
 
-#: standalone/drakTermServ:1620
+#: standalone/drakTermServ:1701
 #, c-format
 msgid "%s added to Terminal Server\n"
 msgstr ""
 
-#: standalone/drakTermServ:1666
+#: standalone/drakTermServ:1718
 #, fuzzy, c-format
 msgid "Deleted %s...\n"
 msgstr "ค้นพบ %s"
 
-#: standalone/drakTermServ:1668 standalone/drakTermServ:1741
+#: standalone/drakTermServ:1720 standalone/drakTermServ:1793
 #, fuzzy, c-format
 msgid "%s not found...\n"
 msgstr "ไม่พบการ์ดเน็ตเวิร์ก"
 
-#: standalone/drakTermServ:1769
+#: standalone/drakTermServ:1821
 #, c-format
 msgid "/etc/hosts.allow and /etc/hosts.deny already configured - not changed"
 msgstr ""
 
-#: standalone/drakTermServ:1921
+#: standalone/drakTermServ:1961
 #, c-format
 msgid "Configuration changed - restart clusternfs/dhcpd?"
 msgstr ""
 
 #: standalone/drakautoinst:38
-#, fuzzy, c-format
+#, c-format
 msgid "Error!"
-msgstr "ผิดพลาด"
+msgstr "ผิดพลาด!"
 
 #: standalone/drakautoinst:39
 #, c-format
-msgid "I can't find needed image file `%s'."
+msgid "I can not find needed image file `%s'."
 msgstr ""
 
 #: standalone/drakautoinst:41
@@ -15619,8 +16116,8 @@ msgid ""
 "The parameters of the auto-install are available in the sections on the left"
 msgstr ""
 
-#: standalone/drakautoinst:252 standalone/drakgw:600 standalone/drakvpn:902
-#: standalone/scannerdrake:375
+#: standalone/drakautoinst:252 standalone/drakgw:597 standalone/drakvpn:902
+#: standalone/scannerdrake:405
 #, c-format
 msgid "Congratulations!"
 msgstr "ขอแสดงความยินดี"
@@ -15657,61 +16154,61 @@ msgstr ""
 msgid "tape"
 msgstr "ประเภท"
 
-#: standalone/drakbackup:153
+#: standalone/drakbackup:152
 #, c-format
 msgid ""
 "Expect is an extension to the TCL scripting language that allows interactive "
 "sessions without user intervention."
 msgstr ""
 
-#: standalone/drakbackup:154
+#: standalone/drakbackup:153
 #, c-format
 msgid "Store the password for this system in drakbackup configuration."
 msgstr ""
 
-#: standalone/drakbackup:155
+#: standalone/drakbackup:154
 #, 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:156
+#: standalone/drakbackup:155
 #, 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:157
+#: standalone/drakbackup:156
 #, c-format
 msgid ""
 "Incremental backups only save files that have changed or are new since the "
 "last backup."
 msgstr ""
 
-#: standalone/drakbackup:158
+#: standalone/drakbackup:157
 #, c-format
 msgid ""
 "Differential backups only save files that have changed or are new since the "
 "original 'base' backup."
 msgstr ""
 
-#: standalone/drakbackup:159
+#: standalone/drakbackup:158
 #, c-format
 msgid ""
 "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:160
+#: standalone/drakbackup:159
 #, 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:161
+#: standalone/drakbackup:160
 #, c-format
 msgid ""
 "For backups to other media, files are still created on the hard drive, then "
@@ -15719,7 +16216,7 @@ msgid ""
 "tar files after the backup."
 msgstr ""
 
-#: standalone/drakbackup:162
+#: standalone/drakbackup:161
 #, c-format
 msgid ""
 "Some protocols, like rsync, may be configured at the server end.  Rather "
@@ -15727,70 +16224,70 @@ msgid ""
 "path."
 msgstr ""
 
-#: standalone/drakbackup:163
+#: standalone/drakbackup:162
 #, 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:327
+#: standalone/drakbackup:326
 #, c-format
 msgid "No media selected for cron operation."
 msgstr ""
 
-#: standalone/drakbackup:331
+#: standalone/drakbackup:330
 #, c-format
 msgid "No interval selected for cron operation."
 msgstr ""
 
-#: standalone/drakbackup:378
+#: standalone/drakbackup:377
 #, c-format
 msgid "Interval cron not available as non-root"
 msgstr ""
 
-#: standalone/drakbackup:463 standalone/logdrake:437
+#: standalone/drakbackup:462 standalone/logdrake:437
 #, c-format
 msgid "\"%s\" neither is a valid email nor is an existing local user!"
 msgstr ""
 
-#: standalone/drakbackup:467 standalone/logdrake:442
+#: standalone/drakbackup:466 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:476
+#: standalone/drakbackup:475
 #, c-format
 msgid "Valid user list changed, rewriting config file."
 msgstr ""
 
-#: standalone/drakbackup:478
+#: standalone/drakbackup:477
 #, c-format
 msgid "Old user list:\n"
 msgstr ""
 
-#: standalone/drakbackup:480
+#: standalone/drakbackup:479
 #, c-format
 msgid "New user list:\n"
 msgstr ""
 
-#: standalone/drakbackup:525
+#: standalone/drakbackup:524
 #, c-format
 msgid ""
 "\n"
 "                      DrakBackup Report \n"
 msgstr ""
 
-#: standalone/drakbackup:526
+#: standalone/drakbackup:525
 #, c-format
 msgid ""
 "\n"
 "                      DrakBackup Daemon Report\n"
 msgstr ""
 
-#: standalone/drakbackup:532
+#: standalone/drakbackup:531
 #, c-format
 msgid ""
 "\n"
@@ -15799,13 +16296,13 @@ msgid ""
 "\n"
 msgstr ""
 
-#: standalone/drakbackup:557 standalone/drakbackup:628
-#: standalone/drakbackup:684
+#: standalone/drakbackup:556 standalone/drakbackup:627
+#: standalone/drakbackup:683
 #, fuzzy, c-format
 msgid "Total progress"
 msgstr "กำลังตรวจสอบพอร์ต"
 
-#: standalone/drakbackup:610
+#: standalone/drakbackup:609
 #, c-format
 msgid ""
 "%s exists, delete?\n"
@@ -15814,42 +16311,42 @@ msgid ""
 " need to purge the entry from authorized_keys on the server."
 msgstr ""
 
-#: standalone/drakbackup:619
+#: standalone/drakbackup:618
 #, c-format
 msgid "This may take a moment to generate the keys."
 msgstr ""
 
-#: standalone/drakbackup:626
+#: standalone/drakbackup:625
 #, fuzzy, c-format
 msgid "Cannot spawn %s."
 msgstr "Adapter %s: %s"
 
-#: standalone/drakbackup:643
+#: standalone/drakbackup:642
 #, c-format
 msgid "No password prompt on %s at port %s"
 msgstr ""
 
-#: standalone/drakbackup:644
+#: standalone/drakbackup:643
 #, fuzzy, c-format
 msgid "Bad password on %s"
 msgstr "ไม่มีรหัสผ่าน"
 
-#: standalone/drakbackup:645
+#: standalone/drakbackup:644
 #, c-format
 msgid "Permission denied transferring %s to %s"
 msgstr ""
 
-#: standalone/drakbackup:646
+#: standalone/drakbackup:645
 #, fuzzy, c-format
-msgid "Can't find %s on %s"
+msgid "Can not find %s on %s"
 msgstr "Adapter %s: %s"
 
-#: standalone/drakbackup:650
+#: standalone/drakbackup:649
 #, c-format
 msgid "%s not responding"
 msgstr ""
 
-#: standalone/drakbackup:654
+#: standalone/drakbackup:653
 #, c-format
 msgid ""
 "Transfer successful\n"
@@ -15860,84 +16357,84 @@ msgid ""
 "without being prompted for a password."
 msgstr ""
 
-#: standalone/drakbackup:698
+#: standalone/drakbackup:697
 #, c-format
 msgid "WebDAV remote site already in sync!"
 msgstr ""
 
-#: standalone/drakbackup:702
+#: standalone/drakbackup:701
 #, c-format
 msgid "WebDAV transfer failed!"
 msgstr ""
 
-#: standalone/drakbackup:723
+#: standalone/drakbackup:722
 #, c-format
 msgid "No CD-R/DVD-R in drive!"
 msgstr ""
 
-#: standalone/drakbackup:727
+#: standalone/drakbackup:726
 #, c-format
 msgid "Does not appear to be recordable media!"
 msgstr ""
 
-#: standalone/drakbackup:732
+#: standalone/drakbackup:731
 #, c-format
 msgid "Not erasable media!"
 msgstr ""
 
-#: standalone/drakbackup:774
+#: standalone/drakbackup:773
 #, c-format
 msgid "This may take a moment to erase the media."
 msgstr ""
 
-#: standalone/drakbackup:832
+#: standalone/drakbackup:831
 #, c-format
 msgid "Permission problem accessing CD."
 msgstr ""
 
-#: standalone/drakbackup:859
+#: standalone/drakbackup:858
 #, c-format
 msgid "No tape in %s!"
 msgstr ""
 
-#: standalone/drakbackup:966
+#: standalone/drakbackup:965
 #, c-format
 msgid ""
 "Backup quota exceeded!\n"
 "%d MB used vs %d MB allocated."
 msgstr ""
 
-#: standalone/drakbackup:985 standalone/drakbackup:1018
+#: standalone/drakbackup:984 standalone/drakbackup:1017
 #, c-format
 msgid "Backup system files..."
 msgstr ""
 
-#: standalone/drakbackup:1019 standalone/drakbackup:1060
+#: standalone/drakbackup:1018 standalone/drakbackup:1059
 #, fuzzy, c-format
 msgid "Hard Disk Backup files..."
 msgstr "ไฟล์แบ็คอัพมีปัญหา"
 
-#: standalone/drakbackup:1059
+#: standalone/drakbackup:1058
 #, fuzzy, c-format
 msgid "Backup User files..."
 msgstr "ไฟล์แบ็คอัพมีปัญหา"
 
-#: standalone/drakbackup:1094
+#: standalone/drakbackup:1093
 #, fuzzy, c-format
 msgid "Backup Other files..."
 msgstr "ไฟล์แบ็คอัพมีปัญหา"
 
-#: standalone/drakbackup:1095
+#: standalone/drakbackup:1094
 #, c-format
 msgid "Hard Disk Backup Progress..."
 msgstr ""
 
-#: standalone/drakbackup:1100
+#: standalone/drakbackup:1099
 #, fuzzy, c-format
 msgid "No changes to backup!"
 msgstr "ไฟล์แบ็คอัพมีปัญหา"
 
-#: standalone/drakbackup:1118 standalone/drakbackup:1142
+#: standalone/drakbackup:1117 standalone/drakbackup:1141
 #, c-format
 msgid ""
 "\n"
@@ -15945,7 +16442,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: standalone/drakbackup:1127
+#: standalone/drakbackup:1126
 #, c-format
 msgid ""
 "\n"
@@ -15953,18 +16450,18 @@ msgid ""
 "FTP.\n"
 msgstr ""
 
-#: standalone/drakbackup:1128
+#: standalone/drakbackup:1127
 #, c-format
 msgid ""
 "Error during sending file via FTP. Please correct your FTP configuration."
 msgstr ""
 
-#: standalone/drakbackup:1130
+#: standalone/drakbackup:1129
 #, c-format
 msgid "file list sent by FTP: %s\n"
 msgstr ""
 
-#: standalone/drakbackup:1147
+#: standalone/drakbackup:1146
 #, c-format
 msgid ""
 "\n"
@@ -15972,7 +16469,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: standalone/drakbackup:1152
+#: standalone/drakbackup:1151
 #, c-format
 msgid ""
 "\n"
@@ -15980,1163 +16477,1163 @@ msgid ""
 "\n"
 msgstr ""
 
-#: standalone/drakbackup:1161
+#: standalone/drakbackup:1160
 #, c-format
 msgid "Error sending mail. Your report mail was not sent."
 msgstr ""
 
-#: standalone/drakbackup:1162
+#: standalone/drakbackup:1161
 #, fuzzy, c-format
 msgid " Error while sending mail. \n"
 msgstr "มีปัญหากับการอ่านข้อมูลในไฟล์ %s"
 
-#: standalone/drakbackup:1192
+#: standalone/drakbackup:1191
 #, c-format
-msgid "Can't create catalog!"
+msgid "Can not create catalog!"
 msgstr ""
 
-#: standalone/drakbackup:1414
+#: standalone/drakbackup:1420
 #, c-format
 msgid ""
 "\n"
 "Please check all options that you need.\n"
 msgstr ""
 
-#: standalone/drakbackup:1415
+#: standalone/drakbackup:1421
 #, c-format
 msgid ""
 "These options can backup and restore all files in your /etc directory.\n"
 msgstr ""
 
-#: standalone/drakbackup:1416
+#: standalone/drakbackup:1422
 #, fuzzy, c-format
 msgid "Backup your System files. (/etc directory)"
 msgstr "ไฟล์แบ็คอัพมีปัญหา"
 
-#: standalone/drakbackup:1417 standalone/drakbackup:1481
-#: standalone/drakbackup:1547
+#: standalone/drakbackup:1423 standalone/drakbackup:1487
+#: standalone/drakbackup:1553
 #, c-format
 msgid "Use Incremental/Differential Backups  (do not replace old backups)"
 msgstr ""
 
-#: standalone/drakbackup:1419 standalone/drakbackup:1483
-#: standalone/drakbackup:1549
+#: standalone/drakbackup:1425 standalone/drakbackup:1489
+#: standalone/drakbackup:1555
 #, c-format
 msgid "Use Incremental Backups"
 msgstr ""
 
-#: standalone/drakbackup:1419 standalone/drakbackup:1483
-#: standalone/drakbackup:1549
+#: standalone/drakbackup:1425 standalone/drakbackup:1489
+#: standalone/drakbackup:1555
 #, c-format
 msgid "Use Differential Backups"
 msgstr ""
 
-#: standalone/drakbackup:1421
+#: standalone/drakbackup:1427
 #, c-format
 msgid "Do not include critical files (passwd, group, fstab)"
 msgstr ""
 
-#: standalone/drakbackup:1422
+#: standalone/drakbackup:1428
 #, c-format
 msgid ""
 "With this option you will be able to restore any version\n"
 " of your /etc directory."
 msgstr ""
 
-#: standalone/drakbackup:1453
+#: standalone/drakbackup:1459
 #, fuzzy, c-format
 msgid "Please check all users that you want to include in your backup."
 msgstr "เลือกแพ็คเก็จที่คุณต้องการติดตั้ง "
 
-#: standalone/drakbackup:1480
+#: standalone/drakbackup:1486
 #, c-format
 msgid "Do not include the browser cache"
 msgstr ""
 
-#: standalone/drakbackup:1534
+#: standalone/drakbackup:1540
 #, c-format
 msgid "Select the files or directories and click on 'OK'"
 msgstr ""
 
-#: standalone/drakbackup:1535 standalone/drakfont:660
+#: standalone/drakbackup:1541 standalone/drakfont:661
 #, fuzzy, c-format
 msgid "Remove Selected"
 msgstr "ลบคิว"
 
-#: standalone/drakbackup:1598
-#, fuzzy, c-format
+#: standalone/drakbackup:1604
+#, c-format
 msgid "Users"
-msgstr "ชื่อผู้ใช้"
+msgstr "ผู้ใช้"
 
-#: standalone/drakbackup:1618
+#: standalone/drakbackup:1624
 #, fuzzy, c-format
 msgid "Use network connection to backup"
 msgstr "ไฟล์แบ็คอัพมีปัญหา"
 
-#: standalone/drakbackup:1620
+#: standalone/drakbackup:1626
 #, c-format
 msgid "Net Method:"
 msgstr ""
 
-#: standalone/drakbackup:1624
+#: standalone/drakbackup:1630
 #, c-format
 msgid "Use Expect for SSH"
 msgstr ""
 
-#: standalone/drakbackup:1625
+#: standalone/drakbackup:1631
 #, c-format
 msgid "Create/Transfer backup keys for SSH"
 msgstr ""
 
-#: standalone/drakbackup:1627
+#: standalone/drakbackup:1633
 #, c-format
 msgid "Transfer Now"
 msgstr ""
 
-#: standalone/drakbackup:1629
+#: standalone/drakbackup:1635
 #, c-format
 msgid "Other (not drakbackup) keys in place already"
 msgstr ""
 
-#: standalone/drakbackup:1632
+#: standalone/drakbackup:1638
 #, fuzzy, c-format
 msgid "Host name or IP."
 msgstr "ชื่อโฮสต์:"
 
-#: standalone/drakbackup:1637
+#: standalone/drakbackup:1643
 #, c-format
 msgid "Directory (or module) to put the backup on this host."
 msgstr ""
 
-#: standalone/drakbackup:1649
+#: standalone/drakbackup:1655
 #, fuzzy, c-format
 msgid "Remember this password"
 msgstr "ไม่มีรหัสผ่าน"
 
-#: standalone/drakbackup:1665
+#: standalone/drakbackup:1671
 #, c-format
 msgid "Need hostname, username and password!"
 msgstr ""
 
-#: standalone/drakbackup:1756
+#: standalone/drakbackup:1762
 #, c-format
 msgid "Use CD-R/DVD-R to backup"
 msgstr ""
 
-#: standalone/drakbackup:1759
+#: standalone/drakbackup:1765
 #, fuzzy, c-format
 msgid "Choose your CD/DVD device"
 msgstr "คุณต้องการเลือกคีย์บอร์ดเลย์เอ้าท์แบบใด "
 
-#: standalone/drakbackup:1764
+#: standalone/drakbackup:1770
 #, fuzzy, c-format
 msgid "Choose your CD/DVD media size"
 msgstr "คุณต้องการเลือกคีย์บอร์ดเลย์เอ้าท์แบบใด "
 
-#: standalone/drakbackup:1771
+#: standalone/drakbackup:1777
 #, fuzzy, c-format
 msgid "Multisession CD"
 msgstr "Multimedia - เขียน CD "
 
-#: standalone/drakbackup:1773
+#: standalone/drakbackup:1779
 #, c-format
 msgid "CDRW media"
 msgstr ""
 
-#: standalone/drakbackup:1779
+#: standalone/drakbackup:1785
 #, fuzzy, c-format
 msgid "Erase your RW media (1st Session)"
 msgstr "โปรดเลือกพาร์ติชั่น"
 
-#: standalone/drakbackup:1780
+#: standalone/drakbackup:1786
 #, c-format
 msgid " Erase Now "
 msgstr ""
 
-#: standalone/drakbackup:1786
+#: standalone/drakbackup:1792
 #, c-format
 msgid "DVD+RW media"
 msgstr ""
 
-#: standalone/drakbackup:1788
+#: standalone/drakbackup:1794
 #, fuzzy, c-format
 msgid "DVD-R media"
 msgstr "อุปกรณ์"
 
-#: standalone/drakbackup:1790
+#: standalone/drakbackup:1796
 #, fuzzy, c-format
 msgid "DVDRAM device"
 msgstr "อุปกรณ์"
 
-#: standalone/drakbackup:1821
+#: standalone/drakbackup:1827
 #, fuzzy, c-format
 msgid "No CD device defined!"
 msgstr "เลือกไฟล์"
 
-#: standalone/drakbackup:1863
+#: standalone/drakbackup:1869
 #, fuzzy, c-format
 msgid "Use tape to backup"
 msgstr "ไฟล์แบ็คอัพมีปัญหา"
 
-#: standalone/drakbackup:1866
+#: standalone/drakbackup:1872
 #, c-format
 msgid "Device name to use for backup"
 msgstr ""
 
-#: standalone/drakbackup:1872
+#: standalone/drakbackup:1878
 #, c-format
 msgid "Backup directly to tape"
 msgstr ""
 
-#: standalone/drakbackup:1878
+#: standalone/drakbackup:1884
 #, fuzzy, c-format
-msgid "Don't rewind tape after backup"
+msgid "Do not rewind tape after backup"
 msgstr "ไฟล์แบ็คอัพมีปัญหา"
 
-#: standalone/drakbackup:1884
+#: standalone/drakbackup:1890
 #, fuzzy, c-format
 msgid "Erase tape before backup"
 msgstr "ไฟล์แบ็คอัพมีปัญหา"
 
-#: standalone/drakbackup:1890
+#: standalone/drakbackup:1896
 #, fuzzy, c-format
 msgid "Eject tape after the backup"
 msgstr "ไฟล์แบ็คอัพมีปัญหา"
 
-#: standalone/drakbackup:1962
+#: standalone/drakbackup:1968
 #, fuzzy, c-format
 msgid "Enter the directory to save to:"
 msgstr "กรุณาทดสอบเม้าส์"
 
-#: standalone/drakbackup:1966
+#: standalone/drakbackup:1972
 #, fuzzy, c-format
 msgid "Directory to save to"
 msgstr "กรุณาทดสอบเม้าส์"
 
-#: standalone/drakbackup:1971
+#: standalone/drakbackup:1977
 #, c-format
 msgid ""
 "Maximum size\n"
 " allowed for Drakbackup (MB)"
 msgstr ""
 
-#: standalone/drakbackup:2035
+#: standalone/drakbackup:2041
 #, c-format
 msgid "CD-R / DVD-R"
 msgstr ""
 
-#: standalone/drakbackup:2040
+#: standalone/drakbackup:2046
 #, c-format
 msgid "HardDrive / NFS"
 msgstr ""
 
-#: standalone/drakbackup:2055 standalone/drakbackup:2056
-#: standalone/drakbackup:2061
+#: standalone/drakbackup:2061 standalone/drakbackup:2062
+#: standalone/drakbackup:2067
 #, c-format
 msgid "hourly"
 msgstr ""
 
-#: standalone/drakbackup:2055 standalone/drakbackup:2057
-#: standalone/drakbackup:2062
+#: standalone/drakbackup:2061 standalone/drakbackup:2063
+#: standalone/drakbackup:2068
 #, c-format
 msgid "daily"
 msgstr ""
 
-#: standalone/drakbackup:2055 standalone/drakbackup:2058
-#: standalone/drakbackup:2063
+#: standalone/drakbackup:2061 standalone/drakbackup:2064
+#: standalone/drakbackup:2069
 #, c-format
 msgid "weekly"
 msgstr ""
 
-#: standalone/drakbackup:2055 standalone/drakbackup:2059
-#: standalone/drakbackup:2064
+#: standalone/drakbackup:2061 standalone/drakbackup:2065
+#: standalone/drakbackup:2070
 #, c-format
 msgid "monthly"
 msgstr ""
 
-#: standalone/drakbackup:2055 standalone/drakbackup:2060
-#: standalone/drakbackup:2065
-#, fuzzy, c-format
+#: standalone/drakbackup:2061 standalone/drakbackup:2066
+#: standalone/drakbackup:2071
+#, c-format
 msgid "custom"
-msgstr "แบบปรับแก้ได้ (Customized) "
+msgstr "กำหนดเอง"
 
-#: standalone/drakbackup:2069
+#: standalone/drakbackup:2075
 #, c-format
 msgid "January"
 msgstr "มกราคม"
 
-#: standalone/drakbackup:2069
+#: standalone/drakbackup:2075
 #, c-format
 msgid "February"
 msgstr "กุมภาพันธ์"
 
-#: standalone/drakbackup:2069
+#: standalone/drakbackup:2075
 #, c-format
 msgid "March"
 msgstr "มีนาคม"
 
-#: standalone/drakbackup:2070
+#: standalone/drakbackup:2076
 #, c-format
 msgid "April"
 msgstr "เมษายน"
 
-#: standalone/drakbackup:2070
+#: standalone/drakbackup:2076
 #, c-format
 msgid "May"
 msgstr "พฤษภาคม"
 
-#: standalone/drakbackup:2070
+#: standalone/drakbackup:2076
 #, c-format
 msgid "June"
 msgstr "มิถุนายน"
 
-#: standalone/drakbackup:2070
+#: standalone/drakbackup:2076
 #, c-format
 msgid "July"
 msgstr "กรกฎาคม"
 
-#: standalone/drakbackup:2070
+#: standalone/drakbackup:2076
 #, c-format
 msgid "August"
 msgstr "สิงหาคม"
 
-#: standalone/drakbackup:2070
+#: standalone/drakbackup:2076
 #, c-format
 msgid "September"
 msgstr "กันยายน"
 
-#: standalone/drakbackup:2071
+#: standalone/drakbackup:2077
 #, c-format
 msgid "October"
 msgstr "ตุลาคม"
 
-#: standalone/drakbackup:2071
+#: standalone/drakbackup:2077
 #, c-format
 msgid "November"
 msgstr "พฤศจิกายน"
 
-#: standalone/drakbackup:2071
+#: standalone/drakbackup:2077
 #, c-format
 msgid "December"
 msgstr "ธันวาคม"
 
-#: standalone/drakbackup:2074
+#: standalone/drakbackup:2080
 #, c-format
 msgid "Sunday"
 msgstr "อาทิตย์"
 
-#: standalone/drakbackup:2074
+#: standalone/drakbackup:2080
 #, c-format
 msgid "Monday"
 msgstr "จันทร์"
 
-#: standalone/drakbackup:2074
+#: standalone/drakbackup:2080
 #, c-format
 msgid "Tuesday"
 msgstr "อังคาร"
 
-#: standalone/drakbackup:2075
+#: standalone/drakbackup:2081
 #, c-format
 msgid "Wednesday"
 msgstr "พุธ"
 
-#: standalone/drakbackup:2075
+#: standalone/drakbackup:2081
 #, c-format
 msgid "Thursday"
 msgstr "พฤหัสบดี"
 
-#: standalone/drakbackup:2075
+#: standalone/drakbackup:2081
 #, c-format
 msgid "Friday"
 msgstr "ศุกร์"
 
-#: standalone/drakbackup:2075
+#: standalone/drakbackup:2081
 #, c-format
 msgid "Saturday"
 msgstr "เสาร์"
 
-#: standalone/drakbackup:2107
+#: standalone/drakbackup:2113
 #, fuzzy, c-format
 msgid "Use daemon"
 msgstr "ชื่อผู้ใช้"
 
-#: standalone/drakbackup:2112
+#: standalone/drakbackup:2117
 #, fuzzy, c-format
 msgid "Please choose the time interval between each backup"
 msgstr "เลือกแพ็คเก็จที่คุณต้องการติดตั้ง "
 
-#: standalone/drakbackup:2118
+#: standalone/drakbackup:2123
 #, c-format
 msgid "Custom setup/crontab entry:"
 msgstr ""
 
-#: standalone/drakbackup:2123
-#, fuzzy, c-format
+#: standalone/drakbackup:2128
+#, c-format
 msgid "Minute"
-msgstr "1 นาที"
+msgstr "นาที"
 
-#: standalone/drakbackup:2127
+#: standalone/drakbackup:2132
 #, c-format
 msgid "Hour"
-msgstr ""
+msgstr "ชั่งโมง"
 
-#: standalone/drakbackup:2131
-#, fuzzy, c-format
+#: standalone/drakbackup:2136
+#, c-format
 msgid "Day"
-msgstr "พฤษภาคม"
+msgstr "วัน"
 
-#: standalone/drakbackup:2135
-#, fuzzy, c-format
+#: standalone/drakbackup:2140
+#, c-format
 msgid "Month"
-msgstr "เม้าท์"
+msgstr "เดือน"
 
-#: standalone/drakbackup:2139
+#: standalone/drakbackup:2144
 #, fuzzy, c-format
 msgid "Weekday"
 msgstr "พุธ"
 
-#: standalone/drakbackup:2145
+#: standalone/drakbackup:2150
 #, fuzzy, c-format
 msgid "Please choose the media for backup."
 msgstr "กรุณาเลือกภาษาที่ต้องการใช้"
 
-#: standalone/drakbackup:2152
+#: standalone/drakbackup:2156
 #, fuzzy, c-format
 msgid "Please be sure that the cron daemon is included in your services."
 msgstr "เลือกแพ็คเก็จที่คุณต้องการติดตั้ง "
 
-#: standalone/drakbackup:2153
+#: standalone/drakbackup:2157
+#, c-format
+msgid ""
+"If your machine is not on all the time, you might want to install anacron."
+msgstr ""
+
+#: standalone/drakbackup:2158
 #, c-format
 msgid "Note that currently all 'net' media also use the hard drive."
 msgstr ""
 
-#: standalone/drakbackup:2201
+#: standalone/drakbackup:2205
 #, fuzzy, c-format
 msgid "Please choose the compression type"
 msgstr "คุณมีเม้าส์ชนิดใด"
 
-#: standalone/drakbackup:2205
+#: standalone/drakbackup:2209
 #, fuzzy, c-format
 msgid "Use .backupignore files"
 msgstr "ไฟล์แบ็คอัพมีปัญหา"
 
-#: standalone/drakbackup:2207
+#: standalone/drakbackup:2211
 #, c-format
 msgid "Send mail report after each backup to:"
 msgstr ""
 
-#: standalone/drakbackup:2213
+#: standalone/drakbackup:2217
 #, fuzzy, c-format
 msgid "SMTP server for mail:"
 msgstr "ชื่อโฮสต์ของ SMB server"
 
-#: standalone/drakbackup:2218
+#: standalone/drakbackup:2222
 #, c-format
 msgid "Delete Hard Drive tar files after backup to other media."
 msgstr ""
 
-#: standalone/drakbackup:2258
+#: standalone/drakbackup:2262
 #, c-format
 msgid "What"
 msgstr ""
 
-#: standalone/drakbackup:2263
+#: standalone/drakbackup:2267
 #, fuzzy, c-format
 msgid "Where"
 msgstr "Wheel"
 
-#: standalone/drakbackup:2268
+#: standalone/drakbackup:2272
 #, fuzzy, c-format
 msgid "When"
 msgstr "Wheel"
 
-#: standalone/drakbackup:2273
+#: standalone/drakbackup:2277
 #, fuzzy, c-format
 msgid "More Options"
 msgstr "อ๊อปชั่นของโมดูล:"
 
-#: standalone/drakbackup:2286
+#: standalone/drakbackup:2290
 #, fuzzy, c-format
 msgid "Backup destination not configured..."
 msgstr "ไม่มีการคอนฟิกจอภาพ"
 
-#: standalone/drakbackup:2306 standalone/drakbackup:4229
+#: standalone/drakbackup:2310 standalone/drakbackup:4234
 #, fuzzy, c-format
 msgid "Drakbackup Configuration"
 msgstr "การคอนฟิกระบบเน็ตเวิร์ก"
 
-#: standalone/drakbackup:2322
+#: standalone/drakbackup:2326
 #, fuzzy, c-format
 msgid "Please choose where you want to backup"
 msgstr "เลือกแพ็คเก็จที่คุณต้องการติดตั้ง "
 
-#: standalone/drakbackup:2325
+#: standalone/drakbackup:2329
 #, c-format
 msgid "Hard Drive used to prepare backups for all media"
 msgstr ""
 
-#: standalone/drakbackup:2325
+#: standalone/drakbackup:2329
 #, c-format
 msgid "Across Network"
 msgstr ""
 
-#: standalone/drakbackup:2325
+#: standalone/drakbackup:2329
 #, c-format
 msgid "On CD-R"
 msgstr ""
 
-#: standalone/drakbackup:2325
+#: standalone/drakbackup:2329
 #, c-format
 msgid "On Tape Device"
 msgstr ""
 
-#: standalone/drakbackup:2371
+#: standalone/drakbackup:2375
 #, c-format
 msgid "Backup Users"
 msgstr ""
 
-#: standalone/drakbackup:2372
+#: standalone/drakbackup:2376
 #, fuzzy, c-format
 msgid " (Default is all users)"
 msgstr "เครื่องพิมพ์โลคอล (ต่อติดกับตัวเครื่อง)"
 
-#: standalone/drakbackup:2384
+#: standalone/drakbackup:2389
 #, fuzzy, c-format
 msgid "Please choose what you want to backup"
 msgstr "เลือกแพ็คเก็จที่คุณต้องการติดตั้ง "
 
-#: standalone/drakbackup:2385
+#: standalone/drakbackup:2390
 #, fuzzy, c-format
 msgid "Backup System"
 msgstr "เซ็ตอัพระบบไฟล์"
 
-#: standalone/drakbackup:2387
+#: standalone/drakbackup:2392
 #, c-format
 msgid "Select user manually"
 msgstr ""
 
-#: standalone/drakbackup:2416
+#: standalone/drakbackup:2421
 #, fuzzy, c-format
 msgid "Please select data to backup..."
 msgstr "กรุณาเลือกภาษาที่ต้องการใช้"
 
-#: standalone/drakbackup:2488
+#: standalone/drakbackup:2493
 #, c-format
 msgid ""
 "\n"
 "Backup Sources: \n"
 msgstr ""
 
-#: standalone/drakbackup:2489
+#: standalone/drakbackup:2494
 #, c-format
 msgid ""
 "\n"
 "- System Files:\n"
 msgstr ""
 
-#: standalone/drakbackup:2491
+#: standalone/drakbackup:2496
 #, c-format
 msgid ""
 "\n"
 "- User Files:\n"
 msgstr ""
 
-#: standalone/drakbackup:2493
+#: standalone/drakbackup:2498
 #, c-format
 msgid ""
 "\n"
 "- Other Files:\n"
 msgstr ""
 
-#: standalone/drakbackup:2495
+#: standalone/drakbackup:2500
 #, c-format
 msgid ""
 "\n"
 "- Save on Hard drive on path: %s\n"
 msgstr ""
 
-#: standalone/drakbackup:2496
+#: standalone/drakbackup:2501
 #, c-format
 msgid "\tLimit disk usage to %s MB\n"
 msgstr ""
 
-#: standalone/drakbackup:2499
+#: standalone/drakbackup:2504
 #, c-format
 msgid ""
 "\n"
 "- Delete hard drive tar files after backup.\n"
 msgstr ""
 
-#: standalone/drakbackup:2504
+#: standalone/drakbackup:2509
 #, c-format
 msgid ""
 "\n"
 "- Burn to CD"
 msgstr ""
 
-#: standalone/drakbackup:2505
+#: standalone/drakbackup:2510
 #, c-format
 msgid "RW"
-msgstr ""
+msgstr "RW"
 
-#: standalone/drakbackup:2506
+#: standalone/drakbackup:2511
 #, fuzzy, c-format
 msgid " on device: %s"
 msgstr "ดีไวซ์ของเม้าส์: %s\n"
 
-#: standalone/drakbackup:2507
+#: standalone/drakbackup:2512
 #, c-format
 msgid " (multi-session)"
 msgstr ""
 
-#: standalone/drakbackup:2508
+#: standalone/drakbackup:2513
 #, c-format
 msgid ""
 "\n"
 "- Save to Tape on device: %s"
 msgstr ""
 
-#: standalone/drakbackup:2509
+#: standalone/drakbackup:2514
 #, c-format
 msgid "\t\tErase=%s"
 msgstr ""
 
-#: standalone/drakbackup:2511
+#: standalone/drakbackup:2516
 #, c-format
 msgid "\tBackup directly to Tape\n"
 msgstr ""
 
-#: standalone/drakbackup:2513
+#: standalone/drakbackup:2518
 #, c-format
 msgid ""
 "\n"
 "- Save via %s on host: %s\n"
 msgstr ""
 
-#: standalone/drakbackup:2514
+#: standalone/drakbackup:2519
 #, c-format
 msgid ""
 "\t\t user name: %s\n"
 "\t\t on path: %s \n"
 msgstr ""
 
-#: standalone/drakbackup:2515
+#: standalone/drakbackup:2520
 #, c-format
 msgid ""
 "\n"
 "- Options:\n"
 msgstr ""
 
-#: standalone/drakbackup:2516
+#: standalone/drakbackup:2521
 #, c-format
 msgid "\tDo not include System Files\n"
 msgstr ""
 
-#: standalone/drakbackup:2518
+#: standalone/drakbackup:2523
 #, c-format
 msgid "\tBackups use tar and bzip2\n"
 msgstr ""
 
-#: standalone/drakbackup:2519
+#: standalone/drakbackup:2524
 #, c-format
 msgid "\tBackups use tar and gzip\n"
 msgstr ""
 
-#: standalone/drakbackup:2520
+#: standalone/drakbackup:2525
 #, fuzzy, c-format
 msgid "\tBackups use tar only\n"
 msgstr "ไฟล์แบ็คอัพมีปัญหา"
 
-#: standalone/drakbackup:2522
+#: standalone/drakbackup:2527
 #, fuzzy, c-format
 msgid "\tUse .backupignore files\n"
 msgstr "ไฟล์แบ็คอัพมีปัญหา"
 
-#: standalone/drakbackup:2523
+#: standalone/drakbackup:2528
 #, c-format
 msgid "\tSend mail to %s\n"
 msgstr ""
 
-#: standalone/drakbackup:2524
+#: standalone/drakbackup:2529
 #, fuzzy, c-format
 msgid "\tUsing SMTP server %s\n"
 msgstr "ค่า IP ของ CUPS เซิร์ฟเวอร์"
 
-#: standalone/drakbackup:2526
+#: standalone/drakbackup:2531
 #, c-format
 msgid ""
 "\n"
 "- Daemon, %s via:\n"
 msgstr ""
 
-#: standalone/drakbackup:2527
+#: standalone/drakbackup:2532
 #, c-format
 msgid "\t-Hard drive.\n"
 msgstr ""
 
-#: standalone/drakbackup:2528
+#: standalone/drakbackup:2533
 #, c-format
 msgid "\t-CD-R.\n"
 msgstr ""
 
-#: standalone/drakbackup:2529
+#: standalone/drakbackup:2534
 #, c-format
 msgid "\t-Tape \n"
 msgstr ""
 
-#: standalone/drakbackup:2530
+#: standalone/drakbackup:2535
 #, c-format
 msgid "\t-Network by FTP.\n"
 msgstr ""
 
-#: standalone/drakbackup:2531
+#: standalone/drakbackup:2536
 #, c-format
 msgid "\t-Network by SSH.\n"
 msgstr ""
 
-#: standalone/drakbackup:2532
+#: standalone/drakbackup:2537
 #, c-format
 msgid "\t-Network by rsync.\n"
 msgstr ""
 
-#: standalone/drakbackup:2533
+#: standalone/drakbackup:2538
 #, c-format
 msgid "\t-Network by webdav.\n"
 msgstr ""
 
-#: standalone/drakbackup:2535
+#: standalone/drakbackup:2540
 #, c-format
 msgid "No configuration, please click Wizard or Advanced.\n"
 msgstr ""
 
-#: standalone/drakbackup:2540
+#: standalone/drakbackup:2545
 #, c-format
 msgid ""
 "List of data to restore:\n"
 "\n"
 msgstr ""
 
-#: standalone/drakbackup:2542
+#: standalone/drakbackup:2547
 #, fuzzy, c-format
 msgid "- Restore System Files.\n"
 msgstr "ลบคิว"
 
-#: standalone/drakbackup:2544 standalone/drakbackup:2554
+#: standalone/drakbackup:2549 standalone/drakbackup:2559
 #, c-format
 msgid "   - from date: %s %s\n"
 msgstr ""
 
-#: standalone/drakbackup:2547
+#: standalone/drakbackup:2552
 #, fuzzy, c-format
 msgid "- Restore User Files: \n"
 msgstr "เรียกคืนจากไฟล์"
 
-#: standalone/drakbackup:2552
+#: standalone/drakbackup:2557
 #, fuzzy, c-format
 msgid "- Restore Other Files: \n"
 msgstr "เรียกคืนจากไฟล์"
 
-#: standalone/drakbackup:2731
+#: standalone/drakbackup:2736
 #, c-format
 msgid ""
 "List of data corrupted:\n"
 "\n"
 msgstr ""
 
-#: standalone/drakbackup:2733
+#: standalone/drakbackup:2738
 #, fuzzy, c-format
 msgid "Please uncheck or remove it on next time."
 msgstr "คุณต้องการให้โมเด็มของคุณต่อกับพอร์ตอนุกรมใด?"
 
-#: standalone/drakbackup:2743
+#: standalone/drakbackup:2748
 #, c-format
 msgid "Backup files are corrupted"
 msgstr ""
 
-#: standalone/drakbackup:2764
+#: standalone/drakbackup:2769
 #, c-format
 msgid "          All of your selected data have been          "
 msgstr ""
 
-#: standalone/drakbackup:2765
+#: standalone/drakbackup:2770
 #, c-format
 msgid "          Successfully Restored on %s       "
 msgstr ""
 
-#: standalone/drakbackup:2885
+#: standalone/drakbackup:2890
 #, fuzzy, c-format
 msgid "         Restore Configuration       "
 msgstr "การคอนฟิกระบบเน็ตเวิร์ก"
 
-#: standalone/drakbackup:2913
+#: standalone/drakbackup:2918
 #, c-format
 msgid "OK to restore the other files."
 msgstr ""
 
-#: standalone/drakbackup:2929
+#: standalone/drakbackup:2934
 #, c-format
 msgid "User list to restore (only the most recent date per user is important)"
 msgstr ""
 
-#: standalone/drakbackup:2994
+#: standalone/drakbackup:2999
 #, fuzzy, c-format
 msgid "Please choose the date to restore:"
 msgstr "คุณมีเม้าส์ชนิดใด"
 
-#: standalone/drakbackup:3031
+#: standalone/drakbackup:3036
 #, fuzzy, c-format
 msgid "Restore from Hard Disk."
 msgstr "เรียกคืนจากแผ่นฟล้อปปี้"
 
-#: standalone/drakbackup:3033
+#: standalone/drakbackup:3038
 #, fuzzy, c-format
 msgid "Enter the directory where backups are stored"
 msgstr "กรุณาทดสอบเม้าส์"
 
-#: standalone/drakbackup:3037
+#: standalone/drakbackup:3042
 #, c-format
 msgid "Directory with backups"
 msgstr ""
 
-#: standalone/drakbackup:3091
+#: standalone/drakbackup:3096
 #, fuzzy, c-format
 msgid "Select another media to restore from"
 msgstr "คุณมีเม้าส์ชนิดใด"
 
-#: standalone/drakbackup:3093
+#: standalone/drakbackup:3098
 #, fuzzy, c-format
 msgid "Other Media"
 msgstr "อื่นๆ"
 
-#: standalone/drakbackup:3098
+#: standalone/drakbackup:3103
 #, fuzzy, c-format
 msgid "Restore system"
 msgstr "ติดตั้งระบบ"
 
-#: standalone/drakbackup:3099
+#: standalone/drakbackup:3104
 #, fuzzy, c-format
 msgid "Restore Users"
 msgstr "เรียกคืนจากไฟล์"
 
-#: standalone/drakbackup:3100
+#: standalone/drakbackup:3105
 #, fuzzy, c-format
 msgid "Restore Other"
 msgstr "เรียกคืนจากไฟล์"
 
-#: standalone/drakbackup:3102
+#: standalone/drakbackup:3107
 #, fuzzy, c-format
 msgid "Select path to restore (instead of /)"
 msgstr "คุณมีเม้าส์ชนิดใด"
 
-#: standalone/drakbackup:3106 standalone/drakbackup:3388
+#: standalone/drakbackup:3111 standalone/drakbackup:3393
 #, fuzzy, c-format
 msgid "Path To Restore To"
 msgstr "แบบปรับแก้ได้ (Customized) "
 
-#: standalone/drakbackup:3109
+#: standalone/drakbackup:3114
 #, c-format
 msgid "Do new backup before restore (only for incremental backups.)"
 msgstr ""
 
-#: standalone/drakbackup:3111
+#: standalone/drakbackup:3116
 #, c-format
 msgid "Remove user directories before restore."
 msgstr ""
 
-#: standalone/drakbackup:3196
+#: standalone/drakbackup:3201
 #, c-format
 msgid "Filename text substring to search for (empty string matches all):"
 msgstr ""
 
-#: standalone/drakbackup:3199
+#: standalone/drakbackup:3204
 #, c-format
 msgid "Search Backups"
 msgstr ""
 
-#: standalone/drakbackup:3217
+#: standalone/drakbackup:3222
 #, fuzzy, c-format
 msgid "No matches found..."
 msgstr "เครื่องพิมพ์โลคอล (ต่อติดกับตัวเครื่อง)"
 
-#: standalone/drakbackup:3221
+#: standalone/drakbackup:3226
 #, fuzzy, c-format
 msgid "Restore Selected"
 msgstr "ลบคิว"
 
-#: standalone/drakbackup:3356
+#: standalone/drakbackup:3361
 #, c-format
 msgid ""
 "Click date/time to see backup files.\n"
 "Ctrl-Click files to select multiple files."
 msgstr ""
 
-#: standalone/drakbackup:3362
+#: standalone/drakbackup:3367
 #, c-format
 msgid ""
 "Restore Selected\n"
 "Catalog Entry"
 msgstr ""
 
-#: standalone/drakbackup:3371
+#: standalone/drakbackup:3376
 #, fuzzy, c-format
 msgid ""
 "Restore Selected\n"
 "Files"
 msgstr "ลบคิว"
 
-#: standalone/drakbackup:3448
+#: standalone/drakbackup:3453
 #, c-format
 msgid "Backup files not found at %s."
 msgstr ""
 
-#: standalone/drakbackup:3461
+#: standalone/drakbackup:3466
 #, fuzzy, c-format
 msgid "Restore From CD"
 msgstr "เรียกคืนจากแผ่นฟล้อปปี้"
 
-#: standalone/drakbackup:3461
+#: standalone/drakbackup:3466
 #, c-format
 msgid ""
 "Insert the CD with volume label %s\n"
 " in the CD drive under mount point /mnt/cdrom"
 msgstr ""
 
-#: standalone/drakbackup:3463
+#: standalone/drakbackup:3468
 #, c-format
 msgid "Not the correct CD label. Disk is labelled %s."
 msgstr ""
 
-#: standalone/drakbackup:3473
+#: standalone/drakbackup:3478
 #, fuzzy, c-format
 msgid "Restore From Tape"
 msgstr "กู้ตารางพาร์ติชั่น"
 
-#: standalone/drakbackup:3473
+#: standalone/drakbackup:3478
 #, c-format
 msgid ""
 "Insert the tape with volume label %s\n"
 " in the tape drive device %s"
 msgstr ""
 
-#: standalone/drakbackup:3475
+#: standalone/drakbackup:3480
 #, c-format
 msgid "Not the correct tape label. Tape is labelled %s."
 msgstr ""
 
-#: standalone/drakbackup:3486
+#: standalone/drakbackup:3491
 #, fuzzy, c-format
 msgid "Restore Via Network"
 msgstr "เรียกคืนจากไฟล์"
 
-#: standalone/drakbackup:3486
+#: standalone/drakbackup:3491
 #, c-format
 msgid "Restore Via Network Protocol: %s"
 msgstr ""
 
-#: standalone/drakbackup:3487
-#, fuzzy, c-format
+#: standalone/drakbackup:3492
+#, c-format
 msgid "Host Name"
-msgstr "ชื่อโฮสต์:"
+msgstr "ชื่อโฮสต์"
 
-#: standalone/drakbackup:3488
+#: standalone/drakbackup:3493
 #, c-format
 msgid "Host Path or Module"
 msgstr ""
 
-#: standalone/drakbackup:3495
+#: standalone/drakbackup:3500
 #, fuzzy, c-format
 msgid "Password required"
 msgstr "รหัสผ่าน"
 
-#: standalone/drakbackup:3501
+#: standalone/drakbackup:3506
 #, fuzzy, c-format
 msgid "Username required"
 msgstr "ชื่อผู้ใช้"
 
-#: standalone/drakbackup:3504
+#: standalone/drakbackup:3509
 #, fuzzy, c-format
 msgid "Hostname required"
 msgstr "ชื่อโฮสต์:"
 
-#: standalone/drakbackup:3509
+#: standalone/drakbackup:3514
 #, c-format
 msgid "Path or Module required"
 msgstr ""
 
-#: standalone/drakbackup:3522
+#: standalone/drakbackup:3527
 #, c-format
 msgid "Files Restored..."
 msgstr ""
 
-#: standalone/drakbackup:3525
+#: standalone/drakbackup:3530
 #, fuzzy, c-format
 msgid "Restore Failed..."
 msgstr "เรียกคืนจากไฟล์"
 
-#: standalone/drakbackup:3543
+#: standalone/drakbackup:3548
 #, fuzzy, c-format
 msgid "%s not retrieved..."
 msgstr "ไม่พบการ์ดเน็ตเวิร์ก"
 
-#: standalone/drakbackup:3765 standalone/drakbackup:3834
+#: standalone/drakbackup:3770 standalone/drakbackup:3839
 #, fuzzy, c-format
 msgid "Search for files to restore"
 msgstr "คุณมีเม้าส์ชนิดใด"
 
-#: standalone/drakbackup:3769
+#: standalone/drakbackup:3774
 #, c-format
 msgid "Restore all backups"
 msgstr ""
 
-#: standalone/drakbackup:3777
+#: standalone/drakbackup:3782
 #, fuzzy, c-format
 msgid "Custom Restore"
 msgstr "แบบปรับแก้ได้ (Customized) "
 
-#: standalone/drakbackup:3781 standalone/drakbackup:3830
+#: standalone/drakbackup:3786 standalone/drakbackup:3835
 #, fuzzy, c-format
 msgid "Restore From Catalog"
 msgstr "กู้ตารางพาร์ติชั่น"
 
-#: standalone/drakbackup:3802
+#: standalone/drakbackup:3807
 #, fuzzy, c-format
 msgid "Unable to find backups to restore...\n"
 msgstr "กรุณาเลือกภาษาที่ต้องการใช้"
 
-#: standalone/drakbackup:3803
+#: standalone/drakbackup:3808
 #, fuzzy, c-format
 msgid "Verify that %s is the correct path"
 msgstr "ถูกต้องหรือไม่?"
 
-#: standalone/drakbackup:3804
+#: standalone/drakbackup:3809
 #, c-format
 msgid " and the CD is in the drive"
 msgstr ""
 
-#: standalone/drakbackup:3806
+#: standalone/drakbackup:3811
 #, c-format
 msgid "Backups on unmountable media - Use Catalog to restore"
 msgstr ""
 
-#: standalone/drakbackup:3822
+#: standalone/drakbackup:3827
 #, c-format
 msgid "CD in place - continue."
 msgstr ""
 
-#: standalone/drakbackup:3827
+#: standalone/drakbackup:3832
 #, c-format
 msgid "Browse to new restore repository."
 msgstr ""
 
-#: standalone/drakbackup:3828
+#: standalone/drakbackup:3833
 #, fuzzy, c-format
 msgid "Directory To Restore From"
 msgstr "เรียกคืนจากแผ่นฟล้อปปี้"
 
-#: standalone/drakbackup:3864
+#: standalone/drakbackup:3869
 #, fuzzy, c-format
 msgid "Restore Progress"
 msgstr "เรียกคืนจากไฟล์"
 
-#: standalone/drakbackup:3919 standalone/drakbackup:3992
-#: standalone/logdrake:173
-#, fuzzy, c-format
-msgid "Save"
-msgstr "สถานะ:"
-
-#: standalone/drakbackup:3975
+#: standalone/drakbackup:3980
 #, fuzzy, c-format
 msgid "Build Backup"
 msgstr "ไฟล์แบ็คอัพมีปัญหา"
 
-#: standalone/drakbackup:4008 standalone/drakbackup:4328
-#, fuzzy, c-format
+#: standalone/drakbackup:4013 standalone/drakbackup:4333
+#, c-format
 msgid "Restore"
-msgstr "เรียกคืนจากไฟล์"
+msgstr "ย้อนกลับ"
 
-#: standalone/drakbackup:4096
+#: standalone/drakbackup:4101
 #, fuzzy, c-format
 msgid "The following packages need to be installed:\n"
 msgstr "แพ็คเก็จเหล่านี้กำลังจะถูกติดตั้ง"
 
-#: standalone/drakbackup:4123
+#: standalone/drakbackup:4128
 #, fuzzy, c-format
 msgid "Please select data to restore..."
 msgstr "กรุณาเลือกภาษาที่ต้องการใช้"
 
-#: standalone/drakbackup:4163
+#: standalone/drakbackup:4168
 #, fuzzy, c-format
 msgid "Backup system files"
 msgstr "ไฟล์แบ็คอัพมีปัญหา"
 
-#: standalone/drakbackup:4166
+#: standalone/drakbackup:4171
 #, fuzzy, c-format
 msgid "Backup user files"
 msgstr "ไฟล์แบ็คอัพมีปัญหา"
 
-#: standalone/drakbackup:4169
+#: standalone/drakbackup:4174
 #, fuzzy, c-format
 msgid "Backup other files"
 msgstr "ไฟล์แบ็คอัพมีปัญหา"
 
-#: standalone/drakbackup:4172 standalone/drakbackup:4206
+#: standalone/drakbackup:4177 standalone/drakbackup:4211
 #, c-format
 msgid "Total Progress"
 msgstr ""
 
-#: standalone/drakbackup:4198
+#: standalone/drakbackup:4203
 #, fuzzy, c-format
 msgid "Sending files by FTP"
 msgstr "บันทึกลงไฟล์"
 
-#: standalone/drakbackup:4201
+#: standalone/drakbackup:4206
 #, fuzzy, c-format
 msgid "Sending files..."
 msgstr "บันทึกลงไฟล์"
 
-#: standalone/drakbackup:4271
+#: standalone/drakbackup:4276
 #, fuzzy, c-format
 msgid "Backup Now from configuration file"
 msgstr "การคอนฟิกระบบเน็ตเวิร์ก"
 
-#: standalone/drakbackup:4276
+#: standalone/drakbackup:4281
 #, fuzzy, c-format
 msgid "View Backup Configuration."
 msgstr "การคอนฟิกระบบเน็ตเวิร์ก"
 
-#: standalone/drakbackup:4302
+#: standalone/drakbackup:4307
 #, fuzzy, c-format
 msgid "Wizard Configuration"
 msgstr "การปรับแต่ง LAN"
 
-#: standalone/drakbackup:4307
-#, fuzzy, c-format
+#: standalone/drakbackup:4312
+#, c-format
 msgid "Advanced Configuration"
-msgstr "การปรับแต่ง LAN"
+msgstr "ค่าตั้งเพิ่มเติม"
 
-#: standalone/drakbackup:4312
+#: standalone/drakbackup:4317
 #, fuzzy, c-format
 msgid "View Configuration"
 msgstr "การปรับแต่ง LAN"
 
-#: standalone/drakbackup:4316
+#: standalone/drakbackup:4321
 #, c-format
 msgid "View Last Log"
 msgstr ""
 
-#: standalone/drakbackup:4321
+#: standalone/drakbackup:4326
 #, fuzzy, c-format
 msgid "Backup Now"
 msgstr "เซ็ตอัพระบบไฟล์"
 
-#: standalone/drakbackup:4325
+#: standalone/drakbackup:4330
 #, c-format
 msgid ""
 "No configuration file found \n"
 "please click Wizard or Advanced."
 msgstr ""
 
-#: standalone/drakbackup:4345 standalone/drakbackup:4348
+#: standalone/drakbackup:4350 standalone/drakbackup:4353
 #, c-format
 msgid "Drakbackup"
 msgstr ""
@@ -17151,10 +17648,10 @@ msgstr "เลือกการเชื่อมต่อกับเครื
 msgid "System mode"
 msgstr "System mode"
 
-#: standalone/drakboot:74 standalone/drakfloppy:47 standalone/harddrake2:171
-#: standalone/harddrake2:172 standalone/logdrake:70
-#: standalone/printerdrake:156 standalone/printerdrake:157
-#: standalone/printerdrake:158
+#: standalone/drakboot:74 standalone/drakfloppy:47 standalone/harddrake2:187
+#: standalone/harddrake2:188 standalone/logdrake:70
+#: standalone/printerdrake:138 standalone/printerdrake:139
+#: standalone/printerdrake:140
 #, c-format
 msgid "/_File"
 msgstr "/_ไฟล์"
@@ -17164,8 +17661,8 @@ msgstr "/_ไฟล์"
 msgid "/File/_Quit"
 msgstr "/ไฟล์/_เลิก"
 
-#: standalone/drakboot:75 standalone/drakfloppy:48 standalone/harddrake2:172
-#: standalone/logdrake:76 standalone/printerdrake:158
+#: standalone/drakboot:75 standalone/drakfloppy:48 standalone/harddrake2:188
+#: standalone/logdrake:76 standalone/printerdrake:140
 #, c-format
 msgid "<control>Q"
 msgstr "<control>Q"
@@ -17198,9 +17695,9 @@ msgid "Do you want to configure it now?"
 msgstr "คุณต้องการทดสอบการคอนฟิกหรือไม่"
 
 #: standalone/drakboot:177
-#, fuzzy, c-format
+#, c-format
 msgid "Theme"
-msgstr "ชื่อที่ใช้ในกรุ๊ป (sharename)"
+msgstr "ชุดตกแต่ง"
 
 #: standalone/drakboot:180
 #, c-format
@@ -17216,7 +17713,7 @@ msgstr "รัน X-Window เมื่อเริ่มทำงาน"
 
 #: standalone/drakboot:197
 #, c-format
-msgid "No, I don't want autologin"
+msgid "No, I do not want autologin"
 msgstr "ไม่ต้องการ autologin"
 
 #: standalone/drakboot:198
@@ -17257,8 +17754,8 @@ msgstr "Mandrakelinux ฐานควบคุม"
 msgid "Synchronization tool"
 msgstr ""
 
-#: standalone/drakbug:49 standalone/drakbug:63 standalone/drakbug:176
-#: standalone/drakbug:178 standalone/drakbug:182
+#: standalone/drakbug:49 standalone/drakbug:63 standalone/drakbug:148
+#: standalone/drakbug:150 standalone/drakbug:154
 #, c-format
 msgid "Standalone Tools"
 msgstr ""
@@ -17269,14 +17766,14 @@ msgid "HardDrake"
 msgstr "HardDrake"
 
 #: standalone/drakbug:51
-#, fuzzy, c-format
+#, c-format
 msgid "Mandrakeonline"
-msgstr "Control Center"
+msgstr "Mandrakeonline"
 
 #: standalone/drakbug:52
-#, fuzzy, c-format
+#, c-format
 msgid "Menudrake"
-msgstr "แบบผู้เชี่ยวชาญ (Expert)"
+msgstr "เครื่องมือแก้ไขเมนู"
 
 #: standalone/drakbug:53
 #, fuzzy, c-format
@@ -17289,9 +17786,9 @@ msgid "Remote Control"
 msgstr "เครื่องพิมพ์แบบรีโมท"
 
 #: standalone/drakbug:55
-#, fuzzy, c-format
+#, c-format
 msgid "Software Manager"
-msgstr "ชื่อที่ใช้ในกรุ๊ป (sharename)"
+msgstr "Software Manager"
 
 #: standalone/drakbug:56
 #, c-format
@@ -17304,190 +17801,135 @@ msgid "Windows Migration tool"
 msgstr ""
 
 #: standalone/drakbug:58
-#, fuzzy, c-format
+#, c-format
 msgid "Userdrake"
-msgstr "เครื่องพิมพ์"
+msgstr "Userdrake"
 
 #: standalone/drakbug:59
 #, fuzzy, c-format
 msgid "Configuration Wizards"
 msgstr "Network Configuration Wizard"
 
-#: standalone/drakbug:83
-#, fuzzy, c-format
-msgid "Application:"
-msgstr "การตรวจสอบสิทธิ์การใช้งาน"
-
-#: standalone/drakbug:84 standalone/drakbug:96
-#, fuzzy, c-format
-msgid "Package: "
-msgstr "เลือกกลุ่มแพ็คเก็จ"
-
-#: standalone/drakbug:85
+#: standalone/drakbug:81
 #, c-format
-msgid "Kernel:"
+msgid "Select Mandrakesoft Tool:"
 msgstr ""
 
-#: standalone/drakbug:86 standalone/drakbug:97
-#, fuzzy, c-format
-msgid "Release: "
-msgstr "โปรดรอสักครู่"
-
-#: standalone/drakbug:91
+#: standalone/drakbug:82
 #, c-format
 msgid ""
-"Application Name\n"
-"or Full Path:"
-msgstr ""
-
-#: standalone/drakbug:94
-#, fuzzy, c-format
-msgid "Find Package"
-msgstr "แพ็คเก็จ %d ชุด"
-
-#: standalone/drakbug:98
-#, fuzzy, c-format
-msgid "Summary: "
-msgstr "รวมความ"
-
-#: standalone/drakbug:104
-#, c-format
-msgid "Bug Description/System Information"
+"or Application Name\n"
+"(or Full Path):"
 msgstr ""
 
-#: standalone/drakbug:105
+#: standalone/drakbug:85
 #, c-format
-msgid "YOUR TEXT HERE"
-msgstr ""
+msgid "Find Package"
+msgstr "ค้นหาแพ็กเกจ"
 
-#: standalone/drakbug:108
+#: standalone/drakbug:87
 #, fuzzy, c-format
-msgid "Submit kernel version"
-msgstr "kernel version"
-
-#: standalone/drakbug:109
-#, c-format
-msgid "Submit cpuinfo"
-msgstr ""
+msgid "Package: "
+msgstr "เลือกกลุ่มแพ็คเก็จ"
 
-#: standalone/drakbug:110
+#: standalone/drakbug:88
 #, c-format
-msgid "Submit lspci"
-msgstr ""
+msgid "Kernel:"
+msgstr "เคอร์เนล:"
 
-#: standalone/drakbug:124
+#: standalone/drakbug:100
 #, 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."
+"To submit a bug report, click on the report button.  \n"
+"This will open a web browser window on %s where you'll find a form to fill "
+"in.  The information displayed above will be transferred to that server.  \n"
+"Things useful to include in your report are the output of lspci, kernel "
+"version, and /proc/cpuinfo."
 msgstr ""
 
-#: standalone/drakbug:130
+#: standalone/drakbug:106
 #, fuzzy, c-format
 msgid "Report"
 msgstr "Port"
 
-#: standalone/drakbug:191
+#: standalone/drakbug:163
 #, fuzzy, c-format
 msgid "Not installed"
 msgstr "ออกจากการติดตั้ง"
 
-#: standalone/drakbug:203
+#: standalone/drakbug:175
 #, fuzzy, c-format
 msgid "Package not installed"
 msgstr "ออกจากการติดตั้ง"
 
-#: standalone/drakbug:220
-#, c-format
-msgid "NOT FOUND"
-msgstr ""
-
-#: standalone/drakbug:227
-#, fuzzy, c-format
-msgid "connecting to %s..."
-msgstr "อ่าน CUPS drivers database..."
-
-#: standalone/drakbug:235
+#: standalone/drakbug:191
 #, fuzzy, c-format
 msgid "No browser available! Please install one"
 msgstr "คุณสามารถเลือกภาษาอื่นซึ่งจะสามารถใช้ได้หลังติดตั้ง"
 
-#: standalone/drakbug:254
-#, fuzzy, c-format
-msgid "Please enter a package name."
-msgstr "โปรดป้อนชื่อผู้ใช้"
-
-#: standalone/drakbug:260
-#, c-format
-msgid "Please enter summary text."
-msgstr ""
-
-#: standalone/drakclock:30
+#: standalone/drakclock:29
 #, c-format
 msgid "DrakClock"
 msgstr "DrakClock"
 
-#: standalone/drakclock:40
+#: standalone/drakclock:39
 #, fuzzy, c-format
 msgid "not defined"
 msgstr "คอนฟิกใหม่"
 
-#: standalone/drakclock:42
+#: standalone/drakclock:41
 #, fuzzy, c-format
 msgid "Change Time Zone"
 msgstr "โซนเวลา"
 
-#: standalone/drakclock:46
+#: standalone/drakclock:45
 #, c-format
 msgid "Timezone - DrakClock"
 msgstr "ช่วงเวลา-DrakClock"
 
-#: standalone/drakclock:48
+#: standalone/drakclock:47
 #, c-format
 msgid "GMT - DrakClock"
 msgstr "GMT-DrakClock"
 
-#: standalone/drakclock:48
-#, fuzzy, c-format
+#: standalone/drakclock:47
+#, c-format
 msgid "Is your hardware clock set to GMT?"
 msgstr "คุณต้องการให้เซ็ตนาฬิกาฮาร์ดแวร์เป็น GMT?"
 
-#: standalone/drakclock:76
+#: standalone/drakclock:75
 #, fuzzy, c-format
 msgid "Network Time Protocol"
 msgstr "Network interface"
 
-#: standalone/drakclock:78
+#: standalone/drakclock:77
 #, c-format
 msgid ""
 "Your computer can synchronize its clock\n"
 " with a remote time server using NTP"
 msgstr ""
 
-#: standalone/drakclock:79
+#: standalone/drakclock:78
 #, c-format
 msgid "Enable Network Time Protocol"
 msgstr ""
 
-#: standalone/drakclock:87
-#, fuzzy, c-format
+#: standalone/drakclock:86
+#, c-format
 msgid "Server:"
-msgstr "เซิร์ฟเวอร์"
+msgstr "เซิร์ฟเวอร์:"
 
-#: standalone/drakclock:125
+#: standalone/drakclock:124
 #, c-format
 msgid "Could not synchronize with %s."
 msgstr ""
 
-#: standalone/drakclock:147 standalone/drakclock:157
-#, fuzzy, c-format
+#: standalone/drakclock:146 standalone/drakclock:156
+#, c-format
 msgid "Reset"
-msgstr "ไม่ยอมรับ"
+msgstr "ตั้งค่าใหม่"
 
-#: standalone/drakclock:225
+#: standalone/drakclock:224
 #, fuzzy, c-format
 msgid ""
 "We need to install ntp package\n"
@@ -17503,12 +17945,12 @@ msgstr ""
 msgid "Network configuration (%d adapters)"
 msgstr "การคอนฟิกระบบเน็ตเวิร์ก (%d adapters)"
 
-#: standalone/drakconnect:96 standalone/drakconnect:787
+#: standalone/drakconnect:96 standalone/drakconnect:786
 #, c-format
 msgid "Gateway:"
 msgstr "เกตเวย์:"
 
-#: standalone/drakconnect:96 standalone/drakconnect:787
+#: standalone/drakconnect:96 standalone/drakconnect:786
 #, c-format
 msgid "Interface:"
 msgstr "Interface:"
@@ -17523,11 +17965,11 @@ msgstr ""
 msgid "Interface"
 msgstr "Interface"
 
-#: standalone/drakconnect:116 standalone/printerdrake:218
-#: standalone/printerdrake:225
-#, fuzzy, c-format
+#: standalone/drakconnect:116 standalone/printerdrake:211
+#: standalone/printerdrake:218
+#, c-format
 msgid "State"
-msgstr "สถานะ:"
+msgstr "สถานะ"
 
 #: standalone/drakconnect:133
 #, c-format
@@ -17539,7 +17981,7 @@ msgstr "ชื่อโฮสต์:"
 msgid "Configure hostname..."
 msgstr "คอนฟิกเม้าส์"
 
-#: standalone/drakconnect:149 standalone/drakconnect:843
+#: standalone/drakconnect:149 standalone/drakconnect:842
 #, c-format
 msgid "LAN configuration"
 msgstr "การปรับแต่ง LAN"
@@ -17570,120 +18012,120 @@ msgstr "ลบคิว"
 msgid "IP configuration"
 msgstr "การปรับแต่ง LAN"
 
-#: standalone/drakconnect:342
+#: standalone/drakconnect:344
 #, fuzzy, c-format
 msgid "DNS servers"
 msgstr "เซิร์ฟเวอร์ DNS"
 
-#: standalone/drakconnect:350
+#: standalone/drakconnect:352
 #, fuzzy, c-format
 msgid "Search Domain"
 msgstr "โดเมน NIS"
 
-#: standalone/drakconnect:358
+#: standalone/drakconnect:360
 #, fuzzy, c-format
 msgid "static"
 msgstr "กำหนดค่า IP แบบอัตโนมัติ"
 
-#: standalone/drakconnect:358
+#: standalone/drakconnect:360
 #, c-format
 msgid "DHCP"
-msgstr ""
+msgstr "DHCP"
 
-#: standalone/drakconnect:436
+#: standalone/drakconnect:438
 #, fuzzy, c-format
 msgid "Metric"
 msgstr "จำเพาะ"
 
-#: standalone/drakconnect:491
-#, fuzzy, c-format
+#: standalone/drakconnect:493
+#, c-format
 msgid "Flow control"
-msgstr "<control>S"
+msgstr "Flow control"
 
-#: standalone/drakconnect:492
+#: standalone/drakconnect:494
 #, fuzzy, c-format
 msgid "Line termination"
 msgstr "การเชื่อมต่อกับ Internet แบบ sharing"
 
-#: standalone/drakconnect:503
+#: standalone/drakconnect:505
 #, fuzzy, c-format
 msgid "Modem timeout"
 msgstr "Kernel Boot Timeout"
 
-#: standalone/drakconnect:507
+#: standalone/drakconnect:509
 #, fuzzy, c-format
 msgid "Use lock file"
 msgstr "เลือกไฟล์"
 
-#: standalone/drakconnect:509
+#: standalone/drakconnect:511
 #, c-format
 msgid "Wait for dialup tone before dialing"
 msgstr ""
 
-#: standalone/drakconnect:512
+#: standalone/drakconnect:514
 #, fuzzy, c-format
 msgid "Busy wait"
 msgstr "ออก"
 
-#: standalone/drakconnect:517
+#: standalone/drakconnect:519
 #, fuzzy, c-format
 msgid "Modem sound"
 msgstr "Mouse"
 
-#: standalone/drakconnect:518
-#, fuzzy, c-format
+#: standalone/drakconnect:520
+#, c-format
 msgid "Enable"
-msgstr "enable"
+msgstr "เปิดใช้งาน"
 
-#: standalone/drakconnect:518
-#, fuzzy, c-format
+#: standalone/drakconnect:520
+#, c-format
 msgid "Disable"
-msgstr "disable"
+msgstr "ปิดการใช้งาน"
 
-#: standalone/drakconnect:569 standalone/harddrake2:45
+#: standalone/drakconnect:571 standalone/harddrake2:48
 #, c-format
 msgid "Media class"
 msgstr ""
 
-#: standalone/drakconnect:570 standalone/drakfloppy:136
+#: standalone/drakconnect:572 standalone/drakfloppy:136
 #, c-format
 msgid "Module name"
 msgstr "ชี่อ module"
 
-#: standalone/drakconnect:571
+#: standalone/drakconnect:573
 #, fuzzy, c-format
 msgid "Mac Address"
 msgstr "ค่า IP"
 
-#: standalone/drakconnect:572 standalone/harddrake2:23
-#: standalone/harddrake2:104
+#: standalone/drakconnect:574 standalone/harddrake2:26
+#: standalone/harddrake2:118
 #, c-format
 msgid "Bus"
 msgstr ""
 
-#: standalone/drakconnect:573 standalone/harddrake2:29
+#: standalone/drakconnect:575 standalone/harddrake2:32
 #, c-format
 msgid "Location on the bus"
 msgstr ""
 
-#: standalone/drakconnect:670 standalone/drakgw:250 standalone/drakpxe:138
+#: standalone/drakconnect:671 standalone/drakgw:247 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:678
+#: standalone/drakconnect:679
 #, fuzzy, c-format
 msgid "Remove a network interface"
 msgstr "เลือก network interface"
 
-#: standalone/drakconnect:682
+#: standalone/drakconnect:683
 #, fuzzy, c-format
 msgid "Select the network interface to remove:"
 msgstr "เลือก network interface"
 
-#: standalone/drakconnect:713
+#: standalone/drakconnect:715
 #, fuzzy, c-format
 msgid ""
 "An error occurred while deleting the \"%s\" network interface:\n"
@@ -17691,7 +18133,7 @@ msgid ""
 "%s"
 msgstr "คุณต้องการเริ่มทำงาน Network ใหม่หรือไม่"
 
-#: standalone/drakconnect:715
+#: standalone/drakconnect:716
 #, c-format
 msgid ""
 "Congratulations, the \"%s\" network interface has been successfully deleted"
@@ -17707,81 +18149,81 @@ msgstr ""
 msgid "No Mask"
 msgstr "แพ็คเก็จชำรุด"
 
-#: standalone/drakconnect:734 standalone/drakconnect:914
+#: standalone/drakconnect:734 standalone/drakconnect:913
 #, c-format
 msgid "up"
 msgstr ""
 
-#: standalone/drakconnect:734 standalone/drakconnect:914
+#: standalone/drakconnect:734 standalone/drakconnect:913
 #, fuzzy, c-format
 msgid "down"
 msgstr "ทำเรียบร้อยแล้ว"
 
-#: standalone/drakconnect:777 standalone/net_monitor:468
+#: standalone/drakconnect:776 standalone/net_monitor:470
 #, c-format
 msgid "Connected"
 msgstr "เชื่อมต่ออยู่"
 
-#: standalone/drakconnect:777 standalone/net_monitor:468
+#: standalone/drakconnect:776 standalone/net_monitor:470
 #, c-format
 msgid "Not connected"
 msgstr "ไม่เชื่อมต่อ"
 
-#: standalone/drakconnect:779
+#: standalone/drakconnect:778
 #, c-format
 msgid "Disconnect..."
 msgstr "ยกเลิกติดต่อ..."
 
-#: standalone/drakconnect:779
+#: standalone/drakconnect:778
 #, c-format
 msgid "Connect..."
 msgstr "ติดต่อ"
 
-#: standalone/drakconnect:808
+#: standalone/drakconnect:807
 #, c-format
 msgid ""
 "Warning, another Internet connection has been detected, maybe using your "
 "network"
 msgstr ""
 
-#: standalone/drakconnect:839
+#: standalone/drakconnect:838
 #, fuzzy, c-format
 msgid "Deactivate now"
 msgstr "แอ็คทีฟ"
 
-#: standalone/drakconnect:839
+#: standalone/drakconnect:838
 #, fuzzy, c-format
 msgid "Activate now"
 msgstr "แอ็คทีฟ"
 
-#: standalone/drakconnect:847
+#: standalone/drakconnect:846
 #, c-format
 msgid ""
-"You don't have any configured interface.\n"
+"You do not have any configured interface.\n"
 "Configure them first by clicking on 'Configure'"
 msgstr ""
 
-#: standalone/drakconnect:861
+#: standalone/drakconnect:860
 #, c-format
 msgid "LAN Configuration"
 msgstr "การปรับแต่ง LAN"
 
-#: standalone/drakconnect:873
+#: standalone/drakconnect:872
 #, c-format
 msgid "Adapter %s: %s"
 msgstr "Adapter %s: %s"
 
-#: standalone/drakconnect:882
+#: standalone/drakconnect:881
 #, c-format
 msgid "Boot Protocol"
 msgstr "Boot Protocol"
 
-#: standalone/drakconnect:883
+#: standalone/drakconnect:882
 #, c-format
 msgid "Started on boot"
 msgstr "เริ่มทำงานตอน boot"
 
-#: standalone/drakconnect:919
+#: standalone/drakconnect:918
 #, c-format
 msgid ""
 "This interface has not been configured yet.\n"
@@ -17789,39 +18231,44 @@ msgid ""
 msgstr ""
 
 #. -PO: here "Add Connection" should be translated the same was as in control-center
-#: standalone/drakconnect:974 standalone/net_applet:46
+#: standalone/drakconnect:973 standalone/net_applet:50
 #, c-format
 msgid ""
-"You don't have any configured Internet connection.\n"
-"Run the \"Add Connection\" assistant from the Mandrakelinux Control Center"
+"You do not have any configured Internet connection.\n"
+"Run the \"%s\" assistant from the Mandrakelinux Control Center"
 msgstr ""
 
-#: standalone/drakconnect:982
+#: standalone/drakconnect:974 standalone/net_applet:51
+#, fuzzy, c-format
+msgid "Set up a new network interface (LAN, ISDN, ADSL, ...)"
+msgstr "เลือก network interface"
+
+#: standalone/drakconnect:981
 #, c-format
 msgid "Internet connection configuration"
 msgstr "การปรับแต่งการติดต่อเข้า internet"
 
-#: standalone/drakconnect:1000
+#: standalone/drakconnect:999
 #, fuzzy, c-format
 msgid "Third DNS server (optional)"
 msgstr "เซิรฟ์เวอร์ DNS เครื่องแรก (optional)"
 
-#: standalone/drakconnect:1022
+#: standalone/drakconnect:1021
 #, c-format
 msgid "Internet Connection Configuration"
 msgstr "การปรับแต่งการติดต่อเข้า internet"
 
-#: standalone/drakconnect:1023
+#: standalone/drakconnect:1022
 #, c-format
 msgid "Internet access"
 msgstr "การติดต่อ internet"
 
-#: standalone/drakconnect:1025 standalone/net_monitor:101
+#: standalone/drakconnect:1024 standalone/net_monitor:101
 #, c-format
 msgid "Connection type: "
 msgstr "ชนิดการเชื่อมต่อ"
 
-#: standalone/drakconnect:1028
+#: standalone/drakconnect:1027
 #, c-format
 msgid "Status:"
 msgstr "สถานะ:"
@@ -17888,10 +18335,10 @@ msgstr "สร้าง boot disk"
 msgid "General"
 msgstr "ทั่วไป"
 
-#: standalone/drakfloppy:82 standalone/harddrake2:131
-#, fuzzy, c-format
+#: standalone/drakfloppy:82 standalone/harddrake2:145
+#, c-format
 msgid "Device"
-msgstr "อุปกรณ์: "
+msgstr "อุปกรณ์"
 
 #: standalone/drakfloppy:88
 #, fuzzy, c-format
@@ -17899,9 +18346,9 @@ msgid "Kernel version"
 msgstr "kernel version"
 
 #: standalone/drakfloppy:103
-#, fuzzy, c-format
+#, c-format
 msgid "Preferences"
-msgstr "ข้อกำหนด: "
+msgstr "ตั้งค่าคุณสมบัติ"
 
 #: standalone/drakfloppy:117
 #, fuzzy, c-format
@@ -17962,23 +18409,23 @@ msgstr ""
 "ยังไม่มีอุปกรณ์ใน %s \n"
 "กรุณาใส่อุปกรณ์ด้วย"
 
-#: standalone/drakfloppy:301
+#: standalone/drakfloppy:300
 #, c-format
 msgid "Unable to fork: %s"
 msgstr "ไม่สามารถ forkได้.%s"
 
-#: standalone/drakfloppy:304
+#: standalone/drakfloppy:303
 #, fuzzy, c-format
 msgid "Floppy creation completed"
 msgstr "ชนิดการเชื่อมต่อ"
 
-#: standalone/drakfloppy:304
+#: standalone/drakfloppy:303
 #, c-format
 msgid "The creation of the boot floppy has been successfully completed \n"
 msgstr ""
 
 #. -PO: Do not alter the <span ..> and </span> tags
-#: standalone/drakfloppy:309
+#: standalone/drakfloppy:308
 #, fuzzy, c-format
 msgid ""
 "Unable to properly close mkbootdisk:\n"
@@ -17989,109 +18436,109 @@ msgstr ""
 "%s \n"
 "%s"
 
-#: standalone/drakfont:183
+#: standalone/drakfont:182
 #, c-format
 msgid "Search installed fonts"
 msgstr ""
 
-#: standalone/drakfont:185
+#: standalone/drakfont:184
 #, c-format
 msgid "Unselect fonts installed"
 msgstr ""
 
-#: standalone/drakfont:208
+#: standalone/drakfont:207
 #, c-format
 msgid "parse all fonts"
 msgstr ""
 
-#: standalone/drakfont:210
+#: standalone/drakfont:209
 #, fuzzy, c-format
 msgid "No fonts found"
 msgstr "ไม่พบการ์ดเน็ตเวิร์ก"
 
-#: standalone/drakfont:218 standalone/drakfont:258 standalone/drakfont:325
-#: standalone/drakfont:358 standalone/drakfont:366 standalone/drakfont:392
-#: standalone/drakfont:410 standalone/drakfont:424
+#: standalone/drakfont:217 standalone/drakfont:257 standalone/drakfont:324
+#: standalone/drakfont:357 standalone/drakfont:365 standalone/drakfont:391
+#: standalone/drakfont:409 standalone/drakfont:423
 #, fuzzy, c-format
 msgid "done"
 msgstr "ทำเรียบร้อยแล้ว"
 
-#: standalone/drakfont:223
+#: standalone/drakfont:222
 #, c-format
 msgid "Could not find any font in your mounted partitions"
 msgstr ""
 
-#: standalone/drakfont:256
+#: standalone/drakfont:255
 #, c-format
 msgid "Reselect correct fonts"
 msgstr ""
 
-#: standalone/drakfont:259
+#: standalone/drakfont:258
 #, fuzzy, c-format
 msgid "Could not find any font.\n"
 msgstr "ลบคิว"
 
-#: standalone/drakfont:269
+#: standalone/drakfont:268
 #, c-format
 msgid "Search for fonts in installed list"
 msgstr ""
 
-#: standalone/drakfont:294
+#: standalone/drakfont:293
 #, c-format
 msgid "%s fonts conversion"
 msgstr ""
 
-#: standalone/drakfont:323
+#: standalone/drakfont:322
 #, fuzzy, c-format
 msgid "Fonts copy"
 msgstr "ฟอร์แมต Floppy"
 
-#: standalone/drakfont:326
+#: standalone/drakfont:325
 #, fuzzy, c-format
 msgid "True Type fonts installation"
 msgstr "กำลังเตรียมการติดตั้ง"
 
-#: standalone/drakfont:333
+#: standalone/drakfont:332
 #, c-format
 msgid "please wait during ttmkfdir..."
 msgstr ""
 
-#: standalone/drakfont:334
+#: standalone/drakfont:333
 #, c-format
 msgid "True Type install done"
 msgstr ""
 
-#: standalone/drakfont:340 standalone/drakfont:355
+#: standalone/drakfont:339 standalone/drakfont:354
 #, c-format
 msgid "type1inst building"
 msgstr ""
 
-#: standalone/drakfont:349
+#: standalone/drakfont:348
 #, c-format
 msgid "Ghostscript referencing"
 msgstr ""
 
-#: standalone/drakfont:359
+#: standalone/drakfont:358
 #, c-format
 msgid "Suppress Temporary Files"
 msgstr ""
 
-#: standalone/drakfont:362
+#: standalone/drakfont:361
 #, fuzzy, c-format
 msgid "Restart XFS"
 msgstr "จำเพาะ"
 
-#: standalone/drakfont:408 standalone/drakfont:418
+#: standalone/drakfont:407 standalone/drakfont:417
 #, c-format
 msgid "Suppress Fonts Files"
 msgstr ""
 
-#: standalone/drakfont:420
+#: standalone/drakfont:419
 #, fuzzy, c-format
 msgid "xfs restart"
 msgstr "จำเพาะ"
 
-#: standalone/drakfont:428
+#: standalone/drakfont:427
 #, c-format
 msgid ""
 "Before installing any fonts, be sure that you have the right to use and "
@@ -18101,33 +18548,33 @@ msgid ""
 "hang up your X Server."
 msgstr ""
 
-#: standalone/drakfont:477 standalone/drakfont:486
+#: standalone/drakfont:476 standalone/drakfont:485
 #, c-format
 msgid "DrakFont"
 msgstr ""
 
-#: standalone/drakfont:487
+#: standalone/drakfont:486
 #, fuzzy, c-format
 msgid "Font List"
 msgstr "กำหนดจุดเม้าท์"
 
-#: standalone/drakfont:493
-#, fuzzy, c-format
+#: standalone/drakfont:492
+#, c-format
 msgid "About"
-msgstr "เลิก"
+msgstr "เกี่ยวกับ"
 
-#: standalone/drakfont:495 standalone/drakfont:691 standalone/drakfont:729
-#, fuzzy, c-format
+#: standalone/drakfont:494 standalone/drakfont:692 standalone/drakfont:730
+#, c-format
 msgid "Uninstall"
-msgstr "ออกจากการติดตั้ง"
+msgstr "ยกเลิกการติดตั้งโปรแกรม"
 
-#: standalone/drakfont:496
-#, fuzzy, c-format
+#: standalone/drakfont:495
+#, c-format
 msgid "Import"
-msgstr "ฟอร์แมตพาร์ติชั่น"
+msgstr "นำเข้า"
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: standalone/drakfont:514
+#: standalone/drakfont:513
 #, c-format
 msgid ""
 "Copyright (C) 2001-2002 by Mandrakesoft \n"
@@ -18140,7 +18587,7 @@ msgid ""
 "       VIGNAUD Thierry <tvignaud@mandrakesoft.com>"
 msgstr ""
 
-#: standalone/drakfont:523
+#: standalone/drakfont:522
 #, c-format
 msgid ""
 "This program is free software; you can redistribute it and/or modify\n"
@@ -18160,7 +18607,7 @@ msgid ""
 " Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA."
 msgstr ""
 
-#: standalone/drakfont:539
+#: standalone/drakfont:538
 #, c-format
 msgid ""
 "Thanks:\n"
@@ -18178,12 +18625,12 @@ msgid ""
 "             Convert ttf font files to afm and pfb fonts\n"
 msgstr ""
 
-#: standalone/drakfont:558
+#: standalone/drakfont:557
 #, fuzzy, c-format
 msgid "Choose the applications that will support the fonts:"
 msgstr "เลือกพาร์ติชั่นที่คุณต้องการฟอร์แมต"
 
-#: standalone/drakfont:559
+#: standalone/drakfont:558
 #, c-format
 msgid ""
 "Before installing any fonts, be sure that you have the right to use and "
@@ -18193,127 +18640,127 @@ msgid ""
 "hang up your X Server."
 msgstr ""
 
-#: standalone/drakfont:569
+#: standalone/drakfont:568
 #, c-format
 msgid "Ghostscript"
-msgstr ""
+msgstr "Ghostscript"
 
-#: standalone/drakfont:570
+#: standalone/drakfont:569
 #, fuzzy, c-format
 msgid "StarOffice"
 msgstr "ดี"
 
-#: standalone/drakfont:571
+#: standalone/drakfont:570
 #, fuzzy, c-format
 msgid "Abiword"
 msgstr "เลิก"
 
-#: standalone/drakfont:572
+#: standalone/drakfont:571
 #, fuzzy, c-format
 msgid "Generic Printers"
 msgstr "เครื่องพิมพ์"
 
-#: standalone/drakfont:588
+#: standalone/drakfont:587
 #, c-format
 msgid "Select the font file or directory and click on 'Add'"
 msgstr ""
 
-#: standalone/drakfont:589
-#, fuzzy, c-format
+#: standalone/drakfont:588
+#, c-format
 msgid "File Selection"
-msgstr "เลือกกลุ่มแพ็คเก็จ"
+msgstr "เลือกเอกสาร"
 
 #: standalone/drakfont:604
 #, fuzzy, c-format
 msgid "You've not selected any font"
 msgstr "ลบคิว"
 
-#: standalone/drakfont:656
+#: standalone/drakfont:657
 #, fuzzy, c-format
 msgid "Import fonts"
 msgstr "ฟอร์แมตพาร์ติชั่น"
 
-#: standalone/drakfont:661
+#: standalone/drakfont:662
 #, fuzzy, c-format
 msgid "Install fonts"
 msgstr "ติดตั้งระบบ"
 
-#: standalone/drakfont:696
+#: standalone/drakfont:697
 #, c-format
 msgid "click here if you are sure."
 msgstr ""
 
-#: standalone/drakfont:698
+#: standalone/drakfont:699
 #, c-format
 msgid "here if no."
 msgstr ""
 
-#: standalone/drakfont:737
+#: standalone/drakfont:738
 #, c-format
 msgid "Unselected All"
 msgstr ""
 
-#: standalone/drakfont:740
+#: standalone/drakfont:741
 #, fuzzy, c-format
 msgid "Selected All"
 msgstr "เลือกไฟล์"
 
-#: standalone/drakfont:743
-#, fuzzy, c-format
+#: standalone/drakfont:744
+#, c-format
 msgid "Remove List"
-msgstr "เครื่องพิมพ์แบบรีโมท"
+msgstr "ลบรายการ"
 
-#: standalone/drakfont:754 standalone/drakfont:773
+#: standalone/drakfont:755 standalone/drakfont:774
 #, fuzzy, c-format
 msgid "Importing fonts"
 msgstr "ฟอร์แมตพาร์ติชั่น"
 
-#: standalone/drakfont:758 standalone/drakfont:778
+#: standalone/drakfont:759 standalone/drakfont:779
 #, fuzzy, c-format
 msgid "Initial tests"
 msgstr "ข้อความ init"
 
-#: standalone/drakfont:759
+#: standalone/drakfont:760
 #, fuzzy, c-format
 msgid "Copy fonts on your system"
 msgstr "ไม่มีอุปกรณ์ Network บนเครื่องคุณ"
 
-#: standalone/drakfont:760
+#: standalone/drakfont:761
 #, c-format
 msgid "Install & convert Fonts"
 msgstr ""
 
-#: standalone/drakfont:761
+#: standalone/drakfont:762
 #, fuzzy, c-format
 msgid "Post Install"
 msgstr "ติดตั้ง"
 
-#: standalone/drakfont:779
+#: standalone/drakfont:780
 #, fuzzy, c-format
 msgid "Remove fonts on your system"
 msgstr "ไม่มีอุปกรณ์ Network บนเครื่องคุณ"
 
-#: standalone/drakfont:780
+#: standalone/drakfont:781
 #, fuzzy, c-format
 msgid "Post Uninstall"
 msgstr "ออกจากการติดตั้ง"
 
-#: standalone/drakgw:58 standalone/drakgw:194
+#: standalone/drakgw:58 standalone/drakgw:191
 #, c-format
 msgid "Internet Connection Sharing"
 msgstr "การเชื่อมต่อกับ Internet แบบ sharing"
 
-#: standalone/drakgw:114 standalone/drakvpn:51
+#: standalone/drakgw:111 standalone/drakvpn:51
 #, c-format
 msgid "Sorry, we support only 2.4 and above kernels."
 msgstr ""
 
-#: standalone/drakgw:125
+#: standalone/drakgw:122
 #, c-format
 msgid "Internet Connection Sharing currently disabled"
 msgstr "การติดต่อ internet แบบ share ถูกยกเลิกแล้ว"
 
-#: standalone/drakgw:126
+#: standalone/drakgw:123
 #, c-format
 msgid ""
 "The setup of Internet connection sharing has already been done.\n"
@@ -18322,39 +18769,39 @@ msgid ""
 "What would you like to do?"
 msgstr ""
 
-#: standalone/drakgw:130 standalone/drakvpn:127
+#: standalone/drakgw:127 standalone/drakvpn:127
 #, c-format
 msgid "enable"
 msgstr "enable"
 
-#: standalone/drakgw:130 standalone/drakgw:157 standalone/drakvpn:101
+#: standalone/drakgw:127 standalone/drakgw:154 standalone/drakvpn:101
 #: standalone/drakvpn:127
 #, c-format
 msgid "reconfigure"
 msgstr "คอนฟิกใหม่"
 
-#: standalone/drakgw:130 standalone/drakgw:157 standalone/drakvpn:101
+#: standalone/drakgw:127 standalone/drakgw:154 standalone/drakvpn:101
 #: standalone/drakvpn:127 standalone/drakvpn:376 standalone/drakvpn:735
 #, c-format
 msgid "dismiss"
 msgstr "เลิก"
 
-#: standalone/drakgw:137
+#: standalone/drakgw:134
 #, c-format
 msgid "Enabling servers..."
 msgstr "เริ่มทำงาน server"
 
-#: standalone/drakgw:149
+#: standalone/drakgw:146
 #, c-format
 msgid "Internet Connection Sharing is now enabled."
 msgstr "การเชื่อมต่อกับ Internet แบบ sharing เริ่มทำงานแล้ว"
 
-#: standalone/drakgw:152
+#: standalone/drakgw:149
 #, c-format
 msgid "Internet Connection Sharing currently enabled"
 msgstr "การเชื่อมต่อ internet แบบ share ได้ทำงานแล้ว"
 
-#: standalone/drakgw:153
+#: standalone/drakgw:150
 #, c-format
 msgid ""
 "The setup of Internet Connection Sharing has already been done.\n"
@@ -18363,22 +18810,22 @@ msgid ""
 "What would you like to do?"
 msgstr ""
 
-#: standalone/drakgw:157 standalone/drakvpn:101
+#: standalone/drakgw:154 standalone/drakvpn:101
 #, c-format
 msgid "disable"
 msgstr "disable"
 
-#: standalone/drakgw:160
+#: standalone/drakgw:157
 #, c-format
 msgid "Disabling servers..."
 msgstr "ยกเลิกการทำงานของ server"
 
-#: standalone/drakgw:175
+#: standalone/drakgw:172
 #, c-format
 msgid "Internet Connection Sharing is now disabled."
 msgstr "การเชื่อมต่อกับ Internet แบบ sharing ถูกยกเลิกแล้ว"
 
-#: standalone/drakgw:195
+#: standalone/drakgw:192
 #, fuzzy, c-format
 msgid ""
 "You are about to configure your computer to share its Internet connection.\n"
@@ -18397,27 +18844,27 @@ msgstr ""
 "\n"
 "คุณต้องการให้ผู้อื่นใช้ internet ร่วมด้วยหรือไม่\n"
 
-#: standalone/drakgw:239
+#: standalone/drakgw:236
 #, c-format
 msgid "Interface %s (using module %s)"
 msgstr "Interface %s (using module %s)"
 
-#: standalone/drakgw:240
+#: standalone/drakgw:237
 #, c-format
 msgid "Interface %s"
 msgstr "Interface %s"
 
-#: standalone/drakgw:249 standalone/drakpxe:137
+#: standalone/drakgw:246 standalone/drakpxe:137
 #, c-format
 msgid "No network adapter on your system!"
 msgstr "ไม่มีอุปกรณ์ Network บนเครื่องคุณ"
 
-#: standalone/drakgw:256
+#: standalone/drakgw:253
 #, c-format
 msgid "Network interface"
 msgstr "Network interface"
 
-#: standalone/drakgw:257
+#: standalone/drakgw:254
 #, c-format
 msgid ""
 "There is only one configured network adapter on your system:\n"
@@ -18432,24 +18879,24 @@ msgstr ""
 "\n"
 "ผมกำลังจะใช้ adapter นี้กับระบบ LAN"
 
-#: standalone/drakgw:263 standalone/drakpxe:142
+#: standalone/drakgw:260 standalone/drakpxe:142
 #, c-format
 msgid "Choose the network interface"
 msgstr "เลือก network interface"
 
-#: standalone/drakgw:264
+#: standalone/drakgw:261
 #, c-format
 msgid ""
 "Please choose what network adapter will be connected to your Local Area "
 "Network."
 msgstr "กรุณาเลือก network adapter ที่จะใช้กับระบบ LAN"
 
-#: standalone/drakgw:293
+#: standalone/drakgw:290
 #, fuzzy, c-format
 msgid "Network interface already configured"
 msgstr "ไม่มีการคอนฟิกจอภาพ"
 
-#: standalone/drakgw:294
+#: standalone/drakgw:291
 #, c-format
 msgid ""
 "Warning, the network adapter (%s) is already configured.\n"
@@ -18459,27 +18906,27 @@ msgid ""
 "You can do it manually but you need to know what you're doing."
 msgstr ""
 
-#: standalone/drakgw:299
+#: standalone/drakgw:296
 #, fuzzy, c-format
 msgid "Automatic reconfiguration"
 msgstr "Boot Style Configuration"
 
-#: standalone/drakgw:299
+#: standalone/drakgw:296
 #, c-format
 msgid "No (experts only)"
 msgstr ""
 
-#: standalone/drakgw:300
+#: standalone/drakgw:297
 #, fuzzy, c-format
 msgid "Show current interface configuration"
 msgstr "การคอนฟิก Internet"
 
-#: standalone/drakgw:301
+#: standalone/drakgw:298
 #, fuzzy, c-format
 msgid "Current interface configuration"
 msgstr "การคอนฟิก Internet"
 
-#: standalone/drakgw:302
+#: standalone/drakgw:299
 #, c-format
 msgid ""
 "Current configuration of `%s':\n"
@@ -18490,7 +18937,7 @@ msgid ""
 "Driver: %s"
 msgstr ""
 
-#: standalone/drakgw:315
+#: standalone/drakgw:312
 #, c-format
 msgid ""
 "I can keep your current configuration and assume you already set up a DHCP "
@@ -18506,86 +18953,86 @@ msgid ""
 "\n"
 msgstr ""
 
-#: standalone/drakgw:322
+#: standalone/drakgw:319
 #, fuzzy, c-format
 msgid "Local Network adress"
 msgstr "ไม่พบการ์ดเน็ตเวิร์ก"
 
-#: standalone/drakgw:326
+#: standalone/drakgw:323
 #, c-format
 msgid ""
 "DHCP Server Configuration.\n"
 "\n"
 "Here you can select different options for the DHCP server configuration.\n"
-"If you don't know the meaning of an option, simply leave it as it is."
+"If you do not know the meaning of an option, simply leave it as it is."
 msgstr ""
 
-#: standalone/drakgw:330
+#: standalone/drakgw:327
 #, fuzzy, c-format
 msgid "(This) DHCP Server IP"
 msgstr "ค่า IP ของ CUPS เซิร์ฟเวอร์"
 
-#: standalone/drakgw:331
+#: standalone/drakgw:328
 #, fuzzy, c-format
 msgid "The DNS Server IP"
 msgstr "ค่า IP ของ CUPS เซิร์ฟเวอร์"
 
-#: standalone/drakgw:332
+#: standalone/drakgw:329
 #, fuzzy, c-format
 msgid "The internal domain name"
 msgstr "ไม่มีเครื่องพิมพ์"
 
-#: standalone/drakgw:333
+#: standalone/drakgw:330
 #, c-format
 msgid "The DHCP start range"
 msgstr ""
 
-#: standalone/drakgw:334
+#: standalone/drakgw:331
 #, c-format
 msgid "The DHCP end range"
 msgstr ""
 
-#: standalone/drakgw:335
+#: standalone/drakgw:332
 #, c-format
 msgid "The default lease (in seconds)"
 msgstr ""
 
-#: standalone/drakgw:336
+#: standalone/drakgw:333
 #, c-format
 msgid "The maximum lease (in seconds)"
 msgstr ""
 
-#: standalone/drakgw:337
+#: standalone/drakgw:334
 #, c-format
 msgid "Re-configure interface and DHCP server"
 msgstr ""
 
-#: standalone/drakgw:344
+#: standalone/drakgw:341
 #, c-format
 msgid "The Local Network did not finish with `.0', bailing out."
 msgstr ""
 
-#: standalone/drakgw:354
+#: standalone/drakgw:351
 #, c-format
 msgid "Potential LAN address conflict found in current config of %s!\n"
 msgstr "มีความขัดแย้งของ LAN address ซึ่งเจอในคอนฟิกปัจจุบันใน %s!\n"
 
-#: standalone/drakgw:364
+#: standalone/drakgw:361
 #, c-format
 msgid "Configuring..."
 msgstr "กำลังทำการคอนฟิก"
 
-#: standalone/drakgw:365
+#: standalone/drakgw:362
 #, c-format
 msgid "Configuring scripts, installing software, starting servers..."
 msgstr "กำลังปรับแต่ง scripts ติดตั้งโปรแกรม และเริ่มทำงาน servers..."
 
-#: standalone/drakgw:405 standalone/drakpxe:231 standalone/drakvpn:278
+#: standalone/drakgw:402 standalone/drakpxe:231 standalone/drakvpn:278
 #, c-format
 msgid "Problems installing package %s"
 msgstr "ปัญหาการติดตั้งแพ็คเก็จ %s"
 
-#: standalone/drakgw:601
+#: standalone/drakgw:598
 #, fuzzy, c-format
 msgid ""
 "Everything has been configured.\n"
@@ -18660,29 +19107,29 @@ msgid "Custom & system settings"
 msgstr "กำลังพาร์ติชั่น Custom disk"
 
 #: standalone/drakperm:44
-#, fuzzy, c-format
+#, c-format
 msgid "Editable"
-msgstr "disable"
+msgstr "แก้ไขได้"
 
 #: standalone/drakperm:49 standalone/drakperm:321
 #, c-format
 msgid "Path"
-msgstr ""
+msgstr "พาธ"
 
 #: standalone/drakperm:49 standalone/drakperm:250
-#, fuzzy, c-format
+#, c-format
 msgid "User"
-msgstr "ชื่อผู้ใช้"
+msgstr "ผู้ใช้"
 
 #: standalone/drakperm:49 standalone/drakperm:250
-#, fuzzy, c-format
+#, c-format
 msgid "Group"
-msgstr "เวิร์กกรุ๊ป (workgroup)"
+msgstr "กลุ่ม"
 
 #: standalone/drakperm:49 standalone/drakperm:333
-#, fuzzy, c-format
+#, c-format
 msgid "Permissions"
-msgstr "เวอร์ชั่น: %s\n"
+msgstr "สิทธิ์"
 
 #: standalone/drakperm:107
 #, c-format
@@ -18702,7 +19149,7 @@ msgstr ""
 #: standalone/drakperm:121
 #, c-format
 msgid "Up"
-msgstr ""
+msgstr "ขึ้น"
 
 #: standalone/drakperm:121
 #, c-format
@@ -18710,9 +19157,9 @@ msgid "Move selected rule up one level"
 msgstr ""
 
 #: standalone/drakperm:122
-#, fuzzy, c-format
+#, c-format
 msgid "Down"
-msgstr "ทำเรียบร้อยแล้ว"
+msgstr "เลื่อนลง"
 
 #: standalone/drakperm:122
 #, c-format
@@ -18737,10 +19184,10 @@ msgstr "ลบคิว"
 #. -PO: "Edit" is a button text and the translation has to be AS SHORT AS POSSIBLE
 #: standalone/drakperm:125 standalone/drakups:298 standalone/drakups:358
 #: standalone/drakups:378 standalone/drakvpn:333 standalone/drakvpn:694
-#: standalone/printerdrake:239
-#, fuzzy, c-format
+#: standalone/printerdrake:232
+#, c-format
 msgid "Edit"
-msgstr "Ext2"
+msgstr "ปรับแต่ง"
 
 #: standalone/drakperm:125
 #, c-format
@@ -18753,24 +19200,24 @@ msgid "browse"
 msgstr ""
 
 #: standalone/drakperm:247
-#, fuzzy, c-format
+#, c-format
 msgid "user"
-msgstr "Mouse"
+msgstr "ผู้ใช้"
 
 #: standalone/drakperm:247
-#, fuzzy, c-format
+#, c-format
 msgid "group"
-msgstr "เวิร์กกรุ๊ป (workgroup)"
+msgstr "กลุ่ม"
 
 #: standalone/drakperm:247
-#, fuzzy, c-format
+#, c-format
 msgid "other"
 msgstr "อื่นๆ"
 
 #: standalone/drakperm:252
-#, fuzzy, c-format
+#, c-format
 msgid "Read"
-msgstr "เรียกอีกครั้ง"
+msgstr "อ่าน"
 
 #. -PO: here %s will be either "user", "group" or "other"
 #: standalone/drakperm:255
@@ -18779,9 +19226,9 @@ msgid "Enable \"%s\" to read the file"
 msgstr ""
 
 #: standalone/drakperm:259
-#, fuzzy, c-format
+#, c-format
 msgid "Write"
-msgstr "Xorg %s"
+msgstr "เขียน"
 
 #. -PO: here %s will be either "user", "group" or "other"
 #: standalone/drakperm:262
@@ -18792,7 +19239,7 @@ msgstr ""
 #: standalone/drakperm:266
 #, c-format
 msgid "Execute"
-msgstr ""
+msgstr "ดำเนินการ"
 
 #. -PO: here %s will be either "user", "group" or "other"
 #: standalone/drakperm:269
@@ -18833,14 +19280,14 @@ msgid "Use group id for execution"
 msgstr "ใช้ auto detection"
 
 #: standalone/drakperm:290 standalone/drakxtv:89
-#, fuzzy, c-format
+#, c-format
 msgid "User:"
-msgstr "ชื่อผู้ใช้"
+msgstr "ผู้ใช้:"
 
 #: standalone/drakperm:292
-#, fuzzy, c-format
+#, c-format
 msgid "Group:"
-msgstr "เวิร์กกรุ๊ป (workgroup)"
+msgstr "กลุ่ม:"
 
 #: standalone/drakperm:296
 #, fuzzy, c-format
@@ -18849,18 +19296,18 @@ msgstr "ยอมรับผู้ใช้"
 
 #: standalone/drakperm:297
 #, c-format
-msgid "When checked, owner and group won't be changed"
+msgid "When checked, owner and group will not be changed"
 msgstr ""
 
 #: standalone/drakperm:307
-#, fuzzy, c-format
+#, c-format
 msgid "Path selection"
-msgstr "บันทึกกลุ่มแพ็คเก็จที่เลือก"
+msgstr "เลือกตำแหน่ง"
 
 #: standalone/drakperm:327
-#, fuzzy, c-format
+#, c-format
 msgid "Property"
-msgstr "Port"
+msgstr "คุณสมบัติ"
 
 #: standalone/drakpxe:55
 #, fuzzy, c-format
@@ -18974,9 +19421,9 @@ msgid "LOCAL"
 msgstr ""
 
 #: standalone/draksec:53
-#, fuzzy, c-format
+#, c-format
 msgid "Ignore"
-msgstr "ไม่มี"
+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.
@@ -19033,7 +19480,7 @@ msgid ""
 "maximum"
 msgstr ""
 
-#: standalone/draksec:154 standalone/harddrake2:184
+#: standalone/draksec:154 standalone/harddrake2:202
 #, c-format
 msgid ""
 "Description of the fields:\n"
@@ -19075,12 +19522,12 @@ msgstr "อ๊อปชั่นของโมดูล:"
 msgid "Periodic Checks"
 msgstr ""
 
-#: standalone/draksec:299
+#: standalone/draksec:298
 #, fuzzy, c-format
 msgid "Please wait, setting security level..."
 msgstr "เลือกระดับระบบรักษาความปลอดภัย"
 
-#: standalone/draksec:305
+#: standalone/draksec:304
 #, fuzzy, c-format
 msgid "Please wait, setting security options..."
 msgstr "กำลังเตรียมการติดตั้ง"
@@ -19205,9 +19652,9 @@ msgid "the color of the progress bar"
 msgstr ""
 
 #: standalone/draksplash:119
-#, fuzzy, c-format
+#, c-format
 msgid "Preview"
-msgstr "อุปกรณ์"
+msgstr "ตัวอย่าง"
 
 #: standalone/draksplash:121
 #, fuzzy, c-format
@@ -19312,7 +19759,7 @@ msgstr ""
 msgid "Autodetection"
 msgstr "ใช้ auto detection"
 
-#: standalone/drakups:101 standalone/harddrake2:211
+#: standalone/drakups:101 standalone/harddrake2:231
 #, fuzzy, c-format
 msgid "Detection in progress"
 msgstr "ค้นหาเจอบน port %s"
@@ -19371,9 +19818,9 @@ msgid "The driver that manages your ups"
 msgstr ""
 
 #: standalone/drakups:147
-#, fuzzy, c-format
+#, c-format
 msgid "Port:"
-msgstr "Port"
+msgstr "พอร์ต:"
 
 #: standalone/drakups:149
 #, fuzzy, c-format
@@ -19391,7 +19838,8 @@ msgid "UPS devices"
 msgstr "อุปกรณ์"
 
 #: standalone/drakups:247 standalone/drakups:266 standalone/drakups:282
-#: standalone/harddrake2:80 standalone/harddrake2:102
+#: standalone/harddrake2:83 standalone/harddrake2:109
+#: standalone/harddrake2:116
 #, c-format
 msgid "Name"
 msgstr "ชื่อ"
@@ -19419,10 +19867,10 @@ msgstr "ไม่ยอมรับ"
 #: standalone/drakups:295
 #, c-format
 msgid "Action"
-msgstr ""
+msgstr "การกระทำ"
 
-#: standalone/drakups:295 standalone/drakvpn:1146 standalone/harddrake2:77
-#, fuzzy, c-format
+#: standalone/drakups:295 standalone/drakvpn:1146 standalone/harddrake2:80
+#, c-format
 msgid "Level"
 msgstr "ระดับ"
 
@@ -19733,7 +20181,7 @@ msgid ""
 "\n"
 "Here you define the default settings. \n"
 "All the other sections will follow this one.\n"
-"The left settings are optional. If don't define\n"
+"The left settings are optional. If do not define\n"
 "them here, globally, you can define them in each\n"
 "section.\n"
 msgstr ""
@@ -19759,9 +20207,9 @@ msgid "disablearrivalcheck"
 msgstr ""
 
 #: standalone/drakvpn:455 standalone/drakvpn:494
-#, fuzzy, c-format
+#, c-format
 msgid "left"
-msgstr "ลบ"
+msgstr "ซ้าย"
 
 #: standalone/drakvpn:456 standalone/drakvpn:495
 #, c-format
@@ -19808,9 +20256,9 @@ msgid "auto"
 msgstr "เลิก"
 
 #: standalone/drakvpn:499
-#, fuzzy, c-format
+#, c-format
 msgid "right"
-msgstr "สูง"
+msgstr "ขวา"
 
 #: standalone/drakvpn:500
 #, fuzzy, c-format
@@ -19874,7 +20322,7 @@ msgstr "ชื่อการเชื่อมต่อ"
 
 #: standalone/drakvpn:590
 #, fuzzy, c-format
-msgid "Can't edit!"
+msgid "Can not edit!"
 msgstr "Adapter %s: %s"
 
 #: standalone/drakvpn:591
@@ -19988,9 +20436,9 @@ msgid "path"
 msgstr ""
 
 #: standalone/drakvpn:735
-#, fuzzy, c-format
+#, c-format
 msgid "remote"
-msgstr "เครื่องพิมพ์แบบรีโมท"
+msgstr "รีโมท"
 
 #: standalone/drakvpn:735
 #, fuzzy, c-format
@@ -20317,9 +20765,9 @@ msgid "deflate"
 msgstr "default"
 
 #: standalone/drakvpn:1043
-#, fuzzy, c-format
+#, c-format
 msgid "Remote"
-msgstr "เครื่องพิมพ์แบบรีโมท"
+msgstr "Remote"
 
 #: standalone/drakvpn:1044
 #, c-format
@@ -20505,20 +20953,15 @@ msgstr ""
 msgid "Hash algorithm"
 msgstr ""
 
-#: standalone/drakvpn:1125
-#, fuzzy, c-format
-msgid "Authentication method"
-msgstr "การตรวจสอบสิทธิ์การใช้งาน"
-
 #: standalone/drakvpn:1126
 #, fuzzy, c-format
 msgid "DH group"
 msgstr "เวิร์กกรุ๊ป (workgroup)"
 
 #: standalone/drakvpn:1133
-#, fuzzy, c-format
+#, c-format
 msgid "Command"
-msgstr "ชื่อโดเมน"
+msgstr "คำสั่ง"
 
 #: standalone/drakvpn:1134
 #, c-format
@@ -20546,9 +20989,9 @@ msgid "Flag"
 msgstr "ธง"
 
 #: standalone/drakvpn:1139
-#, fuzzy, c-format
+#, c-format
 msgid "Direction"
-msgstr "รายละเอียด"
+msgstr "ทิศทาง"
 
 #: standalone/drakvpn:1140
 #, c-format
@@ -20566,9 +21009,9 @@ msgid "discard"
 msgstr "disable"
 
 #: standalone/drakvpn:1143
-#, fuzzy, c-format
+#, c-format
 msgid "Mode"
-msgstr "Mouse"
+msgstr "โหมด"
 
 #: standalone/drakvpn:1143
 #, fuzzy, c-format
@@ -20707,13 +21150,13 @@ msgstr ""
 msgid "Now, you can run xawtv (under X Window!) !\n"
 msgstr ""
 
-#: standalone/drakxtv:134
+#: standalone/drakxtv:149
 #, c-format
 msgid "No TV Card detected!"
 msgstr ""
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: standalone/drakxtv:136
+#: standalone/drakxtv:151
 #, c-format
 msgid ""
 "No TV Card has been detected on your machine. Please verify that a Linux-"
@@ -20726,35 +21169,35 @@ msgid ""
 "http://www.linux-mandrake.com/en/hardware.php3"
 msgstr ""
 
-#: standalone/harddrake2:20
+#: standalone/harddrake2:23
 #, fuzzy, c-format
 msgid "Alternative drivers"
 msgstr "กำลังพิมพ์กระดาษทดสอบ"
 
-#: standalone/harddrake2:21
+#: standalone/harddrake2:24
 #, c-format
 msgid "the list of alternative drivers for this sound card"
 msgstr ""
 
-#: standalone/harddrake2:24
+#: standalone/harddrake2:27
 #, c-format
 msgid ""
 "this is the physical bus on which the device is plugged (eg: PCI, USB, ...)"
 msgstr ""
 
-#: standalone/harddrake2:26 standalone/harddrake2:130
+#: standalone/harddrake2:29 standalone/harddrake2:144
 #, fuzzy, c-format
 msgid "Bus identification"
 msgstr "การตรวจสอบสิทธิ์การใช้งาน"
 
-#: standalone/harddrake2:27
+#: standalone/harddrake2:30
 #, c-format
 msgid ""
 "- PCI and USB devices: this lists the vendor, device, subvendor and "
 "subdevice PCI/USB ids"
 msgstr ""
 
-#: standalone/harddrake2:30
+#: standalone/harddrake2:33
 #, c-format
 msgid ""
 "- pci devices: this gives the PCI slot, device and function of this card\n"
@@ -20762,204 +21205,204 @@ msgid ""
 "- scsi devices: the scsi bus and the scsi device ids"
 msgstr ""
 
-#: standalone/harddrake2:33
+#: standalone/harddrake2:36
 #, c-format
 msgid "Drive capacity"
 msgstr ""
 
-#: standalone/harddrake2:33
+#: standalone/harddrake2:36
 #, c-format
 msgid "special capacities of the driver (burning ability and or DVD support)"
 msgstr ""
 
-#: standalone/harddrake2:34
+#: standalone/harddrake2:37
 #, c-format
 msgid "this field describes the device"
 msgstr ""
 
-#: standalone/harddrake2:35
+#: standalone/harddrake2:38
 #, fuzzy, c-format
 msgid "Old device file"
 msgstr "เลือกไฟล์"
 
-#: standalone/harddrake2:36
+#: standalone/harddrake2:39
 #, c-format
 msgid "old static device name used in dev package"
 msgstr ""
 
-#: standalone/harddrake2:37
+#: standalone/harddrake2:40
 #, fuzzy, c-format
 msgid "New devfs device"
 msgstr "อุปกรณ์เกตเวย์"
 
-#: standalone/harddrake2:38
+#: standalone/harddrake2:41
 #, c-format
 msgid "new dynamic device name generated by core kernel devfs"
 msgstr ""
 
 #. -PO: here "module" is the "jargon term" for a kernel driver
-#: standalone/harddrake2:41
-#, fuzzy, c-format
+#: standalone/harddrake2:44
+#, c-format
 msgid "Module"
-msgstr "Mouse"
+msgstr "โมดูล"
 
-#: standalone/harddrake2:41
+#: standalone/harddrake2:44
 #, c-format
 msgid "the module of the GNU/Linux kernel that handles the device"
 msgstr ""
 
-#: standalone/harddrake2:42
+#: standalone/harddrake2:45
 #, fuzzy, c-format
 msgid "Extended partitions"
 msgstr "สร้างพาร์ติชั่นใหม่"
 
-#: standalone/harddrake2:42
+#: standalone/harddrake2:45
 #, fuzzy, c-format
 msgid "the number of extended partitions"
 msgstr "ไม่มีพื้นที่เพียงพอสำหรับ พาร์ติชั่น ใหม่"
 
-#: standalone/harddrake2:43
-#, fuzzy, c-format
+#: standalone/harddrake2:46
+#, c-format
 msgid "Geometry"
-msgstr "เรียกคืนจากไฟล์"
+msgstr "ค่าเรขาคณิต"
 
-#: standalone/harddrake2:43
+#: standalone/harddrake2:46
 #, c-format
 msgid "Cylinder/head/sectors geometry of the disk"
 msgstr ""
 
-#: standalone/harddrake2:44
+#: standalone/harddrake2:47
 #, c-format
 msgid "Disk controller"
 msgstr ""
 
-#: standalone/harddrake2:44
+#: standalone/harddrake2:47
 #, c-format
 msgid "the disk controller on the host side"
 msgstr ""
 
-#: standalone/harddrake2:45
+#: standalone/harddrake2:48
 #, c-format
 msgid "class of hardware device"
 msgstr ""
 
-#: standalone/harddrake2:46 standalone/harddrake2:78
-#: standalone/printerdrake:218
-#, fuzzy, c-format
+#: standalone/harddrake2:49 standalone/harddrake2:81
+#: standalone/printerdrake:211
+#, c-format
 msgid "Model"
-msgstr "Mouse"
+msgstr "แบบ"
 
-#: standalone/harddrake2:46
+#: standalone/harddrake2:49
 #, fuzzy, c-format
 msgid "hard disk model"
 msgstr "Card mem (DMA)"
 
-#: standalone/harddrake2:47
+#: standalone/harddrake2:50
 #, fuzzy, c-format
 msgid "network printer port"
 msgstr "เครื่องพิมพ์ในระบบ Network (TCP/Socket)"
 
-#: standalone/harddrake2:48
+#: standalone/harddrake2:51
 #, fuzzy, c-format
 msgid "Primary partitions"
 msgstr "ฟอร์แมตพาร์ติชั่น"
 
-#: standalone/harddrake2:48
+#: standalone/harddrake2:51
 #, fuzzy, c-format
 msgid "the number of the primary partitions"
 msgstr "เซ็กเตอร์แรกของบูตพาร์ติชั่น"
 
-#: standalone/harddrake2:49
+#: standalone/harddrake2:52
 #, c-format
 msgid "the vendor name of the device"
 msgstr ""
 
-#: standalone/harddrake2:50
+#: standalone/harddrake2:53
 #, c-format
 msgid "Bus PCI #"
 msgstr ""
 
-#: standalone/harddrake2:50
+#: standalone/harddrake2:53
 #, fuzzy, c-format
 msgid "the PCI bus on which the device is plugged"
 msgstr "เม้าส์ของคุณต่อเข้ากับพอร์ตอนุกรมใด"
 
-#: standalone/harddrake2:51
+#: standalone/harddrake2:54
 #, fuzzy, c-format
 msgid "PCI device #"
 msgstr "อุปกรณ์"
 
-#: standalone/harddrake2:51
+#: standalone/harddrake2:54
 #, fuzzy, c-format
 msgid "PCI device number"
 msgstr "หมายเลขโทรศัพท์"
 
-#: standalone/harddrake2:52
+#: standalone/harddrake2:55
 #, c-format
 msgid "PCI function #"
 msgstr ""
 
-#: standalone/harddrake2:52
+#: standalone/harddrake2:55
 #, fuzzy, c-format
 msgid "PCI function number"
 msgstr "ชื่อการเชื่อมต่อ"
 
-#: standalone/harddrake2:53
+#: standalone/harddrake2:56
 #, fuzzy, c-format
 msgid "Vendor ID"
 msgstr "ยกเลิก"
 
-#: standalone/harddrake2:53
+#: standalone/harddrake2:56
 #, c-format
 msgid "this is the standard numerical identifier of the vendor"
 msgstr ""
 
-#: standalone/harddrake2:54
+#: standalone/harddrake2:57
 #, fuzzy, c-format
 msgid "Device ID"
 msgstr "อุปกรณ์: "
 
-#: standalone/harddrake2:54
+#: standalone/harddrake2:57
 #, c-format
 msgid "this is the numerical identifier of the device"
 msgstr ""
 
-#: standalone/harddrake2:55
+#: standalone/harddrake2:58
 #, c-format
 msgid "Sub vendor ID"
 msgstr ""
 
-#: standalone/harddrake2:55
+#: standalone/harddrake2:58
 #, c-format
 msgid "this is the minor numerical identifier of the vendor"
 msgstr ""
 
-#: standalone/harddrake2:56
+#: standalone/harddrake2:59
 #, fuzzy, c-format
 msgid "Sub device ID"
 msgstr "อุปกรณ์"
 
-#: standalone/harddrake2:56
+#: standalone/harddrake2:59
 #, c-format
 msgid "this is the minor numerical identifier of the device"
 msgstr ""
 
-#: standalone/harddrake2:57
+#: standalone/harddrake2:60
 #, fuzzy, c-format
 msgid "Device USB ID"
 msgstr "อุปกรณ์: "
 
-#: standalone/harddrake2:57
+#: standalone/harddrake2:60
 #, c-format
 msgid ".."
 msgstr ""
 
-#: standalone/harddrake2:61
+#: standalone/harddrake2:64
 #, c-format
 msgid "Bogomips"
 msgstr ""
 
-#: standalone/harddrake2:61
+#: standalone/harddrake2:64
 #, c-format
 msgid ""
 "the GNU/Linux kernel needs to run a calculation loop at boot time to "
@@ -20967,53 +21410,53 @@ msgid ""
 "\"benchmark\" the cpu."
 msgstr ""
 
-#: standalone/harddrake2:62
+#: standalone/harddrake2:65
 #, fuzzy, c-format
 msgid "Cache size"
 msgstr "ขนาดของ chunk"
 
-#: standalone/harddrake2:62
+#: standalone/harddrake2:65
 #, 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
+#: standalone/harddrake2:68
 #, c-format
 msgid "Coma bug"
 msgstr ""
 
-#: standalone/harddrake2:65
+#: standalone/harddrake2:68
 #, c-format
 msgid "whether this cpu has the Cyrix 6x86 Coma bug"
 msgstr ""
 
-#: standalone/harddrake2:66
+#: standalone/harddrake2:69
 #, c-format
 msgid "Cpuid family"
 msgstr ""
 
-#: standalone/harddrake2:66
+#: standalone/harddrake2:69
 #, c-format
 msgid "family of the cpu (eg: 6 for i686 class)"
 msgstr ""
 
-#: standalone/harddrake2:67
+#: standalone/harddrake2:70
 #, fuzzy, c-format
 msgid "Cpuid level"
 msgstr "เลือกระดับระบบรักษาความปลอดภัย"
 
-#: standalone/harddrake2:67
+#: standalone/harddrake2:70
 #, c-format
 msgid "information level that can be obtained through the cpuid instruction"
 msgstr ""
 
-#: standalone/harddrake2:68
+#: standalone/harddrake2:71
 #, c-format
 msgid "Frequency (MHz)"
 msgstr ""
 
-#: standalone/harddrake2:68
+#: standalone/harddrake2:71
 #, c-format
 msgid ""
 "the CPU frequency in MHz (Megahertz which in first approximation may be "
@@ -21021,22 +21464,22 @@ msgid ""
 "per second)"
 msgstr ""
 
-#: standalone/harddrake2:69
+#: standalone/harddrake2:72
 #, c-format
 msgid "Flags"
-msgstr ""
+msgstr "แฟล็ก"
 
-#: standalone/harddrake2:69
+#: standalone/harddrake2:72
 #, c-format
 msgid "CPU flags reported by the kernel"
 msgstr ""
 
-#: standalone/harddrake2:70
+#: standalone/harddrake2:73
 #, c-format
 msgid "Fdiv bug"
 msgstr ""
 
-#: standalone/harddrake2:71
+#: standalone/harddrake2:74
 #, c-format
 msgid ""
 "Early Intel Pentium chips manufactured have a bug in their floating point "
@@ -21044,104 +21487,104 @@ msgid ""
 "Floating point DIVision (FDIV)"
 msgstr ""
 
-#: standalone/harddrake2:72
+#: standalone/harddrake2:75
 #, c-format
 msgid "Is FPU present"
 msgstr ""
 
-#: standalone/harddrake2:72
+#: standalone/harddrake2:75
 #, c-format
 msgid "yes means the processor has an arithmetic coprocessor"
 msgstr ""
 
-#: standalone/harddrake2:73
+#: standalone/harddrake2:76
 #, c-format
 msgid "Whether the FPU has an irq vector"
 msgstr ""
 
-#: standalone/harddrake2:73
+#: standalone/harddrake2:76
 #, c-format
 msgid "yes means the arithmetic coprocessor has an exception vector attached"
 msgstr ""
 
-#: standalone/harddrake2:74
+#: standalone/harddrake2:77
 #, c-format
 msgid "F00f bug"
 msgstr ""
 
-#: standalone/harddrake2:74
+#: standalone/harddrake2:77
 #, c-format
 msgid "early pentiums were buggy and freezed when decoding the F00F bytecode"
 msgstr ""
 
-#: standalone/harddrake2:75
+#: standalone/harddrake2:78
 #, c-format
 msgid "Halt bug"
 msgstr ""
 
-#: standalone/harddrake2:76
+#: standalone/harddrake2:79
 #, 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:77
+#: standalone/harddrake2:80
 #, c-format
 msgid "sub generation of the cpu"
 msgstr ""
 
-#: standalone/harddrake2:78
+#: standalone/harddrake2:81
 #, c-format
 msgid "generation of the cpu (eg: 8 for Pentium III, ...)"
 msgstr ""
 
-#: standalone/harddrake2:79
+#: standalone/harddrake2:82
 #, fuzzy, c-format
 msgid "Model name"
 msgstr "ชี่อ module"
 
-#: standalone/harddrake2:79
+#: standalone/harddrake2:82
 #, c-format
 msgid "official vendor name of the cpu"
 msgstr ""
 
-#: standalone/harddrake2:80
+#: standalone/harddrake2:83
 #, c-format
 msgid "the name of the CPU"
 msgstr ""
 
-#: standalone/harddrake2:81
+#: standalone/harddrake2:84
 #, c-format
 msgid "Processor ID"
 msgstr ""
 
-#: standalone/harddrake2:81
+#: standalone/harddrake2:84
 #, c-format
 msgid "the number of the processor"
 msgstr ""
 
-#: standalone/harddrake2:82
+#: standalone/harddrake2:85
 #, fuzzy, c-format
 msgid "Model stepping"
 msgstr "ฟอร์แมต"
 
-#: standalone/harddrake2:82
+#: standalone/harddrake2:85
 #, c-format
 msgid "stepping of the cpu (sub model (generation) number)"
 msgstr ""
 
-#: standalone/harddrake2:83
+#: standalone/harddrake2:86
 #, c-format
 msgid "the vendor name of the processor"
 msgstr ""
 
-#: standalone/harddrake2:84
+#: standalone/harddrake2:87
 #, fuzzy, c-format
 msgid "Write protection"
 msgstr "ใช้ auto detection"
 
-#: standalone/harddrake2:84
+#: standalone/harddrake2:87
 #, c-format
 msgid ""
 "the WP flag in the CR0 register of the cpu enforce write protection at the "
@@ -21149,42 +21592,42 @@ msgid ""
 "accesses to user memory (aka this is a bug guard)"
 msgstr ""
 
-#: standalone/harddrake2:88
+#: standalone/harddrake2:91
 #, fuzzy, c-format
 msgid "Floppy format"
 msgstr "ฟอร์แมต"
 
-#: standalone/harddrake2:88
+#: standalone/harddrake2:91
 #, c-format
 msgid "format of floppies supported by the drive"
 msgstr ""
 
-#: standalone/harddrake2:92
+#: standalone/harddrake2:95
 #, fuzzy, c-format
 msgid "Channel"
 msgstr "ยกเลิก"
 
-#: standalone/harddrake2:92
+#: standalone/harddrake2:95
 #, c-format
 msgid "EIDE/SCSI channel"
 msgstr ""
 
-#: standalone/harddrake2:93
+#: standalone/harddrake2:96
 #, fuzzy, c-format
 msgid "Disk identifier"
 msgstr "เครื่องพิมพ์"
 
-#: standalone/harddrake2:93
+#: standalone/harddrake2:96
 #, c-format
 msgid "usually the disk serial number"
 msgstr ""
 
-#: standalone/harddrake2:94
+#: standalone/harddrake2:97
 #, fuzzy, c-format
 msgid "Logical unit number"
 msgstr "เครื่องพิมพ์โลคอล (ต่อติดกับตัวเครื่อง)"
 
-#: standalone/harddrake2:94
+#: standalone/harddrake2:97
 #, c-format
 msgid ""
 "the SCSI target number (LUN). SCSI devices connected to a host are uniquely "
@@ -21192,245 +21635,291 @@ msgid ""
 "channel number, a target id and a logical unit number"
 msgstr ""
 
-#: standalone/harddrake2:99
+#. -PO: here, "size" is the size of the ram chip (eg: 128Mo, 256Mo, ...)
+#: standalone/harddrake2:104
+#, fuzzy, c-format
+msgid "Installed size"
+msgstr "ติดตั้งระบบ"
+
+#: standalone/harddrake2:104
+#, c-format
+msgid "Installed size of the memory bank"
+msgstr ""
+
+#: standalone/harddrake2:105
+#, fuzzy, c-format
+msgid "Enabled Size"
+msgstr "enable"
+
+#: standalone/harddrake2:105
+#, c-format
+msgid "Enabled size of the memory bank"
+msgstr ""
+
+#: standalone/harddrake2:106
+#, fuzzy, c-format
+msgid "type of the memory device"
+msgstr "ชื่อเครื่องพิมพ์"
+
+#: standalone/harddrake2:107
+#, c-format
+msgid "Speed"
+msgstr "ความเร็ว"
+
+#: standalone/harddrake2:107
+#, c-format
+msgid "Speed of the memory bank"
+msgstr ""
+
+#: standalone/harddrake2:108
+#, fuzzy, c-format
+msgid "Bank connections"
+msgstr "cable connection"
+
+#: standalone/harddrake2:109
+#, c-format
+msgid "Socket designation of the memory bank"
+msgstr ""
+
+#: standalone/harddrake2:113
 #, fuzzy, c-format
 msgid "Device file"
 msgstr "เลือกไฟล์"
 
-#: standalone/harddrake2:99
+#: standalone/harddrake2:113
 #, c-format
 msgid ""
 "the device file used to communicate with the kernel driver for the mouse"
 msgstr ""
 
-#: standalone/harddrake2:100
+#: standalone/harddrake2:114
 #, c-format
 msgid "Emulated wheel"
 msgstr ""
 
-#: standalone/harddrake2:100
+#: standalone/harddrake2:114
 #, fuzzy, c-format
 msgid "whether the wheel is emulated or not"
 msgstr "Logitech MouseMan"
 
-#: standalone/harddrake2:101
+#: standalone/harddrake2:115
 #, fuzzy, c-format
 msgid "the type of the mouse"
 msgstr "กรุณาทดสอบเม้าส์"
 
-#: standalone/harddrake2:102
+#: standalone/harddrake2:116
 #, fuzzy, c-format
 msgid "the name of the mouse"
 msgstr "2 buttons"
 
-#: standalone/harddrake2:103
+#: standalone/harddrake2:117
 #, fuzzy, c-format
 msgid "Number of buttons"
 msgstr "2 buttons"
 
-#: standalone/harddrake2:103
+#: standalone/harddrake2:117
 #, fuzzy, c-format
 msgid "the number of buttons the mouse has"
 msgstr "2 buttons"
 
-#: standalone/harddrake2:104
+#: standalone/harddrake2:118
 #, fuzzy, c-format
 msgid "the type of bus on which the mouse is connected"
 msgstr "เม้าส์ของคุณต่อเข้ากับพอร์ตอนุกรมใด"
 
-#: standalone/harddrake2:105
+#: standalone/harddrake2:119
 #, c-format
 msgid "Mouse protocol used by X11"
 msgstr ""
 
-#: standalone/harddrake2:105
+#: standalone/harddrake2:119
 #, c-format
 msgid "the protocol that the graphical desktop use with the mouse"
 msgstr ""
 
-#: standalone/harddrake2:112 standalone/harddrake2:121
-#: standalone/harddrake2:128 standalone/harddrake2:136
-#: standalone/harddrake2:309
+#: standalone/harddrake2:126 standalone/harddrake2:135
+#: standalone/harddrake2:142 standalone/harddrake2:150
+#: standalone/harddrake2:316
 #, fuzzy, c-format
 msgid "Identification"
 msgstr "การตรวจสอบสิทธิ์การใช้งาน"
 
-#: standalone/harddrake2:113 standalone/harddrake2:129
-#, fuzzy, c-format
+#: standalone/harddrake2:127 standalone/harddrake2:143
+#, c-format
 msgid "Connection"
-msgstr "ชื่อการเชื่อมต่อ"
+msgstr "การเชื่อมต่อ"
 
-#: standalone/harddrake2:122
+#: standalone/harddrake2:136
 #, fuzzy, c-format
 msgid "Performances"
 msgstr "ข้อกำหนด: "
 
-#: standalone/harddrake2:123
+#: standalone/harddrake2:137
 #, fuzzy, c-format
 msgid "Bugs"
 msgstr "สิงหาคม"
 
-#: standalone/harddrake2:124
+#: standalone/harddrake2:138
 #, c-format
 msgid "FPU"
 msgstr ""
 
-#: standalone/harddrake2:132
-#, fuzzy, c-format
+#: standalone/harddrake2:146
+#, c-format
 msgid "Partitions"
-msgstr "พาร์ติชั่น %s"
+msgstr "พาร์ติชัน"
 
-#: standalone/harddrake2:137
+#: standalone/harddrake2:151
 #, c-format
 msgid "Features"
-msgstr ""
+msgstr "คุณสมบัติ"
 
 #. -PO: please keep all "/" characters !!!
-#: standalone/harddrake2:158 standalone/logdrake:77
-#: standalone/printerdrake:152 standalone/printerdrake:165
+#: standalone/harddrake2:174 standalone/logdrake:77
+#: standalone/printerdrake:134 standalone/printerdrake:147
 #, c-format
 msgid "/_Options"
 msgstr "/_อ็อปชั่น"
 
-#: standalone/harddrake2:159 standalone/harddrake2:180 standalone/logdrake:79
-#: standalone/printerdrake:177 standalone/printerdrake:178
-#: standalone/printerdrake:179 standalone/printerdrake:180
+#: standalone/harddrake2:175 standalone/harddrake2:197 standalone/logdrake:79
+#: standalone/printerdrake:159 standalone/printerdrake:161
+#: standalone/printerdrake:164 standalone/printerdrake:166
 #, c-format
 msgid "/_Help"
 msgstr "/_ช่วยเหลือ"
 
-#: standalone/harddrake2:163
+#: standalone/harddrake2:179
 #, fuzzy, c-format
 msgid "/Autodetect _printers"
 msgstr "ใช้ auto detection"
 
-#: standalone/harddrake2:164
+#: standalone/harddrake2:180
 #, fuzzy, c-format
 msgid "/Autodetect _modems"
 msgstr "ใช้ auto detection"
 
-#: standalone/harddrake2:165
+#: standalone/harddrake2:181
 #, fuzzy, c-format
 msgid "/Autodetect _jaz drives"
 msgstr "ใช้ auto detection"
 
-#: standalone/harddrake2:172 standalone/printerdrake:158
+#: standalone/harddrake2:188 standalone/printerdrake:140
 #, c-format
 msgid "/_Quit"
 msgstr "/_ออก"
 
-#: standalone/harddrake2:181
+#: standalone/harddrake2:199
 #, fuzzy, c-format
 msgid "/_Fields description"
 msgstr "รายละเอียด"
 
-#: standalone/harddrake2:183
+#: standalone/harddrake2:201
 #, c-format
 msgid "Harddrake help"
 msgstr ""
 
-#: standalone/harddrake2:192
+#: standalone/harddrake2:210
 #, 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:197 standalone/printerdrake:179
+#: standalone/harddrake2:216 standalone/printerdrake:164
 #, c-format
 msgid "/_Report Bug"
 msgstr "/_แจ้ง Bug"
 
-#: standalone/harddrake2:198 standalone/printerdrake:180
+#: standalone/harddrake2:218 standalone/printerdrake:166
 #, c-format
 msgid "/_About..."
 msgstr "/_เกี่ยวกับ..."
 
-#: standalone/harddrake2:199
+#: standalone/harddrake2:219
 #, c-format
 msgid "About Harddrake"
 msgstr ""
 
 #. -PO: Do not alter the <span ..> and </span> tags
-#: standalone/harddrake2:201
+#: standalone/harddrake2:221
 #, c-format
 msgid ""
-"This is HardDrake, a Mandrakelinux hardware configuration tool.\n"
+"This is HardDrake, a %s 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:218
+#: standalone/harddrake2:238
 #, fuzzy, c-format
 msgid "Harddrake2"
 msgstr "ฮาร์ดแวร์"
 
-#: standalone/harddrake2:234
+#: standalone/harddrake2:253
 #, fuzzy, c-format
 msgid "Detected hardware"
 msgstr "อ่านต่อข้อมูลของฮาร์ดแวร์"
 
-#: standalone/harddrake2:239
+#: standalone/harddrake2:258
 #, fuzzy, c-format
 msgid "Configure module"
 msgstr "คอนฟิกเม้าส์"
 
-#: standalone/harddrake2:246
+#: standalone/harddrake2:265
 #, c-format
 msgid "Run config tool"
 msgstr ""
 
-#: standalone/harddrake2:296 standalone/net_monitor:108
+#: standalone/harddrake2:303 standalone/net_monitor:108
 #: standalone/net_monitor:109 standalone/net_monitor:114
 #, c-format
 msgid "unknown"
-msgstr ""
+msgstr "ไม่รู้จัก"
 
-#: standalone/harddrake2:297 standalone/printerdrake:308
-#: standalone/printerdrake:346
-#, fuzzy, c-format
+#: standalone/harddrake2:304 standalone/printerdrake:298
+#: standalone/printerdrake:336
+#, c-format
 msgid "Unknown"
-msgstr "Generic"
+msgstr "ไม่รู้จัก"
 
-#: standalone/harddrake2:317
-#, fuzzy, c-format
+#: standalone/harddrake2:324
+#, c-format
 msgid "Misc"
-msgstr "Mouse"
+msgstr "เบ็ดเตล็ด"
 
-#: standalone/harddrake2:332
+#: standalone/harddrake2:339
 #, c-format
 msgid ""
 "Click on a device in the left tree in order to display its information here."
 msgstr ""
 
-#: standalone/harddrake2:384
+#: standalone/harddrake2:391
 #, fuzzy, c-format
 msgid "secondary"
 msgstr "%d วินาที"
 
-#: standalone/harddrake2:384
+#: standalone/harddrake2:391
 #, c-format
 msgid "primary"
 msgstr ""
 
-#: standalone/harddrake2:388
+#: standalone/harddrake2:395
 #, fuzzy, c-format
 msgid "burner"
 msgstr "เครื่องพิมพ์"
 
-#: standalone/harddrake2:388
+#: standalone/harddrake2:395
 #, c-format
 msgid "DVD"
 msgstr "ดีวีดี"
 
-#: standalone/keyboarddrake:25
+#: standalone/keyboarddrake:29
 #, c-format
 msgid "Please, choose your keyboard layout."
 msgstr "คุณต้องการเลือกคีย์บอร์ดเลย์เอ้าท์แบบใด "
 
-#: standalone/keyboarddrake:34
+#: standalone/keyboarddrake:45
 #, c-format
 msgid "Do you want the BackSpace to return Delete in console?"
 msgstr ""
@@ -21735,53 +22224,138 @@ msgstr "Mouse Systems"
 msgid "Please test your mouse:"
 msgstr "กรุณาทดสอบเม้าส์"
 
-#: standalone/net_applet:30
+#: standalone/net_applet:34
 #, 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
+#: standalone/net_applet:42
 #, fuzzy, c-format
 msgid "Network is down on interface %s. Click on \"Configure Network\""
 msgstr "ไม่มีการคอนฟิกจอภาพ"
 
-#: standalone/net_applet:53 standalone/net_monitor:471
+#: standalone/net_applet:57 standalone/net_monitor:473
 #, fuzzy, c-format
 msgid "Connect %s"
 msgstr "เชื่อมต่ออยู่"
 
-#: standalone/net_applet:54 standalone/net_monitor:471
+#: standalone/net_applet:58 standalone/net_monitor:473
 #, fuzzy, c-format
 msgid "Disconnect %s"
 msgstr "ยกเลิกติดต่อ..."
 
-#: standalone/net_applet:55
+#: standalone/net_applet:59
 #, fuzzy, c-format
 msgid "Monitor Network"
 msgstr "เรียกคืนจากไฟล์"
 
-#: standalone/net_applet:56
+#: standalone/net_applet:60
 #, 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
+#: standalone/net_applet:61 standalone/printerdrake:238
+#, c-format
 msgid "Refresh"
-msgstr "ไม่ยอมรับ"
+msgstr "อ่านค่าใหม่"
 
-#: standalone/net_applet:58
+#: standalone/net_applet:62
 #, c-format
 msgid "Get Online Help"
 msgstr ""
 
-#: standalone/net_applet:158
+#: standalone/net_applet:177
+#, fuzzy, c-format
+msgid "Interactive intrusion detection"
+msgstr "โปรแกรมวาดภาพฟังชั่น"
+
+#: standalone/net_applet:181
 #, c-format
 msgid "Always launch on startup"
 msgstr ""
 
+#: standalone/net_applet:230
+#, c-format
+msgid "A port scanning attack has been attempted by %s."
+msgstr ""
+
+#: standalone/net_applet:231
+#, c-format
+msgid "The %s service has been attacked by %s."
+msgstr ""
+
+#: standalone/net_applet:232
+#, c-format
+msgid "A password cracking attack has been attempted by %s."
+msgstr ""
+
+#: standalone/net_applet:240
+#, fuzzy, c-format
+msgid "Active Firewall: intrusion detected"
+msgstr "ตรวจพบคอนฟิกของ Firewall"
+
+#: standalone/net_applet:251
+#, fuzzy, c-format
+msgid "Do you want to blacklist the attacker?"
+msgstr "จะเริ่มใช้แป้นเหนียวไหม?"
+
+#: standalone/net_applet:265
+#, c-format
+msgid "Always blacklist (do not ask again)"
+msgstr ""
+
+#: standalone/net_applet:268
+#, fuzzy, c-format
+msgid "Attack details"
+msgstr "รายละเอียด"
+
+#: standalone/net_applet:272
+#, fuzzy, c-format
+msgid "Attack time: %s"
+msgstr "ปฏิบัติการ: %s"
+
+#: standalone/net_applet:273
+#, fuzzy, c-format
+msgid "Network interface: %s"
+msgstr "แผงวงจรระบบเครือข่าย"
+
+#: standalone/net_applet:274
+#, fuzzy, c-format
+msgid "Attack type: %s"
+msgstr "ประเภท: "
+
+#: standalone/net_applet:275
+#, fuzzy, c-format
+msgid "Protocol: %s"
+msgstr "โปรโตคอล"
+
+#: standalone/net_applet:276
+#, fuzzy, c-format
+msgid "Attacker IP address: %s"
+msgstr "ที่อยู่ไอพีตายตัว"
+
+#: standalone/net_applet:277
+#, fuzzy, c-format
+msgid "Attacker hostname: %s"
+msgstr "ไม่สามารถอ่านชื่อโฮสต์: %s\n"
+
+#: standalone/net_applet:278
+#, fuzzy, c-format
+msgid "Service attacked: %s"
+msgstr "ชนิด_บริการ:"
+
+#: standalone/net_applet:279
+#, fuzzy, c-format
+msgid "Port attacked: %s"
+msgstr "Port"
+
+#: standalone/net_applet:280
+#, c-format
+msgid "Type of ICMP attack: %s"
+msgstr ""
+
 #: standalone/net_monitor:61 standalone/net_monitor:66
 #, fuzzy, c-format
 msgid "Network Monitoring"
@@ -21800,7 +22374,7 @@ msgstr ""
 #: standalone/net_monitor:107
 #, c-format
 msgid "Average"
-msgstr ""
+msgstr "ค่าเฉลี่ย"
 
 #: standalone/net_monitor:108
 #, fuzzy, c-format
@@ -21865,197 +22439,193 @@ msgid ""
 "Verify your configuration in the Mandrakelinux Control Center."
 msgstr ""
 
-#: standalone/net_monitor:341
+#: standalone/net_monitor:340
 #, fuzzy, c-format
 msgid "Color configuration"
 msgstr "การคอนฟิก"
 
-#: standalone/net_monitor:389 standalone/net_monitor:409
+#: standalone/net_monitor:388 standalone/net_monitor:408
 #, c-format
 msgid "sent: "
 msgstr ""
 
-#: standalone/net_monitor:396 standalone/net_monitor:413
+#: standalone/net_monitor:395 standalone/net_monitor:412
 #, c-format
 msgid "received: "
 msgstr ""
 
-#: standalone/net_monitor:403
+#: standalone/net_monitor:402
 #, c-format
 msgid "average"
 msgstr ""
 
-#: standalone/net_monitor:406
+#: standalone/net_monitor:405
 #, fuzzy, c-format
 msgid "Local measure"
 msgstr "เครื่องพิมพ์โลคอล (ต่อติดกับตัวเครื่อง)"
 
-#: standalone/net_monitor:464
+#: standalone/net_monitor:466
 #, c-format
 msgid ""
 "Warning, another internet connection has been detected, maybe using your "
 "network"
 msgstr ""
 
-#: standalone/net_monitor:475
+#: standalone/net_monitor:477
 #, fuzzy, c-format
 msgid "No internet connection configured"
 msgstr "การปรับแต่งการติดต่อเข้า internet"
 
-#: standalone/printerdrake:69
-#, fuzzy, c-format
-msgid "Loading printer configuration... Please wait"
-msgstr "การคอนฟิก Internet"
-
-#: standalone/printerdrake:85
+#: standalone/printerdrake:68
 #, fuzzy, c-format
 msgid "Reading data of installed printers..."
 msgstr "เครื่องพิมพ์โลคอล (ต่อติดกับตัวเครื่อง)"
 
-#: standalone/printerdrake:134
+#: standalone/printerdrake:116
 #, fuzzy, c-format
 msgid "%s Printer Management Tool"
 msgstr "ไม่มีเครื่องพิมพ์"
 
-#: standalone/printerdrake:148 standalone/printerdrake:149
-#: standalone/printerdrake:150 standalone/printerdrake:151
-#: standalone/printerdrake:159 standalone/printerdrake:160
-#: standalone/printerdrake:164
+#: standalone/printerdrake:130 standalone/printerdrake:131
+#: standalone/printerdrake:132 standalone/printerdrake:133
+#: standalone/printerdrake:141 standalone/printerdrake:142
+#: standalone/printerdrake:146
 #, c-format
 msgid "/_Actions"
-msgstr ""
+msgstr "/_แบบการทำงาน"
 
-#: standalone/printerdrake:148 standalone/printerdrake:160
+#: standalone/printerdrake:130 standalone/printerdrake:142
 #, fuzzy, c-format
 msgid "/_Add Printer"
 msgstr "เครื่องพิมพ์"
 
-#: standalone/printerdrake:149
+#: standalone/printerdrake:131
 #, fuzzy, c-format
 msgid "/Set as _Default"
 msgstr " (Default)"
 
-#: standalone/printerdrake:150
+#: standalone/printerdrake:132
 #, c-format
 msgid "/_Edit"
 msgstr "/แ_ก้ไข"
 
-#: standalone/printerdrake:151
+#: standalone/printerdrake:133
 #, c-format
 msgid "/_Delete"
 msgstr "/_ลบ"
 
-#: standalone/printerdrake:152
+#: standalone/printerdrake:134
 #, c-format
 msgid "/_Expert mode"
 msgstr "/โหมดผู้เชี่ยวชาญ"
 
-#: standalone/printerdrake:157
+#: standalone/printerdrake:139
 #, c-format
 msgid "/_Refresh"
 msgstr "/เ_รยกใหม"
 
-#: standalone/printerdrake:164
+#: standalone/printerdrake:146
 #, c-format
 msgid "/_Configure CUPS"
 msgstr "/_คอนฟิกระบบ CUPS"
 
-#: standalone/printerdrake:197
-#, fuzzy, c-format
+#: standalone/printerdrake:181
+#, c-format
 msgid "Search:"
-msgstr "ค้นหา"
+msgstr "ค้นหา:"
 
-#: standalone/printerdrake:200
+#: standalone/printerdrake:184
 #, c-format
 msgid "Apply filter"
-msgstr ""
+msgstr "ใช้ตัวกรอง"
 
-#: standalone/printerdrake:218 standalone/printerdrake:225
+#: standalone/printerdrake:211 standalone/printerdrake:218
 #, c-format
 msgid "Def."
 msgstr ""
 
-#: standalone/printerdrake:218 standalone/printerdrake:225
-#, fuzzy, c-format
+#: standalone/printerdrake:211 standalone/printerdrake:218
+#, c-format
 msgid "Printer Name"
-msgstr "ชื่อพรินต์คิว"
+msgstr "ชื่อเครื่องพิมพ์"
 
-#: standalone/printerdrake:218
-#, fuzzy, c-format
+#: standalone/printerdrake:211
+#, c-format
 msgid "Connection Type"
-msgstr "ชนิดการเชื่อมต่อ"
+msgstr "ประเภทของการเชื่อมต่อ"
 
-#: standalone/printerdrake:225
-#, fuzzy, c-format
+#: standalone/printerdrake:218
+#, c-format
 msgid "Server Name"
-msgstr "เซิร์ฟเวอร์"
+msgstr "ชื่อเซิร์ฟเวอร์"
 
 #. -PO: "Add Printer" is a button text and the translation has to be AS SHORT AS POSSIBLE
-#: standalone/printerdrake:233
+#: standalone/printerdrake:226
 #, fuzzy, c-format
 msgid "Add Printer"
 msgstr "เครื่องพิมพ์"
 
-#: standalone/printerdrake:233
+#: standalone/printerdrake:226
 #, 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:236
+#: standalone/printerdrake:229
 #, fuzzy, c-format
 msgid "Set as default"
 msgstr "default"
 
-#: standalone/printerdrake:236
+#: standalone/printerdrake:229
 #, fuzzy, c-format
 msgid "Set selected printer as the default printer"
 msgstr "คุณต้องการพิมพ์ทดสอบหรือไม่?"
 
-#: standalone/printerdrake:239
+#: standalone/printerdrake:232
 #, fuzzy, c-format
 msgid "Edit selected printer"
 msgstr "ค้นพบ %s"
 
-#: standalone/printerdrake:242
+#: standalone/printerdrake:235
 #, fuzzy, c-format
 msgid "Delete selected printer"
 msgstr "ลบคิว"
 
-#: standalone/printerdrake:245
-#, fuzzy, c-format
+#: standalone/printerdrake:238
+#, c-format
 msgid "Refresh the list"
-msgstr "ฟอร์แมต loopback file %s"
+msgstr "อ่านค่ารายการใหม่"
 
 #. -PO: "Configure CUPS" is a button text and the translation has to be AS SHORT AS POSSIBLE
-#: standalone/printerdrake:248
+#: standalone/printerdrake:241
 #, fuzzy, c-format
 msgid "Configure CUPS"
 msgstr "คอนฟิกระบบ X"
 
-#: standalone/printerdrake:248
+#: standalone/printerdrake:241
 #, fuzzy, c-format
 msgid "Configure CUPS printing system"
 msgstr "คอนฟิกระบบเน็ตเวิร์ก"
 
-#: standalone/printerdrake:309 standalone/printerdrake:347
-#, fuzzy, c-format
+#: standalone/printerdrake:299 standalone/printerdrake:337
+#, c-format
 msgid "Enabled"
-msgstr "enable"
+msgstr "เปิดใช้งาน"
 
-#: standalone/printerdrake:310 standalone/printerdrake:348
-#, fuzzy, c-format
+#: standalone/printerdrake:300 standalone/printerdrake:338
+#, c-format
 msgid "Disabled"
-msgstr "disable"
+msgstr "ไม่ใช้"
 
-#: standalone/printerdrake:572
+#: standalone/printerdrake:560
 #, c-format
 msgid "Authors: "
 msgstr "ผู้แต่ง:  "
 
-#: standalone/printerdrake:578
+#. -PO: here %s is the version number
+#: standalone/printerdrake:570
 #, fuzzy, c-format
-msgid "Printer Management \n"
+msgid "Printer Management %s"
 msgstr "ไม่มีเครื่องพิมพ์"
 
 #: standalone/scannerdrake:51
@@ -22084,22 +22654,22 @@ msgstr ""
 msgid "Scannerdrake will not be started now."
 msgstr ""
 
-#: standalone/scannerdrake:67 standalone/scannerdrake:460
+#: standalone/scannerdrake:67 standalone/scannerdrake:491
 #, fuzzy, c-format
 msgid "Searching for configured scanners..."
 msgstr "เครื่องพิมพ์โลคอล (ต่อติดกับตัวเครื่อง)"
 
-#: standalone/scannerdrake:71 standalone/scannerdrake:464
+#: standalone/scannerdrake:71 standalone/scannerdrake:495
 #, fuzzy, c-format
 msgid "Searching for new scanners..."
 msgstr "เครื่องพิมพ์โลคอล (ต่อติดกับตัวเครื่อง)"
 
-#: standalone/scannerdrake:79 standalone/scannerdrake:486
+#: standalone/scannerdrake:79 standalone/scannerdrake:517
 #, c-format
 msgid "Re-generating list of configured scanners..."
 msgstr ""
 
-#: standalone/scannerdrake:101 standalone/scannerdrake:142
+#: standalone/scannerdrake:101
 #, c-format
 msgid "The %s is not supported by this version of %s."
 msgstr ""
@@ -22122,7 +22692,7 @@ msgstr "เลือกกราฟฟิคการ์ด"
 #: standalone/scannerdrake:132
 #, c-format
 msgid " ("
-msgstr ""
+msgstr " ("
 
 #: standalone/scannerdrake:133
 #, fuzzy, c-format
@@ -22134,132 +22704,194 @@ msgstr "ค้นพบ %s"
 msgid "Port: %s"
 msgstr "Port"
 
-#: standalone/scannerdrake:165 standalone/scannerdrake:179
+#: standalone/scannerdrake:138 standalone/scannerdrake:141
+#, c-format
+msgid " (UNSUPPORTED)"
+msgstr ""
+
+#: standalone/scannerdrake:144
+#, fuzzy, c-format
+msgid "The %s is not supported under Linux."
+msgstr "หน้าต่าง \"%s\" ไม่ตอบสนอง"
+
+#: standalone/scannerdrake:171 standalone/scannerdrake:185
 #, c-format
 msgid "Do not install firmware file"
 msgstr ""
 
-#: standalone/scannerdrake:169 standalone/scannerdrake:221
+#: standalone/scannerdrake:175 standalone/scannerdrake:227
 #, c-format
 msgid ""
 "It is possible that your %s needs its firmware to be uploaded everytime when "
 "it is turned on."
 msgstr ""
 
-#: standalone/scannerdrake:170 standalone/scannerdrake:222
+#: standalone/scannerdrake:176 standalone/scannerdrake:228
 #, c-format
 msgid "If this is the case, you can make this be done automatically."
 msgstr ""
 
-#: standalone/scannerdrake:171 standalone/scannerdrake:225
+#: standalone/scannerdrake:177 standalone/scannerdrake:231
 #, 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:172 standalone/scannerdrake:226
+#: standalone/scannerdrake:178 standalone/scannerdrake:232
 #, 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:174 standalone/scannerdrake:233
+#: standalone/scannerdrake:180 standalone/scannerdrake:239
 #, c-format
 msgid "Install firmware file from"
 msgstr ""
 
-#: standalone/scannerdrake:194
+#: standalone/scannerdrake:200
 #, fuzzy, c-format
 msgid "Select firmware file"
 msgstr "เลือกไฟล์"
 
-#: standalone/scannerdrake:197 standalone/scannerdrake:256
+#: standalone/scannerdrake:203 standalone/scannerdrake:262
 #, c-format
 msgid "The firmware file %s does not exist or is unreadable!"
 msgstr ""
 
-#: standalone/scannerdrake:220
+#: standalone/scannerdrake:226
 #, c-format
 msgid ""
 "It is possible that your scanners need their firmware to be uploaded "
 "everytime when they are turned on."
 msgstr ""
 
-#: standalone/scannerdrake:224
+#: standalone/scannerdrake:230
 #, 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:227
+#: standalone/scannerdrake:233
 #, 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:229
+#: standalone/scannerdrake:235
 #, c-format
 msgid "Install firmware for the"
 msgstr ""
 
-#: standalone/scannerdrake:252
+#: standalone/scannerdrake:258
 #, fuzzy, c-format
 msgid "Select firmware file for the %s"
 msgstr "เลือกไฟล์"
 
-#: standalone/scannerdrake:270
+#: standalone/scannerdrake:276
 #, fuzzy, c-format
 msgid "Could not install the firmware file for the %s!"
 msgstr "เลือกไฟล์"
 
-#: standalone/scannerdrake:283
+#: standalone/scannerdrake:289
 #, c-format
 msgid "The firmware file for your %s was successfully installed."
 msgstr ""
 
-#: standalone/scannerdrake:293
+#: standalone/scannerdrake:299
 #, c-format
 msgid "The %s is unsupported"
 msgstr ""
 
-#: standalone/scannerdrake:298
+#: standalone/scannerdrake:304
 #, 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:302 standalone/scannerdrake:309
-#: standalone/scannerdrake:339
+#: standalone/scannerdrake:308 standalone/scannerdrake:315
+#: standalone/scannerdrake:345
 #, fuzzy, c-format
 msgid "Auto-detect available ports"
 msgstr "ใช้ auto detection"
 
-#: standalone/scannerdrake:304 standalone/scannerdrake:350
+#: standalone/scannerdrake:310 standalone/scannerdrake:356
 #, c-format
 msgid "Please select the device where your %s is attached"
 msgstr ""
 
-#: standalone/scannerdrake:305
+#: standalone/scannerdrake:311
 #, c-format
 msgid "(Note: Parallel ports cannot be auto-detected)"
 msgstr ""
 
-#: standalone/scannerdrake:307 standalone/scannerdrake:352
+#: standalone/scannerdrake:313 standalone/scannerdrake:358
 #, fuzzy, c-format
 msgid "choose device"
 msgstr "อุปกรณ์บูต"
 
-#: standalone/scannerdrake:341
+#: standalone/scannerdrake:347
 #, fuzzy, c-format
 msgid "Searching for scanners..."
 msgstr "เครื่องพิมพ์โลคอล (ต่อติดกับตัวเครื่อง)"
 
-#: standalone/scannerdrake:376
+#: standalone/scannerdrake:383
+#, fuzzy, c-format
+msgid "Setting up kernel modules..."
+msgstr "ลบทิ้ง 1 module"
+
+#: standalone/scannerdrake:390 standalone/scannerdrake:397
+#, fuzzy, c-format
+msgid "Attention!"
+msgstr "ดึงดูดใจ"
+
+#: standalone/scannerdrake:391
+#, c-format
+msgid ""
+"Your %s cannot be configured fully automatically.\n"
+"\n"
+"Manual adjustments are required. Please edit the configuration file /etc/"
+"sane.d/%s.conf. "
+msgstr ""
+
+#: standalone/scannerdrake:392 standalone/scannerdrake:401
+#, c-format
+msgid ""
+"More info in the driver's manual page. Run the command \"man sane-%s\" to "
+"read it."
+msgstr ""
+
+#: standalone/scannerdrake:394 standalone/scannerdrake:403
+#, c-format
+msgid ""
+"After that you may scan documents using \"XSane\" or \"Kooka\" from "
+"Multimedia/Graphics in the applications menu."
+msgstr ""
+
+#: standalone/scannerdrake:398
+#, c-format
+msgid ""
+"Your %s has been configured, but it is possible that additional manual "
+"adjustments are needed to get it to work. "
+msgstr ""
+
+#: standalone/scannerdrake:399
+#, c-format
+msgid ""
+"If it does not appear in the list of configured scanners in the main window "
+"of Scannerdrake or if it does not work correctly, "
+msgstr ""
+
+#: standalone/scannerdrake:400
+#, c-format
+msgid "edit the configuration file /etc/sane.d/%s.conf. "
+msgstr ""
+
+#: standalone/scannerdrake:406
 #, c-format
 msgid ""
 "Your %s has been configured.\n"
@@ -22267,7 +22899,7 @@ msgid ""
 "Graphics in the applications menu."
 msgstr ""
 
-#: standalone/scannerdrake:400
+#: standalone/scannerdrake:431
 #, fuzzy, c-format
 msgid ""
 "The following scanners\n"
@@ -22276,7 +22908,7 @@ msgid ""
 "are available on your system.\n"
 msgstr "ไม่มีอุปกรณ์ Network บนเครื่องคุณ"
 
-#: standalone/scannerdrake:401
+#: standalone/scannerdrake:432
 #, fuzzy, c-format
 msgid ""
 "The following scanner\n"
@@ -22285,137 +22917,137 @@ msgid ""
 "is available on your system.\n"
 msgstr "ไม่มีอุปกรณ์ Network บนเครื่องคุณ"
 
-#: standalone/scannerdrake:404 standalone/scannerdrake:407
+#: standalone/scannerdrake:435 standalone/scannerdrake:438
 #, c-format
 msgid "There are no scanners found which are available on your system.\n"
 msgstr ""
 
-#: standalone/scannerdrake:421
+#: standalone/scannerdrake:452
 #, fuzzy, c-format
 msgid "Search for new scanners"
 msgstr "เครื่องพิมพ์โลคอล (ต่อติดกับตัวเครื่อง)"
 
-#: standalone/scannerdrake:427
+#: standalone/scannerdrake:458
 #, c-format
 msgid "Add a scanner manually"
 msgstr ""
 
-#: standalone/scannerdrake:434
+#: standalone/scannerdrake:465
 #, fuzzy, c-format
 msgid "Install/Update firmware files"
 msgstr "เลือกไฟล์"
 
-#: standalone/scannerdrake:440
+#: standalone/scannerdrake:471
 #, fuzzy, c-format
 msgid "Scanner sharing"
 msgstr "เครื่องพิมพ์"
 
-#: standalone/scannerdrake:499 standalone/scannerdrake:664
+#: standalone/scannerdrake:530 standalone/scannerdrake:695
 #, fuzzy, c-format
 msgid "All remote machines"
 msgstr "เครื่องพิมพ์แบบรีโมท"
 
-#: standalone/scannerdrake:511 standalone/scannerdrake:814
+#: standalone/scannerdrake:542 standalone/scannerdrake:845
 #, fuzzy, c-format
 msgid "This machine"
 msgstr "matching"
 
-#: standalone/scannerdrake:551
+#: standalone/scannerdrake:582
 #, 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:552
+#: standalone/scannerdrake:583
 #, c-format
 msgid ""
 "You can also decide here whether scanners on remote machines should be made "
 "available on this machine."
 msgstr ""
 
-#: standalone/scannerdrake:555
+#: standalone/scannerdrake:586
 #, c-format
 msgid "The scanners on this machine are available to other computers"
 msgstr ""
 
-#: standalone/scannerdrake:557
+#: standalone/scannerdrake:588
 #, fuzzy, c-format
 msgid "Scanner sharing to hosts: "
 msgstr "เครื่องพิมพ์"
 
-#: standalone/scannerdrake:571
+#: standalone/scannerdrake:602
 #, c-format
 msgid "Use scanners on remote computers"
 msgstr ""
 
-#: standalone/scannerdrake:574
+#: standalone/scannerdrake:605
 #, c-format
 msgid "Use the scanners on hosts: "
 msgstr ""
 
-#: standalone/scannerdrake:601 standalone/scannerdrake:673
-#: standalone/scannerdrake:823
+#: standalone/scannerdrake:632 standalone/scannerdrake:704
+#: standalone/scannerdrake:854
 #, fuzzy, c-format
 msgid "Sharing of local scanners"
 msgstr "เครื่องพิมพ์โลคอล (ต่อติดกับตัวเครื่อง)"
 
-#: standalone/scannerdrake:602
+#: standalone/scannerdrake:633
 #, c-format
 msgid ""
 "These are the machines on which the locally connected scanner(s) should be "
 "available:"
 msgstr ""
 
-#: standalone/scannerdrake:613 standalone/scannerdrake:763
+#: standalone/scannerdrake:644 standalone/scannerdrake:794
 #, fuzzy, c-format
 msgid "Add host"
 msgstr "เพิ่มผู้ใช้"
 
-#: standalone/scannerdrake:619 standalone/scannerdrake:769
+#: standalone/scannerdrake:650 standalone/scannerdrake:800
 #, fuzzy, c-format
 msgid "Edit selected host"
 msgstr "ค้นพบ %s"
 
-#: standalone/scannerdrake:628 standalone/scannerdrake:778
+#: standalone/scannerdrake:659 standalone/scannerdrake:809
 #, fuzzy, c-format
 msgid "Remove selected host"
 msgstr "ลบคิว"
 
-#: standalone/scannerdrake:652 standalone/scannerdrake:660
-#: standalone/scannerdrake:665 standalone/scannerdrake:711
-#: standalone/scannerdrake:802 standalone/scannerdrake:810
-#: standalone/scannerdrake:815 standalone/scannerdrake:861
+#: standalone/scannerdrake:683 standalone/scannerdrake:691
+#: standalone/scannerdrake:696 standalone/scannerdrake:742
+#: standalone/scannerdrake:833 standalone/scannerdrake:841
+#: standalone/scannerdrake:846 standalone/scannerdrake:892
 #, c-format
 msgid "Name/IP address of host:"
 msgstr ""
 
-#: standalone/scannerdrake:674 standalone/scannerdrake:824
+#: standalone/scannerdrake:705 standalone/scannerdrake:855
 #, c-format
 msgid "Choose the host on which the local scanners should be made available:"
 msgstr ""
 
-#: standalone/scannerdrake:685 standalone/scannerdrake:835
+#: standalone/scannerdrake:716 standalone/scannerdrake:866
 #, fuzzy, c-format
 msgid "You must enter a host name or an IP address.\n"
 msgstr "กรุณาทดสอบเม้าส์"
 
-#: standalone/scannerdrake:696 standalone/scannerdrake:846
+#: standalone/scannerdrake:727 standalone/scannerdrake:877
 #, c-format
 msgid "This host is already in the list, it cannot be added again.\n"
 msgstr ""
 
-#: standalone/scannerdrake:751
+#: standalone/scannerdrake:782
 #, fuzzy, c-format
 msgid "Usage of remote scanners"
 msgstr "ใช้พื้นที่ที่ว่าง"
 
-#: standalone/scannerdrake:752
+#: standalone/scannerdrake:783
 #, c-format
 msgid "These are the machines from which the scanners should be used:"
 msgstr ""
 
-#: standalone/scannerdrake:909
+#: standalone/scannerdrake:940
 #, fuzzy, c-format
 msgid ""
 "saned needs to be installed to share the local scanner(s).\n"
@@ -22425,7 +23057,7 @@ msgstr ""
 "แพกเกจนี้จำเป็นต้องถูก upgrade\n"
 "คุณแน่ใจว่าจะไม่เลือกมันหรือ"
 
-#: standalone/scannerdrake:913 standalone/scannerdrake:917
+#: standalone/scannerdrake:944 standalone/scannerdrake:948
 #, c-format
 msgid "Your scanner(s) will not be available on the network."
 msgstr ""
@@ -22450,7 +23082,7 @@ msgstr "ดีไวซ์ของเม้าส์: %s\n"
 msgid "- %s was added\n"
 msgstr ""
 
-#: standalone/service_harddrake:199
+#: standalone/service_harddrake:204
 #, fuzzy, c-format
 msgid "Hardware probing in progress"
 msgstr "ค้นหาเจอบน port %s"
@@ -22517,8 +23149,8 @@ msgstr "ติดตั้งระบบ"
 
 #: steps.pm:25
 #, fuzzy, c-format
-msgid "Root password"
-msgstr "ไม่มีรหัสผ่าน"
+msgid "Administrator password"
+msgstr "เซ็ตรหัสผ่านรูท"
 
 #: steps.pm:26
 #, c-format
@@ -22555,22 +23187,47 @@ msgstr "ติดตั้งระบบ"
 msgid "Exit install"
 msgstr "ออกจากการติดตั้ง"
 
-#: ugtk2.pm:1122
+#: ugtk2.pm:900
 #, c-format
 msgid "Is this correct?"
 msgstr "ถูกต้องหรือไม่?"
 
-#: ugtk2.pm:1250
+#: ugtk2.pm:960
+#, fuzzy, c-format
+msgid "No file chosen"
+msgstr "ตัวเลือกแฟ้ม"
+
+#: ugtk2.pm:962
+#, fuzzy, c-format
+msgid "You have chosen a file, not a directory"
+msgstr "ไม่มีไฟล์หรือไดเรกทอรีเช่นนี้"
+
+#: ugtk2.pm:964
+#, fuzzy, c-format
+msgid "You have chosen a directory, not a file"
+msgstr "ไม่พบไดเร็กทอรีส่วนตัวของคุณ"
+
+#: ugtk2.pm:966
+#, fuzzy, c-format
+msgid "No such directory"
+msgstr "ไม่ใช่โฟลเดอร์"
+
+#: ugtk2.pm:966
+#, fuzzy, c-format
+msgid "No such file"
+msgstr "ไม่มีไฟล์"
+
+#: ugtk2.pm:1045
 #, c-format
 msgid "Expand Tree"
 msgstr "ขยาย tree"
 
-#: ugtk2.pm:1251
+#: ugtk2.pm:1046
 #, c-format
 msgid "Collapse Tree"
 msgstr "ยุบ tree"
 
-#: ugtk2.pm:1252
+#: ugtk2.pm:1047
 #, c-format
 msgid "Toggle between flat and group sorted"
 msgstr "เปลี่ยนไปมาระหว่างการจัดเรียงแบบ flat หรือ group"
@@ -22583,15 +23240,126 @@ msgid ""
 msgstr ""
 
 #: wizards.pm:99
-#, fuzzy, c-format
+#, c-format
 msgid "Installation failed"
-msgstr "เลือกชุดการติดตั้ง"
+msgstr "การติดตั้งไม่สำเร็จ"
+
+#~ msgid ""
+#~ "Insert a floppy in drive\n"
+#~ "All data on this floppy will be lost"
+#~ msgstr ""
+#~ "กรุณาใส่แผ่นฟล้อปปี้ในไดรว์\n"
+#~ "ข้อมูลทั้งหมดบนแผ่นฟล้อปปี้จะถูกลบ"
+
+#~ msgid "Insert a FAT formatted floppy in drive %s"
+#~ msgstr "ให้ใส่แผ่นฟล้อปปี้ที่ format แบบ FAT ลงในไดรว์ %s"
+
+#~ msgid "This floppy is not FAT formatted"
+#~ msgstr "่แผ่นฟล้อปปี้นี้ ไม่ใช่ แบบFAT"
+
+#~ msgid ""
+#~ "To use this saved packages selection, boot installation with ``linux "
+#~ "defcfg=floppy''"
+#~ msgstr ""
+#~ "To use this saved packages selection, boot installation with ``linux "
+#~ "defcfg=floppy''"
+
+#, fuzzy
+#~ msgid "Load/Save on floppy"
+#~ msgstr "บันทึกลงแผ่นฟล้อปปี้"
+
+#, fuzzy
+#~ msgid "Load from floppy"
+#~ msgstr "เรียกคืนจากแผ่นฟล้อปปี้"
+
+#~ msgid "Save on floppy"
+#~ msgstr "บันทึกลงแผ่นฟล้อปปี้"
+
+#, fuzzy
+#~ msgid "Package selection"
+#~ msgstr "เลือกกลุ่มแพ็คเก็จ"
+
+#, fuzzy
+#~ msgid "Loading from floppy"
+#~ msgstr "เรียกคืนจากแผ่นฟล้อปปี้"
+
+#, fuzzy
+#~ msgid "Insert a floppy containing package selection"
+#~ msgstr "ให้ใส่แผ่นฟล้อปปี้ลงในไดรว์ %s"
+
+#~ msgid "Installing HPOJ package..."
+#~ msgstr "กำลังติดตั้งแพ็คเก็จ %s..."
+
+#, fuzzy
+#~ msgid "Application:"
+#~ msgstr "การตรวจสอบสิทธิ์การใช้งาน"
+
+#, fuzzy
+#~ msgid "Release: "
+#~ msgstr "โปรดรอสักครู่"
+
+#, fuzzy
+#~ msgid "Summary: "
+#~ msgstr "รวมความ"
+
+#, fuzzy
+#~ msgid "Submit kernel version"
+#~ msgstr "kernel version"
+
+#, fuzzy
+#~ msgid "connecting to %s..."
+#~ msgstr "อ่าน CUPS drivers database..."
+
+#, fuzzy
+#~ msgid "Please enter a package name."
+#~ msgstr "โปรดป้อนชื่อผู้ใช้"
+
+#, fuzzy
+#~ msgid "Loading printer configuration... Please wait"
+#~ msgstr "การคอนฟิก Internet"
 
 #, fuzzy
 #~ msgid "The "
 #~ msgstr "ชื่อที่ใช้ในกรุ๊ป (sharename)"
 
 #, fuzzy
+#~ msgid "%s (was %s)"
+#~ msgstr "Port"
+
+#, fuzzy
+#~ msgid "Root password"
+#~ msgstr "ไม่มีรหัสผ่าน"
+
+#, fuzzy
+#~ msgid "Do you want to recover your system?"
+#~ msgstr "คุณต้องการใช้ aboot หรือไม่"
+
+#, fuzzy
+#~ msgid "Samba server"
+#~ msgstr "เซิร์ฟเวอร์ NIS"
+
+#~ msgid "Move"
+#~ msgstr "ย้าย"
+
+#~ msgid "Which disk do you want to move it to?"
+#~ msgstr "คุณต้องการจะย้ายไปดิสก์ไหน"
+
+#~ msgid "Sector"
+#~ msgstr "เซ็กเตอร์"
+
+#~ msgid "Which sector do you want to move it to?"
+#~ msgstr "คุณต้องการย้ายไปเซ็กเตอร์ไหน"
+
+#~ msgid "Moving"
+#~ msgstr "ย้าย"
+
+#~ msgid "Moving partition..."
+#~ msgstr "ย้ายพาร์ติชั่น..."
+
+#~ msgid "Error opening %s for writing: %s"
+#~ msgstr "เกิดข้อผิดพลาดในการเปิด %s สำหรับการเขียน: %s"
+
+#, fuzzy
 #~ msgid "Server Information:"
 #~ msgstr "แสดงข้อมูล"
 
@@ -22956,7 +23724,7 @@ msgstr "เลือกชุดการติดตั้ง"
 #~ msgstr "การติดต่อแบบ ISDN ของคุณเป็นแบบใด"
 
 #~ msgid ""
-#~ "I have detected an ISDN PCI card, but I don't know its type. Please "
+#~ "I have detected an ISDN PCI card, but I do not know its type. Please "
 #~ "select a PCI card on the next screen."
 #~ msgstr ""
 #~ "ผมเจอการ์ด ISDN แบบ PCI แต่ผมไม่ทราบชนิด กรุณาเลือกหนื่งในการ์ด PCI ในหน้าต่อไป"