sync with code

1 files changed, 264 insertions, 221 deletions

diff --git a/perl-install/install/share/po/th.po b/perl-install/install/share/po/th.po
index 296155133..dbfe06c12 100644
--- a/perl-install/install/share/po/th.po
+++ b/perl-install/install/share/po/th.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DrakX\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-02-13 16:29+0100\n"
+"POT-Creation-Date: 2009-03-30 15:42+0200\n"
 "PO-Revision-Date: 2001-09-10 14:24GMT+7\n"
 "Last-Translator: Wachara Chinsettawong <wachara@yahoo.com>\n"
 "Language-Team: Thai <th@li.org>\n"
@@ -16,6 +16,31 @@ msgstr ""
 "X-Generator: KBabel 0.9.5\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: ../../advertising/IM_flash.pl:1
+#, c-format
+msgid "Your desktop on a USB key"
+msgstr ""
+
+#: ../../advertising/IM_free09.pl:1
+#, c-format
+msgid "The 100%% open source Mandriva Linux distribution"
+msgstr ""
+
+#: ../../advertising/IM_one09.pl:1
+#, c-format
+msgid "Explore Linux easily with Mandriva One"
+msgstr ""
+
+#: ../../advertising/IM_pwp09.pl:1
+#, c-format
+msgid "A full Mandriva Linux desktop, with support"
+msgstr ""
+
+#: ../../advertising/IM_range09.pl:1
+#, c-format
+msgid "Mandriva: distributions for everybody's needs"
+msgstr ""
+
 #: any.pm:109
 #, fuzzy, c-format
 msgid "Do you have further supplementary media?"
@@ -126,17 +151,17 @@ msgstr "Adapter %s: %s"
 msgid "Looking at packages already installed..."
 msgstr "คุณไม่สามารถไม่เลือกแพกเกจนี้เพราะมันได้ถูกติดตั้งไปแล้ว"
 
-#: any.pm:335
-#, c-format
-msgid "Removing packages prior to upgrade..."
-msgstr ""
-
-#: any.pm:377
+#: any.pm:362
 #, c-format
 msgid "Finding packages to upgrade..."
 msgstr "กำลังหาแพ็คเก็จที่จะทำการอัพเกรด"
 
-#: any.pm:389
+#: any.pm:381
+#, c-format
+msgid "Removing packages prior to upgrade..."
+msgstr ""
+
+#: any.pm:402
 #, c-format
 msgid ""
 "You have decided to upgrade your system to %s. KDE 3.5 has been detected\n"
@@ -148,18 +173,18 @@ msgid ""
 "please reboot your system and upgrade using the Mandriva update applet."
 msgstr ""
 
-#: any.pm:394 steps_interactive.pm:1125
+#: any.pm:407 steps_interactive.pm:1106
 #, c-format
 msgid "Reboot"
 msgstr ""
 
-#: any.pm:394
+#: any.pm:407
 #, c-format
 msgid "Proceed"
 msgstr ""
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:584
+#: any.pm:596
 #, c-format
 msgid ""
 "The following packages will be removed to allow upgrading your system: %s\n"
@@ -168,72 +193,72 @@ msgid ""
 "Do you really want to remove these packages?\n"
 msgstr ""
 
-#: any.pm:803
+#: any.pm:815
 #, c-format
 msgid "Error reading file %s"
 msgstr "มีปัญหากับการอ่านข้อมูลในไฟล์ %s"
 
-#: any.pm:1010
+#: any.pm:1022
 #, fuzzy, c-format
 msgid "The following disk(s) were renamed:"
 msgstr "แพ็คเก็จเหล่านี้กำลังจะถูกติดตั้ง"
 
-#: any.pm:1012
+#: any.pm:1024
 #, c-format
 msgid "%s (previously named as %s)"
 msgstr ""
 
-#: any.pm:1069
+#: any.pm:1081
 #, c-format
 msgid "HTTP"
 msgstr "HTTP"
 
-#: any.pm:1069
+#: any.pm:1081
 #, c-format
 msgid "FTP"
 msgstr "FTP"
 
-#: any.pm:1069
+#: any.pm:1081
 #, c-format
 msgid "NFS"
 msgstr "NFS"
 
-#: any.pm:1088 steps_interactive.pm:954
+#: any.pm:1100 steps_interactive.pm:935
 #, c-format
 msgid "Network"
 msgstr "ระบบเครือข่าย"
 
-#: any.pm:1092
+#: any.pm:1104
 #, fuzzy, c-format
 msgid "Please choose a media"
 msgstr "กรุณาเลือก"
 
-#: any.pm:1108
+#: any.pm:1120
 #, fuzzy, c-format
 msgid "File already exists. Overwrite it?"
 msgstr "ไฟล์มีอยู่แล้ว ต้องการใช้?"
 
-#: any.pm:1112
+#: any.pm:1124
 #, c-format
 msgid "Permission denied"
 msgstr "สิทธิการทำงานถูกปฎิเสท"
 
-#: any.pm:1160
+#: any.pm:1172
 #, c-format
 msgid "Bad NFS name"
 msgstr ""
 
-#: any.pm:1181
+#: any.pm:1193
 #, fuzzy, c-format
 msgid "Bad media %s"
 msgstr "อุปกรณ์ที่ถูกเพิ่มเข้ามา %s"
 
-#: any.pm:1224
+#: any.pm:1236
 #, fuzzy, c-format
 msgid "Can not make screenshots before partitioning"
 msgstr "โปรแกรมไม่สามารถเพิ่มพาร์ติชั่นได้อีก"
 
-#: any.pm:1232
+#: any.pm:1244
 #, fuzzy, c-format
 msgid "Screenshots will be available after install in %s"
 msgstr "คุณสามารถเลือกภาษาอื่นซึ่งจะสามารถใช้ได้หลังติดตั้ง"
@@ -244,6 +269,7 @@ msgid "Installation"
 msgstr "กำลังติดตั้ง"
 
 #: gtk.pm:134 share/meta-task/compssUsers.pl:44
