diff --git a/app/assets/stylesheets/common/components/keyboard_shortcuts.css.scss b/app/assets/stylesheets/common/components/keyboard_shortcuts.css.scss
index ef96b1ae8e2..1072a8c6faa 100644
--- a/app/assets/stylesheets/common/components/keyboard_shortcuts.css.scss
+++ b/app/assets/stylesheets/common/components/keyboard_shortcuts.css.scss
@@ -15,9 +15,12 @@
}
#keyboard-shortcuts-help {
+ .span6 {
+ width:32%;
+ }
ul {
list-style: none;
- padding-left: 0;
+ margin-left: 0;
li {
margin: 5px 0
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index ce59f9756c1..8f30a72768c 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -1999,12 +1999,12 @@ en:
title: 'Keyboard Shortcuts'
jump_to:
title: 'Jump To'
- home: 'g then h Home (Latest)'
- latest: 'g then l Latest'
- new: 'g then n New'
- unread: 'g then u Unread'
- starred: 'g then f Starred'
- categories: 'g then c Categories'
+ home: 'g, h Home (Latest)'
+ latest: 'g, l Latest'
+ new: 'g, n New'
+ unread: 'g, u Unread'
+ starred: 'g, f Starred'
+ categories: 'g, c Categories'
navigation:
title: 'Navigation'
jump: '# Go to post number'
@@ -2031,10 +2031,10 @@ en:
bookmark: 'b Bookmark post'
edit: 'e Edit post'
delete: 'd Delete post'
- mark_muted: 'm then m Mark topic as muted'
- mark_regular: 'm then r Mark topic as regular'
- mark_tracking: 'm then t Mark topic as tracking'
- mark_watching: 'm then w Mark topic as watching'
+ mark_muted: 'm, m Mute topic'
+ mark_regular: 'm, r Regular (default) topic'
+ mark_tracking: 'm, t Track topic'
+ mark_watching: 'm, w Watch topic'
badges:
title: Badges