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

locales/fr-FR.yml

@@ -333,7 +333,7 @@ common/views/components/nav.vue:
   stats: "Statistiques"
   status: "Statut"
   wiki: "Wiki"
-  donors: "Donateurs"
+  donors: "Donateur·rice·s"
   repository: "Dépôt"
   develop: "Développeurs"
   feedback: "Suggestions"
@@ -362,12 +362,12 @@ common/views/components/user-menu.vue:
   report-abuse-reported: "Transmit à l’administrateur. Merci de votre collaboration."
   silence: "サイレンス"
   unsilence: "サイレンス解除"
-  suspend: "凍結"
+  suspend: "Suspendre"
   unsuspend: "凍結解除"
 common/views/components/poll.vue:
   vote-to: "Voter pour '{}'"
   vote-count: "{} votes"
-  total-users: "{} utilisateurs ont voté"
+  total-users: "{} utilisateur·rice·s ont voté"
   vote: "Vote"
   show-result: "Montrer les résultats"
   voted: "Voté"
@@ -390,7 +390,7 @@ common/views/components/emoji-picker.vue:
   symbols: "Symboles"
   flags: "Drapeaux"
 common/views/components/signin.vue:
-  username: "Nom d'utilisateur"
+  username: "Nom d'utilisateur·rice"
   password: "Mot de passe"
   token: "Jeton"
   signing-in: "Connexion…"
@@ -403,7 +403,7 @@ common/views/components/signin.vue:
 common/views/components/signup.vue:
   invitation-code: "Code d’invitation"
   invitation-info: "Si vous n’avez pas de code d’invitation, contactez un <a href=\"{}\">administrateur</a>."
-  username: "Nom d'utilisateur"
+  username: "Nom d'utilisateur·rice"
   checking: "Vérification…"
   available: "Disponible"
   unavailable: "Non disponible"
@@ -436,7 +436,7 @@ common/views/components/notification-settings.vue:
   mark-as-read-all-unread-notes: "Marquer toutes les notes comme lues"
   mark-as-read-all-talk-messages: "Marquer toutes les conversations comme lues"
   auto-watch: "投稿の自動ウォッチ"
-  auto-watch-desc: "リアクションしたり返信したりした投稿に関する通知を自動的に受け取るようにします。"
+  auto-watch-desc: "Recevoir automatiquement des notifications à propos des publications auxquelles vous avez réagi ou répondu"
 common/views/components/integration-settings.vue:
   title: "Intégrations"
   connect: "Connecter"
@@ -462,8 +462,8 @@ common/views/components/visibility-chooser.vue:
   public: "Public"
   home: "Accueil"
   home-desc: "Publier sur le fil d’Accueil uniquement"
-  followers: "Abonnés"
+  followers: "Abonné·e·s"
-  followers-desc: "Publier à vos abonnés uniquement"
+  followers-desc: "Publier à vos abonné·e·s uniquement"
   specified: "Direct"
   specified-desc: "Publier uniquement aux utilisateurs mentionnés"
   local-public: "Local (Public)"
@@ -486,7 +486,7 @@ common/views/components/profile-editor.vue:
   account: "Compte"
   location: "Lieu"
   description: "À propos de moi"
-  you-can-include-hashtags: "ハッシュタグを含めることができます。"
+  you-can-include-hashtags: "Vous pouvez également inclure un hashtag sur votre description de profile."
   language: "Langue"
   birthday: "Date de naissance"
   avatar: "Avatar"
@@ -507,7 +507,7 @@ common/views/components/profile-editor.vue:
   email-verified: "L’adresse du courrier électronique a été vérifiée."
   email-not-verified: "Adresse de courriel n’est pas confirmée. Veuillez vérifier votre boite de réception."
 common/views/components/user-list-editor.vue:
-  users: "Utilisateur"
+  users: "Utilisateur·rice"
   rename: "Renommer la liste"
   delete: "Supprimer la liste"
   remove-user: "Retirer de cette liste"
@@ -667,16 +667,16 @@ desktop/views/components/media-video.vue:
   sensitive: "Le contenu est NSFW"
   click-to-show: "Cliquer pour afficher"
 desktop/views/components/followers-window.vue:
-  followers: "{} abonnés"
+  followers: "{} abonné·e·s"
 desktop/views/components/followers.vue:
-  empty: "Il semble que vous n'avez pas encore d'abonnés."
+  empty: "Il semble que vous n’avez pas encore d’abonné·e·s."
 desktop/views/components/following-window.vue:
   following: "Suit {}"
 desktop/views/components/following.vue:
   empty: "Vous ne suivez aucun compte."
 desktop/views/components/friends-maker.vue:
