diff options
Diffstat (limited to 'debian/po/nl.po')
| -rw-r--r-- | debian/po/nl.po | 30 |
1 files changed, 22 insertions, 8 deletions
diff --git a/debian/po/nl.po b/debian/po/nl.po index fd6304a..b2c032c 100644 --- a/debian/po/nl.po +++ b/debian/po/nl.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: ucf_3.0031\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: 2016-01-12 23:14+0100\n" "Last-Translator: Frans Spiesschaert <Frans.Spiesschaert@yucom.be>\n" "Language-Team: Debian Dutch l10n Team <debian-l10n-dutch@lists.debian.org>\n" @@ -73,8 +73,10 @@ msgstr "toon een 3-voudig verschil tussen de beschikbare versies" #. Choices #. Translators, please keep translations *short* (less than 65 columns) #: ../templates:3001 -msgid "do a 3-way merge between available versions (experimental)" -msgstr "een 3-voudige samenvoeging tussen beschikbare versies (testfase)" +#, fuzzy +#| msgid "show a 3-way difference between available versions" +msgid "do a 3-way merge between available versions" +msgstr "toon een 3-voudig verschil tussen de beschikbare versies" #. Type: select #. Choices @@ -95,15 +97,24 @@ msgstr "Wat wilt u met het aangepaste configuratiebestand ${BASENAME} doen?" #. Type: select #. Description +#: ../templates:3002 +msgid "" +"A new version (${NEW}) of configuration file ${FILE} is available, but the " +"version installed currently has been locally modified." +msgstr "" +"Een nieuwe versie (${NEW}) van het configuratiebestand ${FILE} is " +"beschikbaar, maar de geïnstalleerde versie is lokaal gewijzigd." + #. Type: select #. Description -#: ../templates:3002 ../templates:4002 +#: ../templates:4002 +#, fuzzy #| msgid "" -#| "A new version of configuration file ${FILE} is available, but the version " -#| "installed currently has been locally modified." +#| "A new version (${NEW}) of configuration file ${FILE} is available, but " +#| "the version installed currently has been locally modified." msgid "" -"A new version (${NEW}) of configuration file ${FILE} is available, but the " -"version installed currently has been locally modified." +"${BASENAME}: A new version (${NEW}) of configuration file ${FILE} is " +"available, but the version installed currently has been locally modified." msgstr "" "Een nieuwe versie (${NEW}) van het configuratiebestand ${FILE} is " "beschikbaar, maar de geïnstalleerde versie is lokaal gewijzigd." @@ -140,6 +151,9 @@ msgstr "" "Het bestand `${dest_file}.${ERR_SUFFIX}' bevat een verslag van de mislukte " "samenvoeging van het configuratiebestand." +#~ msgid "do a 3-way merge between available versions (experimental)" +#~ msgstr "een 3-voudige samenvoeging tussen beschikbare versies (testfase)" + #~ msgid "" #~ "A new version of configuration file ${FILE} is available, but the version " #~ "installed currently has been locally modified." |