fixed my previous bad entries

1 files changed, 588 insertions, 299 deletions

diff --git a/perl-install/share/po/th.po b/perl-install/share/po/th.po
index 48233fa21..86f715d78 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: 2003-09-16 13:45+0200\n"
+"POT-Creation-Date: 2003-12-03 03:09+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"
@@ -264,11 +264,6 @@ msgstr "การปรับแต่ง LAN"
 msgid "Total progress"
 msgstr "กำลังตรวจสอบพอร์ต"
 
-#: ../../lang.pm:1
-#, c-format
-msgid "Hong Kong"
-msgstr ""
-
 #: ../../install_interactive.pm:1
 #, c-format
 msgid "Not enough free space to allocate new partitions"
@@ -340,6 +335,18 @@ msgstr "ค้นพบ %s"
 msgid "No CD device defined!"
 msgstr "เลือกไฟล์"
 
+#: ../../network/shorewall.pm:1
+#, c-format
+msgid ""
+"Please enter the name of the interface connected to the "
+"internet.              \n"
+"                \n"
+"Examples:\n"
+"                ppp+ for modem or DSL connections, \n"
+"                eth0, or eth1 for cable connection, \n"
+"                ippp+ for a isdn connection.\n"
+msgstr ""
+
 #: ../../standalone/drakbackup:1
 #, fuzzy, c-format
 msgid "\tUse .backupignore files\n"
@@ -411,15 +418,20 @@ msgstr ""
 msgid "Swiss (French layout)"
 msgstr "สวิส (เลย์เอ้าท์ตามฝรั่งเศษ)"
 
+#: ../../raid.pm:1
+#, c-format
+msgid "mkraid failed (maybe raidtools are missing?)"
+msgstr "mkraid failed (maybe raidtools are missing?)"
+
 #: ../../standalone/drakbackup:1
 #, c-format
 msgid "August"
 msgstr "สิงหาคม"
 
-#: ../../raid.pm:1
-#, c-format
-msgid "mkraid failed (maybe raidtools are missing?)"
-msgstr "mkraid failed (maybe raidtools are missing?)"
+#: ../../network/drakfirewall.pm:1
+#, fuzzy, c-format
+msgid "FTP server"
+msgstr "เซิร์ฟเวอร์ NIS"
 
 #: ../../harddrake/data.pm:1
 #, c-format
@@ -498,11 +510,6 @@ msgstr "มีความขัดแย้งของ LAN address ซึ่�
 msgid "Configuring..."
 msgstr "กำลังทำการคอนฟิก"
 
-#: ../../standalone/drakgw:1
-#, c-format
-msgid "The setup has already been done, and it's currently enabled."
-msgstr "การปรับแต่งเรียบร้อยแล้วและตอนนี้ก็ได้ทำงานแล้ว"
-
 #: ../../harddrake/v4l.pm:1
 #, c-format
 msgid ""
@@ -621,6 +628,11 @@ msgstr ""
 msgid "Printer Name"
 msgstr "ชื่อพรินต์คิว"
 
+#: ../../../move/move.pm:1
+#, c-format
+msgid "Setting up USB key"
+msgstr ""
+
 #: ../../standalone/drakfloppy:1
 #, c-format
 msgid "Remove a module"
@@ -676,16 +688,18 @@ msgstr ""
 msgid "if needed"
 msgstr "ถ้าต้องการ"
 
+#: ../../standalone/drakclock:1
+#, c-format
+msgid ""
+"We need to install ntp package\n"
+" to enable Network Time Protocol"
+msgstr ""
+
 #: ../../standalone/drakbackup:1
 #, fuzzy, c-format
 msgid "Restore Failed..."
 msgstr "เรียกคืนจากไฟล์"
 
-#: ../../standalone/harddrake2:1
-#, fuzzy, c-format
-msgid "/Autodetect _jazz drives"
-msgstr "ใช้ auto detection"
-
 #: ../../standalone/drakbackup:1
 #, c-format
 msgid "Store the password for this system in drakbackup configuration."
@@ -1028,11 +1042,6 @@ msgstr ""
 msgid "512 kB"
 msgstr "512 kB"
 
-#: ../../standalone/net_monitor:1
-#, c-format
-msgid "Logs"
-msgstr ""
-
 #: ../../standalone/scannerdrake:1
 #, c-format
 msgid "(Note: Parallel ports cannot be auto-detected)"
@@ -1450,6 +1459,11 @@ msgstr "ตำแหน่ง"
 msgid "monthly"
 msgstr ""
 
+#: ../../../move/move.pm:1
+#, fuzzy, c-format
+msgid "Retry"
+msgstr "เรียกคืนจากไฟล์"
+
 #: ../../standalone/drakfloppy:1
 #, c-format
 msgid "Module name"
@@ -1495,6 +1509,11 @@ msgstr ""
 msgid "the module of the GNU/Linux kernel that handles the device"
 msgstr ""
 
+#: ../../standalone/drakclock:1
+#, fuzzy, c-format
+msgid "Is your hardware clock set to GMT?"
+msgstr "คุณต้องการให้เซ็ตนาฬิกาฮาร์ดแวร์เป็น GMT?"
+
 #: ../../diskdrake/interactive.pm:1
 #, c-format
 msgid "Trying to rescue partition table"
@@ -1535,6 +1554,11 @@ msgstr "ไม่สามารถเริ่ม live upgrade !!!\n"
 msgid "Name: "
 msgstr "ชื่อ: "
 
+#: ../../standalone/drakconnect:1
+#, c-format
+msgid "up"
+msgstr ""
+
 #: ../../Xconfig/resolution_and_depth.pm:1
 #, c-format
 msgid "16 million colors (24 bits)"
@@ -1545,7 +1569,7 @@ msgstr "สิบหกล้านสี (24 บิต)"
 msgid "Allow all users"
 msgstr "เพิ่มผู้ใช้"
 
-#: ../../share/advertising/08-store.pl:1
+#: ../advertising/08-store.pl:1
 #, c-format
 msgid "The official MandrakeSoft Store"
 msgstr ""
@@ -1577,16 +1601,16 @@ msgstr "ชื่อผู้ใช้"
 msgid "Do new backup before restore (only for incremental backups.)"
 msgstr ""
 
-#: ../../standalone/harddrake2:1
-#, fuzzy, c-format
-msgid "Name"
-msgstr "ชื่อ: "
-
 #: ../../raid.pm:1
 #, c-format
 msgid "mkraid failed"
 msgstr "mkraid failed"
 
+#: ../../standalone/harddrake2:1
+#, fuzzy, c-format
+msgid "Name"
+msgstr "ชื่อ: "
+
 #: ../../install_steps_interactive.pm:1
 #, c-format
 msgid "Button 3 Emulation"
@@ -1789,6 +1813,17 @@ msgstr "เริ่มทำงาน server"
 msgid "Printing test page(s)..."
 msgstr "กำลังพิมพ์กระดาษทดสอบ"
 
+#: ../../standalone/drakbackup:1
+#, c-format
+msgid ""
+"Transfer successful\n"
+"You may want to verify you can login to the server with:\n"
+"\n"
+"ssh -i %s %s@%s\n"
+"\n"
+"without being prompted for a password."
+msgstr ""
+
 #: ../../fsedit.pm:1
 #, c-format
 msgid "There is already a partition with mount point %s\n"
@@ -2604,6 +2639,11 @@ msgstr ""
 msgid "Can't add a partition to _formatted_ RAID md%d"
 msgstr "ไม่สามารถเพิ่มพาร์ติชั่นเป็น _formatted_ RAID md%d"
 
+#: ../../standalone/drakclock:1
+#, fuzzy, c-format
+msgid "Network Time Protocol"
+msgstr "Network interface"
+
 #: ../../Xconfig/card.pm:1
 #, c-format
 msgid ""
@@ -2806,7 +2846,7 @@ msgstr ""
 msgid "level"
 msgstr "ระดับ"
 
-#: ../../share/advertising/13-mdkexpert_corporate.pl:1
+#: ../advertising/13-mdkexpert_corporate.pl:1
 #, c-format
 msgid ""
 "All incidents will be followed up by a single qualified MandrakeSoft "
@@ -3168,7 +3208,7 @@ msgstr ""
 msgid "Bad package"
 msgstr "แพ็คเก็จชำรุด"
 
-#: ../../share/advertising/07-server.pl:1
+#: ../advertising/07-server.pl:1
 #, c-format
 msgid ""
 "Transform your computer into a powerful Linux server: Web server, mail, "
@@ -3414,7 +3454,7 @@ msgstr "Welcome To Crackers"
 msgid "Module options:"
 msgstr "อ๊อปชั่นของโมดูล:"
 
-#: ../../share/advertising/11-mnf.pl:1
+#: ../advertising/11-mnf.pl:1
 #, c-format
 msgid "Secure your networks with the Multi Network Firewall"
 msgstr ""
@@ -3493,6 +3533,11 @@ msgstr "Mouse"
 msgid "not enough room in /boot"
 msgstr "ไม่มีที่พอใน /boot"
 
+#: ../../install_steps_gtk.pm:1
+#, c-format
+msgid "trying to promote %s"
+msgstr ""
+
 #: ../../lang.pm:1
 #, c-format
 msgid "Liechtenstein"
