Merge branch 'master' of git://git.mageia.org/software/drakx

1 files changed, 235 insertions, 188 deletions

diff --git a/perl-install/install/share/po/th.po b/perl-install/install/share/po/th.po
index f8a62908d..d52811be9 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: 2013-05-03 10:51+0200\n"
+"POT-Creation-Date: 2013-11-03 12:08+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"
@@ -73,7 +73,7 @@ msgid "Do you have further supplementary media?"
 msgstr "คุณมีอันอื่นๆอีกหรือไม่?"
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:113
+#: any.pm:114
 #, c-format
 msgid ""
 "The following media have been found and will be used during install: %s.\n"
@@ -82,177 +82,177 @@ msgid ""
 "Do you have a supplementary installation medium to configure?"
 msgstr ""
 
-#: any.pm:121
+#: any.pm:122
 #, c-format
 msgid "CD-ROM"
 msgstr "ซีดี-รอม"
 
-#: any.pm:122
+#: any.pm:123
 #, fuzzy, c-format
 msgid "Network (HTTP)"
 msgstr "Network interface"
 
-#: any.pm:123
+#: any.pm:124
 #, fuzzy, c-format
 msgid "Network (FTP)"
 msgstr "Network interface"
 
-#: any.pm:124
+#: any.pm:125
 #, c-format
 msgid "Network (NFS)"
 msgstr ""
 
-#: any.pm:171
+#: any.pm:173
 #, c-format
 msgid "URL of the mirror?"
 msgstr ""
 
-#: any.pm:177
+#: any.pm:179
 #, c-format
 msgid "URL must start with ftp:// or http://"
 msgstr ""
 
-#: any.pm:188
+#: any.pm:190
 #, fuzzy, c-format
 msgid "Contacting %s web site to get the list of available mirrors..."
 msgstr "กำลังติดต่อกับมิลเรอร์ไซต์เพื่อหารายการของแพ็คเก็จที่มีให้"
 
-#: any.pm:193
+#: any.pm:195
 #, fuzzy, c-format
 msgid "Failed contacting %s web site to get the list of available mirrors"
 msgstr "กำลังติดต่อกับมิลเรอร์ไซต์เพื่อหารายการของแพ็คเก็จที่มีให้"
 
-#: any.pm:203
+#: any.pm:205
 #, c-format
 msgid "Choose a mirror from which to get the packages"
 msgstr "เลือกมิลเรอร์ไซต์ที่จะใช้ในการดาวน์โหลดแพ็คเก็จ"
 
-#: any.pm:233
+#: any.pm:235
 #, c-format
 msgid "NFS setup"
 msgstr ""
 
-#: any.pm:234
+#: any.pm:236
 #, c-format
 msgid "Please enter the hostname and directory of your NFS media"
 msgstr ""
 
-#: any.pm:238
+#: any.pm:240
 #, c-format
 msgid "Hostname missing"
 msgstr ""
 
-#: any.pm:239
+#: any.pm:241
 #, c-format
 msgid "Directory must begin with \"/\""
 msgstr ""
 
-#: any.pm:243
+#: any.pm:245
 #, c-format
 msgid "Hostname of the NFS mount ?"
 msgstr ""
 
-#: any.pm:244
+#: any.pm:246
 #, c-format
 msgid "Directory"
 msgstr "สารบัญ"
 
-#: any.pm:266
+#: any.pm:268
 #, c-format
 msgid "Supplementary"
 msgstr ""
 
-#: any.pm:301
+#: any.pm:303
 #, fuzzy, c-format
 msgid ""
 "Can't find a package list file on this mirror. Make sure the location is "
 "correct."
 msgstr "Adapter %s: %s"
 
-#: any.pm:317
+#: any.pm:319
 #, c-format
 msgid "Core Release"
 msgstr ""
 
-#: any.pm:319
+#: any.pm:321
 #, c-format
 msgid "Tainted Release"
 msgstr ""
 
-#: any.pm:321
+#: any.pm:323
 #, c-format
 msgid "Nonfree Release"
 msgstr ""
 
-#: any.pm:335
+#: any.pm:351
 #, c-format
 msgid ""
 "Some hardware on your machine needs some non free firmwares in order for the "
 "free software drivers to work."
 msgstr ""
 
-#: any.pm:336
+#: any.pm:352
 #, c-format
 msgid "You should enable \"%s\""
 msgstr ""
 
-#: any.pm:355
+#: any.pm:377
 #, c-format
 msgid "\"%s\" contains the various pieces of the systems and its applications"
 msgstr ""
 
-#: any.pm:356
+#: any.pm:378
 #, c-format
 msgid "\"%s\" contains non free software.\n"
 msgstr ""
 
-#: any.pm:357
+#: any.pm:379
 #, c-format
 msgid ""
 "It also contains firmwares needed for certain devices to operate (eg: some "
 "ATI/AMD graphic cards, some network cards, some RAID cards, ...)"
 msgstr ""
 
-#: any.pm:358
+#: any.pm:380
 #, c-format
 msgid ""
 "\"%s\" contains software that can not be distributed in every country due to "
 "software patents."
 msgstr ""
 
