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"

effects/logout/package/metadata.desktop

@@ -29,6 +29,7 @@ Comment=Smoothly fade to the logout screen
 Comment[ca]=Transició suau a la pantalla de sortida
 Comment[ca@valencia]=Transició suau a la pantalla d'eixida
 Comment[cs]=Plynule přejít na odhlašovací obrazovku
+Comment[de]=Blendet den Abmeldungsdialog langsam ein.
 Comment[en_GB]=Smoothly fade to the logout screen
 Comment[es]=Desvanecer suavemente hasta la pantalla de cierre de sesión
 Comment[eu]=Emeki desagertu saio-ixteko pantailarantz

effects/showpaint/showpaint_config.desktop

@@ -68,3 +68,4 @@ Name[ug]=سىزىش دائىرىسىنى كۆرسەت
 Name[uk]=Показ малювання
 Name[wa]=Mostrer pondaedje
 Name[x-test]=xxShow Paintxx
+Name[zh_CN]=显示绘制区域

kcmkwin/kwinscreenedges/kwinscreenedges.desktop

@@ -13,7 +13,6 @@ X-KDE-Weight=50
 
 Name=Screen Edges
 Name[ar]=حواف الشاشة
-Name[ast]=Berbesos de pantalla
 Name[bg]=Краища на екрана
 Name[bs]=Ivice ekrana
 Name[ca]=Vores de la pantalla

packageplugins/effect/kwin-packagestructure-effect.desktop

@@ -14,6 +14,7 @@ Name[ru]=Эффект диспетчера окон
 Name[sv]=Kwin-effekt
 Name[uk]=Ефект KWin
 Name[x-test]=xxKWin Effectxx
+Name[zh_CN]=KWin 效果
 Type=Service
 X-KDE-ServiceTypes=KPackage/PackageStructure
 X-KDE-Library=kwin_packagestructure_effect