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"

klipper/klipperrc.desktop

@@ -57,7 +57,7 @@ Description[km]=រូបភាព Jpeg
 Description[kn]=ಜೆಪೆಗ್-ಚಿತ್ರ
 Description[ko]=Jpeg-그림
 Description[ku]=Wêneyê Jpeg
-Description[lt]=Jpeg paveiksliukas
+Description[lt]=Jpeg paveikslas
 Description[lv]=Jpeg attēls
 Description[mai]=जेपीईजी-छवि
 Description[mk]=Jpeg-слика

shell/packageplugins/wallpaperimages/plasma-packagestructure-wallpaperimages.desktop

@@ -21,7 +21,7 @@ Name[is]=Bakgrunnsmyndir
 Name[it]=Immagini di sfondo
 Name[ja]=壁紙画像
 Name[ko]=배경 그림
-Name[lt]=Darbalaukio fono paveiksliukai
+Name[lt]=Darbalaukio fono paveikslai
 Name[lv]=Tapešu attēli
 Name[nb]=Tapetbilder
 Name[nl]=Achtergrondafbeeldingen

wallpapers/image/imagepackage/metadata.desktop

@@ -44,7 +44,7 @@ Name[km]=រូបភាព
 Name[kn]=ಬಿಂಬ (ಇಮೇಜ್)
 Name[ko]=그림
 Name[ku]=Wêne
-Name[lt]=Paveiksliukas
+Name[lt]=Paveikslas
 Name[lv]=Attēls
 Name[mai]=चित्र
 Name[mk]=Слика
@@ -97,7 +97,7 @@ Comment[hu]=Háttérkép nézet képekhez
 Comment[id]=Tampilan wallpaper untuk citra
 Comment[it]=Vista delle immagini di sfondo
 Comment[ko]=마음에 드는 그림을 배경으로 사용
-Comment[lt]=Darbalaukio fono rodinys su paveiksliukais
+Comment[lt]=Darbalaukio fono rodinys su paveikslais
 Comment[nl]=Achtergrondweergave voor afbeeldingen
 Comment[nn]=Bakgrunnsbiletevising for bilete
 Comment[pa]=ਚਿੱਤਰਾਂ ਲਈ ਵਾਲਪੇਪਰ ਝਲਕ