Merge Simple View changes into Develop

.travis.yml

@@ -3,8 +3,11 @@ node_js:
   - "9"
 sudo: false
 
+before_install:
+  - npm i -g npm
+
 install:
-  - npm install --silent
+  - npm ci --silent
 
 script:
   - node ./tools/licenses/fetchLicenses.js

CONTRIBUTING.md

@@ -21,10 +21,10 @@ You can also submit feature requests to the [issue tracker](../../issues). Befor
 + [Fork](https://help.github.com/articles/fork-a-repo/) the repository. Make sure to keep your fork [synced](https://help.github.com/articles/syncing-a-fork/) with the source repo
 + When you are ready to begin working on a new feature, cut a new branch from "develop" with the prefix "feature/" (e.g. "feature/name-of-new-feature"). Check out the [Gitflow branching model](https://www.atlassian.com/git/tutorials/comparing-workflows/gitflow-workflow) for more information.
 + Code style should follow the [Airbnb JavaScript Style Guide](https://github.com/airbnb/javascript)
-+ There is a [.editorconfig](.editorconfig) file that you can use with your IDE
++ There is an [.editorconfig](.editorconfig) file that you can use with your IDE
 + Refer to the [README](../../README.md) for details on how to install and build
 
-### Making Pull Requests
+### Submitting Pull Requests
 
 + Sync the develop branch in your fork with the develop branch from the source repo
 + Merge your feature branch into "develop"
@@ -34,6 +34,10 @@ You can also submit feature requests to the [issue tracker](../../issues). Befor
 + Write unit tests for new features and make sure all tests are passing (`npm run test.unit`)
 + If your pull request has multiple commits or commits that are not meaningful, consider [squashing](https://git-scm.com/docs/git-rebase#_interactive_mode) them
 
+#### Submitting Patches via Email
+
+If you are unable to submit pull requests on GitHub, we will also accept patches via [email](mailto:info@ghostery.com). For example, you can generate a patch from your last commit using `git format-patch HEAD^`. See [git-format-patch](https://git-scm.com/docs/git-format-patch) for more info.
+
 ### Code of Conduct
 
 See [CODE OF CONDUCT](CODE-OF-CONDUCT.md)

README.md

@@ -61,6 +61,13 @@ $ npm run lint
 $ npm run lint.raw -- src/utils/matcher.js
 ```
 
+```sh
+# Disable lint
+$ NO_LINT=true npm run build.dev
+# or
+$ npm run build.dev -- --env.nolint
+```
+
 ## Build Docs
 ```sh
 # Build JSDoc files to ./docs

_locales/de/messages.json

@@ -456,10 +456,10 @@
 		"message": "Navigieren Sie zu einer anderen Seite und ich verspreche, dass ich liefern werde."
 	},
 	"summary_trust_site": {
-		"message": "Website vertrauen"
+		"message": "Tracker entsperren"
 	},
 	"summary_restrict_site": {
-		"message": "Website nicht vertrauen"
+		"message": "Tracker blockieren"
 	},
 	"summary_undo": {
 		"message": "Rückgängig machen"
@@ -856,7 +856,7 @@
 		"message": "Nie"
 	},
 	"settings_seconds": {
-		"message": "Sekunden"
+		"message": "Sek."
 	},
 	"settings_hide_alert_trusted": {
 		"message": "Lila Box auf vertrauenswürdigen Websites verbergen"
@@ -1110,6 +1110,9 @@
 	"tooltip_anti_track_body": {
 		"message": "Anonymisieren Sie entsperrte und unbekannte Tracker für besseren Browsing-Schutz."
 	},
+	"tooltip_body_in_cliqz": {
+		"message": "Bereits als Standard in Cliqz aktiviert."
+	},
 	"tooltip_ad_block": {
 		"message": "Besserer Werbeblocker"
 	},
@@ -1422,7 +1425,7 @@
 		"message": "Was ist neu?"
 	},
 	"panel_help_setup": {
-		"message": "Set Up Ghostery"
+		"message": "Ghostery installieren"
 	},
 	"global_settings_saved": {
 		"message": "Globale Einstellungen gespeichert"
@@ -1461,7 +1464,7 @@
 		"message": "Meine Analysedaten teilen, um Ghostery noch leistungsstärker zu machen."
 	},
 	"setup_feature_active_in_cliqz": {
-		"message": "Diese Funktion ist in Cliqz bereits standardmäßig aktiviert. $LINK_START$Weitere Informationen$LINK_END$",
+		"message": "Bereits als Standard in Cliqz aktiviert. $LINK_START$Mehr erfahren.$LINK_END$",
 		"placeholders": {
 			"link_start": {
 				"content": "<a href=\"https://www.ghostery.com/faqs/what-are-the-new-ghostery-8-features/\" target=\"_blank\">"
@@ -1481,5 +1484,8 @@
 				"content": "</a>"
 			}
 		}
-	}		
-}
+	},
+	"panel_about_release_notes": {
+		"message": "Release-Hinweise für alle Updates ansehen"
+	}
+}

_locales/en/messages.json

@@ -1233,6 +1233,9 @@
 	"tooltip_anti_track_body_on": {
 		"message": "Personal data points anonymized."
 	},
+	"tooltip_body_in_cliqz": {
+		"message": "Feature already active in Cliqz by default."
+	},
 	"tooltip_ad_block": {
 		"message": "Enhanced Ad Blocking"
 	},
@@ -1587,5 +1590,17 @@
 	},
 	"setup_upgrade_button_go": {
 		"message": "Set Me Up"
+	},
+	"enable_when_paused": {
+		"message": "To use this function, Resume Ghostery."
+	},
+	"enable_when_whitelisted": {
+		"message": "To use this function, undo Trust Site"
+	},
+	"enable_when_blacklisted": {
+		"message": "To use this function, undo Restrict Site."
+	},
+	"enable_when_not_scanned": {
+		"message": "To use this function, navigate to another page."
 	}
 }

