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"

kcms/style/kcm_style.desktop

@@ -92,6 +92,7 @@ X-KDE-Keywords[it]=stile,stili,aspetto,oggetto,icone,barre degli strumenti,testo
 X-KDE-Keywords[nl]=stijl,stijlen,uiterlijk,widget,pictogrammen,werkbalk,tekst,accentuering,apps,KDE-toepassingen,thema,plasma, menu,globaal menu,GTK,GNOME
 X-KDE-Keywords[nn]=stil,stilar,utsjånad,skjermelement,ikon,verktøylinjer,tekst,framheva,program,KDE-program,tema,plasma,meny,global meny,GTK,GNOME
 X-KDE-Keywords[pa]=ਸਟਾਈਲ,ਸ਼ੈਲੀ,ਦਿੱਖ,ਵਿਜੈੱਟ,ਆਈਕਾਨ,ਟੂਲਬਾਰ,ਟੈਕਸਟ,ਲਿਖਤ,ਸ਼ਬਦ,ਉਭਾਰਨਾ,ਐਪ,ਕੇਡੀਈ ਐਪਲੀਕੇਸ਼ਨਾਂ,ਥੀਮ,ਪਲਾਜ਼ਮਾ,ਮੇਨੂ,ਗਲੋਬਲ ਮੇਨੂ,GTK,ਗਨੋਮ
+X-KDE-Keywords[pl]=style,styl,wygląd,element interfejsu,ikony,paski narzędzi,tekst,podświetlenie,programy,programy KDE,motyw,plazma,menu,globalne menu,GTK,GNOME
 X-KDE-Keywords[pt]=estilo,estilos,aparência,elemento,ícones,barras de ferramentas,texto,realce,aplicações,aplicações do KDE,tema,plasma,menu,menu global,GTK,GNOME
 X-KDE-Keywords[pt_BR]=estilo,estilos,aparência,widget,ícones,barras de ferramentas,texto,realce,aplicativos,aplicativos do KDE,tema,plasma, menu, menu global,GTK,GNOME
 X-KDE-Keywords[ro]=stil,stiluri,aspect,control,pictograme,bare,text,evidențiere,aplicații,aplicații KDE,temă,tematică,plasma,meniu,meniu global,GTK,GNOME

login-sessions/plasmax11.desktop.cmake

@@ -16,6 +16,7 @@ Name[it]=Plasma (X11)
 Name[nl]=Plasma (X11)
 Name[nn]=Plasma (X11)
 Name[pa]=ਪਲਾਜ਼ਮਾ (X11)
+Name[pl]=Plazma (X11)
 Name[pt]=Plasma (X11)
 Name[ru]=Plasma (X11)
 Name[sk]=Plasma (X11)