sync with code

1 files changed, 221 insertions, 216 deletions

diff --git a/po/th.po b/po/th.po
index 1f7fa14d..27511eb7 100644
--- a/po/th.po
+++ b/po/th.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi 3.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-02-09 22:13+0100\n"
+"POT-Creation-Date: 2013-03-26 21:20+0100\n"
 "PO-Revision-Date: 2002-11-25 13:52-0500\n"
 "Last-Translator: Wachara Chinsettawong <wachara@yahoo.com>\n"
 "Language-Team: Thai <th@li.org>\n"
@@ -20,22 +20,76 @@ msgstr ""
 "X-Generator: KBabel 0.9.6\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../gurpmi:32
+#: ../gurpm/RPMProgressDialog.pm:47
+#, fuzzy, c-format
+msgid "Distribution Upgrade"
+msgstr "กำลังติดตั้ง %s\n"
+
+#: ../gurpm/RPMProgressDialog.pm:47
+#, fuzzy, c-format
+msgid "Packages installation"
+msgstr "การ install package"
+
+#: ../gurpm/RPMProgressDialog.pm:125
+#, fuzzy, c-format
+msgid "Please wait..."
+msgstr "กรุณารอ"
+
+#: ../gurpm/RPMProgressDialog.pm:287
+#, fuzzy, c-format
+msgid "Verifying package signatures..."
+msgstr "แพ็คเกจต่อไปนี้มี signatures ที่ไม่ถูกต้อง"
+
+#: ../gurpm/RPMProgressDialog.pm:306 ../urpm/install.pm:107
+#, c-format
+msgid "Preparing..."
+msgstr "กำลังเตรียม..."
+
+#: ../gurpm/RPMProgressDialog.pm:310
+#, fuzzy, c-format
+msgid "Removing package `%s' ..."
+msgstr "กำลังติดตั้งแพ็คเก็จ %s"
+
+#: ../gurpm/RPMProgressDialog.pm:314
+#, fuzzy, c-format
+msgid "Installing package `%s' (%s/%s)..."
+msgstr ""
+"กำลังติดตั้งแพ็คเก็จ %s\n"
+"%d%%"
+
+#: ../gurpm/RPMProgressDialog.pm:342
+#, fuzzy, c-format
+msgid "Downloading package `%s'..."
+msgstr "กำลังติดตั้งแพ็คเก็จ %s"
+
+#: ../gurpm/RPMProgressDialog.pm:346
+#, c-format
+msgid "Cancel"
+msgstr "ยกเลิก"
+
+#: ../gurpm/RPMProgressDialog.pm:356 ../urpm.pm:453 ../urpm/download.pm:857
+#: ../urpm/get_pkgs.pm:278 ../urpm/media.pm:1078 ../urpm/media.pm:1604
+#: ../urpm/media.pm:1755
+#, c-format
+msgid "...retrieving failed: %s"
+msgstr "การอ่านข้อมูลล้มเหลว: %s"
+
+#: ../gurpmi:38
 #, fuzzy, c-format
 msgid "RPM installation"
 msgstr "กำลังเตรียมการติดตั้ง"
 
-#: ../gurpmi:46
+#: ../gurpmi:52
 #, c-format
 msgid "Error: unable to find file %s, will cancel operation"
 msgstr ""
 
-#: ../gurpmi:47 ../gurpmi2:198 ../gurpmi2:223
+#: ../gurpmi:53 ../gurpmi2:167 ../gurpmi2:197
 #, c-format
 msgid "_Ok"
 msgstr "_Ok"
 
-#: ../gurpmi:67
+#: ../gurpmi:73
 #, c-format
 msgid ""
 "You have selected a source package:\n"
@@ -48,7 +102,7 @@ msgid ""
 "What would you like to do?"
 msgstr ""
 
-#: ../gurpmi:75 ../gurpmi:86
+#: ../gurpmi:81 ../gurpmi:92
 #, fuzzy, c-format
 msgid ""
 "You are about to install the following software packages on your computer:\n"
@@ -60,7 +114,7 @@ msgstr ""
 "คุณจะต้องเป็นรูทในการติดตั้ง ความเป็นอิสระ :\n"
 "%s\n"
 
-#: ../gurpmi:81
+#: ../gurpmi:87
 #, c-format
 msgid ""
 "You are about to install the following software package on your computer:\n"
@@ -70,57 +124,57 @@ msgid ""
 "You may prefer to just save it. What is your choice?"
 msgstr ""
 
-#: ../gurpmi:99
+#: ../gurpmi:105
 #, c-format
 msgid "_Install"
 msgstr "_ติดตั้ง"
 
-#: ../gurpmi:100
+#: ../gurpmi:106
 #, c-format
 msgid "_Save"
 msgstr "_บันทึก"
 
-#: ../gurpmi:101 ../gurpmi2:198
+#: ../gurpmi:107 ../gurpmi2:167
 #, c-format
 msgid "_Cancel"
 msgstr "_ยกเลิก"
 
-#: ../gurpmi:109
+#: ../gurpmi:115
 #, c-format
 msgid "Choose location to save file"
 msgstr ""
 
-#: ../gurpmi.pm:41
+#: ../gurpmi.pm:56
 #, c-format
 msgid "Options:"
 msgstr ""
 
