Make merge

1 files changed, 392 insertions, 364 deletions

diff --git a/po/th.po b/po/th.po
index 5a074926..c713a18e 100644
--- a/po/th.po
+++ b/po/th.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake\n"
-"POT-Creation-Date: 2005-01-14 18:50+0100\n"
+"POT-Creation-Date: 2005-01-18 13:29+0100\n"
 "PO-Revision-Date: 2002-11-27 21:43+0700\n"
 "Last-Translator: Varokas Panusuwan <varokasp@hotmail.com>\n"
 "Language-Team: Thai <th@li.org>\n"
@@ -17,7 +17,37 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 0.9.6\n"
 
-#: ../edit-urpm-sources.pl:65
+#: ../edit-urpm-sources.pl:66
+#, c-format
+msgid "Choose media type"
+msgstr ""
+
+#: ../edit-urpm-sources.pl:67
+#, c-format
+msgid ""
+"This step enables you to add sources from a Mandrakelinux web or FTP "
+"mirror.\n"
+"\n"
+"There are two kinds of official mirrors. You can choose to add sources that\n"
+"contain the complete set of packages of your distribution (usually a "
+"superset\n"
+"of what comes on the standard installation CDs), or sources that provide "
+"the\n"
+"official updates for your distribution. (You can add both, but you'll have\n"
+"to do this in two steps.)"
+msgstr ""
+
+#: ../edit-urpm-sources.pl:75
+#, c-format
+msgid "Distribution sources"
+msgstr ""
+
+#: ../edit-urpm-sources.pl:75
+#, fuzzy, c-format
+msgid "Official updates"
+msgstr "อัพเดททั่วไป"
+
+#: ../edit-urpm-sources.pl:78
 #, fuzzy, c-format
 msgid ""
 "This will attempt to install all official sources corresponding to your\n"
@@ -33,103 +63,93 @@ msgstr ""
 "\n"
 "คุณต้องการจะทำต่อหรือไม่?"
 
-#: ../edit-urpm-sources.pl:73
+#: ../edit-urpm-sources.pl:87
 #, fuzzy, c-format
 msgid "Please wait, adding media..."
 msgstr "กำลังอัพเดทสื่อข้อมูล, กรุณารอสักครู่"
 
-#: ../edit-urpm-sources.pl:93
+#: ../edit-urpm-sources.pl:120
 #, fuzzy, c-format
 msgid "Add a medium"
 msgstr "เพิ่ม source: "
 
-#: ../edit-urpm-sources.pl:94
+#: ../edit-urpm-sources.pl:122
 #, c-format
 msgid "Local files"
 msgstr "ไฟล์ในเครื่องนี้"
 
-#: ../edit-urpm-sources.pl:94
+#: ../edit-urpm-sources.pl:122
 #, c-format
 msgid "Path:"
 msgstr "พาธ:"
 
-#: ../edit-urpm-sources.pl:95
+#: ../edit-urpm-sources.pl:123
 #, c-format
 msgid "FTP server"
 msgstr "เซอร์เวอร์ FTP"
 
-#: ../edit-urpm-sources.pl:95 ../edit-urpm-sources.pl:96
-#: ../edit-urpm-sources.pl:98 ../edit-urpm-sources.pl:373
+#: ../edit-urpm-sources.pl:123 ../edit-urpm-sources.pl:124
+#: ../edit-urpm-sources.pl:382
 #, c-format
 msgid "URL:"
 msgstr "๊URL:"
 
-#: ../edit-urpm-sources.pl:96
+#: ../edit-urpm-sources.pl:124
 #, c-format
 msgid "HTTP server"
 msgstr "เซอร์้เวอร์ HTTP"
 
-#: ../edit-urpm-sources.pl:97
+#: ../edit-urpm-sources.pl:125
 #, c-format
 msgid "Removable device"
 msgstr "ไดร์ฟเคลื่อนย้ายได้"
 
-#: ../edit-urpm-sources.pl:97
+#: ../edit-urpm-sources.pl:125
 #, c-format
 msgid "Path or mount point:"
 msgstr "ที่อยู่หรือจุดเมาท์:"
 
-#: ../edit-urpm-sources.pl:98 ../rpmdrake:859
-#, c-format
-msgid "Security updates"
-msgstr "อัพเดทระบบรักษาความปลอดภัย"
-
-#: ../edit-urpm-sources.pl:114
+#: ../edit-urpm-sources.pl:141
 #, c-format
 msgid "Browse..."
 msgstr "เลือก..."
 
-#: ../edit-urpm-sources.pl:121
-#, c-format
-msgid "Choose a mirror..."
-msgstr "เลือก mirror..."
-
-#: ../edit-urpm-sources.pl:159
+#: ../edit-urpm-sources.pl:171
 #, c-format
 msgid "Login:"
 msgstr "ล็อกอิน:"
 
-#: ../edit-urpm-sources.pl:159 ../edit-urpm-sources.pl:450
+#: ../edit-urpm-sources.pl:171 ../edit-urpm-sources.pl:459
 #, c-format
 msgid "Password:"
 msgstr "พาสเวิร์ด:"
 
-#: ../edit-urpm-sources.pl:164 ../edit-urpm-sources.pl:374
+#: ../edit-urpm-sources.pl:176 ../edit-urpm-sources.pl:383
 #, c-format
 msgid "Relative path to synthesis/hdlist:"
 msgstr "พาธแบบ relative ไปยัง synthesis/hdlist:"
 
-#: ../edit-urpm-sources.pl:166
+#: ../edit-urpm-sources.pl:178
 #, c-format
 msgid "If left blank, synthesis/hdlist will be automatically probed"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:171
+#: ../edit-urpm-sources.pl:183
 #, c-format
 msgid "Name:"
 msgstr "ชื่อ:"
 
-#: ../edit-urpm-sources.pl:184
+#: ../edit-urpm-sources.pl:194
 #, c-format
 msgid "Create media for a whole distribution"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:203
+#: ../edit-urpm-sources.pl:212
 #, c-format
 msgid "You need to fill up at least the two first entries."
 msgstr "คุณต้องใส่ข้อมูลอย่างน้อยในสองช่องแรก"
 
-#: ../edit-urpm-sources.pl:207
+#: ../edit-urpm-sources.pl:216
 #, c-format
 msgid ""
 "There is already a medium by that name, do you\n"
@@ -138,367 +158,367 @@ msgstr ""
 "มีสื่อข้อมูลชื่อดังกล่าวอยู่แล้ว\n"
 "คุณต้องการจะเขียนทับหรือไม่?"
 
-#: ../edit-urpm-sources.pl:218
+#: ../edit-urpm-sources.pl:227
 #, fuzzy, c-format
 msgid "Adding a medium:"
 msgstr "เพิ่ม source:"
 
-#: ../edit-urpm-sources.pl:219
+#: ../edit-urpm-sources.pl:228
 #, fuzzy, c-format
 msgid "Type of medium:"
 msgstr "ชนิดของ source:"
 
-#: ../edit-urpm-sources.pl:224 ../edit-urpm-sources.pl:294
-#: ../edit-urpm-sources.pl:380 ../edit-urpm-sources.pl:405
-#: ../edit-urpm-sources.pl:467 ../edit-urpm-sources.pl:548
-#: ../edit-urpm-sources.pl:588 ../edit-urpm-sources.pl:646
-#: ../edit-urpm-sources.pl:786 ../rpmdrake:159 ../rpmdrake:626
-#: ../rpmdrake:1393 ../rpmdrake:1401 ../rpmdrake.pm:505 ../rpmdrake.pm:595
-#: ../rpmdrake.pm:664
+#: ../edit-urpm-sources.pl:233 ../edit-urpm-sources.pl:303
+#: ../edit-urpm-sources.pl:389 ../edit-urpm-sources.pl:414
+#: ../edit-urpm-sources.pl:476 ../edit-urpm-sources.pl:557
+#: ../edit-urpm-sources.pl:597 ../edit-urpm-sources.pl:655
+#: ../edit-urpm-sources.pl:794 ../rpmdrake:159 ../rpmdrake:676
+#: ../rpmdrake:1418 ../rpmdrake:1426 ../rpmdrake.pm:502 ../rpmdrake.pm:592
+#: ../rpmdrake.pm:661
 #, c-format
 msgid "Cancel"
 msgstr "ยกเลิก"
 
