diff --git a/app/controllers/admin/reports_controller.rb b/app/controllers/admin/reports_controller.rb index 5d7f43e005223dd9f7df86184afcf8c8178c2ef0..e97ddb9b6477609362625c38b99622c02080f2af 100644 --- a/app/controllers/admin/reports_controller.rb +++ b/app/controllers/admin/reports_controller.rb @@ -44,6 +44,14 @@ module Admin when 'resolve' @report.resolve!(current_account) log_action :resolve, @report + when 'disable' + @report.resolve!(current_account) + @report.target_account.user.disable! + + log_action :resolve, @report + log_action :disable, @report.target_account.user + + resolve_all_target_account_reports when 'silence' @report.resolve!(current_account) @report.target_account.update!(silenced: true) @@ -55,6 +63,7 @@ module Admin else raise ActiveRecord::RecordNotFound end + @report.reload end diff --git a/app/views/admin/accounts/show.html.haml b/app/views/admin/accounts/show.html.haml index f2c53e3fe3facbf181661f528bde2ba182a5afdb..17f1f224d460ecb994dcea1346f7c55f070da789 100644 --- a/app/views/admin/accounts/show.html.haml +++ b/app/views/admin/accounts/show.html.haml @@ -106,7 +106,7 @@ - if @account.user&.otp_required_for_login? = link_to t('admin.accounts.disable_two_factor_authentication'), admin_user_two_factor_authentication_path(@account.user.id), method: :delete, class: 'button' if can?(:disable_2fa, @account.user) - unless @account.memorial? - = link_to t('admin.accounts.memorialize'), memorialize_admin_account_path(@account.id), method: :post, data: { confirm: t('admin.accounts.are_you_sure') }, class: 'button' if can?(:memorialize, @account) + = link_to t('admin.accounts.memorialize'), memorialize_admin_account_path(@account.id), method: :post, data: { confirm: t('admin.accounts.are_you_sure') }, class: 'button button--destructive' if can?(:memorialize, @account) - else = link_to t('admin.accounts.redownload'), redownload_admin_account_path(@account.id), method: :post, class: 'button' if can?(:redownload, @account) @@ -114,7 +114,7 @@ - if @account.silenced? = link_to t('admin.accounts.undo_silenced'), admin_account_silence_path(@account.id), method: :delete, class: 'button' if can?(:unsilence, @account) - else - = link_to t('admin.accounts.silence'), admin_account_silence_path(@account.id), method: :post, class: 'button' if can?(:silence, @account) + = link_to t('admin.accounts.silence'), admin_account_silence_path(@account.id), method: :post, class: 'button button--destructive' if can?(:silence, @account) - if @account.local? - unless @account.user_confirmed? @@ -123,7 +123,7 @@ - if @account.suspended? = link_to t('admin.accounts.undo_suspension'), admin_account_suspension_path(@account.id), method: :delete, class: 'button' if can?(:unsuspend, @account) - else - = link_to t('admin.accounts.perform_full_suspension'), new_admin_account_suspension_path(@account.id), class: 'button' if can?(:suspend, @account) + = link_to t('admin.accounts.perform_full_suspension'), new_admin_account_suspension_path(@account.id), class: 'button button--destructive' if can?(:suspend, @account) - if !@account.local? && @account.hub_url.present? %hr.spacer/ diff --git a/app/views/admin/reports/show.html.haml b/app/views/admin/reports/show.html.haml index ef0e4aa415631583a65c1f7c1b1f059db835599e..3588d151d2815806f3c62cc588b8dd11bf1c28ae 100644 --- a/app/views/admin/reports/show.html.haml +++ b/app/views/admin/reports/show.html.haml @@ -7,8 +7,10 @@ %div{ style: 'overflow: hidden; margin-bottom: 20px' } - if @report.unresolved? %div{ style: 'float: right' } - = link_to t('admin.reports.silence_account'), admin_report_path(@report, outcome: 'silence'), method: :put, class: 'button' - = link_to t('admin.reports.suspend_account'), new_admin_account_suspension_path(@report.target_account_id, report_id: @report.id), class: 'button' + - if @report.target_account.local? + = link_to t('admin.accounts.disable'), admin_report_path(@report, outcome: 'disable'), method: :put, class: 'button button--destructive' + = link_to t('admin.accounts.silence'), admin_report_path(@report, outcome: 'silence'), method: :put, class: 'button button--destructive' + = link_to t('admin.accounts.perform_full_suspension'), new_admin_account_suspension_path(@report.target_account_id, report_id: @report.id), class: 'button button--destructive' %div{ style: 'float: left' } = link_to t('admin.reports.mark_as_resolved'), admin_report_path(@report, outcome: 'resolve'), method: :put, class: 'button' - else diff --git a/config/locales/ar.yml b/config/locales/ar.yml index 0a8d3fdd4b336bcb8856d01e82ae4292802a43f5..4499830f951af5d66c4592ab1b4b4e4067c8ffa5 100644 --- a/config/locales/ar.yml +++ b/config/locales/ar.yml @@ -346,9 +346,7 @@ ar: reported_by: أبلغ عنه من طر٠resolved: معالجة resolved_msg: تم ØÙ„ تقرير بنجاØ! - silence_account: كتم Ùˆ Ø¥Ø®ÙØ§Ø¡ Ø§Ù„ØØ³Ø§Ø¨ status: Ø§Ù„ØØ§Ù„Ø© - suspend_account: ÙØ±Ø¶ تعليق على Ø§Ù„ØØ³Ø§Ø¨ title: التقارير unassign: إلغاء تعيين unresolved: غير معالجة diff --git a/config/locales/ca.yml b/config/locales/ca.yml index 354d45713b8a77c1a168955a8c6b264eb652900a..d7211f654dfc1a386700b1c32c4ddc2b30a8e590 100644 --- a/config/locales/ca.yml +++ b/config/locales/ca.yml @@ -336,9 +336,7 @@ ca: reported_by: Reportat per resolved: Resolt resolved_msg: Informe resolt amb èxit! - silence_account: Silencia el compte status: Estat - suspend_account: Suspèn el compte title: Informes unassign: Treure assignació unresolved: No resolt diff --git a/config/locales/co.yml b/config/locales/co.yml index 0eac457e8b60e21d5e488761b4f8e733d144d88b..7b810e2edecebbf80c0486588678f41378db6e8f 100644 --- a/config/locales/co.yml +++ b/config/locales/co.yml @@ -345,9 +345,7 @@ co: reported_by: Palisatu da resolved: Scioltu è chjosu resolved_msg: Signalamentu scioltu! - silence_account: Silenzà u contu status: Statutu - suspend_account: Suspende u contu title: Signalamenti unassign: Disassignà unresolved: Micca sciolti diff --git a/config/locales/cs.yml b/config/locales/cs.yml index 2ab2beec5849e097a8831882f829402c3c9cc689..67bda70f1965a7303c62bf5fcd8d363c60581ec6 100644 --- a/config/locales/cs.yml +++ b/config/locales/cs.yml @@ -345,9 +345,7 @@ cs: reported_by: Nahlášeno uživatelem resolved: VyÅ™eÅ¡eno resolved_msg: Nahlášenà úspěšnÄ› vyÅ™eÅ¡eno! - silence_account: UtiÅ¡it úÄet status: Stav - suspend_account: Suspendovat úÄet title: Nahlášenà unassign: Odebrat unresolved: NevyÅ™eÅ¡eno diff --git a/config/locales/cy.yml b/config/locales/cy.yml index 88aa3ee5628e6ff78cbd567628571af7bff1e6dd..8b16949a5503145be342b495fdc40fcb9eb8fcf8 100644 --- a/config/locales/cy.yml +++ b/config/locales/cy.yml @@ -329,7 +329,6 @@ cy: reported_by: Adroddwyd gan resolved: Wedi ei ddatrys resolved_msg: Llwyddwyd i ddatrys yr adroddiad! - silence_account: Tawelwch y cyfrif status: Statws title: Adroddiadau unassign: Dadneilltuo diff --git a/config/locales/da.yml b/config/locales/da.yml index 7cda5cbca229a555489da56c34435931f904a627..0cd3e78f72b77b3e0645f4fa1362eb057e489cfc 100644 --- a/config/locales/da.yml +++ b/config/locales/da.yml @@ -336,9 +336,7 @@ da: reported_by: Anmeldt af resolved: Løst resolved_msg: Anmeldelse er sat til at være løst! - silence_account: Dæmp konto status: Status - suspend_account: Udeluk konto title: Anmeldelser unassign: Utildel unresolved: Uløst diff --git a/config/locales/de.yml b/config/locales/de.yml index fb0235e0ce8936d04ceece7a6772ec4382be8566..12e01522644353588427260a424ce209ffa42933 100644 --- a/config/locales/de.yml +++ b/config/locales/de.yml @@ -344,9 +344,7 @@ de: reported_by: Gemeldet von resolved: Gelöst resolved_msg: Meldung erfolgreich gelöst! - silence_account: Konto stummschalten status: Status - suspend_account: Konto sperren title: Meldungen unassign: Zuweisung entfernen unresolved: Ungelöst diff --git a/config/locales/el.yml b/config/locales/el.yml index 63c438a93808f065301af0bdf68f80cb8f3b2feb..fbd8a6461df721133bf4a749fa21b6c61f430d53 100644 --- a/config/locales/el.yml +++ b/config/locales/el.yml @@ -345,9 +345,7 @@ el: reported_by: ΑναφÎÏθηκε από resolved: ΕπιλÏθηκε resolved_msg: Η καταγγελία επιλÏθηκε επιτυχώς! - silence_account: Αποσιώπηση λογαÏÎ¹Î±ÏƒÎ¼Î¿Ï status: Κατάσταση - suspend_account: ΑνÎστειλε λογαÏιασμό title: ΑναφοÏÎÏ‚ unassign: ΑποσÏνδεση unresolved: Άλυτη diff --git a/config/locales/en.yml b/config/locales/en.yml index 26fe0080ded62d2c1b3eb6a5f342ff3268795bf2..0360e719ef8c3d3b6434409f842e2bff0e90d163 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -128,7 +128,7 @@ en: most_recent: Most recent title: Order outbox_url: Outbox URL - perform_full_suspension: Perform full suspension + perform_full_suspension: Suspend profile_url: Profile URL promote: Promote protocol: Protocol @@ -346,9 +346,7 @@ en: reported_by: Reported by resolved: Resolved resolved_msg: Report successfully resolved! - silence_account: Silence account status: Status - suspend_account: Suspend account title: Reports unassign: Unassign unresolved: Unresolved diff --git a/config/locales/eo.yml b/config/locales/eo.yml index 454eeae9d32a24faf1d6f3234940b6fc21dfd4ec..72628a9440091b4704e60a6108143e770c12aed5 100644 --- a/config/locales/eo.yml +++ b/config/locales/eo.yml @@ -325,9 +325,7 @@ eo: reported_by: Signalita de resolved: Solvita resolved_msg: Signalo sukcese solvita! - silence_account: KaÅi konton status: MesaÄoj - suspend_account: Haltigi konton title: Signaloj unassign: Malasigni unresolved: Nesolvita diff --git a/config/locales/es.yml b/config/locales/es.yml index 5adfafeca9b116b25ebf9af73f06fdd5d4cf8e2c..ccb7439ae6c05932c97723816a4ac419c569a83b 100644 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -336,9 +336,7 @@ es: reported_by: Reportado por resolved: Resuelto resolved_msg: "¡La denuncia se ha resuelto correctamente!" - silence_account: Silenciar cuenta status: Estado - suspend_account: Suspender cuenta title: Reportes unassign: Desasignar unresolved: No resuelto diff --git a/config/locales/eu.yml b/config/locales/eu.yml index 1a6558d9f564dafb986883d875e2794270dfcf25..f0ddb6adbdc89425184ebb50def3b29a20eed9e6 100644 --- a/config/locales/eu.yml +++ b/config/locales/eu.yml @@ -336,9 +336,7 @@ eu: reported_by: Salatzailea resolved: Konponduta resolved_msg: Salaketa ongi konpondu da! - silence_account: Isilarazi kontua status: Mezua - suspend_account: Kanporatu kontua title: Salaketak unassign: Kendu esleipena unresolved: Konpondu gabea diff --git a/config/locales/fa.yml b/config/locales/fa.yml index d620dcf4b3c2c9e6abadf35ed1b164afcf3390cf..a9cf5868fc5d9023cf857c5fe7c3d8f8ee54c470 100644 --- a/config/locales/fa.yml +++ b/config/locales/fa.yml @@ -336,9 +336,7 @@ fa: reported_by: گزارش از طر٠resolved: ØÙ„‌شده resolved_msg: گزارش با موÙقیت ØÙ„ شد! - silence_account: بی‌صدا کردن ØØ³Ø§Ø¨ status: نوشته - suspend_account: معلق‌کردن ØØ³Ø§Ø¨ title: گزارش‌ها unassign: Ù¾Ø³â€ŒÚ¯Ø±ÙØªÙ† مسئولیت unresolved: ØÙ„‌نشده diff --git a/config/locales/fi.yml b/config/locales/fi.yml index c4d1dd8713617f711f05feabb4e02930a689ed95..e629311291da7a3e8b67cf47f0f5ad80d1167f62 100644 --- a/config/locales/fi.yml +++ b/config/locales/fi.yml @@ -282,9 +282,7 @@ fi: reported_by: Raportoija resolved: Ratkaistut resolved_msg: Raportti onnistuneesti ratkaistu! - silence_account: Hiljennä tili status: Tila - suspend_account: Siirrä tili jäähylle title: Raportit unresolved: Ratkaisemattomat updated_at: Päivitetty diff --git a/config/locales/fr.yml b/config/locales/fr.yml index 51a308553708a449819ccfe7e79935b3e7317543..f0eaf8d3f1490a573bcdf4fbd909dbd95c6e86b8 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -345,9 +345,7 @@ fr: reported_by: Signalé par resolved: Résolus resolved_msg: Signalement résolu avec succès ! - silence_account: Masquer le compte status: Statut - suspend_account: Suspendre le compte title: Signalements unassign: Dés-assigner unresolved: Non résolus diff --git a/config/locales/gl.yml b/config/locales/gl.yml index 49cc94f3022b6e380b465a4a8d79f75a90cc9da3..090796413d7dd17979a8ef8e43ac34588b14434d 100644 --- a/config/locales/gl.yml +++ b/config/locales/gl.yml @@ -345,9 +345,7 @@ gl: reported_by: Reportada por resolved: Resolto resolved_msg: Resolveuse con éxito o informe! - silence_account: Acalar conta status: Estado - suspend_account: Suspender conta title: Informes unassign: Non asignar unresolved: Non resolto diff --git a/config/locales/he.yml b/config/locales/he.yml index 3d24f22d209788145233b75d9e18c7e00c6b10b6..09d57da3b9ed887ca25d38935c9697ad9bee1948 100644 --- a/config/locales/he.yml +++ b/config/locales/he.yml @@ -189,9 +189,7 @@ he: reported_account: חשבון מדווח reported_by: דווח על ידי resolved: פתור - silence_account: השתקת חשבון status: הודעה - suspend_account: השעיית חשבון title: ×“×™×•×•×—×™× unresolved: ×œ× ×¤×ª×•×¨ settings: diff --git a/config/locales/hu.yml b/config/locales/hu.yml index 0c4046785eb18a34d62fe512025419905667fa29..92d11f0d8a4d1a1330e9dcb9d3bbf1d6948c79c3 100644 --- a/config/locales/hu.yml +++ b/config/locales/hu.yml @@ -249,9 +249,7 @@ hu: reported_account: Bejelentett fiók reported_by: 'Jelentette:' resolved: Megoldott - silence_account: Felhasználó némÃtása status: Ãllapot - suspend_account: Felhasználó felfüggesztése title: Jelentések unresolved: Megoldatlan settings: diff --git a/config/locales/id.yml b/config/locales/id.yml index b186b7652fb6aebe0145327321052006faa09eb1..3da3583f69962e637912a98ae5f0062ac3939943 100644 --- a/config/locales/id.yml +++ b/config/locales/id.yml @@ -114,9 +114,7 @@ id: reported_account: Akun yang dilaporkan reported_by: Dilaporkan oleh resolved: Terseleseikan - silence_account: Akun yang didiamkan status: Status - suspend_account: Akun yang disuspen title: Laporan unresolved: Belum Terseleseikan settings: diff --git a/config/locales/io.yml b/config/locales/io.yml index be8a87acd0db3a98e65ce4a5d3e44bf83938d784..b739df3af02fa1dd10457e8844044d482b7b77dd 100644 --- a/config/locales/io.yml +++ b/config/locales/io.yml @@ -107,9 +107,7 @@ io: reported_account: Reported account reported_by: Reported by resolved: Resolved - silence_account: Silence account status: Status - suspend_account: Suspend account title: Reports unresolved: Unresolved settings: diff --git a/config/locales/it.yml b/config/locales/it.yml index 5182e33729d6fcfd7071a635b7dbe4de4137290f..6a831ab2c57fcdb1055a6afa94d7b305e6bcbb80 100644 --- a/config/locales/it.yml +++ b/config/locales/it.yml @@ -324,9 +324,7 @@ it: report: 'Rapporto #%{id}' reported_by: Inviato da resolved: Risolto - silence_account: Silenzia account status: Stato - suspend_account: Sospendi account title: Rapporti unassign: Non assegnare unresolved: Non risolto diff --git a/config/locales/ja.yml b/config/locales/ja.yml index 84426f84ebb0a8b6a1c6ded1397c3bf4d4d125be..ea1d665daf4e829b370191cc524e6e53bf51a06a 100644 --- a/config/locales/ja.yml +++ b/config/locales/ja.yml @@ -346,9 +346,7 @@ ja: reported_by: å ±å‘Šè€… resolved: 解決済㿠resolved_msg: レãƒãƒ¼ãƒˆã‚’解決済ã¿ã«ã—ã¾ã—ãŸï¼ - silence_account: アカウントをサイレンス status: ステータス - suspend_account: ã‚¢ã‚«ã‚¦ãƒ³ãƒˆã‚’åœæ¢ title: レãƒãƒ¼ãƒˆ unassign: 担当を外㙠unresolved: 未解決 diff --git a/config/locales/ka.yml b/config/locales/ka.yml index f782db09b1c46e4f73a1770e4bd020c196af605c..5ac254df485fb7708ce6fb4b204ba2e132d496d3 100644 --- a/config/locales/ka.yml +++ b/config/locales/ka.yml @@ -325,9 +325,7 @@ ka: reported_by: დáƒáƒáƒ ეპáƒáƒ ტრresolved: გáƒáƒ“áƒáƒ¬áƒ§áƒ•ეტილი resolved_msg: რეპáƒáƒ ტი წáƒáƒ მáƒáƒ¢áƒ”ბით გáƒáƒ“áƒáƒ¬áƒ§áƒ“áƒ! - silence_account: áƒáƒœáƒ’áƒáƒ იშის გáƒáƒ©áƒ£áƒ›áƒ”ბრstatus: სტáƒáƒ¢áƒ£áƒ¡áƒ˜ - suspend_account: áƒáƒœáƒ’áƒáƒ იშის შეჩერებრtitle: რეპáƒáƒ ტები unassign: გáƒáƒ“áƒáƒ§áƒ”ნებრunresolved: გáƒáƒ“áƒáƒ£áƒ¬áƒ§áƒ•ეტელი diff --git a/config/locales/ko.yml b/config/locales/ko.yml index 6f281a302905b5fd5ec6c58023692b6c9904fa21..9f9875a16a92cf1702f9cdb3396d748db3a500c0 100644 --- a/config/locales/ko.yml +++ b/config/locales/ko.yml @@ -338,9 +338,7 @@ ko: reported_by: ì‹ ê³ ìž resolved: í•´ê²°ë¨ resolved_msg: 리í¬íŠ¸ê°€ 성공ì 으로 í•´ê²°ë˜ì—ˆìŠµë‹ˆë‹¤! - silence_account: ê³„ì •ì„ ì¹¨ë¬µ 처리 status: ìƒíƒœ - suspend_account: ê³„ì •ì„ ì •ì§€ title: ì‹ ê³ unassign: í• ë‹¹ í•´ì œ unresolved: 미해결 diff --git a/config/locales/nl.yml b/config/locales/nl.yml index 7e206d9389445afed416c0cadd1a20977b05d5e3..997df016450d62fa3b60869da3ecf726107b1a06 100644 --- a/config/locales/nl.yml +++ b/config/locales/nl.yml @@ -336,9 +336,7 @@ nl: reported_by: Gerapporteerd door resolved: Opgelost resolved_msg: Rapportage succesvol opgelost! - silence_account: Account negeren status: Toot - suspend_account: Account opschorten title: Rapportages unassign: Niet langer toewijzen unresolved: Onopgelost diff --git a/config/locales/no.yml b/config/locales/no.yml index bbfa9b5da04d5317a2a9796a77fee3b2743cd02e..61466fa20ea471c69728dfd8769de6115caf9853 100644 --- a/config/locales/no.yml +++ b/config/locales/no.yml @@ -249,9 +249,7 @@ reported_account: Rapportert konto reported_by: Rapportert av resolved: Løst - silence_account: MÃ¥lbind konto status: Status - suspend_account: Utvis konto title: Rapporter unresolved: Uløst settings: diff --git a/config/locales/oc.yml b/config/locales/oc.yml index af11d18e44bdc19355a984c950425e8893f7bc81..01063ab57f3221dc3a9c31f89eccc1a6b030300d 100644 --- a/config/locales/oc.yml +++ b/config/locales/oc.yml @@ -144,7 +144,6 @@ oc: role: Permissions roles: admin: Administrator - bot: Robòt moderator: Moderador staff: Personnal user: Uitlizaire @@ -337,9 +336,7 @@ oc: reported_by: Senhalat per resolved: Resolgut resolved_msg: Rapòrt corrèctament resolgut  ! - silence_account: Metre lo compte en silenci status: Estatut - suspend_account: Suspendre lo compte title: Senhalament unassign: Levar unresolved: Pas resolgut diff --git a/config/locales/pl.yml b/config/locales/pl.yml index dfebe25bdd0e115f99321f15e9abb35643c5bc7c..4921055e3f799abd5093524a61931024493e2fce 100644 --- a/config/locales/pl.yml +++ b/config/locales/pl.yml @@ -354,9 +354,7 @@ pl: reported_by: ZgÅ‚aszajÄ…cy resolved: RozwiÄ…zane resolved_msg: PomyÅ›lnie rozwiÄ…zano zgÅ‚oszenie. - silence_account: Wycisz konto status: Stan - suspend_account: ZawieÅ› konto title: ZgÅ‚oszenia unassign: Cofnij przypisanie unresolved: NierozwiÄ…zane diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml index 3e56f0731e544a3aba87bb5d3bfebf6069ed1cce..1ec00f85f240e06c6d2462827757d715b0d9bd7a 100644 --- a/config/locales/pt-BR.yml +++ b/config/locales/pt-BR.yml @@ -334,9 +334,7 @@ pt-BR: reported_by: Denunciada por resolved: Resolvido resolved_msg: Denúncia resolvida com sucesso! - silence_account: Silenciar conta status: Status - suspend_account: Suspender conta title: Denúncias unassign: Desatribuir unresolved: Não resolvido diff --git a/config/locales/pt.yml b/config/locales/pt.yml index 2bada74fe6ae36abb2948a97a00335d3216183f4..5f532ea377eb929da601bff01a2efc65c58db85d 100644 --- a/config/locales/pt.yml +++ b/config/locales/pt.yml @@ -249,9 +249,7 @@ pt: reported_account: Conta denunciada reported_by: Denúnciada por resolved: Resolvido - silence_account: Conta silenciada status: Estado - suspend_account: Conta suspensa title: Denúncias unresolved: Por resolver settings: diff --git a/config/locales/ru.yml b/config/locales/ru.yml index e8bbb94ca1aae27dd56528518f20e435a113dc6d..2eef0017041402c165e6be0fd1a9273ed812db91 100644 --- a/config/locales/ru.yml +++ b/config/locales/ru.yml @@ -345,9 +345,7 @@ ru: reported_by: Отправитель жалобы resolved: Разрешено resolved_msg: Жалоба уÑпешно обработана! - silence_account: Заглушить аккаунт status: Ð¡Ñ‚Ð°Ñ‚ÑƒÑ - suspend_account: Блокировать аккаунт title: Жалобы unassign: СнÑть назначение unresolved: Ðеразрешенные diff --git a/config/locales/sk.yml b/config/locales/sk.yml index 3e337fa428275de66585fe3cc430c777d6038291..2bdd3afa6618f75655778f03475099b513a5d559 100644 --- a/config/locales/sk.yml +++ b/config/locales/sk.yml @@ -337,9 +337,7 @@ sk: reported_by: Nahlásené užÃvateľom resolved: VyrieÅ¡ené resolved_msg: Hlásenie úspeÅ¡ne vyrieÅ¡ené! - silence_account: ZamĺÄaÅ¥ úÄet status: Stav - suspend_account: PozastaviÅ¥ úÄet title: Reporty unassign: OdobraÅ¥ unresolved: NevyrieÅ¡ené diff --git a/config/locales/sr-Latn.yml b/config/locales/sr-Latn.yml index d6800a8fb2ba0016e97aad3d70583e47aee9b13f..ff31203c857f2e6144333e6c9364220afffd7205 100644 --- a/config/locales/sr-Latn.yml +++ b/config/locales/sr-Latn.yml @@ -251,9 +251,7 @@ sr-Latn: reported_account: Prijavljeni nalog reported_by: Prijavio resolved: ReÅ¡eni - silence_account: Ućutkaj nalog status: Status - suspend_account: Suspenduj nalog title: Prijave unresolved: NereÅ¡eni settings: diff --git a/config/locales/sr.yml b/config/locales/sr.yml index 53981b0f0aa6c71af9ce364f0dad276564111e14..36d81886eb4336de84e7ac88b8de590e3ed77566 100644 --- a/config/locales/sr.yml +++ b/config/locales/sr.yml @@ -338,9 +338,7 @@ sr: reported_by: Пријавио resolved: Решена resolved_msg: Пријава уÑпешно разрешена! - silence_account: Ућуткај налог status: Ð¡Ñ‚Ð°Ñ‚ÑƒÑ - suspend_account: СуÑпендуј налог title: Пријаве unassign: Уклони доделу unresolved: Ðерешене diff --git a/config/locales/sv.yml b/config/locales/sv.yml index b7229aebe6fbd8cad091cc65e3d566b0a1b99081..4f80a46f1aee145de5a8a4371bd804261f7e028a 100644 --- a/config/locales/sv.yml +++ b/config/locales/sv.yml @@ -285,9 +285,7 @@ sv: reported_by: Anmäld av resolved: Löst resolved_msg: Anmälan har lösts framgÃ¥ngsrikt! - silence_account: Tysta ner konto status: Status - suspend_account: Suspendera konto title: Anmälningar unassign: Otilldela unresolved: Olösta diff --git a/config/locales/th.yml b/config/locales/th.yml index 8c411f2524e0a5b34e056674000dc413b3424bab..3ed73c7f50ec18655454249e107f530c1efcb5d1 100644 --- a/config/locales/th.yml +++ b/config/locales/th.yml @@ -116,9 +116,7 @@ th: reported_account: รายงานà¹à¸à¸„เคาท์ reported_by: รายงานโดย resolved: จัดà¸à¸²à¸£à¹à¸¥à¹‰à¸§ - silence_account: à¹à¸à¸„เค๊าท์ที่ปิดเสียง status: สถานะ - suspend_account: à¹à¸à¸„เค๊าท์ที่หยุดไว้ title: รายงาน unresolved: Unresolved settings: diff --git a/config/locales/tr.yml b/config/locales/tr.yml index d7ecb480f00bf0227e12fd798bf5352df14952b8..99ba89397912fd109bc0f37d120a2c9eda8b3150 100644 --- a/config/locales/tr.yml +++ b/config/locales/tr.yml @@ -115,9 +115,7 @@ tr: reported_account: Åžikayet edilen hesap reported_by: Åžikayet eden resolved: Giderildi - silence_account: Hesabı sustur status: Durum - suspend_account: Hesabı uzaklaÅŸtır title: Åžikayetler unresolved: Giderilmedi settings: diff --git a/config/locales/uk.yml b/config/locales/uk.yml index 22d5e98df10583763ab51b138865987c2ddce35e..83a315a3797e941a75effc596646ea6afda2a3bb 100644 --- a/config/locales/uk.yml +++ b/config/locales/uk.yml @@ -313,9 +313,7 @@ uk: reported_by: Відправник Ñкарги resolved: Вирішено resolved_msg: Скаргу уÑпішно вирішено! - silence_account: Заглушити акаунт status: Ð¡Ñ‚Ð°Ñ‚ÑƒÑ - suspend_account: Заблокувати акаунт title: Скарги unassign: ЗнÑти Ð¿Ñ€Ð¸Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ unresolved: Ðевирішені diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml index 9a1b47fdbb53032a6b4df2df704a701793e661b2..0ce1a0ed7e544baabefda79f83dd256f99291bcf 100644 --- a/config/locales/zh-CN.yml +++ b/config/locales/zh-CN.yml @@ -332,9 +332,7 @@ zh-CN: reported_by: 举报人 resolved: å·²å¤„ç† resolved_msg: ä¸¾æŠ¥å¤„ç†æˆåŠŸï¼ - silence_account: éšè—用户 status: çŠ¶æ€ - suspend_account: å°ç¦ç”¨æˆ· title: 举报 unassign: å–æ¶ˆæŽ¥ç®¡ unresolved: æœªå¤„ç† diff --git a/config/locales/zh-HK.yml b/config/locales/zh-HK.yml index abbb1b8093ae22df59db814869c4bd89374bc53e..db7c0c47cf1c32ef316291f1b62add14b326c87b 100644 --- a/config/locales/zh-HK.yml +++ b/config/locales/zh-HK.yml @@ -285,9 +285,7 @@ zh-HK: reported_by: èˆ‰å ±è€… resolved: å·²è™•ç† resolved_msg: èˆ‰å ±å·²è™•ç†ã€‚ - silence_account: 將用戶éœéŸ³ status: 狀態 - suspend_account: å°‡ç”¨æˆ¶åœæ¬Š title: èˆ‰å ± unassign: å–æ¶ˆæŒ‡æ´¾ unresolved: æœªè™•ç† diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml index 338c40d095d7f93992b40118f0f2c29f2f0ef838..d1b7633f332b87eae50348caac21a364339467fb 100644 --- a/config/locales/zh-TW.yml +++ b/config/locales/zh-TW.yml @@ -295,9 +295,7 @@ zh-TW: reported_by: 檢舉人 resolved: 已解決 resolved_msg: 檢舉已處ç†! - silence_account: éœéŸ³ä½¿ç”¨è€… status: 狀態 - suspend_account: åœæ¬Šä½¿ç”¨è€… title: 檢舉 unassign: å–æ¶ˆæŒ‡æ´¾ unresolved: 未解決