(cherry picked from commit a196687e)

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"

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

Niklas Freund authored Feb 01, 2022 and Albert Astals Cid committed Feb 01, 2022

BUG: 448760

In my previous resizing support merge request (!24), I made sure that any KCalc mode changes that happen at minimum window size result in the window resizing itself to the new minimum size. However, this turns out to not have worked in one specific case: Showing/Hiding the constants buttons.

Upon investigation of this issue, I noticed that `minimumSize()` isn't updating correctly after hiding of the buttons (and stays at the old minimumSize). Thus, the call to `resize(minimumSize())` doesn't work.

(cherry picked from commit 187571ea)

(cherry picked from commit 769047ac)

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 962e550d)

Fix conflict resulting from 85d1c688