sync with code

also update br+fr

1 files changed, 238 insertions, 248 deletions

diff --git a/perl-install/install/share/po/th.po b/perl-install/install/share/po/th.po
index d52811be9..7c99f6edb 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-11-03 12:08+0200\n"
+"POT-Creation-Date: 2014-11-19 20:52+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"
@@ -67,13 +67,13 @@ msgstr ""
 msgid "Be Free!"
 msgstr ""
 
-#: any.pm:111
+#: any.pm:151
 #, fuzzy, c-format
 msgid "Do you have further supplementary media?"
 msgstr "คุณมีอันอื่นๆอีกหรือไม่?"
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:114
+#: any.pm:154
 #, 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:122
+#: any.pm:162
 #, c-format
 msgid "CD-ROM"
 msgstr "ซีดี-รอม"
 
-#: any.pm:123
+#: any.pm:163
 #, fuzzy, c-format
 msgid "Network (HTTP)"
 msgstr "Network interface"
 
-#: any.pm:124
+#: any.pm:164
 #, fuzzy, c-format
 msgid "Network (FTP)"
 msgstr "Network interface"
 
-#: any.pm:125
+#: any.pm:165
 #, c-format
 msgid "Network (NFS)"
 msgstr ""
 
-#: any.pm:173
+#: any.pm:224
 #, c-format
 msgid "URL of the mirror?"
 msgstr ""
 
-#: any.pm:179
+#: any.pm:230
 #, c-format
 msgid "URL must start with ftp:// or http://"
 msgstr ""
 
-#: any.pm:190
+#: any.pm:248
 #, fuzzy, c-format
 msgid "Contacting %s web site to get the list of available mirrors..."
 msgstr "กำลังติดต่อกับมิลเรอร์ไซต์เพื่อหารายการของแพ็คเก็จที่มีให้"
 
-#: any.pm:195
+#: any.pm:253
 #, fuzzy, c-format
 msgid "Failed contacting %s web site to get the list of available mirrors"
 msgstr "กำลังติดต่อกับมิลเรอร์ไซต์เพื่อหารายการของแพ็คเก็จที่มีให้"
 
-#: any.pm:205
+#: any.pm:263
 #, c-format
 msgid "Choose a mirror from which to get the packages"
 msgstr "เลือกมิลเรอร์ไซต์ที่จะใช้ในการดาวน์โหลดแพ็คเก็จ"
 
-#: any.pm:235
+#: any.pm:293
 #, c-format
 msgid "NFS setup"
 msgstr ""
 
-#: any.pm:236
+#: any.pm:294
 #, c-format
 msgid "Please enter the hostname and directory of your NFS media"
 msgstr ""
 
-#: any.pm:240
+#: any.pm:298
 #, c-format
 msgid "Hostname missing"
 msgstr ""
 
-#: any.pm:241
+#: any.pm:299
 #, c-format
 msgid "Directory must begin with \"/\""
 msgstr ""
 
-#: any.pm:245
+#: any.pm:303
 #, c-format
 msgid "Hostname of the NFS mount ?"
 msgstr ""
 
-#: any.pm:246
+#: any.pm:304
 #, c-format
 msgid "Directory"
 msgstr "สารบัญ"
 
-#: any.pm:268
+#: any.pm:334
 #, c-format
 msgid "Supplementary"
 msgstr ""
 
-#: any.pm:303
+#: any.pm:369
 #, 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:319
+#: any.pm:394
 #, c-format
 msgid "Core Release"
 msgstr ""
 
-#: any.pm:321
+#: any.pm:396
 #, c-format
 msgid "Tainted Release"
 msgstr ""
 
-#: any.pm:323
+#: any.pm:398
 #, c-format
 msgid "Nonfree Release"
 msgstr ""
 
-#: any.pm:351
+#: any.pm:436
 #, 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:352
+#: any.pm:437
 #, c-format
 msgid "You should enable \"%s\""
 msgstr ""
 
-#: any.pm:377
+#: any.pm:475
 #, c-format
 msgid "\"%s\" contains the various pieces of the systems and its applications"
 msgstr ""
 
-#: any.pm:378
+#: any.pm:476
 #, c-format
 msgid "\"%s\" contains non free software.\n"
 msgstr ""
 
-#: any.pm:379
+#: any.pm:477
 #, 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:380
+#: any.pm:478
 #, c-format
 msgid ""
 "\"%s\" contains software that can not be distributed in every country due to "
 "software patents."
 msgstr ""
 
-#: any.pm:381
+#: any.pm:479
 #, c-format
 msgid ""
 "It also contains software from \"%s\" rebuild with additional capabilities."
 msgstr ""
 
-#: any.pm:387
+#: any.pm:485
 #, c-format
 msgid "Here you can enable more media if you want."
 msgstr ""
 
-#: any.pm:404
+#: any.pm:502
 #, c-format
 msgid "This medium provides package updates for medium \"%s\""
 msgstr ""
 
-#: any.pm:480
+#: any.pm:600
 #, fuzzy, c-format
 msgid "Looking at packages already installed..."
 msgstr "คุณไม่สามารถไม่เลือกแพกเกจนี้เพราะมันได้ถูกติดตั้งไปแล้ว"
 
-#: any.pm:514
+#: any.pm:634
 #, c-format
 msgid "Finding packages to upgrade..."
 msgstr "กำลังหาแพ็คเก็จที่จะทำการอัพเกรด"
 
-#: any.pm:527
+#: any.pm:653
 #, 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:743
+#: any.pm:881
 #, c-format
 msgid ""
 "The following packages will be removed to allow upgrading your system: %s\n"
