summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Kalnischkies <david@kalnischkies.de>2016-12-29 12:55:12 +0100
committerDavid Kalnischkies <david@kalnischkies.de>2016-12-31 02:29:20 +0100
commitcfc11b2e1d8480727208b9d3e9577172de9a4038 (patch)
tree3e9e1a65269ebf6eed634c2d2b79e8a0683c1b3d
parentabbe74b2b4690b9138da94d26a7e45ad80a3bf6c (diff)
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!
-rw-r--r--apt-private/private-cachefile.cc5
-rw-r--r--apt-private/private-install.cc4
-rw-r--r--doc/guide.dbk2
-rw-r--r--doc/po/apt-doc.pot11
-rw-r--r--doc/po/de.po19
-rw-r--r--doc/po/es.po19
-rw-r--r--doc/po/fr.po20
-rw-r--r--doc/po/it.po19
-rw-r--r--doc/po/ja.po19
-rw-r--r--doc/po/nl.po21
-rw-r--r--doc/po/pl.po22
-rw-r--r--doc/po/pt.po19
-rw-r--r--doc/po/pt_BR.po11
-rw-r--r--po/apt-all.pot27
-rw-r--r--po/ar.po40
-rw-r--r--po/ast.po41
-rw-r--r--po/bg.po42
-rw-r--r--po/bs.po32
-rw-r--r--po/ca.po36
-rw-r--r--po/cs.po47
-rw-r--r--po/cy.po45
-rw-r--r--po/da.po41
-rw-r--r--po/de.po41
-rw-r--r--po/dz.po43
-rw-r--r--po/el.po43
-rw-r--r--po/es.po50
-rw-r--r--po/eu.po43
-rw-r--r--po/fi.po42
-rw-r--r--po/fr.po46
-rw-r--r--po/gl.po41
-rw-r--r--po/he.po12
-rw-r--r--po/hu.po50
-rw-r--r--po/it.po44
-rw-r--r--po/ja.po53
-rw-r--r--po/km.po40
-rw-r--r--po/ko.po44
-rw-r--r--po/ku.po27
-rw-r--r--po/lt.po43
-rw-r--r--po/mr.po43
-rw-r--r--po/nb.po42
-rw-r--r--po/ne.po41
-rw-r--r--po/nl.po53
-rw-r--r--po/nn.po44
-rw-r--r--po/pl.po44
-rw-r--r--po/pt.po47
-rw-r--r--po/pt_BR.po46
-rw-r--r--po/ro.po43
-rw-r--r--po/ru.po49
-rw-r--r--po/sk.po42
-rw-r--r--po/sl.po44
-rw-r--r--po/sv.po46
-rw-r--r--po/th.po41
-rw-r--r--po/tl.po46
-rw-r--r--po/tr.po52
-rw-r--r--po/uk.po46
-rw-r--r--po/vi.po43
-rw-r--r--po/zh_CN.po46
-rw-r--r--po/zh_TW.po41
-rwxr-xr-xtest/integration/test-bug-686346-package-missing-architecture8
-rwxr-xr-xtest/integration/test-parse-all-archs-into-cache4
60 files changed, 1081 insertions, 1034 deletions
diff --git a/apt-private/private-cachefile.cc b/apt-private/private-cachefile.cc
index 32cad1c33..77090f8eb 100644
--- a/apt-private/private-cachefile.cc
+++ b/apt-private/private-cachefile.cc
@@ -108,10 +108,9 @@ bool CacheFile::CheckDeps(bool AllowBroken)
}
else
{
- c1out << _("You might want to run 'apt-get -f install' to correct these.") << endl;
+ c1out << _("You might want to run 'apt --fix-broken install' to correct these.") << endl;
ShowBroken(c1out,*this,true);
-
- return _error->Error(_("Unmet dependencies. Try using -f."));
+ return _error->Error(_("Unmet dependencies. Try 'apt --fix-broken install' with no packages (or specify a solution)."));
}
return true;
diff --git a/apt-private/private-install.cc b/apt-private/private-install.cc
index 761e4d175..e3fe46960 100644
--- a/apt-private/private-install.cc
+++ b/apt-private/private-install.cc
@@ -657,9 +657,9 @@ bool DoCacheManipulationFromCommandLine(CommandLine &CmdL, std::vector<std::stri
packages */
if (BrokenFix == true && Cache->BrokenCount() != 0)
{
- c1out << _("You might want to run 'apt-get -f install' to correct these:") << std::endl;
+ c1out << _("You might want to run 'apt --fix-broken install' to correct these.") << std::endl;
ShowBroken(c1out,Cache,false);
- return _error->Error(_("Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a solution)."));
+ return _error->Error(_("Unmet dependencies. Try 'apt --fix-broken install' with no packages (or specify a solution)."));
}
if (Fix != NULL)
diff --git a/doc/guide.dbk b/doc/guide.dbk
index 80937164e..e7ab5ad87 100644
--- a/doc/guide.dbk
+++ b/doc/guide.dbk
@@ -327,7 +327,7 @@ will be printed out and <command>apt-get</command> will refuse to run.
# apt-get check
Reading Package Lists... Done
Building Dependency Tree... Done
-You might want to run apt-get -f install' to correct these.
+You might want to run 'apt --fix-broken install' to correct these.
Sorry, but the following packages have unmet dependencies:
9fonts: Depends: xlib6g but it is not installed
uucp: Depends: mailx but it is not installed
diff --git a/doc/po/apt-doc.pot b/doc/po/apt-doc.pot
index 7c3ca984c..04fe2a529 100644
--- a/doc/po/apt-doc.pot
+++ b/doc/po/apt-doc.pot
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt-doc 1.4~beta2\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2016-12-08 15:20+0100\n"
+"POT-Creation-Date: 2016-12-29 13:24+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -1386,6 +1386,13 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml:1
msgid ""
+"Only process architecture-independent build-dependencies. Configuration "
+"Item: <literal>APT::Get::Indep-Only</literal>."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml:1
+msgid ""
"Ignore if packages can't be authenticated and don't prompt about it. This "
"can be useful while working with local repositories, but is a huge security "
"risk if data authenticity isn't ensured in another way by the user itself. "
@@ -7239,7 +7246,7 @@ msgid ""
"# apt-get check\n"
"Reading Package Lists... Done\n"
"Building Dependency Tree... Done\n"
-"You might want to run apt-get -f install' to correct these.\n"
+"You might want to run 'apt --fix-broken install' to correct these.\n"
"Sorry, but the following packages have unmet dependencies:\n"
" 9fonts: Depends: xlib6g but it is not installed\n"
" uucp: Depends: mailx but it is not installed\n"
diff --git a/doc/po/de.po b/doc/po/de.po
index 22c7a4827..4c5c8f139 100644
--- a/doc/po/de.po
+++ b/doc/po/de.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt-doc 1.3\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2016-12-08 15:20+0100\n"
+"POT-Creation-Date: 2016-12-29 13:24+0100\n"
"PO-Revision-Date: 2016-11-15 21:51+0200\n"
"Last-Translator: Chris Leick <c.leick@vollbio.de>\n"
"Language-Team: German <debian-l10n-german@lists.debian.org>\n"
@@ -1933,6 +1933,19 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml
+#, fuzzy
+#| msgid ""
+#| "Only process architecture-dependent build-dependencies. Configuration "
+#| "Item: <literal>APT::Get::Arch-Only</literal>."
+msgid ""
+"Only process architecture-independent build-dependencies. Configuration "
+"Item: <literal>APT::Get::Indep-Only</literal>."
+msgstr ""
+"verarbeitet nur architekturabhängige Bauabhängigkeiten. "
+"Konfigurationselement: <literal>APT::Get::Arch-Only</literal>."
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml
msgid ""
"Ignore if packages can't be authenticated and don't prompt about it. This "
"can be useful while working with local repositories, but is a huge security "
@@ -10371,7 +10384,7 @@ msgid ""
"# apt-get check\n"
"Reading Package Lists... Done\n"
"Building Dependency Tree... Done\n"
-"You might want to run apt-get -f install' to correct these.\n"
+"You might want to run 'apt --fix-broken install' to correct these.\n"
"Sorry, but the following packages have unmet dependencies:\n"
" 9fonts: Depends: xlib6g but it is not installed\n"
" uucp: Depends: mailx but it is not installed\n"
@@ -10388,7 +10401,7 @@ msgstr ""
"Paketlisten werden gelesen … Fertig Fertig\n"
"Abhängigkeitsbaum wird aufgebaut\n"
"Status-Informationen einlesen … Fertig Fertig\n"
-"Probieren Sie „apt-get -f install“, um diese zu korrigieren:\n"
+"Probieren Sie „apt --fix-broken install“, um diese zu korrigieren:\n"
"Die folgenden Pakete haben nichterfüllte Abhängigkeiten:\n"
" 9fonts: Hängt ab: xlib6g ist aber nicht installiert\n"
" uucp: Hängt ab: mailx ist aber nicht installiert\n"
diff --git a/doc/po/es.po b/doc/po/es.po
index d4b6faa03..61c52417a 100644
--- a/doc/po/es.po
+++ b/doc/po/es.po
@@ -38,7 +38,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt-doc 1.0.5\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2016-12-08 15:20+0100\n"
+"POT-Creation-Date: 2016-12-29 13:24+0100\n"
"PO-Revision-Date: 2014-07-04 01:31+0200\n"
"Last-Translator: Omar Campagne <ocampagne@gmail.com>\n"
"Language-Team: Debian l10n Spanish <debian-l10n-spanish@lists.debian.org>\n"
@@ -2018,6 +2018,19 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml
+#, fuzzy
+#| msgid ""
+#| "Only process architecture-dependent build-dependencies. Configuration "
+#| "Item: <literal>APT::Get::Arch-Only</literal>."
+msgid ""
+"Only process architecture-independent build-dependencies. Configuration "
+"Item: <literal>APT::Get::Indep-Only</literal>."
+msgstr ""
+"Procesa sólo las dependencias de construcción dependientes de la "
+"arquitectura. Opción de configuración: <literal>APT::Get::Arch-Only</literal>"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml
msgid ""
"Ignore if packages can't be authenticated and don't prompt about it. This "
"can be useful while working with local repositories, but is a huge security "
@@ -10218,7 +10231,7 @@ msgid ""
"# apt-get check\n"
"Reading Package Lists... Done\n"
"Building Dependency Tree... Done\n"
-"You might want to run apt-get -f install' to correct these.\n"
+"You might want to run 'apt --fix-broken install' to correct these.\n"
"Sorry, but the following packages have unmet dependencies:\n"
" 9fonts: Depends: xlib6g but it is not installed\n"
" uucp: Depends: mailx but it is not installed\n"
@@ -10234,7 +10247,7 @@ msgstr ""
"# apt-get check\n"
"Leyendo lista de paquetes... Hecho\n"
"Creando árbol de dependencias... Hecho\n"
-"Tal vez quiera ejecutar 'apt-get -f install' para corregirlo.\n"
+"Tal vez quiera ejecutar 'apt --fix-broken install' para corregirlo.\n"
"Los siguientes paquetes tienen dependencias incumplidas:\n"
" 9fonts: Depende: xlib6g pero no está instalado\n"
" uucp: Depende: mailx pero no está instalado\n"
diff --git a/doc/po/fr.po b/doc/po/fr.po
index 3aca07fcd..ce269342b 100644
--- a/doc/po/fr.po
+++ b/doc/po/fr.po
@@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt-doc 1.0.5\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2016-12-08 15:20+0100\n"
+"POT-Creation-Date: 2016-12-29 13:24+0100\n"
"PO-Revision-Date: 2014-11-15 17:26+0100\n"
"Last-Translator: Jean-Pierre Giraud <jean-pierregiraud@neuf.fr>\n"
"Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -1938,6 +1938,20 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml
+#, fuzzy
+#| msgid ""
+#| "Only process architecture-dependent build-dependencies. Configuration "
+#| "Item: <literal>APT::Get::Arch-Only</literal>."
+msgid ""
+"Only process architecture-independent build-dependencies. Configuration "
+"Item: <literal>APT::Get::Indep-Only</literal>."
+msgstr ""
+"Ne traiter que les dépendances de construction dépendantes de "
+"l'architecture. Élément de configuration : <literal>APT::Get::Arch-Only</"
+"literal>."
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml
msgid ""
"Ignore if packages can't be authenticated and don't prompt about it. This "
"can be useful while working with local repositories, but is a huge security "
@@ -10208,7 +10222,7 @@ msgid ""
"# apt-get check\n"
"Reading Package Lists... Done\n"
"Building Dependency Tree... Done\n"
-"You might want to run apt-get -f install' to correct these.\n"
+"You might want to run 'apt --fix-broken install' to correct these.\n"
"Sorry, but the following packages have unmet dependencies:\n"
" 9fonts: Depends: xlib6g but it is not installed\n"
" uucp: Depends: mailx but it is not installed\n"
@@ -10224,7 +10238,7 @@ msgstr ""
"# apt-get check\n"
"Lecture de la liste des paquets... Fait\n"
"Construction de l'arbre des dépendances... Fait\n"
-"Vous pouvez lancer « apt-get -f install » pour corriger ces problèmes.\n"
+"Vous pouvez lancer « apt --fix-broken install » pour corriger ces problèmes.\n"
"Les paquets suivants contiennent des dépendances non satisfaites :\n"
" 9fonts: Depends: xlib6g mais il n'est pas installé\n"
" uucp: Depends: mailx mais il n'est pas installé\n"
diff --git a/doc/po/it.po b/doc/po/it.po
index bdf977643..337230a69 100644
--- a/doc/po/it.po
+++ b/doc/po/it.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt-doc 1.0.5\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2016-12-08 15:20+0100\n"
+"POT-Creation-Date: 2016-12-29 13:24+0100\n"
"PO-Revision-Date: 2015-12-27 21:26+0200\n"
"Last-Translator: Beatrice Torracca <beatricet@libero.it>\n"
"Language-Team: Italian <debian-l10n-italian@lists.debian.org>\n"
@@ -1987,6 +1987,19 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml
+#, fuzzy
+#| msgid ""
+#| "Only process architecture-dependent build-dependencies. Configuration "
+#| "Item: <literal>APT::Get::Arch-Only</literal>."
+msgid ""
+"Only process architecture-independent build-dependencies. Configuration "
+"Item: <literal>APT::Get::Indep-Only</literal>."
+msgstr ""
+"Elabora solo le dipendenze di compilazione dipendenti dall'architettura. "
+"Voce di configurazione: <literal>APT::Get::Arch-Only</literal>."
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml
msgid ""
"Ignore if packages can't be authenticated and don't prompt about it. This "
"can be useful while working with local repositories, but is a huge security "
@@ -10358,7 +10371,7 @@ msgid ""
"# apt-get check\n"
"Reading Package Lists... Done\n"
"Building Dependency Tree... Done\n"
-"You might want to run apt-get -f install' to correct these.\n"
+"You might want to run 'apt --fix-broken install' to correct these.\n"
"Sorry, but the following packages have unmet dependencies:\n"
" 9fonts: Depends: xlib6g but it is not installed\n"
" uucp: Depends: mailx but it is not installed\n"
@@ -10374,7 +10387,7 @@ msgstr ""
"# apt-get check\n"
"Lettura elenco pacchetti... Fatto\n"
"Generazione albero delle dipendenze... Fatto\n"
-"È utile eseguire \"run apt-get -f install\" per correggere ciò.\n"
+"È utile eseguire \"run apt --fix-broken install\" per correggere ciò.\n"
"I seguenti pacchetti hanno dipendenze non soddisfatte:\n"
" 9fonts: Dipende: xlib6g ma non è installato\n"
" uucp: Dipende: mailx ma non è installato\n"
diff --git a/doc/po/ja.po b/doc/po/ja.po
index 1481f9a9c..052d55584 100644
--- a/doc/po/ja.po
+++ b/doc/po/ja.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt-doc 1.3\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2016-12-08 15:20+0100\n"
+"POT-Creation-Date: 2016-12-29 13:24+0100\n"
"PO-Revision-Date: 2016-09-03 03:30+0900\n"
"Last-Translator: Takuma Yamada <tyamada@takumayamada.com>\n"
"Language-Team: Japanese <debian-japanese@lists.debian.org>\n"
@@ -1907,6 +1907,19 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml
+#, fuzzy
+#| msgid ""
+#| "Only process architecture-dependent build-dependencies. Configuration "
+#| "Item: <literal>APT::Get::Arch-Only</literal>."
+msgid ""
+"Only process architecture-independent build-dependencies. Configuration "
+"Item: <literal>APT::Get::Indep-Only</literal>."
+msgstr ""
+"構築依存関係の解決を、アーキテクチャに依存したもののみ行います。設定項目: "
+"<literal>APT::Get::Arch-Only</literal>"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml
msgid ""
"Ignore if packages can't be authenticated and don't prompt about it. This "
"can be useful while working with local repositories, but is a huge security "
@@ -9895,7 +9908,7 @@ msgid ""
"# apt-get check\n"
"Reading Package Lists... Done\n"
"Building Dependency Tree... Done\n"
-"You might want to run apt-get -f install' to correct these.\n"
+"You might want to run 'apt --fix-broken install' to correct these.\n"
"Sorry, but the following packages have unmet dependencies:\n"
" 9fonts: Depends: xlib6g but it is not installed\n"
" uucp: Depends: mailx but it is not installed\n"
@@ -9912,7 +9925,7 @@ msgstr ""
"パッケージリストを読み込んでいます... 完了\n"
"依存関係ツリーを作成しています\n"
"状態情報を読み取っています... 完了\n"
-"これらを直すためには 'apt-get -f install' を実行する必要があるかもしれません。\n"
+"これらを直すためには 'apt --fix-broken install' を実行する必要があるかもしれません。\n"
"下のパッケージには満たせない依存関係があります:\n"
" 9fonts: 依存: xlib6g しかし、インストールされていません\n"
" uucp: 依存: mailx しかし、インストールされていません\n"
diff --git a/doc/po/nl.po b/doc/po/nl.po
index 89b37bb6d..d42ac08cc 100644
--- a/doc/po/nl.po
+++ b/doc/po/nl.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt-doc 1.4~beta1-nl\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2016-12-28 12:38+0100\n"
+"POT-Creation-Date: 2016-12-29 13:24+0100\n"
"PO-Revision-Date: 2016-12-09 20:29+0100\n"
"Last-Translator: Frans Spiesschaert <Frans.Spiesschaert@yucom.be>\n"
"Language-Team: Debian Dutch l10n Team <debian-l10n-dutch@lists.debian.org>\n"
@@ -2004,6 +2004,19 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml
+#, fuzzy
+#| msgid ""
+#| "Only process architecture-dependent build-dependencies. Configuration "
+#| "Item: <literal>APT::Get::Arch-Only</literal>."
+msgid ""
+"Only process architecture-independent build-dependencies. Configuration "
+"Item: <literal>APT::Get::Indep-Only</literal>."
+msgstr ""
+"Enkel architectuurafhankelijke bouwvereisten verwerken. Configuratie-item: "
+"<literal>APT::Get::Arch-Only</literal>."
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml
msgid ""
"Ignore if packages can't be authenticated and don't prompt about it. This "
"can be useful while working with local repositories, but is a huge security "
@@ -10532,7 +10545,7 @@ msgid ""
"# apt-get check\n"
"Reading Package Lists... Done\n"
"Building Dependency Tree... Done\n"
-"You might want to run apt-get -f install' to correct these.\n"
+"You might want to run 'apt --fix-broken install' to correct these.\n"
"Sorry, but the following packages have unmet dependencies:\n"
" 9fonts: Depends: xlib6g but it is not installed\n"
" uucp: Depends: mailx but it is not installed\n"
@@ -10548,8 +10561,8 @@ msgstr ""
"# apt-get check\n"
"Pakketlijsten worden ingelezen... Klaar\n"
"Boom van vereisten wordt opgebouwd... Klaar\n"
-"You might want to run apt-get -f install' to correct these.\n"
-"(U zou 'apt-get -f install' kunnen uitvoeren om dit te repareren)\n"
+"You might want to run 'apt --fix-broken install' to correct these.\n"
+"(U zou 'apt --fix-broken install' kunnen uitvoeren om dit te repareren)\n"
"Sorry, but the following packages have unmet dependencies:\n"
"(Sorry, maar de volgende pakketten hebben niet-voldane vereisten:)\n"
" 9fonts: Depends: xlib6g but it is not installed\n"
diff --git a/doc/po/pl.po b/doc/po/pl.po
index 4060bbe50..391177666 100644
--- a/doc/po/pl.po
+++ b/doc/po/pl.po
@@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt-doc 1.0.5\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2016-12-08 15:20+0100\n"
+"POT-Creation-Date: 2016-12-29 13:24+0100\n"
"PO-Revision-Date: 2014-07-04 02:13+0200\n"
"Last-Translator: Robert Luberda <robert@debian.org>\n"
"Language-Team: Polish <manpages-pl-list@lists.sourceforge.net>\n"
@@ -2022,6 +2022,22 @@ msgstr ""
"komputera. Pozycja w pliku konfiguracyjnym: <literal>APT::Get::Arch-Only</"
"literal>."
+#
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml
+#, fuzzy
+#| msgid ""
+#| "Only process architecture-dependent build-dependencies. Configuration "
+#| "Item: <literal>APT::Get::Arch-Only</literal>."
+msgid ""
+"Only process architecture-independent build-dependencies. Configuration "
+"Item: <literal>APT::Get::Indep-Only</literal>."
+msgstr ""
+"Przetwarza tylko te pakiety z zależnościami wymaganymi do zbudowania pakietu "
+"ze źródeł (build-dependencies), które są zależnie od architektury "
+"komputera. Pozycja w pliku konfiguracyjnym: <literal>APT::Get::Arch-Only</"
+"literal>."
+
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml
msgid ""
@@ -9376,7 +9392,7 @@ msgid ""
"# apt-get check\n"
"Reading Package Lists... Done\n"
"Building Dependency Tree... Done\n"
-"You might want to run apt-get -f install' to correct these.\n"
+"You might want to run 'apt --fix-broken install' to correct these.\n"
"Sorry, but the following packages have unmet dependencies:\n"
" 9fonts: Depends: xlib6g but it is not installed\n"
" uucp: Depends: mailx but it is not installed\n"
@@ -9392,7 +9408,7 @@ msgstr ""
"# apt-get check\n"
"Czytanie list pakietów... Gotowe\n"
"Budowanie drzewa zależności... Gotowe\n"
-"Należy uruchomić \"apt-get -f install\", aby je naprawić.\n"
+"Należy uruchomić \"apt --fix-broken install\", aby je naprawić.\n"
"Następujące pakiety mają niespełnione zależności:\n"
" 9fonts: Wymaga: xlib6g ale nie jest zainstalowany\n"
" uucp: Wymaga: mailx ale nie jest zainstalowany\n"
diff --git a/doc/po/pt.po b/doc/po/pt.po
index a164727b1..82cc55800 100644
--- a/doc/po/pt.po
+++ b/doc/po/pt.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt-doc 1.0.7\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2016-12-08 15:20+0100\n"
+"POT-Creation-Date: 2016-12-29 13:24+0100\n"
"PO-Revision-Date: 2014-08-29 00:34+0100\n"
"Last-Translator: Américo Monteiro <a_monteiro@gmx.com>\n"
"Language-Team: Portuguese <traduz@debianpt.org>\n"
@@ -1961,6 +1961,19 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml
+#, fuzzy
+#| msgid ""
+#| "Only process architecture-dependent build-dependencies. Configuration "
+#| "Item: <literal>APT::Get::Arch-Only</literal>."
+msgid ""
+"Only process architecture-independent build-dependencies. Configuration "
+"Item: <literal>APT::Get::Indep-Only</literal>."
+msgstr ""
+"Apenas processa dependências de compilação dependentes da arquitectura. Item "
+"de Configuração: <literal>APT::Get::Arch-Only</literal>."
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml
msgid ""
"Ignore if packages can't be authenticated and don't prompt about it. This "
"can be useful while working with local repositories, but is a huge security "
@@ -10140,7 +10153,7 @@ msgid ""
"# apt-get check\n"
"Reading Package Lists... Done\n"
"Building Dependency Tree... Done\n"
-"You might want to run apt-get -f install' to correct these.\n"
+"You might want to run 'apt --fix-broken install' to correct these.\n"
"Sorry, but the following packages have unmet dependencies:\n"
" 9fonts: Depends: xlib6g but it is not installed\n"
" uucp: Depends: mailx but it is not installed\n"
@@ -10156,7 +10169,7 @@ msgstr ""
"# apt-get check\n"
"Reading Package Lists... Done\n"
"Building Dependency Tree... Done\n"
-"You might want to run apt-get -f install' to correct these.\n"
+"You might want to run 'apt --fix-broken install' to correct these.\n"
"Sorry, but the following packages have unmet dependencies:\n"
" 9fonts: Depends: xlib6g but it is not installed\n"
" uucp: Depends: mailx but it is not installed\n"
diff --git a/doc/po/pt_BR.po b/doc/po/pt_BR.po
index cf3065ee0..2789537fa 100644
--- a/doc/po/pt_BR.po
+++ b/doc/po/pt_BR.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt-doc 1.0.5\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2016-12-08 15:20+0100\n"
+"POT-Creation-Date: 2016-12-29 13:24+0100\n"
"PO-Revision-Date: 2004-09-20 17:02+0000\n"
"Last-Translator: André Luís Lopes <andrelop@debian.org>\n"
"Language-Team: <debian-l10n-portuguese@lists.debian.org>\n"
@@ -1360,6 +1360,13 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml
msgid ""
+"Only process architecture-independent build-dependencies. Configuration "
+"Item: <literal>APT::Get::Indep-Only</literal>."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml
+msgid ""
"Ignore if packages can't be authenticated and don't prompt about it. This "
"can be useful while working with local repositories, but is a huge security "
"risk if data authenticity isn't ensured in another way by the user itself. "
@@ -7548,7 +7555,7 @@ msgid ""
"# apt-get check\n"
"Reading Package Lists... Done\n"
"Building Dependency Tree... Done\n"
-"You might want to run apt-get -f install' to correct these.\n"
+"You might want to run 'apt --fix-broken install' to correct these.\n"
"Sorry, but the following packages have unmet dependencies:\n"
" 9fonts: Depends: xlib6g but it is not installed\n"
" uucp: Depends: mailx but it is not installed\n"
diff --git a/po/apt-all.pot b/po/apt-all.pot
index 5caea899a..c5b2952c1 100644
--- a/po/apt-all.pot
+++ b/po/apt-all.pot
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 1.4~beta2\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2016-12-08 15:20+0100\n"
+"POT-Creation-Date: 2016-12-29 13:23+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -400,8 +400,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
@@ -1576,12 +1576,14 @@ msgstr ""
msgid " Done"
msgstr ""
-#: apt-private/private-cachefile.cc
-msgid "You might want to run 'apt-get -f install' to correct these."
+#: apt-private/private-cachefile.cc apt-private/private-install.cc
+msgid "You might want to run 'apt --fix-broken install' to correct these."
msgstr ""
-#: apt-private/private-cachefile.cc
-msgid "Unmet dependencies. Try using -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 ""
#: apt-private/private-cacheset.cc apt-private/private-search.cc
@@ -1921,16 +1923,6 @@ msgstr[0] ""
msgstr[1] ""
#: apt-private/private-install.cc
-msgid "You might want to run 'apt-get -f install' to correct these:"
-msgstr ""
-
-#: apt-private/private-install.cc
-msgid ""
-"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
-"solution)."
-msgstr ""
-
-#: apt-private/private-install.cc
msgid "The following additional packages will be installed:"
msgstr ""
@@ -2303,7 +2295,6 @@ msgid "Unpack command '%s' failed.\n"
msgstr ""
#: apt-private/private-source.cc
-#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr ""
diff --git a/po/ar.po b/po/ar.po
index f5151dbbe..e62553919 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 1.0.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: 2006-10-20 21:28+0300\n"
"Last-Translator: Ossama M. Khayat <okhayat@yahoo.com>\n"
"Language-Team: Arabic <support@arabeyes.org>\n"
@@ -406,8 +406,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
@@ -1591,13 +1591,17 @@ msgstr "لم يمكن تقليص مجموعة الترقية"
msgid " Done"
msgstr " تم"
-#: apt-private/private-cachefile.cc
-msgid "You might want to run 'apt-get -f install' to correct these."
-msgstr "قد ترغب بتنفيذ الأمر '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 "قد ترغب بتنفيذ الأمر 'apt --fix-broken install' لتصحيح هذه."
-#: apt-private/private-cachefile.cc
-msgid "Unmet dependencies. Try using -f."
-msgstr "مُعتمدات غير مستوفاة. حاول استخدام -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 ""
+"مُعتمدات غير مستوفاة. جرب 'apt --fix-broken install' بدون أسماء حزم (أو حدّد "
+"حلاً)."
#: apt-private/private-cacheset.cc apt-private/private-search.cc
msgid "Sorting"
@@ -1947,17 +1951,6 @@ msgstr[0] ""
msgstr[1] ""
#: apt-private/private-install.cc
-msgid "You might want to run 'apt-get -f install' to correct these:"
-msgstr "قد ترغب بتشغيل 'apt-get -f install' لتصحيح هذه:"
-
-#: apt-private/private-install.cc
-msgid ""
-"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
-"solution)."
-msgstr ""
-"مُعتمدات غير مستوفاة. جرب 'apt-get -f install' بدون أسماء حزم (أو حدّد حلاً)."
-
-#: apt-private/private-install.cc
#, fuzzy
msgid "The following additional packages will be installed:"
msgstr "سيتم تثبيت الحزم الإضافيّة التالية:"
@@ -2337,7 +2330,6 @@ msgid "Unpack command '%s' failed.\n"
msgstr "أمر فك الحزمة '%s' فشل.\n"
#: apt-private/private-source.cc
-#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr ""
@@ -3622,6 +3614,12 @@ msgstr "خطأ داخلي"
msgid "Empty files can't be valid archives"
msgstr ""
+#~ msgid "Unmet dependencies. Try using --fix-broken."
+#~ msgstr "مُعتمدات غير مستوفاة. حاول استخدام --fix-broken."
+
+#~ msgid "You might want to run 'apt --fix-broken install' to correct these:"
+#~ msgstr "قد ترغب بتشغيل 'apt --fix-broken install' لتصحيح هذه:"
+
#~ msgid "(not found)"
#~ msgstr "(غير موجود)"
diff --git a/po/ast.po b/po/ast.po
index 2f5dc38d4..20f0d79fc 100644
--- a/po/ast.po
+++ b/po/ast.po
@@ -4,7 +4,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.7.18\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: 2010-10-02 23:35+0100\n"
"Last-Translator: Iñigo Varela <ivarela@softastur.org>\n"
"Language-Team: Asturian (ast)\n"
@@ -407,8 +407,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
@@ -1640,13 +1640,17 @@ msgstr "Nun pue amenorgase'l conxuntu d'actualización"
msgid " Done"
msgstr " Fecho"
-#: apt-private/private-cachefile.cc
-msgid "You might want to run 'apt-get -f install' to correct these."
-msgstr "Habríes d'executar 'apt-get -f install' para igualo."
+#: apt-private/private-cachefile.cc apt-private/private-install.cc
+msgid "You might want to run 'apt --fix-broken install' to correct these."
+msgstr "Habríes d'executar 'apt --fix-broken install' para igualo."
-#: apt-private/private-cachefile.cc
-msgid "Unmet dependencies. Try using -f."
-msgstr "Dependencies incumplíes. Téntalo usando -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 ""
+"Dependencies ensin cubrir. Tenta 'apt --fix-broken install' ensin paquetes "
+"(o conseña una solución)."
#: apt-private/private-cacheset.cc apt-private/private-search.cc
msgid "Sorting"
@@ -2011,18 +2015,6 @@ msgstr[0] "Usa '%s' pa desinstalalos."
msgstr[1] "Usa '%s' pa desinstalalos."
#: apt-private/private-install.cc
-msgid "You might want to run 'apt-get -f install' to correct these:"
-msgstr "Habríes d'executar 'apt-get -f install' para iguar estos:"
-
-#: apt-private/private-install.cc
-msgid ""
-"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
-"solution)."
-msgstr ""
-"Dependencies ensin cubrir. Tenta 'apt-get -f install' ensin paquetes (o "
-"conseña una solución)."
-
-#: apt-private/private-install.cc
#, fuzzy
msgid "The following additional packages will be installed:"
msgstr "Instalaránse los siguientes paquetes extra:"
@@ -2413,7 +2405,6 @@ msgid "Unpack command '%s' failed.\n"
msgstr "Falló la orde de desempaquetáu '%s'.\n"
#: apt-private/private-source.cc
-#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Comprueba qu'el paquete 'dpkg-dev' ta instaláu.\n"
@@ -3788,6 +3779,12 @@ msgstr "Fallu internu"
msgid "Empty files can't be valid archives"
msgstr ""
+#~ msgid "Unmet dependencies. Try using --fix-broken."
+#~ msgstr "Dependencies incumplíes. Téntalo usando --fix-broken."
+
+#~ msgid "You might want to run 'apt --fix-broken install' to correct these:"
+#~ msgstr "Habríes d'executar 'apt --fix-broken install' para iguar estos:"
+
#~ msgid "(not found)"
#~ msgstr "(nun s'alcontró)"
diff --git a/po/bg.po b/po/bg.po
index 3353a8d1a..f61c08f23 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.7.21\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-25 17:23+0300\n"
"Last-Translator: Damyan Ivanov <dmn@debian.org>\n"
"Language-Team: Bulgarian <dict@fsa-bg.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
@@ -1671,15 +1671,19 @@ msgstr "Неуспех при минимизирането на набора а
msgid " Done"
msgstr " Готово"
-#: apt-private/private-cachefile.cc
-msgid "You might want to run 'apt-get -f install' to correct these."
+#: apt-private/private-cachefile.cc apt-private/private-install.cc
+msgid "You might want to run 'apt --fix-broken install' to correct these."
msgstr ""
-"Възможно е да изпълните „apt-get -f install“, за да коригирате тези "
+"Възможно е да изпълните „apt --fix-broken install“, за да коригирате тези "
"неизправности."
-#: apt-private/private-cachefile.cc
-msgid "Unmet dependencies. Try using -f."
-msgstr "Неудовлетворени зависимости. Опитайте с „-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 ""
+"Неудовлетворени зависимости. Опитайте „apt --fix-broken install“ без пакети "
+"(или укажете разрешение)."
#: apt-private/private-cacheset.cc apt-private/private-search.cc
msgid "Sorting"
@@ -2048,18 +2052,6 @@ msgstr[0] "Използвайте „%s“ за да го премахнете."
msgstr[1] "Използвайте „%s“ за да ги премахнете."
#: apt-private/private-install.cc
-msgid "You might want to run 'apt-get -f install' to correct these:"
-msgstr "Възможно е да изпълните „apt-get -f install“, за да коригирате:"
-
-#: apt-private/private-install.cc
-msgid ""
-"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
-"solution)."
-msgstr ""
-"Неудовлетворени зависимости. Опитайте „apt-get -f install“ без пакети (или "
-"укажете разрешение)."
-
-#: apt-private/private-install.cc
#, fuzzy
msgid "The following additional packages will be installed:"
msgstr "Следните допълнителни пакети ще бъдат инсталирани:"
@@ -2452,7 +2444,6 @@ msgid "Unpack command '%s' failed.\n"
msgstr "Командата за разпакетиране „%s“ пропадна.\n"
#: apt-private/private-source.cc
-#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Проверете дали имате инсталиран пакета „dpkg-dev“.\n"
@@ -3837,6 +3828,13 @@ msgstr "Вътрешна грешка"
msgid "Empty files can't be valid archives"
msgstr "Празни файлове не могат да бъдат валидни архиви"
+#~ msgid "Unmet dependencies. Try using --fix-broken."
+#~ msgstr "Неудовлетворени зависимости. Опитайте с „--fix-broken“."
+
+#~ msgid "You might want to run 'apt --fix-broken install' to correct these:"
+#~ msgstr ""
+#~ "Възможно е да изпълните „apt --fix-broken install“, за да коригирате:"
+
#~ msgid "(not found)"
#~ msgstr "(не са намерени)"
diff --git a/po/bs.po b/po/bs.po
index b4a6b97c1..0c564a56c 100644
--- a/po/bs.po
+++ b/po/bs.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.5.26\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: 2004-05-06 15:25+0100\n"
"Last-Translator: Safir Šećerović <sapphire@linux.org.ba>\n"
"Language-Team: Bosnian <lokal@lugbih.org>\n"
@@ -402,8 +402,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
@@ -1586,13 +1586,15 @@ msgstr ""
msgid " Done"
msgstr " Urađeno"
-#: apt-private/private-cachefile.cc
-msgid "You might want to run 'apt-get -f install' to correct these."
+#: apt-private/private-cachefile.cc apt-private/private-install.cc
+msgid "You might want to run 'apt --fix-broken install' to correct these."
msgstr ""
-#: apt-private/private-cachefile.cc
-msgid "Unmet dependencies. Try using -f."
-msgstr "Nezadovoljene zavisnosti. Pokušajte koristeći -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 ""
#: apt-private/private-cacheset.cc apt-private/private-search.cc
msgid "Sorting"
@@ -1935,16 +1937,6 @@ msgstr[0] ""
msgstr[1] ""
#: apt-private/private-install.cc
-msgid "You might want to run 'apt-get -f install' to correct these:"
-msgstr ""
-
-#: apt-private/private-install.cc
-msgid ""
-"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
-"solution)."
-msgstr ""
-
-#: apt-private/private-install.cc
#, fuzzy
msgid "The following additional packages will be installed:"
msgstr "Slijedeći dodatni paketi će biti instalirani:"
@@ -2322,7 +2314,6 @@ msgid "Unpack command '%s' failed.\n"
msgstr ""
#: apt-private/private-source.cc
-#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr ""
@@ -3605,6 +3596,9 @@ msgstr "Unutrašnja greška"
msgid "Empty files can't be valid archives"
msgstr ""
+#~ msgid "Unmet dependencies. Try using --fix-broken."
+#~ msgstr "Nezadovoljene zavisnosti. Pokušajte koristeći --fix-broken."
+
#~ msgid ""
#~ "Options:\n"
#~ " -h This help text.\n"
diff --git a/po/ca.po b/po/ca.po
index 725e7d241..6af68d5c6 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 1.4~beta1\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2016-12-06 11:12+0100\n"
+"POT-Creation-Date: 2016-12-29 13:23+0100\n"
"PO-Revision-Date: 2016-12-05 21:09+0100\n"
"Last-Translator: Oriol Debian <oriol.debian@gmail.com>\n"
"Language-Team: Catalan <debian-l10n-catalan@lists.debian.org>\n"
@@ -1700,13 +1700,17 @@ msgstr "No es pot minimitzar el joc de versions revisades"
msgid " Done"
msgstr " Fet"
-#: apt-private/private-cachefile.cc
-msgid "You might want to run 'apt-get -f install' to correct these."
-msgstr "Potser voldreu executar «apt-get -f install» per a corregir-ho."
+#: apt-private/private-cachefile.cc apt-private/private-install.cc
+msgid "You might want to run 'apt --fix-broken install' to correct these."
+msgstr "Potser voldreu executar «apt --fix-broken install» per a corregir-ho."
-#: apt-private/private-cachefile.cc
-msgid "Unmet dependencies. Try using -f."
-msgstr "Dependències sense satisfer. Proveu-ho emprant -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 ""
+"Dependències insatisfetes. Proveu amb «apt --fix-broken install» sense "
+"paquets (o especifiqueu una solució)."
#: apt-private/private-cacheset.cc apt-private/private-search.cc
msgid "Sorting"
@@ -2093,18 +2097,6 @@ msgstr[0] "Empreu «%s» per a suprimir-lo."
msgstr[1] "Empreu «%s» per a suprimir-los."
#: apt-private/private-install.cc
-msgid "You might want to run 'apt-get -f install' to correct these:"
-msgstr "Potser voldreu executar «apt-get -f install» per corregir-ho:"
-
-#: apt-private/private-install.cc
-msgid ""
-"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
-"solution)."
-msgstr ""
-"Dependències insatisfetes. Proveu amb «apt-get -f install» sense paquets (o "
-"especifiqueu una solució)."
-
-#: apt-private/private-install.cc
msgid "The following additional packages will be installed:"
msgstr "S'instal·laran els següents paquets extres:"
@@ -3914,3 +3906,9 @@ msgstr "Error intern"
#: methods/store.cc
msgid "Empty files can't be valid archives"
msgstr "Els fitxers buits no poden ser arxius vàlids"
+
+#~ msgid "Unmet dependencies. Try using --fix-broken."
+#~ msgstr "Dependències sense satisfer. Proveu-ho emprant --fix-broken."
+
+#~ msgid "You might want to run 'apt --fix-broken install' to correct these:"
+#~ msgstr "Potser voldreu executar «apt --fix-broken install» per corregir-ho:"
diff --git a/po/cs.po b/po/cs.po
index fd3e8f2cc..b1c3ce187 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 1.0.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: 2015-08-29 15:24+0200\n"
"Last-Translator: Miroslav Kure <kurem@debian.cz>\n"
"Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"
@@ -412,10 +412,13 @@ msgid "No sandbox user '%s' on the system, can not drop privileges"
msgstr ""
#: 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 ""
"Pro stažení nelze zahodit oprávnění, jelikož soubor „%s“ by nebyl přístupný "
"uživateli „%s“."
@@ -1641,13 +1644,17 @@ msgstr "Nelze minimalizovat sadu pro aktualizaci"
msgid " Done"
msgstr " Hotovo"
-#: apt-private/private-cachefile.cc
-msgid "You might want to run 'apt-get -f install' to correct these."
-msgstr "Pro opravení můžete spustit „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 "Pro opravení můžete spustit „apt --fix-broken install“."
-#: apt-private/private-cachefile.cc
-msgid "Unmet dependencies. Try using -f."
-msgstr "Nesplněné závislosti. Zkuste použít -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 ""
+"Nesplněné závislosti. Zkuste spustit „apt --fix-broken install“ bez balíků "
+"(nebo navrhněte řešení)."
#: apt-private/private-cacheset.cc apt-private/private-search.cc
msgid "Sorting"
@@ -2020,18 +2027,6 @@ msgstr[1] "Pro jejich odstranění použijte „%s“."
msgstr[2] "Pro jejich odstranění použijte „%s“."
#: apt-private/private-install.cc
-msgid "You might want to run 'apt-get -f install' to correct these:"
-msgstr "Pro opravení následujících můžete spustit „apt-get -f install“:"
-
-#: apt-private/private-install.cc
-msgid ""
-"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
-"solution)."
-msgstr ""
-"Nesplněné závislosti. Zkuste spustit „apt-get -f install“ bez balíků (nebo "
-"navrhněte řešení)."
-
-#: apt-private/private-install.cc
msgid "The following additional packages will be installed:"
msgstr "Následující dodatečné balíky budou instalovány:"
@@ -2419,7 +2414,6 @@ msgid "Unpack command '%s' failed.\n"
msgstr "Příkaz pro rozbalení „%s“ selhal.\n"
#: apt-private/private-source.cc
-#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Zkontrolujte, zda je nainstalován balík „dpkg-dev“.\n"
@@ -3792,6 +3786,13 @@ msgstr "Vnitřní chyba"
msgid "Empty files can't be valid archives"
msgstr "Prázdné soubory nejsou platnými archivy"
+#~ msgid "Unmet dependencies. Try using --fix-broken."
+#~ msgstr "Nesplněné závislosti. Zkuste použít --fix-broken."
+
+#~ msgid "You might want to run 'apt --fix-broken install' to correct these:"
+#~ msgstr ""
+#~ "Pro opravení následujících můžete spustit „apt --fix-broken install“:"
+
#~ msgid "(not found)"
#~ msgstr "(nenalezeno)"
diff --git a/po/cy.po b/po/cy.po
index 0ac298de5..84157f154 100644
--- a/po/cy.po
+++ b/po/cy.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 1.0.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: 2005-06-06 13:46+0100\n"
"Last-Translator: Dafydd Harries <daf@muse.19inch.net>\n"
"Language-Team: Welsh <cy@pengwyn.linux.org.uk>\n"
@@ -415,8 +415,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
@@ -1637,13 +1637,19 @@ msgstr "Ni ellir bychanu y set uwchraddio"
msgid " Done"
msgstr " Wedi Gorffen"
-#: apt-private/private-cachefile.cc
-msgid "You might want to run 'apt-get -f install' to correct these."
-msgstr "Efallai hoffech rhedeg 'apt-get -f install' er mwyn cywiro'r rhain."
+#: apt-private/private-cachefile.cc apt-private/private-install.cc
+msgid "You might want to run 'apt --fix-broken install' to correct these."
+msgstr ""
+"Efallai hoffech rhedeg 'apt --fix-broken install' er mwyn cywiro'r rhain."
-#: apt-private/private-cachefile.cc
-msgid "Unmet dependencies. Try using -f."
-msgstr "Dibyniaethau heb eu bodloni. Ceisiwch ddefnyddio -f."
+# FIXME
+#: 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 ""
+"Dibyniaethau heb eu bodloni. Ceisiwch rhedeg 'apt --fix-broken install' efo "
+"dim pecyn (neu penodwch ddatrys)"
#: apt-private/private-cacheset.cc apt-private/private-search.cc
msgid "Sorting"
@@ -2009,19 +2015,6 @@ msgstr[0] ""
msgstr[1] ""
#: apt-private/private-install.cc
-msgid "You might want to run 'apt-get -f install' to correct these:"
-msgstr "Efallai hoffech rhedeg 'apt-get -f install' er mwyn cywiro'r rhain:"
-
-# FIXME
-#: apt-private/private-install.cc
-msgid ""
-"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
-"solution)."
-msgstr ""
-"Dibyniaethau heb eu bodloni. Ceisiwch rhedeg 'apt-get -f install' efo dim "
-"pecyn (neu penodwch ddatrys)"
-
-#: apt-private/private-install.cc
#, fuzzy
msgid "The following additional packages will be installed:"
msgstr "Caiff y pecynnau canlynol ychwanegol eu sefydlu:"
@@ -2409,7 +2402,6 @@ msgid "Unpack command '%s' failed.\n"
msgstr "Methodd y gorchymyn dadbacio '%s'.\n"
#: apt-private/private-source.cc
-#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr ""
@@ -3818,6 +3810,13 @@ msgstr "Gwall mewnol"
msgid "Empty files can't be valid archives"
msgstr ""
+#~ msgid "Unmet dependencies. Try using --fix-broken."
+#~ msgstr "Dibyniaethau heb eu bodloni. Ceisiwch ddefnyddio --fix-broken."
+
+#~ msgid "You might want to run 'apt --fix-broken install' to correct these:"
+#~ msgstr ""
+#~ "Efallai hoffech rhedeg 'apt --fix-broken install' er mwyn cywiro'r rhain:"
+
#~ msgid "(not found)"
#~ msgstr "(heb ganfod)"
diff --git a/po/da.po b/po/da.po
index 0d0db74f0..85f3b7c08 100644
--- a/po/da.po
+++ b/po/da.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 1.0.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: 2014-07-06 23:51+0200\n"
"Last-Translator: Joe Hansen <joedalton2@yahoo.dk>\n"
"Language-Team: Danish <debian-l10n-danish@lists.debian.org>\n"
@@ -415,8 +415,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
@@ -1640,13 +1640,17 @@ msgstr "Kunne ikke minimere opgraderingssættet"
msgid " Done"
msgstr " Færdig"
-#: apt-private/private-cachefile.cc
-msgid "You might want to run 'apt-get -f install' to correct these."
-msgstr "Du kan muligvis rette dette ved at køre »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 "Du kan muligvis rette dette ved at køre »apt --fix-broken install«."
-#: apt-private/private-cachefile.cc
-msgid "Unmet dependencies. Try using -f."
-msgstr "Uopfyldte afhængigheder. Prøv med -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 ""
+"Uopfyldte afhængigheder. Prøv »apt --fix-broken install« uden pakker (eller "
+"angiv en løsning)."
#: apt-private/private-cacheset.cc apt-private/private-search.cc
msgid "Sorting"
@@ -2011,18 +2015,6 @@ msgstr[0] "Brug »%s« til at fjerne den."
msgstr[1] "Brug »%s« til at fjerne dem."
#: apt-private/private-install.cc
-msgid "You might want to run 'apt-get -f install' to correct these:"
-msgstr "Du kan muligvis rette det ved at køre »apt-get -f install«:"
-
-#: apt-private/private-install.cc
-msgid ""
-"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
-"solution)."
-msgstr ""
-"Uopfyldte afhængigheder. Prøv »apt-get -f install« uden pakker (eller angiv "
-"en løsning)."
-
-#: apt-private/private-install.cc
#, fuzzy
msgid "The following additional packages will be installed:"
msgstr "Følgende yderligere pakker vil blive installeret:"
@@ -2418,7 +2410,6 @@ msgid "Unpack command '%s' failed.\n"
msgstr "Udpakningskommandoen »%s« fejlede.\n"
#: apt-private/private-source.cc
-#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Tjek om pakken »dpkg-dev« er installeret.\n"
@@ -3807,6 +3798,12 @@ msgstr "Intern fejl"
msgid "Empty files can't be valid archives"
msgstr "Tomme filer kan ikke være gyldige arkiver"
+#~ msgid "Unmet dependencies. Try using --fix-broken."
+#~ msgstr "Uopfyldte afhængigheder. Prøv med --fix-broken."
+
+#~ msgid "You might want to run 'apt --fix-broken install' to correct these:"
+#~ msgstr "Du kan muligvis rette det ved at køre »apt --fix-broken install«:"
+
#~ msgid "(not found)"
#~ msgstr "(ikke fundet)"
diff --git a/po/de.po b/po/de.po
index eefacea75..86a2ee093 100644
--- a/po/de.po
+++ b/po/de.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 1.0.8\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: 2014-09-19 13:04+0100\n"
"Last-Translator: Holger Wansing <linux@wansing-online.de>\n"
"Language-Team: Debian German <debian-l10n-german@lists.debian.org>\n"
@@ -422,8 +422,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
@@ -1691,13 +1691,17 @@ msgstr "Menge der zu aktualisierenden Pakete konnte nicht minimiert werden."
msgid " Done"
msgstr " Fertig"
-#: apt-private/private-cachefile.cc
-msgid "You might want to run 'apt-get -f install' to correct these."
-msgstr "Probieren Sie »apt-get -f install«, um dies zu korrigieren."
+#: apt-private/private-cachefile.cc apt-private/private-install.cc
+msgid "You might want to run 'apt --fix-broken install' to correct these."
+msgstr "Probieren Sie »apt --fix-broken install«, um dies zu korrigieren."
-#: apt-private/private-cachefile.cc
-msgid "Unmet dependencies. Try using -f."
-msgstr "Unerfüllte Abhängigkeiten. Versuchen Sie, -f zu benutzen."
+#: 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 ""
+"Unerfüllte Abhängigkeiten. Versuchen Sie »apt --fix-broken install« ohne "
+"Angabe eines Pakets (oder geben Sie eine Lösung an)."
#: apt-private/private-cacheset.cc apt-private/private-search.cc
msgid "Sorting"
@@ -2071,18 +2075,6 @@ msgstr[0] "Verwenden Sie »%s«, um es zu entfernen."
msgstr[1] "Verwenden Sie »%s«, um sie zu entfernen."
#: apt-private/private-install.cc
-msgid "You might want to run 'apt-get -f install' to correct these:"
-msgstr "Probieren Sie »apt-get -f install«, um dies zu korrigieren:"
-
-#: apt-private/private-install.cc
-msgid ""
-"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
-"solution)."
-msgstr ""
-"Unerfüllte Abhängigkeiten. Versuchen Sie »apt-get -f install« ohne Angabe "
-"eines Pakets (oder geben Sie eine Lösung an)."
-
-#: apt-private/private-install.cc
#, fuzzy
msgid "The following additional packages will be installed:"
msgstr "Die folgenden zusätzlichen Pakete werden installiert:"
@@ -2489,7 +2481,6 @@ msgid "Unpack command '%s' failed.\n"
msgstr "Entpackbefehl »%s« fehlgeschlagen.\n"
#: apt-private/private-source.cc
-#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Überprüfen Sie, ob das Paket »dpkg-dev« installiert ist.\n"
@@ -3918,6 +3909,12 @@ msgstr "Interner Fehler"
msgid "Empty files can't be valid archives"
msgstr "Leere Dateien können kein gültiges Archiv sein."
+#~ msgid "Unmet dependencies. Try using --fix-broken."
+#~ msgstr "Unerfüllte Abhängigkeiten. Versuchen Sie, --fix-broken zu benutzen."
+
+#~ msgid "You might want to run 'apt --fix-broken install' to correct these:"
+#~ msgstr "Probieren Sie »apt --fix-broken install«, um dies zu korrigieren:"
+
#~ msgid "(not found)"
#~ msgstr "(nicht gefunden)"
diff --git a/po/dz.po b/po/dz.po
index 89b46b99f..fa0384d1e 100644
--- a/po/dz.po
+++ b/po/dz.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 1.0.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: 2006-09-19 09:49+0530\n"
"Last-Translator: Kinley Tshering <gasepkuenden2k3@hotmail.com>\n"
"Language-Team: Dzongkha <pgeyleg@dit.gov.bt>\n"
@@ -409,8 +409,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
@@ -1612,13 +1612,18 @@ msgstr "ཡར་བསྐྱེད་འབད་ཡོད་པའི་ཆ་
msgid " Done"
msgstr "འབད་ཚར་ཡི།"
-#: apt-private/private-cachefile.cc
-msgid "You might want to run 'apt-get -f install' to correct these."
-msgstr "འ་ནི་འདི་ཚུ་ནོར་བཅོས་འབད་ནི་ལུ་ཁྱོད་ཀྱི་'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 ""
+"འ་ནི་འདི་ཚུ་ནོར་བཅོས་འབད་ནི་ལུ་ཁྱོད་ཀྱི་'apt --fix-broken install'དེ་གཡོག་བཀོལ་དགོཔ་འོང་།"
-#: apt-private/private-cachefile.cc
-msgid "Unmet dependencies. Try using -f."
-msgstr "མ་ཚང་པའི་རྟེན་འབྲེལ་ཚུ། -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 ""
+"མ་ཚང་བའི་རྟེན་འབྲེལ་ ཐུས་སྒྲིལ་མེད་མི་ཚུ་དང་གཅིག་ཁར་ 'apt --fix-broken install'དེ་འབཐ་རྩོལ་"
+"བསྐྱེདཔ།(ཡང་ན་ཐབས་ཤེས་ཅིག་གསལ་བཀོད་འབད།)"
#: apt-private/private-cacheset.cc apt-private/private-search.cc
msgid "Sorting"
@@ -1981,18 +1986,6 @@ msgstr[0] ""
msgstr[1] ""
#: apt-private/private-install.cc
-msgid "You might want to run 'apt-get -f install' to correct these:"
-msgstr "འདི་ཚུ་ནོར་བཅོས་འབད་ནིའི་དོན་ལུ་ཁྱོད་ཀྱི་'apt-get -f install'དེ་གཡོག་བཀོལ་དགོཔ་འོང་:"
-
-#: apt-private/private-install.cc
-msgid ""
-"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
-"solution)."
-msgstr ""
-"མ་ཚང་བའི་རྟེན་འབྲེལ་ ཐུས་སྒྲིལ་མེད་མི་ཚུ་དང་གཅིག་ཁར་ 'apt-get -f install'དེ་འབཐ་རྩོལ་བསྐྱེདཔ།"
-"(ཡང་ན་ཐབས་ཤེས་ཅིག་གསལ་བཀོད་འབད།)"
-
-#: apt-private/private-install.cc
#, fuzzy
msgid "The following additional packages will be installed:"
msgstr "འོག་གི་ཐུམ་སྒྲིལ་ཐེབས་ཚུ་གཞི་བཙུགས་འབད་འོང་:"
@@ -2377,7 +2370,6 @@ msgid "Unpack command '%s' failed.\n"
msgstr "'%s'སྦུང་ཚན་བཟོ་བཤོལ་འཐུས་ཤོར་བྱུང་ཡོད།\n"
#: apt-private/private-source.cc
-#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "'dpkg-dev'་ཐུམ་སྒྲིལ་དེ་གཞི་བཙུགས་འབད་ཡོད་པ་ཅིན་ཨེབ་གཏང་འབད།\n"
@@ -3761,6 +3753,13 @@ msgstr "ནང་འཁོད་འཛོལ་བ།"
msgid "Empty files can't be valid archives"
msgstr ""
+#~ msgid "Unmet dependencies. Try using --fix-broken."
+#~ msgstr "མ་ཚང་པའི་རྟེན་འབྲེལ་ཚུ། --fix-broken ལག་ལེན་འཐབ་སྟེ་འབད་རྩོལ་བསྐྱེད།"
+
+#~ msgid "You might want to run 'apt --fix-broken install' to correct these:"
+#~ msgstr ""
+#~ "འདི་ཚུ་ནོར་བཅོས་འབད་ནིའི་དོན་ལུ་ཁྱོད་ཀྱི་'apt --fix-broken install'དེ་གཡོག་བཀོལ་དགོཔ་འོང་:"
+
#~ msgid "(not found)"
#~ msgstr "(མ་ཐོབ།)"
diff --git a/po/el.po b/po/el.po
index 41403ca8c..2b51c48f4 100644
--- a/po/el.po
+++ b/po/el.po
@@ -16,7 +16,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 1.0.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: 2008-08-26 18:25+0300\n"
"Last-Translator: Θανάσης Νάτσης <natsisthanasis@gmail.com>\n"
"Language-Team: Greek <debian-l10n-greek@lists.debian.org>\n"
@@ -419,8 +419,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
@@ -1630,15 +1630,19 @@ msgstr "Αδύνατη η ελαχιστοποίηση του συνόλου α
msgid " Done"
msgstr " Ετοιμο"
-#: apt-private/private-cachefile.cc
-msgid "You might want to run 'apt-get -f install' to correct these."
+#: apt-private/private-cachefile.cc apt-private/private-install.cc
+msgid "You might want to run 'apt --fix-broken install' to correct these."
msgstr ""
-"Ίσως να πρέπει να τρέξετε apt-get -f install για να διορθώσετε αυτά τα "
+"Ίσως να πρέπει να τρέξετε apt --fix-broken install για να διορθώσετε αυτά τα "
"προβλήματα."
-#: apt-private/private-cachefile.cc
-msgid "Unmet dependencies. Try using -f."
-msgstr "Ανεπίλυτες εξαρτήσεις. Δοκιμάστε με το -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 ""
+"Ανεπίλυτες εξαρτήσεις. Δοκιμάστε 'apt --fix-broken install' χωρίς να ορίσετε "
+"πακέτο (ή καθορίστε μια λύση)."
#: apt-private/private-cacheset.cc apt-private/private-search.cc
msgid "Sorting"
@@ -2006,18 +2010,6 @@ msgstr[0] "Χρησιμοποιήστε '%s' για να το διαγράψετ
msgstr[1] "Χρησιμοποιήστε '%s' για να τα διαγράψετε."
#: apt-private/private-install.cc
-msgid "You might want to run 'apt-get -f install' to correct these:"
-msgstr "Aν τρέξετε 'apt-get -f install' ίσως να διορθώσετε αυτά τα προβλήματα:"
-
-#: apt-private/private-install.cc
-msgid ""
-"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
-"solution)."
-msgstr ""
-"Ανεπίλυτες εξαρτήσεις. Δοκιμάστε 'apt-get -f install' χωρίς να ορίσετε "
-"πακέτο (ή καθορίστε μια λύση)."
-
-#: apt-private/private-install.cc
#, fuzzy
msgid "The following additional packages will be installed:"
msgstr "Τα ακόλουθα επιπλέον πακέτα θα εγκατασταθούν:"
@@ -2403,7 +2395,6 @@ msgid "Unpack command '%s' failed.\n"
msgstr "Απέτυχε η εντολή αποσυμπίεσης %s\n"
#: apt-private/private-source.cc
-#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Ελέγξτε αν είναι εγκαταστημένο το πακέτο 'dpkg-dev'.\n"
@@ -3790,6 +3781,14 @@ msgstr "Εσωτερικό Σφάλμα"
msgid "Empty files can't be valid archives"
msgstr ""
+#~ msgid "Unmet dependencies. Try using --fix-broken."
+#~ msgstr "Ανεπίλυτες εξαρτήσεις. Δοκιμάστε με το --fix-broken."
+
+#~ msgid "You might want to run 'apt --fix-broken install' to correct these:"
+#~ msgstr ""
+#~ "Aν τρέξετε 'apt --fix-broken install' ίσως να διορθώσετε αυτά τα "
+#~ "προβλήματα:"
+
#~ msgid "(not found)"
#~ msgstr "(δε βρέθηκαν)"
diff --git a/po/es.po b/po/es.po
index a6b268bc3..2d7cda4ba 100644
--- a/po/es.po
+++ b/po/es.po
@@ -34,7 +34,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.8.10\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-01-26 01:51+0100\n"
"Last-Translator: Manuel \"Venturi\" Porras Peralta <venturi@openmailbox."
"org>\n"
@@ -490,10 +490,13 @@ msgstr ""
"privilegios"
#: 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 ""
"No se podrán ignorar los privilegios para descargar mientras no se pueda "
"acceder a «%s» con el usuario «%s»."
@@ -1763,13 +1766,17 @@ msgstr "No se puede minimizar el conjunto de actualización"
msgid " Done"
msgstr " Listo"
-#: apt-private/private-cachefile.cc
-msgid "You might want to run 'apt-get -f install' to correct these."
-msgstr "Tal vez quiera ejecutar «apt-get -f install» para corregirlo."
+#: apt-private/private-cachefile.cc apt-private/private-install.cc
+msgid "You might want to run 'apt --fix-broken install' to correct these."
+msgstr "Tal vez quiera ejecutar «apt --fix-broken install» para corregirlo."
-#: apt-private/private-cachefile.cc
-msgid "Unmet dependencies. Try using -f."
-msgstr "Dependencias incumplidas. Pruebe de nuevo utilizando -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 ""
+"Dependencias incumplidas. Intente «apt --fix-broken install» sin paquetes (o "
+"especifique una solución)."
#: apt-private/private-cacheset.cc apt-private/private-search.cc
msgid "Sorting"
@@ -2153,18 +2160,6 @@ msgstr[0] "Utilice «%s» para eliminarlo."
msgstr[1] "Utilice «%s» para eliminarlos."
#: apt-private/private-install.cc
-msgid "You might want to run 'apt-get -f install' to correct these:"
-msgstr "Tal vez quiera ejecutar «apt-get -f install» para corregirlo:"
-
-#: apt-private/private-install.cc
-msgid ""
-"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
-"solution)."
-msgstr ""
-"Dependencias incumplidas. Intente «apt-get -f install» sin paquetes (o "
-"especifique una solución)."
-
-#: apt-private/private-install.cc
msgid "The following additional packages will be installed:"
msgstr "Se instalarán los siguientes paquetes adicionales:"
@@ -2554,7 +2549,6 @@ msgid "Unpack command '%s' failed.\n"
msgstr "Falló la orden de desempaquetamiento «%s».\n"
#: apt-private/private-source.cc
-#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Compruebe que el paquete «dpkg-dev» esté instalado.\n"
@@ -3973,6 +3967,12 @@ msgstr "Error interno"
msgid "Empty files can't be valid archives"
msgstr "Los ficheros vacíos no pueden ser archivos válidos"
+#~ msgid "Unmet dependencies. Try using --fix-broken."
+#~ msgstr "Dependencias incumplidas. Pruebe de nuevo utilizando --fix-broken."
+
+#~ msgid "You might want to run 'apt --fix-broken install' to correct these:"
+#~ msgstr "Tal vez quiera ejecutar «apt --fix-broken install» para corregirlo:"
+
#~ msgid "(not found)"
#~ msgstr "(no encontrado)"
@@ -4559,11 +4559,11 @@ msgstr "Los ficheros vacíos no pueden ser archivos válidos"
#~ msgid ""
#~ "Some broken packages were found while trying to process build-"
#~ "dependencies.\n"
-#~ "You might want to run 'apt-get -f install' to correct these."
+#~ "You might want to run 'apt --fix-broken install' to correct these."
#~ msgstr ""
#~ "Se encontraron algunos paquetes rotos mientras se intentaba procesar\n"
#~ "las dependencies de construcción. Tal vez quiera ejecutar \n"
-#~ "'apt-get -f install' para corregirlos."
+#~ "'apt --fix-broken install' para corregirlos."
#~ msgid ""
#~ "Usage: apt-cache [options] command\n"
diff --git a/po/eu.po b/po/eu.po
index 085e592d6..8b6d5882c 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 1.0.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: 2009-05-17 00:41+0200\n"
"Last-Translator: Piarres Beobide <pi@beobide.net>\n"
"Language-Team: Euskara <debian-l10n-basque@lists.debian.org>\n"
@@ -408,8 +408,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
@@ -1611,13 +1611,17 @@ msgstr "Ezin da bertsio berritzeko multzoa minimizatu"
msgid " Done"
msgstr " Eginda"
-#: apt-private/private-cachefile.cc
-msgid "You might want to run 'apt-get -f install' to correct these."
-msgstr "Beharbada 'apt-get -f install' exekutatu nahiko duzu zuzentzeko."
+#: apt-private/private-cachefile.cc apt-private/private-install.cc
+msgid "You might want to run 'apt --fix-broken install' to correct these."
+msgstr "Beharbada 'apt --fix-broken install' exekutatu nahiko duzu zuzentzeko."
-#: apt-private/private-cachefile.cc
-msgid "Unmet dependencies. Try using -f."
-msgstr "Bete gabeko mendekotasunak. Probatu -f erabiliz."
+#: 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 ""
+"Bete gabeko mendekotasunak. Probatu 'apt --fix-broken install' paketerik "
+"gabe (edo zehaztu konponbide bat)."
#: apt-private/private-cacheset.cc apt-private/private-search.cc
msgid "Sorting"
@@ -1986,18 +1990,6 @@ msgstr[0] "'%s' erabili ezabatzeko."
msgstr[1] "'%s' erabili ezabatzeko."
#: apt-private/private-install.cc
-msgid "You might want to run 'apt-get -f install' to correct these:"
-msgstr "Beharbada 'apt-get -f install' exekutatu nahiko duzu hauek zuzentzeko:"
-
-#: apt-private/private-install.cc
-msgid ""
-"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
-"solution)."
-msgstr ""
-"Bete gabeko mendekotasunak. Probatu 'apt-get -f install' paketerik gabe (edo "
-"zehaztu konponbide bat)."
-
-#: apt-private/private-install.cc
#, fuzzy
msgid "The following additional packages will be installed:"
msgstr "Ondorengo pakete gehigarriak instalatuko dira:"
@@ -2380,7 +2372,6 @@ msgid "Unpack command '%s' failed.\n"
msgstr "Deskonprimitzeko '%s' komandoak huts egin du.\n"
#: apt-private/private-source.cc
-#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Egiaztatu 'dpkg-dev' paketea instalaturik dagoen.\n"
@@ -3757,6 +3748,14 @@ msgstr "Barne errorea"
msgid "Empty files can't be valid archives"
msgstr ""
+#~ msgid "Unmet dependencies. Try using --fix-broken."
+#~ msgstr "Bete gabeko mendekotasunak. Probatu --fix-broken erabiliz."
+
+#~ msgid "You might want to run 'apt --fix-broken install' to correct these:"
+#~ msgstr ""
+#~ "Beharbada 'apt --fix-broken install' exekutatu nahiko duzu hauek "
+#~ "zuzentzeko:"
+
#~ msgid "(not found)"
#~ msgstr "(ez da aurkitu)"
diff --git a/po/fi.po b/po/fi.po
index ccf82c06d..728e6b9ff 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.5.26\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: 2008-12-11 14:52+0200\n"
"Last-Translator: Tapio Lehtonen <tale@debian.org>\n"
"Language-Team: Finnish <debian-l10n-finnish@lists.debian.org>\n"
@@ -408,8 +408,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
@@ -1606,13 +1606,17 @@ msgstr "Päivitysjoukon minimointi ei onnistu"
msgid " Done"
msgstr " Valmis"
-#: apt-private/private-cachefile.cc
-msgid "You might want to run 'apt-get -f install' to correct these."
-msgstr "Halunnet suorittaa \"apt-get -f install\" korjaamaan nämä."
+#: apt-private/private-cachefile.cc apt-private/private-install.cc
+msgid "You might want to run 'apt --fix-broken install' to correct these."
+msgstr "Halunnet suorittaa \"apt --fix-broken install\" korjaamaan nämä."
-#: apt-private/private-cachefile.cc
-msgid "Unmet dependencies. Try using -f."
-msgstr "Tyydyttämättömiä riippuvuuksia. Koita käyttää -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 ""
+"Kaikkia riippuvuuksia ei ole tyydytetty. Kokeile \"apt --fix-broken install"
+"\" ilmanpaketteja (tai ratkaise itse)."
#: apt-private/private-cacheset.cc apt-private/private-search.cc
msgid "Sorting"
@@ -1981,18 +1985,6 @@ msgstr[0] "Poista ne komennolla \"%s\"."
msgstr[1] "Poista ne komennolla \"%s\"."
#: apt-private/private-install.cc
-msgid "You might want to run 'apt-get -f install' to correct these:"
-msgstr "Saatat haluta suorittaa \"apt-get -f install\" korjaamaan nämä:"
-
-#: apt-private/private-install.cc
-msgid ""
-"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
-"solution)."
-msgstr ""
-"Kaikkia riippuvuuksia ei ole tyydytetty. Kokeile \"apt-get -f install\" "
-"ilmanpaketteja (tai ratkaise itse)."
-
-#: apt-private/private-install.cc
#, fuzzy
msgid "The following additional packages will be installed:"
msgstr "Seuraavat ylimääräiset paketit on merkitty asennettaviksi:"
@@ -2372,7 +2364,6 @@ msgid "Unpack command '%s' failed.\n"
msgstr "Purkukomento \"%s\" ei onnistunut.\n"
#: apt-private/private-source.cc
-#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Tarkista onko paketti \"dpkg-dev\" asennettu.\n"
@@ -3749,6 +3740,13 @@ msgstr "Sisäinen virhe"
msgid "Empty files can't be valid archives"
msgstr ""
+#~ msgid "Unmet dependencies. Try using --fix-broken."
+#~ msgstr "Tyydyttämättömiä riippuvuuksia. Koita käyttää --fix-broken."
+
+#~ msgid "You might want to run 'apt --fix-broken install' to correct these:"
+#~ msgstr ""
+#~ "Saatat haluta suorittaa \"apt --fix-broken install\" korjaamaan nämä:"
+
#~ msgid "(not found)"
#~ msgstr "(ei löydy)"
diff --git a/po/fr.po b/po/fr.po
index 6f00ad90e..e52a40e30 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 1.0.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: 2013-12-15 16:45+0100\n"
"Last-Translator: Julien Patriarca <leatherface@debian.org>\n"
"Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -422,8 +422,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
@@ -1696,13 +1696,19 @@ msgstr "Impossible de minimiser le nombre des paquets mis à jour"
msgid " Done"
msgstr " Fait"
-#: apt-private/private-cachefile.cc
-msgid "You might want to run 'apt-get -f install' to correct these."
-msgstr "Vous pouvez lancer « apt-get -f install » pour corriger ces problèmes."
+#: apt-private/private-cachefile.cc apt-private/private-install.cc
+msgid "You might want to run 'apt --fix-broken install' to correct these."
+msgstr ""
+"Vous pouvez lancer « apt --fix-broken install » pour corriger ces problèmes."
-#: apt-private/private-cachefile.cc
-msgid "Unmet dependencies. Try using -f."
-msgstr "Dépendances manquantes. Essayez d'utiliser l'option -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 ""
+"Dépendances non satisfaites. Essayez « apt --fix-broken install » sans "
+"paquet\n"
+"(ou indiquez une solution)."
#: apt-private/private-cacheset.cc apt-private/private-search.cc
msgid "Sorting"
@@ -2086,19 +2092,6 @@ msgstr[0] "Veuillez utiliser « %s » pour le supprimer."
msgstr[1] "Veuillez utiliser « %s » pour les supprimer."
#: apt-private/private-install.cc
-msgid "You might want to run 'apt-get -f install' to correct these:"
-msgstr ""
-"Vous pouvez lancer « apt-get -f install » pour corriger ces problèmes :"
-
-#: apt-private/private-install.cc
-msgid ""
-"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
-"solution)."
-msgstr ""
-"Dépendances non satisfaites. Essayez « apt-get -f install » sans paquet\n"
-"(ou indiquez une solution)."
-
-#: apt-private/private-install.cc
#, fuzzy
msgid "The following additional packages will be installed:"
msgstr "Les paquets supplémentaires suivants seront installés : "
@@ -2493,7 +2486,6 @@ msgid "Unpack command '%s' failed.\n"
msgstr "La commande de décompactage « %s » a échoué.\n"
#: apt-private/private-source.cc
-#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Veuillez vérifier si le paquet dpkg-dev est installé.\n"
@@ -3903,6 +3895,14 @@ msgstr "Erreur interne"
msgid "Empty files can't be valid archives"
msgstr "Les fichiers vides ne peuvent être des archives valables"
+#~ msgid "Unmet dependencies. Try using --fix-broken."
+#~ msgstr "Dépendances manquantes. Essayez d'utiliser l'option --fix-broken."
+
+#~ msgid "You might want to run 'apt --fix-broken install' to correct these:"
+#~ msgstr ""
+#~ "Vous pouvez lancer « apt --fix-broken install » pour corriger ces "
+#~ "problèmes :"
+
#~ msgid "(not found)"
#~ msgstr "(non trouvé)"
diff --git a/po/gl.po b/po/gl.po
index 961c54923..a762844e5 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 1.0.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: 2011-05-12 15:28+0100\n"
"Last-Translator: Miguel Anxo Bouzada <mbouzada@gmail.com>\n"
"Language-Team: galician <proxecto@trasno.net>\n"
@@ -417,8 +417,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
@@ -1664,13 +1664,17 @@ msgstr "Non foi posíbel minimizar o conxunto de anovacións"
msgid " Done"
msgstr " Feito"
-#: apt-private/private-cachefile.cc
-msgid "You might want to run 'apt-get -f install' to correct these."
-msgstr "Pode querer executar «apt-get -f install» para corrixilos."
+#: apt-private/private-cachefile.cc apt-private/private-install.cc
+msgid "You might want to run 'apt --fix-broken install' to correct these."
+msgstr "Pode querer executar «apt --fix-broken install» para corrixilos."
-#: apt-private/private-cachefile.cc
-msgid "Unmet dependencies. Try using -f."
-msgstr "Dependencias incumpridas. Probe a empregar -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 ""
+"Dependencias incumpridas. Probe «apt --fix-broken install» sen paquetes (ou "
+"especifique unha solución)."
#: apt-private/private-cacheset.cc apt-private/private-search.cc
msgid "Sorting"
@@ -2043,18 +2047,6 @@ msgstr[0] "Empregue «%s» para eliminalos."
msgstr[1] "Empregue «%s» para eliminalos."
#: apt-private/private-install.cc
-msgid "You might want to run 'apt-get -f install' to correct these:"
-msgstr "Pode querer executar «apt-get -f install» para corrixir isto:"
-
-#: apt-private/private-install.cc
-msgid ""
-"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
-"solution)."
-msgstr ""
-"Dependencias incumpridas. Probe «apt-get -f install» sen paquetes (ou "
-"especifique unha solución)."
-
-#: apt-private/private-install.cc
#, fuzzy
msgid "The following additional packages will be installed:"
msgstr "Instalaranse os seguintes paquetes extra:"
@@ -2445,7 +2437,6 @@ msgid "Unpack command '%s' failed.\n"
msgstr "Fallou a orde de desempaquetado «%s».\n"
#: apt-private/private-source.cc
-#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Comprobe que o paquete «dpkg-dev» estea instalado.\n"
@@ -3825,6 +3816,12 @@ msgstr "Produciuse un erro interno"
msgid "Empty files can't be valid archives"
msgstr "Os ficheiros baleiros non poden ser arquivadores válidos"
+#~ msgid "Unmet dependencies. Try using --fix-broken."
+#~ msgstr "Dependencias incumpridas. Probe a empregar --fix-broken."
+
+#~ msgid "You might want to run 'apt --fix-broken install' to correct these:"
+#~ msgstr "Pode querer executar «apt --fix-broken install» para corrixir isto:"
+
#~ msgid "(not found)"
#~ msgstr "(non se atopou)"
diff --git a/po/he.po b/po/he.po
index de8c7b325..592ca87c0 100644
--- a/po/he.po
+++ b/po/he.po
@@ -668,12 +668,12 @@ msgid " Done"
msgstr "סיום"
#: cmdline/apt-get.cc:684
-msgid "You might want to run 'apt-get -f install' to correct these."
-msgstr "אולי תרצה להריץ 'apt-get -f install' כדי לתקן את אלו."
+msgid "You might want to run 'apt --fix-broken install' to correct these."
+msgstr "אולי תרצה להריץ 'apt --fix-broken install' כדי לתקן את אלו."
#: cmdline/apt-get.cc:687
-msgid "Unmet dependencies. Try using -f."
-msgstr "תלויות שלא נענו. נסה להשתמש באפשרות -f."
+msgid "Unmet dependencies. Try using --fix-broken."
+msgstr "תלויות שלא נענו. נסה להשתמש באפשרות --fix-broken."
#: cmdline/apt-get.cc:712
#, fuzzy
@@ -972,12 +972,12 @@ msgid "%s set to manually installed.\n"
msgstr "אבל %s הולכת להיות מותקנת"
#: cmdline/apt-get.cc:1784
-msgid "You might want to run 'apt-get -f install' to correct these:"
+msgid "You might want to run 'apt --fix-broken install' to correct these:"
msgstr ""
#: cmdline/apt-get.cc:1787
msgid ""
-"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
+"Unmet dependencies. Try 'apt --fix-broken install' with no packages (or specify a "
"solution)."
msgstr ""
diff --git a/po/hu.po b/po/hu.po
index 20a9a0bfa..a9a140e7b 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 1.0.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: 2016-04-10 19:46+0200\n"
"Last-Translator: Gabor Kelemen <kelemeng@ubuntu.com>\n"
"Language-Team: Hungarian <gnome-hu-list@gnome.org>\n"
@@ -429,10 +429,13 @@ msgid "No sandbox user '%s' on the system, can not drop privileges"
msgstr "Nincs „%s” felhasználó a rendszeren, a jogosultságok nem dobhatók el"
#: 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 ""
"Nem dobhatók el a jogosultságok a letöltéshez, mivel a(z) „%s” fájl nem "
"érhető el a felhasználó („%s”) által."
@@ -1685,13 +1688,18 @@ msgstr "Nem lehet minimalizálni a frissítendő csomagok mennyiségét"
msgid " Done"
msgstr " Kész"
-#: apt-private/private-cachefile.cc
-msgid "You might want to run 'apt-get -f install' to correct these."
-msgstr "Próbálja futtatni az „apt-get -f install” parancsot ezek javításához."
+#: apt-private/private-cachefile.cc apt-private/private-install.cc
+msgid "You might want to run 'apt --fix-broken install' to correct these."
+msgstr ""
+"Próbálja futtatni az „apt --fix-broken install” parancsot ezek javításához."
-#: apt-private/private-cachefile.cc
-msgid "Unmet dependencies. Try using -f."
-msgstr "Teljesítetlen függőségek. Próbálja a -f használatával."
+#: 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 ""
+"Teljesítetlen függőségek. Próbálja kiadni az „apt --fix-broken install” "
+"parancsot csomagok nélkül (vagy telepítse a függőségeket is!)."
#: apt-private/private-cacheset.cc apt-private/private-search.cc
msgid "Sorting"
@@ -2067,19 +2075,6 @@ msgstr[0] "Ezt az „%s” paranccsal törölheti."
msgstr[1] "Ezeket az „%s” paranccsal törölheti."
#: apt-private/private-install.cc
-msgid "You might want to run 'apt-get -f install' to correct these:"
-msgstr ""
-"Próbálja futtatni az „apt-get -f install” parancsot az alábbiak javításához:"
-
-#: apt-private/private-install.cc
-msgid ""
-"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
-"solution)."
-msgstr ""
-"Teljesítetlen függőségek. Próbálja kiadni az „apt-get -f install” parancsot "
-"csomagok nélkül (vagy telepítse a függőségeket is!)."
-
-#: apt-private/private-install.cc
msgid "The following additional packages will be installed:"
msgstr "A következő további csomagok lesznek telepítve:"
@@ -2470,7 +2465,6 @@ msgid "Unpack command '%s' failed.\n"
msgstr "„%s” kibontási parancs nem sikerült.\n"
#: apt-private/private-source.cc
-#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Ellenőrizze, hogy a „dpkg-dev” csomag telepítve van-e.\n"
@@ -3871,6 +3865,14 @@ msgstr "Belső hiba"
msgid "Empty files can't be valid archives"
msgstr "Az üres fájlok biztosan nem érvényes csomagok"
+#~ msgid "Unmet dependencies. Try using --fix-broken."
+#~ msgstr "Teljesítetlen függőségek. Próbálja a --fix-broken használatával."
+
+#~ msgid "You might want to run 'apt --fix-broken install' to correct these:"
+#~ msgstr ""
+#~ "Próbálja futtatni az „apt --fix-broken install” parancsot az alábbiak "
+#~ "javításához:"
+
#~ msgid "(not found)"
#~ msgstr "(nem található)"
diff --git a/po/it.po b/po/it.po
index 6c1165175..0b0f6a2c7 100644
--- a/po/it.po
+++ b/po/it.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 1.0.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: 2015-04-07 16:51+0100\n"
"Last-Translator: Milo Casagrande <milo@milo.name>\n"
"Language-Team: Italian <tp@lists.linux.it>\n"
@@ -420,8 +420,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
@@ -1685,13 +1685,17 @@ msgstr "Impossibile minimizzare l'insieme da aggiornare"
msgid " Done"
msgstr " Fatto"
-#: apt-private/private-cachefile.cc
-msgid "You might want to run 'apt-get -f install' to correct these."
-msgstr "È utile eseguire \"apt-get -f install\" per correggere ciò."
+#: apt-private/private-cachefile.cc apt-private/private-install.cc
+msgid "You might want to run 'apt --fix-broken install' to correct these."
+msgstr "È utile eseguire \"apt --fix-broken install\" per correggere ciò."
-#: apt-private/private-cachefile.cc
-msgid "Unmet dependencies. Try using -f."
-msgstr "Dipendenze non trovate. Riprovare usando -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 ""
+"Dipendenze non soddisfatte. Provare \"apt --fix-broken install\" senza "
+"pacchetti (o specificare una soluzione)."
#: apt-private/private-cacheset.cc apt-private/private-search.cc
msgid "Sorting"
@@ -2068,19 +2072,6 @@ msgstr[0] "Usare \"%s\" per rimuoverlo."
msgstr[1] "Usare \"%s\" per rimuoverli."
#: apt-private/private-install.cc
-msgid "You might want to run 'apt-get -f install' to correct these:"
-msgstr ""
-"È utile eseguire \"apt-get -f install\" per correggere questi problemi:"
-
-#: apt-private/private-install.cc
-msgid ""
-"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
-"solution)."
-msgstr ""
-"Dipendenze non soddisfatte. Provare \"apt-get -f install\" senza pacchetti "
-"(o specificare una soluzione)."
-
-#: apt-private/private-install.cc
#, fuzzy
msgid "The following additional packages will be installed:"
msgstr "I seguenti pacchetti saranno inoltre installati:"
@@ -2473,7 +2464,6 @@ msgid "Unpack command '%s' failed.\n"
msgstr "Comando di estrazione \"%s\" non riuscito.\n"
#: apt-private/private-source.cc
-#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Verificare che il pacchetto \"dpkg-dev\" sia installato.\n"
@@ -3877,6 +3867,14 @@ msgstr "Errore interno"
msgid "Empty files can't be valid archives"
msgstr "File vuoti non possono essere archivi validi"
+#~ msgid "Unmet dependencies. Try using --fix-broken."
+#~ msgstr "Dipendenze non trovate. Riprovare usando --fix-broken."
+
+#~ msgid "You might want to run 'apt --fix-broken install' to correct these:"
+#~ msgstr ""
+#~ "È utile eseguire \"apt --fix-broken install\" per correggere questi "
+#~ "problemi:"
+
#~ msgid "(not found)"
#~ msgstr "(non trovato)"
diff --git a/po/ja.po b/po/ja.po
index f22bf332e..756b4b958 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 1.0.9.3\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-05-18 15:31+0900\n"
"Last-Translator: Takuma Yamada <tyamada@takumayamada.com>\n"
"Language-Team: Japanese <debian-japanese@lists.debian.org>\n"
@@ -434,10 +434,13 @@ msgid "No sandbox user '%s' on the system, can not drop privileges"
msgstr "システムにサンドボックスユーザ '%s' がありません。権限を削除できません"
#: 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 ""
"ダウンロード権限を削除できません。ファイル '%s' がユーザ '%s' からアクセスで"
"きません。"
@@ -1687,15 +1690,19 @@ msgstr "アップグレードセットを最小化できません"
msgid " Done"
msgstr " 完了"
-#: apt-private/private-cachefile.cc
-msgid "You might want to run 'apt-get -f install' to correct these."
+#: apt-private/private-cachefile.cc apt-private/private-install.cc
+msgid "You might want to run 'apt --fix-broken install' to correct these."
msgstr ""
-"これらを直すためには 'apt-get -f install' を実行する必要があるかもしれませ"
-"ん。"
+"これらを直すためには 'apt --fix-broken install' を実行する必要があるかもしれ"
+"ません。"
-#: apt-private/private-cachefile.cc
-msgid "Unmet dependencies. Try using -f."
-msgstr "未解決の依存関係があります。-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 ""
+"未解決の依存関係です。'apt --fix-broken install' を実行してみてください (また"
+"は解法を明示してください)。"
#: apt-private/private-cacheset.cc apt-private/private-search.cc
msgid "Sorting"
@@ -2067,20 +2074,6 @@ msgid_plural "Use '%s' to remove them."
msgstr[0] "これを削除するには '%s' を利用してください。"
#: apt-private/private-install.cc
-msgid "You might want to run 'apt-get -f install' to correct these:"
-msgstr ""
-"以下の問題を解決するために 'apt-get -f install' を実行する必要があるかもしれ"
-"ません:"
-
-#: apt-private/private-install.cc
-msgid ""
-"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
-"solution)."
-msgstr ""
-"未解決の依存関係です。'apt-get -f install' を実行してみてください (または解法"
-"を明示してください)。"
-
-#: apt-private/private-install.cc
msgid "The following additional packages will be installed:"
msgstr "以下の追加パッケージがインストールされます:"
@@ -2471,7 +2464,6 @@ msgid "Unpack command '%s' failed.\n"
msgstr "展開コマンド '%s' が失敗しました。\n"
#: apt-private/private-source.cc
-#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr ""
"'dpkg-dev' パッケージがインストールされていることを確認してください。\n"
@@ -3862,6 +3854,15 @@ msgstr "内部エラー"
msgid "Empty files can't be valid archives"
msgstr "空のファイルは有効なアーカイブと認められません"
+#~ msgid "Unmet dependencies. Try using --fix-broken."
+#~ msgstr ""
+#~ "未解決の依存関係があります。--fix-broken オプションを試してください。"
+
+#~ msgid "You might want to run 'apt --fix-broken install' to correct these:"
+#~ msgstr ""
+#~ "以下の問題を解決するために 'apt --fix-broken install' を実行する必要がある"
+#~ "かもしれません:"
+
#~ msgid "Failed to fetch %s %s\n"
#~ msgstr "%s の取得に失敗しました %s\n"
diff --git a/po/km.po b/po/km.po
index f63709df4..79c016444 100644
--- a/po/km.po
+++ b/po/km.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 1.0.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: 2006-10-10 09:48+0700\n"
"Last-Translator: Khoem Sokhem <khoemsokhem@khmeros.info>\n"
"Language-Team: Khmer <support@khmeros.info>\n"
@@ -410,8 +410,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
@@ -1605,13 +1605,17 @@ msgstr "មិនអាច​បង្រួម​ការ​កំណត់​
msgid " Done"
msgstr " ធ្វើ​រួច"
-#: apt-private/private-cachefile.cc
-msgid "You might want to run 'apt-get -f install' to correct these."
-msgstr "អ្នក​ប្រហែល​ជា​ចង់រត់ '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 "អ្នក​ប្រហែល​ជា​ចង់រត់ 'apt --fix-broken install' ដើម្បី​កែ​វា​​ទាំងនេះ​ហើយ ។"
-#: apt-private/private-cachefile.cc
-msgid "Unmet dependencies. Try using -f."
-msgstr "ភាព​អាស្រ័យ​ដែល​ខុស​គ្នា ។ ព្យាយាម​ការ​ប្រើ -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 ""
+"ភាពអស្រ័យ​ដែល​ខុស​គ្នា ។ ព្យាយាម​ 'apt --fix-broken install' ដោយ​គ្មាន​កញ្ចប់ (ឬ បញ្ជាក់​"
+"ដំណោះស្រាយ) ។"
#: apt-private/private-cacheset.cc apt-private/private-search.cc
msgid "Sorting"
@@ -1971,17 +1975,6 @@ msgstr[0] ""
msgstr[1] ""
#: apt-private/private-install.cc
-msgid "You might want to run 'apt-get -f install' to correct these:"
-msgstr "អ្នក​ប្រហែល​ជា​ចង់​រត់ 'apt-get -f install' ដើម្បី​កែ​ពួក​វា​ទាំង​នេះ ៖"
-
-#: apt-private/private-install.cc
-msgid ""
-"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
-"solution)."
-msgstr ""
-"ភាពអស្រ័យ​ដែល​ខុស​គ្នា ។ ព្យាយាម​ 'apt-get -f install' ដោយ​គ្មាន​កញ្ចប់ (ឬ បញ្ជាក់​ដំណោះស្រាយ) ។"
-
-#: apt-private/private-install.cc
#, fuzzy
msgid "The following additional packages will be installed:"
msgstr "កញ្ចប់​បន្ថែម​ដូចតទៅនេះ នឹងត្រូវបាន​ដំឡើង ៖"
@@ -2361,7 +2354,6 @@ msgid "Unpack command '%s' failed.\n"
msgstr "ពាក្យ​បញ្ជា​ស្រាយ '%s' បាន​បរាជ័យ​ ។\n"
#: apt-private/private-source.cc
-#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "ពិនិត្យ​ប្រសិន​បើកញ្ចប់ 'dpkg-dev' មិន​ទាន់​បាន​ដំឡើង​ ។\n"
@@ -3730,6 +3722,12 @@ msgstr "កំហុស​ខាង​ក្នុង​"
msgid "Empty files can't be valid archives"
msgstr ""
+#~ msgid "Unmet dependencies. Try using --fix-broken."
+#~ msgstr "ភាព​អាស្រ័យ​ដែល​ខុស​គ្នា ។ ព្យាយាម​ការ​ប្រើ --fix-broken ។"
+
+#~ msgid "You might want to run 'apt --fix-broken install' to correct these:"
+#~ msgstr "អ្នក​ប្រហែល​ជា​ចង់​រត់ 'apt --fix-broken install' ដើម្បី​កែ​ពួក​វា​ទាំង​នេះ ៖"
+
#~ msgid "(not found)"
#~ msgstr "(រក​មិន​ឃើញ)"
diff --git a/po/ko.po b/po/ko.po
index 34c4c3ac5..5012d4ea5 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -5,7 +5,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 1.0.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: 2010-08-30 02:31+0900\n"
"Last-Translator: Changwoo Ryu <cwryu@debian.org>\n"
"Language-Team: Korean <debian-l10n-korean@lists.debian.org>\n"
@@ -407,8 +407,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
@@ -1616,14 +1616,20 @@ msgstr "업그레이드 집합을 최소화할 수 없습니다"
msgid " Done"
msgstr " 완료"
-#: apt-private/private-cachefile.cc
-msgid "You might want to run 'apt-get -f install' to correct these."
+#: apt-private/private-cachefile.cc apt-private/private-install.cc
+msgid "You might want to run 'apt --fix-broken install' to correct these."
msgstr ""
-"이 상황을 바로잡으려면 'apt-get -f install'을 실행해야 할 수도 있습니다."
+"이 상황을 바로잡으려면 'apt --fix-broken install'을 실행해야 할 수도 있습니"
+"다."
-#: apt-private/private-cachefile.cc
-msgid "Unmet dependencies. Try using -f."
-msgstr "의존성이 맞지 않습니다. -f 옵션을 사용해 보십시오."
+# FIXME: specify a solution? 무슨 솔루션?
+#: 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 ""
+"의존성이 맞지 않습니다. 패키지 없이 'apt --fix-broken install'을 시도해 보십"
+"시오 (아니면 해결 방법을 지정하십시오)."
#: apt-private/private-cacheset.cc apt-private/private-search.cc
msgid "Sorting"
@@ -1982,19 +1988,6 @@ msgid_plural "Use '%s' to remove them."
msgstr[0] "이들을 지우려면 '%s'를 사용하십시오."
#: apt-private/private-install.cc
-msgid "You might want to run 'apt-get -f install' to correct these:"
-msgstr "다음을 바로잡으려면 'apt-get -f install'을 실행해 보십시오:"
-
-# FIXME: specify a solution? 무슨 솔루션?
-#: apt-private/private-install.cc
-msgid ""
-"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
-"solution)."
-msgstr ""
-"의존성이 맞지 않습니다. 패키지 없이 'apt-get -f install'을 시도해 보십시오 "
-"(아니면 해결 방법을 지정하십시오)."
-
-#: apt-private/private-install.cc
#, fuzzy
msgid "The following additional packages will be installed:"
msgstr "다음 패키지를 더 설치할 것입니다:"
@@ -2381,7 +2374,6 @@ msgid "Unpack command '%s' failed.\n"
msgstr "압축 풀기 명령 '%s' 실패.\n"
#: apt-private/private-source.cc
-#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "'dpkg-dev' 패키지가 설치되었는지를 확인하십시오.\n"
@@ -3745,6 +3737,12 @@ msgstr "내부 오류"
msgid "Empty files can't be valid archives"
msgstr ""
+#~ msgid "Unmet dependencies. Try using --fix-broken."
+#~ msgstr "의존성이 맞지 않습니다. --fix-broken 옵션을 사용해 보십시오."
+
+#~ msgid "You might want to run 'apt --fix-broken install' to correct these:"
+#~ msgstr "다음을 바로잡으려면 'apt --fix-broken install'을 실행해 보십시오:"
+
#~ msgid "(not found)"
#~ msgstr "(없음)"
diff --git a/po/ku.po b/po/ku.po
index 08aeb6f97..b116f9ce1 100644
--- a/po/ku.po
+++ b/po/ku.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 1.0.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: 2008-05-08 12:48+0200\n"
"Last-Translator: Erdal Ronahi <erdal.ronahi@gmail.com>\n"
"Language-Team: ku <ubuntu-l10n-kur@lists.ubuntu.com>\n"
@@ -406,8 +406,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
@@ -1587,12 +1587,14 @@ msgstr ""
msgid " Done"
msgstr " Temam"
-#: apt-private/private-cachefile.cc
-msgid "You might want to run 'apt-get -f install' to correct these."
+#: apt-private/private-cachefile.cc apt-private/private-install.cc
+msgid "You might want to run 'apt --fix-broken install' to correct these."
msgstr ""
-#: apt-private/private-cachefile.cc
-msgid "Unmet dependencies. Try using -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 ""
#: apt-private/private-cacheset.cc apt-private/private-search.cc
@@ -1936,16 +1938,6 @@ msgstr[0] ""
msgstr[1] ""
#: apt-private/private-install.cc
-msgid "You might want to run 'apt-get -f install' to correct these:"
-msgstr ""
-
-#: apt-private/private-install.cc
-msgid ""
-"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
-"solution)."
-msgstr ""
-
-#: apt-private/private-install.cc
#, fuzzy
msgid "The following additional packages will be installed:"
msgstr "Ev pakêtên NÛ dê werine sazkirin:"
@@ -2324,7 +2316,6 @@ msgid "Unpack command '%s' failed.\n"
msgstr ""
#: apt-private/private-source.cc
-#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr ""
diff --git a/po/lt.po b/po/lt.po
index 656f6eb76..751585c98 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 1.0.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: 2008-08-02 01:47-0400\n"
"Last-Translator: Gintautas Miliauskas <gintas@akl.lt>\n"
"Language-Team: Lithuanian <komp_lt@konferencijos.lt>\n"
@@ -406,8 +406,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
@@ -1596,13 +1596,18 @@ msgstr "Nepavyko minimizuoti atnaujinimo rinkinio"
msgid " Done"
msgstr " Įvykdyta"
-#: apt-private/private-cachefile.cc
-msgid "You might want to run 'apt-get -f install' to correct these."
-msgstr "Įvykdykite „apt-get -f install“, jei norite ištaisyti šias klaidas."
+#: apt-private/private-cachefile.cc apt-private/private-install.cc
+msgid "You might want to run 'apt --fix-broken install' to correct these."
+msgstr ""
+"Įvykdykite „apt --fix-broken install“, jei norite ištaisyti šias klaidas."
-#: apt-private/private-cachefile.cc
-msgid "Unmet dependencies. Try using -f."
-msgstr "Nepatenkintos priklausomybės. Bandykit naudoti -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 ""
+"Nepatenkintos priklausomybės. Pabandykite įvykdyti 'apt --fix-broken "
+"install' be nurodytų paketų (arba nurodykite išeitį)."
#: apt-private/private-cacheset.cc apt-private/private-search.cc
msgid "Sorting"
@@ -1959,18 +1964,6 @@ msgstr[0] "Norėdami juos pašalinti, paleiskite „%s“"
msgstr[1] "Norėdami juos pašalinti, paleiskite „%s“"
#: apt-private/private-install.cc
-msgid "You might want to run 'apt-get -f install' to correct these:"
-msgstr "Jūs galite norėti paleisti 'apt-get -f install\" klaidų taisymui:"
-
-#: apt-private/private-install.cc
-msgid ""
-"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
-"solution)."
-msgstr ""
-"Nepatenkintos priklausomybės. Pabandykite įvykdyti 'apt-get -f install' be "
-"nurodytų paketų (arba nurodykite išeitį)."
-
-#: apt-private/private-install.cc
#, fuzzy
msgid "The following additional packages will be installed:"
msgstr "Bus įdiegti šie papildomi paketai:"
@@ -2351,7 +2344,6 @@ msgid "Unpack command '%s' failed.\n"
msgstr "Nepavyko įvykdyti išpakavimo komandos „%s“\n"
#: apt-private/private-source.cc
-#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Patikrinkite, ar įdiegtas „dpkg-dev“ paketas.\n"
@@ -3724,6 +3716,13 @@ msgstr "Vidinė klaida"
msgid "Empty files can't be valid archives"
msgstr ""
+#~ msgid "Unmet dependencies. Try using --fix-broken."
+#~ msgstr "Nepatenkintos priklausomybės. Bandykit naudoti --fix-broken."
+
+#~ msgid "You might want to run 'apt --fix-broken install' to correct these:"
+#~ msgstr ""
+#~ "Jūs galite norėti paleisti 'apt --fix-broken install\" klaidų taisymui:"
+
#~ msgid "(not found)"
#~ msgstr "(nerasta)"
diff --git a/po/mr.po b/po/mr.po
index 45040d8eb..90ea8d5e7 100644
--- a/po/mr.po
+++ b/po/mr.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 1.0.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: 2008-11-20 23:27+0530\n"
"Last-Translator: Sampada <sampadanakhare@gmail.com>\n"
"Language-Team: Marathi, janabhaaratii, C-DAC, Mumbai, India "
@@ -407,8 +407,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
@@ -1607,13 +1607,17 @@ msgstr "आवृत्तीकृत संच कमीतकमी करण
msgid " Done"
msgstr "झाले"
-#: apt-private/private-cachefile.cc
-msgid "You might want to run 'apt-get -f install' to correct these."
+#: apt-private/private-cachefile.cc apt-private/private-install.cc
+msgid "You might want to run 'apt --fix-broken install' to correct these."
msgstr "हे बरोबर करण्यासाठी तुम्हाला `apt-get -f संस्थापना' प्रोग्राम चालू करावा लागेल."
-#: apt-private/private-cachefile.cc
-msgid "Unmet dependencies. Try using -f."
-msgstr "अनमेट डिपेंडन्सीज.-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 ""
+"अनमेट डिपेंडन्सीज.एपीटी-गेट -एफ संस्थापन ('apt --fix-broken install') पॅकेजशिवाय "
+"प्रयत्न करा (किंवा पर्याय सांगा)."
#: apt-private/private-cacheset.cc apt-private/private-search.cc
msgid "Sorting"
@@ -1975,20 +1979,6 @@ msgstr[0] "ती काढून टाकण्यासाठी '%s' वा
msgstr[1] "ती काढून टाकण्यासाठी '%s' वापरा."
#: apt-private/private-install.cc
-msgid "You might want to run 'apt-get -f install' to correct these:"
-msgstr ""
-"तुम्हाला कदाचित 'apt-get -f install'(एपीटी-गेट -एफ संस्थापन') प्रोग्राम चालू करावा "
-"लागेल'यात बदल करण्यासाठी:"
-
-#: apt-private/private-install.cc
-msgid ""
-"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
-"solution)."
-msgstr ""
-"अनमेट डिपेंडन्सीज.एपीटी-गेट -एफ संस्थापन ('apt-get -f install') पॅकेजशिवाय प्रयत्न करा "
-"(किंवा पर्याय सांगा)."
-
-#: apt-private/private-install.cc
#, fuzzy
msgid "The following additional packages will be installed:"
msgstr "खालील अतिरिक्त पॅकेजेस संस्थापित होतील:"
@@ -2368,7 +2358,6 @@ msgid "Unpack command '%s' failed.\n"
msgstr "'%s' आज्ञा सुट्या करण्यास असमर्थ.\n"
#: apt-private/private-source.cc
-#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "'dpkg-dev' पॅकेज संस्थापित केले आहे का ते पडताळून पहा.\n"
@@ -3733,6 +3722,14 @@ msgstr "अंतर्गत त्रुटी"
msgid "Empty files can't be valid archives"
msgstr ""
+#~ msgid "Unmet dependencies. Try using --fix-broken."
+#~ msgstr "अनमेट डिपेंडन्सीज.--fix-broken.वापरून प्रयत्न करा "
+
+#~ msgid "You might want to run 'apt --fix-broken install' to correct these:"
+#~ msgstr ""
+#~ "तुम्हाला कदाचित 'apt --fix-broken install'(एपीटी-गेट -एफ संस्थापन') प्रोग्राम "
+#~ "चालू करावा लागेल'यात बदल करण्यासाठी:"
+
#~ msgid "(not found)"
#~ msgstr "(मिळाले नाही)"
diff --git a/po/nb.po b/po/nb.po
index 53f9e23e3..a477d4c11 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -12,7 +12,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 1.0.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: 2016-06-11 22:38+0200\n"
"Last-Translator: Petter Reinholdtsen <pere@hungry.com>\n"
"Language-Team: Norwegian Bokmål <i18n-no@lister.ping.uio.no>\n"
@@ -413,8 +413,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
@@ -1635,13 +1635,17 @@ msgstr "Klarer ikke å minimere oppgraderingsettet"
msgid " Done"
msgstr " Utført"
-#: apt-private/private-cachefile.cc
-msgid "You might want to run 'apt-get -f install' to correct these."
-msgstr "Du vil kanskje kjøre «apt-get -f install» for å rette på dette."
+#: apt-private/private-cachefile.cc apt-private/private-install.cc
+msgid "You might want to run 'apt --fix-broken install' to correct these."
+msgstr "Du vil kanskje kjøre «apt --fix-broken install» for å rette på dette."
-#: apt-private/private-cachefile.cc
-msgid "Unmet dependencies. Try using -f."
-msgstr "Uinnfridde avhengighetsforhold - Prøv «-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 ""
+"Uinnfridde avhengighetsforhold. Prøv «apt --fix-broken install» uten pakker "
+"(eller angi en løsning)."
#: apt-private/private-cacheset.cc apt-private/private-search.cc
msgid "Sorting"
@@ -2014,18 +2018,6 @@ msgstr[0] "Bruk «%s» for å fjerne den."
msgstr[1] "Bruk «%s» for å fjerne dem."
#: apt-private/private-install.cc
-msgid "You might want to run 'apt-get -f install' to correct these:"
-msgstr "Du vil kanskje utføre «apt-get -f install» for å rette på disse:"
-
-#: apt-private/private-install.cc
-msgid ""
-"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
-"solution)."
-msgstr ""
-"Uinnfridde avhengighetsforhold. Prøv «apt-get -f install» uten pakker (eller "
-"angi en løsning)."
-
-#: apt-private/private-install.cc
msgid "The following additional packages will be installed:"
msgstr "Følgende ekstra pakker vil bli installert:"
@@ -2421,7 +2413,6 @@ msgid "Unpack command '%s' failed.\n"
msgstr "Utpakkingskommandoen «%s» mislyktes.\n"
#: apt-private/private-source.cc
-#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Sjekk om pakken «dpkg-dev» er installert.\n"
@@ -3803,6 +3794,13 @@ msgstr "Intern feil"
msgid "Empty files can't be valid archives"
msgstr "Tomme filer kan ikke være gyldige arkiver"
+#~ msgid "Unmet dependencies. Try using --fix-broken."
+#~ msgstr "Uinnfridde avhengighetsforhold - Prøv «--fix-broken»."
+
+#~ msgid "You might want to run 'apt --fix-broken install' to correct these:"
+#~ msgstr ""
+#~ "Du vil kanskje utføre «apt --fix-broken install» for å rette på disse:"
+
#~ msgid "Failed to fetch %s %s\n"
#~ msgstr "Klarte ikke å skaffe %s %s\n"
diff --git a/po/ne.po b/po/ne.po
index 87f8ddfaa..19654ca0f 100644
--- a/po/ne.po
+++ b/po/ne.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 1.0.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: 2006-06-12 14:35+0545\n"
"Last-Translator: Shiva Pokharel <pokharelshiva@hotmail.com>\n"
"Language-Team: Nepali <info@mpp.org.np>\n"
@@ -406,8 +406,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
@@ -1602,13 +1602,17 @@ msgstr "स्तर वृद्धि सेटलाई न्यूनतम
msgid " Done"
msgstr "काम भयो"
-#: apt-private/private-cachefile.cc
-msgid "You might want to run 'apt-get -f install' to correct these."
-msgstr "यी सुधार गर्न तपाईँले '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 "यी सुधार गर्न तपाईँले 'apt --fix-broken install' चलाउन पर्छ ।"
-#: apt-private/private-cachefile.cc
-msgid "Unmet dependencies. Try using -f."
-msgstr "नभेटिएका निर्भरताहरू । -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 ""
+"नभेटिएका निर्भरताहरू । प्याकेजहरू बिना 'apt --fix-broken install' प्रयास गर्नुहोस् "
+"( वा समाधान निर्दिष्ट गर्नुहोस्) ।"
#: apt-private/private-cacheset.cc apt-private/private-search.cc
msgid "Sorting"
@@ -1969,18 +1973,6 @@ msgstr[0] ""
msgstr[1] ""
#: apt-private/private-install.cc
-msgid "You might want to run 'apt-get -f install' to correct these:"
-msgstr "तपाईँ यसलाई सुधार गर्न 'apt-get -f install' चलाउन चाहनुहुन्छ:"
-
-#: apt-private/private-install.cc
-msgid ""
-"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
-"solution)."
-msgstr ""
-"नभेटिएका निर्भरताहरू । प्याकेजहरू बिना 'apt-get -f install' प्रयास गर्नुहोस् ( वा "
-"समाधान निर्दिष्ट गर्नुहोस्) ।"
-
-#: apt-private/private-install.cc
#, fuzzy
msgid "The following additional packages will be installed:"
msgstr "निम्न अतिरिक्त प्याकेजहरू स्थापना हुनेछन्:"
@@ -2360,7 +2352,6 @@ msgid "Unpack command '%s' failed.\n"
msgstr "अनप्याक आदेश '%s' असफल भयो ।\n"
#: apt-private/private-source.cc
-#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "जाँच्नुहोस् यदि 'dpkg-dev' प्याकेज स्थापना भयो ।\n"
@@ -3730,6 +3721,12 @@ msgstr "आन्तरिक त्रुटि"
msgid "Empty files can't be valid archives"
msgstr ""
+#~ msgid "Unmet dependencies. Try using --fix-broken."
+#~ msgstr "नभेटिएका निर्भरताहरू । --fix-broken प्रयोग गरेर प्रयास गर्नुहोस् ।"
+
+#~ msgid "You might want to run 'apt --fix-broken install' to correct these:"
+#~ msgstr "तपाईँ यसलाई सुधार गर्न 'apt --fix-broken install' चलाउन चाहनुहुन्छ:"
+
#~ msgid "(not found)"
#~ msgstr "(फेला परेन)"
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"
diff --git a/po/nn.po b/po/nn.po
index 4cb001c6f..a1f035925 100644
--- a/po/nn.po
+++ b/po/nn.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 1.0.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: 2005-02-14 23:30+0100\n"
"Last-Translator: Havard Korsvoll <korsvoll@skulelinux.no>\n"
"Language-Team: Norwegian nynorsk <i18n-nn@lister.ping.uio.no>\n"
@@ -413,8 +413,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
@@ -1611,14 +1611,18 @@ msgstr "Klarte ikkje minimera oppgraderingsmengda"
msgid " Done"
msgstr " Ferdig"
-#: apt-private/private-cachefile.cc
-msgid "You might want to run 'apt-get -f install' to correct these."
+#: apt-private/private-cachefile.cc apt-private/private-install.cc
+msgid "You might want to run 'apt --fix-broken install' to correct these."
msgstr ""
-"Du vil kanskje prva retta p desse ved kyra apt-get -f install."
+"Du vil kanskje prva retta p desse ved kyra apt --fix-broken install."
-#: apt-private/private-cachefile.cc
-msgid "Unmet dependencies. Try using -f."
-msgstr "Nokre krav er ikkje oppfylte. Prv med -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 ""
+"Nokre krav er ikkje oppfylte. Du kan prva apt --fix-broken install (eller "
+"velja ei lysing)."
#: apt-private/private-cacheset.cc apt-private/private-search.cc
msgid "Sorting"
@@ -1978,19 +1982,6 @@ msgstr[0] ""
msgstr[1] ""
#: apt-private/private-install.cc
-msgid "You might want to run 'apt-get -f install' to correct these:"
-msgstr ""
-"Du vil kanskje prva retta p desse ved kyra apt-get -f install."
-
-#: apt-private/private-install.cc
-msgid ""
-"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
-"solution)."
-msgstr ""
-"Nokre krav er ikkje oppfylte. Du kan prva apt-get -f install (eller velja "
-"ei lysing)."
-
-#: apt-private/private-install.cc
#, fuzzy
msgid "The following additional packages will be installed:"
msgstr "Dei flgjande tilleggspakkane vil verta installerte:"
@@ -2375,7 +2366,6 @@ msgid "Unpack command '%s' failed.\n"
msgstr "Utpakkingskommandoen %s mislukkast.\n"
#: apt-private/private-source.cc
-#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr ""
@@ -3746,6 +3736,14 @@ msgstr "Intern feil"
msgid "Empty files can't be valid archives"
msgstr ""
+#~ msgid "Unmet dependencies. Try using --fix-broken."
+#~ msgstr "Nokre krav er ikkje oppfylte. Prv med --fix-broken."
+
+#~ msgid "You might want to run 'apt --fix-broken install' to correct these:"
+#~ msgstr ""
+#~ "Du vil kanskje prva retta p desse ved kyra apt --fix-broken "
+#~ "install."
+
#~ msgid "(not found)"
#~ msgstr "(ikkje funne)"
diff --git a/po/pl.po b/po/pl.po
index 1918c28ca..f26224d0d 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.9.7.3\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-07-28 21:53+0200\n"
"Last-Translator: Michał Kułach <michal.kulach@gmail.com>\n"
"Language-Team: Polish <debian-l10n-polish@lists.debian.org>\n"
@@ -418,8 +418,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
@@ -1672,13 +1672,17 @@ msgstr "Nie udało się zminimalizować zbioru aktualizacji"
msgid " Done"
msgstr " Gotowe"
-#: apt-private/private-cachefile.cc
-msgid "You might want to run 'apt-get -f install' to correct these."
-msgstr "Należy uruchomić \"apt-get -f install\", aby je naprawić."
+#: apt-private/private-cachefile.cc apt-private/private-install.cc
+msgid "You might want to run 'apt --fix-broken install' to correct these."
+msgstr "Należy uruchomić \"apt --fix-broken install\", aby je naprawić."
-#: apt-private/private-cachefile.cc
-msgid "Unmet dependencies. Try using -f."
-msgstr "Niespełnione zależności. Proszę spróbować użyć -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 ""
+"Niespełnione zależności. Proszę spróbować wykonać \"apt --fix-broken install"
+"\" bez pakietów (lub podać rozwiązanie)."
#: apt-private/private-cacheset.cc apt-private/private-search.cc
msgid "Sorting"
@@ -2062,19 +2066,6 @@ msgstr[1] "Aby je usunąć należy użyć \"%s\"."
msgstr[2] "Aby je usunąć należy użyć \"%s\"."
#: apt-private/private-install.cc
-msgid "You might want to run 'apt-get -f install' to correct these:"
-msgstr ""
-"Należy uruchomić \"apt-get -f install\", aby naprawić poniższe problemy:"
-
-#: apt-private/private-install.cc
-msgid ""
-"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
-"solution)."
-msgstr ""
-"Niespełnione zależności. Proszę spróbować wykonać \"apt-get -f install\" bez "
-"pakietów (lub podać rozwiązanie)."
-
-#: apt-private/private-install.cc
#, fuzzy
msgid "The following additional packages will be installed:"
msgstr "Zostaną zainstalowane następujące dodatkowe pakiety:"
@@ -2476,7 +2467,6 @@ msgid "Unpack command '%s' failed.\n"
msgstr "Polecenie rozpakowania \"%s\" zawiodło.\n"
#: apt-private/private-source.cc
-#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Proszę sprawdzić czy pakiet \"dpkg-dev\" jest zainstalowany.\n"
@@ -3865,6 +3855,14 @@ msgstr "Błąd wewnętrzny"
msgid "Empty files can't be valid archives"
msgstr "Puste pliki nie mogą być prawidłowymi archiwami"
+#~ msgid "Unmet dependencies. Try using --fix-broken."
+#~ msgstr "Niespełnione zależności. Proszę spróbować użyć --fix-broken."
+
+#~ msgid "You might want to run 'apt --fix-broken install' to correct these:"
+#~ msgstr ""
+#~ "Należy uruchomić \"apt --fix-broken install\", aby naprawić poniższe "
+#~ "problemy:"
+
#~ msgid "(not found)"
#~ msgstr "(nie znaleziono)"
diff --git a/po/pt.po b/po/pt.po
index 0fe8a4614..650fd33de 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 1.0.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-29 15:45+0100\n"
"Last-Translator: Miguel Figueiredo <elmig@debianpt.org>\n"
"Language-Team: Portuguese <traduz@debianpt.org>\n"
@@ -417,8 +417,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
@@ -1676,13 +1676,18 @@ msgstr "Não foi possível minimizar o conjunto de actualizações"
msgid " Done"
msgstr " Feito"
-#: apt-private/private-cachefile.cc
-msgid "You might want to run 'apt-get -f install' to correct these."
-msgstr "Você pode querer executar 'apt-get -f install' para corrigir isso."
+#: apt-private/private-cachefile.cc apt-private/private-install.cc
+msgid "You might want to run 'apt --fix-broken install' to correct these."
+msgstr ""
+"Você pode querer executar 'apt --fix-broken install' para corrigir isso."
-#: apt-private/private-cachefile.cc
-msgid "Unmet dependencies. Try using -f."
-msgstr "Dependências não satisfeitas. Tente utilizar -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 ""
+"Dependências não satisfeitas. Tente 'apt --fix-broken install' sem nenhum "
+"pacote (ou especifique uma solução)."
#: apt-private/private-cacheset.cc apt-private/private-search.cc
msgid "Sorting"
@@ -2051,18 +2056,6 @@ msgstr[0] "Utilize '%s' para o remover."
msgstr[1] "Utilize '%s' para os remover."
#: apt-private/private-install.cc
-msgid "You might want to run 'apt-get -f install' to correct these:"
-msgstr "Você deve querer executar 'apt-get -f install' para corrigir estes:"
-
-#: apt-private/private-install.cc
-msgid ""
-"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
-"solution)."
-msgstr ""
-"Dependências não satisfeitas. Tente 'apt-get -f install' sem nenhum pacote "
-"(ou especifique uma solução)."
-
-#: apt-private/private-install.cc
#, fuzzy
msgid "The following additional packages will be installed:"
msgstr "Os seguintes pacotes extra serão instalados:"
@@ -2455,7 +2448,6 @@ msgid "Unpack command '%s' failed.\n"
msgstr "O comando de descompactação '%s' falhou.\n"
#: apt-private/private-source.cc
-#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Verifique se o pacote 'dpkg-dev' está instalado.\n"
@@ -3841,6 +3833,13 @@ msgstr "Erro interno"
msgid "Empty files can't be valid archives"
msgstr "Ficheiros vazios não podem ser arquivos válidos"
+#~ msgid "Unmet dependencies. Try using --fix-broken."
+#~ msgstr "Dependências não satisfeitas. Tente utilizar --fix-broken."
+
+#~ msgid "You might want to run 'apt --fix-broken install' to correct these:"
+#~ msgstr ""
+#~ "Você deve querer executar 'apt --fix-broken install' para corrigir estes:"
+
#~ msgid "(not found)"
#~ msgstr "(não encontrado)"
@@ -4436,12 +4435,12 @@ msgstr "Ficheiros vazios não podem ser arquivos válidos"
#~ msgid ""
#~ "Some broken packages were found while trying to process build-"
#~ "dependencies.\n"
-#~ "You might want to run 'apt-get -f install' to correct these."
+#~ "You might want to run 'apt --fix-broken install' to correct these."
#~ msgstr ""
#~ "Alguns pacotes quebrados foram encontrados enquanto se tentava "
#~ "processar \n"
#~ "as dependências de construção.\n"
-#~ "Você pode querer rodar 'apt-get -f install' para corrigí-los."
+#~ "Você pode querer rodar 'apt --fix-broken install' para corrigí-los."
#~ msgid "Sorry, you don't have enough free space in %s to hold all the .debs."
#~ msgstr ""
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 068834598..1b864481f 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 1.0.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: 2008-11-17 02:33-0200\n"
"Last-Translator: Felipe Augusto van de Wiel (faw) <faw@debian.org>\n"
"Language-Team: Brazilian Portuguese <debian-l10n-portuguese@lists.debian."
@@ -410,8 +410,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
@@ -1619,13 +1619,17 @@ msgstr "Impossível minimizar o conjunto de atualizações"
msgid " Done"
msgstr " Pronto"
-#: apt-private/private-cachefile.cc
-msgid "You might want to run 'apt-get -f install' to correct these."
-msgstr "Você pode querer executar 'apt-get -f install' para corrigí-los."
+#: apt-private/private-cachefile.cc apt-private/private-install.cc
+msgid "You might want to run 'apt --fix-broken install' to correct these."
+msgstr "Você pode querer executar 'apt --fix-broken install' para corrigí-los."
-#: apt-private/private-cachefile.cc
-msgid "Unmet dependencies. Try using -f."
-msgstr "Dependências desencontradas. Tente usar -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 ""
+"Dependências desencontradas. Tente 'apt --fix-broken install' sem nenhum "
+"pacote (ou especifique uma solução)."
#: apt-private/private-cacheset.cc apt-private/private-search.cc
msgid "Sorting"
@@ -1995,18 +1999,6 @@ msgstr[0] "Use '%s' para removê-los."
msgstr[1] "Use '%s' para removê-los."
#: apt-private/private-install.cc
-msgid "You might want to run 'apt-get -f install' to correct these:"
-msgstr "Você deve querer executar 'apt-get -f install' para corrigí-los:"
-
-#: apt-private/private-install.cc
-msgid ""
-"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
-"solution)."
-msgstr ""
-"Dependências desencontradas. Tente 'apt-get -f install' sem nenhum pacote "
-"(ou especifique uma solução)."
-
-#: apt-private/private-install.cc
#, fuzzy
msgid "The following additional packages will be installed:"
msgstr "Os pacotes extra a seguir serão instalados:"
@@ -2389,7 +2381,6 @@ msgid "Unpack command '%s' failed.\n"
msgstr "Comando de desempacotamento '%s' falhou.\n"
#: apt-private/private-source.cc
-#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Confira se o pacote 'dpkg-dev' está instalado.\n"
@@ -3776,6 +3767,13 @@ msgstr "Erro interno"
msgid "Empty files can't be valid archives"
msgstr ""
+#~ msgid "Unmet dependencies. Try using --fix-broken."
+#~ msgstr "Dependências desencontradas. Tente usar --fix-broken."
+
+#~ msgid "You might want to run 'apt --fix-broken install' to correct these:"
+#~ msgstr ""
+#~ "Você deve querer executar 'apt --fix-broken install' para corrigí-los:"
+
#~ msgid "(not found)"
#~ msgstr "(não encontrado)"
@@ -4263,12 +4261,12 @@ msgstr ""
#~ msgid ""
#~ "Some broken packages were found while trying to process build-"
#~ "dependencies.\n"
-#~ "You might want to run 'apt-get -f install' to correct these."
+#~ "You might want to run 'apt --fix-broken install' to correct these."
#~ msgstr ""
#~ "Alguns pacotes quebrados foram encontrados enquanto se tentava "
#~ "processar \n"
#~ "as dependências de construção.\n"
-#~ "Você pode querer rodar 'apt-get -f install' para corrigí-los."
+#~ "Você pode querer rodar 'apt --fix-broken install' para corrigí-los."
#~ msgid "Sorry, you don't have enough free space in %s to hold all the .debs."
#~ msgstr ""
diff --git a/po/ro.po b/po/ro.po
index 8199ae8e0..a7afc718d 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 1.0.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: 2008-11-15 02:21+0200\n"
"Last-Translator: Eddy Petrișor <eddy.petrisor@gmail.com>\n"
"Language-Team: Romanian <debian-l10n-romanian@lists.debian.org>\n"
@@ -413,8 +413,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
@@ -1622,13 +1622,18 @@ msgstr "Nu s-a putut micșora mulțimea pachetelor de înnoit"
msgid " Done"
msgstr " Terminat"
-#: apt-private/private-cachefile.cc
-msgid "You might want to run 'apt-get -f install' to correct these."
-msgstr "Ați putea să porniți 'apt-get -f install' pentru a corecta acestea."
+#: apt-private/private-cachefile.cc apt-private/private-install.cc
+msgid "You might want to run 'apt --fix-broken install' to correct these."
+msgstr ""
+"Ați putea să porniți 'apt --fix-broken install' pentru a corecta acestea."
-#: apt-private/private-cachefile.cc
-msgid "Unmet dependencies. Try using -f."
-msgstr "Dependențe neîndeplinite. Încercați să folosiți -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 ""
+"Dependențe neîndeplinite. Încercați 'apt --fix-broken install' fără nici un "
+"pachet (sau oferiți o altă soluție)."
#: apt-private/private-cacheset.cc apt-private/private-search.cc
msgid "Sorting"
@@ -2002,18 +2007,6 @@ msgstr[1] "Folosiți '%s' pentru a le șterge."
msgstr[2] "Folosiți '%s' pentru a le șterge."
#: apt-private/private-install.cc
-msgid "You might want to run 'apt-get -f install' to correct these:"
-msgstr "Ați putea porni 'apt-get -f install' pentru a corecta acestea:"
-
-#: apt-private/private-install.cc
-msgid ""
-"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
-"solution)."
-msgstr ""
-"Dependențe neîndeplinite. Încercați 'apt-get -f install' fără nici un pachet "
-"(sau oferiți o altă soluție)."
-
-#: apt-private/private-install.cc
#, fuzzy
msgid "The following additional packages will be installed:"
msgstr "Următoarele extra pachete vor fi instalate:"
@@ -2396,7 +2389,6 @@ msgid "Unpack command '%s' failed.\n"
msgstr "Comanda de despachetare '%s' eșuată.\n"
#: apt-private/private-source.cc
-#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Verificați dacă pachetul 'dpkg-dev' este instalat.\n"
@@ -3788,6 +3780,13 @@ msgstr "Eroare internă"
msgid "Empty files can't be valid archives"
msgstr ""
+#~ msgid "Unmet dependencies. Try using --fix-broken."
+#~ msgstr "Dependențe neîndeplinite. Încercați să folosiți --fix-broken."
+
+#~ msgid "You might want to run 'apt --fix-broken install' to correct these:"
+#~ msgstr ""
+#~ "Ați putea porni 'apt --fix-broken install' pentru a corecta acestea:"
+
#~ msgid "(not found)"
#~ msgstr "(negăsit)"
diff --git a/po/ru.po b/po/ru.po
index b622a3007..ada54bdf5 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -12,7 +12,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 1.2.12\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-05-19 20:50+0300\n"
"Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n"
"Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n"
@@ -431,10 +431,13 @@ msgstr ""
"В системе не пользователя «%s» для песочницы, невозможно сбросить права"
#: 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 ""
"Невозможно сбросить права для скачивания, так как файл «%s» недоступен для "
"пользователя «%s»."
@@ -1695,15 +1698,19 @@ msgstr "Невозможно минимизировать набор обнов
msgid " Done"
msgstr " Готово"
-#: apt-private/private-cachefile.cc
-msgid "You might want to run 'apt-get -f install' to correct these."
+#: apt-private/private-cachefile.cc apt-private/private-install.cc
+msgid "You might want to run 'apt --fix-broken install' to correct these."
msgstr ""
"Возможно, для исправления этих ошибок вы захотите воспользоваться «apt-get -"
"f install»."
-#: apt-private/private-cachefile.cc
-msgid "Unmet dependencies. Try using -f."
-msgstr "Неудовлетворённые зависимости. Попытайтесь использовать -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 ""
+"Неудовлетворённые зависимости. Попытайтесь выполнить «apt --fix-broken "
+"install», не указывая имени пакета, (или найдите другое решение)."
#: apt-private/private-cacheset.cc apt-private/private-search.cc
msgid "Sorting"
@@ -2091,20 +2098,6 @@ msgstr[1] "Для их удаления используйте «%s»."
msgstr[2] "Для их удаления используйте «%s»."
#: apt-private/private-install.cc
-msgid "You might want to run 'apt-get -f install' to correct these:"
-msgstr ""
-"Возможно, для исправления этих ошибок вы захотите воспользоваться «apt-get -"
-"f install»:"
-
-#: apt-private/private-install.cc
-msgid ""
-"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
-"solution)."
-msgstr ""
-"Неудовлетворённые зависимости. Попытайтесь выполнить «apt-get -f install», "
-"не указывая имени пакета, (или найдите другое решение)."
-
-#: apt-private/private-install.cc
msgid "The following additional packages will be installed:"
msgstr "Будут установлены следующие дополнительные пакеты:"
@@ -2493,7 +2486,6 @@ msgid "Unpack command '%s' failed.\n"
msgstr "Команда распаковки «%s» завершилась неудачно.\n"
#: apt-private/private-source.cc
-#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Проверьте, установлен ли пакет «dpkg-dev».\n"
@@ -3906,6 +3898,15 @@ msgstr "Внутренняя ошибка"
msgid "Empty files can't be valid archives"
msgstr "Пустые файлы не могут быть допустимыми архивами"
+#~ msgid "Unmet dependencies. Try using --fix-broken."
+#~ msgstr ""
+#~ "Неудовлетворённые зависимости. Попытайтесь использовать --fix-broken."
+
+#~ msgid "You might want to run 'apt --fix-broken install' to correct these:"
+#~ msgstr ""
+#~ "Возможно, для исправления этих ошибок вы захотите воспользоваться «apt-"
+#~ "get -f install»:"
+
#~ msgid "(not found)"
#~ msgstr "(не найдено)"
diff --git a/po/sk.po b/po/sk.po
index a16cdc0c8..7e7e297eb 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 1.0.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-28 20:49+0100\n"
"Last-Translator: Ivan Masár <helix84@centrum.sk>\n"
"Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
@@ -414,8 +414,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,17 @@ msgstr "Sada na aktualizáciu sa nedá minimalizovať"
msgid " Done"
msgstr " Hotovo"
-#: apt-private/private-cachefile.cc
-msgid "You might want to run 'apt-get -f install' to correct these."
-msgstr "Možno to budete chcieť napraviť spustením „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 "Možno to budete chcieť napraviť spustením „apt --fix-broken install“."
-#: apt-private/private-cachefile.cc
-msgid "Unmet dependencies. Try using -f."
-msgstr "Nesplnené závislosti. Skúste použiť -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 ""
+"Nesplnené závislosti. Skúste spustiť „apt --fix-broken install“ bez balíkov "
+"(alebo navrhnite riešenie)."
#: apt-private/private-cacheset.cc apt-private/private-search.cc
msgid "Sorting"
@@ -2024,18 +2028,6 @@ msgstr[1] "Na ich odstránenie použite „%s“."
msgstr[2] "Na ich odstránenie použite „%s“."
#: apt-private/private-install.cc
-msgid "You might want to run 'apt-get -f install' to correct these:"
-msgstr "Možno to budete chcieť napraviť spustením „apt-get -f install“:"
-
-#: apt-private/private-install.cc
-msgid ""
-"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
-"solution)."
-msgstr ""
-"Nesplnené závislosti. Skúste spustiť „apt-get -f install“ bez balíkov (alebo "
-"navrhnite riešenie)."
-
-#: apt-private/private-install.cc
#, fuzzy
msgid "The following additional packages will be installed:"
msgstr "Nainštalujú sa nasledovné extra balíky:"
@@ -2428,7 +2420,6 @@ msgid "Unpack command '%s' failed.\n"
msgstr "Príkaz na rozbalenie „%s“ zlyhal.\n"
#: apt-private/private-source.cc
-#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Skontrolujte, či je nainštalovaný balík „dpkg-dev“.\n"
@@ -3803,6 +3794,13 @@ msgstr "Vnútorná chyba"
msgid "Empty files can't be valid archives"
msgstr "Prázdne súbory nemôžu byť platné archívy"
+#~ msgid "Unmet dependencies. Try using --fix-broken."
+#~ msgstr "Nesplnené závislosti. Skúste použiť --fix-broken."
+
+#~ msgid "You might want to run 'apt --fix-broken install' to correct these:"
+#~ msgstr ""
+#~ "Možno to budete chcieť napraviť spustením „apt --fix-broken install“:"
+
#~ msgid "(not found)"
#~ msgstr "(nenájdené)"
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"
@@ -2028,18 +2033,6 @@ 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:"
msgstr "Naslednji dodatni paketi bodo nameščeni:"
@@ -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)"
diff --git a/po/sv.po b/po/sv.po
index a4f0eafa0..90dbfcfbe 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt\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: 2015-08-19 21:33+0200\n"
"Last-Translator: Anders Jonsson <anders.jonsson@norsjovallen.se>\n"
"Language-Team: Swedish <debian-l10n-swedish@debian.org>\n"
@@ -416,10 +416,13 @@ msgid "No sandbox user '%s' on the system, can not drop privileges"
msgstr ""
#: 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 inte släppa privilegier för hämtning eftersom filen ”%s” inte kunde "
"kommas åt av användaren ”%s”."
@@ -1661,13 +1664,17 @@ msgstr "Kunde inte minimera uppgraderingsuppsättningen"
msgid " Done"
msgstr " Färdig"
-#: apt-private/private-cachefile.cc
-msgid "You might want to run 'apt-get -f install' to correct these."
-msgstr "Du bör köra ”apt-get -f install” för att korrigera dessa."
+#: apt-private/private-cachefile.cc apt-private/private-install.cc
+msgid "You might want to run 'apt --fix-broken install' to correct these."
+msgstr "Du bör köra ”apt --fix-broken install” för att korrigera dessa."
-#: apt-private/private-cachefile.cc
-msgid "Unmet dependencies. Try using -f."
-msgstr "Otillfredsställda beroenden. Prova med -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 ""
+"Otillfredsställda beroenden. Prova med ”apt --fix-broken install” utan paket "
+"(eller ange en lösning)."
#: apt-private/private-cacheset.cc apt-private/private-search.cc
msgid "Sorting"
@@ -2039,18 +2046,6 @@ msgstr[0] "Använd ”%s” för att ta bort det."
msgstr[1] "Använd ”%s” för att ta bort dem."
#: apt-private/private-install.cc
-msgid "You might want to run 'apt-get -f install' to correct these:"
-msgstr "Du bör köra ”apt-get -f install” för att korrigera dessa:"
-
-#: apt-private/private-install.cc
-msgid ""
-"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
-"solution)."
-msgstr ""
-"Otillfredsställda beroenden. Prova med ”apt-get -f install” utan paket "
-"(eller ange en lösning)."
-
-#: apt-private/private-install.cc
#, fuzzy
msgid "The following additional packages will be installed:"
msgstr "Följande ytterligare paket kommer att installeras:"
@@ -2443,7 +2438,6 @@ msgid "Unpack command '%s' failed.\n"
msgstr "Uppackningskommandot ”%s” misslyckades.\n"
#: apt-private/private-source.cc
-#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Försäkra dig om att paketet ”dpkg-dev” är installerat.\n"
@@ -3840,6 +3834,12 @@ msgstr "Internt fel"
msgid "Empty files can't be valid archives"
msgstr "Tomma filer kan inte vara giltiga arkiv"
+#~ msgid "Unmet dependencies. Try using --fix-broken."
+#~ msgstr "Otillfredsställda beroenden. Prova med --fix-broken."
+
+#~ msgid "You might want to run 'apt --fix-broken install' to correct these:"
+#~ msgstr "Du bör köra ”apt --fix-broken install” för att korrigera dessa:"
+
#~ msgid "(not found)"
#~ msgstr "(hittades inte)"
diff --git a/po/th.po b/po/th.po
index 54af3b449..dcd3ed432 100644
--- a/po/th.po
+++ b/po/th.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 1.0.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: 2014-12-12 13:00+0700\n"
"Last-Translator: Theppitak Karoonboonyanan <thep@debian.org>\n"
"Language-Team: Thai <thai-l10n@googlegroups.com>\n"
@@ -411,8 +411,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
@@ -1613,13 +1613,17 @@ msgstr "ไม่สามารถจำกัดรายการปรับ
msgid " Done"
msgstr " เสร็จแล้ว"
-#: apt-private/private-cachefile.cc
-msgid "You might want to run 'apt-get -f install' to correct these."
-msgstr "คุณอาจต้องเรียก '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 "คุณอาจต้องเรียก 'apt --fix-broken install' เพื่อแก้ปัญหาเหล่านี้"
-#: apt-private/private-cachefile.cc
-msgid "Unmet dependencies. Try using -f."
-msgstr "รายการแพกเกจที่ต้องใช้ไม่ครบ กรุณาลองใช้ตัวเลือก -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 ""
+"มีปัญหาความขึ้นต่อกันระหว่างแพกเกจ กรุณาลองใช้ 'apt --fix-broken install' "
+"โดยไม่ระบุแพกเกจ (หรือจะระบุทางแก้ก็ได้)"
#: apt-private/private-cacheset.cc apt-private/private-search.cc
msgid "Sorting"
@@ -1972,18 +1976,6 @@ msgid_plural "Use '%s' to remove them."
msgstr[0] "ใช้ '%s' เพื่อถอดถอนแพกเกจดังกล่าวได้"
#: apt-private/private-install.cc
-msgid "You might want to run 'apt-get -f install' to correct these:"
-msgstr "คุณอาจเรียก 'apt-get -f install' เพื่อแก้ปัญหานี้ได้:"
-
-#: apt-private/private-install.cc
-msgid ""
-"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
-"solution)."
-msgstr ""
-"มีปัญหาความขึ้นต่อกันระหว่างแพกเกจ กรุณาลองใช้ 'apt-get -f install' โดยไม่ระบุแพกเกจ "
-"(หรือจะระบุทางแก้ก็ได้)"
-
-#: apt-private/private-install.cc
#, fuzzy
msgid "The following additional packages will be installed:"
msgstr "จะติดตั้งแพกเกจเพิ่มเติมต่อไปนี้:"
@@ -2366,7 +2358,6 @@ msgid "Unpack command '%s' failed.\n"
msgstr "คำสั่งแตกแฟ้ม '%s' ล้มเหลว\n"
#: apt-private/private-source.cc
-#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "กรุณาตรวจสอบว่าได้ติดตั้งแพกเกจ 'dpkg-dev' แล้ว\n"
@@ -3724,6 +3715,12 @@ msgstr "ข้อผิดพลาดภายใน"
msgid "Empty files can't be valid archives"
msgstr "แฟ้มว่างเปล่าไม่สามารถเป็นแฟ้มจัดเก็บที่ใช้การได้"
+#~ msgid "Unmet dependencies. Try using --fix-broken."
+#~ msgstr "รายการแพกเกจที่ต้องใช้ไม่ครบ กรุณาลองใช้ตัวเลือก --fix-broken"
+
+#~ msgid "You might want to run 'apt --fix-broken install' to correct these:"
+#~ msgstr "คุณอาจเรียก 'apt --fix-broken install' เพื่อแก้ปัญหานี้ได้:"
+
#~ msgid "(not found)"
#~ msgstr "(ไม่พบ)"
diff --git a/po/tl.po b/po/tl.po
index ca07e5012..071c6ef4a 100644
--- a/po/tl.po
+++ b/po/tl.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 1.0.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: 2007-03-29 21:36+0800\n"
"Last-Translator: Eric Pareja <xenos@upm.edu.ph>\n"
"Language-Team: Tagalog <debian-tl@banwa.upm.edu.ph>\n"
@@ -412,8 +412,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
@@ -1626,13 +1626,18 @@ msgstr "Hindi mai-minimize ang upgrade set"
msgid " Done"
msgstr " Tapos"
-#: apt-private/private-cachefile.cc
-msgid "You might want to run 'apt-get -f install' to correct these."
-msgstr "Maaari ninyong patakbuhin ang 'apt-get -f install' upang ayusin ito."
+#: apt-private/private-cachefile.cc apt-private/private-install.cc
+msgid "You might want to run 'apt --fix-broken install' to correct these."
+msgstr ""
+"Maaari ninyong patakbuhin ang 'apt --fix-broken install' upang ayusin ito."
-#: apt-private/private-cachefile.cc
-msgid "Unmet dependencies. Try using -f."
-msgstr "May mga kulang na dependensiya. Subukan niyong gamitin ang -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 ""
+"May mga dependensiyang kulang. Subukan ang 'apt --fix-broken install' na "
+"walang mga pakete (o magtakda ng solusyon)."
#: apt-private/private-cacheset.cc apt-private/private-search.cc
msgid "Sorting"
@@ -1997,19 +2002,6 @@ msgstr[0] ""
msgstr[1] ""
#: apt-private/private-install.cc
-msgid "You might want to run 'apt-get -f install' to correct these:"
-msgstr ""
-"Maaaring patakbuhin niyo ang 'apt-get -f install' upang ayusin ang mga ito:"
-
-#: apt-private/private-install.cc
-msgid ""
-"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
-"solution)."
-msgstr ""
-"May mga dependensiyang kulang. Subukan ang 'apt-get -f install' na walang "
-"mga pakete (o magtakda ng solusyon)."
-
-#: apt-private/private-install.cc
#, fuzzy
msgid "The following additional packages will be installed:"
msgstr "Ang mga sumusunod na extra na pakete ay luluklokin:"
@@ -2391,7 +2383,6 @@ msgid "Unpack command '%s' failed.\n"
msgstr "Bigo ang utos ng pagbuklat '%s'.\n"
#: apt-private/private-source.cc
-#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Paki-siguro na nakaluklok ang paketeng 'dpkg-dev'.\n"
@@ -3769,6 +3760,15 @@ msgstr "Internal na error"
msgid "Empty files can't be valid archives"
msgstr ""
+#~ msgid "Unmet dependencies. Try using --fix-broken."
+#~ msgstr ""
+#~ "May mga kulang na dependensiya. Subukan niyong gamitin ang --fix-broken."
+
+#~ msgid "You might want to run 'apt --fix-broken install' to correct these:"
+#~ msgstr ""
+#~ "Maaaring patakbuhin niyo ang 'apt --fix-broken install' upang ayusin ang "
+#~ "mga ito:"
+
#~ msgid "(not found)"
#~ msgstr "(hindi nahanap)"
diff --git a/po/tr.po b/po/tr.po
index d1977866f..89d9fee07 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 1.0.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: 2016-09-24 03:24+0300\n"
"Last-Translator: Mert Dirik <mertdirik@gmail.com>\n"
"Language-Team: Debian l10n Turkish <debian-l10n-turkish@lists.debian.org>\n"
@@ -431,10 +431,13 @@ msgstr ""
"'%s' kullanıcısı sistemde mevcut olmadığı için ayrıcalıklar bırakılamıyor"
#: 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 ""
"'%2$s' kullanıcısının '%1$s' dosyasına erişimi olmadığı için dosya "
"indirilirken ayrıcalıklar bırakılamıyor."
@@ -1668,15 +1671,19 @@ msgstr "Yükseltme kümesi küçültülemiyor"
msgid " Done"
msgstr " Tamamlandı"
-#: apt-private/private-cachefile.cc
-msgid "You might want to run 'apt-get -f install' to correct these."
+#: apt-private/private-cachefile.cc apt-private/private-install.cc
+msgid "You might want to run 'apt --fix-broken install' to correct these."
msgstr ""
-"Bu sorunları düzeltmek için 'apt-get -f install' komutunu çalıştırmanız "
-"gerekebilir."
+"Bu sorunları düzeltmek için 'apt --fix-broken install' komutunu "
+"çalıştırmanız gerekebilir."
-#: apt-private/private-cachefile.cc
-msgid "Unmet dependencies. Try using -f."
-msgstr "Karşılanmayan bağımlılıklar. -f kullanmayı deneyin."
+#: 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 ""
+"Karşılanmamış bağımlılıklar. 'apt --fix-broken install' komutunu paket "
+"seçeneği vermeden deneyin (ya da bir çözüm belirtin)."
#: apt-private/private-cacheset.cc apt-private/private-search.cc
msgid "Sorting"
@@ -2059,20 +2066,6 @@ msgstr[0] "Bu paketi kaldırmak için '%s' komutunu kullanın."
msgstr[1] "Bu paketleri kaldırmak için '%s' komutunu kullanın."
#: apt-private/private-install.cc
-msgid "You might want to run 'apt-get -f install' to correct these:"
-msgstr ""
-"Bunları düzeltmek için 'apt-get -f install' komutunu çalıştırmanız "
-"gerekebilir:"
-
-#: apt-private/private-install.cc
-msgid ""
-"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
-"solution)."
-msgstr ""
-"Karşılanmamış bağımlılıklar. 'apt-get -f install' komutunu paket seçeneği "
-"vermeden deneyin (ya da bir çözüm belirtin)."
-
-#: apt-private/private-install.cc
msgid "The following additional packages will be installed:"
msgstr "Aşağıdaki ek paketler kurulacak:"
@@ -2465,7 +2458,6 @@ msgid "Unpack command '%s' failed.\n"
msgstr "Paket açma komutu '%s' başarısız.\n"
#: apt-private/private-source.cc
-#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "'dpkg-dev' paketinin kurulu olduğundan emin olun.\n"
@@ -3860,6 +3852,14 @@ msgstr "İç hata"
msgid "Empty files can't be valid archives"
msgstr "Boş dosyalar geçerli birer arşiv dosyası olamazlar"
+#~ msgid "Unmet dependencies. Try using --fix-broken."
+#~ msgstr "Karşılanmayan bağımlılıklar. --fix-broken kullanmayı deneyin."
+
+#~ msgid "You might want to run 'apt --fix-broken install' to correct these:"
+#~ msgstr ""
+#~ "Bunları düzeltmek için 'apt --fix-broken install' komutunu çalıştırmanız "
+#~ "gerekebilir:"
+
#~ msgid "(not found)"
#~ msgstr "(bulunamadı)"
diff --git a/po/uk.po b/po/uk.po
index ffe89b8ce..e4e627d43 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -12,7 +12,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 1.0.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-09-25 20:19+0300\n"
"Last-Translator: A. Bondarenko <artem.brz@gmail.com>\n"
"Language-Team: Українська <uk@li.org>\n"
@@ -424,8 +424,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
@@ -1673,14 +1673,19 @@ msgstr "Неможливо мінімізувати набір оновлень"
msgid " Done"
msgstr " Виконано"
-#: apt-private/private-cachefile.cc
-msgid "You might want to run 'apt-get -f install' to correct these."
+#: apt-private/private-cachefile.cc apt-private/private-install.cc
+msgid "You might want to run 'apt --fix-broken install' to correct these."
msgstr ""
-"Для виправлення цих помилок ви можете скористатися 'apt-get -f install'."
+"Для виправлення цих помилок ви можете скористатися 'apt --fix-broken "
+"install'."
-#: apt-private/private-cachefile.cc
-msgid "Unmet dependencies. Try using -f."
-msgstr "Незадоволені залежності. Спробуйте використати -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 ""
+"Незадоволені залежності. Спробуйте виконати 'apt --fix-broken install', не "
+"вказуючи назв пакунків (або вкажіть рішення)."
#: apt-private/private-cacheset.cc apt-private/private-search.cc
msgid "Sorting"
@@ -2057,20 +2062,6 @@ msgstr[1] "Використовуйте '%s' щоб видалити їх."
msgstr[2] "Використовуйте '%s' щоб видалити їх."
#: apt-private/private-install.cc
-msgid "You might want to run 'apt-get -f install' to correct these:"
-msgstr ""
-"Можливо, для виправлення цих помилок Ви захочете скористатися 'apt-get -f "
-"install':"
-
-#: apt-private/private-install.cc
-msgid ""
-"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
-"solution)."
-msgstr ""
-"Незадоволені залежності. Спробуйте виконати 'apt-get -f install', не "
-"вказуючи назв пакунків (або вкажіть рішення)."
-
-#: apt-private/private-install.cc
#, fuzzy
msgid "The following additional packages will be installed:"
msgstr "Будуть встановлені наступні додаткові пакунки:"
@@ -2465,7 +2456,6 @@ msgid "Unpack command '%s' failed.\n"
msgstr "Команда розпакування '%s' завершилася невдало.\n"
#: apt-private/private-source.cc
-#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Перевірте, чи встановлений пакунок 'dpkg-dev'.\n"
@@ -3866,6 +3856,14 @@ msgstr "Внутрішня помилка"
msgid "Empty files can't be valid archives"
msgstr "Пусті файли не можуть бути правильними архівами"
+#~ msgid "Unmet dependencies. Try using --fix-broken."
+#~ msgstr "Незадоволені залежності. Спробуйте використати --fix-broken."
+
+#~ msgid "You might want to run 'apt --fix-broken install' to correct these:"
+#~ msgstr ""
+#~ "Можливо, для виправлення цих помилок Ви захочете скористатися 'apt-get -f "
+#~ "install':"
+
#~ msgid "(not found)"
#~ msgstr "(не знайдено)"
diff --git a/po/vi.po b/po/vi.po
index bb21d259f..3b996bd3b 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 1.0.8\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: 2014-09-12 13:48+0700\n"
"Last-Translator: Trần Ngọc Quân <vnwildman@gmail.com>\n"
"Language-Team: Vietnamese <translation-team-vi@lists.sourceforge.net>\n"
@@ -420,8 +420,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
@@ -1656,13 +1656,17 @@ msgstr "Không thể tối thiểu hóa tập hợp nâng cấp"
msgid " Done"
msgstr " Xong"
-#: apt-private/private-cachefile.cc
-msgid "You might want to run 'apt-get -f install' to correct these."
-msgstr "Bạn có thể chạy lệnh “apt-get -f install” để sửa những lỗi trên."
+#: apt-private/private-cachefile.cc apt-private/private-install.cc
+msgid "You might want to run 'apt --fix-broken install' to correct these."
+msgstr "Bạn có thể chạy lệnh “apt --fix-broken install” để sửa những lỗi trên."
-#: apt-private/private-cachefile.cc
-msgid "Unmet dependencies. Try using -f."
-msgstr "Chưa thỏa mãn quan hệ phụ thuộc. Hãy thử dùng tùy chọn “-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 ""
+"Thưa thỏa mãn quan hệ phụ thuộc. Hãy thử chạy lệnh “apt --fix-broken "
+"install” mà không có gói nào (hoặc chỉ định cách thức giải quyết)."
#: apt-private/private-cacheset.cc apt-private/private-search.cc
msgid "Sorting"
@@ -2024,18 +2028,6 @@ msgid_plural "Use '%s' to remove them."
msgstr[0] "Hãy dùng lệnh “%s” để gỡ bỏ chúng."
#: apt-private/private-install.cc
-msgid "You might want to run 'apt-get -f install' to correct these:"
-msgstr "Có lẽ bạn cần chạy lệnh “apt-get -f install” để sửa những cái đó:"
-
-#: apt-private/private-install.cc
-msgid ""
-"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
-"solution)."
-msgstr ""
-"Thưa thỏa mãn quan hệ phụ thuộc. Hãy thử chạy lệnh “apt-get -f install” mà "
-"không có gói nào (hoặc chỉ định cách thức giải quyết)."
-
-#: apt-private/private-install.cc
#, fuzzy
msgid "The following additional packages will be installed:"
msgstr "Những gói thêm theo đây sẽ được cài đặt:"
@@ -2421,7 +2413,6 @@ msgid "Unpack command '%s' failed.\n"
msgstr "Lệnh giải nén “%s” bị lỗi.\n"
#: apt-private/private-source.cc
-#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Hãy kiểm tra xem gói “dpkg-dev” đã được cài đặt chưa.\n"
@@ -3834,6 +3825,14 @@ msgstr "Gặp lỗi nội bộ"
msgid "Empty files can't be valid archives"
msgstr "Các tập tin trống rỗng không phải là kho lưu hợp lệ"
+#~ msgid "Unmet dependencies. Try using --fix-broken."
+#~ msgstr ""
+#~ "Chưa thỏa mãn quan hệ phụ thuộc. Hãy thử dùng tùy chọn “--fix-broken”."
+
+#~ msgid "You might want to run 'apt --fix-broken install' to correct these:"
+#~ msgstr ""
+#~ "Có lẽ bạn cần chạy lệnh “apt --fix-broken install” để sửa những cái đó:"
+
#~ msgid "(not found)"
#~ msgstr "(không tìm thấy)"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 799c0445a..ce706f498 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 1.2.x\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-08-20 13:00+0000\n"
"Last-Translator: Zhou Mo <cdluminate@gmail.com>\n"
"Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
@@ -410,10 +410,13 @@ msgid "No sandbox user '%s' on the system, can not drop privileges"
msgstr "系统中不存在沙箱用户'%s',无法降低权限"
#: 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 "文件'%s'无法被用户'%s'访问,无法降低权限以进行下载。"
#: apt-pkg/acquire.cc apt-pkg/clean.cc
@@ -1609,13 +1612,17 @@ msgstr "无法最小化待升级软件包集合"
msgid " Done"
msgstr " 完成"
-#: apt-private/private-cachefile.cc
-msgid "You might want to run 'apt-get -f install' to correct these."
-msgstr "您也许需要运行“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 "您也许需要运行“apt --fix-broken install”来修正上面的错误。"
-#: apt-private/private-cachefile.cc
-msgid "Unmet dependencies. Try using -f."
-msgstr "不能满足依赖关系。不妨试一下 -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 ""
+"有未能满足的依赖关系。请尝试不指明软件包的名字来运行“apt --fix-broken "
+"install”(也可以指定一个解决办法)。"
#: apt-private/private-cacheset.cc apt-private/private-search.cc
msgid "Sorting"
@@ -1969,18 +1976,6 @@ msgid_plural "Use '%s' to remove them."
msgstr[0] "使用'%s'来卸载它(它们)。"
#: apt-private/private-install.cc
-msgid "You might want to run 'apt-get -f install' to correct these:"
-msgstr "您可能需要运行“apt-get -f install”来纠正下列错误:"
-
-#: apt-private/private-install.cc
-msgid ""
-"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
-"solution)."
-msgstr ""
-"有未能满足的依赖关系。请尝试不指明软件包的名字来运行“apt-get -f install”(也可"
-"以指定一个解决办法)。"
-
-#: apt-private/private-install.cc
msgid "The following additional packages will be installed:"
msgstr "将会同时安装下列软件:"
@@ -2361,7 +2356,6 @@ msgid "Unpack command '%s' failed.\n"
msgstr "运行解包的命令“%s”出错。\n"
#: apt-private/private-source.cc
-#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "请检查是否安装了“dpkg-dev”软件包。\n"
@@ -3721,6 +3715,12 @@ msgstr "内部错误"
msgid "Empty files can't be valid archives"
msgstr "空文件不是有效归档"
+#~ msgid "Unmet dependencies. Try using --fix-broken."
+#~ msgstr "不能满足依赖关系。不妨试一下 --fix-broken 选项。"
+
+#~ msgid "You might want to run 'apt --fix-broken install' to correct these:"
+#~ msgstr "您可能需要运行“apt --fix-broken install”来纠正下列错误:"
+
#~ msgid "(not found)"
#~ msgstr "(没有找到)"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index fbdf68844..1305b3a7e 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 1.2.X\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: 2009-01-28 10:41+0800\n"
"Last-Translator: Tetralet <tetralet@gmail.com>\n"
"Language-Team: Debian-user in Chinese [Big5] <debian-chinese-big5@lists."
@@ -408,8 +408,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
@@ -1599,13 +1599,17 @@ msgstr "無法將升級計劃最小化"
msgid " Done"
msgstr " 完成"
-#: apt-private/private-cachefile.cc
-msgid "You might want to run 'apt-get -f install' to correct these."
-msgstr "您也許得執行 '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 "您也許得執行 'apt --fix-broken install' 以修正這些問題。"
-#: apt-private/private-cachefile.cc
-msgid "Unmet dependencies. Try using -f."
-msgstr "未能滿足相依關係。試試 -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 ""
+"未能滿足相依關係。請試著不指定套件來執行 'apt --fix-broken install'(或採取其"
+"它的解決方案)。"
#: apt-private/private-cacheset.cc apt-private/private-search.cc
msgid "Sorting"
@@ -1959,18 +1963,6 @@ msgstr[0] "使用 '%s' 來將其移除。"
msgstr[1] "使用 '%s' 來將其移除。"
#: apt-private/private-install.cc
-msgid "You might want to run 'apt-get -f install' to correct these:"
-msgstr "您也許得執行 'apt-get -f install' 以修正這些問題:"
-
-#: apt-private/private-install.cc
-msgid ""
-"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
-"solution)."
-msgstr ""
-"未能滿足相依關係。請試著不指定套件來執行 'apt-get -f install'(或採取其它的解"
-"決方案)。"
-
-#: apt-private/private-install.cc
msgid "The following additional packages will be installed:"
msgstr "下列的額外套件將被安裝:"
@@ -2349,7 +2341,6 @@ msgid "Unpack command '%s' failed.\n"
msgstr "解開指令 '%s' 失敗。\n"
#: apt-private/private-source.cc
-#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "請檢查是否已安裝了 'dpkg-dev' 套件。\n"
@@ -3709,6 +3700,12 @@ msgstr "內部錯誤"
msgid "Empty files can't be valid archives"
msgstr ""
+#~ msgid "Unmet dependencies. Try using --fix-broken."
+#~ msgstr "未能滿足相依關係。試試 --fix-broken 選項。"
+
+#~ msgid "You might want to run 'apt --fix-broken install' to correct these:"
+#~ msgstr "您也許得執行 'apt --fix-broken install' 以修正這些問題:"
+
#~ msgid "(not found)"
#~ msgstr "(未找到)"
diff --git a/test/integration/test-bug-686346-package-missing-architecture b/test/integration/test-bug-686346-package-missing-architecture
index 8f9536a09..d28600a4f 100755
--- a/test/integration/test-bug-686346-package-missing-architecture
+++ b/test/integration/test-bug-686346-package-missing-architecture
@@ -69,7 +69,7 @@ insertinstalledpackage 'pkgb' 'amd64' '2'
testequalor2 "Reading package lists...
Building dependency tree...
Reading state information...
-You might want to run 'apt-get -f install' to correct these.
+You might want to run 'apt --fix-broken install' to correct these.
The following packages have unmet dependencies:
pkgb : Conflicts: pkgb:none but 1 is installed
pkgb:none : Conflicts: pkgb but 2 is installed
@@ -77,10 +77,10 @@ The following packages have unmet dependencies:
Conflicts: pkgb but 2 is installed
pkgg : Conflicts: pkgb but 2 is installed
Conflicts: pkgb:none but 1 is installed
-E: Unmet dependencies. Try using -f." "Reading package lists...
+E: Unmet dependencies. Try using --fix-broken." "Reading package lists...
Building dependency tree...
Reading state information...
-You might want to run 'apt-get -f install' to correct these.
+You might want to run 'apt --fix-broken install' to correct these.
The following packages have unmet dependencies:
pkgb : Conflicts: pkgb:none but 1 is installed
pkgb:none : Conflicts: pkgb but 2 is installed
@@ -88,7 +88,7 @@ The following packages have unmet dependencies:
Conflicts: pkgb:none but 1 is installed
pkgg : Conflicts: pkgb but 2 is installed
Conflicts: pkgb:none but 1 is installed
-E: Unmet dependencies. Try using -f." aptget check
+E: Unmet dependencies. Try 'apt --fix-broken install' with no packages (or specify a solution)." aptget check
# check that dependencies are generated for none-packages
rm rootdir/var/lib/dpkg/status
diff --git a/test/integration/test-parse-all-archs-into-cache b/test/integration/test-parse-all-archs-into-cache
index 65222f0fe..7485431db 100755
--- a/test/integration/test-parse-all-archs-into-cache
+++ b/test/integration/test-parse-all-archs-into-cache
@@ -22,10 +22,10 @@ setupaptarchive
testfailureequal "Reading package lists...
Building dependency tree...
-You might want to run 'apt-get -f install' to correct these.
+You might want to run 'apt --fix-broken install' to correct these.
The following packages have unmet dependencies:
foo:amd64 : Depends: libfoo1:amd64 but it is not installable
-E: Unmet dependencies. Try using -f." aptget check -s
+E: Unmet dependencies. Try 'apt --fix-broken install' with no packages (or specify a solution)." aptget check -s
insertinstalledpackage 'libfoo1' 'amd64' '1' 'Multi-Arch: same'