@@ -3592,6 +3637,11 @@ msgstr ""
 msgid "Saudi Arabia"
 msgstr ""
 
+#: ../../services.pm:1
+#, c-format
+msgid "Internet"
+msgstr "เฎ?เฏ?เฎฃเฎฏเฎฎเฎ?"
+
 #: ../../diskdrake/interactive.pm:1
 #, c-format
 msgid "Continue anyway?"
@@ -3610,11 +3660,6 @@ msgstr ""
 msgid "Printer"
 msgstr "เครื่องพิมพ์"
 
-#: ../../services.pm:1
-#, c-format
-msgid "Internet"
-msgstr "เฎ?เฏ?เฎฃเฎฏเฎฎเฎ?"
-
 #: ../../standalone/service_harddrake:1
 #, c-format
 msgid "Some devices were added:\n"
@@ -3683,6 +3728,11 @@ msgstr ""
 msgid "Restarting printing system..."
 msgstr "ประเภทของการพิมพ์ชนิดไหนที่คุณต้องการ"
 
+#: ../../../move/tree/mdk_totem:1
+#, c-format
+msgid "You can only run with no CDROM support"
+msgstr ""
+
 #: ../../modules/interactive.pm:1
 #, c-format
 msgid "See hardware info"
@@ -3889,16 +3939,16 @@ msgstr "ISA / PCMCIA"
 msgid "About"
 msgstr "เลิก"
 
-#: ../../network/network.pm:1
-#, c-format
-msgid "Proxies configuration"
-msgstr "การคอนฟิก Proxies"
-
 #: ../../mouse.pm:1
 #, c-format
 msgid "GlidePoint"
 msgstr "GlidePoint"
 
+#: ../../network/network.pm:1
+#, c-format
+msgid "Proxies configuration"
+msgstr "การคอนฟิก Proxies"
+
 #: ../../diskdrake/interactive.pm:1
 #, c-format
 msgid "Start: sector %s\n"
@@ -4040,6 +4090,11 @@ msgstr "จุดเม้าท์จะต้องเริ่มด้วย
 msgid "Choose your CD/DVD device"
 msgstr "คุณต้องการเลือกคีย์บอร์ดเลย์เอ้าท์แบบใด "
 
+#: ../../network/drakfirewall.pm:1
+#, fuzzy, c-format
+msgid "CUPS server"
+msgstr "เซิร์ฟเวอร์ DNS"
+
 #: ../../standalone/logdrake:1
 #, fuzzy, c-format
 msgid "Postfix Mail Server"
@@ -4055,7 +4110,7 @@ msgstr "ออกโดยไม่ต้องบันทึก"
 msgid "Yemen"
 msgstr ""
 
-#: ../../share/advertising/11-mnf.pl:1
+#: ../advertising/11-mnf.pl:1
 #, c-format
 msgid "This product is available on the MandrakeStore Web site."
 msgstr ""
@@ -4065,6 +4120,31 @@ msgstr ""
 msgid "=> There are many things to choose from (%s).\n"
 msgstr ""
 
+#: ../../standalone/drakclock:1
+#, c-format
+msgid "GMT - DrakClock"
+msgstr ""
+
+#: ../../../move/move.pm:1
+#, c-format
+msgid ""
+"An error occurred:\n"
+"\n"
+"\n"
+"%s\n"
+"\n"
+"This may come from corrupted system configuration files\n"
+"on the USB key, in this case removing them and then\n"
+"rebooting Mandrake Move would fix the problem. To do\n"
+"so, click on the corresponding button.\n"
+"\n"
+"\n"
+"You may also want to reboot and remove the USB key, or\n"
+"examine its contents under another OS, or even have\n"
+"a look at log files in console #3 and #4 to try to\n"
+"guess what's happening."
+msgstr ""
+
 #: ../../steps.pm:1
 #, c-format
 msgid "Hard drive detection"
@@ -4290,6 +4370,11 @@ msgstr "เครื่องพิมพ์"
 msgid "Which partition do you want to use for Linux4Win?"
 msgstr "พาร์ติชั่นใหนที่ท่านต้องการใช้กับ Linux4Win"
 
+#: ../../install_steps_gtk.pm:1
+#, fuzzy, c-format
+msgid "due to missing %s"
+msgstr "ไม่มี kdesu "
+
 #: ../../printer/printerdrake.pm:1
 #, fuzzy, c-format
 msgid "Test pages"
@@ -4739,7 +4824,7 @@ msgstr ""
 msgid "Started on boot"
 msgstr "เริ่มทำงานตอน boot"
 
-#: ../../share/advertising/12-mdkexpert.pl:1
+#: ../advertising/12-mdkexpert.pl:1
 #, c-format
 msgid ""
 "Join the MandrakeSoft support teams and the Linux Community online to share "
@@ -5051,11 +5136,6 @@ msgid ""
 "under console"
 msgstr ""
 
-#: ../../standalone/net_monitor:1
-#, c-format
-msgid "Statistics"
-msgstr ""
-
 #: ../../printer/cups.pm:1
 #, fuzzy, c-format
 msgid "(on %s)"
@@ -5776,7 +5856,7 @@ msgid ""
 "number generation."
 msgstr ""
 
-#: ../../share/advertising/07-server.pl:1
+#: ../advertising/07-server.pl:1
 #, c-format
 msgid "Turn your computer into a reliable server"
 msgstr ""
@@ -5791,6 +5871,11 @@ msgstr ""
 msgid " (driver %s)"
 msgstr " (driver %s)"
 
+#: ../../services.pm:1
+#, c-format
+msgid "Start when requested"
+msgstr ""
+
 #: ../../diskdrake/interactive.pm:1
 #, fuzzy, c-format
 msgid ""
@@ -5803,11 +5888,6 @@ msgstr "Loopback file(s): %s\n"
 msgid "I don't know"
 msgstr "ผมไม่ทราบ"
 
-#: ../../services.pm:1
-#, c-format
-msgid "Start when requested"
-msgstr ""
-
 #: ../../printer/main.pm:1
 #, c-format
 msgid ", TCP/IP host \"%s\", port %s"
@@ -6003,6 +6083,11 @@ msgid ""
 "section."
 msgstr ""
 
+#: ../../../move/move.pm:1
+#, c-format
+msgid "Key isn't writable"
+msgstr ""
+
 #: ../../lang.pm:1
 #, c-format
 msgid "Bangladesh"
@@ -6047,16 +6132,16 @@ msgstr ""
 msgid "Set the root umask."
 msgstr "ไม่มีรหัสผ่าน"
 
-#: ../../network/modem.pm:1 ../../standalone/drakconnect:1
-#, c-format
-msgid "Script-based"
-msgstr "รูปแบบสคริปต์"
-
 #: ../../install_any.pm:1 ../../partition_table.pm:1
 #, c-format
 msgid "Error reading file %s"
 msgstr "มีปัญหากับการอ่านข้อมูลในไฟล์ %s"
 
+#: ../../network/modem.pm:1 ../../standalone/drakconnect:1
+#, c-format
+msgid "Script-based"
+msgstr "รูปแบบสคริปต์"
+
 #: ../../harddrake/v4l.pm:1
 #, fuzzy, c-format
 msgid "PLL setting:"
@@ -6126,17 +6211,6 @@ msgstr ""
 msgid "Domain Authentication Required"
 msgstr "การตรวจสอบสิทธิ์การใช้งาน"
 
-#: ../../standalone/drakTermServ:1
-#, c-format
-msgid ""
-"\n"
-"\n"
-" Thanks:\n"
-"\t- LTSP Project http://www.ltsp.org\n"
-"\t- Michael Brown <mbrown\\@fensystems.co.uk>\n"
-"\n"
-msgstr ""
-
 #: ../../security/level.pm:1
 #, fuzzy, c-format
 msgid "Use libsafe for servers"
@@ -6750,16 +6824,16 @@ msgstr "Yaboot"
 msgid "Logitech CC Series with Wheel emulation"
 msgstr "Logitech CC Series"
 
-#: ../../standalone/drakboot:1
-#, fuzzy, c-format
-msgid "Splash selection"
-msgstr "บันทึกกลุ่มแพ็คเก็จที่เลือก"
-
 #: ../../partition_table.pm:1
 #, c-format
 msgid "Extended partition not supported on this platform"
 msgstr "Extended partition not supported on this platform"
 
+#: ../../standalone/drakboot:1
+#, fuzzy, c-format
+msgid "Splash selection"
+msgstr "บันทึกกลุ่มแพ็คเก็จที่เลือก"
+
 #: ../../network/isdn.pm:1
 #, c-format
 msgid "ISDN Configuration"
@@ -6814,6 +6888,11 @@ msgstr ""
 msgid "Printer default settings"
 msgstr "เลือกการเชื่อมต่อกับเครื่องพิมพ์"
 
+#: ../../mouse.pm:1
+#, c-format
+msgid "Generic PS2 Wheel Mouse"
+msgstr "Generic PS2 Wheel Mouse"
+
 #: ../../standalone/harddrake2:1
 #, c-format
 msgid ""
