Ozzie Isaacs e052590270 Merge remote-tracking branch 'chinese/master' ... # Conflicts: # cps/translations/zh_Hans_CN/LC_MESSAGES/messages.mo # cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po # messages.pot		2021-08-01 17:31:47 +02:00
..
messages.mo	Merge remote-tracking branch 'chinese/master'	2021-08-01 17:31:47 +02:00
messages.po	Merge remote-tracking branch 'chinese/master'	2021-08-01 17:31:47 +02:00