diff options
| author |  Stefan Malzner <stefan@adlk.io> | 2017-10-27 10:40:06 +0200 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2017-10-27 10:40:06 +0200 |
| commit | 84129e2b01e390d20dd5eeef4c4d2a9165397f3b (patch) | |
| tree | 508812c1bd755929bd67d12770094a75c810cb34 /src/components/layout/Sidebar.js | |
| parent | Removed mainWindow parameter from Tray class (diff) | |
| parent | Merge pull request #112 from haveneersrobin/master (diff) | |
| download | ferdium-app-84129e2b01e390d20dd5eeef4c4d2a9165397f3b.tar.gz ferdium-app-84129e2b01e390d20dd5eeef4c4d2a9165397f3b.tar.zst ferdium-app-84129e2b01e390d20dd5eeef4c4d2a9165397f3b.zip | |
Merge branch 'develop' into fix_tray
Diffstat (limited to 'src/components/layout/Sidebar.js')
| -rw-r--r-- | src/components/layout/Sidebar.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/components/layout/Sidebar.js b/src/components/layout/Sidebar.js index 4aee1ec60..6a5c0f365 100644 --- a/src/components/layout/Sidebar.js +++ b/src/components/layout/Sidebar.js | |||
| @@ -52,7 +52,7 @@ export default class Sidebar extends Component { | |||
| 52 | <button | 52 | <button |
| 53 | onClick={openSettings} | 53 | onClick={openSettings} |
| 54 | className="sidebar__settings-button" | 54 | className="sidebar__settings-button" |
| 55 | data-tip={`Settings (${ctrlKey}+,)`} | 55 | data-tip={`${intl.formatMessage(messages.settings)} (${ctrlKey}+,)`} |
| 56 | > | 56 | > |
| 57 | {isPremiumUser && ( | 57 | {isPremiumUser && ( |
| 58 | <span className="emoji"> | 58 | <span className="emoji"> |