diff -Nru language-pack-th-18.04+20200123/data/th/LC_MESSAGES/apport.po language-pack-th-18.04+20200702/data/th/LC_MESSAGES/apport.po
--- language-pack-th-18.04+20200123/data/th/LC_MESSAGES/apport.po	2020-01-23 16:55:56.000000000 +0000
+++ language-pack-th-18.04+20200702/data/th/LC_MESSAGES/apport.po	2020-07-08 13:58:08.000000000 +0000
@@ -7,703 +7,545 @@
 msgstr ""
 "Project-Id-Version: apport\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-11-19 19:02+0000\n"
+"POT-Creation-Date: 2020-05-21 13:29+0000\n"
 "PO-Revision-Date: 2017-10-15 15:48+0000\n"
 "Last-Translator: Rockworld <sumoisrock@gmail.com>\n"
 "Language-Team: Thai <th@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2020-01-23 11:31+0000\n"
-"X-Generator: Launchpad (build b8d1327fd820d6bf500589d6da587d5037c7d88e)\n"
+"X-Launchpad-Export-Date: 2020-07-02 11:18+0000\n"
+"X-Generator: Launchpad (build 1cbd0aa39df153c901321817f9b57cf3f232b507)\n"
 "Language: th\n"
 
-#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:144
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:144
-#: ../apport/ui.py:144
-#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:144
-msgid "This package does not seem to be installed correctly"
-msgstr "ดูเหมือนว่าแพคเกจนี้จะไม่ได้ถูกติดตั้งอย่างถูกต้อง"
+#: ../gtk/apport-gtk.desktop.in.h:1 ../kde/apport-kde.desktop.in.h:1
+#: ../kde/apport-kde-mime.desktop.in.h:1
+msgid "Report a problem..."
+msgstr "รายงานปัญหา..."
 
-#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:149
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:149
-#: ../apport/ui.py:149
-#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:149
-#, python-format
+#: ../gtk/apport-gtk.desktop.in.h:2 ../kde/apport-kde.desktop.in.h:2
+#: ../kde/apport-kde-mime.desktop.in.h:2
+msgid "Report a malfunction to the developers"
+msgstr "รายงานการทำงานผิดพลาดไปที่เหล่านักพัฒนา"
+
+#: ../debian/tmp/usr/share/apport/kernel_oops.py:29 ../data/kernel_oops.py:29
+msgid "Your system might become unstable now and might need to be restarted."
+msgstr "ระบบของคุณอาจไม่เสถียรแล้วในขณะนี้ และต้องเริ่มการทำงานของระบบใหม่"
+
+#: ../kde/apport-kde-mimelnk.desktop.in.h:1
+msgid "Apport crash file"
+msgstr "แฟ้มความล้มเหลว Apport"
+
+#: ../debian/tmp/usr/share/apport/apportcheckresume.py:67
+#: ../data/apportcheckresume.py:67
 msgid ""
-"This is not an official %s package. Please remove any third party package "
-"and try again."
+"This occurred during a previous suspend, and prevented the system from "
+"resuming properly."
 msgstr ""
-"นี่ไม่ใช่แพกเกจ %s ทางการ โปรดลบแพกเกจบุคคลที่สามใด ๆ ออกและลองอีกครั้ง"
+"นี่เกิดขึ้นระหว่างการพักเครื่องครั้งที่ผ่านมา "
+"และป้องกันไม่ให้ระบบทำงานต่อได้อย่างถูกต้อง"
 
-#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:166
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:166
-#: ../apport/ui.py:166
-#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:166
-#, python-format
+#: ../debian/tmp/usr/share/apport/apportcheckresume.py:69
+#: ../data/apportcheckresume.py:69
 msgid ""
-"You have some obsolete package versions installed. Please upgrade the "
-"following packages and check if the problem still occurs:\n"
-"\n"
-"%s"
+"This occurred during a previous hibernation, and prevented the system from "
+"resuming properly."
 msgstr ""
-"คุณมีแพกเกจเก่าติดตั้งอยู่ "
-"โปรดปรับรุ่นแพกเกจต่อไปนี้แล้วตรวจสอบปัญหาที่อาจเกิดขึ้น:\n"
-"\n"
-"%s"
+"นี่เกิดขึ้นระหว่างการไฮเบอร์เนตครั้งที่ผ่านมา "
+"และป้องกันไม่ให้ระบบทำงานต่อได้อย่างถูกต้อง"
 
-#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:303
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:303
-#: ../apport/ui.py:303
-#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:303
-msgid "unknown program"
-msgstr "โปรแกรมนี้ไม่รู้จัก"
+#: ../debian/tmp/usr/share/apport/apportcheckresume.py:74
+#: ../data/apportcheckresume.py:74
+msgid ""
+"The resume processing hung very near the end and will have appeared to have "
+"completed normally."
+msgstr ""
+"การดำเนินการที่กำลังจะดำเนินการต่อไปนั้นหยุดทำงานชั่วคราวเมื่อใกล้จะจบแล้ว "
+"และจะเสร็จสมบูรณ์โดยปกติ"
 
-#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:304
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:304
-#: ../apport/ui.py:304
-#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:304
-#, python-format
-msgid "Sorry, the program \"%s\" closed unexpectedly"
-msgstr "ขออภัย โปรแกรม \"%s\" ปิดลงโดยไม่คาดหมาย"
+#: ../debian/tmp/usr/bin/apport-retrace.py:34 ../bin/apport-retrace.py:34
+msgid "Do not put the new traces into the report, but write them to stdout."
+msgstr "ไม่ต้องเพิ่มการติดตามใหม่ลงในรายงาน แต่ให้เขียนไปที่ stdout"
 
-#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:306
-#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:1427
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:306
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1427
-#: ../apport/ui.py:306 ../apport/ui.py:1427
-#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:306
-#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1427
-#, python-format
-msgid "Problem in %s"
-msgstr "ปัญหาใน %s"
+#: ../debian/tmp/usr/bin/apport-retrace.py:36 ../bin/apport-retrace.py:36
+msgid ""
+"Start an interactive gdb session with the report's core dump (-o ignored; "
+"does not rewrite report)"
+msgstr ""
+"เริ่มวาระ gdb แบบโต้ตอบพร้อมบันทึกหลักของรายงาน (ละเว้น -o; "
+"ไม่ต้องเขียนรายงานใหม่)"
 
-#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:307
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:307
-#: ../apport/ui.py:307
-#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:307
+#: ../debian/tmp/usr/bin/apport-retrace.py:38 ../bin/apport-retrace.py:38
 msgid ""
-"Your computer does not have enough free memory to automatically analyze the "
-"problem and send a report to the developers."
+"Write modified report to given file instead of changing the original report"
 msgstr ""
-"ระบบของคุณไม่มีหน่วยความจำเหลือเพีัยงพอที่จะทำการตรวจสอบ, วิเคราะปัญหา "
-"และส่งรายงานกลับไปที่นักพัฒนาได้"
+"เขียนรายงานที่ปรับเปลี่ยนไปที่แฟ้มที่ระบุแทนที่จะเปลี่ยนรายงานดั้งเดิม"
 
-#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:362
-#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:370
-#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:513
-#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:516
-#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:721
-#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:1233
-#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:1399
-#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:1403
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:362
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:370
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:513
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:516
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:721
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1233
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1399
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1403
-#: ../apport/ui.py:362 ../apport/ui.py:370 ../apport/ui.py:513
-#: ../apport/ui.py:516 ../apport/ui.py:721 ../apport/ui.py:1233
-#: ../apport/ui.py:1399 ../apport/ui.py:1403
-#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:362
-#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:370
-#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:513
-#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:516
-#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:721
-#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1233
-#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1399
-#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1403
-msgid "Invalid problem report"
-msgstr "รายงานปัญหาไม่ถูกต้อง"
+#: ../debian/tmp/usr/bin/apport-retrace.py:41 ../bin/apport-retrace.py:41
+msgid "Remove the core dump from the report after stack trace regeneration"
+msgstr "เอาบันทึกหลักออกจากรายงานหลังจากที่สร้างการติดตามสแตกใหม่แล้ว"
 
-#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:363
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:363
-#: ../apport/ui.py:363
-#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:363
-msgid "You are not allowed to access this problem report."
-msgstr "คุณไม่ได้รับอนุญาตให้ดูรายงานปัญหานี้"
+#: ../debian/tmp/usr/bin/apport-retrace.py:43 ../bin/apport-retrace.py:43
+msgid "Override report's CoreFile"
+msgstr "แทนที่ CoreFile ของรายงาน"
 
-#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:366
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:366
-#: ../apport/ui.py:366
-#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:366
-msgid "Error"
-msgstr "ผิดพลาด"
+#: ../debian/tmp/usr/bin/apport-retrace.py:45 ../bin/apport-retrace.py:45
+msgid "Override report's ExecutablePath"
+msgstr "แทนที่ ExecutablePath ของรายงาน"
 
-#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:367
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:367
-#: ../apport/ui.py:367
-#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:367
-msgid "There is not enough disk space available to process this report."
-msgstr "พื้นที่ว่างบนดิืสไม่พอสำหรับดำเนินการกับรายงานนี้ได้"
+#: ../debian/tmp/usr/bin/apport-retrace.py:47 ../bin/apport-retrace.py:47
+msgid "Override report's ProcMaps"
+msgstr "แทนที่ ProcMaps ของรายงาน"
 
-#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:461
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:461
-#: ../apport/ui.py:461
-#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:461
-msgid "No package specified"
-msgstr "ไม่ได้ระบุแพกเกจ"
+#: ../debian/tmp/usr/bin/apport-retrace.py:49 ../bin/apport-retrace.py:49
+msgid "Rebuild report's Package information"
+msgstr "สร้างรายงานข้อมูลแพกเกจใหม่"
 
-#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:462
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:462
-#: ../apport/ui.py:462
-#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:462
+#: ../debian/tmp/usr/bin/apport-retrace.py:51 ../bin/apport-retrace.py:51
 msgid ""
-"You need to specify a package or a PID. See --help for more information."
-msgstr "คุณต้องระบุแพกเกจสักตัวหรือเลข PID ดู --help สำหรับข้อมูลเพิ่มเติม"
-
-#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:491
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:491
-#: ../apport/ui.py:491
-#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:491
-msgid "Permission denied"
-msgstr "ไม่ได้รับสิทธิ์"
+"Build a temporary sandbox and download/install the necessary packages and "
+"debug symbols in there; without this option it assumes that the necessary "
+"packages and debug symbols are already installed in the system. The argument "
+"points to the packaging system configuration base directory; if you specify "
+"\"system\", it will use the system configuration files, but will then only "
+"be able to retrace crashes that happened on the currently running release."
+msgstr ""
+"สร้าง Sandbox "
+"แบบชั่วคราวและดาวน์โหลด/ติดตั้งแพกเกจที่จำเป็นและสัญลักษณ์การดีบั๊กในนั้น "
+"ถ้าไม่ใช้ตัวเลือกนี้ "
+"จะถือว่าแพกเกจที่จำเป็นและสัญลักษณ์การดีบั๊กได้ถูกติดตั้งไว้ในระบบแล้ว "
+"อาร์กิวเมนต์จะบ่งชี้ไปที่ไดเรกทอรีพื้นฐานการกำหนดค่าระบบแพกเกจ ถ้าคุณระบุ "
+"\"system\" ก็จะใช้เพียงแฟ้มกำหนดค่าของระบบ "
+"แต่จะสามารถทำได้เพียงติดตามความล้มเหลวที่เกิดขึ้นเมื่อใช้รุ่นที่กำลังใช้งานอย"
+"ู่ในขณะนี้เท่านั้น"
 
-#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:492
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:492
-#: ../apport/ui.py:492
-#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:492
+#: ../debian/tmp/usr/bin/apport-retrace.py:53 ../bin/apport-retrace.py:53
 msgid ""
-"The specified process does not belong to you. Please run this program as the "
-"process owner or as root."
+"Build another temporary sandbox for installing gdb and its dependencies "
+"using the same release as the report rather than whatever version of gdb you "
+"have installed."
 msgstr ""
-"กระบวนการที่ระบุไม่ใช่ของคุณ "
-"โปรดเรียกใช้โปรแกรมนี้ในฐานะเจ้าของกระบวนการหรือในฐานะผู้ดูแลระบบขั้นสูง"
+"สร้าง Sandbox ใหม่ชั่วคราวสำหรับติดตั้ง gdb และแพกเกจอื่นๆ "
+"ที่เกี่ยวข้องโดยใช้รุ่นเดียวกับรายงานแทน gdb รุ่นที่คุณได้ติดตั้งไว้"
 
-#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:405
-#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:494
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:405
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:494
-#: ../apport/ui.py:405 ../apport/ui.py:494
-#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:405
-#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:494
-msgid "Invalid PID"
-msgstr "PID ไม่ถูกต้อง"
+#: ../debian/tmp/usr/bin/apport-retrace.py:55 ../bin/apport-retrace.py:55
+msgid ""
+"Report download/install progress when installing packages into sandbox"
+msgstr ""
+"รายงานความคืบหน้าในการดาวน์โหลด/ติดตั้งระหว่างติดตั้งแพกเกจไปที่ Sandbox"
 
-#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:495
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:495
-#: ../apport/ui.py:495
-#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:495
-msgid "The specified process ID does not belong to a program."
-msgstr "ID ของกระบวนการที่ระบุไม่ใช่ของโปรแกรมใด"
+#: ../debian/tmp/usr/bin/apport-retrace.py:57 ../bin/apport-retrace.py:57
+msgid "Prepend timestamps to log messages, for batch operation"
+msgstr "ขึ้นต้นการประทับเวลาในข้อความปูม สำหรับดำเนินการชุดงาน"
 
-#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:514
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:514
-#: ../apport/ui.py:514
-#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:514
-#, python-format
-msgid "Symptom script %s did not determine an affected package"
-msgstr "สคริปต์อาการ %s ไม่ได้กำหนดแพกเกจที่ได้รับผลกระทบ"
+#: ../debian/tmp/usr/bin/apport-retrace.py:59 ../bin/apport-retrace.py:59
+msgid ""
+"Create and use third-party repositories from origins specified in reports"
+msgstr "สร้างและใช้ที่เก็บจากบุคคลที่สามจากแหล่งข้อมูลที่ระบุไว้ในรายงาน"
 
-#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:517
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:517
-#: ../apport/ui.py:517
-#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:517
-#, python-format
-msgid "Package %s does not exist"
-msgstr "ไม่มีแพกเกจ %s อยู่"
+#: ../debian/tmp/usr/bin/apport-retrace.py:61 ../bin/apport-retrace.py:61
+msgid "Cache directory for packages downloaded in the sandbox"
+msgstr "ไดเรกทอรีแคชสำหรับแพกเกจที่ดาวน์โหลดใน Sandbox"
 
-#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:546
-#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:733
-#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:738
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:546
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:733
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:738
-#: ../apport/ui.py:546 ../apport/ui.py:733 ../apport/ui.py:738
-#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:546
-#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:733
-#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:738
-msgid "Cannot create report"
-msgstr "ไม่สามารถสร้างรายงานได้"
+#: ../debian/tmp/usr/bin/apport-retrace.py:63 ../bin/apport-retrace.py:63
+msgid ""
+"Directory for unpacked packages. Future runs will assume that any already "
+"downloaded package is also extracted to this sandbox."
+msgstr ""
+"ไดเรกทอรีสำหรับแพกเกจที่ยังไม่ได้แยก "
+"การเรียกใช้งานครั้งต่อไปก็จะถือว่าแพกเกจที่ดาวน์โหลดไว้ถูกแยกไปที่ Sandbox "
+"แล้ว"
 
-#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:561
-#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:607
-#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:623
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:561
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:607
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:623
-#: ../apport/ui.py:561 ../apport/ui.py:607 ../apport/ui.py:623
-#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:561
-#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:607
-#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:623
-msgid "Updating problem report"
-msgstr "กำลังปรับข้อมูลรายงานปัญหา"
+#: ../bin/apport-valgrind.py:66 ../debian/tmp/usr/bin/apport-retrace.py:65
+#: ../debian/tmp/usr/bin/apport-valgrind.py:66 ../bin/apport-retrace.py:65
+msgid ""
+"Install an extra package into the sandbox (can be specified multiple times)"
+msgstr "ติดตั้งแพกเกจพิเศษไปที่ Sandbox (สามารถระบุได้หลายครั้ง)"
 
-#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:562
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:562
-#: ../apport/ui.py:562
-#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:562
+#: ../debian/tmp/usr/bin/apport-retrace.py:67 ../bin/apport-retrace.py:67
 msgid ""
-"You are not the reporter or subscriber of this problem report, or the report "
-"is a duplicate or already closed.\n"
-"\n"
-"Please create a new report using \"apport-bug\"."
+"Path to a file with the crash database authentication information. This is "
+"used when specifying a crash ID to upload the retraced stack traces (only if "
+"neither -g, -o, nor -s are specified)"
 msgstr ""
-"คุณไม่ใช่ผู้รายงานหรือผู้ติดตามรายงานปัญหานี้ "
-"หรือรายงานนี้อาจมีการเชื่อมโยงซ้ำ หรือถูกปิดไปแล้ว\n"
-"\n"
-"โปรดสร้างรายงานใหม่โดยใช้ \"apport-bug\""
+"เส้นทางที่ไปยังแฟ้มที่มีข้อมูลการตรวจสอบความถูกต้องของฐานข้อมูลความล้มเหลว "
+"โดยจะถูกใช้เมื่อระบุ ID "
+"ความล้มเหลวเพื่ออัปโหลดการติดตามสแตกที่มีการติดตามใหม่ (เฉพาะเมื่อไม่ได้ระบุ "
+"-g, -o, หรือ -s)"
 
-#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:571
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:571
-#: ../apport/ui.py:571
-#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:571
+#: ../debian/tmp/usr/bin/apport-retrace.py:69 ../bin/apport-retrace.py:69
 msgid ""
-"You are not the reporter of this problem report. It is much easier to mark a "
-"bug as a duplicate of another than to move your comments and attachments to "
-"a new bug.\n"
-"\n"
-"Subsequently, we recommend that you file a new bug report using \"apport-"
-"bug\" and make a comment in this bug about the one you file.\n"
-"\n"
-"Do you really want to proceed?"
+"Display retraced stack traces and ask for confirmation before sending them "
+"to the crash database."
 msgstr ""
-"คุณไม่ใช้ผู้รายงานปัญหานี้ "
-"การที่คุณทำเครื่องหมายปัญหานี้ว่ามีการเชื่อมโยงซ้ำง่ายกว่าการที่คุณย้ายความคิ"
-"ดเห็นและสิ่งที่แนบมาไปยังปัญหาใหม่\n"
-"\n"
-"เราขอแนะนำให้คุณรายงานปัญหาใหม่โดยใช้ \"apport-bug\" "
-"แล้วสร้างความคิดเห็นเกี่ยวกับปัญหาที่คุณรายงานนี้\n"
-"\n"
-"คุณต้องการดำเนินการต่อไปหรือไม่?"
-
-#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:608
-#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:624
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:608
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:624
-#: ../apport/ui.py:608 ../apport/ui.py:624
-#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:608
-#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:624
-msgid "No additional information collected."
-msgstr "ไม่มีการรวบรวมข้อมูลเพิ่มเติมใด ๆ"
-
-#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:675
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:675
-#: ../apport/ui.py:675
-#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:675
-msgid "What kind of problem do you want to report?"
-msgstr "ปัญหาแบบใดที่คุณต้องการที่จะรายงาน?"
-
-#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:692
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:692
-#: ../apport/ui.py:692
-#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:692
-msgid "Unknown symptom"
-msgstr "อาการที่ไม่รู้จัก"
-
-#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:693
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:693
-#: ../apport/ui.py:693
-#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:693
-#, python-format
-msgid "The symptom \"%s\" is not known."
-msgstr "ไม่รู้จักอาการ \"%s\""
+"แสดงการติดตามสแตกที่ติดตามใหม่และร้องขอการยืนยันก่อนที่จะส่งไปที่ฐานข้อมูลควา"
+"มล้มเหลว"
 
-#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:724
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:724
-#: ../apport/ui.py:724
-#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:724
+#: ../debian/tmp/usr/bin/apport-retrace.py:71 ../bin/apport-retrace.py:71
 msgid ""
-"After closing this message please click on an application window to report a "
-"problem about it."
+"Path to the duplicate sqlite database (default: no duplicate checking)"
 msgstr ""
-"หลังจากที่ปิดข้อความนี้แล้ว โปรดคลิกบนหน้าต่างโปรแกรมเพื่อรายงานปัญหานี้"
+"เส้นทางที่ไปยังฐานข้อมูล sqlite ที่ทำซ้ำ (ค่าปริยาย: ไม่มีการตรวจสอบการทำซ้ำ)"
 
-#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:734
-#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:739
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:734
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:739
-#: ../apport/ui.py:734 ../apport/ui.py:739
-#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:734
-#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:739
-msgid "xprop failed to determine process ID of the window"
-msgstr "xprop ไม่สามารถกำหนด ID โปรเซสของหน้าต่างได้"
+#: ../debian/tmp/usr/bin/apport-retrace.py:73 ../bin/apport-retrace.py:73
+msgid "Do not add StacktraceSource to the report."
+msgstr ""
 
-#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:753
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:753
-#: ../apport/ui.py:753
-#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:753
-msgid "%prog <report number>"
-msgstr "%prog <report number>"
+#: ../debian/tmp/usr/bin/apport-retrace.py:82 ../bin/apport-retrace.py:82
+msgid "You cannot use -C without -S. Stopping."
+msgstr "คุณไม่สามารถใช้ -C โดยไม่ใช้ -S ได้ กำลังหยุดทำงาน"
 
-#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:755
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:755
-#: ../apport/ui.py:755
-#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:755
-msgid "Specify package name."
-msgstr "ระบุชื่อแพกเกจ"
+#. translators: don't translate y/n, apport currently only checks for "y"
+#: ../debian/tmp/usr/bin/apport-retrace.py:115 ../bin/apport-retrace.py:115
+msgid "OK to send these as attachments? [y/n]"
+msgstr "ต้องการส่งเป็นสิ่งที่แนบมาหรือไม่? [y/n]"
 
-#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:757
-#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:808
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:757
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:808
-#: ../apport/ui.py:757 ../apport/ui.py:808
-#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:757
-#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:808
-msgid "Add an extra tag to the report. Can be specified multiple times."
-msgstr "เพิ่มแท็กพิเศษไปในรายงาน สามารถระบุได้หลาย ๆ ครั้ง"
+#: ../bin/apport-valgrind.py:37 ../debian/tmp/usr/bin/apport-valgrind.py:37
+msgid "See man page for details."
+msgstr "ดูที่ Man page สำหรับรายละเอียดเพิ่มเติม"
 
-#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:787
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:787
-#: ../apport/ui.py:787
-#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:787
+#: ../bin/apport-valgrind.py:43 ../debian/tmp/usr/bin/apport-valgrind.py:43
+msgid "specify the log file name produced by valgrind"
+msgstr "ระบุชื่อแฟ้มปูมที่สร้างขึ้นโดย valgrind"
+
+#: ../bin/apport-valgrind.py:46 ../debian/tmp/usr/bin/apport-valgrind.py:46
 msgid ""
-"%prog [options] [symptom|pid|package|program path|.apport/.crash file]"
+"reuse a previously created sandbox dir (SDIR) or, if it does not exist, "
+"create it"
 msgstr ""
-"%prog [options] [symptom|pid|package|program path|.apport/.crash file]"
+"นำ ไดเรกทอรี Sandbox (SDIR) ที่สร้างไว้ก่อนหน้านี้มาใช้ใหม่ "
+"หรือสร้างขึ้นมาถ้าเกิดไม่มีอยู่"
 
-#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:790
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:790
-#: ../apport/ui.py:790
-#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:790
+#: ../bin/apport-valgrind.py:50 ../debian/tmp/usr/bin/apport-valgrind.py:50
 msgid ""
-"Start in bug filing mode. Requires --package and an optional --pid, or just "
-"a --pid. If neither is given, display a list of known symptoms. (Implied if "
-"a single argument is given.)"
+"do  not  create  or reuse a sandbox directory for additional debug symbols "
+"but rely only on installed debug symbols."
 msgstr ""
-"เริ่มทำงานในโหมดรายงานปัญหา ต้องใช้ --package และ --pid พร้อมตัวเลือก "
-"หรือเพียง --pid ถ้าไม่ใส่อาร์กิวเมนต์ดังกล่าว "
-"ให้แสดงรายการอาการที่รู้ว่าเกิดขึ้น (ไม่ทำงานถ้าใส่เพียงอาร์กิวเมนต์เดียว)"
-
-#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:792
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:792
-#: ../apport/ui.py:792
-#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:792
-msgid "Click a window as a target for filing a problem report."
-msgstr "คลิกหน้าต่างเพื่อเป็นเป้าหมายสำหรับรายงานปัญหา"
+"ไม่ต้องสร้างหรือนำไดเรกทอรี Sandbox มาใช้ใหม่สำหรับสัญลักษณ์การดีบั๊ก "
+"แต่ให้อ้างอิงเฉพาะสัญลักษณ์การดีบั๊กที่ติดตั้งเท่านั้น"
 
-#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:794
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:794
-#: ../apport/ui.py:794
-#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:794
-msgid "Start in bug updating mode. Can take an optional --package."
+#: ../bin/apport-valgrind.py:54 ../debian/tmp/usr/bin/apport-valgrind.py:54
+msgid ""
+"reuse a previously created cache dir (CDIR) or, if it does not exist, create "
+"it"
 msgstr ""
-"เริ่มทำงานในโหมดอัปเดตปัญหา สามารถใช้อาร์กิวเมนต์ --package พร้อมตัวเลือกได้"
+"ใช้ไดเรกทอรีแคช (CDIR) ที่สร้างไว้ก่อนหน้านี้มาใช้ใหม่ "
+"หรือสร้างขึ้นมาถ้าเกิดไม่มีอยู่"
 
-#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:796
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:796
-#: ../apport/ui.py:796
-#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:796
+#: ../bin/apport-valgrind.py:58 ../debian/tmp/usr/bin/apport-valgrind.py:58
 msgid ""
-"File a bug report about a symptom. (Implied if symptom name is given as only "
-"argument.)"
+"report download/install progress when installing packages into sandbox"
 msgstr ""
-"รายงานปัญหาเกี่ยวกับอาการ (ไม่ทำงานถ้าชื่ออาการถูกใส่เพียงอาร์กิวเมนต์)"
+"รายงานความคืบหน้าของการดาวน์โหลด/ติดตั้งระหว่างติดตั้งแพกเกจไปที่ Sandbox"
 
-#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:798
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:798
-#: ../apport/ui.py:798
-#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:798
+#: ../bin/apport-valgrind.py:62 ../debian/tmp/usr/bin/apport-valgrind.py:62
 msgid ""
-"Specify package name in --file-bug mode. This is optional if a --pid is "
-"specified. (Implied if package name is given as only argument.)"
+"the executable that is run under valgrind's memcheck tool  for memory leak "
+"detection"
 msgstr ""
-"ระบุชื่อแพกเกจในโหมด --file-bug ถ้าระบุ --pid นี่จะเป็นตัวเลือก "
-"(ไม่ทำงานถ้าชื่อแพกเกจถูกใส่เพียงอาร์กิวเมนต์)"
+"แฟ้มปฏิบัติการที่ทำงานภายใต้เครื่องมือตรวจสอบหน่วยความจำของ valgrind "
+"สำหรับตรวจหาการรั่วไหลของหน่วยความจำ"
+
+#: ../bin/apport-valgrind.py:97 ../debian/tmp/usr/bin/apport-valgrind.py:97
+#, python-format
+msgid "Error: %s is not an executable. Stopping."
+msgstr "ผิดพลาด: %s ไม่ใช่แฟ้มปฏิบัติการ กำลังหยุดทำงาน"
+
+#: ../debian/tmp/usr/bin/apport-unpack.py:22 ../bin/apport-unpack.py:22
+#, python-format
+msgid "Usage: %s <report> <target directory>"
+msgstr "ให้ใช้: %s <report> <target directory>"
+
+#: ../debian/tmp/usr/bin/apport-unpack.py:42 ../bin/apport-unpack.py:42
+msgid "Destination directory exists and is not empty."
+msgstr "ไดเรกทอรีปลายทางมีอยู่และไม่ว่างเปล่า"
 
-#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:800
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:800
-#: ../apport/ui.py:800
-#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:800
+#: ../debian/tmp/usr/bin/apport-cli.py:80 ../bin/apport-cli.py:80
+msgid "Press any key to continue..."
+msgstr "กดปุ่มใดๆ เพื่อดำเนินการต่อ..."
+
+#: ../debian/tmp/usr/bin/apport-cli.py:87 ../bin/apport-cli.py:87
+msgid "What would you like to do? Your options are:"
+msgstr "คุณต้องการทำอะไร? ตัวเลือกของคุณคือ:"
+
+#: ../debian/tmp/usr/bin/apport-cli.py:100 ../bin/apport-cli.py:100
+#, python-format
+msgid "Please choose (%s):"
+msgstr "โปรดเลือก (%s):"
+
+#: ../debian/tmp/usr/bin/apport-cli.py:164 ../bin/apport-cli.py:164
+#, python-format
+msgid "(%i bytes)"
+msgstr "(%i ไบต์)"
+
+#: ../debian/tmp/usr/share/apport/apport-kde.py:363
+#: ../debian/tmp/usr/share/apport/apport-gtk.py:146
+#: ../debian/tmp/usr/bin/apport-cli.py:166 ../kde/apport-kde.py:363
+#: ../gtk/apport-gtk.py:146 ../bin/apport-cli.py:166
+msgid "(binary data)"
+msgstr "(binary data)"
+
+#: ../debian/tmp/usr/share/apport/apport-kde.py:186
+#: ../debian/tmp/usr/share/apport/apport-gtk.py:181
+#: ../debian/tmp/usr/bin/apport-cli.py:194 ../kde/apport-kde.py:186
+#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:6 ../gtk/apport-gtk.ui.h:6
+#: ../gtk/apport-gtk.py:181 ../bin/apport-cli.py:194
+msgid "Send problem report to the developers?"
+msgstr "ต้องการส่งรายงานปัญหาไปยังนักพัฒนาหรือไม่?"
+
+#: ../debian/tmp/usr/bin/apport-cli.py:195 ../bin/apport-cli.py:195
 msgid ""
-"Specify a running program in --file-bug mode. If this is specified, the bug "
-"report will contain more information.  (Implied if pid is given as only "
-"argument.)"
+"After the problem report has been sent, please fill out the form in the\n"
+"automatically opened web browser."
 msgstr ""
-"ระบุโปรแกรมที่กำลังทำงานในโหมด --file-bug ถ้ามีการระบุ "
-"รายงานปัญหาจะประกอบด้วยข้อมูลเพิ่มเติม  (ไม่ทำงานถ้า pid "
-"ถูกใส่เพียงอาร์กิวเมนต์)"
+"หลังจากที่รายงานปัญหาถูกส่งไปแล้ว โปรดกรอกข้อมูลลงในแบบฟอร์ม\n"
+"ในโปรแกรมท่องเว็บที่เปิดขึ้นมาโดยอัตโนมัติ"
 
-#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:802
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:802
-#: ../apport/ui.py:802
-#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:802
-msgid "The provided pid is a hanging application."
-msgstr "pid ที่ระบุเป็นโปรแกรมที่ทำงานค้างอยู่"
+#: ../debian/tmp/usr/bin/apport-cli.py:198 ../bin/apport-cli.py:198
+#, python-format
+msgid "&Send report (%s)"
+msgstr "&ส่งรายงาน (%s)"
+
+#: ../debian/tmp/usr/bin/apport-cli.py:202 ../bin/apport-cli.py:202
+msgid "&Examine locally"
+msgstr "&ตรวจในเครื่อง"
+
+#: ../debian/tmp/usr/bin/apport-cli.py:206 ../bin/apport-cli.py:206
+msgid "&View report"
+msgstr "&ดูรายงาน"
+
+#: ../debian/tmp/usr/bin/apport-cli.py:207 ../bin/apport-cli.py:207
+msgid "&Keep report file for sending later or copying to somewhere else"
+msgstr "&เก็บแฟ้มรายงานไว้ส่งทีหลังหรือคัดลอกไปไว้ในที่อื่น ๆ"
+
+#: ../debian/tmp/usr/bin/apport-cli.py:208 ../bin/apport-cli.py:208
+msgid "Cancel and &ignore future crashes of this program version"
+msgstr "ยกเลิกและเพิกเ&ฉยต่อการขัดข้องครั้งหน้าของโปรแกรมรุ่นนี้"
+
+#: ../debian/tmp/usr/bin/apport-cli.py:210
+#: ../debian/tmp/usr/bin/apport-cli.py:287
+#: ../debian/tmp/usr/bin/apport-cli.py:319
+#: ../debian/tmp/usr/bin/apport-cli.py:340 ../bin/apport-cli.py:210
+#: ../bin/apport-cli.py:287 ../bin/apport-cli.py:319 ../bin/apport-cli.py:340
+msgid "&Cancel"
+msgstr "&ยกเลิก"
+
+#: ../debian/tmp/usr/bin/apport-cli.py:238 ../bin/apport-cli.py:238
+msgid "Problem report file:"
+msgstr "แฟ้มรายงานปัญหา:"
+
+#: ../debian/tmp/usr/bin/apport-cli.py:244
+#: ../debian/tmp/usr/bin/apport-cli.py:249 ../bin/apport-cli.py:244
+#: ../bin/apport-cli.py:249
+msgid "&Confirm"
+msgstr "&ยืนยัน"
 
-#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:804
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:804
-#: ../apport/ui.py:804
-#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:804
+#: ../debian/tmp/usr/bin/apport-cli.py:248 ../bin/apport-cli.py:248
 #, python-format
+msgid "Error: %s"
+msgstr "ผิดพลาด: %s"
+
+#: ../debian/tmp/usr/share/apport/apport-kde.py:407
+#: ../debian/tmp/usr/bin/apport-cli.py:254 ../kde/apport-kde.py:407
+#: ../bin/apport-cli.py:254
+msgid "Collecting problem information"
+msgstr "กำลังรวบรวมข้อมูลของปัญหา"
+
+#: ../debian/tmp/usr/bin/apport-cli.py:255 ../bin/apport-cli.py:255
 msgid ""
-"Report the crash from given .apport or .crash file instead of the pending "
-"ones in %s. (Implied if file is given as only argument.)"
+"The collected information can be sent to the developers to improve the\n"
+"application. This might take a few minutes."
 msgstr ""
-"รายงานความล้มเหลวจากแฟ้ม .apport หรือ .crash ที่ให้มาแทนที่กำลังรออยู่ใน %s "
-"(ไม่ทำงานถ้าแฟ้มถูกใส่เพียงอาร์กิวเมนต์)"
+"ข้อมูลที่รวบรวมมาสามารถส่งไปให้นักพัฒนาเพื่อให้ทำการปรับปรุงโปรแกรมได้\n"
+"การดำเนินการนี้จะใช้เวลาเพียงไม่กี่นาที"
+
+#: ../debian/tmp/usr/share/apport/apport-kde.py:435
+#: ../debian/tmp/usr/bin/apport-cli.py:267 ../kde/apport-kde.py:435
+#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:17 ../gtk/apport-gtk.ui.h:17
+#: ../bin/apport-cli.py:267
+msgid "Uploading problem information"
+msgstr "กำลังอัปโหลดข้อมูลปัญหา"
 
-#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:806
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:806
-#: ../apport/ui.py:806
-#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:806
+#: ../debian/tmp/usr/bin/apport-cli.py:268 ../bin/apport-cli.py:268
 msgid ""
-"In bug filing mode, save the collected information into a file instead of "
-"reporting it. This file can then be reported later on from a different "
-"machine."
+"The collected information is being sent to the bug tracking system.\n"
+"This might take a few minutes."
 msgstr ""
-"ในโหมดรายงานปัญหา บันทึกข้อมูลที่รวบรวมเป็นแฟ้มแทนที่จะรายงาน "
-"แฟ้มนี้สามารถเก็บไว้รายงานได้ทีหลังโดยใช้เครื่องอื่นได้"
+"ข้อมูลที่รวบรวมมากำลังจะถูกส่งไปยังระบบติด\n"
+"ตามบั๊ก การดำเนินการนี้จะใช้เวลาเพียงไม่กี่นาที"
 
-#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:810
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:810
-#: ../apport/ui.py:810
-#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:810
-msgid "Print the Apport version number."
-msgstr "พิมพ์หมายเลขรุ่น Apport"
+#: ../debian/tmp/usr/bin/apport-cli.py:318 ../bin/apport-cli.py:318
+msgid "&Done"
+msgstr "&เสร็จแล้ว"
+
+#: ../debian/tmp/usr/bin/apport-cli.py:324 ../bin/apport-cli.py:324
+msgid "none"
+msgstr "ไม่มี"
+
+#: ../debian/tmp/usr/bin/apport-cli.py:325 ../bin/apport-cli.py:325
+#, python-format
+msgid "Selected: %s. Multiple choices:"
+msgstr "เลือกแล้ว: %s. หลายตัวเลือก:"
 
-#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:961
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:961
-#: ../apport/ui.py:961
-#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:961
-msgid ""
-"This will launch apport-retrace in a terminal window to examine the crash."
-msgstr ""
-"การดำเนินการนี้จะเป็นการเรียกใช้ apport-retrace "
-"ในหน้าต่างเทอร์มินัลเพื่อตรวจสอบความล้มเหลว"
+#: ../debian/tmp/usr/bin/apport-cli.py:341 ../bin/apport-cli.py:341
+msgid "Choices:"
+msgstr "ตัวเลือก:"
 
-#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:962
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:962
-#: ../apport/ui.py:962
-#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:962
-msgid "Run gdb session"
-msgstr "เรียกใช้วาระ gdb"
+#: ../debian/tmp/usr/bin/apport-cli.py:355 ../bin/apport-cli.py:355
+msgid "Path to file (Enter to cancel):"
+msgstr "เส้นทางมายังแฟ้ม (กด Enter เพื่อยกเลิก):"
 
-#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:963
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:963
-#: ../apport/ui.py:963
-#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:963
-msgid "Run gdb session without downloading debug symbols"
-msgstr "เรียกใช้วาระ gdb session โดยไม่ต้องดาวน์โหลดสัญลักษณ์การดีบั๊ก"
+#: ../debian/tmp/usr/bin/apport-cli.py:361 ../bin/apport-cli.py:361
+msgid "File does not exist."
+msgstr "แฟ้มไม่มีอยู่"
 
-#. TRANSLATORS: %s contains the crash report file name
-#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:965
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:965
-#: ../apport/ui.py:965
-#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:965
-#, python-format
-msgid "Update %s with fully symbolic stack trace"
-msgstr "อัปเดต %s พร้อมข้อมูลการติดตามสแตกเชิงสัญลักษณ์"
+#: ../debian/tmp/usr/bin/apport-cli.py:363 ../bin/apport-cli.py:363
+msgid "This is a directory."
+msgstr "นี่คือไดเรกทอรี"
 
-#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:1001
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1001
-#: ../apport/ui.py:1001
-#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1001
-msgid "Can't remember send report status settings"
-msgstr ""
+#: ../debian/tmp/usr/bin/apport-cli.py:369 ../bin/apport-cli.py:369
+msgid "To continue, you must visit the following URL:"
+msgstr "เพื่อดำเนินการต่อ คุณจะต้องไปยัง URL:"
 
-#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:1002
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1002
-#: ../apport/ui.py:1002
-#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1002
+#: ../debian/tmp/usr/bin/apport-cli.py:371 ../bin/apport-cli.py:371
 msgid ""
-"Saving crash reporting state failed. Can't set auto or never reporting mode."
+"You can launch a browser now, or copy this URL into a browser on another "
+"computer."
 msgstr ""
+"คุณสามารถเปิดโปรแกรมท่องเว็บได้แล้วตอนนี้ หรือคัดลอก URL "
+"นี้ไปยังโปรแกรมท่องเว็บบนคอมพิวเตอร์เครื่องอื่น"
 
-#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:1061
-#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:1071
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1061
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1071
-#: ../apport/ui.py:1061 ../apport/ui.py:1071
-#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1061
-#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1071
-msgid ""
-"This problem report applies to a program which is not installed any more."
-msgstr "รายงานปัญหานี้จะนำไปใช้กับโปรแกรมที่ไม่ได้ติดตั้งอีกต่อไป"
+#: ../debian/tmp/usr/bin/apport-cli.py:373 ../bin/apport-cli.py:373
+msgid "Launch a browser now"
+msgstr "เปิดเบราว์เซอร์เดี๋ยวนี้"
 
-#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:1086
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1086
-#: ../apport/ui.py:1086
-#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1086
-#, python-format
-msgid ""
-"The problem happened with the program %s which changed since the crash "
-"occurred."
+#: ../debian/tmp/usr/bin/apport-cli.py:388 ../bin/apport-cli.py:388
+msgid "No pending crash reports. Try --help for more information."
 msgstr ""
-"มีปัญหาเกิดขึ้นกับโปรแกรม %s ซึ่งมีการเปลี่ยนแปลงตั้งแต่เกิดความล้มเหลวขึ้น"
+"ไม่มีรายงานปัญหาที่รออยู่ ลองเรียกคำสั่ง --help เพื่อดูข้อมูลเพิ่มเติม"
 
-#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:1133
-#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:1190
-#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:1405
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1133
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1190
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1405
-#: ../apport/ui.py:1133 ../apport/ui.py:1190 ../apport/ui.py:1405
-#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1133
-#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1190
-#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1405
-msgid "This problem report is damaged and cannot be processed."
-msgstr "รายงานปัญหาเสียหายทำให้ไม่สามารถดำเนินการต่้อได้"
+#: ../debian/tmp/usr/share/apport/apport-gtk.py:161 ../gtk/apport-gtk.py:161
+#, python-format
+msgid "Sorry, the application %s has stopped unexpectedly."
+msgstr "ขออภัย โปรแกรม %s หยุดทำงานอย่างกะทันหัน"
 
-#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:1141
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1141
-#: ../apport/ui.py:1141
-#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1141
+#: ../debian/tmp/usr/share/apport/apport-gtk.py:164 ../gtk/apport-gtk.py:164
 #, python-format
-msgid ""
-"This report is about a snap published by %s. Contact them via %s for help."
-msgstr ""
+msgid "Sorry, %s has closed unexpectedly."
+msgstr "ขออภัย %s ปิดลงอย่างกะทันหัน"
 
-#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:1144
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1144
-#: ../apport/ui.py:1144
-#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1144
+#: ../debian/tmp/usr/share/apport/apport-kde.py:200
+#: ../debian/tmp/usr/share/apport/apport-kde.py:238
+#: ../debian/tmp/usr/share/apport/apport-gtk.py:169 ../kde/apport-kde.py:200
+#: ../kde/apport-kde.py:238 ../gtk/apport-gtk.py:169
 #, python-format
-msgid ""
-"This report is about a snap published by %s. No contact address has been "
-"provided; visit the forum at https://forum.snapcraft.io/ for help."
-msgstr ""
+msgid "Sorry, %s has experienced an internal error."
+msgstr "ขออภัย %s ประสบปัญหาภายใน"
 
-#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:1148
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1148
-#: ../apport/ui.py:1148
-#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1148
-msgid "This report is about a package that is not installed."
-msgstr ""
+#: ../debian/tmp/usr/share/apport/apport-kde.py:194
+#: ../debian/tmp/usr/share/apport/apport-gtk.py:188 ../kde/apport-kde.py:194
+#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:14 ../gtk/apport-gtk.ui.h:14
+#: ../gtk/apport-gtk.py:188
+msgid "Send"
+msgstr "ส่ง"
 
-#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:1152
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1152
-#: ../apport/ui.py:1152
-#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1152
-msgid "An error occurred while attempting to process this problem report:"
-msgstr "เกิดข้อผิดพลาดขณะพยายามประมวลผลการรายงานปัญหานี้:"
+#: ../debian/tmp/usr/share/apport/apport-kde.py:292
+#: ../debian/tmp/usr/share/apport/apport-gtk.py:204
+#: ../debian/tmp/usr/share/apport/apport-gtk.py:575 ../kde/apport-kde.py:292
+#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:11 ../gtk/apport-gtk.ui.h:11
+#: ../gtk/apport-gtk.py:204 ../gtk/apport-gtk.py:575
+msgid "Show Details"
+msgstr "แสดงรายละเอียด"
 
-#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:1159
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1159
-#: ../apport/ui.py:1159
-#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1159
+#: ../debian/tmp/usr/share/apport/apport-kde.py:231
+#: ../debian/tmp/usr/share/apport/apport-kde.py:244
+#: ../debian/tmp/usr/share/apport/apport-gtk.py:216 ../kde/apport-kde.py:231
+#: ../kde/apport-kde.py:244 ../gtk/apport-gtk.py:216
+msgid "Continue"
+msgstr "ทำต่อไป"
+
+#: ../debian/tmp/usr/share/apport/apport-gtk.py:239 ../gtk/apport-gtk.py:239
 #, python-format
-msgid ""
-"You are about to report a bug against the deb package, but you also a have "
-"snap published by %s installed. You can contact them via %s for help. Do you "
-"want to continue with the bug report against the deb?"
-msgstr ""
+msgid "The application %s has stopped responding."
+msgstr "โปรแกรม %s หยุดตอบสนองแล้ว"
 
-#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:1161
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1161
-#: ../apport/ui.py:1161
-#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1161
+#: ../debian/tmp/usr/share/apport/apport-gtk.py:243 ../gtk/apport-gtk.py:243
 #, python-format
-msgid ""
-"You are about to report a bug against the deb package, but you also a have "
-"snap published by %s installed. For the snap, no contact address has been "
-"provided; visit the forum at https://forum.snapcraft.io/ for help. Do you "
-"want to continue with the bug report against the deb?"
-msgstr ""
+msgid "The program \"%s\" has stopped responding."
+msgstr "โปรแกรม \"%s\" หยุดตอบสนองแล้ว"
 
-#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:1234
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1234
-#: ../apport/ui.py:1234
-#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1234
-msgid "Could not determine the package or source package name."
-msgstr "ไม่สามารถกำหนดแพกเกจหรือชื่อแพกเกจต้นฉบับได้"
+#: ../debian/tmp/usr/share/apport/apport-kde.py:208
+#: ../debian/tmp/usr/share/apport/apport-gtk.py:259 ../kde/apport-kde.py:208
+#: ../gtk/apport-gtk.py:259
+#, python-format
+msgid "Package: %s"
+msgstr "แพกเกจ: %s"
 
-#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:1252
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1252
-#: ../apport/ui.py:1252
-#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1252
-msgid "Unable to start web browser"
-msgstr "ไม่สามารถเริ่มเว็บเบราว์เซอร์ได้"
+#: ../debian/tmp/usr/share/apport/apport-kde.py:214
+#: ../debian/tmp/usr/share/apport/apport-gtk.py:265 ../kde/apport-kde.py:214
+#: ../gtk/apport-gtk.py:265
+msgid "Sorry, a problem occurred while installing software."
+msgstr "ขออภัย เกิดปัญหาขณะติดตั้งซอฟต์แวร์"
 
-#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:1253
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1253
-#: ../apport/ui.py:1253
-#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1253
+#: ../debian/tmp/usr/share/apport/apport-kde.py:220
+#: ../debian/tmp/usr/share/apport/apport-gtk.py:274
+#: ../debian/tmp/usr/share/apport/apport-gtk.py:289 ../kde/apport-kde.py:220
+#: ../gtk/apport-gtk.py:274 ../gtk/apport-gtk.py:289
 #, python-format
-msgid "Unable to start web browser to open %s."
-msgstr "ไม่สามารถเริ่มเว็บเบราว์เซอร์เพื่อเปิด %s"
+msgid "The application %s has experienced an internal error."
+msgstr "โปรแกรม %s ประสบปัญหาภายใน"
 
-#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:1353
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1353
-#: ../apport/ui.py:1353
-#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1353
+#: ../debian/tmp/usr/share/apport/apport-kde.py:223
+#: ../debian/tmp/usr/share/apport/apport-gtk.py:277 ../kde/apport-kde.py:223
+#: ../gtk/apport-gtk.py:277
 #, python-format
-msgid "Please enter your account information for the %s bug tracking system"
-msgstr "โปรดป้อนข้อมูลบัญชีของคุณสำหรับระบบติดตามปัญหาของ %s"
-
-#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:1365
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1365
-#: ../apport/ui.py:1365
-#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1365
-msgid "Network problem"
-msgstr "ปัญหาเครือข่าย"
+msgid "The application %s has closed unexpectedly."
+msgstr "โปรแกรม %s ปิดลงอย่างกะทันหัน"
 
-#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:1367
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1367
-#: ../apport/ui.py:1367
-#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1367
-msgid ""
-"Cannot connect to crash database, please check your Internet connection."
+#: ../debian/tmp/usr/share/apport/apport-kde.py:241
+#: ../debian/tmp/usr/share/apport/apport-gtk.py:297 ../kde/apport-kde.py:241
+#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:7 ../gtk/apport-gtk.ui.h:7
+#: ../gtk/apport-gtk.py:297
+msgid "If you notice further problems, try restarting the computer."
 msgstr ""
-"ไม่สามารถเชื่อมต่อไปที่ฐานข้อมูลความล้มเหลวได้ "
-"โปรดตรวจสอบการเชื่อมต่ออินเทอร์เน็ตของคุณ"
+"ถ้าคุณประสบปัญหาเพิ่มเติม ให้ลองเริ่มการทำงานของคอมพิวเตอร์ใหม่อีกครั้ง"
 
-#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:1394
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1394
-#: ../apport/ui.py:1394
-#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1394
-msgid "Memory exhaustion"
-msgstr "หน่วยความจำหมด"
+#: ../debian/tmp/usr/share/apport/apport-kde.py:245
+#: ../debian/tmp/usr/share/apport/apport-gtk.py:299 ../kde/apport-kde.py:245
+#: ../gtk/apport-gtk.py:299
+msgid "Ignore future problems of this type"
+msgstr "เพิกเฉยต่อปัญหาครั้งหน้าของประเภทนี้"
 
-#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:1395
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1395
-#: ../apport/ui.py:1395
-#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1395
-msgid "Your system does not have enough memory to process this crash report."
-msgstr "ระบบของคุณมีหน่วยความจำไม่เพียงพอสำหรับประมวลผลการรายงานปัญหานี้"
+#: ../debian/tmp/usr/share/apport/apport-kde.py:289
+#: ../debian/tmp/usr/share/apport/apport-gtk.py:579 ../kde/apport-kde.py:289
+#: ../gtk/apport-gtk.py:579
+msgid "Hide Details"
+msgstr "ซ่อนรายละเอียด"
 
-#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:1430
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1430
-#: ../apport/ui.py:1430
-#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1430
-#, python-format
+#: ../apport/com.ubuntu.apport.policy.in.h:1
+msgid "Collect system information"
+msgstr "รวบรวมข้อมูลของระบบ"
+
+#: ../apport/com.ubuntu.apport.policy.in.h:2
 msgid ""
-"The problem cannot be reported:\n"
-"\n"
-"%s"
-msgstr ""
-"ปัญหานี้ไม่สามารถรายงานได้:\n"
-"\n"
-"%s"
+"Authentication is required to collect system information for this problem "
+"report"
+msgstr "ต้องยืนยันตัวตนเพื่อรวบรวมข้อมูลของระบบเพื่อใช้รายงานปัญหาในครั้งนี้"
 
-#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:1486
-#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:1493
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1486
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1493
-#: ../apport/ui.py:1486 ../apport/ui.py:1493
-#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1486
-#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1493
-msgid "Problem already known"
-msgstr "ปัญหาที่ทราบแล้ว"
+#: ../apport/com.ubuntu.apport.policy.in.h:3
+msgid "System problem reports"
+msgstr "การรายงานปัญหาระบบ"
 
-#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:1487
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1487
-#: ../apport/ui.py:1487
-#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1487
+#: ../apport/com.ubuntu.apport.policy.in.h:4
 msgid ""
-"This problem was already reported in the bug report displayed in the web "
-"browser. Please check if you can add any further information that might be "
-"helpful for the developers."
-msgstr ""
-"ปัญหานี้ถูกรายงานอยู่แล้วในรายงานปัญหาที่แสดงในเว็บเบราว์เซอร์ "
-"โปรดตรวจสอบว่าคุณสามารถเพิ่มข้อมูลเพิ่มเติมที่อาจเป็นประโยชน์ต่อนักพัฒนาได้หร"
-"ือไม่"
-
-#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:1494
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1494
-#: ../apport/ui.py:1494
-#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1494
-msgid "This problem was already reported to developers. Thank you!"
-msgstr "ปัญหานี้ถูกรายงานให้ทางผู้พัฒนาไปแล้ว ขอขอบคุณ!"
+"Please enter your password to access problem reports of system programs"
+msgstr "โปรดป้อนรหัสผ่านเพื่อเข้าถึงรายงานปัญหาของโปรแกรมระบบ"
 
-#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:1 ../gtk/apport-gtk.ui.h:1
-#: ../kde/apport-kde.py:469 ../kde/apport-kde.py:504 ../kde/apport-kde.py:524
 #: ../debian/tmp/usr/share/apport/apport-kde.py:469
 #: ../debian/tmp/usr/share/apport/apport-kde.py:504
-#: ../debian/tmp/usr/share/apport/apport-kde.py:524
+#: ../debian/tmp/usr/share/apport/apport-kde.py:524 ../kde/apport-kde.py:469
+#: ../kde/apport-kde.py:504 ../kde/apport-kde.py:524
+#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:1 ../gtk/apport-gtk.ui.h:1
 msgid "Apport"
 msgstr "Apport"
 
@@ -723,21 +565,6 @@
 msgid "<big><b>Sorry, an internal error happened.</b></big>"
 msgstr "<big><b>ขออภัย เกิดข้อผิดพลาดภายใน</b></big>"
 
-#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:6 ../gtk/apport-gtk.ui.h:6
-#: ../bin/apport-cli.py:194 ../kde/apport-kde.py:186
-#: ../debian/tmp/usr/share/apport/apport-kde.py:186
-#: ../debian/tmp/usr/share/apport/apport-gtk.py:181
-#: ../debian/tmp/usr/bin/apport-cli.py:194 ../gtk/apport-gtk.py:181
-msgid "Send problem report to the developers?"
-msgstr "ต้องการส่งรายงานปัญหาไปยังนักพัฒนาหรือไม่?"
-
-#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:7 ../gtk/apport-gtk.ui.h:7
-#: ../kde/apport-kde.py:241 ../debian/tmp/usr/share/apport/apport-kde.py:241
-#: ../debian/tmp/usr/share/apport/apport-gtk.py:297 ../gtk/apport-gtk.py:297
-msgid "If you notice further problems, try restarting the computer."
-msgstr ""
-"ถ้าคุณประสบปัญหาเพิ่มเติม ให้ลองเริ่มการทำงานของคอมพิวเตอร์ใหม่อีกครั้ง"
-
 #: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:8 ../gtk/apport-gtk.ui.h:8
 msgid "Remember this in future"
 msgstr ""
@@ -750,14 +577,6 @@
 msgid "Relaunch this application"
 msgstr ""
 
-#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:11 ../gtk/apport-gtk.ui.h:11
-#: ../kde/apport-kde.py:292 ../debian/tmp/usr/share/apport/apport-kde.py:292
-#: ../debian/tmp/usr/share/apport/apport-gtk.py:204
-#: ../debian/tmp/usr/share/apport/apport-gtk.py:575 ../gtk/apport-gtk.py:204
-#: ../gtk/apport-gtk.py:575
-msgid "Show Details"
-msgstr "แสดงรายละเอียด"
-
 #: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:12 ../gtk/apport-gtk.ui.h:12
 msgid "_Examine locally"
 msgstr "_ตรวจสอบในเครื่อง"
@@ -766,12 +585,6 @@
 msgid "Don't send"
 msgstr ""
 
-#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:14 ../gtk/apport-gtk.ui.h:14
-#: ../kde/apport-kde.py:194 ../debian/tmp/usr/share/apport/apport-kde.py:194
-#: ../debian/tmp/usr/share/apport/apport-gtk.py:188 ../gtk/apport-gtk.py:188
-msgid "Send"
-msgstr "ส่ง"
-
 #: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:15 ../gtk/apport-gtk.ui.h:15
 msgid "<big><b>Collecting problem information</b></big>"
 msgstr "<big><b>กำลังรวบรวมข้อมูลของปัญหา</b></big>"
@@ -782,19 +595,12 @@
 "you report."
 msgstr "กำลังรวบรวมข้อมูลซึ่งช่วยให้นักพัฒนาแก้ไขปัญหาที่คุณรายงานไป"
 
-#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:17 ../gtk/apport-gtk.ui.h:17
-#: ../bin/apport-cli.py:267 ../kde/apport-kde.py:435
-#: ../debian/tmp/usr/share/apport/apport-kde.py:435
-#: ../debian/tmp/usr/bin/apport-cli.py:267
-msgid "Uploading problem information"
-msgstr "กำลังอัปโหลดข้อมูลปัญหา"
-
 #: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:18 ../gtk/apport-gtk.ui.h:18
 msgid "<big><b>Uploading problem information</b></big>"
 msgstr "<big><b>กำลังอัปโหลดข้อมูลของปัญหา</b></big>"
 
+#: ../debian/tmp/usr/share/apport/apport-kde.py:436 ../kde/apport-kde.py:436
 #: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:19 ../gtk/apport-gtk.ui.h:19
-#: ../kde/apport-kde.py:436 ../debian/tmp/usr/share/apport/apport-kde.py:436
 msgid ""
 "The collected information is being sent to the bug tracking system. This "
 "might take a few minutes."
@@ -802,92 +608,29 @@
 "ข้อมูลที่รวบรวมมากำลังจะถูกส่งไปยังระบบติดตามบั๊ก "
 "การกระทำนี้จะใช้เวลาเพียงไม่กี่นาที"
 
-#: ../kde/apport-kde.py:200 ../kde/apport-kde.py:238
-#: ../debian/tmp/usr/share/apport/apport-kde.py:200
-#: ../debian/tmp/usr/share/apport/apport-kde.py:238
-#: ../debian/tmp/usr/share/apport/apport-gtk.py:169 ../gtk/apport-gtk.py:169
-#, python-format
-msgid "Sorry, %s has experienced an internal error."
-msgstr "ขออภัย %s ประสบปัญหาภายใน"
-
-#: ../kde/apport-kde.py:208 ../debian/tmp/usr/share/apport/apport-kde.py:208
-#: ../debian/tmp/usr/share/apport/apport-gtk.py:259 ../gtk/apport-gtk.py:259
-#, python-format
-msgid "Package: %s"
-msgstr "แพกเกจ: %s"
-
-#: ../kde/apport-kde.py:214 ../debian/tmp/usr/share/apport/apport-kde.py:214
-#: ../debian/tmp/usr/share/apport/apport-gtk.py:265 ../gtk/apport-gtk.py:265
-msgid "Sorry, a problem occurred while installing software."
-msgstr "ขออภัย เกิดปัญหาขณะติดตั้งซอฟต์แวร์"
-
-#: ../kde/apport-kde.py:220 ../debian/tmp/usr/share/apport/apport-kde.py:220
-#: ../debian/tmp/usr/share/apport/apport-gtk.py:274
-#: ../debian/tmp/usr/share/apport/apport-gtk.py:289 ../gtk/apport-gtk.py:274
-#: ../gtk/apport-gtk.py:289
-#, python-format
-msgid "The application %s has experienced an internal error."
-msgstr "โปรแกรม %s ประสบปัญหาภายใน"
-
-#: ../kde/apport-kde.py:223 ../debian/tmp/usr/share/apport/apport-kde.py:223
-#: ../debian/tmp/usr/share/apport/apport-gtk.py:277 ../gtk/apport-gtk.py:277
-#, python-format
-msgid "The application %s has closed unexpectedly."
-msgstr "โปรแกรม %s ปิดลงอย่างกะทันหัน"
-
-#: ../kde/apport-kde.py:231 ../kde/apport-kde.py:244
-#: ../debian/tmp/usr/share/apport/apport-kde.py:231
-#: ../debian/tmp/usr/share/apport/apport-kde.py:244
-#: ../debian/tmp/usr/share/apport/apport-gtk.py:216 ../gtk/apport-gtk.py:216
-msgid "Continue"
-msgstr "ทำต่อไป"
-
-#: ../kde/apport-kde.py:234 ../debian/tmp/usr/share/apport/apport-kde.py:234
+#: ../debian/tmp/usr/share/apport/apport-kde.py:234 ../kde/apport-kde.py:234
 msgid "Leave Closed"
 msgstr "ปล่อยให้ปิดไป"
 
-#: ../kde/apport-kde.py:235 ../kde/apport-kde.py:381
 #: ../debian/tmp/usr/share/apport/apport-kde.py:235
-#: ../debian/tmp/usr/share/apport/apport-kde.py:381
+#: ../debian/tmp/usr/share/apport/apport-kde.py:381 ../kde/apport-kde.py:235
+#: ../kde/apport-kde.py:381
 msgid "Relaunch"
 msgstr "เรียกใหม่"
 
-#: ../kde/apport-kde.py:245 ../debian/tmp/usr/share/apport/apport-kde.py:245
-#: ../debian/tmp/usr/share/apport/apport-gtk.py:299 ../gtk/apport-gtk.py:299
-msgid "Ignore future problems of this type"
-msgstr "เพิกเฉยต่อปัญหาครั้งหน้าของประเภทนี้"
-
-#: ../kde/apport-kde.py:289 ../debian/tmp/usr/share/apport/apport-kde.py:289
-#: ../debian/tmp/usr/share/apport/apport-gtk.py:579 ../gtk/apport-gtk.py:579
-msgid "Hide Details"
-msgstr "ซ่อนรายละเอียด"
-
-#: ../kde/apport-kde.py:315 ../debian/tmp/usr/share/apport/apport-kde.py:315
+#: ../debian/tmp/usr/share/apport/apport-kde.py:315 ../kde/apport-kde.py:315
 msgid "Username:"
 msgstr "ชื่อผู้ใช้:"
 
-#: ../kde/apport-kde.py:316 ../debian/tmp/usr/share/apport/apport-kde.py:316
+#: ../debian/tmp/usr/share/apport/apport-kde.py:316 ../kde/apport-kde.py:316
 msgid "Password:"
 msgstr "รหัสผ่าน:"
 
-#: ../bin/apport-cli.py:166 ../kde/apport-kde.py:363
-#: ../debian/tmp/usr/share/apport/apport-kde.py:363
-#: ../debian/tmp/usr/share/apport/apport-gtk.py:146
-#: ../debian/tmp/usr/bin/apport-cli.py:166 ../gtk/apport-gtk.py:146
-msgid "(binary data)"
-msgstr "(binary data)"
-
-#: ../kde/apport-kde.py:406 ../debian/tmp/usr/share/apport/apport-kde.py:406
+#: ../debian/tmp/usr/share/apport/apport-kde.py:406 ../kde/apport-kde.py:406
 msgid "Collecting Problem Information"
 msgstr "กำลังรวบรวมข้อมูลปัญหา"
 
-#: ../bin/apport-cli.py:254 ../kde/apport-kde.py:407
-#: ../debian/tmp/usr/share/apport/apport-kde.py:407
-#: ../debian/tmp/usr/bin/apport-cli.py:254
-msgid "Collecting problem information"
-msgstr "กำลังรวบรวมข้อมูลของปัญหา"
-
-#: ../kde/apport-kde.py:408 ../debian/tmp/usr/share/apport/apport-kde.py:408
+#: ../debian/tmp/usr/share/apport/apport-kde.py:408 ../kde/apport-kde.py:408
 msgid ""
 "The collected information can be sent to the developers to improve the "
 "application. This might take a few minutes."
@@ -895,430 +638,526 @@
 "ข้อมูลที่รวบรวมมาสามารถส่งไปให้นักพัฒนาเพื่อให้ปรับปรุงโปรแกรมได้ "
 "การกระทำนี้จะใช้เวลาเพียงไม่กี่นาที"
 
-#: ../kde/apport-kde.py:434 ../debian/tmp/usr/share/apport/apport-kde.py:434
+#: ../debian/tmp/usr/share/apport/apport-kde.py:434 ../kde/apport-kde.py:434
 msgid "Uploading Problem Information"
 msgstr "กำลังปรับปรุงข้อมูลของปัญหา"
 
-#: ../debian/tmp/usr/share/apport/kernel_oops.py:29 ../data/kernel_oops.py:29
-msgid "Your system might become unstable now and might need to be restarted."
-msgstr "ระบบของคุณอาจไม่เสถียรแล้วในขณะนี้ และต้องเริ่มการทำงานของระบบใหม่"
-
-#: ../bin/apport-cli.py:80 ../debian/tmp/usr/bin/apport-cli.py:80
-msgid "Press any key to continue..."
-msgstr "กดปุ่มใดๆ เพื่อดำเนินการต่อ..."
-
-#: ../bin/apport-cli.py:87 ../debian/tmp/usr/bin/apport-cli.py:87
-msgid "What would you like to do? Your options are:"
-msgstr "คุณต้องการทำอะไร? ตัวเลือกของคุณคือ:"
+#: ../apport/ui.py:139
+#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:139
+msgid "This package does not seem to be installed correctly"
+msgstr "ดูเหมือนว่าแพคเกจนี้จะไม่ได้ถูกติดตั้งอย่างถูกต้อง"
 
-#: ../bin/apport-cli.py:100 ../debian/tmp/usr/bin/apport-cli.py:100
+#: ../apport/ui.py:144
+#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:144
 #, python-format
-msgid "Please choose (%s):"
-msgstr "โปรดเลือก (%s):"
+msgid ""
+"This is not an official %s package. Please remove any third party package "
+"and try again."
+msgstr ""
+"นี่ไม่ใช่แพกเกจ %s ทางการ โปรดลบแพกเกจบุคคลที่สามใด ๆ ออกและลองอีกครั้ง"
 
-#: ../bin/apport-cli.py:164 ../debian/tmp/usr/bin/apport-cli.py:164
+#: ../apport/ui.py:163
+#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:163
 #, python-format
-msgid "(%i bytes)"
-msgstr "(%i ไบต์)"
-
-#: ../bin/apport-cli.py:195 ../debian/tmp/usr/bin/apport-cli.py:195
 msgid ""
-"After the problem report has been sent, please fill out the form in the\n"
-"automatically opened web browser."
+"You have some obsolete package versions installed. Please upgrade the "
+"following packages and check if the problem still occurs:\n"
+"\n"
+"%s"
 msgstr ""
-"หลังจากที่รายงานปัญหาถูกส่งไปแล้ว โปรดกรอกข้อมูลลงในแบบฟอร์ม\n"
-"ในโปรแกรมท่องเว็บที่เปิดขึ้นมาโดยอัตโนมัติ"
+"คุณมีแพกเกจเก่าติดตั้งอยู่ "
+"โปรดปรับรุ่นแพกเกจต่อไปนี้แล้วตรวจสอบปัญหาที่อาจเกิดขึ้น:\n"
+"\n"
+"%s"
 
-#: ../bin/apport-cli.py:198 ../debian/tmp/usr/bin/apport-cli.py:198
-#, python-format
-msgid "&Send report (%s)"
-msgstr "&ส่งรายงาน (%s)"
+#: ../apport/ui.py:300
+#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:300
+msgid "unknown program"
+msgstr "โปรแกรมนี้ไม่รู้จัก"
 
-#: ../bin/apport-cli.py:202 ../debian/tmp/usr/bin/apport-cli.py:202
-msgid "&Examine locally"
-msgstr "&ตรวจในเครื่อง"
+#: ../apport/ui.py:301
+#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:301
+#, python-format
+msgid "Sorry, the program \"%s\" closed unexpectedly"
+msgstr "ขออภัย โปรแกรม \"%s\" ปิดลงโดยไม่คาดหมาย"
 
-#: ../bin/apport-cli.py:206 ../debian/tmp/usr/bin/apport-cli.py:206
-msgid "&View report"
-msgstr "&ดูรายงาน"
+#: ../apport/ui.py:303 ../apport/ui.py:1448
+#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:303
+#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1448
+#, python-format
+msgid "Problem in %s"
+msgstr "ปัญหาใน %s"
 
-#: ../bin/apport-cli.py:207 ../debian/tmp/usr/bin/apport-cli.py:207
-msgid "&Keep report file for sending later or copying to somewhere else"
-msgstr "&เก็บแฟ้มรายงานไว้ส่งทีหลังหรือคัดลอกไปไว้ในที่อื่น ๆ"
+#: ../apport/ui.py:304
+#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:304
+msgid ""
+"Your computer does not have enough free memory to automatically analyze the "
+"problem and send a report to the developers."
+msgstr ""
+"ระบบของคุณไม่มีหน่วยความจำเหลือเพีัยงพอที่จะทำการตรวจสอบ, วิเคราะปัญหา "
+"และส่งรายงานกลับไปที่นักพัฒนาได้"
 
-#: ../bin/apport-cli.py:208 ../debian/tmp/usr/bin/apport-cli.py:208
-msgid "Cancel and &ignore future crashes of this program version"
-msgstr "ยกเลิกและเพิกเ&ฉยต่อการขัดข้องครั้งหน้าของโปรแกรมรุ่นนี้"
+#: ../apport/ui.py:359 ../apport/ui.py:367 ../apport/ui.py:510
+#: ../apport/ui.py:513 ../apport/ui.py:718 ../apport/ui.py:1254
+#: ../apport/ui.py:1420 ../apport/ui.py:1424
+#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:359
+#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:367
+#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:510
+#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:513
+#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:718
+#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1254
+#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1420
+#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1424
+msgid "Invalid problem report"
+msgstr "รายงานปัญหาไม่ถูกต้อง"
 
-#: ../bin/apport-cli.py:210 ../bin/apport-cli.py:287 ../bin/apport-cli.py:319
-#: ../bin/apport-cli.py:340 ../debian/tmp/usr/bin/apport-cli.py:210
-#: ../debian/tmp/usr/bin/apport-cli.py:287
-#: ../debian/tmp/usr/bin/apport-cli.py:319
-#: ../debian/tmp/usr/bin/apport-cli.py:340
-msgid "&Cancel"
-msgstr "&ยกเลิก"
+#: ../apport/ui.py:360
+#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:360
+msgid "You are not allowed to access this problem report."
+msgstr "คุณไม่ได้รับอนุญาตให้ดูรายงานปัญหานี้"
 
-#: ../bin/apport-cli.py:238 ../debian/tmp/usr/bin/apport-cli.py:238
-msgid "Problem report file:"
-msgstr "แฟ้มรายงานปัญหา:"
+#: ../apport/ui.py:363
+#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:363
+msgid "Error"
+msgstr "ผิดพลาด"
 
-#: ../bin/apport-cli.py:244 ../bin/apport-cli.py:249
-#: ../debian/tmp/usr/bin/apport-cli.py:244
-#: ../debian/tmp/usr/bin/apport-cli.py:249
-msgid "&Confirm"
-msgstr "&ยืนยัน"
+#: ../apport/ui.py:364
+#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:364
+msgid "There is not enough disk space available to process this report."
+msgstr "พื้นที่ว่างบนดิืสไม่พอสำหรับดำเนินการกับรายงานนี้ได้"
 
-#: ../bin/apport-cli.py:248 ../debian/tmp/usr/bin/apport-cli.py:248
-#, python-format
-msgid "Error: %s"
-msgstr "ผิดพลาด: %s"
+#: ../apport/ui.py:458
+#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:458
+msgid "No package specified"
+msgstr "ไม่ได้ระบุแพกเกจ"
 
-#: ../bin/apport-cli.py:255 ../debian/tmp/usr/bin/apport-cli.py:255
+#: ../apport/ui.py:459
+#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:459
 msgid ""
-"The collected information can be sent to the developers to improve the\n"
-"application. This might take a few minutes."
-msgstr ""
-"ข้อมูลที่รวบรวมมาสามารถส่งไปให้นักพัฒนาเพื่อให้ทำการปรับปรุงโปรแกรมได้\n"
-"การดำเนินการนี้จะใช้เวลาเพียงไม่กี่นาที"
+"You need to specify a package or a PID. See --help for more information."
+msgstr "คุณต้องระบุแพกเกจสักตัวหรือเลข PID ดู --help สำหรับข้อมูลเพิ่มเติม"
+
+#: ../apport/ui.py:488
+#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:488
+msgid "Permission denied"
+msgstr "ไม่ได้รับสิทธิ์"
 
-#: ../bin/apport-cli.py:268 ../debian/tmp/usr/bin/apport-cli.py:268
+#: ../apport/ui.py:489
+#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:489
 msgid ""
-"The collected information is being sent to the bug tracking system.\n"
-"This might take a few minutes."
+"The specified process does not belong to you. Please run this program as the "
+"process owner or as root."
 msgstr ""
-"ข้อมูลที่รวบรวมมากำลังจะถูกส่งไปยังระบบติด\n"
-"ตามบั๊ก การดำเนินการนี้จะใช้เวลาเพียงไม่กี่นาที"
+"กระบวนการที่ระบุไม่ใช่ของคุณ "
+"โปรดเรียกใช้โปรแกรมนี้ในฐานะเจ้าของกระบวนการหรือในฐานะผู้ดูแลระบบขั้นสูง"
 
-#: ../bin/apport-cli.py:318 ../debian/tmp/usr/bin/apport-cli.py:318
-msgid "&Done"
-msgstr "&เสร็จแล้ว"
+#: ../apport/ui.py:402 ../apport/ui.py:491
+#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:402
+#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:491
+msgid "Invalid PID"
+msgstr "PID ไม่ถูกต้อง"
 
-#: ../bin/apport-cli.py:324 ../debian/tmp/usr/bin/apport-cli.py:324
-msgid "none"
-msgstr "ไม่มี"
+#: ../apport/ui.py:492
+#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:492
+msgid "The specified process ID does not belong to a program."
+msgstr "ID ของกระบวนการที่ระบุไม่ใช่ของโปรแกรมใด"
 
-#: ../bin/apport-cli.py:325 ../debian/tmp/usr/bin/apport-cli.py:325
+#: ../apport/ui.py:511
+#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:511
 #, python-format
-msgid "Selected: %s. Multiple choices:"
-msgstr "เลือกแล้ว: %s. หลายตัวเลือก:"
-
-#: ../bin/apport-cli.py:341 ../debian/tmp/usr/bin/apport-cli.py:341
-msgid "Choices:"
-msgstr "ตัวเลือก:"
+msgid "Symptom script %s did not determine an affected package"
+msgstr "สคริปต์อาการ %s ไม่ได้กำหนดแพกเกจที่ได้รับผลกระทบ"
 
-#: ../bin/apport-cli.py:355 ../debian/tmp/usr/bin/apport-cli.py:355
-msgid "Path to file (Enter to cancel):"
-msgstr "เส้นทางมายังแฟ้ม (กด Enter เพื่อยกเลิก):"
+#: ../apport/ui.py:514
+#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:514
+#, python-format
+msgid "Package %s does not exist"
+msgstr "ไม่มีแพกเกจ %s อยู่"
 
-#: ../bin/apport-cli.py:361 ../debian/tmp/usr/bin/apport-cli.py:361
-msgid "File does not exist."
-msgstr "แฟ้มไม่มีอยู่"
+#: ../apport/ui.py:543 ../apport/ui.py:730 ../apport/ui.py:735
+#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:543
+#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:730
+#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:735
+msgid "Cannot create report"
+msgstr "ไม่สามารถสร้างรายงานได้"
 
-#: ../bin/apport-cli.py:363 ../debian/tmp/usr/bin/apport-cli.py:363
-msgid "This is a directory."
-msgstr "นี่คือไดเรกทอรี"
+#: ../apport/ui.py:558 ../apport/ui.py:604 ../apport/ui.py:620
+#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:558
+#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:604
+#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:620
+msgid "Updating problem report"
+msgstr "กำลังปรับข้อมูลรายงานปัญหา"
 
-#: ../bin/apport-cli.py:369 ../debian/tmp/usr/bin/apport-cli.py:369
-msgid "To continue, you must visit the following URL:"
-msgstr "เพื่อดำเนินการต่อ คุณจะต้องไปยัง URL:"
+#: ../apport/ui.py:559
+#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:559
+msgid ""
+"You are not the reporter or subscriber of this problem report, or the report "
+"is a duplicate or already closed.\n"
+"\n"
+"Please create a new report using \"apport-bug\"."
+msgstr ""
+"คุณไม่ใช่ผู้รายงานหรือผู้ติดตามรายงานปัญหานี้ "
+"หรือรายงานนี้อาจมีการเชื่อมโยงซ้ำ หรือถูกปิดไปแล้ว\n"
+"\n"
+"โปรดสร้างรายงานใหม่โดยใช้ \"apport-bug\""
 
-#: ../bin/apport-cli.py:371 ../debian/tmp/usr/bin/apport-cli.py:371
+#: ../apport/ui.py:568
+#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:568
 msgid ""
-"You can launch a browser now, or copy this URL into a browser on another "
-"computer."
+"You are not the reporter of this problem report. It is much easier to mark a "
+"bug as a duplicate of another than to move your comments and attachments to "
+"a new bug.\n"
+"\n"
+"Subsequently, we recommend that you file a new bug report using \"apport-"
+"bug\" and make a comment in this bug about the one you file.\n"
+"\n"
+"Do you really want to proceed?"
 msgstr ""
-"คุณสามารถเปิดโปรแกรมท่องเว็บได้แล้วตอนนี้ หรือคัดลอก URL "
-"นี้ไปยังโปรแกรมท่องเว็บบนคอมพิวเตอร์เครื่องอื่น"
+"คุณไม่ใช้ผู้รายงานปัญหานี้ "
+"การที่คุณทำเครื่องหมายปัญหานี้ว่ามีการเชื่อมโยงซ้ำง่ายกว่าการที่คุณย้ายความคิ"
+"ดเห็นและสิ่งที่แนบมาไปยังปัญหาใหม่\n"
+"\n"
+"เราขอแนะนำให้คุณรายงานปัญหาใหม่โดยใช้ \"apport-bug\" "
+"แล้วสร้างความคิดเห็นเกี่ยวกับปัญหาที่คุณรายงานนี้\n"
+"\n"
+"คุณต้องการดำเนินการต่อไปหรือไม่?"
 
-#: ../bin/apport-cli.py:373 ../debian/tmp/usr/bin/apport-cli.py:373
-msgid "Launch a browser now"
-msgstr "เปิดเบราว์เซอร์เดี๋ยวนี้"
+#: ../apport/ui.py:605 ../apport/ui.py:621
+#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:605
+#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:621
+msgid "No additional information collected."
+msgstr "ไม่มีการรวบรวมข้อมูลเพิ่มเติมใด ๆ"
 
-#: ../bin/apport-cli.py:388 ../debian/tmp/usr/bin/apport-cli.py:388
-msgid "No pending crash reports. Try --help for more information."
-msgstr ""
-"ไม่มีรายงานปัญหาที่รออยู่ ลองเรียกคำสั่ง --help เพื่อดูข้อมูลเพิ่มเติม"
+#: ../apport/ui.py:672
+#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:672
+msgid "What kind of problem do you want to report?"
+msgstr "ปัญหาแบบใดที่คุณต้องการที่จะรายงาน?"
 
-#: ../gtk/apport-gtk.desktop.in.h:1 ../kde/apport-kde.desktop.in.h:1
-#: ../kde/apport-kde-mime.desktop.in.h:1
-msgid "Report a problem..."
-msgstr "รายงานปัญหา..."
+#: ../apport/ui.py:689
+#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:689
+msgid "Unknown symptom"
+msgstr "อาการที่ไม่รู้จัก"
 
-#: ../gtk/apport-gtk.desktop.in.h:2 ../kde/apport-kde.desktop.in.h:2
-#: ../kde/apport-kde-mime.desktop.in.h:2
-msgid "Report a malfunction to the developers"
-msgstr "รายงานการทำงานผิดพลาดไปที่เหล่านักพัฒนา"
+#: ../apport/ui.py:690
+#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:690
+#, python-format
+msgid "The symptom \"%s\" is not known."
+msgstr "ไม่รู้จักอาการ \"%s\""
 
-#: ../data/apportcheckresume.py:67
-#: ../debian/tmp/usr/share/apport/apportcheckresume.py:67
+#: ../apport/ui.py:721
+#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:721
 msgid ""
-"This occurred during a previous suspend, and prevented the system from "
-"resuming properly."
+"After closing this message please click on an application window to report a "
+"problem about it."
 msgstr ""
-"นี่เกิดขึ้นระหว่างการพักเครื่องครั้งที่ผ่านมา "
-"และป้องกันไม่ให้ระบบทำงานต่อได้อย่างถูกต้อง"
+"หลังจากที่ปิดข้อความนี้แล้ว โปรดคลิกบนหน้าต่างโปรแกรมเพื่อรายงานปัญหานี้"
 
-#: ../data/apportcheckresume.py:69
-#: ../debian/tmp/usr/share/apport/apportcheckresume.py:69
+#: ../apport/ui.py:731 ../apport/ui.py:736
+#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:731
+#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:736
+msgid "xprop failed to determine process ID of the window"
+msgstr "xprop ไม่สามารถกำหนด ID โปรเซสของหน้าต่างได้"
+
+#: ../apport/ui.py:750
+#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:750
+msgid "%prog <report number>"
+msgstr "%prog <report number>"
+
+#: ../apport/ui.py:752
+#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:752
+msgid "Specify package name."
+msgstr "ระบุชื่อแพกเกจ"
+
+#: ../apport/ui.py:754 ../apport/ui.py:805
+#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:754
+#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:805
+msgid "Add an extra tag to the report. Can be specified multiple times."
+msgstr "เพิ่มแท็กพิเศษไปในรายงาน สามารถระบุได้หลาย ๆ ครั้ง"
+
+#: ../apport/ui.py:784
+#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:784
 msgid ""
-"This occurred during a previous hibernation, and prevented the system from "
-"resuming properly."
+"%prog [options] [symptom|pid|package|program path|.apport/.crash file]"
 msgstr ""
-"นี่เกิดขึ้นระหว่างการไฮเบอร์เนตครั้งที่ผ่านมา "
-"และป้องกันไม่ให้ระบบทำงานต่อได้อย่างถูกต้อง"
+"%prog [options] [symptom|pid|package|program path|.apport/.crash file]"
 
-#: ../data/apportcheckresume.py:74
-#: ../debian/tmp/usr/share/apport/apportcheckresume.py:74
+#: ../apport/ui.py:787
+#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:787
 msgid ""
-"The resume processing hung very near the end and will have appeared to have "
-"completed normally."
+"Start in bug filing mode. Requires --package and an optional --pid, or just "
+"a --pid. If neither is given, display a list of known symptoms. (Implied if "
+"a single argument is given.)"
 msgstr ""
-"การดำเนินการที่กำลังจะดำเนินการต่อไปนั้นหยุดทำงานชั่วคราวเมื่อใกล้จะจบแล้ว "
-"และจะเสร็จสมบูรณ์โดยปกติ"
-
-#: ../debian/tmp/usr/share/apport/apport-gtk.py:161 ../gtk/apport-gtk.py:161
-#, python-format
-msgid "Sorry, the application %s has stopped unexpectedly."
-msgstr "ขออภัย โปรแกรม %s หยุดทำงานอย่างกะทันหัน"
-
-#: ../debian/tmp/usr/share/apport/apport-gtk.py:164 ../gtk/apport-gtk.py:164
-#, python-format
-msgid "Sorry, %s has closed unexpectedly."
-msgstr "ขออภัย %s ปิดลงอย่างกะทันหัน"
-
-#: ../debian/tmp/usr/share/apport/apport-gtk.py:239 ../gtk/apport-gtk.py:239
-#, python-format
-msgid "The application %s has stopped responding."
-msgstr "โปรแกรม %s หยุดตอบสนองแล้ว"
+"เริ่มทำงานในโหมดรายงานปัญหา ต้องใช้ --package และ --pid พร้อมตัวเลือก "
+"หรือเพียง --pid ถ้าไม่ใส่อาร์กิวเมนต์ดังกล่าว "
+"ให้แสดงรายการอาการที่รู้ว่าเกิดขึ้น (ไม่ทำงานถ้าใส่เพียงอาร์กิวเมนต์เดียว)"
 
-#: ../debian/tmp/usr/share/apport/apport-gtk.py:243 ../gtk/apport-gtk.py:243
-#, python-format
-msgid "The program \"%s\" has stopped responding."
-msgstr "โปรแกรม \"%s\" หยุดตอบสนองแล้ว"
+#: ../apport/ui.py:789
+#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:789
+msgid "Click a window as a target for filing a problem report."
+msgstr "คลิกหน้าต่างเพื่อเป็นเป้าหมายสำหรับรายงานปัญหา"
 
-#: ../apport/com.ubuntu.apport.policy.in.h:1
-msgid "Collect system information"
-msgstr "รวบรวมข้อมูลของระบบ"
+#: ../apport/ui.py:791
+#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:791
+msgid "Start in bug updating mode. Can take an optional --package."
+msgstr ""
+"เริ่มทำงานในโหมดอัปเดตปัญหา สามารถใช้อาร์กิวเมนต์ --package พร้อมตัวเลือกได้"
 
-#: ../apport/com.ubuntu.apport.policy.in.h:2
+#: ../apport/ui.py:793
+#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:793
 msgid ""
-"Authentication is required to collect system information for this problem "
-"report"
-msgstr "ต้องยืนยันตัวตนเพื่อรวบรวมข้อมูลของระบบเพื่อใช้รายงานปัญหาในครั้งนี้"
+"File a bug report about a symptom. (Implied if symptom name is given as only "
+"argument.)"
+msgstr ""
+"รายงานปัญหาเกี่ยวกับอาการ (ไม่ทำงานถ้าชื่ออาการถูกใส่เพียงอาร์กิวเมนต์)"
 
-#: ../apport/com.ubuntu.apport.policy.in.h:3
-msgid "System problem reports"
-msgstr "การรายงานปัญหาระบบ"
+#: ../apport/ui.py:795
+#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:795
+msgid ""
+"Specify package name in --file-bug mode. This is optional if a --pid is "
+"specified. (Implied if package name is given as only argument.)"
+msgstr ""
+"ระบุชื่อแพกเกจในโหมด --file-bug ถ้าระบุ --pid นี่จะเป็นตัวเลือก "
+"(ไม่ทำงานถ้าชื่อแพกเกจถูกใส่เพียงอาร์กิวเมนต์)"
 
-#: ../apport/com.ubuntu.apport.policy.in.h:4
+#: ../apport/ui.py:797
+#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:797
 msgid ""
-"Please enter your password to access problem reports of system programs"
-msgstr "โปรดป้อนรหัสผ่านเพื่อเข้าถึงรายงานปัญหาของโปรแกรมระบบ"
+"Specify a running program in --file-bug mode. If this is specified, the bug "
+"report will contain more information.  (Implied if pid is given as only "
+"argument.)"
+msgstr ""
+"ระบุโปรแกรมที่กำลังทำงานในโหมด --file-bug ถ้ามีการระบุ "
+"รายงานปัญหาจะประกอบด้วยข้อมูลเพิ่มเติม  (ไม่ทำงานถ้า pid "
+"ถูกใส่เพียงอาร์กิวเมนต์)"
 
-#: ../bin/apport-retrace.py:34 ../debian/tmp/usr/bin/apport-retrace.py:34
-msgid "Do not put the new traces into the report, but write them to stdout."
-msgstr "ไม่ต้องเพิ่มการติดตามใหม่ลงในรายงาน แต่ให้เขียนไปที่ stdout"
+#: ../apport/ui.py:799
+#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:799
+msgid "The provided pid is a hanging application."
+msgstr "pid ที่ระบุเป็นโปรแกรมที่ทำงานค้างอยู่"
 
-#: ../bin/apport-retrace.py:36 ../debian/tmp/usr/bin/apport-retrace.py:36
+#: ../apport/ui.py:801
+#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:801
+#, python-format
 msgid ""
-"Start an interactive gdb session with the report's core dump (-o ignored; "
-"does not rewrite report)"
+"Report the crash from given .apport or .crash file instead of the pending "
+"ones in %s. (Implied if file is given as only argument.)"
 msgstr ""
-"เริ่มวาระ gdb แบบโต้ตอบพร้อมบันทึกหลักของรายงาน (ละเว้น -o; "
-"ไม่ต้องเขียนรายงานใหม่)"
+"รายงานความล้มเหลวจากแฟ้ม .apport หรือ .crash ที่ให้มาแทนที่กำลังรออยู่ใน %s "
+"(ไม่ทำงานถ้าแฟ้มถูกใส่เพียงอาร์กิวเมนต์)"
 
-#: ../bin/apport-retrace.py:38 ../debian/tmp/usr/bin/apport-retrace.py:38
+#: ../apport/ui.py:803
+#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:803
 msgid ""
-"Write modified report to given file instead of changing the original report"
+"In bug filing mode, save the collected information into a file instead of "
+"reporting it. This file can then be reported later on from a different "
+"machine."
 msgstr ""
-"เขียนรายงานที่ปรับเปลี่ยนไปที่แฟ้มที่ระบุแทนที่จะเปลี่ยนรายงานดั้งเดิม"
+"ในโหมดรายงานปัญหา บันทึกข้อมูลที่รวบรวมเป็นแฟ้มแทนที่จะรายงาน "
+"แฟ้มนี้สามารถเก็บไว้รายงานได้ทีหลังโดยใช้เครื่องอื่นได้"
 
-#: ../bin/apport-retrace.py:41 ../debian/tmp/usr/bin/apport-retrace.py:41
-msgid "Remove the core dump from the report after stack trace regeneration"
-msgstr "เอาบันทึกหลักออกจากรายงานหลังจากที่สร้างการติดตามสแตกใหม่แล้ว"
+#: ../apport/ui.py:807
+#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:807
+msgid "Print the Apport version number."
+msgstr "พิมพ์หมายเลขรุ่น Apport"
 
-#: ../bin/apport-retrace.py:43 ../debian/tmp/usr/bin/apport-retrace.py:43
-msgid "Override report's CoreFile"
-msgstr "แทนที่ CoreFile ของรายงาน"
+#: ../apport/ui.py:958
+#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:958
+msgid ""
+"This will launch apport-retrace in a terminal window to examine the crash."
+msgstr ""
+"การดำเนินการนี้จะเป็นการเรียกใช้ apport-retrace "
+"ในหน้าต่างเทอร์มินัลเพื่อตรวจสอบความล้มเหลว"
 
-#: ../bin/apport-retrace.py:45 ../debian/tmp/usr/bin/apport-retrace.py:45
-msgid "Override report's ExecutablePath"
-msgstr "แทนที่ ExecutablePath ของรายงาน"
+#: ../apport/ui.py:959
+#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:959
+msgid "Run gdb session"
+msgstr "เรียกใช้วาระ gdb"
 
-#: ../bin/apport-retrace.py:47 ../debian/tmp/usr/bin/apport-retrace.py:47
-msgid "Override report's ProcMaps"
-msgstr "แทนที่ ProcMaps ของรายงาน"
+#: ../apport/ui.py:960
+#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:960
+msgid "Run gdb session without downloading debug symbols"
+msgstr "เรียกใช้วาระ gdb session โดยไม่ต้องดาวน์โหลดสัญลักษณ์การดีบั๊ก"
 
-#: ../bin/apport-retrace.py:49 ../debian/tmp/usr/bin/apport-retrace.py:49
-msgid "Rebuild report's Package information"
-msgstr "สร้างรายงานข้อมูลแพกเกจใหม่"
+#. TRANSLATORS: %s contains the crash report file name
+#: ../apport/ui.py:962
+#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:962
+#, python-format
+msgid "Update %s with fully symbolic stack trace"
+msgstr "อัปเดต %s พร้อมข้อมูลการติดตามสแตกเชิงสัญลักษณ์"
 
-#: ../bin/apport-retrace.py:51 ../debian/tmp/usr/bin/apport-retrace.py:51
-msgid ""
-"Build a temporary sandbox and download/install the necessary packages and "
-"debug symbols in there; without this option it assumes that the necessary "
-"packages and debug symbols are already installed in the system. The argument "
-"points to the packaging system configuration base directory; if you specify "
-"\"system\", it will use the system configuration files, but will then only "
-"be able to retrace crashes that happened on the currently running release."
+#: ../apport/ui.py:998
+#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:998
+msgid "Can't remember send report status settings"
 msgstr ""
-"สร้าง Sandbox "
-"แบบชั่วคราวและดาวน์โหลด/ติดตั้งแพกเกจที่จำเป็นและสัญลักษณ์การดีบั๊กในนั้น "
-"ถ้าไม่ใช้ตัวเลือกนี้ "
-"จะถือว่าแพกเกจที่จำเป็นและสัญลักษณ์การดีบั๊กได้ถูกติดตั้งไว้ในระบบแล้ว "
-"อาร์กิวเมนต์จะบ่งชี้ไปที่ไดเรกทอรีพื้นฐานการกำหนดค่าระบบแพกเกจ ถ้าคุณระบุ "
-"\"system\" ก็จะใช้เพียงแฟ้มกำหนดค่าของระบบ "
-"แต่จะสามารถทำได้เพียงติดตามความล้มเหลวที่เกิดขึ้นเมื่อใช้รุ่นที่กำลังใช้งานอย"
-"ู่ในขณะนี้เท่านั้น"
 
-#: ../bin/apport-retrace.py:53 ../debian/tmp/usr/bin/apport-retrace.py:53
+#: ../apport/ui.py:999
+#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:999
 msgid ""
-"Build another temporary sandbox for installing gdb and its dependencies "
-"using the same release as the report rather than whatever version of gdb you "
-"have installed."
+"Saving crash reporting state failed. Can't set auto or never reporting mode."
 msgstr ""
-"สร้าง Sandbox ใหม่ชั่วคราวสำหรับติดตั้ง gdb และแพกเกจอื่นๆ "
-"ที่เกี่ยวข้องโดยใช้รุ่นเดียวกับรายงานแทน gdb รุ่นที่คุณได้ติดตั้งไว้"
 
-#: ../bin/apport-retrace.py:55 ../debian/tmp/usr/bin/apport-retrace.py:55
+#: ../apport/ui.py:1058 ../apport/ui.py:1068
+#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1058
+#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1068
 msgid ""
-"Report download/install progress when installing packages into sandbox"
-msgstr ""
-"รายงานความคืบหน้าในการดาวน์โหลด/ติดตั้งระหว่างติดตั้งแพกเกจไปที่ Sandbox"
-
-#: ../bin/apport-retrace.py:57 ../debian/tmp/usr/bin/apport-retrace.py:57
-msgid "Prepend timestamps to log messages, for batch operation"
-msgstr "ขึ้นต้นการประทับเวลาในข้อความปูม สำหรับดำเนินการชุดงาน"
+"This problem report applies to a program which is not installed any more."
+msgstr "รายงานปัญหานี้จะนำไปใช้กับโปรแกรมที่ไม่ได้ติดตั้งอีกต่อไป"
 
-#: ../bin/apport-retrace.py:59 ../debian/tmp/usr/bin/apport-retrace.py:59
+#: ../apport/ui.py:1083
+#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1083
+#, python-format
 msgid ""
-"Create and use third-party repositories from origins specified in reports"
-msgstr "สร้างและใช้ที่เก็บจากบุคคลที่สามจากแหล่งข้อมูลที่ระบุไว้ในรายงาน"
+"The problem happened with the program %s which changed since the crash "
+"occurred."
+msgstr ""
+"มีปัญหาเกิดขึ้นกับโปรแกรม %s ซึ่งมีการเปลี่ยนแปลงตั้งแต่เกิดความล้มเหลวขึ้น"
 
-#: ../bin/apport-retrace.py:61 ../debian/tmp/usr/bin/apport-retrace.py:61
-msgid "Cache directory for packages downloaded in the sandbox"
-msgstr "ไดเรกทอรีแคชสำหรับแพกเกจที่ดาวน์โหลดใน Sandbox"
+#: ../apport/ui.py:1130 ../apport/ui.py:1211 ../apport/ui.py:1426
+#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1130
+#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1211
+#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1426
+msgid "This problem report is damaged and cannot be processed."
+msgstr "รายงานปัญหาเสียหายทำให้ไม่สามารถดำเนินการต่้อได้"
 
-#: ../bin/apport-retrace.py:63 ../debian/tmp/usr/bin/apport-retrace.py:63
+#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1141
+#: ../apport/ui.py:1141
+#, python-format
 msgid ""
-"Directory for unpacked packages. Future runs will assume that any already "
-"downloaded package is also extracted to this sandbox."
+"This report is about a snap published by %s. Contact them via %s for help."
 msgstr ""
-"ไดเรกทอรีสำหรับแพกเกจที่ยังไม่ได้แยก "
-"การเรียกใช้งานครั้งต่อไปก็จะถือว่าแพกเกจที่ดาวน์โหลดไว้ถูกแยกไปที่ Sandbox "
-"แล้ว"
 
-#: ../bin/apport-retrace.py:65 ../bin/apport-valgrind.py:66
-#: ../debian/tmp/usr/bin/apport-retrace.py:65
-#: ../debian/tmp/usr/bin/apport-valgrind.py:66
+#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1144
+#: ../apport/ui.py:1144
+#, python-format
 msgid ""
-"Install an extra package into the sandbox (can be specified multiple times)"
-msgstr "ติดตั้งแพกเกจพิเศษไปที่ Sandbox (สามารถระบุได้หลายครั้ง)"
+"This report is about a snap published by %s. No contact address has been "
+"provided; visit the forum at https://forum.snapcraft.io/ for help."
+msgstr ""
 
-#: ../bin/apport-retrace.py:67 ../debian/tmp/usr/bin/apport-retrace.py:67
-msgid ""
-"Path to a file with the crash database authentication information. This is "
-"used when specifying a crash ID to upload the retraced stack traces (only if "
-"neither -g, -o, nor -s are specified)"
+#: ../apport/ui.py:1135
+#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1135
+msgid "This report is about a package that is not installed."
 msgstr ""
-"เส้นทางที่ไปยังแฟ้มที่มีข้อมูลการตรวจสอบความถูกต้องของฐานข้อมูลความล้มเหลว "
-"โดยจะถูกใช้เมื่อระบุ ID "
-"ความล้มเหลวเพื่ออัปโหลดการติดตามสแตกที่มีการติดตามใหม่ (เฉพาะเมื่อไม่ได้ระบุ "
-"-g, -o, หรือ -s)"
 
-#: ../bin/apport-retrace.py:69 ../debian/tmp/usr/bin/apport-retrace.py:69
+#: ../apport/ui.py:1139
+#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1139
+msgid "An error occurred while attempting to process this problem report:"
+msgstr "เกิดข้อผิดพลาดขณะพยายามประมวลผลการรายงานปัญหานี้:"
+
+#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1159
+#: ../apport/ui.py:1159
+#, python-format
 msgid ""
-"Display retraced stack traces and ask for confirmation before sending them "
-"to the crash database."
+"You are about to report a bug against the deb package, but you also a have "
+"snap published by %s installed. You can contact them via %s for help. Do you "
+"want to continue with the bug report against the deb?"
 msgstr ""
-"แสดงการติดตามสแตกที่ติดตามใหม่และร้องขอการยืนยันก่อนที่จะส่งไปที่ฐานข้อมูลควา"
-"มล้มเหลว"
 
-#: ../bin/apport-retrace.py:71 ../debian/tmp/usr/bin/apport-retrace.py:71
+#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1161
+#: ../apport/ui.py:1161
+#, python-format
 msgid ""
-"Path to the duplicate sqlite database (default: no duplicate checking)"
+"You are about to report a bug against the deb package, but you also a have "
+"snap published by %s installed. For the snap, no contact address has been "
+"provided; visit the forum at https://forum.snapcraft.io/ for help. Do you "
+"want to continue with the bug report against the deb?"
 msgstr ""
-"เส้นทางที่ไปยังฐานข้อมูล sqlite ที่ทำซ้ำ (ค่าปริยาย: ไม่มีการตรวจสอบการทำซ้ำ)"
 
-#: ../bin/apport-retrace.py:73 ../debian/tmp/usr/bin/apport-retrace.py:73
-msgid "Do not add StacktraceSource to the report."
-msgstr ""
+#: ../apport/ui.py:1255
+#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1255
+msgid "Could not determine the package or source package name."
+msgstr "ไม่สามารถกำหนดแพกเกจหรือชื่อแพกเกจต้นฉบับได้"
 
-#: ../bin/apport-retrace.py:82 ../debian/tmp/usr/bin/apport-retrace.py:82
-msgid "You cannot use -C without -S. Stopping."
-msgstr "คุณไม่สามารถใช้ -C โดยไม่ใช้ -S ได้ กำลังหยุดทำงาน"
+#: ../apport/ui.py:1273
+#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1273
+msgid "Unable to start web browser"
+msgstr "ไม่สามารถเริ่มเว็บเบราว์เซอร์ได้"
 
-#. translators: don't translate y/n, apport currently only checks for "y"
-#: ../bin/apport-retrace.py:115 ../debian/tmp/usr/bin/apport-retrace.py:115
-msgid "OK to send these as attachments? [y/n]"
-msgstr "ต้องการส่งเป็นสิ่งที่แนบมาหรือไม่? [y/n]"
+#: ../apport/ui.py:1274
+#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1274
+#, python-format
+msgid "Unable to start web browser to open %s."
+msgstr "ไม่สามารถเริ่มเว็บเบราว์เซอร์เพื่อเปิด %s"
 
-#: ../bin/apport-valgrind.py:37 ../debian/tmp/usr/bin/apport-valgrind.py:37
-msgid "See man page for details."
-msgstr "ดูที่ Man page สำหรับรายละเอียดเพิ่มเติม"
+#: ../apport/ui.py:1374
+#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1374
+#, python-format
+msgid "Please enter your account information for the %s bug tracking system"
+msgstr "โปรดป้อนข้อมูลบัญชีของคุณสำหรับระบบติดตามปัญหาของ %s"
 
-#: ../bin/apport-valgrind.py:43 ../debian/tmp/usr/bin/apport-valgrind.py:43
-msgid "specify the log file name produced by valgrind"
-msgstr "ระบุชื่อแฟ้มปูมที่สร้างขึ้นโดย valgrind"
+#: ../apport/ui.py:1386
+#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1386
+msgid "Network problem"
+msgstr "ปัญหาเครือข่าย"
 
-#: ../bin/apport-valgrind.py:46 ../debian/tmp/usr/bin/apport-valgrind.py:46
+#: ../apport/ui.py:1388
+#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1388
 msgid ""
-"reuse a previously created sandbox dir (SDIR) or, if it does not exist, "
-"create it"
+"Cannot connect to crash database, please check your Internet connection."
 msgstr ""
-"นำ ไดเรกทอรี Sandbox (SDIR) ที่สร้างไว้ก่อนหน้านี้มาใช้ใหม่ "
-"หรือสร้างขึ้นมาถ้าเกิดไม่มีอยู่"
+"ไม่สามารถเชื่อมต่อไปที่ฐานข้อมูลความล้มเหลวได้ "
+"โปรดตรวจสอบการเชื่อมต่ออินเทอร์เน็ตของคุณ"
 
-#: ../bin/apport-valgrind.py:50 ../debian/tmp/usr/bin/apport-valgrind.py:50
-msgid ""
-"do  not  create  or reuse a sandbox directory for additional debug symbols "
-"but rely only on installed debug symbols."
-msgstr ""
-"ไม่ต้องสร้างหรือนำไดเรกทอรี Sandbox มาใช้ใหม่สำหรับสัญลักษณ์การดีบั๊ก "
-"แต่ให้อ้างอิงเฉพาะสัญลักษณ์การดีบั๊กที่ติดตั้งเท่านั้น"
+#: ../apport/ui.py:1415
+#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1415
+msgid "Memory exhaustion"
+msgstr "หน่วยความจำหมด"
 
-#: ../bin/apport-valgrind.py:54 ../debian/tmp/usr/bin/apport-valgrind.py:54
-msgid ""
-"reuse a previously created cache dir (CDIR) or, if it does not exist, create "
-"it"
-msgstr ""
-"ใช้ไดเรกทอรีแคช (CDIR) ที่สร้างไว้ก่อนหน้านี้มาใช้ใหม่ "
-"หรือสร้างขึ้นมาถ้าเกิดไม่มีอยู่"
+#: ../apport/ui.py:1416
+#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1416
+msgid "Your system does not have enough memory to process this crash report."
+msgstr "ระบบของคุณมีหน่วยความจำไม่เพียงพอสำหรับประมวลผลการรายงานปัญหานี้"
 
-#: ../bin/apport-valgrind.py:58 ../debian/tmp/usr/bin/apport-valgrind.py:58
+#: ../apport/ui.py:1451
+#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1451
+#, python-format
 msgid ""
-"report download/install progress when installing packages into sandbox"
+"The problem cannot be reported:\n"
+"\n"
+"%s"
 msgstr ""
-"รายงานความคืบหน้าของการดาวน์โหลด/ติดตั้งระหว่างติดตั้งแพกเกจไปที่ Sandbox"
+"ปัญหานี้ไม่สามารถรายงานได้:\n"
+"\n"
+"%s"
 
-#: ../bin/apport-valgrind.py:62 ../debian/tmp/usr/bin/apport-valgrind.py:62
+#: ../apport/ui.py:1507 ../apport/ui.py:1514
+#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1507
+#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1514
+msgid "Problem already known"
+msgstr "ปัญหาที่ทราบแล้ว"
+
+#: ../apport/ui.py:1508
+#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1508
 msgid ""
-"the executable that is run under valgrind's memcheck tool  for memory leak "
-"detection"
+"This problem was already reported in the bug report displayed in the web "
+"browser. Please check if you can add any further information that might be "
+"helpful for the developers."
 msgstr ""
-"แฟ้มปฏิบัติการที่ทำงานภายใต้เครื่องมือตรวจสอบหน่วยความจำของ valgrind "
-"สำหรับตรวจหาการรั่วไหลของหน่วยความจำ"
+"ปัญหานี้ถูกรายงานอยู่แล้วในรายงานปัญหาที่แสดงในเว็บเบราว์เซอร์ "
+"โปรดตรวจสอบว่าคุณสามารถเพิ่มข้อมูลเพิ่มเติมที่อาจเป็นประโยชน์ต่อนักพัฒนาได้หร"
+"ือไม่"
 
-#: ../bin/apport-valgrind.py:97 ../debian/tmp/usr/bin/apport-valgrind.py:97
-#, python-format
-msgid "Error: %s is not an executable. Stopping."
-msgstr "ผิดพลาด: %s ไม่ใช่แฟ้มปฏิบัติการ กำลังหยุดทำงาน"
+#: ../apport/ui.py:1515
+#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1515
+msgid "This problem was already reported to developers. Thank you!"
+msgstr "ปัญหานี้ถูกรายงานให้ทางผู้พัฒนาไปแล้ว ขอขอบคุณ!"
 
-#: ../debian/tmp/usr/share/apport/general-hooks/ubuntu.py:186
-#: ../data/general-hooks/ubuntu.py:186
+#: ../data/general-hooks/ubuntu.py:195
+#: ../debian/tmp/usr/share/apport/general-hooks/ubuntu.py:195
 msgid ""
 "An Ubuntu package has a file conflict with a package that is not a genuine "
 "Ubuntu package."
 msgstr ""
 "แพคเกจ Ubuntu มีแฟ้มที่ขัดแย้งกับแพกเกจซึ่งไม่ใช้แพกเกจ Ubuntu ที่แท้จริง"
 
-#: ../debian/tmp/usr/share/apport/general-hooks/ubuntu.py:194
-#: ../data/general-hooks/ubuntu.py:194
+#: ../data/general-hooks/ubuntu.py:203
+#: ../debian/tmp/usr/share/apport/general-hooks/ubuntu.py:203
 msgid "You have already encountered this package installation failure."
 msgstr "คุณได้ประสบปัญหาในการติดตั้งแพกเกจนี้แล้ว"
 
-#: ../debian/tmp/usr/share/apport/general-hooks/ubuntu.py:210
-#: ../data/general-hooks/ubuntu.py:210
+#: ../data/general-hooks/ubuntu.py:219
+#: ../debian/tmp/usr/share/apport/general-hooks/ubuntu.py:219
 msgid ""
 "Your system was initially configured with grub version 2, but you have "
 "removed it from your system in favor of grub 1 without configuring it.  To "
@@ -1333,16 +1172,3 @@
 "รุ่นใหม่พร้อมใช้งานแล้ว เปิดเทอร์มินัลและเรียกใช้คำสั่งต่อไปนี้:\n"
 "\n"
 "      sudo apt-get install grub-pc\n"
-
-#: ../debian/tmp/usr/bin/apport-unpack.py:22 ../bin/apport-unpack.py:22
-#, python-format
-msgid "Usage: %s <report> <target directory>"
-msgstr "ให้ใช้: %s <report> <target directory>"
-
-#: ../debian/tmp/usr/bin/apport-unpack.py:42 ../bin/apport-unpack.py:42
-msgid "Destination directory exists and is not empty."
-msgstr "ไดเรกทอรีปลายทางมีอยู่และไม่ว่างเปล่า"
-
-#: ../kde/apport-kde-mimelnk.desktop.in.h:1
-msgid "Apport crash file"
-msgstr "แฟ้มความล้มเหลว Apport"
diff -Nru language-pack-th-18.04+20200123/data/th/LC_MESSAGES/apt.po language-pack-th-18.04+20200702/data/th/LC_MESSAGES/apt.po
--- language-pack-th-18.04+20200123/data/th/LC_MESSAGES/apt.po	2020-01-23 16:55:56.000000000 +0000
+++ language-pack-th-18.04+20200702/data/th/LC_MESSAGES/apt.po	2020-07-08 13:58:08.000000000 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: apt 1.0.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2019-09-05 12:01+0000\n"
+"POT-Creation-Date: 2020-05-13 13:17+0000\n"
 "PO-Revision-Date: 2019-09-06 00:21+0000\n"
 "Last-Translator: Theppitak Karoonboonyanan <Unknown>\n"
 "Language-Team: Thai <thai-l10n@googlegroups.com>\n"
@@ -16,8 +16,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2020-01-23 10:31+0000\n"
-"X-Generator: Launchpad (build b8d1327fd820d6bf500589d6da587d5037c7d88e)\n"
+"X-Launchpad-Export-Date: 2020-07-02 10:30+0000\n"
+"X-Generator: Launchpad (build 1cbd0aa39df153c901321817f9b57cf3f232b507)\n"
 "Language: th\n"
 
 #. TRANSLATOR: Very short word to be displayed before unchanged files in 'apt-get update'
@@ -204,7 +204,7 @@
 msgid "This APT helper has Super Meep Powers."
 msgstr "โปรแกรมช่วยเหลือของ APT นี้มีพลัง Super Meep"
 
-#: apt-private/private-cmndline.cc:549
+#: apt-private/private-cmndline.cc:554
 msgid ""
 "--force-yes is deprecated, use one of the options starting with --allow "
 "instead."
@@ -213,7 +213,7 @@
 #: apt-private/private-depends.cc:35 apt-private/private-download.cc:251
 #: apt-private/private-show.cc:408 apt-private/private-show.cc:410
 #: apt-private/private-show.cc:465 cmdline/apt-mark.cc:56
-#: cmdline/apt-mark.cc:102 cmdline/apt-mark.cc:298
+#: cmdline/apt-mark.cc:114 cmdline/apt-mark.cc:310
 msgid "No packages found"
 msgstr "ไม่พบแพกเกจ"
 
@@ -380,7 +380,7 @@
 msgid "Abort."
 msgstr "เลิกทำ"
 
-#: apt-private/private-install.cc:303 cmdline/apt-mark.cc:239
+#: apt-private/private-install.cc:303 cmdline/apt-mark.cc:251
 msgid "Do you want to continue?"
 msgstr "คุณต้องการจะดำเนินการต่อไปหรือไม่?"
 
@@ -495,7 +495,7 @@
 msgstr ""
 
 #: apt-private/private-install.cc:1010 cmdline/apt-get.cc:121
-#: cmdline/apt-mark.cc:78
+#: cmdline/apt-mark.cc:94
 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "กำหนด %s ให้เป็นการติดตั้งแบบเลือกเองแล้ว\n"
@@ -510,11 +510,11 @@
 msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
 msgstr "เลือกรุ่น '%s' (%s) สำหรับ '%s' แล้ว อันเนื่องมาจาก '%s'\n"
 
-#: apt-private/private-list.cc:129
+#: apt-private/private-list.cc:130
 msgid "Listing"
 msgstr "กำลังแสดงรายชื่อ"
 
-#: apt-private/private-list.cc:159
+#: apt-private/private-list.cc:160
 #, c-format
 msgid "There is %i additional version. Please use the '-a' switch to see it"
 msgid_plural ""
@@ -919,19 +919,19 @@
 msgid "Package %s version %s has an unmet dep:\n"
 msgstr "แพกเกจ %s รุ่น %s ขาดแพกเกจที่ต้องใช้:\n"
 
-#: apt-private/private-update.cc:33
+#: apt-private/private-update.cc:34
 msgid "The update command takes no arguments"
 msgstr "คำสั่ง update ไม่รับอาร์กิวเมนต์เพิ่ม"
 
 #. TRANSLATOR: the first two are manpage references, the last the URI from a sources.list
-#: apt-private/private-update.cc:116
+#: apt-private/private-update.cc:117
 #, c-format
 msgid ""
 "Usage of %s should be preferred over embedding login information directly in "
 "the %s entry for '%s'"
 msgstr ""
 
-#: apt-private/private-update.cc:134
+#: apt-private/private-update.cc:135
 #, c-format
 msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
 msgid_plural ""
@@ -940,7 +940,7 @@
 "มี %i แพกเกจสามารถปรับรุ่นได้ เรียก 'apt list --upgradable' "
 "หากต้องการดูรายชื่อ\n"
 
-#: apt-private/private-update.cc:138
+#: apt-private/private-update.cc:139
 msgid "All packages are up to date."
 msgstr "ปรับรุ่นทุกแพกเกจเป็นรุ่นล่าสุดแล้ว"
 
@@ -1120,12 +1120,12 @@
 msgid "Couldn't find package %s"
 msgstr "ไม่พบแพกเกจ %s"
 
-#: cmdline/apt-get.cc:123 cmdline/apt-mark.cc:80
+#: cmdline/apt-get.cc:123 cmdline/apt-mark.cc:96
 #, c-format
 msgid "%s set to automatically installed.\n"
 msgstr "กำหนด %s ให้เป็นการติดตั้งแบบอัตโนมัติแล้ว\n"
 
-#: cmdline/apt-get.cc:131 cmdline/apt-mark.cc:123
+#: cmdline/apt-get.cc:131 cmdline/apt-mark.cc:135
 msgid ""
 "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
 "instead."
@@ -1213,24 +1213,24 @@
 msgid "Download and display the changelog for the given package"
 msgstr "ดาวน์โหลดและแสดงปูมการแก้ไขของแพกเกจที่กำหนด"
 
-#: cmdline/apt-helper.cc:43
+#: cmdline/apt-helper.cc:44
 msgid "Need one URL as argument"
 msgstr "ต้องการ URL หนึ่งรายการเป็นอาร์กิวเมนต์"
 
-#: cmdline/apt-helper.cc:57
+#: cmdline/apt-helper.cc:58
 msgid "Must specify at least one pair url/filename"
 msgstr "ต้องระบุคู่ URL, ชื่อแฟ้ม อย่างน้อยหนึ่งคู่"
 
-#: cmdline/apt-helper.cc:100 cmdline/apt-helper.cc:104
+#: cmdline/apt-helper.cc:101 cmdline/apt-helper.cc:105
 msgid "Download Failed"
 msgstr "ดาวน์โหลดไม่สำเร็จ"
 
-#: cmdline/apt-helper.cc:125 cmdline/apt-helper.cc:128
+#: cmdline/apt-helper.cc:126 cmdline/apt-helper.cc:129
 #, c-format
 msgid "GetSrvRec failed for %s"
 msgstr ""
 
-#: cmdline/apt-helper.cc:263
+#: cmdline/apt-helper.cc:293
 msgid ""
 "Usage: apt-helper [options] command\n"
 "       apt-helper [options] cat-file file ...\n"
@@ -1240,85 +1240,85 @@
 "e.g. the same proxy configuration or acquire system as APT would.\n"
 msgstr ""
 
-#: cmdline/apt-helper.cc:275
+#: cmdline/apt-helper.cc:305
 msgid "download the given uri to the target-path"
 msgstr "ดาวน์โหลด URI ที่กำหนดลงในพาธปลายทาง"
 
-#: cmdline/apt-helper.cc:276
+#: cmdline/apt-helper.cc:306
 msgid "lookup a SRV record (e.g. _http._tcp.ftp.debian.org)"
 msgstr ""
 
-#: cmdline/apt-helper.cc:277
+#: cmdline/apt-helper.cc:307
 msgid "concatenate files, with automatic decompression"
 msgstr ""
 
-#: cmdline/apt-helper.cc:278
+#: cmdline/apt-helper.cc:308
 msgid "detect proxy using apt.conf"
 msgstr "ตรวจหาพร็อกซีโดยใช้ apt.conf"
 
-#: cmdline/apt-helper.cc:279
+#: cmdline/apt-helper.cc:309
 msgid "wait for system to be online"
 msgstr ""
 
-#: cmdline/apt-helper.cc:280
+#: cmdline/apt-helper.cc:310
 msgid "drop privileges before running given command"
 msgstr ""
 
-#: cmdline/apt-mark.cc:65
+#: cmdline/apt-mark.cc:66
 #, c-format
 msgid "%s can not be marked as it is not installed.\n"
 msgstr "%s ไม่สามารถทำเครื่องหมายได้ เพราะไม่ได้ติดตั้งไว้\n"
 
-#: cmdline/apt-mark.cc:71
+#: cmdline/apt-mark.cc:72
 #, c-format
 msgid "%s was already set to manually installed.\n"
 msgstr "%s ถูกกำหนดให้เป็นการติดตั้งแบบเลือกเองอยู่ก่อนแล้ว\n"
 
-#: cmdline/apt-mark.cc:73
+#: cmdline/apt-mark.cc:74
 #, c-format
 msgid "%s was already set to automatically installed.\n"
 msgstr "%s ถูกกำหนดให้เป็นการติดตั้งแบบอัตโนมัติอยู่ก่อนแล้ว\n"
 
-#: cmdline/apt-mark.cc:311
+#: cmdline/apt-mark.cc:323
 #, c-format
 msgid "%s was already set on hold.\n"
 msgstr "%s ถูกกำหนดให้คงรุ่นอยู่ก่อนแล้ว\n"
 
-#: cmdline/apt-mark.cc:313
+#: cmdline/apt-mark.cc:325
 #, c-format
 msgid "%s was already not hold.\n"
 msgstr "%s ไม่ได้คงรุ่นอยู่ก่อนแล้ว\n"
 
-#: cmdline/apt-mark.cc:340
+#: cmdline/apt-mark.cc:352
 msgid "Executing dpkg failed. Are you root?"
 msgstr "เรียกทำงาน dpkg ไม่สำเร็จ คุณเป็น root หรือเปล่า?"
 
-#: cmdline/apt-mark.cc:343
+#: cmdline/apt-mark.cc:355
 #, c-format
 msgid "%s set on hold.\n"
 msgstr "กำหนด %s ให้คงรุ่นแล้ว\n"
 
-#: cmdline/apt-mark.cc:345
+#: cmdline/apt-mark.cc:357
 #, c-format
 msgid "Canceled hold on %s.\n"
 msgstr "ยกเลิกการคงรุ่นของ %s แล้ว\n"
 
-#: cmdline/apt-mark.cc:347
+#: cmdline/apt-mark.cc:359
 #, c-format
 msgid "Selected %s for purge.\n"
 msgstr ""
 
-#: cmdline/apt-mark.cc:349
+#: cmdline/apt-mark.cc:361
 #, c-format
 msgid "Selected %s for removal.\n"
 msgstr ""
 
-#: cmdline/apt-mark.cc:351
+#: cmdline/apt-mark.cc:363
 #, c-format
 msgid "Selected %s for installation.\n"
 msgstr ""
 
-#: cmdline/apt-mark.cc:403
+#: cmdline/apt-mark.cc:415
 msgid ""
 "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
 "\n"
@@ -1328,27 +1328,27 @@
 "all packages with or without a certain marking.\n"
 msgstr ""
 
-#: cmdline/apt-mark.cc:415
+#: cmdline/apt-mark.cc:427
 msgid "Mark the given packages as automatically installed"
 msgstr "ทำเครื่องหมายแพกเกจที่กำหนดให้เป็นการติดตั้งแบบอัตโนมัติ"
 
-#: cmdline/apt-mark.cc:416
+#: cmdline/apt-mark.cc:428
 msgid "Mark the given packages as manually installed"
 msgstr "ทำเครื่องหมายแพกเกจที่กำหนดให้เป็นการติดตั้งแบบเลือกเอง"
 
-#: cmdline/apt-mark.cc:418
+#: cmdline/apt-mark.cc:430
 msgid "Mark a package as held back"
 msgstr "ทำเครื่องหมายแพกเกจที่กำหนดให้เป็นการคงรุ่น"
 
-#: cmdline/apt-mark.cc:419
+#: cmdline/apt-mark.cc:431
 msgid "Unset a package set as held back"
 msgstr "ลบการทำเครื่องหมายการคงรุ่นจากแพกเกจที่กำหนด"
 
-#: cmdline/apt-mark.cc:424
+#: cmdline/apt-mark.cc:436
 msgid "Print the list of automatically installed packages"
 msgstr "แสดงรายชื่อของแพกเกจที่ติดตั้งแบบอัตโนมัติ"
 
-#: cmdline/apt-mark.cc:425
+#: cmdline/apt-mark.cc:437
 msgid "Print the list of manually installed packages"
 msgstr "แสดงรายชื่อของแพกเกจที่ติดตั้งแบบเลือกเอง"
 
@@ -1480,8 +1480,8 @@
 msgid "Connection failed"
 msgstr "เชื่อมต่อไม่สำเร็จ"
 
-#: methods/basehttp.cc:708 methods/ftp.cc:970 methods/http.cc:615
-#: methods/http.cc:874
+#: methods/basehttp.cc:708 methods/ftp.cc:970 methods/http.cc:619
+#: methods/http.cc:878
 #, c-format
 msgid "File has unexpected size (%llu != %llu). Mirror sync in progress?"
 msgstr ""
@@ -1497,12 +1497,12 @@
 msgid "Internal error"
 msgstr "ข้อผิดพลาดภายใน"
 
-#: methods/cdrom.cc:204
+#: methods/cdrom.cc:203
 #, c-format
 msgid "Unable to read the cdrom database %s"
 msgstr "ไม่สามารถอ่านฐานข้อมูลซีดีรอม %s"
 
-#: methods/cdrom.cc:213
+#: methods/cdrom.cc:212
 msgid ""
 "Please use apt-cdrom to make this CD-ROM recognized by APT. apt-get update "
 "cannot be used to add new CD-ROMs"
@@ -1510,20 +1510,20 @@
 "กรุณาใช้ apt-cdrom เพื่อให้ APT รู้จักซีดีรอมนี้ apt-get update "
 "ไม่สามารถใช้เพิ่มซีดีรอมใหม่ได้"
 
-#: methods/cdrom.cc:223
+#: methods/cdrom.cc:222
 msgid "Wrong CD-ROM"
 msgstr "ซีดีรอมผิดแผ่น"
 
-#: methods/cdrom.cc:250
+#: methods/cdrom.cc:249
 #, c-format
 msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
 msgstr "ไม่สามารถเลิกเมานท์ซีดีรอมใน %s  แผ่นอาจกำลังถูกใช้งานอยู่"
 
-#: methods/cdrom.cc:255
+#: methods/cdrom.cc:254
 msgid "Disk not found."
 msgstr "ไม่พบแผ่น"
 
-#: methods/cdrom.cc:263 methods/file.cc:123 methods/rsh.cc:296
+#: methods/cdrom.cc:262 methods/file.cc:123 methods/rsh.cc:296
 msgid "File not found"
 msgstr "ไม่พบแฟ้ม"
 
@@ -1548,7 +1548,7 @@
 msgid "Connected to %s (%s)"
 msgstr ""
 
-#: methods/connect.cc:167 methods/connect.cc:576 methods/http.cc:317
+#: methods/connect.cc:167 methods/connect.cc:576 methods/http.cc:321
 #, c-format
 msgid "Connecting to %s (%s)"
 msgstr "เชื่อมต่อไปยัง %s (%s)"
@@ -1737,7 +1737,7 @@
 msgid "Unable to accept connection"
 msgstr "ไม่สามารถรับการเชื่อมต่อ"
 
-#: methods/ftp.cc:918 methods/http.cc:1015 methods/rsh.cc:334
+#: methods/ftp.cc:918 methods/http.cc:1033 methods/rsh.cc:334
 msgid "Problem hashing file"
 msgstr "เกิดปัญหาขณะคำนวณค่าแฮชของแฟ้ม"
 
@@ -1816,32 +1816,32 @@
 "available:\n"
 msgstr "ลายเซ็นต่อไปนี้ไม่สามารถตรวจสอบได้ เพราะไม่มีกุญแจสาธารณะ:\n"
 
-#: methods/http.cc:711
+#: methods/http.cc:715
 msgid "Error writing to the file"
 msgstr "เกิดข้อผิดพลาดขณะเขียนลงแฟ้ม"
 
-#: methods/http.cc:728
+#: methods/http.cc:732
 msgid "Error reading from server. Remote end closed connection"
 msgstr ""
 "เกิดข้อผิดพลาดขณะอ่านข้อมูลจากเซิร์ฟเวอร์ ปลายทางอีกด้านหนึ่งปิดการเชื่อมต่อ"
 
-#: methods/http.cc:732
+#: methods/http.cc:736
 msgid "Error reading from server"
 msgstr "เกิดข้อผิดพลาดขณะอ่านข้อมูลจากเซิร์ฟเวอร์"
 
-#: methods/http.cc:769
+#: methods/http.cc:773
 msgid "Error writing to file"
 msgstr "เกิดข้อผิดพลาดขณะเขียนลงแฟ้ม"
 
-#: methods/http.cc:836
+#: methods/http.cc:840
 msgid "Select failed"
 msgstr "select ไม่สำเร็จ"
 
-#: methods/http.cc:842
+#: methods/http.cc:846
 msgid "Connection timed out"
 msgstr "หมดเวลารอเชื่อมต่อ"
 
-#: methods/http.cc:866
+#: methods/http.cc:870
 msgid "Error writing to output file"
 msgstr "เกิดข้อผิดพลาดขณะเขียนลงแฟ้มผลลัพธ์"
 
diff -Nru language-pack-th-18.04+20200123/data/th/LC_MESSAGES/apturl.po language-pack-th-18.04+20200702/data/th/LC_MESSAGES/apturl.po
--- language-pack-th-18.04+20200123/data/th/LC_MESSAGES/apturl.po	2020-01-23 16:55:56.000000000 +0000
+++ language-pack-th-18.04+20200702/data/th/LC_MESSAGES/apturl.po	2020-07-08 13:58:08.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2020-01-23 11:45+0000\n"
-"X-Generator: Launchpad (build b8d1327fd820d6bf500589d6da587d5037c7d88e)\n"
+"X-Launchpad-Export-Date: 2020-07-02 11:30+0000\n"
+"X-Generator: Launchpad (build 1cbd0aa39df153c901321817f9b57cf3f232b507)\n"
 
 #: ../apturl-gtk:49 ../apturl-kde:52
 msgid "User requested interrupt."
diff -Nru language-pack-th-18.04+20200123/data/th/LC_MESSAGES/apt-utils.po language-pack-th-18.04+20200702/data/th/LC_MESSAGES/apt-utils.po
--- language-pack-th-18.04+20200123/data/th/LC_MESSAGES/apt-utils.po	2020-01-23 16:55:56.000000000 +0000
+++ language-pack-th-18.04+20200702/data/th/LC_MESSAGES/apt-utils.po	2020-07-08 13:58:08.000000000 +0000
@@ -8,15 +8,15 @@
 msgstr ""
 "Project-Id-Version: apt 1.0.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2019-09-05 12:01+0000\n"
+"POT-Creation-Date: 2020-05-13 13:17+0000\n"
 "PO-Revision-Date: 2019-09-12 15:24+0000\n"
 "Last-Translator: Theppitak Karoonboonyanan <Unknown>\n"
 "Language-Team: Thai <thai-l10n@googlegroups.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2020-01-23 10:31+0000\n"
-"X-Generator: Launchpad (build b8d1327fd820d6bf500589d6da587d5037c7d88e)\n"
+"X-Launchpad-Export-Date: 2020-07-02 10:31+0000\n"
+"X-Generator: Launchpad (build 1cbd0aa39df153c901321817f9b57cf3f232b507)\n"
 "Language: th\n"
 
 #: cmdline/apt-dump-solver.cc:37
@@ -86,31 +86,31 @@
 "can be used to switch to source package ordering instead.\n"
 msgstr ""
 
-#: ftparchive/apt-ftparchive.cc:199 ftparchive/apt-ftparchive.cc:376
+#: ftparchive/apt-ftparchive.cc:208 ftparchive/apt-ftparchive.cc:375
 msgid "Package extension list is too long"
 msgstr "รายชื่อนามสกุลแพกเกจยาวเกินไป"
 
-#: ftparchive/apt-ftparchive.cc:201 ftparchive/apt-ftparchive.cc:213
-#: ftparchive/apt-ftparchive.cc:236 ftparchive/apt-ftparchive.cc:290
-#: ftparchive/apt-ftparchive.cc:300 ftparchive/apt-ftparchive.cc:322
+#: ftparchive/apt-ftparchive.cc:210 ftparchive/apt-ftparchive.cc:222
+#: ftparchive/apt-ftparchive.cc:245 ftparchive/apt-ftparchive.cc:294
+#: ftparchive/apt-ftparchive.cc:304 ftparchive/apt-ftparchive.cc:326
 #, c-format
 msgid "Error processing directory %s"
 msgstr "เกิดข้อผิดพลาดขณะประมวลผลไดเรกทอรี %s"
 
-#: ftparchive/apt-ftparchive.cc:288
+#: ftparchive/apt-ftparchive.cc:292
 msgid "Source extension list is too long"
 msgstr "รายชื่อนามสกุลซอร์สยาวเกินไป"
 
-#: ftparchive/apt-ftparchive.cc:402
+#: ftparchive/apt-ftparchive.cc:401
 msgid "Error writing header to contents file"
 msgstr "เกิดข้อผิดพลาดขณะเขียนข้อมูลส่วนหัวลงในแฟ้มสารบัญ"
 
-#: ftparchive/apt-ftparchive.cc:432
+#: ftparchive/apt-ftparchive.cc:431
 #, c-format
 msgid "Error processing contents %s"
 msgstr "เกิดข้อผิดพลาดขณะประมวลผลสารบัญ %s"
 
-#: ftparchive/apt-ftparchive.cc:627
+#: ftparchive/apt-ftparchive.cc:621
 msgid ""
 "Usage: apt-ftparchive [options] command\n"
 "Commands: packages binarypath [overridefile [pathprefix]]\n"
@@ -195,11 +195,11 @@
 "  -c=?  อ่านแฟ้มค่าตั้งนี้\n"
 "  -o=?  กำหนดตัวเลือกค่าตั้งเป็นรายตัว"
 
-#: ftparchive/apt-ftparchive.cc:823
+#: ftparchive/apt-ftparchive.cc:817
 msgid "No selections matched"
 msgstr "ไม่มีรายการเลือกที่ตรง"
 
-#: ftparchive/apt-ftparchive.cc:903
+#: ftparchive/apt-ftparchive.cc:897
 #, c-format
 msgid "Some files are missing in the package file group `%s'"
 msgstr "บางแฟ้มขาดหายไปในกลุ่มแฟ้มแพกเกจ `%s'"
diff -Nru language-pack-th-18.04+20200123/data/th/LC_MESSAGES/debconf.po language-pack-th-18.04+20200702/data/th/LC_MESSAGES/debconf.po
--- language-pack-th-18.04+20200123/data/th/LC_MESSAGES/debconf.po	2020-01-23 16:55:57.000000000 +0000
+++ language-pack-th-18.04+20200702/data/th/LC_MESSAGES/debconf.po	2020-07-08 13:58:09.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2020-01-23 10:41+0000\n"
-"X-Generator: Launchpad (build b8d1327fd820d6bf500589d6da587d5037c7d88e)\n"
+"X-Launchpad-Export-Date: 2020-07-02 10:38+0000\n"
+"X-Generator: Launchpad (build 1cbd0aa39df153c901321817f9b57cf3f232b507)\n"
 "Language: th\n"
 
 #: ../Debconf/AutoSelect.pm:88
diff -Nru language-pack-th-18.04+20200123/data/th/LC_MESSAGES/dpkg.po language-pack-th-18.04+20200702/data/th/LC_MESSAGES/dpkg.po
--- language-pack-th-18.04+20200123/data/th/LC_MESSAGES/dpkg.po	2020-01-23 16:55:58.000000000 +0000
+++ language-pack-th-18.04+20200702/data/th/LC_MESSAGES/dpkg.po	2020-07-08 13:58:10.000000000 +0000
@@ -15,8 +15,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2020-01-23 10:43+0000\n"
-"X-Generator: Launchpad (build b8d1327fd820d6bf500589d6da587d5037c7d88e)\n"
+"X-Launchpad-Export-Date: 2020-07-02 10:38+0000\n"
+"X-Generator: Launchpad (build 1cbd0aa39df153c901321817f9b57cf3f232b507)\n"
 "Language: th\n"
 
 #: lib/dpkg/ar.c
@@ -137,7 +137,8 @@
 msgid "error creating new backup file '%s'"
 msgstr "เกิดข้อผิดพลาดขณะสร้างแฟ้มสำรองใหม่ '%s'"
 
-#: lib/dpkg/atomic-file.c lib/dpkg/triglib.c src/infodb-upgrade.c src/remove.c
+#: lib/dpkg/atomic-file.c lib/dpkg/db-ctrl-upgrade.c lib/dpkg/triglib.c
+#: src/remove.c
 #, c-format
 msgid "cannot remove '%.250s'"
 msgstr "ไม่สามารถลบ `%.250s'"
@@ -1173,7 +1174,7 @@
 msgid "rm command for cleanup"
 msgstr "คำสั่ง rm เพื่อทำความสะอาด"
 
-#: lib/dpkg/pkg-db.c lib/dpkg/pkg-spec.c
+#: lib/dpkg/pkg-hash.c lib/dpkg/pkg-spec.c
 #, c-format
 msgid "ambiguous package name '%s' with more than one installed instance"
 msgstr "ชื่อแพกเกจ '%s' กำกวม และมีการติดตั้งมากกว่าหนึ่งชุด"
@@ -1510,7 +1511,7 @@
 msgid "error creating device '%.255s'"
 msgstr "เกิดข้อผิดพลาดขณะสร้างอุปกรณ์ `%.255s'"
 
-#: src/archives.c src/infodb-upgrade.c
+#: lib/dpkg/db-ctrl-upgrade.c src/archives.c
 #, c-format
 msgid "error creating hard link '%.255s'"
 msgstr "เกิดข้อผิดพลาดขณะสร้าง hard link `%.255s'"
@@ -1821,10 +1822,10 @@
 msgid "archive '%s' is not a regular file"
 msgstr ""
 
-#: src/archives.c src/divertcmd.c src/enquiry.c src/main.c src/packages.c
-#: src/querycmd.c src/select.c src/statcmd.c src/trigcmd.c src/verify.c
-#: dpkg-deb/build.c dpkg-deb/extract.c dpkg-deb/info.c dpkg-deb/main.c
-#: dpkg-split/info.c dpkg-split/main.c dpkg-split/queue.c
+#: src/archives.c src/divertcmd.c src/enquiry.c src/force.c src/main.c
+#: src/packages.c src/querycmd.c src/select.c src/statcmd.c src/trigcmd.c
+#: src/verify.c dpkg-deb/build.c dpkg-deb/extract.c dpkg-deb/info.c
+#: dpkg-deb/main.c dpkg-split/info.c dpkg-split/main.c dpkg-split/queue.c
 msgid "<standard output>"
 msgstr "<เอาต์พุตมาตรฐาน>"
 
@@ -2562,15 +2563,15 @@
 msgid "divert-to may not contain newlines"
 msgstr "divert-to ห้ามมีอักขระขึ้นบรรทัดใหม่"
 
-#: src/divertdb.c
+#: lib/dpkg/db-fsys-divert.c
 msgid "failed to open diversions file"
 msgstr "ไม่สามารถเปิดแฟ้ม diversions"
 
-#: src/divertdb.c
+#: lib/dpkg/db-fsys-divert.c
 msgid "failed to fstat diversions file"
 msgstr "ไม่สามารถ fstat แฟ้ม diversions"
 
-#: src/divertdb.c
+#: lib/dpkg/db-fsys-divert.c
 #, c-format
 msgid "conflicting diversions involving '%.250s' or '%.250s'"
 msgstr "มีการเบนแฟ้มขัดแย้งกันโดยเกี่ยวข้องกับ `%.250s' หรือ `%.250s'"
@@ -2871,26 +2872,26 @@
 "แพกเกจ %s ถูกกำหนดให้คงรุ่นไว้ จะไม่ทำอะไรกับแพกเกจดังกล่าว ใช้ตัวเลือก --"
 "force-hold ถ้าจะบังคับให้ทำ\n"
 
-#: src/errors.c
+#: src/force.c
 msgid "overriding problem because --force enabled:"
 msgstr "จะข้ามปัญหาไปเพราะมีการเปิดตัวเลือก --force:"
 
-#: src/filesdb-hash.c
+#: lib/dpkg/db-fsys-digest.c
 #, c-format
 msgid "control file '%s' for package '%s' is missing final newline"
 msgstr "แฟ้มควบคุม '%s' ของแพกเกจ '%s' ขาดอักขระขึ้นบรรทัดใหม่ที่ท้ายบรรทัด"
 
-#: src/filesdb-hash.c
+#: lib/dpkg/db-fsys-digest.c
 #, c-format
 msgid "control file '%s' for package '%s' is missing value"
 msgstr ""
 
-#: src/filesdb-hash.c
+#: lib/dpkg/db-fsys-digest.c
 #, c-format
 msgid "control file '%s' for package '%s' is missing value separator"
 msgstr ""
 
-#: src/filesdb-hash.c
+#: lib/dpkg/db-fsys-digest.c
 #, c-format
 msgid "control file '%s' for package '%s' contains empty filename"
 msgstr "แฟ้มควบคุม '%s' ของแพกเกจ '%s' มีรายการชื่อแฟ้มที่ว่างเปล่า"
@@ -2925,7 +2926,7 @@
 msgid "unable to open files list file for package '%.250s'"
 msgstr "ไม่สามารถเปิดแฟ้มรายชื่อแฟ้มของแพกเกจ `%.250s'"
 
-#: src/filesdb.c
+#: lib/dpkg/db-fsys-files.c
 #, c-format
 msgid ""
 "files list file for package '%.250s' missing; assuming package has no files "
@@ -2949,13 +2950,13 @@
 msgid "reading files list for package '%.250s'"
 msgstr "เกิดปัญหาขณะอ่านรายชื่อแฟ้มของแพกเกจ '%.250s'"
 
-#: src/filesdb.c
+#: lib/dpkg/db-fsys-files.c
 #, c-format
 msgid "files list file for package '%.250s' is missing final newline"
 msgstr ""
 "แฟ้มรายชื่อแฟ้มของแพกเกจ '%.250s' ขาดอักขระขึ้นบรรทัดใหม่ที่ท้ายบรรทัด"
 
-#: src/filesdb.c
+#: lib/dpkg/db-fsys-files.c
 #, c-format
 msgid "files list file for package '%.250s' contains empty filename"
 msgstr "แฟ้มรายชื่อแฟ้มของแพกเกจ `%.250s' มีรายการชื่อแฟ้มที่ว่างเปล่า"
@@ -2965,11 +2966,11 @@
 msgid "error closing files list file for package '%.250s'"
 msgstr "เกิดข้อผิดพลาดขณะปิดแฟ้มรายชื่อแฟ้มของแพกเกจ `%.250s'"
 
-#: src/filesdb.c
+#: lib/dpkg/db-fsys-files.c
 msgid "(Reading database ... "
 msgstr "(กำลังอ่านฐานข้อมูล ... "
 
-#: src/filesdb.c
+#: lib/dpkg/db-fsys-files.c
 #, c-format
 msgid "%d file or directory currently installed.)\n"
 msgid_plural "%d files and directories currently installed.)\n"
@@ -3034,26 +3035,26 @@
 msgstr ""
 "สังเกต: PATH ของ root ควรมี /usr/local/sbin, /usr/sbin และ /sbin ด้วย"
 
-#: src/infodb-access.c
+#: lib/dpkg/db-ctrl-access.c
 #, c-format
 msgid "unable to check existence of '%.250s'"
 msgstr "ไม่สามารถตรวจสอบการมีอยู่ของ `%.250s'"
 
-#: src/infodb-access.c src/infodb-upgrade.c
+#: lib/dpkg/db-ctrl-access.c lib/dpkg/db-ctrl-upgrade.c
 msgid "cannot read info directory"
 msgstr "ไม่สามารถอ่านไดเรกทอรีสารสนเทศ"
 
-#: src/infodb-format.c src/unpack.c
+#: lib/dpkg/db-ctrl-format.c src/unpack.c
 #, c-format
 msgid "error trying to open %.250s"
 msgstr "เกิดข้อผิดพลาดขณะพยายามเปิด %.250s"
 
-#: src/infodb-format.c
+#: lib/dpkg/db-ctrl-format.c
 #, c-format
 msgid "corrupt info database format file '%s'"
 msgstr "แฟ้มฟอร์แมต '%s' ของฐานข้อมูลสารสนเทศแพกเกจเสียหาย"
 
-#: src/infodb-format.c
+#: lib/dpkg/db-ctrl-format.c
 #, c-format
 msgid ""
 "info database format (%d) is bogus or too new; try getting a newer dpkg"
@@ -3061,12 +3062,12 @@
 "ฟอร์แมตของฐานข้อมูลสารสนเทศ (%d) เป็นค่าปลอมหรือใหม่เกินไป ลองติดตั้ง dpkg "
 "รุ่นที่ใหม่กว่านี้"
 
-#: src/infodb-upgrade.c
+#: lib/dpkg/db-ctrl-upgrade.c
 #, c-format
 msgid "info file %s/%s not associated to any package"
 msgstr "แฟ้มสารสนเทศ %s/%s ไม่มีความเชื่อมโยงกับแพกเกจใด"
 
-#: src/infodb-upgrade.c
+#: lib/dpkg/db-ctrl-upgrade.c
 #, c-format
 msgid "error while writing '%s'"
 msgstr "เกิดข้อผิดพลาดขณะเขียน '%s'"
@@ -3271,67 +3272,67 @@
 "ตัวเลือกที่มีเครื่องหมาย [*] จะแสดงข้อมูลมากมาย - ควรไปป์ไปยังคำสั่ง `less' "
 "หรือ `more'"
 
-#: src/main.c
+#: src/force.c
 msgid "Set all force options"
 msgstr "บังคับทุกรายการ"
 
-#: src/main.c
+#: src/force.c
 msgid "Replace a package with a lower version"
 msgstr "แทนที่แพกเกจด้วยรุ่นที่เก่ากว่า"
 
-#: src/main.c
+#: src/force.c
 msgid "Configure any package which may help this one"
 msgstr "ตั้งค่าแพกเกจใดก็ตามที่อาจช่วยให้ติดตั้งแพกเกจนี้ได้"
 
-#: src/main.c
+#: src/force.c
 msgid "Process incidental packages even when on hold"
 msgstr "ดำเนินการกับแพกเกจที่ติดขัดอยู่แม้จะถูกกำหนดให้คงรุ่นไว้ก็ตาม"
 
-#: src/main.c
+#: src/force.c
 msgid "Try to (de)install things even when not root"
 msgstr "พยายามติดตั้ง/ถอดถอนแม้จะไม่ใช่ root"
 
-#: src/main.c
+#: src/force.c
 msgid "PATH is missing important programs, problems likely"
 msgstr "PATH ขาดโปรแกรมสำคัญ ซึ่งน่าจะเป็นปัญหา"
 
-#: src/main.c
+#: src/force.c
 msgid "Install a package even if it fails authenticity check"
 msgstr "ติดตั้งแพกเกจแม้จะไม่ผ่านการตรวจสอบแหล่งต้นตอ"
 
-#: src/main.c
+#: src/force.c
 msgid "Process even packages with wrong versions"
 msgstr "ดำเนินการแม้กับแพกเกจที่ผิดรุ่น"
 
-#: src/main.c
+#: src/force.c
 msgid "Overwrite a file from one package with another"
 msgstr "เขียนทับแฟ้มของแพกเกจอื่น"
 
-#: src/main.c
+#: src/force.c
 msgid "Overwrite a diverted file with an undiverted version"
 msgstr "เขียนทับแฟ้มที่เบนอยู่ด้วยฉบับที่ไม่ได้เบน"
 
-#: src/main.c
+#: src/force.c
 msgid "Overwrite one package's directory with another's file"
 msgstr "เขียนทับไดเรกทอรีของแพกเกจด้วยแฟ้มของแพกเกจอื่น"
 
-#: src/main.c
+#: src/force.c
 msgid "Do not perform safe I/O operations when unpacking"
 msgstr "ไม่ต้องใช้การกระทำ I/O แบบปลอดภัยเมื่อแตกแพกเกจ"
 
-#: src/main.c
+#: src/force.c
 msgid "Do not chroot into maintainer script environment"
 msgstr ""
 
-#: src/main.c
+#: src/force.c
 msgid "Always use the new config files, don't prompt"
 msgstr "ใช้แฟ้มค่าตั้งใหม่เสมอโดยไม่ต้องถาม"
 
-#: src/main.c
+#: src/force.c
 msgid "Always use the old config files, don't prompt"
 msgstr "ใช้แฟ้มค่าตั้งเดิมเสมอโดยไม่ต้องถาม"
 
-#: src/main.c
+#: src/force.c
 msgid ""
 "Use the default option for new config files if one\n"
 "is available, don't prompt. If no default can be found,\n"
@@ -3342,39 +3343,39 @@
 "โดยไม่ต้องถาม ถ้าไม่มีค่าปริยายกำหนดไว้ ก็จะถามคำถาม\n"
 "ยกเว้นมีการกำหนดตัวเลือก confold หรือ confnew ด้วย"
 
-#: src/main.c
+#: src/force.c
 msgid "Always install missing config files"
 msgstr "ติดตั้งแฟ้มค่าตั้งที่ขาดหายเสมอ"
 
-#: src/main.c
+#: src/force.c
 msgid "Offer to replace config files with no new versions"
 msgstr "เสนอการแทนที่แฟ้มค่าตั้งที่ไม่มีรุ่นใหม่"
 
-#: src/main.c
+#: src/force.c
 msgid "Process even packages with wrong or no architecture"
 msgstr "ดำเนินการแม้กับแพกเกจที่ผิดสถาปัตยกรรมหรือไม่ระบุสถาปัตยกรรม"
 
-#: src/main.c
+#: src/force.c
 msgid "Install even if it would break another package"
 msgstr "ติดตั้งแพกเกจแม้จะทำให้แพกเกจอื่นพัง"
 
-#: src/main.c
+#: src/force.c
 msgid "Allow installation of conflicting packages"
 msgstr "ยอมให้ติดตั้งแพกเกจที่ขัดแย้งกัน"
 
-#: src/main.c
+#: src/force.c
 msgid "Turn all dependency problems into warnings"
 msgstr "เปลี่ยนปัญหาความขึ้นต่อกันทั้งหมดของแพกเกจให้เป็นแค่คำเตือน"
 
-#: src/main.c
+#: src/force.c
 msgid "Turn dependency version problems into warnings"
 msgstr "เปลี่ยนปัญหาความขึ้นต่อรุ่นของแพกเกจให้เป็นแค่คำเตือน"
 
-#: src/main.c
+#: src/force.c
 msgid "Remove packages which require installation"
 msgstr "ถอดถอนแพกเกจที่ต้องการการติดตั้งซ้ำ"
 
-#: src/main.c
+#: src/force.c
 msgid "Remove an essential package"
 msgstr "ถอดถอนแพกเกจจำเป็น"
 
@@ -3506,7 +3507,7 @@
 msgid "cannot remove architecture '%s' currently in use by the database"
 msgstr "ไม่สามารถลบสถาปัตยกรรม '%s' ซึ่งกำลังใช้งานอยู่ในฐานข้อมูล"
 
-#: src/main.c
+#: src/force.c
 #, c-format
 msgid ""
 "%s forcing options - control behaviour when problems found:\n"
@@ -3520,7 +3521,7 @@
 "<รายการ>,...\n"
 " รายการสำหรับการบังคับ:\n"
 
-#: src/main.c
+#: src/force.c
 #, c-format
 msgid ""
 "\n"
@@ -3532,12 +3533,12 @@
 "อาจทำให้ระบบเสียหายอย่างร้ายแรงได้\n"
 "รายการการบังคับที่ทำเครื่องหมาย [*] ไว้ จะถูกเปิดใช้โดยปริยายอยู่แล้ว\n"
 
-#: src/main.c
+#: src/force.c
 #, c-format
 msgid "unknown force/refuse option '%.*s'"
 msgstr "ไม่รู้จักตัวเลือก force/refuse `%.*s'"
 
-#: src/main.c
+#: src/force.c
 #, c-format
 msgid "obsolete force/refuse option '%s'"
 msgstr ""
@@ -4231,43 +4232,43 @@
 msgid "--update is useless for --remove"
 msgstr "--update ไม่มีประโยชน์อะไรสำหรับ --remove"
 
-#: src/statdb.c
+#: lib/dpkg/db-fsys-override.c
 #, c-format
 msgid "invalid statoverride uid %s"
 msgstr ""
 
-#: src/statdb.c
+#: lib/dpkg/db-fsys-override.c
 #, c-format
 msgid "invalid statoverride gid %s"
 msgstr ""
 
-#: src/statdb.c
+#: lib/dpkg/db-fsys-override.c
 #, c-format
 msgid "invalid statoverride mode %s"
 msgstr ""
 
-#: src/statdb.c
+#: lib/dpkg/db-fsys-override.c
 msgid "failed to open statoverride file"
 msgstr "ไม่สามารถเปิดแฟ้ม statoverride"
 
-#: src/statdb.c
+#: lib/dpkg/db-fsys-override.c
 msgid "failed to fstat statoverride file"
 msgstr "ไม่สามารถ fstat แฟ้ม statoverride"
 
-#: src/statdb.c
+#: lib/dpkg/db-fsys-override.c
 #, c-format
 msgid "reading statoverride file '%.250s'"
 msgstr "เกิดข้อผิดพลาดขณะอ่านแฟ้ม statoverride '%.250s'"
 
-#: src/statdb.c
+#: lib/dpkg/db-fsys-override.c
 msgid "statoverride file is missing final newline"
 msgstr "แฟ้ม statoverride ขาดอักขระขึ้นบรรทัดใหม่ที่ท้ายบรรทัด"
 
-#: src/statdb.c
+#: lib/dpkg/db-fsys-override.c
 msgid "statoverride file contains empty line"
 msgstr "แฟ้ม statoverride มีบรรทัดว่างเปล่า"
 
-#: src/statdb.c
+#: lib/dpkg/db-fsys-override.c
 msgid "syntax error in statoverride file"
 msgstr "พบรูปแบบผิดพลาดในแฟ้ม statoverride"
 
@@ -4276,7 +4277,7 @@
 msgid "unknown user '%s' in statoverride file"
 msgstr "พบผู้ใช้ '%s' ที่ไม่รู้จักอยู่ในแฟ้ม statoverride"
 
-#: src/statdb.c
+#: lib/dpkg/db-fsys-override.c
 msgid "unexpected end of line in statoverride file"
 msgstr "พบจุดจบบรรทัดก่อนกำหนดในแฟ้ม statoverride"
 
@@ -4285,7 +4286,7 @@
 msgid "unknown group '%s' in statoverride file"
 msgstr "พบกลุ่ม '%s' ที่ไม่รู้จักอยู่ในแฟ้ม statoverride"
 
-#: src/statdb.c
+#: lib/dpkg/db-fsys-override.c
 #, c-format
 msgid "multiple statoverrides present for file '%.250s'"
 msgstr "มีรายการ statoverride หลายรายการสำหรับ '%.250s'"
diff -Nru language-pack-th-18.04+20200123/data/th/LC_MESSAGES/fcitx-mozc.po language-pack-th-18.04+20200702/data/th/LC_MESSAGES/fcitx-mozc.po
--- language-pack-th-18.04+20200123/data/th/LC_MESSAGES/fcitx-mozc.po	2020-01-23 16:55:54.000000000 +0000
+++ language-pack-th-18.04+20200702/data/th/LC_MESSAGES/fcitx-mozc.po	2020-07-08 13:58:06.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2020-01-23 12:02+0000\n"
-"X-Generator: Launchpad (build b8d1327fd820d6bf500589d6da587d5037c7d88e)\n"
+"X-Launchpad-Export-Date: 2020-07-02 11:43+0000\n"
+"X-Generator: Launchpad (build 1cbd0aa39df153c901321817f9b57cf3f232b507)\n"
 
 #: ../eim.cc:184
 msgid "Press Escape to go back"
diff -Nru language-pack-th-18.04+20200123/data/th/LC_MESSAGES/friendly-recovery.po language-pack-th-18.04+20200702/data/th/LC_MESSAGES/friendly-recovery.po
--- language-pack-th-18.04+20200123/data/th/LC_MESSAGES/friendly-recovery.po	2020-01-23 16:55:58.000000000 +0000
+++ language-pack-th-18.04+20200702/data/th/LC_MESSAGES/friendly-recovery.po	2020-07-08 13:58:10.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2020-01-23 11:45+0000\n"
-"X-Generator: Launchpad (build b8d1327fd820d6bf500589d6da587d5037c7d88e)\n"
+"X-Launchpad-Export-Date: 2020-07-02 11:31+0000\n"
+"X-Generator: Launchpad (build 1cbd0aa39df153c901321817f9b57cf3f232b507)\n"
 
 #: ../lib/recovery-mode/options/apt-snapshots:20
 #, sh-format
diff -Nru language-pack-th-18.04+20200123/data/th/LC_MESSAGES/gettext-runtime.po language-pack-th-18.04+20200702/data/th/LC_MESSAGES/gettext-runtime.po
--- language-pack-th-18.04+20200123/data/th/LC_MESSAGES/gettext-runtime.po	2020-01-23 16:55:54.000000000 +0000
+++ language-pack-th-18.04+20200702/data/th/LC_MESSAGES/gettext-runtime.po	2020-07-08 13:58:06.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2020-01-23 10:58+0000\n"
-"X-Generator: Launchpad (build b8d1327fd820d6bf500589d6da587d5037c7d88e)\n"
+"X-Launchpad-Export-Date: 2020-07-02 10:50+0000\n"
+"X-Generator: Launchpad (build 1cbd0aa39df153c901321817f9b57cf3f232b507)\n"
 
 #: gnulib-lib/closeout.c:66
 msgid "write error"
diff -Nru language-pack-th-18.04+20200123/data/th/LC_MESSAGES/gold.po language-pack-th-18.04+20200702/data/th/LC_MESSAGES/gold.po
--- language-pack-th-18.04+20200123/data/th/LC_MESSAGES/gold.po	2020-01-23 16:55:54.000000000 +0000
+++ language-pack-th-18.04+20200702/data/th/LC_MESSAGES/gold.po	2020-07-08 13:58:06.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2020-01-23 10:37+0000\n"
-"X-Generator: Launchpad (build b8d1327fd820d6bf500589d6da587d5037c7d88e)\n"
+"X-Launchpad-Export-Date: 2020-07-02 10:34+0000\n"
+"X-Generator: Launchpad (build 1cbd0aa39df153c901321817f9b57cf3f232b507)\n"
 
 #: aarch64-reloc-property.cc:173 arm-reloc-property.cc:303
 #, c-format
@@ -2392,7 +2392,7 @@
 "pointers are definitely not taken"
 msgstr ""
 
-#: options.h:949
+#: options.h:945
 msgid "Number of iterations of ICF (default 2)"
 msgstr ""
 
@@ -3426,7 +3426,7 @@
 msgid "** glink"
 msgstr ""
 
-#: powerpc.cc:5427 powerpc.cc:5874
+#: powerpc.cc:5215 powerpc.cc:5682
 #, c-format
 msgid "%s: linkage table error against `%s'"
 msgstr ""
diff -Nru language-pack-th-18.04+20200123/data/th/LC_MESSAGES/grep.po language-pack-th-18.04+20200702/data/th/LC_MESSAGES/grep.po
--- language-pack-th-18.04+20200123/data/th/LC_MESSAGES/grep.po	2020-01-23 16:55:56.000000000 +0000
+++ language-pack-th-18.04+20200702/data/th/LC_MESSAGES/grep.po	2020-07-08 13:58:08.000000000 +0000
@@ -14,62 +14,62 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2020-01-23 10:59+0000\n"
-"X-Generator: Launchpad (build b8d1327fd820d6bf500589d6da587d5037c7d88e)\n"
+"X-Launchpad-Export-Date: 2020-07-02 10:51+0000\n"
+"X-Generator: Launchpad (build 1cbd0aa39df153c901321817f9b57cf3f232b507)\n"
 "Language: th\n"
 "X-Bugs: Report translation errors to the Language-Team address.\n"
 
-#: lib/argmatch.c:134
+#: lib/argmatch.c:132
 #, c-format
 msgid "invalid argument %s for %s"
 msgstr "อาร์กิวเมนต์ %s ไม่ถูกต้องสำหรับ %s"
 
-#: lib/argmatch.c:135
+#: lib/argmatch.c:133
 #, c-format
 msgid "ambiguous argument %s for %s"
 msgstr "อาร์กิวเมนต์ %s กำกวมไม่ชัดเจน สำหรับ %s"
 
-#: lib/argmatch.c:154
+#: lib/argmatch.c:152 lib/argmatch.h:223
 msgid "Valid arguments are:"
-msgstr "อาร์กิวเมนต์ที่ถูกต้องได้แก่:"
+msgstr "อาร์กิวเมนต์ที่ใช้ได้ ได้แก่:"
 
-#: lib/closeout.c:122 src/grep.c:1274
+#: lib/closeout.c:122 src/grep.c:1278
 msgid "write error"
 msgstr "การเขียนผิดพลาด"
 
-#: lib/dfa.c:958
+#: lib/dfa.c:923
 msgid "unbalanced ["
 msgstr "[ ไม่สมดุลกัน"
 
-#: lib/dfa.c:1079
+#: lib/dfa.c:1044
 msgid "invalid character class"
 msgstr "ชื่อกลุ่มชุดอักขระไม่ถูกต้อง"
 
-#: lib/dfa.c:1205
+#: lib/dfa.c:1170
 msgid "character class syntax is [[:space:]], not [:space:]"
-msgstr "character class syntax is [[:space:]], not [:space:]"
+msgstr "วากยสัมพันธ์ของกลุ่มชุดอักขระ คือ [[:space:]], ไม่ใช่ [:space:]"
 
-#: lib/dfa.c:1272
+#: lib/dfa.c:1237
 msgid "unfinished \\ escape"
-msgstr "เครื่องหมายหลีก \\ ไม่เสร็จสิ้น"
+msgstr "เครื่องหมายหลีก \\ ไม่จบ"
 
-#: lib/dfa.c:1433
+#: lib/dfa.c:1398
 msgid "invalid content of \\{\\}"
-msgstr "เนื้อหาของ  \\{\\} ไม่ถูกต้อง"
+msgstr "เนื้อหาของ \\{\\} ไม่ถูกต้อง"
 
-#: lib/dfa.c:1436
+#: lib/dfa.c:1401
 msgid "regular expression too big"
 msgstr "นิพจน์ปกติใหญ่เกินไป"
 
-#: lib/dfa.c:1850
+#: lib/dfa.c:1872
 msgid "unbalanced ("
 msgstr "( ไม่สมดุลกัน"
 
-#: lib/dfa.c:1968
+#: lib/dfa.c:1989
 msgid "no syntax specified"
 msgstr "ไม่ระบุวากยสัมพันธ์"
 
-#: lib/dfa.c:1976
+#: lib/dfa.c:2000
 msgid "unbalanced )"
 msgstr ") ไม่สมดุลกัน"
 
@@ -105,14 +105,14 @@
 #: lib/getopt.c:621
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
-msgstr "%s: ตัวเลือกไม่ถูกต้อง — ‘%c’\n"
+msgstr "%s: ตัวเลือกไม่ถูกต้อง -- '%c'\n"
 
 #: lib/getopt.c:636 lib/getopt.c:682
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
-msgstr "%s: ตัวเลือกต้องการอาร์กิวเมนต์ — ‘%c’\n"
+msgstr "%s: ตัวเลือกต้องการอาร์กิวเมนต์ -- '%c'\n"
 
-#: lib/obstack.c:338 lib/obstack.c:340 lib/xalloc-die.c:34 src/pcresearch.c:291
+#: lib/obstack.c:338 lib/obstack.c:340 lib/xalloc-die.c:34 src/pcresearch.c:300
 msgid "memory exhausted"
 msgstr "หน่วยความจำถูกใช้จนหมด"
 
@@ -150,7 +150,7 @@
 #. for your locale.
 #. 
 #. If you don't know what to put here, please see
-#. <http://en.wikipedia.org/wiki/Quotation_marks_in_other_languages>
+#. <https://en.wikipedia.org/wiki/Quotation_marks_in_other_languages>
 #. and use glyphs suitable for your language.
 #: lib/quotearg.c:362
 msgid "`"
@@ -158,7 +158,7 @@
 
 #: lib/quotearg.c:363
 msgid "'"
-msgstr "‘"
+msgstr "'"
 
 #: lib/regcomp.c:135
 msgid "Success"
@@ -228,16 +228,16 @@
 msgid "Unmatched ) or \\)"
 msgstr "ไม่ตรงกันกับ ) หรือ \\)"
 
-#: lib/regcomp.c:687
+#: lib/regcomp.c:676
 msgid "No previous regular expression"
 msgstr "ไม่มีนิพจน์ปกติก่อนหน้า"
 
-#: lib/version-etc.c:74
+#: lib/version-etc.c:73
 #, c-format
 msgid "Packaged by %s (%s)\n"
 msgstr "สร้างแพกเกจโดย %s (%s)\n"
 
-#: lib/version-etc.c:77
+#: lib/version-etc.c:76
 #, c-format
 msgid "Packaged by %s\n"
 msgstr "สร้างแพกเกจโดย %s\n"
@@ -245,7 +245,7 @@
 #. TRANSLATORS: Translate "(C)" to the copyright symbol
 #. (C-in-a-circle), if this symbol is available in the user's
 #. locale.  Otherwise, do not translate "(C)"; leave it as-is.
-#: lib/version-etc.c:84
+#: lib/version-etc.c:83
 msgid "(C)"
 msgstr "(C)"
 
@@ -266,19 +266,19 @@
 "\n"
 
 #. TRANSLATORS: %s denotes an author name.
-#: lib/version-etc.c:102
+#: lib/version-etc.c:105
 #, c-format
 msgid "Written by %s.\n"
 msgstr "เขียนโดย %s.\n"
 
 #. TRANSLATORS: Each %s denotes an author name.
-#: lib/version-etc.c:106
+#: lib/version-etc.c:109
 #, c-format
 msgid "Written by %s and %s.\n"
 msgstr "เขียนโดย  %s และ %s.\n"
 
 #. TRANSLATORS: Each %s denotes an author name.
-#: lib/version-etc.c:110
+#: lib/version-etc.c:113
 #, c-format
 msgid "Written by %s, %s, and %s.\n"
 msgstr "เขียนโดย  %s, %s, และ %s.\n"
@@ -286,7 +286,7 @@
 #. TRANSLATORS: Each %s denotes an author name.
 #. You can use line breaks, estimating that each author name occupies
 #. ca. 16 screen columns and that a screen line has ca. 80 columns.
-#: lib/version-etc.c:117
+#: lib/version-etc.c:120
 #, c-format
 msgid ""
 "Written by %s, %s, %s,\n"
@@ -298,7 +298,7 @@
 #. TRANSLATORS: Each %s denotes an author name.
 #. You can use line breaks, estimating that each author name occupies
 #. ca. 16 screen columns and that a screen line has ca. 80 columns.
-#: lib/version-etc.c:124
+#: lib/version-etc.c:127
 #, c-format
 msgid ""
 "Written by %s, %s, %s,\n"
@@ -310,7 +310,7 @@
 #. TRANSLATORS: Each %s denotes an author name.
 #. You can use line breaks, estimating that each author name occupies
 #. ca. 16 screen columns and that a screen line has ca. 80 columns.
-#: lib/version-etc.c:131
+#: lib/version-etc.c:134
 #, c-format
 msgid ""
 "Written by %s, %s, %s,\n"
@@ -322,7 +322,7 @@
 #. TRANSLATORS: Each %s denotes an author name.
 #. You can use line breaks, estimating that each author name occupies
 #. ca. 16 screen columns and that a screen line has ca. 80 columns.
-#: lib/version-etc.c:139
+#: lib/version-etc.c:142
 #, c-format
 msgid ""
 "Written by %s, %s, %s,\n"
@@ -334,7 +334,7 @@
 #. TRANSLATORS: Each %s denotes an author name.
 #. You can use line breaks, estimating that each author name occupies
 #. ca. 16 screen columns and that a screen line has ca. 80 columns.
-#: lib/version-etc.c:147
+#: lib/version-etc.c:150
 #, c-format
 msgid ""
 "Written by %s, %s, %s,\n"
@@ -348,7 +348,7 @@
 #. TRANSLATORS: Each %s denotes an author name.
 #. You can use line breaks, estimating that each author name occupies
 #. ca. 16 screen columns and that a screen line has ca. 80 columns.
-#: lib/version-etc.c:156
+#: lib/version-etc.c:159
 #, c-format
 msgid ""
 "Written by %s, %s, %s,\n"
@@ -362,7 +362,7 @@
 #. TRANSLATORS: Each %s denotes an author name.
 #. You can use line breaks, estimating that each author name occupies
 #. ca. 16 screen columns and that a screen line has ca. 80 columns.
-#: lib/version-etc.c:167
+#: lib/version-etc.c:170
 #, c-format
 msgid ""
 "Written by %s, %s, %s,\n"
@@ -386,12 +386,12 @@
 "\n"
 "รายงานข้อผิดพลาดไปยัง: %s\n"
 
-#: lib/version-etc.c:247
+#: lib/version-etc.c:251
 #, c-format
 msgid "Report %s bugs to: %s\n"
 msgstr "รายงานข้อผิดพลาดของ %s ไปยัง: %s\n"
 
-#: lib/version-etc.c:251
+#: lib/version-etc.c:255 lib/version-etc.c:257
 #, c-format
 msgid "%s home page: <%s>\n"
 msgstr "โฮมเพจของ %s : <%s>\n"
@@ -409,17 +409,17 @@
 #: lib/xstrtol-error.c:63
 #, c-format
 msgid "invalid %s%s argument '%s'"
-msgstr "%s%s รับอาร์กิวเมนต์ที่ไม่ถูกต้อง ‘%s’"
+msgstr "%s%s รับอาร์กิวเมนต์ที่ไม่ถูกต้อง '%s'"
 
 #: lib/xstrtol-error.c:68
 #, c-format
 msgid "invalid suffix in %s%s argument '%s'"
-msgstr "คำเสริมท้ายไม่ถูกต้องใน %s%s อาร์กิวเมนต์  ‘%s’"
+msgstr "คำเสริมท้ายไม่ถูกต้องใน %s%s อาร์กิวเมนต์ '%s'"
 
 #: lib/xstrtol-error.c:72
 #, c-format
 msgid "%s%s argument '%s' too large"
-msgstr "%s%s อาร์กิวเมนต์ ‘%s’ ใหญ่มากเกินไป"
+msgstr "%s%s อาร์กิวเมนต์ '%s' ใหญ่มากเกินไป"
 
 #. This is a proper name. See the gettext manual, section Names.
 #: src/grep.c:59
@@ -430,33 +430,33 @@
 msgid "others, see <http://git.sv.gnu.org/cgit/grep.git/tree/AUTHORS>"
 msgstr "อื่น ๆ , ดูที่ <http://git.sv.gnu.org/cgit/grep.git/tree/AUTHORS>"
 
-#: src/grep.c:585
+#: src/grep.c:584
 msgid "(standard input)"
 msgstr "(นำเข้ามาตรฐาน)"
 
-#: src/grep.c:765
+#: src/grep.c:764
 msgid "invalid context length argument"
 msgstr "ความยาวบริบทอาร์กิวเมนต์ไม่ถูกต้อง"
 
-#: src/grep.c:828
+#: src/grep.c:829
 msgid "input is too large to count"
 msgstr "ข้อมูลเข้ายาวเกินกว่าจะนับได้"
 
-#: src/grep.c:1579
+#: src/grep.c:1583
 #, c-format
 msgid "Binary file %s matches\n"
 msgstr "ตรงกันกันกับแฟ้มฐานสอง %s\n"
 
-#: src/grep.c:1627
+#: src/grep.c:1624
 #, c-format
 msgid "warning: %s: %s"
 msgstr "คำเตือน: %s: %s"
 
-#: src/grep.c:1628
+#: src/grep.c:1625
 msgid "recursive directory loop"
 msgstr "เรียกซ้ำไดเรกทอรีเป็นวงวน"
 
-#: src/grep.c:1844
+#: src/grep.c:1845
 #, c-format
 msgid "input file %s is also the output"
 msgstr "แฟ้มนำเข้า %s เป็นแฟ้มส่งออกด้วยเหมือนกัน"
@@ -466,10 +466,10 @@
 msgid "Usage: %s [OPTION]... PATTERN [FILE]...\n"
 msgstr "วิธีใช้: %s [OPTION]… PATTERN [FILE]…\n"
 
-#: src/grep.c:1909
+#: src/grep.c:1910
 #, c-format
 msgid "Try '%s --help' for more information.\n"
-msgstr "ลองใช้ ‘%s —help’ เพื่อข้อมูลเพิ่มเติม.\n"
+msgstr "ลองใช้ '%s --help' เพื่อข้อมูลเพิ่มเติม.\n"
 
 #: src/grep.c:1915
 #, c-format
@@ -513,7 +513,7 @@
 "  -z, —null-data           ข้อมูลบรรทัดจบด้วยขนาด 0 ไบต์, "
 "ไม่มีตัวขึ้นบรรทัดใหม่\n"
 
-#: src/grep.c:1933
+#: src/grep.c:1936
 #, c-format
 msgid ""
 "\n"
@@ -525,12 +525,12 @@
 msgstr ""
 "\n"
 "เบ็ดเตล็ด:\n"
-"  -s, —no-messages         ระงับข้อความแสดงข้อผิดพลาด\n"
-"  -v, —invert-match        เลือกบรรทัดที่ไม่ตรงกัน\n"
-"  -V, —version             พิมพ์ข้อมูลรุ่นแล้วออก\n"
-"      —help                แสดงความช่วยเหลือนี้แล้วออก\n"
+"  -s, --no-messages         ระงับข้อความแสดงข้อผิดพลาด\n"
+"  -v, --invert-match        เลือกบรรทัดที่ไม่ตรงกัน\n"
+"  -V, --version             พิมพ์ข้อมูลรุ่นแล้วออก\n"
+"      --help                แสดงความช่วยเหลือนี้แล้วออก\n"
 
-#: src/grep.c:1940
+#: src/grep.c:1943
 #, c-format
 msgid ""
 "\n"
@@ -571,7 +571,7 @@
 "match’\n"
 "  -a, —text                มีค่าเท่ากันกับ —binary-files=text\n"
 
-#: src/grep.c:1958
+#: src/grep.c:1961
 #, c-format
 msgid ""
 "  -I                        equivalent to --binary-files=without-match\n"
@@ -582,13 +582,13 @@
 "  -r, --recursive           like --directories=recurse\n"
 "  -R, --dereference-recursive  likewise, but follow all symlinks\n"
 msgstr ""
-"  -I                        มีค่าเท่ากันกับ —binary-files=without-match\n"
-"  -d, —directories=ACTION  จะทำการจัดการไดเรกทอรีอย่างไร;\n"
-"                            ACTION เป็น `read’, `recurse’, หรือ `skip’\n"
-"  -D, —devices=ACTION      จะทำการจัดการอุปกรณ์อย่างไร, FIFOs and sockets;\n"
-"                            ACTION is `read’ or `skip’\n"
-"  -r, —recursive           เหมือนกับ —directories=recurse\n"
-"  -R, —dereference-recursive  เช่นกัน, แต่ตาม symlink ทั้งหมด\n"
+"  -I                        มีค่าเท่ากันกับ --binary-files=without-match\n"
+"  -d, --directories=ACTION  จะทำการจัดการไดเรกทอรีอย่างไร;\n"
+"                            ACTION เป็น 'read', 'recurse', หรือ 'skip'\n"
+"  -D, --devices=ACTION      จะทำการจัดการอุปกรณ์อย่างไร, FIFOs and sockets;\n"
+"                            ACTION is 'read' or 'skip'\n"
+"  -r, --recursive           เหมือนกับ --directories=recurse\n"
+"  -R, --dereference-recursive  เช่นกัน, แต่ตาม symlink ทั้งหมด\n"
 
 #: src/grep.c:1967
 #, c-format
@@ -605,7 +605,7 @@
 "      —exclude-from=FILE   ข้ามแฟ้มที่ตรงกันกับแบบแผนแฟ้มจาก FILE\n"
 "      —exclude-dir=PATTERN  ไดเร็กทอรีที่ตรงกันกับ PATTERN จะถูกข้ามไป.\n"
 
-#: src/grep.c:1974
+#: src/grep.c:1977
 #, c-format
 msgid ""
 "  -L, --files-without-match  print only names of FILEs with no selected "
@@ -623,7 +623,7 @@
 "  -T, --initial-tab         ทำการจัดเตรียมแท็บ (ถ้าจำเป็น)\n"
 "  -Z, --null                พิมพ์ 0 ไบต์หลังชื่อ FILE\n"
 
-#: src/grep.c:1980
+#: src/grep.c:1983
 #, c-format
 msgid ""
 "\n"
@@ -634,11 +634,11 @@
 msgstr ""
 "\n"
 "ควบคุมบริบท:\n"
-"  -B, —before-context=NUM  พิมพ์ NUM บรรทัดของบริบทส่วนนำ\n"
-"  -A, —after-context=NUM   พิมพ์ NUM บรรทัดของบริบทส่วนตาม\n"
-"  -C, —context=NUM         พิมพ์ NUM บรรทัดของบริบทส่งออก\n"
+"  -B, --before-context=NUM  พิมพ์ NUM บรรทัดของบริบทส่วนนำ\n"
+"  -A, --after-context=NUM   พิมพ์ NUM บรรทัดของบริบทส่วนตาม\n"
+"  -C, --context=NUM         พิมพ์ NUM บรรทัดของบริบทส่งออก\n"
 
-#: src/grep.c:1987
+#: src/grep.c:1990
 #, c-format
 msgid ""
 "  -NUM                      same as --context=NUM\n"
@@ -666,33 +666,33 @@
 "if any error occurs and -q is not given, the exit status is 2.\n"
 msgstr ""
 
-#: src/grep.c:2034
+#: src/grep.c:2039
 msgid "conflicting matchers specified"
 msgstr "การขัดแย้งของการตรงกันได้รับการระบุ"
 
-#: src/grep.c:2038
+#: src/grep.c:2048
 #, c-format
 msgid "invalid matcher %s"
 msgstr "ตัวจับคู่ไม่ถูกต้อง %s"
 
-#: src/grep.c:2458
+#: src/grep.c:2472
 #, c-format
 msgid "warning: GREP_OPTIONS is deprecated; please use an alias or script"
 msgstr "คำเตือน: GREP_OPTIONS ไม่สนับสนุนให้ใช้ ; กรุณาใช้นามแฝงหรือสคริปต์"
 
-#: src/grep.c:2485
+#: src/grep.c:2499
 msgid "unknown devices method"
 msgstr "ไม่รู้จักกระบวนการอุปกรณ์"
 
-#: src/grep.c:2629
+#: src/grep.c:2645
 msgid "invalid max count"
 msgstr "ตัวนับสูงสุดไม่ถูกต้อง"
 
-#: src/grep.c:2687
+#: src/grep.c:2703
 msgid "unknown binary-files type"
-msgstr "ไม่รู้จักชนิดแฟ้มฐานสอง"
+msgstr "ชนิดแฟ้มไบนารีที่ไม่รู้จัก"
 
-#: src/pcresearch.c:80
+#: src/pcresearch.c:85
 msgid "failed to allocate memory for the PCRE JIT stack"
 msgstr "ล้มเหลวที่จะจัดสรรหน่วยความจำสำหรับสแต็ก PCRE JIT"
 
@@ -704,15 +704,15 @@
 "การสนับสนุนตัวเลือก -P ไม่ได้ถูกรวบรวมไปยังแฟ้มฐานสอง —disable-perl-regexp "
 "นี้"
 
-#: src/pcresearch.c:119
+#: src/pcresearch.c:132
 msgid "-P supports only unibyte and UTF-8 locales"
 msgstr "-P สนับสนุนเฉพาะโลแคล unibyte และ UTF-8"
 
-#: src/pcresearch.c:125
+#: src/pcresearch.c:138
 msgid "the -P option only supports a single pattern"
 msgstr "ตัวเลือก -P สนับสนุนรูปแบบเดียวเท่านั้น"
 
-#: src/pcresearch.c:167
+#: src/pcresearch.c:181
 msgid "internal error (should never happen)"
 msgstr "ข้อผิดพลาดภายใน (ไม่ควรเกิดขึ้นมาก่อน)"
 
@@ -720,19 +720,19 @@
 msgid "internal error"
 msgstr "ข้อผิดพลาดภายใน"
 
-#: src/pcresearch.c:215
+#: src/pcresearch.c:224
 msgid "exceeded PCRE's line length limit"
 msgstr "ขอบเขตความยาวบรรทัด PCRE เกินจากข้อจำกัด"
 
-#: src/pcresearch.c:295
+#: src/pcresearch.c:304
 msgid "exhausted PCRE JIT stack"
 msgstr "แสต็ก PCRE JIT ถูกใช้จนหมดแล้ว"
 
-#: src/pcresearch.c:299
+#: src/pcresearch.c:308
 msgid "exceeded PCRE's backtracking limit"
 msgstr "ขอบเขตการ backtrack ของ PCRE เกินจากข้อจำกัด"
 
-#: src/pcresearch.c:306
+#: src/pcresearch.c:315
 #, c-format
 msgid "internal PCRE error: %d"
 msgstr "ข้อผิดพลาด PCRE ภายใน: %d"
diff -Nru language-pack-th-18.04+20200123/data/th/LC_MESSAGES/grub.po language-pack-th-18.04+20200702/data/th/LC_MESSAGES/grub.po
--- language-pack-th-18.04+20200123/data/th/LC_MESSAGES/grub.po	2020-01-23 16:55:56.000000000 +0000
+++ language-pack-th-18.04+20200702/data/th/LC_MESSAGES/grub.po	2020-07-08 13:58:08.000000000 +0000
@@ -7,16 +7,17 @@
 msgstr ""
 "Project-Id-Version: grub2\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2019-11-22 11:21+0000\n"
+"POT-Creation-Date: 2020-03-12 17:34+0000\n"
 "PO-Revision-Date: 2011-04-19 06:13+0000\n"
 "Last-Translator: SiraNokyoongtong <gumaraa@gmail.com>\n"
 "Language-Team: Thai <th@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2020-01-23 11:21+0000\n"
-"X-Generator: Launchpad (build b8d1327fd820d6bf500589d6da587d5037c7d88e)\n"
+"X-Launchpad-Export-Date: 2020-07-02 11:09+0000\n"
+"X-Generator: Launchpad (build 1cbd0aa39df153c901321817f9b57cf3f232b507)\n"
 
+#: .pc/0077-ubuntu-Make-the-linux-command-in-EFI-grub-always-try.patch/grub-core/loader/i386/linux.c:469
 #: .pc/ubuntu-linuxefi.patch/grub-core/loader/i386/bsd.c:1147
 #: .pc/ubuntu-linuxefi.patch/grub-core/loader/i386/linux.c:466
 #: grub-core/loader/i386/bsd.c:1148 grub-core/loader/i386/linux.c:469
@@ -24,6 +25,12 @@
 msgid "Booting in blind mode"
 msgstr ""
 
+#: .pc/0077-ubuntu-Make-the-linux-command-in-EFI-grub-always-try.patch/grub-core/loader/i386/efi/linux.c:86
+#: .pc/0077-ubuntu-Make-the-linux-command-in-EFI-grub-always-try.patch/grub-core/loader/i386/efi/linux.c:173
+#: .pc/0077-ubuntu-Make-the-linux-command-in-EFI-grub-always-try.patch/grub-core/loader/i386/linux.c:694
+#: .pc/0077-ubuntu-Make-the-linux-command-in-EFI-grub-always-try.patch/grub-core/loader/i386/linux.c:1093
+#: .pc/0078-ubuntu-Update-the-linux-boot-protocol-version-check.patch/grub-core/loader/i386/efi/linux.c:87
+#: .pc/0078-ubuntu-Update-the-linux-boot-protocol-version-check.patch/grub-core/loader/i386/efi/linux.c:174
 #: .pc/disable-floppies.patch/grub-core/kern/emu/hostdisk.c:519
 #: .pc/no-devicetree-if-secure-boot.patch/grub-core/loader/arm/linux.c:364
 #: .pc/no-devicetree-if-secure-boot.patch/grub-core/loader/arm/linux.c:409
@@ -65,8 +72,8 @@
 #: grub-core/loader/efi/chainloader.c:900 grub-core/loader/i386/bsd.c:1463
 #: grub-core/loader/i386/bsd.c:1808 grub-core/loader/i386/bsd.c:2086
 #: grub-core/loader/i386/coreboot/chainloader.c:438
-#: grub-core/loader/i386/efi/linux.c:86 grub-core/loader/i386/efi/linux.c:173
-#: grub-core/loader/i386/linux.c:694 grub-core/loader/i386/linux.c:1093
+#: grub-core/loader/i386/efi/linux.c:87 grub-core/loader/i386/efi/linux.c:174
+#: grub-core/loader/i386/linux.c:699 grub-core/loader/i386/linux.c:1098
 #: grub-core/loader/i386/pc/chainloader.c:290
 #: grub-core/loader/i386/pc/freedos.c:105 grub-core/loader/i386/pc/linux.c:140
 #: grub-core/loader/i386/pc/linux.c:410 grub-core/loader/i386/pc/ntldr.c:85
@@ -90,11 +97,17 @@
 msgid "filename expected"
 msgstr ""
 
-#: grub-core/loader/i386/efi/linux.c:187 grub-core/loader/i386/linux.c:706
+#: .pc/0077-ubuntu-Make-the-linux-command-in-EFI-grub-always-try.patch/grub-core/loader/i386/efi/linux.c:187
+#: .pc/0077-ubuntu-Make-the-linux-command-in-EFI-grub-always-try.patch/grub-core/loader/i386/linux.c:706
+#: .pc/0078-ubuntu-Update-the-linux-boot-protocol-version-check.patch/grub-core/loader/i386/efi/linux.c:188
+#: grub-core/loader/i386/efi/linux.c:188 grub-core/loader/i386/linux.c:711
 #: grub-core/loader/i386/pc/linux.c:152
 msgid "cannot allocate kernel buffer"
 msgstr ""
 
+#: .pc/0077-ubuntu-Make-the-linux-command-in-EFI-grub-always-try.patch/grub-core/loader/i386/efi/linux.c:130
+#: .pc/0077-ubuntu-Make-the-linux-command-in-EFI-grub-always-try.patch/grub-core/loader/i386/linux.c:713
+#: .pc/0078-ubuntu-Update-the-linux-boot-protocol-version-check.patch/grub-core/loader/i386/efi/linux.c:131
 #: .pc/no-devicetree-if-secure-boot.patch/grub-core/loader/arm/linux.c:319
 #: .pc/no-devicetree-if-secure-boot.patch/grub-core/loader/efi/fdt.c:138
 #: .pc/ubuntu-efi-allow-loopmount-chainload.patch/grub-core/loader/efi/chainloader.c:985
@@ -139,7 +152,7 @@
 #: grub-core/loader/i386/coreboot/chainloader.c:112
 #: grub-core/loader/i386/coreboot/chainloader.c:148
 #: grub-core/loader/i386/coreboot/chainloader.c:170
-#: grub-core/loader/i386/efi/linux.c:130 grub-core/loader/i386/linux.c:713
+#: grub-core/loader/i386/efi/linux.c:131 grub-core/loader/i386/linux.c:718
 #: grub-core/loader/i386/multiboot_mbi.c:171
 #: grub-core/loader/i386/pc/chainloader.c:202
 #: grub-core/loader/i386/pc/linux.c:159 grub-core/loader/i386/pc/plan9.c:457
@@ -165,16 +178,20 @@
 msgid "premature end of file %s"
 msgstr ""
 
+#: .pc/0077-ubuntu-Make-the-linux-command-in-EFI-grub-always-try.patch/grub-core/loader/i386/linux.c:922
 #: .pc/ubuntu-linuxefi.patch/grub-core/loader/i386/linux.c:876
-#: grub-core/loader/i386/linux.c:922
+#: grub-core/loader/i386/linux.c:927
 msgid "Legacy `ask' parameter no longer supported."
 msgstr ""
 
+#: .pc/0077-ubuntu-Make-the-linux-command-in-EFI-grub-always-try.patch/grub-core/loader/i386/linux.c:938
+#: .pc/0077-ubuntu-Make-the-linux-command-in-EFI-grub-always-try.patch/grub-core/loader/i386/linux.c:948
+#: .pc/0077-ubuntu-Make-the-linux-command-in-EFI-grub-always-try.patch/grub-core/loader/i386/linux.c:978
 #: .pc/ubuntu-linuxefi.patch/grub-core/loader/i386/linux.c:892
 #: .pc/ubuntu-linuxefi.patch/grub-core/loader/i386/linux.c:902
 #: .pc/ubuntu-linuxefi.patch/grub-core/loader/i386/linux.c:932
-#: grub-core/loader/i386/linux.c:938 grub-core/loader/i386/linux.c:948
-#: grub-core/loader/i386/linux.c:978
+#: grub-core/loader/i386/linux.c:943 grub-core/loader/i386/linux.c:953
+#: grub-core/loader/i386/linux.c:983
 #, c-format
 msgid ""
 "%s is deprecated. Use set gfxpayload=%s before linux command instead.\n"
@@ -182,14 +199,18 @@
 
 #. TRANSLATORS: "x" has to be entered in, like an identifier,
 #. so please don't use better Unicode codepoints.
+#: .pc/0077-ubuntu-Make-the-linux-command-in-EFI-grub-always-try.patch/grub-core/loader/i386/linux.c:961
 #: .pc/ubuntu-linuxefi.patch/grub-core/loader/i386/linux.c:915
-#: grub-core/loader/i386/linux.c:961
+#: grub-core/loader/i386/linux.c:966
 #, c-format
 msgid ""
 "%s is deprecated. VGA mode %d isn't recognized. Use set "
 "gfxpayload=WIDTHxHEIGHT[xDEPTH] before linux command instead.\n"
 msgstr ""
 
+#: .pc/0077-ubuntu-Make-the-linux-command-in-EFI-grub-always-try.patch/grub-core/loader/i386/efi/linux.c:92
+#: .pc/0077-ubuntu-Make-the-linux-command-in-EFI-grub-always-try.patch/grub-core/loader/i386/linux.c:1099
+#: .pc/0078-ubuntu-Update-the-linux-boot-protocol-version-check.patch/grub-core/loader/i386/efi/linux.c:93
 #: .pc/ubuntu-linuxefi.patch/grub-core/loader/arm64/linux.c:250
 #: .pc/ubuntu-linuxefi.patch/grub-core/loader/i386/bsd.c:1799
 #: .pc/ubuntu-linuxefi.patch/grub-core/loader/i386/bsd.c:1900
@@ -211,8 +232,8 @@
 #: grub-core/commands/legacycfg.c:574 grub-core/loader/arm64/linux.c:258
 #: grub-core/loader/i386/bsd.c:1800 grub-core/loader/i386/bsd.c:1901
 #: grub-core/loader/i386/bsd.c:2008 grub-core/loader/i386/bsd.c:2041
-#: grub-core/loader/i386/bsd.c:2090 grub-core/loader/i386/efi/linux.c:92
-#: grub-core/loader/i386/linux.c:1099 grub-core/loader/i386/pc/linux.c:416
+#: grub-core/loader/i386/bsd.c:2090 grub-core/loader/i386/efi/linux.c:93
+#: grub-core/loader/i386/linux.c:1104 grub-core/loader/i386/pc/linux.c:416
 #: grub-core/loader/i386/xen.c:775 grub-core/loader/i386/xen.c:859
 #: grub-core/loader/ia64/efi/linux.c:545 grub-core/loader/mips/linux.c:432
 #: grub-core/loader/multiboot.c:389
@@ -225,12 +246,15 @@
 msgid "you need to load the kernel first"
 msgstr ""
 
+#: .pc/0077-ubuntu-Make-the-linux-command-in-EFI-grub-always-try.patch/grub-core/loader/i386/efi/linux.c:368
+#: .pc/0077-ubuntu-Make-the-linux-command-in-EFI-grub-always-try.patch/grub-core/loader/i386/linux.c:1177
+#: .pc/0078-ubuntu-Update-the-linux-boot-protocol-version-check.patch/grub-core/loader/i386/efi/linux.c:372
 #: .pc/no-devicetree-if-secure-boot.patch/grub-core/loader/arm/linux.c:493
 #: .pc/ubuntu-linuxefi.patch/grub-core/loader/arm64/linux.c:383
 #: .pc/ubuntu-linuxefi.patch/grub-core/loader/i386/linux.c:1125
 #: .pc/ubuntu-linuxefi.patch/grub-core/loader/i386/pc/linux.c:479
 #: grub-core/loader/arm/linux.c:505 grub-core/loader/arm64/linux.c:399
-#: grub-core/loader/i386/efi/linux.c:368 grub-core/loader/i386/linux.c:1177
+#: grub-core/loader/i386/efi/linux.c:372 grub-core/loader/i386/linux.c:1182
 #: grub-core/loader/i386/pc/linux.c:492 grub-core/loader/i386/xen.c:962
 #: grub-core/loader/i386/xen.c:964 grub-core/loader/ia64/efi/linux.c:591
 #: grub-core/loader/mips/linux.c:501
@@ -240,12 +264,15 @@
 msgid "Load Linux."
 msgstr "โหลดลินุกซ์"
 
+#: .pc/0077-ubuntu-Make-the-linux-command-in-EFI-grub-always-try.patch/grub-core/loader/i386/efi/linux.c:371
+#: .pc/0077-ubuntu-Make-the-linux-command-in-EFI-grub-always-try.patch/grub-core/loader/i386/linux.c:1179
+#: .pc/0078-ubuntu-Update-the-linux-boot-protocol-version-check.patch/grub-core/loader/i386/efi/linux.c:375
 #: .pc/no-devicetree-if-secure-boot.patch/grub-core/loader/arm/linux.c:495
 #: .pc/ubuntu-linuxefi.patch/grub-core/loader/arm64/linux.c:385
 #: .pc/ubuntu-linuxefi.patch/grub-core/loader/i386/linux.c:1127
 #: .pc/ubuntu-linuxefi.patch/grub-core/loader/i386/pc/linux.c:482
 #: grub-core/loader/arm/linux.c:507 grub-core/loader/arm64/linux.c:401
-#: grub-core/loader/i386/efi/linux.c:371 grub-core/loader/i386/linux.c:1179
+#: grub-core/loader/i386/efi/linux.c:375 grub-core/loader/i386/linux.c:1184
 #: grub-core/loader/i386/pc/linux.c:495 grub-core/loader/i386/xen.c:966
 #: grub-core/loader/ia64/efi/linux.c:594 grub-core/loader/mips/linux.c:503
 #: grub-core/loader/powerpc/ieee1275/linux.c:385
@@ -270,16 +297,21 @@
 msgstr ""
 
 #: .pc/install-powerpc-machtypes.patch/grub-core/osdep/windows/platform.c:418
+#: .pc/ubuntu-resilient-boot-boot-order.patch/grub-core/osdep/basic/no_platform.c:30
+#: .pc/ubuntu-resilient-boot-boot-order.patch/grub-core/osdep/windows/platform.c:424
 #: grub-core/osdep/basic/no_platform.c:30
 #: grub-core/osdep/windows/platform.c:424
 msgid "no IEEE1275 routines are available for your platform"
 msgstr ""
 
+#: .pc/ubuntu-resilient-boot-boot-order.patch/grub-core/osdep/basic/no_platform.c:38
 #: grub-core/osdep/basic/no_platform.c:38
 msgid "no EFI routines are available for your platform"
 msgstr ""
 
 #: .pc/install-powerpc-machtypes.patch/grub-core/osdep/windows/platform.c:425
+#: .pc/ubuntu-resilient-boot-boot-order.patch/grub-core/osdep/basic/no_platform.c:45
+#: .pc/ubuntu-resilient-boot-boot-order.patch/grub-core/osdep/windows/platform.c:431
 #: grub-core/osdep/basic/no_platform.c:45
 #: grub-core/osdep/windows/platform.c:431
 msgid "no SGI routines are available for your platform"
@@ -287,6 +319,7 @@
 
 #: .pc/efi-variable-storage-minimise-writes.patch/grub-core/osdep/unix/platform.c:77
 #: .pc/install-powerpc-machtypes.patch/grub-core/osdep/unix/platform.c:77
+#: .pc/ubuntu-resilient-boot-boot-order.patch/grub-core/osdep/unix/platform.c:74
 #: grub-core/osdep/unix/platform.c:74
 #, c-format
 msgid ""
@@ -315,12 +348,14 @@
 #: .pc/efi-variable-storage-minimise-writes.patch/grub-core/osdep/unix/platform.c:189
 #: .pc/install-powerpc-machtypes.patch/grub-core/osdep/unix/platform.c:149
 #: .pc/install-powerpc-machtypes.patch/grub-core/osdep/unix/platform.c:189
+#: .pc/ubuntu-resilient-boot-boot-order.patch/grub-core/osdep/unix/platform.c:103
 #: grub-core/osdep/unix/platform.c:103
 #, c-format
 msgid "%s: not found"
 msgstr ""
 
 #: .pc/efi-variable-storage-minimise-writes.patch/grub-core/osdep/unix/platform.c:228
+#: .pc/ubuntu-resilient-boot-boot-order.patch/grub-core/osdep/unix/platform.c:142
 #: grub-core/osdep/unix/platform.c:142
 #, c-format
 msgid ""
@@ -332,6 +367,7 @@
 
 #: .pc/efi-variable-storage-minimise-writes.patch/grub-core/osdep/unix/platform.c:240
 #: .pc/install-powerpc-machtypes.patch/grub-core/osdep/unix/platform.c:225
+#: .pc/ubuntu-resilient-boot-boot-order.patch/grub-core/osdep/unix/platform.c:154
 #: grub-core/osdep/unix/platform.c:154
 #, c-format
 msgid ""
@@ -343,26 +379,31 @@
 
 #: .pc/efi-variable-storage-minimise-writes.patch/grub-core/osdep/unix/platform.c:256
 #: .pc/install-powerpc-machtypes.patch/grub-core/osdep/unix/platform.c:240
+#: .pc/ubuntu-resilient-boot-boot-order.patch/grub-core/osdep/unix/platform.c:170
 #: grub-core/osdep/unix/platform.c:170
 msgid "You will have to set `SystemPartition' and `OSLoader' manually."
 msgstr ""
 
 #: .pc/install-powerpc-machtypes.patch/grub-core/osdep/windows/platform.c:97
+#: .pc/ubuntu-resilient-boot-boot-order.patch/grub-core/osdep/windows/platform.c:97
 #: grub-core/osdep/windows/platform.c:97
 msgid "Insufficient privileges to access firmware, assuming BIOS"
 msgstr ""
 
 #: .pc/install-powerpc-machtypes.patch/grub-core/osdep/windows/platform.c:225
+#: .pc/ubuntu-resilient-boot-boot-order.patch/grub-core/osdep/windows/platform.c:231
 #: grub-core/osdep/windows/platform.c:231
 msgid "no EFI routines are available when running in BIOS mode"
 msgstr ""
 
 #: .pc/install-powerpc-machtypes.patch/grub-core/osdep/windows/platform.c:240
+#: .pc/ubuntu-resilient-boot-boot-order.patch/grub-core/osdep/windows/platform.c:246
 #: grub-core/osdep/windows/platform.c:246
 msgid "unexpected EFI error"
 msgstr ""
 
 #: .pc/install-powerpc-machtypes.patch/grub-core/osdep/windows/platform.c:315
+#: .pc/ubuntu-resilient-boot-boot-order.patch/grub-core/osdep/windows/platform.c:321
 #: grub-core/osdep/windows/platform.c:321
 msgid "Couldn't find a free BootNNNN slot"
 msgstr ""
@@ -371,30 +412,36 @@
 #: .pc/efi-variable-storage-minimise-writes.patch/include/grub/util/install.h:35
 #: .pc/install-powerpc-machtypes.patch/include/grub/util/install.h:30
 #: .pc/install-powerpc-machtypes.patch/include/grub/util/install.h:35
+#: .pc/ubuntu-resilient-boot-boot-order.patch/include/grub/util/install.h:30
+#: .pc/ubuntu-resilient-boot-boot-order.patch/include/grub/util/install.h:35
 #: include/grub/util/install.h:30 include/grub/util/install.h:35
 msgid "MODULES"
 msgstr ""
 
 #: .pc/efi-variable-storage-minimise-writes.patch/include/grub/util/install.h:31
 #: .pc/install-powerpc-machtypes.patch/include/grub/util/install.h:31
+#: .pc/ubuntu-resilient-boot-boot-order.patch/include/grub/util/install.h:31
 #: include/grub/util/install.h:31
 msgid "pre-load specified modules MODULES"
 msgstr ""
 
 #: .pc/efi-variable-storage-minimise-writes.patch/include/grub/util/install.h:36
 #: .pc/install-powerpc-machtypes.patch/include/grub/util/install.h:36
+#: .pc/ubuntu-resilient-boot-boot-order.patch/include/grub/util/install.h:36
 #: include/grub/util/install.h:36
 msgid "install only MODULES and their dependencies [default=all]"
 msgstr ""
 
 #: .pc/efi-variable-storage-minimise-writes.patch/include/grub/util/install.h:37
 #: .pc/install-powerpc-machtypes.patch/include/grub/util/install.h:37
+#: .pc/ubuntu-resilient-boot-boot-order.patch/include/grub/util/install.h:37
 #: include/grub/util/install.h:37
 msgid "THEMES"
 msgstr ""
 
 #: .pc/efi-variable-storage-minimise-writes.patch/include/grub/util/install.h:38
 #: .pc/install-powerpc-machtypes.patch/include/grub/util/install.h:38
+#: .pc/ubuntu-resilient-boot-boot-order.patch/include/grub/util/install.h:38
 #: include/grub/util/install.h:38
 #, c-format
 msgid "install THEMES [default=%s]"
@@ -402,12 +449,14 @@
 
 #: .pc/efi-variable-storage-minimise-writes.patch/include/grub/util/install.h:39
 #: .pc/install-powerpc-machtypes.patch/include/grub/util/install.h:39
+#: .pc/ubuntu-resilient-boot-boot-order.patch/include/grub/util/install.h:39
 #: include/grub/util/install.h:39
 msgid "FONTS"
 msgstr ""
 
 #: .pc/efi-variable-storage-minimise-writes.patch/include/grub/util/install.h:40
 #: .pc/install-powerpc-machtypes.patch/include/grub/util/install.h:40
+#: .pc/ubuntu-resilient-boot-boot-order.patch/include/grub/util/install.h:40
 #: include/grub/util/install.h:40
 #, c-format
 msgid "install FONTS [default=%s]"
@@ -415,24 +464,28 @@
 
 #: .pc/efi-variable-storage-minimise-writes.patch/include/grub/util/install.h:41
 #: .pc/install-powerpc-machtypes.patch/include/grub/util/install.h:41
+#: .pc/ubuntu-resilient-boot-boot-order.patch/include/grub/util/install.h:41
 #: include/grub/util/install.h:41
 msgid "LOCALES"
 msgstr ""
 
 #: .pc/efi-variable-storage-minimise-writes.patch/include/grub/util/install.h:42
 #: .pc/install-powerpc-machtypes.patch/include/grub/util/install.h:42
+#: .pc/ubuntu-resilient-boot-boot-order.patch/include/grub/util/install.h:42
 #: include/grub/util/install.h:42
 msgid "install only LOCALES [default=all]"
 msgstr ""
 
 #: .pc/efi-variable-storage-minimise-writes.patch/include/grub/util/install.h:45
 #: .pc/install-powerpc-machtypes.patch/include/grub/util/install.h:45
+#: .pc/ubuntu-resilient-boot-boot-order.patch/include/grub/util/install.h:45
 #: include/grub/util/install.h:45
 msgid "compress GRUB files [optional]"
 msgstr ""
 
 #: .pc/efi-variable-storage-minimise-writes.patch/include/grub/util/install.h:48
 #: .pc/install-powerpc-machtypes.patch/include/grub/util/install.h:48
+#: .pc/ubuntu-resilient-boot-boot-order.patch/include/grub/util/install.h:48
 #: include/grub/util/install.h:48 util/grub-mkimage.c:83
 msgid "choose the compression to use for core image"
 msgstr ""
@@ -475,6 +528,14 @@
 #: .pc/ubuntu-install-signed.patch/util/grub-install.c:253
 #: .pc/ubuntu-install-signed.patch/util/grub-install.c:298
 #: .pc/ubuntu-install-signed.patch/util/grub-install.c:300
+#: .pc/ubuntu-resilient-boot-boot-order.patch/include/grub/util/install.h:50
+#: .pc/ubuntu-resilient-boot-boot-order.patch/include/grub/util/install.h:53
+#: .pc/ubuntu-resilient-boot-boot-order.patch/include/grub/util/install.h:56
+#: .pc/ubuntu-resilient-boot-boot-order.patch/include/grub/util/install.h:59
+#: .pc/ubuntu-resilient-boot-boot-order.patch/util/grub-install.c:270
+#: .pc/ubuntu-resilient-boot-boot-order.patch/util/grub-install.c:272
+#: .pc/ubuntu-resilient-boot-boot-order.patch/util/grub-install.c:318
+#: .pc/ubuntu-resilient-boot-boot-order.patch/util/grub-install.c:320
 #: .pc/ubuntu-temp-keep-auto-nvram.patch/util/grub-install.c:268
 #: .pc/ubuntu-temp-keep-auto-nvram.patch/util/grub-install.c:270
 #: .pc/ubuntu-temp-keep-auto-nvram.patch/util/grub-install.c:315
@@ -493,6 +554,7 @@
 #: util/grub-mknetdir.c:46 util/grub-mknetdir.c:48 util/grub-mkrescue.c:99
 #: util/grub-setup.c:82 util/grub-syslinux2cfg.c:63 util/grub-syslinux2cfg.c:65
 #: util/grub-syslinux2cfg.c:67 util/grub-syslinux2cfg.c:71
+#: util/grub-reboot.in:54 util/grub-set-default.in:54
 msgid "DIR"
 msgstr ""
 
@@ -501,6 +563,8 @@
 #: .pc/efi-variable-storage-minimise-writes.patch/include/grub/util/install.h:54
 #: .pc/install-powerpc-machtypes.patch/include/grub/util/install.h:51
 #: .pc/install-powerpc-machtypes.patch/include/grub/util/install.h:54
+#: .pc/ubuntu-resilient-boot-boot-order.patch/include/grub/util/install.h:51
+#: .pc/ubuntu-resilient-boot-boot-order.patch/include/grub/util/install.h:54
 #: include/grub/util/install.h:51 include/grub/util/install.h:54
 #: util/grub-mkimage.c:66
 #, c-format
@@ -509,6 +573,7 @@
 
 #: .pc/efi-variable-storage-minimise-writes.patch/include/grub/util/install.h:57
 #: .pc/install-powerpc-machtypes.patch/include/grub/util/install.h:57
+#: .pc/ubuntu-resilient-boot-boot-order.patch/include/grub/util/install.h:57
 #: include/grub/util/install.h:57
 #, c-format
 msgid "use translations under DIR [default=%s]"
@@ -516,6 +581,7 @@
 
 #: .pc/efi-variable-storage-minimise-writes.patch/include/grub/util/install.h:60
 #: .pc/install-powerpc-machtypes.patch/include/grub/util/install.h:60
+#: .pc/ubuntu-resilient-boot-boot-order.patch/include/grub/util/install.h:60
 #: include/grub/util/install.h:60
 #, c-format
 msgid "use themes under DIR [default=%s]"
@@ -548,6 +614,10 @@
 #: .pc/ubuntu-linuxefi.patch/grub-core/loader/i386/bsd.c:2137
 #: .pc/ubuntu-linuxefi.patch/grub-core/loader/i386/bsd.c:2140
 #: .pc/ubuntu-linuxefi.patch/grub-core/loader/i386/bsd.c:2143
+#: .pc/ubuntu-resilient-boot-boot-order.patch/include/grub/util/install.h:32
+#: .pc/ubuntu-resilient-boot-boot-order.patch/include/grub/util/install.h:64
+#: .pc/ubuntu-resilient-boot-boot-order.patch/util/grub-install.c:274
+#: .pc/ubuntu-resilient-boot-boot-order.patch/util/grub-install.c:322
 #: .pc/ubuntu-temp-keep-auto-nvram.patch/util/grub-install.c:272
 #: .pc/ubuntu-temp-keep-auto-nvram.patch/util/grub-install.c:319
 #: .pc/uefi-secure-boot-cryptomount.patch/util/grub-install.c:272
@@ -578,18 +648,21 @@
 #: util/grub-probe.c:732 util/grub-render-label.c:59
 #: util/grub-render-label.c:70 util/grub-render-label.c:72 util/grub-setup.c:78
 #: util/grub-setup.c:80 util/grub-setup.c:84 util/grub-syslinux2cfg.c:74
-#: util/grub-syslinux2cfg.c:147
+#: util/grub-syslinux2cfg.c:147 util/grub-kbdcomp.in:29
+#: util/grub-mkconfig.in:60
 msgid "FILE"
 msgstr "แฟ้ม"
 
 #: .pc/efi-variable-storage-minimise-writes.patch/include/grub/util/install.h:65
 #: .pc/install-powerpc-machtypes.patch/include/grub/util/install.h:65
+#: .pc/ubuntu-resilient-boot-boot-order.patch/include/grub/util/install.h:65
 #: include/grub/util/install.h:65 util/grub-mkimage.c:78
 msgid "embed FILE as public key for signature checking"
 msgstr ""
 
 #: .pc/efi-variable-storage-minimise-writes.patch/include/grub/util/install.h:67
 #: .pc/install-powerpc-machtypes.patch/include/grub/util/install.h:67
+#: .pc/ubuntu-resilient-boot-boot-order.patch/include/grub/util/install.h:67
 #: grub-core/kern/emu/main.c:108 include/grub/util/install.h:67
 #: util/grub-editenv.c:58 util/grub-fstest.c:525 util/grub-glue-efi.c:58
 #: util/grub-macbless.c:104 util/grub-mkfont.c:962 util/grub-mkimage.c:84
@@ -606,6 +679,7 @@
 #: .pc/install-stage2-confusion.patch/util/grub-install.c:238
 #: .pc/ubuntu-grub-install-extra-removable.patch/util/grub-install.c:250
 #: .pc/ubuntu-install-signed.patch/util/grub-install.c:239
+#: .pc/ubuntu-resilient-boot-boot-order.patch/util/grub-install.c:258
 #: .pc/ubuntu-temp-keep-auto-nvram.patch/util/grub-install.c:256
 #: .pc/uefi-secure-boot-cryptomount.patch/util/grub-install.c:256
 #: util/grub-install.c:258
@@ -619,6 +693,7 @@
 #: .pc/install-stage2-confusion.patch/util/grub-install.c:251
 #: .pc/ubuntu-grub-install-extra-removable.patch/util/grub-install.c:263
 #: .pc/ubuntu-install-signed.patch/util/grub-install.c:252
+#: .pc/ubuntu-resilient-boot-boot-order.patch/util/grub-install.c:271
 #: .pc/ubuntu-temp-keep-auto-nvram.patch/util/grub-install.c:269
 #: .pc/uefi-secure-boot-cryptomount.patch/util/grub-install.c:269
 #: util/grub-install.c:271
@@ -634,6 +709,7 @@
 #: .pc/install-stage2-confusion.patch/util/grub-install.c:256
 #: .pc/ubuntu-grub-install-extra-removable.patch/util/grub-install.c:268
 #: .pc/ubuntu-install-signed.patch/util/grub-install.c:257
+#: .pc/ubuntu-resilient-boot-boot-order.patch/util/grub-install.c:276
 #: .pc/ubuntu-temp-keep-auto-nvram.patch/util/grub-install.c:274
 #: .pc/uefi-secure-boot-cryptomount.patch/util/grub-install.c:274
 #: util/grub-install.c:276 util/grub-probe.c:734
@@ -648,6 +724,7 @@
 #: .pc/install-stage2-confusion.patch/util/grub-install.c:258
 #: .pc/ubuntu-grub-install-extra-removable.patch/util/grub-install.c:270
 #: .pc/ubuntu-install-signed.patch/util/grub-install.c:259
+#: .pc/ubuntu-resilient-boot-boot-order.patch/util/grub-install.c:278
 #: .pc/ubuntu-temp-keep-auto-nvram.patch/util/grub-install.c:276
 #: .pc/uefi-secure-boot-cryptomount.patch/util/grub-install.c:276
 #: util/grub-install.c:278
@@ -666,6 +743,7 @@
 #: .pc/install-stage2-confusion.patch/util/grub-install.c:267
 #: .pc/ubuntu-grub-install-extra-removable.patch/util/grub-install.c:279
 #: .pc/ubuntu-install-signed.patch/util/grub-install.c:268
+#: .pc/ubuntu-resilient-boot-boot-order.patch/util/grub-install.c:287
 #: .pc/ubuntu-temp-keep-auto-nvram.patch/util/grub-install.c:285
 #: .pc/uefi-secure-boot-cryptomount.patch/util/grub-install.c:285
 #: util/grub-install.c:287 util/grub-setup.c:94
@@ -681,6 +759,7 @@
 #: .pc/install-stage2-confusion.patch/util/grub-install.c:270
 #: .pc/ubuntu-grub-install-extra-removable.patch/util/grub-install.c:282
 #: .pc/ubuntu-install-signed.patch/util/grub-install.c:271
+#: .pc/ubuntu-resilient-boot-boot-order.patch/util/grub-install.c:290
 #: .pc/ubuntu-temp-keep-auto-nvram.patch/util/grub-install.c:288
 #: .pc/uefi-secure-boot-cryptomount.patch/util/grub-install.c:288
 #: util/grub-install.c:290
@@ -694,6 +773,7 @@
 #: .pc/install-stage2-confusion.patch/util/grub-install.c:272
 #: .pc/ubuntu-grub-install-extra-removable.patch/util/grub-install.c:284
 #: .pc/ubuntu-install-signed.patch/util/grub-install.c:273
+#: .pc/ubuntu-resilient-boot-boot-order.patch/util/grub-install.c:292
 #: .pc/ubuntu-temp-keep-auto-nvram.patch/util/grub-install.c:290
 #: .pc/uefi-secure-boot-cryptomount.patch/util/grub-install.c:290
 #: util/grub-install.c:292 util/grub-setup.c:87
@@ -707,6 +787,7 @@
 #: .pc/install-stage2-confusion.patch/util/grub-install.c:274
 #: .pc/ubuntu-grub-install-extra-removable.patch/util/grub-install.c:286
 #: .pc/ubuntu-install-signed.patch/util/grub-install.c:275
+#: .pc/ubuntu-resilient-boot-boot-order.patch/util/grub-install.c:294
 #: .pc/ubuntu-temp-keep-auto-nvram.patch/util/grub-install.c:292
 #: .pc/uefi-secure-boot-cryptomount.patch/util/grub-install.c:292
 #: util/grub-install.c:294
@@ -720,6 +801,7 @@
 #: .pc/install-stage2-confusion.patch/util/grub-install.c:275
 #: .pc/ubuntu-grub-install-extra-removable.patch/util/grub-install.c:287
 #: .pc/ubuntu-install-signed.patch/util/grub-install.c:276
+#: .pc/ubuntu-resilient-boot-boot-order.patch/util/grub-install.c:295
 #: .pc/ubuntu-temp-keep-auto-nvram.patch/util/grub-install.c:293
 #: .pc/uefi-secure-boot-cryptomount.patch/util/grub-install.c:293
 #: grub-core/commands/minicmd.c:207 grub-core/kern/corecmd.c:188
@@ -734,6 +816,7 @@
 #: .pc/install-stage2-confusion.patch/util/grub-install.c:276
 #: .pc/ubuntu-grub-install-extra-removable.patch/util/grub-install.c:288
 #: .pc/ubuntu-install-signed.patch/util/grub-install.c:277
+#: .pc/ubuntu-resilient-boot-boot-order.patch/util/grub-install.c:296
 #: .pc/ubuntu-temp-keep-auto-nvram.patch/util/grub-install.c:294
 #: .pc/uefi-secure-boot-cryptomount.patch/util/grub-install.c:294
 #: util/grub-install.c:296
@@ -749,6 +832,7 @@
 #: .pc/install-stage2-confusion.patch/util/grub-install.c:279
 #: .pc/ubuntu-grub-install-extra-removable.patch/util/grub-install.c:291
 #: .pc/ubuntu-install-signed.patch/util/grub-install.c:280
+#: .pc/ubuntu-resilient-boot-boot-order.patch/util/grub-install.c:299
 #: .pc/ubuntu-temp-keep-auto-nvram.patch/util/grub-install.c:297
 #: .pc/uefi-secure-boot-cryptomount.patch/util/grub-install.c:297
 #: util/grub-install.c:299
@@ -764,6 +848,7 @@
 #: .pc/install-stage2-confusion.patch/util/grub-install.c:282
 #: .pc/ubuntu-grub-install-extra-removable.patch/util/grub-install.c:294
 #: .pc/ubuntu-install-signed.patch/util/grub-install.c:283
+#: .pc/ubuntu-resilient-boot-boot-order.patch/util/grub-install.c:303
 #: .pc/ubuntu-temp-keep-auto-nvram.patch/util/grub-install.c:300
 #: .pc/uefi-secure-boot-cryptomount.patch/util/grub-install.c:300
 #: util/grub-install.c:303 util/grub-setup.c:89
@@ -777,6 +862,7 @@
 #: .pc/install-stage2-confusion.patch/util/grub-install.c:284
 #: .pc/ubuntu-grub-install-extra-removable.patch/util/grub-install.c:296
 #: .pc/ubuntu-install-signed.patch/util/grub-install.c:285
+#: .pc/ubuntu-resilient-boot-boot-order.patch/util/grub-install.c:305
 #: .pc/ubuntu-temp-keep-auto-nvram.patch/util/grub-install.c:302
 #: .pc/uefi-secure-boot-cryptomount.patch/util/grub-install.c:302
 #: util/grub-install.c:305
@@ -790,6 +876,7 @@
 #: .pc/install-stage2-confusion.patch/util/grub-install.c:286
 #: .pc/ubuntu-grub-install-extra-removable.patch/util/grub-install.c:298
 #: .pc/ubuntu-install-signed.patch/util/grub-install.c:287
+#: .pc/ubuntu-resilient-boot-boot-order.patch/util/grub-install.c:307
 #: .pc/ubuntu-temp-keep-auto-nvram.patch/util/grub-install.c:304
 #: .pc/uefi-secure-boot-cryptomount.patch/util/grub-install.c:304
 #: util/grub-install.c:307 util/grub-setup.c:96
@@ -815,6 +902,8 @@
 #: .pc/ubuntu-grub-install-extra-removable.patch/util/grub-install.c:316
 #: .pc/ubuntu-install-signed.patch/util/grub-install.c:292
 #: .pc/ubuntu-install-signed.patch/util/grub-install.c:305
+#: .pc/ubuntu-resilient-boot-boot-order.patch/util/grub-install.c:312
+#: .pc/ubuntu-resilient-boot-boot-order.patch/util/grub-install.c:325
 #: .pc/ubuntu-temp-keep-auto-nvram.patch/util/grub-install.c:309
 #: .pc/ubuntu-temp-keep-auto-nvram.patch/util/grub-install.c:322
 #: .pc/uefi-secure-boot-cryptomount.patch/util/grub-install.c:309
@@ -834,6 +923,7 @@
 #: .pc/install-stage2-confusion.patch/util/grub-install.c:293
 #: .pc/ubuntu-grub-install-extra-removable.patch/util/grub-install.c:305
 #: .pc/ubuntu-install-signed.patch/util/grub-install.c:294
+#: .pc/ubuntu-resilient-boot-boot-order.patch/util/grub-install.c:314
 #: .pc/ubuntu-temp-keep-auto-nvram.patch/util/grub-install.c:311
 #: .pc/uefi-secure-boot-cryptomount.patch/util/grub-install.c:311
 #: util/grub-install.c:314
@@ -848,6 +938,7 @@
 #: .pc/install-stage2-confusion.patch/util/grub-install.c:295
 #: .pc/ubuntu-grub-install-extra-removable.patch/util/grub-install.c:307
 #: .pc/ubuntu-install-signed.patch/util/grub-install.c:296
+#: .pc/ubuntu-resilient-boot-boot-order.patch/util/grub-install.c:316
 #: .pc/ubuntu-temp-keep-auto-nvram.patch/util/grub-install.c:313
 #: .pc/uefi-secure-boot-cryptomount.patch/util/grub-install.c:313
 #: util/grub-install.c:316
@@ -861,6 +952,7 @@
 #: .pc/install-stage2-confusion.patch/util/grub-install.c:296
 #: .pc/ubuntu-grub-install-extra-removable.patch/util/grub-install.c:308
 #: .pc/ubuntu-install-signed.patch/util/grub-install.c:297
+#: .pc/ubuntu-resilient-boot-boot-order.patch/util/grub-install.c:317
 #: .pc/ubuntu-temp-keep-auto-nvram.patch/util/grub-install.c:314
 #: .pc/uefi-secure-boot-cryptomount.patch/util/grub-install.c:314
 #: util/grub-install.c:317
@@ -874,6 +966,7 @@
 #: .pc/install-stage2-confusion.patch/util/grub-install.c:298
 #: .pc/ubuntu-grub-install-extra-removable.patch/util/grub-install.c:310
 #: .pc/ubuntu-install-signed.patch/util/grub-install.c:299
+#: .pc/ubuntu-resilient-boot-boot-order.patch/util/grub-install.c:319
 #: .pc/ubuntu-temp-keep-auto-nvram.patch/util/grub-install.c:316
 #: .pc/uefi-secure-boot-cryptomount.patch/util/grub-install.c:316
 #: util/grub-install.c:319
@@ -887,6 +980,7 @@
 #: .pc/install-stage2-confusion.patch/util/grub-install.c:300
 #: .pc/ubuntu-grub-install-extra-removable.patch/util/grub-install.c:312
 #: .pc/ubuntu-install-signed.patch/util/grub-install.c:301
+#: .pc/ubuntu-resilient-boot-boot-order.patch/util/grub-install.c:321
 #: .pc/ubuntu-temp-keep-auto-nvram.patch/util/grub-install.c:318
 #: .pc/uefi-secure-boot-cryptomount.patch/util/grub-install.c:318
 #: util/grub-install.c:321
@@ -901,6 +995,7 @@
 #: .pc/mkrescue-efi-modules.patch/util/grub-mkrescue.c:106
 #: .pc/ubuntu-grub-install-extra-removable.patch/util/grub-install.c:313
 #: .pc/ubuntu-install-signed.patch/util/grub-install.c:302
+#: .pc/ubuntu-resilient-boot-boot-order.patch/util/grub-install.c:322
 #: .pc/ubuntu-temp-keep-auto-nvram.patch/util/grub-install.c:319
 #: .pc/uefi-secure-boot-cryptomount.patch/util/grub-install.c:319
 #: util/grub-install.c:322 util/grub-mkrescue.c:106
@@ -923,6 +1018,8 @@
 #: .pc/ubuntu-grub-install-extra-removable.patch/util/grub-install.c:315
 #: .pc/ubuntu-install-signed.patch/util/grub-install.c:303
 #: .pc/ubuntu-install-signed.patch/util/grub-install.c:304
+#: .pc/ubuntu-resilient-boot-boot-order.patch/util/grub-install.c:323
+#: .pc/ubuntu-resilient-boot-boot-order.patch/util/grub-install.c:324
 #: .pc/ubuntu-temp-keep-auto-nvram.patch/util/grub-install.c:320
 #: .pc/ubuntu-temp-keep-auto-nvram.patch/util/grub-install.c:321
 #: .pc/uefi-secure-boot-cryptomount.patch/util/grub-install.c:320
@@ -941,6 +1038,7 @@
 #: .pc/mkrescue-efi-modules.patch/util/grub-mkrescue.c:107
 #: .pc/ubuntu-grub-install-extra-removable.patch/util/grub-install.c:314
 #: .pc/ubuntu-install-signed.patch/util/grub-install.c:303
+#: .pc/ubuntu-resilient-boot-boot-order.patch/util/grub-install.c:323
 #: .pc/ubuntu-temp-keep-auto-nvram.patch/util/grub-install.c:320
 #: .pc/uefi-secure-boot-cryptomount.patch/util/grub-install.c:320
 #: util/grub-install.c:323 util/grub-mkrescue.c:107
@@ -955,6 +1053,7 @@
 #: .pc/mkrescue-efi-modules.patch/util/grub-mkrescue.c:108
 #: .pc/ubuntu-grub-install-extra-removable.patch/util/grub-install.c:315
 #: .pc/ubuntu-install-signed.patch/util/grub-install.c:304
+#: .pc/ubuntu-resilient-boot-boot-order.patch/util/grub-install.c:324
 #: .pc/ubuntu-temp-keep-auto-nvram.patch/util/grub-install.c:321
 #: .pc/uefi-secure-boot-cryptomount.patch/util/grub-install.c:321
 #: util/grub-install.c:324 util/grub-mkrescue.c:108
@@ -969,6 +1068,7 @@
 #: .pc/mkrescue-efi-modules.patch/util/grub-mkrescue.c:110
 #: .pc/ubuntu-grub-install-extra-removable.patch/util/grub-install.c:316
 #: .pc/ubuntu-install-signed.patch/util/grub-install.c:305
+#: .pc/ubuntu-resilient-boot-boot-order.patch/util/grub-install.c:325
 #: .pc/ubuntu-temp-keep-auto-nvram.patch/util/grub-install.c:322
 #: .pc/uefi-secure-boot-cryptomount.patch/util/grub-install.c:322
 #: util/grub-install.c:325 util/grub-mkrescue.c:110
@@ -980,6 +1080,7 @@
 #: .pc/install-efi-ubuntu-flavours.patch/util/grub-install.c:318
 #: .pc/install-powerpc-machtypes.patch/util/grub-install.c:318
 #: .pc/ubuntu-grub-install-extra-removable.patch/util/grub-install.c:318
+#: .pc/ubuntu-resilient-boot-boot-order.patch/util/grub-install.c:327
 #: .pc/ubuntu-temp-keep-auto-nvram.patch/util/grub-install.c:324
 #: .pc/uefi-secure-boot-cryptomount.patch/util/grub-install.c:324
 #: util/grub-install.c:327
@@ -993,6 +1094,7 @@
 #: .pc/install-efi-ubuntu-flavours.patch/util/grub-install.c:322
 #: .pc/install-powerpc-machtypes.patch/util/grub-install.c:322
 #: .pc/ubuntu-grub-install-extra-removable.patch/util/grub-install.c:322
+#: .pc/ubuntu-resilient-boot-boot-order.patch/util/grub-install.c:331
 #: .pc/ubuntu-temp-keep-auto-nvram.patch/util/grub-install.c:328
 #: .pc/uefi-secure-boot-cryptomount.patch/util/grub-install.c:328
 #: util/grub-install.c:331
@@ -1002,6 +1104,7 @@
 msgstr ""
 
 #: .pc/efi-variable-storage-minimise-writes.patch/util/grub-install.c:332
+#: .pc/ubuntu-resilient-boot-boot-order.patch/util/grub-install.c:335
 #: .pc/ubuntu-temp-keep-auto-nvram.patch/util/grub-install.c:332
 #: .pc/uefi-secure-boot-cryptomount.patch/util/grub-install.c:332
 #: util/grub-install.c:335
@@ -1017,6 +1120,7 @@
 #: .pc/install-stage2-confusion.patch/util/grub-install.c:361
 #: .pc/ubuntu-grub-install-extra-removable.patch/util/grub-install.c:381
 #: .pc/ubuntu-install-signed.patch/util/grub-install.c:362
+#: .pc/ubuntu-resilient-boot-boot-order.patch/util/grub-install.c:393
 #: .pc/ubuntu-temp-keep-auto-nvram.patch/util/grub-install.c:390
 #: .pc/uefi-secure-boot-cryptomount.patch/util/grub-install.c:390
 #: util/grub-install.c:393
@@ -1030,6 +1134,7 @@
 #: .pc/install-stage2-confusion.patch/util/grub-install.c:362
 #: .pc/ubuntu-grub-install-extra-removable.patch/util/grub-install.c:382
 #: .pc/ubuntu-install-signed.patch/util/grub-install.c:363
+#: .pc/ubuntu-resilient-boot-boot-order.patch/util/grub-install.c:394
 #: .pc/ubuntu-temp-keep-auto-nvram.patch/util/grub-install.c:391
 #: .pc/uefi-secure-boot-cryptomount.patch/util/grub-install.c:391
 #: util/grub-install.c:394
@@ -1043,6 +1148,7 @@
 #: .pc/install-stage2-confusion.patch/util/grub-install.c:363
 #: .pc/ubuntu-grub-install-extra-removable.patch/util/grub-install.c:383
 #: .pc/ubuntu-install-signed.patch/util/grub-install.c:364
+#: .pc/ubuntu-resilient-boot-boot-order.patch/util/grub-install.c:395
 #: .pc/ubuntu-temp-keep-auto-nvram.patch/util/grub-install.c:392
 #: .pc/uefi-secure-boot-cryptomount.patch/util/grub-install.c:392
 #: util/grub-install.c:395
@@ -1060,6 +1166,7 @@
 #: .pc/install-stage2-confusion.patch/util/grub-install.c:570
 #: .pc/ubuntu-grub-install-extra-removable.patch/util/grub-install.c:590
 #: .pc/ubuntu-install-signed.patch/util/grub-install.c:571
+#: .pc/ubuntu-resilient-boot-boot-order.patch/util/grub-install.c:602
 #: .pc/ubuntu-temp-keep-auto-nvram.patch/util/grub-install.c:599
 #: .pc/uefi-secure-boot-cryptomount.patch/util/grub-install.c:599
 #: grub-core/osdep/windows/hostdisk.c:501 util/grub-install.c:602
@@ -1073,6 +1180,7 @@
 #: .pc/install-stage2-confusion.patch/util/grub-install.c:672
 #: .pc/ubuntu-grub-install-extra-removable.patch/util/grub-install.c:692
 #: .pc/ubuntu-install-signed.patch/util/grub-install.c:673
+#: .pc/ubuntu-resilient-boot-boot-order.patch/util/grub-install.c:704
 #: .pc/ubuntu-temp-keep-auto-nvram.patch/util/grub-install.c:701
 #: .pc/uefi-secure-boot-cryptomount.patch/util/grub-install.c:701
 #: util/grub-install.c:704
@@ -1090,6 +1198,7 @@
 #: .pc/install-stage2-confusion.patch/util/grub-install.c:774
 #: .pc/ubuntu-grub-install-extra-removable.patch/util/grub-install.c:794
 #: .pc/ubuntu-install-signed.patch/util/grub-install.c:775
+#: .pc/ubuntu-resilient-boot-boot-order.patch/util/grub-install.c:806
 #: .pc/ubuntu-temp-keep-auto-nvram.patch/util/grub-install.c:803
 #: .pc/uefi-secure-boot-cryptomount.patch/util/grub-install.c:803
 #: .pc/zpool-full-device-name.patch/grub-core/osdep/unix/getroot.c:551
@@ -1106,6 +1215,7 @@
 #: .pc/install-locale-langpack.patch/util/grub-install-common.c:552
 #: .pc/install-locale-langpack.patch/util/grub-install-common.c:579
 #: .pc/install-locale-langpack.patch/util/grub-install-common.c:621
+#: .pc/ubuntu-resilient-boot-boot-order.patch/util/grub-install.c:869
 #: .pc/ubuntu-temp-keep-auto-nvram.patch/util/grub-install.c:866
 #: .pc/uefi-secure-boot-cryptomount.patch/util/grub-install.c:866
 #: util/grub-install-common.c:196 util/grub-install-common.c:552
@@ -1116,6 +1226,7 @@
 msgstr ""
 
 #: .pc/efi-variable-storage-minimise-writes.patch/util/grub-install.c:898
+#: .pc/ubuntu-resilient-boot-boot-order.patch/util/grub-install.c:901
 #: .pc/ubuntu-temp-keep-auto-nvram.patch/util/grub-install.c:898
 #: .pc/uefi-secure-boot-cryptomount.patch/util/grub-install.c:898
 #: util/grub-install.c:901
@@ -1123,6 +1234,7 @@
 msgstr ""
 
 #: .pc/efi-variable-storage-minimise-writes.patch/util/grub-install.c:900
+#: .pc/ubuntu-resilient-boot-boot-order.patch/util/grub-install.c:903
 #: .pc/ubuntu-temp-keep-auto-nvram.patch/util/grub-install.c:900
 #: .pc/uefi-secure-boot-cryptomount.patch/util/grub-install.c:900
 #: util/grub-install.c:903
@@ -1130,6 +1242,7 @@
 msgstr ""
 
 #: .pc/efi-variable-storage-minimise-writes.patch/util/grub-install.c:1012
+#: .pc/ubuntu-resilient-boot-boot-order.patch/util/grub-install.c:1015
 #: .pc/ubuntu-temp-keep-auto-nvram.patch/util/grub-install.c:1012
 #: .pc/uefi-secure-boot-cryptomount.patch/util/grub-install.c:1012
 #: util/grub-install.c:1015
@@ -1143,6 +1256,7 @@
 #: .pc/install-stage2-confusion.patch/util/grub-install.c:878
 #: .pc/ubuntu-grub-install-extra-removable.patch/util/grub-install.c:899
 #: .pc/ubuntu-install-signed.patch/util/grub-install.c:879
+#: .pc/ubuntu-resilient-boot-boot-order.patch/util/grub-install.c:1025
 #: .pc/ubuntu-temp-keep-auto-nvram.patch/util/grub-install.c:1022
 #: .pc/uefi-secure-boot-cryptomount.patch/util/grub-install.c:1022
 #: util/grub-install.c:1025
@@ -1156,6 +1270,7 @@
 #: .pc/install-stage2-confusion.patch/util/grub-install.c:891
 #: .pc/ubuntu-grub-install-extra-removable.patch/util/grub-install.c:912
 #: .pc/ubuntu-install-signed.patch/util/grub-install.c:892
+#: .pc/ubuntu-resilient-boot-boot-order.patch/util/grub-install.c:1038
 #: .pc/ubuntu-temp-keep-auto-nvram.patch/util/grub-install.c:1035
 #: .pc/uefi-secure-boot-cryptomount.patch/util/grub-install.c:1035
 #: util/grub-install.c:1038
@@ -1170,6 +1285,7 @@
 #: .pc/install-stage2-confusion.patch/util/grub-install.c:939
 #: .pc/ubuntu-grub-install-extra-removable.patch/util/grub-install.c:960
 #: .pc/ubuntu-install-signed.patch/util/grub-install.c:940
+#: .pc/ubuntu-resilient-boot-boot-order.patch/util/grub-install.c:1086
 #: .pc/ubuntu-temp-keep-auto-nvram.patch/util/grub-install.c:1083
 #: .pc/uefi-secure-boot-cryptomount.patch/util/grub-install.c:1083
 #: util/grub-install.c:1086
@@ -1190,6 +1306,8 @@
 #: .pc/ubuntu-grub-install-extra-removable.patch/util/grub-install.c:1348
 #: .pc/ubuntu-install-signed.patch/util/grub-install.c:985
 #: .pc/ubuntu-install-signed.patch/util/grub-install.c:1332
+#: .pc/ubuntu-resilient-boot-boot-order.patch/util/grub-install.c:1131
+#: .pc/ubuntu-resilient-boot-boot-order.patch/util/grub-install.c:1476
 #: .pc/ubuntu-temp-keep-auto-nvram.patch/util/grub-install.c:1128
 #: .pc/ubuntu-temp-keep-auto-nvram.patch/util/grub-install.c:1473
 #: .pc/uefi-secure-boot-cryptomount.patch/util/grub-install.c:1128
@@ -1210,6 +1328,7 @@
 #: .pc/install-stage2-confusion.patch/util/grub-install.c:1057
 #: .pc/ubuntu-grub-install-extra-removable.patch/util/grub-install.c:1078
 #: .pc/ubuntu-install-signed.patch/util/grub-install.c:1058
+#: .pc/ubuntu-resilient-boot-boot-order.patch/util/grub-install.c:1204
 #: .pc/ubuntu-temp-keep-auto-nvram.patch/util/grub-install.c:1201
 #: .pc/uefi-secure-boot-cryptomount.patch/util/grub-install.c:1201
 #: util/grub-install.c:1204
@@ -1238,6 +1357,9 @@
 #: .pc/ubuntu-install-signed.patch/util/grub-install.c:1061
 #: .pc/ubuntu-install-signed.patch/util/grub-install.c:1210
 #: .pc/ubuntu-install-signed.patch/util/grub-install.c:1255
+#: .pc/ubuntu-resilient-boot-boot-order.patch/util/grub-install.c:1207
+#: .pc/ubuntu-resilient-boot-boot-order.patch/util/grub-install.c:1354
+#: .pc/ubuntu-resilient-boot-boot-order.patch/util/grub-install.c:1399
 #: .pc/ubuntu-temp-keep-auto-nvram.patch/util/grub-install.c:1204
 #: .pc/ubuntu-temp-keep-auto-nvram.patch/util/grub-install.c:1351
 #: .pc/ubuntu-temp-keep-auto-nvram.patch/util/grub-install.c:1396
@@ -1278,6 +1400,10 @@
 #: .pc/ubuntu-install-signed.patch/util/grub-install.c:1218
 #: .pc/ubuntu-install-signed.patch/util/grub-install.c:1271
 #: .pc/ubuntu-install-signed.patch/util/grub-install.c:1366
+#: .pc/ubuntu-resilient-boot-boot-order.patch/util/grub-install.c:1216
+#: .pc/ubuntu-resilient-boot-boot-order.patch/util/grub-install.c:1362
+#: .pc/ubuntu-resilient-boot-boot-order.patch/util/grub-install.c:1415
+#: .pc/ubuntu-resilient-boot-boot-order.patch/util/grub-install.c:1510
 #: .pc/ubuntu-temp-keep-auto-nvram.patch/util/grub-install.c:1213
 #: .pc/ubuntu-temp-keep-auto-nvram.patch/util/grub-install.c:1359
 #: .pc/ubuntu-temp-keep-auto-nvram.patch/util/grub-install.c:1412
@@ -1299,6 +1425,7 @@
 #: .pc/install-stage2-confusion.patch/util/grub-install.c:1087
 #: .pc/ubuntu-grub-install-extra-removable.patch/util/grub-install.c:1108
 #: .pc/ubuntu-install-signed.patch/util/grub-install.c:1088
+#: .pc/ubuntu-resilient-boot-boot-order.patch/util/grub-install.c:1234
 #: .pc/ubuntu-temp-keep-auto-nvram.patch/util/grub-install.c:1231
 #: .pc/uefi-secure-boot-cryptomount.patch/util/grub-install.c:1231
 #: util/grub-install.c:1234
@@ -1320,6 +1447,8 @@
 #: .pc/ubuntu-grub-install-extra-removable.patch/util/grub-install.c:1658
 #: .pc/ubuntu-install-signed.patch/util/grub-install.c:1130
 #: .pc/ubuntu-install-signed.patch/util/grub-install.c:1615
+#: .pc/ubuntu-resilient-boot-boot-order.patch/util/grub-install.c:1290
+#: .pc/ubuntu-resilient-boot-boot-order.patch/util/grub-install.c:1803
 #: .pc/ubuntu-temp-keep-auto-nvram.patch/util/grub-install.c:1287
 #: .pc/ubuntu-temp-keep-auto-nvram.patch/util/grub-install.c:1800
 #: .pc/uefi-secure-boot-cryptomount.patch/util/grub-install.c:1287
@@ -1335,6 +1464,7 @@
 #: .pc/install-stage2-confusion.patch/util/grub-install.c:1231
 #: .pc/ubuntu-grub-install-extra-removable.patch/util/grub-install.c:1248
 #: .pc/ubuntu-install-signed.patch/util/grub-install.c:1232
+#: .pc/ubuntu-resilient-boot-boot-order.patch/util/grub-install.c:1376
 #: .pc/ubuntu-temp-keep-auto-nvram.patch/util/grub-install.c:1373
 #: .pc/uefi-secure-boot-cryptomount.patch/util/grub-install.c:1373
 #: util/grub-install.c:1376
@@ -1349,6 +1479,7 @@
 #: .pc/install-stage2-confusion.patch/util/grub-install.c:1299
 #: .pc/ubuntu-grub-install-extra-removable.patch/util/grub-install.c:1316
 #: .pc/ubuntu-install-signed.patch/util/grub-install.c:1300
+#: .pc/ubuntu-resilient-boot-boot-order.patch/util/grub-install.c:1444
 #: .pc/ubuntu-temp-keep-auto-nvram.patch/util/grub-install.c:1441
 #: .pc/uefi-secure-boot-cryptomount.patch/util/grub-install.c:1441
 #: util/grub-install.c:1444
@@ -1379,6 +1510,9 @@
 #: .pc/ubuntu-install-signed.patch/util/grub-install.c:1411
 #: .pc/ubuntu-install-signed.patch/util/grub-install.c:1786
 #: .pc/ubuntu-install-signed.patch/util/grub-install.c:1886
+#: .pc/ubuntu-resilient-boot-boot-order.patch/util/grub-install.c:1599
+#: .pc/ubuntu-resilient-boot-boot-order.patch/util/grub-install.c:1974
+#: .pc/ubuntu-resilient-boot-boot-order.patch/util/grub-install.c:2074
 #: .pc/ubuntu-temp-keep-auto-nvram.patch/util/grub-install.c:1596
 #: .pc/ubuntu-temp-keep-auto-nvram.patch/util/grub-install.c:1971
 #: .pc/ubuntu-temp-keep-auto-nvram.patch/util/grub-install.c:2071
@@ -1397,6 +1531,7 @@
 #: .pc/install-stage2-confusion.patch/util/grub-install.c:1491
 #: .pc/ubuntu-grub-install-extra-removable.patch/util/grub-install.c:1535
 #: .pc/ubuntu-install-signed.patch/util/grub-install.c:1492
+#: .pc/ubuntu-resilient-boot-boot-order.patch/util/grub-install.c:1680
 #: .pc/ubuntu-temp-keep-auto-nvram.patch/util/grub-install.c:1677
 #: .pc/uefi-secure-boot-cryptomount.patch/util/grub-install.c:1660
 #: util/grub-install.c:1680
@@ -1412,6 +1547,7 @@
 #: .pc/install-stage2-confusion.patch/util/grub-install.c:1702
 #: .pc/ubuntu-grub-install-extra-removable.patch/util/grub-install.c:1746
 #: .pc/ubuntu-install-signed.patch/util/grub-install.c:1703
+#: .pc/ubuntu-resilient-boot-boot-order.patch/util/grub-install.c:1891
 #: .pc/ubuntu-temp-keep-auto-nvram.patch/util/grub-install.c:1888
 #: .pc/uefi-secure-boot-cryptomount.patch/util/grub-install.c:1871
 #: util/grub-install.c:1891
@@ -1425,6 +1561,7 @@
 #: .pc/install-stage2-confusion.patch/util/grub-install.c:1806
 #: .pc/ubuntu-grub-install-extra-removable.patch/util/grub-install.c:1863
 #: .pc/ubuntu-install-signed.patch/util/grub-install.c:1820
+#: .pc/ubuntu-resilient-boot-boot-order.patch/util/grub-install.c:2008
 #: .pc/ubuntu-temp-keep-auto-nvram.patch/util/grub-install.c:2005
 #: .pc/uefi-secure-boot-cryptomount.patch/util/grub-install.c:1988
 #: util/grub-install.c:2008
@@ -1438,6 +1575,7 @@
 #: .pc/install-stage2-confusion.patch/util/grub-install.c:1811
 #: .pc/ubuntu-grub-install-extra-removable.patch/util/grub-install.c:1868
 #: .pc/ubuntu-install-signed.patch/util/grub-install.c:1825
+#: .pc/ubuntu-resilient-boot-boot-order.patch/util/grub-install.c:2013
 #: .pc/ubuntu-temp-keep-auto-nvram.patch/util/grub-install.c:2010
 #: .pc/uefi-secure-boot-cryptomount.patch/util/grub-install.c:1993
 #: util/grub-install.c:2013
@@ -1451,6 +1589,7 @@
 #: .pc/install-stage2-confusion.patch/util/grub-install.c:1816
 #: .pc/ubuntu-grub-install-extra-removable.patch/util/grub-install.c:1873
 #: .pc/ubuntu-install-signed.patch/util/grub-install.c:1830
+#: .pc/ubuntu-resilient-boot-boot-order.patch/util/grub-install.c:2018
 #: .pc/ubuntu-temp-keep-auto-nvram.patch/util/grub-install.c:2015
 #: .pc/uefi-secure-boot-cryptomount.patch/util/grub-install.c:1998
 #: util/grub-install.c:2018
@@ -1487,6 +1626,7 @@
 #: .pc/install-stage2-confusion.patch/util/grub-install.c:1916
 #: .pc/ubuntu-grub-install-extra-removable.patch/util/grub-install.c:2040
 #: .pc/ubuntu-install-signed.patch/util/grub-install.c:1930
+#: .pc/ubuntu-resilient-boot-boot-order.patch/util/grub-install.c:2191
 #: .pc/ubuntu-temp-keep-auto-nvram.patch/util/grub-install.c:2188
 #: .pc/uefi-secure-boot-cryptomount.patch/util/grub-install.c:2171
 #: util/grub-install.c:2191
@@ -1500,6 +1640,7 @@
 #: .pc/install-stage2-confusion.patch/util/grub-install.c:1950
 #: .pc/ubuntu-grub-install-extra-removable.patch/util/grub-install.c:2094
 #: .pc/ubuntu-install-signed.patch/util/grub-install.c:1964
+#: .pc/ubuntu-resilient-boot-boot-order.patch/util/grub-install.c:2245
 #: .pc/ubuntu-temp-keep-auto-nvram.patch/util/grub-install.c:2242
 #: .pc/uefi-secure-boot-cryptomount.patch/util/grub-install.c:2225
 #: util/grub-install.c:2245
@@ -1513,6 +1654,7 @@
 #: .pc/install-stage2-confusion.patch/util/grub-install.c:1957
 #: .pc/ubuntu-grub-install-extra-removable.patch/util/grub-install.c:2101
 #: .pc/ubuntu-install-signed.patch/util/grub-install.c:1971
+#: .pc/ubuntu-resilient-boot-boot-order.patch/util/grub-install.c:2252
 #: .pc/ubuntu-temp-keep-auto-nvram.patch/util/grub-install.c:2249
 #: .pc/uefi-secure-boot-cryptomount.patch/util/grub-install.c:2232
 #: util/grub-install.c:2252
@@ -2155,49 +2297,71 @@
 msgid "Load another boot loader."
 msgstr ""
 
-#: grub-core/loader/i386/efi/linux.c:113
+#: .pc/0077-ubuntu-Make-the-linux-command-in-EFI-grub-always-try.patch/grub-core/loader/i386/efi/linux.c:113
+#: .pc/0078-ubuntu-Update-the-linux-boot-protocol-version-check.patch/grub-core/loader/i386/efi/linux.c:114
+#: grub-core/loader/i386/efi/linux.c:114
 msgid "can't allocate initrd"
 msgstr ""
 
-#: grub-core/loader/i386/efi/linux.c:193
+#: .pc/0077-ubuntu-Make-the-linux-command-in-EFI-grub-always-try.patch/grub-core/loader/i386/efi/linux.c:193
+#: .pc/0078-ubuntu-Update-the-linux-boot-protocol-version-check.patch/grub-core/loader/i386/efi/linux.c:194
+#: grub-core/loader/i386/efi/linux.c:194
 #, c-format
 msgid "Can't read kernel %s"
 msgstr ""
 
-#: grub-core/loader/arm64/linux.c:348 grub-core/loader/i386/efi/linux.c:201
+#: .pc/0077-ubuntu-Make-the-linux-command-in-EFI-grub-always-try.patch/grub-core/loader/i386/efi/linux.c:201
+#: .pc/0078-ubuntu-Update-the-linux-boot-protocol-version-check.patch/grub-core/loader/i386/efi/linux.c:204
+#: grub-core/loader/arm64/linux.c:348 grub-core/loader/i386/efi/linux.c:204
 #, c-format
 msgid "%s has invalid signature"
 msgstr ""
 
-#: grub-core/loader/i386/efi/linux.c:232
+#: .pc/0077-ubuntu-Make-the-linux-command-in-EFI-grub-always-try.patch/grub-core/loader/i386/efi/linux.c:232
+#: .pc/0078-ubuntu-Update-the-linux-boot-protocol-version-check.patch/grub-core/loader/i386/efi/linux.c:236
+#: grub-core/loader/i386/efi/linux.c:236
 msgid "invalid magic number"
 msgstr ""
 
-#: grub-core/loader/i386/efi/linux.c:239
+#: .pc/0077-ubuntu-Make-the-linux-command-in-EFI-grub-always-try.patch/grub-core/loader/i386/efi/linux.c:239
+#: .pc/0078-ubuntu-Update-the-linux-boot-protocol-version-check.patch/grub-core/loader/i386/efi/linux.c:243
+#: grub-core/loader/i386/efi/linux.c:243
 msgid "too many setup sectors"
 msgstr ""
 
-#: grub-core/loader/i386/efi/linux.c:246
+#: .pc/0077-ubuntu-Make-the-linux-command-in-EFI-grub-always-try.patch/grub-core/loader/i386/efi/linux.c:246
+#: .pc/0078-ubuntu-Update-the-linux-boot-protocol-version-check.patch/grub-core/loader/i386/efi/linux.c:250
+#: grub-core/loader/i386/efi/linux.c:250
 msgid "kernel too old"
 msgstr ""
 
-#: grub-core/loader/i386/efi/linux.c:253
+#: .pc/0077-ubuntu-Make-the-linux-command-in-EFI-grub-always-try.patch/grub-core/loader/i386/efi/linux.c:253
+#: .pc/0078-ubuntu-Update-the-linux-boot-protocol-version-check.patch/grub-core/loader/i386/efi/linux.c:257
+#: grub-core/loader/i386/efi/linux.c:257
 msgid "kernel doesn't support EFI handover"
 msgstr ""
 
-#: grub-core/loader/i386/efi/linux.c:261
+#: .pc/0077-ubuntu-Make-the-linux-command-in-EFI-grub-always-try.patch/grub-core/loader/i386/efi/linux.c:261
+#: .pc/0078-ubuntu-Update-the-linux-boot-protocol-version-check.patch/grub-core/loader/i386/efi/linux.c:265
+#: grub-core/loader/i386/efi/linux.c:265
 msgid "kernel doesn't support 64-bit CPUs"
 msgstr ""
 
-#: grub-core/loader/i386/efi/linux.c:271
+#: .pc/0077-ubuntu-Make-the-linux-command-in-EFI-grub-always-try.patch/grub-core/loader/i386/efi/linux.c:271
+#: .pc/0078-ubuntu-Update-the-linux-boot-protocol-version-check.patch/grub-core/loader/i386/efi/linux.c:275
+#: grub-core/loader/i386/efi/linux.c:275
 msgid "kernel doesn't support 32-bit handover"
 msgstr ""
 
-#: grub-core/loader/i386/efi/linux.c:281
+#: .pc/0077-ubuntu-Make-the-linux-command-in-EFI-grub-always-try.patch/grub-core/loader/i386/efi/linux.c:281
+#: .pc/0078-ubuntu-Update-the-linux-boot-protocol-version-check.patch/grub-core/loader/i386/efi/linux.c:285
+#: grub-core/loader/i386/efi/linux.c:285
 msgid "can't allocate cmdline"
 msgstr ""
 
-#: grub-core/loader/i386/efi/linux.c:311
+#: .pc/0077-ubuntu-Make-the-linux-command-in-EFI-grub-always-try.patch/grub-core/loader/i386/efi/linux.c:311
+#: .pc/0078-ubuntu-Update-the-linux-boot-protocol-version-check.patch/grub-core/loader/i386/efi/linux.c:315
+#: grub-core/loader/i386/efi/linux.c:315
 msgid "can't allocate kernel"
 msgstr ""
 
@@ -2512,9 +2676,10 @@
 msgid "name"
 msgstr ""
 
+#: .pc/0076-smbios-Add-a-linux-argument-to-apply-linux-modalias-.patch/grub-core/commands/smbios.c:182
 #: .pc/ubuntu-linuxefi.patch/grub-core/loader/i386/bsd.c:489
 #: .pc/ubuntu-linuxefi.patch/grub-core/loader/i386/bsd.c:555
-#: grub-core/commands/smbios.c:182 grub-core/loader/i386/bsd.c:490
+#: grub-core/commands/smbios.c:198 grub-core/loader/i386/bsd.c:490
 #: grub-core/loader/i386/bsd.c:556
 msgid "type"
 msgstr ""
@@ -2833,6 +2998,7 @@
 
 #: .pc/mkrescue-efi-modules.patch/util/grub-mkrescue.c:98
 #: util/grub-mkfont.c:936 util/grub-mkrescue.c:98 util/grub-mkstandalone.c:48
+#: util/grub-kbdcomp.in:29
 msgid "save output in FILE [required]"
 msgstr ""
 
@@ -2906,7 +3072,7 @@
 
 #: .pc/mkrescue-efi-modules.patch/util/grub-mkrescue.c:483
 #: util/grub-mkfont.c:1182 util/grub-mkrescue.c:483
-#: util/grub-mkstandalone.c:306
+#: util/grub-mkstandalone.c:306 util/grub-kbdcomp.in:70
 msgid "output file must be specified"
 msgstr ""
 
@@ -7717,16 +7883,16 @@
 msgid "%s: Not found.\\n"
 msgstr ""
 
-#: util/grub-mkconfig.in:158 util/grub-mkconfig.in:163
+#: util/grub-mkconfig.in:165 util/grub-mkconfig.in:170
 msgid "Sourcing file `%s'\\n"
 msgstr ""
 
-#: util/grub-mkconfig.in:260
+#: util/grub-mkconfig.in:271
 msgid "Generating grub configuration file ..."
 msgstr ""
 
 #. TRANSLATORS: %s is replaced by filename
-#: util/grub-mkconfig.in:297
+#: util/grub-mkconfig.in:308
 msgid ""
 "Syntax errors are detected in generated GRUB config file.\n"
 "Ensure that there are no errors in /etc/default/grub\n"
@@ -7734,7 +7900,7 @@
 "%s file attached."
 msgstr ""
 
-#: util/grub-mkconfig.in:309
+#: util/grub-mkconfig.in:320
 msgid "done"
 msgstr ""
 
@@ -7843,8 +8009,8 @@
 msgstr ""
 
 #: util/grub.d/10_hurd.in:100 util/grub.d/10_kfreebsd.in:87
-#: util/grub.d/10_linux.in:134 util/grub.d/10_netbsd.in:113
-#: util/grub.d/20_linux_xen.in:109 util/grub.d/30_os-prober.in:316
+#: util/grub.d/10_linux.in:189 util/grub.d/10_netbsd.in:113
+#: util/grub.d/20_linux_xen.in:119 util/grub.d/30_os-prober.in:316
 msgid ""
 "Please don't use old title `%s' for GRUB_DEFAULT, use `%s' (for versions "
 "before 2.00) or `%s' (for 2.00 or later)"
@@ -7860,8 +8026,8 @@
 
 #. TRANSLATORS: %s is replaced with an OS name
 #: util/grub.d/10_hurd.in:164 util/grub.d/10_kfreebsd.in:225
-#: util/grub.d/10_linux.in:376 util/grub.d/10_netbsd.in:168
-#: util/grub.d/30_os-prober.in:292
+#: util/grub.d/10_linux.in:476 util/grub.d/10_linux_zfs.in:988
+#: util/grub.d/10_netbsd.in:168 util/grub.d/30_os-prober.in:292
 msgid "Advanced options for %s"
 msgstr ""
 
@@ -7889,28 +8055,30 @@
 msgid "Found kernel module directory: %s\\n"
 msgstr ""
 
-#: util/grub.d/10_linux.in:124 util/grub.d/10_linux.in:126
+#: util/grub.d/10_linux.in:179 util/grub.d/10_linux.in:181
 msgid "%s, with Linux %s (%s)"
 msgstr ""
 
-#: util/grub.d/10_linux.in:128
+#: util/grub.d/10_linux.in:183
 msgid "%s, with Linux %s"
 msgstr ""
 
-#: util/grub.d/10_linux.in:176 util/grub.d/20_linux_xen.in:125
+#: util/grub.d/10_linux.in:231 util/grub.d/10_linux_zfs.in:852
+#: util/grub.d/20_linux_xen.in:135
 msgid "Loading Linux %s ..."
 msgstr ""
 
 #. TRANSLATORS: ramdisk isn't identifier. Should be translated.
-#: util/grub.d/10_linux.in:192 util/grub.d/20_linux_xen.in:139
+#: util/grub.d/10_linux.in:247 util/grub.d/10_linux_zfs.in:863
+#: util/grub.d/20_linux_xen.in:149
 msgid "Loading initial ramdisk ..."
 msgstr ""
 
-#: util/grub.d/10_linux.in:322 util/grub.d/20_linux_xen.in:226
+#: util/grub.d/10_linux.in:388 util/grub.d/20_linux_xen.in:254
 msgid "Found linux image: %s\\n"
 msgstr ""
 
-#: util/grub.d/10_linux.in:359 util/grub.d/20_linux_xen.in:249
+#: util/grub.d/10_linux.in:430 util/grub.d/20_linux_xen.in:285
 msgid "Found initrd image: %s\\n"
 msgstr ""
 
@@ -7956,28 +8124,28 @@
 msgid "(on %s)"
 msgstr ""
 
-#: util/grub.d/20_linux_xen.in:99 util/grub.d/20_linux_xen.in:101
+#: util/grub.d/20_linux_xen.in:109 util/grub.d/20_linux_xen.in:111
 msgid "%s, with Xen %s and Linux %s (%s)"
 msgstr ""
 
-#: util/grub.d/20_linux_xen.in:103
+#: util/grub.d/20_linux_xen.in:113
 msgid "%s, with Xen %s and Linux %s"
 msgstr ""
 
-#: util/grub.d/20_linux_xen.in:113
+#: util/grub.d/20_linux_xen.in:123
 msgid "%s, with Xen hypervisor"
 msgstr ""
 
-#: util/grub.d/20_linux_xen.in:124
+#: util/grub.d/20_linux_xen.in:134
 msgid "Loading Xen %s ..."
 msgstr ""
 
-#: util/grub.d/20_linux_xen.in:215 util/grub.d/20_linux_xen.in:266
+#: util/grub.d/20_linux_xen.in:229 util/grub.d/20_linux_xen.in:310
 msgid "Xen hypervisor, version %s"
 msgstr ""
 
 #. TRANSLATORS: %s is replaced with an OS name
-#: util/grub.d/20_linux_xen.in:265
+#: util/grub.d/20_linux_xen.in:309
 msgid "Advanced options for %s (with Xen hypervisor)"
 msgstr ""
 
diff -Nru language-pack-th-18.04+20200123/data/th/LC_MESSAGES/hello.po language-pack-th-18.04+20200702/data/th/LC_MESSAGES/hello.po
--- language-pack-th-18.04+20200123/data/th/LC_MESSAGES/hello.po	1970-01-01 00:00:00.000000000 +0000
+++ language-pack-th-18.04+20200702/data/th/LC_MESSAGES/hello.po	2020-07-08 13:58:07.000000000 +0000
@@ -0,0 +1,209 @@
+# Translation hello messages to Thai.
+# Copyright (C) 2013 Free Software Foundation, Inc.
+# This file is distributed under the same license as the hello package.
+# Seksan Poltree <seksan.poltree@gmail.com>, 2007-2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: GNU hello 2.9\n"
+"Report-Msgid-Bugs-To: bug-hello@gnu.org\n"
+"POT-Creation-Date: 2014-11-16 11:53+0000\n"
+"PO-Revision-Date: 2015-07-09 09:38+0000\n"
+"Last-Translator: Seksan Poltree <seksan.poltree@gmail.com>\n"
+"Language-Team: Thai <translation-team-th@lists.sourceforge.net>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2020-07-02 11:10+0000\n"
+"X-Generator: Launchpad (build 1cbd0aa39df153c901321817f9b57cf3f232b507)\n"
+"Language: th\n"
+"X-Poedit-SourceCharset: utf-8\n"
+
+#: src/hello.c:60
+msgid "Hello, world!"
+msgstr "สวัสดี, ชาวโลก!"
+
+#: src/hello.c:84
+msgid "hello, world"
+msgstr "สวัสดี, ชาวโลก"
+
+#: src/hello.c:94
+msgid "extra operand"
+msgstr ""
+
+#: src/hello.c:100
+#, c-format
+msgid "conversion to a multibyte string failed"
+msgstr ""
+
+#. TRANSLATORS: --help output 1 (synopsis)
+#. no-wrap
+#: src/hello.c:121
+#, c-format
+msgid "Usage: %s [OPTION]...\n"
+msgstr "การใช้งาน: %s [ตัวเลือก]...\n"
+
+#. TRANSLATORS: --help output 2 (brief description)
+#. no-wrap
+#: src/hello.c:126
+msgid "Print a friendly, customizable greeting.\n"
+msgstr "พิมพ์คำทักทายรูปแบบเป็นมิตร, สามารถปรับแต่งได้ .\n"
+
+#. TRANSLATORS: --help output 3: options 1/2
+#. no-wrap
+#: src/hello.c:132
+msgid ""
+"  -h, --help          display this help and exit\n"
+"  -v, --version       display version information and exit\n"
+msgstr ""
+"  -h, --help         แสดงข้อความช่วยเหลือนี้แล้วออกจากโปรแกรม\n"
+"  -v, --version      แสดงข้อมูลรุ่นแล้วออกจากโปรแกรม\n"
+
+#. TRANSLATORS: --help output 4: options 2/2
+#. no-wrap
+#: src/hello.c:139
+msgid ""
+"  -t, --traditional       use traditional greeting\n"
+"  -g, --greeting=TEXT     use TEXT as the greeting message\n"
+msgstr ""
+
+#. TRANSLATORS: --help output 5+ (reports)
+#. TRANSLATORS: the placeholder indicates the bug-reporting address
+#. for this application.  Please add _another line_ with the
+#. address for translation bugs.
+#. no-wrap
+#: src/hello.c:149
+#, c-format
+msgid "Report bugs to: %s\n"
+msgstr "รายงานบั๊กไปยัง: <%s>\n"
+
+#: src/hello.c:152
+#, c-format
+msgid "Report %s bugs to: %s\n"
+msgstr "รายงานบั๊ก %s ไปยัง: %s\n"
+
+#: src/hello.c:156
+#, c-format
+msgid "%s home page: <%s>\n"
+msgstr "%s หน้าเว็บหลัก: <%s>\n"
+
+#: src/hello.c:158
+#, c-format
+msgid "%s home page: <http://www.gnu.org/software/%s/>\n"
+msgstr "%s หน้าเว็บหลัก: <http://www.gnu.org/software/%s/>\n"
+
+#: src/hello.c:161
+msgid "General help using GNU software: <http://www.gnu.org/gethelp/>\n"
+msgstr ""
+"ความช่วยเหลือทั่วไปในการใช้ซอฟต์แวร์ GNU : <http://www.gnu.org/gethelp/>\n"
+
+#: src/hello.c:179
+#, c-format
+msgid ""
+"Copyright (C) %d Free Software Foundation, Inc.\n"
+"License GPLv3+: GNU GPL version 3 or later "
+"<http://gnu.org/licenses/gpl.html>\n"
+"This is free software: you are free to change and redistribute it.\n"
+"There is NO WARRANTY, to the extent permitted by law.\n"
+msgstr ""
+"สงวนสิขสิทธิ์ (C) %d Free Software Foundation, Inc.\n"
+"สัญญาอนุญาต GPLv3+: GNU GPL รุ่น 3 หรือใหม่กว่า "
+"<http://www.gnu.org/licenses/gpl.html>\n"
+"นี่เป็นซอฟต์แวร์เสรี: คุณมีอิสระที่จะปรับเปลี่ยนและการส่งต่อมัน.\n"
+"มีการไม่รับประกัน, จากขอบเขตที่อนุญาตโดยกฎหมาย.\n"
+
+#: lib/error.c:191
+msgid "Unknown system error"
+msgstr "เกิดความผิดพลาดของระบบที่ไม่รู้จักขึ้น"
+
+#: lib/getopt.c:547 lib/getopt.c:576
+#, c-format
+msgid "%s: option '%s' is ambiguous; possibilities:"
+msgstr "%s: ตัวเลือก '%s' กำกวมไม่ชัดเจน; น่าจะเป็น:"
+
+#: lib/getopt.c:624 lib/getopt.c:628
+#, c-format
+msgid "%s: option '--%s' doesn't allow an argument\n"
+msgstr "%s: ตัวเลือก '--%s' ไม่อนุญาตให้มีอาร์กิวเมนต์\n"
+
+#: lib/getopt.c:637 lib/getopt.c:642
+#, c-format
+msgid "%s: option '%c%s' doesn't allow an argument\n"
+msgstr "%s: ตัวเลือก '%c%s' ไม่อนุญาตให้มีอาร์กิวเมนต์\n"
+
+#: lib/getopt.c:685 lib/getopt.c:704
+#, c-format
+msgid "%s: option '--%s' requires an argument\n"
+msgstr "%s: ตัวเลือก '--%s' จำเป็นต้องมีอาร์กิวเมนต์\n"
+
+#: lib/getopt.c:742 lib/getopt.c:745
+#, c-format
+msgid "%s: unrecognized option '--%s'\n"
+msgstr "%s:  ไม่สามารถจดจำตัวเลือก `--%s'\n"
+
+#: lib/getopt.c:753 lib/getopt.c:756
+#, c-format
+msgid "%s: unrecognized option '%c%s'\n"
+msgstr "%s: ไม่สามารถจดจำตัวเลือก '%c%s' ได้\n"
+
+#: lib/getopt.c:805 lib/getopt.c:808
+#, c-format
+msgid "%s: invalid option -- '%c'\n"
+msgstr "%s: ตัวเลือกไม่ถูกต้อง -- '%c'\n"
+
+#: lib/getopt.c:861 lib/getopt.c:878 lib/getopt.c:1088 lib/getopt.c:1106
+#, c-format
+msgid "%s: option requires an argument -- '%c'\n"
+msgstr "%s: ตัวเลือกที่ต้องการอาร์กิวเมนต์หนึ่งตัว -- '%c'\n"
+
+#: lib/getopt.c:934 lib/getopt.c:950
+#, c-format
+msgid "%s: option '-W %s' is ambiguous\n"
+msgstr "%s: ตัวเลือก '-W %s' กำกวมไม่ชัดเจน\n"
+
+#: lib/getopt.c:974 lib/getopt.c:992
+#, c-format
+msgid "%s: option '-W %s' doesn't allow an argument\n"
+msgstr "%s: ตัวเลือก '-W %s' ไม่อนุญาตให้มีอาร์กิวเมนต์\n"
+
+#: lib/getopt.c:1013 lib/getopt.c:1031
+#, c-format
+msgid "%s: option '-W %s' requires an argument\n"
+msgstr "%s: ตัวเลือก '-W %s' จำเป็นต้องมีอาร์กิวเมนต์\n"
+
+#: lib/closeout.c:112
+msgid "write error"
+msgstr "เกิดข้อผิดพลาดในการเขียน"
+
+#. TRANSLATORS:
+#. Get translations for open and closing quotation marks.
+#. The message catalog should translate "`" to a left
+#. quotation mark suitable for the locale, and similarly for
+#. "'".  For example, a French Unicode local should translate
+#. these to U+00AB (LEFT-POINTING DOUBLE ANGLE
+#. QUOTATION MARK), and U+00BB (RIGHT-POINTING DOUBLE ANGLE
+#. QUOTATION MARK), respectively.
+#. 
+#. If the catalog has no translation, we will try to
+#. use Unicode U+2018 (LEFT SINGLE QUOTATION MARK) and
+#. Unicode U+2019 (RIGHT SINGLE QUOTATION MARK).  If the
+#. current locale is not Unicode, locale_quoting_style
+#. will quote 'like this', and clocale_quoting_style will
+#. quote "like this".  You should always include translations
+#. for "`" and "'" even if U+2018 and U+2019 are appropriate
+#. for your locale.
+#. 
+#. If you don't know what to put here, please see
+#. <http://en.wikipedia.org/wiki/Quotation_marks_in_other_languages>
+#. and use glyphs suitable for your language.
+#: lib/quotearg.c:312
+msgid "`"
+msgstr "`"
+
+#: lib/quotearg.c:313
+msgid "'"
+msgstr "'"
+
+#: lib/xalloc-die.c:34
+msgid "memory exhausted"
+msgstr "หน่วยความจำถูกใช้จนหมดแล้ว"
diff -Nru language-pack-th-18.04+20200123/data/th/LC_MESSAGES/language-selector.po language-pack-th-18.04+20200702/data/th/LC_MESSAGES/language-selector.po
--- language-pack-th-18.04+20200123/data/th/LC_MESSAGES/language-selector.po	2020-01-23 16:55:54.000000000 +0000
+++ language-pack-th-18.04+20200702/data/th/LC_MESSAGES/language-selector.po	2020-07-08 13:58:06.000000000 +0000
@@ -15,8 +15,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2020-01-23 11:22+0000\n"
-"X-Generator: Launchpad (build b8d1327fd820d6bf500589d6da587d5037c7d88e)\n"
+"X-Launchpad-Export-Date: 2020-07-02 11:11+0000\n"
+"X-Generator: Launchpad (build 1cbd0aa39df153c901321817f9b57cf3f232b507)\n"
 "Language: th\n"
 
 #. Hack for Chinese langpack split
diff -Nru language-pack-th-18.04+20200123/data/th/LC_MESSAGES/libapt-inst2.0.po language-pack-th-18.04+20200702/data/th/LC_MESSAGES/libapt-inst2.0.po
--- language-pack-th-18.04+20200123/data/th/LC_MESSAGES/libapt-inst2.0.po	2020-01-23 16:55:54.000000000 +0000
+++ language-pack-th-18.04+20200702/data/th/LC_MESSAGES/libapt-inst2.0.po	2020-07-08 13:58:06.000000000 +0000
@@ -8,179 +8,175 @@
 msgstr ""
 "Project-Id-Version: apt 1.0.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2019-09-05 12:01+0000\n"
-"PO-Revision-Date: 2019-09-12 15:24+0000\n"
+"POT-Creation-Date: 2020-05-13 13:17+0000\n"
+"PO-Revision-Date: 2020-05-14 05:01+0000\n"
 "Last-Translator: Theppitak Karoonboonyanan <Unknown>\n"
 "Language-Team: Thai <thai-l10n@googlegroups.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2020-01-23 10:31+0000\n"
-"X-Generator: Launchpad (build b8d1327fd820d6bf500589d6da587d5037c7d88e)\n"
+"X-Launchpad-Export-Date: 2020-07-02 10:31+0000\n"
+"X-Generator: Launchpad (build 1cbd0aa39df153c901321817f9b57cf3f232b507)\n"
 "Language: th\n"
 
-#: apt-inst/contrib/arfile.cc:75
+#: apt-inst/contrib/arfile.cc:76
 msgid "Invalid archive signature"
 msgstr "เอกลักษณ์ของแฟ้มจัดเก็บไม่ถูกต้อง"
 
-#: apt-inst/contrib/arfile.cc:83
+#: apt-inst/contrib/arfile.cc:84
 msgid "Error reading archive member header"
 msgstr "เกิดข้อผิดพลาดขณะอ่านข้อมูลส่วนหัวของสมาชิกแฟ้มจัดเก็บ"
 
-#: apt-inst/contrib/arfile.cc:95
-#, c-format
-msgid "Invalid archive member header %s"
-msgstr "ข้อมูลส่วนหัว %s ของสมาชิกแฟ้มจัดเก็บไม่ถูกต้อง"
-
-#: apt-inst/contrib/arfile.cc:107
+#: apt-inst/contrib/arfile.cc:96 apt-inst/contrib/arfile.cc:108
+#: apt-inst/contrib/arfile.cc:128
 msgid "Invalid archive member header"
 msgstr "ข้อมูลส่วนหัวของสมาชิกแฟ้มจัดเก็บไม่ถูกต้อง"
 
-#: apt-inst/contrib/arfile.cc:136
+#: apt-inst/contrib/arfile.cc:144
 msgid "Archive is too short"
 msgstr "แฟ้มจัดเก็บสั้นเกินไป"
 
-#: apt-inst/contrib/arfile.cc:140
+#: apt-inst/contrib/arfile.cc:148
 msgid "Failed to read the archive headers"
 msgstr "อ่านข้อมูลส่วนหัวของแฟ้มจัดเก็บไม่สำเร็จ"
 
-#: apt-inst/contrib/extracttar.cc:109
+#: apt-inst/contrib/extracttar.cc:110
 #, c-format
 msgid "Cannot find a configured compressor for '%s'"
 msgstr ""
 
-#: apt-inst/contrib/extracttar.cc:141 apt-inst/contrib/extracttar.cc:171
+#: apt-inst/contrib/extracttar.cc:142 apt-inst/contrib/extracttar.cc:172
 msgid "Corrupted archive"
 msgstr "แฟ้มจัดเก็บเสียหาย"
 
-#: apt-inst/contrib/extracttar.cc:156
+#: apt-inst/contrib/extracttar.cc:157
 msgid "Tar checksum failed, archive corrupted"
 msgstr "checksum ของแฟ้ม tar ผิดพลาด แฟ้มจัดเก็บเสียหาย"
 
-#: apt-inst/contrib/extracttar.cc:261
+#: apt-inst/contrib/extracttar.cc:262
 #, c-format
-msgid "Unknown TAR header type %u, member %s"
-msgstr "พบชนิด %u ของข้อมูลส่วนหัว TAR ที่ไม่รู้จัก ที่สมาชิก %s"
+msgid "Unknown TAR header type %u"
+msgstr ""
 
-#: apt-inst/deb/debfile.cc:46 apt-inst/deb/debfile.cc:55
-#: apt-inst/deb/debfile.cc:66
+#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:56
+#: apt-inst/deb/debfile.cc:67
 #, c-format
 msgid "This is not a valid DEB archive, missing '%s' member"
 msgstr "แฟ้มนี้ไม่ใช่แพกเกจ DEB ที่ใช้การได้ ขาดสมาชิก '%s'"
 
-#: apt-inst/deb/debfile.cc:135
+#: apt-inst/deb/debfile.cc:136
 #, c-format
 msgid "Internal error, could not locate member %s"
 msgstr "ข้อผิดพลาดภายใน: ไม่พบสมาชิก %s"
 
-#: apt-inst/deb/debfile.cc:230
+#: apt-inst/deb/debfile.cc:231
 msgid "Unparsable control file"
 msgstr "ไม่สามารถแจงแฟ้มควบคุมได้"
 
-#: apt-inst/dirstream.cc:41 apt-inst/dirstream.cc:48 apt-inst/dirstream.cc:53
+#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54
 #, c-format
 msgid "Failed to write file %s"
 msgstr "ไม่สามารถเขียนแฟ้ม %s"
 
-#: apt-inst/dirstream.cc:103
+#: apt-inst/dirstream.cc:104
 #, c-format
 msgid "Failed to close file %s"
 msgstr "ไม่สามารถปิดแฟ้ม %s"
 
-#: apt-inst/extract.cc:99 apt-inst/extract.cc:170
+#: apt-inst/extract.cc:100 apt-inst/extract.cc:171
 #, c-format
 msgid "The path %s is too long"
 msgstr "พาธ %s ยาวเกินไป"
 
-#: apt-inst/extract.cc:130
+#: apt-inst/extract.cc:131
 #, c-format
 msgid "Unpacking %s more than once"
 msgstr "พยายามแตกแพกเกจ %s มากกว่าหนึ่งครั้ง"
 
-#: apt-inst/extract.cc:140
+#: apt-inst/extract.cc:141
 #, c-format
 msgid "The directory %s is diverted"
 msgstr "ไดเรกทอรี %s ถูก divert"
 
-#: apt-inst/extract.cc:150
+#: apt-inst/extract.cc:151
 #, c-format
 msgid "The package is trying to write to the diversion target %s/%s"
 msgstr "แพกเกจนี้พยายามเขียนลงปลายทางของการเบนแฟ้ม %s/%s"
 
-#: apt-inst/extract.cc:160 apt-inst/extract.cc:304
+#: apt-inst/extract.cc:161 apt-inst/extract.cc:305
 msgid "The diversion path is too long"
 msgstr "พาธของการเบนแฟ้มยาวเกินไป"
 
-#: apt-inst/extract.cc:184 apt-inst/extract.cc:197 apt-inst/extract.cc:214
+#: apt-inst/extract.cc:185 apt-inst/extract.cc:198 apt-inst/extract.cc:215
 #, c-format
 msgid "Failed to stat %s"
 msgstr "stat %s ไม่สำเร็จ"
 
-#: apt-inst/extract.cc:192
+#: apt-inst/extract.cc:193
 #, c-format
 msgid "Failed to rename %s to %s"
 msgstr "ไม่สามารถเปลี่ยนชื่อ %s ไปเป็น %s"
 
-#: apt-inst/extract.cc:247
+#: apt-inst/extract.cc:248
 #, c-format
 msgid "The directory %s is being replaced by a non-directory"
 msgstr "ไดเรกทอรี %s กำลังจะถูกแทนที่ด้วยสิ่งที่ไม่ใช่ไดเรกทอรี"
 
-#: apt-inst/extract.cc:287
+#: apt-inst/extract.cc:288
 msgid "Failed to locate node in its hash bucket"
 msgstr "หาโหนดใน bucket ของแฮชไม่พบ"
 
-#: apt-inst/extract.cc:291
+#: apt-inst/extract.cc:292
 msgid "The path is too long"
 msgstr "พาธยาวเกินไป"
 
-#: apt-inst/extract.cc:419
+#: apt-inst/extract.cc:420
 #, c-format
 msgid "Overwrite package match with no version for %s"
 msgstr "พบแพกเกจที่เขียนทับโดยไม่มีข้อมูลรุ่นสำหรับ %s"
 
-#: apt-inst/extract.cc:436
+#: apt-inst/extract.cc:437
 #, c-format
 msgid "File %s/%s overwrites the one in the package %s"
 msgstr "แฟ้ม %s/%s เขียนทับแฟ้มในแพกเกจ %s"
 
-#: apt-inst/extract.cc:469
+#: apt-inst/extract.cc:470
 #, c-format
 msgid "Unable to read %s"
 msgstr "ไม่สามารถอ่าน %s"
 
-#: apt-inst/extract.cc:496
+#: apt-inst/extract.cc:497
 #, c-format
 msgid "Unable to stat %s"
 msgstr "ไม่สามารถ stat %s"
 
-#: apt-inst/filelist.cc:379
+#: apt-inst/filelist.cc:380
 msgid "DropNode called on still linked node"
 msgstr "DropNode ถูกเรียกใช้กับโหนดที่ยังลิงก์อยู่"
 
-#: apt-inst/filelist.cc:411
+#: apt-inst/filelist.cc:412
 msgid "Failed to locate the hash element!"
 msgstr "หาสมาชิกในตารางแฮชไม่สำเร็จ!"
 
-#: apt-inst/filelist.cc:458
+#: apt-inst/filelist.cc:459
 msgid "Failed to allocate diversion"
 msgstr "จองเนื้อที่สำหรับการเบนแฟ้มไม่สำเร็จ"
 
-#: apt-inst/filelist.cc:463
+#: apt-inst/filelist.cc:464
 msgid "Internal error in AddDiversion"
 msgstr "ข้อผิดพลาดภายในที่ AddDiversion"
 
-#: apt-inst/filelist.cc:476
+#: apt-inst/filelist.cc:477
 #, c-format
 msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
 msgstr "พยายามเขียนทับการเบนแฟ้ม: %s -> %s กับ %s/%s"
 
-#: apt-inst/filelist.cc:505
+#: apt-inst/filelist.cc:506
 #, c-format
 msgid "Double add of diversion %s -> %s"
 msgstr "เพิ่มการเบนแฟ้ม %s -> %s ซ้ำสอง"
 
-#: apt-inst/filelist.cc:548
+#: apt-inst/filelist.cc:549
 #, c-format
 msgid "Duplicate conf file %s/%s"
 msgstr "แฟ้มค่าตั้ง %s/%s ซ้ำ"
diff -Nru language-pack-th-18.04+20200123/data/th/LC_MESSAGES/libapt-pkg5.0.po language-pack-th-18.04+20200702/data/th/LC_MESSAGES/libapt-pkg5.0.po
--- language-pack-th-18.04+20200123/data/th/LC_MESSAGES/libapt-pkg5.0.po	2020-01-23 16:55:56.000000000 +0000
+++ language-pack-th-18.04+20200702/data/th/LC_MESSAGES/libapt-pkg5.0.po	2020-07-08 13:58:08.000000000 +0000
@@ -8,102 +8,102 @@
 msgstr ""
 "Project-Id-Version: apt 1.0.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2019-09-05 12:01+0000\n"
-"PO-Revision-Date: 2019-09-12 15:23+0000\n"
+"POT-Creation-Date: 2020-05-13 13:17+0000\n"
+"PO-Revision-Date: 2020-05-14 05:01+0000\n"
 "Last-Translator: Theppitak Karoonboonyanan <Unknown>\n"
 "Language-Team: Thai <thai-l10n@googlegroups.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2020-01-23 10:31+0000\n"
-"X-Generator: Launchpad (build b8d1327fd820d6bf500589d6da587d5037c7d88e)\n"
+"X-Launchpad-Export-Date: 2020-07-02 10:31+0000\n"
+"X-Generator: Launchpad (build 1cbd0aa39df153c901321817f9b57cf3f232b507)\n"
 "Language: th\n"
 
-#: apt-pkg/acquire-item.cc:177
+#: apt-pkg/acquire-item.cc:176
 msgid ""
 "Updating from such a repository can't be done securely, and is therefore "
 "disabled by default."
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:182
+#: apt-pkg/acquire-item.cc:181
 msgid ""
 "Data from such a repository can't be authenticated and is therefore "
 "potentially dangerous to use."
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:184
+#: apt-pkg/acquire-item.cc:183
 msgid ""
 "See apt-secure(8) manpage for repository creation and user configuration "
 "details."
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:225
+#: apt-pkg/acquire-item.cc:224
 #, c-format
 msgid "The repository '%s' is no longer signed."
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:226
+#: apt-pkg/acquire-item.cc:225
 #, c-format
 msgid "The repository '%s' no longer has a Release file."
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:235
+#: apt-pkg/acquire-item.cc:234
 msgid ""
 "This is normally not allowed, but the option "
 "Acquire::AllowDowngradeToInsecureRepositories was given to override it."
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:253
+#: apt-pkg/acquire-item.cc:252
 #, c-format
 msgid "The repository '%s' is not signed."
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:254
+#: apt-pkg/acquire-item.cc:253
 #, c-format
 msgid "The repository '%s' does not have a Release file."
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:255
+#: apt-pkg/acquire-item.cc:254
 #, c-format
 msgid "The repository '%s' provides only weak security information."
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:590
+#: apt-pkg/acquire-item.cc:543
 #, c-format
 msgid "Failed to readlink %s"
 msgstr "readlink %s ไม่สำเร็จ"
 
-#: apt-pkg/acquire-item.cc:599
+#: apt-pkg/acquire-item.cc:552
 #, c-format
 msgid "Failed to stat %s"
 msgstr "stat %s ไม่สำเร็จ"
 
-#: apt-pkg/acquire-item.cc:949 apt-pkg/acquire-item.cc:1089
+#: apt-pkg/acquire-item.cc:864 apt-pkg/acquire-item.cc:1004
 msgid "Hash Sum mismatch"
 msgstr "ผลรวมแฮชไม่ตรงกัน"
 
-#: apt-pkg/acquire-item.cc:952
+#: apt-pkg/acquire-item.cc:867
 msgid "Insufficient information available to perform this download securely"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1064 apt-pkg/contrib/fileutl.cc:3149
+#: apt-pkg/acquire-item.cc:979 apt-pkg/contrib/fileutl.cc:3143
 #, c-format
 msgid "rename failed, %s (%s -> %s)."
 msgstr "เปลี่ยนชื่อไม่สำเร็จ: %s (%s -> %s)"
 
-#: apt-pkg/acquire-item.cc:1092
+#: apt-pkg/acquire-item.cc:1007
 msgid "Size mismatch"
 msgstr "ขนาดไม่ตรงกัน"
 
-#: apt-pkg/acquire-item.cc:1096
+#: apt-pkg/acquire-item.cc:1011
 msgid "Invalid file format"
 msgstr "รูปแบบของแฟ้มไม่ถูกต้อง"
 
-#: apt-pkg/acquire-item.cc:1101
+#: apt-pkg/acquire-item.cc:1016
 msgid "Signature error"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1105
+#: apt-pkg/acquire-item.cc:1020
 #, c-format
 msgid ""
 "Clearsigned file isn't valid, got '%s' (does the network require "
@@ -112,7 +112,7 @@
 "แฟ้มที่เซ็นกำกับครอบข้อความมีเนื้อหาไม่ถูกต้อง ได้รับผลลัพธ์ '%s' "
 "(เครือข่ายต้องยืนยันตัวบุคคลหรือไม่?)"
 
-#: apt-pkg/acquire-item.cc:1354
+#: apt-pkg/acquire-item.cc:1269
 #, c-format
 msgid ""
 "An error occurred during the signature verification. The repository is not "
@@ -120,33 +120,33 @@
 msgstr ""
 
 #. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1363 apt-pkg/acquire-item.cc:1369
+#: apt-pkg/acquire-item.cc:1278 apt-pkg/acquire-item.cc:1284
 #, c-format
 msgid "GPG error: %s: %s"
 msgstr "ข้อผิดพลาดจาก GPG: %s: %s"
 
-#: apt-pkg/acquire-item.cc:1604
+#: apt-pkg/acquire-item.cc:1494
 #, c-format
 msgid ""
 "Skipping acquire of configured file '%s' as repository '%s' doesn't have the "
 "component '%s' (component misspelt in sources.list?)"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1623
+#: apt-pkg/acquire-item.cc:1513
 #, c-format
 msgid ""
 "Skipping acquire of configured file '%s' as repository '%s' doesn't support "
 "architecture '%s'"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1640
+#: apt-pkg/acquire-item.cc:1530
 #, c-format
 msgid ""
 "Skipping acquire of configured file '%s' as repository '%s' does not seem to "
 "provide it (sources.list entry misspelt?)"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1658
+#: apt-pkg/acquire-item.cc:1548
 #, c-format
 msgid ""
 "Skipping acquire of configured file '%s' as repository '%s' provides only "
@@ -156,7 +156,7 @@
 #. TRANSLATOR: The first %s is the URL of the bad Release file, the second is
 #. the time since then the file is invalid - formatted in the same way as in
 #. the download progress display (e.g. 7d 3h 42min 1s)
-#: apt-pkg/acquire-item.cc:1760
+#: apt-pkg/acquire-item.cc:1659
 #, c-format
 msgid ""
 "Release file for %s is expired (invalid since %s). Updates for this "
@@ -168,92 +168,92 @@
 #. TRANSLATOR: The first %s is the URL of the bad Release file, the second is
 #. the time until the file will be valid - formatted in the same way as in
 #. the download progress display (e.g. 7d 3h 42min 1s)
-#: apt-pkg/acquire-item.cc:1779
+#: apt-pkg/acquire-item.cc:1678
 #, c-format
 msgid ""
 "Release file for %s is not valid yet (invalid for another %s). Updates for "
 "this repository will not be applied."
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1814
+#: apt-pkg/acquire-item.cc:1713
 #, c-format
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr "ชุดจัดแจกขัดแย้งกัน: %s (ต้องการ %s แต่พบ %s)"
 
-#: apt-pkg/acquire-item.cc:1844
+#: apt-pkg/acquire-item.cc:1743
 #, c-format
 msgid "Repository '%s' changed its '%s' value from '%s' to '%s'"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1860
+#: apt-pkg/acquire-item.cc:1759
 #, c-format
 msgid "Repository '%s' changed its default priority for %s from %hi to %hi."
 msgstr ""
 
 #. TRANSLATOR: the "this" refers to changes in the repository like a new release or owner change
-#: apt-pkg/acquire-item.cc:1873
+#: apt-pkg/acquire-item.cc:1772
 #, c-format
 msgid ""
 "More information about this can be found online in the Release notes at: %s"
 msgstr ""
 
 #. TRANSLATOR: %s is the name of the manpage in question, e.g. apt-secure(8)
-#: apt-pkg/acquire-item.cc:1880
+#: apt-pkg/acquire-item.cc:1779
 #, c-format
 msgid ""
 "This must be accepted explicitly before updates for this repository can be "
 "applied. See %s manpage for details."
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:2011 apt-pkg/update.cc:93 apt-pkg/update.cc:96
+#: apt-pkg/acquire-item.cc:1910 apt-pkg/update.cc:93 apt-pkg/update.cc:96
 #, c-format
 msgid "Failed to fetch %s  %s"
 msgstr "ไม่สามารถดาวน์โหลด %s  %s"
 
-#: apt-pkg/acquire-item.cc:3358
+#: apt-pkg/acquire-item.cc:3338
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
 "to manually fix this package. (due to missing arch)"
 msgstr "ไม่พบแฟ้มสำหรับแพกเกจ %s คุณอาจต้องแก้ปัญหาแพกเกจนี้เอง (ไม่มี arch)"
 
-#: apt-pkg/acquire-item.cc:3491
+#: apt-pkg/acquire-item.cc:3471
 #, c-format
 msgid "Can't find a source to download version '%s' of '%s'"
 msgstr "ไม่พบแหล่งที่จะดาวน์โหลดรุ่น '%s' ของ '%s' ได้"
 
 #. TRANSLATOR: %s=%s is sourcename=sourceversion, e.g. apt=1.1
-#: apt-pkg/acquire-item.cc:3643 apt-pkg/acquire-item.cc:3832
+#: apt-pkg/acquire-item.cc:3623 apt-pkg/acquire-item.cc:3812
 #, c-format
 msgid "Changelog unavailable for %s=%s"
 msgstr ""
 
-#: apt-pkg/acquire-worker.cc:109
+#: apt-pkg/acquire-worker.cc:108
 #, c-format
 msgid "The method '%s' is explicitly disabled via configuration."
 msgstr ""
 
-#: apt-pkg/acquire-worker.cc:111
+#: apt-pkg/acquire-worker.cc:110
 #, c-format
 msgid "If you meant to use Tor remember to use %s instead of %s."
 msgstr ""
 
-#: apt-pkg/acquire-worker.cc:114
+#: apt-pkg/acquire-worker.cc:113
 #, c-format
 msgid "The method driver %s could not be found."
 msgstr "ไม่พบไดรเวอร์สำหรับวิธีการ %s"
 
-#: apt-pkg/acquire-worker.cc:118
+#: apt-pkg/acquire-worker.cc:117
 #, c-format
 msgid "Is the package %s installed?"
 msgstr "ได้ติดตั้งแพกเกจ %s ไว้หรือไม่?"
 
-#: apt-pkg/acquire-worker.cc:173
+#: apt-pkg/acquire-worker.cc:172
 #, c-format
 msgid "Method %s did not start correctly"
 msgstr "ไม่สามารถเรียกทำงานวิธีการ %s"
 
-#: apt-pkg/acquire-worker.cc:690
+#: apt-pkg/acquire-worker.cc:677
 #, c-format
 msgid ""
 "Please insert the disc labeled: '%s' in the drive '%s' and press [Enter]."
@@ -286,41 +286,43 @@
 "by user '%s'."
 msgstr ""
 
-#: apt-pkg/acquire.cc:789 apt-pkg/clean.cc:39
+#: apt-pkg/acquire.cc:789 apt-pkg/clean.cc:40
 #, c-format
 msgid "Clean of %s is not supported"
 msgstr "ไม่รองรับการล้างข้อมูลที่ %s"
 
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
-#: apt-pkg/acquire.cc:793 apt-pkg/acquire.cc:796 apt-pkg/clean.cc:49
-#: apt-pkg/clean.cc:59 apt-pkg/contrib/cdromutl.cc:189
-#: apt-pkg/contrib/cdromutl.cc:211 apt-pkg/contrib/fileutl.cc:416
+#: apt-pkg/acquire.cc:793 apt-pkg/acquire.cc:796 apt-pkg/clean.cc:50
+#: apt-pkg/clean.cc:60 apt-pkg/contrib/cdromutl.cc:190
+#: apt-pkg/contrib/cdromutl.cc:212 apt-pkg/contrib/fileutl.cc:416
 #: apt-pkg/contrib/fileutl.cc:418 apt-pkg/contrib/fileutl.cc:531
-#: apt-pkg/contrib/fileutl.cc:3391 apt-pkg/deb/dpkgpm.cc:1394
-#: apt-pkg/init.cc:223 apt-pkg/init.cc:231 apt-pkg/policy.cc:327
-#: apt-pkg/sourcelist.cc:320 apt-pkg/sourcelist.cc:327
+#: apt-pkg/contrib/fileutl.cc:3385 apt-pkg/deb/dpkgpm.cc:1394
+#: apt-pkg/init.cc:223 apt-pkg/init.cc:231 apt-pkg/policy.cc:328
+#: apt-pkg/sourcelist.cc:321 apt-pkg/sourcelist.cc:328
 #, c-format
 msgid "Unable to read %s"
 msgstr "ไม่สามารถอ่าน %s"
 
-#: apt-pkg/acquire.cc:1384
+#. only show the ETA if it makes sense
+#. two days
+#: apt-pkg/acquire.cc:1376
 #, c-format
 msgid "Retrieving file %li of %li (%s remaining)"
 msgstr "กำลังดาวน์โหลดแฟ้มที่ %li จาก %li (เหลืออีก %s)"
 
-#: apt-pkg/acquire.cc:1386
+#: apt-pkg/acquire.cc:1378
 #, c-format
 msgid "Retrieving file %li of %li"
 msgstr "กำลังดาวน์โหลดแฟ้มที่ %li จาก %li"
 
-#: apt-pkg/algorithms.cc:322
+#: apt-pkg/algorithms.cc:323
 #, c-format
 msgid ""
 "The package %s needs to be reinstalled, but I can't find an archive for it."
 msgstr "จำเป็นต้องติดตั้งแพกเกจ %s ซ้ำ แต่หาตัวแพกเกจไม่พบ"
 
-#: apt-pkg/algorithms.cc:1137
+#: apt-pkg/algorithms.cc:1138
 msgid ""
 "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
 "held packages."
@@ -328,19 +330,19 @@
 "ข้อผิดพลาด: pkgProblemResolver::Resolve สร้างคำตอบที่ทำให้เกิดแพกเกจเสีย "
 "อาจเกิดจากแพกเกจที่ถูกกำหนดให้คงรุ่นไว้"
 
-#: apt-pkg/algorithms.cc:1139
+#: apt-pkg/algorithms.cc:1140
 msgid "Unable to correct problems, you have held broken packages."
 msgstr "ไม่สามารถแก้ปัญหาได้ คุณได้คงรุ่นแพกเกจที่เสียอยู่ไว้"
 
-#: apt-pkg/cachefile.cc:129
+#: apt-pkg/cachefile.cc:130
 msgid "The package lists or status file could not be parsed or opened."
 msgstr "ไม่สามารถแจงหรือเปิดรายชื่อแพกเกจหรือสถานะแพกเกจได้"
 
-#: apt-pkg/cachefile.cc:133
+#: apt-pkg/cachefile.cc:134
 msgid "You may want to run apt-get update to correct these problems"
 msgstr "คุณอาจเรียก `apt-get update' เพื่อแก้ปัญหาเหล่านี้ได้"
 
-#: apt-pkg/cachefile.cc:156
+#: apt-pkg/cachefile.cc:157
 msgid "The list of sources could not be read."
 msgstr "ไม่สามารถอ่านรายชื่อแหล่งแพกเกจได้"
 
@@ -498,116 +500,116 @@
 msgid "Source list entries for this disc are:\n"
 msgstr "บรรทัดรายชื่อแหล่งแพกเกจสำหรับแผ่นนี้คือ:\n"
 
-#: apt-pkg/clean.cc:55 apt-pkg/clean.cc:145
+#: apt-pkg/clean.cc:56 apt-pkg/clean.cc:146
 #, c-format
 msgid "Unable to change to %s"
 msgstr "ไม่สามารถเปลี่ยนไดเรกทอรีไปยัง %s"
 
-#: apt-pkg/clean.cc:75
+#: apt-pkg/clean.cc:76
 #, c-format
 msgid "Unable to stat %s."
 msgstr "ไม่สามารถ stat %s"
 
-#: apt-pkg/contrib/cdromutl.cc:64
+#: apt-pkg/contrib/cdromutl.cc:65
 #, c-format
 msgid "Unable to stat the mount point %s"
 msgstr "ไม่สามารถ stat จุดเมานท์ %s"
 
-#: apt-pkg/contrib/cdromutl.cc:244
+#: apt-pkg/contrib/cdromutl.cc:245
 msgid "Failed to stat the cdrom"
 msgstr "ไม่สามารถ stat ซีดีรอม"
 
-#: apt-pkg/contrib/cmndline.cc:126
+#: apt-pkg/contrib/cmndline.cc:127
 #, c-format
 msgid ""
 "Command line option '%c' [from %s] is not understood in combination with the "
 "other options."
 msgstr ""
 
-#: apt-pkg/contrib/cmndline.cc:151 apt-pkg/contrib/cmndline.cc:160
-#: apt-pkg/contrib/cmndline.cc:168
+#: apt-pkg/contrib/cmndline.cc:152 apt-pkg/contrib/cmndline.cc:161
+#: apt-pkg/contrib/cmndline.cc:169
 #, c-format
 msgid ""
 "Command line option %s is not understood in combination with the other "
 "options"
 msgstr ""
 
-#: apt-pkg/contrib/cmndline.cc:173
+#: apt-pkg/contrib/cmndline.cc:174
 #, c-format
 msgid "Command line option %s is not boolean"
 msgstr "ตัวเลือกบรรทัดคำสั่ง %s ไม่ได้เป็นค่าบูลีน"
 
-#: apt-pkg/contrib/cmndline.cc:229
+#: apt-pkg/contrib/cmndline.cc:230
 #, c-format
 msgid "Option %s requires an argument."
 msgstr "ตัวเลือก %s ต้องมีอาร์กิวเมนต์"
 
-#: apt-pkg/contrib/cmndline.cc:242
+#: apt-pkg/contrib/cmndline.cc:243
 #, c-format
 msgid "Option %s: Configuration item specification must have an =<val>."
 msgstr "ตัวเลือก %s: การกำหนดรายการค่าตั้งต้องมี =<val>"
 
-#: apt-pkg/contrib/cmndline.cc:268
+#: apt-pkg/contrib/cmndline.cc:269
 #, c-format
 msgid "Option %s requires an integer argument, not '%s'"
 msgstr "ตัวเลือก %s ต้องการอาร์กิวเมนต์จำนวนเต็ม ไม่ใช่ '%s'"
 
-#: apt-pkg/contrib/cmndline.cc:299
+#: apt-pkg/contrib/cmndline.cc:300
 #, c-format
 msgid "Option '%s' is too long"
 msgstr "ตัวเลือก '%s' ยาวเกินไป"
 
-#: apt-pkg/contrib/cmndline.cc:331
+#: apt-pkg/contrib/cmndline.cc:332
 #, c-format
 msgid "Sense %s is not understood, try true or false."
 msgstr "ไม่เข้าใจค่าบูลีน %s กรุณาลองใช้ true หรือ false"
 
-#: apt-pkg/contrib/cmndline.cc:379
+#: apt-pkg/contrib/cmndline.cc:380
 #, c-format
 msgid "Invalid operation %s"
 msgstr "ไม่รู้จักคำสั่ง %s"
 
-#: apt-pkg/contrib/configuration.cc:720
+#: apt-pkg/contrib/configuration.cc:721
 #, c-format
 msgid "Unrecognized type abbreviation: '%c'"
 msgstr "พบตัวย่อของชนิดที่ข้อมูลไม่รู้จัก: '%c'"
 
-#: apt-pkg/contrib/configuration.cc:1001
+#: apt-pkg/contrib/configuration.cc:1002
 #, c-format
 msgid "Syntax error %s:%u: Block starts with no name."
 msgstr "ไวยากรณ์ผิดพลาด %s:%u: เริ่มบล็อคโดยไม่มีชื่อ"
 
-#: apt-pkg/contrib/configuration.cc:1015
+#: apt-pkg/contrib/configuration.cc:1016
 #, c-format
 msgid "Syntax error %s:%u: Malformed tag"
 msgstr "ไวยากรณ์ผิดพลาด %s:%u: แท็กผิดรูปแบบ"
 
-#: apt-pkg/contrib/configuration.cc:1032
+#: apt-pkg/contrib/configuration.cc:1033
 #, c-format
 msgid "Syntax error %s:%u: Extra junk after value"
 msgstr "ไวยากรณ์ผิดพลาด %s:%u: มีขยะเกินหลังค่า"
 
-#: apt-pkg/contrib/configuration.cc:1070
+#: apt-pkg/contrib/configuration.cc:1071
 #, c-format
 msgid "Syntax error %s:%u: Directives can only be done at the top level"
 msgstr "ไวยากรณ์ผิดพลาด %s:%u: สามารถใช้ directive ที่ระดับบนสุดได้เท่านั้น"
 
-#: apt-pkg/contrib/configuration.cc:1077
+#: apt-pkg/contrib/configuration.cc:1078
 #, c-format
 msgid "Syntax error %s:%u: Too many nested includes"
 msgstr "ไวยากรณ์ผิดพลาด %s:%u: ใช้ include ซ้อนกันมากเกินไป"
 
-#: apt-pkg/contrib/configuration.cc:1081 apt-pkg/contrib/configuration.cc:1086
+#: apt-pkg/contrib/configuration.cc:1082 apt-pkg/contrib/configuration.cc:1087
 #, c-format
 msgid "Syntax error %s:%u: Included from here"
 msgstr "ไวยากรณ์ผิดพลาด %s:%u: include จากที่นี่"
 
-#: apt-pkg/contrib/configuration.cc:1095
+#: apt-pkg/contrib/configuration.cc:1096
 #, c-format
 msgid "Syntax error %s:%u: Unsupported directive '%s'"
 msgstr "ไวยากรณ์ผิดพลาด %s:%u: พบ directive '%s' ที่ไม่รองรับ"
 
-#: apt-pkg/contrib/configuration.cc:1098
+#: apt-pkg/contrib/configuration.cc:1099
 #, c-format
 msgid ""
 "Syntax error %s:%u: clear directive requires an option tree as argument"
@@ -615,7 +617,7 @@
 "ไวยากรณ์ผิดพลาด %s:%u: directive 'clear' "
 "ต้องมีอาร์กิวเมนต์เป็นลำดับชั้นตัวเลือก"
 
-#: apt-pkg/contrib/configuration.cc:1142
+#: apt-pkg/contrib/configuration.cc:1143
 #, c-format
 msgid "Syntax error %s:%u: Extra junk at end of file"
 msgstr "ไวยากรณ์ผิดพลาด %s:%u: มีขยะเกินหลังจบแฟ้ม"
@@ -667,8 +669,8 @@
 msgstr ""
 "จะละเลย '%s' ในไดเรกทอรี '%s' เนื่องจากส่วนขยายในชื่อแฟ้มไม่สามารถใช้การได้"
 
-#: apt-pkg/contrib/fileutl.cc:912 apt-pkg/contrib/gpgv.cc:407
-#: apt-pkg/deb/debsystem.cc:434
+#: apt-pkg/contrib/fileutl.cc:912 apt-pkg/contrib/gpgv.cc:265
+#: apt-pkg/deb/debsystem.cc:431
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "รอโพรเซส %s แต่ตัวโพรเซสไม่อยู่"
@@ -685,12 +687,12 @@
 msgstr "โพรเซสย่อย %s ได้รับสัญญาณ %u"
 
 #. we forward the statuscode, so don't generate a message on the fd in this case
-#: apt-pkg/contrib/fileutl.cc:930 apt-pkg/contrib/gpgv.cc:422
+#: apt-pkg/contrib/fileutl.cc:930 apt-pkg/contrib/gpgv.cc:280
 #, c-format
 msgid "Sub-process %s returned an error code (%u)"
 msgstr "โพรเซสย่อย %s คืนค่าข้อผิดพลาด (%u)"
 
-#: apt-pkg/contrib/fileutl.cc:932 apt-pkg/contrib/gpgv.cc:414
+#: apt-pkg/contrib/fileutl.cc:932 apt-pkg/contrib/gpgv.cc:272
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr "โพรเซสย่อย %s จบการทำงานกะทันหัน"
@@ -718,7 +720,7 @@
 msgid "Unexpected end of file"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:2186 apt-pkg/contrib/fileutl.cc:3174
+#: apt-pkg/contrib/fileutl.cc:2186 apt-pkg/contrib/fileutl.cc:3168
 msgid "Failed to create subprocess IPC"
 msgstr "สร้าง IPC ของโพรเซสย่อยไม่สำเร็จ"
 
@@ -760,49 +762,49 @@
 msgid "Problem syncing the file"
 msgstr "เกิดปัญหาขณะ sync แฟ้ม"
 
-#: apt-pkg/contrib/fileutl.cc:3128
+#: apt-pkg/contrib/fileutl.cc:3124
 #, c-format
 msgid "Unable to mkstemp %s"
 msgstr "ไม่สามารถ mkstemp %s"
 
-#: apt-pkg/contrib/fileutl.cc:3135
+#: apt-pkg/contrib/fileutl.cc:3131
 #, c-format
 msgid "Unable to write to %s"
 msgstr "ไม่สามารถเขียนลงแฟ้ม %s"
 
-#: apt-pkg/contrib/mmap.cc:77
+#: apt-pkg/contrib/mmap.cc:78
 msgid "Can't mmap an empty file"
 msgstr "ไม่สามารถ mmap แฟ้มเปล่า"
 
-#: apt-pkg/contrib/mmap.cc:86 apt-pkg/contrib/mmap.cc:106
-#: apt-pkg/contrib/mmap.cc:117 apt-pkg/contrib/mmap.cc:123
+#: apt-pkg/contrib/mmap.cc:87 apt-pkg/contrib/mmap.cc:107
+#: apt-pkg/contrib/mmap.cc:118 apt-pkg/contrib/mmap.cc:124
 #, c-format
 msgid "Couldn't make mmap of %llu bytes"
 msgstr "ไม่สามารถสร้าง mmap ขนาด %llu ไบต์"
 
-#: apt-pkg/contrib/mmap.cc:113
+#: apt-pkg/contrib/mmap.cc:114
 #, c-format
 msgid "Couldn't duplicate file descriptor %i"
 msgstr "ไม่สามารถทำซ้ำ file descriptor %i"
 
-#: apt-pkg/contrib/mmap.cc:149
+#: apt-pkg/contrib/mmap.cc:150
 msgid "Unable to close mmap"
 msgstr "ไม่สามารถปิด mmap"
 
-#: apt-pkg/contrib/mmap.cc:177 apt-pkg/contrib/mmap.cc:205
+#: apt-pkg/contrib/mmap.cc:178 apt-pkg/contrib/mmap.cc:206
 msgid "Unable to synchronize mmap"
 msgstr "ไม่สามารถปรับ mmap ให้ตรงกัน"
 
-#: apt-pkg/contrib/mmap.cc:287
+#: apt-pkg/contrib/mmap.cc:288
 #, c-format
 msgid "Couldn't make mmap of %lu bytes"
 msgstr "ไม่สามารถสร้าง mmap ขนาด %lu ไบต์"
 
-#: apt-pkg/contrib/mmap.cc:319
+#: apt-pkg/contrib/mmap.cc:320
 msgid "Failed to truncate file"
 msgstr "ไม่สามารถตัดท้ายแฟ้ม"
 
-#: apt-pkg/contrib/mmap.cc:338
+#: apt-pkg/contrib/mmap.cc:339
 #, c-format
 msgid ""
 "Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. "
@@ -811,63 +813,63 @@
 "MMap แบบพลวัตมีเนื้อที่ไม่พอ กรุณาเพิ่มขนาดของ APT::Cache-Start  "
 "ค่าปัจจุบัน: %lu (man 5 apt.conf)"
 
-#: apt-pkg/contrib/mmap.cc:456
+#: apt-pkg/contrib/mmap.cc:457
 #, c-format
 msgid ""
 "Unable to increase the size of the MMap as the limit of %lu bytes is already "
 "reached."
 msgstr "ไม่สามารถเพิ่มขนาดของ MMap เนื่องจากถึงขีดจำกัด %lu ไบต์แล้ว"
 
-#: apt-pkg/contrib/mmap.cc:459
+#: apt-pkg/contrib/mmap.cc:460
 msgid ""
 "Unable to increase size of the MMap as automatic growing is disabled by user."
 msgstr "ไม่สามารถเพิ่มขนาดของ MMap เนื่องจากผู้ใช้ปิดการขยายขนาดอัตโนมัติ"
 
-#: apt-pkg/contrib/progress.cc:155
+#: apt-pkg/contrib/progress.cc:149
 #, c-format
 msgid "%c%s... Error!"
 msgstr "%c%s... ผิดพลาด!"
 
-#: apt-pkg/contrib/progress.cc:157
+#: apt-pkg/contrib/progress.cc:151
 #, c-format
 msgid "%c%s... Done"
 msgstr "%c%s... เสร็จแล้ว"
 
-#: apt-pkg/contrib/progress.cc:188
+#: apt-pkg/contrib/progress.cc:182
 msgid "..."
 msgstr "..."
 
 #. Print the spinner
-#: apt-pkg/contrib/progress.cc:204
+#: apt-pkg/contrib/progress.cc:198
 #, c-format
 msgid "%c%s... %u%%"
 msgstr "%c%s... %u%%"
 
 #. TRANSLATOR: d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:435
+#: apt-pkg/contrib/strutl.cc:436
 #, c-format
 msgid "%lid %lih %limin %lis"
 msgstr "%liวัน %liชม. %liนาที %liวิ"
 
 #. TRANSLATOR: h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:440
+#: apt-pkg/contrib/strutl.cc:441
 #, c-format
 msgid "%lih %limin %lis"
 msgstr "%liชม. %liนาที %liวิ"
 
 #. TRANSLATOR: min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:445
+#: apt-pkg/contrib/strutl.cc:446
 #, c-format
 msgid "%limin %lis"
 msgstr "%liนาที %liวิ"
 
 #. TRANSLATOR: s means seconds
-#: apt-pkg/contrib/strutl.cc:450
+#: apt-pkg/contrib/strutl.cc:451
 #, c-format
 msgid "%lis"
 msgstr "%liวิ"
 
-#: apt-pkg/contrib/strutl.cc:1434
+#: apt-pkg/contrib/strutl.cc:1435
 #, c-format
 msgid "Selection %s not found"
 msgstr "ไม่พบรายการเลือก %s"
@@ -875,7 +877,7 @@
 #. TRANSLATOR: an identifier like Packages; Releasefile key indicating
 #. a file like main/binary-amd64/Packages; another identifier like Contents;
 #. filename and linenumber of the sources.list entry currently parsed
-#: apt-pkg/deb/debmetaindex.cc:314
+#: apt-pkg/deb/debmetaindex.cc:263
 #, c-format
 msgid "Target %s wants to acquire the same file (%s) as %s from source %s"
 msgstr ""
@@ -883,163 +885,164 @@
 #. TRANSLATOR: an identifier like Packages; Releasefile key indicating
 #. a file like main/binary-amd64/Packages; filename and linenumber of
 #. two sources.list entries
-#: apt-pkg/deb/debmetaindex.cc:335
+#: apt-pkg/deb/debmetaindex.cc:284
 #, c-format
 msgid "Target %s (%s) is configured multiple times in %s and %s"
 msgstr ""
 
-#: apt-pkg/deb/debmetaindex.cc:435
+#: apt-pkg/deb/debmetaindex.cc:384
 #, c-format
 msgid "Unable to parse Release file %s"
 msgstr "ไม่สามารถแจงแฟ้ม Release %s"
 
-#: apt-pkg/deb/debmetaindex.cc:444
+#: apt-pkg/deb/debmetaindex.cc:393
 #, c-format
 msgid "No sections in Release file %s"
 msgstr "ไม่มีหัวข้อย่อยในแฟ้ม Release %s"
 
-#: apt-pkg/deb/debmetaindex.cc:527
+#: apt-pkg/deb/debmetaindex.cc:476
 #, c-format
 msgid "No Hash entry in Release file %s"
 msgstr "ไม่มีรายการแฮชในแฟ้ม Release %s"
 
-#: apt-pkg/deb/debmetaindex.cc:529
+#: apt-pkg/deb/debmetaindex.cc:478
 #, c-format
 msgid ""
 "No Hash entry in Release file %s which is considered strong enough for "
 "security purposes"
 msgstr ""
 
-#: apt-pkg/deb/debmetaindex.cc:536 apt-pkg/deb/debmetaindex.cc:576
-#: apt-pkg/deb/debmetaindex.cc:622
+#: apt-pkg/deb/debmetaindex.cc:485 apt-pkg/deb/debmetaindex.cc:525
+#: apt-pkg/deb/debmetaindex.cc:578
 #, c-format
 msgid "Invalid '%s' entry in Release file %s"
 msgstr "รายการ '%s' ไม่ถูกต้องในแฟ้ม Release %s"
 
 #. TRANSLATOR: The first is an option name from sources.list manpage, the other two URI and Suite
-#: apt-pkg/deb/debmetaindex.cc:727 apt-pkg/deb/debmetaindex.cc:735
-#: apt-pkg/deb/debmetaindex.cc:743 apt-pkg/deb/debmetaindex.cc:751
-#: apt-pkg/deb/debmetaindex.cc:759 apt-pkg/deb/debmetaindex.cc:767
-#: apt-pkg/deb/debmetaindex.cc:1117 apt-pkg/deb/debmetaindex.cc:1119
-#: apt-pkg/deb/debmetaindex.cc:1124 apt-pkg/deb/debmetaindex.cc:1126
-#: apt-pkg/deb/debmetaindex.cc:1135
+#: apt-pkg/deb/debmetaindex.cc:693 apt-pkg/deb/debmetaindex.cc:701
+#: apt-pkg/deb/debmetaindex.cc:709 apt-pkg/deb/debmetaindex.cc:717
+#: apt-pkg/deb/debmetaindex.cc:725 apt-pkg/deb/debmetaindex.cc:733
+#: apt-pkg/deb/debmetaindex.cc:1105 apt-pkg/deb/debmetaindex.cc:1107
+#: apt-pkg/deb/debmetaindex.cc:1112 apt-pkg/deb/debmetaindex.cc:1114
+#: apt-pkg/deb/debmetaindex.cc:1123
 #, c-format
 msgid "Conflicting values set for option %s regarding source %s %s"
 msgstr ""
 
-#: apt-pkg/deb/debmetaindex.cc:776
+#: apt-pkg/deb/debmetaindex.cc:752
 #, c-format
 msgid "Invalid value set for option %s regarding source %s %s (%s)"
 msgstr ""
 
-#: apt-pkg/deb/debmetaindex.cc:782
+#: apt-pkg/deb/debmetaindex.cc:771
 #, c-format
 msgid "Conflicting values set for option %s regarding source %s %s: %s != %s"
 msgstr ""
 
-#: apt-pkg/deb/debrecords.cc:219 apt-pkg/tagfile.cc:217 apt-pkg/tagfile.cc:468
+#: apt-pkg/deb/debrecords.cc:220 apt-pkg/tagfile.cc:218 apt-pkg/tagfile.cc:465
 #, c-format
 msgid "Unable to parse package file %s (%d)"
 msgstr "ไม่สามารถแจงแฟ้มแพกเกจ %s (%d)"
 
-#: apt-pkg/deb/debsystem.cc:94
+#: apt-pkg/deb/debsystem.cc:95
 #, c-format
 msgid ""
 "Unable to acquire the dpkg frontend lock (%s), is another process using it?"
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:97
+#: apt-pkg/deb/debsystem.cc:98
 #, c-format
 msgid "Unable to acquire the dpkg frontend lock (%s), are you root?"
 msgstr ""
 
 #. TRANSLATORS: the %s contains the recovery command, usually
 #. dpkg --configure -a
-#: apt-pkg/deb/debsystem.cc:120
+#: apt-pkg/deb/debsystem.cc:121
 #, c-format
 msgid ""
 "dpkg was interrupted, you must manually run '%s' to correct the problem. "
 msgstr "dpkg ถูกขัดจังหวะ คุณต้องเรียก '%s' เองเพื่อแก้ปัญหา "
 
-#: apt-pkg/deb/debsystem.cc:135
+#: apt-pkg/deb/debsystem.cc:136
 #, c-format
 msgid ""
 "Unable to lock the administration directory (%s), is another process using "
 "it?"
 msgstr "ไม่สามารถล็อคไดเรกทอรีดูแลระบบ (%s) มีโพรเซสอื่นใช้งานอยู่หรือเปล่า?"
 
-#: apt-pkg/deb/debsystem.cc:138
+#: apt-pkg/deb/debsystem.cc:139
 #, c-format
 msgid "Unable to lock the administration directory (%s), are you root?"
 msgstr "ไม่สามารถล็อคไดเรกทอรีดูแลระบบ (%s) คุณเป็น root หรือเปล่า?"
 
-#: apt-pkg/deb/debsystem.cc:153
+#: apt-pkg/deb/debsystem.cc:154
 msgid "Not locked"
 msgstr "ไม่ได้ล็อคอยู่"
 
-#: apt-pkg/deb/dpkgpm.cc:1164
+#. we don't care for the difference
+#: apt-pkg/deb/dpkgpm.cc:144 apt-pkg/deb/dpkgpm.cc:146
 #, c-format
 msgid "Installing %s"
 msgstr "กำลังติดตั้ง %s"
 
-#: apt-pkg/deb/dpkgpm.cc:870 apt-pkg/deb/dpkgpm.cc:1168
+#: apt-pkg/deb/dpkgpm.cc:147 apt-pkg/deb/dpkgpm.cc:869
+#: apt-pkg/deb/dpkgpm.cc:1161
 #, c-format
 msgid "Configuring %s"
 msgstr "กำลังตั้งค่า %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1173 apt-pkg/deb/dpkgpm.cc:1174
+#: apt-pkg/deb/dpkgpm.cc:148 apt-pkg/deb/dpkgpm.cc:1167
 #, c-format
 msgid "Removing %s"
 msgstr "กำลังถอดถอน %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1178
+#: apt-pkg/deb/dpkgpm.cc:149
 #, c-format
 msgid "Completely removing %s"
 msgstr "กำลังถอดถอน %s อย่างสมบูรณ์"
 
-#: apt-pkg/deb/dpkgpm.cc:151
+#: apt-pkg/deb/dpkgpm.cc:150
 #, c-format
 msgid "Noting disappearance of %s"
 msgstr "กำลังจดบันทึกการหายไปของ %s"
 
-#: apt-pkg/deb/dpkgpm.cc:152
+#: apt-pkg/deb/dpkgpm.cc:151
 #, c-format
 msgid "Running post-installation trigger %s"
 msgstr "กำลังเรียกการสะกิด %s หลังการติดตั้ง"
 
-#: apt-pkg/deb/dpkgpm.cc:869 apt-pkg/deb/dpkgpm.cc:1169
+#: apt-pkg/deb/dpkgpm.cc:868 apt-pkg/deb/dpkgpm.cc:1162
 #, c-format
 msgid "Installed %s"
 msgstr "ติดตั้ง %s แล้ว"
 
 #. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:1018 apt-pkg/deb/dpkgpm.cc:1051
+#: apt-pkg/deb/dpkgpm.cc:1009 apt-pkg/deb/dpkgpm.cc:1042
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "ไม่มีไดเรกทอรี '%s'"
 
-#: apt-pkg/deb/dpkgpm.cc:1032 apt-pkg/deb/dpkgpm.cc:1056 apt-pkg/edsp.cc:1049
+#: apt-pkg/deb/dpkgpm.cc:1023 apt-pkg/deb/dpkgpm.cc:1047 apt-pkg/edsp.cc:1049
 #, c-format
 msgid "Could not open file '%s'"
 msgstr "ไม่สามารถเปิดแฟ้ม '%s'"
 
-#. we don't care for the difference
-#: apt-pkg/deb/dpkgpm.cc:145 apt-pkg/deb/dpkgpm.cc:147
+#: apt-pkg/deb/dpkgpm.cc:1154
 #, c-format
 msgid "Preparing %s"
 msgstr "กำลังเตรียม %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1163
+#: apt-pkg/deb/dpkgpm.cc:1155
 #, c-format
 msgid "Unpacking %s"
 msgstr "กำลังแตกแพกเกจ %s"
 
-#: apt-pkg/deb/dpkgpm.cc:148
+#: apt-pkg/deb/dpkgpm.cc:1160
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "กำลังเตรียมตั้งค่า %s"
 
-#: apt-pkg/deb/dpkgpm.cc:149
+#: apt-pkg/deb/dpkgpm.cc:1166
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "กำลังเตรียมถอดถอน %s"
@@ -1049,12 +1052,12 @@
 msgid "Removed %s"
 msgstr "ถอดถอน %s แล้ว"
 
-#: apt-pkg/deb/dpkgpm.cc:150
+#: apt-pkg/deb/dpkgpm.cc:1172
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "กำลังเตรียมถอดถอน %s อย่างสมบูรณ์"
 
-#: apt-pkg/deb/dpkgpm.cc:1179
+#: apt-pkg/deb/dpkgpm.cc:1173
 #, c-format
 msgid "Completely removed %s"
 msgstr "ถอดถอน %s อย่างสมบูรณ์แล้ว"
@@ -1068,20 +1071,20 @@
 msgid "Is /dev/pts mounted?"
 msgstr "ได้เมานท์ /dev/pts ไว้หรือไม่?"
 
-#: apt-pkg/deb/dpkgpm.cc:2177
+#: apt-pkg/deb/dpkgpm.cc:2161
 msgid "Operation was interrupted before it could finish"
 msgstr "ปฏิบัติการถูกขัดจังหวะก่อนที่จะสามารถทำงานเสร็จ"
 
-#: apt-pkg/deb/dpkgpm.cc:2262
+#: apt-pkg/deb/dpkgpm.cc:2246
 msgid "No apport report written because MaxReports is reached already"
 msgstr "ไม่มีการเขียนรายงาน apport เพราะถึงขีดจำกัด MaxReports แล้ว"
 
 #. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:2267
+#: apt-pkg/deb/dpkgpm.cc:2251
 msgid "dependency problems - leaving unconfigured"
 msgstr "มีปัญหาความขึ้นต่อกัน - จะทิ้งไว้โดยไม่ตั้งค่า"
 
-#: apt-pkg/deb/dpkgpm.cc:2269
+#: apt-pkg/deb/dpkgpm.cc:2253
 msgid ""
 "No apport report written because the error message indicates its a followup "
 "error from a previous failure."
@@ -1089,14 +1092,14 @@
 "ไม่มีการเขียนรายงาน apport "
 "เพราะข้อความข้อผิดพลาดระบุว่าเป็นสิ่งที่ตามมาจากข้อผิดพลาดก่อนหน้า"
 
-#: apt-pkg/deb/dpkgpm.cc:2275
+#: apt-pkg/deb/dpkgpm.cc:2259
 msgid ""
 "No apport report written because the error message indicates a disk full "
 "error"
 msgstr ""
 "ไม่มีการเขียนรายงาน apport เพราะข้อความข้อผิดพลาดระบุว่าเกิดจากดิสก์เต็ม"
 
-#: apt-pkg/deb/dpkgpm.cc:2282
+#: apt-pkg/deb/dpkgpm.cc:2266
 msgid ""
 "No apport report written because the error message indicates a out of memory "
 "error"
@@ -1104,7 +1107,7 @@
 "ไม่มีการเขียนรายงาน apport "
 "เพราะข้อความข้อผิดพลาดระบุว่าเกิดจากหน่วยความจำเต็ม"
 
-#: apt-pkg/deb/dpkgpm.cc:2289 apt-pkg/deb/dpkgpm.cc:2295
+#: apt-pkg/deb/dpkgpm.cc:2273 apt-pkg/deb/dpkgpm.cc:2279
 msgid ""
 "No apport report written because the error message indicates an issue on the "
 "local system"
@@ -1112,35 +1115,35 @@
 "ไม่มีการเขียนรายงาน apport "
 "เพราะข้อความข้อผิดพลาดระบุว่าเกิดจากปัญหาของระบบในเครื่อง"
 
-#: apt-pkg/deb/dpkgpm.cc:2317
+#: apt-pkg/deb/dpkgpm.cc:2301
 msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
 msgstr ""
 "ไม่มีการเขียนรายงาน apport "
 "เพราะข้อความข้อผิดพลาดระบุว่าเกิดจากปัญหาการอ่าน/เขียนของ dpkg"
 
-#: apt-pkg/depcache.cc:139 apt-pkg/depcache.cc:167
+#: apt-pkg/depcache.cc:140 apt-pkg/depcache.cc:168
 msgid "Building dependency tree"
 msgstr "กำลังสร้างโครงสร้างลำดับความสัมพันธ์"
 
-#: apt-pkg/depcache.cc:140
+#: apt-pkg/depcache.cc:141
 msgid "Candidate versions"
 msgstr "รุ่นแพกเกจที่มี"
 
-#: apt-pkg/depcache.cc:168
+#: apt-pkg/depcache.cc:169
 msgid "Dependency generation"
 msgstr "สร้างลำดับความสัมพันธ์"
 
-#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
+#: apt-pkg/depcache.cc:189 apt-pkg/depcache.cc:222 apt-pkg/depcache.cc:226
 msgid "Reading state information"
 msgstr "กำลังอ่านข้อมูลสถานะ"
 
-#: apt-pkg/depcache.cc:252
+#: apt-pkg/depcache.cc:253
 #, c-format
 msgid "Failed to open StateFile %s"
 msgstr "ไม่สามารถเปิดแฟ้มสถานะ %s"
 
-#: apt-pkg/depcache.cc:257
+#: apt-pkg/depcache.cc:258
 #, c-format
 msgid "Failed to write temporary StateFile %s"
 msgstr "ไม่สามารถเขียนแฟ้มสถานะชั่วคราว %s"
@@ -1182,33 +1185,33 @@
 msgid "External planner failed without a proper error message"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:226 apt-pkg/indexcopy.cc:765
+#: apt-pkg/indexcopy.cc:227 apt-pkg/indexcopy.cc:766
 #, c-format
 msgid "Wrote %i records.\n"
 msgstr "เขียนแล้ว %i ระเบียน\n"
 
-#: apt-pkg/indexcopy.cc:228 apt-pkg/indexcopy.cc:767
+#: apt-pkg/indexcopy.cc:229 apt-pkg/indexcopy.cc:768
 #, c-format
 msgid "Wrote %i records with %i missing files.\n"
 msgstr "เขียนแล้ว %i ระเบียน โดยมีแฟ้มขาดหาย %i แฟ้ม\n"
 
-#: apt-pkg/indexcopy.cc:231 apt-pkg/indexcopy.cc:770
+#: apt-pkg/indexcopy.cc:232 apt-pkg/indexcopy.cc:771
 #, c-format
 msgid "Wrote %i records with %i mismatched files\n"
 msgstr "เขียนแล้ว %i ระเบียน โดยมีแฟ้มผิดขนาด %i แฟ้ม\n"
 
-#: apt-pkg/indexcopy.cc:234 apt-pkg/indexcopy.cc:773
+#: apt-pkg/indexcopy.cc:235 apt-pkg/indexcopy.cc:774
 #, c-format
 msgid "Wrote %i records with %i missing files and %i mismatched files\n"
 msgstr ""
 "เขียนแล้ว %i ระเบียน โดยมีแฟ้มขาดหาย %i แฟ้ม และแฟ้มผิดขนาด %i แฟ้ม\n"
 
-#: apt-pkg/indexcopy.cc:510
+#: apt-pkg/indexcopy.cc:511
 #, c-format
 msgid "Can't find authentication record for: %s"
 msgstr "ไม่พบระเบียนยืนยันความแท้สำหรับ: %s"
 
-#: apt-pkg/indexcopy.cc:516
+#: apt-pkg/indexcopy.cc:517
 #, c-format
 msgid "Hash mismatch for: %s"
 msgstr "แฮชไม่ตรงกันสำหรับ: %s"
@@ -1232,7 +1235,7 @@
 msgid "Running dpkg"
 msgstr "กำลังเรียก dpkg"
 
-#: apt-pkg/packagemanager.cc:330 apt-pkg/packagemanager.cc:1018
+#: apt-pkg/packagemanager.cc:331 apt-pkg/packagemanager.cc:1019
 #, c-format
 msgid ""
 "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
@@ -1241,12 +1244,12 @@
 "ไม่สามารถตั้งค่า '%s' แบบทันทีได้ กรุณาอ่านรายละเอียดเพิ่มเติมจาก man 5 "
 "apt.conf ที่หัวข้อ APT::Immediate-Configure (%d)"
 
-#: apt-pkg/packagemanager.cc:589 apt-pkg/packagemanager.cc:627
+#: apt-pkg/packagemanager.cc:590 apt-pkg/packagemanager.cc:628
 #, c-format
 msgid "Could not configure '%s'. "
 msgstr "ไม่สามารถตั้งค่า '%s' "
 
-#: apt-pkg/packagemanager.cc:677
+#: apt-pkg/packagemanager.cc:678
 #, c-format
 msgid ""
 "This installation run will require temporarily removing the essential "
@@ -1258,136 +1261,136 @@
 "ซึ่งแพกเกจดังกล่าวเป็นแพกเกจที่จำเป็นสำหรับระบบ การลบดังกล่าวมักเป็นอันตราย "
 "แต่ถ้าคุณต้องการทำเช่นนั้นจริงๆ ก็ให้เปิดตัวเลือก APT::Force-LoopBreak"
 
-#: apt-pkg/pkgcache.cc:164
+#: apt-pkg/pkgcache.cc:165
 msgid "Empty package cache"
 msgstr "แคชของแพกเกจว่างเปล่า"
 
-#: apt-pkg/pkgcache.cc:170 apt-pkg/pkgcache.cc:178
+#: apt-pkg/pkgcache.cc:171 apt-pkg/pkgcache.cc:179
 msgid "The package cache file is corrupted"
 msgstr "แฟ้มแคชของแพกเกจเสียหาย"
 
-#: apt-pkg/pkgcache.cc:175
+#: apt-pkg/pkgcache.cc:176
 msgid "The package cache file is an incompatible version"
 msgstr "แฟ้มแคชของแพกเกจเป็นคนละรุ่นกัน"
 
-#: apt-pkg/pkgcache.cc:182
+#: apt-pkg/pkgcache.cc:183
 #, c-format
 msgid "This APT does not support the versioning system '%s'"
 msgstr "APT รุ่นนี้ไม่รองรับระบบนับรุ่นแบบ '%s'"
 
-#: apt-pkg/pkgcache.cc:194
+#: apt-pkg/pkgcache.cc:195
 #, c-format
 msgid "The package cache was built for different architectures: %s vs %s"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:201
+#: apt-pkg/pkgcache.cc:202
 msgid "The package cache file is corrupted, it has the wrong hash"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:398
+#: apt-pkg/pkgcache.cc:351
 msgid "Depends"
 msgstr "ต้องใช้"
 
-#: apt-pkg/pkgcache.cc:398
+#: apt-pkg/pkgcache.cc:351
 msgid "PreDepends"
 msgstr "ต้องใช้ขณะติดตั้ง"
 
-#: apt-pkg/pkgcache.cc:398
+#: apt-pkg/pkgcache.cc:351
 msgid "Suggests"
 msgstr "แนะนำ"
 
-#: apt-pkg/pkgcache.cc:399
+#: apt-pkg/pkgcache.cc:352
 msgid "Conflicts"
 msgstr "ขัดแย้งกับ"
 
-#: apt-pkg/pkgcache.cc:399
+#: apt-pkg/pkgcache.cc:352
 msgid "Recommends"
 msgstr "ควรใช้ร่วมกับ"
 
-#: apt-pkg/pkgcache.cc:399
+#: apt-pkg/pkgcache.cc:352
 msgid "Replaces"
 msgstr "แทนที่"
 
-#: apt-pkg/pkgcache.cc:400
+#: apt-pkg/pkgcache.cc:353
 msgid "Breaks"
 msgstr "ทำให้พัง"
 
-#: apt-pkg/pkgcache.cc:400
+#: apt-pkg/pkgcache.cc:353
 msgid "Enhances"
 msgstr "เพิ่มความสามารถ"
 
-#: apt-pkg/pkgcache.cc:400
+#: apt-pkg/pkgcache.cc:353
 msgid "Obsoletes"
 msgstr "ใช้แทน"
 
-#: apt-pkg/pkgcache.cc:411
+#: apt-pkg/pkgcache.cc:364
 msgid "important"
 msgstr "สำคัญ"
 
-#: apt-pkg/pkgcache.cc:411
+#: apt-pkg/pkgcache.cc:364
 msgid "required"
 msgstr "จำเป็น"
 
-#: apt-pkg/pkgcache.cc:411
+#: apt-pkg/pkgcache.cc:364
 msgid "standard"
 msgstr "มาตรฐาน"
 
-#: apt-pkg/pkgcache.cc:412
+#: apt-pkg/pkgcache.cc:365
 msgid "extra"
 msgstr "ส่วนเสริม"
 
-#: apt-pkg/pkgcache.cc:412
+#: apt-pkg/pkgcache.cc:365
 msgid "optional"
 msgstr "ตัวเลือก"
 
-#: apt-pkg/pkgcachegen.cc:121
+#: apt-pkg/pkgcachegen.cc:122
 msgid "Cache has an incompatible versioning system"
 msgstr "แคชมีระบบนับรุ่นที่ไม่ตรงกัน"
 
 #. TRANSLATOR: The first placeholder is a package name,
 #. the other two should be copied verbatim as they include debug info
-#: apt-pkg/pkgcachegen.cc:277 apt-pkg/pkgcachegen.cc:339
-#: apt-pkg/pkgcachegen.cc:418 apt-pkg/pkgcachegen.cc:422
-#: apt-pkg/pkgcachegen.cc:439 apt-pkg/pkgcachegen.cc:447
-#: apt-pkg/pkgcachegen.cc:451 apt-pkg/pkgcachegen.cc:455
-#: apt-pkg/pkgcachegen.cc:476 apt-pkg/pkgcachegen.cc:481
-#: apt-pkg/pkgcachegen.cc:525 apt-pkg/pkgcachegen.cc:539
+#: apt-pkg/pkgcachegen.cc:278 apt-pkg/pkgcachegen.cc:340
+#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:423
+#: apt-pkg/pkgcachegen.cc:440 apt-pkg/pkgcachegen.cc:448
+#: apt-pkg/pkgcachegen.cc:452 apt-pkg/pkgcachegen.cc:456
+#: apt-pkg/pkgcachegen.cc:477 apt-pkg/pkgcachegen.cc:482
+#: apt-pkg/pkgcachegen.cc:526 apt-pkg/pkgcachegen.cc:540
 #, c-format
 msgid "Error occurred while processing %s (%s%d)"
 msgstr "เกิดข้อผิดพลาดขณะประมวลผล %s (%s%d)"
 
-#: apt-pkg/pkgcachegen.cc:297
+#: apt-pkg/pkgcachegen.cc:298
 msgid "Wow, you exceeded the number of package names this APT is capable of."
 msgstr "โอ้ คุณมาถึงขีดจำกัดจำนวนชื่อแพกเกจที่ APT สามารถรองรับได้แล้ว"
 
-#: apt-pkg/pkgcachegen.cc:300
+#: apt-pkg/pkgcachegen.cc:301
 msgid "Wow, you exceeded the number of versions this APT is capable of."
 msgstr "โอ้ คุณมาถึงขีดจำกัดจำนวนรุ่นแพกเกจที่ APT สามารถรองรับได้แล้ว"
 
-#: apt-pkg/pkgcachegen.cc:303
+#: apt-pkg/pkgcachegen.cc:304
 msgid "Wow, you exceeded the number of descriptions this APT is capable of."
 msgstr "โอ้ คุณมาถึงขีดจำกัดจำนวนคำบรรยายแพกเกจที่ APT สามารถรองรับได้แล้ว"
 
-#: apt-pkg/pkgcachegen.cc:306
+#: apt-pkg/pkgcachegen.cc:307
 msgid "Wow, you exceeded the number of dependencies this APT is capable of."
 msgstr ""
 "โอ้ คุณมาถึงขีดจำกัดจำนวนความสัมพันธ์ระหว่างแพกเกจที่ APT สามารถรองรับได้แล้ว"
 
-#: apt-pkg/pkgcachegen.cc:1546 apt-pkg/pkgcachegen.cc:1683
-#: apt-pkg/pkgcachegen.cc:1712 apt-pkg/pkgcachegen.cc:1830
+#: apt-pkg/pkgcachegen.cc:1547 apt-pkg/pkgcachegen.cc:1684
+#: apt-pkg/pkgcachegen.cc:1713 apt-pkg/pkgcachegen.cc:1831
 msgid "Reading package lists"
 msgstr "กำลังอ่านรายชื่อแพกเกจ"
 
-#: apt-pkg/pkgcachegen.cc:1617 apt-pkg/pkgcachegen.cc:1624
+#: apt-pkg/pkgcachegen.cc:1618 apt-pkg/pkgcachegen.cc:1625
 msgid "IO Error saving source cache"
 msgstr "เกิดข้อผิดพลาด IO ขณะบันทึกแคชของซอร์ส"
 
-#: apt-pkg/pkgrecords.cc:36
+#: apt-pkg/pkgrecords.cc:37
 #, c-format
 msgid "Index file type '%s' is not supported"
 msgstr "ไม่รองรับแฟ้มดัชนีชนิด '%s'"
 
-#: apt-pkg/policy.cc:80
+#: apt-pkg/policy.cc:81
 #, c-format
 msgid ""
 "The value '%s' is invalid for APT::Default-Release as such a release is not "
@@ -1396,74 +1399,74 @@
 "ค่า '%s' ไม่สามารถใช้กับ APT::Default-Release ได้ "
 "เนื่องจากรุ่นดังกล่าวไม่มีในแหล่ง"
 
-#: apt-pkg/policy.cc:376
+#: apt-pkg/policy.cc:377
 #, c-format
 msgid "Invalid record in the preferences file %s, no Package header"
 msgstr "ระเบียนผิดรูปแบบในแฟ้มค่าปรับแต่ง %s: ไม่มีข้อมูลส่วนหัว 'Package'"
 
-#: apt-pkg/policy.cc:398
+#: apt-pkg/policy.cc:399
 #, c-format
 msgid "Did not understand pin type %s"
 msgstr "ไม่เข้าใจชนิดการตรึง %s"
 
-#: apt-pkg/policy.cc:410
+#: apt-pkg/policy.cc:411
 #, c-format
 msgid ""
 "%s: The special 'Pin-Priority: %s' can only be used for 'Package: *' records"
 msgstr ""
 
-#: apt-pkg/policy.cc:418
+#: apt-pkg/policy.cc:419
 #, c-format
 msgid "%s: Value %s is outside the range of valid pin priorities (%d to %d)"
 msgstr ""
 
-#: apt-pkg/policy.cc:425
+#: apt-pkg/policy.cc:426
 msgid "No priority (or zero) specified for pin"
 msgstr "ไม่ได้ระบุลำดับความสำคัญ (หรือค่าศูนย์) สำหรับการตรึง"
 
 #. TRANSLATOR: %u is a line number, the first %s is a filename of a file with the extension "second %s" and the third %s is a unique identifier for bugreports
-#: apt-pkg/sourcelist.cc:157 apt-pkg/sourcelist.cc:160
-#: apt-pkg/sourcelist.cc:165 apt-pkg/sourcelist.cc:172
-#: apt-pkg/sourcelist.cc:179 apt-pkg/sourcelist.cc:218
-#: apt-pkg/sourcelist.cc:221 apt-pkg/sourcelist.cc:232
-#: apt-pkg/sourcelist.cc:238 apt-pkg/sourcelist.cc:241
-#: apt-pkg/sourcelist.cc:254 apt-pkg/sourcelist.cc:256
-#: apt-pkg/sourcelist.cc:259 apt-pkg/sourcelist.cc:265
-#: apt-pkg/sourcelist.cc:272
+#: apt-pkg/sourcelist.cc:158 apt-pkg/sourcelist.cc:161
+#: apt-pkg/sourcelist.cc:166 apt-pkg/sourcelist.cc:173
+#: apt-pkg/sourcelist.cc:180 apt-pkg/sourcelist.cc:219
+#: apt-pkg/sourcelist.cc:222 apt-pkg/sourcelist.cc:233
+#: apt-pkg/sourcelist.cc:239 apt-pkg/sourcelist.cc:242
+#: apt-pkg/sourcelist.cc:255 apt-pkg/sourcelist.cc:257
+#: apt-pkg/sourcelist.cc:260 apt-pkg/sourcelist.cc:266
+#: apt-pkg/sourcelist.cc:273
 #, c-format
 msgid "Malformed entry %u in %s file %s (%s)"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:408
+#: apt-pkg/sourcelist.cc:409
 #, c-format
 msgid "Malformed line %u in source list %s (type)"
 msgstr "บรรทัด %u ในแฟ้มรายชื่อแหล่งแพกเกจ %s ผิดรูปแบบ (ชนิด)"
 
-#: apt-pkg/sourcelist.cc:412
+#: apt-pkg/sourcelist.cc:413
 #, c-format
 msgid "Type '%s' is not known on line %u in source list %s"
 msgstr "ไม่รู้จักชนิด '%s' ที่บรรทัด %u ในแฟ้มรายชื่อแหล่งแพกเกจ %s"
 
-#: apt-pkg/sourcelist.cc:431 apt-pkg/sourcelist.cc:440
+#: apt-pkg/sourcelist.cc:432 apt-pkg/sourcelist.cc:441
 #, c-format
 msgid "Malformed stanza %u in source list %s (type)"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:447
+#: apt-pkg/sourcelist.cc:448
 #, c-format
 msgid "Type '%s' is not known on stanza %u in source list %s"
 msgstr "ไม่รู้จักชนิด '%s' ที่วรรคที่ %u ในแฟ้มรายชื่อแหล่งแพกเกจ %s"
 
-#: apt-pkg/sourcelist.cc:620 apt-pkg/sourcelist.cc:637
+#: apt-pkg/sourcelist.cc:621 apt-pkg/sourcelist.cc:638
 #, c-format
 msgid "Unsupported file %s given on commandline"
 msgstr ""
 
-#: apt-pkg/srcrecords.cc:55
+#: apt-pkg/srcrecords.cc:56
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr "คุณต้องเพิ่ม URI ชนิด 'source' ใน sources.list ของคุณด้วย"
 
-#: apt-pkg/tagfile.cc:764
+#: apt-pkg/tagfile.cc:761
 #, c-format
 msgid "Cannot convert %s to integer: out of range"
 msgstr ""
diff -Nru language-pack-th-18.04+20200123/data/th/LC_MESSAGES/Linux-PAM.po language-pack-th-18.04+20200702/data/th/LC_MESSAGES/Linux-PAM.po
--- language-pack-th-18.04+20200123/data/th/LC_MESSAGES/Linux-PAM.po	2020-01-23 16:55:58.000000000 +0000
+++ language-pack-th-18.04+20200702/data/th/LC_MESSAGES/Linux-PAM.po	2020-07-08 13:58:10.000000000 +0000
@@ -15,8 +15,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2020-01-23 11:05+0000\n"
-"X-Generator: Launchpad (build b8d1327fd820d6bf500589d6da587d5037c7d88e)\n"
+"X-Launchpad-Export-Date: 2020-07-02 10:55+0000\n"
+"X-Generator: Launchpad (build 1cbd0aa39df153c901321817f9b57cf3f232b507)\n"
 
 #: libpam_misc/misc_conv.c:33
 msgid "...Time is running out...\n"
diff -Nru language-pack-th-18.04+20200123/data/th/LC_MESSAGES/luksformat.po language-pack-th-18.04+20200702/data/th/LC_MESSAGES/luksformat.po
--- language-pack-th-18.04+20200123/data/th/LC_MESSAGES/luksformat.po	2020-01-23 16:55:57.000000000 +0000
+++ language-pack-th-18.04+20200702/data/th/LC_MESSAGES/luksformat.po	2020-07-08 13:58:09.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2020-01-23 11:15+0000\n"
-"X-Generator: Launchpad (build b8d1327fd820d6bf500589d6da587d5037c7d88e)\n"
+"X-Launchpad-Export-Date: 2020-07-02 11:04+0000\n"
+"X-Generator: Launchpad (build 1cbd0aa39df153c901321817f9b57cf3f232b507)\n"
 
 #: ../luksformat:33
 msgid "This program needs to be started as root\n"
diff -Nru language-pack-th-18.04+20200123/data/th/LC_MESSAGES/man-db.po language-pack-th-18.04+20200702/data/th/LC_MESSAGES/man-db.po
--- language-pack-th-18.04+20200123/data/th/LC_MESSAGES/man-db.po	2020-01-23 16:55:57.000000000 +0000
+++ language-pack-th-18.04+20200702/data/th/LC_MESSAGES/man-db.po	2020-07-08 13:58:09.000000000 +0000
@@ -15,8 +15,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2020-01-23 11:08+0000\n"
-"X-Generator: Launchpad (build b8d1327fd820d6bf500589d6da587d5037c7d88e)\n"
+"X-Launchpad-Export-Date: 2020-07-02 10:58+0000\n"
+"X-Generator: Launchpad (build 1cbd0aa39df153c901321817f9b57cf3f232b507)\n"
 
 #: lib/security.c:79
 #, c-format
@@ -28,7 +28,7 @@
 msgid "the setuid man user \"%s\" does not exist"
 msgstr ""
 
-#: src/check_mandirs.c:390 src/man.c:1689
+#: src/check_mandirs.c:390 src/man.c:1716
 #, c-format
 msgid "can't chown %s"
 msgstr ""
@@ -201,7 +201,7 @@
 msgid "warning: cannot create catdir %s"
 msgstr ""
 
-#: src/check_mandirs.c:467 src/man.c:1701 src/mandb.c:232
+#: src/check_mandirs.c:467 src/man.c:1728 src/mandb.c:232
 #, c-format
 msgid "can't chmod %s"
 msgstr ""
@@ -275,7 +275,7 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/lexgrog.l:856 src/man.c:2270 src/man.c:2354 src/man.c:2452
+#: src/lexgrog.l:856 src/man.c:2297 src/man.c:2382 src/man.c:2480
 #: src/man-recode.c:176 src/man-recode.c:201 src/manconv_main.c:158
 #: src/straycats.c:204 src/ult_src.c:320 src/ult_src.c:333 src/zsoelim.l:517
 #, c-format
@@ -533,74 +533,74 @@
 msgid "ignoring unknown preprocessor `%c'"
 msgstr ""
 
-#: src/man.c:1712 src/man-recode.c:243 src/mandb.c:223
+#: src/man.c:1739 src/man-recode.c:243 src/mandb.c:223
 #, c-format
 msgid "can't rename %s to %s"
 msgstr ""
 
-#: src/man.c:1729
+#: src/man.c:1756
 #, c-format
 msgid "can't set times on %s"
 msgstr ""
 
-#: src/man.c:1738 src/man.c:1775
+#: src/man.c:1765 src/man.c:1802
 #, c-format
 msgid "can't unlink %s"
 msgstr ""
 
-#: src/man.c:1805
+#: src/man.c:1832
 #, c-format
 msgid "can't create temporary cat for %s"
 msgstr ""
 
-#: src/man.c:1915
+#: src/man.c:1942
 #, c-format
 msgid "can't create temporary directory"
 msgstr ""
 
-#: src/man.c:1926 src/man-recode.c:209
+#: src/man.c:1953 src/man-recode.c:209
 #, c-format
 msgid "can't open temporary file %s"
 msgstr ""
 
-#: src/man.c:1956 src/man.c:1985
+#: src/man.c:1983 src/man.c:2012
 #, c-format
 msgid "can't remove directory %s"
 msgstr ""
 
-#: src/man.c:2114
+#: src/man.c:2141
 #, c-format
 msgid "--Man-- next: %s [ view (return) | skip (Ctrl-D) | quit (Ctrl-C) ]\n"
 msgstr ""
 
-#: src/man.c:2397
+#: src/man.c:2425
 #, c-format
 msgid ""
 "\n"
 "cannot write to %s in catman mode"
 msgstr ""
 
-#: src/man.c:2477
+#: src/man.c:2505
 #, c-format
 msgid "Can't convert %s to cat name"
 msgstr ""
 
-#: src/man.c:3202
+#: src/man.c:3230
 #, c-format
 msgid "%s: relying on whatis refs is deprecated\n"
 msgstr ""
 
-#: src/man.c:3345 src/man.c:4203
+#: src/man.c:3373 src/man.c:4231
 #, c-format
 msgid "mandb command failed with exit status %d"
 msgstr ""
 
-#: src/man.c:3547
+#: src/man.c:3575
 #, c-format
 msgid "internal error: candidate type %d out of range"
 msgstr ""
 
-#: src/man.c:4146
+#: src/man.c:4174
 msgid " Manual page "
 msgstr ""
 
diff -Nru language-pack-th-18.04+20200123/data/th/LC_MESSAGES/MoinMoin.po language-pack-th-18.04+20200702/data/th/LC_MESSAGES/MoinMoin.po
--- language-pack-th-18.04+20200123/data/th/LC_MESSAGES/MoinMoin.po	2020-01-23 16:55:56.000000000 +0000
+++ language-pack-th-18.04+20200702/data/th/LC_MESSAGES/MoinMoin.po	2020-07-08 13:58:08.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2020-01-23 11:09+0000\n"
-"X-Generator: Launchpad (build b8d1327fd820d6bf500589d6da587d5037c7d88e)\n"
+"X-Launchpad-Export-Date: 2020-07-02 10:59+0000\n"
+"X-Generator: Launchpad (build 1cbd0aa39df153c901321817f9b57cf3f232b507)\n"
 "X-Direction: ltr\n"
 "X-Language: ไทย\n"
 "X-Language-in-English: Thai\n"
diff -Nru language-pack-th-18.04+20200123/data/th/LC_MESSAGES/NetworkManager.po language-pack-th-18.04+20200702/data/th/LC_MESSAGES/NetworkManager.po
--- language-pack-th-18.04+20200123/data/th/LC_MESSAGES/NetworkManager.po	2020-01-23 16:55:57.000000000 +0000
+++ language-pack-th-18.04+20200702/data/th/LC_MESSAGES/NetworkManager.po	2020-07-08 13:58:09.000000000 +0000
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-12-06 21:14+0000\n"
+"POT-Creation-Date: 2020-04-28 23:42+0000\n"
 "PO-Revision-Date: 2012-03-29 21:38+0000\n"
 "Last-Translator: Theppitak Karoonboonyanan <thep@linux.thai.net>\n"
 "Language-Team: Thai <l10n@opentle.org>\n"
@@ -17,11 +17,11 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2020-01-23 11:24+0000\n"
-"X-Generator: Launchpad (build b8d1327fd820d6bf500589d6da587d5037c7d88e)\n"
+"X-Launchpad-Export-Date: 2020-07-02 11:13+0000\n"
+"X-Generator: Launchpad (build 1cbd0aa39df153c901321817f9b57cf3f232b507)\n"
 "Language: th\n"
 
-#: ../clients/cli/agent.c:23
+#: ../clients/cli/agent.c:22
 #, c-format
 msgid ""
 "Usage: nmcli agent { COMMAND | help }\n"
@@ -30,7 +30,7 @@
 "\n"
 msgstr ""
 
-#: ../clients/cli/agent.c:31
+#: ../clients/cli/agent.c:30
 #, c-format
 msgid ""
 "Usage: nmcli agent secret { help }\n"
@@ -42,7 +42,7 @@
 "\n"
 msgstr ""
 
-#: ../clients/cli/agent.c:41
+#: ../clients/cli/agent.c:40
 #, c-format
 msgid ""
 "Usage: nmcli agent polkit { help }\n"
@@ -54,7 +54,7 @@
 "\n"
 msgstr ""
 
-#: ../clients/cli/agent.c:51
+#: ../clients/cli/agent.c:50
 #, c-format
 msgid ""
 "Usage: nmcli agent all { help }\n"
@@ -63,73 +63,73 @@
 "\n"
 msgstr ""
 
-#: ../clients/cli/agent.c:143
+#: ../clients/cli/agent.c:142
 #, c-format
 msgid "nmcli successfully registered as a NetworkManager's secret agent.\n"
 msgstr ""
 
-#: ../clients/cli/agent.c:145
+#: ../clients/cli/agent.c:144
 #, c-format
 msgid "Error: secret agent initialization failed"
 msgstr ""
 
-#: ../clients/cli/agent.c:164
+#: ../clients/cli/agent.c:176
 #, c-format
 msgid "Error: polkit agent initialization failed: %s"
 msgstr ""
 
-#: ../clients/cli/agent.c:172
+#: ../clients/cli/agent.c:153
 #, c-format
 msgid "nmcli successfully registered as a polkit agent.\n"
 msgstr ""
 
-#: ../clients/cli/common.c:344 ../clients/cli/common.c:345
-#: ../clients/cli/common.c:376 ../clients/cli/common.c:377
-#: ../clients/cli/connections.c:1495
+#: ../clients/cli/common.c:347 ../clients/cli/common.c:348
+#: ../clients/cli/common.c:379 ../clients/cli/common.c:380
+#: ../clients/cli/connections.c:1511
 msgid "GROUP"
 msgstr ""
 
-#: ../clients/cli/common.c:628
+#: ../clients/cli/common.c:631
 #, c-format
 msgid "Error: openconnect failed: %s\n"
 msgstr ""
 
-#: ../clients/cli/common.c:635
+#: ../clients/cli/common.c:638
 #, c-format
 msgid "Error: openconnect failed with status %d\n"
 msgstr ""
 
-#: ../clients/cli/common.c:637
+#: ../clients/cli/common.c:640
 #, c-format
 msgid "Error: openconnect failed with signal %d\n"
 msgstr ""
 
-#: ../clients/cli/common.c:725
+#: ../clients/cli/common.c:728
 #, c-format
 msgid ""
 "Warning: password for '%s' not given in 'passwd-file' and nmcli cannot ask "
 "without '--ask' option.\n"
 msgstr ""
 
-#: ../clients/cli/common.c:1227
+#: ../clients/cli/common.c:1244
 #, c-format
 msgid "Error: Could not create NMClient object: %s."
 msgstr ""
 
-#: ../clients/cli/common.c:1246
+#: ../clients/cli/common.c:1265
 msgid "Error: NetworkManager is not running."
 msgstr ""
 
-#: ../clients/cli/common.c:1339
+#: ../clients/cli/common.c:1364
 #, c-format
 msgid "Error: argument '%s' not understood. Try passing --help instead."
 msgstr ""
 
-#: ../clients/cli/common.c:1347
+#: ../clients/cli/common.c:1372
 msgid "Error: missing argument. Try passing --help."
 msgstr ""
 
-#: ../clients/cli/common.c:1414
+#: ../clients/cli/common.c:1439
 msgid "access denied"
 msgstr ""
 
@@ -163,7 +163,7 @@
 msgid "Connection(s) (name, UUID, path or apath)"
 msgstr ""
 
-#: ../clients/cli/connections.c:904
+#: ../clients/cli/connections.c:907
 #, c-format
 msgid ""
 "Usage: nmcli connection { COMMAND | help }\n"
@@ -204,7 +204,7 @@
 "\n"
 msgstr ""
 
-#: ../clients/cli/connections.c:926
+#: ../clients/cli/connections.c:929
 #, c-format
 msgid ""
 "Usage: nmcli connection show { ARGUMENTS | help }\n"
@@ -231,7 +231,7 @@
 "well.\n"
 msgstr ""
 
-#: ../clients/cli/connections.c:947
+#: ../clients/cli/connections.c:950
 #, c-format
 msgid ""
 "Usage: nmcli connection up { ARGUMENTS | help }\n"
@@ -256,7 +256,7 @@
 "\n"
 msgstr ""
 
-#: ../clients/cli/connections.c:968
+#: ../clients/cli/connections.c:971
 #, c-format
 msgid ""
 "Usage: nmcli connection down { ARGUMENTS | help }\n"
@@ -447,7 +447,7 @@
 "\n"
 msgstr ""
 
-#: ../clients/cli/connections.c:1127
+#: ../clients/cli/connections.c:1135
 #, c-format
 msgid ""
 "Usage: nmcli connection clone { ARGUMENTS | help }\n"
@@ -461,7 +461,7 @@
 "\n"
 msgstr ""
 
-#: ../clients/cli/connections.c:1139
+#: ../clients/cli/connections.c:1147
 #, c-format
 msgid ""
 "Usage: nmcli connection edit { ARGUMENTS | help }\n"
@@ -477,7 +477,7 @@
 "\n"
 msgstr ""
 
-#: ../clients/cli/connections.c:1154
+#: ../clients/cli/connections.c:1162
 #, c-format
 msgid ""
 "Usage: nmcli connection delete { ARGUMENTS | help }\n"
@@ -489,7 +489,7 @@
 "\n"
 msgstr ""
 
-#: ../clients/cli/connections.c:1165
+#: ../clients/cli/connections.c:1173
 #, c-format
 msgid ""
 "Usage: nmcli connection monitor { ARGUMENTS | help }\n"
@@ -502,7 +502,7 @@
 "\n"
 msgstr ""
 
-#: ../clients/cli/connections.c:1177
+#: ../clients/cli/connections.c:1185
 #, c-format
 msgid ""
 "Usage: nmcli connection reload { help }\n"
@@ -511,7 +511,7 @@
 "\n"
 msgstr ""
 
-#: ../clients/cli/connections.c:1185
+#: ../clients/cli/connections.c:1193
 #, c-format
 msgid ""
 "Usage: nmcli connection load { ARGUMENTS | help }\n"
@@ -525,7 +525,7 @@
 "\n"
 msgstr ""
 
-#: ../clients/cli/connections.c:1197
+#: ../clients/cli/connections.c:1205
 #, c-format
 msgid ""
 "Usage: nmcli connection import { ARGUMENTS | help }\n"
@@ -540,7 +540,7 @@
 "\n"
 msgstr ""
 
-#: ../clients/cli/connections.c:1210
+#: ../clients/cli/connections.c:1218
 #, c-format
 msgid ""
 "Usage: nmcli connection export { ARGUMENTS | help }\n"
@@ -552,194 +552,194 @@
 "\n"
 msgstr ""
 
-#: ../clients/cli/connections.c:67
+#: ../clients/cli/connections.c:68
 msgid "activating"
 msgstr ""
 
-#: ../clients/cli/connections.c:68
+#: ../clients/cli/connections.c:69
 msgid "activated"
 msgstr ""
 
-#: ../clients/cli/connections.c:69 ../clients/common/nm-client-utils.c:261
+#: ../clients/cli/connections.c:70 ../clients/common/nm-client-utils.c:261
 msgid "deactivating"
 msgstr ""
 
-#: ../clients/cli/connections.c:70
+#: ../clients/cli/connections.c:71
 msgid "deactivated"
 msgstr ""
 
-#: ../clients/cli/common.c:1468 ../clients/cli/connections.c:66
-#: ../clients/cli/connections.c:75 ../clients/cli/devices.c:427
-#: ../clients/cli/devices.c:519 ../clients/cli/devices.c:526
-#: ../clients/cli/general.c:26 ../clients/cli/general.c:116
-#: ../clients/cli/general.c:121 ../clients/common/nm-client-utils.c:250
+#: ../clients/cli/common.c:1493 ../clients/cli/connections.c:67
+#: ../clients/cli/connections.c:77 ../clients/cli/devices.c:433
+#: ../clients/cli/devices.c:525 ../clients/cli/devices.c:532
+#: ../clients/cli/general.c:31 ../clients/cli/general.c:86
+#: ../clients/cli/general.c:91 ../clients/common/nm-client-utils.c:250
 #: ../clients/common/nm-client-utils.c:263
 #: ../clients/common/nm-client-utils.c:267
 #: ../clients/common/nm-client-utils.c:272
-#: ../clients/common/nm-meta-setting-desc.c:1724
-#: ../clients/common/nm-meta-setting-desc.c:1755
-#: ../clients/common/nm-meta-setting-desc.c:2687
-#: ../clients/common/nm-meta-setting-desc.c:2745
+#: ../clients/common/nm-meta-setting-desc.c:1713
+#: ../clients/common/nm-meta-setting-desc.c:1744
+#: ../clients/common/nm-meta-setting-desc.c:2646
+#: ../clients/common/nm-meta-setting-desc.c:2704
 msgid "unknown"
 msgstr ""
 
-#: ../clients/cli/connections.c:76
+#: ../clients/cli/connections.c:78
 msgid "VPN connecting (prepare)"
 msgstr ""
 
-#: ../clients/cli/connections.c:77
+#: ../clients/cli/connections.c:79
 msgid "VPN connecting (need authentication)"
 msgstr ""
 
-#: ../clients/cli/connections.c:78
+#: ../clients/cli/connections.c:80
 msgid "VPN connecting"
 msgstr ""
 
-#: ../clients/cli/connections.c:79
+#: ../clients/cli/connections.c:81
 msgid "VPN connecting (getting IP configuration)"
 msgstr ""
 
-#: ../clients/cli/connections.c:80
+#: ../clients/cli/connections.c:82
 msgid "VPN connected"
 msgstr ""
 
-#: ../clients/cli/connections.c:81
+#: ../clients/cli/connections.c:83
 msgid "VPN connection failed"
 msgstr ""
 
-#: ../clients/cli/connections.c:82
+#: ../clients/cli/connections.c:84
 msgid "VPN disconnected"
 msgstr ""
 
-#: ../clients/cli/connections.c:1301
+#: ../clients/cli/connections.c:1309
 #, c-format
 msgid "Error updating secrets for %s: %s\n"
 msgstr ""
 
-#: ../clients/cli/connections.c:1348
+#: ../clients/cli/connections.c:1356
 msgid "Connection profile details"
 msgstr ""
 
-#: ../clients/cli/connections.c:1361 ../clients/cli/connections.c:1446
+#: ../clients/cli/connections.c:1369 ../clients/cli/connections.c:1458
 #, c-format
 msgid "Error: 'connection show': %s"
 msgstr ""
 
-#: ../clients/cli/connections.c:544
+#: ../clients/cli/connections.c:546
 msgid "never"
 msgstr ""
 
-#: ../clients/cli/connections.c:4966 ../clients/cli/connections.c:6921
-#: ../clients/cli/connections.c:6922 ../clients/cli/devices.c:517
-#: ../clients/cli/devices.c:524 ../clients/cli/devices.c:1239
-#: ../clients/cli/general.c:122 ../clients/cli/utils.h:291
+#: ../clients/cli/connections.c:5067 ../clients/cli/connections.c:7004
+#: ../clients/cli/connections.c:7005 ../clients/cli/devices.c:523
+#: ../clients/cli/devices.c:530 ../clients/cli/devices.c:1249
+#: ../clients/cli/general.c:92 ../clients/cli/utils.h:293
 #: ../clients/common/nm-client-utils.c:268
-#: ../clients/common/nm-meta-setting-desc.c:866
-#: ../clients/common/nm-meta-setting-desc.c:2679
+#: ../clients/common/nm-meta-setting-desc.c:847
+#: ../clients/common/nm-meta-setting-desc.c:2638
 msgid "yes"
 msgstr ""
 
-#: ../clients/cli/connections.c:4965 ../clients/cli/connections.c:6921
-#: ../clients/cli/connections.c:6922 ../clients/cli/devices.c:518
-#: ../clients/cli/devices.c:525 ../clients/cli/devices.c:1239
-#: ../clients/cli/general.c:123 ../clients/cli/utils.h:291
+#: ../clients/cli/connections.c:5066 ../clients/cli/connections.c:7004
+#: ../clients/cli/connections.c:7005 ../clients/cli/devices.c:524
+#: ../clients/cli/devices.c:531 ../clients/cli/devices.c:1249
+#: ../clients/cli/general.c:93 ../clients/cli/utils.h:293
 #: ../clients/common/nm-client-utils.c:269
-#: ../clients/common/nm-meta-setting-desc.c:866
-#: ../clients/common/nm-meta-setting-desc.c:2682
+#: ../clients/common/nm-meta-setting-desc.c:847
+#: ../clients/common/nm-meta-setting-desc.c:2641
 msgid "no"
 msgstr ""
 
-#: ../clients/cli/connections.c:1436
+#: ../clients/cli/connections.c:1448
 msgid "Activate connection details"
 msgstr ""
 
-#: ../clients/cli/connections.c:1637
+#: ../clients/cli/connections.c:1653
 #, c-format
 msgid "invalid field '%s'; allowed fields: %s and %s, or %s,%s"
 msgstr ""
 
-#: ../clients/cli/connections.c:1647 ../clients/cli/connections.c:1655
+#: ../clients/cli/connections.c:1663 ../clients/cli/connections.c:1671
 #, c-format
 msgid "'%s' has to be alone"
 msgstr ""
 
-#: ../clients/cli/connections.c:1915
+#: ../clients/cli/connections.c:1931
 #, c-format
 msgid "incorrect string '%s' of '--order' option"
 msgstr ""
 
-#: ../clients/cli/connections.c:1940
+#: ../clients/cli/connections.c:1956
 #, c-format
 msgid "incorrect item '%s' in '--order' option"
 msgstr ""
 
-#: ../clients/cli/connections.c:1978
+#: ../clients/cli/connections.c:1994
 msgid "No connection specified"
 msgstr ""
 
-#: ../clients/cli/connections.c:1989
+#: ../clients/cli/connections.c:2005
 #, c-format
 msgid "%s argument is missing"
 msgstr ""
 
-#: ../clients/cli/connections.c:2007
+#: ../clients/cli/connections.c:2023
 #, c-format
 msgid "unknown connection '%s'"
 msgstr ""
 
-#: ../clients/cli/connections.c:2036
+#: ../clients/cli/connections.c:2052
 msgid "'--order' argument is missing"
 msgstr ""
 
-#: ../clients/cli/connections.c:2096
+#: ../clients/cli/connections.c:2112
 msgid "NetworkManager active profiles"
 msgstr ""
 
-#: ../clients/cli/connections.c:2097
+#: ../clients/cli/connections.c:2113
 msgid "NetworkManager connection profiles"
 msgstr ""
 
-#: ../clients/cli/connections.c:2149 ../clients/cli/connections.c:2895
-#: ../clients/cli/connections.c:2907 ../clients/cli/connections.c:2919
-#: ../clients/cli/connections.c:3149 ../clients/cli/connections.c:8969
-#: ../clients/cli/connections.c:8990 ../clients/cli/devices.c:3019
-#: ../clients/cli/devices.c:3031 ../clients/cli/devices.c:3044
-#: ../clients/cli/devices.c:3299 ../clients/cli/devices.c:3310
-#: ../clients/cli/devices.c:3328 ../clients/cli/devices.c:3337
-#: ../clients/cli/devices.c:3358 ../clients/cli/devices.c:3369
-#: ../clients/cli/devices.c:3387 ../clients/cli/devices.c:3905
-#: ../clients/cli/devices.c:3915 ../clients/cli/devices.c:3923
-#: ../clients/cli/devices.c:3935 ../clients/cli/devices.c:3950
-#: ../clients/cli/devices.c:3958 ../clients/cli/devices.c:4101
-#: ../clients/cli/devices.c:4112 ../clients/cli/devices.c:4326
-#: ../clients/cli/devices.c:4495
+#: ../clients/cli/connections.c:2165 ../clients/cli/connections.c:2911
+#: ../clients/cli/connections.c:2924 ../clients/cli/connections.c:2937
+#: ../clients/cli/connections.c:3169 ../clients/cli/connections.c:9056
+#: ../clients/cli/connections.c:9078 ../clients/cli/devices.c:3108
+#: ../clients/cli/devices.c:3121 ../clients/cli/devices.c:3133
+#: ../clients/cli/devices.c:3425 ../clients/cli/devices.c:3436
+#: ../clients/cli/devices.c:3454 ../clients/cli/devices.c:3463
+#: ../clients/cli/devices.c:3484 ../clients/cli/devices.c:3495
+#: ../clients/cli/devices.c:3513 ../clients/cli/devices.c:4029
+#: ../clients/cli/devices.c:4040 ../clients/cli/devices.c:4049
+#: ../clients/cli/devices.c:4063 ../clients/cli/devices.c:4080
+#: ../clients/cli/devices.c:4089 ../clients/cli/devices.c:4236
+#: ../clients/cli/devices.c:4247 ../clients/cli/devices.c:4463
+#: ../clients/cli/devices.c:4635
 #, c-format
 msgid "Error: %s argument is missing."
 msgstr ""
 
-#: ../clients/cli/connections.c:2177
+#: ../clients/cli/connections.c:2193
 #, c-format
 msgid "Error: %s - no such connection profile."
 msgstr ""
 
-#: ../clients/cli/connections.c:2268 ../clients/cli/connections.c:2882
-#: ../clients/cli/connections.c:2947 ../clients/cli/connections.c:8506
-#: ../clients/cli/connections.c:8597 ../clients/cli/connections.c:9090
-#: ../clients/cli/devices.c:1773 ../clients/cli/devices.c:2041
-#: ../clients/cli/devices.c:2211 ../clients/cli/devices.c:2319
-#: ../clients/cli/devices.c:2511 ../clients/cli/devices.c:3178
-#: ../clients/cli/devices.c:4064 ../clients/cli/devices.c:4501
-#: ../clients/cli/general.c:982
+#: ../clients/cli/connections.c:2284 ../clients/cli/connections.c:2897
+#: ../clients/cli/connections.c:2967 ../clients/cli/connections.c:8597
+#: ../clients/cli/connections.c:8689 ../clients/cli/connections.c:9183
+#: ../clients/cli/devices.c:1786 ../clients/cli/devices.c:2054
+#: ../clients/cli/devices.c:2224 ../clients/cli/devices.c:2337
+#: ../clients/cli/devices.c:2526 ../clients/cli/devices.c:3304
+#: ../clients/cli/devices.c:4200 ../clients/cli/devices.c:4642
+#: ../clients/cli/general.c:993
 #, c-format
 msgid "Error: %s."
 msgstr ""
 
-#: ../clients/cli/connections.c:2361 ../clients/cli/devices.c:4278
+#: ../clients/cli/connections.c:2376 ../clients/cli/devices.c:4414
 #, c-format
 msgid "no active connection on device '%s'"
 msgstr ""
 
-#: ../clients/cli/connections.c:2369
+#: ../clients/cli/connections.c:2384
 msgid "no active connection or device"
 msgstr ""
 
@@ -748,63 +748,63 @@
 msgid "device '%s' not compatible with connection '%s':"
 msgstr ""
 
-#: ../clients/cli/connections.c:2422
+#: ../clients/cli/connections.c:2437
 #, c-format
 msgid "device '%s' not compatible with connection '%s'"
 msgstr ""
 
-#: ../clients/cli/connections.c:2425
+#: ../clients/cli/connections.c:2440
 #, c-format
 msgid "no device found for connection '%s'"
 msgstr ""
 
-#: ../clients/cli/connections.c:2494
+#: ../clients/cli/connections.c:2509
 #, c-format
 msgid "Connection successfully activated (%s) (D-Bus active path: %s)\n"
 msgstr ""
 
-#: ../clients/cli/connections.c:2498 ../clients/cli/connections.c:2648
-#: ../clients/cli/connections.c:6798
+#: ../clients/cli/connections.c:2513 ../clients/cli/connections.c:2663
+#: ../clients/cli/connections.c:6898
 #, c-format
 msgid "Connection successfully activated (D-Bus active path: %s)\n"
 msgstr ""
 
-#: ../clients/cli/connections.c:2505 ../clients/cli/connections.c:2627
+#: ../clients/cli/connections.c:2520 ../clients/cli/connections.c:2642
 #, c-format
 msgid "Error: Connection activation failed: %s"
 msgstr ""
 
-#: ../clients/cli/connections.c:2542
+#: ../clients/cli/connections.c:2557
 #, c-format
 msgid "Error: Timeout expired (%d seconds)"
 msgstr ""
 
-#: ../clients/cli/connections.c:2709
+#: ../clients/cli/connections.c:2724
 #, c-format
 msgid "failed to read passwd-file '%s': %s"
 msgstr ""
 
-#: ../clients/cli/connections.c:2722
+#: ../clients/cli/connections.c:2737
 #, c-format
 msgid "missing colon in 'password' entry '%s'"
 msgstr ""
 
-#: ../clients/cli/connections.c:2730
+#: ../clients/cli/connections.c:2745
 #, c-format
 msgid "missing dot in 'password' entry '%s'"
 msgstr ""
 
-#: ../clients/cli/connections.c:2743
+#: ../clients/cli/connections.c:2758
 #, c-format
 msgid "invalid setting name in 'password' entry '%s'"
 msgstr ""
 
-#: ../clients/cli/connections.c:2800
+#: ../clients/cli/connections.c:2815
 #, c-format
 msgid "unknown device '%s'."
 msgstr ""
 
-#: ../clients/cli/connections.c:2805
+#: ../clients/cli/connections.c:2820
 msgid "neither a valid connection nor device given"
 msgstr ""
 
@@ -815,153 +815,153 @@
 msgid "Unknown parameter: %s\n"
 msgstr ""
 
-#: ../clients/cli/connections.c:2955
+#: ../clients/cli/connections.c:2976
 msgid "preparing"
 msgstr ""
 
-#: ../clients/cli/connections.c:3064
+#: ../clients/cli/connections.c:3083
 #, c-format
 msgid "Connection '%s' (%s) successfully deleted.\n"
 msgstr ""
 
-#: ../clients/cli/connections.c:3080
+#: ../clients/cli/connections.c:3099
 #, c-format
 msgid "Connection '%s' successfully deactivated (D-Bus active path: %s)\n"
 msgstr ""
 
-#: ../clients/cli/connections.c:3131 ../clients/cli/connections.c:8693
-#: ../clients/cli/connections.c:8724 ../clients/cli/connections.c:8890
+#: ../clients/cli/connections.c:3150 ../clients/cli/connections.c:8786
+#: ../clients/cli/connections.c:8817 ../clients/cli/connections.c:8980
 #, c-format
 msgid "Error: No connection specified."
 msgstr ""
 
-#: ../clients/cli/connections.c:3161
+#: ../clients/cli/connections.c:3182
 #, c-format
 msgid "Error: '%s' is not an active connection.\n"
 msgstr ""
 
-#: ../clients/cli/connections.c:3162
+#: ../clients/cli/connections.c:3183
 #, c-format
 msgid "Error: not all active connections found."
 msgstr ""
 
-#: ../clients/cli/connections.c:3170
+#: ../clients/cli/connections.c:3191
 #, c-format
 msgid "Error: no active connection provided."
 msgstr ""
 
-#: ../clients/cli/connections.c:3201
+#: ../clients/cli/connections.c:3223
 #, c-format
 msgid "Connection '%s' deactivation failed: %s\n"
 msgstr ""
 
-#: ../clients/cli/connections.c:3461 ../clients/cli/connections.c:3518
+#: ../clients/cli/connections.c:3481 ../clients/cli/connections.c:3538
 #: ../clients/common/nm-client-utils.c:211
 #, c-format
 msgid "'%s' not among [%s]"
 msgstr ""
 
 #. We should not really come here
-#: ../clients/cli/connections.c:3481 ../clients/cli/connections.c:3541
+#: ../clients/cli/connections.c:3501 ../clients/cli/connections.c:3561
 #: ../clients/common/nm-client-utils.c:279
 #, c-format
 msgid "Unknown error"
 msgstr ""
 
-#: ../clients/cli/connections.c:3675
+#: ../clients/cli/connections.c:3695
 #, c-format
 msgid "Warning: master='%s' doesn't refer to any existing profile.\n"
 msgstr ""
 
-#: ../clients/cli/connections.c:4038
+#: ../clients/cli/connections.c:4058
 #, c-format
 msgid "Error: invalid property '%s': %s."
 msgstr ""
 
-#: ../clients/cli/connections.c:3995
+#: ../clients/cli/connections.c:3585
 #, c-format
 msgid "Error: failed to modify %s.%s: %s."
 msgstr ""
 
-#: ../clients/cli/connections.c:4015
+#: ../clients/cli/connections.c:3604
 #, c-format
 msgid "Error: failed to remove a value from %s.%s: %s."
 msgstr ""
 
-#: ../clients/cli/connections.c:4095
+#: ../clients/cli/connections.c:4115
 #, c-format
 msgid "Error: '%s' is mandatory."
 msgstr ""
 
-#: ../clients/cli/connections.c:4122
+#: ../clients/cli/connections.c:4142
 #, c-format
 msgid "Error: invalid slave type; %s."
 msgstr ""
 
-#: ../clients/cli/connections.c:4130
+#: ../clients/cli/connections.c:4150
 #, c-format
 msgid "Error: invalid connection type; %s."
 msgstr ""
 
-#: ../clients/cli/connections.c:4207
+#: ../clients/cli/connections.c:4227
 #, c-format
 msgid "Error: bad connection type: %s"
 msgstr ""
 
-#: ../clients/cli/connections.c:4263
+#: ../clients/cli/connections.c:4234
 #, c-format
 msgid "Error: '%s': %s"
 msgstr ""
 
-#: ../clients/cli/connections.c:4290
+#: ../clients/cli/connections.c:4302
 msgid "Error: master is required"
 msgstr ""
 
-#: ../clients/cli/connections.c:4359
+#: ../clients/cli/connections.c:4371
 #, c-format
 msgid "Error: error adding bond option '%s=%s'."
 msgstr ""
 
-#: ../clients/cli/connections.c:4390
+#: ../clients/cli/connections.c:4402
 #, c-format
 msgid "Error: '%s' is not a valid monitoring mode; use '%s' or '%s'.\n"
 msgstr ""
 
-#: ../clients/cli/connections.c:4421
+#: ../clients/cli/connections.c:4433
 #, c-format
 msgid "Error: 'bt-type': '%s' not valid; use [%s, %s, %s (%s), %s]."
 msgstr ""
 
-#: ../clients/cli/connections.c:4686
+#: ../clients/cli/connections.c:4737
 #, c-format
 msgid "Error: value for '%s' is missing."
 msgstr ""
 
-#: ../clients/cli/connections.c:4730
+#: ../clients/cli/connections.c:4782
 msgid "Error: <setting>.<property> argument is missing."
 msgstr ""
 
-#: ../clients/cli/connections.c:4756
+#: ../clients/cli/connections.c:4854
 #, c-format
 msgid "Error: invalid or not allowed setting '%s': %s."
 msgstr ""
 
-#: ../clients/cli/connections.c:4805 ../clients/cli/connections.c:4821
+#: ../clients/cli/connections.c:4903 ../clients/cli/connections.c:4919
 #, c-format
 msgid "Error: '%s' is ambiguous (%s.%s or %s.%s)."
 msgstr ""
 
-#: ../clients/cli/connections.c:4837
+#: ../clients/cli/connections.c:4939
 #, c-format
 msgid "Error: invalid <setting>.<property> '%s'."
 msgstr ""
 
-#: ../clients/cli/connections.c:4876 ../clients/cli/connections.c:8545
+#: ../clients/cli/connections.c:4977 ../clients/cli/connections.c:8637
 #, c-format
 msgid "Error: Failed to add '%s' connection: %s"
 msgstr ""
 
-#: ../clients/cli/connections.c:4894
+#: ../clients/cli/connections.c:4995
 #, c-format
 msgid ""
 "Warning: There is another connection with the name '%1$s'. Reference the "
@@ -972,48 +972,48 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../clients/cli/connections.c:4903
+#: ../clients/cli/connections.c:5004
 #, c-format
 msgid "Connection '%s' (%s) successfully added.\n"
 msgstr ""
 
-#: ../clients/cli/connections.c:5052
+#: ../clients/cli/connections.c:5153
 #, c-format
 msgid ""
 "You can specify this option more than once. Press <Enter> when you're done.\n"
 msgstr ""
 
 #. Ask for optional arguments.
-#: ../clients/cli/connections.c:5154
+#: ../clients/cli/connections.c:5255
 #, c-format
 msgid "There is %d optional setting for %s.\n"
 msgid_plural "There are %d optional settings for %s.\n"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../clients/cli/connections.c:5160
+#: ../clients/cli/connections.c:5261
 #, c-format
 msgid "Do you want to provide it? %s"
 msgid_plural "Do you want to provide them? %s"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../clients/cli/connections.c:5292 ../clients/cli/utils.c:279
+#: ../clients/cli/connections.c:5393 ../clients/cli/utils.c:279
 #, c-format
 msgid "Error: value for '%s' argument is required."
 msgstr ""
 
-#: ../clients/cli/connections.c:5299
+#: ../clients/cli/connections.c:5400
 #, c-format
 msgid "Error: 'save': %s."
 msgstr ""
 
-#: ../clients/cli/connections.c:5384 ../clients/cli/connections.c:5395
+#: ../clients/cli/connections.c:5485 ../clients/cli/connections.c:5496
 #, c-format
 msgid "Error: '%s' argument is required."
 msgstr ""
 
-#: ../clients/cli/connections.c:6354
+#: ../clients/cli/connections.c:6454
 #, c-format
 msgid "['%s' setting values]\n"
 msgstr ""
@@ -1021,7 +1021,7 @@
 #. TRANSLATORS: do not translate command names and keywords before ::
 #. *              However, you should translate terms enclosed in <>.
 #. 
-#: ../clients/cli/connections.c:6463
+#: ../clients/cli/connections.c:6563
 #, c-format
 msgid ""
 "---[ Main menu ]---\n"
@@ -1040,7 +1040,7 @@
 "quit                                 :: exit nmcli\n"
 msgstr ""
 
-#: ../clients/cli/connections.c:6490
+#: ../clients/cli/connections.c:6590
 #, c-format
 msgid ""
 "goto <setting>[.<prop>] | <prop>  :: enter setting/property for editing\n"
@@ -1052,7 +1052,7 @@
 "          nmcli> goto ipv4.addresses\n"
 msgstr ""
 
-#: ../clients/cli/connections.c:6497
+#: ../clients/cli/connections.c:6597
 #, c-format
 msgid ""
 "remove <setting>[.<prop>]  :: remove setting or reset property value\n"
@@ -1065,7 +1065,7 @@
 "          nmcli> remove eth.mtu\n"
 msgstr ""
 
-#: ../clients/cli/connections.c:6504
+#: ../clients/cli/connections.c:6604
 #, c-format
 msgid ""
 "set [<setting>.<prop> <value>]  :: set property value\n"
@@ -1075,7 +1075,7 @@
 "Example: nmcli> set con.id My connection\n"
 msgstr ""
 
-#: ../clients/cli/connections.c:6509
+#: ../clients/cli/connections.c:6609
 #, c-format
 msgid ""
 "describe [<setting>.<prop>]  :: describe property\n"
@@ -1084,7 +1084,7 @@
 "see all NM settings and properties.\n"
 msgstr ""
 
-#: ../clients/cli/connections.c:6514
+#: ../clients/cli/connections.c:6614
 #, c-format
 msgid ""
 "print [all]  :: print setting or connection values\n"
@@ -1094,7 +1094,7 @@
 "Example: nmcli ipv4> print all\n"
 msgstr ""
 
-#: ../clients/cli/connections.c:6519
+#: ../clients/cli/connections.c:6619
 #, c-format
 msgid ""
 "verify [all | fix]  :: verify setting or connection validity\n"
@@ -1109,7 +1109,7 @@
 "          nmcli bond> verify\n"
 msgstr ""
 
-#: ../clients/cli/connections.c:6528
+#: ../clients/cli/connections.c:6628
 #, c-format
 msgid ""
 "save [persistent|temporary]  :: save the connection\n"
@@ -1125,7 +1125,7 @@
 "profile must be deleted.\n"
 msgstr ""
 
-#: ../clients/cli/connections.c:6539
+#: ../clients/cli/connections.c:6639
 #, c-format
 msgid ""
 "activate [<ifname>] [/<ap>|<nsp>]  :: activate the connection\n"
@@ -1138,21 +1138,21 @@
 "specified)\n"
 msgstr ""
 
-#: ../clients/cli/connections.c:6546 ../clients/cli/connections.c:6704
+#: ../clients/cli/connections.c:6646 ../clients/cli/connections.c:6804
 #, c-format
 msgid ""
 "back  :: go to upper menu level\n"
 "\n"
 msgstr ""
 
-#: ../clients/cli/connections.c:6549
+#: ../clients/cli/connections.c:6649
 #, c-format
 msgid ""
 "help/? [<command>]  :: help for the nmcli commands\n"
 "\n"
 msgstr ""
 
-#: ../clients/cli/connections.c:6552
+#: ../clients/cli/connections.c:6652
 #, c-format
 msgid ""
 "nmcli [<conf-option> <value>]  :: nmcli configuration\n"
@@ -1168,7 +1168,7 @@
 "          nmcli> nmcli prompt-color 3\n"
 msgstr ""
 
-#: ../clients/cli/connections.c:6574 ../clients/cli/connections.c:6710
+#: ../clients/cli/connections.c:6674 ../clients/cli/connections.c:6810
 #, c-format
 msgid ""
 "quit  :: exit nmcli\n"
@@ -1177,8 +1177,8 @@
 "user is asked to confirm the action.\n"
 msgstr ""
 
-#: ../clients/cli/connections.c:6579 ../clients/cli/connections.c:6715
-#: ../clients/cli/connections.c:7126 ../clients/cli/connections.c:8129
+#: ../clients/cli/connections.c:6679 ../clients/cli/connections.c:6815
+#: ../clients/cli/connections.c:7209 ../clients/cli/connections.c:8219
 #, c-format
 msgid "Unknown command: '%s'\n"
 msgstr ""
@@ -1186,7 +1186,7 @@
 #. TRANSLATORS: do not translate command names and keywords before ::
 #. *              However, you should translate terms enclosed in <>.
 #. 
-#: ../clients/cli/connections.c:6644
+#: ../clients/cli/connections.c:6744
 #, c-format
 msgid ""
 "---[ Property menu ]---\n"
@@ -1202,7 +1202,7 @@
 "quit                             :: exit nmcli\n"
 msgstr ""
 
-#: ../clients/cli/connections.c:6669
+#: ../clients/cli/connections.c:6769
 #, c-format
 msgid ""
 "set [<value>]  :: set new value\n"
@@ -1210,7 +1210,7 @@
 "This command sets provided <value> to this property\n"
 msgstr ""
 
-#: ../clients/cli/connections.c:6673
+#: ../clients/cli/connections.c:6773
 #, c-format
 msgid ""
 "add [<value>]  :: append new value to the property\n"
@@ -1220,7 +1220,7 @@
 "(same as 'set').\n"
 msgstr ""
 
-#: ../clients/cli/connections.c:6679
+#: ../clients/cli/connections.c:6779
 #, c-format
 msgid ""
 "change  :: change current value\n"
@@ -1228,7 +1228,7 @@
 "Displays current value and allows editing it.\n"
 msgstr ""
 
-#: ../clients/cli/connections.c:6683
+#: ../clients/cli/connections.c:6783
 #, c-format
 msgid ""
 "remove [<value>|<index>|<option name>]  :: delete the value\n"
@@ -1248,7 +1248,7 @@
 "\n"
 msgstr ""
 
-#: ../clients/cli/connections.c:6694
+#: ../clients/cli/connections.c:6794
 #, c-format
 msgid ""
 "describe  :: describe property\n"
@@ -1257,7 +1257,7 @@
 "see all NM settings and properties.\n"
 msgstr ""
 
-#: ../clients/cli/connections.c:6699
+#: ../clients/cli/connections.c:6799
 #, c-format
 msgid ""
 "print [property|setting|connection]  :: print property (setting, connection) "
@@ -1267,100 +1267,100 @@
 "the whole setting or connection.\n"
 msgstr ""
 
-#: ../clients/cli/connections.c:6707
+#: ../clients/cli/connections.c:6807
 #, c-format
 msgid ""
 "help/? [<command>]  :: help for nmcli commands\n"
 "\n"
 msgstr ""
 
-#: ../clients/cli/connections.c:6804
+#: ../clients/cli/connections.c:6904
 #, c-format
 msgid "Error: Connection activation failed.\n"
 msgstr ""
 
-#: ../clients/cli/connections.c:6901
+#: ../clients/cli/connections.c:6893
 #, c-format
 msgid "Error: setting '%s' is mandatory and cannot be removed.\n"
 msgstr ""
 
 #. TRANSLATORS: status line in nmcli connection editor
-#: ../clients/cli/connections.c:6919
+#: ../clients/cli/connections.c:7002
 #, c-format
 msgid "[ Type: %s | Name: %s | UUID: %s | Dirty: %s | Temp: %s ]\n"
 msgstr ""
 
-#: ../clients/cli/connections.c:6955
+#: ../clients/cli/connections.c:7038
 #, c-format
 msgid "The connection is not saved. Do you really want to quit? %s"
 msgstr ""
 
-#: ../clients/cli/connections.c:6996
+#: ../clients/cli/connections.c:7079
 #, c-format
 msgid ""
 "The connection profile has been removed from another client. You may type "
 "'save' in the main menu to restore it.\n"
 msgstr ""
 
-#: ../clients/cli/connections.c:7030 ../clients/cli/connections.c:7424
-#: ../clients/cli/connections.c:7488
+#: ../clients/cli/connections.c:7113 ../clients/cli/connections.c:7507
+#: ../clients/cli/connections.c:7571
 #, c-format
 msgid "Allowed values for '%s' property: %s\n"
 msgstr ""
 
-#: ../clients/cli/connections.c:7034 ../clients/cli/connections.c:7428
-#: ../clients/cli/connections.c:7492
+#: ../clients/cli/connections.c:7117 ../clients/cli/connections.c:7511
+#: ../clients/cli/connections.c:7575
 #, c-format
 msgid "Enter '%s' value: "
 msgstr ""
 
-#: ../clients/cli/connections.c:7048 ../clients/cli/connections.c:7066
-#: ../clients/cli/connections.c:7437 ../clients/cli/connections.c:7505
+#: ../clients/cli/connections.c:7131 ../clients/cli/connections.c:7149
+#: ../clients/cli/connections.c:7520 ../clients/cli/connections.c:7588
 #, c-format
 msgid "Error: failed to set '%s' property: %s\n"
 msgstr ""
 
-#: ../clients/cli/connections.c:7057
+#: ../clients/cli/connections.c:7140
 #, c-format
 msgid "Edit '%s' value: "
 msgstr ""
 
-#: ../clients/cli/connections.c:7080 ../clients/cli/settings.c:400
+#: ../clients/cli/connections.c:7163 ../clients/cli/settings.c:400
 #, c-format
 msgid "Error: %s\n"
 msgstr ""
 
-#: ../clients/cli/connections.c:7607 ../clients/cli/connections.c:7662
+#: ../clients/cli/connections.c:7690 ../clients/cli/connections.c:7749
 #, c-format
 msgid "Error: failed to remove value of '%s': %s\n"
 msgstr ""
 
-#: ../clients/cli/connections.c:7099
+#: ../clients/cli/connections.c:7182
 #, c-format
 msgid "Unknown command argument: '%s'\n"
 msgstr ""
 
-#: ../clients/cli/connections.c:7190
+#: ../clients/cli/connections.c:7273
 #, c-format
 msgid "Available settings: %s\n"
 msgstr ""
 
-#: ../clients/cli/connections.c:7202
+#: ../clients/cli/connections.c:7285
 #, c-format
 msgid "Error: invalid setting name; %s\n"
 msgstr ""
 
-#: ../clients/cli/connections.c:7220
+#: ../clients/cli/connections.c:7303
 #, c-format
 msgid "Available properties: %s\n"
 msgstr ""
 
-#: ../clients/cli/connections.c:7228
+#: ../clients/cli/connections.c:7311
 #, c-format
 msgid "Error: property %s\n"
 msgstr ""
 
-#: ../clients/cli/connections.c:7273
+#: ../clients/cli/connections.c:7356
 #, c-format
 msgid ""
 "Saving the connection with 'autoconnect=yes'. That might result in an "
@@ -1368,189 +1368,189 @@
 "Do you still want to save? %s"
 msgstr ""
 
-#: ../clients/cli/connections.c:7358
+#: ../clients/cli/connections.c:7441
 #, c-format
 msgid "You may edit the following settings: %s\n"
 msgstr ""
 
-#: ../clients/cli/connections.c:7389
+#: ../clients/cli/connections.c:7472
 #, c-format
 msgid ""
 "The connection profile has been removed from another client. You may type "
 "'save' to restore it.\n"
 msgstr ""
 
-#: ../clients/cli/connections.c:7441 ../clients/cli/connections.c:7709
-#: ../clients/cli/connections.c:7741
+#: ../clients/cli/connections.c:7524 ../clients/cli/connections.c:7799
+#: ../clients/cli/connections.c:7831
 #, c-format
 msgid "Error: no setting selected; valid are [%s]\n"
 msgstr ""
 
-#: ../clients/cli/connections.c:7442
+#: ../clients/cli/connections.c:7525
 #, c-format
 msgid "use 'goto <setting>' first, or 'set <setting>.<property>'\n"
 msgstr ""
 
-#: ../clients/cli/connections.c:7457 ../clients/cli/connections.c:7634
-#: ../clients/cli/connections.c:7731
+#: ../clients/cli/connections.c:7540 ../clients/cli/connections.c:7717
+#: ../clients/cli/connections.c:7821
 #, c-format
 msgid "Error: invalid setting argument '%s'; valid are [%s]\n"
 msgstr ""
 
-#: ../clients/cli/connections.c:7466
+#: ../clients/cli/connections.c:7549
 #, c-format
 msgid "Error: missing setting for '%s' property\n"
 msgstr ""
 
-#: ../clients/cli/connections.c:7473
+#: ../clients/cli/connections.c:7556
 #, c-format
 msgid "Error: invalid property: %s\n"
 msgstr ""
 
-#: ../clients/cli/connections.c:7537
+#: ../clients/cli/connections.c:7620
 #, c-format
 msgid "Error: unknown setting '%s'\n"
 msgstr ""
 
-#: ../clients/cli/connections.c:7562
+#: ../clients/cli/connections.c:7645
 #, c-format
 msgid "You may edit the following properties: %s\n"
 msgstr ""
 
-#: ../clients/cli/connections.c:7612
+#: ../clients/cli/connections.c:7695
 #, c-format
 msgid "Error: no argument given; valid are [%s]\n"
 msgstr ""
 
-#: ../clients/cli/connections.c:7631
+#: ../clients/cli/connections.c:7714
 #, c-format
 msgid "Setting '%s' is not present in the connection.\n"
 msgstr ""
 
-#: ../clients/cli/connections.c:7685
+#: ../clients/cli/connections.c:7775
 #, c-format
 msgid "Error: %s properties, nor it is a setting name.\n"
 msgstr ""
 
-#: ../clients/cli/connections.c:7710 ../clients/cli/connections.c:7742
+#: ../clients/cli/connections.c:7800 ../clients/cli/connections.c:7832
 #, c-format
 msgid "use 'goto <setting>' first, or 'describe <setting>.<property>'\n"
 msgstr ""
 
-#: ../clients/cli/connections.c:7765
+#: ../clients/cli/connections.c:7855
 #, c-format
 msgid "Error: invalid property: %s, neither a valid setting name.\n"
 msgstr ""
 
-#: ../clients/cli/connections.c:7795
+#: ../clients/cli/connections.c:7885
 #, c-format
 msgid "Error: unknown setting: '%s'\n"
 msgstr ""
 
-#: ../clients/cli/connections.c:7800
+#: ../clients/cli/connections.c:7890
 #, c-format
 msgid "Error: '%s' setting not present in the connection\n"
 msgstr ""
 
-#: ../clients/cli/connections.c:7831
+#: ../clients/cli/connections.c:7921
 #, c-format
 msgid "Error: invalid property: %s%s\n"
 msgstr ""
 
-#: ../clients/cli/connections.c:7833
+#: ../clients/cli/connections.c:7923
 msgid ", neither a valid setting name"
 msgstr ""
 
-#: ../clients/cli/connections.c:7849
+#: ../clients/cli/connections.c:7939
 #, c-format
 msgid "Invalid verify option: %s\n"
 msgstr ""
 
-#: ../clients/cli/connections.c:7858
+#: ../clients/cli/connections.c:7948
 #, c-format
 msgid "Verify setting '%s': %s\n"
 msgstr ""
 
-#: ../clients/cli/connections.c:7874
+#: ../clients/cli/connections.c:7964
 #, c-format
 msgid "Verify connection: %s\n"
 msgstr ""
 
-#: ../clients/cli/connections.c:7877
+#: ../clients/cli/connections.c:7967
 #, c-format
 msgid "The error cannot be fixed automatically.\n"
 msgstr ""
 
-#: ../clients/cli/connections.c:7897
+#: ../clients/cli/connections.c:7987
 #, c-format
 msgid "Error: invalid argument '%s'\n"
 msgstr ""
 
-#: ../clients/cli/connections.c:7947
+#: ../clients/cli/connections.c:8037
 #, c-format
 msgid "Error: Failed to save '%s' (%s) connection: %s\n"
 msgstr ""
 
-#: ../clients/cli/connections.c:7958
+#: ../clients/cli/connections.c:8048
 #, c-format
 msgid "Connection '%s' (%s) successfully saved.\n"
 msgstr ""
 
-#: ../clients/cli/connections.c:7959
+#: ../clients/cli/connections.c:8049
 #, c-format
 msgid "Connection '%s' (%s) successfully updated.\n"
 msgstr ""
 
-#: ../clients/cli/connections.c:7992
+#: ../clients/cli/connections.c:8082
 #, c-format
 msgid "Error: connection verification failed: %s\n"
 msgstr ""
 
-#: ../clients/cli/connections.c:7993
+#: ../clients/cli/connections.c:8083
 msgid "(unknown error)"
 msgstr ""
 
-#: ../clients/cli/connections.c:7994
+#: ../clients/cli/connections.c:8084
 #, c-format
 msgid "You may try running 'verify fix' to fix errors.\n"
 msgstr ""
 
 #. TRANSLATORS: do not translate 'save', leave it as it is
-#: ../clients/cli/connections.c:8017
+#: ../clients/cli/connections.c:8107
 #, c-format
 msgid "Error: connection is not saved. Type 'save' first.\n"
 msgstr ""
 
-#: ../clients/cli/connections.c:8021
+#: ../clients/cli/connections.c:8111
 #, c-format
 msgid "Error: connection is not valid: %s\n"
 msgstr ""
 
-#: ../clients/cli/connections.c:8031
+#: ../clients/cli/connections.c:8121
 #, c-format
 msgid "Error: Cannot activate connection: %s.\n"
 msgstr ""
 
-#: ../clients/cli/connections.c:8040
+#: ../clients/cli/connections.c:8130
 #, c-format
 msgid "Error: Failed to activate '%s' (%s) connection: %s\n"
 msgstr ""
 
-#: ../clients/cli/connections.c:8047
+#: ../clients/cli/connections.c:8137
 msgid "Monitoring connection activation (press any key to continue)\n"
 msgstr ""
 
-#: ../clients/cli/connections.c:8083
+#: ../clients/cli/connections.c:8173
 #, c-format
 msgid "Error: status-line: %s\n"
 msgstr ""
 
-#: ../clients/cli/connections.c:8091
+#: ../clients/cli/connections.c:8181
 #, c-format
 msgid "Error: save-confirmation: %s\n"
 msgstr ""
 
-#: ../clients/cli/connections.c:8099
+#: ../clients/cli/connections.c:8189
 #, c-format
 msgid "Error: show-secrets: %s\n"
 msgstr ""
@@ -1560,12 +1560,12 @@
 msgid "Error: bad color: %s\n"
 msgstr ""
 
-#: ../clients/cli/connections.c:8106
+#: ../clients/cli/connections.c:8196
 #, c-format
 msgid "Current nmcli configuration:\n"
 msgstr ""
 
-#: ../clients/cli/connections.c:8114
+#: ../clients/cli/connections.c:8204
 #, c-format
 msgid "Invalid configuration option '%s'; allowed [%s]\n"
 msgstr ""
@@ -1575,160 +1575,160 @@
 msgid "Error: only one of 'id', uuid, or 'path' can be provided."
 msgstr ""
 
-#: ../clients/cli/connections.c:8349 ../clients/cli/connections.c:8513
+#: ../clients/cli/connections.c:8441 ../clients/cli/connections.c:8605
 #, c-format
 msgid "Error: Unknown connection '%s'."
 msgstr ""
 
-#: ../clients/cli/connections.c:8365
+#: ../clients/cli/connections.c:8458
 #, c-format
 msgid ""
 "Warning: editing existing connection '%s'; 'type' argument is ignored\n"
 msgstr ""
 
-#: ../clients/cli/connections.c:8368
+#: ../clients/cli/connections.c:8461
 #, c-format
 msgid ""
 "Warning: editing existing connection '%s'; 'con-name' argument is ignored\n"
 msgstr ""
 
-#: ../clients/cli/connections.c:8395
+#: ../clients/cli/connections.c:8488
 #, c-format
 msgid "Valid connection types: %s\n"
 msgstr ""
 
-#: ../clients/cli/connections.c:8397
+#: ../clients/cli/connections.c:8490
 #, c-format
 msgid "Error: invalid connection type; %s\n"
 msgstr ""
 
-#: ../clients/cli/connections.c:8433
+#: ../clients/cli/connections.c:8526
 #, c-format
 msgid "===| nmcli interactive connection editor |==="
 msgstr ""
 
-#: ../clients/cli/connections.c:8436
+#: ../clients/cli/connections.c:8529
 #, c-format
 msgid "Editing existing '%s' connection: '%s'"
 msgstr ""
 
-#: ../clients/cli/connections.c:8438
+#: ../clients/cli/connections.c:8531
 #, c-format
 msgid "Adding a new '%s' connection"
 msgstr ""
 
 #. TRANSLATORS: do not translate 'help', leave it as it is
-#: ../clients/cli/connections.c:8441
+#: ../clients/cli/connections.c:8534
 #, c-format
 msgid "Type 'help' or '?' for available commands."
 msgstr ""
 
 #. TRANSLATORS: do not translate 'describe', leave it as it is
-#: ../clients/cli/connections.c:8447
+#: ../clients/cli/connections.c:8540
 #, c-format
 msgid "Type 'describe [<setting>.<prop>]' for detailed property description."
 msgstr ""
 
-#: ../clients/cli/connections.c:8475
+#: ../clients/cli/connections.c:8568
 #, c-format
 msgid "Error: Failed to modify connection '%s': %s"
 msgstr ""
 
-#: ../clients/cli/connections.c:8481
+#: ../clients/cli/connections.c:8574
 #, c-format
 msgid "Connection '%s' (%s) successfully modified.\n"
 msgstr ""
 
-#: ../clients/cli/connections.c:8549
+#: ../clients/cli/connections.c:8641
 #, c-format
 msgid "%s (%s) cloned as %s (%s).\n"
 msgstr ""
 
-#: ../clients/cli/connections.c:8608
+#: ../clients/cli/connections.c:8701
 msgid "New connection name: "
 msgstr ""
 
-#: ../clients/cli/connections.c:8610
+#: ../clients/cli/connections.c:8703
 #, c-format
 msgid "Error: <new name> argument is missing."
 msgstr ""
 
-#: ../clients/cli/connections.c:8615 ../clients/cli/connections.c:9101
+#: ../clients/cli/connections.c:8709 ../clients/cli/connections.c:9194
 #, c-format
 msgid "Error: unknown extra argument: '%s'."
 msgstr ""
 
-#: ../clients/cli/connections.c:8648
+#: ../clients/cli/connections.c:8741
 #, c-format
 msgid "Error: not all connections deleted."
 msgstr ""
 
-#: ../clients/cli/connections.c:8588
+#: ../clients/cli/connections.c:8154
 #, c-format
 msgid "Error: Connection deletion failed: %s"
 msgstr ""
 
-#: ../clients/cli/connections.c:8705 ../clients/cli/connections.c:8826
+#: ../clients/cli/connections.c:8798 ../clients/cli/connections.c:8918
 #, c-format
 msgid "Error: %s.\n"
 msgstr ""
 
-#: ../clients/cli/connections.c:8706 ../clients/cli/connections.c:8827
+#: ../clients/cli/connections.c:8799 ../clients/cli/connections.c:8919
 #, c-format
 msgid "Error: not all connections found."
 msgstr ""
 
 #. truncate trailing ", "
-#: ../clients/cli/connections.c:8757
+#: ../clients/cli/connections.c:8850
 #, c-format
 msgid "Error: cannot delete unknown connection(s): %s."
 msgstr ""
 
-#: ../clients/cli/connections.c:8767
+#: ../clients/cli/connections.c:8859
 #, c-format
 msgid "%s: connection profile changed\n"
 msgstr ""
 
-#: ../clients/cli/connections.c:8793
+#: ../clients/cli/connections.c:8885
 #, c-format
 msgid "%s: connection profile created\n"
 msgstr ""
 
-#: ../clients/cli/connections.c:8802
+#: ../clients/cli/connections.c:8894
 #, c-format
 msgid "%s: connection profile removed\n"
 msgstr ""
 
-#: ../clients/cli/connections.c:8873
+#: ../clients/cli/connections.c:8964
 #, c-format
 msgid "Error: failed to reload connections: %s."
 msgstr ""
 
-#: ../clients/cli/connections.c:8905
+#: ../clients/cli/connections.c:8994
 #, c-format
 msgid "Error: failed to load connection: %s."
 msgstr ""
 
-#: ../clients/cli/connections.c:8913
+#: ../clients/cli/connections.c:9002
 #, c-format
 msgid "Could not load file '%s'\n"
 msgstr ""
 
-#: ../clients/cli/connections.c:8920
+#: ../clients/cli/connections.c:9006
 msgid "File to import: "
 msgstr ""
 
-#: ../clients/cli/connections.c:8953
+#: ../clients/cli/connections.c:9039
 #, c-format
 msgid "Error: No arguments provided."
 msgstr ""
 
-#: ../clients/cli/connections.c:8984
+#: ../clients/cli/connections.c:9072
 #, c-format
 msgid "Warning: 'type' already specified, ignoring extra one.\n"
 msgstr ""
 
-#: ../clients/cli/connections.c:8998
+#: ../clients/cli/connections.c:9087
 #, c-format
 msgid "Warning: 'file' already specified, ignoring extra one.\n"
 msgstr ""
@@ -1738,51 +1738,51 @@
 msgid "Unknown parameter: %s"
 msgstr ""
 
-#: ../clients/cli/connections.c:9011
+#: ../clients/cli/connections.c:9101
 #, c-format
 msgid "Error: 'type' argument is required."
 msgstr ""
 
-#: ../clients/cli/connections.c:9015
+#: ../clients/cli/connections.c:9106
 #, c-format
 msgid "Error: 'file' argument is required."
 msgstr ""
 
-#: ../clients/cli/connections.c:9024
+#: ../clients/cli/connections.c:9116
 #, c-format
 msgid "Error: failed to find VPN plugin for %s."
 msgstr ""
 
-#: ../clients/cli/connections.c:9031 ../clients/cli/connections.c:9122
+#: ../clients/cli/connections.c:9124 ../clients/cli/connections.c:9215
 #, c-format
 msgid "Error: failed to load VPN plugin: %s."
 msgstr ""
 
-#: ../clients/cli/connections.c:9040
+#: ../clients/cli/connections.c:9134
 #, c-format
 msgid "Error: failed to import '%s': %s."
 msgstr ""
 
-#: ../clients/cli/connections.c:9108
+#: ../clients/cli/connections.c:9201
 msgid "Output file name: "
 msgstr ""
 
-#: ../clients/cli/connections.c:9113
+#: ../clients/cli/connections.c:9206
 #, c-format
 msgid "Error: the connection is not VPN."
 msgstr ""
 
-#: ../clients/cli/connections.c:9135
+#: ../clients/cli/connections.c:9228
 #, c-format
 msgid "Error: failed to create temporary file %s."
 msgstr ""
 
-#: ../clients/cli/connections.c:9143
+#: ../clients/cli/connections.c:9236
 #, c-format
 msgid "Error: failed to export '%s': %s."
 msgstr ""
 
-#: ../clients/cli/connections.c:9155
+#: ../clients/cli/connections.c:9248
 #, c-format
 msgid "Error: failed to read temporary file '%s': %s."
 msgstr ""
@@ -1838,7 +1838,7 @@
 "\n"
 msgstr ""
 
-#: ../clients/cli/devices.c:749
+#: ../clients/cli/devices.c:755
 #, c-format
 msgid ""
 "Usage: nmcli device status { help }\n"
@@ -1856,7 +1856,7 @@
 "\n"
 msgstr ""
 
-#: ../clients/cli/devices.c:764
+#: ../clients/cli/devices.c:770
 #, c-format
 msgid ""
 "Usage: nmcli device show { ARGUMENTS | help }\n"
@@ -1868,7 +1868,7 @@
 "\n"
 msgstr ""
 
-#: ../clients/cli/devices.c:775
+#: ../clients/cli/devices.c:781
 #, c-format
 msgid ""
 "Usage: nmcli device connect { ARGUMENTS | help }\n"
@@ -1882,7 +1882,7 @@
 "\n"
 msgstr ""
 
-#: ../clients/cli/devices.c:787
+#: ../clients/cli/devices.c:793
 #, c-format
 msgid ""
 "Usage: nmcli device reapply { ARGUMENTS | help }\n"
@@ -1894,7 +1894,7 @@
 "\n"
 msgstr ""
 
-#: ../clients/cli/devices.c:798
+#: ../clients/cli/devices.c:804
 #, c-format
 msgid ""
 "Usage: nmcli device modify { ARGUMENTS | --help }\n"
@@ -1916,7 +1916,7 @@
 "nmcli dev mod em1 -ipv6.addr \"abbe::cafe/56\"\n"
 msgstr ""
 
-#: ../clients/cli/devices.c:818
+#: ../clients/cli/devices.c:824
 #, c-format
 msgid ""
 "Usage: nmcli device disconnect { ARGUMENTS | help }\n"
@@ -1929,7 +1929,7 @@
 "\n"
 msgstr ""
 
-#: ../clients/cli/devices.c:830
+#: ../clients/cli/devices.c:836
 #, c-format
 msgid ""
 "Usage: nmcli device delete { ARGUMENTS | help }\n"
@@ -1943,7 +1943,7 @@
 "\n"
 msgstr ""
 
-#: ../clients/cli/devices.c:843
+#: ../clients/cli/devices.c:849
 #, c-format
 msgid ""
 "Usage: nmcli device set { ARGUMENTS | help }\n"
@@ -1957,7 +1957,7 @@
 "\n"
 msgstr ""
 
-#: ../clients/cli/devices.c:856
+#: ../clients/cli/devices.c:862
 #, c-format
 msgid ""
 "Usage: nmcli device monitor { ARGUMENTS | help }\n"
@@ -2023,7 +2023,7 @@
 "\n"
 msgstr ""
 
-#: ../clients/cli/devices.c:915
+#: ../clients/cli/devices.c:921
 #, c-format
 msgid ""
 "Usage: nmcli device lldp { ARGUMENTS | help }\n"
@@ -2036,45 +2036,45 @@
 "\n"
 msgstr ""
 
-#: ../clients/cli/devices.c:1013
+#: ../clients/cli/devices.c:1020
 #, c-format
 msgid "Error: No interface specified."
 msgstr ""
 
-#: ../clients/cli/devices.c:1036
+#: ../clients/cli/devices.c:1043
 #, c-format
 msgid "Warning: argument '%s' is duplicated.\n"
 msgstr ""
 
-#: ../clients/cli/devices.c:1039
+#: ../clients/cli/devices.c:1046
 #, c-format
 msgid "Error: Device '%s' not found.\n"
 msgstr ""
 
-#: ../clients/cli/devices.c:1040
+#: ../clients/cli/devices.c:1047
 #, c-format
 msgid "Error: not all devices found."
 msgstr ""
 
-#: ../clients/cli/devices.c:1071
+#: ../clients/cli/devices.c:1078
 msgid "No interface specified"
 msgstr ""
 
-#: ../clients/cli/devices.c:1090
+#: ../clients/cli/devices.c:1097
 #, c-format
 msgid "Device '%s' not found"
 msgstr ""
 
-#: ../clients/cli/devices.c:59 ../clients/cli/devices.c:1267
+#: ../clients/cli/devices.c:64 ../clients/cli/devices.c:1277
 msgid "(none)"
 msgstr ""
 
-#: ../clients/cli/devices.c:1186
+#: ../clients/cli/devices.c:1193
 #, c-format
 msgid "%u MHz"
 msgstr ""
 
-#: ../clients/cli/devices.c:1187
+#: ../clients/cli/devices.c:1194
 #, c-format
 msgid "%u Mbit/s"
 msgstr ""
@@ -2095,84 +2095,84 @@
 msgid "802.1X"
 msgstr ""
 
-#: ../clients/cli/devices.c:1226
+#: ../clients/cli/devices.c:1236
 msgid "Ad-Hoc"
 msgstr ""
 
-#: ../clients/cli/devices.c:1227
+#: ../clients/cli/devices.c:1237
 msgid "Infra"
 msgstr ""
 
-#: ../clients/cli/devices.c:1229
+#: ../clients/cli/devices.c:1239
 msgid "N/A"
 msgstr ""
 
-#: ../clients/cli/devices.c:1424
+#: ../clients/cli/devices.c:1434
 msgid "Device details"
 msgstr ""
 
-#: ../clients/cli/devices.c:1435
+#: ../clients/cli/devices.c:1445
 #, c-format
 msgid "Error: 'device show': %s"
 msgstr ""
 
-#: ../clients/cli/devices.c:166 ../clients/cli/devices.c:173
+#: ../clients/cli/devices.c:172 ../clients/cli/devices.c:179
 msgid "(unknown)"
 msgstr "(ไม่รู้จัก)"
 
-#: ../clients/cli/devices.c:424
+#: ../clients/cli/devices.c:430
 #, c-format
 msgid "%u Mb/s"
 msgstr ""
 
-#: ../clients/cli/utils.h:297 ../clients/common/nm-meta-setting-desc.c:4136
+#: ../clients/cli/utils.h:299 ../clients/common/nm-meta-setting-desc.c:4105
 msgid "on"
 msgstr ""
 
-#: ../clients/cli/utils.h:297 ../clients/common/nm-meta-setting-desc.c:4138
+#: ../clients/cli/utils.h:299 ../clients/common/nm-meta-setting-desc.c:4107
 msgid "off"
 msgstr ""
 
-#: ../clients/cli/devices.c:1751
+#: ../clients/cli/devices.c:1765
 #, c-format
 msgid "Error: 'device status': %s"
 msgstr ""
 
-#: ../clients/cli/devices.c:1747
+#: ../clients/cli/devices.c:1761
 msgid "Status of devices"
 msgstr ""
 
-#: ../clients/cli/connections.c:2929 ../clients/cli/connections.c:9000
-#: ../clients/cli/devices.c:1732 ../clients/cli/devices.c:1778
-#: ../clients/cli/devices.c:2216 ../clients/cli/devices.c:3076
-#: ../clients/cli/devices.c:3400 ../clients/cli/devices.c:3967
-#: ../clients/cli/devices.c:4118 ../clients/cli/devices.c:4335
-#: ../clients/cli/devices.c:4505
+#: ../clients/cli/connections.c:2948 ../clients/cli/connections.c:9089
+#: ../clients/cli/devices.c:1745 ../clients/cli/devices.c:1792
+#: ../clients/cli/devices.c:2230 ../clients/cli/devices.c:3167
+#: ../clients/cli/devices.c:3526 ../clients/cli/devices.c:4099
+#: ../clients/cli/devices.c:4253 ../clients/cli/devices.c:4473
+#: ../clients/cli/devices.c:4647
 #, c-format
 msgid "Error: invalid extra argument '%s'."
 msgstr ""
 
-#: ../clients/cli/devices.c:1814 ../clients/cli/general.c:537
+#: ../clients/cli/devices.c:1827 ../clients/cli/general.c:511
 #, c-format
 msgid "Error: Timeout %d sec expired."
 msgstr ""
 
-#: ../clients/cli/devices.c:1886
+#: ../clients/cli/devices.c:1899
 #, c-format
 msgid "Device '%s' successfully activated with '%s'.\n"
 msgstr ""
 
-#: ../clients/cli/devices.c:1895
+#: ../clients/cli/devices.c:1908
 #, c-format
 msgid "Error: Connection activation failed: (%d) %s.\n"
 msgstr ""
 
-#: ../clients/cli/devices.c:1925
+#: ../clients/cli/devices.c:1938
 #, c-format
 msgid "Error: Failed to setup a Wi-Fi hotspot: %s"
 msgstr ""
 
-#: ../clients/cli/devices.c:1928
+#: ../clients/cli/devices.c:1941
 #, c-format
 msgid "Error: Failed to add/activate new connection: %s"
 msgstr ""
@@ -2197,7 +2197,7 @@
 msgid "Hotspot '%s' activated on device '%s'\n"
 msgstr ""
 
-#: ../clients/cli/devices.c:1996
+#: ../clients/cli/devices.c:2009
 #, c-format
 msgid "Error: Device activation failed: %s"
 msgstr ""
@@ -2212,218 +2212,218 @@
 msgid "Device '%s' has been connected.\n"
 msgstr ""
 
-#: ../clients/cli/devices.c:2046
+#: ../clients/cli/devices.c:2060
 #, c-format
 msgid "Error: extra argument not allowed: '%s'."
 msgstr ""
 
-#: ../clients/cli/devices.c:2116 ../clients/cli/devices.c:2131
-#: ../clients/cli/devices.c:2368
+#: ../clients/cli/devices.c:2129 ../clients/cli/devices.c:2144
+#: ../clients/cli/devices.c:2385
 #, c-format
 msgid "Device '%s' successfully disconnected.\n"
 msgstr ""
 
-#: ../clients/cli/devices.c:2119 ../clients/cli/devices.c:2442
+#: ../clients/cli/devices.c:2132 ../clients/cli/devices.c:2458
 #, c-format
 msgid "Device '%s' successfully removed.\n"
 msgstr ""
 
-#: ../clients/cli/devices.c:2181 ../clients/cli/devices.c:2251
+#: ../clients/cli/devices.c:2194 ../clients/cli/devices.c:2264
 #, c-format
 msgid "Error: Reapplying connection to device '%s' (%s) failed: %s"
 msgstr ""
 
-#: ../clients/cli/devices.c:2191 ../clients/cli/devices.c:2260
+#: ../clients/cli/devices.c:2204 ../clients/cli/devices.c:2273
 #, c-format
 msgid "Connection successfully reapplied to device '%s'.\n"
 msgstr ""
 
-#: ../clients/cli/devices.c:2285
+#: ../clients/cli/devices.c:2300
 #, c-format
 msgid "Error: Reading applied connection from device '%s' (%s) failed: %s"
 msgstr ""
 
-#: ../clients/cli/devices.c:2352
+#: ../clients/cli/devices.c:2369
 #, c-format
 msgid "Error: not all devices disconnected."
 msgstr ""
 
-#: ../clients/cli/devices.c:2353
+#: ../clients/cli/devices.c:2370
 #, c-format
 msgid "Error: Device '%s' (%s) disconnecting failed: %s\n"
 msgstr ""
 
-#: ../clients/cli/devices.c:2433
+#: ../clients/cli/devices.c:2449
 #, c-format
 msgid "Error: not all devices deleted."
 msgstr ""
 
-#: ../clients/cli/devices.c:2434
+#: ../clients/cli/devices.c:2450
 #, c-format
 msgid "Error: Device '%s' (%s) deletion failed: %s\n"
 msgstr ""
 
-#: ../clients/cli/devices.c:2516
+#: ../clients/cli/devices.c:2532
 #, c-format
 msgid "Error: No property specified."
 msgstr ""
 
-#: ../clients/cli/devices.c:2531 ../clients/cli/devices.c:2548
-#: ../clients/cli/general.c:777 ../clients/cli/general.c:789
+#: ../clients/cli/devices.c:2548 ../clients/cli/devices.c:2567
+#: ../clients/cli/general.c:769 ../clients/cli/general.c:782
 #, c-format
 msgid "Error: '%s' argument is missing."
 msgstr ""
 
-#: ../clients/cli/devices.c:2537
+#: ../clients/cli/devices.c:2555
 #, c-format
 msgid "Error: 'managed': %s."
 msgstr ""
 
-#: ../clients/cli/devices.c:2554
+#: ../clients/cli/devices.c:2574
 #, c-format
 msgid "Error: 'autoconnect': %s."
 msgstr ""
 
-#: ../clients/cli/devices.c:2562 ../clients/cli/general.c:803
+#: ../clients/cli/devices.c:2583 ../clients/cli/general.c:797
 #, c-format
 msgid "Error: property '%s' is not known."
 msgstr ""
 
-#: ../clients/cli/devices.c:2611
+#: ../clients/cli/devices.c:2631
 #, c-format
 msgid "%s: using connection '%s'\n"
 msgstr ""
 
-#: ../clients/cli/devices.c:2637
+#: ../clients/cli/devices.c:2657
 #, c-format
 msgid "%s: device created\n"
 msgstr ""
 
-#: ../clients/cli/devices.c:2644
+#: ../clients/cli/devices.c:2664
 #, c-format
 msgid "%s: device removed\n"
 msgstr ""
 
-#: ../clients/cli/devices.c:2824
+#: ../clients/cli/devices.c:2843
 msgid "Wi-Fi scan list"
 msgstr ""
 
-#: ../clients/cli/devices.c:3067
+#: ../clients/cli/devices.c:3160
 #, c-format
 msgid "Error: 'device wifi': %s"
 msgstr ""
 
-#: ../clients/cli/devices.c:3094
+#: ../clients/cli/devices.c:3218
 #, c-format
 msgid "Error: Device '%s' not found."
 msgstr ""
 
-#: ../clients/cli/devices.c:2911
+#: ../clients/cli/devices.c:2961 ../clients/cli/devices.c:3237
 #, c-format
 msgid "Error: Access point with bssid '%s' not found."
 msgstr ""
 
-#: ../clients/cli/devices.c:3105
+#: ../clients/cli/devices.c:3223
 #, c-format
 msgid ""
 "Error: Device '%s' was not recognized as a Wi-Fi device, check "
 "NetworkManager Wi-Fi plugin."
 msgstr ""
 
-#: ../clients/cli/devices.c:3109 ../clients/cli/devices.c:3430
-#: ../clients/cli/devices.c:4006 ../clients/cli/devices.c:4134
-#: ../clients/cli/devices.c:4266
+#: ../clients/cli/devices.c:3227 ../clients/cli/devices.c:3556
+#: ../clients/cli/devices.c:4141 ../clients/cli/devices.c:4269
+#: ../clients/cli/devices.c:4402
 #, c-format
 msgid "Error: Device '%s' is not a Wi-Fi device."
 msgstr ""
 
-#: ../clients/cli/devices.c:3277
+#: ../clients/cli/devices.c:3403
 msgid "SSID or BSSID: "
 msgstr ""
 
-#: ../clients/cli/devices.c:3282
+#: ../clients/cli/devices.c:3408
 #, c-format
 msgid "Error: SSID or BSSID are missing."
 msgstr ""
 
-#: ../clients/cli/devices.c:3319
+#: ../clients/cli/devices.c:3445
 #, c-format
 msgid "Error: bssid argument value '%s' is not a valid BSSID."
 msgstr ""
 
-#: ../clients/cli/devices.c:3349
+#: ../clients/cli/devices.c:3475
 #, c-format
 msgid ""
 "Error: wep-key-type argument value '%s' is invalid, use 'key' or 'phrase'."
 msgstr ""
 
-#: ../clients/cli/devices.c:3376 ../clients/cli/devices.c:3394
+#: ../clients/cli/devices.c:3502 ../clients/cli/devices.c:3520
 #, c-format
 msgid "Error: %s: %s."
 msgstr ""
 
-#: ../clients/cli/devices.c:3413
+#: ../clients/cli/devices.c:3539
 #, c-format
 msgid "Error: BSSID to connect to (%s) differs from bssid argument (%s)."
 msgstr ""
 
-#: ../clients/cli/devices.c:3419
+#: ../clients/cli/devices.c:3545
 #, c-format
 msgid "Error: Parameter '%s' is neither SSID nor BSSID."
 msgstr ""
 
-#: ../clients/cli/devices.c:3432 ../clients/cli/devices.c:4008
-#: ../clients/cli/devices.c:4136 ../clients/cli/devices.c:4367
+#: ../clients/cli/devices.c:3558 ../clients/cli/devices.c:4143
+#: ../clients/cli/devices.c:4271 ../clients/cli/devices.c:4507
 #, c-format
 msgid "Error: No Wi-Fi device found."
 msgstr ""
 
-#: ../clients/cli/devices.c:3452
+#: ../clients/cli/devices.c:3578
 #, c-format
 msgid "Error: Failed to scan hidden SSID: %s."
 msgstr ""
 
-#: ../clients/cli/devices.c:3479
+#: ../clients/cli/devices.c:3605
 #, c-format
 msgid "Error: No network with SSID '%s' found."
 msgstr ""
 
-#: ../clients/cli/devices.c:3481
+#: ../clients/cli/devices.c:3607
 #, c-format
 msgid "Error: No access point with BSSID '%s' found."
 msgstr ""
 
-#: ../clients/cli/devices.c:3551
+#: ../clients/cli/devices.c:3677
 #, c-format
 msgid ""
 "Warning: '%s' should be SSID for hidden APs; but it looks like a BSSID.\n"
 msgstr ""
 
-#: ../clients/cli/devices.c:3588
+#: ../clients/cli/devices.c:3714
 msgid "Password: "
 msgstr ""
 
-#: ../clients/cli/devices.c:3729
+#: ../clients/cli/devices.c:3853
 #, c-format
 msgid "'%s' is not valid WPA PSK"
 msgstr ""
 
-#: ../clients/cli/devices.c:3746
+#: ../clients/cli/devices.c:3870
 #, c-format
 msgid "'%s' is not valid WEP key (it should be 5 or 13 ASCII chars)"
 msgstr ""
 
-#: ../clients/cli/devices.c:3762
+#: ../clients/cli/devices.c:3886
 #, c-format
 msgid "Hotspot password: %s\n"
 msgstr ""
 
-#: ../clients/cli/devices.c:3927
+#: ../clients/cli/devices.c:4054
 #, c-format
 msgid "Error: ssid is too long."
 msgstr ""
 
-#: ../clients/cli/devices.c:3942
+#: ../clients/cli/devices.c:4071
 #, c-format
 msgid "Error: band argument value '%s' is invalid; use 'a' or 'bg'."
 msgstr ""
@@ -2433,110 +2433,110 @@
 msgid "Error: Unknown parameter %s."
 msgstr ""
 
-#: ../clients/cli/devices.c:3989
+#: ../clients/cli/devices.c:4122
 #, c-format
 msgid "Error: channel requires band too."
 msgstr ""
 
-#: ../clients/cli/devices.c:3994
+#: ../clients/cli/devices.c:4128
 #, c-format
 msgid "Error: channel '%s' not valid for band '%s'."
 msgstr ""
 
-#: ../clients/cli/devices.c:4019
+#: ../clients/cli/devices.c:4155
 #, c-format
 msgid "Error: Device '%s' supports neither AP nor Ad-Hoc mode."
 msgstr ""
 
-#: ../clients/cli/devices.c:4041
+#: ../clients/cli/devices.c:4178
 #, c-format
 msgid "Error: Invalid 'password': %s."
 msgstr ""
 
-#: ../clients/cli/devices.c:4094 ../clients/cli/devices.c:4318
+#: ../clients/cli/devices.c:4229 ../clients/cli/devices.c:4454
 #, c-format
 msgid "Error: '%s' cannot repeat."
 msgstr ""
 
 #. Main header name
-#: ../clients/cli/devices.c:4411
+#: ../clients/cli/devices.c:4548
 msgid "Device LLDP neighbors"
 msgstr ""
 
-#: ../clients/cli/devices.c:4521
+#: ../clients/cli/devices.c:4664
 #, c-format
 msgid "Error: 'device lldp list': %s"
 msgstr ""
 
-#: ../clients/cli/general.c:27
+#: ../clients/cli/general.c:32
 msgid "asleep"
 msgstr ""
 
-#: ../clients/cli/general.c:28
+#: ../clients/cli/general.c:33
 msgid "connecting"
 msgstr ""
 
-#: ../clients/cli/general.c:29
+#: ../clients/cli/general.c:34
 msgid "connected (local only)"
 msgstr ""
 
-#: ../clients/cli/general.c:30
+#: ../clients/cli/general.c:35
 msgid "connected (site only)"
 msgstr ""
 
-#: ../clients/cli/general.c:31 ../clients/common/nm-client-utils.c:260
+#: ../clients/cli/general.c:36 ../clients/common/nm-client-utils.c:260
 msgid "connected"
 msgstr ""
 
-#: ../clients/cli/general.c:32
+#: ../clients/cli/general.c:37
 msgid "disconnecting"
 msgstr ""
 
-#: ../clients/cli/general.c:33 ../clients/common/nm-client-utils.c:253
+#: ../clients/cli/general.c:38 ../clients/common/nm-client-utils.c:253
 msgid "disconnected"
 msgstr ""
 
-#: ../clients/cli/common.c:1469
+#: ../clients/cli/common.c:1494
 msgid "none"
 msgstr "ไม่มี"
 
-#: ../clients/cli/common.c:1470
+#: ../clients/cli/common.c:1495
 msgid "portal"
 msgstr ""
 
-#: ../clients/cli/common.c:1471
+#: ../clients/cli/common.c:1496
 msgid "limited"
 msgstr ""
 
-#: ../clients/cli/common.c:1472
+#: ../clients/cli/common.c:1497
 msgid "full"
 msgstr ""
 
-#: ../clients/cli/general.c:124
+#: ../clients/cli/general.c:94
 msgid "auth"
 msgstr ""
 
-#: ../clients/cli/general.c:152
+#: ../clients/cli/general.c:123
 msgid "running"
 msgstr ""
 
-#: ../clients/cli/general.c:166
+#: ../clients/cli/general.c:137
 msgid "starting"
 msgstr ""
 
-#: ../clients/cli/general.c:166
+#: ../clients/cli/general.c:137
 msgid "started"
 msgstr ""
 
-#: ../clients/cli/general.c:200
+#: ../clients/cli/general.c:171
 msgid "enabled"
 msgstr ""
 
-#: ../clients/cli/general.c:200
+#: ../clients/cli/general.c:171
 msgid "disabled"
 msgstr ""
 
-#: ../clients/cli/general.c:318
+#: ../clients/cli/general.c:289
 #, c-format
 msgid ""
 "Usage: nmcli general { COMMAND | help }\n"
@@ -2553,7 +2553,7 @@
 "\n"
 msgstr ""
 
-#: ../clients/cli/general.c:329
+#: ../clients/cli/general.c:300
 #, c-format
 msgid ""
 "Usage: nmcli general status { help }\n"
@@ -2564,7 +2564,7 @@
 "\n"
 msgstr ""
 
-#: ../clients/cli/general.c:338
+#: ../clients/cli/general.c:309
 #, c-format
 msgid ""
 "Usage: nmcli general hostname { ARGUMENTS | help }\n"
@@ -2578,7 +2578,7 @@
 "\n"
 msgstr ""
 
-#: ../clients/cli/general.c:350
+#: ../clients/cli/general.c:321
 #, c-format
 msgid ""
 "Usage: nmcli general permissions { help }\n"
@@ -2587,7 +2587,7 @@
 "\n"
 msgstr ""
 
-#: ../clients/cli/general.c:390
+#: ../clients/cli/general.c:361
 #, c-format
 msgid ""
 "Usage: nmcli general logging { ARGUMENTS | help }\n"
@@ -2603,7 +2603,7 @@
 "\n"
 msgstr ""
 
-#: ../clients/cli/general.c:403
+#: ../clients/cli/general.c:374
 #, c-format
 msgid ""
 "Usage: nmcli networking { COMMAND | help }\n"
@@ -2618,7 +2618,7 @@
 "\n"
 msgstr ""
 
-#: ../clients/cli/general.c:413
+#: ../clients/cli/general.c:384
 #, c-format
 msgid ""
 "Usage: nmcli networking on { help }\n"
@@ -2627,7 +2627,7 @@
 "\n"
 msgstr ""
 
-#: ../clients/cli/general.c:421
+#: ../clients/cli/general.c:392
 #, c-format
 msgid ""
 "Usage: nmcli networking off { help }\n"
@@ -2636,7 +2636,7 @@
 "\n"
 msgstr ""
 
-#: ../clients/cli/general.c:429
+#: ../clients/cli/general.c:400
 #, c-format
 msgid ""
 "Usage: nmcli networking connectivity { ARGUMENTS | help }\n"
@@ -2649,7 +2649,7 @@
 "\n"
 msgstr ""
 
-#: ../clients/cli/general.c:441
+#: ../clients/cli/general.c:412
 #, c-format
 msgid ""
 "Usage: nmcli radio { COMMAND | help }\n"
@@ -2660,7 +2660,7 @@
 "\n"
 msgstr ""
 
-#: ../clients/cli/general.c:450
+#: ../clients/cli/general.c:421
 #, c-format
 msgid ""
 "Usage: nmcli radio all { ARGUMENTS | help }\n"
@@ -2671,7 +2671,7 @@
 "\n"
 msgstr ""
 
-#: ../clients/cli/general.c:460
+#: ../clients/cli/general.c:431
 #, c-format
 msgid ""
 "Usage: nmcli radio wifi { ARGUMENTS | help }\n"
@@ -2682,7 +2682,7 @@
 "\n"
 msgstr ""
 
-#: ../clients/cli/general.c:470
+#: ../clients/cli/general.c:441
 #, c-format
 msgid ""
 "Usage: nmcli radio wwan { ARGUMENTS | help }\n"
@@ -2693,7 +2693,7 @@
 "\n"
 msgstr ""
 
-#: ../clients/cli/general.c:480
+#: ../clients/cli/general.c:451
 #, c-format
 msgid ""
 "Usage: nmcli monitor\n"
@@ -2703,34 +2703,34 @@
 "\n"
 msgstr ""
 
-#: ../clients/cli/general.c:510
+#: ../clients/cli/general.c:481
 msgid "NetworkManager status"
 msgstr ""
 
-#: ../clients/cli/general.c:514
+#: ../clients/cli/general.c:485
 #, c-format
 msgid "Error: only these fields are allowed: %s"
 msgstr ""
 
-#: ../clients/cli/general.c:567
+#: ../clients/cli/general.c:561
 msgid "NetworkManager permissions"
 msgstr ""
 
-#: ../clients/cli/general.c:571
+#: ../clients/cli/general.c:565
 #, c-format
 msgid "Error: 'general permissions': %s"
 msgstr ""
 
-#: ../clients/cli/general.c:727
+#: ../clients/cli/general.c:704
 msgid "NetworkManager logging"
 msgstr ""
 
-#: ../clients/cli/general.c:731
+#: ../clients/cli/general.c:708
 #, c-format
 msgid "Error: 'general logging': %s"
 msgstr ""
 
-#: ../clients/cli/general.c:813
+#: ../clients/cli/general.c:740
 #, c-format
 msgid "Error: failed to set logging: %s"
 msgstr ""
@@ -2740,141 +2740,141 @@
 msgid "Error: failed to set hostname: %s"
 msgstr ""
 
-#: ../clients/cli/general.c:900
+#: ../clients/cli/general.c:891
 #, c-format
 msgid "Error: '--fields' value '%s' is not valid here (allowed field: %s)"
 msgstr ""
 
-#: ../clients/cli/general.c:925
+#: ../clients/cli/general.c:916
 #, c-format
 msgid "Error: invalid '%s' argument: '%s' (use on/off)."
 msgstr ""
 
 #. no arguments -> get current state
-#: ../clients/cli/general.c:973 ../clients/cli/general.c:985
+#: ../clients/cli/general.c:984 ../clients/cli/general.c:996
 msgid "Connectivity"
 msgstr ""
 
-#: ../clients/cli/general.c:988
+#: ../clients/cli/general.c:999
 #, c-format
 msgid "Error: 'networking' command '%s' is not valid."
 msgstr ""
 
-#: ../clients/cli/general.c:1002
+#: ../clients/cli/general.c:1011
 msgid "Networking"
 msgstr ""
 
 #. no argument, show all radio switches
-#: ../clients/cli/general.c:1037
+#: ../clients/cli/general.c:1039
 msgid "Radio switches"
 msgstr ""
 
 #. no argument, show current Wi-Fi state
-#: ../clients/cli/general.c:1067
+#: ../clients/cli/general.c:1082
 msgid "Wi-Fi radio switch"
 msgstr ""
 
 #. no argument, show current WWAN (mobile broadband) state
-#: ../clients/cli/general.c:1094
+#: ../clients/cli/general.c:1118
 msgid "WWAN radio switch"
 msgstr ""
 
-#: ../clients/cli/general.c:1142
+#: ../clients/cli/general.c:1158
 msgid "NetworkManager has started"
 msgstr ""
 
-#: ../clients/cli/general.c:1142
+#: ../clients/cli/general.c:1158
 msgid "NetworkManager has stopped"
 msgstr ""
 
-#: ../clients/cli/general.c:1153
+#: ../clients/cli/general.c:1169
 #, c-format
 msgid "Hostname set to '%s'\n"
 msgstr ""
 
-#: ../clients/cli/general.c:1168
+#: ../clients/cli/general.c:1184
 #, c-format
 msgid "'%s' is now the primary connection\n"
 msgstr ""
 
-#: ../clients/cli/general.c:1170
+#: ../clients/cli/general.c:1186
 #, c-format
 msgid "There's no primary connection\n"
 msgstr ""
 
-#: ../clients/cli/general.c:1182
+#: ../clients/cli/general.c:1198
 #, c-format
 msgid "Connectivity is now '%s'\n"
 msgstr ""
 
-#: ../clients/cli/general.c:1196
+#: ../clients/cli/general.c:1212
 #, c-format
 msgid "Networkmanager is now in the '%s' state\n"
 msgstr ""
 
-#: ../clients/cli/general.c:1216
+#: ../clients/cli/general.c:1232
 msgid "connection available"
 msgstr ""
 
-#: ../clients/cli/general.c:1218
+#: ../clients/cli/general.c:1234
 msgid "connections available"
 msgstr ""
 
-#: ../clients/cli/general.c:1236
+#: ../clients/cli/general.c:1252
 msgid "autoconnect"
 msgstr ""
 
-#: ../clients/cli/general.c:1238
+#: ../clients/cli/general.c:1254
 msgid "fw missing"
 msgstr ""
 
-#: ../clients/cli/general.c:1243
+#: ../clients/cli/general.c:1259
 msgid "plugin missing"
 msgstr ""
 
-#: ../clients/cli/general.c:1283
+#: ../clients/cli/general.c:1299
 msgid "sw"
 msgstr ""
 
-#: ../clients/cli/general.c:1285
+#: ../clients/cli/general.c:1301
 msgid "hw"
 msgstr ""
 
-#: ../clients/cli/general.c:1290
+#: ../clients/cli/general.c:1306
 msgid "iface"
 msgstr ""
 
-#: ../clients/cli/general.c:1293
+#: ../clients/cli/general.c:1309
 msgid "port"
 msgstr ""
 
-#: ../clients/cli/general.c:1296
+#: ../clients/cli/general.c:1312
 msgid "mtu"
 msgstr ""
 
-#: ../clients/cli/general.c:1313
+#: ../clients/cli/general.c:1329
 msgid "master"
 msgstr ""
 
-#: ../clients/cli/general.c:1317 ../clients/tui/nm-editor-utils.c:235
+#: ../clients/cli/general.c:1333 ../clients/tui/nm-editor-utils.c:230
 #: ../clients/tui/nmt-connect-connection-list.c:394
 msgid "VPN"
 msgstr ""
 
-#: ../clients/cli/general.c:1319
+#: ../clients/cli/general.c:1335
 msgid "ip4 default"
 msgstr ""
 
-#: ../clients/cli/general.c:1321
+#: ../clients/cli/general.c:1337
 msgid "ip6 default"
 msgstr ""
 
-#: ../clients/cli/general.c:1403
+#: ../clients/cli/general.c:1416
 #, c-format
 msgid "%s VPN connection"
 msgstr ""
 
-#: ../clients/cli/general.c:1350
+#: ../clients/cli/general.c:1386
 #, c-format
 msgid ""
 "Use \"nmcli device show\" to get complete information about known devices "
@@ -2885,12 +2885,12 @@
 "details.\n"
 msgstr ""
 
-#: ../clients/cli/general.c:1501
+#: ../clients/cli/general.c:1509
 #, c-format
 msgid "Error: 'monitor' command '%s' is not valid."
 msgstr ""
 
-#: ../clients/cli/general.c:1513
+#: ../clients/cli/general.c:1521
 msgid "Networkmanager is not running (waiting for it)\n"
 msgstr ""
 
@@ -2928,62 +2928,62 @@
 "\n"
 msgstr ""
 
-#: ../clients/cli/nmcli.c:310
+#: ../clients/cli/nmcli.c:306
 #, c-format
 msgid "Error: missing argument for '%s' option."
 msgstr ""
 
-#: ../clients/cli/nmcli.c:741
+#: ../clients/cli/nmcli.c:757
 #, c-format
 msgid "Error: Option '--terse' is specified the second time."
 msgstr ""
 
-#: ../clients/cli/nmcli.c:746
+#: ../clients/cli/nmcli.c:762
 #, c-format
 msgid "Error: Option '--terse' is mutually exclusive with '--pretty'."
 msgstr ""
 
-#: ../clients/cli/nmcli.c:754
+#: ../clients/cli/nmcli.c:770
 #, c-format
 msgid "Error: Option '--pretty' is specified the second time."
 msgstr ""
 
-#: ../clients/cli/nmcli.c:759
+#: ../clients/cli/nmcli.c:775
 #, c-format
 msgid "Error: Option '--pretty' is mutually exclusive with '--terse'."
 msgstr ""
 
-#: ../clients/cli/nmcli.c:774
+#: ../clients/cli/nmcli.c:790
 #, c-format
 msgid "Error: '%s' is not a valid argument for '%s' option."
 msgstr ""
 
-#: ../clients/cli/nmcli.c:788 ../clients/cli/nmcli.c:800
+#: ../clients/cli/nmcli.c:804 ../clients/cli/nmcli.c:816
 #, c-format
 msgid "Error: '%s' is not valid argument for '%s' option."
 msgstr ""
 
-#: ../clients/cli/nmcli.c:824
+#: ../clients/cli/nmcli.c:840
 #, c-format
 msgid "Error: '%s' is not a valid timeout."
 msgstr ""
 
-#: ../clients/cli/nmcli.c:831
+#: ../clients/cli/nmcli.c:847
 #, c-format
 msgid "nmcli tool, version %s\n"
 msgstr ""
 
-#: ../clients/cli/nmcli.c:839
+#: ../clients/cli/nmcli.c:855
 #, c-format
 msgid "Error: Option '%s' is unknown, try 'nmcli -help'."
 msgstr ""
 
-#: ../clients/cli/nmcli.c:895 ../clients/cli/nmcli.c:902
+#: ../clients/cli/nmcli.c:911 ../clients/cli/nmcli.c:918
 #, c-format
 msgid "Error: nmcli terminated by signal %s (%d)"
 msgstr ""
 
-#: ../clients/cli/nmcli.c:968
+#: ../clients/cli/nmcli.c:986
 msgid "Success"
 msgstr ""
 
@@ -2997,7 +2997,7 @@
 msgid "Authentication error: %s\n"
 msgstr ""
 
-#: ../clients/cli/polkit-agent.c:122
+#: ../clients/cli/polkit-agent.c:99
 #, c-format
 msgid "Warning: polkit agent initialization failed: %s\n"
 msgstr ""
@@ -3052,19 +3052,19 @@
 msgid "Info: %s\n"
 msgstr ""
 
-#: ../clients/cli/settings.c:490
+#: ../clients/cli/settings.c:488
 msgid "don't know how to get the property value"
 msgstr ""
 
-#: ../clients/cli/settings.c:580
+#: ../clients/cli/settings.c:578
 msgid "the property can't be changed"
 msgstr ""
 
-#: ../clients/cli/settings.c:658
+#: ../clients/cli/settings.c:656
 msgid "[NM property description]"
 msgstr ""
 
-#: ../clients/cli/settings.c:668
+#: ../clients/cli/settings.c:666
 msgid "[nmcli specific description]"
 msgstr ""
 
@@ -3078,42 +3078,42 @@
 msgid "Error: Unexpected argument '%s'"
 msgstr ""
 
-#: ../clients/cli/utils.c:695
+#: ../clients/cli/utils.c:691
 #, c-format
 msgid "invalid field '%s%s%s'; no such field"
 msgstr ""
 
-#: ../clients/cli/utils.c:699
+#: ../clients/cli/utils.c:695
 #, c-format
 msgid "invalid field '%s%s%s'; allowed fields: [%s]"
 msgstr ""
 
-#: ../clients/cli/utils.c:795
+#: ../clients/cli/utils.c:791
 #, c-format
 msgid "failure to select field"
 msgstr ""
 
-#: ../clients/cli/utils.c:1424
+#: ../clients/cli/utils.c:1427
 #, c-format
 msgid "Error reading nmcli output: %s\n"
 msgstr ""
 
-#: ../clients/cli/utils.c:1429
+#: ../clients/cli/utils.c:1432
 #, c-format
 msgid "Error writing nmcli output: %s\n"
 msgstr ""
 
-#: ../clients/cli/utils.c:1455
+#: ../clients/cli/utils.c:1458
 #, c-format
 msgid "Failed to create pager pipe: %s\n"
 msgstr ""
 
-#: ../clients/cli/utils.c:1464
+#: ../clients/cli/utils.c:1467
 #, c-format
 msgid "Failed to fork pager: %s\n"
 msgstr ""
 
-#: ../clients/cli/utils.c:1511 ../clients/cli/utils.c:1515
+#: ../clients/cli/utils.c:1514 ../clients/cli/utils.c:1518
 #, c-format
 msgid "Failed to duplicate pager pipe: %s\n"
 msgstr ""
@@ -3455,7 +3455,7 @@
 #. TRANSLATORS: Unknown reason for a device state change (NMDeviceStateReason)
 #. TRANSLATORS: Unknown reason for a connection state change (NMActiveConnectionStateReason)
 #: ../clients/common/nm-client-utils.c:277
-#: ../clients/common/nm-client-utils.c:350 ../libnm/nm-device.c:1514
+#: ../clients/common/nm-client-utils.c:350 ../libnm/nm-device.c:1583
 msgid "Unknown"
 msgstr "ไม่มีข้อมูล"
 
@@ -3529,34 +3529,34 @@
 msgid "invalid field '%s%s%s%s%s'; %s%s%s"
 msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:297
-#: ../clients/common/nm-meta-setting-desc.c:358
+#: ../clients/common/nm-meta-setting-desc.c:276
+#: ../clients/common/nm-meta-setting-desc.c:337
 #, c-format
 msgid "invalid prefix '%s'; <1-%d> allowed"
 msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:305
+#: ../clients/common/nm-meta-setting-desc.c:284
 #, c-format
 msgid "invalid IP address: %s"
 msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:330
+#: ../clients/common/nm-meta-setting-desc.c:309
 msgid ""
 "The valid syntax is: 'ip[/prefix] [next-hop] [metric] [attribute=val]... "
 "[,ip[/prefix] ...]'"
 msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:369
+#: ../clients/common/nm-meta-setting-desc.c:348
 #, c-format
 msgid "the next hop ('%s') must be first"
 msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:375
+#: ../clients/common/nm-meta-setting-desc.c:354
 #, c-format
 msgid "the metric ('%s') must be before attributes"
 msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:423
+#: ../clients/common/nm-meta-setting-desc.c:402
 #, c-format
 msgid "invalid route: %s. %s"
 msgstr ""
@@ -3565,53 +3565,53 @@
 msgid "default route cannot be added (NetworkManager handles it by itself)"
 msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:3816
+#: ../clients/common/nm-meta-setting-desc.c:3781
 #, c-format
 msgid "invalid priority map '%s'"
 msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:440
-#: ../clients/common/nm-meta-setting-desc.c:446
+#: ../clients/common/nm-meta-setting-desc.c:432
+#: ../clients/common/nm-meta-setting-desc.c:438
 #, c-format
 msgid "priority '%s' is not valid (<0-%ld>)"
 msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:489
+#: ../clients/common/nm-meta-setting-desc.c:468
 #, c-format
 msgid "cannot read pac-script from file '%s'"
 msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:496
+#: ../clients/common/nm-meta-setting-desc.c:475
 #, c-format
 msgid "file '%s' contains non-valid utf-8"
 msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:509
+#: ../clients/common/nm-meta-setting-desc.c:488
 #, c-format
 msgid "'%s' does not contain a valid PAC Script"
 msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:512
+#: ../clients/common/nm-meta-setting-desc.c:491
 #, c-format
 msgid "Not a valid PAC Script"
 msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:565
+#: ../clients/common/nm-meta-setting-desc.c:544
 #, c-format
 msgid "cannot read team config from file '%s'"
 msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:572
+#: ../clients/common/nm-meta-setting-desc.c:551
 #, c-format
 msgid "team config file '%s' contains non-valid utf-8"
 msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:594
+#: ../clients/common/nm-meta-setting-desc.c:586
 #, c-format
 msgid "'%s' does not contain a valid team configuration"
 msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:597
+#: ../clients/common/nm-meta-setting-desc.c:589
 #, c-format
 msgid "team configuration must be a JSON object"
 msgstr ""
@@ -3620,11 +3620,11 @@
 msgid "(default)"
 msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:1029
+#: ../clients/common/nm-meta-setting-desc.c:1018
 msgid "auto"
 msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:1181
+#: ../clients/common/nm-meta-setting-desc.c:1170
 #, c-format
 msgid "%s (%s)"
 msgstr ""
@@ -3634,17 +3634,17 @@
 msgid "'%s' is out of range [%lli, %lli]"
 msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:1338
+#: ../clients/common/nm-meta-setting-desc.c:1327
 #, c-format
 msgid "'%s' is not a valid number"
 msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:1395
+#: ../clients/common/nm-meta-setting-desc.c:1384
 #, c-format
 msgid "'%s' is out of range [0, %u]"
 msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:1441
+#: ../clients/common/nm-meta-setting-desc.c:1430
 #, c-format
 msgid "'%s' is not a valid Ethernet MAC"
 msgstr ""
@@ -3659,48 +3659,49 @@
 msgid "'%s' sum is higher than all flags => all flags set"
 msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:1567
+#: ../clients/common/nm-meta-setting-desc.c:1556
 #, c-format
 msgid "invalid option '%s', use a combination of [%s]"
 msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:1572 ../libnm-core/nm-keyfile.c:926
+#: ../clients/common/nm-meta-setting-desc.c:1561
+#: ../shared/nm-keyfile/nm-keyfile.c:927
 #, c-format
 msgid "invalid option '%s', use one of [%s]"
 msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:1691
+#: ../clients/common/nm-meta-setting-desc.c:1680
 #, c-format
 msgid "%d (key)"
 msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:1693
+#: ../clients/common/nm-meta-setting-desc.c:1682
 #, c-format
 msgid "%d (passphrase)"
 msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:1696
+#: ../clients/common/nm-meta-setting-desc.c:1685
 #, c-format
 msgid "%d (unknown)"
 msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:1709
+#: ../clients/common/nm-meta-setting-desc.c:1698
 msgid "0 (NONE)"
 msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:1715
+#: ../clients/common/nm-meta-setting-desc.c:1704
 msgid "REORDER_HEADERS, "
 msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:1717
+#: ../clients/common/nm-meta-setting-desc.c:1706
 msgid "GVRP, "
 msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:1719
+#: ../clients/common/nm-meta-setting-desc.c:1708
 msgid "LOOSE_BINDING, "
 msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:1721
+#: ../clients/common/nm-meta-setting-desc.c:1710
 msgid "MVRP, "
 msgstr ""
 
@@ -3719,89 +3720,89 @@
 msgid "%d (enabled, prefer temporary IP)"
 msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:1742
+#: ../clients/common/nm-meta-setting-desc.c:1731
 msgid "0 (none)"
 msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:1748
+#: ../clients/common/nm-meta-setting-desc.c:1737
 msgid "agent-owned, "
 msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:1750
+#: ../clients/common/nm-meta-setting-desc.c:1739
 msgid "not saved, "
 msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:1752
+#: ../clients/common/nm-meta-setting-desc.c:1741
 msgid "not required, "
 msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:1970
+#: ../clients/common/nm-meta-setting-desc.c:1941
 #, c-format
 msgid "'%s' is not valid; use <option>=<value>"
 msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:1703
+#: ../clients/common/nm-meta-setting-desc.c:1649
 msgid "no item to remove"
 msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:1707
+#: ../clients/common/nm-meta-setting-desc.c:1653
 #, c-format
 msgid "index '%d' is not in range <0-%d>"
 msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:1722
+#: ../clients/common/nm-meta-setting-desc.c:1668
 #, c-format
 msgid "invalid option '%s'"
 msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:1724
+#: ../clients/common/nm-meta-setting-desc.c:1670
 msgid "missing option"
 msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:1748
+#: ../clients/common/nm-meta-setting-desc.c:1694
 #, c-format
 msgid "'%s' is not a valid MAC"
 msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:2077
-#: ../clients/common/nm-meta-setting-desc.c:4052
+#: ../clients/common/nm-meta-setting-desc.c:2048
+#: ../clients/common/nm-meta-setting-desc.c:4021
 #: ../libnm-core/nm-setting-ovs-bridge.c:183 ../src/nm-config.c:556
 #, c-format
 msgid "'%s' is not valid"
 msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:2039
+#: ../clients/common/nm-meta-setting-desc.c:2010
 #, c-format
 msgid "'%u' flags are not valid; use combination of %s"
 msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:2056
+#: ../clients/common/nm-meta-setting-desc.c:2027
 #, c-format
 msgid "'%s' is not a valid number (or out of range)"
 msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:2190
+#: ../clients/common/nm-meta-setting-desc.c:2159
 #, c-format
 msgid "'%s' is not a valid hex character"
 msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:2266
+#: ../clients/common/nm-meta-setting-desc.c:2200
 #, c-format
 msgid "the property doesn't contain EAP method '%s'"
 msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:2289
+#: ../clients/common/nm-meta-setting-desc.c:2223
 #, c-format
 msgid "the property doesn't contain alternative subject match '%s'"
 msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:2315
+#: ../clients/common/nm-meta-setting-desc.c:2249
 #, c-format
 msgid ""
 "the property doesn't contain \"phase2\" alternative subject match '%s'"
 msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:2393
+#: ../clients/common/nm-meta-setting-desc.c:2370
 #, c-format
 msgid ""
 "Enter a list of bonding options formatted as:\n"
@@ -3826,136 +3827,138 @@
 #. * hacky: we can not see if the type is already set, because
 #. * nmc_setting_set_property() is called only after the property
 #. * we're setting (type) has been removed.
-#: ../clients/common/nm-meta-setting-desc.c:2458
+#: ../clients/common/nm-meta-setting-desc.c:2435
 #, c-format
 msgid "Can not change the connection type"
 msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:2597
+#: ../clients/common/nm-meta-setting-desc.c:2540
 #, c-format
 msgid "the property doesn't contain permission '%s'"
 msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:2580
+#: ../clients/common/nm-meta-setting-desc.c:2567
 #, c-format
 msgid "'%s' is not valid master; use ifname or connection UUID"
 msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:2661
+#: ../clients/common/nm-meta-setting-desc.c:2620
 #, c-format
 msgid "the value '%s' is not a valid UUID"
 msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:2722
+#: ../clients/common/nm-meta-setting-desc.c:2667
 #, c-format
 msgid "the property doesn't contain UUID '%s'"
 msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:2732
+#: ../clients/common/nm-meta-setting-desc.c:2691
 msgid "0 (disabled)"
 msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:2738
+#: ../clients/common/nm-meta-setting-desc.c:2697
 msgid "enabled, "
 msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:2740
+#: ../clients/common/nm-meta-setting-desc.c:2699
 msgid "advertise, "
 msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:2742
+#: ../clients/common/nm-meta-setting-desc.c:2701
 msgid "willing, "
 msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:2831
+#: ../clients/common/nm-meta-setting-desc.c:2790
 #, c-format
 msgid "'%s' is not a valid DCB flag"
 msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:2858
+#: ../clients/common/nm-meta-setting-desc.c:2817
 msgid "must contain 8 comma-separated numbers"
 msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:2872
+#: ../clients/common/nm-meta-setting-desc.c:2831
 #, c-format
 msgid "'%s' not a number between 0 and %u (inclusive) or %u"
 msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:2875
+#: ../clients/common/nm-meta-setting-desc.c:2834
 #, c-format
 msgid "'%s' not a number between 0 and %u (inclusive)"
 msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:2896
+#: ../clients/common/nm-meta-setting-desc.c:2855
 #, c-format
 msgid "changes will have no effect until '%s' includes 1 (enabled)"
 msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:2926
+#: ../clients/common/nm-meta-setting-desc.c:2885
 #, c-format
 msgid "bandwidth percentages must total 100%%"
 msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:2997
-#: ../clients/common/nm-meta-setting-desc.c:3003
+#: ../clients/common/nm-meta-setting-desc.c:2956
+#: ../clients/common/nm-meta-setting-desc.c:2962
 msgid "SIM operator ID must be a 5 or 6 number MCCMNC code"
 msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:3027
+#: ../clients/common/nm-meta-setting-desc.c:2986
 #, c-format
 msgid "'%s' is not a valid IBoIP P_Key"
 msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:3050
+#: ../clients/common/nm-meta-setting-desc.c:3009
 msgid "default"
 msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:3312
-#: ../clients/common/nm-meta-setting-desc.c:3329
+#: ../clients/common/nm-meta-setting-desc.c:3249
+#: ../clients/common/nm-meta-setting-desc.c:3268
 #, c-format
 msgid "invalid IPv4 address '%s'"
 msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:3335
-#: ../clients/common/nm-meta-setting-desc.c:3582
+#: ../clients/common/nm-meta-setting-desc.c:3274
+#: ../clients/common/nm-meta-setting-desc.c:3528
 #, c-format
 msgid "the property doesn't contain DNS server '%s'"
 msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:3373
+#: ../clients/common/nm-meta-setting-desc.c:3314
+#: ../clients/common/nm-meta-setting-desc.c:3568
 #, c-format
 msgid "the property doesn't contain DNS search domain '%s'"
 msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:3413
+#: ../clients/common/nm-meta-setting-desc.c:3351
+#: ../clients/common/nm-meta-setting-desc.c:3605
 #, c-format
 msgid "the property doesn't contain DNS option '%s'"
 msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:3456
-#: ../clients/common/nm-meta-setting-desc.c:3630
+#: ../clients/common/nm-meta-setting-desc.c:3394
+#: ../clients/common/nm-meta-setting-desc.c:3654
 #, c-format
 msgid "the property doesn't contain IP address '%s'"
 msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:3341
+#: ../clients/common/nm-meta-setting-desc.c:3300
 #, c-format
 msgid "invalid gateway address '%s'"
 msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:3515
-#: ../clients/common/nm-meta-setting-desc.c:3690
+#: ../clients/common/nm-meta-setting-desc.c:3453
+#: ../clients/common/nm-meta-setting-desc.c:3714
 #, c-format
 msgid "the property doesn't contain route '%s'"
 msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:3559
-#: ../clients/common/nm-meta-setting-desc.c:3576
+#: ../clients/common/nm-meta-setting-desc.c:3503
+#: ../clients/common/nm-meta-setting-desc.c:3522
 #, c-format
 msgid "invalid IPv6 address '%s'"
 msgstr ""
 
-#: ../libnm-core/nm-setting-gsm.c:372
+#: ../libnm-core/nm-setting-gsm.c:366
 #, c-format
 msgid "'%s' is not a number"
 msgstr ""
@@ -3965,92 +3968,92 @@
 msgid "'%s' is not valid; use 0, 1, or 2"
 msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:3491
+#: ../clients/common/nm-meta-setting-desc.c:3456
 #, c-format
 msgid "'%s' is not a valid channel; use <1-13>"
 msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:3903
+#: ../clients/common/nm-meta-setting-desc.c:3833
 msgid ""
 "The valid syntax is: '[root | parent <handle>] [handle <handle>] <qdisc>'"
 msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:3954
+#: ../clients/common/nm-meta-setting-desc.c:3856
 #, c-format
 msgid "the property doesn't contain qdisc '%s'"
 msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:4008
+#: ../clients/common/nm-meta-setting-desc.c:3909
 msgid ""
 "The valid syntax is: '[root | parent <handle>] [handle <handle>] <tfilter>'"
 msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:4031
+#: ../clients/common/nm-meta-setting-desc.c:3932
 #, c-format
 msgid "the property doesn't contain tfilter '%s'"
 msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:4098
+#: ../clients/common/nm-meta-setting-desc.c:4003
 #, c-format
 msgid "the property doesn't contain string '%s'"
 msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:4173
-#: ../clients/common/nm-meta-setting-desc.c:4247
+#: ../clients/common/nm-meta-setting-desc.c:4077
+#: ../clients/common/nm-meta-setting-desc.c:4150
 #, c-format
 msgid "the property doesn't contain link watcher '%s'"
 msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:4353
+#: ../clients/common/nm-meta-setting-desc.c:4241
 #, c-format
 msgid "only one mapping at a time is supported; taking the first one (%s)"
 msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:4361
+#: ../clients/common/nm-meta-setting-desc.c:4249
 #, c-format
 msgid "the property doesn't contain mapping '%s'"
 msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:4369
+#: ../clients/common/nm-meta-setting-desc.c:4257
 msgid "no priority to remove"
 msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:4373
+#: ../clients/common/nm-meta-setting-desc.c:4261
 #, c-format
 msgid "index '%d' is not in the range of <0-%d>"
 msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:4442
+#: ../clients/common/nm-meta-setting-desc.c:4330
 #, c-format
 msgid "'%s' cannot be empty"
 msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:4001
+#: ../clients/common/nm-meta-setting-desc.c:3970
 #: ../libnm-core/nm-setting-sriov.c:438 ../libnm-core/nm-setting-wired.c:758
 #: ../libnm-core/nm-setting-wired.c:771 ../libnm-core/nm-setting-wired.c:824
-#: ../libnm-core/nm-setting-wired.c:867 ../libnm-core/nm-setting-wireless.c:876
-#: ../libnm-core/nm-setting-wireless.c:892
+#: ../libnm-core/nm-setting-wired.c:867 ../libnm-core/nm-setting-wireless.c:881
+#: ../libnm-core/nm-setting-wireless.c:897
 #, c-format
 msgid "'%s' is not a valid MAC address"
 msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:4487
-#: ../clients/common/nm-meta-setting-desc.c:4618
+#: ../clients/common/nm-meta-setting-desc.c:4375
+#: ../clients/common/nm-meta-setting-desc.c:4508
 #, c-format
 msgid "the property doesn't contain MAC address '%s'"
 msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:3904
+#: ../clients/common/nm-meta-setting-desc.c:3873
 #, c-format
 msgid "'%s' is not valid; 2 or 3 strings should be provided"
 msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:4519
+#: ../clients/common/nm-meta-setting-desc.c:4409
 #, c-format
 msgid "'%s' string value should consist of 1 - 199 characters"
 msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:3943
+#: ../clients/common/nm-meta-setting-desc.c:3912
 #, c-format
 msgid ""
 "Enter a list of S/390 options formatted as:\n"
@@ -4058,41 +4061,41 @@
 "Valid options are: %s\n"
 msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:3978
+#: ../clients/common/nm-meta-setting-desc.c:3947
 #, c-format
 msgid "'%s' is not a valid channel"
 msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:3984
+#: ../clients/common/nm-meta-setting-desc.c:3953
 #, c-format
 msgid "'%ld' is not a valid channel"
 msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:4674
-#: ../clients/common/nm-meta-setting-desc.c:4710
-#: ../clients/common/nm-meta-setting-desc.c:4746
+#: ../clients/common/nm-meta-setting-desc.c:4580
+#: ../clients/common/nm-meta-setting-desc.c:4616
+#: ../clients/common/nm-meta-setting-desc.c:4652
 #, c-format
 msgid "the property doesn't contain protocol '%s'"
 msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:4061
+#: ../clients/common/nm-meta-setting-desc.c:4030
 #, c-format
 msgid ""
 "'%s' not compatible with %s '%s', please change the key or set the right %s "
 "first."
 msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:4071
+#: ../clients/common/nm-meta-setting-desc.c:4040
 #, c-format
 msgid "WEP key is guessed to be of '%s'"
 msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:4076
+#: ../clients/common/nm-meta-setting-desc.c:4045
 #, c-format
 msgid "WEP key index set to '%d'"
 msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:4115
+#: ../clients/common/nm-meta-setting-desc.c:4084
 #, c-format
 msgid ""
 "'%s' is not compatible with '%s' type, please change or delete the key."
@@ -4103,42 +4106,42 @@
 msgid "'%s' is not a valid PSK"
 msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:4232
+#: ../clients/common/nm-meta-setting-desc.c:4200
 msgid "Bonding primary interface [none]"
 msgstr ""
 
 #. this is a virtual property, only needed during "ask" mode.
-#: ../clients/common/nm-meta-setting-desc.c:4239
+#: ../clients/common/nm-meta-setting-desc.c:4207
 msgid "Bonding monitoring mode"
 msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:4248
+#: ../clients/common/nm-meta-setting-desc.c:4216
 msgid "Bonding miimon [100]"
 msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:4256
+#: ../clients/common/nm-meta-setting-desc.c:4224
 msgid "Bonding downdelay [0]"
 msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:4264
+#: ../clients/common/nm-meta-setting-desc.c:4232
 msgid "Bonding updelay [0]"
 msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:4272
+#: ../clients/common/nm-meta-setting-desc.c:4240
 msgid "Bonding arp-interval [0]"
 msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:4280
+#: ../clients/common/nm-meta-setting-desc.c:4248
 msgid "Bonding arp-ip-target [none]"
 msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:4288
+#: ../clients/common/nm-meta-setting-desc.c:4256
 msgid "LACP rate ('slow' or 'fast') [slow]"
 msgstr ""
 
 #. macro that returns @func as const (guint32(*)(NMSetting*)) type, but checks
 #. * that the actual type is (guint32(*)(type *)).
-#: ../clients/common/nm-meta-setting-desc.c:4455
+#: ../clients/common/nm-meta-setting-desc.c:4423
 msgid ""
 "nmcli can accepts both direct JSON configuration data and a file name "
 "containing the configuration. In the latter case the file is read and the "
@@ -4149,7 +4152,7 @@
 "          set team.config /etc/my-team.conf\n"
 msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:4463
+#: ../clients/common/nm-meta-setting-desc.c:4431
 msgid ""
 "Enter a list of link watchers formatted as dictionaries where the keys are "
 "teamd properties. Dictionary pairs are in the form: key=value and pairs are "
@@ -4175,7 +4178,7 @@
 "name=ethtool delay-up=3\n"
 msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:4532
+#: ../clients/common/nm-meta-setting-desc.c:4516
 msgid ""
 "Enter file path to CA certificate (optionally prefixed with file://).\n"
 "  [file://]<file path>\n"
@@ -4183,7 +4186,7 @@
 "Example: /home/cimrman/cacert.crt\n"
 msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:4571
+#: ../clients/common/nm-meta-setting-desc.c:4558
 msgid ""
 "Enter file path to client certificate (optionally prefixed with file://).\n"
 "  [file://]<file path>\n"
@@ -4191,7 +4194,7 @@
 "Example: /home/cimrman/jara.crt\n"
 msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:4628
+#: ../clients/common/nm-meta-setting-desc.c:4615
 msgid ""
 "Enter file path to CA certificate for inner authentication (optionally "
 "prefixed\n"
@@ -4201,7 +4204,7 @@
 "Example: /home/cimrman/ca-zweite-phase.crt\n"
 msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:4668
+#: ../clients/common/nm-meta-setting-desc.c:4658
 msgid ""
 "Enter file path to client certificate for inner authentication (optionally "
 "prefixed\n"
@@ -4211,7 +4214,7 @@
 "Example: /home/cimrman/jara-zweite-phase.crt\n"
 msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:4695
+#: ../clients/common/nm-meta-setting-desc.c:4685
 msgid ""
 "Enter bytes as a list of hexadecimal values.\n"
 "Two formats are accepted:\n"
@@ -4224,8 +4227,8 @@
 "          ab 4 55 0xa6 ea 3a 74 C2\n"
 msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:4712
-#: ../clients/common/nm-meta-setting-desc.c:4730
+#: ../clients/common/nm-meta-setting-desc.c:4702
+#: ../clients/common/nm-meta-setting-desc.c:4720
 msgid ""
 "Enter path to a private key and the key password (if not set yet):\n"
 "  [file://]<file path> [<password>]\n"
@@ -4233,84 +4236,84 @@
 "Example: /home/cimrman/jara-priv-key Dardanely\n"
 msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:4769
+#: ../clients/common/nm-meta-setting-desc.c:4759
 #: ../clients/common/nm-secret-agent-simple.c:268
 #: ../clients/common/nm-secret-agent-simple.c:356
-#: ../clients/tui/nmt-page-dsl.c:53 ../clients/tui/nmt-page-wifi.c:321
+#: ../clients/tui/nmt-page-dsl.c:53 ../clients/tui/nmt-page-wifi.c:322
 msgid "Username"
 msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:4775
-#: ../clients/common/nm-meta-setting-desc.c:4990
-#: ../clients/common/nm-meta-setting-desc.c:5385
-#: ../clients/common/nm-meta-setting-desc.c:6328
+#: ../clients/common/nm-meta-setting-desc.c:4765
+#: ../clients/common/nm-meta-setting-desc.c:5013
+#: ../clients/common/nm-meta-setting-desc.c:5410
+#: ../clients/common/nm-meta-setting-desc.c:6350
 msgid "Password [none]"
 msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:4821
+#: ../clients/common/nm-meta-setting-desc.c:4811
 msgid "Bluetooth device address"
 msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:4869
-#: ../clients/common/nm-meta-setting-desc.c:5438
-#: ../clients/common/nm-meta-setting-desc.c:7024
-#: ../clients/common/nm-meta-setting-desc.c:7062
-#: ../clients/common/nm-meta-setting-desc.c:7244
-#: ../clients/common/nm-meta-setting-desc.c:7474
+#: ../clients/common/nm-meta-setting-desc.c:4859
+#: ../clients/common/nm-meta-setting-desc.c:5463
+#: ../clients/common/nm-meta-setting-desc.c:7058
+#: ../clients/common/nm-meta-setting-desc.c:7096
+#: ../clients/common/nm-meta-setting-desc.c:7278
+#: ../clients/common/nm-meta-setting-desc.c:7508
 msgid "MAC [none]"
 msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:4875
+#: ../clients/common/nm-meta-setting-desc.c:4865
 msgid "Enable STP [no]"
 msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:4881
+#: ../clients/common/nm-meta-setting-desc.c:4871
 msgid "STP priority [32768]"
 msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:4887
+#: ../clients/common/nm-meta-setting-desc.c:4877
 msgid "Forward delay [15]"
 msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:4893
+#: ../clients/common/nm-meta-setting-desc.c:4883
 msgid "Hello time [2]"
 msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:4899
+#: ../clients/common/nm-meta-setting-desc.c:4889
 msgid "Max age [20]"
 msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:4905
+#: ../clients/common/nm-meta-setting-desc.c:4895
 msgid "MAC address ageing time [300]"
 msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:4911
+#: ../clients/common/nm-meta-setting-desc.c:4905
 msgid "Group forward mask [0]"
 msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:4917
+#: ../clients/common/nm-meta-setting-desc.c:4919
 msgid "Enable IGMP snooping [no]"
 msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:4946
+#: ../clients/common/nm-meta-setting-desc.c:4969
 msgid "Bridge port priority [32]"
 msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:4952
+#: ../clients/common/nm-meta-setting-desc.c:4975
 msgid "Bridge port STP path cost [100]"
 msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:4958
+#: ../clients/common/nm-meta-setting-desc.c:4981
 msgid "Hairpin [no]"
 msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:4984
-#: ../clients/common/nm-meta-setting-desc.c:5379
-#: ../clients/common/nm-meta-setting-desc.c:6882
+#: ../clients/common/nm-meta-setting-desc.c:5007
+#: ../clients/common/nm-meta-setting-desc.c:5404
+#: ../clients/common/nm-meta-setting-desc.c:6904
 msgid "Username [none]"
 msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:5086
+#: ../clients/common/nm-meta-setting-desc.c:5109
 msgid ""
 "Enter a list of user permissions. This is a list of user names formatted "
 "as:\n"
@@ -4320,7 +4323,7 @@
 "Example: alice bob charlie\n"
 msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:5138
+#: ../clients/common/nm-meta-setting-desc.c:5162
 msgid ""
 "Enter secondary connections that should be activated when this connection "
 "is\n"
@@ -4333,7 +4336,7 @@
 "Example: private-openvpn, fe6ba5d8-c2fc-4aae-b2e3-97efddd8d9a7\n"
 msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:5161
+#: ../clients/common/nm-meta-setting-desc.c:5185
 msgid ""
 "Enter a value which indicates whether the connection is subject to a data\n"
 "quota, usage costs or other limitations. Accepted options are:\n"
@@ -4342,36 +4345,36 @@
 "'unknown' to let NetworkManager choose a value using some heuristics\n"
 msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:5395
+#: ../clients/common/nm-meta-setting-desc.c:5420
 msgid "APN"
 msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:5447
-#: ../clients/common/nm-meta-setting-desc.c:7093
-#: ../clients/common/nm-meta-setting-desc.c:7284
+#: ../clients/common/nm-meta-setting-desc.c:5472
+#: ../clients/common/nm-meta-setting-desc.c:7127
+#: ../clients/common/nm-meta-setting-desc.c:7318
 msgid "MTU [auto]"
 msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:5466
+#: ../clients/common/nm-meta-setting-desc.c:5491
 msgid "P_KEY [none]"
 msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:5475
+#: ../clients/common/nm-meta-setting-desc.c:5500
 msgid "Parent interface [none]"
 msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:5502
+#: ../clients/common/nm-meta-setting-desc.c:5527
 msgid ""
 "Enter a list of IPv4 addresses of DNS servers.\n"
 "\n"
 "Example: 8.8.8.8, 8.8.4.4\n"
 msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:5550
+#: ../clients/common/nm-meta-setting-desc.c:5575
 msgid "IPv4 address (IP[/plen]) [none]"
 msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:5552
+#: ../clients/common/nm-meta-setting-desc.c:5577
 msgid ""
 "Enter a list of IPv4 addresses formatted as:\n"
 "  ip[/prefix], ip[/prefix],...\n"
@@ -4380,11 +4383,11 @@
 "Example: 192.168.1.5/24, 10.0.0.11/24\n"
 msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:5571
+#: ../clients/common/nm-meta-setting-desc.c:5596
 msgid "IPv4 gateway [none]"
 msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:5579
+#: ../clients/common/nm-meta-setting-desc.c:5604
 msgid ""
 "Enter a list of IPv4 routes formatted as:\n"
 "  ip[/prefix] [next-hop] [metric],...\n"
@@ -4397,7 +4400,7 @@
 "          10.1.2.0/24\n"
 msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:5721
+#: ../clients/common/nm-meta-setting-desc.c:5735
 msgid ""
 "Enter a list of IPv6 addresses of DNS servers.  If the IPv6 configuration "
 "method is 'auto' these DNS servers are appended to those (if any) returned "
@@ -4409,11 +4412,11 @@
 "Example: 2607:f0d0:1002:51::4, 2607:f0d0:1002:51::1\n"
 msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:5775
+#: ../clients/common/nm-meta-setting-desc.c:5789
 msgid "IPv6 address (IP[/plen]) [none]"
 msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:5777
+#: ../clients/common/nm-meta-setting-desc.c:5791
 msgid ""
 "Enter a list of IPv6 addresses formatted as:\n"
 "  ip[/prefix], ip[/prefix],...\n"
@@ -4422,11 +4425,11 @@
 "Example: 2607:f0d0:1002:51::4/64, 1050:0:0:0:5:600:300c:326b\n"
 msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:5796
+#: ../clients/common/nm-meta-setting-desc.c:5810
 msgid "IPv6 gateway [none]"
 msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:5804
+#: ../clients/common/nm-meta-setting-desc.c:5818
 msgid ""
 "Enter a list of IPv6 routes formatted as:\n"
 "  ip[/prefix] [next-hop] [metric],...\n"
@@ -4440,249 +4443,249 @@
 "          abbe::/64 55\n"
 msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:5943
-#: ../clients/common/nm-meta-setting-desc.c:6923
+#: ../clients/common/nm-meta-setting-desc.c:5965
+#: ../clients/common/nm-meta-setting-desc.c:6957
 msgid "Parent device [none]"
 msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:5949
+#: ../clients/common/nm-meta-setting-desc.c:5971
 msgid "Local endpoint [none]"
 msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:5956
-#: ../clients/common/nm-meta-setting-desc.c:6943
+#: ../clients/common/nm-meta-setting-desc.c:5978
+#: ../clients/common/nm-meta-setting-desc.c:6977
 msgid "Remote"
 msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:6001
+#: ../clients/common/nm-meta-setting-desc.c:6023
 msgid "MACsec parent device or connection UUID"
 msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:6022
+#: ../clients/common/nm-meta-setting-desc.c:6044
 msgid "Enable encryption [yes]"
 msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:6028
+#: ../clients/common/nm-meta-setting-desc.c:6050
 #: ../clients/common/nm-secret-agent-simple.c:917
 msgid "MKA CAK"
 msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:6038
+#: ../clients/common/nm-meta-setting-desc.c:6060
 msgid "MKA_CKN"
 msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:6044
+#: ../clients/common/nm-meta-setting-desc.c:6066
 msgid "SCI port [1]"
 msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:6070
+#: ../clients/common/nm-meta-setting-desc.c:6092
 msgid "MACVLAN parent device or connection UUID"
 msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:6091
+#: ../clients/common/nm-meta-setting-desc.c:6113
 msgid "Tap [no]"
 msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:6126
-#: ../clients/common/nm-meta-setting-desc.c:7198
-#: ../clients/tui/nmt-page-wifi.c:212
+#: ../clients/common/nm-meta-setting-desc.c:6148
+#: ../clients/common/nm-meta-setting-desc.c:7232
+#: ../clients/tui/nmt-page-wifi.c:213
 msgid "SSID"
 msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:6135
+#: ../clients/common/nm-meta-setting-desc.c:6157
 msgid "OLPC Mesh channel [1]"
 msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:6144
+#: ../clients/common/nm-meta-setting-desc.c:6166
 msgid "DHCP anycast MAC address [none]"
 msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:6309
+#: ../clients/common/nm-meta-setting-desc.c:6331
 msgid "PPPoE parent device"
 msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:6315
+#: ../clients/common/nm-meta-setting-desc.c:6337
 msgid "Service [none]"
 msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:6322
+#: ../clients/common/nm-meta-setting-desc.c:6344
 msgid "PPPoE username"
 msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:6358
+#: ../clients/common/nm-meta-setting-desc.c:6380
 msgid "Browser only [no]"
 msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:6364
+#: ../clients/common/nm-meta-setting-desc.c:6386
 msgid "PAC URL"
 msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:6370
+#: ../clients/common/nm-meta-setting-desc.c:6392
 msgid "PAC script"
 msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:6494
-#: ../clients/common/nm-meta-setting-desc.c:6682
+#: ../clients/common/nm-meta-setting-desc.c:6516
+#: ../clients/common/nm-meta-setting-desc.c:6704
 msgid "Team JSON configuration [none]"
 msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:6785
+#: ../clients/common/nm-meta-setting-desc.c:6807
 msgid "User ID [none]"
 msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:6791
+#: ../clients/common/nm-meta-setting-desc.c:6813
 msgid "Group ID [none]"
 msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:6797
+#: ../clients/common/nm-meta-setting-desc.c:6819
 msgid "Enable PI [no]"
 msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:6803
+#: ../clients/common/nm-meta-setting-desc.c:6825
 msgid "Enable VNET header [no]"
 msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:6809
+#: ../clients/common/nm-meta-setting-desc.c:6831
 msgid "Enable multi queue [no]"
 msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:6822
+#: ../clients/common/nm-meta-setting-desc.c:6844
 msgid "VLAN parent device or connection UUID"
 msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:6829
+#: ../clients/common/nm-meta-setting-desc.c:6851
 msgid "VLAN ID (<0-4094>)"
 msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:6835
+#: ../clients/common/nm-meta-setting-desc.c:6857
 msgid "VLAN flags (<0-7>) [none]"
 msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:6844
+#: ../clients/common/nm-meta-setting-desc.c:6866
 msgid "Ingress priority maps [none]"
 msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:6854
+#: ../clients/common/nm-meta-setting-desc.c:6876
 msgid "Egress priority maps [none]"
 msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:6930
+#: ../clients/common/nm-meta-setting-desc.c:6964
 msgid "VXLAN ID"
 msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:6936
+#: ../clients/common/nm-meta-setting-desc.c:6970
 msgid "Local address [none]"
 msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:6949
+#: ../clients/common/nm-meta-setting-desc.c:6983
 msgid "Minimum source port [0]"
 msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:6955
+#: ../clients/common/nm-meta-setting-desc.c:6989
 msgid "Maximum source port [0]"
 msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:6961
+#: ../clients/common/nm-meta-setting-desc.c:6995
 msgid "Destination port [8472]"
 msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:7031
+#: ../clients/common/nm-meta-setting-desc.c:7065
 msgid "WiMAX NSP name"
 msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:7068
-#: ../clients/common/nm-meta-setting-desc.c:7249
+#: ../clients/common/nm-meta-setting-desc.c:7102
+#: ../clients/common/nm-meta-setting-desc.c:7283
 msgid "Cloned MAC [none]"
 msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:7101
+#: ../clients/common/nm-meta-setting-desc.c:7135
 msgid ""
 "Enter a list of subchannels (comma or space separated).\n"
 "\n"
 "Example: 0.0.0e20 0.0.0e21 0.0.0e22\n"
 msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:7423
+#: ../clients/common/nm-meta-setting-desc.c:7457
 msgid ""
 "Enter the type of WEP keys. The accepted values are: 0 or unknown, 1 or key, "
 "and 2 or passphrase.\n"
 msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:7663
+#: ../clients/common/nm-meta-setting-desc.c:7697
 msgid "802-1x settings"
 msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:7664
+#: ../clients/common/nm-meta-setting-desc.c:7698
 #: ../src/devices/adsl/nm-device-adsl.c:117
 msgid "ADSL connection"
 msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:7665
+#: ../clients/common/nm-meta-setting-desc.c:7699
 msgid "bluetooth connection"
 msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:7666
+#: ../clients/common/nm-meta-setting-desc.c:7700
 msgid "Bond device"
 msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:7667
+#: ../clients/common/nm-meta-setting-desc.c:7701
 msgid "Bridge device"
 msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:7668
+#: ../clients/common/nm-meta-setting-desc.c:7702
 msgid "Bridge port"
 msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:7669
+#: ../clients/common/nm-meta-setting-desc.c:7703
 msgid "CDMA mobile broadband connection"
 msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:7670
+#: ../clients/common/nm-meta-setting-desc.c:7704
 msgid "General settings"
 msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:7671
+#: ../clients/common/nm-meta-setting-desc.c:7705
 msgid "DCB settings"
 msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:7672
+#: ../clients/common/nm-meta-setting-desc.c:7706
 msgid "Dummy settings"
 msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:7674
+#: ../clients/common/nm-meta-setting-desc.c:7708
 msgid "Generic settings"
 msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:7675
+#: ../clients/common/nm-meta-setting-desc.c:7709
 msgid "GSM mobile broadband connection"
 msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:7676
+#: ../clients/common/nm-meta-setting-desc.c:7710
 #: ../src/devices/nm-device-infiniband.c:158
 msgid "InfiniBand connection"
 msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:7677
+#: ../clients/common/nm-meta-setting-desc.c:7711
 msgid "IPv4 protocol"
 msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:7678
+#: ../clients/common/nm-meta-setting-desc.c:7712
 msgid "IPv6 protocol"
 msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:7679
+#: ../clients/common/nm-meta-setting-desc.c:7713
 msgid "IP-tunnel settings"
 msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:7680
+#: ../clients/common/nm-meta-setting-desc.c:7714
 msgid "MACsec connection"
 msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:7681
+#: ../clients/common/nm-meta-setting-desc.c:7715
 msgid "macvlan connection"
 msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:7683
+#: ../clients/common/nm-meta-setting-desc.c:7717
 msgid "OLPC Mesh connection"
 msgstr ""
 
@@ -4702,73 +4705,73 @@
 msgid "OpenVSwitch port settings"
 msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:7689
+#: ../clients/common/nm-meta-setting-desc.c:7723
 msgid "PPP settings"
 msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:7690
+#: ../clients/common/nm-meta-setting-desc.c:7724
 msgid "PPPoE"
 msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:7691
+#: ../clients/common/nm-meta-setting-desc.c:7725
 msgid "Proxy"
 msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:7692
+#: ../clients/common/nm-meta-setting-desc.c:7726
 msgid "Serial settings"
 msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:7694
+#: ../clients/common/nm-meta-setting-desc.c:7728
 msgid "Traffic controls"
 msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:7695
+#: ../clients/common/nm-meta-setting-desc.c:7729
 msgid "Team device"
 msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:7696
+#: ../clients/common/nm-meta-setting-desc.c:7730
 msgid "Team port"
 msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:7697
+#: ../clients/common/nm-meta-setting-desc.c:7731
 msgid "Tun device"
 msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:7698
+#: ../clients/common/nm-meta-setting-desc.c:7732
 msgid "User settings"
 msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:7699
+#: ../clients/common/nm-meta-setting-desc.c:7733
 #: ../src/devices/nm-device-vlan.c:385
 msgid "VLAN connection"
 msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:7700 ../src/nm-manager.c:5682
+#: ../clients/common/nm-meta-setting-desc.c:7734 ../src/nm-manager.c:5713
 msgid "VPN connection"
 msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:7701
+#: ../clients/common/nm-meta-setting-desc.c:7736
 #: ../src/devices/nm-device-vxlan.c:354
 msgid "VXLAN connection"
 msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:7703
+#: ../clients/common/nm-meta-setting-desc.c:7738
 msgid "WiMAX connection"
 msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:7704
+#: ../clients/common/nm-meta-setting-desc.c:7739
 msgid "Wired Ethernet"
 msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:7706
+#: ../clients/common/nm-meta-setting-desc.c:7741
 msgid "Wi-Fi connection"
 msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:7707
+#: ../clients/common/nm-meta-setting-desc.c:7742
 msgid "Wi-Fi security settings"
 msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:8074
+#: ../clients/common/nm-meta-setting-desc.c:8120
 msgid "name"
 msgstr ""
 
@@ -4776,7 +4779,7 @@
 msgid "An authentication session is already underway."
 msgstr ""
 
-#: ../clients/cli/devices.c:4240 ../clients/common/nm-secret-agent-simple.c:273
+#: ../clients/cli/devices.c:4376 ../clients/common/nm-secret-agent-simple.c:273
 #: ../clients/common/nm-secret-agent-simple.c:310
 #: ../clients/common/nm-secret-agent-simple.c:333
 #: ../clients/common/nm-secret-agent-simple.c:366
@@ -4787,8 +4790,8 @@
 #: ../clients/common/nm-vpn-helpers.c:114
 #: ../clients/common/nm-vpn-helpers.c:120
 #: ../clients/common/nm-vpn-helpers.c:125 ../clients/tui/nmt-page-dsl.c:62
-#: ../clients/tui/nmt-page-wifi.c:265 ../clients/tui/nmt-page-wifi.c:297
-#: ../clients/tui/nmt-page-wifi.c:330
+#: ../clients/tui/nmt-page-wifi.c:266 ../clients/tui/nmt-page-wifi.c:298
+#: ../clients/tui/nmt-page-wifi.c:331
 msgid "Password"
 msgstr ""
 
@@ -4801,7 +4804,7 @@
 msgstr ""
 
 #: ../clients/common/nm-secret-agent-simple.c:323
-#: ../clients/tui/nmt-page-wifi.c:278
+#: ../clients/tui/nmt-page-wifi.c:279
 msgid "Key"
 msgstr ""
 
@@ -5033,7 +5036,7 @@
 msgstr ""
 
 #: ../clients/common/settings-docs.h.in:11
-#: ../clients/common/settings-docs.h.in:92
+#: ../clients/common/settings-docs.h.in:94
 msgid ""
 "With \"cloned-mac-address\" setting \"random\" or \"stable\", by default all "
 "bits of the MAC address are scrambled and a locally-administered, unicast "
@@ -5093,14 +5096,14 @@
 "Deprecated: 1"
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:16
+#: ../clients/common/settings-docs.c.in:16
 msgid ""
 "Wi-Fi network mode; one of \"infrastructure\", \"adhoc\" or \"ap\".  If "
 "blank, infrastructure is assumed."
 msgstr ""
 
 #: ../clients/common/settings-docs.h.in:17
-#: ../clients/common/settings-docs.h.in:95
+#: ../clients/common/settings-docs.h.in:97
 msgid ""
 "If non-zero, only transmit packets of the specified size or smaller, "
 "breaking larger packets up into multiple Ethernet frames."
@@ -5364,7 +5367,7 @@
 "SubjectName CN using same suffix match comparison."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:55
+#: ../clients/common/settings-docs.h.in:56
 msgid ""
 "The allowed EAP method to be used when authenticating to the network with "
 "802.1x.  Valid methods are: \"leap\", \"md5\", \"tls\", \"peap\", \"ttls\", "
@@ -5373,32 +5376,32 @@
 "the allowed combinations."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:56
+#: ../clients/common/settings-docs.h.in:57
 msgid ""
 "Identity string for EAP authentication methods.  Often the user's user or "
 "login name."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:58
+#: ../clients/common/settings-docs.h.in:59
 msgid "UTF-8 encoded file path containing PAC for EAP-FAST."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:59
+#: ../clients/common/settings-docs.h.in:60
 msgid ""
 "UTF-8 encoded password used for EAP authentication methods. If both the "
 "\"password\" property and the \"password-raw\" property are specified, "
 "\"password\" is preferred."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:60
-#: ../clients/common/settings-docs.h.in:105
-#: ../clients/common/settings-docs.h.in:132
-#: ../clients/common/settings-docs.h.in:181
-#: ../clients/common/settings-docs.h.in:299
+#: ../clients/common/settings-docs.h.in:61
+#: ../clients/common/settings-docs.h.in:107
+#: ../clients/common/settings-docs.h.in:140
+#: ../clients/common/settings-docs.h.in:189
+#: ../clients/common/settings-docs.h.in:308
 msgid "Flags indicating how to handle the \"password\" property."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:61
+#: ../clients/common/settings-docs.h.in:62
 msgid ""
 "Password used for EAP authentication methods, given as a byte array to allow "
 "passwords in other encodings than UTF-8 to be used. If both the \"password\" "
@@ -5406,11 +5409,11 @@
 "preferred."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:62
+#: ../clients/common/settings-docs.h.in:63
 msgid "Flags indicating how to handle the \"password-raw\" property."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:63
+#: ../clients/common/settings-docs.h.in:64
 msgid ""
 "Specifies authentication flags to use in \"phase 1\" outer authentication "
 "using NMSetting8021xAuthFlags options. The individual TLS versions can be "
@@ -5420,7 +5423,7 @@
 "details."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:64
+#: ../clients/common/settings-docs.h.in:65
 msgid ""
 "Enables or disables in-line provisioning of EAP-FAST credentials when FAST "
 "is specified as the EAP method in the \"eap\" property. Recognized values "
@@ -5430,7 +5433,7 @@
 "more details."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:65
+#: ../clients/common/settings-docs.h.in:66
 msgid ""
 "Forces use of the new PEAP label during key derivation.  Some RADIUS servers "
 "may require forcing the new PEAP label to interoperate with PEAPv1.  Set to "
@@ -5438,7 +5441,7 @@
 "documentation for more details."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:66
+#: ../clients/common/settings-docs.h.in:67
 msgid ""
 "Forces which PEAP version is used when PEAP is set as the EAP method in the "
 "\"eap\" property.  When unset, the version reported by the server will be "
@@ -5447,7 +5450,7 @@
 "set to \"0\" or \"1\" to force that specific PEAP version."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:67
+#: ../clients/common/settings-docs.h.in:68
 msgid ""
 "List of strings to be matched against the altSubjectName of the certificate "
 "presented by the authentication server during the inner \"phase 2\" "
@@ -5455,7 +5458,7 @@
 "certificate's altSubjectName is performed."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:68
+#: ../clients/common/settings-docs.h.in:67
 msgid ""
 "Specifies the allowed \"phase 2\" inner non-EAP authentication methods when "
 "an EAP method that uses an inner TLS tunnel is specified in the \"eap\" "
@@ -5465,7 +5468,7 @@
 "authentication; see the wpa_supplicant documentation for more details."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:69
+#: ../clients/common/settings-docs.h.in:68
 msgid ""
 "Specifies the allowed \"phase 2\" inner EAP-based authentication methods "
 "when an EAP method that uses an inner TLS tunnel is specified in the \"eap\" "
@@ -5475,7 +5478,7 @@
 "wpa_supplicant documentation for more details."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:70
+#: ../clients/common/settings-docs.h.in:71
 msgid ""
 "Contains the \"phase 2\" CA certificate if used by the EAP method specified "
 "in the \"phase2-auth\" or \"phase2-autheap\" properties. Certificate data is "
@@ -5489,26 +5492,26 @@
 "and is NOT recommended."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:71
+#: ../clients/common/settings-docs.h.in:72
 msgid ""
 "The password used to access the \"phase2\" CA certificate stored in \"phase2-"
 "ca-cert\" property. Only makes sense if the certificate is stored on a "
 "PKCS#11 token that requires a login."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:72
+#: ../clients/common/settings-docs.h.in:73
 msgid ""
 "Flags indicating how to handle the \"phase2-ca-cert-password\" property."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:73
+#: ../clients/common/settings-docs.h.in:74
 msgid ""
 "UTF-8 encoded path to a directory containing PEM or DER formatted "
 "certificates to be added to the verification chain in addition to the "
 "certificate specified in the \"phase2-ca-cert\" property."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:74
+#: ../clients/common/settings-docs.h.in:75
 msgid ""
 "Contains the \"phase 2\" client certificate if used by the EAP method "
 "specified in the \"phase2-auth\" or \"phase2-autheap\" properties. "
@@ -5522,14 +5525,14 @@
 "in-the-middle attacks and is NOT recommended."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:75
+#: ../clients/common/settings-docs.h.in:76
 msgid ""
 "The password used to access the \"phase2\" client certificate stored in "
 "\"phase2-client-cert\" property. Only makes sense if the certificate is "
 "stored on a PKCS#11 token that requires a login."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:76
+#: ../clients/common/settings-docs.h.in:77
 msgid ""
 "Flags indicating how to handle the \"phase2-client-cert-password\" property."
 msgstr ""
@@ -5544,7 +5547,7 @@
 "match comparison."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:78
+#: ../clients/common/settings-docs.h.in:80
 msgid ""
 "Contains the \"phase 2\" inner private key when the \"phase2-auth\" or "
 "\"phase2-autheap\" property is set to \"tls\". Key data is specified using a "
@@ -5563,19 +5566,19 @@
 "decode the PKCS#12 private key and certificate."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:79
+#: ../clients/common/settings-docs.h.in:81
 msgid ""
 "The password used to decrypt the \"phase 2\" private key specified in the "
 "\"phase2-private-key\" property when the private key either uses the path "
 "scheme, or is a PKCS#12 format key."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:80
+#: ../clients/common/settings-docs.h.in:82
 msgid ""
 "Flags indicating how to handle the \"phase2-private-key-password\" property."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:81
+#: ../clients/common/settings-docs.h.in:83
 msgid ""
 "Substring to be matched against the subject of the certificate presented by "
 "the authentication server during the inner \"phase 2\" authentication. When "
@@ -5584,16 +5587,16 @@
 "deprecated in favor of NMSetting8021x:phase2-domain-suffix-match."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:82
+#: ../clients/common/settings-docs.h.in:84
 msgid "PIN used for EAP authentication methods."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:83
-#: ../clients/common/settings-docs.h.in:183
+#: ../clients/common/settings-docs.h.in:85
+#: ../clients/common/settings-docs.h.in:191
 msgid "Flags indicating how to handle the \"pin\" property."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:84
+#: ../clients/common/settings-docs.h.in:86
 msgid ""
 "Contains the private key when the \"eap\" property is set to \"tls\". Key "
 "data is specified using a \"scheme\"; two are currently supported: blob and "
@@ -5615,18 +5618,18 @@
 "to prevent unauthorized access to unencrypted private key data."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:85
+#: ../clients/common/settings-docs.h.in:87
 msgid ""
 "The password used to decrypt the private key specified in the \"private-"
 "key\" property when the private key either uses the path scheme, or if the "
 "private key is a PKCS#12 format key."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:86
+#: ../clients/common/settings-docs.h.in:88
 msgid "Flags indicating how to handle the \"private-key-password\" property."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:87
+#: ../clients/common/settings-docs.h.in:89
 msgid ""
 "Substring to be matched against the subject of the certificate presented by "
 "the authentication server. When unset, no verification of the authentication "
@@ -5635,7 +5638,7 @@
 "NMSetting8021x:domain-suffix-match."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:88
+#: ../clients/common/settings-docs.h.in:90
 msgid ""
 "When TRUE, overrides the \"ca-path\" and \"phase2-ca-path\" properties using "
 "the system CA directory specified at configure time with the --system-ca-"
@@ -5654,7 +5657,7 @@
 "will be skipped."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:90
+#: ../clients/common/settings-docs.h.in:92
 msgid ""
 "If specified, request that the device use this MAC address instead. This is "
 "known as MAC cloning or spoofing. Beside explicitly specifying a MAC "
@@ -5679,21 +5682,21 @@
 "specified. Before specifying a duplex mode be sure your device supports it."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:93
+#: ../clients/common/settings-docs.h.in:95
 msgid ""
 "If specified, this connection will only apply to the Ethernet device whose "
 "permanent MAC address matches. This property does not change the MAC address "
 "of the device (i.e. MAC spoofing)."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:94
+#: ../clients/common/settings-docs.h.in:96
 msgid ""
 "If specified, this connection will never apply to the Ethernet device whose "
 "permanent MAC address matches an address in the list.  Each MAC address is "
 "in the standard hex-digits-and-colons notation (00:11:22:33:44:55)."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:96
+#: ../clients/common/settings-docs.h.in:98
 msgid ""
 "Specific port type to use if the device supports multiple attachment "
 "methods.  One of \"tp\" (Twisted Pair), \"aui\" (Attachment Unit Interface), "
@@ -5701,13 +5704,13 @@
 "device supports only one port type, this setting is ignored."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:97
+#: ../clients/common/settings-docs.h.in:99
 msgid ""
 "s390 network device type; one of \"qeth\", \"lcs\", or \"ctc\", representing "
 "the different types of virtual network devices available on s390 systems."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:98
+#: ../clients/common/settings-docs.h.in:100
 msgid ""
 "Dictionary of key/value pairs of s390-specific device options.  Both keys "
 "and values must be strings.  Allowed keys include \"portno\", \"layer2\", "
@@ -5715,7 +5718,7 @@
 "alphanumeric characters (ie, [a-zA-Z0-9])."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:99
+#: ../clients/common/settings-docs.h.in:101
 msgid ""
 "Identifies specific subchannels that this network device uses for "
 "communication with z/VM or s390 host.  Like the \"mac-address\" property for "
@@ -5734,7 +5737,7 @@
 "sure your device supports it."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:101
+#: ../clients/common/settings-docs.h.in:103
 msgid ""
 "The NMSettingWiredWakeOnLan options to enable. Not all devices support all "
 "options. May be any combination of NM_SETTING_WIRED_WAKE_ON_LAN_PHY (0x2), "
@@ -5747,63 +5750,63 @@
 "disable management of Wake-on-LAN in NetworkManager)."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:102
+#: ../clients/common/settings-docs.h.in:104
 msgid ""
 "If specified, the password used with magic-packet-based Wake-on-LAN, "
 "represented as an Ethernet MAC address.  If NULL, no password will be "
 "required."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:103
+#: ../clients/common/settings-docs.h.in:105
 msgid "Encapsulation of ADSL connection.  Can be \"vcmux\" or \"llc\"."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:104
+#: ../clients/common/settings-docs.h.in:106
 msgid "Password used to authenticate with the ADSL service."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:106
+#: ../clients/common/settings-docs.h.in:108
 msgid "ADSL connection protocol.  Can be \"pppoa\", \"pppoe\" or \"ipoatm\"."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:107
+#: ../clients/common/settings-docs.h.in:109
 msgid "Username used to authenticate with the ADSL service."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:108
+#: ../clients/common/settings-docs.h.in:110
 msgid "VCI of ADSL connection"
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:109
+#: ../clients/common/settings-docs.h.in:111
 msgid "VPI of ADSL connection"
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:110
+#: ../clients/common/settings-docs.h.in:112
 msgid "The Bluetooth address of the device."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:111
+#: ../clients/common/settings-docs.h.in:113
 msgid ""
 "Either \"dun\" for Dial-Up Networking connections or \"panu\" for Personal "
 "Area Networking connections to devices supporting the NAP profile."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:112
+#: ../clients/common/settings-docs.h.in:114
 msgid ""
 "Dictionary of key/value pairs of bonding options.  Both keys and values must "
 "be strings. Option names must contain only alphanumeric characters (ie, [a-"
 "zA-Z0-9])."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:113
+#: ../clients/common/settings-docs.h.in:115
 msgid "The Ethernet MAC address aging time, in seconds."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:114
+#: ../clients/common/settings-docs.h.in:116
 msgid "The Spanning Tree Protocol (STP) forwarding delay, in seconds."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:115
+#: ../clients/common/settings-docs.h.in:118
 msgid ""
 "A mask of group addresses to forward. Usually, group addresses in the range "
 "from 01:80:C2:00:00:00 to 01:80:C2:00:00:0F are not forwarded according to "
@@ -5812,7 +5815,7 @@
 "or 2 set because they are used for STP, MAC pause frames and LACP."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:116
+#: ../clients/common/settings-docs.h.in:119
 msgid "The Spanning Tree Protocol (STP) hello time, in seconds."
 msgstr ""
 
@@ -5826,76 +5829,76 @@
 "Hence, this property is deprecated."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:118
+#: ../clients/common/settings-docs.h.in:121
 msgid "The Spanning Tree Protocol (STP) maximum message age, in seconds."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:119
+#: ../clients/common/settings-docs.h.in:125
 msgid ""
 "Controls whether IGMP snooping is enabled for this bridge. Note that if "
 "snooping was automatically disabled due to hash collisions, the system may "
 "refuse to enable the feature until the collisions are resolved."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:120
+#: ../clients/common/settings-docs.h.in:126
 msgid ""
 "Sets the Spanning Tree Protocol (STP) priority for this bridge.  Lower "
 "values are \"better\"; the lowest priority bridge will be elected the root "
 "bridge."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:121
+#: ../clients/common/settings-docs.h.in:127
 msgid ""
 "Controls whether Spanning Tree Protocol (STP) is enabled for this bridge."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:125
+#: ../clients/common/settings-docs.h.in:133
 msgid ""
 "Enables or disables \"hairpin mode\" for the port, which allows frames to be "
 "sent back out through the port the frame was received on."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:126
+#: ../clients/common/settings-docs.h.in:134
 msgid ""
 "The Spanning Tree Protocol (STP) port cost for destinations via this port."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:127
+#: ../clients/common/settings-docs.h.in:135
 msgid "The Spanning Tree Protocol (STP) priority of this bridge port."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:129
-#: ../clients/common/settings-docs.h.in:177
-#: ../clients/common/settings-docs.h.in:188
+#: ../clients/common/settings-docs.h.in:137
+#: ../clients/common/settings-docs.h.in:185
+#: ../clients/common/settings-docs.h.in:196
 msgid ""
 "If non-zero, only transmit packets of the specified size or smaller, "
 "breaking larger packets up into multiple frames."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:130
+#: ../clients/common/settings-docs.h.in:138
 msgid ""
 "The number to dial to establish the connection to the CDMA-based mobile "
 "broadband network, if any.  If not specified, the default number (#777) is "
 "used when required."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:131
-#: ../clients/common/settings-docs.h.in:180
+#: ../clients/common/settings-docs.h.in:139
+#: ../clients/common/settings-docs.h.in:188
 msgid ""
 "The password used to authenticate with the network, if required.  Many "
 "providers do not require a password, or accept any password.  But if a "
 "password is required, it is specified here."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:133
-#: ../clients/common/settings-docs.h.in:186
+#: ../clients/common/settings-docs.h.in:141
+#: ../clients/common/settings-docs.h.in:194
 msgid ""
 "The username used to authenticate with the network, if required.  Many "
 "providers do not require a username, or accept any username.  But if a "
 "username is required, it is specified here."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:134
+#: ../clients/common/settings-docs.h.in:142
 msgid ""
 "The number of retries for the authentication. Zero means to try "
 "indefinitely; -1 means to use a global default. If the global default is not "
@@ -5911,14 +5914,14 @@
 "to activate the connection."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:136
+#: ../clients/common/settings-docs.h.in:144
 msgid ""
 "The autoconnect priority. If the connection is set to autoconnect, "
 "connections with higher priority will be preferred. Defaults to 0. The "
 "higher number means higher priority."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:137
+#: ../clients/common/settings-docs.h.in:145
 msgid ""
 "The number of times a connection should be tried when autoactivating before "
 "giving up. Zero means forever, -1 means the global default (4 times if not "
@@ -5938,19 +5941,19 @@
 "to 0."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:139
+#: ../clients/common/settings-docs.h.in:147
 msgid ""
 "If greater than zero, delay success of IP addressing until either the "
 "timeout is reached, or an IP gateway replies to a ping."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:140
+#: ../clients/common/settings-docs.h.in:148
 msgid ""
 "A human readable unique identifier for the connection, like \"Work Wi-Fi\" "
 "or \"T-Mobile 3G\"."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:141
+#: ../clients/common/settings-docs.h.in:149
 msgid ""
 "The name of the network interface this connection is bound to. If not set, "
 "then the connection can be attached to any interface of the appropriate type "
@@ -5963,11 +5966,11 @@
 "interface."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:142
+#: ../clients/common/settings-docs.h.in:150
 msgid "Whether LLDP is enabled for the connection."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:144
+#: ../clients/common/settings-docs.h.in:152
 msgid "Interface name of the master device or UUID of the master connection."
 msgstr ""
 
@@ -5981,13 +5984,13 @@
 "supports mDNS. One such plugin is dns-systemd-resolved."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:146
+#: ../clients/common/settings-docs.h.in:154
 msgid ""
 "Whether the connection is metered. When updating this property on a "
 "currently activated connection, the change takes effect immediately."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:148
+#: ../clients/common/settings-docs.h.in:156
 msgid ""
 "An array of strings defining what access a given user has to this "
 "connection.  If this is NULL or empty, all users are allowed to access this "
@@ -6002,20 +6005,20 @@
 "[id], and [reserved] must be valid UTF-8."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:149
+#: ../clients/common/settings-docs.h.in:157
 msgid ""
 "FALSE if the connection can be modified using the provided settings "
 "service's D-Bus interface with the right privileges, or TRUE if the "
 "connection is read-only and cannot be modified."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:150
+#: ../clients/common/settings-docs.h.in:158
 msgid ""
 "List of connection UUIDs that should be activated when the base connection "
 "itself is activated. Currently only VPN connections are supported."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:151
+#: ../clients/common/settings-docs.h.in:159
 msgid ""
 "Setting name of the device type of this slave's master connection (eg, "
 "\"bond\"), or NULL if this connection is not a slave."
@@ -6044,7 +6047,7 @@
 "identical before performing dynamic substitutions."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:153
+#: ../clients/common/settings-docs.h.in:161
 msgid ""
 "The time, in seconds since the Unix Epoch, that the connection was last "
 "_successfully_ fully activated. NetworkManager updates the connection "
@@ -6053,7 +6056,7 @@
 "reading (changes to this property will not be preserved)."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:154
+#: ../clients/common/settings-docs.h.in:162
 msgid ""
 "Base type of the connection. For hardware-dependent connections, should "
 "contain the setting name of the hardware-type specific setting (ie, \"802-3-"
@@ -6062,7 +6065,7 @@
 "setting name of that setting type (ie, \"vpn\" or \"bridge\", etc)."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:155
+#: ../clients/common/settings-docs.h.in:163
 msgid ""
 "A universally unique identifier for the connection, for example generated "
 "with libuuid.  It should be assigned when the connection is created, and "
@@ -6074,7 +6077,7 @@
 "contains only hexadecimal characters and \"-\")."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:157
+#: ../clients/common/settings-docs.h.in:165
 msgid ""
 "The trust level of a the connection.  Free form case-insensitive string (for "
 "example \"Home\", \"Work\", \"Public\").  NULL or unspecified zone means the "
@@ -6083,53 +6086,53 @@
 "takes effect immediately."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:158
+#: ../clients/common/settings-docs.h.in:166
 msgid ""
 "Specifies the NMSettingDcbFlags for the DCB FCoE application.  Flags may be "
 "any combination of NM_SETTING_DCB_FLAG_ENABLE (0x1), "
 "NM_SETTING_DCB_FLAG_ADVERTISE (0x2), and NM_SETTING_DCB_FLAG_WILLING (0x4)."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:159
+#: ../clients/common/settings-docs.h.in:167
 msgid "The FCoE controller mode; either \"fabric\" (default) or \"vn2vn\"."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:160
+#: ../clients/common/settings-docs.h.in:168
 msgid ""
 "The highest User Priority (0 - 7) which FCoE frames should use, or -1 for "
 "default priority.  Only used when the \"app-fcoe-flags\" property includes "
 "the NM_SETTING_DCB_FLAG_ENABLE (0x1) flag."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:161
+#: ../clients/common/settings-docs.h.in:169
 msgid ""
 "Specifies the NMSettingDcbFlags for the DCB FIP application.  Flags may be "
 "any combination of NM_SETTING_DCB_FLAG_ENABLE (0x1), "
 "NM_SETTING_DCB_FLAG_ADVERTISE (0x2), and NM_SETTING_DCB_FLAG_WILLING (0x4)."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:162
+#: ../clients/common/settings-docs.h.in:170
 msgid ""
 "The highest User Priority (0 - 7) which FIP frames should use, or -1 for "
 "default priority.  Only used when the \"app-fip-flags\" property includes "
 "the NM_SETTING_DCB_FLAG_ENABLE (0x1) flag."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:163
+#: ../clients/common/settings-docs.h.in:171
 msgid ""
 "Specifies the NMSettingDcbFlags for the DCB iSCSI application.  Flags may be "
 "any combination of NM_SETTING_DCB_FLAG_ENABLE (0x1), "
 "NM_SETTING_DCB_FLAG_ADVERTISE (0x2), and NM_SETTING_DCB_FLAG_WILLING (0x4)."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:164
+#: ../clients/common/settings-docs.h.in:172
 msgid ""
 "The highest User Priority (0 - 7) which iSCSI frames should use, or -1 for "
 "default priority. Only used when the \"app-iscsi-flags\" property includes "
 "the NM_SETTING_DCB_FLAG_ENABLE (0x1) flag."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:165
+#: ../clients/common/settings-docs.h.in:173
 msgid ""
 "An array of 8 uint values, where the array index corresponds to the User "
 "Priority (0 - 7) and the value indicates the percentage of bandwidth of the "
@@ -6138,21 +6141,21 @@
 "percents."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:166
+#: ../clients/common/settings-docs.h.in:174
 msgid ""
 "An array of 8 boolean values, where the array index corresponds to the User "
 "Priority (0 - 7) and the value indicates whether or not the corresponding "
 "priority should transmit priority pause."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:167
+#: ../clients/common/settings-docs.h.in:175
 msgid ""
 "Specifies the NMSettingDcbFlags for DCB Priority Flow Control (PFC). Flags "
 "may be any combination of NM_SETTING_DCB_FLAG_ENABLE (0x1), "
 "NM_SETTING_DCB_FLAG_ADVERTISE (0x2), and NM_SETTING_DCB_FLAG_WILLING (0x4)."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:168
+#: ../clients/common/settings-docs.h.in:176
 msgid ""
 "An array of 8 uint values, where the array index corresponds to the Priority "
 "Group ID (0 - 7) and the value indicates the percentage of link bandwidth "
@@ -6160,35 +6163,35 @@
 "values must total 100 percents."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:169
+#: ../clients/common/settings-docs.h.in:177
 msgid ""
 "Specifies the NMSettingDcbFlags for DCB Priority Groups.  Flags may be any "
 "combination of NM_SETTING_DCB_FLAG_ENABLE (0x1), "
 "NM_SETTING_DCB_FLAG_ADVERTISE (0x2), and NM_SETTING_DCB_FLAG_WILLING (0x4)."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:170
+#: ../clients/common/settings-docs.h.in:178
 msgid ""
 "An array of 8 uint values, where the array index corresponds to the User "
 "Priority (0 - 7) and the value indicates the Priority Group ID.  Allowed "
 "Priority Group ID values are 0 - 7 or 15 for the unrestricted group."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:171
+#: ../clients/common/settings-docs.h.in:179
 msgid ""
 "An array of 8 boolean values, where the array index corresponds to the User "
 "Priority (0 - 7) and the value indicates whether or not the priority may use "
 "all of the bandwidth allocated to its assigned group."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:172
+#: ../clients/common/settings-docs.h.in:180
 msgid ""
 "An array of 8 uint values, where the array index corresponds to the User "
 "Priority (0 - 7) and the value indicates the traffic class (0 - 7) to which "
 "the priority is mapped."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:173
+#: ../clients/common/settings-docs.h.in:181
 msgid ""
 "The GPRS Access Point Name specifying the APN used when establishing a data "
 "session with the GSM-based network.  The APN often determines how the user "
@@ -6199,20 +6202,20 @@
 "14.9."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:175
+#: ../clients/common/settings-docs.h.in:183
 msgid ""
 "The device unique identifier (as given by the WWAN management service) which "
 "this connection applies to.  If given, the connection will only apply to the "
 "specified device."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:176
+#: ../clients/common/settings-docs.h.in:184
 msgid ""
 "When TRUE, only connections to the home network will be allowed. Connections "
 "to roaming networks will not be made."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:178
+#: ../clients/common/settings-docs.h.in:186
 msgid ""
 "The Network ID (GSM LAI format, ie MCC-MNC) to force specific network "
 "registration.  If the Network ID is specified, NetworkManager will attempt "
@@ -6229,14 +6232,14 @@
 "NetworkManager to select the appropriate settings automatically."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:182
+#: ../clients/common/settings-docs.h.in:190
 msgid ""
 "If the SIM is locked with a PIN it must be unlocked before any other "
 "operations are requested.  Specify the PIN here to allow operation of the "
 "device."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:184
+#: ../clients/common/settings-docs.h.in:192
 msgid ""
 "The SIM card unique identifier (as given by the WWAN management service) "
 "which this connection applies to.  If given, the connection will apply to "
@@ -6244,7 +6247,7 @@
 "the given identifier."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:185
+#: ../clients/common/settings-docs.h.in:193
 msgid ""
 "A MCC/MNC string like \"310260\" or \"21601\" identifying the specific "
 "mobile network operator which this connection applies to.  If given, the "
@@ -6252,105 +6255,105 @@
 "id\" which contains a SIM card provisioned by the given operator."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:187
+#: ../clients/common/settings-docs.h.in:195
 msgid ""
 "If specified, this connection will only apply to the IPoIB device whose "
 "permanent MAC address matches. This property does not change the MAC address "
 "of the device (i.e. MAC spoofing)."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:189
+#: ../clients/common/settings-docs.h.in:197
 msgid ""
 "The InfiniBand P_Key to use for this device. A value of -1 means to use the "
 "default P_Key (aka \"the P_Key at index 0\").  Otherwise it is a 16-bit "
 "unsigned integer, whose high bit is set if it is a \"full membership\" P_Key."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:190
+#: ../clients/common/settings-docs.h.in:198
 msgid ""
 "The interface name of the parent device of this device. Normally NULL, but "
 "if the \"p_key\" property is set, then you must specify the base device by "
 "setting either this property or \"mac-address\"."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:191
+#: ../clients/common/settings-docs.h.in:199
 msgid ""
 "The IP-over-InfiniBand transport mode. Either \"datagram\" or \"connected\"."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:192
+#: ../clients/common/settings-docs.h.in:200
 msgid ""
 "How many additional levels of encapsulation are permitted to be prepended to "
 "packets. This property applies only to IPv6 tunnels."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:194
+#: ../clients/common/settings-docs.h.in:202
 msgid ""
 "The flow label to assign to tunnel packets. This property applies only to "
 "IPv6 tunnels."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:195
+#: ../clients/common/settings-docs.h.in:203
 msgid ""
 "The key used for tunnel input packets; the property is valid only for "
 "certain tunnel modes (GRE, IP6GRE). If empty, no key is used."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:196
+#: ../clients/common/settings-docs.h.in:204
 msgid ""
 "The local endpoint of the tunnel; the value can be empty, otherwise it must "
 "contain an IPv4 or IPv6 address."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:197
+#: ../clients/common/settings-docs.h.in:205
 msgid ""
 "The tunneling mode, for example NM_IP_TUNNEL_MODE_IPIP (1) or "
 "NM_IP_TUNNEL_MODE_GRE (2)."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:198
+#: ../clients/common/settings-docs.h.in:206
 msgid ""
 "If non-zero, only transmit packets of the specified size or smaller, "
 "breaking larger packets up into multiple fragments."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:199
+#: ../clients/common/settings-docs.h.in:207
 msgid ""
 "The key used for tunnel output packets; the property is valid only for "
 "certain tunnel modes (GRE, IP6GRE). If empty, no key is used."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:200
+#: ../clients/common/settings-docs.h.in:208
 msgid ""
 "If given, specifies the parent interface name or parent connection UUID the "
 "new device will be bound to so that tunneled packets will only be routed via "
 "that interface."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:201
+#: ../clients/common/settings-docs.h.in:209
 msgid "Whether to enable Path MTU Discovery on this tunnel."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:202
+#: ../clients/common/settings-docs.h.in:210
 msgid ""
 "The remote endpoint of the tunnel; the value must contain an IPv4 or IPv6 "
 "address."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:203
+#: ../clients/common/settings-docs.h.in:211
 msgid ""
 "The type of service (IPv4) or traffic class (IPv6) field to be set on "
 "tunneled packets."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:204
+#: ../clients/common/settings-docs.h.in:212
 msgid ""
 "The TTL to assign to tunneled packets. 0 is a special value meaning that "
 "packets inherit the TTL value."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:205
-#: ../clients/common/settings-docs.h.in:228
+#: ../clients/common/settings-docs.h.in:213
+#: ../clients/common/settings-docs.h.in:236
 msgid "Array of IP addresses."
 msgstr ""
 
@@ -6377,23 +6380,23 @@
 "non-hardware-address client ID and the 'type' field is set to 0."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:208
+#: ../clients/common/settings-docs.h.in:216
 msgid ""
 "If the \"dhcp-send-hostname\" property is TRUE, then the specified FQDN will "
 "be sent to the DHCP server when acquiring a lease. This property and \"dhcp-"
 "hostname\" are mutually exclusive and cannot be set at the same time."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:209
-#: ../clients/common/settings-docs.h.in:231
+#: ../clients/common/settings-docs.h.in:217
+#: ../clients/common/settings-docs.h.in:239
 msgid ""
 "If the \"dhcp-send-hostname\" property is TRUE, then the specified name will "
 "be sent to the DHCP server when acquiring a lease. This property and \"dhcp-"
 "fqdn\" are mutually exclusive and cannot be set at the same time."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:212
-#: ../clients/common/settings-docs.h.in:234
+#: ../clients/common/settings-docs.h.in:220
+#: ../clients/common/settings-docs.h.in:242
 msgid ""
 "If TRUE, a hostname is sent to the DHCP server when acquiring a lease. Some "
 "DHCP servers use this hostname to update DNS databases, essentially "
@@ -6402,13 +6405,13 @@
 "of the computer is sent."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:213
-#: ../clients/common/settings-docs.h.in:235
+#: ../clients/common/settings-docs.h.in:209
+#: ../clients/common/settings-docs.h.in:229
 msgid "A timeout for a DHCP transaction in seconds."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:214
-#: ../clients/common/settings-docs.h.in:236
+#: ../clients/common/settings-docs.h.in:222
+#: ../clients/common/settings-docs.h.in:244
 msgid "Array of IP addresses of DNS servers."
 msgstr ""
 
@@ -6446,8 +6449,8 @@
 "negative DNS priority value, the subdomain is ignored."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:217
-#: ../clients/common/settings-docs.h.in:239
+#: ../clients/common/settings-docs.h.in:225
+#: ../clients/common/settings-docs.h.in:247
 msgid ""
 "Array of DNS search domains. Domains starting with a tilde ('~') are "
 "considered 'routing' domains and are used only to decide the interface over "
@@ -6462,8 +6465,8 @@
 "\"addresses\" is also set."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:219
-#: ../clients/common/settings-docs.h.in:241
+#: ../clients/common/settings-docs.h.in:227
+#: ../clients/common/settings-docs.h.in:249
 msgid ""
 "When \"method\" is set to \"auto\" and this property to TRUE, automatically "
 "configured nameservers and search domains are ignored and only nameservers "
@@ -6471,16 +6474,16 @@
 "if any, are used."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:220
-#: ../clients/common/settings-docs.h.in:242
+#: ../clients/common/settings-docs.h.in:228
+#: ../clients/common/settings-docs.h.in:250
 msgid ""
 "When \"method\" is set to \"auto\" and this property to TRUE, automatically "
 "configured routes are ignored and only routes specified in the \"routes\" "
 "property, if any, are used."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:221
-#: ../clients/common/settings-docs.h.in:244
+#: ../clients/common/settings-docs.h.in:229
+#: ../clients/common/settings-docs.h.in:252
 msgid ""
 "If TRUE, allow overall network configuration to proceed even if the "
 "configuration specified by this property times out.  Note that at least one "
@@ -6505,15 +6508,15 @@
 "10.42.x.0/24 is chosen."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:223
-#: ../clients/common/settings-docs.h.in:246
+#: ../clients/common/settings-docs.h.in:231
+#: ../clients/common/settings-docs.h.in:254
 msgid ""
 "If TRUE, this connection will never be the default connection for this IP "
 "type, meaning it will never be assigned the default route by NetworkManager."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:224
-#: ../clients/common/settings-docs.h.in:247
+#: ../clients/common/settings-docs.h.in:232
+#: ../clients/common/settings-docs.h.in:256
 msgid ""
 "The default metric for routes that don't explicitly specify a metric. The "
 "default value -1 means that the metric is chosen automatically based on the "
@@ -6524,8 +6527,8 @@
 "mean setting it to 1024. For IPv4, zero is a regular value for the metric."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:225
-#: ../clients/common/settings-docs.h.in:248
+#: ../clients/common/settings-docs.h.in:233
+#: ../clients/common/settings-docs.h.in:257
 msgid ""
 "Enable policy routing (source routing) and set the routing table used when "
 "adding routes. This affects all routes, including device-routes, IPv4LL, "
@@ -6542,12 +6545,12 @@
 "tables outside of NetworkManager."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:226
-#: ../clients/common/settings-docs.h.in:249
+#: ../clients/common/settings-docs.h.in:234
+#: ../clients/common/settings-docs.h.in:258
 msgid "Array of IP routes."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:227
+#: ../clients/common/settings-docs.h.in:235
 msgid ""
 "Configure method for creating the address for use with RFC4862 IPv6 "
 "Stateless Address Autoconfiguration. The permitted values are: "
@@ -6569,7 +6572,7 @@
 "affect the temporary addresses configured with this option."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:243
+#: ../clients/common/settings-docs.h.in:251
 msgid ""
 "Configure IPv6 Privacy Extensions for SLAAC, described in RFC4941.  If "
 "enabled, it makes the kernel generate a temporary IPv6 address in addition "
@@ -6586,38 +6589,38 @@
 "avoiding host tracking with IPv6 addresses."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:250
+#: ../clients/common/settings-docs.h.in:259
 msgid ""
 "Configure the token for draft-chown-6man-tokenised-ipv6-identifiers-02 IPv6 "
 "tokenized interface identifiers. Useful with eui64 addr-gen-mode."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:251
+#: ../clients/common/settings-docs.h.in:260
 msgid "Whether the transmitted traffic must be encrypted."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:252
+#: ../clients/common/settings-docs.h.in:261
 msgid ""
 "The pre-shared CAK (Connectivity Association Key) for MACsec Key Agreement."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:253
+#: ../clients/common/settings-docs.h.in:262
 msgid "Flags indicating how to handle the \"mka-cak\" property."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:254
+#: ../clients/common/settings-docs.h.in:263
 msgid ""
 "The pre-shared CKN (Connectivity-association Key Name) for MACsec Key "
 "Agreement."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:255
+#: ../clients/common/settings-docs.h.in:264
 msgid ""
 "Specifies how the CAK (Connectivity Association Key) for MKA (MACsec Key "
 "Agreement) is obtained."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:256
+#: ../clients/common/settings-docs.h.in:265
 msgid ""
 "If given, specifies the parent interface name or parent connection UUID from "
 "which this MACSEC interface should be created.  If this property is not "
@@ -6625,23 +6628,23 @@
 "\"mac-address\" property."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:257
+#: ../clients/common/settings-docs.h.in:266
 msgid ""
 "The port component of the SCI (Secure Channel Identifier), between 1 and "
 "65534."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:259
+#: ../clients/common/settings-docs.h.in:268
 msgid "Specifies the validation mode for incoming frames."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:260
+#: ../clients/common/settings-docs.h.in:269
 msgid ""
 "The macvlan mode, which specifies the communication mechanism between "
 "multiple macvlans on the same lower device."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:261
+#: ../clients/common/settings-docs.h.in:270
 msgid ""
 "If given, specifies the parent interface name or parent connection UUID from "
 "which this MAC-VLAN interface should be created.  If this property is not "
@@ -6649,31 +6652,31 @@
 "\"mac-address\" property."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:262
+#: ../clients/common/settings-docs.h.in:271
 msgid "Whether the interface should be put in promiscuous mode."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:263
+#: ../clients/common/settings-docs.h.in:272
 msgid "Whether the interface should be a MACVTAP."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:266
+#: ../clients/common/settings-docs.h.in:275
 msgid "The bridge failure mode. One of \"secure\", \"standalone\" or empty."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:267
+#: ../clients/common/settings-docs.h.in:276
 msgid "Enable or disable multicast snooping."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:268
+#: ../clients/common/settings-docs.h.in:277
 msgid "Enable or disable RSTP."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:269
+#: ../clients/common/settings-docs.h.in:278
 msgid "Enable or disable STP."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:258
+#: ../clients/common/settings-docs.c.in:273
 msgid "The interface type. Either \"internal\", or empty."
 msgstr ""
 
@@ -6683,47 +6686,47 @@
 "port to connect to."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:273
+#: ../clients/common/settings-docs.h.in:282
 msgid "The time port must be inactive in order to be considered down."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:274
+#: ../clients/common/settings-docs.h.in:283
 msgid ""
 "Bonding mode. One of \"active-backup\", \"balance-slb\", or \"balance-tcp\"."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:275
+#: ../clients/common/settings-docs.h.in:284
 msgid "The time port must be active before it starts forwarding traffic."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:276
+#: ../clients/common/settings-docs.h.in:285
 msgid "LACP mode. One of \"active\", \"off\", or \"passive\"."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:277
+#: ../clients/common/settings-docs.h.in:286
 msgid "The VLAN tag in the range 0-4095."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:278
+#: ../clients/common/settings-docs.h.in:287
 msgid ""
 "The VLAN mode. One of \"access\", \"native-tagged\", \"native-untagged\", "
 "\"trunk\" or unset."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:279
+#: ../clients/common/settings-docs.h.in:288
 msgid ""
 "If non-zero, instruct pppd to set the serial port to the specified baudrate. "
 " This value should normally be left as 0 to automatically choose the speed."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:280
+#: ../clients/common/settings-docs.h.in:289
 msgid ""
 "If TRUE, specify that pppd should set the serial port to use hardware flow "
 "control with RTS and CTS signals.  This value should normally be set to "
 "FALSE."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:281
+#: ../clients/common/settings-docs.h.in:290
 msgid ""
 "If non-zero, instruct pppd to presume the connection to the peer has failed "
 "if the specified number of LCP echo-requests go unanswered by the peer.  The "
@@ -6731,7 +6734,7 @@
 "property is used."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:282
+#: ../clients/common/settings-docs.h.in:291
 msgid ""
 "If non-zero, instruct pppd to send an LCP echo-request frame to the peer "
 "every n seconds (where n is the specified value).  Note that some PPP peers "
@@ -6739,78 +6742,78 @@
 "autodetect this."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:283
+#: ../clients/common/settings-docs.h.in:292
 msgid ""
 "If TRUE, stateful MPPE is used.  See pppd documentation for more information "
 "on stateful MPPE."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:284
+#: ../clients/common/settings-docs.h.in:293
 msgid ""
 "If non-zero, instruct pppd to request that the peer send packets no larger "
 "than the specified size.  If non-zero, the MRU should be between 128 and "
 "16384."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:285
+#: ../clients/common/settings-docs.h.in:294
 msgid ""
 "If non-zero, instruct pppd to send packets no larger than the specified size."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:286
+#: ../clients/common/settings-docs.h.in:295
 msgid "If TRUE, Van Jacobsen TCP header compression will not be requested."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:287
+#: ../clients/common/settings-docs.h.in:296
 msgid ""
 "If TRUE, do not require the other side (usually the PPP server) to "
 "authenticate itself to the client.  If FALSE, require authentication from "
 "the remote side.  In almost all cases, this should be TRUE."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:288
+#: ../clients/common/settings-docs.h.in:297
 msgid "If TRUE, BSD compression will not be requested."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:289
+#: ../clients/common/settings-docs.h.in:298
 msgid "If TRUE, \"deflate\" compression will not be requested."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:290
+#: ../clients/common/settings-docs.h.in:299
 msgid "If TRUE, the CHAP authentication method will not be used."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:291
+#: ../clients/common/settings-docs.h.in:300
 msgid "If TRUE, the EAP authentication method will not be used."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:292
+#: ../clients/common/settings-docs.h.in:301
 msgid "If TRUE, the MSCHAP authentication method will not be used."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:293
+#: ../clients/common/settings-docs.h.in:302
 msgid "If TRUE, the MSCHAPv2 authentication method will not be used."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:294
+#: ../clients/common/settings-docs.h.in:303
 msgid "If TRUE, the PAP authentication method will not be used."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:295
+#: ../clients/common/settings-docs.h.in:304
 msgid ""
 "If TRUE, MPPE (Microsoft Point-to-Point Encryption) will be required for the "
 "PPP session.  If either 64-bit or 128-bit MPPE is not available the session "
 "will fail.  Note that MPPE is not used on mobile broadband connections."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:296
+#: ../clients/common/settings-docs.h.in:305
 msgid ""
 "If TRUE, 128-bit MPPE (Microsoft Point-to-Point Encryption) will be required "
 "for the PPP session, and the \"require-mppe\" property must also be set to "
 "TRUE.  If 128-bit MPPE is not available the session will fail."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:297
+#: ../clients/common/settings-docs.h.in:306
 msgid ""
 "If given, specifies the parent interface name on which this PPPoE connection "
 "should be created.  If this property is not specified, the connection is "
@@ -6818,11 +6821,11 @@
 "NMSettingConnection."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:298
+#: ../clients/common/settings-docs.h.in:307
 msgid "Password used to authenticate with the PPPoE service."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:300
+#: ../clients/common/settings-docs.h.in:309
 msgid ""
 "If specified, instruct PPPoE to only initiate sessions with access "
 "concentrators that provide the specified service.  For most providers, this "
@@ -6830,47 +6833,47 @@
 "concentrators or a specific service is known to be required."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:301
+#: ../clients/common/settings-docs.h.in:310
 msgid "Username used to authenticate with the PPPoE service."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:302
+#: ../clients/common/settings-docs.h.in:311
 msgid "Whether the proxy configuration is for browser only."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:303
+#: ../clients/common/settings-docs.h.in:312
 msgid ""
 "Method for proxy configuration, Default is NM_SETTING_PROXY_METHOD_NONE (0)"
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:304
+#: ../clients/common/settings-docs.h.in:313
 msgid "PAC script for the connection."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:305
+#: ../clients/common/settings-docs.h.in:314
 msgid "PAC URL for obtaining PAC file."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:306
+#: ../clients/common/settings-docs.h.in:315
 msgid ""
 "Speed to use for communication over the serial port.  Note that this value "
 "usually has no effect for mobile broadband modems as they generally ignore "
 "speed settings and use the highest available speed."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:307
+#: ../clients/common/settings-docs.h.in:316
 msgid "Byte-width of the serial communication. The 8 in \"8n1\" for example."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:308
+#: ../clients/common/settings-docs.h.in:317
 msgid "Parity setting of the serial port."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:309
+#: ../clients/common/settings-docs.h.in:318
 msgid "Time to delay between each byte sent to the modem, in microseconds."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:310
+#: ../clients/common/settings-docs.h.in:319
 msgid ""
 "Number of stop bits for communication on the serial port.  Either 1 or 2. "
 "The 1 in \"8n1\" for example."
@@ -6880,11 +6883,11 @@
 msgid "Array of TC queuening disciplines."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:315
+#: ../clients/common/settings-docs.h.in:324
 msgid "Array of TC traffic filters."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:316
+#: ../clients/common/settings-docs.h.in:325
 msgid ""
 "The JSON configuration for the team network interface.  The property should "
 "contain raw JSON configuration data suitable for teamd, because the value is "
@@ -6905,19 +6908,19 @@
 "for more details."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:318
+#: ../clients/common/settings-docs.h.in:327
 msgid "Corresponds to the teamd mcast_rejoin.count."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:319
+#: ../clients/common/settings-docs.h.in:328
 msgid "Corresponds to the teamd mcast_rejoin.interval."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:320
+#: ../clients/common/settings-docs.h.in:329
 msgid "Corresponds to the teamd notify_peers.count."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:321
+#: ../clients/common/settings-docs.h.in:330
 msgid "Corresponds to the teamd notify_peers.interval."
 msgstr ""
 
@@ -6930,43 +6933,43 @@
 "an empty value (or if not possible to a default value)."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:323
+#: ../clients/common/settings-docs.h.in:332
 msgid "Corresponds to the teamd runner.active."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:324
+#: ../clients/common/settings-docs.h.in:333
 msgid "Corresponds to the teamd runner.agg_select_policy."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:325
+#: ../clients/common/settings-docs.h.in:334
 msgid "Corresponds to the teamd runner.fast_rate."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:326
+#: ../clients/common/settings-docs.h.in:335
 msgid "Corresponds to the teamd runner.hwaddr_policy."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:327
+#: ../clients/common/settings-docs.h.in:336
 msgid "Corresponds to the teamd runner.min_ports."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:328
+#: ../clients/common/settings-docs.h.in:337
 msgid "Corresponds to the teamd runner.sys_prio."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:329
+#: ../clients/common/settings-docs.h.in:338
 msgid "Corresponds to the teamd runner.tx_balancer.name."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:330
+#: ../clients/common/settings-docs.h.in:339
 msgid "Corresponds to the teamd runner.tx_balancer.interval."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:331
+#: ../clients/common/settings-docs.h.in:340
 msgid "Corresponds to the teamd runner.tx_hash."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:332
+#: ../clients/common/settings-docs.h.in:341
 msgid ""
 "The JSON configuration for the team port. The property should contain raw "
 "JSON configuration data suitable for teamd, because the value is passed "
@@ -6974,67 +6977,67 @@
 "man teamd.conf for the format details."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:333
+#: ../clients/common/settings-docs.h.in:342
 msgid "Corresponds to the teamd ports.PORTIFNAME.lacp_key."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:334
+#: ../clients/common/settings-docs.h.in:343
 msgid "Corresponds to the teamd ports.PORTIFNAME.lacp_prio."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:336
+#: ../clients/common/settings-docs.h.in:345
 msgid "Corresponds to the teamd ports.PORTIFNAME.prio."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:337
+#: ../clients/common/settings-docs.h.in:346
 msgid ""
 "Corresponds to the teamd ports.PORTIFNAME.queue_id. When set to -1 means the "
 "parameter is skipped from the json config."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:338
+#: ../clients/common/settings-docs.h.in:347
 msgid "Corresponds to the teamd ports.PORTIFNAME.sticky."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:339
+#: ../clients/common/settings-docs.h.in:348
 msgid ""
 "The group ID which will own the device. If set to NULL everyone will be able "
 "to use the device."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:340
+#: ../clients/common/settings-docs.h.in:349
 msgid ""
 "The operating mode of the virtual device. Allowed values are "
 "NM_SETTING_TUN_MODE_TUN (1) to create a layer 3 device and "
 "NM_SETTING_TUN_MODE_TAP (2) to create an Ethernet-like layer 2 one."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:341
+#: ../clients/common/settings-docs.h.in:350
 msgid ""
 "If the property is set to TRUE, the interface will support multiple file "
 "descriptors (queues) to parallelize packet sending or receiving. Otherwise, "
 "the interface will only support a single queue."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:342
+#: ../clients/common/settings-docs.h.in:351
 msgid ""
 "The user ID which will own the device. If set to NULL everyone will be able "
 "to use the device."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:343
+#: ../clients/common/settings-docs.h.in:352
 msgid ""
 "If TRUE the interface will prepend a 4 byte header describing the physical "
 "interface to the packets."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:344
+#: ../clients/common/settings-docs.h.in:353
 msgid ""
 "If TRUE the IFF_VNET_HDR the tunnel packets will include a virtio network "
 "header."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:345
+#: ../clients/common/settings-docs.h.in:354
 msgid ""
 "A dictionary of key/value pairs with user data. This data is ignored by "
 "NetworkManager and can be used at the users discretion. The keys only "
@@ -7042,14 +7045,14 @@
 "up to a certain length."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:346
+#: ../clients/common/settings-docs.h.in:355
 msgid ""
 "For outgoing packets, a list of mappings from Linux SKB priorities to 802.1p "
 "priorities.  The mapping is given in the format \"from:to\" where both "
 "\"from\" and \"to\" are unsigned integers, ie \"7:3\"."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:347
+#: ../clients/common/settings-docs.h.in:356
 msgid ""
 "One or more flags which control the behavior and features of the VLAN "
 "interface.  Flags include NM_VLAN_FLAG_REORDER_HEADERS (0x1) (reordering of "
@@ -7062,20 +7065,20 @@
 "missing property on D-Bus is still considered as 0."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:348
+#: ../clients/common/settings-docs.h.in:357
 msgid ""
 "The VLAN identifier that the interface created by this connection should be "
 "assigned. The valid range is from 0 to 4094, without the reserved id 4095."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:349
+#: ../clients/common/settings-docs.h.in:358
 msgid ""
 "For incoming packets, a list of mappings from 802.1p priorities to Linux SKB "
 "priorities.  The mapping is given in the format \"from:to\" where both "
 "\"from\" and \"to\" are unsigned integers, ie \"7:3\"."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:350
+#: ../clients/common/settings-docs.h.in:359
 msgid ""
 "If given, specifies the parent interface name or parent connection UUID from "
 "which this VLAN interface should be created.  If this property is not "
@@ -7083,32 +7086,32 @@
 "\"mac-address\" property."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:351
+#: ../clients/common/settings-docs.h.in:360
 msgid ""
 "Dictionary of key/value pairs of VPN plugin specific data.  Both keys and "
 "values must be strings."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:352
+#: ../clients/common/settings-docs.h.in:361
 msgid ""
 "If the VPN service supports persistence, and this property is TRUE, the VPN "
 "will attempt to stay connected across link changes and outages, until "
 "explicitly disconnected."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:353
+#: ../clients/common/settings-docs.h.in:362
 msgid ""
 "Dictionary of key/value pairs of VPN plugin specific secrets like passwords "
 "or private keys.  Both keys and values must be strings."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:354
+#: ../clients/common/settings-docs.h.in:363
 msgid ""
 "D-Bus service name of the VPN plugin that this setting uses to connect to "
 "its network.  i.e. org.freedesktop.NetworkManager.vpnc for the vpnc plugin."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:355
+#: ../clients/common/settings-docs.h.in:364
 msgid ""
 "Timeout for the VPN service to establish the connection. Some services may "
 "take quite a long time to connect. Value of 0 means a default timeout, which "
@@ -7116,7 +7119,7 @@
 "Values greater than zero mean timeout in seconds."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:356
+#: ../clients/common/settings-docs.h.in:365
 msgid ""
 "If the VPN connection requires a user name for authentication, that name "
 "should be provided here.  If the connection is available to more than one "
@@ -7126,144 +7129,144 @@
 "connection."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:357
+#: ../clients/common/settings-docs.h.in:367
 msgid ""
 "Specifies the lifetime in seconds of FDB entries learnt by the kernel."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:358
+#: ../clients/common/settings-docs.h.in:368
 msgid ""
 "Specifies the UDP destination port to communicate to the remote VXLAN tunnel "
 "endpoint."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:359
+#: ../clients/common/settings-docs.h.in:369
 msgid ""
 "Specifies the VXLAN Network Identifier (or VXLAN Segment Identifier) to use."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:360
+#: ../clients/common/settings-docs.h.in:370
 msgid "Specifies whether netlink LL ADDR miss notifications are generated."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:361
+#: ../clients/common/settings-docs.h.in:371
 msgid "Specifies whether netlink IP ADDR miss notifications are generated."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:362
+#: ../clients/common/settings-docs.h.in:372
 msgid ""
 "Specifies whether unknown source link layer addresses and IP addresses are "
 "entered into the VXLAN device forwarding database."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:363
+#: ../clients/common/settings-docs.h.in:373
 msgid ""
 "Specifies the maximum number of FDB entries. A value of zero means that the "
 "kernel will store unlimited entries."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:364
+#: ../clients/common/settings-docs.h.in:374
 msgid "If given, specifies the source IP address to use in outgoing packets."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:365
+#: ../clients/common/settings-docs.h.in:375
 msgid ""
 "If given, specifies the parent interface name or parent connection UUID."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:366
+#: ../clients/common/settings-docs.h.in:376
 msgid "Specifies whether ARP proxy is turned on."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:367
+#: ../clients/common/settings-docs.h.in:377
 msgid ""
 "Specifies the unicast destination IP address to use in outgoing packets when "
 "the destination link layer address is not known in the VXLAN device "
 "forwarding database, or the multicast IP address to join."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:368
+#: ../clients/common/settings-docs.h.in:378
 msgid "Specifies whether route short circuit is turned on."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:369
+#: ../clients/common/settings-docs.h.in:379
 msgid ""
 "Specifies the maximum UDP source port to communicate to the remote VXLAN "
 "tunnel endpoint."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:370
+#: ../clients/common/settings-docs.h.in:380
 msgid ""
 "Specifies the minimum UDP source port to communicate to the remote VXLAN "
 "tunnel endpoint."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:371
+#: ../clients/common/settings-docs.h.in:381
 msgid "Specifies the TOS value to use in outgoing packets."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:372
+#: ../clients/common/settings-docs.h.in:382
 msgid "Specifies the time-to-live value to use in outgoing packets."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:376
+#: ../clients/common/settings-docs.h.in:386
 msgid ""
 "If specified, this connection will only apply to the WiMAX device whose MAC "
 "address matches. This property does not change the MAC address of the device "
 "(known as MAC spoofing). Deprecated: 1"
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:377
+#: ../clients/common/settings-docs.h.in:387
 msgid ""
 "Network Service Provider (NSP) name of the WiMAX network this connection "
 "should use. Deprecated: 1"
 msgstr ""
 
-#: ../clients/nm-online.c:75
+#: ../clients/nm-online.c:77
 msgid "Connecting"
 msgstr ""
 
-#: ../clients/nm-online.c:191
+#: ../clients/nm-online.c:193
 #, c-format
 msgid "Error: timeout creating NMClient object\n"
 msgstr ""
 
-#: ../clients/nm-online.c:211
+#: ../clients/nm-online.c:216
 #, c-format
 msgid "Error: Could not create NMClient object: %s\n"
 msgstr ""
 
-#: ../clients/nm-online.c:239
+#: ../clients/nm-online.c:242
 msgid ""
 "Time to wait for a connection, in seconds (without the option, default value "
 "is 30)"
 msgstr ""
 
-#: ../clients/nm-online.c:240
+#: ../clients/nm-online.c:243
 msgid "Exit immediately if NetworkManager is not running or connecting"
 msgstr ""
 
-#: ../clients/nm-online.c:237
+#: ../clients/nm-online.c:240
 msgid "Don't print anything"
 msgstr ""
 
-#: ../clients/nm-online.c:238
+#: ../clients/nm-online.c:241
 msgid "Wait for NetworkManager startup instead of a connection"
 msgstr ""
 
-#: ../clients/nm-online.c:260
+#: ../clients/nm-online.c:265
 msgid ""
 "Waits for NetworkManager to finish activating startup network connections."
 msgstr ""
 
-#: ../clients/nm-online.c:267 ../clients/nm-online.c:273
+#: ../clients/nm-online.c:272 ../clients/nm-online.c:278
 msgid "Invalid option.  Please use --help to see a list of valid options."
 msgstr ""
 
 #: ../clients/tui/newt/nmt-newt-utils.c:163 ../clients/tui/nmt-editor.c:420
 #: ../clients/tui/nmt-password-dialog.c:161
 #: ../clients/tui/nmt-route-editor.c:109 ../clients/tui/nmtui-hostname.c:56
-#: ../clients/tui/nmtui.c:121
+#: ../clients/tui/nmtui.c:123
 msgid "OK"
 msgstr ""
 
@@ -7293,105 +7296,105 @@
 msgid "Could not re-read file: %s"
 msgstr ""
 
-#: ../clients/tui/nm-editor-utils.c:140 ../libnm/nm-device.c:1455
+#: ../clients/tui/nm-editor-utils.c:135 ../libnm/nm-device.c:1522
 msgid "Ethernet"
 msgstr ""
 
-#: ../clients/tui/nm-editor-utils.c:144
+#: ../clients/tui/nm-editor-utils.c:139
 #, c-format
 msgid "Ethernet connection %d"
 msgstr ""
 
-#: ../clients/tui/nm-editor-utils.c:148 ../libnm/nm-device.c:1457
+#: ../clients/tui/nm-editor-utils.c:143 ../libnm/nm-device.c:1524
 msgid "Wi-Fi"
 msgstr ""
 
-#: ../clients/tui/nm-editor-utils.c:152
+#: ../clients/tui/nm-editor-utils.c:147
 #, c-format
 msgid "Wi-Fi connection %d"
 msgstr ""
 
-#: ../clients/tui/nm-editor-utils.c:157 ../libnm-core/nm-connection.c:2752
-#: ../libnm/nm-device.c:1473
+#: ../clients/tui/nm-editor-utils.c:152 ../libnm-core/nm-connection.c:2713
+#: ../libnm/nm-device.c:1540
 msgid "InfiniBand"
 msgstr ""
 
-#: ../clients/tui/nm-editor-utils.c:161
+#: ../clients/tui/nm-editor-utils.c:156
 #, c-format
 msgid "InfiniBand connection %d"
 msgstr ""
 
-#: ../clients/tui/nm-editor-utils.c:166 ../libnm/nm-device.c:1471
+#: ../clients/tui/nm-editor-utils.c:161 ../libnm/nm-device.c:1538
 msgid "Mobile Broadband"
 msgstr ""
 
-#: ../clients/tui/nm-editor-utils.c:169
+#: ../clients/tui/nm-editor-utils.c:164
 #, c-format
 msgid "Mobile broadband connection %d"
 msgstr ""
 
-#: ../clients/tui/nm-editor-utils.c:175 ../clients/tui/nmt-page-dsl.c:49
+#: ../clients/tui/nm-editor-utils.c:170 ../clients/tui/nmt-page-dsl.c:49
 msgid "DSL"
 msgstr ""
 
-#: ../clients/tui/nm-editor-utils.c:179
+#: ../clients/tui/nm-editor-utils.c:174
 #, c-format
 msgid "DSL connection %d"
 msgstr ""
 
-#: ../clients/tui/nm-editor-utils.c:184 ../libnm-core/nm-connection.c:2744
-#: ../libnm/nm-device.c:1475
-#: ../src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c:4959
+#: ../clients/tui/nm-editor-utils.c:179 ../libnm-core/nm-connection.c:2705
+#: ../libnm/nm-device.c:1542
+#: ../src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c:5036
 msgid "Bond"
 msgstr ""
 
-#: ../clients/tui/nm-editor-utils.c:188
+#: ../clients/tui/nm-editor-utils.c:183
 #, c-format
 msgid "Bond connection %d"
 msgstr ""
 
-#: ../clients/tui/nm-editor-utils.c:193 ../libnm-core/nm-connection.c:2748
-#: ../libnm/nm-device.c:1479
-#: ../src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c:5314
+#: ../clients/tui/nm-editor-utils.c:188 ../libnm-core/nm-connection.c:2709
+#: ../libnm/nm-device.c:1546
+#: ../src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c:5400
 msgid "Bridge"
 msgstr ""
 
-#: ../clients/tui/nm-editor-utils.c:198
+#: ../clients/tui/nm-editor-utils.c:193
 #, c-format
 msgid "Bridge connection %d"
 msgstr ""
 
-#: ../clients/tui/nm-editor-utils.c:202 ../libnm-core/nm-connection.c:2746
-#: ../libnm/nm-device.c:1477
-#: ../src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c:5032
+#: ../clients/tui/nm-editor-utils.c:197 ../libnm-core/nm-connection.c:2707
+#: ../libnm/nm-device.c:1544
+#: ../src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c:5109
 msgid "Team"
 msgstr ""
 
-#: ../clients/tui/nm-editor-utils.c:207
+#: ../clients/tui/nm-editor-utils.c:202
 #, c-format
 msgid "Team connection %d"
 msgstr ""
 
-#: ../clients/tui/nm-editor-utils.c:211 ../clients/tui/nmt-page-vlan.c:69
-#: ../libnm-core/nm-connection.c:2750 ../libnm/nm-device.c:1481
+#: ../clients/tui/nm-editor-utils.c:206 ../clients/tui/nmt-page-vlan.c:69
+#: ../libnm-core/nm-connection.c:2711 ../libnm/nm-device.c:1548
 msgid "VLAN"
 msgstr ""
 
-#: ../clients/tui/nm-editor-utils.c:215
+#: ../clients/tui/nm-editor-utils.c:210
 #, c-format
 msgid "VLAN connection %d"
 msgstr ""
 
-#: ../clients/tui/nm-editor-utils.c:219 ../clients/tui/nmt-page-ip-tunnel.c:123
+#: ../clients/tui/nm-editor-utils.c:214 ../clients/tui/nmt-page-ip-tunnel.c:123
 msgid "IP tunnel"
 msgstr ""
 
-#: ../clients/tui/nm-editor-utils.c:223
+#: ../clients/tui/nm-editor-utils.c:218
 #, c-format
 msgid "IP tunnel connection %d"
 msgstr ""
 
-#: ../clients/tui/nm-editor-utils.c:238
+#: ../clients/tui/nm-editor-utils.c:233
 #, c-format
 msgid "VPN connection %d"
 msgstr ""
@@ -7524,7 +7527,7 @@
 msgstr ""
 
 #: ../clients/tui/nmt-page-bond.c:365 ../clients/tui/nmt-page-ip-tunnel.c:135
-#: ../clients/tui/nmt-page-wifi.c:218
+#: ../clients/tui/nmt-page-wifi.c:219
 msgid "Mode"
 msgstr ""
 
@@ -7559,7 +7562,7 @@
 msgstr ""
 
 #: ../clients/tui/nmt-page-bond.c:418 ../clients/tui/nmt-page-ethernet.c:64
-#: ../clients/tui/nmt-page-vlan.c:97 ../clients/tui/nmt-page-wifi.c:353
+#: ../clients/tui/nmt-page-vlan.c:97 ../clients/tui/nmt-page-wifi.c:354
 msgid "Cloned MAC address"
 msgstr ""
 
@@ -7624,7 +7627,7 @@
 #: ../clients/tui/nmt-page-ethernet.c:70
 #: ../clients/tui/nmt-page-infiniband.c:81
 #: ../clients/tui/nmt-page-ip-tunnel.c:173 ../clients/tui/nmt-page-vlan.c:103
-#: ../clients/tui/nmt-page-wifi.c:359
+#: ../clients/tui/nmt-page-wifi.c:360
 msgid "MTU"
 msgstr ""
 
@@ -7913,68 +7916,69 @@
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../clients/tui/nmt-page-wifi.c:79
+#: ../clients/tui/nmt-page-wifi.c:80
 msgctxt "WEP key index"
 msgid "1 (Default)"
 msgstr ""
 
-#: ../clients/tui/nmt-page-wifi.c:80
+#: ../clients/tui/nmt-page-wifi.c:81
 msgctxt "WEP key index"
 msgid "2"
 msgstr ""
 
-#: ../clients/tui/nmt-page-wifi.c:81
+#: ../clients/tui/nmt-page-wifi.c:82
 msgctxt "WEP key index"
 msgid "3"
 msgstr ""
 
-#: ../clients/tui/nmt-page-wifi.c:82
+#: ../clients/tui/nmt-page-wifi.c:83
 msgctxt "WEP key index"
 msgid "4"
 msgstr ""
 
-#: ../clients/tui/nmt-page-wifi.c:87
+#: ../clients/tui/nmt-page-wifi.c:88
 msgid "Open System"
 msgstr "ระบบเปิด"
 
-#: ../clients/tui/nmt-page-wifi.c:88
+#: ../clients/tui/nmt-page-wifi.c:89
 msgid "Shared Key"
 msgstr "ใช้กุญแจร่วมกัน"
 
-#: ../clients/tui/nmt-page-wifi.c:202
+#: ../clients/tui/nmt-page-wifi.c:203
 msgid "WI-FI"
 msgstr ""
 
-#: ../clients/tui/nmt-page-wifi.c:244
+#: ../clients/tui/nmt-page-wifi.c:245
 msgid "Channel"
 msgstr ""
 
-#: ../clients/cli/devices.c:4227 ../clients/cli/devices.c:4231
-#: ../clients/cli/devices.c:4236 ../clients/tui/nmt-page-wifi.c:249
+#: ../clients/cli/devices.c:4360 ../clients/cli/devices.c:4364
+#: ../clients/cli/devices.c:4369 ../clients/cli/devices.c:4372
+#: ../clients/tui/nmt-page-wifi.c:250
 msgid "Security"
 msgstr ""
 
 #. "wpa-enterprise"
 #. FIXME
-#: ../clients/tui/nmt-page-wifi.c:271
+#: ../clients/tui/nmt-page-wifi.c:272
 msgid "(No support for wpa-enterprise yet...)"
 msgstr ""
 
-#: ../clients/tui/nmt-page-wifi.c:281 ../clients/tui/nmt-page-wifi.c:300
+#: ../clients/tui/nmt-page-wifi.c:282 ../clients/tui/nmt-page-wifi.c:301
 msgid "WEP index"
 msgstr ""
 
-#: ../clients/tui/nmt-page-wifi.c:289 ../clients/tui/nmt-page-wifi.c:308
+#: ../clients/tui/nmt-page-wifi.c:290 ../clients/tui/nmt-page-wifi.c:309
 msgid "Authentication"
 msgstr ""
 
 #. "dynamic-wep"
 #. FIXME
-#: ../clients/tui/nmt-page-wifi.c:314
+#: ../clients/tui/nmt-page-wifi.c:315
 msgid "(No support for dynamic-wep yet...)"
 msgstr ""
 
-#: ../clients/tui/nmt-page-wifi.c:347
+#: ../clients/tui/nmt-page-wifi.c:348
 msgid "BSSID"
 msgstr ""
 
@@ -8062,7 +8066,7 @@
 msgstr ""
 
 #: ../clients/tui/nmtui-connect.c:432 ../clients/tui/nmtui-edit.c:105
-#: ../clients/tui/nmtui.c:115
+#: ../clients/tui/nmtui.c:117
 msgid "Quit"
 msgstr ""
 
@@ -8131,48 +8135,50 @@
 msgid "Unable to set hostname: %s"
 msgstr ""
 
-#: ../clients/tui/nmtui.c:38 ../clients/tui/nmtui.c:41
+#: ../clients/tui/nmtui.c:40 ../clients/tui/nmtui.c:43
 msgid "connection"
 msgstr ""
 
-#: ../clients/tui/nmtui.c:39
+#: ../clients/tui/nmtui.c:41
 msgid "Edit a connection"
 msgstr ""
 
-#: ../clients/tui/nmtui.c:42
+#: ../clients/tui/nmtui.c:44
 msgid "Activate a connection"
 msgstr ""
 
-#: ../clients/tui/nmtui.c:44
+#: ../clients/tui/nmtui.c:46
 msgid "new hostname"
 msgstr ""
 
-#: ../clients/tui/nmtui.c:45
+#: ../clients/tui/nmtui.c:47
 msgid "Set system hostname"
 msgstr ""
 
-#: ../clients/tui/nmtui.c:89
+#: ../clients/tui/nmtui.c:91
 msgid "NetworkManager TUI"
 msgstr ""
 
-#: ../clients/tui/nmtui.c:97
+#: ../clients/tui/nmtui.c:99
 msgid "Please select an option"
 msgstr ""
 
-#: ../clients/tui/nmtui.c:145
+#: ../clients/tui/nmtui.c:147
 msgid "Usage"
 msgstr ""
 
-#: ../clients/tui/nmtui.c:226
+#: ../clients/tui/nmtui.c:228
 msgid "Could not parse arguments"
 msgstr ""
 
-#: ../clients/tui/nmtui.c:236
+#: ../clients/tui/nmtui.c:241
 #, c-format
 msgid "Could not contact NetworkManager: %s.\n"
 msgstr ""
 
-#: ../clients/tui/nmtui.c:241
+#. NetworkManager quit while we were waiting.
+#: ../clients/cli/general.c:541 ../clients/tui/nmtui.c:246
+#, c-format
 msgid "NetworkManager is not running."
 msgstr ""
 
@@ -8181,7 +8187,7 @@
 msgid "PEM key file had no end tag '%s'."
 msgstr "แฟ้มกุญแจ PEM ไม่ได้ลงท้ายด้วย '%s'"
 
-#: ../libnm-util/crypto.c:143
+#: ../libnm-core/crypto.c:131 ../libnm-util/crypto.c:144
 #, c-format
 msgid "Doesn't look like a PEM private key file."
 msgstr "ดูไม่เหมือนแฟ้มกุญแจ PEM ส่วนตัว"
@@ -8244,9 +8250,11 @@
 msgid "IV contains non-hexadecimal digits."
 msgstr "IV บรรจุค่าที่ไม่ใช่เลขฐานสิบหก"
 
-#: ../libnm-util/crypto.c:405 ../libnm-util/crypto_gnutls.c:151
-#: ../libnm-util/crypto_gnutls.c:253 ../libnm-util/crypto_nss.c:162
-#: ../libnm-util/crypto_nss.c:323
+#: ../libnm-core/crypto.c:395 ../libnm-core/crypto_gnutls.c:91
+#: ../libnm-core/crypto_gnutls.c:197 ../libnm-core/crypto_nss.c:112
+#: ../libnm-core/crypto_nss.c:277 ../libnm-util/crypto.c:406
+#: ../libnm-util/crypto_gnutls.c:151 ../libnm-util/crypto_gnutls.c:256
+#: ../libnm-util/crypto_nss.c:162 ../libnm-util/crypto_nss.c:323
 #, c-format
 msgid "Private key cipher '%s' was unknown."
 msgstr ""
@@ -8280,7 +8288,7 @@
 msgid "Failed to initialize the crypto engine."
 msgstr "การเริ่มต้นกลไก crypto ล้มเหลว"
 
-#: ../libnm-util/crypto_gnutls.c:159
+#: ../libnm-core/crypto_gnutls.c:99 ../libnm-util/crypto_gnutls.c:159
 #, c-format
 msgid "Invalid IV length (must be at least %zd)."
 msgstr "ความยาว IV ไม่ถูกต้อง (ต้องไม่น้อยกว่า %zd)"
@@ -8355,7 +8363,7 @@
 msgid "Failed to initialize the crypto engine: %d."
 msgstr ""
 
-#: ../libnm-util/crypto_nss.c:170
+#: ../libnm-core/crypto_nss.c:120 ../libnm-util/crypto_nss.c:170
 #, c-format
 msgid "Invalid IV length (must be at least %d)."
 msgstr "ความยาว IV ไม่ถูกต้อง (ต้องไม่น้อยกว่า %d)"
@@ -8466,52 +8474,52 @@
 msgid "duplicate setting name"
 msgstr ""
 
-#: ../libnm-core/nm-connection.c:1423
+#: ../libnm-core/nm-connection.c:1424
 msgid "setting not found"
 msgstr ""
 
-#: ../libnm-core/nm-connection.c:1502 ../libnm-core/nm-connection.c:1527
-#: ../libnm-core/nm-connection.c:1552
+#: ../libnm-core/nm-connection.c:1489 ../libnm-core/nm-connection.c:1514
+#: ../libnm-core/nm-connection.c:1539
 msgid "setting not allowed in slave connection"
 msgstr ""
 
-#: ../libnm-core/nm-connection.c:1489 ../libnm-core/nm-connection.c:1514
-#: ../libnm-core/nm-connection.c:1539
+#: ../libnm-core/nm-connection.c:1476 ../libnm-core/nm-connection.c:1501
+#: ../libnm-core/nm-connection.c:1526
 msgid "setting is required for non-slave connections"
 msgstr ""
 
-#: ../libnm-core/nm-connection.c:1720
+#: ../libnm-core/nm-connection.c:1707
 msgid "Unexpected failure to verify the connection"
 msgstr ""
 
-#: ../libnm-core/nm-connection.c:1657
+#: ../libnm-core/nm-connection.c:1644
 msgid "Unexpected failure to normalize the connection"
 msgstr ""
 
-#: ../libnm-core/nm-connection.c:2609 ../libnm-core/nm-setting-8021x.c:2574
-#: ../libnm-core/nm-setting-8021x.c:2591 ../libnm-core/nm-setting-8021x.c:2622
-#: ../libnm-core/nm-setting-8021x.c:2639 ../libnm-core/nm-setting-8021x.c:2681
-#: ../libnm-core/nm-setting-8021x.c:2693 ../libnm-core/nm-setting-8021x.c:2711
-#: ../libnm-core/nm-setting-8021x.c:2723 ../libnm-core/nm-setting-8021x.c:2747
-#: ../libnm-core/nm-setting-8021x.c:2840 ../libnm-core/nm-setting-adsl.c:158
+#: ../libnm-core/nm-connection.c:2569 ../libnm-core/nm-setting-8021x.c:2610
+#: ../libnm-core/nm-setting-8021x.c:2627 ../libnm-core/nm-setting-8021x.c:2658
+#: ../libnm-core/nm-setting-8021x.c:2675 ../libnm-core/nm-setting-8021x.c:2717
+#: ../libnm-core/nm-setting-8021x.c:2729 ../libnm-core/nm-setting-8021x.c:2747
+#: ../libnm-core/nm-setting-8021x.c:2759 ../libnm-core/nm-setting-8021x.c:2783
+#: ../libnm-core/nm-setting-8021x.c:2876 ../libnm-core/nm-setting-adsl.c:158
 #: ../libnm-core/nm-setting-bluetooth.c:109
 #: ../libnm-core/nm-setting-bluetooth.c:167
 #: ../libnm-core/nm-setting-bluetooth.c:181 ../libnm-core/nm-setting-cdma.c:128
 #: ../libnm-core/nm-setting-connection.c:954
-#: ../libnm-core/nm-setting-connection.c:997
-#: ../libnm-core/nm-setting-connection.c:1177
-#: ../libnm-core/nm-setting-ip-config.c:4946
-#: ../libnm-core/nm-setting-ip-tunnel.c:359
+#: ../libnm-core/nm-setting-connection.c:983
+#: ../libnm-core/nm-setting-connection.c:1220
+#: ../libnm-core/nm-setting-ip-config.c:4935
+#: ../libnm-core/nm-setting-ip-tunnel.c:367
 #: ../libnm-core/nm-setting-olpc-mesh.c:84
 #: ../libnm-core/nm-setting-ovs-patch.c:77 ../libnm-core/nm-setting-pppoe.c:130
-#: ../libnm-core/nm-setting-vpn.c:516 ../libnm-core/nm-setting-vxlan.c:323
+#: ../libnm-core/nm-setting-vpn.c:551 ../libnm-core/nm-setting-vxlan.c:323
 #: ../libnm-core/nm-setting-wifi-p2p.c:122 ../libnm-core/nm-setting-wimax.c:94
-#: ../libnm-core/nm-setting-wireless-security.c:902
-#: ../libnm-core/nm-setting-wireless.c:759
+#: ../libnm-core/nm-setting-wireless-security.c:894
+#: ../libnm-core/nm-setting-wireless.c:764
 msgid "property is missing"
 msgstr ""
 
-#: ../libnm-core/nm-connection.c:2755
+#: ../libnm-core/nm-connection.c:2716
 msgid "IP Tunnel"
 msgstr ""
 
@@ -8520,62 +8528,62 @@
 msgid "Method returned type '%s', but expected '%s'"
 msgstr ""
 
-#: ../libnm-core/nm-keyfile.c:196
+#: ../shared/nm-keyfile/nm-keyfile.c:197
 msgid "ignoring missing number"
 msgstr ""
 
-#: ../libnm-core/nm-keyfile.c:204
+#: ../shared/nm-keyfile/nm-keyfile.c:205
 #, c-format
 msgid "ignoring invalid number '%s'"
 msgstr ""
 
-#: ../libnm-core/nm-keyfile.c:225
+#: ../shared/nm-keyfile/nm-keyfile.c:226
 #, c-format
 msgid "ignoring invalid %s address: %s"
 msgstr ""
 
-#: ../libnm-core/nm-keyfile.c:268
+#: ../shared/nm-keyfile/nm-keyfile.c:269
 #, c-format
 msgid "ignoring invalid gateway '%s' for %s route"
 msgstr ""
 
-#: ../libnm-core/nm-keyfile.c:292
+#: ../shared/nm-keyfile/nm-keyfile.c:293
 #, c-format
 msgid "ignoring invalid %s route: %s"
 msgstr ""
 
-#: ../libnm-core/nm-keyfile.c:464
+#: ../shared/nm-keyfile/nm-keyfile.c:465
 #, c-format
 msgid "unexpected character '%c' for address %s: '%s' (position %td)"
 msgstr ""
 
-#: ../libnm-core/nm-keyfile.c:474
+#: ../shared/nm-keyfile/nm-keyfile.c:475
 #, c-format
 msgid "unexpected character '%c' for %s: '%s' (position %td)"
 msgstr ""
 
-#: ../libnm-core/nm-keyfile.c:483
+#: ../shared/nm-keyfile/nm-keyfile.c:484
 #, c-format
 msgid ""
 "unexpected character '%c' in prefix length for %s: '%s' (position %td)"
 msgstr ""
 
-#: ../libnm-core/nm-keyfile.c:494
+#: ../shared/nm-keyfile/nm-keyfile.c:495
 #, c-format
 msgid "garbage at the end of value %s: '%s'"
 msgstr ""
 
-#: ../libnm-core/nm-keyfile.c:500
+#: ../shared/nm-keyfile/nm-keyfile.c:501
 #, c-format
 msgid "deprecated semicolon at the end of value %s: '%s'"
 msgstr ""
 
-#: ../libnm-core/nm-keyfile.c:514
+#: ../shared/nm-keyfile/nm-keyfile.c:515
 #, c-format
 msgid "invalid prefix length for %s '%s', defaulting to %d"
 msgstr ""
 
-#: ../libnm-core/nm-keyfile.c:521
+#: ../shared/nm-keyfile/nm-keyfile.c:522
 #, c-format
 msgid "missing prefix length for %s '%s', defaulting to %d"
 msgstr ""
@@ -8590,75 +8598,76 @@
 msgid "ignoring invalid DNS server IPv6 address '%s'"
 msgstr ""
 
-#: ../libnm-core/nm-keyfile.c:990 ../libnm-core/nm-keyfile.c:3143
+#: ../shared/nm-keyfile/nm-keyfile.c:3121
 #, c-format
 msgid "ignoring invalid byte element '%d' (not between 0 and 255 inclusive)"
 msgstr ""
 
-#: ../libnm-core/nm-keyfile.c:1001
+#: ../shared/nm-keyfile/nm-keyfile.c:979
 msgid "ignoring invalid MAC address"
 msgstr ""
 
-#: ../libnm-core/nm-keyfile.c:1260
+#: ../shared/nm-keyfile/nm-keyfile.c:1238
 msgid "ignoring invalid SSID"
 msgstr ""
 
-#: ../libnm-core/nm-keyfile.c:1276
+#: ../shared/nm-keyfile/nm-keyfile.c:1254
 msgid "ignoring invalid raw password"
 msgstr ""
 
-#: ../libnm-core/nm-keyfile.c:1447 ../libnm-core/nm-keyfile.c:1530
+#: ../shared/nm-keyfile/nm-keyfile.c:1425
+#: ../shared/nm-keyfile/nm-keyfile.c:1508
 #, c-format
 msgid "certificate or key file '%s' does not exist"
 msgstr ""
 
-#: ../libnm-core/nm-keyfile.c:1427
+#: ../shared/nm-keyfile/nm-keyfile.c:1405
 #, c-format
 msgid "invalid key/cert value path \"%s\""
 msgstr ""
 
-#: ../libnm-core/nm-keyfile.c:1456
+#: ../shared/nm-keyfile/nm-keyfile.c:1434
 #, c-format
 msgid "invalid PKCS#11 URI \"%s\""
 msgstr ""
 
-#: ../libnm-core/nm-keyfile.c:1500
+#: ../shared/nm-keyfile/nm-keyfile.c:1478
 msgid "invalid key/cert value data:;base64, is not base64"
 msgstr ""
 
-#: ../libnm-core/nm-keyfile.c:1509
+#: ../shared/nm-keyfile/nm-keyfile.c:1487
 msgid "invalid key/cert value data:;base64,file://"
 msgstr ""
 
-#: ../libnm-core/nm-keyfile.c:1542
+#: ../shared/nm-keyfile/nm-keyfile.c:1520
 msgid "invalid key/cert value is not a valid blob"
 msgstr ""
 
-#: ../libnm-core/nm-keyfile.c:1416
+#: ../shared/nm-keyfile/nm-keyfile.c:1394
 msgid "invalid key/cert value"
 msgstr ""
 
-#: ../libnm-core/nm-keyfile.c:1644
+#: ../shared/nm-keyfile/nm-keyfile.c:1622
 #, c-format
 msgid "invalid parity value '%s'"
 msgstr ""
 
-#: ../libnm-core/nm-keyfile.c:1678
+#: ../shared/nm-keyfile/nm-keyfile.c:1656
 #, c-format
 msgid "ignoring invalid team configuration: %s"
 msgstr ""
 
-#: ../libnm-core/nm-keyfile.c:1756
+#: ../shared/nm-keyfile/nm-keyfile.c:1734
 #, c-format
 msgid "invalid qdisc: %s"
 msgstr ""
 
-#: ../libnm-core/nm-keyfile.c:1802
+#: ../shared/nm-keyfile/nm-keyfile.c:1780
 #, c-format
 msgid "invalid tfilter: %s"
 msgstr ""
 
-#: ../libnm-core/nm-keyfile.c:3042
+#: ../shared/nm-keyfile/nm-keyfile.c:3020
 #, c-format
 msgid "error loading setting value: %s"
 msgstr ""
@@ -8688,119 +8697,118 @@
 msgid "unhandled setting property type '%s'"
 msgstr ""
 
-#: ../libnm-core/nm-keyfile.c:3219
+#: ../shared/nm-keyfile/nm-keyfile.c:3197
 #, c-format
 msgid "invalid setting name '%s'"
 msgstr ""
 
-#: ../libnm-core/nm-setting-8021x.c:276
+#: ../libnm-core/nm-setting-8021x.c:280
 msgid "data missing"
 msgstr ""
 
-#: ../libnm-core/nm-setting-8021x.c:213
+#: ../libnm-core/nm-setting-8021x.c:217
 msgid "binary data missing"
 msgstr ""
 
-#: ../libnm-core/nm-setting-8021x.c:241
+#: ../libnm-core/nm-setting-8021x.c:245
 msgid "URI not NUL terminated"
 msgstr ""
 
-#: ../libnm-core/nm-setting-8021x.c:250
+#: ../libnm-core/nm-setting-8021x.c:254
 msgid "URI is empty"
 msgstr ""
 
-#: ../libnm-core/nm-setting-8021x.c:258
+#: ../libnm-core/nm-setting-8021x.c:262
 msgid "URI is not valid UTF-8"
 msgstr ""
 
-#: ../libnm-core/nm-setting-8021x.c:521
+#: ../libnm-core/nm-setting-8021x.c:525
 msgid "CA certificate must be in X.509 format"
 msgstr ""
 
-#: ../libnm-core/nm-setting-8021x.c:537
+#: ../libnm-core/nm-setting-8021x.c:541
 msgid "invalid certificate format"
 msgstr ""
 
-#: ../libnm-util/nm-setting-8021x.c:1811
+#: ../libnm-core/nm-setting-8021x.c:2275 ../libnm-util/nm-setting-8021x.c:1812
 msgid "invalid private key"
 msgstr ""
 
-#: ../libnm-util/nm-setting-8021x.c:2122
+#: ../libnm-core/nm-setting-8021x.c:2622 ../libnm-util/nm-setting-8021x.c:2123
 msgid "invalid phase2 private key"
 msgstr ""
 
-#: ../libnm-core/nm-setting-8021x.c:2581 ../libnm-core/nm-setting-8021x.c:2598
-#: ../libnm-core/nm-setting-8021x.c:2629 ../libnm-core/nm-setting-8021x.c:2646
-#: ../libnm-core/nm-setting-8021x.c:2687 ../libnm-core/nm-setting-8021x.c:2699
-#: ../libnm-core/nm-setting-8021x.c:2717 ../libnm-core/nm-setting-8021x.c:2729
-#: ../libnm-core/nm-setting-8021x.c:2754 ../libnm-core/nm-setting-adsl.c:165
+#: ../libnm-core/nm-setting-8021x.c:2617 ../libnm-core/nm-setting-8021x.c:2634
+#: ../libnm-core/nm-setting-8021x.c:2665 ../libnm-core/nm-setting-8021x.c:2682
+#: ../libnm-core/nm-setting-8021x.c:2723 ../libnm-core/nm-setting-8021x.c:2735
+#: ../libnm-core/nm-setting-8021x.c:2753 ../libnm-core/nm-setting-8021x.c:2765
+#: ../libnm-core/nm-setting-8021x.c:2790 ../libnm-core/nm-setting-adsl.c:166
 #: ../libnm-core/nm-setting-cdma.c:135 ../libnm-core/nm-setting-cdma.c:144
 #: ../libnm-core/nm-setting-connection.c:961
-#: ../libnm-core/nm-setting-connection.c:1009
-#: ../libnm-core/nm-setting-gsm.c:289 ../libnm-core/nm-setting-gsm.c:347
-#: ../libnm-core/nm-setting-gsm.c:384 ../libnm-core/nm-setting-gsm.c:393
-#: ../libnm-core/nm-setting-ip-config.c:4953
+#: ../libnm-core/nm-setting-connection.c:995 ../libnm-core/nm-setting-gsm.c:283
+#: ../libnm-core/nm-setting-gsm.c:341 ../libnm-core/nm-setting-gsm.c:378
+#: ../libnm-core/nm-setting-gsm.c:387 ../libnm-core/nm-setting-ip-config.c:4942
 #: ../libnm-core/nm-setting-ip4-config.c:167
 #: ../libnm-core/nm-setting-ip4-config.c:174
 #: ../libnm-core/nm-setting-pppoe.c:137 ../libnm-core/nm-setting-pppoe.c:146
-#: ../libnm-core/nm-setting-vpn.c:525 ../libnm-core/nm-setting-vpn.c:535
+#: ../libnm-core/nm-setting-vpn.c:559 ../libnm-core/nm-setting-vpn.c:570
 #: ../libnm-core/nm-setting-wimax.c:103
-#: ../libnm-core/nm-setting-wireless-security.c:945
-#: ../libnm-core/nm-setting-wireless-security.c:969
-#: ../libnm-core/nm-setting.c:1243
+#: ../libnm-core/nm-setting-wireless-security.c:937
+#: ../libnm-core/nm-setting-wireless-security.c:961
+#: ../libnm-core/nm-setting.c:1246
 msgid "property is empty"
 msgstr ""
 
-#: ../libnm-core/nm-setting-8021x.c:2611 ../libnm-core/nm-setting-8021x.c:2659
+#: ../libnm-core/nm-setting-8021x.c:2647 ../libnm-core/nm-setting-8021x.c:2695
 #, c-format
 msgid "has to match '%s' property for PKCS#12"
 msgstr ""
 
-#: ../libnm-core/nm-setting-8021x.c:299 ../libnm-core/nm-setting-8021x.c:666
+#: ../libnm-core/nm-setting-8021x.c:303 ../libnm-core/nm-setting-8021x.c:670
 #, c-format
 msgid "certificate is invalid: %s"
 msgstr ""
 
-#: ../libnm-core/nm-setting-8021x.c:676
+#: ../libnm-core/nm-setting-8021x.c:680
 #, c-format
 msgid "password is not supported when certificate is not on a PKCS#11 token"
 msgstr ""
 
-#: ../libnm-core/nm-setting-8021x.c:2849
+#: ../libnm-core/nm-setting-8021x.c:2885
 #: ../libnm-core/nm-setting-bluetooth.c:94
-#: ../libnm-core/nm-setting-infiniband.c:162
-#: ../libnm-core/nm-setting-infiniband.c:172
+#: ../libnm-core/nm-setting-infiniband.c:163
+#: ../libnm-core/nm-setting-infiniband.c:173
 #: ../libnm-core/nm-setting-ip4-config.c:158
-#: ../libnm-core/nm-setting-ip6-config.c:207
-#: ../libnm-core/nm-setting-ip6-config.c:218
+#: ../libnm-core/nm-setting-ip6-config.c:226
+#: ../libnm-core/nm-setting-ip6-config.c:237
 #: ../libnm-core/nm-setting-olpc-mesh.c:113
 #: ../libnm-core/nm-setting-wifi-p2p.c:131 ../libnm-core/nm-setting-wimax.c:112
 #: ../libnm-core/nm-setting-wired.c:785 ../libnm-core/nm-setting-wired.c:795
-#: ../libnm-core/nm-setting-wireless-security.c:988
-#: ../libnm-core/nm-setting-wireless-security.c:997
-#: ../libnm-core/nm-setting-wireless-security.c:1006
-#: ../libnm-core/nm-setting-wireless-security.c:1016
-#: ../libnm-core/nm-setting-wireless-security.c:1026
-#: ../libnm-core/nm-setting-wireless-security.c:1049
-#: ../libnm-core/nm-setting-wireless-security.c:1087
-#: ../libnm-core/nm-setting-wireless-security.c:1128
-#: ../libnm-core/nm-setting-wireless.c:830
-#: ../libnm-core/nm-setting-wireless.c:839
-#: ../libnm-core/nm-setting-wireless.c:850 ../libnm-core/nm-setting-wpan.c:162
-#: ../libnm-core/nm-utils.c:4566
+#: ../libnm-core/nm-setting-wireless-security.c:980
+#: ../libnm-core/nm-setting-wireless-security.c:989
+#: ../libnm-core/nm-setting-wireless-security.c:998
+#: ../libnm-core/nm-setting-wireless-security.c:1008
+#: ../libnm-core/nm-setting-wireless-security.c:1018
+#: ../libnm-core/nm-setting-wireless-security.c:1041
+#: ../libnm-core/nm-setting-wireless-security.c:1079
+#: ../libnm-core/nm-setting-wireless-security.c:1120
+#: ../libnm-core/nm-setting-wireless.c:835
+#: ../libnm-core/nm-setting-wireless.c:844
+#: ../libnm-core/nm-setting-wireless.c:855 ../libnm-core/nm-setting-wpan.c:162
+#: ../libnm-core/nm-utils.c:4562
 msgid "property is invalid"
 msgstr ""
 
-#: ../libnm-core/nm-setting-8021x.c:2876 ../libnm-core/nm-setting-8021x.c:2888
-#: ../libnm-core/nm-setting-8021x.c:2902 ../libnm-core/nm-setting-8021x.c:2929
-#: ../libnm-core/nm-setting-8021x.c:2944 ../libnm-core/nm-setting-adsl.c:177
+#: ../libnm-core/nm-setting-8021x.c:2912 ../libnm-core/nm-setting-8021x.c:2924
+#: ../libnm-core/nm-setting-8021x.c:2938 ../libnm-core/nm-setting-8021x.c:2965
+#: ../libnm-core/nm-setting-8021x.c:2980 ../libnm-core/nm-setting-adsl.c:177
 #: ../libnm-core/nm-setting-adsl.c:189 ../libnm-core/nm-setting-bluetooth.c:122
-#: ../libnm-core/nm-setting-wireless-security.c:923
+#: ../libnm-core/nm-setting-wireless-security.c:915
 #, c-format
 msgid "'%s' is not a valid value for the property"
 msgstr ""
 
-#: ../libnm-core/nm-setting-8021x.c:2912
+#: ../libnm-core/nm-setting-8021x.c:2948
 msgid "invalid auth flags"
 msgstr ""
 
@@ -8814,85 +8822,84 @@
 msgid "'%s' connection requires '%s' setting"
 msgstr ""
 
-#: ../libnm-core/nm-setting-bond.c:541
+#: ../libnm-core/nm-setting-bond.c:757
 #, c-format
 msgid "invalid option '%s' or its value '%s'"
 msgstr ""
 
-#: ../libnm-core/nm-setting-bond.c:566
+#: ../libnm-core/nm-setting-bond.c:576
 #, c-format
 msgid "only one of '%s' and '%s' can be set"
 msgstr ""
 
-#: ../libnm-core/nm-setting-bond.c:579
+#: ../libnm-core/nm-setting-bond.c:789
 #, c-format
 msgid "mandatory option '%s' is missing"
 msgstr ""
 
-#: ../libnm-core/nm-setting-bond.c:589
+#: ../libnm-core/nm-setting-bond.c:799
 #, c-format
 msgid "'%s' is not a valid value for '%s'"
 msgstr ""
 
-#: ../libnm-core/nm-setting-bond.c:603
+#: ../libnm-core/nm-setting-bond.c:816
 #, c-format
 msgid "'%s=%s' is incompatible with '%s > 0'"
 msgstr ""
 
-#: ../libnm-core/nm-setting-bond.c:618
+#: ../libnm-core/nm-setting-bond.c:836
 #, c-format
 msgid "'%s' is not valid for the '%s' option: %s"
 msgstr ""
 
-#: ../libnm-core/nm-setting-bond.c:629
+#: ../libnm-core/nm-setting-bond.c:849
 #, c-format
 msgid "'%s' option is only valid for '%s=%s'"
 msgstr ""
 
-#: ../libnm-core/nm-setting-bond.c:642
+#: ../libnm-core/nm-setting-bond.c:862
 #, c-format
 msgid "'%s=%s' is not a valid configuration for '%s'"
 msgstr ""
 
-#: ../libnm-core/nm-setting-bond.c:655 ../libnm-core/nm-setting-bond.c:664
-#: ../libnm-core/nm-setting-bond.c:684 ../libnm-core/nm-setting-bond.c:720
+#: ../libnm-core/nm-setting-bond.c:912 ../libnm-core/nm-setting-bond.c:958
 #, c-format
 msgid "'%s' option requires '%s' option to be set"
 msgstr ""
 
-#: ../libnm-core/nm-setting-bond.c:695
+#: ../libnm-core/nm-setting-bond.c:927
 #, c-format
 msgid "'%s' option is empty"
 msgstr ""
 
-#: ../libnm-core/nm-setting-bond.c:707
+#: ../libnm-core/nm-setting-bond.c:941
 #, c-format
 msgid "'%s' is not a valid IPv4 address for '%s' option"
 msgstr ""
 
-#: ../libnm-core/nm-setting-bond.c:735
+#: ../libnm-core/nm-setting-bond.c:975
 #, c-format
 msgid "'%s' option is only valid with mode '%s'"
 msgstr ""
 
-#: ../libnm-core/nm-setting-bond.c:746
+#: ../libnm-core/nm-setting-bond.c:987
 #, c-format
 msgid "'%s' and '%s' cannot have different values"
 msgstr ""
 
-#: ../libnm-core/nm-setting-bond.c:762
+#: ../libnm-core/nm-setting-bond.c:1010
 #, c-format
 msgid "'%s' option should be string"
 msgstr ""
 
-#: ../libnm-core/nm-setting-bond.c:778
+#: ../libnm-core/nm-setting-bond.c:1023
 #, c-format
 msgid "'%s' option is not valid with mode '%s'"
 msgstr ""
 
 #: ../libnm-core/nm-setting-bridge-port.c:301
 #: ../libnm-core/nm-setting-ovs-bridge.c:153
-#: ../libnm-core/nm-setting-ovs-interface.c:259
+#: ../libnm-core/nm-setting-ovs-interface.c:269
 #: ../libnm-core/nm-setting-ovs-port.c:172
 #: ../libnm-core/nm-setting-team-port.c:299
 #, c-format
@@ -8900,7 +8907,7 @@
 msgstr ""
 
 #: ../libnm-core/nm-setting-bridge-port.c:312
-#: ../libnm-core/nm-setting-ovs-interface.c:280
+#: ../libnm-core/nm-setting-ovs-interface.c:290
 #: ../libnm-core/nm-setting-ovs-port.c:193
 #: ../libnm-core/nm-setting-team-port.c:310
 #, c-format
@@ -8909,16 +8916,16 @@
 "Instead it is '%s'"
 msgstr ""
 
-#: ../libnm-core/nm-setting-bridge.c:896
+#: ../libnm-core/nm-setting-bridge.c:1030
 #, c-format
 msgid "value '%d' is out of range <%d-%d>"
 msgstr ""
 
-#: ../libnm-core/nm-setting-bridge.c:913
+#: ../libnm-core/nm-setting-bridge.c:1047
 msgid "is not a valid MAC address"
 msgstr ""
 
-#: ../libnm-core/nm-setting-bridge.c:954
+#: ../libnm-core/nm-setting-bridge.c:1088
 msgid "the mask can't contain bits 0 (STP), 1 (MAC) or 2 (LACP)"
 msgstr ""
 
@@ -8932,22 +8939,22 @@
 msgid "'%s' is not a valid UUID"
 msgstr ""
 
-#: ../libnm-core/nm-setting-connection.c:1020
+#: ../libnm-core/nm-setting-connection.c:1006
 #, c-format
 msgid "connection type '%s' is not valid"
 msgstr ""
 
-#: ../libnm-core/nm-setting-connection.c:1056
+#: ../libnm-core/nm-setting-connection.c:1099
 #, c-format
 msgid "Unknown slave type '%s'"
 msgstr ""
 
-#: ../libnm-core/nm-setting-connection.c:1067
+#: ../libnm-core/nm-setting-connection.c:1110
 #, c-format
 msgid "Slave connections need a valid '%s' property"
 msgstr ""
 
-#: ../libnm-core/nm-setting-connection.c:1088
+#: ../libnm-core/nm-setting-connection.c:1131
 #, c-format
 msgid "Cannot set '%s' without '%s'"
 msgstr ""
@@ -8957,7 +8964,7 @@
 msgid "Only '%s' connections can be enslaved to '%s'"
 msgstr ""
 
-#: ../libnm-core/nm-setting-connection.c:1116
+#: ../libnm-core/nm-setting-connection.c:1159
 #, c-format
 msgid "metered value %d is not valid"
 msgstr ""
@@ -8967,201 +8974,201 @@
 msgid "mdns value %d is not valid"
 msgstr ""
 
-#: ../libnm-core/nm-setting-connection.c:1186
+#: ../libnm-core/nm-setting-connection.c:1229
 #, c-format
 msgid "property type should be set to '%s'"
 msgstr ""
 
-#: ../libnm-core/nm-setting-connection.c:1201
+#: ../libnm-core/nm-setting-connection.c:1244
 #, c-format
 msgid "slave-type '%s' requires a '%s' setting in the connection"
 msgstr ""
 
-#: ../libnm-core/nm-setting-connection.c:1211
+#: ../libnm-core/nm-setting-connection.c:1254
 #, c-format
 msgid ""
 "Detect a slave connection with '%s' set and a port type '%s'. '%s' should be "
 "set to '%s'"
 msgstr ""
 
-#: ../libnm-core/nm-setting-connection.c:1228
+#: ../libnm-core/nm-setting-connection.c:1271
 #, c-format
 msgid "A slave connection with '%s' set to '%s' cannot have a '%s' setting"
 msgstr ""
 
-#: ../libnm-core/nm-setting-dcb.c:492
+#: ../libnm-core/nm-setting-dcb.c:486
 msgid "flags invalid"
 msgstr ""
 
-#: ../libnm-core/nm-setting-dcb.c:501
+#: ../libnm-core/nm-setting-dcb.c:495
 msgid "flags invalid - disabled"
 msgstr ""
 
-#: ../libnm-core/nm-setting-dcb.c:527 ../libnm-core/nm-setting-dcb.c:576
+#: ../libnm-core/nm-setting-dcb.c:521 ../libnm-core/nm-setting-dcb.c:570
 msgid "property invalid (not enabled)"
 msgstr ""
 
-#: ../libnm-core/nm-setting-dcb.c:536
+#: ../libnm-core/nm-setting-dcb.c:530
 msgid "element invalid"
 msgstr ""
 
-#: ../libnm-core/nm-setting-dcb.c:551
+#: ../libnm-core/nm-setting-dcb.c:545
 msgid "sum not 100%"
 msgstr ""
 
-#: ../libnm-core/nm-setting-dcb.c:585 ../libnm-core/nm-setting-dcb.c:617
+#: ../libnm-core/nm-setting-dcb.c:579 ../libnm-core/nm-setting-dcb.c:611
 msgid "property invalid"
 msgstr ""
 
-#: ../libnm-core/nm-setting-dcb.c:607
+#: ../libnm-core/nm-setting-dcb.c:601
 msgid "property missing"
 msgstr ""
 
-#: ../libnm-core/nm-setting-gsm.c:302
+#: ../libnm-core/nm-setting-gsm.c:296
 #, c-format
 msgid "property value '%s' is empty or too long (>64)"
 msgstr ""
 
-#: ../libnm-core/nm-setting-gsm.c:334
+#: ../libnm-core/nm-setting-gsm.c:328
 #, c-format
 msgid "'%s' contains invalid char(s) (use [A-Za-z._-])"
 msgstr ""
 
-#: ../libnm-core/nm-setting-gsm.c:361
+#: ../libnm-core/nm-setting-gsm.c:355
 #, c-format
 msgid "'%s' length is invalid (should be 5 or 6 digits)"
 msgstr ""
 
-#: ../libnm-core/nm-setting-gsm.c:406
+#: ../libnm-core/nm-setting-gsm.c:400
 msgid "property is empty or wrong size"
 msgstr ""
 
-#: ../libnm-core/nm-setting-gsm.c:416
+#: ../libnm-core/nm-setting-gsm.c:410
 msgid "property must contain only digits"
 msgstr ""
 
-#: ../libnm-core/nm-setting-infiniband.c:193
+#: ../libnm-core/nm-setting-infiniband.c:194
 msgid "Must specify a P_Key if specifying parent"
 msgstr ""
 
-#: ../libnm-core/nm-setting-infiniband.c:203
+#: ../libnm-core/nm-setting-infiniband.c:204
 msgid "InfiniBand P_Key connection did not specify parent interface name"
 msgstr ""
 
-#: ../libnm-core/nm-setting-infiniband.c:241
+#: ../libnm-core/nm-setting-infiniband.c:227
 #, c-format
 msgid ""
 "interface name of software infiniband device must be '%s' or unset (instead "
 "it is '%s')"
 msgstr ""
 
-#: ../libnm-core/nm-setting-infiniband.c:278
+#: ../libnm-core/nm-setting-infiniband.c:291
 #, c-format
 msgid "mtu for transport mode '%s' can be at most %d but it is %d"
 msgstr ""
 
-#: ../libnm-core/nm-setting-ip-config.c:120
+#: ../libnm-core/nm-setting-ip-config.c:109
 #, c-format
 msgid "Missing IPv4 address"
 msgstr ""
 
-#: ../libnm-core/nm-setting-ip-config.c:120
+#: ../libnm-core/nm-setting-ip-config.c:109
 #, c-format
 msgid "Missing IPv6 address"
 msgstr ""
 
-#: ../libnm-core/nm-setting-ip-config.c:125
+#: ../libnm-core/nm-setting-ip-config.c:114
 #, c-format
 msgid "Invalid IPv4 address '%s'"
 msgstr ""
 
-#: ../libnm-core/nm-setting-ip-config.c:125
+#: ../libnm-core/nm-setting-ip-config.c:114
 #, c-format
 msgid "Invalid IPv6 address '%s'"
 msgstr ""
 
-#: ../libnm-core/nm-setting-ip-config.c:140
+#: ../libnm-core/nm-setting-ip-config.c:129
 #, c-format
 msgid "Invalid IPv4 address prefix '%u'"
 msgstr ""
 
-#: ../libnm-core/nm-setting-ip-config.c:140
+#: ../libnm-core/nm-setting-ip-config.c:129
 #, c-format
 msgid "Invalid IPv6 address prefix '%u'"
 msgstr ""
 
-#: ../libnm-core/nm-setting-ip-config.c:155
+#: ../libnm-core/nm-setting-ip-config.c:144
 #, c-format
 msgid "Invalid routing metric '%s'"
 msgstr ""
 
-#: ../libnm-core/nm-setting-ip-config.c:1282
+#: ../libnm-core/nm-setting-ip-config.c:1271
 #: ../libnm-core/nm-setting-sriov.c:413
 msgid "unknown attribute"
 msgstr ""
 
-#: ../libnm-core/nm-setting-ip-config.c:1292
+#: ../libnm-core/nm-setting-ip-config.c:1281
 #: ../libnm-core/nm-setting-sriov.c:423
 #, c-format
 msgid "invalid attribute type '%s'"
 msgstr ""
 
-#: ../libnm-core/nm-setting-ip-config.c:1303
+#: ../libnm-core/nm-setting-ip-config.c:1292
 #, c-format
 msgid "attribute is not valid for a IPv4 route"
 msgstr ""
 
-#: ../libnm-core/nm-setting-ip-config.c:1304
+#: ../libnm-core/nm-setting-ip-config.c:1293
 #, c-format
 msgid "attribute is not valid for a IPv6 route"
 msgstr ""
 
-#: ../libnm-core/nm-setting-ip-config.c:1318
-#: ../libnm-core/nm-setting-ip-config.c:1346
+#: ../libnm-core/nm-setting-ip-config.c:1307
+#: ../libnm-core/nm-setting-ip-config.c:1335
 #, c-format
 msgid "'%s' is not a valid IPv4 address"
 msgstr ""
 
-#: ../libnm-core/nm-setting-ip-config.c:1319
-#: ../libnm-core/nm-setting-ip-config.c:1347
+#: ../libnm-core/nm-setting-ip-config.c:1308
+#: ../libnm-core/nm-setting-ip-config.c:1336
 #, c-format
 msgid "'%s' is not a valid IPv6 address"
 msgstr ""
 
-#: ../libnm-core/nm-setting-ip-config.c:1337
+#: ../libnm-core/nm-setting-ip-config.c:1326
 #, c-format
 msgid "invalid prefix %s"
 msgstr ""
 
-#: ../libnm-core/nm-setting-ip-config.c:4966
+#: ../libnm-core/nm-setting-ip-config.c:4955
 #, c-format
 msgid "%d. DNS server address is invalid"
 msgstr ""
 
-#: ../libnm-core/nm-setting-ip-config.c:4982
+#: ../libnm-core/nm-setting-ip-config.c:4971
 #, c-format
 msgid "%d. IP address is invalid"
 msgstr ""
 
-#: ../libnm-core/nm-setting-ip-config.c:4994
+#: ../libnm-core/nm-setting-ip-config.c:4983
 #, c-format
 msgid "%d. IP address has 'label' property with invalid type"
 msgstr ""
 
-#: ../libnm-core/nm-setting-ip-config.c:5003
+#: ../libnm-core/nm-setting-ip-config.c:4992
 #, c-format
 msgid "%d. IP address has invalid label '%s'"
 msgstr ""
 
-#: ../libnm-core/nm-setting-ip-config.c:5017
+#: ../libnm-core/nm-setting-ip-config.c:5006
 msgid "gateway cannot be set if there are no addresses configured"
 msgstr ""
 
-#: ../libnm-core/nm-setting-ip-config.c:5026
+#: ../libnm-core/nm-setting-ip-config.c:5015
 msgid "gateway is invalid"
 msgstr ""
 
-#: ../libnm-core/nm-setting-ip-config.c:5040
+#: ../libnm-core/nm-setting-ip-config.c:5029
 #, c-format
 msgid "%d. route is invalid"
 msgstr ""
@@ -9171,13 +9178,13 @@
 msgid "%d. route cannot be a default route"
 msgstr ""
 
-#: ../libnm-core/nm-setting-ip-config.c:5115
+#: ../libnm-core/nm-setting-ip-config.c:5104
 #, c-format
 msgid "a gateway is incompatible with '%s'"
 msgstr ""
 
 #: ../libnm-core/nm-setting-ip4-config.c:112
-#: ../libnm-core/nm-setting-ip6-config.c:159
+#: ../libnm-core/nm-setting-ip6-config.c:178
 #, c-format
 msgid "this property cannot be empty for '%s=%s'"
 msgstr ""
@@ -9185,9 +9192,9 @@
 #: ../libnm-core/nm-setting-ip4-config.c:124
 #: ../libnm-core/nm-setting-ip4-config.c:134
 #: ../libnm-core/nm-setting-ip4-config.c:146
-#: ../libnm-core/nm-setting-ip6-config.c:174
-#: ../libnm-core/nm-setting-ip6-config.c:184
-#: ../libnm-core/nm-setting-ip6-config.c:194
+#: ../libnm-core/nm-setting-ip6-config.c:193
+#: ../libnm-core/nm-setting-ip6-config.c:203
+#: ../libnm-core/nm-setting-ip6-config.c:213
 #, c-format
 msgid "this property is not allowed for '%s=%s'"
 msgstr ""
@@ -9210,52 +9217,52 @@
 msgid "property should be TRUE when method is set to disabled"
 msgstr ""
 
-#: ../libnm-core/nm-setting-ip6-config.c:233
+#: ../libnm-core/nm-setting-ip6-config.c:252
 msgid "value is not a valid token"
 msgstr ""
 
-#: ../libnm-core/nm-setting-ip6-config.c:244
+#: ../libnm-core/nm-setting-ip6-config.c:263
 msgid "only makes sense with EUI64 address generation mode"
 msgstr ""
 
-#: ../libnm-core/nm-setting-ip6-config.c:267
+#: ../libnm-core/nm-setting-ip6-config.c:286
 msgid "token is not in canonical form"
 msgstr ""
 
-#: ../libnm-core/nm-setting-ip6-config.c:294
+#: ../libnm-core/nm-setting-ip6-config.c:276
 msgid "property should be TRUE when method is set to ignore"
 msgstr ""
 
-#: ../libnm-core/nm-setting-ip-tunnel.c:325
+#: ../libnm-core/nm-setting-ip-tunnel.c:333
 #, c-format
 msgid "'%d' is not a valid tunnel mode"
 msgstr ""
 
 #: ../libnm-core/nm-setting-6lowpan.c:112
-#: ../libnm-core/nm-setting-ip-tunnel.c:337
+#: ../libnm-core/nm-setting-ip-tunnel.c:345
 #: ../libnm-core/nm-setting-macsec.c:298 ../libnm-core/nm-setting-macvlan.c:127
 #: ../libnm-core/nm-setting-vlan.c:611 ../libnm-core/nm-setting-vxlan.c:366
 #, c-format
 msgid "'%s' is neither an UUID nor an interface name"
 msgstr ""
 
-#: ../libnm-core/nm-setting-ip-tunnel.c:348
-#: ../libnm-core/nm-setting-ip-tunnel.c:368
+#: ../libnm-core/nm-setting-ip-tunnel.c:356
+#: ../libnm-core/nm-setting-ip-tunnel.c:376
 #, c-format
 msgid "'%s' is not a valid IPv%c address"
 msgstr ""
 
-#: ../libnm-core/nm-setting-ip-tunnel.c:385
+#: ../libnm-core/nm-setting-ip-tunnel.c:393
 msgid "tunnel keys can only be specified for GRE tunnels"
 msgstr ""
 
-#: ../libnm-core/nm-setting-ip-tunnel.c:398
-#: ../libnm-core/nm-setting-ip-tunnel.c:414
+#: ../libnm-core/nm-setting-ip-tunnel.c:406
+#: ../libnm-core/nm-setting-ip-tunnel.c:422
 #, c-format
 msgid "'%s' is not a valid tunnel key"
 msgstr ""
 
-#: ../libnm-core/nm-setting-ip-tunnel.c:426
+#: ../libnm-core/nm-setting-ip-tunnel.c:434
 msgid "a fixed TTL is allowed only when path MTU discovery is enabled"
 msgstr ""
 
@@ -9299,67 +9306,67 @@
 msgstr ""
 
 #: ../libnm-core/nm-setting-olpc-mesh.c:94
-#: ../libnm-core/nm-setting-wireless.c:769
+#: ../libnm-core/nm-setting-wireless.c:774
 msgid "SSID length is out of range <1-32> bytes"
 msgstr ""
 
 #: ../libnm-core/nm-setting-olpc-mesh.c:103
-#: ../libnm-core/nm-setting-wireless.c:809
+#: ../libnm-core/nm-setting-wireless.c:814
 #, c-format
 msgid "'%d' is not a valid channel"
 msgstr ""
 
-#: ../libnm-core/nm-setting-ovs-interface.c:94
+#: ../libnm-core/nm-setting-ovs-interface.c:96
 #, c-format
 msgid "'%s' is not a valid interface type"
 msgstr ""
 
-#: ../libnm-core/nm-setting-ovs-interface.c:116
+#: ../libnm-core/nm-setting-ovs-interface.c:120
 #, c-format
 msgid "A connection with a '%s' setting needs connection.type explicitly set"
 msgstr ""
 
-#: ../libnm-core/nm-setting-ovs-interface.c:128
+#: ../libnm-core/nm-setting-ovs-interface.c:132
 #, c-format
 msgid "A connection of type '%s' cannot have ovs-interface.type \"system\""
 msgstr ""
 
-#: ../libnm-core/nm-setting-ovs-interface.c:140
+#: ../libnm-core/nm-setting-ovs-interface.c:144
 #, c-format
 msgid "A connection of type '%s' cannot have an ovs-interface.type \"%s\""
 msgstr ""
 
-#: ../libnm-core/nm-setting-ovs-interface.c:173
+#: ../libnm-core/nm-setting-ovs-interface.c:177
 #, c-format
 msgid ""
 "A connection with '%s' setting must be of connection.type \"ovs-interface\" "
 "but is \"%s\""
 msgstr ""
 
-#: ../libnm-core/nm-setting-ovs-interface.c:184
+#: ../libnm-core/nm-setting-ovs-interface.c:186
 #, c-format
 msgid ""
 "A connection with '%s' setting needs to be of 'patch' interface type, not "
 "'%s'"
 msgstr ""
 
-#: ../libnm-core/nm-setting-ovs-interface.c:201
+#: ../libnm-core/nm-setting-ovs-interface.c:206
 #, c-format
 msgid ""
 "A connection with ovs-interface.type '%s' setting a 'ovs-patch' setting"
 msgstr ""
 
-#: ../libnm-core/nm-setting-ovs-interface.c:221
+#: ../libnm-core/nm-setting-ovs-interface.c:231
 #, c-format
 msgid "Missing ovs interface setting"
 msgstr ""
 
-#: ../libnm-core/nm-setting-ovs-interface.c:227
+#: ../libnm-core/nm-setting-ovs-interface.c:237
 #, c-format
 msgid "Missing ovs interface type"
 msgstr ""
 
-#: ../libnm-core/nm-setting-ovs-interface.c:268
+#: ../libnm-core/nm-setting-ovs-interface.c:278
 #: ../libnm-core/nm-setting-ovs-port.c:181
 #, c-format
 msgid "A connection with a '%s' setting must have a master."
@@ -9410,27 +9417,27 @@
 msgid "setting this property requires non-zero '%s' property"
 msgstr ""
 
-#: ../libnm-core/nm-setting-proxy.c:132
+#: ../libnm-core/nm-setting-proxy.c:129
 #, c-format
 msgid "invalid proxy method"
 msgstr ""
 
-#: ../libnm-core/nm-setting-proxy.c:142 ../libnm-core/nm-setting-proxy.c:151
+#: ../libnm-core/nm-setting-proxy.c:139 ../libnm-core/nm-setting-proxy.c:148
 #, c-format
 msgid "this property is not allowed for method none"
 msgstr ""
 
-#: ../libnm-core/nm-setting-proxy.c:162
+#: ../libnm-core/nm-setting-proxy.c:159
 #, c-format
 msgid "the script is too large"
 msgstr ""
 
-#: ../libnm-core/nm-setting-proxy.c:170
+#: ../libnm-core/nm-setting-proxy.c:167
 #, c-format
 msgid "the script is not valid utf8"
 msgstr ""
 
-#: ../libnm-core/nm-setting-proxy.c:178
+#: ../libnm-core/nm-setting-proxy.c:175
 #, c-format
 msgid "the script lacks FindProxyForURL function"
 msgstr ""
@@ -9478,27 +9485,27 @@
 msgid "team config exceeds size limit"
 msgstr ""
 
-#: ../libnm-core/nm-setting-team.c:1229
+#: ../libnm-core/nm-setting-team.c:1179
 #, c-format
 msgid "invalid runner \"%s\""
 msgstr ""
 
-#: ../libnm-core/nm-setting-team.c:1242
+#: ../libnm-core/nm-setting-team.c:1192
 #, c-format
 msgid "missing link watcher name"
 msgstr ""
 
-#: ../libnm-core/nm-setting-team.c:1252
+#: ../libnm-core/nm-setting-team.c:1202
 #, c-format
 msgid "unknown link watcher \"%s\""
 msgstr ""
 
-#: ../libnm-core/nm-setting-team.c:1263
+#: ../libnm-core/nm-setting-team.c:1213
 #, c-format
 msgid "missing target host"
 msgstr ""
 
-#: ../libnm-core/nm-setting-team.c:1271
+#: ../libnm-core/nm-setting-team.c:1221
 #, c-format
 msgid "missing source address"
 msgstr ""
@@ -9563,7 +9570,7 @@
 msgid "invalid key \"%s\": %s"
 msgstr ""
 
-#: ../libnm-core/nm-keyfile.c:856 ../libnm-core/nm-setting-user.c:358
+#: ../libnm-core/nm-setting-user.c:358 ../shared/nm-keyfile/nm-keyfile.c:857
 #, c-format
 msgid "invalid value for \"%s\": %s"
 msgstr ""
@@ -9591,7 +9598,7 @@
 msgid "secret was empty"
 msgstr ""
 
-#: ../libnm-core/nm-setting-vpn.c:597
+#: ../libnm-core/nm-setting-vpn.c:626
 msgid "setting contained a secret with an empty name"
 msgstr ""
 
@@ -9600,11 +9607,11 @@
 msgid "secret value was empty"
 msgstr ""
 
-#: ../libnm-core/nm-setting-vpn.c:652 ../libnm-core/nm-setting.c:2124
+#: ../libnm-core/nm-setting-vpn.c:666 ../libnm-core/nm-setting.c:2127
 msgid "not a secret property"
 msgstr ""
 
-#: ../libnm-core/nm-setting-vpn.c:658
+#: ../libnm-core/nm-setting-vpn.c:672
 msgid "secret is not of correct type"
 msgstr ""
 
@@ -9658,17 +9665,17 @@
 msgid "both speed and duplex are required for static link configuration"
 msgstr ""
 
-#: ../libnm-core/nm-setting-wireless-security.c:936
+#: ../libnm-core/nm-setting-wireless-security.c:928
 #, c-format
 msgid "'%s' security requires '%s=%s'"
 msgstr ""
 
-#: ../libnm-core/nm-setting-wireless-security.c:957
+#: ../libnm-core/nm-setting-wireless-security.c:949
 #, c-format
 msgid "'%s' security requires '%s' setting presence"
 msgstr ""
 
-#: ../libnm-core/nm-setting-wireless-security.c:978
+#: ../libnm-core/nm-setting-wireless-security.c:970
 #, c-format
 msgid "'%d' value is out of range <0-3>"
 msgstr ""
@@ -9678,7 +9685,7 @@
 msgid "'%s' connections require '%s' in this property"
 msgstr ""
 
-#: ../libnm-core/nm-setting-wireless-security.c:1037
+#: ../libnm-core/nm-setting-wireless-security.c:1029
 #, c-format
 msgid "'%s' can only be used with '%s=%s' (WEP)"
 msgstr ""
@@ -9688,61 +9695,61 @@
 msgid "'%s' can only be used with '%s=%s' or '%s=%s'"
 msgstr ""
 
-#: ../libnm-core/nm-utils.c:4576
+#: ../libnm-core/nm-utils.c:4572
 msgid "can't be simultaneously disabled and enabled"
 msgstr ""
 
-#: ../libnm-core/nm-setting-wireless.c:778
+#: ../libnm-core/nm-setting-wireless.c:783
 #, c-format
 msgid "'%s' is not a valid Wi-Fi mode"
 msgstr ""
 
-#: ../libnm-core/nm-setting-wireless.c:788
+#: ../libnm-core/nm-setting-wireless.c:793
 #, c-format
 msgid "'%s' is not a valid band"
 msgstr ""
 
-#: ../libnm-core/nm-setting-wireless.c:798
+#: ../libnm-core/nm-setting-wireless.c:803
 #, c-format
 msgid "'%s' requires setting '%s' property"
 msgstr ""
 
-#: ../libnm-core/nm-setting-wireless.c:907 ../libnm-core/nm-team-utils.c:1990
+#: ../libnm-core/nm-setting-wireless.c:912 ../libnm-core/nm-team-utils.c:1990
 #, c-format
 msgid "invalid value"
 msgstr ""
 
-#: ../libnm-core/nm-setting-wireless.c:948
+#: ../libnm-core/nm-setting-wireless.c:953
 #, c-format
 msgid "conflicting value of mac-address-randomization and cloned-mac-address"
 msgstr ""
 
-#: ../libnm-core/nm-setting.c:806
+#: ../libnm-core/nm-setting.c:809
 #, c-format
 msgid "duplicate property"
 msgstr ""
 
-#: ../libnm-core/nm-setting.c:900 ../libnm-core/nm-setting.c:949
+#: ../libnm-core/nm-setting.c:903 ../libnm-core/nm-setting.c:952
 #, c-format
 msgid "can't set property of type '%s' from value of type '%s'"
 msgstr ""
 
-#: ../libnm-core/nm-setting.c:919 ../libnm-core/nm-setting.c:934
+#: ../libnm-core/nm-setting.c:922 ../libnm-core/nm-setting.c:937
 #, c-format
 msgid "failed to set property: %s"
 msgstr ""
 
-#: ../libnm-core/nm-setting.c:964
+#: ../libnm-core/nm-setting.c:967
 #, c-format
 msgid "can not set property: %s"
 msgstr ""
 
-#: ../libnm-core/nm-setting.c:829
+#: ../libnm-core/nm-setting.c:832
 #, c-format
 msgid "unknown property"
 msgstr ""
 
-#: ../libnm-core/nm-setting.c:2015
+#: ../libnm-core/nm-setting.c:2018
 msgid "secret not found"
 msgstr ""
 
@@ -9750,175 +9757,175 @@
 msgid "secret is not set"
 msgstr ""
 
-#: ../libnm-core/nm-utils.c:2330
+#: ../libnm-core/nm-utils.c:2284
 #, c-format
 msgid "'%s' is not a valid handle."
 msgstr ""
 
-#: ../libnm-core/nm-utils.c:2458
+#: ../libnm-core/nm-utils.c:2412
 #, c-format
 msgid "'%s' unexpected: parent already specified."
 msgstr ""
 
-#: ../libnm-core/nm-utils.c:2474
+#: ../libnm-core/nm-utils.c:2428
 #, c-format
 msgid "invalid handle: '%s'"
 msgstr ""
 
-#: ../libnm-core/nm-utils.c:2496
+#: ../libnm-core/nm-utils.c:2450
 msgid "parent not specified."
 msgstr ""
 
-#: ../libnm-core/nm-utils.c:2558
+#: ../libnm-core/nm-utils.c:2512
 #, c-format
 msgid "unsupported qdisc option: '%s'."
 msgstr ""
 
-#: ../libnm-core/nm-utils.c:2680
+#: ../libnm-core/nm-utils.c:2634
 msgid "action name missing."
 msgstr ""
 
-#: ../libnm-core/nm-utils.c:2706
+#: ../libnm-core/nm-utils.c:2660
 #, c-format
 msgid "unsupported action option: '%s'."
 msgstr ""
 
-#: ../libnm-core/nm-utils.c:2844
+#: ../libnm-core/nm-utils.c:2798
 msgid "invalid action: "
 msgstr ""
 
-#: ../libnm-core/nm-utils.c:2848
+#: ../libnm-core/nm-utils.c:2802
 #, c-format
 msgid "unsupported tfilter option: '%s'."
 msgstr ""
 
-#: ../libnm-core/nm-utils.c:3449
+#: ../libnm-core/nm-utils.c:3403
 #, c-format
 msgid "failed stat file %s: %s"
 msgstr ""
 
-#: ../libnm-core/nm-utils.c:3458
+#: ../libnm-core/nm-utils.c:3412
 #, c-format
 msgid "not a file (%s)"
 msgstr ""
 
-#: ../libnm-core/nm-utils.c:3469
+#: ../libnm-core/nm-utils.c:3423
 #, c-format
 msgid "invalid file owner %d for %s"
 msgstr ""
 
-#: ../libnm-core/nm-utils.c:3480
+#: ../libnm-core/nm-utils.c:3434
 #, c-format
 msgid "file permissions for %s"
 msgstr ""
 
-#: ../libnm-core/nm-utils.c:3490
+#: ../libnm-core/nm-utils.c:3444
 #, c-format
 msgid "reject %s"
 msgstr ""
 
-#: ../libnm-core/nm-utils.c:3509
+#: ../libnm-core/nm-utils.c:3463
 #, c-format
 msgid "path is not absolute (%s)"
 msgstr ""
 
-#: ../libnm-core/nm-utils.c:3523
+#: ../libnm-core/nm-utils.c:3477
 #, c-format
 msgid "Plugin file does not exist (%s)"
 msgstr ""
 
-#: ../libnm-core/nm-utils.c:3531
+#: ../libnm-core/nm-utils.c:3485
 #, c-format
 msgid "Plugin is not a valid file (%s)"
 msgstr ""
 
-#: ../libnm-core/nm-utils.c:3541
+#: ../libnm-core/nm-utils.c:3495
 #, c-format
 msgid "libtool archives are not supported (%s)"
 msgstr ""
 
-#: ../libnm-core/nm-utils.c:3623
+#: ../libnm-core/nm-utils.c:3577
 #, c-format
 msgid "Could not find \"%s\" binary"
 msgstr ""
 
-#: ../libnm-core/nm-utils.c:4650
+#: ../libnm-core/nm-utils.c:4646
 #, c-format
 msgid "not a valid ethernet MAC address for mask at position %lld"
 msgstr ""
 
-#: ../libnm-core/nm-utils.c:4665
+#: ../libnm-core/nm-utils.c:4661
 #, c-format
 msgid "not a valid ethernet MAC address #%u at position %lld"
 msgstr ""
 
-#: ../libnm-core/nm-utils.c:4731
+#: ../shared/nm-glib-aux/nm-shared-utils.c:4620
 msgid "interface name is too short"
 msgstr ""
 
-#: ../libnm-core/nm-utils.c:4740
+#: ../shared/nm-glib-aux/nm-shared-utils.c:4629
 msgid "interface name is reserved"
 msgstr ""
 
-#: ../libnm-core/nm-utils.c:4752
+#: ../shared/nm-glib-aux/nm-shared-utils.c:4641
 msgid "interface name contains an invalid character"
 msgstr ""
 
-#: ../libnm-core/nm-utils.c:4758
+#: ../shared/nm-glib-aux/nm-shared-utils.c:4647
 msgid "interface name is longer than 15 characters"
 msgstr ""
 
-#: ../libnm-core/nm-utils.c:5425
+#: ../libnm-core/nm-utils.c:5356
 msgid "not valid utf-8"
 msgstr ""
 
-#: ../libnm-core/nm-utils.c:5446 ../libnm-core/nm-utils.c:5499
+#: ../libnm-core/nm-utils.c:5377 ../libnm-core/nm-utils.c:5430
 msgid "is not a JSON object"
 msgstr ""
 
-#: ../libnm-core/nm-utils.c:5475 ../libnm-core/nm-utils.c:5512
+#: ../libnm-core/nm-utils.c:5406 ../libnm-core/nm-utils.c:5443
 msgid "value is NULL"
 msgstr ""
 
-#: ../libnm-core/nm-utils.c:5475 ../libnm-core/nm-utils.c:5512
+#: ../libnm-core/nm-utils.c:5406 ../libnm-core/nm-utils.c:5443
 msgid "value is empty"
 msgstr ""
 
-#: ../libnm-core/nm-utils.c:5487
+#: ../libnm-core/nm-utils.c:5418
 #, c-format
 msgid "invalid JSON at position %d (%s)"
 msgstr ""
 
-#: ../libnm-core/nm-utils.c:5649 ../libnm-core/nm-utils.c:5669
+#: ../libnm-core/nm-utils.c:5580 ../libnm-core/nm-utils.c:5600
 msgid "unterminated escape sequence"
 msgstr ""
 
-#: ../libnm-core/nm-utils.c:5694
+#: ../libnm-core/nm-utils.c:5625
 #, c-format
 msgid "unknown attribute '%s'"
 msgstr ""
 
-#: ../libnm-core/nm-utils.c:5709
+#: ../libnm-core/nm-utils.c:5640
 #, c-format
 msgid "missing key-value separator '%c' after '%s'"
 msgstr ""
 
-#: ../libnm-core/nm-utils.c:5725
+#: ../libnm-core/nm-utils.c:5656
 #, c-format
 msgid "invalid uint32 value '%s' for attribute '%s'"
 msgstr ""
 
-#: ../libnm-core/nm-utils.c:5734
+#: ../libnm-core/nm-utils.c:5665
 #, c-format
 msgid "invalid uint8 value '%s' for attribute '%s'"
 msgstr ""
 
-#: ../libnm-core/nm-utils.c:5744
+#: ../libnm-core/nm-utils.c:5675
 #, c-format
 msgid "invalid boolean value '%s' for attribute '%s'"
 msgstr ""
 
-#: ../libnm-core/nm-utils.c:5754
+#: ../libnm-core/nm-utils.c:5685
 #, c-format
 msgid "unsupported attribute '%s' of type '%s'"
 msgstr ""
@@ -9958,98 +9965,98 @@
 msgid "the plugin does not support export capability"
 msgstr ""
 
-#: ../libnm-core/nm-vpn-plugin-info.c:93
+#: ../libnm-core/nm-vpn-plugin-info.c:111
 #, c-format
 msgid "missing filename"
 msgstr ""
 
-#: ../libnm-core/nm-vpn-plugin-info.c:101
+#: ../libnm-core/nm-vpn-plugin-info.c:119
 #, c-format
 msgid "filename must be an absolute path (%s)"
 msgstr ""
 
-#: ../libnm-core/nm-vpn-plugin-info.c:110
+#: ../libnm-core/nm-vpn-plugin-info.c:128
 #, c-format
 msgid "filename has invalid format (%s)"
 msgstr ""
 
-#: ../libnm-core/nm-vpn-plugin-info.c:433
+#: ../libnm-core/nm-vpn-plugin-info.c:419
 #, c-format
 msgid "there exists a conflicting plugin (%s) that has the same %s.%s value"
 msgstr ""
 
-#: ../libnm-core/nm-vpn-plugin-info.c:471
+#: ../libnm-core/nm-vpn-plugin-info.c:457
 #, c-format
 msgid "there exists a conflicting plugin with the same name (%s)"
 msgstr ""
 
-#: ../libnm-core/nm-vpn-plugin-info.c:1053
+#: ../libnm-core/nm-vpn-plugin-info.c:1045
 #, c-format
 msgid "missing \"plugin\" setting"
 msgstr ""
 
-#: ../libnm-core/nm-vpn-plugin-info.c:1063
+#: ../libnm-core/nm-vpn-plugin-info.c:1055
 #, c-format
 msgid "%s: don't retry loading plugin which already failed previously"
 msgstr ""
 
-#: ../libnm-core/nm-vpn-plugin-info.c:1139
+#: ../libnm-core/nm-vpn-plugin-info.c:1131
 msgid "missing filename to load VPN plugin info"
 msgstr ""
 
-#: ../libnm-core/nm-vpn-plugin-info.c:1151
+#: ../libnm-core/nm-vpn-plugin-info.c:1143
 msgid "missing name for VPN plugin info"
 msgstr ""
 
-#: ../libnm-core/nm-vpn-plugin-info.c:1160
+#: ../libnm-core/nm-vpn-plugin-info.c:1152
 msgid "missing service for VPN plugin info"
 msgstr ""
 
-#: ../libnm/nm-device.c:1459
+#: ../libnm/nm-device.c:1526
 msgid "Bluetooth"
 msgstr ""
 
-#: ../libnm/nm-device.c:1461
+#: ../libnm/nm-device.c:1528
 msgid "OLPC Mesh"
 msgstr ""
 
-#: ../libnm/nm-device.c:1469
+#: ../libnm/nm-device.c:1536
 msgid "WiMAX"
 msgstr ""
 
-#: ../libnm/nm-device.c:1483
+#: ../libnm/nm-device.c:1550
 msgid "ADSL"
 msgstr ""
 
-#: ../libnm/nm-device.c:1485
+#: ../libnm/nm-device.c:1552
 msgid "MACVLAN"
 msgstr ""
 
-#: ../libnm/nm-device.c:1487
+#: ../libnm/nm-device.c:1554
 msgid "VXLAN"
 msgstr ""
 
-#: ../libnm/nm-device.c:1489
+#: ../libnm/nm-device.c:1556
 msgid "IPTunnel"
 msgstr ""
 
-#: ../libnm/nm-device.c:1491
+#: ../libnm/nm-device.c:1558
 msgid "Tun"
 msgstr ""
 
-#: ../libnm/nm-device.c:1493
+#: ../libnm/nm-device.c:1560
 msgid "Veth"
 msgstr ""
 
-#: ../libnm/nm-device.c:1539
+#: ../libnm/nm-device.c:1608
 msgid "Wired"
 msgstr ""
 
-#: ../libnm/nm-device.c:1571
+#: ../libnm/nm-device.c:1640
 msgid "PCI"
 msgstr ""
 
-#: ../libnm/nm-device.c:1573
+#: ../libnm/nm-device.c:1642
 msgid "USB"
 msgstr ""
 
@@ -10059,13 +10066,13 @@
 #. * "%2$s (%1$s)" if there's no grammatical way to combine
 #. * the strings otherwise.
 #. 
-#: ../libnm/nm-device.c:1873 ../libnm/nm-device.c:1892
+#: ../libnm/nm-device.c:1942 ../libnm/nm-device.c:1961
 #, c-format
 msgctxt "long device name"
 msgid "%s %s"
 msgstr ""
 
-#: ../libnm-glib/nm-remote-connection.c:148
+#: ../libnm-glib/nm-remote-connection.c:149
 msgid "Disconnected by D-Bus"
 msgstr ""
 
@@ -10084,28 +10091,28 @@
 msgid "Failed to initialize the MD5 context: %d."
 msgstr ""
 
-#: ../libnm-util/crypto_nss.c:457
+#: ../libnm-util/crypto_nss.c:460
 #, c-format
 msgid "Couldn't convert password to UCS2: %d"
 msgstr "ไม่สามารถแปลงรหัสผ่านไปเป็น UCS2: %d"
 
-#: ../libnm-util/nm-setting-bluetooth.c:185
+#: ../libnm-util/nm-setting-bluetooth.c:186
 #, c-format
 msgid "requires '%s' or '%s' setting"
 msgstr ""
 
-#: ../libnm-util/nm-setting-bond.c:580
+#: ../libnm-util/nm-setting-bond.c:582
 #, c-format
 msgid "'%s' is not a valid interface name for '%s' option"
 msgstr ""
 
-#: ../libnm-util/nm-setting-connection.c:831
+#: ../libnm-util/nm-setting-connection.c:834
 #: ../libnm-util/nm-setting-infiniband.c:269
 #, c-format
 msgid "'%s' is not a valid interface name"
 msgstr ""
 
-#: ../libnm-util/nm-setting-connection.c:859
+#: ../libnm-util/nm-setting-connection.c:862
 #, c-format
 msgid "requires presence of '%s' setting in the connection"
 msgstr ""
@@ -10125,32 +10132,32 @@
 msgstr ""
 
 #: ../libnm-util/nm-setting-ip4-config.c:983
-#: ../libnm-util/nm-setting-ip6-config.c:937
+#: ../libnm-util/nm-setting-ip6-config.c:939
 #, c-format
 msgid "%d. route has invalid prefix"
 msgstr ""
 
-#: ../libnm-util/nm-setting-ip6-config.c:911
+#: ../libnm-util/nm-setting-ip6-config.c:913
 #, c-format
 msgid "%d. IPv6 address is invalid"
 msgstr ""
 
-#: ../libnm-util/nm-setting-ip6-config.c:921
+#: ../libnm-util/nm-setting-ip6-config.c:923
 #, c-format
 msgid "%d. IPv6 address has invalid prefix"
 msgstr ""
 
-#: ../libnm-util/nm-setting-vpn.c:580
+#: ../libnm-util/nm-setting-vpn.c:582
 #, c-format
 msgid "Failed to convert '%s' value '%s' to uint"
 msgstr ""
 
-#: ../libnm-util/nm-setting-vpn.c:587
+#: ../libnm-util/nm-setting-vpn.c:589
 #, c-format
 msgid "Secret flags property '%s' not found"
 msgstr ""
 
-#: ../libnm-util/nm-setting-wireless.c:806
+#: ../libnm-util/nm-setting-wireless.c:807
 #, c-format
 msgid "requires setting '%s' property"
 msgstr ""
@@ -10159,7 +10166,7 @@
 msgid "The connection was not an ADSL connection."
 msgstr ""
 
-#: ../libnm/nm-device-bond.c:104
+#: ../libnm/nm-device-bond.c:105
 msgid "The connection was not a bond connection."
 msgstr ""
 
@@ -10191,11 +10198,11 @@
 "The device is lacking Bluetooth capabilities required by the connection."
 msgstr ""
 
-#: ../libnm/nm-device-dummy.c:68
+#: ../libnm/nm-device-dummy.c:61
 msgid "The connection was not a dummy connection."
 msgstr ""
 
-#: ../libnm/nm-device-dummy.c:75 ../libnm/nm-device-generic.c:91
+#: ../libnm/nm-device-dummy.c:68 ../libnm/nm-device-generic.c:85
 #: ../libnm/nm-device-ovs-bridge.c:84 ../libnm/nm-device-ovs-interface.c:52
 #: ../libnm/nm-device-ovs-port.c:84
 msgid "The connection did not specify an interface name."
@@ -10228,7 +10235,7 @@
 msgid "Device MAC (%s) is blacklisted by the connection."
 msgstr ""
 
-#: ../libnm/nm-device-generic.c:84
+#: ../libnm/nm-device-generic.c:78
 msgid "The connection was not a generic connection."
 msgstr ""
 
@@ -10256,7 +10263,7 @@
 msgid "The connection was not an IP tunnel connection."
 msgstr ""
 
-#: ../libnm/nm-device-macvlan.c:151
+#: ../libnm/nm-device-macvlan.c:152
 msgid "The connection was not a MAC-VLAN connection."
 msgstr ""
 
@@ -10272,7 +10279,7 @@
 msgid "The device is lacking capabilities required by the connection."
 msgstr ""
 
-#: ../libnm/nm-device-olpc-mesh.c:107
+#: ../libnm/nm-device-olpc-mesh.c:101
 msgid "The connection was not an OLPC Mesh connection."
 msgstr ""
 
@@ -10288,7 +10295,7 @@
 msgid "The connection was not a ovs_port connection."
 msgstr ""
 
-#: ../libnm/nm-device-team.c:131
+#: ../libnm/nm-device-team.c:125
 msgid "The connection was not a team connection."
 msgstr ""
 
@@ -10300,7 +10307,7 @@
 msgid "The VLAN identifiers of the device and the connection didn't match."
 msgstr ""
 
-#: ../libnm/nm-device-vlan.c:143
+#: ../libnm/nm-device-vlan.c:144
 msgid "The hardware address of the device and the connection didn't match."
 msgstr ""
 
@@ -10341,24 +10348,24 @@
 msgid "OpenVSwitch Bridge"
 msgstr ""
 
-#: ../libnm/nm-device.c:1495
+#: ../libnm/nm-device.c:1562
 msgid "MACsec"
 msgstr ""
 
-#: ../libnm/nm-device.c:1497
+#: ../libnm/nm-device.c:1564
 msgid "Dummy"
 msgstr ""
 
-#: ../libnm/nm-device.c:1499
+#: ../libnm/nm-device.c:1566
 msgid "PPP"
 msgstr ""
 
-#: ../libnm/nm-device.c:2569
+#: ../libnm/nm-device.c:2638
 #, c-format
 msgid "The connection was not valid: %s"
 msgstr ""
 
-#: ../libnm/nm-device.c:2578
+#: ../libnm/nm-device.c:2647
 #, c-format
 msgid "The interface names of the device and the connection didn't match."
 msgstr ""
@@ -10510,33 +10517,33 @@
 msgid "System policy prevents enabling or disabling connectivity checking"
 msgstr ""
 
-#: ../shared/nm-glib-aux/nm-shared-utils.c:1669
+#: ../shared/nm-glib-aux/nm-shared-utils.c:2202
 #, c-format
 msgid "object class '%s' has no property named '%s'"
 msgstr ""
 
-#: ../shared/nm-glib-aux/nm-shared-utils.c:1676
+#: ../shared/nm-glib-aux/nm-shared-utils.c:2209
 #, c-format
 msgid "property '%s' of object class '%s' is not writable"
 msgstr ""
 
-#: ../shared/nm-glib-aux/nm-shared-utils.c:1683
+#: ../shared/nm-glib-aux/nm-shared-utils.c:2216
 #, c-format
 msgid ""
 "construct property \"%s\" for object '%s' can't be set after construction"
 msgstr ""
 
-#: ../shared/nm-glib-aux/nm-shared-utils.c:1691
+#: ../shared/nm-glib-aux/nm-shared-utils.c:2224
 #, c-format
 msgid "'%s::%s' is not a valid property name; '%s' is not a GObject subtype"
 msgstr ""
 
-#: ../shared/nm-glib-aux/nm-shared-utils.c:1700
+#: ../shared/nm-glib-aux/nm-shared-utils.c:2233
 #, c-format
 msgid "unable to set property '%s' of type '%s' from value of type '%s'"
 msgstr ""
 
-#: ../shared/nm-glib-aux/nm-shared-utils.c:1711
+#: ../shared/nm-glib-aux/nm-shared-utils.c:2244
 #, c-format
 msgid ""
 "value \"%s\" of type '%s' is invalid or out of range for property '%s' of "
@@ -10559,25 +10566,25 @@
 msgstr ""
 
 #. Logging/debugging
-#: ../src/main.c:184 ../src/nm-iface-helper.c:295
+#: ../src/main.c:184 ../src/nm-iface-helper.c:296
 msgid "Print NetworkManager version and exit"
 msgstr ""
 
-#: ../src/main.c:185 ../src/nm-iface-helper.c:296
+#: ../src/main.c:185 ../src/nm-iface-helper.c:297
 msgid "Don't become a daemon"
 msgstr ""
 
-#: ../src/main.c:186 ../src/nm-iface-helper.c:298
+#: ../src/main.c:186 ../src/nm-iface-helper.c:299
 #, c-format
 msgid "Log level: one of [%s]"
 msgstr ""
 
-#: ../src/main.c:188 ../src/nm-iface-helper.c:300
+#: ../src/main.c:188 ../src/nm-iface-helper.c:301
 #, c-format
 msgid "Log domains separated by ',': any combination of [%s]"
 msgstr ""
 
-#: ../src/main.c:190 ../src/nm-iface-helper.c:302
+#: ../src/main.c:190 ../src/nm-iface-helper.c:303
 msgid "Make all warnings fatal"
 msgstr ""
 
@@ -10597,12 +10604,12 @@
 "should associate with."
 msgstr ""
 
-#: ../src/main.c:325 ../src/main-utils.c:275 ../src/nm-iface-helper.c:443
+#: ../src/main.c:325 ../src/main-utils.c:275 ../src/nm-iface-helper.c:444
 #, c-format
 msgid "%s.  Please use --help to see a list of valid options.\n"
 msgstr ""
 
-#: ../src/nm-iface-helper.c:448
+#: ../src/nm-iface-helper.c:449
 #, c-format
 msgid "Ignoring unrecognized log domain(s) '%s' passed on command line.\n"
 msgstr ""
@@ -10617,7 +10624,7 @@
 msgid "Ignoring unrecognized log domain(s) '%s' from config files.\n"
 msgstr ""
 
-#: ../src/main.c:358 ../src/nm-iface-helper.c:456
+#: ../src/main.c:358 ../src/nm-iface-helper.c:457
 #, c-format
 msgid "Could not daemonize: %s [error %u]\n"
 msgstr ""
@@ -10720,11 +10727,11 @@
 msgid "Dummy connection"
 msgstr ""
 
-#: ../src/devices/nm-device-ethernet.c:1506
+#: ../src/devices/nm-device-ethernet.c:1562
 msgid "PPPoE connection"
 msgstr ""
 
-#: ../src/devices/nm-device-ethernet.c:1506
+#: ../src/devices/nm-device-ethernet.c:1562
 msgid "Wired connection"
 msgstr ""
 
@@ -10733,7 +10740,7 @@
 msgid "Wired connection %d"
 msgstr ""
 
-#: ../src/devices/nm-device-ip-tunnel.c:407
+#: ../src/devices/nm-device-ip-tunnel.c:408
 msgid "IP tunnel connection"
 msgstr ""
 
@@ -10749,7 +10756,7 @@
 msgid "Team connection"
 msgstr ""
 
-#: ../clients/cli/devices.c:1228 ../src/devices/wifi/nm-device-olpc-mesh.c:118
+#: ../clients/cli/devices.c:1238 ../src/devices/wifi/nm-device-olpc-mesh.c:118
 msgid "Mesh"
 msgstr ""
 
@@ -10902,11 +10909,11 @@
 msgid "WPA authentication is incompatible with Shared Key authentication"
 msgstr ""
 
-#: ../src/devices/wifi/nm-wifi-utils.c:776
+#: ../src/devices/wifi/nm-wifi-utils.c:782
 msgid "Failed to determine AP security information"
 msgstr ""
 
-#: ../src/devices/wwan/nm-modem-broadband.c:690
+#: ../src/devices/wwan/nm-modem-broadband.c:695
 msgid "GSM mobile broadband connection requires a 'gsm' setting"
 msgstr ""
 
@@ -10942,7 +10949,7 @@
 msgid "Quit after initial configuration"
 msgstr ""
 
-#: ../src/nm-config.c:593 ../src/nm-iface-helper.c:297
+#: ../src/nm-config.c:593 ../src/nm-iface-helper.c:298
 msgid "Don't become a daemon, and log to stderr"
 msgstr ""
 
@@ -10960,105 +10967,105 @@
 msgstr ""
 
 #. Interface/IP config
-#: ../src/nm-iface-helper.c:277
+#: ../src/nm-iface-helper.c:278
 msgid "The interface to manage"
 msgstr ""
 
-#: ../src/nm-iface-helper.c:278
+#: ../src/nm-iface-helper.c:279
 msgid "Connection UUID"
 msgstr ""
 
-#: ../src/nm-iface-helper.c:279
+#: ../src/nm-iface-helper.c:280
 msgid "Connection Token for Stable IDs"
 msgstr ""
 
-#: ../src/nm-iface-helper.c:280
+#: ../src/nm-iface-helper.c:281
 msgid "Whether to manage IPv6 SLAAC"
 msgstr ""
 
-#: ../src/nm-iface-helper.c:281
+#: ../src/nm-iface-helper.c:282
 msgid "Whether SLAAC must be successful"
 msgstr ""
 
-#: ../src/nm-iface-helper.c:282
+#: ../src/nm-iface-helper.c:283
 msgid "Use an IPv6 temporary privacy address"
 msgstr ""
 
-#: ../src/nm-iface-helper.c:283
+#: ../src/nm-iface-helper.c:284
 msgid "Current DHCPv4 address"
 msgstr ""
 
-#: ../src/nm-iface-helper.c:284
+#: ../src/nm-iface-helper.c:285
 msgid "Whether DHCPv4 must be successful"
 msgstr ""
 
-#: ../src/nm-iface-helper.c:285
+#: ../src/nm-iface-helper.c:286
 msgid "Hex-encoded DHCPv4 client ID"
 msgstr ""
 
-#: ../src/nm-iface-helper.c:286
+#: ../src/nm-iface-helper.c:287
 msgid "Hostname to send to DHCP server"
 msgstr ""
 
-#: ../src/nm-iface-helper.c:286
+#: ../src/nm-iface-helper.c:287
 msgid "barbar"
 msgstr ""
 
-#: ../src/nm-iface-helper.c:287
+#: ../src/nm-iface-helper.c:288
 msgid "FQDN to send to DHCP server"
 msgstr ""
 
-#: ../src/nm-iface-helper.c:287
+#: ../src/nm-iface-helper.c:288
 msgid "host.domain.org"
 msgstr ""
 
-#: ../src/nm-iface-helper.c:288
+#: ../src/nm-iface-helper.c:289
 msgid "Route priority for IPv4"
 msgstr ""
 
-#: ../src/nm-iface-helper.c:288
+#: ../src/nm-iface-helper.c:289
 msgid "0"
 msgstr ""
 
-#: ../src/nm-iface-helper.c:289
+#: ../src/nm-iface-helper.c:290
 msgid "Route priority for IPv6"
 msgstr ""
 
-#: ../src/nm-iface-helper.c:289
+#: ../src/nm-iface-helper.c:290
 msgid "1024"
 msgstr ""
 
-#: ../src/nm-iface-helper.c:290
+#: ../src/nm-iface-helper.c:291
 msgid "Hex-encoded Interface Identifier"
 msgstr ""
 
-#: ../src/nm-iface-helper.c:291
+#: ../src/nm-iface-helper.c:292
 msgid "IPv6 SLAAC address generation mode"
 msgstr ""
 
-#: ../src/nm-iface-helper.c:292
+#: ../src/nm-iface-helper.c:293
 msgid ""
 "The logging backend configuration value. See logging.backend in "
 "NetworkManager.conf"
 msgstr ""
 
-#: ../src/nm-iface-helper.c:312
+#: ../src/nm-iface-helper.c:313
 msgid ""
 "nm-iface-helper is a small, standalone process that manages a single network "
 "interface."
 msgstr ""
 
-#: ../src/nm-iface-helper.c:423
+#: ../src/nm-iface-helper.c:424
 #, c-format
 msgid "An interface name and UUID are required\n"
 msgstr ""
 
-#: ../src/nm-iface-helper.c:430
+#: ../src/nm-iface-helper.c:431
 #, c-format
 msgid "Failed to find interface index for %s (%s)\n"
 msgstr ""
 
-#: ../src/nm-iface-helper.c:489
+#: ../src/nm-iface-helper.c:490
 #, c-format
 msgid "(%s): Invalid IID %s\n"
 msgstr ""
diff -Nru language-pack-th-18.04+20200123/data/th/LC_MESSAGES/pastebinit.po language-pack-th-18.04+20200702/data/th/LC_MESSAGES/pastebinit.po
--- language-pack-th-18.04+20200123/data/th/LC_MESSAGES/pastebinit.po	2020-01-23 16:55:55.000000000 +0000
+++ language-pack-th-18.04+20200702/data/th/LC_MESSAGES/pastebinit.po	2020-07-08 13:58:07.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2020-01-23 11:39+0000\n"
-"X-Generator: Launchpad (build b8d1327fd820d6bf500589d6da587d5037c7d88e)\n"
+"X-Launchpad-Export-Date: 2020-07-02 11:26+0000\n"
+"X-Generator: Launchpad (build 1cbd0aa39df153c901321817f9b57cf3f232b507)\n"
 
 #: ../pastebinit:105
 msgid "%s: no section [pastebin]"
diff -Nru language-pack-th-18.04+20200123/data/th/LC_MESSAGES/polkit-1.po language-pack-th-18.04+20200702/data/th/LC_MESSAGES/polkit-1.po
--- language-pack-th-18.04+20200123/data/th/LC_MESSAGES/polkit-1.po	2020-01-23 16:55:56.000000000 +0000
+++ language-pack-th-18.04+20200702/data/th/LC_MESSAGES/polkit-1.po	2020-07-08 13:58:08.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2020-01-23 11:57+0000\n"
-"X-Generator: Launchpad (build b8d1327fd820d6bf500589d6da587d5037c7d88e)\n"
+"X-Launchpad-Export-Date: 2020-07-02 11:39+0000\n"
+"X-Generator: Launchpad (build 1cbd0aa39df153c901321817f9b57cf3f232b507)\n"
 
 #: ../actions/org.freedesktop.policykit.policy.in.h:1
 msgid "Run programs as another user"
diff -Nru language-pack-th-18.04+20200123/data/th/LC_MESSAGES/pulseaudio.po language-pack-th-18.04+20200702/data/th/LC_MESSAGES/pulseaudio.po
--- language-pack-th-18.04+20200123/data/th/LC_MESSAGES/pulseaudio.po	2020-01-23 16:55:55.000000000 +0000
+++ language-pack-th-18.04+20200702/data/th/LC_MESSAGES/pulseaudio.po	2020-07-08 13:58:07.000000000 +0000
@@ -7,15 +7,15 @@
 msgstr ""
 "Project-Id-Version: pulseaudio\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2019-10-16 00:40+0000\n"
+"POT-Creation-Date: 2020-06-29 13:36+0000\n"
 "PO-Revision-Date: 2017-07-29 12:42+0000\n"
 "Last-Translator: Rockworld <sumoisrock@gmail.com>\n"
 "Language-Team: Thai <th@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2020-01-23 11:39+0000\n"
-"X-Generator: Launchpad (build b8d1327fd820d6bf500589d6da587d5037c7d88e)\n"
+"X-Launchpad-Export-Date: 2020-07-02 11:25+0000\n"
+"X-Generator: Launchpad (build 1cbd0aa39df153c901321817f9b57cf3f232b507)\n"
 
 #: ../src/daemon/cmdline.c:113
 #, c-format
@@ -90,15 +90,15 @@
 "  -n                                    Don't load default script file\n"
 msgstr ""
 
-#: src/daemon/cmdline.c:246
+#: ../src/daemon/cmdline.c:246
 msgid "--daemonize expects boolean argument"
 msgstr "--daemonize ต้องการอาร์กิวเมนต์บูลีน"
 
-#: src/daemon/cmdline.c:254
+#: ../src/daemon/cmdline.c:254
 msgid "--fail expects boolean argument"
 msgstr "--fail ต้องการอาร์กิวเมนต์บูลีน"
 
-#: src/daemon/cmdline.c:265
+#: ../src/daemon/cmdline.c:265
 msgid ""
 "--log-level expects log level argument (either numeric in range 0..4 or one "
 "of debug, info, notice, warn, error)."
@@ -106,23 +106,23 @@
 "--log-level ต้องการอาร์กิวเมนต์ระดับบันทึก (ได้ทั้งจำนวนตั้งแต่ 0..4 "
 "หรืออาร์กิวเมนต์หนึ่งใน debug, info, notice, warn, error)."
 
-#: src/daemon/cmdline.c:277
+#: ../src/daemon/cmdline.c:277
 msgid "--high-priority expects boolean argument"
 msgstr "--high-priority ต้องการอาร์กิวเมนต์บูลีน"
 
-#: src/daemon/cmdline.c:285
+#: ../src/daemon/cmdline.c:285
 msgid "--realtime expects boolean argument"
 msgstr "--realtime ต้องการอาร์กิวเมนต์บูลีน"
 
-#: src/daemon/cmdline.c:293
+#: ../src/daemon/cmdline.c:293
 msgid "--disallow-module-loading expects boolean argument"
 msgstr "--disallow-module-loading ต้องการอาร์กิวเมนต์บูลีน"
 
-#: src/daemon/cmdline.c:301
+#: ../src/daemon/cmdline.c:301
 msgid "--disallow-exit expects boolean argument"
 msgstr "--disallow-exit ต้องการอาร์กิวเมนต์บูลีน"
 
-#: src/daemon/cmdline.c:309
+#: ../src/daemon/cmdline.c:309
 msgid "--use-pid-file expects boolean argument"
 msgstr "--use-pid-file ต้องการอาร์กิวเมนต์บูลีน"
 
@@ -132,7 +132,7 @@
 "valid file name 'file:<path>', 'newfile:<path>'."
 msgstr ""
 
-#: src/daemon/cmdline.c:330
+#: ../src/daemon/cmdline.c:330
 msgid ""
 "Invalid log target: use either 'syslog', 'stderr' or 'auto' or a valid file "
 "name 'file:<path>', 'newfile:<path>'."
@@ -140,222 +140,222 @@
 "เป้าหมายในการบันทึกไม่ถูกต้อง: ใช้คำสั่ง 'syslog', 'stderr' หรือ 'auto' "
 "หรือชื่อแฟ้มที่ใช้ได้ 'file:<path>', 'newfile:<path>"
 
-#: src/daemon/cmdline.c:338
+#: ../src/daemon/cmdline.c:338
 msgid "--log-time expects boolean argument"
 msgstr "--log-time ต้องการอาร์กิวเมนต์บูลีน"
 
-#: src/daemon/cmdline.c:346
+#: ../src/daemon/cmdline.c:346
 msgid "--log-meta expects boolean argument"
 msgstr "--log-meta ต้องการอาร์กิวเมนต์บูลีน"
 
-#: src/daemon/cmdline.c:366
+#: ../src/daemon/cmdline.c:366
 #, c-format
 msgid "Invalid resample method '%s'."
 msgstr "ตัวเลือกแสดงตัวอย่างอีกรอบไม่ถูกต้อง '%s'"
 
-#: src/daemon/cmdline.c:373
+#: ../src/daemon/cmdline.c:373
 msgid "--system expects boolean argument"
 msgstr "--system ต้องการอาร์กิวเมนต์บูลีน"
 
-#: src/daemon/cmdline.c:381
+#: ../src/daemon/cmdline.c:381
 msgid "--no-cpu-limit expects boolean argument"
 msgstr "--no-cpu-limit ต้องการอาร์กิวเมนต์บูลีน"
 
-#: src/daemon/cmdline.c:389
+#: ../src/daemon/cmdline.c:389
 msgid "--disable-shm expects boolean argument"
 msgstr "--disable-shm ต้องการอาร์กิวเมนต์บูลีน"
 
-#: src/daemon/cmdline.c:397
+#: ../src/daemon/cmdline.c:397
 msgid "--enable-memfd expects boolean argument"
 msgstr ""
 
-#: src/daemon/daemon-conf.c:268
+#: ../src/daemon/daemon-conf.c:262
 #, c-format
 msgid "[%s:%u] Invalid log target '%s'."
 msgstr "[%s:%u] เป้าหมายบันทึกไม่ถูกต้อง '%s'"
 
-#: src/daemon/daemon-conf.c:283
+#: ../src/daemon/daemon-conf.c:277
 #, c-format
 msgid "[%s:%u] Invalid log level '%s'."
 msgstr "[%s:%u] ระดับบันทึกไม่ถูกต้อง '%s'"
 
-#: src/daemon/daemon-conf.c:298
+#: ../src/daemon/daemon-conf.c:292
 #, c-format
 msgid "[%s:%u] Invalid resample method '%s'."
 msgstr "[%s:%u] ตัวเลือกแสดงตัวอย่างอีกครั้งไม่ถูกต้อง '%s'"
 
-#: src/daemon/daemon-conf.c:320
+#: ../src/daemon/daemon-conf.c:314
 #, c-format
 msgid "[%s:%u] Invalid rlimit '%s'."
 msgstr "[%s:%u] ค่าของ rlimit ไม่ถูกต้อง '%s'"
 
-#: src/daemon/daemon-conf.c:340
+#: ../src/daemon/daemon-conf.c:334
 #, c-format
 msgid "[%s:%u] Invalid sample format '%s'."
 msgstr "[%s:%u] รูปแบบตัวอย่างไม่ถูกต้อง '%s'"
 
-#: src/daemon/daemon-conf.c:357 src/daemon/daemon-conf.c:374
+#: ../src/daemon/daemon-conf.c:351 ../src/daemon/daemon-conf.c:368
 #, c-format
 msgid "[%s:%u] Invalid sample rate '%s'."
 msgstr "[%s:%u] อัตราตัวอย่างไม่ถูกต้อง '%s'"
 
-#: src/daemon/daemon-conf.c:397
+#: ../src/daemon/daemon-conf.c:391
 #, c-format
 msgid "[%s:%u] Invalid sample channels '%s'."
 msgstr "[%s:%u] แชนแนลตัวอย่างไม่ถูกต้อง '%s'"
 
-#: src/daemon/daemon-conf.c:414
+#: ../src/daemon/daemon-conf.c:408
 #, c-format
 msgid "[%s:%u] Invalid channel map '%s'."
 msgstr "[%s:%u] แมปของแชนแนลไม่ถูกต้อง '%s'"
 
-#: src/daemon/daemon-conf.c:431
+#: ../src/daemon/daemon-conf.c:425
 #, c-format
 msgid "[%s:%u] Invalid number of fragments '%s'."
 msgstr "[%s:%u] จำนวนส่วนย่อยไม่ถูกต้อง '%s'"
 
-#: src/daemon/daemon-conf.c:448
+#: ../src/daemon/daemon-conf.c:442
 #, c-format
 msgid "[%s:%u] Invalid fragment size '%s'."
 msgstr "[%s:%u] ขนาดส่วนย่อยไม่ถูกต้อง '%s'."
 
-#: src/daemon/daemon-conf.c:465
+#: ../src/daemon/daemon-conf.c:459
 #, c-format
 msgid "[%s:%u] Invalid nice level '%s'."
 msgstr "[%s:%u] ระดับความสำคัญไม่ถูกต้อง '%s'"
 
-#: src/daemon/daemon-conf.c:508
+#: ../src/daemon/daemon-conf.c:502
 #, c-format
 msgid "[%s:%u] Invalid server type '%s'."
 msgstr "[%s:%u] ประเภทเซิร์ฟเวอร์ไม่ถูกต้อง '%s'"
 
-#: src/daemon/daemon-conf.c:626
+#: ../src/daemon/daemon-conf.c:620
 #, c-format
 msgid "Failed to open configuration file: %s"
 msgstr "ไม่สามารถเปิดแฟ้มค่ากำหนด: %s"
 
-#: src/daemon/daemon-conf.c:642
+#: ../src/daemon/daemon-conf.c:636
 msgid ""
 "The specified default channel map has a different number of channels than "
 "the specified default number of channels."
 msgstr "จำนวนแมปในแชนแนลที่ระบุแตกต่างไปจากจำนวนแชนแนลที่ระบุ"
 
-#: src/daemon/daemon-conf.c:729
+#: ../src/daemon/daemon-conf.c:723
 #, c-format
 msgid "### Read from configuration file: %s ###\n"
 msgstr "### อ่านข้อมูลจากแฟ้มค่ากำหนด: %s ###\n"
 
-#: src/daemon/dumpmodules.c:57
+#: ../src/daemon/dumpmodules.c:57
 #, c-format
 msgid "Name: %s\n"
 msgstr "ชื่อ: %s\n"
 
-#: src/daemon/dumpmodules.c:60
+#: ../src/daemon/dumpmodules.c:60
 #, c-format
 msgid "No module information available\n"
 msgstr "ไม่พบข้อมูลของโมดูลที่ใช้ได้\n"
 
-#: src/daemon/dumpmodules.c:63
+#: ../src/daemon/dumpmodules.c:63
 #, c-format
 msgid "Version: %s\n"
 msgstr "รุ่น: %s\n"
 
-#: src/daemon/dumpmodules.c:65
+#: ../src/daemon/dumpmodules.c:65
 #, c-format
 msgid "Description: %s\n"
 msgstr "คำอธิบาย: %s\n"
 
-#: src/daemon/dumpmodules.c:67
+#: ../src/daemon/dumpmodules.c:67
 #, c-format
 msgid "Author: %s\n"
 msgstr "ผู้สร้าง: %s\n"
 
-#: src/daemon/dumpmodules.c:69
+#: ../src/daemon/dumpmodules.c:69
 #, c-format
 msgid "Usage: %s\n"
 msgstr "วิธีใช้: %s\n"
 
-#: src/daemon/dumpmodules.c:70
+#: ../src/daemon/dumpmodules.c:70
 #, c-format
 msgid "Load Once: %s\n"
 msgstr "โหลดครั้งเดียว: %s\n"
 
-#: src/daemon/dumpmodules.c:72
+#: ../src/daemon/dumpmodules.c:72
 #, c-format
 msgid "DEPRECATION WARNING: %s\n"
 msgstr "คำเตือนเกี่ยวกับการเลิกใช้งาน: %s\n"
 
-#: src/daemon/dumpmodules.c:76
+#: ../src/daemon/dumpmodules.c:76
 #, c-format
 msgid "Path: %s\n"
 msgstr "เส้นทาง: %s\n"
 
-#: src/daemon/ltdl-bind-now.c:75
+#: ../src/daemon/ltdl-bind-now.c:75
 #, c-format
 msgid "Failed to open module %s: %s"
 msgstr "ไม่สามารถเปิดโมดูล %s: %s"
 
-#: src/daemon/ltdl-bind-now.c:126
+#: ../src/daemon/ltdl-bind-now.c:126
 msgid "Failed to find original lt_dlopen loader."
 msgstr "ไม่พบโฟลเดอร์ lt_dlopen ต้นฉบับ"
 
-#: src/daemon/ltdl-bind-now.c:131
+#: ../src/daemon/ltdl-bind-now.c:131
 msgid "Failed to allocate new dl loader."
 msgstr "ไม่สามารถจัดสรรตัวโหลด dl ใหม่ได้"
 
-#: src/daemon/ltdl-bind-now.c:144
+#: ../src/daemon/ltdl-bind-now.c:144
 msgid "Failed to add bind-now-loader."
 msgstr "ไม่สามารถเพิ่ม bind-now-loader ได้"
 
-#: src/daemon/main.c:171
+#: ../src/daemon/main.c:161
 #, c-format
 msgid "Failed to find user '%s'."
 msgstr "ไม่พบผู้ใช้ '%s'"
 
-#: src/daemon/main.c:176
+#: ../src/daemon/main.c:166
 #, c-format
 msgid "Failed to find group '%s'."
 msgstr "ไม่พบกลุ่ม '%s'"
 
-#: src/daemon/main.c:185
+#: ../src/daemon/main.c:175
 #, c-format
 msgid "GID of user '%s' and of group '%s' don't match."
 msgstr "GID ของผู้ใช้ '%s' และกลุ่ม '%s' ไม่ตรงกัน"
 
-#: src/daemon/main.c:190
+#: ../src/daemon/main.c:180
 #, c-format
 msgid "Home directory of user '%s' is not '%s', ignoring."
 msgstr "ไดเรกทอรีบ้านของผู้ใช้ '%s' ไม่ใช่ '%s' กำลังละเว้น"
 
-#: src/daemon/main.c:193 src/daemon/main.c:198
+#: ../src/daemon/main.c:183 ../src/daemon/main.c:188
 #, c-format
 msgid "Failed to create '%s': %s"
 msgstr "ไม่สามารถสร้าง '%s': %s"
 
-#: src/daemon/main.c:205
+#: ../src/daemon/main.c:195
 #, c-format
 msgid "Failed to change group list: %s"
 msgstr "ไม่สามารถเปลี่ยนรายชื่อกลุ่ม: %s"
 
-#: src/daemon/main.c:221
+#: ../src/daemon/main.c:211
 #, c-format
 msgid "Failed to change GID: %s"
 msgstr "ไม่สามารถเปลี่ยน GID: %s"
 
-#: src/daemon/main.c:237
+#: ../src/daemon/main.c:227
 #, c-format
 msgid "Failed to change UID: %s"
 msgstr "ไม่สามารถเปลี่ยน UID: %s"
 
-#: src/daemon/main.c:266
+#: ../src/daemon/main.c:256
 msgid "System wide mode unsupported on this platform."
 msgstr "ไม่สนับสนุนโหมดทั้งระบบบนแพลตฟอร์มนี้"
 
-#: src/daemon/main.c:495
+#: ../src/daemon/main.c:494
 msgid "Failed to parse command line."
 msgstr "ไม่สามารถแยกวิเคราะห์บรรทัดคำสั่งได้"
 
-#: src/daemon/main.c:534
+#: ../src/daemon/main.c:533
 msgid ""
 "System mode refused for non-root user. Only starting the D-Bus server lookup "
 "service."
@@ -363,32 +363,32 @@
 "โหมดระบบถูกปฏิเสธสำหรับผู้ใช้ที่ไม่ใช่ root "
 "กำลังเริ่มบริการค้นหาเซิร์ฟเวอร์ของ D-Bus"
 
-#: src/daemon/main.c:633
+#: ../src/daemon/main.c:632
 #, c-format
 msgid "Failed to kill daemon: %s"
 msgstr "ไม่สามารถฆ่าดีมอน: %s"
 
-#: src/daemon/main.c:662
+#: ../src/daemon/main.c:661
 msgid ""
 "This program is not intended to be run as root (unless --system is "
 "specified)."
 msgstr ""
 "โปรแกรมนี้ไม่ได้ตั้งให้เรียกใช้งานในชื่อ root (เว้นแต่จะระบุ --system)"
 
-#: src/daemon/main.c:665
+#: ../src/daemon/main.c:664
 msgid "Root privileges required."
 msgstr "ต้องการสิทธิ์ root"
 
-#: src/daemon/main.c:672
+#: ../src/daemon/main.c:671
 msgid "--start not supported for system instances."
 msgstr "ไม่สนับสนุน --start สำหรับอินสแตนซ์ระบบ"
 
-#: src/daemon/main.c:712
+#: ../src/daemon/main.c:711
 #, c-format
 msgid "User-configured server at %s, refusing to start/autospawn."
 msgstr "เซิร์ฟเวอร์ที่ถูกกำหนดค่าโดยผู้ใช้ที่ %s ได้ปฏิเสธการเริ่มทำงาน"
 
-#: src/daemon/main.c:718
+#: ../src/daemon/main.c:717
 #, c-format
 msgid ""
 "User-configured server at %s, which appears to be local. Probing deeper."
@@ -396,55 +396,55 @@
 "เซิร์ฟเวอร์ที่ถูกกำหนดค่าโดยผู้ใช้ที่ %s ซึ่งดูเหมือนว่าจะอยู่ในท้องถิ่น "
 "กำลังทดลองให้ลึกขึ้น"
 
-#: src/daemon/main.c:723
+#: ../src/daemon/main.c:722
 msgid "Running in system mode, but --disallow-exit not set."
 msgstr ""
 
-#: src/daemon/main.c:726
+#: ../src/daemon/main.c:725
 msgid "Running in system mode, but --disallow-module-loading not set."
 msgstr ""
 
-#: src/daemon/main.c:729
+#: ../src/daemon/main.c:728
 msgid "Running in system mode, forcibly disabling SHM mode."
 msgstr "กำลังทำงานในโหมดระบบ กำลังบังคับปิดใช้งานโหมด SHM"
 
-#: src/daemon/main.c:734
+#: ../src/daemon/main.c:733
 msgid "Running in system mode, forcibly disabling exit idle time."
 msgstr ""
 
-#: src/daemon/main.c:767
+#: ../src/daemon/main.c:766
 msgid "Failed to acquire stdio."
 msgstr "ไม่สามารถดึง stdio ได้"
 
-#: src/daemon/main.c:773 src/daemon/main.c:844
+#: ../src/daemon/main.c:772 ../src/daemon/main.c:843
 #, c-format
 msgid "pipe() failed: %s"
 msgstr "pipe() ล้มเหลว: %s"
 
-#: src/daemon/main.c:778 src/daemon/main.c:849
+#: ../src/daemon/main.c:777 ../src/daemon/main.c:848
 #, c-format
 msgid "fork() failed: %s"
 msgstr "fork() ล้มเหลว: %s"
 
-#: src/daemon/main.c:793 src/daemon/main.c:864 src/utils/pacat.c:562
+#: ../src/daemon/main.c:792 ../src/daemon/main.c:863 ../src/utils/pacat.c:562
 #, c-format
 msgid "read() failed: %s"
 msgstr "read() ล้มเหลว: %s"
 
-#: src/daemon/main.c:799
+#: ../src/daemon/main.c:798
 msgid "Daemon startup failed."
 msgstr "การเริ่มดีมอนล้มเหลว"
 
-#: src/daemon/main.c:832
+#: ../src/daemon/main.c:831
 #, c-format
 msgid "setsid() failed: %s"
 msgstr "setsid() ล้มเหลว: %s"
 
-#: src/daemon/main.c:965
+#: ../src/daemon/main.c:958
 msgid "Failed to get machine ID"
 msgstr "ไม่สามารถรับข้อมูล ID เครื่องได้"
 
-#: src/daemon/main.c:991
+#: ../src/daemon/main.c:984
 msgid ""
 "OK, so you are running PA in system mode. Please make sure that you actually "
 "do want to do that.\n"
@@ -454,11 +454,11 @@
 "idea."
 msgstr ""
 
-#: src/daemon/main.c:1007
+#: ../src/daemon/main.c:1000
 msgid "pa_pid_file_create() failed."
 msgstr "pa_pid_file_create() ล้มเหลว"
 
-#: src/daemon/main.c:1039
+#: ../src/daemon/main.c:1032
 msgid "pa_core_new() failed."
 msgstr "pa_core_new() ล้มเหลว"
 
@@ -466,301 +466,310 @@
 msgid "Failed to initialize daemon."
 msgstr "ไม่สามารถเริ่มดีมอนได้"
 
-#: src/daemon/main.c:1120
+#: ../src/daemon/main.c:1110
 msgid "Daemon startup without any loaded modules, refusing to work."
 msgstr "ดีมอนเริ่มทำงานโดยไม่โหลดโมดูลใด ๆ กำลังปฏิเสธการทำงาน"
 
-#: src/daemon/pulseaudio.desktop.in:4
+#: ../src/daemon/pulseaudio.desktop.in.h:1
 msgid "PulseAudio Sound System"
 msgstr "ระบบเสียง PulseAudio"
 
-#: src/daemon/pulseaudio.desktop.in:5
+#: ../src/daemon/pulseaudio.desktop.in.h:2
 msgid "Start the PulseAudio Sound System"
 msgstr "เริ่มระบบเสียง PulseAudio"
 
-#: src/modules/alsa/alsa-mixer.c:2443
+#: ../src/modules/alsa/alsa-mixer.c:2492
 msgid "Input"
 msgstr "เสียงเข้า"
 
-#: src/modules/alsa/alsa-mixer.c:2444
+#: ../src/modules/alsa/alsa-mixer.c:2493
 msgid "Docking Station Input"
 msgstr "เสียงเข้าสถานีแท่นวาง"
 
-#: src/modules/alsa/alsa-mixer.c:2445
+#: ../src/modules/alsa/alsa-mixer.c:2494
 msgid "Docking Station Microphone"
 msgstr "ไมโครโฟนสถานีแท่นวาง"
 
-#: src/modules/alsa/alsa-mixer.c:2446
+#: ../src/modules/alsa/alsa-mixer.c:2495
 msgid "Docking Station Line In"
 msgstr "ไลน์เข้าสถานีแท่นวาง"
 
-#: src/modules/alsa/alsa-mixer.c:2447 src/modules/alsa/alsa-mixer.c:2532
+#: ../src/modules/alsa/alsa-mixer.c:2496 ../src/modules/alsa/alsa-mixer.c:2581
 msgid "Line In"
 msgstr "ไลน์เข้า"
 
-#: src/modules/alsa/alsa-mixer.c:2448 src/modules/alsa/alsa-mixer.c:2526
-#: src/modules/bluetooth/module-bluez5-device.c:1757
+#: ../src/modules/alsa/alsa-mixer.c:2497 ../src/modules/alsa/alsa-mixer.c:2575
+#: ../src/modules/bluetooth/module-bluez4-device.c:2104
+#: ../src/modules/bluetooth/module-bluez5-device.c:1887
 msgid "Microphone"
 msgstr "ไมโครโฟน"
 
-#: src/modules/alsa/alsa-mixer.c:2449 src/modules/alsa/alsa-mixer.c:2527
+#: ../src/modules/alsa/alsa-mixer.c:2498 ../src/modules/alsa/alsa-mixer.c:2576
 msgid "Front Microphone"
 msgstr "ไมโครโฟนหน้า"
 
-#: src/modules/alsa/alsa-mixer.c:2450 src/modules/alsa/alsa-mixer.c:2528
+#: ../src/modules/alsa/alsa-mixer.c:2499 ../src/modules/alsa/alsa-mixer.c:2577
 msgid "Rear Microphone"
 msgstr "ไมโครโฟนหลัง"
 
-#: src/modules/alsa/alsa-mixer.c:2451
+#: ../src/modules/alsa/alsa-mixer.c:2500
 msgid "External Microphone"
 msgstr "ไมโครโฟนภายนอก"
 
-#: src/modules/alsa/alsa-mixer.c:2452 src/modules/alsa/alsa-mixer.c:2530
+#: ../src/modules/alsa/alsa-mixer.c:2501 ../src/modules/alsa/alsa-mixer.c:2579
 msgid "Internal Microphone"
 msgstr "ไมโครโฟนภายใน"
 
-#: src/modules/alsa/alsa-mixer.c:2453 src/modules/alsa/alsa-mixer.c:2533
+#: ../src/modules/alsa/alsa-mixer.c:2502 ../src/modules/alsa/alsa-mixer.c:2582
 msgid "Radio"
 msgstr "วิทยุ"
 
-#: src/modules/alsa/alsa-mixer.c:2454 src/modules/alsa/alsa-mixer.c:2534
+#: ../src/modules/alsa/alsa-mixer.c:2503 ../src/modules/alsa/alsa-mixer.c:2583
 msgid "Video"
 msgstr "วิดีโอ"
 
-#: src/modules/alsa/alsa-mixer.c:2455
+#: ../src/modules/alsa/alsa-mixer.c:2504
 msgid "Automatic Gain Control"
 msgstr "ตัวควบคุมระดับสัญญาณอัตโนมัติ"
 
-#: src/modules/alsa/alsa-mixer.c:2456
+#: ../src/modules/alsa/alsa-mixer.c:2505
 msgid "No Automatic Gain Control"
 msgstr "ไม่มีตัวควบคุมระดับสัญญาณอัตโนมัติ"
 
-#: src/modules/alsa/alsa-mixer.c:2457
+#: ../src/modules/alsa/alsa-mixer.c:2506
 msgid "Boost"
 msgstr "การเพิ่มเสียง"
 
-#: src/modules/alsa/alsa-mixer.c:2458
+#: ../src/modules/alsa/alsa-mixer.c:2507
 msgid "No Boost"
 msgstr "ไม่มีการเพิ่มเสียง"
 
-#: src/modules/alsa/alsa-mixer.c:2459
+#: ../src/modules/alsa/alsa-mixer.c:2508
 msgid "Amplifier"
 msgstr "เครื่องขยายเสียง"
 
-#: src/modules/alsa/alsa-mixer.c:2460
+#: ../src/modules/alsa/alsa-mixer.c:2509
 msgid "No Amplifier"
 msgstr "ไม่มีเครื่องขยายเสียง"
 
-#: src/modules/alsa/alsa-mixer.c:2461
+#: ../src/modules/alsa/alsa-mixer.c:2510
 msgid "Bass Boost"
 msgstr "การเพิ่มเสียงเบส"
 
-#: src/modules/alsa/alsa-mixer.c:2462
+#: ../src/modules/alsa/alsa-mixer.c:2511
 msgid "No Bass Boost"
 msgstr "ไม่มีการเพิ่มเสียงเบส"
 
-#: src/modules/alsa/alsa-mixer.c:2463
-#: src/modules/bluetooth/module-bluez5-device.c:1764
+#: ../src/modules/alsa/alsa-mixer.c:2512
+#: ../src/modules/bluetooth/module-bluez4-device.c:2109
+#: ../src/modules/bluetooth/module-bluez5-device.c:1894
 msgid "Speaker"
 msgstr "ลำโพง"
 
-#: src/modules/alsa/alsa-mixer.c:2464 src/modules/alsa/alsa-mixer.c:2536
+#: ../src/modules/alsa/alsa-mixer.c:2513 ../src/modules/alsa/alsa-mixer.c:2585
 msgid "Headphones"
 msgstr "หูฟัง"
 
-#: src/modules/alsa/alsa-mixer.c:2525
+#: ../src/modules/alsa/alsa-mixer.c:2574
 msgid "Analog Input"
 msgstr "อินพุตแอนะล็อก"
 
-#: src/modules/alsa/alsa-mixer.c:2529
+#: ../src/modules/alsa/alsa-mixer.c:2578
 msgid "Dock Microphone"
 msgstr "ไมโครโฟนแท่นวาง"
 
-#: src/modules/alsa/alsa-mixer.c:2531
+#: ../src/modules/alsa/alsa-mixer.c:2580
 msgid "Headset Microphone"
 msgstr ""
 
-#: src/modules/alsa/alsa-mixer.c:2535
+#: ../src/modules/alsa/alsa-mixer.c:2584
 msgid "Analog Output"
 msgstr "เอาต์พุตแอนะล็อก"
 
-#: src/modules/alsa/alsa-mixer.c:2537
+#: ../src/modules/alsa/alsa-mixer.c:2586
 msgid "Headphones Mono Output"
 msgstr ""
 
-#: src/modules/alsa/alsa-mixer.c:2538
+#: ../src/modules/alsa/alsa-mixer.c:2587
 msgid "LFE on Separate Mono Output"
 msgstr "เอาต์พุต LFE on Separate Mono"
 
-#: src/modules/alsa/alsa-mixer.c:2539
+#: ../src/modules/alsa/alsa-mixer.c:2588
 msgid "Line Out"
 msgstr "ไลน์ออก"
 
-#: src/modules/alsa/alsa-mixer.c:2540
+#: ../src/modules/alsa/alsa-mixer.c:2589
 msgid "Analog Mono Output"
 msgstr "เอาต์พุตแอนะล็อกโมโน"
 
-#: src/modules/alsa/alsa-mixer.c:2541
+#: ../src/modules/alsa/alsa-mixer.c:2590
 msgid "Speakers"
 msgstr "ลำโพง"
 
-#: src/modules/alsa/alsa-mixer.c:2542
+#: ../src/modules/alsa/alsa-mixer.c:2591
 msgid "HDMI / DisplayPort"
 msgstr "HDMI / DisplayPort"
 
-#: src/modules/alsa/alsa-mixer.c:2543
+#: ../src/modules/alsa/alsa-mixer.c:2592
 msgid "Digital Output (S/PDIF)"
 msgstr "เอาต์พุตดิจิตอล (S/PDIF)"
 
-#: src/modules/alsa/alsa-mixer.c:2544
+#: ../src/modules/alsa/alsa-mixer.c:2593
 msgid "Digital Input (S/PDIF)"
 msgstr ""
 
-#: src/modules/alsa/alsa-mixer.c:2545
+#: ../src/modules/alsa/alsa-mixer.c:2594
 msgid "Digital Passthrough (S/PDIF)"
 msgstr "พาสทรูดิจิตอล (S/PDIF)"
 
-#: src/modules/alsa/alsa-mixer.c:2546
+#: ../src/modules/alsa/alsa-mixer.c:2595
 msgid "Multichannel Input"
 msgstr "อินพุตหลายแชนแนล"
 
-#: src/modules/alsa/alsa-mixer.c:2547
+#: ../src/modules/alsa/alsa-mixer.c:2596
 msgid "Multichannel Output"
 msgstr "อินพุตหลายแชนแนล"
 
-#: src/modules/alsa/alsa-mixer.c:2548
+#: ../src/modules/alsa/alsa-mixer.c:2597
 msgid "Game Output"
 msgstr ""
 
-#: src/modules/alsa/alsa-mixer.c:2549
+#: ../src/modules/alsa/alsa-mixer.c:2598
 msgid "Chat Output"
 msgstr ""
 
-#: src/modules/alsa/alsa-mixer.c:4063
+#: ../src/modules/alsa/alsa-mixer.c:4113
 msgid "Analog Mono"
 msgstr "แอนะล็อกโมโน"
 
-#: src/modules/alsa/alsa-mixer.c:4064 src/modules/alsa/alsa-mixer.c:4072
-#: src/modules/alsa/alsa-mixer.c:4073
+#. Note: Not translated to "Analog Stereo Input", because the source
+#. * name gets "Input" appended to it automatically, so adding "Input"
+#. * here would lead to the source name to become "Analog Stereo Input
+#. * Input". The same logic applies to analog-stereo-output,
+#. * multichannel-input and multichannel-output.
+#: ../src/modules/alsa/alsa-mixer.c:4114 ../src/modules/alsa/alsa-mixer.c:4121
+#: ../src/modules/alsa/alsa-mixer.c:4122
 msgid "Analog Stereo"
 msgstr "แอนะล็อกสเตอริโอ"
 
-#: src/modules/alsa/alsa-mixer.c:4066 src/pulse/channelmap.c:775
+#: ../src/modules/alsa/alsa-mixer.c:4115 ../src/pulse/channelmap.c:775
 msgid "Stereo"
 msgstr ""
 
-#: src/modules/alsa/alsa-mixer.c:4074 src/modules/alsa/alsa-mixer.c:4075
+#: ../src/modules/alsa/alsa-mixer.c:4123 ../src/modules/alsa/alsa-mixer.c:4124
 msgid "Multichannel"
 msgstr "หลายแชนแนล"
 
-#: src/modules/alsa/alsa-mixer.c:4076
+#: ../src/modules/alsa/alsa-mixer.c:4125
 msgid "Analog Surround 2.1"
 msgstr "ระบบเสียงรอบทิศทางแอนะล็อก 2.1"
 
-#: src/modules/alsa/alsa-mixer.c:4077
+#: ../src/modules/alsa/alsa-mixer.c:4126
 msgid "Analog Surround 3.0"
 msgstr "ระบบเสียงรอบทิศทางแอนะล็อก 3.0"
 
-#: src/modules/alsa/alsa-mixer.c:4078
+#: ../src/modules/alsa/alsa-mixer.c:4127
 msgid "Analog Surround 3.1"
 msgstr "ระบบเสียงรอบทิศทางแอนะล็อก 3.1"
 
-#: src/modules/alsa/alsa-mixer.c:4079
+#: ../src/modules/alsa/alsa-mixer.c:4128
 msgid "Analog Surround 4.0"
 msgstr "ระบบเสียงรอบทิศทางแอนะล็อก 4.0"
 
-#: src/modules/alsa/alsa-mixer.c:4080
+#: ../src/modules/alsa/alsa-mixer.c:4129
 msgid "Analog Surround 4.1"
 msgstr "ระบบเสียงรอบทิศทางแอนะล็อก 4.1"
 
-#: src/modules/alsa/alsa-mixer.c:4081
+#: ../src/modules/alsa/alsa-mixer.c:4130
 msgid "Analog Surround 5.0"
 msgstr "ระบบเสียงรอบทิศทางแอนะล็อก 5.0"
 
-#: src/modules/alsa/alsa-mixer.c:4082
+#: ../src/modules/alsa/alsa-mixer.c:4131
 msgid "Analog Surround 5.1"
 msgstr "ระบบเสียงรอบทิศทางแอนะล็อก 5.1"
 
-#: src/modules/alsa/alsa-mixer.c:4083
+#: ../src/modules/alsa/alsa-mixer.c:4132
 msgid "Analog Surround 6.0"
 msgstr "ระบบเสียงรอบทิศทางแอนะล็อก 6.0"
 
-#: src/modules/alsa/alsa-mixer.c:4084
+#: ../src/modules/alsa/alsa-mixer.c:4133
 msgid "Analog Surround 6.1"
 msgstr "ระบบเสียงรอบทิศทางแอนะล็อก 6.1"
 
-#: src/modules/alsa/alsa-mixer.c:4085
+#: ../src/modules/alsa/alsa-mixer.c:4134
 msgid "Analog Surround 7.0"
 msgstr "ระบบเสียงรอบทิศทางแอนะล็อก 7.0"
 
-#: src/modules/alsa/alsa-mixer.c:4086
+#: ../src/modules/alsa/alsa-mixer.c:4135
 msgid "Analog Surround 7.1"
 msgstr "ระบบเสียงรอบทิศทางแอนะล็อก 7.1"
 
-#: src/modules/alsa/alsa-mixer.c:4087
+#: ../src/modules/alsa/alsa-mixer.c:4136
 msgid "Digital Stereo (IEC958)"
 msgstr "ดิจิทัลสเตอริโอ (IEC958)"
 
-#: ../src/modules/alsa/alsa-mixer.c:4017
+#: ../src/modules/alsa/alsa-mixer.c:4137
 msgid "Digital Passthrough  (IEC958)"
 msgstr "ดิจิทัลพาสทรู  (IEC958)"
 
-#: src/modules/alsa/alsa-mixer.c:4089
+#: ../src/modules/alsa/alsa-mixer.c:4138
 msgid "Digital Surround 4.0 (IEC958/AC3)"
 msgstr "ระบบเสียงรอบทิศทางดิจิทัล 4.0 (IEC958/AC3)"
 
-#: src/modules/alsa/alsa-mixer.c:4090
+#: ../src/modules/alsa/alsa-mixer.c:4139
 msgid "Digital Surround 5.1 (IEC958/AC3)"
 msgstr "ระบบเสียงรอบทิศทางดิจิทัล 5.1 (IEC958/AC3)"
 
-#: src/modules/alsa/alsa-mixer.c:4091
+#: ../src/modules/alsa/alsa-mixer.c:4140
 msgid "Digital Surround 5.1 (IEC958/DTS)"
 msgstr "ระบบเสียงรอบทิศทางดิจิทัล 5.1 (IEC958/DTS)"
 
-#: src/modules/alsa/alsa-mixer.c:4092
+#: ../src/modules/alsa/alsa-mixer.c:4141
 msgid "Digital Stereo (HDMI)"
 msgstr "ดิจิทัลสเตอริโอ (HDMI)"
 
-#: src/modules/alsa/alsa-mixer.c:4093
+#: ../src/modules/alsa/alsa-mixer.c:4142
 msgid "Digital Surround 5.1 (HDMI)"
 msgstr "ระบบเสียงรอบทิศทางดิจิทัล 5.1 (HDMI)"
 
-#: src/modules/alsa/alsa-mixer.c:4226
+#: ../src/modules/alsa/alsa-mixer.c:4275
 msgid "Analog Mono Duplex"
 msgstr "ช่องสื่อสารสองทิศทางแอนะล็อกโมโน"
 
-#: src/modules/alsa/alsa-mixer.c:4227
+#: ../src/modules/alsa/alsa-mixer.c:4276
 msgid "Analog Stereo Duplex"
 msgstr "ช่องสื่อสารสองทิศทางแอนะล็อกสเตอริโอ"
 
-#: src/modules/alsa/alsa-mixer.c:4228
+#: ../src/modules/alsa/alsa-mixer.c:4277
 msgid "Digital Stereo Duplex (IEC958)"
 msgstr "ช่องสื่อสารดิจิทัลสตูดิโอแบบสองทิศทาง (IEC958)"
 
-#: src/modules/alsa/alsa-mixer.c:4229
+#: ../src/modules/alsa/alsa-mixer.c:4278
 msgid "Multichannel Duplex"
 msgstr ""
 
-#: src/modules/alsa/alsa-mixer.c:4230
+#: ../src/modules/alsa/alsa-mixer.c:4279
 msgid "Stereo Duplex"
 msgstr ""
 
-#: src/modules/alsa/alsa-mixer.c:4231 src/modules/alsa/module-alsa-card.c:189
-#: src/modules/bluetooth/module-bluez5-device.c:2012
+#: ../src/modules/alsa/alsa-mixer.c:4280
+#: ../src/modules/alsa/module-alsa-card.c:186
+#: ../src/modules/bluetooth/module-bluez4-device.c:2324
+#: ../src/modules/bluetooth/module-bluez5-device.c:2142
 msgid "Off"
 msgstr "ปิด"
 
-#: src/modules/alsa/alsa-mixer.c:4330
+#: ../src/modules/alsa/alsa-mixer.c:4379
 #, c-format
 msgid "%s Output"
 msgstr "เอาต์พุต %s"
 
-#: src/modules/alsa/alsa-mixer.c:4338
+#: ../src/modules/alsa/alsa-mixer.c:4387
 #, c-format
 msgid "%s Input"
 msgstr "อินพุต %s"
 
-#: src/modules/alsa/alsa-sink.c:651 src/modules/alsa/alsa-sink.c:841
+#: ../src/modules/alsa/alsa-sink.c:636
 #, c-format
 msgid ""
 "ALSA woke us up to write new data to the device, but there was actually "
@@ -771,7 +780,7 @@
 "returned 0 or another value < min_avail."
 msgstr ""
 
-#: ../src/modules/alsa/alsa-sink.c:756
+#: ../src/modules/alsa/alsa-sink.c:826
 #, c-format
 msgid ""
 "ALSA woke us up to write new data to the device, but there was actually "
@@ -788,7 +797,7 @@
 "เราถูกแจ้งเตือนพร้อมตั้งค่า POLLOUT -- แต่ผลลัพธ์คือ snd_pcm_avail() "
 "ส่งกลับค่า 0 หรือค่าอื่น ๆ ที่น้อยกว่าค่าต่ำสุดที่ใช้ได้"
 
-#: src/modules/alsa/alsa-source.c:610 src/modules/alsa/alsa-source.c:776
+#: ../src/modules/alsa/alsa-source.c:596
 #, c-format
 msgid ""
 "ALSA woke us up to read new data from the device, but there was actually "
@@ -799,7 +808,7 @@
 "returned 0 or another value < min_avail."
 msgstr ""
 
-#: ../src/modules/alsa/alsa-source.c:680
+#: ../src/modules/alsa/alsa-source.c:762
 #, c-format
 msgid ""
 "ALSA woke us up to read new data from the device, but there was actually "
@@ -816,7 +825,7 @@
 "เราถูกแจ้งเตือนพร้อมตั้งค่า POLLIN -- แต่ผลลัพธ์คือ snd_pcm_avail() "
 "ส่งกลับค่า 0 หรือค่าอื่น ๆ ที่น้อยกว่าค่าต่ำสุดที่ใช้ได้"
 
-#: ../src/modules/alsa/alsa-util.c:1168 ../src/modules/alsa/alsa-util.c:1243
+#: ../src/modules/alsa/alsa-util.c:1173 ../src/modules/alsa/alsa-util.c:1248
 #, c-format
 msgid ""
 "snd_pcm_avail() returned a value that is exceptionally large: %lu bytes (%lu "
@@ -825,7 +834,7 @@
 "to the ALSA developers."
 msgstr ""
 
-#: ../src/modules/alsa/alsa-util.c:1218
+#: ../src/modules/alsa/alsa-util.c:1223
 #, c-format
 msgid ""
 "snd_pcm_delay() returned a value that is exceptionally large: %li bytes "
@@ -834,7 +843,7 @@
 "to the ALSA developers."
 msgstr ""
 
-#: src/modules/alsa/alsa-util.c:1286
+#: ../src/modules/alsa/alsa-util.c:1264
 #, c-format
 msgid ""
 "snd_pcm_avail_delay() returned strange values: delay %lu is less than avail "
@@ -843,7 +852,7 @@
 "to the ALSA developers."
 msgstr ""
 
-#: ../src/modules/alsa/alsa-util.c:1302
+#: ../src/modules/alsa/alsa-util.c:1307
 #, c-format
 msgid ""
 "snd_pcm_mmap_begin() returned a value that is exceptionally large: %lu bytes "
@@ -852,44 +861,53 @@
 "to the ALSA developers."
 msgstr ""
 
-#: src/modules/bluetooth/module-bluez5-device.c:1747
+#: ../src/modules/bluetooth/module-bluez4-device.c:2094
+#: ../src/modules/bluetooth/module-bluez5-device.c:1877
 msgid "Headset"
 msgstr ""
 
-#: src/modules/bluetooth/module-bluez5-device.c:1752
+#: ../src/modules/bluetooth/module-bluez4-device.c:2099
+#: ../src/modules/bluetooth/module-bluez5-device.c:1882
 msgid "Handsfree"
 msgstr ""
 
-#: src/modules/bluetooth/module-bluez5-device.c:1770
+#: ../src/modules/bluetooth/module-bluez4-device.c:2114
+#: ../src/modules/bluetooth/module-bluez5-device.c:1900
 msgid "Headphone"
 msgstr ""
 
-#: src/modules/bluetooth/module-bluez5-device.c:1775
+#: ../src/modules/bluetooth/module-bluez4-device.c:2119
+#: ../src/modules/bluetooth/module-bluez5-device.c:1905
 msgid "Portable"
 msgstr ""
 
-#: src/modules/bluetooth/module-bluez5-device.c:1780
+#: ../src/modules/bluetooth/module-bluez4-device.c:2124
+#: ../src/modules/bluetooth/module-bluez5-device.c:1910
 msgid "Car"
 msgstr ""
 
-#: src/modules/bluetooth/module-bluez5-device.c:1785
+#: ../src/modules/bluetooth/module-bluez4-device.c:2129
+#: ../src/modules/bluetooth/module-bluez5-device.c:1915
 msgid "HiFi"
 msgstr ""
 
-#: src/modules/bluetooth/module-bluez5-device.c:1790
+#: ../src/modules/bluetooth/module-bluez4-device.c:2134
+#: ../src/modules/bluetooth/module-bluez5-device.c:1920
 msgid "Phone"
 msgstr ""
 
-#: src/modules/bluetooth/module-bluez5-device.c:1742
-#: src/modules/bluetooth/module-bluez5-device.c:1758
-#: src/modules/bluetooth/module-bluez5-device.c:1796
+#: ../src/modules/bluetooth/module-bluez4-device.c:2142
+#: ../src/modules/bluetooth/module-bluez5-device.c:1872
+#: ../src/modules/bluetooth/module-bluez5-device.c:1888
+#: ../src/modules/bluetooth/module-bluez5-device.c:1926
 msgid "Bluetooth Output"
 msgstr ""
 
-#: src/modules/bluetooth/module-bluez5-device.c:1741
-#: src/modules/bluetooth/module-bluez5-device.c:1763
-#: src/modules/bluetooth/module-bluez5-device.c:1769
-#: src/modules/bluetooth/module-bluez5-device.c:1795
+#: ../src/modules/bluetooth/module-bluez4-device.c:2145
+#: ../src/modules/bluetooth/module-bluez5-device.c:1871
+#: ../src/modules/bluetooth/module-bluez5-device.c:1893
+#: ../src/modules/bluetooth/module-bluez5-device.c:1899
+#: ../src/modules/bluetooth/module-bluez5-device.c:1925
 msgid "Bluetooth Input"
 msgstr ""
 
@@ -909,23 +927,23 @@
 msgid "Handsfree Gateway"
 msgstr ""
 
-#: src/modules/bluetooth/module-bluez5-device.c:1837
+#: ../src/modules/bluetooth/module-bluez5-device.c:1967
 msgid "High Fidelity Playback (A2DP Sink)"
 msgstr ""
 
-#: src/modules/bluetooth/module-bluez5-device.c:1849
+#: ../src/modules/bluetooth/module-bluez5-device.c:1979
 msgid "High Fidelity Capture (A2DP Source)"
 msgstr ""
 
-#: src/modules/bluetooth/module-bluez5-device.c:1861
+#: ../src/modules/bluetooth/module-bluez5-device.c:1991
 msgid "Headset Head Unit (HSP/HFP)"
 msgstr ""
 
-#: src/modules/bluetooth/module-bluez5-device.c:1874
+#: ../src/modules/bluetooth/module-bluez5-device.c:2004
 msgid "Headset Audio Gateway (HSP/HFP)"
 msgstr ""
 
-#: src/modules/echo-cancel/module-echo-cancel.c:59
+#: ../src/modules/echo-cancel/module-echo-cancel.c:61
 msgid ""
 "source_name=<name for the source> source_properties=<properties for the "
 "source> source_master=<name of source to filter> sink_name=<name for the "
@@ -939,31 +957,25 @@
 "or no> "
 msgstr ""
 
-#: src/modules/macosx/module-coreaudio-device.c:824
+#. add on profile
+#: ../src/modules/macosx/module-coreaudio-device.c:811
 msgid "On"
 msgstr ""
 
-#: src/modules/module-allow-passthrough.c:71
-#: src/modules/module-always-sink.c:80
+#: ../src/modules/module-allow-passthrough.c:73
+#: ../src/modules/module-always-sink.c:82
 msgid "Dummy Output"
 msgstr ""
 
-#. / TRANSLATORS: The app icon and name appears above this string. If the phrase
-#. / can't be translated in this language, translate the whole sentence
-#. / 'This app wants to record audio.'
-#: ../src/modules/trust-store/module-trust-store.c:154
-msgid "wants to record audio."
-msgstr ""
-
-#: src/modules/module-always-sink.c:34
+#: ../src/modules/module-always-sink.c:36
 msgid "Always keeps at least one sink loaded even if it's a null one"
 msgstr ""
 
-#: src/modules/module-equalizer-sink.c:68
+#: ../src/modules/module-equalizer-sink.c:70
 msgid "General Purpose Equalizer"
 msgstr ""
 
-#: src/modules/module-equalizer-sink.c:72
+#: ../src/modules/module-equalizer-sink.c:74
 msgid ""
 "sink_name=<name of the sink> sink_properties=<properties for the sink> "
 "sink_master=<sink to connect to> format=<sample format> rate=<sample rate> "
@@ -971,11 +983,11 @@
 "this module is being loaded automatically> use_volume_sharing=<yes or no> "
 msgstr ""
 
-#: src/modules/module-filter-apply.c:47
+#: ../src/modules/module-filter-apply.c:48
 msgid "autoclean=<automatically unload unused filters?>"
 msgstr ""
 
-#: src/modules/module-ladspa-sink.c:50
+#: ../src/modules/module-ladspa-sink.c:51
 msgid "Virtual LADSPA sink"
 msgstr ""
 
@@ -991,47 +1003,49 @@
 "autoloaded=<set if this module is being loaded automatically> "
 msgstr ""
 
-#: src/modules/module-null-sink.c:46
+#: ../src/modules/module-null-sink.c:47
 msgid "Clocked NULL sink"
 msgstr ""
 
-#: src/modules/module-null-sink.c:333
+#: ../src/modules/module-null-sink.c:284
 msgid "Null Output"
 msgstr ""
 
-#: src/modules/module-rygel-media-server.c:506
-#: src/modules/module-rygel-media-server.c:544
-#: src/modules/module-rygel-media-server.c:903
+#: ../src/modules/module-rygel-media-server.c:508
+#: ../src/modules/module-rygel-media-server.c:546
+#: ../src/modules/module-rygel-media-server.c:905
 msgid "Output Devices"
 msgstr ""
 
-#: src/modules/module-rygel-media-server.c:507
-#: src/modules/module-rygel-media-server.c:545
-#: src/modules/module-rygel-media-server.c:904
+#: ../src/modules/module-rygel-media-server.c:509
+#: ../src/modules/module-rygel-media-server.c:547
+#: ../src/modules/module-rygel-media-server.c:906
 msgid "Input Devices"
 msgstr ""
 
-#: src/modules/module-rygel-media-server.c:1061
+#: ../src/modules/module-rygel-media-server.c:1063
 msgid "Audio on @HOSTNAME@"
 msgstr ""
 
-#: src/modules/module-tunnel-sink-new.c:307
-#: src/modules/module-tunnel-source-new.c:305
+#. TODO: old tunnel put here the remote sink_name into stream name e.g. 'Null Output for lynxis@lazus'
+#. TODO: old tunnel put here the remote source_name into stream name e.g. 'Null Output for lynxis@lazus'
+#: ../src/modules/module-tunnel-sink-new.c:309
+#: ../src/modules/module-tunnel-source-new.c:307
 #, c-format
 msgid "Tunnel for %s@%s"
 msgstr ""
 
-#: src/modules/module-tunnel-sink-new.c:544
-#: src/modules/module-tunnel-source-new.c:540
+#: ../src/modules/module-tunnel-sink-new.c:532
+#: ../src/modules/module-tunnel-source-new.c:528
 #, c-format
 msgid "Tunnel to %s/%s"
 msgstr ""
 
-#: src/modules/module-virtual-surround-sink.c:45
+#: ../src/modules/module-virtual-surround-sink.c:47
 msgid "Virtual surround sink"
 msgstr ""
 
-#: src/modules/module-virtual-surround-sink.c:49
+#: ../src/modules/module-virtual-surround-sink.c:51
 msgid ""
 "sink_name=<name for the sink> sink_properties=<properties for the sink> "
 "master=<name of sink to filter> sink_master=<name of sink to filter> "
@@ -1041,281 +1055,282 @@
 "this module is being loaded automatically> "
 msgstr ""
 
-#: src/modules/reserve-wrap.c:149
+#: ../src/modules/reserve-wrap.c:149
 msgid "PulseAudio Sound Server"
 msgstr ""
 
-#: src/modules/alsa/alsa-mixer.c:4065 src/pulse/channelmap.c:103
-#: src/pulse/channelmap.c:771
+#: ../src/pulse/channelmap.c:103 ../src/pulse/channelmap.c:771
 msgid "Mono"
 msgstr ""
 
-#: src/pulse/channelmap.c:105
+#: ../src/pulse/channelmap.c:105
 msgid "Front Center"
 msgstr ""
 
-#: src/pulse/channelmap.c:106
+#: ../src/pulse/channelmap.c:106
 msgid "Front Left"
 msgstr ""
 
-#: src/pulse/channelmap.c:107
+#: ../src/pulse/channelmap.c:107
 msgid "Front Right"
 msgstr ""
 
-#: src/pulse/channelmap.c:109
+#: ../src/pulse/channelmap.c:109
 msgid "Rear Center"
 msgstr ""
 
-#: src/pulse/channelmap.c:110
+#: ../src/pulse/channelmap.c:110
 msgid "Rear Left"
 msgstr ""
 
-#: src/pulse/channelmap.c:111
+#: ../src/pulse/channelmap.c:111
 msgid "Rear Right"
 msgstr ""
 
-#: src/pulse/channelmap.c:113
+#: ../src/pulse/channelmap.c:113
 msgid "Subwoofer"
 msgstr ""
 
-#: src/pulse/channelmap.c:115
+#: ../src/pulse/channelmap.c:115
 msgid "Front Left-of-center"
 msgstr ""
 
-#: src/pulse/channelmap.c:116
+#: ../src/pulse/channelmap.c:116
 msgid "Front Right-of-center"
 msgstr ""
 
-#: src/pulse/channelmap.c:118
+#: ../src/pulse/channelmap.c:118
 msgid "Side Left"
 msgstr ""
 
-#: src/pulse/channelmap.c:119
+#: ../src/pulse/channelmap.c:119
 msgid "Side Right"
 msgstr ""
 
-#: src/pulse/channelmap.c:121
+#: ../src/pulse/channelmap.c:121
 msgid "Auxiliary 0"
 msgstr ""
 
-#: src/pulse/channelmap.c:122
+#: ../src/pulse/channelmap.c:122
 msgid "Auxiliary 1"
 msgstr ""
 
-#: src/pulse/channelmap.c:123
+#: ../src/pulse/channelmap.c:123
 msgid "Auxiliary 2"
 msgstr ""
 
-#: src/pulse/channelmap.c:124
+#: ../src/pulse/channelmap.c:124
 msgid "Auxiliary 3"
 msgstr ""
 
-#: src/pulse/channelmap.c:125
+#: ../src/pulse/channelmap.c:125
 msgid "Auxiliary 4"
 msgstr ""
 
-#: src/pulse/channelmap.c:126
+#: ../src/pulse/channelmap.c:126
 msgid "Auxiliary 5"
 msgstr ""
 
-#: src/pulse/channelmap.c:127
+#: ../src/pulse/channelmap.c:127
 msgid "Auxiliary 6"
 msgstr ""
 
-#: src/pulse/channelmap.c:128
+#: ../src/pulse/channelmap.c:128
 msgid "Auxiliary 7"
 msgstr ""
 
-#: src/pulse/channelmap.c:129
+#: ../src/pulse/channelmap.c:129
 msgid "Auxiliary 8"
 msgstr ""
 
-#: src/pulse/channelmap.c:130
+#: ../src/pulse/channelmap.c:130
 msgid "Auxiliary 9"
 msgstr ""
 
-#: src/pulse/channelmap.c:131
+#: ../src/pulse/channelmap.c:131
 msgid "Auxiliary 10"
 msgstr ""
 
-#: src/pulse/channelmap.c:132
+#: ../src/pulse/channelmap.c:132
 msgid "Auxiliary 11"
 msgstr ""
 
-#: src/pulse/channelmap.c:133
+#: ../src/pulse/channelmap.c:133
 msgid "Auxiliary 12"
 msgstr ""
 
-#: src/pulse/channelmap.c:134
+#: ../src/pulse/channelmap.c:134
 msgid "Auxiliary 13"
 msgstr ""
 
-#: src/pulse/channelmap.c:135
+#: ../src/pulse/channelmap.c:135
 msgid "Auxiliary 14"
 msgstr ""
 
-#: src/pulse/channelmap.c:136
+#: ../src/pulse/channelmap.c:136
 msgid "Auxiliary 15"
 msgstr ""
 
-#: src/pulse/channelmap.c:137
+#: ../src/pulse/channelmap.c:137
 msgid "Auxiliary 16"
 msgstr ""
 
-#: src/pulse/channelmap.c:138
+#: ../src/pulse/channelmap.c:138
 msgid "Auxiliary 17"
 msgstr ""
 
-#: src/pulse/channelmap.c:139
+#: ../src/pulse/channelmap.c:139
 msgid "Auxiliary 18"
 msgstr ""
 
-#: src/pulse/channelmap.c:140
+#: ../src/pulse/channelmap.c:140
 msgid "Auxiliary 19"
 msgstr ""
 
-#: src/pulse/channelmap.c:141
+#: ../src/pulse/channelmap.c:141
 msgid "Auxiliary 20"
 msgstr ""
 
-#: src/pulse/channelmap.c:142
+#: ../src/pulse/channelmap.c:142
 msgid "Auxiliary 21"
 msgstr ""
 
-#: src/pulse/channelmap.c:143
+#: ../src/pulse/channelmap.c:143
 msgid "Auxiliary 22"
 msgstr ""
 
-#: src/pulse/channelmap.c:144
+#: ../src/pulse/channelmap.c:144
 msgid "Auxiliary 23"
 msgstr ""
 
-#: src/pulse/channelmap.c:145
+#: ../src/pulse/channelmap.c:145
 msgid "Auxiliary 24"
 msgstr ""
 
-#: src/pulse/channelmap.c:146
+#: ../src/pulse/channelmap.c:146
 msgid "Auxiliary 25"
 msgstr ""
 
-#: src/pulse/channelmap.c:147
+#: ../src/pulse/channelmap.c:147
 msgid "Auxiliary 26"
 msgstr ""
 
-#: src/pulse/channelmap.c:148
+#: ../src/pulse/channelmap.c:148
 msgid "Auxiliary 27"
 msgstr ""
 
-#: src/pulse/channelmap.c:149
+#: ../src/pulse/channelmap.c:149
 msgid "Auxiliary 28"
 msgstr ""
 
-#: src/pulse/channelmap.c:150
+#: ../src/pulse/channelmap.c:150
 msgid "Auxiliary 29"
 msgstr ""
 
-#: src/pulse/channelmap.c:151
+#: ../src/pulse/channelmap.c:151
 msgid "Auxiliary 30"
 msgstr ""
 
-#: src/pulse/channelmap.c:152
+#: ../src/pulse/channelmap.c:152
 msgid "Auxiliary 31"
 msgstr ""
 
-#: src/pulse/channelmap.c:154
+#: ../src/pulse/channelmap.c:154
 msgid "Top Center"
 msgstr ""
 
-#: src/pulse/channelmap.c:156
+#: ../src/pulse/channelmap.c:156
 msgid "Top Front Center"
 msgstr ""
 
-#: src/pulse/channelmap.c:157
+#: ../src/pulse/channelmap.c:157
 msgid "Top Front Left"
 msgstr ""
 
-#: src/pulse/channelmap.c:158
+#: ../src/pulse/channelmap.c:158
 msgid "Top Front Right"
 msgstr ""
 
-#: src/pulse/channelmap.c:160
+#: ../src/pulse/channelmap.c:160
 msgid "Top Rear Center"
 msgstr ""
 
-#: src/pulse/channelmap.c:161
+#: ../src/pulse/channelmap.c:161
 msgid "Top Rear Left"
 msgstr ""
 
-#: src/pulse/channelmap.c:162
+#: ../src/pulse/channelmap.c:162
 msgid "Top Rear Right"
 msgstr ""
 
-#: src/pulse/channelmap.c:479 src/pulse/format.c:123 src/pulse/sample.c:177
-#: src/pulse/volume.c:306 src/pulse/volume.c:332 src/pulse/volume.c:352
-#: src/pulse/volume.c:384 src/pulse/volume.c:424 src/pulse/volume.c:443
+#: ../src/pulse/channelmap.c:479 ../src/pulse/format.c:121
+#: ../src/pulse/sample.c:177 ../src/pulse/volume.c:306
+#: ../src/pulse/volume.c:332 ../src/pulse/volume.c:352
+#: ../src/pulse/volume.c:384 ../src/pulse/volume.c:424
+#: ../src/pulse/volume.c:443
 msgid "(invalid)"
 msgstr ""
 
-#: src/pulse/channelmap.c:780
+#: ../src/pulse/channelmap.c:780
 msgid "Surround 4.0"
 msgstr ""
 
-#: src/pulse/channelmap.c:786
+#: ../src/pulse/channelmap.c:786
 msgid "Surround 4.1"
 msgstr ""
 
-#: src/pulse/channelmap.c:792
+#: ../src/pulse/channelmap.c:792
 msgid "Surround 5.0"
 msgstr ""
 
-#: src/pulse/channelmap.c:798
+#: ../src/pulse/channelmap.c:798
 msgid "Surround 5.1"
 msgstr ""
 
-#: src/pulse/channelmap.c:805
+#: ../src/pulse/channelmap.c:805
 msgid "Surround 7.1"
 msgstr ""
 
-#: src/pulse/client-conf-x11.c:61 src/utils/pax11publish.c:97
+#: ../src/pulse/client-conf-x11.c:53 ../src/utils/pax11publish.c:97
 msgid "xcb_connect() failed"
 msgstr ""
 
-#: src/pulse/client-conf-x11.c:66 src/utils/pax11publish.c:102
+#: ../src/pulse/client-conf-x11.c:58 ../src/utils/pax11publish.c:102
 msgid "xcb_connection_has_error() returned true"
 msgstr ""
 
-#: src/pulse/client-conf-x11.c:102
+#: ../src/pulse/client-conf-x11.c:94
 msgid "Failed to parse cookie data"
 msgstr ""
 
-#: src/pulse/context.c:705
+#: ../src/pulse/context.c:702
 #, c-format
 msgid "fork(): %s"
 msgstr ""
 
-#: src/pulse/context.c:760
+#: ../src/pulse/context.c:757
 #, c-format
 msgid "waitpid(): %s"
 msgstr ""
 
-#: src/pulse/context.c:1466
+#: ../src/pulse/context.c:1463
 #, c-format
 msgid "Received message for unknown extension '%s'"
 msgstr ""
 
-#: src/pulse/direction.c:37
+#: ../src/pulse/direction.c:37
 msgid "input"
 msgstr ""
 
-#: src/pulse/direction.c:39
+#: ../src/pulse/direction.c:39
 msgid "output"
 msgstr ""
 
-#: src/pulse/direction.c:41
+#: ../src/pulse/direction.c:41
 msgid "bidirectional"
 msgstr ""
 
-#: src/pulse/direction.c:43
+#: ../src/pulse/direction.c:43
 msgid "invalid"
 msgstr ""
 
@@ -1327,351 +1342,351 @@
 "over the native protocol. Don't do that.)"
 msgstr ""
 
-#: src/pulsecore/core-util.h:96
+#: ../src/pulsecore/core-util.h:97
 msgid "yes"
 msgstr ""
 
-#: src/pulsecore/core-util.h:96
+#: ../src/pulsecore/core-util.h:97
 msgid "no"
 msgstr ""
 
-#: src/pulsecore/lock-autospawn.c:141 src/pulsecore/lock-autospawn.c:227
+#: ../src/pulsecore/lock-autospawn.c:141 ../src/pulsecore/lock-autospawn.c:227
 msgid "Cannot access autospawn lock."
 msgstr ""
 
-#: src/pulsecore/log.c:165
+#: ../src/pulsecore/log.c:165
 #, c-format
 msgid "Failed to open target file '%s'."
 msgstr ""
 
-#: src/pulsecore/log.c:188
+#: ../src/pulsecore/log.c:188
 #, c-format
 msgid ""
 "Tried to open target file '%s', '%s.1', '%s.2' ... '%s.%d', but all failed."
 msgstr ""
 
-#: src/pulsecore/log.c:651
+#: ../src/pulsecore/log.c:651
 msgid "Invalid log target."
 msgstr ""
 
-#: src/pulsecore/sink.c:3516
+#: ../src/pulsecore/sink.c:3475
 msgid "Built-in Audio"
 msgstr ""
 
-#: src/pulsecore/sink.c:3521
+#: ../src/pulsecore/sink.c:3480
 msgid "Modem"
 msgstr ""
 
-#: src/pulse/error.c:38
+#: ../src/pulse/error.c:38
 msgid "OK"
 msgstr ""
 
-#: src/pulse/error.c:39
+#: ../src/pulse/error.c:39
 msgid "Access denied"
 msgstr ""
 
-#: src/pulse/error.c:40
+#: ../src/pulse/error.c:40
 msgid "Unknown command"
 msgstr ""
 
-#: src/pulse/error.c:41
+#: ../src/pulse/error.c:41
 msgid "Invalid argument"
 msgstr ""
 
-#: src/pulse/error.c:42
+#: ../src/pulse/error.c:42
 msgid "Entity exists"
 msgstr ""
 
-#: src/pulse/error.c:43
+#: ../src/pulse/error.c:43
 msgid "No such entity"
 msgstr ""
 
-#: src/pulse/error.c:44
+#: ../src/pulse/error.c:44
 msgid "Connection refused"
 msgstr ""
 
-#: src/pulse/error.c:45
+#: ../src/pulse/error.c:45
 msgid "Protocol error"
 msgstr ""
 
-#: src/pulse/error.c:46
+#: ../src/pulse/error.c:46
 msgid "Timeout"
 msgstr ""
 
-#: src/pulse/error.c:47
+#: ../src/pulse/error.c:47
 msgid "No authentication key"
 msgstr ""
 
-#: src/pulse/error.c:48
+#: ../src/pulse/error.c:48
 msgid "Internal error"
 msgstr ""
 
-#: src/pulse/error.c:49
+#: ../src/pulse/error.c:49
 msgid "Connection terminated"
 msgstr ""
 
-#: src/pulse/error.c:50
+#: ../src/pulse/error.c:50
 msgid "Entity killed"
 msgstr ""
 
-#: src/pulse/error.c:51
+#: ../src/pulse/error.c:51
 msgid "Invalid server"
 msgstr ""
 
-#: src/pulse/error.c:52
+#: ../src/pulse/error.c:52
 msgid "Module initialization failed"
 msgstr ""
 
-#: src/pulse/error.c:53
+#: ../src/pulse/error.c:53
 msgid "Bad state"
 msgstr ""
 
-#: src/pulse/error.c:54
+#: ../src/pulse/error.c:54
 msgid "No data"
 msgstr ""
 
-#: src/pulse/error.c:55
+#: ../src/pulse/error.c:55
 msgid "Incompatible protocol version"
 msgstr ""
 
-#: src/pulse/error.c:56
+#: ../src/pulse/error.c:56
 msgid "Too large"
 msgstr ""
 
-#: src/pulse/error.c:57
+#: ../src/pulse/error.c:57
 msgid "Not supported"
 msgstr ""
 
-#: src/pulse/error.c:58
+#: ../src/pulse/error.c:58
 msgid "Unknown error code"
 msgstr ""
 
-#: src/pulse/error.c:59
+#: ../src/pulse/error.c:59
 msgid "No such extension"
 msgstr ""
 
-#: src/pulse/error.c:60
+#: ../src/pulse/error.c:60
 msgid "Obsolete functionality"
 msgstr ""
 
-#: src/pulse/error.c:61
+#: ../src/pulse/error.c:61
 msgid "Missing implementation"
 msgstr ""
 
-#: src/pulse/error.c:62
+#: ../src/pulse/error.c:62
 msgid "Client forked"
 msgstr ""
 
-#: src/pulse/error.c:63
+#: ../src/pulse/error.c:63
 msgid "Input/Output error"
 msgstr ""
 
-#: src/pulse/error.c:64
+#: ../src/pulse/error.c:64
 msgid "Device or resource busy"
 msgstr ""
 
-#: src/pulse/sample.c:179
+#: ../src/pulse/sample.c:179
 #, c-format
 msgid "%s %uch %uHz"
 msgstr ""
 
-#: src/pulse/sample.c:191
+#: ../src/pulse/sample.c:191
 #, c-format
 msgid "%0.1f GiB"
 msgstr ""
 
-#: src/pulse/sample.c:193
+#: ../src/pulse/sample.c:193
 #, c-format
 msgid "%0.1f MiB"
 msgstr ""
 
-#: src/pulse/sample.c:195
+#: ../src/pulse/sample.c:195
 #, c-format
 msgid "%0.1f KiB"
 msgstr ""
 
-#: src/pulse/sample.c:197
+#: ../src/pulse/sample.c:197
 #, c-format
 msgid "%u B"
 msgstr ""
 
-#: src/utils/pacat.c:134
+#: ../src/utils/pacat.c:134
 #, c-format
 msgid "Failed to drain stream: %s"
 msgstr ""
 
-#: src/utils/pacat.c:139
+#: ../src/utils/pacat.c:139
 msgid "Playback stream drained."
 msgstr ""
 
-#: src/utils/pacat.c:150
+#: ../src/utils/pacat.c:150
 msgid "Draining connection to server."
 msgstr ""
 
-#: src/utils/pacat.c:163
+#: ../src/utils/pacat.c:163
 #, c-format
 msgid "pa_stream_drain(): %s"
 msgstr ""
 
-#: src/utils/pacat.c:194 src/utils/pacat.c:543
+#: ../src/utils/pacat.c:194 ../src/utils/pacat.c:543
 #, c-format
 msgid "pa_stream_begin_write() failed: %s"
 msgstr ""
 
-#: src/utils/pacat.c:244 src/utils/pacat.c:274
+#: ../src/utils/pacat.c:244 ../src/utils/pacat.c:274
 #, c-format
 msgid "pa_stream_peek() failed: %s"
 msgstr ""
 
-#: src/utils/pacat.c:324
+#: ../src/utils/pacat.c:324
 msgid "Stream successfully created."
 msgstr ""
 
-#: src/utils/pacat.c:327
+#: ../src/utils/pacat.c:327
 #, c-format
 msgid "pa_stream_get_buffer_attr() failed: %s"
 msgstr ""
 
-#: src/utils/pacat.c:331
+#: ../src/utils/pacat.c:331
 #, c-format
 msgid "Buffer metrics: maxlength=%u, tlength=%u, prebuf=%u, minreq=%u"
 msgstr ""
 
-#: src/utils/pacat.c:334
+#: ../src/utils/pacat.c:334
 #, c-format
 msgid "Buffer metrics: maxlength=%u, fragsize=%u"
 msgstr ""
 
-#: src/utils/pacat.c:338
+#: ../src/utils/pacat.c:338
 #, c-format
 msgid "Using sample spec '%s', channel map '%s'."
 msgstr ""
 
-#: src/utils/pacat.c:342
+#: ../src/utils/pacat.c:342
 #, c-format
 msgid "Connected to device %s (index: %u, suspended: %s)."
 msgstr ""
 
-#: src/utils/pacat.c:352
+#: ../src/utils/pacat.c:352
 #, c-format
 msgid "Stream error: %s"
 msgstr ""
 
-#: src/utils/pacat.c:362
+#: ../src/utils/pacat.c:362
 #, c-format
 msgid "Stream device suspended.%s"
 msgstr ""
 
-#: src/utils/pacat.c:364
+#: ../src/utils/pacat.c:364
 #, c-format
 msgid "Stream device resumed.%s"
 msgstr ""
 
-#: src/utils/pacat.c:372
+#: ../src/utils/pacat.c:372
 #, c-format
 msgid "Stream underrun.%s"
 msgstr ""
 
-#: src/utils/pacat.c:379
+#: ../src/utils/pacat.c:379
 #, c-format
 msgid "Stream overrun.%s"
 msgstr ""
 
-#: src/utils/pacat.c:386
+#: ../src/utils/pacat.c:386
 #, c-format
 msgid "Stream started.%s"
 msgstr ""
 
-#: src/utils/pacat.c:393
+#: ../src/utils/pacat.c:393
 #, c-format
 msgid "Stream moved to device %s (%u, %ssuspended).%s"
 msgstr ""
 
-#: src/utils/pacat.c:393
+#: ../src/utils/pacat.c:393
 msgid "not "
 msgstr ""
 
-#: src/utils/pacat.c:400
+#: ../src/utils/pacat.c:400
 #, c-format
 msgid "Stream buffer attributes changed.%s"
 msgstr ""
 
-#: src/utils/pacat.c:415
+#: ../src/utils/pacat.c:415
 msgid "Cork request stack is empty: corking stream"
 msgstr ""
 
-#: src/utils/pacat.c:421
+#: ../src/utils/pacat.c:421
 msgid "Cork request stack is empty: uncorking stream"
 msgstr ""
 
-#: src/utils/pacat.c:425
+#: ../src/utils/pacat.c:425
 msgid "Warning: Received more uncork requests than cork requests."
 msgstr ""
 
-#: src/utils/pacat.c:450
+#: ../src/utils/pacat.c:450
 #, c-format
 msgid "Connection established.%s"
 msgstr ""
 
-#: src/utils/pacat.c:453
+#: ../src/utils/pacat.c:453
 #, c-format
 msgid "pa_stream_new() failed: %s"
 msgstr ""
 
-#: src/utils/pacat.c:491
+#: ../src/utils/pacat.c:491
 #, c-format
 msgid "pa_stream_connect_playback() failed: %s"
 msgstr ""
 
-#: src/utils/pacat.c:497
+#: ../src/utils/pacat.c:497
 #, c-format
 msgid "Failed to set monitor stream: %s"
 msgstr ""
 
-#: src/utils/pacat.c:501
+#: ../src/utils/pacat.c:501
 #, c-format
 msgid "pa_stream_connect_record() failed: %s"
 msgstr ""
 
-#: src/utils/pacat.c:514 src/utils/pactl.c:1454
+#: ../src/utils/pacat.c:514 ../src/utils/pactl.c:1446
 #, c-format
 msgid "Connection failure: %s"
 msgstr ""
 
-#: src/utils/pacat.c:557
+#: ../src/utils/pacat.c:557
 msgid "Got EOF."
 msgstr ""
 
-#: src/utils/pacat.c:581
+#: ../src/utils/pacat.c:581
 #, c-format
 msgid "pa_stream_write() failed: %s"
 msgstr ""
 
-#: src/utils/pacat.c:605
+#: ../src/utils/pacat.c:605
 #, c-format
 msgid "write() failed: %s"
 msgstr ""
 
-#: src/utils/pacat.c:626
+#: ../src/utils/pacat.c:626
 msgid "Got signal, exiting."
 msgstr ""
 
-#: src/utils/pacat.c:640
+#: ../src/utils/pacat.c:640
 #, c-format
 msgid "Failed to get latency: %s"
 msgstr ""
 
-#: src/utils/pacat.c:645
+#: ../src/utils/pacat.c:645
 #, c-format
 msgid "Time: %0.3f sec; Latency: %0.0f usec."
 msgstr ""
 
-#: src/utils/pacat.c:666
+#: ../src/utils/pacat.c:666
 #, c-format
 msgid "pa_stream_update_timing_info() failed: %s"
 msgstr ""
 
-#: src/utils/pacat.c:676
+#: ../src/utils/pacat.c:676
 #, c-format
 msgid ""
 "%s [options]\n"
@@ -1739,28 +1754,28 @@
 "index INDEX.\n"
 msgstr ""
 
-#: src/utils/pacat.c:793
+#: ../src/utils/pacat.c:793
 msgid "Play back encoded audio files on a PulseAudio sound server."
 msgstr ""
 
-#: src/utils/pacat.c:797
+#: ../src/utils/pacat.c:797
 msgid ""
 "Capture audio data from a PulseAudio sound server and write it to a file."
 msgstr ""
 
-#: src/utils/pacat.c:801
+#: ../src/utils/pacat.c:801
 msgid ""
 "Capture audio data from a PulseAudio sound server and write it to STDOUT or "
 "the specified file."
 msgstr ""
 
-#: src/utils/pacat.c:805
+#: ../src/utils/pacat.c:805
 msgid ""
 "Play back audio data from STDIN or the specified file on a PulseAudio sound "
 "server."
 msgstr ""
 
-#: src/utils/pacat.c:819
+#: ../src/utils/pacat.c:819
 #, c-format
 msgid ""
 "pacat %s\n"
@@ -1768,226 +1783,226 @@
 "Linked with libpulse %s\n"
 msgstr ""
 
-#: src/utils/pacat.c:852 src/utils/pactl.c:1656
+#: ../src/utils/pacat.c:852 ../src/utils/pactl.c:1648
 #, c-format
 msgid "Invalid client name '%s'"
 msgstr ""
 
-#: src/utils/pacat.c:867
+#: ../src/utils/pacat.c:867
 #, c-format
 msgid "Invalid stream name '%s'"
 msgstr ""
 
-#: src/utils/pacat.c:904
+#: ../src/utils/pacat.c:904
 #, c-format
 msgid "Invalid channel map '%s'"
 msgstr ""
 
-#: src/utils/pacat.c:933 src/utils/pacat.c:947
+#: ../src/utils/pacat.c:933 ../src/utils/pacat.c:947
 #, c-format
 msgid "Invalid latency specification '%s'"
 msgstr ""
 
-#: src/utils/pacat.c:940 src/utils/pacat.c:954
+#: ../src/utils/pacat.c:940 ../src/utils/pacat.c:954
 #, c-format
 msgid "Invalid process time specification '%s'"
 msgstr ""
 
-#: src/utils/pacat.c:966
+#: ../src/utils/pacat.c:966
 #, c-format
 msgid "Invalid property '%s'"
 msgstr ""
 
-#: src/utils/pacat.c:985
+#: ../src/utils/pacat.c:985
 #, c-format
 msgid "Unknown file format %s."
 msgstr ""
 
-#: src/utils/pacat.c:1000
+#: ../src/utils/pacat.c:1000
 msgid "Failed to parse the argument for --monitor-stream"
 msgstr ""
 
-#: src/utils/pacat.c:1011
+#: ../src/utils/pacat.c:1011
 msgid "Invalid sample specification"
 msgstr ""
 
-#: src/utils/pacat.c:1021
+#: ../src/utils/pacat.c:1021
 #, c-format
 msgid "open(): %s"
 msgstr ""
 
-#: src/utils/pacat.c:1026
+#: ../src/utils/pacat.c:1026
 #, c-format
 msgid "dup2(): %s"
 msgstr ""
 
-#: src/utils/pacat.c:1033
+#: ../src/utils/pacat.c:1033
 msgid "Too many arguments."
 msgstr ""
 
-#: src/utils/pacat.c:1044
+#: ../src/utils/pacat.c:1044
 msgid "Failed to generate sample specification for file."
 msgstr ""
 
-#: src/utils/pacat.c:1070
+#: ../src/utils/pacat.c:1070
 msgid "Failed to open audio file."
 msgstr ""
 
-#: src/utils/pacat.c:1076
+#: ../src/utils/pacat.c:1076
 msgid ""
 "Warning: specified sample specification will be overwritten with "
 "specification from file."
 msgstr ""
 
-#: src/utils/pacat.c:1079 src/utils/pactl.c:1720
+#: ../src/utils/pacat.c:1079 ../src/utils/pactl.c:1712
 msgid "Failed to determine sample specification from file."
 msgstr ""
 
-#: src/utils/pacat.c:1088
+#: ../src/utils/pacat.c:1088
 msgid "Warning: Failed to determine channel map from file."
 msgstr ""
 
-#: src/utils/pacat.c:1099
+#: ../src/utils/pacat.c:1099
 msgid "Channel map doesn't match sample specification"
 msgstr ""
 
-#: src/utils/pacat.c:1110
+#: ../src/utils/pacat.c:1110
 msgid "Warning: failed to write channel map to file."
 msgstr ""
 
-#: src/utils/pacat.c:1125
+#: ../src/utils/pacat.c:1125
 #, c-format
 msgid ""
 "Opening a %s stream with sample specification '%s' and channel map '%s'."
 msgstr ""
 
-#: src/utils/pacat.c:1126
+#: ../src/utils/pacat.c:1126
 msgid "recording"
 msgstr ""
 
-#: src/utils/pacat.c:1126
+#: ../src/utils/pacat.c:1126
 msgid "playback"
 msgstr ""
 
-#: src/utils/pacat.c:1150
+#: ../src/utils/pacat.c:1150
 msgid "Failed to set media name."
 msgstr ""
 
-#: src/utils/pacat.c:1160 src/utils/pactl.c:2070
+#: ../src/utils/pacat.c:1160 ../src/utils/pactl.c:2062
 msgid "pa_mainloop_new() failed."
 msgstr ""
 
-#: src/utils/pacat.c:1183
+#: ../src/utils/pacat.c:1183
 msgid "io_new() failed."
 msgstr ""
 
-#: src/utils/pacat.c:1190 src/utils/pactl.c:2082
+#: ../src/utils/pacat.c:1190 ../src/utils/pactl.c:2074
 msgid "pa_context_new() failed."
 msgstr ""
 
-#: src/utils/pacat.c:1198 src/utils/pactl.c:2088
+#: ../src/utils/pacat.c:1198 ../src/utils/pactl.c:2080
 #, c-format
 msgid "pa_context_connect() failed: %s"
 msgstr ""
 
-#: src/utils/pacat.c:1204
+#: ../src/utils/pacat.c:1204
 msgid "pa_context_rttime_new() failed."
 msgstr ""
 
-#: src/utils/pacat.c:1211 src/utils/pactl.c:2093
+#: ../src/utils/pacat.c:1211 ../src/utils/pactl.c:2085
 msgid "pa_mainloop_run() failed."
 msgstr ""
 
-#: src/utils/pacmd.c:51 src/utils/pactl.c:1578
+#: ../src/utils/pacmd.c:51 ../src/utils/pactl.c:1570
 msgid "NAME [ARGS ...]"
 msgstr ""
 
-#: src/utils/pacmd.c:52 src/utils/pacmd.c:60 src/utils/pactl.c:1579
+#: ../src/utils/pacmd.c:52 ../src/utils/pacmd.c:60 ../src/utils/pactl.c:1571
 msgid "NAME|#N"
 msgstr ""
 
-#: src/utils/pacmd.c:53 src/utils/pacmd.c:63 src/utils/pactl.c:1577
-#: src/utils/pactl.c:1583
+#: ../src/utils/pacmd.c:53 ../src/utils/pacmd.c:63 ../src/utils/pactl.c:1569
+#: ../src/utils/pactl.c:1575
 msgid "NAME"
 msgstr ""
 
-#: src/utils/pacmd.c:54
+#: ../src/utils/pacmd.c:54
 msgid "NAME|#N VOLUME"
 msgstr ""
 
-#: src/utils/pacmd.c:55
+#: ../src/utils/pacmd.c:55
 msgid "#N VOLUME"
 msgstr ""
 
-#: src/utils/pacmd.c:56 src/utils/pacmd.c:70 src/utils/pactl.c:1581
+#: ../src/utils/pacmd.c:56 ../src/utils/pacmd.c:70 ../src/utils/pactl.c:1573
 msgid "NAME|#N 1|0"
 msgstr ""
 
-#: src/utils/pacmd.c:57
+#: ../src/utils/pacmd.c:57
 msgid "#N 1|0"
 msgstr ""
 
-#: src/utils/pacmd.c:58
+#: ../src/utils/pacmd.c:58
 msgid "NAME|#N KEY=VALUE"
 msgstr ""
 
-#: src/utils/pacmd.c:59
+#: ../src/utils/pacmd.c:59
 msgid "#N KEY=VALUE"
 msgstr ""
 
-#: src/utils/pacmd.c:61
+#: ../src/utils/pacmd.c:61
 msgid "#N"
 msgstr ""
 
-#: src/utils/pacmd.c:62
+#: ../src/utils/pacmd.c:62
 msgid "NAME SINK|#N"
 msgstr ""
 
-#: src/utils/pacmd.c:64 src/utils/pacmd.c:65
+#: ../src/utils/pacmd.c:64 ../src/utils/pacmd.c:65
 msgid "NAME FILENAME"
 msgstr ""
 
-#: src/utils/pacmd.c:66
+#: ../src/utils/pacmd.c:66
 msgid "PATHNAME"
 msgstr ""
 
-#: src/utils/pacmd.c:67
+#: ../src/utils/pacmd.c:67
 msgid "FILENAME SINK|#N"
 msgstr ""
 
-#: src/utils/pacmd.c:69 src/utils/pactl.c:1580
+#: ../src/utils/pacmd.c:69 ../src/utils/pactl.c:1572
 msgid "#N SINK|SOURCE"
 msgstr ""
 
-#: src/utils/pacmd.c:71 src/utils/pacmd.c:77 src/utils/pacmd.c:78
+#: ../src/utils/pacmd.c:71 ../src/utils/pacmd.c:77 ../src/utils/pacmd.c:78
 msgid "1|0"
 msgstr ""
 
-#: src/utils/pacmd.c:72 src/utils/pactl.c:1582
+#: ../src/utils/pacmd.c:72 ../src/utils/pactl.c:1574
 msgid "CARD PROFILE"
 msgstr ""
 
-#: src/utils/pacmd.c:73 src/utils/pactl.c:1584
+#: ../src/utils/pacmd.c:73 ../src/utils/pactl.c:1576
 msgid "NAME|#N PORT"
 msgstr ""
 
-#: src/utils/pacmd.c:74 src/utils/pactl.c:1590
+#: ../src/utils/pacmd.c:74 ../src/utils/pactl.c:1582
 msgid "CARD-NAME|CARD-#N PORT OFFSET"
 msgstr ""
 
-#: src/utils/pacmd.c:75
+#: ../src/utils/pacmd.c:75
 msgid "TARGET"
 msgstr ""
 
-#: src/utils/pacmd.c:76
+#: ../src/utils/pacmd.c:76
 msgid "NUMERIC-LEVEL"
 msgstr ""
 
-#: src/utils/pacmd.c:79
+#: ../src/utils/pacmd.c:79
 msgid "FRAMES"
 msgstr ""
 
-#: src/utils/pacmd.c:81
+#: ../src/utils/pacmd.c:81
 #, c-format
 msgid ""
 "\n"
@@ -1996,7 +2011,7 @@
 "When no command is given pacmd starts in the interactive mode.\n"
 msgstr ""
 
-#: src/utils/pacmd.c:128
+#: ../src/utils/pacmd.c:128
 #, c-format
 msgid ""
 "pacmd %s\n"
@@ -2004,44 +2019,44 @@
 "Linked with libpulse %s\n"
 msgstr ""
 
-#: src/utils/pacmd.c:142
+#: ../src/utils/pacmd.c:142
 msgid "No PulseAudio daemon running, or not running as session daemon."
 msgstr ""
 
-#: src/utils/pacmd.c:147
+#: ../src/utils/pacmd.c:147
 #, c-format
 msgid "socket(PF_UNIX, SOCK_STREAM, 0): %s"
 msgstr ""
 
-#: src/utils/pacmd.c:164
+#: ../src/utils/pacmd.c:164
 #, c-format
 msgid "connect(): %s"
 msgstr ""
 
-#: src/utils/pacmd.c:172
+#: ../src/utils/pacmd.c:172
 msgid "Failed to kill PulseAudio daemon."
 msgstr ""
 
-#: src/utils/pacmd.c:180
+#: ../src/utils/pacmd.c:180
 msgid "Daemon not responding."
 msgstr ""
 
-#: src/utils/pacmd.c:212 src/utils/pacmd.c:321 src/utils/pacmd.c:339
+#: ../src/utils/pacmd.c:212 ../src/utils/pacmd.c:321 ../src/utils/pacmd.c:339
 #, c-format
 msgid "write(): %s"
 msgstr ""
 
-#: src/utils/pacmd.c:268
+#: ../src/utils/pacmd.c:268
 #, c-format
 msgid "poll(): %s"
 msgstr ""
 
-#: src/utils/pacmd.c:279 src/utils/pacmd.c:299
+#: ../src/utils/pacmd.c:279 ../src/utils/pacmd.c:299
 #, c-format
 msgid "read(): %s"
 msgstr ""
 
-#: src/utils/pactl.c:164
+#: ../src/utils/pactl.c:164
 #, c-format
 msgid "Failed to get statistics: %s"
 msgstr ""
@@ -2057,17 +2072,17 @@
 "Allocated during whole lifetime: %u blocks containing %s bytes total.\n"
 msgstr ""
 
-#: src/utils/pactl.c:182
+#: ../src/utils/pactl.c:176
 #, c-format
 msgid "Sample cache size: %s\n"
 msgstr ""
 
-#: src/utils/pactl.c:191
+#: ../src/utils/pactl.c:185
 #, c-format
 msgid "Failed to get server information: %s"
 msgstr ""
 
-#: src/utils/pactl.c:196
+#: ../src/utils/pactl.c:190
 #, c-format
 msgid ""
 "Server String: %s\n"
@@ -2078,7 +2093,7 @@
 "Tile Size: %zu\n"
 msgstr ""
 
-#: src/utils/pactl.c:212
+#: ../src/utils/pactl.c:206
 #, c-format
 msgid ""
 "User Name: %s\n"
@@ -2092,12 +2107,12 @@
 "Cookie: %04x:%04x\n"
 msgstr ""
 
-#: src/utils/pactl.c:261 src/utils/pactl.c:908 src/utils/pactl.c:986
+#: ../src/utils/pactl.c:255 ../src/utils/pactl.c:900 ../src/utils/pactl.c:978
 #, c-format
 msgid "Failed to get sink information: %s"
 msgstr ""
 
-#: src/utils/pactl.c:287
+#: ../src/utils/pactl.c:281
 #, c-format
 msgid ""
 "Sink #%u\n"
@@ -2119,27 +2134,27 @@
 "\t\t%s\n"
 msgstr ""
 
-#: src/utils/pactl.c:331 src/utils/pactl.c:437 src/utils/pactl.c:598
+#: ../src/utils/pactl.c:325 ../src/utils/pactl.c:431 ../src/utils/pactl.c:592
 #, c-format
 msgid "\tPorts:\n"
 msgstr ""
 
-#: src/utils/pactl.c:338 src/utils/pactl.c:444
+#: ../src/utils/pactl.c:332 ../src/utils/pactl.c:438
 #, c-format
 msgid "\tActive Port: %s\n"
 msgstr ""
 
-#: src/utils/pactl.c:344 src/utils/pactl.c:450
+#: ../src/utils/pactl.c:338 ../src/utils/pactl.c:444
 #, c-format
 msgid "\tFormats:\n"
 msgstr ""
 
-#: src/utils/pactl.c:368 src/utils/pactl.c:928 src/utils/pactl.c:1001
+#: ../src/utils/pactl.c:362 ../src/utils/pactl.c:920 ../src/utils/pactl.c:993
 #, c-format
 msgid "Failed to get source information: %s"
 msgstr ""
 
-#: src/utils/pactl.c:394
+#: ../src/utils/pactl.c:388
 #, c-format
 msgid ""
 "Source #%u\n"
@@ -2161,20 +2176,20 @@
 "\t\t%s\n"
 msgstr ""
 
-#: src/utils/pactl.c:422 src/utils/pactl.c:492 src/utils/pactl.c:535
-#: src/utils/pactl.c:577 src/utils/pactl.c:675 src/utils/pactl.c:676
-#: src/utils/pactl.c:687 src/utils/pactl.c:745 src/utils/pactl.c:746
-#: src/utils/pactl.c:757 src/utils/pactl.c:808 src/utils/pactl.c:809
-#: src/utils/pactl.c:815
+#: ../src/utils/pactl.c:416 ../src/utils/pactl.c:486 ../src/utils/pactl.c:529
+#: ../src/utils/pactl.c:571 ../src/utils/pactl.c:669 ../src/utils/pactl.c:670
+#: ../src/utils/pactl.c:681 ../src/utils/pactl.c:739 ../src/utils/pactl.c:740
+#: ../src/utils/pactl.c:751 ../src/utils/pactl.c:802 ../src/utils/pactl.c:803
+#: ../src/utils/pactl.c:809
 msgid "n/a"
 msgstr ""
 
-#: src/utils/pactl.c:461 src/utils/pactl.c:865
+#: ../src/utils/pactl.c:455 ../src/utils/pactl.c:859
 #, c-format
 msgid "Failed to get module information: %s"
 msgstr ""
 
-#: src/utils/pactl.c:484
+#: ../src/utils/pactl.c:478
 #, c-format
 msgid ""
 "Module #%u\n"
@@ -2185,12 +2200,12 @@
 "\t\t%s\n"
 msgstr ""
 
-#: src/utils/pactl.c:503
+#: ../src/utils/pactl.c:497
 #, c-format
 msgid "Failed to get client information: %s"
 msgstr ""
 
-#: src/utils/pactl.c:529
+#: ../src/utils/pactl.c:523
 #, c-format
 msgid ""
 "Client #%u\n"
@@ -2200,12 +2215,12 @@
 "\t\t%s\n"
 msgstr ""
 
-#: src/utils/pactl.c:546
+#: ../src/utils/pactl.c:540
 #, c-format
 msgid "Failed to get card information: %s"
 msgstr ""
 
-#: src/utils/pactl.c:569
+#: ../src/utils/pactl.c:563
 #, c-format
 msgid ""
 "Card #%u\n"
@@ -2216,39 +2231,39 @@
 "\t\t%s\n"
 msgstr ""
 
-#: src/utils/pactl.c:585
+#: ../src/utils/pactl.c:579
 #, c-format
 msgid "\tProfiles:\n"
 msgstr ""
 
-#: src/utils/pactl.c:587
+#: ../src/utils/pactl.c:581
 #, c-format
 msgid "\t\t%s: %s (sinks: %u, sources: %u, priority: %u, available: %s)\n"
 msgstr ""
 
-#: src/utils/pactl.c:592
+#: ../src/utils/pactl.c:586
 #, c-format
 msgid "\tActive Profile: %s\n"
 msgstr ""
 
-#: src/utils/pactl.c:606
+#: ../src/utils/pactl.c:600
 #, c-format
 msgid ""
 "\t\t\tProperties:\n"
 "\t\t\t\t%s\n"
 msgstr ""
 
-#: src/utils/pactl.c:611
+#: ../src/utils/pactl.c:605
 #, c-format
 msgid "\t\t\tPart of profile(s): %s"
 msgstr ""
 
-#: src/utils/pactl.c:628 src/utils/pactl.c:948 src/utils/pactl.c:1016
+#: ../src/utils/pactl.c:622 ../src/utils/pactl.c:940 ../src/utils/pactl.c:1008
 #, c-format
 msgid "Failed to get sink input information: %s"
 msgstr ""
 
-#: src/utils/pactl.c:657
+#: ../src/utils/pactl.c:651
 #, c-format
 msgid ""
 "Sink Input #%u\n"
@@ -2270,12 +2285,12 @@
 "\t\t%s\n"
 msgstr ""
 
-#: src/utils/pactl.c:698 src/utils/pactl.c:968 src/utils/pactl.c:1031
+#: ../src/utils/pactl.c:692 ../src/utils/pactl.c:960 ../src/utils/pactl.c:1023
 #, c-format
 msgid "Failed to get source output information: %s"
 msgstr ""
 
-#: src/utils/pactl.c:727
+#: ../src/utils/pactl.c:721
 #, c-format
 msgid ""
 "Source Output #%u\n"
@@ -2297,12 +2312,12 @@
 "\t\t%s\n"
 msgstr ""
 
-#: src/utils/pactl.c:768
+#: ../src/utils/pactl.c:762
 #, c-format
 msgid "Failed to get sample information: %s"
 msgstr ""
 
-#: src/utils/pactl.c:795
+#: ../src/utils/pactl.c:789
 #, c-format
 msgid ""
 "Sample #%u\n"
@@ -2319,12 +2334,12 @@
 "\t\t%s\n"
 msgstr ""
 
-#: src/utils/pactl.c:823 src/utils/pactl.c:833
+#: ../src/utils/pactl.c:817 ../src/utils/pactl.c:827
 #, c-format
 msgid "Failure: %s"
 msgstr ""
 
-#: src/utils/pactl.c:872
+#: ../src/utils/pactl.c:866
 #, c-format
 msgid "Failed to unload module: Module %s not loaded"
 msgstr ""
@@ -2336,140 +2351,144 @@
 "channel/s supported = %d\n"
 msgstr ""
 
-#: src/modules/module-null-sink.c:345 src/utils/pactl.c:1058
+#: ../src/utils/pactl.c:1050
 #, c-format
 msgid "Failed to set format: invalid format string %s"
 msgstr ""
 
-#: src/utils/pactl.c:1101
+#: ../src/utils/pactl.c:1093
 #, c-format
 msgid "Failed to upload sample: %s"
 msgstr ""
 
-#: src/utils/pactl.c:1118
+#: ../src/utils/pactl.c:1110
 msgid "Premature end of file"
 msgstr ""
 
-#: src/utils/pactl.c:1138
+#: ../src/utils/pactl.c:1130
 msgid "new"
 msgstr ""
 
-#: src/utils/pactl.c:1141
+#: ../src/utils/pactl.c:1133
 msgid "change"
 msgstr ""
 
-#: src/utils/pactl.c:1144
+#: ../src/utils/pactl.c:1136
 msgid "remove"
 msgstr ""
 
-#: src/utils/pactl.c:1147 src/utils/pactl.c:1182
+#: ../src/utils/pactl.c:1139 ../src/utils/pactl.c:1174
 msgid "unknown"
 msgstr ""
 
-#: src/utils/pactl.c:1155
+#: ../src/utils/pactl.c:1147
 msgid "sink"
 msgstr ""
 
-#: src/utils/pactl.c:1158
+#: ../src/utils/pactl.c:1150
 msgid "source"
 msgstr ""
 
-#: src/utils/pactl.c:1161
+#: ../src/utils/pactl.c:1153
 msgid "sink-input"
 msgstr ""
 
-#: src/utils/pactl.c:1164
+#: ../src/utils/pactl.c:1156
 msgid "source-output"
 msgstr ""
 
-#: src/utils/pactl.c:1167
+#: ../src/utils/pactl.c:1159
 msgid "module"
 msgstr ""
 
-#: src/utils/pactl.c:1170
+#: ../src/utils/pactl.c:1162
 msgid "client"
 msgstr ""
 
-#: src/utils/pactl.c:1173
+#: ../src/utils/pactl.c:1165
 msgid "sample-cache"
 msgstr ""
 
-#: src/utils/pactl.c:1176
+#: ../src/utils/pactl.c:1168
 msgid "server"
 msgstr ""
 
-#: src/utils/pactl.c:1179
+#: ../src/utils/pactl.c:1171
 msgid "card"
 msgstr ""
 
-#: src/utils/pactl.c:1188
+#: ../src/utils/pactl.c:1180
 #, c-format
 msgid "Event '%s' on %s #%u\n"
 msgstr ""
 
-#: src/utils/pactl.c:1460
+#: ../src/utils/pactl.c:1452
 msgid "Got SIGINT, exiting."
 msgstr ""
 
-#: src/utils/pactl.c:1493
+#: ../src/utils/pactl.c:1485
 msgid "Invalid volume specification"
 msgstr ""
 
-#: src/utils/pactl.c:1516
+#: ../src/utils/pactl.c:1508
 msgid "Volume outside permissible range.\n"
 msgstr ""
 
-#: src/utils/pactl.c:1529
+#: ../src/utils/pactl.c:1521
 msgid "Invalid number of volume specifications.\n"
 msgstr ""
 
-#: src/utils/pactl.c:1541
+#: ../src/utils/pactl.c:1533
 msgid "Inconsistent volume specification.\n"
 msgstr ""
 
-#: src/utils/pactl.c:1571 src/utils/pactl.c:1572 src/utils/pactl.c:1573
-#: src/utils/pactl.c:1574 src/utils/pactl.c:1575 src/utils/pactl.c:1576
-#: src/utils/pactl.c:1577 src/utils/pactl.c:1578 src/utils/pactl.c:1579
-#: src/utils/pactl.c:1580 src/utils/pactl.c:1581 src/utils/pactl.c:1582
-#: src/utils/pactl.c:1583 src/utils/pactl.c:1584 src/utils/pactl.c:1585
-#: src/utils/pactl.c:1586 src/utils/pactl.c:1587 src/utils/pactl.c:1588
-#: src/utils/pactl.c:1589 src/utils/pactl.c:1590 src/utils/pactl.c:1591
+#: ../src/utils/pactl.c:1563 ../src/utils/pactl.c:1564
+#: ../src/utils/pactl.c:1565 ../src/utils/pactl.c:1566
+#: ../src/utils/pactl.c:1567 ../src/utils/pactl.c:1568
+#: ../src/utils/pactl.c:1569 ../src/utils/pactl.c:1570
+#: ../src/utils/pactl.c:1571 ../src/utils/pactl.c:1572
+#: ../src/utils/pactl.c:1573 ../src/utils/pactl.c:1574
+#: ../src/utils/pactl.c:1575 ../src/utils/pactl.c:1576
+#: ../src/utils/pactl.c:1577 ../src/utils/pactl.c:1578
+#: ../src/utils/pactl.c:1579 ../src/utils/pactl.c:1580
+#: ../src/utils/pactl.c:1581 ../src/utils/pactl.c:1582
+#: ../src/utils/pactl.c:1583
 msgid "[options]"
 msgstr ""
 
-#: src/utils/pactl.c:1573
+#: ../src/utils/pactl.c:1565
 msgid "[TYPE]"
 msgstr ""
 
-#: src/utils/pactl.c:1575
+#: ../src/utils/pactl.c:1567
 msgid "FILENAME [NAME]"
 msgstr ""
 
-#: src/utils/pactl.c:1576
+#: ../src/utils/pactl.c:1568
 msgid "NAME [SINK]"
 msgstr ""
 
-#: src/utils/pactl.c:1585
+#: ../src/utils/pactl.c:1577
 msgid "NAME|#N VOLUME [VOLUME ...]"
 msgstr ""
 
-#: src/utils/pactl.c:1586
+#: ../src/utils/pactl.c:1578
 msgid "#N VOLUME [VOLUME ...]"
 msgstr ""
 
-#: src/utils/pactl.c:1587
+#: ../src/utils/pactl.c:1579
 msgid "NAME|#N 1|0|toggle"
 msgstr ""
 
-#: src/utils/pactl.c:1588
+#: ../src/utils/pactl.c:1580
 msgid "#N 1|0|toggle"
 msgstr ""
 
-#: src/utils/pactl.c:1589
+#: ../src/utils/pactl.c:1581
 msgid "#N FORMATS"
 msgstr ""
 
-#: src/utils/pactl.c:1592
+#: ../src/utils/pactl.c:1584
 #, c-format
 msgid ""
 "\n"
@@ -2477,7 +2496,7 @@
 "can be used to specify the default sink, source and monitor.\n"
 msgstr ""
 
-#: src/utils/pactl.c:1595
+#: ../src/utils/pactl.c:1587
 #, c-format
 msgid ""
 "\n"
@@ -2490,7 +2509,7 @@
 "server\n"
 msgstr ""
 
-#: src/utils/pactl.c:1636
+#: ../src/utils/pactl.c:1628
 #, c-format
 msgid ""
 "pactl %s\n"
@@ -2498,195 +2517,195 @@
 "Linked with libpulse %s\n"
 msgstr ""
 
-#: src/utils/pactl.c:1692
+#: ../src/utils/pactl.c:1684
 #, c-format
 msgid "Specify nothing, or one of: %s"
 msgstr ""
 
-#: src/utils/pactl.c:1702
+#: ../src/utils/pactl.c:1694
 msgid "Please specify a sample file to load"
 msgstr ""
 
-#: src/utils/pactl.c:1715
+#: ../src/utils/pactl.c:1707
 msgid "Failed to open sound file."
 msgstr ""
 
-#: src/utils/pactl.c:1727
+#: ../src/utils/pactl.c:1719
 msgid "Warning: Failed to determine sample specification from file."
 msgstr ""
 
-#: src/utils/pactl.c:1737
+#: ../src/utils/pactl.c:1729
 msgid "You have to specify a sample name to play"
 msgstr ""
 
-#: src/utils/pactl.c:1749
+#: ../src/utils/pactl.c:1741
 msgid "You have to specify a sample name to remove"
 msgstr ""
 
-#: src/utils/pactl.c:1758
+#: ../src/utils/pactl.c:1750
 msgid "You have to specify a sink input index and a sink"
 msgstr ""
 
-#: src/utils/pactl.c:1768
+#: ../src/utils/pactl.c:1760
 msgid "You have to specify a source output index and a source"
 msgstr ""
 
-#: src/utils/pactl.c:1783
+#: ../src/utils/pactl.c:1775
 msgid "You have to specify a module name and arguments."
 msgstr ""
 
-#: src/utils/pactl.c:1803
+#: ../src/utils/pactl.c:1795
 msgid "You have to specify a module index or name"
 msgstr ""
 
-#: src/utils/pactl.c:1816
+#: ../src/utils/pactl.c:1808
 msgid ""
 "You may not specify more than one sink. You have to specify a boolean value."
 msgstr ""
 
-#: src/utils/pactl.c:1821 src/utils/pactl.c:1841
+#: ../src/utils/pactl.c:1813 ../src/utils/pactl.c:1833
 msgid "Invalid suspend specification."
 msgstr ""
 
-#: src/utils/pactl.c:1836
+#: ../src/utils/pactl.c:1828
 msgid ""
 "You may not specify more than one source. You have to specify a boolean "
 "value."
 msgstr ""
 
-#: src/utils/pactl.c:1853
+#: ../src/utils/pactl.c:1845
 msgid "You have to specify a card name/index and a profile name"
 msgstr ""
 
-#: src/utils/pactl.c:1864
+#: ../src/utils/pactl.c:1856
 msgid "You have to specify a sink name/index and a port name"
 msgstr ""
 
-#: src/utils/pactl.c:1875
+#: ../src/utils/pactl.c:1867
 msgid "You have to specify a sink name"
 msgstr ""
 
-#: src/utils/pactl.c:1885
+#: ../src/utils/pactl.c:1877
 msgid "You have to specify a source name/index and a port name"
 msgstr ""
 
-#: src/utils/pactl.c:1896
+#: ../src/utils/pactl.c:1888
 msgid "You have to specify a source name"
 msgstr ""
 
-#: src/utils/pactl.c:1906
+#: ../src/utils/pactl.c:1898
 msgid "You have to specify a sink name/index and a volume"
 msgstr ""
 
-#: src/utils/pactl.c:1919
+#: ../src/utils/pactl.c:1911
 msgid "You have to specify a source name/index and a volume"
 msgstr ""
 
-#: src/utils/pactl.c:1932
+#: ../src/utils/pactl.c:1924
 msgid "You have to specify a sink input index and a volume"
 msgstr ""
 
-#: src/utils/pactl.c:1937
+#: ../src/utils/pactl.c:1929
 msgid "Invalid sink input index"
 msgstr ""
 
-#: src/utils/pactl.c:1948
+#: ../src/utils/pactl.c:1940
 msgid "You have to specify a source output index and a volume"
 msgstr ""
 
-#: src/utils/pactl.c:1953
+#: ../src/utils/pactl.c:1945
 msgid "Invalid source output index"
 msgstr ""
 
-#: src/utils/pactl.c:1964
+#: ../src/utils/pactl.c:1956
 msgid ""
 "You have to specify a sink name/index and a mute action (0, 1, or 'toggle')"
 msgstr ""
 
-#: src/utils/pactl.c:1969 src/utils/pactl.c:1984 src/utils/pactl.c:2004
-#: src/utils/pactl.c:2022
+#: ../src/utils/pactl.c:1961 ../src/utils/pactl.c:1976
+#: ../src/utils/pactl.c:1996 ../src/utils/pactl.c:2014
 msgid "Invalid mute specification"
 msgstr ""
 
-#: src/utils/pactl.c:1979
+#: ../src/utils/pactl.c:1971
 msgid ""
 "You have to specify a source name/index and a mute action (0, 1, or 'toggle')"
 msgstr ""
 
-#: src/utils/pactl.c:1994
+#: ../src/utils/pactl.c:1986
 msgid ""
 "You have to specify a sink input index and a mute action (0, 1, or 'toggle')"
 msgstr ""
 
-#: src/utils/pactl.c:1999
+#: ../src/utils/pactl.c:1991
 msgid "Invalid sink input index specification"
 msgstr ""
 
-#: src/utils/pactl.c:2012
+#: ../src/utils/pactl.c:2004
 msgid ""
 "You have to specify a source output index and a mute action (0, 1, or "
 "'toggle')"
 msgstr ""
 
-#: src/utils/pactl.c:2017
+#: ../src/utils/pactl.c:2009
 msgid "Invalid source output index specification"
 msgstr ""
 
-#: src/utils/pactl.c:2034
+#: ../src/utils/pactl.c:2026
 msgid ""
 "You have to specify a sink index and a semicolon-separated list of supported "
 "formats"
 msgstr ""
 
-#: src/utils/pactl.c:2046
+#: ../src/utils/pactl.c:2038
 msgid ""
 "You have to specify a card name/index, a port name and a latency offset"
 msgstr ""
 
-#: src/utils/pactl.c:2053
+#: ../src/utils/pactl.c:2045
 msgid "Could not parse latency offset"
 msgstr ""
 
-#: src/utils/pactl.c:2065
+#: ../src/utils/pactl.c:2057
 msgid "No valid command specified."
 msgstr ""
 
-#: src/utils/pasuspender.c:79
+#: ../src/utils/pasuspender.c:79
 #, c-format
 msgid "fork(): %s\n"
 msgstr ""
 
-#: src/utils/pasuspender.c:92
+#: ../src/utils/pasuspender.c:92
 #, c-format
 msgid "execvp(): %s\n"
 msgstr ""
 
-#: src/utils/pasuspender.c:111
+#: ../src/utils/pasuspender.c:111
 #, c-format
 msgid "Failure to resume: %s\n"
 msgstr ""
 
-#: src/utils/pasuspender.c:145
+#: ../src/utils/pasuspender.c:145
 #, c-format
 msgid "Failure to suspend: %s\n"
 msgstr ""
 
-#: src/utils/pasuspender.c:170
+#: ../src/utils/pasuspender.c:170
 #, c-format
 msgid "WARNING: Sound server is not local, not suspending.\n"
 msgstr ""
 
-#: src/utils/pasuspender.c:183
+#: ../src/utils/pasuspender.c:183
 #, c-format
 msgid "Connection failure: %s\n"
 msgstr ""
 
-#: src/utils/pasuspender.c:201
+#: ../src/utils/pasuspender.c:201
 #, c-format
 msgid "Got SIGINT, exiting.\n"
 msgstr ""
 
-#: src/utils/pasuspender.c:219
+#: ../src/utils/pasuspender.c:219
 #, c-format
 msgid "WARNING: Child process terminated by signal %u\n"
 msgstr ""
@@ -2703,7 +2722,7 @@
 "\n"
 msgstr ""
 
-#: src/utils/pasuspender.c:267
+#: ../src/utils/pasuspender.c:266
 #, c-format
 msgid ""
 "pasuspender %s\n"
@@ -2711,22 +2730,22 @@
 "Linked with libpulse %s\n"
 msgstr ""
 
-#: src/utils/pasuspender.c:296
+#: ../src/utils/pasuspender.c:295
 #, c-format
 msgid "pa_mainloop_new() failed.\n"
 msgstr ""
 
-#: src/utils/pasuspender.c:309
+#: ../src/utils/pasuspender.c:308
 #, c-format
 msgid "pa_context_new() failed.\n"
 msgstr ""
 
-#: src/utils/pasuspender.c:321
+#: ../src/utils/pasuspender.c:320
 #, c-format
 msgid "pa_mainloop_run() failed.\n"
 msgstr ""
 
-#: src/utils/pax11publish.c:58
+#: ../src/utils/pax11publish.c:58
 #, c-format
 msgid ""
 "%s [-D display] [-S server] [-O sink] [-I source] [-c file]  [-d|-e|-i|-r]\n"
@@ -2738,52 +2757,52 @@
 " -r    Remove PulseAudio data from X11 display\n"
 msgstr ""
 
-#: src/utils/pax11publish.c:91
+#: ../src/utils/pax11publish.c:91
 #, c-format
 msgid "Failed to parse command line.\n"
 msgstr ""
 
-#: src/utils/pax11publish.c:110
+#: ../src/utils/pax11publish.c:110
 #, c-format
 msgid "Server: %s\n"
 msgstr ""
 
-#: src/utils/pax11publish.c:112
+#: ../src/utils/pax11publish.c:112
 #, c-format
 msgid "Source: %s\n"
 msgstr ""
 
-#: src/utils/pax11publish.c:114
+#: ../src/utils/pax11publish.c:114
 #, c-format
 msgid "Sink: %s\n"
 msgstr ""
 
-#: src/utils/pax11publish.c:116
+#: ../src/utils/pax11publish.c:116
 #, c-format
 msgid "Cookie: %s\n"
 msgstr ""
 
-#: src/utils/pax11publish.c:134
+#: ../src/utils/pax11publish.c:134
 #, c-format
 msgid "Failed to parse cookie data\n"
 msgstr ""
 
-#: src/utils/pax11publish.c:139
+#: ../src/utils/pax11publish.c:139
 #, c-format
 msgid "Failed to save cookie data\n"
 msgstr ""
 
-#: src/utils/pax11publish.c:168
+#: ../src/utils/pax11publish.c:168
 #, c-format
 msgid "Failed to get FQDN.\n"
 msgstr ""
 
-#: src/utils/pax11publish.c:188
+#: ../src/utils/pax11publish.c:188
 #, c-format
 msgid "Failed to load cookie data\n"
 msgstr ""
 
-#: src/utils/pax11publish.c:206
+#: ../src/utils/pax11publish.c:206
 #, c-format
 msgid "Not yet implemented.\n"
 msgstr ""
diff -Nru language-pack-th-18.04+20200123/data/th/LC_MESSAGES/python-apt.po language-pack-th-18.04+20200702/data/th/LC_MESSAGES/python-apt.po
--- language-pack-th-18.04+20200123/data/th/LC_MESSAGES/python-apt.po	2020-01-23 16:55:58.000000000 +0000
+++ language-pack-th-18.04+20200702/data/th/LC_MESSAGES/python-apt.po	2020-07-08 13:58:10.000000000 +0000
@@ -7,15 +7,15 @@
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-01-22 22:28+0000\n"
+"POT-Creation-Date: 2020-05-21 14:20+0000\n"
 "PO-Revision-Date: 2018-03-04 05:36+0000\n"
 "Last-Translator: Rockworld <sumoisrock@gmail.com>\n"
 "Language-Team: Thai <th@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2020-01-23 11:10+0000\n"
-"X-Generator: Launchpad (build b8d1327fd820d6bf500589d6da587d5037c7d88e)\n"
+"X-Launchpad-Export-Date: 2020-07-02 11:00+0000\n"
+"X-Generator: Launchpad (build 1cbd0aa39df153c901321817f9b57cf3f232b507)\n"
 
 #. ChangelogURI
 #: ../data/templates/Ubuntu.info.in.h:4
@@ -70,407 +70,407 @@
 msgstr "ซีดีรอมที่มี Ubuntu 16.10 'Yakkety Yak'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:572
+#: ../data/templates/Ubuntu.info.in:140
 msgid "Ubuntu 16.04 LTS 'Xenial Xerus'"
 msgstr "Ubuntu 16.04 LTS 'Xenial Xerus'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:579
+#: ../data/templates/Ubuntu.info.in:147
 msgid "Cdrom with Ubuntu 16.04 LTS 'Xenial Xerus'"
 msgstr "ซีดีรอมที่มี Ubuntu 16.04 LTS 'Xenial Xerus'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:680
+#: ../data/templates/Ubuntu.info.in:248
 msgid "Ubuntu 15.10 'Wily Werewolf'"
 msgstr "Ubuntu 15.10 'Wily Werewolf'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:687
+#: ../data/templates/Ubuntu.info.in:255
 msgid "Cdrom with Ubuntu 15.10 'Wily Werewolf'"
 msgstr "ซีดีรอมที่มี Ubuntu 15.10 'Wily Werewolf'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:789
+#: ../data/templates/Ubuntu.info.in:357
 msgid "Ubuntu 15.04 'Vivid Vervet'"
 msgstr "Ubuntu 15.04 'Vivid Vervet'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:796
+#: ../data/templates/Ubuntu.info.in:364
 msgid "Cdrom with Ubuntu 15.04 'Vivid Vervet'"
 msgstr "ซีดีรอมที่มี Ubuntu 15.04 'Vivid Vervet'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:908
+#: ../data/templates/Ubuntu.info.in:476
 msgid "Ubuntu 14.10 'Utopic Unicorn'"
 msgstr "Ubuntu 14.10 'Utopic Unicorn'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:915
+#: ../data/templates/Ubuntu.info.in:483
 msgid "Cdrom with Ubuntu 14.10 'Utopic Unicorn'"
 msgstr "ซีดีรอมที่มี Ubuntu 14.10 'Utopic Unicorn'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:1027
+#: ../data/templates/Ubuntu.info.in:595
 msgid "Ubuntu 14.04 'Trusty Tahr'"
 msgstr "Ubuntu 14.04 'Trusty Tahr'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:1034
+#: ../data/templates/Ubuntu.info.in:602
 msgid "Cdrom with Ubuntu 14.04 'Trusty Tahr'"
 msgstr "ซีดีรอมที่มี Ubuntu 14.04 'Trusty Tahr'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:1146
+#: ../data/templates/Ubuntu.info.in:714
 msgid "Ubuntu 13.10 'Saucy Salamander'"
 msgstr "Ubuntu 13.10 'Saucy Salamander'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:1153
+#: ../data/templates/Ubuntu.info.in:721
 msgid "Cdrom with Ubuntu 13.10 'Saucy Salamander'"
 msgstr "ซีดีรอมที่มี Ubuntu 13.10 'Saucy Salamander'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:1265
+#: ../data/templates/Ubuntu.info.in:833
 msgid "Ubuntu 13.04 'Raring Ringtail'"
 msgstr "Ubuntu 13.04 'Raring Ringtail'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:1272
+#: ../data/templates/Ubuntu.info.in:840
 msgid "Cdrom with Ubuntu 13.04 'Raring Ringtail'"
 msgstr "ซีดีรอมที่มี Ubuntu 13.04 'Raring Ringtail'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:1384
+#: ../data/templates/Ubuntu.info.in:952
 msgid "Ubuntu 12.10 'Quantal Quetzal'"
 msgstr "Ubuntu 12.10 'Quantal Quetzal'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:1391
+#: ../data/templates/Ubuntu.info.in:959
 msgid "Cdrom with Ubuntu 12.10 'Quantal Quetzal'"
 msgstr "ซีดีรอมที่มี Ubuntu 12.10 'Quantal Quetzal'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:1502
+#: ../data/templates/Ubuntu.info.in:1070
 msgid "Ubuntu 12.04 'Precise Pangolin'"
 msgstr "Ubuntu 12.04 'Precise Pangolin'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:1509
+#: ../data/templates/Ubuntu.info.in:1077
 msgid "Cdrom with Ubuntu 12.04 'Precise Pangolin'"
 msgstr "ซีดีรอมที่มี Ubuntu 12.04 'Precise Pangolin'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:1620
+#: ../data/templates/Ubuntu.info.in:1188
 msgid "Ubuntu 11.10 'Oneiric Ocelot'"
 msgstr "Ubuntu 11.10 'Oneiric Ocelot'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:1627
+#: ../data/templates/Ubuntu.info.in:1195
 msgid "Cdrom with Ubuntu 11.10 'Oneiric Ocelot'"
 msgstr "ซีดีรอมที่มี Ubuntu 11.10 'Oneiric Ocelot'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:1739
+#: ../data/templates/Ubuntu.info.in:1307
 msgid "Ubuntu 11.04 'Natty Narwhal'"
 msgstr "Ubuntu 11.04 'Natty Narwhal'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:1746
+#: ../data/templates/Ubuntu.info.in:1314
 msgid "Cdrom with Ubuntu 11.04 'Natty Narwhal'"
 msgstr "ซีดีรอมที่มี Ubuntu 11.04 'Natty Narwhal'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:1837
+#: ../data/templates/Ubuntu.info.in:1405
 msgid "Ubuntu 10.10 'Maverick Meerkat'"
 msgstr "Ubuntu 10.10 'Maverick Meerkat'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:1857
+#: ../data/templates/Ubuntu.info.in:1425
 msgid "Cdrom with Ubuntu 10.10 'Maverick Meerkat'"
 msgstr "ซีดีรอมที่มี Ubuntu 10.10 'Maverick Meerkat'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:1869
+#: ../data/templates/Ubuntu.info.in:1437
 msgid "Canonical Partners"
 msgstr "พันธมิตรของ Canonical"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:1871
+#: ../data/templates/Ubuntu.info.in:1439
 msgid "Software packaged by Canonical for their partners"
 msgstr "ซอฟต์แวร์ที่รวมชุดโดย Canonical สำหรับคู่ค้าของพวกเขา"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:1872
+#: ../data/templates/Ubuntu.info.in:1440
 msgid "This software is not part of Ubuntu."
 msgstr "ซอฟแวร์นี้ไม่ได้เป็นส่วนหนึ่งของ Ubuntu"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:1879
+#: ../data/templates/Ubuntu.info.in:1447
 msgid "Independent"
 msgstr "เป็นอิสระ"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:1881
+#: ../data/templates/Ubuntu.info.in:1449
 msgid "Provided by third-party software developers"
 msgstr "จัดทำโดยผู้พัฒนารายอื่น ๆ"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:1882
+#: ../data/templates/Ubuntu.info.in:1450
 msgid "Software offered by third party developers."
 msgstr "ซอฟแวร์นำเสนอโดยผู้พัฒนารายอื่น ๆ"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:1920
+#: ../data/templates/Ubuntu.info.in:1488
 msgid "Ubuntu 10.04 'Lucid Lynx'"
 msgstr "Ubuntu 10.04 'Lucid Lynx'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:1940
+#: ../data/templates/Ubuntu.info.in:1508
 msgid "Cdrom with Ubuntu 10.04 'Lucid Lynx'"
 msgstr "ซีดีรอม Ubuntu 10.04 'Lucid Lynx'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:1983
+#: ../data/templates/Ubuntu.info.in:1551
 msgid "Ubuntu 9.10 'Karmic Koala'"
 msgstr "อูบุนตู 9.10 'Karmic Koala'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:2003
+#: ../data/templates/Ubuntu.info.in:1571
 msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'"
 msgstr "ซีดีที่มีอูบุนตู 9.10 'Karmic Koala'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:2046
+#: ../data/templates/Ubuntu.info.in:1614
 msgid "Ubuntu 9.04 'Jaunty Jackalope'"
 msgstr "อูบุนตู 9.04 'Jaunty Jackalope'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:2065
+#: ../data/templates/Ubuntu.info.in:1633
 msgid "Cdrom with Ubuntu 9.04 'Jaunty Jackalope'"
 msgstr "ซีดีที่มีอูบุนตู 9.04 'Jaunty Jackalope'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:2108
+#: ../data/templates/Ubuntu.info.in:1676
 msgid "Ubuntu 8.10 'Intrepid Ibex'"
 msgstr "อูบุนตู 8.10 'Intrepid Ibex'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:2128
+#: ../data/templates/Ubuntu.info.in:1696
 msgid "Cdrom with Ubuntu 8.10 'Intrepid Ibex'"
 msgstr "ซีดีที่มีอูบุนตู 8.10 'Intrepid Ibex'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:2172
+#: ../data/templates/Ubuntu.info.in:1740
 msgid "Ubuntu 8.04 'Hardy Heron'"
 msgstr "Ubuntu 8.04 'Hardy Heron'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:2192
+#: ../data/templates/Ubuntu.info.in:1760
 msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'"
 msgstr "ซีดีรอมที่มี Ubuntu 8.04 'Hardy Heron'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:2237
+#: ../data/templates/Ubuntu.info.in:1805
 msgid "Ubuntu 7.10 'Gutsy Gibbon'"
 msgstr "Ubuntu 7.10 'Gutsy Gibbon'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:2256
+#: ../data/templates/Ubuntu.info.in:1824
 msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'"
 msgstr "ซีดีรอมที่มี Ubuntu 7.10 'Gutsy Gibbon'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:2301
+#: ../data/templates/Ubuntu.info.in:1869
 msgid "Ubuntu 7.04 'Feisty Fawn'"
 msgstr "Ubuntu 7.04 'Feisty Fawn'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:2320
+#: ../data/templates/Ubuntu.info.in:1888
 msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'"
 msgstr "ซีดีรอมที่มี Ubuntu 7.04 'Feisty Fawn'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:2362
+#: ../data/templates/Ubuntu.info.in:1930
 msgid "Ubuntu 6.10 'Edgy Eft'"
 msgstr "อูบันตู 6.10 'Edgy Eft'"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:2367
+#: ../data/templates/Ubuntu.info.in:1935
 msgid "Community-maintained"
 msgstr "ชุมชนดูแล"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:2373
+#: ../data/templates/Ubuntu.info.in:1941
 msgid "Restricted software"
 msgstr "ซอฟต์แวร์จำกัดการใช้งาน"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:2381
+#: ../data/templates/Ubuntu.info.in:1949
 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
 msgstr "ซีดีรอมที่มีอูบันตู 6.10 'Edgy Eft'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:2423
+#: ../data/templates/Ubuntu.info.in:1991
 msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr "อูบันตู 6.06 LTS 'Dapper Drake'"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:2426
+#: ../data/templates/Ubuntu.info.in:1994
 msgid "Canonical-supported free and open-source software"
 msgstr "ซอฟต์แวร์โอเพนซอร์สและเสรีที่ Canonical รองรับ"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:2428
+#: ../data/templates/Ubuntu.info.in:1996
 msgid "Community-maintained (universe)"
 msgstr "ชุมชนเป็นผู้ดูแล (Universe)"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:2429
+#: ../data/templates/Ubuntu.info.in:1997
 msgid "Community-maintained free and open-source software"
 msgstr "ซอฟต์แวร์โอเพนซอร์สและเสรีที่ชุมชนดูแล"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:2431
+#: ../data/templates/Ubuntu.info.in:1999
 msgid "Non-free drivers"
 msgstr "ไดรเวอร์ที่ไม่ฟรี"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:2432
+#: ../data/templates/Ubuntu.info.in:2000
 msgid "Proprietary drivers for devices"
 msgstr "ไดรเวอร์ที่มีกรรมสิทธิ์สำหรับอุปกรณ์"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:2434
+#: ../data/templates/Ubuntu.info.in:2002
 msgid "Restricted software (Multiverse)"
 msgstr "ซอฟต์แวร์จำกัดการใช้งาน(Multiverse)"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:2435
+#: ../data/templates/Ubuntu.info.in:2003
 msgid "Software restricted by copyright or legal issues"
 msgstr "ซอฟต์แวร์นี้มีลิขสิทธ์หรือข้อกฏหมายจำกัดอยู่"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:2442
+#: ../data/templates/Ubuntu.info.in:2010
 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr "ซีดีรอมที่มีอูบันตู 6.06 LST 'Dapper Drake'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:2458
+#: ../data/templates/Ubuntu.info.in:2026
 msgid "Important security updates"
 msgstr "ปรับปรุงด้านความปลอดภัยที่สำคัญ"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:2463 ../data/templates/Debian.info.in:86
+#: ../data/templates/Ubuntu.info.in:2031 ../data/templates/Debian.info.in:56
 msgid "Recommended updates"
 msgstr "การปรับปรุงที่แนะนำให้ทำ"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:2468
+#: ../data/templates/Ubuntu.info.in:2036
 msgid "Pre-released updates"
 msgstr "ปรับปรุงก่อนเผยแพร่"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:2473
+#: ../data/templates/Ubuntu.info.in:2041
 msgid "Unsupported updates"
 msgstr "ปรับปรุงที่ไม่มีการสนับสนุน"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:2484
+#: ../data/templates/Ubuntu.info.in:2052
 msgid "Ubuntu 5.10 'Breezy Badger'"
 msgstr "อูบันตู 5.10 'Breezy Badger'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:2499
+#: ../data/templates/Ubuntu.info.in:2067
 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
 msgstr "ซีดีรอมที่มี อูบันตู 5.10 'Breezy Badger'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:2515
+#: ../data/templates/Ubuntu.info.in:2083
 msgid "Ubuntu 5.10 Security Updates"
 msgstr "อูบันตู 5.10 Security Updates"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:2520
+#: ../data/templates/Ubuntu.info.in:2088
 msgid "Ubuntu 5.10 Updates"
 msgstr "อูบันตู 5.10 Updates"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:2525
+#: ../data/templates/Ubuntu.info.in:2093
 msgid "Ubuntu 5.10 Backports"
 msgstr "อูบันตู 5.10 Backports"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:2536
+#: ../data/templates/Ubuntu.info.in:2104
 msgid "Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr "อูบันตู 5.04 'Hoary Hedgehog'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:2551
+#: ../data/templates/Ubuntu.info.in:2119
 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr "ซีดีรอมที่มีอูบันตู 5.04 'Hoary Hedgehog'"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:2554 ../data/templates/Debian.info.in:239
+#: ../data/templates/Ubuntu.info.in:2122 ../data/templates/Debian.info.in:209
 msgid "Officially supported"
 msgstr "สนับสนุนอย่างเป็นทางการ"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:2567
+#: ../data/templates/Ubuntu.info.in:2135
 msgid "Ubuntu 5.04 Security Updates"
 msgstr "อูบันตู 5.04 ปรับปรุงด้านความปลอดภัย"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:2572
+#: ../data/templates/Ubuntu.info.in:2140
 msgid "Ubuntu 5.04 Updates"
 msgstr "อูบันตู 5.04 ปรับปรุง"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:2577
+#: ../data/templates/Ubuntu.info.in:2145
 msgid "Ubuntu 5.04 Backports"
 msgstr "อูบันตู 5.04 พอร์ตย้อนหลัง"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:2583
+#: ../data/templates/Ubuntu.info.in:2151
 msgid "Ubuntu 4.10 'Warty Warthog'"
 msgstr "อูบันตู 4.10 'Warty Warthog'"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:2589
+#: ../data/templates/Ubuntu.info.in:2157
 msgid "Community-maintained (Universe)"
 msgstr "ชุมชนดูแล (Universe)"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:2591
+#: ../data/templates/Ubuntu.info.in:2159
 msgid "Non-free (Multiverse)"
 msgstr "ไม่ฟรี(ลิขสิทธิ์)"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:2598
+#: ../data/templates/Ubuntu.info.in:2166
 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
 msgstr "ซีดีรอมที่มีอูบันตู 4.10 'Warty Warthog'"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:2601
+#: ../data/templates/Ubuntu.info.in:2169
 msgid "No longer officially supported"
 msgstr "ไม่ได้รับการสนับสนุนอย่างเป็นทางการแล้ว"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:2603
+#: ../data/templates/Ubuntu.info.in:2171
 msgid "Restricted copyright"
 msgstr "จำกัดลิขสิทธิ์"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:2610
+#: ../data/templates/Ubuntu.info.in:2178
 msgid "Ubuntu 4.10 Security Updates"
 msgstr "อูบันตู 4.10 ปรับปรุงด้านความปลอดภัย"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:2615
+#: ../data/templates/Ubuntu.info.in:2183
 msgid "Ubuntu 4.10 Updates"
 msgstr "อูบันตู 4.10 ปรับปรุง"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:2620
+#: ../data/templates/Ubuntu.info.in:2188
 msgid "Ubuntu 4.10 Backports"
 msgstr "อูบันตู 4.10 พอร์ตย้อนหลัง"
 
@@ -486,72 +486,72 @@
 msgstr "Debian 9 'stretch'"
 
 #. Description
-#: ../data/templates/Debian.info.in:38
+#: ../data/templates/Debian.info.in:8
 msgid "Debian 8 'jessie'"
 msgstr "Debian 8 'jessie'"
 
 #. Description
-#: ../data/templates/Debian.info.in:68
+#: ../data/templates/Debian.info.in:38
 msgid "Debian 7 'Wheezy' "
 msgstr "Debian 7 'Wheezy' "
 
 #. Description
-#: ../data/templates/Debian.info.in:98
+#: ../data/templates/Debian.info.in:68
 msgid "Debian 6.0 'Squeeze' "
 msgstr "เดบียน 6.0 'Squeeze' "
 
 #. Description
-#: ../data/templates/Debian.info.in:123
+#: ../data/templates/Debian.info.in:93
 msgid "Debian 5.0 'Lenny' "
 msgstr "เดเบียน 5.0 'Lenny' "
 
 #. Description
-#: ../data/templates/Debian.info.in:148
+#: ../data/templates/Debian.info.in:118
 msgid "Debian 4.0 'Etch'"
 msgstr "เดเบียน 4.0 'Etch'"
 
 #. Description
-#: ../data/templates/Debian.info.in:173
+#: ../data/templates/Debian.info.in:143
 msgid "Debian 3.1 'Sarge'"
 msgstr "Debian 3.1 'Sarge'"
 
 #. Description
-#: ../data/templates/Debian.info.in:184
+#: ../data/templates/Debian.info.in:154
 msgid "Proposed updates"
 msgstr "การปรับปรุงที่เสนอให้ทำ"
 
 #. Description
-#: ../data/templates/Debian.info.in:191
+#: ../data/templates/Debian.info.in:161
 msgid "Security updates"
 msgstr "ตัวปรับปรุงด้านความปลอดภัย"
 
 #. Description
-#: ../data/templates/Debian.info.in:198
+#: ../data/templates/Debian.info.in:168
 msgid "Debian current stable release"
 msgstr "Debian รุ่นเสถียรตัวปัจจุบัน"
 
 #. Description
-#: ../data/templates/Debian.info.in:211
+#: ../data/templates/Debian.info.in:181
 msgid "Debian testing"
 msgstr "Debian อยู่ในระหว่างการทดสอบ"
 
 #. Description
-#: ../data/templates/Debian.info.in:237
+#: ../data/templates/Debian.info.in:207
 msgid "Debian 'Sid' (unstable)"
 msgstr "Debian 'Sid' (ไม่เสถียร)"
 
 #. CompDescription
-#: ../data/templates/Debian.info.in:241
+#: ../data/templates/Debian.info.in:211
 msgid "DFSG-compatible Software with Non-Free Dependencies"
 msgstr "เข้ากับ DFSG ซอฟแวร์แต่ขึ้นอยู่กับไม่ฟรี"
 
 #. CompDescription
-#: ../data/templates/Debian.info.in:243
+#: ../data/templates/Debian.info.in:213
 msgid "Non-DFSG-compatible Software"
 msgstr "ไม่เข้ากับ DFSG ซอฟแวร์"
 
 #. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:215 ../aptsources/distro.py:446
+#: ../aptsources/distro.py:211 ../aptsources/distro.py:442
 #, python-format
 msgid "Server for %s"
 msgstr "เซิร์ฟเวอร์สำหรับประเทศ %s"
@@ -559,12 +559,12 @@
 #. More than one server is used. Since we don't handle this case
 #. in the user interface we set "custom servers" to true and
 #. append a list of all used servers
-#: ../aptsources/distro.py:233 ../aptsources/distro.py:239
-#: ../aptsources/distro.py:255
+#: ../aptsources/distro.py:229 ../aptsources/distro.py:235
+#: ../aptsources/distro.py:251
 msgid "Main server"
 msgstr "เซิร์ฟเวอร์หลัก"
 
-#: ../aptsources/distro.py:259
+#: ../aptsources/distro.py:255
 msgid "Custom servers"
 msgstr "เซิร์ฟเวอร์ที่กำหนดเอาเอง"
 
@@ -573,16 +573,16 @@
 msgid "Missing description for '%s'.Please report."
 msgstr "ไม่มีคำอธิบายสำหรับ '%s' โปรดรายงานปัญหานี้"
 
-#: ../apt/package.py:620
+#: ../apt/package.py:529
 #, python-format
 msgid "Invalid unicode in description for '%s' (%s). Please report."
 msgstr "Invalid unicode ในคำอธิบายสำหรับ '%s' (%s). กรุณา report."
 
-#: ../apt/package.py:1315 ../apt/package.py:1424 ../apt/package.py:1438
+#: ../apt/package.py:1153 ../apt/package.py:1259 ../apt/package.py:1273
 msgid "The list of changes is not available"
 msgstr "รายการของการเปลี่ยนแปลงยังไม่มีให้"
 
-#: ../apt/package.py:1431
+#: ../apt/package.py:1266
 #, python-format
 msgid ""
 "The list of changes is not available yet.\n"
@@ -595,7 +595,7 @@
 "กรุณาดูที่ http://launchpad.net/ubuntu/+source/%s/%s/+changelog\n"
 "จนกว่ารายการเปลี่ยนแปลงจะมีให้ดูได้หรือลองใหม่อีกครั้งหลังจากนี้สักพักหนึ่ง"
 
-#: ../apt/package.py:1444
+#: ../apt/package.py:1276
 msgid ""
 "Failed to download the list of changes. \n"
 "Please check your Internet connection."
@@ -663,20 +663,20 @@
 "สถาปัตยกรรมไม่ถูกต้อง '%s' -- เรียกใช้ dpkg --add-architecture "
 "เพื่อเพิ่มและอัปเดตทีหลัง"
 
-#: ../apt/debfile.py:514
+#: ../apt/debfile.py:512
 msgid "A later version is already installed"
 msgstr "มีรุ่นที่ใหม่กว่าถูกติดตั้งแล้ว"
 
-#: ../apt/debfile.py:539
+#: ../apt/debfile.py:537
 msgid "Failed to satisfy all dependencies (broken cache)"
 msgstr "การตรวจสอบสิ่งที่จำเป็นต้องใช้ล้มเหลว (แคชเสียหาย)"
 
-#: ../apt/debfile.py:568
+#: ../apt/debfile.py:566
 #, python-format
 msgid "Cannot install '%s'"
 msgstr "ไม่สามารถติดตั้ง '%s'"
 
-#: ../apt/debfile.py:644
+#: ../apt/debfile.py:642
 msgid ""
 "Automatically decompressed:\n"
 "\n"
@@ -684,17 +684,17 @@
 "คลายข้อมูลที่ถูกบีบอัตโนมัติ:\n"
 "\n"
 
-#: ../apt/debfile.py:650
+#: ../apt/debfile.py:648
 msgid "Automatically converted to printable ascii:\n"
 msgstr "แปลงเป็น ASCII ที่พิมพ์ได้โดยอัตโนมัติ:\n"
 
-#: ../apt/debfile.py:750
+#: ../apt/debfile.py:748
 #, python-format
 msgid "Install Build-Dependencies for source package '%s' that builds %s\n"
 msgstr ""
 "ติดตั้งสิ่งที่จำเป็นสำหรับการสร้างแพกเกจต้นฉบับ '%s' ที่ใช้สร้าง %s\n"
 
-#: ../apt/debfile.py:761
+#: ../apt/debfile.py:759
 msgid "An essential package would be removed"
 msgstr "แพกเกจสำคัญยิ่งยวดที่ถูกถอดออก"
 
diff -Nru language-pack-th-18.04+20200123/data/th/LC_MESSAGES/sane-backends.po language-pack-th-18.04+20200702/data/th/LC_MESSAGES/sane-backends.po
--- language-pack-th-18.04+20200123/data/th/LC_MESSAGES/sane-backends.po	2020-01-23 16:55:54.000000000 +0000
+++ language-pack-th-18.04+20200702/data/th/LC_MESSAGES/sane-backends.po	2020-07-08 13:58:06.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2020-01-23 11:07+0000\n"
-"X-Generator: Launchpad (build b8d1327fd820d6bf500589d6da587d5037c7d88e)\n"
+"X-Launchpad-Export-Date: 2020-07-02 10:56+0000\n"
+"X-Generator: Launchpad (build 1cbd0aa39df153c901321817f9b57cf3f232b507)\n"
 
 #: include/sane/saneopts.h:154
 #, no-c-format
@@ -28,37 +28,39 @@
 msgstr "มาตรฐาน"
 
 #: include/sane/saneopts.h:157 backend/artec_eplus48u.c:2884
-#: backend/epson.c:3298 backend/epson2.c:1291 backend/genesys.c:5618
-#: backend/gt68xx.c:703 backend/hp3500.c:1019 backend/hp-option.c:3297
-#: backend/kvs1025_opt.c:640 backend/kvs20xx_opt.c:285
-#: backend/kvs40xx_opt.c:506 backend/leo.c:823 backend/lexmark.c:199
-#: backend/ma1509.c:551 backend/matsushita.c:1135 backend/microtek2.h:599
-#: backend/mustek.c:4361 backend/mustek_usb.c:305 backend/mustek_usb2.c:465
-#: backend/pixma_sane_options.c:160 backend/plustek.c:808
-#: backend/plustek_pp.c:747 backend/sceptre.c:702
-#: backend/snapscan-options.c:550 backend/teco1.c:1095 backend/teco2.c:1914
-#: backend/teco3.c:920 backend/test.c:647 backend/u12.c:546
-#: backend/umax.c:5176 backend/umax_pp.c:580
+#: backend/epson.c:3298 backend/epson2.c:1290 backend/epsonds.c:677
+#: backend/genesys/genesys.cpp:4034 backend/gt68xx.c:696
+#: backend/hp-option.c:3300 backend/hp3500.c:1019 backend/kvs1025_opt.c:639
+#: backend/kvs20xx_opt.c:285 backend/kvs40xx_opt.c:506 backend/leo.c:827
+#: backend/lexmark.c:203 backend/ma1509.c:551 backend/matsushita.c:1139
+#: backend/microtek2.h:599 backend/mustek.c:4373 backend/mustek_usb.c:301
+#: backend/mustek_usb2.c:465 backend/pixma/pixma_sane_options.c:160
+#: backend/plustek.c:808 backend/plustek_pp.c:747 backend/sceptre.c:706
+#: backend/snapscan-options.c:550 backend/teco1.c:1099 backend/teco2.c:1914
+#: backend/teco3.c:924 backend/test.c:651 backend/u12.c:546
+#: backend/umax.c:5176 backend/umax_pp.c:570
 #, no-c-format
 msgid "Geometry"
 msgstr "เรขาคณิต"
 
 #: include/sane/saneopts.h:158 backend/artec_eplus48u.c:2805
-#: backend/canon.c:1498 backend/genesys.c:5678 backend/gt68xx.c:672
-#: backend/hp-option.c:2953 backend/kvs1025_opt.c:704 backend/leo.c:871
-#: backend/ma1509.c:599 backend/matsushita.c:1189 backend/microtek2.h:600
-#: backend/mustek.c:4409 backend/mustek_usb.c:353 backend/mustek_usb2.c:431
-#: backend/niash.c:754 backend/plustek.c:854 backend/plustek_pp.c:793
-#: backend/sceptre.c:750 backend/snapscan-options.c:617 backend/stv680.c:1067
-#: backend/teco1.c:1143 backend/teco2.c:1962 backend/teco3.c:968
-#: backend/u12.c:592 backend/umax.c:5226 backend/umax_pp.c:629
+#: backend/canon.c:1493 backend/genesys/genesys.cpp:4077
+#: backend/gt68xx.c:665 backend/hp-option.c:2956 backend/kvs1025_opt.c:703
+#: backend/leo.c:875 backend/ma1509.c:599 backend/matsushita.c:1193
+#: backend/microtek2.h:600 backend/mustek.c:4421 backend/mustek_usb.c:349
+#: backend/mustek_usb2.c:431 backend/niash.c:754 backend/plustek.c:854
+#: backend/plustek_pp.c:793 backend/sceptre.c:754
+#: backend/snapscan-options.c:617 backend/stv680.c:1071
+#: backend/teco1.c:1147 backend/teco2.c:1962 backend/teco3.c:972
+#: backend/u12.c:592 backend/umax.c:5226 backend/umax_pp.c:619
 #, no-c-format
 msgid "Enhancement"
 msgstr "ส่วนเพิ่มความสามารถ"
 
-#: include/sane/saneopts.h:159 backend/epson.c:3197 backend/epson2.c:1216
-#: backend/kvs20xx_opt.c:366 backend/kvs40xx_opt.c:597 backend/rts8891.c:2831
-#: backend/snapscan-options.c:923 backend/umax.c:5565
+#: include/sane/saneopts.h:159 backend/epson.c:3197 backend/epson2.c:1215
+#: backend/kvs20xx_opt.c:366 backend/kvs40xx_opt.c:597
+#: backend/rts8891.c:2831 backend/snapscan-options.c:923
+#: backend/umax.c:5565
 #, no-c-format
 msgid "Advanced"
 msgstr "ขั้นสูง"
@@ -83,8 +85,8 @@
 msgid "Bit depth"
 msgstr ""
 
-#: include/sane/saneopts.h:165 backend/canon.c:1145 backend/leo.c:781
-#: backend/pixma_sane_options.c:47
+#: include/sane/saneopts.h:165 backend/canon.c:1140 backend/leo.c:785
+#: backend/pixma/pixma_sane_options.c:47
 #, no-c-format
 msgid "Scan mode"
 msgstr ""
@@ -124,8 +126,8 @@
 msgid "Bottom-right y"
 msgstr "ล่างขวา y"
 
-#: include/sane/saneopts.h:173 backend/canon.c:1221
-#: backend/pixma_sane_options.c:300
+#: include/sane/saneopts.h:173 backend/canon.c:1216
+#: backend/pixma/pixma_sane_options.c:300
 #, no-c-format
 msgid "Scan resolution"
 msgstr "ความละเอียดการสแกน"
@@ -280,7 +282,7 @@
 msgid "Halftone pattern size"
 msgstr ""
 
-#: include/sane/saneopts.h:204 backend/fujitsu.c:3186
+#: include/sane/saneopts.h:204 backend/fujitsu.c:3237
 #, no-c-format
 msgid "Halftone pattern"
 msgstr ""
@@ -290,10 +292,10 @@
 msgid "Bind X and Y resolution"
 msgstr ""
 
-#: include/sane/saneopts.h:206 backend/hp3900_sane.c:428
-#: backend/hp3900_sane.c:1021 backend/hp3900_sane.c:1421
-#: backend/hp-option.c:3235 backend/mustek_usb2.c:121 backend/plustek.c:236
-#: backend/plustek_pp.c:205 backend/u12.c:157
+#: include/sane/saneopts.h:206 backend/hp-option.c:3238
+#: backend/hp3900_sane.c:433 backend/hp3900_sane.c:1026
+#: backend/hp3900_sane.c:1426 backend/mustek_usb2.c:121
+#: backend/plustek.c:236 backend/plustek_pp.c:205 backend/u12.c:157
 #, no-c-format
 msgid "Negative"
 msgstr ""
@@ -937,7 +939,7 @@
 msgid "Set default values for enhancement controls."
 msgstr ""
 
-#: backend/artec_eplus48u.c:2932 backend/canon.c:1616
+#: backend/artec_eplus48u.c:2932 backend/canon.c:1611
 #, no-c-format
 msgid "Calibration"
 msgstr ""
@@ -992,54 +994,54 @@
 msgid "Duplex scan provide a scan of the front and back side of the document"
 msgstr ""
 
-#: backend/canon630u.c:159
+#: backend/canon630u.c:163
 #, no-c-format
 msgid "Calibrate Scanner"
 msgstr ""
 
-#: backend/canon630u.c:160
+#: backend/canon630u.c:164
 #, no-c-format
 msgid "Force scanner calibration before scan"
 msgstr ""
 
-#: backend/canon630u.c:259 backend/umax1220u.c:208
+#: backend/canon630u.c:263 backend/umax1220u.c:208
 #, no-c-format
 msgid "Grayscale scan"
 msgstr ""
 
-#: backend/canon630u.c:260 backend/umax1220u.c:209
+#: backend/canon630u.c:264 backend/umax1220u.c:209
 #, no-c-format
 msgid "Do a grayscale rather than color scan"
 msgstr ""
 
-#: backend/canon630u.c:306
+#: backend/canon630u.c:310
 #, no-c-format
 msgid "Analog Gain"
 msgstr ""
 
-#: backend/canon630u.c:307
+#: backend/canon630u.c:311
 #, no-c-format
 msgid "Increase or decrease the analog gain of the CCD array"
 msgstr ""
 
-#: backend/canon630u.c:347 backend/epson.h:68 backend/epson2.h:67
+#: backend/canon630u.c:351 backend/epson.h:68 backend/epson2.h:67
 #, no-c-format
 msgid "Gamma Correction"
 msgstr ""
 
-#: backend/canon630u.c:348
+#: backend/canon630u.c:352
 #, no-c-format
 msgid "Selects the gamma corrected transfer curve"
 msgstr ""
 
-#: backend/canon.c:149 backend/canon-sane.c:1318
+#: backend/canon-sane.c:1318 backend/canon.c:149
 #, no-c-format
 msgid "Raw"
 msgstr ""
 
-#: backend/canon.c:157 backend/canon-sane.c:732 backend/canon-sane.c:940
+#: backend/canon-sane.c:732 backend/canon-sane.c:940
 #: backend/canon-sane.c:1076 backend/canon-sane.c:1314
-#: backend/canon-sane.c:1494 backend/canon-sane.c:1643
+#: backend/canon-sane.c:1494 backend/canon-sane.c:1643 backend/canon.c:157
 #, no-c-format
 msgid "Fine color"
 msgstr ""
@@ -1049,17 +1051,17 @@
 msgid "No transparency correction"
 msgstr ""
 
-#: backend/canon.c:170 backend/canon-sane.c:680
+#: backend/canon-sane.c:680 backend/canon.c:170
 #, no-c-format
 msgid "Correction according to film type"
 msgstr ""
 
-#: backend/canon.c:171 backend/canon-sane.c:674
+#: backend/canon-sane.c:674 backend/canon.c:171
 #, no-c-format
 msgid "Correction according to transparency ratio"
 msgstr ""
 
-#: backend/canon.c:176 backend/canon-sane.c:776
+#: backend/canon-sane.c:776 backend/canon.c:176
 #, no-c-format
 msgid "Negatives"
 msgstr ""
@@ -1069,8 +1071,8 @@
 msgid "Slides"
 msgstr ""
 
-#: backend/canon.c:186 backend/kvs1025_opt.c:181 backend/kvs40xx_opt.c:273
-#: backend/matsushita.c:178
+#: backend/canon.c:186 backend/kvs1025_opt.c:180 backend/kvs40xx_opt.c:273
+#: backend/matsushita.c:182
 #, no-c-format
 msgid "Automatic"
 msgstr ""
@@ -1090,108 +1092,108 @@
 msgid "1/3 normal speed"
 msgstr ""
 
-#: backend/canon.c:365
+#: backend/canon.c:360
 #, no-c-format
 msgid "rounded parameter"
 msgstr ""
 
-#: backend/canon.c:368 backend/canon.c:384 backend/canon.c:419
-#: backend/canon.c:469 backend/canon.c:487 backend/canon.c:530
+#: backend/canon.c:363 backend/canon.c:379 backend/canon.c:414
+#: backend/canon.c:464 backend/canon.c:482 backend/canon.c:525
 #, no-c-format
 msgid "unknown"
 msgstr ""
 
-#: backend/canon.c:378
+#: backend/canon.c:373
 #, no-c-format
 msgid "ADF jam"
 msgstr ""
 
-#: backend/canon.c:381
+#: backend/canon.c:376
 #, no-c-format
 msgid "ADF cover open"
 msgstr ""
 
-#: backend/canon.c:394
+#: backend/canon.c:389
 #, no-c-format
 msgid "lamp failure"
 msgstr ""
 
-#: backend/canon.c:397
+#: backend/canon.c:392
 #, no-c-format
 msgid "scan head positioning error"
 msgstr ""
 
-#: backend/canon.c:400
+#: backend/canon.c:395
 #, no-c-format
 msgid "CPU check error"
 msgstr ""
 
-#: backend/canon.c:403
+#: backend/canon.c:398
 #, no-c-format
 msgid "RAM check error"
 msgstr ""
 
-#: backend/canon.c:406
+#: backend/canon.c:401
 #, no-c-format
 msgid "ROM check error"
 msgstr ""
 
-#: backend/canon.c:409
+#: backend/canon.c:404
 #, no-c-format
 msgid "hardware check error"
 msgstr ""
 
-#: backend/canon.c:412
+#: backend/canon.c:407
 #, no-c-format
 msgid "transparency unit lamp failure"
 msgstr ""
 
-#: backend/canon.c:415
+#: backend/canon.c:410
 #, no-c-format
 msgid "transparency unit scan head positioning failure"
 msgstr ""
 
-#: backend/canon.c:429
+#: backend/canon.c:424
 #, no-c-format
 msgid "parameter list length error"
 msgstr ""
 
-#: backend/canon.c:433
+#: backend/canon.c:428
 #, no-c-format
 msgid "invalid command operation code"
 msgstr ""
 
-#: backend/canon.c:437
+#: backend/canon.c:432
 #, no-c-format
 msgid "invalid field in CDB"
 msgstr ""
 
-#: backend/canon.c:441
+#: backend/canon.c:436
 #, no-c-format
 msgid "unsupported LUN"
 msgstr ""
 
-#: backend/canon.c:445
+#: backend/canon.c:440
 #, no-c-format
 msgid "invalid field in parameter list"
 msgstr ""
 
-#: backend/canon.c:449
+#: backend/canon.c:444
 #, no-c-format
 msgid "command sequence error"
 msgstr ""
 
-#: backend/canon.c:453
+#: backend/canon.c:448
 #, no-c-format
 msgid "too many windows specified"
 msgstr ""
 
-#: backend/canon.c:457
+#: backend/canon.c:452
 #, no-c-format
 msgid "medium not present"
 msgstr ""
 
-#: backend/canon.c:461
+#: backend/canon.c:456
 #, no-c-format
 msgid "invalid bit IDENTIFY message"
 msgstr ""
@@ -1201,418 +1203,429 @@
 msgid "option not connect"
 msgstr ""
 
-#: backend/canon.c:479
+#: backend/canon.c:474
 #, no-c-format
 msgid "power on reset / bus device reset"
 msgstr ""
 
-#: backend/canon.c:483
+#: backend/canon.c:478
 #, no-c-format
 msgid "parameter changed by another initiator"
 msgstr ""
 
-#: backend/canon.c:497
+#: backend/canon.c:492
 #, no-c-format
 msgid "no additional sense information"
 msgstr ""
 
-#: backend/canon.c:501
+#: backend/canon.c:496
 #, no-c-format
 msgid "reselect failure"
 msgstr ""
 
-#: backend/canon.c:505
+#: backend/canon.c:500
 #, no-c-format
 msgid "SCSI parity error"
 msgstr ""
 
-#: backend/canon.c:509
+#: backend/canon.c:504
 #, no-c-format
 msgid "initiator detected error message received"
 msgstr ""
 
-#: backend/canon.c:514
+#: backend/canon.c:509
 #, no-c-format
 msgid "invalid message error"
 msgstr ""
 
-#: backend/canon.c:518
+#: backend/canon.c:513
 #, no-c-format
 msgid "timeout error"
 msgstr ""
 
-#: backend/canon.c:522
+#: backend/canon.c:517
 #, no-c-format
 msgid "transparency unit shading error"
 msgstr ""
 
-#: backend/canon.c:526
+#: backend/canon.c:521
 #, no-c-format
 msgid "lamp not stabilized"
 msgstr ""
 
-#: backend/canon.c:852 backend/canon.c:867
+#: backend/canon.c:847 backend/canon.c:862
 #, no-c-format
 msgid "film scanner"
 msgstr ""
 
-#: backend/canon.c:882 backend/canon.c:897 backend/canon.c:912
-#: backend/canon.c:927 backend/hp3900_sane.c:1683 backend/plustek.c:1335
-#: backend/plustek_pp.c:1014 backend/sceptre.c:593 backend/teco2.c:1836
+#: backend/canon.c:877 backend/canon.c:892 backend/canon.c:907
+#: backend/canon.c:922 backend/hp3900_sane.c:1688 backend/plustek.c:1335
+#: backend/plustek_pp.c:1014 backend/sceptre.c:597 backend/teco2.c:1836
 #: backend/u12.c:851
 #, no-c-format
 msgid "flatbed scanner"
 msgstr ""
 
-#: backend/canon.c:1183 backend/epson.c:3386 backend/epson2.c:1365
+#: backend/canon.c:1178 backend/epson.c:3386 backend/epson2.c:1364
 #, no-c-format
 msgid "Film type"
 msgstr ""
 
-#: backend/canon.c:1184
+#: backend/canon.c:1179
 #, no-c-format
 msgid "Selects the film type, i.e. negatives or slides"
 msgstr ""
 
-#: backend/canon.c:1196
+#: backend/canon.c:1191
 #, no-c-format
 msgid "Negative film type"
 msgstr ""
 
-#: backend/canon.c:1197
+#: backend/canon.c:1192
 #, no-c-format
 msgid "Selects the negative film type"
 msgstr ""
 
-#: backend/canon.c:1236
+#: backend/canon.c:1231
 #, no-c-format
 msgid "Hardware resolution"
 msgstr ""
 
-#: backend/canon.c:1237
+#: backend/canon.c:1232
 #, no-c-format
 msgid "Use only hardware resolutions"
 msgstr ""
 
-#: backend/canon.c:1318
+#: backend/canon.c:1313
 #, no-c-format
 msgid "Focus"
 msgstr ""
 
-#: backend/canon.c:1328
+#: backend/canon.c:1323
 #, no-c-format
 msgid "Auto focus"
 msgstr ""
 
-#: backend/canon.c:1329
+#: backend/canon.c:1324
 #, no-c-format
 msgid "Enable/disable auto focus"
 msgstr ""
 
-#: backend/canon.c:1336
+#: backend/canon.c:1331
 #, no-c-format
 msgid "Auto focus only once"
 msgstr ""
 
-#: backend/canon.c:1337
+#: backend/canon.c:1332
 #, no-c-format
 msgid "Do auto focus only once between ejects"
 msgstr ""
 
-#: backend/canon.c:1345
+#: backend/canon.c:1340
 #, no-c-format
 msgid "Manual focus position"
 msgstr ""
 
-#: backend/canon.c:1346
+#: backend/canon.c:1341
 #, no-c-format
 msgid "Set the optical system's focus position by hand (default: 128)."
 msgstr ""
 
-#: backend/canon.c:1356
+#: backend/canon.c:1351
 #, no-c-format
 msgid "Scan margins"
 msgstr ""
 
-#: backend/canon.c:1403
+#: backend/canon.c:1398
 #, no-c-format
 msgid "Extra color adjustments"
 msgstr ""
 
-#: backend/canon.c:1538 backend/epson.c:3205 backend/epson2.c:1255
+#: backend/canon.c:1533 backend/epson.c:3205 backend/epson2.c:1254
 #: backend/kvs1025.h:55 backend/kvs40xx_opt.c:826
 #, no-c-format
 msgid "Mirror image"
 msgstr ""
 
-#: backend/canon.c:1539
+#: backend/canon.c:1534
 #, no-c-format
 msgid "Mirror the image horizontally"
 msgstr ""
 
-#: backend/canon.c:1608
+#: backend/canon.c:1603
 #, no-c-format
 msgid "Auto exposure"
 msgstr ""
 
-#: backend/canon.c:1609
+#: backend/canon.c:1604
 #, no-c-format
 msgid "Enable/disable the auto exposure feature"
 msgstr ""
 
-#: backend/canon.c:1625
+#: backend/canon.c:1620
 #, no-c-format
 msgid "Calibration now"
 msgstr ""
 
-#: backend/canon.c:1626
+#: backend/canon.c:1621
 #, no-c-format
 msgid "Execute calibration *now*"
 msgstr ""
 
-#: backend/canon.c:1636
+#: backend/canon.c:1631
 #, no-c-format
 msgid "Self diagnosis"
 msgstr ""
 
-#: backend/canon.c:1637
+#: backend/canon.c:1632
 #, no-c-format
 msgid "Perform scanner self diagnosis"
 msgstr ""
 
-#: backend/canon.c:1648
+#: backend/canon.c:1643
 #, no-c-format
 msgid "Reset scanner"
 msgstr ""
 
-#: backend/canon.c:1649
+#: backend/canon.c:1644
 #, no-c-format
 msgid "Reset the scanner"
 msgstr ""
 
-#: backend/canon.c:1659
+#: backend/canon.c:1654
 #, no-c-format
 msgid "Medium handling"
 msgstr ""
 
-#: backend/canon.c:1668
+#: backend/canon.c:1663
 #, no-c-format
 msgid "Eject film after each scan"
 msgstr ""
 
-#: backend/canon.c:1669
+#: backend/canon.c:1664
 #, no-c-format
 msgid "Automatically eject the film from the device after each scan"
 msgstr ""
 
-#: backend/canon.c:1680
+#: backend/canon.c:1675
 #, no-c-format
 msgid "Eject film before exit"
 msgstr ""
 
-#: backend/canon.c:1681
+#: backend/canon.c:1676
 #, no-c-format
 msgid ""
 "Automatically eject the film from the device before exiting the program"
 msgstr ""
 
-#: backend/canon.c:1690
+#: backend/canon.c:1685
 #, no-c-format
 msgid "Eject film now"
 msgstr ""
 
-#: backend/canon.c:1691
+#: backend/canon.c:1686
 #, no-c-format
 msgid "Eject the film *now*"
 msgstr ""
 
-#: backend/canon.c:1700
+#: backend/canon.c:1695
 #, no-c-format
 msgid "Document feeder extras"
 msgstr ""
 
-#: backend/canon.c:1707
+#: backend/canon.c:1702
 #, no-c-format
 msgid "Flatbed only"
 msgstr ""
 
-#: backend/canon.c:1708
+#: backend/canon.c:1703
 #, no-c-format
 msgid "Disable auto document feeder and use flatbed only"
 msgstr ""
 
-#: backend/canon.c:1718 backend/canon.c:1728
+#: backend/canon.c:1713 backend/canon.c:1723
 #, no-c-format
 msgid "Transparency unit"
 msgstr ""
 
-#: backend/canon.c:1729
+#: backend/canon.c:1724
 #, no-c-format
 msgid "Switch on/off the transparency unit (FAU, film adapter unit)"
 msgstr ""
 
-#: backend/canon.c:1739
+#: backend/canon.c:1734
 #, no-c-format
 msgid "Negative film"
 msgstr ""
 
-#: backend/canon.c:1740
+#: backend/canon.c:1735
 #, no-c-format
 msgid "Positive or negative film"
 msgstr ""
 
-#: backend/canon.c:1749
+#: backend/canon.c:1744
 #, no-c-format
 msgid "Density control"
 msgstr ""
 
-#: backend/canon.c:1750
+#: backend/canon.c:1745
 #, no-c-format
 msgid "Set density control mode"
 msgstr ""
 
-#: backend/canon.c:1761
+#: backend/canon.c:1756
 #, no-c-format
 msgid "Transparency ratio"
 msgstr ""
 
-#: backend/canon.c:1775
+#: backend/canon.c:1770
 #, no-c-format
 msgid "Select film type"
 msgstr ""
 
-#: backend/canon.c:1776
+#: backend/canon.c:1771
 #, no-c-format
 msgid "Select the film type"
 msgstr ""
 
-#: backend/canon_dr.c:408 backend/epjitsu.c:233 backend/epson.c:501
-#: backend/epson2.c:115 backend/fujitsu.c:672 backend/gt68xx.c:148
-#: backend/hp3900_sane.c:418 backend/hp3900_sane.c:427
-#: backend/hp3900_sane.c:1017 backend/hp5590.c:85 backend/ma1509.c:108
-#: backend/magicolor.c:181 backend/mustek.c:156 backend/mustek.c:160
-#: backend/mustek.c:164 backend/pixma.c:901 backend/pixma_sane_options.c:92
-#: backend/snapscan-options.c:86 backend/test.c:192 backend/umax.c:181
+#: backend/canon_dr.c:413 backend/epjitsu.c:233 backend/epson.c:501
+#: backend/epson2-ops.c:101 backend/epson2.c:115 backend/epsonds-ops.c:32
+#: backend/epsonds.c:95 backend/epsonds.h:62 backend/fujitsu.c:677
+#: backend/genesys/genesys.h:78 backend/gt68xx.c:148
+#: backend/hp3900_sane.c:423 backend/hp3900_sane.c:432
+#: backend/hp3900_sane.c:1022 backend/hp5590.c:92 backend/kodakaio.c:617
+#: backend/ma1509.c:108 backend/magicolor.c:181 backend/mustek.c:156
+#: backend/mustek.c:160 backend/mustek.c:164 backend/pixma/pixma.c:920
+#: backend/pixma/pixma_sane_options.c:92 backend/snapscan-options.c:86
+#: backend/test.c:196 backend/umax.c:181
 #, no-c-format
 msgid "Flatbed"
 msgstr ""
 
-#: backend/canon_dr.c:409 backend/epjitsu.c:234 backend/fujitsu.c:673
+#: backend/canon_dr.c:414 backend/epjitsu.c:234 backend/fujitsu.c:678
 #: backend/kodak.c:140
 #, no-c-format
 msgid "ADF Front"
 msgstr ""
 
-#: backend/canon_dr.c:410 backend/epjitsu.c:235 backend/fujitsu.c:674
+#: backend/canon_dr.c:415 backend/epjitsu.c:235 backend/fujitsu.c:679
 #: backend/kodak.c:141
 #, no-c-format
 msgid "ADF Back"
 msgstr ""
 
-#: backend/canon_dr.c:411 backend/epjitsu.c:236 backend/fujitsu.c:675
-#: backend/hp5590.c:87 backend/kodak.c:142 backend/pixma.c:912
+#: backend/canon_dr.c:416 backend/epjitsu.c:236 backend/fujitsu.c:680
+#: backend/hp5590.c:94 backend/kodak.c:142 backend/pixma/pixma.c:931
 #, no-c-format
 msgid "ADF Duplex"
 msgstr ""
 
-#: backend/canon_dr.c:412
+#: backend/canon_dr.c:417
 #, no-c-format
 msgid "Card Front"
 msgstr ""
 
-#: backend/canon_dr.c:413
+#: backend/canon_dr.c:418
 #, no-c-format
 msgid "Card Back"
 msgstr ""
 
-#: backend/canon_dr.c:414
+#: backend/canon_dr.c:419
 #, no-c-format
 msgid "Card Duplex"
 msgstr ""
 
-#: backend/canon_dr.c:421 backend/epson.c:599 backend/epson.c:3096
-#: backend/epson2.c:201 backend/fujitsu.c:692 backend/genesys.c:89
-#: backend/genesys.c:96 backend/gt68xx_low.h:133 backend/hp-option.c:3093
+#: backend/canon_dr.c:426 backend/epson.c:599 backend/epson.c:3096
+#: backend/epson2.c:201 backend/fujitsu.c:697
+#: backend/genesys/genesys.cpp:120 backend/genesys/genesys.cpp:127
+#: backend/gt68xx_low.h:136 backend/hp-option.c:3096
 #, no-c-format
 msgid "Red"
 msgstr ""
 
-#: backend/canon_dr.c:422 backend/epson.c:600 backend/epson.c:3092
-#: backend/epson2.c:202 backend/fujitsu.c:693 backend/genesys.c:90
-#: backend/genesys.c:97 backend/gt68xx_low.h:134 backend/hp-option.c:3094
+#: backend/canon_dr.c:427 backend/epson.c:600 backend/epson.c:3092
+#: backend/epson2.c:202 backend/fujitsu.c:698
+#: backend/genesys/genesys.cpp:121 backend/genesys/genesys.cpp:128
+#: backend/gt68xx_low.h:137 backend/hp-option.c:3097
 #, no-c-format
 msgid "Green"
 msgstr ""
 
-#: backend/canon_dr.c:423 backend/epson.c:601 backend/epson.c:3100
-#: backend/epson2.c:203 backend/fujitsu.c:694 backend/genesys.c:91
-#: backend/genesys.c:98 backend/gt68xx_low.h:135 backend/hp-option.c:3095
+#: backend/canon_dr.c:428 backend/epson.c:601 backend/epson.c:3100
+#: backend/epson2.c:203 backend/fujitsu.c:699
+#: backend/genesys/genesys.cpp:122 backend/genesys/genesys.cpp:129
+#: backend/gt68xx_low.h:138 backend/hp-option.c:3098
 #, no-c-format
 msgid "Blue"
 msgstr ""
 
-#: backend/canon_dr.c:424
+#: backend/canon_dr.c:429
 #, no-c-format
 msgid "Enhance Red"
 msgstr ""
 
-#: backend/canon_dr.c:425
+#: backend/canon_dr.c:430
 #, no-c-format
 msgid "Enhance Green"
 msgstr ""
 
-#: backend/canon_dr.c:426
+#: backend/canon_dr.c:431
 #, no-c-format
 msgid "Enhance Blue"
 msgstr ""
 
-#: backend/canon_dr.c:428 backend/epson.c:556 backend/epson.c:564
+#: backend/canon_dr.c:433 backend/epson.c:556 backend/epson.c:564
 #: backend/epson.c:576 backend/epson.c:598 backend/epson2.c:165
 #: backend/epson2.c:173 backend/epson2.c:185 backend/epson2.c:200
-#: backend/epson2.c:214 backend/fujitsu.c:698 backend/genesys.c:99
-#: backend/leo.c:109 backend/matsushita.c:138 backend/matsushita.c:159
-#: backend/matsushita.c:191 backend/matsushita.c:213
+#: backend/epson2.c:214 backend/fujitsu.c:703
+#: backend/genesys/genesys.cpp:130 backend/leo.c:113
+#: backend/matsushita.c:142 backend/matsushita.c:163
+#: backend/matsushita.c:195 backend/matsushita.c:217
 #: backend/snapscan-options.c:91
 #, no-c-format
 msgid "None"
 msgstr ""
 
-#: backend/canon_dr.c:429 backend/fujitsu.c:699
+#: backend/canon_dr.c:434 backend/fujitsu.c:704
 #, no-c-format
 msgid "JPEG"
 msgstr ""
 
-#: backend/canon_dr.c:2449 backend/fujitsu.c:4066 backend/genesys.c:5769
-#: backend/kvs1025_opt.c:911
+#: backend/canon_dr.c:2479 backend/fujitsu.c:4117
+#: backend/genesys/genesys.cpp:4168 backend/kvs1025_opt.c:910
 #, no-c-format
 msgid "Software blank skip percentage"
 msgstr ""
 
-#: backend/canon_dr.c:2450 backend/fujitsu.c:4067
+#: backend/canon_dr.c:2480 backend/fujitsu.c:4118
 #, no-c-format
 msgid "Request driver to discard pages with low percentage of dark pixels"
 msgstr ""
 
-#: backend/epson.c:491 backend/epson2.c:108 backend/magicolor.c:174
+#: backend/epson.c:491 backend/epson2.c:108 backend/epsonds.c:88
+#: backend/kodakaio.c:611 backend/magicolor.c:174
 #, no-c-format
 msgid "Simplex"
 msgstr ""
 
-#: backend/epson.c:492 backend/epson2.c:109 backend/kvs1025.h:50
-#: backend/kvs20xx_opt.c:204 backend/kvs40xx_opt.c:353 backend/magicolor.c:175
+#: backend/epson.c:492 backend/epson2.c:109 backend/epsonds.c:89
+#: backend/kodakaio.c:612 backend/kvs1025.h:50 backend/kvs20xx_opt.c:204
+#: backend/kvs40xx_opt.c:353 backend/magicolor.c:175
 #: backend/matsushita.h:218
 #, no-c-format
 msgid "Duplex"
 msgstr ""
 
-#: backend/epson.c:502 backend/epson2.c:116 backend/pixma.c:918
+#: backend/epson.c:502 backend/epson2-ops.c:102 backend/epson2.c:116
+#: backend/epsonds-ops.c:33 backend/epsonds.h:63 backend/pixma/pixma.c:937
 #, no-c-format
 msgid "Transparency Unit"
 msgstr ""
 
-#: backend/epson.c:503 backend/epson2.c:118 backend/magicolor.c:182
-#: backend/mustek.c:160 backend/pixma.c:906 backend/test.c:192
-#: backend/umax.c:183
+#: backend/epson.c:503 backend/epson2-ops.c:104 backend/epson2.c:118
+#: backend/epsonds-ops.c:34 backend/epsonds.c:96 backend/epsonds.h:64
+#: backend/kodakaio.c:618 backend/magicolor.c:182 backend/mustek.c:160
+#: backend/pixma/pixma.c:925 backend/test.c:196 backend/umax.c:183
 #, no-c-format
 msgid "Automatic Document Feeder"
 msgstr ""
@@ -1724,8 +1737,8 @@
 msgid "CRT monitors"
 msgstr ""
 
-#: backend/epson.c:656 backend/epson2.c:254 backend/fujitsu.c:682
-#: backend/hp-option.c:3226 backend/test.c:143
+#: backend/epson.c:656 backend/epson2.c:254 backend/fujitsu.c:687
+#: backend/hp-option.c:3229 backend/test.c:147
 #, no-c-format
 msgid "Default"
 msgstr ""
@@ -1788,49 +1801,51 @@
 msgid "Max"
 msgstr ""
 
-#: backend/epson.c:2813 backend/epson2.c:977 backend/genesys.c:5535
-#: backend/gt68xx.c:458 backend/hp-option.c:2914 backend/kvs1025_opt.c:522
+#: backend/epson.c:2813 backend/epson2.c:976 backend/epsonds.c:629
+#: backend/genesys/genesys.cpp:3965 backend/gt68xx.c:451
+#: backend/hp-option.c:2917 backend/kvs1025_opt.c:521
 #: backend/kvs20xx_opt.c:171 backend/kvs40xx_opt.c:320 backend/ma1509.c:501
-#: backend/matsushita.c:1084 backend/microtek2.h:598 backend/mustek.c:4203
-#: backend/mustek_usb.c:260 backend/mustek_usb2.c:344 backend/niash.c:734
-#: backend/plustek.c:721 backend/plustek_pp.c:658 backend/sceptre.c:673
-#: backend/snapscan-options.c:354 backend/stv680.c:1030 backend/teco2.c:1886
-#: backend/test.c:306 backend/u12.c:473 backend/umax.c:5054
+#: backend/matsushita.c:1088 backend/microtek2.h:598 backend/mustek.c:4215
+#: backend/mustek_usb.c:256 backend/mustek_usb2.c:344 backend/niash.c:734
+#: backend/plustek.c:721 backend/plustek_pp.c:658 backend/sceptre.c:677
+#: backend/snapscan-options.c:354 backend/stv680.c:1034
+#: backend/teco2.c:1886 backend/test.c:310 backend/u12.c:473
+#: backend/umax.c:5054
 #, no-c-format
 msgid "Scan Mode"
 msgstr ""
 
-#: backend/epson.c:2845 backend/epson2.c:1012
+#: backend/epson.c:2845 backend/epson2.c:1011
 #, no-c-format
 msgid "Selects the halftone."
 msgstr ""
 
-#: backend/epson.c:2867 backend/epson2.c:1033
+#: backend/epson.c:2867 backend/epson2.c:1032
 #, no-c-format
 msgid "Dropout"
 msgstr ""
 
-#: backend/epson.c:2868 backend/epson2.c:1034
+#: backend/epson.c:2868 backend/epson2.c:1033
 #, no-c-format
 msgid "Selects the dropout."
 msgstr ""
 
-#: backend/epson.c:2880 backend/epson2.c:1046
+#: backend/epson.c:2880 backend/epson2.c:1045
 #, no-c-format
 msgid "Selects the brightness."
 msgstr ""
 
-#: backend/epson.c:2895 backend/epson2.c:1059
+#: backend/epson.c:2895 backend/epson2.c:1058
 #, no-c-format
 msgid "Sharpness"
 msgstr ""
 
-#: backend/epson.c:3031 backend/epson2.c:1175 backend/epson2.c:1222
+#: backend/epson.c:3031 backend/epson2.c:1174 backend/epson2.c:1221
 #, no-c-format
 msgid "Color correction"
 msgstr ""
 
-#: backend/epson.c:3034 backend/epson2.c:1177
+#: backend/epson.c:3034 backend/epson2.c:1176
 #, no-c-format
 msgid "Sets the color correction table for the selected output device."
 msgstr ""
@@ -1920,17 +1935,17 @@
 msgid "Controls blue level"
 msgstr ""
 
-#: backend/epson.c:3206 backend/epson2.c:1256
+#: backend/epson.c:3206 backend/epson2.c:1255
 #, no-c-format
 msgid "Mirror the image."
 msgstr ""
 
-#: backend/epson.c:3232 backend/mustek.c:4332
+#: backend/epson.c:3232 backend/mustek.c:4344
 #, no-c-format
 msgid "Fast preview"
 msgstr ""
 
-#: backend/epson.c:3245 backend/epson2.c:1266
+#: backend/epson.c:3245 backend/epson2.c:1265
 #, no-c-format
 msgid "Auto area segmentation"
 msgstr ""
@@ -1960,47 +1975,49 @@
 msgid "Quick format"
 msgstr ""
 
-#: backend/epson.c:3360 backend/epson2.c:1341
+#: backend/epson.c:3360 backend/epson2.c:1340 backend/epsonds.c:726
 #, no-c-format
 msgid "Optional equipment"
 msgstr ""
 
-#: backend/epson.c:3431 backend/epson2.c:1394
+#: backend/epson.c:3431 backend/epson2.c:1393 backend/epsonds.c:742
 #, no-c-format
 msgid "Eject"
 msgstr ""
 
-#: backend/epson.c:3432 backend/epson2.c:1395
+#: backend/epson.c:3432 backend/epson2.c:1394 backend/epsonds.c:743
 #, no-c-format
 msgid "Eject the sheet in the ADF"
 msgstr ""
 
-#: backend/epson.c:3444 backend/epson2.c:1405
+#: backend/epson.c:3444 backend/epson2.c:1404
 #, no-c-format
 msgid "Auto eject"
 msgstr ""
 
-#: backend/epson.c:3445 backend/epson2.c:1407
+#: backend/epson.c:3445 backend/epson2.c:1406
 #, no-c-format
 msgid "Eject document after scanning"
 msgstr ""
 
-#: backend/epson.c:3457 backend/epson2.c:1417 backend/magicolor.c:2419
+#: backend/epson.c:3457 backend/epson2.c:1416 backend/epsonds.c:758
+#: backend/kodakaio.c:2855 backend/magicolor.c:2450
 #, no-c-format
 msgid "ADF Mode"
 msgstr ""
 
-#: backend/epson.c:3459 backend/epson2.c:1419 backend/magicolor.c:2421
+#: backend/epson.c:3459 backend/epson2.c:1418 backend/epsonds.c:760
+#: backend/kodakaio.c:2857 backend/magicolor.c:2452
 #, no-c-format
 msgid "Selects the ADF mode (simplex/duplex)"
 msgstr ""
 
-#: backend/epson.c:3473 backend/epson2.c:1431
+#: backend/epson.c:3473 backend/epson2.c:1430
 #, no-c-format
 msgid "Bay"
 msgstr ""
 
-#: backend/epson.c:3474 backend/epson2.c:1432
+#: backend/epson.c:3474 backend/epson2.c:1431
 #, no-c-format
 msgid "Select bay to scan"
 msgstr ""
@@ -2034,12 +2051,12 @@
 "pressed to actually start the scan process."
 msgstr ""
 
-#: backend/epson2.c:102 backend/pixma.c:390
+#: backend/epson2.c:102 backend/pixma/pixma.c:409
 #, no-c-format
 msgid "Infrared"
 msgstr ""
 
-#: backend/epson2.c:117
+#: backend/epson2-ops.c:103 backend/epson2.c:117
 #, no-c-format
 msgid "TPU8x10"
 msgstr ""
@@ -2064,490 +2081,490 @@
 msgid "User defined CCT profile"
 msgstr ""
 
-#: backend/fujitsu.c:683 backend/hp-option.c:3327 backend/hp-option.c:3340
+#: backend/fujitsu.c:688 backend/hp-option.c:3330 backend/hp-option.c:3343
 #, no-c-format
 msgid "On"
 msgstr ""
 
-#: backend/fujitsu.c:684 backend/hp-option.c:3159 backend/hp-option.c:3326
-#: backend/hp-option.c:3339
+#: backend/fujitsu.c:689 backend/hp-option.c:3162 backend/hp-option.c:3329
+#: backend/hp-option.c:3342
 #, no-c-format
 msgid "Off"
 msgstr ""
 
-#: backend/fujitsu.c:686
+#: backend/fujitsu.c:691
 #, no-c-format
 msgid "DTC"
 msgstr ""
 
-#: backend/fujitsu.c:687
+#: backend/fujitsu.c:692
 #, no-c-format
 msgid "SDTC"
 msgstr ""
 
-#: backend/fujitsu.c:689 backend/teco1.c:1152 backend/teco1.c:1153
-#: backend/teco2.c:1971 backend/teco2.c:1972 backend/teco3.c:977
-#: backend/teco3.c:978
+#: backend/fujitsu.c:694 backend/teco1.c:1156 backend/teco1.c:1157
+#: backend/teco2.c:1971 backend/teco2.c:1972 backend/teco3.c:981
+#: backend/teco3.c:982
 #, no-c-format
 msgid "Dither"
 msgstr ""
 
-#: backend/fujitsu.c:690
+#: backend/fujitsu.c:695
 #, no-c-format
 msgid "Diffusion"
 msgstr ""
 
-#: backend/fujitsu.c:695
+#: backend/fujitsu.c:700
 #, no-c-format
 msgid "White"
 msgstr ""
 
-#: backend/fujitsu.c:696
+#: backend/fujitsu.c:701
 #, no-c-format
 msgid "Black"
 msgstr ""
 
-#: backend/fujitsu.c:701
+#: backend/fujitsu.c:706
 #, no-c-format
 msgid "Continue"
 msgstr ""
 
-#: backend/fujitsu.c:702
+#: backend/fujitsu.c:707
 #, no-c-format
 msgid "Stop"
 msgstr ""
 
-#: backend/fujitsu.c:704
+#: backend/fujitsu.c:709
 #, no-c-format
 msgid "10mm"
 msgstr ""
 
-#: backend/fujitsu.c:705
+#: backend/fujitsu.c:710
 #, no-c-format
 msgid "15mm"
 msgstr ""
 
-#: backend/fujitsu.c:706
+#: backend/fujitsu.c:711
 #, no-c-format
 msgid "20mm"
 msgstr ""
 
-#: backend/fujitsu.c:708 backend/hp-option.c:3045
+#: backend/fujitsu.c:713 backend/hp-option.c:3048
 #, no-c-format
 msgid "Horizontal"
 msgstr ""
 
-#: backend/fujitsu.c:709
+#: backend/fujitsu.c:714
 #, no-c-format
 msgid "Horizontal bold"
 msgstr ""
 
-#: backend/fujitsu.c:710
+#: backend/fujitsu.c:715
 #, no-c-format
 msgid "Horizontal narrow"
 msgstr ""
 
-#: backend/fujitsu.c:711 backend/hp-option.c:3044
+#: backend/fujitsu.c:716 backend/hp-option.c:3047
 #, no-c-format
 msgid "Vertical"
 msgstr ""
 
-#: backend/fujitsu.c:712
+#: backend/fujitsu.c:717
 #, no-c-format
 msgid "Vertical bold"
 msgstr ""
 
-#: backend/fujitsu.c:714
+#: backend/fujitsu.c:719
 #, no-c-format
 msgid "Top to bottom"
 msgstr ""
 
-#: backend/fujitsu.c:715
+#: backend/fujitsu.c:720
 #, no-c-format
 msgid "Bottom to top"
 msgstr ""
 
-#: backend/fujitsu.c:717
+#: backend/fujitsu.c:722
 #, no-c-format
 msgid "Front"
 msgstr ""
 
-#: backend/fujitsu.c:718
+#: backend/fujitsu.c:723
 #, no-c-format
 msgid "Back"
 msgstr ""
 
-#: backend/fujitsu.c:3097 backend/pixma_sane_options.c:145
+#: backend/fujitsu.c:3148 backend/pixma/pixma_sane_options.c:145
 #, no-c-format
 msgid "Gamma function exponent"
 msgstr ""
 
-#: backend/fujitsu.c:3098 backend/pixma_sane_options.c:146
+#: backend/fujitsu.c:3149 backend/pixma/pixma_sane_options.c:146
 #, no-c-format
 msgid "Changes intensity of midtones"
 msgstr ""
 
-#: backend/fujitsu.c:3147
+#: backend/fujitsu.c:3198
 #, no-c-format
 msgid "RIF"
 msgstr ""
 
-#: backend/fujitsu.c:3148
+#: backend/fujitsu.c:3199
 #, no-c-format
 msgid "Reverse image format"
 msgstr ""
 
-#: backend/fujitsu.c:3165
+#: backend/fujitsu.c:3216
 #, no-c-format
 msgid "Halftone type"
 msgstr ""
 
-#: backend/fujitsu.c:3166
+#: backend/fujitsu.c:3217
 #, no-c-format
 msgid "Control type of halftone filter"
 msgstr ""
 
-#: backend/fujitsu.c:3187
+#: backend/fujitsu.c:3238
 #, no-c-format
 msgid "Control pattern of halftone filter"
 msgstr ""
 
-#: backend/fujitsu.c:3209
+#: backend/fujitsu.c:3260
 #, no-c-format
 msgid "Outline"
 msgstr ""
 
-#: backend/fujitsu.c:3210
+#: backend/fujitsu.c:3261
 #, no-c-format
 msgid "Perform outline extraction"
 msgstr ""
 
-#: backend/fujitsu.c:3221
+#: backend/fujitsu.c:3272
 #, no-c-format
 msgid "Emphasis"
 msgstr ""
 
-#: backend/fujitsu.c:3222
+#: backend/fujitsu.c:3273
 #, no-c-format
 msgid "Negative to smooth or positive to sharpen image"
 msgstr ""
 
-#: backend/fujitsu.c:3240
+#: backend/fujitsu.c:3291
 #, no-c-format
 msgid "Separation"
 msgstr ""
 
-#: backend/fujitsu.c:3241
+#: backend/fujitsu.c:3292
 #, no-c-format
 msgid "Enable automatic separation of image and text"
 msgstr ""
 
-#: backend/fujitsu.c:3252
+#: backend/fujitsu.c:3303
 #, no-c-format
 msgid "Mirroring"
 msgstr ""
 
-#: backend/fujitsu.c:3253
+#: backend/fujitsu.c:3304
 #, no-c-format
 msgid "Reflect output image horizontally"
 msgstr ""
 
-#: backend/fujitsu.c:3270
+#: backend/fujitsu.c:3321
 #, no-c-format
 msgid "White level follower"
 msgstr ""
 
-#: backend/fujitsu.c:3271
+#: backend/fujitsu.c:3322
 #, no-c-format
 msgid "Control white level follower"
 msgstr ""
 
-#: backend/fujitsu.c:3289
+#: backend/fujitsu.c:3340
 #, no-c-format
 msgid "BP filter"
 msgstr ""
 
-#: backend/fujitsu.c:3290
+#: backend/fujitsu.c:3341
 #, no-c-format
 msgid "Improves quality of high resolution ball-point pen text"
 msgstr ""
 
-#: backend/fujitsu.c:3306 backend/hp-option.h:73
+#: backend/fujitsu.c:3357 backend/hp-option.h:73
 #, no-c-format
 msgid "Smoothing"
 msgstr ""
 
-#: backend/fujitsu.c:3307
+#: backend/fujitsu.c:3358
 #, no-c-format
 msgid "Enable smoothing for improved OCR"
 msgstr ""
 
-#: backend/fujitsu.c:3323
+#: backend/fujitsu.c:3374
 #, no-c-format
 msgid "Gamma curve"
 msgstr ""
 
-#: backend/fujitsu.c:3324
+#: backend/fujitsu.c:3375
 #, no-c-format
 msgid "Gamma curve, from light to dark, but upper two may not work"
 msgstr ""
 
-#: backend/fujitsu.c:3346 backend/genesys.c:5832
-#: backend/pixma_sane_options.c:335
+#: backend/fujitsu.c:3397 backend/genesys/genesys.cpp:4229
+#: backend/pixma/pixma_sane_options.c:335
 #, no-c-format
 msgid "Threshold curve"
 msgstr ""
 
-#: backend/fujitsu.c:3347
+#: backend/fujitsu.c:3398
 #, no-c-format
 msgid "Threshold curve, from light to dark, but upper two may not be linear"
 msgstr ""
 
-#: backend/fujitsu.c:3369
+#: backend/fujitsu.c:3420
 #, no-c-format
 msgid "Threshold white"
 msgstr ""
 
-#: backend/fujitsu.c:3370
+#: backend/fujitsu.c:3421
 #, no-c-format
 msgid "Set pixels equal to threshold to white instead of black"
 msgstr ""
 
-#: backend/fujitsu.c:3386 backend/fujitsu.c:3387
+#: backend/fujitsu.c:3437 backend/fujitsu.c:3438
 #, no-c-format
 msgid "Noise removal"
 msgstr ""
 
-#: backend/fujitsu.c:3403
+#: backend/fujitsu.c:3454
 #, no-c-format
 msgid "Matrix 5x5"
 msgstr ""
 
-#: backend/fujitsu.c:3404
+#: backend/fujitsu.c:3455
 #, no-c-format
 msgid "Remove 5 pixel square noise"
 msgstr ""
 
-#: backend/fujitsu.c:3420
+#: backend/fujitsu.c:3471
 #, no-c-format
 msgid "Matrix 4x4"
 msgstr ""
 
-#: backend/fujitsu.c:3421
+#: backend/fujitsu.c:3472
 #, no-c-format
 msgid "Remove 4 pixel square noise"
 msgstr ""
 
-#: backend/fujitsu.c:3437
+#: backend/fujitsu.c:3488
 #, no-c-format
 msgid "Matrix 3x3"
 msgstr ""
 
-#: backend/fujitsu.c:3438
+#: backend/fujitsu.c:3489
 #, no-c-format
 msgid "Remove 3 pixel square noise"
 msgstr ""
 
-#: backend/fujitsu.c:3454
+#: backend/fujitsu.c:3505
 #, no-c-format
 msgid "Matrix 2x2"
 msgstr ""
 
-#: backend/fujitsu.c:3455
+#: backend/fujitsu.c:3506
 #, no-c-format
 msgid "Remove 2 pixel square noise"
 msgstr ""
 
-#: backend/fujitsu.c:3474
+#: backend/fujitsu.c:3525
 #, no-c-format
 msgid "Variance"
 msgstr ""
 
-#: backend/fujitsu.c:3475
+#: backend/fujitsu.c:3526
 #, no-c-format
 msgid "Set SDTC variance rate (sensitivity), 0 equals 127"
 msgstr ""
 
-#: backend/fujitsu.c:3508
+#: backend/fujitsu.c:3559
 #, no-c-format
 msgid "Auto width detection"
 msgstr ""
 
-#: backend/fujitsu.c:3509
+#: backend/fujitsu.c:3560
 #, no-c-format
 msgid "Scanner detects paper sides. May reduce scanning speed."
 msgstr ""
 
-#: backend/fujitsu.c:3526
+#: backend/fujitsu.c:3577
 #, no-c-format
 msgid "Auto length detection"
 msgstr ""
 
-#: backend/fujitsu.c:3527
+#: backend/fujitsu.c:3578
 #, no-c-format
 msgid "Scanner detects paper lower edge. May confuse some frontends."
 msgstr ""
 
-#: backend/fujitsu.c:3553
+#: backend/fujitsu.c:3604
 #, no-c-format
 msgid "Compression"
 msgstr ""
 
-#: backend/fujitsu.c:3554
+#: backend/fujitsu.c:3605
 #, no-c-format
 msgid "Enable compressed data. May crash your front-end program"
 msgstr ""
 
-#: backend/fujitsu.c:3574
+#: backend/fujitsu.c:3625
 #, no-c-format
 msgid "Compression argument"
 msgstr ""
 
-#: backend/fujitsu.c:3575
+#: backend/fujitsu.c:3626
 #, no-c-format
 msgid ""
 "Level of JPEG compression. 1 is small file, 7 is large file. 0 (default) is "
 "same as 4"
 msgstr ""
 
-#: backend/fujitsu.c:3605
+#: backend/fujitsu.c:3656
 #, no-c-format
 msgid "DF action"
 msgstr ""
 
-#: backend/fujitsu.c:3606
+#: backend/fujitsu.c:3657
 #, no-c-format
 msgid "Action following double feed error"
 msgstr ""
 
-#: backend/fujitsu.c:3622
+#: backend/fujitsu.c:3673
 #, no-c-format
 msgid "DF skew"
 msgstr ""
 
-#: backend/fujitsu.c:3623
+#: backend/fujitsu.c:3674
 #, no-c-format
 msgid "Enable double feed error due to skew"
 msgstr ""
 
-#: backend/fujitsu.c:3641
+#: backend/fujitsu.c:3692
 #, no-c-format
 msgid "DF thickness"
 msgstr ""
 
-#: backend/fujitsu.c:3642
+#: backend/fujitsu.c:3693
 #, no-c-format
 msgid "Enable double feed error due to paper thickness"
 msgstr ""
 
-#: backend/fujitsu.c:3660
+#: backend/fujitsu.c:3711
 #, no-c-format
 msgid "DF length"
 msgstr ""
 
-#: backend/fujitsu.c:3661
+#: backend/fujitsu.c:3712
 #, no-c-format
 msgid "Enable double feed error due to paper length"
 msgstr ""
 
-#: backend/fujitsu.c:3684
+#: backend/fujitsu.c:3735
 #, no-c-format
 msgid "DF length difference"
 msgstr ""
 
-#: backend/fujitsu.c:3685
+#: backend/fujitsu.c:3736
 #, no-c-format
 msgid "Difference in page length to trigger double feed error"
 msgstr ""
 
-#: backend/fujitsu.c:3708
+#: backend/fujitsu.c:3759
 #, no-c-format
 msgid "DF recovery mode"
 msgstr ""
 
-#: backend/fujitsu.c:3709
+#: backend/fujitsu.c:3760
 #, no-c-format
 msgid "Request scanner to reverse feed on paper jam"
 msgstr ""
 
-#: backend/fujitsu.c:3728
+#: backend/fujitsu.c:3779
 #, no-c-format
 msgid "Paper protection"
 msgstr ""
 
-#: backend/fujitsu.c:3729
+#: backend/fujitsu.c:3780
 #, no-c-format
 msgid "Request scanner to predict jams in the ADF"
 msgstr ""
 
-#: backend/fujitsu.c:3748
+#: backend/fujitsu.c:3799
 #, no-c-format
 msgid "Advanced paper protection"
 msgstr ""
 
-#: backend/fujitsu.c:3749
+#: backend/fujitsu.c:3800
 #, no-c-format
 msgid "Request scanner to predict jams in the ADF using improved sensors"
 msgstr ""
 
-#: backend/fujitsu.c:3768
+#: backend/fujitsu.c:3819
 #, no-c-format
 msgid "Staple detection"
 msgstr ""
 
-#: backend/fujitsu.c:3769
+#: backend/fujitsu.c:3820
 #, no-c-format
 msgid "Request scanner to detect jams in the ADF caused by staples"
 msgstr ""
 
-#: backend/fujitsu.c:3788
+#: backend/fujitsu.c:3839
 #, no-c-format
 msgid "Background color"
 msgstr ""
 
-#: backend/fujitsu.c:3789
+#: backend/fujitsu.c:3840
 #, no-c-format
 msgid "Set color of background for scans. May conflict with overscan option"
 msgstr ""
 
-#: backend/fujitsu.c:3809
+#: backend/fujitsu.c:3860
 #, no-c-format
 msgid "Dropout color"
 msgstr ""
 
-#: backend/fujitsu.c:3810
+#: backend/fujitsu.c:3861
 #, no-c-format
 msgid ""
 "One-pass scanners use only one color during gray or binary scanning, useful "
 "for colored paper or ink"
 msgstr ""
 
-#: backend/fujitsu.c:3833
+#: backend/fujitsu.c:3884
 #, no-c-format
 msgid "Buffer mode"
 msgstr ""
 
-#: backend/fujitsu.c:3834
+#: backend/fujitsu.c:3885
 #, no-c-format
 msgid "Request scanner to read pages quickly from ADF into internal memory"
 msgstr ""
 
-#: backend/fujitsu.c:3853
+#: backend/fujitsu.c:3904
 #, no-c-format
 msgid "Prepick"
 msgstr ""
 
-#: backend/fujitsu.c:3854
+#: backend/fujitsu.c:3905
 #, no-c-format
 msgid "Request scanner to grab next page from ADF"
 msgstr ""
 
-#: backend/fujitsu.c:3873
+#: backend/fujitsu.c:3924
 #, no-c-format
 msgid "Overscan"
 msgstr ""
 
-#: backend/fujitsu.c:3874
+#: backend/fujitsu.c:3925
 #, no-c-format
 msgid ""
 "Collect a few mm of background on top side of scan, before paper enters ADF, "
@@ -2555,65 +2572,65 @@
 "remaining sides. May conflict with bgcolor option"
 msgstr ""
 
-#: backend/fujitsu.c:3892
+#: backend/fujitsu.c:3943
 #, no-c-format
 msgid "Sleep timer"
 msgstr ""
 
-#: backend/fujitsu.c:3893
+#: backend/fujitsu.c:3944
 #, no-c-format
 msgid ""
 "Time in minutes until the internal power supply switches to sleep mode"
 msgstr ""
 
-#: backend/fujitsu.c:3911
+#: backend/fujitsu.c:3962
 #, no-c-format
 msgid "Off timer"
 msgstr ""
 
-#: backend/fujitsu.c:3912
+#: backend/fujitsu.c:3963
 #, no-c-format
 msgid ""
 "Time in minutes until the internal power supply switches the scanner off. "
 "Will be rounded to nearest 15 minutes. Zero means never power off."
 msgstr ""
 
-#: backend/fujitsu.c:3930
+#: backend/fujitsu.c:3981
 #, no-c-format
 msgid "Duplex offset"
 msgstr ""
 
-#: backend/fujitsu.c:3931
+#: backend/fujitsu.c:3982
 #, no-c-format
 msgid "Adjust front/back offset"
 msgstr ""
 
-#: backend/fujitsu.c:3948 backend/plustek.c:1025 backend/umax_pp.c:804
+#: backend/fujitsu.c:3999 backend/plustek.c:1025 backend/umax_pp.c:794
 #, no-c-format
 msgid "Green offset"
 msgstr ""
 
-#: backend/fujitsu.c:3949
+#: backend/fujitsu.c:4000
 #, no-c-format
 msgid "Adjust green/red offset"
 msgstr ""
 
-#: backend/fujitsu.c:3966 backend/plustek.c:1041 backend/umax_pp.c:816
+#: backend/fujitsu.c:4017 backend/plustek.c:1041 backend/umax_pp.c:806
 #, no-c-format
 msgid "Blue offset"
 msgstr ""
 
-#: backend/fujitsu.c:3967
+#: backend/fujitsu.c:4018
 #, no-c-format
 msgid "Adjust blue/red offset"
 msgstr ""
 
-#: backend/fujitsu.c:3980
+#: backend/fujitsu.c:4031
 #, no-c-format
 msgid "Low Memory"
 msgstr ""
 
-#: backend/fujitsu.c:3981
+#: backend/fujitsu.c:4032
 #, no-c-format
 msgid ""
 "Limit driver memory usage for use in embedded systems. Causes some duplex "
@@ -2622,172 +2639,172 @@
 "used with custom front-end software."
 msgstr ""
 
-#: backend/fujitsu.c:3996
+#: backend/fujitsu.c:4047
 #, no-c-format
 msgid "Duplex side"
 msgstr ""
 
-#: backend/fujitsu.c:3997
+#: backend/fujitsu.c:4048
 #, no-c-format
 msgid ""
 "Tells which side (0=front, 1=back) of a duplex scan the next call to "
 "sane_read will return."
 msgstr ""
 
-#: backend/fujitsu.c:4008
+#: backend/fujitsu.c:4059
 #, no-c-format
 msgid "Hardware deskew and crop"
 msgstr ""
 
-#: backend/fujitsu.c:4009
+#: backend/fujitsu.c:4060
 #, no-c-format
 msgid "Request scanner to rotate and crop pages digitally."
 msgstr ""
 
-#: backend/fujitsu.c:4020 backend/kvs1025_opt.c:872
+#: backend/fujitsu.c:4071 backend/kvs1025_opt.c:871
 #, no-c-format
 msgid "Software deskew"
 msgstr ""
 
-#: backend/fujitsu.c:4021
+#: backend/fujitsu.c:4072
 #, no-c-format
 msgid "Request driver to rotate skewed pages digitally."
 msgstr ""
 
-#: backend/fujitsu.c:4033 backend/kvs1025_opt.c:881
+#: backend/fujitsu.c:4084 backend/kvs1025_opt.c:880
 #, no-c-format
 msgid "Software despeckle diameter"
 msgstr ""
 
-#: backend/fujitsu.c:4034
+#: backend/fujitsu.c:4085
 #, no-c-format
 msgid "Maximum diameter of lone dots to remove from scan."
 msgstr ""
 
-#: backend/fujitsu.c:4053 backend/genesys.c:5760
+#: backend/fujitsu.c:4104 backend/genesys/genesys.cpp:4159
 #, no-c-format
 msgid "Software crop"
 msgstr ""
 
-#: backend/fujitsu.c:4054
+#: backend/fujitsu.c:4105
 #, no-c-format
 msgid "Request driver to remove border from pages digitally."
 msgstr ""
 
-#: backend/fujitsu.c:4083
+#: backend/fujitsu.c:4134
 #, no-c-format
 msgid "Halt on Cancel"
 msgstr ""
 
-#: backend/fujitsu.c:4084
+#: backend/fujitsu.c:4135
 #, no-c-format
 msgid ""
 "Request driver to halt the paper feed instead of eject during a cancel."
 msgstr ""
 
-#: backend/fujitsu.c:4095
+#: backend/fujitsu.c:4146
 #, no-c-format
 msgid "Endorser Options"
 msgstr ""
 
-#: backend/fujitsu.c:4096
+#: backend/fujitsu.c:4147
 #, no-c-format
 msgid "Controls for endorser unit"
 msgstr ""
 
-#: backend/fujitsu.c:4107
+#: backend/fujitsu.c:4158
 #, no-c-format
 msgid "Endorser"
 msgstr ""
 
-#: backend/fujitsu.c:4108
+#: backend/fujitsu.c:4159
 #, no-c-format
 msgid "Enable endorser unit"
 msgstr ""
 
-#: backend/fujitsu.c:4123
+#: backend/fujitsu.c:4174
 #, no-c-format
 msgid "Endorser bits"
 msgstr ""
 
-#: backend/fujitsu.c:4124
+#: backend/fujitsu.c:4175
 #, no-c-format
 msgid "Determines maximum endorser counter value."
 msgstr ""
 
-#: backend/fujitsu.c:4149
+#: backend/fujitsu.c:4200
 #, no-c-format
 msgid "Endorser value"
 msgstr ""
 
-#: backend/fujitsu.c:4150
+#: backend/fujitsu.c:4201
 #, no-c-format
 msgid "Initial endorser counter value."
 msgstr ""
 
-#: backend/fujitsu.c:4173
+#: backend/fujitsu.c:4224
 #, no-c-format
 msgid "Endorser step"
 msgstr ""
 
-#: backend/fujitsu.c:4174
+#: backend/fujitsu.c:4225
 #, no-c-format
 msgid "Change endorser counter value by this much for each page."
 msgstr ""
 
-#: backend/fujitsu.c:4197
+#: backend/fujitsu.c:4248
 #, no-c-format
 msgid "Endorser Y"
 msgstr ""
 
-#: backend/fujitsu.c:4198
+#: backend/fujitsu.c:4249
 #, no-c-format
 msgid "Endorser print offset from top of paper."
 msgstr ""
 
-#: backend/fujitsu.c:4223
+#: backend/fujitsu.c:4274
 #, no-c-format
 msgid "Endorser font"
 msgstr ""
 
-#: backend/fujitsu.c:4224
+#: backend/fujitsu.c:4275
 #, no-c-format
 msgid "Endorser printing font."
 msgstr ""
 
-#: backend/fujitsu.c:4253
+#: backend/fujitsu.c:4304
 #, no-c-format
 msgid "Endorser direction"
 msgstr ""
 
-#: backend/fujitsu.c:4254
+#: backend/fujitsu.c:4305
 #, no-c-format
 msgid "Endorser printing direction."
 msgstr ""
 
-#: backend/fujitsu.c:4278
+#: backend/fujitsu.c:4329
 #, no-c-format
 msgid "Endorser side"
 msgstr ""
 
-#: backend/fujitsu.c:4279
+#: backend/fujitsu.c:4330
 #, no-c-format
 msgid "Endorser printing side, requires hardware support to change"
 msgstr ""
 
-#: backend/fujitsu.c:4304
+#: backend/fujitsu.c:4355
 #, no-c-format
 msgid "Endorser string"
 msgstr ""
 
-#: backend/fujitsu.c:4305
+#: backend/fujitsu.c:4356
 #, no-c-format
 msgid ""
 "Endorser alphanumeric print format. %05ud or %08ud at the end will be "
 "replaced by counter value."
 msgstr ""
 
-#: backend/fujitsu.c:4332
+#: backend/fujitsu.c:4383
 #, no-c-format
 msgid "Top edge"
 msgstr ""
@@ -2797,177 +2814,177 @@
 msgid "Paper is pulled partly into adf"
 msgstr ""
 
-#: backend/fujitsu.c:4344
+#: backend/fujitsu.c:4395
 #, no-c-format
 msgid "A3 paper"
 msgstr ""
 
-#: backend/fujitsu.c:4345
+#: backend/fujitsu.c:4396
 #, no-c-format
 msgid "A3 paper detected"
 msgstr ""
 
-#: backend/fujitsu.c:4356
+#: backend/fujitsu.c:4407
 #, no-c-format
 msgid "B4 paper"
 msgstr ""
 
-#: backend/fujitsu.c:4357
+#: backend/fujitsu.c:4408
 #, no-c-format
 msgid "B4 paper detected"
 msgstr ""
 
-#: backend/fujitsu.c:4368
+#: backend/fujitsu.c:4419
 #, no-c-format
 msgid "A4 paper"
 msgstr ""
 
-#: backend/fujitsu.c:4369
+#: backend/fujitsu.c:4420
 #, no-c-format
 msgid "A4 paper detected"
 msgstr ""
 
-#: backend/fujitsu.c:4380
+#: backend/fujitsu.c:4431
 #, no-c-format
 msgid "B5 paper"
 msgstr ""
 
-#: backend/fujitsu.c:4381
+#: backend/fujitsu.c:4432
 #, no-c-format
 msgid "B5 paper detected"
 msgstr ""
 
-#: backend/fujitsu.c:4404
+#: backend/fujitsu.c:4455
 #, no-c-format
 msgid "OMR or DF"
 msgstr ""
 
-#: backend/fujitsu.c:4405
+#: backend/fujitsu.c:4456
 #, no-c-format
 msgid "OMR or double feed detected"
 msgstr ""
 
-#: backend/fujitsu.c:4428
+#: backend/fujitsu.c:4479
 #, no-c-format
 msgid "Power saving"
 msgstr ""
 
-#: backend/fujitsu.c:4429
+#: backend/fujitsu.c:4480
 #, no-c-format
 msgid "Scanner in power saving mode"
 msgstr ""
 
-#: backend/fujitsu.c:4452
+#: backend/fujitsu.c:4503
 #, no-c-format
 msgid "Manual feed"
 msgstr ""
 
-#: backend/fujitsu.c:4453
+#: backend/fujitsu.c:4504
 #, no-c-format
 msgid "Manual feed selected"
 msgstr ""
 
-#: backend/fujitsu.c:4476
+#: backend/fujitsu.c:4527
 #, no-c-format
 msgid "Function"
 msgstr ""
 
-#: backend/fujitsu.c:4477
+#: backend/fujitsu.c:4528
 #, no-c-format
 msgid "Function character on screen"
 msgstr ""
 
-#: backend/fujitsu.c:4488
+#: backend/fujitsu.c:4539
 #, no-c-format
 msgid "Ink low"
 msgstr ""
 
-#: backend/fujitsu.c:4489
+#: backend/fujitsu.c:4540
 #, no-c-format
 msgid "Imprinter ink running low"
 msgstr ""
 
-#: backend/fujitsu.c:4500
+#: backend/fujitsu.c:4551
 #, no-c-format
 msgid "Double feed"
 msgstr ""
 
-#: backend/fujitsu.c:4501
+#: backend/fujitsu.c:4552
 #, no-c-format
 msgid "Double feed detected"
 msgstr ""
 
-#: backend/fujitsu.c:4512
+#: backend/fujitsu.c:4563
 #, no-c-format
 msgid "Error code"
 msgstr ""
 
-#: backend/fujitsu.c:4513
+#: backend/fujitsu.c:4564
 #, no-c-format
 msgid "Hardware error code"
 msgstr ""
 
-#: backend/fujitsu.c:4524
+#: backend/fujitsu.c:4575
 #, no-c-format
 msgid "Skew angle"
 msgstr ""
 
-#: backend/fujitsu.c:4525
+#: backend/fujitsu.c:4576
 #, no-c-format
 msgid "Requires black background for scanning"
 msgstr ""
 
-#: backend/fujitsu.c:4536
+#: backend/fujitsu.c:4587
 #, no-c-format
 msgid "Ink remaining"
 msgstr ""
 
-#: backend/fujitsu.c:4537
+#: backend/fujitsu.c:4588
 #, no-c-format
 msgid "Imprinter ink level"
 msgstr ""
 
-#: backend/fujitsu.c:4548
+#: backend/fujitsu.c:4599
 #, no-c-format
 msgid "Density"
 msgstr ""
 
-#: backend/fujitsu.c:4549
+#: backend/fujitsu.c:4600
 #, no-c-format
 msgid "Density dial"
 msgstr ""
 
-#: backend/fujitsu.c:4560 backend/fujitsu.c:4561
+#: backend/fujitsu.c:4611 backend/fujitsu.c:4612
 #, no-c-format
 msgid "Duplex switch"
 msgstr ""
 
-#: backend/genesys.c:5761
+#: backend/genesys/genesys.cpp:4160
 #, no-c-format
 msgid "Request backend to remove border from pages digitally"
 msgstr ""
 
-#: backend/genesys.c:5770 backend/kvs1025_opt.c:913
+#: backend/genesys/genesys.cpp:4169 backend/kvs1025_opt.c:912
 #, no-c-format
 msgid "Request driver to discard pages with low numbers of dark pixels"
 msgstr ""
 
-#: backend/genesys.c:5781 backend/kvs1025_opt.c:893
+#: backend/genesys/genesys.cpp:4179 backend/kvs1025_opt.c:892
 #, no-c-format
 msgid "Software derotate"
 msgstr ""
 
-#: backend/genesys.c:5782 backend/kvs1025_opt.c:895
+#: backend/genesys/genesys.cpp:4180 backend/kvs1025_opt.c:894
 #, no-c-format
 msgid "Request driver to detect and correct 90 degree image rotation"
 msgstr ""
 
-#: backend/genesys.c:5813 backend/pixma_sane_options.c:314
+#: backend/genesys/genesys.cpp:4210 backend/pixma/pixma_sane_options.c:314
 #, no-c-format
 msgid "Extras"
 msgstr ""
 
-#: backend/genesys.c:5833 backend/pixma_sane_options.c:336
+#: backend/genesys/genesys.cpp:4230 backend/pixma/pixma_sane_options.c:336
 #, no-c-format
 msgid "Dynamic threshold curve, from light to dark, normally 50-65"
 msgstr ""
@@ -2984,180 +3001,183 @@
 "instead on hardware lineart."
 msgstr ""
 
-#: backend/genesys.c:5860
+#: backend/genesys/genesys.cpp:4240
 #, no-c-format
 msgid "Disable interpolation"
 msgstr ""
 
-#: backend/genesys.c:5863
+#: backend/genesys/genesys.cpp:4243
 #, no-c-format
 msgid ""
 "When using high resolutions where the horizontal resolution is smaller than "
 "the vertical resolution this disables horizontal interpolation."
 msgstr ""
 
-#: backend/genesys.c:5872
+#: backend/genesys/genesys.cpp:4252
 #, no-c-format
 msgid "Color filter"
 msgstr ""
 
-#: backend/genesys.c:5875
+#: backend/genesys/genesys.cpp:4255
 #, no-c-format
 msgid "When using gray or lineart this option selects the used color."
 msgstr ""
 
-#: backend/genesys.c:5901
+#: backend/genesys/genesys.cpp:4279
 #, no-c-format
 msgid "Calibration file"
 msgstr ""
 
-#: backend/genesys.c:5902
+#: backend/genesys/genesys.cpp:4280
 #, no-c-format
 msgid "Specify the calibration file to use"
 msgstr ""
 
-#: backend/genesys.c:5919
+#: backend/genesys/genesys.cpp:4297
 #, no-c-format
 msgid "Calibration cache expiration time"
 msgstr ""
 
-#: backend/genesys.c:5920
+#: backend/genesys/genesys.cpp:4298
 #, no-c-format
 msgid ""
 "Time (in minutes) before a cached calibration expires. A value of 0 means "
 "cache is not used. A negative value means cache never expires."
 msgstr ""
 
-#: backend/genesys.c:5930
+#: backend/genesys/genesys.cpp:4308
 #, no-c-format
 msgid "Lamp off time"
 msgstr ""
 
-#: backend/genesys.c:5933
+#: backend/genesys/genesys.cpp:4311
 #, no-c-format
 msgid ""
 "The lamp will be turned off after the given time (in minutes). A value of 0 "
 "means, that the lamp won't be turned off."
 msgstr ""
 
-#: backend/genesys.c:5943
+#: backend/genesys/genesys.cpp:4321
 #, no-c-format
 msgid "Lamp off during scan"
 msgstr ""
 
-#: backend/genesys.c:5944
+#: backend/genesys/genesys.cpp:4322
 #, no-c-format
 msgid "The lamp will be turned off during scan. "
 msgstr ""
 
-#: backend/genesys.c:5972 backend/genesys.c:5973
+#: backend/genesys/genesys.cpp:4349 backend/genesys/genesys.cpp:4350
 #, no-c-format
 msgid "File button"
 msgstr ""
 
-#: backend/genesys.c:6025 backend/genesys.c:6026
+#: backend/genesys/genesys.cpp:4394 backend/genesys/genesys.cpp:4395
 #, no-c-format
 msgid "OCR button"
 msgstr ""
 
-#: backend/genesys.c:6039 backend/genesys.c:6040
+#: backend/genesys/genesys.cpp:4406 backend/genesys/genesys.cpp:4407
 #, no-c-format
 msgid "Power button"
 msgstr ""
 
-#: backend/genesys.c:6053 backend/genesys.c:6054
+#: backend/genesys/genesys.cpp:4418 backend/genesys/genesys.cpp:4419
 #, no-c-format
 msgid "Extra button"
 msgstr ""
 
-#: backend/genesys.c:6067 backend/gt68xx.c:762
+#: backend/p5.c:1926
 #, no-c-format
 msgid "Need calibration"
 msgstr ""
 
-#: backend/genesys.c:6068 backend/gt68xx.c:763
+#: backend/genesys/genesys.cpp:4431 backend/gt68xx.c:756 backend/p5.c:1928
 #, no-c-format
 msgid "The scanner needs calibration for the current settings"
 msgstr ""
 
-#: backend/genesys.c:6080 backend/gt68xx.c:787 backend/gt68xx.c:788
-#: backend/pixma_sane_options.c:226 backend/plustek.c:1080
+#: backend/genesys/genesys.cpp:4442 backend/gt68xx.c:780
+#: backend/gt68xx.c:781 backend/p5.c:1937 backend/p5.c:1938
+#: backend/pixma/pixma_sane_options.c:226 backend/plustek.c:1080
 #, no-c-format
 msgid "Buttons"
 msgstr ""
 
-#: backend/genesys.c:6089 backend/gt68xx.c:794 backend/hp5400_sane.c:392
-#: backend/hp-option.h:97 backend/niash.c:726 backend/plustek.c:941
+#: backend/genesys/genesys.cpp:4451 backend/gt68xx.c:787
+#: backend/hp-option.h:97 backend/hp5400_sane.c:395 backend/niash.c:726
+#: backend/p5.c:1945 backend/plustek.c:941
 #, no-c-format
 msgid "Calibrate"
 msgstr ""
 
-#: backend/genesys.c:6091 backend/gt68xx.c:796
+#: backend/genesys/genesys.cpp:4453 backend/gt68xx.c:789 backend/p5.c:1947
 #, no-c-format
 msgid "Start calibration using special sheet"
 msgstr ""
 
-#: backend/genesys.c:6105 backend/gt68xx.c:809
+#: backend/genesys/genesys.cpp:4465 backend/gt68xx.c:802 backend/p5.c:1958
 #, no-c-format
 msgid "Clear calibration"
 msgstr ""
 
-#: backend/genesys.c:6106 backend/gt68xx.c:810
+#: backend/genesys/genesys.cpp:4466 backend/gt68xx.c:803 backend/p5.c:1960
 #, no-c-format
 msgid "Clear calibration cache"
 msgstr ""
 
-#: backend/gt68xx.c:149 backend/ma1509.c:108 backend/mustek.c:164
-#: backend/snapscan-options.c:87 backend/umax.c:182
+#: backend/genesys/genesys.h:79 backend/gt68xx.c:149 backend/ma1509.c:108
+#: backend/mustek.c:164 backend/snapscan-options.c:87 backend/umax.c:182
 #, no-c-format
 msgid "Transparency Adapter"
 msgstr ""
 
-#: backend/gt68xx.c:477
+#: backend/gt68xx.c:470
 #, no-c-format
 msgid "Gray mode color"
 msgstr ""
 
-#: backend/gt68xx.c:479
+#: backend/gt68xx.c:472
 #, no-c-format
 msgid "Selects which scan color is used gray mode (default: green)."
 msgstr ""
 
-#: backend/gt68xx.c:560 backend/hp3900_sane.c:1392 backend/mustek_usb2.c:410
+#: backend/gt68xx.c:553 backend/hp3900_sane.c:1397
+#: backend/mustek_usb2.c:410
 #, no-c-format
 msgid "Debugging Options"
 msgstr ""
 
-#: backend/gt68xx.c:571 backend/mustek_usb2.c:419
+#: backend/gt68xx.c:564 backend/mustek_usb2.c:419
 #, no-c-format
 msgid "Automatic warmup"
 msgstr ""
 
-#: backend/gt68xx.c:573
+#: backend/gt68xx.c:566
 #, no-c-format
 msgid ""
 "Warm-up until the lamp's brightness is constant instead of insisting on 60 "
 "seconds warm-up time."
 msgstr ""
 
-#: backend/gt68xx.c:585
+#: backend/gt68xx.c:578
 #, no-c-format
 msgid "Full scan"
 msgstr ""
 
-#: backend/gt68xx.c:587
+#: backend/gt68xx.c:580
 #, no-c-format
 msgid ""
 "Scan the complete scanning area including calibration strip. Be careful. "
 "Don't select the full height. For testing only."
 msgstr ""
 
-#: backend/gt68xx.c:598
+#: backend/gt68xx.c:591
 #, no-c-format
 msgid "Coarse calibration"
 msgstr ""
 
-#: backend/gt68xx.c:600
+#: backend/gt68xx.c:593
 #, no-c-format
 msgid ""
 "Setup gain and offset for scanning automatically. If this option is "
@@ -3165,12 +3185,12 @@
 "provided. This option is enabled by default. For testing only."
 msgstr ""
 
-#: backend/gt68xx.c:619
+#: backend/gt68xx.c:612
 #, no-c-format
 msgid "Coarse calibration for first scan only"
 msgstr ""
 
-#: backend/gt68xx.c:621
+#: backend/gt68xx.c:614
 #, no-c-format
 msgid ""
 "Coarse calibration is only done for the first scan. Works with most scanners "
@@ -3178,12 +3198,12 @@
 "scan, disable this option. For testing only."
 msgstr ""
 
-#: backend/gt68xx.c:654
+#: backend/gt68xx.c:647
 #, no-c-format
 msgid "Backtrack lines"
 msgstr ""
 
-#: backend/gt68xx.c:656
+#: backend/gt68xx.c:649
 #, no-c-format
 msgid ""
 "Number of lines the scan slider moves back when backtracking occurs. That "
@@ -3191,12 +3211,12 @@
 "data. Low values cause faster scans but increase the risk of omitting lines."
 msgstr ""
 
-#: backend/gt68xx.c:681 backend/mustek_usb2.c:452
+#: backend/gt68xx.c:674 backend/mustek_usb2.c:452
 #, no-c-format
 msgid "Gamma value"
 msgstr ""
 
-#: backend/gt68xx.c:683 backend/mustek_usb2.c:454
+#: backend/gt68xx.c:676 backend/mustek_usb2.c:454
 #, no-c-format
 msgid "Sets the gamma value of all channels."
 msgstr ""
@@ -3211,13 +3231,13 @@
 msgid "Scan Mode Group"
 msgstr ""
 
-#: backend/hp3900_sane.c:427 backend/hp3900_sane.c:1019
-#: backend/hp-option.c:3174
+#: backend/hp-option.c:3177 backend/hp3900_sane.c:432
+#: backend/hp3900_sane.c:1024
 #, no-c-format
 msgid "Slide"
 msgstr ""
 
-#: backend/hp3900_sane.c:1405
+#: backend/hp3900_sane.c:1410
 #, no-c-format
 msgid "Scanner model"
 msgstr ""
@@ -3232,42 +3252,42 @@
 msgid "Image colours will be inverted"
 msgstr ""
 
-#: backend/hp3900_sane.c:1436
+#: backend/hp3900_sane.c:1441
 #, no-c-format
 msgid "Disable gamma correction"
 msgstr ""
 
-#: backend/hp3900_sane.c:1437
+#: backend/hp3900_sane.c:1442
 #, no-c-format
 msgid "Gamma correction will be disabled"
 msgstr ""
 
-#: backend/hp3900_sane.c:1451
+#: backend/hp3900_sane.c:1456
 #, no-c-format
 msgid "Disable white shading correction"
 msgstr ""
 
-#: backend/hp3900_sane.c:1453
+#: backend/hp3900_sane.c:1458
 #, no-c-format
 msgid "White shading correction will be disabled"
 msgstr ""
 
-#: backend/hp3900_sane.c:1467
+#: backend/hp3900_sane.c:1472
 #, no-c-format
 msgid "Skip warmup process"
 msgstr ""
 
-#: backend/hp3900_sane.c:1468
+#: backend/hp3900_sane.c:1473
 #, no-c-format
 msgid "Warmup process will be disabled"
 msgstr ""
 
-#: backend/hp3900_sane.c:1482
+#: backend/hp3900_sane.c:1487
 #, no-c-format
 msgid "Force real depth"
 msgstr ""
 
-#: backend/hp3900_sane.c:1485
+#: backend/hp3900_sane.c:1490
 #, no-c-format
 msgid ""
 "If gamma is enabled, scans are always made in 16 bits depth to improve image "
@@ -3275,293 +3295,294 @@
 "emulation."
 msgstr ""
 
-#: backend/hp3900_sane.c:1499
+#: backend/hp3900_sane.c:1504
 #, no-c-format
 msgid "Emulate Grayscale"
 msgstr ""
 
-#: backend/hp3900_sane.c:1502
+#: backend/hp3900_sane.c:1507
 #, no-c-format
 msgid ""
 "If enabled, image will be scanned in color mode and then converted to "
 "grayscale by software. This may improve image quality in some circumstances."
 msgstr ""
 
-#: backend/hp3900_sane.c:1516
+#: backend/hp3900_sane.c:1521
 #, no-c-format
 msgid "Save debugging images"
 msgstr ""
 
-#: backend/hp3900_sane.c:1519
+#: backend/hp3900_sane.c:1524
 #, no-c-format
 msgid ""
 "If enabled, some images involved in scanner processing are saved to analyze "
 "them."
 msgstr ""
 
-#: backend/hp3900_sane.c:1533
+#: backend/hp3900_sane.c:1538
 #, no-c-format
 msgid "Reset chipset"
 msgstr ""
 
-#: backend/hp3900_sane.c:1534
+#: backend/hp3900_sane.c:1539
 #, no-c-format
 msgid "Resets chipset data"
 msgstr ""
 
-#: backend/hp3900_sane.c:1547
+#: backend/hp3900_sane.c:1552
 #, no-c-format
 msgid "Information"
 msgstr ""
 
-#: backend/hp3900_sane.c:1560
+#: backend/hp3900_sane.c:1565
 #, no-c-format
 msgid "Chipset name"
 msgstr ""
 
-#: backend/hp3900_sane.c:1561
+#: backend/hp3900_sane.c:1566
 #, no-c-format
 msgid "Shows chipset name used in device."
 msgstr ""
 
-#: backend/hp3900_sane.c:1565
+#: backend/hp3900_sane.c:1570
 #, no-c-format
 msgid "Unknown"
 msgstr ""
 
-#: backend/hp3900_sane.c:1571
+#: backend/hp3900_sane.c:1576
 #, no-c-format
 msgid "Chipset ID"
 msgstr ""
 
-#: backend/hp3900_sane.c:1572
+#: backend/hp3900_sane.c:1577
 #, no-c-format
 msgid "Shows the chipset ID"
 msgstr ""
 
-#: backend/hp3900_sane.c:1582
+#: backend/hp3900_sane.c:1587
 #, no-c-format
 msgid "Scan counter"
 msgstr ""
 
-#: backend/hp3900_sane.c:1584
+#: backend/hp3900_sane.c:1589
 #, no-c-format
 msgid "Shows the number of scans made by scanner"
 msgstr ""
 
-#: backend/hp3900_sane.c:1594
+#: backend/hp3900_sane.c:1599
 #, no-c-format
 msgid "Update information"
 msgstr ""
 
-#: backend/hp3900_sane.c:1595
+#: backend/hp3900_sane.c:1600
 #, no-c-format
 msgid "Updates information about device"
 msgstr ""
 
-#: backend/hp3900_sane.c:1635
+#: backend/hp3900_sane.c:1640
 #, no-c-format
 msgid "This option reflects a front panel scanner button"
 msgstr ""
 
-#: backend/hp5400_sane.c:313 backend/niash.c:678
+#: backend/hp5400_sane.c:316 backend/niash.c:678
 #, no-c-format
 msgid "Image"
 msgstr ""
 
-#: backend/hp5400_sane.c:352 backend/niash.c:709
+#: backend/hp5400_sane.c:355 backend/niash.c:709
 #, no-c-format
 msgid "Miscellaneous"
 msgstr ""
 
-#: backend/hp5400_sane.c:358
+#: backend/hp5400_sane.c:361
 #, no-c-format
 msgid "offset X"
 msgstr ""
 
-#: backend/hp5400_sane.c:359
+#: backend/hp5400_sane.c:362
 #, no-c-format
 msgid "Hardware internal X position of the scanning area."
 msgstr ""
 
-#: backend/hp5400_sane.c:368
+#: backend/hp5400_sane.c:371
 #, no-c-format
 msgid "offset Y"
 msgstr ""
 
-#: backend/hp5400_sane.c:369
+#: backend/hp5400_sane.c:372
 #, no-c-format
 msgid "Hardware internal Y position of the scanning area."
 msgstr ""
 
-#: backend/hp5400_sane.c:381 backend/niash.c:716
+#: backend/hp5400_sane.c:384 backend/niash.c:716
 #, no-c-format
 msgid "Lamp status"
 msgstr ""
 
-#: backend/hp5400_sane.c:382 backend/niash.c:717
+#: backend/hp5400_sane.c:385 backend/niash.c:717
 #, no-c-format
 msgid "Switches the lamp on or off."
 msgstr ""
 
-#: backend/hp5400_sane.c:393 backend/niash.c:727
+#: backend/hp5400_sane.c:396 backend/niash.c:727
 #, no-c-format
 msgid "Calibrates for black and white level."
 msgstr ""
 
-#: backend/hp5590.c:86 backend/hp-option.c:3253
+#: backend/hp-option.c:3256 backend/hp5590.c:93
 #, no-c-format
 msgid "ADF"
 msgstr ""
 
-#: backend/hp5590.c:88
+#: backend/hp5590.c:95
 #, no-c-format
 msgid "TMA Slides"
 msgstr ""
 
-#: backend/hp5590.c:89
+#: backend/hp5590.c:96
 #, no-c-format
 msgid "TMA Negatives"
 msgstr ""
 
-#: backend/hp5590.c:92
+#: backend/hp5590.c:108
 #, no-c-format
 msgid "Color (48 bits)"
 msgstr ""
 
-#: backend/hp5590.c:95
+#: backend/hp5590.c:112
 #, no-c-format
 msgid "Extend lamp timeout"
 msgstr ""
 
-#: backend/hp5590.c:96
+#: backend/hp5590.c:113
 #, no-c-format
 msgid "Extends lamp timeout (from 15 minutes to 1 hour)"
 msgstr ""
 
-#: backend/hp5590.c:98
+#: backend/hp5590.c:115
 #, no-c-format
 msgid "Wait for button"
 msgstr ""
 
-#: backend/hp5590.c:99
+#: backend/hp5590.c:116
 #, no-c-format
 msgid "Waits for button before scanning"
 msgstr ""
 
-#: backend/hp-option.c:2984
+#: backend/hp-option.c:2987
 #, no-c-format
 msgid "Advanced Options"
 msgstr ""
 
-#: backend/hp-option.c:3041
+#: backend/hp-option.c:3044
 #, no-c-format
 msgid "Coarse"
 msgstr ""
 
-#: backend/hp-option.c:3042
+#: backend/hp-option.c:3045
 #, no-c-format
 msgid "Fine"
 msgstr ""
 
-#: backend/hp-option.c:3043
+#: backend/hp-option.c:3046
 #, no-c-format
 msgid "Bayer"
 msgstr ""
 
-#: backend/hp-option.c:3046 backend/hp-option.c:3097
+#: backend/hp-option.c:3049 backend/hp-option.c:3100
 #, no-c-format
 msgid "Custom"
 msgstr ""
 
-#: backend/hp-option.c:3087 backend/hp-option.c:3143 backend/hp-option.c:3158
+#: backend/hp-option.c:3090 backend/hp-option.c:3146
+#: backend/hp-option.c:3161
 #, no-c-format
 msgid "Auto"
 msgstr ""
 
-#: backend/hp-option.c:3088
+#: backend/hp-option.c:3091
 #, no-c-format
 msgid "NTSC RGB"
 msgstr ""
 
-#: backend/hp-option.c:3089
+#: backend/hp-option.c:3092
 #, no-c-format
 msgid "XPA RGB"
 msgstr ""
 
-#: backend/hp-option.c:3090
+#: backend/hp-option.c:3093
 #, no-c-format
 msgid "Pass-through"
 msgstr ""
 
-#: backend/hp-option.c:3091
+#: backend/hp-option.c:3094
 #, no-c-format
 msgid "NTSC Gray"
 msgstr ""
 
-#: backend/hp-option.c:3092
+#: backend/hp-option.c:3095
 #, no-c-format
 msgid "XPA Gray"
 msgstr ""
 
-#: backend/hp-option.c:3144
+#: backend/hp-option.c:3147
 #, no-c-format
 msgid "Slow"
 msgstr ""
 
-#: backend/hp-option.c:3145 backend/hp-option.c:3252 backend/kvs40xx_opt.c:230
-#: backend/matsushita.c:244 backend/mustek.c:149 backend/plustek.c:234
-#: backend/plustek_pp.c:203 backend/u12.c:155
+#: backend/hp-option.c:3148 backend/hp-option.c:3255
+#: backend/kvs40xx_opt.c:230 backend/matsushita.c:248 backend/mustek.c:149
+#: backend/plustek.c:234 backend/plustek_pp.c:203 backend/u12.c:155
 #, no-c-format
 msgid "Normal"
 msgstr ""
 
-#: backend/hp-option.c:3146
+#: backend/hp-option.c:3149
 #, no-c-format
 msgid "Fast"
 msgstr ""
 
-#: backend/hp-option.c:3147
+#: backend/hp-option.c:3150
 #, no-c-format
 msgid "Extra Fast"
 msgstr ""
 
-#: backend/hp-option.c:3160
+#: backend/hp-option.c:3163
 #, no-c-format
 msgid "2-pixel"
 msgstr ""
 
-#: backend/hp-option.c:3161
+#: backend/hp-option.c:3164
 #, no-c-format
 msgid "4-pixel"
 msgstr ""
 
-#: backend/hp-option.c:3162
+#: backend/hp-option.c:3165
 #, no-c-format
 msgid "8-pixel"
 msgstr ""
 
-#: backend/hp-option.c:3173
+#: backend/hp-option.c:3176
 #, no-c-format
 msgid "Print"
 msgstr ""
 
-#: backend/hp-option.c:3175
+#: backend/hp-option.c:3178
 #, no-c-format
 msgid "Film-strip"
 msgstr ""
 
-#: backend/hp-option.c:3254
+#: backend/hp-option.c:3257
 #, no-c-format
 msgid "XPA"
 msgstr ""
 
-#: backend/hp-option.c:3328 backend/hp-option.c:3341
+#: backend/hp-option.c:3331 backend/hp-option.c:3344
 #, no-c-format
 msgid "Conditional"
 msgstr ""
 
-#: backend/hp-option.c:3414
+#: backend/hp-option.c:3417
 #, no-c-format
 msgid "Experiment"
 msgstr ""
@@ -3819,46 +3840,51 @@
 msgid "adf"
 msgstr ""
 
-#: backend/kvs1025_opt.c:62 backend/kvs40xx_opt.c:50 backend/kvs40xx_opt.c:109
+#: backend/kvs1025_opt.c:62 backend/kvs40xx_opt.c:50
+#: backend/kvs40xx_opt.c:109
 #, no-c-format
 msgid "fb"
 msgstr ""
 
-#: backend/kvs1025_opt.c:72 backend/kvs20xx_opt.c:55 backend/kvs40xx_opt.c:101
+#: backend/kvs1025_opt.c:72 backend/kvs20xx_opt.c:55
+#: backend/kvs40xx_opt.c:101
 #, no-c-format
 msgid "single"
 msgstr ""
 
 #: backend/kvs1025_opt.c:73 backend/kvs20xx.c:462 backend/kvs20xx_opt.c:56
-#: backend/kvs40xx.c:704 backend/kvs40xx.c:722 backend/kvs40xx_opt.c:102
+#: backend/kvs40xx.c:705 backend/kvs40xx.c:723 backend/kvs40xx_opt.c:102
 #: backend/kvs40xx_opt.c:1087
 #, no-c-format
 msgid "continuous"
 msgstr ""
 
-#: backend/kvs1025_opt.c:83 backend/kvs20xx_opt.c:62 backend/kvs40xx_opt.c:115
+#: backend/kvs1025_opt.c:83 backend/kvs20xx_opt.c:62
+#: backend/kvs40xx_opt.c:115
 #, no-c-format
 msgid "off"
 msgstr ""
 
-#: backend/kvs1025_opt.c:84 backend/kvs20xx_opt.c:63 backend/kvs40xx_opt.c:116
+#: backend/kvs1025_opt.c:84 backend/kvs20xx_opt.c:63
+#: backend/kvs40xx_opt.c:116
 #, no-c-format
 msgid "wait_doc"
 msgstr ""
 
-#: backend/kvs1025_opt.c:85 backend/kvs20xx_opt.c:64 backend/kvs40xx_opt.c:118
+#: backend/kvs1025_opt.c:85 backend/kvs20xx_opt.c:64
+#: backend/kvs40xx_opt.c:118
 #, no-c-format
 msgid "wait_key"
 msgstr ""
 
-#: backend/kvs1025_opt.c:96 backend/kvs20xx_opt.c:70 backend/kvs40xx_opt.c:124
-#: backend/kvs40xx_opt.c:141
+#: backend/kvs1025_opt.c:96 backend/kvs20xx_opt.c:70
+#: backend/kvs40xx_opt.c:124 backend/kvs40xx_opt.c:141
 #, no-c-format
 msgid "user_def"
 msgstr ""
 
-#: backend/kvs1025_opt.c:97 backend/kvs20xx_opt.c:71 backend/kvs40xx_opt.c:125
-#: backend/kvs40xx_opt.c:142
+#: backend/kvs1025_opt.c:97 backend/kvs20xx_opt.c:71
+#: backend/kvs40xx_opt.c:125 backend/kvs40xx_opt.c:142
 #, no-c-format
 msgid "business_card"
 msgstr ""
@@ -3899,96 +3925,96 @@
 msgid "Legal"
 msgstr ""
 
-#: backend/kvs1025_opt.c:149 backend/kvs40xx_opt.c:239
+#: backend/kvs1025_opt.c:148 backend/kvs40xx_opt.c:239
 #, no-c-format
 msgid "bayer_64"
 msgstr ""
 
-#: backend/kvs1025_opt.c:150 backend/kvs40xx_opt.c:240
+#: backend/kvs1025_opt.c:149 backend/kvs40xx_opt.c:240
 #, no-c-format
 msgid "bayer_16"
 msgstr ""
 
-#: backend/kvs1025_opt.c:151 backend/kvs40xx_opt.c:241
+#: backend/kvs1025_opt.c:150 backend/kvs40xx_opt.c:241
 #, no-c-format
 msgid "halftone_32"
 msgstr ""
 
-#: backend/kvs1025_opt.c:152 backend/kvs40xx_opt.c:242
+#: backend/kvs1025_opt.c:151 backend/kvs40xx_opt.c:242
 #, no-c-format
 msgid "halftone_64"
 msgstr ""
 
-#: backend/kvs1025_opt.c:153
+#: backend/kvs1025_opt.c:152
 #, no-c-format
 msgid "diffusion"
 msgstr ""
 
-#: backend/kvs1025_opt.c:166 backend/kvs1025_opt.c:228
-#: backend/kvs1025_opt.c:241 backend/kvs20xx_opt.c:129
+#: backend/kvs1025_opt.c:165 backend/kvs1025_opt.c:227
+#: backend/kvs1025_opt.c:240 backend/kvs20xx_opt.c:129
 #: backend/kvs20xx_opt.c:137 backend/kvs40xx_opt.c:215
 #: backend/kvs40xx_opt.c:223 backend/kvs40xx_opt.c:258
 #, no-c-format
 msgid "normal"
 msgstr ""
 
-#: backend/kvs1025_opt.c:167 backend/kvs40xx_opt.c:259
+#: backend/kvs1025_opt.c:166 backend/kvs40xx_opt.c:259
 #, no-c-format
 msgid "light"
 msgstr ""
 
-#: backend/kvs1025_opt.c:168 backend/kvs40xx_opt.c:260
+#: backend/kvs1025_opt.c:167 backend/kvs40xx_opt.c:260
 #, no-c-format
 msgid "dark"
 msgstr ""
 
-#: backend/kvs1025_opt.c:179 backend/kvs40xx_opt.c:271
+#: backend/kvs1025_opt.c:178 backend/kvs40xx_opt.c:271
 #, no-c-format
 msgid "From scanner"
 msgstr ""
 
-#: backend/kvs1025_opt.c:180 backend/kvs40xx_opt.c:272
-#: backend/matsushita.c:177
+#: backend/kvs1025_opt.c:179 backend/kvs40xx_opt.c:272
+#: backend/matsushita.c:181
 #, no-c-format
 msgid "From paper"
 msgstr ""
 
-#: backend/kvs1025_opt.c:192 backend/kvs40xx_opt.c:284
+#: backend/kvs1025_opt.c:191 backend/kvs40xx_opt.c:284
 #, no-c-format
 msgid "default"
 msgstr ""
 
-#: backend/kvs1025_opt.c:211 backend/kvs20xx_opt.c:123
+#: backend/kvs1025_opt.c:210 backend/kvs20xx_opt.c:123
 #: backend/kvs40xx_opt.c:209
 #, no-c-format
 msgid "smooth"
 msgstr ""
 
-#: backend/kvs1025_opt.c:212 backend/kvs20xx_opt.c:119
+#: backend/kvs1025_opt.c:211 backend/kvs20xx_opt.c:119
 #: backend/kvs40xx_opt.c:205
 #, no-c-format
 msgid "none"
 msgstr ""
 
-#: backend/kvs1025_opt.c:213 backend/kvs20xx_opt.c:120
+#: backend/kvs1025_opt.c:212 backend/kvs20xx_opt.c:120
 #: backend/kvs40xx_opt.c:206
 #, no-c-format
 msgid "low"
 msgstr ""
 
-#: backend/kvs1025_opt.c:214 backend/kvs1025_opt.c:804
+#: backend/kvs1025_opt.c:213 backend/kvs1025_opt.c:803
 #: backend/kvs20xx_opt.c:121 backend/kvs40xx_opt.c:207
 #, no-c-format
 msgid "medium"
 msgstr ""
 
-#: backend/kvs1025_opt.c:215 backend/kvs20xx_opt.c:122
+#: backend/kvs1025_opt.c:214 backend/kvs20xx_opt.c:122
 #: backend/kvs40xx_opt.c:208
 #, no-c-format
 msgid "high"
 msgstr ""
 
-#: backend/kvs1025_opt.c:229 backend/kvs20xx_opt.c:130
+#: backend/kvs1025_opt.c:228 backend/kvs20xx_opt.c:130
 #: backend/kvs40xx_opt.c:216
 #, no-c-format
 msgid "crt"
@@ -3999,194 +4025,194 @@
 msgid "linier"
 msgstr ""
 
-#: backend/kvs1025_opt.c:242 backend/kvs20xx_opt.c:138
+#: backend/kvs1025_opt.c:241 backend/kvs20xx_opt.c:138
 #: backend/kvs40xx_opt.c:224
 #, no-c-format
 msgid "red"
 msgstr ""
 
-#: backend/kvs1025_opt.c:243 backend/kvs20xx_opt.c:139
+#: backend/kvs1025_opt.c:242 backend/kvs20xx_opt.c:139
 #: backend/kvs40xx_opt.c:225
 #, no-c-format
 msgid "green"
 msgstr ""
 
-#: backend/kvs1025_opt.c:244 backend/kvs20xx_opt.c:140
+#: backend/kvs1025_opt.c:243 backend/kvs20xx_opt.c:140
 #: backend/kvs40xx_opt.c:226
 #, no-c-format
 msgid "blue"
 msgstr ""
 
-#: backend/kvs1025_opt.c:562
+#: backend/kvs1025_opt.c:561
 #, no-c-format
 msgid "Sets the scan source"
 msgstr ""
 
-#: backend/kvs1025_opt.c:573 backend/kvs20xx_opt.c:218
-#: backend/kvs40xx_opt.c:367 backend/matsushita.c:1126
+#: backend/kvs1025_opt.c:572 backend/kvs20xx_opt.c:218
+#: backend/kvs40xx_opt.c:367 backend/matsushita.c:1130
 #, no-c-format
 msgid "Feeder mode"
 msgstr ""
 
-#: backend/kvs1025_opt.c:574 backend/kvs20xx_opt.c:219
-#: backend/kvs40xx_opt.c:368 backend/matsushita.c:1127
+#: backend/kvs1025_opt.c:573 backend/kvs20xx_opt.c:219
+#: backend/kvs40xx_opt.c:368 backend/matsushita.c:1131
 #, no-c-format
 msgid "Sets the feeding mode"
 msgstr ""
 
-#: backend/kvs1025_opt.c:584
+#: backend/kvs1025_opt.c:583
 #, no-c-format
 msgid "Enable/Disable long paper mode"
 msgstr ""
 
-#: backend/kvs1025_opt.c:593
+#: backend/kvs1025_opt.c:592
 #, no-c-format
 msgid "Enable/Disable length control mode"
 msgstr ""
 
-#: backend/kvs1025_opt.c:601 backend/kvs20xx_opt.c:243
+#: backend/kvs1025_opt.c:600 backend/kvs20xx_opt.c:243
 #: backend/kvs40xx_opt.c:417
 #, no-c-format
 msgid "Sets the manual feed mode"
 msgstr ""
 
-#: backend/kvs1025_opt.c:612 backend/kvs20xx_opt.c:255
+#: backend/kvs1025_opt.c:611 backend/kvs20xx_opt.c:255
 #: backend/kvs40xx_opt.c:429
 #, no-c-format
 msgid "Sets the manual feed timeout in seconds"
 msgstr ""
 
-#: backend/kvs1025_opt.c:625 backend/kvs20xx_opt.c:268
+#: backend/kvs1025_opt.c:624 backend/kvs20xx_opt.c:268
 #: backend/kvs40xx_opt.c:442
 #, no-c-format
 msgid "Enable/Disable double feed detection"
 msgstr ""
 
-#: backend/kvs1025_opt.c:631 backend/kvs20xx_opt.c:276
+#: backend/kvs1025_opt.c:630 backend/kvs20xx_opt.c:276
 #: backend/kvs40xx_opt.c:497
 #, no-c-format
 msgid "fit-to-page"
 msgstr ""
 
-#: backend/kvs1025_opt.c:632 backend/kvs20xx_opt.c:277
+#: backend/kvs1025_opt.c:631 backend/kvs20xx_opt.c:277
 #: backend/kvs40xx_opt.c:498
 #, no-c-format
 msgid "Fit to page"
 msgstr ""
 
-#: backend/kvs1025_opt.c:634 backend/kvs20xx_opt.c:278
+#: backend/kvs1025_opt.c:633 backend/kvs20xx_opt.c:278
 #: backend/kvs40xx_opt.c:499
 #, no-c-format
 msgid "Scanner shrinks image to fit scanned page"
 msgstr ""
 
-#: backend/kvs1025_opt.c:661 backend/kvs20xx_opt.c:309
+#: backend/kvs1025_opt.c:660 backend/kvs20xx_opt.c:309
 #: backend/kvs40xx_opt.c:533
 #, no-c-format
 msgid "Set paper position : true for landscape, false for portrait"
 msgstr ""
 
-#: backend/kvs1025_opt.c:735 backend/matsushita.c:1224
+#: backend/kvs1025_opt.c:734 backend/matsushita.c:1228
 #, no-c-format
 msgid "Automatic threshold"
 msgstr ""
 
-#: backend/kvs1025_opt.c:738 backend/matsushita.c:1227
+#: backend/kvs1025_opt.c:737 backend/matsushita.c:1231
 #, no-c-format
 msgid ""
 "Automatically sets brightness, contrast, white level, gamma, noise reduction "
 "and image emphasis"
 msgstr ""
 
-#: backend/kvs1025_opt.c:783 backend/kvs40xx_opt.c:764
-#: backend/matsushita.c:1275
+#: backend/kvs1025_opt.c:782 backend/kvs40xx_opt.c:764
+#: backend/matsushita.c:1279
 #, no-c-format
 msgid "Noise reduction"
 msgstr ""
 
-#: backend/kvs1025_opt.c:785 backend/kvs40xx_opt.c:765
-#: backend/matsushita.c:1277
+#: backend/kvs1025_opt.c:784 backend/kvs40xx_opt.c:765
+#: backend/matsushita.c:1281
 #, no-c-format
 msgid "Reduce the isolated dot noise"
 msgstr ""
 
-#: backend/kvs1025_opt.c:796 backend/kvs20xx_opt.c:412
-#: backend/kvs40xx_opt.c:655 backend/matsushita.c:1288
+#: backend/kvs1025_opt.c:795 backend/kvs20xx_opt.c:412
+#: backend/kvs40xx_opt.c:655 backend/matsushita.c:1292
 #, no-c-format
 msgid "Image emphasis"
 msgstr ""
 
-#: backend/kvs1025_opt.c:797 backend/kvs20xx_opt.c:413
-#: backend/kvs40xx_opt.c:656 backend/matsushita.c:1289
+#: backend/kvs1025_opt.c:796 backend/kvs20xx_opt.c:413
+#: backend/kvs40xx_opt.c:656 backend/matsushita.c:1293
 #, no-c-format
 msgid "Sets the image emphasis"
 msgstr ""
 
-#: backend/kvs1025_opt.c:808 backend/kvs1025_opt.c:809
-#: backend/matsushita.c:1300 backend/matsushita.c:1301
-#: backend/pixma_sane_options.c:112
+#: backend/kvs1025_opt.c:807 backend/kvs1025_opt.c:808
+#: backend/matsushita.c:1304 backend/matsushita.c:1305
+#: backend/pixma/pixma_sane_options.c:112
 #, no-c-format
 msgid "Gamma"
 msgstr ""
 
-#: backend/kvs1025_opt.c:818 backend/kvs20xx_opt.c:436
+#: backend/kvs1025_opt.c:817 backend/kvs20xx_opt.c:436
 #: backend/kvs40xx_opt.c:681
 #, no-c-format
 msgid "Lamp color"
 msgstr ""
 
-#: backend/kvs1025_opt.c:819 backend/kvs20xx_opt.c:437
+#: backend/kvs1025_opt.c:818 backend/kvs20xx_opt.c:437
 #: backend/kvs40xx_opt.c:682
 #, no-c-format
 msgid "Sets the lamp color (color dropout)"
 msgstr ""
 
-#: backend/kvs1025_opt.c:832
+#: backend/kvs1025_opt.c:831
 #, no-c-format
 msgid "Inverse image in B/W or halftone mode"
 msgstr ""
 
-#: backend/kvs1025_opt.c:840
+#: backend/kvs1025_opt.c:839
 #, no-c-format
 msgid "Mirror image (left/right flip)"
 msgstr ""
 
-#: backend/kvs1025_opt.c:847
+#: backend/kvs1025_opt.c:846
 #, no-c-format
 msgid "jpeg compression"
 msgstr ""
 
-#: backend/kvs1025_opt.c:850
+#: backend/kvs1025_opt.c:849
 #, no-c-format
 msgid "JPEG Image Compression with Q parameter, '0' - no compression"
 msgstr ""
 
-#: backend/kvs1025_opt.c:860
+#: backend/kvs1025_opt.c:859
 #, no-c-format
 msgid "Rotate image clockwise"
 msgstr ""
 
-#: backend/kvs1025_opt.c:862
+#: backend/kvs1025_opt.c:861
 #, no-c-format
 msgid "Request driver to rotate pages by a fixed amount"
 msgstr ""
 
-#: backend/kvs1025_opt.c:874
+#: backend/kvs1025_opt.c:873
 #, no-c-format
 msgid "Request driver to rotate skewed pages digitally"
 msgstr ""
 
-#: backend/kvs1025_opt.c:883
+#: backend/kvs1025_opt.c:882
 #, no-c-format
 msgid "Maximum diameter of lone dots to remove from scan"
 msgstr ""
 
-#: backend/kvs1025_opt.c:902
+#: backend/kvs1025_opt.c:901
 #, no-c-format
 msgid "Software automatic cropping"
 msgstr ""
 
-#: backend/kvs1025_opt.c:904
+#: backend/kvs1025_opt.c:903
 #, no-c-format
 msgid "Request driver to remove border from pages digitally"
 msgstr ""
@@ -4199,7 +4225,8 @@
 msgstr ""
 
 #: backend/kvs20xx_opt.c:424 backend/kvs20xx_opt.c:425
-#: backend/kvs40xx_opt.c:668 backend/kvs40xx_opt.c:669 backend/microtek2.h:640
+#: backend/kvs40xx_opt.c:668 backend/kvs40xx_opt.c:669
+#: backend/microtek2.h:640
 #, no-c-format
 msgid "Gamma correction"
 msgstr ""
@@ -4381,162 +4408,163 @@
 msgid "Addition of space in bottom position"
 msgstr ""
 
-#: backend/leo.c:110
+#: backend/leo.c:114
 #, no-c-format
 msgid "Diamond"
 msgstr ""
 
-#: backend/leo.c:111
+#: backend/leo.c:115
 #, no-c-format
 msgid "8x8 Coarse Fatting"
 msgstr ""
 
-#: backend/leo.c:112
+#: backend/leo.c:116
 #, no-c-format
 msgid "8x8 Fine Fatting"
 msgstr ""
 
-#: backend/leo.c:113
+#: backend/leo.c:117
 #, no-c-format
 msgid "8x8 Bayer"
 msgstr ""
 
-#: backend/leo.c:114
+#: backend/leo.c:118
 #, no-c-format
 msgid "8x8 Vertical Line"
 msgstr ""
 
-#: backend/lexmark.c:273 backend/umax_pp.c:715
+#: backend/lexmark.c:277 backend/umax_pp.c:705
 #, no-c-format
 msgid "Gain"
 msgstr ""
 
-#: backend/lexmark.c:274 backend/umax_pp.c:716
+#: backend/lexmark.c:278 backend/umax_pp.c:706
 #, no-c-format
 msgid "Color channels gain settings"
 msgstr ""
 
-#: backend/lexmark.c:283 backend/umax_pp.c:723
+#: backend/lexmark.c:287 backend/umax_pp.c:713
 #, no-c-format
 msgid "Gray gain"
 msgstr ""
 
-#: backend/lexmark.c:284 backend/umax_pp.c:724
+#: backend/lexmark.c:288 backend/umax_pp.c:714
 #, no-c-format
 msgid "Sets gray channel gain"
 msgstr ""
 
-#: backend/lexmark.c:297 backend/plustek.c:1001 backend/umax_pp.c:735
+#: backend/lexmark.c:301 backend/plustek.c:1001 backend/umax_pp.c:725
 #, no-c-format
 msgid "Red gain"
 msgstr ""
 
-#: backend/lexmark.c:298 backend/umax_pp.c:736
+#: backend/lexmark.c:302 backend/umax_pp.c:726
 #, no-c-format
 msgid "Sets red channel gain"
 msgstr ""
 
-#: backend/lexmark.c:311 backend/plustek.c:1017 backend/umax_pp.c:747
+#: backend/lexmark.c:315 backend/plustek.c:1017 backend/umax_pp.c:737
 #, no-c-format
 msgid "Green gain"
 msgstr ""
 
-#: backend/lexmark.c:312 backend/umax_pp.c:748
+#: backend/lexmark.c:316 backend/umax_pp.c:738
 #, no-c-format
 msgid "Sets green channel gain"
 msgstr ""
 
-#: backend/lexmark.c:325 backend/plustek.c:1033 backend/umax_pp.c:759
+#: backend/lexmark.c:329 backend/plustek.c:1033 backend/umax_pp.c:749
 #, no-c-format
 msgid "Blue gain"
 msgstr ""
 
-#: backend/lexmark.c:326 backend/umax_pp.c:760
+#: backend/lexmark.c:330 backend/umax_pp.c:750
 #, no-c-format
 msgid "Sets blue channel gain"
 msgstr ""
 
-#: backend/matsushita.c:139
+#: backend/matsushita.c:143
 #, no-c-format
 msgid "Bayer Dither 16"
 msgstr ""
 
-#: backend/matsushita.c:140
+#: backend/matsushita.c:144
 #, no-c-format
 msgid "Bayer Dither 64"
 msgstr ""
 
-#: backend/matsushita.c:141
+#: backend/matsushita.c:145
 #, no-c-format
 msgid "Halftone Dot 32"
 msgstr ""
 
-#: backend/matsushita.c:142
+#: backend/matsushita.c:146
 #, no-c-format
 msgid "Halftone Dot 64"
 msgstr ""
 
-#: backend/matsushita.c:143
+#: backend/matsushita.c:147
 #, no-c-format
 msgid "Error Diffusion"
 msgstr ""
 
-#: backend/matsushita.c:160
+#: backend/matsushita.c:164
 #, no-c-format
 msgid "Mode 1"
 msgstr ""
 
-#: backend/matsushita.c:161
+#: backend/matsushita.c:165
 #, no-c-format
 msgid "Mode 2"
 msgstr ""
 
-#: backend/matsushita.c:162
+#: backend/matsushita.c:166
 #, no-c-format
 msgid "Mode 3"
 msgstr ""
 
-#: backend/matsushita.c:176
+#: backend/matsushita.c:180
 #, no-c-format
 msgid "From white stick"
 msgstr ""
 
-#: backend/matsushita.c:212
+#: backend/matsushita.c:216
 #, no-c-format
 msgid "Smooth"
 msgstr ""
 
-#: backend/matsushita.c:214 backend/matsushita.c:229
+#: backend/matsushita.c:218 backend/matsushita.c:233
 #, no-c-format
 msgid "Low"
 msgstr ""
 
-#: backend/matsushita.c:215 backend/matsushita.c:230 backend/matsushita.c:1296
+#: backend/matsushita.c:219 backend/matsushita.c:234
+#: backend/matsushita.c:1300
 #, no-c-format
 msgid "Medium"
 msgstr ""
 
-#: backend/matsushita.c:216 backend/matsushita.c:231
+#: backend/matsushita.c:220 backend/matsushita.c:235
 #, no-c-format
 msgid "High"
 msgstr ""
 
-#: backend/matsushita.c:245
+#: backend/matsushita.c:249
 #, no-c-format
 msgid "CRT"
 msgstr ""
 
-#: backend/matsushita.c:257
+#: backend/matsushita.c:261
 #, no-c-format
 msgid "One page"
 msgstr ""
 
-#: backend/matsushita.c:258
+#: backend/matsushita.c:262
 #, no-c-format
 msgid "All pages"
 msgstr ""
 
-#: backend/matsushita.c:1034 backend/plustek.c:1333
+#: backend/matsushita.c:1038 backend/p5_device.c:13 backend/plustek.c:1333
 #, no-c-format
 msgid "sheetfed scanner"
 msgstr ""
@@ -4894,99 +4922,99 @@
 msgid "2x2 custom"
 msgstr ""
 
-#: backend/mustek.c:4235
+#: backend/mustek.c:4247
 #, no-c-format
 msgid "Fast gray mode"
 msgstr ""
 
-#: backend/mustek.c:4236
+#: backend/mustek.c:4248
 #, no-c-format
 msgid "Scan in fast gray mode (lower quality)."
 msgstr ""
 
-#: backend/mustek.c:4333
+#: backend/mustek.c:4345
 #, no-c-format
 msgid ""
 "Request that all previews are done in the fastest (low-quality) mode. This "
 "may be a non-color mode or a low resolution mode."
 msgstr ""
 
-#: backend/mustek.c:4341
+#: backend/mustek.c:4353
 #, no-c-format
 msgid "Lamp off time (minutes)"
 msgstr ""
 
-#: backend/mustek.c:4342
+#: backend/mustek.c:4354
 #, no-c-format
 msgid "Set the time (in minutes) after which the lamp is shut off."
 msgstr ""
 
-#: backend/mustek.c:4353
+#: backend/mustek.c:4365
 #, no-c-format
 msgid "Turn lamp off"
 msgstr ""
 
-#: backend/mustek.c:4354
+#: backend/mustek.c:4366
 #, no-c-format
 msgid "Turns the lamp off immediately."
 msgstr ""
 
-#: backend/mustek.c:4431
+#: backend/mustek.c:4443
 #, no-c-format
 msgid "Red brightness"
 msgstr ""
 
-#: backend/mustek.c:4432
+#: backend/mustek.c:4444
 #, no-c-format
 msgid "Controls the brightness of the red channel of the acquired image."
 msgstr ""
 
-#: backend/mustek.c:4444
+#: backend/mustek.c:4456
 #, no-c-format
 msgid "Green brightness"
 msgstr ""
 
-#: backend/mustek.c:4445
+#: backend/mustek.c:4457
 #, no-c-format
 msgid "Controls the brightness of the green channel of the acquired image."
 msgstr ""
 
-#: backend/mustek.c:4457
+#: backend/mustek.c:4469
 #, no-c-format
 msgid "Blue brightness"
 msgstr ""
 
-#: backend/mustek.c:4458
+#: backend/mustek.c:4470
 #, no-c-format
 msgid "Controls the brightness of the blue channel of the acquired image."
 msgstr ""
 
-#: backend/mustek.c:4483
+#: backend/mustek.c:4495
 #, no-c-format
 msgid "Contrast red channel"
 msgstr ""
 
-#: backend/mustek.c:4484
+#: backend/mustek.c:4496
 #, no-c-format
 msgid "Controls the contrast of the red channel of the acquired image."
 msgstr ""
 
-#: backend/mustek.c:4496
+#: backend/mustek.c:4508
 #, no-c-format
 msgid "Contrast green channel"
 msgstr ""
 
-#: backend/mustek.c:4497
+#: backend/mustek.c:4509
 #, no-c-format
 msgid "Controls the contrast of the green channel of the acquired image."
 msgstr ""
 
-#: backend/mustek.c:4509
+#: backend/mustek.c:4521
 #, no-c-format
 msgid "Contrast blue channel"
 msgstr ""
 
-#: backend/mustek.c:4510
+#: backend/mustek.c:4522
 #, no-c-format
 msgid "Controls the contrast of the blue channel of the acquired image."
 msgstr ""
@@ -5028,39 +5056,39 @@
 "seconds warm-up time."
 msgstr ""
 
-#: backend/pixma.c:378
+#: backend/pixma/pixma.c:397
 #, no-c-format
 msgid "Negative color"
 msgstr ""
 
-#: backend/pixma.c:383
+#: backend/pixma/pixma.c:402
 #, no-c-format
 msgid "Negative gray"
 msgstr ""
 
-#: backend/pixma.c:396
+#: backend/pixma/pixma.c:415
 #, no-c-format
 msgid "48 bits color"
 msgstr ""
 
-#: backend/pixma.c:401
+#: backend/pixma/pixma.c:420
 #, no-c-format
 msgid "16 bits gray"
 msgstr ""
 
-#: backend/pixma_sane_options.c:84
+#: backend/pixma/pixma_sane_options.c:84
 #, no-c-format
 msgid ""
 "Selects the scan source (such as a document-feeder). Set source before mode "
 "and resolution. Resets mode and resolution to auto values."
 msgstr ""
 
-#: backend/pixma_sane_options.c:98
+#: backend/pixma/pixma_sane_options.c:98
 #, no-c-format
 msgid "Button-controlled scan"
 msgstr ""
 
-#: backend/pixma_sane_options.c:99
+#: backend/pixma/pixma_sane_options.c:99
 #, no-c-format
 msgid ""
 "When enabled, scan process will not start immediately. To proceed, press "
@@ -5068,32 +5096,32 @@
 "cancel, press \"GRAY\" button."
 msgstr ""
 
-#: backend/pixma_sane_options.c:232
+#: backend/pixma/pixma_sane_options.c:232
 #, no-c-format
 msgid "Update button state"
 msgstr ""
 
-#: backend/pixma_sane_options.c:244
+#: backend/pixma/pixma_sane_options.c:244
 #, no-c-format
 msgid "Button 1"
 msgstr ""
 
-#: backend/pixma_sane_options.c:258
+#: backend/pixma/pixma_sane_options.c:258
 #, no-c-format
 msgid "Button 2"
 msgstr ""
 
-#: backend/pixma_sane_options.c:272
+#: backend/pixma/pixma_sane_options.c:272
 #, no-c-format
 msgid "Type of original to scan"
 msgstr ""
 
-#: backend/pixma_sane_options.c:286
+#: backend/pixma/pixma_sane_options.c:286
 #, no-c-format
 msgid "Target operation type"
 msgstr ""
 
-#: backend/pixma_sane_options.c:348
+#: backend/pixma/pixma_sane_options.c:348
 #, no-c-format
 msgid "ADF Waiting Time"
 msgstr ""
@@ -5190,7 +5218,7 @@
 msgid "Red gain value of the AFE"
 msgstr ""
 
-#: backend/plustek.c:1009 backend/umax_pp.c:792
+#: backend/plustek.c:1009 backend/umax_pp.c:782
 #, no-c-format
 msgid "Red offset"
 msgstr ""
@@ -5444,7 +5472,7 @@
 msgid "This option reflects the status of a scanner button."
 msgstr ""
 
-#: backend/rts8891.c:2840 backend/umax.c:5795 backend/umax_pp.c:639
+#: backend/rts8891.c:2840 backend/umax.c:5795 backend/umax_pp.c:629
 #, no-c-format
 msgid "Lamp on"
 msgstr ""
@@ -5454,12 +5482,12 @@
 msgid "Turn on scanner lamp"
 msgstr ""
 
-#: backend/rts8891.c:2851 backend/umax1220u.c:248 backend/umax.c:5812
+#: backend/rts8891.c:2851 backend/umax.c:5812 backend/umax1220u.c:248
 #, no-c-format
 msgid "Lamp off"
 msgstr ""
 
-#: backend/rts8891.c:2852 backend/umax1220u.c:249 backend/umax.c:5813
+#: backend/rts8891.c:2852 backend/umax.c:5813 backend/umax1220u.c:249
 #, no-c-format
 msgid "Turn off scanner lamp"
 msgstr ""
@@ -5602,7 +5630,7 @@
 msgid "Greyscale lines per read"
 msgstr ""
 
-#: backend/stv680.c:974
+#: backend/stv680.c:978
 #, no-c-format
 msgid "webcam"
 msgstr ""
@@ -5622,49 +5650,49 @@
 msgid "Color RGB TEXT"
 msgstr ""
 
-#: backend/test.c:137
+#: backend/test.c:141
 #, no-c-format
 msgid "Solid black"
 msgstr ""
 
-#: backend/test.c:137
+#: backend/test.c:141
 #, no-c-format
 msgid "Solid white"
 msgstr ""
 
-#: backend/test.c:138
+#: backend/test.c:142
 #, no-c-format
 msgid "Color pattern"
 msgstr ""
 
-#: backend/test.c:138
+#: backend/test.c:142
 #, no-c-format
 msgid "Grid"
 msgstr ""
 
-#: backend/test.c:163 backend/test.c:171
+#: backend/test.c:167 backend/test.c:175
 #, no-c-format
 msgid "First entry"
 msgstr ""
 
-#: backend/test.c:163 backend/test.c:171
+#: backend/test.c:167 backend/test.c:175
 #, no-c-format
 msgid "Second entry"
 msgstr ""
 
-#: backend/test.c:165
+#: backend/test.c:169
 #, no-c-format
 msgid ""
 "This is the very long third entry. Maybe the frontend has an idea how to "
 "display it"
 msgstr ""
 
-#: backend/test.c:348
+#: backend/test.c:352
 #, no-c-format
 msgid "Hand-scanner simulation"
 msgstr ""
 
-#: backend/test.c:349
+#: backend/test.c:353
 #, no-c-format
 msgid ""
 "Simulate a hand-scanner.  Hand-scanners do not know the image height a "
@@ -5673,45 +5701,45 @@
 "enables a fixed width of 11 cm."
 msgstr ""
 
-#: backend/test.c:366
+#: backend/test.c:370
 #, no-c-format
 msgid "Three-pass simulation"
 msgstr ""
 
-#: backend/test.c:367
+#: backend/test.c:371
 #, no-c-format
 msgid ""
 "Simulate a three-pass scanner. In color mode, three frames are transmitted."
 msgstr ""
 
-#: backend/test.c:382
+#: backend/test.c:386
 #, no-c-format
 msgid "Set the order of frames"
 msgstr ""
 
-#: backend/test.c:383
+#: backend/test.c:387
 #, no-c-format
 msgid "Set the order of frames in three-pass color mode."
 msgstr ""
 
-#: backend/test.c:416
+#: backend/test.c:420
 #, no-c-format
 msgid ""
 "If Automatic Document Feeder is selected, the feeder will be 'empty' after "
 "10 scans."
 msgstr ""
 
-#: backend/test.c:431
+#: backend/test.c:435
 #, no-c-format
 msgid "Special Options"
 msgstr ""
 
-#: backend/test.c:444
+#: backend/test.c:448
 #, no-c-format
 msgid "Select the test picture"
 msgstr ""
 
-#: backend/test.c:446
+#: backend/test.c:450
 #, no-c-format
 msgid ""
 "Select the kind of test picture. Available options:\n"
@@ -5721,12 +5749,12 @@
 "Grid: draws a black/white grid with a width and height of 10 mm per square."
 msgstr ""
 
-#: backend/test.c:467
+#: backend/test.c:471
 #, no-c-format
 msgid "Invert endianness"
 msgstr ""
 
-#: backend/test.c:468
+#: backend/test.c:472
 #, no-c-format
 msgid ""
 "Exchange upper and lower byte of image data in 16 bit modes. This option can "
@@ -5734,54 +5762,54 @@
 "correct endianness."
 msgstr ""
 
-#: backend/test.c:484
+#: backend/test.c:488
 #, no-c-format
 msgid "Read limit"
 msgstr ""
 
-#: backend/test.c:485
+#: backend/test.c:489
 #, no-c-format
 msgid "Limit the amount of data transferred with each call to sane_read()."
 msgstr ""
 
-#: backend/test.c:498
+#: backend/test.c:502
 #, no-c-format
 msgid "Size of read-limit"
 msgstr ""
 
-#: backend/test.c:499
+#: backend/test.c:503
 #, no-c-format
 msgid ""
 "The (maximum) amount of data transferred with each call to sane_read()."
 msgstr ""
 
-#: backend/test.c:514
+#: backend/test.c:518
 #, no-c-format
 msgid "Read delay"
 msgstr ""
 
-#: backend/test.c:515
+#: backend/test.c:519
 #, no-c-format
 msgid "Delay the transfer of data to the pipe."
 msgstr ""
 
-#: backend/test.c:527
+#: backend/test.c:531
 #, no-c-format
 msgid "Duration of read-delay"
 msgstr ""
 
-#: backend/test.c:528
+#: backend/test.c:532
 #, no-c-format
 msgid ""
 "How long to wait after transferring each buffer of data through the pipe."
 msgstr ""
 
-#: backend/test.c:543
+#: backend/test.c:547
 #, no-c-format
 msgid "Return-value of sane_read"
 msgstr ""
 
-#: backend/test.c:545
+#: backend/test.c:549
 #, no-c-format
 msgid ""
 "Select the return-value of sane_read(). \"Default\" is the normal handling "
@@ -5789,94 +5817,94 @@
 "handles them."
 msgstr ""
 
-#: backend/test.c:562
+#: backend/test.c:566
 #, no-c-format
 msgid "Loss of pixels per line"
 msgstr ""
 
-#: backend/test.c:564
+#: backend/test.c:568
 #, no-c-format
 msgid "The number of pixels that are wasted at the end of each line."
 msgstr ""
 
-#: backend/test.c:577
+#: backend/test.c:581
 #, no-c-format
 msgid "Fuzzy parameters"
 msgstr ""
 
-#: backend/test.c:578
+#: backend/test.c:582
 #, no-c-format
 msgid ""
 "Return fuzzy lines and bytes per line when sane_parameters() is called "
 "before sane_start()."
 msgstr ""
 
-#: backend/test.c:591
+#: backend/test.c:595
 #, no-c-format
 msgid "Use non-blocking IO"
 msgstr ""
 
-#: backend/test.c:592
+#: backend/test.c:596
 #, no-c-format
 msgid "Use non-blocking IO for sane_read() if supported by the frontend."
 msgstr ""
 
-#: backend/test.c:605
+#: backend/test.c:609
 #, no-c-format
 msgid "Offer select file descriptor"
 msgstr ""
 
-#: backend/test.c:606
+#: backend/test.c:610
 #, no-c-format
 msgid ""
 "Offer a select filedescriptor for detecting if sane_read() will return data."
 msgstr ""
 
-#: backend/test.c:619
+#: backend/test.c:623
 #, no-c-format
 msgid "Enable test options"
 msgstr ""
 
-#: backend/test.c:620
+#: backend/test.c:624
 #, no-c-format
 msgid ""
 "Enable various test options. This is for testing the ability of frontends to "
 "view and modify all the different SANE option types."
 msgstr ""
 
-#: backend/test.c:634
+#: backend/test.c:638
 #, no-c-format
 msgid "Print options"
 msgstr ""
 
-#: backend/test.c:635
+#: backend/test.c:639
 #, no-c-format
 msgid "Print a list of all options."
 msgstr ""
 
-#: backend/test.c:712
+#: backend/test.c:716
 #, no-c-format
 msgid "Bool test options"
 msgstr ""
 
-#: backend/test.c:725
+#: backend/test.c:729
 #, no-c-format
 msgid "(1/6) Bool soft select soft detect"
 msgstr ""
 
-#: backend/test.c:727
+#: backend/test.c:731
 #, no-c-format
 msgid ""
 "(1/6) Bool test option that has soft select and soft detect (and advanced) "
 "capabilities. That's just a normal bool option."
 msgstr ""
 
-#: backend/test.c:743
+#: backend/test.c:747
 #, no-c-format
 msgid "(2/6) Bool hard select soft detect"
 msgstr ""
 
-#: backend/test.c:745
+#: backend/test.c:749
 #, no-c-format
 msgid ""
 "(2/6) Bool test option that has hard select and soft detect (and advanced) "
@@ -5884,12 +5912,12 @@
 "user (e.g. by pressing a button at the device)."
 msgstr ""
 
-#: backend/test.c:762
+#: backend/test.c:766
 #, no-c-format
 msgid "(3/6) Bool hard select"
 msgstr ""
 
-#: backend/test.c:763
+#: backend/test.c:767
 #, no-c-format
 msgid ""
 "(3/6) Bool test option that has hard select (and advanced) capabilities. "
@@ -5897,199 +5925,199 @@
 "pressing a button at the device) and can't be read by the frontend."
 msgstr ""
 
-#: backend/test.c:781
+#: backend/test.c:785
 #, no-c-format
 msgid "(4/6) Bool soft detect"
 msgstr ""
 
-#: backend/test.c:782
+#: backend/test.c:786
 #, no-c-format
 msgid ""
 "(4/6) Bool test option that has soft detect (and advanced) capabilities. "
 "That means the option is read-only."
 msgstr ""
 
-#: backend/test.c:798
+#: backend/test.c:802
 #, no-c-format
 msgid "(5/6) Bool soft select soft detect emulated"
 msgstr ""
 
-#: backend/test.c:799
+#: backend/test.c:803
 #, no-c-format
 msgid ""
 "(5/6) Bool test option that has soft select, soft detect, and emulated (and "
 "advanced) capabilities."
 msgstr ""
 
-#: backend/test.c:815
+#: backend/test.c:819
 #, no-c-format
 msgid "(6/6) Bool soft select soft detect auto"
 msgstr ""
 
-#: backend/test.c:816
+#: backend/test.c:820
 #, no-c-format
 msgid ""
 "(6/6) Bool test option that has soft select, soft detect, and automatic (and "
 "advanced) capabilities. This option can be automatically set by the backend."
 msgstr ""
 
-#: backend/test.c:833
+#: backend/test.c:837
 #, no-c-format
 msgid "Int test options"
 msgstr ""
 
-#: backend/test.c:846
+#: backend/test.c:850
 #, no-c-format
 msgid "(1/6) Int"
 msgstr ""
 
-#: backend/test.c:847
+#: backend/test.c:851
 #, no-c-format
 msgid "(1/6) Int test option with no unit and no constraint set."
 msgstr ""
 
-#: backend/test.c:862
+#: backend/test.c:866
 #, no-c-format
 msgid "(2/6) Int constraint range"
 msgstr ""
 
-#: backend/test.c:863
+#: backend/test.c:867
 #, no-c-format
 msgid ""
 "(2/6) Int test option with unit pixel and constraint range set. Minimum is "
 "4, maximum 192, and quant is 2."
 msgstr ""
 
-#: backend/test.c:879
+#: backend/test.c:883
 #, no-c-format
 msgid "(3/6) Int constraint word list"
 msgstr ""
 
-#: backend/test.c:880
+#: backend/test.c:884
 #, no-c-format
 msgid "(3/6) Int test option with unit bits and constraint word list set."
 msgstr ""
 
-#: backend/test.c:895
+#: backend/test.c:899
 #, no-c-format
 msgid "(4/6) Int array"
 msgstr ""
 
-#: backend/test.c:896
+#: backend/test.c:900
 #, no-c-format
 msgid ""
 "(4/6) Int test option with unit mm and using an array without constraints."
 msgstr ""
 
-#: backend/test.c:911
+#: backend/test.c:915
 #, no-c-format
 msgid "(5/6) Int array constraint range"
 msgstr ""
 
-#: backend/test.c:912
+#: backend/test.c:916
 #, no-c-format
 msgid ""
 "(5/6) Int test option with unit dpi and using an array with a range "
 "constraint. Minimum is 4, maximum 192, and quant is 2."
 msgstr ""
 
-#: backend/test.c:929
+#: backend/test.c:933
 #, no-c-format
 msgid "(6/6) Int array constraint word list"
 msgstr ""
 
-#: backend/test.c:930
+#: backend/test.c:934
 #, no-c-format
 msgid ""
 "(6/6) Int test option with unit percent and using an array with a word list "
 "constraint."
 msgstr ""
 
-#: backend/test.c:946
+#: backend/test.c:950
 #, no-c-format
 msgid "Fixed test options"
 msgstr ""
 
-#: backend/test.c:959
+#: backend/test.c:963
 #, no-c-format
 msgid "(1/3) Fixed"
 msgstr ""
 
-#: backend/test.c:960
+#: backend/test.c:964
 #, no-c-format
 msgid "(1/3) Fixed test option with no unit and no constraint set."
 msgstr ""
 
-#: backend/test.c:975
+#: backend/test.c:979
 #, no-c-format
 msgid "(2/3) Fixed constraint range"
 msgstr ""
 
-#: backend/test.c:976
+#: backend/test.c:980
 #, no-c-format
 msgid ""
 "(2/3) Fixed test option with unit microsecond and constraint range set. "
 "Minimum is -42.17, maximum 32767.9999, and quant is 2.0."
 msgstr ""
 
-#: backend/test.c:992
+#: backend/test.c:996
 #, no-c-format
 msgid "(3/3) Fixed constraint word list"
 msgstr ""
 
-#: backend/test.c:993
+#: backend/test.c:997
 #, no-c-format
 msgid "(3/3) Fixed test option with no unit and constraint word list set."
 msgstr ""
 
-#: backend/test.c:1008
+#: backend/test.c:1012
 #, no-c-format
 msgid "String test options"
 msgstr ""
 
-#: backend/test.c:1021
+#: backend/test.c:1025
 #, no-c-format
 msgid "(1/3) String"
 msgstr ""
 
-#: backend/test.c:1022
+#: backend/test.c:1026
 #, no-c-format
 msgid "(1/3) String test option without constraint."
 msgstr ""
 
-#: backend/test.c:1039
+#: backend/test.c:1043
 #, no-c-format
 msgid "(2/3) String constraint string list"
 msgstr ""
 
-#: backend/test.c:1040
+#: backend/test.c:1044
 #, no-c-format
 msgid "(2/3) String test option with string list constraint."
 msgstr ""
 
-#: backend/test.c:1059
+#: backend/test.c:1063
 #, no-c-format
 msgid "(3/3) String constraint long string list"
 msgstr ""
 
-#: backend/test.c:1060
+#: backend/test.c:1064
 #, no-c-format
 msgid ""
 "(3/3) String test option with string list constraint. Contains some more "
 "entries..."
 msgstr ""
 
-#: backend/test.c:1080
+#: backend/test.c:1084
 #, no-c-format
 msgid "Button test options"
 msgstr ""
 
-#: backend/test.c:1093
+#: backend/test.c:1097
 #, no-c-format
 msgid "(1/1) Button"
 msgstr ""
 
-#: backend/test.c:1094
+#: backend/test.c:1098
 #, no-c-format
 msgid "(1/1) Button test option. Prints some text..."
 msgstr ""
@@ -6179,52 +6207,52 @@
 msgid "Define calibration mode"
 msgstr ""
 
-#: backend/umax_pp.c:640
+#: backend/umax_pp.c:630
 #, no-c-format
 msgid "Sets lamp on/off"
 msgstr ""
 
-#: backend/umax_pp.c:649
+#: backend/umax_pp.c:639
 #, no-c-format
 msgid "UTA on"
 msgstr ""
 
-#: backend/umax_pp.c:650
+#: backend/umax_pp.c:640
 #, no-c-format
 msgid "Sets UTA on/off"
 msgstr ""
 
-#: backend/umax_pp.c:771
+#: backend/umax_pp.c:761
 #, no-c-format
 msgid "Offset"
 msgstr ""
 
-#: backend/umax_pp.c:773
+#: backend/umax_pp.c:763
 #, no-c-format
 msgid "Color channels offset settings"
 msgstr ""
 
-#: backend/umax_pp.c:780
+#: backend/umax_pp.c:770
 #, no-c-format
 msgid "Gray offset"
 msgstr ""
 
-#: backend/umax_pp.c:781
+#: backend/umax_pp.c:771
 #, no-c-format
 msgid "Sets gray channel offset"
 msgstr ""
 
-#: backend/umax_pp.c:793
+#: backend/umax_pp.c:783
 #, no-c-format
 msgid "Sets red channel offset"
 msgstr ""
 
-#: backend/umax_pp.c:805
+#: backend/umax_pp.c:795
 #, no-c-format
 msgid "Sets green channel offset"
 msgstr ""
 
-#: backend/umax_pp.c:817
+#: backend/umax_pp.c:807
 #, no-c-format
 msgid "Sets blue channel offset"
 msgstr ""
diff -Nru language-pack-th-18.04+20200123/data/th/LC_MESSAGES/snappy.po language-pack-th-18.04+20200702/data/th/LC_MESSAGES/snappy.po
--- language-pack-th-18.04+20200123/data/th/LC_MESSAGES/snappy.po	2020-01-23 16:55:55.000000000 +0000
+++ language-pack-th-18.04+20200702/data/th/LC_MESSAGES/snappy.po	2020-07-08 13:58:07.000000000 +0000
@@ -7,15 +7,15 @@
 msgstr ""
 "Project-Id-Version: snapd\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2019-11-16 03:17+0000\n"
+"POT-Creation-Date: 2020-06-23 17:28+0000\n"
 "PO-Revision-Date: 2018-04-04 15:05+0000\n"
 "Last-Translator: Rockworld <sumoisrock@gmail.com>\n"
 "Language-Team: Thai <th@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2020-01-23 12:15+0000\n"
-"X-Generator: Launchpad (build b8d1327fd820d6bf500589d6da587d5037c7d88e)\n"
+"X-Launchpad-Export-Date: 2020-07-02 11:53+0000\n"
+"X-Generator: Launchpad (build 1cbd0aa39df153c901321817f9b57cf3f232b507)\n"
 
 #, c-format
 msgid " command %q from snap %q\n"
@@ -186,6 +186,7 @@
 msgstr ""
 
 #. TRANSLATORS: This needs to begin with < and end with >
+#. TRANSLATORS: This needs to begin with < and end with >
 msgid "<filename>"
 msgstr ""
 
@@ -221,11 +222,15 @@
 msgstr ""
 
 #. TRANSLATORS: This needs to begin with < and end with >
-msgid "<query>"
+msgid "<path>"
 msgstr ""
 
 #. TRANSLATORS: This needs to begin with < and end with >
-msgid "<root-dir>"
+msgid "<process ID>"
+msgstr ""
+
+#. TRANSLATORS: This needs to begin with < and end with >
+msgid "<query>"
 msgstr ""
 
 #. TRANSLATORS: This needs to begin with < and end with >
@@ -233,6 +238,10 @@
 msgstr ""
 
 #. TRANSLATORS: This needs to begin with < and end with >
+msgid "<snap>"
+msgstr ""
+
+#. TRANSLATORS: This needs to begin with < and end with >
 #. TRANSLATORS: This needs to begin with < and end with >
 msgid "<snap>:<plug>"
 msgstr ""
@@ -246,6 +255,14 @@
 msgid "<snap>:<slot>"
 msgstr ""
 
+#. TRANSLATORS: This needs to begin with < and end with >
+msgid "<target-dir>"
+msgstr ""
+
+#. TRANSLATORS: This is a noun and it needs to begin with < and end with >
+msgid "<username>"
+msgstr ""
+
 #. TRANSLATORS: This should not start with a lowercase letter.
 msgid ""
 "A service specification, which can be just a snap name (for all services in "
@@ -413,6 +430,10 @@
 msgid "Commands can be classified as follows:"
 msgstr ""
 
+#. TRANSLATORS: This should not start with a lowercase letter.
+msgid "Compression to use (e.g. xz)"
+msgstr ""
+
 msgid "Configuration"
 msgstr ""
 
@@ -596,6 +617,14 @@
 msgstr ""
 
 #. TRANSLATORS: This should not start with a lowercase letter.
+msgid "File path"
+msgstr ""
+
+#. TRANSLATORS: This should not start with a lowercase letter.
+msgid "File to sign (defaults to stdin)"
+msgstr ""
+
+#. TRANSLATORS: This should not start with a lowercase letter.
 msgid "Filename of the snap you want to assert a build for"
 msgstr ""
 
@@ -616,6 +645,10 @@
 msgid "Force import on classic systems"
 msgstr ""
 
+#, c-format
+msgid "Forget connection %s:%s from %s:%s"
+msgstr ""
+
 msgid ""
 "Format public key material as a request for an account-key for this account-"
 "id"
@@ -791,6 +824,9 @@
 "   snap install %s\n"
 msgstr ""
 
+msgid "Install the system"
+msgstr ""
+
 #, c-format
 msgid ""
 "Interacting with snapd is not yet supported on %s.\n"
@@ -853,6 +889,10 @@
 msgstr ""
 
 #, c-format
+msgid "Make snap %q (%s) available to the system during remodel"
+msgstr ""
+
+#, c-format
 msgid "Make snap %q (%s) unavailable to the system"
 msgstr ""
 
@@ -864,6 +904,9 @@
 msgid "Make snap %q%s available to the system"
 msgstr ""
 
+msgid "Mark system pre-seeded"
+msgstr ""
+
 msgid "Mark system seeded"
 msgstr ""
 
@@ -979,7 +1022,7 @@
 msgstr ""
 
 #. TRANSLATORS: This should not start with a lowercase letter.
-msgid "Only search for snaps in “stable”"
+msgid "Only search for snaps in “stable”."
 msgstr ""
 
 msgid "Other"
@@ -990,6 +1033,9 @@
 msgid "Output results in JSON format"
 msgstr ""
 
+msgid "Output seeding status (true or false)"
+msgstr ""
+
 #. TRANSLATORS: This should not start with a lowercase letter.
 msgid "Output to this filename"
 msgstr ""
@@ -1055,6 +1101,10 @@
 msgstr ""
 
 #, c-format
+msgid "Prepare snap %q (%s) for remodel"
+msgstr ""
+
+#, c-format
 msgid "Prepare snap %q%s"
 msgstr ""
 
@@ -1085,6 +1135,10 @@
 msgid "Print whether the system is managed"
 msgstr ""
 
+#. TRANSLATORS: This should not start with a lowercase letter.
+msgid "Process ID of confined app"
+msgstr ""
+
 #, c-format
 msgid "Prune automatic aliases for snap %q"
 msgstr ""
@@ -1104,6 +1158,14 @@
 msgid "Query the status of services"
 msgstr ""
 
+#. TRANSLATORS: This should not start with a lowercase letter.
+msgid "Query the store for the assertion, via snapd if possible"
+msgstr ""
+
+#. TRANSLATORS: This should not start with a lowercase letter.
+msgid "Query the store for the assertion, without attempting to go via snapd"
+msgstr ""
+
 #, c-format
 msgid "Refresh %q snap"
 msgstr ""
@@ -1164,6 +1226,9 @@
 msgid "Remove %q snap"
 msgstr ""
 
+msgid "Remove a local system user"
+msgstr ""
+
 msgid "Remove a manual alias, or the aliases for an entire snap"
 msgstr ""
 
@@ -1251,12 +1316,22 @@
 msgstr ""
 
 #. TRANSLATORS: This should not start with a lowercase letter.
-msgid "Restrict the search to a given section"
+msgid "Restrict the search to a given section."
 msgstr ""
 
 msgid "Retrieve logs for services"
 msgstr ""
 
+msgid "Return information about a process"
+msgstr ""
+
+msgid "Return information about file access by a snap"
+msgstr ""
+
+msgid ""
+"Return success if the given plug or slot is connected, and failure otherwise"
+msgstr ""
+
 #. TRANSLATORS: 'Rev' is an abbreviation of 'Revision'
 msgid "Rev"
 msgstr ""
@@ -1272,6 +1347,9 @@
 msgid "Reverts the given snap to the previous state"
 msgstr ""
 
+msgid "Root directory to look for boot variables in"
+msgstr ""
+
 #. TRANSLATORS: This should not start with a lowercase letter.
 msgid "Run a shell instead of the command (useful for debugging)"
 msgstr ""
@@ -1318,6 +1396,9 @@
 msgid "Run remove hook of %q snap if present"
 msgstr ""
 
+msgid "Run routine commands"
+msgstr ""
+
 #. TRANSLATORS: This should not start with a lowercase letter.
 msgid ""
 "Run the command under strace (useful for debugging). Extra strace options "
@@ -1339,7 +1420,7 @@
 msgstr ""
 
 #. TRANSLATORS: This should not start with a lowercase letter.
-msgid "Search private snaps"
+msgid "Search private snaps."
 msgstr ""
 
 msgid "See 'snap info <snap name>' for additional versions."
@@ -1410,6 +1491,9 @@
 msgid "Setup snap %q%s security profiles"
 msgstr ""
 
+msgid "Setup system for run mode"
+msgstr ""
+
 #. TRANSLATORS: This should not start with a lowercase letter.
 msgid "Show a short summary of all commands"
 msgstr ""
@@ -1508,6 +1592,7 @@
 
 #. TRANSLATORS: This should not start with a lowercase letter.
 #. TRANSLATORS: This should not start with a lowercase letter.
+#. TRANSLATORS: This should not start with a lowercase letter.
 msgid "Snap name"
 msgstr ""
 
@@ -1551,6 +1636,12 @@
 "Specify an architecture for snaps for --classic when the model does not"
 msgstr ""
 
+#, c-format
+msgid ""
+"Specifying a channel %q is relying on undefined behaviour. Interpreting it "
+"as %q for now, but this will be an error later.\n"
+msgstr ""
+
 msgid "Start services"
 msgstr ""
 
@@ -1739,6 +1830,10 @@
 msgid "The timings command displays details about the time each task runs."
 msgstr ""
 
+#. TRANSLATORS: This should not start with a lowercase letter
+msgid "The username to remove"
+msgstr ""
+
 msgid "There are no services provided by installed snaps."
 msgstr ""
 
@@ -1842,6 +1937,9 @@
 msgid "Watch a change in progress"
 msgstr ""
 
+msgid "Whether to use uc20 boot vars or not"
+msgstr ""
+
 msgid "Wrong again. Once more: "
 msgstr ""
 
@@ -2092,6 +2190,12 @@
 "\n"
 "Disconnects everything from the provided plug or slot.\n"
 "The snap name may be omitted for the core snap.\n"
+"\n"
+"When an automatic connection is manually disconnected, its disconnected "
+"state\n"
+"is retained after a snap refresh. The --forget flag can be added to the\n"
+"disconnect command to reset this behaviour, and consequently re-enable\n"
+"an automatic reconnection after a snap refresh.\n"
 msgstr ""
 
 msgid ""
@@ -2114,8 +2218,22 @@
 
 msgid ""
 "\n"
-"The find command queries the store for available packages in the stable "
-"channel.\n"
+"The file-access command returns information about a snap's file system "
+"access.\n"
+"\n"
+"This command is used by the xdg-document-portal service to identify\n"
+"files that do not need to be proxied to provide access within\n"
+"confinement.\n"
+"\n"
+"File paths are interpreted as host file system paths.  The tool may\n"
+"return false negatives (e.g. report that a file path is unreadable,\n"
+"despite being readable under a different path).  It also does not\n"
+"check if file system permissions would render a file unreadable.\n"
+msgstr ""
+
+msgid ""
+"\n"
+"The find command queries the store for available packages.\n"
 "\n"
 "With the --private flag, which requires the user to be logged-in to the "
 "store\n"
@@ -2186,13 +2304,13 @@
 "    $ snap get snap-name username\n"
 "    frank\n"
 "\n"
-"If multiple option names are provided, a document is returned:\n"
+"If multiple option names are provided, the corresponding values are "
+"returned:\n"
 "\n"
 "    $ snap get snap-name username password\n"
-"    {\n"
-"        \"username\": \"frank\",\n"
-"        \"password\": \"...\"\n"
-"    }\n"
+"    Key       Value\n"
+"    username  frank\n"
+"    password  ...\n"
 "\n"
 "Nested values may be retrieved via a dotted path:\n"
 "\n"
@@ -2275,6 +2393,19 @@
 
 msgid ""
 "\n"
+"The is-connected command returns success if the given plug or slot of the\n"
+"calling snap is connected, and failure otherwise.\n"
+"\n"
+"$ snapctl is-connected plug\n"
+"$ echo $?\n"
+"1\n"
+"\n"
+"Snaps can only query their own plugs and slots - snap name is implicit and\n"
+"implied by the snapctl execution context.\n"
+msgstr ""
+
+msgid ""
+"\n"
 "The keys command lists cryptographic keys that can be used for signing\n"
 "assertions.\n"
 msgstr ""
@@ -2386,6 +2517,15 @@
 
 msgid ""
 "\n"
+"The portal-info command returns information about a process in keyfile "
+"format.\n"
+"\n"
+"This command is used by the xdg-desktop-portal service to retrieve\n"
+"information about snap confined processes.\n"
+msgstr ""
+
+msgid ""
+"\n"
 "The prefer command enables all aliases of the given snap in preference\n"
 "to conflicting aliases of other snaps whose aliases will be disabled\n"
 "(or removed, for manual ones).\n"
@@ -2459,6 +2599,11 @@
 
 msgid ""
 "\n"
+"The remove-user command removes a local system user.\n"
+msgstr ""
+
+msgid ""
+"\n"
 "The repair command shows the details about one or multiple repairs.\n"
 msgstr ""
 
@@ -2509,6 +2654,15 @@
 
 msgid ""
 "\n"
+"The routine command contains a selection of additional sub-commands.\n"
+"\n"
+"Routine commands are not intended to be directly invoked by the user.\n"
+"Instead, they are intended to be called by other programs and produce\n"
+"machine readable output.\n"
+msgstr ""
+
+msgid ""
+"\n"
 "The run command executes the given snap command with the right confinement\n"
 "and environment.\n"
 msgstr ""
@@ -2945,6 +3099,7 @@
 msgstr ""
 
 #. TRANSLATORS: %q is the key name, %v the error message
+#. TRANSLATORS: %q is the key name, %v the error message
 #, c-format
 msgid "cannot use %q key: %v"
 msgstr ""
@@ -3172,6 +3327,10 @@
 msgid "reboot scheduled to update the system"
 msgstr ""
 
+#, c-format
+msgid "removed user %q\n"
+msgstr ""
+
 msgid "repairs are not available on a classic system"
 msgstr ""
 
diff -Nru language-pack-th-18.04+20200123/data/th/LC_MESSAGES/software-properties.po language-pack-th-18.04+20200702/data/th/LC_MESSAGES/software-properties.po
--- language-pack-th-18.04+20200123/data/th/LC_MESSAGES/software-properties.po	2020-01-23 16:55:58.000000000 +0000
+++ language-pack-th-18.04+20200702/data/th/LC_MESSAGES/software-properties.po	2020-07-08 13:58:10.000000000 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-12-06 21:41+0000\n"
+"POT-Creation-Date: 2020-05-26 20:54+0000\n"
 "PO-Revision-Date: 2018-03-04 05:36+0000\n"
 "Last-Translator: Rockworld <sumoisrock@gmail.com>\n"
 "Language-Team: Thai <th@li.org>\n"
@@ -15,8 +15,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2020-01-23 11:39+0000\n"
-"X-Generator: Launchpad (build b8d1327fd820d6bf500589d6da587d5037c7d88e)\n"
+"X-Launchpad-Export-Date: 2020-07-02 11:26+0000\n"
+"X-Generator: Launchpad (build 1cbd0aa39df153c901321817f9b57cf3f232b507)\n"
 
 #: ../data/com.ubuntu.softwareproperties.policy.in.h:1
 msgid "Write Configuration"
@@ -27,13 +27,13 @@
 msgstr "คุณต้องยืนยันตัวตนเพื่อทำการเปลี่ยนการตั้งค่าคลังแพกเกจของโปรแกรม"
 
 #: ../data/software-properties-gtk.desktop.in.h:1
-#: ../data/gtkbuilder/main.ui.h:14
+#: ../data/gtkbuilder/main.ui.h:17
 msgid "Software & Updates"
 msgstr "ซอฟต์แวร์และการอัปเดต"
 
 #: ../data/software-properties-gtk.desktop.in.h:2
 #: ../data/software-properties-gtk.appdata.xml.in.h:2
-#: ../data/software-properties-kde.desktop.in.h:2
+#: ../data/software-properties-qt.desktop.in.h:2
 msgid "Configure the sources for installable software and updates"
 msgstr "ปรับแต่งแหล่งของซอฟต์แวร์และการอัปเดตที่สามารถติดตั้งได้"
 
@@ -64,9 +64,9 @@
 "โปรแกรมนี้ยังสามารถให้คุณเลือกไดรเวอร์เพิ่มเติมสำหรับคอมพิวเตอร์ของคุณ "
 "รวมทั้งให้คุณเปิดใช้งานบริการ Canonical Livepatch ได้"
 
-#: ../data/software-properties-kde.desktop.in.h:1
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:690
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:709
+#: ../data/software-properties-qt.desktop.in.h:1
+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:785
+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:804
 msgid "Software Sources"
 msgstr "แหล่งของซอฟต์แวร์"
 
@@ -89,38 +89,38 @@
 "\n"
 "'add-apt-repository multiverse'"
 
-#: ../software-properties-kde:73
+#: ../software-properties-qt:73
 msgid "Print some debug information to the command line"
 msgstr "แสดงข้อมูลการดีบั๊กในบรรทัดคำสั่ง"
 
-#: ../software-properties-kde:76 ../add-apt-repository:58
+#: ../software-properties-qt:76 ../add-apt-repository:58
 msgid "Print a lot of debug information to the command line"
 msgstr "แสดงข้อมูลการดีบั๊กจำนวนมากในบรรทัดคำสั่ง"
 
-#: ../software-properties-kde:79
+#: ../software-properties-qt:79
 msgid ""
 "No update on repository change (useful if called from an external program)"
 msgstr ""
 "ไม่มีการอัปเดตข้อมูลเกี่ยวกับการเปลี่ยนแปลงที่เก็บ "
 "(จะมีประโยชน์ถ้าเรียกจากโปรแกรมภายนอก)"
 
-#: ../software-properties-kde:82
+#: ../software-properties-qt:82
 msgid "Enable the specified component of the distro's repositories"
 msgstr "เปิดใช้งานองค์ประกอบที่ระบุของที่เก็บของชุดเผยแพร่"
 
-#: ../software-properties-kde:86
+#: ../software-properties-qt:90
 msgid "Enable PPA with the given name"
 msgstr "เปิดใช้งาน PPA ด้วยชื่อที่ให้มา"
 
-#: ../software-properties-kde:90
+#: ../software-properties-qt:94
 msgid "Legacy option, unused"
 msgstr "ตัวเลือกดั้งเดิมที่ไม่ใช้แล้ว"
 
-#: ../software-properties-kde:93
+#: ../software-properties-qt:97
 msgid "Win ID to act as a dialogue for"
 msgstr "Win ID สำหรับแสดงเป็นกล่องโต้ตอบ"
 
-#: ../software-properties-kde:96
+#: ../software-properties-qt:100
 msgid "data directory for UI files"
 msgstr "ไดเรกทอรีข้อมูลสำหรับแฟ้มส่วนติดต่อผู้ใช้"
 
@@ -245,59 +245,59 @@
 msgstr ""
 "ส่งรายชื่อและความถี่ในการใช้งานของซอฟต์แวร์ที่ได้ติดตั้งแล้วกลับไปยังโครงการ"
 
-#: ../softwareproperties/kde/DialogMirror.py:63
+#: ../softwareproperties/qt/DialogMirror.py:63
 msgid "Mirror"
 msgstr "แหล่งข้อมูลสำรอง"
 
-#: ../softwareproperties/kde/DialogMirror.py:184
-#: ../softwareproperties/kde/DialogMirror.py:185
-#: ../softwareproperties/kde/DialogMirror.py:218
+#: ../softwareproperties/qt/DialogMirror.py:184
+#: ../softwareproperties/qt/DialogMirror.py:185
+#: ../softwareproperties/qt/DialogMirror.py:218
 msgid "Testing Mirrors"
 msgstr "แหล่งข้อมูลสำรองทดลองใช้อยู่"
 
-#: ../softwareproperties/kde/DialogMirror.py:184
-#: ../softwareproperties/kde/DialogMirror.py:187
+#: ../softwareproperties/qt/DialogMirror.py:184
+#: ../softwareproperties/qt/DialogMirror.py:187
 #: ../data/gtkbuilder/dialog-auth.ui.h:2
 msgid "Cancel"
 msgstr "ยกเลิก"
 
-#: ../softwareproperties/kde/DialogMirror.py:219
+#: ../softwareproperties/qt/DialogMirror.py:219
 #: ../softwareproperties/gtk/DialogMirror.py:337
 msgid "No suitable download server was found"
 msgstr "ไม่พบเซิร์ฟเวอร์ของซอฟท์แวร์ที่เข้ากันได้"
 
-#: ../softwareproperties/kde/DialogMirror.py:220
+#: ../softwareproperties/qt/DialogMirror.py:220
 #: ../softwareproperties/gtk/DialogMirror.py:338
 msgid "Please check your Internet connection."
 msgstr "กรุณาตรวจสอบการเชื่อมต่ออินเทอร์เน็ตของคุณ"
 
-#: ../softwareproperties/kde/DialogMirror.py:235
+#: ../softwareproperties/qt/DialogMirror.py:235
 #: ../softwareproperties/gtk/DialogMirror.py:353
 msgid "Canceling..."
 msgstr "กำลังยกเลิก..."
 
-#: ../softwareproperties/kde/SoftwarePropertiesKDE.py:162
-#: ../data/gtkbuilder/main.ui.h:9
+#: ../softwareproperties/qt/SoftwarePropertiesQt.py:211
+#: ../data/gtkbuilder/main.ui.h:12
 msgid "Daily"
 msgstr "ทุกวัน"
 
-#: ../softwareproperties/kde/SoftwarePropertiesKDE.py:163
-#: ../data/gtkbuilder/main.ui.h:10
+#: ../softwareproperties/qt/SoftwarePropertiesQt.py:212
+#: ../data/gtkbuilder/main.ui.h:13
 msgid "Every two days"
 msgstr "ทุก 2 วัน"
 
-#: ../softwareproperties/kde/SoftwarePropertiesKDE.py:164
-#: ../data/gtkbuilder/main.ui.h:11
+#: ../softwareproperties/qt/SoftwarePropertiesQt.py:213
+#: ../data/gtkbuilder/main.ui.h:14
 msgid "Weekly"
 msgstr "ทุกสัปดาห์"
 
-#: ../softwareproperties/kde/SoftwarePropertiesKDE.py:165
-#: ../data/gtkbuilder/main.ui.h:12
+#: ../softwareproperties/qt/SoftwarePropertiesQt.py:214
+#: ../data/gtkbuilder/main.ui.h:15
 msgid "Every two weeks"
 msgstr "ทุก 2 สัปดาห์"
 
-#: ../softwareproperties/kde/SoftwarePropertiesKDE.py:172
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:263
+#: ../softwareproperties/qt/SoftwarePropertiesQt.py:221
+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:302
 #, python-format
 msgid "Every %s days"
 msgstr "ทุก %s วัน"
@@ -309,8 +309,7 @@
 msgstr "%s ปรับปรุง"
 
 #. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu
-#: ../softwareproperties/kde/SoftwarePropertiesKDE.py:218
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:323
+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:362
 #, python-format
 msgid "%s Software"
 msgstr "%s ซอฟต์แวร์"
@@ -318,111 +317,111 @@
 #. TRANSLATORS: Label for the components in the Internet section
 #. first %s is the description of the component
 #. second %s is the code name of the comp, eg main, universe
-#: ../softwareproperties/kde/SoftwarePropertiesKDE.py:237
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:336
+#: ../softwareproperties/qt/SoftwarePropertiesQt.py:282
+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:375
 #, python-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
 #. add a separator and the option to choose another mirror from the list
 #. #FIXME server_store.append(["sep", None, True])
-#: ../softwareproperties/kde/SoftwarePropertiesKDE.py:300
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:466
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:559
+#: ../softwareproperties/qt/SoftwarePropertiesQt.py:345
+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:532
+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:660
 msgid "Other..."
 msgstr "อื่นๆ..."
 
-#: ../softwareproperties/kde/SoftwarePropertiesKDE.py:668
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:982
+#: ../softwareproperties/qt/SoftwarePropertiesQt.py:713
+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1077
 msgid "Import key"
 msgstr "นำเข้ากุญแจ"
 
-#: ../softwareproperties/kde/SoftwarePropertiesKDE.py:671
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:996
+#: ../softwareproperties/qt/SoftwarePropertiesQt.py:716
+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1091
 msgid "Error importing selected file"
 msgstr "ไม่สามารถนำเข้าไฟล์ที่เลือกไว้"
 
-#: ../softwareproperties/kde/SoftwarePropertiesKDE.py:672
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:997
+#: ../softwareproperties/qt/SoftwarePropertiesQt.py:717
+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1092
 msgid "The selected file may not be a GPG key file or it might be corrupt."
 msgstr "ไฟล์ที่เลือกไว้อาจจะไม่ใช่ GPG กุญแจไฟล์หรืออาจจะเสียหาย"
 
-#: ../softwareproperties/kde/SoftwarePropertiesKDE.py:685
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1013
+#: ../softwareproperties/qt/SoftwarePropertiesQt.py:730
+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1107
 msgid "Error removing the key"
 msgstr "มีปัญหาขณะลบกุจแจ"
 
-#: ../softwareproperties/kde/SoftwarePropertiesKDE.py:686
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1014
+#: ../softwareproperties/qt/SoftwarePropertiesQt.py:731
+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1108
 msgid ""
 "The key you selected could not be removed. Please report this as a bug."
 msgstr "กุญแจที่คุณเลือกไม่สามารถลบออกได้ กรุณารายงานว่าเป็นปัญหา"
 
-#: ../softwareproperties/kde/SoftwarePropertiesKDE.py:703
+#: ../softwareproperties/qt/SoftwarePropertiesQt.py:762
 msgid "Reload"
 msgstr "เรียกใหม่"
 
-#: ../softwareproperties/kde/SoftwarePropertiesKDE.py:705
+#: ../softwareproperties/qt/SoftwarePropertiesQt.py:764
 msgid "Your local copy of the software catalog is out of date."
 msgstr "สำเนาแค็ตตาล็อกซอฟต์แวร์ท้องถิ่นของคุณล้าสมัยแล้ว"
 
-#: ../softwareproperties/kde/SoftwarePropertiesKDE.py:706
+#: ../softwareproperties/qt/SoftwarePropertiesQt.py:765
 msgid "A new copy will be downloaded."
 msgstr "สำเนาฉบับใหม่จะถูกดาวน์โหลด"
 
-#: ../softwareproperties/kde/SoftwarePropertiesKDE.py:730
+#: ../softwareproperties/qt/SoftwarePropertiesQt.py:814
 msgid "CD Error"
 msgstr "CD มีปัญหา"
 
-#: ../softwareproperties/kde/SoftwarePropertiesKDE.py:731
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:848
+#: ../softwareproperties/qt/SoftwarePropertiesQt.py:815
+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:948
 msgid "Error scanning the CD"
 msgstr "ผิดพลาดในขณะทำการกวาดตรวจ CD"
 
-#: ../softwareproperties/kde/CdromProgress.py:54
+#: ../softwareproperties/qt/CdromProgress.py:54
 msgid "CD Name"
 msgstr "ชื่อแผ่น CD"
 
-#: ../softwareproperties/kde/CdromProgress.py:54
+#: ../softwareproperties/qt/CdromProgress.py:54
 #: ../softwareproperties/gtk/CdromProgress.py:61
 msgid "Please enter a name for the disc"
 msgstr "กรุณาใส่ชื่อสำหรับแผ่นดิสก์"
 
-#: ../softwareproperties/kde/CdromProgress.py:58
+#: ../softwareproperties/qt/CdromProgress.py:58
 msgid "Insert Disk"
 msgstr "ใส่แผน"
 
-#: ../softwareproperties/kde/CdromProgress.py:58
+#: ../softwareproperties/qt/CdromProgress.py:58
 #: ../softwareproperties/gtk/CdromProgress.py:77
 msgid "Please insert a disk in the drive:"
 msgstr "กรุณาใส่แผ่นเข้าไปในเครื่องเล่น:"
 
 #. L10N: the example is of the format: deb http://ftp.debian.org sarge main
-#: ../softwareproperties/kde/DialogAdd.py:55
+#: ../softwareproperties/qt/DialogAdd.py:55
 msgid "Enter the complete APT line of the repository that you want to add."
 msgstr "ป้อนชื่อสาย APT แบบเต็มของที่เก็บที่คุณต้องการเพิ่ม"
 
-#: ../softwareproperties/kde/DialogAdd.py:57
+#: ../softwareproperties/qt/DialogAdd.py:57
 #, python-format
 msgid ""
 "Include the type, location and components of the repository. Example: %s"
 msgstr "รวมประเภท ตำแหน่งที่ตั้ง และองค์ประกอบของที่เก็บด้วย ตัวอย่าง: %s"
 
-#: ../softwareproperties/kde/DialogEdit.py:43
+#: ../softwareproperties/qt/DialogEdit.py:43
 #: ../data/gtkbuilder/dialog-edit-source.ui.h:1
 msgid "Binary"
 msgstr "เลขฐานสอง"
 
-#: ../softwareproperties/kde/DialogEdit.py:44 ../data/gtkbuilder/main.ui.h:15
+#: ../softwareproperties/qt/DialogEdit.py:44 ../data/gtkbuilder/main.ui.h:18
 msgid "Source code"
 msgstr "ต้นฉบับโปรแกรม"
 
-#: ../softwareproperties/SoftwareProperties.py:515
-#: ../softwareproperties/SoftwareProperties.py:522
+#: ../softwareproperties/SoftwareProperties.py:516
+#: ../softwareproperties/SoftwareProperties.py:523
 msgid "(Source Code)"
 msgstr "(ต้นฉบับโปรแกรม)"
 
-#: ../softwareproperties/SoftwareProperties.py:528
+#: ../softwareproperties/SoftwareProperties.py:529
 msgid "Source Code"
 msgstr "ต้นฉบับโปรแกรม"
 
@@ -456,134 +455,149 @@
 msgid "Completed %s of %s tests"
 msgstr "ทดสอบไปแล้ว %s จากทั้งหมด %s"
 
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:700
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:719
+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:795
+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:814
 msgid "Active"
 msgstr "เปิดใช้งาน"
 
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:758
+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:859
 msgid "Key"
 msgstr "กุญแจ"
 
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:775
+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:876
 msgid "_Add key from paste data"
 msgstr "เพิ่ม key จากข้อมูลที่จะวาง"
 
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:788
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:799
+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:889
+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:900
 msgid "Error importing key"
 msgstr "การนำเข้า key ผิดพลาด"
 
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:789
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:800
+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:890
+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:901
 msgid "The selected data may not be a GPG key file or it might be corrupt."
 msgstr "ข้อมูลที่ถูกเลือกไว้อาจไม่เป็น GPG key file หรือมันอาจจะไม่สมบูรณ์."
 
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:849
+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:949
 msgid "Could not find a suitable CD."
 msgstr "หาแผ่นซีดีที่เหมาะสมไม่ได้"
 
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1066
+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1157
 msgid "Applying changes..."
 msgstr "กำลังปรับใช้การเปลี่ยนแปลง..."
 
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1173
-#: ../data/gtkbuilder/main.ui.h:45
+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1276
+#: ../data/gtkbuilder/main.ui.h:49
 msgid "Re_vert"
 msgstr "_คืนกลับ"
 
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1175
+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1278
 msgid "_Apply Changes"
 msgstr "_ปรับใช้การเปลี่ยนแปลง"
 
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1177
+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1280
 msgid "_Cancel"
 msgstr "_ยกเลิก"
 
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1179
+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1282
 msgid "_Restart..."
 msgstr "_เริ่มใหม่..."
 
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1194
+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1297
 msgid "Searching for available drivers..."
 msgstr "กำลังค้นหาไดรเวอร์ที่ใช้ได้..."
 
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1224
+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1327
 msgid "An error occurred while searching for drivers."
 msgstr "เกิดข้อผิดพลาดขณะค้นหาไดรเวอร์"
 
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1298
+#: ../softwareproperties/qt/SoftwarePropertiesQt.py:1101
+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1401
 msgid "This device is using the recommended driver."
 msgstr "อุปกรณ์นี้กำลังใช้ไดรเวอร์ที่แนะนำ"
 
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1299
+#: ../softwareproperties/qt/SoftwarePropertiesQt.py:1103
+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1402
 msgid "This device is using an alternative driver."
 msgstr "อุปกรณ์นี้กำลังใช้ไดรเวอร์อื่น"
 
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1300
+#: ../softwareproperties/qt/SoftwarePropertiesQt.py:1105
+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1403
 msgid "This device is using a manually-installed driver."
 msgstr "อุปกรณ์นี้กำลังใช้ไดรเวอร์ที่ถูกติดตั้งด้วยตนเอง"
 
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1301
+#: ../softwareproperties/qt/SoftwarePropertiesQt.py:1106
+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1404
 msgid "This device is not working."
 msgstr "อุปกรณ์นี้ไม่ทำงาน"
 
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1310
+#: ../softwareproperties/qt/SoftwarePropertiesQt.py:1115
+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1413
 msgid "Continue using a manually installed driver"
 msgstr "ใช้ไดรเวอร์ที่ถูกติดตั้งด้วยตนเองต่อไป"
 
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1337
+#: ../softwareproperties/qt/SoftwarePropertiesQt.py:1142
+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1440
 msgid "Using {} from {}"
 msgstr "กำลังใช้ {} จาก {}"
 
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1339
+#: ../softwareproperties/qt/SoftwarePropertiesQt.py:1144
+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1442
 msgid "Using {}"
 msgstr "กำลังใช้ {}"
 
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1346
+#: ../softwareproperties/qt/SoftwarePropertiesQt.py:1151
+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1449
 msgid "open source"
 msgstr "โอเพนซอร์ส"
 
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1348
+#: ../softwareproperties/qt/SoftwarePropertiesQt.py:1153
+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1451
 msgid "proprietary"
 msgstr "กรรมสิทธิ์"
 
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1351
+#: ../softwareproperties/qt/SoftwarePropertiesQt.py:1156
+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1454
 #, python-brace-format
 msgid "{base_description} ({licence}, tested)"
 msgstr "{base_description} ({licence}, ผ่านการทดสอบแล้ว)"
 
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1353
+#: ../softwareproperties/qt/SoftwarePropertiesQt.py:1158
+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1456
 #, python-brace-format
 msgid "{base_description} ({licence})"
 msgstr "{base_description} ({licence})"
 
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1373
+#: ../softwareproperties/qt/SoftwarePropertiesQt.py:1176
+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1476
 msgid "Do not use the device"
 msgstr "อย่าใช้อุปกรณ์นี้"
 
 #. No drivers found.
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1393
+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1496
 msgid "No additional drivers available."
 msgstr "ไม่มีไดรเวอร์เพิ่มเติมที่ใช้ได้"
 
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1411
+#. 1 for priority over the icon to stretch
+#: ../softwareproperties/qt/SoftwarePropertiesQt.py:1219
+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1514
 msgid "Unknown"
 msgstr "ไม่รู้จัก"
 
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1460
+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1563
 msgid "You need to restart the computer to complete the driver changes."
 msgstr ""
 "คุณต้องเริ่มระบบของคอมพิวเตอร์ใหม่เพื่อสิ้นสุดการเปลี่ยนแปลงของไดรเวอร์"
 
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1474
+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1577
 #, python-format
 msgid "%(count)d proprietary driver in use."
 msgid_plural "%(count)d proprietary drivers in use."
 msgstr[0] "%(count)d ไดรเวอร์กรรมสิทธิ์ใช้อยู่"
 
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1479
-#: ../data/gtkbuilder/main.ui.h:37
+#: ../softwareproperties/qt/SoftwarePropertiesQt.py:1287
+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1582
+#: ../data/gtkbuilder/main.ui.h:41
 msgid "No proprietary drivers are in use."
 msgstr "ไม่มีไดรเวอร์กรรมสิทธิ์ใช้อยู่"
 
@@ -798,68 +812,68 @@
 msgid "Scanning CD-ROM"
 msgstr "ตรวจสอบแผ่นซีดี"
 
-#: ../data/gtkbuilder/main.ui.h:1
+#: ../data/gtkbuilder/main.ui.h:4
 msgid "Display immediately"
 msgstr "แสดงตอนนี้"
 
-#: ../data/gtkbuilder/main.ui.h:2
+#: ../data/gtkbuilder/main.ui.h:5
 msgid "Display weekly"
 msgstr "แสดงทุก ๆ สัปดาห์"
 
-#: ../data/gtkbuilder/main.ui.h:3
+#: ../data/gtkbuilder/main.ui.h:6
 msgid "Display every two weeks"
 msgstr "แสดงทุก ๆ สองสัปดาห์"
 
-#: ../data/gtkbuilder/main.ui.h:4
+#: ../data/gtkbuilder/main.ui.h:7
 msgid "For any new version"
 msgstr "สำหรับทุก ๆ รุ่นใหม่"
 
-#: ../data/gtkbuilder/main.ui.h:5
+#: ../data/gtkbuilder/main.ui.h:8
 msgid "For long-term support versions"
 msgstr "สำหรับรุ่นที่ดูแลเป็นเวลานาน"
 
-#: ../data/gtkbuilder/main.ui.h:6
+#: ../data/gtkbuilder/main.ui.h:9
 msgid "Never"
 msgstr "ไม่ต้อง"
 
-#: ../data/gtkbuilder/main.ui.h:7
+#: ../data/gtkbuilder/main.ui.h:10
 msgid "Download automatically"
 msgstr "ดาว์โหลดแบบอัตโนมัติ"
 
-#: ../data/gtkbuilder/main.ui.h:8
+#: ../data/gtkbuilder/main.ui.h:11
 msgid "Download and install automatically"
 msgstr "ดาว์โหลดและติดตั้งแบบอัตโนมัติ"
 
-#: ../data/gtkbuilder/main.ui.h:13
+#: ../data/gtkbuilder/main.ui.h:16
 msgid "To install from a CD-ROM or DVD, insert the medium into the drive."
 msgstr ""
 "เพื่อที่จะติดตั้งจากแผ่นซีดีรอมหรือแผ่นดีวีดี กรุณาใส่แผ่นเข้าไปในเครื่องอ่าน"
 
-#: ../data/gtkbuilder/main.ui.h:16
+#: ../data/gtkbuilder/main.ui.h:19
 msgid "Download from:"
 msgstr "ดาวน์โหลดจาก:"
 
-#: ../data/gtkbuilder/main.ui.h:17
+#: ../data/gtkbuilder/main.ui.h:20
 msgid "<b>Downloadable from the Internet</b>"
 msgstr "<b>สามารถดาวน์โหลดได้จากอินเทอร์เน็ต</b>"
 
-#: ../data/gtkbuilder/main.ui.h:18
+#: ../data/gtkbuilder/main.ui.h:21
 msgid "<b>Installable from CD-ROM/DVD</b>"
 msgstr "<b>ติดตั้งได้จาก ซีดี/ดีวีดี</b>"
 
-#: ../data/gtkbuilder/main.ui.h:19
+#: ../data/gtkbuilder/main.ui.h:22
 msgid "Add..."
 msgstr "เพิ่ม..."
 
-#: ../data/gtkbuilder/main.ui.h:20
+#: ../data/gtkbuilder/main.ui.h:23
 msgid "Edit..."
 msgstr "แก้ไข..."
 
-#: ../data/gtkbuilder/main.ui.h:21
+#: ../data/gtkbuilder/main.ui.h:24
 msgid "Add Volume..."
 msgstr "เพิ่มโวลุม..."
 
-#: ../data/gtkbuilder/main.ui.h:22
+#: ../data/gtkbuilder/main.ui.h:25
 msgid "Other Software"
 msgstr "ซอฟต์แวร์อื่นๆ"
 
@@ -867,35 +881,35 @@
 msgid "Install updates from:"
 msgstr "ติดตั้งการปรับปรุงจาก:"
 
-#: ../data/gtkbuilder/main.ui.h:24
+#: ../data/gtkbuilder/main.ui.h:28
 msgid "Automatically check for updates:"
 msgstr "ตรวจสอบการปรับปรุงแบบอัตโนมัติ:"
 
-#: ../data/gtkbuilder/main.ui.h:25
+#: ../data/gtkbuilder/main.ui.h:29
 msgid "When there are security updates:"
 msgstr "เมื่อมีการปรับปรุงความปลอดภัย:"
 
-#: ../data/gtkbuilder/main.ui.h:26
+#: ../data/gtkbuilder/main.ui.h:30
 msgid "When there are other updates:"
 msgstr "เมื่อมีการปรับปรุงอื่น ๆ:"
 
-#: ../data/gtkbuilder/main.ui.h:27
+#: ../data/gtkbuilder/main.ui.h:31
 msgid "Notify me of a new Ubuntu version:"
 msgstr "แจ้งเตือนฉันเมื่อมี Ubuntu รุ่นใหม่:"
 
-#: ../data/gtkbuilder/main.ui.h:28
+#: ../data/gtkbuilder/main.ui.h:32
 msgid "Updates"
 msgstr "ปรับปรุง"
 
-#: ../data/gtkbuilder/main.ui.h:29
+#: ../data/gtkbuilder/main.ui.h:33
 msgid "<b>Trusted software providers</b>"
 msgstr "<b>ผู้ให้บริการซอฟท์แวร์ที่เชื่อถือได้</b>"
 
-#: ../data/gtkbuilder/main.ui.h:30
+#: ../data/gtkbuilder/main.ui.h:34
 msgid "    "
 msgstr "    "
 
-#: ../data/gtkbuilder/main.ui.h:31
+#: ../data/gtkbuilder/main.ui.h:35
 msgid ""
 "Keys are used to authenticate the correct source of software and so protect "
 "your computer from malicious software"
@@ -903,27 +917,27 @@
 "รหัสกุญแจใช้สำหรับยืนยันแหล่งข้อมูลที่ถูกต้องและป้องกันคอมพิวเตอร์ของคุณจากซอ"
 "ฟต์แวร์ที่เป็นอันตราย"
 
-#: ../data/gtkbuilder/main.ui.h:32
+#: ../data/gtkbuilder/main.ui.h:36
 msgid "_Import Key File..."
 msgstr "_นำเข้ารหัสกุณแจไฟล์"
 
-#: ../data/gtkbuilder/main.ui.h:33
+#: ../data/gtkbuilder/main.ui.h:37
 msgid "Import the public key from a trusted software provider"
 msgstr "นำเข้ากุญแจสาธารณะจากผู้ให้ซอฟแวร์ที่น่าเชื่อถือ"
 
-#: ../data/gtkbuilder/main.ui.h:34
+#: ../data/gtkbuilder/main.ui.h:38
 msgid "Restore _Defaults"
 msgstr "_คืนค่าปริยาย"
 
-#: ../data/gtkbuilder/main.ui.h:35
+#: ../data/gtkbuilder/main.ui.h:39
 msgid "Restore the default keys of your distribution"
 msgstr "คืนกุญแจเดืมของชุดเผยแพร่ของคุณ"
 
-#: ../data/gtkbuilder/main.ui.h:36
+#: ../data/gtkbuilder/main.ui.h:40
 msgid "Authentication"
 msgstr "การยืนยันของจริง"
 
-#: ../data/gtkbuilder/main.ui.h:38
+#: ../data/gtkbuilder/main.ui.h:42
 msgid ""
 "<small>A proprietary driver has private code that Ubuntu developers can't "
 "review or improve. Security and other updates are dependent on the driver "
@@ -933,33 +947,33 @@
 "ไม่สามารถตรวจสอบหรือปรับปรุงได้ การอัปเดตความปลอดภัยและการอัปเดตอื่น ๆ "
 "จะแตกต่างกันไปตามผู้ผลิตไดรเวอร์นั้น ๆ</small>"
 
-#: ../data/gtkbuilder/main.ui.h:39
+#: ../data/gtkbuilder/main.ui.h:43
 msgid "Additional Drivers"
 msgstr "ไดรเวอร์เพิ่มเติม"
 
-#: ../data/gtkbuilder/main.ui.h:40
+#: ../data/gtkbuilder/main.ui.h:44
 msgid ""
 "Use proposed updates if you’re willing to report bugs on any problems that "
 "occur."
 msgstr ""
 "ใช้การอัปเดตที่เสนอ ถ้าคุณต้องการรายงานบั๊กเกี่ยวกับปัญหาใด ๆ ที่เกิดขึ้น"
 
-#: ../data/gtkbuilder/main.ui.h:41
+#: ../data/gtkbuilder/main.ui.h:45
 msgid "Developer Options"
 msgstr "ตัวเลือกสำหรับนักพัฒนา"
 
-#: ../data/gtkbuilder/main.ui.h:42
+#: ../data/gtkbuilder/main.ui.h:46
 msgid ""
 "Canonical Livepatch helps keep your system secure by applying security "
 "updates that don't require a restart. <a "
 "href=\"https://www.ubuntu.com/livepatch\">Learn More</a>"
 msgstr ""
 
-#: ../data/gtkbuilder/main.ui.h:43
+#: ../data/gtkbuilder/main.ui.h:47
 msgid "column"
 msgstr ""
 
-#: ../data/gtkbuilder/main.ui.h:44
+#: ../data/gtkbuilder/main.ui.h:48
 msgid "Show Livepatch status in the top bar"
 msgstr ""
 
diff -Nru language-pack-th-18.04+20200123/data/th/LC_MESSAGES/sos.po language-pack-th-18.04+20200702/data/th/LC_MESSAGES/sos.po
--- language-pack-th-18.04+20200123/data/th/LC_MESSAGES/sos.po	2020-01-23 16:55:54.000000000 +0000
+++ language-pack-th-18.04+20200702/data/th/LC_MESSAGES/sos.po	2020-07-08 13:58:06.000000000 +0000
@@ -13,8 +13,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2020-01-23 12:13+0000\n"
-"X-Generator: Launchpad (build b8d1327fd820d6bf500589d6da587d5037c7d88e)\n"
+"X-Launchpad-Export-Date: 2020-07-02 11:51+0000\n"
+"X-Generator: Launchpad (build 1cbd0aa39df153c901321817f9b57cf3f232b507)\n"
 "Language: th\n"
 "Generated-By: pygettext.py 1.5\n"
 
diff -Nru language-pack-th-18.04+20200123/data/th/LC_MESSAGES/ubiquity-debconf.po language-pack-th-18.04+20200702/data/th/LC_MESSAGES/ubiquity-debconf.po
--- language-pack-th-18.04+20200123/data/th/LC_MESSAGES/ubiquity-debconf.po	2020-01-23 16:55:53.000000000 +0000
+++ language-pack-th-18.04+20200702/data/th/LC_MESSAGES/ubiquity-debconf.po	2020-07-08 13:58:06.000000000 +0000
@@ -13,8 +13,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2020-01-23 11:29+0000\n"
-"X-Generator: Launchpad (build b8d1327fd820d6bf500589d6da587d5037c7d88e)\n"
+"X-Launchpad-Export-Date: 2020-07-02 11:17+0000\n"
+"X-Generator: Launchpad (build 1cbd0aa39df153c901321817f9b57cf3f232b507)\n"
 "Language: th\n"
 
 #. Type: text
@@ -46,7 +46,7 @@
 #. This is used as a window title.
 #. Type: text
 #. Description
-#: ../ubiquity.templates:7001 ../ubiquity.templates:183001
+#: ../ubiquity.templates:7001 ../ubiquity.templates:184001
 msgid "Install"
 msgstr "ติดตั้ง"
 
@@ -383,31 +383,31 @@
 #. Description
 #. This is used as a button label, and should be translated as an action.
 #. Omit the [ ... ] from the translation.
-#: ../ubiquity.templates:55001
+#: ../ubiquity.templates:56001
 msgid "_Install Now[ action ]"
 msgstr "_ติดตั้งเดี๋ยวนี้[ action ]"
 
 #. Type: title
 #. Description
-#: ../ubiquity.templates:56001
+#: ../ubiquity.templates:57001
 msgid "Quit the installation?"
 msgstr "ต้องการออกจากการติดตั้งหรือไม่?"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:57001
+#: ../ubiquity.templates:58001
 msgid "Do you really want to quit the installation now?"
 msgstr "คุณแน่ใจหรือไม่ว่าต้องการออกจากการติดตั้งเดี๋ยวนี้?"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:58001
+#: ../ubiquity.templates:59001
 msgid "Bootloader install failed"
 msgstr "การติดตั้งบูตโหลดเดอร์ล้มเหลว"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:59001
+#: ../ubiquity.templates:60001
 msgid ""
 "Sorry, an error occurred and it was not possible to install the bootloader "
 "at the specified location."
@@ -417,63 +417,63 @@
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:60001
+#: ../ubiquity.templates:61001
 msgid "Choose a different device to install the bootloader on:"
 msgstr "เลือกอุปกรณ์อื่นที่จะติดตั้งบูตโหลดเดอร์ลงไป:"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:61001
+#: ../ubiquity.templates:62001
 msgid "Continue without a bootloader."
 msgstr "ดำเนินการต่อโดยปราศจากบูตโหลดเดอร์"
 
 #. Type: text
 #. Description
 #. RELEASE is a variable substituted into this string, and may be 'Ubuntu'
-#: ../ubiquity.templates:62001
+#: ../ubiquity.templates:63001
 msgid ""
 "You will need to manually install a bootloader in order to start ${RELEASE}."
 msgstr "คุณจะต้องติดตั้งบูตโหลดเดอร์ด้วยตัวเองเพื่อเริ่ม ${RELEASE}"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:63001
+#: ../ubiquity.templates:64001
 msgid "Cancel the installation."
 msgstr "ยกเลิกการติดตั้ง"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:64001
+#: ../ubiquity.templates:65001
 msgid "This may leave your computer unable to boot."
 msgstr "นี่อาจทำให้คอมพิวเตอร์ไม่สามารถบูตได้"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:65001
+#: ../ubiquity.templates:66001
 msgid "How would you like to proceed?"
 msgstr "คุณต้องการดำเนินการอย่างไร?"
 
 #. Type: title
 #. Description
-#: ../ubiquity.templates:67001
+#: ../ubiquity.templates:68001
 msgid "Installation Complete"
 msgstr "การติดตั้งสมบูรณ์"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:68001
+#: ../ubiquity.templates:69001
 msgid "Continue Testing"
 msgstr "ทดลองใช้งานต่อไป"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:69001
+#: ../ubiquity.templates:70001
 msgid "Restart Now"
 msgstr "เริ่มระบบใหม่เดี๋ยวนี้"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:70001
+#: ../ubiquity.templates:71001
 msgid "Shutdown Now"
 msgstr "ปิดเครื่องเดี๋ยวนี้"
 
@@ -481,13 +481,13 @@
 #. Description
 #. Type: text
 #. Description
-#: ../ubiquity.templates:72001 ../ubiquity.templates:73001
+#: ../ubiquity.templates:73001 ../ubiquity.templates:74001
 msgid "Installer crashed"
 msgstr "โปรแกรมติดตั้งเกิดการขัดข้อง"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:74001
+#: ../ubiquity.templates:75001
 msgid ""
 "We're sorry; the installer crashed. After you close this window, we'll allow "
 "you to file a bug report using the integrated bug reporting tool. This will "
@@ -504,56 +504,56 @@
 #. Type: text
 #. Description
 #. An indicator menu item.  The underscore goes before an accelerator key.
-#: ../ubiquity.templates:75001
+#: ../ubiquity.templates:76001
 msgid "_High Contrast"
 msgstr "_ความเปรียบต่างสูง"
 
 #. Type: text
 #. Description
 #. An indicator menu item.  The underscore goes before an accelerator key.
-#: ../ubiquity.templates:76001
+#: ../ubiquity.templates:77001
 msgid "_Screen Reader"
 msgstr "_ตัวอ่านหน้าจอ"
 
 #. Type: text
 #. Description
 #. An indicator menu item.  The underscore goes before an accelerator key.
-#: ../ubiquity.templates:77001
+#: ../ubiquity.templates:78001
 msgid "_Keyboard Modifiers"
 msgstr "ตัว_ปรับแต่งแป้นพิมพ์"
 
 #. Type: text
 #. Description
 #. An indicator menu item.  The underscore goes before an accelerator key.
-#: ../ubiquity.templates:78001
+#: ../ubiquity.templates:79001
 msgid "_On-screen Keyboard"
 msgstr "แป้น_พิมพ์บนหน้าจอ"
 
 #. Type: text
 #. Description
 #. An action, displayed on a button or as a menu item.
-#: ../ubiquity.templates:79001
+#: ../ubiquity.templates:80001
 msgid "New Partition Table..."
 msgstr "พาร์ทิชันใหม่..."
 
 #. Type: text
 #. Description
 #. An action, displayed on a button or as a menu item.
-#: ../ubiquity.templates:80001
+#: ../ubiquity.templates:81001
 msgid "Add..."
 msgstr "เพิ่ม..."
 
 #. Type: text
 #. Description
 #. An action, displayed on a button or as a menu item.
-#: ../ubiquity.templates:81001
+#: ../ubiquity.templates:82001
 msgid "Change..."
 msgstr "เปลี่ยน..."
 
 #. Type: text
 #. Description
 #. An action, displayed on a button or as a menu item.
-#: ../ubiquity.templates:82001
+#: ../ubiquity.templates:83001
 msgid "Delete"
 msgstr "ลบ"
 
@@ -562,20 +562,20 @@
 #. An action, displayed on a button or as a menu item.
 #. Type: text
 #. Description
-#: ../ubiquity.templates:83001 ../ubiquity.templates:297001
+#: ../ubiquity.templates:84001 ../ubiquity.templates:303001
 msgid "Revert"
 msgstr "กลับคืนค่าเดิม"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:84001
+#: ../ubiquity.templates:85001
 msgid "Recalculating partitions..."
 msgstr "กำลังคำนวนพาร์ทิชันอีกครั้ง..."
 
 #. Type: text
 #. Description
 #. A column heading in the partitioner.
-#: ../ubiquity.templates:85001
+#: ../ubiquity.templates:86001
 msgid "Device"
 msgstr "อุปกรณ์"
 
@@ -583,28 +583,28 @@
 #. Description
 #. A column heading in the partitioner. Indicates how the partition is to be
 #. used (ext2, swap, etc.).
-#: ../ubiquity.templates:86001
+#: ../ubiquity.templates:87001
 msgid "Type"
 msgstr "ชนิด"
 
 #. Type: text
 #. Description
 #. A column heading in the partitioner.
-#: ../ubiquity.templates:87001
+#: ../ubiquity.templates:88001
 msgid "Mount point"
 msgstr "จุดเมานท์"
 
 #. Type: text
 #. Description
 #. A column heading in the partitioner.
-#: ../ubiquity.templates:88001
+#: ../ubiquity.templates:89001
 msgid "Format?"
 msgstr "ต้องการฟอร์แมตหรือไม่?"
 
 #. Type: text
 #. Description
 #. A column heading in the partitioner.
-#: ../ubiquity.templates:89001
+#: ../ubiquity.templates:90001
 msgid "Size"
 msgstr "ขนาด"
 
@@ -612,89 +612,89 @@
 #. Description
 #. A column heading in the partitioner. Indicates how much of the space on
 #. this partition is used by data.
-#: ../ubiquity.templates:90001
+#: ../ubiquity.templates:91001
 msgid "Used"
 msgstr "ใช้ไป"
 
 #. Type: text
 #. Description
 #. A column heading in the partitioner.
-#: ../ubiquity.templates:91001
+#: ../ubiquity.templates:92001
 msgid "System"
 msgstr "ระบบ"
 
 #. Type: text
 #. Description
 #. Indicates unpartitioned free space on a disk.
-#: ../ubiquity.templates:92001
+#: ../ubiquity.templates:93001
 msgid "free space"
 msgstr "พื้นที่ว่าง"
 
 #. Type: text
 #. Description
 #. Indicates that we do not know how much space is used on this partition.
-#: ../ubiquity.templates:93001
+#: ../ubiquity.templates:94001
 msgid "unknown"
 msgstr "ไม่ทราบ"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:94001
+#: ../ubiquity.templates:95001
 msgid "Create partition"
 msgstr "สร้างพาร์ทิชัน"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:95001
+#: ../ubiquity.templates:96001
 msgid "Size:"
 msgstr "ขนาด:"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:96001
+#: ../ubiquity.templates:97001
 msgid "Beginning of this space"
 msgstr "จุดเริ่มต้นของพื้นที่ว่างนี้"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:97001
+#: ../ubiquity.templates:98001
 msgid "End of this space"
 msgstr "จุดสิ้นสุดของพื้นที่ว่างนี้"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:98001
+#: ../ubiquity.templates:99001
 msgid "Primary"
 msgstr "ไพรมารี"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:99001
+#: ../ubiquity.templates:100001
 msgid "Logical"
 msgstr "ลอจิคัล"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:100001
+#: ../ubiquity.templates:101001
 msgid "Edit partition"
 msgstr "แก้ไขพาร์ทิชัน"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:101001
+#: ../ubiquity.templates:102001
 msgid "Edit a partition"
 msgstr "แก้ไขพาร์ทิชัน"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:102001
+#: ../ubiquity.templates:103001
 msgid "Boot loader"
 msgstr "บูตโหลดเดอร์"
 
 #. Type: text
 #. Description
 #. RELEASE is a variable substituted into this string, and may be 'Ubuntu'
-#: ../ubiquity.templates:103001
+#: ../ubiquity.templates:104001
 msgid ""
 "Installation has finished.  You can continue testing ${RELEASE} now, but "
 "until you restart the computer, any changes you make or documents you save "
@@ -707,7 +707,7 @@
 #. Type: text
 #. Description
 #. Translators, this text will appear on a button, so KEEP IT SHORT
-#: ../ubiquity.templates:104001
+#: ../ubiquity.templates:105001
 msgid "Go Back"
 msgstr "ย้อนกลับ"
 
@@ -717,34 +717,34 @@
 #. Type: text
 #. Description
 #. Translators, this text will appear on a button, so KEEP IT SHORT
-#: ../ubiquity.templates:105001 ../ubiquity.templates:108001
+#: ../ubiquity.templates:106001 ../ubiquity.templates:109001
 msgid "Continue"
 msgstr "ดำเนินการต่อ"
 
 #. Type: text
 #. Description
 #. Translators, this text will appear on a button, so KEEP IT SHORT
-#: ../ubiquity.templates:106001
+#: ../ubiquity.templates:107001
 msgid "Connect"
 msgstr "เชื่อมต่อ"
 
 #. Type: text
 #. Description
 #. Translators, this text will appear on a button, so KEEP IT SHORT
-#: ../ubiquity.templates:107001
+#: ../ubiquity.templates:108001
 msgid "Stop"
 msgstr "หยุด"
 
 #. Type: text
 #. Description
 #. Translators, this text will appear on a button, so KEEP IT SHORT
-#: ../ubiquity.templates:109001
+#: ../ubiquity.templates:110001
 msgid "Continue in UEFI mode"
 msgstr "ดำเนินการต่อในโหมด UEFI"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:110001
+#: ../ubiquity.templates:111001
 msgid ""
 "Installation is complete. You need to restart the computer in order to use "
 "the new installation."
@@ -754,31 +754,31 @@
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:111001
+#: ../ubiquity.templates:112001
 msgid "Verifying the installation configuration..."
 msgstr "กำลังตรวจสอบการตั้งค่าการติตตั้ง..."
 
 #. Type: title
 #. Description
-#: ../ubiquity.templates:112001
+#: ../ubiquity.templates:113001
 msgid "Installing system"
 msgstr "กำลังติดตั้งระบบ"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:113001
+#: ../ubiquity.templates:114001
 msgid "Finding the distribution to copy..."
 msgstr "กำลังค้นหาชุดแจกจ่ายเพื่อคัดลอก..."
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:115001
+#: ../ubiquity.templates:116001
 msgid "Copying files..."
 msgstr "กำลังคัดลอกแฟ้ม..."
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:116001
+#: ../ubiquity.templates:117001
 msgid "Almost finished copying files..."
 msgstr "การคัดลอกแฟ้มใกล้เสร็จ..."
 
@@ -792,9 +792,9 @@
 #. Description
 #. Type: select
 #. Description
-#: ../ubiquity.templates:117001 ../ubiquity.templates:118001
-#: ../ubiquity.templates:119001 ../ubiquity.templates:120001
-#: ../ubiquity.templates:121001
+#: ../ubiquity.templates:118001 ../ubiquity.templates:119001
+#: ../ubiquity.templates:120001 ../ubiquity.templates:121001
+#: ../ubiquity.templates:122001
 msgid "Installation Failed"
 msgstr "การติดตั้งล้มเหลว"
 
@@ -806,14 +806,14 @@
 #. Description
 #. Type: error
 #. Description
-#: ../ubiquity.templates:117001 ../ubiquity.templates:118001
-#: ../ubiquity.templates:119001 ../ubiquity.templates:120001
+#: ../ubiquity.templates:118001 ../ubiquity.templates:119001
+#: ../ubiquity.templates:120001 ../ubiquity.templates:121001
 msgid "The installer encountered an error copying files to the hard disk:"
 msgstr "โปรแกรมติดตั้งเกิดข้อผิดพลาด ไม่สามารถคัดลอกแฟ้มลงฮาร์ดดิสก์ได้:"
 
 #. Type: error
 #. Description
-#: ../ubiquity.templates:117001
+#: ../ubiquity.templates:118001
 msgid ""
 "This is due to there being insufficient disk space for the install to "
 "complete on the target partition.  Please run the installer again and select "
@@ -825,7 +825,7 @@
 
 #. Type: error
 #. Description
-#: ../ubiquity.templates:118001
+#: ../ubiquity.templates:119001
 msgid ""
 "This is often due to a faulty CD/DVD disk or drive. It may help to clean the "
 "CD/DVD, to burn the CD/DVD at a lower speed, or to clean the CD/DVD drive "
@@ -838,7 +838,7 @@
 
 #. Type: error
 #. Description
-#: ../ubiquity.templates:119001
+#: ../ubiquity.templates:120001
 msgid ""
 "This is often due to a faulty hard disk. It may help to check whether the "
 "hard disk is old and in need of replacement, or to move the system to a "
@@ -856,7 +856,7 @@
 #. Description
 #. This is used when there was an md5 mismatch during copying, meaning that
 #. the source file and destination file are not equal.
-#: ../ubiquity.templates:120001 ../ubiquity.templates:121001
+#: ../ubiquity.templates:121001 ../ubiquity.templates:122001
 msgid ""
 "This is often due to a faulty CD/DVD disk or drive, or a faulty hard disk. "
 "It may help to clean the CD/DVD, to burn the CD/DVD at a lower speed, to "
@@ -873,151 +873,151 @@
 
 #. Type: select
 #. Description
-#: ../ubiquity.templates:121001
+#: ../ubiquity.templates:122001
 msgid "The following file did not match its source copy on the CD/DVD:"
 msgstr "แฟ้มต่อไปนี้ไม่ตรงกับแฟ้มต้นฉบับบนซีดี/ดีวีดี:"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:122001
+#: ../ubiquity.templates:123001
 msgid "Copying installation logs..."
 msgstr "กำลังคัดลอกปูมการติดตั้ง..."
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:123001
+#: ../ubiquity.templates:124001
 msgid "Configuring target system..."
 msgstr "กำลังตั้งค่าระบบปลายทาง..."
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:124001
+#: ../ubiquity.templates:125001
 msgid "Configuring system locales..."
 msgstr "กำลังตั้งค่าระบบภายใน..."
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:125001
+#: ../ubiquity.templates:126001
 msgid "Configuring apt..."
 msgstr "กำลังตั้งค่า apt..."
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:126001
+#: ../ubiquity.templates:127001
 msgid "Configuring time zone..."
 msgstr "กำลังตั้งค่าเขตเวลา..."
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:127001
+#: ../ubiquity.templates:128001
 msgid "Configuring keyboard..."
 msgstr "กำลังตั้งค่าแป้นพิมพ์..."
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:128001
+#: ../ubiquity.templates:129001
 msgid "Creating user..."
 msgstr "กำลังสร้างผู้ใช้..."
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:129001
+#: ../ubiquity.templates:130001
 msgid "Configuring hardware..."
 msgstr "กำลังตั้งค่าฮาร์ดแวร์..."
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:130001
+#: ../ubiquity.templates:131001
 msgid "Installing third-party software..."
 msgstr "กำลังติดตั้งซอฟต์แวร์จากบุคคลที่สาม..."
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:131001
+#: ../ubiquity.templates:132001
 msgid "Configuring network..."
 msgstr "กำลังตั้งค่าเครือข่าย..."
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:132001
+#: ../ubiquity.templates:133001
 msgid "Configuring boot loader..."
 msgstr "กำลังตั้งค่าบูตโหลดเดอร์..."
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:133001
+#: ../ubiquity.templates:134001
 msgid "Saving installed packages..."
 msgstr "กำลังบันทึกแพกเกจที่ติดตั้งแล้ว..."
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:134001
+#: ../ubiquity.templates:135001
 msgid "Restoring previously installed packages..."
 msgstr "กำลังกู้คืนแพกเกจที่ติดตั้งเมื่อครั้งที่แล้ว..."
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:135001
+#: ../ubiquity.templates:136001
 msgid "Installing additional packages..."
 msgstr "กำลังติดตั้งแพกเกจเพิ่มเติม..."
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:136001
+#: ../ubiquity.templates:137001
 msgid "Checking for packages to install..."
 msgstr "กำลังตรวจแพกเกจที่จะติดตั้ง..."
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:137001
+#: ../ubiquity.templates:138001
 msgid "Removing extra packages..."
 msgstr "กำลังถอดถอนแพกเกจเสริม..."
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:138001
+#: ../ubiquity.templates:139001
 msgid "Checking for packages to remove..."
 msgstr "กำลังตรวจสอบแพกเกจที่จะถอดถอน..."
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:139001
+#: ../ubiquity.templates:140001
 msgid "Downloading packages (${TIME} remaining)..."
 msgstr "กำลังดาวน์โหลดแพกเกจ (ต้องใช้เวลาอีก ${TIME})..."
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:140001
+#: ../ubiquity.templates:141001
 msgid "Downloading package lists..."
 msgstr "กำลังดาวน์โหลดรายชื่อแพกเกจ..."
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:141001
+#: ../ubiquity.templates:142001
 msgid "Downloading package lists (${TIME} remaining)..."
 msgstr "กำลังดาวน์โหลดรายชื่อแพกเกจ (ต้องใช้เวลาอีก ${TIME})..."
 
 #. Type: error
 #. Description
-#: ../ubiquity.templates:143001
+#: ../ubiquity.templates:144001
 msgid "Error installing ${PACKAGE}"
 msgstr "ผิดพลาดขณะกำลังติดตั้ง ${PACKAGE}"
 
 #. Type: error
 #. Description
-#: ../ubiquity.templates:144001
+#: ../ubiquity.templates:145001
 msgid "Error removing ${PACKAGE}"
 msgstr "ผิดพลาดขณะกำลังถอดถอน ${PACKAGE}"
 
 #. Type: error
 #. Description
-#: ../ubiquity.templates:145001
+#: ../ubiquity.templates:146001
 msgid "Error while installing packages"
 msgstr "ผิดพลาดขณะติดตั้งแพกเกจ"
 
 #. Type: error
 #. Description
-#: ../ubiquity.templates:145001
+#: ../ubiquity.templates:146001
 msgid "An error occurred while installing packages:"
 msgstr "เกิดข้อผิดพลาดขณะกำลังติดตั้งแพกเกจ:"
 
@@ -1025,7 +1025,7 @@
 #. Description
 #. Type: error
 #. Description
-#: ../ubiquity.templates:145001 ../ubiquity.templates:146001
+#: ../ubiquity.templates:146001 ../ubiquity.templates:147001
 msgid "The following packages are in a broken state:"
 msgstr "แพกเกจต่อไปนี้อยู่ในสถานะที่เสีย:"
 
@@ -1033,7 +1033,7 @@
 #. Description
 #. Type: error
 #. Description
-#: ../ubiquity.templates:145001 ../ubiquity.templates:146001
+#: ../ubiquity.templates:146001 ../ubiquity.templates:147001
 msgid ""
 "This may be due to using an old installer image, or it may be due to a bug "
 "in some of the packages listed above. More details may be found in "
@@ -1053,25 +1053,25 @@
 
 #. Type: error
 #. Description
-#: ../ubiquity.templates:146001
+#: ../ubiquity.templates:147001
 msgid "Error while removing packages"
 msgstr "ผิดพลาดขณะกำลังถอดถอนแพกเกจ"
 
 #. Type: error
 #. Description
-#: ../ubiquity.templates:146001
+#: ../ubiquity.templates:147001
 msgid "An error occurred while removing packages:"
 msgstr "ข้อผิดพลาดขณะกำลังถอดถอนแพกเกจ:"
 
 #. Type: error
 #. Description
-#: ../ubiquity.templates:147001
+#: ../ubiquity.templates:148001
 msgid "Error copying network configuration"
 msgstr "การคัดลอกการตั้งค่าเครือข่ายผิดพลาด"
 
 #. Type: error
 #. Description
-#: ../ubiquity.templates:147001
+#: ../ubiquity.templates:148001
 msgid ""
 "An error occurred while copying the network settings.  The installation will "
 "continue, but the network configuration will have to be set up again in the "
@@ -1083,13 +1083,13 @@
 
 #. Type: error
 #. Description
-#: ../ubiquity.templates:148001
+#: ../ubiquity.templates:149001
 msgid "Error copying bluetooth configuration"
 msgstr "เกิดข้อผิดพลาดในการคัดลอกการกำหนดค่าบลูทูธ"
 
 #. Type: error
 #. Description
-#: ../ubiquity.templates:148001
+#: ../ubiquity.templates:149001
 msgid ""
 "An error occurred while copying the bluetooth settings.  The installation "
 "will continue, but the bluetooth configuration will have to be set up again "
@@ -1100,13 +1100,13 @@
 
 #. Type: error
 #. Description
-#: ../ubiquity.templates:149001
+#: ../ubiquity.templates:150001
 msgid "Error restoring installed applications"
 msgstr "การกู้คืนแอปพลิเคชันที่ติดตั้งแล้วผิดพลาด"
 
 #. Type: error
 #. Description
-#: ../ubiquity.templates:149001
+#: ../ubiquity.templates:150001
 msgid ""
 "An error occurred while restoring previously-installed applications.  The "
 "installation will continue, but you may have to manually reinstall some "
@@ -1118,31 +1118,31 @@
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:153001
+#: ../ubiquity.templates:154001
 msgid "Calculating files to skip copying..."
 msgstr "กำลังคำนวณแฟ้มที่ข้ามการคัดลอก..."
 
 #. Type: title
 #. Description
-#: ../ubiquity.templates:154001
+#: ../ubiquity.templates:155001
 msgid "Installing language packs"
 msgstr "กำลังติดตั้งชุดภาษา"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:155001
+#: ../ubiquity.templates:156001
 msgid "Downloading language packs (${TIME} remaining)..."
 msgstr "กำลังดาวน์โหลดชุดภาษา (ต้องใช้เวลาอีก ${TIME})..."
 
 #. Type: boolean
 #. Description
-#: ../ubiquity.templates:164001
+#: ../ubiquity.templates:165001
 msgid "Failed to unmount partitions"
 msgstr "การเลิกเมานท์พาร์ทิชันไม่สำเร็จ"
 
 #. Type: boolean
 #. Description
-#: ../ubiquity.templates:164001
+#: ../ubiquity.templates:165001
 msgid ""
 "The installer needs to commit changes to partition tables, but cannot do so "
 "because partitions on the following mount points could not be unmounted:"
@@ -1153,13 +1153,13 @@
 
 #. Type: boolean
 #. Description
-#: ../ubiquity.templates:164001
+#: ../ubiquity.templates:165001
 msgid "Please close any applications using these mount points."
 msgstr "โปรดปิดแอปพลิเคชันใด ๆ ที่กำลังใช้จุดเมานท์เหล่านี้"
 
 #. Type: boolean
 #. Description
-#: ../ubiquity.templates:164001
+#: ../ubiquity.templates:165001
 msgid ""
 "Would you like the installer to try to unmount these partitions again?"
 msgstr ""
@@ -1167,13 +1167,13 @@
 
 #. Type: boolean
 #. Description
-#: ../ubiquity.templates:170001
+#: ../ubiquity.templates:171001
 msgid "Do you want to return to the partitioner?"
 msgstr "คุณต้องการกลับไปยังตัวจัดพาร์ติชันหรือไม่?"
 
 #. Type: boolean
 #. Description
-#: ../ubiquity.templates:170001
+#: ../ubiquity.templates:171001
 msgid ""
 "Some of the partitions you created are too small.  Please make the following "
 "partitions at least this large:"
@@ -1183,7 +1183,7 @@
 
 #. Type: boolean
 #. Description
-#: ../ubiquity.templates:170001
+#: ../ubiquity.templates:171001
 msgid ""
 "If you do not go back to the partitioner and increase the size of these "
 "partitions, the installation may fail."
@@ -1193,7 +1193,7 @@
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:172001
+#: ../ubiquity.templates:173001
 msgid "System Configuration"
 msgstr "ตั้งค่าระบบ"
 
@@ -1201,25 +1201,25 @@
 #. Description
 #. Type: text
 #. Description
-#: ../ubiquity.templates:173001 ../ubiquity.templates:251001
+#: ../ubiquity.templates:174001 ../ubiquity.templates:257001
 msgid "Welcome"
 msgstr "ยินดีต้อนรับ"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:174001
+#: ../ubiquity.templates:175001
 msgid "Network configuration"
 msgstr "ตั้งค่าเครือข่าย"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:175001
+#: ../ubiquity.templates:176001
 msgid "Software selection"
 msgstr "เลือกซอฟต์แวร์"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:176001
+#: ../ubiquity.templates:177001
 msgid "Language"
 msgstr "ภาษา"
 
@@ -1227,111 +1227,111 @@
 #. Description
 #. Type: text
 #. Description
-#: ../ubiquity.templates:177001 ../ubiquity.templates:201001
+#: ../ubiquity.templates:178001 ../ubiquity.templates:202001
 msgid "Wireless"
 msgstr "ไร้สาย"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:178001
+#: ../ubiquity.templates:179001
 msgid "Software"
 msgstr "ซอฟต์แวร์"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:179001
+#: ../ubiquity.templates:180001
 msgid "Timezone"
 msgstr "เขตเวลา"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:180001
+#: ../ubiquity.templates:181001
 msgid "Keyboard"
 msgstr "แป้นพิมพ์"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:181001
+#: ../ubiquity.templates:182001
 msgid "Disk Setup"
 msgstr "ตั้งค่าดิสก์"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:182001
+#: ../ubiquity.templates:183001
 msgid "User Info"
 msgstr "ข้อมูลผู้ใช้"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:184001
+#: ../ubiquity.templates:185001
 msgid "installation process"
 msgstr "ขั้นตอนการติดตั้ง"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:186001
+#: ../ubiquity.templates:187001
 msgid "Checking for installer updates"
 msgstr "กำลังตรวจสอบการปรับปรุงโปรแกรมติตตั้ง"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:187001
+#: ../ubiquity.templates:188001
 msgid "Reading package information"
 msgstr "กำลังอ่านข้อมูลแพกเกจ"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:188001
+#: ../ubiquity.templates:189001
 msgid "Updating package information"
 msgstr "กำลังปรับข้อมูลแพกเกจ"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:189001
+#: ../ubiquity.templates:190001
 msgid "File ${INDEX} of ${TOTAL} at ${SPEED}/s"
 msgstr "${INDEX} แฟ้ม จาก ${TOTAL} ที่ความเร็ว ${SPEED}/s"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:190001
+#: ../ubiquity.templates:191001
 msgid "File ${INDEX} of ${TOTAL}"
 msgstr "${INDEX} แฟ้ม จาก ${TOTAL}"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:191001
+#: ../ubiquity.templates:192001
 msgid "Installing update"
 msgstr "กำลังติดตั้งการปรับปรุง"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:192001
+#: ../ubiquity.templates:193001
 msgid "Error updating installer"
 msgstr "การติดตั้งการปรับปรุงผิดพลาด"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:192001
+#: ../ubiquity.templates:193001
 msgid "The installer encountered an error while trying to update itself:"
 msgstr "เกิดข้อผิดพลาดที่โปรแกรมติดตั้งในขณะกำลังพยายามปรับปรุงตัวเอง:"
 
 #. Type: text
 #. Description
 #. Translated acronym for Universal Serial Bus.
-#: ../ubiquity.templates:193001
+#: ../ubiquity.templates:194001
 msgid "USB disk"
 msgstr "ดิสก์ USB"
 
 #. Type: text
 #. Description
 #. Translated acronym for Compact Disc.
-#: ../ubiquity.templates:194001
+#: ../ubiquity.templates:195001
 msgid "CD"
 msgstr "ซีดี"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:195001
+#: ../ubiquity.templates:196001
 msgid ""
 "Please choose the language to use for the install process. This language "
 "will be the default language for this computer."
@@ -1341,7 +1341,7 @@
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:196001
+#: ../ubiquity.templates:197001
 msgid ""
 "Please choose the language used for the configuration process. This language "
 "will be the default language for this computer."
@@ -1352,13 +1352,13 @@
 #. Description
 #. Type: text
 #. Description
-#: ../ubiquity.templates:197001 ../ubiquity.templates:198001
+#: ../ubiquity.templates:198001 ../ubiquity.templates:199001
 msgid "Installation failed"
 msgstr "การติดตั้งล้มเหลว"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:197001
+#: ../ubiquity.templates:198001
 msgid ""
 "The installer encountered an unrecoverable error.  A desktop session will "
 "now be run so that you may investigate the problem or try installing again."
@@ -1368,19 +1368,19 @@
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:198001
+#: ../ubiquity.templates:199001
 msgid "The installer encountered an unrecoverable error and will now reboot."
 msgstr "โปรแกรมติดตั้งพบข้อผิดพลาดที่ไม่สามารถกู้ได้และจะเริ่มใหม่เดี๋ยวนี้"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:200001
+#: ../ubiquity.templates:201001
 msgid "Updates and other software"
 msgstr "การอัปเดตและซอฟต์แวร์อื่น"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:202001
+#: ../ubiquity.templates:203001
 msgid ""
 "Connecting this computer to a wi-fi network allows you to install third-"
 "party software, download updates, automatically detect your timezone, and "
@@ -1392,49 +1392,49 @@
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:203001
+#: ../ubiquity.templates:204001
 msgid "Password:"
 msgstr "รหัสผ่าน:"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:204001
+#: ../ubiquity.templates:205001
 msgid "Display password"
 msgstr "แสดงรหัสผ่าน"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:205001
+#: ../ubiquity.templates:206001
 msgid "I don't want to connect to a wi-fi network right now"
 msgstr "ฉันไม่ต้องการเชื่อมต่อกับเครื่อข่าย wi-fi ในตอนนี้"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:206001
+#: ../ubiquity.templates:207001
 msgid "Connect to this network"
 msgstr "เชื่อมต่อกับเครื่อข่ายนี้"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:211001
+#: ../ubiquity.templates:213001
 msgid "Select drive:"
 msgstr "เลือกไดรว์:"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:212001
+#: ../ubiquity.templates:214001
 msgid "Allocate drive space by dragging the divider below:"
 msgstr "จัดสรรพื้นที่ว่างบนไดรว์ด้วยการลากตัวแบ่งข้างล่าง:"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:213001
+#: ../ubiquity.templates:215001
 msgid "The entire disk will be used:"
 msgstr "ดิสก์ทั้งหมดจะถูกใช้:"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:214001
+#: ../ubiquity.templates:216001
 #, no-c-format
 msgid ""
 "<small>%d smaller partitions are hidden, use the <a href=\"\">advanced "
@@ -1445,7 +1445,7 @@
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:215001
+#: ../ubiquity.templates:217001
 msgid ""
 "<small>1 smaller partition is hidden, use the <a href=\"\">advanced "
 "partitioning tool</a> for more control</small>"
@@ -1455,7 +1455,7 @@
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:216001
+#: ../ubiquity.templates:218001
 #, no-c-format
 msgid ""
 "%d partitions will be deleted, use the <a href=\"\">advanced partitioning "
@@ -1466,7 +1466,7 @@
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:217001
+#: ../ubiquity.templates:219001
 msgid ""
 "1 partition will be deleted, use the <a href=\"\">advanced partitioning "
 "tool</a> for more control"
@@ -1476,19 +1476,19 @@
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:218001
+#: ../ubiquity.templates:220001
 msgid "Split Largest Partition"
 msgstr "แบ่งจากพาร์ทิชันใหญ่ที่สุด"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:220001
+#: ../ubiquity.templates:222001
 msgid "For best results, please ensure that this computer:"
 msgstr "เพื่อผลลัพธ์ที่ดีกว่า โปรดตรวจสอบความเรียบร้อยของคอมพิวเตอร์นี้:"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:221001
+#: ../ubiquity.templates:223001
 msgid "Sorry"
 msgstr "ขออภัย"
 
@@ -1496,7 +1496,7 @@
 #. Description
 #. SIZE is a variable substituted into this string, and may be '3.7 GB'
 #. RELEASE is a variable substituted into this string, the Ubuntu flavor'
-#: ../ubiquity.templates:222001
+#: ../ubiquity.templates:228001
 msgid "You need at least ${SIZE} disk space to install ${RELEASE}."
 msgstr ""
 "คุณต้องมีพื้นที่ว่างอย่างน้อย ${SIZE} จึงจะสามารถติดตั้ง ${RELEASE} ได้"
@@ -1504,25 +1504,25 @@
 #. Type: text
 #. Description
 #. SIZE is a variable substituted into this string, and may be '3.7 GB'
-#: ../ubiquity.templates:223001
+#: ../ubiquity.templates:229001
 msgid "This computer has only ${SIZE}."
 msgstr "คอมพิวเตอร์นี้มีเพียง ${SIZE}"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:224001
+#: ../ubiquity.templates:230001
 msgid "is plugged in to a power source"
 msgstr "การเชื่อมต่อเข้ากับแหล่งจ่ายพลังงาน"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:225001
+#: ../ubiquity.templates:231001
 msgid "is connected to the Internet"
 msgstr "การเชื่อมต่อกับอินเทอร์เน็ต"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:226001
+#: ../ubiquity.templates:232001
 msgid ""
 "This software is subject to license terms included with its documentation. "
 "Some is proprietary."
@@ -1532,7 +1532,7 @@
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:227001
+#: ../ubiquity.templates:233001
 msgid ""
 "Install third-party software for graphics and Wi-Fi hardware and additional "
 "media formats"
@@ -1542,68 +1542,68 @@
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:228001
+#: ../ubiquity.templates:234001
 msgid "Download updates while installing ${RELEASE}"
 msgstr "ดาวน์โหลดการอัปเดตขณะติดตั้ง ${RELEASE}"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:229001
+#: ../ubiquity.templates:235001
 msgid "This saves time after installation."
 msgstr "การกระทำนี้จะช่วยประหยัดเวลาหลังการติดตั้ง"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:230001
+#: ../ubiquity.templates:236001
 msgid "Not available because there is no Internet connection."
 msgstr "ไม่พร้อมใช้งานเนื่องจากไม่ได้เชื่อมต่ออินเทอร์เน็ต"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:231001
+#: ../ubiquity.templates:237001
 msgid "What apps would you like to install to start with?"
 msgstr "คุณต้องการเริ่มจากการติดตั้งแอพใด?"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:232001
+#: ../ubiquity.templates:238001
 msgid "Which applications would you like to start with?"
 msgstr "คุณต้องการเริ่มจากแอพพลิเคชั่นใด?"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:233001
+#: ../ubiquity.templates:239001
 msgid "Minimal installation"
 msgstr "การติดตั้งแบบขนาดเล็ก"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:234001
+#: ../ubiquity.templates:240001
 msgid "Web browser and basic utilities."
 msgstr "เว็บเบราว์เซอร์และโปรแกรมอรรถประโยชน์พื้นฐาน"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:235001
+#: ../ubiquity.templates:241001
 msgid "Web browser plus basic utilities and applications."
 msgstr "เว็บเบราว์เซอร์ โปรแกรมอรรถประโยชน์พื้นฐาน และแอพพลิเคชั่น"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:236001
+#: ../ubiquity.templates:242001
 msgid "Normal installation"
 msgstr "การติดตั้งแบบปกติ"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:237001
+#: ../ubiquity.templates:243001
 msgid "Web browser, utilities, office software, games, and media players."
 msgstr ""
 "เว็บเบราว์เซอร์ โปรแกรมอรรถประโยชน์ ซอฟต์แวร์สำนักงาน เกม และโปรแกรมเล่นสื่อ"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:238001
+#: ../ubiquity.templates:244001
 msgid ""
 "Web browser, utilities, office software, KDE PIM suite plus additional "
 "internet applications and media players."
@@ -1613,7 +1613,7 @@
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:239001
+#: ../ubiquity.templates:245001
 msgid "Other options"
 msgstr "ตัวเลือกอื่น"
 
@@ -1630,25 +1630,25 @@
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:244001
+#: ../ubiquity.templates:250001
 msgid "Layout:"
 msgstr "ผัง:"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:245001
+#: ../ubiquity.templates:251001
 msgid "Variant:"
 msgstr "ตัวแปร:"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:246001
+#: ../ubiquity.templates:252001
 msgid "Below is an image of your current layout:"
 msgstr "ข้างล่างนี้เป็นภาพของผังปัจจุบัน:"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:247001
+#: ../ubiquity.templates:253001
 msgid ""
 "Select your location, so that the system can use appropriate display "
 "conventions for your country, fetch updates from sites close to you, and set "
@@ -1660,19 +1660,19 @@
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:248001
+#: ../ubiquity.templates:254001
 msgid "Time Zone:"
 msgstr "เขตเวลา:"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:249001
+#: ../ubiquity.templates:255001
 msgid "Region:"
 msgstr "ภูมิภาค:"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:250001
+#: ../ubiquity.templates:256001
 msgid "[type here to change]"
 msgstr "[พิมพ์ที่นี่เพื่อเปลี่ยน]"
 
@@ -1680,14 +1680,14 @@
 #. Description
 #. OS is a variable substituted into this string, and may be 'Windows 7'
 #. DISTRO is a variable substituted into this string, and may be 'Ubuntu'
-#: ../ubiquity.templates:253001
+#: ../ubiquity.templates:259001
 msgid "Replace ${OS} with ${DISTRO}"
 msgstr "แทนที่ ${OS} ด้วย ${DISTRO}"
 
 #. Type: text
 #. Description
 #. OS is a variable substituted into this string, and may be 'Windows 7'
-#: ../ubiquity.templates:253001
+#: ../ubiquity.templates:259001
 msgid ""
 "<span foreground=\"darkred\">Warning:</span> This will delete all of your "
 "${OS} programs, documents, photos, music, and any other files."
@@ -1699,7 +1699,7 @@
 #. Description
 #. DISTRO is a variable substituted into this string, and may be 'Ubuntu'
 #. OS is a variable substituted into this string, and may be 'Windows 7'
-#: ../ubiquity.templates:254001
+#: ../ubiquity.templates:260001
 msgid "Install ${DISTRO} alongside ${OS}"
 msgstr "ติดตั้ง ${DISTRO} คู่กับ ${OS}"
 
@@ -1711,8 +1711,8 @@
 #. Description
 #. Type: text
 #. Description
-#: ../ubiquity.templates:254001 ../ubiquity.templates:255001
-#: ../ubiquity.templates:258001 ../ubiquity.templates:263001
+#: ../ubiquity.templates:260001 ../ubiquity.templates:261001
+#: ../ubiquity.templates:264001 ../ubiquity.templates:269001
 msgid ""
 "Documents, music, and other personal files will be kept. You can choose "
 "which operating system you want each time the computer starts up."
@@ -1724,20 +1724,20 @@
 #. Description
 #. DISTRO is a variable substituted into this string, and may be 'Ubuntu'
 #. OS is a variable substituted into this string, and may be 'Windows 7'
-#: ../ubiquity.templates:255001
+#: ../ubiquity.templates:261001
 msgid "Install ${DISTRO} inside ${OS}"
 msgstr "ติดตั้ง ${DISTRO} ใน ${OS}"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:256001
+#: ../ubiquity.templates:262001
 msgid "Something else"
 msgstr "อื่นๆ"
 
 #. Type: text
 #. Description
 #. DISTRO is a variable substituted into this string, and may be 'Ubuntu'
-#: ../ubiquity.templates:256001
+#: ../ubiquity.templates:262001
 msgid ""
 "You can create or resize partitions yourself, or choose multiple partitions "
 "for ${DISTRO}."
@@ -1748,14 +1748,14 @@
 #. Type: text
 #. Description
 #. CURDISTRO is a variable substituted into this string, and may be 'Ubuntu 10.10'
-#: ../ubiquity.templates:257001
+#: ../ubiquity.templates:263001
 msgid "Erase ${CURDISTRO} and reinstall"
 msgstr "ลบ ${CURDISTRO} และติดตั้งใหม่"
 
 #. Type: text
 #. Description
 #. CURDISTRO is a variable substituted into this string, and may be 'Ubuntu 10.10'
-#: ../ubiquity.templates:257001
+#: ../ubiquity.templates:263001
 msgid ""
 "<span foreground=\"darkred\">Warning:</span> This will delete all your "
 "${CURDISTRO} programs, documents, photos, music, and any other files."
@@ -1773,7 +1773,7 @@
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:261001
+#: ../ubiquity.templates:267001
 msgid ""
 "Documents, music, and other personal files will be kept. Installed software "
 "will be kept where possible. System-wide settings will be cleared."
@@ -1786,7 +1786,7 @@
 #. DISTRO is a variable substituted into this string, and may be 'Ubuntu'
 #. VER is a variable substituted into this string, and may be '11.04'
 #. CURDISTRO is a variable substituted into this string, and may be 'Ubuntu 10.10'
-#: ../ubiquity.templates:258001
+#: ../ubiquity.templates:264001
 msgid "Install ${DISTRO} ${VER} alongside ${CURDISTRO}"
 msgstr "ติดตั้ง ${DISTRO} ${VER} คู่กับ ${CURDISTRO}"
 
@@ -1796,13 +1796,13 @@
 #. Type: text
 #. Description
 #. DISTRO is a variable substituted into this string, and may be 'Ubuntu'
-#: ../ubiquity.templates:259001 ../ubiquity.templates:262001
+#: ../ubiquity.templates:265001 ../ubiquity.templates:268001
 msgid "Erase disk and install ${DISTRO}"
 msgstr "ลบดิสก์และติดตั้ง ${DISTRO}"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:259001
+#: ../ubiquity.templates:265001
 msgid ""
 "<span foreground=\"darkred\">Warning:</span> This will delete any files on "
 "the disk."
@@ -1810,7 +1810,7 @@
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:260001
+#: ../ubiquity.templates:266001
 msgid "Erase everything and reinstall"
 msgstr "ลบทุกอย่างและติดตั้งใหม่"
 
@@ -1818,7 +1818,7 @@
 #. Description
 #. OS is a variable substituted into this string, and may be 'Windows 7'
 #. CURDISTRO is a variable substituted into this string, and may be 'Ubuntu 10.10'
-#: ../ubiquity.templates:260001
+#: ../ubiquity.templates:266001
 msgid ""
 "<span foreground=\"darkred\">Warning:</span> This will delete all your "
 "programs, documents, photos, music, and other files in both ${OS} and "
@@ -1830,13 +1830,13 @@
 #. Type: text
 #. Description
 #. CURDISTRO is a variable substituted into this string, and may be 'Ubuntu 10.10'
-#: ../ubiquity.templates:261001
+#: ../ubiquity.templates:267001
 msgid "Reinstall ${CURDISTRO}"
 msgstr "ติดตั้ง ${CURDISTRO} ใหม่"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:262001
+#: ../ubiquity.templates:268001
 msgid ""
 "<span foreground=\"darkred\">Warning:</span> This will delete all your "
 "programs, documents, photos, music, and any other files in all operating "
@@ -1848,14 +1848,14 @@
 #. Type: text
 #. Description
 #. DISTRO is a variable substituted into this string, and may be 'Ubuntu'
-#: ../ubiquity.templates:263001
+#: ../ubiquity.templates:269001
 msgid "Install ${DISTRO} alongside them"
 msgstr "ติดตั้ง ${DISTRO} ไว้คู่กับมัน"
 
 #. Type: text
 #. Description
 #. OS is a variable substituted into this string, and may be 'Windows 7'
-#: ../ubiquity.templates:264001
+#: ../ubiquity.templates:270001
 msgid "This computer currently has ${OS} on it. What would you like to do?"
 msgstr "คอมพิวเตอร์นี้มี ${OS} อยู่แล้ว คุณต้องการจะทำอย่างไร?"
 
@@ -1863,7 +1863,7 @@
 #. Description
 #. OS1 is a variable substituted into this string, and may be 'Windows 7'
 #. OS2 is a variable substituted into this string, and may be 'Mac OS X'
-#: ../ubiquity.templates:265001
+#: ../ubiquity.templates:271001
 msgid ""
 "This computer currently has ${OS1} and ${OS2} on it. What would you like to "
 "do?"
@@ -1871,7 +1871,7 @@
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:266001
+#: ../ubiquity.templates:272001
 msgid ""
 "This computer currently has multiple operating systems on it. What would you "
 "like to do?"
@@ -1879,7 +1879,7 @@
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:267001
+#: ../ubiquity.templates:273001
 msgid ""
 "This computer currently has no detected operating systems. What would you "
 "like to do?"
@@ -1887,37 +1887,37 @@
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:268001
+#: ../ubiquity.templates:274001
 msgid "Before:"
 msgstr "ก่อน:"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:269001
+#: ../ubiquity.templates:275001
 msgid "After:"
 msgstr "หลัง:"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:270001
+#: ../ubiquity.templates:276001
 msgid "Encrypt the new ${RELEASE} installation for security"
 msgstr "เข้ารหัสการติดตั้ง ${RELEASE} ใหม่เพื่อความปลอดภัย"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:271001
+#: ../ubiquity.templates:277001
 msgid "You will choose a security key in the next step."
 msgstr "คุณจะต้องเลือกคีย์ความปลอดภัยในขั้นถัดไป"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:272001
+#: ../ubiquity.templates:278001
 msgid "Use LVM with the new ${RELEASE} installation"
 msgstr "ใช้ LVM กับการติดตั้ง ${RELEASE} ใหม่"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:273001
+#: ../ubiquity.templates:279001
 msgid ""
 "This will set up Logical Volume Management. It allows taking snapshots and "
 "easier partition resizing."
@@ -1927,19 +1927,19 @@
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:285001
+#: ../ubiquity.templates:291001
 msgid "Confirm the security key:"
 msgstr "ยืนยันคีย์ความปลอดภัยของคุณ:"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:286001
+#: ../ubiquity.templates:292001
 msgid "Choose a security key:"
 msgstr "เลือกคีย์ความปลอดภัย:"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:287001
+#: ../ubiquity.templates:293001
 msgid ""
 "Disk encryption protects your files in case you lose your computer. It "
 "requires you to enter a security key each time the computer starts up."
@@ -1949,13 +1949,13 @@
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:288001
+#: ../ubiquity.templates:294001
 msgid "Any files outside of ${RELEASE} will not be encrypted."
 msgstr "แฟ้มใดๆ ที่อยู่นอก ${RELEASE} จะไม่ถูกเข้ารหัส"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:289001
+#: ../ubiquity.templates:295001
 msgid ""
 "<span foreground=\"darkred\">Warning:</span> If you lose this security key, "
 "all data will be lost. If you need to, write down your key and keep it in a "
@@ -1967,61 +1967,61 @@
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:290001
+#: ../ubiquity.templates:296001
 msgid "For more security:"
 msgstr "เพื่อความปลอดภัยที่มากกว่า:"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:291001
+#: ../ubiquity.templates:297001
 msgid "Overwrite empty disk space"
 msgstr "เขียนทับพื้นที่ว่างในดิสก์"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:292001
+#: ../ubiquity.templates:298001
 msgid "The installation may take much longer."
 msgstr "กระบวนการติดตั้งอาจใช้เวลานานขึ้นมาก"
 
 #. Type: text
 #. description
-#: ../ubiquity.templates:293001
+#: ../ubiquity.templates:299001
 msgid "LVM..."
 msgstr "LVM..."
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:294001
+#: ../ubiquity.templates:300001
 msgid "Volume groups:"
 msgstr "กลุ่มโวลุม:"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:295001
+#: ../ubiquity.templates:301001
 msgid "Encryption Options"
 msgstr "ตัวเลือกการเข้ารหัส"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:296001
+#: ../ubiquity.templates:302001
 msgid "Physical volumes:"
 msgstr "โวลุมจริง:"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:298001
+#: ../ubiquity.templates:304001
 msgid "Encrypt this partition (LUKS)"
 msgstr "เข้ารหัสพาร์ทิชันนี้ (LUKS)"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:299001
+#: ../ubiquity.templates:305001
 msgid "MB"
 msgstr "MB"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:300001
+#: ../ubiquity.templates:306001
 msgid ""
 "Logical Volume Management (LVM) lets ${RELEASE} treat multiple physical "
 "volumes as a single volume."
@@ -2031,19 +2031,19 @@
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:301001
+#: ../ubiquity.templates:307001
 msgid "Logical Volume Management"
 msgstr "Logical Volume Management"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:302001
+#: ../ubiquity.templates:308001
 msgid "Encryption options..."
 msgstr "ตัวเลือกการเข้ารหัส..."
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:303001
+#: ../ubiquity.templates:309001
 msgid "UEFI Secure Boot"
 msgstr "UEFI Secure Boot"
 
@@ -2079,7 +2079,7 @@
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:304001
+#: ../ubiquity.templates:310001
 msgid ""
 "<span foreground=\"darkred\">Warning</span>: If you choose not to install "
 "these drivers, or if you proceed but do not confirm the password upon "
@@ -2094,7 +2094,7 @@
 
 #. Type: password
 #. Description
-#: ../ubiquity.templates:305001
+#: ../ubiquity.templates:311001
 msgid "SecureBoot key for MokPW"
 msgstr "คีย์ SecureBoot สำหรับ MokPW"
 
@@ -2156,6 +2156,6 @@
 
 #. Type: text
 #. Description
-#: ../oem-config.templates:2001
+#: ../oem-config.templates:3001
 msgid "Removing packages"
 msgstr "กำลังถอดถอนแพกเกจ"
diff -Nru language-pack-th-18.04+20200123/data/th/LC_MESSAGES/ubiquity-desktop.po language-pack-th-18.04+20200702/data/th/LC_MESSAGES/ubiquity-desktop.po
--- language-pack-th-18.04+20200123/data/th/LC_MESSAGES/ubiquity-desktop.po	2020-01-23 16:55:55.000000000 +0000
+++ language-pack-th-18.04+20200702/data/th/LC_MESSAGES/ubiquity-desktop.po	2020-07-08 13:58:07.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2020-01-23 11:30+0000\n"
-"X-Generator: Launchpad (build b8d1327fd820d6bf500589d6da587d5037c7d88e)\n"
+"X-Launchpad-Export-Date: 2020-07-02 11:17+0000\n"
+"X-Generator: Launchpad (build 1cbd0aa39df153c901321817f9b57cf3f232b507)\n"
 "Language: th\n"
 
 #. Do not translate the word "RELEASE".  It is used as a marker by casper.
diff -Nru language-pack-th-18.04+20200123/data/th/LC_MESSAGES/ubuntu-default-launchers.po language-pack-th-18.04+20200702/data/th/LC_MESSAGES/ubuntu-default-launchers.po
--- language-pack-th-18.04+20200123/data/th/LC_MESSAGES/ubuntu-default-launchers.po	2020-01-23 16:55:58.000000000 +0000
+++ language-pack-th-18.04+20200702/data/th/LC_MESSAGES/ubuntu-default-launchers.po	2020-07-08 13:58:10.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2020-01-23 12:24+0000\n"
-"X-Generator: Launchpad (build b8d1327fd820d6bf500589d6da587d5037c7d88e)\n"
+"X-Launchpad-Export-Date: 2020-07-02 12:02+0000\n"
+"X-Generator: Launchpad (build 1cbd0aa39df153c901321817f9b57cf3f232b507)\n"
 
 #: data/ubuntu/applications/gnome-initial-setup.desktop.in:3
 msgid "Welcome to Ubuntu"
diff -Nru language-pack-th-18.04+20200123/data/th/LC_MESSAGES/ufw.po language-pack-th-18.04+20200702/data/th/LC_MESSAGES/ufw.po
--- language-pack-th-18.04+20200123/data/th/LC_MESSAGES/ufw.po	2020-01-23 16:55:54.000000000 +0000
+++ language-pack-th-18.04+20200702/data/th/LC_MESSAGES/ufw.po	2020-07-08 13:58:06.000000000 +0000
@@ -14,442 +14,442 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2020-01-23 11:51+0000\n"
-"X-Generator: Launchpad (build b8d1327fd820d6bf500589d6da587d5037c7d88e)\n"
+"X-Launchpad-Export-Date: 2020-07-02 11:35+0000\n"
+"X-Generator: Launchpad (build 1cbd0aa39df153c901321817f9b57cf3f232b507)\n"
 
 #: src/ufw:74
 msgid ": Need at least python 2.6)\n"
 msgstr ""
 
-#: src/ufw:139 src/frontend.py:625 src/frontend.py:927
+#: src/ufw:139 src/frontend.py:632 src/frontend.py:934
 msgid "Aborted"
 msgstr "เลิกทำ"
 
-#: src/backend.py:70
+#: src/backend.py:77
 msgid "Couldn't determine iptables version"
 msgstr ""
 
-#: src/backend.py:149
+#: src/backend.py:156
 msgid "problem running sysctl"
 msgstr ""
 
-#: src/backend.py:188
+#: src/backend.py:195
 msgid "Checks disabled"
 msgstr ""
 
-#: src/backend.py:194
+#: src/backend.py:201
 msgid "ERROR: this script should not be SUID"
 msgstr ""
 
-#: src/backend.py:197
+#: src/backend.py:204
 msgid "ERROR: this script should not be SGID"
 msgstr ""
 
-#: src/backend.py:202
+#: src/backend.py:209
 msgid "You need to be root to run this script"
 msgstr "คุณต้องใช้สิทธิผู้ดูแลระบบในการใช้งานสคลิปท์"
 
-#: src/backend.py:212
+#: src/backend.py:219
 #, python-format
 msgid "'%s' does not exist"
 msgstr ""
 
-#: src/backend.py:235 src/backend_iptables.py:1416
+#: src/backend.py:242 src/backend_iptables.py:1427
 #, python-format
 msgid "Couldn't stat '%s'"
 msgstr ""
 
-#: src/backend.py:253
+#: src/backend.py:260
 #, python-format
 msgid "uid is %(uid)s but '%(path)s' is owned by %(st_uid)s"
 msgstr ""
 
-#: src/backend.py:260
+#: src/backend.py:267
 #, python-format
 msgid "%s is world writable!"
 msgstr ""
 
-#: src/backend.py:265
+#: src/backend.py:272
 #, python-format
 msgid "%s is group writable!"
 msgstr ""
 
-#: src/backend.py:281
+#: src/backend.py:288
 #, python-format
 msgid "'%(f)s' file '%(name)s' does not exist"
 msgstr ""
 
-#: src/backend.py:292 src/backend_iptables.py:690
+#: src/backend.py:299 src/backend_iptables.py:701
 #, python-format
 msgid "Couldn't open '%s' for reading"
 msgstr ""
 
-#: src/backend.py:306
+#: src/backend.py:313
 #, python-format
 msgid "Missing policy for '%s'"
 msgstr ""
 
-#: src/backend.py:310
+#: src/backend.py:317
 #, python-format
 msgid "Invalid policy '%(policy)s' for '%(chain)s'"
 msgstr ""
 
-#: src/backend.py:317
+#: src/backend.py:324
 msgid "Invalid option"
 msgstr ""
 
-#: src/backend.py:323 src/backend_iptables.py:790
+#: src/backend.py:330 src/backend_iptables.py:801
 #, python-format
 msgid "'%s' is not writable"
 msgstr ""
 
-#: src/backend.py:370 src/backend_iptables.py:94
+#: src/backend.py:377 src/backend_iptables.py:105
 #, python-format
 msgid "Unsupported policy '%s'"
 msgstr ""
 
-#: src/backend.py:373
+#: src/backend.py:380
 #, python-format
 msgid "Default application policy changed to '%s'"
 msgstr ""
 
-#: src/backend.py:440
+#: src/backend.py:447
 msgid "No rules found for application profile"
 msgstr ""
 
-#: src/backend.py:496
+#: src/backend.py:503
 #, python-format
 msgid "Rules updated for profile '%s'"
 msgstr ""
 
-#: src/backend.py:502
+#: src/backend.py:509
 msgid "Couldn't update application rules"
 msgstr ""
 
-#: src/backend.py:524
+#: src/backend.py:531
 #, python-format
 msgid "Found multiple matches for '%s'. Please use exact profile name"
 msgstr ""
 
-#: src/backend.py:527
+#: src/backend.py:534
 #, python-format
 msgid "Could not find a profile matching '%s'"
 msgstr ""
 
-#: src/backend.py:594
+#: src/backend.py:601
 msgid "Logging: "
 msgstr ""
 
-#: src/backend.py:598
+#: src/backend.py:605
 msgid "unknown"
 msgstr ""
 
-#: src/backend.py:610 src/backend_iptables.py:1284
+#: src/backend.py:617 src/backend_iptables.py:1295
 #, python-format
 msgid "Invalid log level '%s'"
 msgstr ""
 
-#: src/backend.py:625
+#: src/backend.py:632
 msgid "Logging disabled"
 msgstr ""
 
-#: src/backend.py:627
+#: src/backend.py:634
 msgid "Logging enabled"
 msgstr ""
 
-#: src/common.py:196
+#: src/common.py:204
 #, python-format
 msgid "Bad port '%s'"
 msgstr ""
 
-#: src/common.py:252
+#: src/common.py:260
 #, python-format
 msgid "Unsupported protocol '%s'"
 msgstr ""
 
-#: src/common.py:280
+#: src/common.py:288
 msgid "Bad source address"
 msgstr ""
 
-#: src/common.py:290
+#: src/common.py:298
 msgid "Bad destination address"
 msgstr ""
 
-#: src/common.py:309
+#: src/common.py:317
 msgid "Bad interface type"
 msgstr ""
 
-#: src/common.py:314
+#: src/common.py:322
 msgid "Bad interface name: reserved character: '!'"
 msgstr ""
 
-#: src/common.py:318
+#: src/common.py:326
 msgid "Bad interface name: can't use interface aliases"
 msgstr ""
 
-#: src/common.py:322
+#: src/common.py:330
 msgid "Bad interface name: can't use '.' or '..'"
 msgstr ""
 
-#: src/common.py:326
+#: src/common.py:334
 msgid "Bad interface name: interface name is empty"
 msgstr ""
 
-#: src/common.py:330
+#: src/common.py:338
 msgid "Bad interface name: interface name too long"
 msgstr ""
 
-#: src/common.py:335
+#: src/common.py:343
 msgid "Bad interface name"
 msgstr ""
 
-#: src/common.py:349
+#: src/common.py:357
 #, python-format
 msgid "Insert position '%s' is not a valid position"
 msgstr ""
 
-#: src/common.py:359
+#: src/common.py:367
 #, python-format
 msgid "Invalid log type '%s'"
 msgstr ""
 
-#: src/common.py:367
+#: src/common.py:375
 #, python-format
 msgid "Unsupported direction '%s'"
 msgstr ""
 
-#: src/common.py:386
+#: src/common.py:394
 msgid "Could not normalize source address"
 msgstr ""
 
-#: src/common.py:397
+#: src/common.py:405
 msgid "Could not normalize destination address"
 msgstr ""
 
-#: src/common.py:463
+#: src/common.py:471
 msgid "Found exact match"
 msgstr ""
 
-#: src/common.py:468
+#: src/common.py:476
 msgid "Found exact match, excepting comment"
 msgstr ""
 
-#: src/common.py:472
+#: src/common.py:480
 #, python-format
 msgid ""
 "Found non-action/non-logtype/comment match (%(xa)s/%(ya)s/'%(xc)s' "
 "%(xl)s/%(yl)s/'%(yc)s')"
 msgstr ""
 
-#: src/common.py:630
+#: src/common.py:643
 #, python-format
 msgid "Improper rule syntax ('%s' specified with app rule)"
 msgstr ""
 
-#: src/common.py:637
+#: src/common.py:650
 #, python-format
 msgid "Invalid IPv6 address with protocol '%s'"
 msgstr ""
 
-#: src/common.py:643 src/util.py:84
+#: src/common.py:656 src/util.py:92
 #, python-format
 msgid "Invalid port with protocol '%s'"
 msgstr ""
 
-#: src/parser.py:110
+#: src/parser.py:117
 #, python-format
 msgid "Cannot insert rule at position '%s'"
 msgstr ""
 
-#: src/parser.py:148
+#: src/parser.py:155
 msgid "Invalid interface clause"
 msgstr ""
 
-#: src/parser.py:174
+#: src/parser.py:181
 msgid "Option 'log' not allowed here"
 msgstr ""
 
-#: src/parser.py:178
+#: src/parser.py:185
 msgid "Option 'log-all' not allowed here"
 msgstr ""
 
-#: src/parser.py:185
+#: src/parser.py:192
 msgid "Option 'comment' missing required argument"
 msgstr ""
 
-#: src/parser.py:191
+#: src/parser.py:198
 msgid "Comment may not contain \"'\""
 msgstr ""
 
-#: src/parser.py:233 src/parser.py:359
+#: src/parser.py:240 src/parser.py:366
 msgid "Port ranges must be numeric"
 msgstr ""
 
-#: src/parser.py:242 src/util.py:87
+#: src/parser.py:249 src/util.py:95
 msgid "Bad port"
 msgstr ""
 
-#: src/parser.py:245
+#: src/parser.py:252
 msgid "Wrong number of arguments"
 msgstr ""
 
-#: src/parser.py:249
+#: src/parser.py:256
 msgid "Need 'to' or 'from' clause"
 msgstr ""
 
-#: src/parser.py:264
+#: src/parser.py:271
 msgid "Improper rule syntax"
 msgstr ""
 
-#: src/parser.py:271
+#: src/parser.py:278
 #, python-format
 msgid "Invalid token '%s'"
 msgstr ""
 
-#: src/parser.py:283
+#: src/parser.py:290
 msgid "Invalid 'proto' clause"
 msgstr ""
 
-#: src/parser.py:298
+#: src/parser.py:305
 #, python-format
 msgid "Invalid '%s' clause"
 msgstr ""
 
-#: src/parser.py:320
+#: src/parser.py:327
 msgid "Invalid 'from' clause"
 msgstr ""
 
-#: src/parser.py:342
+#: src/parser.py:349
 msgid "Invalid 'to' clause"
 msgstr ""
 
-#: src/parser.py:347
+#: src/parser.py:354
 #, python-format
 msgid "Need 'from' or 'to' with '%s'"
 msgstr ""
 
-#: src/parser.py:374
+#: src/parser.py:381
 msgid "Invalid 'port' clause"
 msgstr ""
 
-#: src/parser.py:383
+#: src/parser.py:390
 msgid "Mixed IP versions for 'from' and 'to'"
 msgstr ""
 
-#: src/parser.py:400 src/parser.py:410 src/parser.py:419
+#: src/parser.py:407 src/parser.py:417 src/parser.py:426
 msgid "Could not find protocol"
 msgstr "ไม่สามารถค้นหาโปรโตคอลได้"
 
-#: src/parser.py:426
+#: src/parser.py:433
 msgid "Protocol mismatch (from/to)"
 msgstr ""
 
-#: src/parser.py:433
+#: src/parser.py:440
 #, python-format
 msgid "Protocol mismatch with specified protocol %s"
 msgstr ""
 
-#: src/parser.py:552
+#: src/parser.py:559
 msgid "'route delete NUM' unsupported. Use 'delete NUM' instead."
 msgstr ""
 
-#: src/parser.py:585
+#: src/parser.py:592
 msgid "Invalid interface clause for route rule"
 msgstr ""
 
-#: src/parser.py:884
+#: src/parser.py:891
 #, python-format
 msgid "Command '%s' already exists"
 msgstr ""
 
-#: src/util.py:446
+#: src/util.py:437
 msgid "Couldn't find pid (is /proc mounted?)"
 msgstr ""
 
-#: src/util.py:450
+#: src/util.py:441
 #, python-format
 msgid "Couldn't find parent pid for '%s'"
 msgstr ""
 
-#: src/util.py:460
+#: src/util.py:451
 #, python-format
 msgid "Couldn't find '%s'"
 msgstr ""
 
-#: src/util.py:466
+#: src/util.py:457
 #, python-format
 msgid "Could not find executable for '%s'"
 msgstr ""
 
-#: src/util.py:1026
+#: src/util.py:1043
 #, python-format
 msgid "Could not get statistics for '%s'"
 msgstr ""
 
-#: src/backend_iptables.py:78
+#: src/backend_iptables.py:89
 msgid "New profiles:"
 msgstr ""
 
-#: src/backend_iptables.py:99
+#: src/backend_iptables.py:110
 #, python-format
 msgid "Unsupported policy for direction '%s'"
 msgstr ""
 
-#: src/backend_iptables.py:159
+#: src/backend_iptables.py:170
 #, python-format
 msgid "Default %(direction)s policy changed to '%(policy)s'\n"
 msgstr ""
 
-#: src/backend_iptables.py:161
+#: src/backend_iptables.py:172
 msgid "(be sure to update your rules accordingly)"
 msgstr ""
 
-#: src/backend_iptables.py:168
+#: src/backend_iptables.py:179
 msgid "Checking raw iptables\n"
 msgstr ""
 
-#: src/backend_iptables.py:169
+#: src/backend_iptables.py:180
 msgid "Checking raw ip6tables\n"
 msgstr ""
 
-#: src/backend_iptables.py:262
+#: src/backend_iptables.py:273
 msgid "Checking iptables\n"
 msgstr ""
 
-#: src/backend_iptables.py:264
+#: src/backend_iptables.py:275
 msgid "Checking ip6tables\n"
 msgstr ""
 
-#: src/backend_iptables.py:267 src/backend_iptables.py:568
+#: src/backend_iptables.py:278 src/backend_iptables.py:579
 msgid "problem running"
 msgstr ""
 
-#: src/backend_iptables.py:273
+#: src/backend_iptables.py:284
 msgid "Status: inactive"
 msgstr ""
 
-#: src/backend_iptables.py:443
+#: src/backend_iptables.py:454
 msgid "To"
 msgstr "ถึง"
 
-#: src/backend_iptables.py:444
+#: src/backend_iptables.py:455
 msgid "From"
 msgstr "จาก"
 
-#: src/backend_iptables.py:445
+#: src/backend_iptables.py:456
 msgid "Action"
 msgstr "การกระทำ"
 
-#: src/backend_iptables.py:461 src/backend_iptables.py:465
+#: src/backend_iptables.py:472 src/backend_iptables.py:476
 msgid "\n"
 msgstr ""
 
-#: src/backend_iptables.py:473
+#: src/backend_iptables.py:484
 #, python-format
 msgid "Default: %(in)s (incoming), %(out)s (outgoing), %(routed)s (routed)"
 msgstr ""
 
-#: src/backend_iptables.py:481
+#: src/backend_iptables.py:492
 #, python-format
 msgid ""
 "Status: active\n"
@@ -458,164 +458,164 @@
 "%(app)s%(status)s"
 msgstr ""
 
-#: src/backend_iptables.py:485
+#: src/backend_iptables.py:496
 #, python-format
 msgid "Status: active%s"
 msgstr ""
 
-#: src/backend_iptables.py:490 src/backend_iptables.py:508
+#: src/backend_iptables.py:501 src/backend_iptables.py:519
 msgid "running ufw-init"
 msgstr ""
 
-#: src/backend_iptables.py:502 src/backend_iptables.py:520
+#: src/backend_iptables.py:513 src/backend_iptables.py:531
 #, python-format
 msgid ""
 "problem running ufw-init\n"
 "%s"
 msgstr ""
 
-#: src/backend_iptables.py:529
+#: src/backend_iptables.py:540
 msgid "Could not set LOGLEVEL"
 msgstr ""
 
-#: src/backend_iptables.py:535
+#: src/backend_iptables.py:546
 msgid "Could not load logging rules"
 msgstr ""
 
-#: src/backend_iptables.py:709
+#: src/backend_iptables.py:720
 #, python-format
 msgid "Skipping malformed tuple (bad length): %s"
 msgstr ""
 
-#: src/backend_iptables.py:720
+#: src/backend_iptables.py:731
 #, python-format
 msgid "Skipping malformed tuple (iface): %s"
 msgstr ""
 
-#: src/backend_iptables.py:768
+#: src/backend_iptables.py:779
 #, python-format
 msgid "Skipping malformed tuple: %s"
 msgstr ""
 
-#: src/backend_iptables.py:966
+#: src/backend_iptables.py:977
 msgid "Adding IPv6 rule failed: IPv6 not enabled"
 msgstr ""
 
-#: src/backend_iptables.py:970
+#: src/backend_iptables.py:981
 #, python-format
 msgid "Skipping unsupported IPv6 '%s' rule"
 msgstr ""
 
-#: src/backend_iptables.py:974
+#: src/backend_iptables.py:985
 #, python-format
 msgid "Skipping unsupported IPv4 '%s' rule"
 msgstr ""
 
-#: src/backend_iptables.py:977
+#: src/backend_iptables.py:988
 msgid "Must specify 'tcp' or 'udp' with multiple ports"
 msgstr ""
 
-#: src/backend_iptables.py:989
+#: src/backend_iptables.py:1000
 msgid "Skipping IPv6 application rule. Need at least iptables 1.4"
 msgstr ""
 
-#: src/backend_iptables.py:994
+#: src/backend_iptables.py:1005
 #, python-format
 msgid "Invalid position '%d'"
 msgstr ""
 
-#: src/backend_iptables.py:998
+#: src/backend_iptables.py:1009
 msgid "Cannot specify insert and delete"
 msgstr ""
 
-#: src/backend_iptables.py:1001
+#: src/backend_iptables.py:1012
 #, python-format
 msgid "Cannot insert rule at position '%d'"
 msgstr ""
 
-#: src/backend_iptables.py:1062
+#: src/backend_iptables.py:1073
 msgid "Skipping inserting existing rule"
 msgstr ""
 
-#: src/backend_iptables.py:1073 src/frontend.py:415
+#: src/backend_iptables.py:1084 src/frontend.py:422
 msgid "Could not delete non-existent rule"
 msgstr ""
 
-#: src/backend_iptables.py:1078
+#: src/backend_iptables.py:1089
 msgid "Skipping adding existing rule"
 msgstr ""
 
-#: src/backend_iptables.py:1094
+#: src/backend_iptables.py:1105
 msgid "Couldn't update rules file"
 msgstr ""
 
-#: src/backend_iptables.py:1099
+#: src/backend_iptables.py:1110
 msgid "Rules updated"
 msgstr ""
 
-#: src/backend_iptables.py:1101
+#: src/backend_iptables.py:1112
 msgid "Rules updated (v6)"
 msgstr ""
 
-#: src/backend_iptables.py:1109
+#: src/backend_iptables.py:1120
 msgid "Rule inserted"
 msgstr ""
 
-#: src/backend_iptables.py:1111
+#: src/backend_iptables.py:1122
 msgid "Rule updated"
 msgstr ""
 
-#: src/backend_iptables.py:1121
+#: src/backend_iptables.py:1132
 msgid " (skipped reloading firewall)"
 msgstr ""
 
-#: src/backend_iptables.py:1124
+#: src/backend_iptables.py:1135
 msgid "Rule deleted"
 msgstr ""
 
-#: src/backend_iptables.py:1127
+#: src/backend_iptables.py:1138
 msgid "Rule added"
 msgstr ""
 
-#: src/backend_iptables.py:1144 src/backend_iptables.py:1235
+#: src/backend_iptables.py:1155 src/backend_iptables.py:1246
 msgid "Could not update running firewall"
 msgstr ""
 
-#: src/backend_iptables.py:1199
+#: src/backend_iptables.py:1210
 #, python-format
 msgid "Could not perform '%s'"
 msgstr ""
 
-#: src/backend_iptables.py:1226
+#: src/backend_iptables.py:1237
 msgid "Couldn't update rules file for logging"
 msgstr ""
 
-#: src/backend_iptables.py:1382
+#: src/backend_iptables.py:1393
 #, python-format
 msgid "Could not find '%s'. Aborting"
 msgstr ""
 
-#: src/backend_iptables.py:1394
+#: src/backend_iptables.py:1405
 #, python-format
 msgid "'%s' already exists. Aborting"
 msgstr ""
 
-#: src/backend_iptables.py:1400
+#: src/backend_iptables.py:1411
 #, python-format
 msgid "Backing up '%(old)s' to '%(new)s'\n"
 msgstr ""
 
-#: src/backend_iptables.py:1421
+#: src/backend_iptables.py:1432
 #, python-format
 msgid "WARN: '%s' is world writable"
 msgstr ""
 
-#: src/backend_iptables.py:1423
+#: src/backend_iptables.py:1434
 #, python-format
 msgid "WARN: '%s' is world readable"
 msgstr ""
 
-#: src/frontend.py:93
+#: src/frontend.py:100
 #, python-format
 msgid ""
 "\n"
@@ -650,87 +650,87 @@
 " %(appdefault)-31s set default application policy\n"
 msgstr ""
 
-#: src/frontend.py:176
+#: src/frontend.py:183
 msgid "n"
 msgstr ""
 
-#: src/frontend.py:177
+#: src/frontend.py:184
 msgid "y"
 msgstr ""
 
-#: src/frontend.py:178
+#: src/frontend.py:185
 msgid "yes"
 msgstr ""
 
-#: src/frontend.py:223
+#: src/frontend.py:230
 msgid "Firewall is active and enabled on system startup"
 msgstr ""
 
-#: src/frontend.py:230
+#: src/frontend.py:237
 msgid "Firewall stopped and disabled on system startup"
 msgstr ""
 
-#: src/frontend.py:282
+#: src/frontend.py:289
 msgid "Could not get listening status"
 msgstr ""
 
-#: src/frontend.py:351
+#: src/frontend.py:358
 msgid "Added user rules (see 'ufw status' for running firewall):"
 msgstr ""
 
-#: src/frontend.py:354
+#: src/frontend.py:361
 msgid ""
 "\n"
 "(None)"
 msgstr ""
 
-#: src/frontend.py:410 src/frontend.py:521 src/frontend.py:534
+#: src/frontend.py:417 src/frontend.py:528 src/frontend.py:541
 #, python-format
 msgid "Invalid IP version '%s'"
 msgstr ""
 
-#: src/frontend.py:441
+#: src/frontend.py:448
 msgid "Invalid position '"
 msgstr ""
 
-#: src/frontend.py:531
+#: src/frontend.py:538
 msgid "IPv6 support not enabled"
 msgstr ""
 
-#: src/frontend.py:542
+#: src/frontend.py:549
 msgid "Rule changed after normalization"
 msgstr ""
 
-#: src/frontend.py:566
+#: src/frontend.py:573
 #, python-format
 msgid "Could not back out rule '%s'"
 msgstr ""
 
-#: src/frontend.py:570
+#: src/frontend.py:577
 msgid ""
 "\n"
 "Error applying application rules."
 msgstr ""
 
-#: src/frontend.py:572
+#: src/frontend.py:579
 msgid " Some rules could not be unapplied."
 msgstr ""
 
-#: src/frontend.py:574
+#: src/frontend.py:581
 msgid " Attempted rules successfully unapplied."
 msgstr ""
 
-#: src/frontend.py:585
+#: src/frontend.py:592
 #, python-format
 msgid "Could not find rule '%s'"
 msgstr ""
 
-#: src/frontend.py:590 src/frontend.py:595
+#: src/frontend.py:597 src/frontend.py:602
 #, python-format
 msgid "Could not find rule '%d'"
 msgstr ""
 
-#: src/frontend.py:611
+#: src/frontend.py:618
 #, python-format
 msgid ""
 "Deleting:\n"
@@ -738,51 +738,51 @@
 "Proceed with operation (%(yes)s|%(no)s)? "
 msgstr ""
 
-#: src/frontend.py:643
+#: src/frontend.py:650
 msgid "Unsupported default policy"
 msgstr ""
 
-#: src/frontend.py:672 src/frontend.py:817
+#: src/frontend.py:679 src/frontend.py:824
 msgid "Firewall reloaded"
 msgstr ""
 
-#: src/frontend.py:674
+#: src/frontend.py:681
 msgid "Firewall not enabled (skipping reload)"
 msgstr ""
 
-#: src/frontend.py:691 src/frontend.py:705 src/frontend.py:742
+#: src/frontend.py:698 src/frontend.py:712 src/frontend.py:749
 msgid "Invalid profile name"
 msgstr ""
 
-#: src/frontend.py:710 src/frontend.py:892
+#: src/frontend.py:717 src/frontend.py:899
 #, python-format
 msgid "Unsupported action '%s'"
 msgstr ""
 
-#: src/frontend.py:729
+#: src/frontend.py:736
 msgid "Available applications:"
 msgstr ""
 
-#: src/frontend.py:750
+#: src/frontend.py:757
 #, python-format
 msgid "Could not find profile '%s'"
 msgstr ""
 
-#: src/frontend.py:755
+#: src/frontend.py:762
 msgid "Invalid profile"
 msgstr ""
 
-#: src/frontend.py:758
+#: src/frontend.py:765
 #, python-format
 msgid "Profile: %s\n"
 msgstr ""
 
-#: src/frontend.py:759
+#: src/frontend.py:766
 #, python-format
 msgid "Title: %s\n"
 msgstr ""
 
-#: src/frontend.py:762
+#: src/frontend.py:769
 #, python-format
 msgid ""
 "Description: %s\n"
@@ -791,113 +791,113 @@
 "รายละเอียด: %s\n"
 "\n"
 
-#: src/frontend.py:768
+#: src/frontend.py:775
 msgid "Ports:"
 msgstr ""
 
-#: src/frontend.py:770
+#: src/frontend.py:777
 msgid "Port:"
 msgstr "พอร์ต:"
 
-#: src/frontend.py:819
+#: src/frontend.py:826
 msgid "Skipped reloading firewall"
 msgstr ""
 
-#: src/frontend.py:829
+#: src/frontend.py:836
 msgid "Cannot specify 'all' with '--add-new'"
 msgstr ""
 
-#: src/frontend.py:844
+#: src/frontend.py:851
 #, python-format
 msgid "Unknown policy '%s'"
 msgstr ""
 
-#: src/frontend.py:901
+#: src/frontend.py:908
 #, python-format
 msgid ""
 "Command may disrupt existing ssh connections. Proceed with operation "
 "(%(yes)s|%(no)s)? "
 msgstr ""
 
-#: src/frontend.py:914
+#: src/frontend.py:921
 #, python-format
 msgid ""
 "Resetting all rules to installed defaults. Proceed with operation "
 "(%(yes)s|%(no)s)? "
 msgstr ""
 
-#: src/frontend.py:918
+#: src/frontend.py:925
 #, python-format
 msgid ""
 "Resetting all rules to installed defaults. This may disrupt existing ssh "
 "connections. Proceed with operation (%(yes)s|%(no)s)? "
 msgstr ""
 
-#: src/applications.py:37
+#: src/applications.py:44
 msgid "Profiles directory does not exist"
 msgstr ""
 
-#: src/applications.py:69
+#: src/applications.py:76
 #, python-format
 msgid "Skipping '%s': couldn't stat"
 msgstr ""
 
-#: src/applications.py:74
+#: src/applications.py:81
 #, python-format
 msgid "Skipping '%s': too big"
 msgstr ""
 
-#: src/applications.py:79
+#: src/applications.py:86
 #, python-format
 msgid "Skipping '%s': too many files read already"
 msgstr ""
 
-#: src/applications.py:93
+#: src/applications.py:100
 #, python-format
 msgid "Skipping '%s': couldn't process"
 msgstr "ยับยั้ง '%s': ไม่สามารถดำเนินการได้"
 
-#: src/applications.py:100
+#: src/applications.py:107
 #, python-format
 msgid "Skipping '%s': name too long"
 msgstr "ยับยั้ง '%s': ชื่อยาวเกินไป"
 
-#: src/applications.py:105
+#: src/applications.py:112
 #, python-format
 msgid "Skipping '%s': invalid name"
 msgstr "ยับยั้ง '%s': ชื่อไม่ถูกต้อง"
 
-#: src/applications.py:111
+#: src/applications.py:118
 #, python-format
 msgid "Skipping '%s': also in /etc/services"
 msgstr ""
 
-#: src/applications.py:120
+#: src/applications.py:127
 #, python-format
 msgid "Skipping '%s': field too long"
 msgstr ""
 
-#: src/applications.py:125
+#: src/applications.py:132
 #, python-format
 msgid "Skipping '%(value)s': value too long for '%(field)s'"
 msgstr ""
 
-#: src/applications.py:135
+#: src/applications.py:142
 #, python-format
 msgid "Duplicate profile '%s', using last found"
 msgstr ""
 
-#: src/applications.py:178
+#: src/applications.py:185
 #, python-format
 msgid "Profile '%(fn)s' missing required field '%(f)s'"
 msgstr ""
 
-#: src/applications.py:183
+#: src/applications.py:190
 #, python-format
 msgid "Profile '%(fn)s' has empty required field '%(f)s'"
 msgstr ""
 
-#: src/applications.py:198
+#: src/applications.py:205
 #, python-format
 msgid "Invalid ports in profile '%s'"
 msgstr ""
diff -Nru language-pack-th-18.04+20200123/data/th/LC_MESSAGES/usbcreator.po language-pack-th-18.04+20200702/data/th/LC_MESSAGES/usbcreator.po
--- language-pack-th-18.04+20200123/data/th/LC_MESSAGES/usbcreator.po	2020-01-23 16:55:56.000000000 +0000
+++ language-pack-th-18.04+20200702/data/th/LC_MESSAGES/usbcreator.po	2020-07-08 13:58:08.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2020-01-23 11:54+0000\n"
-"X-Generator: Launchpad (build b8d1327fd820d6bf500589d6da587d5037c7d88e)\n"
+"X-Launchpad-Export-Date: 2020-07-02 11:37+0000\n"
+"X-Generator: Launchpad (build 1cbd0aa39df153c901321817f9b57cf3f232b507)\n"
 
 #: .././gui/usbcreator-gtk.ui.h:1
 msgid "Installation Failed"
diff -Nru language-pack-th-18.04+20200123/data/th/LC_MESSAGES/xkeyboard-config.po language-pack-th-18.04+20200702/data/th/LC_MESSAGES/xkeyboard-config.po
--- language-pack-th-18.04+20200123/data/th/LC_MESSAGES/xkeyboard-config.po	2020-01-23 16:55:57.000000000 +0000
+++ language-pack-th-18.04+20200702/data/th/LC_MESSAGES/xkeyboard-config.po	2020-07-08 13:58:09.000000000 +0000
@@ -14,10 +14,10 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2020-01-23 11:26+0000\n"
-"X-Generator: Launchpad (build b8d1327fd820d6bf500589d6da587d5037c7d88e)\n"
+"X-Launchpad-Export-Date: 2020-07-02 11:13+0000\n"
+"X-Generator: Launchpad (build 1cbd0aa39df153c901321817f9b57cf3f232b507)\n"
 
-#: ../rules/base.xml.in.h:1
+#: rules/base.xml:8
 msgid "Generic 101-key PC"
 msgstr ""
 
@@ -25,251 +25,251 @@
 msgid "Generic 101-key PC (intl.)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:3
+#: rules/base.xml:22
 msgid "Generic 104-key PC"
 msgstr ""
 
-#: ../rules/base.xml.in.h:4
+#: rules/base.xml:29
 msgid "Generic 105-key PC (intl.)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:5
+#: rules/base.xml:36
 msgid "Dell 101-key PC"
 msgstr ""
 
-#: ../rules/base.xml.in.h:6
+#: rules/base.xml:43
 msgid "Dell Latitude laptop"
 msgstr ""
 
-#: ../rules/base.xml.in.h:7
+#: rules/base.xml:50
 msgid "Dell Precision M65 laptop"
 msgstr ""
 
-#: ../rules/base.xml.in.h:8
+#: rules/base.xml:57
 msgid "Everex STEPnote"
 msgstr ""
 
-#: ../rules/base.xml.in.h:9
+#: rules/base.xml:64
 msgid "Keytronic FlexPro"
 msgstr ""
 
-#: ../rules/base.xml.in.h:10
+#: rules/base.xml:71
 msgid "Microsoft Natural"
 msgstr ""
 
-#: ../rules/base.xml.in.h:11
+#: rules/base.xml:78
 msgid "Northgate OmniKey 101"
 msgstr ""
 
-#: ../rules/base.xml.in.h:12
+#: rules/base.xml:85
 msgid "Winbook Model XP5"
 msgstr ""
 
-#: ../rules/base.xml.in.h:13
+#: rules/base.xml:92
 msgid "PC-98"
 msgstr ""
 
-#: ../rules/base.xml.in.h:14
+#: rules/base.xml:99
 msgid "A4Tech KB-21"
 msgstr ""
 
-#: ../rules/base.xml.in.h:15
+#: rules/base.xml:106
 msgid "A4Tech KBS-8"
 msgstr ""
 
-#: ../rules/base.xml.in.h:16
+#: rules/base.xml:113
 msgid "A4Tech Wireless Desktop RFKB-23"
 msgstr ""
 
-#: ../rules/base.xml.in.h:17
+#: rules/base.xml:120
 msgid "Acer AirKey V"
 msgstr ""
 
-#: ../rules/base.xml.in.h:18
+#: rules/base.xml:127
 msgid "Azona RF2300 wireless Internet"
 msgstr ""
 
-#: ../rules/base.xml.in.h:19
+#: rules/base.xml:134
 msgid "Advance Scorpius KI"
 msgstr ""
 
-#: ../rules/base.xml.in.h:20
+#: rules/base.xml:141
 msgid "Brother Internet"
 msgstr ""
 
-#: ../rules/base.xml.in.h:21
+#: rules/base.xml:148
 msgid "BTC 5113RF Multimedia"
 msgstr ""
 
-#: ../rules/base.xml.in.h:22
+#: rules/base.xml:155
 msgid "BTC 5126T"
 msgstr ""
 
-#: ../rules/base.xml.in.h:23
+#: rules/base.xml:162
 msgid "BTC 6301URF"
 msgstr ""
 
-#: ../rules/base.xml.in.h:24
+#: rules/base.xml:169
 msgid "BTC 9000"
 msgstr ""
 
-#: ../rules/base.xml.in.h:25
+#: rules/base.xml:176
 msgid "BTC 9000A"
 msgstr ""
 
-#: ../rules/base.xml.in.h:26
+#: rules/base.xml:183
 msgid "BTC 9001AH"
 msgstr ""
 
-#: ../rules/base.xml.in.h:27
+#: rules/base.xml:190
 msgid "BTC 5090"
 msgstr ""
 
-#: ../rules/base.xml.in.h:28
+#: rules/base.xml:197
 msgid "BTC 9019U"
 msgstr ""
 
-#: ../rules/base.xml.in.h:29
+#: rules/base.xml:204
 msgid "BTC 9116U Mini Wireless Internet and Gaming"
 msgstr ""
 
-#: ../rules/base.xml.in.h:30
+#: rules/base.xml:210
 msgid "Cherry Blue Line CyBo@rd"
 msgstr ""
 
-#: ../rules/base.xml.in.h:31
+#: rules/base.xml:216
 msgid "Cherry CyMotion Master XPress"
 msgstr ""
 
-#: ../rules/base.xml.in.h:32
+#: rules/base.xml:223
 msgid "Cherry Blue Line CyBo@rd (alt.)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:33
+#: rules/base.xml:230
 msgid "Cherry CyBo@rd USB-Hub"
 msgstr ""
 
-#: ../rules/base.xml.in.h:34
+#: rules/base.xml:237
 msgid "Cherry CyMotion Expert"
 msgstr ""
 
-#: ../rules/base.xml.in.h:35
+#: rules/base.xml:244
 msgid "Cherry B.UNLIMITED"
 msgstr ""
 
-#: ../rules/base.xml.in.h:36
+#: rules/base.xml:251
 msgid "Chicony Internet"
 msgstr ""
 
-#: ../rules/base.xml.in.h:37
+#: rules/base.xml:258
 msgid "Chicony KU-0108"
 msgstr ""
 
-#: ../rules/base.xml.in.h:38
+#: rules/base.xml:265
 msgid "Chicony KU-0420"
 msgstr ""
 
-#: ../rules/base.xml.in.h:39
+#: rules/base.xml:272
 msgid "Chicony KB-9885"
 msgstr ""
 
-#: ../rules/base.xml.in.h:40
+#: rules/base.xml:279
 msgid "Compaq Easy Access"
 msgstr ""
 
-#: ../rules/base.xml.in.h:41
+#: rules/base.xml:286
 msgid "Compaq Internet (7 keys)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:42
+#: rules/base.xml:293
 msgid "Compaq Internet (13 keys)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:43
+#: rules/base.xml:300
 msgid "Compaq Internet (18 keys)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:44
+#: rules/base.xml:307
 msgid "Cherry CyMotion Master Linux"
 msgstr ""
 
-#: ../rules/base.xml.in.h:45
+#: rules/base.xml:314
 msgid "Compaq Armada laptop"
 msgstr ""
 
-#: ../rules/base.xml.in.h:46
+#: rules/base.xml:321
 msgid "Compaq Presario laptop"
 msgstr ""
 
-#: ../rules/base.xml.in.h:47
+#: rules/base.xml:328
 msgid "Compaq iPaq"
 msgstr ""
 
-#: ../rules/base.xml.in.h:48
+#: rules/base.xml:335
 msgid "Dell"
 msgstr ""
 
-#: ../rules/base.xml.in.h:49
+#: rules/base.xml:342
 msgid "Dell SK-8125"
 msgstr ""
 
-#: ../rules/base.xml.in.h:50
+#: rules/base.xml:349
 msgid "Dell SK-8135"
 msgstr ""
 
-#: ../rules/base.xml.in.h:51
+#: rules/base.xml:356
 msgid "Dell USB Multimedia"
 msgstr ""
 
-#: ../rules/base.xml.in.h:52
+#: rules/base.xml:363
 msgid "Dell Inspiron 6000/8000 laptop"
 msgstr ""
 
-#: ../rules/base.xml.in.h:53
+#: rules/base.xml:370
 msgid "Dell Precision M laptop"
 msgstr ""
 
-#: ../rules/base.xml.in.h:54
+#: rules/base.xml:377
 msgid "Dexxa Wireless Desktop"
 msgstr ""
 
-#: ../rules/base.xml.in.h:55
+#: rules/base.xml:384
 msgid "Diamond 9801/9802"
 msgstr ""
 
-#: ../rules/base.xml.in.h:56
+#: rules/base.xml:391
 msgid "DTK2000"
 msgstr ""
 
-#: ../rules/base.xml.in.h:57
+#: rules/base.xml:397
 msgid "Ennyah DKB-1008"
 msgstr ""
 
-#: ../rules/base.xml.in.h:58
+#: rules/base.xml:404
 msgid "Fujitsu-Siemens Amilo laptop"
 msgstr ""
 
-#: ../rules/base.xml.in.h:59
+#: rules/base.xml:411
 msgid "Genius Comfy KB-16M/Multimedia KWD-910"
 msgstr ""
 
-#: ../rules/base.xml.in.h:60
+#: rules/base.xml:418
 msgid "Genius Comfy KB-12e"
 msgstr ""
 
-#: ../rules/base.xml.in.h:61
+#: rules/base.xml:425
 msgid "Genius Comfy KB-21e-Scroll"
 msgstr ""
 
-#: ../rules/base.xml.in.h:62
+#: rules/base.xml:432
 msgid "Genius KB-19e NB"
 msgstr ""
 
-#: ../rules/base.xml.in.h:63
+#: rules/base.xml:439
 msgid "Genius KKB-2050HS"
 msgstr ""
 
-#: ../rules/base.xml.in.h:64
+#: rules/base.xml:446
 msgid "Gyration"
 msgstr ""
 
@@ -277,471 +277,471 @@
 msgid "HTC Dream"
 msgstr ""
 
-#: ../rules/base.xml.in.h:66
+#: rules/base.xml:453
 msgid "Kinesis"
 msgstr ""
 
-#: ../rules/base.xml.in.h:67
+#: rules/base.xml:460
 msgid "Logitech"
 msgstr ""
 
-#: ../rules/base.xml.in.h:68
+#: rules/base.xml:467
 msgid "Logitech G15 extra keys via G15daemon"
 msgstr ""
 
-#: ../rules/base.xml.in.h:69
+#: rules/base.xml:474
 msgid "Hewlett-Packard Internet"
 msgstr ""
 
-#: ../rules/base.xml.in.h:70
+#: rules/base.xml:481
 msgid "Hewlett-Packard NEC SK-2500 Multimedia"
 msgstr ""
 
-#: ../rules/base.xml.in.h:71
+#: rules/base.xml:488
 msgid "Hewlett-Packard Omnibook XE3 GC"
 msgstr ""
 
-#: ../rules/base.xml.in.h:72
+#: rules/base.xml:495
 msgid "Hewlett-Packard Omnibook XE3 GF"
 msgstr ""
 
-#: ../rules/base.xml.in.h:73
+#: rules/base.xml:502
 msgid "Hewlett-Packard Omnibook XT1000"
 msgstr ""
 
-#: ../rules/base.xml.in.h:74
+#: rules/base.xml:509
 msgid "Hewlett-Packard Pavilion dv5"
 msgstr ""
 
-#: ../rules/base.xml.in.h:75
+#: rules/base.xml:516
 msgid "Hewlett-Packard Pavilion ZT1100"
 msgstr ""
 
-#: ../rules/base.xml.in.h:76
+#: rules/base.xml:523
 msgid "Hewlett-Packard Omnibook 500 FA"
 msgstr ""
 
-#: ../rules/base.xml.in.h:77
+#: rules/base.xml:530
 msgid "Hewlett-Packard Omnibook 500"
 msgstr ""
 
-#: ../rules/base.xml.in.h:78
+#: rules/base.xml:537
 msgid "Hewlett-Packard nx9020"
 msgstr ""
 
-#: ../rules/base.xml.in.h:79
+#: rules/base.xml:544
 msgid "Hewlett-Packard Omnibook 6000/6100"
 msgstr ""
 
-#: ../rules/base.xml.in.h:80
+#: rules/base.xml:551
 msgid "Honeywell Euroboard"
 msgstr ""
 
-#: ../rules/base.xml.in.h:81
+#: rules/base.xml:558
 msgid "Hewlett-Packard Mini 110 laptop"
 msgstr ""
 
-#: ../rules/base.xml.in.h:82
+#: rules/base.xml:565
 msgid "IBM Rapid Access"
 msgstr ""
 
-#: ../rules/base.xml.in.h:83
+#: rules/base.xml:572
 msgid "IBM Rapid Access II"
 msgstr ""
 
-#: ../rules/base.xml.in.h:84
+#: rules/base.xml:579
 msgid "IBM ThinkPad 560Z/600/600E/A22E"
 msgstr ""
 
-#: ../rules/base.xml.in.h:85
+#: rules/base.xml:586
 msgid "IBM ThinkPad R60/T60/R61/T61"
 msgstr ""
 
-#: ../rules/base.xml.in.h:86
+#: rules/base.xml:593
 msgid "IBM ThinkPad Z60m/Z60t/Z61m/Z61t"
 msgstr ""
 
-#: ../rules/base.xml.in.h:87
+#: rules/base.xml:600
 msgid "IBM Space Saver"
 msgstr ""
 
-#: ../rules/base.xml.in.h:88
+#: rules/base.xml:607
 msgid "Logitech Access"
 msgstr ""
 
-#: ../rules/base.xml.in.h:89
+#: rules/base.xml:614
 msgid "Logitech Cordless Desktop LX-300"
 msgstr ""
 
-#: ../rules/base.xml.in.h:90
+#: rules/base.xml:621 rules/base.xml:629
 msgid "Logitech Internet 350"
 msgstr ""
 
-#: ../rules/base.xml.in.h:91
+#: rules/base.xml:636
 msgid "Logitech Cordless Desktop"
 msgstr ""
 
-#: ../rules/base.xml.in.h:92
+#: rules/base.xml:643
 msgid "Logitech Cordless Desktop iTouch"
 msgstr ""
 
-#: ../rules/base.xml.in.h:93
+#: rules/base.xml:650 rules/base.xml:685
 msgid "Logitech Cordless Desktop Navigator"
 msgstr ""
 
-#: ../rules/base.xml.in.h:94
+#: rules/base.xml:657
 msgid "Logitech Cordless Desktop Optical"
 msgstr ""
 
-#: ../rules/base.xml.in.h:95
+#: rules/base.xml:664
 msgid "Logitech Cordless Desktop (alt.)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:96
+#: rules/base.xml:671
 msgid "Logitech Cordless Desktop Pro (2nd alt.)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:97
+#: rules/base.xml:678
 msgid "Logitech Cordless Freedom/Desktop Navigator"
 msgstr ""
 
-#: ../rules/base.xml.in.h:98
+#: rules/base.xml:692
 msgid "Logitech iTouch Cordless Y-RB6"
 msgstr ""
 
-#: ../rules/base.xml.in.h:99
+#: rules/base.xml:699
 msgid "Logitech Internet"
 msgstr ""
 
-#: ../rules/base.xml.in.h:100
+#: rules/base.xml:706
 msgid "Logitech iTouch"
 msgstr ""
 
-#: ../rules/base.xml.in.h:101
+#: rules/base.xml:713
 msgid "Logitech Internet Navigator"
 msgstr ""
 
-#: ../rules/base.xml.in.h:102
+#: rules/base.xml:720
 msgid "Logitech Cordless Desktop EX110"
 msgstr ""
 
-#: ../rules/base.xml.in.h:103
+#: rules/base.xml:727
 msgid "Logitech iTouch Internet Navigator SE"
 msgstr ""
 
-#: ../rules/base.xml.in.h:104
+#: rules/base.xml:734
 msgid "Logitech iTouch Internet Navigator SE USB"
 msgstr ""
 
-#: ../rules/base.xml.in.h:105
+#: rules/base.xml:741
 msgid "Logitech Ultra-X"
 msgstr ""
 
-#: ../rules/base.xml.in.h:106
+#: rules/base.xml:748
 msgid "Logitech Ultra-X Cordless Media Desktop"
 msgstr ""
 
-#: ../rules/base.xml.in.h:107
+#: rules/base.xml:755
 msgid "Logitech diNovo"
 msgstr ""
 
-#: ../rules/base.xml.in.h:108
+#: rules/base.xml:762
 msgid "Logitech diNovo Edge"
 msgstr ""
 
-#: ../rules/base.xml.in.h:109
+#: rules/base.xml:769
 msgid "Memorex MX1998"
 msgstr ""
 
-#: ../rules/base.xml.in.h:110
+#: rules/base.xml:776
 msgid "Memorex MX2500 EZ-Access"
 msgstr ""
 
-#: ../rules/base.xml.in.h:111
+#: rules/base.xml:783
 msgid "Memorex MX2750"
 msgstr ""
 
-#: ../rules/base.xml.in.h:112
+#: rules/base.xml:790
 msgid "Microsoft Natural Ergonomic 4000"
 msgstr ""
 
-#: ../rules/base.xml.in.h:113
+#: rules/base.xml:797
 msgid "Microsoft Natural Wireless Ergonomic 7000"
 msgstr ""
 
-#: ../rules/base.xml.in.h:114
+#: rules/base.xml:804
 msgid "Microsoft Internet"
 msgstr ""
 
-#: ../rules/base.xml.in.h:115
+#: rules/base.xml:811
 msgid "Microsoft Natural Pro/Internet Pro"
 msgstr ""
 
-#: ../rules/base.xml.in.h:116
+#: rules/base.xml:818
 msgid "Microsoft Natural Pro USB/Internet Pro"
 msgstr ""
 
-#: ../rules/base.xml.in.h:117
+#: rules/base.xml:825
 msgid "Microsoft Natural Pro OEM"
 msgstr ""
 
-#: ../rules/base.xml.in.h:118
+#: rules/base.xml:832
 msgid "ViewSonic KU-306 Internet"
 msgstr ""
 
-#: ../rules/base.xml.in.h:119
+#: rules/base.xml:839
 msgid "Microsoft Internet Pro (Swedish)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:120
+#: rules/base.xml:846
 msgid "Microsoft Office Keyboard"
 msgstr ""
 
-#: ../rules/base.xml.in.h:121
+#: rules/base.xml:853
 msgid "Microsoft Wireless Multimedia 1.0A"
 msgstr ""
 
-#: ../rules/base.xml.in.h:122
+#: rules/base.xml:867
 msgid "Microsoft Natural Elite"
 msgstr ""
 
-#: ../rules/base.xml.in.h:123
+#: rules/base.xml:874
 msgid "Microsoft Comfort Curve 2000"
 msgstr ""
 
-#: ../rules/base.xml.in.h:124
+#: rules/base.xml:881
 msgid "Ortek Multimedia/Internet MCK-800"
 msgstr ""
 
-#: ../rules/base.xml.in.h:125
+#: rules/base.xml:888
 msgid "Propeller Voyager KTEZ-1000"
 msgstr ""
 
-#: ../rules/base.xml.in.h:126
+#: rules/base.xml:895
 msgid "QTronix Scorpius 98N+"
 msgstr ""
 
-#: ../rules/base.xml.in.h:127
+#: rules/base.xml:902
 msgid "Samsung SDM 4500P"
 msgstr ""
 
-#: ../rules/base.xml.in.h:128
+#: rules/base.xml:909
 msgid "Samsung SDM 4510P"
 msgstr ""
 
-#: ../rules/base.xml.in.h:129
+#: rules/base.xml:916
 msgid "Sanwa Supply SKB-KG3"
 msgstr ""
 
-#: ../rules/base.xml.in.h:130
+#: rules/base.xml:923
 msgid "NEC SK-1300"
 msgstr ""
 
-#: ../rules/base.xml.in.h:131
+#: rules/base.xml:930
 msgid "NEC SK-2500"
 msgstr ""
 
-#: ../rules/base.xml.in.h:132
+#: rules/base.xml:937
 msgid "NEC SK-6200"
 msgstr ""
 
-#: ../rules/base.xml.in.h:133
+#: rules/base.xml:944
 msgid "NEC SK-7100"
 msgstr ""
 
-#: ../rules/base.xml.in.h:134
+#: rules/base.xml:951
 msgid "Super Power Multimedia"
 msgstr ""
 
-#: ../rules/base.xml.in.h:135
+#: rules/base.xml:958
 msgid "SVEN Ergonomic 2500"
 msgstr ""
 
-#: ../rules/base.xml.in.h:136
+#: rules/base.xml:965
 msgid "SVEN Slim 303"
 msgstr ""
 
-#: ../rules/base.xml.in.h:137
+#: rules/base.xml:972
 msgid "Symplon PaceBook tablet"
 msgstr ""
 
-#: ../rules/base.xml.in.h:138
+#: rules/base.xml:979
 msgid "Toshiba Satellite S3000"
 msgstr ""
 
-#: ../rules/base.xml.in.h:139
+#: rules/base.xml:986
 msgid "Trust Wireless Classic"
 msgstr ""
 
-#: ../rules/base.xml.in.h:140
+#: rules/base.xml:993
 msgid "Trust Direct Access"
 msgstr ""
 
-#: ../rules/base.xml.in.h:141
+#: rules/base.xml:1000
 msgid "Trust Slimline"
 msgstr ""
 
-#: ../rules/base.xml.in.h:142
+#: rules/base.xml:1007
 msgid "TypeMatrix EZ-Reach 2020"
 msgstr ""
 
-#: ../rules/base.xml.in.h:143
+#: rules/base.xml:1014
 msgid "TypeMatrix EZ-Reach 2030 PS2"
 msgstr ""
 
-#: ../rules/base.xml.in.h:144
+#: rules/base.xml:1021
 msgid "TypeMatrix EZ-Reach 2030 USB"
 msgstr ""
 
-#: ../rules/base.xml.in.h:145
+#: rules/base.xml:1028
 msgid "TypeMatrix EZ-Reach 2030 USB (102/105:EU mode)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:146
+#: rules/base.xml:1035
 msgid "TypeMatrix EZ-Reach 2030 USB (106:JP mode)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:147
+#: rules/base.xml:1042
 msgid "Yahoo! Internet"
 msgstr ""
 
-#: ../rules/base.xml.in.h:148
+#: rules/base.xml:1049
 msgid "MacBook/MacBook Pro"
 msgstr ""
 
-#: ../rules/base.xml.in.h:149
+#: rules/base.xml:1056
 msgid "MacBook/MacBook Pro (intl.)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:150
+#: rules/base.xml:1063
 msgid "Macintosh"
 msgstr ""
 
-#: ../rules/base.xml.in.h:151
+#: rules/base.xml:1070
 msgid "Macintosh Old"
 msgstr ""
 
-#: ../rules/base.xml.in.h:152
+#: rules/base.xml:1077
 msgid "Happy Hacking for Mac"
 msgstr ""
 
-#: ../rules/base.xml.in.h:153
+#: rules/base.xml:1084
 msgid "Acer C300"
 msgstr ""
 
-#: ../rules/base.xml.in.h:154
+#: rules/base.xml:1091
 msgid "Acer Ferrari 4000"
 msgstr ""
 
-#: ../rules/base.xml.in.h:155
+#: rules/base.xml:1098
 msgid "Acer laptop"
 msgstr ""
 
-#: ../rules/base.xml.in.h:156
+#: rules/base.xml:1105
 msgid "Asus laptop"
 msgstr ""
 
-#: ../rules/base.xml.in.h:157
+#: rules/base.xml:1112
 msgid "Apple"
 msgstr ""
 
-#: ../rules/base.xml.in.h:158
+#: rules/base.xml:1119
 msgid "Apple laptop"
 msgstr ""
 
-#: ../rules/base.xml.in.h:159
+#: rules/base.xml:1126
 msgid "Apple Aluminium (ANSI)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:160
+#: rules/base.xml:1133
 msgid "Apple Aluminium (ISO)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:161
+#: rules/base.xml:1140
 msgid "Apple Aluminium (JIS)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:162
+#: rules/base.xml:1147
 msgid "Silvercrest Multimedia Wireless"
 msgstr ""
 
-#: ../rules/base.xml.in.h:163
+#: rules/base.xml:1154
 msgid "eMachines m6800 laptop"
 msgstr ""
 
-#: ../rules/base.xml.in.h:164
+#: rules/base.xml:1161
 msgid "BenQ X-Touch"
 msgstr ""
 
-#: ../rules/base.xml.in.h:165
+#: rules/base.xml:1168
 msgid "BenQ X-Touch 730"
 msgstr ""
 
-#: ../rules/base.xml.in.h:166
+#: rules/base.xml:1175
 msgid "BenQ X-Touch 800"
 msgstr ""
 
-#: ../rules/base.xml.in.h:167
+#: rules/base.xml:1182
 msgid "Happy Hacking"
 msgstr ""
 
-#: ../rules/base.xml.in.h:168
+#: rules/base.xml:1189
 msgid "Classmate PC"
 msgstr ""
 
-#: ../rules/base.xml.in.h:169
+#: rules/base.xml:1196
 msgid "OLPC"
 msgstr ""
 
-#: ../rules/base.xml.in.h:170
+#: rules/base.xml:1203
 msgid "Sun Type 7 USB"
 msgstr ""
 
-#: ../rules/base.xml.in.h:171
+#: rules/base.xml:1210
 msgid "Sun Type 7 USB (European)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:172
+#: rules/base.xml:1217
 msgid "Sun Type 7 USB (Unix)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:173
+#: rules/base.xml:1224
 msgid "Sun Type 7 USB (Japanese)/Japanese 106-key"
 msgstr "Sun Type 7 USB (ญี่ปุ่น)/ญี่ปุ่น 106 แป้น"
 
-#: ../rules/base.xml.in.h:174
+#: rules/base.xml:1231
 msgid "Sun Type 6/7 USB"
 msgstr ""
 
-#: ../rules/base.xml.in.h:175
+#: rules/base.xml:1238
 msgid "Sun Type 6/7 USB (European)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:176
+#: rules/base.xml:1245
 msgid "Sun Type 6 USB (Unix)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:177
+#: rules/base.xml:1252
 msgid "Sun Type 6 USB (Japanese)"
 msgstr "Sun Type 6 USB (ญี่ปุ่น)"
 
-#: ../rules/base.xml.in.h:178
+#: rules/base.xml:1259
 msgid "Sun Type 6 (Japanese)"
 msgstr "Sun Type 6 (ญี่ปุ่น)"
 
-#: ../rules/base.xml.in.h:179
+#: rules/base.xml:1266
 msgid "Targa Visionary 811"
 msgstr ""
 
-#: ../rules/base.xml.in.h:180
+#: rules/base.xml:1273
 msgid "Unitek KB-1925"
 msgstr ""
 
-#: ../rules/base.xml.in.h:181
+#: rules/base.xml:1280
 msgid "FL90"
 msgstr ""
 
-#: ../rules/base.xml.in.h:182
+#: rules/base.xml:1287
 msgid "Creative Desktop Wireless 7000"
 msgstr ""
 
@@ -749,449 +749,468 @@
 msgid "Htc Dream phone"
 msgstr ""
 
-#: ../rules/base.xml.in.h:184
+#: rules/base.xml:1294
 msgid "Truly Ergonomic 227"
 msgstr ""
 
-#: ../rules/base.xml.in.h:185
+#: rules/base.xml:1301
 msgid "Truly Ergonomic 229"
 msgstr ""
 
-#: ../rules/base.xml.in.h:186
+#: rules/base.xml:1308
 msgid "SteelSeries Apex 300 (Apex RAW)"
 msgstr ""
 
 #. Keyboard indicator for English layouts
-#: ../rules/base.xml.in.h:191 ../rules/base.extras.xml.in.h:61
+#. Keyboard indicator for Australian layouts
+#. Keyboard indicator for English layouts
+#: rules/base.xml:1339 rules/base.xml:1737 rules/base.xml:2257
+#: rules/base.xml:2684 rules/base.xml:3362 rules/base.xml:5576
+#: rules/base.xml:5823 rules/base.xml:5866 rules/base.xml:6011
+#: rules/base.xml:6022 rules/base.extras.xml:337 rules/base.extras.xml:1171
 msgid "en"
 msgstr ""
 
-#: ../rules/base.xml.in.h:192 ../rules/base.extras.xml.in.h:62
+#: rules/base.xml:1340 rules/base.extras.xml:338
 msgid "English (US)"
 msgstr "อังกฤษ (สหรัฐอเมริกา)"
 
 #. Keyboard indicator for Cherokee layouts
-#: ../rules/base.xml.in.h:194
+#: rules/base.xml:1350
 msgid "chr"
 msgstr ""
 
-#: ../rules/base.xml.in.h:195
+#: rules/base.xml:1351
 msgid "Cherokee"
 msgstr ""
 
-#: ../rules/base.xml.in.h:196
+#: rules/base.xml:1360
 msgid "English (US, euro on 5)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:197
+#: rules/base.xml:1366
 msgid "English (US, intl., with dead keys)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:198
+#: rules/base.xml:1372
 msgid "English (US, alt. intl.)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:199
+#: rules/base.xml:1378
 msgid "English (Colemak)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:200
+#: rules/base.xml:1384
 msgid "English (Dvorak)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:201
+#: rules/base.xml:1390
 msgid "English (Dvorak, intl., with dead keys)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:202
+#: rules/base.xml:1396
 msgid "English (Dvorak, alt. intl.)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:203
+#: rules/base.xml:1402
 msgid "English (Dvorak, left-handed)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:204
+#: rules/base.xml:1408
 msgid "English (Dvorak, right-handed)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:205
+#: rules/base.xml:1414
 msgid "English (classic Dvorak)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:206
+#: rules/base.xml:1420
 msgid "English (programmer Dvorak)"
 msgstr ""
 
 #. Keyboard indicator for Russian layouts
-#: ../rules/base.xml.in.h:208 ../rules/base.extras.xml.in.h:35
+#: rules/base.xml:1427 rules/base.xml:2908 rules/base.xml:3488
+#: rules/base.xml:3626 rules/base.xml:4055 rules/base.xml:4549
+#: rules/base.xml:4669 rules/base.xml:5069 rules/base.xml:5080
+#: rules/base.extras.xml:177 rules/base.extras.xml:188
+#: rules/base.extras.xml:566 rules/base.extras.xml:582
+#: rules/base.extras.xml:618
 msgid "ru"
 msgstr ""
 
-#: ../rules/base.xml.in.h:209
+#: rules/base.xml:1428
 msgid "Russian (US, phonetic)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:210
+#: rules/base.xml:1437
 msgid "English (Macintosh)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:211
+#: rules/base.xml:1443
 msgid "English (intl., with AltGr dead keys)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:212
+#: rules/base.xml:1454
 msgid "English (the divide/multiply keys toggle the layout)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:213
+#: rules/base.xml:1460
 msgid "Serbo-Croatian (US)"
 msgstr "เซอร์เบีย-โครเอเชีย (สหรัฐอเมริกา)"
 
-#: ../rules/base.xml.in.h:214
+#: rules/base.xml:1479
 msgid "English (Workman)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:215
+#: rules/base.xml:1485
 msgid "English (Workman, intl., with dead keys)"
 msgstr ""
 
+#. Keyboard indicator for Afghani layouts
 #. Keyboard indicator for Persian layouts
-#: ../rules/base.xml.in.h:217 ../rules/base.extras.xml.in.h:43
+#: rules/base.xml:1494 rules/base.xml:1535 rules/base.xml:3037
+#: rules/base.extras.xml:226
 msgid "fa"
 msgstr ""
 
-#: ../rules/base.xml.in.h:218
+#: rules/base.xml:1495
 msgid "Afghani"
 msgstr ""
 
 #. Keyboard indicator for Pashto layouts
-#: ../rules/base.xml.in.h:220
+#: rules/base.xml:1502 rules/base.xml:1524
 msgid "ps"
 msgstr ""
 
-#: ../rules/base.xml.in.h:221
+#: rules/base.xml:1503
 msgid "Pashto"
 msgstr ""
 
 #. Keyboard indicator for Uzbek layouts
-#: ../rules/base.xml.in.h:223
+#: rules/base.xml:1513 rules/base.xml:1543 rules/base.xml:5642
 msgid "uz"
 msgstr ""
 
-#: ../rules/base.xml.in.h:224
+#: rules/base.xml:1514
 msgid "Uzbek (Afghanistan)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:225
+#: rules/base.xml:1525
 msgid "Pashto (Afghanistan, OLPC)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:226
+#: rules/base.xml:1536
 msgid "Persian (Afghanistan, Dari OLPC)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:227
+#: rules/base.xml:1544
 msgid "Uzbek (Afghanistan, OLPC)"
 msgstr ""
 
 #. Keyboard indicator for Arabic layouts
-#: ../rules/base.xml.in.h:229 ../rules/base.extras.xml.in.h:106
+#. Keyboard indicator for Iraqi layouts
+#. Keyboard indicator for Arabic layouts
+#: rules/base.xml:1556 rules/base.xml:2400 rules/base.xml:2413
+#: rules/base.xml:3100 rules/base.xml:5223 rules/base.xml:5787
+#: rules/base.extras.xml:734
 msgid "ar"
 msgstr ""
 
-#: ../rules/base.xml.in.h:230 ../rules/base.extras.xml.in.h:107
+#: rules/base.xml:1557 rules/base.extras.xml:735
 msgid "Arabic"
 msgstr "อาหรับ"
 
-#: ../rules/base.xml.in.h:231
+#: rules/base.xml:1587
 msgid "Arabic (AZERTY)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:232
+#: rules/base.xml:1593
 msgid "Arabic (AZERTY/digits)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:233
+#: rules/base.xml:1599
 msgid "Arabic (digits)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:234
+#: rules/base.xml:1605
 msgid "Arabic (QWERTY)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:235
+#: rules/base.xml:1611
 msgid "Arabic (qwerty/digits)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:236
+#: rules/base.xml:1617
 msgid "Arabic (Buckwalter)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:237
+#: rules/base.xml:1623
 msgid "Arabic (OLPC)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:238
+#: rules/base.xml:1629
 msgid "Arabic (Macintosh)"
 msgstr ""
 
 #. Keyboard indicator for Albanian layouts
-#: ../rules/base.xml.in.h:240
+#: rules/base.xml:1638
 msgid "sq"
 msgstr ""
 
-#: ../rules/base.xml.in.h:241
+#: rules/base.xml:1639
 msgid "Albanian"
 msgstr ""
 
-#: ../rules/base.xml.in.h:242
+#: rules/base.xml:1648
 msgid "Albanian (Plisi)"
 msgstr ""
 
 #. Keyboard indicator for Armenian layouts
-#: ../rules/base.xml.in.h:244 ../rules/base.extras.xml.in.h:100
+#: rules/base.xml:1663 rules/base.extras.xml:695
 msgid "hy"
 msgstr ""
 
-#: ../rules/base.xml.in.h:245 ../rules/base.extras.xml.in.h:101
+#: rules/base.xml:1664 rules/base.extras.xml:696
 msgid "Armenian"
 msgstr ""
 
-#: ../rules/base.xml.in.h:246
+#: rules/base.xml:1673
 msgid "Armenian (phonetic)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:247
+#: rules/base.xml:1679
 msgid "Armenian (alt. phonetic)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:248
+#: rules/base.xml:1685
 msgid "Armenian (eastern)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:249
+#: rules/base.xml:1691
 msgid "Armenian (western)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:250
+#: rules/base.xml:1697
 msgid "Armenian (alt. eastern)"
 msgstr ""
 
 #. Keyboard indicator for German layouts
-#: ../rules/base.xml.in.h:252 ../rules/base.extras.xml.in.h:22
+#: rules/base.xml:1706 rules/base.xml:3510 rules/base.xml:5135
+#: rules/base.xml:5153 rules/base.xml:5161 rules/base.xml:5213
+#: rules/base.extras.xml:95 rules/base.extras.xml:1120
 msgid "de"
 msgstr ""
 
-#: ../rules/base.xml.in.h:253
+#: rules/base.xml:1707
 msgid "German (Austria)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:254
+#: rules/base.xml:1716
 msgid "German (Austria, no dead keys)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:255
+#: rules/base.xml:1722
 msgid "German (Austria, with Sun dead keys)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:256
+#: rules/base.xml:1728
 msgid "German (Austria, Macintosh)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:257
+#: rules/base.xml:1738
 msgid "English (Australian)"
 msgstr ""
 
 #. Keyboard indicator for Azerbaijani layouts
-#: ../rules/base.xml.in.h:259
+#: rules/base.xml:1748
 msgid "az"
 msgstr ""
 
-#: ../rules/base.xml.in.h:260
+#: rules/base.xml:1749
 msgid "Azerbaijani"
 msgstr ""
 
-#: ../rules/base.xml.in.h:261
+#: rules/base.xml:1758
 msgid "Azerbaijani (Cyrillic)"
 msgstr ""
 
 #. Keyboard indicator for Belarusian layouts
-#: ../rules/base.xml.in.h:263
+#: rules/base.xml:1767
 msgid "by"
 msgstr ""
 
-#: ../rules/base.xml.in.h:264
+#: rules/base.xml:1768
 msgid "Belarusian"
 msgstr ""
 
-#: ../rules/base.xml.in.h:265
+#: rules/base.xml:1777
 msgid "Belarusian (legacy)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:266
+#: rules/base.xml:1783
 msgid "Belarusian (Latin)"
 msgstr ""
 
 #. Keyboard indicator for Belgian layouts
-#: ../rules/base.xml.in.h:268 ../rules/base.extras.xml.in.h:112
+#: rules/base.xml:1792 rules/base.extras.xml:767
 msgid "be"
 msgstr ""
 
-#: ../rules/base.xml.in.h:269 ../rules/base.extras.xml.in.h:113
+#: rules/base.xml:1793 rules/base.extras.xml:768
 msgid "Belgian"
 msgstr ""
 
-#: ../rules/base.xml.in.h:270
+#: rules/base.xml:1804
 msgid "Belgian (alt.)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:271
+#: rules/base.xml:1810
 msgid "Belgian (alt., Latin-9 only)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:272
+#: rules/base.xml:1816
 msgid "Belgian (alt., with Sun dead keys)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:273
+#: rules/base.xml:1822
 msgid "Belgian (alt. ISO)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:274
+#: rules/base.xml:1828
 msgid "Belgian (no dead keys)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:275
+#: rules/base.xml:1834
 msgid "Belgian (with Sun dead keys)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:276
+#: rules/base.xml:1840
 msgid "Belgian (Wang 724 AZERTY)"
 msgstr ""
 
 #. Keyboard indicator for Bangla layouts
-#: ../rules/base.xml.in.h:278
+#: rules/base.xml:1849 rules/base.xml:1878 rules/base.xml:1891
 msgid "bn"
 msgstr ""
 
-#: ../rules/base.xml.in.h:279
+#: rules/base.xml:1850
 msgid "Bangla"
 msgstr ""
 
-#: ../rules/base.xml.in.h:280
+#: rules/base.xml:1861
 msgid "Bangla (Probhat)"
 msgstr ""
 
 #. Keyboard indicator for Indian layouts
-#: ../rules/base.xml.in.h:282
+#: rules/base.xml:1870
 msgid "in"
 msgstr ""
 
-#: ../rules/base.xml.in.h:283
+#: rules/base.xml:1871
 msgid "Indian"
 msgstr ""
 
-#: ../rules/base.xml.in.h:284
+#: rules/base.xml:1879
 msgid "Bangla (India)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:285
+#: rules/base.xml:1892
 msgid "Bangla (India, Probhat)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:286
+#: rules/base.xml:1903
 msgid "Bangla (India, Baishakhi)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:287
+#: rules/base.xml:1914
 msgid "Bangla (India, Bornona)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:288
+#: rules/base.xml:1925
 msgid "Bangla (India, Uni Gitanjali)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:289
+#: rules/base.xml:1936
 msgid "Bangla (India, Baishakhi Inscript)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:290
+#: rules/base.xml:1947
 msgid "Manipuri (Eeyek)"
 msgstr ""
 
 #. Keyboard indicator for Gujarati layouts
-#: ../rules/base.xml.in.h:292
+#: rules/base.xml:1957
 msgid "gu"
 msgstr ""
 
-#: ../rules/base.xml.in.h:293
+#: rules/base.xml:1958
 msgid "Gujarati"
 msgstr "คุชราต"
 
 #. Keyboard indicator for Punjabi layouts
-#: ../rules/base.xml.in.h:295
+#: rules/base.xml:1968 rules/base.xml:1979
 msgid "pa"
 msgstr ""
 
-#: ../rules/base.xml.in.h:296
+#: rules/base.xml:1969
 msgid "Punjabi (Gurmukhi)"
 msgstr "ปัญจาบ (คุรมุข)"
 
-#: ../rules/base.xml.in.h:297
+#: rules/base.xml:1980
 msgid "Punjabi (Gurmukhi Jhelum)"
 msgstr "ปัญจาบ (คุรมุข Jhelum)"
 
 #. Keyboard indicator for Kannada layouts
-#: ../rules/base.xml.in.h:299
+#: rules/base.xml:1990 rules/base.xml:2001
 msgid "kn"
 msgstr ""
 
-#: ../rules/base.xml.in.h:300
+#: rules/base.xml:1991
 msgid "Kannada"
 msgstr "กัณณาท"
 
-#: ../rules/base.xml.in.h:301
+#: rules/base.xml:2002
 msgid "Kannada (KaGaPa phonetic)"
 msgstr ""
 
 #. Keyboard indicator for Malayalam layouts
-#: ../rules/base.xml.in.h:303
+#: rules/base.xml:2012 rules/base.xml:2023 rules/base.xml:2034
 msgid "ml"
 msgstr ""
 
-#: ../rules/base.xml.in.h:304
+#: rules/base.xml:2013
 msgid "Malayalam"
 msgstr "มะละยาลัม"
 
-#: ../rules/base.xml.in.h:305
+#: rules/base.xml:2024
 msgid "Malayalam (Lalitha)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:306
+#: rules/base.xml:2035
 msgid "Malayalam (enhanced Inscript, with rupee)"
 msgstr ""
 
 #. Keyboard indicator for Oriya layouts
-#: ../rules/base.xml.in.h:308
+#: rules/base.xml:2045
 msgid "or"
 msgstr ""
 
-#: ../rules/base.xml.in.h:309
+#: rules/base.xml:2046
 msgid "Oriya"
 msgstr "โอริยา"
 
 #. Keyboard indicator for Ol Chiki layouts
-#: ../rules/base.xml.in.h:311
+#: rules/base.xml:2058
 msgid "sat"
 msgstr ""
 
-#: ../rules/base.xml.in.h:312
+#: rules/base.xml:2059
 msgid "Ol Chiki"
 msgstr ""
 
 #. Keyboard indicator for Tamil layouts
-#: ../rules/base.xml.in.h:314
+#: rules/base.xml:2070 rules/base.xml:2081 rules/base.xml:2092
+#: rules/base.xml:2103 rules/base.xml:2114 rules/base.xml:5315
 msgid "ta"
 msgstr ""
 
@@ -1216,1723 +1235,1739 @@
 msgstr "ทมิฬ"
 
 #. Keyboard indicator for Telugu layouts
-#: ../rules/base.xml.in.h:321
+#: rules/base.xml:2125 rules/base.xml:2136 rules/base.xml:2147
+#: rules/base.xml:2158
 msgid "te"
 msgstr ""
 
-#: ../rules/base.xml.in.h:322
+#: rules/base.xml:2126
 msgid "Telugu"
 msgstr "เตลูกู"
 
-#: ../rules/base.xml.in.h:323
+#: rules/base.xml:2137 rules/base.xml:2159
 msgid "Telugu (KaGaPa phonetic)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:324
+#: rules/base.xml:2148
 msgid "Telugu (Sarala)"
 msgstr ""
 
 #. Keyboard indicator for Urdu layouts
-#: ../rules/base.xml.in.h:326
+#: rules/base.xml:2169 rules/base.xml:2180 rules/base.xml:2191
+#: rules/base.xml:5765
 msgid "ur"
 msgstr ""
 
-#: ../rules/base.xml.in.h:327
+#: rules/base.xml:2170
 msgid "Urdu (phonetic)"
 msgstr "อุรดู (การออกเสียง)"
 
-#: ../rules/base.xml.in.h:328
+#: rules/base.xml:2181
 msgid "Urdu (alt. phonetic)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:329
+#: rules/base.xml:2192
 msgid "Urdu (Win keys)"
 msgstr ""
 
 #. Keyboard indicator for Hindi layouts
-#: ../rules/base.xml.in.h:331
+#: rules/base.xml:2202 rules/base.xml:2213 rules/base.xml:2224
 msgid "hi"
 msgstr ""
 
-#: ../rules/base.xml.in.h:332
+#: rules/base.xml:2203
 msgid "Hindi (Bolnagri)"
 msgstr "ฮินดี (Bolnagri)"
 
-#: ../rules/base.xml.in.h:333
+#: rules/base.xml:2214
 msgid "Hindi (Wx)"
 msgstr "ฮินดี (Wx)"
 
-#: ../rules/base.xml.in.h:334
+#: rules/base.xml:2225
 msgid "Hindi (KaGaPa phonetic)"
 msgstr "ฮินดี (KaGaPa phonetic)"
 
 #. Keyboard indicator for Sanskrit layouts
-#: ../rules/base.xml.in.h:336
+#: rules/base.xml:2235
 msgid "sa"
 msgstr ""
 
-#: ../rules/base.xml.in.h:337
+#: rules/base.xml:2236
 msgid "Sanskrit (KaGaPa phonetic)"
 msgstr "สันสกฤต (การออกเสียง KaGaPa)"
 
 #. Keyboard indicator for Marathi layouts
-#: ../rules/base.xml.in.h:339
+#: rules/base.xml:2246
 msgid "mr"
 msgstr ""
 
-#: ../rules/base.xml.in.h:340
+#: rules/base.xml:2247
 msgid "Marathi (KaGaPa phonetic)"
 msgstr "มาราฐี (การออกเสียง KaGaPa)"
 
-#: ../rules/base.xml.in.h:341
+#: rules/base.xml:2258
 msgid "English (India, with rupee)"
 msgstr ""
 
 #. Keyboard indicator for Bosnian layouts
-#: ../rules/base.xml.in.h:343
+#: rules/base.xml:2270
 msgid "bs"
 msgstr ""
 
-#: ../rules/base.xml.in.h:344
+#: rules/base.xml:2271
 msgid "Bosnian"
 msgstr "บอสเนีย"
 
-#: ../rules/base.xml.in.h:345
+#: rules/base.xml:2280
 msgid "Bosnian (with guillemets)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:346
+#: rules/base.xml:2286
 msgid "Bosnian (with Bosnian digraphs)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:347
+#: rules/base.xml:2292
 msgid "Bosnian (US, with Bosnian digraphs)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:348
+#: rules/base.xml:2298
 msgid "Bosnian (US, with Bosnian letters)"
 msgstr ""
 
 #. Keyboard indicator for Portuguese layouts
-#: ../rules/base.xml.in.h:350 ../rules/base.extras.xml.in.h:115
+#: rules/base.xml:2307 rules/base.xml:4568 rules/base.extras.xml:782
+#: rules/base.extras.xml:1024 rules/base.extras.xml:1039
 msgid "pt"
 msgstr ""
 
-#: ../rules/base.xml.in.h:351 ../rules/base.extras.xml.in.h:116
+#: rules/base.xml:2308 rules/base.extras.xml:783
 msgid "Portuguese (Brazil)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:352
+#: rules/base.xml:2317
 msgid "Portuguese (Brazil, no dead keys)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:353
+#: rules/base.xml:2323
 msgid "Portuguese (Brazil, Dvorak)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:354
+#: rules/base.xml:2329
 msgid "Portuguese (Brazil, Nativo)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:355
+#: rules/base.xml:2335
 msgid "Portuguese (Brazil, Nativo for US keyboards)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:356
+#: rules/base.xml:2341
 msgid "Esperanto (Brazil, Nativo)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:357
+#: rules/base.xml:2350
 msgid "Portuguese (Brazil, IBM/Lenovo ThinkPad)"
 msgstr ""
 
 #. Keyboard indicator for Bulgarian layouts
-#: ../rules/base.xml.in.h:359
+#: rules/base.xml:2359
 msgid "bg"
 msgstr ""
 
-#: ../rules/base.xml.in.h:360
+#: rules/base.xml:2360
 msgid "Bulgarian"
 msgstr "บัลแกเรีย"
 
-#: ../rules/base.xml.in.h:361
+#: rules/base.xml:2369
 msgid "Bulgarian (traditional phonetic)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:362
+#: rules/base.xml:2375
 msgid "Bulgarian (new phonetic)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:363
+#: rules/base.xml:2383
 msgid "la"
 msgstr ""
 
-#: ../rules/base.xml.in.h:364
+#: rules/base.xml:2384
 msgid "Berber (Algeria, Latin)"
 msgstr ""
 
 #. Keyboard indicator for Berber layouts
-#: ../rules/base.xml.in.h:366
+#: rules/base.xml:2390 rules/base.xml:2432 rules/base.xml:2443
+#: rules/base.xml:2454 rules/base.xml:2465 rules/base.xml:2476
+#: rules/base.xml:2487
 msgid "ber"
 msgstr ""
 
-#: ../rules/base.xml.in.h:367
+#: rules/base.xml:2391
 msgid "Berber (Algeria, Tifinagh)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:368
+#: rules/base.xml:2401
 msgid "Arabic (Algeria)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:369
+#: rules/base.xml:2414
 msgid "Arabic (Morocco)"
 msgstr ""
 
 #. Keyboard indicator for French layouts
-#: ../rules/base.xml.in.h:371 ../rules/base.extras.xml.in.h:15
+#: rules/base.xml:2421 rules/base.xml:2628 rules/base.xml:2639
+#: rules/base.xml:2647 rules/base.xml:2697 rules/base.xml:3223
+#: rules/base.xml:3453 rules/base.xml:5169 rules/base.xml:5180
+#: rules/base.xml:5191 rules/base.xml:5202 rules/base.xml:6000
+#: rules/base.extras.xml:63 rules/base.extras.xml:908
 msgid "fr"
 msgstr ""
 
-#: ../rules/base.xml.in.h:372
+#: rules/base.xml:2422
 msgid "French (Morocco)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:373
+#: rules/base.xml:2433
 msgid "Berber (Morocco, Tifinagh)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:374
+#: rules/base.xml:2444
 msgid "Berber (Morocco, Tifinagh alt.)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:375
+#: rules/base.xml:2455
 msgid "Berber (Morocco, Tifinagh alt. phonetic)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:376
+#: rules/base.xml:2466
 msgid "Berber (Morocco, Tifinagh extended)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:377
+#: rules/base.xml:2477
 msgid "Berber (Morocco, Tifinagh phonetic)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:378
+#: rules/base.xml:2488
 msgid "Berber (Morocco, Tifinagh extended phonetic)"
 msgstr ""
 
 #. Keyboard indicator for Cameroon layouts
-#: ../rules/base.xml.in.h:380 ../rules/base.extras.xml.in.h:193
+#: rules/base.xml:2500 rules/base.extras.xml:1253
 msgid "cm"
 msgstr ""
 
-#: ../rules/base.xml.in.h:381 ../rules/base.extras.xml.in.h:194
+#: rules/base.xml:2501 rules/base.extras.xml:1254
 msgid "English (Cameroon)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:382
+#: rules/base.xml:2510
 msgid "French (Cameroon)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:383
+#: rules/base.xml:2519
 msgid "Cameroon Multilingual (QWERTY)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:384
+#: rules/base.xml:2556
 msgid "Cameroon Multilingual (AZERTY)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:385
+#: rules/base.xml:2593
 msgid "Cameroon Multilingual (Dvorak)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:386 ../rules/base.extras.xml.in.h:195
+#: rules/base.xml:2599 rules/base.extras.xml:1260
 msgid "Mmuock"
 msgstr ""
 
 #. Keyboard indicator for Burmese layouts
-#: ../rules/base.xml.in.h:388
+#: rules/base.xml:2608
 msgid "my"
 msgstr ""
 
-#: ../rules/base.xml.in.h:389
+#: rules/base.xml:2609
 msgid "Burmese"
 msgstr ""
 
-#: ../rules/base.xml.in.h:392 ../rules/base.extras.xml.in.h:16
+#: rules/base.xml:2629 rules/base.extras.xml:64
 msgid "French (Canada)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:393
+#: rules/base.xml:2640
 msgid "French (Canada, Dvorak)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:394
+#: rules/base.xml:2648
 msgid "French (Canada, legacy)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:395
+#: rules/base.xml:2654
 msgid "Canadian Multilingual"
 msgstr ""
 
-#: ../rules/base.xml.in.h:396
+#: rules/base.xml:2660
 msgid "Canadian Multilingual (1st part)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:397
+#: rules/base.xml:2666
 msgid "Canadian Multilingual (2nd part)"
 msgstr ""
 
 #. Keyboard indicator for Inuktikut layouts
-#: ../rules/base.xml.in.h:399
+#: rules/base.xml:2673
 msgid "ike"
 msgstr ""
 
-#: ../rules/base.xml.in.h:400
+#: rules/base.xml:2674
 msgid "Inuktitut"
 msgstr ""
 
-#: ../rules/base.xml.in.h:401
+#: rules/base.xml:2685
 msgid "English (Canada)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:402
+#: rules/base.xml:2698
 msgid "French (Democratic Republic of the Congo)"
 msgstr ""
 
+#. Keyboard indicator for Chinese layouts
 #. Keyboard indicator for Taiwanese layouts
-#: ../rules/base.xml.in.h:404
+#: rules/base.xml:2709 rules/base.xml:5473
 msgid "zh"
 msgstr ""
 
-#: ../rules/base.xml.in.h:405
+#: rules/base.xml:2710
 msgid "Chinese"
 msgstr "จีน"
 
-#: ../rules/base.xml.in.h:406
+#: rules/base.xml:2784
 msgid "Tibetan"
 msgstr ""
 
-#: ../rules/base.xml.in.h:407
+#: rules/base.xml:2793
 msgid "Tibetan (with ASCII numerals)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:408
+#: rules/base.xml:2802
 msgid "ug"
 msgstr ""
 
-#: ../rules/base.xml.in.h:409
+#: rules/base.xml:2803
 msgid "Uyghur"
 msgstr ""
 
 #. Keyboard indicator for Croatian layouts
-#: ../rules/base.xml.in.h:412
+#: rules/base.xml:2824
 msgid "hr"
 msgstr ""
 
-#: ../rules/base.xml.in.h:413
+#: rules/base.xml:2825
 msgid "Croatian"
 msgstr "โครเอเชีย"
 
-#: ../rules/base.xml.in.h:414
+#: rules/base.xml:2834
 msgid "Croatian (with guillemets)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:415
+#: rules/base.xml:2840
 msgid "Croatian (with Croatian digraphs)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:416
+#: rules/base.xml:2846
 msgid "Croatian (US, with Croatian digraphs)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:417
+#: rules/base.xml:2852
 msgid "Croatian (US, with Croatian letters)"
 msgstr ""
 
 #. Keyboard indicator for Chech layouts
-#: ../rules/base.xml.in.h:419 ../rules/base.extras.xml.in.h:118
+#: rules/base.xml:2861 rules/base.extras.xml:797
 msgid "cs"
 msgstr ""
 
-#: ../rules/base.xml.in.h:420 ../rules/base.extras.xml.in.h:119
+#: rules/base.xml:2862 rules/base.extras.xml:798
 msgid "Czech"
 msgstr "เช็ก"
 
-#: ../rules/base.xml.in.h:421
+#: rules/base.xml:2871
 msgid "Czech (with &lt;\\|&gt; key)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:422
+#: rules/base.xml:2877
 msgid "Czech (QWERTY)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:423
+#: rules/base.xml:2883
 msgid "Czech (QWERTY, extended backslash)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:424
+#: rules/base.xml:2895
 msgid "Czech (UCW, only accented letters)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:425
+#: rules/base.xml:2901
 msgid "Czech (US, Dvorak, UCW support)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:426
+#: rules/base.xml:2909
 msgid "Russian (Czech, phonetic)"
 msgstr ""
 
 #. Keyboard indicator for Danish layouts
-#: ../rules/base.xml.in.h:428 ../rules/base.extras.xml.in.h:121
+#: rules/base.xml:2921 rules/base.extras.xml:836
 msgid "da"
 msgstr ""
 
-#: ../rules/base.xml.in.h:429 ../rules/base.extras.xml.in.h:122
+#: rules/base.xml:2922 rules/base.extras.xml:837
 msgid "Danish"
 msgstr "เดนมาร์ก"
 
-#: ../rules/base.xml.in.h:430
+#: rules/base.xml:2931
 msgid "Danish (no dead keys)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:431
+#: rules/base.xml:2937
 msgid "Danish (Win keys)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:432
+#: rules/base.xml:2943
 msgid "Danish (Macintosh)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:433
+#: rules/base.xml:2949
 msgid "Danish (Macintosh, no dead keys)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:434
+#: rules/base.xml:2955
 msgid "Danish (Dvorak)"
 msgstr ""
 
 #. Keyboard indicator for Dutch layouts
-#: ../rules/base.xml.in.h:436 ../rules/base.extras.xml.in.h:124
+#: rules/base.xml:2964 rules/base.extras.xml:851
 msgid "nl"
 msgstr ""
 
-#: ../rules/base.xml.in.h:437 ../rules/base.extras.xml.in.h:125
+#: rules/base.xml:2965 rules/base.extras.xml:852
 msgid "Dutch"
 msgstr "ดัตช์"
 
-#: ../rules/base.xml.in.h:438
+#: rules/base.xml:2974
 msgid "Dutch (with Sun dead keys)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:439
+#: rules/base.xml:2980
 msgid "Dutch (Macintosh)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:440
+#: rules/base.xml:2986
 msgid "Dutch (standard)"
 msgstr ""
 
 #. Keyboard indicator for Dzongkha layouts
-#: ../rules/base.xml.in.h:442
+#: rules/base.xml:2995
 msgid "dz"
 msgstr ""
 
-#: ../rules/base.xml.in.h:443
+#: rules/base.xml:2996
 msgid "Dzongkha"
 msgstr ""
 
 #. Keyboard indicator for Estonian layouts
-#: ../rules/base.xml.in.h:445 ../rules/base.extras.xml.in.h:127
+#: rules/base.xml:3006 rules/base.extras.xml:866
 msgid "et"
 msgstr ""
 
-#: ../rules/base.xml.in.h:446 ../rules/base.extras.xml.in.h:128
+#: rules/base.xml:3007 rules/base.extras.xml:867
 msgid "Estonian"
 msgstr ""
 
-#: ../rules/base.xml.in.h:447
+#: rules/base.xml:3016
 msgid "Estonian (no dead keys)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:448
+#: rules/base.xml:3022
 msgid "Estonian (Dvorak)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:449
+#: rules/base.xml:3028
 msgid "Estonian (US, with Estonian letters)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:450 ../rules/base.extras.xml.in.h:44
+#: rules/base.xml:3038 rules/base.extras.xml:227
 msgid "Persian"
 msgstr "เปอร์เซีย"
 
-#: ../rules/base.xml.in.h:451
+#: rules/base.xml:3047
 msgid "Persian (with Persian keypad)"
 msgstr ""
 
 #. Keyboard indicator for Kurdish layouts
-#: ../rules/base.xml.in.h:453
+#: rules/base.xml:3054 rules/base.xml:3065 rules/base.xml:3076
+#: rules/base.xml:3087 rules/base.xml:3112 rules/base.xml:3123
+#: rules/base.xml:3134 rules/base.xml:3145 rules/base.xml:5250
+#: rules/base.xml:5261 rules/base.xml:5272 rules/base.xml:5399
+#: rules/base.xml:5410 rules/base.xml:5421
 msgid "ku"
 msgstr ""
 
-#: ../rules/base.xml.in.h:454
+#: rules/base.xml:3055
 msgid "Kurdish (Iran, Latin Q)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:455
+#: rules/base.xml:3066
 msgid "Kurdish (Iran, F)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:456
+#: rules/base.xml:3077
 msgid "Kurdish (Iran, Latin Alt-Q)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:457
+#: rules/base.xml:3088
 msgid "Kurdish (Iran, Arabic-Latin)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:458
+#: rules/base.xml:3101
 msgid "Iraqi"
 msgstr ""
 
-#: ../rules/base.xml.in.h:459
+#: rules/base.xml:3113
 msgid "Kurdish (Iraq, Latin Q)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:460
+#: rules/base.xml:3124
 msgid "Kurdish (Iraq, F)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:461
+#: rules/base.xml:3135
 msgid "Kurdish (Iraq, Latin Alt-Q)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:462
+#: rules/base.xml:3146
 msgid "Kurdish (Iraq, Arabic-Latin)"
 msgstr ""
 
 #. Keyboard indicator for Faroese layouts
-#: ../rules/base.xml.in.h:464
+#: rules/base.xml:3158
 msgid "fo"
 msgstr ""
 
-#: ../rules/base.xml.in.h:465
+#: rules/base.xml:3159
 msgid "Faroese"
 msgstr ""
 
-#: ../rules/base.xml.in.h:466
+#: rules/base.xml:3168
 msgid "Faroese (no dead keys)"
 msgstr ""
 
 #. Keyboard indicator for Finnish layouts
-#: ../rules/base.xml.in.h:468 ../rules/base.extras.xml.in.h:130
+#: rules/base.xml:3177 rules/base.extras.xml:881
 msgid "fi"
 msgstr ""
 
-#: ../rules/base.xml.in.h:469 ../rules/base.extras.xml.in.h:131
+#: rules/base.xml:3178 rules/base.extras.xml:882
 msgid "Finnish"
 msgstr "ฟินแลนด์"
 
-#: ../rules/base.xml.in.h:470
+#: rules/base.xml:3193
 msgid "Finnish (classic)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:471
+#: rules/base.xml:3199
 msgid "Finnish (classic, no dead keys)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:472
+#: rules/base.xml:3187
 msgid "Finnish (Winkeys)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:473
+#: rules/base.xml:3205
 msgid "Northern Saami (Finland)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:474
+#: rules/base.xml:3214
 msgid "Finnish (Macintosh)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:475 ../rules/base.extras.xml.in.h:135
+#: rules/base.xml:3224 rules/base.extras.xml:909
 msgid "French"
 msgstr "ฝรั่งเศส"
 
-#: ../rules/base.xml.in.h:476
+#: rules/base.xml:3233
 msgid "French (no dead keys)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:477
+#: rules/base.xml:3239
 msgid "French (with Sun dead keys)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:478
+#: rules/base.xml:3245
 msgid "French (alt.)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:479
+#: rules/base.xml:3251
 msgid "French (alt., Latin-9 only)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:480
+#: rules/base.xml:3257
 msgid "French (alt., no dead keys)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:481
+#: rules/base.xml:3263
 msgid "French (alt., with Sun dead keys)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:482
+#: rules/base.xml:3269
 msgid "French (legacy, alt.)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:483
+#: rules/base.xml:3275
 msgid "French (legacy, alt., no dead keys)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:484
+#: rules/base.xml:3281
 msgid "French (legacy, alt., with Sun dead keys)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:485
+#: rules/base.xml:3287
 msgid "French (Bepo, ergonomic, Dvorak way)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:486
+#: rules/base.xml:3293
 msgid "French (Bepo, ergonomic, Dvorak way, Latin-9 only)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:487
+#: rules/base.xml:3305
 msgid "French (Dvorak)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:488
+#: rules/base.xml:3311
 msgid "French (Macintosh)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:489
+#: rules/base.xml:3317
 msgid "French (AZERTY)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:490
+#: rules/base.xml:3329
 msgid "French (Breton)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:491
+#: rules/base.xml:3335
 msgid "Occitan"
 msgstr ""
 
-#: ../rules/base.xml.in.h:492
+#: rules/base.xml:3344
 msgid "Georgian (France, AZERTY Tskapo)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:494
+#: rules/base.xml:3363
 msgid "English (Ghana)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:495
+#: rules/base.xml:3372
 msgid "English (Ghana, multilingual)"
 msgstr ""
 
 #. Keyboard indicator for Akan layouts
-#: ../rules/base.xml.in.h:497
+#: rules/base.xml:3379
 msgid "ak"
 msgstr ""
 
-#: ../rules/base.xml.in.h:498
+#: rules/base.xml:3380
 msgid "Akan"
 msgstr ""
 
 #. Keyboard indicator for Ewe layouts
-#: ../rules/base.xml.in.h:500
+#: rules/base.xml:3390
 msgid "ee"
 msgstr ""
 
-#: ../rules/base.xml.in.h:501
+#: rules/base.xml:3391
 msgid "Ewe"
 msgstr ""
 
 #. Keyboard indicator for Fula layouts
-#: ../rules/base.xml.in.h:503
+#: rules/base.xml:3401
 msgid "ff"
 msgstr ""
 
-#: ../rules/base.xml.in.h:504
+#: rules/base.xml:3402
 msgid "Fula"
 msgstr ""
 
 #. Keyboard indicator for Ga layouts
-#: ../rules/base.xml.in.h:506
+#: rules/base.xml:3412
 msgid "gaa"
 msgstr ""
 
-#: ../rules/base.xml.in.h:507
+#: rules/base.xml:3413
 msgid "Ga"
 msgstr ""
 
 #. Keyboard indicator for Hausa layouts
-#: ../rules/base.xml.in.h:509
+#: rules/base.xml:3423 rules/base.xml:5899
 msgid "ha"
 msgstr ""
 
-#: ../rules/base.xml.in.h:510
+#: rules/base.xml:3424
 msgid "Hausa (Ghana)"
 msgstr ""
 
 #. Keyboard indicator for Avatime layouts
-#: ../rules/base.xml.in.h:512
+#: rules/base.xml:3434
 msgid "avn"
 msgstr ""
 
-#: ../rules/base.xml.in.h:513
+#: rules/base.xml:3435
 msgid "Avatime"
 msgstr ""
 
-#: ../rules/base.xml.in.h:514
+#: rules/base.xml:3444
 msgid "English (Ghana, GILLBT)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:515
+#: rules/base.xml:3454
 msgid "French (Guinea)"
 msgstr ""
 
 #. Keyboard indicator for Georgian layouts
-#: ../rules/base.xml.in.h:517
+#: rules/base.xml:3465
 msgid "ka"
 msgstr ""
 
-#: ../rules/base.xml.in.h:518
+#: rules/base.xml:3466
 msgid "Georgian"
 msgstr ""
 
-#: ../rules/base.xml.in.h:519
+#: rules/base.xml:3475
 msgid "Georgian (ergonomic)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:520
+#: rules/base.xml:3481
 msgid "Georgian (MESS)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:521
+#: rules/base.xml:3489
 msgid "Russian (Georgia)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:522
+#: rules/base.xml:3498
 msgid "Ossetian (Georgia)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:523 ../rules/base.extras.xml.in.h:23
+#: rules/base.xml:3511 rules/base.extras.xml:96
 msgid "German"
 msgstr "เยอรมัน"
 
-#: ../rules/base.xml.in.h:524
+#: rules/base.xml:3520
 msgid "German (dead acute)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:525
+#: rules/base.xml:3526
 msgid "German (dead grave acute)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:526
+#: rules/base.xml:3532
 msgid "German (no dead keys)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:527
+#: rules/base.xml:3538
 msgid "German (T3)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:528
+#: rules/base.xml:3544
 msgid "Romanian (Germany)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:529
+#: rules/base.xml:3553
 msgid "Romanian (Germany, no dead keys)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:530
+#: rules/base.xml:3562
 msgid "German (Dvorak)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:531
+#: rules/base.xml:3568
 msgid "German (with Sun dead keys)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:532
+#: rules/base.xml:3574
 msgid "German (Neo 2)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:533
+#: rules/base.xml:3580
 msgid "German (Macintosh)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:534
+#: rules/base.xml:3586
 msgid "German (Macintosh, no dead keys)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:535
+#: rules/base.xml:3592
 msgid "Lower Sorbian"
 msgstr ""
 
-#: ../rules/base.xml.in.h:536
+#: rules/base.xml:3601
 msgid "Lower Sorbian (QWERTZ)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:537
+#: rules/base.xml:3610
 msgid "German (QWERTY)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:538
+#: rules/base.xml:3616
 msgid "Turkish (Germany)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:539
+#: rules/base.xml:3627
 msgid "Russian (Germany, phonetic)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:540
+#: rules/base.xml:3636
 msgid "German (dead tilde)"
 msgstr ""
 
 #. Keyboard indicator for Greek layouts
-#: ../rules/base.xml.in.h:542 ../rules/base.extras.xml.in.h:139
+#: rules/base.xml:3645 rules/base.extras.xml:935
 msgid "gr"
 msgstr ""
 
-#: ../rules/base.xml.in.h:543 ../rules/base.extras.xml.in.h:140
+#: rules/base.xml:3646 rules/base.extras.xml:936
 msgid "Greek"
 msgstr "กรีก"
 
-#: ../rules/base.xml.in.h:544
+#: rules/base.xml:3655
 msgid "Greek (simple)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:545
+#: rules/base.xml:3661
 msgid "Greek (extended)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:546
+#: rules/base.xml:3667
 msgid "Greek (no dead keys)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:547
+#: rules/base.xml:3673
 msgid "Greek (polytonic)"
 msgstr ""
 
 #. Keyboard indicator for Hungarian layouts
-#: ../rules/base.xml.in.h:549
+#: rules/base.xml:3682
 msgid "hu"
 msgstr ""
 
-#: ../rules/base.xml.in.h:550 ../rules/base.extras.xml.in.h:40
+#: rules/base.xml:3683 rules/base.extras.xml:211
 msgid "Hungarian"
 msgstr "ฮังการี"
 
-#: ../rules/base.xml.in.h:551
+#: rules/base.xml:3692
 msgid "Hungarian (standard)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:552
+#: rules/base.xml:3698
 msgid "Hungarian (no dead keys)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:553
+#: rules/base.xml:3704
 msgid "Hungarian (QWERTY)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:554
+#: rules/base.xml:3710
 msgid "Hungarian (101/QWERTZ/comma/dead keys)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:555
+#: rules/base.xml:3716
 msgid "Hungarian (101/QWERTZ/comma/no dead keys)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:556
+#: rules/base.xml:3722
 msgid "Hungarian (101/QWERTZ/dot/dead keys)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:557
+#: rules/base.xml:3728
 msgid "Hungarian (101/QWERTZ/dot/no dead keys)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:558
+#: rules/base.xml:3734
 msgid "Hungarian (101/QWERTY/comma/dead keys)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:559
+#: rules/base.xml:3740
 msgid "Hungarian (101/QWERTY/comma/no dead keys)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:560
+#: rules/base.xml:3746
 msgid "Hungarian (101/QWERTY/dot/dead keys)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:561
+#: rules/base.xml:3752
 msgid "Hungarian (101/QWERTY/dot/no dead keys)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:562
+#: rules/base.xml:3758
 msgid "Hungarian (102/QWERTZ/comma/dead keys)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:563
+#: rules/base.xml:3764
 msgid "Hungarian (102/QWERTZ/comma/no dead keys)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:564
+#: rules/base.xml:3770
 msgid "Hungarian (102/QWERTZ/dot/dead keys)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:565
+#: rules/base.xml:3776
 msgid "Hungarian (102/QWERTZ/dot/no dead keys)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:566
+#: rules/base.xml:3782
 msgid "Hungarian (102/QWERTY/comma/dead keys)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:567
+#: rules/base.xml:3788
 msgid "Hungarian (102/QWERTY/comma/no dead keys)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:568
+#: rules/base.xml:3794
 msgid "Hungarian (102/QWERTY/dot/dead keys)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:569
+#: rules/base.xml:3800
 msgid "Hungarian (102/QWERTY/dot/no dead keys)"
 msgstr ""
 
 #. Keyboard indicator for Icelandic layouts
-#: ../rules/base.xml.in.h:571
+#: rules/base.xml:3809
 msgid "is"
 msgstr ""
 
-#: ../rules/base.xml.in.h:572
+#: rules/base.xml:3810
 msgid "Icelandic"
 msgstr ""
 
-#: ../rules/base.xml.in.h:573
+#: rules/base.xml:3819
 msgid "Icelandic (with Sun dead keys)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:574
+#: rules/base.xml:3825
 msgid "Icelandic (no dead keys)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:575
+#: rules/base.xml:3831
 msgid "Icelandic (Macintosh, legacy)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:576
+#: rules/base.xml:3837
 msgid "Icelandic (Macintosh)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:577
+#: rules/base.xml:3843
 msgid "Icelandic (Dvorak)"
 msgstr ""
 
 #. Keyboard indicator for Hebrew layouts
-#: ../rules/base.xml.in.h:579 ../rules/base.extras.xml.in.h:103
+#: rules/base.xml:3852 rules/base.extras.xml:713
 msgid "he"
 msgstr ""
 
-#: ../rules/base.xml.in.h:580 ../rules/base.extras.xml.in.h:104
+#: rules/base.xml:3853 rules/base.extras.xml:714
 msgid "Hebrew"
 msgstr "ฮิบรู"
 
-#: ../rules/base.xml.in.h:581
+#: rules/base.xml:3862
 msgid "Hebrew (lyx)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:582
+#: rules/base.xml:3868
 msgid "Hebrew (phonetic)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:583
+#: rules/base.xml:3874
 msgid "Hebrew (Biblical, Tiro)"
 msgstr ""
 
 #. Keyboard indicator for Italian layouts
-#: ../rules/base.xml.in.h:585 ../rules/base.extras.xml.in.h:143
+#: rules/base.xml:3883 rules/base.extras.xml:956
 msgid "it"
 msgstr ""
 
-#: ../rules/base.xml.in.h:586 ../rules/base.extras.xml.in.h:144
+#: rules/base.xml:3884 rules/base.extras.xml:957
 msgid "Italian"
 msgstr "อิตาลี"
 
-#: ../rules/base.xml.in.h:587
+#: rules/base.xml:3893
 msgid "Italian (no dead keys)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:588
+#: rules/base.xml:3899
 msgid "Italian (Winkeys)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:589
+#: rules/base.xml:3905
 msgid "Italian (Macintosh)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:590
+#: rules/base.xml:3911
 msgid "Italian (US, with Italian letters)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:591
+#: rules/base.xml:3917
 msgid "Georgian (Italy)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:592
+#: rules/base.xml:3926
 msgid "Italian (IBM 142)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:593
+#: rules/base.xml:3932
 msgid "Italian (intl., with dead keys)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:594
+#: rules/base.xml:3948
 msgid "Sicilian"
 msgstr ""
 
 #. Keyboard indicator for Japaneses
-#: ../rules/base.xml.in.h:596 ../rules/base.extras.xml.in.h:149
+#: rules/base.xml:3970 rules/base.xml:5705 rules/base.extras.xml:982
 msgid "ja"
 msgstr ""
 
-#: ../rules/base.xml.in.h:597 ../rules/base.extras.xml.in.h:150
+#: rules/base.xml:3971 rules/base.extras.xml:983
 msgid "Japanese"
 msgstr "ญี่ปุ่น"
 
-#: ../rules/base.xml.in.h:598
+#: rules/base.xml:3980
 msgid "Japanese (Kana)"
 msgstr "ญี่ปุ่น (Kana)"
 
-#: ../rules/base.xml.in.h:599
+#: rules/base.xml:3986
 msgid "Japanese (Kana 86)"
 msgstr "ญี่ปุ่น (Kana 86)"
 
-#: ../rules/base.xml.in.h:600
+#: rules/base.xml:3992
 msgid "Japanese (OADG 109A)"
 msgstr "ญี่ปุ่น (OADG 109A)"
 
-#: ../rules/base.xml.in.h:601
+#: rules/base.xml:3998
 msgid "Japanese (Macintosh)"
 msgstr "ญี่ปุ่น (Macintosh)"
 
-#: ../rules/base.xml.in.h:602
+#: rules/base.xml:4004
 msgid "Japanese (Dvorak)"
 msgstr "ญี่ปุ่น (Dvorak)"
 
+#. Keyboard indicator for Kyrgyz layouts
 #. Keyboard indicator for Kikuyu layouts
-#: ../rules/base.xml.in.h:604
+#: rules/base.xml:4013 rules/base.xml:6084
 msgid "ki"
 msgstr ""
 
-#: ../rules/base.xml.in.h:605
+#: rules/base.xml:4014
 msgid "Kyrgyz"
 msgstr ""
 
-#: ../rules/base.xml.in.h:606
+#: rules/base.xml:4023
 msgid "Kyrgyz (phonetic)"
 msgstr ""
 
 #. Keyboard indicator for Khmer layouts
-#: ../rules/base.xml.in.h:608
+#: rules/base.xml:4032
 msgid "km"
 msgstr ""
 
-#: ../rules/base.xml.in.h:609
+#: rules/base.xml:4033
 msgid "Khmer (Cambodia)"
 msgstr "เขมร (กัมพูชา)"
 
 #. Keyboard indicator for Kazakh layouts
-#: ../rules/base.xml.in.h:611
+#: rules/base.xml:4044
 msgid "kk"
 msgstr ""
 
-#: ../rules/base.xml.in.h:612
+#: rules/base.xml:4045
 msgid "Kazakh"
 msgstr ""
 
-#: ../rules/base.xml.in.h:613
+#: rules/base.xml:4056
 msgid "Russian (Kazakhstan, with Kazakh)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:614
+#: rules/base.xml:4066
 msgid "Kazakh (with Russian)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:615
+#: rules/base.xml:4076
 msgid "Kazakh (extended)"
 msgstr ""
 
 #. Keyboard indicator for Lao layouts
-#: ../rules/base.xml.in.h:618
+#: rules/base.xml:4097
 msgid "lo"
 msgstr ""
 
-#: ../rules/base.xml.in.h:619
+#: rules/base.xml:4098
 msgid "Lao"
 msgstr ""
 
-#: ../rules/base.xml.in.h:620
+#: rules/base.xml:4107
 msgid "Lao (STEA proposed standard layout)"
 msgstr ""
 
 #. Keyboard indicator for Spanish layouts
-#: ../rules/base.xml.in.h:622 ../rules/base.extras.xml.in.h:163
+#: rules/base.xml:4119 rules/base.xml:4977 rules/base.extras.xml:1075
 msgid "es"
 msgstr ""
 
-#: ../rules/base.xml.in.h:623
+#: rules/base.xml:4120
 msgid "Spanish (Latin American)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:624
+#: rules/base.xml:4152
 msgid "Spanish (Latin American, no dead keys)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:625
+#: rules/base.xml:4158
 msgid "Spanish (Latin American, dead tilde)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:626
+#: rules/base.xml:4164
 msgid "Spanish (Latin American, with Sun dead keys)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:627
+#: rules/base.xml:4170
 msgid "Spanish (Latin American, Dvorak)"
 msgstr ""
 
 #. Keyboard indicator for Lithuanian layouts
-#: ../rules/base.xml.in.h:631 ../rules/base.extras.xml.in.h:46
+#: rules/base.xml:4191 rules/base.extras.xml:247
 msgid "lt"
 msgstr ""
 
-#: ../rules/base.xml.in.h:632 ../rules/base.extras.xml.in.h:47
+#: rules/base.xml:4192 rules/base.extras.xml:248
 msgid "Lithuanian"
 msgstr "ลิทัวเนีย"
 
-#: ../rules/base.xml.in.h:633
+#: rules/base.xml:4201
 msgid "Lithuanian (standard)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:634
+#: rules/base.xml:4207
 msgid "Lithuanian (US, with Lithuanian letters)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:635
+#: rules/base.xml:4213
 msgid "Lithuanian (IBM LST 1205-92)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:636
+#: rules/base.xml:4219
 msgid "Lithuanian (LEKP)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:637
+#: rules/base.xml:4225
 msgid "Lithuanian (LEKPa)"
 msgstr ""
 
 #. Keyboard indicator for Latvian layouts
-#: ../rules/base.xml.in.h:639 ../rules/base.extras.xml.in.h:50
+#: rules/base.xml:4243 rules/base.extras.xml:271
 msgid "lv"
 msgstr ""
 
-#: ../rules/base.xml.in.h:640 ../rules/base.extras.xml.in.h:51
+#: rules/base.xml:4244 rules/base.extras.xml:272
 msgid "Latvian"
 msgstr "ลัตเวีย"
 
-#: ../rules/base.xml.in.h:641
+#: rules/base.xml:4253
 msgid "Latvian (apostrophe)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:642
+#: rules/base.xml:4259
 msgid "Latvian (tilde)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:643
+#: rules/base.xml:4265
 msgid "Latvian (F)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:644
+#: rules/base.xml:4271
 msgid "Latvian (modern)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:645
+#: rules/base.xml:4277
 msgid "Latvian (ergonomic, ŪGJRMV)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:646
+#: rules/base.xml:4283
 msgid "Latvian (adapted)"
 msgstr ""
 
 #. Keyboard indicator for Maori layouts
-#: ../rules/base.xml.in.h:648
+#: rules/base.xml:4292
 msgid "mi"
 msgstr ""
 
-#: ../rules/base.xml.in.h:649
+#: rules/base.xml:4293
 msgid "Maori"
 msgstr ""
 
+#. Keyboard indicator for Montenegrin layouts
 #. Keyboard indicator for Serbian layouts
-#: ../rules/base.xml.in.h:651 ../rules/base.extras.xml.in.h:90
+#: rules/base.xml:4304 rules/base.xml:4857 rules/base.extras.xml:548
 msgid "sr"
 msgstr ""
 
-#: ../rules/base.xml.in.h:652
+#: rules/base.xml:4305
 msgid "Montenegrin"
 msgstr ""
 
-#: ../rules/base.xml.in.h:653
+#: rules/base.xml:4314
 msgid "Montenegrin (Cyrillic)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:654
+#: rules/base.xml:4320
 msgid "Montenegrin (Cyrillic, ZE and ZHE swapped)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:655
+#: rules/base.xml:4326
 msgid "Montenegrin (Latin, Unicode)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:656
+#: rules/base.xml:4332
 msgid "Montenegrin (Latin, QWERTY)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:657
+#: rules/base.xml:4338
 msgid "Montenegrin (Latin, Unicode, QWERTY)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:658
+#: rules/base.xml:4344
 msgid "Montenegrin (Cyrillic with guillemets)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:659
+#: rules/base.xml:4350
 msgid "Montenegrin (Latin with guillemets)"
 msgstr ""
 
 #. Keyboard indicator for Macedonian layouts
-#: ../rules/base.xml.in.h:661
+#: rules/base.xml:4359
 msgid "mk"
 msgstr ""
 
-#: ../rules/base.xml.in.h:662
+#: rules/base.xml:4360
 msgid "Macedonian"
 msgstr ""
 
-#: ../rules/base.xml.in.h:663
+#: rules/base.xml:4369
 msgid "Macedonian (no dead keys)"
 msgstr ""
 
 #. Keyboard indicator for Maltese layouts
-#: ../rules/base.xml.in.h:665
+#: rules/base.xml:4378
 msgid "mt"
 msgstr ""
 
-#: ../rules/base.xml.in.h:666
+#: rules/base.xml:4379
 msgid "Maltese"
 msgstr ""
 
-#: ../rules/base.xml.in.h:667
+#: rules/base.xml:4388
 msgid "Maltese (with US layout)"
 msgstr ""
 
 #. Keyboard indicator for Mongolian layouts
-#: ../rules/base.xml.in.h:669
+#: rules/base.xml:4409
 msgid "mn"
 msgstr ""
 
-#: ../rules/base.xml.in.h:670
+#: rules/base.xml:4410
 msgid "Mongolian"
 msgstr ""
 
 #. Keyboard indicator for Norwegian layouts
-#: ../rules/base.xml.in.h:672 ../rules/base.extras.xml.in.h:154
+#: rules/base.xml:4421 rules/base.extras.xml:1009
 msgid "no"
 msgstr ""
 
-#: ../rules/base.xml.in.h:673 ../rules/base.extras.xml.in.h:155
+#: rules/base.xml:4422 rules/base.extras.xml:1010
 msgid "Norwegian"
 msgstr "นอร์เวย์"
 
-#: ../rules/base.xml.in.h:674
+#: rules/base.xml:4433
 msgid "Norwegian (no dead keys)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:675
+#: rules/base.xml:4439
 msgid "Norwegian (Win keys)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:676
+#: rules/base.xml:4445
 msgid "Norwegian (Dvorak)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:677
+#: rules/base.xml:4451
 msgid "Northern Saami (Norway)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:678
+#: rules/base.xml:4460
 msgid "Northern Saami (Norway, no dead keys)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:679
+#: rules/base.xml:4469
 msgid "Norwegian (Macintosh)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:680
+#: rules/base.xml:4475
 msgid "Norwegian (Macintosh, no dead keys)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:681
+#: rules/base.xml:4481
 msgid "Norwegian (Colemak)"
 msgstr ""
 
 #. Keyboard indicator for Polish layouts
-#: ../rules/base.xml.in.h:683 ../rules/base.extras.xml.in.h:78
+#: rules/base.xml:4490 rules/base.xml:5629 rules/base.extras.xml:478
 msgid "pl"
 msgstr ""
 
-#: ../rules/base.xml.in.h:684 ../rules/base.extras.xml.in.h:79
+#: rules/base.xml:4491 rules/base.extras.xml:479
 msgid "Polish"
 msgstr "โปแลนด์"
 
-#: ../rules/base.xml.in.h:685
+#: rules/base.xml:4500
 msgid "Polish (legacy)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:686
+#: rules/base.xml:4506
 msgid "Polish (QWERTZ)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:687
+#: rules/base.xml:4512
 msgid "Polish (Dvorak)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:688
+#: rules/base.xml:4518
 msgid "Polish (Dvorak, with Polish quotes on quotemark key)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:689
+#: rules/base.xml:4524
 msgid "Polish (Dvorak, with Polish quotes on key 1)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:690
+#: rules/base.xml:4530
 msgid "Kashubian"
 msgstr ""
 
-#: ../rules/base.xml.in.h:691
+#: rules/base.xml:4539
 msgid "Silesian"
 msgstr ""
 
-#: ../rules/base.xml.in.h:692
+#: rules/base.xml:4550
 msgid "Russian (Poland, phonetic Dvorak)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:693
+#: rules/base.xml:4559
 msgid "Polish (programmer Dvorak)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:694 ../rules/base.extras.xml.in.h:157
+#: rules/base.xml:4569 rules/base.extras.xml:1025 rules/base.extras.xml:1040
 msgid "Portuguese"
 msgstr "โปรตุเกส"
 
-#: ../rules/base.xml.in.h:695
+#: rules/base.xml:4578
 msgid "Portuguese (no dead keys)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:696
+#: rules/base.xml:4584
 msgid "Portuguese (with Sun dead keys)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:697
+#: rules/base.xml:4590
 msgid "Portuguese (Macintosh)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:698
+#: rules/base.xml:4596
 msgid "Portuguese (Macintosh, no dead keys)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:699
+#: rules/base.xml:4602
 msgid "Portuguese (Macintosh, with Sun dead keys)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:700
+#: rules/base.xml:4608
 msgid "Portuguese (Nativo)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:701
+#: rules/base.xml:4614
 msgid "Portuguese (Nativo for US keyboards)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:702
+#: rules/base.xml:4620
 msgid "Esperanto (Portugal, Nativo)"
 msgstr ""
 
 #. Keyboard indicator for Romanian layouts
-#: ../rules/base.xml.in.h:704 ../rules/base.extras.xml.in.h:84
+#: rules/base.xml:4632 rules/base.extras.xml:514
 msgid "ro"
 msgstr ""
 
-#: ../rules/base.xml.in.h:705 ../rules/base.extras.xml.in.h:85
+#: rules/base.xml:4633 rules/base.extras.xml:515
 msgid "Romanian"
 msgstr "โรมาเนีย"
 
-#: ../rules/base.xml.in.h:706
+#: rules/base.xml:4642
 msgid "Romanian (cedilla)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:707
+#: rules/base.xml:4648
 msgid "Romanian (standard)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:708
+#: rules/base.xml:4654
 msgid "Romanian (standard cedilla)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:709
+#: rules/base.xml:4660
 msgid "Romanian (Win keys)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:710 ../rules/base.extras.xml.in.h:93
+#: rules/base.xml:4670 rules/base.extras.xml:567
 msgid "Russian"
 msgstr "รัสเซีย"
 
-#: ../rules/base.xml.in.h:711
+#: rules/base.xml:4679
 msgid "Russian (phonetic)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:712
+#: rules/base.xml:4685
 msgid "Russian (phonetic, with Win keys)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:714
+#: rules/base.xml:4697
 msgid "Russian (typewriter)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:715
+#: rules/base.xml:4703
 msgid "Russian (legacy)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:716
+#: rules/base.xml:4709
 msgid "Russian (typewriter, legacy)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:717
+#: rules/base.xml:4715
 msgid "Tatar"
 msgstr ""
 
-#: ../rules/base.xml.in.h:718
+#: rules/base.xml:4724
 msgid "Ossetian (legacy)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:719
+#: rules/base.xml:4733
 msgid "Ossetian (Win keys)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:720
+#: rules/base.xml:4742
 msgid "Chuvash"
 msgstr ""
 
-#: ../rules/base.xml.in.h:721
+#: rules/base.xml:4751
 msgid "Chuvash (Latin)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:722
+#: rules/base.xml:4760
 msgid "Udmurt"
 msgstr ""
 
-#: ../rules/base.xml.in.h:723
+#: rules/base.xml:4769
 msgid "Komi"
 msgstr ""
 
-#: ../rules/base.xml.in.h:724
+#: rules/base.xml:4778
 msgid "Yakut"
 msgstr ""
 
-#: ../rules/base.xml.in.h:725
+#: rules/base.xml:4787
 msgid "Kalmyk"
 msgstr ""
 
-#: ../rules/base.xml.in.h:726
+#: rules/base.xml:4796
 msgid "Russian (DOS)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:727
+#: rules/base.xml:4802
 msgid "Russian (Macintosh)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:728
+#: rules/base.xml:4808
 msgid "Serbian (Russia)"
 msgstr "เซอร์เบีย (รัสเซีย)"
 
-#: ../rules/base.xml.in.h:729
+#: rules/base.xml:4818
 msgid "Bashkirian"
 msgstr ""
 
-#: ../rules/base.xml.in.h:730
+#: rules/base.xml:4827
 msgid "Mari"
 msgstr ""
 
-#: ../rules/base.xml.in.h:731
+#: rules/base.xml:4836
 msgid "Russian (phonetic, AZERTY)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:732
+#: rules/base.xml:4842
 msgid "Russian (phonetic, Dvorak)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:733
+#: rules/base.xml:4848
 msgid "Russian (phonetic, French)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:734 ../rules/base.extras.xml.in.h:91
+#: rules/base.xml:4858 rules/base.extras.xml:549
 msgid "Serbian"
 msgstr "เซอร์เบีย"
 
-#: ../rules/base.xml.in.h:735
+#: rules/base.xml:4867
 msgid "Serbian (Cyrillic, ZE and ZHE swapped)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:736
+#: rules/base.xml:4873
 msgid "Serbian (Latin)"
 msgstr "เซอร์เบีย (ละติน)"
 
-#: ../rules/base.xml.in.h:737
+#: rules/base.xml:4879
 msgid "Serbian (Latin, Unicode)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:738
+#: rules/base.xml:4885
 msgid "Serbian (Latin, QWERTY)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:739
+#: rules/base.xml:4891
 msgid "Serbian (Latin, Unicode, QWERTY)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:740
+#: rules/base.xml:4897
 msgid "Serbian (Cyrillic with guillemets)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:741
+#: rules/base.xml:4903
 msgid "Serbian (Latin with guillemets)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:742
+#: rules/base.xml:4909
 msgid "Pannonian Rusyn"
 msgstr ""
 
 #. Keyboard indicator for Slovenian layouts
-#: ../rules/base.xml.in.h:744
+#: rules/base.xml:4921
 msgid "sl"
 msgstr ""
 
-#: ../rules/base.xml.in.h:745
+#: rules/base.xml:4922
 msgid "Slovenian"
 msgstr "สโลวีเนีย"
 
-#: ../rules/base.xml.in.h:746
+#: rules/base.xml:4931
 msgid "Slovenian (with guillemets)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:747
+#: rules/base.xml:4937
 msgid "Slovenian (US, with Slovenian letters)"
 msgstr ""
 
 #. Keyboard indicator for Slovak layouts
-#: ../rules/base.xml.in.h:749 ../rules/base.extras.xml.in.h:160
+#: rules/base.xml:4946 rules/base.extras.xml:1054
 msgid "sk"
 msgstr ""
 
-#: ../rules/base.xml.in.h:750 ../rules/base.extras.xml.in.h:161
+#: rules/base.xml:4947 rules/base.extras.xml:1055
 msgid "Slovak"
 msgstr "สโลวัก"
 
-#: ../rules/base.xml.in.h:751
+#: rules/base.xml:4956
 msgid "Slovak (extended backslash)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:752
+#: rules/base.xml:4962
 msgid "Slovak (QWERTY)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:753
+#: rules/base.xml:4968
 msgid "Slovak (QWERTY, extended backslash)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:754 ../rules/base.extras.xml.in.h:164
+#: rules/base.xml:4978 rules/base.extras.xml:1076
 msgid "Spanish"
 msgstr "สเปน"
 
-#: ../rules/base.xml.in.h:755
+#: rules/base.xml:4987
 msgid "Spanish (no dead keys)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:756
+#: rules/base.xml:4993
 msgid "Spanish (Win keys)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:757
+#: rules/base.xml:4999
 msgid "Spanish (dead tilde)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:758
+#: rules/base.xml:5005
 msgid "Spanish (with Sun dead keys)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:759
+#: rules/base.xml:5011
 msgid "Spanish (Dvorak)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:760
+#: rules/base.xml:5017
 msgid "ast"
 msgstr ""
 
-#: ../rules/base.xml.in.h:761
+#: rules/base.xml:5018
 msgid "Asturian (Spain, with bottom-dot H and bottom-dot L)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:762
+#: rules/base.xml:5027
 msgid "ca"
 msgstr ""
 
-#: ../rules/base.xml.in.h:763
+#: rules/base.xml:5028
 msgid "Catalan (Spain, with middle-dot L)"
 msgstr "คาตาลัน (สเปน พร้อมตัวอักษร L แบบมีจุดตรงกลาง)"
 
-#: ../rules/base.xml.in.h:764
+#: rules/base.xml:5037
 msgid "Spanish (Macintosh)"
 msgstr ""
 
 #. Keyboard indicator for Swedish layouts
-#: ../rules/base.xml.in.h:766 ../rules/base.extras.xml.in.h:166
+#: rules/base.xml:5046 rules/base.extras.xml:1090
 msgid "sv"
 msgstr ""
 
-#: ../rules/base.xml.in.h:767 ../rules/base.extras.xml.in.h:167
+#: rules/base.xml:5047 rules/base.extras.xml:1091
 msgid "Swedish"
 msgstr "สวีเดน"
 
-#: ../rules/base.xml.in.h:768
+#: rules/base.xml:5056
 msgid "Swedish (no dead keys)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:769
+#: rules/base.xml:5062
 msgid "Swedish (Dvorak)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:770
+#: rules/base.xml:5070
 msgid "Russian (Sweden, phonetic)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:771
+#: rules/base.xml:5081
 msgid "Russian (Sweden, phonetic, no dead keys)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:772
+#: rules/base.xml:5090
 msgid "Northern Saami (Sweden)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:773
+#: rules/base.xml:5099
 msgid "Swedish (Macintosh)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:774
+#: rules/base.xml:5105
 msgid "Swedish (Svdvorak)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:775
+#: rules/base.xml:5111
 msgid "Swedish (based on US Intl. Dvorak)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:777
+#: rules/base.xml:5123
 msgid "Swedish Sign Language"
 msgstr ""
 
-#: ../rules/base.xml.in.h:778 ../rules/base.extras.xml.in.h:171
+#: rules/base.xml:5136 rules/base.extras.xml:1121
 msgid "German (Switzerland)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:779
+#: rules/base.xml:5146
 msgid "German (Switzerland, legacy)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:780
+#: rules/base.xml:5154
 msgid "German (Switzerland, no dead keys)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:781
+#: rules/base.xml:5162
 msgid "German (Switzerland, with Sun dead keys)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:782
+#: rules/base.xml:5170
 msgid "French (Switzerland)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:783
+#: rules/base.xml:5181
 msgid "French (Switzerland, no dead keys)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:784
+#: rules/base.xml:5192
 msgid "French (Switzerland, with Sun dead keys)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:785
+#: rules/base.xml:5203
 msgid "French (Switzerland, Macintosh)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:786
+#: rules/base.xml:5214
 msgid "German (Switzerland, Macintosh)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:787
+#: rules/base.xml:5224
 msgid "Arabic (Syria)"
 msgstr ""
 
 #. Keyboard indicator for Syriac layouts
-#: ../rules/base.xml.in.h:789
+#: rules/base.xml:5234 rules/base.xml:5242
 msgid "syc"
 msgstr ""
 
-#: ../rules/base.xml.in.h:790
+#: rules/base.xml:5235
 msgid "Syriac"
 msgstr ""
 
-#: ../rules/base.xml.in.h:791
+#: rules/base.xml:5243
 msgid "Syriac (phonetic)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:792
+#: rules/base.xml:5251
 msgid "Kurdish (Syria, Latin Q)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:793
+#: rules/base.xml:5262
 msgid "Kurdish (Syria, F)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:794
+#: rules/base.xml:5273
 msgid "Kurdish (Syria, Latin Alt-Q)"
 msgstr ""
 
 #. Keyboard indicator for Tajik layouts
-#: ../rules/base.xml.in.h:796
+#: rules/base.xml:5285
 msgid "tg"
 msgstr ""
 
-#: ../rules/base.xml.in.h:797
+#: rules/base.xml:5286
 msgid "Tajik"
 msgstr ""
 
-#: ../rules/base.xml.in.h:798
+#: rules/base.xml:5295
 msgid "Tajik (legacy)"
 msgstr ""
 
 #. Keyboard indicator for Sinhala layouts
-#: ../rules/base.xml.in.h:800
+#: rules/base.xml:5304
 msgid "si"
 msgstr ""
 
-#: ../rules/base.xml.in.h:801
+#: rules/base.xml:5305
 msgid "Sinhala (phonetic)"
 msgstr "สิงหล (การออกเสียง)"
 
@@ -2945,481 +2980,482 @@
 msgstr ""
 
 #. Keyboard indicator for US layouts
-#: ../rules/base.xml.in.h:805
+#: rules/base.xml:5335
 msgid "us"
 msgstr ""
 
-#: ../rules/base.xml.in.h:806
+#: rules/base.xml:5336
 msgid "Sinhala (US, with Sinhala letters)"
 msgstr "สิงหล (สหรัฐอเมริกา พร้อมตัวอักษรสิงหล)"
 
 #. Keyboard indicator for Thai layouts
-#: ../rules/base.xml.in.h:808
+#: rules/base.xml:5345
 msgid "th"
 msgstr ""
 
-#: ../rules/base.xml.in.h:809
+#: rules/base.xml:5346
 msgid "Thai"
 msgstr "ไทย"
 
-#: ../rules/base.xml.in.h:810
+#: rules/base.xml:5355
 msgid "Thai (TIS-820.2538)"
 msgstr "ไทย (สมอ-820.2538)"
 
-#: ../rules/base.xml.in.h:811
+#: rules/base.xml:5361
 msgid "Thai (Pattachote)"
 msgstr "ไทย (ปัตตะโชติ)"
 
 #. Keyboard indicator for Turkish layouts
-#: ../rules/base.xml.in.h:813 ../rules/base.extras.xml.in.h:174
+#: rules/base.xml:5370 rules/base.extras.xml:1141
 msgid "tr"
 msgstr ""
 
-#: ../rules/base.xml.in.h:814 ../rules/base.extras.xml.in.h:175
+#: rules/base.xml:5371 rules/base.extras.xml:1142
 msgid "Turkish"
 msgstr "ตุรกี"
 
-#: ../rules/base.xml.in.h:815
+#: rules/base.xml:5380
 msgid "Turkish (F)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:816
+#: rules/base.xml:5386
 msgid "Turkish (Alt-Q)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:817
+#: rules/base.xml:5392
 msgid "Turkish (with Sun dead keys)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:818
+#: rules/base.xml:5400
 msgid "Kurdish (Turkey, Latin Q)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:819
+#: rules/base.xml:5411
 msgid "Kurdish (Turkey, F)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:820
+#: rules/base.xml:5422
 msgid "Kurdish (Turkey, Latin Alt-Q)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:821
+#: rules/base.xml:5431
 msgid "Turkish (intl., with dead keys)"
 msgstr ""
 
 #. Keyboard indicator for Crimean Tatar layouts
-#: ../rules/base.xml.in.h:823 ../rules/base.extras.xml.in.h:86
+#: rules/base.xml:5438 rules/base.xml:5449 rules/base.xml:5460
+#: rules/base.extras.xml:524
 msgid "crh"
 msgstr ""
 
-#: ../rules/base.xml.in.h:824
+#: rules/base.xml:5439
 msgid "Crimean Tatar (Turkish Q)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:825
+#: rules/base.xml:5450
 msgid "Crimean Tatar (Turkish F)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:826
+#: rules/base.xml:5461
 msgid "Crimean Tatar (Turkish Alt-Q)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:827
+#: rules/base.xml:5474
 msgid "Taiwanese"
 msgstr ""
 
-#: ../rules/base.xml.in.h:828
+#: rules/base.xml:5483
 msgid "Taiwanese (indigenous)"
 msgstr ""
 
 #. Keyboard indicator for Saisiyat layouts
-#: ../rules/base.xml.in.h:830
+#: rules/base.xml:5508
 msgid "xsy"
 msgstr ""
 
-#: ../rules/base.xml.in.h:831
+#: rules/base.xml:5509
 msgid "Saisiyat (Taiwan)"
 msgstr ""
 
 #. Keyboard indicator for Ukranian layouts
-#: ../rules/base.xml.in.h:833 ../rules/base.extras.xml.in.h:177
+#: rules/base.xml:5521 rules/base.extras.xml:1156
 msgid "uk"
 msgstr ""
 
-#: ../rules/base.xml.in.h:834 ../rules/base.extras.xml.in.h:178
+#: rules/base.xml:5522 rules/base.extras.xml:1157
 msgid "Ukrainian"
 msgstr "ยูเครน"
 
-#: ../rules/base.xml.in.h:835
+#: rules/base.xml:5531
 msgid "Ukrainian (phonetic)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:836
+#: rules/base.xml:5537
 msgid "Ukrainian (typewriter)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:837
+#: rules/base.xml:5543
 msgid "Ukrainian (Win keys)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:838
+#: rules/base.xml:5549
 msgid "Ukrainian (legacy)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:839
+#: rules/base.xml:5555
 msgid "Ukrainian (standard RSTU)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:840
+#: rules/base.xml:5561
 msgid "Russian (Ukraine, standard RSTU)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:841
+#: rules/base.xml:5567
 msgid "Ukrainian (homophonic)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:842 ../rules/base.extras.xml.in.h:180
+#: rules/base.xml:5577 rules/base.extras.xml:1172
 msgid "English (UK)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:843
+#: rules/base.xml:5586
 msgid "English (UK, extended, with Win keys)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:844
+#: rules/base.xml:5592
 msgid "English (UK, intl., with dead keys)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:845
+#: rules/base.xml:5598
 msgid "English (UK, Dvorak)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:846
+#: rules/base.xml:5604
 msgid "English (UK, Dvorak, with UK punctuation)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:847
+#: rules/base.xml:5610
 msgid "English (UK, Macintosh)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:848
+#: rules/base.xml:5616
 msgid "English (UK, intl., Macintosh)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:849
+#: rules/base.xml:5622
 msgid "English (UK, Colemak)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:851
+#: rules/base.xml:5643
 msgid "Uzbek"
 msgstr ""
 
-#: ../rules/base.xml.in.h:852
+#: rules/base.xml:5652
 msgid "Uzbek (Latin)"
 msgstr ""
 
 #. Keyboard indicator for Vietnamese layouts
-#: ../rules/base.xml.in.h:854 ../rules/base.extras.xml.in.h:186
+#: rules/base.xml:5661 rules/base.extras.xml:1202
 msgid "vi"
 msgstr ""
 
-#: ../rules/base.xml.in.h:855 ../rules/base.extras.xml.in.h:187
+#: rules/base.xml:5662 rules/base.extras.xml:1203
 msgid "Vietnamese"
 msgstr "เวียดนาม"
 
 #. Keyboard indicator for Korean layouts
-#: ../rules/base.xml.in.h:859 ../rules/base.extras.xml.in.h:182
+#: rules/base.xml:5686 rules/base.extras.xml:1186
 msgid "ko"
 msgstr ""
 
-#: ../rules/base.xml.in.h:860 ../rules/base.extras.xml.in.h:183
+#: rules/base.xml:5687 rules/base.extras.xml:1187
 msgid "Korean"
 msgstr "เกาหลี"
 
-#: ../rules/base.xml.in.h:861
+#: rules/base.xml:5696
 msgid "Korean (101/104 key compatible)"
 msgstr "เกาหลี (101/104 key compatible)"
 
-#: ../rules/base.xml.in.h:862
+#: rules/base.xml:5706
 msgid "Japanese (PC-98)"
 msgstr "ญี่ปุ่น (PC-98)"
 
 #. Keyboard indicator for Irish layouts
-#: ../rules/base.xml.in.h:864
+#: rules/base.xml:5719
 msgid "ie"
 msgstr ""
 
-#: ../rules/base.xml.in.h:865
+#: rules/base.xml:5720
 msgid "Irish"
 msgstr ""
 
-#: ../rules/base.xml.in.h:866
+#: rules/base.xml:5729
 msgid "CloGaelach"
 msgstr ""
 
-#: ../rules/base.xml.in.h:867
+#: rules/base.xml:5738
 msgid "Irish (UnicodeExpert)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:868
+#: rules/base.xml:5744
 msgid "Ogham"
 msgstr ""
 
-#: ../rules/base.xml.in.h:869
+#: rules/base.xml:5753
 msgid "Ogham (IS434)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:870
+#: rules/base.xml:5766
 msgid "Urdu (Pakistan)"
 msgstr "อุรดู (ปากีสถาน)"
 
-#: ../rules/base.xml.in.h:871
+#: rules/base.xml:5775
 msgid "Urdu (Pakistan, CRULP)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:872
+#: rules/base.xml:5781
 msgid "Urdu (Pakistan, NLA)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:873
+#: rules/base.xml:5788
 msgid "Arabic (Pakistan)"
 msgstr ""
 
 #. Keyboard indicator for Sindhi layouts
-#: ../rules/base.xml.in.h:875
+#: rules/base.xml:5798
 msgid "sd"
 msgstr ""
 
-#: ../rules/base.xml.in.h:876
+#: rules/base.xml:5799
 msgid "Sindhi"
 msgstr ""
 
 #. Keyboard indicator for Dhivehi layouts
-#: ../rules/base.xml.in.h:878
+#: rules/base.xml:5811
 msgid "dv"
 msgstr ""
 
-#: ../rules/base.xml.in.h:879
+#: rules/base.xml:5812
 msgid "Dhivehi"
 msgstr ""
 
-#: ../rules/base.xml.in.h:880
+#: rules/base.xml:5824
 msgid "English (South Africa)"
 msgstr ""
 
 #. Keyboard indicator for Esperanto layouts
-#: ../rules/base.xml.in.h:882
+#: rules/base.xml:5834
 msgid "eo"
 msgstr ""
 
-#: ../rules/base.xml.in.h:883
+#: rules/base.xml:5835
 msgid "Esperanto"
 msgstr ""
 
-#: ../rules/base.xml.in.h:884
+#: rules/base.xml:5844
 msgid "Esperanto (displaced semicolon and quote, obsolete)"
 msgstr ""
 
 #. Keyboard indicator for Nepali layouts
-#: ../rules/base.xml.in.h:886
+#: rules/base.xml:5853
 msgid "ne"
 msgstr ""
 
-#: ../rules/base.xml.in.h:887
+#: rules/base.xml:5854
 msgid "Nepali"
 msgstr "เนปาล"
 
-#: ../rules/base.xml.in.h:888
+#: rules/base.xml:5867
 msgid "English (Nigeria)"
 msgstr ""
 
 #. Keyboard indicator for Igbo layouts
-#: ../rules/base.xml.in.h:890
+#: rules/base.xml:5877
 msgid "ig"
 msgstr ""
 
-#: ../rules/base.xml.in.h:891
+#: rules/base.xml:5878
 msgid "Igbo"
 msgstr ""
 
 #. Keyboard indicator for Yoruba layouts
-#: ../rules/base.xml.in.h:893
+#: rules/base.xml:5888
 msgid "yo"
 msgstr ""
 
-#: ../rules/base.xml.in.h:894
+#: rules/base.xml:5889
 msgid "Yoruba"
 msgstr ""
 
-#: ../rules/base.xml.in.h:895
+#: rules/base.xml:5900
 msgid "Hausa (Nigeria)"
 msgstr ""
 
 #. Keyboard indicator for Amharic layouts
-#: ../rules/base.xml.in.h:897
+#: rules/base.xml:5912
 msgid "am"
 msgstr ""
 
-#: ../rules/base.xml.in.h:898
+#: rules/base.xml:5913
 msgid "Amharic"
 msgstr "อัมฮาริก"
 
 #. Keyboard indicator for Wolof layouts
-#: ../rules/base.xml.in.h:900
+#: rules/base.xml:5924
 msgid "wo"
 msgstr ""
 
-#: ../rules/base.xml.in.h:901
+#: rules/base.xml:5925
 msgid "Wolof"
 msgstr ""
 
 #. Keyboard indicator for Braille layouts
-#: ../rules/base.xml.in.h:903
+#: rules/base.xml:5936
 msgid "brl"
 msgstr ""
 
-#: ../rules/base.xml.in.h:904
+#: rules/base.xml:5937
 msgid "Braille"
 msgstr ""
 
-#: ../rules/base.xml.in.h:905
+#: rules/base.xml:5943
 msgid "Braille (left-handed)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:907
+#: rules/base.xml:5955
 msgid "Braille (right-handed)"
 msgstr ""
 
 #. Keyboard indicator for Turkmen layouts
-#: ../rules/base.xml.in.h:910
+#: rules/base.xml:5970
 msgid "tk"
 msgstr ""
 
-#: ../rules/base.xml.in.h:911
+#: rules/base.xml:5971
 msgid "Turkmen"
 msgstr ""
 
-#: ../rules/base.xml.in.h:912
+#: rules/base.xml:5980
 msgid "Turkmen (Alt-Q)"
 msgstr ""
 
 #. Keyboard indicator for Bambara layouts
-#: ../rules/base.xml.in.h:914
+#: rules/base.xml:5989
 msgid "bm"
 msgstr ""
 
-#: ../rules/base.xml.in.h:915
+#: rules/base.xml:5990
 msgid "Bambara"
 msgstr ""
 
-#: ../rules/base.xml.in.h:916
+#: rules/base.xml:6001
 msgid "French (Mali, alt.)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:917
+#: rules/base.xml:6012
 msgid "English (Mali, US, Macintosh)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:918
+#: rules/base.xml:6023
 msgid "English (Mali, US, intl.)"
 msgstr ""
 
 #. Keyboard indicator for Swahili layouts
-#: ../rules/base.xml.in.h:920
+#: rules/base.xml:6035 rules/base.xml:6073
 msgid "sw"
 msgstr ""
 
-#: ../rules/base.xml.in.h:921
+#: rules/base.xml:6036
 msgid "Swahili (Tanzania)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:922
+#: rules/base.xml:6045
 msgid "fr-tg"
 msgstr ""
 
-#: ../rules/base.xml.in.h:923
+#: rules/base.xml:6046
 msgid "French (Togo)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:924
+#: rules/base.xml:6074
 msgid "Swahili (Kenya)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:925
+#: rules/base.xml:6085
 msgid "Kikuyu"
 msgstr ""
 
 #. Keyboard indicator for Tswana layouts
-#: ../rules/base.xml.in.h:927
+#: rules/base.xml:6097
 msgid "tn"
 msgstr ""
 
-#: ../rules/base.xml.in.h:928
+#: rules/base.xml:6098
 msgid "Tswana"
 msgstr ""
 
 #. Keyboard indicator for Filipino layouts
-#: ../rules/base.xml.in.h:930
+#: rules/base.xml:6108
 msgid "ph"
 msgstr ""
 
-#: ../rules/base.xml.in.h:931
+#: rules/base.xml:6109
 msgid "Filipino"
 msgstr ""
 
-#: ../rules/base.xml.in.h:932
+#: rules/base.xml:6128
 msgid "Filipino (QWERTY, Baybayin)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:933
+#: rules/base.xml:6146
 msgid "Filipino (Capewell-Dvorak, Latin)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:934
+#: rules/base.xml:6152
 msgid "Filipino (Capewell-Dvorak, Baybayin)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:935
+#: rules/base.xml:6170
 msgid "Filipino (Capewell-QWERF 2006, Latin)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:936
+#: rules/base.xml:6176
 msgid "Filipino (Capewell-QWERF 2006, Baybayin)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:937
+#: rules/base.xml:6194
 msgid "Filipino (Colemak, Latin)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:938
+#: rules/base.xml:6200
 msgid "Filipino (Colemak, Baybayin)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:939
+#: rules/base.xml:6218
 msgid "Filipino (Dvorak, Latin)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:940
+#: rules/base.xml:6224
 msgid "Filipino (Dvorak, Baybayin)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:941
+#: rules/base.xml:6244
 msgid "md"
 msgstr ""
 
-#: ../rules/base.xml.in.h:942
+#: rules/base.xml:6245
 msgid "Moldavian"
 msgstr ""
 
-#: ../rules/base.xml.in.h:943
+#: rules/base.xml:6254
 msgid "gag"
 msgstr ""
 
-#: ../rules/base.xml.in.h:944
+#: rules/base.xml:6255
 msgid "Moldavian (Gagauz)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:945
+#: rules/base.xml:6266
 msgid "id"
 msgstr ""
 
@@ -3427,724 +3463,725 @@
 msgid "Indonesian (Jawi)"
 msgstr "อินโดนีเซีย (ยาวี)"
 
-#: ../rules/base.xml.in.h:947
+#: rules/base.xml:6301
 msgid "ms"
 msgstr ""
 
-#: ../rules/base.xml.in.h:948
+#: rules/base.xml:6302
 msgid "Malay (Jawi, Arabic Keyboard)"
 msgstr "มาเลย์ (ยาวี แป้นพิมพ์อาหรับ)"
 
-#: ../rules/base.xml.in.h:949
+#: rules/base.xml:6317
 msgid "Malay (Jawi, phonetic)"
 msgstr "มาเลย์ (ยาวี จัดเค้าโครงตามการออกเสียง)"
 
-#: ../rules/base.xml.in.h:950
+#: rules/base.xml:6328
 msgid "Switching to another layout"
 msgstr ""
 
-#: ../rules/base.xml.in.h:951
+#: rules/base.xml:6333
 msgid "Right Alt (while pressed)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:952
+#: rules/base.xml:6339
 msgid "Left Alt (while pressed)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:953
+#: rules/base.xml:6345
 msgid "Left Win (while pressed)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:954
+#: rules/base.xml:6357
 msgid "Any Win (while pressed)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:955
+#: rules/base.xml:6363
 msgid "Menu (while pressed), Shift+Menu for Menu"
 msgstr ""
 
-#: ../rules/base.xml.in.h:956
+#: rules/base.xml:6369
 msgid ""
 "Caps Lock (while pressed), Alt+Caps Lock for the original Caps Lock action"
 msgstr ""
 
-#: ../rules/base.xml.in.h:957
+#: rules/base.xml:6375
 msgid "Right Ctrl (while pressed)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:958
+#: rules/base.xml:6381 rules/base.xml:6605 rules/base.xml:7093
 msgid "Right Alt"
 msgstr ""
 
-#: ../rules/base.xml.in.h:959
+#: rules/base.xml:6387 rules/base.xml:6599
 msgid "Left Alt"
 msgstr ""
 
-#: ../rules/base.xml.in.h:960
+#: rules/base.xml:6393 rules/base.xml:6629 rules/base.xml:6756
+#: rules/base.xml:7159
 msgid "Caps Lock"
 msgstr ""
 
-#: ../rules/base.xml.in.h:961
+#: rules/base.xml:6399
 msgid "Shift+Caps Lock"
 msgstr ""
 
-#: ../rules/base.xml.in.h:962
+#: rules/base.xml:6405
 msgid "Caps Lock to first layout; Shift+Caps Lock to last layout"
 msgstr ""
 
-#: ../rules/base.xml.in.h:963
+#: rules/base.xml:6411
 msgid "Left Win to first layout; Right Win/Menu to last layout"
 msgstr ""
 
-#: ../rules/base.xml.in.h:964
+#: rules/base.xml:6417
 msgid "Left Ctrl to first layout; Right Ctrl to last layout"
 msgstr ""
 
-#: ../rules/base.xml.in.h:965
+#: rules/base.xml:6423
 msgid "Alt+Caps Lock"
 msgstr ""
 
-#: ../rules/base.xml.in.h:966
+#: rules/base.xml:6429
 msgid "Both Shift together"
 msgstr ""
 
-#: ../rules/base.xml.in.h:967
+#: rules/base.xml:6435
 msgid "Both Alt together"
 msgstr ""
 
-#: ../rules/base.xml.in.h:968
+#: rules/base.xml:6441
 msgid "Both Ctrl together"
 msgstr ""
 
-#: ../rules/base.xml.in.h:969
+#: rules/base.xml:6447
 msgid "Ctrl+Shift"
 msgstr ""
 
-#: ../rules/base.xml.in.h:970
+#: rules/base.xml:6453
 msgid "Left Ctrl+Left Shift"
 msgstr ""
 
-#: ../rules/base.xml.in.h:971
+#: rules/base.xml:6459
 msgid "Right Ctrl+Right Shift"
 msgstr ""
 
-#: ../rules/base.xml.in.h:972
+#: rules/base.xml:6465
 msgid "Alt+Ctrl"
 msgstr ""
 
-#: ../rules/base.xml.in.h:973
+#: rules/base.xml:6471
 msgid "Alt+Shift"
 msgstr ""
 
-#: ../rules/base.xml.in.h:974
+#: rules/base.xml:6477
 msgid "Left Alt+Left Shift"
 msgstr ""
 
-#: ../rules/base.xml.in.h:975
+#: rules/base.xml:6483
 msgid "Alt+Space"
 msgstr ""
 
-#: ../rules/base.xml.in.h:976
+#: rules/base.xml:6489 rules/base.xml:6569 rules/base.xml:7123
 msgid "Menu"
 msgstr ""
 
-#: ../rules/base.xml.in.h:977
+#: rules/base.xml:6495 rules/base.xml:6581 rules/base.xml:7099
 msgid "Left Win"
 msgstr ""
 
-#: ../rules/base.xml.in.h:978
+#: rules/base.xml:6501
 msgid "Win+Space"
 msgstr ""
 
-#: ../rules/base.xml.in.h:979
+#: rules/base.xml:6507 rules/base.xml:6587 rules/base.xml:7111
 msgid "Right Win"
 msgstr ""
 
-#: ../rules/base.xml.in.h:980
+#: rules/base.xml:6513
 msgid "Left Shift"
 msgstr ""
 
-#: ../rules/base.xml.in.h:981
+#: rules/base.xml:6519
 msgid "Right Shift"
 msgstr ""
 
-#: ../rules/base.xml.in.h:982
+#: rules/base.xml:6525 rules/base.xml:7135
 msgid "Left Ctrl"
 msgstr ""
 
-#: ../rules/base.xml.in.h:983
+#: rules/base.xml:6531 rules/base.xml:6563 rules/base.xml:7147
 msgid "Right Ctrl"
 msgstr ""
 
-#: ../rules/base.xml.in.h:984
+#: rules/base.xml:6537 rules/base.xml:6762 rules/base.xml:7195
 msgid "Scroll Lock"
 msgstr ""
 
-#: ../rules/base.xml.in.h:985
+#: rules/base.xml:6543
 msgid "Left Ctrl+Left Win to first layout; Right Ctrl+Menu to second layout"
 msgstr ""
 
-#: ../rules/base.xml.in.h:986
+#: rules/base.xml:6549
 msgid "Left Ctrl+Left Win"
 msgstr ""
 
-#: ../rules/base.xml.in.h:987
+#: rules/base.xml:6558 rules/base.extras.xml:1280
 msgid "Key to choose the 3rd level"
 msgstr ""
 
-#: ../rules/base.xml.in.h:988
+#: rules/base.xml:6575
 msgid "Any Win"
 msgstr ""
 
-#: ../rules/base.xml.in.h:989
+#: rules/base.xml:6593
 msgid "Any Alt"
 msgstr ""
 
-#: ../rules/base.xml.in.h:990
+#: rules/base.xml:6611
 msgid "Right Alt; Shift+Right Alt as Compose"
 msgstr ""
 
-#: ../rules/base.xml.in.h:991
+#: rules/base.xml:6617
 msgid "Right Alt never chooses 3rd level"
 msgstr ""
 
-#: ../rules/base.xml.in.h:992
+#: rules/base.xml:6623
 msgid "Enter on keypad"
 msgstr ""
 
-#: ../rules/base.xml.in.h:993
+#: rules/base.xml:6635
 msgid "Backslash"
 msgstr ""
 
-#: ../rules/base.xml.in.h:994
+#: rules/base.xml:6641 rules/base.xml:7171
 msgid "&lt;Less/Greater&gt;"
 msgstr ""
 
-#: ../rules/base.xml.in.h:995
+#: rules/base.xml:6647
 msgid ""
 "Caps Lock; acts as onetime lock when pressed together with another 3rd-level "
 "chooser"
 msgstr ""
 
-#: ../rules/base.xml.in.h:996
+#: rules/base.xml:6653
 msgid ""
 "Backslash; acts as onetime lock when pressed together with another 3rd level "
 "chooser"
 msgstr ""
 
-#: ../rules/base.xml.in.h:997
+#: rules/base.xml:6659
 msgid ""
 "&lt;Less/Greater&gt;; acts as onetime lock when pressed together with "
 "another 3rd level chooser"
 msgstr ""
 
-#: ../rules/base.xml.in.h:998
+#: rules/base.xml:6667
 msgid "Ctrl position"
 msgstr ""
 
-#: ../rules/base.xml.in.h:999
+#: rules/base.xml:6672
 msgid "Caps Lock as Ctrl"
 msgstr ""
 
-#: ../rules/base.xml.in.h:1000
+#: rules/base.xml:6678
 msgid "Left Ctrl as Meta"
 msgstr ""
 
-#: ../rules/base.xml.in.h:1001
+#: rules/base.xml:6684
 msgid "Swap Ctrl and Caps Lock"
 msgstr ""
 
-#: ../rules/base.xml.in.h:1002
+#: rules/base.xml:6696
 msgid "At left of 'A'"
 msgstr ""
 
-#: ../rules/base.xml.in.h:1003
+#: rules/base.xml:6702
 msgid "At bottom left"
 msgstr ""
 
-#: ../rules/base.xml.in.h:1004
+#: rules/base.xml:6708
 msgid "Right Ctrl as Right Alt"
 msgstr ""
 
-#: ../rules/base.xml.in.h:1005
+#: rules/base.xml:6714
 msgid "Menu as Right Ctrl"
 msgstr ""
 
-#: ../rules/base.xml.in.h:1006
+#: rules/base.xml:6720
 msgid "Swap Left Alt with Left Ctrl"
 msgstr ""
 
-#: ../rules/base.xml.in.h:1007
+#: rules/base.xml:6726
 msgid "Swap Left Win with Left Ctrl"
 msgstr ""
 
-#: ../rules/base.xml.in.h:1008
+#: rules/base.xml:6731
 msgid "Swap Right Win with Right Ctrl"
 msgstr ""
 
-#: ../rules/base.xml.in.h:1009
+#: rules/base.xml:6737
 msgid "Left Alt as Ctrl, Left Ctrl as Win, Left Win as Left Alt"
 msgstr ""
 
-#: ../rules/base.xml.in.h:1010
+#: rules/base.xml:6745
 msgid "Use keyboard LED to show alternative layout"
 msgstr ""
 
-#: ../rules/base.xml.in.h:1011
+#: rules/base.xml:6750
 msgid "Num Lock"
 msgstr ""
 
-#: ../rules/base.xml.in.h:1012
+#: rules/base.xml:6783
 msgid "Layout of numeric keypad"
 msgstr ""
 
-#: ../rules/base.xml.in.h:1013
+#: rules/base.xml:6788
 msgid "Legacy"
 msgstr ""
 
-#: ../rules/base.xml.in.h:1014
+#: rules/base.xml:6794
 msgid "Unicode additions (arrows and math operators)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:1015
+#: rules/base.xml:6800
 msgid ""
 "Unicode additions (arrows and math operators; math operators on default "
 "level)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:1016
+#: rules/base.xml:6806
 msgid "Legacy Wang 724"
 msgstr ""
 
-#: ../rules/base.xml.in.h:1017
+#: rules/base.xml:6812
 msgid "Wang 724 keypad with Unicode additions (arrows and math operators)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:1018
+#: rules/base.xml:6818
 msgid ""
 "Wang 724 keypad with Unicode additions (arrows and math operators; math "
 "operators on default level)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:1019
+#: rules/base.xml:6824
 msgid "Hexadecimal"
 msgstr ""
 
-#: ../rules/base.xml.in.h:1020
+#: rules/base.xml:6830
 msgid "ATM/phone-style"
 msgstr ""
 
-#: ../rules/base.xml.in.h:1021
+#: rules/base.xml:6839
 msgid "Numeric keypad Delete behavior"
 msgstr ""
 
-#: ../rules/base.xml.in.h:1022
+#: rules/base.xml:6845
 msgid "Legacy key with dot"
 msgstr ""
 
 #. Actually, with KP_SEPARATOR, as the old keypad(comma)
-#: ../rules/base.xml.in.h:1024
+#: rules/base.xml:6852
 msgid "Legacy key with comma"
 msgstr ""
 
-#: ../rules/base.xml.in.h:1025
+#: rules/base.xml:6858
 msgid "Four-level key with dot"
 msgstr ""
 
-#: ../rules/base.xml.in.h:1026
+#: rules/base.xml:6864
 msgid "Four-level key with dot, Latin-9 only"
 msgstr ""
 
-#: ../rules/base.xml.in.h:1027
+#: rules/base.xml:6870
 msgid "Four-level key with comma"
 msgstr ""
 
-#: ../rules/base.xml.in.h:1028
+#: rules/base.xml:6876
 msgid "Four-level key with momayyez"
 msgstr ""
 
 #. This assumes the KP_ abstract symbols are actually useful for some apps
 #. The description needs to be rewritten
-#: ../rules/base.xml.in.h:1031
+#: rules/base.xml:6884
 msgid "Four-level key with abstract separators"
 msgstr ""
 
-#: ../rules/base.xml.in.h:1032
+#: rules/base.xml:6890
 msgid "Semicolon on third level"
 msgstr ""
 
-#: ../rules/base.xml.in.h:1033
+#: rules/base.xml:6900
 msgid "Caps Lock behavior"
 msgstr ""
 
-#: ../rules/base.xml.in.h:1034
+#: rules/base.xml:6905
 msgid "Caps Lock uses internal capitalization; Shift \"pauses\" Caps Lock"
 msgstr ""
 
-#: ../rules/base.xml.in.h:1035
+#: rules/base.xml:6911
 msgid ""
 "Caps Lock uses internal capitalization; Shift does not affect Caps Lock"
 msgstr ""
 
-#: ../rules/base.xml.in.h:1036
+#: rules/base.xml:6917
 msgid "Caps Lock acts as Shift with locking; Shift \"pauses\" Caps Lock"
 msgstr ""
 
-#: ../rules/base.xml.in.h:1037
+#: rules/base.xml:6923
 msgid "Caps Lock acts as Shift with locking; Shift does not affect Caps Lock"
 msgstr ""
 
-#: ../rules/base.xml.in.h:1038
+#: rules/base.xml:6929
 msgid "Caps Lock toggles normal capitalization of alphabetic characters"
 msgstr ""
 
-#: ../rules/base.xml.in.h:1039
+#: rules/base.xml:6935
 msgid "Caps Lock toggles ShiftLock (affects all keys)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:1040
+#: rules/base.xml:6941
 msgid "Swap ESC and Caps Lock"
 msgstr ""
 
-#: ../rules/base.xml.in.h:1041
+#: rules/base.xml:6947
 msgid "Make Caps Lock an additional Esc"
 msgstr ""
 
-#: ../rules/base.xml.in.h:1042
+#: rules/base.xml:6959
 msgid "Make Caps Lock an additional Backspace"
 msgstr ""
 
-#: ../rules/base.xml.in.h:1043
+#: rules/base.xml:6965
 msgid "Make Caps Lock an additional Super"
 msgstr ""
 
-#: ../rules/base.xml.in.h:1044
+#: rules/base.xml:6971
 msgid "Make Caps Lock an additional Hyper"
 msgstr ""
 
-#: ../rules/base.xml.in.h:1045
+#: rules/base.xml:6977
 msgid "Make Caps Lock an additional Menu key"
 msgstr ""
 
-#: ../rules/base.xml.in.h:1046
+#: rules/base.xml:6983
 msgid "Make Caps Lock an additional Num Lock"
 msgstr ""
 
-#: ../rules/base.xml.in.h:1047
+#: rules/base.xml:6989
 msgid "Caps Lock is also a Ctrl"
 msgstr ""
 
-#: ../rules/base.xml.in.h:1048
+#: rules/base.xml:6995
 msgid "Caps Lock is disabled"
 msgstr ""
 
-#: ../rules/base.xml.in.h:1049
+#: rules/base.xml:7003
 msgid "Alt/Win key behavior"
 msgstr ""
 
-#: ../rules/base.xml.in.h:1050
+#: rules/base.xml:7008
 msgid "Add the standard behavior to Menu key"
 msgstr ""
 
-#: ../rules/base.xml.in.h:1051
+#: rules/base.xml:7020
 msgid "Alt and Meta are on Alt"
 msgstr ""
 
-#: ../rules/base.xml.in.h:1052
+#: rules/base.xml:7026
 msgid "Alt is mapped to Win and the usual Alt"
 msgstr ""
 
-#: ../rules/base.xml.in.h:1053
+#: rules/base.xml:7032
 msgid "Ctrl is mapped to Win and the usual Ctrl keys"
 msgstr ""
 
-#: ../rules/base.xml.in.h:1054
+#: rules/base.xml:7038
 msgid "Ctrl is mapped to Alt; Alt is mapped to Win"
 msgstr ""
 
-#: ../rules/base.xml.in.h:1055
+#: rules/base.xml:7044
 msgid "Meta is mapped to Win"
 msgstr ""
 
-#: ../rules/base.xml.in.h:1056
+#: rules/base.xml:7050
 msgid "Meta is mapped to Left Win"
 msgstr ""
 
-#: ../rules/base.xml.in.h:1057
+#: rules/base.xml:7056
 msgid "Hyper is mapped to Win"
 msgstr ""
 
-#: ../rules/base.xml.in.h:1058
+#: rules/base.xml:7062
 msgid "Alt is mapped to Right Win, Super to Menu"
 msgstr ""
 
-#: ../rules/base.xml.in.h:1059
+#: rules/base.xml:7068
 msgid "Left Alt is swapped with Left Win"
 msgstr ""
 
-#: ../rules/base.xml.in.h:1060
+#: rules/base.xml:7074
 msgid "Alt is swapped with Win"
 msgstr ""
 
-#: ../rules/base.xml.in.h:1061
+#: rules/base.xml:7080
 msgid "Win is mapped to PrtSc and the usual Win"
 msgstr ""
 
-#: ../rules/base.xml.in.h:1062
+#: rules/base.xml:7088
 msgid "Position of Compose key"
 msgstr ""
 
-#: ../rules/base.xml.in.h:1063
+#: rules/base.xml:7105
 msgid "3rd level of Left Win"
 msgstr ""
 
-#: ../rules/base.xml.in.h:1064
+#: rules/base.xml:7117
 msgid "3rd level of Right Win"
 msgstr ""
 
-#: ../rules/base.xml.in.h:1065
+#: rules/base.xml:7129
 msgid "3rd level of Menu"
 msgstr ""
 
-#: ../rules/base.xml.in.h:1066
+#: rules/base.xml:7141
 msgid "3rd level of Left Ctrl"
 msgstr ""
 
-#: ../rules/base.xml.in.h:1067
+#: rules/base.xml:7153
 msgid "3rd level of Right Ctrl"
 msgstr ""
 
-#: ../rules/base.xml.in.h:1068
+#: rules/base.xml:7165
 msgid "3rd level of Caps Lock"
 msgstr ""
 
-#: ../rules/base.xml.in.h:1069
+#: rules/base.xml:7177
 msgid "3rd level of &lt;Less/Greater&gt;"
 msgstr ""
 
-#: ../rules/base.xml.in.h:1070
+#: rules/base.xml:7183
 msgid "Pause"
 msgstr ""
 
-#: ../rules/base.xml.in.h:1071
+#: rules/base.xml:7189
 msgid "PrtSc"
 msgstr ""
 
-#: ../rules/base.xml.in.h:1072
+#: rules/base.xml:7202
 msgid "Miscellaneous compatibility options"
 msgstr ""
 
-#: ../rules/base.xml.in.h:1073
+#: rules/base.xml:7207
 msgid "Default numeric keypad keys"
 msgstr ""
 
-#: ../rules/base.xml.in.h:1074
+#: rules/base.xml:7213
 msgid "Numeric keypad always enters digits (as in macOS)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:1075
+#: rules/base.xml:7219
 msgid ""
 "Num Lock on: digits; Shift for arrow keys. Num Lock off: arrow keys (as in "
 "Windows)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:1076
+#: rules/base.xml:7225
 msgid "Shift does not cancel Num Lock, chooses 3rd level instead"
 msgstr ""
 
-#: ../rules/base.xml.in.h:1077
+#: rules/base.xml:7231
 msgid "Special keys (Ctrl+Alt+&lt;key&gt;) handled in a server"
 msgstr ""
 
-#: ../rules/base.xml.in.h:1078
+#: rules/base.xml:7237
 msgid ""
 "Apple Aluminium: emulate PC keys (PrtSc, Scroll Lock, Pause, Num Lock)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:1079
+#: rules/base.xml:7243
 msgid "Shift cancels Caps Lock"
 msgstr ""
 
-#: ../rules/base.xml.in.h:1080
+#: rules/base.xml:7249
 msgid "Enable extra typographic characters"
 msgstr ""
 
-#: ../rules/base.xml.in.h:1081
+#: rules/base.xml:7255
 msgid "Both Shift together enable Caps Lock"
 msgstr ""
 
-#: ../rules/base.xml.in.h:1082
+#: rules/base.xml:7261
 msgid "Both Shift together enable Caps Lock; one Shift key disables it"
 msgstr ""
 
-#: ../rules/base.xml.in.h:1083
+#: rules/base.xml:7267
 msgid "Both Shift together enable Shift Lock"
 msgstr ""
 
-#: ../rules/base.xml.in.h:1084
+#: rules/base.xml:7273
 msgid "Shift + Num Lock enables PointerKeys"
 msgstr ""
 
-#: ../rules/base.xml.in.h:1085
+#: rules/base.xml:7279
 msgid "Allow breaking grabs with keyboard actions (warning: security risk)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:1086
+#: rules/base.xml:7285
 msgid "Allow grab and window tree logging"
 msgstr ""
 
-#: ../rules/base.xml.in.h:1087
+#: rules/base.xml:7293
 msgid "Adding currency signs to certain keys"
 msgstr ""
 
-#: ../rules/base.xml.in.h:1088
+#: rules/base.xml:7298
 msgid "Euro on E"
 msgstr ""
 
-#: ../rules/base.xml.in.h:1089
+#: rules/base.xml:7304
 msgid "Euro on 2"
 msgstr ""
 
-#: ../rules/base.xml.in.h:1090
+#: rules/base.xml:7310
 msgid "Euro on 4"
 msgstr ""
 
-#: ../rules/base.xml.in.h:1091
+#: rules/base.xml:7316
 msgid "Euro on 5"
 msgstr ""
 
-#: ../rules/base.xml.in.h:1092
+#: rules/base.xml:7322
 msgid "Rupee on 4"
 msgstr ""
 
-#: ../rules/base.xml.in.h:1093
+#: rules/base.xml:7329
 msgid "Key to choose 5th level"
 msgstr ""
 
-#: ../rules/base.xml.in.h:1094
+#: rules/base.xml:7346
 msgid ""
 "&lt;Less/Greater&gt; chooses 5th level; acts as onetime lock when pressed "
 "together with another 5th level chooser"
 msgstr ""
 
-#: ../rules/base.xml.in.h:1095
+#: rules/base.xml:7352
 msgid ""
 "Right Alt chooses 5th level; acts as onetime lock when pressed together with "
 "another 5th level chooser"
 msgstr ""
 
-#: ../rules/base.xml.in.h:1096
+#: rules/base.xml:7358
 msgid ""
 "Left Win chooses 5th level; acts as onetime lock when pressed together with "
 "another 5th level chooser"
 msgstr ""
 
-#: ../rules/base.xml.in.h:1097
+#: rules/base.xml:7364
 msgid ""
 "Right Win chooses 5th level; acts as onetime lock when pressed together with "
 "another 5th level chooser"
 msgstr ""
 
-#: ../rules/base.xml.in.h:1098
+#: rules/base.xml:7410
 msgid "Using space key to input non-breaking space"
 msgstr ""
 
-#: ../rules/base.xml.in.h:1099
+#: rules/base.xml:7415
 msgid "Usual space at any level"
 msgstr ""
 
-#: ../rules/base.xml.in.h:1100
+#: rules/base.xml:7421
 msgid "Non-breaking space at the 2nd level"
 msgstr ""
 
-#: ../rules/base.xml.in.h:1101
+#: rules/base.xml:7427
 msgid "Non-breaking space at the 3rd level"
 msgstr ""
 
-#: ../rules/base.xml.in.h:1102
+#: rules/base.xml:7433
 msgid "Non-breaking space at the 3rd level, nothing at the 4th level"
 msgstr ""
 
-#: ../rules/base.xml.in.h:1103
+#: rules/base.xml:7439
 msgid ""
 "Non-breaking space at the 3rd level, thin non-breaking space at the 4th level"
 msgstr ""
 
-#: ../rules/base.xml.in.h:1104
+#: rules/base.xml:7445
 msgid "Non-breaking space at the 4th level"
 msgstr ""
 
-#: ../rules/base.xml.in.h:1105
+#: rules/base.xml:7451
 msgid ""
 "Non-breaking space at the 4th level, thin non-breaking space at the 6th level"
 msgstr ""
 
-#: ../rules/base.xml.in.h:1106
+#: rules/base.xml:7457
 msgid ""
 "Non-breaking space at the 4th level, thin non-breaking space at the 6th "
 "level (via Ctrl+Shift)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:1107
+#: rules/base.xml:7463
 msgid "Zero-width non-joiner at the 2nd level"
 msgstr ""
 
-#: ../rules/base.xml.in.h:1108
+#: rules/base.xml:7469
 msgid ""
 "Zero-width non-joiner at the 2nd level, zero-width joiner at the 3rd level"
 msgstr ""
 
-#: ../rules/base.xml.in.h:1109
+#: rules/base.xml:7475
 msgid ""
 "Zero-width non-joiner at the 2nd level, zero-width joiner at the 3rd level, "
 "non-breaking space at the 4th level"
 msgstr ""
 
-#: ../rules/base.xml.in.h:1110
+#: rules/base.xml:7481
 msgid ""
 "Zero-width non-joiner at the 2nd level, non-breaking space at the 3rd level"
 msgstr ""
 
-#: ../rules/base.xml.in.h:1111
+#: rules/base.xml:7487
 msgid ""
 "Zero-width non-joiner at the 2nd level, non-breaking space at the 3rd level, "
 "nothing at the 4th level"
 msgstr ""
 
-#: ../rules/base.xml.in.h:1112
+#: rules/base.xml:7493
 msgid ""
 "Zero-width non-joiner at the 2nd level, non-breaking space at the 3rd level, "
 "zero-width joiner at the 4th level"
 msgstr ""
 
-#: ../rules/base.xml.in.h:1113
+#: rules/base.xml:7499
 msgid ""
 "Zero-width non-joiner at the 2nd level, non-breaking space at the 3rd level, "
 "thin non-breaking space at the 4th level"
 msgstr ""
 
-#: ../rules/base.xml.in.h:1114
+#: rules/base.xml:7505
 msgid ""
 "Zero-width non-joiner at the 3rd level, zero-width joiner at the 4th level"
 msgstr ""
 
-#: ../rules/base.xml.in.h:1115
+#: rules/base.xml:7512
 msgid "Japanese keyboard options"
 msgstr "ตัวเลือกแป้นพิมพ์ภาษาญี่ปุ่น"
 
-#: ../rules/base.xml.in.h:1116
+#: rules/base.xml:7517
 msgid "Kana Lock key is locking"
 msgstr ""
 
-#: ../rules/base.xml.in.h:1117
+#: rules/base.xml:7523
 msgid "NICOLA-F style Backspace"
 msgstr ""
 
-#: ../rules/base.xml.in.h:1118
+#: rules/base.xml:7529
 msgid "Make Zenkaku Hankaku an additional Esc"
 msgstr ""
 
-#: ../rules/base.xml.in.h:1119
+#: rules/base.xml:7536
 msgid "Korean Hangul/Hanja keys"
 msgstr "แป้นฮันกึล/ฮันจาภาษาเกาหลี"
 
@@ -4160,395 +4197,395 @@
 msgid "Right Ctrl as Hangul, right Alt as Hanja"
 msgstr ""
 
-#: ../rules/base.xml.in.h:1122
+#: rules/base.xml:7566
 msgid "Adding Esperanto supersigned letters"
 msgstr ""
 
-#: ../rules/base.xml.in.h:1123
+#: rules/base.xml:7571
 msgid "To the corresponding key in a QWERTY layout"
 msgstr ""
 
-#: ../rules/base.xml.in.h:1124
+#: rules/base.xml:7577
 msgid "To the corresponding key in a Dvorak layout"
 msgstr ""
 
-#: ../rules/base.xml.in.h:1125
+#: rules/base.xml:7583
 msgid "To the corresponding key in a Colemak layout"
 msgstr ""
 
-#: ../rules/base.xml.in.h:1126
+#: rules/base.xml:7590
 msgid "Maintain key compatibility with old Solaris keycodes"
 msgstr ""
 
-#: ../rules/base.xml.in.h:1127
+#: rules/base.xml:7595
 msgid "Sun Key compatibility"
 msgstr ""
 
-#: ../rules/base.xml.in.h:1128
+#: rules/base.xml:7602
 msgid "Key sequence to kill the X server"
 msgstr ""
 
-#: ../rules/base.xml.in.h:1129
+#: rules/base.xml:7607
 msgid "Ctrl+Alt+Backspace"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:1
+#: rules/base.extras.xml:9
 msgid "apl"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:2
+#: rules/base.extras.xml:10
 msgid "APL"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:3
+#: rules/base.extras.xml:19
 msgid "dlg"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:4
+#: rules/base.extras.xml:20
 msgid "Dyalog APL complete"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:5
+#: rules/base.extras.xml:26
 msgid "sax"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:6
+#: rules/base.extras.xml:27
 msgid "APL Keyboard Symbols: sax"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:7
+#: rules/base.extras.xml:33
 msgid "ufd"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:8
+#: rules/base.extras.xml:34
 msgid "APL Keyboard Symbols: Unified Layout"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:9
+#: rules/base.extras.xml:40
 msgid "apl2"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:10
+#: rules/base.extras.xml:41
 msgid "APL Keyboard Symbols: IBM APL2"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:11
+#: rules/base.extras.xml:47
 msgid "aplII"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:12
+#: rules/base.extras.xml:48
 msgid "APL Keyboard Symbols: Manugistics APL*PLUS II"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:13
+#: rules/base.extras.xml:54
 msgid "aplx"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:14
+#: rules/base.extras.xml:55
 msgid "APL Keyboard Symbols: APLX Unified APL Layout"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:17
+#: rules/base.extras.xml:73
 msgid "kut"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:18
+#: rules/base.extras.xml:74
 msgid "Kutenai"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:19
+#: rules/base.extras.xml:80
 msgid "shs"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:20
+#: rules/base.extras.xml:81
 msgid "Secwepemctsin"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:21
+#: rules/base.extras.xml:87
 msgid "Multilingual (Canada, Sun Type 6/7)"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:24
+#: rules/base.extras.xml:105
 msgid "German (US, with German letters)"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:25
+#: rules/base.extras.xml:114
 msgid "German (with Hungarian letters and no dead keys)"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:26
+#: rules/base.extras.xml:124
 msgid "Polish (Germany, no dead keys)"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:27
+#: rules/base.extras.xml:134
 msgid "German (Sun Type 6/7)"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:28
+#: rules/base.extras.xml:140
 msgid "German (Aus der Neo-Welt)"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:29
+#: rules/base.extras.xml:146
 msgid "German (KOY)"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:30
+#: rules/base.extras.xml:152
 msgid "German (Bone)"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:31
+#: rules/base.extras.xml:158
 msgid "German (Bone, eszett home row)"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:32
+#: rules/base.extras.xml:164
 msgid "German (Neo qwertz)"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:33
+#: rules/base.extras.xml:170
 msgid "German (Neo qwerty)"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:36
+#: rules/base.extras.xml:178
 msgid "Russian (Germany, recommended)"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:37
+#: rules/base.extras.xml:189
 msgid "Russian (Germany, transliteration)"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:38
+#: rules/base.extras.xml:199
 msgid "German Ladin"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:39
+#: rules/base.extras.xml:198
 msgid "de_lld"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:41
+#: rules/base.extras.xml:218
 msgid "Old Hungarian"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:42
+#: rules/base.extras.xml:217
 msgid "oldhun"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:45
+#: rules/base.extras.xml:236
 msgid "Avestan"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:48
+#: rules/base.extras.xml:257
 msgid "Lithuanian (US Dvorak with Lithuanian letters)"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:49
+#: rules/base.extras.xml:263
 msgid "Lithuanian (Sun Type 6/7)"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:52
+#: rules/base.extras.xml:281
 msgid "Latvian (US Dvorak)"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:53
+#: rules/base.extras.xml:287
 msgid "Latvian (US Dvorak, Y variant)"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:54
+#: rules/base.extras.xml:293
 msgid "Latvian (US Dvorak, minus variant)"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:55
+#: rules/base.extras.xml:299
 msgid "Latvian (programmer US Dvorak)"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:56
+#: rules/base.extras.xml:305
 msgid "Latvian (programmer US Dvorak, Y variant)"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:57
+#: rules/base.extras.xml:311
 msgid "Latvian (programmer US Dvorak, minus variant)"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:58
+#: rules/base.extras.xml:317
 msgid "Latvian (US Colemak)"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:59
+#: rules/base.extras.xml:323
 msgid "Latvian (US Colemak, apostrophe variant)"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:60
+#: rules/base.extras.xml:329
 msgid "Latvian (Sun Type 6/7)"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:63
+#: rules/base.extras.xml:347
 msgid "English (US, international AltGr Unicode combining)"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:64
+#: rules/base.extras.xml:353
 msgid "English (US, international AltGr Unicode combining, alternative)"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:65
+#: rules/base.extras.xml:359
 msgid "Atsina"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:66
+#: rules/base.extras.xml:366
 msgid "Coeur d'Alene Salish"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:67
+#: rules/base.extras.xml:375
 msgid "Czech Slovak and German (US)"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:68
+#: rules/base.extras.xml:405
 msgid "English (US, IBM Arabic 238_L)"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:69
+#: rules/base.extras.xml:411
 msgid "English (US, Sun Type 6/7)"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:70
+#: rules/base.xml:1473
 msgid "English (Norman)"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:71
+#: rules/base.extras.xml:417
 msgid "English (Carpalx)"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:72
+#: rules/base.extras.xml:423
 msgid "English (Carpalx, intl., with dead keys)"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:73
+#: rules/base.extras.xml:429
 msgid "English (Carpalx, intl., with AltGr dead keys)"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:74
+#: rules/base.extras.xml:435
 msgid "English (Carpalx, full optimization)"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:75
+#: rules/base.extras.xml:441
 msgid "English (Carpalx, full optimization, intl., with dead keys)"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:76
+#: rules/base.extras.xml:447
 msgid "English (Carpalx, full optimization, intl., with AltGr dead keys)"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:77
+#: rules/base.extras.xml:465
 msgid "Sicilian (US keyboard)"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:80
+#: rules/base.extras.xml:488
 msgid "Polish (intl., with dead keys)"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:81
+#: rules/base.extras.xml:494
 msgid "Polish (Colemak)"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:82
+#: rules/base.extras.xml:500
 msgid "Polish (Sun Type 6/7)"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:83
+#: rules/base.extras.xml:506
 msgid "Polish (Glagolica)"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:87
+#: rules/base.extras.xml:525
 msgid "Crimean Tatar (Dobruja Q)"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:88
+#: rules/base.extras.xml:534
 msgid "Romanian (ergonomic Touchtype)"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:89
+#: rules/base.extras.xml:540
 msgid "Romanian (Sun Type 6/7)"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:92
+#: rules/base.extras.xml:558
 msgid "Serbian (combining accents instead of dead keys)"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:94
+#: rules/base.extras.xml:573
 msgid "Church Slavonic"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:95
+#: rules/base.extras.xml:583
 msgid "Russian (with Ukrainian-Belorussian layout)"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:96
+#: rules/base.extras.xml:594
 msgid "Russian (Rulemak, phonetic Colemak)"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:97
+#: rules/base.extras.xml:606
 msgid "Russian (Sun Type 6/7)"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:99
+#: rules/base.extras.xml:619
 msgid "Russian (Polyglot and Reactionary)"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:102
+#: rules/base.extras.xml:705
 msgid "Armenian (OLPC phonetic)"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:105
+#: rules/base.extras.xml:723
 msgid "Hebrew (Biblical, SIL phonetic)"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:108
+#: rules/base.extras.xml:741
 msgid "Arabic (Sun Type 6/7)"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:109
+#: rules/base.extras.xml:747
 msgid ""
 "Arabic (with extensions for Arabic-written other languages and European "
 "digits preferred)"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:110
+#: rules/base.extras.xml:753
 msgid ""
 "Arabic (with extensions for Arabic-written other languages and Arabic digits "
 "preferred)"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:111
+#: rules/base.extras.xml:759
 msgid "Ugaritic instead of Arabic"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:114
+#: rules/base.extras.xml:774
 msgid "Belgian (Sun Type 6/7)"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:117
+#: rules/base.extras.xml:789
 msgid "Portuguese (Brazil, Sun Type 6/7)"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:120
+#: rules/base.extras.xml:804
 msgid "Czech (Sun Type 6/7)"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:123
+#: rules/base.extras.xml:843
 msgid "Danish (Sun Type 6/7)"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:126
+#: rules/base.extras.xml:858
 msgid "Dutch (Sun Type 6/7)"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:129
+#: rules/base.extras.xml:873
 msgid "Estonian (Sun Type 6/7)"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:132
+#: rules/base.extras.xml:894
 msgid "Finnish (DAS)"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:133
+#: rules/base.extras.xml:888
 msgid "Finnish (Sun Type 6/7)"
 msgstr ""
 
@@ -4556,96 +4593,96 @@
 msgid "Finnish Dvorak"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:136
+#: rules/base.extras.xml:915
 msgid "French (Sun Type 6/7)"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:141
+#: rules/base.extras.xml:942
 msgid "Greek (Sun Type 6/7)"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:145
+#: rules/base.extras.xml:963
 msgid "Italian (Sun Type 6/7)"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:146
+#: rules/base.xml:3958
 msgid "Friulian (Italy)"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:147
+#: rules/base.extras.xml:970
 msgid "Italian Ladin"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:148
+#: rules/base.extras.xml:969
 msgid "it_lld"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:151
+#: rules/base.extras.xml:989
 msgid "Japanese (Sun Type 6)"
 msgstr "ญี่ปุ่น (Sun Type 6)"
 
-#: ../rules/base.extras.xml.in.h:152
+#: rules/base.extras.xml:995
 msgid "Japanese (Sun Type 7 - pc compatible)"
 msgstr "ญี่ปุ่น (Sun Type 7 - เข้ากันได้กับพีซี)"
 
-#: ../rules/base.extras.xml.in.h:153
+#: rules/base.extras.xml:1001
 msgid "Japanese (Sun Type 7 - sun compatible)"
 msgstr "ญี่ปุ่น (Sun Type 7 - เข้ากันได้กับ Sun)"
 
-#: ../rules/base.extras.xml.in.h:156
+#: rules/base.extras.xml:1016
 msgid "Norwegian (Sun Type 6/7)"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:158
+#: rules/base.extras.xml:1031
 msgid "Portuguese (Sun Type 6/7)"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:162
+#: rules/base.extras.xml:1067
 msgid "Slovak (Sun Type 6/7)"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:165
+#: rules/base.extras.xml:1082
 msgid "Spanish (Sun Type 6/7)"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:168
+#: rules/base.extras.xml:1097
 msgid "Swedish (Dvorak A5)"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:169
+#: rules/base.extras.xml:1103
 msgid "Swedish (Sun Type 6/7)"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:170
+#: rules/base.extras.xml:1109
 msgid "Elfdalian (Swedish, with combining ogonek)"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:172
+#: rules/base.extras.xml:1127
 msgid "German (Switzerland, Sun Type 6/7)"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:173
+#: rules/base.extras.xml:1133
 msgid "French (Switzerland, Sun Type 6/7)"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:176
+#: rules/base.extras.xml:1148
 msgid "Turkish (Sun Type 6/7)"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:179
+#: rules/base.extras.xml:1163
 msgid "Ukrainian (Sun Type 6/7)"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:181
+#: rules/base.extras.xml:1178
 msgid "English (UK, Sun Type 6/7)"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:184
+#: rules/base.extras.xml:1193
 msgid "Korean (Sun Type 6/7)"
 msgstr "เกาหลี (Sun Type 6/7)"
 
 #. Keyboard indicator for European layouts
-#: ../rules/base.extras.xml.in.h:191
+#: rules/base.extras.xml:1227
 msgid "eu"
 msgstr ""
 
@@ -4654,14 +4691,14 @@
 msgstr ""
 
 #. Keyboard layouts for transcription and transliteration systems
-#: ../rules/base.extras.xml.in.h:197
+#: rules/base.extras.xml:1269
 msgid "International Phonetic Alphabet"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:198
+#: rules/base.extras.xml:1299
 msgid "Parentheses position"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:199
+#: rules/base.extras.xml:1304
 msgid "Swap with square brackets"
 msgstr ""
diff -Nru language-pack-th-18.04+20200123/debian/changelog language-pack-th-18.04+20200702/debian/changelog
--- language-pack-th-18.04+20200123/debian/changelog	2020-01-23 16:55:53.000000000 +0000
+++ language-pack-th-18.04+20200702/debian/changelog	2020-07-08 13:58:06.000000000 +0000
@@ -1,3 +1,9 @@
+language-pack-th (1:18.04+20200702) bionic-proposed; urgency=low
+
+  * Automatic update to latest translation data.
+
+ -- Ubuntu automatic language-pack builder <language-packs@ubuntu.com>  Wed, 08 Jul 2020 13:58:05 +0000
+
 language-pack-th (1:18.04+20200123) bionic-proposed; urgency=low
 
   * Automatic update to latest translation data.