-  title: "Utilisateurs recommandés :"
+  title: "Utilisateur·rice·s recommandé·e·s :"
-  empty: "Impossible de trouver des utilisateurs à recommander."
+  empty: "Impossible de trouver des utilisateur·trice·s à recommander."
   fetching: "Chargement"
   refresh: "Plus"
   close: "Fermer"
@@ -977,7 +977,7 @@ desktop/views/components/user-lists-window.vue:
 desktop/views/components/user-preview.vue:
   notes: "Publications"
   following: "Abonné à"
-  followers: "Abonnés"
+  followers: "Abonné·e·s"
 desktop/views/components/users-list.vue:
   all: "Tout"
   iknow: "Vous connaissez"
@@ -1251,11 +1251,11 @@ desktop/views/pages/share.vue:
 desktop/views/pages/tag.vue:
   no-posts-found: "Aucune publication contenant « {q} » n’a été trouvée."
 desktop/views/pages/user-list.users.vue:
-  users: "Utilisateurs"
+  users: "Utilisateur·rice·s"
   add-user: "Ajouter un utilisateur"
   username: "Nom d'utilisateur"
 desktop/views/pages/user/user.followers-you-know.vue:
-  title: "Abonnés que vous connaissez"
+  title: "Abonné·e·s que vous connaissez"
   loading: "Chargement en cours"
   no-users: "Aucun abonné connu"
 desktop/views/pages/user/user.friends.vue:
@@ -1272,7 +1272,7 @@ desktop/views/pages/user/user.profile.vue:
 desktop/views/pages/user/user.header.vue:
   posts: "Notes"
   following: "Suit"
-  followers: "Abonnés"
+  followers: "Abonné·e·s"
   is-bot: "Ce compte est un Bot"
   years-old: "{age} ans"
   year: "/"
@@ -1304,7 +1304,7 @@ desktop/views/widgets/trends.vue:
   refresh: "Afficher d'autres"
   nothing: "Rien"
 desktop/views/widgets/users.vue:
-  title: "Utilisateurs"
+  title: "Utilisateurs·rices"
   refresh: "Afficher d'autres"
   no-one: "Personne"
 mobile/views/components/drive.vue:
@@ -1347,7 +1347,7 @@ common/views/components/follow-button.vue:
   follow-request: "Demande d’abonnement"
 mobile/views/components/friends-maker.vue:
   title: "Abonnez-vous à"
-  empty: "Impossible de trouver des utilisateurs à recommander."
+  empty: "Impossible de trouver des utilisateurs·trices à recommander."
   fetching: "Chargement"
   refresh: "Voir plus"
   close: "Fermer"
@@ -1461,7 +1461,7 @@ mobile/views/pages/search.vue:
 mobile/views/pages/selectdrive.vue:
   select-file: "Choisissez un fichier"
 mobile/views/pages/settings.vue:
-  signed-in-as: "Connecté en tant que {}"
+  signed-in-as: "Connecté·e en tant que {}"
   design: "Affichage et design"
   dark-mode: "Mode nuit"
   i-am-under-limited-internet: "J'ai un accès Internet limité"
@@ -1506,7 +1506,7 @@ mobile/views/pages/settings.vue:
 mobile/views/pages/user.vue:
   follows-you: "Vous suit"
   following: "Abonnements"
-  followers: "Abonnés"
+  followers: "Abonné·e·s"
   notes: "Notes"
   overview: "Aperçu"
   timeline: "Fil d’actualité"
@@ -1519,10 +1519,10 @@ mobile/views/pages/user/home.vue:
   keywords: "Mot clés"
   domains: "Domaines"
   frequently-replied-users: "Utilisateurs mentionnés souvent"
-  followers-you-know: "Abonnés que vous connaissez"
+  followers-you-know: "Abonné·e·s que vous connaissez"
   last-used-at: "Dernière connexion il y a"
 mobile/views/pages/user/home.followers-you-know.vue:
-  no-users: "Aucun utilisateur connu"
+  no-users: "Aucun utilisateur·rice connu·e"
 mobile/views/pages/user/home.friends.vue:
   no-users: "Aucun utilisateur connu"
 mobile/views/pages/user/home.notes.vue:

locales/zh-CN.yml

@@ -149,7 +149,7 @@ common:
     this-turn: "{count}回合"
   widgets:
     analog-clock: "模拟时钟"
-    profile: "简介"
+    profile: "个人资料"
     calendar: "日历"
     timemachine: "日历 (时间机器)"
     activity: "动态"
