diff options
author | Michael Vogt <mvo@ubuntu.com> | 2014-05-05 17:13:24 +0200 |
---|---|---|
committer | Michael Vogt <mvo@ubuntu.com> | 2014-05-05 17:13:24 +0200 |
commit | b4278cc96fa0184b4f522e2bcfe82bd8eba93595 (patch) | |
tree | 59969ad6463918810ca264854615e8b2cfdf0bad /doc/po/ja.po | |
parent | f3594b9de99745c84563bac3ef59a159e30d4cd8 (diff) | |
parent | 3fa4e98f62e469f4292d2811b4e15f4afb678fbd (diff) |
Merge branch 'debian/sid' into ubuntu/master
Conflicts:
configure.ac
debian/apt.dirs
debian/changelog
Diffstat (limited to 'doc/po/ja.po')
-rw-r--r-- | doc/po/ja.po | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/po/ja.po b/doc/po/ja.po index 4c10c5814..2475b810d 100644 --- a/doc/po/ja.po +++ b/doc/po/ja.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.7.25.3\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2014-04-25 13:52+0200\n" +"POT-Creation-Date: 2014-05-05 16:26+0200\n" "PO-Revision-Date: 2014-04-01 14:00+0200\n" "Last-Translator: KURASAWA Nozomu <nabetaro@debian.or.jp>\n" "Language-Team: Debian Japanese List <debian-japanese@lists.debian.org>\n" |