summaryrefslogtreecommitdiff
path: root/doc/po/ja.po
diff options
context:
space:
mode:
authorMichael Vogt <mvo@debian.org>2014-06-18 11:21:35 +0200
committerMichael Vogt <mvo@debian.org>2014-06-18 11:24:16 +0200
commit8d20b69d2fd7a8fec82bb559f0e39059bbaecf1b (patch)
tree000fce642c5c12f3cc8b5472bcd03994c78b5050 /doc/po/ja.po
parent17091f2f33de16c2dae501e7868f7aec4fc3452f (diff)
parent82ced5c894cd013721f432ae8da66114155e04c7 (diff)
Merge remote-tracking branch 'donkult/debian/sid' into debian/experimental
Conflicts: apt-private/private-install.cc
Diffstat (limited to 'doc/po/ja.po')
-rw-r--r--doc/po/ja.po4
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/po/ja.po b/doc/po/ja.po
index 2475b810d..5f127426a 100644
--- a/doc/po/ja.po
+++ b/doc/po/ja.po
@@ -2963,10 +2963,10 @@ msgstr ""
#: apt-secure.8.xml:195
msgid ""
"&apt-conf;, &apt-get;, &sources-list;, &apt-key;, &apt-ftparchive;, "
-"&debsign; &debsig-verify;, &gpg;"
+"&debsign;, &debsig-verify;, &gpg;"
msgstr ""
"&apt-conf;, &apt-get;, &sources-list;, &apt-key;, &apt-ftparchive;, "
-"&debsign; &debsig-verify;, &gpg;"
+"&debsign;, &debsig-verify;, &gpg;"
#. type: Content of: <refentry><refsect1><para>
#: apt-secure.8.xml:199