From 3657f49534932cd0a609ef5835b5e2dc4ef070e9 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Thu, 6 Dec 2018 05:47:01 +0100
Subject: [PATCH] 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/BreezeDark.colors          | 2 +-
 colors/BreezeHighContrast.colors  | 8 ++++++++
 colors/BreezeLight.colors         | 8 ++++++++
 lookandfeel.dark/metadata.desktop | 2 +-
 4 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/colors/BreezeDark.colors b/colors/BreezeDark.colors
index d730901f..8eb9716f 100644
--- a/colors/BreezeDark.colors
+++ b/colors/BreezeDark.colors
@@ -143,7 +143,7 @@ Name[sr@ijekavianlatin]=Povetarac tamni
 Name[sr@latin]=Povetarac tamni
 Name[sv]=Breeze mörk
 Name[tr]=Koyu Esinti
-Name[uk]=Breeze Dark
+Name[uk]=Темна Breeze
 Name[x-test]=xxBreeze Darkxx
 Name[zh_CN]=暗色微风
 Name[zh_TW]=Breeze Dark
diff --git a/colors/BreezeHighContrast.colors b/colors/BreezeHighContrast.colors
index 758f1e90..2017abcc 100644
--- a/colors/BreezeHighContrast.colors
+++ b/colors/BreezeHighContrast.colors
@@ -105,6 +105,14 @@ ForegroundVisited=127,140,141
 [General]
 ColorScheme=Breeze High Conttrast
 Name=Breeze High Contrast
+Name[ca]=Brisa de contrast alt
+Name[ca@valencia]=Brisa de contrast alt
+Name[de]=Breeze Hoher Kontrast
+Name[nl]=Breeze met hoog contrast
+Name[pt]=Brisa de Alto Contraste
+Name[uk]=Висококонтрастна Breeze
+Name[x-test]=xxBreeze High Contrastxx
+Name[zh_TW]=Breeze 高對比
 shadeSortColumn=true
 
 [KDE]
diff --git a/colors/BreezeLight.colors b/colors/BreezeLight.colors
index aada7643..49e14ff7 100644
--- a/colors/BreezeLight.colors
+++ b/colors/BreezeLight.colors
@@ -105,6 +105,14 @@ ForegroundVisited=61,174,230
 [General]
 ColorScheme=Breeze Light
 Name=Breeze Light
+Name[ca]=Brisa clara
+Name[ca@valencia]=Brisa clara
+Name[de]=Breeze Hell
+Name[nl]=Breeze Light
+Name[pt]=Brisa Clara
+Name[uk]=Світла Breeze
+Name[x-test]=xxBreeze Lightxx
+Name[zh_TW]=Breeze Light
 shadeSortColumn=true
 
 [KDE]
diff --git a/lookandfeel.dark/metadata.desktop b/lookandfeel.dark/metadata.desktop
index 3e189284..caf2a2d5 100644
--- a/lookandfeel.dark/metadata.desktop
+++ b/lookandfeel.dark/metadata.desktop
@@ -76,7 +76,7 @@ Name[sr@ijekavianlatin]=Povetarac tamni
 Name[sr@latin]=Povetarac tamni
 Name[sv]=Breeze mörk
 Name[tr]=Koyu Esinti
-Name[uk]=Breeze Dark
+Name[uk]=Темна Breeze
 Name[x-test]=xxBreeze Darkxx
 Name[zh_CN]=暗色微风
 Name[zh_TW]=Breeze Dark