From 3953f3e0bfbb365dcb3ca02f87654e34481b8488 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 13 Jan 2020 08:18:40 +0100 Subject: [PATCH 1/4] GIT_SILENT made messages (after extraction) --- linux/appdata/org.kde.falkon.appdata.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/linux/appdata/org.kde.falkon.appdata.xml b/linux/appdata/org.kde.falkon.appdata.xml index d0dff3765..5b08ecc54 100644 --- a/linux/appdata/org.kde.falkon.appdata.xml +++ b/linux/appdata/org.kde.falkon.appdata.xml @@ -96,7 +96,7 @@

Falkon posee todas las funciones estándares que cabría esperar de un navegador web. Incluye marcadores, historial (ambos disponibles también en una barra lateral) y pestañas. Además, puede gestionar fuentes RSS con el lector RSS que incluye, bloquear publicidad mediante un complemento integrado, bloquear contenido Flash con Click2Flash y editar la base de datos local de certificados con un gestor SSL.

Falkonissa on kaikki selaimelta odottamasi toiminnallisuus: kirjanmerkit, historia (kumpikin myös sivupalkissa) ja välilehdet. Lisäksi voit hallita RSS-syötteitäsi sisään rakennetulla RSS-lukuohjelmalla, estää mainokset sisään rakennetulla AdBlock-liitännäisellä, estää Flash-sisällön Click2Flashillä sekä muokata paikallista CA-varmennetietokantaa SSL-hallintatyökalulla.

Falkon dispose de toutes les fonctionnalités standard que l'on peut attendre d'un navigateur. Il comporte des signets, un historique (tous deux également disponibles dans la barre latérale) et des onglets. En plus de cela, vous pouvez gérer des flux RSS grâce au lecteur RSS intégré, bloquer les publicités avec le module externe AdBlock intégré, bloquer les contenus Flash avec Click2Flash et modifier la base de données de certificats CA locaux en utilisant un gestionnaire SSL.

-

Falkon ten todas as funcións estándar que esperaría dun navegador web. Inclúe marcadores, historial (ambos dispoñíbeis en barras laterais) e lapelas. Ademais, pode xestionar fontes de novas RSS cun lector de RSS incluído, bloquear anuncios cun complemento de AdBlock integrado, bloquear contido en Flash con Click2Flash e editar a base de datos local de certificados de autoridades certificadoras cun xestor de SSL.

+

Falkon ten todas as funcións estándar que esperaría dun navegador web. Inclúe marcadores, historial (ambos dispoñíbeis en barras laterais) e separadores. Ademais, pode xestionar fontes de novas RSS cun lector de RSS incluído, bloquear anuncios cun complemento de AdBlock integrado, bloquear contido en Flash con Click2Flash e editar a base de datos local de certificados de autoridades certificadoras cun xestor de SSL.

Falkon memiliki semua fungsi standar yang kamu harapkan dari penelusur web. Ini termasuk markah, histori (keduanya juga di bilah sisi) dan tab. Di samping itu, kamu bisa mengelola feed RSS dengan pembaca RSS yang disertakan, mencekal iklan dengan plugin AdBlock bawaan, mencekal konten Flash dengan Click2Flash dan mengedit database CA Certificates lokal dengan pengelola SSL.

Falkon ha tutte le funzioni standard che ti aspetteresti da un browser web. Include i segnalibri e la cronologia, entrambi anche nella barra laterale, e le schede. Puoi inoltre gestire i feed RSS con un lettore RSS incluso, bloccare sia le inserzioni con un'estensione AdBlock integrata, sia i contenuti Flash con Click2Flash, ed infine modificare la banca dati dei certificati CA con un gestore SSL.

Falkon은 웹 브라우저의 표준 기능을 포함하고 있습니다. 책갈피, 과거 기록(사이드바 지원), 탭을 지원합니다. 이외에도 내장 RSS 리더를 통한 RSS 피드 구독, AdBlock 플러그인으로 광고 차단, Click2Flash로 플래시 콘텐츠 차단, SSL 관리자로 로컬 CA 인증서 편집 등을 지원합니다.

