From 7cee10d89eaa212ef033900ae19c72652201d2c3 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 16 Feb 2020 05:56:41 +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" --- effects/sessionquit/package/metadata.desktop | 1 + 1 file changed, 1 insertion(+) diff --git a/effects/sessionquit/package/metadata.desktop b/effects/sessionquit/package/metadata.desktop index 438f72f2c1..70a4eca6cc 100644 --- a/effects/sessionquit/package/metadata.desktop +++ b/effects/sessionquit/package/metadata.desktop @@ -51,6 +51,7 @@ Comment[sv]=Behåll skrivbordets bakgrund levande under utloggning till slutet Comment[uk]=Не вимикати тло стільниці до кінця процедури виходу із облікового запису Comment[x-test]=xxKeep the desktop background alive during logout until the endxx Comment[zh_CN]=注销时保持桌面背景，直到完全退出 +Comment[zh_TW]=直到登出完成前皆保留桌面背景圖片 Type=Service X-KDE-ServiceTypes=KWin/Effect