From 58d8fc6dd5379cb136d13a7ddf52e815364dc27f Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Mon, 29 Apr 2019 05:32:30 +0200
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 861820097..739ddc1f7 100644
--- a/src/desktoptheme/breeze-dark/metadata.desktop
+++ b/src/desktoptheme/breeze-dark/metadata.desktop
@@ -46,6 +46,7 @@ Comment[ca@valencia]=Brisa fosca pel VDG del KDE
 Comment[de]=Breeze-Dunkel von der KDE VDG
 Comment[en_GB]=Breeze Dark by the KDE VDG
 Comment[es]=Brisa oscuro por KDE VDG
+Comment[eu]=Breeze iluna, KDE VDGk egina
 Comment[fi]=Breeze Dark KDE VDG:ltä
 Comment[fr]=Breeze sombre, par KDE VDG
 Comment[gl]=Breeze escuro de KDE VDG
diff --git a/src/desktoptheme/breeze-light/metadata.desktop b/src/desktoptheme/breeze-light/metadata.desktop
index 849d6ef49..7f828bffb 100644
--- a/src/desktoptheme/breeze-light/metadata.desktop
+++ b/src/desktoptheme/breeze-light/metadata.desktop
@@ -43,6 +43,7 @@ Comment[ca@valencia]=Brisa clara pel VDG del KDE
 Comment[de]=Breeze-Hell von der KDE VDG
 Comment[en_GB]=Breeze Light by the KDE VDG
 Comment[es]=Brisa claro por KDE VDG
+Comment[eu]=Breeze argia, KDE VDGk egina
 Comment[fi]=Breeze Light KDE VDG:ltä
 Comment[fr]=Breeze clair, par KDE VDG
 Comment[gl]=Breeze claro de KDE VDG
diff --git a/src/desktoptheme/breeze/metadata.desktop b/src/desktoptheme/breeze/metadata.desktop
index 9891cb287..ccd4ff469 100644
--- a/src/desktoptheme/breeze/metadata.desktop
+++ b/src/desktoptheme/breeze/metadata.desktop
@@ -46,6 +46,7 @@ Comment[ca@valencia]=Brisa pel VDG del KDE
 Comment[de]=Breeze von der KDE VDG
 Comment[en_GB]=Breeze by the KDE VDG
 Comment[es]=Brisa por KDE VDG
+Comment[eu]=Breeze, KDE VDGk egina
 Comment[fi]=Breeze KDE VDG:ltä
 Comment[fr]=Breeze, par KDE VDG
 Comment[gl]=Breeze de KDE VDG