-#: any.pm:359
+#: any.pm:381
 #, c-format
 msgid ""
 "It also contains software from \"%s\" rebuild with additional capabilities."
 msgstr ""
 
-#: any.pm:363
+#: any.pm:387
 #, c-format
 msgid "Here you can enable more media if you want."
 msgstr ""
 
-#: any.pm:378
+#: any.pm:404
 #, c-format
 msgid "This medium provides package updates for medium \"%s\""
 msgstr ""
 
-#: any.pm:451
+#: any.pm:480
 #, fuzzy, c-format
 msgid "Looking at packages already installed..."
 msgstr "คุณไม่สามารถไม่เลือกแพกเกจนี้เพราะมันได้ถูกติดตั้งไปแล้ว"
 
-#: any.pm:485
+#: any.pm:514
 #, c-format
 msgid "Finding packages to upgrade..."
 msgstr "กำลังหาแพ็คเก็จที่จะทำการอัพเกรด"
 
-#: any.pm:498
+#: any.pm:527
 #, c-format
 msgid "Removing packages prior to upgrade..."
 msgstr ""
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:713
+#: any.pm:743
 #, c-format
 msgid ""
 "The following packages will be removed to allow upgrading your system: %s\n"
@@ -261,72 +261,72 @@ msgid ""
 "Do you really want to remove these packages?\n"
 msgstr ""
 
-#: any.pm:932
+#: any.pm:962
 #, c-format
 msgid "Error reading file %s"
 msgstr "มีปัญหากับการอ่านข้อมูลในไฟล์ %s"
 
-#: any.pm:1140
+#: any.pm:1170
 #, fuzzy, c-format
 msgid "The following disk(s) were renamed:"
 msgstr "แพ็คเก็จเหล่านี้กำลังจะถูกติดตั้ง"
 
-#: any.pm:1142
+#: any.pm:1172
 #, c-format
 msgid "%s (previously named as %s)"
 msgstr ""
 
-#: any.pm:1199
+#: any.pm:1229
 #, c-format
 msgid "HTTP"
 msgstr "HTTP"
 
-#: any.pm:1199
+#: any.pm:1229
 #, c-format
 msgid "FTP"
 msgstr "FTP"
 
-#: any.pm:1199
+#: any.pm:1229
 #, c-format
 msgid "NFS"
 msgstr "NFS"
 
-#: any.pm:1218 steps_interactive.pm:970
+#: any.pm:1248 steps_interactive.pm:973
 #, c-format
 msgid "Network"
 msgstr "ระบบเครือข่าย"
 
-#: any.pm:1222
+#: any.pm:1252
 #, fuzzy, c-format
 msgid "Please choose a media"
 msgstr "กรุณาเลือก"
 
-#: any.pm:1238
+#: any.pm:1268
 #, fuzzy, c-format
 msgid "File already exists. Overwrite it?"
 msgstr "ไฟล์มีอยู่แล้ว ต้องการใช้?"
 
-#: any.pm:1242
+#: any.pm:1272
 #, c-format
 msgid "Permission denied"
 msgstr "สิทธิการทำงานถูกปฎิเสท"
 
-#: any.pm:1290
+#: any.pm:1320
 #, c-format
 msgid "Bad NFS name"
 msgstr ""
 
-#: any.pm:1311
+#: any.pm:1341
 #, fuzzy, c-format
 msgid "Bad media %s"
 msgstr "อุปกรณ์ที่ถูกเพิ่มเข้ามา %s"
 
-#: any.pm:1355
+#: any.pm:1385
 #, fuzzy, c-format
 msgid "Cannot make screenshots before partitioning"
 msgstr "โปรแกรมไม่สามารถเพิ่มพาร์ติชั่นได้อีก"
 
-#: any.pm:1363
+#: any.pm:1393
 #, fuzzy, c-format
 msgid "Screenshots will be available after install in %s"
 msgstr "คุณสามารถเลือกภาษาอื่นซึ่งจะสามารถใช้ได้หลังติดตั้ง"
@@ -336,7 +336,7 @@ msgstr "คุณสามารถเลือกภาษาอื่นซึ
 msgid "Installation"
 msgstr "กำลังติดตั้ง"
 
-#: gtk.pm:132 share/meta-task/compssUsers.pl:43
+#: gtk.pm:132 share/meta-task/compssUsers.pl:46
 #, c-format
 msgid "Configuration"
 msgstr "ปรับแต่งค่า"
@@ -432,343 +432,390 @@ msgid ""
 "%s"
 msgstr ""
 
-#: pkgs.pm:382 pkgs.pm:409
+#: pkgs.pm:383 pkgs.pm:410
 #, fuzzy, c-format
 msgid "An error occurred:"
 msgstr "มีปัญหาเกิดขึ้น"
 
-#: pkgs.pm:401
+#: pkgs.pm:402
 #, c-format
 msgid "A fatal error occurred: %s."
 msgstr ""
 
