Disambiguate error message about conflicting command line actions by

providing both long and short option names. Based on a suggestion by
Josip Rodin. Closes: #45575

1 files changed, 22 insertions, 22 deletions

diff --git a/po/dpkg.pot b/po/dpkg.pot
index f9b51b61f..28a140238 100644
--- a/po/dpkg.pot
+++ b/po/dpkg.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2006-05-31 06:03+0300\n"
+"POT-Creation-Date: 2006-06-02 03:58+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -2165,15 +2165,15 @@ msgstr ""
 
 #: src/main.c:206 src/query.c:544 dpkg-deb/main.c:177 dpkg-split/main.c:157
 #, c-format
-msgid "conflicting actions --%s and --%s"
+msgid "conflicting actions -%c (--%s) and -%c (--%s)"
 msgstr ""
 
-#: src/main.c:211
+#: src/main.c:212
 #, c-format
 msgid "Warning: obsolete option `--%s'\n"
 msgstr ""
 
-#: src/main.c:219
+#: src/main.c:220
 #, c-format
 msgid ""
 "%s debugging option, --debug=<octal> or -D<octal>:\n"
@@ -2194,26 +2194,26 @@ msgid ""
 "Note that the meanings and values are subject to change.\n"
 msgstr ""
 
-#: src/main.c:240
+#: src/main.c:241
 msgid "--debug requires an octal argument"
 msgstr ""
 
-#: src/main.c:264
+#: src/main.c:265
 #, c-format
 msgid "null package name in --ignore-depends comma-separated list `%.250s'"
 msgstr ""
 
-#: src/main.c:270
+#: src/main.c:271
 #, c-format
 msgid "--ignore-depends requires a legal package name. `%.250s' is not; %s"
 msgstr ""
 
-#: src/main.c:286 src/main.c:297
+#: src/main.c:287 src/main.c:298
 #, c-format
 msgid "invalid integer for --%s: `%.250s'"
 msgstr ""
 
-#: src/main.c:317
+#: src/main.c:318
 #, c-format
 msgid ""
 "%s forcing options - control behaviour when problems found:\n"
@@ -2253,53 +2253,53 @@ msgid ""
 "Forcing options marked [*] are enabled by default.\n"
 msgstr ""
 
-#: src/main.c:362
+#: src/main.c:363
 #, c-format
 msgid "unknown force/refuse option `%.*s'"
 msgstr ""
 
-#: src/main.c:367
+#: src/main.c:368
 #, c-format
 msgid "Warning: obsolete force/refuse option `%s'\n"
 msgstr ""
 
-#: src/main.c:490 src/main.c:500 src/main.c:508
+#: src/main.c:491 src/main.c:501 src/main.c:509
 msgid "couldn't malloc in execbackend"
 msgstr ""
 
-#: src/main.c:494 src/main.c:517
+#: src/main.c:495 src/main.c:518
 msgid "couldn't strdup in execbackend"
 msgstr ""
 
-#: src/main.c:522
+#: src/main.c:523
 #, c-format
 msgid "failed to exec %s"
 msgstr ""
 
-#: src/main.c:537
+#: src/main.c:538
 msgid "--command-fd takes one argument, not zero"
 msgstr ""
 
-#: src/main.c:539
+#: src/main.c:540
 msgid "--command-fd only takes one argument"
 msgstr ""
 
-#: src/main.c:541
+#: src/main.c:542
 msgid "invalid number for --command-fd"
 msgstr ""
 
-#: src/main.c:543
+#: src/main.c:544
 #, c-format
 msgid "couldn't open `%i' for stream"
 msgstr ""
 
-#: src/main.c:568
+#: src/main.c:569
 #, c-format
 msgid "unexpected eof before end of line %d"
 msgstr ""
 
-#: src/main.c:612 src/main.c:627 src/query.c:579 dpkg-deb/main.c:199
-#: dpkg-split/main.c:169
+#: src/main.c:613 src/main.c:628 src/query.c:580 dpkg-deb/main.c:200
+#: dpkg-split/main.c:170
 msgid "need an action option"
 msgstr ""
 
@@ -3509,7 +3509,7 @@ msgid ""
 "Type dpkg --help for help about installing and deinstalling packages."
 msgstr ""
 
-#: dpkg-deb/main.c:191
+#: dpkg-deb/main.c:192
 #, c-format
 msgid "unknown compression type `%s'!"
 msgstr ""