@@ -6822,11 +6901,6 @@ msgid ""
 "accesses to user memory (aka this is a bug guard)"
 msgstr ""
 
-#: ../../mouse.pm:1
-#, c-format
-msgid "Generic PS2 Wheel Mouse"
-msgstr "Generic PS2 Wheel Mouse"
-
 #: ../../printer/printerdrake.pm:1
 #, fuzzy, c-format
 msgid "Removing old printer \"%s\"..."
@@ -6969,6 +7043,11 @@ msgstr "Korean keyboard"
 msgid "Not connected"
 msgstr "ไม่เชื่อมต่อ"
 
+#: ../../standalone/net_monitor:1
+#, fuzzy, c-format
+msgid "No internet connection configured"
+msgstr "การปรับแต่งการติดต่อเข้า internet"
+
 #: ../../keyboard.pm:1
 #, c-format
 msgid "Greek"
@@ -6984,17 +7063,6 @@ msgstr ""
 msgid "Generic 3 Button Mouse with Wheel emulation"
 msgstr "เม้าส์แบบปกติที่ใช้งานสามปุ่ม"
 
-#: ../../standalone/drakbackup:1
-#, c-format
-msgid ""
-"Transfer successful\n"
-"You may want to verify you can login to the server with:\n"
-"\n"
-"ssh -i %s %s\\@%s\n"
-"\n"
-"without being prompted for a password."
-msgstr ""
-
 #: ../../any.pm:1
 #, c-format
 msgid "Enable OF Boot?"
@@ -7210,7 +7278,7 @@ msgid ""
 "You can also type a new name or skip this printer."
 msgstr ""
 
-#: ../../share/advertising/12-mdkexpert.pl:1
+#: ../advertising/12-mdkexpert.pl:1
 #, c-format
 msgid ""
 "Find the solutions of your problems via MandrakeSoft's online support "
@@ -7276,6 +7344,22 @@ msgstr ""
 msgid "Multi-function device on USB"
 msgstr ""
 
+#: ../../../move/move.pm:1
+#, c-format
+msgid ""
+"We didn't 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"
+"or another one. Note: if you plug in a key now, wait several\n"
+"seconds before detecting again.\n"
+"\n"
+"\n"
+"You may also proceed without an USB key - you'll still be\n"
+"able to use Mandrake Move as a normal live Mandrake\n"
+"Operating System."
+msgstr ""
+
 #: ../../help.pm:1
 #, fuzzy, c-format
 msgid "With basic documentation"
@@ -7369,16 +7453,16 @@ msgstr ""
 msgid "Other Media"
 msgstr "อื่นๆ"
 
-#: ../../standalone/drakbackup:1
-#, fuzzy, c-format
-msgid "Backup system files"
-msgstr "ไฟล์แบ็คอัพมีปัญหา"
-
 #: ../../mouse.pm:1
 #, c-format
 msgid "Logitech MouseMan+"
 msgstr "Logitech MouseMan+"
 
+#: ../../standalone/drakbackup:1
+#, fuzzy, c-format
+msgid "Backup system files"
+msgstr "ไฟล์แบ็คอัพมีปัญหา"
+
 #: ../../diskdrake/interactive.pm:1
 #, c-format
 msgid "Sector"
@@ -7440,6 +7524,11 @@ msgstr "กำลังพาร์ติชั่น Custom disk"
 msgid "Please choose your type of mouse."
 msgstr "คุณมีเม้าส์ชนิดใด"
 
+#: ../../services.pm:1
+#, c-format
+msgid "running"
+msgstr "กำลังทำงาน"
+
 #: ../../standalone/harddrake2:1
 #, c-format
 msgid "class of hardware device"
@@ -7457,11 +7546,6 @@ msgstr ""
 msgid "United Kingdom"
 msgstr "อังกฤษ"
 
-#: ../../services.pm:1
-#, c-format
-msgid "running"
-msgstr "กำลังทำงาน"
-
 #: ../../lang.pm:1
 #, fuzzy, c-format
 msgid "Indonesia"
@@ -7504,7 +7588,7 @@ msgstr "enable"
 msgid "Command line"
 msgstr "ชื่อโดเมน"
 
-#: ../../share/advertising/08-store.pl:1
+#: ../advertising/08-store.pl:1
 #, c-format
 msgid ""
 "Our full range of Linux solutions, as well as special offers on products and "
@@ -7557,6 +7641,17 @@ msgstr "สวอป"
 msgid "Custom settings"
 msgstr "กำลังพาร์ติชั่น Custom disk"
 
+#: ../../../move/move.pm:1
+#, c-format
+msgid ""
+"The USB key seems to have write protection enabled, but we can't safely\n"
+"unplug it now.\n"
+"\n"
+"\n"
+"Click the button to reboot the machine, unplug it, remove write protection,\n"
+"plug the key again, and launch Mandrake Move again."
+msgstr ""
+
 #: ../../standalone/drakbackup:1
 #, fuzzy, c-format
 msgid "Restore Other"
@@ -7659,7 +7754,7 @@ msgstr "กรุณาเลือก Network Adaptor สำหรับกา�
 msgid "Photo memory card access on your HP multi-function device"
 msgstr ""
 
-#: ../../share/advertising/09-mdksecure.pl:1
+#: ../advertising/09-mdksecure.pl:1
 #, c-format
 msgid ""
 "Enhance your computer performance with the help of a selection of partners "
@@ -7777,6 +7872,11 @@ msgstr ""
 msgid "Exit install"
 msgstr "ออกจากการติดตั้ง"
 
+#: ../../../move/move.pm:1
+#, c-format
+msgid "Need a key to save your data"
+msgstr ""
+
 #: ../../standalone/drakgw:1
 #, c-format
 msgid ""
@@ -7943,11 +8043,6 @@ msgstr "รัสเซีย (โฟเนติค)"
 msgid "dhcpd Config..."
 msgstr "กำลังทำการคอนฟิก"
 
-#: ../../standalone/drakgw:1
-#, c-format
-msgid "The setup has already been done, but it's currently disabled."
-msgstr ""
-
 #: ../../any.pm:1
 #, c-format
 msgid "LILO/grub Installation"
@@ -8086,6 +8181,11 @@ msgstr ""
 msgid "Choose an X server"
 msgstr "เลือก X เซิร์ฟเวอร์"
 
+#: ../../../move/tree/mdk_totem:1
+#, c-format
+msgid "Copying to memory to allow removing the CDROM"
+msgstr ""
+
 #: ../../install_interactive.pm:1
 #, c-format
 msgid "Swap partition size in MB: "
@@ -8133,7 +8233,7 @@ msgstr "Boot Style Configuration"
 msgid "Barbados"
 msgstr ""
 
-#: ../../share/advertising/02-community.pl:1
+#: ../advertising/02-community.pl:1
 #, c-format
 msgid ""
 "Want to know more and to contribute to the Open Source community? Get "
@@ -8292,15 +8392,6 @@ msgstr ""
 msgid "First Time Wizard"
 msgstr ""
 
-#: ../../install_steps.pm:1
-#, c-format
-msgid ""
-"An error occurred, but I don't know how to handle it nicely.\n"
-"Continue at your own risk."
-msgstr ""
-"มีความผิดพลาดเกิดขึ้น แต่โปรแกรมไม่สามารถแก้ไขได้\n"
-"หากทำงานต่ออาจเกิดความเสียหายได้"
-
 #: ../../lang.pm:1
 #, fuzzy, c-format
 msgid "Taiwan"
@@ -8316,6 +8407,15 @@ msgstr ""
 msgid "please wait, parsing file: %s"
 msgstr "โปรดกรุณารอ,parsing file:%s"
 
+#: ../../install_steps.pm:1 ../../../move/move.pm:1
+#, c-format
+msgid ""
+"An error occurred, but I don't know how to handle it nicely.\n"
+"Continue at your own risk."
+msgstr ""
+"มีความผิดพลาดเกิดขึ้น แต่โปรแกรมไม่สามารถแก้ไขได้\n"
+"หากทำงานต่ออาจเกิดความเสียหายได้"
+
 #: ../../install_steps_gtk.pm:1
 #, fuzzy, c-format
 msgid "Importance: "
@@ -8481,6 +8581,11 @@ msgid ""
 "The format is the same as auto_install generated floppies."
 msgstr ""
 
+#: ../../../move/tree/mdk_totem:1
+#, c-format
+msgid "No CDROM support"
+msgstr ""
+
 #: ../../standalone/drakxtv:1
 #, c-format
 msgid "China (broadcast)"
@@ -8518,7 +8623,7 @@ msgstr ""
 "การโหลดโมดูล %s ล้มเหลว\n"
 "คุณต้องการให้ทดลองอีกครั้งด้วยพารามิเตอร์อื่นๆอีกหรือไม่?"
 
-#: ../../share/advertising/01-thanks.pl:1
+#: ../advertising/01-thanks.pl:1
 #, c-format
 msgid "Welcome to the Open Source world."
 msgstr ""
@@ -8731,6 +8836,11 @@ msgstr "กำลังตรวจสอบพอร์ต"
 msgid "number of capture buffers for mmap'ed capture"
 msgstr ""
 
