diff --git a/drivers/bookmarklet/js/driver.js b/drivers/bookmarklet/js/driver.js index 1525822b5..1e602a032 100644 --- a/drivers/bookmarklet/js/driver.js +++ b/drivers/bookmarklet/js/driver.js @@ -42,6 +42,18 @@ 27: 'Programming Language', 28: 'Operating System', 29: 'Search Engine' + 30: 'Web Mail', + 31: 'CDN', + 32: 'Marketing Automation', + 33: 'Web Server Extensions', + 34: 'Databases', + 35: 'Maps', + 36: 'Advertising Networks', + 37: 'Network Devices', + 38: 'Media Servers', + 39: 'Webcams', + 40: 'Printers', + 41: 'Payment Processors' } ; diff --git a/drivers/chrome/_locales/en/messages.json b/drivers/chrome/_locales/en/messages.json index cd6f01cfc..cdf813963 100644 --- a/drivers/chrome/_locales/en/messages.json +++ b/drivers/chrome/_locales/en/messages.json @@ -41,4 +41,9 @@ "categoryName34": { "message": "Database" }, "categoryName35": { "message": "Map" }, "categoryName36": { "message": "Advertising Network" } + "categoryName37": { "message": "Network Sevice" }, + "categoryName38": { "message": "Media Server" }, + "categoryName39": { "message": "Webcam" }, + "categoryName40": { "message": "Printer" }, + "categoryName41": { "message": "Payment Processor" } } diff --git a/drivers/chrome/_locales/es/messages.json b/drivers/chrome/_locales/es/messages.json index fa4e7cdcf..2793f349f 100644 --- a/drivers/chrome/_locales/es/messages.json +++ b/drivers/chrome/_locales/es/messages.json @@ -44,5 +44,10 @@ "categoryName33": { "message": "Extensión de Servidor Web" }, "categoryName34": { "message": "Base de Datos" }, "categoryName35": { "message": "Mapa" }, - "categoryName36": { "message": "Red de Publicidad" } + "categoryName36": { "message": "Red de Publicidad" }, + "categoryName37": { "message": "Network Sevice" }, + "categoryName38": { "message": "Media Server" }, + "categoryName39": { "message": "Webcam" }, + "categoryName40": { "message": "Printer" }, + "categoryName41": { "message": "Payment Processor" } } diff --git a/drivers/chrome/_locales/fr/messages.json b/drivers/chrome/_locales/fr/messages.json index 5a75e0a09..251a7337b 100644 --- a/drivers/chrome/_locales/fr/messages.json +++ b/drivers/chrome/_locales/fr/messages.json @@ -1,140 +1,53 @@ { - "categoryName1": { - "message": "CMS" - }, - "categoryName2": { - "message": "Forum" - }, - "categoryName3": { - "message": "Gestionnaire de base de données" - }, - "categoryName4": { - "message": "Outil de documentation" - }, - "categoryName5": { - "message": "Widget" - }, - "categoryName6": { - "message": "Boutique en ligne" - }, - "categoryName7": { - "message": "Galerie photo" - }, - "categoryName8": { - "message": "Wiki" - }, - "categoryName9": { - "message": "Gestionnaires de serveur" - }, - "categoryName10": { - "message": "Outil de statistiques" - }, - "categoryName11": { - "message": "Blog" - }, - "categoryName12": { - "message": "Framework JavaScript" - }, - "categoryName13": { - "message": "Outils de suivi de problèmes" - }, - "categoryName14": { - "message": "Lecteur de vidéos" - }, - "categoryName15": { - "message": "Système de commentaires" - }, - "categoryName16": { - "message": "Captcha" - }, - "categoryName17": { - "message": "Script de police" - }, - "categoryName18": { - "message": "Framework web" - }, - "categoryName19": { - "message": "Divers" - }, - "categoryName20": { - "message": "Editeur" - }, - "categoryName21": { - "message": "LMS" - }, - "categoryName22": { - "message": "Serveur web" - }, - "categoryName23": { - "message": "Outil de cache" - }, - "categoryName24": { - "message": "Editeur WYSIWYG" - }, - "categoryName25": { - "message": "Graphismes JavaScript" - }, - "categoryName26": { - "message": "Framework pour mobiles" - }, - "categoryName27": { - "message": "Language de programmation" - }, - "categoryName28": { - "message": "Système d'exploitation" - }, - "categoryName29": { - "message": "Moteur de recherche" - }, - "categoryName30": { - "message": "Web Mail" - }, - "categoryName31": { - "message": "CDN" - }, - "categoryName32": { - "message": "Logiciel de marketing" - }, - "categoryName33": { - "message": "Web Server Extension" - }, - "categoryName34": { - "message": "Database" - }, - "categoryName35": { - "message": "Map" - }, - "categoryName36": { - "message": "Advertzing Network" - }, - "github": { - "message": "Forker Wappalyzer sur GitHub!" - }, - "noAppsDetected": { - "message": "Pas d'applications détectées." - }, - "nothingToDo": { - "message": "Rien à faire ici." - }, - "optionTracking": { - "message": "Envoyer anonymement des rapports sur les applications détectées à wappalyzer.com pour la recherche" - }, - "optionUpgradeMessage": { - "message": "M'afficher les mises à jour" - }, - "options": { - "message": "Options de Wappalyzer" - }, - "optionsSave": { - "message": "Sauver les options" - }, - "optionsSaved": { - "message": "Sauvé" - }, - "twitter": { - "message": "Suivre Wappalyzer sur Twitter" - }, - "website": { - "message": "Aller à wappalyzer.com" - } + "github": { "message": "Forker Wappalyzer sur GitHub!" }, + "noAppsDetected": { "message": "Pas d'applications détectées." }, + "nothingToDo": { "message": "Rien à faire ici." }, + "optionTracking": { "message": "Envoyer anonymement des rapports sur les applications détectées à wappalyzer.com pour la recherche" }, + "optionUpgradeMessage": { "message": "M'afficher les mises à jour" }, + "options": { "message": "Options de Wappalyzer" }, + "optionsSave": { "message": "Sauver les options" }, + "optionsSaved": { "message": "Sauvé" }, + "twitter": { "message": "Suivre Wappalyzer sur Twitter" }, + "website": { "message": "Aller à wappalyzer.com" }, + "categoryName1": { "message": "CMS" }, + "categoryName2": { "message": "Forum" }, + "categoryName3": { "message": "Gestionnaire de base de données" }, + "categoryName4": { "message": "Outil de documentation" }, + "categoryName5": { "message": "Widget" }, + "categoryName6": { "message": "Boutique en ligne" }, + "categoryName7": { "message": "Galerie photo" }, + "categoryName8": { "message": "Wiki" }, + "categoryName9": { "message": "Gestionnaires de serveur" }, + "categoryName10": { "message": "Outil de statistiques" }, + "categoryName11": { "message": "Blog" }, + "categoryName12": { "message": "Framework JavaScript" }, + "categoryName13": { "message": "Outils de suivi de problèmes" }, + "categoryName14": { "message": "Lecteur de vidéos" }, + "categoryName15": { "message": "Système de commentaires" }, + "categoryName16": { "message": "Captcha" }, + "categoryName17": { "message": "Script de police" }, + "categoryName18": { "message": "Framework web" }, + "categoryName19": { "message": "Divers" }, + "categoryName20": { "message": "Editeur" }, + "categoryName21": { "message": "LMS" }, + "categoryName22": { "message": "Serveur web" }, + "categoryName23": { "message": "Outil de cache" }, + "categoryName24": { "message": "Editeur WYSIWYG" }, + "categoryName25": { "message": "Graphismes JavaScript" }, + "categoryName26": { "message": "Framework pour mobiles" }, + "categoryName27": { "message": "Language de programmation" }, + "categoryName28": { "message": "Système d'exploitation" }, + "categoryName29": { "message": "Moteur de recherche" }, + "categoryName30": { "message": "Web Mail" }, + "categoryName31": { "message": "CDN" }, + "categoryName32": { "message": "Logiciel de marketing" }, + "categoryName33": { "message": "Web Server Extension" }, + "categoryName34": { "message": "Database" }, + "categoryName35": { "message": "Map" }, + "categoryName36": { "message": "Advertzing Network" }, + "categoryName37": { "message": "Network Sevice" }, + "categoryName38": { "message": "Media Server" }, + "categoryName39": { "message": "Webcam" }, + "categoryName40": { "message": "Printer" }, + "categoryName41": { "message": "Payment Processor" } } diff --git a/drivers/chrome/js/driver.js b/drivers/chrome/js/driver.js index d22cc11e1..bb313b90c 100644 --- a/drivers/chrome/js/driver.js +++ b/drivers/chrome/js/driver.js @@ -252,6 +252,7 @@ 28, // Operating System 15, // Comment System 20, // Editor + 41, // Payment Processor 10, // Analytics 32, // Marketing Automation 31, // CDN diff --git a/drivers/firefox/lib/driver.js b/drivers/firefox/lib/driver.js index 11c6b9708..9578ab599 100644 --- a/drivers/firefox/lib/driver.js +++ b/drivers/firefox/lib/driver.js @@ -354,6 +354,7 @@ 28, // Operating System 15, // Comment System 20, // Editor + 41, // Payment Processor 10, // Analytics 32, // Marketing Automation 31, // CDN diff --git a/drivers/firefox/locale/de-DE.properties b/drivers/firefox/locale/de-DE.properties index bbebd8288..38b91a334 100755 --- a/drivers/firefox/locale/de-DE.properties +++ b/drivers/firefox/locale/de-DE.properties @@ -53,3 +53,4 @@ cat37 = Network Device cat38 = Media Server cat39 = Webcam cat40 = Printer +cat41 = Payment Processor diff --git a/drivers/firefox/locale/en-GB.properties b/drivers/firefox/locale/en-GB.properties index 83df83703..b519ab978 100755 --- a/drivers/firefox/locale/en-GB.properties +++ b/drivers/firefox/locale/en-GB.properties @@ -53,3 +53,4 @@ cat37 = Network Device cat38 = Media Server cat39 = Webcam cat40 = Printer +cat41 = Payment Processor diff --git a/drivers/firefox/locale/en-US.properties b/drivers/firefox/locale/en-US.properties index e3a4c261e..efca45ee6 100755 --- a/drivers/firefox/locale/en-US.properties +++ b/drivers/firefox/locale/en-US.properties @@ -53,3 +53,4 @@ cat37 = Network Device cat38 = Media Server cat39 = Webcam cat40 = Printer +cat41 = Payment Processor diff --git a/drivers/firefox/locale/es-ES.properties b/drivers/firefox/locale/es-ES.properties index a7c2e4640..ab304969f 100755 --- a/drivers/firefox/locale/es-ES.properties +++ b/drivers/firefox/locale/es-ES.properties @@ -53,3 +53,4 @@ cat37 = Dispositivo de Red cat38 = Servidores de Contenido cat39 = Webcam cat40 = Impresora +cat41 = Payment Processor diff --git a/drivers/firefox/locale/fr-FR.properties b/drivers/firefox/locale/fr-FR.properties index a6bb86820..531f20b38 100644 --- a/drivers/firefox/locale/fr-FR.properties +++ b/drivers/firefox/locale/fr-FR.properties @@ -53,3 +53,4 @@ cat37 = Network Device cat38 = Media Server cat39 = Webcam cat40 = Printer +cat41 = Payment Processor diff --git a/drivers/firefox/locale/nl-NL.properties b/drivers/firefox/locale/nl-NL.properties index d4bb72534..9d6d63e60 100755 --- a/drivers/firefox/locale/nl-NL.properties +++ b/drivers/firefox/locale/nl-NL.properties @@ -1,11 +1,11 @@ name = Wappalyzer -noAppsDetected = Geen applications gedetecteerd +noAppsDetected = Geen applicaties gedetecteerd preferences = Meer opties... categories = Beheer categorien tracking_title = Tracking tracking_description = Verzend anonieme informatie over applicaties naar wappalyzer.com voor onderzoek -urlbar_title = Display icons in URL bar +urlbar_title = Laat iconen in de adresbalk zien urlbar_description = Uncheck to display toolbar button. feedback = Feedback @@ -49,7 +49,8 @@ cat33 = Web Server Extentie cat34 = Database cat35 = Landkaart cat36 = Advertentie Netwerk -cat37 = Network Apparaat +cat37 = Netwerk Apparaat cat38 = Media Server cat39 = Webcam cat40 = Printer +cat41 = Betaling Processor diff --git a/share/apps.json b/share/apps.json index 369d192ea..759079df8 100644 --- a/share/apps.json +++ b/share/apps.json @@ -39,7 +39,8 @@ "37": "network-devices", "38": "media-servers", "39": "webcams", - "40": "printers" + "40": "printers", + "41": "payment-processors" }, "apps": { "1C-Bitrix": { @@ -705,7 +706,7 @@ "cats": [ 15 ], "script": "disqus_url", "html": "]+id=\"disqus_thread\"", - "env": "^DISQUS$" + "env": "^DISQUS" }, "Django": { "website": "djangoproject.com", @@ -1041,7 +1042,7 @@ "Google AdSense": { "website": "google.com/adsense", "cats": [ 36 ], - "env": [ "^google_ad_" ], + "env": [ "^google_ad_", "^__google_ad_", "^Goog_AdSense_" ], "script": [ "googlesyndication\\.com/pagead/show_ads\\.js", "ad.ca.doubleclick.net" ] }, "Google App Engine": { @@ -1915,6 +1916,11 @@ "cats": [ 6 ], "html": "(?: