Fixes for GH-877, GH-872, GH-886, missing translations added.

_locales/de/messages.json

@@ -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

@@ -1146,6 +1146,9 @@
 	"tooltip_anti_track_body": {
 		"message": "Anonymize unblocked and unknown trackers for greater browsing protection."
 	},
+	"tooltip_body_in_cliqz": {
+		"message": "Feature already active in Cliqz by default."
+	},
 	"tooltip_ad_block": {
 		"message": "Enhanced Ad Blocking"
 	},
@@ -1487,15 +1490,15 @@
 		"message": "Set Me Up"
 	},
 	"enable_when_paused": {
-		"message": "To execute this function, please resume Ghostery."
+		"message": "To use this function, Resume Ghostery."
 	},
 	"enable_when_whitelisted": {
-		"message": "To execute this function, please undo Trust site."
+		"message": "To use this function, undo Trust Site"
 	},
 	"enable_when_blacklisted": {
-		"message": "To execute this function, please undo Restrict site."
+		"message": "To use this function, undo Restrict Site."
 	},
 	"enable_when_not_scanned": {
-		"message": "To execute this function, please navigate to a site which can be scanned."
+		"message": "To use this function, navigate to another page."
 	}
 }

_locales/es/messages.json

@@ -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

@@ -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": "查看所有更新的版本说明"
+	}
+}

_locales/zh_TW/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": "閱讀發佈說明以了解所有更新"
+	}
+}

app/panel/components/Summary.jsx

@@ -396,22 +396,22 @@ class Summary extends React.Component {
 								<div className="columns medium-4 gx-tooltip">
 									<Tooltip
 										header={t('tooltip_anti_track')}
-										body={showBody && t('tooltip_anti_track_body')}
+										body={showBody && (IS_CLIQZ ? t('tooltip_body_in_cliqz') : t('tooltip_anti_track_body'))}
 										position={`${showBody ? 'top' : 'right'} top-right`}
 										showNotification={this.props.actions.showNotification}
 										disabled={IS_CLIQZ || buttonDisabled}
-										alertText={alertText}
+										alertText={IS_CLIQZ ? '' : alertText}
 									/>
 									<button value="antiTrackBtn" onClick={this.openDrawer} className={`${(this.state.disableBlocking || this.props.paused_blocking || this.props.sitePolicy !== false || IS_CLIQZ ? 'disabled' : '')} ${(this.props.enable_anti_tracking ? 'active' : '')} button controls-trust cliqz-control-btn anti-track-btn`} />
 								</div>
 								<div className="columns medium-4 gx-tooltip">
 									<Tooltip
 										header={t('tooltip_ad_block')}
-										body={showBody && t('tooltip_ad_block_body')}
+										body={showBody && (IS_CLIQZ ? t('tooltip_body_in_cliqz') : t('tooltip_ad_block_body'))}
 										position={showBody ? 'top' : 'right'}
 										showNotification={this.props.actions.showNotification}
 										disabled={IS_CLIQZ || buttonDisabled}
-										alertText={alertText}
+										alertText={IS_CLIQZ ? '' : alertText}
 									/>
 									<button value="adBlockBtn" onClick={this.openDrawer} className={`${(this.state.disableBlocking || this.props.paused_blocking || this.props.sitePolicy !== false || IS_CLIQZ ? 'disabled' : '')} ${(this.props.enable_ad_block ? 'active' : '')} button controls-restrict cliqz-control-btn ad-block-btn`} />
 								</div>

app/panel/components/Tooltip.jsx

@@ -55,7 +55,7 @@ class Tooltip extends React.Component {
 	 */
 	enter = () => {
 		this.setState({ show: true });
-		if (this.props.disabled && this.props.showNotification) {
+		if (this.props.disabled && this.props.showNotification && this.props.alertText) {
 			this.props.showNotification({ text: this.props.alertText, classes: 'warning', filter: 'tooltip' });
 		}
 	}

app/scss/setup.scss

@@ -69,6 +69,10 @@ body {
 }
 
 #setup-page {
+	//Don't show blue border on click
+	*:focus {
+	    outline: none;
+	}	
 	#header {
 		height: 53px;
 		color: $white;

manifest.json

@@ -12,7 +12,6 @@
 	"version_name": "8.1.1",
 	"default_locale": "en",
 	"description": "__MSG_short_description__",
-	"log": true,
 	"icons": {
 		"16": "app/images/icon16.png",
 		"48": "app/images/icon48.png",