[debian-edu-commits] debian-edu/ 03/03: Merge branch 'master' of git://git.weblate.org/debian-edu-documentation

[Petter Reinholdtsen]

This is an automated email from the git hooks/post-receive script.

pere pushed a commit to branch master
in repository debian-edu-doc.

commit c89a52b0c45a9e601d1fd7e288b00ef21b830db0
Merge: 98c5fb9 8eb6ddf
Author: Petter Reinholdtsen <pere at hungry.com>
Date:   Thu Sep 7 18:15:06 2017 +0200

    Merge branch 'master' of git://git.weblate.org/debian-edu-documentation

 documentation/audacity/audacity-manual.zh.po            |  9 +++++----
 .../debian-edu-itil/debian-edu-itil-manual.zh.po        | 17 +++++++++--------
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --cc documentation/debian-edu-itil/debian-edu-itil-manual.zh.po
index 4a2d5ed,7df8e28..d15aab5
--- a/documentation/debian-edu-itil/debian-edu-itil-manual.zh.po
+++ b/documentation/debian-edu-itil/debian-edu-itil-manual.zh.po
@@@ -6,12 -6,12 +6,12 @@@
  msgid ""
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
 -"POT-Creation-Date: 2017-04-29 11:14+0000\n"
 +"POT-Creation-Date: 2017-09-07 15:13+0000\n"
- "PO-Revision-Date: 2017-07-04 17:42+0000\n"
- "Last-Translator: zhangmiao <myzhm at 163.com>\n"
- "Language-Team: Chinese (Simplified) <https://hosted.weblate.org/projects/"
- "debian-edu-documentation/debian-edu-itil/zh_Hans/>\n"
- "Language: zh_Hans\n"
+ "PO-Revision-Date: 2017-09-07 04:44+0000\n"
+ "Last-Translator: Liang Guo <bluestonechina at gmail.com>\n"
+ "Language-Team: Chinese <https://hosted.weblate.org/projects/debian-edu-"
+ "documentation/debian-edu-itil/zh/>\n"
+ "Language: zh\n"
  "MIME-Version: 1.0\n"
  "Content-Type: text/plain; charset=UTF-8\n"
  "Content-Transfer-Encoding: 8bit\n"

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/debian-edu-doc.git