+#: share/meta-task/compssUsers.pl.orig:44
 #, c-format
 msgid "Configuration"
 msgstr "ปรับแต่งค่า"
@@ -272,370 +298,412 @@ msgstr "ระบบเน็ตเวิร์กกำลังจะทำง
 msgid "Bringing down the network"
 msgstr "ระบบเน็ตเวิร์กกำลังจะหยุดทำงาน"
 
-#: media.pm:422
+#: media.pm:402
 #, c-format
 msgid "Please wait, retrieving file"
 msgstr ""
 
-#: media.pm:705 media.pm:716
+#: media.pm:734
 #, fuzzy, c-format
 msgid "Downloading file %s..."
 msgstr "บันทึกลงไฟล์"
 
-#: media.pm:808
+#: media.pm:822
 #, c-format
 msgid "Copying some packages on disks for future use"
 msgstr ""
 
-#: media.pm:861
+#: media.pm:875
 #, fuzzy, c-format
 msgid "Copying in progress"
 msgstr "ค้นหาเจอบน port %s"
 
-#: pkgs.pm:29
+#: pkgs.pm:32
 #, c-format
 msgid "must have"
 msgstr "ต้องมี"
 
-#: pkgs.pm:30
+#: pkgs.pm:33
 #, c-format
 msgid "important"
 msgstr "สำคัญ"
 
-#: pkgs.pm:31
+#: pkgs.pm:34
 #, c-format
 msgid "very nice"
 msgstr "ดีมาก"
 
-#: pkgs.pm:32
+#: pkgs.pm:35
 #, c-format
 msgid "nice"
 msgstr "ดี"
 
-#: pkgs.pm:33
+#: pkgs.pm:36
 #, c-format
 msgid "maybe"
 msgstr "อาจจะ"
 
-#: pkgs.pm:253
+#: pkgs.pm:225
 #, c-format
 msgid ""
 "Some packages requested by %s cannot be installed:\n"
 "%s"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:13
+#: pkgs.pm:313
+#, fuzzy, c-format
+msgid "An error occurred:"
+msgstr "มีปัญหาเกิดขึ้น"
+
+#: pkgs.pm:776
+#, c-format
+msgid "%d installation transactions failed"
+msgstr ""
+
+#: pkgs.pm:777
+#, fuzzy, c-format
+msgid "Installation of packages failed:"
+msgstr "กำลังติดตั้งแพ็คเก็จ %s"
+
+#: share/meta-task/compssUsers.pl:13 share/meta-task/compssUsers.pl.orig:13
 #, fuzzy, c-format
 msgid "Workstation"
 msgstr "Workstation ที่ทำงาน"
 
-#: share/meta-task/compssUsers.pl:15
+#: share/meta-task/compssUsers.pl:15 share/meta-task/compssUsers.pl.orig:15
 #, c-format
 msgid "Office Workstation"
 msgstr "Workstation ที่ทำงาน"
 
-#: share/meta-task/compssUsers.pl:17
+#: share/meta-task/compssUsers.pl:17 share/meta-task/compssUsers.pl.orig:17
 #, c-format
 msgid ""
 "Office programs: wordprocessors (OpenOffice.org Writer, Kword), spreadsheets "
 "(OpenOffice.org Calc, Kspread), PDF viewers, etc"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:18
+#: share/meta-task/compssUsers.pl:18 share/meta-task/compssUsers.pl.orig:18
 #, c-format
 msgid ""
 "Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
 "gnumeric), pdf viewers, etc"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:23
+#: share/meta-task/compssUsers.pl:23 share/meta-task/compssUsers.pl.orig:23
 #, fuzzy, c-format
 msgid "Game station"
 msgstr "Workstation ที่ทำงาน"
 
-#: share/meta-task/compssUsers.pl:24
+#: share/meta-task/compssUsers.pl:24 share/meta-task/compssUsers.pl.orig:24
 #, c-format
 msgid "Amusement programs: arcade, boards, strategy, etc"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:27
+#: share/meta-task/compssUsers.pl:27 share/meta-task/compssUsers.pl.orig:27
 #, fuzzy, c-format
 msgid "Multimedia station"
 msgstr "Multimedia - เขียน CD "
 
-#: share/meta-task/compssUsers.pl:28
+#: share/meta-task/compssUsers.pl:28 share/meta-task/compssUsers.pl.orig:28
 #, c-format
 msgid "Sound and video playing/editing programs"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:33
+#: share/meta-task/compssUsers.pl:33 share/meta-task/compssUsers.pl.orig:33
 #, fuzzy, c-format
 msgid "Internet station"
 msgstr "การเชื่อมต่อกับ Internet แบบ sharing"
 
-#: share/meta-task/compssUsers.pl:34
+#: share/meta-task/compssUsers.pl:34 share/meta-task/compssUsers.pl.orig:34
 #, fuzzy, c-format
 msgid ""
 "Set of tools to read and send mail and news (mutt, tin..) and to browse the "
 "Web"
 msgstr "เครื่องมือในการอ่านและส่ง mail และ news (pine, mutt, tin..) และท่องอินเตอร์เน็ต"
 
-#: share/meta-task/compssUsers.pl:39
+#: share/meta-task/compssUsers.pl:39 share/meta-task/compssUsers.pl.orig:39
 #, fuzzy, c-format
 msgid "Network Computer (client)"
 msgstr "เครื่องพิมพ์ในระบบ Network (Socket)"
 
-#: share/meta-task/compssUsers.pl:40
+#: share/meta-task/compssUsers.pl:40 share/meta-task/compssUsers.pl.orig:40
 #, c-format
 msgid "Clients for different protocols including ssh"
 msgstr "Clients for different protocols including ssh"
 
-#: share/meta-task/compssUsers.pl:45
+#: share/meta-task/compssUsers.pl:45 share/meta-task/compssUsers.pl.orig:45
 #, c-format
 msgid "Tools to ease the configuration of your computer"
 msgstr "เครืองมือที่ช่วยในการปรับแต่งเครื่องชองคุณให้ง่ายขึ้น"
 
