Merge branch 'develop' of https://github.com/syuilo/misskey into develop

This commit is contained in:
syuilo 2018-09-18 02:14:16 +09:00
commit 77e53cbf9e
No known key found for this signature in database
GPG Key ID: BDC4C49D06AB9D69

View File

@ -155,7 +155,7 @@ common:
home: "Home" home: "Home"
local: "Local" local: "Local"
hybrid: "Social" hybrid: "Social"
hashtag: "ハッシュタグ" hashtag: "Hashtag"
global: "Global" global: "Global"
mentions: "Mentions" mentions: "Mentions"
notifications: "Notifications" notifications: "Notifications"
@ -811,10 +811,10 @@ desktop/views/components/timeline.vue:
global: "Global" global: "Global"
mentions: "Mentions" mentions: "Mentions"
list: "Lists" list: "Lists"
hashtag: "ハッシュタグ" hashtag: "Hashtag"
add-tag-timeline: "ハッシュタグを追加" add-tag-timeline: "Add hashtag tl"
add-list: "リストを追加" add-list: "Add list"
list-name: "リスト名" list-name: "List name"
desktop/views/components/ui.header.vue: desktop/views/components/ui.header.vue:
welcome-back: "Welcome back," welcome-back: "Welcome back,"
adjective: "-san" adjective: "-san"