Merge branch 'develop' into feature/yarn

.tx/config

@@ -2,7 +2,7 @@
 host = https://www.transifex.com
 
 [ghostery-8.messages-json]
-file_filter = _locales<lang>messages.json
+file_filter = _locales/<lang>/messages.json
 minimum_perc = 0
 source_file = _locales/en/messages.json
 source_lang = en_US

_locales/de/messages.json

@@ -699,9 +699,6 @@
 	"panel_detail_rewards_title": {
 		"message": "Ghostery Rewards"
 	},
-	"panel_detail_rewards_text": {
-		"message": "Funktion ist demnächst verfügbar."
-	},
 	"panel_detail_premium_title": {
 		"message": "Ghostery Premium"
 	},
@@ -1292,26 +1289,6 @@
 	"setup_login_view_password_error": {
 		"message": "Verwenden Sie zwischen 8 und 50 Zeichen."
 	},
-	"setup_login_view_terms_error": {
-		"message": "Sie müssen dies akzeptieren."
-	},
-	"setup_login_view_terms": {
-		"message": "Ich erkläre mich mit Ghosterys $LINK_PP_START$Datenschutzrichtlinie$LINK_PP_END$ und $LINK_TERMS_START$Benutzungsbedingungen$LINK_TERMS_END$ einverstanden",
-		"placeholders": {
-			"link_pp_start": {
-				"content": "<a href=\"https://www.ghostery.com/about-ghostery/browser-extension-privacy-policy/\" target=\"_blank\">"
-			},
-			"link_pp_end": {
-				"content": "</a>"
-			},
-			"link_terms_start": {
-				"content": "<a href=\"https://www.ghostery.com/about-ghostery/browser-extension-end-user-license-agreement/\" target=\"_blank\">"
-			},
-			"link_terms_end": {
-				"content": "</a>"
-			}
-		}
-	},
 	"setup_login_view_create_account": {
 		"message": "Haben Sie noch kein Benutzerkonto? Erstellen Sie eins."
 	},

_locales/en/messages.json

@@ -756,9 +756,21 @@
 	"panel_detail_rewards_title": {
 		"message": "Ghostery Rewards"
 	},
-	"panel_detail_rewards_text": {
+	"panel_detail_rewards_coming_soon": {
 		"message": "Feature coming soon."
 	},
+	"panel_detail_rewards_cliqz_text": {
+		"message": "Feature already active in the Cliqz MyOffrz control panel."
+	},
+	"panel_detail_rewards_loading": {
+		"message": "Loading Rewards..."
+	},
+	"panel_detail_rewards_none_found": {
+		"message": "No Rewards found"
+	},
+	"panel_detail_rewards_off": {
+		"message": "Ghostery Rewards is OFF"
+	},
 	"panel_detail_premium_title": {
 		"message": "Ghostery Premium"
 	},
@@ -1599,5 +1611,89 @@
 	},
 	"enable_when_not_scanned": {
 		"message": "To use this function, navigate to another page."
+	},
+	"rewards_new_text": {
+		"message": "new Reward was discovered"
+	},
+	"rewards_copy_code": {
+		"message": "copy code"
+	},
+	"rewards_code_copied": {
+		"message": "code copied"
+	},
+	"rewards_expires_in": {
+		"description": "example: Expires in 8 minutes. TYPE will be rewards_expires_in_TYPE listed below.",
+		"message": "Expires in $COUNT$ $TYPE$",
+		"placeholders": {
+			"count": {
+				"content": "$1"
+			},
+			"type": {
+				"content": "$2"
+			}
+		}
+	},
+	"rewards_expires_in_days": {
+		"message": "days"
+	},
+	"rewards_expires_in_hours": {
+		"message": "hours"
+	},
+	"rewards_expires_in_mins": {
+		"message": "minutes"
+	},
+	"rewards_expires_in_secs": {
+		"message": "seconds"
+	},
+	"rewards_terms_conditions": {
+		"message": "Terms & Conditions"
+	},
+	"rewards_disable": {
+		"message": "Turn off Ghostery rewards"
+	},
+	"rewards_disable_notification": {
+		"message": "Ghostery Rewards is now off. You can always turn it on in Ghostery Settings or in the Ghostery Dashboard."
+	},
+	"rewards_disable_confirm": {
+		"message": "OK, got it."
+	},
+	"rewards_about": {
+		"message": "About Ghostery Rewards"
+	},
+	"rewards_settings": {
+		"message": "Ghostery Rewards Settings"
+	},
+	"rewards_delete": {
+		"message": "Delete this reward"
+	},
+	"rewards_first_prompt": {
+		"message": "Would you like to continue to Ghostery Rewards?"
+	},
+	"rewards_second_prompt": {
+		"message": "Are you sure you would like to opt-out of Ghostery Rewards?"
+	},
+	"rewards_yes": {
+		"message": "yes"
+	},
+	"rewards_no": {
+		"message": "no"
+	},
+	"rewards_on": {
+		"message": "on"
+	},
+	"rewards_off": {
+		"message": "off"
+	},
+	"rewards_on_toast_notification": {
+		"message": "Ghostery Rewards is ON"
+	},
+	"rewards_off_toast_notification": {
+		"message": "Ghostery Rewards is OFF"
+	},
+	"rewards_code_copied_toast_notification": {
+		"message": "Rewards code copied!"
+	},
+	"rewards_learn_more": {
+		"message": "Learn More"
 	}
 }

