Merge branch 'wip.i18n-nl' into master

Conflicts:
	po/nl.po

diff --combined po/nl.po
index fcedc508cbb9dd9bfda786ecda3f2659014551b5,a0dc658cd6968f07b2e12f039050093da7a9ef3b..b67f5f77eff3f2cf90a28549b0e87e55089a21b8
--- 1/po/nl.po
--- 2/po/nl.po
+++ b/po/nl.po
@@@ -2,14 -2,14 +2,14 @@@
  # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
  # This file is distributed under the same license as the dgit package.
  # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
- # Frans Spiesschaert <Frans.Spiesschaert@yucom.be>, 2018.
+ # Frans Spiesschaert <Frans.Spiesschaert@yucom.be>, 2018, 2019.
  #
  msgid ""
  msgstr ""
- "Project-Id-Version: dgit_8.1\n"
+ "Project-Id-Version: dgit_8.3\n"
  "Report-Msgid-Bugs-To: \n"
  "POT-Creation-Date: 2019-01-06 17:50+0000\n"
- "PO-Revision-Date: 2018-12-05 20:40+0100\n"
+ "PO-Revision-Date: 2019-01-19 20:58+0100\n"
  "Last-Translator: Frans Spiesschaert <Frans.Spiesschaert@yucom.be>\n"
  "Language-Team: Debian Dutch l10n Team <debian-l10n-dutch@lists.debian.org>\n"
  "Language: nl\n"
@@@ -35,6 -35,8 +35,7 @@@ msgstr "
  "waarschuwing: controles of functionaliteit overgeslagen wegens --force-%s\n"
  
  #: ../dgit:260
 -#| msgid "%s: package %s does not exist in suite %s\n"
+ #, perl-format
  msgid "%s: source package %s does not exist in suite %s\n"
  msgstr "%s: broncodepakket %s bestaat niet in suite %s\n"
  
@@@ -510,55 -512,58 +511,58 @@@ msgid "(nominal) distro being accessed
  msgstr "(nominale) distributie wordt benaderd"
  
  #: ../dgit:2202
- #, fuzzy, perl-format
+ #, perl-format
  #| msgid "opendir build-products-dir %s: %s"
  msgid "build-products-dir %s is not accessible: %s\n"
- msgstr "opendir build-products-dir %s: %s"
+ msgstr "build-products-dir %s is niet toegankelijk: %s\n"
  
  #: ../dgit:2227
  #, perl-format
  msgid ""
  "%s: found orig(s) in .. missing from build-products-dir, transferring:\n"
  msgstr ""
+ "%s: orig(s) gevonden in .. welke ontbreken in build-products-dir, bezig met "
+ "overbrengen:\n"
  
  #: ../dgit:2231
  #, perl-format
  msgid "check orig file %s in bpd %s: %s"
- msgstr ""
+ msgstr "controleer orig-bestand %s in bpd %s: %s"
  
  #: ../dgit:2233
- #, fuzzy, perl-format
+ #, perl-format
  #| msgid "missing field %s in %s"
  msgid "check orig file %s in ..: %s"
- msgstr "ontbrekend veld %s in %s"
+ msgstr "controleer orig-bestand %s in ..: %s"
  
  #: ../dgit:2236
  #, perl-format
  msgid "check targe of orig symlink %s in ..: %s"
- msgstr ""
+ msgstr "controleer doel van orig-symbolische koppeling %s in ..: %s"
  
  #: ../dgit:2245
- #, fuzzy, perl-format
+ #, perl-format
  #| msgid "%s: warning: removing from %s: %s\n"
  msgid "%s: cloned orig symlink from ..: %s\n"
- msgstr "%s: waarschuwing: wordt verwijderd van %s: %s\n"
+ msgstr "%s: orig-symbolische koppeling gekloond van ..: %s\n"
  
  #: ../dgit:2249
- #, fuzzy, perl-format
+ #, perl-format
  #| msgid "%s: warning: removing from %s: %s\n"
  msgid "%s: hardlinked orig from ..: %s\n"
- msgstr "%s: waarschuwing: wordt verwijderd van %s: %s\n"
+ msgstr "%s: vast gekoppelde orig van ..: %s\n"
  
  #: ../dgit:2252
- #, fuzzy, perl-format
+ #, perl-format
  #| msgid "failed to mkdir a playground %s: %s"
  msgid "failed to make %s a hardlink to %s: %s"
- msgstr "mkdir van een speelplaats %s mislukte: %s"
+ msgstr "niet gelukt om %s een vaste koppeling naar %s te maken: %s"
  
  #: ../dgit:2258
  #, perl-format
  msgid "%s: symmlinked orig from .. on other filesystem: %s\n"
  msgstr ""
+ "%s: symbolisch gekoppelde orig van .. op een ander bestandssysteem: %s\n"
  
  #: ../dgit:2290 ../dgit:2295
  #, perl-format
@@@ -773,7 -778,7 +777,7 @@@ msgstr "
  
  #: ../dgit:3099
  msgid "rewrite map"
 -msgstr "modificatieplan (rewrite map) "
 +msgstr "modificatieplan (rewrite map)"
  
  #: ../dgit:3106
  msgid "server's git history rewrite map contains a relevant entry!"
@@@ -1894,15 -1899,19 +1898,14 @@@ msgstr "
  "schonen."
  
  #: ../dgit:6302
 -#| msgid ""
 -#| "%s\n"
 -#| "If this is just missing .gitignore entries, use a different clean\n"
 -#| "mode, eg --clean=dpkg-source,no-check (-wdu/-wddu) to ignore them\n"
 -#| "or --clean=git (-wg/-wgf) to use `git clean' instead.\n"
  msgid ""
  "If this is just missing .gitignore entries, use a different clean\n"
  "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"
  
@@@ -1922,6 -1931,8 +1925,8 @@@ msgid "
  "tree contains uncommited, untracked, unignored files\n"
  "You can use --clean=git[-ff],always (-wga/-wgfa) to delete them."
  msgstr ""
+ "de boom bevat niet-vastgelegde, niet-gevolgde, niet-genegeerde bestanden\n"
+ "U kunt --clean=git[-ff],always (-wga/-wgfa) gebruiken om ze te verwijderen."
  
  #: ../dgit:6338
  msgid "tree contains uncommitted files (after running rules clean)"
@@@ -2381,6 -2392,17 +2386,6 @@@ msgid "unknown operation %s
  msgstr "onbekende bewerking %s"
  
  #: ../git-debrebase:44
 -#| msgid ""
 -#| "usages:\n"
 -#| "  git-debrebase [<options>] [--|-i <git rebase options...>]\n"
 -#| "  git-debrebase [<options>] status\n"
 -#| "  git-debrebase [<options>] prepush [--prose=...]\n"
 -#| "  git-debrebase [<options>] quick|conclude\n"
 -#| "  git-debrebase [<options>] new-upstream <new-version> [<details ...>]\n"
 -#| "  git-debrebase [<options>] convert-from-gbp [<upstream-commitish>]\n"
 -#| "  ...\n"
 -#| "See git-debrebase(1), git-debrebase(5), dgit-maint-debrebase(7) (in "
 -#| "dgit).\n"
  msgid ""
  "usages:\n"
  "  git-debrebase [<options>] [--|-i <git rebase options...>]\n"