Regenerate .pot files and merge .po files with them

1 files changed, 83 insertions, 78 deletions

diff --git a/po/pa.po b/po/pa.po
index 627e6ed59..a8fc0dc92 100644
--- a/po/pa.po
+++ b/po/pa.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-20 15:20+0200\n"
+"POT-Creation-Date: 2014-10-23 01:04+0200\n"
 "PO-Revision-Date: 2006-12-25 08:23+0530\n"
 "Last-Translator: A S Alam <apbrar@gmail.com>\n"
 "Language-Team: Punjabi <punjabi-users@lists.sf.net>\n"
@@ -1578,7 +1578,7 @@ msgstr ""
 #: utils/update-alternatives.c:1232 utils/update-alternatives.c:1310
 #: utils/update-alternatives.c:1461 utils/update-alternatives.c:1725
 #: utils/update-alternatives.c:2223 utils/update-alternatives.c:2271
-#: utils/update-alternatives.c:2446
+#: utils/update-alternatives.c:2449
 #, fuzzy, c-format
 #| msgid "unable to read %s: %s"
 msgid "cannot stat file '%s'"
@@ -1796,7 +1796,7 @@ msgstr ""
 #: 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:624 src/packages.c:266 src/querycmd.c:329
+#: src/main.c:322 src/main.c:624 src/packages.c:284 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
@@ -1807,7 +1807,7 @@ msgstr ""
 msgid "<standard output>"
 msgstr ""
 
-#: src/archives.c:1665 src/packages.c:267 src/querycmd.c:330
+#: src/archives.c:1665 src/packages.c:285 src/querycmd.c:330
 #: src/querycmd.c:429 src/querycmd.c:534 src/querycmd.c:613 src/select.c:102
 #: dpkg-split/main.c:170 dpkg-split/queue.c:234
 msgid "<standard error>"
@@ -2769,53 +2769,53 @@ msgstr ""
 msgid "overriding problem because --force enabled:"
 msgstr ""
 
-#: src/filesdb.c:236
+#: src/filesdb.c:237
 #, c-format
 msgid "unable to open files list file for package `%.250s'"
 msgstr ""
 
-#: src/filesdb.c:241
+#: src/filesdb.c:242
 #, fuzzy, c-format
 msgid ""
 "files list file for package '%.250s' missing; assuming package has no files "
 "currently installed"
 msgstr "ਕੰਟਰੋਲ ਫਾਇਲ ਜਾਣਕਾਰੀ `%.250s' ਹਟਾਉਣ ਲਈ ਅਸਫ਼ਲ"
 
-#: src/filesdb.c:253
+#: src/filesdb.c:254
 #, fuzzy, c-format
 msgid "unable to stat files list file for package '%.250s'"
 msgstr "ਕੰਟਰੋਲ ਫਾਇਲ ਜਾਣਕਾਰੀ `%.250s' ਹਟਾਉਣ ਲਈ ਅਸਫ਼ਲ"
 
-#: src/filesdb.c:257
+#: src/filesdb.c:258
 #, fuzzy, c-format
 msgid "files list for package '%.250s' is not a regular file"
 msgstr "ਕੰਟਰੋਲ ਫਾਇਲ ਜਾਣਕਾਰੀ `%.250s' ਹਟਾਉਣ ਲਈ ਅਸਫ਼ਲ"
 
-#: src/filesdb.c:265
+#: src/filesdb.c:266
 #, fuzzy, c-format
 msgid "reading files list for package '%.250s'"
 msgstr "ਕੰਟਰੋਲ ਫਾਇਲ ਜਾਣਕਾਰੀ `%.250s' ਹਟਾਉਣ ਲਈ ਅਸਫ਼ਲ"
 
-#: src/filesdb.c:275
+#: src/filesdb.c:276
 #, c-format
 msgid "files list file for package '%.250s' is missing final newline"
 msgstr ""
 
-#: src/filesdb.c:283
+#: src/filesdb.c:284
 #, c-format
 msgid "files list file for package `%.250s' contains empty filename"
 msgstr ""
 