+#: ../../network/adsl.pm:1
+#, fuzzy, c-format
+msgid " - detected"
+msgstr "ค้นพบ %s"
+
 #: ../../harddrake/data.pm:1
 #, c-format
 msgid "SMBus controllers"
@@ -8827,6 +8937,11 @@ msgstr ""
 msgid "Restore"
 msgstr "เรียกคืนจากไฟล์"
 
+#: ../../standalone/drakclock:1
+#, fuzzy, c-format
+msgid "Server:"
+msgstr "เซิร์ฟเวอร์"
+
 #: ../../security/help.pm:1
 #, c-format
 msgid "if set to yes, check if the network devices are in promiscuous mode."
@@ -8837,6 +8952,11 @@ msgstr ""
 msgid "Looking for available packages..."
 msgstr "กำลังหาแพ็คเก็จที่มีอยู่"
 
+#: ../../../move/move.pm:1
+#, fuzzy, c-format
+msgid "Please wait, setting up system configuration files on USB key..."
+msgstr "เลือกระดับระบบรักษาความปลอดภัย"
+
 #: ../../any.pm:1
 #, c-format
 msgid "Init Message"
@@ -8940,16 +9060,16 @@ msgid ""
 "per second)"
 msgstr ""
 
-#: ../../standalone/printerdrake:1
-#, fuzzy, c-format
-msgid "Mandrake Linux Printer Management Tool"
-msgstr "การติดตั้งลีนุกซ์-แมนเดรก %s"
-
 #: ../../pkgs.pm:1
 #, c-format
 msgid "important"
 msgstr "สำคัญ"
 
+#: ../../standalone/printerdrake:1
+#, fuzzy, c-format
+msgid "Mandrake Linux Printer Management Tool"
+msgstr "การติดตั้งลีนุกซ์-แมนเดรก %s"
+
 #: ../../standalone/drakbackup:1
 #, c-format
 msgid "Total Progress"
@@ -9010,6 +9130,11 @@ msgstr "ชื่อผู้ใช้"
 msgid "Preparing bootloader..."
 msgstr "กำลังเตรียมบูตโหลดเดอร์"
 
+#: ../../../move/move.pm:1
+#, c-format
+msgid "Enter your user information, password will be used for screensaver"
+msgstr ""
+
 #: ../../network/network.pm:1
 #, c-format
 msgid "Gateway (e.g. %s)"
@@ -9399,17 +9524,17 @@ msgstr "ข้อความของ file"
 msgid "Authentication LDAP"
 msgstr "การตรวจสอบสิทธิ์การใช้งาน"
 
+#: ../../install_steps_gtk.pm:1
+#, c-format
+msgid "in order to keep %s"
+msgstr ""
+
 #: ../../harddrake/sound.pm:1
 #, c-format
 msgid "Let me pick any driver"
 msgstr ""
 
 #: ../../standalone/net_monitor:1
-#, fuzzy, c-format
-msgid "Profile "
-msgstr "Profile: "
-
-#: ../../standalone/net_monitor:1
 #, c-format
 msgid "transmitted"
 msgstr ""
@@ -9506,9 +9631,9 @@ msgstr "kernel version"
 #: ../../standalone/drakautoinst:1 ../../standalone/drakbackup:1
 #: ../../standalone/drakboot:1 ../../standalone/drakconnect:1
 #: ../../standalone/drakfloppy:1 ../../standalone/drakfont:1
-#: ../../standalone/drakgw:1 ../../standalone/drakperm:1
-#: ../../standalone/draksec:1 ../../standalone/logdrake:1
-#: ../../standalone/mousedrake:1 ../../standalone/net_monitor:1
+#: ../../standalone/drakperm:1 ../../standalone/draksec:1
+#: ../../standalone/logdrake:1 ../../standalone/mousedrake:1
+#: ../../standalone/net_monitor:1
 #, c-format
 msgid "Cancel"
 msgstr "ยกเลิก"
@@ -9658,15 +9783,6 @@ msgstr "อิตาลี"
 msgid "Basic"
 msgstr ""
 
-#: ../../standalone/drakTermServ:1
-#, c-format
-msgid ""
-"\n"
-" Copyright (C) 2002 by MandrakeSoft \n"
-"\tStew Benedict sbenedict\\@mandrakesoft.com\n"
-"\n"
-msgstr ""
-
 #: ../../install_messages.pm:1
 #, c-format
 msgid "http://www.mandrakelinux.com/en/92errata.php3"
@@ -9687,10 +9803,10 @@ msgstr ""
 msgid "Card IO"
 msgstr "Card IO"
 
-#: ../../standalone/drakperm:1
-#, c-format
-msgid "when checked, owner and group won't be changed"
-msgstr ""
+#: ../../network/drakfirewall.pm:1
+#, fuzzy, c-format
+msgid "Samba server"
+msgstr "เซิร์ฟเวอร์ NIS"
 
 #: ../../diskdrake/interactive.pm:1
 #, c-format
@@ -9767,6 +9883,11 @@ msgstr ""
 msgid "access to compilation tools"
 msgstr ""
 
+#: ../../standalone/net_monitor:1
+#, c-format
+msgid "Global statistics"
+msgstr ""
+
 #: ../../standalone/drakbackup:1
 #, fuzzy, c-format
 msgid "Please select data to restore..."
@@ -9787,6 +9908,11 @@ msgstr ""
 msgid "Standard test page"
 msgstr "เครื่องมีอ Standard"
 
+#: ../../standalone/drakclock:1
+#, fuzzy, c-format
+msgid "Time Zone"
+msgstr "โซนเวลา"
+
 #: ../../diskdrake/hd_gtk.pm:1 ../../diskdrake/interactive.pm:1
 #, c-format
 msgid "Create"
@@ -9869,6 +9995,15 @@ msgid ""
 "Your choice? "
 msgstr ""
 
+#: ../../standalone/drakTermServ:1
+#, c-format
+msgid ""
+"\n"
+" Copyright (C) 2002 by MandrakeSoft \n"
+"\tStew Benedict sbenedict@mandrakesoft.com\n"
+"\n"
+msgstr ""
+
 #: ../../standalone/draksplash:1
 #, fuzzy, c-format
 msgid "Save theme"
@@ -9894,16 +10029,16 @@ msgstr "Network Configuration Wizard"
 msgid "Removable media automounting"
 msgstr ""
 
-#: ../../standalone/drakbackup:1
-#, fuzzy, c-format
-msgid "Enter the directory to save:"
-msgstr "กรุณาทดสอบเม้าส์"
-
 #: ../../services.pm:1
 #, fuzzy, c-format
 msgid "Printing"
 msgstr "เครื่องพิมพ์"
 
+#: ../../standalone/drakbackup:1
+#, fuzzy, c-format
+msgid "Enter the directory to save:"
+msgstr "กรุณาทดสอบเม้าส์"
+
 #: ../../printer/printerdrake.pm:1
 #, c-format
 msgid ""
@@ -9994,7 +10129,7 @@ msgstr "Kensington Thinking Mouse"
 msgid "Configuration of a remote printer"
 msgstr "การคอนฟิก"
 
-#: ../../share/advertising/13-mdkexpert_corporate.pl:1
+#: ../advertising/13-mdkexpert_corporate.pl:1
 #, c-format
 msgid "An online platform to respond to enterprise support needs."
 msgstr ""
@@ -10139,9 +10274,11 @@ msgstr ""
 msgid "Configure Local Area Network..."
 msgstr "ปรับแต่งระบบเน็ตเวิร์กภายใน..."
 
-#: ../../security/l10n.pm:1
+#: ../../../move/move.pm:1
 #, c-format
-msgid "Verify checksum of the suid/sgid files"
+msgid ""
+"The USB key seems to have write protection enabled. Please\n"
+"unplug it, remove write protection, and then plug it again."
 msgstr ""
 
 #: ../../services.pm:1
@@ -10151,6 +10288,11 @@ msgstr "รัน X-Window เมื่อเริ่มทำงาน"
 
 #: ../../security/l10n.pm:1
 #, c-format
+msgid "Verify checksum of the suid/sgid files"
+msgstr ""
+
+#: ../../security/l10n.pm:1
+#, c-format
 msgid "Run some checks against the rpm database"
 msgstr ""
 
@@ -10448,6 +10590,11 @@ msgstr "คุณไม่สามารถไม่เลือกแพกเ
 msgid "Loading from floppy"
 msgstr "เรียกคืนจากแผ่นฟล้อปปี้"
 
+#: ../../standalone/drakclock:1
+#, c-format
+msgid "Timezone - DrakClock"
+msgstr ""
+
 #: ../../security/help.pm:1
 #, c-format
 msgid "Enable/Disable the logging of IPv4 strange packets."
@@ -10592,6 +10739,11 @@ msgstr ""
 "ข้อมูลสำหรับการคอนฟิกระบบของคุณ สามารถหาได้จากช่วง\n"
 "บทหลังจากการติดตั้งของคู่มือแนะนำผู้ใช้งานลีนุกซ์-แมนเดรกฉบับเป็นทางการ"
 
+#: ../../standalone/drakclock:1
+#, c-format
+msgid "Enable Network Time Protocol"
+msgstr ""
+
 #: ../../printer/printerdrake.pm:1
 #, fuzzy, c-format
 msgid "paranoid"
