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"
5 years ago · 1c96a6d060
parent e40760a941
commit 1c96a6d060
4 changed files with 4 additions and 4 deletions
--- a/colors/BreezeLight.colors
+++ b/colors/BreezeLight.colors
@ -138,7 +138,7 @@ Name[ca]=Brisa clara
 Name[ca@valencia]=Brisa clara
 Name[cs]=Breeze Světlé
 Name[da]=Breeze Light
-Name[de]=Breeze-Hell
+Name[de]=Breeze Hell
 Name[el]=Breeze φωτεινό
 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
@ -5,7 +5,7 @@ Name[ca]=Brisa clara
 Name[ca@valencia]=Brisa clara
 Name[cs]=Breeze Světlé
 Name[da]=Breeze Light
-Name[de]=Breeze-Hell
+Name[de]=Breeze Hell
 Name[el]=Breeze φωτεινό
 Name[en_GB]=Breeze Light
 Name[es]=Brisa claro
--- a/cursors/Breeze_Snow/src/index.theme
+++ b/cursors/Breeze_Snow/src/index.theme
@ -5,7 +5,7 @@ Name[ca]=Brisa clara
 Name[ca@valencia]=Brisa clara
 Name[cs]=Breeze Světlé
 Name[da]=Breeze Light
-Name[de]=Breeze-Hell
+Name[de]=Breeze Hell
 Name[el]=Breeze φωτεινό
 Name[en_GB]=Breeze Light
 Name[es]=Brisa claro
--- a/kdecoration/config/breezedecorationconfig.desktop
+++ b/kdecoration/config/breezedecorationconfig.desktop
@ -105,7 +105,7 @@ X-KDE-Keywords[ca]=breeze,brisa,decoració
 X-KDE-Keywords[ca@valencia]=breeze,brisa,decoració
 X-KDE-Keywords[cs]=breeze,dekorace
 X-KDE-Keywords[da]=breeze,dekoration
-X-KDE-Keywords[de]=Breeze,Dekoration
+X-KDE-Keywords[de]=Breeze-Dekoration
 X-KDE-Keywords[el]=breeze,διακόσμηση
 X-KDE-Keywords[en_GB]=breeze,decoration
 X-KDE-Keywords[es]=breeze,brisa,decoración