From 8ec62ec15e9fbe2f28d8172d91457d3ebdf427f5 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Thu, 23 Feb 2017 08:20:02 +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" --- applets/appmenu/package/metadata.desktop | 3 +++ components/shellprivate/widgetexplorer/plasmoids.knsrc | 1 + 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 +- wallpapers/image/wallpaper.knsrc | 1 + 8 files changed, 11 insertions(+), 6 deletions(-) diff --git a/applets/appmenu/package/metadata.desktop b/applets/appmenu/package/metadata.desktop index 79e7fb825..fb3776d0f 100644 --- a/applets/appmenu/package/metadata.desktop +++ b/applets/appmenu/package/metadata.desktop @@ -2,6 +2,8 @@ Encoding=UTF-8 Name=Global Menu Name[ca]=Menú global +Name[ca@valencia]=Menú global +Name[cs]=Globální nabídka Name[da]=Global menu Name[el]=Καθολικό μενού Name[en_GB]=Global Menu @@ -9,6 +11,7 @@ Name[es]=Menú global Name[eu]=Menu orokorra Name[it]=Menu globale Name[nl]=Globaal menu +Name[nn]=Global meny Name[pl]=Menu globalne Name[pt]=Menu Global Name[pt_BR]=Menu global diff --git a/components/shellprivate/widgetexplorer/plasmoids.knsrc b/components/shellprivate/widgetexplorer/plasmoids.knsrc index b0bbc843b..c984d8a7f 100644 --- a/components/shellprivate/widgetexplorer/plasmoids.knsrc +++ b/components/shellprivate/widgetexplorer/plasmoids.knsrc @@ -2,6 +2,7 @@ Name=Plasma Widgets Name[ca]=Estris del Plasma Name[ca@valencia]=Estris del Plasma +Name[cs]=Widgety pro Plasmu Name[da]=Plasma-widgets Name[de]=Plasma-Miniprogramme Name[el]=Γραφικά συστατικά Plasma diff --git a/dataengines/dict/plasma-dataengine-dict.desktop b/dataengines/dict/plasma-dataengine-dict.desktop index 50ac53bfd..3298c6ad3 100644 --- a/dataengines/dict/plasma-dataengine-dict.desktop +++ b/dataengines/dict/plasma-dataengine-dict.desktop @@ -85,7 +85,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 0063877dd..df754c193 100644 --- a/runners/bookmarks/plasma-runner-bookmarks.desktop +++ b/runners/bookmarks/plasma-runner-bookmarks.desktop @@ -77,7 +77,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 ea691e010..f5ead282d 100644 --- a/runners/services/plasma-runner-services.desktop +++ b/runners/services/plasma-runner-services.desktop @@ -96,7 +96,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 3a8fdfebf..fc9930a83 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 diff --git a/wallpapers/image/wallpaper.knsrc b/wallpapers/image/wallpaper.knsrc index b4d148ff6..b1173e78f 100644 --- a/wallpapers/image/wallpaper.knsrc +++ b/wallpapers/image/wallpaper.knsrc @@ -2,6 +2,7 @@ Name=Wallpapers Name[ca]=Fons d'escriptori Name[ca@valencia]=Fons d'escriptori +Name[cs]=Tapety Name[da]=Baggrundsbilleder Name[de]=Hintergrundbilder Name[el]=Ταπετσαρίες