From 210674d67bfce1a115631c88247461d7ec8a1521 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Sun, 14 Apr 2019 05:47:29 +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"
---
 app/lattedock.notifyrc | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/lattedock.notifyrc b/app/lattedock.notifyrc
index 9d804f326..0b1280df1 100644
--- a/app/lattedock.notifyrc
+++ b/app/lattedock.notifyrc
@@ -62,7 +62,7 @@ Name[gl]=Importouse correctamente
 Name[it]=Importata con successo
 Name[nl]=Met succes geïmporteerd
 Name[pt]=Importado com sucesso
-Name[sv]=Importerade med lyckat resultat
+Name[sv]=Import lyckades
 Name[uk]=Успішно імпортовано
 Name[x-test]=xxImported successfullyxx
 Action=Popup
@@ -94,7 +94,7 @@ Name[gl]=Exportouse correctamente
 Name[it]=Esportata correttamente
 Name[nl]=Met succes geëxporteerd
 Name[pt]=Exportada com sucesso
-Name[sv]=Exporterade med lyckat resultat
+Name[sv]=Export lyckades
 Name[uk]=Успішно експортовано
 Name[x-test]=xxExported successfullyxx
 Action=Popup
@@ -126,6 +126,7 @@ Name[gl]=Retirouse correctamente
 Name[it]=Rimossa con successo
 Name[nl]=Met succes verwijderd
 Name[pt]=Removido com sucesso
+Name[sv]=Borttagning lyckades
 Name[uk]=Успішно вилучено
 Name[x-test]=xxRemoved successfullyxx
 Action=Popup
@@ -141,6 +142,7 @@ Name[gl]=Non se puido retirar
 Name[it]=Impossibile rimuovere
 Name[nl]=Verwijderen is mislukt
 Name[pt]=Não foi possível remover
+Name[sv]=Misslyckades ta bort
 Name[uk]=Не вдалося вилучити
 Name[x-test]=xxFailed to removexx
 Action=Popup