From 19d3809ad5ca2299216e4b7793c39cc357b2b676 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A9lanie=20Chauvel?= Date: Tue, 4 May 2021 23:23:36 +0200 Subject: [PATCH] Improve description of keyboard shortcuts (#16129) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Remove useless “to” from shortcuts description * Improve descriptions of keyboard shortcuts * Use curved quotations marks instead of straight ones --- app/javascript/mastodon/locales/en.json | 62 ++++++++++++------------- config/locales/devise.en.yml | 2 +- 2 files changed, 32 insertions(+), 32 deletions(-) diff --git a/app/javascript/mastodon/locales/en.json b/app/javascript/mastodon/locales/en.json index 1a742d48f..6ef9c7922 100644 --- a/app/javascript/mastodon/locales/en.json +++ b/app/javascript/mastodon/locales/en.json @@ -206,40 +206,40 @@ "intervals.full.days": "{number, plural, one {# day} other {# days}}", "intervals.full.hours": "{number, plural, one {# hour} other {# hours}}", "intervals.full.minutes": "{number, plural, one {# minute} other {# minutes}}", - "keyboard_shortcuts.back": "to navigate back", - "keyboard_shortcuts.blocked": "to open blocked users list", - "keyboard_shortcuts.boost": "to boost", - "keyboard_shortcuts.column": "to focus a post in one of the columns", - "keyboard_shortcuts.compose": "to focus the compose textarea", + "keyboard_shortcuts.back": "Navigate back", + "keyboard_shortcuts.blocked": "Open blocked users list", + "keyboard_shortcuts.boost": "Boost post", + "keyboard_shortcuts.column": "Focus column", + "keyboard_shortcuts.compose": "Focus compose textarea", "keyboard_shortcuts.description": "Description", - "keyboard_shortcuts.direct": "to open direct messages column", - "keyboard_shortcuts.down": "to move down in the list", - "keyboard_shortcuts.enter": "to open post", - "keyboard_shortcuts.favourite": "to favourite", - "keyboard_shortcuts.favourites": "to open favourites list", - "keyboard_shortcuts.federated": "to open federated timeline", + "keyboard_shortcuts.direct": "Open direct messages column", + "keyboard_shortcuts.down": "Move down in the list", + "keyboard_shortcuts.enter": "Open post", + "keyboard_shortcuts.favourite": "Favourite post", + "keyboard_shortcuts.favourites": "Open favourites list", + "keyboard_shortcuts.federated": "Open federated timeline", "keyboard_shortcuts.heading": "Keyboard shortcuts", - "keyboard_shortcuts.home": "to open home timeline", + "keyboard_shortcuts.home": "Open home timeline", "keyboard_shortcuts.hotkey": "Hotkey", - "keyboard_shortcuts.legend": "to display this legend", - "keyboard_shortcuts.local": "to open local timeline", - "keyboard_shortcuts.mention": "to mention author", - "keyboard_shortcuts.muted": "to open muted users list", - "keyboard_shortcuts.my_profile": "to open your profile", - "keyboard_shortcuts.notifications": "to open notifications column", - "keyboard_shortcuts.open_media": "to open media", - "keyboard_shortcuts.pinned": "to open pinned posts list", - "keyboard_shortcuts.profile": "to open author's profile", - "keyboard_shortcuts.reply": "to reply", - "keyboard_shortcuts.requests": "to open follow requests list", - "keyboard_shortcuts.search": "to focus search", - "keyboard_shortcuts.spoilers": "to show/hide CW field", - "keyboard_shortcuts.start": "to open \"get started\" column", - "keyboard_shortcuts.toggle_hidden": "to show/hide text behind CW", - "keyboard_shortcuts.toggle_sensitivity": "to show/hide media", - "keyboard_shortcuts.toot": "to start a brand new post", - "keyboard_shortcuts.unfocus": "to un-focus compose textarea/search", - "keyboard_shortcuts.up": "to move up in the list", + "keyboard_shortcuts.legend": "Display this legend", + "keyboard_shortcuts.local": "Open local timeline", + "keyboard_shortcuts.mention": "Mention author", + "keyboard_shortcuts.muted": "Open muted users list", + "keyboard_shortcuts.my_profile": "Open your profile", + "keyboard_shortcuts.notifications": "Open notifications column", + "keyboard_shortcuts.open_media": "Open media", + "keyboard_shortcuts.pinned": "Open pinned posts list", + "keyboard_shortcuts.profile": "Open author's profile", + "keyboard_shortcuts.reply": "Reply to post", + "keyboard_shortcuts.requests": "Open follow requests list", + "keyboard_shortcuts.search": "Focus search bar", + "keyboard_shortcuts.spoilers": "Show/hide CW field", + "keyboard_shortcuts.start": "Open “get started” column", + "keyboard_shortcuts.toggle_hidden": "Show/hide text behind CW", + "keyboard_shortcuts.toggle_sensitivity": "Show/hide media", + "keyboard_shortcuts.toot": "Start a new post", + "keyboard_shortcuts.unfocus": "Unfocus compose textarea/search", + "keyboard_shortcuts.up": "Move up in the list", "lightbox.close": "Close", "lightbox.compress": "Compress image view box", "lightbox.expand": "Expand image view box", diff --git a/config/locales/devise.en.yml b/config/locales/devise.en.yml index cc4140d14..458fa6d75 100644 --- a/config/locales/devise.en.yml +++ b/config/locales/devise.en.yml @@ -78,7 +78,7 @@ en: subject: 'Mastodon: Security key authentication enabled' title: Security keys enabled omniauth_callbacks: - failure: Could not authenticate you from %{kind} because "%{reason}". + failure: Could not authenticate you from %{kind} because “%{reason}”. success: Successfully authenticated from %{kind} account. passwords: no_token: You can't access this page without coming from a password reset email. If you do come from a password reset email, please make sure you used the full URL provided.