_locales/es/messages.json

@@ -699,9 +699,6 @@
 	"panel_detail_rewards_title": {
 		"message": "Recompensas de Ghostery"
 	},
-	"panel_detail_rewards_text": {
-		"message": "Pronto tendrás esta función."
-	},
 	"panel_detail_premium_title": {
 		"message": "Ghostery Premium"
 	},
@@ -1289,26 +1286,6 @@
 	"setup_login_view_password_error": {
 		"message": "Usa entre 8 y 50 caracteres."
 	},
-	"setup_login_view_terms_error": {
-		"message": "Debes aceptar esto."
-	},
-	"setup_login_view_terms": {
-		"message": "Acepto la $LINK_PP_START$ política de privacidad $LINK_PP_END$ y las $LINK_TERMS_START$ condiciones de uso $LINK_TERMS_END$ de Ghostery",
-		"placeholders": {
-			"link_pp_start": {
-				"content": "<a href=\"https://www.ghostery.com/about-ghostery/browser-extension-privacy-policy/\" target=\"_blank\">"
-			},
-			"link_pp_end": {
-				"content": "</a>"
-			},
-			"link_terms_start": {
-				"content": "<a href=\"https://www.ghostery.com/about-ghostery/browser-extension-end-user-license-agreement/\" target=\"_blank\">"
-			},
-			"link_terms_end": {
-				"content": "</a>"
-			}
-		}
-	},
 	"setup_login_view_create_account": {
 		"message": "¿No tienes una cuenta? Crea una."
 	},

_locales/fr/messages.json

@@ -699,9 +699,6 @@
 	"panel_detail_rewards_title": {
 		"message": "Récompenses Ghostery"
 	},
-	"panel_detail_rewards_text": {
-		"message": "Option bientôt disponible."
-	},
 	"panel_detail_premium_title": {
 		"message": "Ghostery Premium"
 	},
@@ -1289,26 +1286,6 @@
 	"setup_login_view_password_error": {
 		"message": "Utilisez entre 8 et 50 caractères."
 	},
-	"setup_login_view_terms_error": {
-		"message": "Vous devez accepter ceci avant de pouvoir continuer."
-	},
-	"setup_login_view_terms": {
-		"message": "J'accepte la $LINK_PP_START$Politique de confidentialité$LINK_PP_END$ et les $LINK_TERMS_START$Conditions d'utilisation$LINK_TERMS_END$ de Ghostery",
-		"placeholders": {
-			"link_pp_start": {
-				"content": "<a href=\"https://www.ghostery.com/about-ghostery/browser-extension-privacy-policy/\" target=\"_blank\">"
-			},
-			"link_pp_end": {
-				"content": "</a>"
-			},
-			"link_terms_start": {
-				"content": "<a href=\"https://www.ghostery.com/about-ghostery/browser-extension-end-user-license-agreement/\" target=\"_blank\">"
-			},
-			"link_terms_end": {
-				"content": "</a>"
-			}
-		}
-	},
 	"setup_login_view_create_account": {
 		"message": "Vous n'avez pas de compte ? Créez-en un."
 	},

_locales/hu/messages.json

@@ -699,9 +699,6 @@
 	"panel_detail_rewards_title": {
 		"message": "Ghostery jutalmak"
 	},
-	"panel_detail_rewards_text": {
-		"message": "Funkció hamarosan érkezik."
-	},
 	"panel_detail_premium_title": {
 		"message": "Ghostery Prémium"
 	},
@@ -1289,26 +1286,6 @@
 	"setup_login_view_password_error": {
 		"message": "8–50 karaktert használjon."
 	},
-	"setup_login_view_terms_error": {
-		"message": "Önnek ezt el kell fogadnia."
-	},
-	"setup_login_view_terms": {
-		"message": "Egyetértek a Ghostery $LINK_PP_START$Adatvédelmi Szabályzatával$LINK_PP_END$ és $LINK_TERMS_START$Felhasználási Feltételeivel$LINK_TERMS_END$",
-		"placeholders": {
-			"link_pp_start": {
-				"content": "<a href=\"https://www.ghostery.com/about-ghostery/browser-extension-privacy-policy/\" target=\"_blank\">"
-			},
-			"link_pp_end": {
-				"content": "</a>"
-			},
-			"link_terms_start": {
-				"content": "<a href=\"https://www.ghostery.com/about-ghostery/browser-extension-end-user-license-agreement/\" target=\"_blank\">"
-			},
-			"link_terms_end": {
-				"content": "</a>"
-			}
-		}
-	},
 	"setup_login_view_create_account": {
 		"message": "Nem rendelkezik fiókkal? Hozzon létre egyet."
 	},

