1
1
mirror of https://github.com/kokonect-link/cherrypick synced 2024-12-02 16:58:43 +09:00

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

This commit is contained in:
syuilo 2018-09-17 09:07:05 +09:00
commit 7ccff732b8
No known key found for this signature in database
GPG Key ID: BDC4C49D06AB9D69
14 changed files with 79 additions and 9 deletions

View File

@ -155,6 +155,7 @@ common:
home: "ホーム" home: "ホーム"
local: "ローカル" local: "ローカル"
hybrid: "ソーシャル" hybrid: "ソーシャル"
hashtag: "ハッシュタグ"
global: "グローバル" global: "グローバル"
mentions: "あなた宛て" mentions: "あなた宛て"
notifications: "通知" notifications: "通知"
@ -810,6 +811,10 @@ desktop/views/components/timeline.vue:
global: "グローバル" global: "グローバル"
mentions: "あなた宛て" mentions: "あなた宛て"
list: "リスト" list: "リスト"
hashtag: "ハッシュタグ"
add-tag-timeline: "ハッシュタグを追加"
add-list: "リストを追加"
list-name: "リスト名"
desktop/views/components/ui.header.vue: desktop/views/components/ui.header.vue:
welcome-back: "おかえりなさい、" welcome-back: "おかえりなさい、"
adjective: "さん" adjective: "さん"

View File

@ -155,6 +155,7 @@ common:
home: "Startseite" home: "Startseite"
local: "Lokal" local: "Lokal"
hybrid: "ソーシャル" hybrid: "ソーシャル"
hashtag: "ハッシュタグ"
global: "Global" global: "Global"
mentions: "あなた宛て" mentions: "あなた宛て"
notifications: "Mitteilungen" notifications: "Mitteilungen"
@ -810,6 +811,10 @@ desktop/views/components/timeline.vue:
global: "Global" global: "Global"
mentions: "あなた宛て" mentions: "あなた宛て"
list: "Listen" list: "Listen"
hashtag: "ハッシュタグ"
add-tag-timeline: "ハッシュタグを追加"
add-list: "リストを追加"
list-name: "リスト名"
desktop/views/components/ui.header.vue: desktop/views/components/ui.header.vue:
welcome-back: "おかえりなさい、" welcome-back: "おかえりなさい、"
adjective: "さん" adjective: "さん"

View File

@ -155,6 +155,7 @@ common:
home: "Home" home: "Home"
local: "Local" local: "Local"
hybrid: "Social" hybrid: "Social"
hashtag: "ハッシュタグ"
global: "Global" global: "Global"
mentions: "Mentions" mentions: "Mentions"
notifications: "Notifications" notifications: "Notifications"
@ -810,6 +811,10 @@ desktop/views/components/timeline.vue:
global: "Global" global: "Global"
mentions: "Mentions" mentions: "Mentions"
list: "Lists" list: "Lists"
hashtag: "ハッシュタグ"
add-tag-timeline: "ハッシュタグを追加"
add-list: "リストを追加"
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"

View File

@ -155,6 +155,7 @@ common:
home: "Inicio" home: "Inicio"
local: "Local" local: "Local"
hybrid: "Social" hybrid: "Social"
hashtag: "ハッシュタグ"
global: "Global" global: "Global"
mentions: "あなた宛て" mentions: "あなた宛て"
notifications: "Notificaciones" notifications: "Notificaciones"
@ -810,6 +811,10 @@ desktop/views/components/timeline.vue:
global: "グローバル" global: "グローバル"
mentions: "あなた宛て" mentions: "あなた宛て"
list: "リスト" list: "リスト"
hashtag: "ハッシュタグ"
add-tag-timeline: "ハッシュタグを追加"
add-list: "リストを追加"
list-name: "リスト名"
desktop/views/components/ui.header.vue: desktop/views/components/ui.header.vue:
welcome-back: "Bienvenido/a de vuelta," welcome-back: "Bienvenido/a de vuelta,"
adjective: "-san" adjective: "-san"

View File

