From 0a6bd71f0e37785ba82afa2dbf87e30db867d7b9 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Fri, 22 Sep 2017 05:01:54 +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/eyeonscreen/package/metadata.desktop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/effects/eyeonscreen/package/metadata.desktop b/effects/eyeonscreen/package/metadata.desktop index fce5c28b03..d657687517 100644 --- a/effects/eyeonscreen/package/metadata.desktop +++ b/effects/eyeonscreen/package/metadata.desktop @@ -74,7 +74,7 @@ Comment[sv]=Sug in fönster i skrivbordet för att visa det senare. Det kanske p Comment[tr]=İlerisini göstermek için pencereleri masaüstüne topla. Bu size bir şey hatırlatabilir. Comment[uk]=Втягнути вікна до стільниці, щоб показати останню. Так вам простіше буде щось згадати. Comment[x-test]=xxSuck windows into desktop to show the latter. This might remind you of something.xx -Comment[zh_CN]=将窗口吸入桌面并显示桌面。这可能会让你想起什么。 +Comment[zh_CN]=将窗口吸入桌面并显示桌面。这可能会让您想起什么。 Comment[zh_TW]=將視窗「吸」入桌面。 Type=Service