From e0ea9fd04c9169ca550222acf4fcfd6964bbfad4 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Wed, 12 Feb 2020 06:06:11 +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"
---
 linux/applications/org.kde.falkon.desktop               | 2 ++
 src/lib/adblock/metadata.desktop                        | 1 +
 src/lib/data/breeze-fallback/index.theme                | 1 +
 src/scripts/helloqml/metadata.desktop                   | 2 ++
 src/scripts/middleclickloader/metadata.desktop          | 2 ++
 src/scripts/runaction/actions/dictionary.desktop        | 1 +
 src/scripts/runaction/actions/googleimagesearch.desktop | 1 +
 themes/linux/metadata.desktop                           | 1 +
 themes/windows/metadata.desktop                         | 1 +
 9 files changed, 12 insertions(+)

diff --git a/linux/applications/org.kde.falkon.desktop b/linux/applications/org.kde.falkon.desktop
index 6677f7252..60922157f 100644
--- a/linux/applications/org.kde.falkon.desktop
+++ b/linux/applications/org.kde.falkon.desktop
@@ -12,6 +12,7 @@ Name[et]=Falkon
 Name[fi]=Falkon
 Name[fr]=Falkon
 Name[gl]=Falkon
+Name[ia]=Falkon:
 Name[id]=Falkon
 Name[it]=Falkon
 Name[ko]=Falkon
@@ -72,6 +73,7 @@ GenericName[et]=Veebilehitseja
 GenericName[fi]=Verkkoselain
 GenericName[fr]=Navigateur Web
 GenericName[gl]=Navegador web
+GenericName[ia]=Navigator Web
 GenericName[id]=Penelusur Web
 GenericName[it]=Browser web
 GenericName[ko]=웹 브라우저
diff --git a/src/lib/adblock/metadata.desktop b/src/lib/adblock/metadata.desktop
index ab8561197..f5906efe4 100644
--- a/src/lib/adblock/metadata.desktop
+++ b/src/lib/adblock/metadata.desktop
@@ -11,6 +11,7 @@ Name[et]=AdBlock
 Name[fi]=Mainosesto
 Name[fr]=AdBlock
 Name[gl]=Bloqueador de publicidade
+Name[ia]=Adblock (bloco de reclamos)
 Name[id]=AdBlock
 Name[it]=Adblock
 Name[ko]=AdBlock
diff --git a/src/lib/data/breeze-fallback/index.theme b/src/lib/data/breeze-fallback/index.theme
index c267dcd43..ca1ff29f7 100644
--- a/src/lib/data/breeze-fallback/index.theme
+++ b/src/lib/data/breeze-fallback/index.theme
@@ -12,6 +12,7 @@ Name[et]=Breeze
 Name[fi]=Breeze
 Name[fr]=Breeze
 Name[gl]=Breeze
+Name[ia]=Brisa
 Name[id]=Breeze
 Name[it]=Brezza
 Name[ko]=Breeze
diff --git a/src/scripts/helloqml/metadata.desktop b/src/scripts/helloqml/metadata.desktop
index 318e4b7f0..6f836d225 100644
--- a/src/scripts/helloqml/metadata.desktop
+++ b/src/scripts/helloqml/metadata.desktop
@@ -3,6 +3,7 @@ Name=Hello Qml
 Name[ca]=Hola Qml
 Name[ca@valencia]=Hola Qml
 Name[cs]=Ahoj QML
+Name[da]=Hello Qml
 Name[de]=Hallo QML
 Name[en_GB]=Hello QML
 Name[es]=Hola Qml
@@ -29,6 +30,7 @@ Comment=Sample Qml Plugin
 Comment[ca]=Connector Qml d'exemple
 Comment[ca@valencia]=Connector Qml d'exemple
 Comment[cs]=Ukázkový modul QML
+Comment[da]=Eksempel på Qml-plugin
 Comment[de]=Beispielmodul in Qml
 Comment[en_GB]=Sample QML Plugin
 Comment[es]=Complemento de ejemplo de Qml
diff --git a/src/scripts/middleclickloader/metadata.desktop b/src/scripts/middleclickloader/metadata.desktop
index 1301dcd04..45d4ff485 100644
--- a/src/scripts/middleclickloader/metadata.desktop
+++ b/src/scripts/middleclickloader/metadata.desktop
@@ -3,6 +3,7 @@ Name=MiddleClickLoader
 Name[ca]=MiddleClickLoader
 Name[ca@valencia]=MiddleClickLoader
 Name[cs]=Načtení prostředním tlačítkem myši
+Name[da]=MidterKlikIndlæsning
 Name[de]=Mittelklick-Lader
 Name[en_GB]=MiddleClickLoader
 Name[es]=Cargador de clic central
@@ -29,6 +30,7 @@ Comment=Load text in selection clipboard as URL
 Comment[ca]=Carrega text com a URL en una selecció del porta-retalls
 Comment[ca@valencia]=Carrega text com a URL en una selecció del porta-retalls
 Comment[cs]=Načíst text ve schránce výběru jako URL
+Comment[da]=Indlæs tekst i markeringsudklipsholder som URL
 Comment[de]=Text in der Auswahl der Zwischenablage als URL laden
 Comment[en_GB]=Load text in selection clipboard as URL
 Comment[es]=Cargar texto seleccionado en el portapapeles como URL
diff --git a/src/scripts/runaction/actions/dictionary.desktop b/src/scripts/runaction/actions/dictionary.desktop
index 325461675..519fa82da 100644
--- a/src/scripts/runaction/actions/dictionary.desktop
+++ b/src/scripts/runaction/actions/dictionary.desktop
@@ -11,6 +11,7 @@ Name[et]=Sõnaraamat
 Name[fi]=Sanasto
 Name[fr]=Dictionnaire
 Name[gl]=Dicionario
+Name[ia]=Dictionario
 Name[id]=Kamus
 Name[it]=Dizionario
 Name[ko]=사전
diff --git a/src/scripts/runaction/actions/googleimagesearch.desktop b/src/scripts/runaction/actions/googleimagesearch.desktop
index 4c104a24e..7e3e4fa7f 100644
--- a/src/scripts/runaction/actions/googleimagesearch.desktop
+++ b/src/scripts/runaction/actions/googleimagesearch.desktop
@@ -11,6 +11,7 @@ Name[et]=Google
 Name[fi]=Google
 Name[fr]=Google
 Name[gl]=Google
+Name[ia]=Google
 Name[id]=Google
 Name[it]=Google
 Name[ko]=Google
diff --git a/themes/linux/metadata.desktop b/themes/linux/metadata.desktop
index 4c5948ca0..d94e8b849 100644
--- a/themes/linux/metadata.desktop
+++ b/themes/linux/metadata.desktop
@@ -11,6 +11,7 @@ Name[et]=Linux
 Name[fi]=Linux
 Name[fr]=Linux
 Name[gl]=Linux
+Name[ia]=Linux
 Name[id]=Linux
 Name[it]=Linux
 Name[ko]=리눅스
diff --git a/themes/windows/metadata.desktop b/themes/windows/metadata.desktop
index b5a86ab3a..93656f9e3 100644
--- a/themes/windows/metadata.desktop
+++ b/themes/windows/metadata.desktop
@@ -11,6 +11,7 @@ Name[et]=Windows
 Name[fi]=Windows
 Name[fr]=Windows
 Name[gl]=Xanelas
+Name[ia]=Fenestras
 Name[id]=Windows
 Name[it]=Windows
 Name[ko]=Windows