From 5043a7675de56f7d3a06e516acb26a6aacfbd429 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Mon, 23 Apr 2018 07:16:55 +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"
---
 linux/applications/org.kde.falkon.desktop | 1 +
 src/lib/data/breeze-fallback/index.theme  | 1 +
 src/plugins/PIM/metadata.desktop          | 1 +
 themes/linux/metadata.desktop             | 1 +
 themes/windows/metadata.desktop           | 1 +
 5 files changed, 5 insertions(+)

diff --git a/linux/applications/org.kde.falkon.desktop b/linux/applications/org.kde.falkon.desktop
index ce16a1fb4..f51c48ba5 100644
--- a/linux/applications/org.kde.falkon.desktop
+++ b/linux/applications/org.kde.falkon.desktop
@@ -11,6 +11,7 @@ Name[en_GB]=Falkon
 Name[es]=Falkon
 Name[fi]=Falkon
 Name[fr]=Falkon
+Name[gl]=Falkon
 Name[id]=Falkon
 Name[it]=Falkon
 Name[nl]=Falkon
diff --git a/src/lib/data/breeze-fallback/index.theme b/src/lib/data/breeze-fallback/index.theme
index 0fded5748..a2a5e311c 100644
--- a/src/lib/data/breeze-fallback/index.theme
+++ b/src/lib/data/breeze-fallback/index.theme
@@ -11,6 +11,7 @@ Name[en_GB]=Breeze
 Name[es]=Brisa
 Name[fi]=Breeze
 Name[fr]=Breeze
+Name[gl]=Breeze
 Name[id]=Breeze
 Name[it]=Brezza
 Name[nl]=Breeze
diff --git a/src/plugins/PIM/metadata.desktop b/src/plugins/PIM/metadata.desktop
index 969e97f9a..96936aa3b 100644
--- a/src/plugins/PIM/metadata.desktop
+++ b/src/plugins/PIM/metadata.desktop
@@ -9,6 +9,7 @@ Name[en_GB]=PIM
 Name[es]=PIM
 Name[fi]=Henkilökohtainen ajanhallinta
 Name[fr]=PIM
+Name[gl]=PIM
 Name[id]=PIM
 Name[it]=PIM
 Name[nl]=PIM
diff --git a/themes/linux/metadata.desktop b/themes/linux/metadata.desktop
index b4ceb5fe1..3f38420f1 100644
--- a/themes/linux/metadata.desktop
+++ b/themes/linux/metadata.desktop
@@ -8,6 +8,7 @@ Name[de]=Linux
 Name[en_GB]=Linux
 Name[es]=Linux
 Name[fi]=Linux
+Name[gl]=Linux
 Name[id]=Linux
 Name[it]=Linux
 Name[nl]=Linux
diff --git a/themes/windows/metadata.desktop b/themes/windows/metadata.desktop
index 3d7f3fc74..e61e4609d 100644
--- a/themes/windows/metadata.desktop
+++ b/themes/windows/metadata.desktop
@@ -8,6 +8,7 @@ Name[de]=Windows
 Name[en_GB]=Windows
 Name[es]=Windows
 Name[fi]=Windows
+Name[gl]=Xanelas
 Name[id]=Windows
 Name[it]=Windows
 Name[nl]=Windows