Extending BugFix #4053

Signed-off-by: Umair Khan <omerjerk@gmail.com>
Merge pull request #925 from omerjerk/QA_4_1

Extending BugFix #4053
Translated using Weblate (Slovak)

Currently translated at 83.4% (2294 of 2749)
Translated using Weblate (Ukrainian)

Currently translated at 94.4% (2597 of 2749)
Merge remote-tracking branch 'origin/QA_4_1' into QA_4_1
Merge commit 'b82c915'
Merge commit '515f4e8'