From 35bea8a87e9b45677ca4eeffc5ddd28f25c15c2a Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Fri, 27 Oct 2017 04:49:52 +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 531019c9ec..fe897f4810 100644 --- a/plugins/scenes/opengl/opengl.json +++ b/plugins/scenes/opengl/opengl.json @@ -9,6 +9,7 @@ "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[pt_BR]": "Plugin do compositor KWin renderizando pelo 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",