-#: ../gurpmi.pm:42 ../urpme:42 ../urpmf:30 ../urpmi:67 ../urpmi.addmedia:55
+#: ../gurpmi.pm:57 ../urpme:42 ../urpmf:30 ../urpmi:67 ../urpmi.addmedia:55
 #: ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:41
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - พิมพ์ข้อความช่วย\n"
 
-#: ../gurpmi.pm:43 ../urpmi:74
+#: ../gurpmi.pm:58 ../urpmi:74
 #, c-format
 msgid ""
 "  --auto         - non-interactive mode, assume default answers to "
 "questions.\n"
 msgstr ""
 
-#: ../gurpmi.pm:44 ../urpmi:75 ../urpmq:48
+#: ../gurpmi.pm:59 ../urpmi:75 ../urpmq:48
 #, c-format
 msgid ""
 "  --auto-select  - automatically select packages to upgrade the system.\n"
 msgstr "  --auto-select  - เลือกแพ็คเกจที่ต้องการอัพเกรดอัตโนมัติ\n"
 
-#: ../gurpmi.pm:45 ../urpme:46 ../urpmi:100 ../urpmq:64
+#: ../gurpmi.pm:60 ../urpme:46 ../urpmi:100 ../urpmq:64
 #, c-format
 msgid ""
 "  --force        - force invocation even if some packages do not exist.\n"
 msgstr "  --force        - บังคับ invocation ถึงแม้ว่าแพ็คเกจจะไม่มีอยู่\n"
 
-#: ../gurpmi.pm:46 ../urpmi:131
+#: ../gurpmi.pm:61 ../urpmi:131
 #, fuzzy, c-format
 msgid ""
 "  --verify-rpm   - verify rpm signature before installation\n"
@@ -129,77 +183,62 @@ msgstr ""
 "  --verify-rpm   - ตรวจสอบความถูกต้องของ rpm signature ก่อนการติดตั้ง\n"
 "                   (--no-verify-rpm disable it, default is enabled)\n"
 
-#: ../gurpmi.pm:48 ../urpmf:36 ../urpmi:68 ../urpmq:43
+#: ../gurpmi.pm:63 ../urpmf:36 ../urpmi:68 ../urpmq:43
 #, fuzzy, c-format
 msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr "  --update       - ใช้เพื่ออัพเดตมีเดีย\n"
 
-#: ../gurpmi.pm:49 ../urpmi:147
+#: ../gurpmi.pm:64 ../urpmi:147
 #, c-format
 msgid "  -p             - allow search in provides to find package.\n"
 msgstr "  -p             - ย้อมให้มีการค้นหาแพ็คเกจจากที่ป้อนให้\n"
 
-#: ../gurpmi.pm:50 ../urpmi:148
+#: ../gurpmi.pm:65 ../urpmi:148
 #, c-format
 msgid "  -P             - do not search in provides to find package.\n"
 msgstr "  -P             - ไม่จำเป็นต้องค้นในส่วนแพ็คเกจที่ไว้สำหรับค้นเท่านั้น\n"
 
-#: ../gurpmi.pm:51 ../urpmi:107 ../urpmq:67
+#: ../gurpmi.pm:66 ../urpmi:107 ../urpmq:67
 #, fuzzy, c-format
 msgid "  --root         - use another root for rpm installation.\n"
 msgstr "  --wget         - ใช้ wget เพื่อดึงไฟล์ที่อยู่ภายนอก\n"
 
-#: ../gurpmi.pm:52 ../urpmi:133
+#: ../gurpmi.pm:67 ../urpmi:133
 #, fuzzy, c-format
 msgid ""
 "  --test         - only verify if the installation can be achieved "
 "correctly.\n"
 msgstr "  --test         - ตรวจสอบว่าการติดตั้งสามารถทำได้ถูกต้องหรือไม่.\n"
 
-#: ../gurpmi.pm:53 ../urpmi:71
+#: ../gurpmi.pm:68 ../urpmi:71
 #, fuzzy, c-format
 msgid ""
 "  --searchmedia  - use only the given media to search requested packages.\n"
 msgstr "  --media        - เลือกใช้เฉพาะมีเดียที่ถูกขั้นด้วยเครื่องหมายลูกน้ำ\n"
 
-#: ../gurpmi.pm:96
+#: ../gurpmi.pm:115
 #, fuzzy, c-format
 msgid "No packages specified"
 msgstr "ไม่มีการกำหนดคำสั่ง"
 
-#: ../gurpmi2:55
-#, fuzzy, c-format
-msgid "Please wait..."
-msgstr "กรุณารอ"
-
-#: ../gurpmi2:64
+#: ../gurpmi2:42
 #, fuzzy, c-format
 msgid "Must be root"
 msgstr "พอร์ตของเม้าส์"
 
-#: ../gurpmi2:71
-#, fuzzy, c-format
-msgid "Distribution Upgrade"
-msgstr "กำลังติดตั้ง %s\n"
-
-#: ../gurpmi2:71
-#, fuzzy, c-format
-msgid "Packages installation"
-msgstr "การ install package"
-
-#: ../gurpmi2:98
+#: ../gurpmi2:72
 #, fuzzy, c-format
 msgid "Preparing packages installation..."
 msgstr "การ install package"
 
