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

2023-05-11 20:17:48 +09:00 · 2023-05-11 20:17:48 +09:00 · a65fa684ce
commit a65fa684ce
parent e18feb4183 0758c56c53
14 changed files with 51 additions and 6 deletions
--- a/.github/reviewer-lottery.yml
+++ b/.github/reviewer-lottery.yml
@ -6,5 +6,4 @@ groups:
      - syuilo
      - acid-chicken
      - EbiseLutica
-      - rinsuki
      - tamaina
--- a/locales/de-DE.yml
+++ b/locales/de-DE.yml
@ -990,6 +990,7 @@ rolesAssignedToMe: "Mir zugewiesene Rollen"
 resetPasswordConfirm: "Wirklich Passwort zurücksetzen?"
 sensitiveWords: "Sensible Wörter"
 sensitiveWordsDescription: "Die Notizsichtbarkeit aller Notizen, die diese Wörter enthalten, wird automatisch auf \"Startseite\" gesetzt. Durch Zeilenumbrüche können mehrere konfiguriert werden."
+sensitiveWordsDescription2: "Durch die Verwendung von Leerzeichen können AND-Verknüpfungen angegeben werden und durch das Umgeben von Schrägstrichen können reguläre Ausdrücke verwendet werden."
 notesSearchNotAvailable: "Die Notizsuche ist nicht verfügbar."
 license: "Lizenz"
 unfavoriteConfirm: "Wirklich aus Favoriten entfernen?"
@ -1038,8 +1039,10 @@ thisChannelArchived: "Dieser Kanal wurde archiviert."
 displayOfNote: "Anzeige von Notizen"
 initialAccountSetting: "Kontoeinrichtung"
 youFollowing: "Gefolgt"
-preventAiLarning: "Verwendung in machinellem Lernen (AI/KI) ablehnen"
-preventAiLarningDescription: "Fordert Crawler auf, gepostetes Text- oder Bildmaterial usw. nicht in Datensätzen für maschinelles Lernen (AI/KI) zu verwenden. Dies wird durch das Hinzufügen eines \"noai\"-HTML-Tags an den jeweiligen Inhalt erreicht. Da dieser Tag jedoch ignoriert werden kann, ist eine vollständige Verhinderung hierdurch nicht möglich."
+preventAiLearning: "Verwendung in machinellem Lernen (Generative bzw. Prediktive AI/KI) ablehnen"
+preventAiLearningDescription: "Fordert Crawler auf, gepostetes Text- oder Bildmaterial usw. nicht in Datensätzen für maschinelles Lernen (Generative bzw. Prediktive AI/KI) zu verwenden. Dies wird durch das Hinzufügen einer \"noai\"-Flag in der HTML-Antwort des jeweiligen Inhalts erreicht. Da diese Flag jedoch ignoriert werden kann, ist eine vollständige Verhinderung hierdurch nicht möglich."
+options: "Optionen"
+specifyUser: "Spezifischer Benutzer"
 _initialAccountSetting:
  accountCreated: "Dein Konto wurde erfolgreich erstellt!"
  letsStartAccountSetup: "Lass uns nun dein Konto einrichten."
--- a/locales/en-US.yml
+++ b/locales/en-US.yml
@ -990,6 +990,7 @@ rolesAssignedToMe: "Roles assigned to me"
 resetPasswordConfirm: "Really reset your password?"
 sensitiveWords: "Sensitive words"
 sensitiveWordsDescription: "The visibility of all notes containing any of the configured words will be set to \"Home\" automatically. You can list multiple by separating them via line breaks."
+sensitiveWordsDescription2: "Using spaces will create AND expressions and surrounding keywords with slashes will turn them into a regular expression."
 notesSearchNotAvailable: "Note search is unavailable."
 license: "License"
 unfavoriteConfirm: "Really remove from favorites?"
@ -1038,8 +1039,10 @@ thisChannelArchived: "This channel has been archived."
 displayOfNote: "Note display"
 initialAccountSetting: "Profile setup"
 youFollowing: "Followed"
-preventAiLarning: "Reject usage in Machine Learning (AI)"
-preventAiLarningDescription: "Requests crawlers to not use posted text or image material etc. in machine learning (AI) data sets. This is achieved by adding a \"noai\" HTML-Tag to the respective content. A complete prevention can however not be achieved through this tag, as it may simply be ignored."
+preventAiLearning: "Reject usage in Machine Learning (Generative AI)"
+preventAiLearningDescription: "Requests crawlers to not use posted text or image material etc. in machine learning (Predictive / Generative AI) data sets. This is achieved by adding a \"noai\" HTML-Response flag to the respective content. A complete prevention can however not be achieved through this flag, as it may simply be ignored."
+options: "Options"
+specifyUser: "Specific user"
 _initialAccountSetting:
  accountCreated: "Your account was successfully created!"
  letsStartAccountSetup: "For starters, let's set up your profile."
