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"
9 years ago · 9d161448d2
parent 15d171f312
commit 9d161448d2
2 changed files with 2 additions and 0 deletions
--- a/kdecoration/config/breezedecorationconfig.desktop
+++ b/kdecoration/config/breezedecorationconfig.desktop
@ -21,6 +21,7 @@ Name[it]=Decorazione delle finestre di Brezza
 Name[nl]=Breeze vensterdecoratie
 Name[pl]=Wygląd okien Bryzy
 Name[pt]=Decoração de Janelas Brisa
+Name[ru]=Оформление окон Breeze
 Name[sr]=Поветарчева декорација прозора
 Name[sr@ijekavian]=Поветарчева декорација прозора
 Name[sr@ijekavianlatin]=Povetarčeva dekoracija prozora
--- a/kstyle/config/breezestyleconfig.desktop
+++ b/kstyle/config/breezestyleconfig.desktop
@ -21,6 +21,7 @@ Name[it]=Stile degli oggetti di Brezza
 Name[nl]=Breeze widgetstijl
 Name[pl]=Wygląd interfejsu Bryzy
 Name[pt]=Estilo Gráfico Brisa
+Name[ru]=Стиль интерфейса Breeze
 Name[sr]=Поветарчев стил виџета̂
 Name[sr@ijekavian]=Поветарчев стил виџета̂
 Name[sr@ijekavianlatin]=Povetarčev stil vidžetâ̂