-#: pkgs.pm:891 pkgs.pm:928
+#: pkgs.pm:896 pkgs.pm:938
 #, c-format
 msgid "Do not ask again"
 msgstr ""
 
-#: pkgs.pm:907
+#: pkgs.pm:912
 #, fuzzy, c-format
 msgid "%d installation transactions failed"
 msgstr "การติดตั้งไม่สำเร็จ"
 
-#: pkgs.pm:908
+#: pkgs.pm:913
 #, fuzzy, c-format
 msgid "Installation of packages failed:"
 msgstr "กำลังติดตั้งแพ็คเก็จ %s"
 
-#: share/meta-task/compssUsers.pl:13
+#: share/meta-task/compssUsers.pl:14
 #, fuzzy, c-format
 msgid "Workstation"
 msgstr "Workstation ที่ทำงาน"
 
-#: share/meta-task/compssUsers.pl:15
+#: share/meta-task/compssUsers.pl:16
 #, c-format
 msgid "Office Workstation"
 msgstr "Workstation ที่ทำงาน"
 
-#: share/meta-task/compssUsers.pl:17
+#: share/meta-task/compssUsers.pl:18
 #, c-format
 msgid ""
 "Office programs: wordprocessors (LibreOffice Writer, Kword), spreadsheets "
 "(LibreOffice Calc, Kspread), PDF viewers, etc"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:22
+#: share/meta-task/compssUsers.pl:24
 #, fuzzy, c-format
 msgid "Game station"
 msgstr "Workstation ที่ทำงาน"
 
-#: share/meta-task/compssUsers.pl:23
+#: share/meta-task/compssUsers.pl:25
 #, c-format
 msgid "Amusement programs: arcade, boards, strategy, etc"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:26
+#: share/meta-task/compssUsers.pl:28
 #, fuzzy, c-format
 msgid "Multimedia station"
 msgstr "Multimedia - เขียน CD "
 
-#: share/meta-task/compssUsers.pl:27
+#: share/meta-task/compssUsers.pl:29
 #, c-format
 msgid "Sound and video playing/editing programs"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:32
+#: share/meta-task/compssUsers.pl:34
 #, fuzzy, c-format
 msgid "Internet station"
 msgstr "การเชื่อมต่อกับ Internet แบบ sharing"
 
-#: share/meta-task/compssUsers.pl:33
+#: share/meta-task/compssUsers.pl:35
 #, 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:38
+#: share/meta-task/compssUsers.pl:40
 #, fuzzy, c-format
 msgid "Network Computer (client)"
 msgstr "เครื่องพิมพ์ในระบบ Network (Socket)"
 
-#: share/meta-task/compssUsers.pl:39
+#: share/meta-task/compssUsers.pl:41
 #, c-format
 msgid "Clients for different protocols including ssh"
 msgstr "Clients for different protocols including ssh"
 
-#: share/meta-task/compssUsers.pl:44
+#: share/meta-task/compssUsers.pl:47
 #, c-format
 msgid "Tools to ease the configuration of your computer"
 msgstr "เครืองมือที่ช่วยในการปรับแต่งเครื่องชองคุณให้ง่ายขึ้น"
 
-#: share/meta-task/compssUsers.pl:48
+#: share/meta-task/compssUsers.pl:51
 #, fuzzy, c-format
 msgid "Console Tools"
 msgstr "ปิด"
 
-#: share/meta-task/compssUsers.pl:49
+#: share/meta-task/compssUsers.pl:52
 #, c-format
 msgid "Editors, shells, file tools, terminals"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:53 share/meta-task/compssUsers.pl:156
-#: share/meta-task/compssUsers.pl:158
+#: share/meta-task/compssUsers.pl:56 share/meta-task/compssUsers.pl:200
+#: share/meta-task/compssUsers.pl:202
 #, c-format
 msgid "Development"
 msgstr "พัฒนาซอฟท์แวร์ (Development)"
 
-#: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:159
+#: share/meta-task/compssUsers.pl:57 share/meta-task/compssUsers.pl:203
 #, c-format
 msgid "C and C++ development libraries, programs and include files"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:57 share/meta-task/compssUsers.pl:163
+#: share/meta-task/compssUsers.pl:61 share/meta-task/compssUsers.pl:207
 #, c-format
 msgid "Documentation"
 msgstr "คู่มือ"
 
-#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164
+#: share/meta-task/compssUsers.pl:62 share/meta-task/compssUsers.pl:208
 #, c-format
 msgid "Books and Howto's on Linux and Free Software"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:62 share/meta-task/compssUsers.pl:167
+#: share/meta-task/compssUsers.pl:66 share/meta-task/compssUsers.pl:211
 #, c-format
 msgid "LSB"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168
+#: share/meta-task/compssUsers.pl:67 share/meta-task/compssUsers.pl:212
 #, c-format
 msgid "Linux Standard Base. Third party applications support"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:72
+#: share/meta-task/compssUsers.pl:77
 #, fuzzy, c-format
 msgid "Web Server"
 msgstr "เซิร์ฟเวอร์"
 
