mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web synced 2024-11-27 19:56:47 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop

Browse source
This commit is contained in:
Weblate 2018-03-20 10:57:36 +00:00
commit 62ee0ae608
2 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/components/structures/UserSettings.js
View file

@ -795,11 +795,18 @@ module.exports = React.createClass({
}
return (
<div>
<h3>{ _t("Bug Report") }</h3>
<h3>{ _t("Debug Logs Submission") }</h3>
<div className="mx_UserSettings_section">
<p>{ _t("Found a bug?") }</p>
<p>{
_t( "If you've submitted a bug via GitHub, debug logs can help " +
"us track down the problem. Debug logs contain application " +
"usage data including your username, the IDs or aliases of " +
"the rooms or groups you have visited and the usernames of " +
"other users. They do not contian messages.",
)
}</p>
<button className="mx_UserSettings_button danger"
onClick={this._onBugReportClicked}>{ _t('Report it') }
onClick={this._onBugReportClicked}>{ _t('Submit debug logs') }
</button>
</div>
</div>

6
src/i18n/strings/en_EN.json
View file

@ -860,9 +860,9 @@
"Device ID:": "Device ID:",
"Device key:": "Device key:",
"Ignored Users": "Ignored Users",
"Bug Report": "Bug Report",
"Found a bug?": "Found a bug?",
"Report it": "Report it",
"Debug Logs Submission": "Debug Logs Submission",
"If you've submitted a bug via GitHub, debug logs can help us track down the problem. Debug logs contain application usage data including your username, the IDs or aliases of the rooms or groups you have visited and the usernames of other users. They do not contian messages.": "If you've submitted a bug via GitHub, debug logs can help us track down the problem. Debug logs contain application usage data including your username, the IDs or aliases of the rooms or groups you have visited and the usernames of other users. They do not contian messages.",
"Submit debug logs": "Submit debug logs",
"Riot collects anonymous analytics to allow us to improve the application.": "Riot collects anonymous analytics to allow us to improve the application.",
"Privacy is important to us, so we don't collect any personal or identifiable data for our analytics.": "Privacy is important to us, so we don't collect any personal or identifiable data for our analytics.",
"Learn more about how we use analytics.": "Learn more about how we use analytics.",