@ -112,7 +112,7 @@ common:
always-show-nsfw: "常に閲覧注意のメディアを表示する" always-show-nsfw: "常に閲覧注意のメディアを表示する"
always-mark-nsfw: "常にメディアを閲覧注意として投稿" always-mark-nsfw: "常にメディアを閲覧注意として投稿"
show-full-acct: "ユーザー名のホストを省略しない" show-full-acct: "ユーザー名のホストを省略しない"
reduce-motion: "UIの動きを減らす" reduce-motion: "Réduire les animations dans linterface utilisateur"
this-setting-is-this-device-only: "Uniquement sur cet appareil" this-setting-is-this-device-only: "Uniquement sur cet appareil"
do-not-use-in-production: 'Il sagit dune version de développement. Ne pas utiliser dans un environnement de production.' do-not-use-in-production: 'Il sagit dune version de développement. Ne pas utiliser dans un environnement de production.'
reversi: reversi:
@ -155,8 +155,9 @@ common:
home: "Accueil" home: "Accueil"
local: "Local" local: "Local"
hybrid: "Social" hybrid: "Social"
hashtag: "ハッシュタグ"
global: "Global" global: "Global"
mentions: "あなた宛て" mentions: "Mentions"
notifications: "Notifications" notifications: "Notifications"
list: "Liste" list: "Liste"
swap-left: "Déplacer à gauche" swap-left: "Déplacer à gauche"
@ -260,8 +261,8 @@ common/views/components/connect-failed.troubleshooter.vue:
flush: "Vider le cache" flush: "Vider le cache"
set-version: "Choisissez une version" set-version: "Choisissez une version"
common/views/components/media-banner.vue: common/views/components/media-banner.vue:
sensitive: "閲覧注意" sensitive: "Contenu sensible"
click-to-show: "クリックして表示" click-to-show: "Cliquer pour afficher"
common/views/components/cw-button.vue: common/views/components/cw-button.vue:
hide: "Masquer" hide: "Masquer"
show: "Voir plus" show: "Voir plus"
@ -484,7 +485,7 @@ desktop/views/components/charts.vue:
drive-files-total: "ドライブのファイル数の累計" drive-files-total: "ドライブのファイル数の累計"
network-requests: "Requêtes" network-requests: "Requêtes"
network-time: "Temps de réponse" network-time: "Temps de réponse"
network-usage: "通信量" network-usage: "Traffic"
desktop/views/components/choose-file-from-drive-window.vue: desktop/views/components/choose-file-from-drive-window.vue:
choose-file: "Sélection de fichiers" choose-file: "Sélection de fichiers"
upload: "Téléverser des fichiers à partir de votre ordinateur" upload: "Téléverser des fichiers à partir de votre ordinateur"
@ -791,7 +792,7 @@ desktop/views/components/settings.profile.vue:
birthday: "Date de naissance" birthday: "Date de naissance"
save: "Mettre à jour le profil" save: "Mettre à jour le profil"
locked-account: "Protéger votre compte" locked-account: "Protéger votre compte"
is-locked: "フォローを承認制にする" is-locked: "Demande dabonnement en attente dapprobation"
other: "Autre" other: "Autre"
is-bot: "Ce compte est un Bot" is-bot: "Ce compte est un Bot"
is-cat: "Ce compte est un Chat" is-cat: "Ce compte est un Chat"
@ -808,8 +809,12 @@ desktop/views/components/timeline.vue:
local: "Local" local: "Local"
hybrid: "Social" hybrid: "Social"
global: "Global" global: "Global"
mentions: "あなた宛て" mentions: "Mentions"
list: "Listes" list: "Listes"
hashtag: "ハッシュタグ"
add-tag-timeline: "ハッシュタグを追加"
add-list: "リストを追加"
list-name: "リスト名"
desktop/views/components/ui.header.vue: desktop/views/components/ui.header.vue:
welcome-back: "Content de vous revoir !" welcome-back: "Content de vous revoir !"
adjective: "さん" adjective: "さん"
@ -1134,7 +1139,7 @@ mobile/views/pages/home.vue:
local: "Local" local: "Local"
hybrid: "Social" hybrid: "Social"
global: "Global" global: "Global"
mentions: "あなた宛て" mentions: "Mentions"
mobile/views/pages/tag.vue: mobile/views/pages/tag.vue:
no-posts-found: "Pas de message avec un hashtag {} trouvé." no-posts-found: "Pas de message avec un hashtag {} trouvé."
mobile/views/pages/welcome.vue: mobile/views/pages/welcome.vue:
@ -1175,7 +1180,7 @@ mobile/views/pages/settings/settings.profile.vue:
avatar: "Avatar" avatar: "Avatar"
banner: "Bannière" banner: "Bannière"
is-cat: "Ce compte est un Bot" is-cat: "Ce compte est un Bot"
is-locked: "フォローを承認制にする" is-locked: "Demande dabonnement en attente dapprobation"
advanced: "Avancé" advanced: "Avancé"
privacy: "Vie privée" privacy: "Vie privée"
save: "Mettre à jour le profil" save: "Mettre à jour le profil"