-#: share/meta-task/compssUsers.pl:73
+#: share/meta-task/compssUsers.pl:78
 #, c-format
 msgid "Apache"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:76
+#: share/meta-task/compssUsers.pl:82
 #, fuzzy, c-format
 msgid "Groupware"
 msgstr "เวิร์กกรุ๊ป (workgroup)"
 
-#: share/meta-task/compssUsers.pl:77
+#: share/meta-task/compssUsers.pl:83
 #, fuzzy, c-format
 msgid "Kolab Server"
 msgstr "เซิร์ฟเวอร์ NIS"
 
-#: share/meta-task/compssUsers.pl:80 share/meta-task/compssUsers.pl:121
+#: share/meta-task/compssUsers.pl:86 share/meta-task/compssUsers.pl:136
 #, c-format
 msgid "Firewall/Router"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:81 share/meta-task/compssUsers.pl:122
+#: share/meta-task/compssUsers.pl:87 share/meta-task/compssUsers.pl:137
 #, fuzzy, c-format
 msgid "Internet gateway"
 msgstr "การติดต่อ internet"
 
-#: share/meta-task/compssUsers.pl:84
+#: share/meta-task/compssUsers.pl:90
 #, fuzzy, c-format
 msgid "Mail/News"
 msgstr "/ไฟล์/_ใหม่"
 
-#: share/meta-task/compssUsers.pl:85
+#: share/meta-task/compssUsers.pl:91
 #, fuzzy, c-format
 msgid "Postfix mail server, Inn news server"
 msgstr "ชื่อเซิร์ฟเวอร์ของพรินเตอร์"
 
-#: share/meta-task/compssUsers.pl:88
+#: share/meta-task/compssUsers.pl:95
 #, fuzzy, c-format
 msgid "Directory Server"
 msgstr "เรียกคืนจากแผ่นฟล้อปปี้"
 
-#: share/meta-task/compssUsers.pl:92
+#: share/meta-task/compssUsers.pl:100
 #, fuzzy, c-format
 msgid "FTP Server"
 msgstr "เซิร์ฟเวอร์ NIS"
 
-#: share/meta-task/compssUsers.pl:93
+#: share/meta-task/compssUsers.pl:101
 #, c-format
 msgid "ProFTPd"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:96
+#: share/meta-task/compssUsers.pl:105
 #, fuzzy, c-format
 msgid "DNS/NIS"
 msgstr "ใช้ NIS"
 
-#: share/meta-task/compssUsers.pl:97
+#: share/meta-task/compssUsers.pl:106
 #, fuzzy, c-format
 msgid "Domain Name and Network Information Server"
 msgstr "ชื่อโดเมน"
 
-#: share/meta-task/compssUsers.pl:100
+#: share/meta-task/compssUsers.pl:110
 #, fuzzy, c-format
 msgid "File and Printer Sharing Server"
 msgstr "ชื่อเซิร์ฟเวอร์ของพรินเตอร์"
 
-#: share/meta-task/compssUsers.pl:101
+#: share/meta-task/compssUsers.pl:111
 #, fuzzy, c-format
 msgid "NFS Server, Samba server"
 msgstr "เซิร์ฟเวอร์ NIS"
 
-#: share/meta-task/compssUsers.pl:104 share/meta-task/compssUsers.pl:117
+#: share/meta-task/compssUsers.pl:115 share/meta-task/compssUsers.pl:131
 #, c-format
 msgid "Database"
 msgstr "ฐานข้อมูล"
 
-#: share/meta-task/compssUsers.pl:105
+#: share/meta-task/compssUsers.pl:116
 #, c-format
 msgid "PostgreSQL and MariaDB Database Server"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:109
+#: share/meta-task/compssUsers.pl:121
 #, c-format
 msgid "Web/FTP"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:110
+#: share/meta-task/compssUsers.pl:122
 #, c-format
 msgid "Apache, Pro-ftpd"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:113
+#: share/meta-task/compssUsers.pl:126
 #, c-format
 msgid "Mail"
 msgstr "จดหมาย"
 
-#: share/meta-task/compssUsers.pl:114
+#: share/meta-task/compssUsers.pl:127
 #, fuzzy, c-format
 msgid "Postfix mail server"
 msgstr "ชื่อเซิร์ฟเวอร์ของพรินเตอร์"
 
-#: share/meta-task/compssUsers.pl:118
+#: share/meta-task/compssUsers.pl:132
 #, c-format
 msgid "PostgreSQL or MariaDB database server"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:125
+#: share/meta-task/compssUsers.pl:140
 #, fuzzy, c-format
 msgid "Network Computer server"
 msgstr "เครื่องพิมพ์ในระบบ Network (Socket)"
 
-#: share/meta-task/compssUsers.pl:126
+#: share/meta-task/compssUsers.pl:141
 #, c-format
 msgid "NFS server, SMB server, Proxy server, ssh server"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:132
+#: share/meta-task/compssUsers.pl:148
 #, c-format
 msgid "Graphical Environment"
 msgstr "การทำงานแบบกราฟฟิก"
 