@@ -261,87 +261,87 @@ msgid ""
 "Do you really want to remove these packages?\n"
 msgstr ""
 
-#: any.pm:962
+#: any.pm:1096
 #, c-format
 msgid "Error reading file %s"
 msgstr "มีปัญหากับการอ่านข้อมูลในไฟล์ %s"
 
-#: any.pm:1170
+#: any.pm:1304
 #, fuzzy, c-format
 msgid "The following disk(s) were renamed:"
 msgstr "แพ็คเก็จเหล่านี้กำลังจะถูกติดตั้ง"
 
-#: any.pm:1172
+#: any.pm:1306
 #, c-format
 msgid "%s (previously named as %s)"
 msgstr ""
 
-#: any.pm:1229
+#: any.pm:1363
 #, c-format
 msgid "HTTP"
 msgstr "HTTP"
 
-#: any.pm:1229
+#: any.pm:1363
 #, c-format
 msgid "FTP"
 msgstr "FTP"
 
-#: any.pm:1229
+#: any.pm:1363
 #, c-format
 msgid "NFS"
 msgstr "NFS"
 
-#: any.pm:1248 steps_interactive.pm:973
+#: any.pm:1382 steps_interactive.pm:948
 #, c-format
 msgid "Network"
 msgstr "ระบบเครือข่าย"
 
-#: any.pm:1252
+#: any.pm:1386
 #, fuzzy, c-format
 msgid "Please choose a media"
 msgstr "กรุณาเลือก"
 
-#: any.pm:1268
+#: any.pm:1402
 #, fuzzy, c-format
 msgid "File already exists. Overwrite it?"
 msgstr "ไฟล์มีอยู่แล้ว ต้องการใช้?"
 
-#: any.pm:1272
+#: any.pm:1406
 #, c-format
 msgid "Permission denied"
 msgstr "สิทธิการทำงานถูกปฎิเสท"
 
-#: any.pm:1320
+#: any.pm:1454
 #, c-format
 msgid "Bad NFS name"
 msgstr ""
 
-#: any.pm:1341
+#: any.pm:1475
 #, fuzzy, c-format
 msgid "Bad media %s"
 msgstr "อุปกรณ์ที่ถูกเพิ่มเข้ามา %s"
 
-#: any.pm:1385
+#: any.pm:1519
 #, fuzzy, c-format
 msgid "Cannot make screenshots before partitioning"
 msgstr "โปรแกรมไม่สามารถเพิ่มพาร์ติชั่นได้อีก"
 
-#: any.pm:1393
+#: any.pm:1530
 #, fuzzy, c-format
 msgid "Screenshots will be available after install in %s"
 msgstr "คุณสามารถเลือกภาษาอื่นซึ่งจะสามารถใช้ได้หลังติดตั้ง"
 
-#: gtk.pm:128
+#: gtk.pm:135
 #, fuzzy, c-format
 msgid "Installation"
 msgstr "กำลังติดตั้ง"
 
-#: gtk.pm:132 share/meta-task/compssUsers.pl:46
+#: gtk.pm:139 share/meta-task/compssUsers.pl:48
 #, c-format
 msgid "Configuration"
 msgstr "ปรับแต่งค่า"
 
-#: install2.pm:169
+#: install2.pm:210
 #, c-format
 msgid "You must also format %s"
 msgstr ""
@@ -365,22 +365,22 @@ msgstr "ระบบเน็ตเวิร์กกำลังจะทำง
 msgid "Bringing down the network"
 msgstr "ระบบเน็ตเวิร์กกำลังจะหยุดทำงาน"
 
-#: media.pm:409
+#: media.pm:404
 #, c-format
 msgid "Please wait, retrieving file"
 msgstr ""
 
-#: media.pm:717
+#: media.pm:712
 #, c-format
 msgid "unable to add medium"
 msgstr ""
 
-#: media.pm:757
+#: media.pm:752
 #, c-format
 msgid "Copying some packages on disks for future use"
 msgstr ""
 
-#: media.pm:810
+#: media.pm:805
 #, fuzzy, c-format
 msgid "Copying in progress"
 msgstr "ค้นหาเจอบน port %s"
@@ -425,397 +425,407 @@ msgstr ""
 msgid "No description"
 msgstr "ไม่มีคำอธิบายรายละเอียด"
 
-#: pkgs.pm:287
+#: pkgs.pm:286
 #, c-format
 msgid ""
 "Some packages requested by %s cannot be installed:\n"
 "%s"
 msgstr ""
 
-#: pkgs.pm:383 pkgs.pm:410
+#: pkgs.pm:382 pkgs.pm:409
 #, fuzzy, c-format
 msgid "An error occurred:"
 msgstr "มีปัญหาเกิดขึ้น"
 
-#: pkgs.pm:402
+#: pkgs.pm:401
 #, c-format
 msgid "A fatal error occurred: %s."
 msgstr ""
 
-#: pkgs.pm:896 pkgs.pm:938
+#: pkgs.pm:895 pkgs.pm:937
 #, c-format
 msgid "Do not ask again"
 msgstr ""
 
-#: pkgs.pm:912
+#: pkgs.pm:911
 #, fuzzy, c-format
 msgid "%d installation transactions failed"
 msgstr "การติดตั้งไม่สำเร็จ"
 
-#: pkgs.pm:913
+#: pkgs.pm:912
 #, fuzzy, c-format
 msgid "Installation of packages failed:"
 msgstr "กำลังติดตั้งแพ็คเก็จ %s"
 
-#: share/meta-task/compssUsers.pl:14
+#: share/meta-task/compssUsers.pl:16
 #, fuzzy, c-format
 msgid "Workstation"
 msgstr "Workstation ที่ทำงาน"
 
-#: share/meta-task/compssUsers.pl:16
+#: share/meta-task/compssUsers.pl:18
 #, c-format
 msgid "Office Workstation"
 msgstr "Workstation ที่ทำงาน"
 
-#: share/meta-task/compssUsers.pl:18
+#: share/meta-task/compssUsers.pl:20
 #, c-format
 msgid ""
 "Office programs: wordprocessors (LibreOffice Writer, Kword), spreadsheets "
 "(LibreOffice Calc, Kspread), PDF viewers, etc"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:24
+#: share/meta-task/compssUsers.pl:26
 #, fuzzy, c-format
 msgid "Game station"
 msgstr "Workstation ที่ทำงาน"
 
-#: share/meta-task/compssUsers.pl:25
+#: share/meta-task/compssUsers.pl:27
 #, c-format
 msgid "Amusement programs: arcade, boards, strategy, etc"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:28
+#: share/meta-task/compssUsers.pl:30
 #, fuzzy, c-format
 msgid "Multimedia station"
 msgstr "Multimedia - เขียน CD "
 
-#: share/meta-task/compssUsers.pl:29
+#: share/meta-task/compssUsers.pl:31
 #, c-format
 msgid "Sound and video playing/editing programs"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:34
+#: share/meta-task/compssUsers.pl:36
 #, fuzzy, c-format
 msgid "Internet station"
 msgstr "การเชื่อมต่อกับ Internet แบบ sharing"
 
-#: share/meta-task/compssUsers.pl:35
+#: share/meta-task/compssUsers.pl:37
 #, 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:40
+#: share/meta-task/compssUsers.pl:42
 #, fuzzy, c-format
 msgid "Network Computer (client)"
 msgstr "เครื่องพิมพ์ในระบบ Network (Socket)"
 
-#: share/meta-task/compssUsers.pl:41
+#: share/meta-task/compssUsers.pl:43
 #, c-format
 msgid "Clients for different protocols including ssh"
 msgstr "Clients for different protocols including ssh"
 
-#: share/meta-task/compssUsers.pl:47
+#: share/meta-task/compssUsers.pl:49
 #, c-format
 msgid "Tools to ease the configuration of your computer"
 msgstr "เครืองมือที่ช่วยในการปรับแต่งเครื่องชองคุณให้ง่ายขึ้น"
 
-#: share/meta-task/compssUsers.pl:51
+#: share/meta-task/compssUsers.pl:53
 #, fuzzy, c-format
 msgid "Console Tools"
 msgstr "ปิด"
 
-#: share/meta-task/compssUsers.pl:52
+#: share/meta-task/compssUsers.pl:54
 #, c-format
 msgid "Editors, shells, file tools, terminals"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:56 share/meta-task/compssUsers.pl:200
-#: share/meta-task/compssUsers.pl:202
+#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:206
+#: share/meta-task/compssUsers.pl:208
 #, c-format
 msgid "Development"
 msgstr "พัฒนาซอฟท์แวร์ (Development)"
 
-#: share/meta-task/compssUsers.pl:57 share/meta-task/compssUsers.pl:203
+#: share/meta-task/compssUsers.pl:59 share/meta-task/compssUsers.pl:209
 #, c-format
 msgid "C and C++ development libraries, programs and include files"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:61 share/meta-task/compssUsers.pl:207
+#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:213
 #, c-format
 msgid "Documentation"
 msgstr "คู่มือ"
 
-#: share/meta-task/compssUsers.pl:62 share/meta-task/compssUsers.pl:208
+#: share/meta-task/compssUsers.pl:64 share/meta-task/compssUsers.pl:214
 #, c-format
 msgid "Books and Howto's on Linux and Free Software"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:66 share/meta-task/compssUsers.pl:211
+#: share/meta-task/compssUsers.pl:68 share/meta-task/compssUsers.pl:217
 #, c-format
 msgid "LSB"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:67 share/meta-task/compssUsers.pl:212
+#: share/meta-task/compssUsers.pl:69 share/meta-task/compssUsers.pl:218
 #, c-format
 msgid "Linux Standard Base. Third party applications support"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:77
+#: share/meta-task/compssUsers.pl:79
 #, fuzzy, c-format
 msgid "Web Server"
 msgstr "เซิร์ฟเวอร์"
 
-#: share/meta-task/compssUsers.pl:78
+#: share/meta-task/compssUsers.pl:80
 #, c-format
 msgid "Apache"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:82
+#: share/meta-task/compssUsers.pl:84
 #, fuzzy, c-format
 msgid "Groupware"
 msgstr "เวิร์กกรุ๊ป (workgroup)"
 
-#: share/meta-task/compssUsers.pl:83
+#: share/meta-task/compssUsers.pl:85
 #, fuzzy, c-format
 msgid "Kolab Server"
 msgstr "เซิร์ฟเวอร์ NIS"
 
-#: share/meta-task/compssUsers.pl:86 share/meta-task/compssUsers.pl:136
+#: share/meta-task/compssUsers.pl:88 share/meta-task/compssUsers.pl:138
 #, c-format
 msgid "Firewall/Router"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:87 share/meta-task/compssUsers.pl:137
+#: share/meta-task/compssUsers.pl:89 share/meta-task/compssUsers.pl:139
 #, fuzzy, c-format
 msgid "Internet gateway"
 msgstr "การติดต่อ internet"
 
-#: share/meta-task/compssUsers.pl:90
+#: share/meta-task/compssUsers.pl:92
 #, fuzzy, c-format
 msgid "Mail/News"
 msgstr "/ไฟล์/_ใหม่"
 
