From f9a3a97dc707bf52dbfaaa840fd8606e971a8e76 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Wed, 13 Jun 2018 07:33:20 +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" --- plugins/scenes/qpainter/qpainter.json | 2 +- plugins/scenes/xrender/xrender.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/scenes/qpainter/qpainter.json b/plugins/scenes/qpainter/qpainter.json index 9335773a72..779ebe2e97 100644 --- a/plugins/scenes/qpainter/qpainter.json +++ b/plugins/scenes/qpainter/qpainter.json @@ -30,7 +30,7 @@ "Description[tr]": "QPainter üzerinden KWin Dizgici eklentisi oluşturma", "Description[uk]": "Додаток засобу композиції KWin для обробки з використанням QPainter", "Description[x-test]": "xxKWin Compositor plugin rendering through QPainterxx", - "Description[zh_CN]": "使用 QPainter 渲染的 KWin 合成插件", + "Description[zh_CN]": "使用 QPainter 渲染的 KWin 混成插件", "Description[zh_TW]": "透過 QPainter 繪製 KWin 合成器附加元件", "Id": "KWinSceneQPainter", "Name": "SceneQPainter", diff --git a/plugins/scenes/xrender/xrender.json b/plugins/scenes/xrender/xrender.json index 47fe8056f4..68e9e6220e 100644 --- a/plugins/scenes/xrender/xrender.json +++ b/plugins/scenes/xrender/xrender.json @@ -30,7 +30,7 @@ "Description[tr]": "XRender üzerinden KWin Dizgici eklentisi oluşturma", "Description[uk]": "Додаток засобу композиції KWin для обробки з використанням XRender", "Description[x-test]": "xxKWin Compositor plugin rendering through XRenderxx", - "Description[zh_CN]": "使用 XRender 渲染的 KWin 合成插件", + "Description[zh_CN]": "使用 XRender 渲染的 KWin 混成插件", "Description[zh_TW]": "透過 XRender 繪製 KWin 合成器附加元件", "Id": "KWinSceneXRender", "Name": "SceneXRender",