From 62c6e1399b3adbea2951b2acdca1f7dc5b6b546f Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 4 Sep 2017 04:47:09 +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, 4 insertions(+) diff --git a/plugins/scenes/qpainter/qpainter.json b/plugins/scenes/qpainter/qpainter.json index 02dda86748..1e6bb25663 100644 --- a/plugins/scenes/qpainter/qpainter.json +++ b/plugins/scenes/qpainter/qpainter.json @@ -4,12 +4,14 @@ "Description": "KWin Compositor plugin rendering through QPainter", "Description[ca]": "Connector del Compositor del KWin que renderitza a través del QPainter", "Description[nl]": "KWin-compositor-plug-in rendering via QPainter", + "Description[pl]": "Wtyczka kompozytora KWin wyświetlająca przez QPainter", "Description[pt]": "'Plugin' de Composição do KWin com desenho via QPainter", "Description[sv]": "Kwin sammansättningsinsticksprogram återger via QPainter", "Description[uk]": "Додаток засобу композиції KWin для обробки з використанням QPainter", "Description[x-test]": "xxKWin Compositor plugin rendering through QPainterxx", "Id": "KWinSceneQPainter", "Name": "SceneQPainter", + "Name[pl]": "QPainter sceny", "Name[sv]": "Scen QPainter", "Name[x-test]": "xxSceneQPainterxx" } diff --git a/plugins/scenes/xrender/xrender.json b/plugins/scenes/xrender/xrender.json index c269126725..61085760c6 100644 --- a/plugins/scenes/xrender/xrender.json +++ b/plugins/scenes/xrender/xrender.json @@ -4,12 +4,14 @@ "Description": "KWin Compositor plugin rendering through XRender", "Description[ca]": "Connector del Compositor del KWin que renderitza a través de l'XRender", "Description[nl]": "KWin-compositor-plug-in rendering via XRender", + "Description[pl]": "Wtyczka kompozytora KWin wyświetlająca przez XRender", "Description[pt]": "'Plugin' de Composição do KWin com desenho via XRender", "Description[sv]": "Kwin sammansättningsinsticksprogram återger via XRender", "Description[uk]": "Додаток засобу композиції KWin для обробки з використанням XRender", "Description[x-test]": "xxKWin Compositor plugin rendering through XRenderxx", "Id": "KWinSceneXRender", "Name": "SceneXRender", + "Name[pl]": "XRender sceny", "Name[sv]": "Scen XRender", "Name[x-test]": "xxSceneXRenderxx" }