diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json index 3582ca359..9468bb8b2 100644 --- a/src/i18n/strings/en_EN.json +++ b/src/i18n/strings/en_EN.json @@ -1,12 +1,12 @@ { - "Unexpected error preparing the app. See console for details.": "Unexpected error preparing the app. See console for details.", - "Your Riot is misconfigured": "Your Riot is misconfigured", "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.", "Invalid configuration: no default server specified.": "Invalid configuration: no default server specified.", + "Your Riot is misconfigured": "Your Riot is misconfigured", "Your Riot configuration contains invalid JSON. Please correct the problem and reload the page.": "Your Riot configuration contains invalid JSON. Please correct the problem and reload the page.", "The message from the parser is: %(message)s": "The message from the parser is: %(message)s", "Invalid JSON": "Invalid JSON", "Unable to load config file: please refresh the page to try again.": "Unable to load config file: please refresh the page to try again.", + "Unexpected error preparing the app. See console for details.": "Unexpected error preparing the app. See console for details.", "Open user settings": "Open user settings", "Riot Desktop on %(platformName)s": "Riot Desktop on %(platformName)s", "Go to your browser to complete Sign In": "Go to your browser to complete Sign In", diff --git a/src/vector/app.js b/src/vector/app.js index e92cdd2d6..d446b38b4 100644 --- a/src/vector/app.js +++ b/src/vector/app.js @@ -26,7 +26,7 @@ global.React = React; import * as sdk from 'matrix-react-sdk'; import PlatformPeg from 'matrix-react-sdk/src/PlatformPeg'; import * as VectorConferenceHandler from 'matrix-react-sdk/src/VectorConferenceHandler'; -import {_t, _td, newTranslatableError} from 'matrix-react-sdk/src/languageHandler'; +import {_td, newTranslatableError} from 'matrix-react-sdk/src/languageHandler'; import AutoDiscoveryUtils from 'matrix-react-sdk/src/utils/AutoDiscoveryUtils'; import {AutoDiscovery} from "matrix-js-sdk/src/autodiscovery"; import * as Lifecycle from "matrix-react-sdk/src/Lifecycle"; diff --git a/src/vector/index.ts b/src/vector/index.ts index 1c89c4311..cb877320f 100644 --- a/src/vector/index.ts +++ b/src/vector/index.ts @@ -21,8 +21,6 @@ limitations under the License. // Require common CSS here; this will make webpack process it into bundle.css. // Our own CSS (which is themed) is imported via separate webpack entry points // in webpack.config.js -import React from "react"; - require('gfm.css/gfm.css'); require('highlight.js/styles/github.css');