expand -f to --fix-broken in error messages

Users end up believing that this is a --force mode as -f is common for
that, but apt doesn't have such a mode and --fix-broken is really not
about forcing something but actually trying to fix the breakage which
tends to be the result of a user forcing something on its system via
low-level forced dpkg calls.

Example: The "common" pattern of "dpkg -i ./foo.deb; apt install -f" is
nowadays far better dealt with via "apt install ./foo.deb".

And while at it the two places handing out this suggestion are changed
to use the same strings to avoid needless translation work in the future
and the suggestion uses 'apt' instead of 'apt-get' as this will be run
interactively by a user, so its a good opportunity to showcase what we
can do and will allow us to be more helpful to the user.

Closes: #709092
Thanks: Kristian Glass for initial patch!

1 files changed, 28 insertions, 25 deletions

diff --git a/po/nl.po b/po/nl.po
index bf8436293..8a258c5b5 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 1..3~rc4\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2016-11-25 23:46+0100\n"
+"POT-Creation-Date: 2016-12-29 13:23+0100\n"
 "PO-Revision-Date: 2016-09-16 10:56+0200\n"
 "Last-Translator: Frans Spiesschaert <Frans.Spiesschaert@yucom.be>\n"
 "Language-Team: Debian Dutch l10n Team <debian-l10n-dutch@lists.debian.org>\n"
@@ -436,10 +436,13 @@ msgstr ""
 "Geen zandbakgebruiker '%s' op het systeem; kan voorrechten niet laten vallen"
 
 #: apt-pkg/acquire.cc
-#, c-format
+#, fuzzy, c-format
+#| msgid ""
+#| "Can't drop privileges for downloading as file '%s' couldn't be accessed "
+#| "by user '%s'."
 msgid ""
-"Can't drop privileges for downloading as file '%s' couldn't be accessed by "
-"user '%s'."
+"Download is performed unsandboxed as root as file '%s' couldn't be accessed "
+"by user '%s'."
 msgstr ""
 "Kan voorrechten voor het downloaden niet laten vallen, gezien bestand '%s' "
 "niet door gebruiker '%s' kon benaderd worden."
@@ -1706,13 +1709,18 @@ msgstr "Kon de verzameling op te waarderen pakketten niet minimaliseren"
 msgid " Done"
 msgstr " Klaar"
 
-#: apt-private/private-cachefile.cc
-msgid "You might want to run 'apt-get -f install' to correct these."
-msgstr "U kunt 'apt-get -f install' uitvoeren om dit op te lossen."
+#: apt-private/private-cachefile.cc apt-private/private-install.cc
+msgid "You might want to run 'apt --fix-broken install' to correct these."
+msgstr "U kunt 'apt --fix-broken install' uitvoeren om dit op te lossen."
 
-#: apt-private/private-cachefile.cc
-msgid "Unmet dependencies. Try using -f."
-msgstr "Er zijn vereisten waaraan niet voldaan is. Probeer -f te gebruiken."
+#: apt-private/private-cachefile.cc apt-private/private-install.cc
+msgid ""
+"Unmet dependencies. Try 'apt --fix-broken install' with no packages (or "
+"specify a solution)."
+msgstr ""
+"Er zijn niet-voldane vereisten. U kunt best 'apt --fix-broken install' "
+"uitvoeren zonder pakketten op te geven, (of u kunt zelf een oplossing "
+"specificeren)."
 
 #: apt-private/private-cacheset.cc apt-private/private-search.cc
 msgid "Sorting"
@@ -2094,20 +2102,6 @@ msgstr[0] "Gebruik '%s' om het te verwijderen."
 msgstr[1] "Gebruik '%s' om ze te verwijderen."
 
 #: apt-private/private-install.cc
-msgid "You might want to run 'apt-get -f install' to correct these:"
-msgstr ""
-"U wilt waarschijnlijk 'apt-get -f install' uitvoeren om de volgende zaken op "
-"te lossen:"
-
-#: apt-private/private-install.cc
-msgid ""
-"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
-"solution)."
-msgstr ""
-"Er zijn niet-voldane vereisten. U kunt best 'apt-get -f install' uitvoeren "
-"zonder pakketten op te geven, (of u kunt zelf een oplossing specificeren)."
-
-#: apt-private/private-install.cc
 msgid "The following additional packages will be installed:"
 msgstr "De volgende extra pakketten zullen geïnstalleerd worden:"
 
@@ -2504,7 +2498,6 @@ msgid "Unpack command '%s' failed.\n"
 msgstr "Uitpakopdracht '%s' is mislukt.\n"
 
 #: apt-private/private-source.cc
-#, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "Gelieve na te gaan of het pakket 'dpkg-dev' geïnstalleerd is.\n"
 
@@ -3931,6 +3924,16 @@ msgstr "Interne fout"
 msgid "Empty files can't be valid archives"
 msgstr "Lege bestanden kunnen geen geldige archieven zijn"
 
+#~ msgid "Unmet dependencies. Try using --fix-broken."
+#~ msgstr ""
+#~ "Er zijn vereisten waaraan niet voldaan is. Probeer --fix-broken te "
+#~ "gebruiken."
+
+#~ msgid "You might want to run 'apt --fix-broken install' to correct these:"
+#~ msgstr ""
+#~ "U wilt waarschijnlijk 'apt --fix-broken install' uitvoeren om de volgende "
+#~ "zaken op te lossen:"
+
 #~ msgid "Failed to fetch %s  %s\n"
 #~ msgstr "Ophalen van %s is mislukt  %s\n"