Merge remote-tracking branch 'mibmo/docs/config-path-clarification'

This commit is contained in:
Travis Ralston 2021-11-24 13:06:47 -07:00
commit 59bdb67bdd
3 changed files with 18 additions and 5 deletions

View File

@ -230,7 +230,12 @@
</p>
<p>{{'Here\'s the configuration options you\'ll need to update in your Element' | translate}} <code>config.json</code>:</p>
<pre>{{ integrationsConfig }}</pre>
{{'The location of' | translate}} <code>config.json</code>
{{'differs depending on whether the' | translate}}
<a href="https://github.com/vector-im/element-web/blob/develop/docs/config.md" target="_blank">web</a>
{{'or' | translate}}
<a href="https://github.com/vector-im/element-desktop#user-specified-configjson" target="_blank">desktop</a>
{{'version of Element is used.' | translate}}
<h4>{{'Configuring integrations' | translate}}</h4>
<p>
{{'If everything is set up correctly, you\'ll be able to access the admin area of Dimension by clicking the 3x3 grid in the top right of any room in Element. The gear icon' | translate}}

View File

@ -459,5 +459,9 @@
"Checking client version...": "Checking client version...",
"Your client is too old to use this widget, sorry": "Your client is too old to use this widget, sorry",
"Please accept the prompt to verify your identity": "Please accept the prompt to verify your identity",
"Error loading policy": "Error loading policy"
}
"Error loading policy": "Error loading policy",
"The location of": "The location of ",
"differs depending on whether the": " differs depending on whether the",
"or": " or ",
"version of Element is used.": " version of Element is used."
}

View File

@ -459,5 +459,9 @@
"Checking client version...": "Checking client version...",
"Your client is too old to use this widget, sorry": "Your client is too old to use this widget, sorry",
"Please accept the prompt to verify your identity": "Please accept the prompt to verify your identity",
"Error loading policy": "Error loading policy"
}
"Error loading policy": "Error loading policy",
"The location of": "The location of",
"differs depending on whether the": "differs depending on whether the",
"or": "or",
"version of Element is used.": "version of Element is used."
}