From 5ba2dce127aa417d483e2b2ebfe983b681380b3d Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Tue, 29 May 2018 07:28:55 +0200 Subject: [PATCH 01/10] 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/ImageFinder/metadata.desktop | 2 ++ src/plugins/KWalletPasswords/metadata.desktop | 2 ++ 2 files changed, 4 insertions(+) diff --git a/src/plugins/ImageFinder/metadata.desktop b/src/plugins/ImageFinder/metadata.desktop index 369e181eb..4f50989bf 100644 --- a/src/plugins/ImageFinder/metadata.desktop +++ b/src/plugins/ImageFinder/metadata.desktop @@ -3,6 +3,7 @@ Name=ImageFinder Name[ca]=ImageFinder Name[ca@valencia]=ImageFinder Name[cs]=ImageFinder +Name[da]=ImageFinder Name[de]=Bildersuche Name[en_GB]=ImageFinder Name[es]=Buscador de imágenes @@ -19,6 +20,7 @@ Comment=Provides context menu with reverse image search engine support Comment[ca]=Proporciona un menú contextual amb suport pel motor de cerca inversa d'imatges Comment[ca@valencia]=Proporciona un menú contextual amb suport pel motor de cerca inversa d'imatges Comment[cs]=Poskytuje kontextovou nabídku pro nástroj pro vyhledávání obrázků +Comment[da]=Giver genvejsmenu med understøttelse af omvendt billedsøgetjeneste Comment[en_GB]=Provides context menu with reverse image search engine support Comment[es]=Proporciona un menú de contexto con implementación de búsqueda inversa de imágenes Comment[fi]=Tarjoaa kontekstivalikon käänteisen kuvahaun tuen moottorille diff --git a/src/plugins/KWalletPasswords/metadata.desktop b/src/plugins/KWalletPasswords/metadata.desktop index 66eefc016..52f6d10dd 100644 --- a/src/plugins/KWalletPasswords/metadata.desktop +++ b/src/plugins/KWalletPasswords/metadata.desktop @@ -3,6 +3,7 @@ Name=KWallet Passwords Name[ca]=Contrasenyes del KWallet Name[ca@valencia]=Contrasenyes del KWallet Name[cs]=Hesla Kwallet +Name[da]=Adgangskoder til KWallet Name[de]=KWallet-Passwörter Name[en_GB]=KWallet Passwords Name[es]=Contraseñas de KWallet @@ -19,6 +20,7 @@ Comment=Provides support for storing passwords in KWallet Comment[ca]=Proporciona suport per emmagatzemar contrasenyes al KWallet Comment[ca@valencia]=Proporciona suport per emmagatzemar contrasenyes al KWallet Comment[cs]=Poskytuje podporu pro ukládání hesel v Kwallet +Comment[da]=Giver understøttelse til lagring af adgangskoder i KWallet Comment[en_GB]=Provides support for storing passwords in KWallet Comment[es]=Implementa el almacenamiento de contraseñas en KWallet Comment[id]=Menyediakan dukungan untuk menyimpan sandi dalam KWallet From 35d8f25fd4a1e3f8490a0288799ac1f98341a82a Mon Sep 17 00:00:00 2001 From: David Rosca Date: Fri, 1 Jun 2018 12:57:44 +0200 Subject: [PATCH 02/10] GreaseMonkey: Return undefined when value was not found in GM_getValue --- src/plugins/GreaseMonkey/data/values.js | 2 +- src/plugins/GreaseMonkey/data/values.min.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/plugins/GreaseMonkey/data/values.js b/src/plugins/GreaseMonkey/data/values.js index e7a6756fe..f035a062a 100644 --- a/src/plugins/GreaseMonkey/data/values.js +++ b/src/plugins/GreaseMonkey/data/values.js @@ -8,7 +8,7 @@ function GM_deleteValue(aKey) { function GM_getValue(aKey, aDefault) { var val = localStorage.getItem("%1" + aKey) - if (null === val && 'undefined' != typeof aDefault) return aDefault; + if (null === val) return aDefault; return val; } diff --git a/src/plugins/GreaseMonkey/data/values.min.js b/src/plugins/GreaseMonkey/data/values.min.js index a26504911..a69b4c7db 100644 --- a/src/plugins/GreaseMonkey/data/values.min.js +++ b/src/plugins/GreaseMonkey/data/values.min.js @@ -1,4 +1,4 @@ -function GM_deleteValue(a){localStorage.removeItem("%1"+a)}function GM_getValue(a,b){var c=localStorage.getItem("%1"+a);return null===c&&"undefined"!=typeof b?b:c}function GM_listValues(){for(var a=[],b=0;b Date: Sat, 2 Jun 2018 05:39:44 +0200 Subject: [PATCH 03/10] 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 | 3 ++- src/plugins/TabManager/metadata.desktop | 1 + src/plugins/TestPlugin/metadata.desktop | 1 + src/scripts/hellopython/metadata.desktop | 2 ++ themes/chrome/metadata.desktop | 1 + themes/mac/metadata.desktop | 1 + themes/windows/metadata.desktop | 1 + 7 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/plugins/MouseGestures/metadata.desktop b/src/plugins/MouseGestures/metadata.desktop index b594c468e..43f12c36c 100644 --- a/src/plugins/MouseGestures/metadata.desktop +++ b/src/plugins/MouseGestures/metadata.desktop @@ -4,7 +4,7 @@ Name[ca]=Gestos del ratolí Name[ca@valencia]=Gestos del ratolí Name[cs]=Gesta myší Name[da]=Musebevægelser -Name[de]=Maus-Gesten +Name[de]=Mausgesten Name[en_GB]=Mouse Gestures Name[es]=Gestos de ratón Name[fi]=Hiirieleet @@ -22,6 +22,7 @@ Comment[ca]=Proporciona suport per navegar per les pàgines web amb gestos del r Comment[ca@valencia]=Proporciona suport per navegar per les pàgines web amb gestos del ratolí Comment[cs]=Poskytuje podporu pro procházení webových stránek pomocí gest myší Comment[da]=Giver understøttelse af navigering på websider med musebevægelser +Comment[de]=Unterstützung für die Navigation auf Webseiten durch Mausgesten 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 diff --git a/src/plugins/TabManager/metadata.desktop b/src/plugins/TabManager/metadata.desktop index a45b05f5f..4e5421d2b 100644 --- a/src/plugins/TabManager/metadata.desktop +++ b/src/plugins/TabManager/metadata.desktop @@ -23,6 +23,7 @@ Comment[ca]=Afegeix la possibilitat de gestionar pestanyes i finestres Comment[ca@valencia]=Afig la possibilitat de gestionar pestanyes i finestres Comment[cs]=Přidává schopnost správy karet a oken Comment[da]=Tilføjer mulighed for at håndtere faneblade og vinduer +Comment[de]=Verwaltung von Unterfenstern und Fenstern 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 diff --git a/src/plugins/TestPlugin/metadata.desktop b/src/plugins/TestPlugin/metadata.desktop index 53c967ec2..123c699fd 100644 --- a/src/plugins/TestPlugin/metadata.desktop +++ b/src/plugins/TestPlugin/metadata.desktop @@ -23,6 +23,7 @@ Comment[ca]=Exemple molt senzill de connector mínim Comment[ca@valencia]=Exemple molt senzill de connector mínim Comment[cs]=Jednoduchá ukázka modulu Comment[da]=Meget simpelt minimalt plugin eksempel +Comment[de]=Einfaches minimales Beispielmodul 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ä diff --git a/src/scripts/hellopython/metadata.desktop b/src/scripts/hellopython/metadata.desktop index 70c2007e1..56f2d2573 100644 --- a/src/scripts/hellopython/metadata.desktop +++ b/src/scripts/hellopython/metadata.desktop @@ -4,6 +4,7 @@ Name[ca]=Hola Python Name[ca@valencia]=Hola Python Name[cs]=Hello Python Name[da]=Hallo Python +Name[de]=Hallo-Python Name[en_GB]=Hello Python Name[es]=Hola Python Name[gl]=Ola, Python! @@ -21,6 +22,7 @@ Comment[ca]=Exemple d'una extensió en Python Comment[ca@valencia]=Exemple d'una extensió en Python Comment[cs]=Ukázkové rozšíření v Pythonu Comment[da]=Eksempel Python-udvidelse +Comment[de]=Beispiel eines Python-Moduls Comment[en_GB]=Example Python extension Comment[es]=Ejemplo de extensión de Python Comment[gl]=Extensión de Python de exemplo diff --git a/themes/chrome/metadata.desktop b/themes/chrome/metadata.desktop index 002191aae..aaa423272 100644 --- a/themes/chrome/metadata.desktop +++ b/themes/chrome/metadata.desktop @@ -23,6 +23,7 @@ Comment[ca]=Tema semblant al Chrome pel Falkon basat en el tema Chromifox del Fi Comment[ca@valencia]=Tema semblant al Chrome pel Falkon basat en el tema Chromifox del Firefox Comment[cs]=Motiv pro Falkon podobný Chrome založený na motivu Firefox Chromifox Comment[da]=Chrome-lignende tema til Falkon baseret på Firefox Chromifox-tema +Comment[de]=Chrome ähnliches Design für Falkon auf der Basis des Chromifox-Designs von Firefox 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 diff --git a/themes/mac/metadata.desktop b/themes/mac/metadata.desktop index a74a81e6a..21276a8df 100644 --- a/themes/mac/metadata.desktop +++ b/themes/mac/metadata.desktop @@ -23,6 +23,7 @@ Comment[ca]=Tema semblant al Mac pel Falkon basat en el tema Mac OS X del Firefo Comment[ca@valencia]=Tema semblant al Mac pel Falkon basat en el tema Mac OS X del Firefox Comment[cs]=Motiv pro Falkon podobný Macu založený na motivu Firefox Mac OS X Comment[da]=Mac-lignende tema til Falkon baseret på Firefox Mac OS X-tema +Comment[de]=Mac ähnliches Design für Falkon auf der Basis des „Mac OS X“-Designs von Firefox 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 diff --git a/themes/windows/metadata.desktop b/themes/windows/metadata.desktop index dcb7e3b0e..28bc588ee 100644 --- a/themes/windows/metadata.desktop +++ b/themes/windows/metadata.desktop @@ -23,6 +23,7 @@ Comment[ca]=Tema semblant al Windows basat en el «Material design» Comment[ca@valencia]=Tema semblant al Windows basat en el «Material design» Comment[cs]=Motiv podobný Windows založený na designu Material Comment[da]=Windows-lignende tema baseret på Material design +Comment[de]=Windows ähnliches Design auf der Basis des Designs Material 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 From f1fdfa57aba6f382bc62f66ee83b2bab7cae69ad Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sat, 2 Jun 2018 07:40:51 +0200 Subject: [PATCH 04/10] 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/KWalletPasswords/metadata.desktop | 1 + src/plugins/MouseGestures/metadata.desktop | 3 ++- src/plugins/TabManager/metadata.desktop | 1 + src/plugins/TestPlugin/metadata.desktop | 1 + src/scripts/hellopython/metadata.desktop | 2 ++ themes/chrome/metadata.desktop | 1 + themes/mac/metadata.desktop | 1 + themes/windows/metadata.desktop | 1 + 8 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/plugins/KWalletPasswords/metadata.desktop b/src/plugins/KWalletPasswords/metadata.desktop index 52f6d10dd..82bdfd0e9 100644 --- a/src/plugins/KWalletPasswords/metadata.desktop +++ b/src/plugins/KWalletPasswords/metadata.desktop @@ -21,6 +21,7 @@ Comment[ca]=Proporciona suport per emmagatzemar contrasenyes al KWallet Comment[ca@valencia]=Proporciona suport per emmagatzemar contrasenyes al KWallet Comment[cs]=Poskytuje podporu pro ukládání hesel v Kwallet Comment[da]=Giver understøttelse til lagring af adgangskoder i KWallet +Comment[de]=Unterstützung für die Speicherung von Passwörtern in KWallet Comment[en_GB]=Provides support for storing passwords in KWallet Comment[es]=Implementa el almacenamiento de contraseñas en KWallet Comment[id]=Menyediakan dukungan untuk menyimpan sandi dalam KWallet diff --git a/src/plugins/MouseGestures/metadata.desktop b/src/plugins/MouseGestures/metadata.desktop index b594c468e..43f12c36c 100644 --- a/src/plugins/MouseGestures/metadata.desktop +++ b/src/plugins/MouseGestures/metadata.desktop @@ -4,7 +4,7 @@ Name[ca]=Gestos del ratolí Name[ca@valencia]=Gestos del ratolí Name[cs]=Gesta myší Name[da]=Musebevægelser -Name[de]=Maus-Gesten +Name[de]=Mausgesten Name[en_GB]=Mouse Gestures Name[es]=Gestos de ratón Name[fi]=Hiirieleet @@ -22,6 +22,7 @@ Comment[ca]=Proporciona suport per navegar per les pàgines web amb gestos del r Comment[ca@valencia]=Proporciona suport per navegar per les pàgines web amb gestos del ratolí Comment[cs]=Poskytuje podporu pro procházení webových stránek pomocí gest myší Comment[da]=Giver understøttelse af navigering på websider med musebevægelser +Comment[de]=Unterstützung für die Navigation auf Webseiten durch Mausgesten 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 diff --git a/src/plugins/TabManager/metadata.desktop b/src/plugins/TabManager/metadata.desktop index a45b05f5f..4e5421d2b 100644 --- a/src/plugins/TabManager/metadata.desktop +++ b/src/plugins/TabManager/metadata.desktop @@ -23,6 +23,7 @@ Comment[ca]=Afegeix la possibilitat de gestionar pestanyes i finestres Comment[ca@valencia]=Afig la possibilitat de gestionar pestanyes i finestres Comment[cs]=Přidává schopnost správy karet a oken Comment[da]=Tilføjer mulighed for at håndtere faneblade og vinduer +Comment[de]=Verwaltung von Unterfenstern und Fenstern 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 diff --git a/src/plugins/TestPlugin/metadata.desktop b/src/plugins/TestPlugin/metadata.desktop index 53c967ec2..123c699fd 100644 --- a/src/plugins/TestPlugin/metadata.desktop +++ b/src/plugins/TestPlugin/metadata.desktop @@ -23,6 +23,7 @@ Comment[ca]=Exemple molt senzill de connector mínim Comment[ca@valencia]=Exemple molt senzill de connector mínim Comment[cs]=Jednoduchá ukázka modulu Comment[da]=Meget simpelt minimalt plugin eksempel +Comment[de]=Einfaches minimales Beispielmodul 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ä diff --git a/src/scripts/hellopython/metadata.desktop b/src/scripts/hellopython/metadata.desktop index 70c2007e1..56f2d2573 100644 --- a/src/scripts/hellopython/metadata.desktop +++ b/src/scripts/hellopython/metadata.desktop @@ -4,6 +4,7 @@ Name[ca]=Hola Python Name[ca@valencia]=Hola Python Name[cs]=Hello Python Name[da]=Hallo Python +Name[de]=Hallo-Python Name[en_GB]=Hello Python Name[es]=Hola Python Name[gl]=Ola, Python! @@ -21,6 +22,7 @@ Comment[ca]=Exemple d'una extensió en Python Comment[ca@valencia]=Exemple d'una extensió en Python Comment[cs]=Ukázkové rozšíření v Pythonu Comment[da]=Eksempel Python-udvidelse +Comment[de]=Beispiel eines Python-Moduls Comment[en_GB]=Example Python extension Comment[es]=Ejemplo de extensión de Python Comment[gl]=Extensión de Python de exemplo diff --git a/themes/chrome/metadata.desktop b/themes/chrome/metadata.desktop index 002191aae..aaa423272 100644 --- a/themes/chrome/metadata.desktop +++ b/themes/chrome/metadata.desktop @@ -23,6 +23,7 @@ Comment[ca]=Tema semblant al Chrome pel Falkon basat en el tema Chromifox del Fi Comment[ca@valencia]=Tema semblant al Chrome pel Falkon basat en el tema Chromifox del Firefox Comment[cs]=Motiv pro Falkon podobný Chrome založený na motivu Firefox Chromifox Comment[da]=Chrome-lignende tema til Falkon baseret på Firefox Chromifox-tema +Comment[de]=Chrome ähnliches Design für Falkon auf der Basis des Chromifox-Designs von Firefox 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 diff --git a/themes/mac/metadata.desktop b/themes/mac/metadata.desktop index a74a81e6a..21276a8df 100644 --- a/themes/mac/metadata.desktop +++ b/themes/mac/metadata.desktop @@ -23,6 +23,7 @@ Comment[ca]=Tema semblant al Mac pel Falkon basat en el tema Mac OS X del Firefo Comment[ca@valencia]=Tema semblant al Mac pel Falkon basat en el tema Mac OS X del Firefox Comment[cs]=Motiv pro Falkon podobný Macu založený na motivu Firefox Mac OS X Comment[da]=Mac-lignende tema til Falkon baseret på Firefox Mac OS X-tema +Comment[de]=Mac ähnliches Design für Falkon auf der Basis des „Mac OS X“-Designs von Firefox 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 diff --git a/themes/windows/metadata.desktop b/themes/windows/metadata.desktop index dcb7e3b0e..28bc588ee 100644 --- a/themes/windows/metadata.desktop +++ b/themes/windows/metadata.desktop @@ -23,6 +23,7 @@ Comment[ca]=Tema semblant al Windows basat en el «Material design» Comment[ca@valencia]=Tema semblant al Windows basat en el «Material design» Comment[cs]=Motiv podobný Windows založený na designu Material Comment[da]=Windows-lignende tema baseret på Material design +Comment[de]=Windows ähnliches Design auf der Basis des Designs Material 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 From 0c30443e84ef648fe565d835ca64f577158d989b Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Wed, 6 Jun 2018 05:35:48 +0200 Subject: [PATCH 05/10] 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/lib/adblock/metadata.desktop | 2 ++ 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/KDEFrameworksIntegration/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 ++ src/scripts/runaction/actions/googleimagesearch.desktop | 1 + 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 ++ themes/chrome/metadata.desktop | 2 ++ themes/linux/metadata.desktop | 2 ++ themes/mac/metadata.desktop | 2 ++ themes/windows/metadata.desktop | 2 ++ 24 files changed, 42 insertions(+), 1 deletion(-) diff --git a/src/lib/adblock/metadata.desktop b/src/lib/adblock/metadata.desktop index 6d8967639..0169709ac 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[fr]=AdBlock Name[gl]=Bloqueador de publicidade Name[id]=AdBlock Name[it]=Adblock @@ -26,6 +27,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[fr]=Blocage des contenus Web indésirables Comment[gl]=Bloquea contenido web non desexado Comment[id]=Memblokir konten web yang tak diinginkan Comment[it]=Blocca i contenuti web non desiderati diff --git a/src/plugins/AutoScroll/metadata.desktop b/src/plugins/AutoScroll/metadata.desktop index 478fec1b7..3201c8870 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[fr]=AutoScroll Name[gl]=Desprazamento automático Name[id]=AutoScroll Name[it]=Scorrimento automatico @@ -26,6 +27,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[fr]=Prise en charge du défilement automatique à l'aide du bouton central de la souris 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 diff --git a/src/plugins/FlashCookieManager/metadata.desktop b/src/plugins/FlashCookieManager/metadata.desktop index 511afe4ce..87d5d861d 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[fr]=Gestionnaire de cookies Flash Name[gl]=Xestor de cookies flash Name[id]=Flash Cookie Manager Name[it]=Gestore dei cookie in flash @@ -26,6 +27,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[fr]=Affichage et suppression facile des cookies stockés sur votre ordinateur. Une solution idéale pour gérer votre confidentialité. 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. diff --git a/src/plugins/GnomeKeyringPasswords/metadata.desktop b/src/plugins/GnomeKeyringPasswords/metadata.desktop index 236834d69..72224436f 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[fr]=Trousseau de clés de GNOME Name[gl]=Contrasinais do chaveiro de Gnome Name[id]=Gnome Keyring Passwords Name[it]=Portachiavi per le chiavi di Gnome @@ -25,6 +26,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[fr]=Prise en charge de l'enregistrement de mots de passe au sein de gnome-keyring 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 diff --git a/src/plugins/GreaseMonkey/metadata.desktop b/src/plugins/GreaseMonkey/metadata.desktop index 94f9f0b8e..248043615 100644 --- a/src/plugins/GreaseMonkey/metadata.desktop +++ b/src/plugins/GreaseMonkey/metadata.desktop @@ -27,7 +27,7 @@ Comment[da]=Giver understøttelse af brugerscripts 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[fr]=Prise en charge des scripts utilisateur. Comment[gl]=Permite scripts de usuario Comment[id]=Menyediakan dukungan untuk skrip pengguna Comment[it]=Fornisce un supporto agli script utente diff --git a/src/plugins/KDEFrameworksIntegration/metadata.desktop b/src/plugins/KDEFrameworksIntegration/metadata.desktop index b31f55ae4..1915d311b 100644 --- a/src/plugins/KDEFrameworksIntegration/metadata.desktop +++ b/src/plugins/KDEFrameworksIntegration/metadata.desktop @@ -6,6 +6,7 @@ Name[cs]=Integrace KDE Frameworks Name[da]=KDE Frameworks integration Name[en_GB]=KDE Frameworks Integration 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 @@ -21,6 +22,7 @@ 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[en_GB]=Provides support for KIO and storing passwords in KWallet 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 diff --git a/src/plugins/MouseGestures/metadata.desktop b/src/plugins/MouseGestures/metadata.desktop index 43f12c36c..b7c73ebdd 100644 --- a/src/plugins/MouseGestures/metadata.desktop +++ b/src/plugins/MouseGestures/metadata.desktop @@ -8,6 +8,7 @@ Name[de]=Mausgesten Name[en_GB]=Mouse Gestures Name[es]=Gestos de ratón Name[fi]=Hiirieleet +Name[fr]=Mouvements de souris Name[gl]=Xestos do rato Name[id]=Mouse Gestures Name[it]=Gesti del mouse @@ -26,6 +27,7 @@ Comment[de]=Unterstützung für die Navigation auf Webseiten durch Mausgesten 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[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 pergerakan mouse Comment[it]=Fornisce un supporto alla navigazione nelle pagine web per mezzo di gesti del mouse diff --git a/src/plugins/PIM/metadata.desktop b/src/plugins/PIM/metadata.desktop index c8cfd4198..3b95d0d67 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[fr]=Ajout d'une capacité de stockage de certaines données personnelles par Falkon 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 diff --git a/src/plugins/StatusBarIcons/metadata.desktop b/src/plugins/StatusBarIcons/metadata.desktop index c02acd1a2..4a93c4512 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[fr]=Icônes de la barre d'état Name[gl]=Iconas da barra de estado Name[id]=Ikon BilahStatus Name[it]=Icone della barra di stato @@ -26,6 +27,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[fr]=Ajout d'icônes supplémentaires et d'un composant graphique de zoom à la barre d'état 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 diff --git a/src/plugins/TabManager/metadata.desktop b/src/plugins/TabManager/metadata.desktop index 4e5421d2b..c23d0e8c2 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[fr]=Gestionnaire d'onglets Name[gl]=Xestor de lapelas Name[id]=Pengelola Tab Name[it]=Gestore delle schede @@ -27,6 +28,7 @@ Comment[de]=Verwaltung von Unterfenstern und Fenstern 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]=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 diff --git a/src/plugins/TestPlugin/metadata.desktop b/src/plugins/TestPlugin/metadata.desktop index 123c699fd..bd0c790ea 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[fr]=Module externe d'exemple Name[gl]=Complemento de exemplo Name[id]=Contoh Plugin Name[it]=Estensione di esempio @@ -27,6 +28,7 @@ Comment[de]=Einfaches minimales Beispielmodul 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[fr]=Exemple de module externe minimaliste très simple 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 diff --git a/src/plugins/VerticalTabs/metadata.desktop b/src/plugins/VerticalTabs/metadata.desktop index ac0ec2a0f..1f85bb375 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[fr]=Onglets verticaux Name[gl]=Lapelas verticais Name[id]=Tab Tegak Name[it]=Schede verticali @@ -26,6 +27,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[fr]=Prise en charge de l'affichage des onglets dans le panneau latéral 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 diff --git a/src/scripts/hellopython/metadata.desktop b/src/scripts/hellopython/metadata.desktop index 56f2d2573..f0ea1c8e2 100644 --- a/src/scripts/hellopython/metadata.desktop +++ b/src/scripts/hellopython/metadata.desktop @@ -7,6 +7,7 @@ Name[da]=Hallo Python Name[de]=Hallo-Python Name[en_GB]=Hello Python Name[es]=Hola Python +Name[fr]=Hello Python Name[gl]=Ola, Python! Name[id]=Hello Python Name[it]=Hello Python @@ -25,6 +26,7 @@ Comment[da]=Eksempel Python-udvidelse Comment[de]=Beispiel eines Python-Moduls Comment[en_GB]=Example Python extension Comment[es]=Ejemplo de extensión de Python +Comment[fr]=Exemple d'extension Python Comment[gl]=Extensión de Python de exemplo Comment[id]=Contoh ekstensi Python Comment[it]=Estensione di esempio in Python diff --git a/src/scripts/runaction/actions/googleimagesearch.desktop b/src/scripts/runaction/actions/googleimagesearch.desktop index 3e27d5b87..d418db845 100644 --- a/src/scripts/runaction/actions/googleimagesearch.desktop +++ b/src/scripts/runaction/actions/googleimagesearch.desktop @@ -25,6 +25,7 @@ Comment[da]=Søg med... Comment[de]=Suchen mit ... Comment[en_GB]=Search with... Comment[es]=Buscar con... +Comment[fr]=Chercher avec… Comment[gl]=Buscar con… Comment[id]=Cari dengan... Comment[it]=Cerca con... diff --git a/src/scripts/runaction/actions/mpv.desktop b/src/scripts/runaction/actions/mpv.desktop index b53ea97ce..045e3da51 100644 --- a/src/scripts/runaction/actions/mpv.desktop +++ b/src/scripts/runaction/actions/mpv.desktop @@ -6,6 +6,7 @@ Name[cs]=Otevřít pomocí mpv Name[da]=Åbn med mpv Name[en_GB]=Open with mpv Name[es]=Abrir con mpv +Name[fr]=Ouvrir avec mpv Name[gl]=Abrir con mpv Name[id]=Buka dengan mpv Name[it]=Apri con mpv diff --git a/src/scripts/runaction/actions/tineyeimagesearch.desktop b/src/scripts/runaction/actions/tineyeimagesearch.desktop index bf2938a7c..1c65e2e4d 100644 --- a/src/scripts/runaction/actions/tineyeimagesearch.desktop +++ b/src/scripts/runaction/actions/tineyeimagesearch.desktop @@ -7,6 +7,7 @@ Name[da]=TinEye Name[de]=TinEye Name[en_GB]=TinEye Name[es]=TinEye +Name[fr]=TinEye Name[gl]=TinEye Name[id]=TinEye Name[it]=TinEye @@ -24,6 +25,7 @@ Comment[da]=Søg med... Comment[de]=Suchen mit ... Comment[en_GB]=Search with... Comment[es]=Buscar con... +Comment[fr]=Chercher avec… Comment[gl]=Buscar con… Comment[id]=Cari dengan... Comment[it]=Cerca con... diff --git a/src/scripts/runaction/actions/translate.desktop b/src/scripts/runaction/actions/translate.desktop index ae87961c1..5b2bc1886 100644 --- a/src/scripts/runaction/actions/translate.desktop +++ b/src/scripts/runaction/actions/translate.desktop @@ -7,6 +7,7 @@ Name[da]=Oversæt side Name[de]=Seite übersetzen Name[en_GB]=Translate page Name[es]=Traducir página +Name[fr]=Traduire la page Web Name[gl]=Traducir a páxina Name[id]=Terjemahkan halaman Name[it]=Traduci la pagina diff --git a/src/scripts/runaction/actions/w3.desktop b/src/scripts/runaction/actions/w3.desktop index c67cbfb51..09fc962c6 100644 --- a/src/scripts/runaction/actions/w3.desktop +++ b/src/scripts/runaction/actions/w3.desktop @@ -7,6 +7,7 @@ Name[da]=Valider side Name[de]=Seite überprüfen Name[en_GB]=Validate page Name[es]=Validar página +Name[fr]=Valider la page Name[gl]=Validar a páxina Name[id]=Validasi halaman Name[it]=Convalida la pagina diff --git a/src/scripts/runaction/actions/yandeximagesearch.desktop b/src/scripts/runaction/actions/yandeximagesearch.desktop index c2f8ea7f4..ee6557bfd 100644 --- a/src/scripts/runaction/actions/yandeximagesearch.desktop +++ b/src/scripts/runaction/actions/yandeximagesearch.desktop @@ -7,6 +7,7 @@ Name[da]=Yandex Name[de]=Yandex Name[en_GB]=Yandex Name[es]=Yandex +Name[fr]=Yandex Name[gl]=Yandex Name[id]=Yandex Name[it]=Yandex @@ -24,6 +25,7 @@ Comment[da]=Søg med... Comment[de]=Suchen mit ... Comment[en_GB]=Search with... Comment[es]=Buscar con... +Comment[fr]=Chercher avec… Comment[gl]=Buscar con… Comment[id]=Cari dengan... Comment[it]=Cerca con... diff --git a/src/scripts/runaction/metadata.desktop b/src/scripts/runaction/metadata.desktop index 8f621cae0..606f19c7b 100644 --- a/src/scripts/runaction/metadata.desktop +++ b/src/scripts/runaction/metadata.desktop @@ -6,6 +6,7 @@ Name[cs]=Spustit činnost Name[da]=Kør handling Name[en_GB]=Run Action Name[es]=Ejecutar acción +Name[fr]=Lancer une action Name[gl]=Executar a acción Name[id]=Run Action Name[it]=Esegui azione @@ -22,6 +23,7 @@ Comment[cs]=Spouštět různé činnosti na stránkách Comment[da]=Kør diverse handlinger på steder Comment[en_GB]=Run various actions on sites Comment[es]=Ejecutar varias acciones en sitios +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 Comment[it]=Esegue numerose azioni nei siti diff --git a/themes/chrome/metadata.desktop b/themes/chrome/metadata.desktop index aaa423272..b57fb8608 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[fr]=Chrome Name[gl]=Chrome Name[id]=Chrome Name[it]=Chrome @@ -27,6 +28,7 @@ Comment[de]=Chrome ähnliches Design für Falkon auf der Basis des Chromifox-Des 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[fr]=Thème Chrome pour Falkon inspiré du thème Chromifox de Firefox 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 diff --git a/themes/linux/metadata.desktop b/themes/linux/metadata.desktop index 3f01a9d34..465eca18e 100644 --- a/themes/linux/metadata.desktop +++ b/themes/linux/metadata.desktop @@ -8,6 +8,7 @@ Name[de]=Linux Name[en_GB]=Linux Name[es]=Linux Name[fi]=Linux +Name[fr]=Linux Name[gl]=Linux Name[id]=Linux Name[it]=Linux @@ -26,6 +27,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[fr]=Thème simple par défaut pour Linux utilisant les styles de composants graphiques natifs et quelques icônes simples du jeu d'icônes du bureau 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 diff --git a/themes/mac/metadata.desktop b/themes/mac/metadata.desktop index 21276a8df..492697939 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[fr]=Mac Name[gl]=Mac Name[id]=Mac Name[it]=Mac @@ -27,6 +28,7 @@ Comment[de]=Mac ähnliches Design für Falkon auf der Basis des „Mac OS X“-D 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[fr]=Thème Mac pour Falkon inspiré du thème Mac OS X de Firefox 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 diff --git a/themes/windows/metadata.desktop b/themes/windows/metadata.desktop index 28bc588ee..c0095511a 100644 --- a/themes/windows/metadata.desktop +++ b/themes/windows/metadata.desktop @@ -8,6 +8,7 @@ Name[de]=Windows Name[en_GB]=Windows Name[es]=Windows Name[fi]=Windows +Name[fr]=Windows Name[gl]=Xanelas Name[id]=Windows Name[it]=Windows @@ -27,6 +28,7 @@ Comment[de]=Windows ähnliches Design auf der Basis des Designs Material 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[fr]=Thème Windows inspiré par Material 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 From cd15b7008c3f29f1fde74d4ae71239f7d4285f6a Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Wed, 6 Jun 2018 07:29:50 +0200 Subject: [PATCH 06/10] 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/lib/adblock/metadata.desktop | 2 ++ 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/ImageFinder/metadata.desktop | 2 ++ src/plugins/KWalletPasswords/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 | 2 ++ themes/mac/metadata.desktop | 2 ++ themes/windows/metadata.desktop | 2 ++ 18 files changed, 34 insertions(+), 1 deletion(-) diff --git a/src/lib/adblock/metadata.desktop b/src/lib/adblock/metadata.desktop index 1002a0d5b..892088793 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[fr]=AdBlock Name[gl]=Bloqueador de publicidade Name[id]=AdBlock Name[it]=Adblock @@ -26,6 +27,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[fr]=Blocage des contenus Web indésirables Comment[gl]=Bloquea contenido web non desexado Comment[id]=Memblokir konten web yang tak diinginkan Comment[it]=Blocca i contenuti web non desiderati diff --git a/src/plugins/AutoScroll/metadata.desktop b/src/plugins/AutoScroll/metadata.desktop index 478fec1b7..3201c8870 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[fr]=AutoScroll Name[gl]=Desprazamento automático Name[id]=AutoScroll Name[it]=Scorrimento automatico @@ -26,6 +27,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[fr]=Prise en charge du défilement automatique à l'aide du bouton central de la souris 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 diff --git a/src/plugins/FlashCookieManager/metadata.desktop b/src/plugins/FlashCookieManager/metadata.desktop index 511afe4ce..87d5d861d 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[fr]=Gestionnaire de cookies Flash Name[gl]=Xestor de cookies flash Name[id]=Flash Cookie Manager Name[it]=Gestore dei cookie in flash @@ -26,6 +27,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[fr]=Affichage et suppression facile des cookies stockés sur votre ordinateur. Une solution idéale pour gérer votre confidentialité. 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. diff --git a/src/plugins/GnomeKeyringPasswords/metadata.desktop b/src/plugins/GnomeKeyringPasswords/metadata.desktop index 236834d69..72224436f 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[fr]=Trousseau de clés de GNOME Name[gl]=Contrasinais do chaveiro de Gnome Name[id]=Gnome Keyring Passwords Name[it]=Portachiavi per le chiavi di Gnome @@ -25,6 +26,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[fr]=Prise en charge de l'enregistrement de mots de passe au sein de gnome-keyring 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 diff --git a/src/plugins/GreaseMonkey/metadata.desktop b/src/plugins/GreaseMonkey/metadata.desktop index 94f9f0b8e..248043615 100644 --- a/src/plugins/GreaseMonkey/metadata.desktop +++ b/src/plugins/GreaseMonkey/metadata.desktop @@ -27,7 +27,7 @@ Comment[da]=Giver understøttelse af brugerscripts 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[fr]=Prise en charge des scripts utilisateur. Comment[gl]=Permite scripts de usuario Comment[id]=Menyediakan dukungan untuk skrip pengguna Comment[it]=Fornisce un supporto agli script utente diff --git a/src/plugins/ImageFinder/metadata.desktop b/src/plugins/ImageFinder/metadata.desktop index 4f50989bf..c11cda79b 100644 --- a/src/plugins/ImageFinder/metadata.desktop +++ b/src/plugins/ImageFinder/metadata.desktop @@ -8,6 +8,7 @@ Name[de]=Bildersuche Name[en_GB]=ImageFinder Name[es]=Buscador de imágenes Name[fi]=ImageFinder +Name[fr]=ImageFinder Name[id]=ImageFinder Name[it]=Cercatore di immagini Name[nl]=ImageFinder @@ -24,6 +25,7 @@ Comment[da]=Giver genvejsmenu med understøttelse af omvendt billedsøgetjeneste Comment[en_GB]=Provides context menu with reverse image search engine support Comment[es]=Proporciona un menú de contexto con implementación de búsqueda inversa de imágenes Comment[fi]=Tarjoaa kontekstivalikon käänteisen kuvahaun tuen moottorille +Comment[fr]=Prise en charge de menu contextuels de recherche d'image inversée Comment[id]=Menyediakan menu konteks dengan dukungan mesin pencari gambar terbalik Comment[it]=Fornisce un menu contestuale con un supporto al motore di ricerca inversa di immagini Comment[nl]=Biedt contextmenu met ondersteuningsengine voor omgekeerd afbeeldingen zoeken diff --git a/src/plugins/KWalletPasswords/metadata.desktop b/src/plugins/KWalletPasswords/metadata.desktop index 82bdfd0e9..0f90df2d9 100644 --- a/src/plugins/KWalletPasswords/metadata.desktop +++ b/src/plugins/KWalletPasswords/metadata.desktop @@ -8,6 +8,7 @@ Name[de]=KWallet-Passwörter Name[en_GB]=KWallet Passwords Name[es]=Contraseñas de KWallet Name[fi]=KWallet-salasanat +Name[fr]=Mots de passe KWallet Name[id]=KWallet Passwords Name[it]=Password di KWallet Name[nl]=Wachtwoorden in KWallet @@ -24,6 +25,7 @@ Comment[da]=Giver understøttelse til lagring af adgangskoder i KWallet Comment[de]=Unterstützung für die Speicherung von Passwörtern in KWallet Comment[en_GB]=Provides support for storing passwords in KWallet Comment[es]=Implementa el almacenamiento de contraseñas en KWallet +Comment[fr]=Prise en charge du stockage de mots de passe dans KWallet Comment[id]=Menyediakan dukungan untuk menyimpan sandi dalam KWallet Comment[it]=Fornisce un supporto per l'immagazzinamento delle password in KWallet Comment[nl]=Biedt ondersteuning voor opslaan van wachtwoorden in KWallet diff --git a/src/plugins/MouseGestures/metadata.desktop b/src/plugins/MouseGestures/metadata.desktop index 43f12c36c..b7c73ebdd 100644 --- a/src/plugins/MouseGestures/metadata.desktop +++ b/src/plugins/MouseGestures/metadata.desktop @@ -8,6 +8,7 @@ Name[de]=Mausgesten Name[en_GB]=Mouse Gestures Name[es]=Gestos de ratón Name[fi]=Hiirieleet +Name[fr]=Mouvements de souris Name[gl]=Xestos do rato Name[id]=Mouse Gestures Name[it]=Gesti del mouse @@ -26,6 +27,7 @@ Comment[de]=Unterstützung für die Navigation auf Webseiten durch Mausgesten 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[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 pergerakan mouse Comment[it]=Fornisce un supporto alla navigazione nelle pagine web per mezzo di gesti del mouse diff --git a/src/plugins/PIM/metadata.desktop b/src/plugins/PIM/metadata.desktop index c8cfd4198..3b95d0d67 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[fr]=Ajout d'une capacité de stockage de certaines données personnelles par Falkon 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 diff --git a/src/plugins/StatusBarIcons/metadata.desktop b/src/plugins/StatusBarIcons/metadata.desktop index c02acd1a2..4a93c4512 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[fr]=Icônes de la barre d'état Name[gl]=Iconas da barra de estado Name[id]=Ikon BilahStatus Name[it]=Icone della barra di stato @@ -26,6 +27,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[fr]=Ajout d'icônes supplémentaires et d'un composant graphique de zoom à la barre d'état 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 diff --git a/src/plugins/TabManager/metadata.desktop b/src/plugins/TabManager/metadata.desktop index 4e5421d2b..c23d0e8c2 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[fr]=Gestionnaire d'onglets Name[gl]=Xestor de lapelas Name[id]=Pengelola Tab Name[it]=Gestore delle schede @@ -27,6 +28,7 @@ Comment[de]=Verwaltung von Unterfenstern und Fenstern 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]=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 diff --git a/src/plugins/TestPlugin/metadata.desktop b/src/plugins/TestPlugin/metadata.desktop index 123c699fd..bd0c790ea 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[fr]=Module externe d'exemple Name[gl]=Complemento de exemplo Name[id]=Contoh Plugin Name[it]=Estensione di esempio @@ -27,6 +28,7 @@ Comment[de]=Einfaches minimales Beispielmodul 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[fr]=Exemple de module externe minimaliste très simple 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 diff --git a/src/plugins/VerticalTabs/metadata.desktop b/src/plugins/VerticalTabs/metadata.desktop index ac0ec2a0f..1f85bb375 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[fr]=Onglets verticaux Name[gl]=Lapelas verticais Name[id]=Tab Tegak Name[it]=Schede verticali @@ -26,6 +27,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[fr]=Prise en charge de l'affichage des onglets dans le panneau latéral 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 diff --git a/src/scripts/hellopython/metadata.desktop b/src/scripts/hellopython/metadata.desktop index 56f2d2573..f0ea1c8e2 100644 --- a/src/scripts/hellopython/metadata.desktop +++ b/src/scripts/hellopython/metadata.desktop @@ -7,6 +7,7 @@ Name[da]=Hallo Python Name[de]=Hallo-Python Name[en_GB]=Hello Python Name[es]=Hola Python +Name[fr]=Hello Python Name[gl]=Ola, Python! Name[id]=Hello Python Name[it]=Hello Python @@ -25,6 +26,7 @@ Comment[da]=Eksempel Python-udvidelse Comment[de]=Beispiel eines Python-Moduls Comment[en_GB]=Example Python extension Comment[es]=Ejemplo de extensión de Python +Comment[fr]=Exemple d'extension Python Comment[gl]=Extensión de Python de exemplo Comment[id]=Contoh ekstensi Python Comment[it]=Estensione di esempio in Python diff --git a/themes/chrome/metadata.desktop b/themes/chrome/metadata.desktop index aaa423272..b57fb8608 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[fr]=Chrome Name[gl]=Chrome Name[id]=Chrome Name[it]=Chrome @@ -27,6 +28,7 @@ Comment[de]=Chrome ähnliches Design für Falkon auf der Basis des Chromifox-Des 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[fr]=Thème Chrome pour Falkon inspiré du thème Chromifox de Firefox 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 diff --git a/themes/linux/metadata.desktop b/themes/linux/metadata.desktop index 3f01a9d34..465eca18e 100644 --- a/themes/linux/metadata.desktop +++ b/themes/linux/metadata.desktop @@ -8,6 +8,7 @@ Name[de]=Linux Name[en_GB]=Linux Name[es]=Linux Name[fi]=Linux +Name[fr]=Linux Name[gl]=Linux Name[id]=Linux Name[it]=Linux @@ -26,6 +27,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[fr]=Thème simple par défaut pour Linux utilisant les styles de composants graphiques natifs et quelques icônes simples du jeu d'icônes du bureau 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 diff --git a/themes/mac/metadata.desktop b/themes/mac/metadata.desktop index 21276a8df..492697939 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[fr]=Mac Name[gl]=Mac Name[id]=Mac Name[it]=Mac @@ -27,6 +28,7 @@ Comment[de]=Mac ähnliches Design für Falkon auf der Basis des „Mac OS X“-D 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[fr]=Thème Mac pour Falkon inspiré du thème Mac OS X de Firefox 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 diff --git a/themes/windows/metadata.desktop b/themes/windows/metadata.desktop index 28bc588ee..c0095511a 100644 --- a/themes/windows/metadata.desktop +++ b/themes/windows/metadata.desktop @@ -8,6 +8,7 @@ Name[de]=Windows Name[en_GB]=Windows Name[es]=Windows Name[fi]=Windows +Name[fr]=Windows Name[gl]=Xanelas Name[id]=Windows Name[it]=Windows @@ -27,6 +28,7 @@ Comment[de]=Windows ähnliches Design auf der Basis des Designs Material 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[fr]=Thème Windows inspiré par Material 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 From 29fbbf5dc4cc55102752e20d1f85cbd49ee7333a Mon Sep 17 00:00:00 2001 From: Razi Alavizadeh Date: Wed, 6 Jun 2018 23:42:08 +0430 Subject: [PATCH 07/10] Windows: Warn user about needed hotfix BUG: 394905 FIXED-IN: 3.0.2 --- windows/installer.nsi | 18 ++++++++++++++++++ windows/strings.nsh | 2 ++ 2 files changed, 20 insertions(+) diff --git a/windows/installer.nsi b/windows/installer.nsi index 3a13f802c..2d67bf07a 100644 --- a/windows/installer.nsi +++ b/windows/installer.nsi @@ -402,6 +402,7 @@ Function .onInit doAbort: Abort skip: + call notifyUserIfHotfixNeeded FunctionEnd Function RegisterCapabilities @@ -491,3 +492,20 @@ Function SkipComponentsIfPortableInstalltion StrCmp $installAsPortable "YES" 0 +2 Abort FunctionEnd + +Function notifyUserIfHotfixNeeded + ; check if Windows 10 family. Taken from: http://nsis.sourceforge.net/Get_Windows_version + ReadRegStr $R0 HKLM "SOFTWARE\Microsoft\Windows NT\CurrentVersion" CurrentMajorVersionNumber + StrCmp $R0 '' 0 skiphotfixwarn + + ClearErrors + nsExec::ExecToStack 'cmd /Q /C "%SYSTEMROOT%\System32\wbem\wmic.exe qfe get hotfixid | %SYSTEMROOT%\System32\findstr.exe "^KB2999226""' + Pop $0 ; return value (it always 0 even if an error occured) + Pop $1 ; command output KB2999226 + + StrCmp $1 "" 0 skiphotfixwarn + MessageBox MB_YESNO|MB_ICONQUESTION "${MSG_HotfixNeeded}" IDNO +2 + ExecShell open "https://support.microsoft.com/en-us/help/2999226/update-for-universal-c-runtime-in-windows" + + skiphotfixwarn: +FunctionEnd diff --git a/windows/strings.nsh b/windows/strings.nsh index b33597e9f..1da4a42a3 100644 --- a/windows/strings.nsh +++ b/windows/strings.nsh @@ -37,3 +37,5 @@ !define MSG_InvalidInstallPath "Install path invalid!" !define MSG_PortableWriteError "Error occurred when creating 'falkon.conf' in installation folder. Create it manually." + +!define MSG_HotfixNeeded "To run Falkon you have to install hotfix 'KB2999226'. Proceed to Windows update website?" From 9f0f688ee8ed7d454713db5418c9a86f80fd5850 Mon Sep 17 00:00:00 2001 From: David Rosca Date: Mon, 14 May 2018 13:53:05 +0200 Subject: [PATCH 08/10] Use QTWEBENGINE_VERSION instead of QT_VERSION Fixes build against separate QtWebEngine releases. --- CMakeLists.txt | 4 +--- config.h.cmake | 3 --- src/lib/CMakeLists.txt | 3 +++ src/lib/app/qzcommon.h | 1 + src/lib/webengine/webview.cpp | 3 +-- 5 files changed, 6 insertions(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b3f583c4c..67f675748 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -45,7 +45,7 @@ add_definitions(-DQT_NO_URL_CAST_FROM_STRING -DQT_USE_QSTRINGBUILDER -DQT_NO_CAS # Mandatory: Qt5 set(QT_MIN_VERSION "5.9.0") -find_package(Qt5 ${QT_MIN_VERSION} REQUIRED COMPONENTS Core Widgets Network Sql QuickWidgets PrintSupport WebEngineWidgets WebChannel) +find_package(Qt5 ${QT_MIN_VERSION} REQUIRED COMPONENTS Core Widgets Network Sql QuickWidgets PrintSupport WebEngine WebEngineWidgets WebChannel) if (BUILD_TESTING) find_package(Qt5 ${QT_MIN_VERSION} REQUIRED COMPONENTS Test) endif() @@ -85,8 +85,6 @@ if (WIN32) add_definitions(-D_WIN32_WINNT=${ver}) endif() -set(HAVE_QTWEBENGINE_5_10 NOT Qt5WebEngineWidgets_VERSION VERSION_LESS 5.10.0) - # Mandatory: OpenSSL find_package(OpenSSL REQUIRED) diff --git a/config.h.cmake b/config.h.cmake index 3cc5d3484..d35648e5b 100644 --- a/config.h.cmake +++ b/config.h.cmake @@ -9,6 +9,3 @@ /* Disable DBus support */ #cmakedefine DISABLE_DBUS - -/* QtWebEngine is at least version 5.10 */ -#cmakedefine01 HAVE_QTWEBENGINE_5_10 diff --git a/src/lib/CMakeLists.txt b/src/lib/CMakeLists.txt index 93a831f52..a93c68b9f 100644 --- a/src/lib/CMakeLists.txt +++ b/src/lib/CMakeLists.txt @@ -297,6 +297,9 @@ qt5_add_resources(SRCS add_library(FalkonPrivate SHARED ${SRCS}) +get_property(QT_WEBENGINE_INCLUDE_DIRS TARGET Qt5::WebEngine PROPERTY INTERFACE_INCLUDE_DIRECTORIES) +target_include_directories(FalkonPrivate SYSTEM PUBLIC ${QT_WEBENGINE_INCLUDE_DIRS}) + target_link_libraries(FalkonPrivate Qt5::Widgets Qt5::WebEngineWidgets diff --git a/src/lib/app/qzcommon.h b/src/lib/app/qzcommon.h index fe49aff57..a6d008b90 100644 --- a/src/lib/app/qzcommon.h +++ b/src/lib/app/qzcommon.h @@ -20,6 +20,7 @@ #include #include +#include #ifdef FALKON_SHAREDLIBRARY #define FALKON_EXPORT Q_DECL_EXPORT diff --git a/src/lib/webengine/webview.cpp b/src/lib/webengine/webview.cpp index 32c288ca3..d514b0937 100644 --- a/src/lib/webengine/webview.cpp +++ b/src/lib/webengine/webview.cpp @@ -35,7 +35,6 @@ #include "scripts.h" #include "webhittestresult.h" #include "webscrollbarmanager.h" -#include "../config.h" #include @@ -496,7 +495,7 @@ void WebView::copyLinkToClipboard() void WebView::savePageAs() { -#if HAVE_QTWEBENGINE_5_10 +#if QTWEBENGINE_VERSION >= QT_VERSION_CHECK(5, 10, 0) page()->runJavaScript(QSL("document.contentType"), WebPage::SafeJsWorld, [this](const QVariant &res) { const QSet webPageTypes = { QSL("text/html"), From c252de4bdd267c86564e6f6bc1a8cdcdc2d0424c Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Wed, 13 Jun 2018 03:38:24 +0200 Subject: [PATCH 09/10] GIT_SILENT made messages (after extraction) --- linux/appdata/org.kde.falkon.appdata.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/linux/appdata/org.kde.falkon.appdata.xml b/linux/appdata/org.kde.falkon.appdata.xml index 83670b215..689b381de 100644 --- a/linux/appdata/org.kde.falkon.appdata.xml +++ b/linux/appdata/org.kde.falkon.appdata.xml @@ -69,6 +69,7 @@

Falkon är en ny och mycket snabb Qt webbläsare. Den har som mål att vara en lättviktig webbläsare tillgänglig på alla större plattformar. Projektet startades ursprungligen bara i utbildningssyfte, men från starten har Falkon växt till en funktionsrik webbläsare.

Falkon — нова і дуже швидка програма для перегляду інтернету на основі навігатора Qt. Метою проекту є створення невибагливого до ресурсів переглядача інтернету для усіх основних програмних платформ. Реалізацію проекту було розпочато з навчальною метою. Втім, з того часу Falkon стала повноцінним переглядачем.

xxFalkon is a new and very fast Qt web browser. It aims to be a lightweight web browser available through all major platforms. This project has been originally started only for educational purposes. But from its start, Falkon has grown into a feature-rich browser.xx

+

Falkon 是一款全新的超快速 Qt 网络浏览器。它将是一款轻量级的跨平台浏览器。这个项目当初仅仅作为教育项目。但是从一开始，Falkon 就成长为一款功能丰富的浏览器。

Falkon has all standard functions you expect from a web browser. It includes bookmarks, history (both also in sidebar) and tabs. Above that, you can manage RSS feeds with an included RSS reader, block ads with a built-in AdBlock plugin, block Flash content with Click2Flash and edit the local CA Certificates database with an SSL manager.

From b8bb4dfa31bf2aea4a4d623593c72b49da4a7695 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Wed, 13 Jun 2018 05:35:07 +0200 Subject: [PATCH 10/10] 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/FlashCookieManager/metadata.desktop | 2 +- src/plugins/KDEFrameworksIntegration/metadata.desktop | 1 + src/plugins/MouseGestures/metadata.desktop | 1 + src/scripts/runaction/actions/googleimagesearch.desktop | 1 + src/scripts/runaction/actions/tineyeimagesearch.desktop | 1 + src/scripts/runaction/actions/yandeximagesearch.desktop | 1 + 6 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/plugins/FlashCookieManager/metadata.desktop b/src/plugins/FlashCookieManager/metadata.desktop index 87d5d861d..609516f15 100644 --- a/src/plugins/FlashCookieManager/metadata.desktop +++ b/src/plugins/FlashCookieManager/metadata.desktop @@ -37,7 +37,7 @@ Comment[pt]=Poderá ver/apagar facilmente os 'cookies' do Flash gravados no seu Comment[sv]=Det går enkelt att titta på eller ta bort Flash kakor lagrade på datorn. Det är en lösning på integritetsproblem. Comment[uk]=Спрощує перегляд і вилучення кук flash, які зберігаються на вашому комп'ютері. Це засіб для поліпшення захисту системи. Comment[x-test]=xxYou can easily view/delete flash cookies stored on your computer. This is a solution for having more privacy.xx -Comment[zh_CN]=您可以轻松地查看/删除存储在您的计算机上的 Flash cookie。这是一个更注重隐私的解决方案。 +Comment[zh_CN]=您可以轻松地查看/删除存储在您的计算机上的 Flash Cookie。这是一个更注重隐私的解决方案。 Icon=:flashcookiemanager/data/flash-cookie-manager.png Type=Service diff --git a/src/plugins/KDEFrameworksIntegration/metadata.desktop b/src/plugins/KDEFrameworksIntegration/metadata.desktop index 1915d311b..e34356f65 100644 --- a/src/plugins/KDEFrameworksIntegration/metadata.desktop +++ b/src/plugins/KDEFrameworksIntegration/metadata.desktop @@ -15,6 +15,7 @@ Name[pt]=Integração com as Plataformas do KDE Name[sv]=Integration med KDE Ramverk Name[uk]=Інтерграція із KDE Frameworks Name[x-test]=xxKDE Frameworks Integrationxx +Name[zh_CN]=KDE 框架集成 Comment=Provides support for KIO and storing passwords in KWallet Comment[ca]=Proporciona suport pel KIO i per emmagatzemar contrasenyes al KWallet Comment[ca@valencia]=Proporciona suport pel KIO i per emmagatzemar contrasenyes al KWallet diff --git a/src/plugins/MouseGestures/metadata.desktop b/src/plugins/MouseGestures/metadata.desktop index b7c73ebdd..fe1ef9069 100644 --- a/src/plugins/MouseGestures/metadata.desktop +++ b/src/plugins/MouseGestures/metadata.desktop @@ -18,6 +18,7 @@ Name[pt]=Gestos do Rato Name[sv]=Musgester Name[uk]=Керування мишею Name[x-test]=xxMouse Gesturesxx +Name[zh_CN]=鼠标手势 Comment=Provides support for navigating in webpages by mouse gestures Comment[ca]=Proporciona suport per navegar per les pàgines web amb gestos del ratolí Comment[ca@valencia]=Proporciona suport per navegar per les pàgines web amb gestos del ratolí diff --git a/src/scripts/runaction/actions/googleimagesearch.desktop b/src/scripts/runaction/actions/googleimagesearch.desktop index d418db845..3c0893e17 100644 --- a/src/scripts/runaction/actions/googleimagesearch.desktop +++ b/src/scripts/runaction/actions/googleimagesearch.desktop @@ -34,6 +34,7 @@ Comment[pt]=Procurar com... Comment[sv]=Sök med... Comment[uk]=Шукати за допомогою… Comment[x-test]=xxSearch with...xx +Comment[zh_CN]=使用搜索引擎搜索... Icon=google.png Type=Service diff --git a/src/scripts/runaction/actions/tineyeimagesearch.desktop b/src/scripts/runaction/actions/tineyeimagesearch.desktop index 1c65e2e4d..2c6d07d0e 100644 --- a/src/scripts/runaction/actions/tineyeimagesearch.desktop +++ b/src/scripts/runaction/actions/tineyeimagesearch.desktop @@ -34,6 +34,7 @@ Comment[pt]=Procurar com... Comment[sv]=Sök med... Comment[uk]=Шукати за допомогою… Comment[x-test]=xxSearch with...xx +Comment[zh_CN]=使用搜索引擎搜索... Icon=tineye.png Type=Service diff --git a/src/scripts/runaction/actions/yandeximagesearch.desktop b/src/scripts/runaction/actions/yandeximagesearch.desktop index ee6557bfd..bdfdc6bdc 100644 --- a/src/scripts/runaction/actions/yandeximagesearch.desktop +++ b/src/scripts/runaction/actions/yandeximagesearch.desktop @@ -34,6 +34,7 @@ Comment[pt]=Procurar com... Comment[sv]=Sök med... Comment[uk]=Шукати за допомогою… Comment[x-test]=xxSearch with...xx +Comment[zh_CN]=使用搜索引擎搜索... Icon=yandex.png Type=Service