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 · 9f7210554d
parent 56109d1a4b
commit 9f7210554d
1 changed files with 1 additions and 0 deletions
--- a/colors/BreezeClassic.colors
+++ b/colors/BreezeClassic.colors
@ -127,6 +127,7 @@ Name[nn]=Breeze klassisk
 Name[pl]=Klasyczna Bryza
 Name[pt]=Brisa Clássica
 Name[pt_BR]=Breeze Classic
+Name[ru]=Breeze, классический вариант
 Name[sk]=Klasický vánok
 Name[sl]=Sapica, klasična
 Name[sv]=Breeze klassisk