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"
2020-09-09 06:33:22 +02:00 · 2020-09-09 06:33:22 +02:00 · 81a9b824cf
parent 6acf35e4cc
commit 81a9b824cf
1 changed files with 1 additions and 1 deletions
--- a/effects/presentwindows/presentwindows_config.desktop
+++ b/effects/presentwindows/presentwindows_config.desktop
@ -62,7 +62,7 @@ Name[pa]=ਮੌਜੂਦਾ ਵਿੰਡੋਜ਼
 Name[pl]=Prezentacja okien
 Name[pt]=Apresentar as Janelas
 Name[pt_BR]=Apresentar janelas
-Name[ro]=Ferestre prezente
+Name[ro]=Prezintă ferestrele
 Name[ru]=Все окна
 Name[se]=Presentere lásiid
 Name[si]=පවතින කවුළුව