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, 113 deletions

diff --git a/src/_locales/fr/messages.json b/src/_locales/fr/messages.json
deleted file mode 100644
index 993271aa..00000000
--- a/src/_locales/fr/messages.json
+++ /dev/null
@@ -1,113 +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": "Changer d'instance",
-        "description": "used in manifest.json as shortcut description"
-    },
-    "settings": {
-        "message": "Paramètres",
-        "description": "used in the popup"
-    },
-    "general": {
-        "message": "Général",
-        "description": "used in the settings page"
-    },
-    "theme": {
-        "message": "Thème",
-        "description": "used in the settings page"
-    },
-    "light": {
-        "message": "Clair",
-        "description": "used in the settings page"
-    },
-    "dark": {
-        "message": "Sombre",
-        "description": "used in the settings page"
-    },
-    "auto": {
-        "message": "Auto",
-        "description": "used in the settings page"
-    },
-    "excludeFromRedirecting": {
-        "message": "Exclus de la redirection",
-        "description": "used in the settings page"
-    },
-    "importSettings": {
-        "message": "Importer les paramètres",
-        "description": "used in the settings page"
-    },
-    "exportSettings": {
-        "message": "Exporter les paramètres",
-        "description": "used in the settings page"
-    },
-    "resetSettings": {
-        "message": "Réinitialiser les paramètres",
-        "description": "used in the settings page"
-    },
-    "enable": {
-        "message": "Activer",
-        "description": "used in the settings page"
-    },
-    "showInPopup": {
-        "message": "Afficher dans la fenêtre contextuelle",
-        "description": "used in the settings page"
-    },
-    "frontend": {
-        "message": "Interface",
-        "description": "used in the settings page"
-    },
-    "redirectType": {
-        "message": "Type de redirection",
-        "description": "used in the settings page"
-    },
-    "both": {
-        "message": "les deux",
-        "description": "used in the settings page"
-    },
-    "onlyEmbedded": {
-        "message": "uniquement intégré",
-        "description": "used in the settings page"
-    },
-    "onlyNotEmbedded": {
-        "message": "seulement non intégré",
-        "description": "used in the settings page"
-    },
-    "addYourFavoriteInstances": {
-        "message": "Ajoutez vos instances favorites",
-        "description": "used in the settings page"
-    },
-    "copyRaw": {
-        "message": "Copier le lien original"
-    },
-    "copied": {
-        "message": "Copié"
-    },
-    "redirectToOriginal": {
-        "message": "Rediriger vers l'original",
-        "description": "Used in context menus when right clicking on a page/tab"
-    },
-    "redirectLink": {
-        "message": "Essayer de rediriger",
-        "description": "Used in context menus when right clicking on a hyperlink"
-    },
-    "about": {
-        "message": "À propos"
-    },
-    "unsupportedIframesHandling": {
-        "message": "Unsupported iframes handling"
-    },
-    },
-    "fetchPublicInstances": {
-        "message": "Rechercher des instances publiques"
-    },
-    "disable": {
-        "message": "Désactiver"
-    }
-}