From c21d688d73354c5c8c0a1c59b8480d269a309dc7 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Wed, 1 Aug 2018 05:55:06 +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"
---
 effects/logout/package/metadata.desktop | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/effects/logout/package/metadata.desktop b/effects/logout/package/metadata.desktop
index 47832db63a..afb6fe7efe 100644
--- a/effects/logout/package/metadata.desktop
+++ b/effects/logout/package/metadata.desktop
@@ -1,7 +1,17 @@
 [Desktop Entry]
 Name=Logout
+Name[nl]=Afmelden
+Name[pt]=Encerrar
+Name[uk]=Вихід
+Name[x-test]=xxLogoutxx
+Name[zh_TW]=登出
 Icon=preferences-system-windows-effect-logout
 Comment=Smoothly fade to the logout screen
+Comment[nl]=Langzaam naar het afmeldscherm vervagen
+Comment[pt]=Desvanecer suavemente para o ecrã de encerramento
+Comment[uk]=Плавний перехід до вікна виходу з системи
+Comment[x-test]=xxSmoothly fade to the logout screenxx
+Comment[zh_TW]=平順地淡入登出畫面
 
 Type=Service
 X-KDE-ServiceTypes=KWin/Effect,KCModule