@@ -10679,7 +10831,7 @@ msgstr ""
 msgid "Firmware-Upload for HP LaserJet 1000"
 msgstr ""
 
-#: ../../share/advertising/03-software.pl:1
+#: ../advertising/03-software.pl:1
 #, c-format
 msgid ""
 "And, of course, push multimedia to its limits with the very latest software "
@@ -10736,6 +10888,11 @@ msgstr "Boot Protocol"
 msgid "LVM-disks %s\n"
 msgstr "LVM-disks %s\n"
 
+#: ../../services.pm:1
+#, c-format
+msgid "On boot"
+msgstr "ขณะ boot"
+
 #: ../../diskdrake/interactive.pm:1
 #, fuzzy, c-format
 msgid "The package %s is needed. Install it?"
@@ -10743,11 +10900,6 @@ msgstr ""
 "แพกเกจนี้จำเป็นต้องถูก upgrade\n"
 "คุณแน่ใจว่าจะไม่เลือกมันหรือ"
 
-#: ../../services.pm:1
-#, c-format
-msgid "On boot"
-msgstr "ขณะ boot"
-
 #: ../../standalone/harddrake2:1
 #, fuzzy, c-format
 msgid "Bus identification"
@@ -10763,6 +10915,11 @@ msgstr "ตำแหน่ง"
 msgid "Please make a backup of your data first"
 msgstr "กรุณาทำ backup ก่อน"
 
+#: ../../harddrake/data.pm:1
+#, c-format
+msgid "ADSL adapters"
+msgstr ""
+
 #: ../../install_interactive.pm:1
 #, c-format
 msgid "You have more than one hard drive, which one do you install linux on?"
@@ -10788,7 +10945,7 @@ msgstr "ถ้าต้องการ"
 msgid "Remove List"
 msgstr "เครื่องพิมพ์แบบรีโมท"
 
-#: ../../share/advertising/05-desktop.pl:1
+#: ../advertising/05-desktop.pl:1
 #, c-format
 msgid "A customizable environment"
 msgstr ""
@@ -10987,6 +11144,13 @@ msgstr ""
 msgid "Firmware copy succeeded"
 msgstr ""
 
+#: ../../../move/tree/mdk_totem:1
+#, c-format
+msgid ""
+"You can't use another CDROM when the following programs are running: \n"
+"%s"
+msgstr ""
+
 #: ../../security/help.pm:1
 #, c-format
 msgid "if set to yes, check permissions of files in the users' home."
@@ -11411,6 +11575,11 @@ msgid ""
 "line, e. g. \"%s <file>\". "
 msgstr ""
 
+#: ../../standalone/drakclock:1
+#, c-format
+msgid "DrakClock"
+msgstr ""
+
 #: ../../modules/interactive.pm:1
 #, c-format
 msgid ""
@@ -11440,21 +11609,6 @@ msgid ""
 "- Daemon, %s via:\n"
 msgstr ""
 
-#: ../../standalone/drakgw:1
-#, fuzzy, c-format
-msgid ""
-"Welcome to the Internet Connection Sharing utility!\n"
-"\n"
-"%s\n"
-"\n"
-"Click on Configure to launch the setup wizard."
-msgstr ""
-"ยินดีต้อนรับสู่เครื่องมือในการติดต่อ internet แบบ share\n"
-"\n"
-"%s\n"
-"\n"
-"กด ``Ok'' ถ้าคุณต้องการเริ่มการทำงานของ setup wizard"
-
 #: ../../lang.pm:1
 #, c-format
 msgid "Cuba"
@@ -11631,6 +11785,11 @@ msgstr ""
 msgid "Christmas Island"
 msgstr ""
 
+#: ../../mouse.pm:1
+#, fuzzy, c-format
+msgid "Automatic"
+msgstr "กำหนดค่า IP แบบอัตโนมัติ"
+
 #: ../../install_steps_interactive.pm:1
 #, c-format
 msgid "Installation of bootloader failed. The following error occured:"
@@ -11733,11 +11892,6 @@ msgstr ""
 msgid "Set root password and network authentication methods"
 msgstr ""
 
-#: ../../standalone/drakgw:1
-#, fuzzy, c-format
-msgid "Internet Connection Sharing configuration"
-msgstr "การเชื่อมต่อ Internet และการปรับแต่ง"
-
 #: ../../ugtk2.pm:1
 #, c-format
 msgid "Toggle between flat and group sorted"
@@ -11989,6 +12143,11 @@ msgstr "ให้เลือกฟล้อปปี้ไดรว์ที่
 msgid "LILO with text menu"
 msgstr "LILO แบบ text menu"
 
+#: ../../standalone/net_monitor:1
+#, c-format
+msgid "instantaneous"
+msgstr ""
+
 #: ../../network/drakfirewall.pm:1
 #, c-format
 msgid "Everything (no firewall)"
@@ -12167,6 +12326,11 @@ msgstr "โปรดป้อนชื่อผู้ใช้"
 msgid "Enable CD Boot?"
 msgstr "Enable CD Boot?"
 
+#: ../../../move/move.pm:1
+#, c-format
+msgid "Simply reboot"
+msgstr ""
+
 #: ../../interactive/stdio.pm:1
 #, c-format
 msgid " enter `void' for void entry"
@@ -12245,16 +12409,16 @@ msgid ""
 "other machines on your local network as well."
 msgstr ""
 
-#: ../../install_steps_interactive.pm:1
-#, c-format
-msgid "Which is your timezone?"
-msgstr "คุณใช้ย่านเวลาใด? "
-
 #: ../../standalone/drakbackup:1
 #, c-format
 msgid "Can't create log file!"
 msgstr ""
 
+#: ../../install_steps_interactive.pm:1 ../../standalone/drakclock:1
+#, c-format
+msgid "Which is your timezone?"
+msgstr "คุณใช้ย่านเวลาใด? "
+
 #: ../../standalone/drakbackup:1
 #, fuzzy, c-format
 msgid "Use .backupignore files"
@@ -12300,6 +12464,11 @@ msgstr ""
 msgid "Icon"
 msgstr "Icon"
 
+#: ../../../move/tree/mdk_totem:1
+#, c-format
+msgid "Kill those programs"
+msgstr ""
+
 #: ../../standalone/drakbackup:1
 #, fuzzy, c-format
 msgid "Please choose what you want to backup"
@@ -12335,7 +12504,7 @@ msgstr "เพิ่ม 1 module"
 msgid "Chunk size %s\n"
 msgstr "ขนาดของ Chunk %s\n"
 
-#: ../../share/advertising/02-community.pl:1
+#: ../advertising/02-community.pl:1
 #, c-format
 msgid "Build the future of Linux!"
 msgstr ""
@@ -12456,7 +12625,7 @@ msgid ""
 "in getting the display configured."
 msgstr ""
 
-#: ../../share/advertising/13-mdkexpert_corporate.pl:1
+#: ../advertising/13-mdkexpert_corporate.pl:1
 #, fuzzy, c-format
 msgid "MandrakeExpert Corporate"
 msgstr "แบบผู้เชี่ยวชาญ (Expert)"
@@ -12495,6 +12664,11 @@ msgid ""
 "After changing type of partition %s, all data on this partition will be lost"
 msgstr "การเปลี่ยนชนิดพาร์ติชั่น %s ข้อมูลทั้งหมดในพาร์ติชั่นนี้จะถูกลบทิ้ง"
 
+#: ../../harddrake/data.pm:1
+#, fuzzy, c-format
+msgid "ISDN adapters"
+msgstr "Internal ISDN card"
+
 #: ../../common.pm:1
 #, c-format
 msgid "%d seconds"
@@ -12761,6 +12935,11 @@ msgstr "เครื่องพิมพ์โลคอล (ต่อติด�
 msgid "Plug'n Play probing failed. Please select the correct monitor"
 msgstr ""
 
+#: ../../../move/move.pm:1
+#, c-format
+msgid "Detect again USB key"
+msgstr ""
+
 #: ../../services.pm:1
 #, c-format
 msgid "Services and deamons"
@@ -12802,7 +12981,7 @@ msgstr "ปรับแต่งการบริการต่างๆ"
 msgid "Slovakian (QWERTZ)"
 msgstr "สโลวาเกีย (QWERTZ)"
 
-#: ../../share/advertising/06-development.pl:1
+#: ../advertising/06-development.pl:1
 #, c-format
 msgid ""
 "To modify and to create in different languages such as Perl, Python, C and C+"
@@ -12864,6 +13043,11 @@ msgstr "พอร์ตอนุกรม"
 msgid "Restore Via Network"
 msgstr "เรียกคืนจากไฟล์"
 
+#: ../../standalone/drakbackup:1
+#, c-format
+msgid "Use tar and bzip2 (rather than tar and gzip)"
+msgstr ""
+
 #: ../../any.pm:1
 #, c-format
 msgid "Initrd-size"
@@ -12978,7 +13162,7 @@ msgstr ""
 msgid "Georgian (\"Latin\" layout)"
 msgstr "จอร์เจีย (เลย์เอ้าท์แบบละติน)"
 
