From cfc11b2e1d8480727208b9d3e9577172de9a4038 Mon Sep 17 00:00:00 2001
From: David Kalnischkies <david@kalnischkies.de>
Date: Thu, 29 Dec 2016 12:55:12 +0100
Subject: 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!
---
 po/sl.po | 44 ++++++++++++++++++++++----------------------
 1 file changed, 22 insertions(+), 22 deletions(-)

(limited to 'po/sl.po')

diff --git a/po/sl.po b/po/sl.po
index e7d116873..6d99b4ea0 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -4,7 +4,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 0.5.5\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: 2012-06-27 21:29+0000\n"
 "Last-Translator: Andrej Znidarsic <andrej.znidarsic@gmail.com>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
@@ -416,8 +416,8 @@ msgstr ""
 #: apt-pkg/acquire.cc
 #, c-format
 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 ""
 
 #: apt-pkg/acquire.cc apt-pkg/clean.cc
@@ -1642,13 +1642,18 @@ msgstr "Ni mogoče pomanjšati zbirke za nadgradnjo"
 msgid " Done"
 msgstr " Opravljeno"
 
-#: apt-private/private-cachefile.cc
-msgid "You might want to run 'apt-get -f install' to correct these."
-msgstr "Če želite popraviti napake, poskusite pognati 'apt-get -f install'."
+#: apt-private/private-cachefile.cc apt-private/private-install.cc
+msgid "You might want to run 'apt --fix-broken install' to correct these."
+msgstr ""
+"Če želite popraviti napake, poskusite pognati 'apt --fix-broken install'."
 
-#: apt-private/private-cachefile.cc
-msgid "Unmet dependencies. Try using -f."
-msgstr "Nerešene odvisnosti. Poskusite uporabiti -f."
+#: 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 ""
+"Nerešene odvisnosti. Poskusite 'apt --fix-broken install' brez paketov (ali "
+"navedite rešitev)."
 
 #: apt-private/private-cacheset.cc apt-private/private-search.cc
 msgid "Sorting"
@@ -2027,18 +2032,6 @@ msgstr[1] "Uporabite '%s' za njegovo odstranitev."
 msgstr[2] "Uporabite '%s' za njuno odstranitev."
 msgstr[3] "Uporabite '%s' za njihovo odstranitev."
 
-#: apt-private/private-install.cc
-msgid "You might want to run 'apt-get -f install' to correct these:"
-msgstr "Poskusite zagnati 'apt-get -f install', če želite popraviti naslednje:"
-
-#: apt-private/private-install.cc
-msgid ""
-"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
-"solution)."
-msgstr ""
-"Nerešene odvisnosti. Poskusite 'apt-get -f install' brez paketov (ali "
-"navedite rešitev)."
-
 #: apt-private/private-install.cc
 #, fuzzy
 msgid "The following additional packages will be installed:"
@@ -2432,7 +2425,6 @@ msgid "Unpack command '%s' failed.\n"
 msgstr "Ukaz odpakiranja '%s' ni uspel.\n"
 
 #: apt-private/private-source.cc
-#, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "Izberite, če je paket 'dpkg-dev' nameščen.\n"
 
@@ -3809,6 +3801,14 @@ msgstr "Notranja napaka"
 msgid "Empty files can't be valid archives"
 msgstr "Prazne datoteke ne morejo biti veljavni arhivi"
 
+#~ msgid "Unmet dependencies. Try using --fix-broken."
+#~ msgstr "Nerešene odvisnosti. Poskusite uporabiti --fix-broken."
+
+#~ msgid "You might want to run 'apt --fix-broken install' to correct these:"
+#~ msgstr ""
+#~ "Poskusite zagnati 'apt --fix-broken install', če želite popraviti "
+#~ "naslednje:"
+
 #~ msgid "(not found)"
 #~ msgstr "(ni najdeno)"
 
-- 
cgit v1.2.3