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 · ffdd370a05
parent 7007a0d87d
commit ffdd370a05
2 changed files with 2 additions and 2 deletions
--- a/colors/BreezeDark.colors
+++ b/colors/BreezeDark.colors
@ -119,7 +119,7 @@ Name[et]=Breeze Dark
 Name[eu]=Breeze iluna
 Name[fi]=Breeze Dark
 Name[fr]=Brise sombre
-Name[gl]=Breeze escuro
+Name[gl]=Breeze Dark
 Name[he]=Breeze Dark
 Name[hu]=Breeze Dark
 Name[ia]=Brisa obscure
--- a/lookandfeel.dark/metadata.desktop
+++ b/lookandfeel.dark/metadata.desktop
@ -40,7 +40,7 @@ Name[et]=Breeze Dark
 Name[eu]=Breeze iluna
 Name[fi]=Breeze Dark
 Name[fr]=Brise sombre
-Name[gl]=Breeze escuro
+Name[gl]=Breeze Dark
 Name[he]=Breeze Dark
 Name[hu]=Breeze Dark
 Name[ia]=Brisa obscure