From 41d5e0ab242eef4e760088218d5c147db4a7fe52 Mon Sep 17 00:00:00 2001
From: "greenkeeper[bot]" <greenkeeper[bot]@users.noreply.github.com>
Date: Sat, 14 Jul 2018 11:39:54 +0000
Subject: [PATCH 1/2] fix(package): update eslint-plugin-vue to version 4.6.0

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 3ac968fd3e..9356ae7802 100644
--- a/package.json
+++ b/package.json
@@ -102,7 +102,7 @@
 		"emojilib": "2.2.12",
 		"escape-regexp": "0.0.1",
 		"eslint": "5.0.1",
-		"eslint-plugin-vue": "4.5.0",
+		"eslint-plugin-vue": "4.6.0",
 		"eventemitter3": "3.1.0",
 		"exif-js": "2.3.0",
 		"file-loader": "1.1.11",

From b687546fcd33a45d79d085edcd22c27573f8e75b Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Sat, 14 Jul 2018 21:41:01 +0900
Subject: [PATCH 2/2] New translations ja.yml (English)

---
 locales/en.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/locales/en.yml b/locales/en.yml
index 22fc5d7bce..baf21f1963 100644
--- a/locales/en.yml
+++ b/locales/en.yml
@@ -91,7 +91,7 @@ common:
     list: "Lists"
     swap-left: "Move to the left"
     swap-right: "Move to the right"
-    swap-up: "Move upward"
+    swap-up: "Move up"
     swap-down: "Move downward"
     remove: "Remove"
     add-column: "Add a column"
@@ -271,7 +271,7 @@ desktop/views/components/choose-file-from-drive-window.vue:
   upload: "Upload files from your device"
   cancel: "Cancel"
   ok: "OK"
-  choose-prompt: "Choose a file"
+  choose-prompt: "Choose files"
 desktop/views/components/choose-folder-from-drive-window.vue:
   cancel: "Cancel"
   ok: "OK"
@@ -716,7 +716,7 @@ mobile/views/components/drive.vue:
 mobile/views/components/drive-file-detail.vue:
   rename: "Rename"
 mobile/views/components/drive-file-chooser.vue:
-  select-file: "Choose a file"
+  select-file: "Choose files"
 mobile/views/components/drive-folder-chooser.vue:
   select-folder: "Choose a folder"
 mobile/views/components/drive.file-detail.vue:
@@ -855,7 +855,7 @@ mobile/views/pages/search.vue:
   search: "Search"
   empty: "No posts were found for '{}'"
 mobile/views/pages/selectdrive.vue:
-  select-file: "Choose a file"
+  select-file: "Choose files"
 mobile/views/pages/settings.vue:
   signed-in-as: "Signed in as {}"
   lang: "Language"