diff -Nru language-pack-dz-base-14.04+20150804/data/dz/LC_MESSAGES/aptitude.po language-pack-dz-base-14.04+20160720/data/dz/LC_MESSAGES/aptitude.po
--- language-pack-dz-base-14.04+20150804/data/dz/LC_MESSAGES/aptitude.po	2015-08-14 07:53:50.000000000 +0000
+++ language-pack-dz-base-14.04+20160720/data/dz/LC_MESSAGES/aptitude.po	2016-07-20 16:44:52.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: 2015-08-04 05:29+0000\n"
-"X-Generator: Launchpad (build 17656)\n"
+"X-Launchpad-Export-Date: 2016-07-20 10:33+0000\n"
+"X-Generator: Launchpad (build 18147)\n"
 "X-Poedit-Country: Bhutan\n"
 "Language: dz\n"
 "X-Poedit-Language: Dzongkha\n"
@@ -506,7 +506,7 @@
 msgid "Dependency handling"
 msgstr ""
 
-#: src/apt_options.cc:529 src/pkg_grouppolicy.cc:1063
+#: src/apt_options.cc:529 src/pkg_grouppolicy.cc:975
 msgid "Miscellaneous"
 msgstr "སྣ་ཚོགས"
 
@@ -515,73 +515,73 @@
 msgid "%ls: Examine"
 msgstr ""
 
-#: src/broken_indicator.cc:137
+#: src/broken_indicator.cc:138
 #, c-format
 msgid "%ls: Apply"
 msgstr ""
 
-#: src/broken_indicator.cc:142
+#: src/broken_indicator.cc:144
 #, c-format
 msgid "%ls: Next"
 msgstr ""
 
-#: src/broken_indicator.cc:148
+#: src/broken_indicator.cc:151
 #, c-format
 msgid "%ls: Previous"
 msgstr ""
 
-#: src/broken_indicator.cc:243
+#: src/broken_indicator.cc:246
 msgid "Dependency resolution disabled."
 msgstr ""
 
-#: src/broken_indicator.cc:254
+#: src/broken_indicator.cc:257
 msgid "Unable to resolve dependencies."
 msgstr "རྟེན་འབྲེལ་ཚུ་མོས་མཐུན་འབད་མ་ཚུགས།"
 
-#: src/broken_indicator.cc:265
+#: src/broken_indicator.cc:268
 msgid "Fatal error in resolver"
 msgstr "མུས་མཐུན་པ་ནང་ཚུབ་ཅན་གྱི་འཛོལ་བ་འབྱུང་ཡོདཔ"
 
-#: src/broken_indicator.cc:277
+#: src/broken_indicator.cc:280
 #, c-format
 msgid "[%d(%d)/...] Resolving dependencies"
 msgstr "[%d(%d)/...] རྟེན་འབྲེལ་ཚུ་མོས་མཐུན་འབད་དོ།"
 
-#: src/broken_indicator.cc:313 src/gtk/resolver.cc:1294
+#: src/broken_indicator.cc:316 src/gtk/resolver.cc:1294
 #: src/gtk/resolver.cc:1462 src/solution_dialog.cc:140
 #: src/solution_screen.cc:569
 msgid "Internal error: unexpected null solution."
 msgstr "ནང་འཁོད་འཛོལ་བ:རེ་འདུན་མེད་པའི་ ཐབས་ཤེས་སྟོང་ཆ།"
 
-#: src/broken_indicator.cc:371
+#: src/broken_indicator.cc:374
 msgid "Suggest keeping all packages at their current version."
 msgstr ""
 
-#: src/broken_indicator.cc:379
+#: src/broken_indicator.cc:382
 #, c-format
 msgid "%d install"
 msgid_plural "%d installs"
 msgstr[0] "%d གཞི་བཙུགས་འབད་ནི།"
 
-#: src/broken_indicator.cc:389
+#: src/broken_indicator.cc:392
 #, c-format
 msgid "%d removal"
 msgid_plural "%d removals"
 msgstr[0] "%d རྩ་བསྐྲད།"
 
-#: src/broken_indicator.cc:399
+#: src/broken_indicator.cc:402
 #, c-format
 msgid "%d keep"
 msgid_plural "%d keeps"
 msgstr[0] "%d བདག་འཛིན་སྦེ་བཞག"
 
-#: src/broken_indicator.cc:409
+#: src/broken_indicator.cc:412
 #, c-format
 msgid "%d upgrade"
 msgid_plural "%d upgrades"
 msgstr[0] "%d ཡར་བསྐྱེད་འབད།"
 
-#: src/broken_indicator.cc:419
+#: src/broken_indicator.cc:422
 #, c-format
 msgid "%d downgrade"
 msgid_plural "%d downgrades"
@@ -590,22 +590,22 @@
 #. TRANSLATORS: %F is replaced with a comma separated list such as
 #. "n1 installs, n2 removals", ...
 #. 
-#: src/broken_indicator.cc:430
+#: src/broken_indicator.cc:433
 #, c-format
 msgid "Suggest %F"
 msgstr "%F གི་བསམ་འཆར་བཀོད།"
 
-#: src/cmdline/cmdline_action.cc:55
+#: src/cmdline/cmdline_action.cc:54
 #, c-format
 msgid "Unable to find the source package for \"%s\".\n"
 msgstr ""
 
-#: src/cmdline/cmdline_action.cc:212
+#: src/cmdline/cmdline_action.cc:211
 #, c-format
 msgid "Unable to satisfy the build-depends: %s.\n"
 msgstr ""
 
-#: src/cmdline/cmdline_action.cc:249
+#: src/cmdline/cmdline_action.cc:248
 #, c-format
 msgid ""
 "Note: \"%s\", providing the virtual package\n"
@@ -614,7 +614,7 @@
 "དྲན་འཛིན:\"%s\", བར་ཅུ་ཡལ་ཐུམ་སྒྲིལ་དེ་བྱིན་དོ།\n"
 "      \"%s\",ཧེ་མ་ལས་གཞི་བཙུགས་འབད་དེ་ཡོད།.\n"
 
-#: src/cmdline/cmdline_action.cc:257
+#: src/cmdline/cmdline_action.cc:256
 #, c-format
 msgid ""
 "Note: \"%s\", providing the virtual package\n"
@@ -623,7 +623,7 @@
 "དྲན་འཛིན:\"%s\", བར་ཅུ་ཡལ་ཐུམ་སྒྲིལ་དེ་བྱིན་དོ།\n"
 "      \"%s\", ཧེ་མ་ལས་གཞི་བཙུགས་འབད་ནི་ཨིན་པས།\n"
 
-#: src/cmdline/cmdline_action.cc:280
+#: src/cmdline/cmdline_action.cc:279
 #, c-format
 msgid ""
 "\"%s\" exists in the package database, but it is not a\n"
@@ -632,17 +632,17 @@
 "\"%s\" ཐུམ་སྒྲིལ་གནད་སྡུད་གཞི་རྟེན་དེ་ནང་ལུ་བྱུངམ་ཨིན་ དེ་འབདཝ་ད་\n"
 "ཐུམ་སྒྲིལ་ངོ་མ་མེན་པའི་ཁར་ ཐུམ་སྒྲིལ་ག་གིས་ཡང་འ་ནི་དེ་མི་བྱིན་དོ་ཡོདཔ་ཨིན།\n"
 
-#: src/cmdline/cmdline_action.cc:288
+#: src/cmdline/cmdline_action.cc:287
 #, c-format
 msgid "\"%s\" is a virtual package provided by:\n"
 msgstr "\"%s\"དེ་ གིས་བྱིན་མི་ བར་ཅུ་ཡལ་ཐུམ་སྒྲིལ་ཅིག་ཨིན:\n"
 
-#: src/cmdline/cmdline_action.cc:291
+#: src/cmdline/cmdline_action.cc:290
 #, c-format
 msgid "You must choose one to install.\n"
 msgstr "གཞི་བཙུགས་འབད་ནིའི་དོན་ལུ་ ཁྱོད་ཀྱིས་གཅིག་གདམ་ཁ་བརྐྱབ་དགོཔ་ཨིན།\n"
 
-#: src/cmdline/cmdline_action.cc:299
+#: src/cmdline/cmdline_action.cc:298
 #, c-format
 msgid ""
 "Note: selecting \"%s\" instead of the\n"
@@ -650,55 +650,55 @@
 msgstr ""
 "དྲན་འཛིན:  \"%s\"དེ་ བར་ཅུ་ཡལ་ཐུམ་སྒྲིལ་ གྱི་ཚབ་ལུ་སེལ་འཐུ་འབད་དོ། \"%s\"\n"
 
-#: src/cmdline/cmdline_action.cc:321
+#: src/cmdline/cmdline_action.cc:320
 #, c-format
 msgid "%s is already installed at the requested version (%s)\n"
 msgstr "%s དེ་ ཞུ་བ་ཕུལ་ཡོད་པའི་ཐོན་རིམ་(%s)གུར་ ཧེ་མ་ལས་འདུག\n"
 
-#: src/cmdline/cmdline_action.cc:331
+#: src/cmdline/cmdline_action.cc:329
 #, c-format
 msgid "%s is not currently installed, so it will not be upgraded.\n"
 msgstr ""
 
-#: src/cmdline/cmdline_action.cc:335
+#: src/cmdline/cmdline_action.cc:334
 #, c-format
 msgid ""
 "%s is already installed at the latest version, so it will not be upgraded.\n"
 msgstr ""
 
-#: src/cmdline/cmdline_action.cc:341
+#: src/cmdline/cmdline_action.cc:340
 #, c-format
 msgid "%s is not currently installed, so it will not be reinstalled.\n"
 msgstr ""
 "%s ད་ལྟོ་གཞི་བཙུགས་མ་འབད་བས། དེ་འབདཝ་ལས་ འ་ནི་དེ་སླར་གཞི་བཙུགས་མི་འབད།\n"
 
-#: src/cmdline/cmdline_action.cc:349 src/cmdline/cmdline_action.cc:356
+#: src/cmdline/cmdline_action.cc:348
 #, c-format
 msgid "Package %s is not installed, so it will not be removed\n"
 msgstr ""
 "ཐུམ་སྒྲིལ་ %s དེ་གཞི་བཙུགས་མ་འབད་བས། དེ་འབདཝ་ལས་ འ་ནི་དེ་རྩ་བསྐྲད་མི་གཏང་།\n"
 
-#: src/cmdline/cmdline_action.cc:375
+#: src/cmdline/cmdline_action.cc:380
 #, c-format
 msgid "Package %s is not installed, cannot forbid an upgrade\n"
 msgstr ""
 "ཐུམ་སྒྲིལ་ %s དེ་གཞི་བཙུགས་མ་འབད་བར་ཡོདཔ་ལས་ "
 "ཡར་བསྐྱེད་དེ་བཀག་དམ་འབད་མི་ཚུགས།\n"
 
-#: src/cmdline/cmdline_action.cc:378
+#: src/cmdline/cmdline_action.cc:383
 #, c-format
 msgid "Package %s is not upgradable, cannot forbid an upgrade\n"
 msgstr ""
 "ཐུམ་སྒྲིལ་ %s དེ་ཡར་བསྐྱེད་མ་འབད་བར་ཡོདཔ་ལས་ "
 "ཡར་བསྐྱེད་དེ་བཀག་དམ་འབད་མི་ཚུགས།\n"
 
-#: src/cmdline/cmdline_action.cc:483
+#: src/cmdline/cmdline_action.cc:488
 #, c-format
 msgid "Note: selecting the task \"%s: %s\" for installation\n"
 msgstr ""
 "དྲན་འཛིན: གཞིི་བཙུགས་ཀྱི་དོན་ལུ་ ལཱ་གཡོག ་\"%s: %s\" དེ་སེལ་འཐུ་འབད་དོ།\n"
 
-#: src/cmdline/cmdline_action.cc:513
+#: src/cmdline/cmdline_action.cc:518
 #, c-format
 msgid ""
 "You can only specify a package version with an 'install' command or a "
@@ -707,14 +707,14 @@
 "ཁྱོད་ཀྱིས་ཐུམ་སྒྲིལ་ཐོན་རིམ་དེ་ 'install' བརྡ་བཀོད་ཡང་ན་ 'forbid-version' "
 "བརྡ་བཀོད་དང་གཅིག་ཁར་རྐྱངམ་ཅིག་གསལ་བཀོཀད་འབད་ཚུགས།\n"
 
-#: src/cmdline/cmdline_action.cc:522
+#: src/cmdline/cmdline_action.cc:527
 #, c-format
 msgid "You can only specify a package archive with an 'install' command.\n"
 msgstr ""
 "ཁྱོད་ཀྱིས་ ཐུམ་སྒྲིལ་ཡིག་མཛོད་དེ་ 'install' "
 "བརྡ་བཀོད་དང་གཅིག་ཁར་རྐྱངམ་ཅིག་གསལ་བཀོད་འབད་ཚུགས།\n"
 
-#: src/cmdline/cmdline_action.cc:560
+#: src/cmdline/cmdline_action.cc:559
 #, c-format
 msgid ""
 "Couldn't find package \"%s\", and more than 40\n"
@@ -723,7 +723,7 @@
 "ཐུམ་སྒྲིལ་ \"%s\",དེ་ཐོབ་མ་ཚུགས། ༤༠་ལས་ལྷག་པའི་ \n"
 "ཐུམ་སྒྲིལ་ཚུ་གི་མིང་ནང་ལུ་ \"%s\" དེ་ཡོདཔ་ཨིན།\n"
 
-#: src/cmdline/cmdline_action.cc:563
+#: src/cmdline/cmdline_action.cc:571
 #, c-format
 msgid ""
 "Couldn't find package \"%s\".  However, the following\n"
@@ -732,14 +732,14 @@
 "ཐུམ་སྒྲིལ་་\"%s\" དེ་ཐོབ་མ་ཚུགས། ཨིན་རུང་ འོག་གི་\n"
 "ཐུམ་སྒྲིལ་ཚུ་གི་མིང་ནང་ལུ་ \"%s\"དེ་ཡོདཔ་ཨིན:\n"
 
-#: src/cmdline/cmdline_action.cc:585
+#: src/cmdline/cmdline_action.cc:593
 #, c-format
 msgid "Couldn't find any package whose name or description matched \"%s\"\n"
 msgstr ""
 "ཐུམ་སྒྲིལ་གྱི་མིིང་ཡང་ན་ འགྲེལ་བཤད་ཀྱིས་ \"%s\" "
 "དང་མཐུན་སྒྲིག་ཡོད་མི་ག་ཡང་མ་ཐོབ།\n"
 
-#: src/cmdline/cmdline_action.cc:587
+#: src/cmdline/cmdline_action.cc:586
 #, c-format
 msgid ""
 "Couldn't find any package matching \"%s\", and more than 40\n"
@@ -749,7 +749,7 @@
 "ཐུམ་སྒྲིལ་༤༠་ལས་ལྷག་ཙམ་ཅིག་གི་\n"
 "འགྲེལ་བཤད་ནང་ལུ་\"%s\"་དེ་ཡོདཔ་ཨིན།\n"
 
-#: src/cmdline/cmdline_action.cc:590
+#: src/cmdline/cmdline_action.cc:600
 #, c-format
 msgid ""
 "Couldn't find any package matching \"%s\".  However, the following\n"
@@ -758,82 +758,82 @@
 "\"%s\"དང་མཐུན་སྒྲིག་ཡོད་མི་ཐུམ་སྒྲིལ་ཅིག་ཡང་མ་ཐོབ། ཨིན་རུང་ འོག་གི་ \n"
 "ཐུམ་སྒྲིག་ཚུ་གི་འགྲེལ་བཤད་ཚུ་ནང་ལུ་ \"%s\" ཡོདཔ་ཨིན:\n"
 
-#: src/cmdline/cmdline_action.cc:732
+#: src/cmdline/cmdline_action.cc:742
 #, c-format
 msgid "Bad action character '%c'\n"
 msgstr "ཡིག་འབྲུའིི་བྱ་བ་བྱང་ཉེས།'%c'\n"
 
-#: src/cmdline/cmdline_changelog.cc:134
-#: src/cmdline/cmdline_download_progress_display.cc:131
+#: src/cmdline/cmdline_changelog.cc:131
+#: src/cmdline/cmdline_download_progress_display.cc:138
 msgid "Get:"
 msgstr "ལེན:"
 
 #. TRANSLATORS: this stands for "error" and should be the
 #. same width as the translation of "Ign".
-#: src/cmdline/cmdline_changelog.cc:144
-#: src/cmdline/cmdline_download_progress_display.cc:185
+#: src/cmdline/cmdline_changelog.cc:141
+#: src/cmdline/cmdline_download_progress_display.cc:192
 msgid "Err"
 msgstr ""
 
-#: src/cmdline/cmdline_changelog.cc:177
+#: src/cmdline/cmdline_changelog.cc:174
 #, c-format
 msgid "Changelog download failed: %s"
 msgstr ""
 
-#: src/cmdline/cmdline_changelog.cc:296
+#: src/cmdline/cmdline_changelog.cc:293
 msgid "Can't execute sensible-pager, is this a working Debian system?"
 msgstr ""
 "དྲན་ཤེས་ཅན་གྱི་ཤོག་ལེབ་པ་དེ་ ལག་ལེན་འཐབ་མ་ཚུགས། "
 "འ་ནི་འདི་ལཱ་གཡོག་འབད་ནིའི་ཌེ་བེ་ཡན་རིམ་ལུགས་ཨིན་ན?"
 
-#: src/cmdline/cmdline_changelog.cc:347
+#: src/cmdline/cmdline_changelog.cc:344
 #, c-format
 msgid "%s is not an official Debian package, cannot display its changelog."
 msgstr ""
 "%s དེ་གཞུང་འབྲེལ་གྱི་ཌེ་བི་ཡཱན་ཐུམ་སྒྲིལ་ཅིག་མེནམ་ལས་ "
 "དེ་གི་བསྒྱུར་བཅོས་དྲན་དེབ་བཀྲམ་སྟོན་འབད་མི་ཚུགས།"
 
-#: src/cmdline/cmdline_changelog.cc:408
+#: src/cmdline/cmdline_changelog.cc:405
 #, c-format
 msgid "Couldn't find a changelog for %s"
 msgstr "%s གི་དོན་ལུ་ བསྒྱུར་བཅོས་དྲན་དེབ་ཐོབ་མ་ཚུགས།"
 
-#: src/cmdline/cmdline_changelog.cc:412
+#: src/cmdline/cmdline_changelog.cc:409
 #, c-format
 msgid "Couldn't run pager %s"
 msgstr ""
 
-#: src/cmdline/cmdline_clean.cc:60
+#: src/cmdline/cmdline_clean.cc:62
 #, c-format
 msgid "E: The clean command takes no arguments\n"
 msgstr "ཨི: བརྡ་བཀོད་རྩ་བ་ལས་སྒྲུབ་རྟགས་མི་འབག\n"
 
-#: src/cmdline/cmdline_clean.cc:66
+#: src/cmdline/cmdline_clean.cc:68
 #, c-format
 msgid "Del %s* %spartial/*\n"
 msgstr "%s* %spartial/* བཏོན་གཏང་།\n"
 
-#: src/cmdline/cmdline_clean.cc:76 src/cmdline/cmdline_clean.cc:146
-#: src/ui.cc:1788 src/ui.cc:1876
+#: src/cmdline/cmdline_clean.cc:78 src/cmdline/cmdline_clean.cc:149
+#: src/ui.cc:1811 src/ui.cc:1899
 msgid "Unable to lock the download directory"
 msgstr ""
 
-#: src/cmdline/cmdline_clean.cc:106
+#: src/cmdline/cmdline_clean.cc:108
 #, c-format
 msgid "Del %s %s [%sB]\n"
 msgstr "%s %s [%sB] བཏོན་གཏང་།\n"
 
-#: src/cmdline/cmdline_clean.cc:134
+#: src/cmdline/cmdline_clean.cc:137
 #, c-format
 msgid "E: The autoclean command takes no arguments\n"
 msgstr "ཨི:རང་བཞིན་ཡང་དག་བརྡ་བཀོད་གིས་སྒྲུབ་རྟགས་མི་འབག\n"
 
-#: src/cmdline/cmdline_clean.cc:172
+#: src/cmdline/cmdline_clean.cc:175
 #, c-format
 msgid "Would free %sB of disk space\n"
 msgstr "ཌིཀསི་བར་སྟོང་ %sབི་ རང་དབང་སྦེེ་བཞག་ནིའི་གོ་སྐབས་ཡོད།\n"
 
-#: src/cmdline/cmdline_clean.cc:175
+#: src/cmdline/cmdline_clean.cc:178
 #, c-format
 msgid "Freed %sB of disk space\n"
 msgstr "ཌིཀསི་བར་སྟོང་གི་་%sབི་ རང་དབང་སབེ་བཞག་ནུག\n"
@@ -854,8 +854,8 @@
 "Unable to safely resolve dependencies, try running with --full-resolver.\n"
 msgstr ""
 
-#: src/cmdline/cmdline_do_action.cc:385 src/cmdline/cmdline_simulate.cc:60
-#: src/main.cc:1223
+#: src/cmdline/cmdline_do_action.cc:385 src/cmdline/cmdline_simulate.cc:59
+#: src/main.cc:1267
 #, c-format
 msgid "Abort.\n"
 msgstr "བར་བཤོལ།\n"
@@ -886,58 +886,58 @@
 "%s ཐོན་རིམ་ %s དེ་གི་དོན་ལུ་ ཕབ་ལེན་འབད་བཏུབ་པའི་ཡིག་སྣོད་ཚུ་མིན་འདུག; "
 "ཡང་ཅིན་འ་ནི་དེ་ ཉེ་གནས་ཡང་ན་ ཕན་མེད་ཐུམ་སྒྲིལ་ཚུ་ཨིན་ན?"
 
-#: src/cmdline/cmdline_download_progress_display.cc:154
+#: src/cmdline/cmdline_download_progress_display.cc:161
 msgid "Hit"
 msgstr ""
 
 #. TRANSLATORS: this stands for "ignored" and should be
 #. the same width as the translation of "Err".
-#: src/cmdline/cmdline_download_progress_display.cc:181
+#: src/cmdline/cmdline_download_progress_display.cc:188
 msgid "Ign"
 msgstr ""
 
-#: src/cmdline/cmdline_download_progress_display.cc:211
+#: src/cmdline/cmdline_download_progress_display.cc:218
 #, c-format
 msgid "Fetched %sB in %s (%sB/s)"
 msgstr ""
 
-#: src/cmdline/cmdline_download_progress_display.cc:230
+#: src/cmdline/cmdline_download_progress_display.cc:237
 #, c-format
 msgid ""
 "Media change: Please insert the disc labeled '%s' into the drive '%s' and "
 "press [Enter]."
 msgstr ""
 
-#: src/cmdline/cmdline_download_progress_display.cc:436
+#: src/cmdline/cmdline_download_progress_display.cc:491
 msgid "[Working]"
 msgstr ""
 
-#: src/cmdline/cmdline_extract_cache_subset.cc:57
+#: src/cmdline/cmdline_extract_cache_subset.cc:58
 #, c-format
 msgid ""
 "extract-cache-entries: at least one argument is required (the directory\n"
 "to which to write files).\n"
 msgstr ""
 
-#: src/cmdline/cmdline_extract_cache_subset.cc:93
-#: src/cmdline/cmdline_resolver.cc:361 src/cmdline/cmdline_user_tag.cc:131
-#: src/cmdline/cmdline_versions.cc:295
+#: src/cmdline/cmdline_extract_cache_subset.cc:94
+#: src/cmdline/cmdline_resolver.cc:356 src/cmdline/cmdline_user_tag.cc:132
+#: src/cmdline/cmdline_versions.cc:312
 #, c-format
 msgid "No such package \"%s\""
 msgstr "\"%s\" བཟུམ་གྱི་ཐུམ་སྒྲིལ་མེད།"
 
-#: src/cmdline/cmdline_extract_cache_subset.cc:133
+#: src/cmdline/cmdline_extract_cache_subset.cc:134
 #, c-format
 msgid ""
 "No packages were selected by the given search pattern; nothing to do.\n"
 msgstr ""
 
-#: src/cmdline/cmdline_forget_new.cc:56
+#: src/cmdline/cmdline_forget_new.cc:58
 #, c-format
 msgid "E: The forget-new command takes no arguments\n"
 msgstr "ཨི:བརྗེད་པའི་ བརྡ་བཀོད་གསརཔ་དེ་གིས་སྒྲུབ་རྟགས་མི་འབག\n"
 
-#: src/cmdline/cmdline_forget_new.cc:83
+#: src/cmdline/cmdline_forget_new.cc:85
 #, c-format
 msgid "Would forget what packages are new\n"
 msgstr "ཐུམ་སྒྲིལ་ཚུ་ག་ཆི་གསརཔ་ཨིན་ན་ སེམས་ཁར་ལས་བརྗེད་ནིའི་ཉེན་ཁ་ཡོད།\n"
@@ -982,13 +982,13 @@
 msgid "What is it?  It's an elephant being eaten by a snake, of course.\n"
 msgstr "འདི་ག་ཅི་སྨོ? འདི་སྦུལ་གྱིས་ཟ་ཟ་བའི་གླངམོ་ཆེ་ཨིན་པས།\n"
 
-#: src/cmdline/cmdline_progress_display.cc:168 src/gtk/download.cc:204
+#: src/cmdline/cmdline_progress_display.cc:165 src/gtk/download.cc:204
 msgid "Done"
 msgstr ""
 
 #. TRANSLATORS: the string replacing "DONE"
 #. be truncated or padded to 4 characters.
-#: src/cmdline/cmdline_progress_display.cc:173
+#: src/cmdline/cmdline_progress_display.cc:170
 msgid "DONE"
 msgstr ""
 
@@ -1049,17 +1049,17 @@
 msgid "The following partially installed packages will be configured:"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:459 src/ui.cc:1575
+#: src/cmdline/cmdline_prompt.cc:459 src/ui.cc:1598
 #, c-format
 msgid "The following ESSENTIAL packages will be REMOVED!\n"
 msgstr "འོག་ལུ་ཡོད་མི་་ཉེར་མཁོའི་ཐུམ་སྒྲིལ་ཚུ་རྩ་བསྐྲད་གཏངའོང་!\n"
 
-#: src/cmdline/cmdline_prompt.cc:468 src/ui.cc:1590
+#: src/cmdline/cmdline_prompt.cc:468 src/ui.cc:1613
 #, c-format
 msgid "The following ESSENTIAL packages will be BROKEN by this action:\n"
 msgstr "འོག་ལུ་ཡོད་མི་་ཉེར་མཁོའི་ཐུམ་སྒྲིལ་ཚུ་ བྱ་བ་འདི་གིས་བཅག་གཏང་འོང་\n"
 
-#: src/cmdline/cmdline_prompt.cc:478 src/ui.cc:1603
+#: src/cmdline/cmdline_prompt.cc:478 src/ui.cc:1626
 #, c-format
 msgid ""
 "WARNING: Performing this action will probably cause your system to break!\n"
@@ -1073,7 +1073,7 @@
 msgid "I am aware that this is a very bad idea"
 msgstr "འདི་གནས་སྐབས་གནམ་མེད་ས་མེད་བྱང་ཉེས་ཅིག་ཨིན་པས་ཟེར་ང་གིས་ཤེས།"
 
-#: src/cmdline/cmdline_prompt.cc:484 src/ui.cc:1604
+#: src/cmdline/cmdline_prompt.cc:484 src/ui.cc:1627
 #, c-format
 msgid "To continue, type the phrase \"%s\":\n"
 msgstr "འཕྲོ་མཐུད་ནིའི་དོན་ལུ་ ཚིག་ཚན་\"%s\"དེ་ཡིག་དཔར་རྐྱབས།:\n"
@@ -1147,65 +1147,65 @@
 "ངོས་འཛིནམ་འབད་བར་ཡོད་མི་ ཨིན་པུཊི།  \"%s\" ཡང་ན་ \"%s\" "
 "གཉིས་ལས་ག་འབད་རུང་ཅིག་ཐོ་བཀོདའབད།\n"
 
-#: src/cmdline/cmdline_prompt.cc:707
+#: src/cmdline/cmdline_prompt.cc:705
 #, c-format
 msgid "The following packages are RECOMMENDED but will NOT be installed:\n"
 msgstr ""
 "འོག་ལུ་ཡོད་མི་ཐུམ་སྒྲིལ་ཚུ་འོས་སྦྱོར་འབད་ནུག དེ་འབདཝ་ད་ གཞི་བཙུགས་མི་འབད:\n"
 
-#: src/cmdline/cmdline_prompt.cc:713
+#: src/cmdline/cmdline_prompt.cc:711
 #, c-format
 msgid "The following packages are SUGGESTED but will NOT be installed:\n"
 msgstr ""
 "འོག་ལུ་ཡོད་མི་ཐུམ་སྒྲིལ་ཚུ་བསམ་འཆར་བཀོད་ཚར་མི་ཚུ་ཨིན་ དེ་འབདཝ་ད་ "
 "གཞི་བཙུགས་མི་འབད:\n"
 
-#: src/cmdline/cmdline_prompt.cc:719
+#: src/cmdline/cmdline_prompt.cc:717
 #, c-format
 msgid "No packages will be installed, upgraded, or removed.\n"
 msgstr "ཐུམ་སྒྲིལ་ཚུ་གཞི་བཙུགས་དང་ ཡར་བསྐྱེད་ ཡང་ན་ རྩ་བསྐྲད་གཏང་འོང་།\n"
 
-#: src/cmdline/cmdline_prompt.cc:721
+#: src/cmdline/cmdline_prompt.cc:719
 #, c-format
 msgid "%lu packages upgraded, %lu newly installed, "
 msgstr "%lu ཐུམ་སྒྲིལ་ཚུ་ཡར་བསྐྱེད་འབད་ཡོདཔ། %lu གསརཔ་གཞི་བཙུགས་འབད་ཡོདཔ། "
 
-#: src/cmdline/cmdline_prompt.cc:725
+#: src/cmdline/cmdline_prompt.cc:723
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "%lu སླར་གཞི་བཙུགས་འབད་ཡོདཔ། "
 
-#: src/cmdline/cmdline_prompt.cc:727
+#: src/cmdline/cmdline_prompt.cc:725
 #, c-format
 msgid "%lu downgraded, "
 msgstr "%lu་མར་ཕབ་འབད་ཡོདཔ། "
 
-#: src/cmdline/cmdline_prompt.cc:729
+#: src/cmdline/cmdline_prompt.cc:727
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr "རྩ་བསྐྲད་འབད་ནི་གི་ %lu དང་ %lu ཡར་བསྐྱེད་མ་འབད་བར་ཡོདཔ།\n"
 
-#: src/cmdline/cmdline_prompt.cc:736
+#: src/cmdline/cmdline_prompt.cc:734
 #, c-format
 msgid "Need to get %sB/%sB of archives. "
 msgstr "ཡིག་མཛོད་ཚུ་གི་%sB/%sB དེ་ལེན་དགོཔ་ཨིན། "
 
-#: src/cmdline/cmdline_prompt.cc:739
+#: src/cmdline/cmdline_prompt.cc:737
 #, c-format
 msgid "Need to get %sB of archives. "
 msgstr "ཡིག་མཛོད་ཚུ་གི་%sB ལེན་དགོཔ་ཨིན། "
 
-#: src/cmdline/cmdline_prompt.cc:746
+#: src/cmdline/cmdline_prompt.cc:744
 #, c-format
 msgid "After unpacking %sB will be used.\n"
 msgstr "སྒམ་བཤུབ་ཚར་ཞིནམ་ལས་ %sB དེ་ལག་ལེན་འཐབ་འོང་།\n"
 
-#: src/cmdline/cmdline_prompt.cc:749
+#: src/cmdline/cmdline_prompt.cc:747
 #, c-format
 msgid "After unpacking %sB will be freed.\n"
 msgstr "སྒམ་བཤུབ་ཚར་ཞིནམ་ལས་%sBདེ་རང་དབང་སྦེ་བཞག་འོང་།\n"
 
-#: src/cmdline/cmdline_prompt.cc:771
+#: src/cmdline/cmdline_prompt.cc:769
 #, c-format
 msgid ""
 "No packages to show -- enter the package names on the line after 'i'.\n"
@@ -1213,49 +1213,49 @@
 "ཐུམ་སྒྲིལ་ཚུ་སྟོན་ནི་མེད --  'i' "
 "གི་ཤུལ་ལས་གྲལ་ཐིག་གུར་ཐུམ་སྒྲིལ་ཚུ་གི་མིང་ཐོབཀད་འབད།\n"
 
-#: src/cmdline/cmdline_prompt.cc:777 src/cmdline/cmdline_prompt.cc:792
-#: src/pkg_item.cc:411 src/ui.cc:1220
+#: src/cmdline/cmdline_prompt.cc:775 src/cmdline/cmdline_prompt.cc:790
+#: src/pkg_item.cc:407 src/ui.cc:1243
 msgid "Press Return to continue."
 msgstr "འཕྲོ་མཐུད་ནིའི་དོན་ལུ་ སལར་ལལོག་ལུ་ཨེབ་གཏང་འབད།"
 
-#: src/cmdline/cmdline_prompt.cc:788
+#: src/cmdline/cmdline_prompt.cc:786
 #, c-format
 msgid "No packages found -- enter the package names on the line after 'c'.\n"
 msgstr ""
 "ཐུམ་སྒྲིལ་ཚུ་མ་ཐོབ་་--  "
 "'c'་གི་ཤུལ་ལས་གྲལ་ཐིག་གུར་ཐུམ་སྒྲིལ་དེ་གི་ཚུ་མིང་ཚུ་ཐོ་བཀོད་འབད།\n"
 
-#: src/cmdline/cmdline_prompt.cc:803
+#: src/cmdline/cmdline_prompt.cc:801
 #, c-format
 msgid ""
 "No packages found -- enter zero or more roots of the search followed by the "
 "package to justify.\n"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:836
+#: src/cmdline/cmdline_prompt.cc:834
 #, c-format
 msgid "y: %F"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:838
+#: src/cmdline/cmdline_prompt.cc:836
 msgid "continue with the installation"
 msgstr "གཞི་བཙུགས་དེ་འཕྲོ་མཐུད་འབད།"
 
-#: src/cmdline/cmdline_prompt.cc:840
+#: src/cmdline/cmdline_prompt.cc:838
 #, c-format
 msgid "n: %F"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:842
+#: src/cmdline/cmdline_prompt.cc:840
 msgid "abort and quit"
 msgstr "བར་བཤོལ་དང་གཤག་ནི།"
 
-#: src/cmdline/cmdline_prompt.cc:844
+#: src/cmdline/cmdline_prompt.cc:842
 #, c-format
 msgid "i: %F"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:846
+#: src/cmdline/cmdline_prompt.cc:844
 msgid ""
 "show information about one or more packages; the package names should follow "
 "the 'i'"
@@ -1263,12 +1263,12 @@
 "གཅིག་ཡང་ན་ དེ་ལས་ལྷག་སྟེ་ཡོད་མི་ཐུམ་སྒྲིལ་ཚུ་གི་སྐོར་ལས་བརྡ་དོན་ཚུ་སྟོན: "
 "ཐུམ་སྒྲིལ་མིང་དེ་གིས་ 'i' གི་རྗེས་སུ་འབྲངས་དགོཔ་ཨིན།"
 
-#: src/cmdline/cmdline_prompt.cc:848
+#: src/cmdline/cmdline_prompt.cc:846
 #, c-format
 msgid "c: %F"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:850
+#: src/cmdline/cmdline_prompt.cc:848
 msgid ""
 "show the Debian changelogs of one or more packages; the package names should "
 "follow the 'c'"
@@ -1277,64 +1277,64 @@
 "བསྒྱུར་བཅོས་དྲན་དེབ་ཚུ་སྟོན; ཐུམ་སྒྲིལ་མིང་དེ་གིས་ "
 "'c'་གི་རྗེས་སུ་འབྲངས་དགོཔ་ཨིན།"
 
-#: src/cmdline/cmdline_prompt.cc:852
+#: src/cmdline/cmdline_prompt.cc:850
 #, c-format
 msgid "d: %F"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:854
+#: src/cmdline/cmdline_prompt.cc:852
 msgid "toggle the display of dependency information"
 msgstr "རྟེན་འབྲེལ་བརྡ་དོན་གྱི་བཀྲམ་སྟོན་དེ་སོར་སྟོན་འབད།"
 
-#: src/cmdline/cmdline_prompt.cc:856
+#: src/cmdline/cmdline_prompt.cc:854
 #, c-format
 msgid "s: %F"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:858
+#: src/cmdline/cmdline_prompt.cc:856
 msgid "toggle the display of changes in package sizes"
 msgstr ""
 "བསྒྱུར་བཅོས་ཚུ་གི་བཀྲམ་སྟོན་དེ་ཐུམ་སྒྲིལ་ཚད་ཚུ་གི་ནང་ལུ་སོར་སྟོན་འབད།"
 
-#: src/cmdline/cmdline_prompt.cc:860
+#: src/cmdline/cmdline_prompt.cc:858
 #, c-format
 msgid "v: %F"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:862
+#: src/cmdline/cmdline_prompt.cc:860
 msgid "toggle the display of version numbers"
 msgstr "ཐོན་རིམ་ཨང་གྲངས་ཚུ་གི་བཀྲམ་སྟོན་དེ་སོར་སྟོན་འབད།"
 
-#: src/cmdline/cmdline_prompt.cc:864
+#: src/cmdline/cmdline_prompt.cc:862
 #, c-format
 msgid "w: %F"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:866
+#: src/cmdline/cmdline_prompt.cc:864
 msgid ""
 "try to find a reason for installing a single package, or explain why "
 "installing one package should lead to installing another package."
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:869
+#: src/cmdline/cmdline_prompt.cc:867
 #, c-format
 msgid "r: %F"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:871
+#: src/cmdline/cmdline_prompt.cc:869
 msgid "run the automatic dependency resolver to fix the broken dependencies."
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:873
+#: src/cmdline/cmdline_prompt.cc:871
 #, c-format
 msgid "e: %F"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:875
+#: src/cmdline/cmdline_prompt.cc:873
 msgid "enter the full visual interface"
 msgstr "མཐོང་བའི་ངོས་འདྲ་བ་ཆ་ཚང་དེ་ཐོ་བཀོད་འབད།"
 
-#: src/cmdline/cmdline_prompt.cc:878
+#: src/cmdline/cmdline_prompt.cc:876
 msgid ""
 "You may also specify modification to the actions which will be taken.  To do "
 "so, type an action character followed by one or more package names (or "
@@ -1348,52 +1348,52 @@
 "ཁྱོད་ཀྱིས་ཐོ་བཀོད་འབད་དེ་ཡོད་པའི་ཐུམ་སྒྲིལ་ཆ་མཉམ་ལུ་འཇུག་སྤྱོད་འབད་འོང་། "
 "འོག་ལུ་ཡོད་མི་བྱ་བ་ཚུ་འཐོབ་ཚུགས:"
 
-#: src/cmdline/cmdline_prompt.cc:885 src/cmdline/cmdline_resolver.cc:267
+#: src/cmdline/cmdline_prompt.cc:883 src/cmdline/cmdline_resolver.cc:262
 msgid "'+' to install packages"
 msgstr "ཐུམ་སྒྲིལ་ཚུ་གཞི་བཙུགས་འབད་ནིའི་དོན་ལུ '+'"
 
-#: src/cmdline/cmdline_prompt.cc:888 src/cmdline/cmdline_resolver.cc:269
+#: src/cmdline/cmdline_prompt.cc:886 src/cmdline/cmdline_resolver.cc:264
 msgid ""
 "'+M' to install packages and immediately flag them as automatically installed"
 msgstr ""
 "ཐུམ་སྒྲིལ་ཚུ་གཞི་བཙུགས་འབད་ནིའི་དོན་ལུ་ '+M' དང་ "
 "དེ་ཚུ་རང་བཞིན་གྱིས་གཞི་བཙུགས་འབད་དེ་ཡོད་དོ་བཟུམ་སྦེ་ དེ་འཕྲལ་ལས་ཟུར་རྟགས་བཀལ།"
 
-#: src/cmdline/cmdline_prompt.cc:890 src/cmdline/cmdline_resolver.cc:271
+#: src/cmdline/cmdline_prompt.cc:888 src/cmdline/cmdline_resolver.cc:266
 msgid "'-' to remove packages"
 msgstr "ཐུམ་སྒྲིལ་ཚུ་རྩ་བསྐྲད་གཏང་ནིའི་དོན་ལུ་ '-'"
 
-#: src/cmdline/cmdline_prompt.cc:892 src/cmdline/cmdline_resolver.cc:273
+#: src/cmdline/cmdline_prompt.cc:890 src/cmdline/cmdline_resolver.cc:268
 msgid "'_' to purge packages"
 msgstr "ཐུམ་སྒྲིལ་ཚུ་ཕྱིར་བསྐྲད་འབད་ནིའི་དོན་ལུ་ '_'"
 
-#: src/cmdline/cmdline_prompt.cc:894 src/cmdline/cmdline_resolver.cc:275
+#: src/cmdline/cmdline_prompt.cc:892 src/cmdline/cmdline_resolver.cc:270
 msgid "'=' to place packages on hold"
 msgstr "ཐུམ་སྒྲིལ་ཚུ་འཆང་ནིའི་གུར་ཞབག་ནིའི་དོན་ལུ་ '='"
 
-#: src/cmdline/cmdline_prompt.cc:896 src/cmdline/cmdline_resolver.cc:277
+#: src/cmdline/cmdline_prompt.cc:894 src/cmdline/cmdline_resolver.cc:272
 msgid ""
 "':' to keep packages in their current state without placing them on hold"
 msgstr ""
 "ཐུམ་སྒྲིལ་ཚུ་འཆང་ནིའི་གུར་མ་བཞག་པར་ཁོང་རའི་ད་ལྟོ་གི་གནས་ལུགས་གུར་བཞག་ནིའི་དོན"
 "་ལུ་ ':'"
 
-#: src/cmdline/cmdline_prompt.cc:898 src/cmdline/cmdline_resolver.cc:279
+#: src/cmdline/cmdline_prompt.cc:896 src/cmdline/cmdline_resolver.cc:274
 msgid "'&M' to mark packages as automatically installed"
 msgstr ""
 "རང་བཞིན་གྱིས་གཞི་བཙུགས་འབད་དེ་ཡོདཔ་བཟུམ་སྦེ་རྟགས་བཀལ་ནིའི་དོན་ལུ་ '&M'"
 
-#: src/cmdline/cmdline_prompt.cc:900 src/cmdline/cmdline_resolver.cc:281
+#: src/cmdline/cmdline_prompt.cc:898 src/cmdline/cmdline_resolver.cc:276
 msgid "'&m' to mark packages as manually installed"
 msgstr ""
 "ཐུམ་སྒྲིལ་ཚུ་ལག་ཐོག་ལས་གཞི་བཙུགས་འབད་དེ་ཡོདཔ་བཟུམ་སྦེ་རྟགས་བཀལ་ནིའི་དོན་ལུ་ "
 "'&m'"
 
-#: src/cmdline/cmdline_prompt.cc:902
+#: src/cmdline/cmdline_prompt.cc:900
 msgid "'&BD' to install the build-dependencies of a package."
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:905
+#: src/cmdline/cmdline_prompt.cc:903
 msgid ""
 "In the list of actions to be performed, some packages will be followed by "
 "one or more characters enclosed in braces; for instance: \"aptitude{u}\".  "
@@ -1401,53 +1401,53 @@
 "can include any combination of the following:"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:909
+#: src/cmdline/cmdline_prompt.cc:907
 msgid "'a': the package was automatically installed or removed."
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:911
+#: src/cmdline/cmdline_prompt.cc:909
 msgid ""
 "'b': some of the package's dependencies are violated by the proposed changes."
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:913
+#: src/cmdline/cmdline_prompt.cc:911
 msgid "'p': the package will be purged in addition to being removed."
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:915
+#: src/cmdline/cmdline_prompt.cc:913
 msgid "'u': the package is being removed because it is unused."
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:920
+#: src/cmdline/cmdline_prompt.cc:918
 msgid "Commands:"
 msgstr "བརྡ་བཀོད:"
 
-#: src/cmdline/cmdline_prompt.cc:1036
+#: src/cmdline/cmdline_prompt.cc:1034
 msgid ""
 "aptitude failed to find a solution to these dependencies.  You can solve "
 "them yourself by hand or type 'n' to quit."
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:1055
+#: src/cmdline/cmdline_prompt.cc:1053
 msgid "Do you want to continue? [Y/n/?] "
 msgstr "ཁྱོད་ཀྱིས་འཕྲོ་མཐུད་འབད་ནི་ཨིན་ན་? [Y/n/?] "
 
-#: src/cmdline/cmdline_prompt.cc:1056
+#: src/cmdline/cmdline_prompt.cc:1054
 msgid "Resolve these dependencies by hand? [N/+/-/_/:/?] "
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:1074
+#: src/cmdline/cmdline_prompt.cc:1072
 msgid "Invalid response.  Please enter a valid command or '?' for help.\n"
 msgstr ""
 "ནུས་མེད་ལན། གྲོགས་རམ་གྱི་དོན་ལུ་ནུས་ཅན་བརྡ་བཀོད་ཡང་ན་ '?' ཅིག་ཐོ་བཀོད་འབད།\n"
 
-#: src/cmdline/cmdline_prompt.cc:1080
+#: src/cmdline/cmdline_prompt.cc:1078
 msgid ""
 "Enter a package management command (such as '+ package' to install a "
 "package), 'R' to attempt automatic dependency resolution or 'N' to abort."
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:1112
+#: src/cmdline/cmdline_prompt.cc:1110
 #, c-format
 msgid ""
 "\n"
@@ -1458,7 +1458,7 @@
 "རྟེན་འབྲེལ་བྲད་དོན་དེ་སྟོན་འོང་།\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:1114
+#: src/cmdline/cmdline_prompt.cc:1112
 #, c-format
 msgid ""
 "\n"
@@ -1469,7 +1469,7 @@
 "རྟེན་འབྲེལ་བརྡ་དོན་དེ་སྟོན་འོང་།\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:1120
+#: src/cmdline/cmdline_prompt.cc:1118
 #, c-format
 msgid ""
 "\n"
@@ -1480,7 +1480,7 @@
 "ཐོན་རིམ་དེ་སྟོན་འོང་།\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:1122
+#: src/cmdline/cmdline_prompt.cc:1120
 #, c-format
 msgid ""
 "\n"
@@ -1491,7 +1491,7 @@
 "ཐོབ་རིམ་དེ་སྟོན་འོང་།\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:1127
+#: src/cmdline/cmdline_prompt.cc:1125
 #, c-format
 msgid ""
 "\n"
@@ -1502,7 +1502,7 @@
 "ཚད་ཀྱི་བསྒྱུར་བཅོས་ཚུ་སྟོན་འོང།\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:1129
+#: src/cmdline/cmdline_prompt.cc:1127
 #, c-format
 msgid ""
 "\n"
@@ -1513,92 +1513,92 @@
 "ཚད་ཀྱི་བསྒྱུར་བཅོས་ཚུ་སྟོན་འོང་།\n"
 "\n"
 
-#: src/cmdline/cmdline_resolver.cc:149 src/cmdline/cmdline_resolver.cc:1002
-#: src/generic/apt/apt.cc:289
+#: src/cmdline/cmdline_resolver.cc:144 src/cmdline/cmdline_resolver.cc:997
+#: src/generic/apt/apt.cc:269
 #, c-format
 msgid "Unable to open %s for writing"
 msgstr "འབྲི་ནིའི་དོན་ལུ་ %s་དེ་ཁ་ཕྱེ་མ་ཚུགས།"
 
-#: src/cmdline/cmdline_resolver.cc:155 src/cmdline/cmdline_resolver.cc:1007
+#: src/cmdline/cmdline_resolver.cc:150 src/cmdline/cmdline_resolver.cc:1002
 #, c-format
 msgid "Error writing resolver state to %s"
 msgstr "%s མོས་མཐུན་པའི་གནས་ལུགས་འབྲི་ནི་ལུ་ འཛོལ་བ་འདུག"
 
-#: src/cmdline/cmdline_resolver.cc:157 src/cmdline/cmdline_resolver.cc:1009
+#: src/cmdline/cmdline_resolver.cc:152 src/cmdline/cmdline_resolver.cc:1004
 msgid "Resolver state successfully written!"
 msgstr "མོས་མཐུན་པའི་གནས་ལུགས་དེ་མཐར་འཁོལ་ཅན་སྦེ་བྲི་ཡི!"
 
-#: src/cmdline/cmdline_resolver.cc:222
+#: src/cmdline/cmdline_resolver.cc:217
 #, c-format
 msgid ""
 "y: %Fn: %Fq: %F.: %F,: %Fo: %Fe: %Fx: %Fr (ID|pkg ver) ...: %F%na (ID|pkg "
 "ver) ...: %F%n<ID>: %F%n<ACTION> pkg... : %F%n%F%F%F%F%F%F%F%F"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:243
+#: src/cmdline/cmdline_resolver.cc:238
 msgid "accept the proposed changes"
 msgstr "གྲོས་འཆར་བཀོད་ཡོད་པའི་བསྒྱུར་བཅོས་ཚུ་དང་ལེན་འབད།"
 
-#: src/cmdline/cmdline_resolver.cc:245
+#: src/cmdline/cmdline_resolver.cc:240
 msgid "reject the proposed changes and search for another solution"
 msgstr ""
 "གྲོས་འཆར་བཀོད་ཡོད་པའི་བསྒྱུར་བཅོས་ཚུ་དང་ལེན་སྤང་སྟེ་ "
 "ཐབས་ཤེས་གཞན་མི་འཚོལ་ཞིབ་འབད།"
 
-#: src/cmdline/cmdline_resolver.cc:247
+#: src/cmdline/cmdline_resolver.cc:242
 msgid "give up and quit the program"
 msgstr "བཀོག་བཞག་སྦེ་ལས་རིམ་དེ་སྤང་།"
 
-#: src/cmdline/cmdline_resolver.cc:249
+#: src/cmdline/cmdline_resolver.cc:244
 msgid "move to the next solution"
 msgstr "ཤུལ་མམ་གྱི་ཐབས་ཤེས་ལུ་སྤོ་བཤུད་འབད།"
 
-#: src/cmdline/cmdline_resolver.cc:251
+#: src/cmdline/cmdline_resolver.cc:246
 msgid "move to the previous solution"
 msgstr "ཧ་མམ་གྱི་ཐབས་ཤེས་ལུ་སྤོ་བཤུད་འབད།"
 
-#: src/cmdline/cmdline_resolver.cc:253
+#: src/cmdline/cmdline_resolver.cc:248
 msgid ""
 "toggle between the contents of the solution and an explanation of the "
 "solution"
 msgstr "སོར་སྟོན་"
 
-#: src/cmdline/cmdline_resolver.cc:255
+#: src/cmdline/cmdline_resolver.cc:250
 msgid "examine the solution in the visual user interface"
 msgstr "ཐབས་ཤེས་དེ་མཐོང་བའི་ལག་ལེན་པ་ངོས་འདྲ་བའི་ནང་ལུ་བརྟག་དཔྱད་འབད།"
 
-#: src/cmdline/cmdline_resolver.cc:257
+#: src/cmdline/cmdline_resolver.cc:252
 msgid ""
 "abort automatic dependency resolution; resolve dependencies by hand instead"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:259
+#: src/cmdline/cmdline_resolver.cc:254
 msgid ""
 "reject the given package versions; don't display any solutions in which they "
 "occur.  Enter UNINST instead of a version to reject removing the package.  "
 "ID is the integer printed to the left of the action."
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:261
+#: src/cmdline/cmdline_resolver.cc:256
 msgid ""
 "accept the given package versions; display only solutions in which they "
 "occur.  Enter UNINST instead of a version to accept removing the package.  "
 "ID is the integer printed to the left of the action."
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:263
+#: src/cmdline/cmdline_resolver.cc:258
 msgid ""
 "display information about the action labeled ID from the solution.  The "
 "label is the integer printed to the left of the action."
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:265
+#: src/cmdline/cmdline_resolver.cc:260
 msgid "adjust the state of the listed packages, where ACTION is one of:"
 msgstr ""
 "བྱ་བ་དེ་ཅིག་ཨིན་མི་ "
 "ཐོ་བཀོད་འབད་ཡོད་མི་ཐུམ་སྒྲིལ་ཚུ་གི་གནས་ལུགས་དེ་བདེ་སྒྲིག་འབད:"
 
-#: src/cmdline/cmdline_resolver.cc:283
+#: src/cmdline/cmdline_resolver.cc:278
 msgid ""
 "Adjustments will cause the current solution to be discarded and recalculated "
 "as necessary."
@@ -1606,99 +1606,99 @@
 "བདེ་སྒྲིག་འབད་མི་དེ་གིས་ཉེར་མཁོ་དང་བསྟུན་ "
 "ད་ལྟོའི་ཐབས་ཤེས་ཚུ་བཏོན་བཀོག་ནི་དང་བསྐྱར་རྩིས་སྟོན་བཅུགཔ་ཨིན།"
 
-#: src/cmdline/cmdline_resolver.cc:298
+#: src/cmdline/cmdline_resolver.cc:293
 #, c-format
 msgid "The version %s is available in the following archives:"
 msgstr "ཐོན་རིམ་ %s འོག་ལུ་ཡོད་མི་ཡིག་མཛོད་ཚུ་ནང་ལས་འཐོབ་ཚུགསཔ་ཨིན:"
 
-#: src/cmdline/cmdline_resolver.cc:306
+#: src/cmdline/cmdline_resolver.cc:301
 #, c-format
 msgid "Select the version of %s that should be used: "
 msgstr "ལག་ལེན་ཐབ་ནི་ཨིན་མི་ %s གི་ཐོན་རིམ་དེ་སེལ་འཐུ་འབད: "
 
-#: src/cmdline/cmdline_resolver.cc:313
+#: src/cmdline/cmdline_resolver.cc:308
 #, c-format
 msgid "Invalid response.  Please enter an integer between 1 and %d."
 msgstr "ནུས་མེད་ཀྱིི་ལན། ༡ དང་ %d་གི་བར་ནའི་ཧྲིལ་ཨང་དེ་བཙུགས་གནང་།"
 
-#: src/cmdline/cmdline_resolver.cc:329
+#: src/cmdline/cmdline_resolver.cc:324
 #, c-format
 msgid "Expected at least one package/version pair following '%c'"
 msgstr ""
 "'%c' གི་རྗེས་སུ་འབྲངས་མི་ "
 "ཉུང་ཤོས་རང་ཐུམ་སྒྲིལ་གཅིག་/་ཐོན་རིམ་ཆ་གཅིག་གི་རེ་འདུན་བསྐྱེད་ཅི།"
 
-#: src/cmdline/cmdline_resolver.cc:351
+#: src/cmdline/cmdline_resolver.cc:346
 #, c-format
 msgid "Expected a version or \"%s\" after \"%s\""
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:377
+#: src/cmdline/cmdline_resolver.cc:372
 #, c-format
 msgid "%s has no version named \"%s\""
 msgstr "%s ལུ་མིང་\"%s\" ཟེར་མི་ཐོན་རིམ་མིང་མེད།"
 
-#: src/cmdline/cmdline_resolver.cc:403
+#: src/cmdline/cmdline_resolver.cc:398
 #, c-format
 msgid "Allowing the removal of %s"
 msgstr "%s དེ་རྩ་བསྐྲད་གཏང་བཅུག་དོ།"
 
-#: src/cmdline/cmdline_resolver.cc:406
+#: src/cmdline/cmdline_resolver.cc:401
 #, c-format
 msgid "Allowing the installation of %s version %s (%s)"
 msgstr "%s ཐོན་རིམ་ %s (%s)དེ་གཞི་བཙུགས་འབད་བཅུག་དོ།"
 
-#: src/cmdline/cmdline_resolver.cc:416
+#: src/cmdline/cmdline_resolver.cc:411
 #, c-format
 msgid "Rejecting the removal of %s"
 msgstr "%s རྩ་བསྐྲད་གཏང་ནི་གི་་ དང་ལེན་སྤང་དོ།"
 
-#: src/cmdline/cmdline_resolver.cc:419
+#: src/cmdline/cmdline_resolver.cc:414
 #, c-format
 msgid "Rejecting the installation of %s version %s (%s)"
 msgstr "%s ཐོན་རིམ་%s (%s) གི་བཙུགས་འབད་ནི་དེ་ དང་ལེན་སྤང་དོ།"
 
-#: src/cmdline/cmdline_resolver.cc:432
+#: src/cmdline/cmdline_resolver.cc:427
 #, c-format
 msgid "No longer requiring the removal of %s"
 msgstr "%s རྩབསྐྲད་གཏང་ནི་དེ་ད་ལས་ཕར་ དགོས་མཁོ་མེད།"
 
-#: src/cmdline/cmdline_resolver.cc:435
+#: src/cmdline/cmdline_resolver.cc:430
 #, c-format
 msgid "No longer requiring the installation of %s version %s (%s)"
 msgstr "%s ཐོན་རིམ་ %s (%s)གི་གཞི་བཙུགས་དེ་ད་ལས་ཕར་དགོས་མཁོ་མིན་མེད།"
 
-#: src/cmdline/cmdline_resolver.cc:444
+#: src/cmdline/cmdline_resolver.cc:439
 #, c-format
 msgid "Requiring the removal of %s"
 msgstr "%s རྩ་སྐྲད་གཏང་ནི་ནེ་དགོས་མཁོ་ཡོད།"
 
-#: src/cmdline/cmdline_resolver.cc:447
+#: src/cmdline/cmdline_resolver.cc:442
 #, c-format
 msgid "Requiring the installation of %s version %s (%s)"
 msgstr "%s ཐོན་རིམ་ %s (%s) གི་གཞི་བཙུགས་དེ་དགོས་ཡོད།"
 
-#: src/cmdline/cmdline_resolver.cc:496
+#: src/cmdline/cmdline_resolver.cc:491
 #, c-format
 msgid "Allowing this recommendation to be ignored: %s"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:502
+#: src/cmdline/cmdline_resolver.cc:497
 #, c-format
 msgid "Always obeying this recommendation: %s"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:511
+#: src/cmdline/cmdline_resolver.cc:506
 #, c-format
 msgid "No longer ignoring this recommendation: %s"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:517
+#: src/cmdline/cmdline_resolver.cc:512
 #, c-format
 msgid "Ignoring this recommendation: %s"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:576
+#: src/cmdline/cmdline_resolver.cc:571
 #, c-format
 msgid "Action \"%s\""
 msgstr ""
@@ -1706,17 +1706,17 @@
 #. TRANSLATORS: the substitution is
 #. replaced in English with something
 #. like "Pkg1 depends upon Pkg2".
-#: src/cmdline/cmdline_resolver.cc:589
+#: src/cmdline/cmdline_resolver.cc:584
 #, c-format
 msgid "This action was selected because %ls."
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:591
+#: src/cmdline/cmdline_resolver.cc:586
 msgid ""
 "This action is currently rejected; it will not appear in new solutions."
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:592
+#: src/cmdline/cmdline_resolver.cc:587
 msgid ""
 "This action is currently approved; it will be selected whenever possible."
 msgstr ""
@@ -1726,7 +1726,7 @@
 #. translated since the commands in
 #. aptitude's internal command-line
 #. aren't translated.
-#: src/cmdline/cmdline_resolver.cc:599
+#: src/cmdline/cmdline_resolver.cc:594
 #, c-format
 msgid "Enter \"r %s\" to allow this action to appear in new solutions."
 msgstr ""
@@ -1736,7 +1736,7 @@
 #. translated since the commands in
 #. aptitude's internal command-line
 #. aren't translated.
-#: src/cmdline/cmdline_resolver.cc:605
+#: src/cmdline/cmdline_resolver.cc:600
 #, c-format
 msgid ""
 "Enter \"r %s\" to prevent this action from appearing in new solutions."
@@ -1747,7 +1747,7 @@
 #. translated since the commands in
 #. aptitude's internal command-line
 #. aren't translated.
-#: src/cmdline/cmdline_resolver.cc:611
+#: src/cmdline/cmdline_resolver.cc:606
 #, c-format
 msgid ""
 "Enter \"a %s\" to cease requiring that new solutions include this action if "
@@ -1759,85 +1759,85 @@
 #. translated since the commands in
 #. aptitude's internal command-line
 #. aren't translated.
-#: src/cmdline/cmdline_resolver.cc:617
+#: src/cmdline/cmdline_resolver.cc:612
 #, c-format
 msgid ""
 "Enter \"a %s\" to require that new solutions include this action if possible."
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:790
+#: src/cmdline/cmdline_resolver.cc:785
 #, c-format
 msgid "open: %zd; closed: %zd; defer: %zd; conflict: %zd"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:814
+#: src/cmdline/cmdline_resolver.cc:809
 #, c-format
 msgid ""
 "Would resolve dependencies, but dependency resolution is disabled.\n"
 "   (%s::ProblemResolver::StepLimit = 0)\n"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:823
+#: src/cmdline/cmdline_resolver.cc:818
 msgid ""
 "I want to resolve dependencies, but no dependency resolver was created."
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:837 src/cmdline/cmdline_resolver.cc:1180
+#: src/cmdline/cmdline_resolver.cc:832 src/cmdline/cmdline_resolver.cc:1175
 #: src/gtk/resolver.cc:2058 src/solution_dialog.cc:127
 #: src/solution_screen.cc:546
 msgid "Resolving dependencies..."
 msgstr "རྟེན་འབྲེལ་ཚུ་མོས་མཐུན་འབད་དོ།"
 
-#: src/cmdline/cmdline_resolver.cc:897
+#: src/cmdline/cmdline_resolver.cc:892
 msgid "The following actions will resolve these dependencies:"
 msgstr "འོག་ལུ་ཡོད་མི་བྱ་བ་དེ་གིས་ རྟེན་འབྲེལ་འ་ནི་ཚུ་མོས་མཐུན་འབདཝ་ཨིན།"
 
-#: src/cmdline/cmdline_resolver.cc:915
+#: src/cmdline/cmdline_resolver.cc:910
 msgid "Accept this solution? [Y/n/q/?] "
 msgstr "ཐབས་ཤེས་འདི་དང་ལེན་འབད་ནི་ཨིན་ན? [Y/n/q/?] "
 
-#: src/cmdline/cmdline_resolver.cc:942 src/cmdline/cmdline_resolver.cc:1077
+#: src/cmdline/cmdline_resolver.cc:937 src/cmdline/cmdline_resolver.cc:1072
 msgid "Abandoning all efforts to resolve these dependencies."
 msgstr ""
 "རྟེན་འབྲེལ་འ་ནི་ཚུ་མོས་མཐུན་འབད་ནིའི་དོན་ལུ་ བརྩོན་ཤུགས་འདོར་བའི་སྒང་ཡོད།"
 
-#: src/cmdline/cmdline_resolver.cc:945
+#: src/cmdline/cmdline_resolver.cc:940
 msgid ""
 "Abandoning automatic dependency resolution and reverting to manual "
 "resolution."
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:978
+#: src/cmdline/cmdline_resolver.cc:973
 msgid "The following commands are available:"
 msgstr "འོག་ལུ་ཡོད་མི་བརྡ་བཀོད་ཚུ་འཐོབ་ཚུགས:"
 
-#: src/cmdline/cmdline_resolver.cc:999 src/ui.cc:2317
+#: src/cmdline/cmdline_resolver.cc:994 src/ui.cc:2340
 msgid "File to write resolver state to: "
 msgstr "དེ་ལུ་ མོས་མཐུན་པའི་གནས་ལུགས་འབྲི་ནིའི་དོན་ལུ་ ཡག་སྣོད: "
 
-#: src/cmdline/cmdline_resolver.cc:1031
+#: src/cmdline/cmdline_resolver.cc:1026
 msgid "Invalid response; please enter one of the following commands:"
 msgstr "ནུས་མེད་ལན་གསལ། འོག་ལུ་ཡོད་མི་བརྡ་བཀོད་ཚུ་ལས་ཅིག་ཐོ་བཀད་འབད་གནང་:"
 
-#: src/cmdline/cmdline_resolver.cc:1051
+#: src/cmdline/cmdline_resolver.cc:1046
 msgid "No solution found within the allotted time.  Try harder? [Y/n] "
 msgstr ""
 "སྤྲོད་དེ་ཡོད་པའི་དུས་ཚོད་ཀྱི་ནང་འཁོད་ལུ་ཐབས་ཤེས་ཐོབ་མ་ཚུགས། "
 "ལྷག་པར་འབད་རྩོལ་བསྐྱེད་ནི་ཨིན་ན? [Y/n] "
 
-#: src/cmdline/cmdline_resolver.cc:1080
+#: src/cmdline/cmdline_resolver.cc:1075
 msgid "Invalid response; please enter 'y' or 'n'."
 msgstr "ནུས་མེད་ལན་གསལ། 'y' ཡང་ན་ 'n'་ཐོ་བཀོད་འབད་གནང་།"
 
-#: src/cmdline/cmdline_resolver.cc:1089
+#: src/cmdline/cmdline_resolver.cc:1084
 msgid "Unable to resolve dependencies!  Giving up..."
 msgstr "རྟེན་འབྲེལ་མོས་མཐུན་འབད་མ་ཚུགས! བཀོག་བཞག་དོ..."
 
-#: src/cmdline/cmdline_resolver.cc:1095
+#: src/cmdline/cmdline_resolver.cc:1090
 msgid "*** No more solutions available ***"
 msgstr "*** ཐབས་ཤེས་དེ་ལལས་མངམ་སྦེ་ཐོབ་མི་ཚུགས། ***"
 
-#: src/cmdline/cmdline_resolver.cc:1114
+#: src/cmdline/cmdline_resolver.cc:1109
 msgid ""
 "*** ERROR: search aborted by fatal exception.  You may continue\n"
 "           searching, but some solutions will be unreachable."
@@ -1845,7 +1845,7 @@
 "***འཛོལ་བ:ཚུབ་ཆེན་དམིགས་གསལ་གྱིས་འབལ་ཤོལ་འཚོལ།ཁྱོད་ཀྱི་འཕྲོ་འཐུད་དེ་འཚོལ་ཞིབ་"
 "འབད དེ་འབདཝ་ད་ཐབས་ཤེས་གཞན་མི་ཚུ་གི་ལྷོད་མི་ཚུགས།"
 
-#: src/cmdline/cmdline_resolver.cc:1191
+#: src/cmdline/cmdline_resolver.cc:1186
 #, c-format
 msgid ""
 "Unable to resolve dependencies for the upgrade because the resolver timed "
@@ -1854,47 +1854,47 @@
 "  Aptitude::ProblemResolver::StepLimit (currently %d)."
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:1201
+#: src/cmdline/cmdline_resolver.cc:1196
 msgid "Unable to resolve dependencies for the upgrade: no solution found."
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:1207
+#: src/cmdline/cmdline_resolver.cc:1202
 #, c-format
 msgid "Unable to resolve dependencies for the upgrade: %s"
 msgstr ""
 
-#: src/cmdline/cmdline_search.cc:199 src/cmdline/cmdline_versions.cc:567
+#: src/cmdline/cmdline_search.cc:204 src/cmdline/cmdline_versions.cc:590
 #, c-format
 msgid "iconv of %s failed.\n"
 msgstr "%s གི་ངོས་དཔར་ཝི་འཐུས་ཤོར་བྱུང་ཡོདཔ།\n"
 
-#: src/cmdline/cmdline_search.cc:216
+#: src/cmdline/cmdline_search.cc:221
 #, c-format
 msgid "search: You must provide at least one search term\n"
 msgstr ""
 "འཚོལ་ཞིབ་འབད: ཁྱོད་ཀྱིས་ཉུང་ཤོས་རང་འཚོལ་ཞིབ་ཀྱི་ལམ་ལུགས་གཅིག་བྱིན་དགོ\n"
 
-#: src/cmdline/cmdline_show_broken.cc:81
+#: src/cmdline/cmdline_show_broken.cc:36
 #, c-format
 msgid "but %s is to be installed."
 msgstr "དེ་འབདཝ་ད་%s དེ་གཞི་བཙུགས་འབད་དགོཔ་ཨིན།"
 
-#: src/cmdline/cmdline_show_broken.cc:84
+#: src/cmdline/cmdline_show_broken.cc:39
 #, c-format
 msgid "but %s is installed and it is kept back."
 msgstr "དེ་འབདཝ་ད་ %s དེ་གཞི་བཙུགས་འབད་དེ་རྒྱབ་ཁར་ལུ་བཞག་ཡོད།"
 
-#: src/cmdline/cmdline_show_broken.cc:87
+#: src/cmdline/cmdline_show_broken.cc:42
 #, c-format
 msgid "but %s is installed."
 msgstr "དེ་འབདཝ་ད་%s དེ་གཞི་བཙུགས་འབད་ཡི།"
 
-#: src/cmdline/cmdline_show_broken.cc:94
+#: src/cmdline/cmdline_show_broken.cc:49
 #, c-format
 msgid "but it is not installable."
 msgstr ""
 
-#: src/cmdline/cmdline_show_broken.cc:96
+#: src/cmdline/cmdline_show_broken.cc:51
 #, c-format
 msgid "but it is not going to be installed."
 msgstr ""
@@ -1904,54 +1904,54 @@
 msgid " which is a virtual package."
 msgstr " ག་དེ་བར་ཅུ་ཡལ་ཐུམ་སྒྲིལ་སྨོ།"
 
-#: src/cmdline/cmdline_show_broken.cc:104
+#: src/cmdline/cmdline_show_broken.cc:138
 #, c-format
 msgid " or"
 msgstr " ཡང་ན།"
 
-#: src/cmdline/cmdline_show_broken.cc:127
+#: src/cmdline/cmdline_show_broken.cc:160
 #, c-format
 msgid "The following packages have unmet dependencies:\n"
 msgstr "འོག་ལུ་ཡོད་མི་ཐུམ་སྒྲིལ་ཚུ་གིས་གཞན་རྟེན་དང་མ་ཕྱེད་པས:\n"
 
-#: src/cmdline/cmdline_show.cc:198 src/cmdline/cmdline_show.cc:448
-#: src/cmdline/cmdline_versions.cc:208 src/gtk/resolver.cc:1192
-#: src/solution_fragment.cc:68
+#: src/cmdline/cmdline_show.cc:196 src/cmdline/cmdline_show.cc:448
+#: src/cmdline/cmdline_versions.cc:225 src/gtk/resolver.cc:1192
+#: src/solution_fragment.cc:64
 msgid "<NULL>"
 msgstr "<སྟོང་ཆ།>"
 
-#: src/cmdline/cmdline_show.cc:215 src/cmdline/cmdline_show.cc:220
+#: src/cmdline/cmdline_show.cc:217 src/cmdline/cmdline_show.cc:222
 #: src/qt/widgets/packages_tab.cc:73
 msgid "not installed"
 msgstr "གཞི་བཙུགས་མ་འབད་བས།"
 
-#: src/cmdline/cmdline_show.cc:222 src/pkg_columnizer.cc:250
-#: src/pkg_ver_item.cc:227
+#: src/cmdline/cmdline_show.cc:224 src/pkg_columnizer.cc:249
+#: src/pkg_ver_item.cc:228
 msgid "unpacked"
 msgstr "གམ་ཤུབ་ཡོདཔ།"
 
-#: src/cmdline/cmdline_show.cc:224
+#: src/cmdline/cmdline_show.cc:226
 msgid "partially configured"
 msgstr "ཆ་ཤས་ཅིག་རིམ་སྒྲིག་འབད་ཡོདཔ།"
 
-#: src/cmdline/cmdline_show.cc:226
+#: src/cmdline/cmdline_show.cc:228
 msgid "partially installed"
 msgstr "ཆ་ཤས་ཅིག་གཞི་བཙུགས་འབད་ཡོདཔ།"
 
-#: src/cmdline/cmdline_show.cc:228
+#: src/cmdline/cmdline_show.cc:230
 msgid "not installed (configuration files remain)"
 msgstr "གཞི་བཙུགས་མ་འབད་བས།(རིམ་སྒྲིག་གི་ཡིག་སྣོད་ཚུ་ལུས་འོང་།)"
 
-#: src/cmdline/cmdline_show.cc:231
+#: src/cmdline/cmdline_show.cc:232
 msgid "awaiting trigger processing by other package(s)"
 msgstr ""
 
-#: src/cmdline/cmdline_show.cc:233
+#: src/cmdline/cmdline_show.cc:234
 msgid "awaiting trigger processing"
 msgstr ""
 
-#: src/cmdline/cmdline_show.cc:236 src/pkg_columnizer.cc:258
-#: src/pkg_ver_item.cc:235 src/qt/widgets/packages_tab.cc:72
+#: src/cmdline/cmdline_show.cc:236 src/pkg_columnizer.cc:257
+#: src/pkg_ver_item.cc:236 src/qt/widgets/packages_tab.cc:72
 msgid "installed"
 msgstr "གཞི་བཙུགས་འབད་ཡོདཔ་།"
 
@@ -2022,7 +2022,7 @@
 msgstr "ཐུམ་་སྒྲིལ་: "
 
 #: src/cmdline/cmdline_show.cc:378 src/cmdline/cmdline_show.cc:408
-#: src/pkg_columnizer.cc:92
+#: src/pkg_columnizer.cc:93
 msgid "State"
 msgstr "གནས་ལུགས།"
 
@@ -2030,12 +2030,12 @@
 msgid "Provided by"
 msgstr "གིས་འབྱིན་བྱིནམ་ཨིན།"
 
-#: src/cmdline/cmdline_show.cc:402 src/pkg_info_screen.cc:120
+#: src/cmdline/cmdline_show.cc:402 src/pkg_info_screen.cc:118
 msgid "Essential: "
 msgstr "ཉེ་བར་མཁོ་བ: "
 
 #: src/cmdline/cmdline_show.cc:402 src/cmdline/cmdline_show.cc:406
-#: src/cmdline/cmdline_show.cc:417 src/pkg_info_screen.cc:120
+#: src/cmdline/cmdline_show.cc:417 src/pkg_info_screen.cc:118
 msgid "yes"
 msgstr "ཨིན།"
 
@@ -2055,7 +2055,7 @@
 msgid "no"
 msgstr "མེན།"
 
-#: src/cmdline/cmdline_show.cc:421 src/pkg_info_screen.cc:125
+#: src/cmdline/cmdline_show.cc:421 src/pkg_info_screen.cc:123
 msgid "Multi-Arch: "
 msgstr ""
 
@@ -2064,7 +2064,7 @@
 msgid "Version: "
 msgstr "ཐོན་རིམ: "
 
-#: src/cmdline/cmdline_show.cc:424 src/pkg_info_screen.cc:134
+#: src/cmdline/cmdline_show.cc:424 src/pkg_info_screen.cc:144
 msgid "Priority: "
 msgstr "གཙོ་རིམ: "
 
@@ -2072,23 +2072,23 @@
 msgid "N/A"
 msgstr "ཨེན/ཨེ།"
 
-#: src/cmdline/cmdline_show.cc:426 src/pkg_info_screen.cc:135
+#: src/cmdline/cmdline_show.cc:426 src/pkg_info_screen.cc:145
 msgid "Section: "
 msgstr "དབྱེ་ཚན: "
 
-#: src/cmdline/cmdline_show.cc:428 src/pkg_info_screen.cc:136
+#: src/cmdline/cmdline_show.cc:428 src/pkg_info_screen.cc:146
 msgid "Maintainer: "
 msgstr "རྒྱུན་་སྐྱོང་པ: "
 
-#: src/cmdline/cmdline_show.cc:430 src/pkg_info_screen.cc:137
+#: src/cmdline/cmdline_show.cc:430 src/pkg_info_screen.cc:147
 msgid "Architecture: "
 msgstr "བཟོ་བཀོད: "
 
-#: src/cmdline/cmdline_show.cc:433 src/pkg_info_screen.cc:139
+#: src/cmdline/cmdline_show.cc:433 src/pkg_info_screen.cc:149
 msgid "Uncompressed Size: "
 msgstr "ཨེབ་བཙུགས་མ་འབད་བར་ཡོའ་མི་ཚད: "
 
-#: src/cmdline/cmdline_show.cc:437 src/pkg_info_screen.cc:138
+#: src/cmdline/cmdline_show.cc:437 src/pkg_info_screen.cc:148
 msgid "Compressed Size: "
 msgstr "ཨེབ་བཙུགས་འབད་ཡོད་པའི་ཚད: "
 
@@ -2113,11 +2113,11 @@
 msgid "PreDepends"
 msgstr "སྔོན་བརྟེན།"
 
-#: src/cmdline/cmdline_show.cc:457 src/cmdline/cmdline_why.cc:299
+#: src/cmdline/cmdline_show.cc:457 src/cmdline/cmdline_why.cc:290
 msgid "Recommends"
 msgstr "འོས་སྦྱོར་འབདཝ་ཨིན།"
 
-#: src/cmdline/cmdline_show.cc:459 src/cmdline/cmdline_why.cc:302
+#: src/cmdline/cmdline_show.cc:459 src/cmdline/cmdline_why.cc:293
 msgid "Suggests"
 msgstr "བསམ་འཆར་བཀོདཔ་ཨིན།"
 
@@ -2141,345 +2141,345 @@
 msgid "Enhances"
 msgstr ""
 
-#: src/cmdline/cmdline_show.cc:471 src/cmdline/cmdline_why.cc:230
-#: src/cmdline/cmdline_why.cc:1632 src/gtk/dependency_chains_tab.cc:205
+#: src/cmdline/cmdline_show.cc:471 src/cmdline/cmdline_why.cc:221
+#: src/cmdline/cmdline_why.cc:1622 src/gtk/dependency_chains_tab.cc:207
 msgid "Provides"
 msgstr "བྱིནམ་ཨིན།"
 
 #: src/cmdline/cmdline_show.cc:475 src/gtk/entitysummary.cc:369
-#: src/gtk/info.cc:716 src/gtk/previewtab.cc:238 src/pkg_info_screen.cc:102
+#: src/gtk/info.cc:714 src/gtk/previewtab.cc:238 src/pkg_info_screen.cc:102
 msgid "Description: "
 msgstr "འགྲེལ་བཤད: "
 
-#: src/cmdline/cmdline_show.cc:481 src/pkg_info_screen.cc:107
-#: src/pkg_view.cc:259
+#: src/cmdline/cmdline_show.cc:480 src/pkg_info_screen.cc:106
+#: src/pkg_view.cc:257
 msgid "Homepage: "
 msgstr ""
 
-#: src/cmdline/cmdline_show.cc:575
+#: src/cmdline/cmdline_show.cc:573
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "ཐུམ་སྒྲིལ་%sདེ་ག་ཡོད་འཚོལ་མ་ཚུགས།"
 
-#: src/cmdline/cmdline_show.cc:596
+#: src/cmdline/cmdline_show.cc:594
 #, c-format
 msgid "Unable to parse pattern %s"
 msgstr "དཔེ་གཞི་%s་དེ་མིང་དཔྱད་འབད་མ་ཚུགས།"
 
-#: src/cmdline/cmdline_simulate.cc:66
+#: src/cmdline/cmdline_simulate.cc:65
 #, c-format
 msgid "Would download/install/remove packages.\n"
 msgstr "ཐུམ་སྒྲིལ་ཚུ་ཕབ་ལེན/གཞི་བཙུགས/རྩ་བསྐྲད་གཏང་འོང།\n"
 
-#: src/cmdline/cmdline_simulate.cc:77
+#: src/cmdline/cmdline_simulate.cc:76
 msgid "Internal Error, Ordering didn't finish"
 msgstr "ནང་འཁོད་འཛོལ་བ་། གོ་རིམ་སྒྲིག་ནི་དེ་མཇུག་མ་བསྡུ་བས།"
 
-#: src/cmdline/cmdline_update.cc:44 src/ui.cc:1712 src/ui.cc:1881
+#: src/cmdline/cmdline_update.cc:43 src/ui.cc:1735 src/ui.cc:1904
 msgid "Deleting obsolete downloaded files"
 msgstr "ཕན་མེད་ཕབ་ལེན་འབད་ཡོད་པའི་ཡིག་སྣོད་ཚུ་བཏོན་གཏང་དོ།"
 
-#: src/cmdline/cmdline_update.cc:55
+#: src/cmdline/cmdline_update.cc:54
 #, c-format
 msgid "E: The update command takes no arguments\n"
 msgstr "ཨི: བརྡ་བཀོད་དུས་མཐུན་བཟོ་མི་དེ་གིས་སྒྲུབ་རྟགས་མི་འབག\n"
 
-#: src/cmdline/cmdline_user_tag.cc:65
+#: src/cmdline/cmdline_user_tag.cc:66
 #, c-format
 msgid "Adding user tag \"%s\" to the package \"%s\".\n"
 msgstr ""
 
-#: src/cmdline/cmdline_user_tag.cc:72
+#: src/cmdline/cmdline_user_tag.cc:73
 #, c-format
 msgid "Removing user tag \"%s\" from the package \"%s\".\n"
 msgstr ""
 
-#: src/cmdline/cmdline_user_tag.cc:104
+#: src/cmdline/cmdline_user_tag.cc:105
 #, c-format
 msgid "%s: too few arguments; expected at least a tag name and a package.\n"
 msgstr ""
 
-#: src/cmdline/cmdline_util.cc:167
+#: src/cmdline/cmdline_util.cc:166
 #, c-format
 msgid "No candidate version found for %s\n"
 msgstr "%sགི་དོན་ལུ་ མི་ངོའི་ཐོན་རིམ་མ་ཐོབ།\n"
 
-#: src/cmdline/cmdline_util.cc:169
+#: src/cmdline/cmdline_util.cc:168
 #, c-format
 msgid "No current or candidate version found for %s\n"
 msgstr "%sགི་དོན་ལུ་ ད་ལྟོའི་ཡང་ན་མི་ངོའི་ཐོན་རིམ་མ་ཐོབ།\n"
 
-#: src/cmdline/cmdline_util.cc:193
+#: src/cmdline/cmdline_util.cc:192
 #, c-format
 msgid "Unable to find an archive \"%s\" for the package \"%s\"\n"
 msgstr "ཐུམ་སྒྲིལ་ \"%s\"གི་དོན་ལུ་ ཡིག་མཛོད་\"%s\"དེ་དོབ་མ་ཚུགས།\n"
 
-#: src/cmdline/cmdline_util.cc:203
+#: src/cmdline/cmdline_util.cc:202
 #, c-format
 msgid "Unable to find a version \"%s\" for the package \"%s\"\n"
 msgstr "ཐུམ་སྒྲིལ་\"%s\"གི་དོན་ལུ་ ཐོན་རིམ་ \"%s\" དེ་ཐོབ་མ་ཚུགས།\n"
 
-#: src/cmdline/cmdline_util.cc:209
+#: src/cmdline/cmdline_util.cc:208
 #, c-format
 msgid "Internal error: invalid value %i passed to cmdline_find_ver!\n"
 msgstr ""
 "ནག་འཁོད་འཛོལ་བ: cmdline_find_ver ལུ་ནུས་མེད་གནས་གོང་%iརྩིས་སྤྲོད་འབད་ནུག་ཡ!\n"
 
-#: src/cmdline/cmdline_util.cc:239
+#: src/cmdline/cmdline_util.cc:238
 #, c-format
 msgid "You cannot specify both an archive and a version for a package\n"
 msgstr ""
 "ཁྱོད་ཀྱིས་ཐུམ་སྒྲིལ་ཅིག་གི་དོན་ལུ་ "
 "ཡིག་མཛོད་དང་ཐོན་རིམ་གཉིས་ཆ་རང་གསལ་བཀོད་འབད་མི་ཚུགས།\n"
 
-#: src/cmdline/cmdline_util.cc:273
+#: src/cmdline/cmdline_util.cc:272
 #, c-format
 msgid "Couldn't find task '%s'"
 msgstr ""
 
-#: src/cmdline/cmdline_util.cc:361
+#: src/cmdline/cmdline_util.cc:360
 #, c-format
 msgid "%d broken [%+d]"
 msgid_plural "%d broken [%+d]"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/cmdline/cmdline_util.cc:375
+#: src/cmdline/cmdline_util.cc:374
 #, c-format
 msgid "%d update [%+d]"
 msgid_plural "%d updates [%+d]"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/cmdline/cmdline_util.cc:389
+#: src/cmdline/cmdline_util.cc:388
 #, c-format
 msgid "%d new [%+d]"
 msgid_plural "%d new [%+d]"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/cmdline/cmdline_util.cc:400
+#: src/cmdline/cmdline_util.cc:399
 #, c-format
 msgid "Current status: %F."
 msgstr ""
 
-#: src/cmdline/cmdline_util.cc:411
+#: src/cmdline/cmdline_util.cc:410
 #, c-format
 msgid "There is %d newly obsolete package."
 msgid_plural "There are %d newly obsolete packages."
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/cmdline/cmdline_util.cc:423
+#: src/cmdline/cmdline_util.cc:422
 #, c-format
 msgid "There is %d newly obsolete package: "
 msgid_plural "There are %d newly obsolete packages: "
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/cmdline/cmdline_versions.cc:125
+#: src/cmdline/cmdline_versions.cc:122
 #, c-format
 msgid "Package %s:"
 msgstr ""
 
-#: src/cmdline/cmdline_versions.cc:152 src/cmdline/cmdline_versions.cc:191
+#: src/cmdline/cmdline_versions.cc:159 src/cmdline/cmdline_versions.cc:208
 #, c-format
 msgid "Source package %s:"
 msgstr ""
 
-#: src/cmdline/cmdline_versions.cc:213
+#: src/cmdline/cmdline_versions.cc:230
 #, c-format
 msgid "Archive %s:"
 msgstr ""
 
-#: src/cmdline/cmdline_versions.cc:502
+#: src/cmdline/cmdline_versions.cc:519
 msgid "--group-by|archive"
 msgstr ""
 
-#: src/cmdline/cmdline_versions.cc:506
+#: src/cmdline/cmdline_versions.cc:523
 msgid "--group-by|auto"
 msgstr ""
 
-#: src/cmdline/cmdline_versions.cc:510
+#: src/cmdline/cmdline_versions.cc:527
 msgid "--group-by|none"
 msgstr ""
 
-#: src/cmdline/cmdline_versions.cc:514
+#: src/cmdline/cmdline_versions.cc:531
 msgid "--group-by|package"
 msgstr ""
 
-#: src/cmdline/cmdline_versions.cc:518
+#: src/cmdline/cmdline_versions.cc:535
 msgid "--group-by|source-package"
 msgstr ""
 
-#: src/cmdline/cmdline_versions.cc:522
+#: src/cmdline/cmdline_versions.cc:539
 msgid "--group-by|source-version"
 msgstr ""
 
 #. TRANSLATORS: --group-by is the argument name and shouldn't
 #. be translated.
-#: src/cmdline/cmdline_versions.cc:528
+#: src/cmdline/cmdline_versions.cc:545
 #, c-format
 msgid ""
 "Invalid package grouping mode \"%s\" (should be \"auto\", \"none\", "
 "\"package\", or \"source-package\")"
 msgstr ""
 
-#: src/cmdline/cmdline_versions.cc:584
+#: src/cmdline/cmdline_versions.cc:607
 #, c-format
 msgid "versions: You must provide at least one package selector\n"
 msgstr ""
 
-#: src/cmdline/cmdline_why.cc:290
+#: src/cmdline/cmdline_why.cc:281
 msgid "dep_level"
 msgstr ""
 
-#: src/cmdline/cmdline_why.cc:296
+#: src/cmdline/cmdline_why.cc:287
 msgid "DependsOnly"
 msgstr ""
 
-#: src/cmdline/cmdline_why.cc:310
+#: src/cmdline/cmdline_why.cc:301
 msgid "version_selection"
 msgstr ""
 
-#: src/cmdline/cmdline_why.cc:315
+#: src/cmdline/cmdline_why.cc:306
 msgid "Current"
 msgstr ""
 
-#: src/cmdline/cmdline_why.cc:318
+#: src/cmdline/cmdline_why.cc:309
 msgid "Candidate"
 msgstr ""
 
-#: src/cmdline/cmdline_why.cc:321 src/gtk/gui.cc:91 src/gtk/gui.cc:1417
+#: src/cmdline/cmdline_why.cc:312 src/gtk/gui.cc:91 src/gtk/gui.cc:1417
 msgid "Install"
 msgstr "གཞི་བཙུགས།"
 
-#: src/cmdline/cmdline_why.cc:324
+#: src/cmdline/cmdline_why.cc:315
 msgid "InstallNotCurrent"
 msgstr ""
 
-#: src/cmdline/cmdline_why.cc:332
+#: src/cmdline/cmdline_why.cc:323
 msgid "allow_choices"
 msgstr ""
 
-#: src/cmdline/cmdline_why.cc:335
+#: src/cmdline/cmdline_why.cc:326
 msgid "true"
 msgstr ""
 
-#: src/cmdline/cmdline_why.cc:337
+#: src/cmdline/cmdline_why.cc:328
 msgid "false"
 msgstr ""
 
-#: src/cmdline/cmdline_why.cc:381
+#: src/cmdline/cmdline_why.cc:372
 #, c-format
 msgid "Install(%s)"
 msgstr ""
 
-#: src/cmdline/cmdline_why.cc:383
+#: src/cmdline/cmdline_why.cc:374
 #, c-format
 msgid "Remove(%s)"
 msgstr ""
 
-#: src/cmdline/cmdline_why.cc:385
+#: src/cmdline/cmdline_why.cc:376
 #, c-format
 msgid "Install(%s provides %s)"
 msgstr ""
 
-#: src/cmdline/cmdline_why.cc:389
+#: src/cmdline/cmdline_why.cc:380
 #, c-format
 msgid "Remove(%s provides %s)"
 msgstr ""
 
-#: src/cmdline/cmdline_why.cc:1074
+#: src/cmdline/cmdline_why.cc:1065
 #, c-format
 msgid "    ++ Examining %F\n"
 msgstr ""
 
-#: src/cmdline/cmdline_why.cc:1082
+#: src/cmdline/cmdline_why.cc:1073
 msgid "    ++   --> skipping, not a conflict\n"
 msgstr ""
 
-#: src/cmdline/cmdline_why.cc:1088
+#: src/cmdline/cmdline_why.cc:1079
 msgid "    ++   --> skipping conflict\n"
 msgstr ""
 
-#: src/cmdline/cmdline_why.cc:1094
+#: src/cmdline/cmdline_why.cc:1085
 msgid "    ++   --> skipping, not relevant according to params\n"
 msgstr ""
 
-#: src/cmdline/cmdline_why.cc:1100
+#: src/cmdline/cmdline_why.cc:1091
 msgid "    ++   --> skipping, parent is not the selected version\n"
 msgstr ""
 
-#: src/cmdline/cmdline_why.cc:1106
+#: src/cmdline/cmdline_why.cc:1097
 msgid "    ++   --> skipping, the dep is satisfied by the current version\n"
 msgstr ""
 
-#: src/cmdline/cmdline_why.cc:1112
+#: src/cmdline/cmdline_why.cc:1103
 msgid "Skipping this solution, I've already seen it.\n"
 msgstr ""
 
-#: src/cmdline/cmdline_why.cc:1118
+#: src/cmdline/cmdline_why.cc:1109
 msgid "    ++   --> skipping, version check failed\n"
 msgstr ""
 
-#: src/cmdline/cmdline_why.cc:1124
+#: src/cmdline/cmdline_why.cc:1115
 msgid "    ++   --> ENQUEUING\n"
 msgstr ""
 
-#: src/cmdline/cmdline_why.cc:1130
+#: src/cmdline/cmdline_why.cc:1121
 #, c-format
 msgid "    ++   --> ENQUEUING %s Provides %s\n"
 msgstr ""
 
-#: src/cmdline/cmdline_why.cc:1138
+#: src/cmdline/cmdline_why.cc:1129
 #, c-format
 msgid "Starting search with parameters %ls\n"
 msgstr ""
 
-#: src/cmdline/cmdline_why.cc:1194
+#: src/cmdline/cmdline_why.cc:1185
 #, c-format
 msgid "Unable to find a reason to remove %s.\n"
 msgstr ""
 
-#: src/cmdline/cmdline_why.cc:1196
+#: src/cmdline/cmdline_why.cc:1187
 #, c-format
 msgid "Unable to find a reason to install %s.\n"
 msgstr ""
 
-#: src/cmdline/cmdline_why.cc:1235
+#: src/cmdline/cmdline_why.cc:1226
 #, c-format
 msgid "Packages requiring %s:"
 msgstr ""
 
-#: src/cmdline/cmdline_why.cc:1299 src/cmdline/cmdline_why.cc:1327
-#: src/cmdline/cmdline_why.cc:1391
+#: src/cmdline/cmdline_why.cc:1290 src/cmdline/cmdline_why.cc:1318
+#: src/cmdline/cmdline_why.cc:1382
 #, c-format
 msgid "No package named \"%s\" exists."
 msgstr ""
 
-#: src/cmdline/cmdline_why.cc:1331
+#: src/cmdline/cmdline_why.cc:1322
 msgid "Unable to parse some match patterns."
 msgstr ""
 
-#: src/cmdline/cmdline_why.cc:1366
+#: src/cmdline/cmdline_why.cc:1357
 #, c-format
 msgid ""
 "%s: this command requires at least one argument (the package to query).\n"
 msgstr ""
 
-#: src/cmdline/cmdline_why.h:212
+#: src/cmdline/cmdline_why.h:213
 msgid "Unknown version selection, something is very wrong."
 msgstr ""
 
-#: src/cmdline/terminal.cc:46
+#: src/cmdline/terminal.cc:44
 msgid "Unexpected end-of-file on standard input"
 msgstr "ཨིན་པུཊི་ཚད་ལྡན་གུར་རེ་འདུན་མེད་པའི་ཡིག་སྣོད་ཀྱི་-མཇུག"
 
 #. TRANSLATORS: the text between [] should be
 #. exactly 4 character cells wide; "ERR" is short
 #. for "ERROR".
-#: src/cmdline/text_progress.cc:96
+#: src/cmdline/text_progress.cc:93
 #, c-format
 msgid "[ ERR] %s"
 msgstr ""
@@ -2488,7 +2488,7 @@
 msgid "UNSATISFIED"
 msgstr "ངལ་རངས་མ་བྱུང་།"
 
-#: src/dep_item.cc:151 src/reason_fragment.cc:234
+#: src/dep_item.cc:151 src/reason_fragment.cc:241
 msgid "UNAVAILABLE"
 msgstr "འཐོབ་ཚུགསཔ་སྦེ་མེད།"
 
@@ -2526,7 +2526,7 @@
 msgid "Continue"
 msgstr "འཕྲོ་མཐུད་འབད།"
 
-#: src/download_list.cc:100 src/mine/cmine.cc:301 src/mine/cmine.cc:366
+#: src/download_list.cc:100 src/mine/cmine.cc:296 src/mine/cmine.cc:361
 msgid "Cancel"
 msgstr "ཆ་མེད།"
 
@@ -2589,83 +2589,83 @@
 msgid "Unable to look up your home directory!"
 msgstr ""
 
-#: src/generic/apt/aptcache.cc:271
+#: src/generic/apt/aptcache.cc:273
 #, c-format
 msgid ""
 "Error parsing a user-tag for the package %s: unexpected end-of-line "
 "following %s."
 msgstr ""
 
-#: src/generic/apt/aptcache.cc:288
+#: src/generic/apt/aptcache.cc:290
 #, c-format
 msgid "Unterminated '\"' in the user-tags list of the package %s."
 msgstr ""
 
-#: src/generic/apt/aptcache.cc:392
+#: src/generic/apt/aptcache.cc:395
 msgid "Can't open Aptitude extended state file"
 msgstr ""
 "མགྱོགས་པ་རྒྱ་བསྐྱེད་འབད་མི་གི་གནས་ལུགས་ནང་ཡོད་མི་ཡིག་སྣོད་དེ་ཁ་ཕྱེ་མི་ཚུགས་པས"
 "།"
 
-#: src/generic/apt/aptcache.cc:406 src/generic/apt/aptcache.cc:501
-#: src/generic/apt/aptcache.cc:503
+#: src/generic/apt/aptcache.cc:409 src/generic/apt/aptcache.cc:527
+#: src/generic/apt/aptcache.cc:529
 msgid "Reading extended state information"
 msgstr "རྒྱ་བསྐྱེད་ཅན་གྱི་གནས་ལུགས་ནང་ཡོད་བརྡ་དོན་དེ་ལྷག་དོ།"
 
-#: src/generic/apt/aptcache.cc:509 src/generic/apt/aptcache.cc:591
-#: src/generic/apt/aptcache.cc:594
+#: src/generic/apt/aptcache.cc:535 src/generic/apt/aptcache.cc:619
+#: src/generic/apt/aptcache.cc:622
 msgid "Initializing package states"
 msgstr "ཐུམ་སྒྲིལ་གྱི་གནས་ལུགས་ཚུ་འགོ་འབྱེད་འབད་དོ།"
 
-#: src/generic/apt/aptcache.cc:752
+#: src/generic/apt/aptcache.cc:783
 msgid "Cannot open Aptitude state file"
 msgstr "གོམ་སའདྲིས་ཅན་གྱི་གནས་ལུགས་ཡིག་སྣོད་དེ་ཁ་ཕྱེ་མ་ཚུགས།"
 
-#: src/generic/apt/aptcache.cc:756 src/generic/apt/aptcache.cc:863
-#: src/generic/apt/aptcache.cc:866
+#: src/generic/apt/aptcache.cc:787 src/generic/apt/aptcache.cc:920
+#: src/generic/apt/aptcache.cc:923
 msgid "Writing extended state information"
 msgstr "རྒྱ་བསྐྱེད་ཅན་གྱི་་གནས་ལུགས་བརྡ་དོན་བྲི་དོ།"
 
-#: src/generic/apt/aptcache.cc:854
+#: src/generic/apt/aptcache.cc:911
 msgid "Couldn't write state file"
 msgstr "གནས་ལུགས་ཡིག་སྣོད་འབྲི་མ་ཚུགས།"
 
-#: src/generic/apt/aptcache.cc:871
+#: src/generic/apt/aptcache.cc:928
 msgid "Error writing state file"
 msgstr "གནས་ལུགས་ཡིག་སྣོད་འབྲི་ནི་ལུ་འཛོལ་བ་འདུག"
 
-#: src/generic/apt/aptcache.cc:889
+#: src/generic/apt/aptcache.cc:946
 #, c-format
 msgid "failed to remove %s"
 msgstr "%sདེ་རྩ་བསྐྲད་གཏང་ནི་ལུ་འཐུས་ཤོར་བྱུང་ནུག"
 
-#: src/generic/apt/aptcache.cc:896
+#: src/generic/apt/aptcache.cc:953
 #, c-format
 msgid "failed to rename %s to %s"
 msgstr "%sལས་%sལུ་བསྐྱར་མིང་བཏགས་ནི་དེ་འཐུས་ཤོར་བྱུང་ནུག"
 
-#: src/generic/apt/aptcache.cc:904
+#: src/generic/apt/aptcache.cc:961
 #, c-format
 msgid "couldn't replace %s with %s"
 msgstr "%sདེ་%sདང་གཅིག་ཁར་ཚབ་བཙུགས་མ་ཚུགས།"
 
-#: src/generic/apt/aptcache.cc:1525
+#: src/generic/apt/aptcache.cc:1714
 msgid "Unable to correct dependencies, some packages cannot be installed"
 msgstr ""
 "རྟེན་འབྲེལ་ཚུ་ལུ་ནོར་བཅོས་འབད་འབད་མ་ཚུགས། "
 "ཐུམ་སྒྲིལ་ལ་ལོ་ཅིག་གཞི་བཙུགས་འབད་མི་བཏུབ།"
 
-#: src/generic/apt/aptcache.cc:2172
+#: src/generic/apt/aptcache.cc:2386
 msgid "The list of sources could not be read."
 msgstr "འབྱུང་ཁུངས་ཀྱི་ཐོ་ཡིག་དེ་ལྷག་མི་ཚུགས།"
 
-#: src/generic/apt/aptcache.cc:2179
+#: src/generic/apt/aptcache.cc:2393
 msgid "The package lists or status file could not be parsed or opened."
 msgstr ""
 "ཐུམ་སྒྲིལ་གྱི་ཐོ་ཡིཡག་ཡང་ན་ གནས་ཚད་ཡིག་སྣོད་དེ་མིང་དཔྱད་འབད་ནི་དང་ ཡང་ན་ "
 "ཁ་ཕྱེ་མི་བཏུབ།"
 
-#: src/generic/apt/aptcache.cc:2182
+#: src/generic/apt/aptcache.cc:2396
 msgid ""
 "You may want to update the package lists to correct these missing files"
 msgstr ""
@@ -2682,53 +2682,53 @@
 #. indicated by translating "Localized defaults|" below to
 #. "aptitude-defaults.ww".  If you use this mechanism, you should
 #. also add your defaults file to pkgdata_DATA in Makefile.am.
-#: src/generic/apt/apt.cc:188
+#: src/generic/apt/apt.cc:168
 msgid "Localized defaults|"
 msgstr ""
 
-#: src/generic/apt/apt.cc:261
+#: src/generic/apt/apt.cc:241
 #, c-format
 msgid "%s is readable but not writable; unable to write configuration file."
 msgstr ""
 "%sདེ་ལྷག་བཏུབ་ དེ་འབདཝ་ད་ འབྲི་མི་བཏུབ། རིམ་སྒྲིག་ཡིག་སྣོད་འབྲི་མ་ཚུགས།"
 
-#: src/generic/apt/apt.cc:306
+#: src/generic/apt/apt.cc:286
 #, c-format
 msgid "Unable to replace %s with new configuration file"
 msgstr "%sདེ་རིམ་སྒྲིག་གི་ཡིག་སྣོད་གསརཔ་གྱིས་ཚབ་བཙུགས་མ་ཚུགས།"
 
-#: src/generic/apt/apt.cc:457
+#: src/generic/apt/apt.cc:437
 msgid ""
 "Could not lock the cache file; this usually means that dpkg or another apt "
 "tool is already installing packages.  Opening in read-only mode; any changes "
 "you make to the states of packages will NOT be preserved!"
 msgstr ""
 
-#: src/generic/apt/apt.cc:1269
+#: src/generic/apt/apt.cc:1253
 msgid "foreign"
 msgstr ""
 
-#: src/generic/apt/apt.cc:1271
+#: src/generic/apt/apt.cc:1255
 msgid "same"
 msgstr ""
 
-#: src/generic/apt/apt.cc:1274
+#: src/generic/apt/apt.cc:1258
 msgid "allowed"
 msgstr ""
 
-#: src/generic/apt/apt.cc:1363
+#: src/generic/apt/apt.cc:1347
 msgid "main"
 msgstr "ངོ་མ།"
 
-#: src/generic/apt/apt.cc:1363
+#: src/generic/apt/apt.cc:1347
 msgid "contrib"
 msgstr ""
 
-#: src/generic/apt/apt.cc:1363
+#: src/generic/apt/apt.cc:1347
 msgid "non-free"
 msgstr ""
 
-#: src/generic/apt/apt.cc:1363
+#: src/generic/apt/apt.cc:1347
 msgid "non-US"
 msgstr ""
 
@@ -2783,7 +2783,7 @@
 "a number."
 msgstr ""
 
-#: src/generic/apt/aptitude_resolver_cost_settings.cc:130
+#: src/generic/apt/aptitude_resolver_cost_settings.cc:129
 #, c-format
 msgid "Conflicting types for the cost component %s."
 msgstr ""
@@ -2827,6 +2827,7 @@
 "ཐུམ་སྒྲིལ་གཞི་བཙུགས་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ནུག "
 "སླར་གསོ་འབད་ནི་ལུ་འབད་རྩོལ་བསྐྱེད་དོ།"
 
+#: src/generic/apt/aptcache.cc:979
 #: src/generic/apt/download_install_manager.cc:219
 msgid ""
 "Could not regain the system lock!  (Perhaps another apt or dpkg is running?)"
@@ -2873,22 +2874,22 @@
 msgid "Unable to create truncated cache: %s."
 msgstr ""
 
-#: src/generic/apt/log.cc:55
+#: src/generic/apt/log.cc:56
 #, c-format
 msgid "Unable to open %s to log actions"
 msgstr "བྱ་བ་ཚུ་བསྡམ་བཞག་ནིའི་དོན་ལུ་%sདེ་ཁ་ཕྱེ་མ་ཚུགས།"
 
 #. TRANSLATORS: This is a date and time format.  See strftime(3).
-#: src/generic/apt/log.cc:66
+#: src/generic/apt/log.cc:67
 msgid "%a, %b %e %Y %T %z"
 msgstr ""
 
-#: src/generic/apt/log.cc:68
+#: src/generic/apt/log.cc:69
 #, c-format
 msgid "Error generating local time (%s)"
 msgstr "ཉེ་གནས་ཀྱི་ཆུ་ཚོད་(%s)བཟོ་བཏོན་འབད་ནི་ལུ་འཛོལ་བ་འདུག"
 
-#: src/generic/apt/log.cc:72
+#: src/generic/apt/log.cc:73
 msgid "log report"
 msgstr "དྲན་དེབ་སྙན་ཞུ།"
 
@@ -2904,19 +2905,19 @@
 "འཐུས་ཤོར་བྱུང་ཡོད་མི་བྱ་བ་ཚུ་མཇུག་མི་བསྡུ་ནིའི་ཉེན་ཁ་ཡོད།\n"
 "\n"
 
-#: src/generic/apt/log.cc:74
+#: src/generic/apt/log.cc:75
 #, c-format
 msgid "Will install %li packages, and remove %li packages.\n"
 msgstr ""
 "%li ཐུམ་སྒྲིལ་ཚུ་གཞི་བཙུགས་འབད་ནི་ཨིནམ་དང་་%li "
 "ཐུམ་སྒྲིལ་ཚུ་རྩ་བསྐྲད་གཏང་འོང་།\n"
 
-#: src/generic/apt/log.cc:78
+#: src/generic/apt/log.cc:79
 #, c-format
 msgid "%sB of disk space will be used\n"
 msgstr "ཌིཀསི་བར་སྟོང་གི་%sB དེ་ལག་ལེན་འཐབ་འོང་།\n"
 
-#: src/generic/apt/log.cc:81
+#: src/generic/apt/log.cc:82
 #, c-format
 msgid "%sB of disk space will be freed\n"
 msgstr "ཌིཀསི་བར་སྟོང་གི་%sB དེ་རང་དབང་སྦེ་བཞག་འོང་།\n"
@@ -2931,51 +2932,51 @@
 msgid "[DOWNGRADE] %s %s -> %s\n"
 msgstr "[མར་ཕབ་འབད།] %s %s -> %s\n"
 
-#: src/generic/apt/log.cc:105
+#: src/generic/apt/log.cc:94
 msgid "REMOVE"
 msgstr "རྩ་བསྐྲད།"
 
-#: src/generic/apt/log.cc:111
+#: src/generic/apt/log.cc:93
 msgid "INSTALL"
 msgstr "གཞི་བཙུགས།"
 
-#: src/generic/apt/log.cc:114
+#: src/generic/apt/log.cc:97
 msgid "REINSTALL"
 msgstr "བསྐྱར་བཙུགས།"
 
-#: src/generic/apt/log.cc:117
+#: src/generic/apt/log.cc:98
 msgid "HOLD"
 msgstr "འཆང།"
 
-#: src/generic/apt/log.cc:120
+#: src/generic/apt/log.cc:99
 msgid "BROKEN"
 msgstr "ཆག་ཡོདཔ།"
 
-#: src/generic/apt/log.cc:123
+#: src/generic/apt/log.cc:100
 msgid "REMOVE, NOT USED"
 msgstr "ལག་ལེན་མ་འཐབ་པར་ཡོདཔ་ལས་རྩ་བསྐྲད་གཏང་།"
 
-#: src/generic/apt/log.cc:126
+#: src/generic/apt/log.cc:101
 msgid "REMOVE, DEPENDENCIES"
 msgstr "བརྟེན་འབྲེལ་ཚུ་རྩ་བསྐྲད་གཏང།"
 
-#: src/generic/apt/log.cc:129
+#: src/generic/apt/log.cc:102
 msgid "INSTALL, DEPENDENCIES"
 msgstr "བརྟེན་འབྲེལ་ཚུ་གཞི་བཙུགས་འབད།"
 
-#: src/generic/apt/log.cc:132
+#: src/generic/apt/log.cc:103
 msgid "HOLD, DEPENDENCIES"
 msgstr "བརྟེན་འབྲེལ་ཚུ་འཆང།"
 
-#: src/generic/apt/log.cc:135
+#: src/generic/apt/log.cc:104
 msgid "UNCONFIGURED"
 msgstr ""
 
-#: src/generic/apt/log.cc:138
+#: src/generic/apt/log.cc:105
 msgid "????????"
 msgstr "????????"
 
-#: src/generic/apt/log.cc:142
+#: src/generic/apt/log.cc:155
 #, c-format
 msgid "[%s] %s\n"
 msgstr "[%s] %s\n"
@@ -2993,13 +2994,13 @@
 "\n"
 "མཇུག་མ་བསྡུ་མི་བསྡམ་བཞག.\n"
 
-#: src/generic/apt/matching/match.cc:3054
-#: src/generic/apt/matching/match.cc:3171
+#: src/generic/apt/matching/match.cc:3083
+#: src/generic/apt/matching/match.cc:3200
 msgid "Accessing index"
 msgstr ""
 
-#: src/generic/apt/matching/match.cc:3064
-#: src/generic/apt/matching/match.cc:3178
+#: src/generic/apt/matching/match.cc:3093
+#: src/generic/apt/matching/match.cc:3207
 msgid "Filtering packages"
 msgstr ""
 
@@ -3033,8 +3034,7 @@
 msgid "Expected '%c', got '%c'."
 msgstr ""
 
-#: src/generic/apt/matching/parse.cc:861
-#: src/generic/apt/matching/parse.cc:1306
+#: src/generic/apt/matching/parse.cc:861 src/generic/apt/matching/parse.cc:1306
 #: src/generic/apt/matching/parse.cc:1346
 #, c-format
 msgid "Unknown dependency type: %s"
@@ -3110,18 +3110,18 @@
 "ཐུམ་སྒྲིལ་ཟུར་ཐོའི་ཡིག་སྣོད་ཚུ་ངན་ཅན་ལུ་གྱུར་སོང་ནུག ཡིག་སྣོད་མིང་མེད: "
 "ཐུམ་སྒྲིལ་%s དེ་གི་དོན་ལུ་ས་སྒོ།"
 
-#: src/cmdline/cmdline_changelog.cc:198 src/generic/apt/pkg_changelog.cc:442
-#: src/generic/apt/pkg_changelog.cc:596 src/view_changelog.cc:272
+#: src/cmdline/cmdline_changelog.cc:195 src/generic/apt/pkg_changelog.cc:450
+#: src/generic/apt/pkg_changelog.cc:615 src/view_changelog.cc:272
 #, c-format
 msgid "Changelog of %s"
 msgstr "%sགི་བསྒྱུར་བཅོས་དྲན་དེབ།"
 
-#: src/generic/apt/pkg_changelog.cc:572 src/generic/apt/pkg_changelog.cc:577
+#: src/generic/apt/pkg_changelog.cc:591 src/generic/apt/pkg_changelog.cc:596
 #, c-format
 msgid "Failed to download changelogs: %s"
 msgstr ""
 
-#: src/generic/apt/pkg_changelog.cc:582
+#: src/generic/apt/pkg_changelog.cc:601
 msgid "Failed to download changelogs: unexpected exception."
 msgstr ""
 
@@ -3157,18 +3157,18 @@
 msgid "Multiple descriptions found for group %s, ignoring one"
 msgstr "%sགུ་དོན་ལུ་ འགྲེལ་བཤད་སྣ་མང་ཐོབ་ཅི། གཅིག་སྣང་མེད་སྦེ་བཞག་དོ།"
 
-#: src/generic/apt/resolver_manager.cc:489
+#: src/generic/apt/resolver_manager.cc:488
 #, c-format
 msgid "Unable to create the output file: child killed by signal %d."
 msgstr ""
 
-#: src/generic/apt/resolver_manager.cc:491
+#: src/generic/apt/resolver_manager.cc:490
 #, c-format
 msgid "Unable to create the output file: child exited with status %d."
 msgstr ""
 
-#: src/generic/apt/resolver_manager.cc:910
-#: src/generic/apt/resolver_manager.cc:912
+#: src/generic/apt/resolver_manager.cc:909
+#: src/generic/apt/resolver_manager.cc:911
 #, c-format
 msgid "Failed to parse the cost settings string: %s"
 msgstr ""
@@ -3202,7 +3202,7 @@
 msgid "Reading task descriptions"
 msgstr "ལས་ཀའི་འགྲེལ་བཤད་ལྷག་དོ།"
 
-#: src/generic/controllers/search_input.cc:110 src/gtk/packagestab.cc:60
+#: src/generic/controllers/search_input.cc:109 src/gtk/packagestab.cc:60
 msgid "Parse error"
 msgstr ""
 
@@ -3218,75 +3218,75 @@
 msgid "A single cost level was both added and lower-bounded."
 msgstr ""
 
-#: src/generic/util/parsers.h:735
+#: src/generic/util/parsers.h:734
 #, c-format
 msgid "Expected '%s', but got EOF."
 msgstr ""
 
-#: src/generic/util/parsers.h:737
+#: src/generic/util/parsers.h:736
 #, c-format
 msgid "Expected '%s', but got '%s'."
 msgstr ""
 
-#: src/generic/util/parsers.h:778
+#: src/generic/util/parsers.h:777
 msgid "Expected any character, but got EOF."
 msgstr ""
 
-#: src/generic/util/parsers.h:791
+#: src/generic/util/parsers.h:790
 msgid "any character"
 msgstr ""
 
-#: src/generic/util/parsers.h:832
+#: src/generic/util/parsers.h:831
 #, c-format
 msgid "Expected %s, but got EOF."
 msgstr ""
 
-#: src/generic/util/parsers.h:843
+#: src/generic/util/parsers.h:842
 #, c-format
 msgid "Expected %s, but got '%c'."
 msgstr ""
 
-#: src/generic/util/parsers.h:1017
+#: src/generic/util/parsers.h:1016
 msgid "Expected an integer, got EOF."
 msgstr ""
 
-#: src/generic/util/parsers.h:1026
+#: src/generic/util/parsers.h:1025
 msgid "Expected an integer following '-', got EOF."
 msgstr ""
 
-#: src/generic/util/parsers.h:1032
+#: src/generic/util/parsers.h:1031
 #, c-format
 msgid "Expected an integer, got '%c'."
 msgstr ""
 
-#: src/generic/util/parsers.h:1046 src/generic/util/parsers.h:1054
+#: src/generic/util/parsers.h:1045 src/generic/util/parsers.h:1053
 #, c-format
 msgid "Invalid integer: \"%s\"."
 msgstr ""
 
-#: src/generic/util/parsers.h:1077
+#: src/generic/util/parsers.h:1076
 #, c-format
 msgid "Expected EOF, got '%c'."
 msgstr ""
 
-#: src/generic/util/parsers.h:1191
+#: src/generic/util/parsers.h:1190
 msgid "anything"
 msgstr ""
 
 #. TRANSLATORS: this is used to generate an error
 #. message; a brief description of what we expected to see
 #. is inserted into it.
-#: src/generic/util/parsers.h:1941 src/generic/util/parsers.h:2034
-#: src/generic/util/parsers.h:2085
+#: src/generic/util/parsers.h:1940 src/generic/util/parsers.h:2033
+#: src/generic/util/parsers.h:2084
 #, c-format
 msgid "Expected %s"
 msgstr ""
 
-#: src/generic/util/parsers.h:2007
+#: src/generic/util/parsers.h:2006
 msgid " or "
 msgstr ""
 
-#: src/generic/util/parsers.h:2770
+#: src/generic/util/parsers.h:2769
 #, c-format
 msgid "Unexpected %s"
 msgstr ""
@@ -3296,32 +3296,32 @@
 msgid "Unable to create temporary directory from template \"%s\": %s"
 msgstr "\"%s\": %s ནང་ལས་གནས་སྐབས་ཀྱི་སྣོད་འཛིན་གསར་བསྐྲུན་འབད་མི་ཚུགས་པས།"
 
-#: src/generic/util/temp.cc:342
+#: src/generic/util/temp.cc:319
 #, c-format
 msgid "Unable to create temporary filename from prefix \"%s\""
 msgstr ""
 
-#: src/generic/util/util.cc:377
+#: src/generic/util/util.cc:372
 #, c-format
 msgid "Unable to stat \"%s\""
 msgstr "\"%s\" དེ་སི་ཊེཊི་འབད་མི་ཚུགས་པས།"
 
-#: src/generic/util/util.cc:383
+#: src/generic/util/util.cc:378
 #, c-format
 msgid "Unable to remove \"%s\""
 msgstr "\"%s\" དེ་རྩ་བསྐྲད་གཏང་མ་ཚུགས།"
 
-#: src/generic/util/util.cc:393
+#: src/generic/util/util.cc:388
 #, c-format
 msgid "Unable to list files in \"%s\""
 msgstr "ཡིག་སྣོད་ཚུ་ \"%s\" དེ་ནང་ལུ་ཐོ་བཀོད་མ་ཚུགས།"
 
-#: src/generic/util/util.cc:410
+#: src/generic/util/util.cc:405
 #, c-format
 msgid "Failure closing directory \"%s\""
 msgstr "སྣོད་ཐོ་\"%s\" དེ་ཁ་བསྡམ་ནི་ལུ་འཐུས་ཤོར་བྱུང་ནུག"
 
-#: src/generic/util/util.cc:416
+#: src/generic/util/util.cc:411
 #, c-format
 msgid "Unable to remove directory \"%s\""
 msgstr "སྣོད་ཐོ་  \"%s\" དེ་རྩ་བསྐྲད་གཏང་མ་ཚུགས།"
@@ -3335,48 +3335,48 @@
 msgid "_File"
 msgstr ""
 
-#: src/gtk/aptitude.glade:28 src/gtk/aptitude.glade:2274 src/ui.cc:2348
+#: src/gtk/aptitude.glade:28 src/gtk/aptitude.glade:2274 src/ui.cc:2371
 msgid "Perform all pending installs and removals"
 msgstr ""
 "བསྣར་ཏེ་ཡོད་པའི་གཞི་བཙུགས་འབད་ནི་དང་རྩ་བསྐྲད་གཏང་ནི་ཚུ་ཆ་མཉམ་ལག་ལེན་འཐབ།"
 
-#: src/gtk/aptitude.glade:38 src/gtk/aptitude.glade:2285 src/ui.cc:2351
+#: src/gtk/aptitude.glade:38 src/gtk/aptitude.glade:2285 src/ui.cc:2374
 msgid "Check for new versions of packages"
 msgstr "ཐུམ་སྒྲིལ་ཚུ་གི་ཐོན་རིམ་གསརཔ་ཚུ་གི་དོན་ལུ་ཞིབ་དཔྱད་འབད།"
 
-#: src/gtk/aptitude.glade:53 src/gtk/aptitude.glade:2301 src/ui.cc:2356
+#: src/gtk/aptitude.glade:53 src/gtk/aptitude.glade:2301 src/ui.cc:2379
 msgid "Mark all upgradable packages which are not held for upgrade"
 msgstr ""
 "ཡར་བསྐྱེད་འབད་བཏུབ་མི་ཐུམ་སྒྲིལ་ཡར་བསྐྱེད་འབད་ནིའི་དོན་ལུ་འཆང་སྟེ་མེད་མི་མི་ཚ"
 "ུ་ཆ་མཉམ་ལུ་རྟགས་བཀལ།"
 
-#: src/gtk/aptitude.glade:63 src/gtk/aptitude.glade:2312 src/ui.cc:2361
+#: src/gtk/aptitude.glade:63 src/gtk/aptitude.glade:2312 src/ui.cc:2384
 msgid "Forget which packages are \"new\""
 msgstr "ཐུམ་སྒྲིལ་ག་དེ་\"new\"ཨིན་ན་སེམས་ཁར་ལས་བརྗེད་ད།"
 
-#: src/gtk/aptitude.glade:72 src/gtk/aptitude.glade:2322 src/ui.cc:2365
+#: src/gtk/aptitude.glade:72 src/gtk/aptitude.glade:2322 src/ui.cc:2388
 msgid "Cancel all pending installations, removals, holds, and upgrades."
 msgstr ""
 "བསྣར་ཏེ་ཡོད་པའི་གཞི་བཙུགས་འབད་ནི་དང་ རྩབསྐྲད་གཏང་ནི་ "
 "འཆང་ནི་དང་ཡར་བསྐྱེད་འབད་ནི་ཚུ་ཆ་མཉམ་ཆ་མེད་གཏང་།"
 
-#: src/gtk/aptitude.glade:81 src/gtk/aptitude.glade:2332 src/ui.cc:2369
+#: src/gtk/aptitude.glade:81 src/gtk/aptitude.glade:2332 src/ui.cc:2392
 msgid "Delete package files which were previously downloaded"
 msgstr "ཧེ་མ་ལས་ཕབ་ལེན་འབད་ཡོའ་པའི་ཐུམ་སྒྲིལ་ཡིག་སྣོད་ཚུ་བཏོན་གཏང་།"
 
-#: src/gtk/aptitude.glade:90 src/gtk/aptitude.glade:2342 src/ui.cc:2373
+#: src/gtk/aptitude.glade:90 src/gtk/aptitude.glade:2342 src/ui.cc:2396
 msgid "Delete package files which can no longer be downloaded"
 msgstr "ད་ལས་ཕར་ཕབ་ལེན་འབད་མ་བཏུབ་མི་ཐུམ་སྒྲིལ་ཡིག་སྣོད་ཚུ་བཏོན་གཏང་།"
 
-#: src/gtk/aptitude.glade:104 src/gtk/aptitude.glade:2357 src/ui.cc:2380
+#: src/gtk/aptitude.glade:104 src/gtk/aptitude.glade:2357 src/ui.cc:2403
 msgid "Reload the package cache"
 msgstr "ཐུམ་སྒྲིལ་འདྲ་མཛོད་དེ་ཡང་བསྐྱར་མངོན་གསལ་འབད།"
 
-#: src/gtk/aptitude.glade:118 src/gtk/aptitude.glade:2372 src/ui.cc:2390
+#: src/gtk/aptitude.glade:118 src/gtk/aptitude.glade:2372 src/ui.cc:2413
 msgid "Restart the program as root; your settings will be preserved"
 msgstr ""
 
-#: src/gtk/aptitude.glade:127 src/gtk/aptitude.glade:2382 src/ui.cc:2393
+#: src/gtk/aptitude.glade:127 src/gtk/aptitude.glade:2382 src/ui.cc:2416
 msgid "Exit the program"
 msgstr "ལས་རིམ་དེ་ཕྱིར་འཐོན་འབད།"
 
@@ -3384,7 +3384,7 @@
 msgid "E_dit"
 msgstr ""
 
-#: src/gtk/aptitude.glade:148 src/gtk/aptitude.glade:2404 src/ui.cc:2400
+#: src/gtk/aptitude.glade:148 src/gtk/aptitude.glade:2404 src/ui.cc:2423
 msgid "Undo the last package operation or group of operations"
 msgstr ""
 "མཇུག་གི་ཐུམ་སྒྲིལ་བཀོལ་སྤྱོད་ ཡང་ན་ བཀོལ་སྤྱོད་སྡེ་ཚན་ཚུ་འབད་བཤོལ་བཞག"
@@ -3416,7 +3416,7 @@
 msgstr ""
 
 #: src/gtk/aptitude.glade:317 src/gtk/aptitude.glade:2576
-#: src/gtk/dashboardtab.cc:740 src/gtk/gui.cc:1603 src/gtk/gui.cc:1801
+#: src/gtk/dashboardtab.cc:739 src/gtk/gui.cc:1603 src/gtk/gui.cc:1801
 msgid "Dashboard"
 msgstr ""
 
@@ -3425,18 +3425,17 @@
 msgstr ""
 
 #: src/gtk/aptitude.glade:347 src/gtk/aptitude.glade:2606 src/gtk/gui.cc:1323
-#: src/qt/tabs_manager.cc:241 src/ui.cc:855 src/ui.cc:857 src/ui.cc:902
-#: src/ui.cc:904 src/ui.cc:930 src/ui.cc:932 src/ui.cc:953 src/ui.cc:955
+#: src/qt/tabs_manager.cc:241 src/ui.cc:884 src/ui.cc:886
 msgid "Packages"
 msgstr "ཐུམ་སྒྲིལ་ཚུ།"
 
 #: src/gtk/aptitude.glade:358 src/gtk/aptitude.glade:2617 src/gtk/gui.cc:1033
-#: src/gtk/previewtab.cc:118 src/qt/tabs_manager.cc:220 src/ui.cc:1396
+#: src/gtk/previewtab.cc:118 src/qt/tabs_manager.cc:220 src/ui.cc:1419
 msgid "Preview"
 msgstr "སྔོན་བལྟ།"
 
 #: src/gtk/aptitude.glade:369 src/gtk/aptitude.glade:2628 src/gtk/gui.cc:1028
-#: src/qt/tabs_manager.cc:263 src/ui.cc:2788
+#: src/qt/tabs_manager.cc:263 src/ui.cc:2813
 msgid "Resolver"
 msgstr "མོས་མཐུན་བཟོ་མི།"
 
@@ -3515,7 +3514,7 @@
 msgid "Fixing upgrade manually:"
 msgstr ""
 
-#: src/gtk/aptitude.glade:1138 src/gtk/dashboardtab.cc:526
+#: src/gtk/aptitude.glade:1138 src/gtk/dashboardtab.cc:525
 msgid "Calculating upgrade..."
 msgstr ""
 
@@ -3602,7 +3601,7 @@
 msgid "Fix Manually"
 msgstr ""
 
-#: src/gtk/aptitude.glade:1656 src/gtk/areas.cc:72 src/gtk/gui.cc:93
+#: src/gtk/aptitude.glade:1656 src/gtk/areas.cc:67 src/gtk/gui.cc:93
 #: src/gtk/gui.cc:1408
 msgid "Upgrade"
 msgstr "ཡར་བསྐྱེད།"
@@ -3640,39 +3639,39 @@
 "You can also modify the files by hand, then click \"No\"."
 msgstr ""
 
-#: src/gtk/areas.cc:73
+#: src/gtk/areas.cc:68
 msgid "Keep your computer up-to-date."
 msgstr ""
 
-#: src/gtk/areas.cc:75
+#: src/gtk/areas.cc:70
 msgid "Browse"
 msgstr ""
 
-#: src/gtk/areas.cc:76
+#: src/gtk/areas.cc:71
 msgid "Explore the available packages."
 msgstr ""
 
-#: src/gtk/areas.cc:78
+#: src/gtk/areas.cc:73
 msgid "Find"
 msgstr ""
 
-#: src/gtk/areas.cc:79
+#: src/gtk/areas.cc:74
 msgid "Search for packages."
 msgstr ""
 
-#: src/gtk/areas.cc:81
+#: src/gtk/areas.cc:76
 msgid "Go"
 msgstr ""
 
-#: src/gtk/areas.cc:82
+#: src/gtk/areas.cc:77
 msgid "Finalize and apply your changes to the system."
 msgstr ""
 
-#: src/gtk/areas.cc:84 src/ui.cc:714 src/ui.cc:716
+#: src/gtk/areas.cc:79 src/ui.cc:712 src/ui.cc:714
 msgid "Preferences"
 msgstr ""
 
-#: src/gtk/areas.cc:85
+#: src/gtk/areas.cc:80
 msgid "Configure aptitude."
 msgstr ""
 
@@ -3725,34 +3724,34 @@
 msgid "Preparing to download the changelog of %s version %s."
 msgstr ""
 
-#: src/gtk/dashboardtab.cc:215
+#: src/gtk/dashboardtab.cc:214
 msgid "Resolve Upgrade Manually"
 msgstr ""
 
-#: src/gtk/dashboardtab.cc:298
+#: src/gtk/dashboardtab.cc:297
 msgid "Preparing to download changelogs"
 msgstr ""
 
-#: src/gtk/dashboardtab.cc:383
+#: src/gtk/dashboardtab.cc:382
 msgid "Available upgrades:"
 msgstr ""
 
-#: src/gtk/dashboardtab.cc:400
+#: src/gtk/dashboardtab.cc:399
 #, c-format
 msgid "%d available upgrade:"
 msgid_plural "%d available upgrades:"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/gtk/dashboardtab.cc:619
+#: src/gtk/dashboardtab.cc:618
 msgid "No upgrades are available."
 msgstr ""
 
-#: src/gtk/dashboardtab.cc:631
+#: src/gtk/dashboardtab.cc:630
 msgid "Unable to calculate an upgrade."
 msgstr ""
 
-#: src/gtk/dashboardtab.cc:640
+#: src/gtk/dashboardtab.cc:639
 #, c-format
 msgid ""
 "Press \"%s\" to install <span size='large'>%d</span> upgrade out of <span "
@@ -3763,7 +3762,7 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/gtk/dashboardtab.cc:652
+#: src/gtk/dashboardtab.cc:651
 #, c-format
 msgid ""
 "Press \"%s\" to manually attempt to install the remaining <span "
@@ -3774,35 +3773,35 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/gtk/dashboardtab.cc:677
+#: src/gtk/dashboardtab.cc:676
 #, c-format
 msgid ""
 "Unable to calculate an upgrade.  Press \"%s\" to manually search for a "
 "solution."
 msgstr ""
 
-#: src/gtk/dashboardtab.cc:694
+#: src/gtk/dashboardtab.cc:693
 #, c-format
 msgid "Internal error encountered while calculating an upgrade: %s"
 msgstr ""
 
-#: src/gtk/dependency_chains_tab.cc:78
+#: src/gtk/dependency_chains_tab.cc:80
 msgid "Find dependency chains: start"
 msgstr ""
 
-#: src/gtk/dependency_chains_tab.cc:82
+#: src/gtk/dependency_chains_tab.cc:84
 msgid "Find dependency chains: end"
 msgstr ""
 
-#: src/gtk/dependency_chains_tab.cc:86
+#: src/gtk/dependency_chains_tab.cc:88
 msgid "Find dependency chains: results"
 msgstr ""
 
-#: src/gtk/dependency_chains_tab.cc:226
+#: src/gtk/dependency_chains_tab.cc:228
 msgid "Select one or more starting packages and an ending package to search."
 msgstr ""
 
-#: src/gtk/dependency_chains_tab.cc:282
+#: src/gtk/dependency_chains_tab.cc:284
 msgid "No dependency chain found."
 msgstr ""
 
@@ -3818,8 +3817,8 @@
 msgid "Already downloaded"
 msgstr ""
 
-#: src/gtk/download.cc:248 src/gtk/entityview.cc:397 src/pkg_columnizer.cc:94
-#: src/pkg_view.cc:675
+#: src/gtk/download.cc:248 src/gtk/entityview.cc:397 src/pkg_columnizer.cc:95
+#: src/pkg_view.cc:643
 msgid "Description"
 msgstr "འགྲེལ་བཤད།"
 
@@ -4033,7 +4032,7 @@
 msgid "Icons showing the current and future status of this package."
 msgstr ""
 
-#: src/gtk/entityview.cc:564 src/pkg_columnizer.cc:103
+#: src/gtk/entityview.cc:564 src/pkg_columnizer.cc:104
 msgid "Auto"
 msgstr "རང་བཞིན་གྱིས།"
 
@@ -4144,7 +4143,7 @@
 msgid "Download already running."
 msgstr ""
 
-#: src/gtk/gui.cc:300 src/gtk/gui.cc:948 src/ui.cc:1527 src/ui.cc:1766
+#: src/gtk/gui.cc:300 src/gtk/gui.cc:948 src/ui.cc:1550 src/ui.cc:1789
 msgid "A package-list update or install run is already taking place."
 msgstr ""
 "ཐུམ་སྒྲིལ་-ཐོ་ཡིག་ཅིག་དུས་མཐུན་བཟོ་ནིི་དང་ ཡང་ན་ "
@@ -4205,7 +4204,7 @@
 msgid "Asking whether to replace the configuration file %s"
 msgstr ""
 
-#: src/gtk/gui.cc:962 src/ui.cc:1267
+#: src/gtk/gui.cc:962 src/ui.cc:1290
 msgid "Downloading packages"
 msgstr "ཐུམ་སྒྲིལ་ཚུ་ཕབ་ལེན་འབད་དོ།"
 
@@ -4302,45 +4301,45 @@
 msgid "Toggle automatic status"
 msgstr ""
 
-#: src/gtk/gui.cc:1780 src/gtk/init.cc:144
+#: src/gtk/gui.cc:1780 src/gtk/init.cc:145
 #, c-format
 msgid "Unable to load the user interface definition file %s/aptitude.glade."
 msgstr ""
 
-#: src/gtk/info.cc:161 src/gtk/pkgview.cc:169
+#: src/gtk/info.cc:159 src/gtk/pkgview.cc:167
 msgid "Current status"
 msgstr ""
 
-#: src/gtk/info.cc:163 src/gtk/pkgview.cc:171
+#: src/gtk/info.cc:161 src/gtk/pkgview.cc:169
 msgid "Selected status"
 msgstr ""
 
-#: src/gtk/info.cc:496
+#: src/gtk/info.cc:494
 msgid "Not available"
 msgstr ""
 
-#: src/gtk/info.cc:545
+#: src/gtk/info.cc:543
 msgid "Package information: version list"
 msgstr ""
 
-#: src/gtk/info.cc:555
+#: src/gtk/info.cc:553
 msgid "Package information: dependency list"
 msgstr ""
 
-#: src/gtk/info.cc:597
+#: src/gtk/info.cc:595
 msgid "Please wait; reloading cache..."
 msgstr ""
 
-#: src/gtk/info.cc:779
+#: src/gtk/info.cc:777
 msgid "Info"
 msgstr ""
 
 #: src/gtk/packageinformation.cc:104 src/gtk/packageinformation.cc:106
-#: src/pkg_columnizer.cc:354 src/pkg_columnizer.cc:375
-#: src/pkg_columnizer.cc:382 src/pkg_grouppolicy.cc:269
-#: src/pkg_info_screen.cc:134 src/pkg_info_screen.cc:135
-#: src/pkg_ver_item.cc:345 src/pkg_ver_item.cc:379 src/qt/package.cc:224
-#: src/qt/version.cc:114
+#: src/pkg_columnizer.cc:351 src/pkg_columnizer.cc:372
+#: src/pkg_columnizer.cc:379 src/pkg_grouppolicy.cc:269
+#: src/pkg_info_screen.cc:144 src/pkg_info_screen.cc:145
+#: src/pkg_ver_item.cc:350 src/pkg_ver_item.cc:384 src/qt/package.cc:226
+#: src/qt/version.cc:117
 msgid "Unknown"
 msgstr "མ་ཤེསཔ།"
 
@@ -4357,44 +4356,44 @@
 msgid "Packages: "
 msgstr ""
 
-#: src/gtk/pkgview.cc:224
+#: src/gtk/pkgview.cc:222
 #, c-format
 msgid "%s was installed automatically."
 msgstr ""
 
-#: src/gtk/pkgview.cc:227
+#: src/gtk/pkgview.cc:225
 #, c-format
 msgid "%s is being installed automatically."
 msgstr ""
 
-#: src/gtk/pkgview.cc:235
+#: src/gtk/pkgview.cc:233
 #, c-format
 msgid "%s was installed manually."
 msgstr ""
 
-#: src/gtk/pkgview.cc:238
+#: src/gtk/pkgview.cc:236
 #, c-format
 msgid "%s is being installed manually."
 msgstr ""
 
-#: src/gtk/pkgview.cc:401
+#: src/gtk/pkgview.cc:399
 msgid "Cache reloading, please wait..."
 msgstr ""
 
-#: src/gtk/pkgview.cc:607
+#: src/gtk/pkgview.cc:605
 msgid "Searching..."
 msgstr ""
 
-#: src/gtk/pkgview.cc:718
+#: src/gtk/pkgview.cc:716
 msgid "Finalizing view"
 msgstr ""
 
-#: src/gtk/pkgview.cc:718 src/pkg_tree.cc:204 src/pkg_tree.cc:215
+#: src/gtk/pkgview.cc:716 src/pkg_tree.cc:204 src/pkg_tree.cc:215
 #: src/pkg_tree.cc:226 src/pkg_tree.cc:238
 msgid "Building view"
 msgstr "མཐོང་སྣང་བཟོ་རྩིག་འབད་དོ།"
 
-#: src/gtk/previewtab.cc:97 src/pkg_grouppolicy.cc:677
+#: src/gtk/previewtab.cc:97 src/pkg_grouppolicy.cc:710
 msgid ""
 "Packages with unsatisfied dependencies\n"
 " The dependency requirements of these packages will be unmet after the "
@@ -4410,7 +4409,7 @@
 "རྩ་འབྲེལ་དེ་ངོ་འཛོམས་སྦེ་ཡོད་མི་དེ་གིས་ ཁྱོད་ཀྱི་རིམ་ལུགས་དང ་ཡང་ན་ "
 "དེ་བི་ཡཱན་ཡིག་མཛོད་ནང་ལུ་ ག་ཅི་ཅིག་ཆད་སོང་ཡོད་པའི་བརྡ་སྟོནམ་ཨིན།"
 
-#: src/gtk/previewtab.cc:98 src/pkg_grouppolicy.cc:678
+#: src/gtk/previewtab.cc:98 src/pkg_grouppolicy.cc:711
 msgid ""
 "Packages being removed because they are no longer used\n"
 " These packages are being deleted because they were automatically installed "
@@ -4424,7 +4423,7 @@
 "འཆར་གཞི་བརྩམས་ཡོད་མི་བྱ་བ་དེ་གིས་གཞི་བཙུགས་འབད་ཡོད་པའི་ཐུམ་སྒྲིལ་ཅིག་ལུ་ཡང་གྲ"
 "ུབ་འབྲས་མི་འབྱུངམ་ཨིན།\n"
 
-#: src/gtk/previewtab.cc:99 src/pkg_grouppolicy.cc:679
+#: src/gtk/previewtab.cc:99 src/pkg_grouppolicy.cc:712
 msgid ""
 "Packages being automatically held in their current state\n"
 " These packages could be upgraded, but they have been kept in their current "
@@ -4435,7 +4434,7 @@
 "དེ་ཚུ་རྟེན་འབྲེལ་ཚུ་རྒྱུན་ཆད་མི་བཅུག་ནིའི་དོན་ལུ་ "
 "དེ་ཚུ་ཁོ་རའི་གནས་ལུགས་ནང་ལུ་བཞག་སྟེ་ཡོདཔ་ཨིན།"
 
-#: src/gtk/previewtab.cc:100 src/pkg_grouppolicy.cc:680
+#: src/gtk/previewtab.cc:100 src/pkg_grouppolicy.cc:713
 msgid ""
 "Packages being automatically installed to satisfy dependencies\n"
 " These packages are being installed because they are required by another "
@@ -4447,7 +4446,7 @@
 "གཞི་བཙུགས་ཀྱི་དོན་ལུ་ཁྱོད་ཀྱིས་གདམ་ཁ་བརྐྱབས་ཡོད་མི་ཐུམ་སྒྲིལ་གཞན་མི་ཅིག་ལུ་དག"
 "ོས་མཁོ་ཡོདཔ་ཨིན།"
 
-#: src/gtk/previewtab.cc:101 src/pkg_grouppolicy.cc:681
+#: src/gtk/previewtab.cc:101 src/pkg_grouppolicy.cc:714
 msgid ""
 "Packages being deleted due to unsatisfied dependencies\n"
 " These packages are being deleted because one or more of their dependencies "
@@ -4459,7 +4458,7 @@
 "དེ་ཚུ་གི་རྟེན་འབྲེལ་གཅིག་ཡང་ན་དེ་ལྷག་སྟེ་ད་ལས་ཕར་འཐོབ་མི་ཚུགས་དོ་ཡོདཔ་དང་ "
 "ཡང་ན་ ཐུམ་སྒྲིལ་གཞན་མི་ཅིག་དེ་ཚུ་དང་མི་མཐུནམ་ཨིན།"
 
-#: src/gtk/previewtab.cc:102 src/pkg_grouppolicy.cc:682
+#: src/gtk/previewtab.cc:102 src/pkg_grouppolicy.cc:715
 msgid ""
 "Packages to be downgraded\n"
 " An older version of these packages than is currently installed will be "
@@ -4469,7 +4468,7 @@
 "ཐུམ་སྒྲིལ་འདི་ཚུ་གི་ཐོན་རིམ་རྙིངམ་འཕྲལ་ཁམས་གཞི་བཙེུགས་འབད་ཡོད་མི་དེ་ "
 "གཞི་བཙུགས་འབད་འོང་།"
 
-#: src/gtk/previewtab.cc:103 src/pkg_grouppolicy.cc:683
+#: src/gtk/previewtab.cc:103 src/pkg_grouppolicy.cc:716
 msgid ""
 "Packages being held back\n"
 " These packages could be upgraded, but you have asked for them to be held at "
@@ -4479,7 +4478,7 @@
 "ཐུམ་སྒྲིལ་འདི་ཚུ་ཡར་བསྐྱེད་འབད་ཚུགས་ དེ་འབདཝ་ད་  "
 "དེ་ཚུ་གིས་ད་ལྟོའི་ཐོན་རིམ་གུར་འཆང་ནིའི་དོན་ལུ་ ཁྱོད་ཀྱིས་འདྲི་དགོཔ་ཨིན།"
 
-#: src/gtk/previewtab.cc:104 src/pkg_grouppolicy.cc:684
+#: src/gtk/previewtab.cc:104 src/pkg_grouppolicy.cc:717
 msgid ""
 "Packages to be reinstalled\n"
 " These packages will be reinstalled."
@@ -4487,7 +4486,7 @@
 "སླར་གཞི་བཙུགས་འབད་ནིའི་ཐུམ་སྒྲིལ་ཚུ།\n"
 "ཐུམ་སྒྲིལ་འདི་ཚུ་སླར་གཞི་བཙུགས་འབད་འོང།"
 
-#: src/gtk/previewtab.cc:105 src/pkg_grouppolicy.cc:685
+#: src/gtk/previewtab.cc:105 src/pkg_grouppolicy.cc:718
 msgid ""
 "Packages to be installed\n"
 " These packages have been manually selected for installation on your "
@@ -4498,7 +4497,7 @@
 "ཁྱོད་ཀྱི་གློག་རིག་གུར་གཞི་བཙུགས་འབད་ནིའི་དོན་ལུ་ལག་ཐོག་ལས་སེལ་འཐུ་འབད་དེ་ཡོདཔ"
 "་ཨིན།"
 
-#: src/gtk/previewtab.cc:106 src/pkg_grouppolicy.cc:686
+#: src/gtk/previewtab.cc:106 src/pkg_grouppolicy.cc:719
 msgid ""
 "Packages to be removed\n"
 " These packages have been manually selected for removal."
@@ -4506,7 +4505,7 @@
 "རྩ་བསྐྲད་གཏང་ནིའི་ཐུམ་སྒྲིལ་ཚུ།\n"
 "ཐུམ་སྒྲིལ་འདི་ཚུ་རྩ་བསྐྲད་གཏང་ནིའི་དོན་ལུ་ལག་ཐོག་ལས་སེལ་འཐུ་འབད་དེ་ཡོདཔ་ཨིན།"
 
-#: src/gtk/previewtab.cc:107 src/pkg_grouppolicy.cc:687
+#: src/gtk/previewtab.cc:107 src/pkg_grouppolicy.cc:720
 msgid ""
 "Packages to be upgraded\n"
 " These packages will be upgraded to a newer version."
@@ -4514,7 +4513,7 @@
 "ཡར་བསྐྱེད་འབད་ནིའི་ཐུམ་སྒྲིལ་ཚུ།\n"
 "ཐུམ་སྒྲིལ་འདི་ཚུ་ཐོན་རིམ་གསར་པའི་ནང་ལུ་ཡར་བསྐྱེད་འབད་འོང་།"
 
-#: src/gtk/previewtab.cc:108 src/pkg_grouppolicy.cc:688
+#: src/gtk/previewtab.cc:108 src/pkg_grouppolicy.cc:721
 msgid ""
 "Packages that are partially installed\n"
 " These packages are not fully installed and configured; an attempt will be "
@@ -4543,7 +4542,7 @@
 msgid "Virtual package"
 msgstr ""
 
-#: src/gtk/resolver.cc:246 src/solution_fragment.cc:457
+#: src/gtk/resolver.cc:246 src/solution_fragment.cc:453
 msgid "Not Installed"
 msgstr "གཞི་བཙུགས་མ་འབད་བས།"
 
@@ -4665,59 +4664,57 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/gtk/resolver.cc:1240 src/solution_fragment.cc:131
+#: src/gtk/resolver.cc:1240 src/solution_fragment.cc:127
 #, c-format
 msgid "%s depends upon %s"
 msgstr "%sདེ་གིས་%sདེ་ལུ་བརྟེན་དོ་ཡོདཔ་ཨིན།"
 
-#: src/gtk/resolver.cc:1243 src/solution_fragment.cc:134
+#: src/gtk/resolver.cc:1243 src/solution_fragment.cc:130
 #, c-format
 msgid "%s pre-depends upon %s"
 msgstr "%s དེ་གིས་ཧེ་མ་རང་%s་དེ་ལུ་བརྟེན་དོ་ཡོདཔ་ཨིན།"
 
-#: src/gtk/resolver.cc:1246 src/solution_fragment.cc:137
+#: src/gtk/resolver.cc:1246 src/solution_fragment.cc:133
 #, c-format
 msgid "%s suggests %s"
 msgstr "%s དེ་གིས་ %s དེ་བསམ་འཆར་བཀོདཔ་ཨིན།"
 
-#: src/gtk/resolver.cc:1249 src/solution_fragment.cc:140
-#: src/solution_item.cc:599
+#: src/gtk/resolver.cc:1249 src/solution_fragment.cc:136
+#: src/solution_item.cc:602
 #, c-format
 msgid "%s recommends %s"
 msgstr "%s་དེ་གིས་%s དེ་འོས་སྦྱོར་འབདཝ་ཨིན།"
 
-#: src/gtk/resolver.cc:1252 src/solution_fragment.cc:143
+#: src/gtk/resolver.cc:1252 src/solution_fragment.cc:139
 #, c-format
 msgid "%s conflicts with %s"
 msgstr "%s་དེ་%s་དང་གཅིག་ཁར་མི་མཐུནམ་ཨིན།"
 
-#: src/gtk/resolver.cc:1255 src/solution_fragment.cc:146
+#: src/gtk/resolver.cc:1255 src/solution_fragment.cc:142
 #, c-format
 msgid "%s breaks %s"
 msgstr ""
 
-#: src/gtk/resolver.cc:1258 src/solution_fragment.cc:149
+#: src/gtk/resolver.cc:1258 src/solution_fragment.cc:145
 #, c-format
 msgid "%s replaces %s"
 msgstr "%s དེགིས་%sདེ་ཚབ་བཙུགསཔ་ཨིན།"
 
-#: src/gtk/resolver.cc:1261 src/solution_fragment.cc:152
+#: src/gtk/resolver.cc:1261 src/solution_fragment.cc:148
 #, c-format
 msgid "%s obsoletes %s"
 msgstr "%s དེགིས་%s ཕན་མེད་བཟོཝ་ཨིན།"
 
-#: src/gtk/resolver.cc:1264 src/solution_fragment.cc:155
+#: src/gtk/resolver.cc:1264 src/solution_fragment.cc:151
 #, c-format
 msgid "%s enhances %s"
 msgstr ""
 
-#: src/gtk/resolver.cc:1376 src/gtk/resolver.cc:1841
-#: src/solution_screen.cc:272
+#: src/gtk/resolver.cc:1376 src/gtk/resolver.cc:1841 src/solution_screen.cc:272
 msgid "Remove the following packages:"
 msgstr "འོག་ལུ་ཡོད་མི་ཐུམ་སྒྲིལ་ཚུ་རཙ་བསྐྲད་གཏང:"
 
-#: src/gtk/resolver.cc:1390 src/gtk/resolver.cc:1853
-#: src/solution_screen.cc:296
+#: src/gtk/resolver.cc:1390 src/gtk/resolver.cc:1853 src/solution_screen.cc:296
 msgid "Install the following packages:"
 msgstr "འོག་ལུ་ཡོད་མི་ཐུམ་སྒྲིལ་དེ་ཚུ་གཞི་བཙུགས་འབད:"
 
@@ -4725,18 +4722,16 @@
 msgid "Keep the following packages:"
 msgstr ""
 
-#: src/gtk/resolver.cc:1416 src/gtk/resolver.cc:1877
-#: src/solution_screen.cc:308
+#: src/gtk/resolver.cc:1416 src/gtk/resolver.cc:1877 src/solution_screen.cc:308
 msgid "Upgrade the following packages:"
 msgstr "འོག་ལུ་ཡོད་མི་ཐུམ་སྒྲིལ་དེ་ཚུ་ཡར་བསྐྱེད་འབད:"
 
-#: src/gtk/resolver.cc:1429 src/gtk/resolver.cc:1890
-#: src/solution_screen.cc:320
+#: src/gtk/resolver.cc:1429 src/gtk/resolver.cc:1890 src/solution_screen.cc:320
 msgid "Downgrade the following packages:"
 msgstr "འོག་ལུ་ཡོད་མི་ཐུམ་སྒྲིལ་དེ་ཚུ་མར་ཕབ་འབད:"
 
 #: src/gtk/resolver.cc:1442 src/gtk/resolver.cc:1903
-#: src/solution_fragment.cc:513
+#: src/solution_fragment.cc:509
 msgid "Leave the following dependencies unresolved:"
 msgstr ""
 
@@ -4957,98 +4952,98 @@
 msgid "Ignoring invalid keybinding \"%s\" -> \"%s\""
 msgstr "ནུས་མེད་ཀྱི་ཀི་བཱའིན་ཌིང་སྣང་མེད་སྦེ་བཞག་དོ། \"%s\" -> \"%s\""
 
-#: src/load_grouppolicy.cc:289
+#: src/load_grouppolicy.cc:290
 #, c-format
 msgid "Expected policy identifier, got '%c'"
 msgstr "རེ་བ་ཡོད་པའི་་སྲིད་བྱུས་ངེས་འཛིན་པ། ཐོབ་ཡོདཔ་'%c'"
 
-#: src/load_grouppolicy.cc:305
+#: src/load_grouppolicy.cc:306
 #, c-format
 msgid "Expected ',', '%c', or '('; got '%c'"
 msgstr ""
 
-#: src/load_grouppolicy.cc:309
+#: src/load_grouppolicy.cc:310
 #, c-format
 msgid "Expected ',' or '(', got '%c'"
 msgstr "རེ་བ་ཡོད་མི་','ཡང་ན་ '(',ཐོབ་ཡོདཔ།'%c'"
 
-#: src/load_grouppolicy.cc:317
+#: src/load_grouppolicy.cc:318
 #, c-format
 msgid "Unknown grouping policy \"%s\""
 msgstr "མ་ཤེས་པའི་སྡེ་ཚན་བཟོ་ནིའི་སྲིད་བྱུས་\"%s\""
 
-#: src/load_grouppolicy.cc:324
+#: src/load_grouppolicy.cc:325
 #, c-format
 msgid "Terminal policy '%s' should be the last policy in the list"
 msgstr ""
 "ཊར་མི་ནཱལ་སྲིད་བྱུས་'%s' དེ་ ཐོ་ཡིག་ནང་གི་སྲིདབྱུས་མཇུག་ཨིན་དགོཔ་ཨིན།"
 
-#: src/load_grouppolicy.cc:385
+#: src/load_grouppolicy.cc:386
 msgid "Unmatched '(' in grouping policy"
 msgstr ""
 
-#: src/load_grouppolicy.cc:413
+#: src/load_grouppolicy.cc:414
 #, c-format
 msgid "Bad section name '%s' (use 'none', 'topdir', 'subdir', or 'subdirs')"
 msgstr ""
 
-#: src/load_grouppolicy.cc:423
+#: src/load_grouppolicy.cc:424
 #, c-format
 msgid "Bad passthrough setting '%s' (use 'passthrough' or 'nopassthrough')"
 msgstr ""
 "སྒྲིག་སྟངས་'%s'བརྒྱུད་དེ་ བརྒྱུད་དེ་འགྱོ་བ་བྱང་ཉེས།(use 'བརྒྱུད་དེ་འགྱོ་བ'' "
 "ཡང་ན་ 'བརྒྱུད་དེ་མ་འགྱོ་བ་')"
 
-#: src/load_grouppolicy.cc:428 src/load_grouppolicy.cc:544
-#: src/load_grouppolicy.cc:621
+#: src/load_grouppolicy.cc:429 src/load_grouppolicy.cc:557
+#: src/load_grouppolicy.cc:627
 #, c-format
 msgid "Too many arguments to '%s' grouping policy"
 msgstr ""
 
-#: src/load_grouppolicy.cc:441 src/load_grouppolicy.cc:521
-#: src/load_grouppolicy.cc:532 src/load_grouppolicy.cc:555
-#: src/load_grouppolicy.cc:566 src/load_grouppolicy.cc:577
-#: src/load_grouppolicy.cc:608 src/load_grouppolicy.cc:766
+#: src/load_grouppolicy.cc:442 src/load_grouppolicy.cc:522
+#: src/load_grouppolicy.cc:570 src/load_grouppolicy.cc:581
+#: src/load_grouppolicy.cc:592 src/load_grouppolicy.cc:603
+#: src/load_grouppolicy.cc:614 src/load_grouppolicy.cc:772
 #, c-format
 msgid "Grouping policy '%s' takes no arguments"
 msgstr ""
 
-#: src/load_grouppolicy.cc:460 src/load_grouppolicy.cc:636
+#: src/load_grouppolicy.cc:461 src/load_grouppolicy.cc:642
 #, c-format
 msgid "Expected '(' after '%s'"
 msgstr ""
 
-#: src/load_grouppolicy.cc:497
+#: src/load_grouppolicy.cc:498
 #, c-format
 msgid "Unable to parse pattern at '%s'"
 msgstr "'%s' གུར་དཔེ་གཞི་མིང་དཔྱད་འབད་མི་ཚུགས་པས།"
 
-#: src/load_grouppolicy.cc:502
+#: src/load_grouppolicy.cc:503
 msgid ""
 "Exactly one filter must be provided as an argument to a 'filter' policy"
 msgstr ""
 
-#: src/load_grouppolicy.cc:644
+#: src/load_grouppolicy.cc:650
 #, c-format
 msgid "Missing arguments to '%s' grouping policy"
 msgstr ""
 
-#: src/load_grouppolicy.cc:667
+#: src/load_grouppolicy.cc:673
 #, c-format
 msgid "Unable to parse pattern after \"%s\""
 msgstr "\"%s\"གི་ཤུལ་ལས་དཔེ་གཞི་དེ་མིང་དཔྱད་འབད་མི་ཚུགས།"
 
-#: src/load_grouppolicy.cc:705
+#: src/load_grouppolicy.cc:684
 #, c-format
 msgid "Unexpectedly empty tree title after \"%s\""
 msgstr "\"%s\"གི་ཤུལ་ལས་ དཔྱད་རིས་མེད་སི་སི་སྦེ་ ཤིང་སྟོངམ་གྱི་མགོ་མིིང་།"
 
-#: src/load_grouppolicy.cc:724
+#: src/load_grouppolicy.cc:730
 #, c-format
 msgid "Expected '{', ')', or ',' following '||', got '%s'"
 msgstr ""
 
-#: src/load_grouppolicy.cc:750
+#: src/load_grouppolicy.cc:756
 #, c-format
 msgid "Unmatched '(' in '%s' grouping policy"
 msgstr ""
@@ -5602,73 +5597,73 @@
 msgid "Invalid logger name \"%s\"."
 msgstr ""
 
-#: src/main.cc:763
+#: src/main.cc:807
 #, c-format
 msgid "Expected a number after -q=\n"
 msgstr "-q= དེ་གི་ཤུལ་ལས་ཨང་ཡིག་ཅིག་རེ་བ་བསྐྱེད་ཅི།\n"
 
-#: src/main.cc:772
+#: src/main.cc:816
 #, c-format
 msgid "Expected a number after -q=, got %s\n"
 msgstr "-q=, got %sདེ་གི་ཤུལ་ལས་ཨང་ཡིག་ཅིག་རེ་བ་བསྐྱེད་ཅི།\n"
 
-#: src/main.cc:796
+#: src/main.cc:840
 #, c-format
 msgid "-o requires an argument of the form key=value, got %s\n"
 msgstr ""
 
-#: src/main.cc:886
+#: src/main.cc:930
 #, c-format
 msgid "No comma following tag name \"%s\".\n"
 msgstr ""
 
-#: src/main.cc:978 src/main.cc:988
+#: src/main.cc:1022 src/main.cc:1032
 msgid "WEIRDNESS: unknown option code received\n"
 msgstr "WEIRDNESS:མ་ཤེས་པའི་གདམ་ཁའི་ཨང་རྟགས་ཐོབ་ཡོདཔ།\n"
 
-#: src/main.cc:1006
+#: src/main.cc:1050
 msgid "--show-package-names|never"
 msgstr ""
 
-#: src/main.cc:1009
+#: src/main.cc:1053
 msgid "--show-package-names|auto"
 msgstr ""
 
-#: src/main.cc:1012
+#: src/main.cc:1056
 msgid "--show-package-names|always"
 msgstr ""
 
-#: src/main.cc:1017
+#: src/main.cc:1061
 #, c-format
 msgid ""
 "Invalid package names display mode \"%s\" (should be \"never\", \"auto\", or "
 "\"always\")."
 msgstr ""
 
-#: src/main.cc:1023
+#: src/main.cc:1067
 msgid "no-summary"
 msgstr ""
 
-#: src/main.cc:1025
+#: src/main.cc:1069
 msgid "first-package"
 msgstr ""
 
-#: src/main.cc:1027
+#: src/main.cc:1071
 msgid "first-package-and-type"
 msgstr ""
 
-#: src/main.cc:1029
+#: src/main.cc:1073
 msgid "all-packages"
 msgstr ""
 
-#: src/main.cc:1031
+#: src/main.cc:1075
 msgid "all-packages-with-dep-versions"
 msgstr ""
 
 #. TRANSLATORS: "why" here is the aptitude command name and should not
 #. be translated.  Both the translated and the untranslated log level
 #. names are accepted here.
-#: src/main.cc:1038
+#: src/main.cc:1082
 #, c-format
 msgid ""
 "Invalid \"why\" summary mode \"%s\": expected \"no-summary\", \"first-"
@@ -5676,40 +5671,40 @@
 "with-dep-versions\"."
 msgstr ""
 
-#: src/main.cc:1079
+#: src/main.cc:1123
 msgid ""
 "Only one of --auto-clean-on-startup, --clean-on-startup, -i, and -u may be "
 "specified\n"
 msgstr ""
 
-#: src/main.cc:1088
+#: src/main.cc:1132
 msgid ""
 "-u, -i, and --clean-on-startup may not be specified in command-line mode "
 "(eg, with 'install')"
 msgstr ""
 
-#: src/main.cc:1105
+#: src/main.cc:1149
 msgid "-u, -i, and --clean-on-startup may not be specified with a command"
 msgstr ""
 
-#: src/main.cc:1216
+#: src/main.cc:1260
 #, c-format
 msgid "Unknown command \"%s\"\n"
 msgstr "མ་ཤེས་པའི་བརྡ་བཀོད་\"%s\"\n"
 
-#: src/main.cc:1228 src/main.cc:1313
+#: src/main.cc:1272 src/main.cc:1357
 #, c-format
 msgid "Uncaught exception: %s\n"
 msgstr "མ་འཛིན་པའི་དང་ལེན: %s\n"
 
-#: src/main.cc:1232 src/main.cc:1317
+#: src/main.cc:1276 src/main.cc:1361
 #, c-format
 msgid ""
 "Backtrace:\n"
 "%s\n"
 msgstr ""
 
-#: src/menu_text_layout.cc:43 src/menu_tree.cc:232 src/ui.cc:260
+#: src/menu_text_layout.cc:43 src/menu_tree.cc:232 src/ui.cc:258
 #: src/view_changelog.cc:168
 msgid "Search for: "
 msgstr "དོན་ལུ་འཚོལ་ཞིབ་འབད: "
@@ -5718,7 +5713,7 @@
 msgid "Search backwards for: "
 msgstr "དོན་ལུ་རྒྱབ་ལོག་སྦེ་འཛོལ་ཞིབ་འབད: "
 
-#: src/mine/cmine.cc:115 src/mine/cmine.cc:154 src/ui.cc:1771
+#: src/mine/cmine.cc:115 src/mine/cmine.cc:154 src/ui.cc:1794
 msgid "Minesweeper"
 msgstr "གཏེར་ཁ་འཕྱག་མི།"
 
@@ -5758,63 +5753,63 @@
 msgid "Could not load game from %s"
 msgstr "%sནང་ལས་རྩེདམོ་ཕབ་ལེན་འབད་མ་ཚུགས།"
 
-#: src/mine/cmine.cc:247
+#: src/mine/cmine.cc:242
 msgid "The board height must be a positive integer"
 msgstr "རྩེད་པང་གི་མཐོ་ཚད་དེ་ཡོད་ཆའི་ཧྲིལ་ཨང་ཨིན་དགོཔ་ཨིན།"
 
-#: src/mine/cmine.cc:258
+#: src/mine/cmine.cc:253
 msgid "The board width must be a positive integer"
 msgstr "རྩེད་པང་གི་རྒྱ་ཚད་དེ་ཡོད་ཆའི་ཧྲིལ་ཨང་ཨིན་དགོཔ་ཨིན།"
 
-#: src/mine/cmine.cc:269
+#: src/mine/cmine.cc:264
 msgid "Invalid mine count; please enter a positive integer"
 msgstr "ནུས་མེད་འགས་རྫས་གྱངས་ཁ་; ཡོད་ཆའི་ཧྲིལ་ཨང་ཐོ་བཀོད་འབད་གནང་།"
 
-#: src/mine/cmine.cc:289
+#: src/mine/cmine.cc:284
 msgid "Setup custom game"
 msgstr "གཞི་སྒྲིག་སྲོོལ་སྒྲིག་གི་རྩེདམོ།"
 
-#: src/mine/cmine.cc:291
+#: src/mine/cmine.cc:286
 msgid "Height of board: "
 msgstr "རྩེད་པང་གི་མཐོ་ཚདཝ: "
 
-#: src/mine/cmine.cc:294
+#: src/mine/cmine.cc:289
 msgid "Width of board: "
 msgstr "རྩེད་པང་གི་རྒྱ་ཚད: "
 
-#: src/mine/cmine.cc:297
+#: src/mine/cmine.cc:292
 msgid "Number of mines: "
 msgstr "འགས་རྫས་ཀྱི་གྱངས་ཁ: "
 
-#: src/mine/cmine.cc:300 src/mine/cmine.cc:365 src/ui.cc:293 src/ui.cc:365
+#: src/mine/cmine.cc:295 src/mine/cmine.cc:360 src/ui.cc:291 src/ui.cc:363
 msgid "Ok"
 msgstr "བཏུབ།"
 
-#: src/mine/cmine.cc:358
+#: src/mine/cmine.cc:353
 msgid "Choose difficulty level"
 msgstr "དཀའ་ཚེགས་ཅན་གྱི་གནས་རིམ་གདམ་ཁ་རྐྱབས།"
 
-#: src/mine/cmine.cc:360
+#: src/mine/cmine.cc:355
 msgid "Easy"
 msgstr "འཇམ་ཏོང་ཏོ།"
 
-#: src/mine/cmine.cc:361
+#: src/mine/cmine.cc:356
 msgid "Medium"
 msgstr "འབྲིང་མ།"
 
-#: src/mine/cmine.cc:362
+#: src/mine/cmine.cc:357
 msgid "Hard"
 msgstr "ལཱ་ཁག"
 
-#: src/mine/cmine.cc:363
+#: src/mine/cmine.cc:358
 msgid "Custom"
 msgstr "སྲོལ་སྒྲིག"
 
-#: src/mine/cmine.cc:461
+#: src/mine/cmine.cc:456
 msgid "You have won."
 msgstr "ཁྱོད་ཀྱིས་རྒྱལ་ཁ་ཐོབ་ཅི།"
 
-#: src/mine/cmine.cc:464
+#: src/mine/cmine.cc:459
 msgid "You lose!"
 msgstr "ཁྱོད་བམ་སོང་ཡི!"
 
@@ -5913,246 +5908,246 @@
 msgid "You are jolted by a surge of electricity!  --More--"
 msgstr "ཁྱོད་གློག་རླབས་ཀྱིས་བརྡབ་དཀྲུག་གཏང་ནུག!--ཧེང་བཀལ།--"
 
-#: src/mine/cmine.cc:655
+#: src/mine/cmine.cc:657
 msgid "Enter the filename to load: "
 msgstr "ཕབ་ལེན་འབད་ནིའི་དོན་ལུ་ ཡིཡག་སྣོད་ཀྱི་མིང་དེ་ཐོ་བཀོད་འབད: "
 
-#: src/mine/cmine.cc:662
+#: src/mine/cmine.cc:664
 msgid "Enter the filename to save: "
 msgstr "སྲུང་བཞག་འབད་ནིའིདོན་ལུ་ ཡིག་སྣོད་ཀྱི་མིང་དེ་ཐོ་བཀོད་འབད: "
 
-#: src/mine/cmine.cc:670
+#: src/mine/cmine.cc:672
 msgid "mine-help.txt"
 msgstr "འགས་རྫས་-གྲོགས་རམ་.ཊི་ཨེགསི་ཊི།"
 
-#: src/mine/cmine.cc:672
+#: src/mine/cmine.cc:674
 msgid "Encoding of mine-help.txt|UTF-8"
 msgstr "འགས་རྫས་-གྲོགས་རམ་གྱི་ཨིན་ཀོ་ཌིང་། ཊི་ཨེགསི་ཊི་|ཡུ་ཊི་ཨེཕ་-༨།"
 
-#: src/pkg_columnizer.cc:86
+#: src/pkg_columnizer.cc:87
 msgid "30 8 8 1 1 40 14 14 11 10 35 9 10 2 1 1 10 9 12 30 17 15"
 msgstr "30 8 8 1 1 40 14 14 11 10 35 9 10 2 1 1 10 9 12 30 19 15"
 
-#: src/pkg_columnizer.cc:89 src/ui.cc:2787
+#: src/pkg_columnizer.cc:90 src/ui.cc:2812
 msgid "Package"
 msgstr "ཐུམ་སྒྲིལ།"
 
-#: src/pkg_columnizer.cc:90
+#: src/pkg_columnizer.cc:91
 msgid "InstSz"
 msgstr "InstSz"
 
-#: src/pkg_columnizer.cc:91
+#: src/pkg_columnizer.cc:92
 msgid "DebSz"
 msgstr "DebSz"
 
-#: src/pkg_columnizer.cc:93
+#: src/pkg_columnizer.cc:94
 msgid "Action"
 msgstr "བྱ་བ།"
 
-#: src/pkg_columnizer.cc:95
+#: src/pkg_columnizer.cc:96
 msgid "InstVer"
 msgstr "InstVer"
 
-#: src/pkg_columnizer.cc:96
+#: src/pkg_columnizer.cc:97
 msgid "CandVer"
 msgstr "CandVer"
 
-#: src/pkg_columnizer.cc:97
+#: src/pkg_columnizer.cc:98
 msgid "LongState"
 msgstr "LongState"
 
-#: src/pkg_columnizer.cc:98
+#: src/pkg_columnizer.cc:99
 msgid "LongAction"
 msgstr "བྱ་བ་རིངམོ།"
 
-#: src/pkg_columnizer.cc:99 src/qt/widgets/packages_tab.cc:105
+#: src/pkg_columnizer.cc:100 src/qt/widgets/packages_tab.cc:105
 msgid "Maintainer"
 msgstr "རྒྱུན་སྐྱོང་པ།"
 
-#: src/pkg_columnizer.cc:100
+#: src/pkg_columnizer.cc:101
 msgid "Priority"
 msgstr "གཙོ་རིམ།"
 
-#: src/pkg_columnizer.cc:101
+#: src/pkg_columnizer.cc:102
 msgid "Section"
 msgstr "དབྱེ་ཚན།"
 
-#: src/pkg_columnizer.cc:102
+#: src/pkg_columnizer.cc:103
 msgid "RC"
 msgstr "ཨཱར་སི།"
 
-#: src/pkg_columnizer.cc:104
+#: src/pkg_columnizer.cc:105
 msgid "Tag"
 msgstr "ངོ་རྟགས།"
 
-#: src/pkg_columnizer.cc:107
+#: src/pkg_columnizer.cc:108
 msgid "ProgName"
 msgstr "ལས་རིམ་གྱི་མིང་།"
 
-#: src/pkg_columnizer.cc:108
+#: src/pkg_columnizer.cc:109
 msgid "ProgVer"
 msgstr "ལས་རིམ་གྱི་ཐོན་རིམ།"
 
-#: src/pkg_columnizer.cc:109
+#: src/pkg_columnizer.cc:110
 msgid "#Broken"
 msgstr "#ཆག་ཆགཔ།"
 
-#: src/pkg_columnizer.cc:110
+#: src/pkg_columnizer.cc:111
 msgid "DiskUsage"
 msgstr "ཌིཀསི་ལག་ལེན།"
 
-#: src/pkg_columnizer.cc:111
+#: src/pkg_columnizer.cc:112
 msgid "DownloadSize"
 msgstr "ཕབ་ལེན་གྱི་ཚད།"
 
-#: src/pkg_columnizer.cc:139 src/pkg_columnizer.cc:151 src/pkg_ver_item.cc:99
-#: src/pkg_ver_item.cc:164
+#: src/pkg_columnizer.cc:140 src/pkg_columnizer.cc:152 src/pkg_ver_item.cc:98
+#: src/pkg_ver_item.cc:163
 msgid "<N/A>"
 msgstr "<ཨེན/ཨེ།>"
 
-#: src/pkg_columnizer.cc:181 src/pkg_columnizer.cc:192
+#: src/pkg_columnizer.cc:182 src/pkg_columnizer.cc:193
 msgid "<none>"
 msgstr "<ཅི་མེད།>"
 
-#: src/pkg_columnizer.cc:238 src/pkg_grouppolicy.cc:264
-#: src/pkg_grouppolicy.cc:1747 src/qt/package.cc:234
+#: src/pkg_columnizer.cc:237 src/pkg_grouppolicy.cc:264
+#: src/pkg_grouppolicy.cc:1673 src/qt/package.cc:236
 #: src/qt/widgets/packages_tab.cc:73
 msgid "virtual"
 msgstr "བར་ཅུ་ཡལ།"
 
-#: src/pkg_columnizer.cc:245 src/pkg_ver_item.cc:214 src/pkg_ver_item.cc:222
+#: src/pkg_columnizer.cc:244 src/pkg_ver_item.cc:215 src/pkg_ver_item.cc:223
 msgid "purged"
 msgstr "ཕྱིར་བསྐྲད།"
 
-#: src/pkg_columnizer.cc:252 src/pkg_ver_item.cc:229
+#: src/pkg_columnizer.cc:251 src/pkg_ver_item.cc:230
 msgid "half-config"
 msgstr "རིམ་སྒྲིག་-ཕྱད་ཀ"
 
-#: src/pkg_columnizer.cc:254 src/pkg_ver_item.cc:231
+#: src/pkg_columnizer.cc:253 src/pkg_ver_item.cc:232
 msgid "half-install"
 msgstr "གཞི་བཙུགས་-ཕྱེ་ཀ"
 
-#: src/pkg_columnizer.cc:256 src/pkg_ver_item.cc:233
+#: src/pkg_columnizer.cc:255 src/pkg_ver_item.cc:234
 msgid "config-files"
 msgstr "རིམ་སྒྲིག་- ཡིག་སྣོད།"
 
-#: src/pkg_columnizer.cc:261
+#: src/pkg_columnizer.cc:259 src/pkg_ver_item.cc:238
 msgid "triggers-awaited"
 msgstr ""
 
-#: src/pkg_columnizer.cc:263
+#: src/pkg_columnizer.cc:261 src/pkg_ver_item.cc:240
 msgid "triggers-pending"
 msgstr ""
 
-#: src/pkg_columnizer.cc:266 src/pkg_columnizer.cc:551 src/pkg_ver_item.cc:237
+#: src/pkg_columnizer.cc:263 src/pkg_columnizer.cc:548 src/pkg_ver_item.cc:242
 msgid "ERROR"
 msgstr "འཛོལ་བ།"
 
-#: src/pkg_columnizer.cc:313 src/pkg_ver_item.cc:295
+#: src/pkg_columnizer.cc:310 src/pkg_ver_item.cc:300
 msgid "hold"
 msgstr "འཆང་།"
 
-#: src/pkg_columnizer.cc:316
+#: src/pkg_columnizer.cc:313
 msgid "forbidden upgrade"
 msgstr "ཡར་བསྐྱེད་བཀག་དམ་འབད་ཡོདཔ།"
 
-#: src/pkg_columnizer.cc:318
+#: src/pkg_columnizer.cc:315
 msgid "purge"
 msgstr "ཕྱིར་བསྐྲད།"
 
-#: src/pkg_columnizer.cc:318 src/pkg_ver_item.cc:319
+#: src/pkg_columnizer.cc:315 src/pkg_ver_item.cc:324
 msgid "delete"
 msgstr "བཏོན་གཏང་།"
 
-#: src/pkg_columnizer.cc:320 src/pkg_ver_item.cc:217 src/pkg_ver_item.cc:301
+#: src/pkg_columnizer.cc:317 src/pkg_ver_item.cc:218 src/pkg_ver_item.cc:306
 msgid "broken"
 msgstr "ཆག་ཆགཔ།"
 
-#: src/pkg_columnizer.cc:322 src/pkg_ver_item.cc:305 src/pkg_ver_item.cc:312
-#: src/pkg_ver_item.cc:321
+#: src/pkg_columnizer.cc:319 src/pkg_ver_item.cc:310 src/pkg_ver_item.cc:317
+#: src/pkg_ver_item.cc:326
 msgid "install"
 msgstr "གཞི་བཙུགས།"
 
-#: src/pkg_columnizer.cc:324
+#: src/pkg_columnizer.cc:321
 msgid "reinstall"
 msgstr "སླར་གཞི་བཙུགས་འབད་ཡོདཔ།"
 
-#: src/pkg_columnizer.cc:326
+#: src/pkg_columnizer.cc:323
 msgid "upgrade"
 msgstr "ཡར་བསྐྱེད།"
 
-#: src/pkg_columnizer.cc:328 src/pkg_columnizer.cc:330 src/pkg_ver_item.cc:307
-#: src/pkg_ver_item.cc:314 src/pkg_ver_item.cc:323 src/pkg_ver_item.cc:326
+#: src/pkg_columnizer.cc:325 src/pkg_columnizer.cc:327 src/pkg_ver_item.cc:312
+#: src/pkg_ver_item.cc:319 src/pkg_ver_item.cc:328 src/pkg_ver_item.cc:331
 msgid "none"
 msgstr "ཅི་མེད།"
 
 #. TRANSLATORS: Imp = Important
-#: src/pkg_columnizer.cc:362 src/pkg_ver_item.cc:354
+#: src/pkg_columnizer.cc:359 src/pkg_ver_item.cc:359
 msgid "Imp"
 msgstr "ཨའི་ཨེམ་པི།"
 
 #. TRANSLATORS: Req = Required
-#: src/pkg_columnizer.cc:364 src/pkg_ver_item.cc:357
+#: src/pkg_columnizer.cc:361 src/pkg_ver_item.cc:362
 msgid "Req"
 msgstr "ཨའར་ཀེཡུ།"
 
 #. TRANSLATORS: Std = Standard
-#: src/pkg_columnizer.cc:366 src/pkg_ver_item.cc:360
+#: src/pkg_columnizer.cc:363 src/pkg_ver_item.cc:365
 msgid "Std"
 msgstr "ཨེསི་ཊི་ཌི།"
 
 #. TRANSLATORS: Opt = Optional
-#: src/pkg_columnizer.cc:368 src/pkg_ver_item.cc:363
+#: src/pkg_columnizer.cc:365 src/pkg_ver_item.cc:368
 msgid "Opt"
 msgstr "ཨོ་པི་ཊི།"
 
 #. TRANSLATORS: Xtr = Extra
-#: src/pkg_columnizer.cc:370 src/pkg_ver_item.cc:366
+#: src/pkg_columnizer.cc:367 src/pkg_ver_item.cc:371
 msgid "Xtr"
 msgstr "ཨེགསི་ཊི་ཨཱར།"
 
-#: src/pkg_columnizer.cc:372 src/pkg_ver_item.cc:368
+#: src/pkg_columnizer.cc:369 src/pkg_ver_item.cc:373
 msgid "ERR"
 msgstr "ཨི་ཨཱར་ཨཱར།"
 
-#: src/pkg_columnizer.cc:394
+#: src/pkg_columnizer.cc:391
 #, c-format
 msgid "#Broken: %ld"
 msgstr "#ཆག་ཆགཔ: %ld"
 
-#: src/pkg_columnizer.cc:409
+#: src/pkg_columnizer.cc:406
 #, c-format
 msgid "Will use %sB of disk space"
 msgstr "ཌིཀསི་བར་སྟོང་གི་%sB དེ་ལག་ལེན་འཐབ་འོང་།"
 
-#: src/pkg_columnizer.cc:417
+#: src/pkg_columnizer.cc:414
 #, c-format
 msgid "Will free %sB of disk space"
 msgstr "ཌིཀསི་བར་སྟོང་གི་%sB དེ་རང་དབང་སབེ་བཞག་ནི་ཨན།"
 
-#: src/pkg_columnizer.cc:431
+#: src/pkg_columnizer.cc:428
 #, c-format
 msgid "DL Size: %sB"
 msgstr "དི་ཨེལ་ཚད: %sB"
 
 #. TRANSLATORS: Hostname
-#: src/pkg_columnizer.cc:499
+#: src/pkg_columnizer.cc:496
 msgid "HN too long"
 msgstr "ཨེཆ་ཨེན་ གནམ་མེད་ས་མེད་རིངམོ་འདུག"
 
-#: src/pkg_columnizer.cc:676 src/pkg_columnizer.cc:685
+#: src/pkg_columnizer.cc:679 src/pkg_columnizer.cc:691
 #, c-format
 msgid "Unable to transcode package display format after \"%ls\""
 msgstr ""
 "\"%ls\"དེ་གི་ཤུལ་ལས་ "
 "ཐུམ་སྒྲིལ་བཀྲམ་སྟོན་རྩ་སྒྲིག་དེ་ཊནསི་ཀོཌི་འབད་མི་ཚུགས་པས།"
 
-#: src/pkg_columnizer.cc:692
+#: src/pkg_columnizer.cc:698
 msgid "Internal error: Default column string is unparsable"
 msgstr ""
 "ནང་འཁོད་འཛོལ་བ: སྔོན་སྒྲིག་ཀོར་ཐིག་ཡིག་རྒྱུན་དེ་མིང་དཔྱད་འབད་མ་བཏུབ་མི་ཨིན།"
 
-#: src/pkg_grouppolicy.cc:274 src/pkg_grouppolicy.cc:1124
+#: src/pkg_grouppolicy.cc:274 src/pkg_grouppolicy.cc:1036
 msgid "Tasks"
 msgstr "ལས་ཀ་ཚུ།"
 
@@ -6226,7 +6221,7 @@
 "ཐུམ་སྒྲིལ་འདི་ཚུ་མེད། "
 "དེ་ཚུ་ཐུམ་སྒྲིལ་གཞན་ལུ་དགོས་མཁོ་ཡོད་མི་དང་ལས་འགན་དག་པ་ཅིག་བྱིན་མི་གི་མིང་ཨིན།"
 
-#: src/pkg_grouppolicy.cc:628
+#: src/pkg_grouppolicy.cc:653
 msgid ""
 "Packages which are recommended by other packages\n"
 " These packages are not strictly required, but they may be necessary to "
@@ -6239,7 +6234,7 @@
 "ཡར་བསྐྱེད་འབད་བའི་སྒང་ཡོད་མི་ ལས་རིམ་གཞན་མི་ཅིག་ནང་ལུ་ "
 "བྱ་བ་ཆ་ཚང་འབྱིན་ནི་ལུ་ཉེར་མཁོ་ཅནའོང་།"
 
-#: src/pkg_grouppolicy.cc:649
+#: src/pkg_grouppolicy.cc:678
 msgid ""
 "Packages which are suggested by other packages\n"
 " These packages are not required in order to make your system function "
@@ -6252,11 +6247,11 @@
 "དེ་ཚུ་གིས་ད་ལྟོ་ཁྱོད་ཀྱིས་གཞི་བཙུགས་འབད་བའི་སྒང་ཡོད་མི་ལས་རིམ་དག་པ་ཅིག་གི་དོན"
 "་ལུ་ གོང་སྤེལ་འགྱོ་མི་ལས་འགན་འབྱིན་འོང་།"
 
-#: src/pkg_grouppolicy.cc:806
+#: src/pkg_grouppolicy.cc:876
 msgid "unknown"
 msgstr "མ་ཤེསཔ།"
 
-#: src/pkg_grouppolicy.cc:817
+#: src/pkg_grouppolicy.cc:887
 #, c-format
 msgid "Priority %s"
 msgstr "གཙོ་རིམ་%s"
@@ -6265,31 +6260,31 @@
 msgid "UNCATEGORIZED"
 msgstr "དབྱེ་རིམ་བཟོ་སྟེ་མེད་མི།"
 
-#: src/pkg_grouppolicy.cc:1058
+#: src/pkg_grouppolicy.cc:970
 msgid "End-user"
 msgstr "མཇུག་གི་-ལག་ལེན་པ།"
 
-#: src/pkg_grouppolicy.cc:1059
+#: src/pkg_grouppolicy.cc:971
 msgid "Servers"
 msgstr "སར་བརས་ཚུ།"
 
-#: src/pkg_grouppolicy.cc:1060
+#: src/pkg_grouppolicy.cc:972
 msgid "Development"
 msgstr "གོང་འཕེལ།"
 
-#: src/pkg_grouppolicy.cc:1061
+#: src/pkg_grouppolicy.cc:973
 msgid "Localization"
 msgstr "ཡུལ་མཐུན་བཟོ་བ།"
 
-#: src/pkg_grouppolicy.cc:1062
+#: src/pkg_grouppolicy.cc:974
 msgid "Hardware Support"
 msgstr "སྲ་ཆས་རྒྱབ་སྐྱོར།"
 
-#: src/pkg_grouppolicy.cc:1064
+#: src/pkg_grouppolicy.cc:976
 msgid "Unrecognized tasks"
 msgstr "ངོས་འཛིན་འབད་པའི་ཚུགས་མི་ལས་ཀ་ཚུ།"
 
-#: src/pkg_grouppolicy.cc:1125
+#: src/pkg_grouppolicy.cc:1037
 msgid ""
 "\n"
 " Tasks are groups of packages which provide an easy way to select a "
@@ -6301,28 +6296,28 @@
 "སེལ་འཐུ་འབད་ནིི་ལུ་ཐབས་ལམ་འཇམ་ཏོང་ཏོ་བྱིན་མི་ "
 "ཐུམ་སྒྲིལ་སྡེ་ཚན་ཅིག་ལུ་སླབ་ཨིན།"
 
-#: src/pkg_grouppolicy.cc:1254
+#: src/pkg_grouppolicy.cc:1166
 #, c-format
 msgid "Bad number in format string: %ls"
 msgstr "རྩ་སྒྲིག་ཡིག་རྒྱུན་ནང་ལུ་ཡིགརྒྱུན་བྱང་ཉེས:%ls"
 
-#: src/pkg_grouppolicy.cc:1263
+#: src/pkg_grouppolicy.cc:1175
 #, c-format
 msgid "Match indices must be 1 or greater, not \"%s\""
 msgstr "མཐུན་སྒྲིག་བརྡ་སྟོན་དེ་༡་ཡང་ན་དེ་ལས་ལྷག་སྟེ་དགོཔ་ཨིན།\"%s\"དེ་མེན།"
 
-#: src/pkg_grouppolicy.cc:1281
+#: src/pkg_grouppolicy.cc:1193
 #, c-format
 msgid "Match index %ls is too large; available groups are (%s)"
 msgstr ""
 "མཐུན་སྒྲིག་བརྡ་སྟོན་%lsདེ་གནམ་མེད་ས་མེད་སྦོམ་དྲག་པས། "
 "(%s)དེ་འཐོབ་ཚུགས་པའི་སྡེ་ཚན་ཨིན།"
 
-#: src/pkg_grouppolicy.cc:1520
+#: src/pkg_grouppolicy.cc:1432
 msgid "TAGLESS PACKAGES"
 msgstr "ངོ་རྟགས་མེད་མི་ཐུམ་སྒྲིལ་ཚུ།"
 
-#: src/pkg_grouppolicy.cc:1521
+#: src/pkg_grouppolicy.cc:1433
 msgid ""
 "\n"
 " These packages have not yet been classified in debtags, or the debtags "
@@ -6333,26 +6328,26 @@
 msgid "MISSING TAG"
 msgstr "ངོ་རྟགས་བརླག་སྟོར་ཞུགས་ཡོདཔ།"
 
-#: src/pkg_info_screen.cc:140
+#: src/pkg_info_screen.cc:150
 msgid "Source Package: "
 msgstr "ཐུམ་སྒྲིལ་གྱི་འབྱུང་ཁུངས: "
 
-#: src/pkg_info_screen.cc:150
+#: src/pkg_info_screen.cc:160
 #, c-format
 msgid "Package names provided by %s"
 msgstr "%sབྱིན་ཡོད་པའི་ཐུམ་སྒྲིལ་གྱི་མིང་།"
 
-#: src/pkg_info_screen.cc:163
+#: src/pkg_info_screen.cc:173
 #, c-format
 msgid "Packages which depend on %s"
 msgstr "%sདེ་ལུ་བརྟེན་མི་ཐུམ་སྒྲིལ་ཚུ།"
 
-#: src/pkg_info_screen.cc:169
+#: src/pkg_info_screen.cc:179
 #, c-format
 msgid "Versions of %s"
 msgstr ""
 
-#: src/pkg_item.cc:88
+#: src/pkg_item.cc:86
 #, c-format
 msgid ""
 "%s is an essential package!%n%nAre you sure you want to remove it?%nType "
@@ -6362,12 +6357,12 @@
 "ཁྱོད་ཀྱིས་འདི་རྩ་བསྐྲད་གཏང་ནིི་ཨིན་ཟེར་མི་དེ་ངེས་ཏིག་ཨིན་ན? %n "
 "ཁྱོད་ཨིན་པ་ཅིན་ '%s' དེ་ཡིག་དཔར་རྐྱབས།"
 
-#: src/pkg_item.cc:373 src/pkg_ver_item.cc:748
+#: src/pkg_item.cc:369 src/pkg_ver_item.cc:749
 #, c-format
 msgid "Reporting a bug in %s:\n"
 msgstr "%sནང་ལུ་རྐྱེན་སྙན་ཞུ་འབད་དོ:\n"
 
-#: src/pkg_item.cc:393
+#: src/pkg_item.cc:389
 msgid ""
 "You are not root and I cannot find any way to become root.  To reconfigure "
 "this package, install the menu package, the login package, or run aptitude "
@@ -6378,7 +6373,7 @@
 "ནང་བསྐྱོད་ཐུམ་སྒྲིལ་གཞི་བཙུགས་འབད་ནི་དང་ ཡང་ན་ "
 "གོམས་འདྲིས་དེ་རྩ་བ་སྦེ་གཡོག་བཀོལ།"
 
-#: src/pkg_item.cc:401
+#: src/pkg_item.cc:397
 #, c-format
 msgid "Reconfiguring %s\n"
 msgstr "%sསླར་རིམ་སྒྲིག་འབད་དོ།\n"
@@ -6387,7 +6382,7 @@
 msgid "Hierarchy Editor"
 msgstr "སྡེ་རིམ་ཞུན་དག་པ།"
 
-#: src/pkg_subtree.cc:159
+#: src/pkg_subtree.cc:163
 #, c-format
 msgid "This group contains %d package."
 msgid_plural "This group contains %d packages."
@@ -6419,46 +6414,46 @@
 "བཀྲམ་སྟོན་འདི་གི་དོན་ལུ་ཐུམ་སྒྲིལ་གསརཔ་གི་དབྱེ་སེལ་འབད་ནིའི་ཐབས་རིིག་དེ་ཐོ་བཀ"
 "ོད་འབད: "
 
-#: src/pkg_view.cc:165
+#: src/pkg_view.cc:164
 msgid "Couldn't cw::util::transcode column definition"
 msgstr ""
 
-#: src/pkg_view.cc:172
+#: src/pkg_view.cc:171
 msgid "Couldn't parse column definition"
 msgstr "ཀེར་ཐིག་ངེས་ཚིག་མིང་དཔྱད་འབད་མ་ཚུགས།"
 
-#: src/pkg_view.cc:223
+#: src/pkg_view.cc:222
 msgid ""
 "If you select a package, an explanation of why it should be installed or "
 "removed will appear in this space."
 msgstr ""
 
-#: src/pkg_view.cc:575
+#: src/pkg_view.cc:565
 msgid "make_package_view: error in arguments -- two main widgets??"
 msgstr ""
 "ཐུམ་སྒྲིལ-མཐོང་སྣང-བཟོ: ,སྒྲུབ་རྟགས་ནང་ལུ་འཛོལ་བ་འདུག -- "
 "ཝི་གེཊི་ངོ་མ་གཉིས་ཨིན་ན??"
 
-#: src/pkg_view.cc:581
+#: src/pkg_view.cc:571
 msgid ""
 "make_package_view: error in arguments -- bad column list for static item"
 msgstr ""
 "ཐུམ་སྒྲིལ་_མཐོང་སྣང་_བཟོ: སྒརུབ་རྟགས་ནང་ལུ་འཛོལ་བ་འདུག -- "
 "སོར་གནས་རིག་པ་གི་དོན་ལུ་ཀེར་ཐིག་གི་ཐོ་ཡིག་བྱང་ཉེས།"
 
-#: src/pkg_view.cc:678
+#: src/pkg_view.cc:646
 msgid "Related Dependencies"
 msgstr ""
 
-#: src/pkg_view.cc:681
+#: src/pkg_view.cc:649
 msgid "Why Installed"
 msgstr ""
 
-#: src/pkg_view.cc:700
+#: src/pkg_view.cc:668
 msgid "make_package_view: bad argument!"
 msgstr "ཐུམ་སྒྲིལ་_མཐོང་སྣང་_བཟོ: སྒྲུབ་རྟགས་བྱང་ཉེས!"
 
-#: src/pkg_view.cc:752
+#: src/pkg_view.cc:720
 msgid "make_package_view: no main widget found"
 msgstr "ཐུམ་སྒྲིལ་_མཐོང་སྣང་_བཟོ: ཝི་གེཊི་ངོ་མ་འཚོལ་མ་འཐོབ།"
 
@@ -6551,12 +6546,12 @@
 msgid " (provided by %F)"
 msgstr " (%F དེ་གིས་བྱིན་ཡོདཔ་ཨིན།)"
 
-#: src/reason_fragment.cc:265
+#: src/reason_fragment.cc:272
 #, c-format
 msgid "%F%s %F %F"
 msgstr "%F%s %F %F"
 
-#: src/reason_fragment.cc:314
+#: src/reason_fragment.cc:321
 msgid ""
 "If you select a package, an explanation of its current state will appear in "
 "this space."
@@ -6564,7 +6559,7 @@
 "ཁྱོད་ཀྱིས་ཐུམ་སྒྲིལ་ཧེལ་འཐུ་འབད་བ་ཅིན་ "
 "དེ་གི་ད་ལྟོའི་གནས་ལུགས་ཀྱི་འགྲེལ་བཤད་དེ་ བར་སྟོང་འདི་ནང་་ལུ་འབྱུང་འོང་།"
 
-#: src/reason_fragment.cc:348
+#: src/reason_fragment.cc:355
 msgid ""
 "%B%s%b was installed automatically;  it is being removed because all of the "
 "packages which depend upon it are being removed:"
@@ -6572,19 +6567,19 @@
 "%B%s%b དེ་རང་བཞིན་གྱིས་གཞི་བཙུགས་འབད་ནུག འདི་རྩ་བསྐྲད་གཏང་མི་དེ་ཡང་ "
 "འདི་ལུ་བརྟེན་མི་ཐུམ་སྒྲིལ་ཆ་མཉམ་རྩ་བསྐྲད་གཏང་སྟེ་ཡོདཔ་ཨིན:"
 
-#: src/reason_fragment.cc:352
+#: src/reason_fragment.cc:359
 msgid "%B%s%b will be automatically removed because of dependency errors:"
 msgstr ""
 "%B%s%b དེ་ རྟེན་འབྲེལ་གྱི་འཛོལ་བ་ཡོདཔ་ལས་རང་བཞིན་གྱིས་རྩ་བསྐྲད་གཏང་འོང་:"
 
-#: src/reason_fragment.cc:356
+#: src/reason_fragment.cc:363
 msgid ""
 "%B%s%b will be automatically installed to satisfy the following dependencies:"
 msgstr ""
 "%B%s%b དེ་འོག་བཀོད་དེ་ཡོད་མི་རྟེན་འབྲེལ་ཚུ་ལུ་ངལ་རངས་འབྱུང་དོན་ལུ་ "
 "རང་བཞིན་གྱིས་གཞི་བཙུགས་འབད་འོང་།"
 
-#: src/reason_fragment.cc:362 src/reason_fragment.cc:374
+#: src/reason_fragment.cc:369 src/reason_fragment.cc:381
 msgid ""
 "%B%s%b cannot be upgraded now, but if it could be, it would still be held at "
 "version %B%s%b."
@@ -6593,7 +6588,7 @@
 "ག་དེ་ཅིག་སྦེ་འབད་ཚུགས་པ་ཅིན་ "
 "འདི་གིས་ད་ལྟོ་ཡང་ཐོན་རིམ་%B%s%bདེ་གུར་འཆང་སྟེ་འོང་།"
 
-#: src/reason_fragment.cc:365
+#: src/reason_fragment.cc:372
 msgid ""
 "%B%s%b will not be upgraded to version %B%s%b, to avoid breaking the "
 "following dependencies:"
@@ -6602,27 +6597,27 @@
 "དེ་གིས་འོག་ལུ་བཀོད་དེ་ཡོད་མི་རྟེན་འབྲེལ་ཚུ་རྒྱུན་ཆད་མི་བཅུག་ནིའི་དོན་ལུ་ "
 "ཐོན་རིམ་ %B%s%bལུ་ཡར་བསྐྱེད་འབད་མི་བཏུབ།"
 
-#: src/reason_fragment.cc:377
+#: src/reason_fragment.cc:384
 msgid "%B%s%b is currently installed."
 msgstr "%B%s%b དེ་ད་ལྟོ་གཞི་བཙུགས་འབད་དེེ་ཡོདཔ་ཨིན།"
 
-#: src/reason_fragment.cc:383
+#: src/reason_fragment.cc:390
 msgid "%B%s%b is not currently installed."
 msgstr "%B%s%b་དེ་ད་ལྟོ་གཞི་བཙུགས་འབད་དེ་མེད།"
 
-#: src/reason_fragment.cc:391
+#: src/reason_fragment.cc:398
 msgid "Some dependencies of %B%s%b are not satisfied:"
 msgstr "%B%s%b དེ་གི་རྟེན་འབྲེལ་ལ་ལུ་ཅིག་ལུ་ངལ་རངས་མ་བྱུང་པས:"
 
-#: src/reason_fragment.cc:395
+#: src/reason_fragment.cc:402
 msgid "%B%s%b will be downgraded."
 msgstr "%B%s%b དེ་མར་ཕབ་འབད་ནི་ཨིན།"
 
-#: src/reason_fragment.cc:402
+#: src/reason_fragment.cc:409
 msgid "%B%s%b will not be upgraded to the forbidden version %B%s%b."
 msgstr "%B%s%b དེ་མ་ཆོག་སྦེེ་ཡོད་མི་ཐོན་རིམ་%B%s%b ལུ་ཡར་བསྐྱེད་མི་འབད།"
 
-#: src/reason_fragment.cc:406
+#: src/reason_fragment.cc:413
 msgid ""
 "%B%s%b could be upgraded to version %B%s%b, but it is being held at version "
 "%B%s%b."
@@ -6630,40 +6625,40 @@
 "%B%s%b དེ་ཐོན་རིམ་%B%s%b ཡར་བསྐྱེད་འབད་མི་ཚུགས་དེ་འབདཝ་ད་ "
 "འ་ནི་དེ་ཐོན་རིམ་%B%s%bདེ་གུར་འཆང་སྟེ་ཡོདཔ་ཨིན།"
 
-#: src/reason_fragment.cc:413
+#: src/reason_fragment.cc:420
 msgid "%B%s%b will be re-installed."
 msgstr "%B%s%b དེ་སླར་གཞི་བཙུགས་འབད་ནི་ཨིན།"
 
-#: src/reason_fragment.cc:417
+#: src/reason_fragment.cc:424
 msgid "%B%s%b will be installed."
 msgstr "%B%s%b དེ་གཞི་བཙུགས་འབད་ནི་ཨིན།"
 
-#: src/reason_fragment.cc:421
+#: src/reason_fragment.cc:428
 msgid "%B%s%b will be removed."
 msgstr "%B%s%b དེ་རྩ་བསྐྲད་གཏང་ནི་ཨིན།"
 
-#: src/reason_fragment.cc:426
+#: src/reason_fragment.cc:433
 msgid "%B%s%b will be upgraded from version %B%s%b to version %B%s%b."
 msgstr ""
 "%B%s%b དེ་ཐོན་རིམ་%B%s%b དེ་ནང་ལས་ཐོན་རིམ་%B%s%b ལུ་ཡར་བསྐྱེད་འབད་ནི་ཨིན།"
 
-#: src/reason_fragment.cc:433
+#: src/reason_fragment.cc:440
 msgid "%B%s%b is only partly installed; its installation will be completed."
 msgstr ""
 
-#: src/reason_fragment.cc:465
+#: src/reason_fragment.cc:472
 msgid ""
 "The following packages depend on %B%s%b and will be broken by its removal:"
 msgstr ""
 "འོག་ལུ་ཡོད་མི་ཐུམ་སྒྲིལ་ཚུ་ %B%s%b དེ་ལུ་བརྟེན་དོ་ཡོདཔ་ད་ "
 "འ་ནི་དེ་རྩ་བསྐྲད་གཏང་མི་དེ་གིས་ཆག་འགྱོ་འོང་:"
 
-#: src/reason_fragment.cc:468
+#: src/reason_fragment.cc:475
 msgid "The following packages depend on %B%s%b and are broken:"
 msgstr ""
 "འོག་ལུ་ཡོད་མི་ཐུམ་སྒྲིལ་ཚུ་ %B%s%b དེ་ལུ་བརྟེན་དོ་ཡོདཔ་མི་དེ་ཆད་འགྱོ་ནུག:"
 
-#: src/reason_fragment.cc:475
+#: src/reason_fragment.cc:482
 msgid ""
 "The following packages conflict with %B%s%b and will be broken by its "
 "installation:"
@@ -6671,7 +6666,7 @@
 "འོག་ལུ་ཡོད་མི་ཐུམ་སྒྲིལ་ཚུ་གིས་ %B%s%b རྩོད་རྙོག་བཀོད་ཨིནམ་དང་ "
 "འ་ནི་དེ་གཞི་བཙུགས་འབད་མི་དེ་གིས་ཆད་འགྱོཝ་ཨིན།"
 
-#: src/reason_fragment.cc:508
+#: src/reason_fragment.cc:515
 msgid ""
 "The following packages depend on a version of %B%s%b other than the "
 "currently installed version of %B%s%b, or conflict with the currently "
@@ -6681,7 +6676,7 @@
 "B%s%b་དེ་གི་ཐོནརིམ་དེ་མེན་པར་ %B%s%b དེལུ་བརྟེནམ་ཨིནམ་འང་ ཡང་ན་ "
 "ད་ལྟོ་གཞི་བཙུགས་འབད་ཡོད་མི་ཐོན་རིམ་དང་གཅིག་ཁར་རྩོད་རྙོག་བཀོདཔ་ཨིན།"
 
-#: src/reason_fragment.cc:512
+#: src/reason_fragment.cc:519
 msgid ""
 "The following packages conflict with %B%s%b, or depend on a version of it "
 "which is not going to be installed."
@@ -6689,12 +6684,12 @@
 "འོག་ལུ་ཡོད་མི་ཐུམ་སྒྲིལ་དེ་ཚུ་ %B%s%b་དང་གཅིག་ཁར་མི་མཐུནམ་ཨིནམ་དང་ "
 "གཞི་བཙུགས་མི་འབད་ནི་ཨིན་མི་ དེའི་ཐོན་རིམ་གུར་བརྟེནམ་ཨིན།"
 
-#: src/reason_fragment.cc:516
+#: src/reason_fragment.cc:523
 msgid "The following packages conflict with %B%s%b:"
 msgstr ""
 "འོགལུ་ཡོད་མི་ཐུམ་སྒྲིལ་དེ་གིས་ %B%s%b དེ་དང་གཅིག་ཁར་རྩོད་རྙོག་བཀོདཔ་ཨིན:"
 
-#: src/reason_fragment.cc:521
+#: src/reason_fragment.cc:528
 msgid ""
 "The following packages depend on a version of %B%s%b other than the "
 "currently installed version of %B%s%b:"
@@ -6702,7 +6697,7 @@
 "འོག་ལུ་ཡོད་མི་ཐུམ་སྒྲིལ་དེ་གིས་ད་ལྟོ་གཞི་བཙུགས་འབད་ཡོད་མི་%B%s%b "
 "དེ་གི་ཐོན་རིམ་དེ་མེན་པར་ %B%s%b གི་ཐོན་རིམ་དེ་ལུ་བརྟེནམ་ཨིན:"
 
-#: src/reason_fragment.cc:525
+#: src/reason_fragment.cc:532
 msgid ""
 "The following packages depend on a version of %B%s%b which is not going to "
 "be installed."
@@ -6710,15 +6705,15 @@
 "འོག་ལུ་ཡོད་མི་ཐུམ་སྒྲིལ་དེ་གིས་གཞི་བཙུགས་མི་འབད་ནི་ཨིན་མི་ %B%s%b "
 "གི་ཐོན་རིམ་གུར་བརྟེནམ་ཨིན།"
 
-#: src/reason_fragment.cc:531
+#: src/reason_fragment.cc:538
 msgid "upgraded"
 msgstr "ཡར་བསྐྱེད་འབད་ཡོདཔ།"
 
-#: src/reason_fragment.cc:531
+#: src/reason_fragment.cc:538
 msgid "downgraded"
 msgstr "མར་ཕབ་འབད་ཡོདཔ།"
 
-#: src/reason_fragment.cc:537
+#: src/reason_fragment.cc:544
 msgid ""
 "The following packages depend on the currently installed version of %B%s%b "
 "(%B%s%b), or conflict with the version it will be %s to (%B%s%b), and will "
@@ -6729,7 +6724,7 @@
 "ཐོན་རིམ་དང་གཅིག་ཁར་མ་མཐུན་པ་ཅིན་ འད་ནི་དེ་(%B%s%b) ལུ་ %s "
 "སྦེ་འོང་ནི་ཨིནམ་དང་ འ་ནི་དེ་%s ཨིན་པ་ཅིན་རྒྱུན་ཆད་འགྱོཝ་ཨིན།"
 
-#: src/reason_fragment.cc:544
+#: src/reason_fragment.cc:551
 msgid ""
 "The following packages conflict with version %B%s%b of %B%s%b, and will be "
 "broken if it is %s."
@@ -6737,7 +6732,7 @@
 "འོག་ལུ་ཡོད་མི་ཐུམ་སྒྲིལ་ཚུ་གིས་%B%s%b་གི་ཐོན་རིམ་%B%s%b "
 "དང་གཅིག་ཁར་རྩོད་རྙོག་བཀོདཔ་ཨིནམ་དང་ འ་ནི་དེ་ %s ཨིན་པ་ཅིན་རྒྱུན་ཆད་འགྱོཝ་ཨིན།"
 
-#: src/reason_fragment.cc:549
+#: src/reason_fragment.cc:556
 msgid ""
 "The following packages depend on version %B%s%b of %B%s%b, and will be "
 "broken if it is %s."
@@ -6773,45 +6768,45 @@
 msgid "Close"
 msgstr "ཁ་བསྡམས།"
 
-#: src/solution_fragment.cc:168
+#: src/solution_fragment.cc:164
 #, c-format
 msgid "%s conflicts with %s [provided by %s %s]"
 msgstr ""
 "%s དེ་%s དང་གཅིག་ཁར་མི་མཐུན་དོ་ཡོདཔ་ཨིན།[%s %s དེ་གིས་བྱིན་ཡོདཔ་ཨིན།]"
 
-#: src/solution_fragment.cc:181
+#: src/solution_fragment.cc:177
 #, c-format
 msgid "Removing %s"
 msgstr "%sདེ་རྩ་བསྐྲད་གཏང་དོ།"
 
-#: src/solution_fragment.cc:183
+#: src/solution_fragment.cc:179
 #, c-format
 msgid "Installing %s %s (%s)"
 msgstr "%s %s (%s) དེ་གཞི་བཙུགས་འབད་དོ།"
 
-#: src/solution_fragment.cc:189
+#: src/solution_fragment.cc:185
 #, c-format
 msgid "Leave %ls unresolved."
 msgstr ""
 
-#: src/solution_fragment.cc:415
+#: src/solution_fragment.cc:411
 msgid "%BRemove%b the following packages:%n"
 msgstr "%B འོག་ལུ་ཡོད་མི་ཐུམ་སྒྲིལ་ཚུ་%bརྩ་བསྐྲད་གཏང:%n"
 
-#: src/solution_fragment.cc:430
+#: src/solution_fragment.cc:426
 msgid "%BInstall%b the following packages:%n"
 msgstr "%Bའོག་ལུ་ཡོད་མི་ཐུམ་སྒྲིལ་ཚུ་ %b གཞི་བཙུགས་འབད:%n"
 
-#: src/solution_fragment.cc:448
+#: src/solution_fragment.cc:444
 msgid "%BKeep%b the following packages at their current version:%n"
 msgstr ""
 "%B འོག་ལུ་ཡོད་མི་ཐུམ་སྒྲིལ་ཚུ་ཁོང་རའི་ད་ལྟོའི་ཐོན་རིམ་གུར་Keep བཞག:%n"
 
-#: src/solution_fragment.cc:472
+#: src/solution_fragment.cc:468
 msgid "%BUpgrade%b the following packages:%n"
 msgstr "%B འོག་ལུ་ཡོད་མི་ཐུམ་སྒྲིལ་ཚུ་ %b ཡར་བསྐྱེད་མ་འབད:%n"
 
-#: src/solution_fragment.cc:492
+#: src/solution_fragment.cc:488
 msgid "%BDowngrade%b the following packages:%n"
 msgstr "%B འོག་ལུ་ཡོད་མི་ཐུམ་སྒརིལ་ཚུ་ %b མར་ཕབ་འབད:%n"
 
@@ -6850,7 +6845,7 @@
 msgid "Downgrade %F [%s (%s) -> %s (%s)]"
 msgstr "%F [%s (%s) -> %s (%s)] དེ་མར་ཕབ་འབད།"
 
-#: src/solution_item.cc:603
+#: src/solution_item.cc:606
 #, c-format
 msgid "-> Leave the dependency \"%s recommends %s\" unresolved."
 msgstr "-> རྟེན་འབྲེལ་\"%s recommends %s\"་དེ་མོས་མཐུན་མ་འབད་བར་བཞག"
@@ -6893,26 +6888,26 @@
 #. TRANSLATORS: This string is a confirmation message, which users
 #. (especially CJK users) should be able to input without input
 #. methods.  Please include nothing but ASCII characters.
-#: src/ui.cc:211
+#: src/ui.cc:209
 msgid "Yes, I am aware this is a very bad idea"
 msgstr ""
 "བཏུབ་ "
 "འདི་གནས་སྐབས་གནམ་མེད་ས་མེད་བྱང་ཉེས་ཅིག་ཨིན་ཟེར་ང་ཡང་དྲན་པ་བཏོན་ཏེ་རང་ཡོད།"
 
-#: src/ui.cc:238
+#: src/ui.cc:236
 msgid "Er, there aren't any errors, this shouldn't have happened.."
 msgstr ""
 "ཨི་ཨཱར།  དེ་ནང་ལུ་འཛོལ་བ་ཅིག་ཡང་མིན་འདུག འདི་བཟུམ་བྱུང་བཅུག་ནིི་མི་འོང་།"
 
-#: src/ui.cc:244
+#: src/ui.cc:242
 msgid "E:"
 msgstr "ཨི:"
 
-#: src/ui.cc:246
+#: src/ui.cc:244
 msgid "W:"
 msgstr "ཌབ་ལུ:"
 
-#: src/ui.cc:342
+#: src/ui.cc:340
 msgid ""
 "WARNING: the package cache is opened in read-only mode!  This change and all "
 "subsequent changes will not be saved unless you stop all other running apt-"
@@ -6925,119 +6920,119 @@
 "\"Become root\" དེ་སེལ་འཐུ་མ་འབད་ཚུན་ཚོད་ ཁྱོད་ཀྱིས་བསྒྱུར་བཅོས་འདི་དང་ "
 "ཤུལ་ལས་ཀྱི་བསྒྱུར་བཅོས་ཆ་མཉམ་རང་ སྲུང་བཞག་མི་འབད།"
 
-#: src/ui.cc:348
+#: src/ui.cc:346
 msgid "Never display this message again."
 msgstr "འཕྲིན་དོན་འདི་ལོག་ནམ་ཡང་བཀྲམ་སྟོན་འབད་ནི་མི་འོང་།"
 
-#: src/ui.cc:394
+#: src/ui.cc:392
 msgid ""
 "You may not modify the state of any package while a download is underway."
 msgstr ""
 "ཕབ་ལེན་བའི་སྒང་ཡོད་པའི་སྐབས་ལུ་ "
 "ཁྱོད་ཀྱིས་ཐུམ་སྒྲིལ་ག་གི་གནས་ལུགས་ཡང་ལེགས་བཅོས་་མ་འབད་རུང་བཏུབ།"
 
-#: src/ui.cc:425
+#: src/ui.cc:423
 msgid "You already are root!"
 msgstr "ཁྱོད་ཧེ་མ་ལས་རང་རྩ་བ་ཨིན!"
 
-#: src/ui.cc:440
+#: src/ui.cc:438
 msgid "Invalid Get-Root-Command; it should start with su: or sudo:"
 msgstr ""
 
-#: src/ui.cc:447
+#: src/ui.cc:445
 #, c-format
 msgid "Invalid Get-Root-Command; it should start with su: or sudo:, not %s:"
 msgstr ""
 
-#: src/ui.cc:476
+#: src/ui.cc:474
 #, c-format
 msgid "Unable to fork: %s"
 msgstr ""
 
-#: src/ui.cc:580
+#: src/ui.cc:578
 msgid ""
 "Subprocess exited with an error -- did you type your password correctly?"
 msgstr ""
 "ཡན་ལག་ལས་སྦྱོར་དེ་འཛོལ་བ་དང་གཅིག་ཁར་ཕྱིར་ཐོན་ཡོདཔ། -- "
 "ཁྱོད་ཀྱིས་ཁྱོད་རའི་ཆོག་ཡིག་ངེས་བདེན་སྦེ་ཡིག་དཔར་བརྐྱབ་ཅི་ག?"
 
-#: src/ui.cc:619
+#: src/ui.cc:617
 msgid "Loading cache"
 msgstr "འདྲ་མཛོད་ཕབ་ལེན་འབད་དོ།"
 
-#: src/ui.cc:661
+#: src/ui.cc:659
 msgid "Really quit Aptitude?"
 msgstr "གོམས་འདྲིས་དེ་ཐད་རི་འབའ་རི་སྤང་་ནི་ཨིན་ན?"
 
-#: src/ui.cc:715 src/ui.cc:2550
+#: src/ui.cc:713 src/ui.cc:2573
 msgid "Change the behavior of aptitude"
 msgstr ""
 
-#: src/ui.cc:751
+#: src/ui.cc:749
 msgid "Really discard your personal settings and reload the defaults?"
 msgstr ""
 "ཁྱོད་ཀྱི་རང་སྡོན་གྱི་སྒྲིག་སྟངས་དེ་བཏོན་བཀོག་སྟེ་སྔོན་སྒྲིག་ཚུ་སླར་ཕབ་ལེད་འབད"
 "་ནི་ཨིན་ན?"
 
-#: src/ui.cc:856 src/ui.cc:903 src/ui.cc:931 src/ui.cc:954
+#: src/ui.cc:885
 msgid "View available packages and choose actions to perform"
 msgstr ""
 "འཐོབ་ཚུགས་པའི་ཐུམ་སྒྲིལ་ཚུ་སྟོན་ཞིནམ་ལས་ལཱ་འགན་འགྲུབ་ནིའི་དོན་ལུ་ "
 "བྱ་བ་ཚུ་གདམ་ཁ་རྐྱབས།"
 
-#: src/ui.cc:885
+#: src/ui.cc:914
 msgid "Recommended Packages"
 msgstr "འོས་སྦྱོར་འབད་ཡོད་པའི་ཐུམ་སྒྲིལ་ཚུ།"
 
-#: src/ui.cc:886
+#: src/ui.cc:915
 msgid "View packages that it is recommended that you install"
 msgstr "ཁྱོད་ཀྱིས་གཞི་བཙུགས་འབདམི་ཐུམ་སྒྲིལ་འོས་སྦྱོར་འབད་ཡོད་མི་ཚུ་སྟོན།"
 
-#: src/ui.cc:887
+#: src/ui.cc:916
 msgid "Recommendations"
 msgstr "འོས་སྦྱོར་ཚུ།"
 
-#: src/ui.cc:982
+#: src/ui.cc:1002
 #, c-format
 msgid "Information about %s"
 msgstr "%sདེ་གི་སྐོར་ལས་བརྡ་དོན།"
 
-#: src/ui.cc:984
+#: src/ui.cc:1004
 #, c-format
 msgid "%s info"
 msgstr "%s བརྡ་དོན།"
 
-#: src/ui.cc:1005
+#: src/ui.cc:1025
 #, c-format
 msgid "Packages depending on %s"
 msgstr "%sདེ་ལུ་བརྟེན་སྡོད་མི་ཐུམ་སྒྲིལ་ཚུ།"
 
-#: src/ui.cc:1006
+#: src/ui.cc:1026
 #, c-format
 msgid "Dependencies of %s"
 msgstr "%s དེ་གི་རྟེན་འབྲེལ་ཚུ།"
 
-#: src/ui.cc:1009
+#: src/ui.cc:1029
 #, c-format
 msgid "%s reverse deps"
 msgstr "%s རིམ་ལོག་ཌེབསི།"
 
-#: src/ui.cc:1010
+#: src/ui.cc:1030
 #, c-format
 msgid "%s deps"
 msgstr "%sཌེབསི།"
 
-#: src/ui.cc:1028
+#: src/ui.cc:1048
 #, c-format
 msgid "Available versions of %s"
 msgstr "%sདེ་གི་ཐོབ་འཐོབ་ཚུགས་པའི་ཐོན་རིམཚུ།"
 
-#: src/ui.cc:1030
+#: src/ui.cc:1050
 #, c-format
 msgid "%s versions"
 msgstr "%s  ཐོན་རིམ་ཚུ།"
 
-#: src/ui.cc:1036
+#: src/ui.cc:1056
 msgid ""
 "Aptitude %s%n%nCopyright 2000-2008 Daniel Burrows.%n%naptitude comes with "
 "%BABSOLUTELY NO WARRANTY%b; for details see 'license' in the Help menu.  "
@@ -7045,74 +7040,74 @@
 "conditions; see 'license' for details."
 msgstr ""
 
-#: src/ui.cc:1086 src/ui.cc:1088
+#: src/ui.cc:1106 src/ui.cc:1108
 msgid "License"
 msgstr ""
 
-#: src/ui.cc:1087 src/ui.cc:2642
+#: src/ui.cc:1107 src/ui.cc:2665
 msgid "View the terms under which you may copy and distribute aptitude"
 msgstr ""
 
 #. TRANSLATORS: You can translate help.txt and set the filename here.
-#: src/ui.cc:1102
+#: src/ui.cc:1122
 msgid "Localized file|help.txt"
 msgstr ""
 
-#: src/ui.cc:1104
+#: src/ui.cc:1124
 msgid "Encoding of help.txt|UTF-8"
 msgstr "གྲོགས་རམ་ ཊི་ཨེགསི་ཊི|ཡུ་ཊི་ཨེཕི་-༨ བརྒྱད་ཀྱི་ཨིན་ཀོཌི་འབད་ནི།"
 
-#: src/ui.cc:1115
+#: src/ui.cc:1135
 msgid "Online Help"
 msgstr ""
 
-#: src/ui.cc:1116
+#: src/ui.cc:1136
 msgid "View a brief introduction to aptitude"
 msgstr ""
 
-#: src/ui.cc:1117 src/ui.cc:2792
+#: src/ui.cc:1137 src/ui.cc:2817
 msgid "Help"
 msgstr "གྲོགས་རམ།"
 
 #. TRANSLATORS: You can translate README and set the filename here.
-#: src/ui.cc:1126
+#: src/ui.cc:1146
 msgid "Localized file|README"
 msgstr ""
 
-#: src/ui.cc:1127
+#: src/ui.cc:1147
 msgid "Encoding of README|ISO_8859-1"
 msgstr "ཨའི་ཨེསི་ཨོ-༨༨༥༩-༡"
 
-#: src/ui.cc:1138
+#: src/ui.cc:1158
 msgid "User's Manual"
 msgstr "ལག་ལེན་པའི་ལག་དེབ།"
 
-#: src/ui.cc:1139
+#: src/ui.cc:1159
 msgid "Read the full user's manual of aptitude"
 msgstr "ལག་ལེན་པ་ཆ་ཚང་གི་གོམས་འདྲིས་གི་ལག་དེབ་དེ་ལྷག"
 
-#: src/ui.cc:1140
+#: src/ui.cc:1160
 msgid "Manual"
 msgstr "ལག་དེབ།"
 
-#: src/ui.cc:1147 src/ui.cc:1149
+#: src/ui.cc:1167 src/ui.cc:1169
 msgid "FAQ"
 msgstr ""
 
-#: src/ui.cc:1148 src/ui.cc:2634
+#: src/ui.cc:1168 src/ui.cc:2657
 msgid "View a list of frequently asked questions"
 msgstr "འཕྲལ་འཕྲལ་རང་་འདྲི་མི་འདྲི་བ་ཚུ་གི་ཐོ་ཡིག་ཅིག་སྟོན།"
 
-#: src/ui.cc:1157 src/ui.cc:1159
+#: src/ui.cc:1177 src/ui.cc:1179
 msgid "News"
 msgstr ""
 
-#: src/ui.cc:1158
+#: src/ui.cc:1178
 #, c-format
 msgid "View the important changes made in each version of %s"
 msgstr ""
 
-#: src/ui.cc:1165
+#: src/ui.cc:1185
 #, c-format
 msgid ""
 "Unable to remove the old temporary directory; you should remove %s by hand."
@@ -7120,7 +7115,7 @@
 "གནས་སྐབས་ཀྱིི་སྣོད་ཐོ་རྙིངམ་དེ་རྩ་བསྐྲད་གཏང་མ་ཚུགས། ཁྱོད་ཀྱིས་ %s "
 "དེ་ལགཔ་གིས་རྩ་བསྐྲད་གཏང་དགོཔ་ཨིན།"
 
-#: src/ui.cc:1170
+#: src/ui.cc:1190
 #, c-format
 msgid ""
 "Will not remove %s; you should examine the files in it and remove them by "
@@ -7130,7 +7125,7 @@
 "ཁྱོད་ཀྱིས་ཡིཡག་སྣོད་ཚུ་འདི་ནང་ལུ་བརྟག་དཔྱད་འབད་དགོཔ་ཨིནམ་དང་ "
 "དེ་ཚུ་ཁྱོད་ཀྱི་ལགཔ་གིས་རྩ་བསྐྲད་གཏང་།"
 
-#: src/ui.cc:1196
+#: src/ui.cc:1216
 #, c-format
 msgid ""
 "It appears that a previous version of aptitude left files behind in %s.  "
@@ -7144,15 +7139,15 @@
 "ཁྱོད་ཀྱིས་\"No\" "
 "དེ་སེལ་འཐུ་འབད་བ་ཅིན་ཁྱོད་ཀྱིས་འཕྲིན་དོན་འདི་ལོག་མཐོང་མི་ཚུགས།"
 
-#: src/ui.cc:1268
+#: src/ui.cc:1291
 msgid "View the progress of the package download"
 msgstr "ཐུམ་སྒྲིལ་ཕབ་ལེན་གི་ཡར་འཕེལ་དེ་སྟོན།"
 
-#: src/ui.cc:1269
+#: src/ui.cc:1292
 msgid "Package Download"
 msgstr "ཐུམ་སྒྲིལ་ཕབ་ལེན།"
 
-#: src/ui.cc:1316
+#: src/ui.cc:1339
 msgid ""
 "%BWARNING%b: untrusted versions of the following packages will be "
 "installed!%n%nUntrusted packages could %Bcompromise your system's "
@@ -7166,35 +7161,35 @@
 "ཁྱོད་ཀྱིས་འ་ནི་འདི་ཁྱོདཀྱིས་འབད་ནི་ཨིནམ་ངེས་ཅན་སྦེ་ཤེས་པ་ཅིན་རྐྱངམ་ཅིག་ "
 "གཞི་བཙུགས་འབད་ནིི་དེ་འཕྲོ་མཐུད་དགོ%n%n"
 
-#: src/ui.cc:1322
+#: src/ui.cc:1345
 msgid "  %S*%N %s [version %s]%n"
 msgstr "  %S*%N %s [ཐོན་རིམ་ %s]%n"
 
-#: src/ui.cc:1328
+#: src/ui.cc:1351
 msgid "Really Continue"
 msgstr "ཐད་རི་འབའ་རི་འཕྲོ་མཐུད་འབད།"
 
-#: src/ui.cc:1330
+#: src/ui.cc:1353
 msgid "Abort Installation"
 msgstr "གཞི་བཙུགས་འབད་ནི་བར་བཤོལ།"
 
-#: src/ui.cc:1394
+#: src/ui.cc:1417
 msgid "Preview of package installation"
 msgstr "ཐུམ་སྒྲིལ་གཞི་བཙུགས་ཀྱི་སྔོན་བལྟ།"
 
-#: src/ui.cc:1395
+#: src/ui.cc:1418
 msgid "View and/or adjust the actions that will be performed"
 msgstr "སྟོན་ཡང་ན་ལས་འགན་འགྲུབ་ནི་ཨིན་མའི་དོན་ལུ་བྱ་བ་ཚུ་བདེ་སྒྲིག་འབད།"
 
-#: src/ui.cc:1457
+#: src/ui.cc:1480
 msgid "Some packages were broken and have been fixed:"
 msgstr "ཐུམ་སྒྲིལ་ལ་ལུ་ཅིག་ཆག་སོངམ་ལས་གཏན་པར་བཟོོ་ནུག:"
 
-#: src/ui.cc:1465
+#: src/ui.cc:1488
 msgid "No solution to these dependency problems exists!"
 msgstr "རྟེན་འབྲེལ་འདི་ལུ་ཐབས་ཤེས་མེད་ཟེར་བཟི་དཀའ་ངལ་བྱུང་མ་ཨིན!"
 
-#: src/ui.cc:1471
+#: src/ui.cc:1494
 #, c-format
 msgid ""
 "Ran out of time while trying to resolve dependencies (press \"%s\" to try "
@@ -7203,7 +7198,7 @@
 "རྟེན་འབྲེལ་ཚུ་མོས་མཐུན་འབད་ནི་ལུ་འབད་རྩོལ་བསྐྱེད་པའི་སྐབས་ལུ་དུས་ཚོད་ཀྱི་བདའ་"
 "མ་ཟུན།(ཧེང་བཀལ་འབད་རྩོལ་བསྐྱེད་ནིའི་དོན་ལུ་ \"%s\" དེ་ལུ་ཨེབ།)"
 
-#: src/ui.cc:1517
+#: src/ui.cc:1540
 msgid ""
 "Installing/removing packages requires administrative privileges, which you "
 "currently do not have.  Would you like to change to the root account?"
@@ -7212,21 +7207,21 @@
 "ཁྱོད་ལུ་ད་ལྟོ་མེད་པའི་བདག་སྐྱོང་དང་འབྲེལ་བའི་ཁེ་དབང་དགོས་མཁོ་ཡོདཔཨིན། "
 "ཁྱོད་ཀྱིས་རྩ་བའི་རྩིས་ཐོ་ལུ་བསྒྱུར་བཅོས་འབད་ནི་ཨིན་ན?"
 
-#: src/ui.cc:1520 src/ui.cc:1759 src/ui.cc:1820 src/ui.cc:1915
+#: src/ui.cc:1543 src/ui.cc:1782 src/ui.cc:1843 src/ui.cc:1938
 msgid "Become root"
 msgstr "རྩ་བ་ལུ་འགྱུར།"
 
-#: src/ui.cc:1522 src/ui.cc:1761 src/ui.cc:1822 src/ui.cc:1917
+#: src/ui.cc:1545 src/ui.cc:1784 src/ui.cc:1845 src/ui.cc:1940
 msgid "Don't become root"
 msgstr "རྩ་བ་ལུ་འགྱུར་མི་དགོ"
 
-#: src/ui.cc:1643
+#: src/ui.cc:1666
 msgid "No packages are scheduled to be installed, removed, or upgraded."
 msgstr ""
 "ཐུམ་སྒྲིལ་ཚུ་ཅིག་ཡང་གཞི་བཙུགས་འབད་ནི་དང་ རྩ་བསྐྲད་གཏང་ནི་ ཡང་ན་ "
 "ཡར་བསྐྱེད་འབད་ནི་ལུ་འཆར་རིམ་མ་བཟོ་བས།"
 
-#: src/ui.cc:1649
+#: src/ui.cc:1672
 msgid ""
 "No packages will be installed, removed or upgraded.  Some packages could be "
 "upgraded, but you have not chosen to upgrade them.  Type \"U\" to prepare an "
@@ -7237,19 +7232,19 @@
 "ཁྱོད་ཀྱིས་དེ་ཚུ་ཡར་བསྐཡེད་འབད་ནི་ལུ་གདམ་ག་མ་བརྐྱབ་པས། "
 "ཡར་བསྐྱེད་གུར་གྲ་སྒྲིག་འབད་ནིའ་དོན་ལུ་ \"U\" དེ་ཡིག་དཔར་རྐྱབས།"
 
-#: src/ui.cc:1729
+#: src/ui.cc:1752
 msgid "Updating package lists"
 msgstr "ཐུམ་སྒྲིལ་གྱི་ཐོ་ཡིག་ཚུ་དུས་མཐུན་བཟོ་དོ།"
 
-#: src/ui.cc:1730
+#: src/ui.cc:1753
 msgid "View the progress of the package list update"
 msgstr "ཐུམ་སྒྲིལ་ཐོ་ཡིག་གི་དུས་མཐུན་བཟོ་ནིའི་ཡར་འཕེལ་དེ་སྟོན།"
 
-#: src/ui.cc:1731
+#: src/ui.cc:1754
 msgid "List Update"
 msgstr "དུས་མཐོན་ཐོ་བཀོད་འབད།"
 
-#: src/ui.cc:1756
+#: src/ui.cc:1779
 msgid ""
 "Updating the package lists requires administrative privileges, which you "
 "currently do not have.  Would you like to change to the root account?"
@@ -7258,35 +7253,35 @@
 "ཁྱོད་ལུ་ད་ལྟོ་མེད་པའི་བདག་སྐྱོང་དང་འབྲེལ་བའི་ཁེ་དབང་ཚུ་དགོས་མཁོ་ཡོདཔ་ཨིན། "
 "ཁྱོད་ཀྱིས་རྩ་བའི་རྩིས་ཐོ་བསྒྱུར་བཅོས་འབད་ནི་ཨིན་ན?"
 
-#: src/ui.cc:1771 src/ui.cc:2385
+#: src/ui.cc:1794 src/ui.cc:2408
 msgid "Waste time trying to find mines"
 msgstr ""
 "འགས་རྫས་ཚུ་འཚོལ་ནིའི་འབད་རྩོལ་བསྐྱེད་དགོ་པ་ཅིན་དུས་་ཚོད་འབྱིན་དགོཔ་ཨིན།"
 
-#: src/ui.cc:1778 src/ui.cc:1866
+#: src/ui.cc:1801 src/ui.cc:1889
 msgid "Cleaning while a download is in progress is not allowed"
 msgstr "ཕབ་ལེན་ཡར་འཕེལ་འབད་བའི་སྒང་ཡོད་མི་དེ་མ་ཆོགཔ་ད་ལུ་གཙང་དག་བཟོ་དོ།"
 
-#: src/ui.cc:1793
+#: src/ui.cc:1816
 msgid "Deleting downloaded files"
 msgstr "ཕབ་ལེན་འབད་ཡོད་པའི་ཡིག་སྣོད་ཚུ་བཏོན་གཏང་དོ།"
 
-#: src/ui.cc:1807
+#: src/ui.cc:1830
 msgid "Downloaded package files have been deleted"
 msgstr "ཕབ་ལེན་འབད་ཡོད་པའི་ཐུམ་སྒྲིལ་ཡིག་སྣོད་ཚུ་བཏོན་གཏང་ནུག"
 
-#: src/ui.cc:1817
+#: src/ui.cc:1840
 msgid ""
 "Cleaning the package cache requires administrative privileges, which you "
 "currently do not have.  Would you like to change to the root account?"
 msgstr ""
 
-#: src/ui.cc:1863
+#: src/ui.cc:1886
 msgid "The apt cache file is not available; cannot auto-clean."
 msgstr ""
 "ཨེཔཊི་འདྲ་མཛོད་ཀྱི་ཡིག་སྣོད་དེ་འཐོབ་མི་ཚུགས། རང་བཞིན་གྱིས་གཙང་དག་བཟོ་མི་ཚུགས།"
 
-#: src/ui.cc:1901
+#: src/ui.cc:1924
 #, c-format
 msgid ""
 "Obsolete downloaded package files have been deleted, freeing %sB of disk "
@@ -7295,133 +7290,133 @@
 "ཕན་མེད་ཀྱི་ཕབ་ལེན་འབད་ཡོད་པའི་ཐུམ་སྒྲིལ་ཡིག་སྣོད་ཚུ་བཏོན་གཏང་ནུག "
 "ཌིཀསི་བར་སྟོང་གི་ %sB དེ་རང་དབང་ཅན་བཟོ་དོ།"
 
-#: src/ui.cc:1912
+#: src/ui.cc:1935
 msgid ""
 "Deleting obsolete files requires administrative privileges, which you "
 "currently do not have.  Would you like to change to the root account?"
 msgstr ""
 
-#: src/ui.cc:2014
+#: src/ui.cc:2037
 msgid "No more solutions."
 msgstr "ཐབས་ཤེས་དེ་ལས་ལྷག་སྟེ་མེད།"
 
-#: src/ui.cc:2222
+#: src/ui.cc:2245
 msgid "Unable to find a solution to apply."
 msgstr "འཇུག་སྤྱོད་འབད་ནིའི་དོན་ལུ་ཐབས་ཤེས་ཅིག་འཚོལ་མ་འཐོབ།"
 
-#: src/ui.cc:2228
+#: src/ui.cc:2251
 msgid "Ran out of time while trying to find a solution."
 msgstr "ཐབས་ཤེས་ཅིག་འཚོལ་བའི་སྐབས་ལུ་དུས་ཚོད་ཀྱི་བདའ་མ་ཟུན།"
 
-#: src/ui.cc:2288 src/ui.cc:2290
+#: src/ui.cc:2311 src/ui.cc:2313
 msgid "Resolve Dependencies"
 msgstr "རྟེན་འབྲེལ་ཚུ་མོས་མཐུན་བཟོ།"
 
-#: src/ui.cc:2289
+#: src/ui.cc:2312
 msgid "Search for solutions to unsatisfied dependencies"
 msgstr "ངལ་རངས་མ་འབྱུང་པའི་རྟེན་འབྲེལ་ཚུ་གི་དོན་ལུ་ ཐབས་ཤེས་ཚུ་འཚོལ་ཞིབ་འབད།"
 
-#: src/ui.cc:2301
+#: src/ui.cc:2324
 #, c-format
 msgid "Unable to open %ls"
 msgstr "%ls དེ་ཁ་ཕྱེ་མི་ཚུགས་པས།"
 
-#: src/ui.cc:2307
+#: src/ui.cc:2330
 msgid "Error while dumping resolver state"
 msgstr "མོས་མཐུན་བཟོ་མི་གནས་ལུགས་དེ་བཀོག་བཞག་པའི་སྐབས་ལུ་འཛོལ་བ་བྱུང་ནུག"
 
-#: src/ui.cc:2347
+#: src/ui.cc:2370
 msgid "^Install/remove packages"
 msgstr "ཐུམ་སྒྲིལ་ཚུ་གཞི་བཙུགས/རྩ་བསྐྲད་གཏང་།(^I)"
 
-#: src/ui.cc:2350
+#: src/ui.cc:2373
 msgid "^Update package list"
 msgstr "ཐུམ་སྒྲིལ་གྱི་ཐོ་ཡིག་དེ་དུས་མཐུན་བཟོ།(^U)"
 
-#: src/ui.cc:2355
+#: src/ui.cc:2378
 msgid "Mark Up^gradable"
 msgstr "ཡར་བསྐྱེད་འབད་བཏུབ་མི་ལུ་རྟགས་བཀལ།(^g)"
 
-#: src/ui.cc:2360
+#: src/ui.cc:2383
 msgid "^Forget new packages"
 msgstr "ཐུམ་སྒྲིལ་གསརཔ་ཚུ་སེམས་ཁར་ལས་བརྗེད་ད།(^F)"
 
-#: src/ui.cc:2364
+#: src/ui.cc:2387
 msgid "Canc^el pending actions"
 msgstr "བསྣར་ཏེ་ཡོད་པའི་བྱ་བ་ཚུ་ཆ་མེད་གཏང་།(^e)"
 
-#: src/ui.cc:2368
+#: src/ui.cc:2391
 msgid "^Clean package cache"
 msgstr "ཐུམ་སྒྲིལ་འདྲ་མཛོད་དེ་གཙང་དག་བཟོ། (^C)"
 
-#: src/ui.cc:2372
+#: src/ui.cc:2395
 msgid "Clean ^obsolete files"
 msgstr "ཕན་ཡིག་སྣོད་ཚུ་གཙང་དག་བཟོ། (^o)"
 
-#: src/ui.cc:2379
+#: src/ui.cc:2402
 msgid "^Reload package cache"
 msgstr "ཐུམ་སྒྲིལ་འདྲ་མཛོད་དེ་ཡང་བསྐྱར་མངོན་གསལ་འབད།(^R)"
 
-#: src/ui.cc:2384
+#: src/ui.cc:2407
 msgid "^Play Minesweeper"
 msgstr "འགས་རྫས་འཕྱག་མི་གཏང་། (^P)"
 
-#: src/ui.cc:2389
+#: src/ui.cc:2412
 msgid "^Become root"
 msgstr "རྩ་བ་ལུ་འགྱུར་འོང་། (^B)"
 
-#: src/ui.cc:2392
+#: src/ui.cc:2415
 msgid "^Quit"
 msgstr "སྤང་།(^Q)"
 
-#: src/ui.cc:2399 src/ui.cc:2786
+#: src/ui.cc:2422 src/ui.cc:2811
 msgid "Undo"
 msgstr "འབད་བཤོལ།"
 
-#: src/ui.cc:2408
+#: src/ui.cc:2431
 msgid "^Install"
 msgstr "གཞི་བཙུགས།(^I)"
 
-#: src/ui.cc:2409
+#: src/ui.cc:2432
 msgid "Flag the currently selected package for installation or upgrade"
 msgstr ""
 "གཞི་བཙུགས་དང་ཡར་བསྐྱེད་འབད་ནིའི་དོན་ལུ་ "
 "ད་ལྟོ་སེལ་འཐུ་འབད་ཡོའ་པའི་ཐུམ་སྒྲིལ་དེ་ལུ་ཟུར་རྟགས་བཀོད།"
 
-#: src/ui.cc:2416
+#: src/ui.cc:2439
 msgid "^Remove"
 msgstr "རྩ་བསྐྲད། (^R)"
 
-#: src/ui.cc:2417
+#: src/ui.cc:2440
 msgid "Flag the currently selected package for removal"
 msgstr ""
 "རྩ་བསྐྲད་གཏང་ནིའི་དོན་ལུ་ "
 "ད་ལྟོ་སེལ་འཐུ་འབད་ཡོད་པའི་ཐུམ་སྒྲིལ་དེ་ལུ་ཟུར་རྟགས་བཀོད།"
 
-#: src/ui.cc:2420
+#: src/ui.cc:2443
 msgid "^Purge"
 msgstr "ཕྱིར་བསྐྲད། (^P)"
 
-#: src/ui.cc:2421
+#: src/ui.cc:2444
 msgid ""
 "Flag the currently selected package and its configuration files for removal"
 msgstr ""
 "རྩ་བསྐྲད་གཏང་ནིའི་དོན་ལུ་ད་ལྟོ་སེལ་འཐུ་འབད་ཡོད་མི་ཐུམ་སྒྲིལ་དང་ "
 "དེའི་རིམ་སྒྲིག་ཡིག་སྣོད་དེ་ལུ་ ཟུར་རྟགས་བཀོད།"
 
-#: src/ui.cc:2424
+#: src/ui.cc:2447
 msgid "^Keep"
 msgstr "བཞག(^K)"
 
-#: src/ui.cc:2425
+#: src/ui.cc:2448
 msgid "Cancel any action on the selected package"
 msgstr "བྱ་བ་ག་འབད་རུང་ཅིག་སེལ་འཐུ་འབད་ཡོད་པའི་ཐུམ་སྒྲིལ་གུར་ཆ་མེད་གཏང་།"
 
-#: src/ui.cc:2428
+#: src/ui.cc:2451
 msgid "^Hold"
 msgstr "འཆང། (^H)"
 
-#: src/ui.cc:2429
+#: src/ui.cc:2452
 msgid ""
 "Cancel any action on the selected package, and protect it from future "
 "upgrades"
@@ -7429,11 +7424,11 @@
 "བྱ་བ་ག་འབད་རུང་ཅིག་སེལ་འཐུ་འབད་ཡོད་པའི་ཐུམ་སྒྲིལ་གུར་ཆ་མེད་གཏང་ཞིནམ་ལས་ "
 "འ་ནི་དེ་མ་འོངས་པ་ལུ་ཡར་བསྐྱེད་འབད་ནི་ལས་ཉེན་སྐྱོབ་འབད།"
 
-#: src/ui.cc:2432
+#: src/ui.cc:2455
 msgid "Mark ^Auto"
 msgstr "རང་བཞིན་ལུ་རྟགས་བཀལ། (^A)"
 
-#: src/ui.cc:2433
+#: src/ui.cc:2456
 msgid ""
 "Mark the selected package as having been automatically installed; it will "
 "automatically be removed if no other packages depend on it"
@@ -7442,11 +7437,11 @@
 "སྦེ་རྟགས་བཀལ། ཐུམ་སྒྲིལ་གཞན་མི་ཚུ་གིས་དེ་ལུ་མ་བརྟེན་པ་ཅིན་ "
 "འ་ནི་དེ་རང་བཞིན་གྱིས་རྩ་བསྐྲད་གཏང་འོང་།"
 
-#: src/ui.cc:2436
+#: src/ui.cc:2459
 msgid "Mark ^Manual"
 msgstr "ལག་དེབ་ལུ་རྟགས་བཀལ།(^M)"
 
-#: src/ui.cc:2437
+#: src/ui.cc:2460
 msgid ""
 "Mark the selected package as having been manually installed; it will not be "
 "removed unless you manually remove it"
@@ -7454,11 +7449,11 @@
 "སེལ་འཐུ་འབད་ཡོད་པའི་ཐུམ་སྒྲིལ་ཚུ་ལག་ཐོག་ལས་གཞི་བཙུགས་འབད་དེ་ཡོད་དོ་བཟུམ་སྦེ་ར"
 "ྟགས་བཀལ། ཁྱོད་ཀྱིས་ལག་ཐོག་ལས་རྩ་བསྐྲད་མ་གཏང་ཚུན་ཚོད་ དེ་གིས་རྩ་བསྐྲད་མི་འགྱོ།"
 
-#: src/ui.cc:2440
+#: src/ui.cc:2463
 msgid "^Forbid Version"
 msgstr "ཐོན་རིམ་མ་ཆོགཔ་བཟོ།(^F)"
 
-#: src/ui.cc:2441
+#: src/ui.cc:2464
 msgid ""
 "Forbid the candidate version of the selected package from being installed; "
 "newer versions of the package will be installed as usual"
@@ -7467,84 +7462,84 @@
 "་ཆོགཔ་བཟོ། "
 "ཐུམ་སྒྲིལ་དེ་གི་ཐོན་རིམ་གསརཔ་ཚུ་ཨ་རྟག་བཟུམ་སྦེ་གཞི་བཙུགས་འབད་ནི་ཨིན།"
 
-#: src/ui.cc:2445
+#: src/ui.cc:2468
 msgid "I^nformation"
 msgstr "བརྡ་དོན།(^n)"
 
-#: src/ui.cc:2446
+#: src/ui.cc:2469
 msgid "Display more information about the selected package"
 msgstr ""
 "སེལ་འཐུ་འབད་ཡོད་པའི་ཐུམ་སྒྲིལ་དེ་གི་སྐོར་ལས་བརྡ་དོན་ཧེང་བཀལ་བཀྲམ་སྟོན་འབད།"
 
-#: src/ui.cc:2449
+#: src/ui.cc:2472
 msgid "C^ycle Package Information"
 msgstr ""
 
-#: src/ui.cc:2450
+#: src/ui.cc:2473
 msgid ""
 "Cycle through the modes of the package information area: it can show the "
 "package's long description, a summary of its dependency status, or an "
 "analysis of why the package is required."
 msgstr ""
 
-#: src/ui.cc:2453
+#: src/ui.cc:2476
 msgid "^Changelog"
 msgstr "བསྒྱུར་བཅོས་དྲན་དེབ། (^C)"
 
-#: src/ui.cc:2454
+#: src/ui.cc:2477
 msgid "Display the Debian changelog of the selected package"
 msgstr ""
 "སེལ་འཐུ་འབད་ཡོད་པའི་ཐུམ་སྒྲིལ་དེ་གི་ཌེ་བི་ཡཱན་བསྒྱུར་བཅོས་དྲན་དེབ་བཀྲམ་སྟོན་འ"
 "བད།"
 
-#: src/ui.cc:2461
+#: src/ui.cc:2484
 msgid "^Examine Solution"
 msgstr "ཐབས་ཤེས་བརྟག་དཔྱད་འབད།"
 
-#: src/ui.cc:2462
+#: src/ui.cc:2485
 msgid "Examine the currently selected solution to the dependency problems."
 msgstr ""
 "ད་ལྟོ་སེལ་འཐུ་འབད་ཡོད་པའི་ཐབས་ཤེས་དེ་རྟེན་འབྲེལ་གྱི་དཀའ་ངལ་དེ་ལུ་བརྟག་དཔྱད་འབ"
 "ད།"
 
-#: src/ui.cc:2465
+#: src/ui.cc:2488
 msgid "Apply ^Solution"
 msgstr "ཐབས་ཤེས་འཇུག་སྤྱོད་འབད།"
 
-#: src/ui.cc:2466
+#: src/ui.cc:2489
 msgid "Perform the actions contained in the currently selected solution."
 msgstr ""
 "ད་ལྟོ་སེལ་འཐུ་འབད་ཡོད་པའི་ཐབས་ཤེས་ཚུ་ནང་ལུ་ཡོད་པའི་བྱ་བ་ཚུ་ལག་ལེན་འཐབ།"
 
-#: src/ui.cc:2469
+#: src/ui.cc:2492
 msgid "^Next Solution"
 msgstr "ཤུལ་མམ་གྱི་ཐབས་ལམ། (^N)"
 
-#: src/ui.cc:2470
+#: src/ui.cc:2493
 msgid "Select the next solution to the dependency problems."
 msgstr "ཤུལ་མམ་གྱི་ཐབས་ཤེས་དེ་རྟེན་འབྲེལ་གྱི་དཀའ་ངལ་དེ་ལུ་སེལ་འཐུ་འབད།"
 
-#: src/ui.cc:2473
+#: src/ui.cc:2496
 msgid "^Previous Solution"
 msgstr "ཧེ་མམ་གྱི་་ཐབས་ཤེས། (^P)"
 
-#: src/ui.cc:2474
+#: src/ui.cc:2497
 msgid "Select the previous solution to the dependency problems."
 msgstr "ཧེ་མམ་གྱི་ཐབས་ཤེས་དེ་རྟེན་འབྲེལ་གྱི་དཀའ་ངལ་དེ་ལུ་སེལ་འཐུ་འབད།"
 
-#: src/ui.cc:2477
+#: src/ui.cc:2500
 msgid "^First Solution"
 msgstr "ཐབས་དང་པ། (^F)"
 
-#: src/ui.cc:2478
+#: src/ui.cc:2501
 msgid "Select the first solution to the dependency problems."
 msgstr "ཐབས་ཤེས་དང་པམ་དེ་རྟེན་འབྲེལ་གྱི་དཀའ་ངལ་དེ་ལུ་སེལ་འཐུ་འབད།"
 
-#: src/ui.cc:2481
+#: src/ui.cc:2504
 msgid "^Last Solution"
 msgstr "མཇུག་གི་ཐབས་ཤེས།"
 
-#: src/ui.cc:2482
+#: src/ui.cc:2505
 msgid ""
 "Select the last solution to the dependency problems that has been generated "
 "so far."
@@ -7552,178 +7547,178 @@
 "མཇུག་གི་སེལ་འཐུ་དེ་ད་ལྟོ་ཚུན་ཚོད་བཟོ་བཏོན་འབད་ཡོད་པའི་རྟེན་འབྲེལ་གྱི་དཀའ་ངལ་ད"
 "ེ་ལུ་སེལ་འཐུ་འབད།"
 
-#: src/ui.cc:2488
+#: src/ui.cc:2511
 msgid "Toggle ^Rejected"
 msgstr "སོར་སྟོན་སྣང་མེད་སྦེ་བཞག་ཡོདཔ།(^R)"
 
-#: src/ui.cc:2489
+#: src/ui.cc:2512
 msgid "Toggle whether the currently selected action is rejected."
 msgstr ""
 "ད་ལྟོ་སེལ་འཐུ་འབཐ་ཡོད་པའི་བྱ་བ་དེ་སྣང་མེད་སྦེ་བཞག་སྟེ་ཡོད་དང་མེད་སོར་སྟོན་འབད"
 "།"
 
-#: src/ui.cc:2493
+#: src/ui.cc:2516
 msgid "Toggle ^Approved"
 msgstr "སོར་སྟོན་གནང་བ་གྲོལ་ཡོདཔ། (^A)"
 
-#: src/ui.cc:2494
+#: src/ui.cc:2517
 msgid "Toggle whether the currently selected action is approved."
 msgstr ""
 "ད་ལྟོ་སེལ་འཐུ་འབད་ཡོད་པའི་བྱ་བ་དེ་གི་གནང་བ་གྲོལ་ཡོད་དང་མེད་སོར་སྟོན་འབད།"
 
-#: src/ui.cc:2498
+#: src/ui.cc:2521
 msgid "^View Target"
 msgstr "དམིགས་གཏད་སྟོན། (^V)"
 
-#: src/ui.cc:2499
+#: src/ui.cc:2522
 msgid "View the package which will be affected by the selected action"
 msgstr ""
 "ཐུམ་སྒྲིལ་ག་དེ་ལུ་སེལ་འཐུ་འབད་ཡོད་པའི་བྱ་བ་གིས་གནོད་སྐྱོན་འབྱུང་ནི་ཨིན་པས་ག་ས"
 "ྟོན།"
 
-#: src/ui.cc:2505
+#: src/ui.cc:2528
 msgid "Reject Breaking ^Holds"
 msgstr ""
 
-#: src/ui.cc:2507
+#: src/ui.cc:2530
 msgid ""
 "Reject all actions that would change the state of held packages or install "
 "forbidden versions"
 msgstr ""
 
-#: src/ui.cc:2515
+#: src/ui.cc:2538
 msgid "^Find"
 msgstr "འཚོལ།(^F)"
 
-#: src/ui.cc:2516
+#: src/ui.cc:2539
 msgid "Search forwards"
 msgstr "གདོང་བསྐྱོད་འབད་དེ་འཚོལ་ཞིབ་འབད།"
 
-#: src/ui.cc:2519
+#: src/ui.cc:2542
 msgid "^Find Backwards"
 msgstr "རྒྱབ་བསྐྱོད་དེ་འཚོལ། (^F)"
 
-#: src/ui.cc:2520
+#: src/ui.cc:2543
 msgid "Search backwards"
 msgstr "རྒྱབ་བསྐྱོད་འབད་དེ་ཚའོལ་ཞིབ་འབད།"
 
-#: src/ui.cc:2523
+#: src/ui.cc:2546
 msgid "Find ^Again"
 msgstr "ལོག་སྟེ་འཚོལ།(^A)"
 
-#: src/ui.cc:2524
+#: src/ui.cc:2547
 msgid "Repeat the last search"
 msgstr "མཇུག་གི་འཚོལ་ཞིབ་འབད་ཡོད་མི་དེ་ཡང་བསྐྱར་འབད།"
 
-#: src/ui.cc:2527
+#: src/ui.cc:2550
 msgid "Find Again ^Backwards"
 msgstr "རྒྱབ་བསྐྱོད་དེ་ལོག་འཚོལ། (^B)"
 
-#: src/ui.cc:2528
+#: src/ui.cc:2551
 msgid "Repeat the last search in the opposite direction"
 msgstr "མཇུག་གི་འཚོལ་ཞིབ་འབད་ཡོད་མི་དེ་རྒྱབ་འགལ་ཕྱོགས་སུ་་ཡང་བསྐྱར་འབད།"
 
-#: src/ui.cc:2532
+#: src/ui.cc:2555
 msgid "^Limit Display"
 msgstr "བཀྲམ་སྟོན་འབད་ནི་ལུ་་ཚད་བཀལ།(^L)"
 
-#: src/ui.cc:2533
+#: src/ui.cc:2556
 msgid "Apply a filter to the package list"
 msgstr "ཐུམ་སྒྲིལ་ཐོ་ཡིག་དེ་ལུ་ཚགས་མ་ཅིག་འཇུག་སྤྱོད་འབད།"
 
-#: src/ui.cc:2536
+#: src/ui.cc:2559
 msgid "^Un-Limit Display"
 msgstr "བཀྲམ་སྟོན་འབད་ནི་ལུ་ཚད་བཤོལ་འབད།"
 
-#: src/ui.cc:2537
+#: src/ui.cc:2560
 msgid "Remove the filter from the package list"
 msgstr "ཐུམ་སྒྲིལ་གྱི་ཐོ་ཡིག་དེ་ནང་ལས་ཚགས་མ་དེ་སྟོན་གཏང་།"
 
-#: src/ui.cc:2541
+#: src/ui.cc:2564
 msgid "Find ^Broken"
 msgstr "ཆག་ཆགཔ་འཚོལ།(^B)"
 
-#: src/ui.cc:2542
+#: src/ui.cc:2565
 msgid "Find the next package with unsatisfied dependencies"
 msgstr "ཤུལ་མམ་གྱི་ཐུམ་སྒྲིལ་དེ་ངལ་མ་འབྱུང་མི་རྟེན་འབྲེལ་ཚུ་དང་གཅིག་ཁར་འཚོལ།"
 
-#: src/ui.cc:2549
+#: src/ui.cc:2572
 msgid "^Preferences"
 msgstr ""
 
-#: src/ui.cc:2554
+#: src/ui.cc:2577
 msgid "^UI options"
 msgstr "ཡུ་ཨའི་གི་གདམ་ཁ།(^M)"
 
-#: src/ui.cc:2555
+#: src/ui.cc:2578
 msgid "Change the settings which affect the user interface"
 msgstr ""
 "ལག་ལེན་པའི་ངོས་འདྲ་བ་དེ་ལུ་གནོད་སྐྱོན་འབྱུང་བཅུག་མི་སྒྲིག་སྟངས་དེ་བསྒྱུར་བཅོས"
 "་འབད།"
 
-#: src/ui.cc:2558
+#: src/ui.cc:2581
 msgid "^Dependency handling"
 msgstr "རྟེན་འབྲེལ་ལེགས་སྐྱོང་འཐབ་ནི།(^D)"
 
-#: src/ui.cc:2559
+#: src/ui.cc:2582
 msgid "Change the settings which affect how package dependencies are handled"
 msgstr ""
 "ཐུམ་སྒྲིལ་གྱི་རྟེན་འབྲེལ་ག་དེ་སྦེེ་ལེགས་སྐྱོང་འཐབ་ཨིན་ན་ལུ་གོནད་སྐྱོན་འབྱུང་བ"
 "ཅུག་མི་སྒྲིག་སྟངས་དེ་བསྒྱུར་བཅོས་འབད།"
 
-#: src/ui.cc:2562
+#: src/ui.cc:2585
 msgid "^Miscellaneous"
 msgstr "སྣ་ཚོགས།(^M)"
 
-#: src/ui.cc:2563
+#: src/ui.cc:2586
 msgid "Change miscellaneous program settings"
 msgstr "ལས་རིམ་སྣ་ཚོགས་ཀྱི་སྒྲིག་སྟངས་དེ་བསྒྱུར་བཅོས་འབད།"
 
-#: src/ui.cc:2569
+#: src/ui.cc:2592
 msgid "^Revert options"
 msgstr "གདམ་ཁ་ཚུ་རྒྱབ་ལོག་འབད།(^R)"
 
-#: src/ui.cc:2570
+#: src/ui.cc:2593
 msgid "Reset all settings to the system defaults"
 msgstr "སྒྲིག་སྟངས་ཚུ་ཆ་མཉམ་རང་རིམ་ལུགས་སྔོན་སྒྲིག་དེ་ལུ་སླར་སྒྲིག་འབད།"
 
-#: src/ui.cc:2581
+#: src/ui.cc:2604
 msgid "^Next"
 msgstr "ཤུལ་མམ།(^N)"
 
-#: src/ui.cc:2582
+#: src/ui.cc:2605
 msgid "View next display"
 msgstr "ཤུལ་མམ་གྱི་བཀྲམ་སྟོན་དེ་སྟོན།"
 
-#: src/ui.cc:2585
+#: src/ui.cc:2608
 msgid "^Prev"
 msgstr "ཧེ་མམ།(^P)"
 
-#: src/ui.cc:2586
+#: src/ui.cc:2609
 msgid "View previous display"
 msgstr "ཧེ་མམ་གྱི་བཀྲམ་སྟོན་དེ་སྟོན།"
 
-#: src/ui.cc:2589
+#: src/ui.cc:2612
 msgid "^Close"
 msgstr "ཁ་བསྡམས།(^C)"
 
-#: src/ui.cc:2590
+#: src/ui.cc:2613
 msgid "Close this display"
 msgstr "བཀྲམ་སྟོན་འདི་ཁ་བསྡམས།"
 
-#: src/ui.cc:2595
+#: src/ui.cc:2618
 msgid "New Package ^View"
 msgstr "ཐུམ་སྒྲིལ་གསརཔ་སྟོན།(^V)"
 
-#: src/ui.cc:2596
+#: src/ui.cc:2619
 msgid "Create a new default package view"
 msgstr "སྔོན་སྒྲིག་ཐུམ་སྒྲིལ་གྱི་མཐོང་སྣང་ཅིག་གསར་བསྐྲུན་འབད།"
 
-#: src/ui.cc:2599
+#: src/ui.cc:2622
 msgid "Audit ^Recommendations"
 msgstr "རྩིས་ཞིབ་འོས་སྦྱོར།(^R)"
 
-#: src/ui.cc:2600
+#: src/ui.cc:2623
 msgid ""
 "View packages which it is recommended that you install, but which are not "
 "currently installed."
@@ -7731,21 +7726,21 @@
 "ཁྱོད་ཀྱིས་གཞི་བཙུགས་འབད་མི་འོས་སྦྱོར་འབད་ཡོད་མི་ཐུམ་སྒྲིལ་ད་ལྟོ་གཞི་བཙུགས་འབད"
 "་དེ་མེད་མི་ཚུ་སྟོན།"
 
-#: src/ui.cc:2603
+#: src/ui.cc:2626
 msgid "New ^Flat Package List"
 msgstr "ཐུམ་སྒྲིལ་ལེབ་ཏེམ་ཡོད་མི་ཐོ་ཡིག་གསརཔ།(^F)"
 
-#: src/ui.cc:2604
+#: src/ui.cc:2627
 msgid "View all the packages on the system in a single uncategorized list"
 msgstr ""
 "ཐུམ་སྒྲིལ་ཚུ་ཆ་མཉམ་རིམ་ལུགས་གུར་དབྱེ་རིམ་བཟོ་སྟེ་མེད་མི་ཐོ་ཡིག་རྐྱང་པའི་ནང་སྦ"
 "ེ་སྟོན།"
 
-#: src/ui.cc:2607
+#: src/ui.cc:2630
 msgid "New ^Debtags Browser"
 msgstr "ཌེབ་ཊེགསི་་བརའུ་ཟར་གསརཔ།(^D)"
 
-#: src/ui.cc:2609
+#: src/ui.cc:2632
 msgid "Browse packages using Debtags data"
 msgstr ""
 "ཌེབ་ཊེགསི་གནད་སྡུད་དེ་ལག་ལེན་འཐབ་པའི་ཐོག་ལས་ཐུམ་སྒྲིལ་ཚུ་བརྡ་འཚོལ་འབད།"
@@ -7758,64 +7753,64 @@
 msgid "Browse packages by category"
 msgstr "ཐུམ་སྒྲིལ་ཚུ་དབྱེ་རིམ་གིས་སྦེ་བརྡ་འཚོལ་འབད།"
 
-#: src/ui.cc:2622
+#: src/ui.cc:2645
 msgid "^About"
 msgstr "སྐོར་ལས།(^A)"
 
-#: src/ui.cc:2623
+#: src/ui.cc:2646
 msgid "View information about this program"
 msgstr "ལས་རིམ་འདི་གི་སྐོར་ལས་བརྡ་དོན་སྟོན།"
 
-#: src/ui.cc:2626
+#: src/ui.cc:2649
 msgid "^Help"
 msgstr "གྲོགས་རམ།(^H)"
 
-#: src/ui.cc:2627
+#: src/ui.cc:2650
 msgid "View the on-line help"
 msgstr "གློག་ཐོག་གྲོགས་རམ་དེ་སྟོན།"
 
-#: src/ui.cc:2629
+#: src/ui.cc:2652
 msgid "User's ^Manual"
 msgstr "ལག་ལེན་པའི་ལག་དེབ།(^M)"
 
-#: src/ui.cc:2630
+#: src/ui.cc:2653
 msgid "View the detailed program manual"
 msgstr "རྒྱས་བཤད་ལས་རིམ་གྱི་ལག་དེབ་དེ་སྟོན།"
 
-#: src/ui.cc:2633
+#: src/ui.cc:2656
 msgid "^FAQ"
 msgstr "ཨེཕ་ཨེ་ཀེཡུ།(^F)"
 
-#: src/ui.cc:2637
+#: src/ui.cc:2660
 msgid "^News"
 msgstr "གནས་ཚུལ།(^N)"
 
-#: src/ui.cc:2638
+#: src/ui.cc:2661
 msgid "View the important changes made in each version of "
 msgstr ""
 "གི་ཐོན་རིམ་རེ་རེའི་ནང་ལུ་བཟོ་ཡོད་མི་གལ་གནད་ཅན་གྱི་བསྒྱུར་བཅོས་དེ་ཚུ་སྟོན། "
 
-#: src/ui.cc:2641
+#: src/ui.cc:2664
 msgid "^License"
 msgstr "ཆོག་ཐམ།(^L)"
 
-#: src/ui.cc:2785
+#: src/ui.cc:2810
 msgid "Actions"
 msgstr "བྱ་བ་ཚུ་སྟོན།"
 
-#: src/ui.cc:2789
+#: src/ui.cc:2814
 msgid "Search"
 msgstr "འཚོལ་ཞིབ།"
 
-#: src/ui.cc:2790
+#: src/ui.cc:2815
 msgid "Options"
 msgstr "གདམ་ཁ་ཚུ།"
 
-#: src/ui.cc:2791
+#: src/ui.cc:2816
 msgid "Views"
 msgstr "མཐོང་སྣང་།"
 
-#: src/ui.cc:2857
+#: src/ui.cc:2823
 #, c-format
 msgid ""
 "%ls: Menu  %ls: Help  %ls: Quit  %ls: Update  %ls: Download/Install/Remove "
@@ -7824,11 +7819,11 @@
 "%ls: དཀར་ཆག  %ls: གྲོགས་རམ་  %ls: སྤང་  %ls: དུས་མཐུན་བཟོ་  %ls: "
 "ཐུམ་སྒྲིལ་ཚུ་ ཕབ་ལེན་/གཞི་བཙུགས་/རྩ་བསྐྲད་གཏང།"
 
-#: src/ui.cc:3216
+#: src/ui.cc:3252
 msgid "yes_key"
 msgstr "ལྡེ་མིག་ཡོད།(_K)"
 
-#: src/ui.cc:3217
+#: src/ui.cc:3253
 msgid "no_key"
 msgstr "ལྡེ་མིག་མེད།(_k)"
 
diff -Nru language-pack-dz-base-14.04+20150804/data/dz/LC_MESSAGES/apt.po language-pack-dz-base-14.04+20160720/data/dz/LC_MESSAGES/apt.po
--- language-pack-dz-base-14.04+20150804/data/dz/LC_MESSAGES/apt.po	2015-08-14 07:53:49.000000000 +0000
+++ language-pack-dz-base-14.04+20160720/data/dz/LC_MESSAGES/apt.po	2016-07-20 16:44:53.000000000 +0000
@@ -7,78 +7,78 @@
 "Project-Id-Version: apt_po.pot\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
 "POT-Creation-Date: 2012-03-15 19:05+0000\n"
-"PO-Revision-Date: 2015-08-02 01:33+0000\n"
+"PO-Revision-Date: 2016-05-18 21:26+0000\n"
 "Last-Translator: kinley tshering <Unknown>\n"
 "Language-Team: Dzongkha <pgeyleg@dit.gov.bt>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2015-08-04 05:28+0000\n"
-"X-Generator: Launchpad (build 17656)\n"
+"X-Launchpad-Export-Date: 2016-07-20 10:32+0000\n"
+"X-Generator: Launchpad (build 18147)\n"
 "X-Poedit-Country: Bhutan\n"
 "Language: dz\n"
 "X-Poedit-Language: Dzongkha\n"
 "X-Poedit-SourceCharset: utf-8\n"
 
-#: cmdline/apt-cache.cc:141
+#: apt-private/private-unmet.cc
 #, c-format
 msgid "Package %s version %s has an unmet dep:\n"
 msgstr "ཐུམ་སྒྲིལ་ %s ཐོན་རིམ་ %s ལུ་ ཌེཔ་མ་ཚང་ཅིག་འདུག:\n"
 
-#: cmdline/apt-cache.cc:245
+#: cmdline/apt-cache.cc
 msgid "Total package names: "
 msgstr "ཐུམ་སྒྲིལ་བསྡོམས་ཀྱི་མིང་ཚུ: "
 
-#: cmdline/apt-cache.cc:286
+#: cmdline/apt-cache.cc
 msgid "Total package structures: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:285
+#: cmdline/apt-cache.cc
 msgid "  Normal packages: "
 msgstr "  སྤྱིར་བཏང་ཐུམ་སྒྲིལ་ཚུ། "
 
-#: cmdline/apt-cache.cc:286
+#: cmdline/apt-cache.cc
 msgid "  Pure virtual packages: "
 msgstr "  བར་ཅུ་ཡལ་ཐུམ་སྒྲིལ་གཙང་མ་ཚུ: "
 
-#: cmdline/apt-cache.cc:287
+#: cmdline/apt-cache.cc
 msgid "  Single virtual packages: "
 msgstr "  བར་ཅུ་ཡལ་ཐུམ་སྒྲིལ་རྐྱང་པ་ཚུ: "
 
-#: cmdline/apt-cache.cc:288
+#: cmdline/apt-cache.cc
 msgid "  Mixed virtual packages: "
 msgstr "  བར་ཅུ་ཡལ་ཐུམ་སྒྲིལ་སླ་བསྲེ་ཡོད་མི་ཚུ: "
 
-#: cmdline/apt-cache.cc:289
+#: cmdline/apt-cache.cc
 msgid "  Missing: "
 msgstr "  བརླག་སྟོར་ཞུགས་པ: "
 
-#: cmdline/apt-cache.cc:291
+#: cmdline/apt-cache.cc
 msgid "Total distinct versions: "
 msgstr "ཁྱད་རྟགས་ཅན་གྱི་ཐོན་རིམ་ཚུ་གི་བསྡོམས: "
 
-#: cmdline/apt-cache.cc:293
+#: cmdline/apt-cache.cc
 msgid "Total distinct descriptions: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:295
+#: cmdline/apt-cache.cc
 msgid "Total dependencies: "
 msgstr "རྟེན་འབྲེལ་བསྡོམས: "
 
-#: cmdline/apt-cache.cc:298
+#: cmdline/apt-cache.cc
 msgid "Total ver/file relations: "
 msgstr "ཐེན་རིམ་/ཡིག་སྣོད་ མཐུན་འབྲེལ་གྱི་བསྡོམས: "
 
-#: cmdline/apt-cache.cc:300
+#: cmdline/apt-cache.cc
 msgid "Total Desc/File relations: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:302
+#: cmdline/apt-cache.cc
 msgid "Total Provides mappings: "
 msgstr "ཡོངས་བསྡོམས་ཀྱིས་ས་ཁྲ་བཟོ་བ་ཚུ་བྱིནམ་ཨིན: "
 
-#: cmdline/apt-cache.cc:314
+#: cmdline/apt-cache.cc
 msgid "Total globbed strings: "
 msgstr "སྤུངས་ཡོད་པའི་ཡིག་རྒྱུན་གྱི་བསྡོམས: "
 
@@ -86,77 +86,74 @@
 msgid "Total dependency version space: "
 msgstr "རྟེན་འབྲེལ་ཐོན་རིམ་བར་སྟོང་གྱི་བསྡོམས: "
 
-#: cmdline/apt-cache.cc:333
+#: cmdline/apt-cache.cc
 msgid "Total slack space: "
 msgstr "བར་སྟོང་ལྷུག་ལྷུག་གི་བསྡོམས: "
 
-#: cmdline/apt-cache.cc:341
+#: cmdline/apt-cache.cc
 msgid "Total space accounted for: "
 msgstr "གི་དོན་ལུ་རྩིས་ཐོ་བཏོན་ཡོད་པའི་བར་སྟོང: "
 
-#: cmdline/apt-cache.cc:469 cmdline/apt-cache.cc:1221
+#: apt-private/private-show.cc cmdline/apt-cache.cc
 #, c-format
 msgid "Package file %s is out of sync."
 msgstr "ཐུམ་སྒྲིལ་ཡིག་སྣོད་ %sའདི་མཉམ་འབྱུང་གི་ཕྱི་ཁར་ཨིན་པས།"
 
-#: cmdline/apt-cache.cc:1453
+#: apt-private/private-depends.cc apt-private/private-show.cc
+#: cmdline/apt-mark.cc
 msgid "No packages found"
 msgstr "ཐུམ་སྒྲིལ་ཚུ་མ་ཐོབ།"
 
-#: cmdline/apt-cache.cc:1221
+#: apt-private/private-search.cc
 msgid "You must give at least one search pattern"
 msgstr ""
 
-#: cmdline/apt-cache.cc:1353
+#: cmdline/apt-cache.cc
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
 msgstr ""
 
-#: cmdline/apt-cache.cc:181 cmdline/apt-cache.cc:550 cmdline/apt-cache.cc:644
-#: cmdline/apt-cache.cc:797 cmdline/apt-cache.cc:1021
-#: cmdline/apt-cache.cc:1425 cmdline/apt-cache.cc:1577
+#: apt-private/private-show.cc
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "%sཐུམ་སྒྲིལ་འདི་ག་ཡོད་ཟཚོལ་མ་ཐོབ།"
 
-#: cmdline/apt-cache.cc:1530
+#: apt-private/private-show.cc
 msgid "Package files:"
 msgstr "ཐུམ་སྒྲིལ་གྱི་ཡིག་སྣོད:"
 
-#: cmdline/apt-cache.cc:1537 cmdline/apt-cache.cc:1624
+#: apt-private/private-show.cc
 msgid "Cache is out of sync, can't x-ref a package file"
 msgstr ""
 "འདྲ་མཛོད་འདི་མཉམ་བྱུང་གི་ཕྱི་ཁར་ཨིན་པས་  ཐུམ་སྒྲིལ་ཡིག་སྣོད་ཅིག་ལུ་ ཨེགསི་-"
 "རེཕ་འབད་མི་ཚུགས་པས།"
 
 #. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1551
+#: apt-private/private-show.cc
 msgid "Pinned packages:"
 msgstr "ཁབ་གཟེར་བཏབ་ཡོད་པའི་ཐུམ་སྒྲིལ་ཚུ:"
 
-#: cmdline/apt-cache.cc:1563 cmdline/apt-cache.cc:1604
+#: apt-private/private-show.cc
 msgid "(not found)"
 msgstr "(མ་ཐོབ།)"
 
-#. Installed version
-#: cmdline/apt-cache.cc:1584
+#: apt-private/private-show.cc
 msgid "  Installed: "
 msgstr "  གཞི་བཙུགས་འབད་ཡོདཔ། "
 
-#. Candidate Version
-#: cmdline/apt-cache.cc:1591
+#: apt-private/private-show.cc
 msgid "  Candidate: "
 msgstr "  མི་ངོ: "
 
-#: cmdline/apt-cache.cc:1586 cmdline/apt-cache.cc:1594
+#: apt-private/private-show.cc
 msgid "(none)"
 msgstr "(ཅི་མེད།)"
 
-#: cmdline/apt-cache.cc:1601
+#: apt-private/private-show.cc
 msgid "  Package pin: "
 msgstr "  ཐུམ་སྒྲིལ་གྱི་ཁབ་གཟེར: "
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1610
+#: apt-private/private-show.cc
 msgid "  Version table:"
 msgstr "  ཐོན་རིམ་ཐིག་ཁྲམ།:"
 
@@ -204,7 +201,7 @@
 "See the apt-cache(8) and apt.conf(5) manual pages for more information.\n"
 msgstr ""
 
-#: cmdline/apt-cdrom.cc:77
+#: cmdline/apt-cdrom.cc
 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
 msgstr ""
 
@@ -212,18 +209,18 @@
 msgid "Please insert a Disc in the drive and press enter"
 msgstr "ཌིསིཀ་ཅིག་འདྲེན་འཕྲུལ་ནང་བཙུགས་བཞིནམ་ལས་ལོག་ལྡེ་འདི་ཨེབ།"
 
-#: cmdline/apt-cdrom.cc:127
+#: cmdline/apt-cdrom.cc
 #, c-format
 msgid "Failed to mount '%s' to '%s'"
 msgstr ""
 
-#: cmdline/apt-cdrom.cc:162
+#: cmdline/apt-cdrom.cc
 msgid "Repeat this process for the rest of the CDs in your set."
 msgstr ""
 "ཁྱོད་ཀྱི་ཆ་ཚན་ནང་གི་སི་ཌི་ལྷག་ལུས་ཡོད་མི་གི་དོན་ལུ་འ་ནི་ལས་སྦྱོར་དེ་ཡང་བསྐྱར་"
 "འབད།"
 
-#: cmdline/apt-config.cc:41
+#: cmdline/apt-config.cc
 msgid "Arguments not in pairs"
 msgstr "སྒྲུབས་རྟགས་ཚུ་ཟུང་ནང་མིན་འདུག"
 
@@ -442,7 +439,7 @@
 msgid "Unable to open DB file %s: %s"
 msgstr "%s: %s་ཌི་བི་ཡིག་སྣོད་འདི་ཁ་ཕྱེ་མ་ཚུགས།"
 
-#: ftparchive/cachedb.cc:123
+#: methods/rred.cc
 #, c-format
 msgid "Failed to stat %s"
 msgstr "%s་སིཊེཊི་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོདཔ།"
@@ -579,7 +576,7 @@
 msgid "Compressed output %s needs a compression set"
 msgstr "ཨེབ་བཙུགས་འབད་ཡོད་པའི་ཨའུཊི་པུཊི་%sལུ་ཨེབ་བཙུགས་ཆ་ཚན་ཅིག་དགོཔ་འདུག"
 
-#: ftparchive/multicompress.cc:170
+#: methods/rsh.cc
 msgid "Failed to create IPC pipe to subprocess"
 msgstr ""
 "ཡན་ལག་ལས་སྦྱོར་ལུ་ཨའི་པི་སི་རྒྱུད་དུང་གསར་བསྐྲུན་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོདཔ"
@@ -620,74 +617,76 @@
 msgid "Failed to rename %s to %s"
 msgstr "%s་ལུ་%s་བསྐྱར་མིང་བཏགས་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།"
 
-#: cmdline/apt-get.cc:127
+#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
+#: apt-private/private-output.cc
 msgid "Y"
 msgstr "ཝའི།"
 
-#: cmdline/apt-get.cc:140
+#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
+#: apt-private/private-output.cc
 msgid "N"
 msgstr ""
 
-#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1763
+#: apt-private/private-output.cc
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "རི་ཇེགསི་ཕྱོགས་སྒྲིག་འཛོལ་བ་- %s"
 
-#: cmdline/apt-get.cc:244
+#: apt-private/private-output.cc
 msgid "The following packages have unmet dependencies:"
 msgstr "འོག་གི་ཐུམ་སྒྲིལ་ཚུ་ལུ་རྟེན་འབྲེལ་མ་ཚང་པས:"
 
-#: cmdline/apt-get.cc:334
+#: apt-private/private-output.cc
 #, c-format
 msgid "but %s is installed"
 msgstr "འདི་འབདཝ་ད་%s་འདི་གཞི་བཙུགས་འབད་ཡོད།"
 
-#: cmdline/apt-get.cc:336
+#: apt-private/private-output.cc
 #, c-format
 msgid "but %s is to be installed"
 msgstr "འདི་འབདཝ་ད་%sའདི་གཞི་བཙུགས་འབད་ནི་ཨིན།"
 
-#: cmdline/apt-get.cc:343
+#: apt-private/private-output.cc
 msgid "but it is not installable"
 msgstr "འདི་འབདཝ་ད་%s་འདི་གཟི་བཙུགས་འབད་མི་བཏུབ་པས།"
 
-#: cmdline/apt-get.cc:345
+#: apt-private/private-output.cc
 msgid "but it is a virtual package"
 msgstr "འདི་འབདཝ་ད་ འདི་བར་ཅུ་ཡལ་ཐུམ་སྒྲིལ་ཅིག་ཨིན་པས།"
 
-#: cmdline/apt-get.cc:348
+#: apt-private/private-output.cc
 msgid "but it is not installed"
 msgstr "འདི་འབདཝ་ད་འདི་གཞི་བཙུགས་མ་འབད་བས།"
 
-#: cmdline/apt-get.cc:348
+#: apt-private/private-output.cc
 msgid "but it is not going to be installed"
 msgstr "འདི་འབདཝ་ད་འདི་གཞི་བཙུགས་མི་འབད་ནི་ཨིན་པས།"
 
-#: cmdline/apt-get.cc:353
+#: apt-private/private-output.cc
 msgid " or"
 msgstr " ཡང་ན།"
 
-#: cmdline/apt-get.cc:382
+#: apt-private/private-output.cc
 msgid "The following NEW packages will be installed:"
 msgstr "འོག་གི་ཐུམ་སྒྲིས་གསརཔ་འདི་ཚུ་ཁཞི་བཙུགས་འབད་འོང་:"
 
-#: cmdline/apt-get.cc:408
+#: apt-private/private-output.cc
 msgid "The following packages will be REMOVED:"
 msgstr "འོག་གི་ཐུམ་སྒྲིལ་འདི་ཚུ་རྩ བསྐྲད་གཏང་འོང་:"
 
-#: cmdline/apt-get.cc:430
+#: apt-private/private-output.cc
 msgid "The following packages have been kept back:"
 msgstr "འོག་གི་ཐུམ་སྒྲིལ་འདི་ཚུ་ལོག་སྟེ་རང་བཞག་ནུག:"
 
-#: cmdline/apt-get.cc:451
+#: apt-private/private-output.cc
 msgid "The following packages will be upgraded:"
 msgstr "འོག་གི་ཐུམ་སྒྲིལ་འདི་ཚུ་ཡར་བསྐྱེད་འབད་འོང་:"
 
-#: cmdline/apt-get.cc:472
+#: apt-private/private-output.cc
 msgid "The following packages will be DOWNGRADED:"
 msgstr "འོག་གི་ཐུམ་སྒྲལ་འདི་ཚུ་མར་ཕབ་འབད་འོང་:"
 
-#: cmdline/apt-get.cc:492
+#: apt-private/private-output.cc
 msgid "The following held packages will be changed:"
 msgstr "འོག་གི་འཆང་ཡོད་པའི་ཐུམ་སྒྲིལ་ཚུ་བསྒྱུར་བཅོས་འབད་འོང་:"
 
@@ -696,7 +695,7 @@
 msgid "%s (due to %s) "
 msgstr "%s( %s་གིས་སྦེ) "
 
-#: cmdline/apt-get.cc:553
+#: apt-private/private-output.cc
 msgid ""
 "WARNING: The following essential packages will be removed.\n"
 "This should NOT be done unless you know exactly what you are doing!"
@@ -704,59 +703,59 @@
 "ཉེན་བརྡ:འོག་གི་ཉོ་མཁོ་བའི་ཐུམ་སྒྲིལ་ཚུ་རྩ་བསྐྲད་གཏང་འོང་།\n"
 "ཁྱོད་ཀྱིས་ཁྱོད་རང་ག་ཅི་འབདཝ་ཨིན་ན་ངེས་སྦེ་མ་ཤེས་ཚུན་འདི་འབད་ནི་མི་འོང་།!"
 
-#: cmdline/apt-get.cc:584
+#: apt-private/private-output.cc
 #, c-format
 msgid "%lu upgraded, %lu newly installed, "
 msgstr "%lu་ཡར་བསྐྱེད་འབད་ཡོད་ %lu་འདི་གསརཔ་སྦེ་གཞི་བཙུགས་འབད་ཡོད། "
 
-#: cmdline/apt-get.cc:588
+#: apt-private/private-output.cc
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "%lu་འདི་ལོག་གཞི་བཙུགས་འབད་ཡོད། "
 
-#: cmdline/apt-get.cc:590
+#: apt-private/private-output.cc
 #, c-format
 msgid "%lu downgraded, "
 msgstr "%lu་འདི་མར་ཕབ་འབད་ཡོད། "
 
-#: cmdline/apt-get.cc:592
+#: apt-private/private-output.cc
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr "རྩ་བསྐྲད་འབད་ནི་ལུ་%lu་དང་%lu་ཡར་བསྐྱེད་མ་འབད་བས།\n"
 
-#: cmdline/apt-get.cc:596
+#: apt-private/private-output.cc
 #, c-format
 msgid "%lu not fully installed or removed.\n"
 msgstr "%lu་འདི་ཆ་ཚང་སྦེ་གཞི་བཙུགས་མ་འབད་ཡང་ན་རྩ་བསྐྲད་མ་གཏང་པས།\n"
 
-#: cmdline/apt-get.cc:628
+#: apt-private/private-cacheset.cc
 #, c-format
 msgid "Note, selecting '%s' for task '%s'\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:634
+#: apt-private/private-cacheset.cc
 #, c-format
 msgid "Note, selecting '%s' for regex '%s'\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:1133
+#: apt-private/private-cacheset.cc
 #, c-format
 msgid "Package %s is a virtual package provided by:\n"
 msgstr "གྱིས་བྱིན་ཏེ་ཡོད་པའི་ཐུམ་སྒྲིལ་%s་འདི་བར་ཅུ་ཡལ་ཐུམ་སྒྲིལ་ཅིག་ཨིན།\n"
 
-#: cmdline/apt-get.cc:1145
+#: apt-private/private-cacheset.cc
 msgid " [Installed]"
 msgstr " [གཞི་བཙུགས་འབད་ཡོད།]"
 
-#: cmdline/apt-get.cc:671
+#: apt-private/private-cacheset.cc
 msgid " [Not candidate version]"
 msgstr ""
 
-#: cmdline/apt-get.cc:1150
+#: apt-private/private-cacheset.cc
 msgid "You should explicitly select one to install."
 msgstr "ཁྱོད་ཀྱི་གཞི་བཙུགས་འབད་ནི་ལུ་གཏན་འཁལ་སྦེ་གཅིག་སེལ་འཐུ་འབད་དགོ"
 
-#: cmdline/apt-get.cc:1155
+#: apt-private/private-cacheset.cc
 #, c-format
 msgid ""
 "Package %s is not available, but is referred to by another package.\n"
@@ -769,26 +768,26 @@
 "ཕན་མེད་སྦེ་གནས་ཡོདཔ་  ཡང་ན་\n"
 "འདི་གཞན་འབྱུང་ཅིག་ནང་ལས་ལས་རྐྱངམ་ཅིག་འཐོབ་ཚུགསཔ་ཨིན་པས།\n"
 
-#: cmdline/apt-get.cc:1174
+#: apt-private/private-cacheset.cc
 msgid "However the following packages replace it:"
 msgstr "ག་དེ་སྦེ་ཨིན་རུང་འོག་གི་ཐུམ་སྒྲིལ་ཚུ་གིས་ འདི་ཚབ་བཙུགསཔ་ཨིན:"
 
-#: cmdline/apt-get.cc:706
+#: apt-private/private-cacheset.cc
 #, c-format
 msgid "Package '%s' has no installation candidate"
 msgstr ""
 
-#: cmdline/apt-get.cc:717
+#: apt-private/private-cacheset.cc
 #, c-format
 msgid "Virtual packages like '%s' can't be removed\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:748
+#: apt-private/private-cacheset.cc
 #, c-format
 msgid "Note, selecting '%s' instead of '%s'\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:1104
+#: apt-private/private-install.cc
 #, c-format
 msgid "Skipping %s, it is already installed and upgrade is not set.\n"
 msgstr ""
@@ -796,12 +795,12 @@
 "འདི་ཧེ་མ་ལས་རང་གཞི་བཙུགས་འབད་འོདཔ་དང་དུས་ཡར་བསྐྱེད་འབད་ནི་འདི་གཞི་སྒྲིག་མ་འབད"
 "་བས།\n"
 
-#: cmdline/apt-get.cc:782
+#: apt-private/private-install.cc
 #, c-format
 msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:1197
+#: apt-private/private-install.cc
 #, c-format
 msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
 msgstr ""
@@ -813,17 +812,17 @@
 msgid "%s is already the newest version.\n"
 msgstr "%s ་འདི་ཧེ་མ་ལས་རང་འཐོན་རིམ་གསར་ཤོས་ཅིག་ཨིན།\n"
 
-#: cmdline/apt-get.cc:1805
+#: apt-private/private-install.cc cmdline/apt-get.cc cmdline/apt-mark.cc
 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:844
+#: apt-private/private-install.cc
 #, c-format
 msgid "Selected version '%s' (%s) for '%s'\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:849
+#: apt-private/private-install.cc
 #, c-format
 msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
 msgstr ""
@@ -834,41 +833,41 @@
 msgstr ""
 "ཐུམ་སྒྲིལ་%s་འདི་གཞི་བཙུགས་མ་འབད་བས་  འདི་འབད་ནི་དི་གིས་རྩ་བསྐྲད་མ་གཏང་པས།་\n"
 
-#: cmdline/apt-get.cc:669
+#: apt-private/private-cachefile.cc
 msgid "Correcting dependencies..."
 msgstr "རྟེན་འབྲེལ་ནོར་བཅོས་འབད་དོ།"
 
-#: cmdline/apt-get.cc:672
+#: apt-private/private-cachefile.cc
 msgid " failed."
 msgstr " འཐུས་ཤོར་བྱུང་ཡོད།"
 
-#: cmdline/apt-get.cc:675
+#: apt-private/private-cachefile.cc
 msgid "Unable to correct dependencies"
 msgstr "རྟེན་འབྲེལ་འདི་ནོར་བཅོས་འབད་མི་ཚུགས་པས།"
 
-#: cmdline/apt-get.cc:678
+#: apt-private/private-cachefile.cc
 msgid "Unable to minimize the upgrade set"
 msgstr "ཡར་བསྐྱེད་འབད་ཡོད་པའི་ཆ་ཚན་འདི་ཆུང་ཀུ་བཟོ་མི་ཚུགས་པས།"
 
-#: cmdline/apt-get.cc:680
+#: apt-private/private-cachefile.cc
 msgid " Done"
 msgstr " འབད་ཚར་ཡི།"
 
-#: cmdline/apt-get.cc:986
+#: apt-private/private-cachefile.cc
 msgid "You might want to run 'apt-get -f install' to correct these."
 msgstr ""
 "འ་ནི་འདི་ཚུ་ནོར་བཅོས་འབད་ནི་ལུ་ཁྱོད་ཀྱི་'apt-get -f "
 "install'དེ་གཡོག་བཀོལ་དགོཔ་འོང་།"
 
-#: cmdline/apt-get.cc:687
+#: apt-private/private-cachefile.cc
 msgid "Unmet dependencies. Try using -f."
 msgstr "མ་ཚང་པའི་རྟེན་འབྲེལ་ཚུ། -f ལག་ལེན་འཐབ་སྟེ་འབད་རྩོལ་བསྐྱེད།"
 
-#: cmdline/apt-get.cc:695
+#: apt-private/private-download.cc
 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr "ཉེན་བརྡ:འོག་གི་ཐུམ་སྒྲིལ་འདི་ཚུ་བདེན་བཤད་འབད་མི་བཏུབ་པས།"
 
-#: cmdline/apt-get.cc:699
+#: apt-private/private-download.cc
 msgid "Authentication warning overridden.\n"
 msgstr "བདེན་བཤད་ཉེན་བརྡ་འདི་ཟུར་འབད་ཡོད།\n"
 
@@ -877,7 +876,7 @@
 msgstr ""
 "བདེན་སྦྱོར་མ་འབད་བར་འ་ནི་ཐུམ་སྒྲིལ་འདི་ཚུ་གཞི་བཙུགས་འབད་ནི་ཨིན་ན་[y/N]? "
 
-#: cmdline/apt-get.cc:704 cmdline/apt-get.cc:711
+#: apt-private/private-download.cc
 msgid "Some packages could not be authenticated"
 msgstr "ཐུམ་སྒྲིལ་ལ་ལུ་ཅིག་བདེན་བཤད་འབད་མ་ཚུགས།"
 
@@ -885,19 +884,19 @@
 msgid "There are problems and -y was used without --force-yes"
 msgstr "དཀའ་ངལ་ཚུ་ཡོདཔ་ལས་-y ་འདི་ --force-yes་མེདཐོག་ལས་ལག་ལེན་འཐབ་སྟེ་ཡོད།"
 
-#: cmdline/apt-get.cc:782
+#: apt-private/private-install.cc
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr ""
 "ནང་འཁོད་ཀྱི་འཛོལ་བ་  གཞི་བཙུགས་ཐུམ་སྒྲིལ་ཚུ་ "
 "ཆད་པ་ཡོད་པའི་ཐུམ་སྒྲིལ་ཚུ་དང་གཅིག་ཁར་བོད་བརྡ་འབད་འདི་ཡོད!"
 
-#: cmdline/apt-get.cc:791
+#: apt-private/private-install.cc
 msgid "Packages need to be removed but remove is disabled."
 msgstr ""
 "ཐུམ་སྒྲིལ་ཚུ་རྩ་བསྐྲད་བཏང་དགོཔ་འདུག་འདི་འབདགཝ་ད་རྩ་བསྐྲད་གཏང་ནི་འདི་ལྕོགས་མིན"
 "་ཐལ་ཏེ་འདུག"
 
-#: cmdline/apt-get.cc:802
+#: apt-private/private-install.cc
 msgid "Internal error, Ordering didn't finish"
 msgstr "ནང་འཁོད་འཛོལ་བ་  གོ་རིམ་བཟོ་ནི་ཚུ་མཇུག་མ་བསྡུ་བས།"
 
@@ -907,48 +906,57 @@
 "ག་ཅི་གི་ཡ་མཚན་ཆེ་མི་ཆེ་  ཚད་འདི་གིས་ email "
 "apt@packages.debian.org་ལུ་མཐུན་སྒྲིག་མི་འབད་བས།"
 
-#: cmdline/apt-get.cc:848
+#. TRANSLATOR: The required space between number and unit is already included
+#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
+#: apt-private/private-install.cc
 #, c-format
 msgid "Need to get %sB/%sB of archives.\n"
 msgstr "%sBལེན་ནི་ལུ་དགོཔ་པས། ཡིག་མཛོད་ཚི་གི་%sB་\n"
 
-#: cmdline/apt-get.cc:851
+#. TRANSLATOR: The required space between number and unit is already included
+#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
+#: apt-private/private-install.cc
 #, c-format
 msgid "Need to get %sB of archives.\n"
 msgstr "ཡིག་མཛོད་ཀྱི་%sB་འདི་ལེན་དགོ་པས།\n"
 
-#: cmdline/apt-get.cc:856
+#. TRANSLATOR: The required space between number and unit is already included
+#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
+#: apt-private/private-install.cc
 #, c-format
 msgid "After this operation, %sB of additional disk space will be used.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:859
+#. TRANSLATOR: The required space between number and unit is already included
+#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
+#: apt-private/private-install.cc
 #, c-format
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:877 cmdline/apt-get.cc:2319
-#: cmdline/apt-get.cc:2322
+#: apt-private/private-download.cc
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "%s་ནང་བར་སྟོང་"
 
-#: cmdline/apt-get.cc:887
+#: apt-private/private-download.cc
 #, c-format
 msgid "You don't have enough free space in %s."
 msgstr "%s ནང་ཁྱོད་ལུ་བར་སྟོང་དལཝ་ལངམ་སྦེ་མིན་འདུག"
 
-#: cmdline/apt-get.cc:903 cmdline/apt-get.cc:923
+#: apt-private/private-install.cc
 msgid "Trivial Only specified but this is not a trivial operation."
 msgstr ""
 "གལ་ཆུང་རྐྱངམ་ཅིག་ཁསལ་བཀོད་འབད་ནུག་ "
 "འདི་འབདཝ་ད་འ་ནི་འདི་གལ་ཆུང་གི་བཀོལ་སྤྱོད་མེན།"
 
-#: cmdline/apt-get.cc:905
+#. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be
+#. careful with hard to type or special characters (like non-breaking spaces)
+#: apt-private/private-install.cc
 msgid "Yes, do as I say!"
 msgstr "ཨིན་ ང་གིས་སླབ་དོ་བཟུམ་སྦེ་རང་འབད!"
 
-#: cmdline/apt-get.cc:907
+#: apt-private/private-install.cc
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -959,7 +967,7 @@
 "འཕྲོ་མཐུད་འབད་ནིའི་དོན་ལུ་'%s'ཚིག་ཚན་ནང་ལུ་ཡིག་དཔར་རྐྱབས།\n"
 " ?] "
 
-#: cmdline/apt-get.cc:913 cmdline/apt-get.cc:932
+#: apt-private/private-install.cc
 msgid "Abort."
 msgstr "བར་བཤོལ་འབད།"
 
@@ -967,20 +975,20 @@
 msgid "Do you want to continue [Y/n]? "
 msgstr "ཁྱོན་ཀྱི་འཕྲོ་མཐུད་ནི་འབད་ནི་ཨིན་ན་[Y/n]? "
 
-#: cmdline/apt-get.cc:1000 cmdline/apt-get.cc:2375
+#: apt-private/private-download.cc
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "%s  %s་ ལེན་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།\n"
 
-#: cmdline/apt-get.cc:1018
+#: apt-private/private-install.cc
 msgid "Some files failed to download"
 msgstr "ཡིག་སྣོད་ལ་ལུ་ཅིག་ཕབ་ལེན་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།"
 
-#: cmdline/apt-get.cc:1019 cmdline/apt-get.cc:2384
+#: apt-private/private-install.cc apt-private/private-source.cc
 msgid "Download complete and in download only mode"
 msgstr "ཕབ་ལེན་ཐབས་ལམ་རྐྱངམ་གཅིག་ནང་མཇུག་བསྡུཝ་སྦེ་རང་ཕབ་ལེན་འབད།"
 
-#: cmdline/apt-get.cc:1025
+#: apt-private/private-install.cc
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
@@ -989,20 +997,20 @@
 "get་དུས་མཐུན་བཟོ་ནི་གཡོག་བཀོལ་ནི་ཨིན་ན་ཡང་ན་--fix-"
 "missing་དང་གཅིག་ཁར་འབད་རྩོལ་བསྐྱེད་ནི་ཨིན་ན་?"
 
-#: cmdline/apt-get.cc:1029
+#: apt-private/private-install.cc
 msgid "--fix-missing and media swapping is not currently supported"
 msgstr ""
 "--fix-missing་དང་བརྡ་ལམ་བརྗེ་སོར་འབད་ནི་འདི་ད་ལྟོ་ལས་རང་རྒྱབ་སྐྱོར་མི་འབད་བས།"
 
-#: cmdline/apt-get.cc:1034
+#: apt-private/private-install.cc
 msgid "Unable to correct missing packages."
 msgstr "བརླག་སྟོར་ཞུགས་ཡོད་པའི་ཐུམ་སྒྲིལ་ཚུ་ནོར་བཅོས་འབད་མི་ཚུགས་པས།"
 
-#: cmdline/apt-get.cc:1035
+#: apt-private/private-install.cc
 msgid "Aborting install."
 msgstr "གཞི་བཙུགས་བར་བཤོལ་འབད་དོ།"
 
-#: cmdline/apt-get.cc:1363
+#: apt-private/private-install.cc
 msgid ""
 "The following package disappeared from your system as\n"
 "all files have been overwritten by other packages:"
@@ -1021,7 +1029,7 @@
 msgid "Ignore unavailable target release '%s' of package '%s'"
 msgstr ""
 
-#: cmdline/apt-get.cc:1374
+#: apt-private/private-source.cc
 #, c-format
 msgid "Picking '%s' as source package instead of '%s'\n"
 msgstr ""
@@ -1032,15 +1040,15 @@
 msgid "Ignore unavailable version '%s' of package '%s'"
 msgstr ""
 
-#: cmdline/apt-get.cc:1428
+#: apt-private/private-update.cc
 msgid "The update command takes no arguments"
 msgstr "དུས་མཐུན་བཟོ་བའི་བརྡ་བཀོད་འདི་གིས་སྒྲུབ་རྟགས་ཚུ་མི་འབག་འབད།"
 
-#: cmdline/apt-get.cc:1497
+#: apt-private/private-install.cc
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr ""
 
-#: cmdline/apt-get.cc:1554
+#: apt-private/private-install.cc
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
@@ -1049,23 +1057,23 @@
 #. 
 #. if (Packages == 1)
 #. {
-#. c1out << endl;
+#. c1out << std::endl;
 #. c1out <<
 #. _("Since you only requested a single operation it is extremely likely that\n"
 #. "the package is simply not installable and a bug report against\n"
-#. "that package should be filed.") << endl;
+#. "that package should be filed.") << std::endl;
 #. }
 #. 
-#: cmdline/apt-get.cc:1557 cmdline/apt-get.cc:1848
+#: apt-private/private-install.cc
 msgid "The following information may help to resolve the situation:"
 msgstr ""
 "འོག་གི་བརྡ་དོན་དེ་གིས་དུས་སྐབས་འདི་མོས་མཐུན་བཟོ་ནི་ལུ་གྲོགས་རམ་འབད་འོང་:"
 
-#: cmdline/apt-get.cc:1561
+#: apt-private/private-install.cc
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr ""
 
-#: cmdline/apt-get.cc:1754
+#: apt-private/private-install.cc
 msgid ""
 "The following package was automatically installed and is no longer required:"
 msgid_plural ""
@@ -1074,7 +1082,7 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: cmdline/apt-get.cc:1758
+#: apt-private/private-install.cc
 #, c-format
 msgid "%lu package was automatically installed and is no longer required.\n"
 msgid_plural ""
@@ -1090,13 +1098,13 @@
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "ནང་འགོད་འཛོལ་བ་  ཡར་བསྐྱེད་ཀྱི་ཅ་ཆས་ཆ་མཉམ་མེདཔ་ཐལ་ཡོད།"
 
-#: cmdline/apt-get.cc:1878
+#: apt-private/private-install.cc
 msgid "You might want to run 'apt-get -f install' to correct these:"
 msgstr ""
 "འདི་ཚུ་ནོར་བཅོས་འབད་ནིའི་དོན་ལུ་ཁྱོད་ཀྱི་'apt-get -f "
 "install'དེ་གཡོག་བཀོལ་དགོཔ་འོང་:"
 
-#: cmdline/apt-get.cc:1821
+#: apt-private/private-install.cc
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
@@ -1104,7 +1112,7 @@
 "མ་ཚང་བའི་རྟེན་འབྲེལ་  ཐུས་སྒྲིལ་མེད་མི་ཚུ་དང་གཅིག་ཁར་ 'apt-get -f "
 "install'དེ་འབཐ་རྩོལ་བསྐྱེདཔ།(ཡང་ན་ཐབས་ཤེས་ཅིག་གསལ་བཀོད་འབད།)"
 
-#: cmdline/apt-get.cc:1833
+#: apt-private/private-install.cc
 msgid ""
 "Some packages could not be installed. This may mean that you have\n"
 "requested an impossible situation or if you are using the unstable\n"
@@ -1117,7 +1125,7 @@
 "ི་ཕྱི་ཁར་རྩ་བསྐྲད་བཏང་ཡོད་པའི་རྩ་བརྟན་མེད་པའི་བགོ་འགྲེམ་ཚུ་ལག་ལེན་འཐབ་དོ་ཡོདཔ"
 "་འོང་ནི་ཨིན་པས།"
 
-#: cmdline/apt-get.cc:1851
+#: apt-private/private-install.cc
 msgid "Broken packages"
 msgstr "ཆད་པ་ཡོད་པའི་ཐུམ་སྒྲིལ་ཚུ།"
 
@@ -1125,25 +1133,25 @@
 msgid "The following extra packages will be installed:"
 msgstr "འོག་གི་ཐུམ་སྒྲིལ་ཐེབས་ཚུ་གཞི་བཙུགས་འབད་འོང་:"
 
-#: cmdline/apt-get.cc:1969
+#: apt-private/private-install.cc
 msgid "Suggested packages:"
 msgstr "བསམ་འཆར་བཀོད་ཡོད་པའི་ཐུམ་སྒྲིལ་ཚུ:"
 
-#: cmdline/apt-get.cc:1970
+#: apt-private/private-install.cc
 msgid "Recommended packages:"
 msgstr "འོས་སྦྱོར་འབད་ཡོད་པའི་ཐུམ་སྒྲིལ་ཚུ:"
 
-#: cmdline/apt-get.cc:1750 cmdline/apt-get.cc:1786
+#: cmdline/apt-get.cc
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "%s་ཐུམ་སྒྲིལ་འཚོལ་མ་ཐོབ།"
 
-#: cmdline/apt-get.cc:2082
+#: cmdline/apt-get.cc cmdline/apt-mark.cc
 #, c-format
 msgid "%s set to automatically installed.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2116 cmdline/apt-mark.cc:105
+#: cmdline/apt-get.cc cmdline/apt-mark.cc
 msgid ""
 "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
 "instead."
@@ -1153,7 +1161,7 @@
 msgid "Calculating upgrade... "
 msgstr "ཡར་བསྐྱེད་རྩིས་བཏོན་དོ་... "
 
-#: cmdline/apt-get.cc:2002
+#: methods/connect.cc methods/ftp.cc methods/rsh.cc
 msgid "Failed"
 msgstr "འཐུས་ཤོར་བྱུང་ཡོད།"
 
@@ -1161,11 +1169,11 @@
 msgid "Done"
 msgstr "འབད་ཚར་ཡི།"
 
-#: cmdline/apt-get.cc:2074 cmdline/apt-get.cc:2082
+#: cmdline/apt-get.cc
 msgid "Internal error, problem resolver broke stuff"
 msgstr "ནང་འཁོད་འཛོལ་བ་ དཀའ་ངལ་མོས་མཐུན་འབད་མི་ཅ་ཆས་ཚུ་མེདཔ་ཐལ་ཡོད།"
 
-#: cmdline/apt-get.cc:818 cmdline/apt-get.cc:2106 cmdline/apt-get.cc:2139
+#: apt-private/private-download.cc
 msgid "Unable to lock the download directory"
 msgstr "ཕབ་ལེན་འབད་ནིའི་སྣོད་ཡིག་འདི་ལྡེ་མིག་རྐྱབས་མ་ཚུགས་པས།"
 
@@ -1174,16 +1182,16 @@
 msgid "Downloading %s %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:2182
+#: apt-private/private-source.cc
 msgid "Must specify at least one package to fetch source for"
 msgstr "གི་དོན་ལུ་འབྱུང་ཁུངས་ལེན་ནི་ལུ་ཉུང་མཐའ་རང་ཐུམ་སྒྲིལ་གཅིག་ལེན་དགོ"
 
-#: cmdline/apt-get.cc:2213 cmdline/apt-get.cc:2498
+#: apt-private/private-source.cc
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "%s་གི་དོན་ལུ་འབྱུང་ཁུངས་ཐུམ་སྒྲིལ་ཅིག་འཚོལ་མ་འཐོབ"
 
-#: cmdline/apt-get.cc:2232
+#: apt-private/private-source.cc
 #, c-format
 msgid ""
 "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
@@ -1198,7 +1206,7 @@
 "to retrieve the latest (possibly unreleased) updates to the package.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2292
+#: apt-private/private-source.cc
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "གོམ་འགྱོ་གིས་ཧེ་མ་ལས་རང་'%s'་ཡིག་སྣོད་དེ་ཕབ་ལེན་འབད་ནུག\n"
@@ -1208,42 +1216,46 @@
 msgid "You don't have enough free space in %s"
 msgstr "%s་ནང་ཁྱོད་ལུ་བར་སྟོང་ཚུ་ལངམ་སྦེ་མིན་འདུག་"
 
-#: cmdline/apt-get.cc:2338
+#. TRANSLATOR: The required space between number and unit is already included
+#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
+#: apt-private/private-source.cc
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "%sB་ལེན་དགོཔ་འདུག་  འབྱུང་ཁུངས་ཡིག་མཛོད་ཀྱི་%sB།\n"
 
-#: cmdline/apt-get.cc:2341
+#. TRANSLATOR: The required space between number and unit is already included
+#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
+#: apt-private/private-source.cc
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "འབྱུང་ཁུངས་ཡིག་མཛོད་ཚུ་ཀྱི་%sB་ལེན་དགོ་པསས།\n"
 
-#: cmdline/apt-get.cc:2347
+#: apt-private/private-source.cc
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "%s་འབྱུང་ཁུངས་ལེན།\n"
 
-#: cmdline/apt-get.cc:2380
+#: apt-private/private-source.cc
 msgid "Failed to fetch some archives."
 msgstr "ཡིག་མཛོད་ལ་ལུ་ཅིག་ལེན་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།"
 
-#: cmdline/apt-get.cc:2409
+#: apt-private/private-source.cc
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr ""
 "%s་ནང་ཧེ་མ་ལས་སྦུང་ཚན་བཟོ་བཤོལ་ཨིན་མའི་སྦུང་ཚན་བཟོ་བཤོལ་གོམ་འགྱོ་འབད་དོ།\n"
 
-#: cmdline/apt-get.cc:2421
+#: apt-private/private-source.cc
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "'%s'སྦུང་ཚན་བཟོ་བཤོལ་འཐུས་ཤོར་བྱུང་ཡོད།\n"
 
-#: cmdline/apt-get.cc:2422
+#: apt-private/private-source.cc
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "'dpkg-dev'་ཐུམ་སྒྲིལ་དེ་གཞི་བཙུགས་འབད་ཡོད་པ་ཅིན་ཨེབ་གཏང་འབད།\n"
 
-#: cmdline/apt-get.cc:2439
+#: apt-private/private-source.cc
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "'%s'་བཟོ་བརྩིགས་བརྡ་བཀོད་འཐུས་ཤོར་བྱུང་ཡོད།\n"
@@ -1252,24 +1264,24 @@
 msgid "Child process failed"
 msgstr "ཆ་ལག་ལས་སྦྱོར་དེ་འཐུས་ཤོར་བྱུང་ནུག"
 
-#: cmdline/apt-get.cc:2475
+#: apt-private/private-source.cc
 msgid "Must specify at least one package to check builddeps for"
 msgstr ""
 "builddeps ཞིབ་དཔྱད་འབད་ནིའི་དོན་ལུ་ཉུང་མཐའ་རང་ཐུམ་སྒྲིལ་གཅིག་གསལ་བཀོད་འབད་དགོ"
 
-#: cmdline/apt-get.cc:2721
+#: apt-private/private-source.cc
 #, c-format
 msgid ""
 "No architecture information available for %s. See apt.conf(5) "
 "APT::Architectures for setup"
 msgstr ""
 
-#: cmdline/apt-get.cc:2503
+#: apt-private/private-source.cc
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "%s་གི་དོན་ལུ་བཟོ་བརྩིགས་-རྟེན་འབྲེལ་བརྡ་དོན་དེ་ལེན་མ་ཚུགས།"
 
-#: cmdline/apt-get.cc:2523
+#: apt-private/private-source.cc
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s ལུ་བཟོ་བརྩིགས་རྟེན་འབྲེལ་མིན་འདུག\n"
@@ -1322,7 +1334,7 @@
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "%s་གི་དོན་ལུ་བཟོ་བརྩིགས་-རྟེན་འབྲེལ་འདི་ངལ་རངས་མ་ཚུགས་པས།"
 
-#: cmdline/apt-get.cc:2712
+#: apt-private/private-source.cc
 msgid "Failed to process build dependencies"
 msgstr "བཟོ་བརྩིགས་རྟེན་འབྲེལ་འདི་ལས་སྦྱོར་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོདཔ་ཨིན།"
 
@@ -1331,7 +1343,7 @@
 msgid "Changelog for %s (%s)"
 msgstr ""
 
-#: cmdline/apt-get.cc:2744
+#: cmdline/apt-get.cc
 msgid "Supported modules:"
 msgstr "རྒྱབ་སྐྱོར་འབད་ཡོད་པའི་ཚད་གཞི་ཚུ:"
 
@@ -1381,7 +1393,7 @@
 "                       This APT has Super Cow Powers.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2952
+#: apt-private/private-main.cc
 msgid ""
 "NOTE: This is only a simulation!\n"
 "      apt-get needs root privileges for real execution.\n"
@@ -1405,13 +1417,12 @@
 msgid "Err "
 msgstr "ཨི་ཨར་ཨར། "
 
-#: cmdline/acqprogress.cc:135
+#: apt-private/acqprogress.cc
 #, c-format
 msgid "Fetched %sB in %s (%sB/s)\n"
 msgstr "%s (%sB/s)་ནང་ལུ་%sB་དེ་ལེན་ཡོདཔ་ཨིན།\n"
 
-#: cmdline/acqprogress.cc:225
-#, c-format
+#: apt-private/acqprogress.cc
 msgid " [Working]"
 msgstr " [ལཱ་འབད་དོ།]"
 
@@ -1442,42 +1453,42 @@
 "                       This APT has Super Cow Powers.\n"
 msgstr ""
 
-#: cmdline/apt-mark.cc:46
+#: cmdline/apt-mark.cc
 #, c-format
 msgid "%s can not be marked as it is not installed.\n"
 msgstr ""
 
-#: cmdline/apt-mark.cc:52
+#: cmdline/apt-mark.cc
 #, c-format
 msgid "%s was already set to manually installed.\n"
 msgstr ""
 
-#: cmdline/apt-mark.cc:54
+#: cmdline/apt-mark.cc
 #, c-format
 msgid "%s was already set to automatically installed.\n"
 msgstr ""
 
-#: cmdline/apt-mark.cc:169
+#: cmdline/apt-mark.cc
 #, c-format
 msgid "%s was already set on hold.\n"
 msgstr ""
 
-#: cmdline/apt-mark.cc:171
+#: cmdline/apt-mark.cc
 #, c-format
 msgid "%s was already not hold.\n"
 msgstr ""
 
-#: cmdline/apt-mark.cc:185 cmdline/apt-mark.cc:207
+#: cmdline/apt-mark.cc
 #, c-format
 msgid "%s set on hold.\n"
 msgstr ""
 
-#: cmdline/apt-mark.cc:187 cmdline/apt-mark.cc:212
+#: cmdline/apt-mark.cc
 #, c-format
 msgid "Canceled hold on %s.\n"
 msgstr ""
 
-#: cmdline/apt-mark.cc:220
+#: cmdline/apt-mark.cc
 msgid "Executing dpkg failed. Are you root?"
 msgstr ""
 
@@ -1534,7 +1545,7 @@
 "  -o=? འདི་གིས་ མཐུན་སྒྲིག་ རིམ་སྒྲིག་གི་གདམ་ཁ་ཚུ་ཁཞི་སྒྲིག་འབདཝ་ཨིན་   "
 "དཔེར་ན་-o dir::cache=/tmp\n"
 
-#: dselect/install:32
+#: dselect/install:33
 msgid "Bad default setting!"
 msgstr "སྔོན་སྒྲིག་བྱང་ཉེས་གཞི་སྒྲིག་འབད་དོ་!"
 
@@ -1543,25 +1554,25 @@
 msgid "Press enter to continue."
 msgstr "འཕྲོ་མཐུད་འབད་ནིའི་དོན་ལུ་ལོག་ལྡེ་འདི་ཨེབ།"
 
-#: dselect/install:91
+#: dselect/install:92
 msgid "Do you want to erase any previously downloaded .deb files?"
 msgstr ""
 
-#: dselect/install:101
+#: dselect/install:102
 msgid "Some errors occurred while unpacking. Packages that were installed"
 msgstr ""
 
-#: dselect/install:102
+#: dselect/install:103
 msgid "will be configured. This may result in duplicate errors"
 msgstr ""
 
-#: dselect/install:103
+#: dselect/install:104
 msgid "or errors caused by missing dependencies. This is OK, only the errors"
 msgstr ""
 "ཡང་ན་བརླག་སྟོར་ཞུགས་ཡོད་པའི་རྟེན་འབྲེལ་གི་རྒྱུ་རྐྱེན་ལས་བརྟེན་པའི་འཛོལ་བ་ཚུ་ན"
 "ང་ལུ་གྲུབ་འབྲས་འཐོན་འོང་། འདི་དེ་བཏུབ་པས་"
 
-#: dselect/install:104
+#: dselect/install:105
 msgid ""
 "above this message are important. Please fix them and run [I]nstall again"
 msgstr ""
diff -Nru language-pack-dz-base-14.04+20150804/data/dz/LC_MESSAGES/debconf.po language-pack-dz-base-14.04+20160720/data/dz/LC_MESSAGES/debconf.po
--- language-pack-dz-base-14.04+20150804/data/dz/LC_MESSAGES/debconf.po	2015-08-14 07:53:50.000000000 +0000
+++ language-pack-dz-base-14.04+20160720/data/dz/LC_MESSAGES/debconf.po	2016-07-20 16:44:55.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: 2015-08-04 05:37+0000\n"
-"X-Generator: Launchpad (build 17656)\n"
+"X-Launchpad-Export-Date: 2016-07-20 10:47+0000\n"
+"X-Generator: Launchpad (build 18147)\n"
 "X-Poedit-Country: bhutan\n"
 "Language: dz\n"
 "X-Poedit-Language: dzongkha\n"
@@ -266,7 +266,7 @@
 msgid "Next"
 msgstr "གཞན་མི།"
 
-#: ../Debconf/Template.pm:91
+#: ../Debconf/Template.pm:96
 #, perl-format
 msgid ""
 "warning: possible database corruption. Will attempt to repair by adding back "
@@ -275,7 +275,7 @@
 "ཉེན་བརྡ་:གནད་སྡུད་གཞི་རྟེན་འདི་ངན་ཅན་འབྱུང་སྲིད། འདི་གིས་ "
 "རྒྱབ་ཁར་མ་ཚང་པའི་འདྲི་བ་%s གི་ཐོག་ལས་ ཉམས་བཅོས་འབད་ནིའི་དཔའ་བཅམ་འོང་།"
 
-#: ../Debconf/Template.pm:206
+#: ../Debconf/Template.pm:211
 #, perl-format
 msgid ""
 "Template #%s in %s has a duplicate field \"%s\" with new value \"%s\". "
@@ -284,18 +284,18 @@
 "%s ནང་ ཊེམ་པེལེཊི་#%s ལུ་ \"%s\"བེ་ལུ་གསརཔ་དང་བཅས་ \"%s\"ས་སྒོ་རྫུན་མ་འདུག "
 "ཊེམཔེལེཊི་གཉིས་ཆ་རང་ གྲལ་ཐིག་གསརཔ་རྐྱང་པ་གིས་ ལེགས་ཤོམ་སྦེ་སོ་སོ་མ་འཕྱལ་བས།\n"
 
-#: ../Debconf/Template.pm:231
+#: ../Debconf/Template.pm:236
 #, perl-format
 msgid "Unknown template field '%s', in stanza #%s of %s\n"
 msgstr "%sགི་ ཚིགས་བཅད་ #%sནང་ མ་ཤེས་པའི་ཊེམ་པེལེཊི་ས་སྒོ་ '%s'།\n"
 
-#: ../Debconf/Template.pm:257
+#: ../Debconf/Template.pm:262
 #, perl-format
 msgid "Template parse error near `%s', in stanza #%s of %s\n"
 msgstr ""
 "%sགི་ ཚིགས་བཅད་ #%s ནང་  `%s'གི་སྦོ་ལོགས་ཁར་ ཊེམ་པེལེཊི་མིང་དཔྱད་འཛོལ་བ།\n"
 
-#: ../Debconf/Template.pm:263
+#: ../Debconf/Template.pm:268
 #, perl-format
 msgid "Template #%s in %s does not contain a 'Template:' line\n"
 msgstr "%sནང་ཡོད་པའི་ ཊེམ་པེལེཊི་ #%sནང་ལུ་ 'ཊེམ་པེལེཊི་'མེད་:གྲལ་ཐིག\n"
diff -Nru language-pack-dz-base-14.04+20150804/data/dz/LC_MESSAGES/debian-tasks.po language-pack-dz-base-14.04+20160720/data/dz/LC_MESSAGES/debian-tasks.po
--- language-pack-dz-base-14.04+20150804/data/dz/LC_MESSAGES/debian-tasks.po	2015-08-14 07:53:55.000000000 +0000
+++ language-pack-dz-base-14.04+20160720/data/dz/LC_MESSAGES/debian-tasks.po	2016-07-20 16:44:53.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: 2015-08-04 07:04+0000\n"
-"X-Generator: Launchpad (build 17656)\n"
+"X-Launchpad-Export-Date: 2016-07-20 12:39+0000\n"
+"X-Generator: Launchpad (build 18147)\n"
 "X-Poedit-Country: Bhutan\n"
 "Language: dz\n"
 "X-Poedit-SourceCharset: utf-8\n"
@@ -200,7 +200,7 @@
 msgstr "ཚད་ལྡན་རིམ་ལུགས་སྤྱོད་ཆས་"
 
 #. Description
-#: ../po/debian-tasks.desc:13001
+#: ../po/debian-tasks.desc:10001
 msgid ""
 "This task sets up a basic user environment, providing a reasonably small "
 "selection of services and tools usable on the command line."
diff -Nru language-pack-dz-base-14.04+20150804/data/dz/LC_MESSAGES/dpkg.po language-pack-dz-base-14.04+20160720/data/dz/LC_MESSAGES/dpkg.po
--- language-pack-dz-base-14.04+20150804/data/dz/LC_MESSAGES/dpkg.po	2015-08-14 07:53:50.000000000 +0000
+++ language-pack-dz-base-14.04+20160720/data/dz/LC_MESSAGES/dpkg.po	2016-07-20 16:44:54.000000000 +0000
@@ -8,100 +8,101 @@
 "Project-Id-Version: dpkg 1.17.0\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
 "POT-Creation-Date: 2013-12-12 08:36+0100\n"
-"PO-Revision-Date: 2015-04-10 07:07+0000\n"
+"PO-Revision-Date: 2016-06-24 07:12+0000\n"
 "Last-Translator: Tshewang Norbu <Unknown>\n"
 "Language-Team: Dzongkha <pgeyleg@dit.gov.bt>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2015-08-04 05:41+0000\n"
-"X-Generator: Launchpad (build 17656)\n"
+"X-Launchpad-Export-Date: 2016-07-20 10:53+0000\n"
+"X-Generator: Launchpad (build 18147)\n"
 "X-Poedit-Country: Bhutan\n"
 "Language: dz\n"
 "X-Poedit-Language: Dzongkha\n"
 "X-Poedit-SourceCharset: utf-8\n"
 "X-Poedit-Bookmarks: -1,-1,317,-1,-1,-1,-1,-1,-1,-1\n"
 
-#: lib/dpkg/ar.c
+#: lib/dpkg/ar.c:66
 #, c-format
 msgid "invalid character '%c' in archive '%.250s' member '%.16s' size"
 msgstr ""
 
-#: lib/dpkg/ar.c utils/update-alternatives.c
+#: lib/dpkg/ar.c:81 lib/dpkg/ar.c:97 lib/dpkg/ar.c:108 lib/dpkg/ar.c:112
+#: lib/dpkg/ar.c:134 utils/update-alternatives.c:1154
 #, c-format
 msgid "unable to write file '%s'"
 msgstr ""
 
-#: lib/dpkg/ar.c
+#: lib/dpkg/ar.c:98
 #, c-format
 msgid "ar member name '%s' length too long"
 msgstr ""
 
-#: lib/dpkg/ar.c
+#: lib/dpkg/ar.c:100
 #, c-format
 msgid "ar member size %jd too large"
 msgstr ""
 
-#: lib/dpkg/ar.c
+#: lib/dpkg/ar.c:94
 #, c-format
 msgid "generated corrupt ar header for '%s'"
 msgstr ""
 
-#: lib/dpkg/ar.c
+#: lib/dpkg/ar.c:123
 #, c-format
 msgid "failed to fstat ar member file (%s)"
 msgstr ""
 
-#: lib/dpkg/ar.c
+#: lib/dpkg/ar.c:144
 #, c-format
 msgid "cannot append ar member file (%s) to '%s': %s"
 msgstr ""
 
-#: lib/dpkg/arch.c lib/dpkg/parsehelp.c lib/dpkg/pkg-format.c
+#: lib/dpkg/parsehelp.c:125
 msgid "may not be empty string"
 msgstr "ཡིག་རྒྱུན་སྟོངམ་མེནམ་འོང་།"
 
-#: lib/dpkg/arch.c
+#: lib/dpkg/arch.c:66
 msgid "must start with an alphanumeric"
 msgstr "ཀ་ཁ་ཨང་ཡིག་དང་ཅིག་ཁར་འགོ་བཙུགས་དགོ"
 
-#: lib/dpkg/arch.c:73 lib/dpkg/parsehelp.c:120
+#: lib/dpkg/parsehelp.c:136
 #, c-format
 msgid "character `%c' not allowed (only letters, digits and characters `%s')"
 msgstr ""
 "ཡིག་འབྲུ་ `%c' མི་ཆོག་(ཡིག་གུ་ ཨང་ཡིག་ དང་ཡིག་འབྲུ་ `%s' ཚུ་རྐྱངམ་ཅིག)"
 
-#: lib/dpkg/arch.c
+#: lib/dpkg/arch.c:236
 msgctxt "architecture"
 msgid "<none>"
 msgstr ""
 
-#: lib/dpkg/arch.c
+#: lib/dpkg/arch.c:238
 msgctxt "architecture"
 msgid "<empty>"
 msgstr ""
 
-#: lib/dpkg/arch.c
+#: lib/dpkg/arch.c:327
 msgid "error writing to architecture list"
 msgstr ""
 
-#: lib/dpkg/atomic-file.c
+#: lib/dpkg/atomic-file.c:57
 #, c-format
 msgid "unable to create new file '%.250s'"
 msgstr ""
 
-#: lib/dpkg/atomic-file.c
+#: lib/dpkg/atomic-file.c:68
 #, c-format
 msgid "unable to write new file '%.250s'"
 msgstr ""
 
-#: lib/dpkg/atomic-file.c
+#: lib/dpkg/atomic-file.c:70
 #, c-format
 msgid "unable to flush new file '%.250s'"
 msgstr ""
 
-#: lib/dpkg/atomic-file.c
+#: lib/dpkg/atomic-file.c:72
 #, c-format
 msgid "unable to sync new file '%.250s'"
 msgstr ""
@@ -111,181 +112,183 @@
 msgid "unable to close new file `%.250s'"
 msgstr ""
 
-#: lib/dpkg/atomic-file.c
+#: lib/dpkg/atomic-file.c:92
 #, c-format
 msgid "error removing old backup file '%s'"
 msgstr ""
 
-#: lib/dpkg/atomic-file.c
+#: lib/dpkg/atomic-file.c:94
 #, c-format
 msgid "error creating new backup file '%s'"
 msgstr ""
 
-#: lib/dpkg/atomic-file.c:103 lib/dpkg/atomic-file.c:105
-#: lib/dpkg/triglib.c:451 src/infodb-upgrade.c:169 src/infodb-upgrade.c:174
-#: src/infodb-upgrade.c:200 src/remove.c:347 src/remove.c:440
+#: lib/dpkg/triglib.c:340 lib/dpkg/triglib.c:342 lib/dpkg/triglib.c:472
+#: src/remove.c:286 src/remove.c:377
 #, c-format
 msgid "cannot remove `%.250s'"
 msgstr "`%.250s' རྩ་བསྐྲད་གཏང་མི་ཚུགས།"
 
-#: lib/dpkg/atomic-file.c
+#: lib/dpkg/atomic-file.c:115
 #, c-format
 msgid "error installing new file '%s'"
 msgstr ""
 
-#: lib/dpkg/buffer.c
+#: lib/dpkg/buffer.c:133
 msgid "failed to write"
 msgstr ""
 
-#: lib/dpkg/buffer.c
+#: lib/dpkg/buffer.c:154
 msgid "failed to read"
 msgstr ""
 
-#: lib/dpkg/buffer.c
+#: lib/dpkg/buffer.c:223
 msgid "unexpected end of file or stream"
 msgstr ""
 
-#: lib/dpkg/buffer.c
+#: lib/dpkg/buffer.c:269
 msgid "failed to seek"
 msgstr ""
 
-#: lib/dpkg/command.c lib/dpkg/path-remove.c src/unpack.c dpkg-deb/build.c
-#: dpkg-split/split.c utils/update-alternatives.c
+#: lib/dpkg/command.c:178 lib/dpkg/command.c:204 src/help.c:621
+#: src/processarc.c:98 src/processarc.c:138 src/processarc.c:432
+#: src/processarc.c:839 dpkg-deb/build.c:459 dpkg-deb/build.c:538
+#: dpkg-deb/build.c:561 dpkg-deb/extract.c:317 dpkg-deb/info.c:65
+#: dpkg-split/split.c:69 utils/update-alternatives.c:457
 #, c-format
 msgid "unable to execute %s (%s)"
 msgstr ""
 
-#: lib/dpkg/compress.c
+#: lib/dpkg/compress.c:113 lib/dpkg/compress.c:122
 #, c-format
 msgid "%s: pass-through copy error: %s"
 msgstr ""
 
-#: lib/dpkg/compress.c
+#: lib/dpkg/compress.c:112
 #, c-format
 msgid "%s: error binding input to gzip stream"
 msgstr ""
 
-#: lib/dpkg/compress.c
+#: lib/dpkg/compress.c:124
 #, c-format
 msgid "%s: internal gzip read error: '%s'"
 msgstr ""
 
-#: lib/dpkg/compress.c
+#: lib/dpkg/compress.c:132 lib/dpkg/compress.c:136
 #, c-format
 msgid "%s: internal gzip write error"
 msgstr ""
 
-#: lib/dpkg/compress.c
+#: lib/dpkg/compress.c:150
 #, c-format
 msgid "%s: error binding output to gzip stream"
 msgstr ""
 
-#: lib/dpkg/compress.c
+#: lib/dpkg/compress.c:157
 #, c-format
 msgid "%s: internal gzip read error"
 msgstr ""
 
-#: lib/dpkg/compress.c
+#: lib/dpkg/compress.c:167
 #, c-format
 msgid "%s: internal gzip write error: '%s'"
 msgstr ""
 
-#: lib/dpkg/compress.c
+#: lib/dpkg/compress.c:180
 #, c-format
 msgid "%s: internal gzip write error: %s"
 msgstr ""
 
-#: lib/dpkg/compress.c
+#: lib/dpkg/compress.c:220
 #, c-format
 msgid "%s: error binding input to bzip2 stream"
 msgstr ""
 
-#: lib/dpkg/compress.c
+#: lib/dpkg/compress.c:232
 #, c-format
 msgid "%s: internal bzip2 read error: '%s'"
 msgstr ""
 
-#: lib/dpkg/compress.c
+#: lib/dpkg/compress.c:240 lib/dpkg/compress.c:244 lib/dpkg/compress.c:294
 #, c-format
 msgid "%s: internal bzip2 write error"
 msgstr ""
 
-#: lib/dpkg/compress.c
+#: lib/dpkg/compress.c:258
 #, c-format
 msgid "%s: error binding output to bzip2 stream"
 msgstr ""
 
-#: lib/dpkg/compress.c
+#: lib/dpkg/compress.c:265
 #, c-format
 msgid "%s: internal bzip2 read error"
 msgstr ""
 
-#: lib/dpkg/compress.c
+#: lib/dpkg/compress.c:275 lib/dpkg/compress.c:286
 #, c-format
 msgid "%s: internal bzip2 write error: '%s'"
 msgstr ""
 
-#: lib/dpkg/compress.c
+#: lib/dpkg/compress.c:282
 msgid "unexpected bzip2 error"
 msgstr ""
 
-#: lib/dpkg/compress.c
+#: lib/dpkg/compress.c:412
 msgid "internal error (bug)"
 msgstr ""
 
-#: lib/dpkg/compress.c
+#: lib/dpkg/compress.c:419
 msgid "memory usage limit reached"
 msgstr ""
 
-#: lib/dpkg/compress.c
+#: lib/dpkg/compress.c:423
 msgid "unsupported compression preset"
 msgstr ""
 
-#: lib/dpkg/compress.c
+#: lib/dpkg/compress.c:425
 msgid "unsupported options in file header"
 msgstr ""
 
-#: lib/dpkg/compress.c
+#: lib/dpkg/compress.c:429
 msgid "compressed data is corrupt"
 msgstr ""
 
-#: lib/dpkg/compress.c
+#: lib/dpkg/compress.c:433
 msgid "unexpected end of input"
 msgstr ""
 
-#: lib/dpkg/compress.c
+#: lib/dpkg/compress.c:437
 msgid "file format not recognized"
 msgstr ""
 
-#: lib/dpkg/compress.c
+#: lib/dpkg/compress.c:441
 msgid "unsupported type of integrity check"
 msgstr ""
 
-#: lib/dpkg/compress.c
+#: lib/dpkg/compress.c:482
 #, c-format
 msgid "%s: lzma read error"
 msgstr ""
 
-#: lib/dpkg/compress.c
+#: lib/dpkg/compress.c:494
 #, c-format
 msgid "%s: lzma write error"
 msgstr ""
 
-#: lib/dpkg/compress.c
+#: lib/dpkg/compress.c:503
 #, c-format
 msgid "%s: lzma close error"
 msgstr ""
 
-#: lib/dpkg/compress.c
+#: lib/dpkg/compress.c:509
 #, c-format
 msgid "%s: lzma error: %s"
 msgstr ""
 
-#: lib/dpkg/compress.c
+#: lib/dpkg/compress.c:799
 msgid "unknown compression strategy"
 msgstr ""
 
-#: lib/dpkg/dbmodify.c:69
+#: lib/dpkg/dbmodify.c:68
 #, c-format
 msgid ""
 "updates directory contains file `%.250s' whose name is too long (length=%d, "
@@ -294,7 +297,7 @@
 "དུས་མཐུན་བཟོ་ཡོད་པའི་སྣོད་ཐོའི་ནང་ན་ ཡིག་སྣོད་ `%.250s' "
 "ག་གི་མིང་རིང་དྲགས་མི་(རིང་ཚད་=%d མང་མཐའ་=%d)འདི་ཡོདཔ་ཨིན།"
 
-#: lib/dpkg/dbmodify.c
+#: lib/dpkg/dbmodify.c:72
 #, c-format
 msgid ""
 "updates directory contains files with different length names (both %d and %d)"
@@ -302,194 +305,196 @@
 "དུས་མཐུན་བཟོ་ཡོད་མི་སྣོད་ཐོའི་ནང་ན་ ཡིག་སྣོད་ རིང་ཚད་མིང་སོ་སོ་འབད་མི་( %d "
 "དང་ %d གཉིས་ཆ་ར་)ཚུ་ཡོདཔ་ཨིན།"
 
-#: lib/dpkg/dbmodify.c:87
+#: lib/dpkg/dbmodify.c:86
 #, c-format
 msgid "cannot scan updates directory `%.255s'"
 msgstr "དུས་མཐོན་ཀྱི་སྣོད་ཐོ་ `%.255s' ཞིབ་ལྟ་འབད་མི་ཚུགས།"
 
-#: lib/dpkg/dbmodify.c
+#: lib/dpkg/dbmodify.c:102
 #, c-format
 msgid "failed to remove incorporated update file %.255s"
 msgstr ""
 "གཅིག་ཁར་སྡེབ་ཡོད་པའི་དུས་མཐུན་གྱི་ཡིག་སྣོད་ %.255s "
 "རྩ་བསྐྲད་གཏང་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།"
 
-#: lib/dpkg/dbmodify.c:122 dpkg-deb/build.c:453
+#: lib/dpkg/dbmodify.c:121 dpkg-deb/build.c:447
 #, c-format
 msgid "unable to create `%.255s'"
 msgstr "`%.255s' གསར་བསྐྲུན་འབད་མ་ཚུགས།"
 
-#: lib/dpkg/dbmodify.c
+#: lib/dpkg/dbmodify.c:125
 #, c-format
 msgid "unable to fill %.250s with padding"
 msgstr "%.250s བར་ཤབས་དང་ཅིག་ཁར་བཀང་མ་ཚུགས།"
 
-#: lib/dpkg/dbmodify.c
+#: lib/dpkg/dbmodify.c:127
 #, c-format
 msgid "unable to flush %.250s after padding"
 msgstr "%.250s འདི་བར་ཤབས་ཀྱི་ཤུལ་ལས་ངོས་སྙོམ་འབད་མ་ཚུགས།"
 
-#: lib/dpkg/dbmodify.c
+#: lib/dpkg/dbmodify.c:129
 #, c-format
 msgid "unable to seek to start of %.250s after padding"
 msgstr "%.250s འདི་བར་ཤབས་ཀྱི་ཤུལ་ལས་འགོ་བཙུགས་ནི་འཚོལ་མ་ཙུགས།"
 
-#: lib/dpkg/dbmodify.c
+#: lib/dpkg/dbmodify.c:195
 #, c-format
 msgid "unable to open lock file %s for testing"
 msgstr ""
 
-#: lib/dpkg/dbmodify.c
+#: lib/dpkg/dbmodify.c:221
 msgid "unable to open/create status database lockfile"
 msgstr ""
 "གནས་ཚད་གནད་སྡུད་ཀྱི་གཞི་རྟེན་ལྡེ་མིག་ཡིག་སྣོད་ ཁ་ཕྱེ་/གསར་བསྐྲུན་འབད་མ་ཚུགས།"
 
-#: lib/dpkg/dbmodify.c
+#: lib/dpkg/dbmodify.c:231
 msgid "you do not have permission to lock the dpkg status database"
 msgstr ""
 "ཁྱོད་ལུ་ཌི་པི་ཀེ་ཇི་གནས་ཚད་གནད་སྡུད་གཞི་རྟེན་ལྡེ་མིག་རྐྱབས་ནིའི་གནང་བ་མེད།"
 
-#: lib/dpkg/dbmodify.c
+#: lib/dpkg/dbmodify.c:233
 msgid "dpkg status database"
 msgstr ""
 
-#: lib/dpkg/dbmodify.c
+#: lib/dpkg/dbmodify.c:257
 msgid "requested operation requires superuser privilege"
 msgstr "ཞུ་བ་འབད་ཡོད་པའི་བཀོལ་སྤྱོད་པ་ལུ་ ལག་ལེན་པ་གཙོ་བོའི་ཁེ་དབང་དགོཔ་ཨིན།"
 
-#: lib/dpkg/dbmodify.c
+#: lib/dpkg/dbmodify.c:262
 msgid "unable to access dpkg status area"
 msgstr "ཌི་པི་ཀེ་ཇི་གནས་ཚད་མངའ་ཁོངས་འཛུལ་སྤྱོད་འབད་མ་ཚུགས།"
 
-#: lib/dpkg/dbmodify.c
+#: lib/dpkg/dbmodify.c:264
 msgid "operation requires read/write access to dpkg status area"
 msgstr ""
 "ཌི་པི་ཀེ་ཇི་གནས་ཚད་མངའ་ཁོངས་ལུ་འཛུལ་སྤྱོད་འབད་ནིའི་དོན་ལས་བཀོལ་སྤྱོད་པ་ལུ་ "
 "ལྷག་/འབྲི་ནི་དགོཔ་ཨིན།"
 
-#: lib/dpkg/dbmodify.c
+#: lib/dpkg/dbmodify.c:309
 #, c-format
 msgid "failed to remove my own update file %.255s"
 msgstr ""
 "ང་རང་བདག་དབང་གི་དུས་མཐུན་ཡིག་སྣོད་ %.255s "
 "རྩ་བསྐྲད་གཏང་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོདཔ།"
 
-#: lib/dpkg/dbmodify.c:354
+#: lib/dpkg/dbmodify.c:347
 #, c-format
 msgid "unable to write updated status of `%.250s'"
 msgstr "`%.250s' གི་དུས་མཐུན་བཟོ་ཡོད་པའི་གནས་ཚད་འབྲི་མ་ཚུགས།"
 
-#: lib/dpkg/dbmodify.c:357
+#: lib/dpkg/dbmodify.c:349
 #, c-format
 msgid "unable to flush updated status of `%.250s'"
 msgstr "`%.250s' གི་དུས་མཐུན་བཟོ་ཡོད་པའི་གནས་ཚད་ངོས་སྙོམ་འབད་མ་ཚུགས།"
 
-#: lib/dpkg/dbmodify.c:360
+#: lib/dpkg/dbmodify.c:351
 #, c-format
 msgid "unable to truncate for updated status of `%.250s'"
 msgstr ""
 "`%.250s' གི་དུས་མཐུན་བཟོ་ཡོད་པའི་གནས་ཚད་ཀྱི་དོན་ལུ་ཆུང་ཀུ་བཟོ་མ་ཚུགས།"
 
-#: lib/dpkg/dbmodify.c:363
+#: lib/dpkg/dbmodify.c:353
 #, c-format
 msgid "unable to fsync updated status of `%.250s'"
 msgstr ""
 "`%.250s' གི་དུས་མཐུན་བཟོ་ཡོད་པའི་གནས་ཚད་ཀྱི་དོན་ལུ་ ཨེཕ་མཉམ་འབྱུང་འབད་མ་ཚུགས།"
 
-#: lib/dpkg/dbmodify.c:366
+#: lib/dpkg/dbmodify.c:355
 #, c-format
 msgid "unable to close updated status of `%.250s'"
 msgstr "`%.250s' གི་དུས་མཐུན་བཟོ་ཡོད་པའི་གནས་ཚད་ཀྱི་དོན་ལུ་ ཁ་བསྡམ་མ་ཚུགས།"
 
-#: lib/dpkg/dbmodify.c:370
+#: lib/dpkg/dbmodify.c:358
 #, c-format
 msgid "unable to install updated status of `%.250s'"
 msgstr ""
 "`%.250s' གི་དུས་མཐུན་བཟོ་ཡོད་པའི་གནས་ཚད་ཀྱི་དོན་ལུ་ གཞི་བཙུགས་འབད་མ་ཚུགས།"
 
-#: lib/dpkg/deb-version.c
+#: lib/dpkg/deb-version.c:55
 msgid "format version with empty major component"
 msgstr ""
 
-#: lib/dpkg/deb-version.c
+#: lib/dpkg/deb-version.c:57
 msgid "format version has no dot"
 msgstr ""
 
-#: lib/dpkg/deb-version.c
+#: lib/dpkg/deb-version.c:63
 msgid "format version with empty minor component"
 msgstr ""
 
-#: lib/dpkg/deb-version.c
+#: lib/dpkg/deb-version.c:65
 msgid "format version followed by junk"
 msgstr ""
 
-#: lib/dpkg/dir.c
+#: lib/dpkg/dir.c:50
 #, c-format
 msgid "unable to get file descriptor for directory '%s'"
 msgstr ""
 
-#: lib/dpkg/dir.c
+#: lib/dpkg/dir.c:54
 #, c-format
 msgid "unable to sync directory '%s'"
 msgstr ""
 
-#: lib/dpkg/dir.c
+#: lib/dpkg/dir.c:69 lib/dpkg/dir.c:131
 #, c-format
 msgid "unable to open directory '%s'"
 msgstr ""
 
-#: lib/dpkg/dir.c src/divertcmd.c dpkg-split/split.c
-#: utils/update-alternatives.c
+#: lib/dpkg/dir.c:109 src/divertcmd.c:218 dpkg-split/split.c:202
+#: utils/update-alternatives.c:1293
 #, c-format
 msgid "unable to open file '%s'"
 msgstr ""
 
-#: lib/dpkg/dir.c src/divertcmd.c dpkg-deb/build.c dpkg-split/join.c
-#: dpkg-split/queue.c utils/update-alternatives.c
+#: lib/dpkg/dir.c:111 src/divertcmd.c:232 src/divertcmd.c:377
+#: src/statcmd.c:217 dpkg-deb/build.c:598 dpkg-split/join.c:65
+#: dpkg-split/queue.c:187 utils/update-alternatives.c:1406
 #, c-format
 msgid "unable to sync file '%s'"
 msgstr ""
 
-#: lib/dpkg/dir.c src/divertcmd.c dpkg-deb/build.c dpkg-split/join.c
-#: dpkg-split/queue.c utils/update-alternatives.c
+#: lib/dpkg/dir.c:113 src/divertcmd.c:234 src/divertcmd.c:379
+#: dpkg-deb/build.c:600 dpkg-split/join.c:67 dpkg-split/queue.c:189
+#: utils/update-alternatives.c:1314 utils/update-alternatives.c:1408
 #, c-format
 msgid "unable to close file '%s'"
 msgstr ""
 
-#: lib/dpkg/dump.c:472
+#: lib/dpkg/dump.c:396
 #, c-format
 msgid "failed to write details of `%.50s' to `%.250s'"
 msgstr "`%.50s' གི་རྒྱས་བཤད་ཚུ་ `%.250s' ལུ་འབྲི་ནི་འཐུས་ཤོར་བྱུང་ཡོདཔ།"
 
-#: lib/dpkg/dump.c
+#: lib/dpkg/dump.c:426
 #, c-format
 msgid "unable to set buffering on %s database file"
 msgstr ""
 
-#: lib/dpkg/dump.c
+#: lib/dpkg/dump.c:438
 #, c-format
 msgid "failed to write %s database record about '%.50s' to '%.250s'"
 msgstr ""
 
-#: lib/dpkg/ehandle.c
+#: lib/dpkg/ehandle.c:94
 #, c-format
 msgid ""
 "%s: unrecoverable fatal error, aborting:\n"
 " %s\n"
 msgstr ""
 
-#: lib/dpkg/ehandle.c
+#: lib/dpkg/ehandle.c:100
 #, c-format
 msgid ""
 "%s: outside error context, aborting:\n"
 " %s\n"
 msgstr ""
 
-#: lib/dpkg/ehandle.c
+#: lib/dpkg/ehandle.c:120
 msgid "out of memory for new error context"
 msgstr ""
 
-#: lib/dpkg/ehandle.c
+#: lib/dpkg/ehandle.c:183
 #, c-format
 msgid ""
 "%s: error while cleaning up:\n"
@@ -498,134 +503,135 @@
 "%s: གཙང་དག་བཟོ་བའི་སྐབས་འཛོལ་བ:\n"
 " %s\n"
 
-#: lib/dpkg/ehandle.c
+#: lib/dpkg/ehandle.c:201
 #, c-format
 msgid "%s: too many nested errors during error recovery!!\n"
 msgstr ""
 
-#: lib/dpkg/ehandle.c
+#: lib/dpkg/ehandle.c:268 lib/dpkg/ehandle.c:307
 msgid "out of memory for new cleanup entry"
 msgstr "གཙང་དག་བཟོ་ནིའི་ཐོ་བཀོད་གསརཔ་གི་དོན་ལུ་དྲན་ཚད་ལས་ཕྱི་ཁ།"
 
-#: lib/dpkg/ehandle.c
+#: lib/dpkg/ehandle.c:291
 msgid "out of memory for new cleanup entry with many arguments"
 msgstr ""
 "སྒྲུབ་རྟགས་ལེ་ཤ་དང་ཅིག་ཁར་གཙང་དག་བཟོ་ནིའི་ཐོ་བཀོད་གསརཔ་གི་དོན་ལུ་དྲན་ཚད་ལས་ཕྱ"
 "ི་ཁར།"
 
-#: lib/dpkg/ehandle.c
+#: lib/dpkg/ehandle.c:352
 #, c-format
 msgid "%s: error: %s\n"
 msgstr ""
 
-#: lib/dpkg/ehandle.c
+#: lib/dpkg/ehandle.c:394
 #, c-format
 msgid "%s:%s:%d:%s: internal error: %s\n"
 msgstr ""
 
-#: lib/dpkg/fields.c
+#: lib/dpkg/fields.c:45
 #, c-format
 msgid "%s is missing"
 msgstr "%s འདི་བརླག་སྟོར་ཞུགས་ནུག"
 
-#: lib/dpkg/fields.c
+#: lib/dpkg/fields.c:49
 #, c-format
 msgid "'%.50s' is not allowed for %s"
 msgstr ""
 
-#: lib/dpkg/fields.c
+#: lib/dpkg/fields.c:73
 #, c-format
 msgid "junk after %s"
 msgstr "%s གི་ཤུལ་ལས་མཁོ་མེད།"
 
-#: lib/dpkg/fields.c
+#: lib/dpkg/fields.c:87
 #, c-format
 msgid "invalid package name (%.250s)"
 msgstr "ནུས་མེད་ཐུམ་སྒྲིལ་མིང་ (%.250s)"
 
-#: lib/dpkg/fields.c:109
+#: lib/dpkg/fields.c:102
 #, c-format
 msgid "empty file details field `%s'"
 msgstr "ཡིག་སྣོད་སྟོངམ་རྒྱས་བཤད་ས་སྒོ་ `%s'"
 
-#: lib/dpkg/fields.c:112
+#: lib/dpkg/fields.c:105
 #, c-format
 msgid "file details field `%s' not allowed in status file"
 msgstr "ཡིག་སྣོད་རྒྱས་བཤད་ས་སྒོ་ `%s' གནས་ཚད་ཡིག་སྣོད་ནང་ལུ་མི་ཆོག"
 
-#: lib/dpkg/fields.c:125
+#: lib/dpkg/fields.c:118
 #, c-format
 msgid "too many values in file details field `%s' (compared to others)"
 msgstr ""
 "ཡིག་སྣོད་རྒྱས་བཤད་ཀྱི་ས་སྒོ་ `%s' ནང་ལུ་གནས་གོང་ལེ་ཤ་ "
 "(གཞན་མི་ཚུ་ལུ་ག་བསྡུར་རྐྱབས་ད)"
 
-#: lib/dpkg/fields.c:139
+#: lib/dpkg/fields.c:132
 #, c-format
 msgid "too few values in file details field `%s' (compared to others)"
 msgstr ""
 "ཡིག་སྣོད་རྒྱས་བཤད་ཀྱི་ས་སྒོ་ `%s' "
 "ནང་ལུ་གནས་གོང་ཉུང་སུ་(གཞན་མི་ཚུ་ལུ་ག་བསྡུར་རྐྱབས་ད)"
 
-#: lib/dpkg/fields.c
+#: lib/dpkg/fields.c:154
 msgid "yes/no in boolean field"
 msgstr "བུ་ལིན་ས་སྒོ་ནང་ལུ་ཨིན་/མེན།"
 
-#: lib/dpkg/fields.c
+#: lib/dpkg/fields.c:177
 msgid "foreign/allowed/same/no in quadstate field"
 msgstr ""
 
-#: lib/dpkg/fields.c
+#: lib/dpkg/fields.c:189
 #, c-format
 msgid "'%s' is not a valid architecture name: %s"
 msgstr ""
 
-#: lib/dpkg/fields.c
+#: lib/dpkg/fields.c:208
 msgid "word in 'Priority' field"
 msgstr ""
 
-#: lib/dpkg/fields.c
+#: lib/dpkg/fields.c:221 lib/dpkg/fields.c:272 lib/dpkg/fields.c:622
+#: lib/dpkg/fields.c:647
 #, c-format
 msgid "value for '%s' field not allowed in this context"
 msgstr ""
 
-#: lib/dpkg/fields.c
+#: lib/dpkg/fields.c:226
 msgid "first (want) word in 'Status' field"
 msgstr ""
 
-#: lib/dpkg/fields.c
+#: lib/dpkg/fields.c:228
 msgid "second (error) word in 'Status' field"
 msgstr ""
 
-#: lib/dpkg/fields.c
+#: lib/dpkg/fields.c:230
 msgid "third (status) word in 'Status' field"
 msgstr ""
 
-#: lib/dpkg/fields.c
+#: lib/dpkg/fields.c:240 lib/dpkg/fields.c:278
 #, c-format
 msgid "error in '%s' field string '%.250s'"
 msgstr ""
 
-#: lib/dpkg/fields.c
+#: lib/dpkg/fields.c:252
 #, c-format
 msgid "obsolete '%s' or '%s' field used"
 msgstr ""
 
-#: lib/dpkg/fields.c
+#: lib/dpkg/fields.c:305
 #, c-format
 msgid "value for '%s' field has malformatted line '%.*s'"
 msgstr ""
 
-#: lib/dpkg/fields.c
+#: lib/dpkg/fields.c:327
 #, c-format
 msgid "value for '%s' has line starting with non-space '%c'"
 msgstr ""
 
-#: lib/dpkg/fields.c
+#: lib/dpkg/fields.c:304
 msgid "root or null directory is listed as a conffile"
 msgstr "རྩ་བ་ཡང་ན་སྟོང་ཆ་སྣོད་ཐོ་འདི་ ཀཱོནཕ་ཕ་ཡིལ་སྦེ་ཐོ་བཀོད་འབད་ཡོད།"
 
-#: lib/dpkg/fields.c:405
+#: lib/dpkg/fields.c:365
 #, c-format
 msgid ""
 "`%s' field, missing package name, or garbage where package name expected"
@@ -633,25 +639,25 @@
 "`%s' ས་སྒོ་ ཐུམ་སྒྲིལ་གྱི་མིང་རེ་བ་བསྐྱེད་ཡོད་ས་ལུ་ ཐུམ་སྒྲིལ་མིང་  "
 "ཡང་ན་ཕྱགས་ཉིག་ བརླག་སྟོར་ཞུགས་ཡོདཔ།"
 
-#: lib/dpkg/fields.c:415
+#: lib/dpkg/fields.c:370
 #, c-format
 msgid "`%s' field, invalid package name `%.255s': %s"
 msgstr "`%s' ས་སྒོ་ ནུས་མེད་ཐུམ་སྒྲིལ་མིང་ `%.255s': %s"
 
-#: lib/dpkg/fields.c
+#: lib/dpkg/fields.c:444
 #, c-format
 msgid ""
 "'%s' field, missing architecture name, or garbage where architecture name "
 "expected"
 msgstr ""
 
-#: lib/dpkg/fields.c
+#: lib/dpkg/fields.c:457
 #, c-format
 msgid ""
 "'%s' field, reference to '%.255s': invalid architecture name '%.255s': %s"
 msgstr ""
 
-#: lib/dpkg/fields.c:491
+#: lib/dpkg/fields.c:406
 #, c-format
 msgid ""
 "`%s' field, reference to `%.255s':\n"
@@ -660,7 +666,7 @@
 "`%s' ས་སྒོ་ གཞི་བསྟུན་  `%.255s' ལུ་:\n"
 "བྱང་ཉེས་ཐོན་རིམ་མཐུན་འབྲེལ་ %c%c"
 
-#: lib/dpkg/fields.c:497
+#: lib/dpkg/fields.c:412
 #, c-format
 msgid ""
 "`%s' field, reference to `%.255s':\n"
@@ -669,7 +675,7 @@
 "`%s' ས་སྒོ་ གཞི་བསྟུན་ `%.255s' ལུ་:\n"
 "`%c' ཕན་མེད་ཨིན། ཚབ་ལུ་ `%c=' ཡང་ན་ `%c%c' ལག་ལེན་འཐབ།"
 
-#: lib/dpkg/fields.c:507
+#: lib/dpkg/fields.c:422
 #, c-format
 msgid ""
 "`%s' field, reference to `%.255s':\n"
@@ -679,12 +685,12 @@
 "བསམ་པའི་མཐུན་སྒྲིག་ཏག་ཏག་ཐོན་རིམ་གུ་ལུ། ཚབ་ལུ་ `=' "
 "ལག་ལེན་འཐབ་ནི་བསམ་འཆར་བཀོད།"
 
-#: lib/dpkg/fields.c
+#: lib/dpkg/fields.c:515
 #, c-format
 msgid "only exact versions may be used for '%s' field"
 msgstr ""
 
-#: lib/dpkg/fields.c:520
+#: lib/dpkg/fields.c:434
 #, c-format
 msgid ""
 "`%s' field, reference to `%.255s':\n"
@@ -694,571 +700,572 @@
 "ཐོན་རིམ་གནས་གོང་འདི་ ཀ་ཁ་ཨང་ཡིག༌-མེད་མི་དང་ཅིག་ཁར་འགོ་བཙུགསཔ་ཨིན། "
 "བར་སྟོང་ཅིག་ཁ་སྐོང་རྐྱབས་ནིའི་བསམ་འཆར་བཀོད།"
 
-#: lib/dpkg/fields.c:537 lib/dpkg/fields.c:541
+#: lib/dpkg/fields.c:451 lib/dpkg/fields.c:455
 #, c-format
 msgid "`%s' field, reference to `%.255s': version contains `%c'"
 msgstr "`%s' ས་སྒོ་ `%.255s' ལུ་གཞི་བསྟུན:ཐོན་རིམ་ནང་ན་ `%c'ཡོད།"
 
-#: lib/dpkg/fields.c:545
+#: lib/dpkg/fields.c:459
 #, c-format
 msgid "`%s' field, reference to `%.255s': version unterminated"
 msgstr "`%s' ས་སྒོ་ གཞི་བསྟུན་ `%.255s' ལུ་: ཐོན་རིམ་རྩ་གྲོལ་མ་གཏངམ།"
 
-#: lib/dpkg/fields.c
+#: lib/dpkg/fields.c:465
 #, c-format
 msgid "'%s' field, reference to '%.255s': error in version"
 msgstr ""
 
-#: lib/dpkg/fields.c:561
+#: lib/dpkg/fields.c:475
 #, c-format
 msgid "`%s' field, syntax error after reference to package `%.255s'"
 msgstr ""
 "`%s' ས་སྒོ་ ཐུམ་སྒྲིལ་ `%.255s' ལུ་གཞི་བསྟུན་གྱི་ཤུལ་ལས་ཚིག་སྦྱོར་གྱྀ་འཛོལ་བ།"
 
-#: lib/dpkg/fields.c:568
+#: lib/dpkg/fields.c:482
 #, c-format
 msgid "alternatives (`|') not allowed in %s field"
 msgstr "སྤེལ་མ་ (`|') ཚུ་ %s ས་སྒོ་ནང་མི་ཆོག"
 
-#: lib/dpkg/fields.c:629
+#: lib/dpkg/fields.c:543
 #, c-format
 msgid "illegal pending trigger name `%.255s': %s"
 msgstr ""
 
-#: lib/dpkg/fields.c:633
+#: lib/dpkg/fields.c:547
 #, c-format
 msgid "duplicate pending trigger `%.255s'"
 msgstr ""
 
-#: lib/dpkg/fields.c:656
+#: lib/dpkg/fields.c:568
 #, c-format
 msgid "illegal package name in awaited trigger `%.255s': %s"
 msgstr ""
 
-#: lib/dpkg/fields.c:661
+#: lib/dpkg/fields.c:574
 #, c-format
 msgid "duplicate awaited trigger package `%.255s'"
 msgstr ""
 
-#: lib/dpkg/file.c
+#: lib/dpkg/file.c:51
 #, c-format
 msgid "unable to stat source file '%.250s'"
 msgstr ""
 
-#: lib/dpkg/file.c
+#: lib/dpkg/file.c:55
 #, c-format
 msgid "unable to change ownership of target file '%.250s'"
 msgstr ""
 
-#: lib/dpkg/file.c
+#: lib/dpkg/file.c:59
 #, c-format
 msgid "unable to set mode of target file '%.250s'"
 msgstr ""
 
-#: lib/dpkg/file.c
+#: lib/dpkg/file.c:85
 #, c-format
 msgid "unable to unlock %s"
 msgstr ""
 
-#: lib/dpkg/file.c
+#: lib/dpkg/file.c:111
 #, c-format
 msgid "unable to check file '%s' lock status"
 msgstr ""
 
-#: lib/dpkg/file.c
+#: lib/dpkg/file.c:146
 #, c-format
 msgid "%s is locked by another process"
 msgstr ""
 
-#: lib/dpkg/file.c
+#: lib/dpkg/file.c:148
 #, c-format
 msgid "unable to lock %s"
 msgstr ""
 
-#: lib/dpkg/file.c
+#: lib/dpkg/file.c:171 lib/dpkg/file.c:176
 msgid "showing file on pager"
 msgstr ""
 
-#: lib/dpkg/log.c
+#: lib/dpkg/log.c:53
 #, c-format
 msgid "could not open log '%s': %s"
 msgstr ""
 
-#: lib/dpkg/log.c
+#: lib/dpkg/log.c:85
 msgid "<package status and progress file descriptor>"
 msgstr ""
 
-#: lib/dpkg/log.c
+#: lib/dpkg/log.c:114
 #, c-format
 msgid "unable to write to status fd %d"
 msgstr ""
 
-#: lib/dpkg/mlib.c utils/update-alternatives.c
+#: lib/dpkg/mlib.c:72 lib/dpkg/mlib.c:90 utils/update-alternatives.c:277
+#: utils/update-alternatives.c:334 utils/update-alternatives.c:1107
 msgid "failed to allocate memory"
 msgstr ""
 
-#: lib/dpkg/mlib.c
+#: lib/dpkg/mlib.c:102
 #, c-format
 msgid "failed to dup for std%s"
 msgstr "std%s གི་དོན་ལུ་ཌུཔ་འབད་ནི་འཐུས་ཤོར་བྱུང་ཡོདཔ།"
 
-#: lib/dpkg/mlib.c
+#: lib/dpkg/mlib.c:103
 #, c-format
 msgid "failed to dup for fd %d"
 msgstr "fd %d གི་དོན་ལུ་ཌུཔ་འབད་ནི་འཐུས་ཤོར་བྱུང་ཡོདཔ།"
 
-#: lib/dpkg/mlib.c
+#: lib/dpkg/mlib.c:109
 msgid "failed to create pipe"
 msgstr "རྒྱུད་དུང་གསར་བསྐྲུན་འབད་ནི་འཐུས་ཤོར་བྱུང་ཡོདཔ།"
 
-#: lib/dpkg/mlib.c
+#: lib/dpkg/mlib.c:117
 #, c-format
 msgid "error writing to '%s'"
 msgstr ""
 
-#: lib/dpkg/mlib.c
+#: lib/dpkg/mlib.c:124
 #, c-format
 msgid "unable to read filedescriptor flags for %.250s"
 msgstr "%.250s གི་དོན་ལུ་ ཡིག་སྣོད་འགྲེལ་བཤདཔ་ཟུར་རྟགས་ཚུ་ལྷག་མ་ཚུགས།"
 
-#: lib/dpkg/mlib.c
+#: lib/dpkg/mlib.c:126
 #, c-format
 msgid "unable to set close-on-exec flag for %.250s"
 msgstr ""
 "%.250s གི་དོན་ལུ་ ལག་ལེན་འཐབ་ནིའི་-གུ་-"
 "ཁ་བསྡམ་ནི་ཟུར་རྟགས་གཞི་སྒྲིག་འབད་མ་ཚུགས།"
 
-#: lib/dpkg/options.c
+#: lib/dpkg/options.c:63
 #, c-format
 msgid "configuration error: %s:%d: %s"
 msgstr ""
 
-#: lib/dpkg/options.c
+#: lib/dpkg/options.c:75
 #, c-format
 msgid "failed to open configuration file '%.255s' for reading: %s"
 msgstr ""
 
-#: lib/dpkg/options.c
+#: lib/dpkg/options.c:102
 #, c-format
 msgid "unbalanced quotes in '%s'"
 msgstr ""
 
-#: lib/dpkg/options.c utils/update-alternatives.c
+#: lib/dpkg/options.c:117
 #, c-format
 msgid "unknown option '%s'"
 msgstr ""
 
-#: lib/dpkg/options.c
+#: lib/dpkg/options.c:121
 #, c-format
 msgid "'%s' needs a value"
 msgstr ""
 
-#: lib/dpkg/options.c
+#: lib/dpkg/options.c:127
 #, c-format
 msgid "'%s' does not take a value"
 msgstr ""
 
-#: lib/dpkg/options.c:137
+#: lib/dpkg/options.c:133
 #, c-format
 msgid "read error in configuration file `%.255s'"
 msgstr "རིམ་སྒྲིག་ཡིག་སྣོད་ `%.255s' ནང་ལུ་ལྷག་པའི་འཛོལ་བ།"
 
-#: lib/dpkg/options.c:138
+#: lib/dpkg/options.c:134
 #, c-format
 msgid "error closing configuration file `%.255s'"
 msgstr "རིམ་སྒྲིག་ཡིག་སྣོད་ `%.255s' ཁ་བསྡམ་ནིའི་འཛོལ་བ།"
 
-#: lib/dpkg/options.c
+#: lib/dpkg/options.c:170
 #, c-format
 msgid "error opening configuration directory '%s'"
 msgstr ""
 
-#: lib/dpkg/options.c
+#: lib/dpkg/options.c:228
 #, c-format
 msgid "unknown option --%s"
 msgstr "མ་ཤེས་པའི་འཛོལ་བ --%s"
 
-#: lib/dpkg/options.c
+#: lib/dpkg/options.c:232
 #, c-format
 msgid "--%s option takes a value"
 msgstr "--%s གདམ་ཁ་གིས་གནས་གོང་ཅིག་འབགཔ་ཨིན།"
 
-#: lib/dpkg/options.c
+#: lib/dpkg/options.c:237
 #, c-format
 msgid "--%s option does not take a value"
 msgstr "--%s གདམ་ཁ་གིས་གནས་གོང་ཅིག་མི་འབག"
 
-#: lib/dpkg/options.c
+#: lib/dpkg/options.c:245
 #, c-format
 msgid "unknown option -%c"
 msgstr "མ་ཤེས་པའི་འཛོལ་བ་ -%c"
 
-#: lib/dpkg/options.c
+#: lib/dpkg/options.c:250
 #, c-format
 msgid "-%c option takes a value"
 msgstr "-%c གདམ་ཁ་གིས་གནས་གོང་ཅིག་འབགཔ་ཨིན།"
 
-#: lib/dpkg/options.c
+#: lib/dpkg/options.c:258
 #, c-format
 msgid "-%c option does not take a value"
 msgstr "-%c གདམ་ཁ་གིས་གནས་གོང་ཅིག་མི་འབག"
 
-#: lib/dpkg/options.c:286 dpkg-split/main.c:127
+#: src/main.c:371 src/main.c:381 src/main.c:649 dpkg-split/main.c:124
 #, c-format
 msgid "invalid integer for --%s: `%.250s'"
 msgstr "--%s: `%.250s' གི་དོན་ལུ་ནུས་མེད་ཧྲིལ་ཨང་།"
 
-#: lib/dpkg/options.c:294
+#: lib/dpkg/options.c:271
 #, c-format
 msgid "obsolete option '--%s'\n"
 msgstr ""
 
-#: lib/dpkg/options.c
+#: lib/dpkg/options.c:287
 #, c-format
 msgid "conflicting actions -%c (--%s) and -%c (--%s)"
 msgstr "མི་མཐུན་པའི་བྱ་བ་-%c (--%s) and -%c (--%s)"
 
-#: lib/dpkg/parse.c:140
+#: lib/dpkg/parse.c:134
 #, c-format
 msgid "duplicate value for `%s' field"
 msgstr "`%s' ས་སྒོའི་དོན་ལུ་གནས་གོང་རྫུན་མ།"
 
-#: lib/dpkg/parse.c:152
+#: lib/dpkg/parse.c:146
 #, c-format
 msgid "user-defined field name `%.*s' too short"
 msgstr "ལག་ལེན་པ་-ངེས་འཛིན་འབད་ཡོད་པའི་ས་སྒོའི་མིང་ `%.*s' ཐུང་དྲགས།"
 
-#: lib/dpkg/parse.c:159
+#: lib/dpkg/parse.c:152
 #, c-format
 msgid "duplicate value for user-defined field `%.*s'"
 msgstr ""
 "ལག་ལེན་པ་-ངེས་འཛིན་འབད་ཡོད་པའི་ས་སྒོ་ `%.*s' གི་དོན་ལུ་གནས་གོང་རྫུན་མ།"
 
-#: lib/dpkg/parse.c lib/dpkg/parsehelp.c
+#: lib/dpkg/parsehelp.c:299 lib/dpkg/parsehelp.c:311
 #, c-format
 msgid "missing %s"
 msgstr "%s བརླག་སྟོར་ཞུགས་ཡོདཔ།"
 
-#: lib/dpkg/parse.c lib/dpkg/parsehelp.c
+#: lib/dpkg/parsehelp.c:301 lib/dpkg/parsehelp.c:314
 #, c-format
 msgid "empty value for %s"
 msgstr "%s གི་དོན་ལུ་གནས་གོང་སྟོངམ།"
 
-#: lib/dpkg/parse.c
+#: lib/dpkg/parse.c:211
 #, c-format
 msgid "package has field '%s' but is missing architecture"
 msgstr ""
 
-#: lib/dpkg/parse.c
+#: lib/dpkg/parse.c:214
 #, c-format
 msgid "package has field '%s' but is architecture all"
 msgstr ""
 
-#: lib/dpkg/parse.c
+#: lib/dpkg/parse.c:232
 msgid "Config-Version for package with inappropriate Status"
 msgstr ""
 
-#: lib/dpkg/parse.c
+#: lib/dpkg/parse.c:218
 #, c-format
 msgid "package has status %s but triggers are awaited"
 msgstr ""
 
-#: lib/dpkg/parse.c
+#: lib/dpkg/parse.c:222
 msgid "package has status triggers-awaited but no triggers awaited"
 msgstr ""
 
-#: lib/dpkg/parse.c
+#: lib/dpkg/parse.c:228
 #, c-format
 msgid "package has status %s but triggers are pending"
 msgstr ""
 
-#: lib/dpkg/parse.c
+#: lib/dpkg/parse.c:232
 msgid "package has status triggers-pending but no triggers pending"
 msgstr ""
 
-#: lib/dpkg/parse.c
+#: lib/dpkg/parse.c:242
 msgid "Package which in state not-installed has conffiles, forgetting them"
 msgstr ""
 "གཞི་བཙུགས་མིན་པའི་གནས་ལུགས་ཀྱི་ཐུམ་སྒྲིལ་འདི་ལུ་ཀཱོན་ཕ་ཡིལ་ཚུ་ཡོད། "
 "འདི་ཚུ་བརྗེད་དོ།"
 
-#: lib/dpkg/parse.c
+#: lib/dpkg/parse.c:345
 msgid ""
 "multiple non-coinstallable package instances present; most probably due to "
 "an upgrade from an unofficial dpkg"
 msgstr ""
 
-#: lib/dpkg/parse.c
+#: lib/dpkg/parse.c:349
 msgid ""
 "mixed non-coinstallable and coinstallable package instances present; most "
 "probably due to an upgrade from an unofficial dpkg"
 msgstr ""
 
-#: lib/dpkg/parse.c
+#: lib/dpkg/parse.c:409
 #, c-format
 msgid ""
 "%s %s (Multi-Arch: %s) is not co-installable with %s which has multiple "
 "installed instances"
 msgstr ""
 
-#: lib/dpkg/parse.c:545
+#: lib/dpkg/parse.c:335
 #, c-format
 msgid "failed to open package info file `%.255s' for reading"
 msgstr ""
 "ལྷག་ནིའི་དོན་ལུ་ ཐུམ་སྒྲིལ་བརྡ་དོན་ཡིག་སྣོད་ `%.255s' "
 "ཁ་ཕྱེ་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོདཔ།"
 
-#: lib/dpkg/parse.c:564
+#: lib/dpkg/parse.c:341
 #, c-format
 msgid "can't stat package info file `%.255s'"
 msgstr "ཐུམ་སྒྲིལ་བརྡ་དོན་ཡིག་སྣོད་ `%.255s' སིཊེཊི་འབད་མི་ཚུགས།"
 
-#: lib/dpkg/parse.c:583
+#: lib/dpkg/parse.c:347
 #, c-format
 msgid "can't mmap package info file `%.255s'"
 msgstr "ཐུམ་སྒྲིལ་བརྡ་དོན་ཡིག་སྣོད་ `%.255s' ཨེམ་མེཔ་འབད་མི་ཚུགས།"
 
-#: lib/dpkg/parse.c
+#: lib/dpkg/parse.c:352
 #, c-format
 msgid "reading package info file '%.255s'"
 msgstr ""
 
-#: lib/dpkg/parse.c:729
+#: lib/dpkg/parse.c:363
 #, c-format
 msgid "failed to close after read: `%.255s'"
 msgstr "ལྷག་པའི་ཤུལ་མ་ཁ་བསྡམ་ནི་འཐུས་ཤོར་བྱུང་ཡོདཔ: `%.255s'"
 
-#: lib/dpkg/parse.c
+#: lib/dpkg/parse.c:585
 msgid "empty field name"
 msgstr ""
 
-#: lib/dpkg/parse.c
+#: lib/dpkg/parse.c:587
 #, c-format
 msgid "field name '%.*s' cannot start with hyphen"
 msgstr ""
 
-#: lib/dpkg/parse.c:640
+#: lib/dpkg/parse.c:404
 #, c-format
 msgid "EOF after field name `%.*s'"
 msgstr "ས་སྒོ་མིང་ `%.*s' གི་ཤུལ་མ་ ཨི་ཨོ་ཨེཕ།"
 
-#: lib/dpkg/parse.c:643
+#: lib/dpkg/parse.c:407
 #, c-format
 msgid "newline in field name `%.*s'"
 msgstr "ས་སྒོ་མིང་ `%.*s' ནང་གྲལ་ཐིག་གསརཔ།"
 
-#: lib/dpkg/parse.c:646
+#: lib/dpkg/parse.c:410
 #, c-format
 msgid "MSDOS EOF (^Z) in field name `%.*s'"
 msgstr "ས་སྒོ་མིང་ `%.*s' ནང་ཨེམ་ཨེསི་ཌི་ཨོ་ཨེསི་ ཨི་ཨོ་ཨེཕ་ (^Z)"
 
-#: lib/dpkg/parse.c:650
+#: lib/dpkg/parse.c:414
 #, c-format
 msgid "field name `%.*s' must be followed by colon"
 msgstr "ས་སྒོ་མིང་ `%.*s' འདི་ཀོ་ལཱོན་གྱིས་རྗེས་སུ་འབྲང་དགོ"
 
-#: lib/dpkg/parse.c:661
+#: lib/dpkg/parse.c:425
 #, c-format
 msgid "EOF before value of field `%.*s' (missing final newline)"
 msgstr ""
 "ས་སྒོ་ `%.*s' "
 "གི་གནས་གོང་གི་ཧེ་མ་ཨི་ཨོ་ཨེཕ་(མཐའ་མཇུག་གི་གྲལ་ཐིག་གསརཔ་བརླག་སྟོར་ཞུགས་ཡོདཔ།)"
 
-#: lib/dpkg/parse.c:665
+#: lib/dpkg/parse.c:429
 #, c-format
 msgid "MSDOS EOF char in value of field `%.*s' (missing newline?)"
 msgstr "ས་སྒོ་ `%.*s' གི་གནས་གོང་ནང་ཨེམ་ཨེསི་ཌི་ཨོ་ཨེསི་ ཨི་ཨོ་ཨེཕ་ ཅར།"
 
-#: lib/dpkg/parse.c
+#: lib/dpkg/parse.c:440
 #, c-format
 msgid "blank line in value of field '%.*s'"
 msgstr ""
 
-#: lib/dpkg/parse.c:696
+#: lib/dpkg/parse.c:461
 #, c-format
 msgid "EOF during value of field `%.*s' (missing final newline)"
 msgstr ""
 "ས་སྒོ་ `%.*s' "
 "གི་གནས་གོང་སྐབས་ཨི་ཨོ་ཨེཕ་(མཐའ་མཇུག་གི་གྲལ་ཐིག་གསརཔ་བརླག་སྟོར་ཞུགས་ཡོདཔ།)"
 
-#: lib/dpkg/parse.c
+#: lib/dpkg/parse.c:546
 msgid "several package info entries found, only one allowed"
 msgstr ""
 "ཐུམ་སྒྲིལ་གྱི་བརྡ་དོན་ཐོ་བཀོད་ལེ་ཤ་ཅིག་ཐོབ་ཡོད་ གཅིག་རྐྱངམ་ཅིག་འབད་ཆོག"
 
-#: lib/dpkg/parse.c:812
+#: lib/dpkg/parse.c:572
 #, c-format
 msgid "no package information in `%.255s'"
 msgstr "`%.255s' ནང་ཐུམ་སྒྲིལ་གྱི་བརྡ་དོན་མེད།"
 
-#: lib/dpkg/parsehelp.c
+#: lib/dpkg/parsehelp.c:45
 #, c-format
 msgid ""
 "parsing file '%.255s' near line %d package '%.255s':\n"
 " %.255s"
 msgstr ""
 
-#: lib/dpkg/parsehelp.c
+#: lib/dpkg/parsehelp.c:48
 #, c-format
 msgid ""
 "parsing file '%.255s' near line %d:\n"
 " %.255s"
 msgstr ""
 
-#: lib/dpkg/parsehelp.c
+#: lib/dpkg/parsehelp.c:127
 msgid "must start with an alphanumeric character"
 msgstr ""
 
-#: lib/dpkg/parsehelp.c
+#: lib/dpkg/parsehelp.c:178
 msgctxt "version"
 msgid "<none>"
 msgstr ""
 
-#: lib/dpkg/parsehelp.c
+#: lib/dpkg/parsehelp.c:209
 msgid "version string is empty"
 msgstr "ཐོན་རིམ་གྱི་ཡིག་རྒྱུན་འདི་སྟོངམ་ཨིན།"
 
-#: lib/dpkg/parsehelp.c
+#: lib/dpkg/parsehelp.c:224
 msgid "version string has embedded spaces"
 msgstr "ཐོན་རིམ་གྱི་ཡིག་རྒྱུན་འདི་གིས་བར་སྟོང་ཚུ་གནས་འདྲེན་འབད་ཡོདཔ།"
 
-#: lib/dpkg/parsehelp.c
+#: lib/dpkg/parsehelp.c:230
 msgid "epoch in version is not number"
 msgstr "ཐོན་རིམ་ནང་གི་ཨི་པོཀ་འདི་ཨང་གྲངས་མེན།"
 
-#: lib/dpkg/parsehelp.c
+#: lib/dpkg/parsehelp.c:243
 msgid "epoch in version is negative"
 msgstr ""
 
-#: lib/dpkg/parsehelp.c
+#: lib/dpkg/parsehelp.c:245
 msgid "epoch in version is too big"
 msgstr ""
 
-#: lib/dpkg/parsehelp.c
+#: lib/dpkg/parsehelp.c:232
 msgid "nothing after colon in version number"
 msgstr "ཐོན་རིམ་ཨང་ནང་གི་ཀོ་ལཱོན་གྱི་ཤུལ་ལས་ག་ནི་ཡང་མེདཔ།"
 
-#: lib/dpkg/parsehelp.c
+#: lib/dpkg/parsehelp.c:247
 msgid "version number does not start with digit"
 msgstr ""
 
-#: lib/dpkg/parsehelp.c
+#: lib/dpkg/parsehelp.c:250
 msgid "invalid character in version number"
 msgstr ""
 
-#: lib/dpkg/parsehelp.c
+#: lib/dpkg/parsehelp.c:254
 msgid "invalid character in revision number"
 msgstr ""
 
-#: lib/dpkg/pkg-db.c lib/dpkg/pkg-spec.c
+#: lib/dpkg/pkg-db.c:164 lib/dpkg/pkg-spec.c:97
 #, c-format
 msgid "ambiguous package name '%s' with more than one installed instance"
 msgstr ""
 
-#: lib/dpkg/pkg-format.c
+#: lib/dpkg/pkg-format.c:87
 #, c-format
 msgid "invalid character '%c' in field width"
 msgstr ""
 
-#: lib/dpkg/pkg-format.c
+#: lib/dpkg/pkg-format.c:92
 msgid "field width is out of range"
 msgstr ""
 
-#: lib/dpkg/pkg-format.c
+#: lib/dpkg/pkg-format.c:183
 msgid "missing closing brace"
 msgstr ""
 
-#: lib/dpkg/pkg-show.c
+#: lib/dpkg/pkg-show.c:40
 msgid "(no description available)"
 msgstr "(འགྲེལ་བཤད་འཐོབ་ཚུགསཔ་མེད་)"
 
-#: lib/dpkg/pkg-spec.c
+#: lib/dpkg/pkg-spec.c:71
 #, c-format
 msgid "illegal package name in specifier '%s%s%s': %s"
 msgstr ""
 
-#: lib/dpkg/pkg-spec.c
+#: lib/dpkg/pkg-spec.c:81
 #, c-format
 msgid "illegal architecture name in specifier '%s:%s': %s"
 msgstr ""
 
-#: lib/dpkg/report.c
+#: lib/dpkg/ehandle.c:393
 #, c-format
 msgid "%s: warning: %s\n"
 msgstr ""
 
-#: lib/dpkg/strwide.c
+#: lib/dpkg/strwide.c:60
 #, c-format
 msgid "cannot convert multibyte string '%s' to a wide-character string"
 msgstr ""
 
-#: lib/dpkg/strwide.c
+#: lib/dpkg/strwide.c:113
 #, c-format
 msgid "cannot convert multibyte sequence '%s' to a wide character"
 msgstr ""
 
-#: lib/dpkg/subproc.c
+#: lib/dpkg/subproc.c:55
 #, c-format
 msgid "unable to ignore signal %s before running %.250s"
 msgstr ""
 
-#: lib/dpkg/subproc.c
+#: lib/dpkg/subproc.c:68
 #, c-format
 msgid "error un-catching signal %s: %s\n"
 msgstr "%s: %s བརྡ་རྟགས་མ་བཟུང་པར་བཞག་ནིའི་འཛོལ་བ།\n"
 
-#: lib/dpkg/subproc.c
+#: lib/dpkg/subproc.c:78
 #, c-format
 msgid "%s (subprocess): %s\n"
 msgstr "%s (ལས་སྦྱོར་ཡན་ལག): %s\n"
 
-#: lib/dpkg/subproc.c utils/update-alternatives.c
+#: lib/dpkg/subproc.c:89 utils/update-alternatives.c:454
 msgid "fork failed"
 msgstr "ཁ་སྤེལ་ནི་འཐུས་ཤོར་བྱུང་ཡོདཔ།"
 
-#: lib/dpkg/subproc.c
+#: lib/dpkg/subproc.c:119
 #, c-format
 msgid "subprocess %s returned error exit status %d"
 msgstr ""
 "ལས་སྦྱོར་ཡན་ལག་ %s སླར་ལོག་ཡོད་པའི་འཛོལ་བ་ གནས་ཚད་ %d ཕྱིར་ཐོན་འབདཝ་ཨིན།"
 
-#: lib/dpkg/subproc.c
+#: lib/dpkg/subproc.c:128
 #, c-format
 msgid "subprocess %s was interrupted"
 msgstr ""
 
-#: lib/dpkg/subproc.c
+#: lib/dpkg/subproc.c:130
 #, c-format
 msgid "subprocess %s was killed by signal (%s)%s"
 msgstr ""
 
-#: lib/dpkg/subproc.c
+#: lib/dpkg/subproc.c:132
 msgid ", core dumped"
 msgstr ", ནང་རྙིང་བཀོག་བཞག་ཡོདཔ།"
 
-#: lib/dpkg/subproc.c
+#: lib/dpkg/subproc.c:134
 #, c-format
 msgid "subprocess %s failed with wait status code %d"
 msgstr ""
 "ལས་སྦྱོར་ཡན་ལག་ %s འདི་བསྒུག་ནིའི་གནས་ཚད་ཨང་རྟགས་ %d "
 "དང་ཅིག་ཁར་འཐུས་ཤོར་བྱུང་ཡོདཔ།"
 
-#: lib/dpkg/subproc.c utils/update-alternatives.c
+#: lib/dpkg/subproc.c:151 utils/update-alternatives.c:461
 #, c-format
 msgid "wait for subprocess %s failed"
 msgstr ""
 
-#: lib/dpkg/trigdeferred.l:75
+#: lib/dpkg/trigdeferred.l:72
 #, c-format
 msgid "invalid package name `%.250s' in triggers deferred file `%.250s'"
 msgstr ""
 
-#: lib/dpkg/trigdeferred.l:84
+#: lib/dpkg/trigdeferred.l:81
 #, c-format
 msgid "truncated triggers deferred file `%.250s'"
 msgstr ""
 
-#: lib/dpkg/trigdeferred.l:88
+#: lib/dpkg/trigdeferred.l:85
 #, c-format
 msgid "syntax error in triggers deferred file `%.250s' at character `%s'%s"
 msgstr ""
@@ -1268,128 +1275,128 @@
 msgid "unable to open/create triggers lockfile `%.250s'"
 msgstr ""
 
-#: lib/dpkg/trigdeferred.l
+#: lib/dpkg/trigdeferred.l:141
 msgid "triggers area"
 msgstr ""
 
-#: lib/dpkg/trigdeferred.l:168
+#: lib/dpkg/trigdeferred.l:151
 #, c-format
 msgid "unable to stat triggers deferred file `%.250s'"
 msgstr ""
 
-#: lib/dpkg/trigdeferred.l:154
+#: lib/dpkg/trigdeferred.l:165
 #, c-format
 msgid "unable to open triggers deferred file `%.250s'"
 msgstr ""
 
-#: lib/dpkg/trigdeferred.l:183
+#: lib/dpkg/trigdeferred.l:179
 #, c-format
 msgid "unable to open/create new triggers deferred file `%.250s'"
 msgstr ""
 
-#: lib/dpkg/trigdeferred.l:221
+#: lib/dpkg/trigdeferred.l:215
 #, c-format
 msgid "error reading triggers deferred file `%.250s'"
 msgstr ""
 
-#: lib/dpkg/trigdeferred.l:229
+#: lib/dpkg/trigdeferred.l:223
 #, c-format
 msgid "unable to write new triggers deferred file `%.250s'"
 msgstr ""
 
-#: lib/dpkg/trigdeferred.l:234
+#: lib/dpkg/trigdeferred.l:228
 #, c-format
 msgid "unable to close new triggers deferred file `%.250s'"
 msgstr ""
 
-#: lib/dpkg/trigdeferred.l:238
+#: lib/dpkg/trigdeferred.l:232
 #, c-format
 msgid "unable to install new triggers deferred file `%.250s'"
 msgstr ""
 
-#: lib/dpkg/triglib.c:228
+#: lib/dpkg/triglib.c:222
 #, c-format
 msgid ""
 "invalid or unknown syntax in trigger name `%.250s' (in trigger interests for "
 "package `%.250s')"
 msgstr ""
 
-#: lib/dpkg/triglib.c:269
+#: lib/dpkg/triglib.c:263
 #, c-format
 msgid "failed to open trigger interest list file `%.250s'"
 msgstr ""
 
-#: lib/dpkg/triglib.c:297
+#: lib/dpkg/triglib.c:292
 #, c-format
 msgid "failed to rewind trigger interest file `%.250s'"
 msgstr ""
 
-#: lib/dpkg/triglib.c:316
+#: lib/dpkg/triglib.c:305
 #, c-format
 msgid ""
 "trigger interest file `%.250s' syntax error; illegal package name `%.250s': "
 "%.250s"
 msgstr ""
 
-#: lib/dpkg/triglib.c:434
+#: lib/dpkg/triglib.c:456
 #, c-format
 msgid ""
 "duplicate file trigger interest for filename `%.250s' and package `%.250s'"
 msgstr ""
 
-#: lib/dpkg/triglib.c:505
+#: lib/dpkg/triglib.c:542
 #, c-format
 msgid "unable to read file triggers file `%.250s'"
 msgstr ""
 
-#: lib/dpkg/triglib.c:516
+#: lib/dpkg/triglib.c:552
 #, c-format
 msgid "syntax error in file triggers file `%.250s'"
 msgstr ""
 
-#: lib/dpkg/triglib.c:532
+#: lib/dpkg/triglib.c:563
 #, c-format
 msgid ""
 "file triggers record mentions illegal package name `%.250s' (for interest in "
 "file `%.250s'): %.250s"
 msgstr ""
 
-#: lib/dpkg/triglib.c:671
+#: lib/dpkg/triglib.c:665
 #, c-format
 msgid ""
 "triggers ci file `%.250s' contains illegal trigger syntax in trigger name "
 "`%.250s': %.250s"
 msgstr ""
 
-#: lib/dpkg/triglib.c:691
+#: lib/dpkg/triglib.c:684
 #, c-format
 msgid "unable to open triggers ci file `%.250s'"
 msgstr ""
 
-#: lib/dpkg/triglib.c
+#: lib/dpkg/triglib.c:699
 msgid "triggers ci file contains unknown directive syntax"
 msgstr ""
 
-#: lib/dpkg/triglib.c:721
+#: lib/dpkg/triglib.c:712
 #, c-format
 msgid "triggers ci file contains unknown directive `%.250s'"
 msgstr ""
 
-#: lib/dpkg/triglib.c:787
+#: lib/dpkg/triglib.c:776
 #, c-format
 msgid "unable to create triggers state directory `%.250s'"
 msgstr ""
 
-#: lib/dpkg/triglib.c:790
+#: lib/dpkg/triglib.c:779
 #, c-format
 msgid "unable to set ownership of triggers state directory `%.250s'"
 msgstr ""
 
-#: lib/dpkg/trigname.c
+#: lib/dpkg/trigname.c:34
 msgid "empty trigger names are not permitted"
 msgstr ""
 
-#: lib/dpkg/trigname.c
+#: lib/dpkg/trigname.c:38
 msgid "trigger name contains invalid character"
 msgstr ""
 
@@ -1413,150 +1420,150 @@
 msgid "unexpected eof reading `%.250s'"
 msgstr ""
 
-#: lib/dpkg/varbuf.c
+#: lib/dpkg/varbuf.c:82 lib/dpkg/varbuf.c:88
 msgid "error formatting string into varbuf variable"
 msgstr ""
 
-#: src/archives.c
+#: src/archives.c:179 src/archives.c:200 src/archives.c:724
 msgid "error reading from dpkg-deb pipe"
 msgstr "dpkg-deb རྒྱུད་དུང་ལས་ལྷག་ནི་འཛོལ་བ།"
 
-#: src/archives.c
+#: src/archives.c:259
 #, c-format
 msgid "cannot skip padding for file '%.255s': %s"
 msgstr ""
 
-#: src/archives.c
+#: src/archives.c:272
 #, c-format
 msgid "cannot skip file '%.255s' (replaced or excluded?) from pipe: %s"
 msgstr ""
 
-#: src/archives.c:334
+#: src/archives.c:711
 #, c-format
 msgid "unable to create `%.255s' (while processing `%.255s')"
 msgstr ""
 
-#: src/archives.c
+#: src/archives.c:342
 #, c-format
 msgid "cannot copy extracted data for '%.255s' to '%.255s': %s"
 msgstr ""
 
-#: src/archives.c:363 src/archives.c:479 src/statcmd.c:165
+#: src/archives.c:265 src/archives.c:734 src/statcmd.c:163
 #, c-format
 msgid "error setting ownership of `%.255s'"
 msgstr "`%.255s' གི་བདག་པོ་གཞི་སྒྲིག་གི་འཛོལ་བ།"
 
-#: src/archives.c:365 src/archives.c:481 src/statcmd.c:167
+#: src/archives.c:267 src/archives.c:736 src/statcmd.c:165
 #, c-format
 msgid "error setting permissions of `%.255s'"
 msgstr "`%.255s' གི་གནང་བ་གཞི་སྒྲིག་གི་འཛོལ་བ།"
 
-#: src/archives.c:373 src/archives.c:1217 src/archives.c:1256
+#: src/archives.c:744 src/archives.c:908 src/archives.c:949
 #, c-format
 msgid "error closing/writing `%.255s'"
 msgstr "`%.255s' ཁ་བསྡམ་ནི་/འབྲི་ནིའི་འཛོལ་བ།"
 
-#: src/archives.c:377
+#: src/archives.c:748
 #, c-format
 msgid "error creating pipe `%.255s'"
 msgstr "རྒྱུད་དུང་ `%.255s' གསར་བསྐུན་འབདཝ་ད་འཛོལ་བ།"
 
-#: src/archives.c:382 src/archives.c:387
+#: src/archives.c:753 src/archives.c:758
 #, c-format
 msgid "error creating device `%.255s'"
 msgstr "ཐབས་འཕྲུལ་ `%.255s' གསར་བསྐྲུན་འབདཝ་ད་འཛོལ་བ།"
 
-#: src/archives.c:400 src/infodb-upgrade.c:146 src/infodb-upgrade.c:166
+#: src/archives.c:771
 #, c-format
 msgid "error creating hard link `%.255s'"
 msgstr "ཧརཌི་ལིངཀ་ `%.255s' གསར་བསྐྲུན་འབདཝ་ད་འཛོལ་བ།"
 
-#: src/archives.c:407 utils/update-alternatives.c:481
+#: src/archives.c:777 utils/update-alternatives.c:539
 #, c-format
 msgid "error creating symbolic link `%.255s'"
 msgstr "བརྡ་མཚོན་འབྲེལ་ལམ་ `%.255s' གསར་བསྐྲུན་འབདཝ་ད་འཛོལ་བ།"
 
-#: src/archives.c:413
+#: src/archives.c:783
 #, c-format
 msgid "error creating directory `%.255s'"
 msgstr "སྣོད་ཐོ་ `%.255s' གསར་བསྐྲུན་འབདཝ་ད་འཛོལ་བ།"
 
-#: src/archives.c
+#: src/archives.c:428
 #, c-format
 msgid "cannot compute MD5 hash for tar file '%.255s': %s"
 msgstr ""
 
-#: src/archives.c:460 src/archives.c:464
+#: src/archives.c:246 src/archives.c:250
 #, c-format
 msgid "error setting timestamps of `%.255s'"
 msgstr "`%.255s' གི་དུས་བཀོད་གཞི་སྒྲིག་འབད་ནིའི་འཛོལ་བ།"
 
-#: src/archives.c:476
+#: src/archives.c:262
 #, c-format
 msgid "error setting ownership of symlink `%.255s'"
 msgstr "བརྡ་མཚོན་འབྲེལ་ལམ་ `%.255s' གི་བདག་པོ་གཞི་སྒྲིག་འབདཝ་ད་འཛོལ་བ།"
 
-#: src/selinux.c
+#: src/archives.c:509
 msgid "cannot open security status notification channel"
 msgstr ""
 
-#: src/selinux.c
+#: src/archives.c:524
 msgid "cannot get security labeling handle"
 msgstr ""
 
-#: src/selinux.c
+#: src/archives.c:572
 #, c-format
 msgid "cannot set security context for file object '%s'"
 msgstr ""
 
-#: src/archives.c:605 src/archives.c:1143 utils/update-alternatives.c:319
+#: src/archives.c:832 utils/update-alternatives.c:322
 #, c-format
 msgid "unable to read link `%.255s'"
 msgstr "འབྲེལ་ལམ་ `%.255s' ལྷག་མ་ཚུགས།"
 
-#: src/archives.c src/configure.c
+#: src/archives.c:834 src/configure.c:423
 #, c-format
 msgid "symbolic link '%.250s' size has changed from %jd to %zd"
 msgstr ""
 
-#: src/archives.c
+#: src/archives.c:640
 #, c-format
 msgid ""
 "trying to overwrite shared '%.250s', which is different from other instances "
 "of package %.250s"
 msgstr ""
 
-#: src/archives.c:736
+#: src/archives.c:395
 #, c-format
 msgid "failed to stat (dereference) existing symlink `%.250s'"
 msgstr ""
 
-#: src/archives.c:758
+#: src/archives.c:417
 #, c-format
 msgid ""
 "failed to stat (dereference) proposed new symlink target `%.250s' for "
 "symlink `%.250s'"
 msgstr ""
 
-#: src/archives.c:818
+#: src/archives.c:475
 #, c-format
 msgid ""
 "trying to overwrite `%.250s', which is the diverted version of `%.250s' "
 "(package: %.100s)"
 msgstr ""
 
-#: src/archives.c:824
+#: src/archives.c:481
 #, c-format
 msgid ""
 "trying to overwrite `%.250s', which is the diverted version of `%.250s'"
 msgstr ""
 
-#: src/archives.c:854
+#: src/archives.c:511
 #, c-format
 msgid "unable to stat `%.255s' (which I was about to install)"
 msgstr "`%.255s' སི་ཊེཊི་འབད་མ་ཚུགས།(ང་གིས་གཞི་བཙུགས་འབད་ནི་འབད་མི་དེ)"
 
-#: src/archives.c:862
+#: src/archives.c:519
 #, c-format
 msgid ""
 "unable to clean up mess surrounding `%.255s' before installing another "
@@ -1565,271 +1572,283 @@
 "ཐོན་རིམ་གཞན་མི་ཅིག་གཞི་བཙུགས་མ་འབད་བའི་ཧེ་མ་ `%.255s' "
 "མཐའ་འཁོར་ཁམས་ལོག་སི་སི་ཚུ་བསལ་གཏང་ནི་འབད་མ་ཚུགས།"
 
-#: src/archives.c:868
+#: src/archives.c:525
 #, c-format
 msgid "unable to stat restored `%.255s' before installing another version"
 msgstr ""
 "ཐོན་རིམ་གཞན་མི་ཅིག་གཞི་བཙུགས་མ་འབད་བའི་ཧེ་མ་ སོར་ཆུད་འབད་ཡོད་པའི་ `%.255s' "
 "འདི་སི་ཊེཊི་འབད་མ་ཚུགས།"
 
-#: src/archives.c:904
+#: src/archives.c:561
 #, c-format
 msgid "archive contained object `%.255s' of unknown type 0x%x"
 msgstr "ཡིག་མཛོད་ཀྱི་ནང་ན་དངོས་པོ་ `%.255s' མ་ཤེས་པའི་དབྱེ་བ་ 0x%x འདུག"
 
-#: src/archives.c src/divertcmd.c utils/update-alternatives.c
+#: src/archives.c:626 src/divertcmd.c:150 utils/update-alternatives.c:682
+#: utils/update-alternatives.c:1222 utils/update-alternatives.c:1284
+#: utils/update-alternatives.c:1441 utils/update-alternatives.c:1680
+#: utils/update-alternatives.c:2167 utils/update-alternatives.c:2244
+#: utils/update-alternatives.c:2527
 #, c-format
 msgid "cannot stat file '%s'"
 msgstr ""
 
-#: src/archives.c
+#: src/archives.c:993
 #, c-format
 msgid "Replacing files in old package %s (%s) ...\n"
 msgstr ""
 
-#: src/archives.c
+#: src/archives.c:999
 #, c-format
 msgid "Replaced by files in installed package %s (%s) ...\n"
 msgstr ""
 
-#: src/archives.c
+#: src/archives.c:654
 #, c-format
 msgid ""
 "trying to overwrite directory '%.250s' in package %.250s %.250s with "
 "nondirectory"
 msgstr ""
 
-#: src/archives.c
+#: src/archives.c:661
 #, c-format
 msgid "trying to overwrite '%.250s', which is also in package %.250s %.250s"
 msgstr ""
 
-#: src/archives.c:1133
+#: src/archives.c:822
 #, c-format
 msgid "unable to move aside `%.255s' to install new version"
 msgstr "ཐོན་རིམ་གསརཔ་གཞི་བཙུགས་འབད་ནིའི་དོན་ལས་  `%.255s' ཟུར་ཁ་བཤུད་མ་ཚུགས།"
 
-#: src/archives.c:1150
+#: src/archives.c:839
 #, c-format
 msgid "unable to make backup symlink for `%.255s'"
 msgstr "`%.255s' གི་དོན་ལུ་རྒྱབ་ཐག་བརྡ་མཚོན་འབྲེལ་ལམ་བཟོ་མ་ཚུགས།"
 
-#: src/archives.c:1152
+#: src/archives.c:841
 #, c-format
 msgid "unable to chown backup symlink for `%.255s'"
 msgstr "`%.255s' གི་དོན་ལུ་རྒྱབ་ཐག་བརྡ་མཚོན་འབྲེལ་ལམ་ཅའུན་འབད་མ་ཚུགས།"
 
-#: src/archives.c:1157
+#: src/archives.c:846
 #, c-format
 msgid "unable to make backup link of `%.255s' before installing new version"
 msgstr ""
 "ཐོན་རིམ་གསརཔ་གཞི་བཙུགས་མ་འབད་བའི་ཧེ་མ་ `%.255s' "
 "གི་རྒྱབ་ཐག་འབྲེལ་ལམ་བཟོ་མ་ཚུགས།"
 
-#: src/archives.c:1174 src/archives.c:1264
+#: src/archives.c:863 src/archives.c:957
 #, c-format
 msgid "unable to install new version of `%.255s'"
 msgstr "`%.255s' གི་ཐོན་རིམ་གསརཔ་གཞི་བཙུགས་འབད་མ་ཚུགས།"
 
-#: src/archives.c
+#: src/archives.c:902 src/archives.c:945
 #, c-format
 msgid "unable to open '%.255s'"
 msgstr ""
 
-#: src/archives.c
+#: src/archives.c:947
 #, c-format
 msgid "unable to sync file '%.255s'"
 msgstr ""
 
-#: src/archives.c
+#: src/archives.c:1000
 #, c-format
 msgid ""
 "ignoring dependency problem with %s:\n"
 "%s"
 msgstr ""
 
-#: src/archives.c
+#: src/archives.c:1332
 #, c-format
 msgid ""
 "considering deconfiguration of essential\n"
 " package %s, to enable %s"
 msgstr ""
 
-#: src/archives.c
+#: src/archives.c:1336
 #, c-format
 msgid ""
 "no, %s is essential, will not deconfigure\n"
 " it in order to enable %s"
 msgstr ""
 
-#: src/archives.c
+#: src/archives.c:1345
 #, c-format
 msgid ""
 "no, cannot proceed with %s (--auto-deconfigure will help):\n"
 "%s"
 msgstr ""
 
-#: src/archives.c
+#: src/archives.c:1032
 #, c-format
 msgid "removal of %.250s"
 msgstr ""
 
-#: src/archives.c
+#: src/archives.c:1057
 #, c-format
 msgid "installation of %.250s"
 msgstr ""
 
-#: src/archives.c
+#: src/archives.c:1382
 #, c-format
 msgid "considering deconfiguration of %s, which would be broken by %s ..."
 msgstr ""
 
-#: src/archives.c
+#: src/archives.c:1388
 #, c-format
 msgid "yes, will deconfigure %s (broken by %s)"
 msgstr ""
 
-#: src/archives.c
+#: src/archives.c:1393 src/archives.c:1514
 #, c-format
 msgid ""
 "regarding %s containing %s:\n"
 "%s"
 msgstr ""
 
-#: src/archives.c
+#: src/archives.c:1077
 msgid "ignoring breakage, may proceed anyway!"
 msgstr ""
 
-#: src/archives.c
+#: src/archives.c:1082
 #, c-format
 msgid ""
 "installing %.250s would break %.250s, and\n"
 " deconfiguration is not permitted (--auto-deconfigure might help)"
 msgstr ""
 
-#: src/archives.c
+#: src/archives.c:1086
 #, c-format
 msgid "installing %.250s would break existing software"
 msgstr ""
 
-#: src/archives.c
+#: src/archives.c:1441
 #, c-format
 msgid "considering removing %s in favour of %s ..."
 msgstr ""
 
-#: src/archives.c
+#: src/archives.c:1447
 #, c-format
 msgid "%s is not properly installed; ignoring any dependencies on it"
 msgstr ""
 
-#: src/archives.c
+#: src/archives.c:1476
 #, c-format
 msgid "may have trouble removing %s, as it provides %s ..."
 msgstr ""
 
-#: src/archives.c
+#: src/archives.c:1491
 #, c-format
 msgid ""
 "package %s requires reinstallation, but will remove anyway as you requested"
 msgstr ""
 
-#: src/archives.c
+#: src/archives.c:1495
 #, c-format
 msgid "package %s requires reinstallation, will not remove"
 msgstr ""
 
-#: src/archives.c
+#: src/archives.c:1504
 #, c-format
 msgid "yes, will remove %s in favour of %s"
 msgstr ""
 
-#: src/archives.c
+#: src/archives.c:1190
 #, c-format
 msgid "conflicting packages - not installing %.250s"
 msgstr "མི་མུན་པའི་ཐུམ་སྒྲིལ་ཚུ་ -  %.250s གཞི་བཙུགས་མི་འབད།"
 
-#: src/archives.c
+#: src/archives.c:1191
 msgid "ignoring conflict, may proceed anyway!"
 msgstr ""
 
-#: src/archives.c
+#: src/archives.c:1235
 #, c-format
 msgid "--%s --recursive needs at least one path argument"
 msgstr "--%s --recursive ལུ་ཉུང་མཐའ་འགྲུལ་ལམ་སྒྲུབ་རྟགས་གཅིག་དགོ"
 
-#: src/archives.c
+#: src/archives.c:1245
 msgid "find for dpkg --recursive"
 msgstr ""
 
-#: src/archives.c
+#: src/archives.c:1266
 msgid "failed to fdopen find's pipe"
 msgstr "འཚོལ་ནིའི་རྒྱུད་དུང་ཨེཕ་ཌི་ཨོ་པཱན་འབད་ནི་འཐུས་ཤོར་བྱུང་ཡོད།"
 
-#: src/archives.c
+#: src/archives.c:1272
 msgid "error reading find's pipe"
 msgstr "འཚོལ་ནིའི་རྒྱུད་དུང་ལྷག་ནིའི་འཛོལ་བ།"
 
-#: src/archives.c
+#: src/archives.c:1273
 msgid "error closing find's pipe"
 msgstr "འཚོལ་ནིའི་རྒྱུད་དུང་ཁ་བསྡམ་ནིའི་འཛོལ་བ།"
 
-#: src/archives.c
+#: src/archives.c:1276
 #, c-format
 msgid "find for --recursive returned unhandled error %i"
 msgstr ""
 "--recursive གི་དོན་ལུ་འཚོལ་ནི་གིས་ལེགས་སྐྱོང་མ་འཐབ་པའི་འཛོལ་བ་ %i "
 "སླར་ལོག་འབད་ནུག"
 
-#: src/archives.c
+#: src/archives.c:1279
 msgid "searched, but found no packages (files matching *.deb)"
 msgstr ""
 "འཚོལ་ཞིབ་འབད་ཡོད་ དེ་འབདཝ་ད་ཐུམ་སྒྲིག་ཚུ་འཚོལ་མ་འཐོབ་(*.deb "
 "མཐུན་མི་ཡིག་སྣོད་ཚུ་)"
 
-#: src/archives.c
+#: src/archives.c:1290
 #, c-format
 msgid "--%s needs at least one package archive file argument"
 msgstr ""
 "--%s ལུ་ཉུང་མཐའ་ཐུམ་སྒྲིལ་ཡིག་མཛོད་ཡིག་སྣོད་ཀྱི་སྒྲུབ་རྟགས་གཅིག་དགོཔ་ཨིན།"
 
-#: 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 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:1325 src/divertcmd.c:78 src/divertcmd.c:118
+#: src/enquiry.c:166 src/enquiry.c:279 src/enquiry.c:449 src/enquiry.c:451
+#: src/enquiry.c:464 src/main.c:66 src/main.c:163 src/main.c:314
+#: src/main.c:493 src/packages.c:254 src/querycmd.c:252 src/querycmd.c:355
+#: src/querycmd.c:396 src/querycmd.c:404 src/querycmd.c:448 src/querycmd.c:517
+#: src/querycmd.c:606 src/querycmd.c:650 src/select.c:79 src/statcmd.c:68
+#: src/statcmd.c:98 src/trigcmd.c:58 src/trigcmd.c:90 dpkg-deb/build.c:441
+#: dpkg-deb/extract.c:217 dpkg-deb/extract.c:250 dpkg-deb/info.c:203
+#: dpkg-deb/info.c:265 dpkg-deb/main.c:60 dpkg-deb/main.c:126
+#: dpkg-split/info.c:257 dpkg-split/main.c:54 dpkg-split/main.c:98
+#: dpkg-split/queue.c:144 dpkg-split/queue.c:280
 msgid "<standard output>"
 msgstr ""
 
-#: src/archives.c src/packages.c src/querycmd.c src/select.c dpkg-split/main.c
-#: dpkg-split/queue.c
+#: src/archives.c:1326 src/packages.c:255 src/querycmd.c:253
+#: src/querycmd.c:353 src/querycmd.c:454 src/querycmd.c:518 src/select.c:80
+#: dpkg-split/main.c:169 dpkg-split/queue.c:218
 msgid "<standard error>"
 msgstr ""
 
-#: src/archives.c
+#: src/archives.c:1367
 #, c-format
 msgid "Selecting previously unselected package %s.\n"
 msgstr ""
 
-#: src/archives.c
+#: src/archives.c:1371
 #, c-format
 msgid "Skipping unselected package %s.\n"
 msgstr ""
 
-#: src/archives.c
+#: src/archives.c:1722
 #, c-format
 msgid "version %.250s of %.250s already installed, skipping"
 msgstr ""
 
-#: src/archives.c
+#: src/archives.c:1731
 #, c-format
 msgid "downgrading %.250s from %.250s to %.250s"
 msgstr ""
 
-#: src/archives.c
+#: src/archives.c:1737
 #, c-format
 msgid "will not downgrade %.250s from %.250s to %.250s, skipping"
 msgstr ""
 
-#: src/cleanup.c:87
+#: src/cleanup.c:86
 #, c-format
 msgid ""
 "unable to remove newly-installed version of `%.250s' to allow reinstallation "
@@ -1838,62 +1857,62 @@
 "གསརཔ་སྦེ་གཞི་བཙུགས་འབད་ཡོད་པའི་ `%.250s' "
 "ཐོན་རིམ་འདི་རྒྱབ་ཐག་འདྲ་བཤུས་ཀྱི་ལོག་གཞི་བཙུགས་འབད་ནི་རྩ་བསྐྲད་གཏང་མི་ཚུགས།"
 
-#: src/cleanup.c:94
+#: src/cleanup.c:93
 #, c-format
 msgid "unable to restore backup version of `%.250s'"
 msgstr "`%.250s' གི་རྒྱབ་ཐག་ཐོན་རིམ་སོར་ཆུད་འབད་མི་ཚུགས།"
 
-#: src/cleanup.c
+#: src/cleanup.c:97
 #, c-format
 msgid "unable to remove backup copy of '%.250s'"
 msgstr ""
 
-#: src/cleanup.c:102
+#: src/cleanup.c:101
 #, c-format
 msgid "unable to remove newly-installed version of `%.250s'"
 msgstr ""
 "`%.250s' གི་གསརཔ་སྦེ་གཞི་བཙུགས་འབད་འབད་བའི་ཐོན་རིམ་རྩ་བསྐྲད་གཏང་མི་ཚུགས།"
 
-#: src/cleanup.c:109
+#: src/cleanup.c:108
 #, c-format
 msgid "unable to remove newly-extracted version of `%.250s'"
 msgstr ""
 "`%.250s' "
 "གི་ཐོན་རིམ་གསརཔ་སྦེ་ཕྱིར་ཐོན་འབད་འབད་བའི་ཐོན་རིམ་རྩ་བསྐྲད་གཏང་མི་ཚུགས།"
 
-#: src/configure.c
+#: src/configure.c:98
 #, c-format
 msgid "Configuration file '%s'\n"
 msgstr ""
 
-#: src/configure.c
+#: src/configure.c:100
 #, c-format
 msgid "Configuration file '%s' (actually '%s')\n"
 msgstr ""
 
-#: src/configure.c
+#: src/configure.c:105
 #, c-format
 msgid ""
 " ==> File on system created by you or by a script.\n"
 " ==> File also in package provided by package maintainer.\n"
 msgstr ""
 
-#: src/configure.c
+#: src/configure.c:109
 #, c-format
 msgid "     Not modified since installation.\n"
 msgstr ""
 
-#: src/configure.c
+#: src/configure.c:111
 #, c-format
 msgid " ==> Modified (by you or by a script) since installation.\n"
 msgstr ""
 
-#: src/configure.c
+#: src/configure.c:112
 #, c-format
 msgid " ==> Deleted (by you or by a script) since installation.\n"
 msgstr ""
 
-#: src/configure.c
+#: src/configure.c:619
 #, c-format
 msgid " ==> Package distributor has shipped an updated version.\n"
 msgstr ""
@@ -1901,35 +1920,35 @@
 "ཐུམ་སྒྲིལ་བགོ་འགྲེམ་པ་གིས་དུས་མཐུན་བཟོ་ཡོད་པའི་ཐོན་རིམ་ཅིག་སྐྱེལ་འདྲེན་འབད་ནུ"
 "ག\n"
 
-#: src/configure.c
+#: src/configure.c:620
 #, c-format
 msgid "     Version in package is the same as at last installation.\n"
 msgstr ""
 "     "
 "ཐུམ་སྒྲིལ་ནང་གི་ཐོན་རིམ་འདི་མཇུག་ལུ་གཞི་བཙུགས་འབད་ཡོད་མི་དང་གཅིག་པ་ཨིན།\n"
 
-#: src/configure.c
+#: src/configure.c:628
 #, c-format
 msgid " ==> Using new file as you requested.\n"
 msgstr " ==> ཁྱོད་ཀྱི་ཞུ་བ་འབད་དོ་བཟུམ་སྦེ་ཡིག་སྣོད་གསརཔ་ལག་ལེན་འཐབ་དོ།\n"
 
-#: src/configure.c
+#: src/configure.c:632
 #, c-format
 msgid " ==> Using current old file as you requested.\n"
 msgstr ""
 " ==> ཁྱོད་ཀྱི་ཞུ་བ་འབད་དོ་བཟུམ་སྦེ་ ད་ལྟོའི་ཡིག་སྣོད་རྙིངམ་ལག་ལེན་འཐབ་དོ།\n"
 
-#: src/configure.c
+#: src/configure.c:641
 #, c-format
 msgid " ==> Keeping old config file as default.\n"
 msgstr " ==> རིམ་སྒྲིག་ཡིག་སྣོད་རྙིངམ་འདི་སྔོན་སྒྲིག་སྦེ་བཞག་དོ།\n"
 
-#: src/configure.c
+#: src/configure.c:645
 #, c-format
 msgid " ==> Using new config file as default.\n"
 msgstr " ==> རིམ་སྒྲིག་ཡིག་སྣོད་འདི་སྔོན་སྒྲིག་སྦེ་ལག་ལེན་འཐབ་དོ།\n"
 
-#: src/configure.c
+#: src/configure.c:652
 #, c-format
 msgid ""
 "   What would you like to do about it ?  Your options are:\n"
@@ -1939,66 +1958,66 @@
 "      Z     : start a shell to examine the situation\n"
 msgstr ""
 
-#: src/configure.c
+#: src/configure.c:659
 #, c-format
 msgid " The default action is to keep your current version.\n"
 msgstr " སྔོན་སྒྲིག་གི་བྱ་བ་འདི་ཁྱོད་ཀྱི་ད་ལྟོའི་ཐོན་རིམ་བཞག་ནི་འདི་ཨིན།\n"
 
-#: src/configure.c
+#: src/configure.c:661
 #, c-format
 msgid " The default action is to install the new version.\n"
 msgstr " སྔོན་སྒྲིག་གི་བྱ་བ་འདི་ཐོན་རིམ་གསརཔ་གཞི་བཙུགས་འབད་ནི་འདི་ཨིན།\n"
 
-#: src/configure.c
+#: src/configure.c:666
 msgid "[default=N]"
 msgstr "[སྔོན་སྒྲིག་=ཨེན་]"
 
-#: src/configure.c
+#: src/configure.c:667
 msgid "[default=Y]"
 msgstr "[སྔོན་སྒྲིག་=ཝའི]"
 
-#: src/configure.c
+#: src/configure.c:668
 msgid "[no default]"
 msgstr "[སྔོན་སྒྲིག་མེད]"
 
-#: src/configure.c
+#: src/configure.c:671
 msgid "error writing to stderr, discovered before conffile prompt"
 msgstr ""
 "ཨེསི་ཊི་ཌི་ཨི་ཨར་ཨར་ལུ་འབྲིཝ་ད་འཛོལ་བ། "
 "རིམ་སྒྲིག་ཡིག་སྣོད་ནུས་སྤེལ་གྱི་ཧེ་མ་གསར་རྙེད་འབད་ཡོདཔ།"
 
-#: src/configure.c
+#: src/configure.c:680
 msgid "read error on stdin at conffile prompt"
 msgstr "རིམ་སྒྲིག་ཡིག་སྣོད་ནུས་སྤེལ་ལུ་ཨེསི་ཊི་ཌི་ཨིན་གུ་ལྷག་པའི་འཛོལ་བ།"
 
-#: src/configure.c:178
+#: src/configure.c:681
 msgid "EOF on stdin at conffile prompt"
 msgstr "རིམ་སྒྲིག་ཡིག་སྣོད་ནུས་སྤེལ་ལུའི་ཨེསི་ཊི་ཌི་ཨིན་གུ་ཨི་ཨོ་ཨེཕ།"
 
-#: src/configure.c
+#: src/configure.c:522 src/configure.c:526
 msgid "conffile difference visualizer"
 msgstr ""
 
-#: src/configure.c:232
+#: src/configure.c:543
 msgid "Type `exit' when you're done.\n"
 msgstr "ཁྱོད་འབད་ཚར་བའི་སྐབས་ `exit' ཡིག་དཔར་རྐྱབས།\n"
 
-#: src/configure.c
+#: src/configure.c:552 src/configure.c:556
 msgid "conffile shell"
 msgstr ""
 
-#: src/configure.c
+#: src/configure.c:104
 #, c-format
 msgid "unable to stat new distributed conffile '%.250s'"
 msgstr ""
 
-#: src/configure.c:413
+#: src/configure.c:114
 #, c-format
 msgid "unable to stat current installed conffile `%.250s'"
 msgstr ""
 "ད་ལྟོ་གཞི་བཙུགས་འབད་ཡོད་པའི་རིམ་སྒྲིག་ཡིག་སྣོད་ `%.250s' སི་ཊེཊི་འབད་མ་ཚུགས།"
 
-#: src/configure.c:425
+#: src/configure.c:126
 #, c-format
 msgid ""
 "\n"
@@ -2009,59 +2028,59 @@
 "རིམ་སྒྲིག་ཡིག་སྣོད་ `%s' རིམ་ལུགས་གུ་ལུ་མེད།\n"
 "ཁྱོད་ཀྱིས་ཞུ་བ་འབད་དོ་བཟུམ་སྦེ་རིམ་སྒྲིག་ཡིག་སྣོད་གསརཔ་གཞི་བཙུགས་འབད་དོ།\n"
 
-#: src/configure.c
+#: src/configure.c:168
 #, c-format
 msgid "%s: failed to remove old backup '%.250s': %s"
 msgstr ""
 
-#: src/configure.c
+#: src/configure.c:176
 #, c-format
 msgid "%s: failed to rename '%.250s' to '%.250s': %s"
 msgstr ""
 
-#: src/configure.c
+#: src/configure.c:182
 #, c-format
 msgid "%s: failed to remove '%.250s': %s"
 msgstr ""
 
-#: src/configure.c
+#: src/configure.c:188
 #, c-format
 msgid "%s: failed to remove old distributed version '%.250s': %s"
 msgstr ""
 
-#: src/configure.c
+#: src/configure.c:192
 #, c-format
 msgid "%s: failed to remove '%.250s' (before overwrite): %s"
 msgstr ""
 
-#: src/configure.c
+#: src/configure.c:196
 #, c-format
 msgid "%s: failed to link '%.250s' to '%.250s': %s"
 msgstr ""
 
-#: src/configure.c
+#: src/configure.c:200
 #, c-format
 msgid "Installing new version of config file %s ...\n"
 msgstr "རིམ་སྒྲིག་ཡིག་སྣོད་ %s གི་ཐོན་རིམ་གསརཔ་གཞི་བཙུགས་འབད་དོ་...\n"
 
-#: src/configure.c:512 utils/update-alternatives.c:488
+#: src/configure.c:206 utils/update-alternatives.c:546
 #, c-format
 msgid "unable to install `%.250s' as `%.250s'"
 msgstr "`%.250s' འདི་ `%.250s' སྦེ་གཞི་བཙུགས་འབད་མ་ཚུགས།"
 
-#: src/configure.c:564
+#: src/configure.c:257
 #, c-format
 msgid "no package named `%s' is installed, cannot configure"
 msgstr ""
 "`%s' སྦེ་མིང་བཏགས་ཡོད་པའི་ཐུམ་སྒྲིལ་ག་ནི་ཡང་གཞི་བཙུགས་མ་འབད་ "
 "རིམ་སྒྲིག་འབད་མི་ཚུགས།"
 
-#: src/configure.c
+#: src/configure.c:260
 #, c-format
 msgid "package %.250s is already installed and configured"
 msgstr "ཐུམ་སྒྲིལ་ %.250s འདི་ཧེ་མ་ལས་གཞི་བཙུགས་དང་རིམ་སྒྲིག་འབད་ཡོདཔ་ཨིན།"
 
-#: src/configure.c:571
+#: src/configure.c:263
 #, c-format
 msgid ""
 "package %.250s is not ready for configuration\n"
@@ -2070,228 +2089,229 @@
 "ཐུམ་སྒྲིལ་ %.250s འདི་རིམ་སྒྲིག་གི་དོན་ལུ་གྲ་སྒྲིག་མེད།\n"
 " རིམ་སྒྲིག་འབད་མི་ཚུགས་(ད་ལྟའི་གནས་ཚད་ `%.250s')"
 
-#: src/configure.c
+#: src/configure.c:581
 #, c-format
 msgid ""
 "package %s cannot be configured because %s is not ready (current status '%s')"
 msgstr ""
 
-#: src/configure.c
+#: src/configure.c:589
 #, c-format
 msgid ""
 "package %s %s cannot be configured because %s is at a different version (%s)"
 msgstr ""
 
-#: src/configure.c
+#: src/configure.c:625
 #, c-format
 msgid ""
 "dependency problems prevent configuration of %s:\n"
 "%s"
 msgstr ""
 
-#: src/configure.c
+#: src/configure.c:297
 msgid "dependency problems - leaving unconfigured"
 msgstr "རྟེན་འབྲེལ་གྱི་དཀའ་ངལ་ཚུ་ - རིམ་སྒྲིག་མ་འབད་བར་བཞག་དོ།"
 
-#: src/configure.c
+#: src/configure.c:631
 #, c-format
 msgid ""
 "%s: dependency problems, but configuring anyway as you requested:\n"
 "%s"
 msgstr ""
 
-#: src/configure.c
+#: src/configure.c:639
 msgid ""
 "package is in a very bad inconsistent state; you should\n"
 " reinstall it before attempting configuration"
 msgstr ""
 
-#: src/configure.c
+#: src/configure.c:312
 #, c-format
 msgid "Setting up %s (%s) ...\n"
 msgstr "%s (%s) གཞི་སྒྲིག་འབད་དོ་...\n"
 
-#: src/configure.c
+#: src/configure.c:396
 #, c-format
 msgid ""
 "%s: unable to stat config file '%s'\n"
 " (= '%s'): %s"
 msgstr ""
 
-#: src/configure.c
+#: src/configure.c:409
 #, c-format
 msgid ""
 "%s: config file '%s' is a circular link\n"
 " (= '%s')"
 msgstr ""
 
-#: src/configure.c
+#: src/configure.c:418
 #, c-format
 msgid ""
 "%s: unable to readlink conffile '%s'\n"
 " (= '%s'): %s"
 msgstr ""
 
-#: src/configure.c
+#: src/configure.c:444
 #, c-format
 msgid ""
 "%s: conffile '%.250s' resolves to degenerate filename\n"
 " ('%s' is a symlink to '%s')"
 msgstr ""
 
-#: src/configure.c
+#: src/configure.c:460
 #, c-format
 msgid "%s: conffile '%.250s' is not a plain file or symlink (= '%s')"
 msgstr ""
 
-#: src/configure.c dpkg-split/split.c
+#: src/configure.c:825 dpkg-split/split.c:142
 #, c-format
 msgid "cannot compute MD5 hash for file '%s': %s"
 msgstr ""
 
-#: src/configure.c
+#: src/configure.c:832
 #, c-format
 msgid "%s: unable to open %s for hash: %s"
 msgstr ""
 
-#: src/depcon.c
+#: src/depcon.c:175
 #, c-format
 msgid "%s depends on %s"
 msgstr "%s ལུ་རྟེནམ་ཨིན %s"
 
-#: src/depcon.c
+#: src/depcon.c:178
 #, c-format
 msgid "%s pre-depends on %s"
 msgstr "%s ལུ་གུ་སྔོན་-རྟེནམ་ཨིན %s"
 
-#: src/depcon.c
+#: src/depcon.c:181
 #, c-format
 msgid "%s recommends %s"
 msgstr "%sའོས་སྦྱོར་འབདཝ་ཨིན %s"
 
-#: src/depcon.c
+#: src/depcon.c:184
 #, c-format
 msgid "%s suggests %s"
 msgstr "%s བསམ་འཆར་བཀོདཔ་ཨིན %s"
 
-#: src/depcon.c
+#: src/depcon.c:187
 #, c-format
 msgid "%s breaks %s"
 msgstr "%s བར་མཚམས་ཚུ %s"
 
-#: src/depcon.c
+#: src/depcon.c:190
 #, c-format
 msgid "%s conflicts with %s"
 msgstr "%s དང་གཅིག་ཁར་མི་མཐུནམ་ཨིན %s"
 
-#: src/depcon.c
+#: src/depcon.c:193
 #, c-format
 msgid "%s enhances %s"
 msgstr "%s གོང་སྤེལ་ཚུ %s"
 
-#: src/depcon.c
+#: src/depcon.c:296
 #, c-format
 msgid "  %.250s is to be removed.\n"
 msgstr "  %.250s འདི་རྩ་བསྐྲད་གཏང་དགོཔ་ཨིན།\n"
 
-#: src/depcon.c
+#: src/depcon.c:299
 #, c-format
 msgid "  %.250s is to be deconfigured.\n"
 msgstr "  %.250s འདི་རིམ་སྒྲིག་མ་འབད་བར་བཞག་དགོཔ་ཨིན།\n"
 
-#: src/depcon.c
+#: src/depcon.c:304
 #, c-format
 msgid "  %.250s is to be installed, but is version %.250s.\n"
 msgstr ""
 "  %.250s འདི་གཞི་བཙུགས་འབད་དགོཔ་ཨིན་། དེ་འབདཝ་ད་འདི་ཐོན་རིམ་ %.250s ཨིན།\n"
 
-#: src/depcon.c
+#: src/depcon.c:314
 #, c-format
 msgid "  %.250s is installed, but is version %.250s.\n"
 msgstr "  %.250s འདི་བཤུབ་ཡོད། དེ་འབདཝ་ད་འདི་ཐོན་རིམ་ %.250s ཨིན།\n"
 
-#: src/depcon.c
+#: src/depcon.c:333
 #, c-format
 msgid "  %.250s is unpacked, but has never been configured.\n"
 msgstr "  %.250s འདི་བཤུབ་ཡོད། དེ་འབདཝ་ད་འདི་ནམ་ཡང་རིམ་སྒྲིག་མ་འབད་བས།\n"
 
-#: src/depcon.c
+#: src/depcon.c:337
 #, c-format
 msgid "  %.250s is unpacked, but is version %.250s.\n"
 msgstr "  %.250s འདི་བཤུབ་ཡོད། དེ་འབདཝ་ད་འདི་ཐོན་རིམ་ %.250s ཨིན།\n"
 
-#: src/depcon.c
+#: src/depcon.c:343
 #, c-format
 msgid "  %.250s latest configured version is %.250s.\n"
 msgstr "  %.250s གིས་མཐའ་མཇུག་རིམ་སྒྲིག་འབད་མི་ཐོན་རིམ་འདི་ %.250s ཨིན།\n"
 
-#: src/depcon.c
+#: src/depcon.c:353
 #, c-format
 msgid "  %.250s is %s.\n"
 msgstr "  %.250s འདི་ %s ཨིན།\n"
 
-#: src/depcon.c
+#: src/depcon.c:388
 #, c-format
 msgid "  %.250s provides %.250s but is to be removed.\n"
 msgstr ""
 "  %.250s གིས་ %.250s བྱིནམ་ཨིན་ དེ་འབདཝ་ད་འདི་རྩ་བསྐྲད་གཏང་དགོཔ་ཨིན།\n"
 
-#: src/depcon.c
+#: src/depcon.c:392
 #, c-format
 msgid "  %.250s provides %.250s but is to be deconfigured.\n"
 msgstr ""
 "  %.250s གིས་ %.250s བྱིནམ་ཨིན་ "
 "དེ་འབདཝ་ད་འདི་རིམ་སྒྲིག་མ་འབད་བར་བཞག་དགོཔ་ཨིན།\n"
 
-#: src/depcon.c
+#: src/depcon.c:401
 #, c-format
 msgid "  %.250s provides %.250s but is %s.\n"
 msgstr "  %.250s གིས་ %.250s བྱིནམ་ཨིན་ དེ་འབདཝ་ད་འདི་ %s ཨིན།\n"
 
-#: src/depcon.c
+#: src/depcon.c:415
 #, c-format
 msgid "  %.250s is not installed.\n"
 msgstr "  %.250s འདི་གཞུ་བཙུགས་མ་འབད་བས།\n"
 
-#: src/depcon.c
+#: src/depcon.c:443
 #, c-format
 msgid "  %.250s (version %.250s) is to be installed.\n"
 msgstr "  %.250s (ཐོན་རིམ་ %.250s) འདི་གཞི་བཙུགས་འབད་དགོཔ་ཨིན།\n"
 
-#: src/depcon.c
+#: src/depcon.c:468
 #, c-format
 msgid "  %.250s (version %.250s) is present and %s.\n"
 msgstr ""
 
-#: src/depcon.c
+#: src/depcon.c:495
 #, c-format
 msgid "  %.250s provides %.250s and is to be installed.\n"
 msgstr "  %.250s གིས་   %.250s བྱིནམ་ཨིན་ དེ་ལས་འདི་གཞི་བཙུགས་འབད་དགོ་ཨིན།\n"
 
-#: src/depcon.c
+#: src/depcon.c:537
 #, c-format
 msgid "  %.250s provides %.250s and is present and %s.\n"
 msgstr ""
 
-#: src/divertcmd.c
+#: src/divertcmd.c:50
 msgid "Use --help for help about diverting files."
 msgstr ""
 
-#: src/divertcmd.c src/statcmd.c utils/update-alternatives.c
+#: src/divertcmd.c:66 src/statcmd.c:57 utils/update-alternatives.c:80
 #, c-format
 msgid "Debian %s version %s.\n"
 msgstr "ཌེ་བི་ཡཱན་ %s ཐོན་རིམ་ %s\n"
 
-#: src/divertcmd.c src/main.c src/querycmd.c src/statcmd.c src/trigcmd.c
-#: dpkg-deb/main.c dpkg-split/main.c utils/update-alternatives.c
+#: src/divertcmd.c:75 src/main.c:63 src/querycmd.c:603 src/statcmd.c:65
+#: src/trigcmd.c:55 dpkg-deb/main.c:57 dpkg-split/main.c:51
+#: utils/update-alternatives.c:89
 #, c-format
 msgid ""
 "This is free software; see the GNU General Public License version 2 or\n"
 "later for copying conditions. There is NO warranty.\n"
 msgstr ""
 
-#: src/divertcmd.c src/main.c src/querycmd.c src/statcmd.c dpkg-deb/main.c
-#: dpkg-split/main.c utils/update-alternatives.c
+#: src/divertcmd.c:87 src/main.c:81 src/querycmd.c:615 src/statcmd.c:77
+#: dpkg-deb/main.c:69 dpkg-split/main.c:63 utils/update-alternatives.c:97
 #, c-format
 msgid ""
 "Usage: %s [<option> ...] <command>\n"
@@ -2300,7 +2320,7 @@
 "ལག་ལེན་: %s [<option> ...] <command>\n"
 "\n"
 
-#: src/divertcmd.c
+#: src/divertcmd.c:91
 #, c-format
 msgid ""
 "Commands:\n"
@@ -2312,7 +2332,7 @@
 "\n"
 msgstr ""
 
-#: src/divertcmd.c
+#: src/divertcmd.c:100
 #, c-format
 msgid ""
 "Options:\n"
@@ -2330,7 +2350,7 @@
 "\n"
 msgstr ""
 
-#: src/divertcmd.c
+#: src/divertcmd.c:114
 #, c-format
 msgid ""
 "When adding, default is --local and --divert <original>.distrib.\n"
@@ -2339,12 +2359,12 @@
 "divert.\n"
 msgstr ""
 
-#: src/divertcmd.c
+#: src/divertcmd.c:168
 #, c-format
 msgid "error checking '%s'"
 msgstr ""
 
-#: src/divertcmd.c:201
+#: src/divertcmd.c:203
 #, c-format
 msgid ""
 "rename involves overwriting `%s' with\n"
@@ -2354,111 +2374,112 @@
 "  ཡིག་སྣོད་ `%s' སོ་སོ་དང་དང་ཅིག་ཁར་ཚབ་སྲུང་འབད་ནི་དང་འབྲེལ་བ་འབདཝ་ཨིན། "
 "འབད་མི་ཆོག"
 
-#: src/divertcmd.c utils/update-alternatives.c
+#: src/divertcmd.c:223 utils/update-alternatives.c:1373
 #, c-format
 msgid "unable to create file '%s'"
 msgstr ""
 
-#: src/divertcmd.c
+#: src/divertcmd.c:227
 #, c-format
 msgid "cannot copy '%s' to '%s': %s"
 msgstr ""
 
-#: src/divertcmd.c
+#: src/divertcmd.c:239
 #, c-format
 msgid "cannot rename '%s' to '%s'"
 msgstr ""
 
-#: src/divertcmd.c
+#: src/divertcmd.c:252
 #, c-format
 msgid "rename: remove duplicate old link '%s'"
 msgstr ""
 
-#: src/divertcmd.c
+#: src/divertcmd.c:262
 #, c-format
 msgid "unable to remove copied source file '%s'"
 msgstr ""
 
-#: src/divertcmd.c
+#: src/divertcmd.c:409 src/divertcmd.c:430
 #, c-format
 msgid "filename \"%s\" is not absolute"
 msgstr "ཡིག་སྣོད་མིང་ \"%s\" འདི་ཡང་དག་མེན།"
 
-#: src/divertcmd.c
+#: src/divertcmd.c:411 src/statcmd.c:249
 msgid "file may not contain newlines"
 msgstr "ཡིག་སྣོད་ཚུ་ནང་གྲལ་ཐིག་གསརཔ་ཚུ་མེདཔ་འོང་།"
 
-#: src/divertcmd.c
+#: src/divertcmd.c:284
 #, c-format
 msgid "local diversion of %s"
 msgstr ""
 
-#: src/divertcmd.c
+#: src/divertcmd.c:286
 #, c-format
 msgid "local diversion of %s to %s"
 msgstr ""
 
-#: src/divertcmd.c
+#: src/divertcmd.c:290
 #, c-format
 msgid "diversion of %s by %s"
 msgstr ""
 
-#: src/divertcmd.c
+#: src/divertcmd.c:293
 #, c-format
 msgid "diversion of %s to %s by %s"
 msgstr ""
 
-#: src/divertcmd.c
+#: src/divertcmd.c:309
 #, c-format
 msgid "any diversion of %s"
 msgstr ""
 
-#: src/divertcmd.c
+#: src/divertcmd.c:311
 #, c-format
 msgid "any diversion of %s to %s"
 msgstr ""
 
-#: src/divertcmd.c src/statcmd.c
+#: src/divertcmd.c:406 src/divertcmd.c:503 src/divertcmd.c:610
+#: src/divertcmd.c:630 src/statcmd.c:290
 #, c-format
 msgid "--%s needs a single argument"
 msgstr "--%s་ལུ་སྒྲུབ་རྟགས་རྐྱང་པ་ཅིག་དགོཔ་འདུག"
 
-#: src/divertcmd.c
+#: src/divertcmd.c:436
 msgid "cannot divert directories"
 msgstr ""
 
-#: src/divertcmd.c
+#: src/divertcmd.c:433
 #, c-format
 msgid "cannot divert file '%s' to itself"
 msgstr ""
 
-#: src/divertcmd.c
+#: src/divertcmd.c:453
 #, c-format
 msgid "Leaving '%s'\n"
 msgstr ""
 
-#: src/divertcmd.c:474
+#: src/divertcmd.c:458
 #, c-format
 msgid "`%s' clashes with `%s'"
 msgstr "`%s' འདི་ `%s' དང་ཅིག་ཁར་རྡབ་འཁྲུག་བྱུངམ་ཨིན།"
 
-#: src/divertcmd.c
+#: src/divertcmd.c:481
 #, c-format
 msgid "Adding '%s'\n"
 msgstr ""
 
-#: src/divertcmd.c
+#: src/divertcmd.c:503
 #, c-format
 msgid ""
 "Ignoring request to rename file '%s' owned by diverting package '%s'\n"
 msgstr ""
 
-#: src/divertcmd.c
+#: src/divertcmd.c:510
 #, c-format
 msgid "No diversion '%s', none removed.\n"
 msgstr ""
 
-#: src/divertcmd.c:583
+#: src/divertcmd.c:525
 #, c-format
 msgid ""
 "mismatch on divert-to\n"
@@ -2469,7 +2490,7 @@
 "   `%s'རྩ་བསྐྲད་གཏང་པའི་སྐབས་\n"
 "   `%s' འཐོབ་ཡོད།"
 
-#: src/divertcmd.c:590
+#: src/divertcmd.c:532
 #, c-format
 msgid ""
 "mismatch on package\n"
@@ -2480,38 +2501,38 @@
 "  `%s' རྩ་བསྐྲད་གཏང་པའི་སྐབས་\n"
 "  `%s' འཐོབ་ཡོད།"
 
-#: src/divertcmd.c
+#: src/divertcmd.c:600
 #, c-format
 msgid "Ignoring request to remove shared diversion '%s'.\n"
 msgstr ""
 
-#: src/divertcmd.c
+#: src/divertcmd.c:539
 #, c-format
 msgid "Removing '%s'\n"
 msgstr ""
 
-#: src/divertcmd.c
+#: src/divertcmd.c:657
 msgid "package may not contain newlines"
 msgstr "ཐུམ་སྒྲིལ་ལུ་གྲལ་ཐིག་གསརཔ་མེདཔ་འོང་།"
 
-#: src/divertcmd.c
+#: src/divertcmd.c:666
 msgid "divert-to may not contain newlines"
 msgstr "ལུ་-ཁ་ཕྱོགས་སྒྱུར་བ་འདི་ནང་ལུ་གྲལ་ཐིག་གསརཔ་ཚུ་མེདཔ་འོང་།"
 
-#: src/divertdb.c
+#: src/divertdb.c:64
 msgid "failed to open diversions file"
 msgstr "ཁ་སྒྱུར་ཡིག་སྣོད་ཁ་ཕྱེ་ནི་འཐུས་ཤོར་བྱུང་ཡོད།"
 
-#: src/divertdb.c
+#: src/divertdb.c:73
 msgid "failed to fstat diversions file"
 msgstr "ཁ་སྒྱུར་ཡིག་སྣོད་ཨེཕ་སི་ཊེཊི་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།"
 
-#: src/divertdb.c:122
+#: src/divertdb.c:113
 #, c-format
 msgid "conflicting diversions involving `%.250s' or `%.250s'"
 msgstr "`%.250s' ཡང་ན་ `%.250s' འབྲེལ་བ་ཡོད་མི་མི་མཐུན་པའི་ཁ་སྒྱུར་ཚུ།"
 
-#: src/enquiry.c
+#: src/enquiry.c:73
 msgid ""
 "The following packages are in a mess due to serious problems during\n"
 "installation.  They must be reinstalled for them (and any packages\n"
@@ -2522,7 +2543,7 @@
 "དེ་ཚུ་གི་དོན་ལུ་ལོག་འགོ་བཙུགས་དགོ་(དེ་ལས་ཐུམ་སྒྲིལ་ཚུ་\n"
 "ཁོང་ལུ་བརྟེན་མི་)ལེ་ཤོམ་སྦེ་ལས་འགན་གྲུབ་ནིའི་དོན་ལུ་:\n"
 
-#: src/enquiry.c
+#: src/enquiry.c:80
 msgid ""
 "The following packages have been unpacked but not yet configured.\n"
 "They must be configured using dpkg --configure or the configure\n"
@@ -2533,7 +2554,7 @@
 "dpkg --configure ཡང་ན་ སེལ་འཐུ་མི་འབད་ནི་ནང་གི་རིམ་སྒྲིག་དཀར་ཆ་གདམ་ཁ་ "
 "ལག་ལེན་ཐའབ་ཐོག་རིམ་སྒྲིག་འབད་དགོ:\n"
 
-#: src/enquiry.c
+#: src/enquiry.c:87
 msgid ""
 "The following packages are only half configured, probably due to problems\n"
 "configuring them the first time.  The configuration should be retried using\n"
@@ -2546,7 +2567,7 @@
 "སེལ་འཐུ་མི་འབད་ནི་ནང་གི་རིམ་སྒྲིག་དཀར་ཆག་གདམ་ཁ་འདི་ལག་ལེན་འཐབ་ཐོག་ལོག་འབད་རྩོ"
 "ལ་བསྐྱེད་དགོ:\n"
 
-#: src/enquiry.c
+#: src/enquiry.c:94
 msgid ""
 "The following packages are only half installed, due to problems during\n"
 "installation.  The installation can probably be completed by retrying it;\n"
@@ -2558,181 +2579,183 @@
 "ཐུམ་སྒྲིལ་ཚུ་སེལ་འཐུ་མི་འབད་ནི་ཡང་ན་dpkg --remove "
 "ལག་ལེན་འཐབ་ཐོག་རྩ་བསྐྲད་གཏང་ཚུགས་:\n"
 
-#: src/enquiry.c
+#: src/enquiry.c:101
 msgid ""
 "The following packages are awaiting processing of triggers that they\n"
 "have activated in other packages.  This processing can be requested using\n"
 "dselect or dpkg --configure --pending (or dpkg --triggers-only):\n"
 msgstr ""
 
-#: src/enquiry.c
+#: src/enquiry.c:108
 msgid ""
 "The following packages have been triggered, but the trigger processing\n"
 "has not yet been done.  Trigger processing can be requested using\n"
 "dselect or dpkg --configure --pending (or dpkg --triggers-only):\n"
 msgstr ""
 
-#: src/enquiry.c
+#: src/enquiry.c:137
 msgid ""
 "The following packages are missing the list control file in the\n"
 "database, they need to be reinstalled:\n"
 msgstr ""
 
-#: src/enquiry.c
+#: src/enquiry.c:143
 msgid ""
 "The following packages are missing the md5sums control file in the\n"
 "database, they need to be reinstalled:\n"
 msgstr ""
 
-#: src/enquiry.c
+#: src/enquiry.c:148
 msgid "The following packages do not have an architecture:\n"
 msgstr ""
 
-#: src/enquiry.c
+#: src/enquiry.c:152
 msgid "The following packages have an illegal architecture:\n"
 msgstr ""
 
-#: src/enquiry.c
+#: src/enquiry.c:157
 msgid ""
 "The following packages have an unknown foreign architecture, which will\n"
 "cause dependency issues on front-ends. This can be fixed by registering\n"
 "the foreign architecture with dpkg --add-architecture:\n"
 msgstr ""
 
-#: src/enquiry.c src/select.c src/trigcmd.c src/update.c dpkg-split/queue.c
+#: src/enquiry.c:137 src/enquiry.c:211 src/enquiry.c:292 src/enquiry.c:373
+#: src/enquiry.c:460 src/select.c:98 src/select.c:164 src/trigcmd.c:199
+#: src/update.c:48 src/update.c:113 dpkg-split/queue.c:232
 #, c-format
 msgid "--%s takes no arguments"
 msgstr "--%s གི་སྒྲུབ་རྟགས་གཅིག་ཡང་མི་འབག"
 
-#: src/enquiry.c
+#: src/enquiry.c:152
 msgid ""
 "Another process has locked the database for writing, and might currently be\n"
 "modifying it, some of the following problems might just be due to that.\n"
 msgstr ""
 
-#: src/enquiry.c
+#: src/enquiry.c:191
 msgctxt "section"
 msgid "<unknown>"
 msgstr ""
 
-#: src/enquiry.c
+#: src/enquiry.c:251
 #, c-format
 msgid " %d in %s: "
 msgstr " %d  %s ནང་: "
 
-#: src/enquiry.c
+#: src/enquiry.c:266
 #, c-format
 msgid " %d package, from the following section:"
 msgid_plural " %d packages, from the following sections:"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/enquiry.c
+#: src/enquiry.c:305
 #, c-format
 msgid ""
 "Version of dpkg with working %s support not yet configured.\n"
 " Please use 'dpkg --configure dpkg', and then try again.\n"
 msgstr ""
 
-#: src/enquiry.c
+#: src/enquiry.c:310
 #, c-format
 msgid "dpkg not recorded as installed, cannot check for %s support!\n"
 msgstr ""
 
-#: src/enquiry.c
+#: src/enquiry.c:321
 msgid "Pre-Depends field"
 msgstr ""
 
-#: src/enquiry.c
+#: src/enquiry.c:329
 msgid "epoch"
 msgstr ""
 
-#: src/enquiry.c
+#: src/enquiry.c:337
 msgid "long filenames"
 msgstr ""
 
-#: src/enquiry.c
+#: src/enquiry.c:346
 msgid "multiple Conflicts and Replaces"
 msgstr ""
 
-#: src/enquiry.c
+#: src/enquiry.c:407
 msgid "multi-arch"
 msgstr ""
 
-#: src/enquiry.c
+#: src/enquiry.c:507
 #, c-format
 msgid ""
 "cannot see how to satisfy pre-dependency:\n"
 " %s"
 msgstr ""
 
-#: src/enquiry.c
+#: src/enquiry.c:435
 #, c-format
 msgid "cannot satisfy pre-dependencies for %.250s (wanted due to %.250s)"
 msgstr ""
 "%.250s གི་དོན་ལུ་སྔོན་-རྟེན་འབྲེལ་ངལ་རངས་མི་ཚུགས་(%.250s གི་དོན་ལས་དགོཔ་)"
 
-#: src/enquiry.c dpkg-deb/main.c
+#: src/enquiry.c:546 dpkg-deb/main.c:169 dpkg-deb/main.c:178
 #, c-format
 msgid "obsolete option '--%s'; please use '--%s' instead"
 msgstr ""
 
-#: src/enquiry.c
+#: src/enquiry.c:519
 msgid ""
 "--compare-versions takes three arguments: <version> <relation> <version>"
 msgstr ""
 "--compare-versions གིས་སྒྲུབ་རྟགས་གསུམ་འབགཔ་ཨིན་: <ཐོན་རིམ་> <མཐུན་འབྲེལ་> "
 "<ཐོན་རིམ་>"
 
-#: src/enquiry.c
+#: src/enquiry.c:524
 msgid "--compare-versions bad relation"
 msgstr "--compare-versions བྱང་ཉེས་མཐུན་འབྲེལ།"
 
-#: src/enquiry.c:659 src/enquiry.c:661 src/enquiry.c:670 src/enquiry.c:672
+#: src/enquiry.c:529 src/enquiry.c:531 src/enquiry.c:540 src/enquiry.c:542
 #, c-format
 msgid "version '%s' has bad syntax: %s"
 msgstr ""
 
-#: src/errors.c
+#: src/errors.c:64
 #, c-format
 msgid ""
 "failed to allocate memory for new entry in list of failed packages: %s"
 msgstr ""
 
-#: src/errors.c
+#: src/errors.c:75
 msgid "too many errors, stopping"
 msgstr ""
 
-#: src/errors.c
+#: src/errors.c:84
 #, c-format
 msgid ""
 "error processing package %s (--%s):\n"
 " %s"
 msgstr ""
 
-#: src/errors.c
+#: src/errors.c:97
 #, c-format
 msgid ""
 "error processing archive %s (--%s):\n"
 " %s"
 msgstr ""
 
-#: src/errors.c
+#: src/errors.c:87
 msgid "Errors were encountered while processing:\n"
 msgstr "ལས་སྦྱོར་འབད་བའི་སྐབས་ལཛོལ་བ་ཚུ་གདོང་ཐུག་བྱུང་ཡོདཔ་:\n"
 
-#: src/errors.c
+#: src/errors.c:94
 msgid "Processing was halted because there were too many errors.\n"
 msgstr ""
 "ལས་སྦྱོར་འབད་ནི་འདི་བར་ཐེམ་ལུས་ཡོད་ ག་ཅི་སྦེ་ཟེར་བ་ཅིན་ "
 "དེ་ནང་ལུ་འཛོལ་བ་ལེ་ཤ་འདུག\n"
 
-#: src/errors.c
+#: src/errors.c:127
 #, c-format
 msgid "package %s was on hold, processing it anyway as you requested"
 msgstr ""
 
-#: src/errors.c
+#: src/errors.c:109
 #, c-format
 msgid ""
 "Package %s is on hold, not touching it.  Use --force-hold to override.\n"
@@ -2740,154 +2763,154 @@
 "ཐུམ་སྒྲིལ་ %s འདི་འཆང་འདི་ཡོདཔ་ཨིན་  མ་སྤྲོག་པར་བཞག་དོ། "
 "ཟུར་བཞག་འབད་ནིའི་དོན་ལུ་ --force-hold ལག་ལེན་འཐབ།\n"
 
-#: src/errors.c
+#: src/errors.c:119
 msgid "overriding problem because --force enabled:"
 msgstr ""
 
-#: src/filesdb.c:238
+#: src/filesdb.c:307
 #, c-format
 msgid "unable to open files list file for package `%.250s'"
 msgstr ""
 "ཐུམ་སྒྲིལ་ `%.250s' གི་དོན་ལུ་ཡིག་སྣོད་ཚུའི་ཐོ་ཡིག་ཡིག་སྣོད་ཁ་ཕྱེ་མ་ཚུགས།"
 
-#: src/filesdb.c
+#: src/filesdb.c:239
 #, c-format
 msgid ""
 "files list file for package '%.250s' missing; assuming package has no files "
 "currently installed"
 msgstr ""
 
-#: src/filesdb.c
+#: src/filesdb.c:322
 #, c-format
 msgid "unable to stat files list file for package '%.250s'"
 msgstr ""
 
-#: src/filesdb.c
+#: src/filesdb.c:255
 #, c-format
 msgid "files list for package '%.250s' is not a regular file"
 msgstr ""
 
-#: src/filesdb.c
+#: src/filesdb.c:330
 #, c-format
 msgid "reading files list for package '%.250s'"
 msgstr ""
 
-#: src/filesdb.c
+#: src/filesdb.c:336
 #, c-format
 msgid "files list file for package '%.250s' is missing final newline"
 msgstr ""
 
-#: src/filesdb.c:285
+#: src/filesdb.c:344
 #, c-format
 msgid "files list file for package `%.250s' contains empty filename"
 msgstr ""
 "ཐུམ་སྒྲིལ་ `%.250s' "
 "གི་དོན་ལུ་ཡིག་སྣོད་ཚུའི་ཐོ་ཡིག་སྣོད་ཀྱི་ནང་ན་ཡིག་སྣོད་མིང་སྟོངམ་འདུག"
 
-#: src/filesdb.c:296
+#: src/filesdb.c:352
 #, c-format
 msgid "error closing files list file for package `%.250s'"
 msgstr ""
 "ཐུམ་སྒྲིལ་ `%.250s' གི་དོན་ལུ་ཡིག་སྣོད་ཚུའི་ཐོ་ཡིག་ཡིག་སྣོད་ཁ་བསྡམ་ད་འཛོལ་བ།"
 
-#: src/filesdb.c
+#: src/filesdb.c:462
 msgid "(Reading database ... "
 msgstr "(གནད་སྡུད་གཞི་རྟེན་ལྷག་དོ་... "
 
-#: src/filesdb.c
+#: src/filesdb.c:483
 #, c-format
 msgid "%d file or directory currently installed.)\n"
 msgid_plural "%d files and directories currently installed.)\n"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/filesdb-hash.c
+#: src/filesdb-hash.c:95
 #, c-format
 msgid "control file '%s' for package '%s' is missing final newline"
 msgstr ""
 
-#: src/filesdb-hash.c
+#: src/filesdb-hash.c:104
 #, c-format
 msgid "control file '%s' missing value"
 msgstr ""
 
-#: src/filesdb-hash.c
+#: src/filesdb-hash.c:107
 #, c-format
 msgid "control file '%s' missing value separator"
 msgstr ""
 
-#: src/filesdb-hash.c
+#: src/filesdb-hash.c:120
 #, c-format
 msgid "control file '%s' for package '%s' contains empty filename"
 msgstr ""
 
-#: src/filesdb-hash.c
+#: src/filesdb-hash.c:146
 #, c-format
 msgid "cannot open '%s' control file for package '%s'"
 msgstr ""
 
-#: src/filesdb-hash.c
+#: src/filesdb-hash.c:151
 #, c-format
 msgid "cannot stat '%s' control file for package '%s'"
 msgstr ""
 
-#: src/filesdb-hash.c
+#: src/filesdb-hash.c:155
 #, c-format
 msgid "'%s' file for package '%s' is not a regular file"
 msgstr ""
 
-#: src/filesdb-hash.c
+#: src/filesdb-hash.c:165
 #, c-format
 msgid "cannot read '%s' control file for package '%s'"
 msgstr ""
 
-#: src/filesdb-hash.c
+#: src/filesdb-hash.c:172
 #, c-format
 msgid "cannot close '%s' control file for package '%s'"
 msgstr ""
 
-#: src/help.c
+#: src/help.c:48
 msgid "not installed"
 msgstr "གཞི་བཙུགས་མ་འབད་བས།"
 
-#: src/help.c
+#: src/help.c:49
 msgid "not installed but configs remain"
 msgstr "གཞི་བཙུགས་མ་འབད་བས་ དེ་འབདཝ་ད་རིམ་སྒྲིག་སྡོདཔ་ཨིན།"
 
-#: src/help.c
+#: src/help.c:50
 msgid "broken due to failed removal or installation"
 msgstr ""
 
-#: src/help.c
+#: src/help.c:51
 msgid "unpacked but not configured"
 msgstr "བཤུབ་ཡོད་ དེ་འབདཝ་ད་རིམ་སྒྲིག་མ་འབད་བས།"
 
-#: src/help.c
+#: src/help.c:52
 msgid "broken due to postinst failure"
 msgstr "པོསིཊི་ཨིནསིཊི་འཐུས་ཤོར་ལུ་རྟེན་ཆད་ཡོདཔ།"
 
-#: src/help.c
+#: src/help.c:53
 msgid "awaiting trigger processing by another package"
 msgstr ""
 
-#: src/help.c
+#: src/help.c:54
 msgid "triggered"
 msgstr ""
 
-#: src/help.c
+#: src/help.c:55
 msgid "installed"
 msgstr "གཞི་བཙུགས་འབད་ཡོདཔ།"
 
-#: src/help.c
+#: src/help.c:112
 msgid "PATH is not set"
 msgstr ""
 
-#: src/help.c
+#: src/help.c:134
 #, c-format
 msgid "'%s' not found in PATH or not executable"
 msgstr ""
 
-#: src/help.c
+#: src/help.c:143
 #, c-format
 msgid ""
 "%d expected program not found in PATH or not executable\n"
@@ -2898,56 +2921,56 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/help.c
+#: src/help.c:146
 msgid ""
 "Note: root's PATH should usually contain /usr/local/sbin, /usr/sbin and /sbin"
 msgstr ""
 
-#: lib/dpkg/path-remove.c
+#: src/help.c:616
 #, c-format
 msgid "unable to securely remove '%.255s'"
 msgstr ""
 
-#: lib/dpkg/path-remove.c
+#: src/help.c:621 dpkg-deb/info.c:65 dpkg-deb/info.c:67
 msgid "rm command for cleanup"
 msgstr ""
 
-#: src/infodb-access.c:53
+#: src/infodb.c:52
 #, c-format
 msgid "unable to check existence of `%.250s'"
 msgstr "`%.250s' གི་གནས་ས་ཞིབ་དཔྱད་འབད་མ་ཚུགས།"
 
-#: src/infodb-access.c src/infodb-upgrade.c
+#: src/infodb.c:70
 msgid "cannot read info directory"
 msgstr "བརྡ་དོན་སྣོད་ཐོ་ལྷག་མི་ཚུགས།"
 
-#: src/infodb-format.c src/unpack.c
+#: src/processarc.c:637
 #, c-format
 msgid "error trying to open %.250s"
 msgstr "%.250s ཁ་ཕྱེ་ནིའ་འབད་རྩོལ་བསྐྱེདཔ་ད་འཛོལ་བ།"
 
-#: src/infodb-format.c
+#: src/infodb-format.c:56
 #, c-format
 msgid "corrupt info database format file '%s'"
 msgstr ""
 
-#: src/infodb-format.c
+#: src/infodb-format.c:88
 #, c-format
 msgid ""
 "info database format (%d) is bogus or too new; try getting a newer dpkg"
 msgstr ""
 
-#: src/infodb-upgrade.c
+#: src/infodb-upgrade.c:123
 #, c-format
 msgid "info file %s/%s not associated to any package"
 msgstr ""
 
-#: src/infodb-upgrade.c
+#: src/infodb-upgrade.c:183
 #, c-format
 msgid "error while writing '%s'"
 msgstr ""
 
-#: src/main.c:61
+#: src/main.c:60
 #, c-format
 msgid "Debian `%s' package management program version %s.\n"
 msgstr "ཌི་བི་ཡཱན་ `%s' ཐུམ་སྒྲིལ་འཛིན་སྐྱོང་པའི་ལས་རིམ་གྱི་ཐོན་རིམ་ %s\n"
@@ -2988,7 +3011,8 @@
 "\n"
 msgstr ""
 
-#: src/main.c src/querycmd.c src/trigcmd.c dpkg-deb/main.c dpkg-split/main.c
+#: src/main.c:118 src/querycmd.c:809 src/trigcmd.c:76 dpkg-deb/main.c:89
+#: dpkg-split/main.c:78
 #, c-format
 msgid ""
 "  -?, --help                       Show this help message.\n"
@@ -2996,7 +3020,7 @@
 "\n"
 msgstr ""
 
-#: src/main.c:123
+#: src/main.c:118
 #, c-format
 msgid ""
 "Use dpkg -b|--build|-c|--contents|-e|--control|-I|--info|-f|--field|\n"
@@ -3018,7 +3042,7 @@
 "\n"
 msgstr ""
 
-#: src/main.c
+#: src/main.c:134
 #, c-format
 msgid ""
 "Options:\n"
@@ -3058,7 +3082,7 @@
 "\n"
 msgstr ""
 
-#: src/main.c
+#: src/main.c:154
 #, c-format
 msgid ""
 "Comparison operators for --compare-versions are:\n"
@@ -3079,12 +3103,12 @@
 "ིག)\n"
 "\n"
 
-#: src/main.c
+#: src/main.c:169
 #, c-format
 msgid "Use 'apt' or 'aptitude' for user-friendly package management.\n"
 msgstr ""
 
-#: src/main.c
+#: src/main.c:177
 msgid ""
 "Type dpkg --help for help about installing and deinstalling packages [*];\n"
 "Use 'apt' or 'aptitude' for user-friendly package management;\n"
@@ -3096,63 +3120,63 @@
 "'more' !"
 msgstr ""
 
-#: src/main.c
+#: src/main.c:219
 msgid "Set all force options"
 msgstr ""
 
-#: src/main.c
+#: src/main.c:221
 msgid "Replace a package with a lower version"
 msgstr ""
 
-#: src/main.c
+#: src/main.c:223
 msgid "Configure any package which may help this one"
 msgstr ""
 
-#: src/main.c
+#: src/main.c:225
 msgid "Process incidental packages even when on hold"
 msgstr ""
 
-#: src/main.c
+#: src/main.c:227
 msgid "Try to (de)install things even when not root"
 msgstr ""
 
-#: src/main.c
+#: src/main.c:229
 msgid "PATH is missing important programs, problems likely"
 msgstr ""
 
-#: src/main.c
+#: src/main.c:231
 msgid "Install a package even if it fails authenticity check"
 msgstr ""
 
-#: src/main.c
+#: src/main.c:233
 msgid "Process even packages with wrong versions"
 msgstr ""
 
-#: src/main.c
+#: src/main.c:235
 msgid "Overwrite a file from one package with another"
 msgstr ""
 
-#: src/main.c
+#: src/main.c:237
 msgid "Overwrite a diverted file with an undiverted version"
 msgstr ""
 
-#: src/main.c
+#: src/main.c:239
 msgid "Overwrite one package's directory with another's file"
 msgstr ""
 
-#: src/main.c
+#: src/main.c:241
 msgid "Do not perform safe I/O operations when unpacking"
 msgstr ""
 
-#: src/main.c
+#: src/main.c:243
 msgid "Always use the new config files, don't prompt"
 msgstr ""
 
-#: src/main.c
+#: src/main.c:245
 msgid "Always use the old config files, don't prompt"
 msgstr ""
 
-#: src/main.c
+#: src/main.c:254
 msgid ""
 "Use the default option for new config files if one\n"
 "is available, don't prompt. If no default can be found,\n"
@@ -3160,95 +3184,95 @@
 "confnew options is also given"
 msgstr ""
 
-#: src/main.c
+#: src/main.c:253
 msgid "Always install missing config files"
 msgstr ""
 
-#: src/main.c
+#: src/main.c:255
 msgid "Offer to replace config files with no new versions"
 msgstr ""
 
-#: src/main.c
+#: src/main.c:257
 msgid "Process even packages with wrong or no architecture"
 msgstr ""
 
-#: src/main.c
+#: src/main.c:259
 msgid "Install even if it would break another package"
 msgstr ""
 
-#: src/main.c
+#: src/main.c:261
 msgid "Allow installation of conflicting packages"
 msgstr ""
 
-#: src/main.c
+#: src/main.c:263
 msgid "Turn all dependency problems into warnings"
 msgstr ""
 
-#: src/main.c
+#: src/main.c:265
 msgid "Turn dependency version problems into warnings"
 msgstr ""
 
-#: src/main.c
+#: src/main.c:267
 msgid "Remove packages which require installation"
 msgstr ""
 
-#: src/main.c
+#: src/main.c:269
 msgid "Remove an essential package"
 msgstr ""
 
-#: src/main.c
+#: src/main.c:281
 msgid "Generally helpful progress information"
 msgstr ""
 
-#: src/main.c
+#: src/main.c:282
 msgid "Invocation and status of maintainer scripts"
 msgstr ""
 
-#: src/main.c
+#: src/main.c:283
 msgid "Output for each file processed"
 msgstr ""
 
-#: src/main.c
+#: src/main.c:284
 msgid "Lots of output for each file processed"
 msgstr ""
 
-#: src/main.c
+#: src/main.c:285
 msgid "Output for each configuration file"
 msgstr ""
 
-#: src/main.c
+#: src/main.c:286
 msgid "Lots of output for each configuration file"
 msgstr ""
 
-#: src/main.c
+#: src/main.c:287
 msgid "Dependencies and conflicts"
 msgstr ""
 
-#: src/main.c
+#: src/main.c:288
 msgid "Lots of dependencies/conflicts output"
 msgstr ""
 
-#: src/main.c
+#: src/main.c:289
 msgid "Trigger activation and processing"
 msgstr ""
 
-#: src/main.c
+#: src/main.c:290
 msgid "Lots of output regarding triggers"
 msgstr ""
 
-#: src/main.c
+#: src/main.c:291
 msgid "Silly amounts of output regarding triggers"
 msgstr ""
 
-#: src/main.c
+#: src/main.c:292
 msgid "Lots of drivel about eg the dpkg/info directory"
 msgstr ""
 
-#: src/main.c
+#: src/main.c:293
 msgid "Insane amounts of drivel"
 msgstr ""
 
-#: src/main.c
+#: src/main.c:304
 #, c-format
 msgid ""
 "%s debugging option, --debug=<octal> or -D<octal>:\n"
@@ -3256,7 +3280,7 @@
 " Number  Ref. in source   Description\n"
 msgstr ""
 
-#: src/main.c
+#: src/main.c:311
 #, c-format
 msgid ""
 "\n"
@@ -3264,32 +3288,33 @@
 "Note that the meanings and values are subject to change.\n"
 msgstr ""
 
-#: src/main.c
+#: src/main.c:329
 #, c-format
 msgid "--%s requires a positive octal argument"
 msgstr ""
 
-#: src/main.c
+#: src/main.c:344
 #, c-format
 msgid "unknown verify output format '%s'"
 msgstr ""
 
-#: src/main.c
+#: src/main.c:368
 #, c-format
 msgid "null package name in --%s comma-separated list '%.250s'"
 msgstr ""
 
-#: lib/dpkg/options-parsers.c
+#: src/main.c:378 src/packages.c:114 src/querycmd.c:440 src/querycmd.c:685
+#: src/querycmd.c:717 src/querycmd.c:754
 #, c-format
 msgid "--%s needs a valid package name but '%.250s' is not: %s"
 msgstr ""
 
-#: src/main.c
+#: src/main.c:438
 #, c-format
 msgid "error executing hook '%s', exit code %d"
 msgstr ""
 
-#: src/main.c
+#: src/main.c:465
 msgid "status logger"
 msgstr ""
 
@@ -3298,32 +3323,32 @@
 msgid "--%s takes one argument"
 msgstr ""
 
-#: src/main.c
+#: src/main.c:518
 #, c-format
 msgid "architecture '%s' is illegal: %s"
 msgstr ""
 
-#: src/main.c
+#: src/main.c:521
 #, c-format
 msgid "architecture '%s' is reserved and cannot be added"
 msgstr ""
 
-#: src/main.c
+#: src/main.c:544
 #, c-format
 msgid "cannot remove non-foreign architecture '%s'"
 msgstr ""
 
-#: src/main.c
+#: src/main.c:555
 #, c-format
 msgid "removing architecture '%s' currently in use by database"
 msgstr ""
 
-#: src/main.c
+#: src/main.c:558
 #, c-format
 msgid "cannot remove architecture '%s' currently in use by the database"
 msgstr ""
 
-#: src/main.c
+#: src/main.c:480
 #, c-format
 msgid ""
 "%s forcing options - control behaviour when problems found:\n"
@@ -3332,7 +3357,7 @@
 " Forcing things:\n"
 msgstr ""
 
-#: src/main.c
+#: src/main.c:490
 #, c-format
 msgid ""
 "\n"
@@ -3340,40 +3365,41 @@
 "Forcing options marked [*] are enabled by default.\n"
 msgstr ""
 
-#: src/main.c:636
+#: src/main.c:504
 #, c-format
 msgid "unknown force/refuse option `%.*s'"
 msgstr "མ་ཤེས་པའི་བང་བཙོང་ནི་/ངོས་ལེན་མི་འབད་ནིའི་གདམ་ཁ་ `%.*s'"
 
-#: src/main.c:645
+#: src/main.c:513
 #, c-format
 msgid "obsolete force/refuse option '%s'\n"
 msgstr ""
 
-#: src/main.c dpkg-deb/info.c
+#: src/main.c:772 dpkg-deb/info.c:333
 #, c-format
 msgid "--%s takes exactly one argument"
 msgstr ""
 
-#: src/main.c:787
+#: src/main.c:651
 #, c-format
 msgid "couldn't open `%i' for stream"
 msgstr "རྒྱུན་རིམ་གྱི་དོན་ལུ་ `%i' ཁ་ཕྱེ་མ་ཚུགས།"
 
-#: src/main.c:812
+#: src/main.c:676
 #, c-format
 msgid "unexpected eof before end of line %d"
 msgstr "གྲལ་ཐིག་ %d གི་མཇུག་གི་ཧེ་མ་རེ་བ་མེད་པའི་ཨི་ཨོ་ཨེཕ།"
 
-#: src/main.c src/querycmd.c src/statcmd.c dpkg-deb/main.c dpkg-split/main.c
+#: src/main.c:719 src/main.c:741 src/querycmd.c:692 src/statcmd.c:379
+#: dpkg-deb/main.c:201 dpkg-split/main.c:163
 msgid "need an action option"
 msgstr "བྱ་བའི་གདམ་ཁ་གཅིག་དགོ"
 
-#: src/main.c src/script.c
+#: src/help.c:190 src/main.c:747
 msgid "unable to setenv for subprocesses"
 msgstr ""
 
-#: src/packages.c
+#: src/packages.c:113
 msgid ""
 "you must specify packages by their own names, not by quoting the names of "
 "the files they come in"
@@ -3382,24 +3408,24 @@
 "དེ་ཚུ་འོང་མི་ཡིག་སྣཽད་ཚུའི་མིང་ཚུ་འདྲེན་ཚིག་བཀོད་དེ་མེན་པར་ "
 "ཁོང་རའི་མིང་གིས་སྦེ་གསལ་བཀོད་འབད་དགོ"
 
-#: src/packages.c
+#: src/packages.c:133
 #, c-format
 msgid "--%s --pending does not take any non-option arguments"
 msgstr "--%s --བསྣར་ནི་འདི་གིས་གདམ་ཁ་-མིན་པའི་སྒྲུབ་རྟགས་ག་ནི་ཡང་མི་འབག"
 
-#: src/packages.c src/querycmd.c
+#: src/packages.c:138 src/querycmd.c:375 src/querycmd.c:565
 #, c-format
 msgid "--%s needs at least one package name argument"
 msgstr "--%s ལུ་ཉུང་མཐའ་ཐུམ་སྒྲིལ་མིང་གི་སྒྲུབ་རྟགས་གཅིག་དགོ"
 
-#: src/packages.c
+#: src/packages.c:179
 #, c-format
 msgid "Package %s listed more than once, only processing once.\n"
 msgstr ""
 "ཐུམ་སྒྲིལ་ %s གིས་ཚར་གཅིག་ལས་ལྷག་སྟེ་ཐོ་བཀོད་འབད་ནུག   "
 "ལས་སྦྱོར་ཚར་གཅིག་རྐྱངམ་ཅིག་འབདཝ་ཨིན།\n"
 
-#: src/packages.c
+#: src/packages.c:183
 #, c-format
 msgid ""
 "More than one copy of package %s has been unpacked\n"
@@ -3408,83 +3434,83 @@
 "ཐུམ་སྒྲིལ་ %s གི་འདྲ་བཤུས་གཅིག་ལས་ལྷག་སྟེ་ བཤུབ་ཡོད་\n"
 "འ་ནི་གཡོག་བཀོལ་ནང་ལུ་! ཚར་གཅིག་རྐྱངམ་ཅིག་རིམ་སྒྲིག་འབད་དོ།\n"
 
-#: src/packages.c:272
+#: src/packages.c:232
 #, c-format
 msgid ""
 "package %.250s is not ready for trigger processing\n"
 " (current status `%.250s' with no pending triggers)"
 msgstr ""
 
-#: src/packages.c
+#: src/packages.c:334
 #, c-format
 msgid "  Package %s which provides %s is to be removed.\n"
 msgstr "  %s བྱིན་མི་ ཐུམ་སྒྲིལ་ %s འདི་རྩ་བསྐྲད་གཏང་ནི་ཨིན།\n"
 
-#: src/packages.c
+#: src/packages.c:337
 #, c-format
 msgid "  Package %s is to be removed.\n"
 msgstr "  ཐུམ་སྒྲིལ་ %s འདི་རྩ་བསྐྲད་གཏང་ནི་ཨིན།\n"
 
-#: src/packages.c
+#: src/packages.c:354
 #, c-format
 msgid "  Version of %s on system is %s.\n"
 msgstr "  རིམ་ལུགས་གུའི་ %s གི་ཐོན་རིམ་འདི་ %s ཨིན།\n"
 
-#: src/packages.c
+#: src/packages.c:376
 #, c-format
 msgid "  Package %s which provides %s awaits trigger processing.\n"
 msgstr ""
 
-#: src/packages.c
+#: src/packages.c:380
 #, c-format
 msgid "  Package %s awaits trigger processing.\n"
 msgstr ""
 
-#: src/packages.c
+#: src/packages.c:419
 #, c-format
 msgid "also configuring '%s' (required by '%s')"
 msgstr ""
 
-#: src/packages.c
+#: src/packages.c:418
 #, c-format
 msgid "  Package %s which provides %s is not configured yet.\n"
 msgstr "  %s བྱིན་མི་ཐུམ་སྒྲིལ་ %s འདི་ད་ཚུན་རིམ་སྒྲིག་མ་འབད་བས།\n"
 
-#: src/packages.c
+#: src/packages.c:421
 #, c-format
 msgid "  Package %s is not configured yet.\n"
 msgstr "  ཐུམ་སྒྲིལ་ %s འདི་ད་ཚུན་རིམ་སྒྲིག་མ་འབད་བས།\n"
 
-#: src/packages.c
+#: src/packages.c:432
 #, c-format
 msgid "  Package %s which provides %s is not installed.\n"
 msgstr "  %s བྱིན་མི་ཐུམ་སྒྲིལ་ %s འདི་གཞི་བཙུགས་མ་འབད་བས།\n"
 
-#: src/packages.c
+#: src/packages.c:435
 #, c-format
 msgid "  Package %s is not installed.\n"
 msgstr "  ཐུམ་སྒྲིལ་ %s འདི་གཞི་བཙུགས་མ་འབད་བས།\n"
 
-#: src/packages.c
+#: src/packages.c:472
 #, c-format
 msgid " %s (%s) breaks %s and is %s.\n"
 msgstr ""
 
-#: src/packages.c
+#: src/packages.c:478
 #, c-format
 msgid "  %s (%s) provides %s.\n"
 msgstr ""
 
-#: src/packages.c
+#: src/packages.c:482
 #, c-format
 msgid "  Version of %s to be configured is %s.\n"
 msgstr ""
 
-#: src/packages.c
+#: src/packages.c:596
 msgid " depends on "
 msgstr " ལུ་རྟེནམ་ཨིན། "
 
-#: src/packages.c
+#: src/packages.c:602
 msgid "; however:\n"
 msgstr "གང་ལྟར་ཡང་:\n"
 
@@ -3494,7 +3520,7 @@
 #. * the first three columns, which should ideally match the English one
 #. * (e.g. Remove → supRimeix), see dpkg-query(1) for further details. The
 #. * translated message can use additional lines if needed.
-#: src/querycmd.c
+#: src/querycmd.c:149
 msgid ""
 "Desired=Unknown/Install/Remove/Purge/Hold\n"
 "| Status=Not/Inst/Conf-files/Unpacked/halF-conf/Half-inst/trig-aWait/Trig-"
@@ -3502,92 +3528,92 @@
 "|/ Err?=(none)/Reinst-required (Status,Err: uppercase=bad)\n"
 msgstr ""
 
-#: src/querycmd.c
+#: src/querycmd.c:153
 msgid "Name"
 msgstr "མིང་།"
 
-#: src/querycmd.c
+#: src/querycmd.c:153
 msgid "Version"
 msgstr "ཐོན་རིམ།"
 
-#: src/querycmd.c
+#: src/querycmd.c:193
 msgid "Architecture"
 msgstr ""
 
-#: src/querycmd.c
+#: src/querycmd.c:154
 msgid "Description"
 msgstr "འགྲེལ་བཤད།"
 
-#: src/querycmd.c src/select.c
+#: src/querycmd.c:296 src/querycmd.c:583 src/select.c:93
 #, c-format
 msgid "no packages found matching %s"
 msgstr ""
 
-#: src/querycmd.c
+#: src/querycmd.c:273
 #, c-format
 msgid "diversion by %s from: %s\n"
 msgstr ""
 
-#: src/querycmd.c
+#: src/querycmd.c:275
 #, c-format
 msgid "diversion by %s to: %s\n"
 msgstr ""
 
-#: src/querycmd.c
+#: src/querycmd.c:278
 #, c-format
 msgid "local diversion from: %s\n"
 msgstr ""
 
-#: src/querycmd.c
+#: src/querycmd.c:279
 #, c-format
 msgid "local diversion to: %s\n"
 msgstr ""
 
-#: src/querycmd.c
+#: src/querycmd.c:309
 msgid "--search needs at least one file name pattern argument"
 msgstr "--འཚོལ་ཞིབ་ལུ་ ཉུང་མཐའ་ཡིག་སྣོད་མིང་གི་དཔེ་གཞིའི་སྒྲུབ་རྟགས་གཅིག་དགོ"
 
-#: src/querycmd.c
+#: src/querycmd.c:404
 #, c-format
 msgid "no path found matching pattern %s"
 msgstr ""
 
-#: src/querycmd.c
+#: src/querycmd.c:451
 #, c-format
 msgid "package '%s' is not installed and no information is available"
 msgstr ""
 
-#: src/querycmd.c
+#: src/querycmd.c:460
 #, c-format
 msgid "package '%s' is not available"
 msgstr ""
 
-#: src/enquiry.c src/querycmd.c
+#: src/querycmd.c:470 src/querycmd.c:689 src/querycmd.c:721 src/querycmd.c:758
 #, c-format
 msgid "package '%s' is not installed"
 msgstr ""
 
-#: src/querycmd.c:497
+#: src/querycmd.c:418
 #, c-format
 msgid "Package `%s' does not contain any files (!)\n"
 msgstr "ཐུམ་སྒྲིལ་ `%s' གི་ནང་ན་ཡིག་སྣོད་ག་ནི་ཡང་མེད་(!)\n"
 
-#: src/querycmd.c
+#: src/querycmd.c:425
 #, c-format
 msgid "locally diverted to: %s\n"
 msgstr "ཉེ་གནས་སྦེ་ : %s ལུ་ཁ་ཕྱོགས་སྒྱུར་ཡོད།\n"
 
-#: src/querycmd.c
+#: src/querycmd.c:428
 #, c-format
 msgid "package diverts others to: %s\n"
 msgstr "ཐུམ་སྒྲིལ་གྱིས་གཞན་མི་ཚུ་: %s ལུ་ཁ་ཕྱོགས་སྒྱུརཝ་ཨིན།\n"
 
-#: src/querycmd.c
+#: src/querycmd.c:431
 #, c-format
 msgid "diverted by %s to: %s\n"
 msgstr "%s གིས་ : %s ལུ་ཁ་ཕྱོགས་སྒྱུར་ཡོདཔ་\n"
 
-#: src/querycmd.c
+#: src/querycmd.c:452
 msgid ""
 "Use dpkg --info (= dpkg-deb --info) to examine archive files,\n"
 "and dpkg --contents (= dpkg-deb --contents) to list their contents.\n"
@@ -3597,42 +3623,42 @@
 "དེ་ལས་  dpkg -- ནང་དོན་ཚུ་ (= dpkg-deb --ནང་དོན་ཚུ་) "
 "འདི་དེའི་ནང་དོན་ཛཚུ་ཐོ་བཀོད་འབད་ནིའི་དོན་ལས་ཐོ་བཀོད་འབད།\n"
 
-#: src/querycmd.c dpkg-deb/info.c
+#: src/querycmd.c:535 dpkg-deb/info.c:282
 #, c-format
 msgid "error in show format: %s"
 msgstr ""
 
-#: src/querycmd.c
+#: src/querycmd.c:578
 #, c-format
 msgid "control file contains %c"
 msgstr ""
 
-#: src/querycmd.c dpkg-deb/build.c
+#: src/querycmd.c:570
 #, c-format
 msgid "--%s takes at most two arguments"
 msgstr ""
 
-#: src/querycmd.c
+#: src/querycmd.c:711
 #, c-format
 msgid "--%s takes one package name argument"
 msgstr ""
 
-#: src/querycmd.c
+#: src/querycmd.c:741 src/querycmd.c:746
 #, c-format
 msgid "--%s takes exactly two arguments"
 msgstr ""
 
-#: src/querycmd.c
+#: src/querycmd.c:763
 #, c-format
 msgid "control file '%s' does not exist"
 msgstr ""
 
-#: src/querycmd.c
+#: src/querycmd.c:600
 #, c-format
 msgid "Debian %s package management program query tool version %s.\n"
 msgstr ""
 
-#: src/querycmd.c:798
+#: src/querycmd.c:794
 #, c-format
 msgid ""
 "Commands:\n"
@@ -3650,7 +3676,7 @@
 "\n"
 msgstr ""
 
-#: src/querycmd.c
+#: src/querycmd.c:814
 #, c-format
 msgid ""
 "Options:\n"
@@ -3660,7 +3686,7 @@
 "\n"
 msgstr ""
 
-#: src/querycmd.c dpkg-deb/main.c
+#: src/querycmd.c:642 dpkg-deb/main.c:112
 #, c-format
 msgid ""
 "Format syntax:\n"
@@ -3684,238 +3710,238 @@
 "  རྒྱ་ཚད་འདི་མེད་ཆ་མེན་ཚུན་ས་སྒོ་འདི་ གཡས་-ཕྲང་འབད་འོང་\n"
 "  གཡོན་ཕྲང་སྒྲིག་ལག་ལེན་འཐབ་མི་གནད་དོན་ནང་ལུ།\n"
 
-#: src/querycmd.c
+#: src/querycmd.c:656
 msgid "Use --help for help about querying packages."
 msgstr ""
 
-#: src/remove.c
+#: src/remove.c:107
 #, c-format
 msgid "ignoring request to remove %.250s which isn't installed"
 msgstr ""
 
-#: src/remove.c
+#: src/remove.c:115
 #, c-format
 msgid ""
 "ignoring request to remove %.250s, only the config\n"
 " files of which are on the system; use --purge to remove them too"
 msgstr ""
 
-#: src/remove.c
+#: src/remove.c:124
 msgid "this is an essential package; it should not be removed"
 msgstr ""
 
-#: src/remove.c
+#: src/remove.c:144
 #, c-format
 msgid ""
 "dependency problems prevent removal of %s:\n"
 "%s"
 msgstr ""
 
-#: src/remove.c
+#: src/remove.c:130
 msgid "dependency problems - not removing"
 msgstr "རྟེན་འབམྲེལ་གྱྱི་དཀའ་ངལ་ཚུ་ - རྩ་བསྐྲད་མི་གཏང་།"
 
-#: src/remove.c
+#: src/remove.c:149
 #, c-format
 msgid ""
 "%s: dependency problems, but removing anyway as you requested:\n"
 "%s"
 msgstr ""
 
-#: src/remove.c
+#: src/remove.c:157
 msgid ""
 "package is in a very bad inconsistent state; you should\n"
 " reinstall it before attempting a removal"
 msgstr ""
 
-#: src/remove.c
+#: src/remove.c:164
 #, c-format
 msgid "Would remove or purge %s (%s) ...\n"
 msgstr ""
 
-#: src/remove.c
+#: src/remove.c:174
 #, c-format
 msgid "Removing %s (%s) ...\n"
 msgstr ""
 
-#: src/remove.c:214 src/unpack.c:312
+#: src/processarc.c:349 src/remove.c:198
 #, c-format
 msgid "unable to delete control info file `%.250s'"
 msgstr "ཚད་འཛིན་བརྡ དོན་ཡིག་སྣོད་ `%.250s' བཏོན་གཏང་མ་ཚུགས།"
 
-#: src/remove.c
+#: src/remove.c:275 src/remove.c:366
 #, c-format
 msgid ""
 "while removing %.250s, unable to remove directory '%.250s': %s - directory "
 "may be a mount point?"
 msgstr ""
 
-#: src/remove.c
+#: src/remove.c:289
 #, c-format
 msgid "unable to securely remove '%.250s'"
 msgstr ""
 
-#: src/remove.c
+#: src/remove.c:421
 #, c-format
 msgid "while removing %.250s, directory '%.250s' not empty so not removed"
 msgstr ""
 
-#: lib/dpkg/atomic-file.c lib/dpkg/triglib.c src/infodb-upgrade.c src/remove.c
+#: src/remove.c:383
 #, c-format
 msgid "cannot remove '%.250s'"
 msgstr "`%.250s' རྩ་བསྐྲད་གཏང་མི་ཚུགས།"
 
-#: src/remove.c
+#: src/remove.c:469
 #, c-format
 msgid "Purging configuration files for %s (%s) ...\n"
 msgstr ""
 
-#: src/remove.c:527
+#: src/remove.c:459
 #, c-format
 msgid "cannot remove old config file `%.250s' (= `%.250s')"
 msgstr "རིམ་སྒྲིག་ཡིག་སྣོད་`%.250s'(=་`%.250s') རྙིངམ་ རྩ་བསྐྲད་གཏང་མ་ཚུགས།"
 
-#: src/remove.c:542
+#: src/remove.c:474
 #, c-format
 msgid "cannot read config file dir `%.250s' (from `%.250s')"
 msgstr "རིམ་སྒྲིག་ཡིག་སྣོད་ སྣོད་ཐོ་`%.250s'(`%.250s' ལས་)ལྷག་མ་ཚུགས།"
 
-#: src/remove.c:579
+#: src/remove.c:510
 #, c-format
 msgid "cannot remove old backup config file `%.250s' (of `%.250s')"
 msgstr ""
 "རྒྱབ་ཐག་རིམ་སྒྲིག་ཡིག་སྣོད་`%.250s' (`%.250s' གི་) རྙིངམ་རྩ་བསྐྲད་གཏང་མ་ཚུགས།"
 
-#: src/remove.c
+#: src/remove.c:568
 msgid "cannot remove old files list"
 msgstr "ཡིག་སྣོད་ཀྱི་ཐོ་ཡིག་རྙིངམ་རྩ་བསྐྲད་གཏང་མི་ཚུགས།"
 
-#: src/remove.c
+#: src/remove.c:574
 msgid "can't remove old postrm script"
 msgstr "པོསིཊི་རིམ་ ཡིག་ཚུགས་རྩ་བསྐྲད་གཏང་མི་ཚུགས།"
 
-#: src/script.c:90
+#: src/help.c:256
 #, c-format
 msgid "unable to set execute permissions on `%.250s'"
 msgstr "`%.250s' གུ་ལུ་ལག་ལེན་འཐབ་པའི་གནང་བ་གཞི་སྒྲིག་འབད་མ་ཚུགས།"
 
-#: src/script.c
+#: src/help.c:188
 msgid "admindir must be inside instdir for dpkg to work properly"
 msgstr ""
 
-#: src/script.c:109
+#: src/help.c:192
 #, c-format
 msgid "failed to chroot to `%.250s'"
 msgstr "`%.250s' ལུ་སི་ཨེཆ་རུཊི་ འབད་ནི་འཐུས་ཤོར་བྱུང་ཡོད།"
 
-#: src/script.c:114 dpkg-deb/build.c:186 dpkg-deb/build.c:461
-#: dpkg-deb/build.c:463 dpkg-deb/build.c:561
+#: src/help.c:194 dpkg-deb/build.c:455 dpkg-deb/build.c:457
+#: dpkg-deb/build.c:536 dpkg-deb/build.c:558
 #, c-format
 msgid "failed to chdir to `%.255s'"
 msgstr "`%.255s' ལུ་སི་ཨེཆ་ཌི་ཨའི་ཨར་འབད་ནི་འཐུས་ཤོར་བྱུང་ཡོད།"
 
-#: src/script.c
+#: src/help.c:276
 msgid "unable to setenv for maintainer script"
 msgstr ""
 
-#: src/script.c
+#: src/script.c:223
 msgid "cannot set security execution context for maintainer script"
 msgstr ""
 
-#: src/script.c
+#: src/help.c:300
 #, c-format
 msgid "installed %s script"
 msgstr ""
 
-#: src/script.c:219 src/script.c:291 src/script.c:353
+#: src/help.c:313 src/help.c:382 src/help.c:441
 #, c-format
 msgid "unable to stat %s `%.250s'"
 msgstr "%s `%.250s' སི་ཊེཊི་འབད་ནི་འཐུས་ཤོར་བྱུང་ཡོད།"
 
-#: src/script.c
+#: src/help.c:368 src/help.c:428
 #, c-format
 msgid "new %s script"
 msgstr "%s ཡིག་ཚུགས་གསརཔ།"
 
-#: src/script.c
+#: src/help.c:402
 #, c-format
 msgid "old %s script"
 msgstr "%s ཡིག་ཚུགས་རྙིངམ།"
 
-#: src/script.c
+#: src/help.c:416
 #, c-format
 msgid "unable to stat %s '%.250s': %s"
 msgstr ""
 
-#: src/script.c
+#: src/script.c:379
 msgid "trying script from the new package instead ..."
 msgstr ""
 
-#: src/script.c
+#: src/help.c:439
 msgid "there is no script in the new version of the package - giving up"
 msgstr "ཐུམ་སྒྲིལ་གྱི་ཐོན་རིམ་གསརཔ་འདི་ནང་ལུ་ཡིག་ཚུགས་མེད།-བཀོག་བཞག་དོ།"
 
-#: src/script.c
+#: src/script.c:399
 msgid "... it looks like that went OK"
 msgstr ""
 
-#: src/select.c:147
+#: src/select.c:115
 #, c-format
 msgid "unexpected eof in package name at line %d"
 msgstr "གྲལ་ཐིག་ %d གུ་ཐུམ་སྒྲིལ་མིང་ནང་ལུ་རེབ་མེད་པའི་ཨི་ཨོ་ཨེཕ།"
 
-#: src/select.c
+#: src/select.c:116
 #, c-format
 msgid "unexpected end of line in package name at line %d"
 msgstr "གྲལ་ཐིག་ %d གུ་ལུ་ཐུམ་སྒྲིལ་མིང་ནང་ལུ་རེ་བ་མེད་པའི་གྲལ་ཐིག་གི་མཇུག"
 
-#: src/select.c:154
+#: src/select.c:122
 #, c-format
 msgid "unexpected eof after package name at line %d"
 msgstr "གྲལ་ཐིག་ %d གུ་ལུ་ཐུམ་སྒྲིལ་མིང་གི་ཤུལ་ལས་རེ་བ་མེད་པའི་ཨི་ཨོ་ཨེཕ།"
 
-#: src/select.c
+#: src/select.c:123
 #, c-format
 msgid "unexpected end of line after package name at line %d"
 msgstr ""
 "གྲལ་ཐིག་ %d གུ་ལུ་ཐུམ་སྒྲིལ་མིང་གི་ཤུལ་ལས་རེ་བ་མེད་པའི་གྲལ་ཐིག་གི་མཇུག"
 
-#: src/select.c
+#: src/select.c:136
 #, c-format
 msgid "unexpected data after package and selection at line %d"
 msgstr ""
 "གྲལ་ཐིག་ %d གུ་ལུ་ ཐུམ་སྒྲིལ་དང་སེལ་འཐུ་གི་ཤུལ་ལས་རེ་བ་མེད་པའི་གནད་སྡུད།"
 
-#: src/select.c
+#: src/select.c:139
 #, c-format
 msgid "illegal package name at line %d: %.250s"
 msgstr "གྲལ་ཐིག་ %d གུ་ལུ་ཁྲིམས་འགལ་ཐུམ་སྒྲིལ་མིང་: %.250s"
 
-#: src/select.c
+#: src/select.c:168
 #, c-format
 msgid "package not in database at line %d: %.250s"
 msgstr ""
 
-#: src/select.c
+#: src/select.c:143
 #, c-format
 msgid "unknown wanted status at line %d: %.250s"
 msgstr "གྲལ་ཐིག་ %d གུ་ལུ་མ་ཤེསཔ་དགོ་པའི་གནས་ཚད་: %.250s"
 
-#: src/select.c
+#: src/select.c:149
 msgid "read error on standard input"
 msgstr "ཚད་ལྡན་ཨིན་པུཊི་གུ་ལུ་ལྷག་པའི་འཛོལ་བ།"
 
-#: src/select.c
+#: src/select.c:186
 msgid ""
 "found unknown packages; this might mean the available database\n"
 "is outdated, and needs to be updated through a frontend method"
 msgstr ""
 
-#: src/statcmd.c
+#: src/statcmd.c:52
 msgid "Use --help for help about overriding file stat information."
 msgstr ""
 
-#: src/statcmd.c
+#: src/statcmd.c:77
 #, c-format
 msgid ""
 "Commands:\n"
@@ -3926,7 +3952,7 @@
 "\n"
 msgstr ""
 
-#: src/statcmd.c
+#: src/statcmd.c:85
 #, c-format
 msgid ""
 "Options:\n"
@@ -3939,40 +3965,40 @@
 "\n"
 msgstr ""
 
-#: src/statcmd.c
+#: src/statcmd.c:116
 msgid "stripping trailing /"
 msgstr "བཤུབ་ནི་རྒྱབ་ལུས་/"
 
-#: src/statcmd.c
+#: src/statcmd.c:227
 #, c-format
 msgid "--%s needs four arguments"
 msgstr ""
 
-#: src/statcmd.c
+#: src/statcmd.c:230
 msgid "path may not contain newlines"
 msgstr ""
 
-#: src/statcmd.c
+#: src/statcmd.c:237
 #, c-format
 msgid ""
 "an override for '%s' already exists, but --force specified so will be ignored"
 msgstr ""
 
-#: src/statcmd.c
+#: src/statcmd.c:241
 #, c-format
 msgid "an override for '%s' already exists; aborting"
 msgstr ""
 
-#: src/statcmd.c
+#: src/statcmd.c:272
 #, c-format
 msgid "--update given but %s does not exist"
 msgstr ""
 
-#: src/statcmd.c
+#: src/statcmd.c:277
 msgid "no override present"
 msgstr ""
 
-#: src/statcmd.c
+#: src/statcmd.c:304
 msgid "--update is useless for --remove"
 msgstr ""
 
@@ -3985,7 +4011,7 @@
 msgid "syntax error: unknown user '%s' in statoverride file"
 msgstr ""
 
-#: src/statdb.c:85
+#: src/statdb.c:83
 msgid "syntax error: invalid gid in statoverride file"
 msgstr ""
 
@@ -3994,54 +4020,54 @@
 msgid "syntax error: unknown group '%s' in statoverride file"
 msgstr ""
 
-#: src/statdb.c:107
+#: src/statdb.c:104
 msgid "syntax error: invalid mode in statoverride file"
 msgstr ""
 
-#: src/statdb.c
+#: src/statdb.c:127
 msgid "failed to open statoverride file"
 msgstr "སི་ཊེཊི་ཟུར་བཞག་ཡིག་སྣོད་ཁ་ཕྱེ་ནི་འཐུས་ཤོར་བྱུང་ཡོད།"
 
-#: src/statdb.c
+#: src/statdb.c:134
 msgid "failed to fstat statoverride file"
 msgstr "སི་ཊེཊི་ཟུར་བཞག་ཡིག་སྣོད་ཨེཕ་སི་ཊེཊི་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།"
 
-#: src/statdb.c
+#: src/statdb.c:162
 #, c-format
 msgid "reading statoverride file '%.250s'"
 msgstr ""
 
-#: src/statdb.c
+#: src/statdb.c:169
 msgid "statoverride file is missing final newline"
 msgstr ""
 
-#: src/statdb.c
+#: src/statdb.c:173
 msgid "statoverride file contains empty line"
 msgstr "སི་ཊེཊི་ཟུར་བཞག་ཡིག་སྣོད་ཀྱི་ནང་ན་གྲལ་ཐིག་སྟོངམ་འདུག"
 
-#: src/statdb.c
+#: src/statdb.c:178 src/statdb.c:190 src/statdb.c:202
 msgid "syntax error in statoverride file"
 msgstr ""
 
-#: src/statdb.c
+#: src/statdb.c:186 src/statdb.c:198 src/statdb.c:210
 msgid "unexpected end of line in statoverride file"
 msgstr ""
 
-#: src/statdb.c
+#: src/statdb.c:238
 #, c-format
 msgid "multiple statoverrides present for file '%.250s'"
 msgstr ""
 
-#: src/trigcmd.c
+#: src/trigcmd.c:46
 msgid "Type dpkg-trigger --help for help about this utility."
 msgstr ""
 
-#: src/trigcmd.c
+#: src/trigcmd.c:51
 #, c-format
 msgid "Debian %s package trigger utility version %s.\n"
 msgstr ""
 
-#: src/trigcmd.c
+#: src/trigcmd.c:67
 #, c-format
 msgid ""
 "Usage: %s [<options> ...] <trigger-name>\n"
@@ -4049,7 +4075,7 @@
 "\n"
 msgstr ""
 
-#: src/trigcmd.c
+#: src/trigcmd.c:72
 #, c-format
 msgid ""
 "Commands:\n"
@@ -4058,7 +4084,7 @@
 "\n"
 msgstr ""
 
-#: src/trigcmd.c:81
+#: src/trigcmd.c:82
 #, c-format
 msgid ""
 "Options:\n"
@@ -4072,103 +4098,103 @@
 "\n"
 msgstr ""
 
-#: src/trigcmd.c
+#: src/trigcmd.c:210
 msgid ""
 "must be called from a maintainer script (or with a --by-package option)"
 msgstr ""
 
-#: src/trigcmd.c
+#: src/trigcmd.c:180
 msgid "triggers data directory not yet created"
 msgstr ""
 
-#: src/trigcmd.c
+#: src/trigcmd.c:183
 msgid "trigger records not yet in existence"
 msgstr ""
 
-#: src/trigcmd.c
+#: src/trigcmd.c:205
 msgid "takes one argument, the trigger name"
 msgstr ""
 
-#: src/trigcmd.c
+#: src/trigcmd.c:215
 #, c-format
 msgid "illegal awaited package name '%.250s': %.250s"
 msgstr ""
 
-#: src/trigcmd.c:235
+#: src/trigcmd.c:221
 #, c-format
 msgid "invalid trigger name `%.250s': %.250s"
 msgstr ""
 
-#: src/trigproc.c
+#: src/trigproc.c:271
 msgid ""
 "cycle found while processing triggers:\n"
 " chain of packages whose triggers are or may be responsible:"
 msgstr ""
 
-#: src/trigproc.c
+#: src/trigproc.c:258
 #, c-format
 msgid ""
 "\n"
 " packages' pending triggers which are or may be unresolvable:\n"
 msgstr ""
 
-#: src/trigproc.c
+#: src/trigproc.c:281
 msgid "triggers looping, abandoned"
 msgstr ""
 
-#: src/trigproc.c
+#: src/trigproc.c:336
 #, c-format
 msgid "Processing triggers for %s (%s) ...\n"
 msgstr ""
 
-#: src/unpack.c
+#: src/processarc.c:71
 #, c-format
 msgid ".../%s"
 msgstr ""
 
-#: src/unpack.c:96
+#: src/processarc.c:91
 #, c-format
 msgid "error ensuring `%.250s' doesn't exist"
 msgstr "`%.250s' མེདཔ་ངེས་བདེན་བཟོཝ་ད་འཛོལ་བ།"
 
-#: src/unpack.c
+#: src/processarc.c:99
 msgid "split package reassembly"
 msgstr ""
 
-#: src/unpack.c
+#: src/processarc.c:108
 msgid "reassembled package file"
 msgstr "ལོག་འཛོམས་ཡོད་པའི་ཐུམ་སྒྲིལ་ཡིག་སྣོད།"
 
-#: src/unpack.c
+#: src/processarc.c:133
 #, c-format
 msgid "Authenticating %s ...\n"
 msgstr "%s བདེན་བཤད་འབད་དོ...\n"
 
-#: src/unpack.c
+#: src/processarc.c:139
 msgid "package signature verification"
 msgstr ""
 
-#: src/unpack.c
+#: src/unpack.c:151
 #, c-format
 msgid "verification on package %s failed!"
 msgstr ""
 
-#: src/unpack.c
+#: src/unpack.c:153
 #, c-format
 msgid ""
 "verification on package %s failed; but installing anyway as you requested"
 msgstr ""
 
-#: src/unpack.c
+#: src/processarc.c:152
 #, c-format
 msgid "passed\n"
 msgstr "རྩིས་སྤྲོད་འབད་ཡོདཔ།\n"
 
-#: src/unpack.c dpkg-deb/info.c
+#: src/processarc.c:165 dpkg-deb/info.c:81
 msgid "unable to create temporary directory"
 msgstr ""
 
-#: src/unpack.c:323
+#: src/processarc.c:243
 #, c-format
 msgid ""
 "old version of package has overly-long info file name starting `%.250s'"
@@ -4177,21 +4203,21 @@
 "ཐུམ་སྒྲིལ་གི་ཐོན་རིམ་རྙིངམ་འདི་ལུ་གནམ་མེད་ས་མེད་རིངམ་བརྡ་དོན་ཡིག་སྣོད་མིང་འདུ"
 "ག"
 
-#: src/unpack.c:361
+#: src/processarc.c:281
 #, c-format
 msgid "unable to remove obsolete info file `%.250s'"
 msgstr "ཕན་མེད་བརྡ་དོན་ཡིག་སྣོད་`%.50s'རྩ་བསྐྲད་གཏང་མ་ཚུགས།"
 
-#: src/unpack.c:366
+#: src/processarc.c:286
 #, c-format
 msgid "unable to install (supposed) new info file `%.250s'"
 msgstr "བརྡ་དོན་ཡིག་སྣོད་`%.50s'གསརཔ་གཞི་བཙུགས་འབད་མ་ཚུགས།"
 
-#: src/unpack.c
+#: src/processarc.c:296
 msgid "unable to open temp control directory"
 msgstr "གནས་སྐབས་ཚད་འཛིན་སྣོད་ཐོ་ཁ་ཕྱེ་མ་ཚུགས།"
 
-#: src/unpack.c:387
+#: src/processarc.c:307
 #, c-format
 msgid ""
 "package contains overly-long control info file name (starting `%.50s')"
@@ -4199,68 +4225,68 @@
 "ཐུམ་སྒྲིལ་གྱི་ནང་ན་ "
 "གནམ་མེད་ས་མེད་རིངམ་ཚད་འཛིན་བརྡ་དོན་ཡིག་སྣོད་མིང་འདུག་(`%.50s' འགོ་བཙུགས་དོ།)"
 
-#: src/unpack.c:394
+#: src/processarc.c:314
 #, c-format
 msgid "package control info contained directory `%.250s'"
 msgstr "ཐུམ་སྒྲིལ་ཚད་འཛིན་བརྡ་དོན་གྱི་ནང་ན་སྣོད་ཐོ་ `%.250s' འདུག"
 
-#: src/unpack.c:396
+#: src/processarc.c:316
 #, c-format
 msgid "package control info rmdir of `%.250s' didn't say not a dir"
 msgstr ""
 "`%.250s' "
 "གི་ཐུམ་སྒྲིལ་ཚད་འཛིན་བརྡ་དོན་ཨར་ཨེམ་སྣོད་ཐོ་གིས་སྣོད་ཐོ་མེན་ཟེར་མ་སླབ།"
 
-#: src/unpack.c
+#: src/processarc.c:326
 #, c-format
 msgid "package %s contained list as info file"
 msgstr ""
 
-#: src/unpack.c:414
+#: src/processarc.c:333
 #, c-format
 msgid "unable to install new info file `%.250s' as `%.250s'"
 msgstr "བརྡ་དོན་ཡིག་སྣོད་ `%.250s' འདི་ `%.250s' སྦེ་གཞི་བཙུགས་འབད་མ་ཚུགས།"
 
-#: src/unpack.c
+#: src/processarc.c:1206
 #, c-format
 msgid "(Noting disappearance of %s, which has been completely replaced.)\n"
 msgstr "(%s གི་ཡལ་མི་ ཆ་ཚང་སྦེ་ཚབ་བཙུགས་ཡོད་མི་ ག་ཅི་ཡང་མེད།)\n"
 
-#: src/unpack.c
+#: src/processarc.c:411
 msgid "cannot access archive"
 msgstr "ཡིག་མཛོད་འཛུལ་སྤྱོད་འབད་མི་ཚུགས།"
 
-#: src/unpack.c
+#: src/processarc.c:433
 msgid "package control information extraction"
 msgstr ""
 
-#: src/unpack.c
+#: src/processarc.c:460
 #, c-format
 msgid "Recorded info about %s from %s.\n"
 msgstr "%s གི་སྐོར་ལས་བརྡ་དོན་འདི་ %s ལས་དྲན་ཐོ་བཀོད་ཡོད།\n"
 
-#: src/unpack.c
+#: src/processarc.c:468
 #, c-format
 msgid "package architecture (%s) does not match system (%s)"
 msgstr "ཐུམ་སྒྲིལ་གྱི་བཟོ་བཀོད(%s)འདི་རིམ་ལུགས་(%s)དང་མི་མཐུན་པས།"
 
-#: src/unpack.c
+#: src/unpack.c:576
 #, c-format
 msgid ""
 "regarding %s containing %s, pre-dependency problem:\n"
 "%s"
 msgstr ""
 
-#: src/unpack.c
+#: src/processarc.c:526
 #, c-format
 msgid "pre-dependency problem - not installing %.250s"
 msgstr "སྔོན་-རྟེན་འབྲེལ་གྱི་དཀའ་ངལ་-  %.250s གཞི་བཙུགས་མི་འབ་དབས།"
 
-#: src/unpack.c
+#: src/processarc.c:527
 msgid "ignoring pre-dependency problem!"
 msgstr ""
 
-#: src/unpack.c
+#: src/unpack.c:597
 #, c-format
 msgid "Preparing to unpack %s ...\n"
 msgstr ""
@@ -4272,84 +4298,84 @@
 "རིམ་སྒྲིག་ཡིག་སྣོད་ཀྱི་མིང་(`%.250s' འགོ་བཙུགས་དོ་) "
 "འདི་གནམ་མེད་ས་མེད་རིངམ་ཨིན་པས་(>%d ཡིག་འབྲུ)"
 
-#: src/unpack.c utils/update-alternatives.c
+#: src/processarc.c:633 utils/update-alternatives.c:2071
 #, c-format
 msgid "read error in %.250s"
 msgstr "%.250s ནང་ལྷག་པའི་འཛོལ་བ།"
 
-#: src/unpack.c
+#: src/processarc.c:635
 #, c-format
 msgid "error closing %.250s"
 msgstr "%.250s ཁ་བསྡམ་ད་འཛོལ་བ།"
 
-#: src/unpack.c
+#: src/unpack.c:735
 #, c-format
 msgid "De-configuring %s (%s), to allow removal of %s (%s) ...\n"
 msgstr ""
 
-#: src/unpack.c
+#: src/unpack.c:741
 #, c-format
 msgid "De-configuring %s (%s) ...\n"
 msgstr ""
 
-#: src/unpack.c
+#: src/unpack.c:833
 #, c-format
 msgid "Unpacking %s (%s) ...\n"
 msgstr ""
 
-#: src/unpack.c
+#: src/unpack.c:837
 #, c-format
 msgid "Unpacking %s (%s) over (%s) ...\n"
 msgstr ""
 
-#: src/unpack.c
+#: src/processarc.c:840
 msgid "package filesystem archive extraction"
 msgstr ""
 
-#: src/unpack.c
+#: src/processarc.c:854
 msgid "error reading dpkg-deb tar output"
 msgstr "dpkg-deb ཊར་ཨའུཊི་པུཏི་ ལྷག་པའི་སྐབས་འཛོལ་བ།"
 
-#: src/unpack.c
+#: src/processarc.c:856
 msgid "corrupted filesystem tarfile - corrupted package archive"
 msgstr ""
 "ངན་ཅན་བཟོ་ཡོད་པའི་ཡིག་སྣོད་རིམ་ལུགས་ཊར་ཡིག་སྣོད་ - "
 "ངན་ཅན་བཟོ་ཡོད་པའི་ཐུམ་སྒྲིལ་ཡིག་མཛོད།"
 
-#: src/unpack.c
+#: src/unpack.c:946
 #, c-format
 msgid "cannot zap possible trailing zeros from dpkg-deb: %s"
 msgstr ""
 
-#: src/unpack.c
+#: src/processarc.c:919
 #, c-format
 msgid "could not stat old file '%.250s' so not deleting it: %s"
 msgstr ""
 
-#: src/unpack.c
+#: src/processarc.c:925
 #, c-format
 msgid "unable to delete old directory '%.250s': %s"
 msgstr ""
 
-#: src/unpack.c
+#: src/processarc.c:928
 #, c-format
 msgid ""
 "old conffile '%.250s' was an empty directory (and has now been deleted)"
 msgstr ""
 
-#: src/unpack.c:1099
+#: src/processarc.c:975
 #, c-format
 msgid "unable to stat other new file `%.250s'"
 msgstr "གཞན་མི་ཡིག་སྣོད་གསརཔ་ `%.250s' སི་ཊེཊི་འབད་མ་ཚུགས།"
 
-#: src/unpack.c
+#: src/processarc.c:986
 #, c-format
 msgid ""
 "old file '%.250s' is the same as several new files! (both '%.250s' and "
 "'%.250s')"
 msgstr ""
 
-#: src/unpack.c
+#: src/processarc.c:1025
 #, c-format
 msgid "unable to securely remove old file '%.250s': %s"
 msgstr ""
@@ -4359,84 +4385,85 @@
 msgid "--%s needs exactly one Packages-file argument"
 msgstr ""
 
-#: src/update.c
+#: src/update.c:62
 msgid "unable to access dpkg status area for bulk available update"
 msgstr ""
 "སྦུང་ཚད་ཅན་འཐོབ་ཚུགསཔ་ཡོད་མི་དུས་མཐུན་བཟོ་ཡོད་མི་འདི་གི་དོན་ལུ་ "
 "ཌི་པི་ཀེ་ཇི་གནས་ཚད་མངའ་ཁོངས་ འཛུལ་སྤྱོད་འབད་མ་ཚུགས།"
 
-#: src/update.c
+#: src/update.c:64
 msgid "bulk available update requires write access to dpkg status area"
 msgstr ""
 "སྦུང་ཚད་ཅན་འཐོབ་ཚུགསཔ་ཡོད་མི་དུས་མཐུན་བཟོ་ཡོད་མི་འདི་ལུ་ ཌི་པི་ཀེ་ཇི་ "
 "གནས་ཚད་མངའ་ཁོངས་ལུ་འབྲི་ནིའི་འཛུལ་སྤྱོད་དགོཔ་ཨིན།"
 
-#: src/update.c
+#: src/update.c:71
 #, c-format
 msgid "Replacing available packages info, using %s.\n"
 msgstr ""
 "%s ལག་ལེན་འཐབ་ཐོག་ འཐོབ་ཚུགས་པའི་ཐུམ་སྒྲིལ་གྱི་བརྡ་དོན་ ཚབ་བཙུགས་དོ།\n"
 
-#: src/update.c
+#: src/update.c:74
 #, c-format
 msgid "Updating available packages info, using %s.\n"
 msgstr "%s ལག་ལེན་འཐབ་ཐོག་ འཐོབ་ཚུགས་པའི་ཐུམ་སྒྲིལ་ཚུ་དུས་མཐུན་བཟོ་དོ།\n"
 
-#: src/update.c
+#: src/update.c:101
 #, c-format
 msgid "Information about %d package was updated.\n"
 msgid_plural "Information about %d packages was updated.\n"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/update.c
+#: src/update.c:112
 #, c-format
 msgid ""
 "obsolete '--%s' option; unavailable packages are automatically cleaned up"
 msgstr ""
 
-#: dpkg-deb/build.c:125
+#: dpkg-deb/build.c:124
 #, c-format
 msgid "file name '%.50s...' is too long"
 msgstr "ཡིག་སྣོད་ཀྱི་མིང '%.50s...'གནམ་མེད་ས་མེད་རིངམ"
 
-#: dpkg-deb/build.c
+#: dpkg-deb/build.c:129
 #, c-format
 msgid "unable to stat file name '%.250s'"
 msgstr ""
 
-#: dpkg-deb/build.c
+#: dpkg-deb/build.c:571 dpkg-deb/build.c:580
 #, c-format
 msgid "failed to write filename to tar pipe (%s)"
 msgstr ""
 
-#: dpkg-deb/build.c
+#: dpkg-deb/build.c:521 dpkg-deb/build.c:524 dpkg-deb/build.c:546
+#: dpkg-deb/build.c:572 dpkg-deb/build.c:580 dpkg-deb/build.c:593
 msgid "data member"
 msgstr ""
 
-#: dpkg-deb/build.c
+#: dpkg-deb/build.c:189
 msgid "unable to stat control directory"
 msgstr ""
 
-#: dpkg-deb/build.c
+#: dpkg-deb/build.c:191
 msgid "control directory is not a directory"
 msgstr ""
 
-#: dpkg-deb/build.c
+#: dpkg-deb/build.c:193
 #, c-format
 msgid ""
 "control directory has bad permissions %03lo (must be >=0755 and <=0775)"
 msgstr ""
 "ཚད་འཛིན་སྣོད་ཐོ་ལུ་བྱང་ཉེས་གནང་བ་ %03lo (>=0755 དང་ <=0775 ཨིན་དགོ་) འདུག"
 
-#: dpkg-deb/build.c:252
+#: dpkg-deb/build.c:204
 #, c-format
 msgid "maintainer script `%.50s' is not a plain file or symlink"
 msgstr ""
 "རྒྱུན་སྐྱོང་པའི་ཡིག་ཚུགས་ `%.50s' "
 "འདི་ཉག་རྐྱང་ཡིག་སྣོད་ཡང་ན་བརྡ་མཚོན་འབྲེལ་ལམ་མེན།"
 
-#: dpkg-deb/build.c:255
+#: dpkg-deb/build.c:207
 #, c-format
 msgid ""
 "maintainer script `%.50s' has bad permissions %03lo (must be >=0555 and "
@@ -4445,16 +4472,16 @@
 "རྒྱུན་སྐྱོང་པའི་ཡིག་ཚུགས་ `%.50s' ལུ་བྱང་ཉེས་གནང་བ་ %03lo ( >=0555 དང་ "
 "<=0775 ཨིན་དགོ་) འདུག"
 
-#: dpkg-deb/build.c:259
+#: dpkg-deb/build.c:211
 #, c-format
 msgid "maintainer script `%.50s' is not stattable"
 msgstr "རྒྱུན་སྐྱོང་པའི་ཡིག་ཚུགས་ `%.50s' འདི་སི་ཊེཊི་འབད་བཏུབ་མེན།"
 
-#: dpkg-deb/build.c
+#: dpkg-deb/build.c:237
 msgid "error opening conffiles file"
 msgstr "ཀཱོནཕ་ཕ་ཡིལསི་ ཡིག་སྣོད་ཁ་ཕྱེཝ་ད་འཛོལ་བ།"
 
-#: dpkg-deb/build.c
+#: dpkg-deb/build.c:246
 msgid "empty string from fgets reading conffiles"
 msgstr "ཨེཕ་གེཊིསི་ལྷག་ནིའི་ཀཱོན་ཕ་ཡིལསི་ལས་ཡིག་རྒྱུན་སྟོངམ།"
 
@@ -4463,47 +4490,47 @@
 msgid "conffile name '%.50s...' is too long, or missing final newline"
 msgstr ""
 
-#: dpkg-deb/build.c
+#: dpkg-deb/build.c:264
 #, c-format
 msgid "conffile filename '%s' contains trailing white spaces"
 msgstr ""
 
-#: dpkg-deb/build.c:308
+#: dpkg-deb/build.c:266
 #, c-format
 msgid "conffile `%.250s' does not appear in package"
 msgstr "ཀཱོན་ཕ་ཡིལ་`%.250s' འདི་ ཐུམ་སྒྲིལ་ནང་མི་འབྱུང་།"
 
-#: dpkg-deb/build.c:310
+#: dpkg-deb/build.c:268
 #, c-format
 msgid "conffile `%.250s' is not stattable"
 msgstr "ཀཱོན་ཕཡིལ་ `%.250s' འདི་སི་ཊེཊི་འབད་བཏུབ་མེན།"
 
-#: dpkg-deb/build.c
+#: dpkg-deb/build.c:270
 #, c-format
 msgid "conffile '%s' is not a plain file"
 msgstr ""
 
-#: dpkg-deb/build.c
+#: dpkg-deb/build.c:274
 #, c-format
 msgid "conffile name '%s' is duplicated"
 msgstr ""
 
-#: dpkg-deb/build.c
+#: dpkg-deb/build.c:287
 msgid "error reading conffiles file"
 msgstr "ཀཱོནཕ་ཕ་ཡིལསི་ ཡིག་སྣོད་ལྷགཔ་ད་འཛོལ་བ།"
 
-#: dpkg-deb/build.c:351
+#: dpkg-deb/build.c:339
 msgid "package name has characters that aren't lowercase alphanums or `-+.'"
 msgstr ""
 "ཐུམ་སྒྲིལ་གྱི་མིང་འདི་ལུ་ མགྱོགས་ཡིག་ཀ་ཁའི་ཨང་ཡིག་ཡང་ན་ `-+.' "
 "མེན་མི་ཡིག་འབྲུ་ཚུ་ཡོད།"
 
-#: dpkg-deb/build.c
+#: dpkg-deb/build.c:341
 #, c-format
 msgid "'%s' contains user-defined Priority value '%s'"
 msgstr ""
 
-#: dpkg-deb/build.c:392
+#: dpkg-deb/build.c:347
 #, c-format
 msgid "'%s' contains user-defined field '%s'"
 msgstr ""
@@ -4515,257 +4542,260 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: dpkg-deb/build.c utils/update-alternatives.c
+#: dpkg-deb/build.c:403 utils/update-alternatives.c:2429
+#: utils/update-alternatives.c:2436
 #, c-format
 msgid "--%s needs a <directory> argument"
 msgstr "--%s ་ལུ་ <སྣོད་ཐོ་> སྒྲུབ་རྟགས་ཅིག་དགོཔ་འདུག"
 
-#: dpkg-deb/build.c:418
+#: dpkg-deb/build.c:413
 #, c-format
 msgid "unable to check for existence of archive `%.250s'"
 msgstr "ཡིག་མཛོད་ `%.250s' གི་གནས་སའི་དོན་ལུ་ཞིབ་དཔྱད་འབད་མ་ཚུགས།"
 
-#: dpkg-deb/build.c
+#: dpkg-deb/build.c:430
 msgid "target is directory - cannot skip control file check"
 msgstr ""
 "དམིགས་གཏད་འདི་སྣོད་ཐོ་ཨིན་ - ཚད་འཛིན་ཡིག་སྣོད་ཞིབ་དཔྱད་ གོམ་འགྱོ་མི་ཚུགས།"
 
-#: dpkg-deb/build.c
+#: dpkg-deb/build.c:481
 msgid "not checking contents of control area"
 msgstr ""
 
-#: dpkg-deb/build.c
+#: dpkg-deb/build.c:432
 #, c-format
 msgid "dpkg-deb: building an unknown package in '%s'.\n"
 msgstr ""
 
-#: dpkg-deb/build.c:444
+#: dpkg-deb/build.c:439
 #, c-format
 msgid "dpkg-deb: building package `%s' in `%s'.\n"
 msgstr "ཌི་པི་ཀེ་ཇི་-ཌེབ་: `%s' ནང་ལུ་ཐུམ་སྒྲིལ་ `%s' བཟོ་བརྩིགས་འབད་དོ།\n"
 
-#: dpkg-deb/build.c
+#: dpkg-deb/build.c:467 dpkg-deb/build.c:521
 #, c-format
 msgid "failed to make temporary file (%s)"
 msgstr ""
 
-#: dpkg-deb/build.c
+#: dpkg-deb/build.c:467 dpkg-deb/build.c:470 dpkg-deb/build.c:477
+#: dpkg-deb/build.c:485 dpkg-deb/build.c:494 dpkg-deb/build.c:499
 msgid "control member"
 msgstr ""
 
-#: dpkg-deb/build.c
+#: dpkg-deb/build.c:470 dpkg-deb/build.c:524
 #, c-format
 msgid "failed to unlink temporary file (%s), %s"
 msgstr ""
 
-#: dpkg-deb/build.c
+#: dpkg-deb/build.c:534
 msgid "compressing control member"
 msgstr ""
 
-#: dpkg-deb/build.c
+#: dpkg-deb/build.c:485 dpkg-deb/build.c:593
 #, c-format
 msgid "failed to rewind temporary file (%s)"
 msgstr ""
 
-#: dpkg-deb/build.c
+#: dpkg-deb/build.c:494
 #, c-format
 msgid "failed to stat temporary file (%s)"
 msgstr ""
 
-#: dpkg-deb/build.c:512
+#: dpkg-deb/build.c:498
 #, c-format
 msgid "error writing `%s'"
 msgstr "`%s' འབྲིཝ་ད་འཛོལ་བ།"
 
-#: dpkg-deb/build.c
+#: dpkg-deb/build.c:557
 #, c-format
 msgid "cannot copy '%s' into archive '%s': %s"
 msgstr ""
 
-#: dpkg-deb/build.c
+#: dpkg-deb/build.c:610
 msgid "compressing data member"
 msgstr ""
 
-#: dpkg-deb/build.c
+#: dpkg-deb/build.c:584
 msgid "<compress> from tar -cf"
 msgstr ""
 
-#: dpkg-deb/extract.c
+#: dpkg-deb/extract.c:61 dpkg-deb/extract.c:63
 msgid "shell command to move files"
 msgstr ""
 
-#: dpkg-deb/extract.c
+#: dpkg-deb/extract.c:70
 #, c-format
 msgid "unexpected end of file in %s in %.255s"
 msgstr "%.255s ནང་གི་ %s ནང་ལུ་ཡིག་སྣོད་ཀྱི་རེ་བ་མེད་པའི་མཇུག"
 
-#: dpkg-deb/extract.c
+#: dpkg-deb/extract.c:72
 #, c-format
 msgid "error reading %s from file %.255s"
 msgstr "ཡིག་སྣོད་ %.255s ལས་ %s ལྷགཔ་ད་འཛོལ་བ།"
 
-#: dpkg-deb/extract.c:129
+#: dpkg-deb/extract.c:125
 #, c-format
 msgid "failed to read archive `%.255s'"
 msgstr "ཡིག་མཛོད་ `%.250s' ལྷག་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོདཔ།"
 
-#: dpkg-deb/extract.c
+#: dpkg-deb/extract.c:127
 msgid "failed to fstat archive"
 msgstr "ཨེཕ་སི་ཊེཊི་ཡིག་མཛོད་འབད་ནི་ལུ་ཐུས་ཤོར་བྱུང་ཡོདཔ།"
 
-#: dpkg-deb/extract.c
+#: dpkg-deb/extract.c:131
 msgid "archive magic version number"
 msgstr ""
 
-#: dpkg-deb/extract.c
+#: dpkg-deb/extract.c:143
 msgid "archive member header"
 msgstr ""
 
-#: dpkg-deb/extract.c
+#: dpkg-deb/extract.c:148
 #, c-format
 msgid "file '%.250s' is corrupt - bad archive header magic"
 msgstr ""
 
-#: dpkg-deb/extract.c:156
+#: dpkg-deb/extract.c:155
 #, c-format
 msgid "file `%.250s' is not a debian binary archive (try dpkg-split?)"
 msgstr ""
 "ཡིག་སྣོད་ %.250s འདི་ ཌི་བི་ཡཱན་ཟུང་ལྡན་ཡིག་མཛོད་མེན་(ཌི་པི་ཀེ་ཇི་-"
 "བཤག་ནི་འབད་རྩོལ་བསྐྱེད?)"
 
-#: dpkg-deb/extract.c
+#: dpkg-deb/extract.c:159
 msgid "archive information header member"
 msgstr ""
 
-#: dpkg-deb/extract.c
+#: dpkg-deb/extract.c:162
 msgid "archive has no newlines in header"
 msgstr "ཡིག་མཛོད་ལུ་མགོ་ཡིག་ནང་གྲལ་ཐིག་གསརཔ་ཚུ་མེད།"
 
-#: dpkg-deb/extract.c
+#: dpkg-deb/extract.c:167 dpkg-deb/extract.c:237
 #, c-format
 msgid "archive has invalid format version: %s"
 msgstr ""
 
-#: dpkg-deb/extract.c
+#: dpkg-deb/extract.c:169
 #, c-format
 msgid "archive is format version %d.%d; get a newer dpkg-deb"
 msgstr ""
 
-#: dpkg-deb/extract.c
+#: dpkg-deb/extract.c:179 dpkg-deb/extract.c:212
 #, c-format
 msgid "cannot skip archive member from '%s': %s"
 msgstr ""
 
-#: dpkg-deb/extract.c
+#: dpkg-deb/extract.c:185 dpkg-deb/extract.c:199
 #, c-format
 msgid "archive '%s' has premature member '%.*s' before '%s', giving up"
 msgstr ""
 
-#: dpkg-deb/extract.c
+#: dpkg-deb/extract.c:195
 #, c-format
 msgid "archive '%s' uses unknown compression for member '%.*s', giving up"
 msgstr ""
 
-#: dpkg-deb/extract.c
+#: dpkg-deb/extract.c:199
 #, c-format
 msgid "archive '%.250s' contains two control members, giving up"
 msgstr ""
 
-#: dpkg-deb/extract.c
+#: dpkg-deb/extract.c:221
 #, c-format
 msgid ""
 " new debian package, version %d.%d.\n"
 " size %jd bytes: control archive=%jd bytes.\n"
 msgstr ""
 
-#: dpkg-deb/extract.c
+#: dpkg-deb/extract.c:232
 msgid "archive control member size"
 msgstr ""
 
-#: dpkg-deb/extract.c
+#: dpkg-deb/extract.c:235
 #, c-format
 msgid "archive has malformatted control member size '%s'"
 msgstr ""
 
-#: dpkg-deb/extract.c
+#: dpkg-deb/extract.c:251
 #, c-format
 msgid "cannot skip archive control member from '%s': %s"
 msgstr ""
 
-#: dpkg-deb/extract.c
+#: dpkg-deb/extract.c:256
 #, c-format
 msgid ""
 " old debian package, version %d.%d.\n"
 " size %jd bytes: control archive=%jd, main archive=%jd.\n"
 msgstr ""
 
-#: dpkg-deb/extract.c
+#: dpkg-deb/extract.c:265
 msgid ""
 "file looks like it might be an archive which has been\n"
 " corrupted by being downloaded in ASCII mode"
 msgstr ""
 
-#: dpkg-deb/extract.c:278
+#: dpkg-deb/extract.c:259
 #, c-format
 msgid "`%.255s' is not a debian format archive"
 msgstr "`%.255s' འདི་ ཌི་བི་ཡཱན་རྩ་སྒྲིག་ཡིག་མཛོད་མེན་པས།"
 
-#: dpkg-deb/extract.c
+#: dpkg-deb/extract.c:277
 #, c-format
 msgid "cannot copy archive member from '%s' to decompressor pipe: %s"
 msgstr ""
 
-#: dpkg-deb/extract.c
+#: dpkg-deb/extract.c:280
 msgid "cannot close decompressor pipe"
 msgstr ""
 
-#: dpkg-deb/extract.c
+#: dpkg-deb/extract.c:297
 msgid "decompressing archive member"
 msgstr ""
 
-#: dpkg-deb/extract.c
+#: dpkg-deb/extract.c:307
 msgid "failed to chdir to directory"
 msgstr "སྣོད་ཐོ་ལུ་སི་ཨེཆ་ཌི་ཨའི་ཨར་འབད་ནི་འཐུས་ཤོར་བྱུང་ཡོདཔ།"
 
-#: dpkg-deb/extract.c
+#: dpkg-deb/extract.c:310
 msgid "failed to create directory"
 msgstr "སྣོད་ཐོ་གསར་བསྐྲུན་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོདཔ།"
 
-#: dpkg-deb/extract.c
+#: dpkg-deb/extract.c:312
 msgid "failed to chdir to directory after creating it"
 msgstr ""
 "དེ་གསར་བསྐྲུན་འབད་བའི་ཤུལ་ལས་སྣོད་ཐོ་ལུ་སི་ཨེཆ་ཌི་ཨའི་ཨར་འབད་ནི་ལུ་འཐུས་ཤོར་བ"
 "ྱུང་ཡོདཔ།"
 
-#: dpkg-deb/extract.c
+#: dpkg-deb/extract.c:323
 msgid "<decompress>"
 msgstr ""
 
-#: dpkg-deb/extract.c
+#: dpkg-deb/extract.c:325
 msgid "paste"
 msgstr ""
 
-#: dpkg-deb/extract.c dpkg-deb/info.c
+#: dpkg-deb/extract.c:342 dpkg-deb/extract.c:363 dpkg-deb/extract.c:402
+#: dpkg-deb/info.c:77
 #, c-format
 msgid "--%s needs a .deb filename argument"
 msgstr "--%s ལུ་ .deb ཡིག་སྣོད་མིང་གི་སྒྲུབ་རྟགས་ཅིག་དགོཔ་ཨིན།"
 
-#: dpkg-deb/extract.c
+#: dpkg-deb/extract.c:365
 #, c-format
 msgid "--%s takes only one argument (.deb filename)"
 msgstr "--%s གིས་སྒྲུབ་རྟགས་གཅིག་རྐྱངམ་ཅིག་འབགཔ་ཨིན།(.deb ཡིག་སྣོད་མིང་)"
 
-#: dpkg-deb/extract.c
+#: dpkg-deb/extract.c:350 dpkg-deb/extract.c:410
 #, c-format
 msgid "--%s takes at most two arguments (.deb and directory)"
 msgstr "--%s གིས་མང་མཐའ་སྒྲུབ་རྟགས་གཉིས་འབགཔ་ཨིན།(.deb དང་སྣོད་ཐོ་)"
 
-#: dpkg-deb/extract.c
+#: dpkg-deb/extract.c:417 dpkg-deb/extract.c:451
 #, c-format
 msgid "--%s needs .deb filename and directory arguments"
 msgstr ""
 
-#: dpkg-deb/extract.c
+#: dpkg-deb/extract.c:347 dpkg-deb/extract.c:406
 #, c-format
 msgid ""
 "--%s needs a target directory.\n"
@@ -4774,66 +4804,66 @@
 "--%s ལུ་དམིགས་གཏད་ཀྱི་སྣོད་ཐོ་ཅིག་དགོ\n"
 "ཁྱོད་ཀྱིས་ ཌི་པི་ཀེ་ཇི་ --གཞི་བཙུགས་ ལག་ལེན་འཐབ་དགོཔ་འོང་?"
 
-#: dpkg-deb/info.c:64
+#: dpkg-deb/info.c:63
 msgid "failed to chdir to `/' for cleanup"
 msgstr ""
 "གཙང་དག་བཟོ་ནིའི་དོན་ལུ་ སི་ཨེཆ་ཌི་ཨའི་ཨར་འདི་ `/' འབད་ནི་འཐུས་ཤོར་བྱུང་ཡོདཔ།"
 
-#: dpkg-deb/info.c
+#: dpkg-deb/info.c:108
 #, c-format
 msgid "cannot extract control file '%s' from '%s': %s"
 msgstr ""
 
-#: dpkg-deb/info.c
+#: dpkg-deb/info.c:112
 #, c-format
 msgid "'%.255s' contains no control component '%.255s'"
 msgstr ""
 
-#: dpkg-deb/info.c:117
+#: dpkg-deb/info.c:114
 #, c-format
 msgid "open component `%.255s' (in %.255s) failed in an unexpected way"
 msgstr ""
 "ཁ་ཕྱེ་ཡོད་མི་ཆ་ཤས་ `%.255s' (%.255s ནང་ལུ་) འདི་ "
 "རེ་བ་མེད་པའི་ཐབས་ལམ་ཅིག་ནང་ལུ་འཐུས་ཤོར་འབྱུང་ཡོདཔ།"
 
-#: dpkg-deb/info.c
+#: dpkg-deb/info.c:121
 #, c-format
 msgid "%d requested control component is missing"
 msgid_plural "%d requested control components are missing"
 msgstr[0] ""
 msgstr[1] ""
 
-#: dpkg-deb/info.c:142 utils/update-alternatives.c:1090
+#: dpkg-deb/info.c:139 utils/update-alternatives.c:424
 #, c-format
 msgid "cannot scan directory `%.255s'"
 msgstr "སྣོད་ཐོ་ `%.255s' ཞིབ་ལྟ་འབད་མི་ཚུགས།"
 
-#: dpkg-deb/info.c:151
+#: dpkg-deb/info.c:148
 #, c-format
 msgid "cannot stat `%.255s' (in `%.255s')"
 msgstr "cannot stat `%.255s' སི་ཊེཊི་འབད་མི་ཚུགས་(`%.255s' ནང་ལུ་)"
 
-#: dpkg-deb/info.c:155
+#: dpkg-deb/info.c:152
 #, c-format
 msgid "cannot open `%.255s' (in `%.255s')"
 msgstr "`%.255s' ཁ་ཕྱེ་མི་ཚུགས་(`%.255s' ནང་ལུ་)"
 
-#: dpkg-deb/info.c:170 dpkg-deb/info.c:188 dpkg-deb/info.c:202
+#: dpkg-deb/info.c:167 dpkg-deb/info.c:185 dpkg-deb/info.c:199
 #, c-format
 msgid "failed to read `%.255s' (in `%.255s')"
 msgstr "`%.255s' ལྷག་ནི་ལུ་འཐུས་ཤོར་འབྱུང་ཡོད་(`%.255s' ནང་ལུ་)"
 
-#: dpkg-deb/info.c
+#: dpkg-deb/info.c:170
 #, c-format
 msgid " %7jd bytes, %5d lines   %c  %-20.127s %.127s\n"
 msgstr ""
 
-#: dpkg-deb/info.c
+#: dpkg-deb/info.c:174
 #, c-format
 msgid "     not a plain file          %.255s\n"
 msgstr "     ཉག་རྐྱང་ཡིག་སྣོད་          %.255s མེན་པས\n"
 
-#: dpkg-deb/info.c:189
+#: dpkg-deb/info.c:186
 msgid "(no `control' file in control archive!)\n"
 msgstr "(ཚད་འཛིན་ཡིག་མཛོད་ནང་ལུ་ `control' ཡིག་སྣོད་མེད་!)\n"
 
@@ -4850,13 +4880,13 @@
 msgid "error closing the '%s' component"
 msgstr ""
 
-#: dpkg-deb/main.c:55
+#: dpkg-deb/main.c:54
 #, c-format
 msgid "Debian `%s' package archive backend version %s.\n"
 msgstr ""
 "ཌི་བི་ཡཱན་ `%s' ཐུམ་སྒྲིལ་ཡིག་མཛོད་ཀྱིས་ཐོན་རིམ་ %s རྒྱབ་མཐའ་འབད་ཡོད།\n"
 
-#: dpkg-deb/main.c:74
+#: dpkg-deb/main.c:73
 #, c-format
 msgid ""
 "Commands:\n"
@@ -4874,7 +4904,7 @@
 "\n"
 msgstr ""
 
-#: dpkg-deb/main.c:95
+#: dpkg-deb/main.c:93
 #, c-format
 msgid ""
 "<deb> is the filename of a Debian format archive.\n"
@@ -4913,7 +4943,7 @@
 "\n"
 msgstr ""
 
-#: dpkg-deb/main.c
+#: dpkg-deb/main.c:128
 #, c-format
 msgid ""
 "\n"
@@ -4922,7 +4952,7 @@
 "unpacked using 'dpkg-deb --extract' will be incorrectly installed !\n"
 msgstr ""
 
-#: dpkg-deb/main.c
+#: dpkg-deb/main.c:132
 msgid ""
 "Type dpkg-deb --help for help about manipulating *.deb files;\n"
 "Type dpkg --help for help about installing and deinstalling packages."
@@ -4933,12 +4963,12 @@
 "ཐུམ་སྒྲིལ་ཚུ་གཞི་བཙུགས་འབད་ནི་དང་གཞི་བཙུགས་མི་འབད་ནིའི་སྐོར་ལས་གྲོགས་རམ་གྱི་ད"
 "ོན་ལུ།"
 
-#: dpkg-deb/main.c
+#: dpkg-deb/main.c:155
 #, c-format
 msgid "invalid deb format version: %s"
 msgstr ""
 
-#: dpkg-deb/main.c
+#: dpkg-deb/main.c:161
 #, c-format
 msgid "unknown deb format version: %s"
 msgstr ""
@@ -4948,192 +4978,192 @@
 msgid "invalid compression level for -%c: %ld'"
 msgstr ""
 
-#: dpkg-deb/main.c
+#: dpkg-deb/main.c:205
 #, c-format
 msgid "unknown compression strategy '%s'!"
 msgstr ""
 
-#: dpkg-deb/main.c:216
+#: dpkg-deb/main.c:161
 #, c-format
 msgid "unknown compression type `%s'!"
 msgstr "མ་ཤེས་པའི་ཨེབ་བཙུགས་ཀྱི་དབྱེ་བ་ `%s'!"
 
-#: dpkg-deb/main.c
+#: dpkg-deb/main.c:215
 #, c-format
 msgid "deprecated compression type '%s'; use xz instead"
 msgstr ""
 
-#: dpkg-deb/main.c
+#: dpkg-deb/main.c:256
 #, c-format
 msgid "invalid compressor parameters: %s"
 msgstr ""
 
-#: dpkg-split/info.c:55
+#: dpkg-split/info.c:52
 #, c-format
 msgid "file `%.250s' is corrupt - bad digit (code %d) in %s"
 msgstr ""
 "ཡིག་སྣོད་ `%.250s' འདི་ངན་ཅན་ - བྱང་ཉེས་ཨང་ཡིག་(ཨང་རྟགས་ %d) %s "
 "ནང་ཡོད་མི་འདི་ཨིན།"
 
-#: dpkg-split/info.c
+#: dpkg-split/info.c:57
 #, c-format
 msgid "file '%s' is corrupt; out of range integer in %s"
 msgstr ""
 
-#: dpkg-split/info.c:65
+#: dpkg-split/info.c:60
 #, c-format
 msgid "file `%.250s' is corrupt - %.250s missing"
 msgstr "ཡིག་སྣོད་ `%.250s' འདི་ངན་ཅན་ཨིན་ - `%.250s' བྲལག་སྟོར་ཞུགས་ནུག"
 
-#: dpkg-split/info.c:68
+#: dpkg-split/info.c:63
 #, c-format
 msgid "file `%.250s' is corrupt - missing newline after %.250s"
 msgstr ""
 "ཡིག་སྣོད་ `%.250s' འདི་ངན་ཅན་ཨིན་ - `%.250s' "
 "གི་ཤུལ་ལས་གྲལ་ཐིག་གསརཔ་བརླག་སྟོར་ཞུགས་ཡོདཔ།"
 
-#: dpkg-split/info.c dpkg-split/main.c
+#: dpkg-split/info.c:89 dpkg-split/main.c:114
 #, c-format
 msgid "error reading %.250s"
 msgstr "%.250s ལྷག་པའི་འཛོལ་བ།"
 
-#: dpkg-split/info.c:109
+#: dpkg-split/info.c:103
 #, c-format
 msgid "file `%.250s' is corrupt - bad magic at end of first header"
 msgstr ""
 "ཡིག་སྣོད་ `%.250s' འདི་ངན་ཅན་ - བྱང་ཉེས་མིག་འཕྲུལ་ "
 "མགོ་ཡིག་གི་མཇུག་ཡང་ན་དང་པ་ཡོད་མི་འདི་ཨིན།"
 
-#: dpkg-split/info.c:119
+#: dpkg-split/info.c:113
 #, c-format
 msgid "file `%.250s' is corrupt - bad padding character (code %d)"
 msgstr ""
 "ཡིག་སྣོད་ `%.250s' འདི་ངན་ཅན་ཨིན་ - བར་ཤབས་ཡིག་འབྲུ་བྱང་ཉེས་(ཨང་རྟགས་ %d)"
 
-#: dpkg-split/info.c:123
+#: dpkg-split/info.c:117
 #, c-format
 msgid "file `%.250s' is corrupt - nulls in info section"
 msgstr "ཡིག་སྣོད་ `%.250s' འདི་ངན་ཅན་ཨིན་ - བརྡ་མཚོན་དབྱེ་མཚན་ནང་སྟོང་ཆ་ཚུ།"
 
-#: dpkg-split/info.c
+#: dpkg-split/info.c:122
 msgid "format version number"
 msgstr ""
 
-#: dpkg-split/info.c
+#: dpkg-split/info.c:131
 #, c-format
 msgid "file '%.250s' has invalid format version: %s"
 msgstr ""
 
-#: dpkg-split/info.c
+#: dpkg-split/info.c:133
 #, c-format
 msgid "file '%.250s' is format version %d.%d; get a newer dpkg-split"
 msgstr ""
 
-#: dpkg-split/info.c
+#: dpkg-split/info.c:127
 msgid "package name"
 msgstr ""
 
-#: dpkg-split/info.c
+#: dpkg-split/info.c:128
 msgid "package version number"
 msgstr ""
 
-#: dpkg-split/info.c
+#: dpkg-split/info.c:129
 msgid "package file MD5 checksum"
 msgstr ""
 
-#: dpkg-split/info.c:141
+#: dpkg-split/info.c:132
 #, c-format
 msgid "file `%.250s' is corrupt - bad MD5 checksum `%.250s'"
 msgstr ""
 "ཡིག་སྣོད་ `%.250s' འདི་ངན་ཅན་ཨིན་ - བྱང་ཉེས་ ཨེམ་ཌི་༥ ཅེག་སམ་  `%.250s'"
 
-#: dpkg-split/info.c
+#: dpkg-split/info.c:134 dpkg-split/info.c:135
 msgid "archive total size"
 msgstr ""
 
-#: dpkg-split/info.c
+#: dpkg-split/info.c:136 dpkg-split/info.c:137
 msgid "archive part offset"
 msgstr ""
 
-#: dpkg-split/info.c
+#: dpkg-split/info.c:139
 msgid "archive part numbers"
 msgstr ""
 
-#: dpkg-split/info.c
+#: dpkg-split/info.c:142
 #, c-format
 msgid "file '%.250s' is corrupt - no slash between archive part numbers"
 msgstr ""
 
-#: dpkg-split/info.c
+#: dpkg-split/info.c:145
 msgid "number of archive parts"
 msgstr ""
 
-#: dpkg-split/info.c
+#: dpkg-split/info.c:147
 #, c-format
 msgid "file '%.250s' is corrupt - bad number of archive parts"
 msgstr ""
 
-#: dpkg-split/info.c
+#: dpkg-split/info.c:149
 msgid "archive parts number"
 msgstr ""
 
-#: dpkg-split/info.c
+#: dpkg-split/info.c:151
 #, c-format
 msgid "file '%.250s' is corrupt - bad archive part number"
 msgstr ""
 
-#: dpkg-split/info.c
+#: dpkg-split/info.c:157
 msgid "package architecture"
 msgstr ""
 
-#: dpkg-split/info.c:175
+#: dpkg-split/info.c:166
 #, c-format
 msgid "file `%.250s' is corrupt - bad magic at end of second header"
 msgstr ""
 "ཡིག་སྣོད་ `%.250s' འདི་ངན་ཅན་ཨིན་ - "
 "མགོ་ཡིག་གཉིས་པའི་མཇུག་ལུ་མིང་འཕྲུལ་བྱང་ཉེས།"
 
-#: dpkg-split/info.c:177
+#: dpkg-split/info.c:168
 #, c-format
 msgid "file `%.250s' is corrupt - second member is not data member"
 msgstr ""
 "ཡིག་སྣོད་ `%.250s' འདི་ངན་ཅན་ཨིན་ - འཐུས་མི་གཉིས་པ་འདི་གནད་སྡུད་འཐུས་མི་མེན།"
 
-#: dpkg-split/info.c:183
+#: dpkg-split/info.c:174
 #, c-format
 msgid "file `%.250s' is corrupt - wrong number of parts for quoted sizes"
 msgstr ""
 "ཡིག་སྣོད་ `%.250s' འདི་ངན་ཅན་ཨིན་ - "
 "འདྲེན་རྟགས་ནང་བཙུགས་ཡོད་པའི་ཚད་ཚུའི་དོན་ལུ་ཡན་ལག་གི་ཨང་ཕྱི་འགྱུར།"
 
-#: dpkg-split/info.c:187
+#: dpkg-split/info.c:178
 #, c-format
 msgid "file `%.250s' is corrupt - size is wrong for quoted part number"
 msgstr ""
 "ཡིག་སྣོད་ `%.250s' འདི་ངན་ཅན་ཨིན་ - ཚད་འདི་ "
 "འདྲེན་རྟགས་ནང་བཙུགས་ཡོད་པའི་ཡན་ལག་ཨང་གི་དོན་ལུ་ཕྱི་འགྱུར་ཨིན།"
 
-#: dpkg-split/info.c:193
+#: dpkg-split/info.c:184
 #, c-format
 msgid "unable to fstat part file `%.250s'"
 msgstr "ཡན་ལག་ཡིག་སྣོད་ `%.250s' ཨེཕ་སི་ཊེཊི་འབད་མ་ཚུགས།"
 
-#: dpkg-split/info.c:198
+#: dpkg-split/info.c:189
 #, c-format
 msgid "file `%.250s' is corrupt - too short"
 msgstr "ཡིག་སྣོད་ `%.250s' འདི་ངན་ཅན་ཨིན་པས་ -སྣ་མེད་ས་མེད་ཐུང་ཀུ།"
 
-#: dpkg-split/info.c:211 dpkg-split/info.c:258
+#: dpkg-split/info.c:202 dpkg-split/info.c:249
 #, c-format
 msgid "cannot open archive part file `%.250s'"
 msgstr "ཡིག་མཛོད་ཡན་ལག་ཡིག་སྣོད་ `%.250s'  ཁ་ཕྱེ་མི་ཚུགས།"
 
-#: dpkg-split/info.c:213
+#: dpkg-split/info.c:204
 #, c-format
 msgid "file `%.250s' is not an archive part"
 msgstr "ཡིག་སྣོད་ `%.250s' འདི་ཡིག་མཛོད་ཡན་ལག་མེན།"
 
-#: dpkg-split/info.c
+#: dpkg-split/info.c:218
 #, c-format
 msgid ""
 "%s:\n"
@@ -5151,59 +5181,59 @@
 "\n"
 msgstr ""
 
-#: dpkg-split/info.c
+#: dpkg-split/info.c:225
 msgctxt "architecture"
 msgid "<unknown>"
 msgstr ""
 
-#: dpkg-split/info.c dpkg-split/join.c
+#: dpkg-split/info.c:244 dpkg-split/join.c:105
 #, c-format
 msgid "--%s requires one or more part file arguments"
 msgstr ""
 
-#: dpkg-split/info.c:264
+#: dpkg-split/info.c:255
 #, c-format
 msgid "file `%s' is not an archive part\n"
 msgstr "ཡིག་སྣོད་ `%s' འདི་ཡིག་མཛོད་ཀྱི་ཡན་ལག་ཅིག་མེན།\n"
 
-#: dpkg-split/join.c
+#: dpkg-split/join.c:44
 #, c-format
 msgid "Putting package %s together from %d part: "
 msgid_plural "Putting package %s together from %d parts: "
 msgstr[0] ""
 msgstr[1] ""
 
-#: dpkg-split/join.c:52
+#: dpkg-split/join.c:51
 #, c-format
 msgid "unable to open output file `%.250s'"
 msgstr "ཨའུཊི་པུཏི་ཡིག་སྣོད་ `%.250s' ཁ་ཕྱེ་མ་ཚུགས།"
 
-#: dpkg-split/join.c:58
+#: dpkg-split/join.c:57
 #, c-format
 msgid "unable to (re)open input part file `%.250s'"
 msgstr "ཨིན་པུཏི་ཡན་ལག་ཡིག་སྣོད་ `%.250s' (ལོག་)ཁ་ཕྱེ་མ་ཚུགས།"
 
-#: dpkg-split/join.c
+#: dpkg-split/join.c:60
 #, c-format
 msgid "cannot skip split package header for '%s': %s"
 msgstr ""
 
-#: dpkg-split/join.c
+#: dpkg-split/join.c:63
 #, c-format
 msgid "cannot append split package part '%s' to '%s': %s"
 msgstr ""
 
-#: dpkg-split/join.c dpkg-split/split.c
+#: dpkg-split/join.c:69 dpkg-split/split.c:237
 #, c-format
 msgid "done\n"
 msgstr "འབད་ཚར་\n"
 
-#: dpkg-split/join.c:90
+#: dpkg-split/join.c:85
 #, c-format
 msgid "files `%.250s' and `%.250s' are not parts of the same file"
 msgstr "ཡིག་སྣོད་ `%.250s' དང་ `%.250s' ཚུ་ཡིག་སྣོད་གཅིག་པ་གི་ཡན་ལག་མེན།"
 
-#: dpkg-split/join.c:95
+#: dpkg-split/join.c:90
 #, c-format
 msgid ""
 "there are several versions of part %d - at least `%.250s' and `%.250s'"
@@ -5211,17 +5241,17 @@
 "འདི་ནང་ལུ་ཡན་ལག་ %d གི་ཐོན་རིམ་ལེ་ཤ་ཅིག་འདུག་ - ཉུང་མཐའ་ `%.250s' དང་ "
 "`%.250s'"
 
-#: dpkg-split/join.c
+#: dpkg-split/join.c:128
 #, c-format
 msgid "part %d is missing"
 msgstr "ཡན་ལག་ %d འདི་བརླག་སྟོར་ཞུགས་ནུག"
 
-#: dpkg-split/main.c:48
+#: dpkg-split/main.c:47
 #, c-format
 msgid "Debian `%s' package split/join tool; version %s.\n"
 msgstr "ཌི་བི་ཡཱན་ `%s' ཐུམ་སྒྲིལ་བཤག་/མཐུད་ནིའི་ལག་ཆས། ཐོན་རིམ་ %s.\n"
 
-#: dpkg-split/main.c
+#: dpkg-split/main.c:67
 #, c-format
 msgid ""
 "Commands:\n"
@@ -5243,7 +5273,7 @@
 "  -d|--བཏོན་བཀོག་ [<filename> ...]    མ་མཐུན་པའི་རྩེད་ཆས་བཏོན་བཀོག\n"
 "\n"
 
-#: dpkg-split/main.c
+#: dpkg-split/main.c:82
 #, c-format
 msgid ""
 "Options:\n"
@@ -5256,7 +5286,7 @@
 "\n"
 msgstr ""
 
-#: dpkg-split/main.c
+#: dpkg-split/main.c:92
 #, c-format
 msgid ""
 "Exit status:\n"
@@ -5265,177 +5295,177 @@
 "  2 = trouble\n"
 msgstr ""
 
-#: dpkg-split/main.c
+#: dpkg-split/main.c:103
 msgid "Type dpkg-split --help for help."
 msgstr "དབྱེ་བ་ ཌི་པི་ཀེ་ཇི་-བཤག་ --གྲོགས་རམ་གྱི་དོན་ལུ་གྲོགས་རམ།"
 
-#: dpkg-split/main.c
+#: dpkg-split/main.c:115
 #, c-format
 msgid "unexpected end of file in %.250s"
 msgstr "%.250s ནང་ལུ་ཡིག་སྣོད་ཀྱི་རེ་བ་མེད་པའི་མཇུག"
 
-#: dpkg-split/main.c
+#: dpkg-split/main.c:126
 msgid "part size is far too large or is not positive"
 msgstr "ཡན་ལག་ཚད་འདི་སྣ་མེད་ས་མེད་རིང་བ་ཡང་འདི་ཡོད་ཆ་མེན་པས།"
 
-#: dpkg-split/main.c
+#: dpkg-split/main.c:130
 #, c-format
 msgid "part size must be at least %d KiB (to allow for header)"
 msgstr ""
 
-#: dpkg-split/queue.c:95
+#: dpkg-split/queue.c:90
 #, c-format
 msgid "unable to read depot directory `%.250s'"
 msgstr "དོས་ཁང་སྣོད་ཐོ་ `%.250s' ལྷག་མ་ཚུགས།"
 
-#: dpkg-split/queue.c
+#: dpkg-split/queue.c:134
 msgid "--auto requires the use of the --output option"
 msgstr "--རང་བཞིན་ལུ་--ཨའུཊི་པུཊི་གདམ་འདི་གི་ལག་ལེན་འདི་དགོཔ་ཨིན།"
 
-#: dpkg-split/queue.c
+#: dpkg-split/queue.c:136
 msgid "--auto requires exactly one part file argument"
 msgstr "--རང་བཞིན་ལུ་ཡན་ལག་ཡིག་སྣོད་ཀྱི་སྒྲུབ་རྟགས་གཅིག་ཏག་ཏག་དགོ"
 
-#: dpkg-split/queue.c:152
+#: dpkg-split/queue.c:140
 #, c-format
 msgid "unable to read part file `%.250s'"
 msgstr "ཡན་ལག་ཡིག་སྣོད་ `%.250s' ལྷག་མ་ཚུགས།"
 
-#: dpkg-split/queue.c:155
+#: dpkg-split/queue.c:143
 #, c-format
 msgid "File `%.250s' is not part of a multipart archive.\n"
 msgstr "ཡིག་སྣོད་ `%.250s' འདི་སྣ་མང་ཡན་ལག་ཡིག་མཛོད་ཀྱི་ཡན་ལག་མེན།\n"
 
-#: dpkg-split/queue.c:193
+#: dpkg-split/queue.c:179
 #, c-format
 msgid "unable to reopen part file `%.250s'"
 msgstr "ཡན་ལག་ཡིག་སྣོད་ `%.250s' ལོག་ཁ་ཕྱེ་མ་ཚུགས།"
 
-#: dpkg-split/queue.c:196
+#: dpkg-split/queue.c:182
 #, c-format
 msgid "unable to open new depot file `%.250s'"
 msgstr "དོས་ཁང་ཡིག་སྣོད་གསརཔ་ `%.250s' ཁ་ཕྱེ་མ་ཚུགས།"
 
-#: dpkg-split/queue.c
+#: dpkg-split/queue.c:199
 #, c-format
 msgid "cannot extract split package part '%s': %s"
 msgstr ""
 
-#: dpkg-split/queue.c:208
+#: dpkg-split/queue.c:192
 #, c-format
 msgid "unable to rename new depot file `%.250s' to `%.250s'"
 msgstr ""
 "དོས་ཁང་ཡིག་སྣོད་གསརཔ་ `%.250s' འདི་ `%.250s' ལུ་བསྐྱར་མིང་བཏགས་མ་ཚུགས།"
 
-#: dpkg-split/queue.c
+#: dpkg-split/queue.c:196
 #, c-format
 msgid "Part %d of package %s filed (still want "
 msgstr "ཡན་ལག་ %d ཐུམ་སྒྲིལ་ %s ལས་བཙུགས་ཡོདཔ་(ད་ལྟོ་ཡང་དགོ་ནི་ "
 
-#: dpkg-split/queue.c
+#: dpkg-split/queue.c:200
 msgid " and "
 msgstr " དང་ "
 
-#: dpkg-split/queue.c:230
+#: dpkg-split/queue.c:214
 #, c-format
 msgid "unable to delete used-up depot file `%.250s'"
 msgstr "ལག་ལེན་འཐབ་ཡོད་པའི་དོས་ཁང་ཡིག་སྣོད་ `%.250s' བཏོན་གཏང་མ་ཚུགས།"
 
-#: dpkg-split/queue.c
+#: dpkg-split/queue.c:235
 msgid "Junk files left around in the depot directory:\n"
 msgstr "དོས་ཁང་སྣོད་ཐོ་ནང་གི་མཐའ་འཁོར་ལུ་བཞག་མི་མཁོ་མེད་ཡིག་སྣོད་ཚུ་:\n"
 
-#: dpkg-split/queue.c:258 dpkg-split/queue.c:287
+#: dpkg-split/queue.c:240 dpkg-split/queue.c:269
 #, c-format
 msgid "unable to stat `%.250s'"
 msgstr "`%.250s' སི་ཊེཊི་འབད་མ་ཚུགས།"
 
-#: dpkg-split/queue.c
+#: dpkg-split/queue.c:243
 #, c-format
 msgid " %s (%jd bytes)\n"
 msgstr ""
 
-#: dpkg-split/queue.c
+#: dpkg-split/queue.c:245
 #, c-format
 msgid " %s (not a plain file)\n"
 msgstr " %s (ཉག་རྐྱང་ཡིག་སྣོད་ཅིག་མེན་)\n"
 
-#: dpkg-split/queue.c
+#: dpkg-split/queue.c:250
 msgid "Packages not yet reassembled:\n"
 msgstr "ཐུམ་སྒྲིལ་ཚུ་ད་ཚུན་ལོག་མ་འཛོམས་པས:\n"
 
-#: dpkg-split/queue.c
+#: dpkg-split/queue.c:258
 #, c-format
 msgid " Package %s: part(s) "
 msgstr ""
 
-#: dpkg-split/queue.c:289
+#: dpkg-split/queue.c:271
 #, c-format
 msgid "part file `%.250s' is not a plain file"
 msgstr "ཡན་ལག་ཡིག་སྣོད་ `%.250s' འདི་ཉག་རྐྱང་ཡིག་སྣོད་ཅིག་མེན།"
 
-#: dpkg-split/queue.c
+#: dpkg-split/queue.c:278
 #, c-format
 msgid "(total %jd bytes)\n"
 msgstr ""
 
-#: dpkg-split/queue.c:329
+#: dpkg-split/queue.c:304
 #, c-format
 msgid "unable to discard `%.250s'"
 msgstr "`%.250s' བཏོན་བཀོག་མ་ཚུགས།"
 
-#: dpkg-split/queue.c
+#: dpkg-split/queue.c:305
 #, c-format
 msgid "Deleted %s.\n"
 msgstr "%s བཏོན་གཏང་ཡོདཔ།\n"
 
-#: dpkg-split/split.c
+#: dpkg-split/split.c:70 dpkg-split/split.c:76 dpkg-split/split.c:81
 msgid "package field value extraction"
 msgstr ""
 
-#: dpkg-split/split.c:79
+#: dpkg-split/split.c:78
 #, c-format
 msgid "cannot extract package field value from '%s': %s"
 msgstr ""
 
-#: dpkg-split/split.c:136
+#: dpkg-split/split.c:131
 #, c-format
 msgid "unable to open source file `%.250s'"
 msgstr "འབྱུང་ཁུངས་ཡིག་སྣོད་ `%.250s' ཁ་ཕྱེ་མ་ཚུགས།"
 
-#: dpkg-split/split.c
+#: dpkg-split/split.c:133
 msgid "unable to fstat source file"
 msgstr "འབྱུང་ཁུངས་ཡིག་སྣོད་ ཨེཕ་སི་ཊེཊི་འབད་མ་ཚུགས།"
 
-#: dpkg-split/split.c:140
+#: dpkg-split/split.c:135
 #, c-format
 msgid "source file `%.250s' not a plain file"
 msgstr "འབྱུང་ཁུངས་ཡིག་སྣོད་ `%.250s' འདི་ཉག་རྐྱང་ཡིག་སྣོད་ཅིག་མེན།"
 
-#: dpkg-split/split.c
+#: dpkg-split/split.c:153
 #, c-format
 msgid "Splitting package %s into %d part: "
 msgid_plural "Splitting package %s into %d parts: "
 msgstr[0] ""
 msgstr[1] ""
 
-#: dpkg-split/split.c
+#: dpkg-split/split.c:197
 msgid ""
 "header is too long, making part too long; the package name or version\n"
 "numbers must be extraordinarily long, or something; giving up"
 msgstr ""
 
-#: dpkg-split/split.c
+#: dpkg-split/split.c:249
 msgid "--split needs a source filename argument"
 msgstr "--བཤག་ནི་ལུ་ འབྱུང་ཁུངས་ཡིག་སྣོད་མིང་གི་སྒྲུབ་རྟགས་ཅིག་དགོཔ་ཨིན།"
 
-#: dpkg-split/split.c
+#: dpkg-split/split.c:252
 msgid "--split takes at most a source filename and destination prefix"
 msgstr ""
 "--བཤག་ནི་འདི་གིས་ "
 "འབྱུང་ཁུངས་ཡིག་སྣོད་མིང་དང་འགྲོ་ཡུལ་སྔོན་ཚིག་མང་ཤོས་འབགཔ་ཨིན།"
 
-#: utils/update-alternatives.c
+#: utils/update-alternatives.c:101
 #, c-format
 msgid ""
 "Commands:\n"
@@ -5459,7 +5489,7 @@
 "\n"
 msgstr ""
 
-#: utils/update-alternatives.c
+#: utils/update-alternatives.c:120
 #, c-format
 msgid ""
 "<link> is the symlink pointing to %s/<name>.\n"
@@ -5474,7 +5504,7 @@
 "\n"
 msgstr ""
 
-#: utils/update-alternatives.c
+#: utils/update-alternatives.c:131
 #, c-format
 msgid ""
 "Options:\n"
@@ -5491,456 +5521,459 @@
 "  --version                show the version.\n"
 msgstr ""
 
-#: utils/update-alternatives.c
+#: utils/update-alternatives.c:150 utils/update-alternatives.c:163
 msgid "error"
 msgstr ""
 
-#: utils/update-alternatives.c
+#: utils/update-alternatives.c:176
 #, c-format
 msgid "Use '%s --help' for program usage information."
 msgstr ""
 
-#: utils/update-alternatives.c
+#: utils/update-alternatives.c:193
 msgid "warning"
 msgstr "ཉེན་བརྡ།"
 
-#: utils/update-alternatives.c
+#: lib/dpkg/mlib.c:44 utils/update-alternatives.c:262
 #, c-format
 msgid "malloc failed (%zu bytes)"
 msgstr ""
 
-#: utils/update-alternatives.c
+#: utils/update-alternatives.c:356
 #, c-format
 msgid "two commands specified: --%s and --%s"
 msgstr ""
 
-#: utils/update-alternatives.c
+#: utils/update-alternatives.c:387
 #, c-format
 msgid "cannot append to '%s'"
 msgstr ""
 
-#: utils/update-alternatives.c
+#: utils/update-alternatives.c:556
 #, c-format
 msgid "unable to remove '%s'"
 msgstr ""
 
-#: utils/update-alternatives.c
+#: utils/update-alternatives.c:1502 utils/update-alternatives.c:1569
+#: utils/update-alternatives.c:2638
 msgid "auto mode"
 msgstr ""
 
-#: utils/update-alternatives.c
+#: utils/update-alternatives.c:1502 utils/update-alternatives.c:1578
+#: utils/update-alternatives.c:2639
 msgid "manual mode"
 msgstr ""
 
-#: utils/update-alternatives.c
+#: utils/update-alternatives.c:1111
 #, c-format
 msgid "unexpected end of file while trying to read %s"
 msgstr ""
 
-#: utils/update-alternatives.c
+#: utils/update-alternatives.c:1113
 #, c-format
 msgid "while reading %s: %s"
 msgstr ""
 
-#: utils/update-alternatives.c
+#: utils/update-alternatives.c:1119
 #, c-format
 msgid "line not terminated while trying to read %s"
 msgstr ""
 
-#: utils/update-alternatives.c
+#: utils/update-alternatives.c:1137
 #, c-format
 msgid "%s corrupt: %s"
 msgstr ""
 
-#: utils/update-alternatives.c
+#: utils/update-alternatives.c:1150
 #, c-format
 msgid "newlines prohibited in update-alternatives files (%s)"
 msgstr "དུས་མཐུན་-སྤེལ་མའི་ཡིག་སྣོད་ཚུ་ (%s) ནང་ལུ་གྲལ་ཐིག་གསརཔ་ཚུ་བཀག་ཡོདཔ།"
 
-#: utils/update-alternatives.c
+#: utils/update-alternatives.c:1163
 msgid "slave name"
 msgstr ""
 
-#: utils/update-alternatives.c
+#: utils/update-alternatives.c:1171 utils/update-alternatives.c:2405
 #, c-format
 msgid "duplicate slave name %s"
 msgstr ""
 
-#: utils/update-alternatives.c
+#: utils/update-alternatives.c:1174
 msgid "slave link"
 msgstr ""
 
-#: utils/update-alternatives.c
+#: utils/update-alternatives.c:1178
 #, c-format
 msgid "slave link same as main link %s"
 msgstr "འབྲན་གཡོག་འབྲེལ་ལམ་འདི་འབྲེལ་ལམ་གཙོ་བོ་ %s དང་ལྕོགས་རང་ཐད།"
 
-#: utils/update-alternatives.c
+#: utils/update-alternatives.c:1185 utils/update-alternatives.c:2412
 #, c-format
 msgid "duplicate slave link %s"
 msgstr "བྲན་གཡོག་འབྲེལ་ལམ་ %s རྫུན་མ།"
 
-#: utils/update-alternatives.c
+#: utils/update-alternatives.c:1204
 msgid "master file"
 msgstr ""
 
-#: utils/update-alternatives.c
+#: utils/update-alternatives.c:1213
 #, c-format
 msgid "duplicate path %s"
 msgstr "འགྲུལ་ལམ་རྫུན་མ་ %s"
 
-#: utils/update-alternatives.c
+#: utils/update-alternatives.c:1238
 #, c-format
 msgid ""
 "alternative %s (part of link group %s) doesn't exist; removing from list of "
 "alternatives"
 msgstr ""
 
-#: utils/update-alternatives.c
+#: utils/update-alternatives.c:1229 utils/update-alternatives.c:1240
 msgid "priority"
 msgstr ""
 
-#: utils/update-alternatives.c
+#: utils/update-alternatives.c:1232 utils/update-alternatives.c:1249
 msgid "slave file"
 msgstr ""
 
-#: utils/update-alternatives.c
+#: utils/update-alternatives.c:1244
 #, c-format
 msgid "priority of %s: %s"
 msgstr ""
 
-#: utils/update-alternatives.c
+#: utils/update-alternatives.c:1261
 #, c-format
 msgid "priority of %s is out of range: %s"
 msgstr ""
 
-#: utils/update-alternatives.c
+#: utils/update-alternatives.c:1297
 msgid "status"
 msgstr ""
 
-#: utils/update-alternatives.c
+#: utils/update-alternatives.c:1299
 msgid "invalid status"
 msgstr ""
 
-#: utils/update-alternatives.c
+#: utils/update-alternatives.c:1304
 msgid "master link"
 msgstr ""
 
-#: utils/update-alternatives.c
+#: utils/update-alternatives.c:1366
 #, c-format
 msgid "discarding obsolete slave link %s (%s)"
 msgstr ""
 
-#: utils/update-alternatives.c
+#: src/divertcmd.c:375 src/statcmd.c:215 utils/update-alternatives.c:1404
 #, c-format
 msgid "unable to flush file '%s'"
 msgstr ""
 
-#: utils/update-alternatives.c
+#: utils/update-alternatives.c:1505
 #, c-format
 msgid "  link currently points to %s"
 msgstr ""
 
-#: utils/update-alternatives.c
+#: utils/update-alternatives.c:1508
 msgid "  link currently absent"
 msgstr ""
 
-#: utils/update-alternatives.c
+#: utils/update-alternatives.c:1512
 #, c-format
 msgid "%s - priority %d"
 msgstr ""
 
-#: utils/update-alternatives.c
+#: utils/update-alternatives.c:1515
 #, c-format
 msgid "  slave %s: %s"
 msgstr ""
 
-#: utils/update-alternatives.c
+#: utils/update-alternatives.c:1522
 #, c-format
 msgid "Current 'best' version is '%s'."
 msgstr ""
 
-#: utils/update-alternatives.c
+#: utils/update-alternatives.c:1524
 msgid "No versions available."
 msgstr "ཐོན་རིམ་ཚུ་ཐོབ་ཚུགསཔ་མེད།"
 
-#: utils/update-alternatives.c
+#: utils/update-alternatives.c:1553
 #, c-format
 msgid "There is %d choice for the alternative %s (providing %s)."
 msgid_plural "There are %d choices for the alternative %s (providing %s)."
 msgstr[0] ""
 msgstr[1] ""
 
-#: utils/update-alternatives.c
+#: utils/update-alternatives.c:1560
 msgid "Selection"
 msgstr ""
 
-#: utils/update-alternatives.c
+#: utils/update-alternatives.c:1561
 msgid "Path"
 msgstr ""
 
-#: utils/update-alternatives.c
+#: utils/update-alternatives.c:1561
 msgid "Priority"
 msgstr ""
 
-#: utils/update-alternatives.c
+#: utils/update-alternatives.c:1561
 msgid "Status"
 msgstr ""
 
-#: utils/update-alternatives.c:1617
+#: utils/update-alternatives.c:1582
 #, c-format
 msgid "Press enter to keep the current choice[*], or type selection number: "
 msgstr ""
 
-#: utils/update-alternatives.c
+#: utils/update-alternatives.c:1765
 #, c-format
 msgid "not replacing %s with a link"
 msgstr ""
 
-#: utils/update-alternatives.c
+#: utils/update-alternatives.c:1762
 #, c-format
 msgid "can't install unknown choice %s"
 msgstr ""
 
-#: utils/update-alternatives.c
+#: utils/update-alternatives.c:1824
 #, c-format
 msgid ""
 "skip creation of %s because associated file %s (of link group %s) doesn't "
 "exist"
 msgstr ""
 
-#: utils/update-alternatives.c
+#: utils/update-alternatives.c:1834
 #, c-format
 msgid "not removing %s since it's not a symlink"
 msgstr ""
 
-#: utils/update-alternatives.c
+#: utils/update-alternatives.c:2041 utils/update-alternatives.c:2047
 #, c-format
 msgid "Call %s."
 msgstr ""
 
-#: utils/update-alternatives.c
+#: utils/update-alternatives.c:2051
 #, c-format
 msgid "Alternative %s unchanged because choice %s is not available."
 msgstr ""
 
-#: utils/update-alternatives.c
+#: utils/update-alternatives.c:2055
 #, c-format
 msgid "Skip unknown alternative %s."
 msgstr ""
 
-#: utils/update-alternatives.c
+#: utils/update-alternatives.c:2077
 #, c-format
 msgid "line too long or not terminated while trying to read %s"
 msgstr ""
 
-#: utils/update-alternatives.c
+#: utils/update-alternatives.c:2090 utils/update-alternatives.c:2103
+#: utils/update-alternatives.c:2113
 #, c-format
 msgid "Skip invalid line: %s"
 msgstr ""
 
-#: utils/update-alternatives.c
+#: utils/update-alternatives.c:2224
 #, c-format
 msgid "%s/%s is dangling; it will be updated with best choice"
 msgstr ""
 
-#: utils/update-alternatives.c
+#: utils/update-alternatives.c:2228
 #, c-format
 msgid ""
 "%s/%s has been changed (manually or by a script); switching to manual "
 "updates only"
 msgstr ""
 
-#: utils/update-alternatives.c
+#: utils/update-alternatives.c:2236
 #, c-format
 msgid "setting up automatic selection of %s"
 msgstr ""
 
-#: utils/update-alternatives.c
+#: utils/update-alternatives.c:2275
 #, c-format
 msgid "renaming %s slave link from %s to %s"
 msgstr ""
 
-#: utils/update-alternatives.c
+#: utils/update-alternatives.c:2296
 #, c-format
 msgid "renaming %s link from %s to %s"
 msgstr ""
 
-#: utils/update-alternatives.c:2334
+#: utils/update-alternatives.c:2332
 #, c-format
 msgid "using %s to provide %s (%s) in %s"
 msgstr ""
 
-#: utils/update-alternatives.c
+#: utils/update-alternatives.c:2341
 #, c-format
 msgid "updating alternative %s because link group %s has changed slave links"
 msgstr ""
 
-#: utils/update-alternatives.c
+#: utils/update-alternatives.c:2346
 #, c-format
 msgid ""
 "forcing reinstallation of alternative %s because link group %s is broken"
 msgstr ""
 
-#: utils/update-alternatives.c
+#: utils/update-alternatives.c:2354
 #, c-format
 msgid "current alternative %s is unknown, switching to %s for link group %s"
 msgstr ""
 
-#: utils/update-alternatives.c
+#: utils/update-alternatives.c:2380
 #, c-format
 msgid "alternative name (%s) must not contain '/' and spaces"
 msgstr ""
 
-#: utils/update-alternatives.c
+#: utils/update-alternatives.c:2193
 #, c-format
 msgid "alternative link is not absolute as it should be: %s"
 msgstr ""
 
-#: utils/update-alternatives.c
+#: utils/update-alternatives.c:2197
 #, c-format
 msgid "alternative path is not absolute as it should be: %s"
 msgstr ""
 
-#: utils/update-alternatives.c
+#: utils/update-alternatives.c:2224
 #, c-format
 msgid "alternative %s can't be master: it is a slave of %s"
 msgstr ""
 
-#: utils/update-alternatives.c
+#: utils/update-alternatives.c:2435 utils/update-alternatives.c:2471
 #, c-format
 msgid "alternative link %s is already managed by %s"
 msgstr ""
 
-#: utils/update-alternatives.c
+#: utils/update-alternatives.c:2441
 #, c-format
 msgid "alternative path %s doesn't exist"
 msgstr ""
 
-#: utils/update-alternatives.c
+#: utils/update-alternatives.c:2458
 #, c-format
 msgid "alternative %s can't be slave of %s: it is a master alternative"
 msgstr ""
 
-#: utils/update-alternatives.c
+#: utils/update-alternatives.c:2258
 #, c-format
 msgid "alternative %s can't be slave of %s: it is a slave of %s"
 msgstr ""
 
-#: utils/update-alternatives.c
+#: utils/update-alternatives.c:2482
 #, c-format
 msgid "alternative link %s is already managed by %s (slave of %s)"
 msgstr ""
 
-#: utils/update-alternatives.c:2532
+#: utils/update-alternatives.c:2324
 #, c-format
 msgid "unknown argument `%s'"
 msgstr "མ་ཤེས་པའི་སྒྲུབ་རྟགས་ `%s'"
 
-#: utils/update-alternatives.c
+#: utils/update-alternatives.c:2343
 msgid "--install needs <link> <name> <path> <priority>"
 msgstr "--གཞི་བཙུགས་ལུ་ <link> <name> <path> <priority> དགོཔ་ཨིན།"
 
-#: utils/update-alternatives.c
+#: utils/update-alternatives.c:2346 utils/update-alternatives.c:2397
 msgid "<link> and <path> can't be the same"
 msgstr ""
 
-#: utils/update-alternatives.c
+#: utils/update-alternatives.c:2349
 msgid "priority must be an integer"
 msgstr "གཙོ་རིམ་འདི་ཧྲིལ་ཨང་ཅིག་ཨིན་དགོ"
 
-#: utils/update-alternatives.c
+#: utils/update-alternatives.c:2558
 msgid "priority is out of range"
 msgstr ""
 
-#: utils/update-alternatives.c
+#: utils/update-alternatives.c:2362
 #, c-format
 msgid "--%s needs <name> <path>"
 msgstr "--%s ལུ་ <name> <path> དགོཔ་ཨིན།"
 
-#: utils/update-alternatives.c
+#: utils/update-alternatives.c:2376
 #, c-format
 msgid "--%s needs <name>"
 msgstr "--%s ལུ་ <name> དགོཔ་ཨིན།"
 
-#: utils/update-alternatives.c
+#: utils/update-alternatives.c:2388
 msgid "--slave only allowed with --install"
 msgstr "--བྲན་གཡོག་འདི་ --གཞི་བཙུགས་དང་ཅིག་ཁར་རྐྱངམ་ཅིག་འབད་ཆོགཔ་ཨིན།"
 
-#: utils/update-alternatives.c
+#: utils/update-alternatives.c:2390
 msgid "--slave needs <link> <name> <path>"
 msgstr "--བྲན་གཡོག་ལུ་ <link> <name> <path> དགོཔ་ཨིན།"
 
-#: utils/update-alternatives.c
+#: utils/update-alternatives.c:2399
 #, c-format
 msgid "name %s is both primary and slave"
 msgstr "མིང་  %s འདི་གཞི་རིམ་དང་བྲན་གཡོག་གཉིས་ཆ་རང་ཨིན།"
 
-#: utils/update-alternatives.c
+#: utils/update-alternatives.c:2402
 #, c-format
 msgid "link %s is both primary and slave"
 msgstr "འབྲེལ་ལམ་ %s འདི་ གཞི་རིམ་དང་བྲན་གཡོག་གཉིས་ཆ་རང་ཨིན།"
 
-#: utils/update-alternatives.c
+#: utils/update-alternatives.c:2422
 #, c-format
 msgid "--%s needs a <file> argument"
 msgstr ""
 
-#: utils/update-alternatives.c:2669
+#: utils/update-alternatives.c:2448
 #, c-format
 msgid "unknown option `%s'"
 msgstr "མ་ཤེས་པའི་གདམ་ཁ་ `%s'"
 
-#: utils/update-alternatives.c
+#: utils/update-alternatives.c:2453
 msgid ""
 "need --display, --query, --list, --get-selections, --config, --set, --set-"
 "selections, --install, --remove, --all, --remove-all or --auto"
 msgstr ""
 
-#: utils/update-alternatives.c
+#: utils/update-alternatives.c:2685 utils/update-alternatives.c:2691
 #, c-format
 msgid "no alternatives for %s"
 msgstr ""
 
-#: utils/update-alternatives.c
+#: utils/update-alternatives.c:2490
 msgid "<standard input>"
 msgstr ""
 
-#: utils/update-alternatives.c
+#: utils/update-alternatives.c:2730
 #, c-format
 msgid "alternative %s for %s not registered; not setting"
 msgstr ""
 
-#: utils/update-alternatives.c
+#: utils/update-alternatives.c:2557 utils/update-alternatives.c:2563
 #, c-format
 msgid "There is no program which provides %s."
 msgstr ""
 
-#: utils/update-alternatives.c
+#: utils/update-alternatives.c:2565 utils/update-alternatives.c:2575
 msgid "Nothing to configure."
 msgstr ""
 
-#: utils/update-alternatives.c
+#: utils/update-alternatives.c:2750
 #, c-format
 msgid "There is only one alternative in link group %s (providing %s): %s"
 msgstr ""
 
-#: utils/update-alternatives.c
+#: utils/update-alternatives.c:2760
 #, c-format
 msgid "alternative %s for %s not registered; not removing"
 msgstr ""
 
-#: utils/update-alternatives.c
+#: utils/update-alternatives.c:2592
 #, c-format
 msgid "removing manually selected alternative - switching %s to auto mode"
 msgstr ""
 
-#: utils/update-alternatives.c
+#: utils/update-alternatives.c:2793
 #, c-format
 msgid "automatic updates of %s/%s are disabled; leaving it alone"
 msgstr ""
 
-#: utils/update-alternatives.c
+#: utils/update-alternatives.c:2795
 #, c-format
 msgid "to return to automatic updates use '%s --auto %s'"
 msgstr ""
diff -Nru language-pack-dz-base-14.04+20150804/data/dz/LC_MESSAGES/libapt-inst1.5.po language-pack-dz-base-14.04+20160720/data/dz/LC_MESSAGES/libapt-inst1.5.po
--- language-pack-dz-base-14.04+20150804/data/dz/LC_MESSAGES/libapt-inst1.5.po	2015-08-14 07:53:49.000000000 +0000
+++ language-pack-dz-base-14.04+20160720/data/dz/LC_MESSAGES/libapt-inst1.5.po	2016-07-20 16:44:54.000000000 +0000
@@ -7,14 +7,14 @@
 "Project-Id-Version: apt_po.pot\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
 "POT-Creation-Date: 2012-03-15 19:05+0000\n"
-"PO-Revision-Date: 2015-08-02 01:00+0000\n"
+"PO-Revision-Date: 2016-05-25 09:49+0000\n"
 "Last-Translator: kinley tshering <Unknown>\n"
 "Language-Team: Dzongkha <pgeyleg@dit.gov.bt>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-08-04 05:28+0000\n"
-"X-Generator: Launchpad (build 17656)\n"
+"X-Launchpad-Export-Date: 2016-07-20 10:32+0000\n"
+"X-Generator: Launchpad (build 18147)\n"
 "X-Poedit-Country: Bhutan\n"
 "Language: dz\n"
 "X-Poedit-Language: Dzongkha\n"
@@ -28,157 +28,156 @@
 msgid "Failed to exec gzip "
 msgstr "ཇི་ཛིཔ་འདི་ལག་ལེན་འཐབ་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད། "
 
-#: apt-inst/contrib/extracttar.cc:178 apt-inst/contrib/extracttar.cc:204
+#: apt-inst/contrib/extracttar.cc
 msgid "Corrupted archive"
 msgstr "ངན་ཅན་གྱི་ཡིག་མཛོད།"
 
-#: apt-inst/contrib/extracttar.cc:193
+#: apt-inst/contrib/extracttar.cc
 msgid "Tar checksum failed, archive corrupted"
 msgstr "ཊར་ཅེག་སམ་དེ་འཐུས་ཤོར་བྱུང་ཡོད་  ཡིག་མཛོད་ངན་ཅན་བྱུང་ནུག"
 
-#: apt-inst/contrib/extracttar.cc:296
+#: apt-inst/contrib/extracttar.cc
 #, c-format
 msgid "Unknown TAR header type %u, member %s"
 msgstr "མ་ཤེས་པའི་ ཊཱར་་མགོ་ཡིག་་དབྱེ་བ་ %u་ འཐུས་མི་ %s།"
 
-#: apt-inst/contrib/arfile.cc:70
+#: apt-inst/contrib/arfile.cc
 msgid "Invalid archive signature"
 msgstr "ནུས་མེད་ཡིག་མཛོད་ཀྱི་མིང་རྟགས།"
 
-#: apt-inst/contrib/arfile.cc:78
+#: apt-inst/contrib/arfile.cc
 msgid "Error reading archive member header"
 msgstr "ཡིག་མཛོད་འཐུས་མི་མགོ་ཡིག་ལྷག་ནིའི་འཛོལ་བ།"
 
-#: apt-inst/contrib/arfile.cc:90
+#: apt-inst/contrib/arfile.cc
 #, c-format
 msgid "Invalid archive member header %s"
 msgstr ""
 
-#: apt-inst/contrib/arfile.cc:102
+#: apt-inst/contrib/arfile.cc
 msgid "Invalid archive member header"
 msgstr "ནུས་མེད་ཡིག་མཛོད་འཐུས་མི་གི་མགོ་ཡིག་"
 
-#: apt-inst/contrib/arfile.cc:128
+#: apt-inst/contrib/arfile.cc
 msgid "Archive is too short"
 msgstr "ཡིག་མཛོད་འདི་གནམ་མེད་ས་མེད་ཐུང་ཀུ་འདུག"
 
-#: apt-inst/contrib/arfile.cc:132
+#: apt-inst/contrib/arfile.cc
 msgid "Failed to read the archive headers"
 msgstr "ཡིག་མཛོད་མགོ་ཡིག་ཚུ་ལྷག་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།"
 
-#: apt-inst/filelist.cc:380
+#: apt-inst/filelist.cc
 msgid "DropNode called on still linked node"
 msgstr ""
 "ད་ལྟོ་ཡང་འབྲེལ་ལམ་ཡོད་པའི་མཐུད་མཚམས་གུར་བཀོག་བཞག་མཐུད་མཚམས་དེ་བོད་བརྡ་འབད་འདི"
 "་ཡོད།"
 
-#: apt-inst/filelist.cc:412
+#: apt-inst/filelist.cc
 msgid "Failed to locate the hash element!"
 msgstr "དྲྭ་རྟགས་རྒྱུ་རྫས་འདི་ག་ཡོད་འཚོལ་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད!"
 
-#: apt-inst/filelist.cc:459
+#: apt-inst/filelist.cc
 msgid "Failed to allocate diversion"
 msgstr "ཁ་ཕྱོགས་སྤྲོད་བཞག་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།"
 
-#: apt-inst/filelist.cc:464
+#: apt-inst/filelist.cc
 msgid "Internal error in AddDiversion"
 msgstr "ཁ་ཕྱོགས་ཁ་སྐོང་རྐྱབ་ནི་ནང་  ནང་འཁོད་ཀྱི་འཛོལ་བ།"
 
-#: apt-inst/filelist.cc:477
+#: apt-inst/filelist.cc
 #, c-format
 msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
 msgstr ""
 "%s -> %s ་དང་ %s/%s་ཁ་ཕྱོགས་ཅིག་ཚབ་སྲུང་འབད་ནི་ལུ་འབད་རྩོལ་བསྐྱེད་དོ།"
 
-#: apt-inst/filelist.cc:506
+#: apt-inst/filelist.cc
 #, c-format
 msgid "Double add of diversion %s -> %s"
 msgstr "%s -> %s་ཁ་ཕྱོགས་ཀྱི་ལོག་བལྟབ་ཁ་སྐོང་།"
 
-#: apt-inst/filelist.cc:549
+#: apt-inst/filelist.cc
 #, c-format
 msgid "Duplicate conf file %s/%s"
 msgstr "རིམ་སྒྲིག་ཡིག་སྣོད་%s/%s་འདི་ངོ་བཤུས་བཟོ།"
 
-#: apt-inst/dirstream.cc:41 apt-inst/dirstream.cc:46 apt-inst/dirstream.cc:49
+#: apt-inst/dirstream.cc
 #, c-format
 msgid "Failed to write file %s"
 msgstr "%s་ཡིག་སྣོད་འདི་འབྲི་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།"
 
-#: apt-inst/dirstream.cc:92 apt-inst/dirstream.cc:100
+#: apt-inst/dirstream.cc
 #, c-format
 msgid "Failed to close file %s"
 msgstr "%s་ཡིག་སྣོད་འདི་ཁ་བསྡམས་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།"
 
-#: apt-inst/extract.cc:93 apt-inst/extract.cc:164
+#: apt-inst/extract.cc
 #, c-format
 msgid "The path %s is too long"
 msgstr "%s་འགྲུལ་ལམ་དེ་གནམ་མེད་ས་མེད་རིངམ་འདུག"
 
-#: apt-inst/extract.cc:124
+#: apt-inst/extract.cc
 #, c-format
 msgid "Unpacking %s more than once"
 msgstr "སྦུང་ཚན་བཟོ་བཤོལ་%s་གཅིག་ལས་ལྷག་སྟེ་འདུག"
 
-#: apt-inst/extract.cc:134
+#: apt-inst/extract.cc
 #, c-format
 msgid "The directory %s is diverted"
 msgstr "སྣོད་ཐོ་%s་འདི་ཁ་ཕྱོགས་སྒྱུར་དེ་ཡོད།"
 
-#: apt-inst/extract.cc:144
+#: apt-inst/extract.cc
 #, c-format
 msgid "The package is trying to write to the diversion target %s/%s"
 msgstr ""
 "ཐུམ་སྒྲིལ་འདི་གིས་ག་སྒྱུར་དམིགས་གཏད་%s/%s་ལུ་འབྲི་ནིའི་འབད་རྩོལ་བསྐྱེདཔ་དེ་ཡོ"
 "ད།"
 
-#: apt-inst/extract.cc:154 apt-inst/extract.cc:297
+#: apt-inst/extract.cc
 msgid "The diversion path is too long"
 msgstr "ཁ་སྒྱུར་འགྲུལ་ལམ་འདི་གནམ་མེད་ས་མེད་རིངམ་ཨིན་པས།"
 
-#: apt-inst/extract.cc:178 apt-inst/extract.cc:190 apt-inst/extract.cc:207
-#: apt-inst/deb/dpkgdb.cc:117
+#: apt-inst/extract.cc
 #, c-format
 msgid "Failed to stat %s"
 msgstr "%s་སིཊེཊི་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོདཔ།"
 
-#: apt-inst/extract.cc:185
+#: apt-inst/extract.cc
 #, c-format
 msgid "Failed to rename %s to %s"
 msgstr "%s་ལུ་%s་བསྐྱར་མིང་བཏགས་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།"
 
-#: apt-inst/extract.cc:240
+#: apt-inst/extract.cc
 #, c-format
 msgid "The directory %s is being replaced by a non-directory"
 msgstr "སྣོད་ཡིག་%s་འདི་སྣོད་ཡིག་མེན་མི་ཅིག་གིས་ཚབ་བཙུག་དེ་ཡོདཔ་ཨིན།"
 
-#: apt-inst/extract.cc:280
+#: apt-inst/extract.cc
 msgid "Failed to locate node in its hash bucket"
 msgstr ""
 "ཁོང་རའི་དྲྭ་རྟགས། (#)རྡོབ་ནང་ལུ་མཐུད་མཚམས་ག་ཡོད་འཚོལ་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།"
 
-#: apt-inst/extract.cc:284
+#: apt-inst/extract.cc
 msgid "The path is too long"
 msgstr "འགྲུལ་ལམ་དེ་གནམ་མེད་ས་མེད་རིངམ་ཅིག་ཨིན་པས།"
 
-#: apt-inst/extract.cc:414
+#: apt-inst/extract.cc
 #, c-format
 msgid "Overwrite package match with no version for %s"
 msgstr ""
 "%s་གི་དོན་ལུ་ཚབ་སྲུང་འབད་བའི་ཐུམ་སྒྲིལ་དེ་གིས་འཐོན་རིམ་གཅིག་ད་ཡང་མཐུན་སྒྲིག་མ"
 "ི་འབད་བས།"
 
-#: apt-inst/extract.cc:431
+#: apt-inst/extract.cc
 #, c-format
 msgid "File %s/%s overwrites the one in the package %s"
 msgstr "ཐུམ་སྒྲིལ་%s་ནང་ལུ་་ཡིག་སྣོད་%s/%sགིས་གཅིག་ཚབ་སྲུང་འབདཝ་ཨིན།"
 
-#: apt-inst/extract.cc:464
+#: apt-inst/extract.cc
 #, c-format
 msgid "Unable to read %s"
 msgstr "%s་འདི་ལུ་ལྷག་མ་ཚུགས།"
 
-#: apt-inst/extract.cc:491
+#: apt-inst/extract.cc
 #, c-format
 msgid "Unable to stat %s"
 msgstr "%s་འདི་ལུ་ངོ་བཤུས་འབད་མ་ཚུགས།"
@@ -280,7 +279,7 @@
 msgid "Error parsing MD5. Offset %lu"
 msgstr "ཨེམ་ཌི་༥་ འཛོལ་བ་མིང་དཔྱད་འབད་དོ། པར་ལེན་ %lu"
 
-#: apt-inst/deb/debfile.cc:38 apt-inst/deb/debfile.cc:43
+#: apt-inst/deb/debfile.cc
 #, c-format
 msgid "This is not a valid DEB archive, missing '%s' member"
 msgstr ""
@@ -298,7 +297,7 @@
 msgid "Couldn't change to %s"
 msgstr "%s་ལུ་བསྒྱུར་བཅོས་འབད་མ་ཚུགས།"
 
-#: apt-inst/deb/debfile.cc:154
+#: apt-inst/deb/debfile.cc
 #, c-format
 msgid "Internal error, could not locate member %s"
 msgstr "ནང་འཁོད་འཛོལ་བ་གིས་འཐུས་མི་%sའདི་ག་ཡོད་འཚོལ་མ་འཐོབ།"
@@ -308,6 +307,6 @@
 msgstr ""
 "ནུས་ཅན་ཡོད་པའི་ཚད་འཛིན་ཡིག་སྣོད་ཅིག་ག་ཡོད་འཚོལ་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོདཔ་ཨིན།"
 
-#: apt-inst/deb/debfile.cc:264
+#: apt-inst/deb/debfile.cc
 msgid "Unparsable control file"
 msgstr "མིང་དཔྱད་འབད་མ་བཏུབ་པའི་ཚད་འཛིན་ཡིག་སྣོད།"
diff -Nru language-pack-dz-base-14.04+20150804/data/dz/LC_MESSAGES/libapt-pkg4.12.po language-pack-dz-base-14.04+20160720/data/dz/LC_MESSAGES/libapt-pkg4.12.po
--- language-pack-dz-base-14.04+20150804/data/dz/LC_MESSAGES/libapt-pkg4.12.po	2015-08-14 07:53:49.000000000 +0000
+++ language-pack-dz-base-14.04+20160720/data/dz/LC_MESSAGES/libapt-pkg4.12.po	2016-07-20 16:44:52.000000000 +0000
@@ -7,14 +7,14 @@
 "Project-Id-Version: apt_po.pot\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
 "POT-Creation-Date: 2012-03-15 19:05+0000\n"
-"PO-Revision-Date: 2015-08-02 01:22+0000\n"
+"PO-Revision-Date: 2016-05-25 08:40+0000\n"
 "Last-Translator: kinley tshering <Unknown>\n"
 "Language-Team: Dzongkha <pgeyleg@dit.gov.bt>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-08-04 05:28+0000\n"
-"X-Generator: Launchpad (build 17656)\n"
+"X-Launchpad-Export-Date: 2016-07-20 10:32+0000\n"
+"X-Generator: Launchpad (build 18147)\n"
 "X-Poedit-Country: Bhutan\n"
 "Language: dz\n"
 "X-Poedit-Language: Dzongkha\n"
@@ -137,7 +137,7 @@
 msgid "Server closed the connection"
 msgstr "སར་བར་གྱིས་མཐུད་ལམ་འདི་ཁ་བསྡམས་ཏེ་ཡོདཔ་ཨིན།"
 
-#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:667 methods/rsh.cc:190
+#: apt-pkg/contrib/fileutl.cc
 msgid "Read error"
 msgstr "འཛོལ་བ་ལྷབ།"
 
@@ -149,7 +149,7 @@
 msgid "Protocol corruption"
 msgstr "གནད་སྤེལ་ལམ་ལུགས་ ངན་ཅན།"
 
-#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:706 methods/rsh.cc:232
+#: apt-pkg/contrib/fileutl.cc
 msgid "Write error"
 msgstr "འཛོལ་བ་འབྲི།"
 
@@ -399,34 +399,34 @@
 msgid "Internal error"
 msgstr "ནང་འཁོད་འཛོལ་བ།"
 
-#: apt-pkg/contrib/mmap.cc:76
+#: apt-pkg/contrib/mmap.cc
 msgid "Can't mmap an empty file"
 msgstr "ཡིག་སྣོད་སྟོངམ་འདི་mmap་འབད་མ་ཚུགས།"
 
-#: apt-pkg/contrib/mmap.cc:89
+#: apt-pkg/contrib/mmap.cc
 #, c-format
 msgid "Couldn't duplicate file descriptor %i"
 msgstr ""
 
-#: apt-pkg/contrib/mmap.cc:117
+#: apt-pkg/contrib/mmap.cc
 #, c-format
 msgid "Couldn't make mmap of %llu bytes"
 msgstr ""
 
-#: apt-pkg/contrib/mmap.cc:124
+#: apt-pkg/contrib/mmap.cc
 msgid "Unable to close mmap"
 msgstr ""
 
-#: apt-pkg/contrib/mmap.cc:152 apt-pkg/contrib/mmap.cc:180
+#: apt-pkg/contrib/mmap.cc
 msgid "Unable to synchronize mmap"
 msgstr ""
 
-#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:187
+#: apt-pkg/contrib/mmap.cc
 #, c-format
 msgid "Couldn't make mmap of %lu bytes"
 msgstr "%lu་བཱའིཊིསི་གི་mmap་བཟོ་མ་ཚུགས།"
 
-#: methods/http.cc:998 apt-pkg/contrib/mmap.cc:215
+#: apt-pkg/contrib/mmap.cc
 msgid "Failed to truncate file"
 msgstr ""
 
@@ -437,110 +437,110 @@
 "Current value: %lu. (man 5 apt.conf)"
 msgstr ""
 
-#: apt-pkg/contrib/mmap.cc:401
+#: apt-pkg/contrib/mmap.cc
 #, c-format
 msgid ""
 "Unable to increase the size of the MMap as the limit of %lu bytes is already "
 "reached."
 msgstr ""
 
-#: apt-pkg/contrib/mmap.cc:404
+#: apt-pkg/contrib/mmap.cc
 msgid ""
 "Unable to increase size of the MMap as automatic growing is disabled by user."
 msgstr ""
 
-#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:371
+#. TRANSLATOR: d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc
 #, c-format
 msgid "%lid %lih %limin %lis"
 msgstr ""
 
-#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:378
+#. TRANSLATOR: h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc
 #, c-format
 msgid "%lih %limin %lis"
 msgstr ""
 
-#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:385
+#. TRANSLATOR: min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc
 #, c-format
 msgid "%limin %lis"
 msgstr ""
 
-#. s means seconds
-#: apt-pkg/contrib/strutl.cc:390
+#. TRANSLATOR: s means seconds
+#: apt-pkg/contrib/strutl.cc
 #, c-format
 msgid "%lis"
 msgstr ""
 
-#: apt-pkg/contrib/strutl.cc:1065
+#: apt-pkg/contrib/strutl.cc
 #, c-format
 msgid "Selection %s not found"
 msgstr "སེལ་འཐུ་%s ་མ་འཐོབ།"
 
-#: apt-pkg/contrib/configuration.cc:452
+#: apt-pkg/contrib/configuration.cc
 #, c-format
 msgid "Unrecognized type abbreviation: '%c'"
 msgstr "ངོ་མ་ཤེས་པའི་སྡུད་ཚིག་གི་དབྱེ་བ:'%c'"
 
-#: apt-pkg/contrib/configuration.cc:510
+#: apt-pkg/contrib/configuration.cc
 #, c-format
 msgid "Opening configuration file %s"
 msgstr "རིམ་སྒྲིག་ཡིག་སྣོད་%s་འདི་ཁ་ཕྱེ་དོ།"
 
-#: apt-pkg/contrib/configuration.cc:678
+#: apt-pkg/contrib/configuration.cc
 #, c-format
 msgid "Syntax error %s:%u: Block starts with no name."
 msgstr ""
 "་ཚིག་སྦྱོར་འཛོལ་བ་%s:%u:  སྡེབ་ཚན་གྱིས་མིང་མེད་མི་དང་གཅིག་ཁར་འགོ་བཙུགསཔ་ཨིན"
 
-#: apt-pkg/contrib/configuration.cc:697
+#: apt-pkg/contrib/configuration.cc
 #, c-format
 msgid "Syntax error %s:%u: Malformed tag"
 msgstr "ཚིག་སྦྱོར་འཛོལ་བ་%s:%u:བཟོ་ཉེས་འགྱུར་བའི་ངོ་རྟགས།"
 
-#: apt-pkg/contrib/configuration.cc:714
+#: apt-pkg/contrib/configuration.cc
 #, c-format
 msgid "Syntax error %s:%u: Extra junk after value"
 msgstr "ཚིག་སྦྱོར་འཛོལ་བ་%s:%u:གནས་གོང་གི་ཤུལ་ལས་མཁོ་མེད་ཐེབས།"
 
-#: apt-pkg/contrib/configuration.cc:754
+#: apt-pkg/contrib/configuration.cc
 #, c-format
 msgid "Syntax error %s:%u: Directives can only be done at the top level"
 msgstr "ཚིག་སྦྱོར་འཛོལ་བ་%s:%u:བཀོད་རྒྱ་ཚུ་ཆེ་རིམ་ནང་རྐྱངམ་ཅིག་བྱིན་ཚུགས།"
 
-#: apt-pkg/contrib/configuration.cc:761
+#: apt-pkg/contrib/configuration.cc
 #, c-format
 msgid "Syntax error %s:%u: Too many nested includes"
 msgstr "ཚིག་སྦྱོར་འཛོལ་བ་%s:%u:འདུ་འཛོམས་འབད་འབདཝ་ལེ་ཤཱ་གྲངས་སུ་བཙུགསཔ་ཨིན།"
 
-#: apt-pkg/contrib/configuration.cc:765 apt-pkg/contrib/configuration.cc:770
+#: apt-pkg/contrib/configuration.cc
 #, c-format
 msgid "Syntax error %s:%u: Included from here"
 msgstr "ཚིག་སྦྱོར་འཛོལ་བ་%s:%u: ནཱ་ལས་རང་འགོ་བཙུགས་གྲངས་སུ་བཙུགས་ཏེ་ཡོད།"
 
-#: apt-pkg/contrib/configuration.cc:774
+#: apt-pkg/contrib/configuration.cc
 #, c-format
 msgid "Syntax error %s:%u: Unsupported directive '%s'"
 msgstr "ཚིག་སྦྱོར་འཛོལ་བ་%s:%u: རྒྱབ་སྐྱོར་མ་འབད་བར་ཡོད་པའི་'%s'བཀོད་རྒྱ།"
 
-#: apt-pkg/contrib/configuration.cc:777
+#: apt-pkg/contrib/configuration.cc
 #, c-format
 msgid ""
 "Syntax error %s:%u: clear directive requires an option tree as argument"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:825
+#: apt-pkg/contrib/configuration.cc
 #, c-format
 msgid "Syntax error %s:%u: Extra junk at end of file"
 msgstr "ཚིག་སྦྱོར་འཛོལ་བ་%s:%u: ཡིག་སྣོད་ཀྱི་མཇུག་ལུ་མཁོ་མེད་ཐེབས།"
 
-#: apt-pkg/contrib/progress.cc:153
+#: apt-pkg/contrib/progress.cc
 #, c-format
 msgid "%c%s... Error!"
 msgstr "%c%s... འཛོལ་བ་!"
 
-#: apt-pkg/contrib/progress.cc:155
+#: apt-pkg/contrib/progress.cc
 #, c-format
 msgid "%c%s... Done"
 msgstr "%c%s... འབད་ཚར་ཡོད།"
@@ -556,69 +556,66 @@
 msgid "Command line option %s is not understood"
 msgstr "བ་རྡ་བཀོད་གྲལ་ཐིག་གི་གདམ་ཁ་%s་འདི་ཧ་མ་གོ་བས།"
 
-#: apt-pkg/contrib/cmndline.cc:124
+#: apt-pkg/contrib/cmndline.cc
 #, c-format
 msgid "Command line option %s is not boolean"
 msgstr "བརྡ་བཀོད་གྲལ་ཐིག་གི་གདམ་ཁ་%s་འདི་བུ་ལིན་མེན་པས།"
 
-#: apt-pkg/contrib/cmndline.cc:163 apt-pkg/contrib/cmndline.cc:184
+#: apt-pkg/contrib/cmndline.cc
 #, c-format
 msgid "Option %s requires an argument."
 msgstr "གདམ་ཁ་%s་ལུ་སྒྲུབ་རྟགས་ཅིག་དགོ་པས།"
 
-#: apt-pkg/contrib/cmndline.cc:198 apt-pkg/contrib/cmndline.cc:204
+#: apt-pkg/contrib/cmndline.cc
 #, c-format
 msgid "Option %s: Configuration item specification must have an =<val>."
 msgstr "གདམ་ཁ་%s:རིམ་སྒྲིག་གི་རྣམ་གྲངས་གསལ་བཀོད་ལུ་ =<val> ་ཅིག་དགོཔ་ཨིན།"
 
-#: apt-pkg/contrib/cmndline.cc:234
+#: apt-pkg/contrib/cmndline.cc
 #, c-format
 msgid "Option %s requires an integer argument, not '%s'"
 msgstr "གདམ་ཁ་ %s ་ལུ་'%s'་མེན་པར་ ཧྲིལ་ཨང་སྒྲུབ་རྟགས་ཅིག་དགོས་མཁོ་ཡོདཔ་ཨིན"
 
-#: apt-pkg/contrib/cmndline.cc:265
+#: apt-pkg/contrib/cmndline.cc
 #, c-format
 msgid "Option '%s' is too long"
 msgstr "གདམ་ཁ་'%s'འདི་གནམ་མེད་ས་མེད་རིངམ་འདུག"
 
-#: apt-pkg/contrib/cmndline.cc:298
+#: apt-pkg/contrib/cmndline.cc
 #, c-format
 msgid "Sense %s is not understood, try true or false."
 msgstr ""
 "དྲན་ཤེས་ %s་འདི་ཧ་གོ་མ་ཚུགས་པས་  བདེན་པ་ཡང་ན་རྫུན་པ་ལུ་འབད་རྩོལ་བསྐྱེདཔ།"
 
-#: apt-pkg/contrib/cmndline.cc:348
+#: apt-pkg/contrib/cmndline.cc
 #, c-format
 msgid "Invalid operation %s"
 msgstr "ནུས་མེད་བཀོལ་སྤྱོད་%s"
 
-#: apt-pkg/contrib/cdromutl.cc:52
+#: apt-pkg/contrib/cdromutl.cc
 #, c-format
 msgid "Unable to stat the mount point %s"
 msgstr "སྦྱར་བརྩེགས་ས་ཚིགས་%s་འདི་ངོ་བཤུས་འབད་མ་ཚུགས།"
 
-#: apt-pkg/contrib/cdromutl.cc:162 apt-pkg/contrib/cdromutl.cc:196
-#: apt-pkg/acquire.cc:425 apt-pkg/acquire.cc:450 apt-pkg/clean.cc:39
-#: methods/mirror.cc:91
+#: apt-pkg/acquire.cc apt-pkg/clean.cc apt-pkg/contrib/cdromutl.cc
 #, c-format
 msgid "Unable to change to %s"
 msgstr "%s་ལུ་བསྒྱུར་བཅོས་འབད་མ་ཚུགས།"
 
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
-#: apt-pkg/contrib/cdromutl.cc:166 apt-pkg/contrib/fileutl.cc:240
-#: apt-pkg/sourcelist.cc:159 apt-pkg/sourcelist.cc:165 apt-pkg/acquire.cc:419
-#: apt-pkg/init.cc:93 apt-pkg/init.cc:101 apt-pkg/clean.cc:33
-#: apt-pkg/policy.cc:279 methods/mirror.cc:85
+#: apt-pkg/acquire.cc apt-pkg/clean.cc apt-pkg/contrib/cdromutl.cc
+#: apt-pkg/contrib/fileutl.cc apt-pkg/init.cc apt-pkg/policy.cc
+#: apt-pkg/sourcelist.cc
 #, c-format
 msgid "Unable to read %s"
 msgstr "%s་འདི་ལུ་ལྷག་མ་ཚུགས།"
 
-#: apt-pkg/contrib/cdromutl.cc:204
+#: apt-pkg/contrib/cdromutl.cc
 msgid "Failed to stat the cdrom"
 msgstr "སི་ཌི་རོམ་འདི་ངོ་བཤུས་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།"
 
-#: apt-pkg/contrib/fileutl.cc:151
+#: apt-pkg/contrib/fileutl.cc
 #, c-format
 msgid "Not using locking for read only lock file %s"
 msgstr ""
@@ -626,12 +623,12 @@
 "ལྷག་ནི་རྐྱངམ་ཅིག་འབད་མི་ལྡེ་མིག་ཡིག་སྣོད་འདི་གི་དོན་ལུ་ལྡེ་མིག་རྐྱབ་ནི་ལག་ལེན"
 "་མི་འཐབ་པས།"
 
-#: apt-pkg/contrib/fileutl.cc:156
+#: apt-pkg/contrib/fileutl.cc
 #, c-format
 msgid "Could not open lock file %s"
 msgstr "ལྡེ་མིག་རྐྱབས་ཡོད་པའི་ཡིག་སྣོད་%s་འདི་ཁ་ཕྱེ་མ་ཚུགས།"
 
-#: apt-pkg/contrib/fileutl.cc:174
+#: apt-pkg/contrib/fileutl.cc
 #, c-format
 msgid "Not using locking for nfs mounted lock file %s"
 msgstr ""
@@ -639,118 +636,118 @@
 "སྦྱར་བརྩེགས་འབད་ཡོད་པའི་ལྡེ་མིག་ཡིག་སྣོད་ཀྱི་དོན་ལུ་ལྡེ་མིག་རྐྱབ་ནི་ལག་ལེན་མི"
 "་འཐབ་པས།"
 
-#: apt-pkg/contrib/fileutl.cc:178
+#: apt-pkg/contrib/fileutl.cc
 #, c-format
 msgid "Could not get lock %s"
 msgstr "%sལྡེ་མིག་རྐྱབ་ནི་ལེན་མ་ཚུགས།"
 
-#: apt-pkg/contrib/fileutl.cc:335
+#: apt-pkg/contrib/fileutl.cc
 #, c-format
 msgid "List of files can't be created as '%s' is not a directory"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:362
+#: apt-pkg/contrib/fileutl.cc
 #, c-format
 msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:380
+#: apt-pkg/contrib/fileutl.cc
 #, c-format
 msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:389
+#: apt-pkg/contrib/fileutl.cc
 #, c-format
 msgid ""
 "Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:568
+#: apt-pkg/contrib/fileutl.cc apt-pkg/contrib/gpgv.cc apt-pkg/deb/debsystem.cc
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "%s་གི་དོན་ལུ་བསྒུག་སྡོད་ཅི་ འདི་འབདཝ་ད་ཕར་མིན་འདུག"
 
-#: apt-pkg/contrib/fileutl.cc:580
+#: apt-pkg/contrib/fileutl.cc
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
 msgstr "ཡན་ལག་ལས་སྦྱོར་%s་ལུ་ཆ་བགོས་ཀྱི་སྐྱོན་ཅིག་ཐོབ་ཡོདཔ་ཨིན།"
 
-#: apt-pkg/contrib/fileutl.cc:582
+#: apt-pkg/contrib/fileutl.cc
 #, c-format
 msgid "Sub-process %s received signal %u."
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:586
+#: apt-pkg/contrib/fileutl.cc apt-pkg/contrib/gpgv.cc
 #, c-format
 msgid "Sub-process %s returned an error code (%u)"
 msgstr "ཡན་ལག་ལས་སྦྱོར་%s་གིས་འཛོལ་བའི་ཨང་རྟགས་(%u)ཅིག་སླར་ལོག་འབད་ཡོདཔ་ཨིན།"
 
-#: apt-pkg/contrib/fileutl.cc:588
+#: apt-pkg/contrib/fileutl.cc apt-pkg/contrib/gpgv.cc
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr "ཡན་ལག་ལས་སྦྱོར་་%s་གིས་རེ་བ་མེད་པར་ཕྱིར་ཐོན་ཡོདཔ་ཨིན།"
 
-#: apt-pkg/contrib/fileutl.cc:632
+#: apt-pkg/contrib/fileutl.cc
 #, c-format
 msgid "Could not open file %s"
 msgstr "%s་ཡིག་སྣོད་འདི་ཁ་ཕྱེ་མ་ཚུགས།"
 
-#: apt-pkg/contrib/fileutl.cc:781
+#: apt-pkg/contrib/fileutl.cc
 #, c-format
 msgid "Could not open file descriptor %d"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:975
+#: apt-pkg/contrib/fileutl.cc
 msgid "Failed to create subprocess IPC"
 msgstr "ཡན་ལག་ལས་སྦྱོར་ ཨའི་པི་སི་ གསར་བསྐྲུན་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།"
 
-#: apt-pkg/contrib/fileutl.cc:1024
+#: apt-pkg/contrib/fileutl.cc
 msgid "Failed to exec compressor "
 msgstr "ཨེབ་འཕྲུལ་ལག་ལེན་འཐབ་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད། "
 
-#: apt-pkg/contrib/fileutl.cc:1102
+#: apt-pkg/contrib/fileutl.cc
 #, c-format
 msgid "read, still have %llu to read but none left"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:1167
+#: apt-pkg/contrib/fileutl.cc
 #, c-format
 msgid "write, still have %llu to write but couldn't"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:1010
+#: apt-pkg/contrib/fileutl.cc
 #, c-format
 msgid "Problem closing the gzip file %s"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:1013
+#: apt-pkg/contrib/fileutl.cc
 #, c-format
 msgid "Problem closing the file %s"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:1018
+#: apt-pkg/contrib/fileutl.cc
 #, c-format
 msgid "Problem renaming the file %s to %s"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:1029
+#: apt-pkg/contrib/fileutl.cc
 #, c-format
 msgid "Problem unlinking the file %s"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:810
+#: apt-pkg/contrib/fileutl.cc
 msgid "Problem syncing the file"
 msgstr "ཡིག་སྣོད་མཉམ་བྱུང་འབདཝ་ད་དཀའ་ངལ།"
 
-#: apt-pkg/pkgcache.cc:132
+#: apt-pkg/pkgcache.cc
 msgid "Empty package cache"
 msgstr "ཐུམ་སྒྲིལ་འདྲ་མཛོད་སྟོངམ།"
 
-#: apt-pkg/pkgcache.cc:138
+#: apt-pkg/pkgcache.cc
 msgid "The package cache file is corrupted"
 msgstr "ཐུམ་སྒྲིལ་འདྲ་མཛོད་ཡིག་སྣོད་འདི་ངན་ཅན་ཨིན་པས།"
 
-#: apt-pkg/pkgcache.cc:143
+#: apt-pkg/pkgcache.cc
 msgid "The package cache file is an incompatible version"
 msgstr "ཐུམ་སྒྲིས་འདྲ་མཛོད་ཡིག་སྣོད་འདི་ མི་མཐུན་པའི་འཐོན་རིམ་ཅིག་ཨིན་པས།"
 
@@ -758,7 +755,7 @@
 msgid "The package cache file is corrupted, it is too small"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:148
+#: apt-pkg/pkgcache.cc
 #, c-format
 msgid "This APT does not support the versioning system '%s'"
 msgstr ""
@@ -771,84 +768,84 @@
 "ཐུམ་སྒྲིལ་འདྲ་མཛོད་འདི་བཟོ་བཀོད་སོ་སོ་ཅིག་གི་དོན་ལུ་བཟོ་བརྩིགས་འབད་འབདཝ་ཨིནཔས"
 "།"
 
-#: apt-pkg/pkgcache.cc:224
+#: apt-pkg/pkgcache.cc
 msgid "Depends"
 msgstr "རྟེནམ་ཨིན།"
 
-#: apt-pkg/pkgcache.cc:224
+#: apt-pkg/pkgcache.cc
 msgid "PreDepends"
 msgstr "སྔོན་གོང་མ་རྟེནམ་ཨིན།"
 
-#: apt-pkg/pkgcache.cc:224
+#: apt-pkg/pkgcache.cc
 msgid "Suggests"
 msgstr "བསམ་འཆར་བཀོདཔ་ཨིན།"
 
-#: apt-pkg/pkgcache.cc:225
+#: apt-pkg/pkgcache.cc
 msgid "Recommends"
 msgstr "འོས་སྦྱོར་འབདཝ་ཨིན།"
 
-#: apt-pkg/pkgcache.cc:225
+#: apt-pkg/pkgcache.cc
 msgid "Conflicts"
 msgstr "མི་མཐུནམ་ཨིན།"
 
-#: apt-pkg/pkgcache.cc:225
+#: apt-pkg/pkgcache.cc
 msgid "Replaces"
 msgstr "ཚབ་བཙུགསཔ་ཨིན།"
 
-#: apt-pkg/pkgcache.cc:226
+#: apt-pkg/pkgcache.cc
 msgid "Obsoletes"
 msgstr "ཕན་མེདཔ་བཟོཝ་ཨིན།"
 
-#: apt-pkg/pkgcache.cc:226
+#: apt-pkg/pkgcache.cc
 msgid "Breaks"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:226
+#: apt-pkg/pkgcache.cc
 msgid "Enhances"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:237
+#: apt-pkg/pkgcache.cc
 msgid "important"
 msgstr "གལ་ཅན།"
 
-#: apt-pkg/pkgcache.cc:237
+#: apt-pkg/pkgcache.cc
 msgid "required"
 msgstr "དགོས་མཁོ་ཡོདཔ།"
 
-#: apt-pkg/pkgcache.cc:237
+#: apt-pkg/pkgcache.cc
 msgid "standard"
 msgstr "ཚད་ལྡན།"
 
-#: apt-pkg/pkgcache.cc:238
+#: apt-pkg/pkgcache.cc
 msgid "optional"
 msgstr "གདམ་ཁ་ཅན།"
 
-#: apt-pkg/pkgcache.cc:238
+#: apt-pkg/pkgcache.cc
 msgid "extra"
 msgstr "ཐེབས།"
 
-#: apt-pkg/depcache.cc:123 apt-pkg/depcache.cc:152
+#: apt-pkg/depcache.cc
 msgid "Building dependency tree"
 msgstr "རྟེན་འབྲེལ་གྱི་རྩ་འབྲེལ་བཟོ་བརྩིགས་འབད་དོ།"
 
-#: apt-pkg/depcache.cc:124
+#: apt-pkg/depcache.cc
 msgid "Candidate versions"
 msgstr "མི་ངོ་འཐོན་རིམཚུ།"
 
-#: apt-pkg/depcache.cc:153
+#: apt-pkg/depcache.cc
 msgid "Dependency generation"
 msgstr "བརྟེན་པའི་བཟོ་བཏོན།"
 
-#: apt-pkg/depcache.cc:173 apt-pkg/depcache.cc:193 apt-pkg/depcache.cc:197
+#: apt-pkg/depcache.cc
 msgid "Reading state information"
 msgstr ""
 
-#: apt-pkg/depcache.cc:223
+#: apt-pkg/depcache.cc
 #, c-format
 msgid "Failed to open StateFile %s"
 msgstr ""
 
-#: apt-pkg/depcache.cc:229
+#: apt-pkg/depcache.cc
 #, c-format
 msgid "Failed to write temporary StateFile %s"
 msgstr ""
@@ -919,40 +916,40 @@
 "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་ཐིག་%lu་  འབྱུང་ཁུངས་ཐོ་ཡིག་%s(dist "
 "མིང་དཔྱད་འབད་ནི་)ནང་ན།"
 
-#: apt-pkg/sourcelist.cc:199
+#: apt-pkg/sourcelist.cc
 #, c-format
 msgid "Opening %s"
 msgstr "%s་ཁ་ཕྱེ་དོ།"
 
-#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:446
+#: apt-pkg/cdrom.cc
 #, c-format
 msgid "Line %u too long in source list %s."
 msgstr "གྲལ་ཐིག་%u་འདི་འབྱུང་ཁུངས་ཐོ་ཡིག་%s་ནང་ལུ་གནམ་མེད་ས་མེད་རིངམོ་འདུག"
 
-#: apt-pkg/sourcelist.cc:236
+#: apt-pkg/sourcelist.cc
 #, c-format
 msgid "Malformed line %u in source list %s (type)"
 msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་ཐིག་%u་ འབྱུང་ཁུངས་ཐོ་ཡིག་%s (དབྱེ་བ)་ནང་ན།"
 
-#: apt-pkg/sourcelist.cc:240
+#: apt-pkg/sourcelist.cc
 #, c-format
 msgid "Type '%s' is not known on line %u in source list %s"
 msgstr ""
 "དབྱེ་བ་'%s'་འདི་གྲལ་ཐིག་%u་གུར་ལུ་ཡོདཔ་འབྱུང་ཁུངས་ཐོ་ཡིག་%s་གི་ནང་ན་མ་ཤེས་པས།"
 
-#: apt-pkg/packagemanager.cc:324 apt-pkg/packagemanager.cc:593
+#: apt-pkg/packagemanager.cc
 #, c-format
 msgid ""
 "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
 "under APT::Immediate-Configure for details. (%d)"
 msgstr ""
 
-#: apt-pkg/packagemanager.cc:468 apt-pkg/packagemanager.cc:498
+#: apt-pkg/packagemanager.cc
 #, c-format
 msgid "Could not configure '%s'. "
 msgstr ""
 
-#: apt-pkg/packagemanager.cc:445
+#: apt-pkg/packagemanager.cc
 #, c-format
 msgid ""
 "This installation run will require temporarily removing the essential "
@@ -966,12 +963,12 @@
 "འདི་འབདཝ་ད་ཁྱོད་ཀྱི་ཐད་རི་འབའ་རི་འབད་དགོཔ་ཨིན་པ་ཅིན་ APT::Force-LoopBreak "
 "གདམ་ཁ་འདི་ཤུགས་ལྡན་བཟོ།"
 
-#: apt-pkg/pkgrecords.cc:32
+#: apt-pkg/pkgrecords.cc
 #, c-format
 msgid "Index file type '%s' is not supported"
 msgstr "ཟུར་ཐོ་ཡིག་སྣོད་ཀྱི་དབྱེ་བ་ '%s' འདི་རྒྱབ་སྐྱོར་མ་འབད་བས།"
 
-#: apt-pkg/algorithms.cc:248
+#: apt-pkg/algorithms.cc
 #, c-format
 msgid ""
 "The package %s needs to be reinstalled, but I can't find an archive for it."
@@ -979,7 +976,7 @@
 "ཐུམ་སྒྲིལ་%s་འདི་ལོག་འདི་རང་གཞི་བཙུགས་འབད་དགོཔ་འདུག་ "
 "འདི་འབདཝ་ད་འདི་གི་དོན་ལུ་ཡིག་མཛོད་ཅིག་འཚོལ་མ་ཐོབ།"
 
-#: apt-pkg/algorithms.cc:1139
+#: apt-pkg/algorithms.cc
 msgid ""
 "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
 "held packages."
@@ -988,7 +985,7 @@
 "pkgProblemResolver::གིས་བཟོ་བཏོན་འབད་ཡོད་པའི་མཚམས་དེ་ཚུ་མོས་མཐུན་བཟོཝ་ཨིན "
 "འ་ནི་ཐུམ་སྒྲིལ་ཚུ་འཛིན་པའི་རྒྱུ་རྐྱེན་ལས་བརྟེན་ཨིན་པས།"
 
-#: apt-pkg/algorithms.cc:1141
+#: apt-pkg/algorithms.cc
 msgid "Unable to correct problems, you have held broken packages."
 msgstr ""
 "དཀའ་ངལ་འདི་ནོར་བཅོས་འབད་མ་ཚུགས་ ཁྱོད་ཀྱི་ཐུམ་སྒྲིལ་ཆད་པ་ཚུ་འཆང་འདི་འདུག"
@@ -998,45 +995,45 @@
 msgid "Failed to fetch %s  %s\n"
 msgstr "%s  %s་ ལེན་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།\n"
 
-#: apt-pkg/algorithms.cc:1453 apt-pkg/algorithms.cc:1455
+#: apt-pkg/update.cc
 msgid ""
 "Some index files failed to download. They have been ignored, or old ones "
 "used instead."
 msgstr ""
 
-#: apt-pkg/acquire.cc:79
+#: apt-pkg/acquire.cc apt-pkg/cdrom.cc
 #, c-format
 msgid "List directory %spartial is missing."
 msgstr ""
 
-#: apt-pkg/acquire.cc:83
+#: apt-pkg/acquire.cc
 #, c-format
 msgid "Archives directory %spartial is missing."
 msgstr ""
 
-#: apt-pkg/acquire.cc:91
+#: apt-pkg/acquire.cc
 #, c-format
 msgid "Unable to lock directory %s"
 msgstr ""
 
 #. only show the ETA if it makes sense
 #. two days
-#: apt-pkg/acquire.cc:826
+#: apt-pkg/acquire.cc
 #, c-format
 msgid "Retrieving file %li of %li (%s remaining)"
 msgstr "%li་ གི་བརླག་སྟོར་ཞུགས་པའི་ཡིག་སྣོད་%li (%s ལྷག་ལུས་དོ།)"
 
-#: apt-pkg/acquire.cc:828
+#: apt-pkg/acquire.cc
 #, c-format
 msgid "Retrieving file %li of %li"
 msgstr "%li་གི་བརླག་སྟོར་ཟུགསཔའི་ཡིག་སྣོད་ %li"
 
-#: apt-pkg/acquire-worker.cc:110
+#: apt-pkg/acquire-worker.cc
 #, c-format
 msgid "The method driver %s could not be found."
 msgstr "ཐབས་ལམ་འདྲེན་བྱེད་%s་འདི་མ་འཐོབ།"
 
-#: apt-pkg/acquire-worker.cc:159
+#: apt-pkg/acquire-worker.cc
 #, c-format
 msgid "Method %s did not start correctly"
 msgstr "ཐབས་ལམ་ %s འདི་ངེས་བདེན་སྦེ་འགོ་མ་བཙུགས་འབད།"
@@ -1049,95 +1046,89 @@
 "ཁ་ཡིག་བཀོད་ཡོད་པའི་ ཌིསི་འདི་བཙུགས་གནང་། '%s'འདྲེན་འཕྲུལ་ནང་'%s' "
 "དང་ལོག་ལྡེ་འདི་ཨེབ།་"
 
-#: apt-pkg/init.cc:136
+#: apt-pkg/init.cc
 #, c-format
 msgid "Packaging system '%s' is not supported"
 msgstr "སྦུང་ཚན་བཟོ་ནིའི་རིམ་ལུགས་ '%s' འདི་ལུ་རྒྱབ་སྐྱོར་མ་འབད་བས།"
 
-#: apt-pkg/init.cc:152
+#: apt-pkg/init.cc
 msgid "Unable to determine a suitable packaging system type"
 msgstr ""
 "འོས་འབབ་དང་ལྡན་པའི་སྦུང་ཚན་རིམ་ལུགས་ཀྱི་དབྱེ་བ་ཅིག་གཏན་འབེབས་བཟོ་མི་ཚུགས་པས།"
 
-#: apt-pkg/clean.cc:56
+#: apt-pkg/clean.cc
 #, c-format
 msgid "Unable to stat %s."
 msgstr "%s་ ངོ་བཤུས་འབད་མ་ཚུགས།"
 
-#: apt-pkg/srcrecords.cc:44
+#: apt-pkg/srcrecords.cc
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr ""
 "ཁྱོད་རའི་sources.listགི་ཐོ་ཡིག་ནང་ལུ་ཁྱོད་ཀྱི་ 'འབྱུང་ཁུངས་' "
 "ཡུ་ཨར་ཨའི་ཚུ་་ལ་ལུ་ཅིག་བཙུགས་དགོ"
 
-#: apt-pkg/cachefile.cc:71
+#: apt-pkg/cachefile.cc
 msgid "The package lists or status file could not be parsed or opened."
 msgstr ""
 "ཐུམ་སྒྲིལ་གྱི་ཐོ་ཡིག་ཡང་ན་གནས་ཚད་ཡིག་སྣོད་ཚུ་ མིང་དཔྱད་ཡང་ན་ཁ་ཕྱེ་མ་ཚུགས།"
 
-#: apt-pkg/cachefile.cc:75
+#: apt-pkg/cachefile.cc
 msgid "You may want to run apt-get update to correct these problems"
 msgstr ""
 "འ་ནི་དཀའ་ངལ་འདི་ཚུ་སེལ་ནིའི་ལུ་ ཁྱོད་ཀྱི་ apt-get "
 "update་དེ་གཡོག་བཀོལ་དགོཔ་འོང་།"
 
-#: apt-pkg/cachefile.cc:65
+#: apt-pkg/cachefile.cc
 msgid "The list of sources could not be read."
 msgstr "འབྱུང་ཁུངས་ཚུ་ཀྱི་ཐོ་ཡིག་དེ་ལྷག་མི་ཚུགས་པས།"
 
-#: apt-pkg/policy.cc:71
+#: apt-pkg/policy.cc
 #, c-format
 msgid ""
 "The value '%s' is invalid for APT::Default-Release as such a release is not "
 "available in the sources"
 msgstr ""
 
-#: apt-pkg/policy.cc:316
+#: apt-pkg/policy.cc
 #, c-format
 msgid "Invalid record in the preferences file %s, no Package header"
 msgstr ""
 
-#: apt-pkg/policy.cc:338
+#: apt-pkg/policy.cc
 #, c-format
 msgid "Did not understand pin type %s"
 msgstr "ངོ་རྟགས་ཨང་གི་དབྱེ་བ་ %s འདི་ཧ་གོ་མ་ཚུགས།"
 
-#: apt-pkg/policy.cc:346
+#: apt-pkg/policy.cc
 msgid "No priority (or zero) specified for pin"
 msgstr "གོ་རྟགས་ཨང་གི་དོན་ལུ་ གཙོ་རིམ་(ཡང་ན་ ཀླད་ཀོར་)ཚུ་གསལ་བཀོད་མ་འབད་བས།"
 
-#: apt-pkg/pkgcachegen.cc:74
+#: apt-pkg/pkgcachegen.cc
 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:211 apt-pkg/pkgcachegen.cc:277
-#: apt-pkg/pkgcachegen.cc:313 apt-pkg/pkgcachegen.cc:355
-#: apt-pkg/pkgcachegen.cc:359 apt-pkg/pkgcachegen.cc:376
-#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:390
-#: apt-pkg/pkgcachegen.cc:394 apt-pkg/pkgcachegen.cc:415
-#: apt-pkg/pkgcachegen.cc:420 apt-pkg/pkgcachegen.cc:465
-#: apt-pkg/pkgcachegen.cc:496 apt-pkg/pkgcachegen.cc:510
+#: apt-pkg/pkgcachegen.cc
 #, c-format
 msgid "Error occurred while processing %s (%s%d)"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:264
+#: apt-pkg/pkgcachegen.cc
 msgid "Wow, you exceeded the number of package names this APT is capable of."
 msgstr ""
 "པའོ་་་ཁྱོད་ཀྱིས་ ཨེ་པི་ཊི་འདི་གིས་བཟོད་ཐུབ་པའི་ཐུམ་སྒྲིལ་ཨང་གྲངས་ལས་ལྷག་ནུག"
 
-#: apt-pkg/pkgcachegen.cc:267
+#: apt-pkg/pkgcachegen.cc
 msgid "Wow, you exceeded the number of versions this APT is capable of."
 msgstr ""
 "པའོ་་་ཁྱོད་ཀྱིས་ ཨེ་པི་ཊི་འདི་གིས་བཟོད་ཐུབ་པའི་ཐོན་རིམ་ཨང་གྲངས་ལས་ལྷག་ནུག"
 
-#: apt-pkg/pkgcachegen.cc:270
+#: apt-pkg/pkgcachegen.cc
 msgid "Wow, you exceeded the number of descriptions this APT is capable of."
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:273
+#: apt-pkg/pkgcachegen.cc
 msgid "Wow, you exceeded the number of dependencies this APT is capable of."
 msgstr ""
 "པའོ་་་ཁྱོད་ཀྱིས་ ཨེ་པི་ཊི་འདི་གིས་བཟོད་ཐུབ་པའི་བརྟེན་པའི་ཨང་གྲངས་ལས་ལྷག་ནུག"
@@ -1154,9 +1145,7 @@
 msgid "Couldn't stat source package list %s"
 msgstr "འབྱུང་ཁུངས་ཐུམ་སྒྲིལ་གྱི་ཐོ་ཡིག་%s་དེ་ངོ་བཤུས་འབད་མ་ཚུགས།"
 
-#. Build the status cache
-#: apt-pkg/pkgcachegen.cc:793 apt-pkg/pkgcachegen.cc:865
-#: apt-pkg/pkgcachegen.cc:870 apt-pkg/pkgcachegen.cc:1008
+#: apt-pkg/pkgcachegen.cc
 msgid "Reading package lists"
 msgstr "ཐུམ་སྒྲིལ་ཐོ་ཡིག་ཚུ་ལྷག་དོ།"
 
@@ -1164,16 +1153,16 @@
 msgid "Collecting File Provides"
 msgstr "ཡིག་སྣོད་བྱིན་མི་ཚུ་བསྡུ་ལེན་འབད་དོ།"
 
-#: apt-pkg/pkgcachegen.cc:863
+#: apt-pkg/contrib/fileutl.cc
 #, c-format
 msgid "Unable to write to %s"
 msgstr "%sལུ་འབྲི་མ་ཚུགས།"
 
-#: apt-pkg/pkgcachegen.cc:952 apt-pkg/pkgcachegen.cc:959
+#: apt-pkg/pkgcachegen.cc
 msgid "IO Error saving source cache"
 msgstr "IO འཛོལ་བ་འབྱུང་ཁུངས་འདྲ་མཛོད་སྲུང་བཞག་འབད་དོ།"
 
-#: apt-pkg/acquire-item.cc:135
+#: apt-pkg/acquire-item.cc apt-pkg/contrib/fileutl.cc
 #, c-format
 msgid "rename failed, %s (%s -> %s)."
 msgstr "%s (%s -> %s)བསྐྱར་མིང་བཏགས་ནི་འདི་འཐུས་ཤོར་བྱུང་ཡོདཔ་ཨིན།"
@@ -1182,11 +1171,11 @@
 msgid "MD5Sum mismatch"
 msgstr "ཨེམ་ཌི་༥་ ཁྱོན་བསྡོམས་མ་མཐུན་པ།"
 
-#: apt-pkg/acquire-item.cc:757 apt-pkg/acquire-item.cc:1549
+#: apt-pkg/acquire-item.cc
 msgid "Hash Sum mismatch"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1388
+#: apt-pkg/acquire-item.cc
 #, c-format
 msgid ""
 "Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
@@ -1198,20 +1187,23 @@
 msgid "Unable to find hash sum for '%s' in Release file"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1244
+#: apt-pkg/acquire-item.cc
 msgid "There is no public key available for the following key IDs:\n"
 msgstr ""
 "འོག་གི་ ཨའི་ཌི་་ "
 "ལྡེ་མིག་ཚུ་གི་དོན་ལུ་མི་དམང་གི་ལྡེ་མིག་འདི་འཐོབ་མི་ཚུགས་པས:\n"
 
-#: apt-pkg/acquire-item.cc:1476
+#. 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
 #, c-format
 msgid ""
 "Release file for %s is expired (invalid since %s). Updates for this "
 "repository will not be applied."
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1497
+#: apt-pkg/acquire-item.cc
 #, c-format
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr ""
@@ -1223,12 +1215,13 @@
 "updated and the previous index files will be used. GPG error: %s: %s\n"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1326
+#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
+#: apt-pkg/acquire-item.cc
 #, c-format
 msgid "GPG error: %s: %s"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1354
+#: apt-pkg/acquire-item.cc
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -1247,7 +1240,7 @@
 "%s་ཐུམ་སྒྲིལ་གི་དོན་ལུ་ང་་གི་ཡིག་སྣོད་ཅིག་ག་ཡོད་འཚོལ་མི་འཐོབ་པས། "
 "འདི་འབདཝ་ལས་ཁྱོད་ཀྱི་ལག་ཐོག་ལས་ འ་ནི་ཐུམ་སྒྲིལ་འདི་གི་དཀའ་ངལ་སེལ་དགོཔ་འདུག"
 
-#: apt-pkg/acquire-item.cc:1454
+#: apt-pkg/acquire-item.cc
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
@@ -1255,31 +1248,31 @@
 "ཐུམ་སྒྲིལ་ ཟུར་ཐོ་ཡིག་སྣོད་ཚུ་ངན་ཅན་འགྱོ་ནུག  ཡིག་སྣོད་ཀྱི་མིང་མིན་འདུག: "
 "%s་ཐུམ་སྒྲིལ་གྱི་དོན་ལུ་ས་སྒོ།"
 
-#: apt-pkg/acquire-item.cc:1541
+#: apt-pkg/acquire-item.cc
 msgid "Size mismatch"
 msgstr "ཚད་མ་མཐུན།"
 
-#: apt-pkg/indexrecords.cc:40
+#: apt-pkg/deb/debmetaindex.cc
 #, c-format
 msgid "Unable to parse Release file %s"
 msgstr ""
 
-#: apt-pkg/indexrecords.cc:47
+#: apt-pkg/deb/debmetaindex.cc
 #, c-format
 msgid "No sections in Release file %s"
 msgstr ""
 
-#: apt-pkg/indexrecords.cc:81
+#: apt-pkg/deb/debmetaindex.cc
 #, c-format
 msgid "No Hash entry in Release file %s"
 msgstr ""
 
-#: apt-pkg/indexrecords.cc:110
+#: apt-pkg/deb/debmetaindex.cc
 #, c-format
 msgid "Invalid 'Valid-Until' entry in Release file %s"
 msgstr ""
 
-#: apt-pkg/indexrecords.cc:125
+#: apt-pkg/deb/debmetaindex.cc
 #, c-format
 msgid "Invalid 'Date' entry in Release file %s"
 msgstr ""
@@ -1302,16 +1295,16 @@
 msgid "Identifying.. "
 msgstr "ངོས་འཛིན་འབད་དོ.. "
 
-#: apt-pkg/cdrom.cc:560
+#: apt-pkg/cdrom.cc
 #, c-format
 msgid "Stored label: %s\n"
 msgstr "གསོག་འཇོག་འབད་ཡོད་པའི་ཁ་ཡིག:%s\n"
 
-#: apt-pkg/cdrom.cc:567 apt-pkg/cdrom.cc:835
+#: apt-pkg/cdrom.cc
 msgid "Unmounting CD-ROM...\n"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:586
+#: apt-pkg/cdrom.cc
 #, c-format
 msgid "Using CD-ROM mount point %s\n"
 msgstr "%s སི་ཌི-རོམ་སྦྱར་བརྩེགས་ཀྱི་ས་ཚིགས་ལག་ལེན་འཐབ་དོ།\n"
@@ -1320,12 +1313,11 @@
 msgid "Unmounting CD-ROM\n"
 msgstr "སི་ཌི་-རོམ་བརྩེགས་བཤོལ་འབད་དོ།\n"
 
-#: apt-pkg/cdrom.cc:608
+#: apt-pkg/cdrom.cc
 msgid "Waiting for disc...\n"
 msgstr "ཌིསིཀ་གི་དོན་ལུ་བསྒུག་དོ...\n"
 
-#. Mount the new CDROM
-#: apt-pkg/cdrom.cc:616
+#: apt-pkg/cdrom.cc
 msgid "Mounting CD-ROM...\n"
 msgstr "སི་ཌི་-རོམ་སྦྱར་བརྩེགས་འབད་དོ...\n"
 
@@ -1333,29 +1325,29 @@
 msgid "Scanning disc for index files..\n"
 msgstr "ཟུར་ཐོ་ཡིག་སྣོད་ཚུ་གི་དོན་ལུ་ ཌིསིཀ་ཞིབ་ལྟ་འབད་དོ..\n"
 
-#: apt-pkg/cdrom.cc:674
+#: apt-pkg/cdrom.cc
 #, c-format
 msgid ""
 "Found %zu package indexes, %zu source indexes, %zu translation indexes and "
 "%zu signatures\n"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:685
+#: apt-pkg/cdrom.cc
 msgid ""
 "Unable to locate any package files, perhaps this is not a Debian Disc or the "
 "wrong architecture?"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:711
+#: apt-pkg/cdrom.cc
 #, c-format
 msgid "Found label '%s'\n"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:740
+#: apt-pkg/cdrom.cc
 msgid "That is not a valid name, try again.\n"
 msgstr "དེ་ནུས་ཅན་གྱི་མིང་ཅིག་མེན་པས་ ལོག་སྟེ་རང་འབད་རྩོལ་བསྐྱེད།\n"
 
-#: apt-pkg/cdrom.cc:756
+#: apt-pkg/cdrom.cc
 #, c-format
 msgid ""
 "This disc is called: \n"
@@ -1364,37 +1356,37 @@
 "ཌིསིཀ་འདི་བོད་བརྡ་འབད་དོ་ཡོདཔ་ཨིན།\n"
 "'%s'\n"
 
-#: apt-pkg/cdrom.cc:760
+#: apt-pkg/cdrom.cc
 msgid "Copying package lists..."
 msgstr "ཐུམ་སྒྲིལ་གྱིཐོ་ཡིག་ཚུ་འདྲ་བཤུས་རྐྱབ་དོ..."
 
-#: apt-pkg/cdrom.cc:786
+#: apt-pkg/cdrom.cc
 msgid "Writing new source list\n"
 msgstr "འབྱུང་ཁུངས་ཀྱི་ཐོ་ཡིག་གསརཔ་ཅིག་འབྲི་དོ།\n"
 
-#: apt-pkg/cdrom.cc:795
+#: apt-pkg/cdrom.cc
 msgid "Source list entries for this disc are:\n"
 msgstr "འ་ནི་ ཌིསིཀ་གི་དོན་ལུ་ འབྱུང་ཁུངས་ཧྲིལ་བུ་ཚུ་:\n"
 
-#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:835
+#: apt-pkg/indexcopy.cc
 #, c-format
 msgid "Wrote %i records.\n"
 msgstr "%i་དྲན་མཐོ་དེ་ཚུ་བྲིས་ཡོད།\n"
 
-#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:837
+#: apt-pkg/indexcopy.cc
 #, c-format
 msgid "Wrote %i records with %i missing files.\n"
 msgstr ""
 "%i བྱིག་འགྱོ་ཡོད་པའི་ཡིག་སྣོད་ཚུ་དང་གཅིག་ཁར་ %i དྲན་ཐོ་འདི་ཚུ་བྲིས་ཡོད།\n"
 
-#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:840
+#: apt-pkg/indexcopy.cc
 #, c-format
 msgid "Wrote %i records with %i mismatched files\n"
 msgstr ""
 "%i་མཐུན་སྒྲིག་མེདཔ་པའི་ཡིག་སྣོད་ཚུ་དང་གཅིག་ཁར་ "
 "%i་དྲན་ཐོ་ཚུ་བྲིས་བཞག་ཡོདཔ་ཨིན།\n"
 
-#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:843
+#: apt-pkg/indexcopy.cc
 #, c-format
 msgid "Wrote %i records with %i missing files and %i mismatched files\n"
 msgstr ""
@@ -1407,12 +1399,12 @@
 msgid "Skipping nonexistent file %s"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:536
+#: apt-pkg/indexcopy.cc
 #, c-format
 msgid "Can't find authentication record for: %s"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:542
+#: apt-pkg/indexcopy.cc
 #, c-format
 msgid "Hash mismatch for: %s"
 msgstr ""
@@ -1428,159 +1420,160 @@
 msgid "No keyring installed in %s."
 msgstr ""
 
-#: apt-pkg/cachefilter.cc:29
+#: apt-pkg/cachefilter.cc
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "རི་ཇེགསི་ཕྱོགས་སྒྲིག་འཛོལ་བ་- %s"
 
-#: apt-pkg/cacheset.cc:337
+#: apt-pkg/cacheset.cc
 #, c-format
 msgid "Release '%s' for '%s' was not found"
 msgstr "%sགི་དོན་ལུ་འཛིན་གྲོལ་'%s'་དེ་མ་འཐོབ་པས།"
 
-#: apt-pkg/cacheset.cc:340
+#: apt-pkg/cacheset.cc
 #, c-format
 msgid "Version '%s' for '%s' was not found"
 msgstr "'%s'་གི་དོན་ལུ་འཐོན་རིམ་'%s'་དེ་མ་འཐོབ་པས།"
 
-#: apt-pkg/cacheset.cc:440
+#: apt-pkg/cacheset.cc
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "%sཐུམ་སྒྲིལ་འདི་ག་ཡོད་ཟཚོལ་མ་ཐོབ།"
 
-#: apt-pkg/cacheset.cc:447
+#: apt-pkg/cacheset.cc
 #, c-format
 msgid "Couldn't find task '%s'"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:454
+#: apt-pkg/cacheset.cc
 #, c-format
 msgid "Couldn't find any package by regex '%s'"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:467
+#: apt-pkg/cacheset.cc
 #, c-format
 msgid "Can't select versions from package '%s' as it is purely virtual"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:475 apt-pkg/cacheset.cc:483
+#: apt-pkg/cacheset.cc
 #, c-format
 msgid ""
 "Can't select installed nor candidate version from package '%s' as it has "
 "neither of them"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:491
+#: apt-pkg/cacheset.cc
 #, c-format
 msgid "Can't select newest version from package '%s' as it is purely virtual"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:499
+#: apt-pkg/cacheset.cc
 #, c-format
 msgid "Can't select candidate version from package %s as it has no candidate"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:507
+#: apt-pkg/cacheset.cc
 #, c-format
 msgid "Can't select installed version from package %s as it is not installed"
 msgstr ""
 
-#: apt-pkg/edsp.cc:32 apt-pkg/edsp.cc:52
+#: apt-pkg/edsp.cc
 msgid "Send scenario to solver"
 msgstr ""
 
-#: apt-pkg/edsp.cc:204
+#: apt-pkg/edsp.cc
 msgid "Send request to solver"
 msgstr ""
 
-#: apt-pkg/edsp.cc:272
+#: apt-pkg/edsp.cc
 msgid "Prepare for receiving solution"
 msgstr ""
 
-#: apt-pkg/edsp.cc:279
+#: apt-pkg/edsp.cc
 msgid "External solver failed without a proper error message"
 msgstr ""
 
-#: apt-pkg/edsp.cc:550 apt-pkg/edsp.cc:553 apt-pkg/edsp.cc:558
+#: apt-pkg/edsp.cc
 msgid "Execute external solver"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:52
+#: apt-pkg/deb/dpkgpm.cc
 #, c-format
 msgid "Installing %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:53 apt-pkg/deb/dpkgpm.cc:740
+#: apt-pkg/deb/dpkgpm.cc
 #, c-format
 msgid "Configuring %s"
 msgstr "%s་རིམ་སྒྲིག་འབད་དོ།"
 
-#: apt-pkg/deb/dpkgpm.cc:54 apt-pkg/deb/dpkgpm.cc:747
+#: apt-pkg/deb/dpkgpm.cc
 #, c-format
 msgid "Removing %s"
 msgstr "%s་རྩ་བསྐྲད་གཏང་དོ།"
 
-#: apt-pkg/deb/dpkgpm.cc:55
+#: apt-pkg/deb/dpkgpm.cc
 #, c-format
 msgid "Completely removing %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:56
+#: apt-pkg/deb/dpkgpm.cc
 #, c-format
 msgid "Noting disappearance of %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:56
+#: apt-pkg/deb/dpkgpm.cc
 #, c-format
 msgid "Running post-installation trigger %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:581 apt-pkg/deb/dpkgpm.cc:660
+#. FIXME: use a better string after freeze
+#: apt-pkg/deb/dpkgpm.cc
 #, c-format
 msgid "Directory '%s' missing"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:596 apt-pkg/deb/dpkgpm.cc:609
+#: apt-pkg/deb/dpkgpm.cc
 #, c-format
 msgid "Could not open file '%s'"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:733
+#: apt-pkg/deb/dpkgpm.cc
 #, c-format
 msgid "Preparing %s"
 msgstr "%s་ གྲ་སྒྲིག་འབད་དོ།"
 
-#: apt-pkg/deb/dpkgpm.cc:734
+#: apt-pkg/deb/dpkgpm.cc
 #, c-format
 msgid "Unpacking %s"
 msgstr "%s་ གི་སྦུང་ཚན་བཟོ་བཤོལ་འབད་དོ།"
 
-#: apt-pkg/deb/dpkgpm.cc:739
+#: apt-pkg/deb/dpkgpm.cc
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "%s་ རིམ་སྒྲིག་ལུ་གྲ་སྒྲིག་འབད་དོ།"
 
-#: apt-pkg/deb/dpkgpm.cc:741
+#: apt-pkg/deb/dpkgpm.cc
 #, c-format
 msgid "Installed %s"
 msgstr "གཞི་བཙུགས་འབད་ཡོད་པའི་%s།"
 
-#: apt-pkg/deb/dpkgpm.cc:746
+#: apt-pkg/deb/dpkgpm.cc
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "%s་ རྩ་བསྐྲད་གཏང་ནིའི་དོན་ལུ་གྲ་སྒྲིག་འབད་དོ།"
 
-#: apt-pkg/deb/dpkgpm.cc:748
+#: apt-pkg/deb/dpkgpm.cc
 #, c-format
 msgid "Removed %s"
 msgstr "རྩ་བསྐྲད་བཏང་ཡོད་པའི་%s"
 
-#: apt-pkg/deb/dpkgpm.cc:753
+#: apt-pkg/deb/dpkgpm.cc
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "%s མཇུག་བསྡུཝ་སྦེ་རང་རྩ་བསྐྲད་གཏང་ནིའི་དོན་ལུ་གྲ་སྒྲིག་འབད་དོ།"
 
-#: apt-pkg/deb/dpkgpm.cc:754
+#: apt-pkg/deb/dpkgpm.cc
 #, c-format
 msgid "Completely removed %s"
 msgstr "%s མཇུག་བསྡུཝ་སྦེ་རང་རྩ་བསྐྲད་བཏང་ཡོད།"
@@ -1589,73 +1582,73 @@
 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:989
+#: apt-pkg/install-progress.cc
 msgid "Running dpkg"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1406
+#: apt-pkg/deb/dpkgpm.cc
 msgid "Operation was interrupted before it could finish"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1202
+#: apt-pkg/deb/dpkgpm.cc
 msgid "No apport report written because MaxReports is reached already"
 msgstr ""
 
 #. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1207
+#: apt-pkg/deb/dpkgpm.cc
 msgid "dependency problems - leaving unconfigured"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1209
+#: apt-pkg/deb/dpkgpm.cc
 msgid ""
 "No apport report written because the error message indicates its a followup "
 "error from a previous failure."
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1215
+#: apt-pkg/deb/dpkgpm.cc
 msgid ""
 "No apport report written because the error message indicates a disk full "
 "error"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1221
+#: apt-pkg/deb/dpkgpm.cc
 msgid ""
 "No apport report written because the error message indicates a out of memory "
 "error"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1380 apt-pkg/deb/dpkgpm.cc:1386
+#: apt-pkg/deb/dpkgpm.cc
 msgid ""
 "No apport report written because the error message indicates an issue on the "
 "local system"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1228
+#: apt-pkg/deb/dpkgpm.cc
 msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:69
+#: apt-pkg/deb/debsystem.cc
 #, c-format
 msgid ""
 "Unable to lock the administration directory (%s), is another process using "
 "it?"
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:72
+#: apt-pkg/deb/debsystem.cc
 #, c-format
 msgid "Unable to lock the administration directory (%s), are you root?"
 msgstr ""
 
 #. TRANSLATORS: the %s contains the recovery command, usually
 #. dpkg --configure -a
-#: apt-pkg/deb/debsystem.cc:88
+#: apt-pkg/deb/debsystem.cc
 #, c-format
 msgid ""
 "dpkg was interrupted, you must manually run '%s' to correct the problem. "
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:99
+#: apt-pkg/deb/debsystem.cc
 msgid "Not locked"
 msgstr ""
 
diff -Nru language-pack-dz-base-14.04+20150804/data/dz/LC_MESSAGES/NetworkManager.po language-pack-dz-base-14.04+20160720/data/dz/LC_MESSAGES/NetworkManager.po
--- language-pack-dz-base-14.04+20150804/data/dz/LC_MESSAGES/NetworkManager.po	2015-08-14 07:53:55.000000000 +0000
+++ language-pack-dz-base-14.04+20160720/data/dz/LC_MESSAGES/NetworkManager.po	2016-07-20 16:44:54.000000000 +0000
@@ -7,356 +7,359 @@
 msgstr ""
 "Project-Id-Version: networkmanager.networkmanager-0-6-0-release.pot\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-04-28 12:15+0000\n"
+"POT-Creation-Date: 2016-02-02 14:58+0000\n"
 "PO-Revision-Date: 2010-12-30 21:45+0000\n"
 "Last-Translator: sonam pelden <Unknown>\n"
 "Language-Team: Dzongkha <pgeyleg@dit.gov.bt>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-08-04 07:09+0000\n"
-"X-Generator: Launchpad (build 17656)\n"
+"X-Launchpad-Export-Date: 2016-07-20 12:44+0000\n"
+"X-Generator: Launchpad (build 18147)\n"
 "X-Poedit-Country: Bhutan\n"
 "X-Poedit-Language: Dzongkha\n"
 "X-Poedit-SourceCharset: utf-8\n"
 
-#: ../cli/src/common.c:38 ../cli/src/common.c:50 ../cli/src/common.c:58
-#: ../cli/src/common.c:69 ../cli/src/connections.c:193
-#: ../cli/src/connections.c:215
+#: ../clients/cli/common.c:38 ../clients/cli/common.c:51
+#: ../clients/cli/common.c:59 ../clients/cli/common.c:71
+#: ../clients/cli/connections.c:192 ../clients/cli/connections.c:214
 msgid "GROUP"
 msgstr ""
 
 #. 0
-#: ../cli/src/common.c:39 ../cli/src/common.c:59
+#: ../clients/cli/common.c:39 ../clients/cli/common.c:60
 msgid "ADDRESS"
 msgstr ""
 
-#. 1
-#: ../cli/src/common.c:40 ../cli/src/common.c:60
+#. 2
+#: ../clients/cli/common.c:41 ../clients/cli/common.c:62
 msgid "ROUTE"
 msgstr ""
 
-#. 2
-#: ../cli/src/common.c:41 ../cli/src/common.c:61
+#. 3
+#: ../clients/cli/common.c:42 ../clients/cli/common.c:63
 msgid "DNS"
 msgstr ""
 
-#. 3
-#: ../cli/src/common.c:42 ../cli/src/common.c:62
+#. 4
+#: ../clients/cli/common.c:43 ../clients/cli/common.c:64
 msgid "DOMAIN"
 msgstr ""
 
-#. 4
-#: ../cli/src/common.c:43
+#. 5
+#: ../clients/cli/common.c:44
 msgid "WINS"
 msgstr ""
 
 #. 0
-#: ../cli/src/common.c:51 ../cli/src/common.c:70
+#: ../clients/cli/common.c:52 ../clients/cli/common.c:72
 msgid "OPTION"
 msgstr ""
 
-#: ../cli/src/common.c:681
+#: ../clients/cli/common.c:494
 msgid "unmanaged"
 msgstr ""
 
-#: ../cli/src/common.c:683
+#: ../clients/cli/common.c:496
 msgid "unavailable"
 msgstr ""
 
-#: ../cli/src/common.c:685 ../cli/src/network-manager.c:276
+#: ../clients/cli/common.c:498 ../clients/cli/general.c:245
 msgid "disconnected"
 msgstr ""
 
-#: ../cli/src/common.c:687
+#: ../clients/cli/common.c:500
 msgid "connecting (prepare)"
 msgstr ""
 
-#: ../cli/src/common.c:689
+#: ../clients/cli/common.c:502
 msgid "connecting (configuring)"
 msgstr ""
 
-#: ../cli/src/common.c:691
+#: ../clients/cli/common.c:504
 msgid "connecting (need authentication)"
 msgstr ""
 
-#: ../cli/src/common.c:693
+#: ../clients/cli/common.c:506
 msgid "connecting (getting IP configuration)"
 msgstr ""
 
-#: ../cli/src/common.c:695
+#: ../clients/cli/common.c:508
 msgid "connecting (checking IP connectivity)"
 msgstr ""
 
-#: ../cli/src/common.c:697
+#: ../clients/cli/common.c:510
 msgid "connecting (starting secondary connections)"
 msgstr ""
 
-#: ../cli/src/common.c:699 ../cli/src/network-manager.c:272
+#: ../clients/cli/common.c:512 ../clients/cli/general.c:241
 msgid "connected"
 msgstr ""
 
-#: ../cli/src/common.c:701 ../cli/src/connections.c:560
+#: ../clients/cli/common.c:514 ../clients/cli/connections.c:648
 msgid "deactivating"
 msgstr ""
 
-#: ../cli/src/common.c:703
+#: ../clients/cli/common.c:516
 msgid "connection failed"
 msgstr ""
 
-#: ../cli/src/common.c:705 ../cli/src/connections.c:565
-#: ../cli/src/connections.c:588 ../cli/src/connections.c:1656
-#: ../cli/src/devices.c:832 ../cli/src/devices.c:2282
-#: ../cli/src/network-manager.c:279 ../cli/src/network-manager.c:297
-#: ../cli/src/network-manager.c:360 ../cli/src/network-manager.c:363
-#: ../cli/src/network-manager.c:373 ../cli/src/network-manager.c:375
-#: ../cli/src/network-manager.c:432 ../cli/src/network-manager.c:448
-#: ../cli/src/settings.c:736 ../cli/src/settings.c:764
-#: ../cli/src/settings.c:826 ../cli/src/settings.c:1142
-#: ../cli/src/utils.c:1122 ../src/main.c:503 ../src/main.c:531
+#: ../clients/cli/common.c:518 ../clients/cli/common.c:535
+#: ../clients/cli/connections.c:653 ../clients/cli/connections.c:676
+#: ../clients/cli/connections.c:1949 ../clients/cli/devices.c:1024
+#: ../clients/cli/devices.c:1065 ../clients/cli/devices.c:1067
+#: ../clients/cli/general.c:248 ../clients/cli/general.c:286
+#: ../clients/cli/general.c:432 ../clients/cli/general.c:448
+#: ../clients/cli/settings.c:839 ../clients/cli/settings.c:925
+#: ../clients/cli/settings.c:1265 ../clients/cli/settings.c:1901
+#: ../clients/cli/settings.c:3205 ../clients/cli/utils.c:1400
+#, c-format
 msgid "unknown"
 msgstr ""
 
-#: ../cli/src/common.c:714
+#: ../clients/cli/common.c:544
 msgid "No reason given"
 msgstr ""
 
-#: ../cli/src/common.c:717 ../cli/src/connections.c:2452
+#. We should not really come here
+#: ../clients/cli/common.c:547 ../clients/cli/connections.c:2976
 #, c-format
 msgid "Unknown error"
 msgstr ""
 
-#: ../cli/src/common.c:720
+#: ../clients/cli/common.c:550
 msgid "Device is now managed"
 msgstr ""
 
-#: ../cli/src/common.c:723
+#: ../clients/cli/common.c:553
 msgid "Device is now unmanaged"
 msgstr ""
 
-#: ../cli/src/common.c:726
+#: ../clients/cli/common.c:556
 msgid "The device could not be readied for configuration"
 msgstr ""
 
-#: ../cli/src/common.c:729
+#: ../clients/cli/common.c:559
 msgid ""
 "IP configuration could not be reserved (no available address, timeout, etc.)"
 msgstr ""
 
-#: ../cli/src/common.c:732
+#: ../clients/cli/common.c:562
 msgid "The IP configuration is no longer valid"
 msgstr ""
 
-#: ../cli/src/common.c:735
+#: ../clients/cli/common.c:565
 msgid "Secrets were required, but not provided"
 msgstr ""
 
-#: ../cli/src/common.c:738
+#: ../clients/cli/common.c:568
 msgid "802.1X supplicant disconnected"
 msgstr ""
 
-#: ../cli/src/common.c:741
+#: ../clients/cli/common.c:571
 msgid "802.1X supplicant configuration failed"
 msgstr ""
 
-#: ../cli/src/common.c:744
+#: ../clients/cli/common.c:574
 msgid "802.1X supplicant failed"
 msgstr ""
 
-#: ../cli/src/common.c:747
+#: ../clients/cli/common.c:577
 msgid "802.1X supplicant took too long to authenticate"
 msgstr ""
 
-#: ../cli/src/common.c:750
+#: ../clients/cli/common.c:580
 msgid "PPP service failed to start"
 msgstr ""
 
-#: ../cli/src/common.c:753
+#: ../clients/cli/common.c:583
 msgid "PPP service disconnected"
 msgstr ""
 
-#: ../cli/src/common.c:756
+#: ../clients/cli/common.c:586
 msgid "PPP failed"
 msgstr ""
 
-#: ../cli/src/common.c:759
+#: ../clients/cli/common.c:589
 msgid "DHCP client failed to start"
 msgstr ""
 
-#: ../cli/src/common.c:762
+#: ../clients/cli/common.c:592
 msgid "DHCP client error"
 msgstr ""
 
-#: ../cli/src/common.c:765
+#: ../clients/cli/common.c:595
 msgid "DHCP client failed"
 msgstr ""
 
-#: ../cli/src/common.c:768
+#: ../clients/cli/common.c:598
 msgid "Shared connection service failed to start"
 msgstr ""
 
-#: ../cli/src/common.c:771
+#: ../clients/cli/common.c:601
 msgid "Shared connection service failed"
 msgstr ""
 
-#: ../cli/src/common.c:774
+#: ../clients/cli/common.c:604
 msgid "AutoIP service failed to start"
 msgstr ""
 
-#: ../cli/src/common.c:777
+#: ../clients/cli/common.c:607
 msgid "AutoIP service error"
 msgstr ""
 
-#: ../cli/src/common.c:780
+#: ../clients/cli/common.c:610
 msgid "AutoIP service failed"
 msgstr ""
 
-#: ../cli/src/common.c:783
+#: ../clients/cli/common.c:613
 msgid "The line is busy"
 msgstr ""
 
-#: ../cli/src/common.c:786
+#: ../clients/cli/common.c:616
 msgid "No dial tone"
 msgstr ""
 
-#: ../cli/src/common.c:789
+#: ../clients/cli/common.c:619
 msgid "No carrier could be established"
 msgstr ""
 
-#: ../cli/src/common.c:792
+#: ../clients/cli/common.c:622
 msgid "The dialing request timed out"
 msgstr ""
 
-#: ../cli/src/common.c:795
+#: ../clients/cli/common.c:625
 msgid "The dialing attempt failed"
 msgstr ""
 
-#: ../cli/src/common.c:798
+#: ../clients/cli/common.c:628
 msgid "Modem initialization failed"
 msgstr ""
 
-#: ../cli/src/common.c:801
+#: ../clients/cli/common.c:631
 msgid "Failed to select the specified APN"
 msgstr ""
 
-#: ../cli/src/common.c:804
+#: ../clients/cli/common.c:634
 msgid "Not searching for networks"
 msgstr ""
 
-#: ../cli/src/common.c:807
+#: ../clients/cli/common.c:637
 msgid "Network registration denied"
 msgstr ""
 
-#: ../cli/src/common.c:810
+#: ../clients/cli/common.c:640
 msgid "Network registration timed out"
 msgstr ""
 
-#: ../cli/src/common.c:813
+#: ../clients/cli/common.c:643
 msgid "Failed to register with the requested network"
 msgstr ""
 
-#: ../cli/src/common.c:816
+#: ../clients/cli/common.c:646
 msgid "PIN check failed"
 msgstr ""
 
-#: ../cli/src/common.c:819
+#: ../clients/cli/common.c:649
 msgid "Necessary firmware for the device may be missing"
 msgstr ""
 
-#: ../cli/src/common.c:822
+#: ../clients/cli/common.c:652
 msgid "The device was removed"
 msgstr ""
 
-#: ../cli/src/common.c:825
+#: ../clients/cli/common.c:655
 msgid "NetworkManager went to sleep"
 msgstr ""
 
-#: ../cli/src/common.c:828
+#: ../clients/cli/common.c:658
 msgid "The device's active connection disappeared"
 msgstr ""
 
-#: ../cli/src/common.c:831
+#: ../clients/cli/common.c:661
 msgid "Device disconnected by user or client"
 msgstr ""
 
-#: ../cli/src/common.c:834
+#: ../clients/cli/common.c:664
 msgid "Carrier/link changed"
 msgstr ""
 
-#: ../cli/src/common.c:837
+#: ../clients/cli/common.c:667
 msgid "The device's existing connection was assumed"
 msgstr ""
 
-#: ../cli/src/common.c:840
+#: ../clients/cli/common.c:670
 msgid "The supplicant is now available"
 msgstr ""
 
-#: ../cli/src/common.c:843
+#: ../clients/cli/common.c:673
 msgid "The modem could not be found"
 msgstr ""
 
-#: ../cli/src/common.c:846
+#: ../clients/cli/common.c:676
 msgid "The Bluetooth connection failed or timed out"
 msgstr ""
 
-#: ../cli/src/common.c:849
+#: ../clients/cli/common.c:679
 msgid "GSM Modem's SIM card not inserted"
 msgstr ""
 
-#: ../cli/src/common.c:852
+#: ../clients/cli/common.c:682
 msgid "GSM Modem's SIM PIN required"
 msgstr ""
 
-#: ../cli/src/common.c:855
+#: ../clients/cli/common.c:685
 msgid "GSM Modem's SIM PUK required"
 msgstr ""
 
-#: ../cli/src/common.c:858
+#: ../clients/cli/common.c:688
 msgid "GSM Modem's SIM wrong"
 msgstr ""
 
-#: ../cli/src/common.c:861
+#: ../clients/cli/common.c:691
 msgid "InfiniBand device does not support connected mode"
 msgstr ""
 
-#: ../cli/src/common.c:864
+#: ../clients/cli/common.c:694
 msgid "A dependency of the connection failed"
 msgstr ""
 
-#: ../cli/src/common.c:867
+#: ../clients/cli/common.c:697
 msgid "A problem with the RFC 2684 Ethernet over ADSL bridge"
 msgstr ""
 
-#: ../cli/src/common.c:870
+#: ../clients/cli/common.c:700
 msgid "ModemManager is unavailable"
 msgstr ""
 
-#: ../cli/src/common.c:873
+#: ../clients/cli/common.c:703
 msgid "The Wi-Fi network could not be found"
 msgstr ""
 
-#: ../cli/src/common.c:876
+#: ../clients/cli/common.c:706
 msgid "A secondary connection of the base connection failed"
 msgstr ""
 
 #. TRANSLATORS: Unknown reason for a device state change (NMDeviceStateReason)
-#: ../cli/src/common.c:895 ../cli/src/devices.c:639
-#: ../libnm-glib/nm-device.c:1837
+#: ../clients/cli/common.c:734 ../libnm-glib/nm-device.c:1888
+#: ../libnm/nm-device.c:1839
 msgid "Unknown"
 msgstr ""
 
 #. 0
-#: ../cli/src/connections.c:82 ../cli/src/connections.c:194
-#: ../cli/src/devices.c:89 ../cli/src/devices.c:117 ../cli/src/devices.c:127
-#: ../cli/src/devices.c:137 ../cli/src/devices.c:146 ../cli/src/devices.c:161
-#: ../cli/src/devices.c:174 ../cli/src/devices.c:200 ../cli/src/devices.c:215
-#: ../cli/src/devices.c:224
+#: ../clients/cli/connections.c:73 ../clients/cli/connections.c:193
+#: ../clients/cli/devices.c:55 ../clients/cli/devices.c:89
+#: ../clients/cli/devices.c:99 ../clients/cli/devices.c:110
+#: ../clients/cli/devices.c:120 ../clients/cli/devices.c:137
+#: ../clients/cli/devices.c:150 ../clients/cli/devices.c:176
+#: ../clients/cli/devices.c:191 ../clients/cli/devices.c:200
+#: ../clients/cli/devices.c:210 ../clients/cli/devices.c:251
 msgid "NAME"
 msgstr ""
 
 #. 0
 #. 1
-#: ../cli/src/connections.c:83 ../cli/src/connections.c:195
+#: ../clients/cli/connections.c:74 ../clients/cli/connections.c:194
 msgid "UUID"
 msgstr ""
 
@@ -364,101 +367,103 @@
 #. 0
 #. 1
 #. 2
-#: ../cli/src/connections.c:84 ../cli/src/connections.c:216
-#: ../cli/src/devices.c:75 ../cli/src/devices.c:91 ../cli/src/devices.c:203
+#: ../clients/cli/connections.c:75 ../clients/cli/connections.c:215
+#: ../clients/cli/devices.c:41 ../clients/cli/devices.c:57
+#: ../clients/cli/devices.c:179
 msgid "TYPE"
 msgstr ""
 
 #. 2
-#: ../cli/src/connections.c:85
+#: ../clients/cli/connections.c:76
 msgid "TIMESTAMP"
 msgstr ""
 
 #. 3
-#: ../cli/src/connections.c:86
+#: ../clients/cli/connections.c:77
 msgid "TIMESTAMP-REAL"
 msgstr ""
 
 #. 4
-#. 14
-#: ../cli/src/connections.c:87 ../cli/src/devices.c:104
+#. 16
+#: ../clients/cli/connections.c:78 ../clients/cli/devices.c:72
 msgid "AUTOCONNECT"
 msgstr ""
 
-#. 5
-#: ../cli/src/connections.c:88
+#. 6
+#: ../clients/cli/connections.c:80
 msgid "READONLY"
 msgstr ""
 
-#. 6
+#. 7
 #. 8
 #. 2
 #. 15
 #. 5
-#: ../cli/src/connections.c:89 ../cli/src/connections.c:202
-#: ../cli/src/devices.c:77 ../cli/src/devices.c:190 ../cli/src/devices.c:206
+#: ../clients/cli/connections.c:81 ../clients/cli/connections.c:201
+#: ../clients/cli/devices.c:43 ../clients/cli/devices.c:166
+#: ../clients/cli/devices.c:182
 msgid "DBUS-PATH"
 msgstr ""
 
 #. 2
-#: ../cli/src/connections.c:196
+#: ../clients/cli/connections.c:195
 msgid "DEVICES"
 msgstr ""
 
-#. 9
+#. 10
 #. 3
 #. 1
-#. 9
+#. 10
 #. 1
-#: ../cli/src/connections.c:92 ../cli/src/connections.c:197
-#: ../cli/src/devices.c:76 ../cli/src/devices.c:99
-#: ../cli/src/network-manager.c:39
+#: ../clients/cli/connections.c:84 ../clients/cli/connections.c:196
+#: ../clients/cli/devices.c:42 ../clients/cli/devices.c:66
+#: ../clients/cli/general.c:36
 msgid "STATE"
 msgstr ""
 
 #. 4
-#: ../cli/src/connections.c:198
+#: ../clients/cli/connections.c:197
 msgid "DEFAULT"
 msgstr ""
 
 #. 5
-#: ../cli/src/connections.c:199
+#: ../clients/cli/connections.c:198
 msgid "DEFAULT6"
 msgstr ""
 
 #. 6
-#: ../cli/src/connections.c:200
+#: ../clients/cli/connections.c:199
 msgid "SPEC-OBJECT"
 msgstr ""
 
 #. 7
 #. 4
 #. Ask for optional 'vpn' arguments.
-#: ../cli/src/connections.c:201 ../cli/src/connections.c:239
-#: ../cli/src/connections.c:3505 ../tui/nm-editor-utils.c:243
-#: ../tui/nmt-connect-connection-list.c:407
+#: ../clients/cli/connections.c:200 ../clients/cli/connections.c:238
+#: ../clients/cli/connections.c:4169 ../clients/tui/nm-editor-utils.c:233
+#: ../clients/tui/nmt-connect-connection-list.c:405
 msgid "VPN"
 msgstr ""
 
 #. 9
 #. 5
-#. 18
-#: ../cli/src/connections.c:203 ../cli/src/devices.c:80
-#: ../cli/src/devices.c:108
+#. 22
+#: ../clients/cli/connections.c:202 ../clients/cli/devices.c:46
+#: ../clients/cli/devices.c:78
 msgid "CON-PATH"
 msgstr ""
 
 #. 10
-#: ../cli/src/connections.c:204
+#: ../clients/cli/connections.c:203
 msgid "ZONE"
 msgstr ""
 
 #. 11
-#: ../cli/src/connections.c:205
+#: ../clients/cli/connections.c:204
 msgid "MASTER-PATH"
 msgstr ""
 
-#: ../cli/src/connections.c:234 ../cli/src/devices.c:239
+#: ../clients/cli/connections.c:233 ../clients/cli/devices.c:225
 msgid "GENERAL"
 msgstr ""
 
@@ -468,27 +473,29 @@
 msgstr ""
 
 #. 1
-#: ../cli/src/connections.c:217
+#: ../clients/cli/connections.c:216
 msgid "USERNAME"
 msgstr ""
 
+#. 1
 #. 2
-#: ../cli/src/connections.c:218
+#: ../clients/cli/common.c:40 ../clients/cli/common.c:61
+#: ../clients/cli/connections.c:217
 msgid "GATEWAY"
 msgstr ""
 
 #. 3
-#: ../cli/src/connections.c:219
+#: ../clients/cli/connections.c:218
 msgid "BANNER"
 msgstr ""
 
 #. 4
-#: ../cli/src/connections.c:220
+#: ../clients/cli/connections.c:219
 msgid "VPN-STATE"
 msgstr ""
 
 #. 5
-#: ../cli/src/connections.c:221
+#: ../clients/cli/connections.c:220
 msgid "CFG"
 msgstr ""
 
@@ -523,34 +530,44 @@
 msgid "Connection details"
 msgstr ""
 
-#: ../cli/src/connections.c:825
+#: ../clients/cli/connections.c:932 ../clients/cli/settings.c:1897
 msgid "never"
 msgstr ""
 
 #. "CAPABILITIES"
-#: ../cli/src/connections.c:826 ../cli/src/connections.c:827
-#: ../cli/src/connections.c:829 ../cli/src/connections.c:888
-#: ../cli/src/connections.c:889 ../cli/src/connections.c:891
-#: ../cli/src/connections.c:2841 ../cli/src/connections.c:6572
-#: ../cli/src/connections.c:6573 ../cli/src/devices.c:609
-#: ../cli/src/devices.c:659 ../cli/src/devices.c:801 ../cli/src/devices.c:802
-#: ../cli/src/devices.c:803 ../cli/src/devices.c:836 ../cli/src/devices.c:865
-#: ../cli/src/devices.c:866 ../cli/src/devices.c:867 ../cli/src/devices.c:868
-#: ../cli/src/devices.c:869 ../cli/src/devices.c:870 ../cli/src/devices.c:871
-#: ../cli/src/network-manager.c:442 ../cli/src/settings.c:1509
+#: ../clients/cli/common.c:527 ../clients/cli/connections.c:933
+#: ../clients/cli/connections.c:935 ../clients/cli/connections.c:937
+#: ../clients/cli/connections.c:971 ../clients/cli/connections.c:1040
+#: ../clients/cli/connections.c:1041 ../clients/cli/connections.c:1043
+#: ../clients/cli/connections.c:3450 ../clients/cli/connections.c:8563
+#: ../clients/cli/connections.c:8564 ../clients/cli/devices.c:772
+#: ../clients/cli/devices.c:989 ../clients/cli/devices.c:990
+#: ../clients/cli/devices.c:991 ../clients/cli/devices.c:992
+#: ../clients/cli/devices.c:993 ../clients/cli/devices.c:1028
+#: ../clients/cli/devices.c:1030 ../clients/cli/devices.c:1058
+#: ../clients/cli/devices.c:1059 ../clients/cli/devices.c:1060
+#: ../clients/cli/devices.c:1061 ../clients/cli/devices.c:1062
+#: ../clients/cli/devices.c:1063 ../clients/cli/devices.c:1064
+#: ../clients/cli/devices.c:1066 ../clients/cli/devices.c:1068
+#: ../clients/cli/general.c:442 ../clients/cli/settings.c:3200
 msgid "yes"
 msgstr ""
 
-#: ../cli/src/connections.c:826 ../cli/src/connections.c:827
-#: ../cli/src/connections.c:829 ../cli/src/connections.c:888
-#: ../cli/src/connections.c:889 ../cli/src/connections.c:891
-#: ../cli/src/connections.c:2842 ../cli/src/connections.c:6572
-#: ../cli/src/connections.c:6573 ../cli/src/devices.c:609
-#: ../cli/src/devices.c:659 ../cli/src/devices.c:801 ../cli/src/devices.c:802
-#: ../cli/src/devices.c:803 ../cli/src/devices.c:836 ../cli/src/devices.c:865
-#: ../cli/src/devices.c:866 ../cli/src/devices.c:867 ../cli/src/devices.c:868
-#: ../cli/src/devices.c:869 ../cli/src/devices.c:870 ../cli/src/devices.c:871
-#: ../cli/src/network-manager.c:444 ../cli/src/settings.c:1509
+#: ../clients/cli/common.c:529 ../clients/cli/connections.c:933
+#: ../clients/cli/connections.c:935 ../clients/cli/connections.c:937
+#: ../clients/cli/connections.c:1040 ../clients/cli/connections.c:1041
+#: ../clients/cli/connections.c:1043 ../clients/cli/connections.c:3451
+#: ../clients/cli/connections.c:8563 ../clients/cli/connections.c:8564
+#: ../clients/cli/devices.c:772 ../clients/cli/devices.c:989
+#: ../clients/cli/devices.c:990 ../clients/cli/devices.c:991
+#: ../clients/cli/devices.c:992 ../clients/cli/devices.c:993
+#: ../clients/cli/devices.c:1028 ../clients/cli/devices.c:1030
+#: ../clients/cli/devices.c:1058 ../clients/cli/devices.c:1059
+#: ../clients/cli/devices.c:1060 ../clients/cli/devices.c:1061
+#: ../clients/cli/devices.c:1062 ../clients/cli/devices.c:1063
+#: ../clients/cli/devices.c:1064 ../clients/cli/devices.c:1066
+#: ../clients/cli/devices.c:1068 ../clients/cli/general.c:444
+#: ../clients/cli/settings.c:3202
 msgid "no"
 msgstr ""
 
@@ -558,16 +575,22 @@
 msgid "Connection list"
 msgstr ""
 
-#: ../cli/src/connections.c:1376 ../cli/src/connections.c:1977
-#: ../cli/src/connections.c:1993 ../cli/src/connections.c:2002
-#: ../cli/src/connections.c:2012 ../cli/src/connections.c:2109
-#: ../cli/src/connections.c:8088 ../cli/src/connections.c:8311
-#: ../cli/src/devices.c:1642 ../cli/src/devices.c:1650
-#: ../cli/src/devices.c:2053 ../cli/src/devices.c:2060
-#: ../cli/src/devices.c:2074 ../cli/src/devices.c:2081
-#: ../cli/src/devices.c:2098 ../cli/src/devices.c:2106
-#: ../cli/src/devices.c:2302 ../cli/src/devices.c:2398
-#: ../cli/src/devices.c:2405
+#: ../clients/cli/connections.c:1681 ../clients/cli/connections.c:2389
+#: ../clients/cli/connections.c:2411 ../clients/cli/connections.c:2420
+#: ../clients/cli/connections.c:2429 ../clients/cli/connections.c:2588
+#: ../clients/cli/connections.c:10156 ../clients/cli/connections.c:10273
+#: ../clients/cli/connections.c:10405 ../clients/cli/connections.c:10538
+#: ../clients/cli/connections.c:10648 ../clients/cli/connections.c:10659
+#: ../clients/cli/connections.c:10758 ../clients/cli/devices.c:2346
+#: ../clients/cli/devices.c:2354 ../clients/cli/devices.c:2677
+#: ../clients/cli/devices.c:2684 ../clients/cli/devices.c:2698
+#: ../clients/cli/devices.c:2705 ../clients/cli/devices.c:2722
+#: ../clients/cli/devices.c:2730 ../clients/cli/devices.c:2743
+#: ../clients/cli/devices.c:3107 ../clients/cli/devices.c:3114
+#: ../clients/cli/devices.c:3121 ../clients/cli/devices.c:3133
+#: ../clients/cli/devices.c:3146 ../clients/cli/devices.c:3153
+#: ../clients/cli/devices.c:3325 ../clients/cli/devices.c:3332
+#: ../clients/cli/devices.c:3505
 #, c-format
 msgid "Error: %s argument is missing."
 msgstr ""
@@ -577,9 +600,9 @@
 msgid "Error: %s - no such connection."
 msgstr ""
 
-#: ../cli/src/connections.c:2021 ../cli/src/devices.c:1176
-#: ../cli/src/devices.c:1656 ../cli/src/devices.c:2117
-#: ../cli/src/devices.c:2411
+#: ../clients/cli/connections.c:2437 ../clients/cli/devices.c:1325
+#: ../clients/cli/devices.c:2360 ../clients/cli/devices.c:2754
+#: ../clients/cli/devices.c:3338
 #, c-format
 msgid "Unknown parameter: %s\n"
 msgstr ""
@@ -589,60 +612,58 @@
 msgid "Error: no valid parameter specified."
 msgstr ""
 
-#: ../cli/src/connections.c:1443 ../cli/src/connections.c:2045
-#: ../cli/src/connections.c:8379 ../cli/src/connections.c:8420
-#: ../cli/src/connections.c:8625 ../cli/src/devices.c:2281
-#: ../cli/src/devices.c:2737 ../cli/src/network-manager.c:539
-#: ../cli/src/network-manager.c:582 ../cli/src/network-manager.c:599
-#: ../cli/src/network-manager.c:645 ../cli/src/network-manager.c:659
-#: ../cli/src/network-manager.c:776 ../cli/src/network-manager.c:820
-#: ../cli/src/network-manager.c:840
+#: ../clients/cli/connections.c:1755 ../clients/cli/connections.c:2452
+#: ../clients/cli/connections.c:11162 ../clients/cli/devices.c:3294
+#: ../clients/cli/devices.c:3781 ../clients/cli/general.c:539
+#: ../clients/cli/general.c:588 ../clients/cli/general.c:605
+#: ../clients/cli/general.c:644 ../clients/cli/general.c:658
+#: ../clients/cli/general.c:776 ../clients/cli/general.c:823
+#: ../clients/cli/general.c:843
 #, c-format
 msgid "Error: %s."
 msgstr ""
 
-#: ../cli/src/connections.c:556
+#: ../clients/cli/connections.c:644
 msgid "activating"
 msgstr ""
 
-#: ../cli/src/connections.c:558
+#: ../clients/cli/connections.c:646
 msgid "activated"
 msgstr ""
 
-#: ../cli/src/connections.c:562
+#: ../clients/cli/connections.c:650
 msgid "deactivated"
 msgstr ""
 
-#: ../cli/src/connections.c:574
+#: ../clients/cli/connections.c:662
 msgid "VPN connecting (prepare)"
 msgstr ""
 
-#: ../cli/src/connections.c:576
+#: ../clients/cli/connections.c:664
 msgid "VPN connecting (need authentication)"
 msgstr ""
 
-#: ../cli/src/connections.c:578
+#: ../clients/cli/connections.c:666
 msgid "VPN connecting"
 msgstr ""
 
-#: ../cli/src/connections.c:580
+#: ../clients/cli/connections.c:668
 msgid "VPN connecting (getting IP configuration)"
 msgstr ""
 
-#: ../cli/src/connections.c:582
+#: ../clients/cli/connections.c:670
 msgid "VPN connected"
 msgstr ""
 
-#: ../cli/src/connections.c:584
+#: ../clients/cli/connections.c:672
 msgid "VPN connection failed"
 msgstr ""
 
-#: ../cli/src/connections.c:586
+#: ../clients/cli/connections.c:674
 msgid "VPN disconnected"
 msgstr ""
 
-#: ../cli/src/connections.c:884 ../cli/src/connections.c:894
-#: ../cli/src/devices.c:599
+#: ../clients/cli/devices.c:762
 msgid "N/A"
 msgstr ""
 
@@ -670,14 +691,9 @@
 msgid "Error: Can't find out if NetworkManager is running: %s."
 msgstr ""
 
-#: ../cli/src/connections.c:1308 ../cli/src/connections.c:2032
-#: ../cli/src/connections.c:2092 ../cli/src/connections.c:8072
-#: ../cli/src/connections.c:8280 ../cli/src/connections.c:8373
-#: ../cli/src/connections.c:8401 ../cli/src/devices.c:1202
-#: ../cli/src/devices.c:1250 ../cli/src/devices.c:1413
-#: ../cli/src/devices.c:1547 ../cli/src/devices.c:1684
-#: ../cli/src/devices.c:2140 ../cli/src/devices.c:2439
-#: ../cli/src/network-manager.c:484
+#: ../clients/cli/agent.c:206 ../clients/cli/connections.c:11050
+#: ../clients/cli/devices.c:3671 ../clients/cli/general.c:343
+#: ../clients/cli/general.c:484
 #, c-format
 msgid "Error: NetworkManager is not running."
 msgstr ""
@@ -686,7 +702,7 @@
 msgid "Active connections"
 msgstr ""
 
-#: ../cli/src/connections.c:2119
+#: ../cli/src/connections.c:959
 #, c-format
 msgid "Error: '%s' is not an active connection."
 msgstr ""
@@ -696,100 +712,100 @@
 msgid "Error: unknown parameter: %s"
 msgstr ""
 
-#: ../cli/src/connections.c:1538
+#: ../clients/cli/connections.c:1851
 #, c-format
 msgid "no active connection on device '%s'"
 msgstr ""
 
-#: ../cli/src/connections.c:1546
+#: ../clients/cli/connections.c:1859
 msgid "no active connection or device"
 msgstr ""
 
-#: ../cli/src/connections.c:1617
+#: ../clients/cli/connections.c:1910
 #, c-format
 msgid "device '%s' not compatible with connection '%s'"
 msgstr ""
 
-#: ../cli/src/connections.c:1620
+#: ../clients/cli/connections.c:1913
 #, c-format
 msgid "no device found for connection '%s'"
 msgstr ""
 
-#: ../cli/src/connections.c:1632
+#: ../clients/cli/connections.c:1925
 msgid "unknown reason"
 msgstr ""
 
-#: ../cli/src/connections.c:1634 ../cli/src/network-manager.c:288
+#: ../clients/cli/connections.c:1927 ../clients/cli/general.c:277
 msgid "none"
 msgstr "ཅི་མེད་"
 
-#: ../cli/src/connections.c:1636
+#: ../clients/cli/connections.c:1929
 msgid "the user was disconnected"
 msgstr ""
 
-#: ../cli/src/connections.c:1638
+#: ../clients/cli/connections.c:1931
 msgid "the base network connection was interrupted"
 msgstr ""
 
-#: ../cli/src/connections.c:1640
+#: ../clients/cli/connections.c:1933
 msgid "the VPN service stopped unexpectedly"
 msgstr ""
 
-#: ../cli/src/connections.c:1642
+#: ../clients/cli/connections.c:1935
 msgid "the VPN service returned invalid configuration"
 msgstr ""
 
-#: ../cli/src/connections.c:1644
+#: ../clients/cli/connections.c:1937
 msgid "the connection attempt timed out"
 msgstr ""
 
-#: ../cli/src/connections.c:1646
+#: ../clients/cli/connections.c:1939
 msgid "the VPN service did not start in time"
 msgstr ""
 
-#: ../cli/src/connections.c:1648
+#: ../clients/cli/connections.c:1941
 msgid "the VPN service failed to start"
 msgstr ""
 
-#: ../cli/src/connections.c:1650
+#: ../clients/cli/connections.c:1943
 msgid "no valid VPN secrets"
 msgstr ""
 
-#: ../cli/src/connections.c:1652
+#: ../clients/cli/connections.c:1945
 msgid "invalid VPN secrets"
 msgstr ""
 
-#: ../cli/src/connections.c:1654
+#: ../clients/cli/connections.c:1947
 msgid "the connection was removed"
 msgstr ""
 
-#: ../cli/src/connections.c:1671 ../cli/src/connections.c:1827
-#: ../cli/src/connections.c:6468
+#: ../clients/cli/connections.c:1969 ../clients/cli/connections.c:1997
+#: ../clients/cli/connections.c:2158 ../clients/cli/connections.c:8454
 #, c-format
 msgid "Connection successfully activated (D-Bus active path: %s)\n"
 msgstr ""
 
-#: ../cli/src/connections.c:1676
+#: ../clients/cli/connections.c:1980 ../clients/cli/connections.c:2002
 #, c-format
 msgid "Error: Connection activation failed."
 msgstr ""
 
-#: ../cli/src/connections.c:1701
+#: ../clients/cli/connections.c:2053
 #, c-format
 msgid "VPN connection successfully activated (D-Bus active path: %s)\n"
 msgstr ""
 
-#: ../cli/src/connections.c:1708
+#: ../clients/cli/connections.c:2061
 #, c-format
 msgid "Error: Connection activation failed: %s."
 msgstr ""
 
-#: ../cli/src/connections.c:1726 ../cli/src/devices.c:1299
+#: ../clients/cli/connections.c:2080 ../clients/cli/devices.c:1426
 #, c-format
 msgid "Error: Timeout %d sec expired."
 msgstr ""
 
-#: ../cli/src/connections.c:1811
+#: ../clients/cli/connections.c:2140
 #, c-format
 msgid "Error: Connection activation failed: %s"
 msgstr ""
@@ -827,7 +843,7 @@
 msgid "Warning: Connection not active\n"
 msgstr ""
 
-#: ../cli/src/connections.c:8249
+#: ../clients/cli/connections.c:10357
 #, c-format
 msgid "Error: Connection deletion failed: %s"
 msgstr ""
@@ -842,301 +858,304 @@
 msgid "Error: could not connect to D-Bus."
 msgstr ""
 
-#: ../cli/src/connections.c:8681 ../cli/src/network-manager.c:615
+#: ../cli/src/connections.c:1913
 #, c-format
 msgid "Error: Could not get system settings."
 msgstr ""
 
-#: ../cli/src/connections.c:8691
+#: ../cli/src/connections.c:1923
 #, c-format
 msgid "Error: Can't obtain connections: settings service is not running."
 msgstr ""
 
-#. 8
+#. 9
 #. 0
 #. 12
 #. 3
-#: ../cli/src/connections.c:91 ../cli/src/devices.c:74 ../cli/src/devices.c:90
-#: ../cli/src/devices.c:187 ../cli/src/devices.c:204
+#. 0
+#: ../clients/cli/connections.c:83 ../clients/cli/devices.c:40
+#: ../clients/cli/devices.c:56 ../clients/cli/devices.c:163
+#: ../clients/cli/devices.c:180 ../clients/cli/devices.c:252
 msgid "DEVICE"
 msgstr ""
 
 #. 0
-#: ../cli/src/devices.c:240
+#: ../clients/cli/devices.c:211 ../clients/cli/devices.c:226
 msgid "CAPABILITIES"
 msgstr ""
 
 #. 1
-#: ../cli/src/devices.c:241
+#: ../clients/cli/devices.c:227
 msgid "WIFI-PROPERTIES"
 msgstr ""
 
 #. 5
 #. 2
-#: ../cli/src/devices.c:152 ../cli/src/devices.c:242
+#: ../clients/cli/devices.c:126 ../clients/cli/devices.c:228
 msgid "AP"
 msgstr ""
 
 #. 3
-#: ../cli/src/devices.c:243
+#: ../clients/cli/devices.c:229
 msgid "WIRED-PROPERTIES"
 msgstr ""
 
 #. 4
-#: ../cli/src/devices.c:244
+#: ../clients/cli/devices.c:230
 msgid "WIMAX-PROPERTIES"
 msgstr ""
 
 #. 0
 #. 5
-#: ../cli/src/devices.c:201 ../cli/src/devices.c:245
+#: ../clients/cli/devices.c:177 ../clients/cli/devices.c:231
 msgid "NSP"
 msgstr ""
 
 #. 0
 #. 6
-#: ../cli/src/connections.c:235 ../cli/src/devices.c:246
+#: ../clients/cli/connections.c:234 ../clients/cli/devices.c:232
 msgid "IP4"
 msgstr ""
 
 #. 1
 #. 7
-#: ../cli/src/connections.c:236 ../cli/src/devices.c:247
+#: ../clients/cli/connections.c:235 ../clients/cli/devices.c:233
 msgid "DHCP4"
 msgstr ""
 
 #. 2
 #. 8
-#: ../cli/src/connections.c:237 ../cli/src/devices.c:248
+#: ../clients/cli/connections.c:236 ../clients/cli/devices.c:234
 msgid "IP6"
 msgstr ""
 
 #. 3
 #. 9
-#: ../cli/src/connections.c:238 ../cli/src/devices.c:249
+#: ../clients/cli/connections.c:237 ../clients/cli/devices.c:235
 msgid "DHCP6"
 msgstr ""
 
 #. 10
-#: ../cli/src/devices.c:250 ../tui/nmt-page-bond.c:73
+#: ../clients/cli/devices.c:236 ../clients/tui/nmt-page-bond.c:351
 msgid "BOND"
 msgstr ""
 
 #. Ask for optional 'vlan' arguments.
-#. 11
-#: ../cli/src/connections.c:3145 ../cli/src/devices.c:251
-#: ../libnm-glib/nm-device.c:1833 ../libnm-util/nm-connection.c:1303
-#: ../tui/nm-editor-utils.c:227 ../tui/nmt-page-vlan.c:53
+#. 13
+#: ../clients/cli/connections.c:3778 ../clients/cli/devices.c:239
+#: ../clients/tui/nm-editor-utils.c:217 ../clients/tui/nmt-page-vlan.c:94
+#: ../libnm-core/nm-connection.c:1714 ../libnm-glib/nm-device.c:1869
+#: ../libnm-util/nm-connection.c:1632 ../libnm/nm-device.c:1820
 msgid "VLAN"
 msgstr ""
 
-#. 12
-#: ../cli/src/devices.c:252
+#. 15
+#: ../clients/cli/devices.c:241
 msgid "CONNECTIONS"
 msgstr ""
 
-#. 2
-#: ../cli/src/devices.c:92
+#. 3
+#: ../clients/cli/devices.c:59
 msgid "VENDOR"
 msgstr ""
 
-#. 3
-#: ../cli/src/devices.c:93
+#. 4
+#: ../clients/cli/devices.c:60
 msgid "PRODUCT"
 msgstr ""
 
-#. 4
-#: ../cli/src/devices.c:94
+#. 5
+#: ../clients/cli/devices.c:61
 msgid "DRIVER"
 msgstr ""
 
-#. 5
-#: ../cli/src/devices.c:95
+#. 6
+#: ../clients/cli/devices.c:62
 msgid "DRIVER-VERSION"
 msgstr ""
 
-#. 6
-#: ../cli/src/devices.c:96
+#. 7
+#: ../clients/cli/devices.c:63
 msgid "FIRMWARE-VERSION"
 msgstr ""
 
-#. 7
-#: ../cli/src/devices.c:97
+#. 8
+#: ../clients/cli/devices.c:64
 msgid "HWADDR"
 msgstr ""
 
-#. 10
-#: ../cli/src/devices.c:100
+#. 11
+#: ../clients/cli/devices.c:67
 msgid "REASON"
 msgstr ""
 
-#. 11
-#: ../cli/src/devices.c:101
+#. 12
+#: ../clients/cli/devices.c:68
 msgid "UDI"
 msgstr ""
 
-#. 12
-#: ../cli/src/devices.c:102
+#. 13
+#: ../clients/cli/devices.c:69
 msgid "IP-IFACE"
 msgstr ""
 
-#. 13
-#: ../cli/src/devices.c:103
+#. 15
+#: ../clients/cli/devices.c:71
 msgid "NM-MANAGED"
 msgstr ""
 
-#. 15
-#: ../cli/src/devices.c:105
+#. 17
+#: ../clients/cli/devices.c:73
 msgid "FIRMWARE-MISSING"
 msgstr ""
 
 #. 3
-#. 16
-#: ../cli/src/devices.c:78 ../cli/src/devices.c:106
+#. 20
+#: ../clients/cli/devices.c:44 ../clients/cli/devices.c:76
 msgid "CONNECTION"
 msgstr ""
 
 #. 0
-#: ../cli/src/devices.c:118
+#: ../clients/cli/devices.c:90
 msgid "AVAILABLE-CONNECTION-PATHS"
 msgstr ""
 
 #. 1
-#: ../cli/src/devices.c:119
+#: ../clients/cli/devices.c:91
 msgid "AVAILABLE-CONNECTIONS"
 msgstr ""
 
 #. 0
-#: ../cli/src/devices.c:128
+#: ../clients/cli/devices.c:100
 msgid "CARRIER-DETECT"
 msgstr ""
 
 #. 1
-#: ../cli/src/devices.c:129
+#: ../clients/cli/devices.c:101
 msgid "SPEED"
 msgstr ""
 
 #. 0
-#: ../cli/src/devices.c:138
+#: ../clients/cli/devices.c:111
 msgid "CARRIER"
 msgstr ""
 
 #. 0
-#: ../cli/src/devices.c:147 ../cli/src/devices.c:568
+#: ../clients/cli/devices.c:121 ../clients/cli/devices.c:731
 msgid "WEP"
 msgstr ""
 
 #. 1
-#: ../cli/src/devices.c:148
+#: ../clients/cli/devices.c:122
 msgid "WPA"
 msgstr ""
 
 #. 2
-#: ../cli/src/devices.c:149 ../cli/src/devices.c:576
+#: ../clients/cli/devices.c:123 ../clients/cli/devices.c:739
 msgid "WPA2"
 msgstr ""
 
 #. 3
-#: ../cli/src/devices.c:150
+#: ../clients/cli/devices.c:124
 msgid "TKIP"
 msgstr ""
 
 #. 4
-#: ../cli/src/devices.c:151
+#: ../clients/cli/devices.c:125
 msgid "CCMP"
 msgstr ""
 
 #. 6
-#: ../cli/src/devices.c:153
+#: ../clients/cli/devices.c:127
 msgid "ADHOC"
 msgstr ""
 
 #. 0
-#: ../cli/src/devices.c:162
+#: ../clients/cli/devices.c:138
 msgid "CTR-FREQ"
 msgstr ""
 
 #. 1
-#: ../cli/src/devices.c:163
+#: ../clients/cli/devices.c:139
 msgid "RSSI"
 msgstr ""
 
 #. 2
-#: ../cli/src/devices.c:164
+#: ../clients/cli/devices.c:140
 msgid "CINR"
 msgstr ""
 
 #. 3
-#: ../cli/src/devices.c:165
+#: ../clients/cli/devices.c:141
 msgid "TX-POW"
 msgstr ""
 
 #. 4
-#: ../cli/src/devices.c:166
+#: ../clients/cli/devices.c:142
 msgid "BSID"
 msgstr ""
 
 #. 0
-#: ../cli/src/devices.c:175 ../tui/nmt-page-wifi.c:221
+#: ../clients/cli/devices.c:151 ../clients/tui/nmt-page-wifi.c:224
 msgid "SSID"
 msgstr ""
 
 #. 2
-#: ../cli/src/devices.c:177 ../tui/nmt-page-wifi.c:352
+#: ../clients/cli/devices.c:153 ../clients/tui/nmt-page-wifi.c:358
 msgid "BSSID"
 msgstr ""
 
 #. 3
-#: ../cli/src/devices.c:178
+#: ../clients/cli/devices.c:154
 msgid "MODE"
 msgstr ""
 
 #. 5
-#: ../cli/src/devices.c:180
+#: ../clients/cli/devices.c:156
 msgid "FREQ"
 msgstr ""
 
 #. 6
-#: ../cli/src/devices.c:181
+#: ../clients/cli/devices.c:157
 msgid "RATE"
 msgstr ""
 
 #. 7
 #. 1
-#: ../cli/src/devices.c:182 ../cli/src/devices.c:202
+#: ../clients/cli/devices.c:158 ../clients/cli/devices.c:178
 msgid "SIGNAL"
 msgstr ""
 
 #. 9
-#: ../cli/src/devices.c:184
+#: ../clients/cli/devices.c:160
 msgid "SECURITY"
 msgstr ""
 
 #. 10
-#: ../cli/src/devices.c:185
+#: ../clients/cli/devices.c:161
 msgid "WPA-FLAGS"
 msgstr ""
 
 #. 11
-#: ../cli/src/devices.c:186
+#: ../clients/cli/devices.c:162
 msgid "RSN-FLAGS"
 msgstr ""
 
-#. 7
+#. 8
 #. 13
 #. 4
-#: ../cli/src/connections.c:90 ../cli/src/devices.c:188
-#: ../cli/src/devices.c:205
+#: ../clients/cli/connections.c:82 ../clients/cli/devices.c:164
+#: ../clients/cli/devices.c:181
 msgid "ACTIVE"
 msgstr ""
 
 #. 0
-#: ../cli/src/devices.c:216
+#: ../clients/cli/devices.c:192
 msgid "SLAVES"
 msgstr ""
 
-#. 0
-#: ../cli/src/devices.c:225
+#. 1
+#: ../clients/cli/devices.c:202
 msgid "ID"
 msgstr ""
 
@@ -1160,11 +1179,11 @@
 "\n"
 msgstr ""
 
-#: ../cli/src/devices.c:483
+#: ../clients/cli/devices.c:650 ../clients/cli/devices.c:801
 msgid "(none)"
 msgstr ""
 
-#: ../cli/src/devices.c:552
+#: ../clients/cli/devices.c:719
 #, c-format
 msgid "%u MHz"
 msgstr ""
@@ -1194,7 +1213,7 @@
 msgid "Enterprise "
 msgstr ""
 
-#: ../cli/src/devices.c:597
+#: ../clients/cli/devices.c:760
 msgid "Ad-Hoc"
 msgstr ""
 
@@ -1202,15 +1221,15 @@
 msgid "Infrastructure"
 msgstr ""
 
-#: ../cli/src/devices.c:630
+#: ../cli/src/devices.c:485
 msgid "Home"
 msgstr ""
 
-#: ../cli/src/devices.c:633
+#: ../cli/src/devices.c:488
 msgid "Partner"
 msgstr ""
 
-#: ../cli/src/devices.c:636
+#: ../cli/src/devices.c:491
 msgid "Roaming"
 msgstr ""
 
@@ -1224,12 +1243,11 @@
 msgid "Error: 'dev list': %s; allowed fields: %s"
 msgstr ""
 
-#: ../cli/src/devices.c:730
+#: ../clients/cli/devices.c:916
 msgid "Device details"
 msgstr ""
 
-#: ../cli/src/devices.c:792 ../cli/src/devices.c:795 ../cli/src/devices.c:1342
-#: ../cli/src/devices.c:1484
+#: ../clients/cli/devices.c:980 ../clients/cli/devices.c:983
 msgid "(unknown)"
 msgstr ""
 
@@ -1237,16 +1255,16 @@
 msgid "not connected"
 msgstr ""
 
-#: ../cli/src/devices.c:832
+#: ../clients/cli/devices.c:1024
 #, c-format
 msgid "%u Mb/s"
 msgstr ""
 
-#: ../cli/src/devices.c:918
+#: ../clients/cli/devices.c:1115
 msgid "on"
 msgstr ""
 
-#: ../cli/src/devices.c:918
+#: ../clients/cli/devices.c:1115
 msgid "off"
 msgstr ""
 
@@ -1261,33 +1279,33 @@
 msgstr ""
 
 #. Add headers
-#: ../cli/src/devices.c:1211
+#: ../clients/cli/devices.c:1349
 msgid "Status of devices"
 msgstr ""
 
-#: ../cli/src/devices.c:1049
+#: ../clients/cli/devices.c:2146 ../clients/cli/devices.c:2161
 #, c-format
 msgid "Error: '%s' argument is missing."
 msgstr ""
 
-#: ../cli/src/devices.c:1270 ../cli/src/devices.c:1432
-#: ../cli/src/devices.c:1566 ../cli/src/devices.c:1705
-#: ../cli/src/devices.c:2461
+#: ../clients/cli/devices.c:1397 ../clients/cli/devices.c:1707
+#: ../clients/cli/devices.c:2128 ../clients/cli/devices.c:2398
+#: ../clients/cli/devices.c:3550
 #, c-format
 msgid "Error: Device '%s' not found."
 msgstr ""
 
-#: ../cli/src/devices.c:1469
+#: ../cli/src/devices.c:1113
 #, c-format
 msgid "Success: Device '%s' successfully disconnected."
 msgstr ""
 
-#: ../cli/src/devices.c:1481
+#: ../cli/src/devices.c:1148
 #, c-format
 msgid "Error: Device '%s' (%s) disconnecting failed: %s"
 msgstr ""
 
-#: ../cli/src/devices.c:1495
+#: ../cli/src/devices.c:1161
 #, c-format
 msgid "Device '%s' has been disconnected.\n"
 msgstr ""
@@ -1311,7 +1329,7 @@
 msgid "WiFi scan list"
 msgstr ""
 
-#: ../cli/src/devices.c:1728 ../cli/src/devices.c:1803
+#: ../clients/cli/devices.c:2421 ../clients/cli/devices.c:2502
 #, c-format
 msgid "Error: Access point with bssid '%s' not found."
 msgstr ""
@@ -1321,69 +1339,70 @@
 msgid "Error: Device '%s' is not a WiFi device."
 msgstr ""
 
-#: ../cli/src/devices.c:1846 ../cli/src/devices.c:1893
+#: ../clients/cli/devices.c:1544
 #, c-format
 msgid "Connection with UUID '%s' created and activated on device '%s'\n"
 msgstr ""
 
-#: ../cli/src/devices.c:1850
+#: ../cli/src/devices.c:1506
 #, c-format
 msgid "Error: Connection activation failed: (%d) %s."
 msgstr ""
 
-#: ../cli/src/devices.c:1875
+#: ../cli/src/devices.c:1531
 #, c-format
 msgid "Error: Failed to add/activate new connection: (%d) %s"
 msgstr ""
 
-#: ../cli/src/devices.c:1883
+#: ../clients/cli/devices.c:1532
 #, c-format
 msgid "Error: Failed to add/activate new connection: Unknown error"
 msgstr ""
 
-#: ../cli/src/devices.c:2043
+#: ../clients/cli/devices.c:2667
 #, c-format
 msgid "Error: SSID or BSSID are missing."
 msgstr ""
 
-#: ../cli/src/devices.c:2067
+#: ../clients/cli/devices.c:2691
 #, c-format
 msgid "Error: bssid argument value '%s' is not a valid BSSID."
 msgstr ""
 
-#: ../cli/src/devices.c:2091
+#: ../clients/cli/devices.c:2715
 #, c-format
 msgid ""
 "Error: wep-key-type argument value '%s' is invalid, use 'key' or 'phrase'."
 msgstr ""
 
-#: ../cli/src/devices.c:2126
+#: ../clients/cli/devices.c:2763
 #, c-format
 msgid "Error: BSSID to connect to (%s) differs from bssid argument (%s)."
 msgstr ""
 
-#: ../cli/src/devices.c:2132
+#: ../clients/cli/devices.c:2769
 #, c-format
 msgid "Error: Parameter '%s' is neither SSID nor BSSID."
 msgstr ""
 
-#: ../cli/src/devices.c:1752 ../cli/src/devices.c:2156
-#: ../cli/src/devices.c:2318
+#: ../clients/cli/devices.c:2450 ../clients/cli/devices.c:2782
+#: ../clients/cli/devices.c:3202 ../clients/cli/devices.c:3351
 #, c-format
 msgid "Error: Device '%s' is not a Wi-Fi device."
 msgstr ""
 
-#: ../cli/src/devices.c:2158 ../cli/src/devices.c:2320
+#: ../clients/cli/devices.c:2784 ../clients/cli/devices.c:3204
+#: ../clients/cli/devices.c:3353
 #, c-format
 msgid "Error: No Wi-Fi device found."
 msgstr ""
 
-#: ../cli/src/devices.c:2176
+#: ../clients/cli/devices.c:2829
 #, c-format
 msgid "Error: No network with SSID '%s' found."
 msgstr ""
 
-#: ../cli/src/devices.c:2178
+#: ../clients/cli/devices.c:2831
 #, c-format
 msgid "Error: No access point with BSSID '%s' found."
 msgstr ""
@@ -1403,21 +1422,21 @@
 msgid "Error: 'dev wimax': %s; allowed fields: %s"
 msgstr ""
 
-#: ../cli/src/devices.c:2393
+#: ../cli/src/devices.c:2026
 msgid "WiMAX NSP list"
 msgstr ""
 
-#: ../cli/src/devices.c:2484
+#: ../cli/src/devices.c:2063
 #, c-format
 msgid "Error: NSP with name '%s' not found."
 msgstr ""
 
-#: ../cli/src/devices.c:2497
+#: ../cli/src/devices.c:2074
 #, c-format
 msgid "Error: Device '%s' is not a WiMAX device."
 msgstr ""
 
-#: ../cli/src/devices.c:2541
+#: ../cli/src/devices.c:2105
 #, c-format
 msgid "Error: Access point with nsp '%s' not found."
 msgstr ""
@@ -1427,17 +1446,17 @@
 msgid "Error: 'dev wimax' command '%s' is not valid."
 msgstr ""
 
-#: ../cli/src/devices.c:2728
+#: ../clients/cli/devices.c:3772
 #, c-format
 msgid "Error: 'dev' command '%s' is not valid."
 msgstr ""
 
-#: ../cli/src/network-manager.c:37
+#: ../clients/cli/general.c:34
 msgid "RUNNING"
 msgstr ""
 
 #. 0
-#: ../cli/src/network-manager.c:38
+#: ../clients/cli/general.c:35
 msgid "VERSION"
 msgstr ""
 
@@ -1452,7 +1471,7 @@
 msgstr ""
 
 #. 6
-#: ../cli/src/network-manager.c:44
+#: ../clients/cli/general.c:41
 msgid "WIFI"
 msgstr ""
 
@@ -1462,7 +1481,7 @@
 msgstr ""
 
 #. 8
-#: ../cli/src/network-manager.c:46
+#: ../clients/cli/general.c:43
 msgid "WWAN"
 msgstr ""
 
@@ -1472,16 +1491,16 @@
 msgstr ""
 
 #. 10
-#: ../cli/src/network-manager.c:48
+#: ../clients/cli/general.c:45
 msgid "WIMAX"
 msgstr ""
 
-#: ../cli/src/network-manager.c:70
+#: ../clients/cli/general.c:61
 msgid "PERMISSION"
 msgstr ""
 
 #. 0
-#: ../cli/src/network-manager.c:71
+#: ../clients/cli/general.c:62
 msgid "VALUE"
 msgstr ""
 
@@ -1505,23 +1524,23 @@
 "\n"
 msgstr ""
 
-#: ../cli/src/network-manager.c:264
+#: ../clients/cli/general.c:233
 msgid "asleep"
 msgstr ""
 
-#: ../cli/src/network-manager.c:266
+#: ../clients/cli/general.c:235
 msgid "connecting"
 msgstr ""
 
-#: ../cli/src/network-manager.c:268
+#: ../clients/cli/general.c:237
 msgid "connected (local only)"
 msgstr ""
 
-#: ../cli/src/network-manager.c:270
+#: ../clients/cli/general.c:239
 msgid "connected (site only)"
 msgstr ""
 
-#: ../cli/src/network-manager.c:274
+#: ../clients/cli/general.c:243
 msgid "disconnecting"
 msgstr ""
 
@@ -1535,33 +1554,31 @@
 msgid "Error: 'nm status': %s; allowed fields: %s"
 msgstr ""
 
-#: ../cli/src/network-manager.c:348 ../cli/src/network-manager.c:349
-#: ../cli/src/network-manager.c:350 ../cli/src/network-manager.c:351
-#: ../cli/src/network-manager.c:352 ../cli/src/network-manager.c:354
-#: ../cli/src/network-manager.c:355
+#: ../clients/cli/general.c:370 ../clients/cli/general.c:371
+#: ../clients/cli/general.c:372 ../clients/cli/general.c:373
+#: ../clients/cli/general.c:374
 msgid "enabled"
 msgstr ""
 
-#: ../cli/src/network-manager.c:348 ../cli/src/network-manager.c:349
-#: ../cli/src/network-manager.c:350 ../cli/src/network-manager.c:351
-#: ../cli/src/network-manager.c:352 ../cli/src/network-manager.c:354
-#: ../cli/src/network-manager.c:355
+#: ../clients/cli/general.c:370 ../clients/cli/general.c:371
+#: ../clients/cli/general.c:372 ../clients/cli/general.c:373
+#: ../clients/cli/general.c:374
 msgid "disabled"
 msgstr ""
 
-#: ../cli/src/network-manager.c:367
+#: ../clients/cli/general.c:360
 msgid "NetworkManager status"
 msgstr ""
 
-#: ../cli/src/network-manager.c:372
+#: ../clients/cli/general.c:365
 msgid "running"
 msgstr ""
 
-#: ../cli/src/network-manager.c:372
+#: ../cli/src/network-manager.c:196
 msgid "not running"
 msgstr ""
 
-#: ../cli/src/network-manager.c:446
+#: ../clients/cli/general.c:446
 msgid "auth"
 msgstr ""
 
@@ -1575,7 +1592,7 @@
 msgid "Error: 'nm permissions': %s; allowed fields: %s"
 msgstr ""
 
-#: ../cli/src/network-manager.c:489
+#: ../clients/cli/general.c:489
 msgid "NetworkManager permissions"
 msgstr ""
 
@@ -1675,52 +1692,54 @@
 "\n"
 msgstr ""
 
-#: ../cli/src/nmcli.c:137
+#: ../clients/cli/nmcli.c:143
 #, c-format
 msgid "Error: Object '%s' is unknown, try 'nmcli help'."
 msgstr ""
 
-#: ../cli/src/nmcli.c:167
+#: ../clients/cli/nmcli.c:173
 #, c-format
 msgid "Error: Option '--terse' is specified the second time."
 msgstr ""
 
-#: ../cli/src/nmcli.c:172
+#: ../clients/cli/nmcli.c:178
 #, c-format
 msgid "Error: Option '--terse' is mutually exclusive with '--pretty'."
 msgstr ""
 
-#: ../cli/src/nmcli.c:180
+#: ../clients/cli/nmcli.c:186
 #, c-format
 msgid "Error: Option '--pretty' is specified the second time."
 msgstr ""
 
-#: ../cli/src/nmcli.c:185
+#: ../clients/cli/nmcli.c:191
 #, c-format
 msgid "Error: Option '--pretty' is mutually exclusive with '--terse'."
 msgstr ""
 
-#: ../cli/src/nmcli.c:195 ../cli/src/nmcli.c:211 ../cli/src/nmcli.c:240
+#: ../clients/cli/nmcli.c:201 ../clients/cli/nmcli.c:217
+#: ../clients/cli/nmcli.c:235 ../clients/cli/nmcli.c:266
 #, c-format
 msgid "Error: missing argument for '%s' option."
 msgstr ""
 
-#: ../cli/src/nmcli.c:204 ../cli/src/nmcli.c:220
+#: ../clients/cli/nmcli.c:210 ../clients/cli/nmcli.c:228
+#: ../clients/cli/nmcli.c:244
 #, c-format
 msgid "Error: '%s' is not valid argument for '%s' option."
 msgstr ""
 
-#: ../cli/src/nmcli.c:227
+#: ../clients/cli/nmcli.c:251
 #, c-format
 msgid "Error: fields for '%s' options are missing."
 msgstr ""
 
-#: ../cli/src/nmcli.c:252
+#: ../clients/cli/nmcli.c:278
 #, c-format
 msgid "nmcli tool, version %s\n"
 msgstr ""
 
-#: ../cli/src/nmcli.c:258
+#: ../clients/cli/nmcli.c:284
 #, c-format
 msgid "Error: Option '%s' is unknown, try 'nmcli -help'."
 msgstr ""
@@ -1730,12 +1749,11 @@
 msgid "Caught signal %d, shutting down..."
 msgstr ""
 
-#: ../cli/src/nmcli.c:343 ../test/nm-online.c:168
-#, c-format
+#: ../cli/src/nmcli.c:272
 msgid "Error: Could not create NMClient object."
 msgstr ""
 
-#: ../cli/src/nmcli.c:359
+#: ../clients/cli/nmcli.c:529
 msgid "Success"
 msgstr ""
 
@@ -1749,134 +1767,134 @@
 msgid "%d (104/128-bit passphrase)"
 msgstr ""
 
-#: ../cli/src/settings.c:675 ../cli/src/settings.c:803
+#: ../clients/cli/settings.c:795 ../clients/cli/settings.c:881
 #, c-format
 msgid "%d (unknown)"
 msgstr ""
 
-#: ../cli/src/settings.c:701
+#: ../cli/src/settings.c:626
 msgid "0 (unknown)"
 msgstr ""
 
-#: ../cli/src/settings.c:707
+#: ../cli/src/settings.c:632
 msgid "any, "
 msgstr ""
 
-#: ../cli/src/settings.c:709
+#: ../cli/src/settings.c:634
 msgid "900 MHz, "
 msgstr ""
 
-#: ../cli/src/settings.c:711
+#: ../cli/src/settings.c:636
 msgid "1800 MHz, "
 msgstr ""
 
-#: ../cli/src/settings.c:713
+#: ../cli/src/settings.c:638
 msgid "1900 MHz, "
 msgstr ""
 
-#: ../cli/src/settings.c:715
+#: ../cli/src/settings.c:640
 msgid "850 MHz, "
 msgstr ""
 
-#: ../cli/src/settings.c:717
+#: ../cli/src/settings.c:642
 msgid "WCDMA 3GPP UMTS 2100 MHz, "
 msgstr ""
 
-#: ../cli/src/settings.c:719
+#: ../cli/src/settings.c:644
 msgid "WCDMA 3GPP UMTS 1800 MHz, "
 msgstr ""
 
-#: ../cli/src/settings.c:721
+#: ../cli/src/settings.c:646
 msgid "WCDMA 3GPP UMTS 1700/2100 MHz, "
 msgstr ""
 
-#: ../cli/src/settings.c:723
+#: ../cli/src/settings.c:648
 msgid "WCDMA 3GPP UMTS 800 MHz, "
 msgstr ""
 
-#: ../cli/src/settings.c:725
+#: ../cli/src/settings.c:650
 msgid "WCDMA 3GPP UMTS 850 MHz, "
 msgstr ""
 
-#: ../cli/src/settings.c:727
+#: ../cli/src/settings.c:652
 msgid "WCDMA 3GPP UMTS 900 MHz, "
 msgstr ""
 
-#: ../cli/src/settings.c:729
+#: ../cli/src/settings.c:654
 msgid "WCDMA 3GPP UMTS 1700 MHz, "
 msgstr ""
 
-#: ../cli/src/settings.c:731
+#: ../cli/src/settings.c:656
 msgid "WCDMA 3GPP UMTS 1900 MHz, "
 msgstr ""
 
-#: ../cli/src/settings.c:733
+#: ../cli/src/settings.c:658
 msgid "WCDMA 3GPP UMTS 2600 MHz, "
 msgstr ""
 
-#: ../cli/src/settings.c:751
+#: ../clients/cli/settings.c:824
 msgid "0 (NONE)"
 msgstr ""
 
-#: ../cli/src/settings.c:757
+#: ../clients/cli/settings.c:830
 msgid "REORDER_HEADERS, "
 msgstr ""
 
-#: ../cli/src/settings.c:759
+#: ../clients/cli/settings.c:832
 msgid "GVRP, "
 msgstr ""
 
-#: ../cli/src/settings.c:761
+#: ../clients/cli/settings.c:834
 msgid "LOOSE_BINDING, "
 msgstr ""
 
-#: ../cli/src/settings.c:797
+#: ../clients/cli/settings.c:875
 #, c-format
 msgid "%d (disabled)"
 msgstr ""
 
-#: ../cli/src/settings.c:799
+#: ../clients/cli/settings.c:877
 #, c-format
 msgid "%d (enabled, prefer public IP)"
 msgstr ""
 
-#: ../cli/src/settings.c:801
+#: ../clients/cli/settings.c:879
 #, c-format
 msgid "%d (enabled, prefer temporary IP)"
 msgstr ""
 
-#: ../cli/src/settings.c:813
+#: ../clients/cli/settings.c:912
 msgid "0 (none)"
 msgstr ""
 
-#: ../cli/src/settings.c:819
+#: ../clients/cli/settings.c:918
 msgid "agent-owned, "
 msgstr ""
 
-#: ../cli/src/settings.c:821
+#: ../clients/cli/settings.c:920
 msgid "not saved, "
 msgstr ""
 
-#: ../cli/src/settings.c:823
+#: ../clients/cli/settings.c:922
 msgid "not required, "
 msgstr ""
 
-#: ../cli/src/settings.c:1275 ../cli/src/settings.c:1458
-#: ../cli/src/settings.c:1498
+#: ../clients/cli/settings.c:1422 ../clients/cli/settings.c:1724
+#: ../clients/cli/settings.c:1864
 msgid "auto"
 msgstr ""
 
-#: ../cli/src/utils.c:206
+#: ../clients/cli/utils.c:202
 #, c-format
 msgid "Error converting IP4 address '0x%X' to text form"
 msgstr ""
 
-#: ../cli/src/utils.c:234
+#: ../clients/cli/utils.c:230
 #, c-format
 msgid "Error converting IP6 address '%s' to text form"
 msgstr ""
 
-#: ../cli/src/utils.c:729
+#: ../clients/cli/utils.c:964
 #, c-format
 msgid "field '%s' has to be alone"
 msgstr ""
@@ -1886,11 +1904,11 @@
 msgid "invalid field '%s'"
 msgstr ""
 
-#: ../cli/src/utils.c:789
+#: ../clients/cli/utils.c:1024
 msgid "Option '--terse' requires specifying '--fields'"
 msgstr ""
 
-#: ../cli/src/utils.c:793
+#: ../clients/cli/utils.c:1028
 #, c-format
 msgid ""
 "Option '--terse' requires specific '--fields' option values , not '%s'"
@@ -1906,26 +1924,26 @@
 msgid "Error: NameHasOwner request failed: %s"
 msgstr ""
 
-#: ../cli/src/utils.c:1112
+#: ../clients/cli/utils.c:1390
 #, c-format
 msgid ""
 "Warning: nmcli (%s) and NetworkManager (%s) versions don't match. Use --"
 "nocheck to suppress the warning.\n"
 msgstr ""
 
-#: ../cli/src/utils.c:1121
+#: ../clients/cli/utils.c:1399
 #, c-format
 msgid ""
 "Error: nmcli (%s) and NetworkManager (%s) versions don't match. Force "
 "execution using --nocheck, but the results are unpredictable."
 msgstr ""
 
-#: ../libnm-util/crypto.c:133
+#: ../libnm-core/crypto.c:118 ../libnm-util/crypto.c:131
 #, c-format
 msgid "PEM key file had no end tag '%s'."
 msgstr ""
 
-#: ../libnm-util/crypto.c:146
+#: ../libnm-core/crypto.c:131 ../libnm-util/crypto.c:144
 #, c-format
 msgid "Doesn't look like a PEM private key file."
 msgstr ""
@@ -1935,46 +1953,46 @@
 msgid "Not enough memory to store PEM file data."
 msgstr ""
 
-#: ../libnm-util/crypto.c:163
+#: ../libnm-core/crypto.c:148 ../libnm-util/crypto.c:161
 #, c-format
 msgid "Malformed PEM file: Proc-Type was not first tag."
 msgstr ""
 
-#: ../libnm-util/crypto.c:171
+#: ../libnm-core/crypto.c:156 ../libnm-util/crypto.c:169
 #, c-format
 msgid "Malformed PEM file: unknown Proc-Type tag '%s'."
 msgstr ""
 
-#: ../libnm-util/crypto.c:181
+#: ../libnm-core/crypto.c:166 ../libnm-util/crypto.c:179
 #, c-format
 msgid "Malformed PEM file: DEK-Info was not the second tag."
 msgstr ""
 
-#: ../libnm-util/crypto.c:192
+#: ../libnm-core/crypto.c:177 ../libnm-util/crypto.c:190
 #, c-format
 msgid "Malformed PEM file: no IV found in DEK-Info tag."
 msgstr ""
 
-#: ../libnm-util/crypto.c:199
+#: ../libnm-core/crypto.c:184 ../libnm-util/crypto.c:197
 #, c-format
 msgid "Malformed PEM file: invalid format of IV in DEK-Info tag."
 msgstr ""
 
-#: ../libnm-util/crypto.c:214
+#: ../libnm-core/crypto.c:199 ../libnm-util/crypto.c:212
 #, c-format
 msgid "Malformed PEM file: unknown private key cipher '%s'."
 msgstr ""
 
-#: ../libnm-util/crypto.c:233
+#: ../libnm-core/crypto.c:218 ../libnm-util/crypto.c:231
 #, c-format
 msgid "Could not decode private key."
 msgstr ""
 
-#: ../libnm-util/crypto.c:285
+#: ../libnm-core/crypto.c:272 ../libnm-util/crypto.c:283
 msgid "Failed to find expected PKCS#8 start tag."
 msgstr ""
 
-#: ../libnm-util/crypto.c:293
+#: ../libnm-core/crypto.c:280 ../libnm-util/crypto.c:291
 #, c-format
 msgid "Failed to find expected PKCS#8 end tag '%s'."
 msgstr ""
@@ -1983,7 +2001,7 @@
 msgid "Not enough memory to store private key data."
 msgstr ""
 
-#: ../libnm-util/crypto.c:312
+#: ../libnm-core/crypto.c:299 ../libnm-util/crypto.c:310
 msgid "Failed to decode PKCS#8 private key."
 msgstr ""
 
@@ -1992,7 +2010,7 @@
 msgid "Not enough memory to store certificate data."
 msgstr ""
 
-#: ../libnm-util/crypto.c:354
+#: ../libnm-core/crypto.c:341 ../libnm-util/crypto.c:352
 #, c-format
 msgid "IV must be an even number of bytes in length."
 msgstr ""
@@ -2002,14 +2020,16 @@
 msgid "Not enough memory to store the IV."
 msgstr ""
 
-#: ../libnm-util/crypto.c:368
+#: ../libnm-core/crypto.c:355 ../libnm-util/crypto.c:366
 #, c-format
 msgid "IV contains non-hexadecimal digits."
 msgstr ""
 
-#: ../libnm-util/crypto.c:408 ../libnm-util/crypto_gnutls.c:150
-#: ../libnm-util/crypto_gnutls.c:267 ../libnm-util/crypto_nss.c:170
-#: ../libnm-util/crypto_nss.c:331
+#: ../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 ""
@@ -2024,27 +2044,27 @@
 msgid "Not enough memory to store decrypted private key."
 msgstr ""
 
-#: ../libnm-util/crypto.c:518
+#: ../libnm-core/crypto.c:494 ../libnm-util/crypto.c:516
 #, c-format
 msgid "Unable to determine private key type."
 msgstr ""
 
-#: ../libnm-util/crypto.c:573
+#: ../libnm-core/crypto.c:555 ../libnm-util/crypto.c:571
 #, c-format
 msgid "PEM certificate had no start tag '%s'."
 msgstr ""
 
-#: ../libnm-util/crypto.c:582
+#: ../libnm-core/crypto.c:564 ../libnm-util/crypto.c:580
 #, c-format
 msgid "PEM certificate had no end tag '%s'."
 msgstr ""
 
-#: ../libnm-util/crypto.c:600
+#: ../libnm-core/crypto.c:582 ../libnm-util/crypto.c:598
 #, c-format
 msgid "Failed to decode certificate."
 msgstr ""
 
-#: ../libnm-util/crypto_gnutls.c:50
+#: ../libnm-core/crypto_gnutls.c:48 ../libnm-util/crypto_gnutls.c:48
 msgid "Failed to initialize the crypto engine."
 msgstr ""
 
@@ -2053,7 +2073,7 @@
 msgid "Failed to initialize the MD5 engine: %s / %s."
 msgstr ""
 
-#: ../libnm-util/crypto_gnutls.c:158
+#: ../libnm-core/crypto_gnutls.c:99 ../libnm-util/crypto_gnutls.c:159
 #, c-format
 msgid "Invalid IV length (must be at least %zd)."
 msgstr ""
@@ -2063,32 +2083,34 @@
 msgid "Not enough memory for decrypted key buffer."
 msgstr ""
 
-#: ../libnm-util/crypto_gnutls.c:169
+#: ../libnm-util/crypto_gnutls.c:172
 #, c-format
 msgid "Failed to initialize the decryption cipher context: %s / %s."
 msgstr ""
 
-#: ../libnm-util/crypto_gnutls.c:178
+#: ../libnm-util/crypto_gnutls.c:181
 #, c-format
 msgid "Failed to set symmetric key for decryption: %s / %s."
 msgstr ""
 
-#: ../libnm-util/crypto_gnutls.c:187
+#: ../libnm-util/crypto_gnutls.c:190
 #, c-format
 msgid "Failed to set IV for decryption: %s / %s."
 msgstr ""
 
-#: ../libnm-util/crypto_gnutls.c:196
+#: ../libnm-util/crypto_gnutls.c:199
 #, c-format
 msgid "Failed to decrypt the private key: %s / %s."
 msgstr ""
 
-#: ../libnm-util/crypto_gnutls.c:206 ../libnm-util/crypto_nss.c:260
+#: ../libnm-core/crypto_gnutls.c:134 ../libnm-core/crypto_nss.c:202
+#: ../libnm-util/crypto_gnutls.c:194 ../libnm-util/crypto_nss.c:252
 #, c-format
 msgid "Failed to decrypt the private key: unexpected padding length."
 msgstr ""
 
-#: ../libnm-util/crypto_gnutls.c:217 ../libnm-util/crypto_nss.c:271
+#: ../libnm-core/crypto_gnutls.c:145 ../libnm-core/crypto_nss.c:213
+#: ../libnm-util/crypto_gnutls.c:205 ../libnm-util/crypto_nss.c:263
 #, c-format
 msgid "Failed to decrypt the private key."
 msgstr ""
@@ -2098,167 +2120,167 @@
 msgid "Could not allocate memory for encrypting."
 msgstr ""
 
-#: ../libnm-util/crypto_gnutls.c:289
+#: ../libnm-util/crypto_gnutls.c:293
 #, c-format
 msgid "Failed to initialize the encryption cipher context: %s / %s."
 msgstr ""
 
-#: ../libnm-util/crypto_gnutls.c:298
+#: ../libnm-util/crypto_gnutls.c:302
 #, c-format
 msgid "Failed to set symmetric key for encryption: %s / %s."
 msgstr ""
 
-#: ../libnm-util/crypto_gnutls.c:308
+#: ../libnm-util/crypto_gnutls.c:312
 #, c-format
 msgid "Failed to set IV for encryption: %s / %s."
 msgstr ""
 
-#: ../libnm-util/crypto_gnutls.c:317
+#: ../libnm-util/crypto_gnutls.c:321
 #, c-format
 msgid "Failed to encrypt the data: %s / %s."
 msgstr ""
 
-#: ../libnm-util/crypto_gnutls.c:357
+#: ../libnm-core/crypto_gnutls.c:276 ../libnm-util/crypto_gnutls.c:332
 #, c-format
 msgid "Error initializing certificate data: %s"
 msgstr ""
 
-#: ../libnm-util/crypto_gnutls.c:379
+#: ../libnm-core/crypto_gnutls.c:298 ../libnm-util/crypto_gnutls.c:354
 #, c-format
 msgid "Couldn't decode certificate: %s"
 msgstr ""
 
-#: ../libnm-util/crypto_gnutls.c:403
+#: ../libnm-core/crypto_gnutls.c:326 ../libnm-util/crypto_gnutls.c:378
 #, c-format
 msgid "Couldn't initialize PKCS#12 decoder: %s"
 msgstr ""
 
-#: ../libnm-util/crypto_gnutls.c:416
+#: ../libnm-core/crypto_gnutls.c:339 ../libnm-util/crypto_gnutls.c:391
 #, c-format
 msgid "Couldn't decode PKCS#12 file: %s"
 msgstr ""
 
-#: ../libnm-util/crypto_gnutls.c:428
+#: ../libnm-core/crypto_gnutls.c:351 ../libnm-util/crypto_gnutls.c:403
 #, c-format
 msgid "Couldn't verify PKCS#12 file: %s"
 msgstr ""
 
-#: ../libnm-util/crypto_gnutls.c:456
+#: ../libnm-core/crypto_gnutls.c:383 ../libnm-util/crypto_gnutls.c:431
 #, c-format
 msgid "Couldn't initialize PKCS#8 decoder: %s"
 msgstr ""
 
-#: ../libnm-util/crypto_gnutls.c:479
+#: ../libnm-core/crypto_gnutls.c:406 ../libnm-util/crypto_gnutls.c:454
 #, c-format
 msgid "Couldn't decode PKCS#8 file: %s"
 msgstr ""
 
-#: ../libnm-util/crypto_nss.c:56
+#: ../libnm-core/crypto_nss.c:54 ../libnm-util/crypto_nss.c:53
 #, c-format
 msgid "Failed to initialize the crypto engine: %d."
 msgstr ""
 
-#: ../libnm-util/crypto_nss.c:107
+#: ../libnm-util/crypto_nss.c:99
 #, c-format
 msgid "Failed to initialize the MD5 context: %d."
 msgstr ""
 
-#: ../libnm-util/crypto_nss.c:178
+#: ../libnm-core/crypto_nss.c:120 ../libnm-util/crypto_nss.c:170
 #, c-format
 msgid "Invalid IV length (must be at least %d)."
 msgstr ""
 
-#: ../libnm-util/crypto_nss.c:189
+#: ../libnm-core/crypto_nss.c:131 ../libnm-util/crypto_nss.c:181
 #, c-format
 msgid "Failed to initialize the decryption cipher slot."
 msgstr ""
 
-#: ../libnm-util/crypto_nss.c:199
+#: ../libnm-core/crypto_nss.c:141 ../libnm-util/crypto_nss.c:191
 #, c-format
 msgid "Failed to set symmetric key for decryption."
 msgstr ""
 
-#: ../libnm-util/crypto_nss.c:209
+#: ../libnm-core/crypto_nss.c:151 ../libnm-util/crypto_nss.c:201
 #, c-format
 msgid "Failed to set IV for decryption."
 msgstr ""
 
-#: ../libnm-util/crypto_nss.c:217
+#: ../libnm-core/crypto_nss.c:159 ../libnm-util/crypto_nss.c:209
 #, c-format
 msgid "Failed to initialize the decryption context."
 msgstr ""
 
-#: ../libnm-util/crypto_nss.c:230
+#: ../libnm-core/crypto_nss.c:172 ../libnm-util/crypto_nss.c:222
 #, c-format
 msgid "Failed to decrypt the private key: %d."
 msgstr ""
 
-#: ../libnm-util/crypto_nss.c:238
+#: ../libnm-core/crypto_nss.c:180 ../libnm-util/crypto_nss.c:230
 #, c-format
 msgid "Failed to decrypt the private key: decrypted data too large."
 msgstr ""
 
-#: ../libnm-util/crypto_nss.c:249
+#: ../libnm-core/crypto_nss.c:191 ../libnm-util/crypto_nss.c:241
 #, c-format
 msgid "Failed to finalize decryption of the private key: %d."
 msgstr ""
 
-#: ../libnm-util/crypto_nss.c:353
+#: ../libnm-core/crypto_nss.c:299 ../libnm-util/crypto_nss.c:345
 #, c-format
 msgid "Failed to initialize the encryption cipher slot."
 msgstr ""
 
-#: ../libnm-util/crypto_nss.c:361
+#: ../libnm-core/crypto_nss.c:307 ../libnm-util/crypto_nss.c:353
 #, c-format
 msgid "Failed to set symmetric key for encryption."
 msgstr ""
 
-#: ../libnm-util/crypto_nss.c:369
+#: ../libnm-core/crypto_nss.c:315 ../libnm-util/crypto_nss.c:361
 #, c-format
 msgid "Failed to set IV for encryption."
 msgstr ""
 
-#: ../libnm-util/crypto_nss.c:377
+#: ../libnm-core/crypto_nss.c:323 ../libnm-util/crypto_nss.c:369
 #, c-format
 msgid "Failed to initialize the encryption context."
 msgstr ""
 
-#: ../libnm-util/crypto_nss.c:385
+#: ../libnm-core/crypto_nss.c:331 ../libnm-util/crypto_nss.c:377
 #, c-format
 msgid "Failed to encrypt: %d."
 msgstr ""
 
-#: ../libnm-util/crypto_nss.c:393
+#: ../libnm-core/crypto_nss.c:339 ../libnm-util/crypto_nss.c:385
 #, c-format
 msgid "Unexpected amount of data after encrypting."
 msgstr ""
 
-#: ../libnm-util/crypto_nss.c:433
+#: ../libnm-core/crypto_nss.c:382 ../libnm-util/crypto_nss.c:425
 #, c-format
 msgid "Couldn't decode certificate: %d"
 msgstr ""
 
-#: ../libnm-util/crypto_nss.c:468
+#: ../libnm-util/crypto_nss.c:460
 #, c-format
 msgid "Couldn't convert password to UCS2: %d"
 msgstr ""
 
-#: ../libnm-util/crypto_nss.c:496
+#: ../libnm-core/crypto_nss.c:450 ../libnm-util/crypto_nss.c:488
 #, c-format
 msgid "Couldn't initialize PKCS#12 decoder: %d"
 msgstr ""
 
-#: ../libnm-util/crypto_nss.c:505
+#: ../libnm-core/crypto_nss.c:459 ../libnm-util/crypto_nss.c:497
 #, c-format
 msgid "Couldn't decode PKCS#12 file: %d"
 msgstr ""
 
-#: ../libnm-util/crypto_nss.c:514
+#: ../libnm-core/crypto_nss.c:468 ../libnm-util/crypto_nss.c:506
 #, c-format
 msgid "Couldn't verify PKCS#12 file: %d"
 msgstr ""
 
-#: ../libnm-util/crypto_nss.c:558
+#: ../libnm-core/crypto_nss.c:519 ../libnm-util/crypto_nss.c:550
 msgid "Could not generate random data."
 msgstr ""
 
@@ -2387,27 +2409,27 @@
 msgid "System policy prevents use of user-specific connections"
 msgstr ""
 
-#: ../cli/src/nmcli.c:323 ../src/main.c:129
+#: ../src/main.c:129
 #, c-format
 msgid "Failed to set signal mask: %d"
 msgstr ""
 
-#: ../cli/src/nmcli.c:330 ../src/main.c:138
+#: ../src/main.c:138
 #, c-format
 msgid "Failed to create signal handling thread: %d"
 msgstr ""
 
-#: ../src/main.c:153
+#: ../src/main-utils.c:99
 #, c-format
 msgid "Opening %s failed: %s\n"
 msgstr ""
 
-#: ../src/main.c:159
+#: ../src/main-utils.c:105
 #, c-format
 msgid "Writing to %s failed: %s\n"
 msgstr ""
 
-#: ../src/main.c:164
+#: ../src/main-utils.c:110
 #, c-format
 msgid "Closing %s failed: %s\n"
 msgstr ""
@@ -2417,47 +2439,48 @@
 msgid "NetworkManager is already running (pid %ld)\n"
 msgstr ""
 
-#: ../src/main.c:360
+#. Logging/debugging
+#: ../src/main.c:234 ../src/nm-iface-helper.c:298
 msgid "Print NetworkManager version and exit"
 msgstr ""
 
-#: ../src/main.c:361
+#: ../src/main.c:235 ../src/nm-iface-helper.c:299
 msgid "Don't become a daemon"
 msgstr ""
 
-#: ../src/main.c:367
+#: ../src/main.c:240 ../src/nm-iface-helper.c:305
 msgid "Make all warnings fatal"
 msgstr ""
 
-#: ../src/main.c:368
+#: ../src/main.c:241
 msgid "Specify the location of a PID file"
 msgstr ""
 
-#: ../src/main.c:368
+#: ../src/main.c:336
 msgid "filename"
 msgstr ""
 
-#: ../src/main.c:369
+#: ../src/main.c:242
 msgid "State file location"
 msgstr ""
 
-#: ../src/main.c:369
+#: ../src/main.c:337
 msgid "/path/to/state.file"
 msgstr ""
 
-#: ../src/config/nm-config.c:281
+#: ../src/nm-config.c:465
 msgid "Config file location"
 msgstr ""
 
-#: ../src/config/nm-config.c:281
+#: ../src/main.c:338
 msgid "/path/to/config.file"
 msgstr ""
 
-#: ../src/config/nm-config.c:284
+#: ../src/nm-config.c:470
 msgid "List of plugins separated by ','"
 msgstr ""
 
-#: ../src/config/nm-config.c:284
+#: ../src/main.c:339
 msgid "plugin1,plugin2"
 msgstr ""
 
@@ -2480,28 +2503,28 @@
 msgstr ""
 
 #. These three are hidden for now, and should eventually just go away.
-#: ../src/config/nm-config.c:287
+#: ../src/nm-config.c:475
 msgid "An http(s) address for checking internet connectivity"
 msgstr ""
 
-#: ../src/config/nm-config.c:288
+#: ../src/nm-config.c:476
 msgid "The interval between connectivity checks (in seconds)"
 msgstr ""
 
-#: ../src/config/nm-config.c:289
+#: ../src/nm-config.c:477
 msgid "The expected start of the response"
 msgstr ""
 
-#: ../src/config/nm-config.c:289
+#: ../src/main.c:352
 msgid "Bingo!"
 msgstr ""
 
-#: ../src/main.c:395
+#: ../src/main.c:370
 #, c-format
 msgid "GModules are not supported on your platform!\n"
 msgstr ""
 
-#: ../src/main.c:423
+#: ../src/main.c:254
 msgid ""
 "NetworkManager monitors all network connections and automatically\n"
 "chooses the best connection to use.  It also allows the user to\n"
@@ -2514,222 +2537,221 @@
 msgid "Invalid option.  Please use --help to see a list of valid options.\n"
 msgstr ""
 
-#: ../src/main.c:400
+#: ../src/main.c:405
 #, c-format
 msgid "You must be root to run NetworkManager!\n"
 msgstr ""
 
-#: ../src/main.c:501
+#: ../src/main.c:433
 #, c-format
 msgid "Failed to read configuration: (%d) %s\n"
 msgstr ""
 
-#: ../src/main.c:429 ../src/main.c:445
+#: ../src/main.c:343 ../src/main-utils.c:269 ../src/nm-iface-helper.c:393
 #, c-format
 msgid "%s.  Please use --help to see a list of valid options.\n"
 msgstr ""
 
-#: ../src/main.c:528
+#: ../src/main.c:451
 #, c-format
 msgid "State file %s parsing failed: (%d) %s\n"
 msgstr ""
 
-#: ../src/main.c:541
+#: ../src/main.c:389 ../src/nm-iface-helper.c:408
 #, c-format
 msgid "Could not daemonize: %s [error %u]\n"
 msgstr ""
 
-#: ../src/devices/bluetooth/nm-bluez-device.c:194
+#: ../src/devices/bluetooth/nm-bluez-device.c:197
 #, c-format
 msgid "%s Network"
 msgstr ""
 
-#: ../src/dhcp-manager/nm-dhcp-dhclient-utils.c:140
+#: ../src/dhcp-manager/nm-dhcp-dhclient-utils.c:213
 msgid "# Created by NetworkManager\n"
 msgstr ""
 
-#: ../src/dhcp-manager/nm-dhcp-dhclient-utils.c:147
+#: ../src/dhcp-manager/nm-dhcp-dhclient-utils.c:220
 #, c-format
 msgid ""
 "# Merged from %s\n"
 "\n"
 msgstr ""
 
-#: ../src/dhcp-manager/nm-dhcp-manager.c:311
+#: ../src/dhcp-manager/nm-dhcp-manager.c:266
 msgid "no usable DHCP client could be found."
 msgstr ""
 
-#: ../src/dhcp-manager/nm-dhcp-manager.c:320
+#: ../src/dhcp-manager/nm-dhcp-manager.c:275
 msgid "'dhclient' could be found."
 msgstr ""
 
-#: ../src/dhcp-manager/nm-dhcp-manager.c:330
+#: ../src/dhcp-manager/nm-dhcp-manager.c:285
 msgid "'dhcpcd' could be found."
 msgstr ""
 
-#: ../src/dhcp-manager/nm-dhcp-manager.c:338
+#: ../src/dhcp-manager/nm-dhcp-manager.c:293
 #, c-format
 msgid "unsupported DHCP client '%s'"
 msgstr ""
 
-#: ../src/dns-manager/nm-dns-manager.c:385
+#: ../src/dns-manager/nm-dns-manager.c:376
 msgid "NOTE: the libc resolver may not support more than 3 nameservers."
 msgstr ""
 
-#: ../src/dns-manager/nm-dns-manager.c:387
+#: ../src/dns-manager/nm-dns-manager.c:378
 msgid "The nameservers listed below may not be recognized."
 msgstr ""
 
-#: ../src/logging/nm-logging.c:150
+#: ../src/nm-logging.c:216
 #, c-format
 msgid "Unknown log level '%s'"
 msgstr ""
 
-#: ../src/logging/nm-logging.c:229
+#: ../src/nm-logging.c:309
 #, c-format
 msgid "Unknown log domain '%s'"
 msgstr ""
 
-#: ../src/devices/bluetooth/nm-device-bt.c:313
-#: ../src/devices/wwan/nm-modem-broadband.c:460
-#: ../src/devices/wwan/nm-modem-old.c:842
+#: ../src/modem-manager/nm-modem-cdma.c:271
+#: ../src/modem-manager/nm-modem-broadband.c:533 ../src/nm-device-bt.c:338
 #, c-format
 msgid "CDMA connection %d"
 msgstr ""
 
-#: ../src/devices/bluetooth/nm-device-bt.c:309
-#: ../src/devices/wwan/nm-modem-broadband.c:438
-#: ../src/devices/wwan/nm-modem-old.c:815
+#: ../src/modem-manager/nm-modem-gsm.c:549
+#: ../src/modem-manager/nm-modem-broadband.c:511 ../src/nm-device-bt.c:334
 #, c-format
 msgid "GSM connection %d"
 msgstr ""
 
-#: ../src/devices/nm-device-bond.c:138 ../tui/nm-editor-utils.c:204
+#: ../clients/tui/nm-editor-utils.c:194
 #, c-format
 msgid "Bond connection %d"
 msgstr ""
 
-#: ../src/devices/adsl/nm-device-adsl.c:122
+#: ../src/nm-device-adsl.c:194
 #, c-format
 msgid "ADSL connection %d"
 msgstr ""
 
-#: ../src/devices/nm-device-bridge.c:148 ../tui/nm-editor-utils.c:214
+#: ../clients/tui/nm-editor-utils.c:204
 #, c-format
 msgid "Bridge connection %d"
 msgstr ""
 
-#: ../src/devices/bluetooth/nm-device-bt.c:284
+#: ../src/nm-device-bt.c:309
 #, c-format
 msgid "PAN connection %d"
 msgstr ""
 
-#: ../src/devices/bluetooth/nm-device-bt.c:317
+#: ../src/nm-device-bt.c:342
 #, c-format
 msgid "DUN connection %d"
 msgstr ""
 
-#: ../src/devices/nm-device-ethernet.c:1528
+#: ../src/nm-device-ethernet.c:1337
 #, c-format
 msgid "PPPoE connection %d"
 msgstr ""
 
-#: ../src/devices/nm-device-ethernet.c:1528
-#: ../src/settings/nm-settings-utils.c:50
+#: ../src/devices/nm-device-ethernet-utils.c:39
 #, c-format
 msgid "Wired connection %d"
 msgstr ""
 
-#: ../src/devices/nm-device-infiniband.c:255 ../tui/nm-editor-utils.c:177
+#: ../clients/tui/nm-editor-utils.c:167
 #, c-format
 msgid "InfiniBand connection %d"
 msgstr ""
 
-#: ../src/devices/wifi/nm-device-olpc-mesh.c:164
+#: ../src/nm-device-olpc-mesh.c:293
 #, c-format
 msgid "Mesh %d"
 msgstr ""
 
-#: ../src/devices/nm-device-vlan.c:230 ../tui/nm-editor-utils.c:231
+#: ../clients/tui/nm-editor-utils.c:221
 #, c-format
 msgid "VLAN connection %d"
 msgstr ""
 
-#: ../src/nm-manager.c:3465 ../tui/nm-editor-utils.c:246
+#: ../clients/tui/nm-editor-utils.c:236
 #, c-format
 msgid "VPN connection %d"
 msgstr ""
 
-#: ../src/nm-netlink-monitor.c:149 ../src/nm-netlink-monitor.c:273
-#: ../src/nm-netlink-monitor.c:714
+#: ../src/nm-netlink-monitor.c:149 ../src/nm-netlink-monitor.c:248
+#: ../src/nm-netlink-monitor.c:689
 #, c-format
 msgid "error processing netlink message: %s"
 msgstr ""
 
-#: ../src/nm-netlink-monitor.c:252
+#: ../src/nm-netlink-monitor.c:227
 msgid "error occurred while waiting for data on socket"
 msgstr "སོ་ཀེཊི་གུ་གནས་སྡུད་ཀྱི་དོན་ལུ་བསྒུགཔ་ད་འཛོལ་བ་བྱུང་ཡོདཔ་"
 
-#: ../src/nm-netlink-monitor.c:297
+#: ../src/nm-netlink-monitor.c:272
 #, c-format
 msgid "unable to connect to netlink for monitoring link status: %s"
 msgstr ""
 
-#: ../src/nm-netlink-monitor.c:308
+#: ../src/nm-netlink-monitor.c:283
 #, c-format
 msgid "unable to enable netlink handle credential passing: %s"
 msgstr ""
 
-#: ../src/nm-netlink-monitor.c:331 ../src/nm-netlink-monitor.c:391
+#: ../src/nm-netlink-monitor.c:306 ../src/nm-netlink-monitor.c:366
 #, c-format
 msgid "unable to allocate netlink handle for monitoring link status: %s"
 msgstr ""
 
-#: ../src/nm-netlink-monitor.c:416
+#: ../src/nm-netlink-monitor.c:391
 #, c-format
 msgid "unable to allocate netlink link cache for monitoring link status: %s"
 msgstr ""
 
-#: ../src/nm-netlink-monitor.c:543
+#: ../src/nm-netlink-monitor.c:518
 #, c-format
 msgid "unable to join netlink group: %s"
 msgstr ""
 
-#: ../src/nm-netlink-monitor.c:690 ../src/nm-netlink-monitor.c:703
+#: ../src/nm-netlink-monitor.c:665 ../src/nm-netlink-monitor.c:678
 #, c-format
 msgid "error updating link cache: %s"
 msgstr ""
 
-#: ../src/settings/plugins/ifcfg-rh/reader.c:113
+#: ../src/settings/plugins/ifcfg-rh/reader.c:108
 msgid "System"
 msgstr ""
 
-#: ../libnm-glib/nm-device.c:1827 ../libnm-util/nm-connection.c:1297
-#: ../src/settings/plugins/ifcfg-rh/reader.c:4285 ../tui/nm-editor-utils.c:200
+#: ../clients/tui/nm-editor-utils.c:190 ../libnm-core/nm-connection.c:1708
+#: ../libnm-glib/nm-device.c:1863 ../libnm-util/nm-connection.c:1626
+#: ../libnm/nm-device.c:1814 ../src/settings/plugins/ifcfg-rh/reader.c:4178
 msgid "Bond"
 msgstr ""
 
-#: ../libnm-glib/nm-device.c:1831 ../libnm-util/nm-connection.c:1301
-#: ../src/settings/plugins/ifcfg-rh/reader.c:4591 ../tui/nm-editor-utils.c:209
+#: ../clients/tui/nm-editor-utils.c:199 ../libnm-core/nm-connection.c:1712
+#: ../libnm-glib/nm-device.c:1867 ../libnm-util/nm-connection.c:1630
+#: ../libnm/nm-device.c:1818 ../src/settings/plugins/ifcfg-rh/reader.c:4475
 msgid "Bridge"
 msgstr ""
 
-#: ../test/nm-online.c:86
+#: ../test/nm-online.c:111
 #, c-format
 msgid "\rConnecting"
 msgstr ""
 
-#: ../test/nm-online.c:118
+#: ../clients/nm-online.c:147
 msgid ""
 "Time to wait for a connection, in seconds (without the option, default value "
 "is 30)"
 msgstr ""
 
-#: ../test/nm-online.c:119
+#: ../clients/nm-online.c:148
 msgid "Exit immediately if NetworkManager is not running or connecting"
 msgstr ""
 
-#: ../test/nm-online.c:120
+#: ../clients/nm-online.c:149
 msgid "Don't print anything"
 msgstr ""
 
@@ -2737,6 +2759,6 @@
 msgid "Waits for a successful connection in NetworkManager."
 msgstr ""
 
-#: ../test/nm-online.c:148 ../test/nm-online.c:158
+#: ../clients/nm-online.c:178 ../clients/nm-online.c:184
 msgid "Invalid option.  Please use --help to see a list of valid options."
 msgstr ""
diff -Nru language-pack-dz-base-14.04+20150804/data/dz/LC_MESSAGES/newt.po language-pack-dz-base-14.04+20160720/data/dz/LC_MESSAGES/newt.po
--- language-pack-dz-base-14.04+20150804/data/dz/LC_MESSAGES/newt.po	2015-08-14 07:53:54.000000000 +0000
+++ language-pack-dz-base-14.04+20160720/data/dz/LC_MESSAGES/newt.po	2016-07-20 16:44:53.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: 2015-08-04 06:29+0000\n"
-"X-Generator: Launchpad (build 17656)\n"
+"X-Launchpad-Export-Date: 2016-07-20 11:59+0000\n"
+"X-Generator: Launchpad (build 18147)\n"
 
 #: ../dialogboxes.c:49
 msgid "Ok"
diff -Nru language-pack-dz-base-14.04+20150804/data/dz/LC_MESSAGES/pidgin.po language-pack-dz-base-14.04+20160720/data/dz/LC_MESSAGES/pidgin.po
--- language-pack-dz-base-14.04+20150804/data/dz/LC_MESSAGES/pidgin.po	2015-08-14 07:53:57.000000000 +0000
+++ language-pack-dz-base-14.04+20160720/data/dz/LC_MESSAGES/pidgin.po	2016-07-20 16:44:54.000000000 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: Pidgin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-27 16:57+0000\n"
+"POT-Creation-Date: 2016-07-12 13:50+0000\n"
 "PO-Revision-Date: 2014-05-22 05:11+0000\n"
 "Last-Translator: wangmo sherpa <Unknown>\n"
 "Language-Team: <pgeygel@dit.gov.bt>\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: 2015-08-04 07:44+0000\n"
-"X-Generator: Launchpad (build 17656)\n"
+"X-Launchpad-Export-Date: 2016-07-20 13:27+0000\n"
+"X-Generator: Launchpad (build 18147)\n"
 "X-Poedit-Country: BHUTAN\n"
 "Language: \n"
 "X-Poedit-Language: Dzongkha\n"
@@ -25,8 +25,8 @@
 
 #. Translators may want to transliterate the name.
 #. It is not to be translated.
-#: ../finch/finch.c:66 ../finch/finch.c:335 ../finch/finch.c:364
-#: ../finch/finch.c:459
+#: ../finch/finch.c:66 ../finch/finch.c:336 ../finch/finch.c:365
+#: ../finch/finch.c:454
 msgid "Finch"
 msgstr ""
 
@@ -48,7 +48,7 @@
 "  -v, --version       display the current version and exit\n"
 msgstr ""
 
-#: ../finch/finch.c:362 ../pidgin/gtkmain.c:723
+#: ../finch/finch.c:363 ../pidgin/gtkmain.c:719
 #, c-format
 msgid ""
 "%s encountered errors migrating your settings from %s to %s. Please "
@@ -65,11 +65,11 @@
 #: ../finch/plugins/gntclipboard.c:128
 #: ../libpurple/protocols/jabber/chat.c:812
 #: ../libpurple/protocols/jabber/chat.c:823
-#: ../libpurple/protocols/jabber/jabber.c:2360
+#: ../libpurple/protocols/jabber/jabber.c:2352
 #: ../libpurple/protocols/jabber/jutil.c:710
 #: ../libpurple/protocols/mxit/login.c:526
-#: ../libpurple/protocols/mxit/protocol.c:2543
-#: ../libpurple/protocols/silc/ops.c:77 ../libpurple/protocols/silc/ops.c:1471
+#: ../libpurple/protocols/mxit/protocol.c:2582
+#: ../libpurple/protocols/silc/ops.c:77 ../libpurple/protocols/silc/ops.c:1472
 #: ../libpurple/protocols/silc10/ops.c:1451
 #: ../pidgin/plugins/disco/xmppdisco.c:514
 #: ../pidgin/plugins/disco/xmppdisco.c:519
@@ -116,7 +116,7 @@
 msgstr ""
 
 #: ../finch/gntaccount.c:570 ../finch/gntconn.c:138
-#: ../pidgin/gtkaccount.c:1583 ../pidgin/gtkblist.c:5127
+#: ../pidgin/gtkaccount.c:1576 ../pidgin/gtkblist.c:5127
 msgid "Modify Account"
 msgstr "རྩིས་ཐོ་ལེགས་བཅོས།"
 
@@ -154,10 +154,10 @@
 #: ../finch/gntblist.c:1583 ../finch/gntblist.c:2762 ../finch/gntblist.c:2813
 #: ../finch/gntblist.c:2887 ../finch/gntblist.c:2949 ../finch/gntcertmgr.c:91
 #: ../finch/gntplugin.c:534 ../finch/gntpounce.c:473 ../finch/gntpounce.c:681
-#: ../finch/gntprefs.c:268 ../finch/gntsound.c:1081 ../finch/gntstatus.c:147
+#: ../finch/gntprefs.c:266 ../finch/gntsound.c:1081 ../finch/gntstatus.c:147
 #: ../finch/gntstatus.c:487 ../finch/gntstatus.c:612
-#: ../finch/plugins/gnthistory.c:182 ../libpurple/account.c:1281
-#: ../libpurple/account.c:1644 ../libpurple/account.c:1679
+#: ../finch/plugins/gnthistory.c:182 ../libpurple/account.c:1222
+#: ../libpurple/account.c:1585 ../libpurple/account.c:1620
 #: ../libpurple/conversation.c:1311 ../libpurple/conversation.c:2147
 #: ../libpurple/plugins/buddynote.c:51 ../libpurple/protocols/gg/gg.c:336
 #: ../libpurple/protocols/gg/gg.c:391 ../libpurple/protocols/gg/gg.c:456
@@ -165,11 +165,11 @@
 #: ../libpurple/protocols/jabber/buddy.c:2214
 #: ../libpurple/protocols/jabber/buddy.c:2263
 #: ../libpurple/protocols/jabber/chat.c:922
-#: ../libpurple/protocols/jabber/jabber.c:1475
-#: ../libpurple/protocols/jabber/jabber.c:1486
-#: ../libpurple/protocols/jabber/jabber.c:2566
-#: ../libpurple/protocols/jabber/jabber.c:3430
-#: ../libpurple/protocols/jabber/si.c:1580
+#: ../libpurple/protocols/jabber/jabber.c:1467
+#: ../libpurple/protocols/jabber/jabber.c:1478
+#: ../libpurple/protocols/jabber/jabber.c:2558
+#: ../libpurple/protocols/jabber/jabber.c:3422
+#: ../libpurple/protocols/jabber/si.c:1584
 #: ../libpurple/protocols/jabber/usernick.c:83
 #: ../libpurple/protocols/jabber/xdata.c:404
 #: ../libpurple/protocols/msn/msn.c:452 ../libpurple/protocols/msn/msn.c:577
@@ -180,21 +180,21 @@
 #: ../libpurple/protocols/mxit/actions.c:412
 #: ../libpurple/protocols/mxit/login.c:365
 #: ../libpurple/protocols/mxit/login.c:711
-#: ../libpurple/protocols/myspace/user.c:826
-#: ../libpurple/protocols/myspace/user.c:887
-#: ../libpurple/protocols/oscar/oscar.c:5215
-#: ../libpurple/protocols/oscar/peer.c:1066
-#: ../libpurple/protocols/sametime/sametime.c:3435
-#: ../libpurple/protocols/sametime/sametime.c:3521
-#: ../libpurple/protocols/sametime/sametime.c:5420
-#: ../libpurple/protocols/sametime/sametime.c:5510
-#: ../libpurple/protocols/sametime/sametime.c:5635
+#: ../libpurple/protocols/myspace/user.c:824
+#: ../libpurple/protocols/myspace/user.c:885
+#: ../libpurple/protocols/oscar/oscar.c:5220
+#: ../libpurple/protocols/oscar/peer.c:1071
+#: ../libpurple/protocols/sametime/sametime.c:3471
+#: ../libpurple/protocols/sametime/sametime.c:3557
+#: ../libpurple/protocols/sametime/sametime.c:5456
+#: ../libpurple/protocols/sametime/sametime.c:5546
+#: ../libpurple/protocols/sametime/sametime.c:5671
 #: ../libpurple/protocols/silc/buddy.c:459
-#: ../libpurple/protocols/silc/buddy.c:1078
-#: ../libpurple/protocols/silc/buddy.c:1193
+#: ../libpurple/protocols/silc/buddy.c:1084
+#: ../libpurple/protocols/silc/buddy.c:1199
 #: ../libpurple/protocols/silc/chat.c:622
 #: ../libpurple/protocols/silc/chat.c:756
-#: ../libpurple/protocols/silc/ops.c:1831
+#: ../libpurple/protocols/silc/ops.c:1832
 #: ../libpurple/protocols/silc/silc.c:1063
 #: ../libpurple/protocols/silc/silc.c:1271
 #: ../libpurple/protocols/silc10/buddy.c:468
@@ -206,41 +206,41 @@
 #: ../libpurple/protocols/silc10/silc.c:761
 #: ../libpurple/protocols/silc10/silc.c:967
 #: ../libpurple/protocols/yahoo/libymsg.c:1369
-#: ../libpurple/protocols/yahoo/libymsg.c:4562
-#: ../libpurple/protocols/yahoo/libymsg.c:4573
+#: ../libpurple/protocols/yahoo/libymsg.c:4575
+#: ../libpurple/protocols/yahoo/libymsg.c:4586
 #: ../libpurple/protocols/yahoo/yahoo_aliases.c:589
 #: ../libpurple/protocols/yahoo/yahoo_aliases.c:600
-#: ../pidgin/gtkaccount.c:1952 ../pidgin/gtkaccount.c:2487
+#: ../pidgin/gtkaccount.c:1945 ../pidgin/gtkaccount.c:2480
 #: ../pidgin/gtkblist.c:705 ../pidgin/gtkblist.c:3582
-#: ../pidgin/gtkblist.c:7334 ../pidgin/gtkcertmgr.c:195
-#: ../pidgin/gtkdialogs.c:913 ../pidgin/gtkdialogs.c:1052
-#: ../pidgin/gtkdialogs.c:1144 ../pidgin/gtkdialogs.c:1164
-#: ../pidgin/gtkdialogs.c:1188 ../pidgin/gtkdialogs.c:1210
-#: ../pidgin/gtkdialogs.c:1258 ../pidgin/gtkdialogs.c:1299
-#: ../pidgin/gtkdialogs.c:1355 ../pidgin/gtkdialogs.c:1394
-#: ../pidgin/gtkdialogs.c:1421 ../pidgin/gtkimhtmltoolbar.c:451
+#: ../pidgin/gtkblist.c:7331 ../pidgin/gtkcertmgr.c:195
+#: ../pidgin/gtkdialogs.c:900 ../pidgin/gtkdialogs.c:1039
+#: ../pidgin/gtkdialogs.c:1131 ../pidgin/gtkdialogs.c:1151
+#: ../pidgin/gtkdialogs.c:1175 ../pidgin/gtkdialogs.c:1197
+#: ../pidgin/gtkdialogs.c:1245 ../pidgin/gtkdialogs.c:1286
+#: ../pidgin/gtkdialogs.c:1342 ../pidgin/gtkdialogs.c:1381
+#: ../pidgin/gtkdialogs.c:1408 ../pidgin/gtkimhtmltoolbar.c:451
 #: ../pidgin/gtklog.c:324 ../pidgin/gtkplugin.c:308 ../pidgin/gtkpounce.c:1141
-#: ../pidgin/gtkprivacy.c:498 ../pidgin/gtkprivacy.c:514
-#: ../pidgin/gtkprivacy.c:539 ../pidgin/gtkprivacy.c:553
+#: ../pidgin/gtkprivacy.c:497 ../pidgin/gtkprivacy.c:513
+#: ../pidgin/gtkprivacy.c:538 ../pidgin/gtkprivacy.c:552
 #: ../pidgin/gtkrequest.c:301 ../pidgin/gtksavedstatuses.c:317
-#: ../pidgin/gtkstatusbox.c:1611 ../pidgin/gtkutils.c:1628
-#: ../pidgin/gtkutils.c:1648 ../pidgin/plugins/disco/gtkdisco.c:246
+#: ../pidgin/gtkstatusbox.c:1611 ../pidgin/gtkutils.c:1620
+#: ../pidgin/gtkutils.c:1640 ../pidgin/plugins/disco/gtkdisco.c:246
 msgid "Cancel"
 msgstr "ཆ་མེད་གཏང་།"
 
 #. Save button
 #. Save
-#: ../finch/gntaccount.c:658 ../finch/gntcertmgr.c:311 ../finch/gntdebug.c:342
-#: ../finch/gntplugin.c:534 ../finch/gntpounce.c:479 ../finch/gntprefs.c:268
+#: ../finch/gntaccount.c:658 ../finch/gntcertmgr.c:311 ../finch/gntdebug.c:341
+#: ../finch/gntplugin.c:534 ../finch/gntpounce.c:479 ../finch/gntprefs.c:266
 #: ../finch/gntsound.c:1078 ../finch/gntstatus.c:490 ../finch/gntstatus.c:600
-#: ../libpurple/account.c:1678 ../libpurple/plugins/buddynote.c:50
+#: ../libpurple/account.c:1619 ../libpurple/plugins/buddynote.c:50
 #: ../libpurple/protocols/jabber/buddy.c:680 ../pidgin/gtkblist.c:705
 #: ../pidgin/gtkdebug.c:824 ../pidgin/gtkdebug.c:826
 #: ../pidgin/gtkrequest.c:307
 msgid "Save"
 msgstr "སྲུངས།"
 
-#: ../finch/gntaccount.c:711 ../pidgin/gtkaccount.c:1943
+#: ../finch/gntaccount.c:711 ../pidgin/gtkaccount.c:1936
 #: ../pidgin/gtksavedstatuses.c:305 ../pidgin/gtkstatusbox.c:1605
 #, c-format
 msgid "Are you sure you want to delete %s?"
@@ -254,14 +254,14 @@
 #: ../finch/gntaccount.c:717 ../finch/gntaccount.c:832
 #: ../finch/gntcertmgr.c:319 ../finch/gntpounce.c:680 ../finch/gntpounce.c:743
 #: ../finch/gntstatus.c:146 ../finch/gntstatus.c:212
-#: ../pidgin/gtkaccount.c:1951 ../pidgin/gtklog.c:323
+#: ../pidgin/gtkaccount.c:1944 ../pidgin/gtklog.c:323
 #: ../pidgin/gtkpounce.c:1140 ../pidgin/gtkrequest.c:304
 #: ../pidgin/gtksavedstatuses.c:316 ../pidgin/gtkstatusbox.c:1610
 msgid "Delete"
 msgstr "བཏོན་བཏང་།"
 
 #: ../finch/gntaccount.c:793 ../finch/gntblist.c:2628 ../finch/gntui.c:99
-#: ../pidgin/gtkaccount.c:2348
+#: ../pidgin/gtkaccount.c:2341
 msgid "Accounts"
 msgstr "རྩིས་ཐོ་ཚུ།"
 
@@ -274,13 +274,13 @@
 #. Add button
 #: ../finch/gntaccount.c:823 ../finch/gntaccount.c:1013
 #: ../finch/gntblist.c:699 ../finch/gntblist.c:806 ../finch/gntblist.c:854
-#: ../finch/gntblist.c:3069 ../finch/gntcertmgr.c:306 ../finch/gntnotify.c:456
+#: ../finch/gntblist.c:3069 ../finch/gntcertmgr.c:306 ../finch/gntnotify.c:452
 #: ../finch/gntpounce.c:727 ../finch/gntroomlist.c:276
 #: ../finch/gntstatus.c:201 ../libpurple/protocols/gg/gg.c:455
-#: ../libpurple/protocols/sametime/sametime.c:5509
+#: ../libpurple/protocols/sametime/sametime.c:5545
 #: ../libpurple/protocols/silc/chat.c:621
-#: ../libpurple/protocols/silc10/chat.c:599 ../pidgin/gtkaccount.c:2486
-#: ../pidgin/gtkblist.c:7333 ../pidgin/gtkconv.c:1692
+#: ../libpurple/protocols/silc10/chat.c:599 ../pidgin/gtkaccount.c:2479
+#: ../pidgin/gtkblist.c:7330 ../pidgin/gtkconv.c:1692
 #: ../pidgin/gtkrequest.c:305
 msgid "Add"
 msgstr "ཁ་སྐོང་རྐྱབས།"
@@ -290,12 +290,12 @@
 msgid "Modify"
 msgstr "ལེགས་བཅོས་འབད།"
 
-#: ../finch/gntaccount.c:936 ../pidgin/gtkaccount.c:2433
+#: ../finch/gntaccount.c:936 ../pidgin/gtkaccount.c:2426
 #, c-format
 msgid "%s%s%s%s has made %s his or her buddy%s%s"
 msgstr "%s%s%s%s གིས་ %s འདི་ ཁོ་རའི་ཡང་ན་མོ་རའི་ བ་ཌི་%s%s བཟོ་ཡོདཔ་ཨིན།"
 
-#: ../finch/gntaccount.c:1009 ../pidgin/gtkaccount.c:2485
+#: ../finch/gntaccount.c:1009 ../pidgin/gtkaccount.c:2478
 msgid "Add buddy to your list?"
 msgstr "ཁྱོད་རའི་ཐོ་ཡིག་ནང་ཆ་རོགས་ཁ་སྐོང་རྐྱབསན?"
 
@@ -305,17 +305,17 @@
 msgstr ""
 
 #: ../finch/gntaccount.c:1094 ../finch/gntaccount.c:1097
-#: ../finch/gntaccount.c:1124 ../pidgin/gtkaccount.c:2618
+#: ../finch/gntaccount.c:1124 ../pidgin/gtkaccount.c:2611
 msgid "Authorize buddy?"
 msgstr ""
 
 #: ../finch/gntaccount.c:1101 ../finch/gntaccount.c:1128
-#: ../pidgin/gtkaccount.c:2619
+#: ../pidgin/gtkaccount.c:2612
 msgid "Authorize"
 msgstr "དབང་སྤྲོད།"
 
 #: ../finch/gntaccount.c:1102 ../finch/gntaccount.c:1129
-#: ../pidgin/gtkaccount.c:2620
+#: ../pidgin/gtkaccount.c:2613
 msgid "Deny"
 msgstr "ཉན་མི་བཏུབ་པས།"
 
@@ -345,7 +345,7 @@
 #: ../finch/gntblist.c:319 ../pidgin/gtkprefs.c:422 ../pidgin/gtkprefs.c:543
 #: ../pidgin/gtkprefs.c:551
 #: ../pidgin/pixmaps/emotes/default/24/default.theme.in.h:1
-#: ../pidgin/plugins/vvconfig.c:93
+#: ../pidgin/plugins/vvconfig.c:87
 msgid "Default"
 msgstr ""
 
@@ -369,21 +369,21 @@
 msgid "Error adding buddy"
 msgstr "བ་ཌི་ཁ་སྐོང་བརྐྱབ་པའི་སྐབས་སུ་འཛོལ་བ།"
 
-#: ../finch/gntblist.c:678 ../libpurple/protocols/jabber/jabber.c:1409
-#: ../libpurple/protocols/jabber/jabber.c:1411
-#: ../libpurple/protocols/oscar/oscar.c:3020
-#: ../libpurple/protocols/silc/buddy.c:1546
-#: ../libpurple/protocols/silc/ops.c:1208
-#: ../libpurple/protocols/silc/ops.c:1211
-#: ../libpurple/protocols/silc/ops.c:1347
-#: ../libpurple/protocols/silc/ops.c:1350
+#: ../finch/gntblist.c:678 ../libpurple/protocols/jabber/jabber.c:1401
+#: ../libpurple/protocols/jabber/jabber.c:1403
+#: ../libpurple/protocols/oscar/oscar.c:3023
+#: ../libpurple/protocols/silc/buddy.c:1552
+#: ../libpurple/protocols/silc/ops.c:1209
+#: ../libpurple/protocols/silc/ops.c:1212
+#: ../libpurple/protocols/silc/ops.c:1348
+#: ../libpurple/protocols/silc/ops.c:1351
 #: ../libpurple/protocols/silc/silc.c:1245
 #: ../libpurple/protocols/silc10/buddy.c:1559
 #: ../libpurple/protocols/silc10/ops.c:1191
 #: ../libpurple/protocols/silc10/ops.c:1194
 #: ../libpurple/protocols/silc10/ops.c:1340
 #: ../libpurple/protocols/silc10/ops.c:1343
-#: ../libpurple/protocols/silc10/silc.c:941 ../pidgin/gtkaccount.c:2025
+#: ../libpurple/protocols/silc10/silc.c:941 ../pidgin/gtkaccount.c:2018
 #: ../pidgin/gtksavedstatuses.c:951
 msgid "Username"
 msgstr "ལག་ལེན་པའི་མིང་།"
@@ -402,7 +402,7 @@
 
 #: ../finch/gntblist.c:691 ../finch/gntblist.c:785 ../finch/gntblist.c:1794
 #: ../finch/gntblist.c:2743 ../finch/gntblist.c:2799 ../finch/gntblist.c:2874
-#: ../finch/gntblist.c:2934 ../finch/gntnotify.c:195 ../finch/gntstatus.c:578
+#: ../finch/gntblist.c:2934 ../finch/gntnotify.c:192 ../finch/gntstatus.c:578
 #: ../libpurple/plugins/idle.c:149 ../libpurple/plugins/idle.c:186
 #: ../pidgin/gtkblist.c:3779 ../pidgin/gtknotify.c:712
 #: ../pidgin/gtkpounce.c:1292 ../pidgin/plugins/gevolution/gevolution.c:456
@@ -411,14 +411,14 @@
 
 #: ../finch/gntblist.c:697 ../finch/gntblist.c:1259
 #: ../libpurple/protocols/silc/buddy.c:730
-#: ../libpurple/protocols/silc/buddy.c:1029
-#: ../libpurple/protocols/silc/buddy.c:1074
-#: ../libpurple/protocols/silc/buddy.c:1184
+#: ../libpurple/protocols/silc/buddy.c:1035
+#: ../libpurple/protocols/silc/buddy.c:1080
+#: ../libpurple/protocols/silc/buddy.c:1190
 #: ../libpurple/protocols/silc10/buddy.c:737
 #: ../libpurple/protocols/silc10/buddy.c:1036
 #: ../libpurple/protocols/silc10/buddy.c:1083
 #: ../libpurple/protocols/silc10/buddy.c:1183
-#: ../libpurple/protocols/yahoo/libymsg.c:4370 ../pidgin/gtkblist.c:7096
+#: ../libpurple/protocols/yahoo/libymsg.c:4383 ../pidgin/gtkblist.c:7093
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:451
 msgid "Add Buddy"
 msgstr "ཆ་རོགས་ཁ་སྐོང་རྐྱབས།"
@@ -427,18 +427,18 @@
 msgid "Please enter buddy information."
 msgstr "བ་ཌི་བརྡ་བཀོད་བཙུགས་གནང་།"
 
-#: ../finch/gntblist.c:753 ../libpurple/blist.c:1496
+#: ../finch/gntblist.c:753 ../libpurple/blist.c:1495
 msgid "Chats"
 msgstr "ཁ་སླབ་ནི།"
 
 #. Extract their Name and put it in
 #: ../finch/gntblist.c:791 ../finch/gntblist.c:2738 ../finch/gntblist.c:2794
 #: ../finch/gntblist.c:2929 ../finch/gntroomlist.c:300
-#: ../libpurple/protocols/jabber/jabber.c:1432
-#: ../libpurple/protocols/jabber/jabber.c:1436
-#: ../libpurple/protocols/msn/msn.c:529 ../libpurple/protocols/msn/msn.c:2410
-#: ../libpurple/protocols/msn/msn.c:2475 ../libpurple/protocols/msn/msn.c:2502
-#: ../pidgin/gtkplugin.c:767 ../pidgin/gtkroomlist.c:740
+#: ../libpurple/protocols/jabber/jabber.c:1424
+#: ../libpurple/protocols/jabber/jabber.c:1428
+#: ../libpurple/protocols/msn/msn.c:529 ../libpurple/protocols/msn/msn.c:2411
+#: ../libpurple/protocols/msn/msn.c:2476 ../libpurple/protocols/msn/msn.c:2503
+#: ../pidgin/gtkplugin.c:765 ../pidgin/gtkroomlist.c:740
 #: ../pidgin/plugins/disco/gtkdisco.c:554
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:131
 #: ../pidgin/plugins/gevolution/assoc-buddy.c:122
@@ -446,14 +446,14 @@
 msgstr "མིང་།"
 
 #: ../finch/gntblist.c:794 ../finch/gntblist.c:1735
-#: ../libpurple/protocols/gg/gg.c:1569 ../libpurple/protocols/msn/msn.c:2236
+#: ../libpurple/protocols/gg/gg.c:1569 ../libpurple/protocols/msn/msn.c:2237
 #: ../libpurple/protocols/mxit/profile.c:206
 #: ../libpurple/protocols/silc/chat.c:612
 #: ../libpurple/protocols/silc10/chat.c:590
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:704
-#: ../libpurple/protocols/zephyr/zephyr.c:804
-#: ../libpurple/protocols/zephyr/zephyr.c:1188 ../pidgin/gtkdialogs.c:1163
-#: ../pidgin/gtkdialogs.c:1187 ../pidgin/gtkdialogs.c:1209
+#: ../libpurple/protocols/zephyr/zephyr.c:797
+#: ../libpurple/protocols/zephyr/zephyr.c:1178 ../pidgin/gtkdialogs.c:1150
+#: ../pidgin/gtkdialogs.c:1174 ../pidgin/gtkdialogs.c:1196
 #: ../pidgin/gtkrequest.c:308
 msgid "Alias"
 msgstr "མིང་གཞན།"
@@ -467,7 +467,7 @@
 msgid "Auto-join"
 msgstr "རང་བཞིན་གྱིས་-མཐུད།"
 
-#: ../finch/gntblist.c:804 ../finch/gntblist.c:1261 ../pidgin/gtkblist.c:7274
+#: ../finch/gntblist.c:804 ../finch/gntblist.c:1261 ../pidgin/gtkblist.c:7271
 msgid "Add Chat"
 msgstr "ཁ་སླབ་ཁ་སྐོང་འབད་"
 
@@ -486,8 +486,8 @@
 "ཁ་སྐོང་རྐྱབ་ནིའི་དོན་ལུ་ཁྱོད་ཀྱིས་ སྡེ་ཚན་གྱི་མིང་གཅིག་བྱིན་དགོཔ་ཨིན།"
 
 #: ../finch/gntblist.c:852 ../finch/gntblist.c:1263
-#: ../libpurple/protocols/sametime/sametime.c:5419
-#: ../libpurple/protocols/sametime/sametime.c:5507 ../pidgin/gtkblist.c:7330
+#: ../libpurple/protocols/sametime/sametime.c:5455
+#: ../libpurple/protocols/sametime/sametime.c:5543 ../pidgin/gtkblist.c:7327
 msgid "Add Group"
 msgstr "སྡེ་ཚན་ཁ་སྐོང་འབད།"
 
@@ -511,11 +511,11 @@
 msgid "Edit Settings"
 msgstr "སྒྲིག་སྟངས་ཚུ་ཞུན་དག་འབད།"
 
-#: ../finch/gntblist.c:1271 ../pidgin/gtkutils.c:1011
+#: ../finch/gntblist.c:1271 ../pidgin/gtkutils.c:1003
 msgid "Information"
 msgstr "བརྡ་དོན།"
 
-#: ../finch/gntblist.c:1271 ../pidgin/gtkutils.c:1011
+#: ../finch/gntblist.c:1271 ../pidgin/gtkutils.c:1003
 msgid "Retrieving..."
 msgstr ""
 
@@ -530,7 +530,7 @@
 msgstr "ཆ་རོགས་པ་འུནསི་ཁ་སྐོང་བརྐྱབ།"
 
 #: ../finch/gntblist.c:1347 ../finch/gntconv.c:641
-#: ../libpurple/protocols/jabber/si.c:1580
+#: ../libpurple/protocols/jabber/si.c:1584
 #: ../libpurple/protocols/oscar/userinfo.c:58 ../pidgin/gtkconv.c:1631
 msgid "Send File"
 msgstr "ཡིག་སྣོད་གཏང་།"
@@ -590,7 +590,7 @@
 msgstr "རྩ་བསྐྲད་བཏང་།"
 
 #. Buddy List
-#: ../finch/gntblist.c:1711 ../finch/gntblist.c:3126 ../finch/gntprefs.c:261
+#: ../finch/gntblist.c:1711 ../finch/gntblist.c:3126 ../finch/gntprefs.c:259
 #: ../finch/gntui.c:100 ../pidgin/gtkblist.c:5768
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:303
 msgid "Buddy List"
@@ -611,22 +611,22 @@
 #. General
 #: ../finch/gntblist.c:1787 ../libpurple/protocols/gg/gg.c:307
 #: ../libpurple/protocols/gg/gg.c:801 ../libpurple/protocols/gg/gg.c:873
-#: ../libpurple/protocols/gg/gg.c:2404
+#: ../libpurple/protocols/gg/gg.c:2346
 #: ../libpurple/protocols/jabber/buddy.c:353
 #: ../libpurple/protocols/jabber/buddy.c:1050
 #: ../libpurple/protocols/jabber/buddy.c:2004
 #: ../libpurple/protocols/jabber/buddy.c:2197
-#: ../libpurple/protocols/jabber/jabber.c:1329
-#: ../libpurple/protocols/jabber/jabber.c:2383
-#: ../libpurple/protocols/jabber/jabber.c:2407
-#: ../libpurple/protocols/jabber/jabber.c:2423
-#: ../libpurple/protocols/jabber/jabber.c:2439
-#: ../libpurple/protocols/jabber/jabber.c:2453
-#: ../libpurple/protocols/msn/msn.c:2243 ../libpurple/protocols/msn/msn.c:2413
-#: ../libpurple/protocols/silc/buddy.c:1543
-#: ../libpurple/protocols/silc/ops.c:1014
-#: ../libpurple/protocols/silc/ops.c:1197
-#: ../libpurple/protocols/silc/ops.c:1335
+#: ../libpurple/protocols/jabber/jabber.c:1321
+#: ../libpurple/protocols/jabber/jabber.c:2375
+#: ../libpurple/protocols/jabber/jabber.c:2399
+#: ../libpurple/protocols/jabber/jabber.c:2415
+#: ../libpurple/protocols/jabber/jabber.c:2431
+#: ../libpurple/protocols/jabber/jabber.c:2445
+#: ../libpurple/protocols/msn/msn.c:2244 ../libpurple/protocols/msn/msn.c:2414
+#: ../libpurple/protocols/silc/buddy.c:1549
+#: ../libpurple/protocols/silc/ops.c:1015
+#: ../libpurple/protocols/silc/ops.c:1198
+#: ../libpurple/protocols/silc/ops.c:1336
 #: ../libpurple/protocols/silc10/buddy.c:1555
 #: ../libpurple/protocols/silc10/ops.c:1036
 #: ../libpurple/protocols/silc10/ops.c:1179
@@ -638,17 +638,17 @@
 
 #. Never know what those translations might end up like...
 #. Idle stuff
-#: ../finch/gntblist.c:1809 ../finch/gntprefs.c:264
+#: ../finch/gntblist.c:1809 ../finch/gntprefs.c:262
 #: ../libpurple/protocols/bonjour/bonjour.c:370
 #: ../libpurple/protocols/jabber/buddy.c:748
-#: ../libpurple/protocols/jabber/jabber.c:2248
+#: ../libpurple/protocols/jabber/jabber.c:2240
 #: ../libpurple/protocols/msn/msn.c:1071 ../libpurple/protocols/msn/msn.c:1088
 #: ../libpurple/protocols/msn/msn.c:1095 ../libpurple/protocols/msn/state.c:38
 #: ../libpurple/protocols/novell/novell.c:2848
-#: ../libpurple/protocols/oscar/userinfo.c:500
-#: ../libpurple/protocols/yahoo/libymsg.c:4089
+#: ../libpurple/protocols/oscar/userinfo.c:499
+#: ../libpurple/protocols/yahoo/libymsg.c:4102
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:709 ../pidgin/gtkblist.c:3831
-#: ../pidgin/gtkblist.c:4286 ../pidgin/gtkprefs.c:2714
+#: ../pidgin/gtkblist.c:4286 ../pidgin/gtkprefs.c:2709
 msgid "Idle"
 msgstr "ལས་མེད།"
 
@@ -665,7 +665,7 @@
 msgstr "སྲུངས་བཞག་ཡོདཔ།..."
 
 #: ../finch/gntblist.c:2596 ../finch/gntplugin.c:354 ../finch/gntui.c:105
-#: ../pidgin/gtkplugin.c:722
+#: ../pidgin/gtkplugin.c:720
 msgid "Plugins"
 msgstr "པ་ལག་ཨིནསི།"
 
@@ -691,26 +691,26 @@
 #. Not masked?
 #. No hints?
 #: ../finch/gntblist.c:2761 ../finch/gntblist.c:2812 ../finch/gntblist.c:2948
-#: ../finch/gntcertmgr.c:90 ../finch/gntconn.c:137 ../finch/gntnotify.c:85
-#: ../finch/plugins/gnthistory.c:181 ../libpurple/account.c:1280
-#: ../libpurple/account.c:1643 ../libpurple/protocols/gg/gg.c:335
+#: ../finch/gntcertmgr.c:90 ../finch/gntconn.c:137 ../finch/gntnotify.c:83
+#: ../finch/plugins/gnthistory.c:181 ../libpurple/account.c:1221
+#: ../libpurple/account.c:1584 ../libpurple/protocols/gg/gg.c:335
 #: ../libpurple/protocols/gg/gg.c:390
-#: ../libpurple/protocols/jabber/jabber.c:2565
+#: ../libpurple/protocols/jabber/jabber.c:2557
 #: ../libpurple/protocols/jabber/xdata.c:403
 #: ../libpurple/protocols/msn/msn.c:451 ../libpurple/protocols/msn/msn.c:576
 #: ../libpurple/protocols/msn/msn.c:654 ../libpurple/protocols/msn/msn.c:671
 #: ../libpurple/protocols/msn/msn.c:688
 #: ../libpurple/protocols/mxit/login.c:365
-#: ../libpurple/protocols/myspace/user.c:825
-#: ../libpurple/protocols/myspace/user.c:886
-#: ../libpurple/protocols/oscar/oscar.c:5214
+#: ../libpurple/protocols/myspace/user.c:823
+#: ../libpurple/protocols/myspace/user.c:884
+#: ../libpurple/protocols/oscar/oscar.c:5219
 #: ../libpurple/protocols/silc/buddy.c:458
-#: ../libpurple/protocols/silc/buddy.c:1192
+#: ../libpurple/protocols/silc/buddy.c:1198
 #: ../libpurple/protocols/silc/chat.c:451
 #: ../libpurple/protocols/silc/chat.c:488
 #: ../libpurple/protocols/silc/chat.c:755
-#: ../libpurple/protocols/silc/ops.c:1304
-#: ../libpurple/protocols/silc/ops.c:1830
+#: ../libpurple/protocols/silc/ops.c:1305
+#: ../libpurple/protocols/silc/ops.c:1831
 #: ../libpurple/protocols/silc/silc.c:1062
 #: ../libpurple/protocols/silc10/buddy.c:467
 #: ../libpurple/protocols/silc10/buddy.c:1191
@@ -721,22 +721,22 @@
 #: ../libpurple/protocols/silc10/ops.c:1909
 #: ../libpurple/protocols/silc10/silc.c:760
 #: ../libpurple/protocols/yahoo/libymsg.c:1368
-#: ../libpurple/protocols/yahoo/libymsg.c:4561
-#: ../libpurple/protocols/yahoo/libymsg.c:4572
+#: ../libpurple/protocols/yahoo/libymsg.c:4574
+#: ../libpurple/protocols/yahoo/libymsg.c:4585
 #: ../libpurple/protocols/yahoo/yahoo_aliases.c:588
 #: ../libpurple/protocols/yahoo/yahoo_aliases.c:599 ../pidgin/gtkblist.c:3581
-#: ../pidgin/gtkcertmgr.c:193 ../pidgin/gtkdialogs.c:912
-#: ../pidgin/gtkdialogs.c:1051 ../pidgin/gtkdialogs.c:1143
-#: ../pidgin/gtkrequest.c:300 ../pidgin/gtkutils.c:1627
-#: ../pidgin/gtkutils.c:1647
+#: ../pidgin/gtkcertmgr.c:193 ../pidgin/gtkdialogs.c:899
+#: ../pidgin/gtkdialogs.c:1038 ../pidgin/gtkdialogs.c:1130
+#: ../pidgin/gtkrequest.c:300 ../pidgin/gtkutils.c:1619
+#: ../pidgin/gtkutils.c:1639
 msgid "OK"
 msgstr "བཏུབ།"
 
-#: ../finch/gntblist.c:2807 ../pidgin/gtkdialogs.c:907
+#: ../finch/gntblist.c:2807 ../pidgin/gtkdialogs.c:894
 msgid "New Instant Message"
 msgstr "འཕྲལ་མྱུར་འཕྲིན་དོན་གསརཔ།"
 
-#: ../finch/gntblist.c:2809 ../pidgin/gtkdialogs.c:909
+#: ../finch/gntblist.c:2809 ../pidgin/gtkdialogs.c:896
 msgid ""
 "Please enter the username or alias of the person you would like to IM."
 msgstr ""
@@ -753,11 +753,11 @@
 msgid "Please enter the name of the chat you want to join."
 msgstr ""
 
-#: ../finch/gntblist.c:2886 ../finch/gntnotify.c:465
+#: ../finch/gntblist.c:2886 ../finch/gntnotify.c:461
 msgid "Join"
 msgstr "མཐུད་ནི།"
 
-#: ../finch/gntblist.c:2945 ../pidgin/gtkdialogs.c:1140
+#: ../finch/gntblist.c:2945 ../pidgin/gtkdialogs.c:1127
 msgid ""
 "Please enter the username or alias of the person whose log you would like to "
 "view."
@@ -823,7 +823,7 @@
 
 #: ../finch/gntblist.c:3080 ../libpurple/protocols/oscar/userinfo.c:52
 #: ../libpurple/protocols/silc/silc.c:1008
-#: ../libpurple/protocols/silc/util.c:509
+#: ../libpurple/protocols/silc/util.c:560
 #: ../libpurple/protocols/silc10/silc.c:704
 #: ../libpurple/protocols/silc10/util.c:553
 #: ../pidgin/plugins/disco/gtkdisco.c:482
@@ -920,20 +920,20 @@
 msgid "Hostname"
 msgstr "ཧོསཊི་ནེམ།"
 
-#: ../finch/gntcertmgr.c:315 ../finch/gntnotify.c:459 ../pidgin/gtkconv.c:1668
+#: ../finch/gntcertmgr.c:315 ../finch/gntnotify.c:455 ../pidgin/gtkconv.c:1668
 #: ../pidgin/gtkdebug.c:940
 msgid "Info"
 msgstr "བརྡ་དོན།"
 
 #. Close button
-#: ../finch/gntcertmgr.c:324 ../finch/gntft.c:256 ../finch/gntnotify.c:203
+#: ../finch/gntcertmgr.c:324 ../finch/gntft.c:256 ../finch/gntnotify.c:200
 #: ../finch/gntplugin.c:222 ../finch/gntplugin.c:415 ../finch/gntpounce.c:752
 #: ../finch/gntroomlist.c:277 ../finch/gntstatus.c:218
-#: ../libpurple/certificate.c:2212 ../libpurple/protocols/msn/msn.c:794
+#: ../libpurple/protocols/msn/msn.c:794
 #: ../libpurple/protocols/mxit/splashscreen.c:207
 #: ../libpurple/protocols/mxit/splashscreen.c:211
-#: ../libpurple/protocols/silc/util.c:335
-#: ../libpurple/protocols/silc10/util.c:377 ../pidgin/gtkaccount.c:2460
+#: ../libpurple/protocols/silc/util.c:386
+#: ../libpurple/protocols/silc10/util.c:377 ../pidgin/gtkaccount.c:2453
 #: ../pidgin/gtkblist.c:5874 ../pidgin/gtkrequest.c:303
 msgid "Close"
 msgstr "ཁ་བསྡམ།"
@@ -1046,7 +1046,7 @@
 msgid "Clear Scrollback"
 msgstr ""
 
-#: ../finch/gntconv.c:616 ../finch/gntprefs.c:194
+#: ../finch/gntconv.c:616 ../finch/gntprefs.c:192
 msgid "Show Timestamps"
 msgstr "དུས་བཀོད་ཚུ་སྟོན།"
 
@@ -1110,7 +1110,7 @@
 msgid "%s is not a valid color. See '/help msgcolor' for valid colors."
 msgstr ""
 
-#: ../finch/gntconv.c:1415 ../pidgin/gtkconv.c:8084
+#: ../finch/gntconv.c:1415 ../pidgin/gtkconv.c:8081
 msgid ""
 "say &lt;message&gt;:  Send a message normally as if you weren't using a "
 "command."
@@ -1118,12 +1118,12 @@
 "སླབ་&lt;འཕྲིན་དོན་&gt;: "
 "ཁྱོད་ཀྱིས་བརྡ་བཀོད་ལག་ལེན་མ་འཐབ་བཟུམ་སྦེ་འཕྲིན་དོན་གཏང་།"
 
-#: ../finch/gntconv.c:1418 ../pidgin/gtkconv.c:8087
+#: ../finch/gntconv.c:1418 ../pidgin/gtkconv.c:8084
 msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
 msgstr ""
 "ང་ &lt;བྱ་བ&gt;: ཆ་རོགས་ཡང་ན་ཁ་སླབ་ནི་ལུ་ཨའི་ཨར་སི་བཟོ་རྣམ་གྱི་བྱ་བ་གཏང་།"
 
-#: ../finch/gntconv.c:1421 ../pidgin/gtkconv.c:8090
+#: ../finch/gntconv.c:1421 ../pidgin/gtkconv.c:8087
 msgid ""
 "debug &lt;option&gt;:  Send various debug information to the current "
 "conversation."
@@ -1131,11 +1131,11 @@
 "རྐྱེན་སེལ་དང་ཨའི་ཊི་;གདམ་ཁ་དང་ཇི་ཊི་;:   "
 "ད་ལྟོའི་གྲོས་གླེང་ལུ་རྐྱེན་སེལ་བརྡ་དོན་འདྲ་མིན་སྣ་ཚོགས་ཚུ་གཏང་།(&I)(&g)"
 
-#: ../finch/gntconv.c:1424 ../pidgin/gtkconv.c:8093
+#: ../finch/gntconv.c:1424 ../pidgin/gtkconv.c:8090
 msgid "clear: Clears the conversation scrollback."
 msgstr "བསལ: གྲོས་གླེང་རྒྱབ་སྒྲིལ་བསལཝ་ཨིན།"
 
-#: ../finch/gntconv.c:1427 ../pidgin/gtkconv.c:8099
+#: ../finch/gntconv.c:1427 ../pidgin/gtkconv.c:8096
 msgid "help &lt;command&gt;:  Help on a specific command."
 msgstr "གྲོགས་རམ &lt;བརད་བཀོད&gt;:  དམིགས་བསལ་བརྡ་བཀོད་ཐོག་ལུ་གྲོགས་རམ་འབད།"
 
@@ -1177,12 +1177,12 @@
 "default"
 msgstr ""
 
-#: ../finch/gntdebug.c:276 ../pidgin/gtkconv.c:994 ../pidgin/gtkdebug.c:230
-#: ../pidgin/gtkft.c:519 ../pidgin/gtkutils.c:3347
+#: ../finch/gntdebug.c:275 ../pidgin/gtkconv.c:994 ../pidgin/gtkdebug.c:230
+#: ../pidgin/gtkft.c:519 ../pidgin/gtkutils.c:3339
 msgid "Unable to open file."
 msgstr "ཡིག་སྣོད་ཁ་ཕྱེ་མ་ཚུགས།"
 
-#: ../finch/gntdebug.c:316 ../finch/gntui.c:103 ../pidgin/gtkdebug.c:755
+#: ../finch/gntdebug.c:315 ../finch/gntui.c:103 ../pidgin/gtkdebug.c:755
 msgid "Debug Window"
 msgstr "རྐྱེན་སེལ་སྒོ་སྒྲིག"
 
@@ -1190,15 +1190,15 @@
 #. * it's necessary to make the width of the debug window resizable ... like I said,
 #. * it doesn't make sense. The bug is likely in the packing in gntbox.c.
 #. 
-#: ../finch/gntdebug.c:337 ../pidgin/gtkdebug.c:835 ../pidgin/gtkdebug.c:837
+#: ../finch/gntdebug.c:336 ../pidgin/gtkdebug.c:835 ../pidgin/gtkdebug.c:837
 msgid "Clear"
 msgstr "བསལ།"
 
-#: ../finch/gntdebug.c:348
+#: ../finch/gntdebug.c:347
 msgid "Filter:"
 msgstr ""
 
-#: ../finch/gntdebug.c:354 ../pidgin/gtkdebug.c:849 ../pidgin/gtkdebug.c:851
+#: ../finch/gntdebug.c:353 ../pidgin/gtkdebug.c:849 ../pidgin/gtkdebug.c:851
 msgid "Pause"
 msgstr "ཐེམ།"
 
@@ -1244,18 +1244,18 @@
 #: ../libpurple/protocols/jabber/buddy.c:770
 #: ../libpurple/protocols/jabber/buddy.c:778
 #: ../libpurple/protocols/jabber/buddy.c:849
-#: ../libpurple/protocols/jabber/jabber.c:2233
+#: ../libpurple/protocols/jabber/jabber.c:2225
 #: ../libpurple/protocols/msn/msn.c:1081 ../libpurple/protocols/msn/msn.c:1090
 #: ../libpurple/protocols/msn/msn.c:1094 ../libpurple/protocols/msn/msn.c:1097
 #: ../libpurple/protocols/mxit/mxit.c:342
 #: ../libpurple/protocols/mxit/profile.c:235
 #: ../libpurple/protocols/novell/novell.c:2858
-#: ../libpurple/protocols/oscar/oscar.c:2294
-#: ../libpurple/protocols/oscar/oscar.c:2317
+#: ../libpurple/protocols/oscar/oscar.c:2296
+#: ../libpurple/protocols/oscar/oscar.c:2319
 #: ../libpurple/protocols/oscar/userinfo.c:303
-#: ../libpurple/protocols/sametime/sametime.c:3310
-#: ../libpurple/protocols/sametime/sametime.c:4161
-#: ../libpurple/protocols/yahoo/libymsg.c:4245 ../pidgin/gtkblist.c:3876
+#: ../libpurple/protocols/sametime/sametime.c:3346
+#: ../libpurple/protocols/sametime/sametime.c:4197
+#: ../libpurple/protocols/yahoo/libymsg.c:4258 ../pidgin/gtkblist.c:3876
 #: ../pidgin/gtkblist.c:3890 ../pidgin/gtkblist.c:3892
 #: ../pidgin/gtksavedstatuses.c:970 ../pidgin/gtksavedstatuses.c:1120
 msgid "Status"
@@ -1384,7 +1384,7 @@
 msgid "System Log"
 msgstr "དྲན་དེབ་རིམ་ལུགས།"
 
-#: ../finch/gntmedia.c:159 ../pidgin/gtkmedia.c:341
+#: ../finch/gntmedia.c:159 ../pidgin/gtkmedia.c:339
 msgid "Calling..."
 msgstr ""
 
@@ -1401,15 +1401,15 @@
 msgid "Reject"
 msgstr "ཕྱིར་བཏོན།"
 
-#: ../finch/gntmedia.c:190 ../pidgin/gtkmedia.c:1144 ../pidgin/gtkmedia.c:1146
+#: ../finch/gntmedia.c:190 ../pidgin/gtkmedia.c:970 ../pidgin/gtkmedia.c:972
 msgid "Call in progress."
 msgstr ""
 
-#: ../finch/gntmedia.c:242 ../pidgin/gtkmedia.c:1123
+#: ../finch/gntmedia.c:242 ../pidgin/gtkmedia.c:949
 msgid "The call has been terminated."
 msgstr ""
 
-#: ../finch/gntmedia.c:270 ../pidgin/gtkmedia.c:640
+#: ../finch/gntmedia.c:270 ../pidgin/gtkmedia.c:635
 #, c-format
 msgid "%s wishes to start an audio session with you."
 msgstr ""
@@ -1419,7 +1419,7 @@
 msgid "%s is trying to start an unsupported media session type with you."
 msgstr ""
 
-#: ../finch/gntmedia.c:288 ../pidgin/gtkmedia.c:1139
+#: ../finch/gntmedia.c:288 ../pidgin/gtkmedia.c:965
 msgid "You have rejected the call."
 msgstr ""
 
@@ -1427,64 +1427,64 @@
 msgid "call: Make an audio call."
 msgstr ""
 
-#: ../finch/gntnotify.c:186
+#: ../finch/gntnotify.c:183
 msgid "Emails"
 msgstr "གློག་འཕྲིན་ཚུ།"
 
-#: ../finch/gntnotify.c:192 ../finch/gntnotify.c:256
+#: ../finch/gntnotify.c:189 ../finch/gntnotify.c:252
 msgid "You have mail!"
 msgstr "ཁྱོད་ལུ་ ཡིག་འཕྲིན་འདུག!"
 
-#: ../finch/gntnotify.c:195 ../pidgin/gtknotify.c:719
+#: ../finch/gntnotify.c:192 ../pidgin/gtknotify.c:719
 msgid "Sender"
 msgstr ""
 
-#: ../finch/gntnotify.c:195 ../pidgin/gtknotify.c:726
+#: ../finch/gntnotify.c:192 ../pidgin/gtknotify.c:726
 msgid "Subject"
 msgstr "དོན་ཚན།"
 
-#: ../finch/gntnotify.c:226
+#: ../finch/gntnotify.c:223
 #, c-format
 msgid "%s (%s) has %d new message."
 msgid_plural "%s (%s) has %d new messages."
 msgstr[0] "%s (%s) ལུ་ %d འཕྲིན་དོན་གསརཔ་གཅིག་འདུག"
 
-#: ../finch/gntnotify.c:256 ../pidgin/gtknotify.c:1596
+#: ../finch/gntnotify.c:252 ../pidgin/gtknotify.c:1596
 msgid "New Mail"
 msgstr "གློག་འཕྲིན་གསརཔ།"
 
-#: ../finch/gntnotify.c:362 ../pidgin/gtknotify.c:1155
+#: ../finch/gntnotify.c:358 ../pidgin/gtknotify.c:1155
 #, c-format
 msgid "Info for %s"
 msgstr "%sགི་དོན་ལུ་ བརྡ་དོན།"
 
-#: ../finch/gntnotify.c:363 ../pidgin/gtknotify.c:1156
+#: ../finch/gntnotify.c:359 ../pidgin/gtknotify.c:1156
 msgid "Buddy Information"
 msgstr "ཆ་རོགས་ཀྱི་བརྡ་དོན།"
 
-#: ../finch/gntnotify.c:453 ../libpurple/protocols/mxit/login.c:711
+#: ../finch/gntnotify.c:449 ../libpurple/protocols/mxit/login.c:711
 #: ../libpurple/protocols/mxit/splashscreen.c:211
 msgid "Continue"
 msgstr "འཕྲོ་མཐུད།"
 
-#: ../finch/gntnotify.c:462 ../pidgin/gtkconv.c:1618
+#: ../finch/gntnotify.c:458 ../pidgin/gtkconv.c:1618
 #: ../pidgin/gtknotify.c:1638
 msgid "IM"
 msgstr "ཨའི་ཨེམ་།"
 
-#: ../finch/gntnotify.c:468 ../libpurple/conversation.c:2146
-#: ../libpurple/protocols/sametime/sametime.c:3520
+#: ../finch/gntnotify.c:464 ../libpurple/conversation.c:2146
+#: ../libpurple/protocols/sametime/sametime.c:3556
 msgid "Invite"
 msgstr "མགྲོན་དུ་འབོད།"
 
-#: ../finch/gntnotify.c:471
+#: ../finch/gntnotify.c:467
 msgid "(none)"
 msgstr "(ཅི་མེད།)"
 
 #. XXX: The following expects that finch_notify_message gets called. This
 #. * may not always happen, e.g. when another plugin sets its own
 #. * notify_message. So tread carefully.
-#: ../finch/gntnotify.c:498 ../finch/plugins/gnttinyurl.c:370
+#: ../finch/gntnotify.c:493 ../finch/plugins/gnttinyurl.c:370
 msgid "URI"
 msgstr ""
 
@@ -1560,8 +1560,8 @@
 #. (that should have been "effect," right?)
 #. Back to instant-apply! I win!  BU-HAHAHA!
 #. Create the window
-#: ../finch/gntplugin.c:526 ../finch/gntplugin.c:533 ../finch/gntprefs.c:267
-#: ../finch/gntui.c:108 ../pidgin/gtkprefs.c:2835
+#: ../finch/gntplugin.c:526 ../finch/gntplugin.c:533 ../finch/gntprefs.c:265
+#: ../finch/gntui.c:108 ../pidgin/gtkprefs.c:2830
 msgid "Preferences"
 msgstr "དགའ་གདམ་ཚུ།"
 
@@ -1747,66 +1747,66 @@
 msgid "Based on keyboard use"
 msgstr ""
 
-#: ../finch/gntprefs.c:95 ../pidgin/gtkprefs.c:2719
+#: ../finch/gntprefs.c:95 ../pidgin/gtkprefs.c:2714
 msgid "From last sent message"
 msgstr "ཧེ་མ་བཏང་ཡོད་པའི་འཕྲིན་དོན་ལས།"
 
-#: ../finch/gntprefs.c:97 ../pidgin/gtkprefs.c:1355 ../pidgin/gtkprefs.c:1363
-#: ../pidgin/gtkprefs.c:2718 ../pidgin/gtkprefs.c:2754
+#: ../finch/gntprefs.c:97 ../pidgin/gtkprefs.c:1349 ../pidgin/gtkprefs.c:1357
+#: ../pidgin/gtkprefs.c:2713 ../pidgin/gtkprefs.c:2749
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:310
 msgid "Never"
 msgstr "ནམ་ཡང་།"
 
-#: ../finch/gntprefs.c:187
+#: ../finch/gntprefs.c:185
 msgid "Show Idle Time"
 msgstr "ལས་མེད་དུས་ཚོད་སྟོན།"
 
-#: ../finch/gntprefs.c:188
+#: ../finch/gntprefs.c:186
 msgid "Show Offline Buddies"
 msgstr "ཨོཕ་ལ་ཡིན་ཆ་རོགས་ཚུ་སྟོན།"
 
-#: ../finch/gntprefs.c:195
+#: ../finch/gntprefs.c:193
 msgid "Notify buddies when you are typing"
 msgstr "ཁྱོད་ཀྱིས་ ཡིག་དཔར་བརྐྱབ་པའི་སྐབས་སུ་ ཆ་རོགས་ཚུ་བརྡ་བསྐུལ་འབད།"
 
-#: ../finch/gntprefs.c:201 ../finch/plugins/gnthistory.c:157
+#: ../finch/gntprefs.c:199 ../finch/plugins/gnthistory.c:157
 msgid "Log format"
 msgstr "དྲན་དེབ་རྩ་སྒྲིག"
 
-#: ../finch/gntprefs.c:202 ../finch/plugins/gnthistory.c:147
+#: ../finch/gntprefs.c:200 ../finch/plugins/gnthistory.c:147
 msgid "Log IMs"
 msgstr "ཨའི་ཨེམ་ཨེསི་ལོག"
 
-#: ../finch/gntprefs.c:203 ../finch/plugins/gnthistory.c:148
+#: ../finch/gntprefs.c:201 ../finch/plugins/gnthistory.c:148
 msgid "Log chats"
 msgstr "དྲན་དེབ་ཁ་སླབ་ཚུ།"
 
-#: ../finch/gntprefs.c:204
+#: ../finch/gntprefs.c:202
 msgid "Log status change events"
 msgstr "ལོག་གནས་ཚད་ཀྱིས་ བྱུང་ལས་ཚུ་བསྒྱུར་བཅོས་འབདཝ་ཨིན།"
 
-#: ../finch/gntprefs.c:210
+#: ../finch/gntprefs.c:208
 msgid "Report Idle time"
 msgstr ""
 
-#: ../finch/gntprefs.c:211
+#: ../finch/gntprefs.c:209
 msgid "Change status when idle"
 msgstr ""
 
-#: ../finch/gntprefs.c:212
+#: ../finch/gntprefs.c:210
 msgid "Minutes before changing status"
 msgstr ""
 
-#: ../finch/gntprefs.c:213
+#: ../finch/gntprefs.c:211
 msgid "Change status to"
 msgstr ""
 
-#: ../finch/gntprefs.c:262 ../pidgin/gtkprefs.c:1475 ../pidgin/gtkprefs.c:2806
+#: ../finch/gntprefs.c:260 ../pidgin/gtkprefs.c:1469 ../pidgin/gtkprefs.c:2801
 msgid "Conversations"
 msgstr "གྲོས་གླེང་།"
 
-#: ../finch/gntprefs.c:263 ../finch/plugins/gnthistory.c:155
-#: ../pidgin/gtkprefs.c:2231 ../pidgin/gtkprefs.c:2807
+#: ../finch/gntprefs.c:261 ../finch/plugins/gnthistory.c:155
+#: ../pidgin/gtkprefs.c:2225 ../pidgin/gtkprefs.c:2802
 msgid "Logging"
 msgstr "ནང་བསྐྱོད།"
 
@@ -1822,11 +1822,11 @@
 msgid "Not implemented yet."
 msgstr "ད་ཚུན་ཡང་ལག་ལེན་མ་འཐབ་པས།"
 
-#: ../finch/gntrequest.c:766 ../pidgin/gtkrequest.c:1610
+#: ../finch/gntrequest.c:766 ../pidgin/gtkrequest.c:1584
 msgid "Save File..."
 msgstr "ཡིག་སྣོད་སྲུང་བཞག་འབད..."
 
-#: ../finch/gntrequest.c:766 ../pidgin/gtkrequest.c:1611
+#: ../finch/gntrequest.c:766 ../pidgin/gtkrequest.c:1585
 msgid "Open File..."
 msgstr "ཡིག་སྣོད་ཁ་ཕྱེ..."
 
@@ -1843,7 +1843,7 @@
 msgstr ""
 
 #. Create the window.
-#: ../finch/gntroomlist.c:287 ../finch/gntui.c:106 ../pidgin/gtkblist.c:7280
+#: ../finch/gntroomlist.c:287 ../finch/gntui.c:106 ../pidgin/gtkblist.c:7277
 #: ../pidgin/gtkroomlist.c:531
 msgid "Room List"
 msgstr "ཁང་མིག་གི་ཐོ་ཡིག"
@@ -1903,8 +1903,8 @@
 #: ../finch/gntsound.c:739 ../finch/gntsound.c:825 ../pidgin/gtkpounce.c:178
 #: ../pidgin/gtkpounce.c:189 ../pidgin/gtkpounce.c:318
 #: ../pidgin/gtkpounce.c:696 ../pidgin/gtkpounce.c:958
-#: ../pidgin/gtkprefs.c:947 ../pidgin/gtkprefs.c:2357
-#: ../pidgin/gtkprefs.c:2455 ../pidgin/gtkprefs.c:2652
+#: ../pidgin/gtkprefs.c:941 ../pidgin/gtkprefs.c:2351
+#: ../pidgin/gtkprefs.c:2449 ../pidgin/gtkprefs.c:2646
 msgid "(default)"
 msgstr ""
 
@@ -1920,7 +1920,7 @@
 msgid "Profiles"
 msgstr ""
 
-#: ../finch/gntsound.c:977 ../pidgin/gtkprefs.c:2519
+#: ../finch/gntsound.c:977 ../pidgin/gtkprefs.c:2513
 msgid "Automatic"
 msgstr "རང་བཞིན་གྱི།"
 
@@ -1928,7 +1928,7 @@
 msgid "Console Beep"
 msgstr ""
 
-#: ../finch/gntsound.c:981 ../pidgin/gtkprefs.c:2523
+#: ../finch/gntsound.c:981 ../pidgin/gtkprefs.c:2517
 msgid "Command"
 msgstr "བརྡ་བཀོད།"
 
@@ -1952,7 +1952,7 @@
 msgstr ""
 
 #. Sound options
-#: ../finch/gntsound.c:1004 ../pidgin/gtkprefs.c:2509
+#: ../finch/gntsound.c:1004 ../pidgin/gtkprefs.c:2503
 msgid "Sound Options"
 msgstr "སྒྲ་སྐད་གདམ་ཁ་ཚུ།"
 
@@ -1960,19 +1960,19 @@
 msgid "Sounds when conversation has focus"
 msgstr ""
 
-#: ../finch/gntsound.c:1013 ../pidgin/gtkprefs.c:1353
-#: ../pidgin/gtkprefs.c:1365 ../pidgin/gtkprefs.c:2554
+#: ../finch/gntsound.c:1013 ../pidgin/gtkprefs.c:1347
+#: ../pidgin/gtkprefs.c:1359 ../pidgin/gtkprefs.c:2548
 #: ../pidgin/plugins/timestamp_format.c:58
 #: ../pidgin/plugins/timestamp_format.c:67
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:311
 msgid "Always"
 msgstr "ཨ་རྟག་རང་།"
 
-#: ../finch/gntsound.c:1014 ../pidgin/gtkprefs.c:2552
+#: ../finch/gntsound.c:1014 ../pidgin/gtkprefs.c:2546
 msgid "Only when available"
 msgstr ""
 
-#: ../finch/gntsound.c:1015 ../pidgin/gtkprefs.c:2553
+#: ../finch/gntsound.c:1015 ../pidgin/gtkprefs.c:2547
 msgid "Only when not available"
 msgstr ""
 
@@ -1981,12 +1981,12 @@
 msgstr ""
 
 #. Sound events
-#: ../finch/gntsound.c:1041 ../pidgin/gtkprefs.c:2581
+#: ../finch/gntsound.c:1041 ../pidgin/gtkprefs.c:2575
 msgid "Sound Events"
 msgstr "འབྱུང་ལས་ཚུའི་སྒྲ་སྐད།"
 
 #: ../finch/gntsound.c:1043 ../pidgin/gtknotify.c:1675
-#: ../pidgin/gtkprefs.c:2635
+#: ../pidgin/gtkprefs.c:2629
 msgid "Event"
 msgstr "འབྱུང་ལས།"
 
@@ -2046,13 +2046,13 @@
 #: ../libpurple/protocols/gg/gg.c:1594 ../libpurple/protocols/gg/gg.c:1604
 #: ../libpurple/protocols/gg/gg.c:1610 ../libpurple/protocols/gg/gg.c:1620
 #: ../libpurple/protocols/gg/gg.c:1629 ../libpurple/protocols/gg/gg.c:1634
-#: ../libpurple/protocols/irc/irc.c:276
-#: ../libpurple/protocols/jabber/jabber.c:2380
-#: ../libpurple/protocols/jabber/jabber.c:2404
-#: ../libpurple/protocols/jabber/jabber.c:2420
-#: ../libpurple/protocols/jabber/jabber.c:2436
-#: ../libpurple/protocols/jabber/jabber.c:2450
-#: ../libpurple/protocols/jabber/jabber.c:2465
+#: ../libpurple/protocols/irc/irc.c:274
+#: ../libpurple/protocols/jabber/jabber.c:2372
+#: ../libpurple/protocols/jabber/jabber.c:2396
+#: ../libpurple/protocols/jabber/jabber.c:2412
+#: ../libpurple/protocols/jabber/jabber.c:2428
+#: ../libpurple/protocols/jabber/jabber.c:2442
+#: ../libpurple/protocols/jabber/jabber.c:2457
 #: ../libpurple/protocols/msn/msn.c:1150 ../libpurple/protocols/msn/msn.c:1156
 #: ../libpurple/protocols/msn/msn.c:1162 ../libpurple/protocols/msn/msn.c:1168
 #: ../libpurple/protocols/msn/msn.c:1173 ../libpurple/protocols/msn/msn.c:1178
@@ -2062,29 +2062,29 @@
 #: ../libpurple/protocols/novell/novell.c:2964
 #: ../libpurple/protocols/novell/novell.c:2970
 #: ../libpurple/protocols/novell/novell.c:2976
-#: ../libpurple/protocols/oscar/oscar.c:4758
-#: ../libpurple/protocols/oscar/oscar.c:4767
-#: ../libpurple/protocols/oscar/oscar.c:4775
-#: ../libpurple/protocols/oscar/oscar.c:4783
-#: ../libpurple/protocols/oscar/oscar.c:4791
-#: ../libpurple/protocols/oscar/oscar.c:4799
-#: ../libpurple/protocols/oscar/oscar.c:4808
-#: ../libpurple/protocols/oscar/oscar.c:4816
-#: ../libpurple/protocols/oscar/oscar.c:4823
-#: ../libpurple/protocols/oscar/oscar.c:4835
-#: ../libpurple/protocols/oscar/oscar.c:4842
-#: ../libpurple/protocols/oscar/oscar.c:4849
-#: ../libpurple/protocols/sametime/sametime.c:3333
-#: ../libpurple/protocols/sametime/sametime.c:3339
-#: ../libpurple/protocols/sametime/sametime.c:3345
-#: ../libpurple/protocols/sametime/sametime.c:3424
-#: ../libpurple/protocols/silc/buddy.c:1557
+#: ../libpurple/protocols/oscar/oscar.c:4763
+#: ../libpurple/protocols/oscar/oscar.c:4772
+#: ../libpurple/protocols/oscar/oscar.c:4780
+#: ../libpurple/protocols/oscar/oscar.c:4788
+#: ../libpurple/protocols/oscar/oscar.c:4796
+#: ../libpurple/protocols/oscar/oscar.c:4804
+#: ../libpurple/protocols/oscar/oscar.c:4813
+#: ../libpurple/protocols/oscar/oscar.c:4821
+#: ../libpurple/protocols/oscar/oscar.c:4828
+#: ../libpurple/protocols/oscar/oscar.c:4840
+#: ../libpurple/protocols/oscar/oscar.c:4847
+#: ../libpurple/protocols/oscar/oscar.c:4854
+#: ../libpurple/protocols/sametime/sametime.c:3369
+#: ../libpurple/protocols/sametime/sametime.c:3375
+#: ../libpurple/protocols/sametime/sametime.c:3381
+#: ../libpurple/protocols/sametime/sametime.c:3460
+#: ../libpurple/protocols/silc/buddy.c:1563
 #: ../libpurple/protocols/silc10/buddy.c:1571
-#: ../libpurple/protocols/simple/simple.c:252
-#: ../libpurple/protocols/yahoo/libymsg.c:5085
-#: ../libpurple/protocols/yahoo/libymsg.c:5091
-#: ../libpurple/protocols/yahoo/libymsg.c:5100
-#: ../libpurple/protocols/zephyr/zephyr.c:2355 ../pidgin/gtknotify.c:1683
+#: ../libpurple/protocols/simple/simple.c:247
+#: ../libpurple/protocols/yahoo/libymsg.c:5098
+#: ../libpurple/protocols/yahoo/libymsg.c:5104
+#: ../libpurple/protocols/yahoo/libymsg.c:5113
+#: ../libpurple/protocols/zephyr/zephyr.c:2340 ../pidgin/gtknotify.c:1683
 #: ../pidgin/gtksavedstatuses.c:496 ../pidgin/gtksavedstatuses.c:985
 msgid "Message"
 msgstr "འཕྲིན་དོན།"
@@ -2139,7 +2139,7 @@
 msgid "Certificates"
 msgstr ""
 
-#: ../finch/gntui.c:107 ../pidgin/gtkprefs.c:2811
+#: ../finch/gntui.c:107 ../pidgin/gtkprefs.c:2806
 msgid "Sounds"
 msgstr "སྒྲ་སྐད་ཚུ།"
 
@@ -2326,9 +2326,9 @@
 #: ../libpurple/protocols/jabber/jutil.c:704
 #: ../libpurple/protocols/mxit/roster.c:53
 #: ../libpurple/protocols/novell/novell.c:2851
-#: ../libpurple/protocols/oscar/oscar.c:4681
+#: ../libpurple/protocols/oscar/oscar.c:4686
 #: ../libpurple/protocols/oscar/userinfo.c:279
-#: ../libpurple/protocols/yahoo/libymsg.c:4091 ../libpurple/status.c:162
+#: ../libpurple/protocols/yahoo/libymsg.c:4104 ../libpurple/status.c:162
 #: ../pidgin/gtkblist.c:3876 ../pidgin/gtkblist.c:4263
 #: ../pidgin/gtkdocklet.c:564 ../pidgin/gtkstatusbox.c:1100
 #: ../pidgin/plugins/themeedit-icon.c:67
@@ -2384,111 +2384,110 @@
 msgid "Lastlog plugin."
 msgstr ""
 
-#: ../libpurple/account.c:1026
+#: ../libpurple/account.c:972
 msgid "accounts"
 msgstr "རྩིས་ཐོ་ ཚུ།"
 
-#: ../libpurple/account.c:1226 ../libpurple/protocols/jabber/auth.c:106
+#: ../libpurple/account.c:1167 ../libpurple/protocols/jabber/auth.c:106
 #: ../libpurple/protocols/jabber/auth_cyrus.c:150
 #: ../libpurple/protocols/silc/silc.c:475
 msgid "Password is required to sign on."
 msgstr "འཛུལ་ནིའི་དོན་ལུ་ཆོག་ཡིག་དགོས་མཁོ་ཡོདཔ།"
 
-#: ../libpurple/account.c:1260
+#: ../libpurple/account.c:1201
 #, c-format
 msgid "Enter password for %s (%s)"
 msgstr "%s (%s)གི་དོན་ལུ་ཆོག་ཡིག་ཐོ་བཀོད་འབད།"
 
-#: ../libpurple/account.c:1267
+#: ../libpurple/account.c:1208
 msgid "Enter Password"
 msgstr "ཆོག་ཡིག་བཙུགས།"
 
-#: ../libpurple/account.c:1272
+#: ../libpurple/account.c:1213
 msgid "Save password"
 msgstr "ཆོག་ཡིག་སྲུངས།"
 
-#: ../libpurple/account.c:1309 ../libpurple/connection.c:119
+#: ../libpurple/account.c:1250 ../libpurple/connection.c:119
 #: ../libpurple/connection.c:197
 #, c-format
 msgid "Missing protocol plugin for %s"
 msgstr "%sགི་དོན་ལུ་པ་ལག་ཨིན་གནད་སྤེལ་ལམ་ལུགས་འདི་བརླག་སྟོར་ཞུགས་ནུག"
 
-#: ../libpurple/account.c:1310 ../libpurple/connection.c:122
+#: ../libpurple/account.c:1251 ../libpurple/connection.c:122
 msgid "Connection Error"
 msgstr "མཐུད་ལམ་གྱི་འཛོལ་བ།"
 
-#: ../libpurple/account.c:1564 ../libpurple/protocols/jabber/jabber.c:2518
+#: ../libpurple/account.c:1505 ../libpurple/protocols/jabber/jabber.c:2510
 msgid "New passwords do not match."
 msgstr "ཆོག་ཡིག་གསརཔ་ཚུ་མི་མཐུན་པས།"
 
-#: ../libpurple/account.c:1577
+#: ../libpurple/account.c:1518
 msgid "Fill out all fields completely."
 msgstr "ས་སྒོ་ཚུ་གེ་ར་ཡོངས་རྫོགས་འབད་བཀང་།"
 
-#: ../libpurple/account.c:1609
+#: ../libpurple/account.c:1550
 msgid "Original password"
 msgstr "ཆོག་ཡིག་ངོ་མ།"
 
-#: ../libpurple/account.c:1617
+#: ../libpurple/account.c:1558
 msgid "New password"
 msgstr "ཆོག་ཡིག་གསརཔ།"
 
-#: ../libpurple/account.c:1625
+#: ../libpurple/account.c:1566
 msgid "New password (again)"
 msgstr "ཆོག་ཡིག་གསརཔ(ལོག་སྟེ་)"
 
-#: ../libpurple/account.c:1632
+#: ../libpurple/account.c:1573
 #, c-format
 msgid "Change password for %s"
 msgstr "%sགི་དོན་ལུ་ཆོག་ཡིག་སོར།་"
 
-#: ../libpurple/account.c:1640
+#: ../libpurple/account.c:1581
 msgid "Please enter your current password and your new password."
 msgstr "ཁྱོད་ཀྱི་ད་ལྟོའི་ཆོག་ཡིག་དང་ཆོག་ཡིག་གསརཔ་ཚུ་བཙུགས་གནང་།"
 
-#: ../libpurple/account.c:1671
+#: ../libpurple/account.c:1612
 #, c-format
 msgid "Change user information for %s"
 msgstr "%sགི་དོན་ལུ་བརྡ་དོན་ལག་ལེན་པ་འདི་སོར།་"
 
-#: ../libpurple/account.c:1674
+#: ../libpurple/account.c:1615
 #: ../libpurple/protocols/yahoo/yahoo_aliases.c:587
 #: ../libpurple/protocols/yahoo/yahoo_aliases.c:598
 msgid "Set User Info"
 msgstr "ལག་ལེན་པའི་བརྡ་དོན་འདི་གཞི་སྒྲིག་འབད།"
 
-#: ../libpurple/account.c:1928
+#: ../libpurple/account.c:1869
 msgid "This protocol does not support setting a public alias."
 msgstr ""
 
-#: ../libpurple/account.c:1968
+#: ../libpurple/account.c:1909
 msgid "This protocol does not support fetching the public alias."
 msgstr ""
 
-#: ../libpurple/account.c:2266 ../libpurple/protocols/gg/gg.c:772
+#: ../libpurple/account.c:2207 ../libpurple/protocols/gg/gg.c:772
 #: ../libpurple/protocols/jabber/buddy.c:778
 #: ../libpurple/protocols/jabber/jutil.c:721
 #: ../libpurple/protocols/msn/oim.c:732
 #: ../libpurple/protocols/mxit/profile.c:46
 #: ../libpurple/protocols/mxit/profile.c:239
 #: ../libpurple/protocols/novell/novell.c:2854 ../pidgin/gtkft.c:162
-#: ../pidgin/plugins/disco/gtkdisco.c:470 ../pidgin/plugins/vvconfig.c:160
+#: ../pidgin/plugins/disco/gtkdisco.c:470 ../pidgin/plugins/vvconfig.c:147
 msgid "Unknown"
 msgstr "མ་ཤེསཔ།"
 
-#: ../libpurple/blist.c:282 ../libpurple/blist.c:586 ../libpurple/blist.c:1600
-#: ../libpurple/blist.c:1848 ../libpurple/blist.c:1850
-#: ../libpurple/protocols/jabber/facebook_roster.c:124
-#: ../libpurple/protocols/jabber/roster.c:143
-#: ../libpurple/protocols/jabber/roster.c:271
-#: ../libpurple/protocols/jabber/roster.c:541
-#: ../libpurple/protocols/myspace/myspace.c:3484 ../pidgin/gtkblist.c:6958
+#. Changing this string?  Look in add_purple_buddy_to_groups
+#: ../libpurple/blist.c:585 ../libpurple/blist.c:1599
+#: ../libpurple/blist.c:1847 ../libpurple/blist.c:1849
+#: ../libpurple/protocols/jabber/roster.c:117
+#: ../libpurple/protocols/jabber/roster.c:256
+#: ../libpurple/protocols/myspace/myspace.c:3484 ../pidgin/gtkblist.c:6955
 #: ../pidgin/plugins/gevolution/gevo-util.c:73
 #: ../pidgin/plugins/gevolution/gevolution.c:106
 msgid "Buddies"
 msgstr "ཆ་རོགས་ཚུ།"
 
-#: ../libpurple/blist.c:613
+#: ../libpurple/blist.c:612
 msgid "buddy list"
 msgstr "ཆ་རོགས་ཐོ་ཡིག"
 
@@ -2620,8 +2619,7 @@
 msgstr ""
 
 #. TODO: Find what the handle ought to be
-#: ../libpurple/certificate.c:2144 ../libpurple/certificate.c:2203
-#: ../libpurple/certificate.c:2208
+#: ../libpurple/certificate.c:2178
 msgid "Certificate Information"
 msgstr ""
 
@@ -2650,14 +2648,13 @@
 #: ../libpurple/protocols/jabber/buddy.c:2138
 #: ../libpurple/protocols/msn/servconn.c:149
 #: ../libpurple/protocols/msn/session.c:404
-#: ../libpurple/protocols/msn/session.c:413
 #: ../libpurple/protocols/msn/session.c:417
 #: ../libpurple/protocols/oscar/family_chatnav.c:66
 #: ../libpurple/protocols/oscar/family_icbm.c:64
 #: ../libpurple/protocols/oscar/family_icbm.c:65
-#: ../libpurple/protocols/yahoo/libymsg.c:2021
-#: ../libpurple/protocols/yahoo/libymsg.c:2032
-#: ../libpurple/protocols/yahoo/libymsg.c:2391
+#: ../libpurple/protocols/yahoo/libymsg.c:2022
+#: ../libpurple/protocols/yahoo/libymsg.c:2031
+#: ../libpurple/protocols/yahoo/libymsg.c:2406
 msgid "Unknown error"
 msgstr "ངོ་མ་ཤེས་པའི་འཛོལ་བ།"
 
@@ -2674,8 +2671,8 @@
 msgid "The message is too large."
 msgstr "འཕྲིན་དོན་འདི་གནམ་མེད་ས་མེད་རིང་དྲག་པས།"
 
-#: ../libpurple/conversation.c:227 ../libpurple/protocols/bonjour/jabber.c:306
-#: ../libpurple/protocols/bonjour/jabber.c:352
+#: ../libpurple/conversation.c:227 ../libpurple/protocols/bonjour/jabber.c:305
+#: ../libpurple/protocols/bonjour/jabber.c:351
 msgid "Unable to send message."
 msgstr "འཕྲིན་དོན་གཏང་མ་ཚུགས།"
 
@@ -2753,15 +2750,15 @@
 msgid "No name"
 msgstr "མིང་མེད།"
 
-#: ../libpurple/dnsquery.c:618
+#: ../libpurple/dnsquery.c:616
 msgid "Unable to create new resolver process\n"
 msgstr "དོགས་པ་སེལ་མི་ལས་སྦྱོར་གསརཔ་གསར་བསྐྲུན་འབད་མ་ཚུགས།\n"
 
-#: ../libpurple/dnsquery.c:623
+#: ../libpurple/dnsquery.c:621
 msgid "Unable to send request to resolver process\n"
 msgstr "དོགས་པ་སེལ་མི་ལས་སྦྱོར་ལུ་ ཞུ་བ་གཏང་མ་ཚུགས།\n"
 
-#: ../libpurple/dnsquery.c:656 ../libpurple/dnsquery.c:787
+#: ../libpurple/dnsquery.c:654 ../libpurple/dnsquery.c:785
 #, c-format
 msgid ""
 "Error resolving %s:\n"
@@ -2770,13 +2767,13 @@
 "%s དོགས་པ་སེལ་ནིའི་འཛོལ་བ།:\n"
 "%s"
 
-#: ../libpurple/dnsquery.c:659 ../libpurple/dnsquery.c:801
-#: ../libpurple/dnsquery.c:853 ../libpurple/dnsquery.c:864
+#: ../libpurple/dnsquery.c:657 ../libpurple/dnsquery.c:799
+#: ../libpurple/dnsquery.c:851 ../libpurple/dnsquery.c:862
 #, c-format
 msgid "Error resolving %s: %d"
 msgstr "%s: %d དོགས་པ་སེལ་ནིའི་འཛོལ་བ།"
 
-#: ../libpurple/dnsquery.c:683
+#: ../libpurple/dnsquery.c:681
 #, c-format
 msgid ""
 "Error reading from resolver process:\n"
@@ -2785,27 +2782,27 @@
 "དོགས་པ་སེལ་མི་ལས་སྦྱོར་ལས་ ལྷག་པའི་སྐབས་སུ་ འཛོལ་བ།:\n"
 "%s"
 
-#: ../libpurple/dnsquery.c:687
+#: ../libpurple/dnsquery.c:685
 #, c-format
 msgid "Resolver process exited without answering our request"
 msgstr ""
 
-#: ../libpurple/dnsquery.c:751
+#: ../libpurple/dnsquery.c:749
 #, c-format
 msgid "Error converting %s to punycode: %d"
 msgstr ""
 
-#: ../libpurple/dnsquery.c:826
+#: ../libpurple/dnsquery.c:824
 #, c-format
 msgid "Thread creation failure: %s"
 msgstr "ཐེ་རེཌི་གསར་བསྐྲུན་འཐུས་ཤོར།: %s"
 
-#: ../libpurple/dnsquery.c:827 ../libpurple/protocols/oscar/oscar.c:1122
+#: ../libpurple/dnsquery.c:825 ../libpurple/protocols/oscar/oscar.c:1124
 #: ../libpurple/protocols/oscar/util.c:69
 msgid "Unknown reason"
 msgstr "མ་ཤེས་པའི་རྒྱུ་མཚན།"
 
-#: ../libpurple/dnsquery.c:901
+#: ../libpurple/dnsquery.c:899
 msgid "Aborting DNS lookup in Tor Proxy mode."
 msgstr ""
 
@@ -2889,70 +2886,70 @@
 msgid "%s is offering to send file %s"
 msgstr "%sའདི་གིས་ཡིག་སྣོད་%sགཏང་ནིའི་དང་ལེན་འབདཝ་མས།"
 
-#: ../libpurple/ft.c:663
+#: ../libpurple/ft.c:661
 #, c-format
 msgid "%s is not a valid filename.\n"
 msgstr "%sའདི་ནུས་ཅན་གྱི་ཡིག་སྣོད་མིང་མེན།\n"
 
-#: ../libpurple/ft.c:690
+#: ../libpurple/ft.c:688
 #, c-format
 msgid "Offering to send %s to %s"
 msgstr "%s འདི་ %s ལུ་གཏང་ནི་དང་ལེན་འབདཝ་ཨིན།"
 
-#: ../libpurple/ft.c:701
+#: ../libpurple/ft.c:699
 #, c-format
 msgid "Starting transfer of %s from %s"
 msgstr "%s ལས་  %s གི་ གནས་སོར་འགོ་བཙུགས་དོ།"
 
-#: ../libpurple/ft.c:889
+#: ../libpurple/ft.c:887
 #, c-format
 msgid "Transfer of file <A HREF=\"file://%s\">%s</A> complete"
 msgstr ""
 
-#: ../libpurple/ft.c:894
+#: ../libpurple/ft.c:892
 #, c-format
 msgid "Transfer of file %s complete"
 msgstr "མཇུག་བསྡུའི་ཡིག་སྣོད་%sཀྱི་གནས་སོར།"
 
-#: ../libpurple/ft.c:899
+#: ../libpurple/ft.c:897
 msgid "File transfer complete"
 msgstr "ཡིག་སྣོད་གནས་སོར་མཇུག་བསྡུ།"
 
-#: ../libpurple/ft.c:1518
+#: ../libpurple/ft.c:1511
 #, c-format
 msgid "You cancelled the transfer of %s"
 msgstr ""
 
-#: ../libpurple/ft.c:1523
+#: ../libpurple/ft.c:1516
 msgid "File transfer cancelled"
 msgstr "ཡིག་སྣོད་གནས་སོར་འདི་ཆ་མེད་བཏང་ནུག"
 
-#: ../libpurple/ft.c:1581
+#: ../libpurple/ft.c:1574
 #, c-format
 msgid "%s cancelled the transfer of %s"
 msgstr ""
 
-#: ../libpurple/ft.c:1586
+#: ../libpurple/ft.c:1579
 #, c-format
 msgid "%s cancelled the file transfer"
 msgstr ""
 
-#: ../libpurple/ft.c:1643
+#: ../libpurple/ft.c:1636
 #, c-format
 msgid "File transfer to %s failed."
 msgstr "%s ལུ་ ཡིག་སྣོད་གནས་སོར་འདི་ འཐུས་ཤོར་བྱུང་ཡོདཔ།"
 
-#: ../libpurple/ft.c:1645
+#: ../libpurple/ft.c:1638
 #, c-format
 msgid "File transfer from %s failed."
 msgstr "%s ལས་ཡིག་སྣོད་གནས་སོར་འདི་ འཐུས་ཤོར་བྱུང་ཡོདཔ།"
 
-#: ../libpurple/data/gconf/purple.schemas.in.h:1
+#: ../libpurple/gconf/purple.schemas.in.h:1
 msgid "Whether the specified command should handle \"aim\" URLs"
 msgstr ""
 "གསལ་བཀོད་འབད་ཡོད་པའི་བརྡ་བཀོད་ཀྱིས་ \"aim\" ཡུ་ཨར་ཨེལ་ཚུ་ལེགས་སྐྱོང་འཐབ་རུང་ག"
 
-#: ../libpurple/data/gconf/purple.schemas.in.h:2
+#: ../libpurple/gconf/purple.schemas.in.h:2
 msgid ""
 "True if the command specified in the \"command\" key should handle \"aim\" "
 "URLs."
@@ -2960,21 +2957,21 @@
 "\"command\" ལྡེ་མིག་ནང་གསལ་བཀོད་འབད་ཡོད་པའི་བརྡ་བཀོད་ཀྱིས་ \"aim\" "
 "ཡུ་ཨར་ཨེལ་ཚུ་ལེགས་སྐྱོང་འཐབ་དགོཔ་ཨིན་པ་ཅིན་བདེན།"
 
-#: ../libpurple/data/gconf/purple.schemas.in.h:3
+#: ../libpurple/gconf/purple.schemas.in.h:3
 msgid "The handler for \"aim\" URLs"
 msgstr "\"aim\" ཡུ་ཨར་ཨེལ་ཚུའི་དོན་ལུ་ལེགས་སྐྱོང་པ།"
 
-#: ../libpurple/data/gconf/purple.schemas.in.h:4
+#: ../libpurple/gconf/purple.schemas.in.h:4
 msgid "The command used to handle \"aim\" URLs, if enabled."
 msgstr ""
 "ལྕོགས་ཅན་བཟོ་སྟེ་ཡོད་པ་ཅིན་ \"aim\" "
 "ཡུ་ཨར་ཨེལ་ཚུ་ལེགས་སྐྱོང་འཐབ་ནིའི་དོན་ལུ་ལག་ལེན་འཐབ་ཡོད་པའི་བརྡ་བཀོད།"
 
-#: ../libpurple/data/gconf/purple.schemas.in.h:5
+#: ../libpurple/gconf/purple.schemas.in.h:5
 msgid "Run the command in a terminal"
 msgstr "ཊར་མི་ནཱལ་ནང་བརྡ་བཀོད་གཡོག་བཀོལ།"
 
-#: ../libpurple/data/gconf/purple.schemas.in.h:6
+#: ../libpurple/gconf/purple.schemas.in.h:6
 msgid ""
 "True if the command used to handle this type of URL should be run in a "
 "terminal."
@@ -2982,12 +2979,12 @@
 "འ་ནི་དབྱེ་བའི་ཡུ་ཨར་ཨེལ་ལེགས་སྐྱོང་འཐབ་ནིའི་དོན་ལུ་ལག་ལེན་འཐབ་ཡོད་པའི་བརྡ་བཀོ"
 "ད་འདི་ཊར་མི་ནཱལ་ནང་གཡོག་བཀོལ་འབད་དགོཔ་ཨིན་པ་ཅིན་བདེན།"
 
-#: ../libpurple/data/gconf/purple.schemas.in.h:7
+#: ../libpurple/gconf/purple.schemas.in.h:7
 msgid "Whether the specified command should handle \"gg\" URLs"
 msgstr ""
 "གསལ་བཀོད་འབད་ཡོད་པའི་བརྡ་བཀོད་ཀྱིས་ \"gg\" ཡུ་ཨར་ཨེལ་ཚུ་ལེགས་སྐྱོང་འཐབ་རུང་ག"
 
-#: ../libpurple/data/gconf/purple.schemas.in.h:8
+#: ../libpurple/gconf/purple.schemas.in.h:8
 msgid ""
 "True if the command specified in the \"command\" key should handle \"gg\" "
 "URLs."
@@ -2995,22 +2992,22 @@
 "\"command\" ལྡེ་མིག་ནང་གསལ་བཀོད་འབད་ཡོད་པའི་བརྡ་བཀོད་ཀྱིས་ \"gg\" "
 "ཡུ་ཨར་ཨེལ་ཚུ་ལེགས་སྐྱོང་འཐབ་དགོཔ་ཨིན་པ་ཅིན་བདེན།"
 
-#: ../libpurple/data/gconf/purple.schemas.in.h:9
+#: ../libpurple/gconf/purple.schemas.in.h:9
 msgid "The handler for \"gg\" URLs"
 msgstr "\"gg\" ཡུ་ཨར་ཨེལ་ཚུའི་དོན་ལུ་ ལེགས་སྐྱོང་པ།"
 
-#: ../libpurple/data/gconf/purple.schemas.in.h:10
+#: ../libpurple/gconf/purple.schemas.in.h:10
 msgid "The command used to handle \"gg\" URLs, if enabled."
 msgstr ""
 "ལྕོགས་ཅན་བཟོ་སྟེ་ཡོད་པ་ཅིན་ \"gg\" "
 "ཡུ་ཨར་ཨེལ་ཚུ་ལེགས་སྐྱོང་འཐབ་ནིའི་དོན་ལུ་ལག་ལེན་འཐབ་ཡོད་པའི་བརྡ་བཀོད།"
 
-#: ../libpurple/data/gconf/purple.schemas.in.h:11
+#: ../libpurple/gconf/purple.schemas.in.h:11
 msgid "Whether the specified command should handle \"icq\" URLs"
 msgstr ""
 "གསལ་བཀོད་འབད་ཡོད་པའི་བརྡ་བཀོད་ཀྱིས་ \"icq\" ཡུ་ཨར་ཨེལ་ཚུ་ལེགས་སྐྱོང་འཐབ་རུང་ག"
 
-#: ../libpurple/data/gconf/purple.schemas.in.h:12
+#: ../libpurple/gconf/purple.schemas.in.h:12
 msgid ""
 "True if the command specified in the \"command\" key should handle \"icq\" "
 "URLs."
@@ -3018,22 +3015,22 @@
 "\"command\" ལྡེ་མིག་ནང་གསལ་བཀོད་འབད་ཡོད་པའི་བརྡ་བཀོད་ཀྱིས་ \"icq\" "
 "ཡུ་ཨར་ཨེལ་ཚུ་ལེགས་སྐྱོང་འཐབ་དགོཔ་ཨིན་པ་ཅིན་བདེན།"
 
-#: ../libpurple/data/gconf/purple.schemas.in.h:13
+#: ../libpurple/gconf/purple.schemas.in.h:13
 msgid "The handler for \"icq\" URLs"
 msgstr "\"icq\" ཡུ་ཨར་ཨེལ་ཚུའི་དོན་ལུ་ལེགས་སྐྱོང་པ།"
 
-#: ../libpurple/data/gconf/purple.schemas.in.h:14
+#: ../libpurple/gconf/purple.schemas.in.h:14
 msgid "The command used to handle \"icq\" URLs, if enabled."
 msgstr ""
 "ལྕོགས་ཅན་བཟོ་སྟེ་ཡོད་པ་ཅིན་ \"icq\" ཡུ་ཨར་ཨེལ་ཚུ་ལེགས་སྐྱོང་འཐབ་ནིའི་དོན་ལུ་ "
 "ལག་ལེན་འཐབ་ཡོད་པའི་བརྡ་བཀོད།"
 
-#: ../libpurple/data/gconf/purple.schemas.in.h:15
+#: ../libpurple/gconf/purple.schemas.in.h:15
 msgid "Whether the specified command should handle \"irc\" URLs"
 msgstr ""
 "གསལ་བཀོད་འབད་ཡད་པའི་བརྡ་བཀོད་ཀྱིས་ \"irc\" ཡུ་ཨར་ཨེལ་ཚུ་ལེགས་སྐྱོང་འཐབ་རུང་ག"
 
-#: ../libpurple/data/gconf/purple.schemas.in.h:16
+#: ../libpurple/gconf/purple.schemas.in.h:16
 msgid ""
 "True if the command specified in the \"command\" key should handle \"irc\" "
 "URLs."
@@ -3041,23 +3038,23 @@
 "\"command\" ལྡེ་མིག་ནང་གསལ་བཀོད་འབད་ཡོད་པའི་བརྡ་བཀོད་ཀྱིས་ \"irc\" "
 "ཡུ་ཨར་ཨེལ་ཚུ་ལེགས་སྐྱོང་འཐབ་དགོ་པ་ཅིན་བདེན།"
 
-#: ../libpurple/data/gconf/purple.schemas.in.h:17
+#: ../libpurple/gconf/purple.schemas.in.h:17
 msgid "The handler for \"irc\" URLs"
 msgstr "\"irc\" ཡུ་ཨར་ཨེལ་ཚུའི་དོན་ལུ་ལེགས་སྐྱོང་པ།"
 
-#: ../libpurple/data/gconf/purple.schemas.in.h:18
+#: ../libpurple/gconf/purple.schemas.in.h:18
 msgid "The command used to handle \"irc\" URLs, if enabled."
 msgstr ""
 "ལྕོགས་ཅན་བཟོ་སྟེ་ཡོད་པ་ཅིན་ \"irc\" "
 "ཡུ་ཨར་ཨེལ་ཚུ་ལེགས་སྐྱོང་འཐབ་ནིའི་དོན་ལུ་ལག་ལེན་འཐབ་ཡོད་པའི་བརྡ་བཀོད།"
 
-#: ../libpurple/data/gconf/purple.schemas.in.h:19
+#: ../libpurple/gconf/purple.schemas.in.h:19
 msgid "Whether the specified command should handle \"msnim\" URLs"
 msgstr ""
 "གསལ་བཀོད་འབད་ཡོད་པའི་བརྡ་བཀོད་ཀྱིས་ \"msnim\" "
 "ཡུ་ཨར་ཨེལ་ཚུ་ལེགས་སྐྱོང་འཐབ་རུང་ག"
 
-#: ../libpurple/data/gconf/purple.schemas.in.h:20
+#: ../libpurple/gconf/purple.schemas.in.h:20
 msgid ""
 "True if the command specified in the \"command\" key should handle \"msnim\" "
 "URLs."
@@ -3065,22 +3062,22 @@
 "\"command\" ལྡེ་མིག་ནང་ གསལ་བཀོད་འབད་ཡོད་པའི་བརྡ་བཀོད་ཀྱིས་ \"msnim\" "
 "ཡུ་ཨར་ཨེལ་ཚུ་ལེགས་སྐྱོང་འཐབ་དགོ་པ་ཅིན་བདེན།"
 
-#: ../libpurple/data/gconf/purple.schemas.in.h:21
+#: ../libpurple/gconf/purple.schemas.in.h:21
 msgid "The handler for \"msnim\" URLs"
 msgstr "\"msnim\" ཡུ་ཨར་ཨེལ་ཚུའི་དོན་ལུ་ ལེགས་སྐྱོང་པ།"
 
-#: ../libpurple/data/gconf/purple.schemas.in.h:22
+#: ../libpurple/gconf/purple.schemas.in.h:22
 msgid "The command used to handle \"msnim\" URLs, if enabled."
 msgstr ""
 "ལྕོགས་ཅན་བཟོ་སྟེ་ཡོད་པ་ཅིན་ \"msnim\" "
 "ཡུ་ཨར་ཨེལ་ཚུ་ལེགས་སྐྱོང་འཐབ་ནིའི་དོན་ལུ་ ལག་ལེན་འཐབ་ཡོད་པའི་བརྡ་བཀོད།"
 
-#: ../libpurple/data/gconf/purple.schemas.in.h:23
+#: ../libpurple/gconf/purple.schemas.in.h:23
 msgid "Whether the specified command should handle \"sip\" URLs"
 msgstr ""
 "གསལ་བཀོད་འབད་ཡོད་པའི་བརྡ་བཀོད་ཀྱིས་ \"sip\" ཡུ་ཨར་ཨེལ་ཚུ་ལེགས་སྐྱོང་འཐབ་རུང་ག"
 
-#: ../libpurple/data/gconf/purple.schemas.in.h:24
+#: ../libpurple/gconf/purple.schemas.in.h:24
 msgid ""
 "True if the command specified in the \"command\" key should handle \"sip\" "
 "URLs."
@@ -3088,23 +3085,23 @@
 "\"command\" ལྡེ་མིག་ནང་ གསལ་བཀོད་འབད་ཡོད་པའི་བརྡ་བཀོད་ཀྱིས་ \"sip\" "
 "ཡུ་ཨར་ཨེལ་ཚུ་ལེགས་སྐྱོང་འཐབ་དགོ་པ་ཅིན་བདེན།"
 
-#: ../libpurple/data/gconf/purple.schemas.in.h:25
+#: ../libpurple/gconf/purple.schemas.in.h:25
 msgid "The handler for \"sip\" URLs"
 msgstr "\"sip\" ཡུ་ཨར་ཨེལ་ཚུའི་དོན་ལུ་ལེགས་སྐྱོང་པ།"
 
-#: ../libpurple/data/gconf/purple.schemas.in.h:26
+#: ../libpurple/gconf/purple.schemas.in.h:26
 msgid "The command used to handle \"sip\" URLs, if enabled."
 msgstr ""
 "ལྕོགས་ཅན་བཟོ་སྟེ་ཡོད་པ་ཅིན་ \"sip\" ཡུ་ཨར་ཨེལ་ཚུ་ལེགས་སྐྱོང་འཐབ་ནིའི་དོན་ལུ་ "
 "ལག་ལེན་འཐབ་ཡོད་པའི་བརྡ་བཀོད།"
 
-#: ../libpurple/data/gconf/purple.schemas.in.h:27
+#: ../libpurple/gconf/purple.schemas.in.h:27
 msgid "Whether the specified command should handle \"xmpp\" URLs"
 msgstr ""
 "གསལ་བཀོད་འབད་ཡོད་པའི་བརྡ་བཀོད་ཀྱིས་ \"xmpp\" ཡུ་ཨར་ཨེལ་ཚུ་ "
 "ལེགས་སྐྱོང་འཐབ་རུང་ག"
 
-#: ../libpurple/data/gconf/purple.schemas.in.h:28
+#: ../libpurple/gconf/purple.schemas.in.h:28
 msgid ""
 "True if the command specified in the \"command\" key should handle \"xmpp\" "
 "URLs."
@@ -3112,23 +3109,23 @@
 "\"command\" ལྡེ་མིག་ནང་ གསལ་བཀོད་འབད་ཡོད་པའི་བརྡ་བཀོད་ཀྱིས་ \"xmpp\" "
 "ཡུ་ཨར་ཨེལ་ཚུ་ལེགས་སྐྱོང་འཐབ་དགོ་པ་ཅིན་བདེན།"
 
-#: ../libpurple/data/gconf/purple.schemas.in.h:29
+#: ../libpurple/gconf/purple.schemas.in.h:29
 msgid "The handler for \"xmpp\" URLs"
 msgstr "\"xmpp\" ཡུ་ཨར་ཨེལ་ཚུའི་དོན་ལུ་ལེགས་སྐྱོང་པ།"
 
-#: ../libpurple/data/gconf/purple.schemas.in.h:30
+#: ../libpurple/gconf/purple.schemas.in.h:30
 msgid "The command used to handle \"xmpp\" URLs, if enabled."
 msgstr ""
 "ལྕོགས་ཅན་བཟོ་སྟེ་ཡོད་པ་ཅིན་ \"xmpp\" "
 "ཡུ་ཨར་ཨེལ་ཚུ་ལེགས་སྐྱོང་འཐབ་ནིའི་དོན་ལུ་ལག་ལེན་འཐབ་ཡོད་པའི་བརྡ་བཀོད།"
 
-#: ../libpurple/data/gconf/purple.schemas.in.h:31
+#: ../libpurple/gconf/purple.schemas.in.h:31
 msgid "Whether the specified command should handle \"ymsgr\" URLs"
 msgstr ""
 "གསལ་བཀོད་འབད་ཡོད་པའི་ བརྡ་བཀོད་ཀྱིས་ \"ymsgr\" ཡུ་ཨར་ཨེལ་ཚུ་ "
 "ལེགས་སྐྱོང་འཐབ་རུང་ག"
 
-#: ../libpurple/data/gconf/purple.schemas.in.h:32
+#: ../libpurple/gconf/purple.schemas.in.h:32
 msgid ""
 "True if the command specified in the \"command\" key should handle \"ymsgr\" "
 "URLs."
@@ -3136,11 +3133,11 @@
 "\"command\" ལྡེ་མིག་ནང་གསལ་བཀོད་འབད་ཡོད་པའི་བརྡ་བཀོད་ཀྱིས་ \"ymsgr\" "
 "ཡུ་ཨར་ཨེལ་ཚུ་ལེགས་སྐྱོང་འཐབ་དགོཔ་ཨིན་པ་ཅིན་བདེན།"
 
-#: ../libpurple/data/gconf/purple.schemas.in.h:33
+#: ../libpurple/gconf/purple.schemas.in.h:33
 msgid "The handler for \"ymsgr\" URLs"
 msgstr "\"ymsgr\" ཡུ་ཨར་ཨེལ་ཚུའི་དོན་ལུ་ ལེགས་སྐྱོང་པ།"
 
-#: ../libpurple/data/gconf/purple.schemas.in.h:34
+#: ../libpurple/gconf/purple.schemas.in.h:34
 msgid "The command used to handle \"ymsgr\" URLs, if enabled."
 msgstr ""
 "ལྕོགས་ཅན་བཟོ་ཡོད་པ་ཅིན་ \"ymsgr\" "
@@ -3203,38 +3200,38 @@
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <རང་བཞིན-ལན>: %s\n"
 
-#: ../libpurple/media/backend-fs2.c:1019
+#: ../libpurple/media/backend-fs2.c:880
 msgid ""
 "No codecs found. Install some GStreamer codecs found in GStreamer plugins "
 "packages."
 msgstr ""
 
-#: ../libpurple/media/backend-fs2.c:1028
+#: ../libpurple/media/backend-fs2.c:889
 msgid ""
 "No codecs left. Your codec preferences in fs-codecs.conf are too strict."
 msgstr ""
 
-#: ../libpurple/media/backend-fs2.c:1062
+#: ../libpurple/media/backend-fs2.c:919
 msgid "A non-recoverable Farsight2 error has occurred."
 msgstr ""
 
-#: ../libpurple/media/backend-fs2.c:1065
+#: ../libpurple/media/backend-fs2.c:922
 msgid "A non-recoverable Farstream error has occurred."
 msgstr ""
 
-#: ../libpurple/media/backend-fs2.c:1331
+#: ../libpurple/media/backend-fs2.c:1191
 msgid "Error with your microphone"
 msgstr ""
 
-#: ../libpurple/media/backend-fs2.c:1334
+#: ../libpurple/media/backend-fs2.c:1194
 msgid "Error with your webcam"
 msgstr ""
 
-#: ../libpurple/media/backend-fs2.c:1341
+#: ../libpurple/media/backend-fs2.c:1201
 msgid "Conference error"
 msgstr ""
 
-#: ../libpurple/media/backend-fs2.c:1757
+#: ../libpurple/media/backend-fs2.c:1610
 #, c-format
 msgid "Error creating session: %s"
 msgstr ""
@@ -3324,11 +3321,11 @@
 #: ../libpurple/plugins/idle.c:200 ../libpurple/plugins/idle.c:226
 #: ../libpurple/protocols/mxit/actions.c:502
 #: ../libpurple/protocols/oscar/authorization.c:99
-#: ../libpurple/protocols/oscar/oscar.c:1222
-#: ../libpurple/protocols/oscar/oscar.c:4932
-#: ../libpurple/protocols/oscar/oscar.c:4989
-#: ../libpurple/protocols/oscar/oscar.c:5272
-#: ../libpurple/protocols/oscar/oscar.c:5329 ../libpurple/request.h:1498
+#: ../libpurple/protocols/oscar/oscar.c:1224
+#: ../libpurple/protocols/oscar/oscar.c:4937
+#: ../libpurple/protocols/oscar/oscar.c:4994
+#: ../libpurple/protocols/oscar/oscar.c:5277
+#: ../libpurple/protocols/oscar/oscar.c:5334 ../libpurple/request.h:1498
 #: ../libpurple/request.h:1508 ../libpurple/request.h:1521
 msgid "_Cancel"
 msgstr "ཆ་མེད་གཏང་།(_C)"
@@ -3376,8 +3373,8 @@
 msgid "Escape the filenames"
 msgstr ""
 
-#: ../libpurple/plugins/buddynote.c:46 ../libpurple/protocols/msn/msn.c:2486
-#: ../libpurple/protocols/msn/msn.c:2516
+#: ../libpurple/plugins/buddynote.c:46 ../libpurple/protocols/msn/msn.c:2487
+#: ../libpurple/protocols/msn/msn.c:2517
 msgid "Notes"
 msgstr "དྲན་འཛིན་ཚུ།"
 
@@ -3614,30 +3611,30 @@
 msgid "(UTC)"
 msgstr ""
 
-#: ../libpurple/plugins/log_reader.c:1567
+#: ../libpurple/plugins/log_reader.c:1561
 msgid "User is offline."
 msgstr "ལག་ལེན་པ་འདི་ གློག་ཐོག་མིན་འདུག"
 
-#: ../libpurple/plugins/log_reader.c:1573
+#: ../libpurple/plugins/log_reader.c:1567
 msgid "Auto-response sent:"
 msgstr "རང་བཞིན་-ལག་འདི་ བཏང་ཡོདཔ།:"
 
-#: ../libpurple/plugins/log_reader.c:1588
-#: ../libpurple/plugins/log_reader.c:1591
+#: ../libpurple/plugins/log_reader.c:1582
+#: ../libpurple/plugins/log_reader.c:1585
 #: ../libpurple/plugins/statenotify.c:93
 #, c-format
 msgid "%s has signed off."
 msgstr "%s གིས་ འཐོན་ཡོདཔ།"
 
-#: ../libpurple/plugins/log_reader.c:1612
+#: ../libpurple/plugins/log_reader.c:1606
 msgid "One or more messages may have been undeliverable."
 msgstr "འཕྲིན་དོན་གཅིག་ཡང་ན་མངམ་ཚུ་ འགྲེམ་སྤེལ་མ་འབད་བས།"
 
-#: ../libpurple/plugins/log_reader.c:1622
+#: ../libpurple/plugins/log_reader.c:1616
 msgid "You were disconnected from the server."
 msgstr "ཁྱོད་ སར་བར་ལས་མཐུད་ལམ་བཏོག་ད་ནུག"
 
-#: ../libpurple/plugins/log_reader.c:1630
+#: ../libpurple/plugins/log_reader.c:1624
 msgid ""
 "You are currently disconnected. Messages will not be received unless you are "
 "logged in."
@@ -3645,85 +3642,85 @@
 "ཁྱོད་ ད་ལྟོ་མཐུད་ལམ་བཏོག་སྟེ་ཡོད། ཁྱོད་ "
 "ནང་བསྐྱོད་མ་འབད་ཚུན་འཕྲིན་དོན་ཚུ་ཐོབ་མི་ཚུགས།"
 
-#: ../libpurple/plugins/log_reader.c:1645
+#: ../libpurple/plugins/log_reader.c:1639
 msgid "Message could not be sent because the maximum length was exceeded."
 msgstr "རིང་ཚད་མང་མཐའ་འདི་ལྷག་ཡོདཔ་ལས་བརྟེན་ འཕྲིན་དོན་འདི་གཏང་མ་ཚུགས།"
 
-#: ../libpurple/plugins/log_reader.c:1650
+#: ../libpurple/plugins/log_reader.c:1644
 msgid "Message could not be sent."
 msgstr "འཕྲིན་དོན་འདི་ གཏང་མ་ཚུགསཔ།"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2751
-#: ../libpurple/plugins/log_reader.c:2907
+#: ../libpurple/plugins/log_reader.c:2726
+#: ../libpurple/plugins/log_reader.c:2882
 msgid "Adium"
 msgstr "ཨེ་ཌིཡམ།"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2764
-#: ../libpurple/plugins/log_reader.c:2912
+#: ../libpurple/plugins/log_reader.c:2739
+#: ../libpurple/plugins/log_reader.c:2887
 msgid "Fire"
 msgstr "མེ།"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2776
-#: ../libpurple/plugins/log_reader.c:2916
+#: ../libpurple/plugins/log_reader.c:2751
+#: ../libpurple/plugins/log_reader.c:2891
 msgid "Messenger Plus!"
 msgstr "འཕྲིན་སྐྱེལ་པ་ ཁ་སྐོང་།!"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2790
-#: ../libpurple/plugins/log_reader.c:2921
+#: ../libpurple/plugins/log_reader.c:2765
+#: ../libpurple/plugins/log_reader.c:2896
 msgid "QIP"
 msgstr ""
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2802
-#: ../libpurple/plugins/log_reader.c:2925
+#: ../libpurple/plugins/log_reader.c:2777
+#: ../libpurple/plugins/log_reader.c:2900
 msgid "MSN Messenger"
 msgstr "ཨེམ་ཨེསི་ཨེན་ འཕྲིན་སྐྱེལ་པ།"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2814
-#: ../libpurple/plugins/log_reader.c:2929
+#: ../libpurple/plugins/log_reader.c:2789
+#: ../libpurple/plugins/log_reader.c:2904
 msgid "Trillian"
 msgstr "ཊིརི་ལིཡན།"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2826
-#: ../libpurple/plugins/log_reader.c:2933
+#: ../libpurple/plugins/log_reader.c:2801
+#: ../libpurple/plugins/log_reader.c:2908
 msgid "aMSN"
 msgstr ""
 
 #. Add general preferences.
-#: ../libpurple/plugins/log_reader.c:2889
+#: ../libpurple/plugins/log_reader.c:2864
 msgid "General Log Reading Configuration"
 msgstr "ཡོངས་ཁྱབ་ལོག་ལྷག་བྱེད་རིམ་སྒྲིག"
 
-#: ../libpurple/plugins/log_reader.c:2893
+#: ../libpurple/plugins/log_reader.c:2868
 msgid "Fast size calculations"
 msgstr "ཚད་རྩིས་ལས་མགྱོགས་དྲགས།"
 
-#: ../libpurple/plugins/log_reader.c:2897
+#: ../libpurple/plugins/log_reader.c:2872
 msgid "Use name heuristics"
 msgstr "ཧིའུ་རིསི་ཊིཀ་མིང་ལག་ལེན་འཐབ།"
 
 #. Add Log Directory preferences.
-#: ../libpurple/plugins/log_reader.c:2903
+#: ../libpurple/plugins/log_reader.c:2878
 msgid "Log Directory"
 msgstr "ལོག་ སྣོད་ཐོ།"
 
@@ -3733,21 +3730,21 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/log_reader.c:2962
+#: ../libpurple/plugins/log_reader.c:2937
 msgid "Log Reader"
 msgstr "ལོག་ ལྷག་བྱེད།"
 
 #. *< name
 #. *< version
 #. * summary
-#: ../libpurple/plugins/log_reader.c:2966
+#: ../libpurple/plugins/log_reader.c:2941
 msgid "Includes other IM clients' logs in the log viewer."
 msgstr ""
 "ཨའི་ཨེམ་ཞབས་ཏོག་སྤྱོད་མི་གཞན་མི་ཚུ་གྲངས་སུ་བཙུགས་ཏེ་ "
 "ལོག་མཐོན་བྱེད་ནང་དྲན་དེབ་བཀོདཔ་ཨིན།"
 
 #. * description
-#: ../libpurple/plugins/log_reader.c:2970
+#: ../libpurple/plugins/log_reader.c:2945
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
 "Currently, this includes Adium, MSN Messenger, aMSN, and Trillian.\n"
@@ -3833,7 +3830,7 @@
 #: ../libpurple/protocols/msn/msn.c:1123 ../libpurple/protocols/msn/msn.c:1126
 #: ../libpurple/protocols/novell/novell.c:1929
 #: ../libpurple/protocols/silc/buddy.c:318
-#: ../libpurple/protocols/silc/pk.c:114 ../libpurple/protocols/silc/wb.c:307
+#: ../libpurple/protocols/silc/pk.c:114 ../libpurple/protocols/silc/wb.c:309
 #: ../libpurple/protocols/silc10/buddy.c:314
 #: ../libpurple/protocols/silc10/pk.c:119
 #: ../libpurple/protocols/silc10/wb.c:307 ../pidgin/gtkrequest.c:298
@@ -3845,7 +3842,7 @@
 #: ../libpurple/protocols/msn/msn.c:1123 ../libpurple/protocols/msn/msn.c:1126
 #: ../libpurple/protocols/novell/novell.c:1930
 #: ../libpurple/protocols/silc/buddy.c:319
-#: ../libpurple/protocols/silc/pk.c:115 ../libpurple/protocols/silc/wb.c:308
+#: ../libpurple/protocols/silc/pk.c:115 ../libpurple/protocols/silc/wb.c:310
 #: ../libpurple/protocols/silc10/buddy.c:315
 #: ../libpurple/protocols/silc10/pk.c:120
 #: ../libpurple/protocols/silc10/wb.c:308 ../pidgin/gtkrequest.c:299
@@ -3895,14 +3892,14 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/perl/perl.c:674
+#: ../libpurple/plugins/perl/perl.c:671
 msgid "Perl Plugin Loader"
 msgstr "པརཱལ་པ་ལག་ཨིན་མངོན་གསལ་འབད་མི།"
 
 #. *< name
 #. *< version
 #. *< summary
-#: ../libpurple/plugins/perl/perl.c:676 ../libpurple/plugins/perl/perl.c:677
+#: ../libpurple/plugins/perl/perl.c:673 ../libpurple/plugins/perl/perl.c:674
 msgid "Provides support for loading perl plugins."
 msgstr "པརཱལ་པ་ལག་ཨིན་མངོན་གསལ་འབད་ནིའི་དོན་ལུ་རྒྱབ་སྐྱོར་བྱིནམ་ཨིན།"
 
@@ -3979,8 +3976,8 @@
 "ཅ་ཆས་མང་ཤོས་ ལཱ་ཚུལ་ལྡན་སྦེ་ འབད་དོ་ག་བལྟ་ནིའི་དོན་ལུ་བརྟག་ཞིབའབདཝ་ཨིན།"
 
 #. Scheme name
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:1232
-#: ../libpurple/plugins/ssl/ssl-nss.c:1199
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:1183
+#: ../libpurple/plugins/ssl/ssl-nss.c:1032
 msgid "X.509 Certificates"
 msgstr ""
 
@@ -3990,7 +3987,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:1308
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:1259
 msgid "GNUTLS"
 msgstr "ཇིཨེན་ཡུ་ཊི་ཨེལ་ཨེསི།"
 
@@ -3998,8 +3995,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:1311
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:1313
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:1262
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:1264
 msgid "Provides SSL support through GNUTLS."
 msgstr ""
 "ཇི་ཨེན་ཡུ་ཊི་ཨེལ་ཨེསི་ལས་བརྒྱུད་དེ་ ཨེསི་ཨེསི་ཨེལ་རྒྱབ་སྐྱོར་བྱིནམ་ཨིན།"
@@ -4010,7 +4007,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ssl/ssl-nss.c:1275
+#: ../libpurple/plugins/ssl/ssl-nss.c:1108
 msgid "NSS"
 msgstr "ཨེན་ཨེསི་ཨེསི།"
 
@@ -4018,8 +4015,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/ssl/ssl-nss.c:1278
-#: ../libpurple/plugins/ssl/ssl-nss.c:1280
+#: ../libpurple/plugins/ssl/ssl-nss.c:1111
+#: ../libpurple/plugins/ssl/ssl-nss.c:1113
 msgid "Provides SSL support through Mozilla NSS."
 msgstr ""
 "མོ་ཛིལ་ལ་ཨེན་ཨེསི་ཨེསི་ལས་བརྒྱུད་དེ་ ཨེསི་ཨེསི་ཨེལ་རྒྱབ་སྐྱོར་བྱིནམ་ཨིན།"
@@ -4142,14 +4139,14 @@
 #: ../libpurple/protocols/bonjour/bonjour.c:386
 #: ../libpurple/protocols/bonjour/bonjour.c:736
 #: ../libpurple/protocols/gg/gg.c:302
-#: ../libpurple/protocols/jabber/jabber.c:1330
+#: ../libpurple/protocols/jabber/jabber.c:1322
 msgid "First name"
 msgstr "མགོ་མིང་།"
 
 #: ../libpurple/protocols/bonjour/bonjour.c:388
 #: ../libpurple/protocols/bonjour/bonjour.c:739
 #: ../libpurple/protocols/gg/gg.c:297
-#: ../libpurple/protocols/jabber/jabber.c:1331
+#: ../libpurple/protocols/jabber/jabber.c:1323
 msgid "Last name"
 msgstr "མཇུག་མིང་།"
 
@@ -4160,12 +4157,12 @@
 #: ../libpurple/protocols/jabber/buddy.c:1127
 #: ../libpurple/protocols/jabber/buddy.c:1140
 #: ../libpurple/protocols/jabber/buddy.c:2006
-#: ../libpurple/protocols/jabber/jabber.c:1328
+#: ../libpurple/protocols/jabber/jabber.c:1320
 #: ../libpurple/protocols/mxit/actions.c:294
-#: ../libpurple/protocols/silc/ops.c:1053
+#: ../libpurple/protocols/silc/ops.c:1054
 #: ../libpurple/protocols/silc/silc.c:1010
 #: ../libpurple/protocols/silc/silc.c:1251
-#: ../libpurple/protocols/silc/util.c:511
+#: ../libpurple/protocols/silc/util.c:562
 #: ../libpurple/protocols/silc10/ops.c:1075
 #: ../libpurple/protocols/silc10/silc.c:706
 #: ../libpurple/protocols/silc10/silc.c:947
@@ -4212,16 +4209,16 @@
 msgid "Bonjour"
 msgstr "བཱོན་ཇོར།"
 
-#: ../libpurple/protocols/bonjour/jabber.c:401
+#: ../libpurple/protocols/bonjour/jabber.c:398
 #, c-format
 msgid "%s has closed the conversation."
 msgstr "%s གིས་ གྲོས་གླེང་ཁ་བསྡམས་ཡོདཔ།"
 
-#: ../libpurple/protocols/bonjour/jabber.c:491
-#: ../libpurple/protocols/bonjour/jabber.c:556
-#: ../libpurple/protocols/bonjour/jabber.c:601
-#: ../libpurple/protocols/bonjour/jabber.c:874
-#: ../libpurple/protocols/bonjour/jabber.c:895
+#: ../libpurple/protocols/bonjour/jabber.c:488
+#: ../libpurple/protocols/bonjour/jabber.c:553
+#: ../libpurple/protocols/bonjour/jabber.c:598
+#: ../libpurple/protocols/bonjour/jabber.c:875
+#: ../libpurple/protocols/bonjour/jabber.c:896
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr "འཕྲིན་དོན་འདི་གཏང་མ་ཚུགས་ གྲོས་གླེང་འདི་འགོ་བཙུགས་མ་ཚུགས།"
 
@@ -4229,13 +4226,13 @@
 msgid "Error communicating with local mDNSResponder."
 msgstr ""
 
-#: ../libpurple/protocols/gg/gg.c:96 ../libpurple/proxy.c:2330
-#: ../libpurple/proxy.c:2398
+#: ../libpurple/protocols/gg/gg.c:96 ../libpurple/proxy.c:2359
+#: ../libpurple/proxy.c:2427
 msgid "Invalid proxy settings"
 msgstr "ནུས་མེད་ཀྱི་ པོ་རོགསི་ གཞི་སྒྲིག་ཚུ།"
 
-#: ../libpurple/protocols/gg/gg.c:97 ../libpurple/proxy.c:2330
-#: ../libpurple/proxy.c:2398
+#: ../libpurple/protocols/gg/gg.c:97 ../libpurple/proxy.c:2359
+#: ../libpurple/proxy.c:2427
 msgid ""
 "Either the host name or port number specified for your given proxy type is "
 "invalid."
@@ -4278,15 +4275,15 @@
 msgid "Save buddylist..."
 msgstr "ཆ་རོགས་ཐོ་ཡིག་སྲུངས་བཞག..."
 
-#: ../libpurple/protocols/gg/gg.c:197 ../libpurple/protocols/gg/gg.c:2233
+#: ../libpurple/protocols/gg/gg.c:197 ../libpurple/protocols/gg/gg.c:2193
 msgid "Load buddylist from file..."
 msgstr "ཡིག་སྣོད་ལས་ ཆ་རོགས་ཐོ་ཡིག་མངོན་གསལ་འབད།..."
 
 #: ../libpurple/protocols/gg/gg.c:312 ../libpurple/protocols/gg/gg.c:805
 #: ../libpurple/protocols/gg/gg.c:876
-#: ../libpurple/protocols/jabber/jabber.c:1333
-#: ../libpurple/protocols/oscar/userinfo.c:463
-#: ../libpurple/protocols/oscar/userinfo.c:471
+#: ../libpurple/protocols/jabber/jabber.c:1325
+#: ../libpurple/protocols/oscar/userinfo.c:462
+#: ../libpurple/protocols/oscar/userinfo.c:470
 msgid "City"
 msgstr "གྲོང་སྡེ།"
 
@@ -4295,13 +4292,13 @@
 msgstr "སྐྱེས་པའི་ལོ།"
 
 #. gender
-#: ../libpurple/protocols/gg/gg.c:320 ../libpurple/protocols/msn/msn.c:2415
+#: ../libpurple/protocols/gg/gg.c:320 ../libpurple/protocols/msn/msn.c:2416
 #: ../libpurple/protocols/mxit/actions.c:245
 #: ../libpurple/protocols/mxit/login.c:349
 #: ../libpurple/protocols/mxit/profile.c:217
 #: ../libpurple/protocols/mxit/profile.c:327
 #: ../libpurple/protocols/myspace/user.c:131
-#: ../libpurple/protocols/oscar/userinfo.c:424
+#: ../libpurple/protocols/oscar/userinfo.c:423
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1090
 msgid "Gender"
 msgstr "ཕོ་མོའི་དབྱེ་བ།"
@@ -4315,7 +4312,7 @@
 #: ../libpurple/protocols/mxit/actions.c:247
 #: ../libpurple/protocols/mxit/login.c:351
 #: ../libpurple/protocols/mxit/profile.c:217
-#: ../libpurple/protocols/oscar/userinfo.c:424
+#: ../libpurple/protocols/oscar/userinfo.c:423
 msgid "Male"
 msgstr "ཕོ།"
 
@@ -4323,7 +4320,7 @@
 #: ../libpurple/protocols/mxit/actions.c:246
 #: ../libpurple/protocols/mxit/login.c:350
 #: ../libpurple/protocols/mxit/profile.c:217
-#: ../libpurple/protocols/oscar/userinfo.c:424
+#: ../libpurple/protocols/oscar/userinfo.c:423
 msgid "Female"
 msgstr "མོ།"
 
@@ -4352,7 +4349,7 @@
 msgstr ""
 
 #: ../libpurple/protocols/gg/gg.c:386 ../libpurple/protocols/gg/gg.c:387
-#: ../libpurple/protocols/gg/gg.c:2223
+#: ../libpurple/protocols/gg/gg.c:2183
 msgid "Change status broadcasting"
 msgstr ""
 
@@ -4377,7 +4374,7 @@
 #: ../libpurple/protocols/msn/state.c:43 ../libpurple/protocols/msn/state.c:44
 #: ../libpurple/protocols/mxit/roster.c:54
 #: ../libpurple/protocols/novell/novell.c:2839
-#: ../libpurple/protocols/yahoo/libymsg.c:4093 ../libpurple/status.c:163
+#: ../libpurple/protocols/yahoo/libymsg.c:4106 ../libpurple/status.c:163
 #: ../pidgin/gtkdocklet.c:548 ../pidgin/gtkstatusbox.c:1096
 #: ../pidgin/plugins/themeedit-icon.c:63
 msgid "Available"
@@ -4385,7 +4382,7 @@
 
 #. 2
 #: ../libpurple/protocols/gg/gg.c:763
-#: ../libpurple/protocols/jabber/jabber.c:2402
+#: ../libpurple/protocols/jabber/jabber.c:2394
 #: ../libpurple/protocols/jabber/jutil.c:706
 #: ../libpurple/protocols/mxit/roster.c:56
 msgid "Chatty"
@@ -4393,12 +4390,12 @@
 
 #. 3
 #: ../libpurple/protocols/gg/gg.c:766
-#: ../libpurple/protocols/jabber/jabber.c:2448
+#: ../libpurple/protocols/jabber/jabber.c:2440
 #: ../libpurple/protocols/jabber/jutil.c:709
 #: ../libpurple/protocols/mxit/roster.c:57
 #: ../libpurple/protocols/oscar/oscar.c:159
-#: ../libpurple/protocols/oscar/oscar.c:4841
-#: ../libpurple/protocols/sametime/sametime.c:3344
+#: ../libpurple/protocols/oscar/oscar.c:4846
+#: ../libpurple/protocols/sametime/sametime.c:3380
 msgid "Do Not Disturb"
 msgstr "མ་དཀྲོགས།"
 
@@ -4406,25 +4403,25 @@
 #. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for
 #. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
 #. Away stuff
-#: ../libpurple/protocols/gg/gg.c:769 ../libpurple/protocols/irc/irc.c:597
+#: ../libpurple/protocols/gg/gg.c:769 ../libpurple/protocols/irc/irc.c:595
 #: ../libpurple/protocols/irc/msgs.c:427
 #: ../libpurple/protocols/jabber/jutil.c:707
 #: ../libpurple/protocols/mxit/roster.c:55
 #: ../libpurple/protocols/novell/novell.c:2842
 #: ../libpurple/protocols/oscar/oscar.c:165
-#: ../libpurple/protocols/silc/buddy.c:1483
+#: ../libpurple/protocols/silc/buddy.c:1489
 #: ../libpurple/protocols/silc10/buddy.c:1496
-#: ../libpurple/protocols/yahoo/libymsg.c:4971
-#: ../libpurple/protocols/yahoo/libymsg.c:5058 ../libpurple/status.c:166
-#: ../pidgin/gtkdocklet.c:552 ../pidgin/gtkprefs.c:2750
+#: ../libpurple/protocols/yahoo/libymsg.c:4984
+#: ../libpurple/protocols/yahoo/libymsg.c:5071 ../libpurple/status.c:166
+#: ../pidgin/gtkdocklet.c:552 ../pidgin/gtkprefs.c:2745
 #: ../pidgin/gtkstatusbox.c:1097 ../pidgin/plugins/themeedit-icon.c:64
 msgid "Away"
 msgstr "ཕྱི་ཁ།"
 
 #: ../libpurple/protocols/gg/gg.c:794 ../libpurple/protocols/gg/gg.c:867
-#: ../libpurple/protocols/oscar/oscar.c:2293
-#: ../libpurple/protocols/oscar/oscar.c:2316
-#: ../libpurple/protocols/oscar/userinfo.c:401
+#: ../libpurple/protocols/oscar/oscar.c:2295
+#: ../libpurple/protocols/oscar/oscar.c:2318
+#: ../libpurple/protocols/oscar/userinfo.c:400
 msgid "UIN"
 msgstr "ཡུ་ཨའི་ཨེན།"
 
@@ -4436,8 +4433,8 @@
 #: ../libpurple/protocols/mxit/actions.c:251
 #: ../libpurple/protocols/mxit/profile.c:220
 #: ../libpurple/protocols/mxit/profile.c:323
-#: ../libpurple/protocols/oscar/userinfo.c:412
-#: ../libpurple/protocols/silc/ops.c:1002
+#: ../libpurple/protocols/oscar/userinfo.c:411
+#: ../libpurple/protocols/silc/ops.c:1003
 #: ../libpurple/protocols/silc10/ops.c:1024
 #: ../libpurple/protocols/yahoo/yahoo_aliases.c:544
 msgid "First Name"
@@ -4448,7 +4445,7 @@
 msgstr "སྐྱེས་ལོ།"
 
 #: ../libpurple/protocols/gg/gg.c:860 ../libpurple/protocols/gg/gg.c:925
-#: ../libpurple/protocols/oscar/oscar.c:3009
+#: ../libpurple/protocols/oscar/oscar.c:3012
 msgid "Unable to display the search results."
 msgstr "འཚོལ་ཞིབ་གྲུབ་འབྲས་ཚུ་བཀྲམ་སྟོན་འབད་མ་ཚུགས་པས།"
 
@@ -4478,11 +4475,11 @@
 #. * we're ready for it (session key, userid, username all setup).
 #: ../libpurple/protocols/gg/gg.c:1496
 #: ../libpurple/protocols/myspace/myspace.c:1159
-#: ../libpurple/protocols/sametime/sametime.c:1577
+#: ../libpurple/protocols/sametime/sametime.c:1578
 msgid "Connected"
 msgstr "མཐུད་ཡོདཔ།"
 
-#: ../libpurple/protocols/gg/gg.c:1505 ../libpurple/protocols/gg/gg.c:1735
+#: ../libpurple/protocols/gg/gg.c:1505 ../libpurple/protocols/gg/gg.c:1759
 #: ../libpurple/protocols/silc/silc.c:375
 #: ../libpurple/protocols/silc/silc.c:422
 #: ../libpurple/protocols/silc10/silc.c:164
@@ -4504,36 +4501,36 @@
 
 #. 1. connect to server
 #. connect to the server
-#: ../libpurple/protocols/gg/gg.c:1731 ../libpurple/protocols/irc/irc.c:363
-#: ../libpurple/protocols/jabber/jabber.c:1749
+#: ../libpurple/protocols/gg/gg.c:1755 ../libpurple/protocols/irc/irc.c:361
+#: ../libpurple/protocols/jabber/jabber.c:1741
 #: ../libpurple/protocols/msn/session.c:432
 #: ../libpurple/protocols/myspace/myspace.c:2206
 #: ../libpurple/protocols/novell/novell.c:2198
 #: ../libpurple/protocols/oscar/oscar.c:834
-#: ../libpurple/protocols/sametime/sametime.c:3733
-#: ../libpurple/protocols/simple/simple.c:1962
-#: ../libpurple/protocols/yahoo/libymsg.c:3897
-#: ../libpurple/protocols/zephyr/zephyr.c:1593 ../pidgin/gtkstatusbox.c:716
+#: ../libpurple/protocols/sametime/sametime.c:3769
+#: ../libpurple/protocols/simple/simple.c:1960
+#: ../libpurple/protocols/yahoo/libymsg.c:3910
+#: ../libpurple/protocols/zephyr/zephyr.c:1581 ../pidgin/gtkstatusbox.c:716
 msgid "Connecting"
 msgstr "མཐུད་དོ།"
 
-#: ../libpurple/protocols/gg/gg.c:2126
+#: ../libpurple/protocols/gg/gg.c:2086
 msgid "Chat error"
 msgstr "ཁ་སླབ་འཛོལ་བ།"
 
-#: ../libpurple/protocols/gg/gg.c:2127
+#: ../libpurple/protocols/gg/gg.c:2087
 msgid "This chat name is already in use"
 msgstr "འ་ནི་ཁ་སླབ་འདི་ ཧེ་མ་ལས་རང་ལག་ལེན་འཐབ་བཞིན་ཡོད།"
 
-#: ../libpurple/protocols/gg/gg.c:2210
+#: ../libpurple/protocols/gg/gg.c:2170
 msgid "Not connected to the server"
 msgstr ""
 
-#: ../libpurple/protocols/gg/gg.c:2219
+#: ../libpurple/protocols/gg/gg.c:2179
 msgid "Find buddies..."
 msgstr "ཆ་རོགས་ཚུ་ འཚོལ།"
 
-#: ../libpurple/protocols/gg/gg.c:2229
+#: ../libpurple/protocols/gg/gg.c:2189
 msgid "Save buddylist to file..."
 msgstr "ཡིག་སྣོད་ལུ་ ཆ་རོགས་ཐོ་ཡིག་སྲུངས།..."
 
@@ -4548,44 +4545,44 @@
 #. id
 #. name
 #. version
-#: ../libpurple/protocols/gg/gg.c:2347
+#: ../libpurple/protocols/gg/gg.c:2297
 msgid "Gadu-Gadu Protocol Plugin"
 msgstr "ག་ཌུ་-ག་ཌུ་ གནད་སྤེལ་ལམ་ལུགས་ པ་ལག་ཨིན།"
 
 #. summary
-#: ../libpurple/protocols/gg/gg.c:2348
+#: ../libpurple/protocols/gg/gg.c:2298
 msgid "Polish popular IM"
 msgstr "ཡོང་གྲགས་ཅན་ ཨའི་ཨེམ་ལེགས་བཅོས་འབད།"
 
-#: ../libpurple/protocols/gg/gg.c:2405
+#: ../libpurple/protocols/gg/gg.c:2347
 msgid "Gadu-Gadu User"
 msgstr "ག་ཌུ་-ག་ཌུ་ ལག་ལེན་པ།"
 
-#: ../libpurple/protocols/gg/gg.c:2409
+#: ../libpurple/protocols/gg/gg.c:2351
 msgid "GG server"
 msgstr ""
 
-#: ../libpurple/protocols/gg/gg.c:2421
-#: ../libpurple/protocols/oscar/oscar.c:5737
+#: ../libpurple/protocols/gg/gg.c:2363
+#: ../libpurple/protocols/oscar/oscar.c:5742
 msgid "Don't use encryption"
 msgstr ""
 
-#: ../libpurple/protocols/gg/gg.c:2422
+#: ../libpurple/protocols/gg/gg.c:2364
 #: ../libpurple/protocols/jabber/libxmpp.c:277
-#: ../libpurple/protocols/oscar/oscar.c:5735
+#: ../libpurple/protocols/oscar/oscar.c:5740
 msgid "Use encryption if available"
 msgstr ""
 
 #. TODO
-#: ../libpurple/protocols/gg/gg.c:2426
+#: ../libpurple/protocols/gg/gg.c:2368
 #: ../libpurple/protocols/jabber/libxmpp.c:276
-#: ../libpurple/protocols/oscar/oscar.c:5736
+#: ../libpurple/protocols/oscar/oscar.c:5741
 msgid "Require encryption"
 msgstr ""
 
-#: ../libpurple/protocols/gg/gg.c:2429
+#: ../libpurple/protocols/gg/gg.c:2371
 #: ../libpurple/protocols/jabber/libxmpp.c:286
-#: ../libpurple/protocols/oscar/oscar.c:5761
+#: ../libpurple/protocols/oscar/oscar.c:5766
 msgid "Connection security"
 msgstr ""
 
@@ -4596,34 +4593,34 @@
 msgid "Unknown command: %s"
 msgstr "བརྡ་བཀོད་ངོ་མ་ཤེསཔ: %s"
 
-#: ../libpurple/protocols/irc/cmds.c:581
-#: ../libpurple/protocols/jabber/jabber.c:2871
+#: ../libpurple/protocols/irc/cmds.c:536
+#: ../libpurple/protocols/jabber/jabber.c:2863
 #: ../libpurple/protocols/silc/silc.c:1590
 #: ../libpurple/protocols/silc10/silc.c:1299
 #, c-format
 msgid "current topic is: %s"
 msgstr "ད་ལྟོའི་གནད་དོན་འདི: %s"
 
-#: ../libpurple/protocols/irc/cmds.c:585
-#: ../libpurple/protocols/jabber/jabber.c:2875
+#: ../libpurple/protocols/irc/cmds.c:540
+#: ../libpurple/protocols/jabber/jabber.c:2867
 #: ../libpurple/protocols/silc/silc.c:1594
 #: ../libpurple/protocols/silc10/silc.c:1303
 msgid "No topic is set"
 msgstr "གནད་དོན་གཞི་སྒྲིག་མ་འབད།"
 
-#: ../libpurple/protocols/irc/dcc_send.c:300
-#: ../libpurple/protocols/irc/dcc_send.c:341
+#: ../libpurple/protocols/irc/dcc_send.c:304
+#: ../libpurple/protocols/irc/dcc_send.c:345
 #: ../libpurple/protocols/yahoo/yahoo_filexfer.c:327
 #: ../libpurple/protocols/yahoo/yahoo_filexfer.c:336
 #: ../libpurple/protocols/yahoo/yahoo_filexfer.c:345
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:1200
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:1948
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:2045
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:1216
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:1977
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:2074
 msgid "File Transfer Failed"
 msgstr "ཡིག་སྣོད་གནས་སོར་འཐུས་ཤོར་བྱུང་ཡོདཔ།"
 
-#: ../libpurple/protocols/irc/dcc_send.c:301
-#: ../libpurple/protocols/irc/dcc_send.c:342
+#: ../libpurple/protocols/irc/dcc_send.c:305
+#: ../libpurple/protocols/irc/dcc_send.c:346
 msgid "Unable to open a listening port."
 msgstr ""
 
@@ -4650,124 +4647,124 @@
 #. * PurpleHTTPConnection reports it is fully sent.
 #. 
 #. TODO: do we really want to disconnect on a failure to write?
-#: ../libpurple/protocols/irc/irc.c:131 ../libpurple/protocols/irc/irc.c:176
-#: ../libpurple/protocols/irc/irc.c:695 ../libpurple/protocols/irc/irc.c:726
+#: ../libpurple/protocols/irc/irc.c:129 ../libpurple/protocols/irc/irc.c:174
+#: ../libpurple/protocols/irc/irc.c:693 ../libpurple/protocols/irc/irc.c:724
 #: ../libpurple/protocols/jabber/bosh.c:1044
 #: ../libpurple/protocols/jabber/bosh.c:1100
 #: ../libpurple/protocols/jabber/jabber.c:408
 #: ../libpurple/protocols/jabber/jabber.c:444
-#: ../libpurple/protocols/jabber/jabber.c:673
-#: ../libpurple/protocols/jabber/jabber.c:731
+#: ../libpurple/protocols/jabber/jabber.c:671
+#: ../libpurple/protocols/jabber/jabber.c:729
 #: ../libpurple/protocols/myspace/myspace.c:2070
 #: ../libpurple/protocols/oscar/flap_connection.c:474
 #: ../libpurple/protocols/sametime/sametime.c:412
-#: ../libpurple/protocols/sametime/sametime.c:1778
-#: ../libpurple/protocols/simple/simple.c:438
-#: ../libpurple/protocols/yahoo/libymsg.c:3363
-#: ../libpurple/protocols/yahoo/libymsg.c:3517
-#: ../libpurple/protocols/yahoo/ycht.c:476 ../libpurple/proxy.c:934
-#: ../libpurple/proxy.c:1517 ../libpurple/proxy.c:1631
-#: ../libpurple/proxy.c:1871 ../libpurple/proxy.c:1947
+#: ../libpurple/protocols/sametime/sametime.c:1779
+#: ../libpurple/protocols/simple/simple.c:433
+#: ../libpurple/protocols/yahoo/libymsg.c:3376
+#: ../libpurple/protocols/yahoo/libymsg.c:3530
+#: ../libpurple/protocols/yahoo/ycht.c:476 ../libpurple/proxy.c:948
+#: ../libpurple/proxy.c:1544 ../libpurple/proxy.c:1658
+#: ../libpurple/proxy.c:1893 ../libpurple/proxy.c:1969
 #, c-format
 msgid "Lost connection with server: %s"
 msgstr ""
 
-#: ../libpurple/protocols/irc/irc.c:291
+#: ../libpurple/protocols/irc/irc.c:289
 msgid "View MOTD"
 msgstr "ཨེམ་ཨོ་ཊི་ཌི་ བལྟ།"
 
-#: ../libpurple/protocols/irc/irc.c:303 ../libpurple/protocols/silc/chat.c:34
+#: ../libpurple/protocols/irc/irc.c:301 ../libpurple/protocols/silc/chat.c:34
 #: ../libpurple/protocols/silc10/chat.c:33
 msgid "_Channel:"
 msgstr "རྒྱུ་ལམ:"
 
-#: ../libpurple/protocols/irc/irc.c:309
-#: ../libpurple/protocols/jabber/chat.c:62 ../pidgin/gtkaccount.c:601
+#: ../libpurple/protocols/irc/irc.c:307
+#: ../libpurple/protocols/jabber/chat.c:62 ../pidgin/gtkaccount.c:594
 msgid "_Password:"
 msgstr "ཆོག་ཡིག:"
 
-#: ../libpurple/protocols/irc/irc.c:342
+#: ../libpurple/protocols/irc/irc.c:340
 msgid "IRC nick and server may not contain whitespace"
 msgstr ""
 
-#: ../libpurple/protocols/irc/irc.c:373
+#: ../libpurple/protocols/irc/irc.c:371
 #: ../libpurple/protocols/jabber/bosh.c:995
-#: ../libpurple/protocols/jabber/jabber.c:1072
+#: ../libpurple/protocols/jabber/jabber.c:1064
 #: ../libpurple/protocols/novell/novell.c:2213
-#: ../libpurple/protocols/yahoo/libymsg.c:2189
+#: ../libpurple/protocols/yahoo/libymsg.c:2188
 msgid "SSL support unavailable"
 msgstr "SSL རྒྱབ་སྐྱོར་མི་ཐོབ།"
 
-#: ../libpurple/protocols/irc/irc.c:386
+#: ../libpurple/protocols/irc/irc.c:384
 #: ../libpurple/protocols/jabber/bosh.c:1001
-#: ../libpurple/protocols/jabber/jabber.c:796
-#: ../libpurple/protocols/jabber/jabber.c:881
+#: ../libpurple/protocols/jabber/jabber.c:794
+#: ../libpurple/protocols/jabber/jabber.c:879
 #: ../libpurple/protocols/msn/msn.c:1379
 #: ../libpurple/protocols/msn/servconn.c:143
-#: ../libpurple/protocols/mxit/http.c:338
+#: ../libpurple/protocols/mxit/http.c:335
 #: ../libpurple/protocols/myspace/myspace.c:2224
 #: ../libpurple/protocols/novell/novell.c:1743
 #: ../libpurple/protocols/oscar/oscar.c:829
-#: ../libpurple/protocols/oscar/oscar.c:1049
-#: ../libpurple/protocols/oscar/oscar.c:1170
-#: ../libpurple/protocols/sametime/sametime.c:3737
+#: ../libpurple/protocols/oscar/oscar.c:1051
+#: ../libpurple/protocols/oscar/oscar.c:1172
+#: ../libpurple/protocols/sametime/sametime.c:3773
 #: ../libpurple/protocols/silc/silc.c:451
-#: ../libpurple/protocols/simple/simple.c:487
-#: ../libpurple/protocols/simple/simple.c:1862
-#: ../libpurple/protocols/yahoo/libymsg.c:3570
-#: ../libpurple/protocols/yahoo/libymsg.c:3758
-#: ../libpurple/protocols/yahoo/libymsg.c:3843
-#: ../libpurple/protocols/yahoo/libymsg.c:3865
+#: ../libpurple/protocols/simple/simple.c:482
+#: ../libpurple/protocols/simple/simple.c:1860
+#: ../libpurple/protocols/yahoo/libymsg.c:3583
+#: ../libpurple/protocols/yahoo/libymsg.c:3771
+#: ../libpurple/protocols/yahoo/libymsg.c:3856
 #: ../libpurple/protocols/yahoo/libymsg.c:3878
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:2045
-#: ../libpurple/protocols/yahoo/yahoochat.c:1505
-#: ../libpurple/protocols/yahoo/yahoochat.c:1531
+#: ../libpurple/protocols/yahoo/libymsg.c:3891
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:2074
+#: ../libpurple/protocols/yahoo/yahoochat.c:1530
+#: ../libpurple/protocols/yahoo/yahoochat.c:1556
 #: ../libpurple/protocols/yahoo/ycht.c:549
 #: ../libpurple/protocols/yahoo/ycht.c:585
 msgid "Unable to connect"
 msgstr "མཐུད་མ་ཚུགས།"
 
 #. this is a regular connect, error out
-#: ../libpurple/protocols/irc/irc.c:477
+#: ../libpurple/protocols/irc/irc.c:475
 #: ../libpurple/protocols/myspace/myspace.c:2163
 #: ../libpurple/protocols/oscar/flap_connection.c:479
-#: ../libpurple/protocols/sametime/sametime.c:1803
-#: ../libpurple/protocols/simple/simple.c:457
-#: ../libpurple/protocols/simple/simple.c:1742
-#: ../libpurple/protocols/yahoo/libymsg.c:3452
-#: ../libpurple/protocols/yahoo/libymsg.c:3478
+#: ../libpurple/protocols/sametime/sametime.c:1804
+#: ../libpurple/protocols/simple/simple.c:452
+#: ../libpurple/protocols/simple/simple.c:1740
+#: ../libpurple/protocols/yahoo/libymsg.c:3465
+#: ../libpurple/protocols/yahoo/libymsg.c:3491
 #, c-format
 msgid "Unable to connect: %s"
 msgstr ""
 
-#: ../libpurple/protocols/irc/irc.c:704 ../libpurple/protocols/irc/irc.c:735
-#: ../libpurple/protocols/jabber/jabber.c:671
-#: ../libpurple/protocols/jabber/jabber.c:729
+#: ../libpurple/protocols/irc/irc.c:702 ../libpurple/protocols/irc/irc.c:733
+#: ../libpurple/protocols/jabber/jabber.c:669
+#: ../libpurple/protocols/jabber/jabber.c:727
 #: ../libpurple/protocols/myspace/myspace.c:2079
 #: ../libpurple/protocols/oscar/flap_connection.c:472
-#: ../libpurple/protocols/sametime/sametime.c:1770
-#: ../libpurple/protocols/yahoo/libymsg.c:3370
-#: ../libpurple/protocols/yahoo/libymsg.c:3524
-#: ../libpurple/protocols/yahoo/ycht.c:482 ../libpurple/proxy.c:923
-#: ../libpurple/proxy.c:1505 ../libpurple/proxy.c:1619
-#: ../libpurple/proxy.c:1860 ../libpurple/proxy.c:1935
+#: ../libpurple/protocols/sametime/sametime.c:1771
+#: ../libpurple/protocols/yahoo/libymsg.c:3383
+#: ../libpurple/protocols/yahoo/libymsg.c:3537
+#: ../libpurple/protocols/yahoo/ycht.c:482 ../libpurple/proxy.c:937
+#: ../libpurple/proxy.c:1532 ../libpurple/proxy.c:1646
+#: ../libpurple/proxy.c:1882 ../libpurple/proxy.c:1957
 msgid "Server closed the connection"
 msgstr ""
 
-#: ../libpurple/protocols/irc/irc.c:871
+#: ../libpurple/protocols/irc/irc.c:869
 #: ../libpurple/protocols/silc/chat.c:1405
 #: ../libpurple/protocols/silc10/chat.c:1426
-#: ../libpurple/protocols/yahoo/yahoochat.c:1588
+#: ../libpurple/protocols/yahoo/yahoochat.c:1613
 msgid "Users"
 msgstr "ལག་ལེན་པ་ཚུ།"
 
-#: ../libpurple/protocols/irc/irc.c:874
-#: ../libpurple/protocols/sametime/sametime.c:3421
+#: ../libpurple/protocols/irc/irc.c:872
+#: ../libpurple/protocols/sametime/sametime.c:3457
 #: ../libpurple/protocols/silc/chat.c:1408
-#: ../libpurple/protocols/silc/ops.c:1404
+#: ../libpurple/protocols/silc/ops.c:1405
 #: ../libpurple/protocols/silc10/chat.c:1429
 #: ../libpurple/protocols/silc10/ops.c:1382
-#: ../libpurple/protocols/yahoo/yahoochat.c:1597
+#: ../libpurple/protocols/yahoo/yahoochat.c:1622
 msgid "Topic"
 msgstr "གནད་དོན།"
 
@@ -4779,50 +4776,50 @@
 #. *< id
 #. *< name
 #. *< version
-#: ../libpurple/protocols/irc/irc.c:1018
+#: ../libpurple/protocols/irc/irc.c:1016
 msgid "IRC Protocol Plugin"
 msgstr "ཨའི་ཨར་སི་ གནད་སྤེལ་ལམ་ལུགས་ པ་ལག་ཨིན།"
 
 #. *  summary
-#: ../libpurple/protocols/irc/irc.c:1019
+#: ../libpurple/protocols/irc/irc.c:1017
 msgid "The IRC Protocol Plugin that Sucks Less"
 msgstr "དཀའ་ངལ་ཉུང་སུ་ཨིན་པའི་ཨའི་ཨར་སི་ གནད་སྤེལ་ལམ་ལུགས་ པ་ལག་ཨིན།"
 
 #. set up account ID as user:server
-#: ../libpurple/protocols/irc/irc.c:1044 ../libpurple/protocols/irc/msgs.c:448
-#: ../libpurple/protocols/msn/msn.c:3024
-#: ../libpurple/protocols/oscar/oscar.c:5749
-#: ../libpurple/protocols/sametime/sametime.c:5747
-#: ../libpurple/protocols/silc/ops.c:1260
-#: ../libpurple/protocols/silc/ops.c:1354
+#: ../libpurple/protocols/irc/irc.c:1042 ../libpurple/protocols/irc/msgs.c:448
+#: ../libpurple/protocols/msn/msn.c:3025
+#: ../libpurple/protocols/oscar/oscar.c:5754
+#: ../libpurple/protocols/sametime/sametime.c:5783
+#: ../libpurple/protocols/silc/ops.c:1261
+#: ../libpurple/protocols/silc/ops.c:1355
 #: ../libpurple/protocols/silc10/ops.c:1244
 #: ../libpurple/protocols/silc10/ops.c:1347
-#: ../libpurple/protocols/simple/simple.c:2166
+#: ../libpurple/protocols/simple/simple.c:2164
 msgid "Server"
 msgstr "སར་བར།"
 
 #. port to connect to
-#: ../libpurple/protocols/irc/irc.c:1047 ../libpurple/protocols/msn/msn.c:3029
-#: ../libpurple/protocols/oscar/oscar.c:5752
-#: ../libpurple/protocols/sametime/sametime.c:5756
+#: ../libpurple/protocols/irc/irc.c:1045 ../libpurple/protocols/msn/msn.c:3030
+#: ../libpurple/protocols/oscar/oscar.c:5757
+#: ../libpurple/protocols/sametime/sametime.c:5792
 #: ../libpurple/protocols/silc/silc.c:2196
 #: ../libpurple/protocols/silc10/silc.c:1910
 msgid "Port"
 msgstr "འདྲེན་ལམ།"
 
-#: ../libpurple/protocols/irc/irc.c:1050
+#: ../libpurple/protocols/irc/irc.c:1048
 msgid "Encodings"
 msgstr "ཨིན་ཀོ་ཌིངསི།"
 
-#: ../libpurple/protocols/irc/irc.c:1053
+#: ../libpurple/protocols/irc/irc.c:1051
 msgid "Auto-detect incoming UTF-8"
 msgstr ""
 
-#: ../libpurple/protocols/irc/irc.c:1056 ../libpurple/protocols/irc/msgs.c:439
+#: ../libpurple/protocols/irc/irc.c:1054 ../libpurple/protocols/irc/msgs.c:439
 msgid "Ident name"
 msgstr ""
 
-#: ../libpurple/protocols/irc/irc.c:1059 ../libpurple/protocols/irc/msgs.c:431
+#: ../libpurple/protocols/irc/irc.c:1057 ../libpurple/protocols/irc/msgs.c:431
 #: ../libpurple/protocols/silc/silc.c:1249
 #: ../libpurple/protocols/silc10/silc.c:945
 msgid "Real name"
@@ -4832,15 +4829,15 @@
 #. option = purple_account_option_string_new(_("Quit message"), "quitmsg", IRC_DEFAULT_QUIT);
 #. prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
 #. 
-#: ../libpurple/protocols/irc/irc.c:1067
+#: ../libpurple/protocols/irc/irc.c:1065
 msgid "Use SSL"
 msgstr "ཨེསི་ཨེསི་ཨེལ་ལག་ལེན་འཐབ།"
 
-#: ../libpurple/protocols/irc/irc.c:1071
+#: ../libpurple/protocols/irc/irc.c:1069
 msgid "Authenticate with SASL"
 msgstr ""
 
-#: ../libpurple/protocols/irc/irc.c:1075
+#: ../libpurple/protocols/irc/irc.c:1073
 msgid "Allow plaintext SASL auth over unencrypted connection"
 msgstr ""
 
@@ -4885,8 +4882,8 @@
 msgstr " <i>(ངོས་འཛིན་བྱུང་མི)</i>"
 
 #: ../libpurple/protocols/irc/msgs.c:420
-#: ../libpurple/protocols/oscar/userinfo.c:402
-#: ../libpurple/protocols/silc/ops.c:1433
+#: ../libpurple/protocols/oscar/userinfo.c:401
+#: ../libpurple/protocols/silc/ops.c:1434
 #: ../libpurple/protocols/silc10/ops.c:1414
 msgid "Nick"
 msgstr "སྐྱོན་མིང་།"
@@ -4900,7 +4897,7 @@
 msgstr ""
 
 #: ../libpurple/protocols/irc/msgs.c:454
-#: ../libpurple/protocols/silc/ops.c:1279
+#: ../libpurple/protocols/silc/ops.c:1280
 #: ../libpurple/protocols/silc10/ops.c:1272
 msgid "Currently on"
 msgstr "ད་ལྟོའི་གནས་ཡུལ།"
@@ -5006,7 +5003,7 @@
 #. Remove user from channel
 #: ../libpurple/protocols/irc/msgs.c:1035
 #: ../libpurple/protocols/jabber/presence.c:747
-#: ../libpurple/protocols/silc/ops.c:724
+#: ../libpurple/protocols/silc/ops.c:726
 #: ../libpurple/protocols/silc10/ops.c:720
 #, c-format
 msgid "Kicked by %s (%s)"
@@ -5019,7 +5016,7 @@
 
 #: ../libpurple/protocols/irc/msgs.c:1148
 #: ../libpurple/protocols/irc/msgs.c:1149
-#: ../libpurple/protocols/jabber/jabber.c:2893
+#: ../libpurple/protocols/jabber/jabber.c:2885
 msgid "Invalid nickname"
 msgstr "ནུས་མེད་ཀྱི་སྐྱོན་མིང་།"
 
@@ -5081,7 +5078,7 @@
 msgstr ""
 
 #: ../libpurple/protocols/irc/msgs.c:1364
-#: ../libpurple/protocols/silc/ops.c:1104
+#: ../libpurple/protocols/silc/ops.c:1105
 #: ../libpurple/protocols/silc10/ops.c:1128
 msgid "Cannot join channel"
 msgstr "རྒྱུ་ལམ་འདི་མཐུད་མི་ཚུགས།"
@@ -5246,7 +5243,7 @@
 msgstr "ངོ་མིང་ཚུ་ [རྒྱུ་ལམ]: ལག་ལེན་པ་ཚུ་ད་ལྟོ་ལས་རྒྱུ་ལམ་ནང་ཐོ་ཡིག་བཞག"
 
 #: ../libpurple/protocols/irc/parse.c:158
-#: ../libpurple/protocols/jabber/jabber.c:3624
+#: ../libpurple/protocols/jabber/jabber.c:3616
 msgid "nick &lt;new nickname&gt;:  Change your nickname."
 msgstr "ནིཀ &lt;སྐྱོན་མིང་གསརཔ&gt;:  ཁྱོད་ཀྱི་སྐྱོན་མིང་བསྒྱུར་བཅོས་རྐྱབས།"
 
@@ -5386,9 +5383,9 @@
 #: ../libpurple/protocols/jabber/adhoccommands.c:161
 #: ../libpurple/protocols/jabber/auth.c:199
 #: ../libpurple/protocols/jabber/auth_scram.c:73
-#: ../libpurple/protocols/jabber/jabber.c:1169
-#: ../libpurple/protocols/jabber/jabber.c:1204
-#: ../libpurple/protocols/jabber/jabber.c:2731
+#: ../libpurple/protocols/jabber/jabber.c:1161
+#: ../libpurple/protocols/jabber/jabber.c:1196
+#: ../libpurple/protocols/jabber/jabber.c:2723
 msgid "Unknown Error"
 msgstr "ངོ་མ་ཤེས་པའི་འཛོལ་བ།"
 
@@ -5483,8 +5480,8 @@
 msgstr ""
 
 #: ../libpurple/protocols/jabber/auth_cyrus.c:472
-#: ../libpurple/protocols/jabber/jabber.c:544
-#: ../libpurple/protocols/jabber/jabber.c:702
+#: ../libpurple/protocols/jabber/jabber.c:542
+#: ../libpurple/protocols/jabber/jabber.c:700
 #, c-format
 msgid "SASL error: %s"
 msgstr ""
@@ -5527,7 +5524,7 @@
 msgstr ""
 
 #: ../libpurple/protocols/jabber/auth_scram.c:71
-#: ../libpurple/protocols/jabber/jabber.c:2796
+#: ../libpurple/protocols/jabber/jabber.c:2788
 msgid "Resource Constraint"
 msgstr "ཐོན་ཁུངས་བཀག་དམ།"
 
@@ -5570,21 +5567,21 @@
 msgstr ""
 
 #: ../libpurple/protocols/jabber/bosh.c:990
-#: ../libpurple/protocols/jabber/jabber.c:1067
+#: ../libpurple/protocols/jabber/jabber.c:1059
 msgid "Unable to establish SSL connection"
 msgstr ""
 
 #: ../libpurple/protocols/jabber/buddy.c:350
 #: ../libpurple/protocols/jabber/buddy.c:1024
-#: ../libpurple/protocols/sametime/sametime.c:4139
-#: ../libpurple/protocols/silc/ops.c:998
+#: ../libpurple/protocols/sametime/sametime.c:4175
+#: ../libpurple/protocols/silc/ops.c:999
 #: ../libpurple/protocols/silc10/ops.c:1020
 msgid "Full Name"
 msgstr "ངོ་མིང་ཆ་ཚང་།"
 
 #: ../libpurple/protocols/jabber/buddy.c:351
 #: ../libpurple/protocols/jabber/buddy.c:1035
-#: ../libpurple/protocols/silc/ops.c:1010
+#: ../libpurple/protocols/silc/ops.c:1011
 #: ../libpurple/protocols/silc10/ops.c:1032
 msgid "Family Name"
 msgstr "རིགས་ཚན་གྱི་མིང་།"
@@ -5595,7 +5592,7 @@
 msgstr "མིང་དང་པམ།"
 
 #: ../libpurple/protocols/jabber/buddy.c:354
-#: ../libpurple/protocols/jabber/jabber.c:1337
+#: ../libpurple/protocols/jabber/jabber.c:1329
 msgid "URL"
 msgstr "ཡུ་ཨར་ཨེལ"
 
@@ -5657,9 +5654,9 @@
 
 #: ../libpurple/protocols/jabber/buddy.c:365
 #: ../libpurple/protocols/jabber/buddy.c:1163
-#: ../libpurple/protocols/msn/msn.c:2503
+#: ../libpurple/protocols/msn/msn.c:2504
 #: ../libpurple/protocols/novell/novell.c:1492
-#: ../libpurple/protocols/silc/ops.c:1022
+#: ../libpurple/protocols/silc/ops.c:1023
 #: ../libpurple/protocols/silc10/ops.c:1044
 msgid "Job Title"
 msgstr "ལས་གཡོག་ མགོ་མིང་།"
@@ -5673,18 +5670,18 @@
 #. birthday (required)
 #: ../libpurple/protocols/jabber/buddy.c:367
 #: ../libpurple/protocols/jabber/buddy.c:1053
-#: ../libpurple/protocols/msn/msn.c:2484
+#: ../libpurple/protocols/msn/msn.c:2485
 #: ../libpurple/protocols/mxit/actions.c:239
 #: ../libpurple/protocols/mxit/login.c:343
 #: ../libpurple/protocols/mxit/profile.c:214
-#: ../libpurple/protocols/oscar/userinfo.c:445
+#: ../libpurple/protocols/oscar/userinfo.c:444
 msgid "Birthday"
 msgstr "སྐྱེ་བའི་ཉིནམ།"
 
 #: ../libpurple/protocols/jabber/buddy.c:368
 #: ../libpurple/protocols/jabber/buddy.c:1167
 #: ../libpurple/protocols/jabber/chat.c:911 ../pidgin/gtkblist.c:3888
-#: ../pidgin/gtkplugin.c:592 ../pidgin/plugins/disco/gtkdisco.c:571
+#: ../pidgin/gtkplugin.c:590 ../pidgin/plugins/disco/gtkdisco.c:571
 msgid "Description"
 msgstr "འགྲེལ་བཤད།"
 
@@ -5714,18 +5711,18 @@
 msgstr ""
 
 #: ../libpurple/protocols/jabber/buddy.c:773
-#: ../libpurple/protocols/jabber/jabber.c:2379
-#: ../libpurple/protocols/jabber/jabber.c:2403
-#: ../libpurple/protocols/jabber/jabber.c:2419
-#: ../libpurple/protocols/jabber/jabber.c:2435
-#: ../libpurple/protocols/jabber/jabber.c:2449
+#: ../libpurple/protocols/jabber/jabber.c:2371
+#: ../libpurple/protocols/jabber/jabber.c:2395
+#: ../libpurple/protocols/jabber/jabber.c:2411
+#: ../libpurple/protocols/jabber/jabber.c:2427
+#: ../libpurple/protocols/jabber/jabber.c:2441
 msgid "Priority"
 msgstr "གཙོ་རིམ།"
 
 #: ../libpurple/protocols/jabber/buddy.c:819
-#: ../libpurple/protocols/jabber/jabber.c:3368
+#: ../libpurple/protocols/jabber/jabber.c:3360
 #: ../libpurple/protocols/jabber/libxmpp.c:265
-#: ../libpurple/protocols/jabber/si.c:1567
+#: ../libpurple/protocols/jabber/si.c:1571
 msgid "Resource"
 msgstr "ཐོན་ཁུངས།"
 
@@ -5743,17 +5740,17 @@
 msgstr ""
 
 #: ../libpurple/protocols/jabber/buddy.c:1039
-#: ../libpurple/protocols/silc/ops.c:1006
+#: ../libpurple/protocols/silc/ops.c:1007
 #: ../libpurple/protocols/silc10/ops.c:1028
 #: ../libpurple/protocols/yahoo/yahoo_aliases.c:547
 msgid "Middle Name"
 msgstr "བར་མའི་མིང་།"
 
 #: ../libpurple/protocols/jabber/buddy.c:1072
-#: ../libpurple/protocols/jabber/jabber.c:1332
-#: ../libpurple/protocols/oscar/userinfo.c:462
-#: ../libpurple/protocols/oscar/userinfo.c:470
-#: ../libpurple/protocols/silc/ops.c:1042
+#: ../libpurple/protocols/jabber/jabber.c:1324
+#: ../libpurple/protocols/oscar/userinfo.c:461
+#: ../libpurple/protocols/oscar/userinfo.c:469
+#: ../libpurple/protocols/silc/ops.c:1043
 #: ../libpurple/protocols/silc10/ops.c:1064
 msgid "Address"
 msgstr "ཁ་བྱང་།"
@@ -5825,7 +5822,7 @@
 #: ../libpurple/protocols/mxit/actions.c:255
 #: ../libpurple/protocols/mxit/profile.c:221
 #: ../libpurple/protocols/mxit/profile.c:325
-#: ../libpurple/protocols/oscar/userinfo.c:413
+#: ../libpurple/protocols/oscar/userinfo.c:412
 #: ../libpurple/protocols/yahoo/yahoo_aliases.c:545
 msgid "Last Name"
 msgstr "མཇུག་མིང་།"
@@ -5864,8 +5861,8 @@
 
 #: ../libpurple/protocols/jabber/buddy.c:2202
 #: ../libpurple/protocols/novell/novell.c:1496
-#: ../libpurple/protocols/oscar/userinfo.c:414
-#: ../libpurple/protocols/oscar/userinfo.c:418
+#: ../libpurple/protocols/oscar/userinfo.c:413
+#: ../libpurple/protocols/oscar/userinfo.c:417
 msgid "Email Address"
 msgstr "གློག་འཕྲིན་ཁ་བྱང་།"
 
@@ -5876,7 +5873,7 @@
 
 #. "Search"
 #: ../libpurple/protocols/jabber/buddy.c:2213
-#: ../libpurple/protocols/sametime/sametime.c:5634
+#: ../libpurple/protocols/sametime/sametime.c:5670
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:476
 #: ../pidgin/plugins/gevolution/assoc-buddy.c:356
 msgid "Search"
@@ -5899,8 +5896,8 @@
 msgstr "སྣོད་ཐོ་འཚོལ་ཞིབ་འབད།"
 
 #: ../libpurple/protocols/jabber/chat.c:44
-#: ../libpurple/protocols/oscar/oscar.c:4401
-#: ../libpurple/protocols/yahoo/yahoochat.c:1137
+#: ../libpurple/protocols/oscar/oscar.c:4406
+#: ../libpurple/protocols/yahoo/yahoochat.c:1162
 msgid "_Room:"
 msgstr "ཁང་མིག:(_R)"
 
@@ -5971,7 +5968,7 @@
 
 #: ../libpurple/protocols/jabber/chat.c:813
 #: ../libpurple/protocols/jabber/chat.c:824
-#: ../libpurple/protocols/silc/ops.c:1471
+#: ../libpurple/protocols/silc/ops.c:1472
 #: ../libpurple/protocols/silc10/ops.c:1451
 msgid "Error retrieving room list"
 msgstr "ཁང་མིག་ཐོ་ཡིག་སླར་འདྲེན་འབད་བའི་འཛོལ་བ།"
@@ -6006,7 +6003,7 @@
 msgid "Roles:"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:252 ../libpurple/util.c:4236
+#: ../libpurple/protocols/jabber/jabber.c:252 ../libpurple/util.c:4212
 msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
 msgstr ""
 
@@ -6014,224 +6011,224 @@
 msgid "You require encryption, but no TLS/SSL support was found."
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:623
+#: ../libpurple/protocols/jabber/jabber.c:621
 msgid "Ping timed out"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:953
-#: ../libpurple/protocols/jabber/jabber.c:991
-#: ../libpurple/protocols/jabber/jabber.c:3039
+#: ../libpurple/protocols/jabber/jabber.c:945
+#: ../libpurple/protocols/jabber/jabber.c:983
+#: ../libpurple/protocols/jabber/jabber.c:3031
 msgid "Invalid XMPP ID"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:962
+#: ../libpurple/protocols/jabber/jabber.c:954
 msgid "Invalid XMPP ID. Username portion must be set."
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:971
+#: ../libpurple/protocols/jabber/jabber.c:963
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1050
+#: ../libpurple/protocols/jabber/jabber.c:1042
 msgid "Malformed BOSH URL"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1153
+#: ../libpurple/protocols/jabber/jabber.c:1145
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "%s@%s ཀྱི་ཐོ་བཀོད་ མཐར་འཁྱོལ་བྱུང་ཡོདཔ།"
 
-#: ../libpurple/protocols/jabber/jabber.c:1159
+#: ../libpurple/protocols/jabber/jabber.c:1151
 #, c-format
 msgid "Registration to %s successful"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1162
-#: ../libpurple/protocols/jabber/jabber.c:1163
+#: ../libpurple/protocols/jabber/jabber.c:1154
+#: ../libpurple/protocols/jabber/jabber.c:1155
 msgid "Registration Successful"
 msgstr "ཐོ་བཀོད་མཐར་འཁྱོལ་བྱུང་ཡོདཔ།"
 
-#: ../libpurple/protocols/jabber/jabber.c:1171
-#: ../libpurple/protocols/jabber/jabber.c:1172
+#: ../libpurple/protocols/jabber/jabber.c:1163
+#: ../libpurple/protocols/jabber/jabber.c:1164
 msgid "Registration Failed"
 msgstr "ཐོེ་བཀོད་འཐུས་ཤོར་བྱུང་ཡོདཔ།"
 
-#: ../libpurple/protocols/jabber/jabber.c:1195
+#: ../libpurple/protocols/jabber/jabber.c:1187
 #, c-format
 msgid "Registration from %s successfully removed"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1197
-#: ../libpurple/protocols/jabber/jabber.c:1198
+#: ../libpurple/protocols/jabber/jabber.c:1189
+#: ../libpurple/protocols/jabber/jabber.c:1190
 msgid "Unregistration Successful"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1206
-#: ../libpurple/protocols/jabber/jabber.c:1207
+#: ../libpurple/protocols/jabber/jabber.c:1198
+#: ../libpurple/protocols/jabber/jabber.c:1199
 msgid "Unregistration Failed"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1334
-#: ../libpurple/protocols/oscar/userinfo.c:464
-#: ../libpurple/protocols/oscar/userinfo.c:472
+#: ../libpurple/protocols/jabber/jabber.c:1326
+#: ../libpurple/protocols/oscar/userinfo.c:463
+#: ../libpurple/protocols/oscar/userinfo.c:471
 msgid "State"
 msgstr "གནས་ལུགས།"
 
-#: ../libpurple/protocols/jabber/jabber.c:1335
+#: ../libpurple/protocols/jabber/jabber.c:1327
 msgid "Postal code"
 msgstr "འགྲེམ་ ཨང་།"
 
-#: ../libpurple/protocols/jabber/jabber.c:1336
-#: ../libpurple/protocols/silc/ops.c:1047
+#: ../libpurple/protocols/jabber/jabber.c:1328
+#: ../libpurple/protocols/silc/ops.c:1048
 #: ../libpurple/protocols/silc/silc.c:1012
-#: ../libpurple/protocols/silc/util.c:513
+#: ../libpurple/protocols/silc/util.c:564
 #: ../libpurple/protocols/silc10/ops.c:1069
 #: ../libpurple/protocols/silc10/silc.c:708
 #: ../libpurple/protocols/silc10/util.c:557
 msgid "Phone"
 msgstr "བརྒྱུད་འཕྲིན།"
 
-#: ../libpurple/protocols/jabber/jabber.c:1338 ../pidgin/gtknotify.c:1691
+#: ../libpurple/protocols/jabber/jabber.c:1330 ../pidgin/gtknotify.c:1691
 msgid "Date"
 msgstr "ཚེས་གྲངས།"
 
-#: ../libpurple/protocols/jabber/jabber.c:1367
-#: ../libpurple/protocols/jabber/jabber.c:1368
+#: ../libpurple/protocols/jabber/jabber.c:1359
+#: ../libpurple/protocols/jabber/jabber.c:1360
 msgid "Already Registered"
 msgstr "ཧེ་མ་ལས་རང་ ཐོ་བཀོད་འབད་ཡི།"
 
-#: ../libpurple/protocols/jabber/jabber.c:1418
-#: ../libpurple/protocols/jabber/jabber.c:1422
-#: ../libpurple/protocols/jabber/jabber.c:2551
+#: ../libpurple/protocols/jabber/jabber.c:1410
+#: ../libpurple/protocols/jabber/jabber.c:1414
+#: ../libpurple/protocols/jabber/jabber.c:2543
 msgid "Password"
 msgstr "ཆོག་ཡིག"
 
-#: ../libpurple/protocols/jabber/jabber.c:1454
+#: ../libpurple/protocols/jabber/jabber.c:1446
 msgid "Unregister"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1461
+#: ../libpurple/protocols/jabber/jabber.c:1453
 msgid ""
 "Please fill out the information below to change your account registration."
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1464
+#: ../libpurple/protocols/jabber/jabber.c:1456
 msgid "Please fill out the information below to register your new account."
 msgstr ""
 "ཁྱོད་རའི་རྩིས་ཐོ་གསརཔ་ ཐོ་བཀོད་འབད་ནིའི་དོན་ལུ་ འོག་གི་བརྡ་དོན་འདི་ བཀང་གནང་།"
 
-#: ../libpurple/protocols/jabber/jabber.c:1472
-#: ../libpurple/protocols/jabber/jabber.c:1473
+#: ../libpurple/protocols/jabber/jabber.c:1464
+#: ../libpurple/protocols/jabber/jabber.c:1465
 msgid "Register New XMPP Account"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1474
-#: ../libpurple/protocols/jabber/jabber.c:1485
+#: ../libpurple/protocols/jabber/jabber.c:1466
+#: ../libpurple/protocols/jabber/jabber.c:1477
 #: ../pidgin/plugins/disco/gtkdisco.c:307
 #: ../pidgin/plugins/disco/gtkdisco.c:688
 msgid "Register"
 msgstr "ཐོ་དེབ།"
 
-#: ../libpurple/protocols/jabber/jabber.c:1481
+#: ../libpurple/protocols/jabber/jabber.c:1473
 #, c-format
 msgid "Change Account Registration at %s"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1482
+#: ../libpurple/protocols/jabber/jabber.c:1474
 #, c-format
 msgid "Register New Account at %s"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1485
+#: ../libpurple/protocols/jabber/jabber.c:1477
 msgid "Change Registration"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1533
-#: ../libpurple/protocols/jabber/jabber.c:1534
+#: ../libpurple/protocols/jabber/jabber.c:1525
+#: ../libpurple/protocols/jabber/jabber.c:1526
 msgid "Error unregistering account"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1539
-#: ../libpurple/protocols/jabber/jabber.c:1540
+#: ../libpurple/protocols/jabber/jabber.c:1531
+#: ../libpurple/protocols/jabber/jabber.c:1532
 msgid "Account successfully unregistered"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1753
+#: ../libpurple/protocols/jabber/jabber.c:1745
 msgid "Initializing Stream"
 msgstr "འགོ་བྱེད་ཀྱི་རྒྱུན་རིམ།"
 
-#: ../libpurple/protocols/jabber/jabber.c:1758
+#: ../libpurple/protocols/jabber/jabber.c:1750
 msgid "Initializing SSL/TLS"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1762
+#: ../libpurple/protocols/jabber/jabber.c:1754
 #: ../libpurple/protocols/msn/session.c:438
 msgid "Authenticating"
 msgstr "བདེན་བཤད་དོ།"
 
-#: ../libpurple/protocols/jabber/jabber.c:1766
+#: ../libpurple/protocols/jabber/jabber.c:1758
 msgid "Re-initializing Stream"
 msgstr "ལོག་འགོ་བྱེད་ཀྱི་རྒྱུན་རིམ།"
 
-#: ../libpurple/protocols/jabber/jabber.c:1935
-#: ../libpurple/protocols/jabber/jabber.c:1936
+#: ../libpurple/protocols/jabber/jabber.c:1927
+#: ../libpurple/protocols/jabber/jabber.c:1928
 msgid "Server doesn't support blocking"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2189
-#: ../libpurple/protocols/jabber/jabber.c:2709
-#: ../libpurple/protocols/jabber/jabber.c:2752
-#: ../libpurple/protocols/jabber/jabber.c:2790
-#: ../libpurple/protocols/oscar/oscar.c:4679
+#: ../libpurple/protocols/jabber/jabber.c:2181
+#: ../libpurple/protocols/jabber/jabber.c:2701
+#: ../libpurple/protocols/jabber/jabber.c:2744
+#: ../libpurple/protocols/jabber/jabber.c:2782
+#: ../libpurple/protocols/oscar/oscar.c:4684
 #: ../libpurple/protocols/oscar/userinfo.c:272
 msgid "Not Authorized"
 msgstr "དབང་སྤྲོད་མ་འབད།"
 
-#: ../libpurple/protocols/jabber/jabber.c:2321
-#: ../libpurple/protocols/jabber/jabber.c:2324
-#: ../libpurple/protocols/jabber/jabber.c:2381
-#: ../libpurple/protocols/jabber/jabber.c:2405
-#: ../libpurple/protocols/jabber/jabber.c:2421
-#: ../libpurple/protocols/jabber/jabber.c:2437
-#: ../libpurple/protocols/jabber/jabber.c:2451
+#: ../libpurple/protocols/jabber/jabber.c:2313
+#: ../libpurple/protocols/jabber/jabber.c:2316
+#: ../libpurple/protocols/jabber/jabber.c:2373
+#: ../libpurple/protocols/jabber/jabber.c:2397
+#: ../libpurple/protocols/jabber/jabber.c:2413
+#: ../libpurple/protocols/jabber/jabber.c:2429
+#: ../libpurple/protocols/jabber/jabber.c:2443
 #: ../libpurple/protocols/mxit/mxit.c:350
 #: ../libpurple/protocols/mxit/profile.c:243
 #: ../libpurple/protocols/mxit/profile.c:245
 #: ../libpurple/protocols/oscar/userinfo.c:298
-#: ../libpurple/protocols/silc/buddy.c:1563
-#: ../libpurple/protocols/silc/ops.c:1223
+#: ../libpurple/protocols/silc/buddy.c:1569
+#: ../libpurple/protocols/silc/ops.c:1224
 #: ../libpurple/protocols/silc10/buddy.c:1577
 #: ../libpurple/protocols/silc10/ops.c:1207
 msgid "Mood"
 msgstr "ཁམས།"
 
-#: ../libpurple/protocols/jabber/jabber.c:2334
+#: ../libpurple/protocols/jabber/jabber.c:2326
 #: ../libpurple/protocols/msn/msn.c:1046
 msgid "Now Listening"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2341
+#: ../libpurple/protocols/jabber/jabber.c:2333
 #: ../libpurple/protocols/mxit/roster.c:252
 msgid "Both"
 msgstr "གཉིས་ཆ་རང་།"
 
-#: ../libpurple/protocols/jabber/jabber.c:2343
+#: ../libpurple/protocols/jabber/jabber.c:2335
 msgid "From (To pending)"
 msgstr "ལས་ (བསྣར་ལུ)"
 
-#: ../libpurple/protocols/jabber/jabber.c:2345
+#: ../libpurple/protocols/jabber/jabber.c:2337
 msgid "From"
 msgstr "ལས།"
 
-#: ../libpurple/protocols/jabber/jabber.c:2348
+#: ../libpurple/protocols/jabber/jabber.c:2340
 msgid "To"
 msgstr "ལུ།"
 
-#: ../libpurple/protocols/jabber/jabber.c:2350
+#: ../libpurple/protocols/jabber/jabber.c:2342
 msgid "None (To pending)"
 msgstr "ཅི་མེད་ (བསྣར་ལུ)"
 
-#: ../libpurple/protocols/jabber/jabber.c:2352
+#: ../libpurple/protocols/jabber/jabber.c:2344
 #: ../libpurple/protocols/mxit/profile.c:245
 #: ../libpurple/protocols/mxit/roster.c:262 ../pidgin/gtkblist.c:3542
 #: ../pidgin/gtkblist.c:3544 ../pidgin/plugins/gevolution/eds-utils.c:73
@@ -6240,35 +6237,35 @@
 msgstr "ཅི་མེད།"
 
 #. subscription type
-#: ../libpurple/protocols/jabber/jabber.c:2355
+#: ../libpurple/protocols/jabber/jabber.c:2347
 #: ../libpurple/protocols/mxit/mxit.c:354
 #: ../libpurple/protocols/mxit/profile.c:252
 msgid "Subscription"
 msgstr "མཁོ་མངགས"
 
-#: ../libpurple/protocols/jabber/jabber.c:2382
-#: ../libpurple/protocols/jabber/jabber.c:2406
-#: ../libpurple/protocols/jabber/jabber.c:2422
-#: ../libpurple/protocols/jabber/jabber.c:2438
-#: ../libpurple/protocols/jabber/jabber.c:2452
+#: ../libpurple/protocols/jabber/jabber.c:2374
+#: ../libpurple/protocols/jabber/jabber.c:2398
+#: ../libpurple/protocols/jabber/jabber.c:2414
+#: ../libpurple/protocols/jabber/jabber.c:2430
+#: ../libpurple/protocols/jabber/jabber.c:2444
 msgid "Mood Text"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2384
-#: ../libpurple/protocols/jabber/jabber.c:2408
-#: ../libpurple/protocols/jabber/jabber.c:2424
-#: ../libpurple/protocols/jabber/jabber.c:2440
+#: ../libpurple/protocols/jabber/jabber.c:2376
+#: ../libpurple/protocols/jabber/jabber.c:2400
+#: ../libpurple/protocols/jabber/jabber.c:2416
+#: ../libpurple/protocols/jabber/jabber.c:2432
 msgid "Allow Buzz"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2391
+#: ../libpurple/protocols/jabber/jabber.c:2383
 #: ../libpurple/protocols/mxit/roster.c:86
-#: ../libpurple/protocols/oscar/oscar.c:4860
+#: ../libpurple/protocols/oscar/oscar.c:4865
 msgid "Mood Name"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2392
-#: ../libpurple/protocols/oscar/oscar.c:4861
+#: ../libpurple/protocols/jabber/jabber.c:2384
+#: ../libpurple/protocols/oscar/oscar.c:4866
 msgid "Mood Comment"
 msgstr ""
 
@@ -6278,335 +6275,335 @@
 #. saveable
 #. should be user_settable some day
 #. independent
-#: ../libpurple/protocols/jabber/jabber.c:2471
+#: ../libpurple/protocols/jabber/jabber.c:2463
 #: ../libpurple/protocols/msn/msn.c:1196
 #: ../libpurple/protocols/myspace/myspace.c:501
 msgid "Tune Artist"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2472
+#: ../libpurple/protocols/jabber/jabber.c:2464
 #: ../libpurple/protocols/msn/msn.c:1198
 #: ../libpurple/protocols/myspace/myspace.c:502
 msgid "Tune Title"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2473
+#: ../libpurple/protocols/jabber/jabber.c:2465
 #: ../libpurple/protocols/msn/msn.c:1197
 msgid "Tune Album"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2474
+#: ../libpurple/protocols/jabber/jabber.c:2466
 msgid "Tune Genre"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2475
+#: ../libpurple/protocols/jabber/jabber.c:2467
 msgid "Tune Comment"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2476
+#: ../libpurple/protocols/jabber/jabber.c:2468
 msgid "Tune Track"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2477
+#: ../libpurple/protocols/jabber/jabber.c:2469
 msgid "Tune Time"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2478
+#: ../libpurple/protocols/jabber/jabber.c:2470
 msgid "Tune Year"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2479
+#: ../libpurple/protocols/jabber/jabber.c:2471
 msgid "Tune URL"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2492
+#: ../libpurple/protocols/jabber/jabber.c:2484
 msgid "Password Changed"
 msgstr "ཆོག་ཡིག་བསྒྱུར་བཅོས་འབད་ད་ཡི།"
 
-#: ../libpurple/protocols/jabber/jabber.c:2493
+#: ../libpurple/protocols/jabber/jabber.c:2485
 msgid "Your password has been changed."
 msgstr "ཁྱོད་ཀྱི་ཆོག་ཡིག་འདི་བསྒྱུར་བཅོས་འབད་དའི།"
 
-#: ../libpurple/protocols/jabber/jabber.c:2499
-#: ../libpurple/protocols/jabber/jabber.c:2500
+#: ../libpurple/protocols/jabber/jabber.c:2491
+#: ../libpurple/protocols/jabber/jabber.c:2492
 msgid "Error changing password"
 msgstr "འཛོལ་བ་བསྒྱུར་བཅེོས་ཀྱི་ཆོག་ཡིག"
 
-#: ../libpurple/protocols/jabber/jabber.c:2557
+#: ../libpurple/protocols/jabber/jabber.c:2549
 msgid "Password (again)"
 msgstr "ཆོག་ཡིག(ལོག་སྟེ)"
 
-#: ../libpurple/protocols/jabber/jabber.c:2563
-#: ../libpurple/protocols/jabber/jabber.c:2564
+#: ../libpurple/protocols/jabber/jabber.c:2555
+#: ../libpurple/protocols/jabber/jabber.c:2556
 msgid "Change XMPP Password"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2564
+#: ../libpurple/protocols/jabber/jabber.c:2556
 msgid "Please enter your new password"
 msgstr "ཁྱོད་རའི་ཆོག་ཡིག་གསརཔ་འདི་བཙུགས་གནང་།"
 
-#: ../libpurple/protocols/jabber/jabber.c:2578
-#: ../libpurple/protocols/oscar/oscar.c:5480
+#: ../libpurple/protocols/jabber/jabber.c:2570
+#: ../libpurple/protocols/oscar/oscar.c:5485
 #: ../libpurple/protocols/silc/silc.c:1333
 #: ../libpurple/protocols/silc10/silc.c:1029
-#: ../libpurple/protocols/yahoo/libymsg.c:4426
-#: ../libpurple/protocols/yahoo/libymsg.c:4582
+#: ../libpurple/protocols/yahoo/libymsg.c:4439
+#: ../libpurple/protocols/yahoo/libymsg.c:4595
 msgid "Set User Info..."
 msgstr "ལག་ལེན་པའི་བརྡ་དོན་གཞི་སྒྲིག་འབད..."
 
 #. if (js->protocol_options & CHANGE_PASSWORD) {
-#: ../libpurple/protocols/jabber/jabber.c:2583
-#: ../libpurple/protocols/oscar/oscar.c:5491
+#: ../libpurple/protocols/jabber/jabber.c:2575
+#: ../libpurple/protocols/oscar/oscar.c:5496
 #: ../libpurple/protocols/silc/silc.c:1329
 #: ../libpurple/protocols/silc10/silc.c:1025
 msgid "Change Password..."
 msgstr "ཆོག་ཡིག་བསྒྱུར་བཅོས་རྐྱབས..."
 
 #. }
-#: ../libpurple/protocols/jabber/jabber.c:2588
+#: ../libpurple/protocols/jabber/jabber.c:2580
 msgid "Search for Users..."
 msgstr "ལག་ལེན་པ་ཚུའི་དོན་ལུ་འཚོལ་ཞིབ་འབད།..."
 
-#: ../libpurple/protocols/jabber/jabber.c:2688
+#: ../libpurple/protocols/jabber/jabber.c:2680
 msgid "Bad Request"
 msgstr "ཞུ་བ་བྱང་ཉེས།"
 
-#: ../libpurple/protocols/jabber/jabber.c:2691
+#: ../libpurple/protocols/jabber/jabber.c:2683
 msgid "Conflict"
 msgstr "མི་མཐུན་པ།"
 
-#: ../libpurple/protocols/jabber/jabber.c:2693
+#: ../libpurple/protocols/jabber/jabber.c:2685
 msgid "Feature Not Implemented"
 msgstr "ཁྱད་རྣམ་ལག་ལེན་མ་འཐབ།"
 
-#: ../libpurple/protocols/jabber/jabber.c:2695
+#: ../libpurple/protocols/jabber/jabber.c:2687
 msgid "Forbidden"
 msgstr "མ་ཆོགཔ"
 
-#: ../libpurple/protocols/jabber/jabber.c:2697
+#: ../libpurple/protocols/jabber/jabber.c:2689
 msgid "Gone"
 msgstr "ཡར་སོའི།"
 
-#: ../libpurple/protocols/jabber/jabber.c:2699
-#: ../libpurple/protocols/jabber/jabber.c:2780
+#: ../libpurple/protocols/jabber/jabber.c:2691
+#: ../libpurple/protocols/jabber/jabber.c:2772
 msgid "Internal Server Error"
 msgstr "ནང་འཁོད་ཀྱི་སར་བར་འཛོལ་བ།"
 
-#: ../libpurple/protocols/jabber/jabber.c:2701
+#: ../libpurple/protocols/jabber/jabber.c:2693
 msgid "Item Not Found"
 msgstr "རྣམ་གྲངས་མ་ཐོབ།"
 
-#: ../libpurple/protocols/jabber/jabber.c:2703
+#: ../libpurple/protocols/jabber/jabber.c:2695
 msgid "Malformed XMPP ID"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2705
+#: ../libpurple/protocols/jabber/jabber.c:2697
 msgid "Not Acceptable"
 msgstr "དང་ལེན་འབད་ནི་མེན་པས།"
 
-#: ../libpurple/protocols/jabber/jabber.c:2707
+#: ../libpurple/protocols/jabber/jabber.c:2699
 msgid "Not Allowed"
 msgstr "མི་ཆོག་པ།"
 
-#: ../libpurple/protocols/jabber/jabber.c:2711
+#: ../libpurple/protocols/jabber/jabber.c:2703
 msgid "Payment Required"
 msgstr "གླ་དངུལ་དགོ་པས།"
 
-#: ../libpurple/protocols/jabber/jabber.c:2713
+#: ../libpurple/protocols/jabber/jabber.c:2705
 msgid "Recipient Unavailable"
 msgstr "ལེན་མཁན་ཐོབ་མི་ཚུགས།"
 
-#: ../libpurple/protocols/jabber/jabber.c:2717
+#: ../libpurple/protocols/jabber/jabber.c:2709
 msgid "Registration Required"
 msgstr "ཐོ་བཀོད་དགོཔ།"
 
-#: ../libpurple/protocols/jabber/jabber.c:2719
+#: ../libpurple/protocols/jabber/jabber.c:2711
 msgid "Remote Server Not Found"
 msgstr "ཐག་རིང་གི་སར་བར་མ་ཐོབ།"
 
-#: ../libpurple/protocols/jabber/jabber.c:2721
+#: ../libpurple/protocols/jabber/jabber.c:2713
 msgid "Remote Server Timeout"
 msgstr "ཐག་རིང་སར་བར་ངལ་མཚམས།"
 
-#: ../libpurple/protocols/jabber/jabber.c:2723
+#: ../libpurple/protocols/jabber/jabber.c:2715
 msgid "Server Overloaded"
 msgstr "སར་བར་ལུ་ ལས་སྣ་མང་དྲགས་པ།"
 
-#: ../libpurple/protocols/jabber/jabber.c:2725
+#: ../libpurple/protocols/jabber/jabber.c:2717
 msgid "Service Unavailable"
 msgstr "ཞབས་ཏོག་ཐོབ་མ་ཚུགས།"
 
-#: ../libpurple/protocols/jabber/jabber.c:2727
+#: ../libpurple/protocols/jabber/jabber.c:2719
 msgid "Subscription Required"
 msgstr "མཁོ་མངགས་དགོ་པས།"
 
-#: ../libpurple/protocols/jabber/jabber.c:2729
+#: ../libpurple/protocols/jabber/jabber.c:2721
 msgid "Unexpected Request"
 msgstr "རེ་བ་མེད་པའི་ཞུ་བ།"
 
-#: ../libpurple/protocols/jabber/jabber.c:2737
+#: ../libpurple/protocols/jabber/jabber.c:2729
 msgid "Authorization Aborted"
 msgstr "དབང་སྤྲོད་བར་ཤོལ།"
 
-#: ../libpurple/protocols/jabber/jabber.c:2739
+#: ../libpurple/protocols/jabber/jabber.c:2731
 msgid "Incorrect encoding in authorization"
 msgstr "དབང་སྤྲོད་ནང་  བདེན་མེད་ཀྱི་ཨིན་ཀོ་ཌིང་།"
 
-#: ../libpurple/protocols/jabber/jabber.c:2741
+#: ../libpurple/protocols/jabber/jabber.c:2733
 msgid "Invalid authzid"
 msgstr "ནུས་མེད་དབང་སྤྲོད་ id"
 
-#: ../libpurple/protocols/jabber/jabber.c:2743
+#: ../libpurple/protocols/jabber/jabber.c:2735
 msgid "Invalid Authorization Mechanism"
 msgstr "ནུས་མེད་དབང་སྤྲོད་ཐབས་རིག"
 
-#: ../libpurple/protocols/jabber/jabber.c:2746
+#: ../libpurple/protocols/jabber/jabber.c:2738
 msgid "Authorization mechanism too weak"
 msgstr "དབང་ཆ་ཐབས་རིག་ནུས་པ་ཆུང་དྲགས་པ།"
 
-#: ../libpurple/protocols/jabber/jabber.c:2754
+#: ../libpurple/protocols/jabber/jabber.c:2746
 msgid "Temporary Authentication Failure"
 msgstr "གནས་སྐབས་ཀྱི་བདེན་བཤད་ འཐུས་ཤོར།"
 
-#: ../libpurple/protocols/jabber/jabber.c:2757
+#: ../libpurple/protocols/jabber/jabber.c:2749
 msgid "Authentication Failure"
 msgstr "བདེན་བཤད་འཐུས་ཤོར།"
 
-#: ../libpurple/protocols/jabber/jabber.c:2765
+#: ../libpurple/protocols/jabber/jabber.c:2757
 msgid "Bad Format"
 msgstr "རྩ་སྒྲིག་བྱང་ཉེས།"
 
-#: ../libpurple/protocols/jabber/jabber.c:2767
+#: ../libpurple/protocols/jabber/jabber.c:2759
 msgid "Bad Namespace Prefix"
 msgstr "སྔོན་ཚིག་མིང་གི་བར་སྟོང་  བྱང་ཉེས།"
 
-#: ../libpurple/protocols/jabber/jabber.c:2770
+#: ../libpurple/protocols/jabber/jabber.c:2762
 msgid "Resource Conflict"
 msgstr "ཐོན་ཁུངས་ མི་མཐུན་པ།"
 
-#: ../libpurple/protocols/jabber/jabber.c:2772
+#: ../libpurple/protocols/jabber/jabber.c:2764
 #: ../libpurple/protocols/msn/msn.c:232
 msgid "Connection Timeout"
 msgstr "མཐུད་ལམ་ངལ་མཚམས།"
 
-#: ../libpurple/protocols/jabber/jabber.c:2774
+#: ../libpurple/protocols/jabber/jabber.c:2766
 msgid "Host Gone"
 msgstr "ཧོསཊི་ ཡར་སོའི།"
 
-#: ../libpurple/protocols/jabber/jabber.c:2776
+#: ../libpurple/protocols/jabber/jabber.c:2768
 msgid "Host Unknown"
 msgstr "ངོ་མ་ཤེས་པའི་ཧོསཊི་།"
 
-#: ../libpurple/protocols/jabber/jabber.c:2778
+#: ../libpurple/protocols/jabber/jabber.c:2770
 msgid "Improper Addressing"
 msgstr "ཚུལ་ལྡན་མིན་པའི་ཁ་བྱང་བྲིས་ནི།"
 
-#: ../libpurple/protocols/jabber/jabber.c:2782
+#: ../libpurple/protocols/jabber/jabber.c:2774
 msgid "Invalid ID"
 msgstr "ནུས་མེད་ཀྱི་ ཨའི་ཌི།"
 
-#: ../libpurple/protocols/jabber/jabber.c:2784
+#: ../libpurple/protocols/jabber/jabber.c:2776
 msgid "Invalid Namespace"
 msgstr "ནུས་མེད་ མིང་གི་བར་སྟོང་།"
 
-#: ../libpurple/protocols/jabber/jabber.c:2786
+#: ../libpurple/protocols/jabber/jabber.c:2778
 msgid "Invalid XML"
 msgstr "ནུས་མེད་ཀྱི་ ཨེགསི་ཨེམ་ཨེལ།"
 
-#: ../libpurple/protocols/jabber/jabber.c:2788
+#: ../libpurple/protocols/jabber/jabber.c:2780
 msgid "Non-matching Hosts"
 msgstr "མཐུན་སྒྲིིག་མ་འབད་བའི་ཧོསཊིསི།"
 
-#: ../libpurple/protocols/jabber/jabber.c:2792
+#: ../libpurple/protocols/jabber/jabber.c:2784
 msgid "Policy Violation"
 msgstr "སྲིད་བྱུས་འགལ་བ།"
 
-#: ../libpurple/protocols/jabber/jabber.c:2794
+#: ../libpurple/protocols/jabber/jabber.c:2786
 msgid "Remote Connection Failed"
 msgstr "ཐག་རིང་གི་མཐུད་ལམ་འཐུས་ཤོར་བྱུང་ཡོདཔ།"
 
-#: ../libpurple/protocols/jabber/jabber.c:2798
+#: ../libpurple/protocols/jabber/jabber.c:2790
 msgid "Restricted XML"
 msgstr "བཀག་དམ་ཅན་ ཨེགསི་ཨེམ་ཨེལ།"
 
-#: ../libpurple/protocols/jabber/jabber.c:2800
+#: ../libpurple/protocols/jabber/jabber.c:2792
 msgid "See Other Host"
 msgstr "ཧོསཊི་གཞན་ཚུ་བལྟ།"
 
-#: ../libpurple/protocols/jabber/jabber.c:2802
+#: ../libpurple/protocols/jabber/jabber.c:2794
 msgid "System Shutdown"
 msgstr "རིམ་ལུགས་སྒོ་བསྡམ།"
 
-#: ../libpurple/protocols/jabber/jabber.c:2804
+#: ../libpurple/protocols/jabber/jabber.c:2796
 msgid "Undefined Condition"
 msgstr "ངེས་འཛིན་མ་འབད་བའི་གནས་སྟངས།"
 
-#: ../libpurple/protocols/jabber/jabber.c:2806
+#: ../libpurple/protocols/jabber/jabber.c:2798
 msgid "Unsupported Encoding"
 msgstr "རྒྱབ་སྐྱོར་མ་འབད་བའི་ཨིན་ཀོ་ཌིང་།"
 
-#: ../libpurple/protocols/jabber/jabber.c:2808
+#: ../libpurple/protocols/jabber/jabber.c:2800
 msgid "Unsupported Stanza Type"
 msgstr "རྒྱབ་སྐྱོར་མ་འབད་བའི་ ཚིགས་བཅད་ཀྱི་དབྱེ་བ།"
 
-#: ../libpurple/protocols/jabber/jabber.c:2810
+#: ../libpurple/protocols/jabber/jabber.c:2802
 msgid "Unsupported Version"
 msgstr "རྒྱབ་སྐྱོར་མ་འབད་བའི་ཐོན་རིམ།"
 
-#: ../libpurple/protocols/jabber/jabber.c:2812
+#: ../libpurple/protocols/jabber/jabber.c:2804
 msgid "XML Not Well Formed"
 msgstr "ཨེགསི་ཨེམ་ཨེལ་ ལེགས་སྒྲིག་ཅན་མེན་པས།"
 
-#: ../libpurple/protocols/jabber/jabber.c:2814
+#: ../libpurple/protocols/jabber/jabber.c:2806
 msgid "Stream Error"
 msgstr "རྒྱུན་རིམ་གྱི་འཛོལ་བ།"
 
-#: ../libpurple/protocols/jabber/jabber.c:2924
+#: ../libpurple/protocols/jabber/jabber.c:2916
 #, c-format
 msgid "Unable to ban user %s"
 msgstr "ལག་ལེན་པ %s འདི་བཀག་དམ་འབད་མི་ཚུགས།"
 
-#: ../libpurple/protocols/jabber/jabber.c:2944
+#: ../libpurple/protocols/jabber/jabber.c:2936
 #, c-format
 msgid "Unknown affiliation: \"%s\""
 msgstr "མ་ཤེས་པའི་འབྲེལ་གཏོགས།: \"%s\""
 
-#: ../libpurple/protocols/jabber/jabber.c:2954
+#: ../libpurple/protocols/jabber/jabber.c:2946
 #, c-format
 msgid "Unable to affiliate user %s as \"%s\""
 msgstr "ལག་ལེན་པ་%s འདི་ \"%s\" སྦེ་ འབྲལ་གཏོགས་འབད་མ་ཚུགས།"
 
-#: ../libpurple/protocols/jabber/jabber.c:2979
+#: ../libpurple/protocols/jabber/jabber.c:2971
 #, c-format
 msgid "Unknown role: \"%s\""
 msgstr "མ་ཤེས་པའི་ལས་འགན་: \"%s\""
 
-#: ../libpurple/protocols/jabber/jabber.c:2989
+#: ../libpurple/protocols/jabber/jabber.c:2981
 #, c-format
 msgid "Unable to set role \"%s\" for user: %s"
 msgstr "ལག་ལེན་པ་ %s དོན་ལུ་ ལས་འགན་ \"%s\" གཞི་སྒྲིག་འབད་མ་ཚུགསཔ།:"
 
-#: ../libpurple/protocols/jabber/jabber.c:3071
+#: ../libpurple/protocols/jabber/jabber.c:3063
 #, c-format
 msgid "Unable to kick user %s"
 msgstr "ལག་ལེན་པ %s འདི་བཏོན་གཏང་མི་ཚུགས།"
 
-#: ../libpurple/protocols/jabber/jabber.c:3108
+#: ../libpurple/protocols/jabber/jabber.c:3100
 #, c-format
 msgid "Unable to ping user %s"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:3130
+#: ../libpurple/protocols/jabber/jabber.c:3122
 #, c-format
 msgid "Unable to buzz, because there is nothing known about %s."
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:3137
+#: ../libpurple/protocols/jabber/jabber.c:3129
 #, c-format
 msgid "Unable to buzz, because %s might be offline."
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:3161
+#: ../libpurple/protocols/jabber/jabber.c:3153
 #, c-format
 msgid ""
 "Unable to buzz, because %s does not support it or does not wish to receive "
@@ -6615,137 +6612,137 @@
 
 #. Yahoo only supports one attention command: the 'buzz'.
 #. This is index number YAHOO_BUZZ.
-#: ../libpurple/protocols/jabber/jabber.c:3208
-#: ../libpurple/protocols/yahoo/libymsg.c:5507
+#: ../libpurple/protocols/jabber/jabber.c:3200
+#: ../libpurple/protocols/yahoo/libymsg.c:5520
 msgid "Buzz"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:3209
-#: ../libpurple/protocols/yahoo/libymsg.c:5508
+#: ../libpurple/protocols/jabber/jabber.c:3201
+#: ../libpurple/protocols/yahoo/libymsg.c:5521
 #, c-format
 msgid "%s has buzzed you!"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:3209
-#: ../libpurple/protocols/yahoo/libymsg.c:5508
+#: ../libpurple/protocols/jabber/jabber.c:3201
+#: ../libpurple/protocols/yahoo/libymsg.c:5521
 #, c-format
 msgid "Buzzing %s..."
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:3324
+#: ../libpurple/protocols/jabber/jabber.c:3316
 #, c-format
 msgid "Unable to initiate media with %s: invalid JID"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:3326
+#: ../libpurple/protocols/jabber/jabber.c:3318
 #, c-format
 msgid "Unable to initiate media with %s: user is not online"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:3328
+#: ../libpurple/protocols/jabber/jabber.c:3320
 #, c-format
 msgid "Unable to initiate media with %s: resource is not online"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:3330
+#: ../libpurple/protocols/jabber/jabber.c:3322
 #, c-format
 msgid "Unable to initiate media with %s: not subscribed to user presence"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:3333
-#: ../libpurple/protocols/jabber/jabber.c:3334
+#: ../libpurple/protocols/jabber/jabber.c:3325
+#: ../libpurple/protocols/jabber/jabber.c:3326
 msgid "Media Initiation Failed"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:3418
+#: ../libpurple/protocols/jabber/jabber.c:3410
 #, c-format
 msgid ""
 "Please select the resource of %s with which you would like to start a media "
 "session."
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:3428
-#: ../libpurple/protocols/jabber/si.c:1579
+#: ../libpurple/protocols/jabber/jabber.c:3420
+#: ../libpurple/protocols/jabber/si.c:1583
 msgid "Select a Resource"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:3429
+#: ../libpurple/protocols/jabber/jabber.c:3421
 msgid "Initiate Media"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:3599
+#: ../libpurple/protocols/jabber/jabber.c:3591
 msgid "Account does not support PEP, can't set mood"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:3612
+#: ../libpurple/protocols/jabber/jabber.c:3604
 msgid "config:  Configure a chat room."
 msgstr "ཀཱོན་ཕིག: ཁ་སླབ་ཁང་མིག་  རིམ་སྒྲིག་འབད།"
 
-#: ../libpurple/protocols/jabber/jabber.c:3618
+#: ../libpurple/protocols/jabber/jabber.c:3610
 msgid "configure:  Configure a chat room."
 msgstr "རིམ་སྒྲིག་འབད: ཁ་སླབ་ཁང་མིག་ རིམ་སྒྲིག་འབད།"
 
-#: ../libpurple/protocols/jabber/jabber.c:3631
+#: ../libpurple/protocols/jabber/jabber.c:3623
 msgid "part [message]:  Leave the room."
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:3638
+#: ../libpurple/protocols/jabber/jabber.c:3630
 msgid "register:  Register with a chat room."
 msgstr "ཐོ་འགོད་འབད: ཁང་མིག་དང་བཅས་ཐོ་འགོད་འབད།"
 
-#: ../libpurple/protocols/jabber/jabber.c:3646
+#: ../libpurple/protocols/jabber/jabber.c:3638
 msgid "topic [new topic]:  View or change the topic."
 msgstr "གནད་དོན[གནད་དོན་གསརཔ]: བལྟ ཡང་ན་ གནད་དོན་བསྒྱུར་བཅོས་རྐྱབས།"
 
-#: ../libpurple/protocols/jabber/jabber.c:3654
+#: ../libpurple/protocols/jabber/jabber.c:3646
 msgid "ban &lt;user&gt; [reason]:  Ban a user from the room."
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:3662
+#: ../libpurple/protocols/jabber/jabber.c:3654
 msgid ""
 "affiliate &lt;owner|admin|member|outcast|none&gt; [nick1] [nick2] ...: Get "
 "the users with an affiliation or set users' affiliation with the room."
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:3670
+#: ../libpurple/protocols/jabber/jabber.c:3662
 msgid ""
 "role &lt;moderator|participant|visitor|none&gt; [nick1] [nick2] ...: Get the "
 "users with a role or set users' role with the room."
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:3678
+#: ../libpurple/protocols/jabber/jabber.c:3670
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
 msgstr ""
 "མགྲོན་བརྡ་འབད &lt;ལག་ལེན་པ&gt; [འཕྲིན་དོན]:  "
 "ཁང་མིག་ནང་ལུ་ལག་ལེན་པ་མགྲོན་བརྡ་འབད།"
 
-#: ../libpurple/protocols/jabber/jabber.c:3686
+#: ../libpurple/protocols/jabber/jabber.c:3678
 msgid "join: &lt;room[@server]&gt; [password]:  Join a chat."
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:3694
+#: ../libpurple/protocols/jabber/jabber.c:3686
 msgid "kick &lt;user&gt; [reason]:  Kick a user from the room."
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:3701
+#: ../libpurple/protocols/jabber/jabber.c:3693
 msgid ""
 "msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
 msgstr ""
 "ཨེམ་ཨེསི་ཇི &lt;ལག་ལེན་པ&gt; &lt;འཕྲིན་དོན&gt;:  ལག་ལེན་པ་གཞན་ཅིག་ལུ་ "
 "སྒེར་དོན་གྱི་འཕྲིན་དོན་གཏང་།"
 
-#: ../libpurple/protocols/jabber/jabber.c:3709
+#: ../libpurple/protocols/jabber/jabber.c:3701
 msgid "ping &lt;jid&gt;:\tPing a user/component/server."
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:3717
+#: ../libpurple/protocols/jabber/jabber.c:3709
 #: ../libpurple/protocols/yahoo/libyahoo.c:53
 #: ../libpurple/protocols/yahoo/libyahoojp.c:50
 msgid "buzz: Buzz a user to get their attention"
 msgstr ""
 "ཟིར་སྒྲ: ཁོང་ཚུའི་དྲན་པ་བཀུག་ནིའི་དོན་ལུ་ལུ་  ལག་ལེན་པ་གཅིག་ཟིར་སྒྲ་བཏོན།"
 
-#: ../libpurple/protocols/jabber/jabber.c:3724
+#: ../libpurple/protocols/jabber/jabber.c:3716
 msgid "mood: Set current user mood"
 msgstr ""
 
@@ -6770,8 +6767,8 @@
 msgstr ""
 
 #. Translators: 'domain' is used here in the context of Internet domains, e.g. pidgin.im
-#: ../libpurple/protocols/jabber/libxmpp.c:261 ../pidgin/gtkaccount.c:577
-#: ../pidgin/gtkaccount.c:581
+#: ../libpurple/protocols/jabber/libxmpp.c:261 ../pidgin/gtkaccount.c:570
+#: ../pidgin/gtkaccount.c:574
 msgid "Domain"
 msgstr ""
 
@@ -6786,7 +6783,7 @@
 
 #: ../libpurple/protocols/jabber/libxmpp.c:296
 #: ../libpurple/protocols/myspace/myspace.c:3633
-#: ../libpurple/protocols/simple/simple.c:2172
+#: ../libpurple/protocols/simple/simple.c:2170
 msgid "Connect port"
 msgstr "འདྲེན་ལམ་མཐུད།"
 
@@ -6917,8 +6914,8 @@
 msgid "Unknown Error in presence"
 msgstr "ངོ་འཛོམས་ནང་ ངོ་མ་ཤེས་པའི་འཛོལ་བ།"
 
-#: ../libpurple/protocols/jabber/si.c:1442
-#: ../libpurple/protocols/jabber/si.c:1483
+#: ../libpurple/protocols/jabber/si.c:1446
+#: ../libpurple/protocols/jabber/si.c:1487
 #, c-format
 msgid "Unable to send file to %s, user does not support file transfers"
 msgstr ""
@@ -6926,31 +6923,31 @@
 "ཡིག་སྣོད་གནས་སོར་གཏང་ནི་ཚུ་རྒྱབ་སྐྱོར་མི་འབད།"
 
 #. not success
-#: ../libpurple/protocols/jabber/si.c:1443
-#: ../libpurple/protocols/jabber/si.c:1444
-#: ../libpurple/protocols/jabber/si.c:1484
-#: ../libpurple/protocols/jabber/si.c:1485
-#: ../libpurple/protocols/jabber/si.c:1555
-#: ../libpurple/protocols/mxit/protocol.c:2251
+#: ../libpurple/protocols/jabber/si.c:1447
+#: ../libpurple/protocols/jabber/si.c:1448
+#: ../libpurple/protocols/jabber/si.c:1488
+#: ../libpurple/protocols/jabber/si.c:1489
+#: ../libpurple/protocols/jabber/si.c:1559
+#: ../libpurple/protocols/mxit/protocol.c:2289
 msgid "File Send Failed"
 msgstr "ཡིག་སྣོད་གཏང་ནི་འཐུས་ཤོར་བྱུང་ཡོདཔ།"
 
-#: ../libpurple/protocols/jabber/si.c:1548
+#: ../libpurple/protocols/jabber/si.c:1552
 #, c-format
 msgid "Unable to send file to %s, invalid JID"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/si.c:1550
+#: ../libpurple/protocols/jabber/si.c:1554
 #, c-format
 msgid "Unable to send file to %s, user is not online"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/si.c:1552
+#: ../libpurple/protocols/jabber/si.c:1556
 #, c-format
 msgid "Unable to send file to %s, not subscribed to user presence"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/si.c:1565
+#: ../libpurple/protocols/jabber/si.c:1569
 #, c-format
 msgid ""
 "Please select the resource of %s to which you would like to send a file"
@@ -6972,9 +6969,9 @@
 #: ../libpurple/protocols/mxit/roster.c:138
 #: ../libpurple/protocols/mxit/roster.c:202
 #: ../libpurple/protocols/oscar/family_locate.c:415
-#: ../libpurple/protocols/silc/buddy.c:1504
+#: ../libpurple/protocols/silc/buddy.c:1510
 #: ../libpurple/protocols/silc/silc.c:987
-#: ../libpurple/protocols/silc/util.c:476
+#: ../libpurple/protocols/silc/util.c:527
 #: ../libpurple/protocols/silc10/buddy.c:1517
 #: ../libpurple/protocols/silc10/silc.c:683
 #: ../libpurple/protocols/silc10/util.c:519
@@ -6986,9 +6983,9 @@
 msgstr ""
 
 #: ../libpurple/protocols/jabber/usermood.c:39
-#: ../libpurple/protocols/silc/buddy.c:1520
+#: ../libpurple/protocols/silc/buddy.c:1526
 #: ../libpurple/protocols/silc/silc.c:1003
-#: ../libpurple/protocols/silc/util.c:492
+#: ../libpurple/protocols/silc/util.c:543
 #: ../libpurple/protocols/silc10/buddy.c:1533
 #: ../libpurple/protocols/silc10/silc.c:699
 #: ../libpurple/protocols/silc10/util.c:535
@@ -7000,9 +6997,9 @@
 msgstr ""
 
 #: ../libpurple/protocols/jabber/usermood.c:41
-#: ../libpurple/protocols/silc/buddy.c:1508
+#: ../libpurple/protocols/silc/buddy.c:1514
 #: ../libpurple/protocols/silc/silc.c:991
-#: ../libpurple/protocols/silc/util.c:480
+#: ../libpurple/protocols/silc/util.c:531
 #: ../libpurple/protocols/silc10/buddy.c:1521
 #: ../libpurple/protocols/silc10/silc.c:687
 #: ../libpurple/protocols/silc10/util.c:523
@@ -7012,9 +7009,9 @@
 #: ../libpurple/protocols/jabber/usermood.c:42
 #: ../libpurple/protocols/mxit/roster.c:148
 #: ../libpurple/protocols/mxit/roster.c:222
-#: ../libpurple/protocols/silc/buddy.c:1516
+#: ../libpurple/protocols/silc/buddy.c:1522
 #: ../libpurple/protocols/silc/silc.c:999
-#: ../libpurple/protocols/silc/util.c:488
+#: ../libpurple/protocols/silc/util.c:539
 #: ../libpurple/protocols/silc10/buddy.c:1529
 #: ../libpurple/protocols/silc10/silc.c:695
 #: ../libpurple/protocols/silc10/util.c:531
@@ -7108,9 +7105,9 @@
 #: ../libpurple/protocols/jabber/usermood.c:63
 #: ../libpurple/protocols/mxit/roster.c:139
 #: ../libpurple/protocols/mxit/roster.c:204
-#: ../libpurple/protocols/silc/buddy.c:1518
+#: ../libpurple/protocols/silc/buddy.c:1524
 #: ../libpurple/protocols/silc/silc.c:1001
-#: ../libpurple/protocols/silc/util.c:490
+#: ../libpurple/protocols/silc/util.c:541
 #: ../libpurple/protocols/silc10/buddy.c:1531
 #: ../libpurple/protocols/silc10/silc.c:697
 #: ../libpurple/protocols/silc10/util.c:533
@@ -7146,9 +7143,9 @@
 #: ../libpurple/protocols/jabber/usermood.c:70
 #: ../libpurple/protocols/mxit/roster.c:141
 #: ../libpurple/protocols/mxit/roster.c:208
-#: ../libpurple/protocols/silc/buddy.c:1500
+#: ../libpurple/protocols/silc/buddy.c:1506
 #: ../libpurple/protocols/silc/silc.c:983
-#: ../libpurple/protocols/silc/util.c:472
+#: ../libpurple/protocols/silc/util.c:523
 #: ../libpurple/protocols/silc10/buddy.c:1513
 #: ../libpurple/protocols/silc10/silc.c:679
 #: ../libpurple/protocols/silc10/util.c:515
@@ -7214,9 +7211,9 @@
 #: ../libpurple/protocols/jabber/usermood.c:83
 #: ../libpurple/protocols/mxit/roster.c:143
 #: ../libpurple/protocols/mxit/roster.c:212
-#: ../libpurple/protocols/silc/buddy.c:1510
+#: ../libpurple/protocols/silc/buddy.c:1516
 #: ../libpurple/protocols/silc/silc.c:993
-#: ../libpurple/protocols/silc/util.c:482
+#: ../libpurple/protocols/silc/util.c:533
 #: ../libpurple/protocols/silc10/buddy.c:1523
 #: ../libpurple/protocols/silc10/silc.c:689
 #: ../libpurple/protocols/silc10/util.c:525
@@ -7224,9 +7221,9 @@
 msgstr "དབང་ལུ་བསྡུ་མི་ཚུགས་པའི།"
 
 #: ../libpurple/protocols/jabber/usermood.c:84
-#: ../libpurple/protocols/silc/buddy.c:1506
+#: ../libpurple/protocols/silc/buddy.c:1512
 #: ../libpurple/protocols/silc/silc.c:989
-#: ../libpurple/protocols/silc/util.c:478
+#: ../libpurple/protocols/silc/util.c:529
 #: ../libpurple/protocols/silc10/buddy.c:1519
 #: ../libpurple/protocols/silc10/silc.c:685
 #: ../libpurple/protocols/silc10/util.c:521
@@ -7296,9 +7293,9 @@
 #: ../libpurple/protocols/jabber/usermood.c:100
 #: ../libpurple/protocols/mxit/roster.c:144
 #: ../libpurple/protocols/mxit/roster.c:214
-#: ../libpurple/protocols/silc/buddy.c:1502
+#: ../libpurple/protocols/silc/buddy.c:1508
 #: ../libpurple/protocols/silc/silc.c:985
-#: ../libpurple/protocols/silc/util.c:474
+#: ../libpurple/protocols/silc/util.c:525
 #: ../libpurple/protocols/silc10/buddy.c:1515
 #: ../libpurple/protocols/silc10/silc.c:681
 #: ../libpurple/protocols/silc10/util.c:517
@@ -7337,9 +7334,9 @@
 #: ../libpurple/protocols/mxit/roster.c:147
 #: ../libpurple/protocols/mxit/roster.c:220
 #: ../libpurple/protocols/oscar/family_locate.c:428
-#: ../libpurple/protocols/silc/buddy.c:1514
+#: ../libpurple/protocols/silc/buddy.c:1520
 #: ../libpurple/protocols/silc/silc.c:997
-#: ../libpurple/protocols/silc/util.c:486
+#: ../libpurple/protocols/silc/util.c:537
 #: ../libpurple/protocols/silc10/buddy.c:1527
 #: ../libpurple/protocols/silc10/silc.c:693
 #: ../libpurple/protocols/silc10/util.c:529
@@ -7423,20 +7420,20 @@
 #. only notify the user about problems adding to the friends list
 #. * maybe we should do something else for other lists, but it probably
 #. * won't cause too many problems if we just ignore it
-#: ../libpurple/protocols/msn/contact.c:1073
-#: ../libpurple/protocols/msn/contact.c:1169
+#: ../libpurple/protocols/msn/contact.c:1070
+#: ../libpurple/protocols/msn/contact.c:1166
 #: ../libpurple/protocols/msn/userlist.c:523
 #, c-format
 msgid "Unable to add \"%s\"."
 msgstr "\"%s\"འདི་ཁ་སྐོང་རྐྱབ་མ་ཚུགས།"
 
-#: ../libpurple/protocols/msn/contact.c:1074
-#: ../libpurple/protocols/msn/contact.c:1170
+#: ../libpurple/protocols/msn/contact.c:1071
+#: ../libpurple/protocols/msn/contact.c:1167
 msgid "Buddy Add error"
 msgstr ""
 
-#: ../libpurple/protocols/msn/contact.c:1075
-#: ../libpurple/protocols/msn/contact.c:1171
+#: ../libpurple/protocols/msn/contact.c:1072
+#: ../libpurple/protocols/msn/contact.c:1168
 msgid "The username specified does not exist."
 msgstr ""
 
@@ -7486,7 +7483,7 @@
 msgstr "ཐོེ་ཡིག་གུ་ལུ་མེན།"
 
 #: ../libpurple/protocols/msn/error.c:86
-#: ../libpurple/protocols/zephyr/zephyr.c:763
+#: ../libpurple/protocols/zephyr/zephyr.c:759
 msgid "User is offline"
 msgstr "ལག་ལེན་པ་འདི་ཨོཕ་ལ་ཡིན་ཨིན།"
 
@@ -7637,7 +7634,7 @@
 
 #: ../libpurple/protocols/msn/error.c:228
 #: ../libpurple/protocols/silc/silc.c:340
-#: ../libpurple/protocols/silc10/ops.c:1713 ../libpurple/proxy.c:1774
+#: ../libpurple/protocols/silc10/ops.c:1713 ../libpurple/proxy.c:1796
 msgid "Authentication failed"
 msgstr "བདེན་བཤད་འཐུས་ཤོར་བྱུང་ཡོདཔ།"
 
@@ -7878,26 +7875,26 @@
 msgstr "ཁྱོད་ལུ་ཡོད་ག"
 
 #: ../libpurple/protocols/msn/msn.c:1130
-#: ../libpurple/protocols/yahoo/libymsg.c:4260
+#: ../libpurple/protocols/yahoo/libymsg.c:4273
 #: ../libpurple/protocols/yahoo/yahoo_aliases.c:548
 msgid "Home Phone Number"
 msgstr ""
 
 #: ../libpurple/protocols/msn/msn.c:1134
-#: ../libpurple/protocols/yahoo/libymsg.c:4261
+#: ../libpurple/protocols/yahoo/libymsg.c:4274
 #: ../libpurple/protocols/yahoo/yahoo_aliases.c:549
 msgid "Work Phone Number"
 msgstr ""
 
 #: ../libpurple/protocols/msn/msn.c:1138
-#: ../libpurple/protocols/yahoo/libymsg.c:4262
+#: ../libpurple/protocols/yahoo/libymsg.c:4275
 #: ../libpurple/protocols/yahoo/yahoo_aliases.c:550
 msgid "Mobile Phone Number"
 msgstr ""
 
 #: ../libpurple/protocols/msn/msn.c:1161 ../libpurple/protocols/msn/state.c:39
-#: ../libpurple/protocols/yahoo/libymsg.c:4069
-#: ../libpurple/protocols/yahoo/libymsg.c:5095
+#: ../libpurple/protocols/yahoo/libymsg.c:4082
+#: ../libpurple/protocols/yahoo/libymsg.c:5108
 msgid "Be Right Back"
 msgstr "ད་ལྟོ་རང་ལོག་ཐོན་འོང་།"
 
@@ -7905,25 +7902,25 @@
 #: ../libpurple/protocols/novell/novell.c:2845
 #: ../libpurple/protocols/novell/novell.c:2975
 #: ../libpurple/protocols/oscar/family_locate.c:409
-#: ../libpurple/protocols/silc/buddy.c:1487
+#: ../libpurple/protocols/silc/buddy.c:1493
 #: ../libpurple/protocols/silc/silc.c:58
 #: ../libpurple/protocols/silc10/buddy.c:1500
 #: ../libpurple/protocols/silc10/silc.c:48
-#: ../libpurple/protocols/yahoo/libymsg.c:4071
-#: ../libpurple/protocols/yahoo/libymsg.c:5099
+#: ../libpurple/protocols/yahoo/libymsg.c:4084
+#: ../libpurple/protocols/yahoo/libymsg.c:5112
 #: ../pidgin/plugins/themeedit-icon.c:66
 msgid "Busy"
 msgstr "ཁོམ་མེད།"
 
 #: ../libpurple/protocols/msn/msn.c:1172
-#: ../libpurple/protocols/yahoo/libymsg.c:4079
-#: ../libpurple/protocols/yahoo/libymsg.c:5113
+#: ../libpurple/protocols/yahoo/libymsg.c:4092
+#: ../libpurple/protocols/yahoo/libymsg.c:5126
 msgid "On the Phone"
 msgstr "བརྒྱུད་འཕྲིན་གྱི་ ཐོག་ལུ།"
 
 #: ../libpurple/protocols/msn/msn.c:1177
-#: ../libpurple/protocols/yahoo/libymsg.c:4083
-#: ../libpurple/protocols/yahoo/libymsg.c:5119
+#: ../libpurple/protocols/yahoo/libymsg.c:4096
+#: ../libpurple/protocols/yahoo/libymsg.c:5132
 msgid "Out to Lunch"
 msgstr "དགུང་ལྟོ་བཟའ་བར།"
 
@@ -7984,227 +7981,227 @@
 "SSL support is needed for MSN. Please install a supported SSL library."
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:1781
+#: ../libpurple/protocols/msn/msn.c:1782
 #, c-format
 msgid ""
 "Unable to add the buddy %s because the username is invalid.  Usernames must "
 "be valid email addresses."
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:1783
-#: ../libpurple/protocols/oscar/oscar.c:3695
-#: ../libpurple/protocols/oscar/oscar.c:4164
-#: ../libpurple/protocols/oscar/oscar.c:4179
+#: ../libpurple/protocols/msn/msn.c:1784
+#: ../libpurple/protocols/oscar/oscar.c:3698
+#: ../libpurple/protocols/oscar/oscar.c:4169
+#: ../libpurple/protocols/oscar/oscar.c:4184
 msgid "Unable to Add"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:2343 ../libpurple/protocols/msn/msn.c:2685
+#: ../libpurple/protocols/msn/msn.c:2344 ../libpurple/protocols/msn/msn.c:2686
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:808
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1199
 msgid "Error retrieving profile"
 msgstr "འཛོལ་བ་ སླར་འདྲེན་འབད་བའི་གསལ་སྡུད།"
 
-#: ../libpurple/protocols/msn/msn.c:2407 ../pidgin/plugins/convcolors.c:387
+#: ../libpurple/protocols/msn/msn.c:2408 ../pidgin/plugins/convcolors.c:387
 msgid "General"
 msgstr "ཡོངས་ཁྱབ།"
 
-#: ../libpurple/protocols/msn/msn.c:2414
+#: ../libpurple/protocols/msn/msn.c:2415
 #: ../libpurple/protocols/mxit/profile.c:329
 #: ../libpurple/protocols/myspace/user.c:127
-#: ../libpurple/protocols/oscar/userinfo.c:450
+#: ../libpurple/protocols/oscar/userinfo.c:449
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1080
 msgid "Age"
 msgstr "སྐྱེས་ལོ།"
 
-#: ../libpurple/protocols/msn/msn.c:2416
+#: ../libpurple/protocols/msn/msn.c:2417
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1095
 msgid "Occupation"
 msgstr "ལཱ་གཡོག"
 
-#: ../libpurple/protocols/msn/msn.c:2417
+#: ../libpurple/protocols/msn/msn.c:2418
 #: ../libpurple/protocols/myspace/user.c:135
 #: ../libpurple/protocols/novell/novell.c:1486
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1075
-#: ../libpurple/protocols/zephyr/zephyr.c:814
-#: ../libpurple/protocols/zephyr/zephyr.c:1196
+#: ../libpurple/protocols/zephyr/zephyr.c:807
+#: ../libpurple/protocols/zephyr/zephyr.c:1186
 msgid "Location"
 msgstr "གནས་ཁོངས།"
 
-#: ../libpurple/protocols/msn/msn.c:2422 ../libpurple/protocols/msn/msn.c:2614
-#: ../libpurple/protocols/msn/msn.c:2620 ../libpurple/protocols/msn/msn.c:2627
+#: ../libpurple/protocols/msn/msn.c:2423 ../libpurple/protocols/msn/msn.c:2615
+#: ../libpurple/protocols/msn/msn.c:2621 ../libpurple/protocols/msn/msn.c:2628
 msgid "Hobbies and Interests"
 msgstr "སྤྲོ་ལས་དང་དང་འདོད་ཚུ།"
 
-#: ../libpurple/protocols/msn/msn.c:2428 ../libpurple/protocols/msn/msn.c:2548
-#: ../libpurple/protocols/msn/msn.c:2554 ../libpurple/protocols/msn/msn.c:2561
-#: ../libpurple/protocols/msn/msn.c:2569 ../libpurple/protocols/msn/msn.c:2576
+#: ../libpurple/protocols/msn/msn.c:2429 ../libpurple/protocols/msn/msn.c:2549
+#: ../libpurple/protocols/msn/msn.c:2555 ../libpurple/protocols/msn/msn.c:2562
+#: ../libpurple/protocols/msn/msn.c:2570 ../libpurple/protocols/msn/msn.c:2577
 msgid "A Little About Me"
 msgstr "ངེ་གི་སྐོར་ལས་མདོར་བསྡུས་ཅིག"
 
-#: ../libpurple/protocols/msn/msn.c:2445
+#: ../libpurple/protocols/msn/msn.c:2446
 msgid "Social"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:2447
+#: ../libpurple/protocols/msn/msn.c:2448
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1085
 msgid "Marital Status"
 msgstr "གཉེན་སྦྱོར་གྱི་གནས་ཚད།"
 
-#: ../libpurple/protocols/msn/msn.c:2448
+#: ../libpurple/protocols/msn/msn.c:2449
 msgid "Interests"
 msgstr "དངུལ་སྐྱེད་ཚུ།"
 
-#: ../libpurple/protocols/msn/msn.c:2449
+#: ../libpurple/protocols/msn/msn.c:2450
 msgid "Pets"
 msgstr "གཅེས་པ་ཚུ།"
 
-#: ../libpurple/protocols/msn/msn.c:2450
+#: ../libpurple/protocols/msn/msn.c:2451
 msgid "Hometown"
 msgstr "སྐྱེད་ཡུལ།"
 
-#: ../libpurple/protocols/msn/msn.c:2451
+#: ../libpurple/protocols/msn/msn.c:2452
 msgid "Places Lived"
 msgstr "སྡོད་ཡོད་པའི་ས་གནས་ཚུ།"
 
-#: ../libpurple/protocols/msn/msn.c:2452
+#: ../libpurple/protocols/msn/msn.c:2453
 msgid "Fashion"
 msgstr "དུས་བབས་གྱོན་ཆས།"
 
-#: ../libpurple/protocols/msn/msn.c:2453
+#: ../libpurple/protocols/msn/msn.c:2454
 msgid "Humor"
 msgstr "དགོད་བྲ།"
 
-#: ../libpurple/protocols/msn/msn.c:2454
+#: ../libpurple/protocols/msn/msn.c:2455
 msgid "Music"
 msgstr "སྙན་ཆ།"
 
-#: ../libpurple/protocols/msn/msn.c:2455 ../libpurple/protocols/msn/msn.c:2636
-#: ../libpurple/protocols/msn/msn.c:2642
+#: ../libpurple/protocols/msn/msn.c:2456 ../libpurple/protocols/msn/msn.c:2637
+#: ../libpurple/protocols/msn/msn.c:2643
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1137
 msgid "Favorite Quote"
 msgstr "འདྲེན་ཚིག་དགའ་མི།"
 
-#: ../libpurple/protocols/msn/msn.c:2472
+#: ../libpurple/protocols/msn/msn.c:2473
 msgid "Contact Info"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:2473
+#: ../libpurple/protocols/msn/msn.c:2474
 msgid "Personal"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:2476
+#: ../libpurple/protocols/msn/msn.c:2477
 msgid "Significant Other"
 msgstr "གཞན་མི་གལ་གནད་ཅན།"
 
-#: ../libpurple/protocols/msn/msn.c:2477
+#: ../libpurple/protocols/msn/msn.c:2478
 msgid "Home Phone"
 msgstr "ཁྱིམ་ བརྒྱུད་འཕྲིན།"
 
-#: ../libpurple/protocols/msn/msn.c:2478
+#: ../libpurple/protocols/msn/msn.c:2479
 msgid "Home Phone 2"
 msgstr "ཁྱིམ་ བརྒྱུད་འཕྲིན་ ༢།"
 
-#: ../libpurple/protocols/msn/msn.c:2479
-#: ../libpurple/protocols/oscar/userinfo.c:460
+#: ../libpurple/protocols/msn/msn.c:2480
+#: ../libpurple/protocols/oscar/userinfo.c:459
 msgid "Home Address"
 msgstr "ཁྱིམ་ནང་གི་ཁ་བྱང་།"
 
-#: ../libpurple/protocols/msn/msn.c:2480
+#: ../libpurple/protocols/msn/msn.c:2481
 msgid "Personal Mobile"
 msgstr "རང་དོན་འགྲུལ་འཕྲིན།"
 
-#: ../libpurple/protocols/msn/msn.c:2481
+#: ../libpurple/protocols/msn/msn.c:2482
 msgid "Home Fax"
 msgstr "ཁྱིམ་དཔར་འཕྲིན།"
 
-#: ../libpurple/protocols/msn/msn.c:2482
+#: ../libpurple/protocols/msn/msn.c:2483
 msgid "Personal Email"
 msgstr "རང་དོན་གློག་-འཕྲིན།"
 
-#: ../libpurple/protocols/msn/msn.c:2483
+#: ../libpurple/protocols/msn/msn.c:2484
 msgid "Personal IM"
 msgstr "རང་དོན་ ཨའི་ཨེམ།"
 
-#: ../libpurple/protocols/msn/msn.c:2485
+#: ../libpurple/protocols/msn/msn.c:2486
 msgid "Anniversary"
 msgstr "ལོ་འཁོར་དུས་དྲན།"
 
 #. Business
-#: ../libpurple/protocols/msn/msn.c:2501
+#: ../libpurple/protocols/msn/msn.c:2502
 msgid "Work"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:2504
-#: ../libpurple/protocols/oscar/userinfo.c:478
+#: ../libpurple/protocols/msn/msn.c:2505
+#: ../libpurple/protocols/oscar/userinfo.c:477
 msgid "Company"
 msgstr "ཚོང་སྡེ།"
 
-#: ../libpurple/protocols/msn/msn.c:2505
+#: ../libpurple/protocols/msn/msn.c:2506
 #: ../libpurple/protocols/novell/novell.c:1488
 msgid "Department"
 msgstr "ལས་ཁུངས།"
 
-#: ../libpurple/protocols/msn/msn.c:2506
+#: ../libpurple/protocols/msn/msn.c:2507
 msgid "Profession"
 msgstr "ཁྱད་ལས།"
 
-#: ../libpurple/protocols/msn/msn.c:2507
+#: ../libpurple/protocols/msn/msn.c:2508
 msgid "Work Phone"
 msgstr "བརྒྱུད་འཕྲིན་ལཱ་གཡོག"
 
-#: ../libpurple/protocols/msn/msn.c:2508
+#: ../libpurple/protocols/msn/msn.c:2509
 msgid "Work Phone 2"
 msgstr "བརྒྱུད་འཕྲིན་ ༢ ལཱ་གཡོག"
 
-#: ../libpurple/protocols/msn/msn.c:2509
-#: ../libpurple/protocols/oscar/userinfo.c:468
+#: ../libpurple/protocols/msn/msn.c:2510
+#: ../libpurple/protocols/oscar/userinfo.c:467
 msgid "Work Address"
 msgstr "ལཱ་གི་ཁ་བྱང་།"
 
-#: ../libpurple/protocols/msn/msn.c:2510
+#: ../libpurple/protocols/msn/msn.c:2511
 msgid "Work Mobile"
 msgstr "འགྲུལ་འཕྲིན་ལཱ་གཡོག"
 
-#: ../libpurple/protocols/msn/msn.c:2511
+#: ../libpurple/protocols/msn/msn.c:2512
 msgid "Work Pager"
 msgstr "བརྡ་འཕྲུལ་ལཱ་གཡོག"
 
-#: ../libpurple/protocols/msn/msn.c:2512
+#: ../libpurple/protocols/msn/msn.c:2513
 msgid "Work Fax"
 msgstr "ལཱ་གཡོག་ དཔར་འཕྲིན།"
 
-#: ../libpurple/protocols/msn/msn.c:2513
+#: ../libpurple/protocols/msn/msn.c:2514
 msgid "Work Email"
 msgstr "གློག་འཕྲིན་ ལཱ་གཡོག"
 
-#: ../libpurple/protocols/msn/msn.c:2514
+#: ../libpurple/protocols/msn/msn.c:2515
 msgid "Work IM"
 msgstr "ཨའི་ཨེམ་ ལཱ་གཡོག"
 
-#: ../libpurple/protocols/msn/msn.c:2515
+#: ../libpurple/protocols/msn/msn.c:2516
 msgid "Start Date"
 msgstr "ཚེས་གྲངས་དགོ་བཙུགས།"
 
-#: ../libpurple/protocols/msn/msn.c:2585 ../libpurple/protocols/msn/msn.c:2591
-#: ../libpurple/protocols/msn/msn.c:2598 ../libpurple/protocols/msn/msn.c:2605
+#: ../libpurple/protocols/msn/msn.c:2586 ../libpurple/protocols/msn/msn.c:2592
+#: ../libpurple/protocols/msn/msn.c:2599 ../libpurple/protocols/msn/msn.c:2606
 msgid "Favorite Things"
 msgstr "དགའ་མི་ཅ་ལ་ཚུ།"
 
-#: ../libpurple/protocols/msn/msn.c:2650
+#: ../libpurple/protocols/msn/msn.c:2651
 msgid "Last Updated"
 msgstr "མཇུག་མམ་གྱི་དུས་མཐུན་བཟོ།"
 
-#: ../libpurple/protocols/msn/msn.c:2661
-#: ../libpurple/protocols/silc/ops.c:1038
+#: ../libpurple/protocols/msn/msn.c:2662
+#: ../libpurple/protocols/silc/ops.c:1039
 #: ../libpurple/protocols/silc10/ops.c:1060
 msgid "Homepage"
 msgstr "ཁྱིམ་ཤོག་ལེབ།"
 
-#: ../libpurple/protocols/msn/msn.c:2687
+#: ../libpurple/protocols/msn/msn.c:2688
 msgid "The user has not created a public profile."
 msgstr "ལག་ལེན་པ་གིས་ མི་མང་གི་གསལ་སྡུད་ བཟོ་བསྐྲུན་མ་འབད་བས།"
 
-#: ../libpurple/protocols/msn/msn.c:2688
+#: ../libpurple/protocols/msn/msn.c:2689
 msgid ""
 "MSN reported not being able to find the user's profile. This either means "
 "that the user does not exist, or that the user exists but has not created a "
@@ -8214,16 +8211,16 @@
 "འདི་ཡང་ ཡང་ཅིན་ ལག་ལེན་པ་འདི་མེདཔ་ཨིན་ན་ ཡང་ན་ "
 "ཡོད་དེ་མི་མང་གི་གསལ་སྡུད་གསར་བསྐྲུན་མ་འབདཝ་ཨིན་མས།"
 
-#: ../libpurple/protocols/msn/msn.c:2692
+#: ../libpurple/protocols/msn/msn.c:2693
 msgid ""
 "Could not find any information in the user's profile. The user most likely "
 "does not exist."
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:2700
+#: ../libpurple/protocols/msn/msn.c:2701
 #: ../libpurple/protocols/myspace/user.c:194
 #: ../libpurple/protocols/myspace/user.c:197
-#: ../libpurple/protocols/oscar/userinfo.c:536
+#: ../libpurple/protocols/oscar/userinfo.c:535
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1237
 msgid "View web profile"
 msgstr ""
@@ -8237,31 +8234,31 @@
 #. *< name
 #. *< version
 #. *< summary
-#: ../libpurple/protocols/msn/msn.c:2998 ../libpurple/protocols/msn/msn.c:2999
+#: ../libpurple/protocols/msn/msn.c:2999 ../libpurple/protocols/msn/msn.c:3000
 msgid "Windows Live Messenger Protocol Plugin"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:3033
+#: ../libpurple/protocols/msn/msn.c:3034
 msgid "Use HTTP Method"
 msgstr "ཨེཆ་ཊི་ཊི་པི་ ཐབས་ལམ་ ལག་ལེན་འཐབ།"
 
-#: ../libpurple/protocols/msn/msn.c:3038
+#: ../libpurple/protocols/msn/msn.c:3039
 msgid "HTTP Method Server"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:3043
+#: ../libpurple/protocols/msn/msn.c:3044
 msgid "Show custom smileys"
 msgstr "སྲོལ་སྒྲིག་ སི་མའི་ལི་ཚུ་སྟོན།"
 
-#: ../libpurple/protocols/msn/msn.c:3048
+#: ../libpurple/protocols/msn/msn.c:3049
 msgid "Allow direct connections"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:3053
+#: ../libpurple/protocols/msn/msn.c:3054
 msgid "Allow connecting from multiple locations"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:3061
+#: ../libpurple/protocols/msn/msn.c:3062
 msgid "nudge: nudge a user to get their attention"
 msgstr "ལྷོག་བཀོག: ཁོང་རའི་དྲན་བཏོན་ནིའི་དོན་ལུ་ ལག་ལེན་པ་གཅིག་ལྷོག་བཀོག"
 
@@ -8273,44 +8270,44 @@
 msgid "Windows Live ID authentication:Invalid response"
 msgstr ""
 
-#: ../libpurple/protocols/msn/notification.c:833
+#: ../libpurple/protocols/msn/notification.c:824
 msgid "The following users are missing from your addressbook"
 msgstr ""
 
-#: ../libpurple/protocols/msn/notification.c:841
-#: ../libpurple/protocols/msn/notification.c:888
+#: ../libpurple/protocols/msn/notification.c:832
+#: ../libpurple/protocols/msn/notification.c:879
 #, c-format
 msgid "Unknown error (%d): %s"
 msgstr ""
 
-#: ../libpurple/protocols/msn/notification.c:845
-#: ../libpurple/protocols/msn/notification.c:869
-#: ../libpurple/protocols/sametime/sametime.c:4436
+#: ../libpurple/protocols/msn/notification.c:836
+#: ../libpurple/protocols/msn/notification.c:860
+#: ../libpurple/protocols/sametime/sametime.c:4472
 msgid "Unable to add user"
 msgstr "ལག་ལེན་པ་ཁ་སྐོང་བརྐྱབ་མ་ཚུགས།"
 
 #. Unknown error!
-#: ../libpurple/protocols/msn/notification.c:868
-#: ../libpurple/protocols/msn/notification.c:914
-#: ../libpurple/protocols/yahoo/libymsg.c:2143
+#: ../libpurple/protocols/msn/notification.c:859
+#: ../libpurple/protocols/msn/notification.c:905
+#: ../libpurple/protocols/yahoo/libymsg.c:2142
 #, c-format
 msgid "Unknown error (%d)"
 msgstr ""
 
-#: ../libpurple/protocols/msn/notification.c:892
-#: ../libpurple/protocols/msn/notification.c:915
+#: ../libpurple/protocols/msn/notification.c:883
+#: ../libpurple/protocols/msn/notification.c:906
 msgid "Unable to remove user"
 msgstr ""
 
-#: ../libpurple/protocols/msn/notification.c:1219
+#: ../libpurple/protocols/msn/notification.c:1210
 msgid "Mobile message was not sent because it was too long."
 msgstr ""
 
-#: ../libpurple/protocols/msn/notification.c:1221
+#: ../libpurple/protocols/msn/notification.c:1212
 msgid "Mobile message was not sent because an unknown error occurred."
 msgstr ""
 
-#: ../libpurple/protocols/msn/notification.c:2243
+#: ../libpurple/protocols/msn/notification.c:2234
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -8550,7 +8547,7 @@
 #. (reference: "libpurple/request.h")
 #: ../libpurple/protocols/mxit/actions.c:224
 #: ../libpurple/protocols/mxit/actions.c:313
-#: ../libpurple/protocols/oscar/userinfo.c:528
+#: ../libpurple/protocols/oscar/userinfo.c:527
 msgid "Profile"
 msgstr "གསལ་སྡུད།"
 
@@ -8676,7 +8673,7 @@
 msgstr ""
 
 #: ../libpurple/protocols/mxit/actions.c:501
-#: ../libpurple/protocols/oscar/oscar.c:5328
+#: ../libpurple/protocols/oscar/oscar.c:5333
 msgid "_Search"
 msgstr ""
 
@@ -8716,16 +8713,16 @@
 msgstr ""
 
 #. file read error
-#: ../libpurple/protocols/mxit/filexfer.c:177
+#: ../libpurple/protocols/mxit/filexfer.c:178
 msgid "Unable to access the local file"
 msgstr ""
 
 #. file write error
-#: ../libpurple/protocols/mxit/filexfer.c:455
+#: ../libpurple/protocols/mxit/filexfer.c:456
 msgid "Unable to save the file"
 msgstr ""
 
-#: ../libpurple/protocols/mxit/http.c:287
+#: ../libpurple/protocols/mxit/http.c:281
 msgid ""
 "Unable to connect to the MXit HTTP server. Please check your server settings."
 msgstr ""
@@ -8976,146 +8973,146 @@
 msgstr[1] ""
 
 #. we must have lost the connection, so terminate it so that we can reconnect
-#: ../libpurple/protocols/mxit/protocol.c:417
+#: ../libpurple/protocols/mxit/protocol.c:444
 msgid "We have lost the connection to MXit. Please reconnect."
 msgstr ""
 
 #. packet could not be queued for transmission
-#: ../libpurple/protocols/mxit/protocol.c:513
+#: ../libpurple/protocols/mxit/protocol.c:540
 msgid "Message Send Error"
 msgstr ""
 
-#: ../libpurple/protocols/mxit/protocol.c:513
+#: ../libpurple/protocols/mxit/protocol.c:540
 msgid "Unable to process your request at this time"
 msgstr ""
 
-#: ../libpurple/protocols/mxit/protocol.c:539
+#: ../libpurple/protocols/mxit/protocol.c:566
 msgid "Timeout while waiting for a response from the MXit server."
 msgstr ""
 
-#: ../libpurple/protocols/mxit/protocol.c:1475
+#: ../libpurple/protocols/mxit/protocol.c:1478
 msgid "Successfully Logged In..."
 msgstr ""
 
-#: ../libpurple/protocols/mxit/protocol.c:1572
+#: ../libpurple/protocols/mxit/protocol.c:1575
 #, c-format
 msgid ""
 "%s sent you an encrypted message, but it is not supported on this client."
 msgstr ""
 
-#: ../libpurple/protocols/mxit/protocol.c:1573
-#: ../libpurple/protocols/mxit/protocol.c:2490
+#: ../libpurple/protocols/mxit/protocol.c:1576
+#: ../libpurple/protocols/mxit/protocol.c:2529
 msgid "Message Error"
 msgstr ""
 
 #. could not be decrypted
-#: ../libpurple/protocols/mxit/protocol.c:1581
+#: ../libpurple/protocols/mxit/protocol.c:1584
 msgid "An encrypted message was received which could not be decrypted."
 msgstr ""
 
-#: ../libpurple/protocols/mxit/protocol.c:2291
+#: ../libpurple/protocols/mxit/protocol.c:2330
 msgid "Cannot perform redirect using the specified protocol"
 msgstr ""
 
-#: ../libpurple/protocols/mxit/protocol.c:2459
+#: ../libpurple/protocols/mxit/protocol.c:2498
 msgid "An internal MXit server error occurred."
 msgstr ""
 
-#: ../libpurple/protocols/mxit/protocol.c:2478
+#: ../libpurple/protocols/mxit/protocol.c:2517
 #, c-format
 msgid "Login error: %s (%i)"
 msgstr ""
 
-#: ../libpurple/protocols/mxit/protocol.c:2483
+#: ../libpurple/protocols/mxit/protocol.c:2522
 #, c-format
 msgid "Logout error: %s (%i)"
 msgstr ""
 
-#: ../libpurple/protocols/mxit/protocol.c:2487
+#: ../libpurple/protocols/mxit/protocol.c:2526
 msgid "Contact Error"
 msgstr ""
 
-#: ../libpurple/protocols/mxit/protocol.c:2493
+#: ../libpurple/protocols/mxit/protocol.c:2532
 msgid "Message Sending Error"
 msgstr ""
 
-#: ../libpurple/protocols/mxit/protocol.c:2496
+#: ../libpurple/protocols/mxit/protocol.c:2535
 msgid "Status Error"
 msgstr ""
 
-#: ../libpurple/protocols/mxit/protocol.c:2499
+#: ../libpurple/protocols/mxit/protocol.c:2538
 msgid "Mood Error"
 msgstr ""
 
-#: ../libpurple/protocols/mxit/protocol.c:2510
+#: ../libpurple/protocols/mxit/protocol.c:2549
 msgid "Invitation Error"
 msgstr ""
 
-#: ../libpurple/protocols/mxit/protocol.c:2513
+#: ../libpurple/protocols/mxit/protocol.c:2552
 msgid "Contact Removal Error"
 msgstr ""
 
-#: ../libpurple/protocols/mxit/protocol.c:2517
+#: ../libpurple/protocols/mxit/protocol.c:2556
 msgid "Subscription Error"
 msgstr ""
 
-#: ../libpurple/protocols/mxit/protocol.c:2520
+#: ../libpurple/protocols/mxit/protocol.c:2559
 msgid "Contact Update Error"
 msgstr ""
 
-#: ../libpurple/protocols/mxit/protocol.c:2523
+#: ../libpurple/protocols/mxit/protocol.c:2562
 msgid "File Transfer Error"
 msgstr ""
 
-#: ../libpurple/protocols/mxit/protocol.c:2526
+#: ../libpurple/protocols/mxit/protocol.c:2565
 msgid "Cannot create MultiMx room"
 msgstr ""
 
-#: ../libpurple/protocols/mxit/protocol.c:2529
+#: ../libpurple/protocols/mxit/protocol.c:2568
 msgid "MultiMx Invitation Error"
 msgstr ""
 
-#: ../libpurple/protocols/mxit/protocol.c:2533
+#: ../libpurple/protocols/mxit/protocol.c:2572
 msgid "Profile Error"
 msgstr ""
 
 #. bad packet
-#: ../libpurple/protocols/mxit/protocol.c:2747
+#: ../libpurple/protocols/mxit/protocol.c:2787
 msgid "Invalid packet received from MXit."
 msgstr ""
 
 #. connection error
-#: ../libpurple/protocols/mxit/protocol.c:2812
+#: ../libpurple/protocols/mxit/protocol.c:2852
 msgid "A connection error occurred to MXit. (read stage 0x01)"
 msgstr ""
 
 #. connection closed
-#: ../libpurple/protocols/mxit/protocol.c:2817
+#: ../libpurple/protocols/mxit/protocol.c:2857
 msgid "A connection error occurred to MXit. (read stage 0x02)"
 msgstr ""
 
-#: ../libpurple/protocols/mxit/protocol.c:2827
+#: ../libpurple/protocols/mxit/protocol.c:2867
 msgid "A connection error occurred to MXit. (read stage 0x03)"
 msgstr ""
 
 #. malformed packet length record (too long)
-#: ../libpurple/protocols/mxit/protocol.c:2838
+#: ../libpurple/protocols/mxit/protocol.c:2879
 msgid "A connection error occurred to MXit. (read stage 0x04)"
 msgstr ""
 
 #. connection error
-#: ../libpurple/protocols/mxit/protocol.c:2849
+#: ../libpurple/protocols/mxit/protocol.c:2890
 msgid "A connection error occurred to MXit. (read stage 0x05)"
 msgstr ""
 
 #. connection closed
-#: ../libpurple/protocols/mxit/protocol.c:2854
+#: ../libpurple/protocols/mxit/protocol.c:2895
 msgid "A connection error occurred to MXit. (read stage 0x06)"
 msgstr ""
 
 #: ../libpurple/protocols/mxit/roster.c:210
-#: ../libpurple/protocols/silc/buddy.c:1512
-#: ../libpurple/protocols/silc/util.c:484
+#: ../libpurple/protocols/silc/buddy.c:1518
+#: ../libpurple/protocols/silc/util.c:535
 #: ../libpurple/protocols/silc10/buddy.c:1525
 #: ../libpurple/protocols/silc10/util.c:527
 msgid "In Love"
@@ -9349,8 +9346,8 @@
 msgstr ""
 
 #: ../libpurple/protocols/myspace/user.c:120
-#: ../libpurple/protocols/zephyr/zephyr.c:801
-#: ../libpurple/protocols/zephyr/zephyr.c:1184
+#: ../libpurple/protocols/zephyr/zephyr.c:794
+#: ../libpurple/protocols/zephyr/zephyr.c:1174
 msgid "User"
 msgstr ""
 
@@ -9370,45 +9367,45 @@
 msgid "Client Version"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/user.c:634
-#: ../libpurple/protocols/myspace/user.c:788
+#: ../libpurple/protocols/myspace/user.c:632
+#: ../libpurple/protocols/myspace/user.c:786
 msgid ""
 "An error occurred while trying to set the username.  Please try again, or "
 "visit http://editprofile.myspace.com/index.cfm?fuseaction=profile.username "
 "to set your username."
 msgstr ""
 
-#: ../libpurple/protocols/myspace/user.c:808
+#: ../libpurple/protocols/myspace/user.c:806
 msgid "MySpaceIM - Username Available"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/user.c:809
+#: ../libpurple/protocols/myspace/user.c:807
 msgid "This username is available. Would you like to set it?"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/user.c:810
+#: ../libpurple/protocols/myspace/user.c:808
 msgid "ONCE SET, THIS CANNOT BE CHANGED!"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/user.c:821
-#: ../libpurple/protocols/myspace/user.c:882
+#: ../libpurple/protocols/myspace/user.c:819
+#: ../libpurple/protocols/myspace/user.c:880
 msgid "MySpaceIM - Please Set a Username"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/user.c:822
+#: ../libpurple/protocols/myspace/user.c:820
 msgid "This username is unavailable."
 msgstr ""
 
-#: ../libpurple/protocols/myspace/user.c:823
+#: ../libpurple/protocols/myspace/user.c:821
 msgid "Please try another username:"
 msgstr ""
 
 #. Protocol won't log in now without a username set.. Disconnect
-#: ../libpurple/protocols/myspace/user.c:872
+#: ../libpurple/protocols/myspace/user.c:870
 msgid "No username set"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/user.c:883
+#: ../libpurple/protocols/myspace/user.c:881
 msgid "Please enter a username to check its availability:"
 msgstr ""
 
@@ -9419,7 +9416,7 @@
 #. * connotation, for example, "he was zapped by electricity when
 #. * he put a fork in the toaster."
 #: ../libpurple/protocols/myspace/zap.c:44
-#: ../libpurple/protocols/myspace/zap.c:216
+#: ../libpurple/protocols/myspace/zap.c:217
 msgid "Zap"
 msgstr ""
 
@@ -9618,9 +9615,9 @@
 
 #: ../libpurple/protocols/novell/nmuser.c:1893
 #: ../libpurple/protocols/oscar/clientlogin.c:487
-#: ../libpurple/protocols/oscar/oscar.c:1094
-#: ../libpurple/protocols/simple/simple.c:1132
-#: ../libpurple/protocols/yahoo/libymsg.c:2109
+#: ../libpurple/protocols/oscar/oscar.c:1096
+#: ../libpurple/protocols/simple/simple.c:1127
+#: ../libpurple/protocols/yahoo/libymsg.c:2108
 msgid "Incorrect password"
 msgstr ""
 
@@ -9817,7 +9814,7 @@
 msgstr "འཕྲིན་བཀག"
 
 #: ../libpurple/protocols/novell/novell.c:1510
-#: ../libpurple/protocols/sametime/sametime.c:4133
+#: ../libpurple/protocols/sametime/sametime.c:4169
 msgid "User ID"
 msgstr "ལག་ལེན་པ་  ཨའི་ཌི།"
 
@@ -9916,8 +9913,8 @@
 
 #: ../libpurple/protocols/oscar/authorization.c:87
 #: ../libpurple/protocols/oscar/authorization.c:97
-#: ../libpurple/protocols/oscar/oscar.c:1962
-#: ../libpurple/protocols/oscar/oscar.c:4368
+#: ../libpurple/protocols/oscar/oscar.c:1964
+#: ../libpurple/protocols/oscar/oscar.c:4373
 #: ../libpurple/protocols/yahoo/libymsg.c:1367
 msgid "No reason given."
 msgstr "རྒྱུ་མཚན་མ་བཀོད་པས།"
@@ -9930,9 +9927,9 @@
 #. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
 #. 
 #: ../libpurple/protocols/oscar/authorization.c:98
-#: ../libpurple/protocols/oscar/oscar.c:1221
-#: ../libpurple/protocols/oscar/oscar.c:4931
-#: ../libpurple/protocols/oscar/oscar.c:5271 ../libpurple/request.h:1498
+#: ../libpurple/protocols/oscar/oscar.c:1223
+#: ../libpurple/protocols/oscar/oscar.c:4936
+#: ../libpurple/protocols/oscar/oscar.c:5276 ../libpurple/request.h:1498
 msgid "_OK"
 msgstr ""
 
@@ -9956,7 +9953,7 @@
 "ཁྱོད་ཀྱིས་འཕྲོ་མཐུད་དེ་རང་འབད་རྩོལ་བསྐྱེད་པ་ཅིན་ ཧེང་བཀལ་རང་བསྒུག་དགོ"
 
 #: ../libpurple/protocols/oscar/clientlogin.c:283
-#: ../libpurple/protocols/oscar/oscar.c:1296
+#: ../libpurple/protocols/oscar/oscar.c:1298
 msgid ""
 "You required encryption in your account settings, but one of the servers "
 "doesn't support it."
@@ -10109,7 +10106,7 @@
 msgid "Watching a movie"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/family_locate.c:419 ../pidgin/gtkconv.c:6823
+#: ../libpurple/protocols/oscar/family_locate.c:419 ../pidgin/gtkconv.c:6820
 #: ../pidgin/gtkstatusbox.c:714
 msgid "Typing"
 msgstr "ཡིག་དཔར་བརྐྱབ་དོ།"
@@ -10202,10 +10199,9 @@
 msgstr ""
 
 #: ../libpurple/protocols/oscar/flap_connection.c:477
-#: ../libpurple/proxy.c:1534 ../libpurple/proxy.c:1564
-#: ../libpurple/proxy.c:1644 ../libpurple/proxy.c:1715
-#: ../libpurple/proxy.c:1725 ../libpurple/proxy.c:1821
-#: ../libpurple/proxy.c:1960
+#: ../libpurple/proxy.c:1561 ../libpurple/proxy.c:1591
+#: ../libpurple/proxy.c:1671 ../libpurple/proxy.c:1742
+#: ../libpurple/proxy.c:1843 ../libpurple/proxy.c:1982
 msgid "Received invalid data on connection with server"
 msgstr ""
 
@@ -10246,7 +10242,7 @@
 #: ../libpurple/protocols/oscar/libicq.c:162
 #: ../libpurple/protocols/yahoo/libyahoo.c:326
 #: ../libpurple/protocols/yahoo/libyahoojp.c:222
-#: ../libpurple/protocols/zephyr/zephyr.c:2997
+#: ../libpurple/protocols/zephyr/zephyr.c:2982
 msgid "Encoding"
 msgstr "ཨིན་ཀོ་ཌིང་།"
 
@@ -10289,17 +10285,17 @@
 msgstr "ཡིག་སྣོད་ %s འདི་ %s གི་ ཚད་མང་མཐའ་ལས་སྦོམ་མའི་ %s ཨིན།"
 
 #: ../libpurple/protocols/oscar/oscar.c:157
-#: ../libpurple/protocols/oscar/oscar.c:4766
+#: ../libpurple/protocols/oscar/oscar.c:4771
 msgid "Free For Chat"
 msgstr "ཁ་སླབ་ནི་ དལཝ་ཨིན།"
 
 #: ../libpurple/protocols/oscar/oscar.c:161
-#: ../libpurple/protocols/oscar/oscar.c:4848
+#: ../libpurple/protocols/oscar/oscar.c:4853
 msgid "Not Available"
 msgstr "ཐོབ་མི་ཚུགས།"
 
 #: ../libpurple/protocols/oscar/oscar.c:163
-#: ../libpurple/protocols/oscar/oscar.c:4834
+#: ../libpurple/protocols/oscar/oscar.c:4839
 msgid "Occupied"
 msgstr "དལ་ཁོམས་མེདཔ།"
 
@@ -10308,28 +10304,28 @@
 msgstr "ཝེབ་ དྲན་ཤེས་ཅན།"
 
 #: ../libpurple/protocols/oscar/oscar.c:169
-#: ../libpurple/protocols/yahoo/libymsg.c:4087 ../libpurple/status.c:165
+#: ../libpurple/protocols/yahoo/libymsg.c:4100 ../libpurple/status.c:165
 #: ../pidgin/gtkdocklet.c:560 ../pidgin/gtkstatusbox.c:1099
 msgid "Invisible"
 msgstr "མ་མཐོངམ།"
 
 #: ../libpurple/protocols/oscar/oscar.c:171
-#: ../libpurple/protocols/oscar/oscar.c:4774
+#: ../libpurple/protocols/oscar/oscar.c:4779
 msgid "Evil"
 msgstr ""
 
 #: ../libpurple/protocols/oscar/oscar.c:173
-#: ../libpurple/protocols/oscar/oscar.c:4782
+#: ../libpurple/protocols/oscar/oscar.c:4787
 msgid "Depression"
 msgstr ""
 
 #: ../libpurple/protocols/oscar/oscar.c:175
-#: ../libpurple/protocols/oscar/oscar.c:4790
+#: ../libpurple/protocols/oscar/oscar.c:4795
 msgid "At home"
 msgstr ""
 
 #: ../libpurple/protocols/oscar/oscar.c:177
-#: ../libpurple/protocols/oscar/oscar.c:4798
+#: ../libpurple/protocols/oscar/oscar.c:4803
 msgid "At work"
 msgstr ""
 
@@ -10376,7 +10372,7 @@
 
 #: ../libpurple/protocols/oscar/oscar.c:896
 #: ../libpurple/protocols/oscar/oscar.c:937
-#: ../libpurple/protocols/oscar/oscar.c:1008
+#: ../libpurple/protocols/oscar/oscar.c:1010
 #, c-format
 msgid "You may be disconnected shortly.  If so, check %s for updates."
 msgstr ""
@@ -10386,36 +10382,36 @@
 msgid "Unable to get a valid AIM login hash."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:1012
+#: ../libpurple/protocols/oscar/oscar.c:1014
 msgid "Unable to get a valid login hash."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:1055
-#: ../libpurple/protocols/oscar/oscar.c:1174
+#: ../libpurple/protocols/oscar/oscar.c:1057
+#: ../libpurple/protocols/oscar/oscar.c:1176
 msgid "Received authorization"
 msgstr "དབང་སྤྲོད་ཐོབ་ཡོདཔ།"
 
 #. Unregistered username
 #. the username does not exist
-#: ../libpurple/protocols/oscar/oscar.c:1088
-#: ../libpurple/protocols/yahoo/libymsg.c:2120
-#: ../libpurple/protocols/yahoo/libymsg.c:2395
+#: ../libpurple/protocols/oscar/oscar.c:1090
+#: ../libpurple/protocols/yahoo/libymsg.c:2119
+#: ../libpurple/protocols/yahoo/libymsg.c:2410
 msgid "Username does not exist"
 msgstr ""
 
 #. Suspended account
-#: ../libpurple/protocols/oscar/oscar.c:1098
+#: ../libpurple/protocols/oscar/oscar.c:1100
 msgid "Your account is currently suspended"
 msgstr ""
 
 #. service temporarily unavailable
-#: ../libpurple/protocols/oscar/oscar.c:1103
+#: ../libpurple/protocols/oscar/oscar.c:1105
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr ""
 "ཨེ་ཨོ་ཨེལ་ འཕྲལ་མྱུར་ འཕྲིན་སྐྱེལ་པའི་ཞབས་ཏོག་འདི་ གནས་སྐབས་ཅིག་ ཐོབ་མི་ཚུགས།"
 
 #. username connecting too frequently
-#: ../libpurple/protocols/oscar/oscar.c:1107
+#: ../libpurple/protocols/oscar/oscar.c:1109
 msgid ""
 "Your username has been connecting and disconnecting too frequently. Wait ten "
 "minutes and try again. If you continue to try, you will need to wait even "
@@ -10423,7 +10419,7 @@
 msgstr ""
 
 #. client too old
-#: ../libpurple/protocols/oscar/oscar.c:1112
+#: ../libpurple/protocols/oscar/oscar.c:1114
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr ""
@@ -10431,34 +10427,34 @@
 "ལུ་ཡར་བསྐྱེད་འབད་གནང་།"
 
 #. IP address connecting too frequently
-#: ../libpurple/protocols/oscar/oscar.c:1119
+#: ../libpurple/protocols/oscar/oscar.c:1121
 msgid ""
 "Your IP address has been connecting and disconnecting too frequently. Wait a "
 "minute and try again. If you continue to try, you will need to wait even "
 "longer."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:1202
+#: ../libpurple/protocols/oscar/oscar.c:1204
 msgid "The SecurID key entered is invalid"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:1218
+#: ../libpurple/protocols/oscar/oscar.c:1220
 msgid "Enter SecurID"
 msgstr "མཐའ་བཙན་གྱི་ ཨའི་ཌི་བཙུགས།"
 
-#: ../libpurple/protocols/oscar/oscar.c:1219
+#: ../libpurple/protocols/oscar/oscar.c:1221
 msgid "Enter the 6 digit number from the digital display."
 msgstr "ཌི་ཇི་ཊཱལ་བཀྲམ་སྟོན་ནང་ལས་ཨང་གྲངས་ཨང་ཡིག་དྲུག་པ་འདི་བཙུགས།"
 
-#: ../libpurple/protocols/oscar/oscar.c:1257
+#: ../libpurple/protocols/oscar/oscar.c:1259
 msgid "Password sent"
 msgstr "ཆོག་ཡིག་བཏང་ཡི།"
 
-#: ../libpurple/protocols/oscar/oscar.c:1348
+#: ../libpurple/protocols/oscar/oscar.c:1350
 msgid "Unable to initialize connection"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:1962
+#: ../libpurple/protocols/oscar/oscar.c:1964
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -10469,12 +10465,12 @@
 "ཁོང་ཚུ་ཁྱོད་ཀྱི་ཆ་རོགས་ཐོ་ཡིག་ནང་ཁ་སྐོང་འབད་ནིའི་ཞུ་བ་འདི་ཉན་མ་བཏུབ་པས  :\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:1963
+#: ../libpurple/protocols/oscar/oscar.c:1965
 msgid "ICQ authorization denied."
 msgstr "ཨའི་སི་ཀིའུ་ དབང་སྤྲོད་ཉན་མ་བཏུབ་པས།"
 
 #. Someone has granted you authorization
-#: ../libpurple/protocols/oscar/oscar.c:1970
+#: ../libpurple/protocols/oscar/oscar.c:1972
 #, c-format
 msgid "The user %u has granted your request to add them to your buddy list."
 msgstr ""
@@ -10482,7 +10478,7 @@
 "ཁོང་ཚུ་ཁྱོད་ཀྱི་ཆ་རོགས་ཐོ་ཡིག་ནང་ཁ་སྐོང་རྐྱབས་ནིའི་དོན་ལུ་ཞུ་བའི་གནང་བ་བྱིན་ན"
 "ུག"
 
-#: ../libpurple/protocols/oscar/oscar.c:1978
+#: ../libpurple/protocols/oscar/oscar.c:1980
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -10495,7 +10491,7 @@
 "ལས: %s [%s]\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:1986
+#: ../libpurple/protocols/oscar/oscar.c:1988
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -10508,7 +10504,7 @@
 "ལས: %s [%s]\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:1994
+#: ../libpurple/protocols/oscar/oscar.c:1996
 #, c-format
 msgid ""
 "You have received an ICQ email from %s [%s]\n"
@@ -10521,25 +10517,25 @@
 "འཕྲིན་དོན་འདི་:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2028
+#: ../libpurple/protocols/oscar/oscar.c:2030
 #, c-format
 msgid "ICQ user %u has sent you a buddy: %s (%s)"
 msgstr "ཨའི་སི་ཀིའུ་  ལག་ལེན་པ %u འདི་གིས་ཁྱོད་ལུ་ ཆ་རོགས་ %s (%s)བཏང་ནུག"
 
-#: ../libpurple/protocols/oscar/oscar.c:2036
+#: ../libpurple/protocols/oscar/oscar.c:2038
 msgid "Do you want to add this buddy to your buddy list?"
 msgstr "ཆ་རོགས་འདི་ ཁྱོད་ཀྱི་ཆ་རོགས་ཐོ་ཡིག་ནང་ཁ་སྐོང་རྐྱབས་ནི་ཨིན་ན?"
 
-#: ../libpurple/protocols/oscar/oscar.c:2041 ../pidgin/gtkroomlist.c:325
+#: ../libpurple/protocols/oscar/oscar.c:2043 ../pidgin/gtkroomlist.c:325
 #: ../pidgin/plugins/disco/gtkdisco.c:694
 msgid "_Add"
 msgstr "ཁ་སྐོང་བརྐྱབ།(_A)"
 
-#: ../libpurple/protocols/oscar/oscar.c:2042
+#: ../libpurple/protocols/oscar/oscar.c:2044
 msgid "_Decline"
 msgstr "ཉམས་ནི།(_D)"
 
-#: ../libpurple/protocols/oscar/oscar.c:2190
+#: ../libpurple/protocols/oscar/oscar.c:2192
 #, c-format
 msgid "You missed %hu message from %s because it was invalid."
 msgid_plural "You missed %hu messages from %s because they were invalid."
@@ -10547,7 +10543,7 @@
 "ཁྱོད་ཀྱིས  %huའཕྲིན་དོན་འདི་%sལས་བྱིག་ཡར་སོ་ནུག  ག་ཅི་འབད་ཟེར་བ་ཅིན་ "
 "འདི་ལུ་ནུས་པ་མེདཔ་ཨིན་པས།"
 
-#: ../libpurple/protocols/oscar/oscar.c:2199
+#: ../libpurple/protocols/oscar/oscar.c:2201
 #, c-format
 msgid "You missed %hu message from %s because it was too large."
 msgid_plural "You missed %hu messages from %s because they were too large."
@@ -10555,7 +10551,7 @@
 "ཁྱོད་ཀྱིས་  %huའཕྲིན་དོན་འདི་ %s ལས་ བྱིག་ཡར་སོ་ནུག  ག་ཅི་འབད་ཟེར་བ་ཅིན་ "
 "འདི་སྦོམ་དྲགསཔ་ཨིན་པས།"
 
-#: ../libpurple/protocols/oscar/oscar.c:2208
+#: ../libpurple/protocols/oscar/oscar.c:2210
 #, c-format
 msgid ""
 "You missed %hu message from %s because the rate limit has been exceeded."
@@ -10565,7 +10561,7 @@
 "ཁྱོད་ཀྱིས་  %huའཕྲིན་དོན་འདི %s ལས་ བྱིག་ཡར་སོ་ནུག  ག་ཅི་འབད་ཟེར་བ་ཅིན "
 "མགྱོགས་ཚད་འདི ལྷག་སོཔ་ཨིན་པས།"
 
-#: ../libpurple/protocols/oscar/oscar.c:2217
+#: ../libpurple/protocols/oscar/oscar.c:2219
 #, c-format
 msgid ""
 "You missed %hu message from %s because his/her warning level is too high."
@@ -10574,7 +10570,7 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../libpurple/protocols/oscar/oscar.c:2226
+#: ../libpurple/protocols/oscar/oscar.c:2228
 #, c-format
 msgid ""
 "You missed %hu message from %s because your warning level is too high."
@@ -10583,89 +10579,89 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../libpurple/protocols/oscar/oscar.c:2235
+#: ../libpurple/protocols/oscar/oscar.c:2237
 #, c-format
 msgid "You missed %hu message from %s for an unknown reason."
 msgid_plural "You missed %hu messages from %s for an unknown reason."
 msgstr[0] ""
 "ངོ་མ་ཤེས་པའི་རྒྱུ་མཚན་གྱི་དོན་ལུ་ %hu འཕྲིན་དོན་འདི་%sལས་ བྱིག་ཡར་སོ་ནུག"
 
-#: ../libpurple/protocols/oscar/oscar.c:2435
+#: ../libpurple/protocols/oscar/oscar.c:2437
 msgid "Your AIM connection may be lost."
 msgstr "ཁྱོད་ཀྱི་ ཨེ་ཨའི་ཨེམ་ མཐུད་ལམ་འདི་བརླག་གཏོར་ཞུགས་ཞུགསཔ་འོང་།"
 
-#: ../libpurple/protocols/oscar/oscar.c:2771
+#: ../libpurple/protocols/oscar/oscar.c:2773
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "ཁྱོད་  ཁ་སླབ་ཁང་མིག་%sནང་ལས་ མཐུད་ལམ་བཏོག་ད་ནུག"
 
-#: ../libpurple/protocols/oscar/oscar.c:2841
+#: ../libpurple/protocols/oscar/oscar.c:2843
 msgid "The new formatting is invalid."
 msgstr "རྩ་སྒྲིག་གསརཔ་འབད་དོ་ཡོད་མི་འདི་ནུས་མེད་ཨིན་པས།"
 
-#: ../libpurple/protocols/oscar/oscar.c:2842
+#: ../libpurple/protocols/oscar/oscar.c:2844
 msgid "Username formatting can change only capitalization and whitespace."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:2975
+#: ../libpurple/protocols/oscar/oscar.c:2978
 msgid "Pop-Up Message"
 msgstr "པོཔ་-ཨཔ་ འཕྲིན་དོན།"
 
-#: ../libpurple/protocols/oscar/oscar.c:3015
+#: ../libpurple/protocols/oscar/oscar.c:3018
 #, c-format
 msgid "The following username is associated with %s"
 msgid_plural "The following usernames are associated with %s"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../libpurple/protocols/oscar/oscar.c:3046
+#: ../libpurple/protocols/oscar/oscar.c:3049
 #, c-format
 msgid "No results found for email address %s"
 msgstr "གློག་འཕྲིན་ཁ་བྱང་ %s ལུ་ གྲུབ་འབྲས་ཚུ་མ་ཐོབ་པས།"
 
-#: ../libpurple/protocols/oscar/oscar.c:3067
+#: ../libpurple/protocols/oscar/oscar.c:3070
 #, c-format
 msgid "You should receive an email asking to confirm %s."
 msgstr "%s ངེས་དཔྱད་ལུ་འདྲི་དཔྱད་འབད་ཟེར་བའི་གློག་-འཕྲིན་གཅིག་ཐོབ་དགོཔ་ཨིན།"
 
-#: ../libpurple/protocols/oscar/oscar.c:3069
+#: ../libpurple/protocols/oscar/oscar.c:3072
 msgid "Account Confirmation Requested"
 msgstr "རྩིས་ཐོའི་ངེས་དཔྱད་ཞུ་ཡི།"
 
-#: ../libpurple/protocols/oscar/oscar.c:3102
+#: ../libpurple/protocols/oscar/oscar.c:3105
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format username because the requested name differs "
 "from the original."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:3104
+#: ../libpurple/protocols/oscar/oscar.c:3107
 #, c-format
 msgid "Error 0x%04x: Unable to format username because it is invalid."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:3106
+#: ../libpurple/protocols/oscar/oscar.c:3109
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format username because the requested name is too "
 "long."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:3108
+#: ../libpurple/protocols/oscar/oscar.c:3111
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because there is already a "
 "request pending for this username."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:3110
+#: ../libpurple/protocols/oscar/oscar.c:3113
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because the given address has "
 "too many usernames associated with it."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:3112
+#: ../libpurple/protocols/oscar/oscar.c:3115
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because the given address is "
@@ -10674,36 +10670,36 @@
 "འཛོལ་བ་ 0x%04x: བྱིན་ཏེ་ཡོད་པའི་ཁ་བྱང་འདི་ནུས་མེད་གཅིག་ཨིནམ་ལས་ གློག་-"
 "འཕྲིན་ཁ་བྱང་བསྒྱུར་བཅོས་འབད་མ་ཚུགས།"
 
-#: ../libpurple/protocols/oscar/oscar.c:3114
+#: ../libpurple/protocols/oscar/oscar.c:3117
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "འཛོལ་བ 0x%04x:ངོ་མ་ཤེས་པའི་འཛོལ་བ།"
 
-#: ../libpurple/protocols/oscar/oscar.c:3116
+#: ../libpurple/protocols/oscar/oscar.c:3119
 msgid "Error Changing Account Info"
 msgstr "རྩིས་ཐོའི་བརྡ་དོན་བསྒྱུར་བཅོས་འབདཝ་ད་ འཛོལ་བ།"
 
-#: ../libpurple/protocols/oscar/oscar.c:3122
+#: ../libpurple/protocols/oscar/oscar.c:3125
 #, c-format
 msgid "The email address for %s is %s"
 msgstr "%s ལུ་གློག་འཕྲིན་ཁ་བྱང་འདི་ %s ཨིན།"
 
-#: ../libpurple/protocols/oscar/oscar.c:3124
+#: ../libpurple/protocols/oscar/oscar.c:3127
 msgid "Account Info"
 msgstr "རྩིས་ཐོའི་བརྡ་དོན།"
 
-#: ../libpurple/protocols/oscar/oscar.c:3312
+#: ../libpurple/protocols/oscar/oscar.c:3315
 msgid ""
 "Your IM Image was not sent. You must be Direct Connected to send IM Images."
 msgstr ""
 "ཁྱོད་ཀྱི་ ཨའི་ཨེམ་གཟུགས་བརྙན་འདི་མ་བཏང་པས། ཨའི་ཨེམ་ གཟུགས་བརྙན་ཚུ་གཏང་ནི་ལུ་ "
 "ཐད་ཀར་མཐུད་དགོཔ་ཨིན།"
 
-#: ../libpurple/protocols/oscar/oscar.c:3539
+#: ../libpurple/protocols/oscar/oscar.c:3542
 msgid "Unable to set AIM profile."
 msgstr "ཨའི་ཨེམ་གསལ་སྡུད་ གཞི་སྒྲིག་འབད་མ་ཚུགས།"
 
-#: ../libpurple/protocols/oscar/oscar.c:3540
+#: ../libpurple/protocols/oscar/oscar.c:3543
 msgid ""
 "You have probably requested to set your profile before the login procedure "
 "completed.  Your profile remains unset; try setting it again when you are "
@@ -10714,7 +10710,7 @@
 "ཁྱོད་ཀྱི་གསལ་སྡུད་འདི་གཞི་སྒྲིག་མ་འབད་བར་ལུསཔ་ཨིན། ཁྱོད་ཆ་ཚང་སྦེ་མཐུད་ཚརཝ་ད་ "
 "ལོག་སྟེ་གཞི་སྒྲིག་འབད་ནིའི་འབད་རྩོལ་བསྐྱེད་།"
 
-#: ../libpurple/protocols/oscar/oscar.c:3554
+#: ../libpurple/protocols/oscar/oscar.c:3557
 #, c-format
 msgid ""
 "The maximum profile length of %d byte has been exceeded.  It has been "
@@ -10725,11 +10721,11 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../libpurple/protocols/oscar/oscar.c:3559
+#: ../libpurple/protocols/oscar/oscar.c:3562
 msgid "Profile too long."
 msgstr "གསལ་སྡུད་རིང་དྲགས་པས།"
 
-#: ../libpurple/protocols/oscar/oscar.c:3588
+#: ../libpurple/protocols/oscar/oscar.c:3591
 #, c-format
 msgid ""
 "The maximum away message length of %d byte has been exceeded.  It has been "
@@ -10740,11 +10736,11 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../libpurple/protocols/oscar/oscar.c:3593
+#: ../libpurple/protocols/oscar/oscar.c:3596
 msgid "Away message too long."
 msgstr "ཕྱི་ཁའི་འཕྲིན་དོན་འདི་རིང་དྲགས་པས།"
 
-#: ../libpurple/protocols/oscar/oscar.c:3693
+#: ../libpurple/protocols/oscar/oscar.c:3696
 #, c-format
 msgid ""
 "Unable to add the buddy %s because the username is invalid.  Usernames must "
@@ -10752,54 +10748,54 @@
 "numbers and spaces, or contain only numbers."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:3829
+#: ../libpurple/protocols/oscar/oscar.c:3832
 msgid "Unable to Retrieve Buddy List"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:3830
+#: ../libpurple/protocols/oscar/oscar.c:3833
 msgid ""
 "The AIM servers were temporarily unable to send your buddy list.  Your buddy "
 "list is not lost, and will probably become available in a few minutes."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:4011
-#: ../libpurple/protocols/oscar/oscar.c:4013
-#: ../libpurple/protocols/oscar/oscar.c:4237
-#: ../libpurple/protocols/oscar/oscar.c:4238
+#: ../libpurple/protocols/oscar/oscar.c:4016
+#: ../libpurple/protocols/oscar/oscar.c:4018
+#: ../libpurple/protocols/oscar/oscar.c:4242
 #: ../libpurple/protocols/oscar/oscar.c:4243
+#: ../libpurple/protocols/oscar/oscar.c:4248
 msgid "Orphans"
 msgstr "དྭ་ཕྲུག་ཚུ།"
 
-#: ../libpurple/protocols/oscar/oscar.c:4162
+#: ../libpurple/protocols/oscar/oscar.c:4167
 #, c-format
 msgid ""
 "Unable to add the buddy %s because you have too many buddies in your buddy "
 "list.  Please remove one and try again."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:4162
-#: ../libpurple/protocols/oscar/oscar.c:4177
+#: ../libpurple/protocols/oscar/oscar.c:4167
+#: ../libpurple/protocols/oscar/oscar.c:4182
 msgid "(no name)"
 msgstr "(མིང་མེད)"
 
-#: ../libpurple/protocols/oscar/oscar.c:4176
+#: ../libpurple/protocols/oscar/oscar.c:4181
 #, c-format
 msgid "Unable to add the buddy %s for an unknown reason."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:4293
+#: ../libpurple/protocols/oscar/oscar.c:4298
 #, c-format
 msgid ""
 "The user %s has given you permission to add him or her to your buddy list.  "
 "Do you want to add this user?"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:4301
+#: ../libpurple/protocols/oscar/oscar.c:4306
 msgid "Authorization Given"
 msgstr "དབང་སྤྲོད་བྱིན་ཡོདཔ།"
 
 #. Granted
-#: ../libpurple/protocols/oscar/oscar.c:4364
+#: ../libpurple/protocols/oscar/oscar.c:4369
 #, c-format
 msgid "The user %s has granted your request to add them to your buddy list."
 msgstr ""
@@ -10807,12 +10803,12 @@
 "ཁོང་ཚུ་ཁྱོད་ཀྱི་ཆ་རོགས་ཐོ་ཡིག་ནང་ཁ་སྐོང་རྐྱབས་ནིའི་ཞུ་བ་འབད་མི་འདི་ "
 "གནང་བ་བྱིན་ཡི།"
 
-#: ../libpurple/protocols/oscar/oscar.c:4365
+#: ../libpurple/protocols/oscar/oscar.c:4370
 msgid "Authorization Granted"
 msgstr "དབང་སྤྲོད་གནང་ཡོདཔ།"
 
 #. Denied
-#: ../libpurple/protocols/oscar/oscar.c:4368
+#: ../libpurple/protocols/oscar/oscar.c:4373
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your buddy list for the "
@@ -10824,44 +10820,44 @@
 "ཉན་མ་བཏུབ་པས:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:4369
+#: ../libpurple/protocols/oscar/oscar.c:4374
 msgid "Authorization Denied"
 msgstr "དབང་སྤྲོད་ཉེན་མ་བཏུབ།"
 
-#: ../libpurple/protocols/oscar/oscar.c:4407
+#: ../libpurple/protocols/oscar/oscar.c:4412
 msgid "_Exchange:"
 msgstr "བརྗེ་སོར:(_E)"
 
-#: ../libpurple/protocols/oscar/oscar.c:4523
+#: ../libpurple/protocols/oscar/oscar.c:4528
 msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
 msgstr ""
 "ཁྱོད་ཀྱི་ ཨའི་ཨེམ་ གཟུགས་བརྙན་འདི་ མ་བཏང་པས། ཨེ་ཨའི་ཨེམ་ ཁ་སླབ་ཚུ་ནང་ "
 "ཨའི་ཨེམ་གྱི་གཟུགས་བརྙན་ཚུ་གཏང་མི་ཚུགས།"
 
-#: ../libpurple/protocols/oscar/oscar.c:4760
+#: ../libpurple/protocols/oscar/oscar.c:4765
 msgid "iTunes Music Store Link"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:4807
+#: ../libpurple/protocols/oscar/oscar.c:4812
 msgid "Lunch"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:4928
+#: ../libpurple/protocols/oscar/oscar.c:4933
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "%sགི་དོན་ལུ་ ཆ་རོགས་ཀྱི་བསམ་བཀོད།"
 
-#: ../libpurple/protocols/oscar/oscar.c:4929
+#: ../libpurple/protocols/oscar/oscar.c:4934
 msgid "Buddy Comment:"
 msgstr "ཆ་རོགས་ཀྱི་བསམ་བཀོད:"
 
-#: ../libpurple/protocols/oscar/oscar.c:4978
+#: ../libpurple/protocols/oscar/oscar.c:4983
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
 msgstr ""
 "ཁྱོད་ཀྱིས %sདང་བཅས་ཐད་ཀར་ ཨའི་ཨེམ་ མཐུད་ལམ་ཁ་ཕྱེ་ནིའི་དོན་ལུ་ སེལ་འཐུ་འབད་ནུག"
 
-#: ../libpurple/protocols/oscar/oscar.c:4982
+#: ../libpurple/protocols/oscar/oscar.c:4987
 msgid ""
 "Because this reveals your IP address, it may be considered a security risk.  "
 "Do you wish to continue?"
@@ -10869,67 +10865,67 @@
 "འ་ནི་གིས་ ཁྱོད་ཀྱི་ ཨའི་པི་ཁ་བྱང་ཕྱིར་གསལ་འབདཝ་ལས་བརྟེན་ དེ་ "
 "སྲུང་སྐྱོབ་ཉེན་ཁ་སྦེ་ཆ་འཇོག་འབད་ནི་འོང་། ཁྱོད་ འཕྲོ་མཐུད་ནི་གི་འདོད་པ་ཡོད་ག?"
 
-#: ../libpurple/protocols/oscar/oscar.c:4988
-#: ../libpurple/protocols/oscar/peer.c:1065
+#: ../libpurple/protocols/oscar/oscar.c:4993
+#: ../libpurple/protocols/oscar/peer.c:1070
 msgid "C_onnect"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:5026
+#: ../libpurple/protocols/oscar/oscar.c:5031
 msgid "You closed the connection."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:5086
+#: ../libpurple/protocols/oscar/oscar.c:5091
 msgid "Get AIM Info"
 msgstr "ཨེ་ཨའི་ཨེམ་ བརྡ་དོན་ལེན།"
 
 #. We only do this if the user is in our buddy list
-#: ../libpurple/protocols/oscar/oscar.c:5095
+#: ../libpurple/protocols/oscar/oscar.c:5100
 msgid "Edit Buddy Comment"
 msgstr "ཆ་རོགས་ཀྱི་བསམ་བཀོད་ཞུན་དག་འབད།"
 
-#: ../libpurple/protocols/oscar/oscar.c:5103
+#: ../libpurple/protocols/oscar/oscar.c:5108
 msgid "Get X-Status Msg"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:5121
+#: ../libpurple/protocols/oscar/oscar.c:5126
 msgid "End Direct IM Session"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:5127
+#: ../libpurple/protocols/oscar/oscar.c:5132
 msgid "Direct IM"
 msgstr "ཐད་ཀར་ ཨའི་ཨེམ།"
 
-#: ../libpurple/protocols/oscar/oscar.c:5145
+#: ../libpurple/protocols/oscar/oscar.c:5150
 msgid "Re-request Authorization"
 msgstr "དབང་སྤྲོད་སླར་ཞུ་བ།"
 
-#: ../libpurple/protocols/oscar/oscar.c:5204
+#: ../libpurple/protocols/oscar/oscar.c:5209
 msgid "Require authorization"
 msgstr "དབང་སྤྲོད་དགོས་མཁོ་བས།"
 
-#: ../libpurple/protocols/oscar/oscar.c:5207
+#: ../libpurple/protocols/oscar/oscar.c:5212
 msgid "Web aware (enabling this will cause you to receive SPAM!)"
 msgstr ""
 "ཝེབ་དྲན་པ་བཏོན་ནི།(འ་ནི་ ལྕོགས་ཅན་བཟོ་ནི་གིས་ ཁྱོད་ལུ་ "
 "སི་པམ་!ཐོབ་ནི་ལུ་རྒྱུ་རྐྱེན་འབདཝ་ཨིན།)"
 
-#: ../libpurple/protocols/oscar/oscar.c:5212
+#: ../libpurple/protocols/oscar/oscar.c:5217
 msgid "ICQ Privacy Options"
 msgstr "ཨའི་སི་ཀིའུ་ སྒེར་གཙང་གདམ་ཁ་ཚུ།"
 
-#: ../libpurple/protocols/oscar/oscar.c:5269
+#: ../libpurple/protocols/oscar/oscar.c:5274
 msgid "Change Address To:"
 msgstr "ཁ་བྱང་ འ་ནི་ལུ བསྒྱུར་བཅོས་རྐྱབས:"
 
-#: ../libpurple/protocols/oscar/oscar.c:5302
+#: ../libpurple/protocols/oscar/oscar.c:5307
 msgid "you are not waiting for authorization"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:5305
+#: ../libpurple/protocols/oscar/oscar.c:5310
 msgid "You are awaiting authorization from the following buddies"
 msgstr "ཁྱོད་  འོག་གི་ཆ་རོགས་ཚུ་ལས་  དབང་སྤྲོད་བསྒུག་དེས།"
 
-#: ../libpurple/protocols/oscar/oscar.c:5306
+#: ../libpurple/protocols/oscar/oscar.c:5311
 msgid ""
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
@@ -10938,103 +10934,103 @@
 "གཡས་ཀྱི་གཡེབ་གཏང་ཨེབ་ནི་དང་\"་དབང་སྤྲོད་སླར་ཞུ་བ།\"སེལ་འཐུ་འབད་བའི་ཐོག་ལས་ "
 "ཁྱོད་ཀྱིས་ཆ་རོགས་ཚུ་ནང་ལས་ དབང་སྤྲོད་སླར་ཞུ་ཚུགས།"
 
-#: ../libpurple/protocols/oscar/oscar.c:5323
+#: ../libpurple/protocols/oscar/oscar.c:5328
 msgid "Find Buddy by Email"
 msgstr "གློག་-འཕྲིན་གྱི་ཐོག་ལས་ ཆ་རོགས་འཚོལ།"
 
-#: ../libpurple/protocols/oscar/oscar.c:5324
+#: ../libpurple/protocols/oscar/oscar.c:5329
 msgid "Search for a buddy by email address"
 msgstr "གློག་འཕྲིན་གྱི་ཐོག་ལས་ཆ་རོགས་ཅིག་གི་དོན་ལུ་འཚོལ་ཞིབ་འབད།"
 
-#: ../libpurple/protocols/oscar/oscar.c:5325
+#: ../libpurple/protocols/oscar/oscar.c:5330
 msgid "Type the email address of the buddy you are searching for."
 msgstr ""
 "ཁྱོད་ཀྱིས་འཚོལ་ཞིབ་འབད་བའི་བསྒང་གི་  "
 "ཆ་རོགས་ཀྱི་གློག་འཕྲིན་ཁ་བྱང་འདི་ཡིག་དཔར་རྐྱབས།"
 
-#: ../libpurple/protocols/oscar/oscar.c:5486
+#: ../libpurple/protocols/oscar/oscar.c:5491
 msgid "Set User Info (web)..."
 msgstr ""
 
 #. This only happens when connecting with the old-style BUCP login
-#: ../libpurple/protocols/oscar/oscar.c:5498
+#: ../libpurple/protocols/oscar/oscar.c:5503
 msgid "Change Password (web)"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:5505
+#: ../libpurple/protocols/oscar/oscar.c:5510
 msgid "Configure IM Forwarding (web)"
 msgstr ""
 
 #. ICQ actions
-#: ../libpurple/protocols/oscar/oscar.c:5515
+#: ../libpurple/protocols/oscar/oscar.c:5520
 msgid "Set Privacy Options..."
 msgstr "སྒེར་གཙང་གདམ་ཁ་ཚུ་གཞི་སྒྲིག་འབད།..."
 
-#: ../libpurple/protocols/oscar/oscar.c:5519
+#: ../libpurple/protocols/oscar/oscar.c:5524
 msgid "Show Visible List"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:5522
+#: ../libpurple/protocols/oscar/oscar.c:5527
 msgid "Show Invisible List"
 msgstr ""
 
 #. AIM actions
-#: ../libpurple/protocols/oscar/oscar.c:5528
+#: ../libpurple/protocols/oscar/oscar.c:5533
 msgid "Confirm Account"
 msgstr "རྩིས་ཐོ་ངེས་གཏན་བཟོ།"
 
-#: ../libpurple/protocols/oscar/oscar.c:5532
+#: ../libpurple/protocols/oscar/oscar.c:5537
 msgid "Display Currently Registered Email Address"
 msgstr "ད་ལྟོ་ ཐོ་འགོད་འབད་ཡོད་པའི་གློག་-འཕྲིན་ཁ་བྱང་འདི་ བཀྲམ་སྟོན་འབད།"
 
-#: ../libpurple/protocols/oscar/oscar.c:5536
+#: ../libpurple/protocols/oscar/oscar.c:5541
 msgid "Change Currently Registered Email Address..."
 msgstr ""
 "ད་ལྟོ་ ཐོ་འགོད་འབད་ཡོད་པའི་གློག་-འཕྲིན་ཁ་བྱང་འདི་ བསྒྱུར་བཅོས་འབད།..."
 
-#: ../libpurple/protocols/oscar/oscar.c:5543
+#: ../libpurple/protocols/oscar/oscar.c:5548
 msgid "Show Buddies Awaiting Authorization"
 msgstr "དབང་སྤྲོད་བསྒུག་བཞིན་དུའི་ཆ་རོགས་ཚུ་སྟོན།"
 
-#: ../libpurple/protocols/oscar/oscar.c:5549
+#: ../libpurple/protocols/oscar/oscar.c:5554
 msgid "Search for Buddy by Email Address..."
 msgstr "གློག་འཕྲིན་ཁ་བྱང་གིས་ཐོག་ལས་ ཆ་རོགས་ཀྱི་དོན་ལུ་ འཚོལ་ཞིབ་འབད།..."
 
-#: ../libpurple/protocols/oscar/oscar.c:5764
+#: ../libpurple/protocols/oscar/oscar.c:5769
 msgid "Use clientLogin"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:5769
+#: ../libpurple/protocols/oscar/oscar.c:5774
 msgid ""
 "Always use AIM/ICQ proxy server for\n"
 "file transfers and direct IM (slower,\n"
 "but does not reveal your IP address)"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:5774
+#: ../libpurple/protocols/oscar/oscar.c:5779
 msgid "Allow multiple simultaneous logins"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/peer.c:715
+#: ../libpurple/protocols/oscar/peer.c:720
 #, c-format
 msgid "Asking %s to connect to us at %s:%hu for Direct IM."
 msgstr "ཨའི་ཨེམ་ཐད་ཀར་གྱི་དོན་ལུ %s ལུ་ ང་བཅས་ %s:%hu ལུ་མཐུད་ནི་ འདྲིཝ་ཨིན།"
 
-#: ../libpurple/protocols/oscar/peer.c:800
+#: ../libpurple/protocols/oscar/peer.c:805
 #, c-format
 msgid "Attempting to connect to %s:%hu."
 msgstr "%s:%hu ལུ་མཐུད་ནི་དཔའ་བཅམ་དོ།"
 
-#: ../libpurple/protocols/oscar/peer.c:874
+#: ../libpurple/protocols/oscar/peer.c:879
 msgid "Attempting to connect via proxy server."
 msgstr "པོརོ་སི་སར་བར་བརྒྱུད་དེ་ མཐུད་ནི་དཔའ་བཅམ་དོ།"
 
-#: ../libpurple/protocols/oscar/peer.c:1053
+#: ../libpurple/protocols/oscar/peer.c:1058
 #, c-format
 msgid "%s has just asked to directly connect to %s"
 msgstr "%s ཀྱིས %sལུ་ཐད་ཀར་དུ་མཐུད་ནིའི་དོན་ལུ་དྲིས་ནུག"
 
-#: ../libpurple/protocols/oscar/peer.c:1057
+#: ../libpurple/protocols/oscar/peer.c:1062
 msgid ""
 "This requires a direct connection between the two computers and is necessary "
 "for IM Images.  Because your IP address will be revealed, this may be "
@@ -11046,7 +11042,7 @@
 "དེ་ཡང་སྒེར་གཙང་གི་ཉེན་ཁ་འབད་ཆ་འཇོག་བསྒྲུབ་འོང་།"
 
 #. Label
-#: ../libpurple/protocols/oscar/userinfo.c:43 ../pidgin/gtkutils.c:2310
+#: ../libpurple/protocols/oscar/userinfo.c:43 ../pidgin/gtkutils.c:2302
 #: ../pidgin/plugins/gevolution/new_person_dialog.c:331
 msgid "Buddy Icon"
 msgstr "ཆ་རོགས་ཀྱི་ངོས་དཔར།"
@@ -11141,8 +11137,8 @@
 msgstr ""
 
 #: ../libpurple/protocols/oscar/userinfo.c:344
-#: ../libpurple/protocols/oscar/userinfo.c:409
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:720 ../pidgin/gtkprefs.c:1748
+#: ../libpurple/protocols/oscar/userinfo.c:408
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:720 ../pidgin/gtkprefs.c:1742
 msgid "IP Address"
 msgstr "ཨའི་པི་ཁ་བྱང་།"
 
@@ -11159,53 +11155,53 @@
 msgid "User information not available: %s"
 msgstr "ལག་ལེན་པའི་བརྡ་དོན་%sའདི་ཐོབ་མི་ཚུགས།"
 
-#: ../libpurple/protocols/oscar/userinfo.c:421
-#: ../libpurple/protocols/silc/util.c:541
+#: ../libpurple/protocols/oscar/userinfo.c:420
+#: ../libpurple/protocols/silc/util.c:592
 #: ../libpurple/protocols/silc10/util.c:586
 msgid "Mobile Phone"
 msgstr "འགྲུལ་འཕྲིན།"
 
-#: ../libpurple/protocols/oscar/userinfo.c:452
+#: ../libpurple/protocols/oscar/userinfo.c:451
 msgid "Personal Web Page"
 msgstr "རང་དོན་གྱི་ ཝེབ་ཤོག་ལེབ།"
 
 #. aim_userinfo_t
 #. use_html_status
-#: ../libpurple/protocols/oscar/userinfo.c:456
+#: ../libpurple/protocols/oscar/userinfo.c:455
 msgid "Additional Information"
 msgstr "ཁ་སྐོང་ཅན་གྱི་བརྡ་དོན།"
 
-#: ../libpurple/protocols/oscar/userinfo.c:465
-#: ../libpurple/protocols/oscar/userinfo.c:473
+#: ../libpurple/protocols/oscar/userinfo.c:464
+#: ../libpurple/protocols/oscar/userinfo.c:472
 msgid "Zip Code"
 msgstr "གནས་ཡུལ་གྱི་ཨང་རྟགས།"
 
-#: ../libpurple/protocols/oscar/userinfo.c:476
+#: ../libpurple/protocols/oscar/userinfo.c:475
 msgid "Work Information"
 msgstr "ལཱ་གི་བརྡ་དོན།"
 
-#: ../libpurple/protocols/oscar/userinfo.c:479
+#: ../libpurple/protocols/oscar/userinfo.c:478
 msgid "Division"
 msgstr "སྡེ་ཚན།"
 
-#: ../libpurple/protocols/oscar/userinfo.c:480
+#: ../libpurple/protocols/oscar/userinfo.c:479
 msgid "Position"
 msgstr "གནས་ས།"
 
-#: ../libpurple/protocols/oscar/userinfo.c:481
+#: ../libpurple/protocols/oscar/userinfo.c:480
 msgid "Web Page"
 msgstr "ཝེབ་ཤོག་ལེབ།"
 
-#: ../libpurple/protocols/oscar/userinfo.c:509
+#: ../libpurple/protocols/oscar/userinfo.c:508
 msgid "Online Since"
 msgstr "ལས་ཚུར་ གློག་ཐོག"
 
-#: ../libpurple/protocols/oscar/userinfo.c:514
+#: ../libpurple/protocols/oscar/userinfo.c:513
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1184
 msgid "Member Since"
 msgstr "ལས་ཚུར་ འཐུས་མི།"
 
-#: ../libpurple/protocols/oscar/userinfo.c:519
+#: ../libpurple/protocols/oscar/userinfo.c:518
 msgid "Capabilities"
 msgstr "ལྕོགས་གྲུབ།"
 
@@ -11305,8 +11301,8 @@
 #. you to appear online to the chosen user even when your status is set to
 #. Invisible.
 #: ../libpurple/protocols/oscar/visibility.c:26
-#: ../libpurple/protocols/yahoo/libymsg.c:4231
-#: ../libpurple/protocols/yahoo/libymsg.c:4307
+#: ../libpurple/protocols/yahoo/libymsg.c:4244
+#: ../libpurple/protocols/yahoo/libymsg.c:4320
 msgid "Appear Online"
 msgstr "གློག་ཐོག་འབྱུང་།"
 
@@ -11321,7 +11317,7 @@
 #. you to always appear offline to the chosen user (even when your status
 #. isn't Invisible).
 #: ../libpurple/protocols/oscar/visibility.c:36
-#: ../libpurple/protocols/yahoo/libymsg.c:4313
+#: ../libpurple/protocols/yahoo/libymsg.c:4326
 msgid "Appear Offline"
 msgstr "ཨོཕ་ལ་ཡིན་བྱུང་།"
 
@@ -11379,47 +11375,47 @@
 msgid "Notes Address Book Information"
 msgstr "དྲན་འཛིན་ཚུའི་ཁ་བྱང་ཀི་དེབ་བརྡ་དོན།"
 
-#: ../libpurple/protocols/sametime/sametime.c:1355
+#: ../libpurple/protocols/sametime/sametime.c:1357
 msgid "Invite Group to Conference..."
 msgstr "གྲོས་ཚོགས་ལུ་ སྡེ་ཚན་གདན་འདྲེན་ཞུ།..."
 
-#: ../libpurple/protocols/sametime/sametime.c:1365
+#: ../libpurple/protocols/sametime/sametime.c:1367
 msgid "Get Notes Address Book Info"
 msgstr "དྲན་འཛིན་ཚུའི་ཁ་བྱང་ཀི་དེབ་བརྡ་དོན་ལེན།"
 
-#: ../libpurple/protocols/sametime/sametime.c:1536
+#: ../libpurple/protocols/sametime/sametime.c:1538
 msgid "Sending Handshake"
 msgstr "ལག་མཐུད་གཏང་དོ།"
 
-#: ../libpurple/protocols/sametime/sametime.c:1541
+#: ../libpurple/protocols/sametime/sametime.c:1543
 msgid "Waiting for Handshake Acknowledgement"
 msgstr "ལག་མཐུད་ངོས་ལེན་ལུ་བསྒུག་དོ།"
 
-#: ../libpurple/protocols/sametime/sametime.c:1546
+#: ../libpurple/protocols/sametime/sametime.c:1548
 msgid "Handshake Acknowledged, Sending Login"
 msgstr "ལག་མཐུད་ངོས་ལེན་འབད་ཡོདཔ་ ནང་བསྐྱོད་གཏང་དོ།"
 
-#: ../libpurple/protocols/sametime/sametime.c:1551
+#: ../libpurple/protocols/sametime/sametime.c:1553
 msgid "Waiting for Login Acknowledgement"
 msgstr "ངོས་ལེན་ནང་བསྐྱོད་འབད་ནིའི་དོན་ལུ་ བསྒུག་དོ།"
 
-#: ../libpurple/protocols/sametime/sametime.c:1556
+#: ../libpurple/protocols/sametime/sametime.c:1558
 msgid "Login Redirected"
 msgstr "ནང་བསྐྱོད་འབད་ནི་སླར་ལོག་གཏང་ཡོདཔ།"
 
-#: ../libpurple/protocols/sametime/sametime.c:1562
+#: ../libpurple/protocols/sametime/sametime.c:1564
 msgid "Forcing Login"
 msgstr "ནང་བསྐྱོད་འབད་ནི་དོན་ལུ་ བང་བཙོང་དོ།"
 
-#: ../libpurple/protocols/sametime/sametime.c:1567
+#: ../libpurple/protocols/sametime/sametime.c:1568
 msgid "Login Acknowledged"
 msgstr "ངོས་ལེན་འབད་ཡོད་མི་འདི་ནང་བསྐྱོད་འབད་དོ།"
 
-#: ../libpurple/protocols/sametime/sametime.c:1572
+#: ../libpurple/protocols/sametime/sametime.c:1573
 msgid "Starting Services"
 msgstr "ཞབས་ཏོག་ཚུ་འགོ་བཙུགས་དོ།"
 
-#: ../libpurple/protocols/sametime/sametime.c:1709
+#: ../libpurple/protocols/sametime/sametime.c:1710
 #, c-format
 msgid ""
 "A Sametime administrator has issued the following announcement on server %s"
@@ -11427,63 +11423,63 @@
 "དུས་ཚོད་གཅིག་པའི་བདག་སྐྱོང་པ་གིས་སར་བར་ %s གུ་ "
 "འོག་ལུ་ཡོད་པའི་ཁྱབ་བསྒྲགས་སྤྲོད་ཡོདཔ་ཨིན།"
 
-#: ../libpurple/protocols/sametime/sametime.c:1714
+#: ../libpurple/protocols/sametime/sametime.c:1715
 msgid "Sametime Administrator Announcement"
 msgstr "དུས་ཚོད་གཅིག་པའི་བདག་སྐྱོང་པ་ཁྱབ་བསྒྲགས།"
 
-#: ../libpurple/protocols/sametime/sametime.c:1846
+#: ../libpurple/protocols/sametime/sametime.c:1847
 #, c-format
 msgid "Announcement from %s"
 msgstr "%s ལས་ཁྱབ་བསྒྲགས།"
 
-#: ../libpurple/protocols/sametime/sametime.c:2020
+#: ../libpurple/protocols/sametime/sametime.c:2021
 msgid "Conference Closed"
 msgstr "གྲོས་ཚོགས་ཁ་བསྡམས་ཡོདཔ།"
 
-#: ../libpurple/protocols/sametime/sametime.c:2468
+#: ../libpurple/protocols/sametime/sametime.c:2486
 msgid "Unable to send message: "
 msgstr "འཕྲིན་དོན་གཏང་མ་ཚུགས།: "
 
-#: ../libpurple/protocols/sametime/sametime.c:2474
+#: ../libpurple/protocols/sametime/sametime.c:2492
 #, c-format
 msgid "Unable to send message to %s:"
 msgstr "%sལུ་འཕྲིན་དོན་གཏང་མ་ཚུགས།"
 
-#: ../libpurple/protocols/sametime/sametime.c:3024
+#: ../libpurple/protocols/sametime/sametime.c:3042
 msgid "Place Closed"
 msgstr "ས་གནས་ཁ་བསྡམས་ཡོདཔ།"
 
-#: ../libpurple/protocols/sametime/sametime.c:3276
+#: ../libpurple/protocols/sametime/sametime.c:3312
 msgid "Microphone"
 msgstr "ཁ་པར།"
 
-#: ../libpurple/protocols/sametime/sametime.c:3277
+#: ../libpurple/protocols/sametime/sametime.c:3313
 msgid "Speakers"
 msgstr "གསལ་བཤདཔ་ཚུ།"
 
-#: ../libpurple/protocols/sametime/sametime.c:3278
+#: ../libpurple/protocols/sametime/sametime.c:3314
 msgid "Video Camera"
 msgstr "ཝི་ཌིའོ་ པར་ཆས།"
 
-#: ../libpurple/protocols/sametime/sametime.c:3282
+#: ../libpurple/protocols/sametime/sametime.c:3318
 msgid "File Transfer"
 msgstr "ཡིག་སྣོད་གནས་སོར།"
 
-#: ../libpurple/protocols/sametime/sametime.c:3316
-#: ../libpurple/protocols/sametime/sametime.c:4156
+#: ../libpurple/protocols/sametime/sametime.c:3352
+#: ../libpurple/protocols/sametime/sametime.c:4192
 msgid "Supports"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:3321
-#: ../libpurple/protocols/sametime/sametime.c:4130
+#: ../libpurple/protocols/sametime/sametime.c:3357
+#: ../libpurple/protocols/sametime/sametime.c:4166
 msgid "External User"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:3427
+#: ../libpurple/protocols/sametime/sametime.c:3463
 msgid "Create conference with user"
 msgstr "ལག་ལེན་པ་དང་གཅིག་ཁར་གྲོས་ཚོགས་གསར་བསྐྲུན་འབད།"
 
-#: ../libpurple/protocols/sametime/sametime.c:3428
+#: ../libpurple/protocols/sametime/sametime.c:3464
 #, c-format
 msgid ""
 "Please enter a topic for the new conference, and an invitation message to be "
@@ -11492,27 +11488,27 @@
 "%s ལུ་གཏང་ནིའི་ཨིན་པའི་མགྲོན་བརྡ་འཕྲིན་དོན་དང་ གྲོས་ཚོགས་གསརཔ་དོན་ལུ་ "
 "གནད་དོན་གཅིག་བཙུགས་གནང་།"
 
-#: ../libpurple/protocols/sametime/sametime.c:3432
+#: ../libpurple/protocols/sametime/sametime.c:3468
 msgid "New Conference"
 msgstr "གྲོས་ཚོགས་གསརཔ།"
 
-#: ../libpurple/protocols/sametime/sametime.c:3434
+#: ../libpurple/protocols/sametime/sametime.c:3470
 msgid "Create"
 msgstr "གསར་བསྐྲུན་འབད།"
 
-#: ../libpurple/protocols/sametime/sametime.c:3499
+#: ../libpurple/protocols/sametime/sametime.c:3535
 msgid "Available Conferences"
 msgstr "ཐོབ་ཆོག་ཆོག་ཡོད་པའི་གྲོས་ཚོགས་ཚུ།"
 
-#: ../libpurple/protocols/sametime/sametime.c:3505
+#: ../libpurple/protocols/sametime/sametime.c:3541
 msgid "Create New Conference..."
 msgstr "གྲོས་ཚོགས་གསརཔ་གཅིག་གསར་བསྐྲུན་འབད།"
 
-#: ../libpurple/protocols/sametime/sametime.c:3512
+#: ../libpurple/protocols/sametime/sametime.c:3548
 msgid "Invite user to a conference"
 msgstr "ལག་ལེན་པ་འདི་གྲོས་ཚོགས་ནང་གདན་འདྲེན་ཞུ།"
 
-#: ../libpurple/protocols/sametime/sametime.c:3513
+#: ../libpurple/protocols/sametime/sametime.c:3549
 #, c-format
 msgid ""
 "Select a conference from the list below to send an invite to user %s. Select "
@@ -11524,50 +11520,50 @@
 "ཁྱོད་ཀྱིས་ གྲོས་ཚོགས་གསརཔ་གཅིག་གསར་བསྐྲུན་འབད་དགོ་མནོ་བ་ཅིན་  \"Create New "
 "Conference\" སེལ་འཐུ་འབད།"
 
-#: ../libpurple/protocols/sametime/sametime.c:3518
+#: ../libpurple/protocols/sametime/sametime.c:3554
 msgid "Invite to Conference"
 msgstr "གྲོས་ཚོགས་ནང་གདན་འདྲེན་ཞུ།"
 
-#: ../libpurple/protocols/sametime/sametime.c:3609
+#: ../libpurple/protocols/sametime/sametime.c:3645
 msgid "Invite to Conference..."
 msgstr "གྲོས་ཚོགས་ནང་གདན་འདྲེན་ཞུ།"
 
-#: ../libpurple/protocols/sametime/sametime.c:3614
+#: ../libpurple/protocols/sametime/sametime.c:3650
 msgid "Send TEST Announcement"
 msgstr "བརྟག་ཞིབ་ཁྱབ་བསྒྲགས་གཏང་།"
 
-#: ../libpurple/protocols/sametime/sametime.c:3633 ../pidgin/gtkconv.c:4681
+#: ../libpurple/protocols/sametime/sametime.c:3669 ../pidgin/gtkconv.c:4681
 msgid "Topic:"
 msgstr "གནད་དོན་:"
 
-#: ../libpurple/protocols/sametime/sametime.c:3693
+#: ../libpurple/protocols/sametime/sametime.c:3729
 msgid "A server is required to connect this account"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:4146
+#: ../libpurple/protocols/sametime/sametime.c:4182
 #, c-format
 msgid "Unknown (0x%04x)<br>"
 msgstr "མ་ཤེས་པའི་ (0x%04x)<br>"
 
-#: ../libpurple/protocols/sametime/sametime.c:4148
+#: ../libpurple/protocols/sametime/sametime.c:4184
 msgid "Last Known Client"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:4312
-#: ../libpurple/protocols/sametime/sametime.c:5529
+#: ../libpurple/protocols/sametime/sametime.c:4348
+#: ../libpurple/protocols/sametime/sametime.c:5565
 msgid "User Name"
 msgstr "ལག་ལེན་པའི་ མིང་།"
 
-#: ../libpurple/protocols/sametime/sametime.c:4315
-#: ../libpurple/protocols/sametime/sametime.c:5532
+#: ../libpurple/protocols/sametime/sametime.c:4351
+#: ../libpurple/protocols/sametime/sametime.c:5568
 msgid "Sametime ID"
 msgstr "དུས་ཚོད་གཅིག་པའི་ཨའི་ཌི།"
 
-#: ../libpurple/protocols/sametime/sametime.c:4339
+#: ../libpurple/protocols/sametime/sametime.c:4375
 msgid "An ambiguous user ID was entered"
 msgstr "ལག་ལེན་པ་གོ་དོན་རྙོགས་དྲགས་ཅན་ཨའི་ཌི་གཅིག་བཙུགས་ཡོདཔ་ཨིན་པས།"
 
-#: ../libpurple/protocols/sametime/sametime.c:4340
+#: ../libpurple/protocols/sametime/sametime.c:4376
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following users. Please "
@@ -11578,15 +11574,15 @@
 "ཆ་རོགས་ཐོ་ཡིག་ནང་ཁ་སྐོང་བརྐྱབ་ནིའི་དོན་ལུ་ འོག་ལུ་ཡོད་པའི་ཐོ་ཡིག་ལས་ "
 "ལག་ལེན་པ་ངེས་བདེན་སེལ་འཐུ་འབད་གནང་།"
 
-#: ../libpurple/protocols/sametime/sametime.c:4345
+#: ../libpurple/protocols/sametime/sametime.c:4381
 msgid "Select User"
 msgstr "ལག་ལེན་པ་སེལ་འཐུ་འབད།"
 
-#: ../libpurple/protocols/sametime/sametime.c:4429
+#: ../libpurple/protocols/sametime/sametime.c:4465
 msgid "Unable to add user: user not found"
 msgstr "ལག་ལེན་པ་ཁ་སྐོང་བརྐྱབ་མ་ཚུགས་:ལག་ལེན་མ་ཐོབ།"
 
-#: ../libpurple/protocols/sametime/sametime.c:4431
+#: ../libpurple/protocols/sametime/sametime.c:4467
 #, c-format
 msgid ""
 "The identifier '%s' did not match any users in your Sametime community. This "
@@ -11596,7 +11592,7 @@
 "ལག་ལེན་ཚུ་ག་དང་ཡང་མ་མཐུན། འ་ནི་ཐོ་བཀོད་འདི་ ཁྱོད་ཀྱི་ "
 "ཆ་རོགས་ཐོ་ཡིག་ལས་རྩ་བསྐྲད་གཏང་ཡོདཔ་ཨིན།"
 
-#: ../libpurple/protocols/sametime/sametime.c:5020
+#: ../libpurple/protocols/sametime/sametime.c:5056
 #, c-format
 msgid ""
 "Error reading file %s: \n"
@@ -11605,64 +11601,64 @@
 "ཡིག་སྣོད་ %s ལྷག་ནིའི་འཛོལ་བ།: \n"
 "%s\n"
 
-#: ../libpurple/protocols/sametime/sametime.c:5169
+#: ../libpurple/protocols/sametime/sametime.c:5205
 msgid "Remotely Stored Buddy List"
 msgstr "ཐག་རིང་ལས་གསོག་འཇོག་འབད་ཡོད་པའི་ཆ་རོགས་ཐོ་ཡིག"
 
-#: ../libpurple/protocols/sametime/sametime.c:5174
+#: ../libpurple/protocols/sametime/sametime.c:5210
 msgid "Buddy List Storage Mode"
 msgstr "ཆ་རོགས་ཐ་ཡིག་བསག་མཛོད་ཐབས་ལམ།"
 
-#: ../libpurple/protocols/sametime/sametime.c:5177
+#: ../libpurple/protocols/sametime/sametime.c:5213
 msgid "Local Buddy List Only"
 msgstr "ཉེ་གནས་ཀྱི་ཆ་རོགས་ཐོ་ཡིག་རྐྱངམ་ཅིག"
 
-#: ../libpurple/protocols/sametime/sametime.c:5179
+#: ../libpurple/protocols/sametime/sametime.c:5215
 msgid "Merge List from Server"
 msgstr "སར་བར་ལས་ཐོ་ཡིག་མཉམ་བསྡོམས་འབད།"
 
-#: ../libpurple/protocols/sametime/sametime.c:5181
+#: ../libpurple/protocols/sametime/sametime.c:5217
 msgid "Merge and Save List to Server"
 msgstr "མཉམ་བསྡོམས་འབད་བཞིནམ་ལས་ སར་བར་ལུ་ཐོ་བཀོད་འབད།"
 
-#: ../libpurple/protocols/sametime/sametime.c:5183
+#: ../libpurple/protocols/sametime/sametime.c:5219
 msgid "Synchronize List with Server"
 msgstr "ཐོ་ཡིག་འདི་ སར་བར་དང་གཅིག་ཁར་ མཉམ་འབྱུང་འབད།"
 
-#: ../libpurple/protocols/sametime/sametime.c:5238
+#: ../libpurple/protocols/sametime/sametime.c:5274
 #, c-format
 msgid "Import Sametime List for Account %s"
 msgstr "རྩིས་ཐོ་ %s དོན་ལུ་ དུས་ཚོད་གཅིག་པའི་ཐོ་ཡིག་ནང་འདྲེན་འབད།"
 
-#: ../libpurple/protocols/sametime/sametime.c:5278
+#: ../libpurple/protocols/sametime/sametime.c:5314
 #, c-format
 msgid "Export Sametime List for Account %s"
 msgstr "རྩིས་ཐོ་ %s དོན་ལུ་ དུས་ཚོད་གཅིག་པའི་ཐོ་ཡིག་ཕྱིར་འདྲེན་འབད།"
 
-#: ../libpurple/protocols/sametime/sametime.c:5332
+#: ../libpurple/protocols/sametime/sametime.c:5368
 msgid "Unable to add group: group exists"
 msgstr "སྡེ་ཚན་བཟོ་མ་ཚུགས་:སྡེ་ཚན་གནས་ཏེ་འདུག"
 
-#: ../libpurple/protocols/sametime/sametime.c:5333
+#: ../libpurple/protocols/sametime/sametime.c:5369
 #, c-format
 msgid "A group named '%s' already exists in your buddy list."
 msgstr ""
 "ཁྱོད་ཀྱི་ ཆ་རོགས་ཐོ་ཡིག་ནང་ '%s' ཟེར་བའི་སྡེ་ཚན་གཅིག་ཧེ་མ་ལས་རང་གནས་ཏེ་འདུག"
 
-#: ../libpurple/protocols/sametime/sametime.c:5336
-#: ../libpurple/protocols/sametime/sametime.c:5466
+#: ../libpurple/protocols/sametime/sametime.c:5372
+#: ../libpurple/protocols/sametime/sametime.c:5502
 msgid "Unable to add group"
 msgstr "སྡེ་ཚན་ཁ་སྐོང་བརྐྱབ་མ་ཚུགས།"
 
-#: ../libpurple/protocols/sametime/sametime.c:5395
+#: ../libpurple/protocols/sametime/sametime.c:5431
 msgid "Possible Matches"
 msgstr "སྲིད་པའི་མཐུན་སྒྲིག་ཚུ།"
 
-#: ../libpurple/protocols/sametime/sametime.c:5411
+#: ../libpurple/protocols/sametime/sametime.c:5447
 msgid "Notes Address Book group results"
 msgstr "དྲན་འཛིན་ཚུའི་ཁ་བྱང་ཀི་དེབ་སྡེ་ཚན་གྲུབ་འབྲས་ཚུ།"
 
-#: ../libpurple/protocols/sametime/sametime.c:5412
+#: ../libpurple/protocols/sametime/sametime.c:5448
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following Notes Address "
@@ -11674,15 +11670,15 @@
 "དེ་ཁྱོད་རའི་ཆ་རོགས་ཐོ་ཡིག་ནང་ཁ་སྐོང་བརྐྱབ་ནིའི་དོན་ལུ་ འོག་གི་ཐོ་ཡིག་ལས་ "
 "སྡེ་ཚན་ངེས་བདེན་སེལ་འཐུ་འབད་གནང་།"
 
-#: ../libpurple/protocols/sametime/sametime.c:5417
+#: ../libpurple/protocols/sametime/sametime.c:5453
 msgid "Select Notes Address Book"
 msgstr "དྲན་འཛིན་ཚུའི་ཁ་བྱང་ཀི་དེབ་སེལ་འཐུ་འབད།"
 
-#: ../libpurple/protocols/sametime/sametime.c:5460
+#: ../libpurple/protocols/sametime/sametime.c:5496
 msgid "Unable to add group: group not found"
 msgstr "སྡེ་ཚན་ཁ་སྐོང་བརྐྱབ་མ་ཚུགས་:སྡེ་ཚད་ཐོབ་མ་ཚུགསཔ།"
 
-#: ../libpurple/protocols/sametime/sametime.c:5462
+#: ../libpurple/protocols/sametime/sametime.c:5498
 #, c-format
 msgid ""
 "The identifier '%s' did not match any Notes Address Book groups in your "
@@ -11691,11 +11687,11 @@
 "ངོས་འཛིན་འབད་མི་ '%s' གིས་ ཁྱོད་རའི་དུས་ཚོད་གཅིག་པའི་མི་སྡེ་ནང་ "
 "དྲན་འཛིན་ཚུའི་ཁ་བྱང་ཀི་དེབ་སྡེ་ཚན་གང་དང་ཡང་མ་མཐུན་པས།"
 
-#: ../libpurple/protocols/sametime/sametime.c:5503
+#: ../libpurple/protocols/sametime/sametime.c:5539
 msgid "Notes Address Book Group"
 msgstr "དྲན་འཛིན་ཚུའི་ཁ་བྱང་ཀི་དེབ་སྡེ་ཚན།"
 
-#: ../libpurple/protocols/sametime/sametime.c:5504
+#: ../libpurple/protocols/sametime/sametime.c:5540
 msgid ""
 "Enter the name of a Notes Address Book group in the field below to add the "
 "group and its members to your buddy list."
@@ -11704,12 +11700,12 @@
 "ཁ་སྐོང་བརྐྱབ་ནིའི་དོན་ལུ་ འོག་གི་ས་སྒོ་ནང་ "
 "དྲན་འཛིན་ཚུའི་ཁ་བྱང་ཀི་དེབ་སྡེ་ཚན་གྱི་མིང་བཙུགས།"
 
-#: ../libpurple/protocols/sametime/sametime.c:5553
+#: ../libpurple/protocols/sametime/sametime.c:5589
 #, c-format
 msgid "Search results for '%s'"
 msgstr "'%s' དོན་ལུ་ འཚོལ་ཞིབ་གྲུབ་འབྲས་ཚུ།"
 
-#: ../libpurple/protocols/sametime/sametime.c:5554
+#: ../libpurple/protocols/sametime/sametime.c:5590
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following users. You "
@@ -11721,15 +11717,15 @@
 "འོག་གི་བྱ་བའི་ཨེབ་རྟ་ཚུ་གཅིག་ཁར་ འ་ནི་ལག་ལེན་པ་ཚུ་ཁྱོད་ཀྱི་ "
 "ཆ་རོགས་ཐོ་ཡིག་ནང་ཁ་སྐོང་ངའམ་ ཁོང་ཚུ་ལུ་འཕྲིན་དོན་ཚུ་གཏང་ཚུགསཔ་ཨིན།"
 
-#: ../libpurple/protocols/sametime/sametime.c:5561 ../pidgin/gtknotify.c:972
+#: ../libpurple/protocols/sametime/sametime.c:5597 ../pidgin/gtknotify.c:972
 msgid "Search Results"
 msgstr "འཚོལ་ཞིབ་ཀྱི་གྲུབ་འབྲས་ཚུ།"
 
-#: ../libpurple/protocols/sametime/sametime.c:5586
+#: ../libpurple/protocols/sametime/sametime.c:5622
 msgid "No matches"
 msgstr "མཐུན་སྒྲིག་ཚུ་མིན་འདུག"
 
-#: ../libpurple/protocols/sametime/sametime.c:5587
+#: ../libpurple/protocols/sametime/sametime.c:5623
 #, c-format
 msgid ""
 "The identifier '%s' did not match any users in your Sametime community."
@@ -11737,15 +11733,15 @@
 "ངོས་འཛིན་འབད་མི་ '%s' གིས་ ཁྱོད་རའི་དུས་ཚོད་གཅིག་པའི་མི་སྡེ་ནང་ "
 "ལག་ལེན་པ་ཚུ་ག་དང་ཡང་མ་མཐུན།"
 
-#: ../libpurple/protocols/sametime/sametime.c:5591
+#: ../libpurple/protocols/sametime/sametime.c:5627
 msgid "No Matches"
 msgstr "མཐུན་སྒྲིག་ཚུ་མིན་འདུག"
 
-#: ../libpurple/protocols/sametime/sametime.c:5628
+#: ../libpurple/protocols/sametime/sametime.c:5664
 msgid "Search for a user"
 msgstr "ལག་ལེན་པའི་དོན་ལུ་ འཚོལ་ཞིབ།"
 
-#: ../libpurple/protocols/sametime/sametime.c:5629
+#: ../libpurple/protocols/sametime/sametime.c:5665
 msgid ""
 "Enter a name or partial ID in the field below to search for matching users "
 "in your Sametime community."
@@ -11754,33 +11750,33 @@
 "མཐུན་སྒྲིག་ལག་ལེན་པ་ཚུ་འཚོལ་ཞིབ་འབད་ནིའི་དོན་ལུ་ འོག་གི་ས་སྒོ་ནང་ མིང་ཡང་ན་ "
 "ཨའི་ཌི་ཆ་ཤས་བཙུགས།"
 
-#: ../libpurple/protocols/sametime/sametime.c:5632
+#: ../libpurple/protocols/sametime/sametime.c:5668
 msgid "User Search"
 msgstr "ལག་ལེན་པ་གི་འཚོལ་ཞིབ།"
 
-#: ../libpurple/protocols/sametime/sametime.c:5645
+#: ../libpurple/protocols/sametime/sametime.c:5681
 msgid "Import Sametime List..."
 msgstr "དུས་ཚོད་གཅིག་པའི་ཐོ་ཡིག་ནང་འདྲེན་འབད།..."
 
-#: ../libpurple/protocols/sametime/sametime.c:5649
+#: ../libpurple/protocols/sametime/sametime.c:5685
 msgid "Export Sametime List..."
 msgstr "དུས་ཚོད་གཅིག་པའི་ཐོ་ཡིག་ཕྱིར་འདྲེན་འབད།..."
 
-#: ../libpurple/protocols/sametime/sametime.c:5653
+#: ../libpurple/protocols/sametime/sametime.c:5689
 msgid "Add Notes Address Book Group..."
 msgstr "དྲན་འཛིན་ཚུའི་ཁ་བྱང་ཀི་དེབ་སྡེ་ཚན་ཁ་སྐོང་བརྐྱབ།..."
 
-#: ../libpurple/protocols/sametime/sametime.c:5657
+#: ../libpurple/protocols/sametime/sametime.c:5693
 msgid "User Search..."
 msgstr "ལག་ལེན་པ་གི་འཚོལ་ཞིབ།..."
 
-#: ../libpurple/protocols/sametime/sametime.c:5764
+#: ../libpurple/protocols/sametime/sametime.c:5800
 msgid "Force login (ignore server redirects)"
 msgstr ""
 "ནང་བསྐྱོད་འབད་ནི་བང་བཅོང་།(སར་བར་གྱི་སླར་ལོག་གཏང་ནི་ཚུ་སྣང་མེད་སྦེ་བཞག)"
 
 #. pretend to be Sametime Connect
-#: ../libpurple/protocols/sametime/sametime.c:5774
+#: ../libpurple/protocols/sametime/sametime.c:5810
 msgid "Hide client identity"
 msgstr "ཞབས་ཏོག་སྤྱོད་མི་ངོ་རྟགས་སྦ།"
 
@@ -11911,8 +11907,8 @@
 #: ../libpurple/protocols/silc/buddy.c:500
 #: ../libpurple/protocols/silc/buddy.c:511
 #: ../libpurple/protocols/silc/buddy.c:544
-#: ../libpurple/protocols/silc/ops.c:1514
-#: ../libpurple/protocols/silc/ops.c:1525
+#: ../libpurple/protocols/silc/ops.c:1515
+#: ../libpurple/protocols/silc/ops.c:1526
 #: ../libpurple/protocols/silc10/buddy.c:513
 #: ../libpurple/protocols/silc10/buddy.c:548
 #: ../libpurple/protocols/silc10/ops.c:1494
@@ -11921,8 +11917,8 @@
 msgstr "མི་མང་གི་ལྡེ་མིག་ལེན།"
 
 #: ../libpurple/protocols/silc/buddy.c:545
-#: ../libpurple/protocols/silc/ops.c:1515
-#: ../libpurple/protocols/silc/ops.c:1526
+#: ../libpurple/protocols/silc/ops.c:1516
+#: ../libpurple/protocols/silc/ops.c:1527
 #: ../libpurple/protocols/silc10/buddy.c:549
 #: ../libpurple/protocols/silc10/ops.c:1495
 #: ../libpurple/protocols/silc10/ops.c:1506
@@ -11930,14 +11926,14 @@
 msgstr "མི་མང་གི་ལྡེ་མིག་ལེན་མི་ཚུགས་པས།"
 
 #: ../libpurple/protocols/silc/buddy.c:626
-#: ../libpurple/protocols/silc/buddy.c:1662
+#: ../libpurple/protocols/silc/buddy.c:1668
 #: ../libpurple/protocols/silc10/buddy.c:635
 #: ../libpurple/protocols/silc10/buddy.c:1674
 msgid "Show Public Key"
 msgstr "མི་མང་གི་ལྡེ་མིག་ སྟོན།"
 
 #: ../libpurple/protocols/silc/buddy.c:627
-#: ../libpurple/protocols/silc/buddy.c:1029
+#: ../libpurple/protocols/silc/buddy.c:1035
 #: ../libpurple/protocols/silc/chat.c:241
 #: ../libpurple/protocols/silc10/buddy.c:636
 #: ../libpurple/protocols/silc10/buddy.c:1036
@@ -11946,11 +11942,11 @@
 msgstr "མི་མང་གི་ལྡེ་མིག་ མངོན་གསལ་འབད་མ་ཚུགས།"
 
 #: ../libpurple/protocols/silc/buddy.c:706
-#: ../libpurple/protocols/silc/ops.c:1064
-#: ../libpurple/protocols/silc/ops.c:1179
-#: ../libpurple/protocols/silc/ops.c:1301
+#: ../libpurple/protocols/silc/ops.c:1065
+#: ../libpurple/protocols/silc/ops.c:1180
 #: ../libpurple/protocols/silc/ops.c:1302
-#: ../libpurple/protocols/silc/ops.c:1320
+#: ../libpurple/protocols/silc/ops.c:1303
+#: ../libpurple/protocols/silc/ops.c:1321
 #: ../libpurple/protocols/silc10/buddy.c:713
 #: ../libpurple/protocols/silc10/ops.c:1087
 #: ../libpurple/protocols/silc10/ops.c:1159
@@ -11961,8 +11957,8 @@
 msgstr "ལག་ལེན་པའི་བརྡ་དོན།"
 
 #: ../libpurple/protocols/silc/buddy.c:707
-#: ../libpurple/protocols/silc/ops.c:1180
-#: ../libpurple/protocols/silc/ops.c:1321
+#: ../libpurple/protocols/silc/ops.c:1181
+#: ../libpurple/protocols/silc/ops.c:1322
 #: ../libpurple/protocols/silc10/buddy.c:714
 #: ../libpurple/protocols/silc10/ops.c:1160
 #: ../libpurple/protocols/silc10/ops.c:1314
@@ -11987,18 +11983,18 @@
 "ལག་ལེན་འཐབ་ཚུགས།"
 
 #. Open file selector to select the public key.
-#: ../libpurple/protocols/silc/buddy.c:1061
+#: ../libpurple/protocols/silc/buddy.c:1067
 #: ../libpurple/protocols/silc10/buddy.c:1070
 msgid "Open..."
 msgstr "ཁ་ཕྱེ..."
 
-#: ../libpurple/protocols/silc/buddy.c:1072
+#: ../libpurple/protocols/silc/buddy.c:1078
 #: ../libpurple/protocols/silc10/buddy.c:1081
 #, c-format
 msgid "The %s buddy is not present in the network"
 msgstr "ཆ་རོགས་ %sའདི ཡོངས་འབྲེལ་ནང་མིན་འདུག"
 
-#: ../libpurple/protocols/silc/buddy.c:1075
+#: ../libpurple/protocols/silc/buddy.c:1081
 #: ../libpurple/protocols/silc10/buddy.c:1084
 msgid ""
 "To add the buddy you must import his/her public key. Press Import to import "
@@ -12007,17 +12003,17 @@
 "ཆ་རོགས་ཁ་སྐོང་འབད་ནིའི་དོན་ལུ་ ཁྱོད་ཀྱིས་ ཁོ/མོའི མི་མང་ལྡེ་མིག་འདི་ "
 "ནང་འདྲེན་འབད་དགོ  མི་མང་གི་ལྡེ་མིག་ནང་འདྲེན་འབད་ནིའི་དོན་ལུ་ ནང་འདྲེན་གཡེབ།"
 
-#: ../libpurple/protocols/silc/buddy.c:1079
+#: ../libpurple/protocols/silc/buddy.c:1085
 #: ../libpurple/protocols/silc10/buddy.c:1088
 msgid "_Import..."
 msgstr "ནང་འདྲེན...(_I)"
 
-#: ../libpurple/protocols/silc/buddy.c:1185
+#: ../libpurple/protocols/silc/buddy.c:1191
 #: ../libpurple/protocols/silc10/buddy.c:1184
 msgid "Select correct user"
 msgstr "བདེན་པའི་ལག་ལེན་པ་འདི་སེལ་འཐུ་འབད།"
 
-#: ../libpurple/protocols/silc/buddy.c:1187
+#: ../libpurple/protocols/silc/buddy.c:1193
 #: ../libpurple/protocols/silc10/buddy.c:1186
 msgid ""
 "More than one user was found with the same public key. Select the correct "
@@ -12027,7 +12023,7 @@
 "ཆ་རོགས་ཀྱི་ཐོ་ཡིག་ནང་ཁ་སྐོང་འབད་ནིའི་དོན་ལུ་ ཐོ་ཡིག་ནང་ལས་ "
 "བདེན་པའི་ལག་ལེན་པ་ སེལ་འཐུ་འབད།"
 
-#: ../libpurple/protocols/silc/buddy.c:1189
+#: ../libpurple/protocols/silc/buddy.c:1195
 #: ../libpurple/protocols/silc10/buddy.c:1188
 msgid ""
 "More than one user was found with the same name. Select the correct user "
@@ -12037,67 +12033,67 @@
 "ཆ་རོགས་ཐོ་ཡིག་ནང་ཁ་སྐོང་འབད་ནིའི་དོན་ལུ་ ཐོ་ཡིག་ནང་ལས་ བདེན་པའི་ལག་ལེན་པ་ "
 "སེལ་འཐུ་འབད།"
 
-#: ../libpurple/protocols/silc/buddy.c:1481
+#: ../libpurple/protocols/silc/buddy.c:1487
 #: ../libpurple/protocols/silc10/buddy.c:1494
 msgid "Detached"
 msgstr "ཁ་འཕྱལ་ཡི།"
 
-#: ../libpurple/protocols/silc/buddy.c:1485
+#: ../libpurple/protocols/silc/buddy.c:1491
 #: ../libpurple/protocols/silc/silc.c:60
 #: ../libpurple/protocols/silc10/buddy.c:1498
 #: ../libpurple/protocols/silc10/silc.c:50
 msgid "Indisposed"
 msgstr "ཁམས་མི་བདེ་བ།"
 
-#: ../libpurple/protocols/silc/buddy.c:1489
+#: ../libpurple/protocols/silc/buddy.c:1495
 #: ../libpurple/protocols/silc/silc.c:62
 #: ../libpurple/protocols/silc10/buddy.c:1502
 #: ../libpurple/protocols/silc10/silc.c:52
 msgid "Wake Me Up"
 msgstr "ང་ཡར་ལྷོང་།"
 
-#: ../libpurple/protocols/silc/buddy.c:1491
+#: ../libpurple/protocols/silc/buddy.c:1497
 #: ../libpurple/protocols/silc/silc.c:54
 #: ../libpurple/protocols/silc10/buddy.c:1504
 #: ../libpurple/protocols/silc10/silc.c:44
 msgid "Hyper Active"
 msgstr "ཤིན་ཏུ་ཤུགས་ལྡན།"
 
-#: ../libpurple/protocols/silc/buddy.c:1493
+#: ../libpurple/protocols/silc/buddy.c:1499
 #: ../libpurple/protocols/silc10/buddy.c:1506
 msgid "Robot"
 msgstr "འཕྲུལ་མི།"
 
-#: ../libpurple/protocols/silc/buddy.c:1551
-#: ../libpurple/protocols/silc/ops.c:1218
+#: ../libpurple/protocols/silc/buddy.c:1557
+#: ../libpurple/protocols/silc/ops.c:1219
 #: ../libpurple/protocols/silc10/buddy.c:1565
 #: ../libpurple/protocols/silc10/ops.c:1202
 msgid "User Modes"
 msgstr "ལག་ལེན་པའི་ཐབས་ལམ་ཚུ།"
 
-#: ../libpurple/protocols/silc/buddy.c:1568
-#: ../libpurple/protocols/silc/ops.c:1235
+#: ../libpurple/protocols/silc/buddy.c:1574
+#: ../libpurple/protocols/silc/ops.c:1236
 #: ../libpurple/protocols/silc10/buddy.c:1582
 #: ../libpurple/protocols/silc10/ops.c:1219
 msgid "Preferred Contact"
 msgstr "དགའ་མིའི་འབྲེལ་ས།"
 
-#: ../libpurple/protocols/silc/buddy.c:1573
-#: ../libpurple/protocols/silc/ops.c:1240
+#: ../libpurple/protocols/silc/buddy.c:1579
+#: ../libpurple/protocols/silc/ops.c:1241
 #: ../libpurple/protocols/silc10/buddy.c:1587
 #: ../libpurple/protocols/silc10/ops.c:1224
 msgid "Preferred Language"
 msgstr "དགའ་མིའི་སྐད་ཡིག"
 
-#: ../libpurple/protocols/silc/buddy.c:1578
-#: ../libpurple/protocols/silc/ops.c:1245
+#: ../libpurple/protocols/silc/buddy.c:1584
+#: ../libpurple/protocols/silc/ops.c:1246
 #: ../libpurple/protocols/silc10/buddy.c:1592
 #: ../libpurple/protocols/silc10/ops.c:1229
 msgid "Device"
 msgstr "ཐབས་འཕྲུལ།"
 
-#: ../libpurple/protocols/silc/buddy.c:1583
-#: ../libpurple/protocols/silc/ops.c:1250
+#: ../libpurple/protocols/silc/buddy.c:1589
+#: ../libpurple/protocols/silc/ops.c:1251
 #: ../libpurple/protocols/silc10/buddy.c:1597
 #: ../libpurple/protocols/silc10/ops.c:1234
 #: ../libpurple/protocols/silc10/silc.c:747
@@ -12105,41 +12101,41 @@
 msgid "Timezone"
 msgstr "ཆུ་ཚོད་གླིང་སྡེ།"
 
-#: ../libpurple/protocols/silc/buddy.c:1588
-#: ../libpurple/protocols/silc/ops.c:1255
+#: ../libpurple/protocols/silc/buddy.c:1594
+#: ../libpurple/protocols/silc/ops.c:1256
 #: ../libpurple/protocols/silc10/buddy.c:1602
 #: ../libpurple/protocols/silc10/ops.c:1239
 msgid "Geolocation"
 msgstr "ཇིའོ་གནས་ཁོངས།"
 
-#: ../libpurple/protocols/silc/buddy.c:1645
+#: ../libpurple/protocols/silc/buddy.c:1651
 #: ../libpurple/protocols/silc10/buddy.c:1656
 msgid "Reset IM Key"
 msgstr "ཨའི་ཨེམ་ ལྡེ་མིག་ བསྐྱར་སྒྲིག་འབད།"
 
-#: ../libpurple/protocols/silc/buddy.c:1650
+#: ../libpurple/protocols/silc/buddy.c:1656
 #: ../libpurple/protocols/silc10/buddy.c:1662
 msgid "IM with Key Exchange"
 msgstr "ཨའི་ཨེམ་དང་བཅས་ལྡེ་མིག་བརྗེ་སོར།"
 
-#: ../libpurple/protocols/silc/buddy.c:1655
+#: ../libpurple/protocols/silc/buddy.c:1661
 #: ../libpurple/protocols/silc10/buddy.c:1667
 msgid "IM with Password"
 msgstr "ཨའི་ཨེམ་དང་བཅས་ཆོག་ཡིག"
 
-#: ../libpurple/protocols/silc/buddy.c:1668
+#: ../libpurple/protocols/silc/buddy.c:1674
 #: ../libpurple/protocols/silc10/buddy.c:1680
 msgid "Get Public Key..."
 msgstr "མི་མང་གི་ལྡེ་མིག་ལེན..."
 
-#: ../libpurple/protocols/silc/buddy.c:1675
-#: ../libpurple/protocols/silc/ops.c:1623
+#: ../libpurple/protocols/silc/buddy.c:1681
+#: ../libpurple/protocols/silc/ops.c:1624
 #: ../libpurple/protocols/silc10/buddy.c:1687
 #: ../libpurple/protocols/silc10/ops.c:1624
 msgid "Kill User"
 msgstr "ལགལེན་པ་ གསད།"
 
-#: ../libpurple/protocols/silc/buddy.c:1685
+#: ../libpurple/protocols/silc/buddy.c:1691
 #: ../libpurple/protocols/silc/chat.c:1004
 #: ../libpurple/protocols/silc10/buddy.c:1697
 #: ../libpurple/protocols/silc10/chat.c:977
@@ -12289,7 +12285,7 @@
 msgstr "སྡེ་ཚན་གྱི་མིང་།"
 
 #: ../libpurple/protocols/silc/chat.c:607
-#: ../libpurple/protocols/silc/ops.c:1828
+#: ../libpurple/protocols/silc/ops.c:1829
 #: ../libpurple/protocols/silc/silc.c:1260
 #: ../libpurple/protocols/silc10/chat.c:585
 #: ../libpurple/protocols/silc10/ops.c:1907
@@ -12497,8 +12493,8 @@
 msgid "Error occurred"
 msgstr ""
 
-#: ../libpurple/protocols/silc/ops.c:558 ../libpurple/protocols/silc/ops.c:567
-#: ../libpurple/protocols/silc/ops.c:576
+#: ../libpurple/protocols/silc/ops.c:560 ../libpurple/protocols/silc/ops.c:569
+#: ../libpurple/protocols/silc/ops.c:578
 #: ../libpurple/protocols/silc10/ops.c:554
 #: ../libpurple/protocols/silc10/ops.c:563
 #: ../libpurple/protocols/silc10/ops.c:572
@@ -12506,38 +12502,38 @@
 msgid "%s has changed the topic of <I>%s</I> to: %s"
 msgstr "%s ཀྱིས  <I>%s</I> གི་མགོ་མིང་འདི་ %sལུ་ བསྒྱུར་བཅོས་རྐྱབས་ནུག"
 
-#: ../libpurple/protocols/silc/ops.c:642
+#: ../libpurple/protocols/silc/ops.c:644
 #: ../libpurple/protocols/silc10/ops.c:638
 #, c-format
 msgid "<I>%s</I> set channel <I>%s</I> modes to: %s"
 msgstr "<I>%s</I> རྒྱུ་ལམ་གཞི་སྒྲིག་འབད་ <I>%s</I>ཐབས་ལམ་ཚུ: %sལུ།"
 
-#: ../libpurple/protocols/silc/ops.c:646
+#: ../libpurple/protocols/silc/ops.c:648
 #: ../libpurple/protocols/silc10/ops.c:642
 #, c-format
 msgid "<I>%s</I> removed all channel <I>%s</I> modes"
 msgstr "<I>%s</I> རྒྱུ་ལམ་གེ་ར་རྩ་བསྐྲད་བཏང་ཡི<I>%s</I>ཐབས་ལམ་ཚུ།"
 
-#: ../libpurple/protocols/silc/ops.c:679
+#: ../libpurple/protocols/silc/ops.c:681
 #: ../libpurple/protocols/silc10/ops.c:675
 #, c-format
 msgid "<I>%s</I> set <I>%s's</I> modes to: %s"
 msgstr "<I>%s</I> གཞི་སྒྲིག་འབད <I>%s's</I> ཐབས་ལམ་ཚུ: %sལུ།"
 
-#: ../libpurple/protocols/silc/ops.c:687
+#: ../libpurple/protocols/silc/ops.c:689
 #: ../libpurple/protocols/silc10/ops.c:683
 #, c-format
 msgid "<I>%s</I> removed all <I>%s's</I> modes"
 msgstr "<I>%s</I> གེ་ར་རྩ་བསྐྲད་བཏང་ཡི་ <I>%s's</I> ཐབས་ལམ་ཚུ།"
 
-#: ../libpurple/protocols/silc/ops.c:716
+#: ../libpurple/protocols/silc/ops.c:718
 #: ../libpurple/protocols/silc10/ops.c:712
 #, c-format
 msgid "You have been kicked off <I>%s</I> by <I>%s</I> (%s)"
 msgstr "ཁྱོད་ ཕྱི་ཁ་བཏོན་བཏང་ཡི<I>%s</I> by <I>%s</I> (%s)"
 
-#: ../libpurple/protocols/silc/ops.c:743 ../libpurple/protocols/silc/ops.c:748
-#: ../libpurple/protocols/silc/ops.c:753
+#: ../libpurple/protocols/silc/ops.c:745 ../libpurple/protocols/silc/ops.c:750
+#: ../libpurple/protocols/silc/ops.c:755
 #: ../libpurple/protocols/silc10/ops.c:742
 #: ../libpurple/protocols/silc10/ops.c:747
 #: ../libpurple/protocols/silc10/ops.c:752
@@ -12545,8 +12541,8 @@
 msgid "You have been killed by %s (%s)"
 msgstr "%s (%s)ཀྱིས་  ཁྱོད་བསད་དའི།"
 
-#: ../libpurple/protocols/silc/ops.c:774 ../libpurple/protocols/silc/ops.c:779
-#: ../libpurple/protocols/silc/ops.c:784
+#: ../libpurple/protocols/silc/ops.c:776 ../libpurple/protocols/silc/ops.c:781
+#: ../libpurple/protocols/silc/ops.c:786
 #: ../libpurple/protocols/silc10/ops.c:773
 #: ../libpurple/protocols/silc10/ops.c:778
 #: ../libpurple/protocols/silc10/ops.c:783
@@ -12554,157 +12550,157 @@
 msgid "Killed by %s (%s)"
 msgstr "%s (%s)གིས་ བསད་དའི།"
 
-#: ../libpurple/protocols/silc/ops.c:821
+#: ../libpurple/protocols/silc/ops.c:823
 #: ../libpurple/protocols/silc10/ops.c:829
 msgid "Server signoff"
 msgstr "སར་བར་ ཕྱི་ཁ་ཨིན།"
 
-#: ../libpurple/protocols/silc/ops.c:995
+#: ../libpurple/protocols/silc/ops.c:996
 #: ../libpurple/protocols/silc10/ops.c:1017
 msgid "Personal Information"
 msgstr "རང་དོན་གྱི་བརྡ་དོན།"
 
-#: ../libpurple/protocols/silc/ops.c:1018
+#: ../libpurple/protocols/silc/ops.c:1019
 #: ../libpurple/protocols/silc10/ops.c:1040
 msgid "Birth Day"
 msgstr "སྐྱེ་བའི་ཉིནམ།"
 
-#: ../libpurple/protocols/silc/ops.c:1026
+#: ../libpurple/protocols/silc/ops.c:1027
 #: ../libpurple/protocols/silc10/ops.c:1048
 msgid "Job Role"
 msgstr "ལས་གཡོག་ ལས་འགན།"
 
-#: ../libpurple/protocols/silc/ops.c:1030
+#: ../libpurple/protocols/silc/ops.c:1031
 #: ../libpurple/protocols/silc/silc.c:1253
 #: ../libpurple/protocols/silc10/ops.c:1052
 #: ../libpurple/protocols/silc10/silc.c:949
 msgid "Organization"
 msgstr "ཚོགས་སྡེ།"
 
-#: ../libpurple/protocols/silc/ops.c:1034
+#: ../libpurple/protocols/silc/ops.c:1035
 #: ../libpurple/protocols/silc10/ops.c:1056
 msgid "Unit"
 msgstr "ཆ་ཕྲན།"
 
-#: ../libpurple/protocols/silc/ops.c:1058
+#: ../libpurple/protocols/silc/ops.c:1059
 #: ../libpurple/protocols/silc10/ops.c:1080
 msgid "Note"
 msgstr "དྲན་ཐོ།"
 
-#: ../libpurple/protocols/silc/ops.c:1104
+#: ../libpurple/protocols/silc/ops.c:1105
 #: ../libpurple/protocols/silc10/ops.c:1128
 msgid "Join Chat"
 msgstr "ཁ་སླབ་གྲངས་སུ་འཛུལ།"
 
-#: ../libpurple/protocols/silc/ops.c:1138
+#: ../libpurple/protocols/silc/ops.c:1139
 #: ../libpurple/protocols/silc10/chat.c:1039
 #, c-format
 msgid "You are channel founder on <I>%s</I>"
 msgstr "ཁྱོད <I>%s</I>གུ་ རྒྱུ་ལམ་གཞི་བཙུགས་འབད་མི་ཨིན།"
 
-#: ../libpurple/protocols/silc/ops.c:1142
+#: ../libpurple/protocols/silc/ops.c:1143
 #: ../libpurple/protocols/silc10/chat.c:1043
 #, c-format
 msgid "Channel founder on <I>%s</I> is <I>%s</I>"
 msgstr "<I>%s</I> is <I>%s</I>གུ་  རྒྱུ་ལམ་གཞི་བཙུགས་འབད་མི་ཨིན།"
 
-#: ../libpurple/protocols/silc/ops.c:1201
-#: ../libpurple/protocols/silc/ops.c:1339
+#: ../libpurple/protocols/silc/ops.c:1202
+#: ../libpurple/protocols/silc/ops.c:1340
 #: ../libpurple/protocols/silc10/ops.c:1183
 #: ../libpurple/protocols/silc10/ops.c:1332
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1070
 msgid "Real Name"
 msgstr "མིང་ ངོ་མ།"
 
-#: ../libpurple/protocols/silc/ops.c:1229
+#: ../libpurple/protocols/silc/ops.c:1230
 #: ../libpurple/protocols/silc10/ops.c:1213 ../pidgin/gtkblist-theme.c:467
 msgid "Status Text"
 msgstr "གནས་ཚད་ ཚིག་ཡིག"
 
-#: ../libpurple/protocols/silc/ops.c:1291
-#: ../libpurple/protocols/silc/ops.c:1365
+#: ../libpurple/protocols/silc/ops.c:1292
+#: ../libpurple/protocols/silc/ops.c:1366
 #: ../libpurple/protocols/silc10/ops.c:1285
 #: ../libpurple/protocols/silc10/ops.c:1357
 msgid "Public Key Fingerprint"
 msgstr "མི་མང་ལྡེ་མིག་མཛུབ་རྗེས།"
 
-#: ../libpurple/protocols/silc/ops.c:1292
-#: ../libpurple/protocols/silc/ops.c:1366
+#: ../libpurple/protocols/silc/ops.c:1293
+#: ../libpurple/protocols/silc/ops.c:1367
 #: ../libpurple/protocols/silc10/ops.c:1286
 #: ../libpurple/protocols/silc10/ops.c:1358
 msgid "Public Key Babbleprint"
 msgstr "མི་མང་ལྡེ་མིག་ བ་བཱལ པིརིནཊི།"
 
-#: ../libpurple/protocols/silc/ops.c:1305
+#: ../libpurple/protocols/silc/ops.c:1306
 #: ../libpurple/protocols/silc10/ops.c:1298
 msgid "_More..."
 msgstr "ཧེང་བཀལ...(_M)"
 
-#: ../libpurple/protocols/silc/ops.c:1384
+#: ../libpurple/protocols/silc/ops.c:1385
 #: ../libpurple/protocols/silc/silc.c:1317
 #: ../libpurple/protocols/silc10/ops.c:1371
 #: ../libpurple/protocols/silc10/silc.c:1013
 msgid "Detach From Server"
 msgstr "སར་བར་ལས་ཁ་འཕྱལ་གཏང་།"
 
-#: ../libpurple/protocols/silc/ops.c:1384
+#: ../libpurple/protocols/silc/ops.c:1385
 #: ../libpurple/protocols/silc10/ops.c:1371
 msgid "Cannot detach"
 msgstr "ཁ་འཕྱལ་མི་ཚུགས།"
 
-#: ../libpurple/protocols/silc/ops.c:1404
+#: ../libpurple/protocols/silc/ops.c:1405
 #: ../libpurple/protocols/silc10/ops.c:1382
 msgid "Cannot set topic"
 msgstr "མགོ་མིང་གཞི་སྒྲིག་འབད་མི་ཚུགས།"
 
-#: ../libpurple/protocols/silc/ops.c:1433
+#: ../libpurple/protocols/silc/ops.c:1434
 #: ../libpurple/protocols/silc10/ops.c:1414
 msgid "Failed to change nickname"
 msgstr "སྐྱོན་མིང་བསྒྱུར་བཅོས་འབད་མ་ཚུགས།"
 
-#: ../libpurple/protocols/silc/ops.c:1482
+#: ../libpurple/protocols/silc/ops.c:1483
 #: ../libpurple/protocols/silc10/ops.c:1462
 msgid "Roomlist"
 msgstr "ཁང་མིག་ཐོ་ཡིག"
 
-#: ../libpurple/protocols/silc/ops.c:1482
+#: ../libpurple/protocols/silc/ops.c:1483
 #: ../libpurple/protocols/silc10/ops.c:1462
 msgid "Cannot get room list"
 msgstr "ཁང་མིག་ཐོ་ཡིག་ཐོབ་མི་ཚུགས།"
 
-#: ../libpurple/protocols/silc/ops.c:1483
+#: ../libpurple/protocols/silc/ops.c:1484
 msgid "Network is empty"
 msgstr ""
 
-#: ../libpurple/protocols/silc/ops.c:1527
+#: ../libpurple/protocols/silc/ops.c:1528
 #: ../libpurple/protocols/silc10/ops.c:1507
 msgid "No public key was received"
 msgstr "མི་མང་ལྡེ་མིག་ མ་ཐོབ་པས།"
 
-#: ../libpurple/protocols/silc/ops.c:1539
-#: ../libpurple/protocols/silc/ops.c:1552
+#: ../libpurple/protocols/silc/ops.c:1540
+#: ../libpurple/protocols/silc/ops.c:1553
 #: ../libpurple/protocols/silc10/ops.c:1519
 #: ../libpurple/protocols/silc10/ops.c:1532
 msgid "Server Information"
 msgstr "སར་བར་ བརྡ་དོན།"
 
-#: ../libpurple/protocols/silc/ops.c:1540
+#: ../libpurple/protocols/silc/ops.c:1541
 #: ../libpurple/protocols/silc10/ops.c:1520
 msgid "Cannot get server information"
 msgstr "སལ་བར་ བརྡ་དོན་ཐོབ་མི་ཚུགས།"
 
-#: ../libpurple/protocols/silc/ops.c:1563
+#: ../libpurple/protocols/silc/ops.c:1564
 #: ../libpurple/protocols/silc10/ops.c:1549
 #: ../libpurple/protocols/silc10/ops.c:1558
 msgid "Server Statistics"
 msgstr "སར་བར་ ཚད་རྩིས་ཚུ།"
 
-#: ../libpurple/protocols/silc/ops.c:1564
+#: ../libpurple/protocols/silc/ops.c:1565
 #: ../libpurple/protocols/silc10/ops.c:1550
 msgid "Cannot get server statistics"
 msgstr "སར་བར་ ཚད་རྩིས་ཚུ་ཐོབ་མི་ཚུགས།"
 
-#: ../libpurple/protocols/silc/ops.c:1571
+#: ../libpurple/protocols/silc/ops.c:1572
 #: ../libpurple/protocols/silc10/ops.c:1581
 #, c-format
 msgid ""
@@ -12740,43 +12736,43 @@
 "སར་བར་ བཀོལ་སྤྱོད་པ་ཚུ་ བསྡོམས: %d\n"
 "རུ་ཊར་ བཀོལ་སྤྱོད་པ་ཚུ་  བསྡོམས: %d\n"
 
-#: ../libpurple/protocols/silc/ops.c:1603
+#: ../libpurple/protocols/silc/ops.c:1604
 #: ../libpurple/protocols/silc10/ops.c:1604
 msgid "Network Statistics"
 msgstr "ཡོངས་འབྲེལ་ཚད་རྩིས་ཚུ།"
 
-#: ../libpurple/protocols/silc/ops.c:1611
-#: ../libpurple/protocols/silc/ops.c:1616
+#: ../libpurple/protocols/silc/ops.c:1612
+#: ../libpurple/protocols/silc/ops.c:1617
 #: ../libpurple/protocols/silc10/ops.c:1612
 #: ../libpurple/protocols/silc10/ops.c:1617
 msgid "Ping"
 msgstr "པིང་།"
 
-#: ../libpurple/protocols/silc/ops.c:1611
+#: ../libpurple/protocols/silc/ops.c:1612
 #: ../libpurple/protocols/silc10/ops.c:1612
 msgid "Ping failed"
 msgstr "པིང་ འཐུས་ཤོར་བྱུང་ཡོདཔ།"
 
-#: ../libpurple/protocols/silc/ops.c:1616
+#: ../libpurple/protocols/silc/ops.c:1617
 #: ../libpurple/protocols/silc10/ops.c:1617
 msgid "Ping reply received from server"
 msgstr "སར་བར་ལས་ པིང་ལན་གསལ་ཐོབ་ནུག"
 
-#: ../libpurple/protocols/silc/ops.c:1624
+#: ../libpurple/protocols/silc/ops.c:1625
 #: ../libpurple/protocols/silc10/ops.c:1625
 msgid "Could not kill user"
 msgstr "ལག་ལེན་པ་གསད་མ་ཚུགས།"
 
-#: ../libpurple/protocols/silc/ops.c:1663
+#: ../libpurple/protocols/silc/ops.c:1664
 msgid "WATCH"
 msgstr ""
 
-#: ../libpurple/protocols/silc/ops.c:1663
+#: ../libpurple/protocols/silc/ops.c:1664
 msgid "Cannot watch user"
 msgstr ""
 
-#: ../libpurple/protocols/silc/ops.c:1739
-#: ../libpurple/protocols/silc/ops.c:1790
+#: ../libpurple/protocols/silc/ops.c:1740
+#: ../libpurple/protocols/silc/ops.c:1791
 #: ../libpurple/protocols/silc/silc.c:396
 #: ../libpurple/protocols/silc10/ops.c:1817
 #: ../libpurple/protocols/silc10/ops.c:1864
@@ -12784,17 +12780,17 @@
 msgid "Resuming session"
 msgstr "ལཱ་ཡུན་བསྐྱར་ལོག་དོ།"
 
-#: ../libpurple/protocols/silc/ops.c:1741
+#: ../libpurple/protocols/silc/ops.c:1742
 #: ../libpurple/protocols/silc10/ops.c:1819
 msgid "Authenticating connection"
 msgstr "མཐུད་ལམ་བདེན་པ་བཤད་དོ།"
 
-#: ../libpurple/protocols/silc/ops.c:1792
+#: ../libpurple/protocols/silc/ops.c:1793
 #: ../libpurple/protocols/silc10/ops.c:1866
 msgid "Verifying server public key"
 msgstr "སར་བར་ མི་མང་ལྡེ་མིག་བདེན་སྦྱོར་འབད་དོ།"
 
-#: ../libpurple/protocols/silc/ops.c:1829
+#: ../libpurple/protocols/silc/ops.c:1830
 #: ../libpurple/protocols/silc10/ops.c:1908
 msgid "Passphrase required"
 msgstr "ཆོག་ཚིག་དགོཔ་ཨིན།"
@@ -12910,7 +12906,7 @@
 msgstr "ཁྱོད་ཀྱི་ད་ལྟོའི་ཁམས།"
 
 #: ../libpurple/protocols/silc/silc.c:981
-#: ../libpurple/protocols/silc10/silc.c:677 ../pidgin/gtkprefs.c:2417
+#: ../libpurple/protocols/silc10/silc.c:677 ../pidgin/gtkprefs.c:2411
 #, c-format
 msgid "Normal"
 msgstr "སྤྱིར་བཏང་།"
@@ -12925,14 +12921,14 @@
 "ཁྱོད་རའི་དགའ་དམ་ཅན་གྱི་འབྲེལ་སའི་ཐབས་ལམ་ཚུ།"
 
 #: ../libpurple/protocols/silc/silc.c:1014
-#: ../libpurple/protocols/silc/util.c:517
+#: ../libpurple/protocols/silc/util.c:568
 #: ../libpurple/protocols/silc10/silc.c:710
 #: ../libpurple/protocols/silc10/util.c:561
 msgid "SMS"
 msgstr "ཨེསི་ཨེམ་ཨེསི།"
 
 #: ../libpurple/protocols/silc/silc.c:1016
-#: ../libpurple/protocols/silc/util.c:519
+#: ../libpurple/protocols/silc/util.c:570
 #: ../libpurple/protocols/silc10/silc.c:712
 #: ../libpurple/protocols/silc10/util.c:563
 msgid "MMS"
@@ -13154,7 +13150,7 @@
 
 #: ../libpurple/protocols/silc/silc.c:1941
 #: ../libpurple/protocols/silc10/silc.c:1650
-#: ../libpurple/protocols/zephyr/zephyr.c:2708
+#: ../libpurple/protocols/zephyr/zephyr.c:2693
 msgid "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user"
 msgstr ""
 "ཨེམ་ཨེསི་ཇི &lt;ནིཀ&gt; &lt;འཕྲིན་དོན&gt;: ལག་ལེན་པ་ལུ་ "
@@ -13321,7 +13317,7 @@
 "མཐའ་བཙན་བཟོ།"
 
 #: ../libpurple/protocols/silc/silc.c:2188
-#: ../libpurple/protocols/silc10/silc.c:1902 ../pidgin/gtkprefs.c:2808
+#: ../libpurple/protocols/silc10/silc.c:1902 ../pidgin/gtkprefs.c:2803
 msgid "Network"
 msgstr "ཡོངས་འབྲེལ།"
 
@@ -13376,75 +13372,75 @@
 "ཌི་ཇི་ཊཱལ་གྱི་ཐོག་ལས་ མིང་རྟགས་བཀོད་བཞིནམ་ལས་ "
 "འཕྲིན་དོན་ཚུ་ཆ་མཉམ་རང་བདེན་སྦྱོར་འབད།"
 
-#: ../libpurple/protocols/silc/util.c:159
-#: ../libpurple/protocols/silc/util.c:202
+#: ../libpurple/protocols/silc/util.c:208
+#: ../libpurple/protocols/silc/util.c:251
 #: ../libpurple/protocols/silc10/util.c:207
 #: ../libpurple/protocols/silc10/util.c:247
 msgid "Creating SILC key pair..."
 msgstr "ཨེསི་ཨའི་ཨེལ་སི་  ལྡེ་མིག་ཟུང་ བཟོ་བསྐྲུན་འབད་དོ..."
 
-#: ../libpurple/protocols/silc/util.c:168
-#: ../libpurple/protocols/silc/util.c:211
+#: ../libpurple/protocols/silc/util.c:217
+#: ../libpurple/protocols/silc/util.c:260
 msgid "Unable to create SILC key pair"
 msgstr ""
 
 #. Hint for translators: Please check the tabulator width here and in
 #. the next strings (short strings: 2 tabs, longer strings 1 tab,
 #. sum: 3 tabs or 24 characters)
-#: ../libpurple/protocols/silc/util.c:313
+#: ../libpurple/protocols/silc/util.c:364
 #: ../libpurple/protocols/silc10/util.c:355
 #, c-format
 msgid "Real Name: \t%s\n"
 msgstr "མིང་ངོ་མ: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:315
+#: ../libpurple/protocols/silc/util.c:366
 #: ../libpurple/protocols/silc10/util.c:357
 #, c-format
 msgid "User Name: \t%s\n"
 msgstr "ལག་ལེན་པའི་མིང་: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:317
+#: ../libpurple/protocols/silc/util.c:368
 #: ../libpurple/protocols/silc10/util.c:359
 #, c-format
 msgid "Email: \t\t%s\n"
 msgstr "གློག་-འཕྲིན་: \t\t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:319
+#: ../libpurple/protocols/silc/util.c:370
 #: ../libpurple/protocols/silc10/util.c:361
 #, c-format
 msgid "Host Name: \t%s\n"
 msgstr "ཧོསཊི་ མིང་: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:321
+#: ../libpurple/protocols/silc/util.c:372
 #: ../libpurple/protocols/silc10/util.c:363
 #, c-format
 msgid "Organization: \t%s\n"
 msgstr "ཚོགས་སྡེ: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:323
+#: ../libpurple/protocols/silc/util.c:374
 #: ../libpurple/protocols/silc10/util.c:365
 #, c-format
 msgid "Country: \t%s\n"
 msgstr "རྒྱལ་ཁབ: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:324
+#: ../libpurple/protocols/silc/util.c:375
 #: ../libpurple/protocols/silc10/util.c:366
 #, c-format
 msgid "Algorithm: \t%s\n"
 msgstr "ཨཱལ་གོ་རི་དམ: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:325
+#: ../libpurple/protocols/silc/util.c:376
 #: ../libpurple/protocols/silc10/util.c:367
 #, c-format
 msgid "Key Length: \t%d bits\n"
 msgstr "ལྡེ་མིག་གི་རིང་ཚད: \t%d བིཊིསི\n"
 
-#: ../libpurple/protocols/silc/util.c:327
+#: ../libpurple/protocols/silc/util.c:378
 #, c-format
 msgid "Version: \t%s\n"
 msgstr ""
 
-#: ../libpurple/protocols/silc/util.c:329
+#: ../libpurple/protocols/silc/util.c:380
 #: ../libpurple/protocols/silc10/util.c:369
 #, c-format
 msgid ""
@@ -13456,7 +13452,7 @@
 "%s\n"
 "\n"
 
-#: ../libpurple/protocols/silc/util.c:330
+#: ../libpurple/protocols/silc/util.c:381
 #: ../libpurple/protocols/silc10/util.c:370
 #, c-format
 msgid ""
@@ -13466,46 +13462,46 @@
 "མི་མང་ལྡེ་མིག་ བ་བཱལ་པིརིནཊི:\n"
 "%s"
 
-#: ../libpurple/protocols/silc/util.c:332
-#: ../libpurple/protocols/silc/util.c:333
+#: ../libpurple/protocols/silc/util.c:383
+#: ../libpurple/protocols/silc/util.c:384
 #: ../libpurple/protocols/silc10/util.c:374
 #: ../libpurple/protocols/silc10/util.c:375
 msgid "Public Key Information"
 msgstr "མི་མང་ལྡེ་མིག་ བརྡ་དོན།"
 
-#: ../libpurple/protocols/silc/util.c:515
+#: ../libpurple/protocols/silc/util.c:566
 #: ../libpurple/protocols/silc10/util.c:559
 msgid "Paging"
 msgstr "ཤོག་ལེབ་ལྷོག་དོ།"
 
-#: ../libpurple/protocols/silc/util.c:521
+#: ../libpurple/protocols/silc/util.c:572
 #: ../libpurple/protocols/silc10/util.c:565
 msgid "Video Conferencing"
 msgstr "ཝི་ཌིའོ་ ཞལ་འཛོམས།"
 
-#: ../libpurple/protocols/silc/util.c:539
+#: ../libpurple/protocols/silc/util.c:590
 #: ../libpurple/protocols/silc10/util.c:584
 msgid "Computer"
 msgstr "གློག་རིག"
 
-#: ../libpurple/protocols/silc/util.c:543
+#: ../libpurple/protocols/silc/util.c:594
 #: ../libpurple/protocols/silc10/util.c:588
 msgid "PDA"
 msgstr "པི་ཌི་ཨེ།"
 
-#: ../libpurple/protocols/silc/util.c:545
+#: ../libpurple/protocols/silc/util.c:596
 #: ../libpurple/protocols/silc10/util.c:590
 msgid "Terminal"
 msgstr "ཊར་མི་ནཱལ།"
 
-#: ../libpurple/protocols/silc/wb.c:287 ../libpurple/protocols/silc10/wb.c:287
+#: ../libpurple/protocols/silc/wb.c:289 ../libpurple/protocols/silc10/wb.c:287
 #, c-format
 msgid "%s sent message to whiteboard. Would you like to open the whiteboard?"
 msgstr ""
 "%s གིས་ པང་དེབ་དཀརཔོ་ལུ་འཕྲིན་དོན་བཏང་ཡོདཔ། ཁྱོད་ཀྱིས་ "
 "པང་དེབ་དཀརཔོ་འདི་ཁ་ཕྱེ་ནི་ཨིན་ན?"
 
-#: ../libpurple/protocols/silc/wb.c:291 ../libpurple/protocols/silc10/wb.c:291
+#: ../libpurple/protocols/silc/wb.c:293 ../libpurple/protocols/silc10/wb.c:291
 #, c-format
 msgid ""
 "%s sent message to whiteboard on %s channel. Would you like to open the "
@@ -13514,7 +13510,7 @@
 "རྒྱུ་ལམ་ %s གུ་ལུ་ པང་དེབ་དཀརཔོ་ལུ་ %s གིས་ འཕྲིན་དོན་བཏང་ཡོདཔ། ཁྱོད་ཀྱིས་ "
 "པང་དེབ་དཀརཔོ་འདི་ཁ་ཕྱེ་ནི་ཨིན་ན?"
 
-#: ../libpurple/protocols/silc/wb.c:305 ../libpurple/protocols/silc10/wb.c:305
+#: ../libpurple/protocols/silc/wb.c:307 ../libpurple/protocols/silc10/wb.c:305
 msgid "Whiteboard"
 msgstr "པང་དེབ་དཀརཔོ།"
 
@@ -13606,27 +13602,27 @@
 msgid "Unable to create connection"
 msgstr "མཐུད་ལམ་གསར་བསྐྲུན་འབད་མ་ཚུགསཔ།"
 
-#: ../libpurple/protocols/simple/simple.c:1147
+#: ../libpurple/protocols/simple/simple.c:1142
 msgid "Unknown server response"
 msgstr ""
 
-#: ../libpurple/protocols/simple/simple.c:1782
-#: ../libpurple/protocols/simple/simple.c:1832
-#: ../libpurple/protocols/simple/simple.c:1847
-#: ../libpurple/protocols/simple/simple.c:1902
+#: ../libpurple/protocols/simple/simple.c:1780
+#: ../libpurple/protocols/simple/simple.c:1830
+#: ../libpurple/protocols/simple/simple.c:1845
+#: ../libpurple/protocols/simple/simple.c:1900
 msgid "Unable to create listen socket"
 msgstr ""
 
-#: ../libpurple/protocols/simple/simple.c:1811
-#: ../libpurple/protocols/simple/simple.c:1913 ../libpurple/proxy.c:2211
+#: ../libpurple/protocols/simple/simple.c:1809
+#: ../libpurple/protocols/simple/simple.c:1911 ../libpurple/proxy.c:2240
 msgid "Unable to resolve hostname"
 msgstr ""
 
-#: ../libpurple/protocols/simple/simple.c:1931
+#: ../libpurple/protocols/simple/simple.c:1929
 msgid "SIP usernames may not contain whitespaces or @ symbols"
 msgstr ""
 
-#: ../libpurple/protocols/simple/simple.c:1950
+#: ../libpurple/protocols/simple/simple.c:1948
 msgid "SIP connect server not specified"
 msgstr ""
 
@@ -13638,36 +13634,36 @@
 #. *< id
 #. *< name
 #. *< version
-#: ../libpurple/protocols/simple/simple.c:2140
+#: ../libpurple/protocols/simple/simple.c:2138
 msgid "SIP/SIMPLE Protocol Plugin"
 msgstr "ཨེསི་ཨའི་པི/གནད་སྤེལ་ལམ་ལུགས་པ་ལག་ཨིན་འཇམ་སམ།"
 
 #. *  summary
-#: ../libpurple/protocols/simple/simple.c:2141
+#: ../libpurple/protocols/simple/simple.c:2139
 msgid "The SIP/SIMPLE Protocol Plugin"
 msgstr "ཨེསི་ཨའི་པི་/གནད་སྤེལ་ལམ་ལུགས་པ་ལག་ཨིན་འཇམ་སམ།"
 
-#: ../libpurple/protocols/simple/simple.c:2169
+#: ../libpurple/protocols/simple/simple.c:2167
 msgid "Publish status (note: everyone may watch you)"
 msgstr "གནས་ཚད་དཔེ་བསྐྲུན་འབད་ (དྲན་དགོཔ་: མི་ག་ར་གིས་ ཁྱོད་ལུ་བལྟ་འོང་།)"
 
-#: ../libpurple/protocols/simple/simple.c:2175
+#: ../libpurple/protocols/simple/simple.c:2173
 msgid "Use UDP"
 msgstr "ཡུ་ཌི་པི་ལག་ལེན་འཐབ།"
 
-#: ../libpurple/protocols/simple/simple.c:2177
+#: ../libpurple/protocols/simple/simple.c:2175
 msgid "Use proxy"
 msgstr "པོརོ་སི་ལག་ལེན་འཐབ།"
 
-#: ../libpurple/protocols/simple/simple.c:2179 ../pidgin/gtkprefs.c:2809
+#: ../libpurple/protocols/simple/simple.c:2177 ../pidgin/gtkprefs.c:2804
 msgid "Proxy"
 msgstr "པོརོ་སི།"
 
-#: ../libpurple/protocols/simple/simple.c:2181
+#: ../libpurple/protocols/simple/simple.c:2179
 msgid "Auth User"
 msgstr "ལག་ལེན་པ་བདེན་ཅན།"
 
-#: ../libpurple/protocols/simple/simple.c:2183
+#: ../libpurple/protocols/simple/simple.c:2181
 msgid "Auth Domain"
 msgstr "བདེན་ཅན་ཌོ་མེན།"
 
@@ -13760,7 +13756,7 @@
 msgid "Yahoo! JAPAN Protocol Plugin"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/libymsg.c:926
+#: ../libpurple/protocols/yahoo/libymsg.c:928
 #, c-format
 msgid "%s has sent you a webcam invite, which is not yet supported."
 msgstr ""
@@ -13804,38 +13800,38 @@
 msgstr "དང་ལེན་སྤང་བའི་ཆ་རོགས་ཁ་སྐོང་འབད།"
 
 #. Some error in the received stream
-#: ../libpurple/protocols/yahoo/libymsg.c:2016
-#: ../libpurple/protocols/yahoo/libymsg.c:2101
+#: ../libpurple/protocols/yahoo/libymsg.c:2017
+#: ../libpurple/protocols/yahoo/libymsg.c:2100
 msgid "Received invalid data"
 msgstr ""
 
 #. security lock from too many failed login attempts
-#: ../libpurple/protocols/yahoo/libymsg.c:2114
+#: ../libpurple/protocols/yahoo/libymsg.c:2113
 msgid ""
 "Account locked: Too many failed login attempts.  Logging into the Yahoo! "
 "website may fix this."
 msgstr ""
 
 #. indicates a lock of some description
-#: ../libpurple/protocols/yahoo/libymsg.c:2125
+#: ../libpurple/protocols/yahoo/libymsg.c:2124
 msgid ""
 "Account locked: Unknown reason.  Logging into the Yahoo! website may fix "
 "this."
 msgstr ""
 
 #. indicates a lock due to logging in too frequently
-#: ../libpurple/protocols/yahoo/libymsg.c:2131
+#: ../libpurple/protocols/yahoo/libymsg.c:2130
 msgid ""
 "Account locked: You have been logging in too frequently.  Wait a few minutes "
 "before trying to connect again.  Logging into the Yahoo! website may help."
 msgstr ""
 
 #. username or password missing
-#: ../libpurple/protocols/yahoo/libymsg.c:2138
+#: ../libpurple/protocols/yahoo/libymsg.c:2137
 msgid "Username or password missing"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/libymsg.c:2249
+#: ../libpurple/protocols/yahoo/libymsg.c:2256
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -13843,11 +13839,11 @@
 "Check %s for updates."
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/libymsg.c:2253
+#: ../libpurple/protocols/yahoo/libymsg.c:2260
 msgid "Failed Yahoo! Authentication"
 msgstr "ཡ་ཧུ་ འཐུས་ཤོར་བྱུང་ཡོདཔ! བདེན་བཤད།"
 
-#: ../libpurple/protocols/yahoo/libymsg.c:2336
+#: ../libpurple/protocols/yahoo/libymsg.c:2351
 #, c-format
 msgid ""
 "You have tried to ignore %s, but the user is on your buddy list.  Clicking "
@@ -13857,31 +13853,31 @@
 "ལག་ལེན་པ་འདི་ཁྱོད་རའི་ཆ་རོགས་ཐོ་ཡིག་ནང་འདུག  ་\"ཨིན\" ཨེབ་ནི་འདི་གིས་ "
 "རྩ་བསྐྲད་དང་ཆ་རོགས་འདི་སྣང་མེད་འབད་བཞག་འོང་།"
 
-#: ../libpurple/protocols/yahoo/libymsg.c:2339
+#: ../libpurple/protocols/yahoo/libymsg.c:2354
 msgid "Ignore buddy?"
 msgstr "ཆ་རོགས་སྣང་མེད་འབད་བཞག་ནི་ཨིན་ན?"
 
-#: ../libpurple/protocols/yahoo/libymsg.c:2417
+#: ../libpurple/protocols/yahoo/libymsg.c:2432
 msgid "Invalid username or password"
 msgstr "ནུས་མེག་ ལག་ལེན་པའི་མིང་ ཡང་ན་ ལམ་ཡིག"
 
-#: ../libpurple/protocols/yahoo/libymsg.c:2421
+#: ../libpurple/protocols/yahoo/libymsg.c:2436
 msgid ""
 "Your account has been locked due to too many failed login attempts.  Please "
 "try logging into the Yahoo! website."
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/libymsg.c:2428
+#: ../libpurple/protocols/yahoo/libymsg.c:2443
 msgid "Unknown error 52.  Reconnecting should fix this."
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/libymsg.c:2432
+#: ../libpurple/protocols/yahoo/libymsg.c:2447
 msgid ""
 "Error 1013: The username you have entered is invalid.  The most common cause "
 "of this error is entering your email address instead of your Yahoo! ID."
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/libymsg.c:2438
+#: ../libpurple/protocols/yahoo/libymsg.c:2453
 #, c-format
 msgid ""
 "Unknown error number %d. Logging into the Yahoo! website may fix this."
@@ -13889,134 +13885,134 @@
 "ངོ་མ་ཤེས་པའི་ འཛོལ་བའི་ ཨང་གྲངས %d ། ཡ་ཧུ! ཝེབ་ས་ཁོངས་ནང་ "
 "དྲན་དེབ་བཀོད་མི་འདི་གིས་ དཀའ་ངལ་སེལ་ཚུགསཔ་འོང་།"
 
-#: ../libpurple/protocols/yahoo/libymsg.c:2532
+#: ../libpurple/protocols/yahoo/libymsg.c:2547
 #, c-format
 msgid "Unable to add buddy %s to group %s to the server list on account %s."
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/libymsg.c:2535
+#: ../libpurple/protocols/yahoo/libymsg.c:2550
 msgid "Unable to add buddy to server list"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/libymsg.c:3194
+#: ../libpurple/protocols/yahoo/libymsg.c:3207
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr "[ Audible %s/%s/%s.swf ] %s"
 
-#: ../libpurple/protocols/yahoo/libymsg.c:3540
+#: ../libpurple/protocols/yahoo/libymsg.c:3553
 msgid "Received unexpected HTTP response from server"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/libymsg.c:3596
+#: ../libpurple/protocols/yahoo/libymsg.c:3609
 #, c-format
 msgid "Lost connection with %s: %s"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/libymsg.c:3621
+#: ../libpurple/protocols/yahoo/libymsg.c:3634
 #, c-format
 msgid "Unable to establish a connection with %s: %s"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/libymsg.c:3838
+#: ../libpurple/protocols/yahoo/libymsg.c:3851
 msgid "Unable to connect: The server returned an empty response."
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/libymsg.c:3872
+#: ../libpurple/protocols/yahoo/libymsg.c:3885
 msgid ""
 "Unable to connect: The server's response did not contain the necessary "
 "information"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/libymsg.c:4073
-#: ../libpurple/protocols/yahoo/libymsg.c:5104
+#: ../libpurple/protocols/yahoo/libymsg.c:4086
+#: ../libpurple/protocols/yahoo/libymsg.c:5117
 msgid "Not at Home"
 msgstr "ཁྱིམ་ནང་ མེན།"
 
-#: ../libpurple/protocols/yahoo/libymsg.c:4075
-#: ../libpurple/protocols/yahoo/libymsg.c:5107
+#: ../libpurple/protocols/yahoo/libymsg.c:4088
+#: ../libpurple/protocols/yahoo/libymsg.c:5120
 msgid "Not at Desk"
 msgstr "ཌེཀསི་ལུ་་མེན།"
 
-#: ../libpurple/protocols/yahoo/libymsg.c:4077
-#: ../libpurple/protocols/yahoo/libymsg.c:5110
+#: ../libpurple/protocols/yahoo/libymsg.c:4090
+#: ../libpurple/protocols/yahoo/libymsg.c:5123
 msgid "Not in Office"
 msgstr "ཡིག་ཚང་ནང་་མེན།"
 
-#: ../libpurple/protocols/yahoo/libymsg.c:4081
-#: ../libpurple/protocols/yahoo/libymsg.c:5116
+#: ../libpurple/protocols/yahoo/libymsg.c:4094
+#: ../libpurple/protocols/yahoo/libymsg.c:5129
 msgid "On Vacation"
 msgstr "ངལ་གསོ་ལུ།"
 
-#: ../libpurple/protocols/yahoo/libymsg.c:4085
-#: ../libpurple/protocols/yahoo/libymsg.c:5122
+#: ../libpurple/protocols/yahoo/libymsg.c:4098
+#: ../libpurple/protocols/yahoo/libymsg.c:5135
 msgid "Stepped Out"
 msgstr "ཕྱིར་བགོམས་པ།"
 
-#: ../libpurple/protocols/yahoo/libymsg.c:4183
-#: ../libpurple/protocols/yahoo/libymsg.c:4214
+#: ../libpurple/protocols/yahoo/libymsg.c:4196
+#: ../libpurple/protocols/yahoo/libymsg.c:4227
 msgid "Not on server list"
 msgstr "སར་བར་ཐོ་ཡིག་གུ་མེན།"
 
-#: ../libpurple/protocols/yahoo/libymsg.c:4234
-#: ../libpurple/protocols/yahoo/libymsg.c:4328
+#: ../libpurple/protocols/yahoo/libymsg.c:4247
+#: ../libpurple/protocols/yahoo/libymsg.c:4341
 msgid "Appear Permanently Offline"
 msgstr "རྟག་བརྟན་གློག་ལམ་མེདཔ་སྦེ་འབྱུང་།"
 
-#: ../libpurple/protocols/yahoo/libymsg.c:4250
+#: ../libpurple/protocols/yahoo/libymsg.c:4263
 msgid "Presence"
 msgstr "ངོ་འཛོམས།"
 
-#: ../libpurple/protocols/yahoo/libymsg.c:4322
+#: ../libpurple/protocols/yahoo/libymsg.c:4335
 msgid "Don't Appear Permanently Offline"
 msgstr "རྟག་བརྟན་གློག་ལམ་མེདཔ་སྦེ་མ་འབྱུང་།"
 
-#: ../libpurple/protocols/yahoo/libymsg.c:4381
+#: ../libpurple/protocols/yahoo/libymsg.c:4394
 msgid "Join in Chat"
 msgstr "ཁ་སླབ་ཀྱི་གྲངས་སུ་འཛུལ།"
 
-#: ../libpurple/protocols/yahoo/libymsg.c:4387
+#: ../libpurple/protocols/yahoo/libymsg.c:4400
 msgid "Initiate Conference"
 msgstr "གྲོས་ཚོགས་འགོ་བཙུགས།"
 
-#: ../libpurple/protocols/yahoo/libymsg.c:4415
+#: ../libpurple/protocols/yahoo/libymsg.c:4428
 msgid "Presence Settings"
 msgstr "ངོ་འཛོམས་སྒྲིག་སྟངང་ཚུ།"
 
-#: ../libpurple/protocols/yahoo/libymsg.c:4420
+#: ../libpurple/protocols/yahoo/libymsg.c:4433
 msgid "Start Doodling"
 msgstr "ཌུཌ་ལིང་ འགོ་བཙུགས།"
 
-#: ../libpurple/protocols/yahoo/libymsg.c:4559
+#: ../libpurple/protocols/yahoo/libymsg.c:4572
 msgid "Select the ID you want to activate"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/libymsg.c:4570
+#: ../libpurple/protocols/yahoo/libymsg.c:4583
 msgid "Join whom in chat?"
 msgstr "ག་ ཁ་སླབ་ཀྱི་གྲངས་སུ་འཛུལ་ཡི?"
 
-#: ../libpurple/protocols/yahoo/libymsg.c:4586
+#: ../libpurple/protocols/yahoo/libymsg.c:4599
 msgid "Activate ID..."
 msgstr "ཨའི་ཌི་ ཤུགས་ལྡན་བཟོ..."
 
-#: ../libpurple/protocols/yahoo/libymsg.c:4590
+#: ../libpurple/protocols/yahoo/libymsg.c:4603
 msgid "Join User in Chat..."
 msgstr "ལག་ལེན་པའི་ཁ་སླབ་ནང་འཛུལ།..."
 
-#: ../libpurple/protocols/yahoo/libymsg.c:4595
+#: ../libpurple/protocols/yahoo/libymsg.c:4608
 msgid "Open Inbox"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/libymsg.c:4622
-#: ../libpurple/protocols/yahoo/libymsg.c:4719
+#: ../libpurple/protocols/yahoo/libymsg.c:4635
+#: ../libpurple/protocols/yahoo/libymsg.c:4732
 msgid "Can't send SMS. Unable to obtain mobile carrier."
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/libymsg.c:4652
-#: ../libpurple/protocols/yahoo/libymsg.c:4783
+#: ../libpurple/protocols/yahoo/libymsg.c:4665
+#: ../libpurple/protocols/yahoo/libymsg.c:4796
 msgid "Can't send SMS. Unknown mobile carrier."
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/libymsg.c:4774
+#: ../libpurple/protocols/yahoo/libymsg.c:4787
 msgid "Getting mobile carrier to send the SMS."
 msgstr ""
 
@@ -14029,19 +14025,19 @@
 
 #: ../libpurple/protocols/yahoo/yahoo_filexfer.c:167
 #: ../libpurple/protocols/yahoo/yahoo_filexfer.c:247
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:1297
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:1313
 msgid "Unable to connect."
 msgstr "མཐུད་མི་ཚུགས།"
 
 #: ../libpurple/protocols/yahoo/yahoo_filexfer.c:328
 #: ../libpurple/protocols/yahoo/yahoo_filexfer.c:337
 #: ../libpurple/protocols/yahoo/yahoo_filexfer.c:346
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:1201
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:1949
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:1217
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:1978
 msgid "Unable to establish file descriptor."
 msgstr "ཡིག་སྣོད་འགྲེལ་བཤད་པ་ གཞི་འཛུགས་འབད་མ་ཚུགས།"
 
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:1840
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:1863
 #, c-format
 msgid "%s is trying to send you a group of %d files.\n"
 msgstr ""
@@ -14141,26 +14137,26 @@
 msgid "%s has declined to join."
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:506
+#: ../libpurple/protocols/yahoo/yahoochat.c:507
 msgid "Failed to join chat"
 msgstr "ཁ་སླབ་གྲངས་སུ་འཛུལ་ནི་འཐུས་ཤོར་བྱུང་ཡོདཔ།"
 
 #. -6
-#: ../libpurple/protocols/yahoo/yahoochat.c:509
+#: ../libpurple/protocols/yahoo/yahoochat.c:510
 msgid "Unknown room"
 msgstr "མ་ཤེས་པའི་ཁང་མིག"
 
 #. -15
-#: ../libpurple/protocols/yahoo/yahoochat.c:512
+#: ../libpurple/protocols/yahoo/yahoochat.c:513
 msgid "Maybe the room is full"
 msgstr "ཁང་མིག་འདི་ ཡང་ཅིན་འབདན་གང་གངམ་འོང་ནི་མས།"
 
 #. -35
-#: ../libpurple/protocols/yahoo/yahoochat.c:515
+#: ../libpurple/protocols/yahoo/yahoochat.c:516
 msgid "Not available"
 msgstr "ཐོབ་ཆོག་ཆོག་མིན་འདུག"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:519
+#: ../libpurple/protocols/yahoo/yahoochat.c:520
 msgid ""
 "Unknown error. You may need to logout and wait five minutes before being "
 "able to rejoin a chatroom"
@@ -14168,43 +14164,43 @@
 "མ་ཤེས་པའི་འཛོལ་བ། ཁྱོད་ཀྱིས་ ཁ་སླབ་ཁང་མིག་ནང་ལུ་སླར་མཐུད་མ་འབད་བའི་ཧེ་མ་ "
 "ཕྱིར་བསྐྱོད་འབད་བཞིནམ་ལས་སྐར་མ་ལྔ་དེ་ཅིག་བསྒུག་སྡོད་དགོཔ་འོང་།"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:603
+#: ../libpurple/protocols/yahoo/yahoochat.c:628
 #, c-format
 msgid "You are now chatting in %s."
 msgstr "ཁྱོད་ད་ལྟོ %s ནང་ཁ་སླབ་དེ།"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:809
+#: ../libpurple/protocols/yahoo/yahoochat.c:834
 msgid "Failed to join buddy in chat"
 msgstr "ཆ་རོགས་འདི་  ཁ་སླབ་གྲངས་སུ་འཛུལ་ནི་འཐུས་ཤོར་བྱུང་ནུག"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:810
+#: ../libpurple/protocols/yahoo/yahoochat.c:835
 msgid "Maybe they're not in a chat?"
 msgstr "ཁོང་ཚུ་ཡང་ཅིན་ ཁ་སླབ་ནང་མེདཔ་འོང་?"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:1505
-#: ../libpurple/protocols/yahoo/yahoochat.c:1531
+#: ../libpurple/protocols/yahoo/yahoochat.c:1530
+#: ../libpurple/protocols/yahoo/yahoochat.c:1556
 msgid "Fetching the room list failed."
 msgstr "ཁང་མིག་ཐོ་ཡིག་ལེན་དོཝ་ཡོད་མི་འདི་ འཐུས་ཤོར་བྱུང་ནུག"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:1591
+#: ../libpurple/protocols/yahoo/yahoochat.c:1616
 msgid "Voices"
 msgstr "སྐད་ཚུ།"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:1594
+#: ../libpurple/protocols/yahoo/yahoochat.c:1619
 msgid "Webcams"
 msgstr "ཝེབ་ཀེམསི།"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:1605
-#: ../libpurple/protocols/yahoo/yahoochat.c:1676
+#: ../libpurple/protocols/yahoo/yahoochat.c:1630
+#: ../libpurple/protocols/yahoo/yahoochat.c:1701
 msgid "Connection problem"
 msgstr "མཐུད་ལམ་ དཀའ་ངལ།"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:1605
-#: ../libpurple/protocols/yahoo/yahoochat.c:1676
+#: ../libpurple/protocols/yahoo/yahoochat.c:1630
+#: ../libpurple/protocols/yahoo/yahoochat.c:1701
 msgid "Unable to fetch room list."
 msgstr "ཁང་མིག་ཐོ་ཡིག་ལེན་མི་ཚུགས་པས།"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:1668
+#: ../libpurple/protocols/yahoo/yahoochat.c:1693
 msgid "User Rooms"
 msgstr "ལག་ལེན་པའི་ཁང་མིག་ཚུ།"
 
@@ -14220,84 +14216,84 @@
 "(འཕྲིན་དོན་འདི་གཞི་སྒྱུར་འབད་བའི་སྐབས་ འཛོལ་བ་བྱུང་ནུག\t "
 "རྩིས་ཐོ་ཞུན་དག་པའི་ནང་ 'ཨིན་ཀོ་ཌིང་'གདམ་ཁ་ ཞིབ་དཔྱད་འབད)"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:756
+#: ../libpurple/protocols/zephyr/zephyr.c:755
 #, c-format
 msgid "Unable to send to chat %s,%s,%s"
 msgstr "ཁ་སླབ་ནི་ དོན་ལུ་ %s,%s,%s གཏང་མ་ཚུགསཔ།"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:807
-#: ../libpurple/protocols/zephyr/zephyr.c:1191
+#: ../libpurple/protocols/zephyr/zephyr.c:800
+#: ../libpurple/protocols/zephyr/zephyr.c:1181
 msgid "Hidden or not logged-in"
 msgstr ""
 
-#: ../libpurple/protocols/zephyr/zephyr.c:813
-#: ../libpurple/protocols/zephyr/zephyr.c:1193
+#: ../libpurple/protocols/zephyr/zephyr.c:806
+#: ../libpurple/protocols/zephyr/zephyr.c:1183
 #, c-format
 msgid "<br>At %s since %s"
 msgstr "<br> %s ལུ %sལས་ཚུར།"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:1518
-#: ../libpurple/protocols/zephyr/zephyr.c:1519
+#: ../libpurple/protocols/zephyr/zephyr.c:1506
+#: ../libpurple/protocols/zephyr/zephyr.c:1507
 msgid "Anyone"
 msgstr "ག་འབད་རུང་ཅིག"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2372
+#: ../libpurple/protocols/zephyr/zephyr.c:2357
 msgid "_Class:"
 msgstr "དབྱེ་རིགས:(_C)"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2378
+#: ../libpurple/protocols/zephyr/zephyr.c:2363
 msgid "_Instance:"
 msgstr "དུས་སྐབས:(_I)"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2384
+#: ../libpurple/protocols/zephyr/zephyr.c:2369
 msgid "_Recipient:"
 msgstr "ལེན་མཁན:(_R)"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2395
+#: ../libpurple/protocols/zephyr/zephyr.c:2380
 #, c-format
 msgid "Attempt to subscribe to %s,%s,%s failed"
 msgstr "%s,%s,%s ལུ་ མཁོ་མངགས་འབད་ནིའི་དཔའ་བཅམ་མི་འདི་འཐུས་ཤོར་བྱུང་ནུག"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2713
+#: ../libpurple/protocols/zephyr/zephyr.c:2698
 msgid "zlocate &lt;nick&gt;: Locate user"
 msgstr "zlocate &lt;ནིཀ&gt;:ལག་ལེན་པ་ག་ཡོད་བལྟ།"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2718
+#: ../libpurple/protocols/zephyr/zephyr.c:2703
 msgid "zl &lt;nick&gt;: Locate user"
 msgstr "zl &lt;ནིཀ&gt;:ལག་ལེན་པ་ག་ཡོད་བལྟ།"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2723
+#: ../libpurple/protocols/zephyr/zephyr.c:2708
 msgid "instance &lt;instance&gt;: Set the instance to be used on this class"
 msgstr ""
 "དཔེར་ན &lt;དཔེར་ན&gt;: "
 "འ་ནི་དབྱེ་རིགས་ནང་ལུ་ལག་ལེན་འཐབ་ནིའི་དོན་ལུ་དཔེ་འདི་གཞི་སྒྲིག་འབད།"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2728
+#: ../libpurple/protocols/zephyr/zephyr.c:2713
 msgid "inst &lt;instance&gt;: Set the instance to be used on this class"
 msgstr ""
 "inst &lt;དཔེར་བརྗོད&gt;: དབྱེ་རིགས་འདི་་གུ "
 "ལག་ལེན་འཐབ་ནིའི་དཔེར་བརྗོད་གཞི་སྒྲིག་འབད།"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2733
+#: ../libpurple/protocols/zephyr/zephyr.c:2718
 msgid "topic &lt;instance&gt;: Set the instance to be used on this class"
 msgstr ""
 "གནད་དོན་དང་ཨའི་ཊི།;དུས་སྐབས་དང་ ཇི་ཊི།;: "
 "འ་ནི་དབྱེ་རིམ་དང་ལག་ལེན་འཐབ་ནི་ཨིན་པའི་དུས་སྐབས་གཞི་སྒྲིག་འབད།(&I)(&g)"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2739
+#: ../libpurple/protocols/zephyr/zephyr.c:2724
 msgid "sub &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Join a new chat"
 msgstr ""
 "འོག་མ &lt;དབྱེ་རིགས&gt; &lt;དཔེར་བརྗོད&gt; &lt;ལེན་མཁན&gt;: "
 "ཁ་སླབ་གསརཔ་གི་གྲངས་སུ་འཛུལ།"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2744
+#: ../libpurple/protocols/zephyr/zephyr.c:2729
 msgid ""
 "zi &lt;instance&gt;: Send a message to &lt;message,<i>instance</i>,*&gt;"
 msgstr ""
 "zi &lt;དཔེར་བརྗོད&gt;: ལུ་ འཕྲིན་དོན་གཏང་ "
 "&lt;འཕྲིན་དོན,<i>དཔེར་བརྗོད</i>,*&gt;"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2750
+#: ../libpurple/protocols/zephyr/zephyr.c:2735
 msgid ""
 "zci &lt;class&gt; &lt;instance&gt;: Send a message to "
 "&lt;<i>class</i>,<i>instance</i>,*&gt;"
@@ -14305,7 +14301,7 @@
 "zci &lt;དབྱེ་རིགས&gt; &lt;དཔེར་བརྗོད&gt;: ལུ འཕྲིན་དོན་གཏང་ "
 "&lt;<i>དབྱེ་རིགས</i>,<i>དཔེར་བརྗོད</i>,*&gt;"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2756
+#: ../libpurple/protocols/zephyr/zephyr.c:2741
 msgid ""
 "zcir &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Send a message to "
 "&lt;<i>class</i>,<i>instance</i>,<i>recipient</i>&gt;"
@@ -14313,7 +14309,7 @@
 "zcir &lt;དབྱེ་རིགས&gt; &lt;དཔེར་བརྗོད&gt; &lt;ལེན་མཁན&gt;: ལུ་ "
 "འཕྲིན་དོན་གཏང་ &lt;<i>དབྱེ་རིགས</i>,<i>དཔེར་བརྗོད</i>,<i>ལེན་མཁན</i>&gt;"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2762
+#: ../libpurple/protocols/zephyr/zephyr.c:2747
 msgid ""
 "zir &lt;instance&gt; &lt;recipient&gt;: Send a message to "
 "&lt;MESSAGE,<i>instance</i>,<i>recipient</i>&gt;"
@@ -14321,16 +14317,16 @@
 "zir &lt;དཔེར་བརྗོད&gt; &lt;ལེན་མཁན&gt;: ལུ་ འཕྲིན་དོན་གཏང་ "
 "&lt;འཕྲིན་དོན,<i>དཔེར་བརྗོད</i>,<i>ལེན་མཁན</i>&gt;"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2767
+#: ../libpurple/protocols/zephyr/zephyr.c:2752
 msgid "zc &lt;class&gt;: Send a message to &lt;<i>class</i>,PERSONAL,*&gt;"
 msgstr ""
 "zc &lt;དབྱེ་རིགས&gt;: ལུ འཕྲིན་དོན་གཏང་ &lt;<i>དབྱེ་རིགས་</i>,རང་དོན་གྱི*&gt;"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2843
+#: ../libpurple/protocols/zephyr/zephyr.c:2828
 msgid "Resubscribe"
 msgstr "སླར་མཁོ་མངགས།"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2846
+#: ../libpurple/protocols/zephyr/zephyr.c:2831
 msgid "Retrieve subscriptions from server"
 msgstr "སར་བར་ལས་ མཁོ་མངགས་ཚུ་སླར་འདྲེན།"
 
@@ -14344,66 +14340,66 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/zephyr/zephyr.c:2946
-#: ../libpurple/protocols/zephyr/zephyr.c:2948
+#: ../libpurple/protocols/zephyr/zephyr.c:2931
+#: ../libpurple/protocols/zephyr/zephyr.c:2933
 msgid "Zephyr Protocol Plugin"
 msgstr "ཛི་ཕིཡར་ གནད་སྤེལ་ལམ་ལུགས་ པ་ལག་ཨིན།"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2973
+#: ../libpurple/protocols/zephyr/zephyr.c:2958
 msgid "Use tzc"
 msgstr "ཊི་ཟེཊི་སི་ལག་ལེན་འཐབ།"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2976
+#: ../libpurple/protocols/zephyr/zephyr.c:2961
 msgid "tzc command"
 msgstr "ཊི་ཛེཊི་སི་ བརྡ་བཀོད།"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2979
+#: ../libpurple/protocols/zephyr/zephyr.c:2964
 msgid "Export to .anyone"
 msgstr "གང་རུང་ཅིག་ལུ་ཕྱིར་འདྲེན་འབད།"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2982
+#: ../libpurple/protocols/zephyr/zephyr.c:2967
 msgid "Export to .zephyr.subs"
 msgstr ".ཛི་ཕིཡར.འོག་མ་ཚུ.ལུ་ཕྱིར་འདྲེན་འབད།"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2985
+#: ../libpurple/protocols/zephyr/zephyr.c:2970
 msgid "Import from .anyone"
 msgstr "གང་རུང་ཅིག་ལས་ ནང་འདྲེན་འབད།"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2988
+#: ../libpurple/protocols/zephyr/zephyr.c:2973
 msgid "Import from .zephyr.subs"
 msgstr ".zephyr.subs ལས་ ནང་འདྲེན་འབད།"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2991
+#: ../libpurple/protocols/zephyr/zephyr.c:2976
 msgid "Realm"
 msgstr "རྒྱལ་ཁམས།"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2994
+#: ../libpurple/protocols/zephyr/zephyr.c:2979
 msgid "Exposure"
 msgstr "མདངས་ཕོག"
 
-#: ../libpurple/proxy.c:752 ../libpurple/proxy.c:807 ../libpurple/proxy.c:1254
-#: ../libpurple/proxy.c:1441 ../libpurple/proxy.c:2099
+#: ../libpurple/proxy.c:754 ../libpurple/proxy.c:816 ../libpurple/proxy.c:1269
+#: ../libpurple/proxy.c:1463 ../libpurple/proxy.c:2123
 #, c-format
 msgid "Unable to create socket: %s"
 msgstr ""
 
-#: ../libpurple/proxy.c:989 ../libpurple/proxy.c:1010
+#: ../libpurple/proxy.c:1002 ../libpurple/proxy.c:1023
 #, c-format
 msgid "Unable to parse response from HTTP proxy: %s"
 msgstr ""
 
-#: ../libpurple/proxy.c:1043 ../libpurple/proxy.c:1105
-#: ../libpurple/proxy.c:1134
+#: ../libpurple/proxy.c:1056 ../libpurple/proxy.c:1118
+#: ../libpurple/proxy.c:1147
 #, c-format
 msgid "HTTP proxy connection error %d"
 msgstr "ཨེཅ་ཊི་ཊི་པི་པོརོ་སི་ མཐུད་ལམ་ འཛོལ་བ་ %d"
 
-#: ../libpurple/proxy.c:1130
+#: ../libpurple/proxy.c:1143
 #, c-format
 msgid "Access denied: HTTP proxy server forbids port %d tunneling"
 msgstr ""
 
-#: ../libpurple/proxy.c:1323
+#: ../libpurple/proxy.c:1343
 #, c-format
 msgid "Error resolving %s"
 msgstr "%s མོས་མཐུན་འབད་བའི་སྐབས་ འཛོལ་བ།"
@@ -14573,66 +14569,66 @@
 msgid "%x %X"
 msgstr "%x %X"
 
-#: ../libpurple/util.c:3309
+#: ../libpurple/util.c:3294
 msgid "Calculating..."
 msgstr "རྩིས་སྟོན་པའི་བསྒང་..."
 
-#: ../libpurple/util.c:3312
+#: ../libpurple/util.c:3297
 msgid "Unknown."
 msgstr "ངོ་མ་ཤེསཔ།"
 
-#: ../libpurple/util.c:3338
+#: ../libpurple/util.c:3323
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d སྐར་མ།"
 
-#: ../libpurple/util.c:3350
+#: ../libpurple/util.c:3335
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d ཉིནམ།"
 
-#: ../libpurple/util.c:3358
+#: ../libpurple/util.c:3343
 #, c-format
 msgid "%s, %d hour"
 msgid_plural "%s, %d hours"
 msgstr[0] "%s, %d ཆུ་ཚོད།"
 
-#: ../libpurple/util.c:3364
+#: ../libpurple/util.c:3349
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d ཆུ་ཚོད།"
 
-#: ../libpurple/util.c:3372
+#: ../libpurple/util.c:3357
 #, c-format
 msgid "%s, %d minute"
 msgid_plural "%s, %d minutes"
 msgstr[0] "%s, %d སྐར་མ།"
 
-#: ../libpurple/util.c:3378
+#: ../libpurple/util.c:3363
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d སྐར་མ།"
 
-#: ../libpurple/util.c:3659
+#: ../libpurple/util.c:3644
 #, c-format
 msgid "Could not open %s: Redirected too many times"
 msgstr ""
 
-#: ../libpurple/util.c:3709 ../libpurple/util.c:4252
+#: ../libpurple/util.c:3694 ../libpurple/util.c:4228
 #, c-format
 msgid "Unable to connect to %s"
 msgstr "%sལུ་མཐུད་མ་ཚུགས།"
 
-#: ../libpurple/util.c:3858
+#: ../libpurple/util.c:3834
 #, c-format
 msgid "Error reading from %s: response too long (%d bytes limit)"
 msgstr ""
 
-#: ../libpurple/util.c:3925 ../libpurple/util.c:3945
+#: ../libpurple/util.c:3901 ../libpurple/util.c:3921
 #, c-format
 msgid ""
 "Unable to allocate enough memory to hold the contents from %s.  The web "
@@ -14641,27 +14637,27 @@
 "%s ལས་ ནང་དོན་ཚུ་ འཆང་ནིའི་དོན་ལུ་ དྲན་ཚད་ལངམ་སྦེ་སྤྲོད་མ་ཚུགས། "
 "ཝེབ་སར་བར་གྱིས་ ངན་སེམས་ཅན་ཅིག་འབད་རྩོལ་བསྐྱེད་དོ་འོང་།"
 
-#: ../libpurple/util.c:3979
+#: ../libpurple/util.c:3955
 #, c-format
 msgid "Error reading from %s: %s"
 msgstr "%s: %s ལས་ ལྷག་ནིའི་འཛོལ་བ།"
 
-#: ../libpurple/util.c:4103
+#: ../libpurple/util.c:4079
 #, c-format
 msgid "Error writing to %s: %s"
 msgstr "%s: %s ལུ་ རྩོམ་སྒྲིག་འབད་ནིའི་འཛོལ་བ།"
 
-#: ../libpurple/util.c:4134 ../libpurple/util.c:4164 ../libpurple/util.c:4234
+#: ../libpurple/util.c:4110 ../libpurple/util.c:4140 ../libpurple/util.c:4210
 #, c-format
 msgid "Unable to connect to %s: %s"
 msgstr "%s: %s ལུ་མཐུད་མ་ཚུགས།"
 
-#: ../libpurple/util.c:5129
+#: ../libpurple/util.c:5085
 #, c-format
 msgid " - %s"
 msgstr ""
 
-#: ../libpurple/util.c:5135
+#: ../libpurple/util.c:5091
 #, c-format
 msgid " (%s)"
 msgstr ""
@@ -14703,87 +14699,87 @@
 "the old file has been renamed to %s~."
 msgstr ""
 
-#: ../pidgin/data/pidgin.desktop.in.h:1
+#: ../pidgin.desktop.in.h:1
 msgid "Pidgin Internet Messenger"
 msgstr ""
 
-#: ../pidgin/data/pidgin.desktop.in.h:2
+#: ../pidgin.desktop.in.h:2
 msgid "Internet Messenger"
 msgstr "ཨིན་ཊར་ནེཊི་འཕྲིན་སྐྱེལ་པ།"
 
-#: ../pidgin/data/pidgin.desktop.in.h:3
+#: ../pidgin.desktop.in.h:3
 msgid ""
 "Chat over IM.  Supports AIM, Google Talk, Jabber/XMPP, MSN, Yahoo and more"
 msgstr ""
 
 #. Build the login options frame.
-#: ../pidgin/gtkaccount.c:455
+#: ../pidgin/gtkaccount.c:448
 msgid "Login Options"
 msgstr "ནང་བསྐྱོད་ཀྱི་གདམ་ཁ་ཚུ།"
 
-#: ../pidgin/gtkaccount.c:480
+#: ../pidgin/gtkaccount.c:473
 msgid "Pro_tocol:"
 msgstr ""
 
-#: ../pidgin/gtkaccount.c:493 ../pidgin/gtkaccount.c:1136
+#: ../pidgin/gtkaccount.c:486 ../pidgin/gtkaccount.c:1129
 msgid "_Username:"
 msgstr "ལག་ལེན་པའི་མིང་:(_U)"
 
-#: ../pidgin/gtkaccount.c:606
+#: ../pidgin/gtkaccount.c:599
 msgid "Remember pass_word"
 msgstr ""
 
 #. Build the user options frame.
-#: ../pidgin/gtkaccount.c:661
+#: ../pidgin/gtkaccount.c:654
 msgid "User Options"
 msgstr "ལག་ལེན་པའི་གདམ་ཁ་ཚུ།"
 
-#: ../pidgin/gtkaccount.c:674
+#: ../pidgin/gtkaccount.c:667
 msgid "_Local alias:"
 msgstr ""
 
-#: ../pidgin/gtkaccount.c:678
+#: ../pidgin/gtkaccount.c:671
 msgid "New _mail notifications"
 msgstr ""
 
 #. Buddy icon
-#: ../pidgin/gtkaccount.c:683
+#: ../pidgin/gtkaccount.c:676
 msgid "Use this buddy _icon for this account:"
 msgstr ""
 
-#: ../pidgin/gtkaccount.c:815
+#: ../pidgin/gtkaccount.c:808
 msgid "Ad_vanced"
 msgstr ""
 
-#: ../pidgin/gtkaccount.c:1000
+#: ../pidgin/gtkaccount.c:993
 msgid "Use GNOME Proxy Settings"
 msgstr ""
 
-#: ../pidgin/gtkaccount.c:1001
+#: ../pidgin/gtkaccount.c:994
 msgid "Use Global Proxy Settings"
 msgstr "སྤྱི་ཁྱབ་པོ་རོག་སི་སྒྲིག་སྟངས་ལག་ལེན་འཐབ།"
 
-#: ../pidgin/gtkaccount.c:1007
+#: ../pidgin/gtkaccount.c:1000
 msgid "No Proxy"
 msgstr "པོ་རོག་སི་མེད།"
 
-#: ../pidgin/gtkaccount.c:1013 ../pidgin/gtkprefs.c:2119
+#: ../pidgin/gtkaccount.c:1006 ../pidgin/gtkprefs.c:2113
 msgid "SOCKS 4"
 msgstr "SOCKS 4"
 
-#: ../pidgin/gtkaccount.c:1019 ../pidgin/gtkprefs.c:2120
+#: ../pidgin/gtkaccount.c:1012 ../pidgin/gtkprefs.c:2114
 msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
-#: ../pidgin/gtkaccount.c:1025 ../pidgin/gtkprefs.c:2121
+#: ../pidgin/gtkaccount.c:1018 ../pidgin/gtkprefs.c:2115
 msgid "Tor/Privacy (SOCKS5)"
 msgstr ""
 
-#: ../pidgin/gtkaccount.c:1031 ../pidgin/gtkprefs.c:2122
+#: ../pidgin/gtkaccount.c:1024 ../pidgin/gtkprefs.c:2116
 msgid "HTTP"
 msgstr "ཨེཅ་ཊི་ཊི་པི།"
 
-#: ../pidgin/gtkaccount.c:1037 ../pidgin/gtkprefs.c:2123
+#: ../pidgin/gtkaccount.c:1030 ../pidgin/gtkprefs.c:2117
 msgid "Use Environmental Settings"
 msgstr "མཐའ་འཁོར་གྱི་སྒྲིག་སྟངས་ཚུ་ལག་ལེན་འཐབ།"
 
@@ -14792,73 +14788,73 @@
 #. A) your network is really slow and you have nothing better to do than
 #. look at butterflies.
 #. B)You are looking really closely at something that shouldn't matter.
-#: ../pidgin/gtkaccount.c:1082
+#: ../pidgin/gtkaccount.c:1075
 msgid "If you look real closely"
 msgstr "ཁྱོད་ཀྱིས་ངོ་མ་འབད་སྦོ་ལོགས་ཁ་ལས་བལྟ་བ་ཅིན་།"
 
 #. This is an easter egg. See the comment on the previous line in the source.
-#: ../pidgin/gtkaccount.c:1085
+#: ../pidgin/gtkaccount.c:1078
 msgid "you can see the butterflies mating"
 msgstr "ཁྱོད་ཀྱིས་ཕྱེ་མ་ལེབ་འདོད་སྦྱོར་འབད་སར་མཐོང་འོང་།"
 
-#: ../pidgin/gtkaccount.c:1115
+#: ../pidgin/gtkaccount.c:1108
 msgid "Proxy _type:"
 msgstr "པོ་རོག་སི་དབྱེ་བ་:(_t)"
 
-#: ../pidgin/gtkaccount.c:1124 ../pidgin/gtkprefs.c:2139
+#: ../pidgin/gtkaccount.c:1117 ../pidgin/gtkprefs.c:2133
 msgid "_Host:"
 msgstr "ཧོསཊི:(_H)"
 
-#: ../pidgin/gtkaccount.c:1128
+#: ../pidgin/gtkaccount.c:1121
 msgid "_Port:"
 msgstr "འདྲེན་ལམ:(_P)"
 
-#: ../pidgin/gtkaccount.c:1145 ../pidgin/gtkprefs.c:2191
+#: ../pidgin/gtkaccount.c:1138 ../pidgin/gtkprefs.c:2185
 msgid "Pa_ssword:"
 msgstr "ཆོག་ཡིག:(_P)"
 
-#: ../pidgin/gtkaccount.c:1214
+#: ../pidgin/gtkaccount.c:1207
 msgid "Use _silence suppression"
 msgstr ""
 
-#: ../pidgin/gtkaccount.c:1219
+#: ../pidgin/gtkaccount.c:1212
 msgid "_Voice and Video"
 msgstr ""
 
-#: ../pidgin/gtkaccount.c:1308
+#: ../pidgin/gtkaccount.c:1301
 msgid "Unable to save new account"
 msgstr ""
 
-#: ../pidgin/gtkaccount.c:1309
+#: ../pidgin/gtkaccount.c:1302
 msgid "An account already exists with the specified criteria."
 msgstr ""
 
-#: ../pidgin/gtkaccount.c:1583
+#: ../pidgin/gtkaccount.c:1576
 msgid "Add Account"
 msgstr "རྩིས་ཐོ་ཁ་སྐོང་རྐྱབས།"
 
-#: ../pidgin/gtkaccount.c:1600
+#: ../pidgin/gtkaccount.c:1593
 msgid "_Basic"
 msgstr "གཞི་རིམ།(_B)"
 
-#: ../pidgin/gtkaccount.c:1608
+#: ../pidgin/gtkaccount.c:1601
 msgid "Create _this new account on the server"
 msgstr ""
 
-#: ../pidgin/gtkaccount.c:1625
+#: ../pidgin/gtkaccount.c:1618
 msgid "P_roxy"
 msgstr ""
 
-#: ../pidgin/gtkaccount.c:2017 ../pidgin/gtkplugin.c:754
+#: ../pidgin/gtkaccount.c:2010 ../pidgin/gtkplugin.c:752
 #: ../pidgin/plugins/convcolors.c:343
 msgid "Enabled"
 msgstr "ལྕོགས་ཅན་བཟོ་ཡོདཔ།"
 
-#: ../pidgin/gtkaccount.c:2045
+#: ../pidgin/gtkaccount.c:2038
 msgid "Protocol"
 msgstr "གནད་སྤེལ་ལམ་ལུགས།"
 
-#: ../pidgin/gtkaccount.c:2232
+#: ../pidgin/gtkaccount.c:2225
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Welcome to %s!</span>\n"
@@ -14872,19 +14868,19 @@
 "<b>Accounts->Manage Accounts</b> in the Buddy List window"
 msgstr ""
 
-#: ../pidgin/gtkaccount.c:2582
+#: ../pidgin/gtkaccount.c:2575
 #, c-format
 msgid ""
 "<a href=\"viewinfo\">%s</a>%s%s%s wants to add you (%s) to his or her buddy "
 "list%s%s"
 msgstr ""
 
-#: ../pidgin/gtkaccount.c:2595
+#: ../pidgin/gtkaccount.c:2588
 #, c-format
 msgid "%s%s%s%s wants to add you (%s) to his or her buddy list%s%s"
 msgstr ""
 
-#: ../pidgin/gtkaccount.c:2629
+#: ../pidgin/gtkaccount.c:2622
 msgid "Send Instant Message"
 msgstr ""
 
@@ -15068,8 +15064,8 @@
 msgid "Room _List"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:1404 ../pidgin/gtkprivacy.c:538
-#: ../pidgin/gtkprivacy.c:552
+#: ../pidgin/gtkblist.c:1404 ../pidgin/gtkprivacy.c:537
+#: ../pidgin/gtkprivacy.c:551
 msgid "_Block"
 msgstr "འགག(_B)"
 
@@ -15286,7 +15282,7 @@
 msgid "/_Accounts"
 msgstr "/རྩིས་ཐོ་ཚུ།(_A)"
 
-#: ../pidgin/gtkblist.c:3626 ../pidgin/gtkblist.c:8021
+#: ../pidgin/gtkblist.c:3626 ../pidgin/gtkblist.c:8018
 msgid "/Accounts/Manage Accounts"
 msgstr ""
 
@@ -15574,31 +15570,31 @@
 msgid "/Buddies/Show/Protocol Icons"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:7097
+#: ../pidgin/gtkblist.c:7094
 msgid "Add a buddy.\n"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:7112
+#: ../pidgin/gtkblist.c:7109
 msgid "Buddy's _username:"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:7129
+#: ../pidgin/gtkblist.c:7126
 msgid "(Optional) A_lias:"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:7140
+#: ../pidgin/gtkblist.c:7137
 msgid "(Optional) _Invite message:"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:7145
+#: ../pidgin/gtkblist.c:7142
 msgid "Add buddy to _group:"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:7250
+#: ../pidgin/gtkblist.c:7247
 msgid "This protocol does not support chat rooms."
 msgstr "གནད་སྤེལ་ལམ་ལུགས་འདི་གིས་ཁ་སླབ་ཁང་མིག་ཚུ་ལུ་རྒྱབ་སྐྱོར་མི་འབད་བས།"
 
-#: ../pidgin/gtkblist.c:7266
+#: ../pidgin/gtkblist.c:7263
 msgid ""
 "You are not currently signed on with any protocols that have the ability to "
 "chat."
@@ -15606,7 +15602,7 @@
 "ཁྱོད་ "
 "ད་ལྟོ་ཁ་སླབ་ནིའི་ལྕོགས་གྲུབ་ཡོད་པའི་གནད་སྤེལ་ལམ་ལུགས་ལུ་མིང་རྟགས་མ་བཀོད་པས།"
 
-#: ../pidgin/gtkblist.c:7275
+#: ../pidgin/gtkblist.c:7272
 msgid ""
 "Please enter an alias, and the appropriate information about the chat you "
 "would like to add to your buddy list.\n"
@@ -15614,60 +15610,60 @@
 "ཁ་སླབ་ཀྱི་སྐོར་ལས་ ཁྱོད་རའི་ཆ་རོགས་ཀྱི་ཐོ་ཡིག་ལུ་ཁ་སྐོང་འབད་ནི་ཨིན་པ་ཅིན "
 "མིང་གཞན་དང་འོས་ལྡན་བརྡ་དོན་བཙུགས་གནང་།\n"
 
-#: ../pidgin/gtkblist.c:7296
+#: ../pidgin/gtkblist.c:7293
 msgid "A_lias:"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:7303
+#: ../pidgin/gtkblist.c:7300
 msgid "_Group:"
 msgstr "སྡེ་ཚན:(_G)"
 
-#: ../pidgin/gtkblist.c:7307
+#: ../pidgin/gtkblist.c:7304
 msgid "Auto_join when account connects."
 msgstr ""
 
-#: ../pidgin/gtkblist.c:7308
+#: ../pidgin/gtkblist.c:7305
 msgid "_Remain in chat after window is closed."
 msgstr ""
 
-#: ../pidgin/gtkblist.c:7331
+#: ../pidgin/gtkblist.c:7328
 msgid "Please enter the name of the group to be added."
 msgstr "ཁ་སྐོང་རྐྱབ་ཚུགས་ནི་ལུ་སྡེ་ཚན་གྱི་མིང་བཙུགས་གནང་།"
 
-#: ../pidgin/gtkblist.c:8035
+#: ../pidgin/gtkblist.c:8032
 msgid "Enable Account"
 msgstr "རྩིས་ཐོ་ལྕོགས་ཅན་བཟོ།"
 
-#: ../pidgin/gtkblist.c:8040
+#: ../pidgin/gtkblist.c:8037
 msgid "<PurpleMain>/Accounts/Enable Account"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:8094
+#: ../pidgin/gtkblist.c:8091
 msgid "<PurpleMain>/Accounts/"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:8115
+#: ../pidgin/gtkblist.c:8112
 msgid "_Edit Account"
 msgstr "རྩིས་ཐོ་ཞུན་དག་འབད།(_E)"
 
-#: ../pidgin/gtkblist.c:8133
+#: ../pidgin/gtkblist.c:8130
 msgid "Set _Mood..."
 msgstr ""
 
-#: ../pidgin/gtkblist.c:8143 ../pidgin/gtkconv.c:3345
+#: ../pidgin/gtkblist.c:8140 ../pidgin/gtkconv.c:3345
 #: ../pidgin/gtkimhtml.c:1862
 msgid "No actions available"
 msgstr "བྱ་བ་མིན་འདུག"
 
-#: ../pidgin/gtkblist.c:8150
+#: ../pidgin/gtkblist.c:8147
 msgid "_Disable"
 msgstr "ལྕོགས་མིན་བཟོ།(_D)"
 
-#: ../pidgin/gtkblist.c:8168
+#: ../pidgin/gtkblist.c:8165
 msgid "/Tools"
 msgstr "/ལག་ཆས་ཚུ།"
 
-#: ../pidgin/gtkblist.c:8239
+#: ../pidgin/gtkblist.c:8236
 msgid "/Buddies/Sort Buddies"
 msgstr "/ཆ་རོགས་ཚུ་/ཆ་རོགས་ཚུ་དབྱེ་སེལ་འབད།"
 
@@ -15996,7 +15992,7 @@
 msgstr ""
 
 #. Build the Send To menu
-#: ../pidgin/gtkconv.c:3885 ../pidgin/gtkconv.c:8618
+#: ../pidgin/gtkconv.c:3885 ../pidgin/gtkconv.c:8615
 msgid "S_end To"
 msgstr ""
 
@@ -16017,85 +16013,85 @@
 msgid "Find:"
 msgstr ""
 
-#: ../pidgin/gtkconv.c:6176 ../pidgin/gtkconv.c:6294
+#: ../pidgin/gtkconv.c:6173 ../pidgin/gtkconv.c:6291
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "%d ཁང་མིག་ནང་གང་ཟག"
 
-#: ../pidgin/gtkconv.c:6827
+#: ../pidgin/gtkconv.c:6824
 msgid "Stopped Typing"
 msgstr "ཡིག་དཔར་བརྐྱབ་ནི་བཀག་ཡོདཔ།"
 
-#: ../pidgin/gtkconv.c:6830
+#: ../pidgin/gtkconv.c:6827
 msgid "Nick Said"
 msgstr "ནིཀ་ཀྱིས་སླབ་ཅི།"
 
-#: ../pidgin/gtkconv.c:6833
+#: ../pidgin/gtkconv.c:6830
 msgid "Unread Messages"
 msgstr "མ་ལྷག་པའི་འཕྲིན་དོན་ཚུ།"
 
-#: ../pidgin/gtkconv.c:6839
+#: ../pidgin/gtkconv.c:6836
 msgid "New Event"
 msgstr "བྱུང་ལས་གསརཔ།"
 
-#: ../pidgin/gtkconv.c:7605
+#: ../pidgin/gtkconv.c:7602
 msgid ""
 "The account has disconnected and you are no longer in this chat. You will "
 "automatically rejoin the chat when the account reconnects."
 msgstr ""
 
-#: ../pidgin/gtkconv.c:8096
+#: ../pidgin/gtkconv.c:8093
 msgid "clear: Clears all conversation scrollbacks."
 msgstr ""
 
-#: ../pidgin/gtkconv.c:8301
+#: ../pidgin/gtkconv.c:8298
 msgid "Confirm close"
 msgstr "ཁ་བསྡམས་ངེས་དཔྱད་འབད།"
 
-#: ../pidgin/gtkconv.c:8333
+#: ../pidgin/gtkconv.c:8330
 msgid "You have unread messages. Are you sure you want to close the window?"
 msgstr ""
 "ཁྱོད་ལུ་ མ་ལྷག་པའི་འཕྲིན་དོན་ཡོད། ཁྱོད་ཀྱིས་ ཝིན་ཌོ་ཁ་བསྡམས་མི་འདི་ "
 "ངེས་གཏན་ཨིན་ན?"
 
-#: ../pidgin/gtkconv.c:8956
+#: ../pidgin/gtkconv.c:8953
 msgid "Close other tabs"
 msgstr "ཨེབ་ལྡེ་གཞན་མི་ཁ་བསྡམས།"
 
-#: ../pidgin/gtkconv.c:8962
+#: ../pidgin/gtkconv.c:8959
 msgid "Close all tabs"
 msgstr "ཨེབ་ལྡེ་ཆ་མཉམ་ཁ་བསྡམས།"
 
-#: ../pidgin/gtkconv.c:8970
+#: ../pidgin/gtkconv.c:8967
 msgid "Detach this tab"
 msgstr "འ་ནི་ཨེབ་ལྡེ་འདི་ ཁ་འཕྱལ།"
 
-#: ../pidgin/gtkconv.c:8976
+#: ../pidgin/gtkconv.c:8973
 msgid "Close this tab"
 msgstr "འ་ནི་ཨེབ་ལྡེ་འདི་ཁ་བསྡམས།"
 
-#: ../pidgin/gtkconv.c:9481
+#: ../pidgin/gtkconv.c:9478
 msgid "Close conversation"
 msgstr "གྲོས་གླེང་ཁ་བསྡམ།"
 
-#: ../pidgin/gtkconv.c:10071
+#: ../pidgin/gtkconv.c:10068
 msgid "Last created window"
 msgstr "མཇུག་ལུ་གསར་བསྐྲུན་འབད་འབད་བའི་སྒོ་སྒྲིག"
 
-#: ../pidgin/gtkconv.c:10073
+#: ../pidgin/gtkconv.c:10070
 msgid "Separate IM and Chat windows"
 msgstr "ཨའི་ཨེམ་དང་ཁ་སླབ་སྒོ་སྒྲིག་ཚུ་སོ་སོ་ཁ་འཕྲལ།"
 
-#: ../pidgin/gtkconv.c:10075 ../pidgin/gtkprefs.c:2015
+#: ../pidgin/gtkconv.c:10072 ../pidgin/gtkprefs.c:2009
 msgid "New window"
 msgstr "སྒོ་སྒྲིག་གསརཔ།"
 
-#: ../pidgin/gtkconv.c:10077
+#: ../pidgin/gtkconv.c:10074
 msgid "By group"
 msgstr "སྡེ་ཚན་གྱིས།"
 
-#: ../pidgin/gtkconv.c:10079
+#: ../pidgin/gtkconv.c:10076
 msgid "By account"
 msgstr "རྩིས་ཐོ་གིས།"
 
@@ -16230,7 +16226,7 @@
 msgid "Afrikaans"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:152 ../pidgin/gtkdialogs.c:273
+#: ../pidgin/gtkdialogs.c:152 ../pidgin/gtkdialogs.c:265
 msgid "Arabic"
 msgstr "ཨ་ར་བིཀ།"
 
@@ -16247,13 +16243,13 @@
 msgstr ""
 
 #: ../pidgin/gtkdialogs.c:156 ../pidgin/gtkdialogs.c:157
-#: ../pidgin/gtkdialogs.c:274
+#: ../pidgin/gtkdialogs.c:266
 msgid "Bulgarian"
 msgstr "བཱལ་ག་རི་ཡཱན།"
 
 #: ../pidgin/gtkdialogs.c:158 ../pidgin/gtkdialogs.c:159
-#: ../pidgin/gtkdialogs.c:160 ../pidgin/gtkdialogs.c:275
-#: ../pidgin/gtkdialogs.c:276
+#: ../pidgin/gtkdialogs.c:160 ../pidgin/gtkdialogs.c:267
+#: ../pidgin/gtkdialogs.c:268
 msgid "Bengali"
 msgstr "བེང་ག་ལི།"
 
@@ -16261,31 +16257,30 @@
 msgid "Bengali-India"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:163
+#: ../pidgin/gtkdialogs.c:162
 msgid "Bosnian"
 msgstr "བོསོ་ནི་ཡཱན།"
 
-#: ../pidgin/gtkdialogs.c:164 ../pidgin/gtkdialogs.c:277
-#: ../pidgin/gtkdialogs.c:278
+#: ../pidgin/gtkdialogs.c:163 ../pidgin/gtkdialogs.c:269
+#: ../pidgin/gtkdialogs.c:270
 msgid "Catalan"
 msgstr "ཀེ་ཊ་ལཱན།"
 
-#: ../pidgin/gtkdialogs.c:165 ../pidgin/gtkdialogs.c:166
+#: ../pidgin/gtkdialogs.c:164 ../pidgin/gtkdialogs.c:165
 msgid "Valencian-Catalan"
 msgstr "ཝེ་ལེན་སིན་-ཀེ་ཊ་ལཱན།"
 
-#: ../pidgin/gtkdialogs.c:167 ../pidgin/gtkdialogs.c:279
-#: ../pidgin/gtkdialogs.c:280
+#: ../pidgin/gtkdialogs.c:166 ../pidgin/gtkdialogs.c:271
+#: ../pidgin/gtkdialogs.c:272
 msgid "Czech"
 msgstr "ཅེཛི།"
 
-#: ../pidgin/gtkdialogs.c:168 ../pidgin/gtkdialogs.c:281
-#: ../pidgin/gtkdialogs.c:282
+#: ../pidgin/gtkdialogs.c:167 ../pidgin/gtkdialogs.c:168
 msgid "Danish"
 msgstr "ཌེ་ནིཤ།"
 
-#: ../pidgin/gtkdialogs.c:169 ../pidgin/gtkdialogs.c:283
-#: ../pidgin/gtkdialogs.c:284
+#: ../pidgin/gtkdialogs.c:169 ../pidgin/gtkdialogs.c:273
+#: ../pidgin/gtkdialogs.c:274
 msgid "German"
 msgstr "ཇར་མཱན།"
 
@@ -16298,11 +16293,11 @@
 msgid "Greek"
 msgstr "གི་རིཀ།"
 
-#: ../pidgin/gtkdialogs.c:175 ../pidgin/gtkdialogs.c:285
+#: ../pidgin/gtkdialogs.c:175
 msgid "Australian English"
 msgstr "ཨསི་ཊེ་ལི་ཡཱན་ ཨིང་ལིཤི"
 
-#: ../pidgin/gtkdialogs.c:176 ../pidgin/gtkdialogs.c:286
+#: ../pidgin/gtkdialogs.c:176 ../pidgin/gtkdialogs.c:275
 msgid "British English"
 msgstr "བི་རི་ཊིཤི་ ཨིང་ལིཤི"
 
@@ -16314,72 +16309,72 @@
 msgid "Esperanto"
 msgstr "ཨིསི་པེ་རེན་ཊོ།"
 
-#: ../pidgin/gtkdialogs.c:179 ../pidgin/gtkdialogs.c:287
-#: ../pidgin/gtkdialogs.c:288 ../pidgin/gtkdialogs.c:289
-#: ../pidgin/gtkdialogs.c:290
+#: ../pidgin/gtkdialogs.c:179 ../pidgin/gtkdialogs.c:276
+#: ../pidgin/gtkdialogs.c:277 ../pidgin/gtkdialogs.c:278
+#: ../pidgin/gtkdialogs.c:279
 msgid "Spanish"
 msgstr "སིཔེ་ནིཤི།"
 
-#: ../pidgin/gtkdialogs.c:181
+#: ../pidgin/gtkdialogs.c:180
 msgid "Estonian"
 msgstr "ཨིསི་ཊོ་ནི་ཡཱན།"
 
-#: ../pidgin/gtkdialogs.c:182 ../pidgin/gtkdialogs.c:291
-#: ../pidgin/gtkdialogs.c:292
+#: ../pidgin/gtkdialogs.c:181 ../pidgin/gtkdialogs.c:280
+#: ../pidgin/gtkdialogs.c:281
 msgid "Basque"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:183 ../pidgin/gtkdialogs.c:184
-#: ../pidgin/gtkdialogs.c:185
+#: ../pidgin/gtkdialogs.c:182 ../pidgin/gtkdialogs.c:183
+#: ../pidgin/gtkdialogs.c:184
 msgid "Persian"
 msgstr "པར་ཤི་ཡཱན།"
 
-#: ../pidgin/gtkdialogs.c:186 ../pidgin/gtkdialogs.c:293
-#: ../pidgin/gtkdialogs.c:294
+#: ../pidgin/gtkdialogs.c:185 ../pidgin/gtkdialogs.c:282
+#: ../pidgin/gtkdialogs.c:283
 msgid "Finnish"
 msgstr "ཕིན་ནིཤ།"
 
-#: ../pidgin/gtkdialogs.c:187 ../pidgin/gtkdialogs.c:295
-#: ../pidgin/gtkdialogs.c:296 ../pidgin/gtkdialogs.c:297
-#: ../pidgin/gtkdialogs.c:298
+#: ../pidgin/gtkdialogs.c:186 ../pidgin/gtkdialogs.c:284
+#: ../pidgin/gtkdialogs.c:285 ../pidgin/gtkdialogs.c:286
+#: ../pidgin/gtkdialogs.c:287
 msgid "French"
 msgstr "ཕིརེནཆི།"
 
-#: ../pidgin/gtkdialogs.c:188 ../pidgin/gtkdialogs.c:189
+#: ../pidgin/gtkdialogs.c:187 ../pidgin/gtkdialogs.c:188
 msgid "Irish"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:190 ../pidgin/gtkdialogs.c:191
-#: ../pidgin/gtkdialogs.c:299
+#: ../pidgin/gtkdialogs.c:189 ../pidgin/gtkdialogs.c:190
+#: ../pidgin/gtkdialogs.c:288
 msgid "Galician"
 msgstr "གེ་ལི་ཤི་ཡཱན།"
 
-#: ../pidgin/gtkdialogs.c:192 ../pidgin/gtkdialogs.c:193
+#: ../pidgin/gtkdialogs.c:191 ../pidgin/gtkdialogs.c:192
 msgid "Gujarati"
 msgstr "གུ་ཇ་ར་ཏི།"
 
-#: ../pidgin/gtkdialogs.c:193
+#: ../pidgin/gtkdialogs.c:192
 msgid "Gujarati Language Team"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:194 ../pidgin/gtkdialogs.c:300
+#: ../pidgin/gtkdialogs.c:193 ../pidgin/gtkdialogs.c:289
 msgid "Hebrew"
 msgstr "ཧེབ་བིརིའུ"
 
-#: ../pidgin/gtkdialogs.c:195 ../pidgin/gtkdialogs.c:196
-#: ../pidgin/gtkdialogs.c:301
+#: ../pidgin/gtkdialogs.c:194 ../pidgin/gtkdialogs.c:195
+#: ../pidgin/gtkdialogs.c:290
 msgid "Hindi"
 msgstr "ཧིན་དི།"
 
-#: ../pidgin/gtkdialogs.c:197
+#: ../pidgin/gtkdialogs.c:196
 msgid "Croatian"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:198 ../pidgin/gtkdialogs.c:302
+#: ../pidgin/gtkdialogs.c:197 ../pidgin/gtkdialogs.c:291
 msgid "Hungarian"
 msgstr "ཧང་ག་རི་ཡཱན།"
 
-#: ../pidgin/gtkdialogs.c:303
+#: ../pidgin/gtkdialogs.c:198
 msgid "Armenian"
 msgstr ""
 
@@ -16387,17 +16382,17 @@
 msgid "Indonesian"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:200 ../pidgin/gtkdialogs.c:304
+#: ../pidgin/gtkdialogs.c:200 ../pidgin/gtkdialogs.c:292
 msgid "Italian"
 msgstr "ཨི་ཊ་ལི་ཡཱན།"
 
-#: ../pidgin/gtkdialogs.c:201 ../pidgin/gtkdialogs.c:305
-#: ../pidgin/gtkdialogs.c:306 ../pidgin/gtkdialogs.c:307
-#: ../pidgin/gtkdialogs.c:308
+#: ../pidgin/gtkdialogs.c:201 ../pidgin/gtkdialogs.c:293
+#: ../pidgin/gtkdialogs.c:294 ../pidgin/gtkdialogs.c:295
+#: ../pidgin/gtkdialogs.c:296
 msgid "Japanese"
 msgstr "ཇ་པ་ནིསི།"
 
-#: ../pidgin/gtkdialogs.c:202 ../pidgin/gtkdialogs.c:309
+#: ../pidgin/gtkdialogs.c:202 ../pidgin/gtkdialogs.c:297
 msgid "Georgian"
 msgstr "ཇིའོར་ཇི་ཡཱན།"
 
@@ -16405,216 +16400,215 @@
 msgid "Ubuntu Georgian Translators"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:204
+#: ../pidgin/gtkdialogs.c:203
 msgid "Khmer"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:205
+#: ../pidgin/gtkdialogs.c:204
 msgid "Kannada"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:205
+#: ../pidgin/gtkdialogs.c:204
 msgid "Kannada Translation team"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:206 ../pidgin/gtkdialogs.c:310
-#: ../pidgin/gtkdialogs.c:311
+#: ../pidgin/gtkdialogs.c:205 ../pidgin/gtkdialogs.c:298
+#: ../pidgin/gtkdialogs.c:299
 msgid "Korean"
 msgstr "ཀོ་རི་ཡཱན།"
 
-#: ../pidgin/gtkdialogs.c:208 ../pidgin/gtkdialogs.c:209
-#: ../pidgin/gtkdialogs.c:210
+#: ../pidgin/gtkdialogs.c:206 ../pidgin/gtkdialogs.c:207
+#: ../pidgin/gtkdialogs.c:208
 msgid "Kurdish"
 msgstr "ཀར་ཌིཤ།"
 
-#: ../pidgin/gtkdialogs.c:312
+#: ../pidgin/gtkdialogs.c:209
 msgid "Lao"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:212 ../pidgin/gtkdialogs.c:313
-#: ../pidgin/gtkdialogs.c:314 ../pidgin/gtkdialogs.c:315
+#: ../pidgin/gtkdialogs.c:210 ../pidgin/gtkdialogs.c:300
+#: ../pidgin/gtkdialogs.c:301 ../pidgin/gtkdialogs.c:302
 msgid "Lithuanian"
 msgstr "ལི་ཐུ་འ་ནི་ཡཱན།"
 
-#: ../pidgin/gtkdialogs.c:214 ../pidgin/gtkdialogs.c:215
+#: ../pidgin/gtkdialogs.c:211 ../pidgin/gtkdialogs.c:212
 msgid "Maithili"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:216
+#: ../pidgin/gtkdialogs.c:213
 msgid "Meadow Mari"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:217 ../pidgin/gtkdialogs.c:218
-#: ../pidgin/gtkdialogs.c:219 ../pidgin/gtkdialogs.c:316
+#: ../pidgin/gtkdialogs.c:214 ../pidgin/gtkdialogs.c:215
+#: ../pidgin/gtkdialogs.c:216 ../pidgin/gtkdialogs.c:303
 msgid "Macedonian"
 msgstr "མེ་སི་ཌོ་ནི་ཡཱན།"
 
-#: ../pidgin/gtkdialogs.c:220
+#: ../pidgin/gtkdialogs.c:217
 msgid "Malayalam"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:221
+#: ../pidgin/gtkdialogs.c:218
 msgid "Mongolian"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:222
+#: ../pidgin/gtkdialogs.c:219
 msgid "Marathi"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:317
+#: ../pidgin/gtkdialogs.c:220
 msgid "Malay"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:223
+#: ../pidgin/gtkdialogs.c:221
 msgid "Burmese"
 msgstr "བར་མིསི"
 
-#: ../pidgin/gtkdialogs.c:224 ../pidgin/gtkdialogs.c:318
-#: ../pidgin/gtkdialogs.c:319 ../pidgin/gtkdialogs.c:320
-#: ../pidgin/gtkdialogs.c:321
+#: ../pidgin/gtkdialogs.c:222 ../pidgin/gtkdialogs.c:304
+#: ../pidgin/gtkdialogs.c:305 ../pidgin/gtkdialogs.c:306
 msgid "Bokmål Norwegian"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:225
+#: ../pidgin/gtkdialogs.c:223
 msgid "Nepali"
 msgstr "ནེ་པཱ་ལི།"
 
-#: ../pidgin/gtkdialogs.c:226 ../pidgin/gtkdialogs.c:322
+#: ../pidgin/gtkdialogs.c:224 ../pidgin/gtkdialogs.c:307
 msgid "Dutch, Flemish"
 msgstr "ཌཆ། ཕེལེ་མིཤི།"
 
-#: ../pidgin/gtkdialogs.c:227
+#: ../pidgin/gtkdialogs.c:225
 msgid "Norwegian Nynorsk"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:228 ../pidgin/gtkdialogs.c:323
+#: ../pidgin/gtkdialogs.c:226
 msgid "Occitan"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:229
+#: ../pidgin/gtkdialogs.c:227
 msgid "Oriya"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:230
+#: ../pidgin/gtkdialogs.c:228
 msgid "Punjabi"
 msgstr "པཱན་ཇ་བི"
 
-#: ../pidgin/gtkdialogs.c:231 ../pidgin/gtkdialogs.c:324
-#: ../pidgin/gtkdialogs.c:325 ../pidgin/gtkdialogs.c:326
-#: ../pidgin/gtkdialogs.c:327 ../pidgin/gtkdialogs.c:328
+#: ../pidgin/gtkdialogs.c:229 ../pidgin/gtkdialogs.c:308
+#: ../pidgin/gtkdialogs.c:309 ../pidgin/gtkdialogs.c:310
+#: ../pidgin/gtkdialogs.c:311 ../pidgin/gtkdialogs.c:312
 msgid "Polish"
 msgstr "པོ་ལིཤ།"
 
-#: ../pidgin/gtkdialogs.c:232 ../pidgin/gtkdialogs.c:329
+#: ../pidgin/gtkdialogs.c:230 ../pidgin/gtkdialogs.c:313
 msgid "Portuguese"
 msgstr "པོར་ཊུ་གིསི།"
 
-#: ../pidgin/gtkdialogs.c:233 ../pidgin/gtkdialogs.c:330
-#: ../pidgin/gtkdialogs.c:331
+#: ../pidgin/gtkdialogs.c:231 ../pidgin/gtkdialogs.c:314
+#: ../pidgin/gtkdialogs.c:315
 msgid "Portuguese-Brazil"
 msgstr "པོར་ཊུ་གིསི-བ་ར་ཛིལ།"
 
-#: ../pidgin/gtkdialogs.c:234
+#: ../pidgin/gtkdialogs.c:232
 msgid "Pashto"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:235 ../pidgin/gtkdialogs.c:236
+#: ../pidgin/gtkdialogs.c:233 ../pidgin/gtkdialogs.c:234
 msgid "Romanian"
 msgstr "རོ་མ་ནི་ཡཱན"
 
-#: ../pidgin/gtkdialogs.c:237 ../pidgin/gtkdialogs.c:332
-#: ../pidgin/gtkdialogs.c:333 ../pidgin/gtkdialogs.c:334
+#: ../pidgin/gtkdialogs.c:235 ../pidgin/gtkdialogs.c:316
+#: ../pidgin/gtkdialogs.c:317 ../pidgin/gtkdialogs.c:318
 msgid "Russian"
 msgstr "ར་ཤི་ཡཱན།"
 
-#: ../pidgin/gtkdialogs.c:239 ../pidgin/gtkdialogs.c:240
-#: ../pidgin/gtkdialogs.c:335 ../pidgin/gtkdialogs.c:336
-#: ../pidgin/gtkdialogs.c:337
+#: ../pidgin/gtkdialogs.c:236 ../pidgin/gtkdialogs.c:237
+#: ../pidgin/gtkdialogs.c:319 ../pidgin/gtkdialogs.c:320
+#: ../pidgin/gtkdialogs.c:321
 msgid "Slovak"
 msgstr "སོལོ་བཱཀ།"
 
-#: ../pidgin/gtkdialogs.c:241 ../pidgin/gtkdialogs.c:338
+#: ../pidgin/gtkdialogs.c:238 ../pidgin/gtkdialogs.c:322
 msgid "Slovenian"
 msgstr "སོལོ་བི་ནི་ཡཱན།"
 
-#: ../pidgin/gtkdialogs.c:242
+#: ../pidgin/gtkdialogs.c:239
 msgid "Albanian"
 msgstr "ཨཱལ་བཱ་ནི་ཡཱན།"
 
-#: ../pidgin/gtkdialogs.c:243 ../pidgin/gtkdialogs.c:339
-#: ../pidgin/gtkdialogs.c:340
+#: ../pidgin/gtkdialogs.c:240 ../pidgin/gtkdialogs.c:323
+#: ../pidgin/gtkdialogs.c:324
 msgid "Serbian"
 msgstr "སར་བི་ཡཱན།"
 
-#: ../pidgin/gtkdialogs.c:244
+#: ../pidgin/gtkdialogs.c:241
 msgid "Serbian Latin"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:245 ../pidgin/gtkdialogs.c:246
+#: ../pidgin/gtkdialogs.c:242 ../pidgin/gtkdialogs.c:243
 msgid "Sinhala"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:247 ../pidgin/gtkdialogs.c:341
-#: ../pidgin/gtkdialogs.c:342 ../pidgin/gtkdialogs.c:343
+#: ../pidgin/gtkdialogs.c:244 ../pidgin/gtkdialogs.c:325
+#: ../pidgin/gtkdialogs.c:326
 msgid "Swedish"
 msgstr "སུའི་ཌིཤི།"
 
-#: ../pidgin/gtkdialogs.c:248
+#: ../pidgin/gtkdialogs.c:245
 msgid "Swahili"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:249 ../pidgin/gtkdialogs.c:250
+#: ../pidgin/gtkdialogs.c:246 ../pidgin/gtkdialogs.c:247
 msgid "Tamil"
 msgstr "ཏ་མིལ།"
 
-#: ../pidgin/gtkdialogs.c:251 ../pidgin/gtkdialogs.c:344
+#: ../pidgin/gtkdialogs.c:248 ../pidgin/gtkdialogs.c:327
 msgid "Telugu"
 msgstr "ཏེ་ལུ་གུ།"
 
-#: ../pidgin/gtkdialogs.c:252
+#: ../pidgin/gtkdialogs.c:249
 msgid "Thai"
 msgstr "ཐཱའི།"
 
-#: ../pidgin/gtkdialogs.c:254
+#: ../pidgin/gtkdialogs.c:250
 msgid "Ukranian"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:255
+#: ../pidgin/gtkdialogs.c:251
 msgid "Urdu"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:260 ../pidgin/gtkdialogs.c:347
+#: ../pidgin/gtkdialogs.c:252 ../pidgin/gtkdialogs.c:330
 msgid "Vietnamese"
 msgstr "ཝེཊི་ན་མིསི།"
 
-#: ../pidgin/gtkdialogs.c:261 ../pidgin/gtkdialogs.c:348
-#: ../pidgin/gtkdialogs.c:349
+#: ../pidgin/gtkdialogs.c:253 ../pidgin/gtkdialogs.c:331
+#: ../pidgin/gtkdialogs.c:332
 msgid "Simplified Chinese"
 msgstr "རྒྱ་ནག་གི་སྐད།(འཇམ་སམ་བཟོ་བཟོཝ)"
 
-#: ../pidgin/gtkdialogs.c:262 ../pidgin/gtkdialogs.c:263
-#: ../pidgin/gtkdialogs.c:264
+#: ../pidgin/gtkdialogs.c:254 ../pidgin/gtkdialogs.c:255
+#: ../pidgin/gtkdialogs.c:256
 msgid "Hong Kong Chinese"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:265 ../pidgin/gtkdialogs.c:266
-#: ../pidgin/gtkdialogs.c:350
+#: ../pidgin/gtkdialogs.c:257 ../pidgin/gtkdialogs.c:258
+#: ../pidgin/gtkdialogs.c:333
 msgid "Traditional Chinese"
 msgstr "རྒྱ་ནག་གི་གཡུས་སྐད"
 
-#: ../pidgin/gtkdialogs.c:272
+#: ../pidgin/gtkdialogs.c:264
 msgid "Amharic"
 msgstr "ཨམ་ཧ་རིཀ།"
 
-#: ../pidgin/gtkdialogs.c:345 ../pidgin/gtkdialogs.c:346
+#: ../pidgin/gtkdialogs.c:328 ../pidgin/gtkdialogs.c:329
 msgid "Turkish"
 msgstr "ཊར་ཀིཤ"
 
-#: ../pidgin/gtkdialogs.c:347
+#: ../pidgin/gtkdialogs.c:330
 msgid "T.M.Thanh and the Gnome-Vi Team"
 msgstr "T.M.Thanh and the Gnome-Vi Team"
 
-#: ../pidgin/gtkdialogs.c:525
+#: ../pidgin/gtkdialogs.c:508
 #, c-format
 msgid ""
 "%s is a messaging client based on libpurple which is capable of connecting "
@@ -16625,7 +16619,7 @@
 " There is no warranty for %s.<BR><BR>"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:535
+#: ../pidgin/gtkdialogs.c:518
 #, c-format
 msgid ""
 "<FONT SIZE=\"4\"><B>Helpful Resources</B></FONT><BR>\t<A "
@@ -16634,7 +16628,7 @@
 "devel@conference.pidgin.im<BR><BR>"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:549
+#: ../pidgin/gtkdialogs.c:532
 msgid ""
 "<font size=\"4\"><b>Help from other Pidgin users</b></font> is available by "
 "e-mailing <a "
@@ -16646,114 +16640,114 @@
 "responses may be less helpful.<br/>"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:559
+#: ../pidgin/gtkdialogs.c:542
 #, c-format
 msgid "About %s"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:581
+#: ../pidgin/gtkdialogs.c:564
 msgid "Build Information"
 msgstr ""
 
 #. End of not to be translated section
-#: ../pidgin/gtkdialogs.c:746
+#: ../pidgin/gtkdialogs.c:733
 #, c-format
 msgid "%s Build Information"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:767
+#: ../pidgin/gtkdialogs.c:754
 msgid "Current Developers"
 msgstr "ད་ལྟོའི་བཟོ་མི་ཚུ།"
 
-#: ../pidgin/gtkdialogs.c:773
+#: ../pidgin/gtkdialogs.c:760
 msgid "Crazy Patch Writers"
 msgstr "སྦྱར་བཅོས་འབྲི་མི་ཚུ།"
 
-#: ../pidgin/gtkdialogs.c:779
+#: ../pidgin/gtkdialogs.c:766
 msgid "Retired Developers"
 msgstr "དགོངས་ཞུ་འབད་མི་བཟོ་མི་ཚུ།"
 
-#: ../pidgin/gtkdialogs.c:785
+#: ../pidgin/gtkdialogs.c:772
 msgid "Retired Crazy Patch Writers"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:788
+#: ../pidgin/gtkdialogs.c:775
 #, c-format
 msgid "%s Developer Information"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:809
+#: ../pidgin/gtkdialogs.c:796
 msgid "Current Translators"
 msgstr "ད་ལྟོའི་སྐད་བསྒྱུར་པཚུ།"
 
-#: ../pidgin/gtkdialogs.c:815
+#: ../pidgin/gtkdialogs.c:802
 msgid "Past Translators"
 msgstr "ཧེ་མའི་སྐད་བསྒྱུར་པ་ཚུ།"
 
-#: ../pidgin/gtkdialogs.c:818
+#: ../pidgin/gtkdialogs.c:805
 #, c-format
 msgid "%s Translator Information"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:829
+#: ../pidgin/gtkdialogs.c:816
 #, c-format
 msgid "%s Plugin Information"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:838
+#: ../pidgin/gtkdialogs.c:825
 msgid "Plugin Information"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:894 ../pidgin/gtkdialogs.c:1033
-#: ../pidgin/gtkdialogs.c:1114
+#: ../pidgin/gtkdialogs.c:881 ../pidgin/gtkdialogs.c:1020
+#: ../pidgin/gtkdialogs.c:1101
 msgid "_Name"
 msgstr "མིང་།(_N)"
 
-#: ../pidgin/gtkdialogs.c:899 ../pidgin/gtkdialogs.c:1038
-#: ../pidgin/gtkdialogs.c:1119
+#: ../pidgin/gtkdialogs.c:886 ../pidgin/gtkdialogs.c:1025
+#: ../pidgin/gtkdialogs.c:1106
 msgid "_Account"
 msgstr "རྩིས་ཐོ(_A)"
 
-#: ../pidgin/gtkdialogs.c:1046
+#: ../pidgin/gtkdialogs.c:1033
 msgid "Get User Info"
 msgstr "བརྡ་དོན་ལག་ལེན་པ་ལེན།"
 
-#: ../pidgin/gtkdialogs.c:1048
+#: ../pidgin/gtkdialogs.c:1035
 msgid ""
 "Please enter the username or alias of the person whose info you would like "
 "to view."
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:1138
+#: ../pidgin/gtkdialogs.c:1125
 msgid "View User Log"
 msgstr "ལག་ལེན་པའི་དྲན་དེབ་བལྟ།"
 
-#: ../pidgin/gtkdialogs.c:1160
+#: ../pidgin/gtkdialogs.c:1147
 msgid "Alias Contact"
 msgstr "འབྲེལ་སའི་མིང་གཞན="
 
-#: ../pidgin/gtkdialogs.c:1161
+#: ../pidgin/gtkdialogs.c:1148
 msgid "Enter an alias for this contact."
 msgstr "འབྲེལ་ནིའི་དོན་ལུ་མིང་གཞན་བཙུགས།"
 
-#: ../pidgin/gtkdialogs.c:1183
+#: ../pidgin/gtkdialogs.c:1170
 #, c-format
 msgid "Enter an alias for %s."
 msgstr "%s ཀྱི་དོན་ལུ་མིང་གཞན་བཙུགས།"
 
-#: ../pidgin/gtkdialogs.c:1185
+#: ../pidgin/gtkdialogs.c:1172
 msgid "Alias Buddy"
 msgstr "ཆ་རོགས་ཀྱི་མིང་གཞན།"
 
-#: ../pidgin/gtkdialogs.c:1206
+#: ../pidgin/gtkdialogs.c:1193
 msgid "Alias Chat"
 msgstr "ཁ་སླབ་མིང་གཞན།"
 
-#: ../pidgin/gtkdialogs.c:1207
+#: ../pidgin/gtkdialogs.c:1194
 msgid "Enter an alias for this chat."
 msgstr "ཁ་སླབ་འདིའི་དོན་ལུ་མིང་གཞན་བཙུགས།"
 
-#: ../pidgin/gtkdialogs.c:1246
+#: ../pidgin/gtkdialogs.c:1233
 #, c-format
 msgid ""
 "You are about to remove the contact containing %s and %d other buddy from "
@@ -16766,15 +16760,15 @@
 "ནང་ན་ཡོད་མི་དང་ཁྱོད་རའི་ཆ་རོགས་ཀྱི་ཐོ་ཡིག་ནང་ལས་ཆ་རོགས་གཞན་མི་ཚུ་རྩ་བསྐྲད་གཏང"
 "་ནི་འབད་དེས།འཕྲོ་མཐུད་དེ་འབད་ནི་ཨིན་ན ?"
 
-#: ../pidgin/gtkdialogs.c:1254
+#: ../pidgin/gtkdialogs.c:1241
 msgid "Remove Contact"
 msgstr "འབྲེལ་ས་རྩ་བསྐྲད་གཏང་།"
 
-#: ../pidgin/gtkdialogs.c:1257
+#: ../pidgin/gtkdialogs.c:1244
 msgid "_Remove Contact"
 msgstr "འབྲེལ་ས་རྩ་བསྐྲད་གཏང་།(_R)"
 
-#: ../pidgin/gtkdialogs.c:1288
+#: ../pidgin/gtkdialogs.c:1275
 #, c-format
 msgid ""
 "You are about to merge the group called %s into the group called %s. Do you "
@@ -16783,15 +16777,15 @@
 "ཁྱོད་ཀྱིས་  %s ཟེར་བའི་སྡེ་ཚན་འདི་  %s "
 "ཟེར་མི་སྡེ་ཚན་ནང་ན་མཉམ་བསྡོམས་འབད་ནི་འབད་དོ། ཁྱོད་ འཕྲོ་མཐུད་དེ་འབད་ནི་ཨིན་ན?"
 
-#: ../pidgin/gtkdialogs.c:1295
+#: ../pidgin/gtkdialogs.c:1282
 msgid "Merge Groups"
 msgstr "སྡེ་ཚན་ཚུ་མཉམ་བསྡོམས་འབད།"
 
-#: ../pidgin/gtkdialogs.c:1298
+#: ../pidgin/gtkdialogs.c:1285
 msgid "_Merge Groups"
 msgstr "སྡེ་ཚན་ཚུ་མཉམ་བསྡོམས་འབད།(_M)"
 
-#: ../pidgin/gtkdialogs.c:1348
+#: ../pidgin/gtkdialogs.c:1335
 #, c-format
 msgid ""
 "You are about to remove the group %s and all its members from your buddy "
@@ -16800,15 +16794,15 @@
 "ཁྱོད་ཀྱིས་ སྡེ་ཚན་ %s དང་འདི་གི་སྡེ་ཚན་ཚུ་གེ་ར་ ཁྱོད་རའི་ཆ་རོགས་ཐོ་ཡིག་ "
 "ནང་ལས་རྩ་བསྐྲད་གཏང་ནི་འབད་དེས། འཕྲོ་མཐུད་དེ་འབད་ནི་ཨིན་ན?"
 
-#: ../pidgin/gtkdialogs.c:1351
+#: ../pidgin/gtkdialogs.c:1338
 msgid "Remove Group"
 msgstr "སྡེ་ཚན་རྩ་བསྐྲད་གཏང་།"
 
-#: ../pidgin/gtkdialogs.c:1354
+#: ../pidgin/gtkdialogs.c:1341
 msgid "_Remove Group"
 msgstr "སྡེ་ཚན་རྩ་བསྐྲད་གཏང་།(_R)"
 
-#: ../pidgin/gtkdialogs.c:1387
+#: ../pidgin/gtkdialogs.c:1374
 #, c-format
 msgid ""
 "You are about to remove %s from your buddy list.  Do you want to continue?"
@@ -16816,15 +16810,15 @@
 "ཁྱོད་ཀྱིས %sའདི་ཁྱོད་རའི་ཆ་རོགས་ཐོ་ཡིག་ནང་ལས་རྩ་བསྐྲད་གཏང་ནི་འབད་དེས། "
 "འཕྲོ་མཐུད་དེ་འབད་ནི་ཨིན་ན?"
 
-#: ../pidgin/gtkdialogs.c:1390
+#: ../pidgin/gtkdialogs.c:1377
 msgid "Remove Buddy"
 msgstr "ཆ་རོགས་རྩ་བསྐྲད་གཏང་།"
 
-#: ../pidgin/gtkdialogs.c:1393
+#: ../pidgin/gtkdialogs.c:1380
 msgid "_Remove Buddy"
 msgstr "ཆ་རོགས་རྩ་བསྐྲད་གཏང་།(_R)"
 
-#: ../pidgin/gtkdialogs.c:1414
+#: ../pidgin/gtkdialogs.c:1401
 #, c-format
 msgid ""
 "You are about to remove the chat %s from your buddy list.  Do you want to "
@@ -16834,11 +16828,11 @@
 "འདི་ཁྱོད་རའི་ཆ་རོགས་ཐོ་ཡིག་ནང་ལས་རྩ་བསྐྲད་གཏང་ནི་འབད་དེས། "
 "འཕྲོ་མཐུད་དེ་འབད་ནི་ཨིན་ན?"
 
-#: ../pidgin/gtkdialogs.c:1417
+#: ../pidgin/gtkdialogs.c:1404
 msgid "Remove Chat"
 msgstr "ཁ་སླབ་རྩ་བསྐྲད་གཏང་།"
 
-#: ../pidgin/gtkdialogs.c:1420
+#: ../pidgin/gtkdialogs.c:1407
 msgid "_Remove Chat"
 msgstr "ཁ་སླབ་རྩ་བསྐྲད་གཏང་།(_R)"
 
@@ -16906,26 +16900,26 @@
 msgid "<b>Sending As:</b>"
 msgstr "<b >As གཏང་དོ:</b>"
 
-#: ../pidgin/gtkft.c:474 ../pidgin/gtkutils.c:3304
+#: ../pidgin/gtkft.c:474 ../pidgin/gtkutils.c:3296
 msgid "There is no application configured to open this type of file."
 msgstr ""
 "འདི་བཟུམ་གྱི་ཡིག་སྣོད་ཁ་ཕྱེ་ནིའི་དོན་ལུ་གློེག་རིམ་ རིམ་སྒྲིག་མ་འབད་བས།"
 
-#: ../pidgin/gtkft.c:479 ../pidgin/gtkutils.c:3309
+#: ../pidgin/gtkft.c:479 ../pidgin/gtkutils.c:3301
 msgid "An error occurred while opening the file."
 msgstr "ཡིག་སྣོད་ཁ་ཕྱེཝ་ད་ འཛོལ་བ་བྱུང་ནུག"
 
-#: ../pidgin/gtkft.c:516 ../pidgin/gtkutils.c:3345
+#: ../pidgin/gtkft.c:516 ../pidgin/gtkutils.c:3337
 #, c-format
 msgid "Error launching %s: %s"
 msgstr "%s: %s གསར་བཙུགས་འབད་བའི་འཛོལ་བ།"
 
-#: ../pidgin/gtkft.c:525 ../pidgin/gtkutils.c:3353
+#: ../pidgin/gtkft.c:525 ../pidgin/gtkutils.c:3345
 #, c-format
 msgid "Error running %s"
 msgstr "%s གཡོག་བཀོལ་འཛོལ་བ།"
 
-#: ../pidgin/gtkft.c:526 ../pidgin/gtkutils.c:3354
+#: ../pidgin/gtkft.c:526 ../pidgin/gtkutils.c:3346
 #, c-format
 msgid "Process returned error code %d"
 msgstr "སླར་ལོག་འབད་ཡོད་པའི་ཨང་རྟགས་ %d ལས་སྦྱོར་འབད།"
@@ -17406,7 +17400,7 @@
 msgid "display the current version and exit"
 msgstr ""
 
-#: ../pidgin/gtkmain.c:497
+#: ../pidgin/gtkmain.c:493
 #, c-format
 msgid ""
 "%s %s has segfaulted and attempted to dump a core file.\n"
@@ -17423,42 +17417,42 @@
 "%swiki/GetABacktrace\n"
 msgstr ""
 
-#: ../pidgin/gtkmain.c:785
+#: ../pidgin/gtkmain.c:781
 #, c-format
 msgid "Exiting because another libpurple client is already running.\n"
 msgstr ""
 
-#: ../pidgin/gtkmedia.c:273
+#: ../pidgin/gtkmedia.c:271
 msgid "_Media"
 msgstr ""
 
-#: ../pidgin/gtkmedia.c:274
+#: ../pidgin/gtkmedia.c:272
 msgid "_Hangup"
 msgstr ""
 
-#: ../pidgin/gtkmedia.c:637
+#: ../pidgin/gtkmedia.c:632
 #, c-format
 msgid "%s wishes to start an audio/video session with you."
 msgstr ""
 
-#: ../pidgin/gtkmedia.c:643
+#: ../pidgin/gtkmedia.c:638
 #, c-format
 msgid "%s wishes to start a video session with you."
 msgstr ""
 
-#: ../pidgin/gtkmedia.c:649
+#: ../pidgin/gtkmedia.c:644
 msgid "Incoming Call"
 msgstr ""
 
-#: ../pidgin/gtkmedia.c:962
+#: ../pidgin/gtkmedia.c:792
 msgid "_Hold"
 msgstr ""
 
-#: ../pidgin/gtkmedia.c:1033 ../pidgin/pidginstock.c:92
+#: ../pidgin/gtkmedia.c:863 ../pidgin/pidginstock.c:92
 msgid "_Pause"
 msgstr "ཐེམ(_P)"
 
-#: ../pidgin/gtkmedia.c:1051
+#: ../pidgin/gtkmedia.c:881
 msgid "_Mute"
 msgstr ""
 
@@ -17562,27 +17556,27 @@
 "Check the plugin website for an update.</span>"
 msgstr ""
 
-#: ../pidgin/gtkplugin.c:593
+#: ../pidgin/gtkplugin.c:591
 msgid "Author"
 msgstr ""
 
-#: ../pidgin/gtkplugin.c:671
+#: ../pidgin/gtkplugin.c:669
 msgid "<b>Written by:</b>"
 msgstr ""
 
-#: ../pidgin/gtkplugin.c:691
+#: ../pidgin/gtkplugin.c:689
 msgid "<b>Web site:</b>"
 msgstr ""
 
-#: ../pidgin/gtkplugin.c:700
+#: ../pidgin/gtkplugin.c:698
 msgid "<b>Filename:</b>"
 msgstr ""
 
-#: ../pidgin/gtkplugin.c:727
+#: ../pidgin/gtkplugin.c:725
 msgid "Configure Pl_ugin"
 msgstr "པ་ལག་ཨིན་རིམ་སྒྲིག་འབད།(_u)"
 
-#: ../pidgin/gtkplugin.c:789
+#: ../pidgin/gtkplugin.c:787
 msgid "<b>Plugin Details</b>"
 msgstr "<b>པ་ལག་ཨིན་རྒྱས་བཤད་ཚུ།</b>"
 
@@ -17676,7 +17670,7 @@
 msgid "Br_owse..."
 msgstr "བརྡ་འཚོལ།...(_o)"
 
-#: ../pidgin/gtkpounce.c:699 ../pidgin/gtkprefs.c:2660
+#: ../pidgin/gtkpounce.c:699 ../pidgin/gtkprefs.c:2654
 msgid "Pre_view"
 msgstr "སྔོན་ལྟ(_v)"
 
@@ -17761,366 +17755,366 @@
 msgid "Theme failed to unpack."
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:743 ../pidgin/gtkprefs.c:787
+#: ../pidgin/gtkprefs.c:740 ../pidgin/gtkprefs.c:781
 msgid "Theme failed to load."
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:790
+#: ../pidgin/gtkprefs.c:784
 msgid "Theme failed to copy."
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1091
+#: ../pidgin/gtkprefs.c:1085
 msgid "Theme Selections"
 msgstr ""
 
 #. Instructions
-#: ../pidgin/gtkprefs.c:1094
+#: ../pidgin/gtkprefs.c:1088
 msgid ""
 "Select a theme that you would like to use from the lists below.\n"
 "New themes can be installed by dragging and dropping them onto the theme "
 "list."
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1108
+#: ../pidgin/gtkprefs.c:1102
 msgid "Buddy List Theme:"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1114
+#: ../pidgin/gtkprefs.c:1108
 msgid "Status Icon Theme:"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1120
+#: ../pidgin/gtkprefs.c:1114
 msgid "Sound Theme:"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1126
+#: ../pidgin/gtkprefs.c:1120
 msgid "Smiley Theme:"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1299
+#: ../pidgin/gtkprefs.c:1293
 msgid "Keyboard Shortcuts"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1319
+#: ../pidgin/gtkprefs.c:1313
 msgid "Cl_ose conversations with the Escape key"
 msgstr ""
 
 #. System Tray
-#: ../pidgin/gtkprefs.c:1350
+#: ../pidgin/gtkprefs.c:1344
 msgid "System Tray Icon"
 msgstr "ངོས་དཔར་སྣོད་ཀྱི་རིམ་ལུགས།"
 
-#: ../pidgin/gtkprefs.c:1351
+#: ../pidgin/gtkprefs.c:1345
 msgid "_Show system tray icon:"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1354
+#: ../pidgin/gtkprefs.c:1348
 msgid "On unread messages"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1360
+#: ../pidgin/gtkprefs.c:1354
 msgid "Conversation Window"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1361
+#: ../pidgin/gtkprefs.c:1355
 msgid "_Hide new IM conversations:"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1364 ../pidgin/gtkprefs.c:2755
+#: ../pidgin/gtkprefs.c:1358 ../pidgin/gtkprefs.c:2750
 msgid "When away"
 msgstr "ཕྱི་ཁ་ཨིན་པའི་སྐབས།"
 
-#: ../pidgin/gtkprefs.c:1371
+#: ../pidgin/gtkprefs.c:1365
 msgid "Minimi_ze new conversation windows"
 msgstr ""
 
 #. All the tab options!
-#: ../pidgin/gtkprefs.c:1375
+#: ../pidgin/gtkprefs.c:1369
 msgid "Tabs"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1377
+#: ../pidgin/gtkprefs.c:1371
 msgid "Show IMs and chats in _tabbed windows"
 msgstr "མཆོང་ལྡེ་ཅན་གྱི་སྒོ་སྒྲིག་ཚུ་ནང་ཨའི་ཨེམ་ཚུ་དང་ཁ་སླབ་ནི་ཚུ་སྟོན(_t)"
 
-#: ../pidgin/gtkprefs.c:1391
+#: ../pidgin/gtkprefs.c:1385
 msgid "Show close b_utton on tabs"
 msgstr "མཆོང་ལྡེ་ཚུ་གུ་ ཁ་བསྡམ་མི་གཡེབ་རྟ་འདི་སྟོན(_u)"
 
-#: ../pidgin/gtkprefs.c:1394
+#: ../pidgin/gtkprefs.c:1388
 msgid "_Placement:"
 msgstr "ཚབ་བཙུགས།:(_P)"
 
-#: ../pidgin/gtkprefs.c:1396
+#: ../pidgin/gtkprefs.c:1390
 msgid "Top"
 msgstr "མགོ"
 
-#: ../pidgin/gtkprefs.c:1397
+#: ../pidgin/gtkprefs.c:1391
 msgid "Bottom"
 msgstr "མཇུག"
 
-#: ../pidgin/gtkprefs.c:1398
+#: ../pidgin/gtkprefs.c:1392
 msgid "Left"
 msgstr "གཡོན།"
 
-#: ../pidgin/gtkprefs.c:1399
+#: ../pidgin/gtkprefs.c:1393
 msgid "Right"
 msgstr "གཡས།"
 
-#: ../pidgin/gtkprefs.c:1400
+#: ../pidgin/gtkprefs.c:1394
 msgid "Left Vertical"
 msgstr "ཀེར་ཕྲང་གཡོན།"
 
-#: ../pidgin/gtkprefs.c:1401
+#: ../pidgin/gtkprefs.c:1395
 msgid "Right Vertical"
 msgstr "ཀེར་ཕྲང་གཡས།"
 
-#: ../pidgin/gtkprefs.c:1407
+#: ../pidgin/gtkprefs.c:1401
 msgid "N_ew conversations:"
 msgstr "གྲོས་གླེང་གསརཔ་ཚུ།:(_e)"
 
-#: ../pidgin/gtkprefs.c:1477
+#: ../pidgin/gtkprefs.c:1471
 msgid "Show _formatting on incoming messages"
 msgstr "ནང་འབྱོར་འཕྲིན་དོན་ཚུ་གུ་ལུ་ རྩ་སྒྲིག་འབད་ནི་སྟོན།(_f)"
 
-#: ../pidgin/gtkprefs.c:1479
+#: ../pidgin/gtkprefs.c:1473
 msgid "Close IMs immediately when the tab is closed"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1482
+#: ../pidgin/gtkprefs.c:1476
 msgid "Show _detailed information"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1484
+#: ../pidgin/gtkprefs.c:1478
 msgid "Enable buddy ic_on animation"
 msgstr "ཆ་རོགས་ངོས་པར་གྱི་བསྒུལ་བཟོ་ལྕོགས་ཅན་བཟོ(_o)"
 
-#: ../pidgin/gtkprefs.c:1491
+#: ../pidgin/gtkprefs.c:1485
 msgid "_Notify buddies that you are typing to them"
 msgstr ""
 "ཁྱོད་ཀྱིས་ ཁོང་ལུ་ཡིག་དཔར་རྐྱབ་པའི་བསྒང་གི་ཆ་རོགས་ཚུ་བརྡ་བསྐུལ་འབད(_N)"
 
-#: ../pidgin/gtkprefs.c:1494
+#: ../pidgin/gtkprefs.c:1488
 msgid "Highlight _misspelled words"
 msgstr "སྡེབ་འཛོལ་བའི་མིང་ཚིག་ཚུ་གཙོ་རྟགས་བཀལ།(_m)"
 
-#: ../pidgin/gtkprefs.c:1498
+#: ../pidgin/gtkprefs.c:1492
 msgid "Use smooth-scrolling"
 msgstr "བཤུད་སྒྲིལ་འབད་ནི་ཧུམ་ཁྱུག་ཁྱུ་ལག་ལེན་འཐབ།"
 
-#: ../pidgin/gtkprefs.c:1501
+#: ../pidgin/gtkprefs.c:1495
 msgid "F_lash window when IMs are received"
 msgstr "ཨའི་ཨེམ་ཚུ་ ཐོབ་ཡོད་པའི་སྐབས་སུ་ ཝིན་ཌོ་ རིབ་སྟོན་འབད།(_l)"
 
-#: ../pidgin/gtkprefs.c:1505
+#: ../pidgin/gtkprefs.c:1499
 msgid "Resize incoming custom smileys"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1509
+#: ../pidgin/gtkprefs.c:1503
 msgid "Maximum size:"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1523
+#: ../pidgin/gtkprefs.c:1517
 msgid "Minimum input area height in lines:"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1531
+#: ../pidgin/gtkprefs.c:1525
 msgid "Font"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1533
+#: ../pidgin/gtkprefs.c:1527
 msgid "Use font from _theme"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1544
+#: ../pidgin/gtkprefs.c:1538
 msgid "Conversation _font:"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1554
+#: ../pidgin/gtkprefs.c:1548
 msgid "Default Formatting"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1572
+#: ../pidgin/gtkprefs.c:1566
 msgid ""
 "This is how your outgoing message text will appear when you use protocols "
 "that support formatting."
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1682
+#: ../pidgin/gtkprefs.c:1676
 msgid "Cannot start proxy configuration program."
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1695
+#: ../pidgin/gtkprefs.c:1689
 msgid "Cannot start browser configuration program."
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1730
+#: ../pidgin/gtkprefs.c:1724
 msgid "Disabled"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1732
+#: ../pidgin/gtkprefs.c:1726
 #, c-format
 msgid "Use _automatically detected IP address: %s"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1758
+#: ../pidgin/gtkprefs.c:1752
 msgid "ST_UN server:"
 msgstr "ཨེསི་ཊི་ཡུ་ཨེན་ སར་བར།:(_U)"
 
-#: ../pidgin/gtkprefs.c:1770
+#: ../pidgin/gtkprefs.c:1764
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr "<span style=\"italic\">དཔེར་བརྗོད།: stunserver.org</span>"
 
-#: ../pidgin/gtkprefs.c:1785
+#: ../pidgin/gtkprefs.c:1779
 msgid "Public _IP:"
 msgstr "མི་མང་གི་ཨའི་པི: (_I)"
 
-#: ../pidgin/gtkprefs.c:1797
+#: ../pidgin/gtkprefs.c:1791
 msgid "Ports"
 msgstr "འདྲེན་ལམ་ཚུ།"
 
-#: ../pidgin/gtkprefs.c:1800
+#: ../pidgin/gtkprefs.c:1794
 msgid "_Enable automatic router port forwarding"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1805
+#: ../pidgin/gtkprefs.c:1799
 msgid "_Manually specify range of ports to listen on:"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1808
+#: ../pidgin/gtkprefs.c:1802
 msgid "_Start:"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1815
+#: ../pidgin/gtkprefs.c:1809
 msgid "_End:"
 msgstr ""
 
 #. TURN server
-#: ../pidgin/gtkprefs.c:1827
+#: ../pidgin/gtkprefs.c:1821
 msgid "Relay Server (TURN)"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1837
+#: ../pidgin/gtkprefs.c:1831
 msgid "_TURN server:"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1840
+#: ../pidgin/gtkprefs.c:1834
 msgid "_UDP Port:"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1843
+#: ../pidgin/gtkprefs.c:1837
 msgid "T_CP Port:"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1846
+#: ../pidgin/gtkprefs.c:1840
 msgid "Use_rname:"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1848
+#: ../pidgin/gtkprefs.c:1842
 msgid "Pass_word:"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1879
+#: ../pidgin/gtkprefs.c:1873
 msgid "Seamonkey"
 msgstr "སི་མཱང་ཀི།"
 
-#: ../pidgin/gtkprefs.c:1880
+#: ../pidgin/gtkprefs.c:1874
 msgid "Opera"
 msgstr "གླུ་གཞས། (གླུ་གཞས་ཁང་)"
 
-#: ../pidgin/gtkprefs.c:1881
+#: ../pidgin/gtkprefs.c:1875
 msgid "Netscape"
 msgstr "ནེཊི་སིཀེཔ།"
 
-#: ../pidgin/gtkprefs.c:1882
+#: ../pidgin/gtkprefs.c:1876
 msgid "Mozilla"
 msgstr "མོ་ཛིལ་ལ།"
 
-#: ../pidgin/gtkprefs.c:1883
+#: ../pidgin/gtkprefs.c:1877
 msgid "Konqueror"
 msgstr "ཀོང་ཀོ་རར།"
 
-#: ../pidgin/gtkprefs.c:1884
+#: ../pidgin/gtkprefs.c:1878
 msgid "Google Chrome"
 msgstr ""
 
 #. Do not move the line below.  Code below expects gnome-open to be in
 #. * this list immediately after xdg-open!
-#: ../pidgin/gtkprefs.c:1887
+#: ../pidgin/gtkprefs.c:1881
 msgid "Desktop Default"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1888
+#: ../pidgin/gtkprefs.c:1882
 msgid "GNOME Default"
 msgstr "ཇི་ནོམ་སྔོན་སྒྲིག"
 
-#: ../pidgin/gtkprefs.c:1889
+#: ../pidgin/gtkprefs.c:1883
 msgid "Galeon"
 msgstr "གེ་ལི་ཨཱོན།"
 
-#: ../pidgin/gtkprefs.c:1890
+#: ../pidgin/gtkprefs.c:1884
 msgid "Firefox"
 msgstr "ཕ་ཡེར་ཕོགསི།"
 
-#: ../pidgin/gtkprefs.c:1891
+#: ../pidgin/gtkprefs.c:1885
 msgid "Firebird"
 msgstr "ཕ་ཡེར་བཱརཌི།"
 
-#: ../pidgin/gtkprefs.c:1892
+#: ../pidgin/gtkprefs.c:1886
 msgid "Epiphany"
 msgstr "ཨི་པི་ཕ་ནི།"
 
 #. Translators: please do not translate "chromium-browser" here!
-#: ../pidgin/gtkprefs.c:1894
+#: ../pidgin/gtkprefs.c:1888
 msgid "Chromium (chromium-browser)"
 msgstr ""
 
 #. Translators: please do not translate "chrome" here!
-#: ../pidgin/gtkprefs.c:1896
+#: ../pidgin/gtkprefs.c:1890
 msgid "Chromium (chrome)"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1905
+#: ../pidgin/gtkprefs.c:1899
 msgid "Manual"
 msgstr "ལག་དེབ།"
 
-#: ../pidgin/gtkprefs.c:1962
+#: ../pidgin/gtkprefs.c:1956
 msgid "Browser Selection"
 msgstr "བ་རའུ་ཟར་ སེལ་འཐུ།"
 
-#: ../pidgin/gtkprefs.c:1968
+#: ../pidgin/gtkprefs.c:1962
 msgid "Browser preferences are configured in GNOME preferences"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1987
+#: ../pidgin/gtkprefs.c:1981
 msgid "<b>Browser configuration program was not found.</b>"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1990
+#: ../pidgin/gtkprefs.c:1984
 msgid "Configure _Browser"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:2003
+#: ../pidgin/gtkprefs.c:1997
 msgid "_Browser:"
 msgstr "བ་རའུ་ཟར:(_B)"
 
-#: ../pidgin/gtkprefs.c:2011
+#: ../pidgin/gtkprefs.c:2005
 msgid "_Open link in:"
 msgstr "འབྲེལ་ལམ(ནང་)ཁ་ཕྱེ:(_O)"
 
-#: ../pidgin/gtkprefs.c:2013
+#: ../pidgin/gtkprefs.c:2007
 msgid "Browser default"
 msgstr "བརའུ་ཟར་ སྔོན་སྒྲིག"
 
-#: ../pidgin/gtkprefs.c:2014
+#: ../pidgin/gtkprefs.c:2008
 msgid "Existing window"
 msgstr "ཡོད་བཞིན་པའི་སྒོ་སྒྲིག"
 
-#: ../pidgin/gtkprefs.c:2016
+#: ../pidgin/gtkprefs.c:2010
 msgid "New tab"
 msgstr "མཆོང་ལྡེ་གསརཔ"
 
-#: ../pidgin/gtkprefs.c:2033
+#: ../pidgin/gtkprefs.c:2027
 #, c-format
 msgid ""
 "_Manual:\n"
@@ -18129,108 +18123,108 @@
 "ལག་དེབ:\n"
 "(ཡུ་ཨར་ཨེལ་ གྱི་དོན་ལུ་ %s)(_M)"
 
-#: ../pidgin/gtkprefs.c:2065
+#: ../pidgin/gtkprefs.c:2059
 msgid "Proxy Server"
 msgstr "པོརོག་སི་སར་བར།"
 
-#: ../pidgin/gtkprefs.c:2072
+#: ../pidgin/gtkprefs.c:2066
 msgid "Proxy preferences are configured in GNOME preferences"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:2094
+#: ../pidgin/gtkprefs.c:2088
 msgid "<b>Proxy configuration program was not found.</b>"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:2097
+#: ../pidgin/gtkprefs.c:2091
 msgid "Configure _Proxy"
 msgstr ""
 
 #. This is a global option that affects SOCKS4 usage even with
 #. * account-specific proxy settings
-#: ../pidgin/gtkprefs.c:2112
+#: ../pidgin/gtkprefs.c:2106
 msgid "Use remote _DNS with SOCKS4 proxies"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:2116
+#: ../pidgin/gtkprefs.c:2110
 msgid "Proxy t_ype:"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:2118
+#: ../pidgin/gtkprefs.c:2112
 msgid "No proxy"
 msgstr "པོརོག་སི་མེད།"
 
-#: ../pidgin/gtkprefs.c:2157
+#: ../pidgin/gtkprefs.c:2151
 msgid "P_ort:"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:2173
+#: ../pidgin/gtkprefs.c:2167
 msgid "User_name:"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:2234
+#: ../pidgin/gtkprefs.c:2228
 msgid "Log _format:"
 msgstr "རྩ་སྒྲིག་དྲན་དེབ་བཀོད།:(_f)"
 
-#: ../pidgin/gtkprefs.c:2239
+#: ../pidgin/gtkprefs.c:2233
 msgid "Log all _instant messages"
 msgstr "འཕྲལ་མྱུར་འཕྲིན་དོན་ཚུ་ཆ་མཉམ་རང་ དྲན་དེབ་བཀོད།(_i)"
 
-#: ../pidgin/gtkprefs.c:2241
+#: ../pidgin/gtkprefs.c:2235
 msgid "Log all c_hats"
 msgstr "ཁ་སླབ་ནི་ཚུ་གེ་ར་དྲན་དེབ་ནང་བཀོད(_h)"
 
-#: ../pidgin/gtkprefs.c:2243
+#: ../pidgin/gtkprefs.c:2237
 msgid "Log all _status changes to system log"
 msgstr ""
 "རིམ་ལུགས་དྲན་དེབ་ནང་ གནས་ཚད་བསྒྱུར་བཅོས་ཚུ་ཆ་མཉམ་རང་དྲན་དེབ་བཀོད།(_s)"
 
-#: ../pidgin/gtkprefs.c:2400
+#: ../pidgin/gtkprefs.c:2394
 msgid "Sound Selection"
 msgstr "སྒྲ་སྐད་སེལ་འཐུ།"
 
-#: ../pidgin/gtkprefs.c:2411
+#: ../pidgin/gtkprefs.c:2405
 #, c-format
 msgid "Quietest"
 msgstr "ཁུ་སིམ་སི།"
 
-#: ../pidgin/gtkprefs.c:2413
+#: ../pidgin/gtkprefs.c:2407
 #, c-format
 msgid "Quieter"
 msgstr "ཧེང་བཀལ་ཁུ་སིམ་སི།"
 
-#: ../pidgin/gtkprefs.c:2415
+#: ../pidgin/gtkprefs.c:2409
 #, c-format
 msgid "Quiet"
 msgstr "ཁུ་སིམ་སི།"
 
-#: ../pidgin/gtkprefs.c:2419
+#: ../pidgin/gtkprefs.c:2413
 #, c-format
 msgid "Loud"
 msgstr "སྐད་སྦོམ།"
 
-#: ../pidgin/gtkprefs.c:2421
+#: ../pidgin/gtkprefs.c:2415
 #, c-format
 msgid "Louder"
 msgstr "སྐད་སྦོམ་སྦེ།"
 
-#: ../pidgin/gtkprefs.c:2423
+#: ../pidgin/gtkprefs.c:2417
 #, c-format
 msgid "Loudest"
 msgstr "སྐད་སྦོམ་ཤོས།"
 
-#: ../pidgin/gtkprefs.c:2515
+#: ../pidgin/gtkprefs.c:2509
 msgid "_Method:"
 msgstr "ཐབས་ལམ:(_M)"
 
-#: ../pidgin/gtkprefs.c:2517
+#: ../pidgin/gtkprefs.c:2511
 msgid "Console beep"
 msgstr "མ་སྒྲོམ་བརྡ་སྐད།"
 
-#: ../pidgin/gtkprefs.c:2524
+#: ../pidgin/gtkprefs.c:2518
 msgid "No sounds"
 msgstr "སྒྲ་སྐད་ཚུ་མིན་འདུག"
 
-#: ../pidgin/gtkprefs.c:2537
+#: ../pidgin/gtkprefs.c:2531
 #, c-format
 msgid ""
 "Sound c_ommand:\n"
@@ -18239,84 +18233,84 @@
 "བརྡ་བཀོད་ཀྱི་སྒྲ་སྐད:\n"
 "(ཡིག་སྣོད་ཀྱི་དོན་ལུ་%s )(_o)"
 
-#: ../pidgin/gtkprefs.c:2545
+#: ../pidgin/gtkprefs.c:2539
 msgid "M_ute sounds"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:2548
+#: ../pidgin/gtkprefs.c:2542
 msgid "Sounds when conversation has _focus"
 msgstr "གྲོས་གླེང་ལུ་ཆེད་དམིགས་ཡོད་པའི་སྐབས་ སྒྲ་སྐད་འབྱུངམ་ཨིན(_f)"
 
-#: ../pidgin/gtkprefs.c:2550
+#: ../pidgin/gtkprefs.c:2544
 msgid "_Enable sounds:"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:2567
+#: ../pidgin/gtkprefs.c:2561
 msgid "V_olume:"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:2628
+#: ../pidgin/gtkprefs.c:2622
 msgid "Play"
 msgstr "གཏང་།"
 
-#: ../pidgin/gtkprefs.c:2656
+#: ../pidgin/gtkprefs.c:2650
 msgid "_Browse..."
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:2664
+#: ../pidgin/gtkprefs.c:2658
 msgid "_Reset"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:2716
+#: ../pidgin/gtkprefs.c:2711
 msgid "_Report idle time:"
 msgstr "ལས་མེད་དུས་ཚོད་སྙན་ཞུ་འབད།:(_R)"
 
-#: ../pidgin/gtkprefs.c:2721
+#: ../pidgin/gtkprefs.c:2716
 msgid "Based on keyboard or mouse use"
 msgstr "ལྡེ་སྒྲོམ་དང་ཡང་ན་ མཱའུསི་ལག་ལེན་ལུ་གཞི་བཞག་སྟེ།"
 
-#: ../pidgin/gtkprefs.c:2728
+#: ../pidgin/gtkprefs.c:2723
 msgid "_Minutes before becoming idle:"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:2734
+#: ../pidgin/gtkprefs.c:2729
 msgid "Change to this status when _idle:"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:2752
+#: ../pidgin/gtkprefs.c:2747
 msgid "_Auto-reply:"
 msgstr "རང་བཞིན་གྱི-ལན:(_A)"
 
-#: ../pidgin/gtkprefs.c:2756
+#: ../pidgin/gtkprefs.c:2751
 msgid "When both away and idle"
 msgstr "གཉིས་ཆ་རང་ ཕྱི་ཁ་དང་ལས་མེད་སྦེ་ཡོདཔ་པའི་སྐབས།"
 
 #. Signon status stuff
-#: ../pidgin/gtkprefs.c:2762
+#: ../pidgin/gtkprefs.c:2757
 msgid "Status at Startup"
 msgstr "འགོ་བཙུགས་ལུ་གནས་ཚད།"
 
-#: ../pidgin/gtkprefs.c:2764
+#: ../pidgin/gtkprefs.c:2759
 msgid "Use status from last _exit at startup"
 msgstr "འགོ་བཙུགས་གུ་ལུ་ ཕྱིར་ཐོན་མཇུག་ལས་ གནས་ཚད་ལག་ལེན་འཐབ།(_e)"
 
-#: ../pidgin/gtkprefs.c:2773
+#: ../pidgin/gtkprefs.c:2768
 msgid "Status to a_pply at startup:"
 msgstr "འགོ་བཙུགས་གུ་ལུ་འཇུག་སྤྱོད་འབད་ནིའི་གནས་ཚད།(_p)"
 
-#: ../pidgin/gtkprefs.c:2797
+#: ../pidgin/gtkprefs.c:2792
 msgid "Interface"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:2803
+#: ../pidgin/gtkprefs.c:2798
 msgid "Browser"
 msgstr "བརའུ་ཟར"
 
-#: ../pidgin/gtkprefs.c:2812
+#: ../pidgin/gtkprefs.c:2807
 msgid "Status / Idle"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:2813
+#: ../pidgin/gtkprefs.c:2808
 msgid "Themes"
 msgstr ""
 
@@ -18340,73 +18334,73 @@
 msgid "Block only the users below"
 msgstr "འོག་གི་ལག་ལེན་པ་ཚུ་རྐྱངམ་ཅིག་བཀག"
 
-#: ../pidgin/gtkprivacy.c:344
+#: ../pidgin/gtkprivacy.c:343
 msgid "Privacy"
 msgstr "སྒེར་གཙང་།"
 
-#: ../pidgin/gtkprivacy.c:354
+#: ../pidgin/gtkprivacy.c:353
 msgid "Changes to privacy settings take effect immediately."
 msgstr "སྒེར་གཙང་གཞི་སྒྲིག་བསྒྱུར་བཅོས་ཚུ་ དེ་འཕྲལ་ལས་ནུས་པ་ཐོབ་ཨིན།"
 
-#: ../pidgin/gtkprivacy.c:363
+#: ../pidgin/gtkprivacy.c:362
 msgid "Set privacy for:"
 msgstr "དོན་ལུ་སྒེར་གཙང་གཞི་སྒྲིག་འབད:"
 
 #. Remove All button
-#: ../pidgin/gtkprivacy.c:406
+#: ../pidgin/gtkprivacy.c:405
 msgid "Remove Al_l"
 msgstr ""
 
-#: ../pidgin/gtkprivacy.c:492 ../pidgin/gtkprivacy.c:509
+#: ../pidgin/gtkprivacy.c:491 ../pidgin/gtkprivacy.c:508
 msgid "Permit User"
 msgstr "ལག་ལེན་པ་ལུ་གནང་བ་བྱིན"
 
-#: ../pidgin/gtkprivacy.c:493
+#: ../pidgin/gtkprivacy.c:492
 msgid "Type a user you permit to contact you."
 msgstr ""
 "ཁྱོད་ཀྱིས་ཁྱོད་རང་དང་འབྲེལ་བ་འཐབ་ནིའི་གནང་བ་བྱིན་པའི་ལག་ལེན་པ་ལུ་ཡིག་དཔར་རྐྱབ"
 "ས།"
 
-#: ../pidgin/gtkprivacy.c:494
+#: ../pidgin/gtkprivacy.c:493
 msgid "Please enter the name of the user you wish to be able to contact you."
 msgstr ""
 "ཁྱོད་ཀྱིས་ ཁྱོད་དང་འབྲེལ་བ་འཐབ་ནིའི་རེ་འདོད་བསྐྱེད་མི་ "
 "ལག་ལེན་པའི་མིང་བཙུགས་གནང་།"
 
-#: ../pidgin/gtkprivacy.c:497 ../pidgin/gtkprivacy.c:513
+#: ../pidgin/gtkprivacy.c:496 ../pidgin/gtkprivacy.c:512
 msgid "_Permit"
 msgstr "གནང་བ་བྱིན་ནི།(_P)"
 
-#: ../pidgin/gtkprivacy.c:503
+#: ../pidgin/gtkprivacy.c:502
 #, c-format
 msgid "Allow %s to contact you?"
 msgstr "%sའདི་ཁྱོད་དང་འབྲེལ་བ་འཐབ་བཅུག་ནི་ཨིན་ན?"
 
-#: ../pidgin/gtkprivacy.c:505
+#: ../pidgin/gtkprivacy.c:504
 #, c-format
 msgid "Are you sure you wish to allow %s to contact you?"
 msgstr ""
 "ཁྱོད་ཀྱིས་ "
 "%sའདི་ཁྱོད་ལུ་འབྲེལ་བ་འཐབ་བཅུག་ནིའི་རེ་འདོད་བསྐྱེད་མི་འདི་ངེས་ཏིག་ཨིན་ན?"
 
-#: ../pidgin/gtkprivacy.c:534 ../pidgin/gtkprivacy.c:548
+#: ../pidgin/gtkprivacy.c:533 ../pidgin/gtkprivacy.c:547
 msgid "Block User"
 msgstr "ལག་ལེན་པ་བཀག"
 
-#: ../pidgin/gtkprivacy.c:535
+#: ../pidgin/gtkprivacy.c:534
 msgid "Type a user to block."
 msgstr "ལག་ལེན་པ་བཀག་ནི་ལུ་ཡིག་དཔར་རྐྱབས།"
 
-#: ../pidgin/gtkprivacy.c:536
+#: ../pidgin/gtkprivacy.c:535
 msgid "Please enter the name of the user you wish to block."
 msgstr "ཁྱོད་ཀྱིས་བཀག་ནིའི་རེ་འདོད་བསྐྱེད་མི་ལག་ལེན་པའི་མིང་བཙུགས་གནང་།"
 
-#: ../pidgin/gtkprivacy.c:544
+#: ../pidgin/gtkprivacy.c:543
 #, c-format
 msgid "Block %s?"
 msgstr "%sའདི་བཀག་ནི་ཨིན་ན?"
 
-#: ../pidgin/gtkprivacy.c:546
+#: ../pidgin/gtkprivacy.c:545
 #, c-format
 msgid "Are you sure you want to block %s?"
 msgstr "ཁྱོད་ཀྱིས་%sའདི་བཀག་ནིའི་ངེས་ཏིག་ཨིན་ན?"
@@ -18415,23 +18409,23 @@
 msgid "Apply"
 msgstr "འཇུག་སྤྱོད་འབད།"
 
-#: ../pidgin/gtkrequest.c:1578
+#: ../pidgin/gtkrequest.c:1552
 msgid "That file already exists"
 msgstr "ཡིག་སྣོད་དེ་ ཧེ་མ་ལས་རང་ཡོདཔ་ཨིན།"
 
-#: ../pidgin/gtkrequest.c:1579
+#: ../pidgin/gtkrequest.c:1553
 msgid "Would you like to overwrite it?"
 msgstr "ཁྱོད་ཀྱིས་སླར་སྲུང་འབད་ནི་ཨིན་ན?"
 
-#: ../pidgin/gtkrequest.c:1582
+#: ../pidgin/gtkrequest.c:1556
 msgid "Overwrite"
 msgstr "ཚབ་སྲུང་འབད།"
 
-#: ../pidgin/gtkrequest.c:1583
+#: ../pidgin/gtkrequest.c:1557
 msgid "Choose New Name"
 msgstr "མིང་གསརཔ་གཅིག་གདམ།"
 
-#: ../pidgin/gtkrequest.c:1684
+#: ../pidgin/gtkrequest.c:1656
 msgid "Select Folder..."
 msgstr "སྣོད་འཛིན་སེལ་འཐུ་འབད།..."
 
@@ -18530,7 +18524,7 @@
 msgid "Custom Smiley Manager"
 msgstr ""
 
-#: ../pidgin/gtkstatusbox.c:323
+#: ../pidgin/gtkstatusbox.c:322
 msgid "Select Buddy Icon"
 msgstr ""
 
@@ -18566,63 +18560,63 @@
 msgid "Facebook (XMPP)"
 msgstr ""
 
-#: ../pidgin/gtkutils.c:1483 ../pidgin/gtkutils.c:1512
+#: ../pidgin/gtkutils.c:1475 ../pidgin/gtkutils.c:1504
 #, c-format
 msgid "The following error has occurred loading %s: %s"
 msgstr "འོག་ལུ་ཡོད་པའི་འཛོལ་བ་གིས་  %s: %s མངོན་གསལ་འབད་ནི་བྱུང་ཡོདཔ་ཨིན།"
 
-#: ../pidgin/gtkutils.c:1486 ../pidgin/gtkutils.c:1514
+#: ../pidgin/gtkutils.c:1478 ../pidgin/gtkutils.c:1506
 msgid "Failed to load image"
 msgstr "གཟུགས་བརྙན་མངོན་གསལ་འབད་ནི་འདི་འཐུས་ཤོར་བྱུང་ཡོདཔ།"
 
-#: ../pidgin/gtkutils.c:1590
+#: ../pidgin/gtkutils.c:1582
 #, c-format
 msgid "Cannot send folder %s."
 msgstr "སྣོད་འཛིན་ %s འདི་གཏང་མི་ཚུགས་པས།"
 
-#: ../pidgin/gtkutils.c:1591
+#: ../pidgin/gtkutils.c:1583
 #, c-format
 msgid ""
 "%s cannot transfer a folder. You will need to send the files within "
 "individually."
 msgstr ""
 
-#: ../pidgin/gtkutils.c:1624 ../pidgin/gtkutils.c:1636
-#: ../pidgin/gtkutils.c:1643
+#: ../pidgin/gtkutils.c:1616 ../pidgin/gtkutils.c:1628
+#: ../pidgin/gtkutils.c:1635
 msgid "You have dragged an image"
 msgstr "ཁྱོད་ཀྱིས་ གཟུགས་བརྙན་གཅིག་འདྲུད་ཡོདཔ་ཨིན།"
 
-#: ../pidgin/gtkutils.c:1625
+#: ../pidgin/gtkutils.c:1617
 msgid ""
 "You can send this image as a file transfer, embed it into this message, or "
 "use it as the buddy icon for this user."
 msgstr ""
 
-#: ../pidgin/gtkutils.c:1631 ../pidgin/gtkutils.c:1651
+#: ../pidgin/gtkutils.c:1623 ../pidgin/gtkutils.c:1643
 msgid "Set as buddy icon"
 msgstr "ཆ་རོགས་ངོས་དཔར་སྦེ་གཞི་སྒྲིག་འབད།"
 
-#: ../pidgin/gtkutils.c:1632 ../pidgin/gtkutils.c:1652
+#: ../pidgin/gtkutils.c:1624 ../pidgin/gtkutils.c:1644
 msgid "Send image file"
 msgstr "གཟུགས་བརྙན་ཡིག་སྣོད་གཏང་།"
 
-#: ../pidgin/gtkutils.c:1633 ../pidgin/gtkutils.c:1652
+#: ../pidgin/gtkutils.c:1625 ../pidgin/gtkutils.c:1644
 msgid "Insert in message"
 msgstr "འཕྲིན་དོན་ནང་བཙུགས།"
 
-#: ../pidgin/gtkutils.c:1637
+#: ../pidgin/gtkutils.c:1629
 msgid "Would you like to set it as the buddy icon for this user?"
 msgstr ""
 "ཁྱོད་ཀྱིས་ ལག་ལེན་པའི་དོན་ལུ་ "
 "དེ་ཆ་རོགས་ངོས་དཔར་སྦེ་གཞི་སྒྲིག་འབད་དགོ་མནོཝ་མས་ག?"
 
-#: ../pidgin/gtkutils.c:1644
+#: ../pidgin/gtkutils.c:1636
 msgid ""
 "You can send this image as a file transfer, or use it as the buddy icon for "
 "this user."
 msgstr ""
 
-#: ../pidgin/gtkutils.c:1645
+#: ../pidgin/gtkutils.c:1637
 msgid ""
 "You can insert this image into this message, or use it as the buddy icon for "
 "this user"
@@ -18639,17 +18633,17 @@
 #. * nothing else? Probably not.  I'll just give an error and
 #. * return.
 #. The original patch sent the icon used by the launcher.  That's probably wrong
-#: ../pidgin/gtkutils.c:1702
+#: ../pidgin/gtkutils.c:1694
 msgid "Cannot send launcher"
 msgstr "གསར་བཙུགས་འབད་མི་གཏང་མི་ཚུགས་པས།"
 
-#: ../pidgin/gtkutils.c:1703
+#: ../pidgin/gtkutils.c:1695
 msgid ""
 "You dragged a desktop launcher. Most likely you wanted to send the target of "
 "this launcher instead of this launcher itself."
 msgstr ""
 
-#: ../pidgin/gtkutils.c:2283
+#: ../pidgin/gtkutils.c:2275
 #, c-format
 msgid ""
 "<b>File:</b> %s\n"
@@ -18660,48 +18654,48 @@
 "<b>ཡིག་སྣོད་ཀྱི་ཚད:</b> %s\n"
 "<b>གཟུགས་བརྙན་གྱི་ཚད:</b> %dx%d"
 
-#: ../pidgin/gtkutils.c:2528
+#: ../pidgin/gtkutils.c:2520
 #, c-format
 msgid "The file '%s' is too large for %s.  Please try a smaller image.\n"
 msgstr ""
 
-#: ../pidgin/gtkutils.c:2530
+#: ../pidgin/gtkutils.c:2522
 msgid "Icon Error"
 msgstr ""
 
-#: ../pidgin/gtkutils.c:2530
+#: ../pidgin/gtkutils.c:2522
 msgid "Could not set icon"
 msgstr ""
 
-#: ../pidgin/gtkutils.c:3241
+#: ../pidgin/gtkutils.c:3233
 msgid "_Open Link"
 msgstr ""
 
-#: ../pidgin/gtkutils.c:3248
+#: ../pidgin/gtkutils.c:3240
 msgid "_Copy Link Location"
 msgstr "འབྲེལ་ལམ་གནས་ཁོངས་འདྲ་བཤུས(_C)"
 
-#: ../pidgin/gtkutils.c:3270
+#: ../pidgin/gtkutils.c:3262
 msgid "_Copy Email Address"
 msgstr "གློག་འཕྲིན་འདྲ་བཤུས་རྐྱབས(_C)"
 
-#: ../pidgin/gtkutils.c:3392
+#: ../pidgin/gtkutils.c:3384
 msgid "_Open File"
 msgstr ""
 
-#: ../pidgin/gtkutils.c:3399
+#: ../pidgin/gtkutils.c:3391
 msgid "Open _Containing Directory"
 msgstr ""
 
-#: ../pidgin/gtkutils.c:3448 ../pidgin/gtkwhiteboard.c:754
+#: ../pidgin/gtkutils.c:3440 ../pidgin/gtkwhiteboard.c:754
 msgid "Save File"
 msgstr "ཡིག་སྣོད་སྲུངས།"
 
-#: ../pidgin/gtkutils.c:3468
+#: ../pidgin/gtkutils.c:3460
 msgid "_Play Sound"
 msgstr ""
 
-#: ../pidgin/gtkutils.c:3476
+#: ../pidgin/gtkutils.c:3468
 msgid "_Save File"
 msgstr ""
 
@@ -20069,55 +20063,55 @@
 msgid "Provides integration with Unity's messaging menu and launcher."
 msgstr ""
 
-#: ../pidgin/plugins/vvconfig.c:322
+#: ../pidgin/plugins/vvconfig.c:303
 msgid "Audio"
 msgstr ""
 
-#: ../pidgin/plugins/vvconfig.c:324
+#: ../pidgin/plugins/vvconfig.c:305
 msgid "Video"
 msgstr ""
 
-#: ../pidgin/plugins/vvconfig.c:335 ../pidgin/plugins/vvconfig.c:342
+#: ../pidgin/plugins/vvconfig.c:316 ../pidgin/plugins/vvconfig.c:323
 msgid "Output"
 msgstr ""
 
-#: ../pidgin/plugins/vvconfig.c:335 ../pidgin/plugins/vvconfig.c:342
+#: ../pidgin/plugins/vvconfig.c:316 ../pidgin/plugins/vvconfig.c:323
 msgid "_Plugin"
 msgstr ""
 
-#: ../pidgin/plugins/vvconfig.c:336 ../pidgin/plugins/vvconfig.c:343
+#: ../pidgin/plugins/vvconfig.c:317 ../pidgin/plugins/vvconfig.c:324
 msgid "_Device"
 msgstr ""
 
-#: ../pidgin/plugins/vvconfig.c:338 ../pidgin/plugins/vvconfig.c:345
+#: ../pidgin/plugins/vvconfig.c:319 ../pidgin/plugins/vvconfig.c:326
 msgid "Input"
 msgstr ""
 
-#: ../pidgin/plugins/vvconfig.c:338 ../pidgin/plugins/vvconfig.c:345
+#: ../pidgin/plugins/vvconfig.c:319 ../pidgin/plugins/vvconfig.c:326
 msgid "P_lugin"
 msgstr ""
 
-#: ../pidgin/plugins/vvconfig.c:339 ../pidgin/plugins/vvconfig.c:346
+#: ../pidgin/plugins/vvconfig.c:320 ../pidgin/plugins/vvconfig.c:327
 msgid "D_evice"
 msgstr ""
 
-#: ../pidgin/plugins/vvconfig.c:647
+#: ../pidgin/plugins/vvconfig.c:622
 msgid "DROP"
 msgstr ""
 
-#: ../pidgin/plugins/vvconfig.c:704
+#: ../pidgin/plugins/vvconfig.c:679
 msgid "Volume:"
 msgstr "སྐད་ཤུགས།:"
 
-#: ../pidgin/plugins/vvconfig.c:708
+#: ../pidgin/plugins/vvconfig.c:683
 msgid "Silence threshold:"
 msgstr ""
 
-#: ../pidgin/plugins/vvconfig.c:755
+#: ../pidgin/plugins/vvconfig.c:730
 msgid "Input and Output Settings"
 msgstr ""
 
-#: ../pidgin/plugins/vvconfig.c:760
+#: ../pidgin/plugins/vvconfig.c:735
 msgid "Microphone Test"
 msgstr ""
 
@@ -20130,18 +20124,18 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/vvconfig.c:801
+#: ../pidgin/plugins/vvconfig.c:776
 msgid "Voice/Video Settings"
 msgstr ""
 
 #. *< name
 #. *< version
-#: ../pidgin/plugins/vvconfig.c:803
+#: ../pidgin/plugins/vvconfig.c:778
 msgid "Configure your microphone and webcam."
 msgstr ""
 
 #. *< summary
-#: ../pidgin/plugins/vvconfig.c:804
+#: ../pidgin/plugins/vvconfig.c:779
 msgid "Configure microphone and webcam settings for voice/video calls."
 msgstr ""
 
diff -Nru language-pack-dz-base-14.04+20150804/data/dz/LC_MESSAGES/tasksel.po language-pack-dz-base-14.04+20160720/data/dz/LC_MESSAGES/tasksel.po
--- language-pack-dz-base-14.04+20150804/data/dz/LC_MESSAGES/tasksel.po	2015-08-14 07:53:55.000000000 +0000
+++ language-pack-dz-base-14.04+20160720/data/dz/LC_MESSAGES/tasksel.po	2016-07-20 16:44:53.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: 2015-08-04 07:04+0000\n"
-"X-Generator: Launchpad (build 17656)\n"
+"X-Launchpad-Export-Date: 2016-07-20 12:39+0000\n"
+"X-Generator: Launchpad (build 18147)\n"
 
 #: ../tasksel.pl:494
 msgid ""
Binary files /tmp/tmpgfmxT2/Z4jZ2jRpoA/language-pack-dz-base-14.04+20150804/data/extra.tar and /tmp/tmpgfmxT2/FtFdNLLLae/language-pack-dz-base-14.04+20160720/data/extra.tar differ
diff -Nru language-pack-dz-base-14.04+20150804/debian/changelog language-pack-dz-base-14.04+20160720/debian/changelog
--- language-pack-dz-base-14.04+20150804/debian/changelog	2015-08-14 07:53:49.000000000 +0000
+++ language-pack-dz-base-14.04+20160720/debian/changelog	2016-07-20 16:44:52.000000000 +0000
@@ -1,6 +1,6 @@
-language-pack-dz-base (1:14.04+20150804) trusty-proposed; urgency=low
+language-pack-dz-base (1:14.04+20160720) trusty-proposed; urgency=low
 
   * Initial Release.
 
- -- Ubuntu automatic language-pack builder <language-packs@ubuntu.com>  Fri, 14 Aug 2015 07:53:49 +0000
+ -- Ubuntu automatic language-pack builder <language-packs@ubuntu.com>  Wed, 20 Jul 2016 16:44:52 +0000