ash/iceshrimp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'master' of aya.github:syuilo/misskey

Browse source
This commit is contained in:
Aya Morisawa 2018-07-14 22:10:14 +09:00
commit 884089aa84
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
locales/en.yml
View file

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

2
package.json
View file

@ -104,7 +104,7 @@
"emojilib": "2.2.12", "emojilib": "2.2.12",
"escape-regexp": "0.0.1", "escape-regexp": "0.0.1",
"eslint": "5.0.1", "eslint": "5.0.1",
"eslint-plugin-vue": "4.5.0", "eslint-plugin-vue": "4.6.0",
"eventemitter3": "3.1.0", "eventemitter3": "3.1.0",
"exif-js": "2.3.0", "exif-js": "2.3.0",
"file-loader": "1.1.11", "file-loader": "1.1.11",