From 277003fa1d83cb7c043e7364a5ebf617bda83a3a Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Wed, 16 May 2018 07:34:51 +0200 Subject: [PATCH 1/5] 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 | 5 +++++ src/lib/adblock/metadata.desktop | 2 ++ src/lib/data/breeze-fallback/index.theme | 1 + src/plugins/AutoScroll/metadata.desktop | 2 ++ src/plugins/FlashCookieManager/metadata.desktop | 2 ++ src/plugins/GnomeKeyringPasswords/metadata.desktop | 2 ++ src/plugins/GreaseMonkey/metadata.desktop | 2 ++ src/plugins/MouseGestures/metadata.desktop | 2 ++ src/plugins/PIM/metadata.desktop | 1 + src/plugins/StatusBarIcons/metadata.desktop | 2 ++ src/plugins/TabManager/metadata.desktop | 2 ++ src/plugins/TestPlugin/metadata.desktop | 2 ++ src/plugins/VerticalTabs/metadata.desktop | 2 ++ src/scripts/hellopython/metadata.desktop | 2 ++ themes/chrome/metadata.desktop | 2 ++ themes/linux/metadata.desktop | 1 + themes/mac/metadata.desktop | 2 ++ themes/windows/metadata.desktop | 1 + 18 files changed, 35 insertions(+) diff --git a/linux/applications/org.kde.falkon.desktop b/linux/applications/org.kde.falkon.desktop index f51c48ba5..dd5ecc482 100644 --- a/linux/applications/org.kde.falkon.desktop +++ b/linux/applications/org.kde.falkon.desktop @@ -38,6 +38,7 @@ Comment[en_GB]=A fast and secure web browser Comment[es]=Un navegador web rápido y seguro Comment[fi]=Nopea ja turvallinen verkkoselain Comment[fr]=Un navigateur Web rapide et sécurisé +Comment[gl]=Un navegador rápido e seguro Comment[id]=Sebuah penelusur web yang cepat dan aman Comment[it]=Un browser web veloce e sicuro Comment[nl]=Een snelle en veilige webbrowser @@ -59,6 +60,7 @@ GenericName[en_GB]=Web Browser GenericName[es]=Navegador web GenericName[fi]=Verkkoselain GenericName[fr]=Navigateur Web +GenericName[gl]=Navegador web GenericName[id]=Penelusur Web GenericName[it]=Browser web GenericName[nl]=Webbrowser @@ -89,6 +91,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[id]=Buka tab baru Name[it]=Apri una nuova scheda Name[nl]=Nieuw tabblad openen @@ -115,6 +118,7 @@ Name[en_GB]=Open new window Name[es]=Abrir nueva ventana Name[fi]=Avaa uusi ikkuna Name[fr]=Ouvrir une nouvelle fenêtre +Name[gl]=Abrir unha xanela nova Name[id]=Buka jendela baru Name[it]=Apre una nuova finestra Name[nl]=Nieuw venster openen @@ -140,6 +144,7 @@ Name[en_GB]=Start private browsing Name[es]=Iniciar navegación privada Name[fi]=Aloita yksityisselaus Name[fr]=Démarrer la navigation privée +Name[gl]=Iniciar a navegación privada Name[id]=Mulai penelusuran privasi Name[it]=Avvia navigazione anonima Name[nl]=Privébrowsing starten diff --git a/src/lib/adblock/metadata.desktop b/src/lib/adblock/metadata.desktop index 187f40eaa..1002a0d5b 100644 --- a/src/lib/adblock/metadata.desktop +++ b/src/lib/adblock/metadata.desktop @@ -7,6 +7,7 @@ Name[da]=AdBlock Name[de]=AdBlock Name[en_GB]=AdBlock Name[es]=AdBlock +Name[gl]=Bloqueador de publicidade Name[id]=AdBlock Name[it]=Adblock Name[nl]=AdBlock @@ -25,6 +26,7 @@ Comment[da]=Blokerer uønskede webindhold Comment[de]=Blockiert unerwünschte Web-Inhalte Comment[en_GB]=Blocks unwanted web content Comment[es]=Bloquea contenido web no deseado +Comment[gl]=Bloquea contenido web non desexado Comment[id]=Memblokir konten web yang tak diinginkan Comment[it]=Blocca i contenuti web non desiderati Comment[nl]=Blokkeert niet-gewilde webinhoud diff --git a/src/lib/data/breeze-fallback/index.theme b/src/lib/data/breeze-fallback/index.theme index a2a5e311c..c63921ba4 100644 --- a/src/lib/data/breeze-fallback/index.theme +++ b/src/lib/data/breeze-fallback/index.theme @@ -35,6 +35,7 @@ Comment[en_GB]=Breeze Team Comment[es]=Equipo de Brisa Comment[fi]=Breeze-työryhmä Comment[fr]=L'équipe de Breeze +Comment[gl]=Equipo de Breeze Comment[id]=Tim Breeze Comment[it]=La squadra di Brezza Comment[nl]=Breeze-team diff --git a/src/plugins/AutoScroll/metadata.desktop b/src/plugins/AutoScroll/metadata.desktop index 33d500b0a..478fec1b7 100644 --- a/src/plugins/AutoScroll/metadata.desktop +++ b/src/plugins/AutoScroll/metadata.desktop @@ -8,6 +8,7 @@ Name[de]=Automatischer Bildlauf Name[en_GB]=AutoScroll Name[es]=Desplazamiento automático Name[fi]=Automaattivieritys +Name[gl]=Desprazamento automático Name[id]=AutoScroll Name[it]=Scorrimento automatico Name[nl]=Auto-schuiven @@ -25,6 +26,7 @@ Comment[da]=Giver understøttelse af autorul med den midterste museknap Comment[en_GB]=Provides support for autoscroll with middle mouse button Comment[es]=Implementa ell desplazamiento automático con el botón medio del ratón Comment[fi]=Tarjoaa automaattivieritystuen hiiren keskipainikkeelle +Comment[gl]=Fornece a funcionalidade de desprazamento automático co botón central Comment[id]=Menyediakan dukungan untuk gulir otomatis dengan tombol tengah mouse Comment[it]=Fornisce il supporto allo scorrimento automatico con il pulsante centrale del mouse Comment[nl]=Bied ondersteuning voor auto-schuiven met middelste muisknop diff --git a/src/plugins/FlashCookieManager/metadata.desktop b/src/plugins/FlashCookieManager/metadata.desktop index fcf083107..511afe4ce 100644 --- a/src/plugins/FlashCookieManager/metadata.desktop +++ b/src/plugins/FlashCookieManager/metadata.desktop @@ -8,6 +8,7 @@ Name[de]=Flash-Cookie-Verwaltung Name[en_GB]=Flash Cookie Manager Name[es]=Gestor de cookies de Flash Name[fi]=Flash-evästeiden hallinta +Name[gl]=Xestor de cookies flash Name[id]=Flash Cookie Manager Name[it]=Gestore dei cookie in flash Name[nl]=Cookiebeheerder van Flash @@ -25,6 +26,7 @@ Comment[da]=Du kan let vise/slette flash-cookies som er lagret på din computer. Comment[en_GB]=You can easily view/delete flash cookies stored on your computer. This is a solution for having more privacy. Comment[es]=Usted puede ver/borrar fácilmente las cookies de flash guardadas en su equipo. Esta es una solución para disponer de más confidencialidad. Comment[fi]=Voit helposti tarkastella ja poistaa tietokoneelle tallennettuja Flash-evästeitä. Ratkaisu parantaa yksityisyytesi suojaa. +Comment[gl]=Pode ver e eliminar facilmente cookies flash almacenadas no seu computador. Isto é unha solución para ter máis intimidade. Comment[id]=Kamu bisa menampilkan/menghapus cookies flash yang tersimpan pada komputermu. Ini adalah sebuah solusi untuk membuat lebih privasi. Comment[it]=Puoi vedere o cancellare in maniera semplice i cookie in flash immagazzinati nel tuo computer. È una soluzione per avere una maggior privacy. Comment[nl]=U kunt gemakkelijk cookies van flash opgeslagen op uw computer bekijken/verwijderen. Dit is een oplossing om meer privacy te hebben. diff --git a/src/plugins/GnomeKeyringPasswords/metadata.desktop b/src/plugins/GnomeKeyringPasswords/metadata.desktop index 375a0eab9..236834d69 100644 --- a/src/plugins/GnomeKeyringPasswords/metadata.desktop +++ b/src/plugins/GnomeKeyringPasswords/metadata.desktop @@ -7,6 +7,7 @@ Name[da]=Adgangskoder til Gnome-nøglering Name[en_GB]=Gnome Keyring Passwords Name[es]=Anillo de contraseñas de Gnome Name[fi]=Gnomen avainrenkaan salasankaat +Name[gl]=Contrasinais do chaveiro de Gnome Name[id]=Gnome Keyring Passwords Name[it]=Portachiavi per le chiavi di Gnome Name[nl]=GNOME-sleutelbos wachtwoorden @@ -24,6 +25,7 @@ Comment[da]=Giver understøttelse af lagring af adgangskoder i gnome-nøglring Comment[en_GB]=Provides support for storing passwords in gnome-keyring Comment[es]=Implementa el almacenamiento de contraseñas en el anillo de claves de Gnome Comment[fi]=Tarjoaa tuen salasanojen tallentamiseksi Gnomen avainrenkaaseen +Comment[gl]=Permite almacenar contrasinais en gnome-keyring Comment[id]=Menyediakan dukungan untuk menyimpan sandi dalam gnome-keyring Comment[it]=Fornisce un supporto all'immagazzinamento delle password nel portachiavi di Gnome Comment[nl]=Biedt ondersteuning voor opslaan van GNOME-sleutelbos wachtwoorden diff --git a/src/plugins/GreaseMonkey/metadata.desktop b/src/plugins/GreaseMonkey/metadata.desktop index 9c2275ac2..94f9f0b8e 100644 --- a/src/plugins/GreaseMonkey/metadata.desktop +++ b/src/plugins/GreaseMonkey/metadata.desktop @@ -9,6 +9,7 @@ Name[en_GB]=GreaseMonkey Name[es]=GreaseMonkey Name[fi]=GreaseMonkey Name[fr]=GreaseMonkey +Name[gl]=GreaseMonkey Name[id]=GreaseMonkey Name[it]=GreaseMonkey Name[nl]=GreaseMonkey @@ -27,6 +28,7 @@ Comment[en_GB]=Provides support for userscripts Comment[es]=Implementa guiones de usuario Comment[fi]=Tarjoaa käyttäjäskriptien tuen Comment[fr]=Prend en charge les scripts utilisateur. +Comment[gl]=Permite scripts de usuario Comment[id]=Menyediakan dukungan untuk skrip pengguna Comment[it]=Fornisce un supporto agli script utente Comment[nl]=Biedt ondersteuning voor scripts van gebruikers diff --git a/src/plugins/MouseGestures/metadata.desktop b/src/plugins/MouseGestures/metadata.desktop index 3b61679c2..b594c468e 100644 --- a/src/plugins/MouseGestures/metadata.desktop +++ b/src/plugins/MouseGestures/metadata.desktop @@ -8,6 +8,7 @@ Name[de]=Maus-Gesten Name[en_GB]=Mouse Gestures Name[es]=Gestos de ratón Name[fi]=Hiirieleet +Name[gl]=Xestos do rato Name[id]=Mouse Gestures Name[it]=Gesti del mouse Name[nl]=Muisgebaren @@ -24,6 +25,7 @@ Comment[da]=Giver understøttelse af navigering på websider med musebevægelser Comment[en_GB]=Provides support for navigating in webpages by mouse gestures Comment[es]=Implementa la navegación en páginas web mediante gestos de ratón Comment[fi]=Tarjoaa tuen verkkosivujen selaamiseksi hiirielein +Comment[gl]=Permite navegar por páxinas web con acenos co rato Comment[id]=Menyediakan dukungan untuk menavigasi dalam halaman web dengan pergerakan 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 diff --git a/src/plugins/PIM/metadata.desktop b/src/plugins/PIM/metadata.desktop index 8e0b77b32..c8cfd4198 100644 --- a/src/plugins/PIM/metadata.desktop +++ b/src/plugins/PIM/metadata.desktop @@ -27,6 +27,7 @@ Comment[da]=Tilføjer mulighed for at Falkon kan lagre nogle personlige data Comment[en_GB]=Adds ability for Falkon to store some personal data Comment[es]=Añade a Falkon la facultad de guardar datos personales Comment[fi]=Lisää Falkoniin kyvyn tallentaa henkilökohtaista tietoa +Comment[gl]=Permite a Falkon almacenar algúns datos persoais Comment[id]=Menambah kemampuan terhadap Falkon untuk menyimpan beberapa data pribadi Comment[it]=Aggiunge a Falkon la capacità di immagazzinare alcuni dati personali Comment[nl]=Biedt mogelijkheid voor Falkon om enige persoonlijke gegevens op te slaan diff --git a/src/plugins/StatusBarIcons/metadata.desktop b/src/plugins/StatusBarIcons/metadata.desktop index fe8039e10..c02acd1a2 100644 --- a/src/plugins/StatusBarIcons/metadata.desktop +++ b/src/plugins/StatusBarIcons/metadata.desktop @@ -8,6 +8,7 @@ Name[de]=Statusleisten-Symbole Name[en_GB]=StatusBar Icons Name[es]=Iconos de la barra de tareas Name[fi]=Tilarivin kuvakkeet +Name[gl]=Iconas da barra de estado Name[id]=Ikon BilahStatus Name[it]=Icone della barra di stato Name[nl]=Pictogrammen op de statusbalk @@ -25,6 +26,7 @@ Comment[da]=Tilføjer yderligere ikoner og zoomwidget til statuslinje Comment[en_GB]=Adds additional icons and zoom widget to statusbar Comment[es]=Añade iconos adicionales y control de zum a la barra de estado Comment[fi]=Lisää tilariville kuvakkeita ja lähennyssovelman +Comment[gl]=Engade iconas adicionais e un trebello de ampliación á barra de estado Comment[id]=Menambah tambahan ikon dan perbesaran widget untuk bilah status Comment[it]=Aggiunge alla barra di stato alcune icone aggiuntive ed uno strumento di ingrandimento Comment[nl]=Voegt extra pictogrammen en zoomwidget toe aan de statusbalk diff --git a/src/plugins/TabManager/metadata.desktop b/src/plugins/TabManager/metadata.desktop index 9e6454752..a45b05f5f 100644 --- a/src/plugins/TabManager/metadata.desktop +++ b/src/plugins/TabManager/metadata.desktop @@ -8,6 +8,7 @@ Name[de]=Unterfensterverwaltung Name[en_GB]=Tab Manager Name[es]=Gestor de pestañas Name[fi]=Välilehtien hallinta +Name[gl]=Xestor de lapelas Name[id]=Pengelola Tab Name[it]=Gestore delle schede Name[nl]=Tabbladbeheerder @@ -25,6 +26,7 @@ Comment[da]=Tilføjer mulighed for at håndtere faneblade og vinduer 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[gl]=Permite xestionar lapelas e xanelas Comment[id]=Menambah kemampuan untuk mengelola tab dan jendela Comment[it]=Aggiunge la capacità di gestione delle schede e delle finestre Comment[nl]=Voegt mogelijkheid toe om tabbladen en vensters te beheren diff --git a/src/plugins/TestPlugin/metadata.desktop b/src/plugins/TestPlugin/metadata.desktop index c5306cb3f..53c967ec2 100644 --- a/src/plugins/TestPlugin/metadata.desktop +++ b/src/plugins/TestPlugin/metadata.desktop @@ -8,6 +8,7 @@ Name[de]=Beispielmodul Name[en_GB]=Example Plugin Name[es]=Complemento de ejemplo Name[fi]=Esimerkkiliitännäinen +Name[gl]=Complemento de exemplo Name[id]=Contoh Plugin Name[it]=Estensione di esempio Name[nl]=Voorbeeld plug-in @@ -25,6 +26,7 @@ Comment[da]=Meget simpelt minimalt plugin eksempel Comment[en_GB]=Very simple minimal plugin example Comment[es]=Complemento de ejemplo mínimo, muy sencillo Comment[fi]=Hyvin yksinkertainen esimerkki minimaalisesta liitännäisestä +Comment[gl]=Exemplo de complemento mínimo moi simple Comment[id]=Contoh plugin minimal yang sangat sederhana Comment[it]=Estensione di esempio molto semplice e minimale Comment[nl]=Zeer eenvoudige minimaal voorbeeld voor plug-in diff --git a/src/plugins/VerticalTabs/metadata.desktop b/src/plugins/VerticalTabs/metadata.desktop index 6e3f53cba..ac0ec2a0f 100644 --- a/src/plugins/VerticalTabs/metadata.desktop +++ b/src/plugins/VerticalTabs/metadata.desktop @@ -8,6 +8,7 @@ Name[de]=Senkrechte Unterfenster Name[en_GB]=Vertical Tabs Name[es]=Pestañas verticales Name[fi]=Pystyvälilehdet +Name[gl]=Lapelas verticais Name[id]=Tab Tegak Name[it]=Schede verticali Name[nl]=Verticale tabbladen @@ -25,6 +26,7 @@ Comment[da]=Tilføjer mulighed for at vise faneblade i sidepanel 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[gl]=Permite mostrar lapelas 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[nl]=Voegt mogelijkheid toe om tabbladen in de zijbalk te tonen diff --git a/src/scripts/hellopython/metadata.desktop b/src/scripts/hellopython/metadata.desktop index d85cc4828..70c2007e1 100644 --- a/src/scripts/hellopython/metadata.desktop +++ b/src/scripts/hellopython/metadata.desktop @@ -6,6 +6,7 @@ Name[cs]=Hello Python Name[da]=Hallo Python Name[en_GB]=Hello Python Name[es]=Hola Python +Name[gl]=Ola, Python! Name[id]=Hello Python Name[it]=Hello Python Name[nl]=Hallo Python @@ -22,6 +23,7 @@ Comment[cs]=Ukázkové rozšíření v Pythonu Comment[da]=Eksempel Python-udvidelse Comment[en_GB]=Example Python extension Comment[es]=Ejemplo de extensión de Python +Comment[gl]=Extensión de Python de exemplo Comment[id]=Contoh ekstensi Python Comment[it]=Estensione di esempio in Python Comment[nl]=Voorbeeld Python-extensie diff --git a/themes/chrome/metadata.desktop b/themes/chrome/metadata.desktop index 24833cbdc..002191aae 100644 --- a/themes/chrome/metadata.desktop +++ b/themes/chrome/metadata.desktop @@ -8,6 +8,7 @@ Name[de]=Chrome Name[en_GB]=Chrome Name[es]=Chrome Name[fi]=Chrome +Name[gl]=Chrome Name[id]=Chrome Name[it]=Chrome Name[nl]=Chrome @@ -25,6 +26,7 @@ Comment[da]=Chrome-lignende tema til Falkon baseret på Firefox Chromifox-tema Comment[en_GB]=Chrome like theme for Falkon based on Firefox Chromifox theme Comment[es]=Tema estilo Chrome para Falkon basado en el tema Firefox Chromifox Comment[fi]=Firefoxin Chromifox-teemaan pohjautuva Chromen kaltainen Falkon-teema +Comment[gl]=Tema parecido a Chrome para Falkon baseado no tema Chromifox de Firefox Comment[id]=Tema seperti Chrome untuk Falkon berdasarkan pada tema Firefox Chromifox Comment[it]=Tema di tipo Chrome per Falkon, basato sul tema Chromifox di Firefox Comment[nl]=Op Chrome lijkend thema voor Falkon gebaseerd op Firefox Chromifox thema diff --git a/themes/linux/metadata.desktop b/themes/linux/metadata.desktop index afb7a1f92..3f01a9d34 100644 --- a/themes/linux/metadata.desktop +++ b/themes/linux/metadata.desktop @@ -26,6 +26,7 @@ Comment[da]=Standard simpelt tema til Linux som bruger systemets widgetstil og n Comment[en_GB]=Default simple theme for Linux using native widget style and some basic icons from desktop icon set Comment[es]=Tema sencillo predeterminado para Linux usando un estilo de controles nativo y algunos iconos básicos desde el conjunto de iconos de escritorio Comment[fi]=Yksinkertainen natiivia elementtityyliä käyttävä Linux-teema sekä joitakin kuvakkeita työpöytäkuvakejoukosta +Comment[gl]=Tema predeterminado simple para Linux que usa o estilo de trebellos nativo e algunhas iconas básicas do grupo de iconas do escritorio Comment[id]=Tema sederhana baku untuk Linux menggunakan gaya widget bawaan dan beberapa ikon dasar dari set ikon desktop Comment[it]=Semplice tema predefinito per Linux, che usa lo stile nativo degli oggetti ed alcune icone di base dall'insieme di icone del desktop Comment[nl]=Standaard eenvoudig thema voor Linux met inheemse widgetstijl en enige basis pictogrammen uit set pictogrammen voor bureaublad diff --git a/themes/mac/metadata.desktop b/themes/mac/metadata.desktop index 6563fea40..a74a81e6a 100644 --- a/themes/mac/metadata.desktop +++ b/themes/mac/metadata.desktop @@ -8,6 +8,7 @@ Name[de]=Mac Name[en_GB]=Mac Name[es]=Mac Name[fi]=Mac +Name[gl]=Mac Name[id]=Mac Name[it]=Mac Name[nl]=Mac @@ -25,6 +26,7 @@ Comment[da]=Mac-lignende tema til Falkon baseret på Firefox Mac OS X-tema Comment[en_GB]=Mac like theme for Falkon based on Firefox Mac OS X theme Comment[es]=Tema estilo Mac para Falkon basado en el tema Firefox Mac OS X Comment[fi]=Firefoxin Mac OS X -teemaan pohjautuva Macin kaltainen Falkon-teema +Comment[gl]=Tema parecido a Mac para Falkon baseado no tema de Mac OS X de Firefox Comment[id]=Tema seperti Mac untuk Falkon berdasarkan pada tema Firefox Mac OS X Comment[it]=Tema di tipo Mac per Falkon, basato sul tema Mac OS X di Firefox Comment[nl]=Op Mac lijkend thema voor Falkon gebaseerd op Firefox Mac OS X thema diff --git a/themes/windows/metadata.desktop b/themes/windows/metadata.desktop index e1040b99c..46d9001e5 100644 --- a/themes/windows/metadata.desktop +++ b/themes/windows/metadata.desktop @@ -26,6 +26,7 @@ Comment[da]=Windows-lignende tema baseret på Material design Comment[en_GB]=Windows like theme based on Material design Comment[es]=Tema estilo Windows basado en el diseño Material Comment[fi]=Material-designiin pohjautuva Windowsin kaltainen teema +Comment[gl]=Tema parecido a Windows baseado no deseño material Comment[id]=Tema seperti Windows berdasarkan pada desain Material Comment[it]=Tema di tipo Windows, basato sul design Material Comment[nl]=Op Windows lijkend thema gebaseerd op Material ontwerp From 1d03b5d44bb849873962119c26fd0bc0b04f1c40 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sat, 19 May 2018 08:02:14 +0200 Subject: [PATCH 2/5] 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" --- themes/windows/metadata.desktop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/themes/windows/metadata.desktop b/themes/windows/metadata.desktop index 46d9001e5..dcb7e3b0e 100644 --- a/themes/windows/metadata.desktop +++ b/themes/windows/metadata.desktop @@ -17,7 +17,7 @@ Name[pt]=Windows Name[sv]=Windows Name[uk]=Windows Name[x-test]=xxWindowsxx -Name[zh_CN]=窗口 +Name[zh_CN]=Windows Comment=Windows like theme based on Material design Comment[ca]=Tema semblant al Windows basat en el «Material design» Comment[ca@valencia]=Tema semblant al Windows basat en el «Material design» From 37a79e3ad4b44dfbde1d63e6e46994886d439417 Mon Sep 17 00:00:00 2001 From: "Tobias C. Berner" Date: Sat, 19 May 2018 13:59:24 +0200 Subject: [PATCH 3/5] Use IMPORTED_TARGET for GnomeKeyring. Summary: Otherwise we would need to append also GNOME_KEYRING_LIBRARY_DIRS to link_directories. ``` /usr/bin/ld: cannot find -lgnome-keyring c++: error: linker command failed with exit code 1 (use -v to see invocation) ninja: build stopped: subcommand failed. ``` Reviewers: #falkon, #automotive, kkofler, drosca Subscribers: falkon Tags: #falkon Differential Revision: https://phabricator.kde.org/D12980 --- CMakeLists.txt | 2 +- src/plugins/GnomeKeyringPasswords/CMakeLists.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1dd3adc7c..b3f583c4c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -100,7 +100,7 @@ find_package(PkgConfig) if (PKG_CONFIG_FOUND) option(BUILD_KEYRING "Gnome keyring password plugin" ON) if (BUILD_KEYRING) - pkg_check_modules(GNOME_KEYRING gnome-keyring-1) + pkg_check_modules(GNOME_KEYRING IMPORTED_TARGET gnome-keyring-1 ) endif() endif() diff --git a/src/plugins/GnomeKeyringPasswords/CMakeLists.txt b/src/plugins/GnomeKeyringPasswords/CMakeLists.txt index 6dd837c29..bc27ee23e 100644 --- a/src/plugins/GnomeKeyringPasswords/CMakeLists.txt +++ b/src/plugins/GnomeKeyringPasswords/CMakeLists.txt @@ -14,5 +14,5 @@ qt5_add_resources(RSCS ${GnomeKeyringPasswords_RSCS}) add_library(GnomeKeyringPasswords MODULE ${GnomeKeyringPasswords_SRCS} ${RSCS}) install(TARGETS GnomeKeyringPasswords DESTINATION ${FALKON_INSTALL_PLUGINDIR}) -target_link_libraries(GnomeKeyringPasswords ${GNOME_KEYRING_LIBRARIES} FalkonPrivate) +target_link_libraries(GnomeKeyringPasswords PkgConfig::GNOME_KEYRING FalkonPrivate) From 42f70c5252d42798af60be7d2a3b1dd50a74c1c9 Mon Sep 17 00:00:00 2001 From: David Rosca Date: Sat, 26 May 2018 20:09:39 +0200 Subject: [PATCH 4/5] Add missing config.h include for HAVE_QTWEBENGINE_5_10 define --- src/lib/webengine/webview.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/lib/webengine/webview.cpp b/src/lib/webengine/webview.cpp index 73003773d..32c288ca3 100644 --- a/src/lib/webengine/webview.cpp +++ b/src/lib/webengine/webview.cpp @@ -35,6 +35,7 @@ #include "scripts.h" #include "webhittestresult.h" #include "webscrollbarmanager.h" +#include "../config.h" #include From 7c07af64febac0ec9da0e960442c796aa50cd949 Mon Sep 17 00:00:00 2001 From: David Rosca Date: Sat, 26 May 2018 20:11:02 +0200 Subject: [PATCH 5/5] AdBlockManager: Temporarily remove url interceptor when updating matcher --- src/lib/adblock/adblockmanager.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/lib/adblock/adblockmanager.cpp b/src/lib/adblock/adblockmanager.cpp index 00d125530..490eed81e 100644 --- a/src/lib/adblock/adblockmanager.cpp +++ b/src/lib/adblock/adblockmanager.cpp @@ -359,7 +359,9 @@ void AdBlockManager::updateMatcher() { QMutexLocker locker(&m_mutex); + mApp->networkManager()->removeUrlInterceptor(m_interceptor); m_matcher->update(); + mApp->networkManager()->installUrlInterceptor(m_interceptor); } void AdBlockManager::updateAllSubscriptions()