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

This commit is contained in:
syuilo 2018-11-24 07:34:23 +09:00
commit 4e6a917dab
No known key found for this signature in database
GPG key ID: BDC4C49D06AB9D69
14 changed files with 36 additions and 36 deletions

View file

@ -1043,8 +1043,8 @@ admin/views/users.vue:
title: "ソート" title: "ソート"
createdAtAsc: "登録日時が古い順" createdAtAsc: "登録日時が古い順"
createdAtDesc: "登録日時が新しい順" createdAtDesc: "登録日時が新しい順"
updatedAtAsc: "最終更新日時が古い順" updatedAtAsc: "更新日時が古い順"
updatedAtDesc: "最終更新日時が新しい順" updatedAtDesc: "更新日時が新しい順"
origin: origin:
title: "オリジン" title: "オリジン"
combined: "ローカル+リモート" combined: "ローカル+リモート"

View file

@ -1043,8 +1043,8 @@ admin/views/users.vue:
title: "ソート" title: "ソート"
createdAtAsc: "登録日時が古い順" createdAtAsc: "登録日時が古い順"
createdAtDesc: "登録日時が新しい順" createdAtDesc: "登録日時が新しい順"
updatedAtAsc: "最終更新日時が古い順" updatedAtAsc: "更新日時が古い順"
updatedAtDesc: "最終更新日時が新しい順" updatedAtDesc: "更新日時が新しい順"
origin: origin:
title: "オリジン" title: "オリジン"
combined: "ローカル+リモート" combined: "ローカル+リモート"

View file

@ -119,7 +119,7 @@ common:
reduce-motion: "Reduce motion in UI" reduce-motion: "Reduce motion in UI"
this-setting-is-this-device-only: "Only for this device" this-setting-is-this-device-only: "Only for this device"
use-os-default-emojis: "Use the OS default Emojis" use-os-default-emojis: "Use the OS default Emojis"
do-not-use-in-production: 'As this is for development, do not use this in production.' do-not-use-in-production: 'This is a development build. Do not use in production.'
is-remote-user: "This user information is copied." is-remote-user: "This user information is copied."
is-remote-post: "This post information is a copy." is-remote-post: "This post information is a copy."
view-on-remote: "View it on remote" view-on-remote: "View it on remote"
@ -1041,10 +1041,10 @@ admin/views/users.vue:
title: "Users" title: "Users"
sort: sort:
title: "Sort" title: "Sort"
createdAtAsc: "登録日時が古い順" createdAtAsc: "Date Registered (Ascending)"
createdAtDesc: "登録日時が新しい順" createdAtDesc: "Date Registered (Descending)"
updatedAtAsc: "最終更新日時が古い順" updatedAtAsc: "Last Updated (Ascending)"
updatedAtDesc: "最終更新日時が新しい順" updatedAtDesc: "Last Updated (Descending)"
origin: origin:
title: "Origin" title: "Origin"
combined: "Local + Remote" combined: "Local + Remote"
@ -1074,7 +1074,7 @@ admin/views/emoji.vue:
remove: "Remove" remove: "Remove"
updated: "Updated" updated: "Updated"
remove-emoji: remove-emoji:
are-you-sure: "Delete \"%1$s\"?" are-you-sure: "Delete \"$1\"?"
removed: "Deleted" removed: "Deleted"
admin/views/announcements.vue: admin/views/announcements.vue:
announcements: "Announcements" announcements: "Announcements"
@ -1085,7 +1085,7 @@ admin/views/announcements.vue:
text: "Content" text: "Content"
saved: "Saved" saved: "Saved"
_remove: _remove:
are-you-sure: "Delete \"%1$s\"?" are-you-sure: "Delete \"$1\"?"
removed: "Deleted" removed: "Deleted"
admin/views/hashtags.vue: admin/views/hashtags.vue:
hided-tags: "Hidden Tags" hided-tags: "Hidden Tags"

View file

@ -1043,8 +1043,8 @@ admin/views/users.vue:
title: "ソート" title: "ソート"
createdAtAsc: "登録日時が古い順" createdAtAsc: "登録日時が古い順"
createdAtDesc: "登録日時が新しい順" createdAtDesc: "登録日時が新しい順"
updatedAtAsc: "最終更新日時が古い順" updatedAtAsc: "更新日時が古い順"
updatedAtDesc: "最終更新日時が新しい順" updatedAtDesc: "更新日時が新しい順"
origin: origin:
title: "オリジン" title: "オリジン"
combined: "ローカル+リモート" combined: "ローカル+リモート"

View file

