diff options
author | Michael Vogt <mvo@debian.org> | 2014-04-01 17:49:06 +0200 |
---|---|---|
committer | Michael Vogt <mvo@debian.org> | 2014-04-01 17:49:06 +0200 |
commit | 4c3722e3a74f183b331b0a782017ae442ca143fb (patch) | |
tree | 683cb69a004aedcf38151aadf0a30c5261ffe83e /po/zh_CN.po | |
parent | d13bb95849fd168200554972b4295c40933e2461 (diff) | |
parent | 5cfd6ef6c6ad67658c042453075e54ac23d10245 (diff) |
Merge branch 'debian/sid' into ubuntu/master
Conflicts:
debian/changelog
Diffstat (limited to 'po/zh_CN.po')
-rw-r--r-- | po/zh_CN.po | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/po/zh_CN.po b/po/zh_CN.po index 2f61817a0..dd991a8a4 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.8.0~pre1\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2014-04-01 14:24+0200\n" +"POT-Creation-Date: 2014-04-01 15:51+0200\n" "PO-Revision-Date: 2010-08-26 14:42+0800\n" "Last-Translator: Aron Xu <happyaron.xu@gmail.com>\n" "Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n" |