-#: share/meta-task/compssUsers.pl:49
+#: share/meta-task/compssUsers.pl:49 share/meta-task/compssUsers.pl.orig:49
 #, c-format
 msgid "Console Tools"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:50
+#: share/meta-task/compssUsers.pl:50 share/meta-task/compssUsers.pl.orig:50
 #, c-format
 msgid "Editors, shells, file tools, terminals"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:156
-#: share/meta-task/compssUsers.pl:158
+#: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:157
+#: share/meta-task/compssUsers.pl:159 share/meta-task/compssUsers.pl.orig:54
+#: share/meta-task/compssUsers.pl.orig:156
+#: share/meta-task/compssUsers.pl.orig:158
 #, c-format
 msgid "Development"
 msgstr "พัฒนาซอฟท์แวร์ (Development)"
 
-#: share/meta-task/compssUsers.pl:55 share/meta-task/compssUsers.pl:159
+#: share/meta-task/compssUsers.pl:55 share/meta-task/compssUsers.pl:160
+#: share/meta-task/compssUsers.pl.orig:55
+#: share/meta-task/compssUsers.pl.orig:159
 #, c-format
 msgid "C and C++ development libraries, programs and include files"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:163
+#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164
+#: share/meta-task/compssUsers.pl.orig:58
+#: share/meta-task/compssUsers.pl.orig:163
 #, c-format
 msgid "Documentation"
 msgstr "คู่มือ"
 
-#: share/meta-task/compssUsers.pl:59 share/meta-task/compssUsers.pl:164
+#: share/meta-task/compssUsers.pl:59 share/meta-task/compssUsers.pl:165
+#: share/meta-task/compssUsers.pl.orig:59
+#: share/meta-task/compssUsers.pl.orig:164
 #, c-format
 msgid "Books and Howto's on Linux and Free Software"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:167
+#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168
+#: share/meta-task/compssUsers.pl.orig:63
+#: share/meta-task/compssUsers.pl.orig:167
 #, c-format
 msgid "LSB"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:64 share/meta-task/compssUsers.pl:168
+#: share/meta-task/compssUsers.pl:64 share/meta-task/compssUsers.pl:169
+#: share/meta-task/compssUsers.pl.orig:64
+#: share/meta-task/compssUsers.pl.orig:168
 #, c-format
 msgid "Linux Standard Base. Third party applications support"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:73
+#: share/meta-task/compssUsers.pl:73 share/meta-task/compssUsers.pl.orig:73
 #, fuzzy, c-format
 msgid "Web Server"
 msgstr "เซิร์ฟเวอร์"
 
-#: share/meta-task/compssUsers.pl:74
+#: share/meta-task/compssUsers.pl:74 share/meta-task/compssUsers.pl.orig:74
 #, c-format
 msgid "Apache"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:77
+#: share/meta-task/compssUsers.pl:77 share/meta-task/compssUsers.pl.orig:77
 #, fuzzy, c-format
 msgid "Groupware"
 msgstr "เวิร์กกรุ๊ป (workgroup)"
 
-#: share/meta-task/compssUsers.pl:78
+#: share/meta-task/compssUsers.pl:78 share/meta-task/compssUsers.pl.orig:78
 #, fuzzy, c-format
 msgid "Kolab Server"
 msgstr "เซิร์ฟเวอร์ NIS"
 
 #: share/meta-task/compssUsers.pl:81 share/meta-task/compssUsers.pl:122
+#: share/meta-task/compssUsers.pl.orig:81
+#: share/meta-task/compssUsers.pl.orig:122
 #, c-format
 msgid "Firewall/Router"
 msgstr ""
 
 #: share/meta-task/compssUsers.pl:82 share/meta-task/compssUsers.pl:123
+#: share/meta-task/compssUsers.pl.orig:82
+#: share/meta-task/compssUsers.pl.orig:123
 #, fuzzy, c-format
 msgid "Internet gateway"
 msgstr "การติดต่อ internet"
 
-#: share/meta-task/compssUsers.pl:85
+#: share/meta-task/compssUsers.pl:85 share/meta-task/compssUsers.pl.orig:85
 #, fuzzy, c-format
 msgid "Mail/News"
 msgstr "/ไฟล์/_ใหม่"
 
-#: share/meta-task/compssUsers.pl:86
+#: share/meta-task/compssUsers.pl:86 share/meta-task/compssUsers.pl.orig:86
 #, fuzzy, c-format
 msgid "Postfix mail server, Inn news server"
 msgstr "ชื่อเซิร์ฟเวอร์ของพรินเตอร์"
 
-#: share/meta-task/compssUsers.pl:89
+#: share/meta-task/compssUsers.pl:89 share/meta-task/compssUsers.pl.orig:89
 #, fuzzy, c-format
 msgid "Directory Server"
 msgstr "เรียกคืนจากแผ่นฟล้อปปี้"
 
-#: share/meta-task/compssUsers.pl:93
+#: share/meta-task/compssUsers.pl:93 share/meta-task/compssUsers.pl.orig:93
 #, fuzzy, c-format
 msgid "FTP Server"
 msgstr "เซิร์ฟเวอร์ NIS"
 
-#: share/meta-task/compssUsers.pl:94
+#: share/meta-task/compssUsers.pl:94 share/meta-task/compssUsers.pl.orig:94
 #, c-format
 msgid "ProFTPd"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:97
+#: share/meta-task/compssUsers.pl:97 share/meta-task/compssUsers.pl.orig:97
 #, fuzzy, c-format
 msgid "DNS/NIS"
 msgstr "ใช้ NIS"
 
-#: share/meta-task/compssUsers.pl:98
+#: share/meta-task/compssUsers.pl:98 share/meta-task/compssUsers.pl.orig:98
 #, fuzzy, c-format
 msgid "Domain Name and Network Information Server"
 msgstr "ชื่อโดเมน"
 
