From ca8f308727486e5d9781a1e4a4577465210599f8 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Thu, 9 Jan 2020 05:54:13 +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"
---
 shell/metadata.desktop     | 1 +
 wallpaper/metadata.desktop | 1 +
 2 files changed, 2 insertions(+)

diff --git a/shell/metadata.desktop b/shell/metadata.desktop
index 09c3aad7..4975b1db 100644
--- a/shell/metadata.desktop
+++ b/shell/metadata.desktop
@@ -39,6 +39,7 @@ Comment[en_GB]=Plasma shell for phones
 Comment[es]=Interfaz de Plasma para teléfonos
 Comment[et]=Plasma kest telefonidele
 Comment[eu]=Telefonoetarako Plasma oskola
+Comment[fi]=Plasma-työtila puhelimiin
 Comment[fr]=Terminal Plasma pour smartphones
 Comment[gl]=Intérprete de ordes de Plasma para móbiles
 Comment[hu]=Plasma felület telefonokhoz
diff --git a/wallpaper/metadata.desktop b/wallpaper/metadata.desktop
index 6adee3d0..42c1a4a2 100644
--- a/wallpaper/metadata.desktop
+++ b/wallpaper/metadata.desktop
@@ -6,6 +6,7 @@ Name[en_GB]=Plasma Phone Lockers
 Name[es]=Bloqueos del teléfono de Plasma
 Name[et]=Plasma telefonilukustajad
 Name[eu]=Plasma telefono giltzatzaileak
+Name[fi]=Plasman puhelinlukot
 Name[fr]=Verrouillage de téléphone Plasma
 Name[gl]=Casilleiros de Plasma Phone
 Name[hu]=Plasma Phone zárképernyők