-#: ../edit-urpm-sources.pl:226 ../edit-urpm-sources.pl:296
-#: ../edit-urpm-sources.pl:405 ../edit-urpm-sources.pl:457
-#: ../edit-urpm-sources.pl:545 ../edit-urpm-sources.pl:587
-#: ../edit-urpm-sources.pl:639 ../edit-urpm-sources.pl:711
-#: ../edit-urpm-sources.pl:779 ../edit-urpm-sources.pl:832
-#: ../edit-urpm-sources.pl:982 ../rpmdrake:159 ../rpmdrake:626 ../rpmdrake:646
-#: ../rpmdrake:651 ../rpmdrake:1335 ../rpmdrake:1393 ../rpmdrake:1537
-#: ../rpmdrake.pm:196 ../rpmdrake.pm:253 ../rpmdrake.pm:505
+#: ../edit-urpm-sources.pl:235 ../edit-urpm-sources.pl:305
+#: ../edit-urpm-sources.pl:414 ../edit-urpm-sources.pl:466
+#: ../edit-urpm-sources.pl:554 ../edit-urpm-sources.pl:596
+#: ../edit-urpm-sources.pl:648 ../edit-urpm-sources.pl:720
+#: ../edit-urpm-sources.pl:787 ../edit-urpm-sources.pl:840
+#: ../edit-urpm-sources.pl:990 ../rpmdrake:159 ../rpmdrake:676 ../rpmdrake:693
+#: ../rpmdrake:698 ../rpmdrake:1360 ../rpmdrake:1418 ../rpmdrake:1561
+#: ../rpmdrake.pm:191 ../rpmdrake.pm:248 ../rpmdrake.pm:502
 #, c-format
 msgid "Ok"
 msgstr "ตกลง"
 
-#: ../edit-urpm-sources.pl:278
+#: ../edit-urpm-sources.pl:287
 #, fuzzy, c-format
 msgid "Global options for package installation"
 msgstr "การ install package"
 
-#: ../edit-urpm-sources.pl:280
+#: ../edit-urpm-sources.pl:289
 #, c-format
 msgid "always"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:281
+#: ../edit-urpm-sources.pl:290
 #, c-format
 msgid "never"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:290
+#: ../edit-urpm-sources.pl:299
 #, fuzzy, c-format
 msgid "Verify RPMs to be installed:"
 msgstr "ไม่สามารถ install บางเพกเกจได้"
 
-#: ../edit-urpm-sources.pl:291
+#: ../edit-urpm-sources.pl:300
 #, c-format
 msgid "Download program to use:"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:321
+#: ../edit-urpm-sources.pl:330
 #, fuzzy, c-format
 msgid "Source Removal"
 msgstr "การลบเพกเกจ"
 
-#: ../edit-urpm-sources.pl:322
+#: ../edit-urpm-sources.pl:331
 #, c-format
 msgid "Are you sure you want to remove source \"%s\"?"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:327
+#: ../edit-urpm-sources.pl:336
 #, c-format
 msgid "Please wait, removing medium..."
 msgstr "กำลังเอาสื่อข้อมูลออก, กรุณารอสักครู่"
 
-#: ../edit-urpm-sources.pl:364
+#: ../edit-urpm-sources.pl:373
 #, fuzzy, c-format
 msgid "Edit a medium"
 msgstr "แก้ไข source"
 
-#: ../edit-urpm-sources.pl:370
+#: ../edit-urpm-sources.pl:379
 #, fuzzy, c-format
 msgid "Editing medium \"%s\":"
 msgstr "กำลังแก้ไข source \"%s\":"
 
-#: ../edit-urpm-sources.pl:384
+#: ../edit-urpm-sources.pl:393
 #, c-format
 msgid "Save changes"
 msgstr "บันทึกการเปลี่ยนแปลง"
 
-#: ../edit-urpm-sources.pl:392 ../edit-urpm-sources.pl:969
+#: ../edit-urpm-sources.pl:401 ../edit-urpm-sources.pl:977
 #, c-format
 msgid "Proxy..."
 msgstr "Proxy..."
 
-#: ../edit-urpm-sources.pl:403
+#: ../edit-urpm-sources.pl:412
 #, c-format
 msgid "You need to insert the medium to continue"
 msgstr "คุณต้องใส่สื่อข้อมูลเพื่อทำต่อ"
 
-#: ../edit-urpm-sources.pl:404
+#: ../edit-urpm-sources.pl:413
 #, c-format
 msgid ""
 "In order to save the changes, you need to insert the medium in the drive."
 msgstr "ถ้าคุณต้องการบันทึกการเปลี่ยนแปลง, คุณต้องใส่แผ่นข้อมูล"
 
-#: ../edit-urpm-sources.pl:426
+#: ../edit-urpm-sources.pl:435
 #, c-format
 msgid "Configure proxies"
 msgstr "ปรับแต่ง proxies"
 
-#: ../edit-urpm-sources.pl:436
+#: ../edit-urpm-sources.pl:445
 #, c-format
 msgid "Proxy settings for media \"%s\""
 msgstr ""
 
-#: ../edit-urpm-sources.pl:437
+#: ../edit-urpm-sources.pl:446
 #, c-format
 msgid "Global proxy settings"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:439
+#: ../edit-urpm-sources.pl:448
 #, c-format
 msgid ""
 "If you need a proxy, enter the hostname and an optional port (syntax: "
 "<proxyhost[:port]>):"
 msgstr "ถ้าคุณต้องการใช้ proxy กรุณาใส่ชื่อ host และ port (รูปแบบ: <proxyhost[:port]>):"
 
-#: ../edit-urpm-sources.pl:442
+#: ../edit-urpm-sources.pl:451
 #, c-format
 msgid "Proxy hostname:"
 msgstr "ชื่อโฮส proxy:"
 
-#: ../edit-urpm-sources.pl:445
+#: ../edit-urpm-sources.pl:454
 #, c-format
 msgid "You may specify a user/password for the proxy authentication:"
 msgstr "คุณต้องใส่ล็อกอินและพาสเวิร์ดเพื่อใช้ proxy:"
 
-#: ../edit-urpm-sources.pl:448
+#: ../edit-urpm-sources.pl:457
 #, c-format
 msgid "User:"
 msgstr "ผู้ใช้:"
 
-#: ../edit-urpm-sources.pl:516
+#: ../edit-urpm-sources.pl:525
 #, c-format
 msgid "Add a parallel group"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:516
+#: ../edit-urpm-sources.pl:525
 #, c-format
 msgid "Edit a parallel group"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:527
+#: ../edit-urpm-sources.pl:536
 #, fuzzy, c-format
 msgid "Add a medium limit"
 msgstr "เพิ่ม source: "
 
-#: ../edit-urpm-sources.pl:539
+#: ../edit-urpm-sources.pl:548
 #, c-format
 msgid "Choose a medium for adding in the media limit:"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:576
+#: ../edit-urpm-sources.pl:585
 #, c-format
 msgid "Add a host"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:582
+#: ../edit-urpm-sources.pl:591
 #, c-format
 msgid "Type in the hostname or IP address of the host to add:"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:613
+#: ../edit-urpm-sources.pl:622
 #, fuzzy, c-format
 msgid "Editing parallel group \"%s\":"
 msgstr "กำลังแก้ไข source \"%s\":"
 
-#: ../edit-urpm-sources.pl:617
+#: ../edit-urpm-sources.pl:626
 #, fuzzy, c-format
 msgid "Group name:"
 msgstr "ชื่อโฮส proxy:"
 
-#: ../edit-urpm-sources.pl:618
+#: ../edit-urpm-sources.pl:627
 #, c-format
 msgid "Protocol:"
 msgstr "Protocol:"
 
-#: ../edit-urpm-sources.pl:620
+#: ../edit-urpm-sources.pl:629
 #, c-format
 msgid "Media limit:"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:625 ../edit-urpm-sources.pl:632
+#: ../edit-urpm-sources.pl:634 ../edit-urpm-sources.pl:641
 #, fuzzy, c-format
 msgid "Add"
 msgstr "เพิ่ม..."
 
-#: ../edit-urpm-sources.pl:626 ../edit-urpm-sources.pl:633
-#: ../edit-urpm-sources.pl:691 ../edit-urpm-sources.pl:947 ../rpmdrake:1131
+#: ../edit-urpm-sources.pl:635 ../edit-urpm-sources.pl:642
+#: ../edit-urpm-sources.pl:700 ../edit-urpm-sources.pl:955 ../rpmdrake:1154
 #, c-format
 msgid "Remove"
 msgstr "เอาออก"
 
-#: ../edit-urpm-sources.pl:627
+#: ../edit-urpm-sources.pl:636
 #, c-format
 msgid "Hosts:"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:661
+#: ../edit-urpm-sources.pl:670
 #, c-format
 msgid "Configure parallel urpmi (distributed execution of urpmi)"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:664
+#: ../edit-urpm-sources.pl:673
 #, fuzzy, c-format
 msgid "Group"
 msgstr "ตามกลุ่ม"
 