-#: src/filesdb.c:294
+#: src/filesdb.c:295
 #, c-format
 msgid "error closing files list file for package `%.250s'"
 msgstr ""
 
-#: src/filesdb.c:406
+#: src/filesdb.c:407
 msgid "(Reading database ... "
 msgstr "(ਡਾਟਾਬੇਸ ਪੜ੍ਹਿਆ ਜਾ ਰਿਹਾ ਹੈ ... "
 
-#: src/filesdb.c:427
+#: src/filesdb.c:428
 #, fuzzy, c-format
 #| msgid "%d files and directories currently installed.)\n"
 msgid "%d file or directory currently installed.)\n"
@@ -3451,117 +3451,117 @@ msgstr ""
 msgid "unable to setenv for subprocesses"
 msgstr ""
 
-#: src/packages.c:115
+#: src/packages.c:119
 msgid ""
 "you must specify packages by their own names, not by quoting the names of "
 "the files they come in"
 msgstr ""
 
-#: src/packages.c:137
+#: src/packages.c:141
 #, c-format
 msgid "--%s --pending does not take any non-option arguments"
 msgstr ""
 
-#: src/packages.c:142 src/querycmd.c:451 src/querycmd.c:689
+#: src/packages.c:146 src/querycmd.c:451 src/querycmd.c:689
 #, c-format
 msgid "--%s needs at least one package name argument"
 msgstr ""
 
-#: src/packages.c:189
+#: src/packages.c:193
 #, c-format
 msgid "Package %s listed more than once, only processing once.\n"
 msgstr "ਪੈਕੇਜ %s ਇੱਕ ਤੋਂ ਵੱਧ ਵਾਰ ਵੇਖਾਇਆ ਗਿਆ ਹੈ, ਪਰ ਕਾਰਵਾਈ ਅਧੀਨ ਇੱਕ ਵਾਰ ਹੀ ਆਏਗਾ।\n"
 
-#: src/packages.c:193
+#: src/packages.c:197
 #, c-format
 msgid ""
 "More than one copy of package %s has been unpacked\n"
 " in this run !  Only configuring it once.\n"
 msgstr ""
 
-#: src/packages.c:244
+#: src/packages.c:262
 #, c-format
 msgid ""
 "package %.250s is not ready for trigger processing\n"
 " (current status `%.250s' with no pending triggers)"
 msgstr ""
 
-#: src/packages.c:346
+#: src/packages.c:364
 #, c-format
 msgid "  Package %s which provides %s is to be removed.\n"
 msgstr ""
 
-#: src/packages.c:350
+#: src/packages.c:368
 #, c-format
 msgid "  Package %s is to be removed.\n"
 msgstr "  ਪੈਕੇਜ %s ਹਟਾਇਆ ਜਾਵੇਗਾ।\n"
 
-#: src/packages.c:370
+#: src/packages.c:388
 #, fuzzy, c-format
 #| msgid "  Version of %s on system is %s.\n"
 msgid "  Version of %s on system, provided by %s, is %s.\n"
 msgstr "  %s ਦਾ ਸਿਸਟਮ ਉੱਤੇ %s ਵਰਜਨ ਹੈ।\n"
 
-#: src/packages.c:383
+#: src/packages.c:401
 #, c-format
 msgid "  Version of %s on system is %s.\n"
 msgstr "  %s ਦਾ ਸਿਸਟਮ ਉੱਤੇ %s ਵਰਜਨ ਹੈ।\n"
 
-#: src/packages.c:406
+#: src/packages.c:424
 #, c-format
 msgid "  Package %s which provides %s awaits trigger processing.\n"
 msgstr ""
 
-#: src/packages.c:411
+#: src/packages.c:429
 #, fuzzy, c-format
 msgid "  Package %s awaits trigger processing.\n"
 msgstr "  ਪੈਕੇਜ %s ਹਟਾਇਆ ਜਾਵੇਗਾ।\n"
 
-#: src/packages.c:458
+#: src/packages.c:476
 #, c-format
 msgid "also configuring '%s' (required by '%s')"
 msgstr ""
 