From 50c2cebdd6c43b9686542e1f5b03b1da36070d9c Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 13 Jan 2020 09:36:25 +0100 Subject: [PATCH 2/4] 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" --- linux/applications/org.kde.falkon.desktop | 2 +- src/plugins/TabManager/metadata.desktop | 4 ++-- src/plugins/VerticalTabs/metadata.desktop | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/linux/applications/org.kde.falkon.desktop b/linux/applications/org.kde.falkon.desktop index 7f12acc63..dd2f4a900 100644 --- a/linux/applications/org.kde.falkon.desktop +++ b/linux/applications/org.kde.falkon.desktop @@ -103,7 +103,7 @@ Name[en_GB]=Open new tab Name[es]=Abrir nueva pestaña Name[fi]=Avaa uusi välilehti Name[fr]=Ouvrir un nouvel onglet -Name[gl]=Abrir unha lapela nova +Name[gl]=Abrir un novo separador Name[id]=Buka tab baru Name[it]=Apri una nuova scheda Name[ko]=새 탭 열기 diff --git a/src/plugins/TabManager/metadata.desktop b/src/plugins/TabManager/metadata.desktop index 10241b59f..1c13d3981 100644 --- a/src/plugins/TabManager/metadata.desktop +++ b/src/plugins/TabManager/metadata.desktop @@ -9,7 +9,7 @@ Name[en_GB]=Tab Manager Name[es]=Gestor de pestañas Name[fi]=Välilehtien hallinta Name[fr]=Gestionnaire d'onglets -Name[gl]=Xestor de lapelas +Name[gl]=Xestor de separadores Name[id]=Tab Manager Name[it]=Gestore delle schede Name[ko]=탭 관리자 @@ -34,7 +34,7 @@ Comment[en_GB]=Adds ability to managing tabs and windows Comment[es]=Añade la posibilidad de gestionar pestañas y ventanas Comment[fi]=Lisää kyvyn hallita välilehtiä ja ikkunoita Comment[fr]=Ajout d'une capacité de gestion des onglets et des fenêtres -Comment[gl]=Engade a posibilidade de xestionar lapelas e xanelas +Comment[gl]=Permite xestionar separadores e xanelas Comment[id]=Menambah kemampuan untuk mengelola tab dan window Comment[it]=Aggiunge la capacità di gestione delle schede e delle finestre Comment[ko]=탭과 창 관리 기능 diff --git a/src/plugins/VerticalTabs/metadata.desktop b/src/plugins/VerticalTabs/metadata.desktop index c8ad6c4a0..4bef23213 100644 --- a/src/plugins/VerticalTabs/metadata.desktop +++ b/src/plugins/VerticalTabs/metadata.desktop @@ -9,7 +9,7 @@ Name[en_GB]=Vertical Tabs Name[es]=Pestañas verticales Name[fi]=Pystyvälilehdet Name[fr]=Onglets verticaux -Name[gl]=Lapelas verticais +Name[gl]=Separadores verticais Name[id]=Vertical Tabs Name[it]=Schede verticali Name[ko]=수직 탭 @@ -34,7 +34,7 @@ Comment[en_GB]=Adds ability to show tabs in sidebar Comment[es]=Añade la posibilidad de mostrar pestañas en la barra lateral Comment[fi]=Lisää kyvyn näyttää välilehdet sivupalkissa Comment[fr]=Prise en charge de l'affichage des onglets dans le panneau latéral -Comment[gl]=Engade a posibilidade de mostrar lapelas na barra lateral +Comment[gl]=Permite mostrar separadores na barra lateral Comment[id]=Menambah kemampuan untuk menampilkan tab dalam bilah sisi Comment[it]=Aggiunge la capacità di mostrare le schede nella barra laterale Comment[ko]=사이드바에 탭 표시 From b577df44665e1351826d7b24c51f2078af529632 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Wed, 12 Feb 2020 10:08:15 +0100 Subject: [PATCH 3/4] 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 e9e3fefeb..f7160b25c 100644 --- a/src/plugins/KDEFrameworksIntegration/metadata.desktop +++ b/src/plugins/KDEFrameworksIntegration/metadata.desktop @@ -3,6 +3,7 @@ Name=KDE Frameworks Integration Name[ca]=Integració amb els Frameworks del KDE Name[ca@valencia]=Integració amb els Frameworks del KDE Name[cs]=Integrace KDE Frameworks +Name[da]=Integration med KDE Frameworks Name[de]=KDE-Frameworks-Integration Name[en_GB]=KDE Frameworks Integration Name[es]=Integración con la infraestructura de KDE @@ -27,6 +28,7 @@ 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 Comment[cs]=Poskytuje podporu pro KIO a ukládání hesel v Kwallet +Comment[da]=Giver understøttelse af KIO og lagring af adgangskoder i KWallet Comment[de]=Unterstützung für KIO und die Speicherung von Passwörtern in KWallet Comment[en_GB]=Provides support for KIO and storing passwords in KWallet Comment[es]=Implementa KIO y almacenamiento de contraseñas en KWallet diff --git a/src/scripts/helloqml/metadata.desktop b/src/scripts/helloqml/metadata.desktop index 289d67b68..8343b94c5 100644 --- a/src/scripts/helloqml/metadata.desktop +++ b/src/scripts/helloqml/metadata.desktop @@ -3,6 +3,7 @@ Name=Hello Qml Name[ca]=Hola QML Name[ca@valencia]=Hola QML Name[cs]=Ahoj QML +Name[da]=Hello Qml Name[de]=Hallo QML Name[en_GB]=Hello QML Name[es]=Hola Qml @@ -27,6 +28,7 @@ Comment=Sample Qml Plugin Comment[ca]=Connector QML d'exemple Comment[ca@valencia]=Connector QML d'exemple Comment[cs]=Ukázkový modul QML +Comment[da]=Eksempel på Qml-plugin Comment[de]=Beispielmodul in Qml Comment[en_GB]=Sample QML Plugin Comment[es]=Complemento de ejemplo de Qml diff --git a/src/scripts/middleclickloader/metadata.desktop b/src/scripts/middleclickloader/metadata.desktop index 840d01525..0a0861c56 100644 --- a/src/scripts/middleclickloader/metadata.desktop +++ b/src/scripts/middleclickloader/metadata.desktop @@ -3,6 +3,7 @@ Name=MiddleClickLoader Name[ca]=MiddleClickLoader Name[ca@valencia]=MiddleClickLoader Name[cs]=Načtení prostředním tlačítkem myši +Name[da]=MidterKlikIndlæsning Name[de]=Mittelklick-Lader Name[en_GB]=MiddleClickLoader Name[es]=Cargador de clic central @@ -27,6 +28,7 @@ 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 Comment[cs]=Načíst text ve schránce výběru jako URL +Comment[da]=Indlæs tekst i markeringsudklipsholder som URL Comment[de]=Text in der Auswahl der Zwischenablage als URL laden Comment[en_GB]=Load text in selection clipboard as URL Comment[es]=Cargar texto seleccionado en el portapapeles como URL diff --git a/src/scripts/runaction/actions/dictionary.desktop b/src/scripts/runaction/actions/dictionary.desktop index 82bcd9e15..2b32b52d1 100644 --- a/src/scripts/runaction/actions/dictionary.desktop +++ b/src/scripts/runaction/actions/dictionary.desktop @@ -3,6 +3,7 @@ Name=Dictionary Name[ca]=Diccionari Name[ca@valencia]=Diccionari Name[cs]=Slovník +Name[da]=Ordbog Name[de]=Wörterbuch Name[en_GB]=Dictionary Name[es]=Diccionario diff --git a/src/scripts/runaction/actions/googleimagesearch.desktop b/src/scripts/runaction/actions/googleimagesearch.desktop index 6cc0617e0..81f04eaa4 100644 --- a/src/scripts/runaction/actions/googleimagesearch.desktop +++ b/src/scripts/runaction/actions/googleimagesearch.desktop @@ -3,6 +3,7 @@ Name=Google Name[ca]=Google Name[ca@valencia]=Google Name[cs]=Google +Name[da]=Google Name[de]=Google Name[en_GB]=Google Name[es]=Google @@ -27,6 +28,7 @@ Comment=Search with... Comment[ca]=Cerca amb... Comment[ca@valencia]=Cerca amb... Comment[cs]=Hledat pomocí... +Comment[da]=Søg med... Comment[de]=Suchen mit ... Comment[en_GB]=Search with... Comment[es]=Buscar con... diff --git a/src/scripts/runaction/actions/mpv.desktop b/src/scripts/runaction/actions/mpv.desktop index 6a2654281..89dd907ee 100644 --- a/src/scripts/runaction/actions/mpv.desktop +++ b/src/scripts/runaction/actions/mpv.desktop @@ -3,6 +3,7 @@ Name=Open with mpv Name[ca]=Obre amb el «mpv» Name[ca@valencia]=Obri amb el «mpv» Name[cs]=Otevřít pomocí mpv +Name[da]=Åbn med mpv Name[de]=Mit mpv öffnen Name[en_GB]=Open with mpv Name[es]=Abrir con mpv diff --git a/src/scripts/runaction/actions/tineyeimagesearch.desktop b/src/scripts/runaction/actions/tineyeimagesearch.desktop index dc83e433e..207473168 100644 --- a/src/scripts/runaction/actions/tineyeimagesearch.desktop +++ b/src/scripts/runaction/actions/tineyeimagesearch.desktop @@ -3,6 +3,7 @@ Name=TinEye Name[ca]=TinEye Name[ca@valencia]=TinEye Name[cs]=TinEye +Name[da]=TinEye Name[de]=TinEye Name[en_GB]=TinEye Name[es]=TinEye @@ -27,6 +28,7 @@ Comment=Search with... Comment[ca]=Cerca amb... Comment[ca@valencia]=Cerca amb... Comment[cs]=Hledat pomocí... +Comment[da]=Søg med... Comment[de]=Suchen mit ... Comment[en_GB]=Search with... Comment[es]=Buscar con... diff --git a/src/scripts/runaction/actions/translate.desktop b/src/scripts/runaction/actions/translate.desktop index 3390997be..76c898226 100644 --- a/src/scripts/runaction/actions/translate.desktop +++ b/src/scripts/runaction/actions/translate.desktop @@ -3,6 +3,7 @@ Name=Translate page Name[ca]=Tradueix la pàgina Name[ca@valencia]=Tradueix la pàgina Name[cs]=Přeložit stránku +Name[da]=Oversæt side Name[de]=Seite übersetzen Name[en_GB]=Translate page Name[es]=Traducir página diff --git a/src/scripts/runaction/actions/w3.desktop b/src/scripts/runaction/actions/w3.desktop index 89460541c..cd909d886 100644 --- a/src/scripts/runaction/actions/w3.desktop +++ b/src/scripts/runaction/actions/w3.desktop @@ -3,6 +3,7 @@ Name=Validate page Name[ca]=Valida la pàgina Name[ca@valencia]=Valida la pàgina Name[cs]=Ověřit stránku +Name[da]=Validér side Name[de]=Seite überprüfen Name[en_GB]=Validate page Name[es]=Validar página diff --git a/src/scripts/runaction/actions/yandeximagesearch.desktop b/src/scripts/runaction/actions/yandeximagesearch.desktop index 27a5c2ec7..d988662c7 100644 --- a/src/scripts/runaction/actions/yandeximagesearch.desktop +++ b/src/scripts/runaction/actions/yandeximagesearch.desktop @@ -3,6 +3,7 @@ Name=Yandex Name[ca]=Yandex Name[ca@valencia]=Yandex Name[cs]=Yandex +Name[da]=Yandex Name[de]=Yandex Name[en_GB]=Yandex Name[es]=Yandex @@ -27,6 +28,7 @@ Comment=Search with... Comment[ca]=Cerca amb... Comment[ca@valencia]=Cerca amb... Comment[cs]=Hledat pomocí... +Comment[da]=Søg med... Comment[de]=Suchen mit ... Comment[en_GB]=Search with... Comment[es]=Buscar con... diff --git a/src/scripts/runaction/metadata.desktop b/src/scripts/runaction/metadata.desktop index 27f55d369..57d115228 100644 --- a/src/scripts/runaction/metadata.desktop +++ b/src/scripts/runaction/metadata.desktop @@ -3,6 +3,7 @@ Name=Run Action Name[ca]=Executa una acció Name[ca@valencia]=Executa una acció Name[cs]=Spustit činnost +Name[da]=Kør handling Name[de]=Aktion ausführen Name[en_GB]=Run Action Name[es]=Ejecutar acción @@ -27,6 +28,7 @@ Comment=Run various actions on sites Comment[ca]=Executa diverses accions als llocs Comment[ca@valencia]=Executa diverses accions als llocs Comment[cs]=Spouštět různé činnosti na stránkách +Comment[da]=Kør diverse handlinger på sider Comment[de]=Verschiedene Aktionen auf Webseiten ausführen Comment[en_GB]=Run various actions on sites Comment[es]=Ejecutar varias acciones en sitios From 2ca83509dbc72dfdfa9cc7103c2b29db31e07f3a Mon Sep 17 00:00:00 2001 From: Heiko Becker Date: Sun, 29 Mar 2020 12:53:00 +0200 Subject: [PATCH 4/4] Fix build with Qt 5.15 QPainterPath is no longer included via qtransform.h (since 5.15.0-beta2, 50d2acdc93b4de2ba56eb67787e2bdcb21dd4bea in qtbase.git). --- src/lib/tools/qztools.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/lib/tools/qztools.cpp b/src/lib/tools/qztools.cpp index 499b22503..04f19b715 100644 --- a/src/lib/tools/qztools.cpp +++ b/src/lib/tools/qztools.cpp @@ -25,6 +25,7 @@ #include #include #include +#include #include #include #include