-#: ../gurpmi2:113 ../urpmi:506
+#: ../gurpmi2:87 ../urpmi:506
 #, fuzzy, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
 "%s"
 msgstr "ไม่สามารถ install บางเพกเกจได้"
 
-#: ../gurpmi2:121
+#: ../gurpmi2:95
 #, fuzzy, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
@@ -207,42 +246,42 @@ msgid ""
 "Continue installation anyway?"
 msgstr "ไม่สามารถ install บางเพกเกจได้"
 
-#: ../gurpmi2:156
+#: ../gurpmi2:126
 #, c-format
 msgid "Warning"
 msgstr "คำเตือน"
 
-#: ../gurpmi2:156
+#: ../gurpmi2:126
 #, c-format
 msgid "Ok"
 msgstr "ตกลง"
 
-#: ../gurpmi2:194
+#: ../gurpmi2:163
 #, c-format
 msgid " (to upgrade)"
 msgstr ""
 
-#: ../gurpmi2:195
+#: ../gurpmi2:164
 #, fuzzy, c-format
 msgid " (to install)"
 msgstr "ออกจากการติดตั้ง"
 
-#: ../gurpmi2:198
+#: ../gurpmi2:167
 #, c-format
 msgid "Package choice"
 msgstr ""
 
-#: ../gurpmi2:199
+#: ../gurpmi2:168
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "หนึ่งใน Packages ต่อไปนี้ต้องได้รับการติดตั้ง "
 
-#: ../gurpmi2:224
+#: ../gurpmi2:198
 #, fuzzy, c-format
 msgid "_Abort"
 msgstr "เลิก"
 
-#: ../gurpmi2:259
+#: ../gurpmi2:233
 #, fuzzy, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -250,98 +289,84 @@ msgid ""
 "Continue installation anyway?"
 msgstr "แพ็คเก็จเหล่านี้กำลังจะถูกลบ"
 
-#: ../gurpmi2:278 ../urpmi:606
+#: ../gurpmi2:244 ../urpmi:615
+#, c-format
+msgid "%s of additional disk space will be used."
+msgstr ""
+
+#: ../gurpmi2:245 ../urpmi:616
+#, c-format
+msgid "%s of disk space will be freed."
+msgstr ""
+
+#: ../gurpmi2:246 ../urpmi:617
+#, c-format
+msgid "%s of packages will be retrieved."
+msgstr ""
+
+#: ../gurpmi2:247 ../urpmi:618
+#, c-format
+msgid "Proceed with the installation of one package?"
+msgid_plural "Proceed with the installation of the %d packages?"
+msgstr[0] ""
+
+#: ../gurpmi2:253 ../urpmi:606
 #, fuzzy, c-format
 msgid ""
 "To satisfy dependencies, the following package is going to be installed:"
 msgstr "เพื่อความถูกต้องของการเป็นอิสระระหว่างโปรแกรมแพ็คเกจบางตัวจะถูกลบทิ้ง(%d MB)"
 
-#: ../gurpmi2:279 ../urpmi:607
+#: ../gurpmi2:254 ../urpmi:607
 #, fuzzy, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed:"
 msgstr "เพื่อความถูกต้องของการเป็นอิสระระหว่างโปรแกรมแพ็คเกจบางตัวจะถูกลบทิ้ง(%d MB)"
 
-#: ../gurpmi2:281
-#, c-format
-msgid "(%d package, %d MB)"
-msgid_plural "(%d packages, %d MB)"
-msgstr[0] "(แพ็คเก็จ %d ชุด, %d MB)"
-
-#: ../gurpmi2:289 ../urpm/main_loop.pm:367
+#: ../gurpmi2:264 ../urpm/main_loop.pm:466
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr "ไม่สามารถเรียก source package,กำลังยกเลิก"
 
-#: ../gurpmi2:321 ../urpm/install.pm:105
-#, c-format
-msgid "Preparing..."
-msgstr "กำลังเตรียม..."
-
-#: ../gurpmi2:327
-#, fuzzy, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr ""
-"กำลังติดตั้งแพ็คเก็จ %s\n"
-"%d%%"
-
-#: ../gurpmi2:345 ../urpmi:634
+#: ../gurpmi2:278 ../urpmi:634
 #, fuzzy, c-format
 msgid "Please insert the medium named \"%s\""
 msgstr "กรุณาใส่อุปกรณ์ที่มีชื่อ \"%s\" ใน [%s]"
 
-#: ../gurpmi2:359
-#, fuzzy, c-format
-msgid "Downloading package `%s'..."
-msgstr "กำลังติดตั้งแพ็คเก็จ %s"
-
-#: ../gurpmi2:372 ../urpm.pm:401 ../urpm/download.pm:857
-#: ../urpm/get_pkgs.pm:278 ../urpm/media.pm:1081 ../urpm/media.pm:1607
-#: ../urpm/media.pm:1758
-#, c-format
-msgid "...retrieving failed: %s"
-msgstr "การอ่านข้อมูลล้มเหลว: %s"
-
-#: ../gurpmi2:388
+#: ../gurpmi2:307
 #, fuzzy, c-format
 msgid "_Done"
 msgstr "ทำเรียบร้อยแล้ว"
 
-#: ../gurpmi2:405 ../urpm/main_loop.pm:82
+#: ../gurpmi2:324 ../urpm/main_loop.pm:82
 #, fuzzy, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
 "%s"
 msgstr "การติดตั้งไม่สำเร็จ"
 
