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/showpaint/showpaint_config.desktop

@@ -47,6 +47,7 @@ Name[ne]=रङ देखाउनुहोस्
 Name[nl]=Intekening tonen
 Name[pa]=ਪੇਂਟ ਵੇਖੋ
 Name[pl]=Pokaż rysowane
+Name[pt]=Mostrar a Pintura
 Name[ro]=Afișează desenele
 Name[ru]=Подсвечивать отрисовку
 Name[si]=ඇඳීම් පෙන්වන්න

packageplugins/effect/kwin-packagestructure-effect.desktop

@@ -4,6 +4,7 @@ Name[ca]=Efecte del KWin
 Name[ca@valencia]=Efecte del KWin
 Name[es]=Efecto de KWin
 Name[nl]=KWin-effect
+Name[pt]=Efeito do KWin
 Name[sv]=Kwin-effekt
 Name[uk]=Ефект KWin
 Name[x-test]=xxKWin Effectxx