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"

examples/testcontainmentactionsplugin/plasma-containmentactions-test.desktop

@@ -58,7 +58,7 @@ Comment[hu]=Üres bővítmény tesztelésre
 Comment[ia]=Un plugin vacue pro essayar
 Comment[it]=Un'estensione finta di prova
 Comment[ko]=테스트를 위한 뼈대 플러그인
-Comment[lt]=Netikras priedas testavimui
+Comment[lt]=Netikras papildinys testavimui
 Comment[mr]=चाचणीसाठी नकली प्लगइन
 Comment[nb]=Et attrapp-programtillegg for testing
 Comment[nds]=En Platzholler-Moduul för't Utproberen

src/desktoptheme/oxygen/metadata.desktop

@@ -59,7 +59,7 @@ Comment[hu]=Oxygen-stílusú téma
 Comment[ia]=Thema facite in le stilo de Oxygen
 Comment[it]=Tema realizzato nello stile di Oxygen
 Comment[ko]=Oxygen 스타일의 기본 테마
-Comment[lt]=Tema padaryta Oxygen stiliuje
+Comment[lt]=Apipavidalinimas padarytas Oxygen stiliumi
 Comment[mr]=ऑक्सीजन शैली मध्ये शैली तयार केली
 Comment[nb]=Tema laget i Oxygen-stil
 Comment[nds]=Muster in den Oxygen-Stil

src/plasma/data/servicetypes/plasma-applet.desktop

@@ -20,7 +20,7 @@ Comment[hu]=Plasma kisalkalmazás
 Comment[ia]=Applet Plasma
 Comment[it]=Applet di Plasma
 Comment[ko]=Plasma 애플릿
-Comment[lt]=Plasma įskiepis
+Comment[lt]=Plasma papildinys
 Comment[mr]=प्लाज्मा एप्लेट
 Comment[nb]=Plasma miniprogram
 Comment[nds]=Plasma-Lüttprogramm