From d04e0091a7c6b75c5498941047cbf062bdf1de38 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Mon, 5 Mar 2018 05:17:05 +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       |  5 +++++
 .../runaction/actions/googleimagesearch.desktop        | 10 ++++++++++
 src/scripts/runaction/actions/mpv.desktop              |  5 +++++
 .../runaction/actions/tineyeimagesearch.desktop        | 10 ++++++++++
 src/scripts/runaction/actions/translate.desktop        |  5 +++++
 src/scripts/runaction/actions/w3.desktop               |  5 +++++
 .../runaction/actions/yandeximagesearch.desktop        | 10 ++++++++++
 src/scripts/runaction/metadata.desktop                 | 10 ++++++++++
 8 files changed, 60 insertions(+)

diff --git a/src/scripts/runaction/actions/dictionary.desktop b/src/scripts/runaction/actions/dictionary.desktop
index 140b059f3..918a1b102 100644
--- a/src/scripts/runaction/actions/dictionary.desktop
+++ b/src/scripts/runaction/actions/dictionary.desktop
@@ -1,5 +1,10 @@
 [Desktop Entry]
 Name=Dictionary
+Name[en_GB]=Dictionary
+Name[pt]=Dicionário
+Name[sv]=Ordlista
+Name[uk]=Словник
+Name[x-test]=xxDictionaryxx
 
 Type=Service
 
diff --git a/src/scripts/runaction/actions/googleimagesearch.desktop b/src/scripts/runaction/actions/googleimagesearch.desktop
index 94f166fd3..7a54a0919 100644
--- a/src/scripts/runaction/actions/googleimagesearch.desktop
+++ b/src/scripts/runaction/actions/googleimagesearch.desktop
@@ -1,6 +1,16 @@
 [Desktop Entry]
 Name=Google
+Name[en_GB]=Google
+Name[pt]=Google
+Name[sv]=Google
+Name[uk]=Google
+Name[x-test]=xxGooglexx
 Comment=Search with...
+Comment[en_GB]=Search with...
+Comment[pt]=Procurar com...
+Comment[sv]=Sök med...
+Comment[uk]=Шукати за допомогою…
+Comment[x-test]=xxSearch with...xx
 
 Icon=google.png
 Type=Service
diff --git a/src/scripts/runaction/actions/mpv.desktop b/src/scripts/runaction/actions/mpv.desktop
index e6b715369..75cb28d48 100644
--- a/src/scripts/runaction/actions/mpv.desktop
+++ b/src/scripts/runaction/actions/mpv.desktop
@@ -1,5 +1,10 @@
 [Desktop Entry]
 Name=Open with mpv
+Name[en_GB]=Open with mpv
+Name[pt]=Abrir com o 'mpv'
+Name[sv]=Öppna med mpv
+Name[uk]=Відкрити за допомогою mpv
+Name[x-test]=xxOpen with mpvxx
 
 Icon=mpv
 TryExec=mpv
diff --git a/src/scripts/runaction/actions/tineyeimagesearch.desktop b/src/scripts/runaction/actions/tineyeimagesearch.desktop
index 10c1485a2..717d0dcf5 100644
--- a/src/scripts/runaction/actions/tineyeimagesearch.desktop
+++ b/src/scripts/runaction/actions/tineyeimagesearch.desktop
@@ -1,6 +1,16 @@
 [Desktop Entry]
 Name=TinEye
+Name[en_GB]=TinEye
+Name[pt]=TinEye
+Name[sv]=TinEye
+Name[uk]=TinEye
+Name[x-test]=xxTinEyexx
 Comment=Search with...
+Comment[en_GB]=Search with...
+Comment[pt]=Procurar com...
+Comment[sv]=Sök med...
+Comment[uk]=Шукати за допомогою…
+Comment[x-test]=xxSearch with...xx
 
 Icon=tineye.png
 Type=Service
diff --git a/src/scripts/runaction/actions/translate.desktop b/src/scripts/runaction/actions/translate.desktop
index c23a1a2e2..869f2086c 100644
--- a/src/scripts/runaction/actions/translate.desktop
+++ b/src/scripts/runaction/actions/translate.desktop
@@ -1,5 +1,10 @@
 [Desktop Entry]
 Name=Translate page
+Name[en_GB]=Translate page
+Name[pt]=Traduzir a página
+Name[sv]=Översätt sida
+Name[uk]=Перекласти сторінку
+Name[x-test]=xxTranslate pagexx
 
 Icon=translate.png
 Type=Service
diff --git a/src/scripts/runaction/actions/w3.desktop b/src/scripts/runaction/actions/w3.desktop
index 9855507e6..9040693b3 100644
--- a/src/scripts/runaction/actions/w3.desktop
+++ b/src/scripts/runaction/actions/w3.desktop
@@ -1,5 +1,10 @@
 [Desktop Entry]
 Name=Validate page
+Name[en_GB]=Validate page
+Name[pt]=Validar a página
+Name[sv]=Validera sida
+Name[uk]=Перевірити достовірність сторінки
+Name[x-test]=xxValidate pagexx
 
 Icon=w3.png
 Type=Service
diff --git a/src/scripts/runaction/actions/yandeximagesearch.desktop b/src/scripts/runaction/actions/yandeximagesearch.desktop
index 60113521b..d3a0be85c 100644
--- a/src/scripts/runaction/actions/yandeximagesearch.desktop
+++ b/src/scripts/runaction/actions/yandeximagesearch.desktop
@@ -1,6 +1,16 @@
 [Desktop Entry]
 Name=Yandex
+Name[en_GB]=Yandex
+Name[pt]=Yandex
+Name[sv]=Yandex
+Name[uk]=Яндекс
+Name[x-test]=xxYandexxx
 Comment=Search with...
+Comment[en_GB]=Search with...
+Comment[pt]=Procurar com...
+Comment[sv]=Sök med...
+Comment[uk]=Шукати за допомогою…
+Comment[x-test]=xxSearch with...xx
 
 Icon=yandex.png
 Type=Service
diff --git a/src/scripts/runaction/metadata.desktop b/src/scripts/runaction/metadata.desktop
index 0024f9a82..0d156b33d 100644
--- a/src/scripts/runaction/metadata.desktop
+++ b/src/scripts/runaction/metadata.desktop
@@ -1,6 +1,16 @@
 [Desktop Entry]
 Name=Run Action
+Name[en_GB]=Run Action
+Name[pt]=Executar uma Acção
+Name[sv]=Utför åtgärd
+Name[uk]=Виконати дію
+Name[x-test]=xxRun Actionxx
 Comment=Run various actions on sites
+Comment[en_GB]=Run various actions on sites
+Comment[pt]=Executar várias acções sobre as páginas
+Comment[sv]=Utför diverse åtgärder på webbplatser
+Comment[uk]=Виконання різноманітних дій на сайтах
+Comment[x-test]=xxRun various actions on sitesxx
 
 Icon=icon.svg
 Type=Service