From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Fri, 1 Mar 2019 20:33:37 +0000 (+0000)
Subject: Merge branch 'wip.i18n-nl' into master
X-Git-Tag: archive/debian/8.4~11
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=af383382f97e6ab687b209e9117fe50dac6d37c8

Merge branch 'wip.i18n-nl' into master

Conflicts:
	po/nl.po
---

af383382f97e6ab687b209e9117fe50dac6d37c8
diff --cc po/nl.po
index fcedc508,a0dc658c..b67f5f77
--- a/po/nl.po
+++ b/po/nl.po
@@@ -35,6 -35,8 +35,7 @@@ msgstr "
  "waarschuwing: controles of functionaliteit overgeslagen wegens --force-%s\n"
  
  #: ../dgit:260
+ #, perl-format
 -#| msgid "%s: package %s does not exist in suite %s\n"
  msgid "%s: source package %s does not exist in suite %s\n"
  msgstr "%s: broncodepakket %s bestaat niet in suite %s\n"
  
@@@ -1899,10 -1909,9 +1903,9 @@@ msgid "
  "mode, eg --clean=dpkg-source,no-check (-wdn/-wddn) to ignore them\n"
  "or --clean=git (-wg/-wgf) to use `git clean' instead.\n"
  msgstr ""
- "%s\n"
  "Indien het enkel ontbrekende .gitignore-items betreft, gebruik dan een "
  "andere\n"
 -"clean-modus, bijv. --clean=dpkg-source,no-check (-wdu/-wddu) om deze te\n"
 +"clean-modus, bijv. --clean=dpkg-source,no-check (-wdn/-wddn) om deze te\n"
  "negeren, of --clean=git (-wg/-wgf) om in de plaats `git clean' te "
  "gebruiken.\n"