From 2a7176946be7301f5789f650a329d312414bbe8b Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 31 Mar 2019 09:30:03 +0200 Subject: [PATCH 1/7] 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 | 2 ++ src/scripts/helloqml/metadata.desktop | 2 ++ src/scripts/middleclickloader/metadata.desktop | 2 ++ 3 files changed, 6 insertions(+) diff --git a/src/plugins/KDEFrameworksIntegration/metadata.desktop b/src/plugins/KDEFrameworksIntegration/metadata.desktop index 04d6f903b..ab10d0918 100644 --- a/src/plugins/KDEFrameworksIntegration/metadata.desktop +++ b/src/plugins/KDEFrameworksIntegration/metadata.desktop @@ -7,6 +7,7 @@ Name[es]=Integración con la infraestructura de KDE Name[fr]=Intégration à KDE Frameworks Name[gl]=Integración coas infraestruturas de KDE Name[id]=KDE Frameworks Integration +Name[it]=Integrazione con KDE Frameworks Name[nl]=KDE Frameworks integratie Name[nn]=Integrering med KDE Frameworks Name[pt_BR]=Integração com o KDE Frameworks @@ -22,6 +23,7 @@ Comment[es]=Implementa KIO y almacenamiento de contraseñas en KWallet Comment[fr]=Prise en charge de KIO et de l'enregistrement de mots de passe dans KWallet Comment[gl]=Fornece compatibilidade con KIO e permite almacenar contrasinais en KWallet Comment[id]=Menyediakan dukungan untuk KIO dan menyimpan sandi dalam KWallet +Comment[it]=Fornisce un supporto per KIO e per l'immagazzinamento delle password in KWallet Comment[nl]=Biedt ondersteuning voor KIO en opslaan van wachtwoorden in KWallet Comment[nn]=Gjev støtte for KIO og lagring av passord i KWallet Comment[pt_BR]=Fornece suporte ao KIO e armazenamento de senhas no KWallet diff --git a/src/scripts/helloqml/metadata.desktop b/src/scripts/helloqml/metadata.desktop index 04a11b718..1653f3e0b 100644 --- a/src/scripts/helloqml/metadata.desktop +++ b/src/scripts/helloqml/metadata.desktop @@ -7,6 +7,7 @@ Name[es]=Hola Qml Name[fr]=Bonjour Qml Name[gl]=Ola Qml Name[id]=Hello Qml +Name[it]=Hello Qml Name[nl]=Hello Qml Name[pt_BR]=Olá Qml Name[sk]=Hello Qml @@ -21,6 +22,7 @@ Comment[es]=Complemento de ejemplo de Qml Comment[fr]=Exemple de module externe Qml Comment[gl]=Complemento de exemplo de Qml Comment[id]=Contoh Plugin Qml +Comment[it]=Estensione di esempio in Qml Comment[nl]=Voorbeeld Qml-plug-in Comment[pt_BR]=Plug-in QML de exemplo Comment[sk]=Ukážkový QML plugin diff --git a/src/scripts/middleclickloader/metadata.desktop b/src/scripts/middleclickloader/metadata.desktop index ed93135a7..993ffa1df 100644 --- a/src/scripts/middleclickloader/metadata.desktop +++ b/src/scripts/middleclickloader/metadata.desktop @@ -7,6 +7,7 @@ Name[es]=Cargador de clic central Name[fr]=MiddleClickLoader Name[gl]=MiddleClickLoader Name[id]=MiddleClickLoader +Name[it]=Caricatore al clic centrale Name[nl]=MiddleClickLoader Name[nn]=Lasting med midtklikk Name[pt_BR]=CarregadorBotãoMeio @@ -22,6 +23,7 @@ Comment[es]=Cargar texto seleccionado en el portapapeles como URL Comment[fr]=Charger l'URL sélectionnée dans le presse-papier Comment[gl]=Cargar texto no portapapeis de selección como URL Comment[id]=Muat teks dalam seleksi clipboard sebagai URL +Comment[it]=Carica come URL il testo negli appunti della selezione Comment[nl]=Tekst laden in selectieklembord als URL Comment[pt_BR]=Carrega o texto na área de transferência como uma URL Comment[sk]=Načítať text vo výbere schránky ako URL From 95661276c5a74e280f053467ae64b6ebc0aec879 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 1 Apr 2019 08:54:43 +0200 Subject: [PATCH 2/7] 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 From 4c2b45357318b404255a4cb78138a80c5ece8629 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Tue, 2 Apr 2019 09:00:21 +0200 Subject: [PATCH 3/7] 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 | 2 ++ src/scripts/helloqml/metadata.desktop | 2 ++ src/scripts/middleclickloader/metadata.desktop | 2 ++ 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, 18 insertions(+) diff --git a/src/plugins/KDEFrameworksIntegration/metadata.desktop b/src/plugins/KDEFrameworksIntegration/metadata.desktop index 21987691d..e6b6750b4 100644 --- a/src/plugins/KDEFrameworksIntegration/metadata.desktop +++ b/src/plugins/KDEFrameworksIntegration/metadata.desktop @@ -10,6 +10,7 @@ Name[id]=KDE Frameworks Integration Name[it]=Integrazione con KDE Frameworks Name[nl]=KDE Frameworks integratie Name[nn]=Integrering med KDE Frameworks +Name[pt]=Integração com as Plataformas do KDE Name[pt_BR]=Integração com o KDE Frameworks Name[sk]=KDE Frameworks Integrácia Name[sv]=Integration med KDE Ramverk @@ -27,6 +28,7 @@ Comment[id]=Menyediakan dukungan untuk KIO dan menyimpan sandi dalam KWallet Comment[it]=Fornisce un supporto per KIO e per l'immagazzinamento delle password in KWallet Comment[nl]=Biedt ondersteuning voor KIO en opslaan van wachtwoorden in KWallet Comment[nn]=Gjev støtte for KIO og lagring av passord i KWallet +Comment[pt]=Oferece o suporte para o KIO e guardar as senhas no KWallet Comment[pt_BR]=Fornece suporte ao KIO e armazenamento de senhas no KWallet Comment[sk]=Poskytuje podporu pre KIO a ukladanie hesiel do KWalletu Comment[sv]=Tillhandahåller stöd för KIO och lagring av lösenord i plånboken diff --git a/src/scripts/helloqml/metadata.desktop b/src/scripts/helloqml/metadata.desktop index e873c02eb..8bec2c39e 100644 --- a/src/scripts/helloqml/metadata.desktop +++ b/src/scripts/helloqml/metadata.desktop @@ -9,6 +9,7 @@ Name[gl]=Ola Qml Name[id]=Hello Qml Name[it]=Hello Qml Name[nl]=Hello Qml +Name[pt]=Olá em QML Name[pt_BR]=Olá Qml Name[sk]=Hello Qml Name[sv]=Hallå QML @@ -25,6 +26,7 @@ Comment[gl]=Complemento de exemplo de Qml Comment[id]=Contoh Plugin Qml Comment[it]=Estensione di esempio in Qml Comment[nl]=Voorbeeld Qml-plug-in +Comment[pt]='Plugin' de Exemplo em QML Comment[pt_BR]=Plug-in QML de exemplo Comment[sk]=Ukážkový QML plugin Comment[sv]=Exempel på QML-insticksprogram diff --git a/src/scripts/middleclickloader/metadata.desktop b/src/scripts/middleclickloader/metadata.desktop index 9209aa2d0..27ec1cf57 100644 --- a/src/scripts/middleclickloader/metadata.desktop +++ b/src/scripts/middleclickloader/metadata.desktop @@ -10,6 +10,7 @@ Name[id]=MiddleClickLoader Name[it]=Caricatore al clic centrale Name[nl]=MiddleClickLoader Name[nn]=Lasting med midtklikk +Name[pt]=MiddleClickLoader Name[pt_BR]=CarregadorBotãoMeio Name[sk]=MiddleClickLoader Name[sv]=Mittenklicksinläsning @@ -26,6 +27,7 @@ Comment[gl]=Cargar texto no portapapeis de selección como URL Comment[id]=Muat teks dalam seleksi clipboard sebagai URL Comment[it]=Carica come URL il testo negli appunti della selezione Comment[nl]=Tekst laden in selectieklembord als URL +Comment[pt]=Carrega o texto na área de transferência da selecção como um URL Comment[pt_BR]=Carrega o texto na área de transferência como uma URL Comment[sk]=Načítať text vo výbere schránky ako URL Comment[sv]=Läs in text markerad på klippbordet som webbadress diff --git a/src/scripts/runaction/actions/dictionary.desktop b/src/scripts/runaction/actions/dictionary.desktop index e7dd507a8..88827f065 100644 --- a/src/scripts/runaction/actions/dictionary.desktop +++ b/src/scripts/runaction/actions/dictionary.desktop @@ -11,6 +11,7 @@ Name[id]=Kamus Name[it]=Dizionario Name[nl]=Woordenboek Name[nn]=Ordliste +Name[pt]=Dicionário Name[pt_BR]=Dicionário Name[sk]=Slovník Name[sv]=Ordlista diff --git a/src/scripts/runaction/actions/googleimagesearch.desktop b/src/scripts/runaction/actions/googleimagesearch.desktop index 9ad6f5256..914c31223 100644 --- a/src/scripts/runaction/actions/googleimagesearch.desktop +++ b/src/scripts/runaction/actions/googleimagesearch.desktop @@ -11,6 +11,7 @@ Name[id]=Google Name[it]=Google Name[nl]=Google Name[nn]=Google +Name[pt]=Google Name[pt_BR]=Google Name[sk]=Google Name[sv]=Google @@ -29,6 +30,7 @@ Comment[id]=Cari dengan... Comment[it]=Cerca con... Comment[nl]=Zoeken met... Comment[nn]=Søk med … +Comment[pt]=Procurar com... Comment[pt_BR]=Pesquisar com... Comment[sk]=Hľadať s... Comment[sv]=Sök med... diff --git a/src/scripts/runaction/actions/mpv.desktop b/src/scripts/runaction/actions/mpv.desktop index 9183c46eb..3adf384cf 100644 --- a/src/scripts/runaction/actions/mpv.desktop +++ b/src/scripts/runaction/actions/mpv.desktop @@ -10,6 +10,7 @@ Name[id]=Buka dengan mpv Name[it]=Apri con mpv Name[nl]=Met mpv openen Name[nn]=Opna med mpv +Name[pt]=Abrir com o MPV Name[pt_BR]=Abrir com o mpv Name[sk]=Otvoriť s mpv Name[sv]=Öppna med mpv diff --git a/src/scripts/runaction/actions/tineyeimagesearch.desktop b/src/scripts/runaction/actions/tineyeimagesearch.desktop index 7509b5ae0..0bd874de4 100644 --- a/src/scripts/runaction/actions/tineyeimagesearch.desktop +++ b/src/scripts/runaction/actions/tineyeimagesearch.desktop @@ -11,6 +11,7 @@ Name[id]=TinEye Name[it]=TinEye Name[nl]=TinEye Name[nn]=TinEye +Name[pt]=TinEye Name[pt_BR]=TinEye Name[sk]=TinEye Name[sv]=TinEye @@ -29,6 +30,7 @@ Comment[id]=Cari dengan... Comment[it]=Cerca con... Comment[nl]=Zoeken met... Comment[nn]=Søk med … +Comment[pt]=Procurar com... Comment[pt_BR]=Pesquisar com... Comment[sk]=Hľadať s... Comment[sv]=Sök med... diff --git a/src/scripts/runaction/actions/translate.desktop b/src/scripts/runaction/actions/translate.desktop index ea955e8d2..4aece82fc 100644 --- a/src/scripts/runaction/actions/translate.desktop +++ b/src/scripts/runaction/actions/translate.desktop @@ -11,6 +11,7 @@ Name[id]=Terjemahkan halaman Name[it]=Traduci la pagina Name[nl]=Pagina vertalen Name[nn]=Set om side +Name[pt]=Traduzir a página Name[pt_BR]=Traduzir página Name[sk]=Preložiť stránku Name[sv]=Översätt sida diff --git a/src/scripts/runaction/actions/w3.desktop b/src/scripts/runaction/actions/w3.desktop index 96683a3e8..e9660033d 100644 --- a/src/scripts/runaction/actions/w3.desktop +++ b/src/scripts/runaction/actions/w3.desktop @@ -11,6 +11,7 @@ Name[id]=Validasi halaman Name[it]=Convalida la pagina Name[nl]=Pagina valideren Name[nn]=Valider side +Name[pt]=Validar a página Name[pt_BR]=Validar página Name[sk]=Skontrolovať stránku Name[sv]=Validera sida diff --git a/src/scripts/runaction/actions/yandeximagesearch.desktop b/src/scripts/runaction/actions/yandeximagesearch.desktop index 78380def4..9fe336be2 100644 --- a/src/scripts/runaction/actions/yandeximagesearch.desktop +++ b/src/scripts/runaction/actions/yandeximagesearch.desktop @@ -11,6 +11,7 @@ Name[id]=Yandex Name[it]=Yandex Name[nl]=Yandex Name[nn]=Yandex +Name[pt]=Yandex Name[pt_BR]=Yandex Name[sk]=Yandex Name[sv]=Yandex @@ -29,6 +30,7 @@ Comment[id]=Cari dengan... Comment[it]=Cerca con... Comment[nl]=Zoeken met... Comment[nn]=Søk med … +Comment[pt]=Procurar com... Comment[pt_BR]=Pesquisar com... Comment[sk]=Hľadať s... Comment[sv]=Sök med... diff --git a/src/scripts/runaction/metadata.desktop b/src/scripts/runaction/metadata.desktop index e27642a39..dd529e28d 100644 --- a/src/scripts/runaction/metadata.desktop +++ b/src/scripts/runaction/metadata.desktop @@ -10,6 +10,7 @@ Name[id]=Run Action Name[it]=Esegui azione Name[nl]=Uitvoeractie Name[nn]=Køyr handling +Name[pt]=Executar a Acção Name[pt_BR]=Executar ação Name[sk]=Spustiť akciu Name[sv]=Utför åtgärd @@ -27,6 +28,7 @@ Comment[id]=Jalankan beberapa aksi pada situs Comment[it]=Esegue numerose azioni nei siti Comment[nl]=Verschillende acties op sites uitvoeren Comment[nn]=Køyr ymse handlingar på nettstadar +Comment[pt]=Executar várias acções nos 'sites' Comment[pt_BR]=Executar várias ações nos sites Comment[sk]=Spustiť rôzne akcie na stránkach Comment[sv]=Utför diverse åtgärder på webbplatser From f322c4ed94213a587bf93a0bcf0e5fb32756359b Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Thu, 4 Apr 2019 09:01:22 +0200 Subject: [PATCH 4/7] 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 | 2 ++ src/scripts/helloqml/metadata.desktop | 2 ++ src/scripts/middleclickloader/metadata.desktop | 2 ++ 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, 18 insertions(+) diff --git a/src/plugins/KDEFrameworksIntegration/metadata.desktop b/src/plugins/KDEFrameworksIntegration/metadata.desktop index e6b6750b4..470819b37 100644 --- a/src/plugins/KDEFrameworksIntegration/metadata.desktop +++ b/src/plugins/KDEFrameworksIntegration/metadata.desktop @@ -4,6 +4,7 @@ Name[ca]=Integració amb els Frameworks del KDE Name[ca@valencia]=Integració amb els Frameworks del KDE Name[en_GB]=KDE Frameworks Integration Name[es]=Integración con la infraestructura de KDE +Name[fi]=KDE Frameworks -integrointi Name[fr]=Intégration à KDE Frameworks Name[gl]=Integración coas infraestruturas de KDE Name[id]=KDE Frameworks Integration @@ -22,6 +23,7 @@ Comment[ca]=Proporciona suport pel KIO i per emmagatzemar les contrasenyes al KW Comment[ca@valencia]=Proporciona suport pel KIO i per emmagatzemar les contrasenyes al KWallet Comment[en_GB]=Provides support for KIO and storing passwords in KWallet Comment[es]=Implementa KIO y almacenamiento de contraseñas en KWallet +Comment[fi]=Tarjoaa KIO-tuen sekä salasanojen tallentamisen KWalletiin Comment[fr]=Prise en charge de KIO et de l'enregistrement de mots de passe dans KWallet Comment[gl]=Fornece compatibilidade con KIO e permite almacenar contrasinais en KWallet Comment[id]=Menyediakan dukungan untuk KIO dan menyimpan sandi dalam KWallet diff --git a/src/scripts/helloqml/metadata.desktop b/src/scripts/helloqml/metadata.desktop index 8bec2c39e..6a784a5be 100644 --- a/src/scripts/helloqml/metadata.desktop +++ b/src/scripts/helloqml/metadata.desktop @@ -4,6 +4,7 @@ Name[ca]=Hola QML Name[ca@valencia]=Hola QML Name[en_GB]=Hello QML Name[es]=Hola Qml +Name[fi]=Hei QML Name[fr]=Bonjour Qml Name[gl]=Ola Qml Name[id]=Hello Qml @@ -21,6 +22,7 @@ Comment[ca]=Connector QML d'exemple Comment[ca@valencia]=Connector QML d'exemple Comment[en_GB]=Sample QML Plugin Comment[es]=Complemento de ejemplo de Qml +Comment[fi]=Esimerkki-QML-liitännäinen Comment[fr]=Exemple de module externe Qml Comment[gl]=Complemento de exemplo de Qml Comment[id]=Contoh Plugin Qml diff --git a/src/scripts/middleclickloader/metadata.desktop b/src/scripts/middleclickloader/metadata.desktop index 27ec1cf57..94bd7d5f7 100644 --- a/src/scripts/middleclickloader/metadata.desktop +++ b/src/scripts/middleclickloader/metadata.desktop @@ -4,6 +4,7 @@ Name[ca]=MiddleClickLoader Name[ca@valencia]=MiddleClickLoader Name[en_GB]=MiddleClickLoader Name[es]=Cargador de clic central +Name[fi]=Keskipainikelatain Name[fr]=MiddleClickLoader Name[gl]=MiddleClickLoader Name[id]=MiddleClickLoader @@ -22,6 +23,7 @@ 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 Comment[en_GB]=Load text in selection clipboard as URL Comment[es]=Cargar texto seleccionado en el portapapeles como URL +Comment[fi]=Lataa leikepöytävalinnan tekstin verkko-osoitteeksi Comment[fr]=Charger l'URL sélectionnée dans le presse-papier Comment[gl]=Cargar texto no portapapeis de selección como URL Comment[id]=Muat teks dalam seleksi clipboard sebagai URL diff --git a/src/scripts/runaction/actions/dictionary.desktop b/src/scripts/runaction/actions/dictionary.desktop index 88827f065..c2171c20c 100644 --- a/src/scripts/runaction/actions/dictionary.desktop +++ b/src/scripts/runaction/actions/dictionary.desktop @@ -5,6 +5,7 @@ Name[ca@valencia]=Diccionari Name[de]=Wörterbuch Name[en_GB]=Dictionary Name[es]=Diccionario +Name[fi]=Sanasto Name[fr]=Dictionnaire Name[gl]=Dicionario Name[id]=Kamus diff --git a/src/scripts/runaction/actions/googleimagesearch.desktop b/src/scripts/runaction/actions/googleimagesearch.desktop index 914c31223..af0f20108 100644 --- a/src/scripts/runaction/actions/googleimagesearch.desktop +++ b/src/scripts/runaction/actions/googleimagesearch.desktop @@ -5,6 +5,7 @@ Name[ca@valencia]=Google Name[de]=Google Name[en_GB]=Google Name[es]=Google +Name[fi]=Google Name[fr]=Google Name[gl]=Google Name[id]=Google @@ -24,6 +25,7 @@ Comment[ca@valencia]=Cerca amb... Comment[de]=Suchen mit ... Comment[en_GB]=Search with... Comment[es]=Buscar con... +Comment[fi]=Etsi hakukoneella… Comment[fr]=Chercher avec… Comment[gl]=Buscar con… Comment[id]=Cari dengan... diff --git a/src/scripts/runaction/actions/mpv.desktop b/src/scripts/runaction/actions/mpv.desktop index 3adf384cf..b5552a2b0 100644 --- a/src/scripts/runaction/actions/mpv.desktop +++ b/src/scripts/runaction/actions/mpv.desktop @@ -4,6 +4,7 @@ Name[ca]=Obre amb el «mpv» Name[ca@valencia]=Obri amb el «mpv» Name[en_GB]=Open with mpv Name[es]=Abrir con mpv +Name[fi]=Avaa mpv:hen Name[fr]=Ouvrir avec mpv Name[gl]=Abrir con mpv Name[id]=Buka dengan mpv diff --git a/src/scripts/runaction/actions/tineyeimagesearch.desktop b/src/scripts/runaction/actions/tineyeimagesearch.desktop index 0bd874de4..025f4e66b 100644 --- a/src/scripts/runaction/actions/tineyeimagesearch.desktop +++ b/src/scripts/runaction/actions/tineyeimagesearch.desktop @@ -5,6 +5,7 @@ Name[ca@valencia]=TinEye Name[de]=TinEye Name[en_GB]=TinEye Name[es]=TinEye +Name[fi]=TinEye Name[fr]=TinEye Name[gl]=TinEye Name[id]=TinEye @@ -24,6 +25,7 @@ Comment[ca@valencia]=Cerca amb... Comment[de]=Suchen mit ... Comment[en_GB]=Search with... Comment[es]=Buscar con... +Comment[fi]=Etsi hakukoneella… Comment[fr]=Chercher avec… Comment[gl]=Buscar con… Comment[id]=Cari dengan... diff --git a/src/scripts/runaction/actions/translate.desktop b/src/scripts/runaction/actions/translate.desktop index 4aece82fc..052514972 100644 --- a/src/scripts/runaction/actions/translate.desktop +++ b/src/scripts/runaction/actions/translate.desktop @@ -5,6 +5,7 @@ Name[ca@valencia]=Tradueix la pàgina Name[de]=Seite übersetzen Name[en_GB]=Translate page Name[es]=Traducir página +Name[fi]=Käännä sivu Name[fr]=Traduire la page Web Name[gl]=Traducir a páxina Name[id]=Terjemahkan halaman diff --git a/src/scripts/runaction/actions/w3.desktop b/src/scripts/runaction/actions/w3.desktop index e9660033d..6ca8eb63f 100644 --- a/src/scripts/runaction/actions/w3.desktop +++ b/src/scripts/runaction/actions/w3.desktop @@ -5,6 +5,7 @@ Name[ca@valencia]=Valida la pàgina Name[de]=Seite überprüfen Name[en_GB]=Validate page Name[es]=Validar página +Name[fi]=Tarkista sivu Name[fr]=Valider la page Name[gl]=Validar a páxina Name[id]=Validasi halaman diff --git a/src/scripts/runaction/actions/yandeximagesearch.desktop b/src/scripts/runaction/actions/yandeximagesearch.desktop index 9fe336be2..532014220 100644 --- a/src/scripts/runaction/actions/yandeximagesearch.desktop +++ b/src/scripts/runaction/actions/yandeximagesearch.desktop @@ -5,6 +5,7 @@ Name[ca@valencia]=Yandex Name[de]=Yandex Name[en_GB]=Yandex Name[es]=Yandex +Name[fi]=Yandex Name[fr]=Yandex Name[gl]=Yandex Name[id]=Yandex @@ -24,6 +25,7 @@ Comment[ca@valencia]=Cerca amb... Comment[de]=Suchen mit ... Comment[en_GB]=Search with... Comment[es]=Buscar con... +Comment[fi]=Etsi hakukoneella… Comment[fr]=Chercher avec… Comment[gl]=Buscar con… Comment[id]=Cari dengan... diff --git a/src/scripts/runaction/metadata.desktop b/src/scripts/runaction/metadata.desktop index dd529e28d..576035ca4 100644 --- a/src/scripts/runaction/metadata.desktop +++ b/src/scripts/runaction/metadata.desktop @@ -4,6 +4,7 @@ Name[ca]=Executa una acció Name[ca@valencia]=Executa una acció Name[en_GB]=Run Action Name[es]=Ejecutar acción +Name[fi]=Suorita toiminto Name[fr]=Lancer une action Name[gl]=Executar a acción Name[id]=Run Action @@ -22,6 +23,7 @@ Comment[ca]=Executa diverses accions als llocs Comment[ca@valencia]=Executa diverses accions als llocs Comment[en_GB]=Run various actions on sites Comment[es]=Ejecutar varias acciones en sitios +Comment[fi]=Suorita eri toimintoja sivustoilla Comment[fr]=Lancement d'actions diverses sur des sites Web Comment[gl]=Executar varias accións en sitios Comment[id]=Jalankan beberapa aksi pada situs From 61f3cd89a1249032760e3bb51b22fc4b0dcd8a47 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 8 Apr 2019 08:42:31 +0200 Subject: [PATCH 5/7] 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/MouseGestures/metadata.desktop | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/plugins/MouseGestures/metadata.desktop b/src/plugins/MouseGestures/metadata.desktop index a8e8657ac..05677bd03 100644 --- a/src/plugins/MouseGestures/metadata.desktop +++ b/src/plugins/MouseGestures/metadata.desktop @@ -10,7 +10,7 @@ Name[es]=Gestos de ratón Name[fi]=Hiirieleet Name[fr]=Mouvements de souris Name[gl]=Xestos do rato -Name[id]=Gerak-gerik Mouse +Name[id]=Gestur Mouse Name[it]=Gesti del mouse Name[nl]=Muisgebaren Name[nn]=Muserørsler @@ -34,7 +34,7 @@ Comment[es]=Implementa la navegación en páginas web mediante gestos de ratón Comment[fi]=Tarjoaa tuen verkkosivujen selaamiseksi hiirielein Comment[fr]=Prise en charge de la navigation Internet à l'aide de mouvements de la souris Comment[gl]=Permite navegar por páxinas web con acenos co rato -Comment[id]=Menyediakan dukungan untuk menavigasi dalam halaman web dengan gerak-gerik mouse +Comment[id]=Menyediakan dukungan untuk menavigasi dalam halaman web dengan gestur mouse Comment[it]=Fornisce un supporto alla navigazione nelle pagine web per mezzo di gesti del mouse Comment[nl]=Biedt ondersteuning voor navigeren in webpagina's door muisgebaren Comment[nn]=Gjev støtte for muserørsler for nettsidenavigering From 6e98af2f1c94e8b8b40d3eb17be642a672bf10c8 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Wed, 10 Apr 2019 09:15:23 +0200 Subject: [PATCH 6/7] 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 | 2 ++ src/scripts/helloqml/metadata.desktop | 2 ++ src/scripts/middleclickloader/metadata.desktop | 2 ++ 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, 18 insertions(+) diff --git a/src/plugins/KDEFrameworksIntegration/metadata.desktop b/src/plugins/KDEFrameworksIntegration/metadata.desktop index 470819b37..76c5052e9 100644 --- a/src/plugins/KDEFrameworksIntegration/metadata.desktop +++ b/src/plugins/KDEFrameworksIntegration/metadata.desktop @@ -17,6 +17,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_CN]=KDE 框架集成 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 @@ -36,6 +37,7 @@ Comment[sk]=Poskytuje podporu pre KIO a ukladanie hesiel do KWalletu Comment[sv]=Tillhandahåller stöd för KIO och lagring av lösenord i plånboken Comment[uk]=Забезпечує підтримку засобів введення-виведення KIO і зберігання паролів у KWallet Comment[x-test]=xxProvides support for KIO and storing passwords in KWalletxx +Comment[zh_CN]=提供在 KWallet 中保存密码以及 KIO 的支持 Icon=:kdeframeworksintegration/data/icon.svg Type=Service diff --git a/src/scripts/helloqml/metadata.desktop b/src/scripts/helloqml/metadata.desktop index 6a784a5be..8c39b9902 100644 --- a/src/scripts/helloqml/metadata.desktop +++ b/src/scripts/helloqml/metadata.desktop @@ -16,6 +16,7 @@ Name[sk]=Hello Qml Name[sv]=Hallå QML Name[uk]=Привіт, Qml Name[x-test]=xxHello Qmlxx +Name[zh_CN]=Hello Qml Name[zh_TW]=嗨 QML Comment=Sample Qml Plugin Comment[ca]=Connector QML d'exemple @@ -34,6 +35,7 @@ Comment[sk]=Ukážkový QML plugin Comment[sv]=Exempel på QML-insticksprogram Comment[uk]=Зразок додатка Qml Comment[x-test]=xxSample Qml Pluginxx +Comment[zh_CN]=示例 Qml 插件 Comment[zh_TW]=簡易的 QML 外掛 Icon= Type=Service diff --git a/src/scripts/middleclickloader/metadata.desktop b/src/scripts/middleclickloader/metadata.desktop index 94bd7d5f7..43b8ab8a5 100644 --- a/src/scripts/middleclickloader/metadata.desktop +++ b/src/scripts/middleclickloader/metadata.desktop @@ -17,6 +17,7 @@ Name[sk]=MiddleClickLoader Name[sv]=Mittenklicksinläsning Name[uk]=Завантажувач за клацанням середньою Name[x-test]=xxMiddleClickLoaderxx +Name[zh_CN]=中键加载器 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 @@ -35,6 +36,7 @@ Comment[sk]=Načítať text vo výbere schránky ako URL Comment[sv]=Läs in text markerad på klippbordet som webbadress Comment[uk]=Завантажує текст у буфері обміну як адресу Comment[x-test]=xxLoad text in selection clipboard as URLxx +Comment[zh_CN]=将选择剪贴板中的文本加载为 URL Icon= Type=Service diff --git a/src/scripts/runaction/actions/dictionary.desktop b/src/scripts/runaction/actions/dictionary.desktop index c2171c20c..2f62d65be 100644 --- a/src/scripts/runaction/actions/dictionary.desktop +++ b/src/scripts/runaction/actions/dictionary.desktop @@ -18,6 +18,7 @@ Name[sk]=Slovník Name[sv]=Ordlista Name[uk]=Словник Name[x-test]=xxDictionaryxx +Name[zh_CN]=词典 Name[zh_TW]=Dictionary Type=Service diff --git a/src/scripts/runaction/actions/googleimagesearch.desktop b/src/scripts/runaction/actions/googleimagesearch.desktop index af0f20108..72557c4b6 100644 --- a/src/scripts/runaction/actions/googleimagesearch.desktop +++ b/src/scripts/runaction/actions/googleimagesearch.desktop @@ -18,6 +18,7 @@ Name[sk]=Google Name[sv]=Google Name[uk]=Google Name[x-test]=xxGooglexx +Name[zh_CN]=Google Name[zh_TW]=Google Comment=Search with... Comment[ca]=Cerca amb... @@ -38,6 +39,7 @@ Comment[sk]=Hľadať s... Comment[sv]=Sök med... Comment[uk]=Шукати за допомогою… Comment[x-test]=xxSearch with...xx +Comment[zh_CN]=使用搜索引擎搜索... Comment[zh_TW]=搜尋… Icon=google.png diff --git a/src/scripts/runaction/actions/mpv.desktop b/src/scripts/runaction/actions/mpv.desktop index b5552a2b0..cd24aafea 100644 --- a/src/scripts/runaction/actions/mpv.desktop +++ b/src/scripts/runaction/actions/mpv.desktop @@ -17,6 +17,7 @@ Name[sk]=Otvoriť s mpv Name[sv]=Öppna med mpv Name[uk]=Відкрити за допомогою mpv Name[x-test]=xxOpen with mpvxx +Name[zh_CN]=用 mpv 打开 Name[zh_TW]=使用 mpv 開啟 Icon=mpv diff --git a/src/scripts/runaction/actions/tineyeimagesearch.desktop b/src/scripts/runaction/actions/tineyeimagesearch.desktop index 025f4e66b..1085340a1 100644 --- a/src/scripts/runaction/actions/tineyeimagesearch.desktop +++ b/src/scripts/runaction/actions/tineyeimagesearch.desktop @@ -18,6 +18,7 @@ Name[sk]=TinEye Name[sv]=TinEye Name[uk]=TinEye Name[x-test]=xxTinEyexx +Name[zh_CN]=TinEye Name[zh_TW]=TinEye Comment=Search with... Comment[ca]=Cerca amb... @@ -38,6 +39,7 @@ Comment[sk]=Hľadať s... Comment[sv]=Sök med... Comment[uk]=Шукати за допомогою… Comment[x-test]=xxSearch with...xx +Comment[zh_CN]=使用搜索引擎搜索... Comment[zh_TW]=搜尋… Icon=tineye.png diff --git a/src/scripts/runaction/actions/translate.desktop b/src/scripts/runaction/actions/translate.desktop index 052514972..0dfda2c1b 100644 --- a/src/scripts/runaction/actions/translate.desktop +++ b/src/scripts/runaction/actions/translate.desktop @@ -18,6 +18,7 @@ Name[sk]=Preložiť stránku Name[sv]=Översätt sida Name[uk]=Перекласти сторінку Name[x-test]=xxTranslate pagexx +Name[zh_CN]=翻译页面 Name[zh_TW]=翻譯頁面 Icon=translate.png diff --git a/src/scripts/runaction/actions/w3.desktop b/src/scripts/runaction/actions/w3.desktop index 6ca8eb63f..9c8b7a265 100644 --- a/src/scripts/runaction/actions/w3.desktop +++ b/src/scripts/runaction/actions/w3.desktop @@ -18,6 +18,7 @@ Name[sk]=Skontrolovať stránku Name[sv]=Validera sida Name[uk]=Перевірити достовірність сторінки Name[x-test]=xxValidate pagexx +Name[zh_CN]=校验页面 Name[zh_TW]=驗證頁面 Icon=w3.png diff --git a/src/scripts/runaction/actions/yandeximagesearch.desktop b/src/scripts/runaction/actions/yandeximagesearch.desktop index 532014220..54cd77a3b 100644 --- a/src/scripts/runaction/actions/yandeximagesearch.desktop +++ b/src/scripts/runaction/actions/yandeximagesearch.desktop @@ -18,6 +18,7 @@ Name[sk]=Yandex Name[sv]=Yandex Name[uk]=Яндекс Name[x-test]=xxYandexxx +Name[zh_CN]=Yandex Name[zh_TW]=Yandex Comment=Search with... Comment[ca]=Cerca amb... @@ -38,6 +39,7 @@ Comment[sk]=Hľadať s... Comment[sv]=Sök med... Comment[uk]=Шукати за допомогою… Comment[x-test]=xxSearch with...xx +Comment[zh_CN]=使用搜索引擎搜索... Comment[zh_TW]=搜尋… Icon=yandex.png diff --git a/src/scripts/runaction/metadata.desktop b/src/scripts/runaction/metadata.desktop index 576035ca4..cb8140ddc 100644 --- a/src/scripts/runaction/metadata.desktop +++ b/src/scripts/runaction/metadata.desktop @@ -17,6 +17,7 @@ Name[sk]=Spustiť akciu Name[sv]=Utför åtgärd Name[uk]=Виконати дію Name[x-test]=xxRun Actionxx +Name[zh_CN]=执行动作 Name[zh_TW]=執行動作 Comment=Run various actions on sites Comment[ca]=Executa diverses accions als llocs @@ -36,6 +37,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_CN]=在站点上运行各种动作 Comment[zh_TW]=在網站上執行各種動作 Icon=icon.svg From 232eaa54bd370de18f0ccc7fc72a1c2217e0b832 Mon Sep 17 00:00:00 2001 From: David Rosca Date: Wed, 17 Apr 2019 16:28:45 +0200 Subject: [PATCH 7/7] KDEFrameworksIntegration: Create Purpose menu in init --- .../kdeframeworksintegrationplugin.cpp | 10 +++++----- .../kdeframeworksintegrationplugin.h | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/plugins/KDEFrameworksIntegration/kdeframeworksintegrationplugin.cpp b/src/plugins/KDEFrameworksIntegration/kdeframeworksintegrationplugin.cpp index 80845806e..d05b41cb5 100644 --- a/src/plugins/KDEFrameworksIntegration/kdeframeworksintegrationplugin.cpp +++ b/src/plugins/KDEFrameworksIntegration/kdeframeworksintegrationplugin.cpp @@ -39,12 +39,7 @@ KDEFrameworksIntegrationPlugin::KDEFrameworksIntegrationPlugin() : QObject() - , m_backend(0) - , m_sharePageMenu(new Purpose::Menu()) { - m_sharePageMenu->setTitle(tr("Share page")); - m_sharePageMenu->setIcon(QIcon::fromTheme(QStringLiteral("document-share"))); - m_sharePageMenu->model()->setPluginType(QStringLiteral("ShareUrl")); } DesktopFile KDEFrameworksIntegrationPlugin::metaData() const @@ -76,6 +71,11 @@ void KDEFrameworksIntegrationPlugin::init(InitState state, const QString &settin WebPage::addSupportedScheme(protocol); } + m_sharePageMenu = new Purpose::Menu(); + m_sharePageMenu->setTitle(tr("Share page")); + m_sharePageMenu->setIcon(QIcon::fromTheme(QStringLiteral("document-share"))); + m_sharePageMenu->model()->setPluginType(QStringLiteral("ShareUrl")); + KAboutData aboutData(QSL("falkon"), QSL("Falkon"), QCoreApplication::applicationVersion()); KAboutData::setApplicationData(aboutData); diff --git a/src/plugins/KDEFrameworksIntegration/kdeframeworksintegrationplugin.h b/src/plugins/KDEFrameworksIntegration/kdeframeworksintegrationplugin.h index b108f9e54..d09038b51 100644 --- a/src/plugins/KDEFrameworksIntegration/kdeframeworksintegrationplugin.h +++ b/src/plugins/KDEFrameworksIntegration/kdeframeworksintegrationplugin.h @@ -40,7 +40,7 @@ public: void populateWebViewMenu(QMenu *menu, WebView *view, const WebHitTestResult &r) override; private: - KWalletPasswordBackend* m_backend; + KWalletPasswordBackend *m_backend = nullptr; QVector m_kioSchemeHandlers; - Purpose::Menu *m_sharePageMenu; + Purpose::Menu *m_sharePageMenu = nullptr; };