Regenerate .pot files and merge .po files with them

1 files changed, 40 insertions, 28 deletions

diff --git a/po/dz.po b/po/dz.po
index 474cd4582..cdcaedd1c 100644
--- a/po/dz.po
+++ b/po/dz.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.17.0\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2014-10-12 05:21+0200\n"
+"POT-Creation-Date: 2014-10-20 15:20+0200\n"
 "PO-Revision-Date: 2007-06-29 04:06+0530\n"
 "Last-Translator: Tshewang Norbu <bumthap2006@hotmail.com>\n"
 "Language-Team: Dzongkha <pgeyleg@dit.gov.bt>\n"
@@ -1898,7 +1898,7 @@ msgstr "--%s ལུ་ཉུང་མཐའ་ཐུམ་སྒྲིལ་ཡ�
 #: src/archives.c:1664 src/divertcmd.c:76 src/divertcmd.c:116
 #: src/enquiry.c:234 src/enquiry.c:355 src/enquiry.c:557 src/enquiry.c:559
 #: src/enquiry.c:572 src/enquiry.c:602 src/main.c:67 src/main.c:171
-#: src/main.c:322 src/main.c:622 src/packages.c:266 src/querycmd.c:329
+#: src/main.c:322 src/main.c:624 src/packages.c:266 src/querycmd.c:329
 #: src/querycmd.c:431 src/querycmd.c:473 src/querycmd.c:482 src/querycmd.c:528
 #: src/querycmd.c:612 src/querycmd.c:785 src/querycmd.c:833 src/select.c:101
 #: src/statcmd.c:64 src/statcmd.c:94 src/trigcmd.c:57 src/trigcmd.c:89
@@ -3637,48 +3637,48 @@ msgid "null package name in --%s comma-separated list '%.250s'"
 msgstr ""
 "སྟོང་ཆ་ཐུམ་སྒྲིལ་མིང་འདི་ --སྣང་མེད་-རྟེན་འབྲེལ་གྱི་ ལྷོད་རྟགས་-སོ་སོ་འཕྱལ་འཕྱལཝ་ཐོ་ཡིག་ `%.250s' ནང་།"
 
-#: src/main.c:464
+#: src/main.c:466
 #, c-format
 msgid "error executing hook '%s', exit code %d"
 msgstr ""
 
-#: src/main.c:503
+#: src/main.c:505
 msgid "status logger"
 msgstr ""
 
-#: src/main.c:515 src/main.c:545 src/main.c:780 dpkg-deb/info.c:311
+#: src/main.c:517 src/main.c:547 src/main.c:782 dpkg-deb/info.c:311
 #, fuzzy, c-format
 #| msgid "--contents takes exactly one argument"
 msgid "--%s takes exactly one argument"
 msgstr "--ནང་དོན་གྱིས་སྒྲུབ་རྟགས་གཅིག་ཏག་ཏག་སྦེ་འབགཔ་ཨིན།"
 
-#: src/main.c:525
+#: src/main.c:527
 #, c-format
 msgid "architecture '%s' is illegal: %s"
 msgstr ""
 
-#: src/main.c:528
+#: src/main.c:530
 #, c-format
 msgid "architecture '%s' is reserved and cannot be added"
 msgstr ""
 
-#: src/main.c:551
+#: src/main.c:553
 #, fuzzy, c-format
 #| msgid "cannot remove file `%.250s'"
 msgid "cannot remove non-foreign architecture '%s'"
 msgstr "ཡིག་སྣོད་ `%.250s' རྩ་བསྐྲད་གཏང་མི་ཚུགས།"
 
-#: src/main.c:562
+#: src/main.c:564
 #, c-format
 msgid "removing architecture '%s' currently in use by database"
 msgstr ""
 
-#: src/main.c:565
+#: src/main.c:567
 #, c-format
 msgid "cannot remove architecture '%s' currently in use by the database"
 msgstr ""
 
-#: src/main.c:610
+#: src/main.c:612
 #, c-format
 msgid ""
 "%s forcing options - control behaviour when problems found:\n"
@@ -3687,7 +3687,7 @@ msgid ""
 " Forcing things:\n"
 msgstr ""
 
-#: src/main.c:619
+#: src/main.c:621
 #, c-format
 msgid ""
 "\n"
@@ -3695,32 +3695,32 @@ msgid ""
 "Forcing options marked [*] are enabled by default.\n"
 msgstr ""
 
-#: src/main.c:634
+#: src/main.c:636
 #, c-format
 msgid "unknown force/refuse option `%.*s'"
 msgstr "མ་ཤེས་པའི་བང་བཙོང་ནི་/ངོས་ལེན་མི་འབད་ནིའི་གདམ་ཁ་ `%.*s'"
 
-#: src/main.c:643
+#: src/main.c:645
 #, fuzzy, c-format
 msgid "obsolete force/refuse option '%s'\n"
 msgstr "ཉེན་བརྡ་: ཕན་མེད་བང་བཙོང་ནི་/ངོས་ལེན་མི་འབད་ནི་གདམ་ཁ་ `%s'\n"
 
