- strip last part of path only if it is not a directory
- if path for client does not end with /kajongg, append it

(cherry picked from commit a07e09f6)

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

(cherry picked from commit 61d79913)

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

(cherry picked from commit bd85c92a)