_locales/es/messages.json

@@ -856,7 +856,7 @@
 		"message": "Nunca"
 	},
 	"settings_seconds": {
-		"message": "segundos"
+		"message": "s"
 	},
 	"settings_hide_alert_trusted": {
 		"message": "Ocultar el cuadro púrpura en sitios web de confianza"
@@ -1422,7 +1422,7 @@
 		"message": "¿Qué novedades hay?"
 	},
 	"panel_help_setup": {
-		"message": "Set Up Ghostery"
+		"message": "Configurar Ghostery"
 	},
 	"global_settings_saved": {
 		"message": "Ajustes globales guardados"
@@ -1481,5 +1481,8 @@
 				"content": "</a>"
 			}
 		}
-	}		
-}
+	},
+	"panel_about_release_notes": {
+		"message": "Consulte las notas de lantamiento para todas las actualizaciones"
+	}
+}

_locales/fr/messages.json

@@ -856,7 +856,7 @@
 		"message": "Jamais"
 	},
 	"settings_seconds": {
-		"message": "secondes"
+		"message": "s"
 	},
 	"settings_hide_alert_trusted": {
 		"message": "Masquer la case violette sur les sites de confiance"
@@ -1422,7 +1422,7 @@
 		"message": "Procédez à l'installation"
 	},
 	"panel_help_setup": {
-		"message": "Set Up Ghostery"
+		"message": "Installer Ghostery"
 	},
 	"global_settings_saved": {
 		"message": "Paramètres globaux sauvegardés"
@@ -1481,5 +1481,8 @@
 				"content": "</a>"
 			}
 		}
-	}		
-}
+	},
+	"panel_about_release_notes": {
+		"message": "Voir les notes de mise à jour pour connaître toutes les nouveautés"
+	}
+}

_locales/hu/messages.json

@@ -1422,7 +1422,7 @@
 		"message": "Mik az újdonságok?"
 	},
 	"panel_help_setup": {
-		"message": "Set Up Ghostery"
+		"message": "A Ghostery beállítása"
 	},
 	"global_settings_saved": {
 		"message": "Globális beállítások mentve"
@@ -1481,5 +1481,8 @@
 				"content": "</a>"
 			}
 		}
-	}		
-}
+	},
+	"panel_about_release_notes": {
+		"message": "Az összes"
+	}
+}

_locales/it/messages.json

@@ -1422,7 +1422,7 @@
 		"message": "Le novità"
 	},
 	"panel_help_setup": {
-		"message": "Set Up Ghostery"
+		"message": "Configura Ghostery"
 	},
 	"global_settings_saved": {
 		"message": "Impostazioni Globali Salvate"
@@ -1481,5 +1481,8 @@
 				"content": "</a>"
 			}
 		}