-#: src/main.c:785
+#: src/main.c:787
 #, c-format
 msgid "couldn't open `%i' for stream"
 msgstr "རྒྱུན་རིམ་གྱི་དོན་ལུ་ `%i' ཁ་ཕྱེ་མ་ཚུགས།"
 
-#: src/main.c:810
+#: src/main.c:812
 #, c-format
 msgid "unexpected eof before end of line %d"
 msgstr "གྲལ་ཐིག་ %d གི་མཇུག་གི་ཧེ་མ་རེ་བ་མེད་པའི་ཨི་ཨོ་ཨེཕ།"
 
-#: src/main.c:853 src/main.c:871 src/querycmd.c:875 src/statcmd.c:368
+#: src/main.c:855 src/main.c:873 src/querycmd.c:875 src/statcmd.c:368
 #: dpkg-deb/main.c:260 dpkg-split/main.c:166
 msgid "need an action option"
 msgstr "བྱ་བའི་གདམ་ཁ་གཅིག་དགོ"
 
-#: src/main.c:877 src/script.c:106
+#: src/main.c:879 src/script.c:106
 #, fuzzy
 msgid "unable to setenv for subprocesses"
 msgstr "vsnprintf སི་ཊེཊི་འབད་མ་ཚུགས།"
@@ -3798,52 +3798,52 @@ msgstr "  %s བྱིན་མི་ ཐུམ་སྒྲིལ་ %s འད�
 msgid "  Package %s awaits trigger processing.\n"
 msgstr "ཐུམ་སྒྲིལ་ %s འདི་རྩ་བསྐྲད་གཏང་ནི་ཨིན།\n"
 
-#: src/packages.c:440
+#: src/packages.c:458
 #, fuzzy, c-format
 #| msgid "dpkg: also configuring `%s' (required by `%s')\n"
 msgid "also configuring '%s' (required by '%s')"
 msgstr "dpkg:  `%s' རིམ་སྒྲིག་ཡང་འབད་དོ་(`%s' གི་དགོཔ་ཨིན།)\n"
 
-#: src/packages.c:449
+#: src/packages.c:467
 #, c-format
 msgid "  Package %s which provides %s is not configured yet.\n"
 msgstr "%s བྱིན་མི་ཐུམ་སྒྲིལ་ %s འདི་ད་ཚུན་རིམ་སྒྲིག་མ་འབད་བས།\n"
 
-#: src/packages.c:453
+#: src/packages.c:471
 #, c-format
 msgid "  Package %s is not configured yet.\n"
 msgstr "ཐུམ་སྒྲིལ་ %s འདི་ད་ཚུན་རིམ་སྒྲིག་མ་འབད་བས།\n"
 
-#: src/packages.c:464
+#: src/packages.c:482
 #, c-format
 msgid "  Package %s which provides %s is not installed.\n"
 msgstr "%s བྱིན་མི་ཐུམ་སྒྲིལ་ %s འདི་གཞི་བཙུགས་མ་འབད་བས།\n"
 
-#: src/packages.c:468
+#: src/packages.c:486
 #, c-format
 msgid "  Package %s is not installed.\n"
 msgstr "ཐུམ་སྒྲིལ་ %s འདི་གཞི་བཙུགས་མ་འབད་བས།\n"
 
-#: src/packages.c:511
+#: src/packages.c:529
 #, fuzzy, c-format
 msgid " %s (%s) breaks %s and is %s.\n"
 msgstr "%.250s གིས་ %.250s བྱིནམ་ཨིན་ དེ་ལས་འདི་ %s ཨིན།\n"
 
-#: src/packages.c:518
+#: src/packages.c:536
 #, fuzzy, c-format
 msgid "  %s (%s) provides %s.\n"
 msgstr "%s (ལས་སྦྱོར་ཡན་ལག): %s\n"
 
-#: src/packages.c:523
+#: src/packages.c:541
 #, fuzzy, c-format
 msgid "  Version of %s to be configured is %s.\n"
 msgstr "  རིམ་ལུགས་གུའི་ %s གི་ཐོན་རིམ་འདི་ %s ཨིན།\n"
 
-#: src/packages.c:670
+#: src/packages.c:688
 msgid " depends on "
 msgstr "ལུ་རྟེནམ་ཨིན།"
 
-#: src/packages.c:676
+#: src/packages.c:694
 msgid "; however:\n"
 msgstr "གང་ལྟར་ཡང་:\n"
 
@@ -4569,6 +4569,18 @@ msgstr ""
 msgid "triggers looping, abandoned"
 msgstr ""
 
+#: src/trigproc.c:349
+#, fuzzy, c-format
+#| msgid ""
+#| "dpkg: %s: dependency problems, but removing anyway as you requested:\n"
+#| "%s"
+msgid ""
+"%s: dependency problems, but processing triggers anyway as you requested:\n"
+"%s"
+msgstr ""
+"dpkg: %s: རྟེན་འབྲེལ་གྱི་དཀའ་ངལ་ཚུ་ དེ་འབདཝ་ད་ ཁྱོད་ཀྱི་ཞུ་བ་འབད་དོ་བཟུམ་སྦེ་རྩ བསྐྲད་གཏང་དོ:\n"
+"%s"
+
 #: src/trigproc.c:359
 #, fuzzy, c-format
 msgid "Processing triggers for %s (%s) ...\n"