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/Breeze.colors

@@ -105,6 +105,49 @@ ForegroundVisited=61,174,230
 [General]
 ColorScheme=Breeze
 Name=Breeze
+Name[ar]=نسيم
+Name[bs]=Breeze
+Name[ca]=Brisa
+Name[ca@valencia]=Brisa
+Name[cs]=Breeze
+Name[da]=Breeze
+Name[de]=Breeze
+Name[el]=Breeze
+Name[en_GB]=Breeze
+Name[es]=Brisa
+Name[et]=Breeze
+Name[eu]=Breeze
+Name[fi]=Breeze
+Name[fr]=Brise
+Name[gl]=Breeze
+Name[he]=Breeze
+Name[hu]=Breeze
+Name[ia]=Brisa
+Name[id]=Breeze
+Name[it]=Brezza
+Name[ko]=Breeze
+Name[lt]=Breeze
+Name[nb]=Breeze
+Name[nds]=Breeze
+Name[nl]=Breeze
+Name[nn]=Breeze
+Name[pl]=Bryza
+Name[pt]=Brisa
+Name[pt_BR]=Breeze
+Name[ro]=Briză
+Name[ru]=Breeze
+Name[sk]=Breeze
+Name[sl]=Sapica
+Name[sr]=Поветарац
+Name[sr@ijekavian]=Поветарац
+Name[sr@ijekavianlatin]=Povetarac
+Name[sr@latin]=Povetarac
+Name[sv]=Breeze
+Name[tr]=Esinti
+Name[uk]=Breeze
+Name[x-test]=xxBreezexx
+Name[zh_CN]=微风
+Name[zh_TW]=Breeze
 shadeSortColumn=true
 
 [KDE]

colors/BreezeDark.colors

@@ -105,6 +105,48 @@ ForegroundVisited=61,174,230
 [General]
 ColorScheme=Breeze Dark
 Name=Breeze Dark
+Name[ar]=نسيم داكن
+Name[bs]=Breeze tamna
+Name[ca]=Brisa fosca
+Name[ca@valencia]=Brisa fosca
+Name[cs]=Breeze Tmavé
+Name[da]=Breeze Dark
+Name[de]=Breeze-Dunkel
+Name[el]=Σκοτεινό Breeze
+Name[en_GB]=Breeze Dark
+Name[es]=Brisa oscuro
+Name[et]=Breeze Dark
+Name[eu]=Breeze Dark
+Name[fi]=Breeze Dark
+Name[fr]=Brise sombre
+Name[gl]=Breeze Dark
+Name[he]=Breeze Dark
+Name[hu]=Breeze Dark
+Name[ia]=Brisa obscure
+Name[id]=Breeze Dark
+Name[it]=Brezza scuro
+Name[ko]=어두운 Breeze
+Name[lt]=Breeze tamsi
+Name[nb]=Breeze mørk
+Name[nl]=Breeze Dark
+Name[nn]=Breeze mørk
+Name[pl]=Ciemna bryza
+Name[pt]=Brisa Escura
+Name[pt_BR]=Breeze Dark
+Name[ro]=Briză Întunecat
+Name[ru]=Breeze, тёмный вариант
+Name[sk]=Tmavý vánok
+Name[sl]=Sapica (temna)
+Name[sr]=Поветарац тамни
+Name[sr@ijekavian]=Поветарац тамни
+Name[sr@ijekavianlatin]=Povetarac tamni
+Name[sr@latin]=Povetarac tamni
+Name[sv]=Breeze mörk
+Name[tr]=Koyu Esinti
+Name[uk]=Breeze Dark
+Name[x-test]=xxBreeze Darkxx
+Name[zh_CN]=暗色微风
+Name[zh_TW]=Breeze Dark
 shadeSortColumn=true
 
 [KDE]