-#: share/meta-task/compssUsers.pl:101
+#: share/meta-task/compssUsers.pl:101 share/meta-task/compssUsers.pl.orig:101
 #, fuzzy, c-format
 msgid "File and Printer Sharing Server"
 msgstr "ชื่อเซิร์ฟเวอร์ของพรินเตอร์"
 
-#: share/meta-task/compssUsers.pl:102
+#: share/meta-task/compssUsers.pl:102 share/meta-task/compssUsers.pl.orig:102
 #, fuzzy, c-format
 msgid "NFS Server, Samba server"
 msgstr "เซิร์ฟเวอร์ NIS"
 
 #: share/meta-task/compssUsers.pl:105 share/meta-task/compssUsers.pl:118
+#: share/meta-task/compssUsers.pl.orig:105
+#: share/meta-task/compssUsers.pl.orig:118
 #, c-format
 msgid "Database"
 msgstr "ฐานข้อมูล"
 
-#: share/meta-task/compssUsers.pl:106
+#: share/meta-task/compssUsers.pl:106 share/meta-task/compssUsers.pl.orig:106
 #, c-format
 msgid "PostgreSQL and MySQL Database Server"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:110
+#: share/meta-task/compssUsers.pl:110 share/meta-task/compssUsers.pl.orig:110
 #, c-format
 msgid "Web/FTP"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:111
+#: share/meta-task/compssUsers.pl:111 share/meta-task/compssUsers.pl.orig:111
 #, c-format
 msgid "Apache, Pro-ftpd"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:114
+#: share/meta-task/compssUsers.pl:114 share/meta-task/compssUsers.pl.orig:114
 #, c-format
 msgid "Mail"
 msgstr "จดหมาย"
 
-#: share/meta-task/compssUsers.pl:115
+#: share/meta-task/compssUsers.pl:115 share/meta-task/compssUsers.pl.orig:115
 #, fuzzy, c-format
 msgid "Postfix mail server"
 msgstr "ชื่อเซิร์ฟเวอร์ของพรินเตอร์"
 
-#: share/meta-task/compssUsers.pl:119
+#: share/meta-task/compssUsers.pl:119 share/meta-task/compssUsers.pl.orig:119
 #, c-format
 msgid "PostgreSQL or MySQL database server"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:126
+#: share/meta-task/compssUsers.pl:126 share/meta-task/compssUsers.pl.orig:126
 #, fuzzy, c-format
 msgid "Network Computer server"
 msgstr "เครื่องพิมพ์ในระบบ Network (Socket)"
 
-#: share/meta-task/compssUsers.pl:127
+#: share/meta-task/compssUsers.pl:127 share/meta-task/compssUsers.pl.orig:127
 #, c-format
 msgid "NFS server, SMB server, Proxy server, ssh server"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:133
+#: share/meta-task/compssUsers.pl:133 share/meta-task/compssUsers.pl.orig:133
 #, c-format
 msgid "Graphical Environment"
 msgstr "การทำงานแบบกราฟฟิก"
 
-#: share/meta-task/compssUsers.pl:135
+#: share/meta-task/compssUsers.pl:135 share/meta-task/compssUsers.pl.orig:135
 #, fuzzy, c-format
 msgid "KDE Workstation"
 msgstr "Workstation ที่ทำงาน"
 
-#: share/meta-task/compssUsers.pl:136
+#: share/meta-task/compssUsers.pl:136 share/meta-task/compssUsers.pl.orig:136
 #, c-format
 msgid ""
 "The K Desktop Environment, the basic graphical environment with a collection "
 "of accompanying tools"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:140
+#: share/meta-task/compssUsers.pl:140 share/meta-task/compssUsers.pl.orig:140
 #, fuzzy, c-format
 msgid "GNOME Workstation"
 msgstr "Workstation ที่ทำงาน"
 
-#: share/meta-task/compssUsers.pl:141
+#: share/meta-task/compssUsers.pl:141 share/meta-task/compssUsers.pl.orig:141
 #, c-format
 msgid ""
 "A graphical environment with user-friendly set of applications and desktop "
 "tools"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:145
+#: share/meta-task/compssUsers.pl:145 share/meta-task/compssUsers.pl.orig:145
 #, fuzzy, c-format
 msgid "LXDE Desktop"
 msgstr "พื้นที่ทำงาน"
 
-#: share/meta-task/compssUsers.pl:149
+#: share/meta-task/compssUsers.pl:147
+#, c-format
+msgid ""
+"A lightweight & fast graphical environment with user-friendly set of "
+"applications and desktop tools"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:150 share/meta-task/compssUsers.pl.orig:149
 #, c-format
 msgid "Other Graphical Desktops"
 msgstr "Graphical Desktops อื่นๆ"
 
-#: share/meta-task/compssUsers.pl:150
+#: share/meta-task/compssUsers.pl:151 share/meta-task/compssUsers.pl.orig:150
 #, c-format
 msgid "Window Maker, Enlightenment, Fvwm, etc"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:173
+#: share/meta-task/compssUsers.pl:174 share/meta-task/compssUsers.pl.orig:173
 #, c-format
 msgid "Utilities"
 msgstr "อรรถประโยชน์"
 
-#: share/meta-task/compssUsers.pl:175 share/meta-task/compssUsers.pl:176
+#: share/meta-task/compssUsers.pl:176 share/meta-task/compssUsers.pl:177
+#: share/meta-task/compssUsers.pl.orig:175
+#: share/meta-task/compssUsers.pl.orig:176
 #, fuzzy, c-format
 msgid "SSH Server"
 msgstr "เซิร์ฟเวอร์ NIS"
 
-#: share/meta-task/compssUsers.pl:180
+#: share/meta-task/compssUsers.pl:181 share/meta-task/compssUsers.pl.orig:180
 #, fuzzy, c-format
 msgid "Webmin"
 msgstr "อุปกรณ์"
 
-#: share/meta-task/compssUsers.pl:181
+#: share/meta-task/compssUsers.pl:182 share/meta-task/compssUsers.pl.orig:181
 #, fuzzy, c-format
 msgid "Webmin Remote Configuration Server"
 msgstr "การคอนฟิก Internet"
 