View File

@ -155,6 +155,7 @@ common:
home: "ホーム" home: "ホーム"
local: "ローカル" local: "ローカル"
hybrid: "ソーシャル" hybrid: "ソーシャル"
hashtag: "ハッシュタグ"
global: "グローバル" global: "グローバル"
mentions: "あなた宛て" mentions: "あなた宛て"
notifications: "通知" notifications: "通知"
@ -810,6 +811,10 @@ desktop/views/components/timeline.vue:
global: "グローバル" global: "グローバル"
mentions: "あなた宛て" mentions: "あなた宛て"
list: "リスト" list: "リスト"
hashtag: "ハッシュタグ"
add-tag-timeline: "ハッシュタグを追加"
add-list: "リストを追加"
list-name: "リスト名"
desktop/views/components/ui.header.vue: desktop/views/components/ui.header.vue:
welcome-back: "おかえりなさい、" welcome-back: "おかえりなさい、"
adjective: "さん" adjective: "さん"

View File

@ -155,6 +155,7 @@ common:
home: "うち" home: "うち"
local: "ローカル" local: "ローカル"
hybrid: "ソーシャル" hybrid: "ソーシャル"
hashtag: "ハッシュタグ"
global: "グローバル" global: "グローバル"
mentions: "あなた宛て" mentions: "あなた宛て"
notifications: "通知" notifications: "通知"
@ -810,6 +811,10 @@ desktop/views/components/timeline.vue:
global: "グローバル" global: "グローバル"
mentions: "あなた宛て" mentions: "あなた宛て"
list: "リスト" list: "リスト"
hashtag: "ハッシュタグ"
add-tag-timeline: "ハッシュタグを追加"
add-list: "リストを追加"
list-name: "リスト名"
desktop/views/components/ui.header.vue: desktop/views/components/ui.header.vue:
welcome-back: "おかえり、" welcome-back: "おかえり、"
adjective: "さん" adjective: "さん"

View File

@ -155,6 +155,7 @@ common:
home: "홈" home: "홈"
local: "로컬" local: "로컬"
hybrid: "소셜" hybrid: "소셜"
hashtag: "ハッシュタグ"
global: "글로벌" global: "글로벌"
mentions: "あなた宛て" mentions: "あなた宛て"
notifications: "통지" notifications: "통지"
@ -810,6 +811,10 @@ desktop/views/components/timeline.vue:
global: "グローバル" global: "グローバル"
mentions: "あなた宛て" mentions: "あなた宛て"
list: "リスト" list: "リスト"
hashtag: "ハッシュタグ"
add-tag-timeline: "ハッシュタグを追加"
add-list: "リストを追加"
list-name: "リスト名"
desktop/views/components/ui.header.vue: desktop/views/components/ui.header.vue:
welcome-back: "おかえりなさい、" welcome-back: "おかえりなさい、"
adjective: "さん" adjective: "さん"

View File

@ -155,6 +155,7 @@ common:
home: "ホーム" home: "ホーム"
local: "ローカル" local: "ローカル"
hybrid: "ソーシャル" hybrid: "ソーシャル"
hashtag: "ハッシュタグ"
global: "グローバル" global: "グローバル"
mentions: "あなた宛て" mentions: "あなた宛て"
notifications: "通知" notifications: "通知"
@ -810,6 +811,10 @@ desktop/views/components/timeline.vue:
global: "Algemeen" global: "Algemeen"
mentions: "あなた宛て" mentions: "あなた宛て"
list: "Lijsten" list: "Lijsten"
hashtag: "ハッシュタグ"
add-tag-timeline: "ハッシュタグを追加"
add-list: "リストを追加"
list-name: "リスト名"
desktop/views/components/ui.header.vue: desktop/views/components/ui.header.vue:
welcome-back: "おかえりなさい、" welcome-back: "おかえりなさい、"
adjective: "さん" adjective: "さん"

View File

