diff options
author | Jenkins <jenkins@jenkins.ninjawedding.org> | 2017-12-02 14:17:11 +0000 |
---|---|---|
committer | Jenkins <jenkins@jenkins.ninjawedding.org> | 2017-12-02 14:17:11 +0000 |
commit | 933eafdcd3a3803e9fcf934f6f7ade667281c527 (patch) | |
tree | 94f5ab03f7cd733cc0743f3c79cf02a8de4c148f /app/javascript | |
parent | ad46bc9772dfc52c7ed522658eda1a3ef608a7b3 (diff) | |
parent | 51f2eca8877d8c56a19e1b8ce4edf407c2d236fb (diff) |
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
Diffstat (limited to 'app/javascript')
-rw-r--r-- | app/javascript/mastodon/locales/ja.json | 34 | ||||
-rw-r--r-- | app/javascript/styles/mastodon/components.scss | 2 |
2 files changed, 17 insertions, 19 deletions
diff --git a/app/javascript/mastodon/locales/ja.json b/app/javascript/mastodon/locales/ja.json index 05e935d52..4d3881ff2 100644 --- a/app/javascript/mastodon/locales/ja.json +++ b/app/javascript/mastodon/locales/ja.json @@ -102,23 +102,23 @@ "home.column_settings.show_reblogs": "ブースト表示", "home.column_settings.show_replies": "返信表示", "home.settings": "カラム設定", - "keyboard_shortcuts.back": "to navigate back", - "keyboard_shortcuts.boost": "to boost", - "keyboard_shortcuts.column": "to focus a status in one of the columns", - "keyboard_shortcuts.compose": "to focus the compose textarea", - "keyboard_shortcuts.description": "Description", - "keyboard_shortcuts.down": "to move down in the list", - "keyboard_shortcuts.enter": "to open status", - "keyboard_shortcuts.favourite": "to favourite", - "keyboard_shortcuts.heading": "Keyboard Shortcuts", - "keyboard_shortcuts.hotkey": "Hotkey", - "keyboard_shortcuts.legend": "to display this legend", - "keyboard_shortcuts.mention": "to mention author", - "keyboard_shortcuts.reply": "to reply", - "keyboard_shortcuts.search": "to focus search", - "keyboard_shortcuts.toot": "to start a brand new toot", - "keyboard_shortcuts.unfocus": "to un-focus compose textarea/search", - "keyboard_shortcuts.up": "to move up in the list", + "keyboard_shortcuts.back": "戻る", + "keyboard_shortcuts.boost": "ブースト", + "keyboard_shortcuts.column": "左からn番目のカラム内最新トゥートに移動", + "keyboard_shortcuts.compose": "トゥート入力欄に移動", + "keyboard_shortcuts.description": "説明", + "keyboard_shortcuts.down": "カラム内一つ下に移動", + "keyboard_shortcuts.enter": "トゥートの詳細を表示", + "keyboard_shortcuts.favourite": "お気に入り", + "keyboard_shortcuts.heading": "キーボードショートカット一覧", + "keyboard_shortcuts.hotkey": "ホットキー", + "keyboard_shortcuts.legend": "この一覧を表示", + "keyboard_shortcuts.mention": "メンション", + "keyboard_shortcuts.reply": "返信", + "keyboard_shortcuts.search": "検索欄に移動", + "keyboard_shortcuts.toot": "新規トゥート", + "keyboard_shortcuts.unfocus": "トゥート入力欄・検索欄から離れる", + "keyboard_shortcuts.up": "カラム内一つ上に移動", "lightbox.close": "閉じる", "lightbox.next": "次", "lightbox.previous": "前", diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss index 80060a00f..26ff8bf00 100644 --- a/app/javascript/styles/mastodon/components.scss +++ b/app/javascript/styles/mastodon/components.scss @@ -1,5 +1,3 @@ -@import 'variables'; - .app-body { -webkit-overflow-scrolling: touch; -ms-overflow-style: -ms-autohiding-scrollbar; |