diff options
| author | Michael Vogt <mvo@debian.org> | 2014-06-18 11:21:35 +0200 |
|---|---|---|
| committer | Michael Vogt <mvo@debian.org> | 2014-06-18 11:24:16 +0200 |
| commit | 8d20b69d2fd7a8fec82bb559f0e39059bbaecf1b (patch) | |
| tree | 000fce642c5c12f3cc8b5472bcd03994c78b5050 /doc/po/apt-doc.pot | |
| parent | 17091f2f33de16c2dae501e7868f7aec4fc3452f (diff) | |
| parent | 82ced5c894cd013721f432ae8da66114155e04c7 (diff) | |
Merge remote-tracking branch 'donkult/debian/sid' into debian/experimental
Conflicts:
apt-private/private-install.cc
Diffstat (limited to 'doc/po/apt-doc.pot')
| -rw-r--r-- | doc/po/apt-doc.pot | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/po/apt-doc.pot b/doc/po/apt-doc.pot index a058e6506..94ad1238d 100644 --- a/doc/po/apt-doc.pot +++ b/doc/po/apt-doc.pot @@ -2153,7 +2153,7 @@ 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 "" #. type: Content of: <refentry><refsect1><para> |