From d1fdb281982ca7246119a52ffa38f34c102690a0 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Sat, 21 Mar 2020 05:57:10 +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"
---
 applets/krunner/metadata.desktop | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/applets/krunner/metadata.desktop b/applets/krunner/metadata.desktop
index cf61f79b..660e45f6 100644
--- a/applets/krunner/metadata.desktop
+++ b/applets/krunner/metadata.desktop
@@ -5,6 +5,7 @@ Name[ca]=Cerca i executa
 Name[es]=Buscar y ejecutar
 Name[et]=Otsimine ja käivitamine
 Name[eu]=Bilatu eta exekutatu
+Name[fi]=Etsi ja käynnistä
 Name[id]=Cari Dan Jalankan
 Name[it]=Cerca e avvia
 Name[ko]=찾아서 실행하기
@@ -25,6 +26,7 @@ Comment[ca]=Cerca i executa aplicacions i serveis
 Comment[es]=Buscar y ejecutar aplicaciones y servicios
 Comment[et]=Rakenduste ja teenuste otsimine ja käivitamine
 Comment[eu]=Bilatu eta exekutatu aplikazioak eta zerbitzuak
+Comment[fi]=Etsi ja käynnistä sovelluksia ja palveluja
 Comment[id]=Cari dan jalankan Aplikasi dan layanan
 Comment[it]=Cerca e avvia applicazioni e servizi
 Comment[ko]=프로그램과 서비스 찾아서 실행하기