From 21e671bee10f9a630f7902eb7eb595ae4cb14bc0 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Fri, 1 Mar 2019 05:56:28 +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"
---
 src/desktoptheme/breeze-dark/metadata.desktop  | 1 +
 src/desktoptheme/breeze-light/metadata.desktop | 1 +
 src/desktoptheme/breeze/metadata.desktop       | 1 +
 3 files changed, 3 insertions(+)

diff --git a/src/desktoptheme/breeze-dark/metadata.desktop b/src/desktoptheme/breeze-dark/metadata.desktop
index 404a7cd0e..8f29f7c46 100644
--- a/src/desktoptheme/breeze-dark/metadata.desktop
+++ b/src/desktoptheme/breeze-dark/metadata.desktop
@@ -45,6 +45,7 @@ Comment[ca]=Brisa fosca pel VDG del KDE
 Comment[ca@valencia]=Brisa fosca pel VDG del KDE
 Comment[de]=Breeze-Dunkel von der KDE VDG
 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[it]=Brezza scuro del KDE VDG
diff --git a/src/desktoptheme/breeze-light/metadata.desktop b/src/desktoptheme/breeze-light/metadata.desktop
index 93c31d551..ed6b6576d 100644
--- a/src/desktoptheme/breeze-light/metadata.desktop
+++ b/src/desktoptheme/breeze-light/metadata.desktop
@@ -42,6 +42,7 @@ Comment[ca]=Brisa clara pel VDG del KDE
 Comment[ca@valencia]=Brisa clara pel VDG del KDE
 Comment[de]=Breeze-Hell von der KDE VDG
 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[it]=Brezza chiaro del KDE VDG
diff --git a/src/desktoptheme/breeze/metadata.desktop b/src/desktoptheme/breeze/metadata.desktop
index 8219054ce..0172be833 100644
--- a/src/desktoptheme/breeze/metadata.desktop
+++ b/src/desktoptheme/breeze/metadata.desktop
@@ -45,6 +45,7 @@ Comment[ca]=Brisa pel VDG del KDE
 Comment[ca@valencia]=Brisa pel VDG del KDE
 Comment[de]=Breeze von der KDE VDG
 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[it]=Brezza del KDE VDG