-#: ../gurpmi2:408
+#: ../gurpmi2:327
 #, fuzzy, c-format
 msgid "You may want to update your urpmi database."
 msgstr ""
 "การติดตั้งล้มเหลวมีบางไฟล์ที่ขาดหายไป\n"
 "ขอแนะนำให้ทำการอัพเดตฐานข้อมูล urpmi"
 
-#: ../gurpmi2:412 ../urpm/main_loop.pm:286 ../urpm/main_loop.pm:480
+#: ../gurpmi2:331 ../urpm/main_loop.pm:287 ../urpm/main_loop.pm:579
 #, fuzzy, c-format
 msgid "Installation failed:"
 msgstr "การติดตั้งไม่สำเร็จ"
 
-#: ../gurpmi2:417
+#: ../gurpmi2:336
 #, c-format
 msgid "The package(s) are already installed"
 msgstr "ทุกอย่างได้ถูกติดตั้งเรียบร้อยแล้ว"
 
-#: ../gurpmi2:419
+#: ../gurpmi2:338
 #, c-format
 msgid "Installation finished"
 msgstr "install เสร็จเรียบร้อย"
 
-#: ../gurpmi2:420 ../urpm/install.pm:113 ../urpme:164
-#, fuzzy, c-format
-msgid "removing %s"
-msgstr "กำลังติดตั้ง %s"
-
-#: ../gurpmi2:431 ../urpmi:692
+#: ../gurpmi2:351 ../urpmi:692
 #, fuzzy, c-format
 msgid "restarting urpmi"
 msgstr "กำลังติดตั้ง $rpm\n"
@@ -393,77 +418,77 @@ msgstr ""
 msgid "While some packages may have been installed, there were failures.\n"
 msgstr ""
 
-#: ../urpm.pm:142
+#: ../urpm.pm:194
 #, fuzzy, c-format
 msgid "fail to create directory %s"
 msgstr "ไม่สามารถสร้างไดเร็คตอรี่ [%s] สำหรับรายงานบัก"
 
-#: ../urpm.pm:143
+#: ../urpm.pm:195
 #, c-format
 msgid "invalid owner for directory %s"
 msgstr ""
 
-#: ../urpm.pm:186
+#: ../urpm.pm:238
 #, fuzzy, c-format
 msgid "Can not download packages into %s"
 msgstr "กำลังติดตั้งแพ็คเก็จ %s"
 
-#: ../urpm.pm:202
+#: ../urpm.pm:254
 #, c-format
 msgid "Environment directory %s does not exist"
 msgstr ""
 
-#: ../urpm.pm:203 ../urpmf:243 ../urpmq:163
+#: ../urpm.pm:255 ../urpmf:243 ../urpmq:163
 #, c-format
 msgid "using specific environment on %s\n"
 msgstr ""
 
-#: ../urpm.pm:371
+#: ../urpm.pm:423
 #, fuzzy, c-format
 msgid "unable to open rpmdb"
 msgstr "ไม่สามารถเปิดแฟ้ม %s\n"
 
-#: ../urpm.pm:390
+#: ../urpm.pm:442
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "ชื่อ rpm fileไม่ถูกต้อง [%s]"
 
-#: ../urpm.pm:396
+#: ../urpm.pm:448
 #, fuzzy, c-format
 msgid "retrieving rpm file [%s] ..."
 msgstr "กำลังอ่านข้อมูลจากไฟล์ hdlists"
 
-#: ../urpm.pm:398 ../urpm/get_pkgs.pm:276
+#: ../urpm.pm:450 ../urpm/get_pkgs.pm:276
 #, c-format
 msgid "...retrieving done"
 msgstr "การอ่านข้อมูลเรียบร้อย"
 
-#: ../urpm.pm:406
+#: ../urpm.pm:458
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "ไม่สามารถใช้งาน rpm file [%s]"
 
-#: ../urpm.pm:411
+#: ../urpm.pm:463
 #, fuzzy, c-format
 msgid "unable to parse spec file %s [%s]"
 msgstr "ไม่สามารถใช้งาน \"%s\" ใน file [%s]"
 
-#: ../urpm.pm:419
+#: ../urpm.pm:471
 #, fuzzy, c-format
 msgid "unable to register rpm file"
 msgstr "ไม่สามารถใช้งาน rpm file [%s]"
 
-#: ../urpm.pm:421
+#: ../urpm.pm:473
 #, c-format
 msgid "Incompatible architecture for rpm [%s]"
 msgstr ""
 
-#: ../urpm.pm:425
+#: ../urpm.pm:477
 #, c-format
 msgid "error registering local packages"
 msgstr "ลงทะเบียน local package มีข้อผิดพลาด"
 
-#: ../urpm.pm:537
+#: ../urpm.pm:589
 #, c-format
 msgid "This operation is forbidden while running in restricted mode"
 msgstr ""
@@ -701,17 +726,17 @@ msgstr "กำลังติดตั้ง %s"
 msgid "retrieved %s"
 msgstr "การอ่านข้อมูลล้มเหลว: %s"
 
-#: ../urpm/download.pm:988
+#: ../urpm/download.pm:989
 #, c-format
 msgid "unknown protocol defined for %s"
 msgstr "ไม่รู้จักโปรโตคอลที่ระบุไว้%s"
 
