From 53969e4828d71669a4d9bfaf300389960e8c7aa0 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 28 Jan 2018 05:10:57 +0100 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 + plugins/scenes/qpainter/qpainter.json | 1 + plugins/scenes/xrender/xrender.json | 1 + 3 files changed, 3 insertions(+) diff --git a/plugins/scenes/opengl/opengl.json b/plugins/scenes/opengl/opengl.json index d0bb2131e5..b56fc07268 100644 --- a/plugins/scenes/opengl/opengl.json +++ b/plugins/scenes/opengl/opengl.json @@ -12,6 +12,7 @@ "Description[it]": "Estensione del compositore di KWin per la resa tramite OpenGL", "Description[ko]": "OpenGL로 렌더링하는 KWin 컴포지터 플러그인", "Description[nl]": "KWin-compositor-plug-in rendering via OpenGL", + "Description[nn]": "KWin-samansetjartillegg som brukar OpenGL", "Description[pl]": "Wtyczka kompozytora KWin wyświetlająca przez OpenGL", "Description[pt]": "'Plugin' de Composição do KWin com desenho via OpenGL", "Description[pt_BR]": "Plugin do compositor KWin renderizando pelo OpenGL", diff --git a/plugins/scenes/qpainter/qpainter.json b/plugins/scenes/qpainter/qpainter.json index d2c1179efa..e53d4b9ab9 100644 --- a/plugins/scenes/qpainter/qpainter.json +++ b/plugins/scenes/qpainter/qpainter.json @@ -14,6 +14,7 @@ "Description[it]": "Estensione del compositore di KWin per la resa tramite QPainter", "Description[ko]": "QPainter로 렌더링하는 KWin 컴포지터 플러그인", "Description[nl]": "KWin-compositor-plug-in rendering via QPainter", + "Description[nn]": "KWin-samansetjartillegg som brukar QPainter", "Description[pl]": "Wtyczka kompozytora KWin wyświetlająca przez QPainter", "Description[pt]": "'Plugin' de Composição do KWin com desenho via QPainter", "Description[pt_BR]": "Plugin do compositor KWin renderizando pelo QPainter", diff --git a/plugins/scenes/xrender/xrender.json b/plugins/scenes/xrender/xrender.json index 1d603655bd..baaa48f5a6 100644 --- a/plugins/scenes/xrender/xrender.json +++ b/plugins/scenes/xrender/xrender.json @@ -14,6 +14,7 @@ "Description[it]": "Estensione del compositore di KWin per la resa tramite XRender", "Description[ko]": "XRender로 렌더링하는 KWin 컴포지터 플러그인", "Description[nl]": "KWin-compositor-plug-in rendering via XRender", + "Description[nn]": "KWin-samansetjartillegg som brukar XRender", "Description[pl]": "Wtyczka kompozytora KWin wyświetlająca przez XRender", "Description[pt]": "'Plugin' de Composição do KWin com desenho via XRender", "Description[pt_BR]": "Plugin do compositor KWin renderizando pelo XRender",