-#: share/meta-task/compssUsers.pl:91
+#: share/meta-task/compssUsers.pl:93
 #, fuzzy, c-format
 msgid "Postfix mail server, Inn news server"
 msgstr "ชื่อเซิร์ฟเวอร์ของพรินเตอร์"
 
-#: share/meta-task/compssUsers.pl:95
+#: share/meta-task/compssUsers.pl:97
 #, fuzzy, c-format
 msgid "Directory Server"
 msgstr "เรียกคืนจากแผ่นฟล้อปปี้"
 
-#: share/meta-task/compssUsers.pl:100
+#: share/meta-task/compssUsers.pl:102
 #, fuzzy, c-format
 msgid "FTP Server"
 msgstr "เซิร์ฟเวอร์ NIS"
 
-#: share/meta-task/compssUsers.pl:101
+#: share/meta-task/compssUsers.pl:103
 #, c-format
 msgid "ProFTPd"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:105
+#: share/meta-task/compssUsers.pl:107
 #, fuzzy, c-format
 msgid "DNS/NIS"
 msgstr "ใช้ NIS"
 
-#: share/meta-task/compssUsers.pl:106
+#: share/meta-task/compssUsers.pl:108
 #, fuzzy, c-format
 msgid "Domain Name and Network Information Server"
 msgstr "ชื่อโดเมน"
 
-#: share/meta-task/compssUsers.pl:110
+#: share/meta-task/compssUsers.pl:112
 #, fuzzy, c-format
 msgid "File and Printer Sharing Server"
 msgstr "ชื่อเซิร์ฟเวอร์ของพรินเตอร์"
 
-#: share/meta-task/compssUsers.pl:111
+#: share/meta-task/compssUsers.pl:113
 #, fuzzy, c-format
 msgid "NFS Server, Samba server"
 msgstr "เซิร์ฟเวอร์ NIS"
 
-#: share/meta-task/compssUsers.pl:115 share/meta-task/compssUsers.pl:131
+#: share/meta-task/compssUsers.pl:117 share/meta-task/compssUsers.pl:133
 #, c-format
 msgid "Database"
 msgstr "ฐานข้อมูล"
 
-#: share/meta-task/compssUsers.pl:116
+#: share/meta-task/compssUsers.pl:118
 #, c-format
 msgid "PostgreSQL and MariaDB Database Server"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:121
+#: share/meta-task/compssUsers.pl:123
 #, c-format
 msgid "Web/FTP"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:122
+#: share/meta-task/compssUsers.pl:124
 #, c-format
 msgid "Apache, Pro-ftpd"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:126
+#: share/meta-task/compssUsers.pl:128
 #, c-format
 msgid "Mail"
 msgstr "จดหมาย"
 
-#: share/meta-task/compssUsers.pl:127
+#: share/meta-task/compssUsers.pl:129
 #, fuzzy, c-format
 msgid "Postfix mail server"
 msgstr "ชื่อเซิร์ฟเวอร์ของพรินเตอร์"
 
-#: share/meta-task/compssUsers.pl:132
+#: share/meta-task/compssUsers.pl:134
 #, c-format
 msgid "PostgreSQL or MariaDB database server"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:140
+#: share/meta-task/compssUsers.pl:142
 #, fuzzy, c-format
 msgid "Network Computer server"
 msgstr "เครื่องพิมพ์ในระบบ Network (Socket)"
 
-#: share/meta-task/compssUsers.pl:141
+#: share/meta-task/compssUsers.pl:143
 #, c-format
 msgid "NFS server, SMB server, Proxy server, ssh server"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:148
+#: share/meta-task/compssUsers.pl:150
 #, c-format
 msgid "Graphical Environment"
 msgstr "การทำงานแบบกราฟฟิก"
 
-#: share/meta-task/compssUsers.pl:150
+#: share/meta-task/compssUsers.pl:152
 #, fuzzy, c-format
 msgid "KDE Workstation"
 msgstr "Workstation ที่ทำงาน"
 
-#: share/meta-task/compssUsers.pl:151
+#: share/meta-task/compssUsers.pl:153
 #, c-format
 msgid ""
 "The K Desktop Environment, the basic graphical environment with a collection "
 "of accompanying tools"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:156
+#: share/meta-task/compssUsers.pl:158
 #, fuzzy, c-format
 msgid "GNOME Workstation"
 msgstr "Workstation ที่ทำงาน"
 
-#: share/meta-task/compssUsers.pl:157 share/meta-task/compssUsers.pl:168
+#: share/meta-task/compssUsers.pl:159 share/meta-task/compssUsers.pl:170
 #, c-format
 msgid ""
 "A graphical environment with user-friendly set of applications and desktop "
 "tools"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:162
+#: share/meta-task/compssUsers.pl:164
 #, fuzzy, c-format
 msgid "XFCE Workstation"
 msgstr "Workstation ที่ทำงาน"
 
-#: share/meta-task/compssUsers.pl:163
+#: share/meta-task/compssUsers.pl:165
 #, c-format
 msgid ""
 "A lighter graphical environment with user-friendly set of applications and "
 "desktop tools"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:167
+#: share/meta-task/compssUsers.pl:169
 #, fuzzy, c-format
 msgid "MATE Workstation"
 msgstr "Workstation ที่ทำงาน"
 
-#: share/meta-task/compssUsers.pl:172
+#: share/meta-task/compssUsers.pl:174
 #, fuzzy, c-format
 msgid "Cinnamon Workstation"
 msgstr "Workstation ที่ทำงาน"
 