-#: ../edit-urpm-sources.pl:664
+#: ../edit-urpm-sources.pl:673
 #, c-format
 msgid "Protocol"
 msgstr "Protocol"
 
-#: ../edit-urpm-sources.pl:664
+#: ../edit-urpm-sources.pl:673
 #, c-format
 msgid "Media limit"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:665
+#: ../edit-urpm-sources.pl:674
 #, fuzzy, c-format
 msgid "Command"
 msgstr "แคนาดา"
 
-#: ../edit-urpm-sources.pl:675 ../rpmdrake:349 ../rpmdrake:366 ../rpmdrake:488
-#: ../rpmdrake:560
+#: ../edit-urpm-sources.pl:684 ../rpmdrake:353 ../rpmdrake:370 ../rpmdrake:492
+#: ../rpmdrake:608
 #, c-format
 msgid "(none)"
 msgstr "(ไม่มี)"
 
-#: ../edit-urpm-sources.pl:695 ../edit-urpm-sources.pl:951
+#: ../edit-urpm-sources.pl:704 ../edit-urpm-sources.pl:959
 #, c-format
 msgid "Edit"
 msgstr "แก้ไข"
 
-#: ../edit-urpm-sources.pl:703 ../edit-urpm-sources.pl:957
+#: ../edit-urpm-sources.pl:712 ../edit-urpm-sources.pl:965
 #, c-format
 msgid "Add..."
 msgstr "เพิ่ม..."
 
-#: ../edit-urpm-sources.pl:719
+#: ../edit-urpm-sources.pl:728
 #, c-format
 msgid "Manage keys for digital signatures of packages"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:723 ../edit-urpm-sources.pl:866
+#: ../edit-urpm-sources.pl:732 ../edit-urpm-sources.pl:874
 #, fuzzy, c-format
 msgid "Medium"
 msgstr "เบลเยียม"
 
-#: ../edit-urpm-sources.pl:728
+#: ../edit-urpm-sources.pl:737
 #, c-format
 msgid "Keys"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:747
+#: ../edit-urpm-sources.pl:756
 #, c-format
 msgid "no name found, key doesn't exist in rpm keyring!"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:761
+#: ../edit-urpm-sources.pl:769
 #, fuzzy, c-format
 msgid "Add a key"
 msgstr "เพิ่ม..."
 
-#: ../edit-urpm-sources.pl:773
+#: ../edit-urpm-sources.pl:781
 #, c-format
 msgid "Choose a key for adding to the medium %s"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:801
+#: ../edit-urpm-sources.pl:809
 #, fuzzy, c-format
 msgid "Remove a key"
 msgstr "ลบโปรแกรท"
 
-#: ../edit-urpm-sources.pl:802
+#: ../edit-urpm-sources.pl:810
 #, c-format
 msgid ""
 "Are you sure you want to remove the key %s from medium %s?\n"
 "(name of the key: %s)"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:820
+#: ../edit-urpm-sources.pl:828
 #, fuzzy, c-format
 msgid "Add a key..."
 msgstr "เพิ่ม..."
 
-#: ../edit-urpm-sources.pl:824
+#: ../edit-urpm-sources.pl:832
 #, fuzzy, c-format
 msgid "Remove key"
 msgstr "เอาออก"
 
-#: ../edit-urpm-sources.pl:840
+#: ../edit-urpm-sources.pl:848
 #, fuzzy, c-format
 msgid "Configure media"
 msgstr "ปรับแต่ง source"
 
-#: ../edit-urpm-sources.pl:865
+#: ../edit-urpm-sources.pl:873
 #, c-format
 msgid "Enabled?"
 msgstr "เปิดใช้?"
 
-#: ../edit-urpm-sources.pl:878
+#: ../edit-urpm-sources.pl:886
 #, fuzzy, c-format
 msgid "Update medium"
 msgstr "อัพเดท source(s)"
 
-#: ../edit-urpm-sources.pl:878
+#: ../edit-urpm-sources.pl:886
 #, c-format
 msgid "Regenerate hdlist"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:890 ../rpmdrake.pm:588
+#: ../edit-urpm-sources.pl:898 ../rpmdrake.pm:585
 #, c-format
 msgid "Please wait, updating media..."
 msgstr "กำลังอัพเดทสื่อข้อมูล, กรุณารอสักครู่"
 
-#: ../edit-urpm-sources.pl:894
+#: ../edit-urpm-sources.pl:902
 #, fuzzy, c-format
 msgid "Please wait, generating hdlist..."
 msgstr "กำลังอัพเดทสื่อข้อมูล, กรุณารอสักครู่"
 
-#: ../edit-urpm-sources.pl:961
+#: ../edit-urpm-sources.pl:969
 #, fuzzy, c-format
 msgid "Add custom..."
 msgstr "เพิ่ม..."
 
-#: ../edit-urpm-sources.pl:965
+#: ../edit-urpm-sources.pl:973
 #, c-format
 msgid "Update..."
 msgstr "อัพเดท..."
 
-#: ../edit-urpm-sources.pl:968
+#: ../edit-urpm-sources.pl:976
 #, c-format
 msgid "Manage keys..."
 msgstr ""
 
-#: ../edit-urpm-sources.pl:970
+#: ../edit-urpm-sources.pl:978
 #, c-format
 msgid "Parallel..."
 msgstr ""
 
-#: ../edit-urpm-sources.pl:971
+#: ../edit-urpm-sources.pl:979
 #, c-format
 msgid "Global options..."
 msgstr ""
 
-#: ../edit-urpm-sources.pl:981
+#: ../edit-urpm-sources.pl:989
 #, c-format
 msgid "Help"
 msgstr "ความช่วยเหลือ"
 
-#: ../edit-urpm-sources.pl:993 ../gurpmi.addmedia:75 ../rpmdrake:1648
+#: ../edit-urpm-sources.pl:1001 ../gurpmi.addmedia:75 ../rpmdrake:1672
 #, c-format
 msgid ""
 "%s\n"
@@ -509,7 +529,7 @@ msgstr ""
 "\n"
 "คุณต้องการจะทำต่อหรือไม่?"
 
-#: ../edit-urpm-sources.pl:996
+#: ../edit-urpm-sources.pl:1004
 #, fuzzy, c-format
 msgid ""
 "Welcome to the Software Media Manager!\n"
@@ -523,7 +543,7 @@ msgstr ""
 "เครื่องมือนี้จะช่วยคุณในการปรับแต่ง package sources ที่คุณจะใช้ในเครื่องคอมพิวเตอร์\n"
 "ของคุณ เพื่อที่เพกเกจเหล่านี้จะได้พร้อมสำหรับการ install หรืออัพเดทต่อไป"
 
-#: ../edit-urpm-sources.pl:1008
+#: ../edit-urpm-sources.pl:1016
 #, c-format
 msgid ""
 "Packages database is locked. Please close other applications\n"
@@ -590,7 +610,7 @@ msgstr "บีบอัด"
 
 #: ../rpmdrake:169 ../rpmdrake:174 ../rpmdrake:186 ../rpmdrake:197
 #: ../rpmdrake:206 ../rpmdrake:218 ../rpmdrake:230 ../rpmdrake:238
-#: ../rpmdrake:318
+#: ../rpmdrake:322
 #, c-format
 msgid "Other"
 msgstr "อื่นๆ"
@@ -1043,87 +1063,147 @@ msgstr "ของเล่นสนุกๆ"
 msgid "Video"
 msgstr "Video"
 
-#: ../rpmdrake:372 ../rpmdrake:774 ../rpmdrake:775
+#: ../rpmdrake:376 ../rpmdrake:509 ../rpmdrake:511
 #, c-format
 msgid "(Not available)"
 msgstr "(ไม่พร้อมใช้งาน)"
 
-#: ../rpmdrake:401 ../rpmdrake:469
+#: ../rpmdrake:405 ../rpmdrake:473
 #, c-format
 msgid "Search results"
 msgstr "ผลการค้นหา"
 
-#: ../rpmdrake:401
+#: ../rpmdrake:405
 #, c-format
 msgid "Search results (none)"
 msgstr "ผลการค้นหา (ไม่พบ)"
 
-#: ../rpmdrake:412 ../rpmdrake:433
+#: ../rpmdrake:416 ../rpmdrake:437
 #, c-format
 msgid "Please wait, searching..."
 msgstr "กำลังค้นหา กรุณารอสักครู่..."
 
-#: ../rpmdrake:431 ../rpmdrake:1171 ../rpmdrake:1433 ../rpmdrake:1647
+#: ../rpmdrake:435 ../rpmdrake:1194 ../rpmdrake:1458 ../rpmdrake:1671
 #, fuzzy, c-format
 msgid "Rpmdrake"
 msgstr "rpmdrake"
 
