From 9927df83add34bcdb339c9be5a51b92fe0959377 Mon Sep 17 00:00:00 2001
From: mayaeh <mayaeh@marimo-net.org>
Date: Fri, 1 Dec 2017 09:35:47 +0900
Subject: Update Japanese translations for KeyboardShortcuts. (#5858)

---
 app/javascript/mastodon/locales/ja.json | 34 ++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

(limited to 'app/javascript')

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": "前",
-- 
cgit 


From bdf6d0a68464fc7d80c257b4c4705818e4a1a8d5 Mon Sep 17 00:00:00 2001
From: cormo <cormorant2+github@gmail.com>
Date: Sat, 2 Dec 2017 08:42:20 +0900
Subject: Remove redundant import statement in SCSS (#5864)

* Remove redudant import statement in SCSS

* Fix wrong chmod
---
 app/javascript/styles/mastodon/components.scss | 2 --
 1 file changed, 2 deletions(-)

(limited to 'app/javascript')

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;
-- 
cgit