Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - `README.md`: Our README.md files are completely different. Discarded upstream changes. - `app/javascript/core/admin.js`: Updating rails-ujs, no real conflict, but a comment to close to changed code. Various glitch-soc-only files have been updated to match those changes, though. - `package.json`: No real conflict, just an additional dependency in glitch-soc that was too close to something updated upstream. Took upstream's changes.
This commit is contained in:
Thibaut Girka
@ -562,7 +562,6 @@ ar:
|
||||
warning_presets:
|
||||
add_new: إضافة واحد جديد
|
||||
delete: حذف
|
||||
edit: تعديل
|
||||
edit_preset: تعديل نموذج التحذير
|
||||
title: إدارة نماذج التحذير
|
||||
admin_mailer:
|
||||
|
||||
@ -573,7 +573,6 @@ ca:
|
||||
warning_presets:
|
||||
add_new: Afegeix-ne un de nou
|
||||
delete: Esborra
|
||||
edit: Edita
|
||||
edit_preset: Edita l'avís predeterminat
|
||||
title: Gestiona les configuracions predefinides dels avisos
|
||||
admin_mailer:
|
||||
|
||||
@ -573,7 +573,6 @@ co:
|
||||
warning_presets:
|
||||
add_new: Aghjunghje
|
||||
delete: Sguassà
|
||||
edit: Cambià
|
||||
edit_preset: Cambià a preselezzione d'avertimentu
|
||||
title: Amministrà e preselezzione d'avertimentu
|
||||
admin_mailer:
|
||||
|
||||
@ -588,7 +588,6 @@ cs:
|
||||
warning_presets:
|
||||
add_new: Přidat nové
|
||||
delete: Smazat
|
||||
edit: Upravit
|
||||
edit_preset: Upravit předlohu pro varování
|
||||
title: Spravovat předlohy pro varování
|
||||
admin_mailer:
|
||||
|
||||
@ -605,7 +605,6 @@ cy:
|
||||
warning_presets:
|
||||
add_new: Ychwanegu newydd
|
||||
delete: Dileu
|
||||
edit: Golygu
|
||||
edit_preset: Golygu rhagosodiad rhybudd
|
||||
title: Rheoli rhagosodiadau rhybudd
|
||||
admin_mailer:
|
||||
|
||||
@ -489,7 +489,6 @@ da:
|
||||
most_recent: Seneste
|
||||
warning_presets:
|
||||
delete: Slet
|
||||
edit: Rediger
|
||||
admin_mailer:
|
||||
new_report:
|
||||
body: "%{reporter} har anmeldt %{target}"
|
||||
|
||||
@ -573,7 +573,6 @@ de:
|
||||
warning_presets:
|
||||
add_new: Neu hinzufügen
|
||||
delete: Löschen
|
||||
edit: Bearbeiten
|
||||
edit_preset: Warnungsvorlage bearbeiten
|
||||
title: Warnungsvorlagen verwalten
|
||||
admin_mailer:
|
||||
|
||||
@ -573,7 +573,6 @@ el:
|
||||
warning_presets:
|
||||
add_new: Πρόσθεση νέου
|
||||
delete: Διαγραφή
|
||||
edit: Ενημέρωση
|
||||
edit_preset: Ενημέρωση προκαθορισμένης προειδοποίησης
|
||||
title: Διαχείριση προκαθορισμένων προειδοποιήσεων
|
||||
admin_mailer:
|
||||
|
||||
@ -92,6 +92,7 @@ en:
|
||||
delete: Delete
|
||||
destroyed_msg: Moderation note successfully destroyed!
|
||||
accounts:
|
||||
add_email_domain_block: Blacklist e-mail domain
|
||||
approve: Approve
|
||||
approve_all: Approve all
|
||||
are_you_sure: Are you sure?
|
||||
@ -172,6 +173,7 @@ en:
|
||||
staff: Staff
|
||||
user: User
|
||||
search: Search
|
||||
search_same_email_domain: Other users with the same e-mail domain
|
||||
search_same_ip: Other users with the same IP
|
||||
shared_inbox_url: Shared inbox URL
|
||||
show:
|
||||
@ -359,6 +361,7 @@ en:
|
||||
destroyed_msg: Successfully deleted e-mail domain from blacklist
|
||||
domain: Domain
|
||||
empty: No e-mail domains currently blacklisted.
|
||||
from_html: from %{domain}
|
||||
new:
|
||||
create: Add domain
|
||||
title: New e-mail blacklist entry
|
||||
@ -589,7 +592,6 @@ en:
|
||||
warning_presets:
|
||||
add_new: Add new
|
||||
delete: Delete
|
||||
edit: Edit
|
||||
edit_preset: Edit warning preset
|
||||
title: Manage warning presets
|
||||
admin_mailer:
|
||||
@ -867,6 +869,7 @@ en:
|
||||
media_attachments:
|
||||
validations:
|
||||
images_and_video: Cannot attach a video to a status that already contains images
|
||||
not_ready: Cannot attach files that have not finished processing. Try again in a moment!
|
||||
too_many: Cannot attach more than 4 files
|
||||
migrations:
|
||||
acct: Moved to
|
||||
|
||||
@ -474,7 +474,6 @@ en_GB:
|
||||
warning_presets:
|
||||
add_new: Add new
|
||||
delete: Delete
|
||||
edit: Edit
|
||||
edit_preset: Edit warning preset
|
||||
title: Manage warning presets
|
||||
admin_mailer:
|
||||
|
||||
@ -557,7 +557,6 @@ eo:
|
||||
warning_presets:
|
||||
add_new: Aldoni novan
|
||||
delete: Forigi
|
||||
edit: Redakti
|
||||
edit_preset: Redakti avertan antaŭagordon
|
||||
title: Administri avertajn antaŭagordojn
|
||||
admin_mailer:
|
||||
|
||||
@ -573,7 +573,6 @@ es-AR:
|
||||
warning_presets:
|
||||
add_new: Agregar nuevo
|
||||
delete: Eliminar
|
||||
edit: Editar
|
||||
edit_preset: Editar preajuste de advertencia
|
||||
title: Administrar preajustes de advertencia
|
||||
admin_mailer:
|
||||
|
||||
@ -573,7 +573,6 @@ es:
|
||||
warning_presets:
|
||||
add_new: Añadir nuevo
|
||||
delete: Borrar
|
||||
edit: Editar
|
||||
edit_preset: Editar aviso predeterminado
|
||||
title: Editar configuración predeterminada de avisos
|
||||
admin_mailer:
|
||||
|
||||
@ -576,7 +576,6 @@ et:
|
||||
warning_presets:
|
||||
add_new: Lisa uus
|
||||
delete: Kustuta
|
||||
edit: Redigeeri
|
||||
edit_preset: Redigeeri hoiatuse eelseadistust
|
||||
title: Halda hoiatuste eelseadistusi
|
||||
admin_mailer:
|
||||
|
||||
@ -573,7 +573,6 @@ eu:
|
||||
warning_presets:
|
||||
add_new: Gehitu berria
|
||||
delete: Ezabatu
|
||||
edit: Editatu
|
||||
edit_preset: Editatu abisu aurre-ezarpena
|
||||
title: Kudeatu abisu aurre-ezarpenak
|
||||
admin_mailer:
|
||||
|
||||
@ -575,7 +575,6 @@ fa:
|
||||
warning_presets:
|
||||
add_new: افزودن تازه
|
||||
delete: زدودن
|
||||
edit: ویرایش
|
||||
edit_preset: ویرایش هشدار پیشفرض
|
||||
title: مدیریت هشدارهای پیشفرض
|
||||
admin_mailer:
|
||||
|
||||
@ -573,7 +573,6 @@ fr:
|
||||
warning_presets:
|
||||
add_new: Ajouter un nouveau
|
||||
delete: Effacer
|
||||
edit: Éditer
|
||||
edit_preset: Éditer les avertissements prédéfinis
|
||||
title: Gérer les avertissements prédéfinis
|
||||
admin_mailer:
|
||||
|
||||
@ -573,7 +573,6 @@ gl:
|
||||
warning_presets:
|
||||
add_new: Engadir novo
|
||||
delete: Eliminar
|
||||
edit: Editar
|
||||
edit_preset: Editar aviso preestablecido
|
||||
title: Xestionar avisos preestablecidos
|
||||
admin_mailer:
|
||||
|
||||
@ -575,7 +575,6 @@ hu:
|
||||
warning_presets:
|
||||
add_new: Új hozzáadása
|
||||
delete: Törlés
|
||||
edit: Szerkesztés
|
||||
edit_preset: Figyelmeztetés szerkesztése
|
||||
title: Figyelmeztetések
|
||||
admin_mailer:
|
||||
|
||||
@ -565,7 +565,6 @@ id:
|
||||
warning_presets:
|
||||
add_new: Tambah baru
|
||||
delete: Hapus
|
||||
edit: Sunting
|
||||
edit_preset: Sunting preset peringatan
|
||||
title: Kelola preset peringatan
|
||||
admin_mailer:
|
||||
|
||||
@ -573,7 +573,6 @@ is:
|
||||
warning_presets:
|
||||
add_new: Bæta við nýju
|
||||
delete: Eyða
|
||||
edit: Breyta
|
||||
edit_preset: Breyta forstilltri aðvörun
|
||||
title: Sýsla með forstilltar aðvaranir
|
||||
admin_mailer:
|
||||
|
||||
@ -573,7 +573,6 @@ it:
|
||||
warning_presets:
|
||||
add_new: Aggiungi nuovo
|
||||
delete: Cancella
|
||||
edit: Modifica
|
||||
edit_preset: Modifica avviso predefinito
|
||||
title: Gestisci avvisi predefiniti
|
||||
admin_mailer:
|
||||
|
||||
@ -565,7 +565,6 @@ ja:
|
||||
warning_presets:
|
||||
add_new: 追加
|
||||
delete: 削除
|
||||
edit: 編集
|
||||
edit_preset: プリセット警告文を編集
|
||||
title: プリセット警告文を管理
|
||||
admin_mailer:
|
||||
|
||||
@ -330,7 +330,6 @@ kab:
|
||||
warning_presets:
|
||||
add_new: Rnu amaynut
|
||||
delete: Kkes
|
||||
edit: Ẓreg
|
||||
admin_mailer:
|
||||
new_report:
|
||||
subject: Aneqqis amaynut i %{instance} (#%{id})
|
||||
|
||||
@ -555,7 +555,6 @@ kk:
|
||||
warning_presets:
|
||||
add_new: Add nеw
|
||||
delete: Deletе
|
||||
edit: Еdit
|
||||
edit_preset: Edit warning prеset
|
||||
title: Manage warning presеts
|
||||
admin_mailer:
|
||||
|
||||
@ -567,7 +567,6 @@ ko:
|
||||
warning_presets:
|
||||
add_new: 새로 추가
|
||||
delete: 삭제
|
||||
edit: 편집
|
||||
edit_preset: 경고 틀 수정
|
||||
title: 경고 틀 관리
|
||||
admin_mailer:
|
||||
|
||||
@ -410,7 +410,6 @@ lt:
|
||||
warning_presets:
|
||||
add_new: Pridėti naują
|
||||
delete: Ištrinti
|
||||
edit: Keisti
|
||||
edit_preset: Keisti įspėjimo nustatymus
|
||||
title: Valdyti įspėjimo nustatymus
|
||||
admin_mailer:
|
||||
|
||||
@ -573,7 +573,6 @@ nl:
|
||||
warning_presets:
|
||||
add_new: Nieuwe toevoegen
|
||||
delete: Verwijderen
|
||||
edit: Bewerken
|
||||
edit_preset: Voorinstelling van waarschuwing bewerken
|
||||
title: Voorinstellingen van waarschuwingen beheren
|
||||
admin_mailer:
|
||||
|
||||
@ -566,7 +566,6 @@ nn:
|
||||
warning_presets:
|
||||
add_new: Legg til ny
|
||||
delete: Slett
|
||||
edit: Rediger
|
||||
edit_preset: Endr åtvaringsoppsett
|
||||
title: Handsam åtvaringsoppsett
|
||||
admin_mailer:
|
||||
|
||||
@ -561,7 +561,6 @@
|
||||
warning_presets:
|
||||
add_new: Legg til ny
|
||||
delete: Slett
|
||||
edit: Rediger
|
||||
admin_mailer:
|
||||
new_pending_account:
|
||||
body: Detaljer om den nye kontoen er nedenfor. Du kan godkjenne eller avvise denne søknaden.
|
||||
|
||||
@ -558,7 +558,6 @@ oc:
|
||||
warning_presets:
|
||||
add_new: N’ajustar un nòu
|
||||
delete: Escafar
|
||||
edit: Modificar
|
||||
edit_preset: Modificar lo tèxt predefinit d’avertiment
|
||||
title: Gerir los tèxtes predefinits
|
||||
admin_mailer:
|
||||
|
||||
@ -541,7 +541,6 @@ pl:
|
||||
warning_presets:
|
||||
add_new: Dodaj nowy
|
||||
delete: Usuń
|
||||
edit: Edytuj
|
||||
edit_preset: Edytuj szablon ostrzeżenia
|
||||
title: Zarządzaj szablonami ostrzeżeń
|
||||
admin_mailer:
|
||||
|
||||
@ -573,7 +573,6 @@ pt-BR:
|
||||
warning_presets:
|
||||
add_new: Adicionar novo
|
||||
delete: Excluir
|
||||
edit: Editar
|
||||
edit_preset: Editar o aviso pré-definido
|
||||
title: Gerenciar os avisos pré-definidos
|
||||
admin_mailer:
|
||||
|
||||
@ -573,7 +573,6 @@ pt-PT:
|
||||
warning_presets:
|
||||
add_new: Adicionar novo
|
||||
delete: Apagar
|
||||
edit: Editar
|
||||
edit_preset: Editar o aviso predefinido
|
||||
title: Gerir os avisos predefinidos
|
||||
admin_mailer:
|
||||
|
||||
@ -594,7 +594,6 @@ ru:
|
||||
warning_presets:
|
||||
add_new: Добавить
|
||||
delete: Удалить
|
||||
edit: Изменить
|
||||
edit_preset: Удалить шаблон предупреждения
|
||||
title: Управление шаблонами предупреждений
|
||||
admin_mailer:
|
||||
|
||||
@ -8,6 +8,7 @@ en:
|
||||
acct: Specify the username@domain of the account you want to move to
|
||||
account_warning_preset:
|
||||
text: You can use toot syntax, such as URLs, hashtags and mentions
|
||||
title: Optional. Not visible to the recipient
|
||||
admin_account_action:
|
||||
include_statuses: The user will see which toots have caused the moderation action or warning
|
||||
send_email_notification: The user will receive an explanation of what happened with their account
|
||||
@ -58,6 +59,9 @@ en:
|
||||
whole_word: When the keyword or phrase is alphanumeric only, it will only be applied if it matches the whole word
|
||||
domain_allow:
|
||||
domain: This domain will be able to fetch data from this server and incoming data from it will be processed and stored
|
||||
email_domain_block:
|
||||
domain: This can be the domain name that shows up in the e-mail address, the MX record that domain resolves to, or IP of the server that MX record resolves to. Those will be checked upon user sign-up and the sign-up will be rejected.
|
||||
with_dns_records: An attempt to resolve the given domain's DNS records will be made and the results will also be blacklisted
|
||||
featured_tag:
|
||||
name: 'You might want to use one of these:'
|
||||
form_challenge:
|
||||
@ -83,6 +87,7 @@ en:
|
||||
acct: Handle of the new account
|
||||
account_warning_preset:
|
||||
text: Preset text
|
||||
title: Title
|
||||
admin_account_action:
|
||||
include_statuses: Include reported toots in the e-mail
|
||||
send_email_notification: Notify the user per e-mail
|
||||
@ -163,6 +168,8 @@ en:
|
||||
username: Username
|
||||
username_or_email: Username or Email
|
||||
whole_word: Whole word
|
||||
email_domain_block:
|
||||
with_dns_records: Include MX records and IPs of the domain
|
||||
featured_tag:
|
||||
name: Hashtag
|
||||
interactions:
|
||||
|
||||
@ -574,7 +574,6 @@ sk:
|
||||
warning_presets:
|
||||
add_new: Pridaj nové
|
||||
delete: Vymaž
|
||||
edit: Uprav
|
||||
edit_preset: Uprav varovnú predlohu
|
||||
title: Spravuj varovné predlohy
|
||||
admin_mailer:
|
||||
|
||||
@ -485,7 +485,6 @@ sl:
|
||||
warning_presets:
|
||||
add_new: Dodaj novo
|
||||
delete: Izbriši
|
||||
edit: Uredi
|
||||
edit_preset: Uredi prednastavitev opozoril
|
||||
title: Upravljaj prednastavitev opozoril
|
||||
admin_mailer:
|
||||
|
||||
@ -415,7 +415,6 @@ sq:
|
||||
warning_presets:
|
||||
add_new: Shtoni të ri
|
||||
delete: Fshije
|
||||
edit: Përpunoni
|
||||
edit_preset: Përpunoni sinjalizim të paracaktuar
|
||||
title: Administroni sinjalizime të paracaktuara
|
||||
admin_mailer:
|
||||
|
||||
@ -431,7 +431,6 @@ sr:
|
||||
warning_presets:
|
||||
add_new: Додај нови
|
||||
delete: Избриши
|
||||
edit: Уреди
|
||||
edit_preset: Уреди пресет упозорења
|
||||
title: Управљај пресетима упозорења
|
||||
admin_mailer:
|
||||
|
||||
@ -448,7 +448,6 @@ sv:
|
||||
warning_presets:
|
||||
add_new: Lägg till ny
|
||||
delete: Radera
|
||||
edit: Redigera
|
||||
admin_mailer:
|
||||
new_report:
|
||||
body: "%{reporter} har rapporterat %{target}"
|
||||
|
||||
@ -488,7 +488,6 @@ th:
|
||||
warning_presets:
|
||||
add_new: เพิ่มใหม่
|
||||
delete: ลบ
|
||||
edit: แก้ไข
|
||||
edit_preset: แก้ไขคำเตือนที่ตั้งไว้ล่วงหน้า
|
||||
title: จัดการคำเตือนที่ตั้งไว้ล่วงหน้า
|
||||
admin_mailer:
|
||||
|
||||
@ -573,7 +573,6 @@ tr:
|
||||
warning_presets:
|
||||
add_new: Yeni ekle
|
||||
delete: Sil
|
||||
edit: Düzenle
|
||||
edit_preset: Uyarı ön-ayarını düzenle
|
||||
title: Uyarı ön-ayarlarını yönet
|
||||
admin_mailer:
|
||||
|
||||
@ -591,7 +591,6 @@ uk:
|
||||
warning_presets:
|
||||
add_new: Додати новий
|
||||
delete: Видалити
|
||||
edit: Редагувати
|
||||
edit_preset: Редагувати шаблон попередження
|
||||
title: Управління шаблонами попереджень
|
||||
admin_mailer:
|
||||
|
||||
@ -534,7 +534,6 @@ vi:
|
||||
warning_presets:
|
||||
add_new: Thêm mới
|
||||
delete: Xóa bỏ
|
||||
edit: Biên tập
|
||||
edit_preset: Chỉnh sửa cảnh báo đặt trước
|
||||
title: Quản lý cài đặt trước cảnh báo
|
||||
admin_mailer:
|
||||
|
||||
@ -565,7 +565,6 @@ zh-CN:
|
||||
warning_presets:
|
||||
add_new: 添加新条目
|
||||
delete: 删除
|
||||
edit: 编辑
|
||||
edit_preset: 编辑预置警告
|
||||
title: 管理预设警告
|
||||
admin_mailer:
|
||||
|
||||
@ -409,7 +409,6 @@ zh-HK:
|
||||
warning_presets:
|
||||
add_new: 新增
|
||||
delete: 刪除
|
||||
edit: 編輯
|
||||
admin_mailer:
|
||||
new_report:
|
||||
body: "%{reporter} 舉報了用戶 %{target}"
|
||||
|
||||
@ -408,7 +408,6 @@ zh-TW:
|
||||
warning_presets:
|
||||
add_new: 新增
|
||||
delete: 刪除
|
||||
edit: 編輯
|
||||
admin_mailer:
|
||||
new_report:
|
||||
body: "%{reporter} 檢舉了使用者 %{target}"
|
||||
|
||||
Reference in New Issue
Block a user