From 8659107e2e0db4e98eb147c7e9143da20965f84c Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Thu, 23 Feb 2017 08:50:29 +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" --- dataengines/dict/plasma-dataengine-dict.desktop | 2 +- runners/baloo/plasma-runner-baloosearch.desktop | 4 ++-- runners/bookmarks/plasma-runner-bookmarks.desktop | 2 +- runners/services/plasma-runner-services.desktop | 2 +- runners/windowedwidgets/plasma-runner-windowedwidgets.desktop | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dataengines/dict/plasma-dataengine-dict.desktop b/dataengines/dict/plasma-dataengine-dict.desktop index 8df212b6b..e61bc9fa0 100644 --- a/dataengines/dict/plasma-dataengine-dict.desktop +++ b/dataengines/dict/plasma-dataengine-dict.desktop @@ -87,7 +87,7 @@ Comment[bg]=Търсене значението на думи Comment[bn_IN]=শব্দের অর্থ অনুসন্ধান করুন Comment[bs]=Potražite značenja riječi Comment[ca]=Cerca els significats de paraules -Comment[ca@valencia]=Cerca els significats de paraules +Comment[ca@valencia]=Busca els significats de paraules Comment[cs]=Vyhledávání významu slov Comment[da]=Slå ords betydning op Comment[de]=Nachschlagen von Wortbedeutungen diff --git a/runners/baloo/plasma-runner-baloosearch.desktop b/runners/baloo/plasma-runner-baloosearch.desktop index 84b643baf..991398992 100644 --- a/runners/baloo/plasma-runner-baloosearch.desktop +++ b/runners/baloo/plasma-runner-baloosearch.desktop @@ -3,7 +3,7 @@ Name=Desktop Search Name[ar]=بحث سطح المكتب Name[bs]=Pretraga radne površine Name[ca]=Cerca a l'escriptori -Name[ca@valencia]=Cerca a l'escriptori +Name[ca@valencia]=Busca a l'escriptori Name[cs]=Vyhledávací služby Name[da]=Skrivebordssøgning Name[de]=Desktop-Suche @@ -46,7 +46,7 @@ Name[zh_CN]=桌面搜索 Name[zh_TW]=桌面搜尋 Comment=Searches through files, emails and contacts Comment[ca]=Cerca pels fitxers, correus electrònics i contactes -Comment[ca@valencia]=Cerca pels fitxers, correus electrònics i contactes +Comment[ca@valencia]=Busca pels fitxers, correus electrònics i contactes Comment[cs]=Prohledává v souborech, emailech a kontaktech Comment[da]=Gennemsøger filer, e-mails og kontakter Comment[de]=Durchsucht Dateien, E-Mails und Kontakte diff --git a/runners/bookmarks/plasma-runner-bookmarks.desktop b/runners/bookmarks/plasma-runner-bookmarks.desktop index 035f39b30..a245c187c 100644 --- a/runners/bookmarks/plasma-runner-bookmarks.desktop +++ b/runners/bookmarks/plasma-runner-bookmarks.desktop @@ -78,7 +78,7 @@ Comment[bn]=বুকমার্ক খোঁজো এবং খোলো Comment[bn_IN]=বুকমার্ক অনুসন্ধান করুন ও খুলুন Comment[bs]=Nađite i otvorite zabilješku Comment[ca]=Cerca i obre adreces d'interès -Comment[ca@valencia]=Cerca i obri adreces d'interés +Comment[ca@valencia]=Busca i obri adreces d'interés Comment[cs]=Najít a otevřít záložku Comment[csb]=Malézë ë òtemkni załóżczi Comment[da]=Find og åbn bogmærker diff --git a/runners/services/plasma-runner-services.desktop b/runners/services/plasma-runner-services.desktop index c55c199fc..55ef983c1 100644 --- a/runners/services/plasma-runner-services.desktop +++ b/runners/services/plasma-runner-services.desktop @@ -97,7 +97,7 @@ Comment[be@latin]=Pošuk aplikacyjaŭ, panelaŭ kiravańnia j słužbaŭ Comment[bg]=Търсене на програми, панели и услуги Comment[bs]=Tražite programe, kontrolne panele i servise Comment[ca]=Cerca aplicacions, plafons de control i serveis -Comment[ca@valencia]=Cerca aplicacions, plafons de control i serveis +Comment[ca@valencia]=Busca aplicacions, plafons de control i serveis Comment[cs]=Najít aplikace, ovládací panely a služby Comment[da]=Find programmer, kontrolpaneler og tjenester Comment[de]=Auffinden von Anwendungen, Einrichtungsprogrammen und Diensten diff --git a/runners/windowedwidgets/plasma-runner-windowedwidgets.desktop b/runners/windowedwidgets/plasma-runner-windowedwidgets.desktop index e843fcc71..c07d5a300 100644 --- a/runners/windowedwidgets/plasma-runner-windowedwidgets.desktop +++ b/runners/windowedwidgets/plasma-runner-windowedwidgets.desktop @@ -66,7 +66,7 @@ Comment[ar]=اعثر على ودجات بلازما التي يمكن أن تع Comment[bg]=Търсене на джаджи, които могат да се използват като самостоятелни прозорци Comment[bs]=Nađite plazma grafičke kontrole koje mogu da rade kao samostalni prozori Comment[ca]=Cerca estris del Plasma que es poden executar en finestres autònomes -Comment[ca@valencia]=Cerca estris del Plasma que es poden executar en finestres autònomes +Comment[ca@valencia]=Busca estris del Plasma que es poden executar en finestres autònomes Comment[cs]=Najít Plasma widgety, které mohou být spuštěny ve vlastních oknech Comment[da]=Find Plasma-widgets der kan køres som selvstændige vinduer Comment[de]=Findet Plasma-Miniprogramme, die als eigenständige Anwendungen gestartet werden können