@ -155,6 +155,7 @@ common:
home: "ホーム" home: "ホーム"
local: "ローカル" local: "ローカル"
hybrid: "ソーシャル" hybrid: "ソーシャル"
hashtag: "ハッシュタグ"
global: "グローバル" global: "グローバル"
mentions: "あなた宛て" mentions: "あなた宛て"
notifications: "通知" notifications: "通知"
@ -810,6 +811,10 @@ desktop/views/components/timeline.vue:
global: "グローバル" global: "グローバル"
mentions: "あなた宛て" mentions: "あなた宛て"
list: "リスト" list: "リスト"
hashtag: "ハッシュタグ"
add-tag-timeline: "ハッシュタグを追加"
add-list: "リストを追加"
list-name: "リスト名"
desktop/views/components/ui.header.vue: desktop/views/components/ui.header.vue:
welcome-back: "おかえりなさい、" welcome-back: "おかえりなさい、"
adjective: "さん" adjective: "さん"

View File

@ -155,6 +155,7 @@ common:
home: "Strona główna" home: "Strona główna"
local: "Lokalne" local: "Lokalne"
hybrid: "Społeczność" hybrid: "Społeczność"
hashtag: "ハッシュタグ"
global: "Globalne" global: "Globalne"
mentions: "あなた宛て" mentions: "あなた宛て"
notifications: "Powiadomienia" notifications: "Powiadomienia"
@ -810,6 +811,10 @@ desktop/views/components/timeline.vue:
global: "Globalne" global: "Globalne"
mentions: "あなた宛て" mentions: "あなた宛て"
list: "Listy" list: "Listy"
hashtag: "ハッシュタグ"
add-tag-timeline: "ハッシュタグを追加"
add-list: "リストを追加"
list-name: "リスト名"
desktop/views/components/ui.header.vue: desktop/views/components/ui.header.vue:
welcome-back: "Witaj ponownie," welcome-back: "Witaj ponownie,"
adjective: "さん" adjective: "さん"

View File

@ -155,6 +155,7 @@ common:
home: "Início" home: "Início"
local: "Local" local: "Local"
hybrid: "Social" hybrid: "Social"
hashtag: "ハッシュタグ"
global: "Global" global: "Global"
mentions: "あなた宛て" mentions: "あなた宛て"
notifications: "Notificações" notifications: "Notificações"
@ -810,6 +811,10 @@ desktop/views/components/timeline.vue:
global: "グローバル" global: "グローバル"
mentions: "あなた宛て" mentions: "あなた宛て"
list: "リスト" list: "リスト"
hashtag: "ハッシュタグ"
add-tag-timeline: "ハッシュタグを追加"
add-list: "リストを追加"
list-name: "リスト名"
desktop/views/components/ui.header.vue: desktop/views/components/ui.header.vue:
welcome-back: "おかえりなさい、" welcome-back: "おかえりなさい、"
adjective: "さん" adjective: "さん"

View File

@ -155,6 +155,7 @@ common:
home: "ホーム" home: "ホーム"
local: "ローカル" local: "ローカル"
hybrid: "ソーシャル" hybrid: "ソーシャル"
hashtag: "ハッシュタグ"
global: "グローバル" global: "グローバル"
mentions: "あなた宛て" mentions: "あなた宛て"
notifications: "通知" notifications: "通知"
@ -810,6 +811,10 @@ desktop/views/components/timeline.vue:
global: "グローバル" global: "グローバル"
mentions: "あなた宛て" mentions: "あなた宛て"
list: "リスト" list: "リスト"
hashtag: "ハッシュタグ"
add-tag-timeline: "ハッシュタグを追加"
add-list: "リストを追加"
list-name: "リスト名"
desktop/views/components/ui.header.vue: desktop/views/components/ui.header.vue:
welcome-back: "おかえりなさい、" welcome-back: "おかえりなさい、"
adjective: "さん" adjective: "さん"

View File

@ -155,6 +155,7 @@ common:
home: "ホーム" home: "ホーム"
local: "ローカル" local: "ローカル"
hybrid: "ソーシャル" hybrid: "ソーシャル"
hashtag: "ハッシュタグ"
global: "グローバル" global: "グローバル"
mentions: "あなた宛て" mentions: "あなた宛て"
notifications: "通知" notifications: "通知"
@ -810,6 +811,10 @@ desktop/views/components/timeline.vue:
global: "グローバル" global: "グローバル"
mentions: "あなた宛て" mentions: "あなた宛て"
list: "リスト" list: "リスト"
hashtag: "ハッシュタグ"
add-tag-timeline: "ハッシュタグを追加"
add-list: "リストを追加"
list-name: "リスト名"
desktop/views/components/ui.header.vue: desktop/views/components/ui.header.vue:
welcome-back: "おかえりなさい、" welcome-back: "おかえりなさい、"
adjective: "さん" adjective: "さん"