From 6574253a65482379e5ebbec003175dafef96f8b9 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Fri, 19 Jan 2018 05:11:45 +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 + scripts/minimizeall/metadata.desktop | 1 + 4 files changed, 4 insertions(+) diff --git a/plugins/scenes/opengl/opengl.json b/plugins/scenes/opengl/opengl.json index dda50e214c..d0bb2131e5 100644 --- a/plugins/scenes/opengl/opengl.json +++ b/plugins/scenes/opengl/opengl.json @@ -8,6 +8,7 @@ "Description[es]": "Complemento compositor de KWin renderizando mediante OpenGL", "Description[fi]": "OpenGL:llä hahmontava KWin-koostajaliitännäinen", "Description[fr]": "Module du compositeur KWin effectuant le rendu avec OpenGL", + "Description[gl]": "Complemento de compositor de KWin que renderiza a través de OpenGL.", "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", diff --git a/plugins/scenes/qpainter/qpainter.json b/plugins/scenes/qpainter/qpainter.json index cb7f369002..d2c1179efa 100644 --- a/plugins/scenes/qpainter/qpainter.json +++ b/plugins/scenes/qpainter/qpainter.json @@ -10,6 +10,7 @@ "Description[es]": "Complemento compositor de KWin renderizando mediante QPainter", "Description[fi]": "QPainterillä hahmontava KWin-koostajaliitännäinen", "Description[fr]": "Module du compositeur KWin effectuant le rendu avec QPainter", + "Description[gl]": "Complemento de compositor de KWin que renderiza a través de QPainter.", "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", diff --git a/plugins/scenes/xrender/xrender.json b/plugins/scenes/xrender/xrender.json index 21cef3fc7a..1d603655bd 100644 --- a/plugins/scenes/xrender/xrender.json +++ b/plugins/scenes/xrender/xrender.json @@ -10,6 +10,7 @@ "Description[es]": "Complemento compositor de KWin renderizando mediante XRender", "Description[fi]": "XRenderillä hahmontava KWin-koostajaliitännäinen", "Description[fr]": "Module du compositeur KWin effectuant le rendu avec XRender", + "Description[gl]": "Complemento de compositor de KWin que renderiza a través de XRender.", "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", diff --git a/scripts/minimizeall/metadata.desktop b/scripts/minimizeall/metadata.desktop index e351379e95..edaa3ce54a 100644 --- a/scripts/minimizeall/metadata.desktop +++ b/scripts/minimizeall/metadata.desktop @@ -45,6 +45,7 @@ Comment[ca@valencia]=Afig una drecera per a minimitzar i restaurar totes les fin Comment[de]=Fügt einen Kurzbefehl hinzu, um alle Fenster zu minimieren oder wieder anzuzeigen Comment[en_GB]=Adds a shortcut to minimise and restore all windows Comment[es]=Añade un acceso rápido para minimizar y restaurar todas la ventanas +Comment[gl]=Engade un atallo para minimizar e restaurar todas as xanelas. Comment[it]=Aggiunge una scorciatoia per minimizzare e ripristinare tutte le finestre Comment[nl]=Voegt een sneltoets toe om alle vensters te minimaliseren en te herstellen Comment[pl]=Dodaje skrót do zminimalizowania i przywracania wszystkich okien