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"

colors/BreezeLight.colors

@@ -110,7 +110,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 Light
 Name[en_GB]=Breeze Light
 Name[es]=Brisa claro

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 Light
 Name[en_GB]=Breeze Light
 Name[es]=Brisa claro

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 Light
 Name[en_GB]=Breeze Light
 Name[es]=Brisa claro

kdecoration/config/breezedecorationconfig.desktop

@@ -103,7 +103,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

wallpapers/Next/metadata.desktop

@@ -1,31 +1,5 @@
 [Desktop Entry]
 Name=Shell
-Name[az]=Axın
-Name[ca]=Flow
-Name[cs]=Proud
-Name[da]=Flow
-Name[el]=Ροή
-Name[en_GB]=Flow
-Name[es]=Fujo
-Name[et]=Flow
-Name[eu]=Flow
-Name[fi]=Flow
-Name[fr]=Flux
-Name[it]=Flusso
-Name[ko]=흐름
-Name[lt]=Flow
-Name[nl]=Flow
-Name[nn]=Flyt
-Name[pt]=Fluxo
-Name[pt_BR]=Flow
-Name[ro]=Flux
-Name[ru]=Поток
-Name[sk]=Prúd
-Name[sl]=Tok
-Name[sv]=Flow
-Name[uk]=Потік
-Name[x-test]=xxFlowxx
-Name[zh_TW]=Flow
 
 X-KDE-PluginInfo-Name=Next
 X-KDE-PluginInfo-Author=Lucas Andrade