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"
4 years ago · f0fcf1e4fd
parent 56b2f1f2ed
commit f0fcf1e4fd
2 changed files with 2 additions and 2 deletions
--- a/kdecoration/config/breezedecorationconfig.desktop
+++ b/kdecoration/config/breezedecorationconfig.desktop
@ -107,7 +107,7 @@ X-KDE-Keywords[ca]=breeze,brisa,decoració
 X-KDE-Keywords[ca@valencia]=breeze,brisa,decoració
 X-KDE-Keywords[cs]=breeze,dekorace
 X-KDE-Keywords[da]=breeze,dekoration
-X-KDE-Keywords[de]=Breeze-Dekoration
+X-KDE-Keywords[de]=Dekoration
 X-KDE-Keywords[el]=breeze,διακόσμηση
 X-KDE-Keywords[en_GB]=breeze,decoration
 X-KDE-Keywords[es]=breeze,brisa,decoración
--- a/kstyle/config/breezestyleconfig.desktop
+++ b/kstyle/config/breezestyleconfig.desktop
@ -107,7 +107,7 @@ X-KDE-Keywords[ca]=breeze,brisa,giny,estil
 X-KDE-Keywords[ca@valencia]=breeze,brisa,giny,estil
 X-KDE-Keywords[cs]=breeze,widget,styl
 X-KDE-Keywords[da]=breeze,kontrol,style
-X-KDE-Keywords[de]=Breeze,Bedienelement,Stil
+X-KDE-Keywords[de]=Bedienelement,Stil
 X-KDE-Keywords[el]=breeze,γραφικό συστατικό,στιλ
 X-KDE-Keywords[en_GB]=breeze,widget,style
 X-KDE-Keywords[es]=breeze,brisa,elemento gráfico,widget,estilo