-#: src/packages.c:467
+#: src/packages.c:485
 #, c-format
 msgid "  Package %s which provides %s is not configured yet.\n"
 msgstr ""
 
-#: src/packages.c:471
+#: src/packages.c:489
 #, c-format
 msgid "  Package %s is not configured yet.\n"
 msgstr "  ਪੈਕੇਜ %s ਹਾਲੇ ਸੰਰਚਿਤ ਨਹੀਂ ਹੈ।\n"
 
-#: src/packages.c:482
+#: src/packages.c:500
 #, c-format
 msgid "  Package %s which provides %s is not installed.\n"
 msgstr ""
 
-#: src/packages.c:486
+#: src/packages.c:504
 #, c-format
 msgid "  Package %s is not installed.\n"
 msgstr "  ਪੈਕੇਜ %s ਇੰਸਟਾਲ ਨਹੀਂ ਹੈ।\n"
 
-#: src/packages.c:529
+#: src/packages.c:547
 #, fuzzy, c-format
 msgid " %s (%s) breaks %s and is %s.\n"
 msgstr "  %.250s %.250s ਦਿੰਦਾ ਹੈ ਅਤੇ %s ਹੈ\n"
 
-#: src/packages.c:536
+#: src/packages.c:554
 #, fuzzy, c-format
 msgid "  %s (%s) provides %s.\n"
 msgstr "  %.250s %s ਹੈ।\n"
 
-#: src/packages.c:541
+#: src/packages.c:559
 #, fuzzy, c-format
 msgid "  Version of %s to be configured is %s.\n"
 msgstr "  %s ਦਾ ਸਿਸਟਮ ਉੱਤੇ %s ਵਰਜਨ ਹੈ।\n"
 
-#: src/packages.c:688
+#: src/packages.c:706
 msgid " depends on "
 msgstr " ਨਿਰਭਰ ਹੈ "
 
-#: src/packages.c:694
+#: src/packages.c:712
 msgid "; however:\n"
 msgstr "; ਪਰ:\n"
 
@@ -4615,8 +4615,8 @@ msgid_plural "ignoring %d warnings about the control file(s)"
 msgstr[0] ""
 msgstr[1] ""
 
-#: dpkg-deb/build.c:407 utils/update-alternatives.c:2647
-#: utils/update-alternatives.c:2654
+#: dpkg-deb/build.c:407 utils/update-alternatives.c:2650
+#: utils/update-alternatives.c:2657
 #, c-format
 msgid "--%s needs a <directory> argument"
 msgstr ""
@@ -5791,7 +5791,7 @@ msgstr ""
 msgid "slave name"
 msgstr ""
 
-#: utils/update-alternatives.c:1186 utils/update-alternatives.c:2623
+#: utils/update-alternatives.c:1186 utils/update-alternatives.c:2626
 #, fuzzy, c-format
 #| msgid "duplicate slave %s"
 msgid "duplicate slave name %s"
@@ -5806,7 +5806,7 @@ msgstr ""
 msgid "slave link same as main link %s"
 msgstr ""
 
-#: utils/update-alternatives.c:1200 utils/update-alternatives.c:2630
+#: utils/update-alternatives.c:1200 utils/update-alternatives.c:2633
 #, c-format
 msgid "duplicate slave link %s"
 msgstr ""
@@ -6004,133 +6004,138 @@ msgstr ""
 msgid "renaming %s link from %s to %s"
 msgstr "  %s ਦਾ ਸਿਸਟਮ ਉੱਤੇ %s ਵਰਜਨ ਹੈ।\n"
 
-#: utils/update-alternatives.c:2334
+#: utils/update-alternatives.c:2335
 #, fuzzy, c-format
-msgid "using %s to provide %s (%s) in %s"
+msgid "using %s to provide %s (%s) in auto mode"
 msgstr "  %.250s %s ਹੈ।\n"
 
