From 985845b44c500ec18fe2f415e94fb58a59e702d7 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Sat, 23 Feb 2019 05:47:39 +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/BreezeLight.colors                   | 2 +-
 cursors/Breeze/Breeze/index.theme           | 1 +
 cursors/Breeze/src/index.theme              | 1 +
 cursors/Breeze_Snow/Breeze_Snow/index.theme | 3 ++-
 cursors/Breeze_Snow/src/index.theme         | 3 ++-
 lookandfeel.dark/metadata.desktop           | 1 +
 6 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/colors/BreezeLight.colors b/colors/BreezeLight.colors
index 65c6fb1c..ce42f8f0 100644
--- a/colors/BreezeLight.colors
+++ b/colors/BreezeLight.colors
@@ -120,7 +120,7 @@ Name[nn]=Breeze lys
 Name[pl]=Jasna Bryza
 Name[pt]=Brisa Clara
 Name[pt_BR]=Breeze Claro
-Name[ru]=Breeze
+Name[ru]=Breeze, светлый вариант
 Name[sk]=Svetlý vánok
 Name[sv]=Breeze Light
 Name[uk]=Світла Breeze
diff --git a/cursors/Breeze/Breeze/index.theme b/cursors/Breeze/Breeze/index.theme
index 51f9c82d..db008a8d 100644
--- a/cursors/Breeze/Breeze/index.theme
+++ b/cursors/Breeze/Breeze/index.theme
@@ -53,6 +53,7 @@ Comment[nl]=Breeze door de KDE VDG
 Comment[nn]=Breeze frå KDE VDG
 Comment[pt]=Brisa da VDG do KDE
 Comment[pt_BR]=Breeze pelo KDE VDG
+Comment[ru]=Breeze от KDE VDG
 Comment[sv]=Breeze av KDE:s visuella designgrupp
 Comment[uk]=Breeze, автори — KDE VDG
 Comment[x-test]=xxBreeze by the KDE VDGxx
diff --git a/cursors/Breeze/src/index.theme b/cursors/Breeze/src/index.theme
index 51f9c82d..db008a8d 100644
--- a/cursors/Breeze/src/index.theme
+++ b/cursors/Breeze/src/index.theme
@@ -53,6 +53,7 @@ Comment[nl]=Breeze door de KDE VDG
 Comment[nn]=Breeze frå KDE VDG
 Comment[pt]=Brisa da VDG do KDE
 Comment[pt_BR]=Breeze pelo KDE VDG
+Comment[ru]=Breeze от KDE VDG
 Comment[sv]=Breeze av KDE:s visuella designgrupp
 Comment[uk]=Breeze, автори — KDE VDG
 Comment[x-test]=xxBreeze by the KDE VDGxx
diff --git a/cursors/Breeze_Snow/Breeze_Snow/index.theme b/cursors/Breeze_Snow/Breeze_Snow/index.theme
index c2a5c48d..53e839aa 100644
--- a/cursors/Breeze_Snow/Breeze_Snow/index.theme
+++ b/cursors/Breeze_Snow/Breeze_Snow/index.theme
@@ -15,7 +15,7 @@ Name[nn]=Breeze lys
 Name[pl]=Jasna Bryza
 Name[pt]=Brisa Clara
 Name[pt_BR]=Breeze Claro
-Name[ru]=Breeze
+Name[ru]=Breeze, светлый вариант
 Name[sk]=Svetlý vánok
 Name[sv]=Breeze Light
 Name[uk]=Світла Breeze
@@ -32,6 +32,7 @@ Comment[nl]=Breeze Light door de KDE VDG
 Comment[nn]=Breeze Light frå KDE VDG
 Comment[pt]=Brisa Claro da VDG do KDE
 Comment[pt_BR]=Breeze Light pelo KDE VDG
+Comment[ru]=Светлый вариант Breeze от KDE VDG
 Comment[sv]=Breeze ljus av KDE:s visuella designgrupp
 Comment[uk]=Світла Breeze, автори — KDE VDG
 Comment[x-test]=xxBreeze Light by the KDE VDGxx
diff --git a/cursors/Breeze_Snow/src/index.theme b/cursors/Breeze_Snow/src/index.theme
index c2a5c48d..53e839aa 100644
--- a/cursors/Breeze_Snow/src/index.theme
+++ b/cursors/Breeze_Snow/src/index.theme
@@ -15,7 +15,7 @@ Name[nn]=Breeze lys
 Name[pl]=Jasna Bryza
 Name[pt]=Brisa Clara
 Name[pt_BR]=Breeze Claro
-Name[ru]=Breeze
+Name[ru]=Breeze, светлый вариант
 Name[sk]=Svetlý vánok
 Name[sv]=Breeze Light
 Name[uk]=Світла Breeze
@@ -32,6 +32,7 @@ Comment[nl]=Breeze Light door de KDE VDG
 Comment[nn]=Breeze Light frå KDE VDG
 Comment[pt]=Brisa Claro da VDG do KDE
 Comment[pt_BR]=Breeze Light pelo KDE VDG
+Comment[ru]=Светлый вариант Breeze от KDE VDG
 Comment[sv]=Breeze ljus av KDE:s visuella designgrupp
 Comment[uk]=Світла Breeze, автори — KDE VDG
 Comment[x-test]=xxBreeze Light by the KDE VDGxx
diff --git a/lookandfeel.dark/metadata.desktop b/lookandfeel.dark/metadata.desktop
index 62affd4f..d19d7f06 100644
--- a/lookandfeel.dark/metadata.desktop
+++ b/lookandfeel.dark/metadata.desktop
@@ -9,6 +9,7 @@ Comment[nl]=Breeze Dark door de KDE VDG
 Comment[nn]=Breeze Dark frå KDE VDG
 Comment[pt]=Brisa Escuro da VDG do KDE
 Comment[pt_BR]=Breeze Dark pelo KDE VDG
+Comment[ru]=Тёмный вариант Breeze от KDE VDG
 Comment[sv]=Breeze mörk av KDE:s visuella designgrupp
 Comment[uk]=Темна Breeze, автори — KDE VDG
 Comment[x-test]=xxBreeze Dark by the KDE VDGxx