From 3772f6186a4aa496734d933be91d7afe149a7e71 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Fri, 18 Dec 2020 06:36:59 +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 ++
 plasma_phone_components.notifyrc | 3 +++
 2 files changed, 5 insertions(+)

diff --git a/applets/krunner/metadata.desktop b/applets/krunner/metadata.desktop
index 124fc610..e372d124 100644
--- a/applets/krunner/metadata.desktop
+++ b/applets/krunner/metadata.desktop
@@ -12,6 +12,7 @@ Name[et]=Otsimine ja käivitamine
 Name[eu]=Bilatu eta exekutatu
 Name[fi]=Etsi ja käynnistä
 Name[fr]=Chercher et lancer
+Name[hu]=Keresés és indítás
 Name[ia]=Cerca e Exeque
 Name[id]=Cari Dan Jalankan
 Name[it]=Cerca e avvia
@@ -43,6 +44,7 @@ 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[fr]=Chercher et lancer des applications et des services
+Comment[hu]=Alkalmazások és szolgáltatások keresése és indítása
 Comment[ia]=Cerca e Exeque Applicatione e Servicios
 Comment[id]=Cari dan jalankan Aplikasi dan layanan
 Comment[it]=Cerca e avvia applicazioni e servizi
diff --git a/plasma_phone_components.notifyrc b/plasma_phone_components.notifyrc
index e4d8a8bb..c1c12b2e 100644
--- a/plasma_phone_components.notifyrc
+++ b/plasma_phone_components.notifyrc
@@ -6,6 +6,7 @@ Name[ca]=Plasma
 Name[cs]=Plasma
 Name[en_GB]=Plasma
 Name[es]=Plasma
+Name[hu]=Plasma
 Name[ia]=Plasma
 Name[it]=Plasma
 Name[nl]=Plasma
@@ -23,6 +24,7 @@ Name=Captured
 Name[ca]=Captura
 Name[en_GB]=Captured
 Name[es]=Capturado
+Name[hu]=Rögzítve
 Name[ia]=Capturate
 Name[it]=Catturato
 Name[nl]=Opgenomen
@@ -37,6 +39,7 @@ Comment=Captured
 Comment[ca]=Captura
 Comment[en_GB]=Captured
 Comment[es]=Capturado
+Comment[hu]=Rögzítve
 Comment[ia]=Capturate
 Comment[it]=Catturato
 Comment[nl]=Opgenomen