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 · 86e532e849
parent dbfb811ef8
commit 86e532e849
4 changed files with 4 additions and 0 deletions
--- a/colors/BreezeHighContrast.colors
+++ b/colors/BreezeHighContrast.colors
@ -108,6 +108,7 @@ Name=Breeze High Contrast
 Name[ca]=Brisa de contrast alt
 Name[ca@valencia]=Brisa de contrast alt
 Name[cs]=Breeze - Vysoký kontrast
+Name[da]=Breeze højkontrast
 Name[de]=Breeze Hoher Kontrast
 Name[en_GB]=Breeze High Contrast
 Name[es]=Brisa de alto contraste
--- a/colors/BreezeLight.colors
+++ b/colors/BreezeLight.colors
@ -108,6 +108,7 @@ Name=Breeze Light
 Name[ca]=Brisa clara
 Name[ca@valencia]=Brisa clara
 Name[cs]=Breeze Světlé
+Name[da]=Breeze Light
 Name[de]=Breeze Hell
 Name[en_GB]=Breeze Light
 Name[es]=Brisa claro
--- a/cursors/Breeze_Snow/Breeze_Snow/index.theme
+++ b/cursors/Breeze_Snow/Breeze_Snow/index.theme
@ -3,6 +3,7 @@ Name=Breeze Light
 Name[ca]=Brisa clara
 Name[ca@valencia]=Brisa clara
 Name[cs]=Breeze Světlé
+Name[da]=Breeze Light
 Name[de]=Breeze Hell
 Name[en_GB]=Breeze Light
 Name[es]=Brisa claro
--- a/cursors/Breeze_Snow/src/index.theme
+++ b/cursors/Breeze_Snow/src/index.theme
@ -3,6 +3,7 @@ Name=Breeze Light
 Name[ca]=Brisa clara
 Name[ca@valencia]=Brisa clara
 Name[cs]=Breeze Světlé
+Name[da]=Breeze Light
 Name[de]=Breeze Hell
 Name[en_GB]=Breeze Light
 Name[es]=Brisa claro