-#: share/meta-task/compssUsers.pl:185
+#: share/meta-task/compssUsers.pl:186 share/meta-task/compssUsers.pl.orig:185
 #, fuzzy, c-format
 msgid "Network Utilities/Monitoring"
 msgstr "การคอนฟิกระบบเน็ตเวิร์ก"
 
-#: share/meta-task/compssUsers.pl:186
+#: share/meta-task/compssUsers.pl:187 share/meta-task/compssUsers.pl.orig:186
 #, c-format
 msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..."
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:190
+#: share/meta-task/compssUsers.pl:191 share/meta-task/compssUsers.pl.orig:190
 #, fuzzy, c-format
 msgid "Mandriva Wizards"
 msgstr "Control Center"
 
-#: share/meta-task/compssUsers.pl:191
+#: share/meta-task/compssUsers.pl:192 share/meta-task/compssUsers.pl.orig:191
 #, fuzzy, c-format
 msgid "Wizards to configure server"
 msgstr "การคอนฟิกเครื่องพิมพ์"
@@ -649,7 +717,7 @@ msgstr ""
 "มีความผิดพลาดเกิดขึ้น แต่โปรแกรมไม่สามารถแก้ไขได้\n"
 "หากทำงานต่ออาจเกิดความเสียหายได้"
 
-#: steps.pm:442
+#: steps.pm:443
 #, c-format
 msgid ""
 "Some important packages did not get installed properly.\n"
@@ -682,7 +750,7 @@ msgstr "<Tab>/<Alt-Tab> ระหว่างตัวเลือก"
 msgid "Xorg server is slow to start. Please wait..."
 msgstr ""
 
-#: steps_gtk.pm:203
+#: steps_gtk.pm:205
 #, c-format
 msgid ""
 "Your system is low on resources. You may have some problem installing\n"
@@ -694,232 +762,232 @@ msgstr ""
 "Mandriva Linux  ถ้าเป็นเช่นนั้น กรุณาทดลองติดตั้งแบบ text \n"
 "กรุณากด F1 ขณะ boot จาก cdrom แล้วพิมพ์ text"
 
-#: steps_gtk.pm:236
+#: steps_gtk.pm:238
 #, c-format
 msgid "Install Mandriva KDE Desktop"
 msgstr ""
 
-#: steps_gtk.pm:237
+#: steps_gtk.pm:239
 #, c-format
 msgid "Install Mandriva GNOME Desktop"
 msgstr ""
 
-#: steps_gtk.pm:238
+#: steps_gtk.pm:240
 #, fuzzy, c-format
 msgid "Custom install"
 msgstr "ออกจากการติดตั้ง"
 
-#: steps_gtk.pm:259
+#: steps_gtk.pm:261
 #, fuzzy, c-format
 msgid "KDE Desktop"
 msgstr "พื้นที่ทำงาน"
 
-#: steps_gtk.pm:260
+#: steps_gtk.pm:262
 #, fuzzy, c-format
 msgid "GNOME Desktop"
 msgstr "พื้นที่ทำงาน"
 
-#: steps_gtk.pm:261
+#: steps_gtk.pm:263
 #, fuzzy, c-format
 msgid "Custom Desktop"
 msgstr "พื้นที่ทำงาน"
 
-#: steps_gtk.pm:267
+#: steps_gtk.pm:269
 #, c-format
 msgid "Here's a preview of the '%s' desktop."
 msgstr ""
 
-#: steps_gtk.pm:295
+#: steps_gtk.pm:297
 #, c-format
 msgid "Click on images in order to see a bigger preview"
 msgstr ""
 
-#: steps_gtk.pm:313 steps_interactive.pm:625 steps_list.pm:30
+#: steps_gtk.pm:315 steps_interactive.pm:606 steps_list.pm:30
 #, c-format
 msgid "Package Group Selection"
 msgstr "เลือกกลุ่มแพ็คเก็จ"
 
-#: steps_gtk.pm:334 steps_interactive.pm:642
+#: steps_gtk.pm:336 steps_interactive.pm:623
 #, c-format
 msgid "Individual package selection"
 msgstr "Individual package selection"
 
-#: steps_gtk.pm:358 steps_interactive.pm:566
+#: steps_gtk.pm:360 steps_interactive.pm:547
 #, c-format
 msgid "Total size: %d / %d MB"
 msgstr "ขนาดรวม: %d / %d MB "
 
-#: steps_gtk.pm:401
+#: steps_gtk.pm:402
 #, c-format
 msgid "Bad package"
 msgstr "แพ็คเก็จชำรุด"
 
-#: steps_gtk.pm:403
+#: steps_gtk.pm:404
 #, c-format
 msgid "Version: "
 msgstr "เวอร์ชัน:"
 
-#: steps_gtk.pm:404
+#: steps_gtk.pm:405
 #, c-format
 msgid "Size: "
 msgstr "ขนาด:"
 
-#: steps_gtk.pm:404
+#: steps_gtk.pm:405
 #, fuzzy, c-format
 msgid "%d KB\n"
 msgstr "ขนาด: %d KB\n"
 
-#: steps_gtk.pm:405
+#: steps_gtk.pm:406
 #, c-format
 msgid "Importance: "
 msgstr "ความสำคัญ:"
 
-#: steps_gtk.pm:439
+#: steps_gtk.pm:440
 #, c-format
 msgid "You can not select/unselect this package"
 msgstr "คุณไม่สามารถเลือก/ไม่เลือกแพกเกจนี้"
 
-#: steps_gtk.pm:443
+#: steps_gtk.pm:444
 #, fuzzy, c-format
 msgid "due to missing %s"
 msgstr "ไม่มี kdesu "
 
-#: steps_gtk.pm:444
+#: steps_gtk.pm:445
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr ""
 
-#: steps_gtk.pm:445
+#: steps_gtk.pm:446
 #, c-format
 msgid "trying to promote %s"
 msgstr ""
 