-#: share/meta-task/compssUsers.pl:134
+#: share/meta-task/compssUsers.pl:150
 #, fuzzy, c-format
 msgid "KDE Workstation"
 msgstr "Workstation ที่ทำงาน"
 
-#: share/meta-task/compssUsers.pl:135
+#: share/meta-task/compssUsers.pl:151
 #, c-format
 msgid ""
 "The K Desktop Environment, the basic graphical environment with a collection "
 "of accompanying tools"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:139
+#: share/meta-task/compssUsers.pl:156
 #, fuzzy, c-format
 msgid "GNOME Workstation"
 msgstr "Workstation ที่ทำงาน"
 
-#: share/meta-task/compssUsers.pl:140
+#: share/meta-task/compssUsers.pl:157 share/meta-task/compssUsers.pl:168
 #, c-format
 msgid ""
 "A graphical environment with user-friendly set of applications and desktop "
 "tools"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:144
+#: share/meta-task/compssUsers.pl:162
+#, fuzzy, c-format
+msgid "XFCE Workstation"
+msgstr "Workstation ที่ทำงาน"
+
+#: share/meta-task/compssUsers.pl:163
+#, c-format
+msgid ""
+"A lighter graphical environment with user-friendly set of applications and "
+"desktop tools"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:167
+#, fuzzy, c-format
+msgid "MATE Workstation"
+msgstr "Workstation ที่ทำงาน"
+
+#: share/meta-task/compssUsers.pl:172
+#, fuzzy, c-format
+msgid "Cinnamon Workstation"
+msgstr "Workstation ที่ทำงาน"
+
+#: share/meta-task/compssUsers.pl:173
+#, fuzzy, c-format
+msgid "A graphical environment based on GNOME"
+msgstr "การทำงานแบบกราฟฟิก"
+
+#: share/meta-task/compssUsers.pl:177
 #, fuzzy, c-format
 msgid "LXDE Desktop"
 msgstr "พื้นที่ทำงาน"
 
-#: share/meta-task/compssUsers.pl:146
+#: share/meta-task/compssUsers.pl:179
 #, c-format
 msgid ""
 "A lightweight & fast graphical environment with user-friendly set of "
 "applications and desktop tools"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:149
+#: share/meta-task/compssUsers.pl:183
+#, fuzzy, c-format
+msgid "RazorQT Desktop"
+msgstr "พื้นที่ทำงาน"
+
+#: share/meta-task/compssUsers.pl:185
+#, c-format
+msgid "A less developed lightweight fast graphical environment"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:188
+#, c-format
+msgid "Enlightenment e17 Desktop"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:190
+#, c-format
+msgid "A lightweight fast graphical environment with a dedicated following"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:193
 #, c-format
 msgid "Other Graphical Desktops"
 msgstr "Graphical Desktops อื่นๆ"
 
-#: share/meta-task/compssUsers.pl:150
+#: share/meta-task/compssUsers.pl:194
 #, c-format
-msgid "Window Maker, Enlightenment, Fvwm, etc"
+msgid "Window Maker, Fvwm, etc"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:173
+#: share/meta-task/compssUsers.pl:217
 #, c-format
 msgid "Utilities"
 msgstr "อรรถประโยชน์"
 
-#: share/meta-task/compssUsers.pl:175 share/meta-task/compssUsers.pl:176
+#: share/meta-task/compssUsers.pl:219 share/meta-task/compssUsers.pl:220
 #, fuzzy, c-format
 msgid "SSH Server"
 msgstr "เซิร์ฟเวอร์ NIS"
 
-#: share/meta-task/compssUsers.pl:180
+#: share/meta-task/compssUsers.pl:224
 #, fuzzy, c-format
 msgid "Webmin"
 msgstr "อุปกรณ์"
 
-#: share/meta-task/compssUsers.pl:181
+#: share/meta-task/compssUsers.pl:225
 #, fuzzy, c-format
 msgid "Webmin Remote Configuration Server"
 msgstr "การคอนฟิก Internet"
 
-#: share/meta-task/compssUsers.pl:185
+#: share/meta-task/compssUsers.pl:229
 #, fuzzy, c-format
 msgid "Network Utilities/Monitoring"
 msgstr "การคอนฟิกระบบเน็ตเวิร์ก"
 
-#: share/meta-task/compssUsers.pl:186
+#: share/meta-task/compssUsers.pl:230
 #, c-format
 msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..."
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:190
+#: share/meta-task/compssUsers.pl:234
 #, fuzzy, c-format
 msgid "Mageia Wizards"
 msgstr "Control Center"
 
-#: share/meta-task/compssUsers.pl:191
+#: share/meta-task/compssUsers.pl:235
 #, fuzzy, c-format
 msgid "Wizards to configure server"
 msgstr "การคอนฟิกเครื่องพิมพ์"
@@ -782,7 +829,7 @@ msgstr ""
 "มีความผิดพลาดเกิดขึ้น แต่โปรแกรมไม่สามารถแก้ไขได้\n"
 "หากทำงานต่ออาจเกิดความเสียหายได้"
 
