fix forgotten spelling.
Merge remote-tracking branch 'upstream/development' into fix_typo
Merge remote-tracking branch 'upstream/development' into fix_typo
fix: warning: string 'publish_avatar' has no default translation.
also altered the types of resources from array to string-array in some res-files.
experimental message merging
require encrypted to be the same for messages to get merged
Merge pull request #398 from betheg/fix_res

fix: warning: string 'publish_avatar' has no default translation.
Merge pull request #391 from betheg/fix_typo

fix forgotten spelling.
some code cleanup