Merge branch 'develop' into luke/fix-rte-tab-complete-after-join

2017-06-26 09:39:49 +01:00
parent ddb84f034e caa0250d30
commit f091d209b9
7 changed files with 143 additions and 88 deletions
--- a/src/components/structures/UserSettings.js
+++ b/src/components/structures/UserSettings.js
@@ -656,7 +656,7 @@ module.exports = React.createClass({
                    <table>
                        <tbody>
                        <tr>
-                            <td><strong>Autocomplete Delay (ms): </strong></td>
+                            <td><strong>{_t('Autocomplete Delay (ms):')}</strong></td>
                            <td>
                                <input
                                    type="number"