-#: share/meta-task/compssUsers.pl:173
+#: share/meta-task/compssUsers.pl:175
 #, 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:179
-#, c-format
-msgid ""
-"A lightweight & fast graphical environment with user-friendly set of "
-"applications and desktop tools"
-msgstr ""
-
-#: share/meta-task/compssUsers.pl:183
 #, fuzzy, c-format
-msgid "RazorQT Desktop"
+msgid "LXQT Desktop"
 msgstr "พื้นที่ทำงาน"
 
-#: share/meta-task/compssUsers.pl:185
+#: share/meta-task/compssUsers.pl:181
 #, c-format
-msgid "A less developed lightweight fast graphical environment"
+msgid "A next generation QT port of the lightweight desktop environment"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:188
+#: share/meta-task/compssUsers.pl:184
 #, c-format
 msgid "Enlightenment e17 Desktop"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:190
+#: share/meta-task/compssUsers.pl:186
 #, c-format
 msgid "A lightweight fast graphical environment with a dedicated following"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:193
+#: share/meta-task/compssUsers.pl:189
+#, fuzzy, c-format
+msgid "LXDE Desktop"
+msgstr "พื้นที่ทำงาน"
+
+#: share/meta-task/compssUsers.pl:191
+#, fuzzy, c-format
+msgid "A lightweight fast graphical environment"
+msgstr "การทำงานแบบกราฟฟิก"
+
+#: share/meta-task/compssUsers.pl:194
+#, fuzzy, c-format
+msgid "Plasma Desktop"
+msgstr "พื้นที่ทำงาน"
+
+#: share/meta-task/compssUsers.pl:195
+#, c-format
+msgid ""
+"The Plasma Desktop, the basic graphical environment with a collection of "
+"accompanying tools"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:199
 #, c-format
 msgid "Other Graphical Desktops"
 msgstr "Graphical Desktops อื่นๆ"
 
-#: share/meta-task/compssUsers.pl:194
+#: share/meta-task/compssUsers.pl:200
 #, c-format
 msgid "Window Maker, Fvwm, etc"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:217
+#: share/meta-task/compssUsers.pl:223
 #, c-format
 msgid "Utilities"
 msgstr "อรรถประโยชน์"
 
-#: share/meta-task/compssUsers.pl:219 share/meta-task/compssUsers.pl:220
+#: share/meta-task/compssUsers.pl:225 share/meta-task/compssUsers.pl:226
 #, fuzzy, c-format
 msgid "SSH Server"
 msgstr "เซิร์ฟเวอร์ NIS"
 
-#: share/meta-task/compssUsers.pl:224
+#: share/meta-task/compssUsers.pl:230
 #, fuzzy, c-format
 msgid "Webmin"
 msgstr "อุปกรณ์"
 
-#: share/meta-task/compssUsers.pl:225
+#: share/meta-task/compssUsers.pl:231
 #, fuzzy, c-format
 msgid "Webmin Remote Configuration Server"
 msgstr "การคอนฟิก Internet"
 
-#: share/meta-task/compssUsers.pl:229
+#: share/meta-task/compssUsers.pl:235
 #, fuzzy, c-format
 msgid "Network Utilities/Monitoring"
 msgstr "การคอนฟิกระบบเน็ตเวิร์ก"
 
-#: share/meta-task/compssUsers.pl:230
+#: share/meta-task/compssUsers.pl:236
 #, c-format
 msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..."
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:234
+#: share/meta-task/compssUsers.pl:240
 #, fuzzy, c-format
 msgid "Mageia Wizards"
 msgstr "Control Center"
 
-#: share/meta-task/compssUsers.pl:235
+#: share/meta-task/compssUsers.pl:241
 #, fuzzy, c-format
 msgid "Wizards to configure server"
 msgstr "การคอนฟิกเครื่องพิมพ์"
@@ -857,12 +867,12 @@ msgstr "การติดตั้งลีนุกซ์-แมนเดร�
 msgid "<Tab>/<Alt-Tab> between elements"
 msgstr "<Tab>/<Alt-Tab> ระหว่างตัวเลือก"
 
-#: steps_gtk.pm:146
+#: steps_gtk.pm:147
 #, c-format
 msgid "Xorg server is slow to start. Please wait..."
 msgstr ""
 
-#: steps_gtk.pm:210
+#: steps_gtk.pm:212
 #, c-format
 msgid ""
 "Your system is low on resources. You may have some problem installing\n"
@@ -873,57 +883,57 @@ msgstr ""
 "%s  ถ้าเป็นเช่นนั้น กรุณาทดลองติดตั้งแบบ text \n"
 "กรุณากด F1 ขณะ boot จาก cdrom แล้วพิมพ์ text"
 
-#: steps_gtk.pm:240 steps_gtk.pm:757
+#: steps_gtk.pm:242 steps_gtk.pm:757
 #, fuzzy, c-format
 msgid "Media Selection"
 msgstr "เลือกกลุ่มแพ็คเก็จ"
 
-#: steps_gtk.pm:251
+#: steps_gtk.pm:253
 #, c-format
 msgid "Install %s KDE Desktop"
 msgstr ""
 
-#: steps_gtk.pm:252
+#: steps_gtk.pm:254
 #, c-format
 msgid "Install %s GNOME Desktop"
 msgstr ""
 
-#: steps_gtk.pm:253
+#: steps_gtk.pm:255
 #, fuzzy, c-format
 msgid "Custom install"
 msgstr "ออกจากการติดตั้ง"
 
-#: steps_gtk.pm:274
+#: steps_gtk.pm:276
 #, fuzzy, c-format
 msgid "KDE Desktop"
 msgstr "พื้นที่ทำงาน"
 
