diff options
author | Guillem Jover <guillem@debian.org> | 2006-06-02 03:45:21 +0000 |
---|---|---|
committer | Guillem Jover <guillem@debian.org> | 2006-06-02 03:45:21 +0000 |
commit | ad13d218499a7224fc8b5904014aac17da757a09 (patch) | |
tree | ebe6987f7835c560ba3b461ac4a4209b49d548aa /po/nn.po | |
parent | 64dde93bd408ec661eefd9708a6803cbf23c394d (diff) | |
download | dpkg-ad13d218499a7224fc8b5904014aac17da757a09.tar.gz |
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
Diffstat (limited to 'po/nn.po')
-rw-r--r-- | po/nn.po | 46 |
1 files changed, 23 insertions, 23 deletions
@@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: debconf_nn\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: 2006-02-17 08:52+0200\n" "Last-Translator: Håvard Korsvoll <korsvoll@skulelinux.no>\n" "Language-Team: Norwegian nynorsk <i18n-nn@lister.ping.uio.no>\n" @@ -2320,16 +2320,16 @@ msgstr "" "informasjonen." #: 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" +#, fuzzy, c-format +msgid "conflicting actions -%c (--%s) and -%c (--%s)" msgstr "handlingar i konflikt --%s og --%s" -#: src/main.c:211 +#: src/main.c:212 #, c-format msgid "Warning: obsolete option `--%s'\n" msgstr "Åtvaring: Forelda val «%s»\n" -#: src/main.c:219 +#: src/main.c:220 #, c-format msgid "" "%s debugging option, --debug=<octal> or -D<octal>:\n" @@ -2368,27 +2368,27 @@ msgstr "" "Avlusingsvala kan kombinerast med logisk eller.\n" "Legg merke til at tydingane og verdiane kan verta endra.\n" -#: src/main.c:240 +#: src/main.c:241 msgid "--debug requires an octal argument" msgstr "-- debug krev ein oktal parameter" -#: src/main.c:264 +#: src/main.c:265 #, c-format msgid "null package name in --ignore-depends comma-separated list `%.250s'" msgstr "tomt pakkenamn i den kommadelte lista til --ignore-depends «%.250s»" -#: src/main.c:270 +#: src/main.c:271 #, c-format msgid "--ignore-depends requires a legal package name. `%.250s' is not; %s" msgstr "" "--ignore-depends krev eit gyldig pakkenamn. «%.250s» er ikkje gyldig; %s" -#: 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 "ugyldig heiltal for --%s: «%.250s»" -#: src/main.c:317 +#: src/main.c:318 #, fuzzy, c-format msgid "" "%s forcing options - control behaviour when problems found:\n" @@ -2466,55 +2466,55 @@ msgstr "" "alvorleg.\n" "Vala som er merkte med [*] er slått på som standard.\n" -#: src/main.c:362 +#: src/main.c:363 #, c-format msgid "unknown force/refuse option `%.*s'" msgstr "ukjend tvingings-/avvisingsval «%.*s»" -#: src/main.c:367 +#: src/main.c:368 #, fuzzy, c-format msgid "Warning: obsolete force/refuse option `%s'\n" msgstr "Åtvaring: Forelda val «%s»\n" -#: 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 "klarte ikkje utføra «malloc» i execbackend" -#: src/main.c:494 src/main.c:517 +#: src/main.c:495 src/main.c:518 msgid "couldn't strdup in execbackend" msgstr "klarte ikkje utføra «strdup» i execbackend" -#: src/main.c:522 +#: src/main.c:523 #, c-format msgid "failed to exec %s" msgstr "klarte ikkje køyra %s" -#: src/main.c:537 +#: src/main.c:538 #, fuzzy msgid "--command-fd takes one argument, not zero" msgstr "--command-fd tek éin parameter, ikkje null" -#: src/main.c:539 +#: src/main.c:540 #, fuzzy msgid "--command-fd only takes one argument" msgstr "--command-fd tek berre ein parameter" -#: src/main.c:541 +#: src/main.c:542 msgid "invalid number for --command-fd" msgstr "ugyldig tal for --command-fd" -#: src/main.c:543 +#: src/main.c:544 #, c-format msgid "couldn't open `%i' for stream" msgstr "klarte ikkje opna «%i» for straum" -#: src/main.c:568 +#: src/main.c:569 #, c-format msgid "unexpected eof before end of line %d" msgstr "uventa slutt på fil før slutten av linje %d" -#: 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 "treng eit handlingsval" @@ -3819,7 +3819,7 @@ msgstr "" "Skriv «dpkg-deb --help» for hjelp med endring av *.deb-filer.\n" "Skriv «dpkg --help» for hjelp med å installera og avinstallera pakkar." -#: dpkg-deb/main.c:191 +#: dpkg-deb/main.c:192 #, c-format msgid "unknown compression type `%s'!" msgstr "ukjend komprimeringstype «%s»!" |