_locales/it/messages.json

@@ -699,9 +699,6 @@
 	"panel_detail_rewards_title": {
 		"message": "Ricompense Ghostery"
 	},
-	"panel_detail_rewards_text": {
-		"message": "Funzionalità presto disponibile."
-	},
 	"panel_detail_premium_title": {
 		"message": "Ghostery Premium"
 	},
@@ -1289,26 +1286,6 @@
 	"setup_login_view_password_error": {
 		"message": "Utilizza tra 8 e 50 caratteri."
 	},
-	"setup_login_view_terms_error": {
-		"message": "Devi accettarli."
-	},
-	"setup_login_view_terms": {
-		"message": "Accetto l'$LINK_PP_START$Informativa sulla Privacy$LINK_PP_END$ e i $LINK_TERMS_START$Termini di Utilizzo$LINK_TERMS_END$ di Ghostery.",
-		"placeholders": {
-			"link_pp_start": {
-				"content": "<a href=\"https://www.ghostery.com/about-ghostery/browser-extension-privacy-policy/\" target=\"_blank\">"
-			},
-			"link_pp_end": {
-				"content": "</a>"
-			},
-			"link_terms_start": {
-				"content": "<a href=\"https://www.ghostery.com/about-ghostery/browser-extension-end-user-license-agreement/\" target=\"_blank\">"
-			},
-			"link_terms_end": {
-				"content": "</a>"
-			}
-		}
-	},
 	"setup_login_view_create_account": {
 		"message": "Non hai un account? Creane uno."
 	},

_locales/ja/messages.json

@@ -699,9 +699,6 @@
 	"panel_detail_rewards_title": {
 		"message": "Ghostery報酬"
 	},
-	"panel_detail_rewards_text": {
-		"message": "近日開始する機能です。"
-	},
 	"panel_detail_premium_title": {
 		"message": "Ghosteryプレミアム"
 	},
@@ -1289,26 +1286,6 @@
 	"setup_login_view_password_error": {
 		"message": "8～50文字を使用してください。"
 	},
-	"setup_login_view_terms_error": {
-		"message": "これを承認する必要があります。"
-	},
-	"setup_login_view_terms": {
-		"message": "Ghosteryの$LINK_PP_START$プライバシーポリシーPrivacy Policy$LINK_PP_END$と$LINK_TERMS_START$利用規約$LINK_TERMS_END$に同意します",
-		"placeholders": {
-			"link_pp_start": {
-				"content": "<a href=\"https://www.ghostery.com/about-ghostery/browser-extension-privacy-policy/\" target=\"_blank\">"
-			},
-			"link_pp_end": {
-				"content": "</a>"
-			},
-			"link_terms_start": {
-				"content": "<a href=\"https://www.ghostery.com/about-ghostery/browser-extension-end-user-license-agreement/\" target=\"_blank\">"
-			},
-			"link_terms_end": {
-				"content": "</a>"
-			}
-		}
-	},
 	"setup_login_view_create_account": {
 		"message": "アカウントをお持ちでないですか？アカウントを作成してください。"
 	},

_locales/ko/messages.json

@@ -699,9 +699,6 @@
 	"panel_detail_rewards_title": {
 		"message": "Ghostery 리워드  "
 	},
-	"panel_detail_rewards_text": {
-		"message": "기능이 곧 제공됩니다."
-	},
 	"panel_detail_premium_title": {
 		"message": "Ghostery 프리미엄 "
 	},
@@ -1289,26 +1286,6 @@
 	"setup_login_view_password_error": {
 		"message": "8자에서 50자까지 사용할 수 있습니다."
 	},
-	"setup_login_view_terms_error": {
-		"message": "이 항목을 수락해야 합니다. "
-	},
-	"setup_login_view_terms": {
-		"message": "Ghostery의 $LINK_PP_START$개인정보 보호정책$LINK_PP_END$ 및 $LINK_TERMS_START$사용 약관$LINK_TERMS_END$에 동의합니다 ",
-		"placeholders": {
-			"link_pp_start": {
-				"content": "<a href=\"https://www.ghostery.com/about-ghostery/browser-extension-privacy-policy/\" target=\"_blank\">"
-			},
-			"link_pp_end": {
-				"content": "</a>"
-			},
-			"link_terms_start": {
-				"content": "<a href=\"https://www.ghostery.com/about-ghostery/browser-extension-end-user-license-agreement/\" target=\"_blank\">"
-			},
-			"link_terms_end": {
-				"content": "</a>"
-			}
-		}
-	},
 	"setup_login_view_create_account": {
 		"message": "계정이 있으십니까? 계정 만들기."
 	},