From 3bcd24b00917c25cfb004d85c7ca6fced8f71cac Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Mon, 31 Aug 2015 11:22:32 +0000
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"
---
 effects/login/package/metadata.desktop | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/effects/login/package/metadata.desktop b/effects/login/package/metadata.desktop
index a4dc203cf2..7467e18ef7 100644
--- a/effects/login/package/metadata.desktop
+++ b/effects/login/package/metadata.desktop
@@ -99,7 +99,7 @@ Comment[en_GB]=Smoothly fade to the desktop when logging in
 Comment[es]=Desvanece el escritorio cuando se inicia la sesión
 Comment[et]=Töölaua sujuv ilmumine sisselogimisel
 Comment[eu]=Mahaigaina pixkanaka desagertzen da saioa hastean
-Comment[fi]=Häivytä pehmeästi työpöytään sisäänkirjauduttaessa
+Comment[fi]=Häivytä pehmeästi työpöydälle kirjauduttaessa sisään
 Comment[fr]=Effectue un dégradé progressif vers le bureau lors de la connexion
 Comment[fy]=Lit it opstartskerm ferdizenje nei it buroblêd ûnder it oanmelden
 Comment[ga]=Céimnigh go dtí an deasc go réidh ag am logála isteach