-#: ../urpm/download.pm:1002
+#: ../urpm/download.pm:1003
 #, c-format
 msgid "no webfetch found, supported webfetch are: %s\n"
 msgstr ""
 
-#: ../urpm/download.pm:1017
+#: ../urpm/download.pm:1018
 #, c-format
 msgid "unable to handle protocol: %s"
 msgstr "ไม่สามารถใช้งานโปรโตคอล: %s"
@@ -731,53 +756,53 @@ msgstr "หา %s package ไม่พบ"
 msgid "retrieving rpm files from medium \"%s\"..."
 msgstr "ไม่สามารถอ่าน rpm file [%s] จาก \"%s\""
 
-#: ../urpm/install.pm:213
+#: ../urpm/install.pm:115 ../urpme:164
+#, fuzzy, c-format
+msgid "removing %s"
+msgstr "กำลังติดตั้ง %s"
+
+#: ../urpm/install.pm:215
 #, fuzzy, c-format
 msgid "unable to extract rpm from delta-rpm package %s"
 msgstr "ไม่สามารถที่จะลบแพ็คเกจ %s"
 
-#: ../urpm/install.pm:240
+#: ../urpm/install.pm:242
 #, c-format
 msgid "unable to install package %s"
 msgstr "ไม่สามารถติดตั้งแพ็คเกจ %s"
 
-#: ../urpm/install.pm:243
+#: ../urpm/install.pm:245
 #, fuzzy, c-format
 msgid "removing bad rpm (%s) from %s"
 msgstr "กำลังติดตั้ง %s\n"
 
-#: ../urpm/install.pm:244 ../urpm/install.pm:370
+#: ../urpm/install.pm:246 ../urpm/install.pm:375
 #, fuzzy, c-format
 msgid "removing %s failed: %s"
 msgstr "การอ่านข้อมูลล้มเหลว: %s"
 
-#: ../urpm/install.pm:294
-#, fuzzy, c-format
-msgid "Removing package %s"
-msgstr "กำลังติดตั้งแพ็คเก็จ %s"
-
-#: ../urpm/install.pm:295
+#: ../urpm/install.pm:296
 #, fuzzy, c-format
 msgid "removing package %s"
 msgstr "กำลังติดตั้งแพ็คเก็จ %s"
 
-#: ../urpm/install.pm:338
+#: ../urpm/install.pm:343
 #, c-format
 msgid ""
 "created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
 msgstr ""
 
-#: ../urpm/install.pm:341
+#: ../urpm/install.pm:346
 #, fuzzy, c-format
 msgid "unable to create transaction"
 msgstr "ไม่สามารถสร้างข้อมูลเฉพาะตัวของผู้ใช้สำหรับ ssh"
 
-#: ../urpm/install.pm:368
+#: ../urpm/install.pm:373
 #, fuzzy, c-format
 msgid "removing installed rpms (%s) from %s"
 msgstr "กำลังติดตั้ง %s\n"
 
-#: ../urpm/install.pm:377
+#: ../urpm/install.pm:382
 #, fuzzy, c-format
 msgid "More information on package %s"
 msgstr "ข้อมูลเพื่มเติมบนแพกเกจ..."
@@ -869,8 +894,8 @@ msgstr "แพ็คเกจต่อไปนี้มี signatures ที่
 msgid "Do you want to continue installation ?"
 msgstr "คุณยังต้องการจะติดตั้งอีกต่อไปหรือไม่ ?"
 
-#: ../urpm/main_loop.pm:155 ../urpm/main_loop.pm:184 ../urpm/main_loop.pm:288
-#: ../urpm/main_loop.pm:296
+#: ../urpm/main_loop.pm:155 ../urpm/main_loop.pm:184 ../urpm/main_loop.pm:289
+#: ../urpm/main_loop.pm:297
 #, c-format
 msgid "Installation failed"
 msgstr "การติดตั้งไม่สำเร็จ"
@@ -885,37 +910,37 @@ msgstr "กำลังติดตั้ง %s\n"
 msgid "Try to continue anyway?"
 msgstr ""
 
-#: ../urpm/main_loop.pm:234
+#: ../urpm/main_loop.pm:235
 #, fuzzy, c-format
 msgid "installing %s from %s"
 msgstr "กำลังติดตั้ง %s\n"
 
-#: ../urpm/main_loop.pm:236
+#: ../urpm/main_loop.pm:237
 #, fuzzy, c-format
 msgid "installing %s"
 msgstr "กำลังติดตั้ง %s\n"
 
-#: ../urpm/main_loop.pm:243
+#: ../urpm/main_loop.pm:244
 #, fuzzy, c-format
 msgid "distributing %s"
 msgstr "กำลังติดตั้ง %s\n"
 
-#: ../urpm/main_loop.pm:289
+#: ../urpm/main_loop.pm:290
 #, fuzzy, c-format
 msgid "Try installation without checking dependencies?"
 msgstr "ต้องการทดลองติดตั้งโดยที่ไม่ต้องตรอจสอบความเข้ากันได้? (y/N)"
 
-#: ../urpm/main_loop.pm:297
+#: ../urpm/main_loop.pm:298
 #, fuzzy, c-format
 msgid "Try harder to install (--force)?"
 msgstr "ต้องการทดลองบังคับติดตั้ง (--force)? (y/N)"
 