-#: utils/update-alternatives.c:2343
+#: utils/update-alternatives.c:2338
+#, fuzzy, c-format
+msgid "using %s to provide %s (%s) in manual mode"
+msgstr "  %.250s %s ਹੈ।\n"
+
+#: utils/update-alternatives.c:2346
 #, c-format
 msgid "updating alternative %s because link group %s has changed slave links"
 msgstr ""
 
-#: utils/update-alternatives.c:2348
+#: utils/update-alternatives.c:2351
 #, c-format
 msgid ""
 "forcing reinstallation of alternative %s because link group %s is broken"
 msgstr ""
 
-#: utils/update-alternatives.c:2356
+#: utils/update-alternatives.c:2359
 #, c-format
 msgid "current alternative %s is unknown, switching to %s for link group %s"
 msgstr ""
 
-#: utils/update-alternatives.c:2382
+#: utils/update-alternatives.c:2385
 #, c-format
 msgid "alternative name (%s) must not contain '/' and spaces"
 msgstr ""
 
-#: utils/update-alternatives.c:2390
+#: utils/update-alternatives.c:2393
 #, c-format
 msgid "alternative link is not absolute as it should be: %s"
 msgstr ""
 
-#: utils/update-alternatives.c:2398
+#: utils/update-alternatives.c:2401
 #, c-format
 msgid "alternative path is not absolute as it should be: %s"
 msgstr ""
 
-#: utils/update-alternatives.c:2429
+#: utils/update-alternatives.c:2432
 #, c-format
 msgid "alternative %s can't be master: it is a slave of %s"
 msgstr ""
 
-#: utils/update-alternatives.c:2437 utils/update-alternatives.c:2473
+#: utils/update-alternatives.c:2440 utils/update-alternatives.c:2476
 #, c-format
 msgid "alternative link %s is already managed by %s"
 msgstr ""
 
-#: utils/update-alternatives.c:2443
+#: utils/update-alternatives.c:2446
 #, c-format
 msgid "alternative path %s doesn't exist"
 msgstr ""
 
-#: utils/update-alternatives.c:2460
+#: utils/update-alternatives.c:2463
 #, c-format
 msgid "alternative %s can't be slave of %s: it is a master alternative"
 msgstr ""
 
-#: utils/update-alternatives.c:2464
+#: utils/update-alternatives.c:2467
 #, c-format
 msgid "alternative %s can't be slave of %s: it is a slave of %s"
 msgstr ""
 
-#: utils/update-alternatives.c:2484
+#: utils/update-alternatives.c:2487
 #, c-format
 msgid "alternative link %s is already managed by %s (slave of %s)"
 msgstr ""
 
-#: utils/update-alternatives.c:2529
+#: utils/update-alternatives.c:2532
 #, c-format
 msgid "unknown argument `%s'"
 msgstr "ਲਾਜ਼ਮੀ ਮੁੱਲ `%s'"
 
-#: utils/update-alternatives.c:2548
+#: utils/update-alternatives.c:2551
 msgid "--install needs <link> <name> <path> <priority>"
 msgstr "--install needs <link> <name> <path> <priority>"
 
-#: utils/update-alternatives.c:2554 utils/update-alternatives.c:2615
+#: utils/update-alternatives.c:2557 utils/update-alternatives.c:2618
 msgid "<link> and <path> can't be the same"
 msgstr ""
 
-#: utils/update-alternatives.c:2558
+#: utils/update-alternatives.c:2561
 msgid "priority must be an integer"
 msgstr "ਤਰਜੀਹ ਇੱਕ ਪੂਰਨ ਅੰਕ ਹੀ ਚਾਹੀਦਾ ਹੈ"
 
-#: utils/update-alternatives.c:2560
+#: utils/update-alternatives.c:2563
 #, fuzzy
 msgid "priority is out of range"
 msgstr "ਤਰਜੀਹ %s %s"
 
-#: utils/update-alternatives.c:2573
+#: utils/update-alternatives.c:2576
 #, c-format
 msgid "--%s needs <name> <path>"
 msgstr "--%s needs <name> <path>"
 
-#: utils/update-alternatives.c:2590
+#: utils/update-alternatives.c:2593
 #, c-format
 msgid "--%s needs <name>"
 msgstr "--%s needs <name>"
 
