Issue 6170 - import translations for the conflict message

locale/et/desktop-options.json

Index: locale/et/desktop-options.json
===================================================================
--- a/locale/et/desktop-options.json
+++ b/locale/et/desktop-options.json
@@ -293,6 +293,34 @@
   "options_tab_whitelist": {
     "message": "Lubatud veebisaidid"
   },
+  "options_tracking_warning_1": {
+    "message": "Märkasime, et sul on lubatud nii <strong>$tracking$</strong> kui ka <strong>$acceptableAds$</strong>.",
+    "placeholders": {
+      "acceptableAds": {
+        "content": "$2",
+        "example": "Allow Acceptable Ads"
+      },
+      "tracking": {
+        "content": "$1",
+        "example": "Block additional tracking"
+      }
+    }
+  },
+  "options_tracking_warning_2": {
+    "message": "Soovime sulle teatada, et reklaamijad saaks sulle näidata asjakohasemaid reklaame, on Lubatud reklaamidel <strong>võibolla</strong> mõnd jälitamist."
+  },
+  "options_tracking_warning_3": {
+    "message": "Kui eelistad täiendavat privaatsust, märgista allolev märkeruut <strong>$acceptableAdsPrivacy$</strong>.",
+    "placeholders": {
+      "acceptableAdsPrivacy": {
+        "content": "$1",
+        "example": "Only allow ads without third-party tracking"
+      }
+    }
+  },
+  "options_tracking_warning_acknowledgment": {
+    "message": "Selge, sain aru"
+  },
   "options_whitelist_add": {
     "message": "Lisa veebisait"
   },