From 4ef7a572a1fdbc169c6da7a47ca5be182531cdfb Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Fri, 20 Oct 2017 04:35:39 +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/opengl/opengl.json | 1 + 1 file changed, 1 insertion(+) diff --git a/plugins/scenes/opengl/opengl.json b/plugins/scenes/opengl/opengl.json index 294d2a2134..531019c9ec 100644 --- a/plugins/scenes/opengl/opengl.json +++ b/plugins/scenes/opengl/opengl.json @@ -16,6 +16,7 @@ "Description[sv]": "Kwin sammansättningsinsticksprogram återger via OpenGL", "Description[uk]": "Додаток засобу композиції KWin для обробки з використанням OpenGL", "Description[x-test]": "xxKWin Compositor plugin rendering through OpenGLxx", + "Description[zh_CN]": "使用 OpenGL 渲染的 KWin 混成插件", "Id": "KWinSceneOpenGL", "Name": "SceneOpenGL", "Name[pl]": "OpenGL sceny",