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, 0 insertions, 112 deletions

diff --git a/src/_locales/bs/messages.json b/src/_locales/bs/messages.json
deleted file mode 100644
index 9cf59d06..00000000
--- a/src/_locales/bs/messages.json
+++ /dev/null
@@ -1,112 +0,0 @@
-{
-    "extensionName": {
-        "message": "vhack-LibRedirect",
-        "description": "name of the extension"
-    },
-    "extensionDescription": {
-        "message": "A soft fork of the LibRedirect extension, preconfigured with the vhack.eu services",
-        "description": "description of the extension"
-    },
-    "switchInstance": {
-        "message": "Prebaci instancu",
-        "description": "used in manifest.json as shortcut description"
-    },
-    "settings": {
-        "message": "Podešavanja",
-        "description": "used in the popup"
-    },
-    "general": {
-        "message": "Općenito",
-        "description": "used in the settings page"
-    },
-    "theme": {
-        "message": "Tema",
-        "description": "used in the settings page"
-    },
-    "light": {
-        "message": "Svjetla",
-        "description": "used in the settings page"
-    },
-    "dark": {
-        "message": "Mračna",
-        "description": "used in the settings page"
-    },
-    "auto": {
-        "message": "Auto",
-        "description": "used in the settings page"
-    },
-    "excludeFromRedirecting": {
-        "message": "Isključeno iz preusmjeravanja",
-        "description": "used in the settings page"
-    },
-    "importSettings": {
-        "message": "Uvozne Postavke",
-        "description": "used in the settings page"
-    },
-    "exportSettings": {
-        "message": "Izvozne Postavke",
-        "description": "used in the settings page"
-    },
-    "resetSettings": {
-        "message": "Obnovite Postavke",
-        "description": "used in the settings page"
-    },
-    "enable": {
-        "message": "Omogući",
-        "description": "used in the settings page"
-    },
-    "showInPopup": {
-        "message": "Prikaži u skočnom prozoru",
-        "description": "used in the settings page"
-    },
-    "frontend": {
-        "message": "Sučelje",
-        "description": "used in the settings page"
-    },
-    "redirectType": {
-        "message": "Vrsta Preusmjeravanja",
-        "description": "used in the settings page"
-    },
-    "both": {
-        "message": "oba",
-        "description": "used in the settings page"
-    },
-    "onlyEmbedded": {
-        "message": "samo ugrađeno",
-        "description": "used in the settings page"
-    },
-    "onlyNotEmbedded": {
-        "message": "samo neugrađeno",
-        "description": "used in the settings page"
-    },
-    "addYourFavoriteInstances": {
-        "message": "Dodajte vaše omiljene instance",
-        "description": "used in the settings page"
-    },
-    "copyRaw": {
-        "message": "Kopirajte neobrađenu kodu"
-    },
-    "copied": {
-        "message": "Kopirano"
-    },
-    "redirectToOriginal": {
-        "message": "Preusmjerite prema originalnoj",
-        "description": "Used in context menus when right clicking on a page/tab"
-    },
-    "redirectLink": {
-        "message": "Pokušajte preusmjeriti",
-        "description": "Used in context menus when right clicking on a hyperlink"
-    },
-    "about": {
-        "message": "O"
-    },
-    "unsupportedIframesHandling": {
-        "message": "Unsupported iframes handling"
-    },
-    "fetchPublicInstances": {
-        "message": "Fetch public instances"
-    },
-    "disable": {
-        "message": "Disable"
-    }
-}
\ No newline at end of file