From 93034e04cf188b033b8ef7c962385e0fdca46f66 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Wed, 20 Apr 2016 09:37:30 +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" --- plugins/platforms/x11/standalone/x11.json | 1 + 1 file changed, 1 insertion(+) diff --git a/plugins/platforms/x11/standalone/x11.json b/plugins/platforms/x11/standalone/x11.json index a18fbc964d..3394bca48d 100644 --- a/plugins/platforms/x11/standalone/x11.json +++ b/plugins/platforms/x11/standalone/x11.json @@ -15,6 +15,7 @@ "Description[sv]": "Plattforminsticksprogram för fristående X11 i kwin_x11", "Description[uk]": "Додаток платформи для окремого x11 у kwin_x11.", "Description[x-test]": "xxPlatform plugin for standalone x11 in kwin_x11.xx", + "Description[zh_CN]": "kwin_x11 中的独立 x11 的平台插件", "Id": "KWinX11Platform", "Name": "x11-standalone", "Name[ca@valencia]": "X11-autònoma",