Merge branch 'tmp1' into develop

This commit is contained in:
Travis Ralston 2020-07-23 16:14:53 -06:00
commit 264bce7ca9
2 changed files with 5 additions and 5 deletions

View File

@ -22,9 +22,9 @@ import { _t } from 'matrix-react-sdk/src/languageHandler';
const VectorAuthFooter = () => { const VectorAuthFooter = () => {
const brandingConfig = SdkConfig.get().branding; const brandingConfig = SdkConfig.get().branding;
let links = [ let links = [
{"text": "blog", "url": "https://element.io/blog"}, {"text": "Blog", "url": "https://element.io/blog"},
{"text": "twitter", "url": "https://twitter.com/element_hq"}, {"text": "Twitter", "url": "https://twitter.com/element_hq"},
{"text": "github", "url": "https://github.com/vector-im/riot-web"}, {"text": "GitHub", "url": "https://github.com/vector-im/riot-web"},
]; ];
if (brandingConfig && brandingConfig.authFooterLinks) { if (brandingConfig && brandingConfig.authFooterLinks) {
@ -43,7 +43,7 @@ const VectorAuthFooter = () => {
return ( return (
<div className="mx_AuthFooter"> <div className="mx_AuthFooter">
{authFooterLinks} {authFooterLinks}
<a href="https://matrix.org" target="_blank" rel="noreferrer noopener">{ _t('powered by Matrix') }</a> <a href="https://matrix.org" target="_blank" rel="noreferrer noopener">{ _t('Powered by Matrix') }</a>
</div> </div>
); );
}; };

View File

@ -18,7 +18,7 @@
"Unknown device": "Unknown device", "Unknown device": "Unknown device",
"%(appName)s (%(browserName)s, %(osName)s)": "%(appName)s (%(browserName)s, %(osName)s)", "%(appName)s (%(browserName)s, %(osName)s)": "%(appName)s (%(browserName)s, %(osName)s)",
"You need to be using HTTPS to place a screen-sharing call.": "You need to be using HTTPS to place a screen-sharing call.", "You need to be using HTTPS to place a screen-sharing call.": "You need to be using HTTPS to place a screen-sharing call.",
"powered by Matrix": "powered by Matrix", "Powered by Matrix": "Powered by Matrix",
"Unsupported browser": "Unsupported browser", "Unsupported browser": "Unsupported browser",
"Your browser can't run %(brand)s": "Your browser can't run %(brand)s", "Your browser can't run %(brand)s": "Your browser can't run %(brand)s",
"%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s uses advanced browser features which aren't supported by your current browser.", "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s uses advanced browser features which aren't supported by your current browser.",