From cfc11b2e1d8480727208b9d3e9577172de9a4038 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Thu, 29 Dec 2016 12:55:12 +0100 Subject: expand -f to --fix-broken in error messages Users end up believing that this is a --force mode as -f is common for that, but apt doesn't have such a mode and --fix-broken is really not about forcing something but actually trying to fix the breakage which tends to be the result of a user forcing something on its system via low-level forced dpkg calls. Example: The "common" pattern of "dpkg -i ./foo.deb; apt install -f" is nowadays far better dealt with via "apt install ./foo.deb". And while at it the two places handing out this suggestion are changed to use the same strings to avoid needless translation work in the future and the suggestion uses 'apt' instead of 'apt-get' as this will be run interactively by a user, so its a good opportunity to showcase what we can do and will allow us to be more helpful to the user. Closes: #709092 Thanks: Kristian Glass for initial patch! --- doc/guide.dbk | 2 +- doc/po/apt-doc.pot | 11 +++++++++-- doc/po/de.po | 19 ++++++++++++++++--- doc/po/es.po | 19 ++++++++++++++++--- doc/po/fr.po | 20 +++++++++++++++++--- doc/po/it.po | 19 ++++++++++++++++--- doc/po/ja.po | 19 ++++++++++++++++--- doc/po/nl.po | 21 +++++++++++++++++---- doc/po/pl.po | 22 +++++++++++++++++++--- doc/po/pt.po | 19 ++++++++++++++++--- doc/po/pt_BR.po | 11 +++++++++-- 11 files changed, 152 insertions(+), 30 deletions(-) (limited to 'doc') 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 apt-get 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 \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 \n" "Language-Team: LANGUAGE \n" @@ -1383,6 +1383,13 @@ msgid "" "APT::Get::Arch-Only." msgstr "" +#. type: Content of: +#: apt-get.8.xml:1 +msgid "" +"Only process architecture-independent build-dependencies. Configuration " +"Item: APT::Get::Indep-Only." +msgstr "" + #. type: Content of: #: apt-get.8.xml:1 msgid "" @@ -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 \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 \n" "Language-Team: German \n" @@ -1931,6 +1931,19 @@ msgstr "" "verarbeitet nur architekturabhängige Bauabhängigkeiten. " "Konfigurationselement: APT::Get::Arch-Only." +#. type: Content of: +#: apt-get.8.xml +#, fuzzy +#| msgid "" +#| "Only process architecture-dependent build-dependencies. Configuration " +#| "Item: APT::Get::Arch-Only." +msgid "" +"Only process architecture-independent build-dependencies. Configuration " +"Item: APT::Get::Indep-Only." +msgstr "" +"verarbeitet nur architekturabhängige Bauabhängigkeiten. " +"Konfigurationselement: APT::Get::Arch-Only." + #. type: Content of: #: apt-get.8.xml msgid "" @@ -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 \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 \n" "Language-Team: Debian l10n Spanish \n" @@ -2016,6 +2016,19 @@ msgstr "" "Procesa sólo las dependencias de construcción dependientes de la " "arquitectura. Opción de configuración: APT::Get::Arch-Only" +#. type: Content of: +#: apt-get.8.xml +#, fuzzy +#| msgid "" +#| "Only process architecture-dependent build-dependencies. Configuration " +#| "Item: APT::Get::Arch-Only." +msgid "" +"Only process architecture-independent build-dependencies. Configuration " +"Item: APT::Get::Indep-Only." +msgstr "" +"Procesa sólo las dependencias de construcción dependientes de la " +"arquitectura. Opción de configuración: APT::Get::Arch-Only" + #. type: Content of: #: apt-get.8.xml msgid "" @@ -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 \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 \n" "Language-Team: French \n" @@ -1936,6 +1936,20 @@ msgstr "" "l'architecture. Élément de configuration : APT::Get::Arch-Only." +#. type: Content of: +#: apt-get.8.xml +#, fuzzy +#| msgid "" +#| "Only process architecture-dependent build-dependencies. Configuration " +#| "Item: APT::Get::Arch-Only." +msgid "" +"Only process architecture-independent build-dependencies. Configuration " +"Item: APT::Get::Indep-Only." +msgstr "" +"Ne traiter que les dépendances de construction dépendantes de " +"l'architecture. Élément de configuration : APT::Get::Arch-Only." + #. type: Content of: #: apt-get.8.xml msgid "" @@ -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 \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 \n" "Language-Team: Italian \n" @@ -1985,6 +1985,19 @@ msgstr "" "Elabora solo le dipendenze di compilazione dipendenti dall'architettura. " "Voce di configurazione: APT::Get::Arch-Only." +#. type: Content of: +#: apt-get.8.xml +#, fuzzy +#| msgid "" +#| "Only process architecture-dependent build-dependencies. Configuration " +#| "Item: APT::Get::Arch-Only." +msgid "" +"Only process architecture-independent build-dependencies. Configuration " +"Item: APT::Get::Indep-Only." +msgstr "" +"Elabora solo le dipendenze di compilazione dipendenti dall'architettura. " +"Voce di configurazione: APT::Get::Arch-Only." + #. type: Content of: #: apt-get.8.xml msgid "" @@ -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 \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 \n" "Language-Team: Japanese \n" @@ -1905,6 +1905,19 @@ msgstr "" "構築依存関係の解決を、アーキテクチャに依存したもののみ行います。設定項目: " "APT::Get::Arch-Only" +#. type: Content of: +#: apt-get.8.xml +#, fuzzy +#| msgid "" +#| "Only process architecture-dependent build-dependencies. Configuration " +#| "Item: APT::Get::Arch-Only." +msgid "" +"Only process architecture-independent build-dependencies. Configuration " +"Item: APT::Get::Indep-Only." +msgstr "" +"構築依存関係の解決を、アーキテクチャに依存したもののみ行います。設定項目: " +"APT::Get::Arch-Only" + #. type: Content of: #: apt-get.8.xml msgid "" @@ -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 \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 \n" "Language-Team: Debian Dutch l10n Team \n" @@ -2002,6 +2002,19 @@ msgstr "" "Enkel architectuurafhankelijke bouwvereisten verwerken. Configuratie-item: " "APT::Get::Arch-Only." +#. type: Content of: +#: apt-get.8.xml +#, fuzzy +#| msgid "" +#| "Only process architecture-dependent build-dependencies. Configuration " +#| "Item: APT::Get::Arch-Only." +msgid "" +"Only process architecture-independent build-dependencies. Configuration " +"Item: APT::Get::Indep-Only." +msgstr "" +"Enkel architectuurafhankelijke bouwvereisten verwerken. Configuratie-item: " +"APT::Get::Arch-Only." + #. type: Content of: #: apt-get.8.xml msgid "" @@ -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 \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 \n" "Language-Team: Polish \n" @@ -2022,6 +2022,22 @@ msgstr "" "komputera. Pozycja w pliku konfiguracyjnym: APT::Get::Arch-Only." +# +#. type: Content of: +#: apt-get.8.xml +#, fuzzy +#| msgid "" +#| "Only process architecture-dependent build-dependencies. Configuration " +#| "Item: APT::Get::Arch-Only." +msgid "" +"Only process architecture-independent build-dependencies. Configuration " +"Item: APT::Get::Indep-Only." +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: APT::Get::Arch-Only." + #. type: Content of: #: 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 \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 \n" "Language-Team: Portuguese \n" @@ -1959,6 +1959,19 @@ msgstr "" "Apenas processa dependências de compilação dependentes da arquitectura. Item " "de Configuração: APT::Get::Arch-Only." +#. type: Content of: +#: apt-get.8.xml +#, fuzzy +#| msgid "" +#| "Only process architecture-dependent build-dependencies. Configuration " +#| "Item: APT::Get::Arch-Only." +msgid "" +"Only process architecture-independent build-dependencies. Configuration " +"Item: APT::Get::Indep-Only." +msgstr "" +"Apenas processa dependências de compilação dependentes da arquitectura. Item " +"de Configuração: APT::Get::Arch-Only." + #. type: Content of: #: apt-get.8.xml msgid "" @@ -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 \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 \n" "Language-Team: \n" @@ -1357,6 +1357,13 @@ msgid "" "APT::Get::Arch-Only." msgstr "" +#. type: Content of: +#: apt-get.8.xml +msgid "" +"Only process architecture-independent build-dependencies. Configuration " +"Item: APT::Get::Indep-Only." +msgstr "" + #. type: Content of: #: apt-get.8.xml msgid "" @@ -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" -- cgit v1.2.3