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"

kstyle/config/breezestyleconfig.desktop

@@ -122,6 +122,7 @@ X-KDE-Keywords[lt]=breeze,valdiklis,stilius
 X-KDE-Keywords[nb]=breeze,skjermelement,stil
 X-KDE-Keywords[nl]=breeze,widget,stijl
 X-KDE-Keywords[nn]=breeze,skjermelement,skjermkontrollar,stil,utsjånad
+X-KDE-Keywords[pa]=ਬਰੀਜ਼,ਵਿਜੈਟ,ਸਟਾਈਲ
 X-KDE-Keywords[pl]=breeze,widget,styl,bryza,element interfejsu
 X-KDE-Keywords[pt]=brisa,elemento,estilo
 X-KDE-Keywords[pt_BR]=breeze,widget,estilo

wallpapers/Next/metadata.desktop

@@ -14,6 +14,7 @@ Name[it]=Shell
 Name[ko]=셸
 Name[nl]=Shell
 Name[nn]=Skal
+Name[pa]=ਸ਼ੈੱਲ
 Name[pt]=Consola
 Name[pt_BR]=Concha
 Name[ro]=Înveliș