-#: steps_gtk.pm:275
+#: steps_gtk.pm:277
 #, fuzzy, c-format
 msgid "GNOME Desktop"
 msgstr "พื้นที่ทำงาน"
 
-#: steps_gtk.pm:276
+#: steps_gtk.pm:278
 #, fuzzy, c-format
 msgid "Custom Desktop"
 msgstr "พื้นที่ทำงาน"
 
-#: steps_gtk.pm:282
+#: steps_gtk.pm:284
 #, c-format
 msgid "Here's a preview of the '%s' desktop."
 msgstr ""
 
-#: steps_gtk.pm:309
+#: steps_gtk.pm:311
 #, c-format
 msgid "Click on images in order to see a bigger preview"
 msgstr ""
 
-#: steps_gtk.pm:325 steps_interactive.pm:633 steps_list.pm:30
+#: steps_gtk.pm:327 steps_interactive.pm:605 steps_list.pm:30
 #, c-format
 msgid "Package Group Selection"
 msgstr "เลือกกลุ่มแพ็คเก็จ"
 
-#: steps_gtk.pm:350 steps_interactive.pm:650
+#: steps_gtk.pm:350 steps_interactive.pm:622
 #, c-format
 msgid "Individual package selection"
 msgstr "Individual package selection"
@@ -933,7 +943,7 @@ msgstr "Individual package selection"
 msgid "Unselect All"
 msgstr ""
 
-#: steps_gtk.pm:376 steps_interactive.pm:562
+#: steps_gtk.pm:376 steps_interactive.pm:534
 #, c-format
 msgid "Total size: %d / %d MB"
 msgstr "ขนาดรวม: %d / %d MB "
@@ -1045,12 +1055,12 @@ msgstr "ออกจากการติดตั้ง"
 msgid "Software Management"
 msgstr "การบริหารโปรแกรม"
 
-#: steps_gtk.pm:534 steps_interactive.pm:443
+#: steps_gtk.pm:534 steps_interactive.pm:415
 #, c-format
 msgid "Choose the packages you want to install"
 msgstr "เลือกแพ็คเก็จที่คุณต้องการติดตั้ง"
 
-#: steps_gtk.pm:551 steps_interactive.pm:670 steps_list.pm:32
+#: steps_gtk.pm:551 steps_interactive.pm:642 steps_list.pm:32
 #, c-format
 msgid "Installing"
 msgstr "กำลังติดตั้ง"
@@ -1076,7 +1086,7 @@ msgid "%d package"
 msgid_plural "%d packages"
 msgstr[0] "แพ็คเก็จ %d ชุด"
 
-#: steps_gtk.pm:687 steps_interactive.pm:837 steps_list.pm:43
+#: steps_gtk.pm:687 steps_interactive.pm:809 steps_list.pm:43
 #, c-format
 msgid "Summary"
 msgstr "รวมความ"
@@ -1086,19 +1096,19 @@ msgstr "รวมความ"
 msgid "Configure"
 msgstr "การปรับแต่ง"
 
-#: steps_gtk.pm:723 steps_interactive.pm:833 steps_interactive.pm:986
+#: steps_gtk.pm:723 steps_interactive.pm:805 steps_interactive.pm:961
 #, fuzzy, c-format
 msgid "not configured"
 msgstr "คอนฟิกใหม่"
 
-#: steps_gtk.pm:766 steps_interactive.pm:343
+#: steps_gtk.pm:766 steps_interactive.pm:315
 #, 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:782 steps_interactive.pm:349
+#: steps_gtk.pm:782 steps_interactive.pm:321
 #, c-format
 msgid ""
 "You have the option to copy the contents of the CDs onto the hard disk drive "
@@ -1107,7 +1117,7 @@ msgid ""
 "available once the system is fully installed."
 msgstr ""
 
-#: steps_gtk.pm:784 steps_interactive.pm:351
+#: steps_gtk.pm:784 steps_interactive.pm:323
 #, c-format
 msgid "Copy whole CDs"
 msgstr ""
@@ -1191,22 +1201,7 @@ msgstr "IDE"
 msgid "Configuring IDE"
 msgstr "คอนฟิก IDE"
 
-#: steps_interactive.pm:301
-#, c-format
-msgid ""
-"No free space for 1MB bootstrap! Install will continue, but to boot your "
-"system, you'll need to create the bootstrap partition in DiskDrake"
-msgstr ""
-
-#: steps_interactive.pm:306
-#, c-format
-msgid ""
-"You'll need to create a PPC PReP Boot bootstrap! Install will continue, but "
-"to boot your system, you'll need to create the bootstrap partition in "
-"DiskDrake"
-msgstr ""
-
-#: steps_interactive.pm:382
+#: steps_interactive.pm:354
 #, c-format
 msgid ""
 "Change your Cd-Rom!\n"
@@ -1219,163 +1214,163 @@ msgstr ""
 "กรุณาใส่ CD-ROM \"%s\" และกด OK\n"
 "ถ้่าคุณไม่มี กรุณากด ยกเลิก (cancel) เพื่อหลีกเลี่ยงการติดตั้งจาก CD-ROM นี้"
 
-#: steps_interactive.pm:400
+#: steps_interactive.pm:372
 #, c-format
 msgid "Looking for available packages..."
 msgstr "กำลังหาแพ็คเก็จที่มีอยู่"
 
-#: steps_interactive.pm:408
+#: steps_interactive.pm:380
 #, c-format
 msgid ""
 "Your system does not have enough space left for installation or upgrade "
 "(%dMB > %dMB)"
 msgstr ""
 
