chore(merge): Merge remote-tracking branch 'origin/master'

Following Conflicts have been resolved:
        README.md
        src/_locales/bs/messages.json
        src/_locales/de/messages.json
        src/_locales/en/messages.json
        src/_locales/fr/messages.json
        src/_locales/ko/messages.json
        src/_locales/nb_NO/messages.json
        src/_locales/pt/messages.json
        src/_locales/pt_BR/messages.json
        src/_locales/sr/messages.json
        src/_locales/vi/messages.json
        src/assets/images/libredirect.svg
        src/assets/javascripts/services.js
        src/config.json
        src/manifest.json
        src/updates/updates.xml

1 files changed, 92 insertions, 59 deletions

diff --git a/src/_locales/fi/messages.json b/src/_locales/fi/messages.json
index 0b6b797b..ee2793b5 100644
--- a/src/_locales/fi/messages.json
+++ b/src/_locales/fi/messages.json
@@ -1,21 +1,43 @@
 {
-    "excludeFromRedirecting": {
-        "message": "Poissuljettu uudelleenohjaukselta",
-        "description": "used in the settings page"
-    },
-    "copyRaw": {
-        "message": "Kopioi alkuperäinen"
+    "extensionName": {
+        "message": "LibRedirect",
+        "description": "name of the extension"
     },
-    "both": {
-        "message": "molemmat",
-        "description": "used in the settings page"
+    "extensionDescription": {
+        "message": "Selainlaajennus joka uudelleenohjaa suositut sivustot vaihtoehtoisiin yksityisyysystävällisiin käyttöliittymiin",
+        "description": "description of the extension"
     },
     "switchInstance": {
         "message": "Vaihda instanssi",
         "description": "used in manifest.json as shortcut description"
     },
-    "unsupportedIframesHandling": {
-        "message": "Tukemattomien iframejen käsittely"
+    "settings": {
+        "message": "Asetukset",
+        "description": "used in the popup"
+    },
+    "general": {
+        "message": "Yleiset",
+        "description": "used in the settings page"
+    },
+    "theme": {
+        "message": "Teema",
+        "description": "used in the settings page"
+    },
+    "light": {
+        "message": "Vaalea",
+        "description": "used in the settings page"
+    },
+    "dark": {
+        "message": "Tumma",
+        "description": "used in the settings page"
+    },
+    "auto": {
+        "message": "Automaattinen",
+        "description": "used in the settings page"
+    },
+    "excludeFromRedirecting": {
+        "message": "Poissuljettu uudelleenohjaukselta",
+        "description": "used in the settings page"
     },
     "importSettings": {
         "message": "Tuo asetukset",
@@ -25,88 +47,99 @@
         "message": "Vie asetukset",
         "description": "used in the settings page"
     },
-    "fetchPublicInstances": {
-        "message": "Hae julkiset instanssit"
-    },
-    "addYourFavoriteInstances": {
-        "message": "Lisää suosikki-instanssisi",
+    "resetSettings": {
+        "message": "Nollaa asetukset",
         "description": "used in the settings page"
     },
-    "extensionName": {
-        "message": "LibRedirect",
-        "description": "name of the extension"
+    "enable": {
+        "message": "Ota käyttöön",
+        "description": "used in the settings page"
     },
     "showInPopup": {
         "message": "Näytä ponnahdusvalikossa",
         "description": "used in the settings page"
     },
-    "theme": {
-        "message": "Teema",
+    "frontend": {
+        "message": "Käyttöliittymä",
+        "description": "used in the settings page"
+    },
+    "redirectType": {
+        "message": "Uudelleenohjauksen tyyppi",
+        "description": "used in the settings page"
+    },
+    "both": {
+        "message": "molemmat",
         "description": "used in the settings page"
     },
     "onlyEmbedded": {
         "message": "vain upotteet",
         "description": "used in the settings page"
     },
-    "light": {
-        "message": "Vaalea",
+    "onlyNotEmbedded": {
+        "message": "vain muut kuin upotteet",
         "description": "used in the settings page"
     },
-    "frontend": {
-        "message": "Käyttöliittymä",
+    "addYourFavoriteInstances": {
+        "message": "Lisää suosikki-instanssisi",
         "description": "used in the settings page"
     },
-    "extensionDescription": {
-        "message": "Selainlaajennus joka uudelleenohjaa suositut sivustot vaihtoehtoisiin yksityisyysystävällisiin käyttöliittymiin",
-        "description": "description of the extension"
+    "copyOriginal": {
+        "message": "Copy Original"
     },
     "copied": {
         "message": "Kopioitu"
     },
-    "onlyNotEmbedded": {
-        "message": "vain muut kuin upotteet",
-        "description": "used in the settings page"
-    },
-    "about": {
-        "message": "Tietoja"
+    "redirectToOriginal": {
+        "message": "Uudelleenohjaa alkuperäiseen",
+        "description": "Used in context menus when right clicking on a page/tab"
     },
     "redirectLink": {
         "message": "Yritä uudelleenohjata",
         "description": "Used in context menus when right clicking on a hyperlink"
     },
-    "redirectType": {
-        "message": "Uudelleenohjauksen tyyppi",
-        "description": "used in the settings page"
-    },
-    "dark": {
-        "message": "Tumma",
-        "description": "used in the settings page"
+    "about": {
+        "message": "Tietoja"
     },
-    "general": {
-        "message": "Yleiset",
-        "description": "used in the settings page"
+    "unsupportedIframesHandling": {
+        "message": "Tukemattomien iframejen käsittely"
     },
-    "enable": {
-        "message": "Ota käyttöön",
-        "description": "used in the settings page"
+    "fetchPublicInstances": {
+        "message": "Hae julkiset instanssit"
     },
     "disable": {
         "message": "Poista käytöstä"
     },
-    "redirectToOriginal": {
-        "message": "Uudelleenohjaa alkuperäiseen",
-        "description": "Used in context menus when right clicking on a page/tab"
+    "pingInstances": {
+        "message": "Ping Instances"
     },
-    "auto": {
-        "message": "Automaattinen",
-        "description": "used in the settings page"
+    "exportSettingsToSync": {
+        "message": "Export Settings to Sync"
     },
-    "settings": {
-        "message": "Asetukset",
-        "description": "used in the popup"
+    "importSettingsFromSync": {
+        "message": "Import Settings from Sync"
     },
-    "resetSettings": {
-        "message": "Nollaa asetukset",
-        "description": "used in the settings page"
+    "services": {
+        "message": "Services"
+    },
+    "service": {
+        "message": "Service"
+    },
+    "bookmarksMenu": {
+        "message": "Bookmarks menu"
+    },
+    "redirectOnlyInIncognito": {
+        "message": "Redirect Only in Incognito"
+    },
+    "bypass": {
+        "message": "Bypass"
+    },
+    "block": {
+        "message": "Block"
+    },
+    "searchHint": {
+        "message": "Set LibRedirect as Default Search Engine. For how to do in chromium browsers, click <a href='https://libredirect.github.io/docs.html#search_engine_chromium' target='_blank' rel='noopener noreferrer'>here</a>."
+    },
+    "redirect": {
+        "message": "Redirect"
     }
 }