-#: ../rpmdrake:436
+#: ../rpmdrake:440
 #, c-format
 msgid "Stop"
 msgstr "หยุด"
 
-#: ../rpmdrake:470 ../rpmdrake:589
+#: ../rpmdrake:474 ../rpmdrake:639
 #, c-format
 msgid "Upgradable"
 msgstr "อัพเกรดได้"
 
-#: ../rpmdrake:470 ../rpmdrake:589
+#: ../rpmdrake:474 ../rpmdrake:639
 #, c-format
 msgid "Addable"
 msgstr "เพิ่มได้"
 
-#: ../rpmdrake:472
+#: ../rpmdrake:476
 #, c-format
 msgid "Selected"
 msgstr "ถูกเลือก"
 
-#: ../rpmdrake:472
+#: ../rpmdrake:476
 #, c-format
 msgid "Not selected"
 msgstr "ไม่ได้ถูกเลือก"
 
 #: ../rpmdrake:506
+#, c-format
+msgid "Files:\n"
+msgstr "แฟ้ม:\n"
+
+#: ../rpmdrake:511
+#, c-format
+msgid "Changelog:\n"
+msgstr "Changelog:\n"
+
+#: ../rpmdrake:516
+#, c-format
+msgid "Medium: "
+msgstr ""
+
+#: ../rpmdrake:518
+#, c-format
+msgid "Currently installed version: "
+msgstr "เวอร์ชันที่กำลังใช้อยู่:"
+
+#: ../rpmdrake:526
+#, c-format
+msgid "Name: "
+msgstr "ชื่อ:"
+
+#: ../rpmdrake:527
+#, c-format
+msgid "Version: "
+msgstr "เวอร์ชัน:"
+
+#: ../rpmdrake:528
+#, c-format
+msgid "Size: "
+msgstr "ขนาด:"
+
+#: ../rpmdrake:528
+#, c-format
+msgid "%s KB"
+msgstr "%s KB"
+
+#: ../rpmdrake:531
+#, c-format
+msgid "Importance: "
+msgstr "ความสำคัญ:"
+
+#: ../rpmdrake:534
+#, c-format
+msgid "Summary: "
+msgstr "ข้อความสรุป:"
+
+#: ../rpmdrake:537
+#, c-format
+msgid "Reason for update: "
+msgstr "เหตุผลในการอัพเดท:"
+
+#: ../rpmdrake:539
+#, c-format
+msgid "Description: "
+msgstr "คำอธิบาย:"
+
+#: ../rpmdrake:554
 #, fuzzy, c-format
 msgid "Rpmdrake %s"
 msgstr "rpmdrake"
 
-#: ../rpmdrake:524 ../rpmdrake:639 ../rpmdrake:642 ../rpmdrake:1527
+#: ../rpmdrake:571 ../rpmdrake:689 ../rpmdrake:691 ../rpmdrake:1551
 #, c-format
 msgid "More information on package..."
 msgstr "ข้อมูลเพื่มเติมบนแพกเกจ..."
 
-#: ../rpmdrake:525
+#: ../rpmdrake:572
 #, c-format
 msgid "Please choose"
 msgstr "กรุณาเลือก"
 
-#: ../rpmdrake:525
+#: ../rpmdrake:572
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "ต้องการแพกเกจหนึ่งในรายชื่อนี้:"
 
-#: ../rpmdrake:545
+#: ../rpmdrake:593
 #, c-format
 msgid "Please wait, listing packages..."
 msgstr "กำลังทำรายชื่อเพกเกจ, กรุณารอสักครู่"
 
-#: ../rpmdrake:562
+#: ../rpmdrake:610
 #, c-format
 msgid "No update"
 msgstr "ไม่มีตัวอัพเดท"
 
-#: ../rpmdrake:563
+#: ../rpmdrake:611
 #, c-format
 msgid ""
 "The list of updates is empty. This means that either there is\n"
@@ -1133,28 +1213,28 @@ msgstr ""
 "ไม่มีรายการที่ต้องอัพเดท หมายความว่าอาจจะยังไม่มีอัพเดทสำหรัับ\n"
 "เพกเกจที่อยู่ในเครื่องของคุณหรือไม่ก็ถูก install หมดแล้ว"
 
-#: ../rpmdrake:583
+#: ../rpmdrake:632
 #, c-format
 msgid "All"
 msgstr "ทั้งหมด"
 
 #. -PO: Keep it short, this is gonna be on a button
-#: ../rpmdrake:626 ../rpmdrake:631
+#: ../rpmdrake:676 ../rpmdrake:681
 #, c-format
 msgid "More info"
 msgstr ""
 
-#: ../rpmdrake:634 ../rpmdrake:1516
+#: ../rpmdrake:684 ../rpmdrake:1540
 #, fuzzy, c-format
 msgid "Information on packages"
 msgstr "ข้อมูลเพื่มเติมบนแพกเกจ..."
 
-#: ../rpmdrake:659
+#: ../rpmdrake:706
 #, c-format
 msgid "Some additional packages need to be removed"
 msgstr "มีเพกเกจบางตัวยังต้องถูกเอาออก"
 
-#: ../rpmdrake:660
+#: ../rpmdrake:707
 #, c-format
 msgid ""
 "Because of their dependencies, the following package(s) also need to be\n"
@@ -1165,19 +1245,19 @@ msgstr ""
 "ต้องถูกลบออก:\n"
 "\n"
 
-#: ../rpmdrake:666 ../rpmdrake:675
+#: ../rpmdrake:713 ../rpmdrake:722
 #, c-format
 msgid "Some packages can't be removed"
 msgstr "ไม่สามารถลบเพกเกจบางตัวออกได้"
 
-#: ../rpmdrake:667
+#: ../rpmdrake:714
 #, c-format
 msgid ""
 "Removing these packages would break your system, sorry:\n"
 "\n"
 msgstr ""
 
-#: ../rpmdrake:676 ../rpmdrake:737
+#: ../rpmdrake:723 ../rpmdrake:785
 #, c-format
 msgid ""
 "Because of their dependencies, the following package(s) must be\n"
@@ -1187,12 +1267,12 @@ msgstr ""
 "เนื่องจาก dependencies จากเพจเกจเหล่านี้ ทำให้ต้องเลือกออกตอนนี้:\n"
 "\n"
 
-#: ../rpmdrake:705
+#: ../rpmdrake:752
 #, c-format
 msgid "Additional packages needed"
 msgstr "ต้องการเพจเกจเพิ่มเติม"
 
-#: ../rpmdrake:706
+#: ../rpmdrake:753
 #, c-format
 msgid ""
 "To satisfy dependencies, the following package(s) also need\n"
@@ -1202,17 +1282,17 @@ msgstr ""
 "เนื่องจาก dependencies, เพจเกจเหล่านี้จะต้อง install ไปด้วย:\n"
 "\n"
 
-#: ../rpmdrake:720
+#: ../rpmdrake:768
 #, c-format
 msgid "%s (belongs to the skip list)"
 msgstr ""
 
-#: ../rpmdrake:722
+#: ../rpmdrake:770
 #, c-format
 msgid "Some packages can't be installed"
 msgstr "ไม่สามารถ install บางเพกเกจได้"
 
-#: ../rpmdrake:723
+#: ../rpmdrake:771
 #, fuzzy, c-format
 msgid ""
 "Sorry, the following package(s) can't be selected:\n"
@@ -1222,177 +1302,122 @@ msgstr ""
 "เพกเกจเหล่านี้ไม่สามารถถูกเลือกได้:\n"
 "\n"
 
-#: ../rpmdrake:736 ../rpmdrake:1025
+#: ../rpmdrake:784 ../rpmdrake:1048
 #, c-format
 msgid "Some packages need to be removed"
 msgstr "เพกเกจบางตัวต้องถูกลบออก"
 
-#: ../rpmdrake:758
+#: ../rpmdrake:807
 #, c-format
 msgid "Selected: %d MB / Free disk space: %d MB"
 msgstr "เลือกไป: %d MB / พื้นที่ดิสก์ที่เหลือ: %d MB"
 
-#: ../rpmdrake:760
+#: ../rpmdrake:809
 #, c-format
 msgid "Selected size: %d MB"
 msgstr "ขนาดรวมที่เลือก: %d MB"
 
-#: ../rpmdrake:766
+#: ../rpmdrake:814
 #, c-format
 msgid "Description not available for this package\n"
 msgstr ""
 
