diff options
| author | David Kalnischkies <david@kalnischkies.de> | 2016-12-29 12:55:12 +0100 |
|---|---|---|
| committer | David Kalnischkies <david@kalnischkies.de> | 2016-12-31 02:29:20 +0100 |
| commit | cfc11b2e1d8480727208b9d3e9577172de9a4038 (patch) | |
| tree | 3e9e1a65269ebf6eed634c2d2b79e8a0683c1b3d /doc/po/ja.po | |
| parent | abbe74b2b4690b9138da94d26a7e45ad80a3bf6c (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!
Diffstat (limited to 'doc/po/ja.po')
| -rw-r--r-- | doc/po/ja.po | 19 |
1 files changed, 16 insertions, 3 deletions
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" |