-#: ../urpm/main_loop.pm:490
+#: ../urpm/main_loop.pm:589
 #, c-format
 msgid "Packages are up to date"
 msgstr ""
 
-#: ../urpm/main_loop.pm:501 ../urpm/parallel.pm:299
+#: ../urpm/main_loop.pm:600 ../urpm/parallel.pm:299
 #, c-format
 msgid "Installation is possible"
 msgstr "การติดตั้งสามารถทำได้"
@@ -972,227 +997,227 @@ msgid ""
 "update, --use-distrib or --parallel"
 msgstr ""
 
-#: ../urpm/media.pm:782
+#: ../urpm/media.pm:779
 #, c-format
 msgid "Search start: %s end: %s"
 msgstr ""
 
-#: ../urpm/media.pm:799
+#: ../urpm/media.pm:796
 #, fuzzy, c-format
 msgid "skipping package %s"
 msgstr "กำลังติดตั้งแพ็คเก็จ %s"
 
-#: ../urpm/media.pm:815
+#: ../urpm/media.pm:812
 #, fuzzy, c-format
 msgid "would install instead of upgrade package %s"
 msgstr "ปัญหาการติดตั้งแพ็คเก็จ %s"
 
-#: ../urpm/media.pm:898
+#: ../urpm/media.pm:895
 #, c-format
 msgid "medium \"%s\" already exists"
 msgstr "อุปกรณ์\"%s\"มีอยู่แล้ว"
 
-#: ../urpm/media.pm:940
+#: ../urpm/media.pm:937
 #, c-format
 msgid "(ignored by default)"
 msgstr ""
 
-#: ../urpm/media.pm:946
+#: ../urpm/media.pm:943
 #, fuzzy, c-format
 msgid "adding medium \"%s\" before remote medium \"%s\""
 msgstr "กำลังทำการอ่าน headers จากอุปกรณ์\"%s\""
 
-#: ../urpm/media.pm:952
+#: ../urpm/media.pm:949
 #, fuzzy, c-format
 msgid "adding medium \"%s\""
 msgstr "กำลังทำการย้ายออกอุปกรณ์\"%s\""
 
-#: ../urpm/media.pm:976
+#: ../urpm/media.pm:973
 #, fuzzy, c-format
 msgid "failed to copy media.cfg to %s (%d)"
 msgstr "ไม่สามารถเปิดแฟ้ม %s\n"
 
-#: ../urpm/media.pm:1047
+#: ../urpm/media.pm:1044
 #, c-format
 msgid "directory %s does not exist"
 msgstr ""
 
-#: ../urpm/media.pm:1055
+#: ../urpm/media.pm:1052
 #, c-format
 msgid "this location doesn't seem to contain any distribution"
 msgstr ""
 
-#: ../urpm/media.pm:1079
+#: ../urpm/media.pm:1076
 #, fuzzy, c-format
 msgid "unable to parse media.cfg"
 msgstr "ไม่สามารถเปิดแฟ้ม %s\n"
 
-#: ../urpm/media.pm:1082
+#: ../urpm/media.pm:1079
 #, fuzzy, c-format
 msgid "unable to access the distribution medium (no media.cfg file found)"
 msgstr "ไม่สามารถที่จะเข้าถึงอุปกรณ์เพื่อการติดตั้งตัวแรก (ไม่พบไฟล์ hdlists)"
 
-#: ../urpm/media.pm:1103
+#: ../urpm/media.pm:1100
 #, c-format
 msgid "skipping non compatible media `%s' (for %s)"
 msgstr ""
 
-#: ../urpm/media.pm:1118
+#: ../urpm/media.pm:1115
 #, fuzzy, c-format
 msgid "ignoring non-free medium `%s'"
 msgstr "กำลังทำการย้ายออกอุปกรณ์\"%s\""
 
-#: ../urpm/media.pm:1167
+#: ../urpm/media.pm:1164
 #, fuzzy, c-format
 msgid "retrieving media.cfg file..."
 msgstr "กำลังอ่านข้อมูลจากไฟล์ hdlists"
 
-#: ../urpm/media.pm:1210
+#: ../urpm/media.pm:1207
 #, fuzzy, c-format
 msgid "trying to select nonexistent medium \"%s\""
 msgstr "กำลังเลี่ยงการทำงานของอุปกรณ์ \"%s\""
 
-#: ../urpm/media.pm:1213
+#: ../urpm/media.pm:1210
 #, c-format
 msgid "selecting multiple media: %s"
 msgstr "พยายามที่จะเลือกใช้มีเดียหลายๆตัว: %s"
 
-#: ../urpm/media.pm:1272
+#: ../urpm/media.pm:1269
 #, c-format
 msgid "removing medium \"%s\""
 msgstr "กำลังทำการย้ายออกอุปกรณ์\"%s\""
 
-#: ../urpm/media.pm:1363
+#: ../urpm/media.pm:1360
 #, fuzzy, c-format
 msgid "reconfiguring urpmi for media \"%s\""
 msgstr "กำลังเขียน list file สำหรับอุปกรณ์\"%s\""
 
-#: ../urpm/media.pm:1397
+#: ../urpm/media.pm:1394
 #, fuzzy, c-format
 msgid "...reconfiguration failed"
 msgstr "บัันทึกการตั้งค่าเมนูแล้ว"
 
