Merge remote-tracking branch 'chinese/master'

Browse Source

# Conflicts:
#	cps/translations/zh_Hans_CN/LC_MESSAGES/messages.mo
#	cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po
#	messages.pot

...

This commit is contained in:

Ozzie Isaacs

2021-08-01 17:31:47 +02:00

parent 41ca85268f 19c75d6790

commit e052590270

2 changed files with 49 additions and 48 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

cps/translations/zh_Hans_CN/LC_MESSAGES/messages.mo

BIN

Binary file not shown.