(cherry picked from commit ef01829b)

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 3fa13393)

(cherry picked from commit 279f765c)

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 c11a0e88)

(cherry picked from commit 2a60ae54)

(cherry picked from commit 390adeda)

(cherry picked from commit 06169623)

(cherry picked from commit 72a6811b)

(cherry picked from commit 7960672c)

Andreas Cord-Landwehr authored Jan 11, 2021 and Jeremy Whiting committed Jul 22, 2021

Allows usage of the app in landscape view in Plasma mobile setup
on RaspberryPi 10-inch landscape discplay. Also do initial fixes
for portrait mode on 7-inch.

(cherry picked from commit d1fba2c3)

(cherry picked from commit 37dd37ae)

(cherry picked from commit e52cb783)

(cherry picked from commit 02826d8c)

(cherry picked from commit d4057091)