@ -1324,7 +1327,7 @@ _role:
  isConditionalRole: "This is a conditional role."
  isPublic: "Public role"
  descriptionOfIsPublic: "Anyone will be able to view a list of users assigned to this role. In addition, this role will be displayed in the profiles of assigned users."
-  options: "Role options"
+  options: "Options"
  policies: "Policies"
  baseRole: "Role template"
  useBaseValue: "Use role template value"
--- a/locales/es-ES.yml
+++ b/locales/es-ES.yml
@ -993,6 +993,7 @@ accountMigration: "Migración de cuenta"
 accountMoved: "Este usuario se ha mudado a una nueva cuenta:"
 horizontal: "Horizontal"
 youFollowing: "Siguiendo"
+options: "Opción"
 _accountMigration:
  moveFrom: "Trasladar de otra cuenta a ésta"
  moveFromLabel: "Cuenta desde la que se realiza el traslado:"
--- a/locales/fr-FR.yml
+++ b/locales/fr-FR.yml
@ -452,6 +452,7 @@ native: "Natif"
 disableDrawer: "Les menus ne s'affichent pas dans le tiroir"
 noHistory: "Pas d'historique"
 signinHistory: "Historique de connexion"
+enableAdvancedMfm: "Activer la MFM avancée"
 doing: "En cours..."
 category: "Catégorie"
 tags: "Étiquettes"
@ -846,6 +847,7 @@ rateLimitExceeded: "Limite de taux dépassée"
 cropImage: "Recadrer l'image"
 cropImageAsk: "Voulez-vous recadrer cette image ?"
 cropYes: "Rogner"
+cropNo: "Utiliser en l'état"
 file: "Fichiers"
 recentNHours: "Dernières {n} heures"
 recentNDays: "Derniers {n} jours"
@ -912,6 +914,7 @@ color: "Couleur"
 manageCustomEmojis: "Gestion des émojis personnalisés"
 preset: "Préréglage"
 selectFromPresets: "Sélectionner à partir des préréglages"
+thisPostMayBeAnnoyingCancel: "Annuler"
 license: "Licence"
 video: "Vidéo"
 videos: "Vidéos"
@ -925,6 +928,7 @@ leftBottom: "En bas à gauche"
 rightBottom: "En bas à droite"
 vertical: "Vertical"
 horizontal: "Latéral"
+serverRules: "Règles du serveur"
 youFollowing: "Abonné·e"
 _achievements:
  _types:
@ -934,10 +938,13 @@ _achievements:
    _notes100000:
      title: "ALL YOUR NOTE ARE BELONG TO US"
    _login3:
+      title: "Débutant Ⅰ"
      description: "Se connecter pour un total de 3 jours"
    _login7:
+      title: "Débutant Ⅱ"
      description: "Se connecter pour un total de 7 jours"
    _login15:
+      title: "Débutant Ⅲ"
      description: "Se connecter pour un total de 15 jours"
    _login30:
      description: "Se connecter pour un total de 30 jours"
@ -945,6 +952,22 @@ _achievements:
      description: "Se connecter pour un total de 60 jours"
    _login100:
      description: "Se connecter pour un total de 100 jours"
+    _login200:
+      description: "Se connecter pour un total de 200 jours"
+    _login300:
+      description: "Se connecter pour un total de 300 jours"
+    _login400:
+      description: "Se connecter pour un total de 400 jours"
+    _login500:
+      description: "Se connecter pour un total de 500 jours"
+    _login600:
+      description: "Se connecter pour un total de 600 jours"
+    _login700:
+      description: "Se connecter pour un total de 700 jours"
+    _login800:
+      description: "Se connecter pour un total de 800 jours"
+    _login900:
+      description: "Se connecter pour un total de 900 jours"
    _login1000:
      flavor: "Merci d'utiliser Misskey !"
    _markedAsCat:
@ -954,8 +977,12 @@ _achievements:
      title: "Beaucoup d'amis"
    _followers10:
      title: "Abonnez-moi !"
+    _iLoveMisskey:
+      title: "J’adore Misskey"
    _viewInstanceChart:
      title: "Analyste"
+    _loggedInOnBirthday:
+      title: "Joyeux Anniversaire !"
    _loggedInOnNewYearsDay:
      title: "Bonne année !"
 _role:
--- a/locales/id-ID.yml
+++ b/locales/id-ID.yml
@ -955,6 +955,7 @@ disableFederationConfirmWarn: "Mematikan federasi tidak membuat kiriman menjadi
 disableFederationOk: "Matikan federasi"
 horizontal: "Horisontal"
 youFollowing: "Mengikuti"
+options: "Opsi peran"
 _achievements:
  earnedAt: "Terbuka pada"
  _types:
--- a/locales/it-IT.yml
+++ b/locales/it-IT.yml
@ -1020,6 +1020,7 @@ pleaseConfirmBelowBeforeSignup: "Ai sensi del regolamento EU 679/2016 GDPR, auto
 pleaseAgreeAllToContinue: "Per continuare, occorre selezionare ed essere d'accordo su tutto."
 continue: "Continua"
 youFollowing: "Seguiti"
