From 8f30e86ab5f6362fcf8393866f93a64a28afab34 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Thu, 19 Apr 2018 07:07:18 +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"
---
 app/org.kde.latte-dock.desktop.cmake                    | 3 +++
 applets/separator/metadata.desktop.cmake                | 2 ++
 applets/separator/package/metadata.desktop              | 2 ++
 containment/metadata.desktop.cmake                      | 1 +
 containment/package/metadata.desktop                    | 1 +
 shell/package/contents/controls/latte-separator.desktop | 1 +
 6 files changed, 10 insertions(+)

diff --git a/app/org.kde.latte-dock.desktop.cmake b/app/org.kde.latte-dock.desktop.cmake
index a9387a3de..7d80e4bfb 100644
--- a/app/org.kde.latte-dock.desktop.cmake
+++ b/app/org.kde.latte-dock.desktop.cmake
@@ -9,6 +9,7 @@ Name[el]=Latte
 Name[en_GB]=Latte
 Name[es]=Latte
 Name[fi]=Latte
+Name[gl]=Latte
 Name[it]=Latte
 Name[nl]=Latte
 Name[pl]=Latte
@@ -27,6 +28,7 @@ Comment[el]=Πίνακες για όλον τον κόσμο
 Comment[en_GB]=Dock for the masses
 Comment[es]=Un dock para las masas
 Comment[fi]=Telakka massoille
+Comment[gl]=Doca para as masas.
 Comment[it]=Area di aggancio per le masse
 Comment[nl]=Dock voor de massa
 Comment[pl]=Dok dla mas
@@ -46,6 +48,7 @@ GenericName[el]=Πίνακας
 GenericName[en_GB]=Dock
 GenericName[es]=Dock
 GenericName[fi]=Telakka
+GenericName[gl]=Doca
 GenericName[it]=Aggancio
 GenericName[nl]=Dock
 GenericName[pl]=Dok
diff --git a/applets/separator/metadata.desktop.cmake b/applets/separator/metadata.desktop.cmake
index 85fe57474..4ee43c6de 100644
--- a/applets/separator/metadata.desktop.cmake
+++ b/applets/separator/metadata.desktop.cmake
@@ -10,6 +10,7 @@ Name[en_GB]=Separator
 Name[es]=Separador
 Name[fi]=Erotin
 Name[fr]=Séparateur
+Name[gl]=Separador
 Name[it]=Separatore
 Name[nl]=Scheidingshulpmiddel
 Name[pl]=Oddzielacz
@@ -30,6 +31,7 @@ Comment[el]=Για όλες τις εργασίες διαχωρισμού σα
 Comment[en_GB]=For all your separation tasks
 Comment[es]=Para todas sus tareas de separación
 Comment[fi]=Kaikkiin erotustehtäviisi
+Comment[gl]=Para todas as súas tarefas de separación.
 Comment[it]=Per tutti i tuoi processi di separazione
 Comment[nl]=Voor al uw scheidingstaken
 Comment[pl]=Dla wszystkich twoich oddzielonych zadań
diff --git a/applets/separator/package/metadata.desktop b/applets/separator/package/metadata.desktop
index 85fe57474..4ee43c6de 100644
--- a/applets/separator/package/metadata.desktop
+++ b/applets/separator/package/metadata.desktop
@@ -10,6 +10,7 @@ Name[en_GB]=Separator
 Name[es]=Separador
 Name[fi]=Erotin
 Name[fr]=Séparateur
+Name[gl]=Separador
 Name[it]=Separatore
 Name[nl]=Scheidingshulpmiddel
 Name[pl]=Oddzielacz
@@ -30,6 +31,7 @@ Comment[el]=Για όλες τις εργασίες διαχωρισμού σα
 Comment[en_GB]=For all your separation tasks
 Comment[es]=Para todas sus tareas de separación
 Comment[fi]=Kaikkiin erotustehtäviisi
+Comment[gl]=Para todas as súas tarefas de separación.
 Comment[it]=Per tutti i tuoi processi di separazione
 Comment[nl]=Voor al uw scheidingstaken
 Comment[pl]=Dla wszystkich twoich oddzielonych zadań
diff --git a/containment/metadata.desktop.cmake b/containment/metadata.desktop.cmake
index e4ec76835..efa2566a5 100644
--- a/containment/metadata.desktop.cmake
+++ b/containment/metadata.desktop.cmake
@@ -10,6 +10,7 @@ Name[el]=Latte
 Name[en_GB]=Latte
 Name[es]=Latte
 Name[fi]=Latte
+Name[gl]=Latte
 Name[it]=Latte
 Name[nl]=Latte
 Name[pl]=Latte
diff --git a/containment/package/metadata.desktop b/containment/package/metadata.desktop
index 392edd08f..76d9ba94b 100644
--- a/containment/package/metadata.desktop
+++ b/containment/package/metadata.desktop
@@ -10,6 +10,7 @@ Name[el]=Latte
 Name[en_GB]=Latte
 Name[es]=Latte
 Name[fi]=Latte
+Name[gl]=Latte
 Name[it]=Latte
 Name[nl]=Latte
 Name[pl]=Latte
diff --git a/shell/package/contents/controls/latte-separator.desktop b/shell/package/contents/controls/latte-separator.desktop
index 667d86068..b2e198b95 100644
--- a/shell/package/contents/controls/latte-separator.desktop
+++ b/shell/package/contents/controls/latte-separator.desktop
@@ -43,6 +43,7 @@ GenericName[el]=Πίνακας
 GenericName[en_GB]=Dock
 GenericName[es]=Dock
 GenericName[fi]=Telakka
+GenericName[gl]=Doca
 GenericName[it]=Aggancio
 GenericName[nl]=Dock
 GenericName[pl]=Dok