-	}		
-}
+	},
+	"panel_about_release_notes": {
+		"message": "Vedi le note di rilascio per tutti gli aggiornamenti"
+	}
+}

_locales/ja/messages.json

@@ -1422,7 +1422,7 @@
 		"message": "最新情報"
 	},
 	"panel_help_setup": {
-		"message": "Set Up Ghostery"
+		"message": "Ghosteryをセットアップ"
 	},
 	"global_settings_saved": {
 		"message": "グローバル設定が保存されました"
@@ -1481,5 +1481,8 @@
 				"content": "</a>"
 			}
 		}
-	}		
-}
+	},
+	"panel_about_release_notes": {
+		"message": "すべての更新情報についてはリリースノートをご覧ください"
+	}
+}

_locales/ko/messages.json

@@ -1422,7 +1422,7 @@
 		"message": "새로운 소식 "
 	},
 	"panel_help_setup": {
-		"message": "Set Up Ghostery"
+		"message": "Ghostery 설정 "
 	},
 	"global_settings_saved": {
 		"message": "전역 설정 저장됨"
@@ -1481,5 +1481,8 @@
 				"content": "</a>"
 			}
 		}
-	}		
-}
+	},
+	"panel_about_release_notes": {
+		"message": "모든 업데이트 내용은 릴리스 노트를 참조하십시오 "
+	}
+}

_locales/nl/messages.json

@@ -1422,7 +1422,7 @@
 		"message": "Actueel"
 	},
 	"panel_help_setup": {
-		"message": "Set Up Ghostery"
+		"message": "Ghostery Instellen"
 	},
 	"global_settings_saved": {
 		"message": "Algemene Instellingen Opgeslagen"
@@ -1481,5 +1481,8 @@
 				"content": "</a>"
 			}
 		}
-	}		
-}
+	},
+	"panel_about_release_notes": {
+		"message": "Bekijk release notes voor alle updates"
+	}
+}

_locales/pl/messages.json

@@ -1422,7 +1422,7 @@
 		"message": "Co nowego?"
 	},
 	"panel_help_setup": {
-		"message": "Set Up Ghostery"
+		"message": "Konfiguruj Ghostery"
 	},
 	"global_settings_saved": {
 		"message": "Ustawienia globalne zapisane"
@@ -1481,5 +1481,8 @@
 				"content": "</a>"
 			}
 		}
-	}		
-}
+	},
+	"panel_about_release_notes": {
+		"message": "Zobacz informacje o wersji dla wszystkich aktualizacji"
+	}
+}

_locales/pt_BR/messages.json

@@ -1422,7 +1422,7 @@
 		"message": "O que há de novo?"
 	},
 	"panel_help_setup": {
-		"message": "Set Up Ghostery"
+		"message": "Configurar o Ghostery"
 	},
 	"global_settings_saved": {
 		"message": "Configurações Globais Salvas"
@@ -1481,5 +1481,8 @@
 				"content": "</a>"
 			}
 		}
-	}		
-}
+	},
+	"panel_about_release_notes": {
+		"message": "Ver notas de lançamento para todas as atualizações"
+	}
+}

_locales/ru/messages.json

@@ -1422,7 +1422,7 @@
 		"message": "Что нового?"
 	},
 	"panel_help_setup": {
-		"message": "Set Up Ghostery"
+		"message": "Настроить Ghostery"
 	},
 	"global_settings_saved": {
 		"message": "Глобальные настройки сохранены"
@@ -1481,5 +1481,8 @@
 				"content": "</a>"
 			}
 		}
-	}		
-}
+	},
+	"panel_about_release_notes": {
+		"message": "См. примечания к выпуску для получения информации обо всех обновлениях"
+	}
+}

_locales/zh_CN/messages.json

@@ -1422,7 +1422,7 @@
 		"message": "有什么新变化？"
 	},
 	"panel_help_setup": {
-		"message": "Set Up Ghostery"
+		"message": "设置 Ghostery"
 	},
 	"global_settings_saved": {
 		"message": "全局设置已保存"
@@ -1481,5 +1481,8 @@
 				"content": "</a>"
 			}
 		}
-	}		
-}
+	},
+	"panel_about_release_notes": {
+		"message": "查看所有更新的版本说明"
+	}
+}