-#: steps.pm:461
+#: steps.pm:458
 #, c-format
 msgid ""
 "Some important packages did not get installed properly.\n"
@@ -836,210 +883,210 @@ msgstr "เลือกกลุ่มแพ็คเก็จ"
 msgid "Install %s KDE Desktop"
 msgstr ""
 
-#: steps_gtk.pm:244
+#: steps_gtk.pm:252
 #, c-format
 msgid "Install %s GNOME Desktop"
 msgstr ""
 
-#: steps_gtk.pm:245
+#: steps_gtk.pm:253
 #, fuzzy, c-format
 msgid "Custom install"
 msgstr "ออกจากการติดตั้ง"
 
-#: steps_gtk.pm:266
+#: steps_gtk.pm:274
 #, fuzzy, c-format
 msgid "KDE Desktop"
 msgstr "พื้นที่ทำงาน"
 
-#: steps_gtk.pm:267
+#: steps_gtk.pm:275
 #, fuzzy, c-format
 msgid "GNOME Desktop"
 msgstr "พื้นที่ทำงาน"
 
-#: steps_gtk.pm:268
+#: steps_gtk.pm:276
 #, fuzzy, c-format
 msgid "Custom Desktop"
 msgstr "พื้นที่ทำงาน"
 
-#: steps_gtk.pm:274
+#: steps_gtk.pm:282
 #, c-format
 msgid "Here's a preview of the '%s' desktop."
 msgstr ""
 
-#: steps_gtk.pm:301
+#: steps_gtk.pm:309
 #, c-format
 msgid "Click on images in order to see a bigger preview"
 msgstr ""
 
-#: steps_gtk.pm:319 steps_interactive.pm:633 steps_list.pm:30
+#: steps_gtk.pm:325 steps_interactive.pm:633 steps_list.pm:30
 #, c-format
 msgid "Package Group Selection"
 msgstr "เลือกกลุ่มแพ็คเก็จ"
 
-#: steps_gtk.pm:344 steps_interactive.pm:650
+#: steps_gtk.pm:350 steps_interactive.pm:650
 #, c-format
 msgid "Individual package selection"
 msgstr "Individual package selection"
 
-#: steps_gtk.pm:351
+#: steps_gtk.pm:357
 #, c-format
 msgid "Unselect All"
 msgstr ""
 
-#: steps_gtk.pm:370 steps_interactive.pm:562
+#: steps_gtk.pm:376 steps_interactive.pm:562
 #, c-format
 msgid "Total size: %d / %d MB"
 msgstr "ขนาดรวม: %d / %d MB "
 
-#: steps_gtk.pm:415
+#: steps_gtk.pm:421
 #, c-format
 msgid "Version: "
 msgstr "เวอร์ชัน:"
 
-#: steps_gtk.pm:416
+#: steps_gtk.pm:422
 #, c-format
 msgid "Size: "
 msgstr "ขนาด:"
 
-#: steps_gtk.pm:416
+#: steps_gtk.pm:422
 #, fuzzy, c-format
 msgid "%d KB\n"
 msgstr "ขนาด: %d KB\n"
 
-#: steps_gtk.pm:417
+#: steps_gtk.pm:423
 #, c-format
 msgid "Importance: "
 msgstr "ความสำคัญ:"
 
-#: steps_gtk.pm:452
+#: steps_gtk.pm:458
 #, c-format
 msgid "You cannot select/unselect this package"
 msgstr "คุณไม่สามารถเลือก/ไม่เลือกแพกเกจนี้"
 
-#: steps_gtk.pm:456
+#: steps_gtk.pm:462
 #, fuzzy, c-format
 msgid "due to missing %s"
 msgstr "ไม่มี kdesu "
 
-#: steps_gtk.pm:457
+#: steps_gtk.pm:463
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr ""
 
-#: steps_gtk.pm:458
+#: steps_gtk.pm:464
 #, c-format
 msgid "trying to promote %s"
 msgstr ""
 
-#: steps_gtk.pm:459
+#: steps_gtk.pm:465
 #, c-format
 msgid "in order to keep %s"
 msgstr ""
 
-#: steps_gtk.pm:464
+#: steps_gtk.pm:470
 #, c-format
 msgid ""
 "You cannot select this package as there is not enough space left to install "
 "it"
 msgstr "คุณไม่สามารถเลือก package นี้เนื่องจากคุณมีพื้นที่ไม่เพียงพอ"
 
-#: steps_gtk.pm:467
+#: steps_gtk.pm:473
 #, c-format
 msgid "The following packages are going to be installed"
 msgstr "แพ็คเก็จเหล่านี้กำลังจะถูกติดตั้ง"
 
-#: steps_gtk.pm:468
+#: steps_gtk.pm:474
 #, c-format
 msgid "The following packages are going to be removed"
 msgstr "แพ็คเก็จเหล่านี้กำลังจะถูกลบ"
 
-#: steps_gtk.pm:494
+#: steps_gtk.pm:500
 #, c-format
 msgid "This is a mandatory package, it cannot be unselected"
 msgstr "นี่คือแพกเกจที่ต้องติดตั้ง ไม่สามารถไม่เลือก"
 