@ -1043,8 +1043,8 @@ admin/views/users.vue:
title: "ソート" title: "ソート"
createdAtAsc: "登録日時が古い順" createdAtAsc: "登録日時が古い順"
createdAtDesc: "登録日時が新しい順" createdAtDesc: "登録日時が新しい順"
updatedAtAsc: "最終更新日時が古い順" updatedAtAsc: "更新日時が古い順"
updatedAtDesc: "最終更新日時が新しい順" updatedAtDesc: "更新日時が新しい順"
origin: origin:
title: "オリジン" title: "オリジン"
combined: "ローカル+リモート" combined: "ローカル+リモート"

View file

@ -1043,8 +1043,8 @@ admin/views/users.vue:
title: "ソート" title: "ソート"
createdAtAsc: "登録日時が古い順" createdAtAsc: "登録日時が古い順"
createdAtDesc: "登録日時が新しい順" createdAtDesc: "登録日時が新しい順"
updatedAtAsc: "最終更新日時が古い順" updatedAtAsc: "更新日時が古い順"
updatedAtDesc: "最終更新日時が新しい順" updatedAtDesc: "更新日時が新しい順"
origin: origin:
title: "オリジン" title: "オリジン"
combined: "ローカル+リモート" combined: "ローカル+リモート"

View file

@ -1043,8 +1043,8 @@ admin/views/users.vue:
title: "ソート" title: "ソート"
createdAtAsc: "登録日時が古い順" createdAtAsc: "登録日時が古い順"
createdAtDesc: "登録日時が新しい順" createdAtDesc: "登録日時が新しい順"
updatedAtAsc: "最終更新日時が古い順" updatedAtAsc: "更新日時が古い順"
updatedAtDesc: "最終更新日時が新しい順" updatedAtDesc: "更新日時が新しい順"
origin: origin:
title: "オリジン" title: "オリジン"
combined: "ローカル+リモート" combined: "ローカル+リモート"

View file

@ -5,12 +5,12 @@ meta:
common: common:
misskey: "연합우주의 ⭐" misskey: "연합우주의 ⭐"
about-title: "연합우주의 ⭐." about-title: "연합우주의 ⭐."
about: "Misskey를 찾아 주셔서 감사합니다. Misskey은 지구에서 태어난 <b>분산 마이크로 블로그 SNS </b> 입니다. Fediverse (다양한 SNS로 구성되는 우주)에 존재하는 다른 SNS와 상호 연결되어 있습니다. 잠시 도시의 번잡함에서 벗어나 새로운 인터넷에 다이브 해 보지 않겠습니까." about: "Misskey를 찾아주셔서 감사합니다. Misskey는 지구에서 태어난 <b>분산 마이크로 블로그 SNS </b> 입니다. Fediverse(다양한 SNS로 구성되는 우주)에 존재하는 다른 SNS와 상호 연결되어 있습니다. 잠시 도시의 번잡함에서 벗어나 새로운 인터넷에 다이브 해 보지 않겠습니까."
intro: intro:
title: "Misskey란?" title: "Misskey란?"
about: "Misskeyはオープンソースの<b>分散型マイクロブログSNS</b>です。リッチで高度にカスタマイズできるUI、投稿へのリアクション、ファイルを一元管理できるドライブなど、先進的な機能を揃えています。また、Fediverseと呼ばれるネットワークに接続できるため、他のSNSともやり取りできます。例えば、あなたが何か投稿すると、その投稿はMisskeyだけでなく他のSNSにも伝わります。ちょうどある惑星から他の惑星に電波を発信している様子をイメージしてください。" about: "Misskey는 오픈소스 <b>분산형 마이크로블로그 SNS</b>입니다. 다양하고 폭넓게 커스터마이징할 수 있는 UI, 게시물에 대한 반응, 파일을 관리할 수 있는 드라이브 등의 선진적인 기능을 갖추고 있습니다. 더하여 Fediverse라고 부르는 네트워크에 연결할 수 있어 다른 SNS와도 주고받을 수 있습니다. 예를 들자면, 당신이 무언가를 게시하면, 해당 게시물은 Misskey 뿐만 아니라 다른 SNS에도 전해집니다. 살짝 어떤 행성에서 다른 행성으로 전파를 발신하고 있는 모습을 상상해주세요."
features: "특징" features: "특징"
rich-contents: "게시" rich-contents: "글 쓰기"
rich-contents-desc: "自分の考え、話題の出来事、皆と共有したいことについて発信してください。必要であれば、様々な構文を使って投稿を装飾したり、好きな画像、動画などのファイルやアンケートを添付することもできます。" rich-contents-desc: "自分の考え、話題の出来事、皆と共有したいことについて発信してください。必要であれば、様々な構文を使って投稿を装飾したり、好きな画像、動画などのファイルやアンケートを添付することもできます。"
reaction: "반응" reaction: "반응"
reaction-desc: "あなたの気持ちを伝える最も簡単な方法です。Misskeyは、他のユーザーの投稿に様々なリアクションを付けることができます。いちどMisskeyのリアクション機能を体験してしまうと、もう「いいね」の概念しか存在しないSNSには戻れなくなるかもしれません。" reaction-desc: "あなたの気持ちを伝える最も簡単な方法です。Misskeyは、他のユーザーの投稿に様々なリアクションを付けることができます。いちどMisskeyのリアクション機能を体験してしまうと、もう「いいね」の概念しか存在しないSNSには戻れなくなるかもしれません。"
@ -1043,8 +1043,8 @@ admin/views/users.vue:
title: "ソート" title: "ソート"
createdAtAsc: "登録日時が古い順" createdAtAsc: "登録日時が古い順"
createdAtDesc: "登録日時が新しい順" createdAtDesc: "登録日時が新しい順"
updatedAtAsc: "最終更新日時が古い順" updatedAtAsc: "更新日時が古い順"
updatedAtDesc: "最終更新日時が新しい順" updatedAtDesc: "更新日時が新しい順"
origin: origin:
title: "オリジン" title: "オリジン"
combined: "ローカル+リモート" combined: "ローカル+リモート"

