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

2019-02-25 03:22:01 +09:00 · 2019-02-25 03:22:01 +09:00 · 31fc43ed16
commit 31fc43ed16
parent 31802c9749 192aa89f95
15 changed files with 35 additions and 9 deletions
--- a/README.md
+++ b/README.md
@ -123,7 +123,6 @@ Please see the [Contribution Guide](./CONTRIBUTING.md).
 <td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/5881381/6235ca5d3fb04c8e95ef5b4ff2abcc18/3?token-time=2145916800&token-hash=9JtETp0X8gI280Ne1E8bxn6j4Lw5o2k4mJkICx97V_k%3D" alt="YUKIMOCHI" width="100"></td>
 <td><img src="https://c8.patreon.com/2/200/17463605" alt="Sampot" width="100"></td>
 <td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/17195955/be45e5e14c3e48b2bee0456c84e19df4/4?token-time=2145916800&token-hash=SbdZeN5SmsuT9stD6v0jN1z0hftg0FmRiCTxysU0Ihw%3D" alt="Damillora" width="100"></td>
-<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/8241184/39e18850e87a449e9c9a71acb3310ebd/3?token-time=2145916800&token-hash=gMq30aylxu5v3G8pRhWR5jeRBbYWEoRKjGbNeiCQz5g%3D" alt="Acid Chicken" width="100"></td>
 <td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/4389829/9f709180ac714651a70f74a82f3ffdb9/2?token-time=2145916800&token-hash=zcwFxb2zopzWwksKVU1YpfAEjsl4yKT02aQ6yiAFRiQ%3D" alt="natalie" width="100"></td>
 <td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/13034746/c711c7f58e204ecfbc2fd646bc8a4eee/1?token-time=2145916800&token-hash=5T8XcaAf9Zyzfg3QubR06s_kJZkArVEM2dwObrBVAU4%3D" alt="Hiratake" width="100"></td>
 </tr><tr>
@ -134,7 +133,6 @@ Please see the [Contribution Guide](./CONTRIBUTING.md).
 <td><a href="https://www.patreon.com/yukimochi">YUKIMOCHI</a></td>
 <td><a href="https://www.patreon.com/user?u=17463605">Sampot</a></td>
 <td><a href="https://www.patreon.com/damillora">Damillora</a></td>
-<td><a href="https://www.patreon.com/acid_chicken">Acid Chicken</a></td>
 <td><a href="https://www.patreon.com/user?u=4389829">natalie</a></td>
 <td><a href="https://www.patreon.com/hiratake">Hiratake</a></td>
 </tr></table>
@ -150,7 +148,7 @@ Please see the [Contribution Guide](./CONTRIBUTING.md).
 <td><a href="https://www.patreon.com/user?u=12531784">Takashi Shibuya</a></td>
 </tr></table>

-**Last updated:** Thu, 21 Feb 2019 16:10:06 UTC
+**Last updated:** Sun, 24 Feb 2019 06:44:06 UTC
 <!-- PATREON_END -->

 :four_leaf_clover: Copyright
--- a/locales/ca-ES.yml
+++ b/locales/ca-ES.yml
@ -146,6 +146,8 @@ common:
  view-on-remote: "正確な情報を見る"
  renoted-by: "{user}がRenote"
  no-notes: "投稿がありません"
+  turn-on-darkmode: "闇に飲まれる"
+  turn-off-darkmode: "光あれ"
  error:
    title: "問題が発生しました"
    retry: "やり直す"
--- a/locales/de-DE.yml
+++ b/locales/de-DE.yml
@ -146,6 +146,8 @@ common:
  view-on-remote: "正確な情報を見る"
  renoted-by: "{user}がRenote"
  no-notes: "投稿がありません"
+  turn-on-darkmode: "闇に飲まれる"
+  turn-off-darkmode: "光あれ"
  error:
    title: "問題が発生しました"
    retry: "Erneut versuchen"
--- a/locales/en-US.yml
+++ b/locales/en-US.yml
@ -146,6 +146,8 @@ common:
  view-on-remote: "For completion, view it remotely."
  renoted-by: "Renoted by {user}"
  no-notes: "Without any notes"