-#: steps_gtk.pm:446
+#: steps_gtk.pm:447
 #, c-format
 msgid "in order to keep %s"
 msgstr ""
 
-#: steps_gtk.pm:451
+#: steps_gtk.pm:452
 #, c-format
 msgid ""
 "You can not select this package as there is not enough space left to install "
 "it"
 msgstr "คุณไม่สามารถเลือก package นี้เนื่องจากคุณมีพื้นที่ไม่เพียงพอ"
 
-#: steps_gtk.pm:454
+#: steps_gtk.pm:455
 #, c-format
 msgid "The following packages are going to be installed"
 msgstr "แพ็คเก็จเหล่านี้กำลังจะถูกติดตั้ง"
 
-#: steps_gtk.pm:455
+#: steps_gtk.pm:456
 #, c-format
 msgid "The following packages are going to be removed"
 msgstr "แพ็คเก็จเหล่านี้กำลังจะถูกลบ"
 
-#: steps_gtk.pm:480
+#: steps_gtk.pm:481
 #, c-format
 msgid "This is a mandatory package, it can not be unselected"
 msgstr "นี่คือแพกเกจที่ต้องติดตั้ง ไม่สามารถไม่เลือก"
 
-#: steps_gtk.pm:482
+#: steps_gtk.pm:483
 #, c-format
 msgid "You can not unselect this package. It is already installed"
 msgstr "คุณไม่สามารถไม่เลือกแพกเกจนี้เพราะมันได้ถูกติดตั้งไปแล้ว"
 
-#: steps_gtk.pm:484
+#: steps_gtk.pm:485
 #, c-format
 msgid "You can not unselect this package. It must be upgraded"
 msgstr "คุณไม่สามารถไม่เลือกแพกเกจนี้  มันจำเป็นที่จะต้องถูก upgrade"
 
-#: steps_gtk.pm:488
+#: steps_gtk.pm:489
 #, c-format
 msgid "Show automatically selected packages"
 msgstr ""
 
-#: steps_gtk.pm:494
+#: steps_gtk.pm:495
 #, c-format
 msgid "Install"
 msgstr "ติดตั้ง"
 
-#: steps_gtk.pm:497
+#: steps_gtk.pm:498
 #, fuzzy, c-format
 msgid "Load/Save selection"
 msgstr "เลือกกลุ่มแพ็คเก็จ"
 
-#: steps_gtk.pm:498
+#: steps_gtk.pm:499
 #, fuzzy, c-format
 msgid "Updating package selection"
 msgstr "บันทึกกลุ่มแพ็คเก็จที่เลือก"
 
-#: steps_gtk.pm:503
+#: steps_gtk.pm:504
 #, fuzzy, c-format
 msgid "Minimal install"
 msgstr "ออกจากการติดตั้ง"
 
-#: steps_gtk.pm:516
+#: steps_gtk.pm:517
 #, c-format
 msgid "Software Management"
 msgstr "การบริหารโปรแกรม"
 
-#: steps_gtk.pm:516 steps_interactive.pm:451
+#: steps_gtk.pm:517 steps_interactive.pm:432
 #, c-format
 msgid "Choose the packages you want to install"
 msgstr "เลือกแพ็คเก็จที่คุณต้องการติดตั้ง"
 
-#: steps_gtk.pm:533 steps_interactive.pm:656 steps_list.pm:32
+#: steps_gtk.pm:534 steps_interactive.pm:637 steps_list.pm:32
 #, c-format
 msgid "Installing"
 msgstr "กำลังติดตั้ง"
 
-#: steps_gtk.pm:562
+#: steps_gtk.pm:563
 #, fuzzy, c-format
 msgid "No details"
 msgstr "รายละเอียด"
 
-#: steps_gtk.pm:577
+#: steps_gtk.pm:578
 #, fuzzy, c-format
 msgid "Time remaining:"
 msgstr "เวลาที่เหลือ "
 
-#: steps_gtk.pm:578
+#: steps_gtk.pm:579
 #, fuzzy, c-format
 msgid "(estimating...)"
 msgstr "การประเมิน"
 
-#: steps_gtk.pm:604
+#: steps_gtk.pm:605
 #, c-format
 msgid "%d package"
 msgid_plural "%d packages"
 msgstr[0] "แพ็คเก็จ %d ชุด"
 
-#: steps_gtk.pm:650 steps_interactive.pm:819 steps_list.pm:43
+#: steps_gtk.pm:651 steps_interactive.pm:800 steps_list.pm:43
 #, c-format
 msgid "Summary"
 msgstr "รวมความ"
 
-#: steps_gtk.pm:669
+#: steps_gtk.pm:670
 #, c-format
 msgid "Configure"
 msgstr "การปรับแต่ง"
 
-#: steps_gtk.pm:686 steps_interactive.pm:815 steps_interactive.pm:966
+#: steps_gtk.pm:687 steps_interactive.pm:796 steps_interactive.pm:947
 #, fuzzy, c-format
 msgid "not configured"
 msgstr "คอนฟิกใหม่"
 
-#: steps_gtk.pm:720
+#: steps_gtk.pm:721
 #, fuzzy, c-format
 msgid "Media Selection"
 msgstr "เลือกกลุ่มแพ็คเก็จ"
 
-#: steps_gtk.pm:729 steps_interactive.pm:334
+#: steps_gtk.pm:730 steps_interactive.pm:334
 #, 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 ""
 
-#: steps_gtk.pm:745 steps_interactive.pm:340
+#: steps_gtk.pm:746 steps_interactive.pm:340
 #, c-format
 msgid ""
 "You have the option to copy the contents of the CDs onto the hard drive "
@@ -928,7 +996,7 @@ msgid ""
 "available once the system is fully installed."
 msgstr ""
 
-#: steps_gtk.pm:747 steps_interactive.pm:342
+#: steps_gtk.pm:748 steps_interactive.pm:342
 #, c-format
 msgid "Copy whole CDs"
 msgstr ""
