Keep translation key consistent
Merge branch '2-2-stable' into 2-2-nemo-stable