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"
10 years ago · 4ff145adf2
parent d28b1011bc
commit 4ff145adf2
1 changed files with 1 additions and 1 deletions
--- a/kdecoration/config/breezedecorationconfig.desktop
+++ b/kdecoration/config/breezedecorationconfig.desktop
@ -30,7 +30,7 @@ Name[lt]=Lango dekoracija
 Name[nb]=Vinduspynt
 Name[nl]=Vensterdecoratie
 Name[nn]=Vindaugspynt
-Name[pl]=Wystrój okien
+Name[pl]=Wygląd okien
 Name[pt]=Decoração de Janelas
 Name[pt_BR]=Decorações da janela
 Name[ro]=Decorații pentru ferestre