From f6e32f5ba15c6a8267343b0708195df73312f7ed Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Tue, 24 Oct 2017 05:16:57 +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 | 1 + plugins/scenes/xrender/xrender.json | 1 + 2 files changed, 2 insertions(+) diff --git a/plugins/scenes/qpainter/qpainter.json b/plugins/scenes/qpainter/qpainter.json index 3ef9e6a5ca..1e9c022376 100644 --- a/plugins/scenes/qpainter/qpainter.json +++ b/plugins/scenes/qpainter/qpainter.json @@ -17,6 +17,7 @@ "Description[sr@latin]": "KWinov priključak slagača za renderovanje kroz QPainter", "Description[sr]": "К‑винов прикључак слагача за рендеровање кроз QPainter", "Description[sv]": "Kwin sammansättningsinsticksprogram återger via QPainter", + "Description[tr]": "QPainter üzerinden KWin Compositor eklentisi oluşturma", "Description[uk]": "Додаток засобу композиції KWin для обробки з використанням QPainter", "Description[x-test]": "xxKWin Compositor plugin rendering through QPainterxx", "Description[zh_CN]": "使用 QPainter 渲染的 KWin 合成插件", diff --git a/plugins/scenes/xrender/xrender.json b/plugins/scenes/xrender/xrender.json index 44a08c188a..79a6df3c99 100644 --- a/plugins/scenes/xrender/xrender.json +++ b/plugins/scenes/xrender/xrender.json @@ -17,6 +17,7 @@ "Description[sr@latin]": "KWinov priključak slagača za renderovanje kroz XRender", "Description[sr]": "К‑винов прикључак слагача за рендеровање кроз Икс‑рендер", "Description[sv]": "Kwin sammansättningsinsticksprogram återger via XRender", + "Description[tr]": "XRender üzerinden KWin Compositor eklentisi oluşturma", "Description[uk]": "Додаток засобу композиції KWin для обробки з використанням XRender", "Description[x-test]": "xxKWin Compositor plugin rendering through XRenderxx", "Description[zh_CN]": "使用 XRender 渲染的 KWin 合成插件",