@@ -360,10 +360,10 @@ common/views/components/user-menu.vue:
   report-abuse: "举报骚扰"
   report-abuse-detail: "做了什么骚扰的行为？"
   report-abuse-reported: "已报告给管理员。 非常感谢你的合作。"
-  silence: "サイレンス"
+  silence: "禁言"
-  unsilence: "サイレンス解除"
+  unsilence: "解除禁言"
-  suspend: "凍結"
+  suspend: "冻结"
-  unsuspend: "凍結解除"
+  unsuspend: "解除冻结"
 common/views/components/poll.vue:
   vote-to: "为\"{}\"投票"
   vote-count: "{}票"
@@ -462,56 +462,56 @@ common/views/components/visibility-chooser.vue:
   public: "公开"
   home: "首页"
   home-desc: "仅发送至首页"
-  followers: "粉丝"
+  followers: "关注者"
-  followers-desc: "仅发送至粉丝"
+  followers-desc: "仅发送至关注者"
   specified: "直接"
   specified-desc: "仅发送至指定用户"
   local-public: "公开（仅限本地）"
-  local-public-desc: "不要发布到公开"
+  local-public-desc: "不要公开发布"
   local-home: "首页（仅限本地）"
-  local-followers: "粉丝 (仅本地)"
+  local-followers: "关注者（仅限本地）"
 common/views/components/trends.vue:
   count: "{} 被提到"
-  empty: "没有流行的标签"
+  empty: "没有趋势"
 common/views/components/language-settings.vue:
   title: "显示语言"
-  pick-language: "选择一个语言"
+  pick-language: "选择语言"
   recommended: "推荐"
   auto: "自动"
   specify-language: "指定语言"
-  info: "你需要刷新这个页面来应用更改。"
+  info: "更改将在刷新页面后生效。"
 common/views/components/profile-editor.vue:
-  title: "个人简介"
+  title: "个人资料"
   name: "名称"
   account: "账户"
   location: "位置"
-  description: "关于我"
+  description: "个人简介"
   you-can-include-hashtags: "您可以包含一个哈希标签。"
   language: "语言"
   birthday: "生日"
   avatar: "头像"
-  banner: "背景"
+  banner: "横幅背景"
   is-cat: "这个账户是CAT"
   is-bot: "这个账户是BOT"
   is-locked: "关注者请求需要批准"
-  careful-bot: "机器人的关注者请求需要批准"
+  careful-bot: "BOT的关注者请求需要批准"
   auto-accept-followed: "自动同意来自您关注的人的关注申请"
-  advanced: "其他选项"
+  advanced: "其他"
   privacy: "隐私"
   save: "保存"
-  saved: "更新配置文件成功"
+  saved: "您的个人资料已保存"
   uploading: "正在上传"
   upload-failed: "上传失败"
   email: "邮件设置"
   email-address: "电子邮件地址"
   email-verified: "电子邮件地址已验证"
-  email-not-verified: "电子邮件地址还没有验证哦, 请检查一下收信箱吧~"
+  email-not-verified: "邮件地址尚未验证。 请检查您的邮箱。"
 common/views/components/user-list-editor.vue:
   users: "用户"
   rename: "重命名列表"
   delete: "删除列表"
   remove-user: "从此列表中删除"
-  delete-are-you-sure: "删除列表 \"$1\"？"
+  delete-are-you-sure: "删除列表“$1”？"
   deleted: "已删除"
 common/views/widgets/broadcast.vue:
   fetching: "确认中"
@@ -522,9 +522,9 @@ common/views/widgets/calendar.vue:
   year: "{}年"
   month: "{}月"
   day: "{}日"
-  today: "今天:"
+  today: "今天："
-  this-month: "本月:"
+  this-month: "本月："
-  this-year: "今年:"
+  this-year: "今年："
 common/views/widgets/photo-stream.vue:
   title: "图片轮播"
   no-photos: "没有图片"
@@ -766,7 +766,7 @@ desktop/views/pages/user-following-or-followers.vue:
 desktop/views/components/settings-window.vue:
   settings: "设置"
 desktop/views/components/settings.vue:
-  profile: "个人简介"
+  profile: "个人资料"
   notification: "通知"
   apps: "应用程序"
   tags: "标签"
@@ -947,7 +947,7 @@ desktop/views/components/ui.header.vue:
   welcome-back: "欢迎回来！"
   adjective: "先生"
 desktop/views/components/ui.header.account.vue:
-  profile: "您的个人资料"
+  profile: "个人资料"
   favorites: "最爱"
   lists: "列表"
   follow-requests: "关注申请"