From 5ba2dce127aa417d483e2b2ebfe983b681380b3d Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Tue, 29 May 2018 07:28:55 +0200 Subject: [PATCH 1/2] 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 2/2] 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