SVN_SILENT made messages (.desktop file) - always resolve ours

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"

runners/powerdevil/plasma-runner-powerdevil.desktop

@@ -76,6 +76,7 @@ Icon=preferences-system-power-management
 Name=Power
 Name[ca]=Energia
 Name[cs]=Energie
+Name[de]=Energie
 Name[en_GB]=Power
 Name[gl]=Enerxía
 Name[nl]=Energie
@@ -85,6 +86,7 @@ Name[sk]=Napájanie
 Name[sv]=Effekt
 Name[uk]=Живлення
 Name[x-test]=xxPowerxx
+Name[zh_CN]=电源
 Type=Service
 X-KDE-Library=krunner_powerdevil
 X-KDE-PluginInfo-Author=Dario Freddi