-#: ../../share/advertising/09-mdksecure.pl:1
+#: ../advertising/09-mdksecure.pl:1
 #, c-format
 msgid "Get the best items with Mandrake Linux Strategic partners"
 msgstr ""
@@ -13078,7 +13262,7 @@ msgstr "Autologin"
 msgid "Domain Admin Password"
 msgstr ""
 
-#: ../../share/advertising/05-desktop.pl:1
+#: ../advertising/05-desktop.pl:1
 #, c-format
 msgid ""
 "Perfectly adapt your computer to your needs thanks to the 11 available "
@@ -13184,6 +13368,11 @@ msgstr ""
 msgid "Pipe job into a command"
 msgstr ""
 
+#: ../../../move/move.pm:1
+#, fuzzy, c-format
+msgid "Remove system config files"
+msgstr "ฟอร์แมต loopback file %s"
+
 #: ../../lang.pm:1
 #, c-format
 msgid "Cote d'Ivoire"
@@ -13195,7 +13384,8 @@ msgid "new dynamic device name generated by core kernel devfs"
 msgstr ""
 
 #: ../../help.pm:1 ../../install_any.pm:1 ../../interactive.pm:1
-#: ../../ugtk2.pm:1 ../../modules/interactive.pm:1 ../../standalone/drakgw:1
+#: ../../ugtk2.pm:1 ../../modules/interactive.pm:1
+#: ../../standalone/drakclock:1 ../../standalone/drakgw:1
 #: ../../standalone/harddrake2:1
 #, c-format
 msgid "Yes"
@@ -13216,11 +13406,6 @@ msgstr "เรียกคืนจากไฟล์"
 msgid "Estonia"
 msgstr "Estonian"
 
-#: ../../standalone/scannerdrake:1
-#, c-format
-msgid "Choose the host on which the local scanners should be made available:"
-msgstr ""
-
 #: ../../partition_table.pm:1
 #, c-format
 msgid ""
@@ -13231,6 +13416,11 @@ msgstr ""
 "คุณมีช่องว่างในตารางพาร์ติชั่น  แต่โปรแกรมจะไม่ใช้งานช่องว่างนั้น\n"
 "การแก้ไขปัญหาสามารถทำได้โดยย้ายไพรมารีพาร์ติชั่น เพื่อให้ช่องว่าไปต่อท้ายพาร์ติชั่นแบบ extended"
 
+#: ../../standalone/scannerdrake:1
+#, c-format
+msgid "Choose the host on which the local scanners should be made available:"
+msgstr ""
+
 #: ../../standalone/harddrake2:1
 #, fuzzy, c-format
 msgid "Channel"
@@ -13242,11 +13432,6 @@ msgstr "ยกเลิก"
 msgid "Add"
 msgstr "เพิ่ม"
 
-#: ../../standalone/drakgw:1
-#, c-format
-msgid "No Internet Connection Sharing has ever been configured."
-msgstr "ไม่มีการเชื่อมต่อกับ Internet แบบ sharing"
-
 #: ../../standalone/drakbackup:1
 #, fuzzy, c-format
 msgid " Error while sending mail. \n"
@@ -13525,7 +13710,7 @@ msgstr "นี่เป็นการติดตั้งหรือการ
 msgid "ISDN card"
 msgstr "Internal ISDN card"
 
-#: ../../share/advertising/02-community.pl:1
+#: ../advertising/02-community.pl:1
 #, c-format
 msgid ""
 "To share your own knowledge and help build Linux software, join our "
@@ -13561,6 +13746,40 @@ msgid ""
 "to Mandrake Linux version \"8.1\" is not recommended."
 msgstr ""
 
+#: ../../standalone/drakfont:1
+#, c-format
+msgid ""
+"\n"
+" Copyright (C) 2001-2002 by MandrakeSoft \n"
+"     DUPONT Sebastien (original version)\n"
+"     CHAUMETTE Damien <dchaumette@mandrakesoft.com>\n"
+"\n"
+" This program is free software; you can redistribute it and/or modify\n"
+" it under the terms of the GNU General Public License as published by\n"
+" the Free Software Foundation; either version 2, or (at your option)\n"
+" any later version.\n"
+"\n"
+" This program is distributed in the hope that it will be useful,\n"
+" but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
+" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
+" GNU General Public License for more details.\n"
+"\n"
+" You should have received a copy of the GNU General Public License\n"
+" along with this program; if not, write to the Free Software\n"
+" Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n"
+"\n"
+" Thanks:\n"
+"    -  pfm2afm:   \n"
+"\t by Ken Borgendale:\n"
+"\t    Convert a Windows .pfm  file to a .afm (Adobe Font Metrics)\n"
+"    -  type1inst:\n"
+"\t by James Macnicol: \n"
+"\t    type1inst generates files fonts.dir fonts.scale & Fontmap.\n"
+"    -  ttf2pt1:   \n"
+"\t  by Andrew Weeks, Frank Siegert, Thomas Henlich, Sergey Babkin  \n"
+"             Convert ttf font files to afm and pfb fonts\n"
+msgstr ""
+
 #: ../../printer/main.pm:1
 #, fuzzy, c-format
 msgid "Printer on remote CUPS server"
@@ -13627,6 +13846,11 @@ msgstr ""
 msgid "Unsafe"
 msgstr "Unsafe"
 
+#: ../../network/drakfirewall.pm:1
+#, fuzzy, c-format
+msgid "SSH server"
+msgstr "เซิร์ฟเวอร์ NIS"
+
 #: ../../diskdrake/interactive.pm:1
 #, c-format
 msgid ", %s sectors"
@@ -13634,7 +13858,7 @@ msgstr ", %s เซ็กเตอร์"
 
 #: ../../help.pm:1 ../../install_any.pm:1 ../../interactive.pm:1
 #: ../../ugtk2.pm:1 ../../modules/interactive.pm:1
-#: ../../standalone/harddrake2:1
+#: ../../standalone/drakclock:1 ../../standalone/harddrake2:1
 #, c-format
 msgid "No"
 msgstr "ไม่ต้อง"
@@ -14154,6 +14378,11 @@ msgstr "ลบคิว"
 msgid "Network configuration"
 msgstr "การคอนฟิกระบบเน็ตเวิร์ก"
 
+#: ../../standalone/harddrake2:1
+#, fuzzy, c-format
+msgid "/Autodetect _jaz drives"
+msgstr "ใช้ auto detection"
+
 #: ../../any.pm:1
 #, fuzzy, c-format
 msgid "No sharing"
@@ -14265,9 +14494,10 @@ msgstr ""
 #: ../../install_steps.pm:1 ../../diskdrake/dav.pm:1
 #: ../../diskdrake/hd_gtk.pm:1 ../../diskdrake/interactive.pm:1
 #: ../../diskdrake/smbnfs_gtk.pm:1 ../../interactive/http.pm:1
-#: ../../standalone/drakboot:1 ../../standalone/drakbug:1
+#: ../../standalone/drakauth:1 ../../standalone/drakboot:1
+#: ../../standalone/drakbug:1 ../../standalone/drakconnect:1
 #: ../../standalone/drakfloppy:1 ../../standalone/drakfont:1
-#: ../../standalone/draksplash:1
+#: ../../standalone/draksplash:1 ../../../move/move.pm:1
 #, c-format
 msgid "Error"
 msgstr "ผิดพลาด"
@@ -14311,6 +14541,11 @@ msgstr ""
 "เครื่องของคุณสนับสนุนการคอนฟิกแบบ multihead \n"
 "คุณต้องการทำอะไร?"
 
+#: ../../partition_table.pm:1
+#, c-format
+msgid "mount failed: "
+msgstr "การเม้าท์ล้มเหลว: "
+
 #: ../../steps.pm:1
 #, c-format
 msgid "Configure services"
@@ -14321,11 +14556,6 @@ msgstr "ปรับแต่งการบริการต่างๆ"
 msgid "Broadcast Address:"
 msgstr ""
 
-#: ../../partition_table.pm:1
-#, c-format
-msgid "mount failed: "
-msgstr "การเม้าท์ล้มเหลว: "
-
 #: ../../standalone/harddrake2:1
 #, c-format
 msgid ""
@@ -14339,16 +14569,16 @@ msgstr ""
 msgid "Image"
 msgstr "Image"
 
-#: ../../printer/printerdrake.pm:1
-#, c-format
-msgid "Failed to add the printer \"%s\" to Star Office/OpenOffice.org/GIMP."
-msgstr ""
-
 #: ../../services.pm:1
 #, fuzzy, c-format
 msgid "Remote Administration"
 msgstr "อ๊อปชั่นของเครื่องพิมพ์แบบรีโมท"
 
+#: ../../printer/printerdrake.pm:1
+#, c-format
+msgid "Failed to add the printer \"%s\" to Star Office/OpenOffice.org/GIMP."
+msgstr ""
+
 #: ../../modules.pm:1
 #, c-format
 msgid ""
@@ -14405,7 +14635,7 @@ msgstr "กรกฎาคม"
 msgid "Prints into %s"
 msgstr "ข้อผิดพลาดถูกบันทึกในไฟล์ %s"
 
