From 7d5234ab88b4cd6b172f13d0912c585983c3410b Mon Sep 17 00:00:00 2001
From: Julian Andres Klode <jak@debian.org>
Date: Fri, 25 Nov 2016 23:47:08 +0100
Subject: Release 1.4~beta1

---
 doc/po/ja.po | 42 ++++++++++++++++++++++++++++++++++++------
 1 file changed, 36 insertions(+), 6 deletions(-)

(limited to 'doc/po/ja.po')

diff --git a/doc/po/ja.po b/doc/po/ja.po
index 5641ee4f4..84d25ec5e 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-11-11 23:29+0100\n"
+"POT-Creation-Date: 2016-11-25 23:46+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"
@@ -2663,6 +2663,30 @@ msgstr ""
 "変わるということになります。<command>apt-key</command> はそういった使い方の検"
 "出を試み、その場合には標準エラーに警告を出します。"
 
+#. type: Content of: <refentry><refsect1><title>
+#: apt-key.8.xml
+msgid "Supported keyring files"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt-key.8.xml
+msgid ""
+"apt-key supports only the binary OpenPGP format (also known as \"GPG key "
+"public ring\") in files with the \"<literal>gpg</literal>\" extension, not "
+"the keybox database format introduced in newer &gpg; versions as default for "
+"keyring files. Binary keyring files intended to be used with any apt version "
+"should therefore always be created with <command>gpg --export</command>."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt-key.8.xml
+msgid ""
+"Alternatively, if all systems which should be using the created keyring have "
+"at least apt version >= 1.4 installed, you can use the ASCII armored format "
+"with the \"<literal>asc</literal>\" extension instead which can be created "
+"with <command>gpg --armor --export</command>."
+msgstr ""
+
 #. type: Content of: <refentry><refsect1><title>
 #: apt-key.8.xml
 msgid "Commands"
@@ -2692,11 +2716,17 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-key.8.xml
-msgid ""
-"Instead of using this command a keyring can be placed directly in the "
-"<filename>/etc/apt/trusted.gpg.d/</filename> directory with a descriptive "
-"name (same rules for filename apply as for &apt-conf; files) and "
-"\"<literal>gpg</literal>\" as file extension."
+#, fuzzy
+#| msgid ""
+#| "Instead of using this command a keyring can be placed directly in the "
+#| "<filename>/etc/apt/trusted.gpg.d/</filename> directory with a descriptive "
+#| "name (same rules for filename apply as for &apt-conf; files) and "
+#| "\"<literal>gpg</literal>\" as file extension."
+msgid ""
+"<emphasis>Note</emphasis>: Instead of using this command a keyring should be "
+"placed directly in the <filename>/etc/apt/trusted.gpg.d/</filename> "
+"directory with a descriptive name and either \"<literal>gpg</literal>\" or "
+"\"<literal>asc</literal>\" as file extension."
 msgstr ""
 "このコマンドを使う代わりに、キーリングに記述的な名前 (ファイル名については "
 "&apt-conf; ファイルと同一の規則が適用されます) を付け、ファイルの拡張子を"
-- 
cgit v1.2.3