From e824e2f57b04f832cfb27b3c5ffbf45357ea3d6c Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Fri, 2 Nov 2018 07:57:11 +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"
---
 lookandfeel/metadata.desktop | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lookandfeel/metadata.desktop b/lookandfeel/metadata.desktop
index 7cf06b914..88d4d511d 100644
--- a/lookandfeel/metadata.desktop
+++ b/lookandfeel/metadata.desktop
@@ -43,7 +43,7 @@ Comment[zh_CN]=KDE 视觉设计组设计的 Breeze 桌面设计语言
 Comment[zh_TW]=KDE VDG 設計的微風桌面設計語言
 Keywords=Desktop;Workspace;Appearance;Look and Feel;Logout;Lock;Suspend;Shutdown;Hibernate;
 Keywords[ca]=Escriptori;Espai de treball;Aparença;Aspecte i comportament;Sortida;Bloqueig;Suspensió;Aturada;Hibernació;
-Keywords[ca@valencia]=Escriptori;Espai de treball;Aparença;Aparença i comportament;Eixida;Bloqueig;Suspensió;Aturada;Hibernació;
+Keywords[ca@valencia]=Escriptori;Espai de treball;Aparença;Aspecte i comportament;Eixida;Bloqueig;Suspensió;Aturada;Hibernació;
 Keywords[da]=Skrivebord;Desktop;Arbejdsområde;Udseende;log ud;Lås;Suspendér;Nedlukning;dvale;
 Keywords[de]=Desktop;Arbeitsfläche;Erscheinungsbild;Erscheinungsbild und Verhalten;Abmelden;Sperren;Standby;Ruhezustand;Tiefschlaf;Herunterfahren;
 Keywords[el]=Επιφάνεια εργασίας;Χώρος εργασίας;Εμφάνιση;Όψη και Αίσθηση;Αποσύνδεση;Κλείδωμα;Αναστολή;Τερματισμός;Νάρκη;