View file

@ -1043,8 +1043,8 @@ admin/views/users.vue:
title: "ソート" title: "ソート"
createdAtAsc: "登録日時が古い順" createdAtAsc: "登録日時が古い順"
createdAtDesc: "登録日時が新しい順" createdAtDesc: "登録日時が新しい順"
updatedAtAsc: "最終更新日時が古い順" updatedAtAsc: "更新日時が古い順"
updatedAtDesc: "最終更新日時が新しい順" updatedAtDesc: "更新日時が新しい順"
origin: origin:
title: "オリジン" title: "オリジン"
combined: "ローカル+リモート" combined: "ローカル+リモート"

View file

@ -1043,8 +1043,8 @@ admin/views/users.vue:
title: "ソート" title: "ソート"
createdAtAsc: "登録日時が古い順" createdAtAsc: "登録日時が古い順"
createdAtDesc: "登録日時が新しい順" createdAtDesc: "登録日時が新しい順"
updatedAtAsc: "最終更新日時が古い順" updatedAtAsc: "更新日時が古い順"
updatedAtDesc: "最終更新日時が新しい順" updatedAtDesc: "更新日時が新しい順"
origin: origin:
title: "オリジン" title: "オリジン"
combined: "ローカル+リモート" combined: "ローカル+リモート"

View file

@ -1043,8 +1043,8 @@ admin/views/users.vue:
title: "ソート" title: "ソート"
createdAtAsc: "登録日時が古い順" createdAtAsc: "登録日時が古い順"
createdAtDesc: "登録日時が新しい順" createdAtDesc: "登録日時が新しい順"
updatedAtAsc: "最終更新日時が古い順" updatedAtAsc: "更新日時が古い順"
updatedAtDesc: "最終更新日時が新しい順" updatedAtDesc: "更新日時が新しい順"
origin: origin:
title: "オリジン" title: "オリジン"
combined: "ローカル+リモート" combined: "ローカル+リモート"

View file

@ -1043,8 +1043,8 @@ admin/views/users.vue:
title: "ソート" title: "ソート"
createdAtAsc: "登録日時が古い順" createdAtAsc: "登録日時が古い順"
createdAtDesc: "登録日時が新しい順" createdAtDesc: "登録日時が新しい順"
updatedAtAsc: "最終更新日時が古い順" updatedAtAsc: "更新日時が古い順"
updatedAtDesc: "最終更新日時が新しい順" updatedAtDesc: "更新日時が新しい順"
origin: origin:
title: "オリジン" title: "オリジン"
combined: "ローカル+リモート" combined: "ローカル+リモート"

View file

@ -1043,8 +1043,8 @@ admin/views/users.vue:
title: "ソート" title: "ソート"
createdAtAsc: "登録日時が古い順" createdAtAsc: "登録日時が古い順"
createdAtDesc: "登録日時が新しい順" createdAtDesc: "登録日時が新しい順"
updatedAtAsc: "最終更新日時が古い順" updatedAtAsc: "更新日時が古い順"
updatedAtDesc: "最終更新日時が新しい順" updatedAtDesc: "更新日時が新しい順"
origin: origin:
title: "オリジン" title: "オリジン"
combined: "ローカル+リモート" combined: "ローカル+リモート"

View file

@ -1043,8 +1043,8 @@ admin/views/users.vue:
title: "ソート" title: "ソート"
createdAtAsc: "登録日時が古い順" createdAtAsc: "登録日時が古い順"
createdAtDesc: "登録日時が新しい順" createdAtDesc: "登録日時が新しい順"
updatedAtAsc: "最終更新日時が古い順" updatedAtAsc: "更新日時が古い順"
updatedAtDesc: "最終更新日時が新しい順" updatedAtDesc: "更新日時が新しい順"
origin: origin:
title: "オリジン" title: "オリジン"
combined: "ローカル+リモート" combined: "ローカル+リモート"