+options: "Opzioni del ruolo"
 _serverRules:
  description: "In Europa è necessario mostrare l'informativa sul trattamento dei dati personali, prima della registrazione al servizio."
 _accountMigration:
--- a/locales/ja-KS.yml
+++ b/locales/ja-KS.yml
@ -1038,6 +1038,7 @@ thisChannelArchived: "このチャンネル、アーカイブされとるで。"
 displayOfNote: "ノートの表示"
 initialAccountSetting: "初期設定"
 youFollowing: "フォロー中やで"
+options: "オプション"
 _initialAccountSetting:
  accountCreated: "アカウント作り終わったで。"
  letsFillYourProfile: "最初はあんたのプロフィールを設定しよか。"
--- a/locales/ko-KR.yml
+++ b/locales/ko-KR.yml
@ -1038,6 +1038,7 @@ thisChannelArchived: "이 채널은 아카이브되었습니다."
 displayOfNote: "노트 표시"
 initialAccountSetting: "초기 설정"
 youFollowing: "팔로잉"
+options: "옵션"
 _initialAccountSetting:
  accountCreated: "계정 생성이 완료되었습니다!"
  letsStartAccountSetup: "계정의 초기 설정을 진행합니다."
--- a/locales/no-NO.yml
+++ b/locales/no-NO.yml
@ -278,6 +278,7 @@ video: "Video"
 videos: "Videoer"
 continue: "Fortsett"
 youFollowing: "Følger"
+options: "Alternativ"
 _initialAccountSetting:
  theseSettingsCanEditLater: "Du kan endre disse innstillingene senere."
 _achievements:
--- a/locales/ru-RU.yml
+++ b/locales/ru-RU.yml
@ -1006,6 +1006,7 @@ videos: "Видео"
 dataSaver: "Экономия трафика"
 horizontal: "Сбоку"
 youFollowing: "Подписки"
+options: "Настройки ролей"
 _achievements:
  earnedAt: "Разблокировано в"
  _types:
--- a/locales/th-TH.yml
+++ b/locales/th-TH.yml
@ -1031,6 +1031,7 @@ preservedUsernames: "ชื่อผู้ใช้ที่สงวนไว
 preservedUsernamesDescription: "ลิสต์ชื่อผู้ใช้ที่จะสำรองโดยคั่นด้วยการแบ่งบรรทัดนั้น เพราะสิ่งเหล่านี้จะไม่สามารถทำได้ในระหว่างการสร้างบัญชีตามปกติ บัญชีที่มีอยู่แล้วนั้นโดยใช้ชื่อผู้ใช้เหล่านี้จะไม่ได้รับผลกระทบอะไร"
 createNoteFromTheFile: "เรียบเรียงโน้ตจากไฟล์นี้"
 youFollowing: "ติดตามแล้ว"
+options: "ตัวเลือกบทบาท"
 _serverRules:
  description: "ชุดของกฎที่จะแสดงก่อนการลงทะเบียนเราขอแนะนำให้ตั้งค่าสรุปข้อกำหนดในการให้บริการ"
 _accountMigration:
--- a/locales/zh-CN.yml
+++ b/locales/zh-CN.yml
@ -1030,6 +1030,7 @@ continue: "继续"
 preservedUsernames: "保留的用户名"
 createNoteFromTheFile: "从文件创建帖子"
 youFollowing: "正在关注"
+options: "选项"
 _serverRules:
  description: "在新用户注册前显示服务器的简单规则。推荐显示服务条款的主要内容。"
 _accountMigration:
--- a/locales/zh-TW.yml
+++ b/locales/zh-TW.yml
@ -990,6 +990,7 @@ rolesAssignedToMe: "指派給自己的角色"
 resetPasswordConfirm: "重設密碼？"
 sensitiveWords: "敏感詞"
 sensitiveWordsDescription: "將含有設定詞彙的貼文可見性設為發送至首頁。可以用換行來進行複數的設定。"
+sensitiveWordsDescription2: "用空格分隔關鍵詞構成AND格式，用斜線包圍關鍵字構成正規表達式。"
 notesSearchNotAvailable: "無法使用搜尋貼文功能。"
 license: "授權"
 unfavoriteConfirm: "要取消收錄我的最愛嗎？"
@ -1038,6 +1039,9 @@ thisChannelArchived: "這個頻道已被封存。"
 displayOfNote: "顯示貼文"
 initialAccountSetting: "初始設定"
 youFollowing: "追隨中"
+preventAiLearning: "拒絕接受產生式AI的學習"
+preventAiLearningDescription: "要求外部的文章產生AI或圖像產生AI不以發布的貼文和圖像等內容為學習對象。這是透過在HTML響應中包含noai旗標來實現的，但不能完全防止AI的學習，因為這要看該AI是否遵守這個要求。"
+options: "選項"
 _initialAccountSetting:
  accountCreated: "帳戶已建立完成！"
  letsStartAccountSetup: "來進行帳戶的初始設定吧。"