@@ -1037,7 +1105,7 @@ msgid ""
 "DiskDrake"
 msgstr ""
 
-#: steps_interactive.pm:378
+#: steps_interactive.pm:372
 #, c-format
 msgid ""
 "Change your Cd-Rom!\n"
@@ -1050,153 +1118,153 @@ msgstr ""
 "กรุณาใส่ CD-ROM \"%s\" และกด OK\n"
 "ถ้่าคุณไม่มี กรุณากด ยกเลิก (cancel) เพื่อหลีกเลี่ยงการติดตั้งจาก CD-ROM นี้"
 
-#: steps_interactive.pm:408
+#: steps_interactive.pm:389
 #, c-format
 msgid "Looking for available packages..."
 msgstr "กำลังหาแพ็คเก็จที่มีอยู่"
 
-#: steps_interactive.pm:416
+#: steps_interactive.pm:397
 #, c-format
 msgid ""
 "Your system does not have enough space left for installation or upgrade (%"
 "dMB > %dMB)"
 msgstr ""
 
-#: steps_interactive.pm:463
+#: steps_interactive.pm:444
 #, c-format
 msgid ""
 "Please choose load or save package selection.\n"
 "The format is the same as auto_install generated files."
 msgstr ""
 
-#: steps_interactive.pm:465
+#: steps_interactive.pm:446
 #, c-format
 msgid "Load"
 msgstr "โหลด"
 
-#: steps_interactive.pm:465
+#: steps_interactive.pm:446
 #, c-format
 msgid "Save"
 msgstr "บันทึก"
 
-#: steps_interactive.pm:473
+#: steps_interactive.pm:454
 #, fuzzy, c-format
 msgid "Bad file"
 msgstr "เปิดแฟ้ม"
 
-#: steps_interactive.pm:489
+#: steps_interactive.pm:470
 #, fuzzy, c-format
 msgid "KDE"
 msgstr "IDE"
 
-#: steps_interactive.pm:490
+#: steps_interactive.pm:471
 #, c-format
 msgid "GNOME"
 msgstr ""
 
-#: steps_interactive.pm:493
+#: steps_interactive.pm:474
 #, fuzzy, c-format
 msgid "Desktop Selection"
 msgstr "เลือกกลุ่มแพ็คเก็จ"
 
-#: steps_interactive.pm:494
+#: steps_interactive.pm:475
 #, c-format
 msgid "You can choose your workstation desktop profile."
 msgstr ""
 
-#: steps_interactive.pm:580
+#: steps_interactive.pm:561
 #, c-format
 msgid "Selected size is larger than available space"
 msgstr ""
 
-#: steps_interactive.pm:595
+#: steps_interactive.pm:576
 #, c-format
 msgid "Type of install"
 msgstr ""
 
-#: steps_interactive.pm:596
+#: steps_interactive.pm:577
 #, c-format
 msgid ""
 "You have not selected any group of packages.\n"
 "Please choose the minimal installation you want:"
 msgstr ""
 
-#: steps_interactive.pm:601
+#: steps_interactive.pm:582
 #, c-format
 msgid "With X"
 msgstr ""
 
-#: steps_interactive.pm:602
+#: steps_interactive.pm:583
 #, c-format
 msgid "With basic documentation (recommended!)"
 msgstr ""
 
-#: steps_interactive.pm:603
+#: steps_interactive.pm:584
 #, c-format
 msgid "Truly minimal install (especially no urpmi)"
 msgstr ""
 
-#: steps_interactive.pm:657
+#: steps_interactive.pm:638
 #, c-format
 msgid "Preparing installation"
 msgstr "กำลังเตรียมการติดตั้ง"
 
-#: steps_interactive.pm:665
+#: steps_interactive.pm:646
 #, c-format
 msgid "Installing package %s"
 msgstr "กำลังติดตั้งแพ็คเก็จ %s"
 
-#: steps_interactive.pm:689
+#: steps_interactive.pm:670
 #, c-format
 msgid "There was an error ordering packages:"
 msgstr "มีปัญหาการลำดับของแพ็คเก็จ:"
 
-#: steps_interactive.pm:689
+#: steps_interactive.pm:670
 #, c-format
 msgid "Go on anyway?"
 msgstr "ทำงานต่อหรือไม่?"
 
-#: steps_interactive.pm:693
+#: steps_interactive.pm:674
 #, c-format
 msgid "Retry"
 msgstr ""
 
-#: steps_interactive.pm:694
+#: steps_interactive.pm:675
 #, c-format
 msgid "Skip this package"
 msgstr ""
 
-#: steps_interactive.pm:695
+#: steps_interactive.pm:676
 #, c-format
 msgid "Skip all packages from medium \"%s\""
 msgstr ""
 
-#: steps_interactive.pm:696
+#: steps_interactive.pm:677
 #, fuzzy, c-format
 msgid "Go back to media and packages selection"
 msgstr "บันทึกกลุ่มแพ็คเก็จที่เลือก"
 
-#: steps_interactive.pm:699
+#: steps_interactive.pm:680
 #, fuzzy, c-format
 msgid "There was an error installing package %s."
 msgstr "มีปัญหาการติดตั้งของแพ็คเก็จ:"
 
-#: steps_interactive.pm:718
+#: steps_interactive.pm:699
 #, c-format
 msgid "Post-install configuration"
 msgstr "การคอนฟิกหลังการติดตั้ง"
 
-#: steps_interactive.pm:725
+#: steps_interactive.pm:706
 #, c-format
 msgid "Please ensure the Update Modules media is in drive %s"
 msgstr ""
 
-#: steps_interactive.pm:753 steps_list.pm:47
+#: steps_interactive.pm:734 steps_list.pm:47
 #, c-format
 msgid "Updates"
 msgstr ""
 
-#: steps_interactive.pm:754
+#: steps_interactive.pm:735
 #, c-format
 msgid ""
 "You now have the opportunity to download updated packages. These packages\n"
@@ -1209,95 +1277,95 @@ msgid ""
 "Do you want to install the updates?"
 msgstr ""
 
