diff options
Diffstat (limited to 'debian/po/da.po')
| -rw-r--r-- | debian/po/da.po | 31 |
1 files changed, 23 insertions, 8 deletions
diff --git a/debian/po/da.po b/debian/po/da.po index 403ca0b..ba3fc19 100644 --- a/debian/po/da.po +++ b/debian/po/da.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: ucf debconf template\n" "Report-Msgid-Bugs-To: ucf@packages.debian.org\n" -"POT-Creation-Date: 2014-05-07 01:28-0700\n" +"POT-Creation-Date: 2018-02-16 15:56-0800\n" "PO-Revision-Date: 2014-05-08 17:34+0000\n" "Last-Translator: Joe Hansen <joedalton2@yahoo.dk>\n" "Language-Team: Danish <debian-l10n-danish@lists.debian.org>\n" @@ -73,9 +73,10 @@ msgstr "vis 3-vejs forskelle mellem de tilgængelige udgaver af filen" #. Choices #. Translators, please keep translations *short* (less than 65 columns) #: ../templates:3001 -msgid "do a 3-way merge between available versions (experimental)" -msgstr "" -"udfør en 3-vejs fletning mellem tilgængelige versioner (eksperimentelt)" +#, fuzzy +#| msgid "show a 3-way difference between available versions" +msgid "do a 3-way merge between available versions" +msgstr "vis 3-vejs forskelle mellem de tilgængelige udgaver af filen" #. Type: select #. Choices @@ -96,9 +97,7 @@ msgstr "Hvad vil du gøre med ændret opsætningsfil ${BASENAME}?" #. Type: select #. Description -#. Type: select -#. Description -#: ../templates:3002 ../templates:4002 +#: ../templates:3002 msgid "" "A new version (${NEW}) of configuration file ${FILE} is available, but the " "version installed currently has been locally modified." @@ -106,6 +105,20 @@ msgstr "" "En ny version (${NEW}) af opsætningsfilen ${FILE} er tilgængelig, men den " "installerede version er blevet ændret lokalt." +#. Type: select +#. Description +#: ../templates:4002 +#, fuzzy +#| msgid "" +#| "A new version (${NEW}) of configuration file ${FILE} is available, but " +#| "the version installed currently has been locally modified." +msgid "" +"${BASENAME}: A new version (${NEW}) of configuration file ${FILE} is " +"available, but the version installed currently has been locally modified." +msgstr "" +"En ny version (${NEW}) af opsætningsfilen ${FILE} er tilgængelig, men den " +"installerede version er blevet ændret lokalt." + #. Type: note #. Description #: ../templates:5001 @@ -138,4 +151,6 @@ msgstr "" "Filen `${dest_file}.${ERR_SUFFIX}' har en post over den mislykkede " "sammenføjning af opsætningsfilen." - +#~ msgid "do a 3-way merge between available versions (experimental)" +#~ msgstr "" +#~ "udfør en 3-vejs fletning mellem tilgængelige versioner (eksperimentelt)" |