-#: steps_interactive.pm:456
+#: steps_interactive.pm:428
 #, 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:458
+#: steps_interactive.pm:430
 #, c-format
 msgid "Load"
 msgstr "โหลด"
 
-#: steps_interactive.pm:458
+#: steps_interactive.pm:430
 #, c-format
 msgid "Save"
 msgstr "บันทึก"
 
-#: steps_interactive.pm:466
+#: steps_interactive.pm:438
 #, fuzzy, c-format
 msgid "Bad file"
 msgstr "เปิดแฟ้ม"
 
-#: steps_interactive.pm:483
+#: steps_interactive.pm:455
 #, c-format
 msgid "KDE"
 msgstr "KDE"
 
-#: steps_interactive.pm:484
+#: steps_interactive.pm:456
 #, c-format
 msgid "GNOME"
 msgstr "GNOME"
 
-#: steps_interactive.pm:487
+#: steps_interactive.pm:459
 #, fuzzy, c-format
 msgid "Desktop Selection"
 msgstr "เลือกกลุ่มแพ็คเก็จ"
 
-#: steps_interactive.pm:488
+#: steps_interactive.pm:460
 #, c-format
 msgid "You can choose your workstation desktop profile."
 msgstr ""
 
-#: steps_interactive.pm:576
+#: steps_interactive.pm:548
 #, c-format
 msgid "Selected size is larger than available space"
 msgstr ""
 
-#: steps_interactive.pm:600
+#: steps_interactive.pm:572
 #, c-format
 msgid "Type of install"
 msgstr ""
 
-#: steps_interactive.pm:601
+#: steps_interactive.pm:573
 #, c-format
 msgid ""
 "You have not selected any group of packages.\n"
 "Please choose the minimal installation you want:"
 msgstr ""
 
-#: steps_interactive.pm:606
+#: steps_interactive.pm:578
 #, c-format
 msgid "With X"
 msgstr ""
 
-#: steps_interactive.pm:607
+#: steps_interactive.pm:579
 #, fuzzy, c-format
-msgid "Install suggested packages"
+msgid "Install recommended packages"
 msgstr "กำลังติดตั้งแพ็คเก็จ %s"
 
-#: steps_interactive.pm:608
+#: steps_interactive.pm:580
 #, c-format
 msgid "With basic documentation (recommended!)"
 msgstr ""
 
-#: steps_interactive.pm:609
+#: steps_interactive.pm:581
 #, c-format
 msgid "Truly minimal install (especially no urpmi)"
 msgstr ""
 
-#: steps_interactive.pm:661
+#: steps_interactive.pm:633
 #, fuzzy, c-format
 msgid "Preparing upgrade..."
 msgstr "กำลังเตรียมบูตโหลดเดอร์"
 
-#: steps_interactive.pm:671
+#: steps_interactive.pm:643
 #, c-format
 msgid "Preparing installation"
 msgstr "กำลังเตรียมการติดตั้ง"
 
-#: steps_interactive.pm:679
+#: steps_interactive.pm:651
 #, c-format
 msgid "Installing package %s"
 msgstr "กำลังติดตั้งแพ็คเก็จ %s"
 
-#: steps_interactive.pm:703
+#: steps_interactive.pm:675
 #, c-format
 msgid "There was an error ordering packages:"
 msgstr "มีปัญหาการลำดับของแพ็คเก็จ:"
 
-#: steps_interactive.pm:703
+#: steps_interactive.pm:675
 #, c-format
 msgid "Go on anyway?"
 msgstr "ทำงานต่อหรือไม่?"
 
-#: steps_interactive.pm:707
+#: steps_interactive.pm:679
 #, fuzzy, c-format
 msgid "Retry"
 msgstr "ย้อนกลับ"
 
-#: steps_interactive.pm:708
+#: steps_interactive.pm:680
 #, c-format
 msgid "Skip this package"
 msgstr ""
 
-#: steps_interactive.pm:709
+#: steps_interactive.pm:681
 #, c-format
 msgid "Skip all packages from medium \"%s\""
 msgstr ""
 
-#: steps_interactive.pm:710
+#: steps_interactive.pm:682
 #, fuzzy, c-format
 msgid "Go back to media and packages selection"
 msgstr "บันทึกกลุ่มแพ็คเก็จที่เลือก"
 
-#: steps_interactive.pm:713
+#: steps_interactive.pm:685
 #, fuzzy, c-format
 msgid "There was an error installing package %s."
 msgstr "มีปัญหาการติดตั้งของแพ็คเก็จ:"
 
-#: steps_interactive.pm:732
+#: steps_interactive.pm:704
 #, c-format
 msgid "Post-install configuration"
 msgstr "การคอนฟิกหลังการติดตั้ง"
 
-#: steps_interactive.pm:739
+#: steps_interactive.pm:711
 #, c-format
 msgid "Please ensure the Update Modules media is in drive %s"
 msgstr ""
 
-#: steps_interactive.pm:767 steps_list.pm:47
+#: steps_interactive.pm:739 steps_list.pm:47
 #, fuzzy, c-format
 msgid "Updates"
 msgstr "อัพเดท"
 
-#: steps_interactive.pm:768
+#: steps_interactive.pm:740
 #, c-format
 msgid ""
 "You now have the opportunity to download updated packages. These packages\n"
@@ -1389,127 +1384,118 @@ msgid ""
 msgstr ""
 
 #. -PO: example: lilo-graphic on /dev/hda1
-#: steps_interactive.pm:881
+#: steps_interactive.pm:853
 #, c-format
 msgid "%s on %s"
 msgstr "%s บน %s"
 