+  turn-on-darkmode: "Switch to Dark mode"
+  turn-off-darkmode: "Light mode"
  error:
    title: "Something happened :("
    retry: "Retry"
@ -292,7 +294,7 @@ common/views/components/media-banner.vue:
  click-to-show: "Click to show"
 common/views/components/theme.vue:
  theme: "Theme"
-  light-theme: "Theme"
+  light-theme: "Theme to use in Light mode"
  dark-theme: "Theme during dark mode"
  light-themes: "Light theme"
  dark-themes: "Dark theme"
@ -1614,7 +1616,7 @@ deck:
  pop-right: "Dock on the right"
  disabled-timeline:
    title: "Timeline has been disabled"
-    description: "This timeline has been disabled by the server administrator."
+    description: "Timeline has been disabled by the administrator."
 deck/deck.tl-column.vue:
  is-media-only: "Only media posts"
  edit: "Options"
--- a/locales/es-ES.yml
+++ b/locales/es-ES.yml
@ -146,6 +146,8 @@ common:
  view-on-remote: "正確な情報を見る"
  renoted-by: "{user}がRenote"
  no-notes: "投稿がありません"
+  turn-on-darkmode: "闇に飲まれる"
+  turn-off-darkmode: "光あれ"
  error:
    title: "問題が発生しました"
    retry: "やり直す"
--- a/locales/fr-FR.yml
+++ b/locales/fr-FR.yml
@ -146,6 +146,8 @@ common:
  view-on-remote: " Consulter le profil complet"
  renoted-by: "Renoté par {user}"
  no-notes: "投稿がありません"
+  turn-on-darkmode: "闇に飲まれる"
+  turn-off-darkmode: "光あれ"
  error:
    title: "Une erreur est survenue"
    retry: "Réessayer"
--- a/locales/it-IT.yml
+++ b/locales/it-IT.yml
@ -146,6 +146,8 @@ common:
  view-on-remote: "正確な情報を見る"
  renoted-by: "{user}がRenote"
  no-notes: "投稿がありません"
+  turn-on-darkmode: "闇に飲まれる"
+  turn-off-darkmode: "光あれ"
  error:
    title: "問題が発生しました"
    retry: "やり直す"
--- a/locales/ja-KS.yml
+++ b/locales/ja-KS.yml
@ -146,6 +146,8 @@ common:
  view-on-remote: "ちゃんとした情報見せてや！"
  renoted-by: "{user}がRenote"
  no-notes: "投稿がありません"
+  turn-on-darkmode: "闇に飲まれる"
+  turn-off-darkmode: "光あれ"
  error:
    title: "問題が起こったわ"
    retry: "もっぺん"
--- a/locales/ko-KR.yml
+++ b/locales/ko-KR.yml
@ -58,7 +58,7 @@ common:
  trash: "휴지통"
  drive: "드라이브"
  messaging: "대화"
-  home: "ホーム"
+  home: "홈"
  deck: "덱"
  timeline: "타임라인"
  explore: "발견"
@ -146,6 +146,8 @@ common:
  view-on-remote: "정확한 정보 보기"
  renoted-by: "{user}이(가) 리노트"
  no-notes: "글이 없습니다"
+  turn-on-darkmode: "어둠에 삼켜져라"
+  turn-off-darkmode: "빛이 있으라"
  error:
    title: "오류가 발생했습니다"
    retry: "다시 시도"
@ -1401,7 +1403,7 @@ mobile/views/components/drive.vue:
  prompt: "무엇을 하시겠습니까? (숫자를 입력하여 주십시오): <1 → 파일 업로드 | 2 → 파일을 URL에서 업로드 | 3 → 폴더 만들기 | 4 → 이 폴더의 이름을 변경 | 5 → 현재 폴더 이동| 6 → 현재 폴더 삭제>"
  deletion-alert: "죄송합니다! 폴더 삭제는 아직 구현되지 않았습니다..."
  folder-name: "폴더 이름"