-#: ../rpmdrake:772
-#, c-format
-msgid "Files:\n"
-msgstr "แฟ้ม:\n"
-
-#: ../rpmdrake:775
-#, c-format
-msgid "Changelog:\n"
-msgstr "Changelog:\n"
-
-#: ../rpmdrake:777
-#, c-format
-msgid "Medium: "
-msgstr ""
-
-#: ../rpmdrake:779
-#, c-format
-msgid "Currently installed version: "
-msgstr "เวอร์ชันที่กำลังใช้อยู่:"
-
-#: ../rpmdrake:784
-#, c-format
-msgid "Name: "
-msgstr "ชื่อ:"
-
-#: ../rpmdrake:785
-#, c-format
-msgid "Version: "
-msgstr "เวอร์ชัน:"
-
-#: ../rpmdrake:786
-#, c-format
-msgid "Size: "
-msgstr "ขนาด:"
-
-#: ../rpmdrake:786
-#, c-format
-msgid "%s KB"
-msgstr "%s KB"
-
-#: ../rpmdrake:788
-#, c-format
-msgid "Importance: "
-msgstr "ความสำคัญ:"
-
-#: ../rpmdrake:790
-#, c-format
-msgid "Summary: "
-msgstr "ข้อความสรุป:"
-
-#: ../rpmdrake:792
-#, c-format
-msgid "Reason for update: "
-msgstr "เหตุผลในการอัพเดท:"
-
-#: ../rpmdrake:794
+#: ../rpmdrake:881
 #, c-format
-msgid "Description: "
-msgstr "คำอธิบาย:"
+msgid "Security updates"
+msgstr "อัพเดทระบบรักษาความปลอดภัย"
 
-#: ../rpmdrake:859
+#: ../rpmdrake:881
 #, c-format
 msgid "Bugfixes updates"
 msgstr "อัพเดทแบบแก้ไขบัก"
 
-#: ../rpmdrake:859
+#: ../rpmdrake:881
 #, c-format
 msgid "Normal updates"
 msgstr "อัพเดททั่วไป"
 
-#: ../rpmdrake:878
+#: ../rpmdrake:901
 #, c-format
 msgid "%s choices"
 msgstr ""
 
-#: ../rpmdrake:878
+#: ../rpmdrake:901
 #, c-format
 msgid "Mandrakelinux choices"
 msgstr "Mandrakelinux choices"
 
-#: ../rpmdrake:881
+#: ../rpmdrake:904
 #, c-format
 msgid "All packages, alphabetical"
 msgstr "ทุกเพกเกจ, เรียงตามตัวอักษร"
 
-#: ../rpmdrake:889
+#: ../rpmdrake:912
 #, fuzzy, c-format
 msgid "All packages, by group"
 msgstr "ทุกเพกเกจ,"
 
-#: ../rpmdrake:890
+#: ../rpmdrake:913
 #, fuzzy, c-format
 msgid "All packages, by size"
 msgstr "ทุกเพกเกจ,"
 
-#: ../rpmdrake:891
+#: ../rpmdrake:914
 #, fuzzy, c-format
 msgid "All packages, by selection state"
 msgstr "ตามการถูกเลือก"
 
-#: ../rpmdrake:895
+#: ../rpmdrake:918
 #, fuzzy, c-format
 msgid "All packages, by medium repository"
 msgstr "ตาม source repository"
 
-#: ../rpmdrake:896
+#: ../rpmdrake:919
 #, fuzzy, c-format
 msgid "All packages, by update availability"
 msgstr "ตามความพร้อมในการอัพเดท"
 
-#: ../rpmdrake:900
+#: ../rpmdrake:923
 #, c-format
 msgid "Leaves only, sorted by install date"
 msgstr ""
 
-#: ../rpmdrake:974
+#: ../rpmdrake:997
 #, c-format
 msgid "in names"
 msgstr "ในชื่อ"
 
-#: ../rpmdrake:976
+#: ../rpmdrake:999
 #, c-format
 msgid "in descriptions"
 msgstr "ตามคำอธิบาย"
 
-#: ../rpmdrake:978
+#: ../rpmdrake:1001
 #, fuzzy, c-format
 msgid "in file names"
 msgstr "ในไฟล์"
 
-#: ../rpmdrake:987
+#: ../rpmdrake:1010
 #, c-format
 msgid "Normal information"
 msgstr "ข้อมูลแบบปกตื"
 
-#: ../rpmdrake:987
+#: ../rpmdrake:1010
 #, c-format
 msgid "Maximum information"
 msgstr "ข้อมูลแบบละเอียด"
 
-#: ../rpmdrake:1007
+#: ../rpmdrake:1030
 #, fuzzy, c-format
 msgid "You need to select some packages first."
 msgstr "ไม่สามารถหา source เพกเกจได้"
 
-#: ../rpmdrake:1012
+#: ../rpmdrake:1035
 #, c-format
 msgid "Too many packages are selected"
 msgstr "มีเพกเกจที่ถูกเลือกมากเกินไป"
 
-#: ../rpmdrake:1013
+#: ../rpmdrake:1036
 #, c-format
 msgid ""
 "Warning: it seems that you are attempting to add so much\n"
@@ -1408,7 +1433,7 @@ msgstr ""
 "\n"
 "คุณต้องการจะลงเพกเกจที่เลือกไว้ทั้งหมดหรือไม่?"
 
-#: ../rpmdrake:1026
+#: ../rpmdrake:1049
 #, fuzzy, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -1423,93 +1448,93 @@ msgstr ""
 "\n"
 "คุณต้องการทำต่อหรือไม่?"
 
-#: ../rpmdrake:1059
+#: ../rpmdrake:1082
 #, c-format
 msgid "Software Packages Removal"
 msgstr "การลบเพกเกจ"
 
-#: ../rpmdrake:1060
+#: ../rpmdrake:1083
 #, fuzzy, c-format
 msgid "Software Packages Update"
 msgstr "การลบเพกเกจ"
 
-#: ../rpmdrake:1061
+#: ../rpmdrake:1084
 #, c-format
 msgid "Software Packages Installation"
 msgstr "การ install package"
 
-#: ../rpmdrake:1067 ../rpmdrake:1070 ../rpmdrake:1079 ../rpmdrake:1090
-#: ../rpmdrake:1095
+#: ../rpmdrake:1090 ../rpmdrake:1093 ../rpmdrake:1102 ../rpmdrake:1113
+#: ../rpmdrake:1118
 #, c-format
 msgid "/_File"
 msgstr "/_ไฟล์"
 
-#: ../rpmdrake:1070
+#: ../rpmdrake:1093
 #, fuzzy, c-format
 msgid "/_Update media"
 msgstr "อัพเดท source(s)"
 
-#: ../rpmdrake:1079
+#: ../rpmdrake:1102
 #, fuzzy, c-format
 msgid "/_Reset the selection"
 msgstr "reset รายชื่อที่ถูกเลือก"
 
-#: ../rpmdrake:1090
+#: ../rpmdrake:1113
 #, fuzzy, c-format
 msgid "/Reload the _packages list"
 msgstr "โหลดรายชื่อเพจเกจใหม่"
 
-#: ../rpmdrake:1095
+#: ../rpmdrake:1118
 #, c-format
 msgid "/_Quit"
 msgstr "/_เลิก"
 
-#: ../rpmdrake:1096
+#: ../rpmdrake:1119
 #, fuzzy, c-format
 msgid "/_View"
 msgstr "ดุ"
 
-#: ../rpmdrake:1098 ../rpmdrake:1099 ../rpmdrake:1106
+#: ../rpmdrake:1121 ../rpmdrake:1122 ../rpmdrake:1129
 #, c-format
 msgid "/_Options"
 msgstr "/_ทางเลือก"
 
-#: ../rpmdrake:1099 ../rpmdrake:1106
+#: ../rpmdrake:1122 ../rpmdrake:1129
 #, fuzzy, c-format
 msgid "/_Show automatically selected packages"
 msgstr "  --อัตโนมัติ         - ทำการเลือกแพ็คเกจโดยอัตโนมัติ.\n"
 
-#: ../rpmdrake:1103 ../rpmdrake:1104
+#: ../rpmdrake:1126 ../rpmdrake:1127
 #, c-format
 msgid "/_Help"
 msgstr "/_ช่วยเหลือ"
 
-#: ../rpmdrake:1120
+#: ../rpmdrake:1143
 #, c-format
 msgid "Find:"
 msgstr "ค้นหา:"
 
-#: ../rpmdrake:1125
+#: ../rpmdrake:1148
 #, c-format
 msgid "Search"
 msgstr "ค้นหา"
 
-#: ../rpmdrake:1131
+#: ../rpmdrake:1154
 #, c-format
 msgid "Install"
 msgstr "Install"
 
-#: ../rpmdrake:1163
+#: ../rpmdrake:1186
 #, c-format
 msgid "Fatal error"
 msgstr ""
 
-#: ../rpmdrake:1164
+#: ../rpmdrake:1187
 #, c-format
 msgid "A fatal error occurred: %s."
 msgstr ""
 