-#: ../../install_steps_interactive.pm:1
+#: ../../install_steps_interactive.pm:1 ../../../move/move.pm:1
 #, c-format
 msgid "An error occurred"
 msgstr "มีปัญหาเกิดขึ้น"
@@ -14610,7 +14840,7 @@ msgstr ""
 msgid "Laos"
 msgstr ""
 
-#: ../../share/advertising/04-configuration.pl:1
+#: ../advertising/04-configuration.pl:1
 #, c-format
 msgid ""
 "Mandrake Linux 9.2 provides you with the Mandrake Control Center, a powerful "
@@ -14784,11 +15014,6 @@ msgstr ""
 msgid "Is FPU present"
 msgstr ""
 
-#: ../../standalone/scannerdrake:1
-#, c-format
-msgid "There are no scanners found which are available on your system.\n"
-msgstr ""
-
 #: ../../services.pm:1
 #, c-format
 msgid ""
@@ -14798,6 +15023,11 @@ msgstr ""
 "ไม่มีข้อมูลเพิ่มเติม\n"
 "สำหรับการบริการนี้ ขอโทษครับ"
 
+#: ../../standalone/scannerdrake:1
+#, c-format
+msgid "There are no scanners found which are available on your system.\n"
+msgstr ""
+
 #: ../../standalone/drakTermServ:1
 #, c-format
 msgid "Build Single NIC -->"
@@ -14838,16 +15068,6 @@ msgstr "อุปกรณ์"
 msgid "if set to yes, report unowned files."
 msgstr ""
 
-#: ../../standalone/harddrake2:1
-#, c-format
-msgid ""
-"This is HardDrake, a Mandrake 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 ""
-
 #: ../../install_interactive.pm:1
 #, c-format
 msgid ""
@@ -14929,11 +15149,22 @@ msgstr ""
 msgid "/_Fields description"
 msgstr "รายละเอียด"
 
-#: ../../share/advertising/10-security.pl:1
+#: ../advertising/10-security.pl:1
 #, c-format
 msgid "Optimize your security by using Mandrake Linux"
 msgstr ""
 
+#: ../../standalone/drakTermServ:1
+#, c-format
+msgid ""
+"\n"
+"\n"
+" Thanks:\n"
+"\t- LTSP Project http://www.ltsp.org\n"
+"\t- Michael Brown <mbrown@fensystems.co.uk>\n"
+"\n"
+msgstr ""
+
 #: ../../install_steps_gtk.pm:1 ../../interactive.pm:1 ../../ugtk2.pm:1
 #: ../../Xconfig/resolution_and_depth.pm:1 ../../diskdrake/hd_gtk.pm:1
 #: ../../interactive/gtk.pm:1 ../../standalone/drakTermServ:1
@@ -15020,7 +15251,7 @@ msgstr ""
 msgid "mkinitrd optional arguments"
 msgstr "mkinitrd optional arguments"
 
-#: ../../share/advertising/03-software.pl:1
+#: ../advertising/03-software.pl:1
 #, c-format
 msgid ""
 "Surf the Web with Mozilla or Konqueror, read your mail with Evolution or "
@@ -15209,6 +15440,11 @@ msgstr "จำเพาะ"
 msgid "Printing/Scanning/Photo Cards on \"%s\""
 msgstr "ระบบเน็ตเวิร์กกำลังจะหยุดทำงาน"
 
+#: ../../../move/move.pm:1
+#, c-format
+msgid "Continue without USB key"
+msgstr ""
+
 #: ../../install_steps.pm:1
 #, c-format
 msgid "Duplicate mount point %s"
@@ -15603,7 +15839,7 @@ msgstr "การติดต่อโดยใช้ Modem ธรรมดา"
 msgid "Hardware probing in progress"
 msgstr "ค้นหาเจอบน port %s"
 
-#: ../../standalone/drakgw:1
+#: ../../network/shorewall.pm:1 ../../standalone/drakgw:1
 #, fuzzy, c-format
 msgid "Net Device"
 msgstr "ชื่อเซิร์ฟเวอร์ของพรินเตอร์"
@@ -15661,6 +15897,11 @@ msgid ""
 "Click \"Ok\" to install 'ImageMagick' or \"Cancel\" to quit"
 msgstr ""
 
+#: ../../network/drakfirewall.pm:1
+#, fuzzy, c-format
+msgid "Telnet server"
+msgstr "X เซิร์ฟเวอร์"
+
 #: ../../keyboard.pm:1
 #, c-format
 msgid "Lithuanian \"number row\" QWERTY"
@@ -15915,7 +16156,7 @@ msgstr "syslog"
 msgid "Can't create catalog!"
 msgstr ""
 
-#: ../../share/advertising/11-mnf.pl:1
+#: ../advertising/11-mnf.pl:1
 #, c-format
 msgid ""
 "Complete your security setup with this very easy-to-use software which "
@@ -15966,6 +16207,11 @@ msgstr "การปรับแต่งการติดต่อเข้า
 msgid "Add the name as an exception to the handling of password aging by msec."
 msgstr ""
 
+#: ../../network/isdn.pm:1
+#, c-format
+msgid "USB"
+msgstr ""
+
 #: ../../standalone/drakxtv:1
 #, c-format
 msgid "Scanning for TV channels"
@@ -16026,6 +16272,11 @@ msgstr "เวิร์กกรุ๊ป (workgroup)"
 msgid "Printer host name or IP"
 msgstr "ชื่อของเครื่องพิมพ์"
 
+#: ../../standalone/drakconnect:1
+#, fuzzy, c-format
+msgid "down"
+msgstr "ทำเรียบร้อยแล้ว"
+
 #: ../../standalone/drakbackup:1
 #, c-format
 msgid "Host Path or Module"
@@ -16424,6 +16675,11 @@ msgstr "เพิ่มผู้ใช้"
 msgid "The printers on this machine are available to other computers"
 msgstr ""
 
+#: ../../lang.pm:1
+#, c-format
+msgid "China (Hong Kong)"
+msgstr ""
+
 #: ../../standalone/drakautoinst:1
 #, c-format
 msgid "I can't find needed image file `%s'."
@@ -16477,7 +16733,7 @@ msgstr "ออกจากการติดตั้ง"
 msgid "American Samoa"
 msgstr ""
 
-#: ../../share/advertising/12-mdkexpert.pl:1
+#: ../advertising/12-mdkexpert.pl:1
 #, fuzzy, c-format
 msgid "Become a MandrakeExpert"
 msgstr "แบบผู้เชี่ยวชาญ (Expert)"
@@ -16593,6 +16849,11 @@ msgstr "อิตาลี"
 msgid "Cayman Islands"
 msgstr ""
 
+#: ../../fs.pm:1 ../../partition_table.pm:1
+#, c-format
+msgid "error unmounting %s: %s"
+msgstr "ผิดพลาดยกเลิกการเม้าท์ %s: %s"
+
 #: ../../printer/printerdrake.pm:1
 #, c-format
 msgid "Name of printer"
@@ -16603,11 +16864,6 @@ msgstr "ชื่อเครื่องพิมพ์"
 msgid "disable"
 msgstr "disable"
 
-#: ../../fs.pm:1 ../../partition_table.pm:1
-#, c-format
-msgid "error unmounting %s: %s"
-msgstr "ผิดพลาดยกเลิกการเม้าท์ %s: %s"
-
 #: ../../printer/printerdrake.pm:1
 #, c-format
 msgid "Do it!"
@@ -16706,7 +16962,7 @@ msgstr "แบบอัด (Compact)"
 msgid "Detected model: %s %s"
 msgstr "ค้นพบ %s"
 
-#: ../../share/advertising/03-software.pl:1
+#: ../advertising/03-software.pl:1
 #, c-format
 msgid "MandrakeSoft has selected the best software for you"
 msgstr ""
@@ -16810,6 +17066,11 @@ msgstr "ให้เป็นกราฟฟิคเมื่อเริ่ม
 msgid " adsl"
 msgstr ""
 
+#: ../../raid.pm:1
+#, c-format
+msgid "Not enough partitions for RAID level %d\n"
+msgstr "ไม่มีพาร์ติชั่นพอสำหรับ RAID ระดับ %d\n"
+
 #: ../../standalone/harddrake2:1
 #, c-format
 msgid "format of floppies supported by the drive"
@@ -16820,11 +17081,6 @@ msgstr ""
 msgid "Firmware copy failed, file %s not found"
 msgstr ""
 
-#: ../../raid.pm:1
-#, c-format
-msgid "Not enough partitions for RAID level %d\n"
-msgstr "ไม่มีพาร์ติชั่นพอสำหรับ RAID ระดับ %d\n"
-
 #: ../../standalone/drakTermServ:1
 #, fuzzy, c-format
 msgid "local config: true"
@@ -16944,7 +17200,7 @@ msgid ""
 "No CD or DVD image found, please copy the installation program and rpm files."
 msgstr ""
 
-#: ../../share/advertising/04-configuration.pl:1
+#: ../advertising/04-configuration.pl:1
 #, fuzzy, c-format
 msgid "Mandrake's multipurpose configuration tool"
 msgstr "การคอนฟิก Internet"
@@ -16974,7 +17230,7 @@ msgstr "เดนมาร์ก"
 msgid "Enter a printer device URI"
 msgstr "อุปกรณ์เครื่องพิมพ์ URI"
 