-  here-is-root: "現在いる場所はルートで、フォルダではありません。"
+  here-is-root: "현재 경로는 루트 경로로 폴더가 아닙니다."
  url-prompt: "업로드 하려는 파일의 URL"
  uploading: "업로드를 요청하였습니다. 업로드가 완료될 때까지 시간이 소요될 수 있습니다."
 mobile/views/components/drive-file-chooser.vue:
--- a/locales/nl-NL.yml
+++ b/locales/nl-NL.yml
@ -146,6 +146,8 @@ common:
  view-on-remote: "正確な情報を見る"
  renoted-by: "{user}がRenote"
  no-notes: "投稿がありません"
+  turn-on-darkmode: "闇に飲まれる"
+  turn-off-darkmode: "光あれ"
  error:
    title: "問題が発生しました"
    retry: "やり直す"
--- a/locales/no-NO.yml
+++ b/locales/no-NO.yml
@ -146,6 +146,8 @@ common:
  view-on-remote: "正確な情報を見る"
  renoted-by: "{user}がRenote"
  no-notes: "投稿がありません"
+  turn-on-darkmode: "闇に飲まれる"
+  turn-off-darkmode: "光あれ"
  error:
    title: "問題が発生しました"
    retry: "やり直す"
--- a/locales/pl-PL.yml
+++ b/locales/pl-PL.yml
@ -146,6 +146,8 @@ common:
  view-on-remote: "Dla dopełnienia, zobacz to zdalnie."
  renoted-by: "{user} udostępnił(a)"
  no-notes: "投稿がありません"
+  turn-on-darkmode: "闇に飲まれる"
+  turn-off-darkmode: "光あれ"
  error:
    title: "Coś poszło nie tak"
    retry: "Ponów próbę"
--- a/locales/pt-PT.yml
+++ b/locales/pt-PT.yml
@ -146,6 +146,8 @@ common:
  view-on-remote: "正確な情報を見る"
  renoted-by: "{user}がRenote"
  no-notes: "投稿がありません"
+  turn-on-darkmode: "闇に飲まれる"
+  turn-off-darkmode: "光あれ"
  error:
    title: "問題が発生しました"
    retry: "やり直す"
--- a/locales/ru-RU.yml
+++ b/locales/ru-RU.yml
@ -146,6 +146,8 @@ common:
  view-on-remote: "正確な情報を見る"
  renoted-by: "{user}がRenote"
  no-notes: "投稿がありません"
+  turn-on-darkmode: "闇に飲まれる"
+  turn-off-darkmode: "光あれ"
  error:
    title: "Что-то пошло не так :("
    retry: "Повторить"
--- a/locales/zh-CN.yml
+++ b/locales/zh-CN.yml
@ -58,7 +58,7 @@ common:
  trash: "垃圾箱"
  drive: "网盘"
  messaging: "聊天"
-  home: "ホーム"
+  home: "首页"
  deck: "Deck"
  timeline: "时间线"
  explore: "发现"
@ -146,6 +146,8 @@ common:
  view-on-remote: "查看准确的信息"
  renoted-by: "由 {user} Renote"
  no-notes: "没有帖子"
+  turn-on-darkmode: "切换暗色主题"
+  turn-off-darkmode: "切换亮色主题"
  error:
    title: "出现问题"
    retry: "重试"
@ -1401,7 +1403,7 @@ mobile/views/components/drive.vue:
  prompt: "您想要干什么呢？(请输入数字):<1 → 上传文件 | 2 → 从URL上传文件 | 3 → 创建新文件夹 | 4 → 更改这个文件夹的名称 | 5 → 移动这个文件夹 | 6 → 删除这个文件夹>"
  deletion-alert: "抱歉！ 删除文件夹功能尚未实现。"
  folder-name: "文件夹名称"
-  here-is-root: "現在いる場所はルートで、フォルダではありません。"
+  here-is-root: "当前位置为根目录。"
  url-prompt: "要上传的文件的URL"
  uploading: "已请求上传。 上传完成可能需要一段时间。"
 mobile/views/components/drive-file-chooser.vue: