summaryrefslogtreecommitdiff
path: root/doc/po/ja.po
diff options
context:
space:
mode:
Diffstat (limited to 'doc/po/ja.po')
-rw-r--r--doc/po/ja.po32
1 files changed, 26 insertions, 6 deletions
diff --git a/doc/po/ja.po b/doc/po/ja.po
index 6b767f195..866cf0e43 100644
--- a/doc/po/ja.po
+++ b/doc/po/ja.po
@@ -8,7 +8,11 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.7.25.3\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
+<<<<<<< HEAD
+"POT-Creation-Date: 2013-04-30 10:29+0300\n"
+=======
"POT-Creation-Date: 2013-06-13 13:46+0300\n"
+>>>>>>> upstream/debian/sid
"PO-Revision-Date: 2012-08-08 07:58+0900\n"
"Last-Translator: KURASAWA Nozomu <nabetaro@debian.or.jp>\n"
"Language-Team: Debian Japanese List <debian-japanese@lists.debian.org>\n"
@@ -2215,12 +2219,19 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-key.8.xml:130
+#, fuzzy
+#| msgid ""
+#| "Update the local keyring with the archive keyring and remove from the "
+#| "local keyring the archive keys which are no longer valid. The archive "
+#| "keyring is shipped in the <literal>archive-keyring</literal> package of "
+#| "your distribution, e.g. the <literal>debian-archive-keyring</literal> "
+#| "package in Debian."
msgid ""
"Update the local keyring with the archive keyring and remove from the local "
"keyring the archive keys which are no longer valid. The archive keyring is "
"shipped in the <literal>archive-keyring</literal> package of your "
-"distribution, e.g. the <literal>debian-archive-keyring</literal> package in "
-"Debian."
+"distribution, e.g. the <literal>ubuntu-archive-keyring</literal> package in "
+"Ubuntu."
msgstr ""
"ローカルキーリングをアーカイブキーリングで更新し、もう有効でなくなったアーカ"
"イブキーをローカルキーリングから削除します。アーカイブキーリングは、使用中の"
@@ -2287,24 +2298,33 @@ msgstr "アーカイブキーのローカル信頼データベースです。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-key.8.xml:183
-msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
+#, fuzzy
+#| msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
+msgid "<filename>/usr/share/keyrings/ubuntu-archive-keyring.gpg</filename>"
msgstr "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-key.8.xml:184
-msgid "Keyring of Debian archive trusted keys."
+#, fuzzy
+#| msgid "Keyring of Debian archive trusted keys."
+msgid "Keyring of Ubuntu archive trusted keys."
msgstr "Debian アーカイブ信頼キーのキーリングです。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-key.8.xml:187
+#, fuzzy
+#| msgid ""
+#| "<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
msgid ""
-"<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
+"<filename>/usr/share/keyrings/ubuntu-archive-removed-keys.gpg</filename>"
msgstr ""
"<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-key.8.xml:188
-msgid "Keyring of Debian archive removed trusted keys."
+#, fuzzy
+#| msgid "Keyring of Debian archive removed trusted keys."
+msgid "Keyring of Ubuntu archive removed trusted keys."
msgstr "削除された Debian アーカイブ信頼キーのキーリングです。"
#. type: Content of: <refentry><refsect1><para>