From 9eec52ec6ceaad2f640e3303246cc0e1b81e402d Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Sat, 9 Mar 2024 02:56:27 +0000
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/helloqml/metadata.desktop                   | 4 ++--
 src/scripts/runaction/actions/googleimagesearch.desktop | 2 +-
 src/scripts/runaction/actions/mpv.desktop               | 2 +-
 src/scripts/runaction/actions/tineyeimagesearch.desktop | 2 +-
 src/scripts/runaction/actions/translate.desktop         | 2 +-
 src/scripts/runaction/actions/w3.desktop                | 2 +-
 src/scripts/runaction/actions/yandeximagesearch.desktop | 2 +-
 7 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/scripts/helloqml/metadata.desktop b/src/scripts/helloqml/metadata.desktop
index a137009ca..42e44fd5a 100644
--- a/src/scripts/helloqml/metadata.desktop
+++ b/src/scripts/helloqml/metadata.desktop
@@ -34,7 +34,7 @@ Name[ru]=Hello Qml
 Name[sk]=Hello Qml
 Name[sl]=Hello Qml
 Name[sv]=Hallå QML
-Name[tr]=Merhaba Qml
+Name[tr]=Merhaba QML
 Name[uk]=Привіт, Qml
 Name[x-test]=xxHello Qmlxx
 Name[zh_CN]=Hello Qml
@@ -74,7 +74,7 @@ Comment[ru]=Пример подключаемого модуля QML
 Comment[sk]=Ukážkový QML plugin
 Comment[sl]=Primer vtičnika za Qml
 Comment[sv]=QML-exempelinsticksprogram
-Comment[tr]=Örnek Qml eklentisi
+Comment[tr]=Örnek QML eklentisi
 Comment[uk]=Зразок додатка Qml
 Comment[x-test]=xxSample Qml Pluginxx
 Comment[zh_CN]=示例 Qml 插件
diff --git a/src/scripts/runaction/actions/googleimagesearch.desktop b/src/scripts/runaction/actions/googleimagesearch.desktop
index bfcebf0c7..1ccd34244 100644
--- a/src/scripts/runaction/actions/googleimagesearch.desktop
+++ b/src/scripts/runaction/actions/googleimagesearch.desktop
@@ -74,7 +74,7 @@ Comment[ru]=Искать с помощью...
 Comment[sk]=Hľadať s...
 Comment[sl]=Išči z...
 Comment[sv]=Sök med...
-Comment[tr]=Şununla ara...
+Comment[tr]=Şununla Ara…
 Comment[uk]=Шукати за допомогою…
 Comment[x-test]=xxSearch with...xx
 Comment[zh_CN]=选择搜索引擎搜索...
diff --git a/src/scripts/runaction/actions/mpv.desktop b/src/scripts/runaction/actions/mpv.desktop
index ff001c235..6951fa385 100644
--- a/src/scripts/runaction/actions/mpv.desktop
+++ b/src/scripts/runaction/actions/mpv.desktop
@@ -34,7 +34,7 @@ Name[ru]=Открыть с помощью MPV
 Name[sk]=Otvoriť s mpv
 Name[sl]=Odppri z mpv
 Name[sv]=Öppna med mpv
-Name[tr]=mpv ile aç
+Name[tr]=mpv ile Aç
 Name[uk]=Відкрити за допомогою mpv
 Name[x-test]=xxOpen with mpvxx
 Name[zh_CN]=用 mpv 打开
diff --git a/src/scripts/runaction/actions/tineyeimagesearch.desktop b/src/scripts/runaction/actions/tineyeimagesearch.desktop
index b8388b516..2823604ee 100644
--- a/src/scripts/runaction/actions/tineyeimagesearch.desktop
+++ b/src/scripts/runaction/actions/tineyeimagesearch.desktop
@@ -74,7 +74,7 @@ Comment[ru]=Искать с помощью...
 Comment[sk]=Hľadať s...
 Comment[sl]=Išči z...
 Comment[sv]=Sök med...
-Comment[tr]=Şununla ara...
+Comment[tr]=Şununla Ara…
 Comment[uk]=Шукати за допомогою…
 Comment[x-test]=xxSearch with...xx
 Comment[zh_CN]=选择搜索引擎搜索...
diff --git a/src/scripts/runaction/actions/translate.desktop b/src/scripts/runaction/actions/translate.desktop
index 6b69165b6..65a8d89a7 100644
--- a/src/scripts/runaction/actions/translate.desktop
+++ b/src/scripts/runaction/actions/translate.desktop
@@ -34,7 +34,7 @@ Name[ru]=Перевести страницу
 Name[sk]=Preložiť stránku
 Name[sl]=Prevedi stran
 Name[sv]=Översätt sida
-Name[tr]=Sayfayı çevir
+Name[tr]=Sayfayı Çevir
 Name[uk]=Перекласти сторінку
 Name[x-test]=xxTranslate pagexx
 Name[zh_CN]=翻译页面
diff --git a/src/scripts/runaction/actions/w3.desktop b/src/scripts/runaction/actions/w3.desktop
index 22a7ce562..15b57f175 100644
--- a/src/scripts/runaction/actions/w3.desktop
+++ b/src/scripts/runaction/actions/w3.desktop
@@ -34,7 +34,7 @@ Name[ru]=Проверить страницу
 Name[sk]=Ohodnotiť stránku
 Name[sl]=Potrdi stran
 Name[sv]=Validera sida
-Name[tr]=Sayfayı doğrula
+Name[tr]=Sayfayı Doğrula
 Name[uk]=Перевірити достовірність сторінки
 Name[x-test]=xxValidate pagexx
 Name[zh_CN]=校验页面
diff --git a/src/scripts/runaction/actions/yandeximagesearch.desktop b/src/scripts/runaction/actions/yandeximagesearch.desktop
index ee6b8ca32..b91967501 100644
--- a/src/scripts/runaction/actions/yandeximagesearch.desktop
+++ b/src/scripts/runaction/actions/yandeximagesearch.desktop
@@ -74,7 +74,7 @@ Comment[ru]=Искать с помощью...
 Comment[sk]=Hľadať s...
 Comment[sl]=Išči z...
 Comment[sv]=Sök med...
-Comment[tr]=Şununla ara...
+Comment[tr]=Şununla Ara…
 Comment[uk]=Шукати за допомогою…
 Comment[x-test]=xxSearch with...xx
 Comment[zh_CN]=选择搜索引擎搜索...