From 95661276c5a74e280f053467ae64b6ebc0aec879 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 1 Apr 2019 08:54:43 +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" --- src/plugins/KDEFrameworksIntegration/metadata.desktop | 1 + src/scripts/helloqml/metadata.desktop | 2 ++ src/scripts/middleclickloader/metadata.desktop | 1 + 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 ++ 11 files changed, 16 insertions(+) diff --git a/src/plugins/KDEFrameworksIntegration/metadata.desktop b/src/plugins/KDEFrameworksIntegration/metadata.desktop index ab10d0918..21987691d 100644 --- a/src/plugins/KDEFrameworksIntegration/metadata.desktop +++ b/src/plugins/KDEFrameworksIntegration/metadata.desktop @@ -15,6 +15,7 @@ Name[sk]=KDE Frameworks Integrácia Name[sv]=Integration med KDE Ramverk Name[uk]=Інтерграція із KDE Frameworks Name[x-test]=xxKDE Frameworks Integrationxx +Name[zh_TW]=KDE Frameworks 整合 Comment=Provides support for KIO and storing passwords in KWallet Comment[ca]=Proporciona suport pel KIO i per emmagatzemar les contrasenyes al KWallet Comment[ca@valencia]=Proporciona suport pel KIO i per emmagatzemar les contrasenyes al KWallet diff --git a/src/scripts/helloqml/metadata.desktop b/src/scripts/helloqml/metadata.desktop index 1653f3e0b..e873c02eb 100644 --- a/src/scripts/helloqml/metadata.desktop +++ b/src/scripts/helloqml/metadata.desktop @@ -14,6 +14,7 @@ Name[sk]=Hello Qml Name[sv]=Hallå QML Name[uk]=Привіт, Qml Name[x-test]=xxHello Qmlxx +Name[zh_TW]=嗨 QML Comment=Sample Qml Plugin Comment[ca]=Connector QML d'exemple Comment[ca@valencia]=Connector QML d'exemple @@ -29,6 +30,7 @@ Comment[sk]=Ukážkový QML plugin Comment[sv]=Exempel på QML-insticksprogram Comment[uk]=Зразок додатка Qml Comment[x-test]=xxSample Qml Pluginxx +Comment[zh_TW]=簡易的 QML 外掛 Icon= Type=Service X-Falkon-Author=Anmol Gautam diff --git a/src/scripts/middleclickloader/metadata.desktop b/src/scripts/middleclickloader/metadata.desktop index 993ffa1df..9209aa2d0 100644 --- a/src/scripts/middleclickloader/metadata.desktop +++ b/src/scripts/middleclickloader/metadata.desktop @@ -15,6 +15,7 @@ Name[sk]=MiddleClickLoader Name[sv]=Mittenklicksinläsning Name[uk]=Завантажувач за клацанням середньою Name[x-test]=xxMiddleClickLoaderxx +Name[zh_TW]=MiddleClickLoader 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 diff --git a/src/scripts/runaction/actions/dictionary.desktop b/src/scripts/runaction/actions/dictionary.desktop index 21153d12b..e7dd507a8 100644 --- a/src/scripts/runaction/actions/dictionary.desktop +++ b/src/scripts/runaction/actions/dictionary.desktop @@ -16,6 +16,7 @@ Name[sk]=Slovník Name[sv]=Ordlista Name[uk]=Словник Name[x-test]=xxDictionaryxx +Name[zh_TW]=Dictionary Type=Service diff --git a/src/scripts/runaction/actions/googleimagesearch.desktop b/src/scripts/runaction/actions/googleimagesearch.desktop index 81c118894..9ad6f5256 100644 --- a/src/scripts/runaction/actions/googleimagesearch.desktop +++ b/src/scripts/runaction/actions/googleimagesearch.desktop @@ -16,6 +16,7 @@ Name[sk]=Google Name[sv]=Google Name[uk]=Google Name[x-test]=xxGooglexx +Name[zh_TW]=Google Comment=Search with... Comment[ca]=Cerca amb... Comment[ca@valencia]=Cerca amb... @@ -33,6 +34,7 @@ Comment[sk]=Hľadať s... Comment[sv]=Sök med... Comment[uk]=Шукати за допомогою… Comment[x-test]=xxSearch with...xx +Comment[zh_TW]=搜尋… Icon=google.png Type=Service diff --git a/src/scripts/runaction/actions/mpv.desktop b/src/scripts/runaction/actions/mpv.desktop index 2d9d2233d..9183c46eb 100644 --- a/src/scripts/runaction/actions/mpv.desktop +++ b/src/scripts/runaction/actions/mpv.desktop @@ -15,6 +15,7 @@ Name[sk]=Otvoriť s mpv Name[sv]=Öppna med mpv Name[uk]=Відкрити за допомогою mpv Name[x-test]=xxOpen with mpvxx +Name[zh_TW]=使用 mpv 開啟 Icon=mpv TryExec=mpv diff --git a/src/scripts/runaction/actions/tineyeimagesearch.desktop b/src/scripts/runaction/actions/tineyeimagesearch.desktop index 4d9e20350..7509b5ae0 100644 --- a/src/scripts/runaction/actions/tineyeimagesearch.desktop +++ b/src/scripts/runaction/actions/tineyeimagesearch.desktop @@ -16,6 +16,7 @@ Name[sk]=TinEye Name[sv]=TinEye Name[uk]=TinEye Name[x-test]=xxTinEyexx +Name[zh_TW]=TinEye Comment=Search with... Comment[ca]=Cerca amb... Comment[ca@valencia]=Cerca amb... @@ -33,6 +34,7 @@ Comment[sk]=Hľadať s... Comment[sv]=Sök med... Comment[uk]=Шукати за допомогою… Comment[x-test]=xxSearch with...xx +Comment[zh_TW]=搜尋… Icon=tineye.png Type=Service diff --git a/src/scripts/runaction/actions/translate.desktop b/src/scripts/runaction/actions/translate.desktop index 1ad9a7e94..ea955e8d2 100644 --- a/src/scripts/runaction/actions/translate.desktop +++ b/src/scripts/runaction/actions/translate.desktop @@ -16,6 +16,7 @@ Name[sk]=Preložiť stránku Name[sv]=Översätt sida Name[uk]=Перекласти сторінку Name[x-test]=xxTranslate pagexx +Name[zh_TW]=翻譯頁面 Icon=translate.png Type=Service diff --git a/src/scripts/runaction/actions/w3.desktop b/src/scripts/runaction/actions/w3.desktop index 3d4fbd0c7..96683a3e8 100644 --- a/src/scripts/runaction/actions/w3.desktop +++ b/src/scripts/runaction/actions/w3.desktop @@ -16,6 +16,7 @@ Name[sk]=Skontrolovať stránku Name[sv]=Validera sida Name[uk]=Перевірити достовірність сторінки Name[x-test]=xxValidate pagexx +Name[zh_TW]=驗證頁面 Icon=w3.png Type=Service diff --git a/src/scripts/runaction/actions/yandeximagesearch.desktop b/src/scripts/runaction/actions/yandeximagesearch.desktop index 0dba03899..78380def4 100644 --- a/src/scripts/runaction/actions/yandeximagesearch.desktop +++ b/src/scripts/runaction/actions/yandeximagesearch.desktop @@ -16,6 +16,7 @@ Name[sk]=Yandex Name[sv]=Yandex Name[uk]=Яндекс Name[x-test]=xxYandexxx +Name[zh_TW]=Yandex Comment=Search with... Comment[ca]=Cerca amb... Comment[ca@valencia]=Cerca amb... @@ -33,6 +34,7 @@ Comment[sk]=Hľadať s... Comment[sv]=Sök med... Comment[uk]=Шукати за допомогою… Comment[x-test]=xxSearch with...xx +Comment[zh_TW]=搜尋… Icon=yandex.png Type=Service diff --git a/src/scripts/runaction/metadata.desktop b/src/scripts/runaction/metadata.desktop index 98f3b980a..e27642a39 100644 --- a/src/scripts/runaction/metadata.desktop +++ b/src/scripts/runaction/metadata.desktop @@ -15,6 +15,7 @@ Name[sk]=Spustiť akciu Name[sv]=Utför åtgärd Name[uk]=Виконати дію Name[x-test]=xxRun Actionxx +Name[zh_TW]=執行動作 Comment=Run various actions on sites Comment[ca]=Executa diverses accions als llocs Comment[ca@valencia]=Executa diverses accions als llocs @@ -31,6 +32,7 @@ Comment[sk]=Spustiť rôzne akcie na stránkach Comment[sv]=Utför diverse åtgärder på webbplatser Comment[uk]=Виконання різноманітних дій на сайтах Comment[x-test]=xxRun various actions on sitesxx +Comment[zh_TW]=在網站上執行各種動作 Icon=icon.svg Type=Service