-#: steps_interactive.pm:861
+#: steps_interactive.pm:842
 #, c-format
 msgid "%s on %s"
 msgstr "%s บน %s"
 
-#: steps_interactive.pm:894 steps_interactive.pm:901 steps_interactive.pm:914
-#: steps_interactive.pm:931 steps_interactive.pm:946
+#: steps_interactive.pm:875 steps_interactive.pm:882 steps_interactive.pm:895
+#: steps_interactive.pm:912 steps_interactive.pm:927
 #, c-format
 msgid "Hardware"
 msgstr "ฮาร์ดแวร์"
 
-#: steps_interactive.pm:915 steps_interactive.pm:932
+#: steps_interactive.pm:896 steps_interactive.pm:913
 #, c-format
 msgid "Sound card"
 msgstr "Sound card"
 
-#: steps_interactive.pm:935
+#: steps_interactive.pm:916
 #, fuzzy, c-format
 msgid "Do you have an ISA sound card?"
 msgstr "คุณมีอันอื่นๆอีกหรือไม่?"
 
-#: steps_interactive.pm:937
+#: steps_interactive.pm:918
 #, c-format
 msgid ""
 "Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
 "card"
 msgstr ""
 
-#: steps_interactive.pm:939
+#: steps_interactive.pm:920
 #, c-format
 msgid "No sound card detected. Try \"harddrake\" after installation"
 msgstr ""
 
-#: steps_interactive.pm:947
+#: steps_interactive.pm:928
 #, fuzzy, c-format
 msgid "Graphical interface"
 msgstr "ให้เป็นกราฟฟิคเมื่อเริ่มต้น"
 
-#: steps_interactive.pm:953 steps_interactive.pm:964
+#: steps_interactive.pm:934 steps_interactive.pm:945
 #, c-format
 msgid "Network & Internet"
 msgstr "เน็ตเวิร์คกับอินเตอร์เน็ต"
 
-#: steps_interactive.pm:965
+#: steps_interactive.pm:946
 #, fuzzy, c-format
 msgid "Proxies"
 msgstr "Profile: "
 
-#: steps_interactive.pm:966
+#: steps_interactive.pm:947
 #, fuzzy, c-format
 msgid "configured"
 msgstr "คอนฟิกใหม่"
 
-#: steps_interactive.pm:976
+#: steps_interactive.pm:957
 #, c-format
 msgid "Security Level"
 msgstr "ระดับความปลอดภัย"
 
-#: steps_interactive.pm:995
+#: steps_interactive.pm:976
 #, c-format
 msgid "Firewall"
 msgstr ""
 
-#: steps_interactive.pm:999
+#: steps_interactive.pm:980
 #, fuzzy, c-format
 msgid "activated"
 msgstr "แอ็คทีฟ"
 
-#: steps_interactive.pm:999
+#: steps_interactive.pm:980
 #, c-format
 msgid "disabled"
 msgstr "ไม่ใช้งาน"
 
-#: steps_interactive.pm:1013
+#: steps_interactive.pm:994
 #, c-format
 msgid "You have not configured X. Are you sure you really want this?"
 msgstr ""
 
-#: steps_interactive.pm:1041
+#: steps_interactive.pm:1022
 #, c-format
 msgid "Preparing bootloader..."
 msgstr "กำลังเตรียมบูตโหลดเดอร์"
 
-#: steps_interactive.pm:1042
+#: steps_interactive.pm:1023
 #, c-format
 msgid "Be patient, this may take a while..."
 msgstr ""
 
-#: steps_interactive.pm:1053
+#: steps_interactive.pm:1034
 #, c-format
 msgid ""
 "You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
@@ -1306,24 +1374,24 @@ msgid ""
 "root fs is: root=%s"
 msgstr ""
 
-#: steps_interactive.pm:1067
+#: steps_interactive.pm:1048
 #, c-format
 msgid ""
 "In this security level, access to the files in the Windows partition is "
 "restricted to the administrator."
 msgstr ""
 
-#: steps_interactive.pm:1099
+#: steps_interactive.pm:1080
 #, c-format
 msgid "Insert a blank floppy in drive %s"
 msgstr "ให้ใส่แผ่นฟล้อปปี้ลงในไดรว์ %s "
 
-#: steps_interactive.pm:1101
+#: steps_interactive.pm:1082
 #, c-format
 msgid "Creating auto install floppy..."
 msgstr "กำลังเตรียมการติดตั้งลงบน floppy"
 
-#: steps_interactive.pm:1112
+#: steps_interactive.pm:1093
 #, c-format
 msgid ""
 "Some steps are not completed.\n"
@@ -1334,7 +1402,7 @@ msgstr ""
 "\n"
 "คุณต้องการออกจากการติดตั้งจริงๆหรือไม่?"
 
-#: steps_interactive.pm:1122
+#: steps_interactive.pm:1103
 #, fuzzy, c-format
 msgid "Congratulations"
 msgstr "ขอแสดงความยินดี"
@@ -1478,31 +1546,6 @@ msgid ""
 "Exit"
 msgstr "เลิกทำงาน"
 
-#: ../../advertising/IM_flash.pl:1
-#, c-format
-msgid "Your desktop on a USB key"
-msgstr ""
-
-#: ../../advertising/IM_free09.pl:1
-#, c-format
-msgid "The 100%% open source Mandriva Linux distribution"
-msgstr ""
-
-#: ../../advertising/IM_one09.pl:1
-#, c-format
-msgid "Explore Linux easily with Mandriva One"
-msgstr ""
-
-#: ../../advertising/IM_pwp09.pl:1
-#, c-format
-msgid "A full Mandriva Linux desktop, with support"
-msgstr ""
-
-#: ../../advertising/IM_range09.pl:1
-#, c-format
-msgid "Mandriva: distributions for everybody's needs"
-msgstr ""
-
 #, fuzzy
 #~ msgid "IceWm Desktop"
 #~ msgstr "พื้นที่ทำงาน"