1
1
mirror of https://github.com/kokonect-link/cherrypick synced 2024-12-15 15:18:22 +09:00

Merge branches 'develop', 'develop', 'develop' and 'develop' of https://github.com/syuilo/misskey into develop

This commit is contained in:
syuilo 2019-01-22 18:31:16 +09:00
commit d6b7a048e4
No known key found for this signature in database
GPG Key ID: BDC4C49D06AB9D69
2 changed files with 27 additions and 27 deletions

View File

@ -13,7 +13,7 @@
<a href="https://misskey.xyz">Misskey</a> is a decentralized microblogging platform born on Earth. <a href="https://misskey.xyz">Misskey</a> is a decentralized microblogging platform born on Earth.
Since it exists within the Fediverse (a universe where various social media platforms are organized), Since it exists within the Fediverse (a universe where various social media platforms are organized),
it is mutually linked with other social media platforms. it is mutually linked with other social media platforms.
Why don't you take a short break from the hustle and bustle of the city, and dive into a new Internet? <a href="https://joinmisskey.github.io/">Find instance!</a> Why don't you take a short break from the hustle and bustle of the city, and dive into a new Internet? <a href="https://joinmisskey.github.io/">Find an instance!</a>
</p> </p>
<a href="https://www.patreon.com/syuilo"><img src="https://c5.patreon.com/external/logo/become_a_patron_button@2x.png" alt="Become a Patron!" width="160" /></a> <a href="https://www.patreon.com/syuilo"><img src="https://c5.patreon.com/external/logo/become_a_patron_button@2x.png" alt="Become a Patron!" width="160" /></a>
@ -61,7 +61,7 @@ Organize and store your files! Want to post a picture you have already uploaded?
...and more! Experience Misskey with your own eyes at [misskey.xyz](https://misskey.xyz) or join one of the [other instances](https://joinmisskey.github.io/) that are available. ...and more! Experience Misskey with your own eyes at [misskey.xyz](https://misskey.xyz) or join one of the [other instances](https://joinmisskey.github.io/) that are available.
:package: Create Your Own Instance :package: Create your own instance
---------------------------------------------------------------- ----------------------------------------------------------------
Please see the [Setup and Installation Guide](./docs/setup.en.md). Please see the [Setup and Installation Guide](./docs/setup.en.md).

View File

@ -350,16 +350,16 @@ common/views/components/note-menu.vue:
delete-confirm: "Supprimer cette publication ?" delete-confirm: "Supprimer cette publication ?"
remote: "Afficher la note originale" remote: "Afficher la note originale"
common/views/components/user-menu.vue: common/views/components/user-menu.vue:
mention: "メンション" mention: "Mention"
mute: "ミュート" mute: "Silencier"
unmute: "ミュート解除" unmute: "Enlever la sourdine"
block: "ブロック" block: "Bloquer"
unblock: "ブロック解除" unblock: "Débloquer"
push-to-list: "リストに追加" push-to-list: "Ajouter à une liste"
select-list: "リストを選択してください" select-list: "Sélectionnez une liste"
report-abuse: "スパムを報告" report-abuse: "Signaler un abus"
report-abuse-detail: "どのような迷惑行為を行っていますか?" report-abuse-detail: "Détail du signalement"
report-abuse-reported: "管理者に報告されました。ご協力ありがとうございました。" report-abuse-reported: "Transmit à ladministrateur. Merci de votre collaboration."
common/views/components/poll.vue: common/views/components/poll.vue:
vote-to: "Voter pour '{}'" vote-to: "Voter pour '{}'"
vote-count: "{} votes" vote-count: "{} votes"
@ -490,7 +490,7 @@ common/views/components/profile-editor.vue:
is-bot: "Ce compte est un Bot" is-bot: "Ce compte est un Bot"
is-locked: "Demandes dabonnements requièrent lapprobation" is-locked: "Demandes dabonnements requièrent lapprobation"
careful-bot: "Les demandes dabonnements venant de Bots requièrent lapprobation" careful-bot: "Les demandes dabonnements venant de Bots requièrent lapprobation"
auto-accept-followed: "フォローしているユーザーからのフォローを自動承認する" auto-accept-followed: "Accepter automatiquement les demandes dabonnement venant des gens que vous suivez"
advanced: "Avancé" advanced: "Avancé"
privacy: "Vie privée" privacy: "Vie privée"
save: "Mettre à jour le profil" save: "Mettre à jour le profil"
@ -989,7 +989,7 @@ admin/views/index.vue:
federation: "Fédération" federation: "Fédération"
announcements: "Annonces" announcements: "Annonces"
hashtags: "Hashtags" hashtags: "Hashtags"
abuse: "スパム報告" abuse: "Abus"
back-to-misskey: "Retour vers Misskey" back-to-misskey: "Retour vers Misskey"
admin/views/dashboard.vue: admin/views/dashboard.vue:
dashboard: "Tableau de bord" dashboard: "Tableau de bord"
@ -1000,11 +1000,11 @@ admin/views/dashboard.vue:
this-instance: "Cette instance" this-instance: "Cette instance"
federated: "Fédérées" federated: "Fédérées"
admin/views/abuse.vue: admin/views/abuse.vue:
title: "スパム報告" title: "Abus"
target: "対象" target: "Cible"
reporter: "報告者" reporter: "Signalé par"
details: "詳細" details: "Détails"
remove-report: "削除" remove-report: "Supprimer"
admin/views/instance.vue: admin/views/instance.vue:
instance: "Instance" instance: "Instance"
instance-name: "Nom de linstance" instance-name: "Nom de linstance"
@ -1051,7 +1051,7 @@ admin/views/instance.vue:
max-note-text-length: "Nombre maximal de caractères pour les messages" max-note-text-length: "Nombre maximal de caractères pour les messages"
disable-registration: "Désactiver les inscriptions" disable-registration: "Désactiver les inscriptions"
disable-local-timeline: "Désactiver le fil local" disable-local-timeline: "Désactiver le fil local"
disable-global-timeline: "グローバルタイムラインを無効にする" disable-global-timeline: "Désactiver le fil global"
disabling-timelines-info: "これらのタイムラインを無効にしても、管理者およびモデレーターは引き続き利用できます。" disabling-timelines-info: "これらのタイムラインを無効にしても、管理者およびモデレーターは引き続き利用できます。"
invite: "Inviter" invite: "Inviter"
save: "Sauvegarder" save: "Sauvegarder"
@ -1105,10 +1105,10 @@ admin/views/charts.vue:
network-time: "Temps de réponse" network-time: "Temps de réponse"
network-usage: "Traffic" network-usage: "Traffic"
admin/views/drive.vue: admin/views/drive.vue:
operation: "操作" operation: "Actions"
fileid-or-url: "ファイルIDまたはファイルURL" fileid-or-url: "ID du fichier ou URL"
file-not-found: "ファイルが見つかりません" file-not-found: "Fichier non trouvé"
lookup: "照会" lookup: "Recherche"
sort: sort:
title: "Tri" title: "Tri"
createdAtAsc: "Âge - Du plus ancien" createdAtAsc: "Âge - Du plus ancien"
@ -1124,8 +1124,8 @@ admin/views/drive.vue:
deleted: "Supprimé" deleted: "Supprimé"
mark-as-sensitive: "Marquer comme sensible" mark-as-sensitive: "Marquer comme sensible"
unmark-as-sensitive: "Ne pas marquer comme sensible" unmark-as-sensitive: "Ne pas marquer comme sensible"
marked-as-sensitive: "閲覧注意に設定しました" marked-as-sensitive: "Marqué comme sensible"
unmarked-as-sensitive: "閲覧注意を解除しました" unmarked-as-sensitive: "Marqué comme non sensible"
admin/views/users.vue: admin/views/users.vue:
operation: "Actions" operation: "Actions"
username-or-userid: "Nom dutilisateur·rice ou ID utilisateur" username-or-userid: "Nom dutilisateur·rice ou ID utilisateur"
@ -1252,7 +1252,7 @@ desktop/views/pages/user/user.photos.vue:
no-photos: "Pas de photos" no-photos: "Pas de photos"
desktop/views/pages/user/user.profile.vue: desktop/views/pages/user/user.profile.vue:
follows-you: "Vous suit" follows-you: "Vous suit"
menu: "メニュー" menu: "Menu"
desktop/views/pages/user/user.header.vue: desktop/views/pages/user/user.header.vue:
posts: "Notes" posts: "Notes"
following: "Suit" following: "Suit"