-#: steps_gtk.pm:496
+#: steps_gtk.pm:502
 #, c-format
 msgid "You cannot unselect this package. It is already installed"
 msgstr "คุณไม่สามารถไม่เลือกแพกเกจนี้เพราะมันได้ถูกติดตั้งไปแล้ว"
 
-#: steps_gtk.pm:498
+#: steps_gtk.pm:504
 #, c-format
 msgid "You cannot unselect this package. It must be upgraded"
 msgstr "คุณไม่สามารถไม่เลือกแพกเกจนี้  มันจำเป็นที่จะต้องถูก upgrade"
 
-#: steps_gtk.pm:502
+#: steps_gtk.pm:508
 #, c-format
 msgid "Show automatically selected packages"
 msgstr ""
 
-#: steps_gtk.pm:509
+#: steps_gtk.pm:512
 #, c-format
 msgid "Install"
 msgstr "ติดตั้ง"
 
-#: steps_gtk.pm:512
+#: steps_gtk.pm:515
 #, fuzzy, c-format
 msgid "Load/Save selection"
 msgstr "เลือกกลุ่มแพ็คเก็จ"
 
-#: steps_gtk.pm:513
+#: steps_gtk.pm:516
 #, fuzzy, c-format
 msgid "Updating package selection"
 msgstr "บันทึกกลุ่มแพ็คเก็จที่เลือก"
 
-#: steps_gtk.pm:518
+#: steps_gtk.pm:521
 #, fuzzy, c-format
 msgid "Minimal install"
 msgstr "ออกจากการติดตั้ง"
 
-#: steps_gtk.pm:531
+#: steps_gtk.pm:534
 #, c-format
 msgid "Software Management"
 msgstr "การบริหารโปรแกรม"
 
-#: steps_gtk.pm:531 steps_interactive.pm:443
+#: steps_gtk.pm:534 steps_interactive.pm:443
 #, c-format
 msgid "Choose the packages you want to install"
 msgstr "เลือกแพ็คเก็จที่คุณต้องการติดตั้ง"
 
-#: steps_gtk.pm:548 steps_interactive.pm:670 steps_list.pm:32
+#: steps_gtk.pm:551 steps_interactive.pm:670 steps_list.pm:32
 #, c-format
 msgid "Installing"
 msgstr "กำลังติดตั้ง"
 
-#: steps_gtk.pm:578
+#: steps_gtk.pm:581
 #, fuzzy, c-format
 msgid "No details"
 msgstr "รายละเอียด"
 
-#: steps_gtk.pm:597
+#: steps_gtk.pm:600
 #, fuzzy, c-format
 msgid "Time remaining:"
 msgstr "เวลาที่เหลือ "
 
-#: steps_gtk.pm:598
+#: steps_gtk.pm:601
 #, fuzzy, c-format
 msgid "(estimating...)"
 msgstr "การประเมิน"
 
-#: steps_gtk.pm:628
+#: steps_gtk.pm:631
 #, c-format
 msgid "%d package"
 msgid_plural "%d packages"
 msgstr[0] "แพ็คเก็จ %d ชุด"
 
-#: steps_gtk.pm:683 steps_interactive.pm:834 steps_list.pm:43
+#: steps_gtk.pm:687 steps_interactive.pm:837 steps_list.pm:43
 #, c-format
 msgid "Summary"
 msgstr "รวมความ"
 
-#: steps_gtk.pm:702
+#: steps_gtk.pm:706
 #, c-format
 msgid "Configure"
 msgstr "การปรับแต่ง"
 
-#: steps_gtk.pm:719 steps_interactive.pm:830 steps_interactive.pm:983
+#: steps_gtk.pm:723 steps_interactive.pm:833 steps_interactive.pm:986
 #, fuzzy, c-format
 msgid "not configured"
 msgstr "คอนฟิกใหม่"
@@ -1051,7 +1098,7 @@ msgid ""
 "If you want to skip some of them, you can unselect them now."
 msgstr ""
 
-#: steps_gtk.pm:778 steps_interactive.pm:349
+#: steps_gtk.pm:782 steps_interactive.pm:349
 #, c-format
 msgid ""
 "You have the option to copy the contents of the CDs onto the hard disk drive "
@@ -1060,7 +1107,7 @@ msgid ""
 "available once the system is fully installed."
 msgstr ""
 
-#: steps_gtk.pm:780 steps_interactive.pm:351
+#: steps_gtk.pm:784 steps_interactive.pm:351
 #, c-format
 msgid "Copy whole CDs"
 msgstr ""
@@ -1342,101 +1389,101 @@ msgid ""
 msgstr ""
 
 #. -PO: example: lilo-graphic on /dev/hda1
-#: steps_interactive.pm:878
+#: steps_interactive.pm:881
 #, c-format
 msgid "%s on %s"
 msgstr "%s บน %s"
 
