From 43831d918101174c6dd6a83f7eeecb489a58155b Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Fri, 5 Jan 2018 05:03:29 +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"
---
 applets/quicksettings/package/metadata.desktop | 2 ++
 plasma-mobile.desktop.cmake                    | 2 ++
 touchscreentest/org.kde.touchtest.desktop      | 2 ++
 3 files changed, 6 insertions(+)

diff --git a/applets/quicksettings/package/metadata.desktop b/applets/quicksettings/package/metadata.desktop
index 3d49ba7d..8de106d0 100644
--- a/applets/quicksettings/package/metadata.desktop
+++ b/applets/quicksettings/package/metadata.desktop
@@ -8,6 +8,7 @@ Name[cs]=Rychlé nastavení
 Name[de]=Schnelleinstellungen
 Name[en_GB]=Quick Settings
 Name[es]=Ajustes rápidos
+Name[gl]=Configuración rápida
 Name[nl]=Snelle instellingen
 Name[nn]=Snøgginnstillingar
 Name[pl]=Szybkie ustawienia
@@ -24,6 +25,7 @@ Comment[ca]=Un plafó per accedir ràpidament a les opcions més importants
 Comment[ca@valencia]=Un plafó per accedir ràpidament a les opcions més importants
 Comment[en_GB]=A panel to quickly access most important settings
 Comment[es]=Un panel para acceder rápidamente a los ajustes más importantes
+Comment[gl]=Un panel para acceder rapidamente á configuración máis importante.
 Comment[nl]=Een paneel voor snelle toegang tot de meest belangrijke instellingen
 Comment[nn]=Panel for rask tilgang til dei viktigaste innstillingane
 Comment[pl]=Panel szybkiego dostępu do najważniejszych ustawień
diff --git a/plasma-mobile.desktop.cmake b/plasma-mobile.desktop.cmake
index 22c97879..1a8109e2 100644
--- a/plasma-mobile.desktop.cmake
+++ b/plasma-mobile.desktop.cmake
@@ -8,6 +8,7 @@ Name[ca]=Plasma Mòbil
 Name[ca@valencia]=Plasma Mòbil
 Name[en_GB]=Plasma Mobile
 Name[es]=Plasma Mobile
+Name[gl]=Plasma Mobile
 Name[nl]=Plasma-mobiel
 Name[pl]=Plazma Mobile
 Name[pt]=Plasma Mobile
@@ -19,6 +20,7 @@ Comment[ca]=Plasma Mòbil, creat per la comunitat KDE
 Comment[ca@valencia]=Plasma Mòbil, creat per la comunitat KDE
 Comment[en_GB]=Plasma Mobile by KDE
 Comment[es]=Plasma Mobile creado por KDE
+Comment[gl]=Plasma Mobile de KDE
 Comment[nl]=Plasma-mobiel door KDE
 Comment[pl]=Plazma Mobile stworzona przez KDE
 Comment[pt]=Plasma Mobile do KDE
diff --git a/touchscreentest/org.kde.touchtest.desktop b/touchscreentest/org.kde.touchtest.desktop
index 9dcf9ecd..7fafffcb 100755
--- a/touchscreentest/org.kde.touchtest.desktop
+++ b/touchscreentest/org.kde.touchtest.desktop
@@ -5,6 +5,7 @@ Name[ca@valencia]=Prova el tàctil
 Name[cs]=Test doteku
 Name[en_GB]=Touch Test
 Name[es]=Prueba táctil
+Name[gl]=Proba táctil
 Name[nl]=Aanraaktest
 Name[pl]=Próba dotyku
 Name[pt]=Teste de Toque
@@ -25,6 +26,7 @@ GenericName[de]=Terminal
 GenericName[en_GB]=Terminal
 GenericName[es]=Terminal
 GenericName[fr]=Terminal
+GenericName[gl]=Terminal
 GenericName[nl]=Terminal
 GenericName[pl]=Terminal
 GenericName[pt]=Terminal