From ee026bd40eefed8c811d3279bc8b75520daf2133 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Thu, 15 Mar 2018 05:21:21 +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"
---
 src/scripts/runaction/actions/dictionary.desktop        | 1 +
 src/scripts/runaction/actions/googleimagesearch.desktop | 2 ++
 src/scripts/runaction/actions/mpv.desktop               | 1 +
 src/scripts/runaction/actions/tineyeimagesearch.desktop | 2 ++
 src/scripts/runaction/actions/translate.desktop         | 1 +
 src/scripts/runaction/actions/w3.desktop                | 1 +
 src/scripts/runaction/actions/yandeximagesearch.desktop | 2 ++
 src/scripts/runaction/metadata.desktop                  | 2 ++
 8 files changed, 12 insertions(+)

diff --git a/src/scripts/runaction/actions/dictionary.desktop b/src/scripts/runaction/actions/dictionary.desktop
index 5e1868c05..8197abede 100644
--- a/src/scripts/runaction/actions/dictionary.desktop
+++ b/src/scripts/runaction/actions/dictionary.desktop
@@ -1,5 +1,6 @@
 [Desktop Entry]
 Name=Dictionary
+Name[ca]=Diccionari
 Name[en_GB]=Dictionary
 Name[fr]=Dictionnaire
 Name[nl]=Woordenboek
diff --git a/src/scripts/runaction/actions/googleimagesearch.desktop b/src/scripts/runaction/actions/googleimagesearch.desktop
index 285d9cd0f..a30c75fde 100644
--- a/src/scripts/runaction/actions/googleimagesearch.desktop
+++ b/src/scripts/runaction/actions/googleimagesearch.desktop
@@ -1,5 +1,6 @@
 [Desktop Entry]
 Name=Google
+Name[ca]=Google
 Name[en_GB]=Google
 Name[fr]=Google
 Name[nl]=Google
@@ -9,6 +10,7 @@ Name[uk]=Google
 Name[x-test]=xxGooglexx
 Name[zh_CN]=Google
 Comment=Search with...
+Comment[ca]=Cerca amb...
 Comment[en_GB]=Search with...
 Comment[nl]=Zoeken met...
 Comment[pt]=Procurar com...
diff --git a/src/scripts/runaction/actions/mpv.desktop b/src/scripts/runaction/actions/mpv.desktop
index 91e2a74c3..05c05d896 100644
--- a/src/scripts/runaction/actions/mpv.desktop
+++ b/src/scripts/runaction/actions/mpv.desktop
@@ -1,5 +1,6 @@
 [Desktop Entry]
 Name=Open with mpv
+Name[ca]=Obre amb el «mpv»
 Name[en_GB]=Open with mpv
 Name[nl]=Met mpv openen
 Name[pt]=Abrir com o 'mpv'
diff --git a/src/scripts/runaction/actions/tineyeimagesearch.desktop b/src/scripts/runaction/actions/tineyeimagesearch.desktop
index d20cc1faf..28e8631c4 100644
--- a/src/scripts/runaction/actions/tineyeimagesearch.desktop
+++ b/src/scripts/runaction/actions/tineyeimagesearch.desktop
@@ -1,5 +1,6 @@
 [Desktop Entry]
 Name=TinEye
+Name[ca]=TinEye
 Name[en_GB]=TinEye
 Name[nl]=TinEye
 Name[pt]=TinEye
@@ -7,6 +8,7 @@ Name[sv]=TinEye
 Name[uk]=TinEye
 Name[x-test]=xxTinEyexx
 Comment=Search with...
+Comment[ca]=Cerca amb...
 Comment[en_GB]=Search with...
 Comment[nl]=Zoeken met...
 Comment[pt]=Procurar com...
diff --git a/src/scripts/runaction/actions/translate.desktop b/src/scripts/runaction/actions/translate.desktop
index 3b72af16d..e9c0bc1fe 100644
--- a/src/scripts/runaction/actions/translate.desktop
+++ b/src/scripts/runaction/actions/translate.desktop
@@ -1,5 +1,6 @@
 [Desktop Entry]
 Name=Translate page
+Name[ca]=Tradueix la pàgina
 Name[en_GB]=Translate page
 Name[nl]=Pagina vertalen
 Name[pt]=Traduzir a página
diff --git a/src/scripts/runaction/actions/w3.desktop b/src/scripts/runaction/actions/w3.desktop
index f5fb6f391..afac2b201 100644
--- a/src/scripts/runaction/actions/w3.desktop
+++ b/src/scripts/runaction/actions/w3.desktop
@@ -1,5 +1,6 @@
 [Desktop Entry]
 Name=Validate page
+Name[ca]=Valida la pàgina
 Name[en_GB]=Validate page
 Name[nl]=Pagina valideren
 Name[pt]=Validar a página
diff --git a/src/scripts/runaction/actions/yandeximagesearch.desktop b/src/scripts/runaction/actions/yandeximagesearch.desktop
index efe3756a7..b03c55a37 100644
--- a/src/scripts/runaction/actions/yandeximagesearch.desktop
+++ b/src/scripts/runaction/actions/yandeximagesearch.desktop
@@ -1,5 +1,6 @@
 [Desktop Entry]
 Name=Yandex
+Name[ca]=Yandex
 Name[en_GB]=Yandex
 Name[nl]=Yandex
 Name[pt]=Yandex
@@ -7,6 +8,7 @@ Name[sv]=Yandex
 Name[uk]=Яндекс
 Name[x-test]=xxYandexxx
 Comment=Search with...
+Comment[ca]=Cerca amb...
 Comment[en_GB]=Search with...
 Comment[nl]=Zoeken met...
 Comment[pt]=Procurar com...
diff --git a/src/scripts/runaction/metadata.desktop b/src/scripts/runaction/metadata.desktop
index 71d64e5f6..32216da34 100644
--- a/src/scripts/runaction/metadata.desktop
+++ b/src/scripts/runaction/metadata.desktop
@@ -1,5 +1,6 @@
 [Desktop Entry]
 Name=Run Action
+Name[ca]=Executa una acció
 Name[en_GB]=Run Action
 Name[nl]=Uitvoeractie
 Name[pt]=Executar uma Acção
@@ -7,6 +8,7 @@ Name[sv]=Utför åtgärd
 Name[uk]=Виконати дію
 Name[x-test]=xxRun Actionxx
 Comment=Run various actions on sites
+Comment[ca]=Executa diverses accions als llocs
 Comment[en_GB]=Run various actions on sites
 Comment[nl]=Verschillende acties op sites uitvoeren
 Comment[pt]=Executar várias acções sobre as páginas