-#: ../rpmdrake:1172
+#: ../rpmdrake:1195
 #, c-format
 msgid ""
 "I need to contact the mirror to get latest update packages.\n"
@@ -1522,12 +1547,12 @@ msgstr ""
 "\n"
 "คุณต้องการจะทำต่อไปหรือไม่?"
 
-#: ../rpmdrake:1181
+#: ../rpmdrake:1204
 #, fuzzy, c-format
 msgid "Already existing update media"
 msgstr "เกิดข้อผิดพลาดขณะกำลังเพื่มแผ่นข้อมูลอัพเดท"
 
-#: ../rpmdrake:1182
+#: ../rpmdrake:1205
 #, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -1538,12 +1563,12 @@ msgid ""
 "Then, restart %s."
 msgstr ""
 
-#: ../rpmdrake:1192
+#: ../rpmdrake:1215
 #, c-format
 msgid "How to choose manually your mirror"
 msgstr "วิธีเลือก mirror ของคุณเอง"
 
-#: ../rpmdrake:1193
+#: ../rpmdrake:1216
 #, fuzzy, c-format
 msgid ""
 "You may also choose your desired mirror manually: to do so,\n"
@@ -1557,62 +1582,62 @@ msgstr ""
 "\n"
 "จากนั้น ก็ปิดแล้วเปิด MandrakelinuxUpdate อีกครั้ง"
 
-#: ../rpmdrake:1224
+#: ../rpmdrake:1249
 #, c-format
 msgid "Please wait, finding available packages..."
 msgstr "กำลังหาเพกเกจที่มีอยู่, กรุณารอสักครู่..."
 
-#: ../rpmdrake:1272
+#: ../rpmdrake:1297
 #, c-format
 msgid "Inspecting %s"
 msgstr "กำลังตรวจสอบ %s"
 
-#: ../rpmdrake:1291
+#: ../rpmdrake:1316
 #, fuzzy, c-format
 msgid "changes:"
 msgstr "บันทึกการเปลี่ยนแปลง"
 
-#: ../rpmdrake:1295
+#: ../rpmdrake:1320
 #, c-format
 msgid "Remove .%s"
 msgstr "ลบ %s"
 
-#: ../rpmdrake:1297
+#: ../rpmdrake:1322
 #, c-format
 msgid "Use .%s as main file"
 msgstr "ใช้ %s เป็นไฟล์หลักManager"
 
-#: ../rpmdrake:1299
+#: ../rpmdrake:1324
 #, c-format
 msgid "Do nothing"
 msgstr "ไม่ต้องทำอะไร"
 
-#: ../rpmdrake:1312
+#: ../rpmdrake:1337
 #, c-format
 msgid "Installation finished"
 msgstr "install เสร็จเรียบร้อย"
 
-#: ../rpmdrake:1327
+#: ../rpmdrake:1352
 #, c-format
 msgid "Inspect..."
 msgstr "ตรวจสอบ..."
 
-#: ../rpmdrake:1356 ../rpmdrake:1512
+#: ../rpmdrake:1381 ../rpmdrake:1536
 #, c-format
 msgid "Everything installed successfully"
 msgstr "ทุกอย่างถูก install เรียบร้อย"
 
-#: ../rpmdrake:1357 ../rpmdrake:1513
+#: ../rpmdrake:1382 ../rpmdrake:1537
 #, c-format
 msgid "All requested packages were installed successfully."
 msgstr "เพกเกจทุกตัวที่เลือกไว้ถูก install เรียบร้อย"
 
-#: ../rpmdrake:1359 ../rpmdrake:1497
+#: ../rpmdrake:1384 ../rpmdrake:1521
 #, c-format
 msgid "Problem during installation"
 msgstr "เกิดปัญหาขณะ install"
 
-#: ../rpmdrake:1360 ../rpmdrake:1498 ../rpmdrake:1553
+#: ../rpmdrake:1385 ../rpmdrake:1522 ../rpmdrake:1577
 #, c-format
 msgid ""
 "There was a problem during the installation:\n"
@@ -1623,17 +1648,17 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:1373
+#: ../rpmdrake:1398
 #, c-format
 msgid "Unable to get source packages."
 msgstr "ไม่สามารถหา source เพกเกจได้"
 
-#: ../rpmdrake:1374
+#: ../rpmdrake:1399
 #, fuzzy, c-format
 msgid "Unable to get source packages, sorry. %s"
 msgstr "ไม่สามารถหา source เพกเกจได้"
 
-#: ../rpmdrake:1375 ../rpmdrake:1444
+#: ../rpmdrake:1400 ../rpmdrake:1469
 #, c-format
 msgid ""
 "\n"
@@ -1642,37 +1667,37 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../rpmdrake:1382
+#: ../rpmdrake:1407
 #, fuzzy, c-format
 msgid "Package installation..."
 msgstr "การ install package"
 
-#: ../rpmdrake:1382
+#: ../rpmdrake:1407
 #, c-format
 msgid "Initializing..."
 msgstr ""
 
-#: ../rpmdrake:1391
+#: ../rpmdrake:1416
 #, c-format
 msgid "Change medium"
 msgstr "เปลื่ยนสื่อข้อมูล"
 
-#: ../rpmdrake:1392
+#: ../rpmdrake:1417
 #, fuzzy, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "กรุณาใส่สื่อข้อมูลชื่อ \"%s\" ลงในอุปกรณ์ชื่อ [%s]"
 
-#: ../rpmdrake:1399
+#: ../rpmdrake:1424
 #, c-format
 msgid "Downloading package `%s' (%s/%s)..."
 msgstr ""
 
-#: ../rpmdrake:1422
+#: ../rpmdrake:1447
 #, c-format
 msgid "Verifying packages signatures..."
 msgstr ""
 
-#: ../rpmdrake:1434
+#: ../rpmdrake:1459
 #, fuzzy, c-format
 msgid ""
 "The following packages have bad signatures:\n"
@@ -1687,12 +1712,12 @@ msgstr ""
 "\n"
 "คุณต้องการทำต่อหรือไม่?"
 
-#: ../rpmdrake:1441 ../rpmdrake:1552
+#: ../rpmdrake:1466 ../rpmdrake:1576
 #, c-format
 msgid "Installation failed"
 msgstr "install ไม่สำเร็จ"
 
-#: ../rpmdrake:1442
+#: ../rpmdrake:1467
 #, fuzzy, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -1703,22 +1728,22 @@ msgstr ""
 "install ไม่สำเร็จ, ไฟล์บางไฟล์อยู่ไท่ครบ\n"
 "คุณอาจจะต้องอัพเดทฐานข้อมูล source ของคุณ"
 
-#: ../rpmdrake:1456
+#: ../rpmdrake:1480
 #, fuzzy, c-format
 msgid "Preparing packages installation..."
 msgstr "การ install package"
 
-#: ../rpmdrake:1459
+#: ../rpmdrake:1483
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr ""
 
-#: ../rpmdrake:1475
+#: ../rpmdrake:1499
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "ไม่สามารถใช้งาน rpm file [%s]"
 
-#: ../rpmdrake:1510
+#: ../rpmdrake:1534
 #, c-format
 msgid ""
 "The installation is finished; %s.\n"
@@ -1731,47 +1756,47 @@ msgstr ""
 "ไฟล์ configuration บางตัวถูกสร้างในชื่อ '.rpmnew' หรือ '.rpmsave', \n"
 "คุณอาจจะต้องตรวจสอบไฟล์เหล่านี้หากต้องการทำอย่างอื่นต่อไป"
 
-#: ../rpmdrake:1510
+#: ../rpmdrake:1534
 #, c-format
 msgid "everything was installed correctly"
 msgstr "ทุกอย่างถูก install เรียบร้อย"
 
-#: ../rpmdrake:1518
+#: ../rpmdrake:1542
 #, c-format
 msgid "These packages come with upgrade information"
 msgstr ""
 
-#: ../rpmdrake:1530
+#: ../rpmdrake:1554
 #, fuzzy, c-format
 msgid "More information on package... [%s]"
 msgstr "ข้อมูลเพื่มเติมบนแพกเกจ..."
 
-#: ../rpmdrake:1543
+#: ../rpmdrake:1567
 #, fuzzy, c-format
 msgid "No package found for installation."
 msgstr "การ install package"
 
-#: ../rpmdrake:1544
+#: ../rpmdrake:1568
 #, c-format
 msgid "Unrecoverable error: no package found for installation, sorry."
 msgstr ""
 
-#: ../rpmdrake:1566
+#: ../rpmdrake:1590
 #, c-format
 msgid "Please wait, reading packages database..."
 msgstr "กำลังอ่านจากฐานข้อมูลเพกเกจ, กรุณารอสักครู่..."
 
