| commit | b652ada42a76548569a0dc9c9cf356343f9e1c3a | |
| author | Jiang Xin <worldhello.net@gmail.com> | |
| Sat, 12 May 2012 07:01:22 +0000 (12 15:01 +0800) | ||
| committer | Jiang Xin <worldhello.net@gmail.com> | |
| Sat, 12 May 2012 07:01:22 +0000 (12 15:01 +0800) | ||
| tree | 986a200acfce7290c0b556eaa6583f1eae9e29db | treesnapshot (tar.gz zip) |
| parent | 1a8e08cdf493818bc08cf7716f3135b2530eee57 | commitdiff |
| parent | 2f64542f9c2f6082dd5aa7d8d13886cdc965d175 | commitdiff |
Merge branch 'maint'
* maint:
l10n: zh_CN.po: translate 1 new message
Conflicts:
po/zh_CN.po
Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
* maint:
l10n: zh_CN.po: translate 1 new message
Conflicts:
po/zh_CN.po
Signed-off-by: Jiang Xin <worldhello.net@gmail.com>