From 36f4e41bbf7d716ab84c8a6834b4da88a6137d2e Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Fri, 22 Feb 2019 05:40:20 +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"
---
 cursors/Breeze/Breeze/index.theme           | 2 ++
 cursors/Breeze/src/index.theme              | 2 ++
 cursors/Breeze_Snow/Breeze_Snow/index.theme | 2 ++
 cursors/Breeze_Snow/src/index.theme         | 2 ++
 lookandfeel.dark/metadata.desktop           | 2 ++
 5 files changed, 10 insertions(+)

diff --git a/cursors/Breeze/Breeze/index.theme b/cursors/Breeze/Breeze/index.theme
index 54b3d269..51f9c82d 100644
--- a/cursors/Breeze/Breeze/index.theme
+++ b/cursors/Breeze/Breeze/index.theme
@@ -46,7 +46,9 @@ Name[zh_TW]=Breeze
 Comment=Breeze by the KDE VDG
 Comment[ca]=Brisa pel VDG del KDE
 Comment[es]=Brisa por KDE VDG
+Comment[fi]=Breeze KDE VDG:ltä
 Comment[gl]=Breeze de KDE VDG
+Comment[id]=Breeze oleh KDE VDG
 Comment[nl]=Breeze door de KDE VDG
 Comment[nn]=Breeze frå KDE VDG
 Comment[pt]=Brisa da VDG do KDE
diff --git a/cursors/Breeze/src/index.theme b/cursors/Breeze/src/index.theme
index 54b3d269..51f9c82d 100644
--- a/cursors/Breeze/src/index.theme
+++ b/cursors/Breeze/src/index.theme
@@ -46,7 +46,9 @@ Name[zh_TW]=Breeze
 Comment=Breeze by the KDE VDG
 Comment[ca]=Brisa pel VDG del KDE
 Comment[es]=Brisa por KDE VDG
+Comment[fi]=Breeze KDE VDG:ltä
 Comment[gl]=Breeze de KDE VDG
+Comment[id]=Breeze oleh KDE VDG
 Comment[nl]=Breeze door de KDE VDG
 Comment[nn]=Breeze frå KDE VDG
 Comment[pt]=Brisa da VDG do KDE
diff --git a/cursors/Breeze_Snow/Breeze_Snow/index.theme b/cursors/Breeze_Snow/Breeze_Snow/index.theme
index a852f236..c2a5c48d 100644
--- a/cursors/Breeze_Snow/Breeze_Snow/index.theme
+++ b/cursors/Breeze_Snow/Breeze_Snow/index.theme
@@ -25,7 +25,9 @@ Name[zh_TW]=Breeze Light
 Comment=Breeze Light by the KDE VDG
 Comment[ca]=Brisa clara pel VDG del KDE
 Comment[es]=Brisa claro por KDE VDG
+Comment[fi]=Breeze Light KDE VDG:ltä
 Comment[gl]=Breeze claro de KDE VDG
+Comment[id]=Breeze Light oleh KDE VDG
 Comment[nl]=Breeze Light door de KDE VDG
 Comment[nn]=Breeze Light frå KDE VDG
 Comment[pt]=Brisa Claro da VDG do KDE
diff --git a/cursors/Breeze_Snow/src/index.theme b/cursors/Breeze_Snow/src/index.theme
index a852f236..c2a5c48d 100644
--- a/cursors/Breeze_Snow/src/index.theme
+++ b/cursors/Breeze_Snow/src/index.theme
@@ -25,7 +25,9 @@ Name[zh_TW]=Breeze Light
 Comment=Breeze Light by the KDE VDG
 Comment[ca]=Brisa clara pel VDG del KDE
 Comment[es]=Brisa claro por KDE VDG
+Comment[fi]=Breeze Light KDE VDG:ltä
 Comment[gl]=Breeze claro de KDE VDG
+Comment[id]=Breeze Light oleh KDE VDG
 Comment[nl]=Breeze Light door de KDE VDG
 Comment[nn]=Breeze Light frå KDE VDG
 Comment[pt]=Brisa Claro da VDG do KDE
diff --git a/lookandfeel.dark/metadata.desktop b/lookandfeel.dark/metadata.desktop
index 6b60705f..62affd4f 100644
--- a/lookandfeel.dark/metadata.desktop
+++ b/lookandfeel.dark/metadata.desktop
@@ -2,7 +2,9 @@
 Comment=Breeze Dark by the KDE VDG
 Comment[ca]=Brisa fosca pel VDG del KDE
 Comment[es]=Brisa oscuro por KDE VDG
+Comment[fi]=Breeze Dark KDE VDG:ltä
 Comment[gl]=Breeze escuro de KDE VDG
+Comment[id]=Breeze Dark oleh KDE VDG
 Comment[nl]=Breeze Dark door de KDE VDG
 Comment[nn]=Breeze Dark frå KDE VDG
 Comment[pt]=Brisa Escuro da VDG do KDE