From b8bb4dfa31bf2aea4a4d623593c72b49da4a7695 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Wed, 13 Jun 2018 05:35:07 +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/FlashCookieManager/metadata.desktop | 2 +- src/plugins/KDEFrameworksIntegration/metadata.desktop | 1 + src/plugins/MouseGestures/metadata.desktop | 1 + src/scripts/runaction/actions/googleimagesearch.desktop | 1 + src/scripts/runaction/actions/tineyeimagesearch.desktop | 1 + src/scripts/runaction/actions/yandeximagesearch.desktop | 1 + 6 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/plugins/FlashCookieManager/metadata.desktop b/src/plugins/FlashCookieManager/metadata.desktop index 87d5d861d..609516f15 100644 --- a/src/plugins/FlashCookieManager/metadata.desktop +++ b/src/plugins/FlashCookieManager/metadata.desktop @@ -37,7 +37,7 @@ Comment[pt]=Poderá ver/apagar facilmente os 'cookies' do Flash gravados no seu Comment[sv]=Det går enkelt att titta på eller ta bort Flash kakor lagrade på datorn. Det är en lösning på integritetsproblem. Comment[uk]=Спрощує перегляд і вилучення кук flash, які зберігаються на вашому комп'ютері. Це засіб для поліпшення захисту системи. Comment[x-test]=xxYou can easily view/delete flash cookies stored on your computer. This is a solution for having more privacy.xx -Comment[zh_CN]=您可以轻松地查看/删除存储在您的计算机上的 Flash cookie。这是一个更注重隐私的解决方案。 +Comment[zh_CN]=您可以轻松地查看/删除存储在您的计算机上的 Flash Cookie。这是一个更注重隐私的解决方案。 Icon=:flashcookiemanager/data/flash-cookie-manager.png Type=Service diff --git a/src/plugins/KDEFrameworksIntegration/metadata.desktop b/src/plugins/KDEFrameworksIntegration/metadata.desktop index 1915d311b..e34356f65 100644 --- a/src/plugins/KDEFrameworksIntegration/metadata.desktop +++ b/src/plugins/KDEFrameworksIntegration/metadata.desktop @@ -15,6 +15,7 @@ Name[pt]=Integração com as Plataformas do KDE Name[sv]=Integration med KDE Ramverk Name[uk]=Інтерграція із KDE Frameworks Name[x-test]=xxKDE Frameworks Integrationxx +Name[zh_CN]=KDE 框架集成 Comment=Provides support for KIO and storing passwords in KWallet Comment[ca]=Proporciona suport pel KIO i per emmagatzemar contrasenyes al KWallet Comment[ca@valencia]=Proporciona suport pel KIO i per emmagatzemar contrasenyes al KWallet diff --git a/src/plugins/MouseGestures/metadata.desktop b/src/plugins/MouseGestures/metadata.desktop index b7c73ebdd..fe1ef9069 100644 --- a/src/plugins/MouseGestures/metadata.desktop +++ b/src/plugins/MouseGestures/metadata.desktop @@ -18,6 +18,7 @@ Name[pt]=Gestos do Rato Name[sv]=Musgester Name[uk]=Керування мишею Name[x-test]=xxMouse Gesturesxx +Name[zh_CN]=鼠标手势 Comment=Provides support for navigating in webpages by mouse gestures Comment[ca]=Proporciona suport per navegar per les pàgines web amb gestos del ratolí Comment[ca@valencia]=Proporciona suport per navegar per les pàgines web amb gestos del ratolí diff --git a/src/scripts/runaction/actions/googleimagesearch.desktop b/src/scripts/runaction/actions/googleimagesearch.desktop index d418db845..3c0893e17 100644 --- a/src/scripts/runaction/actions/googleimagesearch.desktop +++ b/src/scripts/runaction/actions/googleimagesearch.desktop @@ -34,6 +34,7 @@ Comment[pt]=Procurar com... Comment[sv]=Sök med... Comment[uk]=Шукати за допомогою… Comment[x-test]=xxSearch with...xx +Comment[zh_CN]=使用搜索引擎搜索... Icon=google.png Type=Service diff --git a/src/scripts/runaction/actions/tineyeimagesearch.desktop b/src/scripts/runaction/actions/tineyeimagesearch.desktop index 1c65e2e4d..2c6d07d0e 100644 --- a/src/scripts/runaction/actions/tineyeimagesearch.desktop +++ b/src/scripts/runaction/actions/tineyeimagesearch.desktop @@ -34,6 +34,7 @@ Comment[pt]=Procurar com... Comment[sv]=Sök med... Comment[uk]=Шукати за допомогою… Comment[x-test]=xxSearch with...xx +Comment[zh_CN]=使用搜索引擎搜索... Icon=tineye.png Type=Service diff --git a/src/scripts/runaction/actions/yandeximagesearch.desktop b/src/scripts/runaction/actions/yandeximagesearch.desktop index ee6557bfd..bdfdc6bdc 100644 --- a/src/scripts/runaction/actions/yandeximagesearch.desktop +++ b/src/scripts/runaction/actions/yandeximagesearch.desktop @@ -34,6 +34,7 @@ Comment[pt]=Procurar com... Comment[sv]=Sök med... Comment[uk]=Шукати за допомогою… Comment[x-test]=xxSearch with...xx +Comment[zh_CN]=使用搜索引擎搜索... Icon=yandex.png Type=Service