Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/syuilo/misskey
Browse files Browse the repository at this point in the history
  • Loading branch information
syuilo committed May 28, 2018
2 parents b57dd8d + ce0c27b commit cc4a7c1
Show file tree
Hide file tree
Showing 10 changed files with 160 additions and 80 deletions.
24 changes: 16 additions & 8 deletions locales/de.yml
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,8 @@ common/views/components/nav.vue:
common/views/components/note-menu.vue:
favorite: "Diese Anmerkung favorisieren"
pin: "An die Profilseite pinnen"
delete: "削除"
delete-confirm: "この投稿を削除しますか?"
remote: "Auf Quelle anzeigen"
common/views/components/poll.vue:
vote-to: "Stimme für '{}'"
Expand Down Expand Up @@ -309,13 +311,15 @@ desktop/views/components/messaging-window.vue:
title: "Nachrichten"
desktop/views/components/note-detail.vue:
more: "Lade weitere Konversationen"
private: "(Dieser Post ist privat)"
private: "この投稿は非公開です"
deleted: "この投稿は削除されました"
reposted-by: "{}がRenote"
location: "Ort"
renote: "Anmerkung"
add-reaction: "Reaktion hinzufügen"
desktop/views/components/note-detail.sub.vue:
private: "(Dieser Post ist privat)"
private: "この投稿は非公開です"
deleted: "この投稿は削除されました"
desktop/views/components/notes.note.vue:
reposted-by: "Auch geteilt von"
reply: "Antworten"
Expand Down Expand Up @@ -486,8 +490,9 @@ desktop/views/components/settings.profile.vue:
is-bot: "このアカウントはBotです"
is-cat: "このアカウントはCatです"
desktop/views/components/sub-note-content.vue:
hidden: "(この投稿は非公開です)"
media: "つのメディア"
private: "この投稿は非公開です"
deleted: "この投稿は削除されました"
media-count: "{}つのメディア"
poll: "投票"
desktop/views/components/taskmanager.vue:
title: "タスクマネージャ"
Expand Down Expand Up @@ -651,13 +656,15 @@ mobile/views/components/note.vue:
reposted-by: "{}がRenote"
more: "もっと見る"
less: "隠す"
hidden: "この投稿は非公開です"
private: "この投稿は非公開です"
deleted: "この投稿は削除されました"
location: "位置情報"
mobile/views/components/note-detail.vue:
reply: "返信"
reaction: "リアクション"
reposted-by: "{}がRenote"
hidden: "この投稿は非公開です"
private: "この投稿は非公開です"
deleted: "この投稿は削除されました"
location: "位置情報"
mobile/views/components/note-preview.vue:
admin: "admin"
Expand Down Expand Up @@ -686,8 +693,9 @@ mobile/views/components/post-form.vue:
error: "エラー"
username-prompt: "ユーザー名を入力してください"
mobile/views/components/sub-note-content.vue:
hidden: "この投稿は非公開です"
media-count: "{}個のメディア"
private: "この投稿は非公開です"
deleted: "この投稿は削除されました"
media-count: "{}つのメディア"
poll: "投票"
mobile/views/components/timeline.vue:
empty: "投稿がありません"
Expand Down
24 changes: 16 additions & 8 deletions locales/en.yml
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,8 @@ common/views/components/nav.vue:
common/views/components/note-menu.vue:
favorite: "Favorite this note"
pin: "Pin to profile page"
delete: "Delete"
delete-confirm: "Are you sure you want to delete this post?"
remote: "Show on origin"
common/views/components/poll.vue:
vote-to: "Vote for '{}'"
Expand Down Expand Up @@ -309,13 +311,15 @@ desktop/views/components/messaging-window.vue:
title: "Messaging"
desktop/views/components/note-detail.vue:
more: "Load more conversations"
private: "(this post is private)"
private: "this post is private"
deleted: "this post has been deleted"
reposted-by: "Renoted by {}"
location: "Location"
renote: "Renote"
add-reaction: "Add a reaction"
desktop/views/components/note-detail.sub.vue:
private: "(this post is private)"
private: "this post is private"
deleted: "this post has been deleted"
desktop/views/components/notes.note.vue:
reposted-by: "Reposted by {}"
reply: "Reply"
Expand Down Expand Up @@ -486,8 +490,9 @@ desktop/views/components/settings.profile.vue:
is-bot: "This account is a Bot"
is-cat: "This account is a Cat"
desktop/views/components/sub-note-content.vue:
hidden: "(this post is private)"
media: " media"
private: "this post is private"
deleted: "this post has been deleted"
media-count: "{} media attached"
poll: "Polls"
desktop/views/components/taskmanager.vue:
title: "Task Manager"
Expand Down Expand Up @@ -651,13 +656,15 @@ mobile/views/components/note.vue:
reposted-by: "Renoted by {}"
more: "See more"
less: "Hide"
hidden: "this post is private"
private: "this post is private"
deleted: "this post has been deleted"
location: "Location"
mobile/views/components/note-detail.vue:
reply: "Reply"
reaction: "Reaction"
reposted-by: "Renoted by {}"
hidden: "this post is private"
private: "this post is private"
deleted: "this post has been deleted"
location: "Location"
mobile/views/components/note-preview.vue:
admin: "admin"
Expand Down Expand Up @@ -686,8 +693,9 @@ mobile/views/components/post-form.vue:
error: "Error"
username-prompt: "Enter user name"
mobile/views/components/sub-note-content.vue:
hidden: "this post is private"
media-count: "{} media"
private: "this post is private"
deleted: "this post has been deleted"
media-count: "{} media attached"
poll: "Poll"
mobile/views/components/timeline.vue:
empty: "No notes"
Expand Down
24 changes: 16 additions & 8 deletions locales/es.yml
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,8 @@ common/views/components/nav.vue:
common/views/components/note-menu.vue:
favorite: "お気に入り"
pin: "ピン留め"
delete: "削除"
delete-confirm: "この投稿を削除しますか?"
remote: "投稿元で見る"
common/views/components/poll.vue:
vote-to: "「{}」に投票する"
Expand Down Expand Up @@ -309,13 +311,15 @@ desktop/views/components/messaging-window.vue:
title: "メッセージ"
desktop/views/components/note-detail.vue:
more: "会話をもっと読み込む"
private: "(この投稿は非公開です)"
private: "この投稿は非公開です"
deleted: "この投稿は削除されました"
reposted-by: "{}がRenote"
location: "位置情報"
renote: "Renote"
add-reaction: "リアクション"
desktop/views/components/note-detail.sub.vue:
private: "(この投稿は非公開です)"
private: "この投稿は非公開です"
deleted: "この投稿は削除されました"
desktop/views/components/notes.note.vue:
reposted-by: "{}がRenote"
reply: "返信"
Expand Down Expand Up @@ -486,8 +490,9 @@ desktop/views/components/settings.profile.vue:
is-bot: "このアカウントはBotです"
is-cat: "このアカウントはCatです"
desktop/views/components/sub-note-content.vue:
hidden: "(この投稿は非公開です)"
media: "つのメディア"
private: "この投稿は非公開です"
deleted: "この投稿は削除されました"
media-count: "{}つのメディア"
poll: "投票"
desktop/views/components/taskmanager.vue:
title: "タスクマネージャ"
Expand Down Expand Up @@ -651,13 +656,15 @@ mobile/views/components/note.vue:
reposted-by: "{}がRenote"
more: "もっと見る"
less: "隠す"
hidden: "この投稿は非公開です"
private: "この投稿は非公開です"
deleted: "この投稿は削除されました"
location: "位置情報"
mobile/views/components/note-detail.vue:
reply: "返信"
reaction: "リアクション"
reposted-by: "{}がRenote"
hidden: "この投稿は非公開です"
private: "この投稿は非公開です"
deleted: "この投稿は削除されました"
location: "位置情報"
mobile/views/components/note-preview.vue:
admin: "admin"
Expand Down Expand Up @@ -686,8 +693,9 @@ mobile/views/components/post-form.vue:
error: "エラー"
username-prompt: "ユーザー名を入力してください"
mobile/views/components/sub-note-content.vue:
hidden: "この投稿は非公開です"
media-count: "{}個のメディア"
private: "この投稿は非公開です"
deleted: "この投稿は削除されました"
media-count: "{}つのメディア"
poll: "投票"
mobile/views/components/timeline.vue:
empty: "投稿がありません"
Expand Down
24 changes: 16 additions & 8 deletions locales/fr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,8 @@ common/views/components/nav.vue:
common/views/components/note-menu.vue:
favorite: "Favorite this note"
pin: "Épingler sur votre profile"
delete: "削除"
delete-confirm: "この投稿を削除しますか?"
remote: "投稿元で見る"
common/views/components/poll.vue:
vote-to: "Voter pour '{}'"
Expand Down Expand Up @@ -309,13 +311,15 @@ desktop/views/components/messaging-window.vue:
title: "Messagerie"
desktop/views/components/note-detail.vue:
more: "会話をもっと読み込む"
private: "(この投稿は非公開です)"
private: "この投稿は非公開です"
deleted: "この投稿は削除されました"
reposted-by: "{}がRenote"
location: "位置情報"
renote: "Renote"
add-reaction: "リアクション"
desktop/views/components/note-detail.sub.vue:
private: "(この投稿は非公開です)"
private: "この投稿は非公開です"
deleted: "この投稿は削除されました"
desktop/views/components/notes.note.vue:
reposted-by: "Reposté par {}"
reply: "Répondre"
Expand Down Expand Up @@ -486,8 +490,9 @@ desktop/views/components/settings.profile.vue:
is-bot: "このアカウントはBotです"
is-cat: "このアカウントはCatです"
desktop/views/components/sub-note-content.vue:
hidden: "(この投稿は非公開です)"
media: "つのメディア"
private: "この投稿は非公開です"
deleted: "この投稿は削除されました"
media-count: "{}つのメディア"
poll: "投票"
desktop/views/components/taskmanager.vue:
title: "タスクマネージャ"
Expand Down Expand Up @@ -651,13 +656,15 @@ mobile/views/components/note.vue:
reposted-by: "Renoté par {}"
more: "もっと見る"
less: "隠す"
hidden: "この投稿は非公開です"
private: "この投稿は非公開です"
deleted: "この投稿は削除されました"
location: "位置情報"
mobile/views/components/note-detail.vue:
reply: "Répondre"
reaction: "Réaction"
reposted-by: "{}がRenote"
hidden: "この投稿は非公開です"
private: "この投稿は非公開です"
deleted: "この投稿は削除されました"
location: "位置情報"
mobile/views/components/note-preview.vue:
admin: "admin"
Expand Down Expand Up @@ -686,8 +693,9 @@ mobile/views/components/post-form.vue:
error: "エラー"
username-prompt: "ユーザー名を入力してください"
mobile/views/components/sub-note-content.vue:
hidden: "この投稿は非公開です"
media-count: "{} media"
private: "この投稿は非公開です"
deleted: "この投稿は削除されました"
media-count: "{}つのメディア"
poll: "Sondage"
mobile/views/components/timeline.vue:
empty: "Pas de notes"
Expand Down
24 changes: 16 additions & 8 deletions locales/it.yml
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,8 @@ common/views/components/nav.vue:
common/views/components/note-menu.vue:
favorite: "お気に入り"
pin: "ピン留め"
delete: "削除"
delete-confirm: "この投稿を削除しますか?"
remote: "投稿元で見る"
common/views/components/poll.vue:
vote-to: "「{}」に投票する"
Expand Down Expand Up @@ -309,13 +311,15 @@ desktop/views/components/messaging-window.vue:
title: "メッセージ"
desktop/views/components/note-detail.vue:
more: "会話をもっと読み込む"
private: "(この投稿は非公開です)"
private: "この投稿は非公開です"
deleted: "この投稿は削除されました"
reposted-by: "{}がRenote"
location: "位置情報"
renote: "Renote"
add-reaction: "リアクション"
desktop/views/components/note-detail.sub.vue:
private: "(この投稿は非公開です)"
private: "この投稿は非公開です"
deleted: "この投稿は削除されました"
desktop/views/components/notes.note.vue:
reposted-by: "{}がRenote"
reply: "返信"
Expand Down Expand Up @@ -486,8 +490,9 @@ desktop/views/components/settings.profile.vue:
is-bot: "このアカウントはBotです"
is-cat: "このアカウントはCatです"
desktop/views/components/sub-note-content.vue:
hidden: "(この投稿は非公開です)"
media: "つのメディア"
private: "この投稿は非公開です"
deleted: "この投稿は削除されました"
media-count: "{}つのメディア"
poll: "投票"
desktop/views/components/taskmanager.vue:
title: "タスクマネージャ"
Expand Down Expand Up @@ -651,13 +656,15 @@ mobile/views/components/note.vue:
reposted-by: "{}がRenote"
more: "もっと見る"
less: "隠す"
hidden: "この投稿は非公開です"
private: "この投稿は非公開です"
deleted: "この投稿は削除されました"
location: "位置情報"
mobile/views/components/note-detail.vue:
reply: "返信"
reaction: "リアクション"
reposted-by: "{}がRenote"
hidden: "この投稿は非公開です"
private: "この投稿は非公開です"
deleted: "この投稿は削除されました"
location: "位置情報"
mobile/views/components/note-preview.vue:
admin: "admin"
Expand Down Expand Up @@ -686,8 +693,9 @@ mobile/views/components/post-form.vue:
error: "エラー"
username-prompt: "ユーザー名を入力してください"
mobile/views/components/sub-note-content.vue:
hidden: "この投稿は非公開です"
media-count: "{}個のメディア"
private: "この投稿は非公開です"
deleted: "この投稿は削除されました"
media-count: "{}つのメディア"
poll: "投票"
mobile/views/components/timeline.vue:
empty: "投稿がありません"
Expand Down
Loading

0 comments on commit cc4a7c1

Please sign in to comment.