Plain Diff
am 0b50b666: merge in master-release history after reset to 32841c7f * commit '0b50b666': Import translations. DO NOT MERGE