-#: ../../share/advertising/01-thanks.pl:1
+#: ../advertising/01-thanks.pl:1
 #, c-format
 msgid ""
 "The success of MandrakeSoft is based upon the principle of Free Software. "
@@ -17430,7 +17686,7 @@ msgstr "Card mem (DMA)"
 msgid "Thin Client"
 msgstr "DHCP Client"
 
-#: ../../share/advertising/01-thanks.pl:1
+#: ../advertising/01-thanks.pl:1
 #, c-format
 msgid "Thank you for choosing Mandrake Linux 9.2"
 msgstr ""
@@ -17533,6 +17789,13 @@ msgstr ""
 msgid "Mouse Systems"
 msgstr "Mouse Systems"
 
+#: ../../standalone/drakclock:1
+#, c-format
+msgid ""
+"Your computer can synchronize its clock\n"
+" with a remote time server using NTP"
+msgstr ""
+
 #: ../../keyboard.pm:1
 #, c-format
 msgid "Iranian"
@@ -17558,7 +17821,7 @@ msgstr "เพิ่มผู้ใช้"
 msgid "Remote printer name"
 msgstr "เครื่องพิมพ์แบบรีโมท"
 
-#: ../../share/advertising/10-security.pl:1
+#: ../advertising/10-security.pl:1
 #, c-format
 msgid ""
 "MandrakeSoft has designed exclusive tools to create the most secured Linux "
@@ -17705,6 +17968,11 @@ msgstr "Microsoft IntelliMouse"
 msgid "Uninstall Fonts"
 msgstr ""
 
+#: ../../../move/move.pm:1
+#, fuzzy, c-format
+msgid "Please wait, detecting and configuring devices..."
+msgstr "เลือกระดับระบบรักษาความปลอดภัย"
+
 #: ../../keyboard.pm:1
 #, c-format
 msgid "German (no dead keys)"
@@ -17731,11 +17999,6 @@ msgid ""
 "You can export using NFS or Samba. Please select which you'd like to use."
 msgstr ""
 
-#: ../../help.pm:1 ../../install_steps_interactive.pm:1
-#, fuzzy, c-format
-msgid "Reboot"
-msgstr "Root"
-
 #: ../../lang.pm:1
 #, c-format
 msgid "Gambia"
@@ -17746,6 +18009,12 @@ msgstr ""
 msgid "Mandrake Control Center"
 msgstr "Control Center"
 
+#: ../../help.pm:1 ../../install_steps_interactive.pm:1
+#: ../../../move/move.pm:1
+#, fuzzy, c-format
+msgid "Reboot"
+msgstr "Root"
+
 #: ../../printer/main.pm:1
 #, c-format
 msgid "Multi-function device"
@@ -17776,6 +18045,11 @@ msgstr ""
 msgid "Remember this password"
 msgstr "ไม่มีรหัสผ่าน"
 
+#: ../../install_steps_gtk.pm:1
+#, c-format
+msgid "due to unsatisfied %s"
+msgstr ""
+
 #: ../../standalone/drakgw:1
 #, c-format
 msgid "Internet Connection Sharing is now enabled."
@@ -17833,6 +18107,11 @@ msgstr ""
 msgid "Multi-function device on a parallel port"
 msgstr "ชื่อของเครื่องพิมพ์"
 
+#: ../../../move/tree/mdk_totem:1
+#, fuzzy, c-format
+msgid "Busy files"
+msgstr "ไฟล์แบ็คอัพมีปัญหา"
+
 #: ../../keyboard.pm:1
 #, fuzzy, c-format
 msgid "Serbian (cyrillic)"
@@ -17894,6 +18173,16 @@ msgstr ""
 msgid "DHCP Client"
 msgstr "DHCP Client"
 
+#: ../../standalone/harddrake2:1
+#, c-format
+msgid ""
+"This is HardDrake, a Mandrake 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/drakgw:1
 #, c-format
 msgid "dismiss"
@@ -18076,47 +18365,13 @@ msgstr ""
 msgid "Delay before booting the default image"
 msgstr "หน่วงเวลาก่อนทำการบูตอิมเมจที่ใช้"
 
-#: ../../standalone/drakfont:1
-#, c-format
-msgid ""
-"\n"
-" Copyright (C) 2001-2002 by MandrakeSoft \n"
-"     DUPONT Sebastien (original version)\n"
-"     CHAUMETTE Damien <dchaumette\\@mandrakesoft.com>\n"
-"\n"
-" This program is free software; you can redistribute it and/or modify\n"
-" it under the terms of the GNU General Public License as published by\n"
-" the Free Software Foundation; either version 2, or (at your option)\n"
-" any later version.\n"
-"\n"
-" This program is distributed in the hope that it will be useful,\n"
-" but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
-" GNU General Public License for more details.\n"
-"\n"
-" You should have received a copy of the GNU General Public License\n"
-" along with this program; if not, write to the Free Software\n"
-" Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n"
-"\n"
-" Thanks:\n"
-"    -  pfm2afm:   \n"
-"\t by Ken Borgendale:\n"
-"\t    Convert a Windows .pfm  file to a .afm (Adobe Font Metrics)\n"
-"    -  type1inst:\n"
-"\t by James Macnicol: \n"
-"\t    type1inst generates files fonts.dir fonts.scale & Fontmap.\n"
-"    -  ttf2pt1:   \n"
-"\t  by Andrew Weeks, Frank Siegert, Thomas Henlich, Sergey Babkin  \n"
-"             Convert ttf font files to afm and pfb fonts\n"
-msgstr ""
-
 #: ../../standalone/drakbackup:1
 #, fuzzy, c-format
 msgid "Use Hard Disk to backup"
 msgstr "ไฟล์แบ็คอัพมีปัญหา"
 
 #: ../../help.pm:1 ../../install_steps_gtk.pm:1 ../../standalone/drakbackup:1
-#: ../../standalone/drakboot:1 ../../standalone/drakgw:1
+#: ../../standalone/drakboot:1
 #, c-format
 msgid "Configure"
 msgstr "การปรับแต่ง"
@@ -18184,7 +18439,7 @@ msgstr ""
 "กรุณาตรวจสอบ cdrom ในเครื่องคอมพิวเตอร์ที่มีการติดตั้งแล้ว\n"
 "โดยใช้ \"rpm -qpl Mandrake/RPMS/*.rpm\"\n"
 
-#: ../../share/advertising/06-development.pl:1
+#: ../advertising/06-development.pl:1
 #, c-format
 msgid "Mandrake Linux 9.2: the ultimate development platform"
 msgstr ""
@@ -18265,6 +18520,11 @@ msgstr "ขนาดจอภาพ"
 msgid "Services"
 msgstr "อุปกรณ์"
 
+#: ../../../move/move.pm:1
+#, fuzzy, c-format
+msgid "Auto configuration"
+msgstr "การคอนฟิก"
+
 #: ../../Xconfig/card.pm:1
 #, c-format
 msgid "4 MB"
@@ -18304,9 +18564,10 @@ msgid "Internet station"
 msgstr "การเชื่อมต่อกับ Internet แบบ sharing"
 
 #: ../../share/compssUsers:999
+#, fuzzy
 msgid ""
-"Set of tools to read and send mail and news (pine, mutt, tin..) and to "
-"browse the Web"
+"Set of tools to read and send mail and news (mutt, tin..) and to browse the "
+"Web"
 msgstr "เครื่องมือในการอ่านและส่ง mail และ news (pine, mutt, tin..) และท่องอินเตอร์เน็ต"
 
 #: ../../share/compssUsers:999
@@ -18450,6 +18711,34 @@ msgstr ""
 msgid "Set of tools to read and send mail and news and to browse the Web"
 msgstr "เครื่องมือในการอ่านและส่ง mail และ news (pine, mutt, tin..) และท่องอินเตอร์เน็ต"
 
+#~ msgid "The setup has already been done, and it's currently enabled."
+#~ msgstr "การปรับแต่งเรียบร้อยแล้วและตอนนี้ก็ได้ทำงานแล้ว"
+
+#, fuzzy
+#~ msgid "Profile "
+#~ msgstr "Profile: "
+
+#, fuzzy
+#~ msgid ""
+#~ "Welcome to the Internet Connection Sharing utility!\n"
+#~ "\n"
+#~ "%s\n"
+#~ "\n"
+#~ "Click on Configure to launch the setup wizard."
+#~ msgstr ""
+#~ "ยินดีต้อนรับสู่เครื่องมือในการติดต่อ internet แบบ share\n"
+#~ "\n"
+#~ "%s\n"
+#~ "\n"
+#~ "กด ``Ok'' ถ้าคุณต้องการเริ่มการทำงานของ setup wizard"
+
+#, fuzzy
+#~ msgid "Internet Connection Sharing configuration"
+#~ msgstr "การเชื่อมต่อ Internet และการปรับแต่ง"
+
+#~ msgid "No Internet Connection Sharing has ever been configured."
+#~ msgstr "ไม่มีการเชื่อมต่อกับ Internet แบบ sharing"
+
 #, fuzzy
 #~ msgid "Hostname configuration"
 #~ msgstr "การคอนฟิก"