From 07d1cb1191a8311c3535384ccdadef541b4ef69f Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sat, 7 Oct 2017 05:16:28 +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 | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/plugins/scenes/opengl/opengl.json b/plugins/scenes/opengl/opengl.json index 40bb44a1f6..0ae6f180b0 100644 --- a/plugins/scenes/opengl/opengl.json +++ b/plugins/scenes/opengl/opengl.json @@ -7,12 +7,20 @@ "Description[nl]": "KWin-compositor-plug-in rendering via OpenGL", "Description[pl]": "Wtyczka kompozytora KWin wyświetlająca przez OpenGL", "Description[pt]": "'Plugin' de Composição do KWin com desenho via OpenGL", + "Description[sr@ijekavian]": "К‑винов прикључак слагача за рендеровање кроз опенГЛ", + "Description[sr@ijekavianlatin]": "KWinov priključak slagača za renderovanje kroz OpenGL", + "Description[sr@latin]": "KWinov priključak slagača za renderovanje kroz OpenGL", + "Description[sr]": "К‑винов прикључак слагача за рендеровање кроз опенГЛ", "Description[sv]": "Kwin sammansättningsinsticksprogram återger via OpenGL", "Description[uk]": "Додаток засобу композиції KWin для обробки з використанням OpenGL", "Description[x-test]": "xxKWin Compositor plugin rendering through OpenGLxx", "Id": "KWinSceneOpenGL", "Name": "SceneOpenGL", "Name[pl]": "OpenGL sceny", + "Name[sr@ijekavian]": "ОпенГЛ-сцена", + "Name[sr@ijekavianlatin]": "OpenGL-scena", + "Name[sr@latin]": "OpenGL-scena", + "Name[sr]": "ОпенГЛ-сцена", "Name[sv]": "Scen OpenGL", "Name[x-test]": "xxSceneOpenGLxx" }