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"
4 years ago · 39a0d60c34
parent ec55895a27
commit 39a0d60c34
2 changed files with 2 additions and 0 deletions
--- a/colors/BreezeClassic.colors
+++ b/colors/BreezeClassic.colors
@ -110,6 +110,7 @@ Name[az]=Breeze klassik
 Name[ca]=Brisa clàssica
 Name[ca@valencia]=Brisa clàssica
 Name[cs]=Breeze Classic
+Name[da]=Breeze Classic
 Name[de]=Breeze Klassisch
 Name[el]=Breeze κλασικό
 Name[en_GB]=Breeze Classic
--- a/wallpapers/Next/metadata.desktop
+++ b/wallpapers/Next/metadata.desktop
@ -2,6 +2,7 @@
 Name=Honeywave
 Name[ca]=Honeywave
 Name[cs]=Vlna medu
+Name[da]=Honeywave
 Name[es]=Onda de miel
 Name[fi]=Hunaja-aalto
 Name[fr]=Onde de miel