tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into glitch-soc/merge-upstream

Browse Source
This commit is contained in:
Thibaut Girka
2018-07-26 21:22:43 +02:00
parent 82ab5aacb2 3c35b34b61
commit 6141c2a035
72 changed files with 741 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/javascript/mastodon/locales/en.json
View File

@@ -141,6 +141,7 @@
"keyboard_shortcuts.hotkey": "Hotkey",
"keyboard_shortcuts.legend": "to display this legend",
"keyboard_shortcuts.mention": "to mention author",
"keyboard_shortcuts.profile": "to open author's profile",
"keyboard_shortcuts.reply": "to reply",
"keyboard_shortcuts.search": "to focus search",
"keyboard_shortcuts.toggle_hidden": "to show/hide text behind CW",