-#: ../rpmdrake:1613
+#: ../rpmdrake:1637
 #, c-format
 msgid "Please wait, removing packages..."
 msgstr "กำลังลบเพกเกจ, กรุณารอสักครู่..."
 
-#: ../rpmdrake:1618
+#: ../rpmdrake:1642
 #, fuzzy, c-format
 msgid "Problem during removal"
 msgstr "เกิดปัญหาขณะ install"
 
-#: ../rpmdrake:1619
+#: ../rpmdrake:1643
 #, fuzzy, c-format
 msgid ""
 "There was a problem during the removal of packages:\n"
@@ -1782,7 +1807,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:1652
+#: ../rpmdrake:1676
 #, c-format
 msgid ""
 "Welcome to the software removal tool!\n"
@@ -1794,7 +1819,7 @@ msgstr ""
 "\n"
 "โปรแกรมนี้จะช่วยคุณในการเลือกโปรแกรมที่คุณต้องการลบออกจากเครื่อง"
 
-#: ../rpmdrake:1657
+#: ../rpmdrake:1681
 #, c-format
 msgid ""
 "Welcome to %s!\n"
@@ -1806,12 +1831,12 @@ msgstr ""
 "\n"
 "โปรแกรมนี้จะช่วยคุณในการเลือกตัวอัพเดทที่คุณต้องการ install ลงในเครื่อง"
 
-#: ../rpmdrake:1662
+#: ../rpmdrake:1686
 #, c-format
 msgid "Welcome to the software installation tool!"
 msgstr ""
 
-#: ../rpmdrake:1663
+#: ../rpmdrake:1687
 #, c-format
 msgid ""
 "Welcome to the software installation tool!\n"
@@ -1826,183 +1851,183 @@ msgstr ""
 "บน CDROM หรือ DVD  โปรแกรมนี้จะช่วยคุณเลือกว่าโปรแกรทไหนที่คุณต้องการ\n"
 "จะลงบนเครื่อง"
 
-#: ../rpmdrake.pm:95
+#: ../rpmdrake.pm:93
 #, fuzzy, c-format
 msgid "Software Update"
 msgstr "การลบเพกเกจ"
 
-#: ../rpmdrake.pm:95
+#: ../rpmdrake.pm:93
 #, c-format
 msgid "Mandrakelinux Update"
 msgstr "อัพเดทของ Mandrakelinux"
 
-#: ../rpmdrake.pm:187
+#: ../rpmdrake.pm:182
 #, c-format
 msgid "No"
 msgstr "ไม่ใช่"
 
-#: ../rpmdrake.pm:191
+#: ../rpmdrake.pm:186
 #, c-format
 msgid "Yes"
 msgstr "ใช่"
 
-#: ../rpmdrake.pm:239
+#: ../rpmdrake.pm:234
 #, c-format
 msgid "Info..."
 msgstr "ข้อมูล..."
 
-#: ../rpmdrake.pm:315
+#: ../rpmdrake.pm:310
 #, c-format
 msgid "Austria"
 msgstr "ออสเตรีย"
 
-#: ../rpmdrake.pm:316
+#: ../rpmdrake.pm:311
 #, c-format
 msgid "Australia"
 msgstr "ออสเตรเลีย"
 
-#: ../rpmdrake.pm:317
+#: ../rpmdrake.pm:312
 #, c-format
 msgid "Belgium"
 msgstr "เบลเยียม"
 
-#: ../rpmdrake.pm:318
+#: ../rpmdrake.pm:313
 #, c-format
 msgid "Brazil"
 msgstr "บราซิล"
 
-#: ../rpmdrake.pm:319
+#: ../rpmdrake.pm:314
 #, c-format
 msgid "Canada"
 msgstr "แคนาดา"
 
-#: ../rpmdrake.pm:320
+#: ../rpmdrake.pm:315
 #, fuzzy, c-format
 msgid "Switzerland"
 msgstr "เนเธอร์แลนด์"
 
-#: ../rpmdrake.pm:321
+#: ../rpmdrake.pm:316
 #, c-format
 msgid "Costa Rica"
 msgstr "คอสตาริกา"
 
-#: ../rpmdrake.pm:322
+#: ../rpmdrake.pm:317
 #, c-format
 msgid "Czech Republic"
 msgstr "สาธารณรัฐเช็ค"
 
-#: ../rpmdrake.pm:323
+#: ../rpmdrake.pm:318
 #, c-format
 msgid "Germany"
 msgstr "เยอรมนี"
 
-#: ../rpmdrake.pm:324
+#: ../rpmdrake.pm:319
 #, c-format
 msgid "Danmark"
 msgstr "เดนมาร์ก"
 
-#: ../rpmdrake.pm:325 ../rpmdrake.pm:329
+#: ../rpmdrake.pm:320 ../rpmdrake.pm:324
 #, c-format
 msgid "Greece"
 msgstr "กรืซ"
 
-#: ../rpmdrake.pm:326
+#: ../rpmdrake.pm:321
 #, c-format
 msgid "Spain"
 msgstr "สเปน"
 
-#: ../rpmdrake.pm:327
+#: ../rpmdrake.pm:322
 #, c-format
 msgid "Finland"
 msgstr "ฟินแลนด์"
 
-#: ../rpmdrake.pm:328
+#: ../rpmdrake.pm:323
 #, c-format
 msgid "France"
 msgstr "ฝรั่งเศส"
 
-#: ../rpmdrake.pm:330
+#: ../rpmdrake.pm:325
 #, fuzzy, c-format
 msgid "Hungary"
 msgstr "อังการี"
 
-#: ../rpmdrake.pm:331
+#: ../rpmdrake.pm:326
 #, c-format
 msgid "Israel"
 msgstr "อิสราเอล"
 
-#: ../rpmdrake.pm:332
+#: ../rpmdrake.pm:327
 #, c-format
 msgid "Italy"
 msgstr "อิตาลี"
 
-#: ../rpmdrake.pm:333
+#: ../rpmdrake.pm:328
 #, c-format
 msgid "Japan"
 msgstr "ญี่ปุ่น"
 
-#: ../rpmdrake.pm:334
+#: ../rpmdrake.pm:329
 #, c-format
 msgid "Korea"
 msgstr "เกาหลี"
 
-#: ../rpmdrake.pm:335
+#: ../rpmdrake.pm:330
 #, c-format
 msgid "Netherlands"
 msgstr "เนเธอร์แลนด์"
 
-#: ../rpmdrake.pm:336
+#: ../rpmdrake.pm:331
 #, c-format
 msgid "Norway"
 msgstr "นอร์เวย์"
 
-#: ../rpmdrake.pm:337
+#: ../rpmdrake.pm:332
 #, c-format
 msgid "Poland"
 msgstr "โปแลนด๋"
 
-#: ../rpmdrake.pm:338
+#: ../rpmdrake.pm:333
 #, c-format
 msgid "Portugal"
 msgstr "โปรตุเกส"
 
-#: ../rpmdrake.pm:339
+#: ../rpmdrake.pm:334
 #, c-format
 msgid "Russia"
 msgstr "รัสเซีย"
 
-#: ../rpmdrake.pm:340
+#: ../rpmdrake.pm:335
 #, c-format
 msgid "Sweden"
 msgstr "สวีเดน"
 
-#: ../rpmdrake.pm:341
+#: ../rpmdrake.pm:336
 #, fuzzy, c-format
 msgid "Slovakia"
 msgstr "สโลวะเกีย:"
 
-#: ../rpmdrake.pm:342
+#: ../rpmdrake.pm:337
 #, c-format
 msgid "Taiwan"
 msgstr "ไต้หวัน"
 
-#: ../rpmdrake.pm:343
+#: ../rpmdrake.pm:338
 #, c-format
 msgid "United Kingdom"
 msgstr "อังกฤษ"
 
-#: ../rpmdrake.pm:344
+#: ../rpmdrake.pm:339
 #, c-format
 msgid "China"
 msgstr "จีน"
 
-#: ../rpmdrake.pm:345 ../rpmdrake.pm:346 ../rpmdrake.pm:347 ../rpmdrake.pm:348
-#: ../rpmdrake.pm:421
+#: ../rpmdrake.pm:340 ../rpmdrake.pm:341 ../rpmdrake.pm:342 ../rpmdrake.pm:343
+#: ../rpmdrake.pm:419
 #, c-format
 msgid "United States"
 msgstr "สหรัฐอเมริกา"
 
-#: ../rpmdrake.pm:433
+#: ../rpmdrake.pm:431
 #, fuzzy, c-format
 msgid ""
 "I need to access internet to get the mirror list.\n"
@@ -2015,7 +2040,7 @@ msgstr ""
 "\n"
 "คุณต้องการจะทำต่อหรือไม่?"
 