-#: ../urpm/media.pm:1403
+#: ../urpm/media.pm:1400
 #, fuzzy, c-format
 msgid "reconfiguration done"
 msgstr "คอนฟิกเซอเวอร์"
 
-#: ../urpm/media.pm:1419
+#: ../urpm/media.pm:1416
 #, c-format
 msgid "Error generating names file: dependency %d not found"
 msgstr ""
 
-#: ../urpm/media.pm:1440
+#: ../urpm/media.pm:1437
 #, fuzzy, c-format
 msgid "medium \"%s\" is up-to-date"
 msgstr "อุปกรณ์ \"%s\" ไม่ได้ถูกเลือก"
 
-#: ../urpm/media.pm:1451
+#: ../urpm/media.pm:1448
 #, c-format
 msgid "examining synthesis file [%s]"
 msgstr "กำลังตรวจสอบไฟล์ synthesis [%s]"
 
-#: ../urpm/media.pm:1471
+#: ../urpm/media.pm:1468
 #, c-format
 msgid "problem reading synthesis file of medium \"%s\""
 msgstr "มีปัญหาในการอ่านไฟล์ synthesis สำหรับอุปกรณ์\"%s\""
 
-#: ../urpm/media.pm:1484 ../urpm/media.pm:1579
+#: ../urpm/media.pm:1481 ../urpm/media.pm:1576
 #, fuzzy, c-format
 msgid "copying [%s] for medium \"%s\"..."
 msgstr "กำลังเขียน list file สำหรับอุปกรณ์\"%s\""
 
-#: ../urpm/media.pm:1486 ../urpm/media.pm:1556 ../urpm/media.pm:1809
+#: ../urpm/media.pm:1483 ../urpm/media.pm:1553 ../urpm/media.pm:1806
 #, fuzzy, c-format
 msgid "...copying failed"
 msgstr "การคัดลอกสมบูรณ์"
 
-#: ../urpm/media.pm:1552
+#: ../urpm/media.pm:1549
 #, c-format
 msgid "copying description file of \"%s\"..."
 msgstr "กำลังคัดลอกคำอธิบายไฟล์ของ \"%s\"..."
 
-#: ../urpm/media.pm:1554 ../urpm/media.pm:1583
+#: ../urpm/media.pm:1551 ../urpm/media.pm:1580
 #, c-format
 msgid "...copying done"
 msgstr "การคัดลอกสมบูรณ์"
 
-#: ../urpm/media.pm:1585
+#: ../urpm/media.pm:1582
 #, fuzzy, c-format
 msgid "copy of [%s] failed (file is suspiciously small)"
 msgstr "การทำสำเนา [%s] ไม่สำเร็จ"
 
-#: ../urpm/media.pm:1633
+#: ../urpm/media.pm:1630
 #, fuzzy, c-format
 msgid "computing md5sum of retrieved source synthesis"
 msgstr "การดึงโค้ดจาก hdlist (หรือ synthesis)ล้มเหลว"
 
-#: ../urpm/media.pm:1635 ../urpm/media.pm:2118
+#: ../urpm/media.pm:1632 ../urpm/media.pm:2115
 #, fuzzy, c-format
 msgid "retrieval of [%s] failed (md5sum mismatch)"
 msgstr "การทำสำเนา [%s] ไม่สำเร็จ"
 
-#: ../urpm/media.pm:1650
+#: ../urpm/media.pm:1647
 #, fuzzy, c-format
 msgid "genhdlist2 failed on %s"
 msgstr "กำลังตรวจสอบไฟล์ hdlist [%s]"
 
-#: ../urpm/media.pm:1660
+#: ../urpm/media.pm:1657
 #, fuzzy, c-format
 msgid "comparing %s and %s"
 msgstr "กำลังติดตั้ง %s\n"
 
-#: ../urpm/media.pm:1690
+#: ../urpm/media.pm:1687
 #, fuzzy, c-format
 msgid "invalid hdlist file %s for medium \"%s\""
 msgstr "ไม่พบ hdlist file สำหรับอุปกรณ์\"%s\""
 
-#: ../urpm/media.pm:1716
+#: ../urpm/media.pm:1713
 #, fuzzy, c-format
 msgid "copying MD5SUM file of \"%s\"..."
 msgstr "กำลังคัดลอกคำอธิบายไฟล์ของ \"%s\"..."
 
-#: ../urpm/media.pm:1756
+#: ../urpm/media.pm:1753
 #, fuzzy, c-format
 msgid "invalid MD5SUM file (downloaded from %s)"
 msgstr "ชื่อ rpm fileไม่ถูกต้อง [%s]"
 
-#: ../urpm/media.pm:1759
+#: ../urpm/media.pm:1756
 #, fuzzy, c-format
 msgid "no metadata found for medium \"%s\""
 msgstr "ไม่พบ hdlist file สำหรับอุปกรณ์\"%s\""
 
-#: ../urpm/media.pm:1791
+#: ../urpm/media.pm:1788
 #, fuzzy, c-format
 msgid "retrieving source synthesis of \"%s\"..."
 msgstr "กำลังดึงโค้ด hdlist (หรือ synthesis) ของ \"%s\"..."
 