-#: steps_interactive.pm:910 steps_interactive.pm:917 steps_interactive.pm:930
-#: steps_interactive.pm:947 steps_interactive.pm:962
+#: steps_interactive.pm:913 steps_interactive.pm:920 steps_interactive.pm:933
+#: steps_interactive.pm:950 steps_interactive.pm:965
 #, c-format
 msgid "Hardware"
 msgstr "ฮาร์ดแวร์"
 
-#: steps_interactive.pm:931 steps_interactive.pm:948
+#: steps_interactive.pm:934 steps_interactive.pm:951
 #, c-format
 msgid "Sound card"
 msgstr "Sound card"
 
-#: steps_interactive.pm:951
+#: steps_interactive.pm:954
 #, fuzzy, c-format
 msgid "Do you have an ISA sound card?"
 msgstr "คุณมีอันอื่นๆอีกหรือไม่?"
 
-#: steps_interactive.pm:953
+#: steps_interactive.pm:956
 #, c-format
 msgid ""
 "Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
 "card"
 msgstr ""
 
-#: steps_interactive.pm:955
+#: steps_interactive.pm:958
 #, c-format
 msgid "No sound card detected. Try \"harddrake\" after installation"
 msgstr ""
 
-#: steps_interactive.pm:963
+#: steps_interactive.pm:966
 #, fuzzy, c-format
 msgid "Graphical interface"
 msgstr "ให้เป็นกราฟฟิคเมื่อเริ่มต้น"
 
-#: steps_interactive.pm:969 steps_interactive.pm:981
+#: steps_interactive.pm:972 steps_interactive.pm:984
 #, c-format
 msgid "Network & Internet"
 msgstr "เน็ตเวิร์คกับอินเตอร์เน็ต"
 
-#: steps_interactive.pm:982
+#: steps_interactive.pm:985
 #, fuzzy, c-format
 msgid "Proxies"
 msgstr "Profile: "
 
-#: steps_interactive.pm:983
+#: steps_interactive.pm:986
 #, fuzzy, c-format
 msgid "configured"
 msgstr "คอนฟิกใหม่"
 
-#: steps_interactive.pm:993
+#: steps_interactive.pm:996
 #, c-format
 msgid "Security Level"
 msgstr "ระดับความปลอดภัย"
 
-#: steps_interactive.pm:1013
+#: steps_interactive.pm:1016
 #, c-format
 msgid "Firewall"
 msgstr ""
 
-#: steps_interactive.pm:1017
+#: steps_interactive.pm:1020
 #, fuzzy, c-format
 msgid "activated"
 msgstr "แอ็คทีฟ"
 
-#: steps_interactive.pm:1017
+#: steps_interactive.pm:1020
 #, c-format
 msgid "disabled"
 msgstr "ไม่ใช้งาน"
 
-#: steps_interactive.pm:1031
+#: steps_interactive.pm:1034
 #, c-format
 msgid "You have not configured X. Are you sure you really want this?"
 msgstr ""
 
-#: steps_interactive.pm:1060
+#: steps_interactive.pm:1063
 #, c-format
 msgid "Preparing bootloader..."
 msgstr "กำลังเตรียมบูตโหลดเดอร์"
 
 #. -PO: This is NOT the boot loader!!!!
-#: steps_interactive.pm:1062
+#: steps_interactive.pm:1065
 #, fuzzy, c-format
 msgid "Preparing initial startup program..."
 msgstr "กำลังเตรียมการติดตั้ง"
 
-#: steps_interactive.pm:1063
+#: steps_interactive.pm:1066
 #, c-format
 msgid "Be patient, this may take a while..."
 msgstr ""
 
-#: steps_interactive.pm:1074
+#: steps_interactive.pm:1077
 #, c-format
 msgid ""
 "You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
@@ -1445,24 +1492,24 @@ msgid ""
 "root fs is: root=%s"
 msgstr ""
 
-#: steps_interactive.pm:1087
+#: steps_interactive.pm:1090
 #, c-format
 msgid ""
 "In this security level, access to the files in the Windows partition is "
 "restricted to the administrator."
 msgstr ""
 
-#: steps_interactive.pm:1119
+#: steps_interactive.pm:1122
 #, c-format
 msgid "Insert a blank floppy in drive %s"
 msgstr "ให้ใส่แผ่นฟล้อปปี้ลงในไดรว์ %s "
 
-#: steps_interactive.pm:1121
+#: steps_interactive.pm:1124
 #, c-format
 msgid "Creating auto install floppy..."
 msgstr "กำลังเตรียมการติดตั้งลงบน floppy"
 
-#: steps_interactive.pm:1132
+#: steps_interactive.pm:1135
 #, c-format
 msgid ""
 "Some steps are not completed.\n"
@@ -1473,12 +1520,12 @@ msgstr ""
 "\n"
 "คุณต้องการออกจากการติดตั้งจริงๆหรือไม่?"
 
-#: steps_interactive.pm:1142
+#: steps_interactive.pm:1145
 #, fuzzy, c-format
 msgid "Congratulations"
 msgstr "ขอแสดงความยินดี"
 
-#: steps_interactive.pm:1145
+#: steps_interactive.pm:1148
 #, c-format
 msgid "Reboot"
 msgstr ""