-#: steps_interactive.pm:913 steps_interactive.pm:920 steps_interactive.pm:933
-#: steps_interactive.pm:950 steps_interactive.pm:965
+#: steps_interactive.pm:888 steps_interactive.pm:895 steps_interactive.pm:908
+#: steps_interactive.pm:925 steps_interactive.pm:940
 #, c-format
 msgid "Hardware"
 msgstr "ฮาร์ดแวร์"
 
-#: steps_interactive.pm:934 steps_interactive.pm:951
+#: steps_interactive.pm:909 steps_interactive.pm:926
 #, c-format
 msgid "Sound card"
 msgstr "Sound card"
 
-#: steps_interactive.pm:954
+#: steps_interactive.pm:929
 #, fuzzy, c-format
 msgid "Do you have an ISA sound card?"
 msgstr "คุณมีอันอื่นๆอีกหรือไม่?"
 
-#: steps_interactive.pm:956
+#: steps_interactive.pm:931
 #, c-format
 msgid ""
 "Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
 "card"
 msgstr ""
 
-#: steps_interactive.pm:958
+#: steps_interactive.pm:933
 #, c-format
 msgid "No sound card detected. Try \"harddrake\" after installation"
 msgstr ""
 
-#: steps_interactive.pm:966
+#: steps_interactive.pm:941
 #, fuzzy, c-format
 msgid "Graphical interface"
 msgstr "ให้เป็นกราฟฟิคเมื่อเริ่มต้น"
 
-#: steps_interactive.pm:972 steps_interactive.pm:984
+#: steps_interactive.pm:947 steps_interactive.pm:959
 #, c-format
 msgid "Network & Internet"
 msgstr "เน็ตเวิร์คกับอินเตอร์เน็ต"
 
-#: steps_interactive.pm:985
+#: steps_interactive.pm:960
 #, fuzzy, c-format
 msgid "Proxies"
 msgstr "Profile: "
 
-#: steps_interactive.pm:986
+#: steps_interactive.pm:961
 #, fuzzy, c-format
 msgid "configured"
 msgstr "คอนฟิกใหม่"
 
-#: steps_interactive.pm:996
+#: steps_interactive.pm:971
 #, c-format
 msgid "Security Level"
 msgstr "ระดับความปลอดภัย"
 
-#: steps_interactive.pm:1016
+#: steps_interactive.pm:991
 #, c-format
 msgid "Firewall"
 msgstr ""
 
-#: steps_interactive.pm:1020
+#: steps_interactive.pm:995
 #, fuzzy, c-format
 msgid "activated"
 msgstr "แอ็คทีฟ"
 
-#: steps_interactive.pm:1020
+#: steps_interactive.pm:995
 #, c-format
 msgid "disabled"
 msgstr "ไม่ใช้งาน"
 
-#: steps_interactive.pm:1034
+#: steps_interactive.pm:1009
 #, c-format
 msgid "You have not configured X. Are you sure you really want this?"
 msgstr ""
 
-#: steps_interactive.pm:1063
+#: steps_interactive.pm:1038
 #, c-format
 msgid "Preparing bootloader..."
 msgstr "กำลังเตรียมบูตโหลดเดอร์"
 
 #. -PO: This is NOT the boot loader!!!!
-#: steps_interactive.pm:1065
+#: steps_interactive.pm:1040
 #, fuzzy, c-format
 msgid "Preparing initial startup program..."
 msgstr "กำลังเตรียมการติดตั้ง"
 
-#: steps_interactive.pm:1066
+#: steps_interactive.pm:1041
 #, c-format
 msgid "Be patient, this may take a while..."
 msgstr ""
 
-#: steps_interactive.pm:1077
-#, c-format
-msgid ""
-"You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
-"will not work for you. The install will continue, but you'll need to use "
-"BootX or some other means to boot your machine. The kernel argument for the "
-"root fs is: root=%s"
-msgstr ""
-
-#: steps_interactive.pm:1090
+#: steps_interactive.pm:1057
 #, c-format
 msgid ""
 "In this security level, access to the files in the Windows partition is "
 "restricted to the administrator."
 msgstr ""
 
-#: steps_interactive.pm:1122
+#: steps_interactive.pm:1089
 #, c-format
 msgid "Insert a blank floppy in drive %s"
 msgstr "ให้ใส่แผ่นฟล้อปปี้ลงในไดรว์ %s "
 
-#: steps_interactive.pm:1124
+#: steps_interactive.pm:1091
 #, c-format
 msgid "Creating auto install floppy..."
 msgstr "กำลังเตรียมการติดตั้งลงบน floppy"
 
-#: steps_interactive.pm:1135
+#: steps_interactive.pm:1102
 #, c-format
 msgid ""
 "Some steps are not completed.\n"
@@ -1520,12 +1506,12 @@ msgstr ""
 "\n"
 "คุณต้องการออกจากการติดตั้งจริงๆหรือไม่?"
 
-#: steps_interactive.pm:1145
+#: steps_interactive.pm:1112
 #, fuzzy, c-format
 msgid "Congratulations"
 msgstr "ขอแสดงความยินดี"
 
-#: steps_interactive.pm:1148
+#: steps_interactive.pm:1115
 #, c-format
 msgid "Reboot"
 msgstr ""
@@ -1662,6 +1648,10 @@ msgid ""
 "Exit"
 msgstr "เลิกทำงาน"
 
+#, fuzzy
+#~ msgid "RazorQT Desktop"
+#~ msgstr "พื้นที่ทำงาน"
+
 #~ msgid "Welcome"
 #~ msgstr "ยินดีต้อนรับ"