-#: utils/update-alternatives.c:2606
+#: utils/update-alternatives.c:2609
 msgid "--slave only allowed with --install"
 msgstr "--slave only allowed with --install"
 
-#: utils/update-alternatives.c:2608
+#: utils/update-alternatives.c:2611
 msgid "--slave needs <link> <name> <path>"
 msgstr "--slave needs <link> <name> <path>"
 
-#: utils/update-alternatives.c:2617
+#: utils/update-alternatives.c:2620
 #, c-format
 msgid "name %s is both primary and slave"
 msgstr ""
 
-#: utils/update-alternatives.c:2620
+#: utils/update-alternatives.c:2623
 #, c-format
 msgid "link %s is both primary and slave"
 msgstr ""
 
-#: utils/update-alternatives.c:2640
+#: utils/update-alternatives.c:2643
 #, fuzzy, c-format
 msgid "--%s needs a <file> argument"
 msgstr "--%s needs <name>"
 
-#: utils/update-alternatives.c:2666
+#: utils/update-alternatives.c:2669
 #, c-format
 msgid "unknown option `%s'"
 msgstr "ਅਣਜਾਣ ਚੋਣ `%s'"
 
-#: utils/update-alternatives.c:2671
+#: utils/update-alternatives.c:2674
 #, fuzzy
 msgid ""
 "need --display, --query, --list, --get-selections, --config, --set, --set-"
@@ -6139,50 +6144,50 @@ msgstr ""
 "need --display, --config, --set, --install, --remove, --all, --remove-all or "
 "--auto"
 
-#: utils/update-alternatives.c:2687 utils/update-alternatives.c:2693
+#: utils/update-alternatives.c:2690 utils/update-alternatives.c:2696
 #, fuzzy, c-format
 msgid "no alternatives for %s"
 msgstr "%s ਲਈ ਕੋਈ ਬਦਲ ਨਹੀਂ ਹੈ।"
 
-#: utils/update-alternatives.c:2710
+#: utils/update-alternatives.c:2713
 msgid "<standard input>"
 msgstr ""
 
-#: utils/update-alternatives.c:2732
+#: utils/update-alternatives.c:2735
 #, c-format
 msgid "alternative %s for %s not registered; not setting"
 msgstr ""
 
-#: utils/update-alternatives.c:2738 utils/update-alternatives.c:2744
+#: utils/update-alternatives.c:2741 utils/update-alternatives.c:2747
 #, c-format
 msgid "There is no program which provides %s."
 msgstr ""
 
-#: utils/update-alternatives.c:2746 utils/update-alternatives.c:2754
+#: utils/update-alternatives.c:2749 utils/update-alternatives.c:2757
 msgid "Nothing to configure."
 msgstr ""
 
-#: utils/update-alternatives.c:2752
+#: utils/update-alternatives.c:2755
 #, c-format
 msgid "There is only one alternative in link group %s (providing %s): %s"
 msgstr ""
 
-#: utils/update-alternatives.c:2762
+#: utils/update-alternatives.c:2765
 #, c-format
 msgid "alternative %s for %s not registered; not removing"
 msgstr ""
 
-#: utils/update-alternatives.c:2770
+#: utils/update-alternatives.c:2773
 #, c-format
 msgid "removing manually selected alternative - switching %s to auto mode"
 msgstr ""
 
-#: utils/update-alternatives.c:2795
+#: utils/update-alternatives.c:2798
 #, fuzzy, c-format
 msgid "automatic updates of %s/%s are disabled; leaving it alone"
 msgstr "%s ਲਈ ਆਟੋਮੈਟਿਕ ਅੱਪਡੇਟ ਆਯੋਗ ਹੈ, ਇਸ ਨੂੰ ਇੱਕਲਾ ਛੱਡਿਆ ਜਾਂਦਾ ਹੈ"
 
-#: utils/update-alternatives.c:2797
+#: utils/update-alternatives.c:2800
 #, c-format
 msgid "to return to automatic updates use '%s --auto %s'"
 msgstr ""