diff options
author | ThibG <thib@sitedethib.com> | 2019-12-19 16:07:21 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-12-19 16:07:21 +0100 |
commit | f064cd4fb8057af04f0f1db6a98fc45935811e25 (patch) | |
tree | 33375e965ba16e3491f3bc3cd733ff2331a48220 /config | |
parent | 66ab1f83b0d342341181e0c88da83c966391fc0c (diff) | |
parent | dace054c0680b3ac6e0da31f3ffa501cd8840fbf (diff) |
Merge pull request #1255 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'config')
51 files changed, 9 insertions, 379 deletions
diff --git a/config/locales/ar.yml b/config/locales/ar.yml index 13f509836..835e96769 100644 --- a/config/locales/ar.yml +++ b/config/locales/ar.yml @@ -124,9 +124,7 @@ ar: email_status: حالة البريد الإلكتروني enable: تفعيل enabled: مفعَّل - feed_url: عنوان رابط التغذية followers: المتابِعون - followers_url: عنوان رابط المتابِعين follows: يتابع header: الرأسية inbox_url: رابط صندوق الوارد @@ -154,10 +152,8 @@ ar: no_account_selected: لم يطرأ أي تغيير على أي حساب بما أنه لم يتم اختيار أي واحد no_limits_imposed: مِن دون حدود مشروطة not_subscribed: غير مشترك - outbox_url: رابط صندوق الصادر pending: في انتظار المراجعة perform_full_suspension: تعليق الحساب - profile_url: رابط الصفحة التعريفية promote: ترقية protocol: البروتوكول public: عمومي @@ -180,7 +176,6 @@ ar: moderator: مشرف staff: الفريق user: مستخدِم - salmon_url: عنوان رابط سالمون Salmon search: البحث shared_inbox_url: رابط الصندوق المُشترَك للبريد الوارد show: @@ -399,9 +394,6 @@ ar: created_msg: تم إنشاء ملاحظة الشكوى بنجاح! destroyed_msg: تم حذف ملاحظة الشكوى بنجاح! reports: - account: - note: ملحوظة - report: تقرير action_taken_by: تم اتخاذ الإجراء مِن طرف are_you_sure: هل أنت متأكد ؟ assign_to_self: عين لي diff --git a/config/locales/bn.yml b/config/locales/bn.yml index 24f0a654a..7dd49ff96 100644 --- a/config/locales/bn.yml +++ b/config/locales/bn.yml @@ -118,9 +118,7 @@ bn: email_status: ইমেইলের অবস্থা enable: চালু করুন enabled: চালু করুন - feed_url: সম্মিলিত(feed) লিংক followers: অনুসরকারীরা - followers_url: অনুসরণকারীদের লিংক follows: অনুসরণ করে header: শিরোলেখা inbox_url: চিঠি পাওয়ার বক্স লিংক @@ -148,10 +146,8 @@ bn: no_account_selected: কোনও অ্যাকাউন্টই নির্বাচন করা হয়নি বলে কোনও অ্যাকাউন্ট পরিবর্তন করা হয়নি no_limits_imposed: কোন সীমা আরোপ করা নেই not_subscribed: সাবস্ক্রাইব নেই - outbox_url: চিঠি পাঠানোর বাক্স লিংক pending: পয্র্যবেক্ষণের অপেক্ষায় আছে perform_full_suspension: বাতিল করা - profile_url: প্রোফাইল URL promote: প্রচার protocol: প্রোটোকল public: সর্বজনীন @@ -174,7 +170,6 @@ bn: moderator: নিয়ামক staff: কর্মী user: ব্যবহারকারী - salmon_url: সালমন URL search: অনুসন্ধান search_same_ip: একই IP সহ অন্যান্য ব্যবহারকারীরা shared_inbox_url: ভাগ করা ইনবক্স URL diff --git a/config/locales/ca.yml b/config/locales/ca.yml index b8436efd2..c3cfe3083 100644 --- a/config/locales/ca.yml +++ b/config/locales/ca.yml @@ -118,9 +118,7 @@ ca: email_status: Estat del correu electrònic enable: Habilita enabled: Habilitat - feed_url: URL del canal followers: Seguidors - followers_url: URL dels seguidors follows: Segueix header: Capçalera inbox_url: URL de la safata d'entrada @@ -148,10 +146,8 @@ ca: no_account_selected: No s'han canviat els comptes perque no s'han seleccionat no_limits_imposed: Sense límits imposats not_subscribed: No subscrit - outbox_url: URL de la bústia de sortida pending: Revisió pendent perform_full_suspension: Suspèn - profile_url: URL del perfil promote: Promociona protocol: Protocol public: Públic @@ -174,7 +170,6 @@ ca: moderator: Moderador staff: Personal user: Usuari - salmon_url: URL Salmon search: Cerca search_same_ip: Altres usuaris amb la mateixa IP shared_inbox_url: URL de la safata d'entrada compartida @@ -398,9 +393,6 @@ ca: created_msg: La nota del informe s'ha creat correctament! destroyed_msg: La nota del informe s'ha esborrat correctament! reports: - account: - note: nota - report: informe action_taken_by: Mesures adoptades per are_you_sure: N'estàs segur? assign_to_self: Assignar-me diff --git a/config/locales/co.yml b/config/locales/co.yml index f14f4e9ea..9653363ca 100644 --- a/config/locales/co.yml +++ b/config/locales/co.yml @@ -118,9 +118,7 @@ co: email_status: Statutu di l’e-mail enable: Attivà enabled: Attivatu - feed_url: URL di u flussu followers: Abbunati - followers_url: URL di l’abbunati follows: Abbunamenti header: Intistatura inbox_url: URL di l’inbox @@ -148,10 +146,8 @@ co: no_account_selected: Nisun contu hè statu cambiatu postu ch'ùn c'eranu micca selezziunati no_limits_imposed: Nisuna limita imposta not_subscribed: Micca abbunatu - outbox_url: URL di l’outbox pending: In attesa di rivista perform_full_suspension: Suspende - profile_url: URL di u prufile promote: Prumove protocol: Prutucollu public: Pubblicu @@ -174,7 +170,6 @@ co: moderator: Muderatore staff: Squadra user: Utilizatore - salmon_url: URL di Salmon search: Cercà search_same_ip: Altri utilizatori cù listessa IP shared_inbox_url: URL di l’inbox spartuta @@ -398,9 +393,6 @@ co: created_msg: Nota di signalamentu creata! destroyed_msg: Nota di signalamentu sguassata! reports: - account: - note: nota - report: palisà action_taken_by: Intervenzione di are_you_sure: Site sicuru·a? assign_to_self: Assignallu à mè diff --git a/config/locales/cs.yml b/config/locales/cs.yml index 478169d70..81ae22680 100644 --- a/config/locales/cs.yml +++ b/config/locales/cs.yml @@ -126,9 +126,7 @@ cs: email_status: Stav e-mailu enable: Povolit enabled: Povoleno - feed_url: URL proudu followers: Sledující - followers_url: URL sledujících follows: Sledovaní header: Záhlaví inbox_url: URL příchozí schránky @@ -156,10 +154,8 @@ cs: no_account_selected: Nebyl změněn žádný účet, neboť žádný nebyl zvolen no_limits_imposed: Nejsou nastavena žádná omezení not_subscribed: Neodebírá - outbox_url: URL odchozí schránky pending: Čeká na posouzení perform_full_suspension: Pozastavit - profile_url: URL profilu promote: Povýšit protocol: Protokol public: Veřejný @@ -182,7 +178,6 @@ cs: moderator: Moderátor staff: Člen personálu user: Uživatel - salmon_url: URL Salmon search: Hledat search_same_ip: Další uživatelé se stejnou IP adresou shared_inbox_url: URL sdílené příchozí schránky @@ -410,9 +405,6 @@ cs: created_msg: Poznámka o nahlášení úspěšně vytvořena! destroyed_msg: Poznámka o nahlášení úspěšně smazána! reports: - account: - note: poznámka - report: nahlášení action_taken_by: Akci vykonal/a are_you_sure: Jste si jistý/á? assign_to_self: Přidělit ke mně diff --git a/config/locales/cy.yml b/config/locales/cy.yml index aa0974a1a..fde22cc33 100644 --- a/config/locales/cy.yml +++ b/config/locales/cy.yml @@ -133,9 +133,7 @@ cy: email_status: Statws E-bost enable: Galluogi enabled: Wedi ei alluogi - feed_url: Ffrwd URL followers: Dilynwyr - followers_url: URL Dilynwyr follows: Yn dilyn header: Pennawd inbox_url: URL Mewnflwch @@ -163,10 +161,8 @@ cy: no_account_selected: Ni newidwyd dim cyfrif achos ni ddewiswyd dim un no_limits_imposed: Dim terfynau wedi'i gosod not_subscribed: Heb danysgrifio - outbox_url: Allflwch URL pending: Yn aros am adolygiad perform_full_suspension: Atal - profile_url: URL proffil promote: Hyrwyddo protocol: Protocol public: Cyhoeddus @@ -189,7 +185,6 @@ cy: moderator: Aroglygydd staff: Staff user: Defnyddiwr - salmon_url: URL Eog search: Chwilio search_same_ip: Defnyddwyr eraill gyda'r un IP shared_inbox_url: URL Mewnflwch wedi ei rannu @@ -419,9 +414,6 @@ cy: created_msg: Llwyddwyd i greu nodyn adroddiad! destroyed_msg: Llwyddwyd i ddileu nodyn adroddiad! reports: - account: - note: nodyn - report: adroddiad action_taken_by: Gwnaethpwyd hyn gan are_you_sure: Ydych chi'n sicr? assign_to_self: Aseinio i mi diff --git a/config/locales/da.yml b/config/locales/da.yml index 982c712a8..57f4ed879 100644 --- a/config/locales/da.yml +++ b/config/locales/da.yml @@ -96,9 +96,7 @@ da: edit: Rediger enable: Aktiver enabled: Aktiveret - feed_url: Link til feed followers: Følgere - followers_url: Link til følgere follows: Følger inbox_url: Link til indbakke invited_by: Inviteret af @@ -123,9 +121,7 @@ da: most_recent_activity: Seneste aktivitet most_recent_ip: Senest IP not_subscribed: Ikke abonneret - outbox_url: Link til udgående perform_full_suspension: Udeluk - profile_url: Link til profil promote: Forfrem protocol: Protokol public: Offentligt @@ -147,7 +143,6 @@ da: moderator: Mod staff: Personale user: Bruger - salmon_url: Salmon-URL search: Søg search_same_ip: Andre brugere med den samme IP-adresse shared_inbox_url: Link til delt indbakke @@ -333,9 +328,6 @@ da: created_msg: Anmeldelse note blev oprettet! destroyed_msg: Anmeldelse note blev slettet! reports: - account: - note: notat - report: anmeld action_taken_by: Handling udført af are_you_sure: Er du sikker? assign_to_self: Tildel til mig diff --git a/config/locales/de.yml b/config/locales/de.yml index 490ee947e..445205871 100644 --- a/config/locales/de.yml +++ b/config/locales/de.yml @@ -118,9 +118,7 @@ de: email_status: E-Mail-Status enable: Freischalten enabled: Freigegeben - feed_url: Feed-URL followers: Folgende - followers_url: URL des Folgenden follows: Folgt header: Titelbild inbox_url: Posteingangs-URL @@ -148,10 +146,8 @@ de: no_account_selected: Keine Konten wurden geändert, da keine ausgewählt wurden no_limits_imposed: Keine Beschränkungen not_subscribed: Nicht abonniert - outbox_url: Postausgangs-URL pending: In Warteschlange perform_full_suspension: Verbannen - profile_url: Profil-URL promote: Befördern protocol: Protokoll public: Öffentlich @@ -174,7 +170,6 @@ de: moderator: Moderator_in staff: Mitarbeiter user: Nutzer - salmon_url: Salmon-URL search: Suche search_same_ip: Andere Benutzer mit derselben IP shared_inbox_url: Geteilte Posteingang-URL @@ -396,9 +391,6 @@ de: created_msg: Meldungs-Kommentar erfolgreich erstellt! destroyed_msg: Meldungs-Kommentar erfolgreich gelöscht! reports: - account: - note: Notiz - report: Meldung action_taken_by: Maßnahme ergriffen durch are_you_sure: Bist du dir sicher? assign_to_self: Mir zuweisen diff --git a/config/locales/el.yml b/config/locales/el.yml index 9f4a8969d..585eefab4 100644 --- a/config/locales/el.yml +++ b/config/locales/el.yml @@ -118,9 +118,7 @@ el: email_status: Κατάσταση email enable: Ενεργοποίηση enabled: Ενεργοποιημένο - feed_url: URL ροής followers: Ακόλουθοι - followers_url: URL ακολούθων follows: Ακολουθεί header: Επικεφαλίδα inbox_url: URL εισερχομένων @@ -148,10 +146,8 @@ el: no_account_selected: Κανείς λογαριασμός δεν ενημερώθηκε αφού κανείς δεν ήταν επιλεγμένος no_limits_imposed: Χωρίς όρια not_subscribed: Άνευ συνδρομής - outbox_url: URL εξερχομένων pending: Εκκρεμεί έγκριση perform_full_suspension: Αναστολή - profile_url: URL προφίλ promote: Προβίβασε protocol: Πρωτόκολλο public: Δημόσιο @@ -174,7 +170,6 @@ el: moderator: Συντονιστής staff: Προσωπικό user: Χρήστης - salmon_url: URL Salmon search: Αναζήτηση search_same_ip: Υπόλοιποι χρήστες με την ίδια διεύθυνση IP shared_inbox_url: URL κοινόχρηστων εισερχομένων @@ -398,9 +393,6 @@ el: created_msg: Επιτυχής δημιουργία σημείωσης καταγγελίας! destroyed_msg: Επιτυχής διαγραφή σημείωσης καταγγελίας! reports: - account: - note: σημείωση - report: καταγγελία action_taken_by: Ενέργεια από τον/την are_you_sure: Σίγουρα; assign_to_self: Ανάθεση σε μένα diff --git a/config/locales/en.yml b/config/locales/en.yml index c505896e7..43c24fc4e 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -119,9 +119,7 @@ en: email_status: Email status enable: Enable enabled: Enabled - feed_url: Feed URL followers: Followers - followers_url: Followers URL follows: Follows header: Header inbox_url: Inbox URL @@ -149,10 +147,8 @@ en: no_account_selected: No accounts were changed as none were selected no_limits_imposed: No limits imposed not_subscribed: Not subscribed - outbox_url: Outbox URL pending: Pending review perform_full_suspension: Suspend - profile_url: Profile URL promote: Promote protocol: Protocol public: Public @@ -175,7 +171,6 @@ en: moderator: Moderator staff: Staff user: User - salmon_url: Salmon URL search: Search search_same_ip: Other users with the same IP shared_inbox_url: Shared inbox URL @@ -401,8 +396,12 @@ en: destroyed_msg: Report note successfully deleted! reports: account: - note: note - report: report + notes: + one: "%{count} note" + other: "%{count} notes" + reports: + one: "%{count} report" + other: "%{count} reports" action_taken_by: Action taken by are_you_sure: Are you sure? assign_to_self: Assign to me @@ -453,6 +452,8 @@ en: users: To logged-in local users domain_blocks_rationale: title: Show rationale + enable_bootstrap_timeline_accounts: + title: Enable default follows for new users enable_keybase: desc_html: Allow your users to prove their identity via keybase title: Enable keybase integration @@ -731,7 +732,6 @@ en: blocks: You block csv: CSV domain_blocks: Domain blocks - follows: You follow lists: Lists mutes: You mute storage: Media storage diff --git a/config/locales/en_GB.yml b/config/locales/en_GB.yml index 33ba16210..939dfe0c1 100644 --- a/config/locales/en_GB.yml +++ b/config/locales/en_GB.yml @@ -105,9 +105,7 @@ en_GB: email_status: Email status enable: Enable enabled: Enabled - feed_url: Feed URL followers: Followers - followers_url: Followers URL follows: Follows header: Header inbox_url: Inbox URL @@ -134,10 +132,8 @@ en_GB: most_recent_ip: Most recent IP no_limits_imposed: No limits imposed not_subscribed: Not subscribed - outbox_url: Outbox URL pending: Pending review perform_full_suspension: Suspend - profile_url: Profile URL promote: Promote protocol: Protocol public: Public @@ -159,7 +155,6 @@ en_GB: moderator: Moderator staff: Staff user: User - salmon_url: Salmon URL search: Search shared_inbox_url: Shared inbox URL show: @@ -348,9 +343,6 @@ en_GB: created_msg: Report note successfully created! destroyed_msg: Report note successfully deleted! reports: - account: - note: note - report: report action_taken_by: Action taken by are_you_sure: Are you sure? assign_to_self: Assign to me diff --git a/config/locales/eo.yml b/config/locales/eo.yml index 347873214..78ea19af5 100644 --- a/config/locales/eo.yml +++ b/config/locales/eo.yml @@ -111,9 +111,7 @@ eo: email_status: Retadreso Stato enable: Ebligi enabled: Ebligita - feed_url: URL de la fluo followers: Sekvantoj - followers_url: URL de la sekvantoj follows: Sekvatoj header: Kapa bildo inbox_url: Enira URL @@ -141,10 +139,8 @@ eo: no_account_selected: Neniu konto estis ŝanĝita ĉar neniu estis selektita no_limits_imposed: Neniu limito trudita not_subscribed: Ne abonita - outbox_url: Elira URL pending: Pritraktata recenzo perform_full_suspension: Haltigi - profile_url: Profila URL promote: Plirangigi protocol: Protokolo public: Publika @@ -167,7 +163,6 @@ eo: moderator: Kontrolanto staff: Teamo user: Uzanto - salmon_url: Salmon-URL search: Serĉi shared_inbox_url: URL de kunhavigita leterkesto show: @@ -380,9 +375,6 @@ eo: created_msg: Signala noto sukcese kreita! destroyed_msg: Signala noto sukcese forigita! reports: - account: - note: noto - report: signalo action_taken_by: Ago farita de are_you_sure: Ĉu vi certas? assign_to_self: Asigni al mi diff --git a/config/locales/es-AR.yml b/config/locales/es-AR.yml index 0af0c04bd..c52615139 100644 --- a/config/locales/es-AR.yml +++ b/config/locales/es-AR.yml @@ -118,9 +118,7 @@ es-AR: email_status: Estado del correo enable: Habilitar enabled: Habilitada - feed_url: Dirección de la fuente web followers: Seguidores - followers_url: Dirección web de los seguidores follows: Seguidores header: Cabecera inbox_url: Dirección web de la bandeja de entrada @@ -148,10 +146,8 @@ es-AR: no_account_selected: No se cambió ninguna cuenta ya que ninguna fue seleccionada no_limits_imposed: Sin límites impuestos not_subscribed: No suscripto - outbox_url: Dirección web de la bandeja de salida pending: Revisión pendiente perform_full_suspension: Suspender - profile_url: Dirección web del perfil promote: Promocionar protocol: Protocolo public: Pública @@ -395,9 +391,6 @@ es-AR: created_msg: "¡La nota de denuncia fue creada exitosamente!" destroyed_msg: "¡La nota de denuncia fue eliminada exitosamente!" reports: - account: - note: nota - report: denuncia action_taken_by: Acción tomada por are_you_sure: "¿Estás seguro?" assign_to_self: Asignármela a mí diff --git a/config/locales/es.yml b/config/locales/es.yml index 920a0ccdf..1826331b3 100644 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -118,9 +118,7 @@ es: email_status: E-mail Status enable: Habilitar enabled: Habilitada - feed_url: URL de notificaciones followers: Seguidores - followers_url: URL de los seguidores follows: Sigue header: Cabecera inbox_url: URL de la bandeja de entrada @@ -148,10 +146,8 @@ es: no_account_selected: Ninguna cuenta se cambió como ninguna fue seleccionada no_limits_imposed: Sin límites impuestos not_subscribed: No se está suscrito - outbox_url: URL de bandeja de salida pending: Revisión pendiente perform_full_suspension: Suspender - profile_url: URL del perfil promote: Promocionar protocol: Protocolo public: Público @@ -174,7 +170,6 @@ es: moderator: Moderador staff: Personal user: Usuario - salmon_url: URL de salmón search: Buscar search_same_ip: Otros usuarios con la misma IP shared_inbox_url: URL de bandeja compartida @@ -398,9 +393,6 @@ es: created_msg: "¡El registro de la denuncia se ha creado correctamente!" destroyed_msg: "¡El registro de la denuncia se ha borrado correctamente!" reports: - account: - note: nota - report: denuncia action_taken_by: Acción tomada por are_you_sure: "¿Estás seguro?" assign_to_self: Asignármela a mí diff --git a/config/locales/et.yml b/config/locales/et.yml index aa58138f7..36a2931af 100644 --- a/config/locales/et.yml +++ b/config/locales/et.yml @@ -118,9 +118,7 @@ et: email_status: E-posti staatus enable: Luba enabled: Lubatud - feed_url: Voogu URL followers: Jälgijad - followers_url: Jälgijate URL follows: Jälgib header: Päis inbox_url: Sisendkausta URL @@ -148,10 +146,8 @@ et: no_account_selected: Mitte ühtegi kontot muudeti sest midagi polnud valitud no_limits_imposed: Mitte ühtegi limiiti kehtestatud not_subscribed: Ei ole tellitud - outbox_url: Väljundkausta URL pending: Ootab ülevaatamist perform_full_suspension: Peata - profile_url: Profiili URL promote: Edenda protocol: Protokoll public: Avalik @@ -174,7 +170,6 @@ et: moderator: Moderaator staff: Personal user: Kasutaja - salmon_url: Salmoni URL search: Otsi search_same_ip: Teised kasutajad, kellel on sama IP shared_inbox_url: Jagatud sisendkausta URL @@ -401,9 +396,6 @@ et: created_msg: Teade edukalt koostatud! destroyed_msg: Teade edukalt kustutatud! reports: - account: - note: märkus - report: teavita action_taken_by: Meetmeid kasutanud are_you_sure: Olete kindel? assign_to_self: Määra mulle diff --git a/config/locales/eu.yml b/config/locales/eu.yml index ab8a68746..9dfe5e9d3 100644 --- a/config/locales/eu.yml +++ b/config/locales/eu.yml @@ -118,9 +118,7 @@ eu: email_status: Posta elektronikoaren egoera enable: Gaitu enabled: Gaituta - feed_url: Jarioaren URL-a followers: Jarraitzaileak - followers_url: Jarraitzaileen URL-a follows: Jarraitzen du header: Goiburua inbox_url: Sarrera ontziaren URL-a @@ -148,10 +146,8 @@ eu: no_account_selected: Ez da konturik aldatu ez delako bata bera hautatu no_limits_imposed: Ez da mugarik ezarri not_subscribed: Harpidetu gabe - outbox_url: Irteera ontziaren URL-a pending: Berrikusketa egiteke perform_full_suspension: Kanporatu - profile_url: Profilaren URL-a promote: Sustatu protocol: Protokoloa public: Publikoa @@ -174,7 +170,6 @@ eu: moderator: Moderatzailea staff: Langilea user: Erabiltzailea - salmon_url: Salmon URL-a search: Bilatu search_same_ip: IP bera duten beste erabiltzaileak shared_inbox_url: Partekatutako sarrera ontziaren URL-a @@ -398,9 +393,6 @@ eu: created_msg: Salaketa oharra ongi sortu da! destroyed_msg: Salaketa oharra ongi ezabatu da! reports: - account: - note: oharra - report: salaketa action_taken_by: Neurrien hartzailea are_you_sure: Ziur zaude? assign_to_self: Esleitu niri diff --git a/config/locales/fa.yml b/config/locales/fa.yml index ea901423d..02a990a40 100644 --- a/config/locales/fa.yml +++ b/config/locales/fa.yml @@ -118,9 +118,7 @@ fa: email_status: وضعیت ایمیل enable: فعال enabled: فعال - feed_url: نشانی فید followers: پیگیران - followers_url: نشانی پیگیران follows: پی میگیرد header: زمینه inbox_url: نشانی صندوق ورودی @@ -148,10 +146,8 @@ fa: no_account_selected: هیچ حسابی تغییر نکرد زیرا حسابی انتخاب نشده بود no_limits_imposed: بدون محدودیت not_subscribed: عضو نیست - outbox_url: نشانی صندوق خروجی pending: در انتظار بررسی perform_full_suspension: تعلیق - profile_url: نشانی نمایه promote: ترفیعدادن protocol: پروتکل public: عمومی @@ -174,7 +170,6 @@ fa: moderator: ناظم staff: کارمند user: کاربر - salmon_url: نشانی Salmon search: جستجو search_same_ip: دیگر کاربران با همان IP shared_inbox_url: نشانی صندوق ورودی مشترک @@ -396,9 +391,6 @@ fa: created_msg: یادداشت گزارش با موفقیت ساخته شد! destroyed_msg: یادداشت گزارش با موفقیت حذف شد! reports: - account: - note: یادداشت - report: گزارش action_taken_by: انجامدهنده are_you_sure: آیا مطمئن هستید؟ assign_to_self: به عهدهٔ من بگذار diff --git a/config/locales/fi.yml b/config/locales/fi.yml index dfe71c098..3ab1a590e 100644 --- a/config/locales/fi.yml +++ b/config/locales/fi.yml @@ -96,9 +96,7 @@ fi: email_status: Sähköpostin tila enable: Ota käyttöön enabled: Käytössä - feed_url: Syötteen osoite followers: Seuraajat - followers_url: Seuraajien osoite follows: Seuraa inbox_url: Saapuvan postilaatikon osoite ip: IP @@ -122,9 +120,7 @@ fi: most_recent_activity: Viimeisin toiminta most_recent_ip: Viimeisin IP not_subscribed: Ei tilaaja - outbox_url: Lähtevän postilaatikon osoite perform_full_suspension: Siirrä kokonaan jäähylle - profile_url: Profiilin osoite promote: Ylennä protocol: Protokolla public: Julkinen @@ -146,7 +142,6 @@ fi: moderator: Moderaattori staff: Henkilöstö user: Käyttäjä - salmon_url: Salmon-URL search: Hae shared_inbox_url: Jaetun saapuvan postilaatikon osoite show: @@ -270,9 +265,6 @@ fi: created_msg: Muistiinpano onnistuneesti lisätty raporttiin! destroyed_msg: Muistiinpano onnistuneesti poistettu raportista! reports: - account: - note: muistiinpano - report: raportti action_taken_by: Toimenpiteen tekijä are_you_sure: Oletko varma? assign_to_self: Ota tehtäväksi diff --git a/config/locales/fr.yml b/config/locales/fr.yml index 52dd032dd..06b2916fe 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -118,9 +118,7 @@ fr: email_status: État du courriel enable: Activer enabled: Activé - feed_url: URL du flux followers: Abonné⋅e⋅s - followers_url: URL des abonné·e·s follows: Abonnements header: Entête inbox_url: URL d’entrée @@ -148,10 +146,8 @@ fr: no_account_selected: Aucun compte n’a été modifié, car aucun n’a été sélectionné no_limits_imposed: Aucune limite imposée not_subscribed: Non abonné - outbox_url: URL de sortie pending: En attente d’approbation perform_full_suspension: Suspendre - profile_url: URL du profil promote: Promouvoir protocol: Protocole public: Publique @@ -174,7 +170,6 @@ fr: moderator: Modérateur staff: Équipe user: Utilisateur - salmon_url: URL Salmon search: Rechercher search_same_ip: Autres utilisateur·rice·s avec la même IP shared_inbox_url: URL de la boite de réception partagée @@ -398,9 +393,6 @@ fr: created_msg: Note de signalement créée avec succès ! destroyed_msg: Note de signalement effacée avec succès ! reports: - account: - note: note - report: signalement(s) action_taken_by: Intervention de are_you_sure: Êtes vous certain⋅e ? assign_to_self: Me l’assigner diff --git a/config/locales/gl.yml b/config/locales/gl.yml index 64f479ec7..057b21566 100644 --- a/config/locales/gl.yml +++ b/config/locales/gl.yml @@ -118,9 +118,7 @@ gl: email_status: Estado do correo enable: Habilitar enabled: Habilitado - feed_url: URL fonte followers: Seguidoras - followers_url: URL das seguidoras follows: Segue header: Cabeceira inbox_url: URL da Caixa de entrada @@ -148,10 +146,8 @@ gl: no_account_selected: Non cambiou nada xa que non tiña nada seleccionado no_limits_imposed: Sen límites impostos not_subscribed: Non suscrita - outbox_url: URL caixa de saída pending: Pendente revisión perform_full_suspension: Suspender - profile_url: URL do perfil promote: Promocionar protocol: Protocolo public: Público @@ -174,7 +170,6 @@ gl: moderator: Moderador staff: Membresía user: Usuaria - salmon_url: URL Salmon search: Busca search_same_ip: Outros usuarios co mesmo IP shared_inbox_url: URL da caixa de entrada compartida @@ -396,9 +391,6 @@ gl: created_msg: Creouse correctamente a nota do informe! destroyed_msg: Nota do informe eliminouse con éxito! reports: - account: - note: nota - report: informe action_taken_by: Acción tomada por are_you_sure: Está segura? assign_to_self: Asignarmo diff --git a/config/locales/he.yml b/config/locales/he.yml index 50db571dc..89e8a6e4f 100644 --- a/config/locales/he.yml +++ b/config/locales/he.yml @@ -52,9 +52,7 @@ he: email_status: סטטוס דוא"ל enable: לאפשר enabled: מאופשר - feed_url: כתובת פיד followers: עוקבים - followers_url: כתובת עוקבים follows: נעקבים inbox_url: כתובת תיבה נכנסת ip: כתובת IP @@ -75,9 +73,7 @@ he: most_recent_activity: פעילות עדכנית most_recent_ip: כתובות אחרונות not_subscribed: לא רשום - outbox_url: כתובת תיבת דואר יוצא perform_full_suspension: ביצוע השעייה מלאה - profile_url: כתובת פרופיל promote: להעלות בדרגה protocol: פרטיכל public: פומבי @@ -95,7 +91,6 @@ he: admin: מנהל מערכת moderator: מנחה דיונים user: משתמש(ת) - salmon_url: כתובת סלמון search: חיפוש shared_inbox_url: תיבה משותפת לדואר נכנס show: diff --git a/config/locales/hu.yml b/config/locales/hu.yml index 7f519c820..b4f8a970a 100644 --- a/config/locales/hu.yml +++ b/config/locales/hu.yml @@ -120,9 +120,7 @@ hu: email_status: E-mail állapot enable: Bekapcsolás enabled: Bekapcsolva - feed_url: Hírcsatorna URL followers: Követő - followers_url: Követő URL follows: Követett header: Fejléc inbox_url: Beérkezett üzenetek URL @@ -150,10 +148,8 @@ hu: no_account_selected: Nem változott meg egy fiók sem, mert semmi sem volt kiválasztva no_limits_imposed: Nincs korlátozás not_subscribed: Nincs feliratkozás - outbox_url: Kimenő üzenetek URL pending: Engedélyezés alatt perform_full_suspension: Felfüggesztés - profile_url: Profil URL promote: Előléptetés protocol: Protokoll public: Nyilvános @@ -176,7 +172,6 @@ hu: moderator: Moderátor staff: Stáb user: Felhasználó - salmon_url: Salmon URL search: Keresés search_same_ip: Más felhasználók ugyanezzel az IP-vel shared_inbox_url: Megosztott bejövő üzenetek URL @@ -400,9 +395,6 @@ hu: created_msg: Bejelentési feljegyzés létrehozva! destroyed_msg: Bejelentési feljegyzés törölve! reports: - account: - note: feljegyzés - report: bejelentés action_taken_by: 'Kezelte:' are_you_sure: Biztos vagy benne? assign_to_self: Magamhoz rendelés diff --git a/config/locales/id.yml b/config/locales/id.yml index 97e87460a..982e4289a 100644 --- a/config/locales/id.yml +++ b/config/locales/id.yml @@ -114,9 +114,7 @@ id: email_status: Status Email enable: Aktifkan enabled: Diaktifkan - feed_url: URL Feed followers: Pengikut - followers_url: URL pengikut follows: Mengikut header: Tajuk inbox_url: URL Kotak masuk @@ -144,10 +142,8 @@ id: no_account_selected: Tak ada akun yang diubah sebab tak ada yang dipilih no_limits_imposed: Tidak ada batasan not_subscribed: Tidak berlangganan - outbox_url: URL Kotak keluar pending: Tinjauan tertunda perform_full_suspension: Lakukan suspen penuh - profile_url: URL profil promote: Promosikan protocol: Protokol public: Publik @@ -170,7 +166,6 @@ id: moderator: Moderator staff: Staf user: Pengguna - salmon_url: URL Salmon search: Cari search_same_ip: Pengguna lain dengan IP yang sama shared_inbox_url: URL kotak masuk bersama @@ -391,9 +386,6 @@ id: created_msg: Catatan laporan berhasil dibuat! destroyed_msg: Catatan laporan berhasil dihapus! reports: - account: - note: catatan - report: lapor action_taken_by: Aksi dilakukan oleh are_you_sure: Apakah Anda yakin? assign_to_self: Tugaskan kpd saya diff --git a/config/locales/it.yml b/config/locales/it.yml index 3b5743f4d..aadf0f3d6 100644 --- a/config/locales/it.yml +++ b/config/locales/it.yml @@ -118,9 +118,7 @@ it: email_status: Stato email enable: Abilita enabled: Abilitato - feed_url: URL Feed followers: Follower - followers_url: URL follower follows: Segue header: Intestazione inbox_url: URL inbox @@ -148,10 +146,8 @@ it: no_account_selected: Nessun account è stato modificato visto che non ne è stato selezionato nessuno no_limits_imposed: Nessun limite imposto not_subscribed: Non sottoscritto - outbox_url: URL outbox pending: Revisioni in attesa perform_full_suspension: Sospendi - profile_url: URL profilo promote: Promuovi protocol: Protocollo public: Pubblico @@ -174,7 +170,6 @@ it: moderator: Moderatore staff: Personale user: Utente - salmon_url: URL Salmone search: Cerca search_same_ip: Altri utenti con lo stesso IP shared_inbox_url: URL Inbox Condiviso @@ -394,9 +389,6 @@ it: created_msg: Nota rapporto creata! destroyed_msg: Nota rapporto cancellata! reports: - account: - note: note - report: rapporto action_taken_by: Azione intrapresa da are_you_sure: Sei sicuro? assign_to_self: Assegna a me diff --git a/config/locales/ja.yml b/config/locales/ja.yml index 8bf225bee..1f71a6e28 100644 --- a/config/locales/ja.yml +++ b/config/locales/ja.yml @@ -114,9 +114,7 @@ ja: email_status: メールアドレスの状態 enable: 有効化 enabled: 有効 - feed_url: フィードURL followers: フォロワー数 - followers_url: Followers URL follows: フォロー数 header: ヘッダー inbox_url: Inbox URL @@ -144,10 +142,8 @@ ja: no_account_selected: 何も選択されていないため、変更されていません no_limits_imposed: 制限なし not_subscribed: 購読していない - outbox_url: Outbox URL pending: 承認待ち perform_full_suspension: 活動を完全に停止させる - profile_url: プロフィールURL promote: 昇格 protocol: プロトコル public: パブリック @@ -170,7 +166,6 @@ ja: moderator: モデレーター staff: スタッフ user: ユーザー - salmon_url: Salmon URL search: 検索 search_same_ip: 同じ IP のユーザーを検索 shared_inbox_url: Shared inbox URL @@ -392,9 +387,6 @@ ja: created_msg: 通報メモを書き込みました! destroyed_msg: 通報メモを削除しました! reports: - account: - note: メモ - report: 通報 action_taken_by: 通報処理者 are_you_sure: 本当に実行しますか? assign_to_self: 担当になる diff --git a/config/locales/ka.yml b/config/locales/ka.yml index 0ab1f2d69..125912892 100644 --- a/config/locales/ka.yml +++ b/config/locales/ka.yml @@ -70,9 +70,7 @@ ka: email_status: ელ-ფოსტის სტატუსი enable: ჩართვა enabled: ჩართულია - feed_url: ლენტის ურლ followers: მიმდევრები - followers_url: მიმდევრების ურლ follows: დადევნებები inbox_url: ინბოქსის ურლ ip: აი-პი @@ -93,9 +91,7 @@ ka: most_recent_activity: უახლესი აქტივობა most_recent_ip: უახლესი აი-პი not_subscribed: გამოუწერელი - outbox_url: აუთბოქსის ურლ perform_full_suspension: მოახდინეთ სრული შეჩერება - profile_url: პროფილის ურლ promote: დაწინაურება protocol: პროტოკოლი public: საჯარო @@ -115,7 +111,6 @@ ka: moderator: მოდერატორი staff: სტაფი user: მომხმარებელი - salmon_url: სალმონის ურლ search: ძებნა shared_inbox_url: გაზიარებული ინბოქსის ურლ show: @@ -267,9 +262,6 @@ ka: created_msg: რეპორტის ჩანაწერი წარმატებით შეიქმნა! destroyed_msg: რეპორტის ჩანაწერი წარმატებით გაუქმდა! reports: - account: - note: ჩანაწერი - report: რეპორტი action_taken_by: მოქმედება შეასრულა are_you_sure: დარწმუნებული ხარ? assign_to_self: დანიშნე ჩემზე diff --git a/config/locales/kk.yml b/config/locales/kk.yml index 2b3f24e02..df2a29dab 100644 --- a/config/locales/kk.yml +++ b/config/locales/kk.yml @@ -118,9 +118,7 @@ kk: email_status: Email статусы enable: Қосу enabled: Қосылды - feed_url: Feеd URL followers: Оқырмандар - followers_url: Оқырмандар URL follows: Жазылғандары header: Басы inbox_url: Келген хаттар URL @@ -148,10 +146,8 @@ kk: no_account_selected: Бірде-бір аккаунт өзгерген жоқ, себебі ештеңе таңдалмады no_limits_imposed: Шектеу жоқ not_subscribed: Жазылмаған - outbox_url: Кеткен хаттар URL pending: Күтудегілерді қарау perform_full_suspension: Тоқтат - profile_url: Профиль URL promote: Жарнамалау protocol: Хаттама public: Ашық @@ -174,7 +170,6 @@ kk: moderator: Модератор staff: Қызметкерлер user: Қолданушы - salmon_url: Ақсерке URL search: Іздеу search_same_ip: Осы ІРмен кірген басқа қолданушылар shared_inbox_url: Бөлісілген инбокс URL @@ -398,9 +393,6 @@ kk: created_msg: Шағым жазбасы сәтті құрылды! destroyed_msg: Шағым жазбасы сәтті өшірілді! reports: - account: - note: жазба - report: шағым action_taken_by: Белсенділік жасаған are_you_sure: Шынымен бе? assign_to_self: Мені тағайындау diff --git a/config/locales/ko.yml b/config/locales/ko.yml index ceeadfb36..ee9e0e954 100644 --- a/config/locales/ko.yml +++ b/config/locales/ko.yml @@ -114,9 +114,7 @@ ko: email_status: 이메일 상태 enable: 활성화 enabled: 활성 - feed_url: 피드 URL followers: 팔로워 수 - followers_url: 팔로워 URL follows: 팔로잉 수 header: 헤더 inbox_url: 수신함 URL @@ -144,10 +142,8 @@ ko: no_account_selected: 아무 계정도 선택 되지 않아 아무 것도 변경 되지 않았습니다 no_limits_imposed: 제한 없음 not_subscribed: 구독하지 않음 - outbox_url: 발신함 URL pending: 심사 대기 perform_full_suspension: 정지시키기 - profile_url: 프로필 URL promote: 승급 protocol: 프로토콜 public: 전체 공개 @@ -170,7 +166,6 @@ ko: moderator: 모더레이터 staff: 스태프 user: 사용자 - salmon_url: Salmon URL search: 검색 search_same_ip: 같은 IP의 다른 사용자들 shared_inbox_url: 공유된 inbox URL @@ -392,9 +387,6 @@ ko: created_msg: 리포트 노트가 성공적으로 작성되었습니다! destroyed_msg: 리포트 노트가 성공적으로 삭제되었습니다! reports: - account: - note: 노트 - report: 리포트 action_taken_by: 신고 처리자 are_you_sure: 정말로 실행하시겠습니까? assign_to_self: 나에게 할당하기 diff --git a/config/locales/lt.yml b/config/locales/lt.yml index 7a09bee59..e9634b397 100644 --- a/config/locales/lt.yml +++ b/config/locales/lt.yml @@ -75,9 +75,7 @@ lt: email_status: El pašto statusas enable: Įjungti enabled: Įjungta - feed_url: Srauto URL followers: Sekėjai - followers_url: Sekėjų URL follows: Seka header: Antraštė inbox_url: Gautųjų URL @@ -102,9 +100,7 @@ lt: most_recent_ip: Paskutinis IP no_limits_imposed: Be limitu not_subscribed: Ne prenumeruota - outbox_url: Išsiustųjų URL perform_full_suspension: Užrakinti - profile_url: Profilio URL promote: Paaukštinti protocol: Protokolas public: Viešas @@ -125,7 +121,6 @@ lt: moderator: Moderatorius staff: Personalas user: Vartotojas - salmon_url: Lašišos URL search: Ieškoti shared_inbox_url: Bendroji gautųjų URL show: @@ -309,9 +304,6 @@ lt: created_msg: Skundo žinutė sekmingai sukurta! destroyed_msg: Skundo žinutė sekmingai ištrinta! reports: - account: - note: raštelis - report: skundas action_taken_by: Veiksmo ėmėsi are_you_sure: Ar tu įsitikinęs? assign_to_self: Paskirti man diff --git a/config/locales/ms.yml b/config/locales/ms.yml index d824aed60..71dc72d9d 100644 --- a/config/locales/ms.yml +++ b/config/locales/ms.yml @@ -73,9 +73,7 @@ ms: email_status: Status Emel enable: Bolehkan enabled: Dibolehkan - feed_url: Suapan URL followers: Pengikut - followers_url: URL Pengikut follows: Mengikuti inbox_url: URL mesej masuk ip: Alamat IP @@ -97,9 +95,7 @@ ms: most_recent_ip: IP terbaru no_limits_imposed: Tiada had dikuatkuasakan not_subscribed: Tiada langganan - outbox_url: URL mesej keluar perform_full_suspension: Gantung - profile_url: URL profil promote: Naikkan pangkat protocol: Protokol public: Awam @@ -119,7 +115,6 @@ ms: moderator: Pengawal staff: Kakitangan user: Pengguna - salmon_url: URL Salmon search: Cari shared_inbox_url: URL Peti Masuk Berkongsi show: @@ -276,9 +271,6 @@ ms: created_msg: Nota laporan berjaya dicipta! destroyed_msg: Nota laporan berjaya dipadam! reports: - account: - note: nota - report: laporan action_taken_by: Tindakan oleh are_you_sure: Anda pasti? assign_to_self: Berikan pada saya diff --git a/config/locales/nl.yml b/config/locales/nl.yml index bfa4122ed..2b49708e3 100644 --- a/config/locales/nl.yml +++ b/config/locales/nl.yml @@ -118,9 +118,7 @@ nl: email_status: E-mailstatus enable: Inschakelen enabled: Ingeschakeld - feed_url: Feed-URL followers: Volgers - followers_url: Volgers-URL follows: Volgt header: Omslagfoto inbox_url: Inbox-URL @@ -148,10 +146,8 @@ nl: no_account_selected: Er zijn geen accounts veranderd, omdat er geen een was geselecteerd no_limits_imposed: Geen limieten ingesteld not_subscribed: Niet geabonneerd - outbox_url: Outbox-URL pending: Moet nog beoordeeld worden perform_full_suspension: Opschorten - profile_url: Profiel-URL promote: Promoveren protocol: Protocol public: Openbaar @@ -174,7 +170,6 @@ nl: moderator: Moderator staff: Medewerkers user: Gebruiker - salmon_url: Salmon-URL search: Zoeken search_same_ip: Andere gebruikers met hetzelfde IP-adres shared_inbox_url: Gedeelde inbox-URL @@ -396,9 +391,6 @@ nl: created_msg: Opmerking bij rapportage succesvol aangemaakt! destroyed_msg: Opmerking bij rapportage succesvol verwijderd! reports: - account: - note: opmerking - report: rapportage action_taken_by: Actie uitgevoerd door are_you_sure: Weet je het zeker? assign_to_self: Aan mij toewijzen diff --git a/config/locales/no.yml b/config/locales/no.yml index fa40975a7..2c8786066 100644 --- a/config/locales/no.yml +++ b/config/locales/no.yml @@ -48,9 +48,7 @@ email_status: E-poststatus enable: Aktiver enabled: Aktivert - feed_url: Feed-URL followers: Følgere - followers_url: Følgere URL follows: Følginger inbox_url: Innboks URL ip: IP-adresse @@ -71,9 +69,7 @@ most_recent_activity: Nyligste aktivitet most_recent_ip: Nyligste IP not_subscribed: Ikke abonnért - outbox_url: Utboks URL perform_full_suspension: Utfør full utvisning - profile_url: Profil-URL promote: Oppgradere protocol: Protokoll public: Offentlig @@ -90,7 +86,6 @@ roles: staff: Personale user: Bruker - salmon_url: Salmon-URL search: Søk shared_inbox_url: Delt Innboks URL show: diff --git a/config/locales/oc.yml b/config/locales/oc.yml index 851db0491..f84fe882a 100644 --- a/config/locales/oc.yml +++ b/config/locales/oc.yml @@ -108,9 +108,7 @@ oc: email_status: Estat de l’adreça enable: Activar enabled: Activat - feed_url: Flux URL followers: Seguidors - followers_url: URL dels seguidors follows: Abonaments header: Bandièra inbox_url: URL de recepcion @@ -138,10 +136,8 @@ oc: no_account_selected: Cap de compte pas cambiat estant que cap èra pas seleccionat no_limits_imposed: Cap de limit impausat not_subscribed: Pas seguidor - outbox_url: URL Outbox pending: Revision en espèra perform_full_suspension: Suspendre - profile_url: URL del perfil promote: Promòure protocol: Protocòl public: Public @@ -164,7 +160,6 @@ oc: moderator: Moderador staff: Personnal user: Uitlizaire - salmon_url: URL Salmon search: Cercar shared_inbox_url: URL de recepcion partejada show: @@ -383,9 +378,6 @@ oc: created_msg: Nòta de moderacion corrèctament creada ! destroyed_msg: Nòta de moderacion corrèctament suprimida ! reports: - account: - note: nòta - report: rapòrt action_taken_by: Mesura menada per are_you_sure: Es segur ? assign_to_self: Me l’assignar diff --git a/config/locales/pl.yml b/config/locales/pl.yml index 5cf346dc7..c57d168bf 100644 --- a/config/locales/pl.yml +++ b/config/locales/pl.yml @@ -125,9 +125,7 @@ pl: email_status: Stan e-maila enable: Aktywuj enabled: Aktywowano - feed_url: Adres kanału followers: Śledzący - followers_url: Adres śledzących follows: Śledzeni header: Nagłówek inbox_url: Adres skrzynki @@ -155,10 +153,8 @@ pl: no_account_selected: Żadne konto nie zostało zmienione, bo żadne nie zostało wybrane no_limits_imposed: Nie nałożono ograniczeń not_subscribed: Nie zasubskrybowano - outbox_url: Adres skrzynki nadawczej pending: Oczekuje na przegląd perform_full_suspension: Zawieś - profile_url: Adres profilu promote: Podnieś uprawnienia protocol: Protokół public: Publiczne @@ -181,7 +177,6 @@ pl: moderator: Moderator staff: Ekipa user: Użytkownik - salmon_url: Adres Salmon search: Szukaj shared_inbox_url: Adres udostępnianej skrzynki show: @@ -403,9 +398,6 @@ pl: created_msg: Pomyslnie utworzono notatkę moderacyjną. destroyed_msg: Pomyślnie usunięto notatkę moderacyjną. reports: - account: - note: notatka - report: zgłoszenie action_taken_by: Działanie podjęte przez are_you_sure: Czy na pewno? assign_to_self: Przypisz do siebie diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml index 7391ff06c..84eff7991 100644 --- a/config/locales/pt-BR.yml +++ b/config/locales/pt-BR.yml @@ -107,9 +107,7 @@ pt-BR: email_status: Estado do e-mail enable: Ativar enabled: Ativado - feed_url: URL do feed followers: Seguidores - followers_url: URL de seguidores follows: Segue header: Cabeçalho inbox_url: URL da caixa de entrada @@ -137,10 +135,8 @@ pt-BR: no_account_selected: Nenhuma conta foi modificada, pois nenhuma conta foi selecionada no_limits_imposed: Nenhum limite imposto not_subscribed: Não está inscrito - outbox_url: URL da caixa de saída pending: Esperando revisão perform_full_suspension: Suspender - profile_url: URL do perfil promote: Promover protocol: Protocolo public: Público @@ -163,7 +159,6 @@ pt-BR: moderator: Moderador staff: Equipe user: Usuário - salmon_url: URL Salmon search: Pesquisar shared_inbox_url: URL da caixa de entrada compartilhada show: @@ -368,9 +363,6 @@ pt-BR: created_msg: Nota de denúncia criada com sucesso! destroyed_msg: Nota de denúncia excluída com sucesso! reports: - account: - note: nota - report: denúncia action_taken_by: Ação realizada por are_you_sure: Você tem certeza? assign_to_self: Designar para mim diff --git a/config/locales/pt-PT.yml b/config/locales/pt-PT.yml index bb1de517e..3c5b1ca9a 100644 --- a/config/locales/pt-PT.yml +++ b/config/locales/pt-PT.yml @@ -106,9 +106,7 @@ pt-PT: email_status: Estado do correio electrónico enable: Ativar enabled: Ativado - feed_url: URL do Feed followers: Seguidores - followers_url: URL dos seguidores follows: A seguir header: Cabeçalho inbox_url: URL da caixa de entrada @@ -132,9 +130,7 @@ pt-PT: most_recent_ip: IP mais recente no_limits_imposed: Sem limites impostos not_subscribed: Não inscrito - outbox_url: URL da caixa de saída perform_full_suspension: Fazer suspensão completa - profile_url: URL do perfil promote: Promover protocol: Protocolo public: Público @@ -155,7 +151,6 @@ pt-PT: moderator: Moderador staff: Equipa user: Utilizador - salmon_url: URL Salmon search: Pesquisar shared_inbox_url: URL da caixa de entrada compartilhada show: @@ -346,9 +341,6 @@ pt-PT: created_msg: Relatório criado com sucesso! destroyed_msg: Relatório apagado com sucesso! reports: - account: - note: nota - report: relatório action_taken_by: Ação tomada por are_you_sure: Tens a certeza? assign_to_self: Atribuí-me a mim diff --git a/config/locales/ru.yml b/config/locales/ru.yml index 4c1035627..5c68ce4d4 100644 --- a/config/locales/ru.yml +++ b/config/locales/ru.yml @@ -126,9 +126,7 @@ ru: email_status: Статус e-mail enable: Включить enabled: Включен - feed_url: URL фида followers: Подписчики - followers_url: URL подписчиков follows: Подписки header: Шапка inbox_url: URL входящих @@ -156,10 +154,8 @@ ru: no_account_selected: Ничего не выбрано, никакие учётные записи не изменены no_limits_imposed: Без ограничений not_subscribed: Не подписаны - outbox_url: URL исходящих pending: Ожидает рассмотрения perform_full_suspension: Полная блокировка - profile_url: URL профиля promote: Повысить protocol: Протокол public: Публичный @@ -182,7 +178,6 @@ ru: moderator: Модератор staff: Персонал user: Пользователь - salmon_url: Страница Salmon search: Поиск search_same_ip: Другие пользователи с таким же IP shared_inbox_url: URL общих входящих @@ -410,9 +405,6 @@ ru: created_msg: Примечание жалобы создано! destroyed_msg: Примечание жалобы удалено! reports: - account: - note: заметок - report: жалоб action_taken_by: 'Действие предпринято:' are_you_sure: Вы уверены? assign_to_self: Назначить себе diff --git a/config/locales/sk.yml b/config/locales/sk.yml index 5dc2113fd..8339309b3 100644 --- a/config/locales/sk.yml +++ b/config/locales/sk.yml @@ -122,9 +122,7 @@ sk: email_status: Stav emailu enable: Povoľ enabled: Povolený - feed_url: adresa časovej osi followers: Sledujúci - followers_url: URL adresa sledujúcich follows: Sledovania header: Záhlavie inbox_url: URL adresa prijatých správ @@ -152,10 +150,8 @@ sk: no_account_selected: Nedošlo k žiadnému pozmeneniu účtov, keďže žiadne neboli vybrané no_limits_imposed: Nie sú stanovené žiadné obmedzenia not_subscribed: Neodoberá - outbox_url: URL poslaných pending: Vyžaduje posúdenie perform_full_suspension: Vylúč - profile_url: URL adresa profilu promote: Vyzdvihni protocol: Protokol public: Verejná časová os @@ -178,7 +174,6 @@ sk: moderator: Moderátor staff: Člen user: Užívateľ - salmon_url: Salmon adresa search: Hľadaj search_same_ip: Ostatní užívatelia s rovnakou IP adresou shared_inbox_url: URL zdieľanej schránky @@ -403,9 +398,6 @@ sk: created_msg: Poznámka o nahlásení úspešne vytvorená! destroyed_msg: Poznámka o nahlásení úspešne vymazaná! reports: - account: - note: poznámka - report: nahlás action_taken_by: Zákrok vykonal/a are_you_sure: Si si istý/á? assign_to_self: Priraď sebe diff --git a/config/locales/sl.yml b/config/locales/sl.yml index 22b58e7b6..2faaa149a 100644 --- a/config/locales/sl.yml +++ b/config/locales/sl.yml @@ -114,9 +114,7 @@ sl: email_status: Stanje e-pošte enable: Omogoči enabled: Omogočeno - feed_url: URL vira followers: Sledilci - followers_url: URL sledilcev follows: Sledi header: Glava inbox_url: URL mape "Prejeto" @@ -144,10 +142,8 @@ sl: no_account_selected: Noben račun ni bil spremenjen, ker ni bil izbran noben no_limits_imposed: Brez omejitev not_subscribed: Ni naročen - outbox_url: URL za pošiljanje pending: Čakanje na pregled perform_full_suspension: Suspendiraj - profile_url: URL profila promote: Promoviraj protocol: Protokol public: Javen @@ -170,7 +166,6 @@ sl: moderator: Moderator staff: Osebje user: Uporabnik - salmon_url: URL lososa search: Iskanje shared_inbox_url: URL mape "Prejeto v skupni rabi" show: @@ -375,9 +370,6 @@ sl: created_msg: Opomba o prijavi je uspešno ustvarjena! destroyed_msg: Opomba o prijavi je uspešno izbrisana! reports: - account: - note: opomba - report: prijava action_taken_by: Dejanje, ki ga je sprejel are_you_sure: Ali ste prepričani? assign_to_self: Dodeli meni diff --git a/config/locales/sq.yml b/config/locales/sq.yml index ac811b0b0..e5378082e 100644 --- a/config/locales/sq.yml +++ b/config/locales/sq.yml @@ -81,9 +81,7 @@ sq: email_status: Gjendje email-i enable: Aktivizoje enabled: E aktivizuar - feed_url: URL prurjeje followers: Ndjekës - followers_url: URL Ndjekësish follows: Ndjekje header: Krye inbox_url: URL Mesazhesh të Marrë @@ -108,9 +106,7 @@ sq: most_recent_ip: IP-ja më e freskët no_limits_imposed: Pa imponim kufijsh not_subscribed: Jo i pajtuar - outbox_url: URL Mesazhesh të Dërguar perform_full_suspension: Pezulloje - profile_url: URL profili promote: Promovojeni protocol: Protokoll public: Publike @@ -315,9 +311,6 @@ sq: created_msg: Shënimi i raportimit u krijua me sukses! destroyed_msg: Shënimi i raportimit u fshi me sukses! reports: - account: - note: shënim - report: raportojeni action_taken_by: Veprimi i ndërmarrë nga are_you_sure: A jeni i sigurt? assign_to_self: Caktojani vetes diff --git a/config/locales/sr-Latn.yml b/config/locales/sr-Latn.yml index 2bddaf311..1f3d69e21 100644 --- a/config/locales/sr-Latn.yml +++ b/config/locales/sr-Latn.yml @@ -47,9 +47,7 @@ sr-Latn: email_status: Status e-pošte enable: Uključi enabled: Uključeno - feed_url: Adresa dovoda followers: Pratioci - followers_url: Adresa pratioca follows: Praćeni inbox_url: Adresa sandučeta location: @@ -69,9 +67,7 @@ sr-Latn: most_recent_activity: Najskorija aktivnost most_recent_ip: Najskorija IP adresa not_subscribed: Nije pretplaćen - outbox_url: Odlazno sanduče perform_full_suspension: Izvrši kompletno isključenje - profile_url: Adresa profila promote: Unapredi protocol: Protokol public: Javno @@ -87,7 +83,6 @@ sr-Latn: roles: staff: Osoblje user: Korisnik - salmon_url: Salmon adresa search: Pretraga shared_inbox_url: Adresa deljenog sandučeta show: diff --git a/config/locales/sr.yml b/config/locales/sr.yml index 404310fe9..d06bb214e 100644 --- a/config/locales/sr.yml +++ b/config/locales/sr.yml @@ -91,9 +91,7 @@ sr: email_status: Статус е-поште enable: Омогући enabled: Укључено - feed_url: Адреса довода followers: Пратиоци - followers_url: Адреса пратиоца follows: Праћени header: Заглавље inbox_url: Адреса сандучета @@ -118,9 +116,7 @@ sr: most_recent_ip: Најскорија IP адреса no_limits_imposed: Нема ограничења not_subscribed: Није претплаћен - outbox_url: Одлазно сандуче perform_full_suspension: Искључи - profile_url: Адреса профила promote: Унапреди protocol: Протокол public: Јавно @@ -141,7 +137,6 @@ sr: moderator: Модератор staff: Особље user: Корисник - salmon_url: Salmon адреса search: Претрага shared_inbox_url: Адреса дељеног сандучета show: @@ -330,9 +325,6 @@ sr: created_msg: Белешка пријаве успешно направљена! destroyed_msg: Белешка пријаве успешно избрисана! reports: - account: - note: белешка - report: извештај action_taken_by: Акцију извео are_you_sure: Да ли сте сигурни? assign_to_self: Додели мени diff --git a/config/locales/sv.yml b/config/locales/sv.yml index 0068f59f4..911698620 100644 --- a/config/locales/sv.yml +++ b/config/locales/sv.yml @@ -106,9 +106,7 @@ sv: email_status: E-poststatus enable: Aktivera enabled: Aktiverad - feed_url: Flödes URL followers: Följare - followers_url: Följare URL follows: Följs header: Rubrik inbox_url: Inkorgs URL @@ -136,10 +134,8 @@ sv: no_account_selected: Inga konton har ändrats och inget har valts no_limits_imposed: Inga begränsningar har införts not_subscribed: Inte prenumererat - outbox_url: Utkorg URL pending: Inväntar granskning perform_full_suspension: Utför full avstängning - profile_url: Profil URL promote: Befordra protocol: Protokoll public: Offentlig @@ -162,7 +158,6 @@ sv: moderator: Moderator staff: Personal user: Användare - salmon_url: Lax URL search: Sök search_same_ip: Annan användare med samma IP-adress shared_inbox_url: Delad inkorg URL @@ -318,9 +313,6 @@ sv: created_msg: Anmälningsanteckning har skapats! destroyed_msg: Anmälningsanteckning har raderats! reports: - account: - note: anteckning - report: anmälan action_taken_by: Åtgärder vidtagna av are_you_sure: Är du säker? assign_to_self: Tilldela till mig diff --git a/config/locales/te.yml b/config/locales/te.yml index 526b03b49..dd6c878e7 100644 --- a/config/locales/te.yml +++ b/config/locales/te.yml @@ -87,9 +87,7 @@ te: email_status: ఈమెయిల్ స్థితి enable: చేతనం enabled: చేతనం చేయబడింది - feed_url: ఫీడ్ URL followers: అనుచరులు - followers_url: అనుచరుల URL follows: అనుసరిస్తున్నారు inbox_url: ఇన్ బాక్స్ URL location: diff --git a/config/locales/th.yml b/config/locales/th.yml index a63bbe917..214a93acf 100644 --- a/config/locales/th.yml +++ b/config/locales/th.yml @@ -97,9 +97,7 @@ th: email_status: สถานะอีเมล enable: เปิดใช้งาน enabled: เปิดใช้งานอยู่ - feed_url: URL ฟีด followers: ผู้ติดตาม - followers_url: URL ผู้ติดตาม follows: การติดตาม header: ส่วนหัว inbox_url: URL กล่องขาเข้า @@ -124,9 +122,7 @@ th: most_recent_activity: กิจกรรมล่าสุด most_recent_ip: IP ล่าสุด not_subscribed: ไม่ได้บอกรับ - outbox_url: URL กล่องขาออก perform_full_suspension: ระงับ - profile_url: URL โปรไฟล์ promote: เลื่อนตำแหน่ง protocol: โปรโตคอล public: สาธารณะ @@ -310,9 +306,6 @@ th: created_msg: สร้างหมายเหตุรายงานสำเร็จ! destroyed_msg: ลบหมายเหตุรายงานสำเร็จ! reports: - account: - note: หมายเหตุ - report: รายงาน are_you_sure: คุณแน่ใจหรือไม่? assign_to_self: มอบหมายให้ฉัน assigned: ผู้ควบคุมที่ได้รับมอบหมาย diff --git a/config/locales/tr.yml b/config/locales/tr.yml index b2b1dd078..f3a2817ec 100644 --- a/config/locales/tr.yml +++ b/config/locales/tr.yml @@ -118,9 +118,7 @@ tr: email_status: E-posta durumu enable: Etkinleştir enabled: Etkin - feed_url: Besleme linki followers: Takipçiler - followers_url: Takipçi bağlantısı follows: Takip edilen header: Üstbilgi inbox_url: Gelen kutusu bağlantısı @@ -148,10 +146,8 @@ tr: no_account_selected: Hiçbiri seçilmediğinden hiçbir hesap değiştirilmedi no_limits_imposed: Sınır koymaz not_subscribed: Abone edilmedi - outbox_url: Giden Kutusu URL'si pending: Bekleyen yorum perform_full_suspension: Askıya al - profile_url: Profil linki promote: Yükselt protocol: Protokol public: Herkese açık @@ -174,7 +170,6 @@ tr: moderator: Denetleyici staff: Personel user: Kullanıcı - salmon_url: Salmon Linki search: Ara search_same_ip: Aynı IP adresine sahip diğer kullanıcılar shared_inbox_url: Paylaşılan gelen kutusu bağlantısı @@ -398,9 +393,6 @@ tr: created_msg: Şikayet notu başarıyla oluşturuldu! destroyed_msg: Şikayet notu başarıyla silindi! reports: - account: - note: not - report: şikayet action_taken_by: tarafından gerçekleştirilen eylem are_you_sure: Emin misiniz? assign_to_self: Bana ata diff --git a/config/locales/uk.yml b/config/locales/uk.yml index 7d8d83e2d..edcc289da 100644 --- a/config/locales/uk.yml +++ b/config/locales/uk.yml @@ -120,9 +120,7 @@ uk: email_status: Статус електронної пошти enable: Увімкнути enabled: Увімкнено - feed_url: URL-адреса каналу followers: Підписники - followers_url: URL підписників follows: Підписки header: Заголовок inbox_url: URL вхідних повідомлень @@ -150,10 +148,8 @@ uk: no_account_selected: Жоден обліковий запис не було змінено, оскільки жоден не було вибрано no_limits_imposed: Жодних обмежень не накладено not_subscribed: Не підписані - outbox_url: URL вихідних повідомлень pending: Відгук в очікуванні perform_full_suspension: Призупинити - profile_url: URL профілю promote: Просунути protocol: Протокол public: Публічний @@ -176,7 +172,6 @@ uk: moderator: Модератор staff: Персонал user: Користувач - salmon_url: Salmon URL search: Пошук shared_inbox_url: URL спільного вхідного кошика show: @@ -400,9 +395,6 @@ uk: created_msg: Скарга успішно створена! destroyed_msg: Скарга успішно видалена! reports: - account: - note: нотатка - report: скарга action_taken_by: Дія виконана are_you_sure: Ви впевнені? assign_to_self: Призначити мені diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml index 3af145c66..49dd31bac 100644 --- a/config/locales/zh-CN.yml +++ b/config/locales/zh-CN.yml @@ -107,9 +107,7 @@ zh-CN: email_status: 电子邮件地址状态 enable: 启用 enabled: 已启用 - feed_url: 订阅 URL followers: 关注者 - followers_url: 关注者(Followers)URL follows: 正在关注 header: 个人资料页横幅图片 inbox_url: 收件箱(Inbox)URL @@ -137,10 +135,8 @@ zh-CN: no_account_selected: 因为没有账户被选择,所以没有更改 no_limits_imposed: 无限制 not_subscribed: 未订阅 - outbox_url: 发件箱(Outbox)URL pending: 待审核 perform_full_suspension: 封禁 - profile_url: 个人资料页面 URL promote: 升任 protocol: 协议 public: 公开页面 @@ -163,7 +159,6 @@ zh-CN: moderator: 监察员 staff: 管理人员 user: 普通用户 - salmon_url: 三文鱼协议网址(Salmon URL) search: 搜索 search_same_ip: 具有相同IP的其他用户 shared_inbox_url: 公用收件箱(Shared Inbox)URL @@ -384,9 +379,6 @@ zh-CN: created_msg: 举报记录建立成功! destroyed_msg: 举报记录删除成功! reports: - account: - note: 条记录 - report: 条举报 action_taken_by: 操作执行者 are_you_sure: 你确定吗? assign_to_self: 接管 diff --git a/config/locales/zh-HK.yml b/config/locales/zh-HK.yml index 338cf810e..4b7ca52e1 100644 --- a/config/locales/zh-HK.yml +++ b/config/locales/zh-HK.yml @@ -64,9 +64,7 @@ zh-HK: email_status: 电子邮件状态 enable: 啟用 enabled: 已啟用 - feed_url: 訂閱 URL followers: 關注者 - followers_url: 關注者(Followers)URL follows: 正在關注 inbox_url: 收件箱(Inbox)URL ip: IP 位域 @@ -87,9 +85,7 @@ zh-HK: most_recent_activity: 最新活動 most_recent_ip: 最新 IP 位域 not_subscribed: 未訂閱 - outbox_url: 寄件箱(Outbox)URL perform_full_suspension: 完全停權 - profile_url: 個人檔案 URL promote: 升任 protocol: 協議 public: 公共 @@ -109,7 +105,6 @@ zh-HK: moderator: 監察員 staff: 管理人員 user: 普通用戶 - salmon_url: Salmon 反饋 URL search: 搜索 shared_inbox_url: 公共收件箱(Shared Inbox)URL show: @@ -233,9 +228,6 @@ zh-HK: created_msg: 舉報筆記已建立。 destroyed_msg: 舉報筆記已刪除。 reports: - account: - note: 筆記 - report: 舉報 action_taken_by: 操作執行者 are_you_sure: 你確認嗎? assign_to_self: 指派給自己 diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml index b7116e02e..7a5627c30 100644 --- a/config/locales/zh-TW.yml +++ b/config/locales/zh-TW.yml @@ -99,9 +99,7 @@ zh-TW: email_status: 電子信箱狀態 enable: 啟用 enabled: 已啟用 - feed_url: 訂閱 URL followers: 關注者 - followers_url: 關注者(Followers)URL follows: 正在關注 header: 開頭 inbox_url: 收件箱 (Inbox) URL @@ -128,10 +126,8 @@ zh-TW: most_recent_ip: 最近 IP 位址 no_limits_imposed: 未受限制 not_subscribed: 未訂閱 - outbox_url: 寄件箱 (Outbox) URL pending: 等待審核中 perform_full_suspension: 停權 - profile_url: 個人檔案 URL promote: 晉級 protocol: 協議 public: 公開 @@ -154,7 +150,6 @@ zh-TW: moderator: 版主 staff: 管理人員 user: 普通使用者 - salmon_url: Salmon 網址 search: 搜尋 shared_inbox_url: 共享收件箱網址 show: @@ -323,9 +318,6 @@ zh-TW: created_msg: 檢舉記錄建立成功! destroyed_msg: 檢舉記錄刪除成功! reports: - account: - note: 條記錄 - report: 條檢舉 action_taken_by: 操作執行者 are_you_sure: 你確定嗎? assign_to_self: 指派給自己 diff --git a/config/settings.yml b/config/settings.yml index 3cca40cbd..00a4421e4 100644 --- a/config/settings.yml +++ b/config/settings.yml @@ -66,6 +66,7 @@ defaults: &defaults - mod - moderator disallowed_hashtags: # space separated string or list of hashtags without the hash + enable_bootstrap_timeline_accounts: true bootstrap_timeline_accounts: '' activity_api_enabled: true peers_api_enabled: true |