From 7b7c26063e3fcf9e75a61780d81bd60b7c398ead Mon Sep 17 00:00:00 2001 From: rhoio Date: Thu, 13 Sep 2018 01:50:41 +0200 Subject: [PATCH 01/25] Highlight active tab in action bar (#8673) * NavLinks with activeclass instead of Link in actionbar to highlight active tab * highlight border-bottom in action bar consistent to public view --- .../features/account/components/action_bar.js | 14 +++++++------- app/javascript/styles/mastodon/components.scss | 5 +++++ 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/app/javascript/mastodon/features/account/components/action_bar.js b/app/javascript/mastodon/features/account/components/action_bar.js index bc6f86628e0..a00efbbd95d 100644 --- a/app/javascript/mastodon/features/account/components/action_bar.js +++ b/app/javascript/mastodon/features/account/components/action_bar.js @@ -2,7 +2,7 @@ import React from 'react'; import ImmutablePropTypes from 'react-immutable-proptypes'; import PropTypes from 'prop-types'; import DropdownMenuContainer from '../../../containers/dropdown_menu_container'; -import { Link } from 'react-router-dom'; +import { NavLink } from 'react-router-dom'; import { defineMessages, injectIntl, FormattedMessage } from 'react-intl'; import { me } from '../../../initial_state'; import { shortNumberFormat } from '../../../utils/numbers'; @@ -147,20 +147,20 @@ export default class ActionBar extends React.PureComponent {
- + {shortNumberFormat(account.get('statuses_count'))} - + - + {shortNumberFormat(account.get('following_count'))} - + - + {shortNumberFormat(account.get('followers_count'))} - +
diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss index 24fb77d9865..048563336fc 100644 --- a/app/javascript/styles/mastodon/components.scss +++ b/app/javascript/styles/mastodon/components.scss @@ -1297,6 +1297,11 @@ a .account__avatar { flex: 0 1 100%; border-right: 1px solid lighten($ui-base-color, 8%); padding: 10px 0; + border-bottom: 4px solid transparent; + + &.active { + border-bottom: 4px solid $ui-highlight-color; + } & > span { display: block; From 011437dcb5c4719ad6627f3a4dc07a5ce1bd9db8 Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Thu, 13 Sep 2018 03:44:08 +0200 Subject: [PATCH 02/25] Group reports by target account (#8674) * Group reports by target account * Improve CSS --- .../admin/account_moderation_notes_helper.rb | 4 +- app/helpers/home_helper.rb | 8 +- app/javascript/styles/mastodon/admin.scss | 99 +++++++++++++++++++ app/views/admin/reports/_account.html.haml | 19 ---- app/views/admin/reports/_report.html.haml | 29 ------ app/views/admin/reports/index.html.haml | 52 +++++++--- app/views/settings/exports/show.html.haml | 2 +- config/locales/ar.yml | 4 - config/locales/ast.yml | 1 - config/locales/ca.yml | 4 - config/locales/co.yml | 4 - config/locales/cs.yml | 4 - config/locales/da.yml | 4 - config/locales/de.yml | 4 - config/locales/el.yml | 4 - config/locales/en.yml | 12 ++- config/locales/eo.yml | 4 - config/locales/es.yml | 4 - config/locales/eu.yml | 4 - config/locales/fa.yml | 4 - config/locales/fi.yml | 4 - config/locales/fr.yml | 4 - config/locales/gl.yml | 4 - config/locales/he.yml | 4 - config/locales/hu.yml | 4 - config/locales/id.yml | 4 - config/locales/io.yml | 3 - config/locales/it.yml | 4 - config/locales/ja.yml | 4 - config/locales/ka.yml | 4 - config/locales/ko.yml | 4 - config/locales/nl.yml | 4 - config/locales/no.yml | 4 - config/locales/oc.yml | 4 - config/locales/pl.yml | 4 - config/locales/pt-BR.yml | 4 - config/locales/pt.yml | 4 - config/locales/ru.yml | 4 - config/locales/sk.yml | 4 - config/locales/sr-Latn.yml | 4 - config/locales/sr.yml | 4 - config/locales/sv.yml | 4 - config/locales/th.yml | 4 - config/locales/tr.yml | 4 - config/locales/uk.yml | 4 - config/locales/zh-CN.yml | 4 - config/locales/zh-HK.yml | 4 - config/locales/zh-TW.yml | 4 - 48 files changed, 154 insertions(+), 227 deletions(-) delete mode 100644 app/views/admin/reports/_account.html.haml delete mode 100644 app/views/admin/reports/_report.html.haml diff --git a/app/helpers/admin/account_moderation_notes_helper.rb b/app/helpers/admin/account_moderation_notes_helper.rb index 25586fbba38..4d8f0352e4d 100644 --- a/app/helpers/admin/account_moderation_notes_helper.rb +++ b/app/helpers/admin/account_moderation_notes_helper.rb @@ -4,7 +4,7 @@ module Admin::AccountModerationNotesHelper def admin_account_link_to(account) return if account.nil? - link_to admin_account_path(account.id), class: name_tag_classes(account) do + link_to admin_account_path(account.id), class: name_tag_classes(account), title: account.acct do safe_join([ image_tag(account.avatar.url, width: 15, height: 15, alt: display_name(account), class: 'avatar'), content_tag(:span, account.acct, class: 'username'), @@ -15,7 +15,7 @@ module Admin::AccountModerationNotesHelper def admin_account_inline_link_to(account) return if account.nil? - link_to admin_account_path(account.id), class: name_tag_classes(account, true) do + link_to admin_account_path(account.id), class: name_tag_classes(account, true), title: account.acct do content_tag(:span, account.acct, class: 'username') end end diff --git a/app/helpers/home_helper.rb b/app/helpers/home_helper.rb index f5b501235d4..0157785fa7f 100644 --- a/app/helpers/home_helper.rb +++ b/app/helpers/home_helper.rb @@ -7,13 +7,13 @@ module HomeHelper } end - def account_link_to(account, button = '') + def account_link_to(account, button = '', size: 36, path: nil) content_tag(:div, class: 'account') do content_tag(:div, class: 'account__wrapper') do section = if account.nil? content_tag(:div, class: 'account__display-name') do content_tag(:div, class: 'account__avatar-wrapper') do - content_tag(:div, '', class: 'account__avatar', style: "background-image: url(#{full_asset_url('avatars/original/missing.png', skip_pipeline: true)})") + content_tag(:div, '', class: 'account__avatar', style: "width: #{size}px; height: #{size}px; background-size: #{size}px #{size}px; background-image: url(#{full_asset_url('avatars/original/missing.png', skip_pipeline: true)})") end + content_tag(:span, class: 'display-name') do content_tag(:strong, t('about.contact_missing')) + @@ -21,9 +21,9 @@ module HomeHelper end end else - link_to(TagManager.instance.url_for(account), class: 'account__display-name') do + link_to(path || TagManager.instance.url_for(account), class: 'account__display-name') do content_tag(:div, class: 'account__avatar-wrapper') do - content_tag(:div, '', class: 'account__avatar', style: "background-image: url(#{account.avatar.url})") + content_tag(:div, '', class: 'account__avatar', style: "width: #{size}px; height: #{size}px; background-size: #{size}px #{size}px; background-image: url(#{account.avatar.url})") end + content_tag(:span, class: 'display-name') do content_tag(:bdi) do diff --git a/app/javascript/styles/mastodon/admin.scss b/app/javascript/styles/mastodon/admin.scss index 42f50729678..7d359921ab8 100644 --- a/app/javascript/styles/mastodon/admin.scss +++ b/app/javascript/styles/mastodon/admin.scss @@ -567,3 +567,102 @@ a.name-tag, color: $dark-text-color; } } + +.report-card { + background: $ui-base-color; + border-radius: 4px; + margin-bottom: 20px; + + &__profile { + display: flex; + justify-content: space-between; + align-items: center; + padding: 15px; + + .account { + padding: 0; + border: 0; + + &__avatar-wrapper { + margin-left: 0; + } + } + + &__stats { + flex: 0 0 auto; + font-weight: 500; + color: $darker-text-color; + text-transform: uppercase; + text-align: right; + + a { + color: inherit; + text-decoration: none; + + &:focus, + &:hover, + &:active { + color: lighten($darker-text-color, 8%); + } + } + + .red { + color: $error-value-color; + } + } + } + + &__summary { + &__item { + display: flex; + justify-content: flex-start; + border-top: 1px solid darken($ui-base-color, 4%); + + &:hover { + background: lighten($ui-base-color, 2%); + } + + &__reported-by, + &__assigned { + padding: 15px; + flex: 0 0 auto; + box-sizing: border-box; + width: 150px; + color: $darker-text-color; + + &, + .username { + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; + } + } + + &__content { + flex: 1 1 auto; + max-width: calc(100% - 300px); + + &__icon { + color: $dark-text-color; + margin-right: 4px; + font-weight: 500; + } + } + + &__content a { + display: block; + box-sizing: border-box; + width: 100%; + padding: 15px; + text-decoration: none; + color: $darker-text-color; + } + } + } +} + +.one-line { + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; +} diff --git a/app/views/admin/reports/_account.html.haml b/app/views/admin/reports/_account.html.haml deleted file mode 100644 index 9ac161c9c69..00000000000 --- a/app/views/admin/reports/_account.html.haml +++ /dev/null @@ -1,19 +0,0 @@ -- size ||= 36 - -.account.compact - .account__wrapper - - if account.nil? - .account__display-name - .account__avatar-wrapper - .account__avatar{ style: "background-image: url(#{full_asset_url('avatars/original/missing.png', skip_pipeline: true)}); width: #{size}px; height: #{size}px; background-size: #{size}px #{size}px" } - %span.display-name - %strong= t 'about.contact_missing' - %span.display-name__account= t 'about.contact_unavailable' - - else - = link_to TagManager.instance.url_for(account), class: 'account__display-name' do - .account__avatar-wrapper - .account__avatar{ style: "background-image: url(#{account.avatar.url}); width: #{size}px; height: #{size}px; background-size: #{size}px #{size}px" } - %span.display-name - %bdi - %strong.display-name__html.emojify= display_name(account, custom_emojify: true) - %span.display-name__account @#{account.acct} diff --git a/app/views/admin/reports/_report.html.haml b/app/views/admin/reports/_report.html.haml deleted file mode 100644 index 7b25c924bc9..00000000000 --- a/app/views/admin/reports/_report.html.haml +++ /dev/null @@ -1,29 +0,0 @@ -%tr - %td.id - = "##{report.id}" - %td.target - = admin_account_link_to report.target_account - %td.reporter - - if report.account.local? - = admin_account_link_to report.account - - else - = report.account.domain - %td - %div{ title: report.comment } - = truncate(report.comment, length: 30, separator: ' ') - %div - - unless report.statuses.empty? - %span{ title: t('admin.accounts.statuses') } - = fa_icon('comment') - = report.statuses.count - - unless report.media_attachments.empty? - %span{ title: t('admin.accounts.media_attachments') } - = fa_icon('camera') - = report.media_attachments.count - %td - - if report.assigned_account.nil? - \- - - else - = admin_account_link_to report.assigned_account - %td - = table_link_to 'circle', t('admin.reports.view'), admin_report_path(report) diff --git a/app/views/admin/reports/index.html.haml b/app/views/admin/reports/index.html.haml index 44a531f2c66..d73faccb0d9 100644 --- a/app/views/admin/reports/index.html.haml +++ b/app/views/admin/reports/index.html.haml @@ -8,17 +8,45 @@ %li= filter_link_to t('admin.reports.unresolved'), resolved: nil %li= filter_link_to t('admin.reports.resolved'), resolved: '1' -.table-wrapper - %table.table - %thead - %tr - %th= t('admin.reports.id') - %th= t('admin.reports.target') - %th= t('admin.reports.reported_by') - %th= t('admin.reports.report_contents') - %th= t('admin.reports.assigned') - %th - %tbody - = render @reports +- @reports.group_by(&:target_account_id).each do |target_account_id, reports| + - target_account = reports.first.target_account + .report-card + .report-card__profile + = account_link_to target_account, '', size: 36, path: admin_account_path(target_account.id) + .report-card__profile__stats + = link_to pluralize(target_account.targeted_moderation_notes.count, t('admin.reports.account.note')), admin_account_path(target_account.id) + %br/ + - if target_account.suspended? + %span.red= t('admin.accounts.suspended') + - elsif target_account.silenced? + %span.red= t('admin.accounts.silenced') + - elsif target_account.user&.disabled? + %span.red= t('admin.accounts.disabled') + - else + %span.neutral= t('admin.accounts.no_limits_imposed') + .report-card__summary + - reports.each do |report| + .report-card__summary__item + .report-card__summary__item__reported-by + - if report.account.local? + = admin_account_link_to report.account + - else + = report.account.domain + .report-card__summary__item__content + = link_to admin_report_path(report) do + .one-line= report.comment.presence || t('admin.reports.comment.none') + %span.report-card__summary__item__content__icon{ title: t('admin.accounts.statuses') } + = fa_icon('comment') + = report.statuses.count + + %span.report-card__summary__item__content__icon{ title: t('admin.accounts.media_attachments') } + = fa_icon('camera') + = report.media_attachments.count + + .report-card__summary__item__assigned + - if report.assigned_account.present? + = admin_account_link_to report.assigned_account + - else + \- = paginate @reports diff --git a/app/views/settings/exports/show.html.haml b/app/views/settings/exports/show.html.haml index 792dccd9e9f..6c030b1ab77 100644 --- a/app/views/settings/exports/show.html.haml +++ b/app/views/settings/exports/show.html.haml @@ -9,7 +9,7 @@ %td= number_to_human_size @export.total_storage %td %tr - %th= t('accounts.statuses', count: @export.total_statuses) + %th= t('accounts.posts', count: @export.total_statuses) %td= number_with_delimiter @export.total_statuses %td %tr diff --git a/config/locales/ar.yml b/config/locales/ar.yml index eee2bb0b9c6..39995209bef 100644 --- a/config/locales/ar.yml +++ b/config/locales/ar.yml @@ -313,7 +313,6 @@ ar: comment: none: لا شيء created_at: ذكرت - id: معرّف ID mark_as_resolved: إعتبار التقرير كمحلول mark_as_unresolved: علام كغير محلولة notes: @@ -324,7 +323,6 @@ ar: placeholder: قم بوصف الإجراءات التي تم اتخاذها أو أي تحديثات أخرى ذات علاقة … reopen: إعادة فتح التقرير report: 'التقرير #%{id}' - report_contents: المحتويات reported_account: حساب مُبلّغ عنه reported_by: أبلغ عنه من طرف resolved: معالجة @@ -332,12 +330,10 @@ ar: silence_account: كتم و إخفاء الحساب status: الحالة suspend_account: فرض تعليق على الحساب - target: الهدف title: التقارير unassign: إلغاء تعيين unresolved: غير معالجة updated_at: محدث - view: عرض settings: activity_api_enabled: desc_html: عدد المنشورات المحلية و المستخدمين النشطين و التسجيلات الأسبوعية الجديدة diff --git a/config/locales/ast.yml b/config/locales/ast.yml index 9cc80ef16cf..aa3d348130f 100644 --- a/config/locales/ast.yml +++ b/config/locales/ast.yml @@ -88,7 +88,6 @@ ast: title: Invitaciones reports: are_you_sure: "¿De xuru?" - id: ID status: Estáu settings: registrations: diff --git a/config/locales/ca.yml b/config/locales/ca.yml index 73cb608c6f5..5a855945f20 100644 --- a/config/locales/ca.yml +++ b/config/locales/ca.yml @@ -322,7 +322,6 @@ ca: comment: none: Cap created_at: Reportat - id: ID mark_as_resolved: Marca com a resolt mark_as_unresolved: Marcar sense resoldre notes: @@ -333,7 +332,6 @@ ca: placeholder: Descriu les accions que s'han pres o qualsevol altra actualització relacionada… reopen: Reobrir informe report: 'Informe #%{id}' - report_contents: Contingut reported_account: Compte reportat reported_by: Reportat per resolved: Resolt @@ -341,12 +339,10 @@ ca: silence_account: Silencia el compte status: Estat suspend_account: Suspèn el compte - target: Objectiu title: Informes unassign: Treure assignació unresolved: No resolt updated_at: Actualitzat - view: Visualització settings: activity_api_enabled: desc_html: Compte d'estatus publicats localment, usuaris actius i registres nous en períodes setmanals diff --git a/config/locales/co.yml b/config/locales/co.yml index f21471ff7d6..69533e5274c 100644 --- a/config/locales/co.yml +++ b/config/locales/co.yml @@ -322,7 +322,6 @@ co: comment: none: Nisunu created_at: Palisatu - id: ID mark_as_resolved: Indicà cum’è chjosu mark_as_unresolved: Indicà cum’è sempre apertu notes: @@ -333,7 +332,6 @@ co: placeholder: Per parlà di l’azzione pigliate, o altre messe à ghjornu nant’à u signalamentu… reopen: Riapre u signalamentu report: 'Signalamente #%{id}' - report_contents: Cuntenuti reported_account: Contu palisatu reported_by: Palisatu da resolved: Scioltu è chjosu @@ -341,12 +339,10 @@ co: silence_account: Silenzà u contu status: Statutu suspend_account: Suspende u contu - target: Oggettu title: Signalamenti unassign: Disassignà unresolved: Micca sciolti updated_at: Messi à ghjornu - view: Vede settings: activity_api_enabled: desc_html: Numeri di statuti creati quì, utilizatori attivi, è arregistramenti novi tutte e settimane diff --git a/config/locales/cs.yml b/config/locales/cs.yml index ae2d3c04f8c..a55ed00b00c 100644 --- a/config/locales/cs.yml +++ b/config/locales/cs.yml @@ -322,7 +322,6 @@ cs: comment: none: Žádné created_at: Nahlášené - id: ID mark_as_resolved: Označit jako vyřešené mark_as_unresolved: Označit jako nevyřešené notes: @@ -333,7 +332,6 @@ cs: placeholder: Popište, jaké akce byly vykonány, nebo jakékoliv jiné související aktuality... reopen: Znovu otevřít nahlášení report: 'Nahlásit #%{id}' - report_contents: Obsah reported_account: Nahlášený účet reported_by: Nahlášeno uživatelem resolved: Vyřešeno @@ -341,12 +339,10 @@ cs: silence_account: Utišit účet status: Stav suspend_account: Suspendovat účet - target: Cíl title: Nahlášení unassign: Odebrat unresolved: Nevyřešeno updated_at: Aktualizováno - view: Zobrazit settings: activity_api_enabled: desc_html: Počty lokálně publikovaných příspěvků, aktivních uživatelů a nových registrací, v týdenních intervalech diff --git a/config/locales/da.yml b/config/locales/da.yml index e469fd3c075..74ac464c739 100644 --- a/config/locales/da.yml +++ b/config/locales/da.yml @@ -322,7 +322,6 @@ da: comment: none: Ingen created_at: Anmeldt - id: ID mark_as_resolved: Marker som værende løst mark_as_unresolved: Marker som værende uløst notes: @@ -333,7 +332,6 @@ da: placeholder: Beskriv hvilke handlinger der er blevet udført, eller andre relevante opdateringer... reopen: Genåben anmeldelse report: 'Anmeldelse #%{id}' - report_contents: Indhold reported_account: Anmeldt konto reported_by: Anmeldt af resolved: Løst @@ -341,12 +339,10 @@ da: silence_account: Dæmp konto status: Status suspend_account: Udeluk konto - target: Mål title: Anmeldelser unassign: Utildel unresolved: Uløst updated_at: Opdateret - view: Se settings: activity_api_enabled: desc_html: Antal af lokalt opslåede statusser, aktive brugere, og nye registreringer i ugentlige opdelinger diff --git a/config/locales/de.yml b/config/locales/de.yml index a68c645115e..847cfa0d8c5 100644 --- a/config/locales/de.yml +++ b/config/locales/de.yml @@ -321,7 +321,6 @@ de: comment: none: Kein created_at: Gemeldet - id: ID mark_as_resolved: Als gelöst markieren mark_as_unresolved: Als ungelöst markieren notes: @@ -332,7 +331,6 @@ de: placeholder: Beschreibe, welche Maßnahmen ergriffen wurden oder irgendwelche andere Neuigkeiten… reopen: Meldung wieder öffnen report: 'Meldung #%{id}' - report_contents: Inhalt reported_account: Gemeldetes Konto reported_by: Gemeldet von resolved: Gelöst @@ -340,12 +338,10 @@ de: silence_account: Konto stummschalten status: Status suspend_account: Konto sperren - target: Ziel title: Meldungen unassign: Zuweisung entfernen unresolved: Ungelöst updated_at: Aktualisiert - view: Ansehen settings: activity_api_enabled: desc_html: Anzahl der lokal geposteten Beiträge, aktiven Nutzern und neuen Registrierungen in wöchentlichen Zusammenfassungen diff --git a/config/locales/el.yml b/config/locales/el.yml index 84119b08620..6f78402889b 100644 --- a/config/locales/el.yml +++ b/config/locales/el.yml @@ -322,7 +322,6 @@ el: comment: none: Κανένα created_at: Αναφέρθηκε - id: ID mark_as_resolved: Σημειωμένο ως επιλυμένο mark_as_unresolved: Σημειωμένο ως ανεπίλυτο notes: @@ -333,7 +332,6 @@ el: placeholder: Περιέγραψε τις ενέργειες που έγιναν, ή οποιαδήποτε άλλη ενημέρωση... reopen: Ξανάνοιξε την καταγγελία report: 'Καταγγελία #%{id}' - report_contents: Περιεχόμενα reported_account: Αναφερόμενος λογαριασμός reported_by: Αναφέρθηκε από resolved: Επιλύθηκε @@ -341,12 +339,10 @@ el: silence_account: Αποσιώπηση λογαριασμού status: Κατάσταση suspend_account: Ανέστειλε λογαριασμό - target: Αποδέκτης title: Αναφορές unassign: Αποσύνδεση unresolved: Άλυτη updated_at: Ενημερωμένη - view: Εμφάνιση settings: activity_api_enabled: desc_html: Καταμέτρηση τοπικών δημοσιεύσεων, ενεργών χρηστών και νέων εγγραφών σε εβδομαδιαίες ομαδοποιήσεις diff --git a/config/locales/en.yml b/config/locales/en.yml index 501694eac90..5cbb790ddb7 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -120,6 +120,7 @@ en: moderation_notes: Moderation notes most_recent_activity: Most recent activity most_recent_ip: Most recent IP + no_limits_imposed: No limits imposed not_subscribed: Not subscribed order: alphabetic: Alphabetic @@ -155,8 +156,10 @@ en: report: report targeted_reports: Reports made about this account silence: Silence + silenced: Silenced statuses: Statuses subscribe: Subscribe + suspended: Suspended title: Accounts unconfirmed_email: Unconfirmed E-mail undo_silenced: Undo silence @@ -300,8 +303,13 @@ en: title: Invites relays: add_new: Add new relay + delete: Delete description_html: A federation relay is an intermediary server that exchanges large volumes of public toots between servers that subscribe and publish to it. It can help small and medium servers discover content from the fediverse, which would otherwise require local users manually following other people on remote servers. + disable: Disable + disabled: Disabled + enable: Enable enable_hint: Once enabled, your server will subscribe to all public toots from this relay, and will begin sending this server's public toots to it. + enabled: Enabled inbox_url: Relay URL pending: Waiting for relay's approval save_and_enable: Save and enable @@ -322,7 +330,6 @@ en: comment: none: None created_at: Reported - id: ID mark_as_resolved: Mark as resolved mark_as_unresolved: Mark as unresolved notes: @@ -333,7 +340,6 @@ en: placeholder: Describe what actions have been taken, or any other related updates... reopen: Reopen report report: 'Report #%{id}' - report_contents: Contents reported_account: Reported account reported_by: Reported by resolved: Resolved @@ -341,12 +347,10 @@ en: silence_account: Silence account status: Status suspend_account: Suspend account - target: Target title: Reports unassign: Unassign unresolved: Unresolved updated_at: Updated - view: View settings: activity_api_enabled: desc_html: Counts of locally posted statuses, active users, and new registrations in weekly buckets diff --git a/config/locales/eo.yml b/config/locales/eo.yml index 99628733559..9ab128d0cb1 100644 --- a/config/locales/eo.yml +++ b/config/locales/eo.yml @@ -311,7 +311,6 @@ eo: comment: none: Nenio created_at: Signalita - id: ID mark_as_resolved: Marki solvita mark_as_unresolved: Marki nesolvita notes: @@ -322,7 +321,6 @@ eo: placeholder: Priskribu faritajn agojn, aŭ ajnan novan informon pri tiu signalo… reopen: Remalfermi signalon report: 'Signalo #%{id}' - report_contents: Enhavo reported_account: Signalita konto reported_by: Signalita de resolved: Solvita @@ -330,12 +328,10 @@ eo: silence_account: Kaŝi konton status: Mesaĝoj suspend_account: Haltigi konton - target: Celo title: Signaloj unassign: Malasigni unresolved: Nesolvita updated_at: Ĝisdatigita - view: Vidi settings: activity_api_enabled: desc_html: Sumo de lokaj mesaĝoj, aktivaj uzantoj, kaj novaj registriĝoj laŭsemajne diff --git a/config/locales/es.yml b/config/locales/es.yml index ca04f0b1c61..ce0b2bb1655 100644 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -269,7 +269,6 @@ es: comment: none: Ninguno created_at: Denunciado - id: ID mark_as_resolved: Marcar como resuelto mark_as_unresolved: Marcar como no resuelto notes: @@ -280,7 +279,6 @@ es: placeholder: Especificar qué acciones se han tomado o cualquier otra novedad respecto a esta denuncia… reopen: Reabrir denuncia report: 'Reportar #%{id}' - report_contents: Contenido reported_account: Cuenta reportada reported_by: Reportado por resolved: Resuelto @@ -288,12 +286,10 @@ es: silence_account: Silenciar cuenta status: Estado suspend_account: Suspender cuenta - target: Objetivo title: Reportes unassign: Desasignar unresolved: No resuelto updated_at: Actualizado - view: Ver settings: activity_api_enabled: desc_html: Conteo de estados publicados localmente, usuarios activos, y nuevos registros en periodos semanales diff --git a/config/locales/eu.yml b/config/locales/eu.yml index e767d9ad905..d8ea6f2e03e 100644 --- a/config/locales/eu.yml +++ b/config/locales/eu.yml @@ -315,7 +315,6 @@ eu: comment: none: Bat ere ez created_at: Salatua - id: ID mark_as_resolved: Markatu konpondutako gisa mark_as_unresolved: Markatu konpondu gabeko gisa notes: @@ -326,7 +325,6 @@ eu: placeholder: Azaldu hartutako neurriak, edo erlazioa duten bestelako berriak... reopen: Berrireki salaketa report: 'Salaketa #%{id}' - report_contents: Edukiak reported_account: Salatutako kontua reported_by: Salatzailea resolved: Konponduta @@ -334,12 +332,10 @@ eu: silence_account: Isilarazi kontua status: Mezua suspend_account: Kanporatu kontua - target: Helburua title: Salaketak unassign: Kendu esleipena unresolved: Konpondu gabea updated_at: Eguneratua - view: Ikusi settings: activity_api_enabled: desc_html: Lokalki bidalitako mezu kopurua, erabiltzaile aktiboak, eta izen emate berriak asteko diff --git a/config/locales/fa.yml b/config/locales/fa.yml index b0d23063431..e2bcf717651 100644 --- a/config/locales/fa.yml +++ b/config/locales/fa.yml @@ -322,7 +322,6 @@ fa: comment: none: خالی created_at: گزارش‌شده - id: شناسه mark_as_resolved: علامت‌گذاری به عنوان حل‌شده mark_as_unresolved: علامت‌گذاری به عنوان حل‌نشده notes: @@ -333,7 +332,6 @@ fa: placeholder: کارهایی را که در این باره انجام شده، یا هر به‌روزرسانی دیگری را بنویسید... reopen: دوباره به جریان بیندازید report: 'گزارش #%{id}' - report_contents: محتوا reported_account: حساب گزارش‌شده reported_by: گزارش از طرف resolved: حل‌شده @@ -341,12 +339,10 @@ fa: silence_account: بی‌صدا کردن حساب status: نوشته suspend_account: معلق‌کردن حساب - target: هدف title: گزارش‌ها unassign: پس‌گرفتن مسئولیت unresolved: حل‌نشده updated_at: به‌روز شد - view: نمایش settings: activity_api_enabled: desc_html: تعداد بوق‌های محلی، کاربران فعال، و کاربران تازه در هر هفته diff --git a/config/locales/fi.yml b/config/locales/fi.yml index 96339e35ecf..e6a323da6a1 100644 --- a/config/locales/fi.yml +++ b/config/locales/fi.yml @@ -268,7 +268,6 @@ fi: comment: none: Ei mitään created_at: Raportoitu - id: Tunniste mark_as_resolved: Merkitse ratkaistuksi mark_as_unresolved: Merkitse ratkaisemattomaksi notes: @@ -279,7 +278,6 @@ fi: placeholder: Kuvaile mitä toimia on tehty tai muita päivityksiä tähän raporttiin… reopen: Avaa raportti uudestaan report: Raportti nro %{id} - report_contents: Sisältö reported_account: Raportoitu tili reported_by: Raportoija resolved: Ratkaistut @@ -287,11 +285,9 @@ fi: silence_account: Hiljennä tili status: Tila suspend_account: Siirrä tili jäähylle - target: Kohde title: Raportit unresolved: Ratkaisemattomat updated_at: Päivitetty - view: Näytä settings: activity_api_enabled: desc_html: Paikallisesti julkaistujen tilojen, aktiivisten käyttäjien ja uusien rekisteröintien määrät viikoittain diff --git a/config/locales/fr.yml b/config/locales/fr.yml index 1e08e9bbe5e..a9b9e7b554c 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -322,7 +322,6 @@ fr: comment: none: Aucun created_at: Signalé - id: ID mark_as_resolved: Marquer comme résolu mark_as_unresolved: Marquer comme non-résolu notes: @@ -333,7 +332,6 @@ fr: placeholder: Décrivez quelles actions ont été prises, ou toute autre mise à jour… reopen: Ré-ouvrir le signalement report: 'Signalement #%{id}' - report_contents: Contenu reported_account: Compte signalé reported_by: Signalé par resolved: Résolus @@ -341,12 +339,10 @@ fr: silence_account: Masquer le compte status: Statut suspend_account: Suspendre le compte - target: Cible title: Signalements unassign: Dés-assigner unresolved: Non résolus updated_at: Mis à jour - view: Voir settings: activity_api_enabled: desc_html: Nombre de statuts affichés localement, d’utilisateur·ice·s actif·ve·s et de nouveaux enregistrements dans les registres hebdomadaires diff --git a/config/locales/gl.yml b/config/locales/gl.yml index c196e0c4695..3ec89a9a2d0 100644 --- a/config/locales/gl.yml +++ b/config/locales/gl.yml @@ -321,7 +321,6 @@ gl: comment: none: Nada created_at: Reportado - id: ID mark_as_resolved: Marcar como resolto mark_as_unresolved: Marcar como non resolto notes: @@ -332,7 +331,6 @@ gl: placeholder: Describe qué medidas foron tomadas, ou calquer outra información relacionada... reopen: Voltar a abrir o informe report: 'Informe #%{id}' - report_contents: Contidos reported_account: Conta reportada reported_by: Reportada por resolved: Resolto @@ -340,12 +338,10 @@ gl: silence_account: Acalar conta status: Estado suspend_account: Suspender conta - target: Obxetivo title: Informes unassign: Non asignar unresolved: Non resolto updated_at: Actualizado - view: Vista settings: activity_api_enabled: desc_html: Conta de estados publicados localmente, usuarias activas, e novos rexistros por semana diff --git a/config/locales/he.yml b/config/locales/he.yml index ccf53e14abd..3d24f22d209 100644 --- a/config/locales/he.yml +++ b/config/locales/he.yml @@ -184,20 +184,16 @@ he: are_you_sure: 100% על בטוח? comment: none: ללא - id: ID mark_as_resolved: סימון כפתור report: 'דווח על #%{id}' - report_contents: תוכן reported_account: חשבון מדווח reported_by: דווח על ידי resolved: פתור silence_account: השתקת חשבון status: הודעה suspend_account: השעיית חשבון - target: מטרה title: דיווחים unresolved: לא פתור - view: תצוגה settings: contact_information: email: נא להקליד כתובת דוא"ל פומבית diff --git a/config/locales/hu.yml b/config/locales/hu.yml index 824a460669e..5d89b44ccdf 100644 --- a/config/locales/hu.yml +++ b/config/locales/hu.yml @@ -244,20 +244,16 @@ hu: are_you_sure: Biztos vagy benne? comment: none: Egyik sem - id: ID mark_as_resolved: Megjelölés megoldottként report: "#%{id} számú jelentés" - report_contents: Tartalom 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 - target: Cél title: Jelentések unresolved: Megoldatlan - view: Megtekintés settings: activity_api_enabled: desc_html: Helyi tülkök, aktív felhasználók és új regisztrációk száma heti bontásban diff --git a/config/locales/id.yml b/config/locales/id.yml index 33a764a2822..b186b7652fb 100644 --- a/config/locales/id.yml +++ b/config/locales/id.yml @@ -109,20 +109,16 @@ id: reports: comment: none: Tidak ada - id: ID mark_as_resolved: Tandai telah diseleseikan report: 'Laporkan #%{id}' - report_contents: Konten reported_account: Akun yang dilaporkan reported_by: Dilaporkan oleh resolved: Terseleseikan silence_account: Akun yang didiamkan status: Status suspend_account: Akun yang disuspen - target: Target title: Laporan unresolved: Belum Terseleseikan - view: Tampilan settings: contact_information: email: Masukkan alamat email diff --git a/config/locales/io.yml b/config/locales/io.yml index 287c1d0e640..be8a87acd0d 100644 --- a/config/locales/io.yml +++ b/config/locales/io.yml @@ -102,7 +102,6 @@ io: reports: comment: none: None - id: ID mark_as_resolved: Mark as resolved report: 'Report #%{id}' reported_account: Reported account @@ -111,10 +110,8 @@ io: silence_account: Silence account status: Status suspend_account: Suspend account - target: Target title: Reports unresolved: Unresolved - view: View settings: contact_information: email: Enter a public e-mail address diff --git a/config/locales/it.yml b/config/locales/it.yml index c947e3107aa..cef823e8fff 100644 --- a/config/locales/it.yml +++ b/config/locales/it.yml @@ -296,7 +296,6 @@ it: assigned: Moderatore assegnato comment: none: Nessuno - id: ID mark_as_resolved: Segna come risolto mark_as_unresolved: Segna come non risolto notes: @@ -306,17 +305,14 @@ it: delete: Elimina reopen: Riapri rapporto report: 'Rapporto #%{id}' - report_contents: Contenuti reported_by: Inviato da resolved: Risolto silence_account: Silenzia account status: Stato suspend_account: Sospendi account - target: Obbiettivo unassign: Non assegnare unresolved: Non risolto updated_at: Aggiornato - view: Mostra settings: activity_api_enabled: desc_html: Conteggi degli status pubblicati localmente, degli utenti attivi e delle nuove registrazioni in gruppi settimanali diff --git a/config/locales/ja.yml b/config/locales/ja.yml index bd6a22a64ee..3f55948beb2 100644 --- a/config/locales/ja.yml +++ b/config/locales/ja.yml @@ -322,7 +322,6 @@ ja: comment: none: なし created_at: レポート日時 - id: ID mark_as_resolved: 解決済みとしてマーク mark_as_unresolved: 未解決として再び開く notes: @@ -333,7 +332,6 @@ ja: placeholder: どのような措置が取られたか、または関連する更新を記述してください… reopen: 再び開く report: レポート#%{id} - report_contents: 内容 reported_account: 報告対象アカウント reported_by: 報告者 resolved: 解決済み @@ -341,12 +339,10 @@ ja: silence_account: アカウントをサイレンス status: ステータス suspend_account: アカウントを停止 - target: ターゲット title: レポート unassign: 担当を外す unresolved: 未解決 updated_at: 更新日時 - view: 表示 settings: activity_api_enabled: desc_html: 週ごとのローカルに投稿されたトゥート数、アクティブなユーザー数、新規登録者数 diff --git a/config/locales/ka.yml b/config/locales/ka.yml index c1105b017dc..e2283614846 100644 --- a/config/locales/ka.yml +++ b/config/locales/ka.yml @@ -311,7 +311,6 @@ ka: comment: none: არაფერი created_at: რეპორტის დრო - id: იდ mark_as_resolved: მონიშნე გადაწყვეტილად mark_as_unresolved: მონიშნე გადაუწყვეტლად notes: @@ -322,7 +321,6 @@ ka: placeholder: აღწერეთ თუ რა ნაბიჯები უნდა გადაიდგას, ან სხვა დაკავშირებული განახლებები... reopen: რეპორტის ხელახალი გახსნა report: 'რეპორტი #%{id}' - report_contents: მოცულობები reported_account: დარეპორტებული ანგარიში reported_by: დაარეპორტა resolved: გადაწყვეტილი @@ -330,12 +328,10 @@ ka: silence_account: ანგარიშის გაჩუმება status: სტატუსი suspend_account: ანგარიშის შეჩერება - target: მიზანი title: რეპორტები unassign: გადაყენება unresolved: გადაუწყვეტელი updated_at: განახების დრო - view: ჩვენება settings: activity_api_enabled: desc_html: ლოკალურად გამოქვეყნებული სტატუსების, აქტიური მომხმარებლების და ყოველკვირეული რეგისტრაციების მთვლელი diff --git a/config/locales/ko.yml b/config/locales/ko.yml index 737ab5be18e..ff7152064ae 100644 --- a/config/locales/ko.yml +++ b/config/locales/ko.yml @@ -324,7 +324,6 @@ ko: comment: none: 없음 created_at: 리포트 시각 - id: ID mark_as_resolved: 해결 완료 처리 mark_as_unresolved: 미해결로 표시 notes: @@ -335,7 +334,6 @@ ko: placeholder: 이 리포트에 대한 조치, 기타 관련 된 사항에 대해 설명합니다… reopen: 리포트 다시 열기 report: '신고 #%{id}' - report_contents: 내용 reported_account: 신고 대상 계정 reported_by: 신고자 resolved: 해결됨 @@ -343,12 +341,10 @@ ko: silence_account: 계정을 침묵 처리 status: 상태 suspend_account: 계정을 정지 - target: 대상 title: 신고 unassign: 할당 해제 unresolved: 미해결 updated_at: 업데이트 시각 - view: 표시 settings: activity_api_enabled: desc_html: 주별 로컬에 게시 된 글, 활성 사용자 및 새로운 가입자 수 diff --git a/config/locales/nl.yml b/config/locales/nl.yml index c5478d862e3..98107f67678 100644 --- a/config/locales/nl.yml +++ b/config/locales/nl.yml @@ -322,7 +322,6 @@ nl: comment: none: Geen created_at: Gerapporteerd op - id: ID mark_as_resolved: Markeer als opgelost mark_as_unresolved: Markeer als onopgelost notes: @@ -333,7 +332,6 @@ nl: placeholder: Beschrijf welke acties zijn ondernomen of andere gerelateerde opmerkingen… reopen: Rapportage heropenen report: 'Rapportage #%{id}' - report_contents: Inhoud reported_account: Gerapporteerde account reported_by: Gerapporteerd door resolved: Opgelost @@ -341,12 +339,10 @@ nl: silence_account: Account negeren status: Toot suspend_account: Account opschorten - target: Gerapporteerde account title: Rapportages unassign: Niet langer toewijzen unresolved: Onopgelost updated_at: Bijgewerkt - view: Weergeven settings: activity_api_enabled: desc_html: Wekelijks overzicht van de hoeveelheid lokale toots, actieve gebruikers en nieuwe registraties diff --git a/config/locales/no.yml b/config/locales/no.yml index bcf3966d489..57182b5567a 100644 --- a/config/locales/no.yml +++ b/config/locales/no.yml @@ -244,20 +244,16 @@ are_you_sure: Er du sikker? comment: none: Ingen - id: ID mark_as_resolved: Merk som løst report: 'Rapportér #%{id}' - report_contents: Innhold reported_account: Rapportert konto reported_by: Rapportert av resolved: Løst silence_account: Målbind konto status: Status suspend_account: Utvis konto - target: Mål title: Rapporter unresolved: Uløst - view: Vis settings: activity_api_enabled: desc_html: Antall lokale statusposter, aktive brukere og nye registreringer i ukentlige oppdelinger diff --git a/config/locales/oc.yml b/config/locales/oc.yml index 3fd5c87b9b4..592ceead4d9 100644 --- a/config/locales/oc.yml +++ b/config/locales/oc.yml @@ -323,7 +323,6 @@ oc: comment: none: Pas cap created_at: Creacion - id: ID mark_as_resolved: Marcar coma resolgut mark_as_unresolved: Marcar coma pas resolgut notes: @@ -334,7 +333,6 @@ oc: placeholder: Explicatz las accions que son estadas menadas o quicòm de ligat al senhalament… reopen: Tornar dobrir lo rapòrt report: 'Senhalament #%{id}' - report_contents: Contengut reported_account: Compte senhalat reported_by: Senhalat per resolved: Resolgut @@ -342,12 +340,10 @@ oc: silence_account: Metre lo compte en silenci status: Estatut suspend_account: Suspendre lo compte - target: Cibla title: Senhalament unassign: Levar unresolved: Pas resolgut updated_at: Actualizat - view: Veire settings: activity_api_enabled: desc_html: Nombre d’estatuts publicats, d’utilizaires actius e de novèlas inscripcions en rapòrt setmanièr diff --git a/config/locales/pl.yml b/config/locales/pl.yml index 95221e818f4..65b282c68d8 100644 --- a/config/locales/pl.yml +++ b/config/locales/pl.yml @@ -328,7 +328,6 @@ pl: comment: none: Brak created_at: Zgłoszono - id: ID mark_as_resolved: Oznacz jako rozwiązane mark_as_unresolved: Oznacz jako nierozwiązane notes: @@ -339,7 +338,6 @@ pl: placeholder: Opisz wykonane akcje i inne szczegóły dotyczące tego zgłoszenia… reopen: Otwórz ponownie report: 'Zgłoszenie #%{id}' - report_contents: Zawartość reported_account: Zgłoszone konto reported_by: Zgłaszający resolved: Rozwiązane @@ -347,12 +345,10 @@ pl: silence_account: Wycisz konto status: Stan suspend_account: Zawieś konto - target: Cel title: Zgłoszenia unassign: Cofnij przypisanie unresolved: Nierozwiązane updated_at: Zaktualizowano - view: Wyświetl settings: activity_api_enabled: desc_html: Liczy publikowane lokalnie wpisy, aktywnych użytkowników i nowe rejestracje w ciągu danego tygodnia diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml index cc4dddb9c1a..bda31bd7f85 100644 --- a/config/locales/pt-BR.yml +++ b/config/locales/pt-BR.yml @@ -320,7 +320,6 @@ pt-BR: comment: none: Nenhum created_at: Denunciado - id: ID mark_as_resolved: Marcar como resolvido mark_as_unresolved: Marcar como não resolvido notes: @@ -331,7 +330,6 @@ pt-BR: placeholder: Descreva que ações foram tomadas, ou quaisquer outras atualizações relacionadas… reopen: Reabrir denúncia report: 'Denúncia #%{id}' - report_contents: Conteúdos reported_account: Conta denunciada reported_by: Denunciada por resolved: Resolvido @@ -339,12 +337,10 @@ pt-BR: silence_account: Silenciar conta status: Status suspend_account: Suspender conta - target: Alvo title: Denúncias unassign: Desatribuir unresolved: Não resolvido updated_at: Atualizado - view: Visualizar settings: activity_api_enabled: desc_html: Contagem de status postados localmente, usuários ativos e novos cadastros filtrados semanalmente diff --git a/config/locales/pt.yml b/config/locales/pt.yml index eebeb498e9a..a1efd6c6509 100644 --- a/config/locales/pt.yml +++ b/config/locales/pt.yml @@ -244,20 +244,16 @@ pt: are_you_sure: Tens a certeza? comment: none: Nenhum - id: ID mark_as_resolved: Marcar como resolvido report: 'Denúncia #%{id}' - report_contents: Conteúdos reported_account: Conta denunciada reported_by: Denúnciada por resolved: Resolvido silence_account: Conta silenciada status: Estado suspend_account: Conta suspensa - target: Alvo title: Denúncias unresolved: Por resolver - view: Ver settings: activity_api_enabled: desc_html: Contagem semanais de publicações locais, utilizadores activos e novos registos diff --git a/config/locales/ru.yml b/config/locales/ru.yml index 19771aefa2e..121652b7376 100644 --- a/config/locales/ru.yml +++ b/config/locales/ru.yml @@ -331,7 +331,6 @@ ru: comment: none: Нет created_at: Создано - id: ID mark_as_resolved: Отметить как разрешенную mark_as_unresolved: Отметить как неразрешённую notes: @@ -342,7 +341,6 @@ ru: placeholder: Опишите, какие действия были приняты, или любые другие подробности… reopen: Переоткрыть жалобу report: 'Жалоба #%{id}' - report_contents: Содержимое reported_account: Аккаунт нарушителя reported_by: Отправитель жалобы resolved: Разрешено @@ -350,12 +348,10 @@ ru: silence_account: Заглушить аккаунт status: Статус suspend_account: Блокировать аккаунт - target: Цель title: Жалобы unassign: Снять назначение unresolved: Неразрешенные updated_at: Обновлена - view: Просмотреть settings: activity_api_enabled: desc_html: Подсчёт количества локальных статусов, активных пользователей и новых регистраций на еженедельной основе diff --git a/config/locales/sk.yml b/config/locales/sk.yml index 1be11baa499..e029df1ea64 100644 --- a/config/locales/sk.yml +++ b/config/locales/sk.yml @@ -289,7 +289,6 @@ sk: comment: none: Žiadne created_at: Nahlásené - id: Identifikácia mark_as_resolved: Označiť ako vyriešené mark_as_unresolved: Označ ako nevyriešené notes: @@ -300,7 +299,6 @@ sk: placeholder: Opíš aké opatrenia boli urobené, alebo akékoľvek iné súvisiace aktualizácie… reopen: Znovu otvor report report: Nahlásiť - report_contents: Obsah reported_account: Nahlásený účet reported_by: Nahlásené užívateľom resolved: Vyriešené @@ -308,12 +306,10 @@ sk: silence_account: Zamĺčať účet status: Stav suspend_account: Pozastaviť účet - target: Cieľ title: Reporty unassign: Odobrať unresolved: Nevyriešené updated_at: Aktualizované - view: Zobraziť settings: activity_api_enabled: desc_html: Sčítanie lokálne publikovaných príspevkov, aktívnych užívateľov, a nových registrácii, v týždenných intervaloch diff --git a/config/locales/sr-Latn.yml b/config/locales/sr-Latn.yml index d9813db4743..800fe54149b 100644 --- a/config/locales/sr-Latn.yml +++ b/config/locales/sr-Latn.yml @@ -246,20 +246,16 @@ sr-Latn: are_you_sure: Da li ste sigurni? comment: none: Ništa - id: ID mark_as_resolved: Označi kao rešen report: 'Prijava #%{id}' - report_contents: Sadržaj reported_account: Prijavljeni nalog reported_by: Prijavio resolved: Rešeni silence_account: Ućutkaj nalog status: Status suspend_account: Suspenduj nalog - target: Cilj title: Prijave unresolved: Nerešeni - view: Pogledaj settings: bootstrap_timeline_accounts: desc_html: Odvojite više korisničkih imena zarezom. Radi samo za lokalne i otključane naloge. Ako je prazno, onda se odnosi na sve lokalne administratore. diff --git a/config/locales/sr.yml b/config/locales/sr.yml index 516908415cd..960fccdc042 100644 --- a/config/locales/sr.yml +++ b/config/locales/sr.yml @@ -286,20 +286,16 @@ sr: are_you_sure: Да ли сте сигурни? comment: none: Ништа - id: ID mark_as_resolved: Означи као решен report: 'Пријава #%{id}' - report_contents: Садржај reported_account: Пријављени налог reported_by: Пријавио resolved: Решени silence_account: Ућуткај налог status: Статус suspend_account: Суспендуј налог - target: Циљ title: Пријаве unresolved: Нерешени - view: Погледај settings: bootstrap_timeline_accounts: desc_html: Одвојите више корисничких имена зарезом. Ради само за локалне и откључане налоге. Ако је празно, онда се односи на све локалне администраторе. diff --git a/config/locales/sv.yml b/config/locales/sv.yml index 605d9db12f6..3f157ecd13f 100644 --- a/config/locales/sv.yml +++ b/config/locales/sv.yml @@ -271,7 +271,6 @@ sv: comment: none: Ingen created_at: Anmäld - id: ID mark_as_resolved: Markera som löst mark_as_unresolved: Markera som olöst notes: @@ -282,7 +281,6 @@ sv: placeholder: Beskriv vilka åtgärder som vidtagits eller andra uppdateringar till den här anmälan. reopen: Återuppta anmälan report: 'Anmäl #%{id}' - report_contents: Innehåll reported_account: Anmält konto reported_by: Anmäld av resolved: Löst @@ -290,12 +288,10 @@ sv: silence_account: Tysta ner konto status: Status suspend_account: Suspendera konto - target: Mål title: Anmälningar unassign: Otilldela unresolved: Olösta updated_at: Uppdaterad - view: Granska settings: activity_api_enabled: desc_html: Räkning av lokalt postade statusar, aktiva användare och nyregistreringar per vecka diff --git a/config/locales/th.yml b/config/locales/th.yml index 88e1eb44c30..8c411f2524e 100644 --- a/config/locales/th.yml +++ b/config/locales/th.yml @@ -111,20 +111,16 @@ th: reports: comment: none: None - id: ไอดี mark_as_resolved: ทำเครื่องหมายว่าจัดการแล้ว report: 'Report #%{id}' - report_contents: เนื้อหา reported_account: รายงานแอคเคาท์ reported_by: รายงานโดย resolved: จัดการแล้ว silence_account: แอคเค๊าท์ที่ปิดเสียง status: สถานะ suspend_account: แอคเค๊าท์ที่หยุดไว้ - target: เป้าหมาย title: รายงาน unresolved: Unresolved - view: วิว settings: contact_information: email: กรอกที่อยู่อีเมล์สาธารณะ diff --git a/config/locales/tr.yml b/config/locales/tr.yml index 26dd4c1e304..d7ecb480f00 100644 --- a/config/locales/tr.yml +++ b/config/locales/tr.yml @@ -110,20 +110,16 @@ tr: reports: comment: none: Yok - id: ID mark_as_resolved: Giderildi olarak işaretle report: 'Şikayet #%{id}' - report_contents: İçerik reported_account: Şikayet edilen hesap reported_by: Şikayet eden resolved: Giderildi silence_account: Hesabı sustur status: Durum suspend_account: Hesabı uzaklaştır - target: Hedef title: Şikayetler unresolved: Giderilmedi - view: Görüntüle settings: contact_information: email: Herkese açık e-posta adresiniz diff --git a/config/locales/uk.yml b/config/locales/uk.yml index 6783495bb70..9da52d3f574 100644 --- a/config/locales/uk.yml +++ b/config/locales/uk.yml @@ -299,7 +299,6 @@ uk: comment: none: Немає created_at: Створено - id: ID mark_as_resolved: Відмітити як вирішену mark_as_unresolved: Відмітити як невирішену notes: @@ -310,7 +309,6 @@ uk: placeholder: Опишіть, які дії були виконані, або інші зміни, що стосуються справи... reopen: Перевідкрити скаргу report: 'Скарга #%{id}' - report_contents: Зміст reported_account: Акаунт порушника reported_by: Відправник скарги resolved: Вирішено @@ -318,12 +316,10 @@ uk: silence_account: Заглушити акаунт status: Статус suspend_account: Заблокувати акаунт - target: Ціль title: Скарги unassign: Зняти призначення unresolved: Невирішені updated_at: Оновлені - view: Подивитися settings: activity_api_enabled: desc_html: Кількість локальних постів, активних та нових користувачів у тижневих розрізах diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml index b2f9fd01e7e..cace8d050b0 100644 --- a/config/locales/zh-CN.yml +++ b/config/locales/zh-CN.yml @@ -269,7 +269,6 @@ zh-CN: comment: none: 没有 created_at: 举报时间 - id: ID mark_as_resolved: 标记为“已处理” mark_as_unresolved: 标记为“未处理” notes: @@ -280,7 +279,6 @@ zh-CN: placeholder: 描述已经执行的操作，或其他任何相关的跟进情况 reopen: 重开举报 report: '举报 #%{id}' - report_contents: 内容 reported_account: 举报用户 reported_by: 举报人 resolved: 已处理 @@ -288,12 +286,10 @@ zh-CN: silence_account: 隐藏用户 status: 状态 suspend_account: 封禁用户 - target: 被举报人 title: 举报 unassign: 取消接管 unresolved: 未处理 updated_at: 更新时间 - view: 查看 settings: activity_api_enabled: desc_html: 本站用户发布的嘟文数，以及本站的活跃用户数和一周内新用户数 diff --git a/config/locales/zh-HK.yml b/config/locales/zh-HK.yml index ee7ca444339..b1f9922fa67 100644 --- a/config/locales/zh-HK.yml +++ b/config/locales/zh-HK.yml @@ -271,7 +271,6 @@ zh-HK: comment: none: 沒有 created_at: 日期 - id: ID mark_as_resolved: 標示為「已處理」 mark_as_unresolved: 標示為「未處理」 notes: @@ -282,7 +281,6 @@ zh-HK: placeholder: 記錄已執行的動作，或其他相關的更新…… reopen: 重開舉報 report: '舉報 #%{id}' - report_contents: 舉報內容 reported_account: 舉報用戶 reported_by: 舉報者 resolved: 已處理 @@ -290,12 +288,10 @@ zh-HK: silence_account: 將用戶靜音 status: 狀態 suspend_account: 將用戶停權 - target: 對象 title: 舉報 unassign: 取消指派 unresolved: 未處理 updated_at: 更新 - view: 檢視 settings: activity_api_enabled: desc_html: 本站用戶發佈的文章，以及本站的活躍用戶和一週內新用戶數 diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml index 0a18dc9909e..a383957009a 100644 --- a/config/locales/zh-TW.yml +++ b/config/locales/zh-TW.yml @@ -271,7 +271,6 @@ zh-TW: comment: none: 無 created_at: 日期 - id: ID mark_as_resolved: 標記為「已解決」 mark_as_unresolved: 標記為「未解決」 notes: @@ -282,7 +281,6 @@ zh-TW: placeholder: 記錄已執行的動作，或其他相關的更新... reopen: 重開檢舉 report: '檢舉 #%{id}' - report_contents: 檢舉內容 reported_account: 被檢舉使用者 reported_by: 檢舉人 resolved: 已解決 @@ -290,12 +288,10 @@ zh-TW: silence_account: 靜音使用者 status: 狀態 suspend_account: 停權使用者 - target: 對象 title: 檢舉 unassign: 取消指派 unresolved: 未解決 updated_at: 更新 - view: 檢視 settings: activity_api_enabled: desc_html: 本站使用者發佈的嘟文數量，以及本站的活躍使用者與一週內新使用者數量 From 7fa4144d48c2372b73b5ece88588381aeb861948 Mon Sep 17 00:00:00 2001 From: ThibG Date: Thu, 13 Sep 2018 15:18:47 +0200 Subject: [PATCH 03/25] Fix building assets in test environment (#8691) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Webpacker (Ruby wrapper to webpack) uses RAILS_ENV-based environments while the javascript configuration for webpack re-reads this configuration file using the NODE_ENV environment variable. This means that when RAILS_ENV=test, running “assets:precompile” compiled the production packs in “public/packs” while webpacker expects them in “public/packs-test”. This causes Ruby to recompile them on-the-fly, possibly leading to race conditions in parallel_tests. This changes: - Disables on-the-fly compilation in test environment - Changes the javascript part to read the correct environment --- config/webpack/configuration.js | 2 +- config/webpacker.yml | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/config/webpack/configuration.js b/config/webpack/configuration.js index cf8c0c7e1d3..4d325a82877 100644 --- a/config/webpack/configuration.js +++ b/config/webpack/configuration.js @@ -7,7 +7,7 @@ const { readFileSync } = require('fs'); const configPath = resolve('config', 'webpacker.yml'); const loadersDir = join(__dirname, 'loaders'); -const settings = safeLoad(readFileSync(configPath), 'utf8')[env.NODE_ENV]; +const settings = safeLoad(readFileSync(configPath), 'utf8')[env.RAILS_ENV || env.NODE_ENV]; const themePath = resolve('config', 'themes.yml'); const themes = safeLoad(readFileSync(themePath), 'utf8'); diff --git a/config/webpacker.yml b/config/webpacker.yml index 8d8470651ac..ea814a0e65f 100644 --- a/config/webpacker.yml +++ b/config/webpacker.yml @@ -40,6 +40,10 @@ test: # Compile test packs to a separate directory public_output_path: packs-test + # CircleCI precompiles packs prior to running the tests. + # Also avoids race conditions in parallel_tests. + compile: false + production: <<: *default From 661a89ea747e2ef8e0a7671e1a0ace148e9624e9 Mon Sep 17 00:00:00 2001 From: ThibG Date: Thu, 13 Sep 2018 15:27:29 +0200 Subject: [PATCH 04/25] Autofocus comment textarea in report modal (#8689) --- app/javascript/mastodon/features/ui/components/report_modal.js | 1 + 1 file changed, 1 insertion(+) diff --git a/app/javascript/mastodon/features/ui/components/report_modal.js b/app/javascript/mastodon/features/ui/components/report_modal.js index 90f00131970..1962d4ae9f9 100644 --- a/app/javascript/mastodon/features/ui/components/report_modal.js +++ b/app/javascript/mastodon/features/ui/components/report_modal.js @@ -106,6 +106,7 @@ export default class ReportModal extends ImmutablePureComponent { onChange={this.handleCommentChange} onKeyDown={this.handleKeyDown} disabled={isSubmitting} + autoFocus /> {domain && ( From 09a87b2cdbc2c5b19152b732e39b5fdb4164fc7d Mon Sep 17 00:00:00 2001 From: ThibG Date: Thu, 13 Sep 2018 20:31:11 +0200 Subject: [PATCH 05/25] Auto-focus emoji picker's search field (#8688) Fixes #6056 --- .../features/compose/components/emoji_picker_dropdown.js | 1 + 1 file changed, 1 insertion(+) diff --git a/app/javascript/mastodon/features/compose/components/emoji_picker_dropdown.js b/app/javascript/mastodon/features/compose/components/emoji_picker_dropdown.js index 4fc32db8a4d..6c0fd9a2fdd 100644 --- a/app/javascript/mastodon/features/compose/components/emoji_picker_dropdown.js +++ b/app/javascript/mastodon/features/compose/components/emoji_picker_dropdown.js @@ -261,6 +261,7 @@ class EmojiPickerMenu extends React.PureComponent { skin={skinTone} showPreview={false} backgroundImageFn={backgroundImageFn} + autoFocus emojiTooltip /> From f8160b68b38306c4adb4e8a0b7e30b185a69c3d4 Mon Sep 17 00:00:00 2001 From: ThibG Date: Thu, 13 Sep 2018 20:31:33 +0200 Subject: [PATCH 06/25] Only focus first element of dropdown menus if using keyboard (#8679) * Only focus first item of dropdown if it was opened via keyboard * Improve keyboard VS mouse navigation of dropdown menus --- .../mastodon/actions/dropdown_menu.js | 4 +-- .../mastodon/components/dropdown_menu.js | 32 +++++++++++++------ .../containers/dropdown_menu_container.js | 5 +-- .../mastodon/reducers/dropdown_menu.js | 4 +-- 4 files changed, 29 insertions(+), 16 deletions(-) diff --git a/app/javascript/mastodon/actions/dropdown_menu.js b/app/javascript/mastodon/actions/dropdown_menu.js index 217ba4e74a5..14f2939c78d 100644 --- a/app/javascript/mastodon/actions/dropdown_menu.js +++ b/app/javascript/mastodon/actions/dropdown_menu.js @@ -1,8 +1,8 @@ export const DROPDOWN_MENU_OPEN = 'DROPDOWN_MENU_OPEN'; export const DROPDOWN_MENU_CLOSE = 'DROPDOWN_MENU_CLOSE'; -export function openDropdownMenu(id, placement) { - return { type: DROPDOWN_MENU_OPEN, id, placement }; +export function openDropdownMenu(id, placement, keyboard) { + return { type: DROPDOWN_MENU_OPEN, id, placement, keyboard }; } export function closeDropdownMenu(id) { diff --git a/app/javascript/mastodon/components/dropdown_menu.js b/app/javascript/mastodon/components/dropdown_menu.js index a5cf6479b0e..91b65a02fb6 100644 --- a/app/javascript/mastodon/components/dropdown_menu.js +++ b/app/javascript/mastodon/components/dropdown_menu.js @@ -23,6 +23,7 @@ class DropdownMenu extends React.PureComponent { placement: PropTypes.string, arrowOffsetLeft: PropTypes.string, arrowOffsetTop: PropTypes.string, + openedViaKeyboard: PropTypes.bool, }; static defaultProps = { @@ -42,13 +43,15 @@ class DropdownMenu extends React.PureComponent { componentDidMount () { document.addEventListener('click', this.handleDocumentClick, false); + document.addEventListener('keydown', this.handleKeyDown, false); document.addEventListener('touchend', this.handleDocumentClick, listenerOptions); - if (this.focusedItem) this.focusedItem.focus(); + if (this.focusedItem && this.props.openedViaKeyboard) this.focusedItem.focus(); this.setState({ mounted: true }); } componentWillUnmount () { document.removeEventListener('click', this.handleDocumentClick, false); + document.removeEventListener('keydown', this.handleKeyDown, false); document.removeEventListener('touchend', this.handleDocumentClick, listenerOptions); } @@ -62,13 +65,10 @@ class DropdownMenu extends React.PureComponent { handleKeyDown = e => { const items = Array.from(this.node.getElementsByTagName('a')); - const index = items.indexOf(e.currentTarget); + const index = items.indexOf(document.activeElement); let element; switch(e.key) { - case 'Enter': - this.handleClick(e); - break; case 'ArrowDown': element = items[index+1]; if (element) { @@ -96,6 +96,12 @@ class DropdownMenu extends React.PureComponent { } } + handleItemKeyDown = e => { + if (e.key === 'Enter') { + this.handleClick(e); + } + } + handleClick = e => { const i = Number(e.currentTarget.getAttribute('data-index')); const { action, to } = this.props.items[i]; @@ -120,7 +126,7 @@ class DropdownMenu extends React.PureComponent { return (
  • - + {text}
    • @@ -170,6 +176,7 @@ export default class Dropdown extends React.PureComponent { onClose: PropTypes.func.isRequired, dropdownPlacement: PropTypes.string, openDropdownId: PropTypes.number, + openedViaKeyboard: PropTypes.bool, }; static defaultProps = { @@ -180,14 +187,14 @@ export default class Dropdown extends React.PureComponent { id: id++, }; - handleClick = ({ target }) => { + handleClick = ({ target, type }) => { if (this.state.id === this.props.openDropdownId) { this.handleClose(); } else { const { top } = target.getBoundingClientRect(); const placement = top * 2 < innerHeight ? 'bottom' : 'top'; - this.props.onOpen(this.state.id, this.handleItemClick, placement); + this.props.onOpen(this.state.id, this.handleItemClick, placement, type !== 'click'); } } @@ -197,6 +204,11 @@ export default class Dropdown extends React.PureComponent { handleKeyDown = e => { switch(e.key) { + case ' ': + case 'Enter': + this.handleClick(e); + e.preventDefault(); + break; case 'Escape': this.handleClose(); break; @@ -233,7 +245,7 @@ export default class Dropdown extends React.PureComponent { } render () { - const { icon, items, size, title, disabled, dropdownPlacement, openDropdownId } = this.props; + const { icon, items, size, title, disabled, dropdownPlacement, openDropdownId, openedViaKeyboard } = this.props; const open = this.state.id === openDropdownId; return ( @@ -249,7 +261,7 @@ export default class Dropdown extends React.PureComponent { /> - +
    ); diff --git a/app/javascript/mastodon/containers/dropdown_menu_container.js b/app/javascript/mastodon/containers/dropdown_menu_container.js index 7cbcdcd3572..73c8a1e530e 100644 --- a/app/javascript/mastodon/containers/dropdown_menu_container.js +++ b/app/javascript/mastodon/containers/dropdown_menu_container.js @@ -8,15 +8,16 @@ const mapStateToProps = state => ({ isModalOpen: state.get('modal').modalType === 'ACTIONS', dropdownPlacement: state.getIn(['dropdown_menu', 'placement']), openDropdownId: state.getIn(['dropdown_menu', 'openId']), + openedViaKeyboard: state.getIn(['dropdown_menu', 'keyboard']), }); const mapDispatchToProps = (dispatch, { status, items }) => ({ - onOpen(id, onItemClick, dropdownPlacement) { + onOpen(id, onItemClick, dropdownPlacement, keyboard) { dispatch(isUserTouching() ? openModal('ACTIONS', { status, actions: items, onClick: onItemClick, - }) : openDropdownMenu(id, dropdownPlacement)); + }) : openDropdownMenu(id, dropdownPlacement, keyboard)); }, onClose(id) { dispatch(closeModal()); diff --git a/app/javascript/mastodon/reducers/dropdown_menu.js b/app/javascript/mastodon/reducers/dropdown_menu.js index 5449884cc58..36fd4f13217 100644 --- a/app/javascript/mastodon/reducers/dropdown_menu.js +++ b/app/javascript/mastodon/reducers/dropdown_menu.js @@ -4,12 +4,12 @@ import { DROPDOWN_MENU_CLOSE, } from '../actions/dropdown_menu'; -const initialState = Immutable.Map({ openId: null, placement: null }); +const initialState = Immutable.Map({ openId: null, placement: null, keyboard: false }); export default function dropdownMenu(state = initialState, action) { switch (action.type) { case DROPDOWN_MENU_OPEN: - return state.merge({ openId: action.id, placement: action.placement }); + return state.merge({ openId: action.id, placement: action.placement, keyboard: action.keyboard }); case DROPDOWN_MENU_CLOSE: return state.get('openId') === action.id ? state.set('openId', null) : state; default: From 4959ead07c56be120fd00b10c5da4f9db0bb1ea1 Mon Sep 17 00:00:00 2001 From: ThibG Date: Thu, 13 Sep 2018 20:31:59 +0200 Subject: [PATCH 07/25] Fix media description in various media modals (#8678) --- app/javascript/mastodon/features/ui/components/media_modal.js | 2 +- app/javascript/mastodon/features/ui/components/video_modal.js | 2 +- .../mastodon/features/ui/components/zoomable_image.js | 1 + app/javascript/mastodon/features/video/index.js | 3 ++- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/app/javascript/mastodon/features/ui/components/media_modal.js b/app/javascript/mastodon/features/ui/components/media_modal.js index 83b9e1b502e..7a3030ec4ba 100644 --- a/app/javascript/mastodon/features/ui/components/media_modal.js +++ b/app/javascript/mastodon/features/ui/components/media_modal.js @@ -149,7 +149,7 @@ export default class MediaModal extends ImmutablePureComponent { startTime={time || 0} onCloseVideo={onClose} detailed - description={image.get('description')} + alt={image.get('description')} key={image.get('url')} /> ); diff --git a/app/javascript/mastodon/features/ui/components/video_modal.js b/app/javascript/mastodon/features/ui/components/video_modal.js index 9ed4a43ad1f..7cf3eb4d458 100644 --- a/app/javascript/mastodon/features/ui/components/video_modal.js +++ b/app/javascript/mastodon/features/ui/components/video_modal.js @@ -24,7 +24,7 @@ export default class VideoModal extends ImmutablePureComponent { startTime={time} onCloseVideo={onClose} detailed - description={media.get('description')} + alt={media.get('description')} />
    diff --git a/app/javascript/mastodon/features/ui/components/zoomable_image.js b/app/javascript/mastodon/features/ui/components/zoomable_image.js index 0a0a4d41a93..3f6562bc991 100644 --- a/app/javascript/mastodon/features/ui/components/zoomable_image.js +++ b/app/javascript/mastodon/features/ui/components/zoomable_image.js @@ -137,6 +137,7 @@ export default class ZoomableImage extends React.PureComponent { role='presentation' ref={this.setImageRef} alt={alt} + title={alt} src={src} style={{ transform: `scale(${scale})`, diff --git a/app/javascript/mastodon/features/video/index.js b/app/javascript/mastodon/features/video/index.js index 52b395f8890..889f892fa30 100644 --- a/app/javascript/mastodon/features/video/index.js +++ b/app/javascript/mastodon/features/video/index.js @@ -252,11 +252,12 @@ export default class Video extends React.PureComponent { } handleOpenVideo = () => { - const { src, preview, width, height } = this.props; + const { src, preview, width, height, alt } = this.props; const media = fromJS({ type: 'video', url: src, preview_url: preview, + description: alt, width, height, }); From 40dd19be37852d4442a924c2a74bcbbfbf57e054 Mon Sep 17 00:00:00 2001 From: luzpaz Date: Thu, 13 Sep 2018 18:53:09 -0400 Subject: [PATCH 08/25] Misc. typos (#8694) Found via `codespell -q 3 --skip="./app/javascript/mastodon/locales,./config/locales"` --- app/controllers/auth/sessions_controller.rb | 2 +- app/javascript/mastodon/features/compose/util/url_regex.js | 2 +- .../mastodon/features/ui/util/react_router_helpers.js | 2 +- app/models/status.rb | 2 +- config/environments/test.rb | 2 +- config/initializers/simple_form.rb | 2 +- config/initializers/twitter_regex.rb | 2 +- docker-compose.yml | 6 +++--- lib/mastodon/migration_helpers.rb | 2 +- spec/controllers/concerns/localized_spec.rb | 2 +- spec/controllers/emojis_controller_spec.rb | 4 ++-- spec/controllers/stream_entries_controller_spec.rb | 2 +- spec/models/account_spec.rb | 2 +- spec/models/subscription_spec.rb | 2 +- spec/services/process_feed_service_spec.rb | 2 +- 15 files changed, 18 insertions(+), 18 deletions(-) diff --git a/app/controllers/auth/sessions_controller.rb b/app/controllers/auth/sessions_controller.rb index bc980009ebd..901e82331a2 100644 --- a/app/controllers/auth/sessions_controller.rb +++ b/app/controllers/auth/sessions_controller.rb @@ -128,7 +128,7 @@ class Auth::SessionsController < Devise::SessionsController def clear_site_data return if continue_after? - # Should be '"*"' but that doen't work in Chrome (neither does '"executionContexts"') + # Should be '"*"' but that doesn't work in Chrome (neither does '"executionContexts"') # https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Clear-Site-Data response.headers['Clear-Site-Data'] = '"cache", "cookies", "storage"' end diff --git a/app/javascript/mastodon/features/compose/util/url_regex.js b/app/javascript/mastodon/features/compose/util/url_regex.js index d5e39e0d513..7f1e176207b 100644 --- a/app/javascript/mastodon/features/compose/util/url_regex.js +++ b/app/javascript/mastodon/features/compose/util/url_regex.js @@ -170,7 +170,7 @@ export const urlRegex = (function() { ')' + '\\)', 'i'); - // Valid end-of-path chracters (so /foo. does not gobble the period). + // Valid end-of-path characters (so /foo. does not gobble the period). // 1. Allow =&# for empty URL parameters and other URL-join artifacts regexen.validUrlPathEndingChars = regexSupplant(/[^#{spaces_group}\(\)\?!\*';:=\,\.\$%\[\]#{pd}~&\|@]|(?:#{validUrlBalancedParens})/i); // Allow @ in a url, but only in the middle. Catch things like http://example.com/@user/ diff --git a/app/javascript/mastodon/features/ui/util/react_router_helpers.js b/app/javascript/mastodon/features/ui/util/react_router_helpers.js index 32dfe320b9d..d452b871f78 100644 --- a/app/javascript/mastodon/features/ui/util/react_router_helpers.js +++ b/app/javascript/mastodon/features/ui/util/react_router_helpers.js @@ -26,7 +26,7 @@ WrappedSwitch.propTypes = { children: PropTypes.node, }; -// Small Wraper to extract the params from the route and pass +// Small Wrapper to extract the params from the route and pass // them to the rendered component, together with the content to // be rendered inside (the children) export class WrappedRoute extends React.Component { diff --git a/app/models/status.rb b/app/models/status.rb index 35655bff237..f2b5cc6ce39 100644 --- a/app/models/status.rb +++ b/app/models/status.rb @@ -241,7 +241,7 @@ class Status < ApplicationRecord def as_direct_timeline(account, limit = 20, max_id = nil, since_id = nil, cache_ids = false) # direct timeline is mix of direct message from_me and to_me. - # 2 querys are executed with pagination. + # 2 queries are executed with pagination. # constant expression using arel_table is required for partial index # _from_me part does not require any timeline filters diff --git a/config/environments/test.rb b/config/environments/test.rb index 1c1891561fd..a35cadcfa30 100644 --- a/config/environments/test.rb +++ b/config/environments/test.rb @@ -23,7 +23,7 @@ Rails.application.configure do config.consider_all_requests_local = true config.action_controller.perform_caching = false - # The default store, file_store is shared by processses parallely executed + # The default store, file_store is shared by processes parallelly executed # and should not be used. config.cache_store = :memory_store diff --git a/config/initializers/simple_form.rb b/config/initializers/simple_form.rb index 5983918cd42..e413cdb4487 100644 --- a/config/initializers/simple_form.rb +++ b/config/initializers/simple_form.rb @@ -116,7 +116,7 @@ SimpleForm.setup do |config| # You can define the class to use on all labels. Default is nil. # config.label_class = nil - # You can define the default class to be used on forms. Can be overriden + # You can define the default class to be used on forms. Can be overridden # with `html: { :class }`. Defaulting to none. # config.default_form_class = nil diff --git a/config/initializers/twitter_regex.rb b/config/initializers/twitter_regex.rb index c227f92d3ea..76b23f4168d 100644 --- a/config/initializers/twitter_regex.rb +++ b/config/initializers/twitter_regex.rb @@ -28,7 +28,7 @@ module Twitter )/iox REGEXEN[:valid_url] = %r{ ( # $1 total match - (#{REGEXEN[:valid_url_preceding_chars]}) # $2 Preceeding chracter + (#{REGEXEN[:valid_url_preceding_chars]}) # $2 Preceding character ( # $3 URL ((https?|dat|dweb|ipfs|ipns|ssb|gopher):\/\/)? # $4 Protocol (optional) (#{REGEXEN[:valid_domain]}) # $5 Domain(s) diff --git a/docker-compose.yml b/docker-compose.yml index 070a953840c..064d5a26049 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -6,7 +6,7 @@ services: image: postgres:9.6-alpine networks: - internal_network -### Uncomment to enable DB persistance +### Uncomment to enable DB persistence # volumes: # - ./postgres:/var/lib/postgresql/data @@ -15,7 +15,7 @@ services: image: redis:4.0-alpine networks: - internal_network -### Uncomment to enable REDIS persistance +### Uncomment to enable REDIS persistence # volumes: # - ./redis:/data @@ -26,7 +26,7 @@ services: # - "ES_JAVA_OPTS=-Xms512m -Xmx512m" # networks: # - internal_network -#### Uncomment to enable ES persistance +#### Uncomment to enable ES persistence ## volumes: ## - ./elasticsearch:/usr/share/elasticsearch/data diff --git a/lib/mastodon/migration_helpers.rb b/lib/mastodon/migration_helpers.rb index e154b5a2cd7..5c135685f33 100644 --- a/lib/mastodon/migration_helpers.rb +++ b/lib/mastodon/migration_helpers.rb @@ -835,7 +835,7 @@ module Mastodon columns(table).find { |column| column.name == name } end - # This will replace the first occurance of a string in a column with + # This will replace the first occurrence of a string in a column with # the replacement # On postgresql we can use `regexp_replace` for that. # On mysql we find the location of the pattern, and overwrite it diff --git a/spec/controllers/concerns/localized_spec.rb b/spec/controllers/concerns/localized_spec.rb index 8c80b7d2a8d..76c3de1183d 100644 --- a/spec/controllers/concerns/localized_spec.rb +++ b/spec/controllers/concerns/localized_spec.rb @@ -28,7 +28,7 @@ describe ApplicationController, type: :controller do expect(I18n.locale).to eq :fa end - it 'sets available and compatible langauge if none of available languages are preferred' do + it 'sets available and compatible language if none of available languages are preferred' do request.headers['Accept-Language'] = 'fa-IR' get 'success' expect(I18n.locale).to eq :fa diff --git a/spec/controllers/emojis_controller_spec.rb b/spec/controllers/emojis_controller_spec.rb index 68bae256d7b..fbbd11f6480 100644 --- a/spec/controllers/emojis_controller_spec.rb +++ b/spec/controllers/emojis_controller_spec.rb @@ -6,11 +6,11 @@ describe EmojisController do let(:emoji) { Fabricate(:custom_emoji) } describe 'GET #show' do - subject(:responce) { get :show, params: { id: emoji.id, format: :json } } + subject(:response) { get :show, params: { id: emoji.id, format: :json } } subject(:body) { JSON.parse(response.body, symbolize_names: true) } it 'returns the right response' do - expect(responce).to have_http_status 200 + expect(response).to have_http_status 200 expect(body[:name]).to eq ':coolcat:' end end diff --git a/spec/controllers/stream_entries_controller_spec.rb b/spec/controllers/stream_entries_controller_spec.rb index 534bc393dcd..eb7fdf9d782 100644 --- a/spec/controllers/stream_entries_controller_spec.rb +++ b/spec/controllers/stream_entries_controller_spec.rb @@ -4,7 +4,7 @@ RSpec.describe StreamEntriesController, type: :controller do render_views shared_examples 'before_action' do |route| - context 'when account is not suspended anbd stream_entry is available' do + context 'when account is not suspended and stream_entry is available' do it 'assigns instance variables' do status = Fabricate(:status) diff --git a/spec/models/account_spec.rb b/spec/models/account_spec.rb index ec01026dbe7..ae19251ae9d 100644 --- a/spec/models/account_spec.rb +++ b/spec/models/account_spec.rb @@ -559,7 +559,7 @@ RSpec.describe Account, type: :model do end context 'when is local' do - it 'is invalid if the username is not unique in case-insensitive comparsion among local accounts' do + it 'is invalid if the username is not unique in case-insensitive comparison among local accounts' do account_1 = Fabricate(:account, username: 'the_doctor') account_2 = Fabricate.build(:account, username: 'the_Doctor') account_2.valid? diff --git a/spec/models/subscription_spec.rb b/spec/models/subscription_spec.rb index 84096e6ae80..b83979d1379 100644 --- a/spec/models/subscription_spec.rb +++ b/spec/models/subscription_spec.rb @@ -18,7 +18,7 @@ RSpec.describe Subscription, type: :model do end describe 'lease_seconds' do - it 'returns the time remaing until expiration' do + it 'returns the time remaining until expiration' do datetime = 1.day.from_now subscription = Subscription.new(expires_at: datetime) travel_to(datetime - 12.hours) do diff --git a/spec/services/process_feed_service_spec.rb b/spec/services/process_feed_service_spec.rb index d8b06506361..1f26660ed50 100644 --- a/spec/services/process_feed_service_spec.rb +++ b/spec/services/process_feed_service_spec.rb @@ -166,7 +166,7 @@ XML expect(created_statuses.first.reblog.text).to eq 'Overwatch rocks' end - it 'ignores reblogs if it failed to retreive reblogged statuses' do + it 'ignores reblogs if it failed to retrieve reblogged statuses' do stub_request(:get, 'https://overwatch.com/users/tracer/updates/1').to_return(status: 404) actor = Fabricate(:account, username: 'tracer', domain: 'overwatch.com') From 1d8b693d31512b25f90d63b5d879d97dba4044fe Mon Sep 17 00:00:00 2001 From: Yamagishi Kazutoshi Date: Fri, 14 Sep 2018 07:58:42 +0900 Subject: [PATCH 09/25] Weblate translations (2018-09-13) (#8692) * Translated using Weblate (Occitan) Currently translated at 99.9% (688 of 689 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/oc/ * Translated using Weblate (Spanish) Currently translated at 100,0% (334 of 334 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/es/ * Translated using Weblate (Spanish) Currently translated at 100.0% (334 of 334 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/es/ * Translated using Weblate (Spanish) Currently translated at 100,0% (83 of 83 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/es/ * Translated using Weblate (Spanish) Currently translated at 99.9% (688 of 689 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/es/ * Translated using Weblate (Serbian) Currently translated at 100.0% (334 of 334 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sr/ * Translated using Weblate (Serbian) Currently translated at 77.6% (535 of 689 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sr/ * Translated using Weblate (Serbian) Currently translated at 77.6% (535 of 689 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sr/ * Translated using Weblate (Danish) Currently translated at 100,0% (83 of 83 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/da/ * Translated using Weblate (French) Currently translated at 100,0% (83 of 83 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/fr/ * Translated using Weblate (Japanese) Currently translated at 94.0% (78 of 83 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ja/ * Translated using Weblate (German) Currently translated at 99.7% (687 of 689 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/de/ * Translated using Weblate (Slovak) Currently translated at 100.0% (334 of 334 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sk/ * Translated using Weblate (Slovak) Currently translated at 92.0% (634 of 689 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ * Translated using Weblate (French) Currently translated at 100.0% (334 of 334 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fr/ * Translated using Weblate (Serbian) Currently translated at 100.0% (334 of 334 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sr/ * Translated using Weblate (Serbian) Currently translated at 84,6% (583 of 689 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sr/ * Translated using Weblate (Slovak) Currently translated at 100.0% (334 of 334 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sk/ * Translated using Weblate (Serbian) Currently translated at 95,1% (655 of 689 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sr/ * Translated using Weblate (Chinese (Traditional)) Currently translated at 88.0% (606 of 689 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/zh_Hant/ * Translated using Weblate (Chinese (Traditional)) Currently translated at 99.7% (333 of 334 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/zh_Hant/ * Translated using Weblate (Serbian) Currently translated at 95,1% (655 of 689 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sr/ * Translated using Weblate (Chinese (Traditional)) Currently translated at 89.2% (74 of 83 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/zh_Hant/ * Translated using Weblate (Serbian) Currently translated at 96,1% (662 of 689 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sr/ * Translated using Weblate (Telugu) Currently translated at 100.0% (334 of 334 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/te/ * Translated using Weblate (Serbian) Currently translated at 96,1% (662 of 689 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sr/ * Translated using Weblate (Serbian) Currently translated at 96.7% (666 of 689 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sr/ * Translated using Weblate (Serbian) Currently translated at 96.7% (666 of 689 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sr/ * Translated using Weblate (Telugu) Currently translated at 100.0% (334 of 334 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/te/ * Translated using Weblate (Slovak) Currently translated at 92.0% (634 of 689 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ * Translated using Weblate (Romanian) Currently translated at 100.0% (334 of 334 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ro/ No need to be translated * Translated using Weblate (Romanian) Currently translated at 100.0% (334 of 334 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ro/ * Translated using Weblate (Romanian) Currently translated at 95.2% (79 of 83 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ro/ * Translated using Weblate (Slovak) Currently translated at 92.0% (634 of 689 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ * Translated using Weblate (Asturian) Currently translated at 44.6% (37 of 83 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ast/ * Translated using Weblate (Asturian) Currently translated at 46.9% (46 of 98 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/ast/ * Translated using Weblate (Asturian) Currently translated at 16.1% (10 of 62 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/ast/ * Translated using Weblate (Asturian) Currently translated at 50.0% (1 of 2 strings) Translation: Mastodon/Activerecord Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/activerecord/ast/ * Translated using Weblate (Asturian) Currently translated at 30.0% (207 of 689 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ast/ * Translated using Weblate (Asturian) Currently translated at 99.4% (332 of 334 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ast/ * Translated using Weblate (Asturian) Currently translated at 45.8% (38 of 83 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ast/ * Translated using Weblate (German) Currently translated at 99.9% (688 of 689 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/de/ * Translated using Weblate (German) Currently translated at 100.0% (334 of 334 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/de/ * Translated using Weblate (German) Currently translated at 100,0% (83 of 83 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/de/ * Translated using Weblate (German) Currently translated at 100.0% (83 of 83 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/de/ * Translated using Weblate (Slovak) Currently translated at 100.0% (334 of 334 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sk/ * Translated using Weblate (Romanian) Currently translated at 100.0% (334 of 334 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ro/ * Translated using Weblate (Italian) Currently translated at 100,0% (83 of 83 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/it/ * Translated using Weblate (Italian) Currently translated at 100.0% (83 of 83 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/it/ * Translated using Weblate (Italian) Currently translated at 100.0% (334 of 334 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/it/ * Translated using Weblate (Italian) Currently translated at 85.9% (592 of 689 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/it/ * Translated using Weblate (German) Currently translated at 100.0% (334 of 334 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/de/ * Translated using Weblate (Japanese) Currently translated at 95.2% (79 of 83 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ja/ * Added translation using Weblate (English (United Kingdom)) * Added translation using Weblate (English (United Kingdom)) * Translated using Weblate (Arabic) Currently translated at 97.0% (668 of 689 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/ * Translated using Weblate (Danish) Currently translated at 100.0% (334 of 334 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/da/ * Translated using Weblate (Danish) Currently translated at 100.0% (689 of 689 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/da/ * Translated using Weblate (Danish) Currently translated at 100.0% (83 of 83 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/da/ * Translated using Weblate (Arabic) Currently translated at 92.8% (77 of 83 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ar/ * Translated using Weblate (Serbian) Currently translated at 100.0% (334 of 334 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sr/ * Translated using Weblate (Slovak) Currently translated at 100.0% (83 of 83 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sk/ * Translated using Weblate (Slovak) Currently translated at 92.0% (634 of 689 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ * Translated using Weblate (Slovak) Currently translated at 95.2% (656 of 689 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ * Translated using Weblate (Danish) Currently translated at 100.0% (689 of 689 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/da/ * Translated using Weblate (Korean) Currently translated at 100.0% (689 of 689 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ko/ * Translated using Weblate (Chinese (Traditional)) Currently translated at 100.0% (334 of 334 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/zh_Hant/ * Translated using Weblate (Chinese (Traditional)) Currently translated at 100.0% (334 of 334 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/zh_Hant/ * Translated using Weblate (Chinese (Traditional)) Currently translated at 100.0% (83 of 83 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/zh_Hant/ * Translated using Weblate (Welsh) Currently translated at 8.4% (7 of 83 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/cy/ * Translated using Weblate (Welsh) Currently translated at 16.7% (115 of 689 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cy/ * Translated using Weblate (Welsh) Currently translated at 25.0% (172 of 689 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cy/ * Translated using Weblate (Welsh) Currently translated at 8.7% (29 of 334 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/cy/ * Translated using Weblate (Welsh) Currently translated at 25.1% (173 of 689 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cy/ * Translated using Weblate (Welsh) Currently translated at 33.8% (233 of 689 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cy/ * Translated using Weblate (Czech) Currently translated at 99.9% (688 of 689 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cs/ * Translated using Weblate (Welsh) Currently translated at 100.0% (2 of 2 strings) Translation: Mastodon/Activerecord Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/activerecord/cy/ * Translated using Weblate (Welsh) Currently translated at 43.5% (27 of 62 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/cy/ * Translated using Weblate (Arabic) Currently translated at 97.5% (672 of 689 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/ * Translated using Weblate (Serbian) Currently translated at 98.8% (681 of 689 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sr/ * Translated using Weblate (Slovak) Currently translated at 95.5% (658 of 689 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ * Translated using Weblate (Welsh) Currently translated at 74.2% (46 of 62 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/cy/ * i18n-tasks normalize && i18n-tasks remove-unsued * yarn manage:translations --- app/javascript/mastodon/locales/ast.json | 256 +++++----- app/javascript/mastodon/locales/cy.json | 44 +- app/javascript/mastodon/locales/da.json | 4 +- app/javascript/mastodon/locales/de.json | 24 +- .../mastodon/locales/defaultMessages.json | 9 + app/javascript/mastodon/locales/es.json | 120 ++--- app/javascript/mastodon/locales/fr.json | 10 +- app/javascript/mastodon/locales/it.json | 54 +-- app/javascript/mastodon/locales/ro.json | 446 +++++++++--------- app/javascript/mastodon/locales/sk.json | 46 +- app/javascript/mastodon/locales/sr.json | 62 +-- app/javascript/mastodon/locales/te.json | 58 +-- app/javascript/mastodon/locales/zh-TW.json | 12 +- config/locales/activerecord.ast.yml | 3 +- config/locales/activerecord.cy.yml | 12 +- config/locales/ar.yml | 49 +- config/locales/ast.yml | 15 +- config/locales/cs.yml | 8 +- config/locales/cy.yml | 155 +++++- config/locales/da.yml | 12 +- config/locales/de.yml | 3 +- config/locales/devise.ast.yml | 3 +- config/locales/devise.cy.yml | 58 +++ config/locales/doorkeeper.ast.yml | 3 +- config/locales/en_GB.yml | 1 + config/locales/es.yml | 112 ++++- config/locales/it.yml | 49 +- config/locales/ko.yml | 2 +- config/locales/oc.yml | 4 +- config/locales/simple_form.ar.yml | 2 +- config/locales/simple_form.ast.yml | 50 ++ config/locales/simple_form.cy.yml | 2 + config/locales/simple_form.da.yml | 3 +- config/locales/simple_form.de.yml | 1 + config/locales/simple_form.en_GB.yml | 1 + config/locales/simple_form.es.yml | 32 +- config/locales/simple_form.fr.yml | 1 + config/locales/simple_form.it.yml | 5 +- config/locales/simple_form.ja.yml | 1 + config/locales/simple_form.ro.yml | 93 +++- config/locales/simple_form.sk.yml | 1 + config/locales/simple_form.zh-TW.yml | 16 +- config/locales/sk.yml | 63 ++- config/locales/sr.yml | 292 +++++++++--- config/locales/zh-TW.yml | 18 +- 45 files changed, 1516 insertions(+), 699 deletions(-) create mode 100644 config/locales/en_GB.yml create mode 100644 config/locales/simple_form.en_GB.yml diff --git a/app/javascript/mastodon/locales/ast.json b/app/javascript/mastodon/locales/ast.json index da1ab62e60d..a44a06530d1 100644 --- a/app/javascript/mastodon/locales/ast.json +++ b/app/javascript/mastodon/locales/ast.json @@ -1,15 +1,15 @@ { - "account.badges.bot": "Bot", + "account.badges.bot": "Robó", "account.block": "Block @{name}", "account.block_domain": "Hide everything from {domain}", "account.blocked": "Blocked", "account.direct": "Direct message @{name}", "account.disclaimer_full": "Information below may reflect the user's profile incompletely.", "account.domain_blocked": "Domain hidden", - "account.edit_profile": "Edit profile", + "account.edit_profile": "Editar perfil", "account.endorse": "Feature on profile", "account.follow": "Follow", - "account.followers": "Followers", + "account.followers": "Siguidores", "account.followers.empty": "No one follows this user yet.", "account.follows": "Follows", "account.follows.empty": "This user doesn't follow anyone yet.", @@ -22,7 +22,7 @@ "account.mute_notifications": "Mute notifications from @{name}", "account.muted": "Muted", "account.posts": "Toots", - "account.posts_with_replies": "Toots and replies", + "account.posts_with_replies": "Toots y rempuestes", "account.report": "Report @{name}", "account.requested": "Awaiting approval. Click to cancel follow request", "account.share": "Share @{name}'s profile", @@ -34,141 +34,141 @@ "account.unmute": "Unmute @{name}", "account.unmute_notifications": "Unmute notifications from @{name}", "account.view_full_profile": "View full profile", - "alert.unexpected.message": "An unexpected error occurred.", - "alert.unexpected.title": "Oops!", - "boost_modal.combo": "You can press {combo} to skip this next time", + "alert.unexpected.message": "Asocedió un fallu inesperáu.", + "alert.unexpected.title": "¡Ups!", + "boost_modal.combo": "Pues primir {combo} pa saltar esto la próxima vegada", "bundle_column_error.body": "Something went wrong while loading this component.", "bundle_column_error.retry": "Try again", "bundle_column_error.title": "Network error", "bundle_modal_error.close": "Close", "bundle_modal_error.message": "Something went wrong while loading this component.", "bundle_modal_error.retry": "Try again", - "column.blocks": "Blocked users", + "column.blocks": "Usuarios bloquiaos", "column.community": "Local timeline", - "column.direct": "Direct messages", - "column.domain_blocks": "Hidden domains", - "column.favourites": "Favourites", - "column.follow_requests": "Follow requests", - "column.home": "Home", - "column.lists": "Lists", - "column.mutes": "Muted users", - "column.notifications": "Notifications", - "column.pins": "Pinned toot", - "column.public": "Federated timeline", - "column_back_button.label": "Back", + "column.direct": "Mensaxes direutos", + "column.domain_blocks": "Dominios anubríos", + "column.favourites": "Favoritos", + "column.follow_requests": "Solicitúes de siguimientu", + "column.home": "Aniciu", + "column.lists": "Llistes", + "column.mutes": "Usuarios silenciaos", + "column.notifications": "Avisos", + "column.pins": "Toots fixaos", + "column.public": "Llinia temporal federada", + "column_back_button.label": "Atrás", "column_header.hide_settings": "Hide settings", - "column_header.moveLeft_settings": "Move column to the left", - "column_header.moveRight_settings": "Move column to the right", + "column_header.moveLeft_settings": "Mover la columna a la esquierda", + "column_header.moveRight_settings": "Mover la columna a la drecha", "column_header.pin": "Pin", "column_header.show_settings": "Show settings", - "column_header.unpin": "Unpin", - "column_subheading.settings": "Settings", + "column_header.unpin": "Desfixar", + "column_subheading.settings": "Axustes", "community.column_settings.media_only": "Media Only", "compose_form.direct_message_warning": "This toot will only be sent to all the mentioned users.", "compose_form.direct_message_warning_learn_more": "Learn more", "compose_form.hashtag_warning": "This toot won't be listed under any hashtag as it is unlisted. Only public toots can be searched by hashtag.", "compose_form.lock_disclaimer": "Your account is not {locked}. Anyone can follow you to view your follower-only posts.", "compose_form.lock_disclaimer.lock": "locked", - "compose_form.placeholder": "What is on your mind?", + "compose_form.placeholder": "¿En qué pienses?", "compose_form.publish": "Toot", "compose_form.publish_loud": "{publish}!", "compose_form.sensitive.marked": "Media is marked as sensitive", "compose_form.sensitive.unmarked": "Media is not marked as sensitive", - "compose_form.spoiler.marked": "Text is hidden behind warning", - "compose_form.spoiler.unmarked": "Text is not hidden", - "compose_form.spoiler_placeholder": "Write your warning here", - "confirmation_modal.cancel": "Cancel", + "compose_form.spoiler.marked": "El testu nun va anubrise darrera d'una alvertencia", + "compose_form.spoiler.unmarked": "El testu va anubrise", + "compose_form.spoiler_placeholder": "Escribi equí l'avertencia", + "confirmation_modal.cancel": "Encaboxar", "confirmations.block.confirm": "Block", - "confirmations.block.message": "Are you sure you want to block {name}?", + "confirmations.block.message": "¿De xuru que quies bloquiar a {name}?", "confirmations.delete.confirm": "Delete", - "confirmations.delete.message": "Are you sure you want to delete this status?", + "confirmations.delete.message": "¿De xuru que quies desaniciar esti estáu?", "confirmations.delete_list.confirm": "Delete", - "confirmations.delete_list.message": "Are you sure you want to permanently delete this list?", + "confirmations.delete_list.message": "¿De xuru que quies desaniciar dafechu esta llista?", "confirmations.domain_block.confirm": "Hide entire domain", "confirmations.domain_block.message": "Are you really, really sure you want to block the entire {domain}? In most cases a few targeted blocks or mutes are sufficient and preferable. You will not see content from that domain in any public timelines or your notifications. Your followers from that domain will be removed.", "confirmations.mute.confirm": "Mute", - "confirmations.mute.message": "Are you sure you want to mute {name}?", + "confirmations.mute.message": "¿De xuru que quies silenciar a {name}?", "confirmations.redraft.confirm": "Delete & redraft", "confirmations.redraft.message": "Are you sure you want to delete this status and re-draft it? You will lose all replies, boosts and favourites to it.", "confirmations.unfollow.confirm": "Unfollow", "confirmations.unfollow.message": "Are you sure you want to unfollow {name}?", "embed.instructions": "Embed this status on your website by copying the code below.", "embed.preview": "Here is what it will look like:", - "emoji_button.activity": "Activity", + "emoji_button.activity": "Actividá", "emoji_button.custom": "Custom", - "emoji_button.flags": "Flags", - "emoji_button.food": "Food & Drink", + "emoji_button.flags": "Banderes", + "emoji_button.food": "Comída y bébora", "emoji_button.label": "Insert emoji", - "emoji_button.nature": "Nature", - "emoji_button.not_found": "No emojos!! (╯°□°）╯︵ ┻━┻", - "emoji_button.objects": "Objects", - "emoji_button.people": "People", + "emoji_button.nature": "Natura", + "emoji_button.not_found": "¡Nun hai fustaxes! (╯°□°）╯︵ ┻━┻", + "emoji_button.objects": "Oxetos", + "emoji_button.people": "Xente", "emoji_button.recent": "Frequently used", "emoji_button.search": "Search...", "emoji_button.search_results": "Search results", - "emoji_button.symbols": "Symbols", - "emoji_button.travel": "Travel & Places", - "empty_column.blocks": "You haven't blocked any users yet.", + "emoji_button.symbols": "Símbolos", + "emoji_button.travel": "Viaxes y llugares", + "empty_column.blocks": "Entá nun bloquiesti a dengún usuariu.", "empty_column.community": "The local timeline is empty. Write something publicly to get the ball rolling!", - "empty_column.direct": "You don't have any direct messages yet. When you send or receive one, it will show up here.", - "empty_column.domain_blocks": "There are no hidden domains yet.", + "empty_column.direct": "Entá nun tienes dengún mensaxe direutu. Cuando unvies o recibas dalgún, va apaecer equí", + "empty_column.domain_blocks": "Entá nun hai dominios anubríos.", "empty_column.favourited_statuses": "You don't have any favourite toots yet. When you favourite one, it will show up here.", "empty_column.favourites": "No one has favourited this toot yet. When someone does, they will show up here.", - "empty_column.follow_requests": "You don't have any follow requests yet. When you receive one, it will show up here.", + "empty_column.follow_requests": "Entá nun tienes denguna solicitú de siguimientu. Cuando recibas una, va amosase equí.", "empty_column.hashtag": "There is nothing in this hashtag yet.", "empty_column.home": "Your home timeline is empty! Visit {public} or use search to get started and meet other users.", - "empty_column.home.public_timeline": "the public timeline", + "empty_column.home.public_timeline": "la llinia temporal pública", "empty_column.list": "There is nothing in this list yet. When members of this list post new statuses, they will appear here.", - "empty_column.lists": "You don't have any lists yet. When you create one, it will show up here.", - "empty_column.mutes": "You haven't muted any users yet.", - "empty_column.notifications": "You don't have any notifications yet. Interact with others to start the conversation.", + "empty_column.lists": "Entá nun tienes denguna llista. Cuando crees una, va amosase equí.", + "empty_column.mutes": "Enta nun silenciesti a dengún usuariu.", + "empty_column.notifications": "Entá nun tienes dengún avisu. Interactua con otros p'aniciar la conversación.", "empty_column.public": "There is nothing here! Write something publicly, or manually follow users from other instances to fill it up", - "follow_request.authorize": "Authorize", - "follow_request.reject": "Reject", - "getting_started.developers": "Developers", - "getting_started.documentation": "Documentation", - "getting_started.find_friends": "Find friends from Twitter", + "follow_request.authorize": "Autorizar", + "follow_request.reject": "Refugar", + "getting_started.developers": "Desendolcadores", + "getting_started.documentation": "Documentación", + "getting_started.find_friends": "Alcontrar collacios de Twitter", "getting_started.heading": "Getting started", - "getting_started.invite": "Invite people", - "getting_started.open_source_notice": "Mastodon is open source software. You can contribute or report issues on GitHub at {github}.", - "getting_started.security": "Security", - "getting_started.terms": "Terms of service", + "getting_started.invite": "Convidar xente", + "getting_started.open_source_notice": "Mastodon ye software de códigu abiertu. Pues collaborar o informar de fallos en {github} (GitHub).", + "getting_started.security": "Seguranza", + "getting_started.terms": "Términos del serviciu", "home.column_settings.basic": "Basic", "home.column_settings.show_reblogs": "Show boosts", "home.column_settings.show_replies": "Show replies", - "keyboard_shortcuts.back": "to navigate back", - "keyboard_shortcuts.blocked": "to open blocked users list", + "keyboard_shortcuts.back": "pa dir p'atrás", + "keyboard_shortcuts.blocked": "p'abrir la llista d'usuarios bloquiaos", "keyboard_shortcuts.boost": "to boost", "keyboard_shortcuts.column": "to focus a status in one of the columns", "keyboard_shortcuts.compose": "to focus the compose textarea", - "keyboard_shortcuts.description": "Description", - "keyboard_shortcuts.direct": "to open direct messages column", - "keyboard_shortcuts.down": "to move down in the list", + "keyboard_shortcuts.description": "Descripción", + "keyboard_shortcuts.direct": "p'abrir la columna de los mensaxes direutos", + "keyboard_shortcuts.down": "pa baxar na llista", "keyboard_shortcuts.enter": "to open status", "keyboard_shortcuts.favourite": "to favourite", - "keyboard_shortcuts.favourites": "to open favourites list", - "keyboard_shortcuts.federated": "to open federated timeline", - "keyboard_shortcuts.heading": "Keyboard Shortcuts", - "keyboard_shortcuts.home": "to open home timeline", - "keyboard_shortcuts.hotkey": "Hotkey", - "keyboard_shortcuts.legend": "to display this legend", - "keyboard_shortcuts.local": "to open local timeline", - "keyboard_shortcuts.mention": "to mention author", - "keyboard_shortcuts.muted": "to open muted users list", + "keyboard_shortcuts.favourites": "p'abrir la llista de favoritos", + "keyboard_shortcuts.federated": "p'abrir la llinia temporal federada", + "keyboard_shortcuts.heading": "Atayos del tecláu", + "keyboard_shortcuts.home": "p'abrir la llinia temporal d'aniciu", + "keyboard_shortcuts.hotkey": "Atayu", + "keyboard_shortcuts.legend": "p'amosar esta lleenda", + "keyboard_shortcuts.local": "p'abrir la llinia temporal llocal", + "keyboard_shortcuts.mention": "pa mentar al autor", + "keyboard_shortcuts.muted": "p'abrir la llista d'usuarios silenciaos", "keyboard_shortcuts.my_profile": "to open your profile", - "keyboard_shortcuts.notifications": "to open notifications column", + "keyboard_shortcuts.notifications": "p'abrir la columna d'avisos", "keyboard_shortcuts.pinned": "to open pinned toots list", - "keyboard_shortcuts.profile": "to open author's profile", - "keyboard_shortcuts.reply": "to reply", - "keyboard_shortcuts.requests": "to open follow requests list", + "keyboard_shortcuts.profile": "p'abrir el perfil del autor", + "keyboard_shortcuts.reply": "pa responder", + "keyboard_shortcuts.requests": "p'abrir la llista de solicitúes de siguimientu", "keyboard_shortcuts.search": "to focus search", - "keyboard_shortcuts.start": "to open \"get started\" column", + "keyboard_shortcuts.start": "p'abrir la columna «entamar»", "keyboard_shortcuts.toggle_hidden": "to show/hide text behind CW", - "keyboard_shortcuts.toot": "to start a brand new toot", + "keyboard_shortcuts.toot": "p'apenzar un toot nuevu", "keyboard_shortcuts.unfocus": "to un-focus compose textarea/search", - "keyboard_shortcuts.up": "to move up in the list", + "keyboard_shortcuts.up": "pa xubir na llista", "lightbox.close": "Close", - "lightbox.next": "Next", + "lightbox.next": "Siguiente", "lightbox.previous": "Previous", "lists.account.add": "Add to list", "lists.account.remove": "Remove from list", @@ -180,55 +180,55 @@ "lists.subheading": "Your lists", "loading_indicator.label": "Loading...", "media_gallery.toggle_visible": "Toggle visibility", - "missing_indicator.label": "Not found", + "missing_indicator.label": "Nun s'alcontró", "missing_indicator.sublabel": "This resource could not be found", "mute_modal.hide_notifications": "Hide notifications from this user?", - "navigation_bar.apps": "Mobile apps", - "navigation_bar.blocks": "Blocked users", + "navigation_bar.apps": "Aplicaciones móviles", + "navigation_bar.blocks": "Usuarios bloquiaos", "navigation_bar.community_timeline": "Local timeline", "navigation_bar.compose": "Compose new toot", - "navigation_bar.direct": "Direct messages", + "navigation_bar.direct": "Mensaxes direutos", "navigation_bar.discover": "Discover", - "navigation_bar.domain_blocks": "Hidden domains", - "navigation_bar.edit_profile": "Edit profile", - "navigation_bar.favourites": "Favourites", + "navigation_bar.domain_blocks": "Dominios anubríos", + "navigation_bar.edit_profile": "Editar perfil", + "navigation_bar.favourites": "Favoritos", "navigation_bar.filters": "Muted words", - "navigation_bar.follow_requests": "Follow requests", - "navigation_bar.info": "About this instance", - "navigation_bar.keyboard_shortcuts": "Hotkeys", + "navigation_bar.follow_requests": "Solicitúes de siguimientu", + "navigation_bar.info": "Tocante a esta instancia", + "navigation_bar.keyboard_shortcuts": "Atayos", "navigation_bar.lists": "Lists", - "navigation_bar.logout": "Logout", - "navigation_bar.mutes": "Muted users", + "navigation_bar.logout": "Zarrar sesión", + "navigation_bar.mutes": "Usuarios silenciaos", "navigation_bar.personal": "Personal", - "navigation_bar.pins": "Pinned toots", - "navigation_bar.preferences": "Preferences", - "navigation_bar.public_timeline": "Federated timeline", - "navigation_bar.security": "Security", + "navigation_bar.pins": "Toots fixaos", + "navigation_bar.preferences": "Preferencies", + "navigation_bar.public_timeline": "Llinia temporal federada", + "navigation_bar.security": "Seguranza", "notification.favourite": "{name} favourited your status", - "notification.follow": "{name} followed you", - "notification.mention": "{name} mentioned you", + "notification.follow": "{name} siguióte", + "notification.mention": "{name} mentóte", "notification.reblog": "{name} boosted your status", - "notifications.clear": "Clear notifications", - "notifications.clear_confirmation": "Are you sure you want to permanently clear all your notifications?", - "notifications.column_settings.alert": "Desktop notifications", + "notifications.clear": "Llimpiar avisos", + "notifications.clear_confirmation": "¿De xuru que quies llimpiar dafechu tolos avisos?", + "notifications.column_settings.alert": "Avisos d'escritoriu", "notifications.column_settings.favourite": "Favourites:", - "notifications.column_settings.follow": "New followers:", - "notifications.column_settings.mention": "Mentions:", + "notifications.column_settings.follow": "Siguidores nuevos:", + "notifications.column_settings.mention": "Menciones:", "notifications.column_settings.push": "Push notifications", - "notifications.column_settings.push_meta": "This device", + "notifications.column_settings.push_meta": "Esti preséu", "notifications.column_settings.reblog": "Boosts:", - "notifications.column_settings.show": "Show in column", - "notifications.column_settings.sound": "Play sound", - "notifications.group": "{count} notifications", - "onboarding.done": "Done", - "onboarding.next": "Next", + "notifications.column_settings.show": "Amosar en columna", + "notifications.column_settings.sound": "Reproducir soníu", + "notifications.group": "{count} avisos", + "onboarding.done": "Fecho", + "onboarding.next": "Siguiente", "onboarding.page_five.public_timelines": "The local timeline shows public posts from everyone on {domain}. The federated timeline shows public posts from everyone who people on {domain} follow. These are the Public Timelines, a great way to discover new people.", - "onboarding.page_four.home": "The home timeline shows posts from people you follow.", + "onboarding.page_four.home": "La llinia temporal d'aniciu amuesa artículos de xente a la que sigues.", "onboarding.page_four.notifications": "The notifications column shows when someone interacts with you.", - "onboarding.page_one.federation": "Mastodon is a network of independent servers joining up to make one larger social network. We call these servers instances.", + "onboarding.page_one.federation": "Mastodon ye una rede de sividores independientes xuníos pa facer una rede social grande. Nós llamamos instancies a esos sirvidores.", "onboarding.page_one.full_handle": "Your full handle", "onboarding.page_one.handle_hint": "This is what you would tell your friends to search for.", - "onboarding.page_one.welcome": "Welcome to Mastodon!", + "onboarding.page_one.welcome": "¡Afáyate en Mastodon!", "onboarding.page_six.admin": "Your instance's admin is {admin}.", "onboarding.page_six.almost_done": "Almost done...", "onboarding.page_six.appetoot": "Bon Appetoot!", @@ -236,7 +236,7 @@ "onboarding.page_six.github": "Mastodon is free open-source software. You can report bugs, request features, or contribute to the code on {github}.", "onboarding.page_six.guidelines": "community guidelines", "onboarding.page_six.read_guidelines": "Please read {domain}'s {guidelines}!", - "onboarding.page_six.various_app": "mobile apps", + "onboarding.page_six.various_app": "aplicaciones móviles", "onboarding.page_three.profile": "Edit your profile to change your avatar, bio, and display name. There, you will also find other preferences.", "onboarding.page_three.search": "Use the search bar to find people and look at hashtags, such as {illustration} and {introductions}. To look for a person who is not on this instance, use their full handle.", "onboarding.page_two.compose": "Write posts from the compose column. You can upload images, change privacy settings, and add content warnings with the icons below.", @@ -245,7 +245,7 @@ "privacy.direct.long": "Post to mentioned users only", "privacy.direct.short": "Direct", "privacy.private.long": "Post to followers only", - "privacy.private.short": "Followers-only", + "privacy.private.short": "Namái siguidores", "privacy.public.long": "Post to public timelines", "privacy.public.short": "Public", "privacy.unlisted.long": "Do not show in public timelines", @@ -254,24 +254,24 @@ "regeneration_indicator.sublabel": "Your home feed is being prepared!", "relative_time.days": "{number}d", "relative_time.hours": "{number}h", - "relative_time.just_now": "now", + "relative_time.just_now": "agora", "relative_time.minutes": "{number}m", "relative_time.seconds": "{number}s", - "reply_indicator.cancel": "Cancel", + "reply_indicator.cancel": "Encaboxar", "report.forward": "Forward to {target}", "report.forward_hint": "The account is from another server. Send an anonymized copy of the report there as well?", "report.hint": "The report will be sent to your instance moderators. You can provide an explanation of why you are reporting this account below:", - "report.placeholder": "Additional comments", + "report.placeholder": "Comentarios adicionales", "report.submit": "Submit", "report.target": "Report {target}", "search.placeholder": "Search", "search_popout.search_format": "Advanced search format", "search_popout.tips.full_text": "Simple text returns statuses you have written, favourited, boosted, or have been mentioned in, as well as matching usernames, display names, and hashtags.", - "search_popout.tips.hashtag": "hashtag", - "search_popout.tips.status": "status", + "search_popout.tips.hashtag": "etiqueta", + "search_popout.tips.status": "estáu", "search_popout.tips.text": "Simple text returns matching display names, usernames and hashtags", - "search_popout.tips.user": "user", - "search_results.accounts": "People", + "search_popout.tips.user": "usuariu", + "search_results.accounts": "Xente", "search_results.hashtags": "Hashtags", "search_results.statuses": "Toots", "search_results.total": "{count, number} {count, plural, one {result} other {results}}", @@ -285,7 +285,7 @@ "status.embed": "Embed", "status.favourite": "Favourite", "status.filtered": "Filtered", - "status.load_more": "Load more", + "status.load_more": "Cargar más", "status.media_hidden": "Media hidden", "status.mention": "Mention @{name}", "status.more": "More", @@ -299,25 +299,25 @@ "status.reblogged_by": "{name} boosted", "status.reblogs.empty": "No one has boosted this toot yet. When someone does, they will show up here.", "status.redraft": "Delete & re-draft", - "status.reply": "Reply", + "status.reply": "Responder", "status.replyAll": "Reply to thread", "status.report": "Report @{name}", "status.sensitive_toggle": "Click to view", "status.sensitive_warning": "Sensitive content", "status.share": "Share", - "status.show_less": "Show less", + "status.show_less": "Amosar menos", "status.show_less_all": "Show less for all", - "status.show_more": "Show more", + "status.show_more": "Amosar más", "status.show_more_all": "Show more for all", "status.unmute_conversation": "Unmute conversation", "status.unpin": "Unpin from profile", "tabs_bar.federated_timeline": "Federated", - "tabs_bar.home": "Home", + "tabs_bar.home": "Aniciu", "tabs_bar.local_timeline": "Local", - "tabs_bar.notifications": "Notifications", + "tabs_bar.notifications": "Avisos", "tabs_bar.search": "Search", "trends.count_by_accounts": "{count} {rawCount, plural, one {person} other {people}} talking", - "ui.beforeunload": "Your draft will be lost if you leave Mastodon.", + "ui.beforeunload": "El borrador va perdese si coles de Mastodon.", "upload_area.title": "Drag & drop to upload", "upload_button.label": "Add media", "upload_form.description": "Describe for the visually impaired", diff --git a/app/javascript/mastodon/locales/cy.json b/app/javascript/mastodon/locales/cy.json index 26af4d8f016..c5ae58809b8 100644 --- a/app/javascript/mastodon/locales/cy.json +++ b/app/javascript/mastodon/locales/cy.json @@ -3,12 +3,12 @@ "account.block": "Block @{name}", "account.block_domain": "Hide everything from {domain}", "account.blocked": "Blocked", - "account.direct": "Direct message @{name}", + "account.direct": "Neges breifat @{name}", "account.disclaimer_full": "Information below may reflect the user's profile incompletely.", "account.domain_blocked": "Domain hidden", - "account.edit_profile": "Edit profile", + "account.edit_profile": "Golygu proffil", "account.endorse": "Feature on profile", - "account.follow": "Follow", + "account.follow": "Dilyn", "account.followers": "Followers", "account.followers.empty": "No one follows this user yet.", "account.follows": "Follows", @@ -21,7 +21,7 @@ "account.mute": "Mute @{name}", "account.mute_notifications": "Mute notifications from @{name}", "account.muted": "Muted", - "account.posts": "Toots", + "account.posts": "Twtiau", "account.posts_with_replies": "Toots and replies", "account.report": "Report @{name}", "account.requested": "Awaiting approval. Click to cancel follow request", @@ -102,9 +102,9 @@ "emoji_button.nature": "Nature", "emoji_button.not_found": "No emojos!! (╯°□°）╯︵ ┻━┻", "emoji_button.objects": "Objects", - "emoji_button.people": "People", + "emoji_button.people": "Pobl", "emoji_button.recent": "Frequently used", - "emoji_button.search": "Search...", + "emoji_button.search": "Chwilio...", "emoji_button.search_results": "Search results", "emoji_button.symbols": "Symbols", "emoji_button.travel": "Travel & Places", @@ -125,7 +125,7 @@ "empty_column.public": "There is nothing here! Write something publicly, or manually follow users from other instances to fill it up", "follow_request.authorize": "Authorize", "follow_request.reject": "Reject", - "getting_started.developers": "Developers", + "getting_started.developers": "Datblygwyr", "getting_started.documentation": "Documentation", "getting_started.find_friends": "Find friends from Twitter", "getting_started.heading": "Getting started", @@ -168,11 +168,11 @@ "keyboard_shortcuts.unfocus": "to un-focus compose textarea/search", "keyboard_shortcuts.up": "to move up in the list", "lightbox.close": "Close", - "lightbox.next": "Next", + "lightbox.next": "Nesaf", "lightbox.previous": "Previous", "lists.account.add": "Add to list", "lists.account.remove": "Remove from list", - "lists.delete": "Delete list", + "lists.delete": "Dileu rhestr", "lists.edit": "Edit list", "lists.new.create": "Add list", "lists.new.title_placeholder": "New list title", @@ -183,23 +183,23 @@ "missing_indicator.label": "Not found", "missing_indicator.sublabel": "This resource could not be found", "mute_modal.hide_notifications": "Hide notifications from this user?", - "navigation_bar.apps": "Mobile apps", + "navigation_bar.apps": "Apiau symudol", "navigation_bar.blocks": "Blocked users", "navigation_bar.community_timeline": "Local timeline", "navigation_bar.compose": "Compose new toot", "navigation_bar.direct": "Direct messages", "navigation_bar.discover": "Discover", "navigation_bar.domain_blocks": "Hidden domains", - "navigation_bar.edit_profile": "Edit profile", + "navigation_bar.edit_profile": "Golygu proffil", "navigation_bar.favourites": "Favourites", "navigation_bar.filters": "Muted words", "navigation_bar.follow_requests": "Follow requests", "navigation_bar.info": "About this instance", "navigation_bar.keyboard_shortcuts": "Hotkeys", - "navigation_bar.lists": "Lists", + "navigation_bar.lists": "Rhestrau", "navigation_bar.logout": "Logout", "navigation_bar.mutes": "Muted users", - "navigation_bar.personal": "Personal", + "navigation_bar.personal": "Personol", "navigation_bar.pins": "Pinned toots", "navigation_bar.preferences": "Preferences", "navigation_bar.public_timeline": "Federated timeline", @@ -221,7 +221,7 @@ "notifications.column_settings.sound": "Play sound", "notifications.group": "{count} notifications", "onboarding.done": "Done", - "onboarding.next": "Next", + "onboarding.next": "Nesaf", "onboarding.page_five.public_timelines": "The local timeline shows public posts from everyone on {domain}. The federated timeline shows public posts from everyone who people on {domain} follow. These are the Public Timelines, a great way to discover new people.", "onboarding.page_four.home": "The home timeline shows posts from people you follow.", "onboarding.page_four.notifications": "The notifications column shows when someone interacts with you.", @@ -249,7 +249,7 @@ "privacy.public.long": "Post to public timelines", "privacy.public.short": "Public", "privacy.unlisted.long": "Do not show in public timelines", - "privacy.unlisted.short": "Unlisted", + "privacy.unlisted.short": "Heb ei restru", "regeneration_indicator.label": "Loading…", "regeneration_indicator.sublabel": "Your home feed is being prepared!", "relative_time.days": "{number}d", @@ -264,16 +264,16 @@ "report.placeholder": "Additional comments", "report.submit": "Submit", "report.target": "Report {target}", - "search.placeholder": "Search", + "search.placeholder": "Chwilio", "search_popout.search_format": "Advanced search format", "search_popout.tips.full_text": "Simple text returns statuses you have written, favourited, boosted, or have been mentioned in, as well as matching usernames, display names, and hashtags.", "search_popout.tips.hashtag": "hashtag", - "search_popout.tips.status": "status", + "search_popout.tips.status": "statws", "search_popout.tips.text": "Simple text returns matching display names, usernames and hashtags", "search_popout.tips.user": "user", - "search_results.accounts": "People", + "search_results.accounts": "Pobl", "search_results.hashtags": "Hashtags", - "search_results.statuses": "Toots", + "search_results.statuses": "Twtiau", "search_results.total": "{count, number} {count, plural, one {result} other {results}}", "standalone.public_title": "A look inside...", "status.block": "Block @{name}", @@ -312,10 +312,10 @@ "status.unmute_conversation": "Unmute conversation", "status.unpin": "Unpin from profile", "tabs_bar.federated_timeline": "Federated", - "tabs_bar.home": "Home", - "tabs_bar.local_timeline": "Local", + "tabs_bar.home": "Hafan", + "tabs_bar.local_timeline": "Lleol", "tabs_bar.notifications": "Notifications", - "tabs_bar.search": "Search", + "tabs_bar.search": "Chwilio", "trends.count_by_accounts": "{count} {rawCount, plural, one {person} other {people}} talking", "ui.beforeunload": "Your draft will be lost if you leave Mastodon.", "upload_area.title": "Drag & drop to upload", diff --git a/app/javascript/mastodon/locales/da.json b/app/javascript/mastodon/locales/da.json index f5ce7d0b9dc..4663f331e33 100644 --- a/app/javascript/mastodon/locales/da.json +++ b/app/javascript/mastodon/locales/da.json @@ -200,7 +200,7 @@ "navigation_bar.logout": "Logud", "navigation_bar.mutes": "Dæmpede brugere", "navigation_bar.personal": "Personligt", - "navigation_bar.pins": "Fastgjorte toots", + "navigation_bar.pins": "Fastgjorte trut", "navigation_bar.preferences": "Præferencer", "navigation_bar.public_timeline": "Fælles tidslinje", "navigation_bar.security": "Sikkerhed", @@ -273,7 +273,7 @@ "search_popout.tips.user": "bruger", "search_results.accounts": "Folk", "search_results.hashtags": "Emnetags", - "search_results.statuses": "Toote", + "search_results.statuses": "Trut", "search_results.total": "{count, number} {count, plural, et {result} andre {results}}", "standalone.public_title": "Et kig indenfor...", "status.block": "Bloker @{name}", diff --git a/app/javascript/mastodon/locales/de.json b/app/javascript/mastodon/locales/de.json index 0bfdfc46a26..50b73e96820 100644 --- a/app/javascript/mastodon/locales/de.json +++ b/app/javascript/mastodon/locales/de.json @@ -113,7 +113,7 @@ "empty_column.direct": "Du hast noch keine Direktnachrichten erhalten. Wenn du eine sendest oder empfängst, wird sie hier zu sehen sein.", "empty_column.domain_blocks": "Es ist noch keine versteckten Domains.", "empty_column.favourited_statuses": "Du hast noch keine favorisierten Tröts. Wenn du einen favorisierst, wird er hier erscheinen.", - "empty_column.favourites": "Noch niemand hat diesen Tröt favorisiert. Sobald es jemand tut, wird das hier angezeigt.", + "empty_column.favourites": "Noch niemand hat diesen Beitrag favorisiert. Sobald es jemand tut, wird das hier angezeigt.", "empty_column.follow_requests": "Du hast noch keine Folge-Anfragen. Sobald du eine erhältst, wird sie hier angezeigt.", "empty_column.hashtag": "Unter diesem Hashtag gibt es noch nichts.", "empty_column.home": "Deine Startseite ist leer! Besuche {public} oder nutze die Suche, um loszulegen und andere Leute zu finden.", @@ -140,32 +140,32 @@ "keyboard_shortcuts.blocked": "Liste blockierter Profile öffnen", "keyboard_shortcuts.boost": "boosten", "keyboard_shortcuts.column": "einen Status in einer der Spalten fokussieren", - "keyboard_shortcuts.compose": "um das Textfeld zu fokussieren", + "keyboard_shortcuts.compose": "fokussiere das Tröt-Eingabefeld", "keyboard_shortcuts.description": "Beschreibung", "keyboard_shortcuts.direct": "Direct-Message-Spalte öffnen", "keyboard_shortcuts.down": "sich in der Liste hinunter bewegen", - "keyboard_shortcuts.enter": "um den Status zu öffnen", + "keyboard_shortcuts.enter": "Status öffnen", "keyboard_shortcuts.favourite": "um zu favorisieren", "keyboard_shortcuts.favourites": "Favoriten-Liste öffnen", "keyboard_shortcuts.federated": "Förderierte Zeitleiste öffnen", "keyboard_shortcuts.heading": "Tastenkombinationen", "keyboard_shortcuts.home": "Startseite öffnen", "keyboard_shortcuts.hotkey": "Tastenkürzel", - "keyboard_shortcuts.legend": "um diese Übersicht anzuzeigen", + "keyboard_shortcuts.legend": "diese Übersicht anzeigen", "keyboard_shortcuts.local": "Lokale Zeitleiste öffnen", "keyboard_shortcuts.mention": "um Autor_in zu erwähnen", "keyboard_shortcuts.muted": "Liste stummgeschalteter Profile öffnen", "keyboard_shortcuts.my_profile": "Dein Profil öffnen", "keyboard_shortcuts.notifications": "Benachrichtigungsspalte öffnen", "keyboard_shortcuts.pinned": "Liste angehefteter Tröts öffnen", - "keyboard_shortcuts.profile": "um Profil des Autors zu öffnen", - "keyboard_shortcuts.reply": "um zu antworten", + "keyboard_shortcuts.profile": "Profil des Autors öffnen", + "keyboard_shortcuts.reply": "antworten", "keyboard_shortcuts.requests": "Liste der Folge-Anfragen öffnen", - "keyboard_shortcuts.search": "um die Suche zu fokussieren", + "keyboard_shortcuts.search": "Suche fokussieren", "keyboard_shortcuts.start": "\"Erste Schritte-Spalte öffnen", - "keyboard_shortcuts.toggle_hidden": "um den Text hinter einer Inhaltswarnung zu verstecken oder ihn anzuzeigen", - "keyboard_shortcuts.toot": "um einen neuen Toot zu beginnen", - "keyboard_shortcuts.unfocus": "um das Textfeld/die Suche nicht mehr zu fokussieren", + "keyboard_shortcuts.toggle_hidden": "Text hinter einer Inhaltswarnung verstecken/anzeigen", + "keyboard_shortcuts.toot": "einen neuen Toot beginnen", + "keyboard_shortcuts.unfocus": "Textfeld/die Suche nicht mehr fokussieren", "keyboard_shortcuts.up": "sich in der Liste hinauf bewegen", "lightbox.close": "Schließen", "lightbox.next": "Weiter", @@ -186,7 +186,7 @@ "navigation_bar.apps": "Mobile Apps", "navigation_bar.blocks": "Blockierte Profile", "navigation_bar.community_timeline": "Lokale Zeitleiste", - "navigation_bar.compose": "Neuen Tröt verfassen", + "navigation_bar.compose": "Neuen Beitrag verfassen", "navigation_bar.direct": "Direktnachrichten", "navigation_bar.discover": "Entdecken", "navigation_bar.domain_blocks": "Versteckte Domains", @@ -297,7 +297,7 @@ "status.reblog": "Teilen", "status.reblog_private": "An das eigentliche Publikum teilen", "status.reblogged_by": "{name} teilte", - "status.reblogs.empty": "Diesen Tröt hat noch niemand geboostet. Sobald es jemand tut, wird er hier angezeigt.", + "status.reblogs.empty": "Diesen Beitrag hat noch niemand geboostet. Sobald es jemand tun, wird er hier angezeigt.", "status.redraft": "Löschen und neu erstellen", "status.reply": "Antworten", "status.replyAll": "Auf Thread antworten", diff --git a/app/javascript/mastodon/locales/defaultMessages.json b/app/javascript/mastodon/locales/defaultMessages.json index 2f5242e26c8..e19acf984c7 100644 --- a/app/javascript/mastodon/locales/defaultMessages.json +++ b/app/javascript/mastodon/locales/defaultMessages.json @@ -1821,6 +1821,15 @@ ], "path": "app/javascript/mastodon/features/ui/components/bundle_modal_error.json" }, + { + "descriptors": [ + { + "defaultMessage": "Toot", + "id": "compose_form.publish" + } + ], + "path": "app/javascript/mastodon/features/ui/components/columns_area.json" + }, { "descriptors": [ { diff --git a/app/javascript/mastodon/locales/es.json b/app/javascript/mastodon/locales/es.json index 07e110048a7..a08f16065ef 100644 --- a/app/javascript/mastodon/locales/es.json +++ b/app/javascript/mastodon/locales/es.json @@ -7,12 +7,12 @@ "account.disclaimer_full": "La siguiente información del usuario puede estar incompleta.", "account.domain_blocked": "Dominio oculto", "account.edit_profile": "Editar perfil", - "account.endorse": "Feature on profile", + "account.endorse": "Mostrar en perfil", "account.follow": "Seguir", "account.followers": "Seguidores", - "account.followers.empty": "No one follows this user yet.", + "account.followers.empty": "Nadie sigue a este usuario todavía.", "account.follows": "Sigue", - "account.follows.empty": "This user doesn't follow anyone yet.", + "account.follows.empty": "Este usuario todavía no sigue a nadie.", "account.follows_you": "Te sigue", "account.hide_reblogs": "Ocultar retoots de @{name}", "account.media": "Media", @@ -29,12 +29,12 @@ "account.show_reblogs": "Mostrar retoots de @{name}", "account.unblock": "Desbloquear a @{name}", "account.unblock_domain": "Mostrar a {domain}", - "account.unendorse": "Don't feature on profile", + "account.unendorse": "No mostrar en el perfil", "account.unfollow": "Dejar de seguir", "account.unmute": "Dejar de silenciar a @{name}", "account.unmute_notifications": "Dejar de silenciar las notificaciones de @{name}", "account.view_full_profile": "Ver perfil completo", - "alert.unexpected.message": "An unexpected error occurred.", + "alert.unexpected.message": "Hubo un error inesperado.", "alert.unexpected.title": "Oops!", "boost_modal.combo": "Puedes presionar {combo} para saltear este aviso la próxima vez", "bundle_column_error.body": "Algo salió mal al cargar este componente.", @@ -45,8 +45,8 @@ "bundle_modal_error.retry": "Inténtalo de nuevo", "column.blocks": "Usuarios bloqueados", "column.community": "Línea de tiempo local", - "column.direct": "Direct messages", - "column.domain_blocks": "Hidden domains", + "column.direct": "Mensajes directos", + "column.domain_blocks": "Dominios ocultos", "column.favourites": "Favoritos", "column.follow_requests": "Solicitudes de seguimiento", "column.home": "Inicio", @@ -63,9 +63,9 @@ "column_header.show_settings": "Mostrar ajustes", "column_header.unpin": "Dejar de fijar", "column_subheading.settings": "Ajustes", - "community.column_settings.media_only": "Media Only", - "compose_form.direct_message_warning": "This toot will only be visible to all the mentioned users.", - "compose_form.direct_message_warning_learn_more": "Learn more", + "community.column_settings.media_only": "Solo media", + "compose_form.direct_message_warning": "Este toot solo será enviado a los usuarios mencionados.", + "compose_form.direct_message_warning_learn_more": "Aprender mas", "compose_form.hashtag_warning": "Este toot no se mostrará bajo hashtags porque no es público. Sólo los toots públicos se pueden buscar por hashtag.", "compose_form.lock_disclaimer": "Tu cuenta no está bloqueada. Todos pueden seguirte para ver tus toots solo para seguidores.", "compose_form.lock_disclaimer.lock": "bloqueado", @@ -85,11 +85,11 @@ "confirmations.delete_list.confirm": "Delete", "confirmations.delete_list.message": "¿Seguro que quieres borrar esta lista permanentemente?", "confirmations.domain_block.confirm": "Ocultar dominio entero", - "confirmations.domain_block.message": "¿Seguro de que quieres bloquear al dominio entero? En algunos casos es preferible bloquear o silenciar objetivos determinados.", + "confirmations.domain_block.message": "¿Seguro de que quieres bloquear al dominio {domain} entero? En general unos cuantos bloqueos y silenciados concretos es suficiente y preferible.", "confirmations.mute.confirm": "Silenciar", "confirmations.mute.message": "¿Estás seguro de que quieres silenciar a {name}?", - "confirmations.redraft.confirm": "Delete & redraft", - "confirmations.redraft.message": "Are you sure you want to delete this status and re-draft it? You will lose all replies, boosts and favourites to it.", + "confirmations.redraft.confirm": "Borrar y volver a borrador", + "confirmations.redraft.message": "Estás seguro de que quieres borrar este estado y volverlo a borrador? Perderás todas las respuestas, impulsos y favoritos asociados a él, y las respuestas a la publicación original quedarán huérfanos.", "confirmations.unfollow.confirm": "Dejar de seguir", "confirmations.unfollow.message": "¿Estás seguro de que quieres dejar de seguir a {name}?", "embed.instructions": "Añade este toot a tu sitio web con el siguiente código.", @@ -108,62 +108,62 @@ "emoji_button.search_results": "Resultados de búsqueda", "emoji_button.symbols": "Símbolos", "emoji_button.travel": "Viajes y lugares", - "empty_column.blocks": "You haven't blocked any users yet.", + "empty_column.blocks": "Aún no has bloqueado a ningún usuario.", "empty_column.community": "La línea de tiempo local está vacía. ¡Escribe algo para empezar la fiesta!", - "empty_column.direct": "You don't have any direct messages yet. When you send or receive one, it will show up here.", - "empty_column.domain_blocks": "There are no hidden domains yet.", - "empty_column.favourited_statuses": "You don't have any favourite toots yet. When you favourite one, it will show up here.", - "empty_column.favourites": "No one has favourited this toot yet. When someone does, they will show up here.", - "empty_column.follow_requests": "You don't have any follow requests yet. When you receive one, it will show up here.", + "empty_column.direct": "Aún no tienes ningún mensaje directo. Cuando envíes o recibas uno, se mostrará aquí.", + "empty_column.domain_blocks": "Todavía no hay dominios ocultos.", + "empty_column.favourited_statuses": "Aún no tienes toots preferidos. Cuando marques uno como favorito, aparecerá aquí.", + "empty_column.favourites": "Nadie ha marcado este toot como preferido. Cuando alguien lo haga, aparecerá aquí.", + "empty_column.follow_requests": "No tienes ninguna petición de seguidor. Cuando recibas una, se mostrará aquí.", "empty_column.hashtag": "No hay nada en este hashtag aún.", "empty_column.home": "No estás siguiendo a nadie aún. Visita {public} o haz búsquedas para empezar y conocer gente nueva.", "empty_column.home.public_timeline": "la línea de tiempo pública", "empty_column.list": "No hay nada en esta lista aún. Cuando miembros de esta lista publiquen nuevos estatus, estos aparecerán qui.", - "empty_column.lists": "You don't have any lists yet. When you create one, it will show up here.", - "empty_column.mutes": "You haven't muted any users yet.", + "empty_column.lists": "No tienes ninguna lista. cuando crees una, se mostrará aquí.", + "empty_column.mutes": "Aún no has silenciado a ningún usuario.", "empty_column.notifications": "No tienes ninguna notificación aún. Interactúa con otros para empezar una conversación.", "empty_column.public": "¡No hay nada aquí! Escribe algo públicamente, o sigue usuarios de otras instancias manualmente para llenarlo", "follow_request.authorize": "Autorizar", "follow_request.reject": "Rechazar", - "getting_started.developers": "Developers", + "getting_started.developers": "Desarrolladores", "getting_started.documentation": "Documentation", - "getting_started.find_friends": "Find friends from Twitter", + "getting_started.find_friends": "Encuentra a tus amigos desde Twitter", "getting_started.heading": "Primeros pasos", - "getting_started.invite": "Invite people", + "getting_started.invite": "Invitar usuarios", "getting_started.open_source_notice": "Mastodon es software libre. Puedes contribuir o reportar errores en {github}.", - "getting_started.security": "Security", - "getting_started.terms": "Terms of service", + "getting_started.security": "Seguridad", + "getting_started.terms": "Términos de servicio", "home.column_settings.basic": "Básico", "home.column_settings.show_reblogs": "Mostrar retoots", "home.column_settings.show_replies": "Mostrar respuestas", "keyboard_shortcuts.back": "volver atrás", - "keyboard_shortcuts.blocked": "to open blocked users list", + "keyboard_shortcuts.blocked": "abrir una lista de usuarios bloqueados", "keyboard_shortcuts.boost": "retootear", "keyboard_shortcuts.column": "enfocar un estado en una de las columnas", "keyboard_shortcuts.compose": "enfocar el área de texto de redacción", "keyboard_shortcuts.description": "Description", - "keyboard_shortcuts.direct": "to open direct messages column", + "keyboard_shortcuts.direct": "abrir la columna de mensajes directos", "keyboard_shortcuts.down": "mover hacia abajo en la lista", "keyboard_shortcuts.enter": "to open status", "keyboard_shortcuts.favourite": "añadir a favoritos", - "keyboard_shortcuts.favourites": "to open favourites list", - "keyboard_shortcuts.federated": "to open federated timeline", + "keyboard_shortcuts.favourites": "abrir la lista de favoritos", + "keyboard_shortcuts.federated": "abrir el timeline federado", "keyboard_shortcuts.heading": "Keyboard Shortcuts", - "keyboard_shortcuts.home": "to open home timeline", + "keyboard_shortcuts.home": "abrir el timeline propio", "keyboard_shortcuts.hotkey": "Tecla caliente", "keyboard_shortcuts.legend": "para mostrar esta leyenda", - "keyboard_shortcuts.local": "to open local timeline", + "keyboard_shortcuts.local": "abrir el timeline local", "keyboard_shortcuts.mention": "para mencionar al autor", - "keyboard_shortcuts.muted": "to open muted users list", - "keyboard_shortcuts.my_profile": "to open your profile", - "keyboard_shortcuts.notifications": "to open notifications column", - "keyboard_shortcuts.pinned": "to open pinned toots list", - "keyboard_shortcuts.profile": "to open author's profile", + "keyboard_shortcuts.muted": "abrir la lista de usuarios silenciados", + "keyboard_shortcuts.my_profile": "abrir tu perfil", + "keyboard_shortcuts.notifications": "abrir la columna de notificaciones", + "keyboard_shortcuts.pinned": "abrir la lista de toots destacados", + "keyboard_shortcuts.profile": "abrir el perfil del autor", "keyboard_shortcuts.reply": "para responder", - "keyboard_shortcuts.requests": "to open follow requests list", + "keyboard_shortcuts.requests": "abrir la lista de peticiones de seguidores", "keyboard_shortcuts.search": "para poner el foco en la búsqueda", - "keyboard_shortcuts.start": "to open \"get started\" column", - "keyboard_shortcuts.toggle_hidden": "to show/hide text behind CW", + "keyboard_shortcuts.start": "abrir la columna \"comenzar\"", + "keyboard_shortcuts.toggle_hidden": "mostrar/ocultar texto tras aviso de contenido (CW)", "keyboard_shortcuts.toot": "para comenzar un nuevo toot", "keyboard_shortcuts.unfocus": "para retirar el foco de la caja de redacción/búsqueda", "keyboard_shortcuts.up": "para ir hacia arriba en la lista", @@ -183,19 +183,19 @@ "missing_indicator.label": "No encontrado", "missing_indicator.sublabel": "No se encontró este recurso", "mute_modal.hide_notifications": "Ocultar notificaciones de este usuario?", - "navigation_bar.apps": "Mobile apps", + "navigation_bar.apps": "Aplicaciones móviles", "navigation_bar.blocks": "Usuarios bloqueados", "navigation_bar.community_timeline": "Historia local", - "navigation_bar.compose": "Compose new toot", - "navigation_bar.direct": "Direct messages", - "navigation_bar.discover": "Discover", - "navigation_bar.domain_blocks": "Hidden domains", + "navigation_bar.compose": "Escribir un nuevo toot", + "navigation_bar.direct": "Mensajes directos", + "navigation_bar.discover": "Descubrir", + "navigation_bar.domain_blocks": "Dominios ocultos", "navigation_bar.edit_profile": "Editar perfil", "navigation_bar.favourites": "Favoritos", - "navigation_bar.filters": "Muted words", + "navigation_bar.filters": "Palabras silenciadas", "navigation_bar.follow_requests": "Solicitudes para seguirte", "navigation_bar.info": "Información adicional", - "navigation_bar.keyboard_shortcuts": "Atajos de teclado", + "navigation_bar.keyboard_shortcuts": "Atajos", "navigation_bar.lists": "Listas", "navigation_bar.logout": "Cerrar sesión", "navigation_bar.mutes": "Usuarios silenciados", @@ -203,7 +203,7 @@ "navigation_bar.pins": "Toots fijados", "navigation_bar.preferences": "Preferencias", "navigation_bar.public_timeline": "Historia federada", - "navigation_bar.security": "Security", + "navigation_bar.security": "Seguridad", "notification.favourite": "{name} marcó tu estado como favorito", "notification.follow": "{name} te empezó a seguir", "notification.mention": "{name} te ha mencionado", @@ -219,7 +219,7 @@ "notifications.column_settings.reblog": "Retoots:", "notifications.column_settings.show": "Mostrar en columna", "notifications.column_settings.sound": "Reproducir sonido", - "notifications.group": "{count} notifications", + "notifications.group": "{count} notificaciones", "onboarding.done": "Listo", "onboarding.next": "Siguiente", "onboarding.page_five.public_timelines": "La línea de tiempo local muestra toots públicos de todos en {domain}. La línea de tiempo federada muestra toots públicos de cualquiera a quien la gente de {domain} siga. Estas son las líneas de tiempo públicas, una buena forma de conocer gente nueva.", @@ -272,19 +272,19 @@ "search_popout.tips.text": "El texto simple devuelve correspondencias de nombre, usuario y hashtag", "search_popout.tips.user": "usuario", "search_results.accounts": "Gente", - "search_results.hashtags": "Hashtags", + "search_results.hashtags": "Etiquetas", "search_results.statuses": "Toots", "search_results.total": "{count, number} {count, plural, one {resultado} other {resultados}}", "standalone.public_title": "Un pequeño vistazo...", "status.block": "Block @{name}", - "status.cancel_reblog_private": "Unboost", + "status.cancel_reblog_private": "Des-impulsar", "status.cannot_reblog": "Este toot no puede retootearse", "status.delete": "Borrar", - "status.detailed_status": "Detailed conversation view", - "status.direct": "Direct message @{name}", + "status.detailed_status": "Vista de conversación detallada", + "status.direct": "Mensaje directo a @{name}", "status.embed": "Incrustado", "status.favourite": "Favorito", - "status.filtered": "Filtered", + "status.filtered": "Filtrado", "status.load_more": "Cargar más", "status.media_hidden": "Contenido multimedia oculto", "status.mention": "Mencionar", @@ -295,10 +295,10 @@ "status.pin": "Fijar", "status.pinned": "Toot fijado", "status.reblog": "Retootear", - "status.reblog_private": "Boost to original audience", + "status.reblog_private": "Implusar a la audiencia original", "status.reblogged_by": "Retooteado por {name}", - "status.reblogs.empty": "No one has boosted this toot yet. When someone does, they will show up here.", - "status.redraft": "Delete & re-draft", + "status.reblogs.empty": "Nadie impulsó este toot todavía. Cuando alguien lo haga, aparecerá aqui.", + "status.redraft": "Borrar y volver a borrador", "status.reply": "Responder", "status.replyAll": "Responder al hilo", "status.report": "Reportar", @@ -315,14 +315,14 @@ "tabs_bar.home": "Inicio", "tabs_bar.local_timeline": "Local", "tabs_bar.notifications": "Notificaciones", - "tabs_bar.search": "Search", + "tabs_bar.search": "Buscar", "trends.count_by_accounts": "{count} {rawCount, plural, one {person} other {people}} talking", "ui.beforeunload": "Tu borrador se perderá si sales de Mastodon.", "upload_area.title": "Arrastra y suelta para subir", - "upload_button.label": "Subir multimedia", + "upload_button.label": "Subir multimedia (JPEG, PNG, GIF, WebM, MP4, MOV)", "upload_form.description": "Describir para los usuarios con dificultad visual", "upload_form.focus": "Recortar", - "upload_form.undo": "Deshacer", + "upload_form.undo": "Borrar", "upload_progress.label": "Subiendo…", "video.close": "Cerrar video", "video.exit_fullscreen": "Salir de pantalla completa", diff --git a/app/javascript/mastodon/locales/fr.json b/app/javascript/mastodon/locales/fr.json index e77d0028664..aec6816ac31 100644 --- a/app/javascript/mastodon/locales/fr.json +++ b/app/javascript/mastodon/locales/fr.json @@ -147,22 +147,22 @@ "keyboard_shortcuts.enter": "pour ouvrir le statut", "keyboard_shortcuts.favourite": "vers les favoris", "keyboard_shortcuts.favourites": "pour ouvrir une liste de favoris", - "keyboard_shortcuts.federated": "to open federated timeline", + "keyboard_shortcuts.federated": "pour ouvrir le fil public global", "keyboard_shortcuts.heading": "Raccourcis clavier", - "keyboard_shortcuts.home": "to open home timeline", + "keyboard_shortcuts.home": "pour ouvrir l'accueil", "keyboard_shortcuts.hotkey": "Raccourci", "keyboard_shortcuts.legend": "pour afficher cette légende", - "keyboard_shortcuts.local": "to open local timeline", + "keyboard_shortcuts.local": "pour ouvrir le fil public local", "keyboard_shortcuts.mention": "pour mentionner l’auteur·rice", "keyboard_shortcuts.muted": "pour ouvrir la liste des utilisateurs rendus muets", "keyboard_shortcuts.my_profile": "pour ouvrir votre profil", "keyboard_shortcuts.notifications": "pour ouvrir votre colonne de notifications", - "keyboard_shortcuts.pinned": "to open pinned toots list", + "keyboard_shortcuts.pinned": "pour ouvrir une liste des pouets épinglés", "keyboard_shortcuts.profile": "pour ouvrir le profil de l’auteur·rice", "keyboard_shortcuts.reply": "pour répondre", "keyboard_shortcuts.requests": "pour ouvrir la liste de demandes de suivi", "keyboard_shortcuts.search": "pour cibler la recherche", - "keyboard_shortcuts.start": "to open \"get started\" column", + "keyboard_shortcuts.start": "pour ouvrir la colonne \"pour commencer\"", "keyboard_shortcuts.toggle_hidden": "pour afficher/cacher un texte derrière CW", "keyboard_shortcuts.toot": "pour démarrer un tout nouveau pouet", "keyboard_shortcuts.unfocus": "pour recentrer composer textarea/search", diff --git a/app/javascript/mastodon/locales/it.json b/app/javascript/mastodon/locales/it.json index fa0956fe341..2aa7467c0c0 100644 --- a/app/javascript/mastodon/locales/it.json +++ b/app/javascript/mastodon/locales/it.json @@ -7,12 +7,12 @@ "account.disclaimer_full": "Il profilo dell'utente mostrato qui sotto potrebbe essere incompleto.", "account.domain_blocked": "Dominio nascosto", "account.edit_profile": "Modifica profilo", - "account.endorse": "Feature on profile", + "account.endorse": "Metti in evidenza sul profilo", "account.follow": "Segui", "account.followers": "Seguaci", - "account.followers.empty": "No one follows this user yet.", + "account.followers.empty": "Ancora nessuno segue questo utente.", "account.follows": "Segue", - "account.follows.empty": "This user doesn't follow anyone yet.", + "account.follows.empty": "Questo utente non segue ancora nessuno.", "account.follows_you": "Ti segue", "account.hide_reblogs": "Nascondi condivisioni da @{name}", "account.media": "Media", @@ -29,7 +29,7 @@ "account.show_reblogs": "Mostra condivisioni da @{name}", "account.unblock": "Sblocca @{name}", "account.unblock_domain": "Non nascondere {domain}", - "account.unendorse": "Don't feature on profile", + "account.unendorse": "Non mettere in evidenza sul profilo", "account.unfollow": "Non seguire", "account.unmute": "Non silenziare @{name}", "account.unmute_notifications": "Non silenziare più le notifiche da @{name}", @@ -108,19 +108,19 @@ "emoji_button.search_results": "Risultati della ricerca", "emoji_button.symbols": "Simboli", "emoji_button.travel": "Viaggi e luoghi", - "empty_column.blocks": "You haven't blocked any users yet.", + "empty_column.blocks": "Non hai ancora bloccato nessun utente.", "empty_column.community": "La timeline locale è vuota. Condividi qualcosa pubblicamente per dare inizio alla festa!", "empty_column.direct": "Non hai ancora nessun messaggio diretto. Quando ne manderai o riceverai qualcuno, apparirà qui.", - "empty_column.domain_blocks": "There are no hidden domains yet.", - "empty_column.favourited_statuses": "You don't have any favourite toots yet. When you favourite one, it will show up here.", - "empty_column.favourites": "No one has favourited this toot yet. When someone does, they will show up here.", - "empty_column.follow_requests": "You don't have any follow requests yet. When you receive one, it will show up here.", + "empty_column.domain_blocks": "Non vi sono domini nascosti.", + "empty_column.favourited_statuses": "Non hai ancora segnato nessun toot come apprezzato. Quando lo farai, comparirà qui.", + "empty_column.favourites": "Nessuno ha ancora segnato questo toot come apprezzato. Quando qualcuno lo farà, apparirà qui.", + "empty_column.follow_requests": "Non hai ancora ricevuto nessuna richiesta di seguirti. Quando ne arriveranno, saranno mostrate qui.", "empty_column.hashtag": "Non c'è ancora nessun post con questo hashtag.", "empty_column.home": "Non stai ancora seguendo nessuno. Visita {public} o usa la ricerca per incontrare nuove persone.", "empty_column.home.public_timeline": "la timeline pubblica", "empty_column.list": "Non c'è niente in questo elenco ancora. Quando i membri di questo elenco postano nuovi stati, questi appariranno qui.", - "empty_column.lists": "You don't have any lists yet. When you create one, it will show up here.", - "empty_column.mutes": "You haven't muted any users yet.", + "empty_column.lists": "Non hai ancora nessuna lista. Quando ne creerai qualcuna, comparirà qui.", + "empty_column.mutes": "Non hai ancora silenziato nessun utente.", "empty_column.notifications": "Non hai ancora nessuna notifica. Interagisci con altri per iniziare conversazioni.", "empty_column.public": "Qui non c'è nulla! Scrivi qualcosa pubblicamente, o aggiungi utenti da altri server per riempire questo spazio", "follow_request.authorize": "Autorizza", @@ -137,32 +137,32 @@ "home.column_settings.show_reblogs": "Mostra post condivisi", "home.column_settings.show_replies": "Mostra risposte", "keyboard_shortcuts.back": "per tornare indietro", - "keyboard_shortcuts.blocked": "to open blocked users list", + "keyboard_shortcuts.blocked": "per aprire l'elenco degli utenti bloccati", "keyboard_shortcuts.boost": "per condividere", "keyboard_shortcuts.column": "per portare il focus su uno status in una delle colonne", "keyboard_shortcuts.compose": "per portare il focus nell'area di composizione", "keyboard_shortcuts.description": "Descrizione", - "keyboard_shortcuts.direct": "to open direct messages column", + "keyboard_shortcuts.direct": "per aprire la colonna dei messaggi diretti", "keyboard_shortcuts.down": "per spostarsi in basso nella lista", "keyboard_shortcuts.enter": "per aprire lo status", "keyboard_shortcuts.favourite": "per segnare come apprezzato", - "keyboard_shortcuts.favourites": "to open favourites list", - "keyboard_shortcuts.federated": "to open federated timeline", + "keyboard_shortcuts.favourites": "per aprire l'elenco dei toot apprezzati", + "keyboard_shortcuts.federated": "per aprire la timeline federata", "keyboard_shortcuts.heading": "Tasti di scelta rapida", - "keyboard_shortcuts.home": "to open home timeline", + "keyboard_shortcuts.home": "per aprire la timeline home", "keyboard_shortcuts.hotkey": "Tasto di scelta rapida", "keyboard_shortcuts.legend": "per mostrare questa spiegazione", - "keyboard_shortcuts.local": "to open local timeline", + "keyboard_shortcuts.local": "per aprire la timeline locale", "keyboard_shortcuts.mention": "per menzionare l'autore", - "keyboard_shortcuts.muted": "to open muted users list", - "keyboard_shortcuts.my_profile": "to open your profile", - "keyboard_shortcuts.notifications": "to open notifications column", - "keyboard_shortcuts.pinned": "to open pinned toots list", + "keyboard_shortcuts.muted": "per aprire l'elenco degli utenti silenziati", + "keyboard_shortcuts.my_profile": "per aprire il tuo profilo", + "keyboard_shortcuts.notifications": "per aprire la colonna delle notifiche", + "keyboard_shortcuts.pinned": "per aprire l'elenco dei toot fissati in cima", "keyboard_shortcuts.profile": "per aprire il profilo dell'autore", "keyboard_shortcuts.reply": "per rispondere", - "keyboard_shortcuts.requests": "to open follow requests list", + "keyboard_shortcuts.requests": "per aprire l'elenco delle richieste di seguirti", "keyboard_shortcuts.search": "per spostare il focus sulla ricerca", - "keyboard_shortcuts.start": "to open \"get started\" column", + "keyboard_shortcuts.start": "per aprire la colonna \"Come iniziare\"", "keyboard_shortcuts.toggle_hidden": "per mostrare/nascondere il testo dei CW", "keyboard_shortcuts.toot": "per iniziare a scrivere un toot completamente nuovo", "keyboard_shortcuts.unfocus": "per uscire dall'area di composizione o dalla ricerca", @@ -183,10 +183,10 @@ "missing_indicator.label": "Non trovato", "missing_indicator.sublabel": "Risorsa non trovata", "mute_modal.hide_notifications": "Nascondere le notifiche da quest'utente?", - "navigation_bar.apps": "Mobile apps", + "navigation_bar.apps": "App per dispositivi mobili", "navigation_bar.blocks": "Utenti bloccati", "navigation_bar.community_timeline": "Timeline locale", - "navigation_bar.compose": "Compose new toot", + "navigation_bar.compose": "Componi nuovo toot", "navigation_bar.direct": "Messaggi diretti", "navigation_bar.discover": "Scopri", "navigation_bar.domain_blocks": "Domini nascosti", @@ -280,7 +280,7 @@ "status.cancel_reblog_private": "Annulla condivisione", "status.cannot_reblog": "Questo post non può essere condiviso", "status.delete": "Elimina", - "status.detailed_status": "Detailed conversation view", + "status.detailed_status": "Vista conversazione dettagliata", "status.direct": "Messaggio diretto @{name}", "status.embed": "Incorpora", "status.favourite": "Apprezzato", @@ -297,7 +297,7 @@ "status.reblog": "Condividi", "status.reblog_private": "Condividi con i destinatari iniziali", "status.reblogged_by": "{name} ha condiviso", - "status.reblogs.empty": "No one has boosted this toot yet. When someone does, they will show up here.", + "status.reblogs.empty": "Nessuno ha ancora condiviso questo toot. Quando qualcuno lo farà, comparirà qui.", "status.redraft": "Cancella e riscrivi", "status.reply": "Rispondi", "status.replyAll": "Rispondi alla conversazione", diff --git a/app/javascript/mastodon/locales/ro.json b/app/javascript/mastodon/locales/ro.json index f3c540f2ead..c3683aa613e 100644 --- a/app/javascript/mastodon/locales/ro.json +++ b/app/javascript/mastodon/locales/ro.json @@ -1,145 +1,145 @@ { "account.badges.bot": "Bot", - "account.block": "Blocheaza @{name}", + "account.block": "Blochează @{name}", "account.block_domain": "Ascunde tot de la {domain}", "account.blocked": "Blocat", "account.direct": "Mesaj direct @{name}", - "account.disclaimer_full": "Informatiile de la jos pot reflecta profilul incomplet al utilizatorului.", + "account.disclaimer_full": "Informațiile de mai jos pot reflecta profilul incomplet al utilizatorului.", "account.domain_blocked": "Domeniu ascuns", - "account.edit_profile": "Editeaza profilul", - "account.endorse": "Promoveaza pe profil", - "account.follow": "Urmareste", - "account.followers": "Urmaritori", - "account.followers.empty": "Nimeni nu urmareste acest utilizator inca.", - "account.follows": "Urmareste", - "account.follows.empty": "Acest utilizator nu urmareste pe nimeni inca.", - "account.follows_you": "Te urmareste", - "account.hide_reblogs": "Ascunde promovarile de la @{name}", + "account.edit_profile": "Editează profilul", + "account.endorse": "Redistribuie pe profil", + "account.follow": "Urmărește", + "account.followers": "Urmăritori", + "account.followers.empty": "Nimeni nu urmărește acest utilizator incă.", + "account.follows": "Urmărește", + "account.follows.empty": "Acest utilizator nu urmărește pe nimeni incă.", + "account.follows_you": "Te urmărește", + "account.hide_reblogs": "Ascunde redistribuirile de la @{name}", "account.media": "Media", - "account.mention": "Mentioneaza @{name}", + "account.mention": "Menționează @{name}", "account.moved_to": "{name} a fost mutat la:", - "account.mute": "Opreste @{name}", - "account.mute_notifications": "Opreste notificarile de la @{name}", + "account.mute": "Oprește @{name}", + "account.mute_notifications": "Oprește notificările de la @{name}", "account.muted": "Oprit", - "account.posts": "Postare", - "account.posts_with_replies": "Postari si replici", - "account.report": "Raporteaza @{name}", - "account.requested": "Asteapta aprobare. Apasa pentru a anula cererea de urmarire", + "account.posts": "Postări", + "account.posts_with_replies": "Postări și replici", + "account.report": "Raportează @{name}", + "account.requested": "Așteaptă aprobare. Apasă pentru a anula cererea de urmărire", "account.share": "Distribuie profilul lui @{name}", - "account.show_reblogs": "Arata promovarile de la @{name}", - "account.unblock": "Deblocheaza @{name}", - "account.unblock_domain": "Arata {domain}", + "account.show_reblogs": "Arată redistribuirile de la @{name}", + "account.unblock": "Deblochează @{name}", + "account.unblock_domain": "Arată {domain}", "account.unendorse": "Nu promova pe profil", - "account.unfollow": "Nu mai urmari", - "account.unmute": "Porneste notificarile @{name}", - "account.unmute_notifications": "Porneste notificarile de la @{name}", + "account.unfollow": "Nu mai urmări", + "account.unmute": "Pornește notificările @{name}", + "account.unmute_notifications": "Pornește notificările de la @{name}", "account.view_full_profile": "Vezi profilul complet", - "alert.unexpected.message": "A aparut o eroare neasteptata.", + "alert.unexpected.message": "A apărut o eroare neașteptată.", "alert.unexpected.title": "Hopa!", - "boost_modal.combo": "Poti apasa {combo} pentru a sari peste asta data viitoare", - "bundle_column_error.body": "Ceva nu a functionat la incarcarea acestui component.", - "bundle_column_error.retry": "Incearca din nou", - "bundle_column_error.title": "Eoare de retea", - "bundle_modal_error.close": "Inchis", - "bundle_modal_error.message": "Ceva nu a functionat in timupul incacarii acestui component.", - "bundle_modal_error.retry": "Incearca din nou", - "column.blocks": "Utilizatori blocati", + "boost_modal.combo": "Poți apăsa {combo} pentru a sări peste asta data viitoare", + "bundle_column_error.body": "Ceva nu a funcționat la încărcarea acestui component.", + "bundle_column_error.retry": "Încearcă din nou", + "bundle_column_error.title": "Eoare de rețea", + "bundle_modal_error.close": "Închide", + "bundle_modal_error.message": "Ceva nu a funcționat în timupul încărcării acestui component.", + "bundle_modal_error.retry": "Încearcă din nou", + "column.blocks": "Utilizatori blocați", "column.community": "Fluxul Local", "column.direct": "Mesaje directe", "column.domain_blocks": "Domenii ascunse", "column.favourites": "Favorite", - "column.follow_requests": "Cereri de urmarire", - "column.home": "Acasa", + "column.follow_requests": "Cereri de urmărire", + "column.home": "Acasă", "column.lists": "Liste", - "column.mutes": "Utilizatori opriti", - "column.notifications": "Notificari", - "column.pins": "Postari fixate", + "column.mutes": "Utilizatori opriți", + "column.notifications": "Notificări", + "column.pins": "Postări fixate", "column.public": "Flux global", - "column_back_button.label": "Inapoi", - "column_header.hide_settings": "Ascunde setarile", - "column_header.moveLeft_settings": "Muta coloana la stanga", - "column_header.moveRight_settings": "Muta coloaba la dreapta", - "column_header.pin": "Fixeaza", - "column_header.show_settings": "Arata setarile", - "column_header.unpin": "Elibereaza", - "column_subheading.settings": "Setari", + "column_back_button.label": "Înapoi", + "column_header.hide_settings": "Ascunde setările", + "column_header.moveLeft_settings": "Mută coloana la stânga", + "column_header.moveRight_settings": "Mută coloana la dreapta", + "column_header.pin": "Fixează", + "column_header.show_settings": "Arată setările", + "column_header.unpin": "Eliberează", + "column_subheading.settings": "Setări", "community.column_settings.media_only": "Doar media", - "compose_form.direct_message_warning": "Aceasta postare va fi trimisa doar utilizatorilor mentionati.", - "compose_form.direct_message_warning_learn_more": "Afla mai multe", - "compose_form.hashtag_warning": "Aceasta postare nu va fi listata sub nici un hastag. Doar postarile publice pot fi gasite dupa un hastag.", - "compose_form.lock_disclaimer": "Contul tau nu este {locked}. Toata lumea te poate urmari pentru a vedea postarile doar pentru utilizatori.", - "compose_form.lock_disclaimer.lock": "blocat", - "compose_form.placeholder": "La ce te gandesti?", - "compose_form.publish": "Postare", + "compose_form.direct_message_warning": "Această postare va fi trimisă doar utilizatorilor menționați.", + "compose_form.direct_message_warning_learn_more": "Află mai multe", + "compose_form.hashtag_warning": "Această postare nu va fi listată sub nici un hastag. Doar postările publice pot fi găsite dupa un hastag.", + "compose_form.lock_disclaimer": "Contul tău nu este {locked}. Toată lumea te poate urmări pentru a vedea postările doar pentru urmăritori.", + "compose_form.lock_disclaimer.lock": "privat", + "compose_form.placeholder": "La ce te gândești?", + "compose_form.publish": "Postează", "compose_form.publish_loud": "{publish}!", - "compose_form.sensitive.marked": "Continutul media este marcat ca sensibil", - "compose_form.sensitive.unmarked": "Continutul media nu este marcat ca sensibil", + "compose_form.sensitive.marked": "Conținutul media este marcat ca sensibil", + "compose_form.sensitive.unmarked": "Conținutul media nu este marcat ca sensibil", "compose_form.spoiler.marked": "Textul este ascuns sub advertizare", "compose_form.spoiler.unmarked": "Textul nu este ascuns", "compose_form.spoiler_placeholder": "Scrie adveritzarea aici", - "confirmation_modal.cancel": "Anuleaza", - "confirmations.block.confirm": "Blocheaza", - "confirmations.block.message": "Esti sigur ca vrei sa blochezi {name}?", - "confirmations.delete.confirm": "Sterge", - "confirmations.delete.message": "Esti sigur ca vrei sa stergi asta?", - "confirmations.delete_list.confirm": "Sterge", - "confirmations.delete_list.message": "Esti sigur ca vrei sa stergi permanent aceasta lista?", + "confirmation_modal.cancel": "Anulează", + "confirmations.block.confirm": "Blochează", + "confirmations.block.message": "Ești sigur că vrei să blochezi {name}?", + "confirmations.delete.confirm": "Șterge", + "confirmations.delete.message": "Ești șigur că vrei să ștergi asta?", + "confirmations.delete_list.confirm": "Șterge", + "confirmations.delete_list.message": "Ești sigur că vrei să ștergi permanent această listă?", "confirmations.domain_block.confirm": "Ascunde tot domeniul", - "confirmations.domain_block.message": "Esti absolut sigur ca vrei sa blochezi complet {domain}? In cele mai multe cazuti raportarea sau oprirea anumitor lucruri este sufucienta si de preferat. Nu vei mai vedea nici un continut de la acest domeniu in nici un flux public sau in notificarile tale. Urmaritorii tai de la acele domenii vor fi retrasi.", - "confirmations.mute.confirm": "Opreste", - "confirmations.mute.message": "Esti sigur ca vrei sa opresti {name}?", - "confirmations.redraft.confirm": "Strge si salveaza din nou", - "confirmations.redraft.message": "Esti sigur ca vrei sa faci asta? Tot ce tine de aceasta postare, inclusiv raspunsurile vor fi deconectate.", - "confirmations.unfollow.confirm": "Nu mai urmari", - "confirmations.unfollow.message": "Esti sigur ca nu mai vrei sa urmaresti {name}?", - "embed.instructions": "Insereaza aceasta postare pe site-ul tau adaugand codul de mai jos.", - "embed.preview": "Cam asa va arata:", + "confirmations.domain_block.message": "Ești absolut sigur că vrei să blochezi complet {domain}? În cele mai multe cazuri raportarea sau oprirea anumitor lucruri este suficientă și de preferat. Nu vei mai vedea nici un conținut de la acest domeniu in nici un flux public sau în notificările tale. Urmăritorii tăi de la acele domenii vor fi retrași.", + "confirmations.mute.confirm": "Oprește", + "confirmations.mute.message": "Ești sigur că vrei să oprești {name}?", + "confirmations.redraft.confirm": "Șterge și salvează ca ciornă", + "confirmations.redraft.message": "Ești sigur că vrei să faci asta? Tot ce ține de această postare, inclusiv răspunsurile vor fi deconectate.", + "confirmations.unfollow.confirm": "Nu mai urmări", + "confirmations.unfollow.message": "Ești sigur că nu mai vrei să îl urmărești pe {name}?", + "embed.instructions": "Inserează această postare pe site-ul tău adăugând codul de mai jos.", + "embed.preview": "Cam așa va arăta:", "emoji_button.activity": "Activitate", "emoji_button.custom": "Personalizat", "emoji_button.flags": "Marcaje", - "emoji_button.food": "Mancare si Bauturi", - "emoji_button.label": "Insereaza un emoji", - "emoji_button.nature": "Natura", - "emoji_button.not_found": "Fara emojiuri (╯°□°）╯︵ ┻━┻", + "emoji_button.food": "Mâncare și Băuturi", + "emoji_button.label": "Inserează un emoji", + "emoji_button.nature": "Natură", + "emoji_button.not_found": "Fară emojiuri (╯°□°）╯︵ ┻━┻", "emoji_button.objects": "Obiecte", "emoji_button.people": "Persoane", "emoji_button.recent": "Utilizate frecvent", - "emoji_button.search": "Cauta...", - "emoji_button.search_results": "Rezultatele cautarii", + "emoji_button.search": "Caută...", + "emoji_button.search_results": "Rezultatele căutării", "emoji_button.symbols": "Simboluri", - "emoji_button.travel": "Calatorii si Locuri", - "empty_column.blocks": "Nu ai blocat nici un utilizator inca.", - "empty_column.community": "Nimic in fluxul local. Scrie ceva public pentru a impinge bila la deal!", - "empty_column.direct": "Nu ai nici un mesaj direct inca. Cand trimiti sau primesti unul, vor fi afisare aici.", - "empty_column.domain_blocks": "Nu sunt domenii ascunse inca.", - "empty_column.favourited_statuses": "Nu ai nici o postare favorita inca. Cand vei avea, vor fi afisare inca.", - "empty_column.favourites": "Nimeni nu are inca nici o postare favorita. Cand cineva va adauga la favorite, vor aparea aici.", - "empty_column.follow_requests": "Nu ai inca nici o cerete de urmarire. Cand vei primi una, va fi afisata aici.", - "empty_column.hashtag": "Acest hastag nu a fost folosit in nici o postare inca.", - "empty_column.home": "Fluxul tau este gol. Viziteaza {public} sau fa o cautare pentru a incepe a incepe si a cunoaste alti oameni.", + "emoji_button.travel": "Călătorii si Locuri", + "empty_column.blocks": "Nu ai blocat nici un utilizator incă.", + "empty_column.community": "Fluxul local este gol. Scrie ceva public pentru a împinge bila la vale!", + "empty_column.direct": "Nu ai nici un mesaj direct incă. Când trimiți sau primești unul, vor fi afișate aici.", + "empty_column.domain_blocks": "Nu sunt domenii ascunse incă.", + "empty_column.favourited_statuses": "Nu ai nici o postare favorită încă. Când vei avea, vor fi afișate aici.", + "empty_column.favourites": "Nimeni nu are această postare adăugată la favorite. Când cineva o va face va fi afișat aici.", + "empty_column.follow_requests": "Nu ai încă nici o cerere de urmărire. Când vei primi una, va fi afișată aici.", + "empty_column.hashtag": "Acest hastag nu a fost folosit încă nicăieri.", + "empty_column.home": "Fluxul tău este gol. Vizitează {public} sau fă o căutare pentru a începe să cunoști oameni noi.", "empty_column.home.public_timeline": "fluxul public", - "empty_column.list": "Nu este nimic inca in aceasta lista. Cand membri acestei liste vor incepe sa posteze, va aparea aici.", - "empty_column.lists": "Nu ai inca nici o lista. Cand vei crea una, va aparea aici.", - "empty_column.mutes": "Nu ai oprit nici un utilizator inca.", - "empty_column.notifications": "Nu ai nici o notificare inca. Interactioneaza cu altii pentru a incepe o conversatie.", - "empty_column.public": "Nu este nimci aici inca! Scrie ceva public, sau urmareste alti utilizatori din alte medii pentru a porni fluxul", - "follow_request.authorize": "Autorizeaza", + "empty_column.list": "Nu este nimic încă în această listă. Când membrii acestei liste vor începe să posteze, va apărea aici.", + "empty_column.lists": "Nu ai încă nici o listă. Când vei crea una, va apărea aici.", + "empty_column.mutes": "Nu ai oprit nici un utilizator incă.", + "empty_column.notifications": "Nu ai nici o notificare încă. Interacționează cu alții pentru a începe o conversație.", + "empty_column.public": "Nu este nimci aici încă! Scrie ceva public, sau urmărește alți utilizatori din alte instanțe pentru a porni fluxul", + "follow_request.authorize": "Autorizează", "follow_request.reject": "Respinge", - "getting_started.developers": "Dezvolatori", - "getting_started.documentation": "Documentatie", - "getting_started.find_friends": "Gaseste prietenii de pe Twitter", - "getting_started.heading": "Incepe", - "getting_started.invite": "Invita oameni", - "getting_started.open_source_notice": "Mastodon este o retea de socializare de tip open source. Poti contribui la dezvoltarea ei sau sa semnalezi erorirle pe GitHub la {github}.", + "getting_started.developers": "Dezvoltatori", + "getting_started.documentation": "Documentație", + "getting_started.find_friends": "Importă din Twitter", + "getting_started.heading": "Începe", + "getting_started.invite": "Invită oameni", + "getting_started.open_source_notice": "Mastodon este o rețea de socializare de tip open source. Puteți contribuii la dezvoltarea ei sau să semnalați erorile pe GitHub la {github}.", "getting_started.security": "Securitate", "getting_started.terms": "Termenii de Utilizare", - "home.column_settings.basic": "De baza", - "home.column_settings.show_reblogs": "Arata promovarile", - "home.column_settings.show_replies": "Arata raspunsurile", - "keyboard_shortcuts.back": "navigheaza inapoi", - "keyboard_shortcuts.blocked": "sa deschida lista utilizatorilor blocati", - "keyboard_shortcuts.boost": "sa promoveze", - "keyboard_shortcuts.column": "sa focuzeze o postare in una dintre coloane", + "home.column_settings.basic": "De bază", + "home.column_settings.show_reblogs": "Arată redistribuirile", + "home.column_settings.show_replies": "Arată răspunsurile", + "keyboard_shortcuts.back": "navighează inapoi", + "keyboard_shortcuts.blocked": "să deschidă lista utilizatorilor blocați", + "keyboard_shortcuts.boost": "să redistribuie", + "keyboard_shortcuts.column": "să focuzeze o postare in una dintre coloane", "keyboard_shortcuts.compose": "sa focuzeze zona de compunere", "keyboard_shortcuts.description": "Descriere", "keyboard_shortcuts.direct": "sa deschida coloane de mesaje directe", @@ -148,9 +148,9 @@ "keyboard_shortcuts.favourite": "sa adauge la favorite", "keyboard_shortcuts.favourites": "sa deschida lista cu favorite", "keyboard_shortcuts.federated": "sa deschida fluxul global", - "keyboard_shortcuts.heading": "Comenzi din tastature", + "keyboard_shortcuts.heading": "Comenzi din tastatură", "keyboard_shortcuts.home": "sa deschida fluxul principal", - "keyboard_shortcuts.hotkey": "Prescurtari", + "keyboard_shortcuts.hotkey": "Prescurtări", "keyboard_shortcuts.legend": "sa afiseze aceasta legenda", "keyboard_shortcuts.local": "sa deschida fluxul local", "keyboard_shortcuts.mention": "sa mentioneze autorul", @@ -167,170 +167,170 @@ "keyboard_shortcuts.toot": "sa inceapa o noua postare", "keyboard_shortcuts.unfocus": "sa dezactiveze compunerea/cautarea", "keyboard_shortcuts.up": "sa mute mai sus in lista", - "lightbox.close": "Inchide", - "lightbox.next": "Urmatorul", + "lightbox.close": "Închide", + "lightbox.next": "Următorul", "lightbox.previous": "Precedentul", - "lists.account.add": "Adauga in lista", - "lists.account.remove": "Elimina din lista", - "lists.delete": "Sterge lista", - "lists.edit": "Editeaza lista", - "lists.new.create": "Adauga lista", - "lists.new.title_placeholder": "Titlul pentru noua lista", - "lists.search": "Cauta printre persoanale pe care le urmaresti", + "lists.account.add": "Adaugă în listă", + "lists.account.remove": "Elimină din listă", + "lists.delete": "Șterge listă", + "lists.edit": "Editează lista", + "lists.new.create": "Adaugă listă", + "lists.new.title_placeholder": "Titlu pentru noua listă", + "lists.search": "Caută printre persoanale pe care le urmărești", "lists.subheading": "Listele tale", - "loading_indicator.label": "Incarcare...", - "media_gallery.toggle_visible": "Comutati vizibilitatea", - "missing_indicator.label": "Nu a fost gasit", - "missing_indicator.sublabel": "Aceasta resursa nu a putut fi gasita", - "mute_modal.hide_notifications": "Ascunzi notificarile de la acest utilizator?", - "navigation_bar.apps": "Aplicatii mobile", - "navigation_bar.blocks": "Utilizatori blocati", + "loading_indicator.label": "Încărcare...", + "media_gallery.toggle_visible": "Comutați vizibilitatea", + "missing_indicator.label": "Nu a fost găsit", + "missing_indicator.sublabel": "Această resursă nu a putut fi găsită", + "mute_modal.hide_notifications": "Ascunzi notificările de la acest utilizator?", + "navigation_bar.apps": "Aplicații mobile", + "navigation_bar.blocks": "Utilizatori blocați", "navigation_bar.community_timeline": "Flux local", - "navigation_bar.compose": "Compune o noua postare", + "navigation_bar.compose": "Compune o nouă postare", "navigation_bar.direct": "Mesaje directe", - "navigation_bar.discover": "Descopera", + "navigation_bar.discover": "Descoperă", "navigation_bar.domain_blocks": "Domenii ascunse", - "navigation_bar.edit_profile": "Editeaza profilul", + "navigation_bar.edit_profile": "Editează profilul", "navigation_bar.favourites": "Favorite", "navigation_bar.filters": "Cuvinte oprite", - "navigation_bar.follow_requests": "Cereri de urmarire", - "navigation_bar.info": "Despre aceasta instanta", - "navigation_bar.keyboard_shortcuts": "Prescurtari", + "navigation_bar.follow_requests": "Cereri de urmărire", + "navigation_bar.info": "Despre această instanță", + "navigation_bar.keyboard_shortcuts": "Prescurtări", "navigation_bar.lists": "Liste", "navigation_bar.logout": "Deconectare", - "navigation_bar.mutes": "Utilizatori opriti", + "navigation_bar.mutes": "Utilizatori opriți", "navigation_bar.personal": "Personal", - "navigation_bar.pins": "Postari fixate", - "navigation_bar.preferences": "Preferinte", + "navigation_bar.pins": "Postări fixate", + "navigation_bar.preferences": "Preferințe", "navigation_bar.public_timeline": "Flux global", "navigation_bar.security": "Securitate", - "notification.favourite": "{name} a adaugat statusul tau la favorite", - "notification.follow": "{name} te urmareste", - "notification.mention": "{name} te-a mentionat", + "notification.favourite": "{name} a adăugat statusul tău la favorite", + "notification.follow": "{name} te urmărește", + "notification.mention": "{name} te-a menționat", "notification.reblog": "{name} a redistribuit postarea ta", - "notifications.clear": "Sterge notificarile", - "notifications.clear_confirmation": "Esti sigur ca vrei sa stergi toate notificarile?", - "notifications.column_settings.alert": "Notificari desktop", + "notifications.clear": "Șterge notificările", + "notifications.clear_confirmation": "Ești sigur că vrei să ștergi toate notificările?", + "notifications.column_settings.alert": "Notificări pe desktop", "notifications.column_settings.favourite": "Favorite:", - "notifications.column_settings.follow": "Noi urmaritori:", - "notifications.column_settings.mention": "Mentiuni:", - "notifications.column_settings.push": "Notificari push", + "notifications.column_settings.follow": "Noi urmăritori:", + "notifications.column_settings.mention": "Mențiuni:", + "notifications.column_settings.push": "Notificări push", "notifications.column_settings.push_meta": "Acest dispozitiv", "notifications.column_settings.reblog": "Redistribuite:", - "notifications.column_settings.show": "Arata in coloana", - "notifications.column_settings.sound": "Reda sunet", - "notifications.group": "{count} notificari", + "notifications.column_settings.show": "Arată în coloană", + "notifications.column_settings.sound": "Redă sunet", + "notifications.group": "{count} notificări", "onboarding.done": "Gata", - "onboarding.next": "Urmatorul", - "onboarding.page_five.public_timelines": "Fluxul local afiseaza postarile publice de la toti utilizatorii pe {domain}. Fluxul global afiseaza postarile publice de la toti utilizatorii din reteaua mastodon pe care utilizatorii de pe {domain} ii urmaresc. Acestea sunt fluxurile publice, un mod grozav de a descoperi oameni noi.", - "onboarding.page_four.home": "Fluxul Acasa arata postarile celor pe care ii urmaresti.", - "onboarding.page_four.notifications": "Coloana de notificari arata cand cineva interactioneaza cu tine.", - "onboarding.page_one.federation": "Mastodon este o retea independenta de servere care impreuna formeaza o imensa retea de socializare. Noi numim aceste servere istante.", - "onboarding.page_one.full_handle": "Id-ul tau complet", - "onboarding.page_one.handle_hint": "Aceasta este ceea ce trebuie sa le spuneti prietenilor cand vor sa va caute.", + "onboarding.next": "Următorul", + "onboarding.page_five.public_timelines": "Fluxul local afișează postările publice de la toți utilizatorii pe {domain}. Fluxul global afișează postările publice de la toți utilizatorii din rețeaua mastodon pe care utilizatorii de pe {domain} ii urmăresc. Acestea sunt fluxurile publice, un mod grozav de a descoperi oameni noi.", + "onboarding.page_four.home": "Fluxul Acasă arată postarile celor pe care ii urmărești.", + "onboarding.page_four.notifications": "Coloana de notificări arată când cineva interacționează cu tine.", + "onboarding.page_one.federation": "Mastodon este o rețea independentă de servere care împreună formează o imensă retea de socializare. Noi numim aceste servere istanțe.", + "onboarding.page_one.full_handle": "Id-ul tău complet", + "onboarding.page_one.handle_hint": "Asta este ceea ce trebuie să le spuneți prietenilor când vor să vă caute.", "onboarding.page_one.welcome": "Bun venit la Mastodon!", - "onboarding.page_six.admin": "Administatorul acestei instante este {admin}.", + "onboarding.page_six.admin": "Administatorul acestei instanțe este {admin}.", "onboarding.page_six.almost_done": "Aproape gata...", - "onboarding.page_six.appetoot": "Distractie placuta!", - "onboarding.page_six.apps_available": "Acestea sunt {apps} disponibile pentru iOS, Android si alte platforme.", - "onboarding.page_six.github": "Mastodon este un software de tip open source. Poti raporta erori, cere facilitati, sau sa contribuiti pe {github}.", - "onboarding.page_six.guidelines": "instructiunile comunitatii", - "onboarding.page_six.read_guidelines": "Va rugam cititi {domain} {guidelines}!", - "onboarding.page_six.various_app": "aplicatii mobile", - "onboarding.page_three.profile": "Editeaza poriflul pentru a schimba avatarul, bio si numele. Tot acolo vei gasi si alte preferinte.", - "onboarding.page_three.search": "Utilizeaza bara de cautare pentru a gasi oameni sau hastaguri precum {illustration} si {introductions}. Pentru a gasi o persoana care nu este inscrisa pe aceasta instanta foloseste id-ul lor complet.", - "onboarding.page_two.compose": "Scrie postari din coloana pentru compunere. Poti incarca imagini, schimba setarile de confidentialitate, si adauga advertisemente asupra continutului cu ajutorul iconitelor.", + "onboarding.page_six.appetoot": "Distracție plăcută!", + "onboarding.page_six.apps_available": "Acestea sunt {apps} disponibile pentru iOS, Android și alte platforme.", + "onboarding.page_six.github": "Mastodon este un software de tip open source. Puteți raporta erori, cere facilități, sau să contribuiți pe {github}.", + "onboarding.page_six.guidelines": "regulamentul comunității", + "onboarding.page_six.read_guidelines": "Vă rugăm citiți {domain} {guidelines}!", + "onboarding.page_six.various_app": "aplicații mobile", + "onboarding.page_three.profile": "Editează profilul pentru a modifica fotografia de profil, descrierea si numele. Tot acolo vei găsi și alte preferințe.", + "onboarding.page_three.search": "Utilizează bara de căutare pentru a găsi oameni sau hastaguri precum {illustration} și {introductions}. Pentru a găsi o persoană care nu este înscrisă pe această instanță folosește id-ul lui complet.", + "onboarding.page_two.compose": "Scrie postări din coloana pentru compunere. Poți încărca imagini, schimba setările de confidențialitate, și adăuga advertisemente asupra conținutului.", "onboarding.skip": "Omite", - "privacy.change": "Ajusteaza confidentialitatea statusului", - "privacy.direct.long": "Posteaza doar pentru utilizatorii mentionati", + "privacy.change": "Cine vede asta", + "privacy.direct.long": "Postează doar pentru utilizatorii menționați", "privacy.direct.short": "Direct", - "privacy.private.long": "Posteaza doar pentru urmaritori", - "privacy.private.short": "Doar urmaritori", - "privacy.public.long": "Posteaza in fluxul public", + "privacy.private.long": "Postează doar pentru urmăritori", + "privacy.private.short": "Doar urmăritorii", + "privacy.public.long": "Postează în fluxul public", "privacy.public.short": "Public", "privacy.unlisted.long": "Nu afisa in fluxul public", "privacy.unlisted.short": "Nelistat", - "regeneration_indicator.label": "Incarcare…", - "regeneration_indicator.sublabel": "Fluxul tau este in preparare!", + "regeneration_indicator.label": "Încărcare…", + "regeneration_indicator.sublabel": "Fluxul tău este în preparare!", "relative_time.days": "{number}z", "relative_time.hours": "{number}h", "relative_time.just_now": "acum", - "relative_time.minutes": "{number}l", + "relative_time.minutes": "{number}m", "relative_time.seconds": "{number}s", - "reply_indicator.cancel": "Anuleaza", - "report.forward": "Redirectioneaza catre {target}", - "report.forward_hint": "Acest cont este de pe un alt server. Trimitem o copie anonima a raportului si acolo?", - "report.hint": "Sesizarea va fi trimsa catre moderatorii acestei instante. Poti oferi o explicatie pentru aceasta sesizare mai jos:", - "report.placeholder": "Comentarii optionale", + "reply_indicator.cancel": "Anulează", + "report.forward": "Redirecționează catre {target}", + "report.forward_hint": "Acest cont este de pe un alt server. Trimitem o copie anonimă a raportului și acolo?", + "report.hint": "Sesizarea va fi trimsă către moderatorii acestei instanțe. Poți oferi o explicație pentru această sesizare mai jos:", + "report.placeholder": "Comentarii opționale", "report.submit": "Trimite", - "report.target": "Raporteaza {target}", - "search.placeholder": "Cauta", - "search_popout.search_format": "Formate pentru cautare avansata", - "search_popout.tips.full_text": "Textele simple returneaza statusuri pe care le-ai scris, favorizat, redistribuit, sau in care au fost mentionate, deasmenea si utilizatorii sau hastagurile care se potrivesc.", + "report.target": "Raportează {target}", + "search.placeholder": "Caută", + "search_popout.search_format": "Formate pentru căutare avansată", + "search_popout.tips.full_text": "Textele simple returnează statusuri pe care le-ai scris, favorizat, redistribuit, sau în care sunt menționate , deasmenea și utilizatorii sau hastagurile care se potrivesc.", "search_popout.tips.hashtag": "hashtag", "search_popout.tips.status": "status", - "search_popout.tips.text": "Textele simple returneaza numele, numele de utilizarori si hastagurile care se potrivesc", + "search_popout.tips.text": "Textele simple returnează nume, nume de utilizarori și hastagurile care se potrivesc", "search_popout.tips.user": "utilizator", "search_results.accounts": "Oameni", "search_results.hashtags": "Hashtaguri", - "search_results.statuses": "Postari", + "search_results.statuses": "Postări", "search_results.total": "{count, number} {count, plural, one {result} other {results}}", - "standalone.public_title": "O privire in interior...", - "status.block": "Blocheaza @{name}", + "standalone.public_title": "Se întâmplă acum", + "status.block": "Blochează @{name}", "status.cancel_reblog_private": "Nedistribuit", - "status.cannot_reblog": "Aceasta postare nu poate fi redistribuita", - "status.delete": "Sterge", - "status.detailed_status": "Conversatia detailata", + "status.cannot_reblog": "Această postare nu poate fi redistribuită", + "status.delete": "Șterge", + "status.detailed_status": "Conversația detailată", "status.direct": "Mesaj direct @{name}", - "status.embed": "Incorporare", + "status.embed": "Încorporare", "status.favourite": "Favorite", "status.filtered": "Sortate", - "status.load_more": "Incarca mai multe", - "status.media_hidden": "Media ascunsa", - "status.mention": "Mentioneaza @{name}", + "status.load_more": "Încarcă mai multe", + "status.media_hidden": "Media ascunsă", + "status.mention": "Mentionează @{name}", "status.more": "Mai mult", - "status.mute": "Opreste @{name}", - "status.mute_conversation": "Opreste conversatia", + "status.mute": "Oprește @{name}", + "status.mute_conversation": "Oprește conversația", "status.open": "Extinde acest status", - "status.pin": "Fixeaza pe profil", - "status.pinned": "Postare fixata", + "status.pin": "Fixează pe profil", + "status.pinned": "Postare fixată", "status.reblog": "Redistribuie", - "status.reblog_private": "Redistribuie la audienta originala", + "status.reblog_private": "Redistribuie către audiența originală", "status.reblogged_by": "{name} redistribuit", - "status.reblogs.empty": "Nimeni nu a redistribuit aceasta postare inca. Cand cineva o va face, va aparea aici.", - "status.redraft": "Sterge si adauga la ciorne", - "status.reply": "Raspunde", - "status.replyAll": "Raspunde la topic", - "status.report": "Raporteaza @{name}", - "status.sensitive_toggle": "Afiseaza", - "status.sensitive_warning": "Continut sensibil", + "status.reblogs.empty": "Nimeni nu a redistribuit această postare până acum. Când cineva o va face, va apărea aici.", + "status.redraft": "Șterge și adaugă la ciorne", + "status.reply": "Răspunde", + "status.replyAll": "Răspunde la topic", + "status.report": "Raportează @{name}", + "status.sensitive_toggle": "Afișează", + "status.sensitive_warning": "Conținut sensibil", "status.share": "Distribuie", - "status.show_less": "Arata mai putin", - "status.show_less_all": "Arata mai putin pentru toti", - "status.show_more": "Arata mai mult", - "status.show_more_all": "Arata mai mult pentru toti", - "status.unmute_conversation": "Reporneste conversatia", - "status.unpin": "Elibereaza din profil", + "status.show_less": "Arată mai puțin", + "status.show_less_all": "Arată mai puțin pentru toți", + "status.show_more": "Arată mai mult", + "status.show_more_all": "Arată mai mult pentru toți", + "status.unmute_conversation": "Repornește conversația", + "status.unpin": "Eliberează din profil", "tabs_bar.federated_timeline": "Global", - "tabs_bar.home": "Acasa", + "tabs_bar.home": "Acasă", "tabs_bar.local_timeline": "Local", - "tabs_bar.notifications": "Notificari", - "tabs_bar.search": "Cautare", + "tabs_bar.notifications": "Notificări", + "tabs_bar.search": "Căutare", "trends.count_by_accounts": "{count} {rawCount, plural, one {person} other {people}} vorbesc", - "ui.beforeunload": "Ciorna se va priede daca parasesti pagina.", - "upload_area.title": "Trage si elibereaza pentru a incarca", - "upload_button.label": "Adauga media (JPEG, PNG, GIF, WebM, MP4, MOV)", - "upload_form.description": "Adauga o descriere pentru persoanele cu deficiente de vedere", + "ui.beforeunload": "Postarea se va pierde dacă părăsești pagina.", + "upload_area.title": "Trage și eliberează pentru a încărca", + "upload_button.label": "Adaugă media (JPEG, PNG, GIF, WebM, MP4, MOV)", + "upload_form.description": "Adaugă o descriere pentru persoanele cu deficiențe de vedere", "upload_form.focus": "Taie", - "upload_form.undo": "Sterge", - "upload_progress.label": "Se Incarca...", - "video.close": "Inchide video", - "video.exit_fullscreen": "Inchide", + "upload_form.undo": "Șterge", + "upload_progress.label": "Se Încarcă...", + "video.close": "Închide video", + "video.exit_fullscreen": "Închide", "video.expand": "Extinde video", - "video.fullscreen": "Ecran intreg", + "video.fullscreen": "Ecran întreg", "video.hide": "Ascunde video", - "video.mute": "Opreste sonorul", - "video.pause": "Pauza", + "video.mute": "Oprește sonorul", + "video.pause": "Pauză", "video.play": "Redare", - "video.unmute": "Reporneste sunetul" + "video.unmute": "Repornește sunetul" } diff --git a/app/javascript/mastodon/locales/sk.json b/app/javascript/mastodon/locales/sk.json index edfd69a252d..55f10be6df5 100644 --- a/app/javascript/mastodon/locales/sk.json +++ b/app/javascript/mastodon/locales/sk.json @@ -89,7 +89,7 @@ "confirmations.mute.confirm": "Ignoruj", "confirmations.mute.message": "Naozaj chcete ignorovať {name}?", "confirmations.redraft.confirm": "Vyčistiť a prepísať", - "confirmations.redraft.message": "Si si istý/á, že chceš vymazať a prepísať tento príspevok? Jeho nadobudnuté odpovede, povýšenia a obľúbenia, ale i odpovede na pôvodný príspevok budú odlúčené.", + "confirmations.redraft.message": "Si si istý/á, že chceš premazať a prepísať tento príspevok? Jeho nadobudnuté odpovede, povýšenia a obľúbenia, ale i odpovede na pôvodný príspevok budú odlúčené.", "confirmations.unfollow.confirm": "Nesledovať", "confirmations.unfollow.message": "Naozaj chcete prestať sledovať {name}?", "embed.instructions": "Umiestni kód uvedený nižšie pre pridanie tohto statusu na tvoju web stránku.", @@ -111,16 +111,16 @@ "empty_column.blocks": "Ešte si nikoho nezablokoval/a.", "empty_column.community": "Lokálna časová os je prázdna. Napíšte niečo, aby sa to tu začalo hýbať!", "empty_column.direct": "Ešte nemáš žiadne súkromné správy. Keď nejakú pošleš, alebo dostaneš, ukáže sa tu.", - "empty_column.domain_blocks": "There are no hidden domains yet.", - "empty_column.favourited_statuses": "You don't have any favourite toots yet. When you favourite one, it will show up here.", + "empty_column.domain_blocks": "Žiadne domény ešte niesú skryté.", + "empty_column.favourited_statuses": "Nemáš obľúbené ešte žiadne príspevky. Keď si nejaký obľúbiš, bude zobrazený práve tu.", "empty_column.favourites": "Tento toot si ešte nikto neobľúbil. Ten kto si ho obľúbi, bude zobrazený tu.", - "empty_column.follow_requests": "You don't have any follow requests yet. When you receive one, it will show up here.", + "empty_column.follow_requests": "Ešte nemáš žiadne požiadavky o následovanie. Keď nejaké dostaneš, budú tu zobrazené.", "empty_column.hashtag": "Pod týmto hashtagom sa ešte nič nenachádza.", "empty_column.home": "Tvoja lokálna osa je zatiaľ prázdna! Pre začiatok navštív {public}, alebo použi vyhľadávanie a nájdi tak aj iných užívateľov.", "empty_column.home.public_timeline": "verejná časová os", "empty_column.list": "Tento zoznam je ešte prázdny. Keď ale členovia tohoto zoznamu napíšu nové správy, tak tie sa objavia priamo tu.", - "empty_column.lists": "You don't have any lists yet. When you create one, it will show up here.", - "empty_column.mutes": "You haven't muted any users yet.", + "empty_column.lists": "Nemáš ešte žiadne zoznamy. Keď nejaký vytvoríš, bude zobrazený práve tu.", + "empty_column.mutes": "Ešte si nestĺmil žiadných užívateľov.", "empty_column.notifications": "Nemáš ešte žiadne oznámenia. Zapoj sa s niekym do debaty a komunikuj s ostatnými aby diskusia mohla začať.", "empty_column.public": "Ešte tu nič nie je. Napíš niečo verejne alebo začnite sledovať užívateľov z iných Mastodon serverov, aby tu tak niečo pribudlo", "follow_request.authorize": "Povoľ prístup", @@ -137,32 +137,32 @@ "home.column_settings.show_reblogs": "Zobraziť povýšené", "home.column_settings.show_replies": "Ukázať odpovede", "keyboard_shortcuts.back": "dostať sa naspäť", - "keyboard_shortcuts.blocked": "to open blocked users list", + "keyboard_shortcuts.blocked": "otvor zoznam blokovaných užívateľov", "keyboard_shortcuts.boost": "vyzdvihnúť", "keyboard_shortcuts.column": "zamerať sa na status v jednom zo stĺpcov", "keyboard_shortcuts.compose": "zamerať sa na písaciu plochu", "keyboard_shortcuts.description": "Popis", - "keyboard_shortcuts.direct": "to open direct messages column", + "keyboard_shortcuts.direct": "otvor panel súkromných správ", "keyboard_shortcuts.down": "posunúť sa dole v zozname", "keyboard_shortcuts.enter": "otvoriť správu", "keyboard_shortcuts.favourite": "pridať do obľúbených", - "keyboard_shortcuts.favourites": "to open favourites list", - "keyboard_shortcuts.federated": "to open federated timeline", + "keyboard_shortcuts.favourites": "otvor zoznam obľúbených", + "keyboard_shortcuts.federated": "otvor federovanú časovú os", "keyboard_shortcuts.heading": "Klávesové skratky", - "keyboard_shortcuts.home": "to open home timeline", + "keyboard_shortcuts.home": "otvor domácu časovú os", "keyboard_shortcuts.hotkey": "Klávesa", "keyboard_shortcuts.legend": "zobraziť túto legendu", - "keyboard_shortcuts.local": "to open local timeline", + "keyboard_shortcuts.local": "otvor miestnu časovú os", "keyboard_shortcuts.mention": "spomenúť autora", - "keyboard_shortcuts.muted": "to open muted users list", - "keyboard_shortcuts.my_profile": "to open your profile", - "keyboard_shortcuts.notifications": "to open notifications column", - "keyboard_shortcuts.pinned": "to open pinned toots list", - "keyboard_shortcuts.profile": "to open author's profile", + "keyboard_shortcuts.muted": "otvor zoznam stíšených užívateľov", + "keyboard_shortcuts.my_profile": "otvor svoj profil", + "keyboard_shortcuts.notifications": "otvor panel oboznámení", + "keyboard_shortcuts.pinned": "otvor zoznam pripnutých príspevkov", + "keyboard_shortcuts.profile": "otvor autorov profil", "keyboard_shortcuts.reply": "odpovedať", - "keyboard_shortcuts.requests": "to open follow requests list", + "keyboard_shortcuts.requests": "otvor zoznam požiadavok k následovaniu", "keyboard_shortcuts.search": "zamerať sa na vyhľadávanie", - "keyboard_shortcuts.start": "to open \"get started\" column", + "keyboard_shortcuts.start": "otvor panel ''začíname''", "keyboard_shortcuts.toggle_hidden": "ukáž/skry text za CW", "keyboard_shortcuts.toot": "začať úplne novú hlášku", "keyboard_shortcuts.unfocus": "nesústrediť sa na písaciu plochu, alebo hľadanie", @@ -183,10 +183,10 @@ "missing_indicator.label": "Nenájdené", "missing_indicator.sublabel": "Tento zdroj sa nepodarilo nájsť", "mute_modal.hide_notifications": "Skryť notifikácie od tohoto užívateľa?", - "navigation_bar.apps": "Mobile apps", + "navigation_bar.apps": "Mobilné aplikácie", "navigation_bar.blocks": "Blokovaní užívatelia", "navigation_bar.community_timeline": "Lokálna časová os", - "navigation_bar.compose": "Compose new toot", + "navigation_bar.compose": "Napíš nový príspevok", "navigation_bar.direct": "Súkromné správy", "navigation_bar.discover": "Objavuj", "navigation_bar.domain_blocks": "Skryté domény", @@ -280,7 +280,7 @@ "status.cancel_reblog_private": "Nezdieľaj", "status.cannot_reblog": "Tento príspevok nemôže byť re-tootnutý", "status.delete": "Zmazať", - "status.detailed_status": "Detailed conversation view", + "status.detailed_status": "Podrobný náhľad celej konverzácie", "status.direct": "Súkromná správa @{name}", "status.embed": "Vložiť", "status.favourite": "Páči sa mi", @@ -297,7 +297,7 @@ "status.reblog": "Povýšiť", "status.reblog_private": "Povýš k pôvodnému publiku", "status.reblogged_by": "{name} povýšil/a", - "status.reblogs.empty": "No one has boosted this toot yet. When someone does, they will show up here.", + "status.reblogs.empty": "Nikto ešte nepovýšil tento príspevok. Keď tak niekto urobí, bude to zobrazené práve tu.", "status.redraft": "Vymaž a prepíš", "status.reply": "Odpovedať", "status.replyAll": "Odpovedať na diskusiu", diff --git a/app/javascript/mastodon/locales/sr.json b/app/javascript/mastodon/locales/sr.json index 81a37cc4c68..a8a6b5c391f 100644 --- a/app/javascript/mastodon/locales/sr.json +++ b/app/javascript/mastodon/locales/sr.json @@ -1,6 +1,6 @@ { "account.badges.bot": "Бот", - "account.block": "Блокирај корисника @{name}", + "account.block": "Блокирај @{name}", "account.block_domain": "Сакриј све са домена {domain}", "account.blocked": "Блокиран", "account.direct": "Директна порука @{name}", @@ -8,11 +8,11 @@ "account.domain_blocked": "Домен сакривен", "account.edit_profile": "Измени профил", "account.endorse": "Приказати на профилу", - "account.follow": "Запрати", - "account.followers": "Пратиоца", - "account.followers.empty": "Нико још увек не прати овог корисника.", + "account.follow": "Прати", + "account.followers": "Пратиоци", + "account.followers.empty": "Тренутно нико не прати овог корисника.", "account.follows": "Прати", - "account.follows.empty": "Овај корисник не прати никога за сад.", + "account.follows.empty": "Корисник тренутно не прати никога.", "account.follows_you": "Прати Вас", "account.hide_reblogs": "Сакриј подршке које даје корисника @{name}", "account.media": "Медији", @@ -22,7 +22,7 @@ "account.mute_notifications": "Искључи обавештења од корисника @{name}", "account.muted": "Ућуткан", "account.posts": "Трубе", - "account.posts_with_replies": "Трубе са одговорима", + "account.posts_with_replies": "Трубе и одговори", "account.report": "Пријави @{name}", "account.requested": "Чекам одобрење. Кликните да поништите захтев за праћење", "account.share": "Подели профил корисника @{name}", @@ -44,7 +44,7 @@ "bundle_modal_error.message": "Нешто није било у реду при учитавању ове компоненте.", "bundle_modal_error.retry": "Покушајте поново", "column.blocks": "Блокирани корисници", - "column.community": "Локална лајна", + "column.community": "Локална временска линија", "column.direct": "Директне поруке", "column.domain_blocks": "Скривени домени", "column.favourites": "Омиљени", @@ -54,7 +54,7 @@ "column.mutes": "Ућуткани корисници", "column.notifications": "Обавештења", "column.pins": "Прикачени тутови", - "column.public": "Федерисана лајна", + "column.public": "Здружена временска линија", "column_back_button.label": "Назад", "column_header.hide_settings": "Сакриј поставке", "column_header.moveLeft_settings": "Помери колону улево", @@ -70,12 +70,12 @@ "compose_form.lock_disclaimer": "Ваш налог није {locked}. Свако може да Вас запрати и да види објаве намењене само Вашим пратиоцима.", "compose_form.lock_disclaimer.lock": "закључан", "compose_form.placeholder": "Шта Вам је на уму?", - "compose_form.publish": "Тутни", + "compose_form.publish": "Труби", "compose_form.publish_loud": "{publish}!", "compose_form.sensitive.marked": "Медији су означени као осетљиви", "compose_form.sensitive.unmarked": "Медији су означени као не-осетљиви", - "compose_form.spoiler.marked": "Текст је скривен иза упозорења", - "compose_form.spoiler.unmarked": "Текст није скривен", + "compose_form.spoiler.marked": "Текст је сакривен иза упозорења", + "compose_form.spoiler.unmarked": "Текст није сакривен", "compose_form.spoiler_placeholder": "Овде упишите упозорење", "confirmation_modal.cancel": "Поништи", "confirmations.block.confirm": "Блокирај", @@ -89,7 +89,7 @@ "confirmations.mute.confirm": "Ућуткај", "confirmations.mute.message": "Да ли стварно желите да ућуткате корисника {name}?", "confirmations.redraft.confirm": "Избриши и преправи", - "confirmations.redraft.message": "Да ли сте сигурно да желите да избришете овај статус и да га преправите*? Омиљеновање и подршке ће бити изгубљене, а одговори на оригинални пост ће бити поништени.", + "confirmations.redraft.message": "Да ли сте сигурни да желите да избришете овај статус и да га преправите? Сва стављања у омиљене трубе, као и подршке ће бити изгубљене, а одговори на оригинални пост ће бити поништени.", "confirmations.unfollow.confirm": "Отпрати", "confirmations.unfollow.message": "Да ли сте сигурни да желите да отпратите корисника {name}?", "embed.instructions": "Угради овај статус на Ваш веб сајт копирањем кода испод.", @@ -97,25 +97,25 @@ "emoji_button.activity": "Активност", "emoji_button.custom": "Произвољно", "emoji_button.flags": "Заставе", - "emoji_button.food": "Храна & пиће", - "emoji_button.label": "Убаци смајли", + "emoji_button.food": "Храна и пиће", + "emoji_button.label": "Убаци емоџи", "emoji_button.nature": "Природа", - "emoji_button.not_found": "Нема смајлија!! (╯°□°）╯︵ ┻━┻", + "emoji_button.not_found": "Нема емоџија!! (╯°□°）╯︵ ┻━┻", "emoji_button.objects": "Објекти", "emoji_button.people": "Људи", "emoji_button.recent": "Најчешће коришћени", "emoji_button.search": "Претрага...", "emoji_button.search_results": "Резултати претраге", "emoji_button.symbols": "Симболи", - "emoji_button.travel": "Путовања & места", + "emoji_button.travel": "Путовања и места", "empty_column.blocks": "Још увек немате блокираних корисника.", - "empty_column.community": "Локална лајна је празна. Напишите нешто јавно да лајна продува!", + "empty_column.community": "Локална временска линија је празна. Напишите нешто јавно да започнете!", "empty_column.direct": "Још увек немате директних порука. Када пошаљете или примите једну, појавиће се овде.", "empty_column.domain_blocks": "Још увек нема сакривених домена.", "empty_column.favourited_statuses": "Још увек немате труба које су вам се свиделе. Када вам се једна свиди, појавиће се овде.", "empty_column.favourites": "Још увек се никоме није свидела ова труба. Када се некоме свиди, појавиће се овде.", "empty_column.follow_requests": "Још увек немате захтева за праћење. Када примите захтев, појавиће се овде.", - "empty_column.hashtag": "Тренутно нема ништа на овом хештегу.", + "empty_column.hashtag": "Тренутно нема ништа на овој означеној тараби.", "empty_column.home": "Ваша временска линија је празна! Посетите {public} или користите претрагу да почнете и да упознате нове људе.", "empty_column.home.public_timeline": "јавна временска линија", "empty_column.list": "У овој листи још нема ничега. Када чланови листе објаве нове статусе, они ће се појавити овде.", @@ -147,7 +147,7 @@ "keyboard_shortcuts.enter": "да отворите статус", "keyboard_shortcuts.favourite": "да означите као омиљено", "keyboard_shortcuts.favourites": "да отворите листу фаворита", - "keyboard_shortcuts.federated": "да отворите федерализовану временску линију", + "keyboard_shortcuts.federated": "да отворите здружену временску линију", "keyboard_shortcuts.heading": "Пречице на тастатури", "keyboard_shortcuts.home": "да отворите временску линију почетне", "keyboard_shortcuts.hotkey": "Пречица", @@ -185,7 +185,7 @@ "mute_modal.hide_notifications": "Сакриј обавештења од овог корисника?", "navigation_bar.apps": "Мобилне апликације", "navigation_bar.blocks": "Блокирани корисници", - "navigation_bar.community_timeline": "Локална лајна", + "navigation_bar.community_timeline": "Локална временска линија", "navigation_bar.compose": "Саставите нову трубу", "navigation_bar.direct": "Директне поруке", "navigation_bar.discover": "Откриј", @@ -202,9 +202,9 @@ "navigation_bar.personal": "Personal", "navigation_bar.pins": "Прикачени тутови", "navigation_bar.preferences": "Подешавања", - "navigation_bar.public_timeline": "Федерисана лајна", - "navigation_bar.security": "Сигурност", - "notification.favourite": "{name} је ставио Ваш статус као омиљени", + "navigation_bar.public_timeline": "Здружена временска линија", + "navigation_bar.security": "Безбедност", + "notification.favourite": "{name} је ставио/ла Ваш статус као омиљени", "notification.follow": "{name} Вас је запратио", "notification.mention": "{name} Вас је поменуо", "notification.reblog": "{name} је подржао(ла) Ваш статус", @@ -222,8 +222,8 @@ "notifications.group": "{count} обавештења", "onboarding.done": "Готово", "onboarding.next": "Следеће", - "onboarding.page_five.public_timelines": "Локална лајна приказује све јавне статусе од свих на домену {domain}. Федерисана лајна приказује јавне статусе од свих људи које прате корисници са домена {domain}. Ово су јавне лајне, сјајан начин да откријете нове људе.", - "onboarding.page_four.home": "Почетна лајна приказује статусе људи које Ви пратите.", + "onboarding.page_five.public_timelines": "Локална временска линија приказује све јавне статусе од свих на домену {domain}. Здружена временска линија приказује јавне статусе од свих људи које прате корисници са домена {domain}. Ово су јавне временске линије, сјајан начин да откријете нове људе.", + "onboarding.page_four.home": "Почетна временска линија приказује статусе људи које Ви пратите.", "onboarding.page_four.notifications": "Колона са обавештењима Вам приказује када неко прича са Вама.", "onboarding.page_one.federation": "Мастодонт је мрежа независних сервера који се увезују да направе једну већу друштвену мрежу. Ове сервере зовемо инстанцама.", "onboarding.page_one.full_handle": "Ваш пун надимак", @@ -248,7 +248,7 @@ "privacy.private.short": "Само за пратиоце", "privacy.public.long": "Објави на јавној лајни", "privacy.public.short": "Јавно", - "privacy.unlisted.long": "Не објављуј на јавним лајнама", + "privacy.unlisted.long": "Не објављуј на јавним временским линијама", "privacy.unlisted.short": "Неизлистано", "regeneration_indicator.label": "Учитавање…", "regeneration_indicator.sublabel": "Ваша почетна страница се припрема!", @@ -306,23 +306,23 @@ "status.sensitive_warning": "Осетљив садржај", "status.share": "Подели", "status.show_less": "Прикажи мање", - "status.show_less_all": "Show less for all", + "status.show_less_all": "Прикажи мање за све", "status.show_more": "Прикажи више", - "status.show_more_all": "Show more for all", + "status.show_more_all": "Прикажи више за све", "status.unmute_conversation": "Укључи преписку", "status.unpin": "Откачи са профила", "tabs_bar.federated_timeline": "Федерисано", "tabs_bar.home": "Почетна", "tabs_bar.local_timeline": "Локално", "tabs_bar.notifications": "Обавештења", - "tabs_bar.search": "Search", - "trends.count_by_accounts": "{count} {rawCount, plural, one {person} other {people}} talking", + "tabs_bar.search": "Претрага", + "trends.count_by_accounts": "{count} {rawCount, plural, one {човек} other {људи}} прича", "ui.beforeunload": "Ако напустите Мастодонт, изгубићете написани нацрт.", "upload_area.title": "Превуците овде да отпремите", "upload_button.label": "Додај мултимедију (JPEG, PNG, GIF, WebM, MP4, MOV)", "upload_form.description": "Опишите за особе са оштећеним видом", "upload_form.focus": "Подесите", - "upload_form.undo": "Избриши", + "upload_form.undo": "Обриши", "upload_progress.label": "Отпремам...", "video.close": "Затвори видео", "video.exit_fullscreen": "Напусти цео екран", diff --git a/app/javascript/mastodon/locales/te.json b/app/javascript/mastodon/locales/te.json index bbe575fde16..599c8205ffc 100644 --- a/app/javascript/mastodon/locales/te.json +++ b/app/javascript/mastodon/locales/te.json @@ -7,12 +7,12 @@ "account.disclaimer_full": "క్రింది సమాచారం వాడుకరి యొక్క ప్రొఫైల్ను అసంపూర్తిగా ప్రతిబింబించవచ్చు.", "account.domain_blocked": "డొమైన్ దాచిపెట్టబడినది", "account.edit_profile": "ప్రొఫైల్ని సవరించండి", - "account.endorse": "Feature on profile", + "account.endorse": "ప్రొఫైల్లో చూపించు", "account.follow": "అనుసరించు", "account.followers": "అనుచరులు", - "account.followers.empty": "No one follows this user yet.", + "account.followers.empty": "ఈ వినియోగదారుడిని ఇంకా ఎవరూ అనుసరించడంలేదు.", "account.follows": "అనుసరిస్తున్నవి", - "account.follows.empty": "This user doesn't follow anyone yet.", + "account.follows.empty": "ఈ వినియోగదారి ఇంకా ఎవరినీ అనుసరించడంలేదు.", "account.follows_you": "మిమ్మల్ని అనుసరిస్తున్నారు", "account.hide_reblogs": "@{name} నుంచి బూస్ట్ లను దాచిపెట్టు", "account.media": "మీడియా", @@ -29,7 +29,7 @@ "account.show_reblogs": "@{name}నుంచి బూస్ట్ లను చూపించు", "account.unblock": "@{name}పై బ్లాక్ ను తొలగించు", "account.unblock_domain": "{domain}ను దాచవద్దు", - "account.unendorse": "Don't feature on profile", + "account.unendorse": "ప్రొఫైల్లో చూపించవద్దు", "account.unfollow": "అనుసరించవద్దు", "account.unmute": "@{name}పై మ్యూట్ ని తొలగించు", "account.unmute_notifications": "@{name} నుంచి ప్రకటనలపై మ్యూట్ ని తొలగించు", @@ -89,7 +89,7 @@ "confirmations.mute.confirm": "మ్యూట్ చేయి", "confirmations.mute.message": "{name}ను మీరు ఖచ్చితంగా మ్యూట్ చేయాలనుకుంటున్నారా?", "confirmations.redraft.confirm": "తొలగించు & తిరగరాయు", - "confirmations.redraft.message": "మీరు ఖచ్చితంగా ఈ స్టేటస్ ని తొలగించి తిరగరాయాలనుకుంటున్నారా? మీరు అన్ని ప్రత్యుత్తరాలను, బూస్ట్ లను మరియు ఇష్టపడినవి కోల్పోతారు.", + "confirmations.redraft.message": "మీరు ఖచ్చితంగా ఈ స్టేటస్ ని తొలగించి తిరగరాయాలనుకుంటున్నారా? ఈ స్టేటస్ యొక్క బూస్ట్ లు మరియు ఇష్టాలు పోతాయి,మరియు ప్రత్యుత్తరాలు అనాధలు అయిపోతాయి.", "confirmations.unfollow.confirm": "అనుసరించవద్దు", "confirmations.unfollow.message": "{name}ను మీరు ఖచ్చితంగా అనుసరించవద్దనుకుంటున్నారా?", "embed.instructions": "దిగువ కోడ్ను కాపీ చేయడం ద్వారా మీ వెబ్సైట్లో ఈ స్టేటస్ ని పొందుపరచండి.", @@ -108,19 +108,19 @@ "emoji_button.search_results": "శోధన ఫలితాలు", "emoji_button.symbols": "చిహ్నాలు", "emoji_button.travel": "ప్రయాణం & ప్రదేశాలు", - "empty_column.blocks": "You haven't blocked any users yet.", + "empty_column.blocks": "మీరు ఇంకా ఏ వినియోగదారులనూ బ్లాక్ చేయలేదు.", "empty_column.community": "స్థానిక కాలక్రమం ఖాళీగా ఉంది. మొదలుపెట్టడానికి బహిరంగంగా ఏదో ఒకటి వ్రాయండి!", "empty_column.direct": "మీకు ఇంకా ఏ ప్రత్యక్ష సందేశాలు లేవు. మీరు ఒకదాన్ని పంపినప్పుడు లేదా స్వీకరించినప్పుడు, అది ఇక్కడ చూపబడుతుంది.", - "empty_column.domain_blocks": "There are no hidden domains yet.", - "empty_column.favourited_statuses": "You don't have any favourite toots yet. When you favourite one, it will show up here.", - "empty_column.favourites": "No one has favourited this toot yet. When someone does, they will show up here.", - "empty_column.follow_requests": "You don't have any follow requests yet. When you receive one, it will show up here.", + "empty_column.domain_blocks": "దాచబడిన డొమైన్లు ఇంకా ఏమీ లేవు.", + "empty_column.favourited_statuses": "మీకు ఇష్టపడిన టూట్లు ఇంకా ఎమీ లేవు. మీరు ఒకదానిని ఇష్టపడినప్పుడు, అది ఇక్కడ కనిపిస్తుంది.", + "empty_column.favourites": "ఈ టూట్ను ఇంకా ఎవరూ ఇష్టపడలేదు. ఎవరైనా అలా చేసినప్పుడు, అవి ఇక్కడ కనబడతాయి.", + "empty_column.follow_requests": "మీకు ఇంకా ఫాలో రిక్వెస్టులు ఏమీ రాలేదు. మీకు ఒకటి రాగానే, అది ఇక్కడ కనబడుతుంది.", "empty_column.hashtag": "ఇంకా హాష్ ట్యాగ్లో ఏమీ లేదు.", "empty_column.home": "మీ హోమ్ కాలక్రమం ఖాళీగా ఉంది! {Public} ను సందర్శించండి లేదా ఇతర వినియోగదారులను కలుసుకోవడానికి మరియు అన్వేషణ కోసం శోధనను ఉపయోగించండి.", "empty_column.home.public_timeline": "ప్రజా కాలక్రమం", "empty_column.list": "ఇంకా ఈ జాబితాలో ఏదీ లేదు. ఈ జాబితాలోని సభ్యులు కొత్త స్టేటస్ లను పోస్ట్ చేసినప్పుడు, అవి ఇక్కడ కనిపిస్తాయి.", - "empty_column.lists": "You don't have any lists yet. When you create one, it will show up here.", - "empty_column.mutes": "You haven't muted any users yet.", + "empty_column.lists": "మీకు ఇంకా జాబితాలు ఏమీ లేవు. మీరు ఒకటి సృష్టించగానే, అది ఇక్కడ కనబడుతుంది.", + "empty_column.mutes": "మీరు ఇంకా ఏ వినియోగదారులనూ మ్యూట్ చేయలేదు.", "empty_column.notifications": "మీకు ఇంకా ఏ నోటిఫికేషన్లు లేవు. సంభాషణను ప్రారంభించడానికి ఇతరులతో ప్రతిస్పందించండి.", "empty_column.public": "ఇక్కడ ఏమీ లేదు! దీన్ని నింపడానికి బహిరంగంగా ఏదైనా వ్రాయండి, లేదా ఇతర దృష్టాంతాల్లోని వినియోగదారులను అనుసరించండి", "follow_request.authorize": "అనుమతించు", @@ -137,32 +137,32 @@ "home.column_settings.show_reblogs": "బూస్ట్ లను చూపించు", "home.column_settings.show_replies": "ప్రత్యుత్తరాలను చూపించు", "keyboard_shortcuts.back": "వెనక్కి తిరిగి వెళ్ళడానికి", - "keyboard_shortcuts.blocked": "to open blocked users list", + "keyboard_shortcuts.blocked": "బ్లాక్ చేయబడిన వినియోగదారుల జాబితాను తెరవడానికి", "keyboard_shortcuts.boost": "బూస్ట్ చేయడానికి", "keyboard_shortcuts.column": "నిలువు వరుసలలో ఒకదానిపై దృష్టి పెట్టడానికి", "keyboard_shortcuts.compose": "కంపోజ్ టెక్స్ట్ఏరియా పై దృష్టి పెట్టడానికి", "keyboard_shortcuts.description": "Description", - "keyboard_shortcuts.direct": "to open direct messages column", + "keyboard_shortcuts.direct": "నేరుగా పంపిన సందేశాల నిలువు వరుసను తెరువడానికి", "keyboard_shortcuts.down": "జాబితాలో క్రిందికి వెళ్ళడానికి", "keyboard_shortcuts.enter": "to open status", "keyboard_shortcuts.favourite": "ఇష్టపడడానికి", - "keyboard_shortcuts.favourites": "to open favourites list", - "keyboard_shortcuts.federated": "to open federated timeline", + "keyboard_shortcuts.favourites": "ఇష్టాల జాబితాను తెరవడానికి", + "keyboard_shortcuts.federated": "సమాఖ్య కాలక్రమాన్ని తెరవడానికి", "keyboard_shortcuts.heading": "కీబోర్డ్ సత్వరమార్గాలు", - "keyboard_shortcuts.home": "to open home timeline", + "keyboard_shortcuts.home": "హోమ్ కాలక్రమాన్ని తెరవడానికి", "keyboard_shortcuts.hotkey": "హాట్ కీ", "keyboard_shortcuts.legend": "ఈ లెజెండ్ ప్రదర్శించడానికి", - "keyboard_shortcuts.local": "to open local timeline", + "keyboard_shortcuts.local": "లోకల్ కాలక్రమాన్ని తెరవడానికి", "keyboard_shortcuts.mention": "రచయితను ప్రస్తావించడానికి", - "keyboard_shortcuts.muted": "to open muted users list", - "keyboard_shortcuts.my_profile": "to open your profile", - "keyboard_shortcuts.notifications": "to open notifications column", - "keyboard_shortcuts.pinned": "to open pinned toots list", + "keyboard_shortcuts.muted": "మ్యూట్ చేయబడిన వినియోగదారుల జాబితాను తెరవడానికి", + "keyboard_shortcuts.my_profile": "మీ ప్రొఫైల్ను తెరవడానికి", + "keyboard_shortcuts.notifications": "నోటిఫికేషన్ల నిలువు వరుసను తెరవడానికి", + "keyboard_shortcuts.pinned": "అతికించబడిన టూట్ల జాబితాను తెరవడానికి", "keyboard_shortcuts.profile": "రచయిత ప్రొఫైల్ ను తెరవాలంటే", "keyboard_shortcuts.reply": "ప్రత్యుత్తరం ఇవ్వడానికి", - "keyboard_shortcuts.requests": "to open follow requests list", + "keyboard_shortcuts.requests": "ఫాలో రిక్వెస్ట్ల జాబితాను తెరవడానికి", "keyboard_shortcuts.search": "శోధనపై దృష్టి పెట్టండి", - "keyboard_shortcuts.start": "to open \"get started\" column", + "keyboard_shortcuts.start": "\"ఇక్కడ ప్రారంభించండి\" నిలువు వరుసను తెరవడానికి", "keyboard_shortcuts.toggle_hidden": "CW వెనుక ఉన్న పాఠ్యాన్ని చూపడానికి / దాచడానికి", "keyboard_shortcuts.toot": "ఒక సరికొత్త టూట్ను ప్రారంభించడానికి", "keyboard_shortcuts.unfocus": "పాఠ్యం వ్రాసే ఏరియా/శోధన పట్టిక నుండి బయటకు రావడానికి", @@ -183,10 +183,10 @@ "missing_indicator.label": "దొరకలేదు", "missing_indicator.sublabel": "ఈ వనరు కనుగొనబడలేదు", "mute_modal.hide_notifications": "ఈ వినియోగదారు నుండి నోటిఫికేషన్లను దాచాలా?", - "navigation_bar.apps": "Mobile apps", + "navigation_bar.apps": "మొబైల్ ఆప్ లు", "navigation_bar.blocks": "బ్లాక్ చేయబడిన వినియోగదారులు", "navigation_bar.community_timeline": "స్థానిక కాలక్రమం", - "navigation_bar.compose": "Compose new toot", + "navigation_bar.compose": "కొత్త టూట్ను రాయండి", "navigation_bar.direct": "ప్రత్యక్ష సందేశాలు", "navigation_bar.discover": "కనుగొను", "navigation_bar.domain_blocks": "దాచిన డొమైన్లు", @@ -280,7 +280,7 @@ "status.cancel_reblog_private": "బూస్ట్ను తొలగించు", "status.cannot_reblog": "ఈ పోస్ట్ను బూస్ట్ చేయడం సాధ్యం కాదు", "status.delete": "తొలగించు", - "status.detailed_status": "Detailed conversation view", + "status.detailed_status": "వివరణాత్మక సంభాషణ వీక్షణ", "status.direct": "@{name}కు నేరుగా సందేశం పంపు", "status.embed": "ఎంబెడ్", "status.favourite": "ఇష్టపడు", @@ -297,7 +297,7 @@ "status.reblog": "బూస్ట్", "status.reblog_private": "అసలు ప్రేక్షకులకు బూస్ట్ చేయి", "status.reblogged_by": "{name} బూస్ట్ చేసారు", - "status.reblogs.empty": "No one has boosted this toot yet. When someone does, they will show up here.", + "status.reblogs.empty": "ఈ టూట్ను ఇంకా ఎవరూ బూస్ట్ చేయలేదు. ఎవరైనా చేసినప్పుడు, అవి ఇక్కడ కనబడతాయి.", "status.redraft": "తొలగించు & తిరగరాయు", "status.reply": "ప్రత్యుత్తరం", "status.replyAll": "సంభాషణకు ప్రత్యుత్తరం ఇవ్వండి", @@ -319,7 +319,7 @@ "trends.count_by_accounts": "{count} {rawCount, plural, one {person} other {people}} మాట్లాడుతున్నారు", "ui.beforeunload": "మీరు మాస్టొడొన్ను వదిలివేస్తే మీ డ్రాఫ్ట్లు పోతాయి.", "upload_area.title": "అప్లోడ్ చేయడానికి డ్రాగ్ & డ్రాప్ చేయండి", - "upload_button.label": "మీడియాను జోడించండి", + "upload_button.label": "మీడియాను జోడించండి (JPEG, PNG, GIF, WebM, MP4, MOV)", "upload_form.description": "దృష్టి లోపమున్న వారి కోసం వివరించండి", "upload_form.focus": "కత్తిరించు", "upload_form.undo": "తొలగించు", diff --git a/app/javascript/mastodon/locales/zh-TW.json b/app/javascript/mastodon/locales/zh-TW.json index 4e437f0e025..61484dfc310 100644 --- a/app/javascript/mastodon/locales/zh-TW.json +++ b/app/javascript/mastodon/locales/zh-TW.json @@ -10,9 +10,9 @@ "account.endorse": "在個人資訊頁面上推薦對方", "account.follow": "關注", "account.followers": "關注者", - "account.followers.empty": "還沒有人關注這個使用者", + "account.followers.empty": "還沒有人關注這個使用者。", "account.follows": "正在關注", - "account.follows.empty": "這個使用者還沒有關注任何人", + "account.follows.empty": "這個使用者還沒有關注任何人。", "account.follows_you": "關注你", "account.hide_reblogs": "隱藏來自 @{name} 的轉推", "account.media": "媒體", @@ -89,7 +89,7 @@ "confirmations.mute.confirm": "消音", "confirmations.mute.message": "你確定要消音 {name} ？", "confirmations.redraft.confirm": "刪除 & 編輯", - "confirmations.redraft.message": "你確定要刪除這條嘟文並重新編輯它嗎? 所有相關的回覆、轉嘟與最愛都會被刪除。", + "confirmations.redraft.message": "你確定要刪除這條嘟文並重新編輯它嗎？所有相關的轉嘟與最愛都會被刪除，而對原始嘟文的回覆將會變成孤兒。", "confirmations.unfollow.confirm": "取消關注", "confirmations.unfollow.message": "真的不要繼續關注 {name} 了嗎？", "embed.instructions": "要內嵌此嘟文，請將以下代碼貼進你的網站。", @@ -183,7 +183,7 @@ "missing_indicator.label": "找不到", "missing_indicator.sublabel": "找不到此資源", "mute_modal.hide_notifications": "隱藏來自這個使用者的通知？", - "navigation_bar.apps": "Mobile apps", + "navigation_bar.apps": "行動應用程式", "navigation_bar.blocks": "封鎖的使用者", "navigation_bar.community_timeline": "本地時間軸", "navigation_bar.compose": "寫新的嘟文", @@ -284,7 +284,7 @@ "status.direct": "發送私訊給 @{name}", "status.embed": "嵌入", "status.favourite": "最愛", - "status.filtered": "Filtered", + "status.filtered": "已過濾", "status.load_more": "載入更多", "status.media_hidden": "隱藏媒體內容", "status.mention": "提到 @{name}", @@ -319,7 +319,7 @@ "trends.count_by_accounts": "{count} 位使用者在討論", "ui.beforeunload": "如果離開 Mastodon，你的草稿將會不見。", "upload_area.title": "拖放來上傳", - "upload_button.label": "上傳媒體檔案", + "upload_button.label": "上傳媒體檔案 (JPEG, PNG, GIF, WebM, MP4, MOV)", "upload_form.description": "為視障人士增加文字說明", "upload_form.focus": "裁切", "upload_form.undo": "刪除", diff --git a/config/locales/activerecord.ast.yml b/config/locales/activerecord.ast.yml index 0b77eecf27f..0d161faf22f 100644 --- a/config/locales/activerecord.ast.yml +++ b/config/locales/activerecord.ast.yml @@ -1,2 +1 @@ ---- -ast: +ast: {} diff --git a/config/locales/activerecord.cy.yml b/config/locales/activerecord.cy.yml index f1dabe347be..55eb78e74b9 100644 --- a/config/locales/activerecord.cy.yml +++ b/config/locales/activerecord.cy.yml @@ -1,3 +1,13 @@ --- cy: - activerecord: {} + activerecord: + errors: + models: + account: + attributes: + username: + invalid: dim ond llythrennau, rhifau a tanlinellau + status: + attributes: + reblog: + taken: o'r statws sy'n bodoli'n barod diff --git a/config/locales/ar.yml b/config/locales/ar.yml index 39995209bef..26331244d57 100644 --- a/config/locales/ar.yml +++ b/config/locales/ar.yml @@ -30,17 +30,23 @@ ar: other_instances: خوادم أخرى privacy_policy: سياسة الخصوصية source_code: الشفرة المصدرية - status_count_after: منشورات + status_count_after: + one: منشور + other: منشورات status_count_before: نشروا terms: شروط الخدمة - user_count_after: مستخدِمين + user_count_after: + one: مستخدِم + other: مستخدِمين user_count_before: يستضيف what_is_mastodon: ما هو ماستدون ؟ accounts: choices_html: 'توصيات %{name} :' follow: إتبع - followers: متابِعون - following: يتابعون + followers: + one: مُتابِع + other: مُتابِعون + following: مُتابَع joined: انضم·ت في %{date} media: الوسائط moved_html: "%{name} إنتقلَ إلى %{new_profile_link} :" @@ -50,7 +56,9 @@ ar: people_who_follow: الأشخاص الذين يتبعون %{name} pin_errors: following: يجب أن تكون مِن متابعي حساب الشخص الذي تريد إبرازه - posts: تبويقات + posts: + one: تبويق + other: تبويقات posts_tab_heading: تبويقات posts_with_replies: التبويقات و الردود reserved_username: إسم المستخدم محجوز @@ -256,7 +264,9 @@ ar: suspend: تعليق severity: الشدة show: - affected_accounts: هناك %{count} حسابات في قاعدة البيانات متأثرة بذلك + affected_accounts: + one: حساب واحد معني في قاعدة البيانات + other: "%{count} حسابات معنية في قاعدة البيانات" retroactive: silence: إلغاء الكتم عن كافة الحسابات المتواجدة على هذا النطاق suspend: إلغاء التعليق المفروض على كافة حسابات هذا النطاق @@ -354,6 +364,7 @@ ar: desc_html: أسماء النطاقات التي إلتقى بها مثيل الخادوم على البيئة الموحَّدة فيديفرس title: نشر عدد مثيلات الخوادم التي تم مصادفتها preview_sensitive_media: + desc_html: روابط المُعَاينة على مواقع الويب الأخرى ستقوم بعرض صُوَر مصغّرة حتى و إن كانت الوسائط حساسة. title: إظهار الصور الحساسة في مُعاينات أوبن غراف registrations: closed_message: @@ -528,6 +539,9 @@ ar: thread: المحادثات edit: title: تعديل عامل التصفية + errors: + invalid_context: لم تقم بتحديد أي مجال أو أنّ المجال غير صالح + invalid_irreversible: إلّا مجالات الإشعارات و الخيط الرئيسي معنية بالتصفية اللارجعية index: delete: إزالة title: عوامل التصفية @@ -549,9 +563,11 @@ ar: generic: changes_saved_msg: تم حفظ التعديلات بنجاح ! save_changes: حفظ التغييرات - validation_errors: هناك شيء ليس على ما يرام ! رجاءًا تحقق من الأخطاء الـ %{count} أسفله + validation_errors: + one: هناك شيء ما لا يبدو أنه على ما يُرام بعدُ. يُرجى الإطلاع على الخطأ أدناه + other: هناك شيء ليس على ما يُرام! يُرجى معاينة الأخطاء الـ %{count} التالية imports: - preface: You can import certain data like all the people you are following or blocking into your account on this instance, from files created by an export on another instance. + preface: بإمكانك استيراد بيانات قد قُمتَ بتصديرها مِن مثيل خادوم آخَر، كقوائم المستخدِمين الذين كنتَ تتابِعهم أو قُمتَ بحظرهم. success: تم تحميل بياناتك بنجاح وسيتم معالجتها في الوقت المناسب types: blocking: قائمة المحظورين @@ -572,7 +588,9 @@ ar: expires_in_prompt: أبدا generate: توليد invited_by: 'تمت دعوتك من طرف :' - max_uses: "%{count} استخدامات" + max_uses: + one: استعمال واحد + other: "%{count} استخدامات" max_uses_prompt: بلا حدود prompt: توليد و مشاركة روابط للسماح للآخَرين بالنفاذ إلى مثيل الخادوم هذا table: @@ -599,7 +617,8 @@ ar: body: هذا هو مُلَخَّص الرسائل التي فاتتك وذلك منذ آخر زيارة لك في %{since} mention: "%{name} أشار إليك في :" new_followers_summary: و لقد تحصلت على %{count} متتبعين جدد أثناء فترة غيابك ! رائع ! - subject: "%{count} إشعارات جديدة منذ زيارتك الأخيرة \U0001F418" + subject: + one: "إشعار جديد واحد منذ آخر زيارة لك لـ \U0001F418" title: أثناء فترة غيابك … favourite: body: 'أُعجب %{name} بمنشورك :' @@ -717,8 +736,12 @@ ar: statuses: attached: description: 'مُرفَق : %{attached}' - image: "%{count} صور" - video: "%{count} فيديوهات" + image: + one: "%{count} صورة" + other: "%{count} صُوَر" + video: + one: "%{count} فيديو" + other: "%{count} فيديوهات" boosted_from_html: تم إعادة ترقيته مِن %{acct_link} content_warning: 'تحذير عن المحتوى : %{warning}' disallowed_hashtags: 'يحتوي على وسوم ممنوعة : %{tags}' @@ -742,7 +765,7 @@ ar: unlisted_long: يُمكن لأيٍ كان رُؤيتَه و لكن لن يُعرَض على الخيوط العامة stream_entries: pinned: تبويق مثبّت - reblogged: رقى + reblogged: رقّاه sensitive_content: محتوى حساس terms: title: شروط الخدمة وسياسة الخصوصية على %{instance} diff --git a/config/locales/ast.yml b/config/locales/ast.yml index aa3d348130f..bf7599d7322 100644 --- a/config/locales/ast.yml +++ b/config/locales/ast.yml @@ -4,8 +4,10 @@ ast: about_mastodon_html: Mastodon ye una rede social basada en protocolos abiertos y software de códigu llibre. Ye descentralizada, como'l corréu electrónicu. about_this: Tocante a administered_by: 'Alministráu por:' + api: API contact: Contautu contact_unavailable: N/D + documentation: Documentación extended_description_html: |

    Un llugar bonu pa les regles

    Entá nun se configuró la descripción estendida.

    @@ -22,7 +24,9 @@ ast: user_count_after: usuarios what_is_mastodon: "¿Qué ye Mastodon?" accounts: - followers: Siguidores + followers: + one: Siguidor + other: Siguidores moved_html: "%{name} mudóse a %{new_profile_link}:" network_hidden: Esta información nun ta disponible nothing_here: "¡Equí nun hai nada!" @@ -57,6 +61,7 @@ ast: action_logs: actions: create_domain_block: "%{name} bloquió'l dominiu %{target}" + disable_custom_emoji: "%{name} desactivó'l fustaxe %{target}" disable_user: "%{name} desactivó l'aniciu de sesión del usuariu %{target}" custom_emojis: by_domain: Dominiu @@ -180,6 +185,7 @@ ast: acct: nome_usuariu@dominiu de la cuenta nueva notification_mailer: digest: + body: Equí hai un resume de los mensaxes que nun viesti dende la última visita'l %{since} mention: "%{name} mentóte en:" subject: other: "%{count} avisos nuevos dende la última visita \U0001F418" @@ -250,6 +256,7 @@ ast: notifications: Avisos preferences: Preferencies settings: Axustes + two_factor_authentication: Autenticación en dos pasos statuses: attached: image: @@ -262,15 +269,21 @@ ast: limit: Yá fixesti'l númberu máxiumu de toots show_more: Amosar más title: "%{name}: «%{quote}»" + visibilities: + private: Namái siguidores stream_entries: sensitive_content: Conteníu sensible themes: default: Mastodon two_factor_authentication: code_hint: Introduz el códigu xeneráu pola aplicación autenticadora pa confirmar + disable: Desactivar enabled: L'autenticación en dos pasos ta activada enabled_success: L'autenticación en dos pasos activóse con ésitu + generate_recovery_codes: Xenerar códigos de recuperación + lost_recovery_codes: Los códigos de recuperación permítente recuperar l'accesu a la cuenta si pierdes el teléfonu. Si tamién pierdes esos códigos, pues xeneralos de nueves equí. Los códigos de recuperación vieyos van invalidase. manual_instructions: 'Si nun pues escaniar el códigu QR y precises introducilu a mano, equí ta''l secretu en testu planu:' + recovery_codes: Códigos de recuperación user_mailer: welcome: full_handle_hint: Esto ye lo que-yos diríes a los collacios pa que puean unviate mensaxes o siguite dende otra instancia. diff --git a/config/locales/cs.yml b/config/locales/cs.yml index a55ed00b00c..c086b1cfa50 100644 --- a/config/locales/cs.yml +++ b/config/locales/cs.yml @@ -47,7 +47,7 @@ cs: one: Sledovatel other: Sledovatelé following: Sleduje - joined: Připojil/a se %{date} + joined: Připojil/a se dne %{date} media: Média moved_html: 'Účet %{name} byl přesunut na %{new_profile_link}:' network_hidden: Tato informace není k dispozici @@ -774,7 +774,7 @@ cs: unlisted_long: Všichni mohou vidět, ale není zahrnut ve veřejných časových osách stream_entries: pinned: Připnutý toot - reblogged: boostnutý + reblogged: boostnul/a sensitive_content: Citlivý obsah terms: body_html: | @@ -827,7 +827,7 @@ cs:

    Ano. Cookies jsou malé soubory, které stránka nebo její poskytovatel uloží na pevný disk vašeho počítače (pokud to dovolíte). Tyto cookies umožňují stránce rozpoznat váš prohlížeč a, pokud máte registrovaný účet, přidružit ho s vaším registrovaným účtem.

    -

    POužíváme cookies pro pochopení a ukládání vašich předvoleb pro budoucí návštěvy.

    +

    Používáme cookies pro pochopení a ukládání vašich předvoleb pro budoucí návštěvy.

    @@ -843,7 +843,7 @@ cs:

    Používání stránky dětmi

    -

    Pokud se tento server nachází v EU nebo EHP: Naše stránka, produkty a služby jsou všechny směřovány na lidi, kterým je alespoň 16 let. Pokud je vám méně než 16, dle požadavků nařízení GDPR (Obecné nařízení o ochě sobních údajů)

    +

    Pokud se tento server nachází v EU nebo EHP: Naše stránka, produkty a služby jsou všechny směřovány na lidi, kterým je alespoň 16 let. Pokud je vám méně než 16, dle požadavků nařízení GDPR (Obecné nařízení o ochě sobních údajů) tuto stránku nepoužívejte.

    Pokud se tento server nachází v USA: Naše stránka, produkty a služby jsou všechny směřovány na lidi, kterým je alespoň 13 let. Pokud je vám méně než 13, dle požadavků zákona COPPA (Children's Online Privacy Protection Act) tuto stránku nepoužívejte.

    diff --git a/config/locales/cy.yml b/config/locales/cy.yml index 84e8d9e2b0a..221455c2f60 100644 --- a/config/locales/cy.yml +++ b/config/locales/cy.yml @@ -2,21 +2,39 @@ cy: about: about_hashtag_html: Dyma dwtiau cyhoeddus wedi eu tagio gyda #%{hashtag}. Gallwch ryngweithio gyda nhw os oes gennych gyfrif yn unrhywle yn y ffedysawd. + about_mastodon_html: Mae Mastodon yn rhywdwaith cymdeithasol sy'n seiliedig ar brotocolau gwê a meddalwedd côd agored rhad ac am ddim. Mae'n ddatganoledig yn debyg i e-bost. about_this: Ynghylch administered_by: 'Gweinyddir gan:' api: API apps: Apiau symudol + closed_registrations: Mae Mastodon yn rwydwaith cymdeithasol sy'n seiliedig ar brotocolau gwê a meddalwedd côd agored rhad ac am ddim. Mae'n ddatganoledig fel e-bost. contact: Cyswllt + contact_missing: Heb ei osod + contact_unavailable: Ddim yn berthnasol documentation: Dogfennaeth + extended_description_html: | +

    Lle da ar gyfer rheolau

    +

    Nid yw'r disgrifiad estynedig wedi ei sefydlu eto.

    + features: + humane_approach_body: Gan ddysgu o fethiannau rhwydweithiau eraill, mae Mastodon yn anelu i wneud penderfyniadau dylunio moesol er mwyn ymladd y camddefnydd o gyfryngau cymdeithasol. + humane_approach_title: Agwedd fwy dynol + not_a_product_body: Nid yw Mastodon yn rwydwaith fasnachol. Nid oes hysbysebion, cloddio data na gerddi caeedig. Nid oes awdurdod ganolog. + not_a_product_title: Rwyt yn berson, nid yn gynnyrch + real_conversation_title: Wedi ei adeiladu ar gyfer trafodaeth go iawn + within_reach_title: Bob tro o fewn gafael + generic_description: Mae %{domain} yn un gweinydd yn y rhwydwaith + hosted_on: Mastodon wedi ei weinyddu ar %{domain} learn_more: Dysgu mwy privacy_policy: Polisi preifatrwydd source_code: Cod ffynhonnell status_count_after: one: statws + status_count_before: Pwy ysgrifennodd terms: Telerau Gwasanaeth user_count_after: one: defnyddiwr other: defnyddiwyr + user_count_before: Cartref i what_is_mastodon: Beth yw Mastodon? accounts: choices_html: 'Dewisiadau %{name}:' @@ -24,14 +42,22 @@ cy: followers: one: Dilynwr other: Dilynwyr + following: Yn dilyn joined: Ymunodd %{date} media: Cyfryngau - network_hidden: Nid yw'r wybodaeth hon ar gael + moved_html: 'Mae %{name} wedi symud i %{new_profile_link}:' + network_hidden: Nid yw'r wybodaeth hyn ar gael nothing_here: Does dim byd yma! + people_followed_by: Pobl y mae %{name} yn ei ddilyn + people_who_follow: Pobl sy'n dilyn %{name} + pin_errors: + following: Rhaid i ti fod yn dilyn y person yr ydych am ei gymeradwyo yn barod posts: one: Twt other: Twtiau posts_tab_heading: Twtiau + posts_with_replies: Twtiau ac atebion + reserved_username: Mae'r enw defnyddior yn neilltuedig roles: admin: Gweinyddwr bot: Bot @@ -40,12 +66,15 @@ cy: admin: account_moderation_notes: create: Gadael nodyn + created_msg: Crewyd nodyn cymedroli yn llwyddiannus! delete: Dileu + destroyed_msg: Dinistrwyd nodyn cymedroli yn llwyddiannus! accounts: are_you_sure: Ydych chi'n siŵr? avatar: Afatar by_domain: Parth change_email: + changed_msg: E-bost cyfri wedi ei newid yn llwyddiannus! current_email: E-bost Cyfredol label: Newid E-bost new_email: E-bost Newydd @@ -53,54 +82,172 @@ cy: title: Newid E-bost i %{username} confirm: Cadarnhau confirmed: Cadarnhawyd + confirming: Cadarnhau + demote: Diraddio disable: Diffodd + disable_two_factor_authentication: Diffodd 2FA + disabled: Wedi ei ddiffodd + display_name: '' domain: Parth edit: Golygu email: E-bost email_status: Statws E-bost enable: Galluogi + enabled: Wedi ei alluogi feed_url: Ffrwd URL + followers: Dilynwyr + followers_url: URL Dilynwyr + follows: Yn dilyn inbox_url: URL Mewnflwch ip: IP location: all: Popeth - local: Leol + local: Lleol remote: Pell title: Lleoliad + login_status: Statws mewngofnodi media_attachments: Atodiadau moderation: all: Popeth + silenced: Wedi ei dawelu + suspended: Wedi ei atal title: Cymedroli - outbox_url: URL blwch allan + moderation_notes: Nodiadau cymedroli + most_recent_activity: Gweithgarwch diweddaraf + most_recent_ip: IP diweddaraf + not_subscribed: Heb danysgrifio + order: + alphabetic: Allfabetig + most_recent: Mwyaf diweddaraf + title: Trefn + outbox_url: Allflwch URL profile_url: URL proffil + promote: Hyrwyddo + protocol: Protocol public: Cyhoeddus + push_subscription_expires: Tanysgrifiad PUSH yn dod i ben + resend_confirmation: + already_confirmed: Mae'r defnyddiwr hwn wedi ei gadarnhau yn barod + send: Ailanfonwch e-bost cadarnhad + success: E-bost cadarnhau wedi ei anfon yn llwyddiannus! reset: Ailosod - reset_password: Newid cyfrinair + reset_password: Ailosod cyfrinair + resubscribe: Aildanysgrifio + role: Caniatâd roles: + admin: Gweinyddwr + moderator: Safonwr + staff: Staff user: Defnyddiwr + salmon_url: URL Eog search: Chwilio + shared_inbox_url: URL Mewnflwch wedi ei rannu show: + created_reports: Adroddiadau a grewyd gan y cyfri hwn report: adrodd + targeted_reports: Adroddiadau am y cyfri hwn + silence: Tawelu subscribe: Tanysgrifio title: Cyfrifon + unconfirmed_email: E-bost heb ei gadarnhau + undo_silenced: Dadwneud tawelu + undo_suspension: Dadwneud ataliad + unsubscribe: Dad-danysgrifio username: Enw defnyddiwr web: Gwe + action_logs: + actions: + assigned_to_self_report: Aseiniodd %{name} adroddiad %{target} i'w hunan + change_email_user: Newidodd %{name} gyfeiriad e-bost y defnyddiwr %{target} + confirm_user: Cadarnhaodd %{name} gyfeiriad e-bost y defnyddiwr %{target} + create_custom_emoji: Uwchlwythodd %{name} emoji newydd %{target} + create_domain_block: Blociodd %{name} y parth %{target} + create_email_domain_block: Cosbrestrwyd parth e-bost %{target} gan %{name} + deleted_status: "(statws wedi ei ddileu)" custom_emojis: by_domain: Parth copy: Copïo + copy_failed_msg: Methwyd i greu copi lleol o'r emoji hwnnw + created_msg: Llwyddwyd i greu emoji! delete: Dileu + destroyed_msg: Llwyddwyd i ddinistrio emoji! + disable: Diffodd + disabled_msg: Llwyddwyd i ddiffodd ye emoji hwnnw + emoji: Emoji enable: Galluogi + enabled_msg: Llwyddwyd i ganiatau yr emoji hwnnw + image_hint: PNG hyd at 50KB listed: Rhestredig + new: + title: '' + overwrite: Trosysgrifio + shortcode_hint: O leiaf 2 lythyren, dim ond llythrennau alffaniwmerig a tanlinellau + unlisted: Heb ei restru + update_failed_msg: Ni allwyd diweddaru'r emoji hwnnw + updated_msg: Llwyddwyd i ddiweddaru'r emoji! upload: Lanlwytho dashboard: config: Cyfluniad + feature_invites: Dolenni gwahodd feature_registrations: Cofrestriadau features: Nodweddion + open_reports: adroddiadau agored + recent_users: Defnyddwyr diweddar + search: Chwilio testun llawn software: Meddalwedd + space: Defnydd o ofod title: Dangosfwrdd + total_users: cyfanswm defnyddwyr trends: Tueddiadau + week_interactions: ymadweithiau yr wythnos hon + week_users_active: gweithredol yr wythnos hon + week_users_new: defnyddwyr yr wythnos hon + domain_blocks: + domain: Parth + new: + create: Creu bloc + severity: + noop: Dim + silence: Tawelwch + suspend: Atal + reject_media: Gwrthod dogfennau cyfryngau + severities: + noop: Dim + silence: Tawelwch + suspend: Atal + severity: Difrifoldeb + show: + affected_accounts: + one: Mae un cyfri yn y bas data wedi ei effeithio + other: "%{count} o gyfrifoedd yn y bas data wedi eu hefeithio" + retroactive: + silence: Dad-dawelu pob cyfri presennol o'r parth hwn + undo: Dadwneud + undo: Dadwneud + email_domain_blocks: + add_new: Ychwanegu + created_msg: Llwyddwyd i ychwanegu parth e-bost i'r gosbrestr + delete: Dileu + destroyed_msg: Llwyddwyd i ddileu parth e-bost o'r gosbrestr + domain: Parth + new: + create: Ychwanegu parth + title: Cosbrestr e-bost instances: + account_count: Cyfrifoedd hysbys domain_name: Parth + reset: Ailosod + search: Chwilio + invites: + filter: + all: Pob + available: Ar gael + expired: Wedi dod i ben + title: Hidlo + title: Gwahoddiadau + relays: + save_and_enable: Cadw a galluogi + status: Statws settings: contact_information: email: E-bost busnes diff --git a/config/locales/da.yml b/config/locales/da.yml index 74ac464c739..f59c2123dbb 100644 --- a/config/locales/da.yml +++ b/config/locales/da.yml @@ -1,7 +1,7 @@ --- da: about: - about_hashtag_html: Disse er offentlige toots der indeholder tagget #%{hashtag}. Du kan interagere med dem hvis du har en konto hvor som helst i fediverset. + about_hashtag_html: Disse er offentlige trut der indeholder tagget #%{hashtag}. Du kan interagere med dem hvis du har en konto hvor som helst i fediverset. about_mastodon_html: Mastodon er et socialt netværk der er baseret på åbne web protokoller og frit, open-source source software. Der er decentraliseret ligesom e-mail tjenester. about_this: Om administered_by: 'Administreret af:' @@ -20,7 +20,7 @@ da: humane_approach_title: En mere human tilgang not_a_product_body: Mastodon er ikke et kommercielt netværk. Ingen reklamer, ingen datamining, ingen indhegnet haver. Der er ingen central regering. not_a_product_title: Du er en person, ikke et produkt - real_conversation_body: Med 500 tegn til din rådighed og understøttelse af granulært indhold og multimedie advarsler, kan du udtrykke dig på en hvilken som helst måde du ønsker. + real_conversation_body: Med 500 tegn til din rådighed og understøttelse af granulært indhold og medie advarsler, kan du udtrykke dig på en hvilken som helst måde du ønsker. real_conversation_title: Bygget til rigtige samtaler within_reach_body: Adskillige apps for iOS, Android og andre platforme takket være et udviklervenligt API økosystem tillader dig at holde kontakten med dine venner hvor som helst. within_reach_title: Altid indenfor rækkevidde @@ -48,7 +48,7 @@ da: other: Følgere following: Følger joined: Tilmeldt den %{date} - media: Multimedia + media: Medier moved_html: "%{name} er flyttet til %{new_profile_link}:" network_hidden: Denne information er ikke tilgængelig nothing_here: Der er intet her! @@ -110,7 +110,7 @@ da: remote: Fjernt title: Placering login_status: Status på login - media_attachments: Multimedie bilag + media_attachments: Medie bilag memorialize: Omdan til et memoriam moderation: all: Alle @@ -256,7 +256,7 @@ da: silence: Dæmp suspend: Udeluk title: Ny domæne blokering - reject_media: Afvis multimedie filer + reject_media: Afvis medie filer reject_media_hint: Fjerner lokalt lagrede multimedie filer og nægter at hente nogen i fremtiden. Irrelevant for udelukkelser severities: noop: Ingen @@ -732,7 +732,7 @@ da: delete: Sletning af konto development: Udvikling edit_profile: Rediger profil - export: Data exportering + export: Data eksportering followers: Godkendte følgere import: Importer migrate: Konto migrering diff --git a/config/locales/de.yml b/config/locales/de.yml index 847cfa0d8c5..a6d65203fb9 100644 --- a/config/locales/de.yml +++ b/config/locales/de.yml @@ -41,7 +41,7 @@ de: user_count_before: Zuhause für what_is_mastodon: Was ist Mastodon? accounts: - choices_html: "%{name} empfielt:" + choices_html: "%{name} empfiehlt:" follow: Folgen followers: one: Folgende @@ -304,6 +304,7 @@ de: enable_hint: Sobald aktiviert wird dein Server alle öffentlichen Beiträge dieses Relays abonnieren und wird alle öffentlichen Beiträge dieses Servers an es senden. inbox_url: Relay-URL pending: Warte auf Zustimmung des Relays + save_and_enable: Speichern und aktivieren setup: Relayverbindung einrichten status: Status title: Relays diff --git a/config/locales/devise.ast.yml b/config/locales/devise.ast.yml index 0b77eecf27f..0d161faf22f 100644 --- a/config/locales/devise.ast.yml +++ b/config/locales/devise.ast.yml @@ -1,2 +1 @@ ---- -ast: +ast: {} diff --git a/config/locales/devise.cy.yml b/config/locales/devise.cy.yml index a60884c5bcb..91f6765657f 100644 --- a/config/locales/devise.cy.yml +++ b/config/locales/devise.cy.yml @@ -1,6 +1,64 @@ --- cy: devise: + confirmations: + confirmed: Mae eich cyfeiriad e-bost wedi ei gadarnhau yn llwyddiannus. + send_instructions: Byddwch yn derbyn e-bost a chyfarwyddiadau am sut i gadarnhau eich cyfeiriad e-bost mewn rhai munudau. Os na dderbynioch chi'r e-bost hwn, edrychwch yn eich ffolder sbam os gwelwch yn dda. + send_paranoid_instructions: Os yw eich cyfeiriad e-bost yn bodoli yn ein bas data, byddwch yn derbyn e-bost a chyfarwyddiadau am sut i gadarnhau eich cyfeiriad ebost mewn rhai munudau. Os na dderbynioch chi'r e-bost hwn, edrychwch yn eich ffolder sbam os gwelwch yn dda. + failure: + already_authenticated: Yr ydych yn barod wedi mewngofnodi. + inactive: Nid yw eich cyfrif yn weithredol eto. + invalid: "%{authentication_keys} neu gyfrinair annilys." + last_attempt: Mae gennych un gyfle arall cyn i'ch cyfrif gael ei gloi. + locked: Mae eich cyfrif wedi ei gloi. + not_found_in_database: "%{authentication_keys} neu gyfrinair annilys." + timeout: Mae eich sesiwn wedi dod i ben. Mewngofnodwch eto i barhau. + unauthenticated: Mae angen i chi fewngofnodi neu gofrestru cyn parhau. + unconfirmed: Mae rhaid i chi gadarnhau eich cyfeiriad e-bost cyn parhau. mailer: + confirmation_instructions: + action: Gwiriwch eich cyfeiriad e-bost + explanation: Yr ydych wedi creu cyfrif ar %{host} gyda'r cyfrif e-bost hwn. Dim ond un clic sydd angen i'w wneud yn weithredol. Os nad chi oedd hyn, anwybyddwch yr e-bost hwn os gwelwch yn dda. + extra_html: Gwnewch yn siŵr i edrych ar reolau'r INSTANCE a ein telerau gwasanaeth. + subject: 'Mastodon: Canllawiau cadarnhau i %{instance}' + title: Gwiriwch cyfeiriad e-bost + email_changed: + explanation: 'Mae''r cyfeiriad e-bost ar gyfer eich cyfrif yn cael ei newid i:' + extra: Os na wnaethoch chi newid eich e-bost, mae'n debygol fod rhywun wedi cael mynediad i'ch cyfrif. Newidwch eich cyfrinair yn syth os gwelwch yn dda neu cysylltwch a gweinydd yr INSTANCE os ydych wedi'ch cloi allan o'ch cyfrif. + subject: 'Mastodon: Newidwyd e-bost' + title: Cyfeiriad e-bost newydd + password_change: + explanation: Newidwyd cyfrinair eich cyfrif. + extra: Os na wnaethoch chi newid eich e-bost, mae'n debygol fod rhywun wedi cael mynediad i'ch cyfrif. Newidwch eich cyfrinair yn syth os gwelwch yn dda neu cysylltwch a gweinydd yr INSTANCE os ydych wedi'ch cloi allan o'ch cyfrif. + subject: 'Mastodon: Newidwyd Cyfrinair' + title: Newidwyd cyfrinair + reconfirmation_instructions: + explanation: Cadarnhewch y cyferiad newydd i newid eich e-bost. + subject: 'Mastodon: Cadarnhewch e-bost i %{instance}' + title: Gwiriwch cyfeiriad e-bost reset_password_instructions: action: Newid cyfrinair + explanation: Gofynnoch am gyfrinair newydd i'ch cyfrif. + subject: 'Mastodon: Ailosodwch cyfarwyddiadau cyfrinair' + title: Ailosod cyfrinair + unlock_instructions: + subject: 'Mastodon: Cyfarwyddiadau datgloi' + omniauth_callbacks: + failure: Ni ellid eich dilysu o %{kind} achos "%{reason}". + registrations: + signed_up: Croeso! Rydych wedi llwyddo i ymuno. + update_needs_confirmation: Rydych wedi diweddaru eich cyfrif yn llwyddiannus, ond mae angen i ni wirio eich cyfeiriad e-bost newydd. Edrychwch ar eich e-byst a dilynwch y ddolen gadarnhau er mwyn cadarnhau eich cyfeiriad e-bost newydd. Edrychwch ar eich ffolder sbam os na dderbynioch chi yr e-bost hwn. + updated: Mae eich cyfrif wedi ei ddiweddaru yn llwyddiannus. + sessions: + already_signed_out: Allgofnodwyd yn llwyddiannus. + signed_in: Mewngofnodwyd yn llwyddiannus. + signed_out: Allgofnodwyd yn llwyddiannus. + unlocks: + unlocked: Mae eich cyfrif wedi ei ddatgloi'n llwyddiannus. Mewngofnodwch i barhau. + errors: + messages: + already_confirmed: wedi ei gadarnhau yn baros, ymgeisiwch fewngofnodi + confirmation_period_expired: angen ei gadarnhau o fewn %{period}, gwnewch gais am un newydd os gwelwch yn dda + expired: wedi dod i ben, gwnewch gais am un newydd os gwelwch yn dda + not_found: heb ei ganfod + not_locked: heb ei gloi diff --git a/config/locales/doorkeeper.ast.yml b/config/locales/doorkeeper.ast.yml index 0b77eecf27f..0d161faf22f 100644 --- a/config/locales/doorkeeper.ast.yml +++ b/config/locales/doorkeeper.ast.yml @@ -1,2 +1 @@ ---- -ast: +ast: {} diff --git a/config/locales/en_GB.yml b/config/locales/en_GB.yml new file mode 100644 index 00000000000..0967ef424bc --- /dev/null +++ b/config/locales/en_GB.yml @@ -0,0 +1 @@ +{} diff --git a/config/locales/es.yml b/config/locales/es.yml index ce0b2bb1655..99f2f806209 100644 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -5,10 +5,13 @@ es: about_mastodon_html: Mastodon es un servidor de red social libre y de código abierto. Una alternativa descentralizada a plataformas comerciales, que evita el riesgo de que una única compañía monopolice tu comunicación. Cualquiera puede ejecutar Mastodon y participar sin problemas en la red social. about_this: Acerca de esta instancia administered_by: 'Administrado por:' + api: API + apps: Aplicaciones móviles closed_registrations: Los registros están actualmente cerrados en esta instancia. contact: Contacto contact_missing: No especificado contact_unavailable: N/A + documentation: Documentación extended_description_html: |

    Un buen lugar para las reglas

    La descripción extendida no se ha colocado aún.

    @@ -25,26 +28,43 @@ es: hosted_on: Mastodon hosteado en %{domain} learn_more: Aprende más other_instances: Otras instancias + privacy_policy: Política de privacidad source_code: Código fuente - status_count_after: estados + status_count_after: + one: estado + other: estados status_count_before: Qué han escrito - user_count_after: usuarios registrados + terms: Condiciones de servicio + user_count_after: + one: usuario + other: usuarios user_count_before: Tenemos what_is_mastodon: "¿Qué es Mastodon?" accounts: + choices_html: 'Elecciones de %{nombre}:' follow: Seguir - followers: Seguidores + followers: + one: Seguidor + other: Seguidores following: Siguiendo + joined: Se unió el %{fecha} media: Media moved_html: "%{name} se ha trasladado a %{new_profile_link}:" + network_hidden: Esta información no está disponible nothing_here: "¡No hay nada aquí!" people_followed_by: Usuarios a quien %{name} sigue people_who_follow: Usuarios que siguen a %{name} - posts: Toots + pin_errors: + following: Debes estar siguiendo a la persona a la que quieres aprobar + posts: + one: Toot + other: Toots + posts_tab_heading: Toots posts_with_replies: Toots con respuestas reserved_username: El nombre de usuario está reservado roles: admin: Administrador + bot: Bot moderator: Moderador unfollow: Dejar de seguir admin: @@ -117,7 +137,7 @@ es: resend_confirmation: already_confirmed: Este usuario ya está confirmado send: Reenviar el correo electrónico de confirmación - success: "¡Correo electrónico de confirmación enviado con éxito" + success: "¡Correo electrónico de confirmación enviado con éxito!" reset: Reiniciar reset_password: Reiniciar contraseña resubscribe: Re-suscribir @@ -174,6 +194,7 @@ es: unsuspend_account: "%{name} desactivó la suspensión de la cuenta de %{target}" update_custom_emoji: "%{name} actualizó el emoji %{target}" update_status: "%{name} actualizó el estado de %{target}" + deleted_status: "(estado borrado)" title: Log de auditoría custom_emojis: by_domain: Dominio @@ -200,6 +221,27 @@ es: update_failed_msg: No se pudo actualizar ese emoji updated_msg: "¡Emoji actualizado con éxito!" upload: Subir + dashboard: + backlog: trabajos de backlog + config: Configuración + feature_deletions: Borrados de cuenta + feature_invites: Enlaces de invitación + feature_registrations: Registros + feature_relay: Relés de federación + features: Características + hidden_service: Federación con servicios ocultos + open_reports: informes abiertos + recent_users: Usuarios recientes + search: Búsqueda por texto completo + single_user_mode: Modo único usuario + software: Software + space: Uso de almacenamiento + title: Tablero + total_users: usuarios en total + trends: Tendencias + week_interactions: interacciones esta semana + week_users_active: activo esta semana + week_users_new: usuarios esta semana domain_blocks: add_new: Añadir nuevo created_msg: El bloque de dominio está siendo procesado @@ -249,12 +291,23 @@ es: search: Buscar title: Instancias conocidas invites: + deactivate_all: Desactivar todos filter: all: Todas available: Disponibles expired: Expiradas title: Filtrar title: Invitaciones + relays: + add_new: Añadir un nuevo relés + description_html: Un relés de federation es un servidor intermedio que intercambia grandes volúmenes de toots públicos entre servidores que se suscriben y publican en él. Puede ayudar a servidores pequeños y medianos a descubir contenido del fediverso, que de otra manera requeriría que los usuarios locales siguiesen manialmente a personas de servidores remotos. + enable_hint: Una vez conectado, tu servidor se suscribirá a todos los toots públicos de este relés, y comenzará a enviar los toots públicos de este servidor hacia él. + inbox_url: URL del relés + pending: Esperando la aprobación del relés + save_and_enable: Guardar y conectar + setup: Preparar una conexión de relés + status: Estado + title: Releses report_notes: created_msg: "¡El registro de la denuncia se ha creado correctamente!" destroyed_msg: "¡El registro de la denuncia se ha borrado correctamente!" @@ -300,12 +353,18 @@ es: contact_information: email: Correo de trabajo username: Nombre de usuario + custom_css: + desc_html: Modificar el aspecto con CSS cargado en cada página + title: CSS personalizado hero: desc_html: Mostrado en la página principal. Recomendable al menos 600x100px. Por defecto se establece a la miniatura de la instancia title: Imagen de portada peers_api_enabled: desc_html: Nombres de dominio que esta instancia ha encontrado en el fediverso title: Publicar lista de instancias descubiertas + preview_sensitive_media: + desc_html: Los enlaces de vistas previas en otras web mostrarán una miniatura incluso si el medio está marcado como contenido sensible + title: Mostrar contenido sensible en previews de OpenGraph registrations: closed_message: desc_html: Se muestra en la portada cuando los registros están cerrados. Puedes usar tags HTML @@ -331,6 +390,9 @@ es: site_description_extended: desc_html: Un buen lugar para tu código de conducta, reglas, guías y otras cosas que estén impuestas aparte en tu instancia. Puedes usar tags HTML title: Información extendida personalizada + site_short_description: + desc_html: Mostrado en la barra lateral y las etiquetas de metadatos. Describe lo que es Mastodon y qué hace especial a este servidor en un solo párrafo. si está vacío, pone por defecto la descripción de la instancia. + title: Descripción corta de la instancia site_terms: desc_html: Puedes escribir tus propias políticas de privacidad, términos de servicio u otras legalidades. Puedes usar tags HTML title: Términos de servicio personalizados @@ -352,6 +414,7 @@ es: media: title: Multimedia no_media: No hay multimedia + no_status_selected: No se cambió ningún estado al no seleccionar ninguno title: Estado de las cuentas with_media: Con multimedia subscriptions: @@ -361,6 +424,12 @@ es: last_delivery: Última entrega title: WebSub topic: Tópico + suspensions: + bad_acct_msg: El valor de confirmación no cuadra. ¿Estás suspendiendo la cuenta correcta? + hint_html: 'Para confirmar las suspensión de la cuenta, por favor introduce %{value} en el campo de abajo:' + proceed: Proceder + title: Suspender %{acct} + warning_html: 'Suspender esta cuenta borrará irreversiblemente los datos de stra cuenta que incluyen:' title: Administración admin_mailer: new_report: @@ -464,6 +533,22 @@ es: follows: Personas que sigues mutes: Tienes en silencio storage: Almacenamiento + filters: + contexts: + home: Timeline propio + notifications: Notificaciones + public: Timeline público + thread: Conversaciones + edit: + title: Editar filtro + errors: + invalid_context: Se suminstró un contexto inválido o vacío + invalid_irreversible: El filtrado irreversible solo funciona con los contextos propios o de notificaciones + index: + delete: Borrar + title: Filtros + new: + title: Añadir un nuevo filtro followers: domain: Dominio explanation_html: Si deseas asegurar la privacidad de tus estados, tienes que cuidarte de quién te sigue. Tus estados privados son enviados a todas las instancias de tus seguidores. Puede que desees revisarlas, y remover seguidores si no confías en tu privacidad para ser respetado por el staff o software de esas instancias. @@ -476,6 +561,10 @@ es: true_privacy_html: Por favor ten en cuenta que la verdadera privacidad se consigue con encriptación de punto a punto. unlocked_warning_html: Todos pueden seguirte para ver tus estados privados inmediatamente. %{lock_link} para poder chequear y rechazar seguidores. unlocked_warning_title: Tu cuenta no está bloqueada + footer: + developers: Desarrolladores + more: Mas… + resources: Recursos generic: changes_saved_msg: "¡Cambios guardados con éxito!" save_changes: Guardar cambios @@ -490,7 +579,7 @@ es: following: Lista de seguidos muting: Lista de silenciados upload: Cargar - in_memoriam_html: In Memoriam. + in_memoriam_html: En memoria. invites: delete: Desactivar expired: Expiradas @@ -503,6 +592,7 @@ es: '86400': 1 día expires_in_prompt: Nunca generate: Generar + invited_by: 'Fuiste invitado por:' max_uses: one: 1 uso other: "%{count} usos" @@ -585,8 +675,12 @@ es: remote_follow: acct: Ingesa tu usuario@dominio desde el que quieres seguir missing_resource: No se pudo encontrar la URL de redirección requerida para tu cuenta + no_account_html: "¿No tienes una cuenta? Puedes registrarte aqui" proceed: Proceder a seguir prompt: 'Vas a seguir a:' + remote_interaction: + proceed: Proceder para interactuar + prompt: 'Quieres interactuar con este toot:' remote_unfollow: error: Error title: Título @@ -656,10 +750,12 @@ es: video: one: "%{count} vídeo" other: "%{count} vídeos" + boosted_from_html: Impulsado desde %{acct_link} content_warning: 'Alerta de contenido: %{warning}' disallowed_hashtags: one: 'contenía un hashtag no permitido: %{tags}' other: 'contenía los hashtags no permitidos: %{tags}' + language_detection: Detección automática de idioma open_in_web: Abrir en web over_character_limit: Límite de caracteres de %{max} superado pin_errors: @@ -668,6 +764,7 @@ es: private: Los toots no-públicos no pueden fijarse reblog: Un boost no puede fijarse show_more: Mostrar más + sign_in_to_participate: Regístrate para participar en la conversación title: '%{name}: "%{quote}"' visibilities: private: Sólo mostrar a seguidores @@ -685,9 +782,11 @@ es: themes: contrast: Alto contraste default: Mastodon + mastodon-light: Mastodon (claro) time: formats: default: "%d de %b del %Y, %H:%M" + month: "%b %Y" two_factor_authentication: code_hint: Ingresa el código generado por tu aplicación de autenticación para confirmar description_html: Si habilitas la autenticación de dos factores, se requerirá estar en posesión de su teléfono, lo que generará tokens para que usted pueda iniciar sesión. @@ -730,5 +829,6 @@ es: users: invalid_email: La dirección de correo es incorrecta invalid_otp_token: Código de dos factores incorrecto + otp_lost_help_html: Si perdiste al acceso a ambos, puedes ponerte en contancto con %{email} seamless_external_login: Has iniciado sesión desde un servicio externo, así que los ajustes de contraseña y correo no están disponibles. signed_in_as: 'Sesión iniciada como:' diff --git a/config/locales/it.yml b/config/locales/it.yml index cef823e8fff..8222cedbb00 100644 --- a/config/locales/it.yml +++ b/config/locales/it.yml @@ -33,13 +33,17 @@ it: status_count_after: stati status_count_before: Che hanno pubblicato terms: Termini di Servizio - user_count_after: utenti + user_count_after: + one: utente + other: utenti user_count_before: Home di what_is_mastodon: Che cos'è Mastodon? accounts: choices_html: 'Suggerimenti da %{name}:' follow: Segui - followers: Seguaci + followers: + one: Seguace + other: Seguaci following: Segui joined: Dal %{date} media: Media @@ -50,7 +54,10 @@ it: people_who_follow: Persone che seguono %{name} pin_errors: following: Devi gia seguire la persona che vuoi promuovere - posts: Posts + posts: + one: Toot + other: Toot + posts_tab_heading: Toot posts_with_replies: Toot e risposte reserved_username: Il nome utente è gia stato preso roles: @@ -215,8 +222,10 @@ it: dashboard: backlog: backlogged jobs config: Configurazione + feature_deletions: Cancellazioni di account feature_invites: Link di invito feature_registrations: Registrazioni + feature_relay: Ripetitore di federazione features: Funzionalità hidden_service: Federazione con servizi nascosti open_reports: apri report @@ -227,7 +236,7 @@ it: space: Utilizzo dello spazio title: Dashboard total_users: utenti totali - trends: Trends + trends: Tendenze week_interactions: interazioni per questa settimana week_users_active: attivi questa settimana week_users_new: utenti questa settimana @@ -286,10 +295,18 @@ it: title: Filtro title: Inviti relays: + add_new: Aggiungi ripetitore + description_html: Un ripetitore di federazione è un server che fa da intermediario e scambia grandi quantità di toot pubblici tra server che si collegano e pubblicano su di esso. Può aiutare server piccoli e medi a ottenere contenuti dal fediverse, che altrimenti riceverebbero solo se i loro utenti locali seguissero altre persone su server remoti. + enable_hint: Dopo l'attivazione, il vostro server riceverà tutti i toot pubblici da questo ripetitore, e inizierà a inviargli i suoi toot pubblici. inbox_url: Url Relay + pending: In attesa dell'approvazione del ripetitore + save_and_enable: Salva e attiva + setup: Crea una connessione con un ripetitore + title: Ripetitori reports: account: note: note + report: rapporto action_taken_by: Azione intrapresa da are_you_sure: Sei sicuro? assign_to_self: Assegna a me @@ -310,6 +327,7 @@ it: silence_account: Silenzia account status: Stato suspend_account: Sospendi account + title: Rapporti unassign: Non assegnare unresolved: Non risolto updated_at: Aggiornato @@ -321,6 +339,9 @@ it: title: Seguiti predefiniti per i nuovi utenti contact_information: username: Nome utente del contatto + custom_css: + desc_html: Modifica l'aspetto con il CSS caricato in ogni pagina + title: CSS personalizzato peers_api_enabled: desc_html: Nomi di dominio che questa istanza ha incontrato nella fediverse title: Pubblica elenco di istanze scoperte @@ -344,10 +365,13 @@ it: title: Mostra badge staff site_description: title: Descrizione istanza + site_short_description: + title: Breve descrizione dell'istanza site_terms: title: Termini di servizio personalizzati site_title: Nome istanza timeline_preview: + desc_html: Mostra la timeline pubblica sulla pagina iniziale title: Anteprima timeline title: Impostazioni sito statuses: @@ -454,6 +478,17 @@ it: follows: Stai seguendo mutes: Stai silenziando storage: Archiviazione media + filters: + contexts: + home: Timeline home + notifications: Notifiche + public: Timeline pubbliche + thread: Conversazioni + index: + delete: Cancella + title: Filtri + new: + title: Aggiungi filtro followers: domain: Dominio explanation_html: Se vuoi garantire la privacy dei tuoi status, devi sapere chi ti sta seguendo. I tuoi status privati vengono inviati a tutte le istanze su cui hai dei seguaci. Puoi controllare chi sono i tuoi seguaci, ed eliminarli se non hai fiducia che la tua privacy venga rispettata dallo staff o dal software di quelle istanze. @@ -461,6 +496,9 @@ it: purge: Elimina dai seguaci true_privacy_html: Tieni presente che l'effettiva riservatezza si può ottenere solo con la crittografia end-to-end. unlocked_warning_html: Chiunque può seguirti per vedere immediatamente i tuoi status privati. %{lock_link} per poter esaminare e respingere gli utenti che vogliono seguirti. + footer: + developers: Sviluppatori + more: Altro… generic: changes_saved_msg: Modifiche effettuate con successo! save_changes: Salva modifiche @@ -488,6 +526,7 @@ it: '86400': 1 giorno expires_in_prompt: Mai generate: Genera + invited_by: 'Sei stato invitato da:' max_uses: other: "%{count} utilizzi" max_uses_prompt: Nessun limite @@ -657,7 +696,7 @@ it: recovery_codes_regenerated: I codici di recupero sono stati rigenerati recovery_instructions_html: Se perdi il telefono, puoi usare uno dei codici di recupero qui sotto per riottenere l'accesso al tuo account. Conserva i codici di recupero in un posto sicuro. Ad esempio puoi stamparli e conservarli insieme ad altri documenti importanti. setup: Configura - wrong_code: Il codice inserito non è corretto! Assicurati che l'orario del server e l'orario del dispotivo siano corretti. + wrong_code: Il codice inserito non è corretto! Assicurati che l'orario del server e l'orario del dispositivo siano corretti. user_mailer: backup_ready: explanation: Hai richiesto un backup completo del tuo account Mastodon. È pronto per essere scaricato! diff --git a/config/locales/ko.yml b/config/locales/ko.yml index ff7152064ae..7250f244add 100644 --- a/config/locales/ko.yml +++ b/config/locales/ko.yml @@ -429,7 +429,7 @@ ko: suspensions: bad_acct_msg: 확인값이 일치하지 않습니다. 정지하려는 계정이 맞습니까? hint_html: '이 계정을 정지하려면 %{value}를 아래 입력칸에 입력하세요:' - proceed: 처리됨 + proceed: 완전히 정지시키기 title: "%{acct} 정지하기" warning_html: '이 계정을 정지하면 계정의 데이터를 모두 삭제하며 되돌릴 수 없습니다. 이것은 다음을 포함합니다:' title: 관리 diff --git a/config/locales/oc.yml b/config/locales/oc.yml index 592ceead4d9..1ad53b5ffe3 100644 --- a/config/locales/oc.yml +++ b/config/locales/oc.yml @@ -41,13 +41,13 @@ oc: user_count_before: Ostal de what_is_mastodon: Qu’es Mastodon ? accounts: - choices_html: 'Recomandacion de %{name} :' + choices_html: 'Recomandacions de %{name} :' follow: Sègre followers: one: Seguidor other: Seguidors following: Abonaments - joined: Arribèt lo %{date} + joined: Arribèt en %{date} media: Mèdias moved_html: "%{name} a mudat a %{new_profile_link} :" network_hidden: Aquesta informacion es pas disponibla diff --git a/config/locales/simple_form.ar.yml b/config/locales/simple_form.ar.yml index 3ee4a92a4c9..415bdf9cf0a 100644 --- a/config/locales/simple_form.ar.yml +++ b/config/locales/simple_form.ar.yml @@ -46,7 +46,7 @@ ar: display_name: الإسم المعروض email: عنوان البريد الإلكتروني expires_in: تنتهي مدة صلاحيته بعد - fields: واصفات بيانات الملف الشخصي + fields: البيانات الوصفية للصفحة الشخصية header: الرأسية inbox_url: عنوان رابط صندوق المُرَحِّل irreversible: إسقاط بدلا من إخفائها diff --git a/config/locales/simple_form.ast.yml b/config/locales/simple_form.ast.yml index 0b77eecf27f..3cd27a4f2c3 100644 --- a/config/locales/simple_form.ast.yml +++ b/config/locales/simple_form.ast.yml @@ -1,2 +1,52 @@ --- ast: + simple_form: + hints: + defaults: + display_name: + one: Queda 1 caráuter + other: Queden %{count} caráuteres + note: + one: Queda 1 caráuter + other: Queden %{count} caráuteres + setting_theme: Afeuta al aspeutu de Mastodon cuando anicies sesión dende cualesquier preséu. + labels: + account: + fields: + name: Etiqueta + value: Conteníu + defaults: + avatar: Avatar + bot: Esta cuenta ye d'un robó + chosen_languages: Peñera de llingües + current_password: Contraseña actual + data: Datos + display_name: Nome a amosar + fields: Datos meta del perfil + header: Testera + locale: Llingua de la interfaz + locked: Bloquiar cuenta + new_password: Contraseña nueva + note: Bio + otp_attempt: Códigu de verificación en dos pasos + password: Contraseña + setting_auto_play_gif: Reproducir GIFs automáticamente + setting_default_language: Llingua d'espublización + setting_default_privacy: Privacidá d'espublizaciones + severity: Severidá + username: Nome d'usuariu + username_or_email: Nome d'usuariu o corréu + interactions: + must_be_follower: Bloquiar avisos de persones que nun son siguidores + must_be_following: Bloquiar avisos de persones que nun sigues + must_be_following_dm: Bloquiar mensaxes direutos de persones que nun sigues + notification_emails: + favourite: Unviar un corréu cuando daquién conseñe como favoritu los tos estaos + follow: Unviar un corréu cuando daquién te siga + follow_request: Unviar un corréu cuando daquién solicite siguite + mention: Unviar un corréu cuando daquién te mente + 'no': Non + required: + mark: "*" + text: ríquese + 'yes': Sí diff --git a/config/locales/simple_form.cy.yml b/config/locales/simple_form.cy.yml index 4b1721b77f2..60b444fa1a0 100644 --- a/config/locales/simple_form.cy.yml +++ b/config/locales/simple_form.cy.yml @@ -9,3 +9,5 @@ cy: new_password: Cyfrinair newydd password: Cyfrinair username: Enw defnyddiwr + required: + mark: "*" diff --git a/config/locales/simple_form.da.yml b/config/locales/simple_form.da.yml index a5697220eaa..dfa440aae09 100644 --- a/config/locales/simple_form.da.yml +++ b/config/locales/simple_form.da.yml @@ -67,7 +67,7 @@ da: setting_boost_modal: Vis bekræftelses dialog før du fremhæver setting_default_language: Sprog for opslag setting_default_privacy: Privatliv - setting_default_sensitive: Marker altid multimedia som værende følsomt + setting_default_sensitive: Marker altid medier som værende følsomt setting_delete_modal: Vis bekræftelses dialog før du sletter et trut setting_display_sensitive_media: Vis altid multimedier markeret som værende følsomt setting_hide_network: Skjul dit netværk @@ -92,6 +92,7 @@ da: follow_request: Send email når nogen anmoder om at følge dig mention: Send e-mail når nogen nævner dig reblog: Send email når nogen fremhæver din status + report: Send email når en ny anmeldelse bliver indsendt 'no': Nej required: mark: "*" diff --git a/config/locales/simple_form.de.yml b/config/locales/simple_form.de.yml index 38e276d5287..69e707c4c50 100644 --- a/config/locales/simple_form.de.yml +++ b/config/locales/simple_form.de.yml @@ -92,6 +92,7 @@ de: follow_request: E-Mail senden, wenn mir jemand folgen möchte mention: E-Mail senden, wenn mich jemand erwähnt reblog: E-Mail senden, wenn jemand meinen Beitrag teilt + report: E-Mail senden, wenn ein neuer Bericht vorliegt 'no': Nein required: mark: "*" diff --git a/config/locales/simple_form.en_GB.yml b/config/locales/simple_form.en_GB.yml new file mode 100644 index 00000000000..0967ef424bc --- /dev/null +++ b/config/locales/simple_form.en_GB.yml @@ -0,0 +1 @@ +{} diff --git a/config/locales/simple_form.es.yml b/config/locales/simple_form.es.yml index 483f7905808..0a39e01b8cf 100644 --- a/config/locales/simple_form.es.yml +++ b/config/locales/simple_form.es.yml @@ -3,33 +3,58 @@ es: simple_form: hints: defaults: + autofollow: Los usuarios que se registren mediante la invitación te seguirán automáticamente avatar: PNG, GIF o JPG. Máximo %{size}. Será escalado a %{dimensions}px + bot: Esta cuenta ejecuta principalmente acciones automatizadas y podría no ser monitorizada + context: Uno o múltiples contextos en los que debe aplicarse el filtro digest: Solo enviado tras un largo periodo de inactividad y solo si has recibido mensajes personales durante tu ausencia display_name: one: 1 caracter restante other: %{count} caracteres restantes + fields: Puedes tener hasta 4 elementos mostrándose como una tabla en tu perfil header: PNG, GIF o JPG. Máximo %{size}. Será escalado a %{dimensions}px + inbox_url: Copia la URL de la página principal del relés que quieres utilizar + irreversible: Los toots filtrados desaparecerán irreversiblemente, incluso si este filtro es eliminado más adelante + locale: El idioma de la interfaz de usuario, correos y notificaciones push locked: Requiere que manualmente apruebes seguidores y las publicaciones serán mostradas solamente a tus seguidores note: one: 1 carácter restante other: %{count} caracteres restantes + phrase: Se aplicará sin importar las mayúsculas o los avisos de contenido de un toot + scopes: Qué APIs de la aplicación tendrán acceso. Si seleccionas el alcance de nivel mas alto, no necesitas seleccionar las individuales. + setting_default_language: El idioma de tus toots podrá detectarse automáticamente, pero no siempre es preciso + setting_hide_network: A quién sigues y quién te sigue no será mostrado en tu perfil setting_noindex: Afecta a tu perfil público y páginas de estado setting_theme: Afecta al aspecto de Mastodon cuando te identificas desde cualquier dispositivo. + whole_word: Cuando la palabra clave o frase es solo alfanumérica, solo será aplicado si concuerda con toda la palabra imports: data: Archivo CSV exportado desde otra instancia de Mastodon sessions: - otp: Introduce el código de autenticación de dos factores de tu teléfono o usa uno de tus códigos de recuperación. + otp: 'Introduce el código de autenticación de dos factores geberado por tu aplicación de teléfono o usa uno de tus códigos de recuperación:' + user: + chosen_languages: Cuando se marca, solo se mostrarán los toots en los idiomas seleccionados en los timelines públicos labels: + account: + fields: + name: Etiqueta + value: Contenido defaults: + autofollow: Invitar a seguir tu cuenta avatar: Avatar + bot: Esta es una cuenta bot + chosen_languages: Filtrar idiomas confirm_new_password: Confirmar nueva contraseña confirm_password: Confirmar contraseña + context: Filtrar contextos current_password: Contraseña actual data: Información display_name: Nombre para mostrar email: Dirección de correo electrónico expires_in: Expirar tras + fields: Metadatos de perfil header: Img. cabecera + inbox_url: URL de la entrada de relés + irreversible: Dejar en lugar de ocultar locale: Idioma locked: Hacer privada esta cuenta max_uses: Máx. número de usos @@ -37,12 +62,15 @@ es: note: Biografía otp_attempt: Código de dos factores password: Contraseña + phrase: Palabra clave o frase setting_auto_play_gif: Reproducir automáticamente los GIFs animados setting_boost_modal: Mostrar ventana de confirmación antes de un Retoot + setting_default_language: Idioma de publicación setting_default_privacy: Privacidad de publicaciones setting_default_sensitive: Marcar siempre imágenes como sensibles setting_delete_modal: Mostrar diálogo de confirmación antes de borrar un toot setting_display_sensitive_media: Mostrar siempre material marcado como sensible + setting_hide_network: Ocultar tu red setting_noindex: Excluirse del indexado de motores de búsqueda setting_reduce_motion: Reducir el movimiento de las animaciones setting_system_font_ui: Utilizar la tipografía por defecto del sistema @@ -52,6 +80,7 @@ es: type: Importar tipo username: Nombre de usuario username_or_email: Usuario o Email + whole_word: Toda la palabra interactions: must_be_follower: Bloquear notificaciones de personas que no te siguen must_be_following: Bloquear notificaciones de personas que no sigues @@ -63,6 +92,7 @@ es: follow_request: Enviar correo electrónico cuando alguien solicita seguirte mention: Enviar correo electrónico cuando alguien te mencione reblog: Enviar correo electrónico cuando alguien comparta su publicación + report: Enviar un correo cuando se envía un nuevo informe 'no': 'No' required: mark: "*" diff --git a/config/locales/simple_form.fr.yml b/config/locales/simple_form.fr.yml index c13cfa50d6d..7495a94255f 100644 --- a/config/locales/simple_form.fr.yml +++ b/config/locales/simple_form.fr.yml @@ -92,6 +92,7 @@ fr: follow_request: Envoyer un courriel lorsque quelqu’un demande à me suivre mention: Envoyer un courriel lorsque quelqu’un me mentionne reblog: Envoyer un courriel lorsque quelqu’un partage mes statuts + report: Envoyer un courriel lorsqu'un nouveau rapport est soumis 'no': Non required: mark: "*" diff --git a/config/locales/simple_form.it.yml b/config/locales/simple_form.it.yml index 810ac813e22..2eaf04a70e5 100644 --- a/config/locales/simple_form.it.yml +++ b/config/locales/simple_form.it.yml @@ -52,14 +52,14 @@ it: email: Indirizzo email expires_in: Scade dopo fields: Metadati del profilo - header: Header + header: Intestazione inbox_url: URL della inbox del ripetitore irreversible: Elimina invece di nascondere locale: Lingua dell'interfaccia locked: Blocca account max_uses: Numero massimo di utilizzi new_password: Nuova password - note: Bio + note: Biografia otp_attempt: Codice due-fattori password: Password phrase: Parola chiave o frase @@ -92,6 +92,7 @@ it: follow_request: Invia email quando qualcuno richiede di seguirti mention: Invia email quando qualcuno ti menziona reblog: Invia email quando qualcuno da un boost al tuo stato + report: Manda una mail quando viene inviato un nuovo rapporto 'no': 'No' required: mark: "*" diff --git a/config/locales/simple_form.ja.yml b/config/locales/simple_form.ja.yml index 6aa7af9792a..d96394d7a63 100644 --- a/config/locales/simple_form.ja.yml +++ b/config/locales/simple_form.ja.yml @@ -88,6 +88,7 @@ ja: follow_request: フォローリクエストを受けた時にメールで通知する mention: 返信が来た時にメールで通知する reblog: トゥートがブーストされた時にメールで通知する + report: 通報を受けた時にメールで通知する 'no': いいえ required: mark: "*" diff --git a/config/locales/simple_form.ro.yml b/config/locales/simple_form.ro.yml index 31eb21a7704..8cac6d60605 100644 --- a/config/locales/simple_form.ro.yml +++ b/config/locales/simple_form.ro.yml @@ -1,3 +1,94 @@ --- ro: - simple_form: {} + simple_form: + hints: + defaults: + autofollow: Persoanele care se înregistrează datorită invitației tale te vor urmări automat + avatar: PNG, GIF sau JPG. Cel mult %{size}. Va fi redimensionată la %{dimensions}px + bot: Acest cont performează în cea mai mare parte acțiuni automate și nu poate fi monitorizat + context: Contextele în care filtrul trebuie aplicat + digest: Este trimis doar după o lungă perioadă de inactivitate și numai dacă primești mesaje personale în perioada de absență + fields: Poti afișa pană la maxim 4 adrese sub formă de tabel pe pofilul tău + header: PNG, GIF sau JPG. Cel mult %{size}. Vor fi redimensionate la %{dimensions}px + inbox_url: Copiază adresa URL de pe prima pagină a reului pe care vrei să îl utilizezi + irreversible: Postările sortate vor dispărea ireversibil, chiar dacă filtrul este ulterior șters + locale: Limba interfaței de utilizator, e-mailurile si notificările push + locked: Necesită aprobare manuală a urmăritorilor + phrase: Vor fi potrivite indiferent de textul din casetă sau advertismentul unei postări + scopes: La care API-uri aplicația are nevoie de acces. Dacă selectezi un scop principal nu mai e nevoie să selectezi fiecare sub-scop al acestuia. + setting_default_language: Limba postărilor tale poate fi detectată automat, dar nu este întotdeauna precisă + setting_hide_network: Pe cine urmărești și cine te urmărește nu vor fi afișați pe profilul tău + setting_noindex: Afecteazâ profilul tău public și statusurile tale + setting_theme: Afecteazâ modul în care arată interfața pe toate dispozitivele pe care ești conectat. + whole_word: Când fraza sau cuvântul este doar alfanumeric, acesta se aplică doar dacă există o potrivire completă + imports: + data: Fișierul CSV exportat de la o altă instanță + sessions: + otp: 'Introdu codul pentru dubla protecție generat de telefonul mobil sau unul din codurile de rezervă:' + user: + chosen_languages: Doar postările în limbile selectate vor fi afișate în fluxurile publice + labels: + account: + fields: + name: Etichetă + value: Conținut + defaults: + autofollow: Invită să te urmărească + avatar: Fotografie de profil + bot: Acesta este un cont automat (bot) + chosen_languages: Limbile filtrului + confirm_new_password: Confirmă noua parolă + confirm_password: Confirmă parola + context: Contextele filtrului + current_password: Parola actuală + data: Data + display_name: Numele afișat + email: Adresa de e-mail + expires_in: Expiră după + fields: Rețele externe - Unde mai poți fi găsit + header: Antet + inbox_url: Adresa URL a inbox-ului + irreversible: Lasă înloc să ascunzi + locale: Limbă + locked: Cont Privat + max_uses: Numărul maxim de utilizatori + new_password: Parola nouă + note: Descriere + otp_attempt: Cod dublă protecție + password: Parolă + phrase: Cuvânt sau frază + setting_auto_play_gif: Redă automat animațiile GIF + setting_boost_modal: Arată dialogul de confirmare înainte de a redistribui + setting_default_language: În ce limbă postezi + setting_default_privacy: Cine vede postările tale + setting_default_sensitive: Întotdeauna marchează conținutul media ca sensibil + setting_delete_modal: Arată dialogul de confirmare înainte de a șterge o postare + setting_display_sensitive_media: Întotdeauna arată conținutul media sensibil + setting_hide_network: Ascunde rețeaua + setting_noindex: Nu permite motoarelor de căutare să indexeze rețeaua ta + setting_reduce_motion: Redu mișcarea în animații + setting_system_font_ui: Utilizează fontul standard as sistemului + setting_theme: Tema siteului + setting_unfollow_modal: Arată dialogul de confirmare înainte de a nu mai urmări pe cineva + severity: Severitate + type: Ce importați + username: Nume de utilizator + username_or_email: Numele de utilizator sau adresa de E-mail + whole_word: Cuvânt întreg + interactions: + must_be_follower: Blochează notificările de la persoane care nu te urmăresc + must_be_following: Blochează notificările de la persoane pe care nu le urmărești + must_be_following_dm: Blochează mesajele directe de la persoane pe care nu le urmărești + notification_emails: + digest: Trimite rezumate + favourite: Trimite e-mail când cineva favorizează unul din statusurile tale + follow: Trimite e-mail când cineva te urmărește + follow_request: Trimite e-mail când cineva trimite o cerere de urmărire + mention: Trimite e-mail când cineva te menționează + reblog: Trimite e-mail când cineva redistribuie unul din statusurile tale + report: Trimite e-mail când un raport nou este trimis + 'no': Nu + required: + mark: "*" + text: obligatoriu + 'yes': Da diff --git a/config/locales/simple_form.sk.yml b/config/locales/simple_form.sk.yml index c9ec7fb20c4..d92e2dd83c9 100644 --- a/config/locales/simple_form.sk.yml +++ b/config/locales/simple_form.sk.yml @@ -94,6 +94,7 @@ sk: follow_request: Zaslať email ak ti niekto pošle žiadosť o sledovanie mention: Poslať email ak ťa niekto spomenie v svojom príspevku reblog: Poslať email ak niekto re-tootne tvoj príspevok + report: Poslať e-mail ak niekto dodá nové hlásenie 'no': Nie required: mark: "*" diff --git a/config/locales/simple_form.zh-TW.yml b/config/locales/simple_form.zh-TW.yml index 3763fc74796..7b31012395b 100644 --- a/config/locales/simple_form.zh-TW.yml +++ b/config/locales/simple_form.zh-TW.yml @@ -6,21 +6,27 @@ zh-TW: autofollow: 通過邀請網址註冊的使用者將會自動關注你 avatar: 支援 PNG, GIF 或 JPG 圖片，檔案最大為 %{size}，會縮裁成 %{dimensions}px bot: 這個帳號由程式進行自動式操作 + context: 應該套用過濾器的一項或多項內容 digest: 僅在你長時間未登入，並且收到了私訊時發送 display_name: one: 尚餘 1 個字 other: 尚餘 %{count} 個字 fields: 個人資訊頁至多可顯示 4 個項目 header: 支援 PNG, GIF 或 JPG 圖片，檔案最大為 %{size}，會縮裁成 %{dimensions}px + inbox_url: 從您想要使用的中繼首頁複製 URL + irreversible: 已過濾的嘟文將會不可逆的消失，即便過濾器之後也一樣 locale: 使用者介面、 E-mail 與通知的語言 locked: 你必須手動核准每個使用者對你的關注請求，而你的貼文隱私將會被設定為「只有關注你的人能看」 note: one: 尚餘 1 個字 other: 尚餘 %{count} 個字 + phrase: 無論是嘟文的本文或是內容警告都會被過濾 + scopes: 應用程式將會被允許存取哪些 API。若您選取了最高階的範圍，您就不需要再選取單獨的了。 setting_default_language: 你嘟文的語言會被自動偵測，但不一定完全準確 setting_hide_network: 你關注的人與關注你的人將不會在你的個人資料頁上顯示 setting_noindex: 此設定會影響到你的公開個人資料與嘟文頁面 setting_theme: 此設定會影響到你從任意設備登入 Mastodon 時的顯示樣式。 + whole_word: 如果關鍵字或詞組僅有字母與數字，它將只會在符合整個單字的時候才會套用 imports: data: 自其他站點匯出的 CSV 檔案 sessions: @@ -39,6 +45,7 @@ zh-TW: chosen_languages: 語言篩選 confirm_new_password: 確認新密碼 confirm_password: 確認密碼 + context: 過濾範圍 current_password: 目前密碼 data: 資料 display_name: 顯示名稱 @@ -46,6 +53,8 @@ zh-TW: expires_in: 失效時間 fields: 資料 header: 個人頁面圖片 + inbox_url: 中繼收件匣的 URL + irreversible: 放棄而非隱藏 locale: 介面語言 locked: 將帳號轉為「私密」 max_uses: 最大使用次數 @@ -53,13 +62,14 @@ zh-TW: note: 簡介 otp_attempt: 兩階段認證碼 password: 密碼 + phrase: 關鍵字或片語 setting_auto_play_gif: 自動播放 GIF setting_boost_modal: 在轉嘟前先詢問我 setting_default_language: 嘟文語言 setting_default_privacy: 嘟文預設為 - setting_default_sensitive: 預設我的媒體檔案為敏感內容 + setting_default_sensitive: 總是將媒體標記為敏感內容 setting_delete_modal: 刪除嘟文前先詢問我 - setting_display_sensitive_media: 預設我的媒體為敏感內容 + setting_display_sensitive_media: 總是顯示標記為敏感內容的媒體 setting_hide_network: 隱藏你的社交網路 setting_noindex: 阻止搜尋引擎收錄 setting_reduce_motion: 減低動畫效果 @@ -70,6 +80,7 @@ zh-TW: type: 匯入資料類型 username: 使用者名稱 username_or_email: 使用者名稱或 E-mail + whole_word: 整個詞 interactions: must_be_follower: 隱藏沒有關注你的使用者通知 must_be_following: 隱藏你沒關注的使用者通知 @@ -81,6 +92,7 @@ zh-TW: follow_request: 當有使用者要求關注你時，發送 E-mail 通知 mention: 當有使用者在嘟文提及你時，發送 E-mail 通知 reblog: 都有使用者轉嘟你的嘟文時，發送 E-mail 通知 + report: 當遞交新報告時傳送電子郵件 'no': 否 required: mark: "*" diff --git a/config/locales/sk.yml b/config/locales/sk.yml index e029df1ea64..2283e240e04 100644 --- a/config/locales/sk.yml +++ b/config/locales/sk.yml @@ -4,11 +4,14 @@ sk: about_hashtag_html: Toto sú verejné toot príspevky otagované #%{hashtag}. Ak máš účet niekde vo fediverse, môžeš ich používať. about_mastodon_html: Mastodon je sociálna sieť založená na otvorených webových protokoloch. Jej zrojový kód je otvorený a je decentralizovaná podobne ako email. about_this: O tejto instancii - administered_by: 'Správca je:' - closed_registrations: Registrácie sú momentálne uzatvorené. Avšak, môžeš nájsť nejaký iný Mastodon server kde si založ účet a získaj tak prístup do presne tej istej siete, odtiaľ. + administered_by: 'Správcom je:' + api: API + apps: Mobilné aplikácie + closed_registrations: Registrácie sú na tomto serveri momentálne uzatvorené. Avšak, môžeš nájsť nejaký iný Mastodon server kde si založ účet a získaj tak prístup do presne tej istej siete, odtiaľ. contact: Kontakt contact_missing: Nezadané contact_unavailable: Neuvedené + documentation: Dokumentácia extended_description_html: |

    Pravidlá

    Žiadne zatiaľ nie sú

    @@ -25,23 +28,36 @@ sk: hosted_on: Mastodon hostovaný na %{domain} learn_more: Zisti viac other_instances: Zoznam ďalších inštancií + privacy_policy: Ustanovenia o súkromí source_code: Zdrojový kód - status_count_after: príspevkov + status_count_after: + one: status + other: statusy status_count_before: Ktorí napísali - user_count_after: užívateľov + terms: Podmienky užívania + user_count_after: + one: užívateľ + other: užívatelia user_count_before: Domov pre what_is_mastodon: Čo je Mastodon? accounts: + choices_html: "%{name}vé voľby:" follow: Sledovať - followers: Sledujúci + followers: + one: Následovateľ + other: Následovatelia following: Sleduje + joined: Pridal/a sa %{date} media: Médiá moved_html: "%{name} účet bol presunutý na %{new_profile_link}:" network_hidden: Táto informácia nieje k dispozícii nothing_here: Nič tu nie je! people_followed_by: Ľudia, ktorých %{name} sleduje people_who_follow: Ľudia sledujúci %{name} - posts: Príspevky + posts: + one: Príspevok + other: Príspevky + posts_tab_heading: Príspevky posts_with_replies: Príspevky s odpoveďami reserved_username: Prihlasovacie meno je rezervované roles: @@ -83,12 +99,12 @@ sk: feed_url: URL časovej osi followers: Sledujúci followers_url: URL sledujúcich - follows: Sledovaní + follows: Sledovania inbox_url: URL prijatých správ ip: IP location: all: Všetko - local: Lokálne + local: Miestne remote: Federované title: Lokácia login_status: Status prihlásenia @@ -176,6 +192,7 @@ sk: unsuspend_account: "%{name} zrušil/a blokovanie účtu používateľa %{target}" update_custom_emoji: "%{name} aktualizoval/a emoji %{target}" update_status: "%{name} aktualizoval/a status pre %{target}" + deleted_status: "(zmazaný príspevok)" title: Kontrólny záznam custom_emojis: by_domain: Doména @@ -212,9 +229,16 @@ sk: hidden_service: Federácia so skritými službami open_reports: otvorené hlásenia recent_users: Nedávny užívatelia + search: Celofrázové vyhľadávanie + single_user_mode: Jednouživateľské rozhranie software: Softvér space: Využitie miesta + title: Spravovacie rozhranie total_users: užívateľov celkovo + trends: Trendy + week_interactions: Tohto týždňové interakcie + week_users_active: aktívni tento týždeň + week_users_new: užívateľov počas tohto týždňa domain_blocks: add_new: Pridať nový created_msg: Doména je v procese blokovania @@ -265,6 +289,7 @@ sk: search: Hľadať title: Známe instancie invites: + deactivate_all: Pozastaviť všetky filter: all: Všetky available: Dostupné @@ -274,7 +299,12 @@ sk: relays: add_new: Pridaj novú priechodnú oporu description_html: "Federovací mostík je prechodný server ktorý obmieňa veľké množstvá verejných príspevkov medzi tými servermi ktoré na od neho odoberajú, aj doňho prispievajú. Môže to pomôcť malým a stredným instanciám objavovať federovaný obsah, čo inak vyžaduje aby miestni užívatelia ručne následovali iných ľudí zo vzdialených instancií." + inbox_url: URL mostu + pending: Čakám na povolenie od prechodného mostu + save_and_enable: Uložiť a povoliť + setup: Nastav prepojenie s mostom status: Stav + title: Mosty report_notes: created_msg: Poznámka o nahlásení úspešne vytvorená! destroyed_msg: Poznámka o nahlásení úspešne vymazaná! @@ -320,6 +350,9 @@ sk: contact_information: email: Pracovný e-mail username: Kontaktné užívateľské meno + custom_css: + desc_html: Uprav vzhľad pomocou CSS, ktoré je načítané na každej stránke + title: Vlastné CSS hero: desc_html: Zobrazuje sa na hlavnej stránke. Doporučuje sa rozlišenie aspoň 600x100px Pokiaľ tu nieje nič dodané, bude nastavený základný orázok tohoto serveru title: Obrázok hrdinu @@ -354,6 +387,8 @@ sk: site_description_extended: desc_html: Toto je vhodné miesto pre vaše pravidlá, oboznámenia a iné veci, ktorými je vaša instancia špecifická. Je možné tu používať HTML kód title: Vlastné doplňujúce informácie + site_short_description: + title: Krátky popis instancie site_terms: desc_html: Môžete si napísať vaše vlastné pravidla o súkromí, prevádzke, alebo aj iné legality. Môžete tu používať HTML kód title: Vlastné pravidlá prevádzky @@ -406,7 +441,7 @@ sk: warning: Na tieto údaje dávajte ohromný pozor. Nikdy ich s nikým nezďieľajte! your_token: Váš prístupový token auth: - agreement_html: V rámci registrácie súhlasíš, že sa budeš riadiť pravidlami tejto instancie, a taktiež našími servisnými podmienkami . + agreement_html: V rámci registrácie súhlasíš, že sa budeš riadiť pravidlami tejto instancie, a taktiež našími prevoznými podmienkami. change_password: Heslo confirm_email: Potvrdiť email delete_account: Vymazať účet @@ -665,18 +700,18 @@ sk: windows: Microsoft Windows revoke: Zamietni revoke_success: Sezóna úspešne zamietnutá - title: Sezóna + title: Sezóny settings: - authorized_apps: Autorizované aplikácie + authorized_apps: Povolené aplikácie back: Späť na Mastodon delete: Vymazanie účtu development: Vývoj edit_profile: Uprav profil export: Exportovať dáta - followers: Povolení sledovatelia + followers: Povolení následovatelia import: Importovať migrate: Presunúť účet - notifications: Oznámenia + notifications: Oboznámenia preferences: Voľby settings: Nastavenia two_factor_authentication: Dvoj-faktorové overenie @@ -761,7 +796,7 @@ sk: tip_bridge_html: Ak prichádzaš z Twitteru, môžeš svojích priateľov nájsť na Mastodone pomocou tzv. mostíkovej aplikácie. Ale tá funguje iba ak ju aj oni niekedy použili! tip_federated_timeline: Federovaná os zobrazuje sieť Mastodonu až po jej hranice. Ale zahŕňa iba ľúdí ktorých ostatní okolo teba sledujú, takže predsa nieje úplne celistvá. tip_following: Správcu servera následuješ automaticky. Môžeš ale nájsť mnoho iných zaujímavých ľudí ak prezrieš tak lokálnu, ako aj globálne federovanú os. - tip_local_timeline: Lokálna os je celkový pohľad na aktivitu užívateľov %{instance}. Toto sú tvoji najbližší susedia! + tip_local_timeline: Miestna časová os je celkový pohľad na aktivitu užívateľov %{instance}. Toto sú tvoji najbližší susedia! tip_mobile_webapp: Pokiaľ ti prehliadač ponúkne možnosť pridať Mastodon na tvoju obrazovku, môžeš potom dostávať notifikácie skoro ako z natívnej aplikácie! tips: Tipy title: Vitaj na palube, %{name}! diff --git a/config/locales/sr.yml b/config/locales/sr.yml index 960fccdc042..9728fea55e0 100644 --- a/config/locales/sr.yml +++ b/config/locales/sr.yml @@ -2,12 +2,12 @@ sr: about: about_hashtag_html: Ово су јавни статуси таговани са #%{hashtag}. Можете одговарати на њих ако имате налог било где у федиверсу. - about_mastodon_html: Мастодонт је друштвена мрежа базирана на отвореним протоколима и слободном софтверу отвореног кода. Децентрализована је као што је децентрализована е-пошта. + about_mastodon_html: Мастодон је друштвена мрежа базирана на отвореним протоколима и слободном софтверу отвореног кода. Децентрализована је као што је децентрализована е-пошта. about_this: О инстанци administered_by: 'Администрирано од стране:' api: API apps: Мобилне апликације - closed_registrations: Регистрације су тренутно затворене на овој инстанци. Ипак! Можете наћи другу инстанцу на којој ћете направити налог и одатле добити приступ истој овој мрежи. + closed_registrations: Регистрације су тренутно затворене на овој инстанци. Међутим! Можете наћи другу инстанцу на којој ћете направити налог и одатле добити приступ на истој овој мрежи. contact: Контакт contact_missing: Није постављено contact_unavailable: N/A @@ -39,37 +39,51 @@ sr: one: корисник other: корисници user_count_before: Дом за - what_is_mastodon: Шта је Мастодонт? + what_is_mastodon: Шта је Мастодон? accounts: choices_html: "%{name}'s избори:" - follow: Follow + follow: Запрати followers: one: Пратилац other: Пратиоци - following: Following + following: Пратим joined: Придружио/ла се %{date} - media: Мултимедија - moved_html: "%{name} је померен на %{new_profile_link}:" + media: Медији + moved_html: "%{name} је прешао на %{new_profile_link}:" network_hidden: Ова информација није доступна nothing_here: Овде нема ништа! people_followed_by: Људи које %{name} прати people_who_follow: Људи који прате %{name} - posts: Тутови - posts_with_replies: Тутови и одговори + pin_errors: + following: Морате пратити ову особу ако хоћете да потврдите + posts: + one: Труба + other: Трубе + posts_tab_heading: Трубе + posts_with_replies: Трубе и одговори reserved_username: Корисничко име је резервисано roles: admin: Администратор + bot: Бот moderator: Модератор unfollow: Отпрати admin: account_moderation_notes: - create: Направи + create: Оставите белешку created_msg: Модераторска белешка успешно направљена! delete: Обриши destroyed_msg: Модераторска белешка успешно обрисана! accounts: are_you_sure: Да ли сте сигурни? + avatar: Аватар by_domain: Домен + change_email: + changed_msg: Е-пошта налога успешно промењена! + current_email: Тренутна Е-пошта + label: Промените Е-пошту + new_email: Нова Е-пошта + submit: Промените Е-пошту + title: Промените Е-пошту за %{username} confirm: Потврди confirmed: Потврђено confirming: Потврдување @@ -82,7 +96,7 @@ sr: edit: Измени email: Е-пошта email_status: Е-пошта статус - enable: Укључи + enable: Омогући enabled: Укључено feed_url: Адреса довода followers: Пратиоци @@ -117,8 +131,9 @@ sr: promote: Унапреди protocol: Протокол public: Јавно - push_subscription_expires: PuSH subscription expires + push_subscription_expires: PuSH претплата истиче redownload: Освежи аватар + remove_avatar: Уклони аватар resend_confirmation: already_confirmed: Овој корисник е веќе потврден send: Препрати го е-мајлот за потврда @@ -143,6 +158,7 @@ sr: statuses: Статуси subscribe: Претплати се title: Налози + unconfirmed_email: Непотврђена Е-пошта undo_silenced: Укини ћутање undo_suspension: Укини суспензију unsubscribe: Укини претплату @@ -150,8 +166,10 @@ sr: web: Веб action_logs: actions: + assigned_to_self_report: "%{name} је доделио/ла извештај %{target} себи" + change_email_user: "%{name} је променио/ла адресу Е-поште коисника/це %{target}" confirm_user: "%{name} је потврдио адресу е-поште корисника %{target}" - create_custom_emoji: "%{name} је отпремио нови емотикон %{target}" + create_custom_emoji: "%{name} је отпремио нови емоџи %{target}" create_domain_block: "%{name} је блокирао домен %{target}" create_email_domain_block: "%{name} је ставио на црну листу домен е-поште %{target}" demote_user: "%{name} је ражаловао корисника %{target}" @@ -165,10 +183,13 @@ sr: enable_user: "%{name} је омогућио пријављивање за корисника %{target}" memorialize_account: "%{name} је претворио страну налога %{target} као in memoriam страну" promote_user: "%{name} је унапредио корисника %{target}" + remove_avatar_user: "%{name} је уклонио/ла %{target}'s аватар" + reopen_report: "%{name} је поново отворио/ла извештај %{target}" reset_password_user: "%{name} је ресетовао лозинку кориснику %{target}" resolve_report: "%{name} је одбацио пријаву %{target}" silence_account: "%{name} је ућуткао налог %{target}" suspend_account: "%{name} је суспендовао налог %{target}" + unassigned_report: "%{name} недодељен извештај %{target}" unsilence_account: "%{name} је укинуо ћутање налогу %{target}" unsuspend_account: "%{name} је укинуо суспензију налогу %{target}" update_custom_emoji: "%{name} је изменио емотикон %{target}" @@ -258,7 +279,7 @@ sr: email_domain_blocks: add_new: Додај нови created_msg: Успешно додао домен Е-поште на црну листу - delete: Уклони + delete: Обриши destroyed_msg: Успешно уклоњен домен Е-поште са црне листе domain: Домен new: @@ -281,28 +302,71 @@ sr: title: Позивнице relays: add_new: Додај нови релеј + description_html: "Федерални релеј је посреднички сервер који размењује велике количине јавних труба између сервера на који је претплаћен и на који објављује.Може помоћи малим и средњим серверима да открију садржај из федиверса, који иначе захтева од локалних корисника да ручно пратити остале људе на удаљеним серверима." + enable_hint: Када се омогући, Ваш сервер ће бити претплаћен на све јавне трубе са овог релеја, и почеће да шаље своје јавне трубу на њега. + inbox_url: URL Релеја + pending: Чека се одобрење релеја + save_and_enable: Сачувај и омогући + setup: Подеси везу релеја + status: Статус + title: Релеји + report_notes: + created_msg: Белешка пријаве успешно направљена! + destroyed_msg: Белешка пријаве успешно избрисана! reports: + account: + note: белешка + report: извештај action_taken_by: Акцију извео are_you_sure: Да ли сте сигурни? + assign_to_self: Додели мени + assigned: Додељени модератор comment: none: Ништа - mark_as_resolved: Означи као решен + created_at: Пријављена + mark_as_resolved: Означи као решену + mark_as_unresolved: Означи као нерешену + notes: + create: Додај белешку + create_and_resolve: Реши са белешком + create_and_unresolve: Отвори поново са белешком + delete: Обриши + placeholder: Опишите какве су радње предузете, или било какве повезане новости... + reopen: Отвори пријаву поново report: 'Пријава #%{id}' reported_account: Пријављени налог reported_by: Пријавио - resolved: Решени + resolved: Решена + resolved_msg: Пријава успешно разрешена! silence_account: Ућуткај налог status: Статус suspend_account: Суспендуј налог title: Пријаве - unresolved: Нерешени + unassign: Уклони доделу + unresolved: Нерешене + updated_at: Ажурирана settings: + activity_api_enabled: + desc_html: Бројеви локално објављених статуса, активних корисника и нових регистрација по недељама + title: Објављуј агрегиране статистике о корисничким активностима bootstrap_timeline_accounts: desc_html: Одвојите више корисничких имена зарезом. Ради само за локалне и откључане налоге. Ако је празно, онда се односи на све локалне администраторе. title: Налози за аутоматско запраћивање за нове кориснике contact_information: email: Пословна е-пошта username: Контакт корисничко име + custom_css: + desc_html: Промени изглед на свакој страни када се CSS учита + title: Произвољни CSS + hero: + desc_html: Приказано на почетној страни. Препоручено је бар 600х100рх. Када се не одреди, враћа се на иконицу инстанце + title: Лого слика + peers_api_enabled: + desc_html: Имена домена које је ова инстанца срела у федиверсу + title: Објављуј списак откривених инстанци + preview_sensitive_media: + desc_html: Преглед веза на другим веб страницама ће приказати иконицу чак и ако је медиј означен као осетљиво + title: Покажи осетљив медиј у ОпенГраф прегледу registrations: closed_message: desc_html: Приказује се на главној страни када је инстанца затворена за регистрације. Можете користити HTML тагове @@ -316,6 +380,9 @@ sr: open: desc_html: Дозволи свакоме да креира налог title: Отворена регистрација + show_known_fediverse_at_about_page: + desc_html: Када се упали, показаће трубе из свих знаних федиверса на преглед. У супротном ће само показати локалне трубе. + title: Покажи познате здружене инстанце у прегледнику временске линије show_staff_badge: desc_html: Прикажи беџ особља на корисничкој страни title: Прикажи беџ особља @@ -325,6 +392,9 @@ sr: site_description_extended: desc_html: Добро место за ваш код понашања, правила, смернице и друге ствари по којима се Ваша инстанца разликује. Можете користити HTML тагове title: Произвољне додатне информације + site_short_description: + desc_html: Приказано у изборнику са стране и у мета ознакама. Опиши шта је Мастодон и шта чини овај сервер посебним у једном пасусу. Ако остане празно, вратиће се првобитни опис инстанце. + title: Кратак опис инстанце site_terms: desc_html: Можете писати Вашу политику приватности, услове коришћења и остале легалне ствари. Можете користити HTML тагове title: Произвољни услови коришћења @@ -346,6 +416,7 @@ sr: media: title: Мултимедија no_media: Без мултимедије + no_status_selected: Ниједан статус није промењен јер ниједан није изабран title: Статуси налога with_media: Са мултимедијом subscriptions: @@ -355,15 +426,25 @@ sr: last_delivery: Последња достава title: WebSub topic: Topic + suspensions: + bad_acct_msg: Вредност потврде се не поклапа. Да ли суспендујете прави рачун? + hint_html: 'Да бисте потврдили суспензију налога, унесите %{value} у поље испод:' + proceed: Настави + title: Суспендуј %{acct} + warning_html: 'Суспендовање овог налога ће неповратноизбрисати све податке са овог налога, који укључују:' title: Администрација admin_mailer: new_report: body: "%{reporter} је пријавио %{target}" + body_remote: Нека са домена %{domain} је пријавио %{target} subject: Нова пријава за %{instance} (#%{id}) application_mailer: + notification_preferences: Промени преференце Е-поште salutation: "%{name}," settings: 'Промени подешавања е-поште: %{link}' view: 'Погледај:' + view_profile: Погледај профил + view_status: Погледај статус applications: created: Апликација успешно направљена destroyed: Апликација успешно обрисана @@ -374,6 +455,8 @@ sr: your_token: Ваш приступни токен auth: agreement_html: Приступањем инстанци се слажете са правилима инстанце и условима коришћења. + change_password: Лозинка + confirm_email: Потврдите адресу е-поште delete_account: Обриши налог delete_account_html: Ако желите да обришете Ваш налог, можете наставити овде. Бићете упитани да потврдите. didnt_get_confirmation: Нисте добили поруку са упутствима за потврду налога? @@ -383,12 +466,19 @@ sr: logout: Одјава migrate_account: Помери у други налог migrate_account_html: Ако желите да преусмерите овај налог на неки други, можете то подесити овде. + or: или + or_log_in_with: Или се пријавите са + providers: + cas: CAS-ом + saml: SAML-ом register: Региструј се + register_elsewhere: Региструјте се на другом серверу resend_confirmation: Пошаљи поруку са упутствима о потврди налога поново reset_password: Ресетуј лозинку security: Безбедност set_new_password: Постави нову лозинку authorize_follow: + already_following: Већ пратите овај налог error: Нажалост, десила се грешка при тражењу удаљеног налога follow: Запрати follow_request: 'Послали сте захтев за праћењен за:' @@ -425,19 +515,42 @@ sr: '404': Страна коју сте тражили не постоји. '410': Страна коју сте тражили више не постоји. '422': - content: Security verification failed. Are you blocking cookies? - title: Security verification failed + content: Безбедоносна провера није успела. Да не блокирате колачиће? + title: Безбедоносна провера није успела '429': Успоред '500': content: Извињавамо се, нешто је пошло по злу са ове стране. title: Страна није исправна noscript_html: Да бисте користили Мастодонт веб апликацију, омогућите JavaScript. У супротном, пробајте неку од оригиналних апликација за Мастодонт за Вашу платформу. exports: + archive_takeout: + date: Датум + download: Преузмите Вашу архиву + hint_html: Можете затражити архиву ваших труба и отпремљених медија. Извезени подаци ће бити у АктивитиПаб формату, који можете читати са било којим усаглашеним софтвером. Архиву можете затражити сваких 7 дана. + in_progress: Састављање ваше архиве... + request: Затражите Вашу архиву + size: Величина blocks: Блокирали сте csv: CSV follows: Пратите mutes: Ућуткали сте storage: Мултимедијално складиште + filters: + contexts: + home: Временска линија почетне + notifications: Обавештења + public: Јавна временска линија + thread: Разговори + edit: + title: Измени филтер + errors: + invalid_context: Ниједан или неважећи контекст испоручен + invalid_irreversible: Неповратно филтрирање функционише само са почетном или контекстом обавештења + index: + delete: Избриши + title: Филтери + new: + title: Додај нови филтер followers: domain: Домен explanation_html: Ако желите да осигурате приватност Ваших статуса, морате бити свесни ко Вас прати. Ваши приватни статуси се шаљу на све инстанце на којима имате пратиоце. Можда желите да их прегледате и да уклоните оне пратиоце на оним инстанцама за које немате поверења да ће поштовати Вашу приватност. @@ -452,6 +565,10 @@ sr: true_privacy_html: Запамтите да се права приватност може постићи само шифровањем са краја на крај. unlocked_warning_html: Свако може да Вас запрати да одмах види Ваше приватне статусе. %{lock_link} да бисте прегледали и одбацили пратиоце. unlocked_warning_title: Ваш налог није закључан + footer: + developers: Програмери + more: Више… + resources: Ресурси generic: changes_saved_msg: Измене успешно сачуване! save_changes: Сними измене @@ -477,9 +594,11 @@ sr: '21600': 6 сати '3600': 1 сад '43200': 12 сати + '604800': 1 недеља '86400': 1 дан expires_in_prompt: Никад generate: Генериши + invited_by: 'Позвао Вас је:' max_uses: few: "%{count} коришћења" many: "%{count} коришћења" @@ -490,7 +609,7 @@ sr: table: expires_at: Истиче uses: Коришћења - title: Позови људе + title: Позовите људе lists: errors: limit: Достигли сте лимит броја листи @@ -507,7 +626,8 @@ sr: title: Модерација notification_mailer: digest: - body: 'Ево кратак преглед шта сте пропустили на инстанци %{instance} од последње посете од %{since}:' + action: Погледајте сва обавештења + body: Ево кратак преглед порука које сте пропустили од последње посете од %{since} mention: "%{name} Вас је поменуо у:" new_followers_summary: few: Добили сте %{count} нова пратиоца! Сјајно! @@ -519,21 +639,29 @@ sr: many: "%{count} нових обавештења од последње посете \U0001F418" one: "1 ново обавештење од последње посете \U0001F418" other: "%{count} нових обавештења од последње посете \U0001F418" + title: Док нисте били ту... favourite: body: "%{name} је поставио као омиљен Ваш статус:" subject: "%{name} је поставио као омиљен Ваш статус" + title: Нови омиљени follow: body: "%{name} Вас је запратио!" subject: "%{name} Вас је запратио" + title: Нови пратиоц follow_request: + action: Управљајте захтевима за праћење body: "%{name} је затражио да Вас запрати" subject: 'Пратиоци на чекању: %{name}' + title: Нови захтев за праћење mention: + action: Одговори body: "%{name} Вас је поменуо у:" subject: "%{name} Вас је поменуо" + title: Ново спомињање reblog: - body: "%{name} Вам је подржао(ла) статус:" - subject: "%{name} је подржао(ла) Ваш статус" + body: "%{name} Вам је подржао/ла статус:" + subject: "%{name} је подржао/ла Ваш статус" + title: Нова подршка number: human: decimal_units: @@ -546,51 +674,63 @@ sr: trillion: T unit: '' pagination: - next: Следећи + newer: Новије + next: Следеће + older: Старије prev: Претходни truncate: "…" preferences: languages: Језици - other: Остали + other: Остало publishing: Објављивање web: Веб remote_follow: acct: Унесите Ваш корисник@домен са кога желите да пратите missing_resource: Не могу да нађем захтевану адресу преусмеравања за Ваш налог - proceed: Наставите да запратите - prompt: 'Запратите ће:' + no_account_html: Немате налог? Можете се пријавити овде + proceed: Наставите да би сте запратили + prompt: 'Запратићете:' + remote_interaction: + proceed: Наставите за интеракцију + prompt: 'Желите да интерактирате са овом трубом:' + remote_unfollow: + error: Грешка + title: Наслов + unfollowed: Отпраћени sessions: activity: Последња активност browser: Веб читач browsers: - alipay: Alipay - blackberry: Блекбери + alipay: Алипеј + blackberry: Блекберија chrome: Хром - edge: Microsoft Edge - firefox: Firefox + edge: Мајкрософт Еџ + electron: Електрон + firefox: Фајерфокс generic: Непознати веб читач - ie: Internet Explorer - micro_messenger: MicroMessenger - nokia: Nokia S40 Ovi Browser + ie: Интернет Експлорер + micro_messenger: МајкроМесенџер + nokia: Нокија С40 Ови Претраживач opera: Опера - phantom_js: PhantomJS - qq: QQ Browser + otter: Отер + phantom_js: ФантомЏејЕс + qq: КјуКју Претраживач safari: Сафари - uc_browser: UCBrowser - weibo: Weibo + uc_browser: УЦПретраживач + weibo: Веибо current_session: Тренутна сесија description: "%{browser} са %{platform}" - explanation: Ово су тренутно пријављени веб читачи на Ваш Мастодонт налог. + explanation: Ово су веб претраживачи који су тренутно пријављени на Ваш Мастодон налог. ip: IP platforms: - adobe_air: Adobe Air-а + adobe_air: Адоб Ер-а android: Андроида blackberry: Блекберија chrome_os: Хром ОС-а firefox_os: Фајерфокс ОС-а - ios: iOS + ios: иОС-а linux: Линукса - mac: Mac-а + mac: Мека other: непознате платформе windows: Виндоуза windows_mobile: Виндоуз мобилног @@ -614,50 +754,92 @@ sr: two_factor_authentication: Двофакторска идентификација your_apps: Ваше апликације statuses: + attached: + description: 'У прилогу: %{attached}' + image: + one: "%{count} слику" + other: "%{count} слике" + video: + one: "%{count} видео" + other: "%{count} видеа" + boosted_from_html: Подржано од %{acct_link} + content_warning: 'Упозорење на садржај: %{warning}' + disallowed_hashtags: + one: 'садржи забрањену тарабу: %{tags}' + other: 'садржи забрањене тарабе: %{tags}' + language_detection: Аутоматскo откривање језика open_in_web: Отвори у вебу over_character_limit: ограничење од %{max} карактера прекорачено pin_errors: - limit: Већ имате прикачен највећи број тутова - ownership: Туђи тутови не могу да се прикаче - private: Тутови који нису јавни не могу да се прикаче + limit: Већ имате прикачен највећи број труба + ownership: Туђе трубе не могу да се прикаче + private: Трубе које нису јавне не могу бити прикачене reblog: Подршка не може да се прикачи show_more: Прикажи још + sign_in_to_participate: Пријавите се да учествујете у разговору title: '%{name}: "%{quote}"' visibilities: private: Само пратиоци - private_long: Само прикажи пратиоцима + private_long: Прикажи само пратиоцима public: Јавно public_long: Свако може да види unlisted: Неизлистано - unlisted_long: Свако може да види, али није излистано на јавним лајнама + unlisted_long: Свако може да види, али није излистано на јавним временским линијама stream_entries: - pinned: Прикачени тут + pinned: Прикачена труба reblogged: подржано sensitive_content: Осетљив садржај terms: title: Услови коришћења и политика приватности инстанце %{instance} themes: - default: Мастодонт + contrast: Велики контраст + default: Мастодон + mastodon-light: Мастодон (светло) time: formats: default: "%b %d, %Y, %H:%M" + month: "%b %Y" two_factor_authentication: - code_hint: Унесите код са Ваше апликације за проверу идентитета да потврдите + code_hint: Да бисте потврдили, унесите код генерисан од стране ваше апликације за потврду идентитета description_html: Ако укључите двофакторску идентификацију, мораћете да имате телефон са собом да бисте могли да се пријавите. Телефон ће онда генерисати токене за Вашу пријаву. disable: Искључи - enable: Укључи + enable: Омогући enabled: Двофакторска идентификација је укључена enabled_success: Двофакторска идентификација је успешно укључена generate_recovery_codes: Генериши кодове за опоравак instructions_html: "Скенирајте овај QR код у Google Authenticator или некој сличној TOTP апликацији на Вашем телефону. Од сада, та апликација ће Вам генерисати токене које морате унети да бисте се пријавили." - lost_recovery_codes: Кодови за опоравак Вам омогућавају да повратите приступ налогу ако изгубите телефон. Ако изгубите кодове за опоравак, можете их регенерисати овде. Од тог тренутка, стари кодови за опоравак више не важе. + lost_recovery_codes: Кодови за опоравак Вам омогућавају да повратите приступ налогу ако изгубите телефон. Ако изгубите кодове за опоравак, можете их ре-генерисати овде. Од тог тренутка, стари кодови за опоравак више не важе. manual_instructions: 'Уколико не можете да скенирате QR код и морате га унесете ручно, ево је огољена шифра:' recovery_codes: Направите резерву кодова за опоравак - recovery_codes_regenerated: Кодови за опоравак успешно регенерисани + recovery_codes_regenerated: Кодови за опоравак успешно ре-генерисани recovery_instructions_html: Ако икада изгубите приступ телефону, можете искористити кодове за опоравак дате испод да повратите приступ налогу. Држите кодове за опоравак на сигурном. На пример, одштампајте их и чувајте их са осталим важним документима. setup: Намештање wrong_code: Унесени код није исправан! Да ли су времена на серверу и на уређају исправна? + user_mailer: + backup_ready: + explanation: Тражили сте потпуну резервну копију вашег Мастодон рачуна. Спремна за преузимање! + subject: Ваша архива је спремна за преузимање + welcome: + edit_profile_action: Подеси профил + edit_profile_step: Профил можете прилагодити постављањем аватара, заглавља, променом имена и још много тога. Ако желите да прегледате нове пратиоце пре него што буду дозвољени да вас прате, можете закључати свој налог. + explanation: Ево неколико савета за почетак + final_action: Почните објављивати + final_step: 'Почните објављивати! Чак и без пратиоца ваше јавне поруке ће бити виђене од стране других, нпр. на локалној јавног линији и у тараба за означавање. Можда бисте желели да се представите у #увод тараби за означавање.' + full_handle: Ваш пун надимак + full_handle_hint: Ово бисте рекли својим пријатељима како би вам они послали поруку, или запратили са друге инстанце. + review_preferences_action: Промените подешавања + review_preferences_step: Обавезно поставите своја подешавања, као што су какву Е-пошту желите да примите или на који ниво приватности желите да ваше поруке буду постављене. Ако немате морску болест или епилепсију, можете изабрати аутоматско покретање ГИФ-а. + subject: Добродошли на Мастодон + tip_bridge_html: Ако долазите са Твитера, можете пронаћи пријатеље користећи апликацију за премошћавање. Ово ради само ако и они користе исту апликацију! + tip_federated_timeline: Здружена временска линија је компетан увид у Мастодонову мрежу. Али она само укључује људе на којој су ваше комшије претплаћене, тако да није комплетна. + tip_following: Аутоматски пратите админа/не вашег сервера. Да пронађете занимљиве људе, проверите локалне и здружене временске линије. + tip_local_timeline: Локална временска линија је комплетан увид људи у %{instance}. Ово су вам прве комшије! + tip_mobile_webapp: Ако вам мобилни претраживач предложи да додате Мастодон на Ваш почетни екран, добијаћете мобилна обавештења. Делује као изворна апликација на много начина! + tips: Савети + title: Добродошли, %{name}! users: - invalid_email: Адреса е-поште није исправна + invalid_email: Адреса Е-поште није исправна invalid_otp_token: Неисправни двофакторски код - signed_in_as: 'Пријављен као:' + otp_lost_help_html: Ако изгубите приступ за оба, можете ступити у контакт са %{email} + seamless_external_login: Пријављени сте путем спољашње услуге, тако да лозинка и подешавања Е-поште нису доступни. + signed_in_as: 'Пријављен/а као:' diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml index a383957009a..e2b9b520ede 100644 --- a/config/locales/zh-TW.yml +++ b/config/locales/zh-TW.yml @@ -5,10 +5,13 @@ zh-TW: about_mastodon_html: Mastodon （長毛象）是一個自由、開放原始碼的社群網站。它是一個分散式的服務，避免您的通訊被單一商業機構壟斷操控。請您選擇一家您信任的 Mastodon 站點，在上面建立帳號，然後您就可以和任一 Mastodon 站點上的使用者互通，享受無縫的社群網路交流。 about_this: 關於本站 administered_by: 管理者： + api: API + apps: Mobile apps closed_registrations: 本站暫時停止接受註冊。 contact: 聯絡我們 contact_missing: 未設定 contact_unavailable: 未公開 + documentation: 文件 extended_description_html: |

    這裡可以寫一些網站規則

    本站點未有詳細介紹

    @@ -26,14 +29,18 @@ zh-TW: learn_more: 了解詳細 other_instances: 其他站點 source_code: 原始碼 - status_count_after: 條嘟嘟 + status_count_after: + one: 狀態 status_count_before: 他們共嘟出了 - user_count_after: 位使用者 + terms: 使用條款 + user_count_after: + one: 使用者 user_count_before: 這裡共註冊有 what_is_mastodon: 什麼是 Mastodon? accounts: follow: 關注 - followers: 關注者 + followers: + other: 關注者 following: 正在關注 media: 媒體 moved_html: "%{name} 已經搬遷到 %{new_profile_link}:" @@ -41,7 +48,10 @@ zh-TW: nothing_here: 暫時沒有內容可供顯示! people_followed_by: "%{name} 關注的人" people_who_follow: 關注 %{name} 的人 - posts: 嘟文 + posts: + one: 嘟掉 + other: 嘟文 + posts_tab_heading: 嘟文 posts_with_replies: 嘟文與回覆 reserved_username: 此用戶名已被保留 roles: From 6a3f9b7e53e4cef0b5406676d56e904a02716ee6 Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Fri, 14 Sep 2018 17:42:22 +0200 Subject: [PATCH 10/25] Move more tasks to tootctl (#8675) * Move more tasks to tootctl - tootctl feeds build - tootctl feeds clear - tootctl accounts refresh Clean up exit codes and help messages * Move user modifying to tootctl * Improve user modification through CLI, rename commands add -> create mod -> modify del -> delete To remove ambiguity * Fix code style issues * Fix not being able to unset admin/mod role --- .rubocop.yml | 5 + lib/cli.rb | 5 + lib/mastodon/accounts_cli.rb | 114 ++++++++++- lib/mastodon/emoji_cli.rb | 4 - lib/mastodon/feeds_cli.rb | 81 ++++++++ lib/mastodon/media_cli.rb | 13 +- lib/tasks/mastodon.rake | 370 ----------------------------------- 7 files changed, 205 insertions(+), 387 deletions(-) create mode 100644 lib/mastodon/feeds_cli.rb diff --git a/.rubocop.yml b/.rubocop.yml index 4ba5903bd03..59e8a757ac1 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -77,6 +77,11 @@ Rails/SkipsModelValidations: Rails/HttpStatus: Enabled: false +Rails/Exit: + Exclude: + - 'lib/mastodon/*' + - 'lib/cli' + Style/ClassAndModuleChildren: Enabled: false diff --git a/lib/cli.rb b/lib/cli.rb index 60bff414728..14a91c2db4d 100644 --- a/lib/cli.rb +++ b/lib/cli.rb @@ -4,6 +4,8 @@ require 'thor' require_relative 'mastodon/media_cli' require_relative 'mastodon/emoji_cli' require_relative 'mastodon/accounts_cli' +require_relative 'mastodon/feeds_cli' + module Mastodon class CLI < Thor desc 'media SUBCOMMAND ...ARGS', 'Manage media files' @@ -14,5 +16,8 @@ module Mastodon desc 'accounts SUBCOMMAND ...ARGS', 'Manage accounts' subcommand 'accounts', Mastodon::AccountsCLI + + desc 'feeds SUBCOMMAND ...ARGS', 'Manage feeds' + subcommand 'feeds', Mastodon::FeedsCLI end end diff --git a/lib/mastodon/accounts_cli.rb b/lib/mastodon/accounts_cli.rb index d44cdfae947..65c1b395af3 100644 --- a/lib/mastodon/accounts_cli.rb +++ b/lib/mastodon/accounts_cli.rb @@ -40,6 +40,7 @@ module Mastodon say('OK', :green) else say('No account(s) given', :red) + exit(1) end end @@ -48,7 +49,7 @@ module Mastodon option :role, default: 'user' option :reattach, type: :boolean option :force, type: :boolean - desc 'add USERNAME', 'Create a new user' + desc 'create USERNAME', 'Create a new user' long_desc <<-LONG_DESC Create a new user account with a given USERNAME and an e-mail address provided with --email. @@ -65,7 +66,7 @@ module Mastodon the --force option to delete the old record and reattach the username to the new account anyway. LONG_DESC - def add(username) + def create(username) account = Account.new(username: username) password = SecureRandom.hex user = User.new(email: options[:email], password: password, admin: options[:role] == 'admin', moderator: options[:role] == 'moderator', confirmed_at: Time.now.utc) @@ -98,19 +99,75 @@ module Mastodon say(key) say(' ' + error, :red) end + + exit(1) end end - desc 'del USERNAME', 'Delete a user' + option :role + option :email + option :confirm, type: :boolean + option :enable, type: :boolean + option :disable, type: :boolean + option :disable_2fa, type: :boolean + desc 'modify USERNAME', 'Modify a user' + long_desc <<-LONG_DESC + Modify a user account. + + With the --role option, update the user's role to one of "user", + "moderator" or "admin". + + With the --email option, update the user's e-mail address. With + the --confirm option, mark the user's e-mail as confirmed. + + With the --disable option, lock the user out of their account. The + --enable option is the opposite. + + With the --disable-2fa option, the two-factor authentication + requirement for the user can be removed. + LONG_DESC + def modify(username) + user = Account.find_local(username)&.user + + if user.nil? + say('No user with such username', :red) + exit(1) + end + + if options[:role] + user.admin = options[:role] == 'admin' + user.moderator = options[:role] == 'moderator' + end + + user.email = options[:email] if options[:email] + user.disabled = false if options[:enable] + user.disabled = true if options[:disable] + user.otp_required_for_login = false if options[:disable_2fa] + user.confirm if options[:confirm] + + if user.save + say('OK', :green) + else + user.errors.to_h.each do |key, error| + say('Failure/Error: ', :red) + say(key) + say(' ' + error, :red) + end + + exit(1) + end + end + + desc 'delete USERNAME', 'Delete a user' long_desc <<-LONG_DESC Remove a user account with a given USERNAME. LONG_DESC - def del(username) + def delete(username) account = Account.find_local(username) if account.nil? say('No user with such username', :red) - return + exit(1) end say("Deleting user with #{account.statuses_count}, this might take a while...") @@ -182,9 +239,56 @@ module Mastodon end end + option :all, type: :boolean + option :domain + desc 'refresh [USERNAME]', 'Fetch remote user data and files' + long_desc <<-LONG_DESC + Fetch remote user data and files for one or multiple accounts. + + With the --all option, all remote accounts will be processed. + Through the --domain option, this can be narrowed down to a + specific domain only. Otherwise, a single remote account must + be specified with USERNAME. + + All processing is done in the background through Sidekiq. + LONG_DESC + def refresh(username = nil) + if options[:domain] || options[:all] + queued = 0 + scope = Account.remote + scope = scope.where(domain: options[:domain]) if options[:domain] + + scope.select(:id).reorder(nil).find_in_batches do |accounts| + Maintenance::RedownloadAccountMediaWorker.push_bulk(accounts.map(&:id)) + queued += accounts.size + end + + say("Scheduled refreshment of #{queued} accounts", :green, true) + elsif username.present? + username, domain = username.split('@') + account = Account.find_remote(username, domain) + + if account.nil? + say('No such account', :red) + exit(1) + end + + Maintenance::RedownloadAccountMediaWorker.perform_async(account.id) + say('OK', :green) + else + say('No account(s) given', :red) + exit(1) + end + end + private def rotate_keys_for_account(account, delay = 0) + if account.nil? + say('No such account', :red) + exit(1) + end + old_key = account.private_key new_key = OpenSSL::PKey::RSA.new(2048).to_pem account.update(private_key: new_key) diff --git a/lib/mastodon/emoji_cli.rb b/lib/mastodon/emoji_cli.rb index 0a773c771ec..5bc51d034d8 100644 --- a/lib/mastodon/emoji_cli.rb +++ b/lib/mastodon/emoji_cli.rb @@ -5,8 +5,6 @@ require_relative '../../config/boot' require_relative '../../config/environment' require_relative 'cli_helper' -# rubocop:disable Rails/Output - module Mastodon class EmojiCLI < Thor option :prefix @@ -77,5 +75,3 @@ module Mastodon end end end - -# rubocop:enable Rails/Output diff --git a/lib/mastodon/feeds_cli.rb b/lib/mastodon/feeds_cli.rb new file mode 100644 index 00000000000..c3fca723ecf --- /dev/null +++ b/lib/mastodon/feeds_cli.rb @@ -0,0 +1,81 @@ +# frozen_string_literal: true + +require_relative '../../config/boot' +require_relative '../../config/environment' +require_relative 'cli_helper' + +module Mastodon + class FeedsCLI < Thor + option :all, type: :boolean, default: false + option :background, type: :boolean, default: false + option :dry_run, type: :boolean, default: false + option :verbose, type: :boolean, default: false + desc 'build [USERNAME]', 'Build home and list feeds for one or all users' + long_desc <<-LONG_DESC + Build home and list feeds that are stored in Redis from the database. + + With the --all option, all active users will be processed. + Otherwise, a single user specified by USERNAME. + + With the --background option, regeneration will be queued into Sidekiq, + and the command will exit as soon as possible. + + With the --dry-run option, no work will be done. + + With the --verbose option, when accounts are processed sequentially in the + foreground, the IDs of the accounts will be printed. + LONG_DESC + def build(username = nil) + dry_run = options[:dry_run] ? '(DRY RUN)' : '' + + if options[:all] || username.nil? + processed = 0 + queued = 0 + + User.active.select(:id, :account_id).reorder(nil).find_in_batches do |users| + if options[:background] + RegenerationWorker.push_bulk(users.map(&:account_id)) unless options[:dry_run] + queued += users.size + else + users.each do |user| + RegenerationWorker.new.perform(user.account_id) unless options[:dry_run] + options[:verbose] ? say(user.account_id) : say('.', :green, false) + processed += 1 + end + end + end + + if options[:background] + say("Scheduled feed regeneration for #{queued} accounts #{dry_run}", :green, true) + else + say + say("Regenerated feeds for #{processed} accounts #{dry_run}", :green, true) + end + elsif username.present? + account = Account.find_local(username) + + if options[:background] + RegenerationWorker.perform_async(account.id) unless options[:dry_run] + else + RegenerationWorker.new.perform(account.id) unless options[:dry_run] + end + + say("OK #{dry_run}", :green, true) + else + say('No account(s) given', :red) + exit(1) + end + end + + desc 'clear', 'Remove all home and list feeds from Redis' + def clear + keys = Redis.current.keys('feed:*') + + Redis.current.pipelined do + keys.each { |key| Redis.current.del(key) } + end + + say('OK', :green) + end + end +end diff --git a/lib/mastodon/media_cli.rb b/lib/mastodon/media_cli.rb index 12ebdb774ce..8aa9f790391 100644 --- a/lib/mastodon/media_cli.rb +++ b/lib/mastodon/media_cli.rb @@ -4,8 +4,6 @@ require_relative '../../config/boot' require_relative '../../config/environment' require_relative 'cli_helper' -# rubocop:disable Rails/Output - module Mastodon class MediaCLI < Thor option :days, type: :numeric, default: 7 @@ -25,9 +23,10 @@ module Mastodon it may impact other operations of the Mastodon server, and it may overload the underlying file storage. - With the --verbose option, output deleting file ID to console (only when --background false). + With the --dry-run option, no work will be done. - With the --dry-run option, output the number of files to delete without deleting. + With the --verbose option, when media attachments are processed sequentially in the + foreground, the IDs of the media attachments will be printed. DESC def remove time_ago = options[:days].days.ago @@ -53,12 +52,10 @@ module Mastodon say if options[:background] - say("Scheduled the deletion of #{queued} media attachments #{dry_run}.", :green) + say("Scheduled the deletion of #{queued} media attachments #{dry_run}", :green, true) else - say("Removed #{processed} media attachments #{dry_run}.", :green) + say("Removed #{processed} media attachments #{dry_run}", :green, true) end end end end - -# rubocop:enable Rails/Output diff --git a/lib/tasks/mastodon.rake b/lib/tasks/mastodon.rake index 649a22a0bd5..ec88008194c 100644 --- a/lib/tasks/mastodon.rake +++ b/lib/tasks/mastodon.rake @@ -390,139 +390,6 @@ namespace :mastodon do end end - desc 'Turn a user into an admin, identified by the USERNAME environment variable' - task make_admin: :environment do - include RoutingHelper - - account_username = ENV.fetch('USERNAME') - user = User.joins(:account).where(accounts: { username: account_username }) - - if user.present? - user.update(admin: true) - puts "Congrats! #{account_username} is now an admin. \\o/\nNavigate to #{edit_admin_settings_url} to get started" - else - puts "User could not be found; please make sure an account with the `#{account_username}` username exists." - end - end - - desc 'Turn a user into a moderator, identified by the USERNAME environment variable' - task make_mod: :environment do - account_username = ENV.fetch('USERNAME') - user = User.joins(:account).where(accounts: { username: account_username }) - - if user.present? - user.update(moderator: true) - puts "Congrats! #{account_username} is now a moderator \\o/" - else - puts "User could not be found; please make sure an account with the `#{account_username}` username exists." - end - end - - desc 'Remove admin and moderator privileges from user identified by the USERNAME environment variable' - task revoke_staff: :environment do - account_username = ENV.fetch('USERNAME') - user = User.joins(:account).where(accounts: { username: account_username }) - - if user.present? - user.update(moderator: false, admin: false) - puts "#{account_username} is no longer admin or moderator." - else - puts "User could not be found; please make sure an account with the `#{account_username}` username exists." - end - end - - desc 'Manually confirms a user with associated user email address stored in USER_EMAIL environment variable.' - task confirm_email: :environment do - email = ENV.fetch('USER_EMAIL') - user = User.find_by(email: email) - - if user - user.update(confirmed_at: Time.now.utc) - puts "#{email} confirmed" - else - abort "#{email} not found" - end - end - - desc 'Add a user by providing their email, username and initial password.' \ - 'The user will receive a confirmation email, then they must reset their password before logging in.' - task add_user: :environment do - disable_log_stdout! - - prompt = TTY::Prompt.new - - begin - email = prompt.ask('E-mail:', required: true) do |q| - q.modify :strip - end - - username = prompt.ask('Username:', required: true) do |q| - q.modify :strip - end - - role = prompt.select('Role:', %w(user moderator admin)) - - if prompt.yes?('Proceed to create the user?') - user = User.new(email: email, password: SecureRandom.hex, admin: role == 'admin', moderator: role == 'moderator', account_attributes: { username: username }) - - if user.save - prompt.ok 'User created and confirmation mail sent to the user\'s email address.' - prompt.ok "Here is the random password generated for the user: #{user.password}" - else - prompt.warn 'User was not created because of the following errors:' - - user.errors.each do |key, val| - prompt.error "#{key}: #{val}" - end - end - else - prompt.ok 'Aborting. Bye!' - end - rescue TTY::Reader::InputInterrupt - prompt.ok 'Aborting. Bye!' - end - end - - namespace :media do - desc 'Remove media attachments attributed to silenced accounts' - task remove_silenced: :environment do - nb_media_attachments = 0 - MediaAttachment.where(account: Account.silenced).select(:id).reorder(nil).find_in_batches do |media_attachments| - nb_media_attachments += media_attachments.length - Maintenance::DestroyMediaWorker.push_bulk(media_attachments.map(&:id)) - end - puts "Scheduled the deletion of #{nb_media_attachments} media attachments" - end - - desc 'Remove cached remote media attachments that are older than NUM_DAYS. By default 7 (week)' - task remove_remote: :environment do - puts 'Please use `./bin/tootctl media remove --help` directly'.colorize(:yellow) - require_relative '../mastodon/media_cli' - cli = Mastodon::MediaCLI.new([], days: (ENV['NUM_DAYS'] || 7).to_i) - cli.invoke(:remove) - end - - desc 'Set unknown attachment type for remote-only attachments' - task set_unknown: :environment do - puts 'Setting unknown attachment type for remote-only attachments...' - MediaAttachment.where(file_file_name: nil).where.not(type: :unknown).in_batches.update_all(type: :unknown) - puts 'Done!' - end - - desc 'Redownload avatars/headers of remote users. Optionally limit to a particular domain with DOMAIN' - task redownload_avatars: :environment do - accounts = Account.remote - accounts = accounts.where(domain: ENV['DOMAIN']) if ENV['DOMAIN'].present? - nb_accounts = 0 - - accounts.select(:id).reorder(nil).find_in_batches do |accounts_batch| - nb_accounts += accounts_batch.length - Maintenance::RedownloadAccountMediaWorker.push_bulk(accounts_batch.map(&:id)) - end - puts "Scheduled the download of avatars/headers for #{nb_accounts} remote users" - end - end - namespace :push do desc 'Unsubscribes from PuSH updates of feeds nobody follows locally' task clear: :environment do @@ -530,28 +397,6 @@ namespace :mastodon do end end - namespace :feeds do - desc 'Clear all timelines without regenerating them' - task clear_all: :environment do - Redis.current.keys('feed:*').each { |key| Redis.current.del(key) } - end - - desc 'Generates home timelines for users who logged in in the past two weeks' - task build: :environment do - User.active.select(:id, :account_id).reorder(nil).find_in_batches do |users| - RegenerationWorker.push_bulk(users.map(&:account_id)) - end - end - end - - namespace :users do - desc 'List e-mails of all admin users' - task admins: :environment do - puts 'Admin user emails:' - puts User.admins.map(&:email).join("\n") - end - end - namespace :settings do desc 'Open registrations on this instance' task open_registrations: :environment do @@ -572,221 +417,6 @@ namespace :mastodon do puts "VAPID_PUBLIC_KEY=#{vapid_key.public_key}" end end - - namespace :maintenance do - desc 'Update counter caches' - task update_counter_caches: :environment do - puts 'Updating counter caches for accounts...' - - Account.unscoped.where.not(protocol: :activitypub).select('id').find_in_batches do |batch| - Account.where(id: batch.map(&:id)).update_all('statuses_count = (select count(*) from statuses where account_id = accounts.id), followers_count = (select count(*) from follows where target_account_id = accounts.id), following_count = (select count(*) from follows where account_id = accounts.id)') - end - - puts 'Updating counter caches for statuses...' - - Status.unscoped.select('id').find_in_batches do |batch| - Status.where(id: batch.map(&:id)).update_all('favourites_count = (select count(*) from favourites where favourites.status_id = statuses.id), reblogs_count = (select count(*) from statuses as reblogs where reblogs.reblog_of_id = statuses.id)') - end - - puts 'Done!' - end - - desc 'Generate static versions of GIF avatars/headers' - task add_static_avatars: :environment do - puts 'Generating static avatars/headers for GIF ones...' - - Account.unscoped.where(avatar_content_type: 'image/gif').or(Account.unscoped.where(header_content_type: 'image/gif')).find_each do |account| - begin - account.avatar.reprocess! if account.avatar_content_type == 'image/gif' && !account.avatar.exists?(:static) - account.header.reprocess! if account.header_content_type == 'image/gif' && !account.header.exists?(:static) - rescue StandardError => e - Rails.logger.error "Error while generating static avatars/headers for account #{account.id}: #{e}" - next - end - end - - puts 'Done!' - end - - desc 'Ensure referencial integrity' - task prepare_for_foreign_keys: :environment do - # All the deletes: - ActiveRecord::Base.connection.execute('DELETE FROM statuses USING statuses s LEFT JOIN accounts a ON a.id = s.account_id WHERE statuses.id = s.id AND a.id IS NULL') - - if ActiveRecord::Base.connection.table_exists? :account_domain_blocks - ActiveRecord::Base.connection.execute('DELETE FROM account_domain_blocks USING account_domain_blocks adb LEFT JOIN accounts a ON a.id = adb.account_id WHERE account_domain_blocks.id = adb.id AND a.id IS NULL') - end - - if ActiveRecord::Base.connection.table_exists? :conversation_mutes - ActiveRecord::Base.connection.execute('DELETE FROM conversation_mutes USING conversation_mutes cm LEFT JOIN accounts a ON a.id = cm.account_id WHERE conversation_mutes.id = cm.id AND a.id IS NULL') - ActiveRecord::Base.connection.execute('DELETE FROM conversation_mutes USING conversation_mutes cm LEFT JOIN conversations c ON c.id = cm.conversation_id WHERE conversation_mutes.id = cm.id AND c.id IS NULL') - end - - ActiveRecord::Base.connection.execute('DELETE FROM favourites USING favourites f LEFT JOIN accounts a ON a.id = f.account_id WHERE favourites.id = f.id AND a.id IS NULL') - ActiveRecord::Base.connection.execute('DELETE FROM favourites USING favourites f LEFT JOIN statuses s ON s.id = f.status_id WHERE favourites.id = f.id AND s.id IS NULL') - ActiveRecord::Base.connection.execute('DELETE FROM blocks USING blocks b LEFT JOIN accounts a ON a.id = b.account_id WHERE blocks.id = b.id AND a.id IS NULL') - ActiveRecord::Base.connection.execute('DELETE FROM blocks USING blocks b LEFT JOIN accounts a ON a.id = b.target_account_id WHERE blocks.id = b.id AND a.id IS NULL') - ActiveRecord::Base.connection.execute('DELETE FROM follow_requests USING follow_requests fr LEFT JOIN accounts a ON a.id = fr.account_id WHERE follow_requests.id = fr.id AND a.id IS NULL') - ActiveRecord::Base.connection.execute('DELETE FROM follow_requests USING follow_requests fr LEFT JOIN accounts a ON a.id = fr.target_account_id WHERE follow_requests.id = fr.id AND a.id IS NULL') - ActiveRecord::Base.connection.execute('DELETE FROM follows USING follows f LEFT JOIN accounts a ON a.id = f.account_id WHERE follows.id = f.id AND a.id IS NULL') - ActiveRecord::Base.connection.execute('DELETE FROM follows USING follows f LEFT JOIN accounts a ON a.id = f.target_account_id WHERE follows.id = f.id AND a.id IS NULL') - ActiveRecord::Base.connection.execute('DELETE FROM mutes USING mutes m LEFT JOIN accounts a ON a.id = m.account_id WHERE mutes.id = m.id AND a.id IS NULL') - ActiveRecord::Base.connection.execute('DELETE FROM mutes USING mutes m LEFT JOIN accounts a ON a.id = m.target_account_id WHERE mutes.id = m.id AND a.id IS NULL') - ActiveRecord::Base.connection.execute('DELETE FROM imports USING imports i LEFT JOIN accounts a ON a.id = i.account_id WHERE imports.id = i.id AND a.id IS NULL') - ActiveRecord::Base.connection.execute('DELETE FROM mentions USING mentions m LEFT JOIN accounts a ON a.id = m.account_id WHERE mentions.id = m.id AND a.id IS NULL') - ActiveRecord::Base.connection.execute('DELETE FROM mentions USING mentions m LEFT JOIN statuses s ON s.id = m.status_id WHERE mentions.id = m.id AND s.id IS NULL') - ActiveRecord::Base.connection.execute('DELETE FROM notifications USING notifications n LEFT JOIN accounts a ON a.id = n.account_id WHERE notifications.id = n.id AND a.id IS NULL') - ActiveRecord::Base.connection.execute('DELETE FROM notifications USING notifications n LEFT JOIN accounts a ON a.id = n.from_account_id WHERE notifications.id = n.id AND a.id IS NULL') - ActiveRecord::Base.connection.execute('DELETE FROM preview_cards USING preview_cards pc LEFT JOIN statuses s ON s.id = pc.status_id WHERE preview_cards.id = pc.id AND s.id IS NULL') - ActiveRecord::Base.connection.execute('DELETE FROM reports USING reports r LEFT JOIN accounts a ON a.id = r.account_id WHERE reports.id = r.id AND a.id IS NULL') - ActiveRecord::Base.connection.execute('DELETE FROM reports USING reports r LEFT JOIN accounts a ON a.id = r.target_account_id WHERE reports.id = r.id AND a.id IS NULL') - ActiveRecord::Base.connection.execute('DELETE FROM statuses_tags USING statuses_tags st LEFT JOIN statuses s ON s.id = st.status_id WHERE statuses_tags.tag_id = st.tag_id AND statuses_tags.status_id = st.status_id AND s.id IS NULL') - ActiveRecord::Base.connection.execute('DELETE FROM statuses_tags USING statuses_tags st LEFT JOIN tags t ON t.id = st.tag_id WHERE statuses_tags.tag_id = st.tag_id AND statuses_tags.status_id = st.status_id AND t.id IS NULL') - ActiveRecord::Base.connection.execute('DELETE FROM stream_entries USING stream_entries se LEFT JOIN accounts a ON a.id = se.account_id WHERE stream_entries.id = se.id AND a.id IS NULL') - ActiveRecord::Base.connection.execute('DELETE FROM subscriptions USING subscriptions s LEFT JOIN accounts a ON a.id = s.account_id WHERE subscriptions.id = s.id AND a.id IS NULL') - ActiveRecord::Base.connection.execute('DELETE FROM users USING users u LEFT JOIN accounts a ON a.id = u.account_id WHERE users.id = u.id AND a.id IS NULL') - ActiveRecord::Base.connection.execute('DELETE FROM web_settings USING web_settings ws LEFT JOIN users u ON u.id = ws.user_id WHERE web_settings.id = ws.id AND u.id IS NULL') - ActiveRecord::Base.connection.execute('DELETE FROM oauth_access_grants USING oauth_access_grants oag LEFT JOIN users u ON u.id = oag.resource_owner_id WHERE oauth_access_grants.id = oag.id AND oag.resource_owner_id IS NOT NULL AND u.id IS NULL') - ActiveRecord::Base.connection.execute('DELETE FROM oauth_access_grants USING oauth_access_grants oag LEFT JOIN oauth_applications a ON a.id = oag.application_id WHERE oauth_access_grants.id = oag.id AND oag.application_id IS NOT NULL AND a.id IS NULL') - ActiveRecord::Base.connection.execute('DELETE FROM oauth_access_tokens USING oauth_access_tokens oat LEFT JOIN users u ON u.id = oat.resource_owner_id WHERE oauth_access_tokens.id = oat.id AND oat.resource_owner_id IS NOT NULL AND u.id IS NULL') - ActiveRecord::Base.connection.execute('DELETE FROM oauth_access_tokens USING oauth_access_tokens oat LEFT JOIN oauth_applications a ON a.id = oat.application_id WHERE oauth_access_tokens.id = oat.id AND oat.application_id IS NOT NULL AND a.id IS NULL') - - # All the nullifies: - ActiveRecord::Base.connection.execute('UPDATE statuses SET in_reply_to_id = NULL FROM statuses s LEFT JOIN statuses rs ON rs.id = s.in_reply_to_id WHERE statuses.id = s.id AND s.in_reply_to_id IS NOT NULL AND rs.id IS NULL') - ActiveRecord::Base.connection.execute('UPDATE statuses SET in_reply_to_account_id = NULL FROM statuses s LEFT JOIN accounts a ON a.id = s.in_reply_to_account_id WHERE statuses.id = s.id AND s.in_reply_to_account_id IS NOT NULL AND a.id IS NULL') - ActiveRecord::Base.connection.execute('UPDATE media_attachments SET status_id = NULL FROM media_attachments ma LEFT JOIN statuses s ON s.id = ma.status_id WHERE media_attachments.id = ma.id AND ma.status_id IS NOT NULL AND s.id IS NULL') - ActiveRecord::Base.connection.execute('UPDATE media_attachments SET account_id = NULL FROM media_attachments ma LEFT JOIN accounts a ON a.id = ma.account_id WHERE media_attachments.id = ma.id AND ma.account_id IS NOT NULL AND a.id IS NULL') - ActiveRecord::Base.connection.execute('UPDATE reports SET action_taken_by_account_id = NULL FROM reports r LEFT JOIN accounts a ON a.id = r.action_taken_by_account_id WHERE reports.id = r.id AND r.action_taken_by_account_id IS NOT NULL AND a.id IS NULL') - end - - desc 'Remove deprecated preview cards' - task remove_deprecated_preview_cards: :environment do - next unless ActiveRecord::Base.connection.table_exists? 'deprecated_preview_cards' - - class DeprecatedPreviewCard < ActiveRecord::Base - self.inheritance_column = false - - path = '/preview_cards/:attachment/:id_partition/:style/:filename' - if ENV['S3_ENABLED'] != 'true' - path = (ENV['PAPERCLIP_ROOT_PATH'] || ':rails_root/public/system') + path - end - - has_attached_file :image, styles: { original: '280x120>' }, convert_options: { all: '-quality 80 -strip' }, path: path - end - - puts 'Delete records and associated files from deprecated preview cards? [y/N]: ' - confirm = STDIN.gets.chomp - - if confirm.casecmp('y').zero? - DeprecatedPreviewCard.in_batches.destroy_all - - puts 'Drop deprecated preview cards table? [y/N]: ' - confirm = STDIN.gets.chomp - - if confirm.casecmp('y').zero? - ActiveRecord::Migration.drop_table :deprecated_preview_cards - end - end - end - - desc 'Migrate photo preview cards made before 2.1' - task migrate_photo_preview_cards: :environment do - status_ids = Status.joins(:preview_cards) - .where(preview_cards: { embed_url: '', type: :photo }) - .reorder(nil) - .group(:id) - .pluck(:id) - - PreviewCard.where(embed_url: '', type: :photo).delete_all - LinkCrawlWorker.push_bulk status_ids - end - - desc 'Find case-insensitive username duplicates of local users' - task find_duplicate_usernames: :environment do - include RoutingHelper - - disable_log_stdout! - - duplicate_masters = Account.find_by_sql('SELECT * FROM accounts WHERE id IN (SELECT min(id) FROM accounts WHERE domain IS NULL GROUP BY lower(username) HAVING count(*) > 1)') - pastel = Pastel.new - - duplicate_masters.each do |account| - puts pastel.yellow('First of their name: ') + pastel.bold(account.username) + " (#{admin_account_url(account.id)})" - - Account.where('lower(username) = ?', account.username.downcase).where.not(id: account.id).each do |duplicate| - puts ' ' + pastel.red('Duplicate: ') + admin_account_url(duplicate.id) - end - end - end - - desc 'Remove all home feed regeneration markers' - task remove_regeneration_markers: :environment do - keys = Redis.current.keys('account:*:regeneration') - - Redis.current.pipelined do - keys.each { |key| Redis.current.del(key) } - end - end - - desc 'Check every known remote account and delete those that no longer exist in origin' - task purge_removed_accounts: :environment do - prepare_for_options! - - options = {} - - OptionParser.new do |opts| - opts.banner = 'Usage: rails mastodon:maintenance:purge_removed_accounts [options]' - - opts.on('-f', '--force', 'Remove all encountered accounts without asking for confirmation') do - options[:force] = true - end - - opts.on('-h', '--help', 'Display this message') do - puts opts - exit - end - end.parse! - - disable_log_stdout! - - total = Account.remote.where(protocol: :activitypub).count - progress_bar = ProgressBar.create(total: total, format: '%c/%C |%w>%i| %e') - - Account.remote.where(protocol: :activitypub).partitioned.find_each do |account| - progress_bar.increment - - begin - code = Request.new(:head, account.uri).perform(&:code) - rescue StandardError - # This could happen due to network timeout, DNS timeout, wrong SSL cert, etc, - # which should probably not lead to perceiving the account as deleted, so - # just skip till next time - next - end - - if [404, 410].include?(code) - if options[:force] - SuspendAccountService.new.call(account) - account.destroy - else - progress_bar.pause - progress_bar.clear - print "\nIt seems like #{account.acct} no longer exists. Purge the account from the database? [Y/n]: ".colorize(:yellow) - confirm = STDIN.gets.chomp - puts '' - progress_bar.resume - - if confirm.casecmp('n').zero? - next - else - SuspendAccountService.new.call(account) - account.destroy - end - end - end - end - end - end end def disable_log_stdout! From 64a5561b5afe0cd125498a245f8b27ea3d4d133c Mon Sep 17 00:00:00 2001 From: Alexander Date: Fri, 14 Sep 2018 17:42:45 +0200 Subject: [PATCH 11/25] update devise_pam_authenticatable2, new feature: pam gets ip address of client (#8623) --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index bdac00b485a..09e18669d87 100644 --- a/Gemfile +++ b/Gemfile @@ -34,7 +34,7 @@ gem 'devise', '~> 4.4' gem 'devise-two-factor', '~> 3.0' group :pam_authentication, optional: true do - gem 'devise_pam_authenticatable2', '~> 9.1' + gem 'devise_pam_authenticatable2', '~> 9.2' end gem 'net-ldap', '~> 0.10' diff --git a/Gemfile.lock b/Gemfile.lock index 502d08efe31..8fc58395cc8 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -174,7 +174,7 @@ GEM devise (~> 4.0) railties (< 5.3) rotp (~> 2.0) - devise_pam_authenticatable2 (9.1.1) + devise_pam_authenticatable2 (9.2.0) devise (>= 4.0.0) rpam2 (~> 4.0) diff-lcs (1.3) @@ -669,7 +669,7 @@ DEPENDENCIES derailed_benchmarks devise (~> 4.4) devise-two-factor (~> 3.0) - devise_pam_authenticatable2 (~> 9.1) + devise_pam_authenticatable2 (~> 9.2) doorkeeper (~> 5.0) dotenv-rails (~> 2.2, < 2.3) fabrication (~> 2.20) From 0ddbccf7e6303f3b524628e210bdba5654d5c421 Mon Sep 17 00:00:00 2001 From: Yamagishi Kazutoshi Date: Sat, 15 Sep 2018 00:59:48 +0900 Subject: [PATCH 12/25] Upgrade Babel to version 7.0.0 (#5925) --- .babelrc | 66 - Gemfile | 2 +- Gemfile.lock | 4 +- .../__snapshots__/button-test.js.snap | 6 - app/javascript/mastodon/components/account.js | 4 +- .../mastodon/components/column_header.js | 4 +- app/javascript/mastodon/components/domain.js | 4 +- .../mastodon/components/load_gap.js | 4 +- .../mastodon/components/media_gallery.js | 4 +- .../mastodon/components/relative_timestamp.js | 4 +- app/javascript/mastodon/components/status.js | 4 +- .../mastodon/components/status_action_bar.js | 4 +- .../features/account/components/action_bar.js | 4 +- .../features/account/components/header.js | 4 +- .../features/account_gallery/index.js | 4 +- .../features/account_timeline/index.js | 4 +- .../mastodon/features/blocks/index.js | 4 +- .../components/column_settings.js | 4 +- .../features/community_timeline/index.js | 4 +- .../features/compose/components/action_bar.js | 4 +- .../compose/components/compose_form.js | 4 +- .../components/emoji_picker_dropdown.js | 4 +- .../compose/components/privacy_dropdown.js | 4 +- .../compose/components/reply_indicator.js | 4 +- .../features/compose/components/search.js | 4 +- .../features/compose/components/upload.js | 4 +- .../compose/components/upload_button.js | 4 +- .../mastodon/features/compose/index.js | 4 +- .../components/column_settings.js | 4 +- .../features/direct_timeline/index.js | 4 +- .../mastodon/features/domain_blocks/index.js | 4 +- .../features/favourited_statuses/index.js | 4 +- .../mastodon/features/favourites/index.js | 4 +- .../components/account_authorize.js | 4 +- .../features/follow_requests/index.js | 4 +- .../mastodon/features/followers/index.js | 4 +- .../mastodon/features/following/index.js | 4 +- .../features/getting_started/index.js | 4 +- .../features/hashtag_timeline/index.js | 4 +- .../components/column_settings.js | 4 +- .../mastodon/features/home_timeline/index.js | 4 +- .../features/keyboard_shortcuts/index.js | 4 +- .../list_editor/components/account.js | 4 +- .../features/list_editor/components/search.js | 4 +- .../mastodon/features/list_editor/index.js | 4 +- .../mastodon/features/list_timeline/index.js | 4 +- .../lists/components/new_list_form.js | 4 +- .../mastodon/features/lists/index.js | 4 +- .../mastodon/features/mutes/index.js | 4 +- .../notifications/components/notification.js | 4 +- .../mastodon/features/notifications/index.js | 4 +- .../features/pinned_statuses/index.js | 4 +- .../features/public_timeline/index.js | 4 +- .../mastodon/features/reblogs/index.js | 4 +- .../standalone/community_timeline/index.js | 4 +- .../standalone/hashtag_timeline/index.js | 4 +- .../standalone/public_timeline/index.js | 4 +- .../features/status/components/action_bar.js | 4 +- .../mastodon/features/status/index.js | 4 +- .../features/ui/components/boost_modal.js | 4 +- .../features/ui/components/columns_area.js | 4 +- .../ui/components/confirmation_modal.js | 4 +- .../features/ui/components/embed_modal.js | 4 +- .../ui/components/focal_point_modal.js | 4 +- .../features/ui/components/media_modal.js | 4 +- .../features/ui/components/mute_modal.js | 4 +- .../ui/components/onboarding_modal.js | 4 +- .../features/ui/components/report_modal.js | 4 +- .../features/ui/components/tabs_bar.js | 4 +- app/javascript/mastodon/features/ui/index.js | 4 +- .../mastodon/features/video/index.js | 4 +- babel.config.js | 65 + bin/webpack | 2 +- bin/webpack-dev-server | 2 +- config/webpack/loaders/babel.js | 1 - config/webpack/production.js | 1 - package.json | 80 +- yarn.lock | 4120 +++++++++-------- 78 files changed, 2341 insertions(+), 2276 deletions(-) delete mode 100644 .babelrc create mode 100644 babel.config.js diff --git a/.babelrc b/.babelrc deleted file mode 100644 index 190b5038c3f..00000000000 --- a/.babelrc +++ /dev/null @@ -1,66 +0,0 @@ -{ - "presets": [ - "react", - [ - "env", - { - "exclude": ["transform-async-to-generator", "transform-regenerator"], - "loose": true, - "modules": false, - "targets": { - "browsers": ["last 2 versions", "IE >= 11", "iOS >= 9"] - } - } - ] - ], - "plugins": [ - "syntax-dynamic-import", - ["transform-object-rest-spread", { "useBuiltIns": true }], - "transform-decorators-legacy", - "transform-class-properties", - [ - "react-intl", - { - "messagesDir": "./build/messages" - } - ], - "preval" - ], - "env": { - "development": { - "plugins": [ - "transform-react-jsx-source", - "transform-react-jsx-self" - ] - }, - "production": { - "plugins": [ - "lodash", - [ - "transform-react-remove-prop-types", - { - "mode": "remove", - "removeImport": true, - "additionalLibraries": [ - "react-immutable-proptypes" - ] - } - ], - "transform-react-inline-elements", - [ - "transform-runtime", - { - "helpers": true, - "polyfill": false, - "regenerator": false - } - ] - ] - }, - "test": { - "plugins": [ - "transform-es2015-modules-commonjs" - ] - } - } -} diff --git a/Gemfile b/Gemfile index 09e18669d87..0c2cf54903e 100644 --- a/Gemfile +++ b/Gemfile @@ -87,7 +87,7 @@ gem 'tty-command', '~> 0.8', require: false gem 'tty-prompt', '~> 0.16', require: false gem 'twitter-text', '~> 1.14' gem 'tzinfo-data', '~> 1.2018' -gem 'webpacker', '~> 3.4' +gem 'webpacker', '~> 3.5' gem 'webpush' gem 'json-ld', '~> 2.2' diff --git a/Gemfile.lock b/Gemfile.lock index 8fc58395cc8..ccdb3e14653 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -627,7 +627,7 @@ GEM addressable (>= 2.3.6) crack (>= 0.3.2) hashdiff - webpacker (3.4.3) + webpacker (3.5.5) activesupport (>= 4.2) rack-proxy (>= 0.6.1) railties (>= 4.2) @@ -758,7 +758,7 @@ DEPENDENCIES twitter-text (~> 1.14) tzinfo-data (~> 1.2018) webmock (~> 3.3) - webpacker (~> 3.4) + webpacker (~> 3.5) webpush RUBY VERSION diff --git a/app/javascript/mastodon/components/__tests__/__snapshots__/button-test.js.snap b/app/javascript/mastodon/components/__tests__/__snapshots__/button-test.js.snap index c3f018d90e5..5c04e09799f 100644 --- a/app/javascript/mastodon/components/__tests__/__snapshots__/button-test.js.snap +++ b/app/javascript/mastodon/components/__tests__/__snapshots__/button-test.js.snap @@ -3,7 +3,6 @@ exports[`