-#: ../urpm/media.pm:1857
+#: ../urpm/media.pm:1854
 #, fuzzy, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "กำลังคัดลอกคำอธิบายไฟล์ของ \"%s\"..."
 
-#: ../urpm/media.pm:1869
+#: ../urpm/media.pm:1866
 #, fuzzy, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr "ไม่สามารถเขียน list file ของ\"%s\""
 
-#: ../urpm/media.pm:1873
+#: ../urpm/media.pm:1870
 #, fuzzy, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "ไม่สามารถเขียน list file ของ\"%s\""
 
-#: ../urpm/media.pm:1914
+#: ../urpm/media.pm:1911
 #, fuzzy, c-format
 msgid "no synthesis file found for medium \"%s\""
 msgstr "ไม่พบ hdlist file สำหรับอุปกรณ์\"%s\""
 
-#: ../urpm/media.pm:1947
+#: ../urpm/media.pm:1944
 #, fuzzy, c-format
 msgid "updated medium \"%s\""
 msgstr "อุปกรณ์ที่ถูกเพิ่มเข้ามา %s"
 
-#: ../urpm/media.pm:2112
+#: ../urpm/media.pm:2109
 #, c-format
 msgid "retrieval of [%s] failed"
 msgstr ""
@@ -1397,12 +1422,12 @@ msgstr ""
 msgid "unable to access medium \"%s\"."
 msgstr "ไม่สามารถใช้อุปกรณ์\"%s\""
 
-#: ../urpm/removable.pm:86 ../urpm/removable.pm:104
+#: ../urpm/removable.pm:86 ../urpm/removable.pm:101
 #, c-format
 msgid "mounting %s"
 msgstr "กำลังติดตั้ง %s"
 
-#: ../urpm/removable.pm:117
+#: ../urpm/removable.pm:113
 #, c-format
 msgid "unmounting %s"
 msgstr "กำลังถอดถอน %s"
@@ -1527,37 +1552,37 @@ msgstr ""
 msgid "Medium without key (%s)"
 msgstr ""
 
-#: ../urpm/sys.pm:211
+#: ../urpm/sys.pm:194
 #, c-format
 msgid "system"
 msgstr ""
 
-#: ../urpm/sys.pm:248
+#: ../urpm/sys.pm:231
 #, c-format
 msgid "You should restart your computer for %s"
 msgstr ""
 
-#: ../urpm/sys.pm:250
+#: ../urpm/sys.pm:233
 #, c-format
 msgid "You should restart your session for %s"
 msgstr ""
 
-#: ../urpm/sys.pm:252
+#: ../urpm/sys.pm:235
 #, c-format
 msgid "You should restart %s for %s"
 msgstr ""
 
-#: ../urpm/sys.pm:390
+#: ../urpm/sys.pm:373
 #, fuzzy, c-format
 msgid "Can't write file"
 msgstr "ไม่สามารถเขียน config file [%s]"
 
-#: ../urpm/sys.pm:390
+#: ../urpm/sys.pm:373
 #, fuzzy, c-format
 msgid "Can't open file"
 msgstr "ล็อกอินล้มเหลว"
 
-#: ../urpm/sys.pm:403
+#: ../urpm/sys.pm:386
 #, fuzzy, c-format
 msgid "Can't move file %s to %s"
 msgstr "ล็อกอินล้มเหลว"
@@ -2420,27 +2445,6 @@ msgstr ""
 msgid "(test only, installation will not be actually done)"
 msgstr ""
 
-#: ../urpmi:615
-#, c-format
-msgid "%s of additional disk space will be used."
-msgstr ""
-
-#: ../urpmi:616
-#, c-format
-msgid "%s of disk space will be freed."
-msgstr ""
-
-#: ../urpmi:617
-#, c-format
-msgid "%s of packages will be retrieved."
-msgstr ""
-
-#: ../urpmi:618
-#, c-format
-msgid "Proceed with the installation of one package?"
-msgid_plural "Proceed with the installation of the %d packages?"
-msgstr[0] ""
-
 #: ../urpmi:640
 #, fuzzy, c-format
 msgid "Press Enter when mounted..."
@@ -2997,6 +3001,10 @@ msgstr "เครื่องมือติดตั้งโปรแกรม
 msgid "Graphical front end to install RPM files"
 msgstr "ส่วนติดต่อผู้ใช้แบบ graphic ของโปรแกรมเพิ่มแพคเก็จ"
 
+#~ msgid "(%d package, %d MB)"
+#~ msgid_plural "(%d packages, %d MB)"
+#~ msgstr[0] "(แพ็คเก็จ %d ชุด, %d MB)"
+
 #, fuzzy
 #~ msgid "  --repackage    - Re-package the files before erasing\n"
 #~ msgstr "  --list         - แสดงรายชื่อแพ็คเกจที่มีอยู่\n"
@@ -3115,9 +3123,6 @@ msgstr "ส่วนติดต่อผู้ใช้แบบ graphic ขอ
 #~ "การติดตั้งล้มเหลวมีบางไฟล์ที่ขาดหายไป\n"
 #~ "ขอแนะนำให้ทำการอัพเดตฐานข้อมูล urpmi"
 
-#~ msgid "Cancel"
-#~ msgstr "ยกเลิก"
-
 #, fuzzy
 #~ msgid "Cannot write DUDF file.\n"
 #~ msgstr "ไม่สามารถเขียน config file [%s]"