-#: ../rpmdrake.pm:437
+#: ../rpmdrake.pm:435
 #, c-format
 msgid ""
 "I need to contact the Mandrakesoft website to get the mirror list.\n"
@@ -2028,23 +2053,23 @@ msgstr ""
 "\n"
 "คุณต้องการจะทำต่อหรือไม่?"
 
-#: ../rpmdrake.pm:443
+#: ../rpmdrake.pm:441
 #, fuzzy, c-format
 msgid "Please wait, downloading mirror addresses."
 msgstr "กรุณารอสักครุ่, กำลังดาว์นโหลดรายชื่อ mirrors จากเวป Mandrakesoft"
 
-#: ../rpmdrake.pm:444
+#: ../rpmdrake.pm:442
 #, c-format
 msgid ""
 "Please wait, downloading mirror addresses from the Mandrakesoft website."
 msgstr "กรุณารอสักครุ่, กำลังดาว์นโหลดรายชื่อ mirrors จากเวป Mandrakesoft"
 
-#: ../rpmdrake.pm:451
+#: ../rpmdrake.pm:448
 #, c-format
 msgid "Error during download"
 msgstr "เกิดข้อผิดพลาดขณะดาวน์โหลด"
 
-#: ../rpmdrake.pm:453
+#: ../rpmdrake.pm:450
 #, fuzzy, c-format
 msgid ""
 "There was an error downloading the mirror list:\n"
@@ -2058,7 +2083,7 @@ msgstr ""
 "%s\n"
 "ระบบเนตเวิร์ก หรือ เวป Mandrakesoft ในขณะนี้อาจจะไม่พร้อมให้บริการ กรุณาลองใหม่ภายหลัง"
 
-#: ../rpmdrake.pm:458
+#: ../rpmdrake.pm:455
 #, c-format
 msgid ""
 "There was an error downloading the mirror list:\n"
@@ -2072,17 +2097,17 @@ msgstr ""
 "%s\n"
 "ระบบเนตเวิร์ก หรือ เวป Mandrakesoft ในขณะนี้อาจจะไม่พร้อมให้บริการ กรุณาลองใหม่ภายหลัง"
 
-#: ../rpmdrake.pm:467
+#: ../rpmdrake.pm:464
 #, c-format
 msgid "No mirror"
 msgstr "ไม่พบ mirror"
 
-#: ../rpmdrake.pm:469
+#: ../rpmdrake.pm:466
 #, c-format
 msgid "I can't find any suitable mirror."
 msgstr ""
 
-#: ../rpmdrake.pm:470
+#: ../rpmdrake.pm:467
 #, c-format
 msgid ""
 "I can't find any suitable mirror.\n"
@@ -2096,63 +2121,63 @@ msgstr ""
 "ปัญหานี้เกิดได้จากหลายสาเหตุ; ส่วนมากแล้วจะมาจากการที่ architecture ของ\n"
 "หน่วยประมวลผลของคุณไม่ได้สนับสนุนโดย Mandrakelinux Offical Updates"
 
-#: ../rpmdrake.pm:489
+#: ../rpmdrake.pm:486
 #, c-format
 msgid "Please choose the desired mirror."
 msgstr "กรุณาเลือก mirror ที่ต้องการ"
 
-#: ../rpmdrake.pm:548
+#: ../rpmdrake.pm:545
 #, c-format
 msgid "Copying file for medium `%s'..."
 msgstr ""
 
-#: ../rpmdrake.pm:551
+#: ../rpmdrake.pm:548
 #, c-format
 msgid "Examining file of medium `%s'..."
 msgstr ""
 
-#: ../rpmdrake.pm:554
+#: ../rpmdrake.pm:551
 #, c-format
 msgid "Examining remote file of medium `%s'..."
 msgstr ""
 
-#: ../rpmdrake.pm:558
+#: ../rpmdrake.pm:555
 #, c-format
 msgid " done."
 msgstr ""
 
-#: ../rpmdrake.pm:562
+#: ../rpmdrake.pm:559
 #, fuzzy, c-format
 msgid " failed!"
 msgstr "ในไฟล์"
 
 #. -PO: We're downloading the said file from the said medium
-#: ../rpmdrake.pm:566
+#: ../rpmdrake.pm:563
 #, c-format
 msgid "%s from medium %s"
 msgstr ""
 
-#: ../rpmdrake.pm:570
+#: ../rpmdrake.pm:567
 #, c-format
 msgid "Starting download of `%s'..."
 msgstr ""
 
-#: ../rpmdrake.pm:574
+#: ../rpmdrake.pm:571
 #, c-format
 msgid "Download of `%s', time to go:%s, speed:%s"
 msgstr ""
 
-#: ../rpmdrake.pm:577
+#: ../rpmdrake.pm:574
 #, c-format
 msgid "Download of `%s', speed:%s"
 msgstr ""
 
-#: ../rpmdrake.pm:614
+#: ../rpmdrake.pm:611
 #, c-format
 msgid "Error retrieving packages"
 msgstr ""
 
-#: ../rpmdrake.pm:615
+#: ../rpmdrake.pm:612
 #, c-format
 msgid ""
 "It's impossible to retrieve the list of new packages from the media\n"
@@ -2163,27 +2188,27 @@ msgid ""
 "later."
 msgstr ""
 
-#: ../rpmdrake.pm:646
+#: ../rpmdrake.pm:643
 #, fuzzy, c-format
 msgid "Update media"
 msgstr "อัพเดท source(s)"
 
-#: ../rpmdrake.pm:654
+#: ../rpmdrake.pm:651
 #, fuzzy, c-format
 msgid "Select the media you wish to update:"
 msgstr "เลือก source(s) ที่คุณต้องการจะอัพเดท"
 
-#: ../rpmdrake.pm:668
+#: ../rpmdrake.pm:665
 #, fuzzy, c-format
 msgid "Select all"
 msgstr "ถูกเลือก"
 
-#: ../rpmdrake.pm:672
+#: ../rpmdrake.pm:669
 #, c-format
 msgid "Update"
 msgstr "อัพเดท"
 
-#: ../rpmdrake.pm:694
+#: ../rpmdrake.pm:691
 #, fuzzy, c-format
 msgid ""
 "Unable to update medium; it will be automatically disabled.\n"
@@ -2192,7 +2217,7 @@ msgid ""
 "%s"
 msgstr "ไม่สามารถอัพเดทแผ่นข้อมูลได้; แผ่นข้อมูลนี้จะไม่ถูกใช้โดยอัตโนมัติ"
 
-#: ../rpmdrake.pm:718 ../rpmdrake.pm:727
+#: ../rpmdrake.pm:715 ../rpmdrake.pm:724
 #, c-format
 msgid ""
 "Unable to add medium, errors reported:\n"
@@ -2200,17 +2225,17 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../rpmdrake.pm:739
+#: ../rpmdrake.pm:736
 #, c-format
 msgid "Unable to create medium."
 msgstr "ไม่สามารถสร้างแผ่นข้อมูลได้"
 
-#: ../rpmdrake.pm:744
+#: ../rpmdrake.pm:741
 #, fuzzy, c-format
 msgid "Failure when adding medium"
 msgstr "กำลังเพิ่มแผ่นข้อมูล, กรุณารอสักครู่"
 
-#: ../rpmdrake.pm:745
+#: ../rpmdrake.pm:742
 #, fuzzy, c-format
 msgid ""
 "There was a problem adding medium:\n"
@@ -2221,7 +2246,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake.pm:758
+#: ../rpmdrake.pm:755
 #, c-format
 msgid ""
 "Your medium `%s', used for updates, does not match the version of %s you're "
@@ -2229,7 +2254,7 @@ msgid ""
 "It will be disabled."
 msgstr ""
 
-#: ../rpmdrake.pm:761
+#: ../rpmdrake.pm:758
 #, c-format
 msgid ""
 "Your medium `%s', used for updates, does not match the version of "
@@ -2237,12 +2262,12 @@ msgid ""
 "It will be disabled."
 msgstr ""
 
-#: ../rpmdrake.pm:777
+#: ../rpmdrake.pm:774
 #, c-format
 msgid "Help launched in background"
 msgstr ""
 
-#: ../rpmdrake.pm:778
+#: ../rpmdrake.pm:775
 #, c-format
 msgid ""
 "The help window has been started, it should appear shortly on your desktop."
@@ -2520,6 +2545,9 @@ msgstr "ลบโปรแกรท"
 msgid "Software Media Manager"
 msgstr "ตัวจัดการ Software Sources"
 
+#~ msgid "Choose a mirror..."
+#~ msgstr "เลือก mirror..."
+
 #~ msgid "Reset the selection"
 #~ msgstr "reset รายชื่อที่ถูกเลือก"