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"
7 years ago · 3f8536cbcb
parent 1affa79c81
commit 3f8536cbcb
1 changed files with 1 additions and 0 deletions
--- a/colors/BreezeLight.colors
+++ b/colors/BreezeLight.colors
@ -109,6 +109,7 @@ Name[ca]=Brisa clara
 Name[ca@valencia]=Brisa clara
 Name[de]=Breeze Hell
 Name[es]=Brisa claro
+Name[fr]=Brise claire
 Name[gl]=Breeze claro
 Name[it]=Brezza chiaro
 Name[nl]=Breeze Light