From 8bf8d6d9d912d20c2e1f3a1492aee88a21338545 Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Fri, 7 Jun 2019 03:39:24 +0200 Subject: [PATCH 01/27] Change preferences page into appearance, notifications, and other (#10977) --- .../settings/notifications_controller.rb | 32 ------------ .../preferences/appearance_controller.rb | 9 ++++ .../preferences/notifications_controller.rb | 9 ++++ .../settings/preferences_controller.rb | 8 ++- app/javascript/styles/mastodon/accounts.scss | 3 +- app/javascript/styles/mastodon/forms.scss | 10 ++++ app/views/layouts/mailer.html.haml | 2 +- .../preferences/appearance/show.html.haml | 41 +++++++++++++++ .../notifications/show.html.haml | 2 +- app/views/settings/preferences/show.html.haml | 50 ++++--------------- app/views/settings/profiles/show.html.haml | 2 +- config/i18n-tasks.yml | 2 +- config/initializers/simple_form.rb | 10 ++++ config/locales/ar.yml | 3 -- config/locales/ast.yml | 4 -- config/locales/ca.yml | 3 -- config/locales/co.yml | 3 -- config/locales/cs.yml | 3 -- config/locales/cy.yml | 3 -- config/locales/da.yml | 3 -- config/locales/de.yml | 3 -- config/locales/el.yml | 3 -- config/locales/en.yml | 11 ++-- config/locales/en_GB.yml | 3 -- config/locales/eo.yml | 3 -- config/locales/es.yml | 3 -- config/locales/eu.yml | 3 -- config/locales/fa.yml | 3 -- config/locales/fi.yml | 3 -- config/locales/fr.yml | 3 -- config/locales/gl.yml | 3 -- config/locales/hu.yml | 3 -- config/locales/it.yml | 3 -- config/locales/ja.yml | 3 -- config/locales/ka.yml | 3 -- config/locales/kk.yml | 3 -- config/locales/ko.yml | 3 -- config/locales/lt.yml | 3 -- config/locales/nl.yml | 3 -- config/locales/no.yml | 3 -- config/locales/oc.yml | 3 -- config/locales/pl.yml | 3 -- config/locales/pt-BR.yml | 3 -- config/locales/pt.yml | 3 -- config/locales/ru.yml | 3 -- config/locales/simple_form.ar.yml | 2 - config/locales/simple_form.ast.yml | 1 - config/locales/simple_form.ca.yml | 2 - config/locales/simple_form.co.yml | 3 -- config/locales/simple_form.cs.yml | 3 -- config/locales/simple_form.cy.yml | 2 - config/locales/simple_form.da.yml | 2 - config/locales/simple_form.de.yml | 2 - config/locales/simple_form.el.yml | 2 - config/locales/simple_form.en.yml | 7 ++- config/locales/simple_form.en_GB.yml | 2 - config/locales/simple_form.eo.yml | 2 - config/locales/simple_form.es.yml | 2 - config/locales/simple_form.eu.yml | 2 - config/locales/simple_form.fa.yml | 2 - config/locales/simple_form.fi.yml | 1 - config/locales/simple_form.fr.yml | 2 - config/locales/simple_form.gl.yml | 2 - config/locales/simple_form.he.yml | 1 - config/locales/simple_form.hu.yml | 1 - config/locales/simple_form.it.yml | 2 - config/locales/simple_form.ja.yml | 3 -- config/locales/simple_form.ka.yml | 2 - config/locales/simple_form.ko.yml | 3 -- config/locales/simple_form.nl.yml | 2 - config/locales/simple_form.no.yml | 1 - config/locales/simple_form.oc.yml | 2 - config/locales/simple_form.pl.yml | 2 - config/locales/simple_form.pt-BR.yml | 2 - config/locales/simple_form.pt.yml | 2 - config/locales/simple_form.ro.yml | 2 - config/locales/simple_form.ru.yml | 2 - config/locales/simple_form.sk.yml | 3 -- config/locales/simple_form.sl.yml | 2 - config/locales/simple_form.sq.yml | 2 - config/locales/simple_form.sr-Latn.yml | 1 - config/locales/simple_form.sr.yml | 2 - config/locales/simple_form.sv.yml | 2 - config/locales/simple_form.th.yml | 2 - config/locales/simple_form.zh-CN.yml | 2 - config/locales/simple_form.zh-HK.yml | 2 - config/locales/simple_form.zh-TW.yml | 2 - config/locales/sk.yml | 3 -- config/locales/sq.yml | 3 -- config/locales/sr-Latn.yml | 3 -- config/locales/sr.yml | 3 -- config/locales/sv.yml | 3 -- config/locales/th.yml | 3 -- config/locales/uk.yml | 3 -- config/locales/zh-CN.yml | 3 -- config/locales/zh-HK.yml | 3 -- config/locales/zh-TW.yml | 3 -- config/navigation.rb | 7 ++- config/routes.rb | 12 ++++- .../notifications_controller_spec.rb | 4 +- 100 files changed, 130 insertions(+), 296 deletions(-) delete mode 100644 app/controllers/settings/notifications_controller.rb create mode 100644 app/controllers/settings/preferences/appearance_controller.rb create mode 100644 app/controllers/settings/preferences/notifications_controller.rb create mode 100644 app/views/settings/preferences/appearance/show.html.haml rename app/views/settings/{ => preferences}/notifications/show.html.haml (92%) rename spec/controllers/settings/{ => preferences}/notifications_controller_spec.rb (86%) diff --git a/app/controllers/settings/notifications_controller.rb b/app/controllers/settings/notifications_controller.rb deleted file mode 100644 index b2ce83e421..0000000000 --- a/app/controllers/settings/notifications_controller.rb +++ /dev/null @@ -1,32 +0,0 @@ -# frozen_string_literal: true - -class Settings::NotificationsController < Settings::BaseController - layout 'admin' - - before_action :authenticate_user! - - def show; end - - def update - user_settings.update(user_settings_params.to_h) - - if current_user.save - redirect_to settings_notifications_path, notice: I18n.t('generic.changes_saved_msg') - else - render :show - end - end - - private - - def user_settings - UserSettingsDecorator.new(current_user) - end - - def user_settings_params - params.require(:user).permit( - notification_emails: %i(follow follow_request reblog favourite mention digest report pending_account), - interactions: %i(must_be_follower must_be_following must_be_following_dm) - ) - end -end diff --git a/app/controllers/settings/preferences/appearance_controller.rb b/app/controllers/settings/preferences/appearance_controller.rb new file mode 100644 index 0000000000..80ea57bd2d --- /dev/null +++ b/app/controllers/settings/preferences/appearance_controller.rb @@ -0,0 +1,9 @@ +# frozen_string_literal: true + +class Settings::Preferences::AppearanceController < Settings::PreferencesController + private + + def after_update_redirect_path + settings_preferences_appearance_path + end +end diff --git a/app/controllers/settings/preferences/notifications_controller.rb b/app/controllers/settings/preferences/notifications_controller.rb new file mode 100644 index 0000000000..a16ae6a672 --- /dev/null +++ b/app/controllers/settings/preferences/notifications_controller.rb @@ -0,0 +1,9 @@ +# frozen_string_literal: true + +class Settings::Preferences::NotificationsController < Settings::PreferencesController + private + + def after_update_redirect_path + settings_preferences_notifications_path + end +end diff --git a/app/controllers/settings/preferences_controller.rb b/app/controllers/settings/preferences_controller.rb index 930ff70e7f..110debd6e5 100644 --- a/app/controllers/settings/preferences_controller.rb +++ b/app/controllers/settings/preferences_controller.rb @@ -12,7 +12,7 @@ class Settings::PreferencesController < Settings::BaseController if current_user.update(user_params) I18n.locale = current_user.locale - redirect_to settings_preferences_path, notice: I18n.t('generic.changes_saved_msg') + redirect_to after_update_redirect_path, notice: I18n.t('generic.changes_saved_msg') else render :show end @@ -20,6 +20,10 @@ class Settings::PreferencesController < Settings::BaseController private + def after_update_redirect_path + settings_preferences_path + end + def user_settings UserSettingsDecorator.new(current_user) end @@ -51,7 +55,7 @@ class Settings::PreferencesController < Settings::BaseController :setting_show_application, :setting_advanced_layout, notification_emails: %i(follow follow_request reblog favourite mention digest report pending_account), - interactions: %i(must_be_follower must_be_following) + interactions: %i(must_be_follower must_be_following must_be_following_dm) ) end end diff --git a/app/javascript/styles/mastodon/accounts.scss b/app/javascript/styles/mastodon/accounts.scss index a93e1ea121..f95313a259 100644 --- a/app/javascript/styles/mastodon/accounts.scss +++ b/app/javascript/styles/mastodon/accounts.scss @@ -197,7 +197,8 @@ } } -.account-role { +.account-role, +.simple_form .recommended { display: inline-block; padding: 4px 6px; cursor: default; diff --git a/app/javascript/styles/mastodon/forms.scss b/app/javascript/styles/mastodon/forms.scss index f3de877916..456ee4e0d3 100644 --- a/app/javascript/styles/mastodon/forms.scss +++ b/app/javascript/styles/mastodon/forms.scss @@ -79,6 +79,12 @@ code { text-decoration: none; } } + + .recommended { + position: absolute; + margin: 0 4px; + margin-top: -2px; + } } } @@ -443,6 +449,10 @@ code { height: 41px; } + h4 { + margin-bottom: 15px !important; + } + .label_input { &__wrapper { position: relative; diff --git a/app/views/layouts/mailer.html.haml b/app/views/layouts/mailer.html.haml index 4ffe3d79a9..343bcb265e 100644 --- a/app/views/layouts/mailer.html.haml +++ b/app/views/layouts/mailer.html.haml @@ -46,7 +46,7 @@ %tbody %td.column-cell %p= t 'about.hosted_on', domain: site_hostname - %p= link_to t('application_mailer.notification_preferences'), settings_notifications_url + %p= link_to t('application_mailer.notification_preferences'), settings_preferences_notifications_url %td.column-cell.text-right = link_to root_url do = image_tag full_pack_url('media/images/mailer/logo_transparent.png'), alt: 'Mastodon', height: 24 diff --git a/app/views/settings/preferences/appearance/show.html.haml b/app/views/settings/preferences/appearance/show.html.haml new file mode 100644 index 0000000000..10f0092647 --- /dev/null +++ b/app/views/settings/preferences/appearance/show.html.haml @@ -0,0 +1,41 @@ +- content_for :page_title do + = t('settings.appearance') + += simple_form_for current_user, url: settings_preferences_appearance_path, html: { method: :put } do |f| + .fields-row + .fields-group.fields-row__column.fields-row__column-6 + = f.input :locale, collection: I18n.available_locales, wrapper: :with_label, include_blank: false, label_method: lambda { |locale| human_locale(locale) }, selected: I18n.locale, hint: false + .fields-group.fields-row__column.fields-row__column-6 + = f.input :setting_theme, collection: Themes.instance.names, label_method: lambda { |theme| I18n.t("themes.#{theme}", default: theme) }, wrapper: :with_label, include_blank: false, hint: false + + %h4= t 'appearance.advanced_web_interface' + + %p.hint= t 'appearance.advanced_web_interface_hint' + + .fields-group + = f.input :setting_advanced_layout, as: :boolean, wrapper: :with_label, hint: false + + %h4= t 'appearance.animations_and_accessibility' + + .fields-group + = f.input :setting_auto_play_gif, as: :boolean, wrapper: :with_label, recommended: true + = f.input :setting_reduce_motion, as: :boolean, wrapper: :with_label + = f.input :setting_system_font_ui, as: :boolean, wrapper: :with_label + + %h4= t 'appearance.confirmation_dialogs' + + .fields-group + = f.input :setting_unfollow_modal, as: :boolean, wrapper: :with_label + = f.input :setting_boost_modal, as: :boolean, wrapper: :with_label + = f.input :setting_delete_modal, as: :boolean, wrapper: :with_label + + %h4= t 'appearance.sensitive_content' + + .fields-group + = f.input :setting_display_media, collection: ['default', 'show_all', 'hide_all'],label_method: lambda { |item| t("simple_form.hints.defaults.setting_display_media_#{item}") }, hint: false, as: :radio_buttons, collection_wrapper_tag: 'ul', item_wrapper_tag: 'li', wrapper: :with_floating_label + + .fields-group + = f.input :setting_expand_spoilers, as: :boolean, wrapper: :with_label + + .actions + = f.button :button, t('generic.save_changes'), type: :submit diff --git a/app/views/settings/notifications/show.html.haml b/app/views/settings/preferences/notifications/show.html.haml similarity index 92% rename from app/views/settings/notifications/show.html.haml rename to app/views/settings/preferences/notifications/show.html.haml index 6ec57b502f..acc646fc34 100644 --- a/app/views/settings/notifications/show.html.haml +++ b/app/views/settings/preferences/notifications/show.html.haml @@ -1,7 +1,7 @@ - content_for :page_title do = t('settings.notifications') -= simple_form_for current_user, url: settings_notifications_path, html: { method: :put } do |f| += simple_form_for current_user, url: settings_preferences_notifications_path, html: { method: :put } do |f| = render 'shared/error_messages', object: current_user .fields-group diff --git a/app/views/settings/preferences/show.html.haml b/app/views/settings/preferences/show.html.haml index 35b660a680..c966a16bcf 100644 --- a/app/views/settings/preferences/show.html.haml +++ b/app/views/settings/preferences/show.html.haml @@ -1,34 +1,9 @@ - content_for :page_title do = t('settings.preferences') -%ul.quick-nav - %li= link_to t('preferences.languages'), '#settings_languages' - %li= link_to t('preferences.publishing'), '#settings_publishing' - %li= link_to t('preferences.other'), '#settings_other' - %li= link_to t('preferences.web'), '#settings_web' - %li= link_to t('settings.notifications'), settings_notifications_path - = simple_form_for current_user, url: settings_preferences_path, html: { method: :put } do |f| = render 'shared/error_messages', object: current_user - .fields-row#settings_languages - .fields-group.fields-row__column.fields-row__column-6 - = f.input :locale, collection: I18n.available_locales, wrapper: :with_label, include_blank: false, label_method: lambda { |locale| human_locale(locale) }, selected: I18n.locale - .fields-group.fields-row__column.fields-row__column-6 - = f.input :setting_default_language, collection: [nil] + filterable_languages.sort, wrapper: :with_label, label_method: lambda { |locale| locale.nil? ? I18n.t('statuses.language_detection') : human_locale(locale) }, required: false, include_blank: false - - .fields-group - = f.input :chosen_languages, collection: filterable_languages.sort, wrapper: :with_block_label, include_blank: false, label_method: lambda { |locale| human_locale(locale) }, required: false, as: :check_boxes, collection_wrapper_tag: 'ul', item_wrapper_tag: 'li' - - %hr#settings_publishing/ - - .fields-group - = f.input :setting_default_privacy, collection: Status.selectable_visibilities, wrapper: :with_floating_label, include_blank: false, label_method: lambda { |visibility| safe_join([I18n.t("statuses.visibilities.#{visibility}"), content_tag(:span, I18n.t("statuses.visibilities.#{visibility}_long"), class: 'hint')]) }, required: false, as: :radio_buttons, collection_wrapper_tag: 'ul', item_wrapper_tag: 'li' - - = f.input :setting_default_sensitive, as: :boolean, wrapper: :with_label - - %hr#settings_other/ - .fields-group = f.input :setting_noindex, as: :boolean, wrapper: :with_label @@ -36,32 +11,27 @@ = f.input :setting_hide_network, as: :boolean, wrapper: :with_label .fields-group - = f.input :setting_show_application, as: :boolean, wrapper: :with_label + = f.input :setting_aggregate_reblogs, as: :boolean, wrapper: :with_label, recommended: true - %hr#settings_web/ + %h4= t 'preferences.posting_defaults' .fields-row .fields-group.fields-row__column.fields-row__column-6 - = f.input :setting_theme, collection: Themes.instance.names, label_method: lambda { |theme| I18n.t("themes.#{theme}", default: theme) }, wrapper: :with_label, include_blank: false, hint: false + = f.input :setting_default_privacy, collection: Status.selectable_visibilities, wrapper: :with_label, include_blank: false, label_method: lambda { |visibility| safe_join([I18n.t("statuses.visibilities.#{visibility}"), I18n.t("statuses.visibilities.#{visibility}_long")], ' - ') }, required: false, hint: false + .fields-group.fields-row__column.fields-row__column-6 - = f.input :setting_display_media, collection: ['default', 'show_all', 'hide_all'], wrapper: :with_label, include_blank: false, label_method: lambda { |item| t("simple_form.hints.defaults.setting_display_media_#{item}") }, hint: false + = f.input :setting_default_language, collection: [nil] + filterable_languages.sort, wrapper: :with_label, label_method: lambda { |locale| locale.nil? ? I18n.t('statuses.language_detection') : human_locale(locale) }, required: false, include_blank: false, hint: false .fields-group - = f.input :setting_advanced_layout, as: :boolean, wrapper: :with_label + = f.input :setting_default_sensitive, as: :boolean, wrapper: :with_label .fields-group - = f.input :setting_unfollow_modal, as: :boolean, wrapper: :with_label - = f.input :setting_boost_modal, as: :boolean, wrapper: :with_label - = f.input :setting_delete_modal, as: :boolean, wrapper: :with_label + = f.input :setting_show_application, as: :boolean, wrapper: :with_label, recommended: true + + %h4= t 'preferences.public_timelines' .fields-group - = f.input :setting_aggregate_reblogs, as: :boolean, wrapper: :with_label - - .fields-group - = f.input :setting_auto_play_gif, as: :boolean, wrapper: :with_label - = f.input :setting_expand_spoilers, as: :boolean, wrapper: :with_label - = f.input :setting_reduce_motion, as: :boolean, wrapper: :with_label - = f.input :setting_system_font_ui, as: :boolean, wrapper: :with_label + = f.input :chosen_languages, collection: filterable_languages.sort, wrapper: :with_block_label, include_blank: false, label_method: lambda { |locale| human_locale(locale) }, required: false, as: :check_boxes, collection_wrapper_tag: 'ul', item_wrapper_tag: 'li' .actions = f.button :button, t('generic.save_changes'), type: :submit diff --git a/app/views/settings/profiles/show.html.haml b/app/views/settings/profiles/show.html.haml index 8ffb018243..f8a8fddd31 100644 --- a/app/views/settings/profiles/show.html.haml +++ b/app/views/settings/profiles/show.html.haml @@ -28,7 +28,7 @@ - if Setting.profile_directory .fields-group - = f.input :discoverable, as: :boolean, wrapper: :with_label, hint: t('simple_form.hints.defaults.discoverable_html', min_followers: Account::MIN_FOLLOWERS_DISCOVERY, path: explore_path) + = f.input :discoverable, as: :boolean, wrapper: :with_label, hint: t('simple_form.hints.defaults.discoverable_html', min_followers: Account::MIN_FOLLOWERS_DISCOVERY, path: explore_path), recommended: true %hr.spacer/ diff --git a/config/i18n-tasks.yml b/config/i18n-tasks.yml index 1bcac154b1..bc5a05f4a5 100644 --- a/config/i18n-tasks.yml +++ b/config/i18n-tasks.yml @@ -51,7 +51,7 @@ ignore_unused: - 'activerecord.errors.*' - '{devise,pagination,doorkeeper}.*' - '{date,datetime,time,number}.*' - - 'simple_form.{yes,no}' + - 'simple_form.{yes,no,recommended}' - 'simple_form.{placeholders,hints,labels}.*' - 'simple_form.{error_notification,required}.:' - 'errors.messages.*' diff --git a/config/initializers/simple_form.rb b/config/initializers/simple_form.rb index 386ede654c..9645268195 100644 --- a/config/initializers/simple_form.rb +++ b/config/initializers/simple_form.rb @@ -8,7 +8,16 @@ module AppendComponent end end +module RecommendedComponent + def recommended(wrapper_options = nil) + return unless options[:recommended] + options[:label_text] = ->(raw_label_text, _required_label_text, _label_present) { safe_join([raw_label_text, ' ', content_tag(:span, I18n.t('simple_form.recommended'), class: 'recommended')]) } + nil + end +end + SimpleForm.include_component(AppendComponent) +SimpleForm.include_component(RecommendedComponent) SimpleForm.setup do |config| # Wrappers are used by the form builder to generate a @@ -65,6 +74,7 @@ SimpleForm.setup do |config| b.use :html5 b.wrapper tag: :div, class: :label_input do |ba| + ba.optional :recommended ba.use :label ba.wrapper tag: :div, class: :label_input__wrapper do |bb| diff --git a/config/locales/ar.yml b/config/locales/ar.yml index fe49ac7f6b..0d961e4861 100644 --- a/config/locales/ar.yml +++ b/config/locales/ar.yml @@ -736,10 +736,7 @@ ar: prev: السابق truncate: و preferences: - languages: اللغات other: إعدادات أخرى - publishing: النشر - web: الويب remote_follow: acct: قم بإدخال عنوان حسابك username@domain الذي من خلاله تود النشاط missing_resource: تعذر العثور على رابط التحويل المطلوب الخاص بحسابك diff --git a/config/locales/ast.yml b/config/locales/ast.yml index 7a51be7cf4..a2df72ba61 100644 --- a/config/locales/ast.yml +++ b/config/locales/ast.yml @@ -245,10 +245,6 @@ ast: format: "%n%u" pagination: next: Siguiente - preferences: - languages: Llingües - publishing: Espublización - web: Web remote_follow: acct: Introduz el nome_usuariu@dominiu dende'l que lo quies facer no_account_html: "¿Nun tienes una cuenta? Pues rexistrate equí" diff --git a/config/locales/ca.yml b/config/locales/ca.yml index e76182bf4d..d7cc8dfb15 100644 --- a/config/locales/ca.yml +++ b/config/locales/ca.yml @@ -777,10 +777,7 @@ ca: too_few_options: ha de tenir més d'una opció too_many_options: no pot contenir més de %{max} opcions preferences: - languages: Llengues other: Altre - publishing: Publicant - web: Web relationships: activity: Activitat del compte dormant: Inactiu diff --git a/config/locales/co.yml b/config/locales/co.yml index 4927c5c519..cc33d0ad10 100644 --- a/config/locales/co.yml +++ b/config/locales/co.yml @@ -777,10 +777,7 @@ co: too_few_options: deve avè più d'un'uzzione too_many_options: ùn pò micca avè più di %{max} uzzione preferences: - languages: Lingue other: Altre - publishing: Pubblicazione - web: Web relationships: activity: Attività di u contu dormant: Inattivu diff --git a/config/locales/cs.yml b/config/locales/cs.yml index 9b73e3b1da..bc14000502 100644 --- a/config/locales/cs.yml +++ b/config/locales/cs.yml @@ -788,10 +788,7 @@ cs: too_few_options: musí mít více než jednu položku too_many_options: nesmí obsahovat více než %{max} položky preferences: - languages: Jazyky other: Ostatní - publishing: Publikování - web: Web relationships: activity: Aktivita účtu dormant: Nečinné diff --git a/config/locales/cy.yml b/config/locales/cy.yml index f365f71733..3893d597ff 100644 --- a/config/locales/cy.yml +++ b/config/locales/cy.yml @@ -746,10 +746,7 @@ cy: prev: Blaenorol truncate: "…" preferences: - languages: Ieithoedd other: Arall - publishing: Cyhoeddi - web: Gwe remote_follow: acct: Mewnbynnwch eich enwdefnyddiwr@parth yr ydych eisiau gweithredu ohonno missing_resource: Ni ellir canfod yr URL ailgyferio angenrheidiol i'ch cyfrif diff --git a/config/locales/da.yml b/config/locales/da.yml index 0787db621f..d0190d4a20 100644 --- a/config/locales/da.yml +++ b/config/locales/da.yml @@ -634,10 +634,7 @@ da: prev: Forrige truncate: "...…" preferences: - languages: Sprog other: Andet - publishing: Offentligører - web: Web remote_follow: acct: Indtast dit brugernavn@domæne du vil handle fra missing_resource: Kunne ikke finde det påkrævede omdirigerings link for din konto diff --git a/config/locales/de.yml b/config/locales/de.yml index 7138b72697..04a3e7eaf8 100644 --- a/config/locales/de.yml +++ b/config/locales/de.yml @@ -776,10 +776,7 @@ de: too_few_options: muss mindestens einen Eintrag haben too_many_options: kann nicht mehr als %{max} Einträge beinhalten preferences: - languages: Sprachen other: Weiteres - publishing: Beiträge - web: Web relationships: activity: Kontoaktivität dormant: Inaktiv diff --git a/config/locales/el.yml b/config/locales/el.yml index f2b6751ff6..eadbca8a99 100644 --- a/config/locales/el.yml +++ b/config/locales/el.yml @@ -764,10 +764,7 @@ el: too_few_options: πρέπει να έχει περισσότερες από μια επιλογές too_many_options: δεν μπορεί να έχει περισσότερες από %{max} επιλογές preferences: - languages: Γλώσσες other: Άλλο - publishing: Δημοσίευση - web: Διαδίκτυο relationships: activity: Δραστηριότητα λογαριασμού dormant: Αδρανής diff --git a/config/locales/en.yml b/config/locales/en.yml index 3b32e41a62..d4f1855aaa 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -499,6 +499,12 @@ en: body: "%{reporter} has reported %{target}" body_remote: Someone from %{domain} has reported %{target} subject: New report for %{instance} (#%{id}) + appearance: + advanced_web_interface: Advanced web interface + advanced_web_interface_hint: 'If you want to make use of your entire screen width, the advanced web interface allows you to configure many different columns to see as much information at the same time as you want: Home, notifications, federated timeline, any number of lists and hashtags.' + animations_and_accessibility: Animations and accessibility + confirmation_dialogs: Confirmation dialogs + sensitive_content: Sensitive content application_mailer: notification_preferences: Change e-mail preferences salutation: "%{name}," @@ -778,10 +784,9 @@ en: too_few_options: must have more than one item too_many_options: can't contain more than %{max} items preferences: - languages: Languages other: Other - publishing: Publishing - web: Web + posting_defaults: Posting defaults + public_timelines: Public timelines relationships: activity: Account activity dormant: Dormant diff --git a/config/locales/en_GB.yml b/config/locales/en_GB.yml index d428a95c3f..33ba162100 100644 --- a/config/locales/en_GB.yml +++ b/config/locales/en_GB.yml @@ -759,10 +759,7 @@ en_GB: too_few_options: must have more than one item too_many_options: can't contain more than %{max} items preferences: - languages: Languages other: Other - publishing: Publishing - web: Web relationships: activity: Account activity dormant: Dormant diff --git a/config/locales/eo.yml b/config/locales/eo.yml index b85cb1a491..0e3c45341b 100644 --- a/config/locales/eo.yml +++ b/config/locales/eo.yml @@ -772,10 +772,7 @@ eo: too_few_options: devas enhavi pli da unu propono too_many_options: ne povas enhavi pli da %{max} proponoj preferences: - languages: Lingvoj other: Aliaj aferoj - publishing: Publikado - web: Reto relationships: activity: Account activity dormant: Dormant diff --git a/config/locales/es.yml b/config/locales/es.yml index 3a8e8dc0b0..ed04e7101c 100644 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -639,10 +639,7 @@ es: prev: Anterior truncate: "…" preferences: - languages: Idiomas other: Otros - publishing: Publicación - web: Web 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 diff --git a/config/locales/eu.yml b/config/locales/eu.yml index 5ae664cadd..c5171ae7b2 100644 --- a/config/locales/eu.yml +++ b/config/locales/eu.yml @@ -705,10 +705,7 @@ eu: prev: Aurrekoa truncate: "…" preferences: - languages: Hizkuntzak other: Beste bat - publishing: Argitaratzea - web: Web remote_follow: acct: Sartu jarraitzeko erabili nahi duzun erabiltzaile@domeinua missing_resource: Ezin izan da zure konturako behar den birbideratze URL-a diff --git a/config/locales/fa.yml b/config/locales/fa.yml index 3a3455c6d1..f00ffdf2f8 100644 --- a/config/locales/fa.yml +++ b/config/locales/fa.yml @@ -765,10 +765,7 @@ fa: too_few_options: حتماً باید بیش از یک گزینه داشته باشد too_many_options: نمی‌تواند بیشتر از %{max} گزینه داشته باشد preferences: - languages: تنظیمات زبان other: سایر تنظیمات - publishing: تنظیمات انتشار مطالب - web: وب relationships: activity: فعالیت حساب dormant: غیرفعال diff --git a/config/locales/fi.yml b/config/locales/fi.yml index e4a0ed22cb..1072952eaa 100644 --- a/config/locales/fi.yml +++ b/config/locales/fi.yml @@ -550,10 +550,7 @@ fi: prev: Edellinen truncate: "…" preferences: - languages: Kielet other: Muut - publishing: Julkaiseminen - web: Web remote_follow: acct: Syötä se käyttäjätunnus@verkkotunnus, josta haluat seurata missing_resource: Vaadittavaa uudelleenohjaus-URL:ää tiliisi ei löytynyt diff --git a/config/locales/fr.yml b/config/locales/fr.yml index e76fdf99e7..2b06c77611 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -777,10 +777,7 @@ fr: too_few_options: doit avoir plus qu’une proposition too_many_options: ne peut contenir plus que %{max} propositions preferences: - languages: Langues other: Autre - publishing: Publication - web: Web relationships: activity: Activité du compte dormant: Dormant diff --git a/config/locales/gl.yml b/config/locales/gl.yml index 9c4673186b..95066d0079 100644 --- a/config/locales/gl.yml +++ b/config/locales/gl.yml @@ -760,10 +760,7 @@ gl: too_few_options: debe ter máis de unha opción too_many_options: non pode haber máis de %{max} opcións preferences: - languages: Idiomas other: Outro - publishing: Publicando - web: Web relationships: activity: Actividade da conta dormant: En repouso diff --git a/config/locales/hu.yml b/config/locales/hu.yml index b6029eecab..558330c5a6 100644 --- a/config/locales/hu.yml +++ b/config/locales/hu.yml @@ -472,10 +472,7 @@ hu: prev: Előző truncate: "…" preferences: - languages: Nyelvek other: Egyéb - publishing: Közzététel - web: Web remote_follow: acct: Írd be a felhasználódat, amelyről követni szeretnéd felhasznalonev@domain formátumban missing_resource: A fiókodnál nem található a szükséges átirányítási URL diff --git a/config/locales/it.yml b/config/locales/it.yml index 508b8a0dc9..511af485ab 100644 --- a/config/locales/it.yml +++ b/config/locales/it.yml @@ -692,10 +692,7 @@ it: too_few_options: deve avere più di un elemento too_many_options: non può contenere più di %{max} elementi preferences: - languages: Lingue other: Altro - publishing: Pubblicazione - web: Web remote_follow: acct: Inserisci il tuo username@dominio da cui vuoi seguire questo utente missing_resource: Impossibile trovare l'URL di reindirizzamento richiesto per il tuo account diff --git a/config/locales/ja.yml b/config/locales/ja.yml index 4cf9db1167..5935ebe56c 100644 --- a/config/locales/ja.yml +++ b/config/locales/ja.yml @@ -776,10 +776,7 @@ ja: too_few_options: は複数必要です too_many_options: は%{max}個までです preferences: - languages: 言語 other: その他 - publishing: 投稿 - web: ウェブ relationships: activity: 活動 dormant: 非アクティブ diff --git a/config/locales/ka.yml b/config/locales/ka.yml index 9781fc5be9..ef93cc997c 100644 --- a/config/locales/ka.yml +++ b/config/locales/ka.yml @@ -602,10 +602,7 @@ ka: prev: წინა truncate: "…" preferences: - languages: ენები other: სხვა - publishing: გამოქვეყნება - web: ვები remote_follow: acct: შეიყვანეთ თქვენი username@domain საიდანაც გსურთ გაჰყვეთ missing_resource: საჭირო გადამისამართების ურლ თქვენი ანგარიშისთვის ვერ მოიძებნა diff --git a/config/locales/kk.yml b/config/locales/kk.yml index 84bd710818..5843000f34 100644 --- a/config/locales/kk.yml +++ b/config/locales/kk.yml @@ -715,10 +715,7 @@ kk: too_few_options: бір жауаптан көп болуы керек too_many_options: "%{max} жауаптан көп болмайды" preferences: - languages: Тілдер other: Басқа - publishing: Жариялау - web: Веб remote_follow: acct: Өзіңіздің username@domain теріңіз missing_resource: Аккаунтыңызға байланған URL табылмады diff --git a/config/locales/ko.yml b/config/locales/ko.yml index 820b8e5158..274f68df74 100644 --- a/config/locales/ko.yml +++ b/config/locales/ko.yml @@ -779,10 +779,7 @@ ko: too_few_options: 한가지 이상의 항목을 포함해야 합니다 too_many_options: 항목은 %{max}개를 넘을 수 없습니다 preferences: - languages: 언어 other: 기타 - publishing: 퍼블리싱 - web: 웹 relationships: activity: 계정 활동 dormant: 휴면 diff --git a/config/locales/lt.yml b/config/locales/lt.yml index 7ea8dc76b2..0f2a83e65e 100644 --- a/config/locales/lt.yml +++ b/config/locales/lt.yml @@ -718,10 +718,7 @@ lt: prev: Ankstesnis truncate: "…" preferences: - languages: Kalbos other: Kita - publishing: Skelbiama - web: Tinklas remote_follow: acct: Įveskite Jūsų slapyvardį@domenas kurį norite naudoti missing_resource: Jūsų paskyros nukreipimo URL nerasta diff --git a/config/locales/nl.yml b/config/locales/nl.yml index e07e7b1336..97be8aa818 100644 --- a/config/locales/nl.yml +++ b/config/locales/nl.yml @@ -776,10 +776,7 @@ nl: too_few_options: moet meer dan één item bevatten too_many_options: kan niet meer dan %{max} items bevatten preferences: - languages: Talen other: Overig - publishing: Publiceren - web: Webapp relationships: activity: Accountactiviteit dormant: Sluimerend diff --git a/config/locales/no.yml b/config/locales/no.yml index f16b314cb6..395c81a627 100644 --- a/config/locales/no.yml +++ b/config/locales/no.yml @@ -472,10 +472,7 @@ prev: Forrige truncate: "…" preferences: - languages: Språk other: Annet - publishing: Publisering - web: Web remote_follow: acct: Tast inn brukernavn@domene som du vil følge fra missing_resource: Kunne ikke finne URLen for din konto diff --git a/config/locales/oc.yml b/config/locales/oc.yml index 81f17cd3dc..a7ef252426 100644 --- a/config/locales/oc.yml +++ b/config/locales/oc.yml @@ -799,10 +799,7 @@ oc: too_few_options: deu contenir mai d’una opcion too_many_options: pòt pas contenir mai de %{max} opcions preferences: - languages: Lengas other: Autre - publishing: Publicar - web: Interfàcia Web relationships: activity: Activitat del compte dormant: Inactiu diff --git a/config/locales/pl.yml b/config/locales/pl.yml index 1b9bb614c3..54aabfff93 100644 --- a/config/locales/pl.yml +++ b/config/locales/pl.yml @@ -792,10 +792,7 @@ pl: too_few_options: musi zawierać przynajmniej dwie opcje too_many_options: nie może zawierać więcej niż %{max} opcji preferences: - languages: Języki other: Pozostałe - publishing: Publikowanie - web: Sieć relationships: activity: Aktywność konta dormant: Uśpione diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml index 22a3918a19..dbe19d4da8 100644 --- a/config/locales/pt-BR.yml +++ b/config/locales/pt-BR.yml @@ -776,10 +776,7 @@ pt-BR: too_few_options: deve ter mais que um item too_many_options: não pode ter mais que %{max} itens preferences: - languages: Idiomas other: Outro - publishing: Publicação - web: Web relationships: activity: Atividade da conta dormant: Inativo diff --git a/config/locales/pt.yml b/config/locales/pt.yml index b827184e90..0061002c70 100644 --- a/config/locales/pt.yml +++ b/config/locales/pt.yml @@ -718,10 +718,7 @@ pt: too_few_options: tem de ter mais do que um item too_many_options: não pode conter mais do que %{max} itens preferences: - languages: Idiomas other: Outro - publishing: Publicação - web: Web remote_follow: acct: Entre seu usuário@domínio do qual quer seguir missing_resource: Não foi possível achar a URL de redirecionamento para sua conta diff --git a/config/locales/ru.yml b/config/locales/ru.yml index edccd9e7c2..6d1db95c77 100644 --- a/config/locales/ru.yml +++ b/config/locales/ru.yml @@ -798,10 +798,7 @@ ru: too_few_options: должно быть больше 1 варианта too_many_options: может содержать не больше %{max} вариантов preferences: - languages: Языки other: Другое - publishing: Публикация - web: WWW relationships: activity: Активность аккаунта dormant: Заброшенные diff --git a/config/locales/simple_form.ar.yml b/config/locales/simple_form.ar.yml index f0d1211353..6c2905846d 100644 --- a/config/locales/simple_form.ar.yml +++ b/config/locales/simple_form.ar.yml @@ -25,13 +25,11 @@ ar: phrase: سوف يتم العثور عليه مهما كان نوع النص أو حتى و إن كان داخل الويب فيه تحذير عن المحتوى scopes: ما هي المجالات المسموح بها في التطبيق ؟ إن قمت باختيار أعلى المجالات فيمكنك الإستغناء عن الخَيار اليدوي. setting_aggregate_reblogs: لا تقم بعرض المشارَكات الجديدة لتبويقات قد قُمتَ بمشاركتها سابقا (هذا الإجراء يعني المشاركات الجديدة فقط التي تلقيتَها) - setting_default_language: يمكن الكشف التلقائي للّغة اللتي استخدمتها في تحرير تبويقاتك ، غيرَ أنّ العملية ليست دائما دقيقة setting_display_media_default: إخفاء الوسائط المُعيَّنة كحساسة setting_display_media_hide_all: إخفاء كافة الوسائط دائمًا setting_display_media_show_all: دائمًا عرض الوسائط المُعيَّنة كحساسة setting_hide_network: الحسابات التي تُتابعها و التي تُتابِعك على حد سواء لن تُعرَض على صفحتك الشخصية setting_noindex: ذلك يؤثر على حالة ملفك الشخصي و صفحاتك - setting_theme: ذلك يؤثر على الشكل الذي سيبدو عليه ماستدون عندما تقوم بالدخول مِن أي جهاز. username: اسم المستخدم الخاص بك سوف يكون فريدا مِن نوعه على %{domain} featured_tag: name: 'رُبَّما تريد/ي استخدام أحد هؤلاء:' diff --git a/config/locales/simple_form.ast.yml b/config/locales/simple_form.ast.yml index b91d5780a9..41102d23f3 100644 --- a/config/locales/simple_form.ast.yml +++ b/config/locales/simple_form.ast.yml @@ -10,7 +10,6 @@ ast: irreversible: Los toots peñeraos van desapaecer de mou irreversible, magar que se desanicie la peñera dempués password: Usa 8 caráuteres polo menos setting_hide_network: La xente que sigas y teas siguiendo nun va amosase nel perfil - setting_theme: Afeuta al aspeutu de Mastodon cuando anicies sesión dende cualesquier preséu. username: El nome d'usuariu va ser únicu en %{domain} imports: data: El ficheru CSV esportáu dende otra instancia de Mastodon diff --git a/config/locales/simple_form.ca.yml b/config/locales/simple_form.ca.yml index db87fb116b..ab6ee5033d 100644 --- a/config/locales/simple_form.ca.yml +++ b/config/locales/simple_form.ca.yml @@ -27,14 +27,12 @@ ca: phrase: Es combinarà independentment del format en el text o l'avís de contingut d'un toot scopes: A quines API es permetrà l'accés a l'aplicació. Si selecciones un àmbit d'alt nivell, no cal que seleccionis un d'individual. setting_aggregate_reblogs: No mostra els nous impulsos dels toots que ja s'han impulsat recentment (només afecta als impulsos nous rebuts) - setting_default_language: La llengua dels teus toots pot ser detectada automàticament però no sempre acuradament setting_display_media_default: Amaga els multimèdia marcats com a sensibles setting_display_media_hide_all: Sempre oculta tots els multimèdia setting_display_media_show_all: Mostra sempre els elements multimèdia marcats com a sensibles setting_hide_network: Qui tu segueixes i els que et segueixen a tu no es mostraran en el teu perfil setting_noindex: Afecta el teu perfil públic i les pàgines d'estat setting_show_application: L'aplicació que fas servir per a publicar es mostrarà a la vista detallada dels teus toots - setting_theme: Afecta l'aspecte de Mastodon quan es visita des de qualsevol dispositiu. username: El teu nom d'usuari serà únic a %{domain} whole_word: Quan la paraula clau o la frase sigui només alfanumèrica, s'aplicarà si coincideix amb la paraula sencera featured_tag: diff --git a/config/locales/simple_form.co.yml b/config/locales/simple_form.co.yml index c4529093ba..ddc9d5b501 100644 --- a/config/locales/simple_form.co.yml +++ b/config/locales/simple_form.co.yml @@ -26,16 +26,13 @@ co: password: Ci volenu almenu 8 caratteri phrase: Sarà trovu senza primura di e maiuscule o di l'avertimenti scopes: L'API à quelle l'applicazione averà accessu. S'è voi selezziunate un parametru d'altu livellu, un c'hè micca bisognu di selezziunà quell'individuali. - setting_advanced_layout: L'interfaccia avanzata cunsiste in parechje culonne persunalizabile setting_aggregate_reblogs: Ùn mustrà micca e nove spartere per i statuti chì sò stati spartuti da pocu (tocca solu e spartere più ricente) - setting_default_language: A lingua di i vostri statuti pò esse induvinata autumaticamente, mà ùn marchja micca sempre bè setting_display_media_default: Piattà i media marcati cum'è sensibili setting_display_media_hide_all: Sempre piattà tutti i media setting_display_media_show_all: Sempre affissà i media marcati cum'è sensibili setting_hide_network: I vostri abbunati è abbunamenti ùn saranu micca mustrati nant’à u vostru prufile setting_noindex: Tocca à u vostru prufile pubblicu è i vostri statuti setting_show_application: L'applicazione chì voi utilizate per mandà statuti sarà affissata indè a vista ditagliata di quelli - setting_theme: Tocca à l’apparenza di Mastodon quandu site cunnettatu·a da qualch’apparechju. username: U vostru cugnome sarà unicu nant'à %{domain} whole_word: Quandu a parolla o a frasa sana hè alfanumerica, sarà applicata solu s'ella currisponde à a parolla sana featured_tag: diff --git a/config/locales/simple_form.cs.yml b/config/locales/simple_form.cs.yml index fa45fecd55..521b02c44b 100644 --- a/config/locales/simple_form.cs.yml +++ b/config/locales/simple_form.cs.yml @@ -26,16 +26,13 @@ cs: password: Použijte alespoň 8 znaků phrase: Shoda bude nalezena bez ohledu na velikost písmen v těle tootu či varování o obsahu scopes: Která API bude aplikaci povoleno používat. Pokud vyberete rozsah nejvyššího stupně, nebudete je muset vybírat jednotlivě. - setting_advanced_layout: Pokročilé rozhraní se skládá z několika přizpůsobitelných sloupců setting_aggregate_reblogs: Nezobrazovat nové boosty pro tooty, které byly nedávno boostnuty (ovlivňuje pouze nově přijaté boosty) - setting_default_language: Jazyk vašich tootů může být detekován automaticky, není to však vždy přesné setting_display_media_default: Skrývat média označená jako citlivá setting_display_media_hide_all: Vždy skrývat všechna média setting_display_media_show_all: Vždy zobrazovat média označená jako citlivá setting_hide_network: Koho sledujete a kdo sleduje vás nebude zobrazeno na vašem profilu setting_noindex: Ovlivňuje váš veřejný profil a stránky tootů setting_show_application: Aplikace, kterou používáte k psaní tootů, bude zobrazena v detailním zobrazení vašich tootů - setting_theme: Ovlivňuje jak Mastodon vypadá, jste-li přihlášen na libovolném zařízení. username: Vaše uživatelské jméno bude na %{domain} unikátní whole_word: Je-li klíčové slovo či fráze pouze alfanumerická, bude aplikována pouze, pokud se shoduje s celým slovem featured_tag: diff --git a/config/locales/simple_form.cy.yml b/config/locales/simple_form.cy.yml index 24ae49a2a9..2c7a1e112f 100644 --- a/config/locales/simple_form.cy.yml +++ b/config/locales/simple_form.cy.yml @@ -18,13 +18,11 @@ cy: password: Defnyddiwch oleiaf 8 nodyn phrase: Caiff ei gyfateb heb ystyriaeth o briflythrennu mewn testun neu rhybudd ynghylch cynnwys tŵt scopes: Pa APIau y bydd gan y rhaglen ganiatad i gael mynediad iddynt. Os dewiswch maes lefel uchaf, yna nid oes angen dewis rhai unigol. - setting_default_language: Mae modd adnabod iaith eich tŵtiau yn awtomatig, ond nid yw bob tro'n gywir setting_display_media_default: Cuddio cyfryngau wedi eu marcio'n sensitif setting_display_media_hide_all: Cuddio cyfryngau bob tro setting_display_media_show_all: Dangos cyfryngau wedi eu marcio'n sensitif bob tro setting_hide_network: Ni fydd y rheini yr ydych yn eu dilyn a phwy sy'n eich dilyn chi yn cael ei ddangos ar eich proffil setting_noindex: Mae hyn yn effeithio ar eich proffil cyhoeddus a'ch tudalennau statws - setting_theme: Mae hyn yn effeithio ar sut olwg sydd ar Matododon pan yr ydych wedi mewngofnodi o unrhyw ddyfais. username: Bydd eich enw defnyddiwr yn unigryw ar %{domain} whole_word: Os yw'r allweddair neu'r ymadrodd yn alffaniwmerig yn unig, mi fydd ond yn cael ei osod os yw'n cyfateb a'r gair cyfan imports: diff --git a/config/locales/simple_form.da.yml b/config/locales/simple_form.da.yml index 483be70552..fd2024380e 100644 --- a/config/locales/simple_form.da.yml +++ b/config/locales/simple_form.da.yml @@ -20,12 +20,10 @@ da: password: Brug mindst 8 tegn phrase: Vil blive parret uanset om der er store eller små bogstaver i teksten eller om der er en advarsel om et trut scopes: Hvilke APIs applikationen vil få adgang til. Hvis du vælger et højtlevel omfang, behøver du ikke vælge enkeltstående. - setting_default_language: Sproget for dine trut kan blive fundet automatisk, men det er ikke altid præcist setting_display_media_default: Skjul medier markeret som følsomt setting_display_media_hide_all: Skjul altid alle medier setting_hide_network: Hvem du følger og hvem der følger dig vil ikke blive vist på din profil setting_noindex: Påvirker din offentlige profil og status sider - setting_theme: Påvirker hvordan Mastodon ser ud når du er logget ind via en hvilken som helst enhed. username: Dit brugernavn vil være unikt på %{domain} whole_word: Når nøgle ordet eller udtrykket kun er alfanumerisk, vil det kun blive brugt hvis det passer hele ordet imports: diff --git a/config/locales/simple_form.de.yml b/config/locales/simple_form.de.yml index 7794760696..1356d52752 100644 --- a/config/locales/simple_form.de.yml +++ b/config/locales/simple_form.de.yml @@ -27,14 +27,12 @@ de: phrase: Wird unabhängig vom umgebenen Text oder Inhaltswarnung eines Beitrags verglichen scopes: Welche Schnittstellen der Applikation erlaubt sind. Wenn du einen Top-Level-Scope auswählst, dann musst du nicht jeden einzelnen darunter auswählen. setting_aggregate_reblogs: Zeige denselben Beitrag nicht nochmal an, wenn er erneut geteilt wurde (dies betrifft nur neulich erhaltene erneut geteilte Beiträge) - setting_default_language: Die Sprache der Beiträge kann automatisch erkannt werden, aber dies ist nicht immer genau setting_display_media_default: Verstecke Medien, die als sensibel markiert sind setting_display_media_hide_all: Alle Medien immer verstecken setting_display_media_show_all: Medien, die als sensibel markiert sind, immer anzeigen setting_hide_network: Wem du folgst und wer dir folgt, wird in deinem Profil nicht angezeigt setting_noindex: Betrifft dein öffentliches Profil und deine Beiträge setting_show_application: Die Anwendung, die du zum Schreiben von Beiträgen benutzt wird in der detaillierten Ansicht deiner Beiträge angezeigt - setting_theme: Wirkt sich darauf aus, wie Mastodon aussieht, egal auf welchem Gerät du eingeloggt bist. username: Dein Benutzer:innen-Name wird auf %{domain} nur einmal vorkommen whole_word: Wenn das Schlagwort oder die Phrase nur Buchstaben und Zahlen enthält, wird es nur angewendet, wenn es dem ganzen Wort entspricht featured_tag: diff --git a/config/locales/simple_form.el.yml b/config/locales/simple_form.el.yml index 3d812204c3..2201ff498c 100644 --- a/config/locales/simple_form.el.yml +++ b/config/locales/simple_form.el.yml @@ -27,14 +27,12 @@ el: phrase: Θα ταιριάζει ανεξαρτήτως πεζών/κεφαλαίων ή προειδοποίησης περιεχομένου του τουτ scopes: Ποια API θα επιτρέπεται στην εφαρμογή να χρησιμοποιήσεις. Αν επιλέξεις κάποιο υψηλό εύρος εφαρμογής, δε χρειάζεται να επιλέξεις και εξειδικευμένα. setting_aggregate_reblogs: Απόκρυψη των νέων προωθήσεωνγια τα τουτ που έχουν προωθηθεί πρόσφατα (επηρεάζει μόνο τις νέες προωθήσεις) - setting_default_language: Η γλώσσα των τουτ σου μπορεί να ανιχνευτεί αυτόματα αλλά δεν είναι πάντα ακριβές setting_display_media_default: Απόκρυψη ευαίσθητων πολυμέσων setting_display_media_hide_all: Μόνιμη απόκρυψη όλων των πολυμέσων setting_display_media_show_all: Μόνιμη εμφάνιση ευαίσθητων πολυμέσων setting_hide_network: Δε θα εμφανίζεται στο προφίλ σου ποιους ακολουθείς και ποιοι σε ακολουθούν setting_noindex: Επηρεάζει το δημόσιο προφίλ και τις δημοσιεύσεις σου setting_show_application: Η εφαρμογή που χρησιμοποιείς για να στέλνεις τα τουτ σου θα εμφανίζεται στις αναλυτικές λεπτομέρειες τους - setting_theme: Επηρεάζει την εμφάνιση του Mastodon όταν συνδέεται από οποιαδήποτε συσκευή. username: Το όνομα χρήστη σου θα είναι μοναδικό στο %{domain} whole_word: Όταν η λέξη ή η φράση κλειδί είναι μόνο αλφαριθμητική, θα εφαρμοστεί μόνο αν ταιριάζει με ολόκληρη τη λέξη featured_tag: diff --git a/config/locales/simple_form.en.yml b/config/locales/simple_form.en.yml index 2f75efdbd7..4602f9cd9d 100644 --- a/config/locales/simple_form.en.yml +++ b/config/locales/simple_form.en.yml @@ -26,16 +26,14 @@ en: password: Use at least 8 characters phrase: Will be matched regardless of casing in text or content warning of a toot scopes: Which APIs the application will be allowed to access. If you select a top-level scope, you don't need to select individual ones. - setting_advanced_layout: The advanced UI consists of multiple customizable columns setting_aggregate_reblogs: Do not show new boosts for toots that have been recently boosted (only affects newly-received boosts) - setting_default_language: The language of your toots can be detected automatically, but it's not always accurate + setting_default_sensitive: Sensitive media is hidden by default and can be revealed with a click setting_display_media_default: Hide media marked as sensitive setting_display_media_hide_all: Always hide all media setting_display_media_show_all: Always show media marked as sensitive setting_hide_network: Who you follow and who follows you will not be shown on your profile setting_noindex: Affects your public profile and status pages setting_show_application: The application you use to toot will be displayed in the detailed view of your toots - setting_theme: Affects how Mastodon looks when you're logged in from any device. username: Your username will be unique on %{domain} whole_word: When the keyword or phrase is alphanumeric only, it will only be applied if it matches the whole word featured_tag: @@ -96,7 +94,7 @@ en: setting_auto_play_gif: Auto-play animated GIFs setting_boost_modal: Show confirmation dialog before boosting setting_default_language: Posting language - setting_default_privacy: Post privacy + setting_default_privacy: Posting privacy setting_default_sensitive: Always mark media as sensitive setting_delete_modal: Show confirmation dialog before deleting a toot setting_display_media: Media display @@ -134,6 +132,7 @@ en: reblog: Send e-mail when someone boosts your status report: Send e-mail when a new report is submitted 'no': 'No' + recommended: Recommended required: mark: "*" text: required diff --git a/config/locales/simple_form.en_GB.yml b/config/locales/simple_form.en_GB.yml index 6eac4bf3cc..8752d81bb0 100644 --- a/config/locales/simple_form.en_GB.yml +++ b/config/locales/simple_form.en_GB.yml @@ -27,14 +27,12 @@ en_GB: phrase: Will be matched regardless of casing in text or content warning of a toot scopes: Which APIs the application will be allowed to access. If you select a top-level scope, you don't need to select individual ones. setting_aggregate_reblogs: Do not show new boosts for toots that have been recently boosted (only affects newly-received boosts) - setting_default_language: The language of your toots can be detected automatically, but it's not always accurate setting_display_media_default: Hide media marked as sensitive setting_display_media_hide_all: Always hide all media setting_display_media_show_all: Always show media marked as sensitive setting_hide_network: Who you follow and who follows you will not be shown on your profile setting_noindex: Affects your public profile and status pages setting_show_application: The application you use to toot will be displayed in the detailed view of your toots - setting_theme: Affects how Mastodon looks when you're logged in from any device. username: Your username will be unique on %{domain} whole_word: When the keyword or phrase is alphanumeric only, it will only be applied if it matches the whole word featured_tag: diff --git a/config/locales/simple_form.eo.yml b/config/locales/simple_form.eo.yml index f4e1df32af..0ac42102a2 100644 --- a/config/locales/simple_form.eo.yml +++ b/config/locales/simple_form.eo.yml @@ -27,14 +27,12 @@ eo: phrase: Estos provita senzorge pri la uskleco de teksto aŭ averto pri enhavo de mesaĝo scopes: Kiujn API-ojn la aplikaĵo permesiĝos atingi. Se vi elektas supran amplekson, vi ne bezonas elekti la individuajn. setting_aggregate_reblogs: Ne montri novajn diskonigojn de mesaĝoj laste diskonigitaj (nur efikas al novaj diskonigoj) - setting_default_language: La lingvo de viaj mesaĝoj povas esti aŭtomate detektitaj, sed tio ne ĉiam ĝustas setting_display_media_default: Kaŝi aŭdovidaĵojn markitajn kiel tiklaj setting_display_media_hide_all: Ĉiam kaŝi ĉiujn aŭdovidaĵojn setting_display_media_show_all: Ĉiam montri aŭdovidaĵojn markitajn kiel tiklaj setting_hide_network: Tiuj, kiujn vi sekvas, kaj tiuj, kiuj sekvas vin ne estos videblaj en via profilo setting_noindex: Influas vian publikan profilon kaj mesaĝajn paĝojn setting_show_application: La aplikaĵo, kiun vi uzas por afiŝi, estos montrita en la detala vido de viaj mesaĝoj - setting_theme: Influas kiel Mastodon aspektas post ensaluto de ajna aparato. username: Via uzantnomo estos unika ĉe %{domain} whole_word: Kiam la vorto aŭ frazo estas nur litera aŭ cifera, ĝi estos uzata nur se ĝi kongruas kun la tuta vorto featured_tag: diff --git a/config/locales/simple_form.es.yml b/config/locales/simple_form.es.yml index c0d72dc278..da11df3f78 100644 --- a/config/locales/simple_form.es.yml +++ b/config/locales/simple_form.es.yml @@ -16,10 +16,8 @@ es: locked: Requiere que manualmente apruebes seguidores y las publicaciones serán mostradas solamente a tus seguidores 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 diff --git a/config/locales/simple_form.eu.yml b/config/locales/simple_form.eu.yml index f4fadb29d6..36688ee552 100644 --- a/config/locales/simple_form.eu.yml +++ b/config/locales/simple_form.eu.yml @@ -27,14 +27,12 @@ eu: phrase: Bat egingo du Maiuskula/minuskula kontuan hartu gabe eta edukiaren abisua kontuan hartu gabe scopes: Zeintzuk API atzitu ditzakeen aplikazioak. Goi mailako arloa aukeratzen baduzu, ez dituzu azpikoak aukeratu behar. setting_aggregate_reblogs: Ez erakutsi buktzada berriak berriki bultzada jaso duten tootentzat (berriki jasotako bultzadei eragiten die besterik ez) - setting_default_language: Zure Toot-en hizkuntza automatikoki antzeman daiteke, baina ez da beti zehatza setting_display_media_default: Ezkutatu hunkigarri gisa markatutako multimedia setting_display_media_hide_all: Ezkutatu multimedia guztia beti setting_display_media_show_all: Erakutsi beti hunkigarri gisa markatutako multimedia setting_hide_network: Nor jarraitzen duzun eta nork jarraitzen zaituen ez da bistaratuko zure profilean setting_noindex: Zure profil publiko eta Toot-en orrietan eragina du setting_show_application: Tootak bidaltzeko erabiltzen duzun aplikazioa zure tooten ikuspegi xehetsuan bistaratuko da - setting_theme: Edozein gailutik konektatzean Mastodon-en itxuran eragiten du. username: Zure erabiltzaile-izena bakana izango da %{domain} domeinuan whole_word: Hitz eta esaldi gakoa alfanumerikoa denean, hitz osoarekin bat datorrenean besterik ez da aplikatuko featured_tag: diff --git a/config/locales/simple_form.fa.yml b/config/locales/simple_form.fa.yml index b7ba444aa4..543642866e 100644 --- a/config/locales/simple_form.fa.yml +++ b/config/locales/simple_form.fa.yml @@ -27,14 +27,12 @@ fa: phrase: مستقل از کوچکی و بزرگی حروف، با متن اصلی یا هشدار محتوای بوق‌ها مقایسه می‌شود scopes: واسط‌های برنامه‌نویسی که این برنامه به آن دسترسی دارد. اگر بالاترین سطح دسترسی را انتخاب کنید، دیگر نیازی به انتخاب سطح‌های پایینی ندارید. setting_aggregate_reblogs: برای بازبوق‌هایی که به تازگی برایتان نمایش داده شده‌اند، بازبوق‌های بیشتر را نشان نده (فقط روی بازبوق‌های اخیر تأثیر می‌گذارد) - setting_default_language: زبان نوشته‌های شما به طور خودکار تشخیص داده می‌شود، ولی این تشخیص همیشه دقیق نیست setting_display_media_default: تصویرهایی را که به عنوان حساس علامت زده شده‌اند پنهان کن setting_display_media_hide_all: همیشه همهٔ عکس‌ها و ویدیوها را پنهان کن setting_display_media_show_all: همیشه تصویرهایی را که به عنوان حساس علامت زده شده‌اند را نشان بده setting_hide_network: فهرست پیگیران شما و فهرست کسانی که شما پی می‌گیرید روی نمایهٔ شما دیده نخواهد شد setting_noindex: روی نمایهٔ عمومی و صفحهٔ نوشته‌های شما تأثیر می‌گذارد setting_show_application: برنامه‌ای که به کمک آن بوق می‌زنید، در جزئیات بوق شما نمایش خواهد یافت - setting_theme: ظاهر ماستدون را وقتی که از هر دستگاهی به آن وارد می‌شوید تعیین می‌کند. username: نام کاربری شما روی %{domain} یکتا خواهد بود whole_word: اگر کلیدواژه فقط دارای حروف و اعداد باشد، تنها وقتی پیدا می‌شود که با کل یک واژه در متن منطبق باشد، نه با بخشی از یک واژه featured_tag: diff --git a/config/locales/simple_form.fi.yml b/config/locales/simple_form.fi.yml index 5fda109691..c44925b356 100644 --- a/config/locales/simple_form.fi.yml +++ b/config/locales/simple_form.fi.yml @@ -12,7 +12,6 @@ fi: header: PNG, GIF tai JPG. Enintään %{size}. Skaalataan kokoon %{dimensions} px locked: Sinun täytyy hyväksyä seuraajat manuaalisesti setting_noindex: Vaikuttaa julkiseen profiiliisi ja tilasivuihisi - setting_theme: Vaikuttaa Mastodonin ulkoasuun millä tahansa laitteella kirjauduttaessa. imports: data: Toisesta Mastodon-instanssista tuotu CSV-tiedosto sessions: diff --git a/config/locales/simple_form.fr.yml b/config/locales/simple_form.fr.yml index e2121098ad..26f8d1a5ae 100644 --- a/config/locales/simple_form.fr.yml +++ b/config/locales/simple_form.fr.yml @@ -27,14 +27,12 @@ fr: phrase: Sera trouvé sans que la case ou l’avertissement de contenu du pouet soit pris en compte scopes: À quelles APIs l’application sera autorisée à accéder. Si vous sélectionnez un périmètre de haut-niveau, vous n’avez pas besoin de sélectionner les individuels. setting_aggregate_reblogs: Ne pas afficher de nouveaux repartagés pour les pouets qui ont été récemment repartagés (n’affecte que les repartagés nouvellement reçus) - setting_default_language: La langue de vos pouets peut être détectée automatiquement, mais ça n’est pas toujours pertinent setting_display_media_default: Masquer les supports marqués comme sensibles setting_display_media_hide_all: Toujours masquer tous les médias setting_display_media_show_all: Toujours afficher les médias marqués comme sensibles setting_hide_network: Ceux que vous suivez et ceux qui vous suivent ne seront pas affichés sur votre profil setting_noindex: Affecte votre profil public ainsi que vos statuts setting_show_application: Le nom de l’application que vous utilisez afin d’envoyer des pouets sera affiché dans la vue détaillée de ceux-ci - setting_theme: Affecte l’apparence de Mastodon quand vous êtes connecté·e depuis n’importe quel appareil. username: Votre nom d’utilisateur sera unique sur %{domain} whole_word: Lorsque le mot-clef ou la phrase-clef est uniquement alphanumérique, ça sera uniquement appliqué s’il correspond au mot entier featured_tag: diff --git a/config/locales/simple_form.gl.yml b/config/locales/simple_form.gl.yml index 434b8caff0..c06f027add 100644 --- a/config/locales/simple_form.gl.yml +++ b/config/locales/simple_form.gl.yml @@ -27,14 +27,12 @@ gl: phrase: Concordará independentemente das maiúsculas ou avisos de contido no toot scopes: A que APIs terá acceso a aplicación. Si selecciona un ámbito de alto nivel, non precisa seleccionar elementos individuais. setting_aggregate_reblogs: Non mostrar novas promocións de toots que foron promocionados recentemente (só afecta a promocións recén recibidas) - setting_default_language: Pódese detectar automáticamente o idioma dos seus toots, mais non sempre é preciso setting_display_media_default: Ocultar medios marcados como sensibles setting_display_media_hide_all: Ocultar sempre os medios setting_display_media_show_all: Mostrar sempre os medios marcados como sensibles setting_hide_network: Non se mostrará no seu perfil quen a segue e quen a está a seguir setting_noindex: Afecta ao seu perfil público e páxinas de estado setting_show_application: A aplicación que está a utilizar para enviar toots mostrarase na vista detallada do toot - setting_theme: Afecta ao aspecto de Mastodon en calquer dispositivo cando está conectada. username: O seu nome de usuaria será único en %{domain} whole_word: Se a chave ou frase de paso é só alfanumérica, só se aplicará se concorda a palabra completa featured_tag: diff --git a/config/locales/simple_form.he.yml b/config/locales/simple_form.he.yml index c86498c66a..6fda0a0575 100644 --- a/config/locales/simple_form.he.yml +++ b/config/locales/simple_form.he.yml @@ -8,7 +8,6 @@ he: header: PNG, GIF או JPG. מקסימום %{size}. גודל התמונה יוקטן %{dimensions}px locked: מחייב אישור עוקבים באופן ידני. פרטיות ההודעות תהיה עוקבים-בלבד אלא אם יצוין אחרת setting_noindex: משפיע על הפרופיל הציבורי שלך ועמודי ההודעות - setting_theme: משפיע על המראה של מסטודון בעת החיבור המזוהה מכל מכשיר שהוא. imports: data: קובץ CSV שיוצא משרת מסטודון אחר sessions: diff --git a/config/locales/simple_form.hu.yml b/config/locales/simple_form.hu.yml index f36fabda1b..db62b580f1 100644 --- a/config/locales/simple_form.hu.yml +++ b/config/locales/simple_form.hu.yml @@ -8,7 +8,6 @@ hu: header: PNG, GIF vagy JPG. Maximum %{size}. Át lesz méretezve %{dimensions} pixelre locked: Egyenként engedélyezned kell a követőidet setting_noindex: A publikus profilodra és státusz oldalra vonatkozik - setting_theme: A bármely eszközről bejelentkezett felület kinézetére vonatkozik. imports: data: Egy másik Mastodon szerverről exportált CSV fájl sessions: diff --git a/config/locales/simple_form.it.yml b/config/locales/simple_form.it.yml index 9061844fe2..fd1bc9597d 100644 --- a/config/locales/simple_form.it.yml +++ b/config/locales/simple_form.it.yml @@ -27,14 +27,12 @@ it: phrase: Il confronto sarà eseguito ignorando minuscole/maiuscole e i content warning scopes: A quali API l'applicazione potrà avere accesso. Se selezionate un ambito di alto livello, non c'è bisogno di selezionare quelle singole. setting_aggregate_reblogs: Non mostrare nuove condivisioni per toot che sono stati condivisi di recente (ha effetto solo sulle nuove condivisioni) - setting_default_language: La lingua dei tuoi toot può essere individuata automaticamente, ma il risultato non è sempre accurato setting_display_media_default: Nascondi media segnati come sensibili setting_display_media_hide_all: Nascondi sempre tutti i media setting_display_media_show_all: Nascondi sempre i media segnati come sensibili setting_hide_network: Chi segui e chi segue te non saranno mostrati sul tuo profilo setting_noindex: Ha effetto sul tuo profilo pubblico e sulle pagine degli status setting_show_application: L'applicazione che usi per pubblicare i toot sarà mostrata nella vista di dettaglio dei tuoi toot - setting_theme: Ha effetto sul modo in cui Mastodon verrà visualizzato quando sarai collegato da qualsiasi dispositivo. username: Il tuo nome utente sarà unico su %{domain} whole_word: Quando la parola chiave o la frase è solo alfanumerica, si applica solo se corrisponde alla parola intera featured_tag: diff --git a/config/locales/simple_form.ja.yml b/config/locales/simple_form.ja.yml index 221d797e90..ff3dcd0437 100644 --- a/config/locales/simple_form.ja.yml +++ b/config/locales/simple_form.ja.yml @@ -26,16 +26,13 @@ ja: password: 少なくとも8文字は入力してください phrase: トゥートの大文字小文字や閲覧注意に関係なく一致 scopes: アプリの API に許可するアクセス権を選択してください。最上位のスコープを選択する場合、個々のスコープを選択する必要はありません。 - setting_advanced_layout: 上級者向け UI はカスタマイズ可能な複数のカラムで構成されています setting_aggregate_reblogs: 最近ブーストされたトゥートが新たにブーストされても表示しません (設定後受信したものにのみ影響) - setting_default_language: トゥートの言語は自動的に検出されますが、必ずしも正確とは限りません setting_display_media_default: 閲覧注意としてマークされたメディアは隠す setting_display_media_hide_all: 全てのメディアを常に隠す setting_display_media_show_all: 閲覧注意としてマークされたメディアも常に表示する setting_hide_network: フォローとフォロワーの情報がプロフィールページで見られないようにします setting_noindex: 公開プロフィールおよび各投稿ページに影響します setting_show_application: トゥートするのに使用したアプリがトゥートの詳細ビューに表示されるようになります - setting_theme: ログインしている全てのデバイスで適用されるデザインです。 username: あなたのユーザー名は %{domain} の中で重複していない必要があります whole_word: キーワードまたはフレーズが英数字のみの場合、単語全体と一致する場合のみ適用されるようになります featured_tag: diff --git a/config/locales/simple_form.ka.yml b/config/locales/simple_form.ka.yml index 6bccb31346..55a940d784 100644 --- a/config/locales/simple_form.ka.yml +++ b/config/locales/simple_form.ka.yml @@ -16,10 +16,8 @@ ka: locked: საჭიროებს თქვენ მიერ მიმდევრების ხელით დადასტურებას phrase: დამთხვევა მოხდება დიდი და პატარა ასოების ან კონტენტის გაფრთხილების გათვალისწინების გარეშე scopes: რომელი აპიებისადმი ექნება აპლიკაციას ცვდომა. თუ არიჩევთ უმთავრეს ფარგლებს, არ დაგჭირდებათ ინდივიდუალურების ამორჩევა. - setting_default_language: თქვენი ტუტების ენა შეიძლება დადგინდეს ავტომატურად, მაგრამ ეს არაა ყოველთვის ზუსტი setting_hide_network: ვის მიყვებით და ვინ მოგყვებათ არ გამოჩნდება აქ setting_noindex: გავლენას ახდენს თქვენს ღია პროფილისა და სტატუსის გვერდებზე - setting_theme: გავლენას ახდენს თუ როგორ გამოიყურება მასტოდონი, როდესაც შესული ხართ რომელიმე მოწყობილობიდან. whole_word: როდესაც სიტყვა ან ფრაზა მხოლოდ ალფა-ნუმერიკულია, ის დაფიქსირდება თუ ემთხვევა სრულ სიტყვას imports: data: ცსვ ფაილის ექსპორტი მოხდა მასტოდონის სხვა ინსტანციიდან diff --git a/config/locales/simple_form.ko.yml b/config/locales/simple_form.ko.yml index ccb7604e1c..6d3f1b679a 100644 --- a/config/locales/simple_form.ko.yml +++ b/config/locales/simple_form.ko.yml @@ -26,16 +26,13 @@ ko: password: 최소 8글자 phrase: 툿 내용이나 CW 내용 안에서 대소문자 구분 없이 매칭 됩니다 scopes: 애플리케이션에 허용할 API들입니다. 최상위 스코프를 선택하면 개별적인 것은 선택하지 않아도 됩니다. - setting_advanced_layout: 고급 UI는 여러 개의 커스텀 가능한 컬럼을 제공합니다. setting_aggregate_reblogs: 내가 부스트 했던 툿은 새로 부스트 되어도 보여주지 않습니다 - setting_default_language: 작성한 툿의 언어는 자동으로 인식할 수 있지만, 언제나 정확한 건 아닙니다 setting_display_media_default: 민감함으로 설정 된 미디어 가리기 setting_display_media_hide_all: 항상 모든 미디어를 가리기 setting_display_media_show_all: 민감함으로 설정 된 미디어를 항상 보이기 setting_hide_network: 나를 팔로우 하는 사람들과 내가 팔로우 하는 사람들이 내 프로필에 표시되지 않게 합니다 setting_noindex: 공개 프로필 및 각 툿페이지에 영향을 미칩니다 setting_show_application: 당신이 툿을 작성하는데에 사용한 앱이 툿의 상세정보에 표시 됩니다 - setting_theme: 로그인중인 모든 디바이스에 적용되는 디자인입니다. username: 당신의 유저네임은 %{domain} 안에서 유일해야 합니다 whole_word: 키워드가 영문과 숫자로만 이루어 진 경우, 단어 전체에 매칭 되었을 때에만 작동하게 합니다 featured_tag: diff --git a/config/locales/simple_form.nl.yml b/config/locales/simple_form.nl.yml index 09bd4e856a..d9607f5b69 100644 --- a/config/locales/simple_form.nl.yml +++ b/config/locales/simple_form.nl.yml @@ -27,14 +27,12 @@ nl: phrase: Komt overeen ongeacht hoofd-/kleine letters of tekstwaarschuwingen scopes: Tot welke API's heeft de toepassing toegang. Wanneer je een toestemming van het bovenste niveau kiest, hoef je geen individuele toestemmingen meer te kiezen. setting_aggregate_reblogs: Geen nieuwe boosts tonen voor toots die recentelijk nog zijn geboost (heeft alleen effect op nieuw ontvangen boosts) - setting_default_language: De taal van jouw toots kan automatisch worden gedetecteerd, maar het is niet altijd accuraat setting_display_media_default: Als gevoelig gemarkeerde media verbergen setting_display_media_hide_all: Media altijd verbergen setting_display_media_show_all: Als gevoelig gemarkeerde media altijd verbergen setting_hide_network: Wie jij volgt en wie jou volgen wordt niet op jouw profiel getoond setting_noindex: Heeft invloed op jouw openbare profiel en toots setting_show_application: De toepassing de je gebruikt om te tooten wordt in de gedetailleerde weergave van de toot getoond - setting_theme: Heeft invloed op hoe de webapp van Mastodon eruitziet (op elk apparaat waarmee je inlogt). username: Jouw gebruikersnaam is uniek op %{domain} whole_word: Wanneer het trefwoord of zinsdeel alfanumeriek is, wordt het alleen gefilterd wanneer het hele woord overeenkomt featured_tag: diff --git a/config/locales/simple_form.no.yml b/config/locales/simple_form.no.yml index fc339c3f27..e35bdabcca 100644 --- a/config/locales/simple_form.no.yml +++ b/config/locales/simple_form.no.yml @@ -8,7 +8,6 @@ header: PNG, GIF eller JPG. Maksimalt %{size}. Vil bli nedskalert til %{dimensions}px locked: Krever at du manuelt godkjenner følgere setting_noindex: Påvirker din offentlige profil og statussider - setting_theme: Påvirker hvordan Mastodon ser ut når du er logget inn fra uansett enhet. imports: data: CSV-fil eksportert fra en annen Mastodon-instans sessions: diff --git a/config/locales/simple_form.oc.yml b/config/locales/simple_form.oc.yml index 3efaa34dfd..ba6a7782ae 100644 --- a/config/locales/simple_form.oc.yml +++ b/config/locales/simple_form.oc.yml @@ -27,14 +27,12 @@ oc: phrase: Serà pres en compte que siá en majuscula o minuscula o dins un avertiment de contengut sensible scopes: A quinas APIs poiràn accedir las aplicacions. Se seleccionatz un encastre de naut nivèl, fa pas mestièr de seleccionar los nivèls mai basses. setting_aggregate_reblogs: Mostrar pas los nòus partatges que son estats partejats recentament (afecta pas que los nòus partatges recebuts) - setting_default_language: La lenga de vòstres tuts pòt èsser detectada automaticament, mas de còps es pas corrèctament determinada setting_display_media_default: Rescondre los mèdias marcats coma sensibles setting_display_media_hide_all: Totjorn rescondre los mèdias setting_display_media_show_all: Totjorn mostrar los mèdias marcats coma sensibles setting_hide_network: Vòstre perfil mostrarà pas los que vos sègon e lo monde que seguètz setting_noindex: Aquò es destinat a vòstre perfil public e vòstra pagina d’estatuts setting_show_application: Lo nom de l’aplicacion qu’utilizatz per publicar serà mostrat dins la vista detalhada de vòstres tuts - setting_theme: Aquò càmbia lo tèma grafic de Mastodon quand sètz connectat qual que siasque lo periferic. username: Vòstre nom d’utilizaire serà unic sus %{domain} whole_word: Quand lo mot-clau o frasa es solament alfranumeric, serà pas qu’aplicat se correspond al mot complèt featured_tag: diff --git a/config/locales/simple_form.pl.yml b/config/locales/simple_form.pl.yml index e1cbee91c5..af02af5913 100644 --- a/config/locales/simple_form.pl.yml +++ b/config/locales/simple_form.pl.yml @@ -27,14 +27,12 @@ pl: phrase: Zostanie wykryte nawet, gdy znajduje się za ostrzeżeniem o zawartości scopes: Wybór API, do których aplikacja będzie miała dostęp. Jeżeli wybierzesz nadrzędny zakres, nie musisz wybierać jego elementów. setting_aggregate_reblogs: Nie pokazuj nowych podbić dla wpisów, które zostały niedawno podbite (dotyczy tylko nowo otrzymanych podbić) - setting_default_language: Język Twoich wpisów może być wykrywany automatycznie, ale nie zawsze jest to dokładne setting_display_media_default: Ukrywaj zawartość oznaczoną jako wrażliwa setting_display_media_hide_all: Zawsze oznaczaj zawartość multimedialną jako wrażliwą setting_display_media_show_all: Nie ukrywaj zawartości multimedialnej oznaczonej jako wrażliwa setting_hide_network: Informacje o tym, kto Cię śledzi i kogo śledzisz nie będą widoczne setting_noindex: Wpływa na widoczność strony profilu i Twoich wpisów setting_show_application: W informacjach o wpisie będzie widoczna informacja o aplikacji, z której został wysłany - setting_theme: Zmienia wygląd Mastodona po zalogowaniu z dowolnego urządzenia. username: Twoja nazwa użytkownika będzie niepowtarzalna na %{domain} whole_word: Jeśli słowo lub fraza składa się jedynie z liter lub cyfr, filtr będzie zastosowany tylko do pełnych wystąpień featured_tag: diff --git a/config/locales/simple_form.pt-BR.yml b/config/locales/simple_form.pt-BR.yml index 734bd21d01..74ad6ed4e5 100644 --- a/config/locales/simple_form.pt-BR.yml +++ b/config/locales/simple_form.pt-BR.yml @@ -27,14 +27,12 @@ pt-BR: phrase: Vai coincidir, independente de maiúsculas ou minúsculas, no texto ou no aviso de conteúdo de um toot scopes: Quais APIs a aplicação vai ter permissão de acessar. Se você selecionar um escopo de alto nível, você não precisa selecionar individualmente os outros. setting_aggregate_reblogs: Não mostrar novos compartilhamentos para toots que foram compartilhados recentemente (afeta somente novos compartilhamentos recebidos) - setting_default_language: O idioma de seus toots pode ser detectado automaticamente, mas isso nem sempre é preciso setting_display_media_default: Esconder mídia marcada como sensível setting_display_media_hide_all: Sempre esconder todas as mídias setting_display_media_show_all: Sempre mostrar mídia marcada como sensível setting_hide_network: Quem você segue e quem segue você não serão exibidos no seu perfil setting_noindex: Afeta seu perfil público e as páginas de suas postagens setting_show_application: A aplicação que você usar para enviar seus toots vai aparecer na visão detalhada dos seus toots - setting_theme: Afeta a aparência do Mastodon quando em sua conta em qualquer aparelho. username: Seu nome de usuário será único em %{domain} whole_word: Quando a palavra ou frase é inteiramente alfanumérica, ela será aplicada somente se corresponder a palavra inteira featured_tag: diff --git a/config/locales/simple_form.pt.yml b/config/locales/simple_form.pt.yml index 589f5cf5c9..5f9e522fed 100644 --- a/config/locales/simple_form.pt.yml +++ b/config/locales/simple_form.pt.yml @@ -27,14 +27,12 @@ pt: phrase: Será correspondido independentemente da capitalização ou do aviso de conteúdo duma publicação scopes: Quais as APIs a que será concedido acesso. Se escolheres uma abrangência de nível superior, não precisarás de as seleccionar individualmente. setting_aggregate_reblogs: Não mostrar novas partilhas que foram partilhadas recentemente (só afecta as novas partilhas) - setting_default_language: A língua das tuas publicações pode ser detectada automaticamente, mas isso nem sempre é preciso setting_display_media_default: Esconder media marcada como sensível setting_display_media_hide_all: Esconder sempre toda a media setting_display_media_show_all: Mostrar sempre a media marcada como sensível setting_hide_network: Quem tu segues e quem te segue não será mostrado no teu perfil setting_noindex: Afecta o teu perfil público e as páginas das tuas publicações setting_show_application: A aplicação que tu usas para publicar será mostrada na vista detalhada das tuas publicações - setting_theme: Afecta a aparência do Mastodon quando entras na tua conta em qualquer dispositivo. username: O teu nome de utilizador será único em %{domain} whole_word: Quando a palavra-chave ou expressão-chave é somente alfanumérica, ela só será aplicada se corresponder à palavra completa featured_tag: diff --git a/config/locales/simple_form.ro.yml b/config/locales/simple_form.ro.yml index 757b872043..e104d9a4ee 100644 --- a/config/locales/simple_form.ro.yml +++ b/config/locales/simple_form.ro.yml @@ -27,13 +27,11 @@ ro: 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_aggregate_reblogs: Nu afișa redistribuirile noi pentru postările care au fost deja recent redistribuite (afectează doar noile redistribuiri primite) - setting_default_language: Limba postărilor tale poate fi detectată automat, dar nu este întotdeauna precisă setting_display_media_default: Ascunde conținutul media marcat ca sensibil (NSFW) setting_display_media_hide_all: Întotdeauna ascunde tot conținutul media setting_display_media_show_all: Întotdeauna afișează conținutul media marcat ca sensibil 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. username: Numele tău de utilizator va fi unic pe %{domain} whole_word: Când fraza sau cuvântul este doar alfanumeric, acesta se aplică doar dacă există o potrivire completă imports: diff --git a/config/locales/simple_form.ru.yml b/config/locales/simple_form.ru.yml index 4196076a96..3b7a92f464 100644 --- a/config/locales/simple_form.ru.yml +++ b/config/locales/simple_form.ru.yml @@ -27,14 +27,12 @@ ru: phrase: Будет сопоставлено независимо от присутствия в тексте или предупреждения о содержании статуса scopes: Какие API приложению будет позволено использовать. Если вы выберете самый верхний, нижестоящие будут выбраны автоматически. setting_aggregate_reblogs: Не показывать новые продвижения статусов, которые уже были недавно продвинуты (относится только к новым продвижениям) - setting_default_language: Язык ваших статусов может быть определён автоматически, но не всегда правильно setting_display_media_default: Скрывать чувствительные медиафайлы setting_display_media_hide_all: Всегда скрывать любые медиафайлы setting_display_media_show_all: Всегда показывать чувствительные медиафайлы setting_hide_network: Те, на кого вы подписаны и кто подписан на Вас, не будут отображены в вашем профиле setting_noindex: Относится к вашему публичному профилю и страницам статусов setting_show_application: В окне просмотра вашего статуса будет видно, с какого приложения он был отправлен - setting_theme: Влияет на внешний вид Mastodon при выполненном входе в аккаунт. username: Ваш юзернейм будет уникальным на %{domain} whole_word: Если слово или фраза состоит только из букв и цифр, сопоставление произойдёт только по полному совпадению featured_tag: diff --git a/config/locales/simple_form.sk.yml b/config/locales/simple_form.sk.yml index c6de0009d6..5314b55350 100644 --- a/config/locales/simple_form.sk.yml +++ b/config/locales/simple_form.sk.yml @@ -26,16 +26,13 @@ sk: password: Zadaj aspoň osem znakov phrase: Zhoda sa nájde nezávisle od toho, či je text napísaný, veľkými, alebo malými písmenami, či už v tele, alebo v hlavičke scopes: Ktoré API budú povolené aplikácii pre prístup. Ak vyberieš vrcholný stupeň, nemusíš už potom vyberať po jednom. - setting_advanced_layout: Pokročilé užívateľské rozhranie sa skladá z viacero prispôsobiteľných stĺpcov setting_aggregate_reblogs: Nezobrazuj nové vyzdvihnutia pre príspevky, ktoré už boli len nedávno povýšené (týka sa iba nanovo získaných povýšení) - setting_default_language: Jazyk tvojích príspevkov môže byť zistený automaticky, ale nieje to vždy presné setting_display_media_default: Skry médiá označené ako citlivé setting_display_media_hide_all: Vždy ukry všetky médiá setting_display_media_show_all: Stále zobrazuj médiá označené ako citlivé setting_hide_network: Koho následuješ, a kto následuje teba, nebude zobrazené na tvojom profile setting_noindex: Ovplyvňuje verejný profil a stránky s príspevkami setting_show_application: Aplikácia, ktorú používaš na písanie príspevkov, bude zobrazená v podrobnom náhľade jednotlivých tvojích príspevkov - setting_theme: Ovplyvňuje ako Mastodon vyzerá pri prihlásení z hociakého zariadenia. username: Tvoja prezývka bude unikátna pre server %{domain} whole_word: Ak je kľúčové slovo, alebo fráza poskladaná iba s písmen a čísel, bude použité iba ak sa zhoduje s celým výrazom featured_tag: diff --git a/config/locales/simple_form.sl.yml b/config/locales/simple_form.sl.yml index 781485864f..6e07d9b002 100644 --- a/config/locales/simple_form.sl.yml +++ b/config/locales/simple_form.sl.yml @@ -18,13 +18,11 @@ sl: password: Uporabite najmanj 8 znakov phrase: Se bo ujemal, ne glede na začetnice v tekstu ali opozorilo o vsebini troba scopes: Do katerih API-jev bo imel program dostop. Če izberete obseg najvišje ravni, vam ni treba izbrati posameznih. - setting_default_language: Jezik vaših trobov je lahko samodejno zaznan, vendar ni vedno pravilen setting_display_media_default: Skrij medij, ki je označen kot občutljiv setting_display_media_hide_all: Vedno skrij vse medije setting_display_media_show_all: Vedno pokaži medij, ki je označen kot občutljiv setting_hide_network: Kogar spremljate in kdo vas spremlja ne bo prikazano na vašem profilu setting_noindex: Vpliva na vaš javni profil in na strani s stanjem - setting_theme: Vpliva na to, kako izgleda Mastodon, ko ste prijavljeni s katero koli napravo. username: Vaše uporabniško ime bo edinstveno na %{domain} whole_word: Ko je ključna beseda ali fraza samo alfanumerična, se bo uporabljala le, če se bo ujemala s celotno besedo imports: diff --git a/config/locales/simple_form.sq.yml b/config/locales/simple_form.sq.yml index c3feee5751..c1907abecf 100644 --- a/config/locales/simple_form.sq.yml +++ b/config/locales/simple_form.sq.yml @@ -27,14 +27,12 @@ sq: phrase: Do të kërkohet përputhje pavarësish se teksti ose sinjalizimi mbi lëndën e një mesazhi është shkruar me të mëdha apo me të vogla scopes: Cilat API do të lejohet të përdorë aplikacioni. Nëse përzgjidhni një shkallë të epërme, nuk ju duhet të përzgjidhni individualet një nga një. setting_aggregate_reblogs: Mos shfaq përforcime të reja për mesazhe që janë përforcuar tani së fundi (prek vetëm përforcime të marra rishtas) - setting_default_language: Gjuha e mesazheve tuaj do të zbulohet vetvetiu, por mund të mos jetë përherë e saktë setting_display_media_default: Fshih media me shenjën rezervat setting_display_media_hide_all: Fshih përherë krejt mediat setting_display_media_show_all: Mediat me shenjën rezervat shfaqi përherë setting_hide_network: Cilët ndiqni dhe cilët ju ndjekin nuk do të shfaqen në profilin tuaj setting_noindex: Prek faqet e profilit tuaj publik dhe gjendjeve setting_show_application: Aplikacioni që përdorni për mesazhe do të shfaqet te pamja e hollësishme për mesazhet tuaj - setting_theme: Lidhet me se si duket Mastodon-i kur jeni i futur nga çfarëdo pajisje. username: Emri juaj i përdoruesit do të jetë unik në %{domain} whole_word: Kur fjalëkyçi ose fraza është vetëm numerike, do të aplikohet vetëm nëse përputhet me krejt fjalën featured_tag: diff --git a/config/locales/simple_form.sr-Latn.yml b/config/locales/simple_form.sr-Latn.yml index eac64988fe..1c21ac49e8 100644 --- a/config/locales/simple_form.sr-Latn.yml +++ b/config/locales/simple_form.sr-Latn.yml @@ -8,7 +8,6 @@ sr-Latn: header: PNG, GIF ili JPG. Najviše %{size}. Biće smanjena na %{dimensions}px locked: Zahteva da pojedinačno odobrite pratioce setting_noindex: Utiče na Vaš javni profil i statusne strane - setting_theme: Utiče kako će Mastodont izgledati kada ste prijavljeni sa bilo kog uređaja. imports: data: CSV fajl izvezen sa druge Mastodont instance sessions: diff --git a/config/locales/simple_form.sr.yml b/config/locales/simple_form.sr.yml index 7e3c6685e0..f7413fd171 100644 --- a/config/locales/simple_form.sr.yml +++ b/config/locales/simple_form.sr.yml @@ -27,13 +27,11 @@ sr: phrase: Биће упарена без обзира на велико или мало слово у тексту или упозорења о садржају трубе scopes: Којим API-јима ће апликација дозволити приступ. Ако изаберете опсег највишег нивоа, не морате одабрати појединачне. setting_aggregate_reblogs: Не показуј нова дељења за трубе које су недавно подељене (утиче само на недавно примљена дељења) - setting_default_language: Језик ваших труба може бити аутоматски откривен, али није увек прецизан setting_display_media_default: Сакриј медије означене као осетљиве setting_display_media_hide_all: Увек сакриј све медије setting_display_media_show_all: Увек прикажи медије означене као осетљиве setting_hide_network: Кога пратите и ко вас прати неће бити приказано на вашем профилу setting_noindex: Утиче на Ваш јавни профил и статусне стране - setting_theme: Утиче како ће Мастодонт изгледати када сте пријављени са било ког уређаја. username: Ваш надимак ће бити јединствен на %{domain} whole_word: Када је кључна реч или фраза искључиво алфанумеричка, биће примењена само ако се подудара са целом речи imports: diff --git a/config/locales/simple_form.sv.yml b/config/locales/simple_form.sv.yml index 62d0b3769e..e7ed33d0b5 100644 --- a/config/locales/simple_form.sv.yml +++ b/config/locales/simple_form.sv.yml @@ -19,10 +19,8 @@ sv: locale: Användargränssnittets språk, e-post och push-aviseringar locked: Kräver att du manuellt godkänner följare password: Använd minst 8 tecken - setting_default_language: Språket av dina inlägg kan upptäckas automatiskt, men det är inte alltid rätt setting_hide_network: Vem du följer och vilka som följer dig kommer inte att visas på din profilsida setting_noindex: Påverkar din offentliga profil och statussidor - setting_theme: Påverkar hur Mastodon ser ut oavsett från vilken enhet du är inloggad. imports: data: CSV-fil som exporteras från en annan Mastodon-instans sessions: diff --git a/config/locales/simple_form.th.yml b/config/locales/simple_form.th.yml index bce5eaac69..5f40b05a7d 100644 --- a/config/locales/simple_form.th.yml +++ b/config/locales/simple_form.th.yml @@ -27,14 +27,12 @@ th: phrase: จะถูกจับคู่โดยไม่คำนึงถึงตัวอักษรใหญ่เล็กในข้อความหรือคำเตือนเนื้อหาของโพสต์ scopes: API ใดที่แอปพลิเคชันจะได้รับอนุญาตให้เข้าถึง หากคุณเลือกขอบเขตระดับบนสุด คุณไม่จำเป็นต้องเลือกแต่ละขอบเขต setting_aggregate_reblogs: ไม่แสดงการดันใหม่สำหรับโพสต์ที่เพิ่งดัน (มีผลต่อการดันที่ได้รับใหม่เท่านั้น) - setting_default_language: สามารถตรวจพบภาษาของโพสต์ของคุณโดยอัตโนมัติ แต่อาจไม่แม่นยำเสมอไป setting_display_media_default: ซ่อนสื่อที่ถูกทำเครื่องหมายว่าละเอียดอ่อน setting_display_media_hide_all: ซ่อนสื่อทั้งหมดเสมอ setting_display_media_show_all: แสดงสื่อที่ถูกทำเครื่องหมายว่าละเอียดอ่อนเสมอ setting_hide_network: จะไม่แสดงผู้ที่คุณติดตามและผู้ที่ติดตามคุณในโปรไฟล์ของคุณ setting_noindex: มีผลต่อโปรไฟล์สาธารณะและหน้าสถานะของคุณ setting_show_application: จะแสดงผลแอปพลิเคชันที่คุณใช้เพื่อโพสต์ในมุมมองโดยละเอียดของโพสต์ของคุณ - setting_theme: มีผลต่อลักษณะของ Mastodon เมื่อคุณเข้าสู่ระบบจากอุปกรณ์ใด ๆ username: ชื่อผู้ใช้ของคุณจะไม่ซ้ำกันบน %{domain} whole_word: เมื่อคำสำคัญหรือวลีมีแค่ตัวอักษรและตัวเลข จะถูกใช้หากตรงกันทั้งคำเท่านั้น featured_tag: diff --git a/config/locales/simple_form.zh-CN.yml b/config/locales/simple_form.zh-CN.yml index cfa6840a6a..eaed42abaa 100644 --- a/config/locales/simple_form.zh-CN.yml +++ b/config/locales/simple_form.zh-CN.yml @@ -11,10 +11,8 @@ zh-CN: header: 文件大小限制 %{size}，只支持 PNG、GIF 或 JPG 格式。图片分辨率将会压缩至 %{dimensions}px locale: 用户界面、电子邮件和推送通知中使用的语言 locked: 你需要手动审核所有关注请求 - setting_default_language: 嘟文语言自动检测的结果有可能不准确（此设置仅影响你的嘟文） setting_hide_network: 你关注的人和关注你的人将不会在你的个人资料页上展示 setting_noindex: 此设置会影响到你的公开个人资料以及嘟文页面 - setting_theme: 此设置会影响到所有已登录设备上 Mastodon 的显示样式 imports: data: 请上传从其他 Mastodon 实例导出的 CSV 文件 sessions: diff --git a/config/locales/simple_form.zh-HK.yml b/config/locales/simple_form.zh-HK.yml index e28f935c2c..08dcb4ad0a 100644 --- a/config/locales/simple_form.zh-HK.yml +++ b/config/locales/simple_form.zh-HK.yml @@ -11,10 +11,8 @@ zh-HK: header: 支援 PNG, GIF 或 JPG 圖片，檔案最大為 %{size}，會縮裁成 %{dimensions}px locale: 使用者介面、電郵和通知的語言 locked: 你必須人手核准每個用戶對你的關注請求，而你的文章私隱會被預設為「只有關注你的人能看」 - setting_default_language: 你文章的語言會被自動偵測，但不一定完全準確 setting_hide_network: 你關注的人和關注你的人將不會在你的個人資料頁上顯示 setting_noindex: 此設定會影響到你的公開個人資料以及文章頁面 - setting_theme: 此設置會影響到你從任意設備登入時 Mastodon 的顯示樣式。 imports: data: 自其他服務站匯出的 CSV 檔案 sessions: diff --git a/config/locales/simple_form.zh-TW.yml b/config/locales/simple_form.zh-TW.yml index 61d07825c8..bba868997b 100644 --- a/config/locales/simple_form.zh-TW.yml +++ b/config/locales/simple_form.zh-TW.yml @@ -27,14 +27,12 @@ zh-TW: phrase: 無論是嘟文的本文或是內容警告都會被過濾 scopes: 允許讓應用程式存取的 API。 若您選擇最高階範圍，則無須選擇個別項目。 setting_aggregate_reblogs: 請勿顯示最近已被轉嘟之嘟文的最新轉嘟（只影響最新收到的嘟文） - setting_default_language: 您嘟文的語言可被自動偵測，但不一定每次都準確 setting_display_media_default: 隱藏標為敏感的媒體 setting_display_media_hide_all: 總是隱藏所有媒體 setting_display_media_show_all: 總是顯示標為敏感的媒體 setting_hide_network: 你關注的人與關注你的人將不會在你的個人資料頁上顯示 setting_noindex: 會影響您的公開個人資料與嘟文頁面 setting_show_application: 您用來發嘟文的應用程式將會在您嘟文的詳細檢視顯示 - setting_theme: 會影響從任何裝置登入所看到的 Mastodon 樣式。 username: 您的使用者名稱將在 %{domain} 是獨一無二的 whole_word: 如果關鍵字或詞組僅有字母與數字，則其將只在符合整個單字的時候才會套用 featured_tag: diff --git a/config/locales/sk.yml b/config/locales/sk.yml index 778a8f42f8..412f283b80 100644 --- a/config/locales/sk.yml +++ b/config/locales/sk.yml @@ -760,10 +760,7 @@ sk: too_few_options: musí mať viac ako jednu položku too_many_options: nemôže zahŕňať viac ako %{max} položiek preferences: - languages: Jazyky other: Ostatné - publishing: Publikovanie - web: Web remote_follow: acct: Napíš svoju prezývku@doménu z ktorej chceš následovať missing_resource: Nemožno nájsť potrebnú presmerovaciu adresu k tvojmu účtu diff --git a/config/locales/sq.yml b/config/locales/sq.yml index ea36a2189f..ea3a238341 100644 --- a/config/locales/sq.yml +++ b/config/locales/sq.yml @@ -702,10 +702,7 @@ sq: prev: I mëparshmi truncate: "…" preferences: - languages: Gjuhë other: Tjetër - publishing: Publikim - web: Web remote_follow: acct: Jepni çiftin tuaj emërpërdoruesi@përkatësi prej të cilit doni që të veprohet missing_resource: S’u gjet dot URL-ja e domosdoshme e ridrejtimit për llogarinë tuaj diff --git a/config/locales/sr-Latn.yml b/config/locales/sr-Latn.yml index 2292b6a7f8..3bbb79592b 100644 --- a/config/locales/sr-Latn.yml +++ b/config/locales/sr-Latn.yml @@ -464,10 +464,7 @@ sr-Latn: prev: Prethodni truncate: "…" preferences: - languages: Jezici other: Ostali - publishing: Objavljivanje - web: Veb remote_follow: acct: Unesite Vaš korisnik@domen sa koga želite da pratite missing_resource: Ne mogu da nađem zahtevanu adresu preusmeravanja za Vaš nalog diff --git a/config/locales/sr.yml b/config/locales/sr.yml index 2bf9001ce5..8c94b09890 100644 --- a/config/locales/sr.yml +++ b/config/locales/sr.yml @@ -714,10 +714,7 @@ sr: prev: Претходни truncate: "…" preferences: - languages: Језици other: Остало - publishing: Објављивање - web: Веб remote_follow: acct: Унесите Ваш корисник@домен са кога желите да пратите missing_resource: Не могу да нађем захтевану адресу преусмеравања за Ваш налог diff --git a/config/locales/sv.yml b/config/locales/sv.yml index 91d4c2496d..c235fc889d 100644 --- a/config/locales/sv.yml +++ b/config/locales/sv.yml @@ -535,10 +535,7 @@ sv: prev: Tidigare truncate: "…" preferences: - languages: Språk other: Annat - publishing: Publicering - web: Webb remote_follow: acct: Ange ditt användarnamn@domän du vill följa från missing_resource: Det gick inte att hitta den begärda omdirigeringsadressen för ditt konto diff --git a/config/locales/th.yml b/config/locales/th.yml index 2ebd6c7f1c..29199889a8 100644 --- a/config/locales/th.yml +++ b/config/locales/th.yml @@ -543,10 +543,7 @@ th: prev: ก่อนหน้า truncate: "…" preferences: - languages: ภาษา other: อื่น ๆ - publishing: การเผยแพร่ - web: เว็บ relationships: activity: กิจกรรมบัญชี relationship: ความสัมพันธ์ diff --git a/config/locales/uk.yml b/config/locales/uk.yml index a582b23853..7b7153f218 100644 --- a/config/locales/uk.yml +++ b/config/locales/uk.yml @@ -582,10 +582,7 @@ uk: prev: Назад truncate: "…" preferences: - languages: Мови other: Інше - publishing: Публікація - web: Веб remote_follow: acct: Введіть username@domain, яким ви хочете підписатися missing_resource: Пошук потрібного перенаправлення URL для Вашого аккаунта закінчився невдачею diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml index ae49c05371..3b0bc6caff 100644 --- a/config/locales/zh-CN.yml +++ b/config/locales/zh-CN.yml @@ -604,10 +604,7 @@ zh-CN: prev: 上一页 truncate: "…" preferences: - languages: 语言 other: 其他 - publishing: 发布 - web: 站内 remote_follow: acct: 请输入你的“用户名@实例域名” missing_resource: 无法确定你的帐户的跳转 URL diff --git a/config/locales/zh-HK.yml b/config/locales/zh-HK.yml index aade1debb4..fa6af4d61f 100644 --- a/config/locales/zh-HK.yml +++ b/config/locales/zh-HK.yml @@ -532,10 +532,7 @@ zh-HK: prev: 上一頁 truncate: "……" preferences: - languages: 語言 other: 其他 - publishing: 發佈 - web: 站内 remote_follow: acct: 請輸入你的︰用戶名稱@服務點域名 missing_resource: 無法找到你用戶的轉接網址 diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml index 988357e1b1..3dd122f8a5 100644 --- a/config/locales/zh-TW.yml +++ b/config/locales/zh-TW.yml @@ -609,10 +609,7 @@ zh-TW: prev: 上一頁 truncate: '' preferences: - languages: 語言 other: 其他 - publishing: 發佈 - web: 站內 remote_follow: acct: 請輸入您的使用者名稱@站點網域 missing_resource: 無法找到資源 diff --git a/config/navigation.rb b/config/navigation.rb index c2a8e45cea..45e5bc562c 100644 --- a/config/navigation.rb +++ b/config/navigation.rb @@ -10,7 +10,12 @@ SimpleNavigation::Configuration.run do |navigation| s.item :identity_proofs, safe_join([fa_icon('key fw'), t('settings.identity_proofs')]), settings_identity_proofs_path, highlights_on: %r{/settings/identity_proofs*}, if: proc { current_account.identity_proofs.exists? } end - n.item :preferences, safe_join([fa_icon('cog fw'), t('settings.preferences')]), settings_preferences_url, highlights_on: %r{/settings/preferences|/settings/notifications} + n.item :preferences, safe_join([fa_icon('cog fw'), t('settings.preferences')]), settings_preferences_appearance_url do |s| + s.item :appearance, safe_join([fa_icon('desktop fw'), t('settings.appearance')]), settings_preferences_appearance_url + s.item :notifications, safe_join([fa_icon('bell fw'), t('settings.notifications')]), settings_preferences_notifications_url + s.item :other, safe_join([fa_icon('cog fw'), t('preferences.other')]), settings_preferences_url + end + n.item :relationships, safe_join([fa_icon('users fw'), t('settings.relationships')]), relationships_url n.item :filters, safe_join([fa_icon('filter fw'), t('filters.index.title')]), filters_path, highlights_on: %r{/filters} diff --git a/config/routes.rb b/config/routes.rb index 34d0081e77..2b35472bd2 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -87,13 +87,20 @@ Rails.application.routes.draw do get '/explore', to: 'directories#index', as: :explore get '/explore/:id', to: 'directories#show', as: :explore_hashtag + get '/settings', to: redirect('/settings/preferences') + namespace :settings do resource :profile, only: [:show, :update] resource :preferences, only: [:show, :update] - resource :notifications, only: [:show, :update] - resource :import, only: [:show, :create] + namespace :preferences do + resource :appearance, only: [:show, :update], controller: :appearance + resource :notifications, only: [:show, :update] + end + + resource :import, only: [:show, :create] resource :export, only: [:show, :create] + namespace :exports, constraints: { format: :csv } do resources :follows, only: :index, controller: :following_accounts resources :blocks, only: :index, controller: :blocked_accounts @@ -103,6 +110,7 @@ Rails.application.routes.draw do end resource :two_factor_authentication, only: [:show, :create, :destroy] + namespace :two_factor_authentication do resources :recovery_codes, only: [:create] resource :confirmation, only: [:new, :create] diff --git a/spec/controllers/settings/notifications_controller_spec.rb b/spec/controllers/settings/preferences/notifications_controller_spec.rb similarity index 86% rename from spec/controllers/settings/notifications_controller_spec.rb rename to spec/controllers/settings/preferences/notifications_controller_spec.rb index 981ef674ec..02180b3832 100644 --- a/spec/controllers/settings/notifications_controller_spec.rb +++ b/spec/controllers/settings/preferences/notifications_controller_spec.rb @@ -1,6 +1,6 @@ require 'rails_helper' -describe Settings::NotificationsController do +describe Settings::Preferences::NotificationsController do render_views let(:user) { Fabricate(:user) } @@ -28,7 +28,7 @@ describe Settings::NotificationsController do } } - expect(response).to redirect_to(settings_notifications_path) + expect(response).to redirect_to(settings_preferences_notifications_path) user.reload expect(user.settings['notification_emails']['follow']).to be true expect(user.settings['interactions']['must_be_follower']).to be false From 9cf5686de5498bcc28e6307a6c90af45d5cd4793 Mon Sep 17 00:00:00 2001 From: Alix Rossi Date: Fri, 7 Jun 2019 12:12:17 +0200 Subject: [PATCH 02/27] i18n: Update Corsican translations (#10987) --- config/locales/co.yml | 9 +++++++++ config/locales/simple_form.co.yml | 2 ++ 2 files changed, 11 insertions(+) diff --git a/config/locales/co.yml b/config/locales/co.yml index cc33d0ad10..8b2a5fa5b9 100644 --- a/config/locales/co.yml +++ b/config/locales/co.yml @@ -174,6 +174,7 @@ co: statuses: Statuti subscribe: Abbunassi suspended: Suspesu + time_in_queue: 'Attesa in fila: %{time}' title: Conti unconfirmed_email: E-mail micca cunfirmatu undo_silenced: Ùn silenzà più @@ -498,6 +499,12 @@ co: body: "%{reporter} hà palisatu %{target}" body_remote: Qualch’unu da %{domain} hà palisatu %{target} subject: Novu signalamentu nant’à %{instance} (#%{id}) + appearance: + advanced_web_interface: Interfaccia web avanzata + advanced_web_interface_hint: 'S''è voi vulete fà usu di a larghezza sana di u vostru screnu, l''interfaccia web avanzata vi permette di cunfigurà parechje culonne sfarente per vede tutta l''infurmazione chì vulete vede in listessu tempu: Accolta, nutificazione, linea pubblica, è tutti l''hashtag è liste chì vulete.' + animations_and_accessibility: Animazione è accessibilità + confirmation_dialogs: Pop-up di cunfirmazione + sensitive_content: Cuntinutu sensibile application_mailer: notification_preferences: Cambià e priferenze e-mail salutation: "%{name}," @@ -778,6 +785,8 @@ co: too_many_options: ùn pò micca avè più di %{max} uzzione preferences: other: Altre + posting_defaults: Paramettri predefiniti + public_timelines: Linee pubbliche relationships: activity: Attività di u contu dormant: Inattivu diff --git a/config/locales/simple_form.co.yml b/config/locales/simple_form.co.yml index ddc9d5b501..2ca9882ef7 100644 --- a/config/locales/simple_form.co.yml +++ b/config/locales/simple_form.co.yml @@ -27,6 +27,7 @@ co: phrase: Sarà trovu senza primura di e maiuscule o di l'avertimenti scopes: L'API à quelle l'applicazione averà accessu. S'è voi selezziunate un parametru d'altu livellu, un c'hè micca bisognu di selezziunà quell'individuali. setting_aggregate_reblogs: Ùn mustrà micca e nove spartere per i statuti chì sò stati spartuti da pocu (tocca solu e spartere più ricente) + setting_default_sensitive: I media sensibili sò piattati, salvu un cambiamentu di i paramettri, è ponu esse visti cù un cliccu setting_display_media_default: Piattà i media marcati cum'è sensibili setting_display_media_hide_all: Sempre piattà tutti i media setting_display_media_show_all: Sempre affissà i media marcati cum'è sensibili @@ -131,6 +132,7 @@ co: reblog: Mandà un’e-mail quandu qualch’unu sparte i mo statuti report: Mandà un'e-mail quandu c'hè un novu signalamentu 'no': Nò + recommended: Ricumandati required: mark: "*" text: riquisiti From 2b35ddc80a106db88779e968e496aa774dcd571d Mon Sep 17 00:00:00 2001 From: ThibG Date: Fri, 7 Jun 2019 12:41:08 +0200 Subject: [PATCH 03/27] Fix display of alt-text when a media attachment is not available (#10981) --- app/javascript/styles/mastodon/components.scss | 1 - 1 file changed, 1 deletion(-) diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss index 8c9a9864d0..46bccf6096 100644 --- a/app/javascript/styles/mastodon/components.scss +++ b/app/javascript/styles/mastodon/components.scss @@ -4747,7 +4747,6 @@ a.status-card.compact:hover { display: block; text-decoration: none; color: $secondary-text-color; - line-height: 0; position: relative; z-index: 1; From b788e58ea4fca161f938174d3f00ed8904b4104a Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Fri, 7 Jun 2019 16:51:08 +0200 Subject: [PATCH 04/27] Change /settings/preferences to redirect to appearance, add /settings/preferences/other (#10988) --- app/controllers/settings/preferences/other_controller.rb | 9 +++++++++ .../settings/preferences/{ => other}/show.html.haml | 0 config/navigation.rb | 4 ++-- config/routes.rb | 6 ++++-- .../other_controller_spec.rb} | 6 +++--- 5 files changed, 18 insertions(+), 7 deletions(-) create mode 100644 app/controllers/settings/preferences/other_controller.rb rename app/views/settings/preferences/{ => other}/show.html.haml (100%) rename spec/controllers/settings/{preferences_controller_spec.rb => preferences/other_controller_spec.rb} (83%) diff --git a/app/controllers/settings/preferences/other_controller.rb b/app/controllers/settings/preferences/other_controller.rb new file mode 100644 index 0000000000..07eb89a762 --- /dev/null +++ b/app/controllers/settings/preferences/other_controller.rb @@ -0,0 +1,9 @@ +# frozen_string_literal: true + +class Settings::Preferences::OtherController < Settings::PreferencesController + private + + def after_update_redirect_path + settings_preferences_other_path + end +end diff --git a/app/views/settings/preferences/show.html.haml b/app/views/settings/preferences/other/show.html.haml similarity index 100% rename from app/views/settings/preferences/show.html.haml rename to app/views/settings/preferences/other/show.html.haml diff --git a/config/navigation.rb b/config/navigation.rb index 45e5bc562c..df10241892 100644 --- a/config/navigation.rb +++ b/config/navigation.rb @@ -10,10 +10,10 @@ SimpleNavigation::Configuration.run do |navigation| s.item :identity_proofs, safe_join([fa_icon('key fw'), t('settings.identity_proofs')]), settings_identity_proofs_path, highlights_on: %r{/settings/identity_proofs*}, if: proc { current_account.identity_proofs.exists? } end - n.item :preferences, safe_join([fa_icon('cog fw'), t('settings.preferences')]), settings_preferences_appearance_url do |s| + n.item :preferences, safe_join([fa_icon('cog fw'), t('settings.preferences')]), settings_preferences_url do |s| s.item :appearance, safe_join([fa_icon('desktop fw'), t('settings.appearance')]), settings_preferences_appearance_url s.item :notifications, safe_join([fa_icon('bell fw'), t('settings.notifications')]), settings_preferences_notifications_url - s.item :other, safe_join([fa_icon('cog fw'), t('preferences.other')]), settings_preferences_url + s.item :other, safe_join([fa_icon('cog fw'), t('preferences.other')]), settings_preferences_other_url end n.item :relationships, safe_join([fa_icon('users fw'), t('settings.relationships')]), relationships_url diff --git a/config/routes.rb b/config/routes.rb index 2b35472bd2..145079c694 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -87,15 +87,17 @@ Rails.application.routes.draw do get '/explore', to: 'directories#index', as: :explore get '/explore/:id', to: 'directories#show', as: :explore_hashtag - get '/settings', to: redirect('/settings/preferences') + get '/settings', to: redirect('/settings/profile') namespace :settings do resource :profile, only: [:show, :update] - resource :preferences, only: [:show, :update] + + get :preferences, to: redirect('/settings/preferences/appearance') namespace :preferences do resource :appearance, only: [:show, :update], controller: :appearance resource :notifications, only: [:show, :update] + resource :other, only: [:show, :update], controller: :other end resource :import, only: [:show, :create] diff --git a/spec/controllers/settings/preferences_controller_spec.rb b/spec/controllers/settings/preferences/other_controller_spec.rb similarity index 83% rename from spec/controllers/settings/preferences_controller_spec.rb rename to spec/controllers/settings/preferences/other_controller_spec.rb index f2028cf39b..1b556ac7f7 100644 --- a/spec/controllers/settings/preferences_controller_spec.rb +++ b/spec/controllers/settings/preferences/other_controller_spec.rb @@ -1,6 +1,6 @@ require 'rails_helper' -describe Settings::PreferencesController do +describe Settings::Preferences::OtherController do render_views let(:user) { Fabricate(:user, filtered_languages: []) } @@ -20,7 +20,7 @@ describe Settings::PreferencesController do it 'updates the user record' do put :update, params: { user: { locale: 'en', chosen_languages: ['es', 'fr', ''] } } - expect(response).to redirect_to(settings_preferences_path) + expect(response).to redirect_to(settings_preferences_other_path) user.reload expect(user.locale).to eq 'en' expect(user.chosen_languages).to eq ['es', 'fr'] @@ -37,7 +37,7 @@ describe Settings::PreferencesController do } } - expect(response).to redirect_to(settings_preferences_path) + expect(response).to redirect_to(settings_preferences_other_path) user.reload expect(user.settings['boost_modal']).to be true expect(user.settings['delete_modal']).to be false From 5c1a46bdcf83f156f558d7e771bc3da1eb90a646 Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Fri, 7 Jun 2019 17:15:18 +0200 Subject: [PATCH 05/27] Fix some React warnings (#10989) --- .../mastodon/components/autosuggest_textarea.js | 5 +++-- .../features/compose/components/compose_form.js | 12 +++++++----- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/app/javascript/mastodon/components/autosuggest_textarea.js b/app/javascript/mastodon/components/autosuggest_textarea.js index 4c50294bae..b070fe3e51 100644 --- a/app/javascript/mastodon/components/autosuggest_textarea.js +++ b/app/javascript/mastodon/components/autosuggest_textarea.js @@ -201,7 +201,7 @@ export default class AutosuggestTextarea extends ImmutablePureComponent { } return [ -
+
{children}
, -
+ +
{suggestions.map(this.renderSuggestion)}
diff --git a/app/javascript/mastodon/features/compose/components/compose_form.js b/app/javascript/mastodon/features/compose/components/compose_form.js index 531b288666..558b7068ba 100644 --- a/app/javascript/mastodon/features/compose/components/compose_form.js +++ b/app/javascript/mastodon/features/compose/components/compose_form.js @@ -33,10 +33,6 @@ const messages = defineMessages({ export default @injectIntl class ComposeForm extends ImmutablePureComponent { - setRef = c => { - this.composeForm = c; - }; - static contextTypes = { router: PropTypes.object, }; @@ -119,7 +115,9 @@ class ComposeForm extends ImmutablePureComponent { } handleFocus = () => { - this.composeForm.scrollIntoView(); + if (this.composeForm) { + this.composeForm.scrollIntoView(); + } } componentDidUpdate (prevProps) { @@ -163,6 +161,10 @@ class ComposeForm extends ImmutablePureComponent { this.spoilerText = c; } + setRef = c => { + this.composeForm = c; + }; + handleEmojiPick = (data) => { const { text } = this.props; const position = this.autosuggestTextarea.textarea.selectionStart; From b44ae7d2847081986d66d7a196f91849286e8de1 Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Fri, 7 Jun 2019 23:35:26 +0200 Subject: [PATCH 06/27] Fix RTL layout not being RTL within the columns area (#10990) --- app/javascript/styles/mastodon/rtl.scss | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/javascript/styles/mastodon/rtl.scss b/app/javascript/styles/mastodon/rtl.scss index a59f59f59a..58bc53b141 100644 --- a/app/javascript/styles/mastodon/rtl.scss +++ b/app/javascript/styles/mastodon/rtl.scss @@ -43,6 +43,10 @@ body.rtl { left: 10px; } + .columns-area { + direction: rtl; + } + .column-header__buttons { left: 0; right: auto; From c7feecc7151b32504e1e8d2166697d7ebf9cf9e7 Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Sat, 8 Jun 2019 10:23:41 +0200 Subject: [PATCH 07/27] Improve light theme (#10992) --- .../mastodon/features/list_timeline/index.js | 2 - .../mastodon/features/lists/index.js | 2 +- .../styles/mastodon-light/diff.scss | 280 ++++++++++++++++-- .../styles/mastodon-light/variables.scss | 2 +- .../styles/mastodon/components.scss | 49 ++- .../styles/mastodon/stream_entries.scss | 4 + app/views/accounts/show.html.haml | 2 +- 7 files changed, 290 insertions(+), 51 deletions(-) diff --git a/app/javascript/mastodon/features/list_timeline/index.js b/app/javascript/mastodon/features/list_timeline/index.js index ad7d16f95c..0db6d22282 100644 --- a/app/javascript/mastodon/features/list_timeline/index.js +++ b/app/javascript/mastodon/features/list_timeline/index.js @@ -175,8 +175,6 @@ class ListTimeline extends React.PureComponent {
- -
- } > {lists.map(list => diff --git a/app/javascript/styles/mastodon-light/diff.scss b/app/javascript/styles/mastodon-light/diff.scss index d35a598211..21b7621822 100644 --- a/app/javascript/styles/mastodon-light/diff.scss +++ b/app/javascript/styles/mastodon-light/diff.scss @@ -1,6 +1,10 @@ // Notes! // Sass color functions, "darken" and "lighten" are automatically replaced. +html { + scrollbar-color: $ui-base-color rgba($ui-base-color, 0.25); +} + // Change the colors of button texts .button { color: $white; @@ -11,18 +15,119 @@ } // Change default background colors of columns -.column { - > .scrollable { +.column > .scrollable, +.getting-started, +.column-inline-form { + background: $white; + border: 1px solid lighten($ui-base-color, 8%); + border-top: 0; +} + +.column-back-button, +.column-header { + background: $white; + border: 1px solid lighten($ui-base-color, 8%); + + &--slim-button { + border: 0; + top: -49px; + right: 1px; + } +} + +.column-header__back-button, +.column-header__button, +.column-header__button.active, +.account__header__bar { + background: $white; +} + +.column-header__button.active { + color: $ui-highlight-color; + + &:hover, + &:active, + &:focus { + color: $ui-highlight-color; background: $white; } } -.drawer__inner { +.account__header__bar .avatar .account__avatar { + border-color: $white; +} + +.getting-started__footer a { + color: $ui-secondary-color; + text-decoration: underline; +} + +.column-subheading { + background: darken($ui-base-color, 4%); + border-bottom: 1px solid lighten($ui-base-color, 8%); +} + +.getting-started, +.scrollable { + .column-link { + background: $white; + border-bottom: 1px solid lighten($ui-base-color, 8%); + + &:hover, + &:active, + &:focus { + background: $ui-base-color; + } + } +} + +.compose-form__autosuggest-wrapper, +.poll__text input[type="text"], +.compose-form .spoiler-input__input, +.compose-form__poll-wrapper select, +.search__input, +.setting-text, +.box-widget input[type="text"], +.box-widget input[type="email"], +.box-widget input[type="password"], +.box-widget textarea, +.statuses-grid .detailed-status { + border: 1px solid lighten($ui-base-color, 8%); +} + +.list-editor .search .search__input { + border-top: 0; + border-bottom: 0; +} + +.compose-form__poll-wrapper select { + background: $simple-background-color url("data:image/svg+xml;utf8,") no-repeat right 8px center / auto 16px; +} + +.compose-form__poll-wrapper, +.compose-form__poll-wrapper .poll__footer { + border-top-color: lighten($ui-base-color, 8%); +} + +.notification__filter-bar { + border: 1px solid lighten($ui-base-color, 8%); + border-top: 0; +} + +.compose-form .compose-form__buttons-wrapper { background: $ui-base-color; + border: 1px solid lighten($ui-base-color, 8%); + border-top: 0; +} + +.drawer__header, +.drawer__inner { + background: $white; + border: 1px solid lighten($ui-base-color, 8%); } .drawer__inner__mastodon { - background: $ui-base-color url('data:image/svg+xml;utf8,') no-repeat bottom / 100% auto; + background: $white url('data:image/svg+xml;utf8,') no-repeat bottom / 100% auto; } // Change the colors used in compose-form @@ -93,16 +198,16 @@ .detailed-status, .detailed-status__action-bar { - background: darken($ui-base-color, 6%); + background: $white; } // Change the background colors of status__content__spoiler-link .reply-indicator__content .status__content__spoiler-link, .status__content .status__content__spoiler-link { - background: $ui-base-lighter-color; + background: $ui-base-color; &:hover { - background: lighten($ui-base-lighter-color, 6%); + background: lighten($ui-base-color, 4%); } } @@ -112,41 +217,47 @@ background: $ui-base-color; } +.privacy-dropdown.active .privacy-dropdown__value.active .icon-button { + color: $white; +} + .account-gallery__item a { background-color: $ui-base-color; } // Change the colors used in the dropdown menu .dropdown-menu { - background: $ui-base-color; + background: $white; &__arrow { &.left { - border-left-color: $ui-base-color; + border-left-color: $white; } &.top { - border-top-color: $ui-base-color; + border-top-color: $white; } &.bottom { - border-bottom-color: $ui-base-color; + border-bottom-color: $white; } &.right { - border-right-color: $ui-base-color; + border-right-color: $white; } } &__item { a { - background: $ui-base-color; + background: $white; color: $darker-text-color; } } } // Change the text colors on inverted background +.privacy-dropdown__option.active, +.privacy-dropdown__option:hover, .privacy-dropdown__option.active .privacy-dropdown__option__content, .privacy-dropdown__option.active .privacy-dropdown__option__content strong, .privacy-dropdown__option:hover .privacy-dropdown__option__content, @@ -162,7 +273,7 @@ .actions-modal ul li:not(:empty) a:focus button, .actions-modal ul li:not(:empty) a:hover, .actions-modal ul li:not(:empty) a:hover button, -.admin-wrapper .sidebar ul li a.selected, +.admin-wrapper .sidebar ul .simple-navigation-active-leaf a, .simple_form .block-button, .simple_form .button, .simple_form button { @@ -170,7 +281,7 @@ } .dropdown-menu__separator { - border-bottom-color: lighten($ui-base-color, 12%); + border-bottom-color: lighten($ui-base-color, 4%); } // Change the background colors of modals @@ -185,6 +296,12 @@ background: $ui-base-color; } +.column-header__collapsible-inner { + background: darken($ui-base-color, 4%); + border: 1px solid lighten($ui-base-color, 8%); + border-top: 0; +} + .boost-modal__action-bar, .confirmation-modal__action-bar, .mute-modal__action-bar, @@ -239,7 +356,76 @@ border-bottom-color: lighten($ui-base-color, 8%); } +.box-widget, +.nothing-here, +.page-header, +.directory__tag > a, +.directory__tag > div, +.landing-page__call-to-action, +.contact-widget, +.landing .hero-widget__text, +.landing-page__information.contact-widget { + background: $white; + border: 1px solid lighten($ui-base-color, 8%); +} + +.landing .hero-widget__text { + border-top: 0; + border-bottom: 0; +} + +.landing .hero-widget__footer { + background: $white; + border: 1px solid lighten($ui-base-color, 8%); + border-top: 0; +} + +.brand__tagline { + color: $ui-secondary-color; +} + +.directory__tag > a { + &:hover, + &:active, + &:focus { + background: $ui-base-color; + } +} + +.directory__tag.active > a, +.directory__tag.active > div { + border-color: $ui-highlight-color; + + &, + h4, + h4 small, + .fa, + .trends__item__current { + color: $white; + } + + &:hover, + &:active, + &:focus { + background: $ui-highlight-color; + } +} + +.batch-table { + &__toolbar, + &__row, + .nothing-here { + border-color: lighten($ui-base-color, 8%); + } +} + .activity-stream { + border: 1px solid lighten($ui-base-color, 8%); + + &--under-tabs { + border-top: 0; + } + .entry { background: $account-background-color; @@ -294,6 +480,22 @@ background: rgba($error-red, 0.5); text-shadow: none; } + + .recommended { + border-color: $ui-highlight-color; + color: $ui-highlight-color; + background-color: rgba($ui-highlight-color, 0.1); + } +} + +.compose-form .compose-form__warning { + border-color: $ui-highlight-color; + background-color: rgba($ui-highlight-color, 0.1); + + &, + a { + color: $ui-highlight-color; + } } .status__content, @@ -312,14 +514,42 @@ } .public-layout { + .account__section-headline { + border: 1px solid lighten($ui-base-color, 8%); + } + .header, .public-account-header, .public-account-bio { box-shadow: none; } + .public-account-bio, + .hero-widget__text { + background: $account-background-color; + border: 1px solid lighten($ui-base-color, 8%); + } + .header { - background: lighten($ui-base-color, 12%); + background: lighten($ui-base-color, 24%); + + .nav-link { + color: $white; + + &:hover, + &:focus, + &:active { + color: $white; + } + } + + .brand { + &:hover, + &:focus, + &:active { + background: lighten($ui-base-color, 28%); + } + } } .public-account-header { @@ -331,6 +561,18 @@ } } + &__bar { + &::before { + background: $account-background-color; + border: 1px solid lighten($ui-base-color, 8%); + border-top: 0; + } + + .avatar img { + border-color: $account-background-color; + } + } + &__tabs { &__name { h1, @@ -342,6 +584,7 @@ } } +.notification__filter-bar button.active::after, .account__section-headline a.active::after { border-color: transparent transparent $white; } @@ -355,6 +598,9 @@ .activity-stream, .nothing-here, .directory__tag > a, -.directory__tag > div { +.directory__tag > div, +.card > a, +.page-header, +.compose-form .compose-form__warning { box-shadow: none; } diff --git a/app/javascript/styles/mastodon-light/variables.scss b/app/javascript/styles/mastodon-light/variables.scss index 9f6d470b13..01748148f9 100644 --- a/app/javascript/styles/mastodon-light/variables.scss +++ b/app/javascript/styles/mastodon-light/variables.scss @@ -17,7 +17,7 @@ $ui-base-color: $classic-secondary-color !default; $ui-base-lighter-color: #b0c0cf; $ui-primary-color: #9bcbed; $ui-secondary-color: $classic-base-color !default; -$ui-highlight-color: #2b5fd9; +$ui-highlight-color: #2b90d9; $primary-text-color: $black !default; $darker-text-color: $classic-base-color !default; diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss index 46bccf6096..32314137c9 100644 --- a/app/javascript/styles/mastodon/components.scss +++ b/app/javascript/styles/mastodon/components.scss @@ -2212,17 +2212,6 @@ a.account__display-name { height: calc(100% - 10px); overflow-y: hidden; - .search__input { - line-height: 18px; - font-size: 16px; - padding: 15px; - padding-right: 30px; - } - - .search__icon .fa { - top: 15px; - } - .navigation-bar { padding-top: 20px; padding-bottom: 20px; @@ -2709,21 +2698,22 @@ a.account__display-name { } .setting-text { - color: $darker-text-color; - background: transparent; - border: 0; - border-bottom: 2px solid $ui-primary-color; - box-sizing: border-box; display: block; - font-family: inherit; - margin-bottom: 10px; - padding: 7px 0; + box-sizing: border-box; width: 100%; + margin: 0; + color: $inverted-text-color; + background: $simple-background-color; + padding: 10px; + font-family: inherit; + font-size: 14px; + resize: vertical; + border: 0; + outline: 0; + border-radius: 4px; - &:focus, - &:active { - color: $primary-text-color; - border-bottom-color: $highlight-text-color; + &:focus { + outline: 0; } @media screen and (max-width: 600px) { @@ -3895,8 +3885,10 @@ a.status-card.compact:hover { @include search-input; display: block; - padding: 10px; + padding: 15px; padding-right: 30px; + line-height: 18px; + font-size: 16px; } .search__icon { @@ -3911,7 +3903,7 @@ a.status-card.compact:hover { .fa { position: absolute; - top: 10px; + top: 15px; right: 10px; z-index: 2; display: inline-block; @@ -5473,8 +5465,8 @@ noscript { } .column-inline-form { - padding: 7px 15px; - padding-right: 5px; + padding: 15px; + padding-right: 0; display: flex; justify-content: flex-start; align-items: center; @@ -5485,7 +5477,6 @@ noscript { input { width: 100%; - margin-bottom: 6px; &:focus { outline: 0; @@ -5495,7 +5486,7 @@ noscript { .icon-button { flex: 0 0 auto; - margin: 0 5px; + margin: 0 10px; } } diff --git a/app/javascript/styles/mastodon/stream_entries.scss b/app/javascript/styles/mastodon/stream_entries.scss index bfbb907e03..19ce0ab8f0 100644 --- a/app/javascript/styles/mastodon/stream_entries.scss +++ b/app/javascript/styles/mastodon/stream_entries.scss @@ -4,6 +4,10 @@ overflow: hidden; margin-bottom: 10px; + &--under-tabs { + border-radius: 0 0 4px 4px; + } + @media screen and (max-width: $no-gap-breakpoint) { margin-bottom: 0; border-radius: 0; diff --git a/app/views/accounts/show.html.haml b/app/views/accounts/show.html.haml index e4223119cb..950e618477 100644 --- a/app/views/accounts/show.html.haml +++ b/app/views/accounts/show.html.haml @@ -38,7 +38,7 @@ - elsif @statuses.empty? = nothing_here 'nothing-here--under-tabs' - else - .activity-stream + .activity-stream.activity-stream--under-tabs - if params[:page].to_i.zero? = render partial: 'stream_entries/status', collection: @pinned_statuses, as: :status, locals: { pinned: true } From 73e610790e9c320856263ff4c20c3a26ba060573 Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Sat, 8 Jun 2019 15:30:06 +0200 Subject: [PATCH 08/27] Change full logo to use primary text color of the given theme (#10994) * Change full logo to use primary text color of the given theme * Fix colors of public layout header in light theme --- app/helpers/stream_entries_helper.rb | 4 ++++ app/javascript/images/logo_full.svg | 2 +- app/javascript/styles/mastodon-light/diff.scss | 15 +++------------ app/javascript/styles/mastodon/about.scss | 3 ++- app/javascript/styles/mastodon/containers.scss | 6 ++++-- app/views/about/show.html.haml | 2 +- app/views/layouts/application.html.haml | 1 + app/views/layouts/auth.html.haml | 2 +- app/views/layouts/public.html.haml | 2 +- 9 files changed, 18 insertions(+), 19 deletions(-) diff --git a/app/helpers/stream_entries_helper.rb b/app/helpers/stream_entries_helper.rb index a66fb83ea4..02a860a748 100644 --- a/app/helpers/stream_entries_helper.rb +++ b/app/helpers/stream_entries_helper.rb @@ -38,6 +38,10 @@ module StreamEntriesHelper content_tag(:svg, tag(:use, 'xlink:href' => '#mastodon-svg-logo'), 'viewBox' => '0 0 216.4144 232.00976') end + def svg_logo_full + content_tag(:svg, tag(:use, 'xlink:href' => '#mastodon-svg-logo-full'), 'viewBox' => '0 0 713.35878 175.8678') + end + def account_badge(account, all: false) if account.bot? content_tag(:div, content_tag(:div, t('accounts.roles.bot'), class: 'account-role bot'), class: 'roles') diff --git a/app/javascript/images/logo_full.svg b/app/javascript/images/logo_full.svg index c33883342d..03bcf93e39 100644 --- a/app/javascript/images/logo_full.svg +++ b/app/javascript/images/logo_full.svg @@ -1 +1 @@ - + diff --git a/app/javascript/styles/mastodon-light/diff.scss b/app/javascript/styles/mastodon-light/diff.scss index 21b7621822..b6c95fe6a1 100644 --- a/app/javascript/styles/mastodon-light/diff.scss +++ b/app/javascript/styles/mastodon-light/diff.scss @@ -531,23 +531,14 @@ html { } .header { - background: lighten($ui-base-color, 24%); - - .nav-link { - color: $white; - - &:hover, - &:focus, - &:active { - color: $white; - } - } + background: $ui-base-color; + border: 1px solid lighten($ui-base-color, 8%); .brand { &:hover, &:focus, &:active { - background: lighten($ui-base-color, 28%); + background: lighten($ui-base-color, 4%); } } } diff --git a/app/javascript/styles/mastodon/about.scss b/app/javascript/styles/mastodon/about.scss index d3b4a59098..61637ce967 100644 --- a/app/javascript/styles/mastodon/about.scss +++ b/app/javascript/styles/mastodon/about.scss @@ -659,7 +659,8 @@ $small-breakpoint: 960px; align-items: center; padding: 50px; - img { + svg { + fill: $primary-text-color; height: 52px; } diff --git a/app/javascript/styles/mastodon/containers.scss b/app/javascript/styles/mastodon/containers.scss index 2d68d2b706..3564bf07b4 100644 --- a/app/javascript/styles/mastodon/containers.scss +++ b/app/javascript/styles/mastodon/containers.scss @@ -21,7 +21,8 @@ justify-content: center; align-items: center; - img { + svg { + fill: $primary-text-color; height: 42px; margin-right: 10px; } @@ -256,12 +257,13 @@ display: block; padding: 15px; - img { + svg { display: block; height: 18px; width: auto; position: relative; bottom: -2px; + fill: $primary-text-color; @media screen and (max-width: $no-gap-breakpoint) { height: 20px; diff --git a/app/views/about/show.html.haml b/app/views/about/show.html.haml index 45e5f0717b..f24f4e1957 100644 --- a/app/views/about/show.html.haml +++ b/app/views/about/show.html.haml @@ -8,7 +8,7 @@ .landing .landing__brand = link_to root_url, class: 'brand' do - = image_pack_tag 'logo_full.svg', alt: 'Mastodon' + = svg_logo_full %span.brand__tagline=t 'about.tagline' .landing__grid diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml index 220a4ca9bd..747d80bf02 100755 --- a/app/views/layouts/application.html.haml +++ b/app/views/layouts/application.html.haml @@ -36,3 +36,4 @@ %div{ style: 'display: none'} = render file: Rails.root.join('app', 'javascript', 'images', 'logo_transparent.svg') + = render file: Rails.root.join('app', 'javascript', 'images', 'logo_full.svg') diff --git a/app/views/layouts/auth.html.haml b/app/views/layouts/auth.html.haml index aa1990972a..585e246557 100644 --- a/app/views/layouts/auth.html.haml +++ b/app/views/layouts/auth.html.haml @@ -6,7 +6,7 @@ .logo-container %h1 = link_to root_path do - = image_pack_tag 'logo_full.svg', alt: 'Mastodon' + = svg_logo_full .form-container = render 'flashes' diff --git a/app/views/layouts/public.html.haml b/app/views/layouts/public.html.haml index ee34936d67..2929ac599c 100644 --- a/app/views/layouts/public.html.haml +++ b/app/views/layouts/public.html.haml @@ -8,7 +8,7 @@ %nav.header .nav-left = link_to root_url, class: 'brand' do - = image_pack_tag 'logo_full.svg', alt: 'Mastodon' + = svg_logo_full = link_to t('directories.directory'), explore_path, class: 'nav-link optional' if Setting.profile_directory = link_to t('about.about_this'), about_more_path, class: 'nav-link optional' From 21acf681d290c7dcab03b88e8ff1adad305d7a10 Mon Sep 17 00:00:00 2001 From: ThibG Date: Sat, 8 Jun 2019 17:40:59 +0200 Subject: [PATCH 09/27] Put poll options behind content warnings (#10983) * Put poll options behind CWs in WebUI * Put polls behind CWs on public pages * Add poll icon to public pages CWs * Revert to not showing an icon in the CW button --- app/javascript/mastodon/components/status.js | 5 +---- .../mastodon/components/status_content.js | 19 ++++++++++++++++--- .../status/components/detailed_status.js | 5 +---- app/javascript/packs/public.js | 8 ++++---- .../stream_entries/_detailed_status.html.haml | 13 +++++++------ .../stream_entries/_simple_status.html.haml | 13 +++++++------ 6 files changed, 36 insertions(+), 27 deletions(-) diff --git a/app/javascript/mastodon/components/status.js b/app/javascript/mastodon/components/status.js index 6e944dc9eb..a795b8ce9e 100644 --- a/app/javascript/mastodon/components/status.js +++ b/app/javascript/mastodon/components/status.js @@ -16,7 +16,6 @@ import { MediaGallery, Video } from '../features/ui/util/async-components'; import { HotKeys } from 'react-hotkeys'; import classNames from 'classnames'; import Icon from 'mastodon/components/icon'; -import PollContainer from 'mastodon/containers/poll_container'; import { displayMedia } from '../initial_state'; // We use the component (and not the container) since we do not want @@ -321,9 +320,7 @@ class Status extends ImmutablePureComponent { status = status.get('reblog'); } - if (status.get('poll')) { - media = ; - } else if (status.get('media_attachments').size > 0) { + if (status.get('media_attachments').size > 0) { if (this.props.muted) { media = ( + + {!hidden && !!status.get('poll') && }
); } else if (this.props.onClick) { @@ -212,9 +215,13 @@ export default class StatusContent extends React.PureComponent { output.push(readMoreButton); } + if (status.get('poll')) { + output.push(); + } + return output; } else { - return ( + const output = [
- ); + />, + ]; + + if (status.get('poll')) { + output.push(); + } + + return output; } } diff --git a/app/javascript/mastodon/features/status/components/detailed_status.js b/app/javascript/mastodon/features/status/components/detailed_status.js index 9089eb303f..c7aa4d0330 100644 --- a/app/javascript/mastodon/features/status/components/detailed_status.js +++ b/app/javascript/mastodon/features/status/components/detailed_status.js @@ -13,7 +13,6 @@ import Video from '../../video'; import scheduleIdleTask from '../../ui/util/schedule_idle_task'; import classNames from 'classnames'; import Icon from 'mastodon/components/icon'; -import PollContainer from 'mastodon/containers/poll_container'; export default class DetailedStatus extends ImmutablePureComponent { @@ -107,9 +106,7 @@ export default class DetailedStatus extends ImmutablePureComponent { outerStyle.height = `${this.state.height}px`; } - if (status.get('poll')) { - media = ; - } else if (status.get('media_attachments').size > 0) { + if (status.get('media_attachments').size > 0) { if (status.getIn(['media_attachments', 0, 'type']) === 'video') { const video = status.getIn(['media_attachments', 0]); diff --git a/app/javascript/packs/public.js b/app/javascript/packs/public.js index 93379cdb3e..3135636cfb 100644 --- a/app/javascript/packs/public.js +++ b/app/javascript/packs/public.js @@ -126,15 +126,15 @@ function main() { return false; }); - delegate(document, '.status__content__spoiler-link', 'click', ({ target }) => { - const contentEl = target.parentNode.parentNode.querySelector('.e-content'); + delegate(document, '.status__content__spoiler-link', 'click', function() { + const contentEl = this.parentNode.parentNode.querySelector('.e-content'); if (contentEl.style.display === 'block') { contentEl.style.display = 'none'; - target.parentNode.style.marginBottom = 0; + this.parentNode.style.marginBottom = 0; } else { contentEl.style.display = 'block'; - target.parentNode.style.marginBottom = null; + this.parentNode.style.marginBottom = null; } return false; diff --git a/app/views/stream_entries/_detailed_status.html.haml b/app/views/stream_entries/_detailed_status.html.haml index 23f2920d89..95b96feef1 100644 --- a/app/views/stream_entries/_detailed_status.html.haml +++ b/app/views/stream_entries/_detailed_status.html.haml @@ -19,13 +19,14 @@ - if status.spoiler_text? %p{ :style => ('margin-bottom: 0' unless current_account&.user&.setting_expand_spoilers) }< %span.p-summary> #{Formatter.instance.format_spoiler(status, autoplay: autoplay)}  - %a.status__content__spoiler-link{ href: '#' }= t('statuses.show_more') - .e-content{ lang: status.language, style: "display: #{!current_account&.user&.setting_expand_spoilers && status.spoiler_text? ? 'none' : 'block'}; direction: #{rtl_status?(status) ? 'rtl' : 'ltr'}" }= Formatter.instance.format(status, custom_emojify: true, autoplay: autoplay) + %button.status__content__spoiler-link= t('statuses.show_more') + .e-content{ lang: status.language, style: "display: #{!current_account&.user&.setting_expand_spoilers && status.spoiler_text? ? 'none' : 'block'}; direction: #{rtl_status?(status) ? 'rtl' : 'ltr'}" } + = Formatter.instance.format(status, custom_emojify: true, autoplay: autoplay) + - if status.preloadable_poll + = react_component :poll, disabled: true, poll: ActiveModelSerializers::SerializableResource.new(status.preloadable_poll, serializer: REST::PollSerializer, scope: current_user, scope_name: :current_user).as_json do + = render partial: 'stream_entries/poll', locals: { status: status, poll: status.preloadable_poll, autoplay: autoplay } - - if status.preloadable_poll - = react_component :poll, disabled: true, poll: ActiveModelSerializers::SerializableResource.new(status.preloadable_poll, serializer: REST::PollSerializer, scope: current_user, scope_name: :current_user).as_json do - = render partial: 'stream_entries/poll', locals: { status: status, poll: status.preloadable_poll, autoplay: autoplay } - - elsif !status.media_attachments.empty? + - if !status.media_attachments.empty? - if status.media_attachments.first.video? - video = status.media_attachments.first = react_component :video, src: video.file.url(:original), preview: video.file.url(:small), blurhash: video.blurhash, sensitive: !current_account&.user&.show_all_media? && status.sensitive? || current_account&.user&.hide_all_media?, width: 670, height: 380, detailed: true, inline: true, alt: video.description do diff --git a/app/views/stream_entries/_simple_status.html.haml b/app/views/stream_entries/_simple_status.html.haml index 0df7497e10..0f9c65af0b 100644 --- a/app/views/stream_entries/_simple_status.html.haml +++ b/app/views/stream_entries/_simple_status.html.haml @@ -23,13 +23,14 @@ - if status.spoiler_text? %p{ :style => ('margin-bottom: 0' unless current_account&.user&.setting_expand_spoilers) }< %span.p-summary> #{Formatter.instance.format_spoiler(status, autoplay: autoplay)}  - %a.status__content__spoiler-link{ href: '#' }= t('statuses.show_more') - .e-content{ lang: status.language, style: "display: #{!current_account&.user&.setting_expand_spoilers && status.spoiler_text? ? 'none' : 'block'}; direction: #{rtl_status?(status) ? 'rtl' : 'ltr'}" }= Formatter.instance.format(status, custom_emojify: true, autoplay: autoplay) + %button.status__content__spoiler-link= t('statuses.show_more') + .e-content{ lang: status.language, style: "display: #{!current_account&.user&.setting_expand_spoilers && status.spoiler_text? ? 'none' : 'block'}; direction: #{rtl_status?(status) ? 'rtl' : 'ltr'}" } + = Formatter.instance.format(status, custom_emojify: true, autoplay: autoplay) + - if status.preloadable_poll + = react_component :poll, disabled: true, poll: ActiveModelSerializers::SerializableResource.new(status.preloadable_poll, serializer: REST::PollSerializer, scope: current_user, scope_name: :current_user).as_json do + = render partial: 'stream_entries/poll', locals: { status: status, poll: status.preloadable_poll, autoplay: autoplay } - - if status.preloadable_poll - = react_component :poll, disabled: true, poll: ActiveModelSerializers::SerializableResource.new(status.preloadable_poll, serializer: REST::PollSerializer, scope: current_user, scope_name: :current_user).as_json do - = render partial: 'stream_entries/poll', locals: { status: status, poll: status.preloadable_poll, autoplay: autoplay } - - elsif !status.media_attachments.empty? + - if !status.media_attachments.empty? - if status.media_attachments.first.video? - video = status.media_attachments.first = react_component :video, src: video.file.url(:original), preview: video.file.url(:small), blurhash: video.blurhash, sensitive: !current_account&.user&.show_all_media? && status.sensitive? || current_account&.user&.hide_all_media?, width: 610, height: 343, inline: true, alt: video.description do From 2d601a278c2e5defc5e0996197b2e944e548754e Mon Sep 17 00:00:00 2001 From: Aditoo17 <42938951+Aditoo17@users.noreply.github.com> Date: Sat, 8 Jun 2019 17:58:40 +0200 Subject: [PATCH 10/27] =?UTF-8?q?I18n:=20Update=20Czech=20translation=20?= =?UTF-8?q?=F0=9F=87=A8=F0=9F=87=BF=20(#10995)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * I18n: Update Czech translation * Fix * Re-fix * And also this * The real fix now (hopefully) --- app/javascript/mastodon/locales/cs.json | 2 ++ config/locales/cs.yml | 9 +++++++++ config/locales/simple_form.cs.yml | 2 ++ 3 files changed, 13 insertions(+) diff --git a/app/javascript/mastodon/locales/cs.json b/app/javascript/mastodon/locales/cs.json index 5dd9773748..1bd2ae84d5 100644 --- a/app/javascript/mastodon/locales/cs.json +++ b/app/javascript/mastodon/locales/cs.json @@ -204,6 +204,7 @@ "keyboard_shortcuts.search": "k zaměření na hledání", "keyboard_shortcuts.start": "k otevření sloupce „začínáme“", "keyboard_shortcuts.toggle_hidden": "k zobrazení/skrytí textu za varováním o obsahu", + "keyboard_shortcuts.toggle_sensitivity": "k zobrazení/skrytí médií", "keyboard_shortcuts.toot": "k napsání úplně nového tootu", "keyboard_shortcuts.unfocus": "ke zrušení zaměření na psací prostor/hledání", "keyboard_shortcuts.up": "k posunutí nahoru v seznamu", @@ -245,6 +246,7 @@ "navigation_bar.personal": "Osobní", "navigation_bar.pins": "Připnuté tooty", "navigation_bar.preferences": "Předvolby", + "navigation_bar.profile_directory": "Adresář profilů", "navigation_bar.public_timeline": "Federovaná časová osa", "navigation_bar.security": "Zabezpečení", "notification.favourite": "{name} si oblíbil/a váš toot", diff --git a/config/locales/cs.yml b/config/locales/cs.yml index bc14000502..b9cc3ee7c9 100644 --- a/config/locales/cs.yml +++ b/config/locales/cs.yml @@ -178,6 +178,7 @@ cs: statuses: Tooty subscribe: Odebírat suspended: Pozastaven/a + time_in_queue: Čeká ve frontě %{time} title: Účty unconfirmed_email: Nepotvrzený e-mail undo_silenced: Zrušit utišení @@ -504,6 +505,12 @@ cs: body: "%{reporter} nahlásil/a uživatele %{target}" body_remote: Někdo z %{domain} nahlásil uživatele %{target} subject: Nové nahlášení pro %{instance} (#%{id}) + appearance: + advanced_web_interface: Pokročilé webové rozhraní + advanced_web_interface_hint: 'Chcete-li využít celé šířky vaší obrazovky, dovolí vám pokročilé webové rozhraní nastavit si mnoho různých sloupců, takže můžete vidět ve stejnou chvíli tolik informací, kolik chcete: domovskou časovou osu, oznámení, federovanou časovou osu a libovolný počet seznamů a hashtagů.' + animations_and_accessibility: Animace a přístupnost + confirmation_dialogs: Potvrzovací dialogy + sensitive_content: Citlivý obsah application_mailer: notification_preferences: Změnit volby e-mailu salutation: "%{name}," @@ -789,6 +796,8 @@ cs: too_many_options: nesmí obsahovat více než %{max} položky preferences: other: Ostatní + posting_defaults: Výchozí možnosti psaní + public_timelines: Veřejné časové osy relationships: activity: Aktivita účtu dormant: Nečinné diff --git a/config/locales/simple_form.cs.yml b/config/locales/simple_form.cs.yml index 521b02c44b..3bf74e9718 100644 --- a/config/locales/simple_form.cs.yml +++ b/config/locales/simple_form.cs.yml @@ -27,6 +27,7 @@ cs: phrase: Shoda bude nalezena bez ohledu na velikost písmen v těle tootu či varování o obsahu scopes: Která API bude aplikaci povoleno používat. Pokud vyberete rozsah nejvyššího stupně, nebudete je muset vybírat jednotlivě. setting_aggregate_reblogs: Nezobrazovat nové boosty pro tooty, které byly nedávno boostnuty (ovlivňuje pouze nově přijaté boosty) + setting_default_sensitive: Citlivá média jsou ve výchozím stavu skryta a mohou být zobrazena kliknutím setting_display_media_default: Skrývat média označená jako citlivá setting_display_media_hide_all: Vždy skrývat všechna média setting_display_media_show_all: Vždy zobrazovat média označená jako citlivá @@ -131,6 +132,7 @@ cs: reblog: Posílat e-maily, když někdo boostne váš toot report: Posílat e-maily, je-li odesláno nové nahlášení 'no': Ne + recommended: Doporučeno required: mark: "*" text: požadováno From 66ec27e0c8e97229321edcac7c357cc6e702559e Mon Sep 17 00:00:00 2001 From: Darius Kazemi Date: Sat, 8 Jun 2019 11:43:11 -0500 Subject: [PATCH 11/27] Specify gzip required in tootctl emoji help (#11000) --- lib/mastodon/emoji_cli.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/mastodon/emoji_cli.rb b/lib/mastodon/emoji_cli.rb index 32827dd456..97a822e455 100644 --- a/lib/mastodon/emoji_cli.rb +++ b/lib/mastodon/emoji_cli.rb @@ -15,9 +15,9 @@ module Mastodon option :suffix option :overwrite, type: :boolean option :unlisted, type: :boolean - desc 'import PATH', 'Import emoji from a TAR archive at PATH' + desc 'import PATH', 'Import emoji from a TAR GZIP archive at PATH' long_desc <<-LONG_DESC - Imports custom emoji from a TAR archive specified by PATH. + Imports custom emoji from a TAR GZIP archive specified by PATH. Existing emoji will be skipped unless the --overwrite option is provided, in which case they will be overwritten. From 0984e09538546f09623d6e7b286f9894b1700085 Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Sat, 8 Jun 2019 22:32:59 +0200 Subject: [PATCH 12/27] Fix more issues in the light theme (#10996) * Fix tabs bar in light theme * Fix borders on small screens in light theme --- .../styles/mastodon-light/diff.scss | 105 ++++++++++++++++++ .../styles/mastodon/components.scss | 6 +- 2 files changed, 108 insertions(+), 3 deletions(-) diff --git a/app/javascript/styles/mastodon-light/diff.scss b/app/javascript/styles/mastodon-light/diff.scss index b6c95fe6a1..ee8a7d265a 100644 --- a/app/javascript/styles/mastodon-light/diff.scss +++ b/app/javascript/styles/mastodon-light/diff.scss @@ -28,6 +28,10 @@ html { background: $white; border: 1px solid lighten($ui-base-color, 8%); + @media screen and (max-width: $no-gap-breakpoint) { + border-top: 0; + } + &--slim-button { border: 0; top: -49px; @@ -81,6 +85,15 @@ html { } } +.getting-started .navigation-bar { + border-top: 1px solid lighten($ui-base-color, 8%); + border-bottom: 1px solid lighten($ui-base-color, 8%); + + @media screen and (max-width: $no-gap-breakpoint) { + border-top: 0; + } +} + .compose-form__autosuggest-wrapper, .poll__text input[type="text"], .compose-form .spoiler-input__input, @@ -95,6 +108,13 @@ html { border: 1px solid lighten($ui-base-color, 8%); } +.search__input { + @media screen and (max-width: $no-gap-breakpoint) { + border-top: 0; + border-bottom: 0; + } +} + .list-editor .search .search__input { border-top: 0; border-bottom: 0; @@ -350,6 +370,37 @@ html { background: $white; } +.tabs-bar { + background: $white; + border: 1px solid lighten($ui-base-color, 8%); + border-bottom: 0; + + @media screen and (max-width: $no-gap-breakpoint) { + border-top: 0; + } + + &__link { + padding-bottom: 14px; + border-bottom-width: 1px; + border-bottom-color: lighten($ui-base-color, 8%); + + &:hover, + &:active, + &:focus { + background: $ui-base-color; + } + + &.active { + &:hover, + &:active, + &:focus { + background: transparent; + border-bottom-color: $ui-highlight-color; + } + } + } +} + // Change the default colors used on some parts of the profile pages .activity-stream-tabs { background: $account-background-color; @@ -367,6 +418,12 @@ html { .landing-page__information.contact-widget { background: $white; border: 1px solid lighten($ui-base-color, 8%); + + @media screen and (max-width: $no-gap-breakpoint) { + border-left: 0; + border-right: 0; + border-top: 0; + } } .landing .hero-widget__text { @@ -374,10 +431,26 @@ html { border-bottom: 0; } +.simple_form { + input[type=text], + input[type=number], + input[type=email], + input[type=password], + textarea { + &:hover { + border-color: lighten($ui-base-color, 12%); + } + } +} + .landing .hero-widget__footer { background: $white; border: 1px solid lighten($ui-base-color, 8%); border-top: 0; + + @media screen and (max-width: $no-gap-breakpoint) { + border: 0; + } } .brand__tagline { @@ -390,6 +463,10 @@ html { &:focus { background: $ui-base-color; } + + @media screen and (max-width: $no-gap-breakpoint) { + border: 0; + } } .directory__tag.active > a, @@ -516,6 +593,10 @@ html { .public-layout { .account__section-headline { border: 1px solid lighten($ui-base-color, 8%); + + @media screen and (max-width: $no-gap-breakpoint) { + border-top: 0; + } } .header, @@ -534,6 +615,10 @@ html { background: $ui-base-color; border: 1px solid lighten($ui-base-color, 8%); + @media screen and (max-width: $no-gap-breakpoint) { + border: 0; + } + .brand { &:hover, &:focus, @@ -562,6 +647,12 @@ html { .avatar img { border-color: $account-background-color; } + + @media screen and (max-width: $no-columns-breakpoint) { + background: $account-background-color; + border: 1px solid lighten($ui-base-color, 8%); + border-top: 0; + } } &__tabs { @@ -569,9 +660,23 @@ html { h1, h1 small { color: $white; + + @media screen and (max-width: $no-columns-breakpoint) { + color: $primary-text-color; + } } } } + + &__extra { + .public-account-bio { + border: 0; + } + + .public-account-bio .account__header__fields { + border-color: lighten($ui-base-color, 8%); + } + } } } diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss index 32314137c9..c91c1eedc5 100644 --- a/app/javascript/styles/mastodon/components.scss +++ b/app/javascript/styles/mastodon/components.scss @@ -1839,7 +1839,7 @@ a.account__display-name { display: flex; flex-direction: column; - @media screen and (min-width: 360px) { + @media screen and (min-width: $no-gap-breakpoint) { padding: 0 10px; } } @@ -2021,7 +2021,7 @@ a.account__display-name { top: 15px; } - @media screen and (min-width: 360px) { + @media screen and (min-width: $no-gap-breakpoint) { padding: 10px 0; } @@ -2135,7 +2135,7 @@ a.account__display-name { } } -@media screen and (min-width: 360px) { +@media screen and (min-width: $no-gap-breakpoint) { .tabs-bar { margin: 10px auto; margin-bottom: 0; From df11f10efd6194929ea8ac07943b3fa5339f1ea6 Mon Sep 17 00:00:00 2001 From: spla Date: Sun, 9 Jun 2019 01:32:22 +0200 Subject: [PATCH 13/27] i18n: Update Catalan translations (#10998) * Updated Catalan strings * Update ca.yml * Update ca.yml * Update ca.yml * Update ca.yml * Update ca.yml * Update ca.yml * Update ca.yml * Update simple_form.ca.yml * Update simple_form.ca.yml * Update simple_form.ca.yml * bundle exec i18n-tasks * Update ca.json * Update simple_form.ca.yml * i18n: Update Catalan translations * i18n: Update Catalan translations * i18n: Update Catalan translations * i18n: Update Catalan translations * i18n: Update Catalan translations * i18n: Update Catalan translations * i18n: Update Catalan translations * i18n: Update Catalan translations * i18n: Update Catalan translations * i18n: Update Catalan translation * i18n Update Catalan translation * i18n: Update Catalan translations * i18n: Update Catalan translations --- app/javascript/mastodon/locales/ca.json | 2 ++ config/locales/ca.yml | 9 +++++++++ 2 files changed, 11 insertions(+) diff --git a/app/javascript/mastodon/locales/ca.json b/app/javascript/mastodon/locales/ca.json index 0cafb11203..6499ee92f1 100644 --- a/app/javascript/mastodon/locales/ca.json +++ b/app/javascript/mastodon/locales/ca.json @@ -204,6 +204,7 @@ "keyboard_shortcuts.search": "per centrar la cerca", "keyboard_shortcuts.start": "per obrir la columna \"Començar\"", "keyboard_shortcuts.toggle_hidden": "per a mostrar/amagar text sota CW", + "keyboard_shortcuts.toggle_sensitivity": "per a mostrar/amagar mèdia", "keyboard_shortcuts.toot": "per a començar un toot nou de trinca", "keyboard_shortcuts.unfocus": "descentrar l'area de composició de text/cerca", "keyboard_shortcuts.up": "moure amunt en la llista", @@ -236,6 +237,7 @@ "navigation_bar.favourites": "Favorits", "navigation_bar.filters": "Paraules silenciades", "navigation_bar.follow_requests": "Sol·licituds de seguiment", + "navigation_bar.follows_and_followers": "Seguits i seguidors", "navigation_bar.info": "Sobre aquest servidor", "navigation_bar.keyboard_shortcuts": "Dreceres de teclat", "navigation_bar.lists": "Llistes", diff --git a/config/locales/ca.yml b/config/locales/ca.yml index d7cc8dfb15..5663afeab5 100644 --- a/config/locales/ca.yml +++ b/config/locales/ca.yml @@ -174,6 +174,7 @@ ca: statuses: Estats subscribe: Subscriu suspended: Suspès + time_in_queue: Esperant en la cua %{time} title: Comptes unconfirmed_email: Correu electrònic sense confirmar undo_silenced: Deixa de silenciar @@ -498,6 +499,12 @@ ca: body: "%{reporter} ha informat de %{target}" body_remote: Algú des de el domini %{domain} ha informat sobre %{target} subject: Informe nou per a %{instance} (#%{id}) + appearance: + advanced_web_interface: Interfície web avançada + advanced_web_interface_hint: 'Si vols fer ús de tota l''amplada de la teva pantalla, l''interfície web avançada et permet configurar diverses columnes per a veure molta més informació al mateix temps: Inici, notificacions, línia de temps federada i qualsevol número de llistes i etiquetes.' + animations_and_accessibility: Animacions i accessibilitat + confirmation_dialogs: Diàlegs de confirmació + sensitive_content: Contingut sensible application_mailer: notification_preferences: Canvia les preferències de correu salutation: "%{name}," @@ -778,6 +785,8 @@ ca: too_many_options: no pot contenir més de %{max} opcions preferences: other: Altre + posting_defaults: Valors predeterminats de publicació + public_timelines: Línies de temps públiques relationships: activity: Activitat del compte dormant: Inactiu From f698e288038471ad74488f2f1269d62c173c96f8 Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Sun, 9 Jun 2019 01:59:42 +0200 Subject: [PATCH 14/27] Fix position of search icon (#11003) --- app/javascript/styles/mastodon/components.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss index c91c1eedc5..1093bf54fc 100644 --- a/app/javascript/styles/mastodon/components.scss +++ b/app/javascript/styles/mastodon/components.scss @@ -3903,7 +3903,7 @@ a.status-card.compact:hover { .fa { position: absolute; - top: 15px; + top: 16px; right: 10px; z-index: 2; display: inline-block; @@ -3933,7 +3933,7 @@ a.status-card.compact:hover { } .fa-times-circle { - top: 11px; + top: 17px; transform: rotate(0deg); color: $action-button-color; cursor: pointer; From aed4fa02f1d638e5ffa64480d1351632a7e63750 Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Sun, 9 Jun 2019 12:47:33 +0200 Subject: [PATCH 15/27] Change priority of delete activity forwards for replies and reblogs (#11002) Fix #11001 --- app/lib/activitypub/activity/delete.rb | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/app/lib/activitypub/activity/delete.rb b/app/lib/activitypub/activity/delete.rb index 4236af0714..0eb14b89ce 100644 --- a/app/lib/activitypub/activity/delete.rb +++ b/app/lib/activitypub/activity/delete.rb @@ -45,7 +45,7 @@ class ActivityPub::Activity::Delete < ActivityPub::Activity rebloggers_ids = @status.reblogs.includes(:account).references(:account).merge(Account.local).pluck(:account_id) inboxes = Account.where(id: ::Follow.where(target_account_id: rebloggers_ids).select(:account_id)).inboxes - [@account.preferred_inbox_url] - ActivityPub::DeliveryWorker.push_bulk(inboxes) do |inbox_url| + ActivityPub::LowPriorityDeliveryWorker.push_bulk(inboxes) do |inbox_url| [payload, rebloggers_ids.first, inbox_url] end end @@ -61,7 +61,12 @@ class ActivityPub::Activity::Delete < ActivityPub::Activity def forward_for_reply return unless @json['signature'].present? && reply_to_local? - ActivityPub::RawDistributionWorker.perform_async(Oj.dump(@json), replied_to_status.account_id, [@account.preferred_inbox_url]) + + inboxes = replied_to_status.account.followers.inboxes - [@account.preferred_inbox_url] + + ActivityPub::LowPriorityDeliveryWorker.push_bulk(inboxes) do |inbox_url| + [payload, replied_to_status.account_id, inbox_url] + end end def delete_now! From 035755bf96c1df0e129bf341a4803458e9942d34 Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Sun, 9 Jun 2019 15:52:42 +0200 Subject: [PATCH 16/27] Run yarn manage:translations (#11008) --- app/javascript/mastodon/locales/ar.json | 3 +++ app/javascript/mastodon/locales/ast.json | 3 +++ app/javascript/mastodon/locales/bg.json | 3 +++ app/javascript/mastodon/locales/bn.json | 3 +++ app/javascript/mastodon/locales/ca.json | 1 + app/javascript/mastodon/locales/co.json | 1 + app/javascript/mastodon/locales/cy.json | 3 +++ app/javascript/mastodon/locales/da.json | 3 +++ app/javascript/mastodon/locales/de.json | 3 +++ app/javascript/mastodon/locales/defaultMessages.json | 4 ++++ app/javascript/mastodon/locales/el.json | 3 +++ app/javascript/mastodon/locales/en.json | 1 + app/javascript/mastodon/locales/eo.json | 3 +++ app/javascript/mastodon/locales/es.json | 3 +++ app/javascript/mastodon/locales/eu.json | 3 +++ app/javascript/mastodon/locales/fa.json | 3 +++ app/javascript/mastodon/locales/fi.json | 3 +++ app/javascript/mastodon/locales/fr.json | 3 +++ app/javascript/mastodon/locales/gl.json | 3 +++ app/javascript/mastodon/locales/he.json | 3 +++ app/javascript/mastodon/locales/hi.json | 3 +++ app/javascript/mastodon/locales/hr.json | 3 +++ app/javascript/mastodon/locales/hu.json | 3 +++ app/javascript/mastodon/locales/hy.json | 3 +++ app/javascript/mastodon/locales/id.json | 3 +++ app/javascript/mastodon/locales/io.json | 3 +++ app/javascript/mastodon/locales/it.json | 3 +++ app/javascript/mastodon/locales/ja.json | 1 + app/javascript/mastodon/locales/ka.json | 3 +++ app/javascript/mastodon/locales/kk.json | 3 +++ app/javascript/mastodon/locales/ko.json | 1 + app/javascript/mastodon/locales/lv.json | 3 +++ app/javascript/mastodon/locales/ms.json | 3 +++ app/javascript/mastodon/locales/nl.json | 3 +++ app/javascript/mastodon/locales/no.json | 3 +++ app/javascript/mastodon/locales/oc.json | 3 +++ app/javascript/mastodon/locales/pl.json | 3 +++ app/javascript/mastodon/locales/pt-BR.json | 3 +++ app/javascript/mastodon/locales/pt.json | 3 +++ app/javascript/mastodon/locales/ro.json | 3 +++ app/javascript/mastodon/locales/ru.json | 3 +++ app/javascript/mastodon/locales/sk.json | 3 +++ app/javascript/mastodon/locales/sl.json | 3 +++ app/javascript/mastodon/locales/sq.json | 3 +++ app/javascript/mastodon/locales/sr-Latn.json | 3 +++ app/javascript/mastodon/locales/sr.json | 3 +++ app/javascript/mastodon/locales/sv.json | 3 +++ app/javascript/mastodon/locales/ta.json | 3 +++ app/javascript/mastodon/locales/te.json | 3 +++ app/javascript/mastodon/locales/th.json | 3 +++ app/javascript/mastodon/locales/tr.json | 3 +++ app/javascript/mastodon/locales/uk.json | 3 +++ app/javascript/mastodon/locales/zh-CN.json | 3 +++ app/javascript/mastodon/locales/zh-HK.json | 3 +++ app/javascript/mastodon/locales/zh-TW.json | 3 +++ 55 files changed, 156 insertions(+) diff --git a/app/javascript/mastodon/locales/ar.json b/app/javascript/mastodon/locales/ar.json index 68c8835d16..2898c139e4 100644 --- a/app/javascript/mastodon/locales/ar.json +++ b/app/javascript/mastodon/locales/ar.json @@ -204,6 +204,7 @@ "keyboard_shortcuts.search": "للتركيز على البحث", "keyboard_shortcuts.start": "لفتح عمود \"هيا نبدأ\"", "keyboard_shortcuts.toggle_hidden": "لعرض أو إخفاء النص مِن وراء التحذير", + "keyboard_shortcuts.toggle_sensitivity": "to show/hide media", "keyboard_shortcuts.toot": "لتحرير تبويق جديد", "keyboard_shortcuts.unfocus": "لإلغاء التركيز على حقل النص أو نافذة البحث", "keyboard_shortcuts.up": "للإنتقال إلى أعلى القائمة", @@ -236,6 +237,7 @@ "navigation_bar.favourites": "المفضلة", "navigation_bar.filters": "الكلمات المكتومة", "navigation_bar.follow_requests": "طلبات المتابعة", + "navigation_bar.follows_and_followers": "Follows and followers", "navigation_bar.info": "عن هذا الخادم", "navigation_bar.keyboard_shortcuts": "إختصارات لوحة المفاتيح", "navigation_bar.lists": "القوائم", @@ -244,6 +246,7 @@ "navigation_bar.personal": "Personal", "navigation_bar.pins": "التبويقات المثبتة", "navigation_bar.preferences": "التفضيلات", + "navigation_bar.profile_directory": "Profile directory", "navigation_bar.public_timeline": "الخيط العام الموحد", "navigation_bar.security": "الأمان", "notification.favourite": "أُعجِب {name} بمنشورك", diff --git a/app/javascript/mastodon/locales/ast.json b/app/javascript/mastodon/locales/ast.json index 57849c393d..0c00bda424 100644 --- a/app/javascript/mastodon/locales/ast.json +++ b/app/javascript/mastodon/locales/ast.json @@ -204,6 +204,7 @@ "keyboard_shortcuts.search": "to focus search", "keyboard_shortcuts.start": "p'abrir la columna «entamar»", "keyboard_shortcuts.toggle_hidden": "to show/hide text behind CW", + "keyboard_shortcuts.toggle_sensitivity": "to show/hide media", "keyboard_shortcuts.toot": "p'apenzar un toot nuevu", "keyboard_shortcuts.unfocus": "to un-focus compose textarea/search", "keyboard_shortcuts.up": "pa xubir na llista", @@ -236,6 +237,7 @@ "navigation_bar.favourites": "Favoritos", "navigation_bar.filters": "Pallabres silenciaes", "navigation_bar.follow_requests": "Solicitúes de siguimientu", + "navigation_bar.follows_and_followers": "Follows and followers", "navigation_bar.info": "Tocante a esta instancia", "navigation_bar.keyboard_shortcuts": "Atayos", "navigation_bar.lists": "Llistes", @@ -244,6 +246,7 @@ "navigation_bar.personal": "Personal", "navigation_bar.pins": "Toots fixaos", "navigation_bar.preferences": "Preferencies", + "navigation_bar.profile_directory": "Profile directory", "navigation_bar.public_timeline": "Llinia temporal federada", "navigation_bar.security": "Seguranza", "notification.favourite": "{name} favourited your status", diff --git a/app/javascript/mastodon/locales/bg.json b/app/javascript/mastodon/locales/bg.json index 7836146cd2..0480c8ca6f 100644 --- a/app/javascript/mastodon/locales/bg.json +++ b/app/javascript/mastodon/locales/bg.json @@ -204,6 +204,7 @@ "keyboard_shortcuts.search": "to focus search", "keyboard_shortcuts.start": "to open \"get started\" column", "keyboard_shortcuts.toggle_hidden": "to show/hide text behind CW", + "keyboard_shortcuts.toggle_sensitivity": "to show/hide media", "keyboard_shortcuts.toot": "to start a brand new toot", "keyboard_shortcuts.unfocus": "to un-focus compose textarea/search", "keyboard_shortcuts.up": "to move up in the list", @@ -236,6 +237,7 @@ "navigation_bar.favourites": "Favourites", "navigation_bar.filters": "Muted words", "navigation_bar.follow_requests": "Follow requests", + "navigation_bar.follows_and_followers": "Follows and followers", "navigation_bar.info": "Extended information", "navigation_bar.keyboard_shortcuts": "Keyboard shortcuts", "navigation_bar.lists": "Lists", @@ -244,6 +246,7 @@ "navigation_bar.personal": "Personal", "navigation_bar.pins": "Pinned toots", "navigation_bar.preferences": "Предпочитания", + "navigation_bar.profile_directory": "Profile directory", "navigation_bar.public_timeline": "Публичен канал", "navigation_bar.security": "Security", "notification.favourite": "{name} хареса твоята публикация", diff --git a/app/javascript/mastodon/locales/bn.json b/app/javascript/mastodon/locales/bn.json index bdf952d3ab..1afcce1a61 100644 --- a/app/javascript/mastodon/locales/bn.json +++ b/app/javascript/mastodon/locales/bn.json @@ -204,6 +204,7 @@ "keyboard_shortcuts.search": "খোঁজার অংশে ফোকাস করতে", "keyboard_shortcuts.start": "\"প্রথম শুরুর\" কলাম বের করতে", "keyboard_shortcuts.toggle_hidden": "CW লেখা দেখতে বা লুকাতে", + "keyboard_shortcuts.toggle_sensitivity": "to show/hide media", "keyboard_shortcuts.toot": "নতুন একটা টুট লেখা শুরু করতে", "keyboard_shortcuts.unfocus": "লেখা বা খোঁজার জায়গায় ফোকাস না করতে", "keyboard_shortcuts.up": "তালিকার উপরের দিকে যেতে", @@ -236,6 +237,7 @@ "navigation_bar.favourites": "পছন্দের", "navigation_bar.filters": "বন্ধ করা শব্দ", "navigation_bar.follow_requests": "অনুসরণের অনুরোধগুলি", + "navigation_bar.follows_and_followers": "Follows and followers", "navigation_bar.info": "এই সার্ভার সম্পর্কে", "navigation_bar.keyboard_shortcuts": "চাবি ব্যবহার", "navigation_bar.lists": "তালিকাগুলো", @@ -244,6 +246,7 @@ "navigation_bar.personal": "নিজস্ব", "navigation_bar.pins": "পিন দেওয়া টুট", "navigation_bar.preferences": "পছন্দসমূহ", + "navigation_bar.profile_directory": "Profile directory", "navigation_bar.public_timeline": "যুক্তবিশ্বের সময়রেখা", "navigation_bar.security": "নিরাপত্তা", "notification.favourite": "{name} আপনার কার্যক্রম পছন্দ করেছেন", diff --git a/app/javascript/mastodon/locales/ca.json b/app/javascript/mastodon/locales/ca.json index 6499ee92f1..0e10668b53 100644 --- a/app/javascript/mastodon/locales/ca.json +++ b/app/javascript/mastodon/locales/ca.json @@ -246,6 +246,7 @@ "navigation_bar.personal": "Personal", "navigation_bar.pins": "Toots fixats", "navigation_bar.preferences": "Preferències", + "navigation_bar.profile_directory": "Profile directory", "navigation_bar.public_timeline": "Línia de temps federada", "navigation_bar.security": "Seguretat", "notification.favourite": "{name} ha afavorit el teu estat", diff --git a/app/javascript/mastodon/locales/co.json b/app/javascript/mastodon/locales/co.json index 8321d7e7e4..6061713717 100644 --- a/app/javascript/mastodon/locales/co.json +++ b/app/javascript/mastodon/locales/co.json @@ -246,6 +246,7 @@ "navigation_bar.personal": "Persunale", "navigation_bar.pins": "Statuti puntarulati", "navigation_bar.preferences": "Preferenze", + "navigation_bar.profile_directory": "Profile directory", "navigation_bar.public_timeline": "Linea pubblica glubale", "navigation_bar.security": "Sicurità", "notification.favourite": "{name} hà aghjuntu u vostru statutu à i so favuriti", diff --git a/app/javascript/mastodon/locales/cy.json b/app/javascript/mastodon/locales/cy.json index 92dde46071..66d128c9de 100644 --- a/app/javascript/mastodon/locales/cy.json +++ b/app/javascript/mastodon/locales/cy.json @@ -204,6 +204,7 @@ "keyboard_shortcuts.search": "i ffocysu chwilio", "keyboard_shortcuts.start": "i agor colofn \"dechrau arni\"", "keyboard_shortcuts.toggle_hidden": "i ddangos/cuddio testun tu ôl i CW", + "keyboard_shortcuts.toggle_sensitivity": "to show/hide media", "keyboard_shortcuts.toot": "i ddechrau tŵt newydd sbon", "keyboard_shortcuts.unfocus": "i ddad-ffocysu ardal cyfansoddi testun/chwilio", "keyboard_shortcuts.up": "i symud yn uwch yn y rhestr", @@ -236,6 +237,7 @@ "navigation_bar.favourites": "Ffefrynnau", "navigation_bar.filters": "Geiriau a dawelwyd", "navigation_bar.follow_requests": "Ceisiadau dilyn", + "navigation_bar.follows_and_followers": "Follows and followers", "navigation_bar.info": "Ynghylch yr achos hwn", "navigation_bar.keyboard_shortcuts": "Bysellau brys", "navigation_bar.lists": "Rhestrau", @@ -244,6 +246,7 @@ "navigation_bar.personal": "Personol", "navigation_bar.pins": "Tŵtiau wedi eu pinio", "navigation_bar.preferences": "Dewisiadau", + "navigation_bar.profile_directory": "Profile directory", "navigation_bar.public_timeline": "Ffrwd y ffederasiwn", "navigation_bar.security": "Diogelwch", "notification.favourite": "hoffodd {name} eich tŵt", diff --git a/app/javascript/mastodon/locales/da.json b/app/javascript/mastodon/locales/da.json index 0afacada12..ba8ba7a28e 100644 --- a/app/javascript/mastodon/locales/da.json +++ b/app/javascript/mastodon/locales/da.json @@ -204,6 +204,7 @@ "keyboard_shortcuts.search": "for at fokusere søgningen", "keyboard_shortcuts.start": "for at åbne \"kom igen\" kolonnen", "keyboard_shortcuts.toggle_hidden": "for at vise/skjule tekst bag CW", + "keyboard_shortcuts.toggle_sensitivity": "to show/hide media", "keyboard_shortcuts.toot": "for at påbegynde et helt nyt trut", "keyboard_shortcuts.unfocus": "for at fjerne fokus fra skriveområde/søgning", "keyboard_shortcuts.up": "for at bevæge dig op ad listen", @@ -236,6 +237,7 @@ "navigation_bar.favourites": "Favoritter", "navigation_bar.filters": "Dæmpede ord", "navigation_bar.follow_requests": "Følgeanmodninger", + "navigation_bar.follows_and_followers": "Follows and followers", "navigation_bar.info": "Om denne instans", "navigation_bar.keyboard_shortcuts": "Hurtigtast", "navigation_bar.lists": "Lister", @@ -244,6 +246,7 @@ "navigation_bar.personal": "Personligt", "navigation_bar.pins": "Fastgjorte trut", "navigation_bar.preferences": "Præferencer", + "navigation_bar.profile_directory": "Profile directory", "navigation_bar.public_timeline": "Fælles tidslinje", "navigation_bar.security": "Sikkerhed", "notification.favourite": "{name} favoriserede din status", diff --git a/app/javascript/mastodon/locales/de.json b/app/javascript/mastodon/locales/de.json index 8b7d256eb0..ff1a1eebc8 100644 --- a/app/javascript/mastodon/locales/de.json +++ b/app/javascript/mastodon/locales/de.json @@ -204,6 +204,7 @@ "keyboard_shortcuts.search": "Suche fokussieren", "keyboard_shortcuts.start": "\"Erste Schritte-Spalte öffnen", "keyboard_shortcuts.toggle_hidden": "Text hinter einer Inhaltswarnung verstecken/anzeigen", + "keyboard_shortcuts.toggle_sensitivity": "to show/hide media", "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", @@ -236,6 +237,7 @@ "navigation_bar.favourites": "Favoriten", "navigation_bar.filters": "Stummgeschaltene Wörter", "navigation_bar.follow_requests": "Folgeanfragen", + "navigation_bar.follows_and_followers": "Follows and followers", "navigation_bar.info": "Über diesen Server", "navigation_bar.keyboard_shortcuts": "Tastenkombinationen", "navigation_bar.lists": "Listen", @@ -244,6 +246,7 @@ "navigation_bar.personal": "Personal", "navigation_bar.pins": "Angeheftete Beiträge", "navigation_bar.preferences": "Einstellungen", + "navigation_bar.profile_directory": "Profile directory", "navigation_bar.public_timeline": "Föderierte Zeitleiste", "navigation_bar.security": "Sicherheit", "notification.favourite": "{name} hat deinen Beitrag favorisiert", diff --git a/app/javascript/mastodon/locales/defaultMessages.json b/app/javascript/mastodon/locales/defaultMessages.json index f1a940ad24..f76caaf964 100644 --- a/app/javascript/mastodon/locales/defaultMessages.json +++ b/app/javascript/mastodon/locales/defaultMessages.json @@ -2337,6 +2337,10 @@ { "defaultMessage": "Follows and followers", "id": "navigation_bar.follows_and_followers" + }, + { + "defaultMessage": "Profile directory", + "id": "navigation_bar.profile_directory" } ], "path": "app/javascript/mastodon/features/ui/components/navigation_panel.json" diff --git a/app/javascript/mastodon/locales/el.json b/app/javascript/mastodon/locales/el.json index 8dd9e9eb96..314c34e6ea 100644 --- a/app/javascript/mastodon/locales/el.json +++ b/app/javascript/mastodon/locales/el.json @@ -204,6 +204,7 @@ "keyboard_shortcuts.search": "εστίαση αναζήτησης", "keyboard_shortcuts.start": "άνοιγμα κολώνας \"Ξεκινώντας\"", "keyboard_shortcuts.toggle_hidden": "εμφάνιση/απόκρυψη κειμένου πίσω από την προειδοποίηση", + "keyboard_shortcuts.toggle_sensitivity": "to show/hide media", "keyboard_shortcuts.toot": "δημιουργία νέου τουτ", "keyboard_shortcuts.unfocus": "απο-εστίαση του πεδίου σύνθεσης/αναζήτησης", "keyboard_shortcuts.up": "κίνηση προς την κορυφή της λίστας", @@ -236,6 +237,7 @@ "navigation_bar.favourites": "Αγαπημένα", "navigation_bar.filters": "Αποσιωπημένες λέξεις", "navigation_bar.follow_requests": "Αιτήματα ακολούθησης", + "navigation_bar.follows_and_followers": "Follows and followers", "navigation_bar.info": "Πληροφορίες κόμβου", "navigation_bar.keyboard_shortcuts": "Συντομεύσεις", "navigation_bar.lists": "Λίστες", @@ -244,6 +246,7 @@ "navigation_bar.personal": "Προσωπικά", "navigation_bar.pins": "Καρφιτσωμένα τουτ", "navigation_bar.preferences": "Προτιμήσεις", + "navigation_bar.profile_directory": "Profile directory", "navigation_bar.public_timeline": "Ομοσπονδιακή ροή", "navigation_bar.security": "Ασφάλεια", "notification.favourite": "Ο/Η {name} σημείωσε ως αγαπημένη την κατάστασή σου", diff --git a/app/javascript/mastodon/locales/en.json b/app/javascript/mastodon/locales/en.json index 521cba4c40..34ec1ca238 100644 --- a/app/javascript/mastodon/locales/en.json +++ b/app/javascript/mastodon/locales/en.json @@ -246,6 +246,7 @@ "navigation_bar.personal": "Personal", "navigation_bar.pins": "Pinned toots", "navigation_bar.preferences": "Preferences", + "navigation_bar.profile_directory": "Profile directory", "navigation_bar.public_timeline": "Federated timeline", "navigation_bar.security": "Security", "notification.favourite": "{name} favourited your status", diff --git a/app/javascript/mastodon/locales/eo.json b/app/javascript/mastodon/locales/eo.json index a89da4ad54..dc50cd3e94 100644 --- a/app/javascript/mastodon/locales/eo.json +++ b/app/javascript/mastodon/locales/eo.json @@ -204,6 +204,7 @@ "keyboard_shortcuts.search": "por fokusigi la serĉilon", "keyboard_shortcuts.start": "por malfermi la kolumnon «por komenci»", "keyboard_shortcuts.toggle_hidden": "por montri/kaŝi tekston malantaŭ enhava averto", + "keyboard_shortcuts.toggle_sensitivity": "to show/hide media", "keyboard_shortcuts.toot": "por komenci tute novan mesaĝon", "keyboard_shortcuts.unfocus": "por malfokusigi la tekstujon aŭ la serĉilon", "keyboard_shortcuts.up": "por iri supren en la listo", @@ -236,6 +237,7 @@ "navigation_bar.favourites": "Stelumoj", "navigation_bar.filters": "Silentigitaj vortoj", "navigation_bar.follow_requests": "Petoj de sekvado", + "navigation_bar.follows_and_followers": "Follows and followers", "navigation_bar.info": "Pri ĉi tiu servilo", "navigation_bar.keyboard_shortcuts": "Rapidklavoj", "navigation_bar.lists": "Listoj", @@ -244,6 +246,7 @@ "navigation_bar.personal": "Persone", "navigation_bar.pins": "Alpinglitaj mesaĝoj", "navigation_bar.preferences": "Preferoj", + "navigation_bar.profile_directory": "Profile directory", "navigation_bar.public_timeline": "Fratara tempolinio", "navigation_bar.security": "Sekureco", "notification.favourite": "{name} stelumis vian mesaĝon", diff --git a/app/javascript/mastodon/locales/es.json b/app/javascript/mastodon/locales/es.json index 00d756d347..1962d9447f 100644 --- a/app/javascript/mastodon/locales/es.json +++ b/app/javascript/mastodon/locales/es.json @@ -204,6 +204,7 @@ "keyboard_shortcuts.search": "para poner el foco en la búsqueda", "keyboard_shortcuts.start": "abrir la columna \"comenzar\"", "keyboard_shortcuts.toggle_hidden": "mostrar/ocultar texto tras aviso de contenido (CW)", + "keyboard_shortcuts.toggle_sensitivity": "to show/hide media", "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", @@ -236,6 +237,7 @@ "navigation_bar.favourites": "Favoritos", "navigation_bar.filters": "Palabras silenciadas", "navigation_bar.follow_requests": "Solicitudes para seguirte", + "navigation_bar.follows_and_followers": "Follows and followers", "navigation_bar.info": "Información adicional", "navigation_bar.keyboard_shortcuts": "Atajos", "navigation_bar.lists": "Listas", @@ -244,6 +246,7 @@ "navigation_bar.personal": "Personal", "navigation_bar.pins": "Toots fijados", "navigation_bar.preferences": "Preferencias", + "navigation_bar.profile_directory": "Profile directory", "navigation_bar.public_timeline": "Historia federada", "navigation_bar.security": "Seguridad", "notification.favourite": "{name} marcó tu estado como favorito", diff --git a/app/javascript/mastodon/locales/eu.json b/app/javascript/mastodon/locales/eu.json index d4cef3d5d3..4f66e6b39d 100644 --- a/app/javascript/mastodon/locales/eu.json +++ b/app/javascript/mastodon/locales/eu.json @@ -204,6 +204,7 @@ "keyboard_shortcuts.search": "bilaketan fokua jartzea", "keyboard_shortcuts.start": "\"Menua\" zutabea irekitzeko", "keyboard_shortcuts.toggle_hidden": "testua erakustea/ezkutatzea abisu baten atzean", + "keyboard_shortcuts.toggle_sensitivity": "to show/hide media", "keyboard_shortcuts.toot": "toot berria hastea", "keyboard_shortcuts.unfocus": "testua konposatzeko area / bilaketatik fokua kentzea", "keyboard_shortcuts.up": "zerrendan gora mugitzea", @@ -236,6 +237,7 @@ "navigation_bar.favourites": "Gogokoak", "navigation_bar.filters": "Mutututako hitzak", "navigation_bar.follow_requests": "Jarraitzeko eskariak", + "navigation_bar.follows_and_followers": "Follows and followers", "navigation_bar.info": "Zerbitzari honi buruz", "navigation_bar.keyboard_shortcuts": "Laster-teklak", "navigation_bar.lists": "Zerrendak", @@ -244,6 +246,7 @@ "navigation_bar.personal": "Personal", "navigation_bar.pins": "Finkatutako toot-ak", "navigation_bar.preferences": "Hobespenak", + "navigation_bar.profile_directory": "Profile directory", "navigation_bar.public_timeline": "Federatutako denbora-lerroa", "navigation_bar.security": "Segurtasuna", "notification.favourite": "{name}(e)k zure mezua gogoko du", diff --git a/app/javascript/mastodon/locales/fa.json b/app/javascript/mastodon/locales/fa.json index 3dcfbc7acd..d804878758 100644 --- a/app/javascript/mastodon/locales/fa.json +++ b/app/javascript/mastodon/locales/fa.json @@ -204,6 +204,7 @@ "keyboard_shortcuts.search": "برای فعال‌کردن جستجو", "keyboard_shortcuts.start": "برای گشودن ستون «آغاز کنید»", "keyboard_shortcuts.toggle_hidden": "برای نمایش/نهفتن نوشتهٔ پشت هشدار محتوا", + "keyboard_shortcuts.toggle_sensitivity": "to show/hide media", "keyboard_shortcuts.toot": "برای آغاز یک بوق تازه", "keyboard_shortcuts.unfocus": "برای برداشتن توجه از نوشتن/جستجو", "keyboard_shortcuts.up": "برای بالا رفتن در فهرست", @@ -236,6 +237,7 @@ "navigation_bar.favourites": "پسندیده‌ها", "navigation_bar.filters": "واژگان بی‌صداشده", "navigation_bar.follow_requests": "درخواست‌های پیگیری", + "navigation_bar.follows_and_followers": "Follows and followers", "navigation_bar.info": "دربارهٔ این سرور", "navigation_bar.keyboard_shortcuts": "میان‌برهای صفحه‌کلید", "navigation_bar.lists": "فهرست‌ها", @@ -244,6 +246,7 @@ "navigation_bar.personal": "شخصی", "navigation_bar.pins": "نوشته‌های ثابت", "navigation_bar.preferences": "ترجیحات", + "navigation_bar.profile_directory": "Profile directory", "navigation_bar.public_timeline": "نوشته‌های همه‌جا", "navigation_bar.security": "امنیت", "notification.favourite": "‫{name}‬ نوشتهٔ شما را پسندید", diff --git a/app/javascript/mastodon/locales/fi.json b/app/javascript/mastodon/locales/fi.json index 9e098638fb..f17a967b51 100644 --- a/app/javascript/mastodon/locales/fi.json +++ b/app/javascript/mastodon/locales/fi.json @@ -204,6 +204,7 @@ "keyboard_shortcuts.search": "siirry hakukenttään", "keyboard_shortcuts.start": "avaa \"Aloitus\" -sarake", "keyboard_shortcuts.toggle_hidden": "näytä/piilota sisältövaroituksella merkitty teksti", + "keyboard_shortcuts.toggle_sensitivity": "to show/hide media", "keyboard_shortcuts.toot": "ala kirjoittaa uutta tuuttausta", "keyboard_shortcuts.unfocus": "siirry pois tekstikentästä tai hakukentästä", "keyboard_shortcuts.up": "siirry listassa ylöspäin", @@ -236,6 +237,7 @@ "navigation_bar.favourites": "Suosikit", "navigation_bar.filters": "Mykistetyt sanat", "navigation_bar.follow_requests": "Seuraamispyynnöt", + "navigation_bar.follows_and_followers": "Follows and followers", "navigation_bar.info": "Tietoa tästä instanssista", "navigation_bar.keyboard_shortcuts": "Näppäinkomennot", "navigation_bar.lists": "Listat", @@ -244,6 +246,7 @@ "navigation_bar.personal": "Personal", "navigation_bar.pins": "Kiinnitetyt tuuttaukset", "navigation_bar.preferences": "Asetukset", + "navigation_bar.profile_directory": "Profile directory", "navigation_bar.public_timeline": "Yleinen aikajana", "navigation_bar.security": "Tunnukset", "notification.favourite": "{name} tykkäsi tilastasi", diff --git a/app/javascript/mastodon/locales/fr.json b/app/javascript/mastodon/locales/fr.json index 090f15beaa..0dcee350d3 100644 --- a/app/javascript/mastodon/locales/fr.json +++ b/app/javascript/mastodon/locales/fr.json @@ -204,6 +204,7 @@ "keyboard_shortcuts.search": "pour cibler la recherche", "keyboard_shortcuts.start": "pour ouvrir la colonne \"pour commencer\"", "keyboard_shortcuts.toggle_hidden": "pour afficher/cacher un texte derrière CW", + "keyboard_shortcuts.toggle_sensitivity": "to show/hide media", "keyboard_shortcuts.toot": "pour démarrer un tout nouveau pouet", "keyboard_shortcuts.unfocus": "pour quitter la zone de composition/recherche", "keyboard_shortcuts.up": "pour remonter dans la liste", @@ -236,6 +237,7 @@ "navigation_bar.favourites": "Favoris", "navigation_bar.filters": "Mots silenciés", "navigation_bar.follow_requests": "Demandes de suivi", + "navigation_bar.follows_and_followers": "Follows and followers", "navigation_bar.info": "Plus d’informations", "navigation_bar.keyboard_shortcuts": "Raccourcis clavier", "navigation_bar.lists": "Listes", @@ -244,6 +246,7 @@ "navigation_bar.personal": "Personnel", "navigation_bar.pins": "Pouets épinglés", "navigation_bar.preferences": "Préférences", + "navigation_bar.profile_directory": "Profile directory", "navigation_bar.public_timeline": "Fil public global", "navigation_bar.security": "Sécurité", "notification.favourite": "{name} a ajouté à ses favoris :", diff --git a/app/javascript/mastodon/locales/gl.json b/app/javascript/mastodon/locales/gl.json index 61afd4cbfe..7cf7e40267 100644 --- a/app/javascript/mastodon/locales/gl.json +++ b/app/javascript/mastodon/locales/gl.json @@ -204,6 +204,7 @@ "keyboard_shortcuts.search": "para centrar a busca", "keyboard_shortcuts.start": "abrir columna \"comezando\"", "keyboard_shortcuts.toggle_hidden": "mostrar/agochar un texto detrás do AC", + "keyboard_shortcuts.toggle_sensitivity": "to show/hide media", "keyboard_shortcuts.toot": "escribir un toot novo", "keyboard_shortcuts.unfocus": "quitar o foco do área de escritura/busca", "keyboard_shortcuts.up": "ir hacia arriba na lista", @@ -236,6 +237,7 @@ "navigation_bar.favourites": "Favoritas", "navigation_bar.filters": "Palabras acaladas", "navigation_bar.follow_requests": "Peticións de seguimento", + "navigation_bar.follows_and_followers": "Follows and followers", "navigation_bar.info": "Sobre este servidor", "navigation_bar.keyboard_shortcuts": "Atallos", "navigation_bar.lists": "Listas", @@ -244,6 +246,7 @@ "navigation_bar.personal": "Persoal", "navigation_bar.pins": "Mensaxes fixadas", "navigation_bar.preferences": "Preferencias", + "navigation_bar.profile_directory": "Profile directory", "navigation_bar.public_timeline": "Liña temporal federada", "navigation_bar.security": "Seguridade", "notification.favourite": "{name} marcou como favorito o seu estado", diff --git a/app/javascript/mastodon/locales/he.json b/app/javascript/mastodon/locales/he.json index bf09ead220..b6fc8c6ab1 100644 --- a/app/javascript/mastodon/locales/he.json +++ b/app/javascript/mastodon/locales/he.json @@ -204,6 +204,7 @@ "keyboard_shortcuts.search": "להתמקד בחלון החיפוש", "keyboard_shortcuts.start": "to open \"get started\" column", "keyboard_shortcuts.toggle_hidden": "to show/hide text behind CW", + "keyboard_shortcuts.toggle_sensitivity": "to show/hide media", "keyboard_shortcuts.toot": "להתחיל חיצרוץ חדש", "keyboard_shortcuts.unfocus": "לצאת מתיבת חיבור/חיפוש", "keyboard_shortcuts.up": "לנוע במעלה הרשימה", @@ -236,6 +237,7 @@ "navigation_bar.favourites": "חיבובים", "navigation_bar.filters": "Muted words", "navigation_bar.follow_requests": "בקשות מעקב", + "navigation_bar.follows_and_followers": "Follows and followers", "navigation_bar.info": "מידע נוסף", "navigation_bar.keyboard_shortcuts": "קיצורי מקלדת", "navigation_bar.lists": "Lists", @@ -244,6 +246,7 @@ "navigation_bar.personal": "Personal", "navigation_bar.pins": "חיצרוצים מקובעים", "navigation_bar.preferences": "העדפות", + "navigation_bar.profile_directory": "Profile directory", "navigation_bar.public_timeline": "ציר זמן בין-קהילתי", "navigation_bar.security": "Security", "notification.favourite": "חצרוצך חובב על ידי {name}", diff --git a/app/javascript/mastodon/locales/hi.json b/app/javascript/mastodon/locales/hi.json index 5d8f4ab7f2..ac58514d42 100644 --- a/app/javascript/mastodon/locales/hi.json +++ b/app/javascript/mastodon/locales/hi.json @@ -204,6 +204,7 @@ "keyboard_shortcuts.search": "to focus search", "keyboard_shortcuts.start": "to open \"get started\" column", "keyboard_shortcuts.toggle_hidden": "to show/hide text behind CW", + "keyboard_shortcuts.toggle_sensitivity": "to show/hide media", "keyboard_shortcuts.toot": "to start a brand new toot", "keyboard_shortcuts.unfocus": "to un-focus compose textarea/search", "keyboard_shortcuts.up": "to move up in the list", @@ -236,6 +237,7 @@ "navigation_bar.favourites": "Favourites", "navigation_bar.filters": "Muted words", "navigation_bar.follow_requests": "Follow requests", + "navigation_bar.follows_and_followers": "Follows and followers", "navigation_bar.info": "About this server", "navigation_bar.keyboard_shortcuts": "Hotkeys", "navigation_bar.lists": "Lists", @@ -244,6 +246,7 @@ "navigation_bar.personal": "Personal", "navigation_bar.pins": "Pinned toots", "navigation_bar.preferences": "Preferences", + "navigation_bar.profile_directory": "Profile directory", "navigation_bar.public_timeline": "Federated timeline", "navigation_bar.security": "Security", "notification.favourite": "{name} favourited your status", diff --git a/app/javascript/mastodon/locales/hr.json b/app/javascript/mastodon/locales/hr.json index 5353cb572c..9f0ad1985b 100644 --- a/app/javascript/mastodon/locales/hr.json +++ b/app/javascript/mastodon/locales/hr.json @@ -204,6 +204,7 @@ "keyboard_shortcuts.search": "to focus search", "keyboard_shortcuts.start": "to open \"get started\" column", "keyboard_shortcuts.toggle_hidden": "to show/hide text behind CW", + "keyboard_shortcuts.toggle_sensitivity": "to show/hide media", "keyboard_shortcuts.toot": "to start a brand new toot", "keyboard_shortcuts.unfocus": "to un-focus compose textarea/search", "keyboard_shortcuts.up": "to move up in the list", @@ -236,6 +237,7 @@ "navigation_bar.favourites": "Favoriti", "navigation_bar.filters": "Muted words", "navigation_bar.follow_requests": "Zahtjevi za slijeđenje", + "navigation_bar.follows_and_followers": "Follows and followers", "navigation_bar.info": "Više informacija", "navigation_bar.keyboard_shortcuts": "Keyboard shortcuts", "navigation_bar.lists": "Lists", @@ -244,6 +246,7 @@ "navigation_bar.personal": "Personal", "navigation_bar.pins": "Pinned toots", "navigation_bar.preferences": "Postavke", + "navigation_bar.profile_directory": "Profile directory", "navigation_bar.public_timeline": "Federalni timeline", "navigation_bar.security": "Security", "notification.favourite": "{name} je lajkao tvoj status", diff --git a/app/javascript/mastodon/locales/hu.json b/app/javascript/mastodon/locales/hu.json index b906dd6196..9fc9444a7c 100644 --- a/app/javascript/mastodon/locales/hu.json +++ b/app/javascript/mastodon/locales/hu.json @@ -204,6 +204,7 @@ "keyboard_shortcuts.search": "kereső kiemelése", "keyboard_shortcuts.start": "to open \"get started\" column", "keyboard_shortcuts.toggle_hidden": "to show/hide text behind CW", + "keyboard_shortcuts.toggle_sensitivity": "to show/hide media", "keyboard_shortcuts.toot": "új tülk megkezdése", "keyboard_shortcuts.unfocus": "tülk szerkesztés/keresés fókuszpontból való kivétele", "keyboard_shortcuts.up": "fennebb helyezés a listában", @@ -236,6 +237,7 @@ "navigation_bar.favourites": "Kedvencek", "navigation_bar.filters": "Muted words", "navigation_bar.follow_requests": "Követési kérések", + "navigation_bar.follows_and_followers": "Follows and followers", "navigation_bar.info": "Ezen szerverről", "navigation_bar.keyboard_shortcuts": "Gyorsbillentyűk", "navigation_bar.lists": "Listák", @@ -244,6 +246,7 @@ "navigation_bar.personal": "Personal", "navigation_bar.pins": "Kitűzött tülkök", "navigation_bar.preferences": "Beállítások", + "navigation_bar.profile_directory": "Profile directory", "navigation_bar.public_timeline": "Nyilvános időfolyam", "navigation_bar.security": "Security", "notification.favourite": "{name} kedvencnek jelölte az állapotod", diff --git a/app/javascript/mastodon/locales/hy.json b/app/javascript/mastodon/locales/hy.json index e2e0aa881e..74079ba181 100644 --- a/app/javascript/mastodon/locales/hy.json +++ b/app/javascript/mastodon/locales/hy.json @@ -204,6 +204,7 @@ "keyboard_shortcuts.search": "որոնման դաշտին սեւեռվելու համար", "keyboard_shortcuts.start": "to open \"get started\" column", "keyboard_shortcuts.toggle_hidden": "to show/hide text behind CW", + "keyboard_shortcuts.toggle_sensitivity": "to show/hide media", "keyboard_shortcuts.toot": "թարմ թութ սկսելու համար", "keyboard_shortcuts.unfocus": "տեքստի/որոնման տիրույթից ապասեւեռվելու համար", "keyboard_shortcuts.up": "ցանկով վերեւ շարժվելու համար", @@ -236,6 +237,7 @@ "navigation_bar.favourites": "Հավանածներ", "navigation_bar.filters": "Muted words", "navigation_bar.follow_requests": "Հետեւելու հայցեր", + "navigation_bar.follows_and_followers": "Follows and followers", "navigation_bar.info": "Այս հանգույցի մասին", "navigation_bar.keyboard_shortcuts": "Ստեղնաշարի կարճատներ", "navigation_bar.lists": "Ցանկեր", @@ -244,6 +246,7 @@ "navigation_bar.personal": "Անձնական", "navigation_bar.pins": "Ամրացված թթեր", "navigation_bar.preferences": "Նախապատվություններ", + "navigation_bar.profile_directory": "Profile directory", "navigation_bar.public_timeline": "Դաշնային հոսք", "navigation_bar.security": "Անվտանգություն", "notification.favourite": "{name} հավանեց թութդ", diff --git a/app/javascript/mastodon/locales/id.json b/app/javascript/mastodon/locales/id.json index 5b15327edb..a97f0bd860 100644 --- a/app/javascript/mastodon/locales/id.json +++ b/app/javascript/mastodon/locales/id.json @@ -204,6 +204,7 @@ "keyboard_shortcuts.search": "untuk fokus mencari", "keyboard_shortcuts.start": "to open \"get started\" column", "keyboard_shortcuts.toggle_hidden": "to show/hide text behind CW", + "keyboard_shortcuts.toggle_sensitivity": "to show/hide media", "keyboard_shortcuts.toot": "to start a brand new toot", "keyboard_shortcuts.unfocus": "to un-focus compose textarea/search", "keyboard_shortcuts.up": "to move up in the list", @@ -236,6 +237,7 @@ "navigation_bar.favourites": "Favorit", "navigation_bar.filters": "Muted words", "navigation_bar.follow_requests": "Permintaan mengikuti", + "navigation_bar.follows_and_followers": "Follows and followers", "navigation_bar.info": "Informasi selengkapnya", "navigation_bar.keyboard_shortcuts": "Keyboard shortcuts", "navigation_bar.lists": "Lists", @@ -244,6 +246,7 @@ "navigation_bar.personal": "Personal", "navigation_bar.pins": "Pinned toots", "navigation_bar.preferences": "Pengaturan", + "navigation_bar.profile_directory": "Profile directory", "navigation_bar.public_timeline": "Linimasa gabungan", "navigation_bar.security": "Security", "notification.favourite": "{name} menyukai status anda", diff --git a/app/javascript/mastodon/locales/io.json b/app/javascript/mastodon/locales/io.json index 61c65c12d1..00936134a6 100644 --- a/app/javascript/mastodon/locales/io.json +++ b/app/javascript/mastodon/locales/io.json @@ -204,6 +204,7 @@ "keyboard_shortcuts.search": "to focus search", "keyboard_shortcuts.start": "to open \"get started\" column", "keyboard_shortcuts.toggle_hidden": "to show/hide text behind CW", + "keyboard_shortcuts.toggle_sensitivity": "to show/hide media", "keyboard_shortcuts.toot": "to start a brand new toot", "keyboard_shortcuts.unfocus": "to un-focus compose textarea/search", "keyboard_shortcuts.up": "to move up in the list", @@ -236,6 +237,7 @@ "navigation_bar.favourites": "Favorati", "navigation_bar.filters": "Muted words", "navigation_bar.follow_requests": "Demandi di sequado", + "navigation_bar.follows_and_followers": "Follows and followers", "navigation_bar.info": "Detaloza informi", "navigation_bar.keyboard_shortcuts": "Keyboard shortcuts", "navigation_bar.lists": "Lists", @@ -244,6 +246,7 @@ "navigation_bar.personal": "Personal", "navigation_bar.pins": "Pinned toots", "navigation_bar.preferences": "Preferi", + "navigation_bar.profile_directory": "Profile directory", "navigation_bar.public_timeline": "Federata tempolineo", "navigation_bar.security": "Security", "notification.favourite": "{name} favorizis tua mesajo", diff --git a/app/javascript/mastodon/locales/it.json b/app/javascript/mastodon/locales/it.json index ebdc421023..d5e88c4f3e 100644 --- a/app/javascript/mastodon/locales/it.json +++ b/app/javascript/mastodon/locales/it.json @@ -204,6 +204,7 @@ "keyboard_shortcuts.search": "per spostare il focus sulla ricerca", "keyboard_shortcuts.start": "per aprire la colonna \"Come iniziare\"", "keyboard_shortcuts.toggle_hidden": "per mostrare/nascondere il testo dei CW", + "keyboard_shortcuts.toggle_sensitivity": "to show/hide media", "keyboard_shortcuts.toot": "per iniziare a scrivere un toot completamente nuovo", "keyboard_shortcuts.unfocus": "per uscire dall'area di composizione o dalla ricerca", "keyboard_shortcuts.up": "per spostarsi in alto nella lista", @@ -236,6 +237,7 @@ "navigation_bar.favourites": "Apprezzati", "navigation_bar.filters": "Parole silenziate", "navigation_bar.follow_requests": "Richieste di amicizia", + "navigation_bar.follows_and_followers": "Follows and followers", "navigation_bar.info": "Informazioni su questo server", "navigation_bar.keyboard_shortcuts": "Tasti di scelta rapida", "navigation_bar.lists": "Liste", @@ -244,6 +246,7 @@ "navigation_bar.personal": "Personal", "navigation_bar.pins": "Toot fissati in cima", "navigation_bar.preferences": "Impostazioni", + "navigation_bar.profile_directory": "Profile directory", "navigation_bar.public_timeline": "Timeline federata", "navigation_bar.security": "Sicurezza", "notification.favourite": "{name} ha apprezzato il tuo post", diff --git a/app/javascript/mastodon/locales/ja.json b/app/javascript/mastodon/locales/ja.json index 1aa45371e6..e86142869f 100644 --- a/app/javascript/mastodon/locales/ja.json +++ b/app/javascript/mastodon/locales/ja.json @@ -246,6 +246,7 @@ "navigation_bar.personal": "個人用", "navigation_bar.pins": "固定したトゥート", "navigation_bar.preferences": "ユーザー設定", + "navigation_bar.profile_directory": "Profile directory", "navigation_bar.public_timeline": "連合タイムライン", "navigation_bar.security": "セキュリティ", "notification.favourite": "{name}さんがあなたのトゥートをお気に入りに登録しました", diff --git a/app/javascript/mastodon/locales/ka.json b/app/javascript/mastodon/locales/ka.json index 237c11a663..d33de2352f 100644 --- a/app/javascript/mastodon/locales/ka.json +++ b/app/javascript/mastodon/locales/ka.json @@ -204,6 +204,7 @@ "keyboard_shortcuts.search": "ძიებაზე ფოკუსირებისთვის", "keyboard_shortcuts.start": "to open \"get started\" column", "keyboard_shortcuts.toggle_hidden": "გაფრთხილების უკან ტექსტის გამოსაჩენად/დასამალვად", + "keyboard_shortcuts.toggle_sensitivity": "to show/hide media", "keyboard_shortcuts.toot": "ახალი ტუტის დასაწყებად", "keyboard_shortcuts.unfocus": "შედგენის ტექსტ-არეაზე ფოკუსის მოსაშორებლად", "keyboard_shortcuts.up": "სიაში ზემოთ გადასაადგილებლად", @@ -236,6 +237,7 @@ "navigation_bar.favourites": "ფავორიტები", "navigation_bar.filters": "გაჩუმებული სიტყვები", "navigation_bar.follow_requests": "დადევნების მოთხოვნები", + "navigation_bar.follows_and_followers": "Follows and followers", "navigation_bar.info": "ამ ინსტანციის შესახებ", "navigation_bar.keyboard_shortcuts": "ცხელი კლავიშები", "navigation_bar.lists": "სიები", @@ -244,6 +246,7 @@ "navigation_bar.personal": "პირადი", "navigation_bar.pins": "აპინული ტუტები", "navigation_bar.preferences": "პრეფერენსიები", + "navigation_bar.profile_directory": "Profile directory", "navigation_bar.public_timeline": "ფედერალური თაიმლაინი", "navigation_bar.security": "უსაფრთხოება", "notification.favourite": "{name}-მა თქვენი სტატუსი აქცია ფავორიტად", diff --git a/app/javascript/mastodon/locales/kk.json b/app/javascript/mastodon/locales/kk.json index bae8dd1219..b9bd7cac31 100644 --- a/app/javascript/mastodon/locales/kk.json +++ b/app/javascript/mastodon/locales/kk.json @@ -204,6 +204,7 @@ "keyboard_shortcuts.search": "іздеу", "keyboard_shortcuts.start": "бастапқы бағанға бару", "keyboard_shortcuts.toggle_hidden": "жабық мәтінді CW ашу/жабу", + "keyboard_shortcuts.toggle_sensitivity": "to show/hide media", "keyboard_shortcuts.toot": "жаңа жазба бастау", "keyboard_shortcuts.unfocus": "жазба қалдыру алаңынан шығу", "keyboard_shortcuts.up": "тізімде жоғары шығу", @@ -236,6 +237,7 @@ "navigation_bar.favourites": "Таңдаулылар", "navigation_bar.filters": "Үнсіз сөздер", "navigation_bar.follow_requests": "Жазылуға сұранғандар", + "navigation_bar.follows_and_followers": "Follows and followers", "navigation_bar.info": "Сервер туралы", "navigation_bar.keyboard_shortcuts": "Ыстық пернелер", "navigation_bar.lists": "Тізімдер", @@ -244,6 +246,7 @@ "navigation_bar.personal": "Жеке", "navigation_bar.pins": "Жабыстырылғандар", "navigation_bar.preferences": "Басымдықтар", + "navigation_bar.profile_directory": "Profile directory", "navigation_bar.public_timeline": "Жаһандық желі", "navigation_bar.security": "Қауіпсіздік", "notification.favourite": "{name} жазбаңызды таңдаулыға қосты", diff --git a/app/javascript/mastodon/locales/ko.json b/app/javascript/mastodon/locales/ko.json index bd7b9764db..42c166fb59 100644 --- a/app/javascript/mastodon/locales/ko.json +++ b/app/javascript/mastodon/locales/ko.json @@ -246,6 +246,7 @@ "navigation_bar.personal": "개인용", "navigation_bar.pins": "고정된 툿", "navigation_bar.preferences": "사용자 설정", + "navigation_bar.profile_directory": "Profile directory", "navigation_bar.public_timeline": "연합 타임라인", "navigation_bar.security": "보안", "notification.favourite": "{name}님이 즐겨찾기 했습니다", diff --git a/app/javascript/mastodon/locales/lv.json b/app/javascript/mastodon/locales/lv.json index 755f241684..8c864f910f 100644 --- a/app/javascript/mastodon/locales/lv.json +++ b/app/javascript/mastodon/locales/lv.json @@ -204,6 +204,7 @@ "keyboard_shortcuts.search": "to focus search", "keyboard_shortcuts.start": "to open \"get started\" column", "keyboard_shortcuts.toggle_hidden": "to show/hide text behind CW", + "keyboard_shortcuts.toggle_sensitivity": "to show/hide media", "keyboard_shortcuts.toot": "to start a brand new toot", "keyboard_shortcuts.unfocus": "to un-focus compose textarea/search", "keyboard_shortcuts.up": "to move up in the list", @@ -236,6 +237,7 @@ "navigation_bar.favourites": "Favourites", "navigation_bar.filters": "Muted words", "navigation_bar.follow_requests": "Follow requests", + "navigation_bar.follows_and_followers": "Follows and followers", "navigation_bar.info": "About this instance", "navigation_bar.keyboard_shortcuts": "Hotkeys", "navigation_bar.lists": "Lists", @@ -244,6 +246,7 @@ "navigation_bar.personal": "Personal", "navigation_bar.pins": "Pinned toots", "navigation_bar.preferences": "Preferences", + "navigation_bar.profile_directory": "Profile directory", "navigation_bar.public_timeline": "Federated timeline", "navigation_bar.security": "Security", "notification.favourite": "{name} favourited your status", diff --git a/app/javascript/mastodon/locales/ms.json b/app/javascript/mastodon/locales/ms.json index cc384e7ed8..19312633a0 100644 --- a/app/javascript/mastodon/locales/ms.json +++ b/app/javascript/mastodon/locales/ms.json @@ -204,6 +204,7 @@ "keyboard_shortcuts.search": "to focus search", "keyboard_shortcuts.start": "to open \"get started\" column", "keyboard_shortcuts.toggle_hidden": "to show/hide text behind CW", + "keyboard_shortcuts.toggle_sensitivity": "to show/hide media", "keyboard_shortcuts.toot": "to start a brand new toot", "keyboard_shortcuts.unfocus": "to un-focus compose textarea/search", "keyboard_shortcuts.up": "to move up in the list", @@ -236,6 +237,7 @@ "navigation_bar.favourites": "Favourites", "navigation_bar.filters": "Muted words", "navigation_bar.follow_requests": "Follow requests", + "navigation_bar.follows_and_followers": "Follows and followers", "navigation_bar.info": "About this instance", "navigation_bar.keyboard_shortcuts": "Hotkeys", "navigation_bar.lists": "Lists", @@ -244,6 +246,7 @@ "navigation_bar.personal": "Personal", "navigation_bar.pins": "Pinned toots", "navigation_bar.preferences": "Preferences", + "navigation_bar.profile_directory": "Profile directory", "navigation_bar.public_timeline": "Federated timeline", "navigation_bar.security": "Security", "notification.favourite": "{name} favourited your status", diff --git a/app/javascript/mastodon/locales/nl.json b/app/javascript/mastodon/locales/nl.json index 3faf2aef47..60d24273d5 100644 --- a/app/javascript/mastodon/locales/nl.json +++ b/app/javascript/mastodon/locales/nl.json @@ -204,6 +204,7 @@ "keyboard_shortcuts.search": "om het zoekvak te focussen", "keyboard_shortcuts.start": "om de \"Aan de slag\"-kolom te tonen", "keyboard_shortcuts.toggle_hidden": "om tekst achter een waarschuwing (CW) te tonen/verbergen", + "keyboard_shortcuts.toggle_sensitivity": "to show/hide media", "keyboard_shortcuts.toot": "om een nieuwe toot te starten", "keyboard_shortcuts.unfocus": "om het tekst- en zoekvak te ontfocussen", "keyboard_shortcuts.up": "om omhoog te bewegen in de lijst", @@ -236,6 +237,7 @@ "navigation_bar.favourites": "Favorieten", "navigation_bar.filters": "Filters", "navigation_bar.follow_requests": "Volgverzoeken", + "navigation_bar.follows_and_followers": "Follows and followers", "navigation_bar.info": "Over deze server", "navigation_bar.keyboard_shortcuts": "Sneltoetsen", "navigation_bar.lists": "Lijsten", @@ -244,6 +246,7 @@ "navigation_bar.personal": "Persoonlijk", "navigation_bar.pins": "Vastgezette toots", "navigation_bar.preferences": "Instellingen", + "navigation_bar.profile_directory": "Profile directory", "navigation_bar.public_timeline": "Globale tijdlijn", "navigation_bar.security": "Beveiliging", "notification.favourite": "{name} voegde jouw toot als favoriet toe", diff --git a/app/javascript/mastodon/locales/no.json b/app/javascript/mastodon/locales/no.json index f039bcbfd9..ee7b504f96 100644 --- a/app/javascript/mastodon/locales/no.json +++ b/app/javascript/mastodon/locales/no.json @@ -204,6 +204,7 @@ "keyboard_shortcuts.search": "å fokusere søk", "keyboard_shortcuts.start": "to open \"get started\" column", "keyboard_shortcuts.toggle_hidden": "to show/hide text behind CW", + "keyboard_shortcuts.toggle_sensitivity": "to show/hide media", "keyboard_shortcuts.toot": "å starte en helt ny tut", "keyboard_shortcuts.unfocus": "å ufokusere komponerings-/søkefeltet", "keyboard_shortcuts.up": "å flytte opp i listen", @@ -236,6 +237,7 @@ "navigation_bar.favourites": "Favoritter", "navigation_bar.filters": "Muted words", "navigation_bar.follow_requests": "Følgeforespørsler", + "navigation_bar.follows_and_followers": "Follows and followers", "navigation_bar.info": "Utvidet informasjon", "navigation_bar.keyboard_shortcuts": "Tastatursnarveier", "navigation_bar.lists": "Lister", @@ -244,6 +246,7 @@ "navigation_bar.personal": "Personal", "navigation_bar.pins": "Festa tuter", "navigation_bar.preferences": "Preferanser", + "navigation_bar.profile_directory": "Profile directory", "navigation_bar.public_timeline": "Felles tidslinje", "navigation_bar.security": "Security", "notification.favourite": "{name} likte din status", diff --git a/app/javascript/mastodon/locales/oc.json b/app/javascript/mastodon/locales/oc.json index 7eaa422c90..3178f200de 100644 --- a/app/javascript/mastodon/locales/oc.json +++ b/app/javascript/mastodon/locales/oc.json @@ -204,6 +204,7 @@ "keyboard_shortcuts.search": "anar a la recèrca", "keyboard_shortcuts.start": "dobrir la colomna « Per començar »", "keyboard_shortcuts.toggle_hidden": "mostrar/amagar lo tèxte dels avertiments", + "keyboard_shortcuts.toggle_sensitivity": "to show/hide media", "keyboard_shortcuts.toot": "començar un estatut tot novèl", "keyboard_shortcuts.unfocus": "quitar lo camp tèxte/de recèrca", "keyboard_shortcuts.up": "far montar dins la lista", @@ -236,6 +237,7 @@ "navigation_bar.favourites": "Favorits", "navigation_bar.filters": "Mots ignorats", "navigation_bar.follow_requests": "Demandas d’abonament", + "navigation_bar.follows_and_followers": "Follows and followers", "navigation_bar.info": "Tocant aqueste servidor", "navigation_bar.keyboard_shortcuts": "Acorchis clavièr", "navigation_bar.lists": "Listas", @@ -244,6 +246,7 @@ "navigation_bar.personal": "Personal", "navigation_bar.pins": "Tuts penjats", "navigation_bar.preferences": "Preferéncias", + "navigation_bar.profile_directory": "Profile directory", "navigation_bar.public_timeline": "Flux public global", "navigation_bar.security": "Seguretat", "notification.favourite": "{name} a ajustat a sos favorits", diff --git a/app/javascript/mastodon/locales/pl.json b/app/javascript/mastodon/locales/pl.json index b32b29dc26..251057fec0 100644 --- a/app/javascript/mastodon/locales/pl.json +++ b/app/javascript/mastodon/locales/pl.json @@ -204,6 +204,7 @@ "keyboard_shortcuts.search": "aby przejść do pola wyszukiwania", "keyboard_shortcuts.start": "aby otworzyć kolumnę „Rozpocznij”", "keyboard_shortcuts.toggle_hidden": "aby wyświetlić lub ukryć wpis spod CW", + "keyboard_shortcuts.toggle_sensitivity": "to show/hide media", "keyboard_shortcuts.toot": "aby utworzyć nowy wpis", "keyboard_shortcuts.unfocus": "aby opuścić pole wyszukiwania/pisania", "keyboard_shortcuts.up": "aby przejść na górę listy", @@ -236,6 +237,7 @@ "navigation_bar.favourites": "Ulubione", "navigation_bar.filters": "Wyciszone słowa", "navigation_bar.follow_requests": "Prośby o śledzenie", + "navigation_bar.follows_and_followers": "Follows and followers", "navigation_bar.info": "Szczegółowe informacje", "navigation_bar.keyboard_shortcuts": "Skróty klawiszowe", "navigation_bar.lists": "Listy", @@ -244,6 +246,7 @@ "navigation_bar.personal": "Osobiste", "navigation_bar.pins": "Przypięte wpisy", "navigation_bar.preferences": "Preferencje", + "navigation_bar.profile_directory": "Profile directory", "navigation_bar.public_timeline": "Globalna oś czasu", "navigation_bar.security": "Bezpieczeństwo", "notification.favourite": "{name} dodał(a) Twój wpis do ulubionych", diff --git a/app/javascript/mastodon/locales/pt-BR.json b/app/javascript/mastodon/locales/pt-BR.json index 4cbd2296cf..dca087af95 100644 --- a/app/javascript/mastodon/locales/pt-BR.json +++ b/app/javascript/mastodon/locales/pt-BR.json @@ -204,6 +204,7 @@ "keyboard_shortcuts.search": "para focar a pesquisa", "keyboard_shortcuts.start": "para abrir a coluna \"primeiros passos\"", "keyboard_shortcuts.toggle_hidden": "mostrar/esconder o texto com aviso de conteúdo", + "keyboard_shortcuts.toggle_sensitivity": "to show/hide media", "keyboard_shortcuts.toot": "para compor um novo toot", "keyboard_shortcuts.unfocus": "para remover o foco da área de composição/pesquisa", "keyboard_shortcuts.up": "para mover para cima na lista", @@ -236,6 +237,7 @@ "navigation_bar.favourites": "Favoritos", "navigation_bar.filters": "Palavras silenciadas", "navigation_bar.follow_requests": "Seguidores pendentes", + "navigation_bar.follows_and_followers": "Follows and followers", "navigation_bar.info": "Mais informações", "navigation_bar.keyboard_shortcuts": "Atalhos de teclado", "navigation_bar.lists": "Listas", @@ -244,6 +246,7 @@ "navigation_bar.personal": "Pessoal", "navigation_bar.pins": "Postagens fixadas", "navigation_bar.preferences": "Preferências", + "navigation_bar.profile_directory": "Profile directory", "navigation_bar.public_timeline": "Global", "navigation_bar.security": "Segurança", "notification.favourite": "{name} adicionou a sua postagem aos favoritos", diff --git a/app/javascript/mastodon/locales/pt.json b/app/javascript/mastodon/locales/pt.json index b980dfa1cc..157090c55f 100644 --- a/app/javascript/mastodon/locales/pt.json +++ b/app/javascript/mastodon/locales/pt.json @@ -204,6 +204,7 @@ "keyboard_shortcuts.search": "para focar na pesquisa", "keyboard_shortcuts.start": "para abrir a coluna dos \"primeiros passos\"", "keyboard_shortcuts.toggle_hidden": "para mostrar/esconder texto atrás de CW", + "keyboard_shortcuts.toggle_sensitivity": "to show/hide media", "keyboard_shortcuts.toot": "para compor um novo post", "keyboard_shortcuts.unfocus": "para remover o foco da área de publicação/pesquisa", "keyboard_shortcuts.up": "para mover para cima na lista", @@ -236,6 +237,7 @@ "navigation_bar.favourites": "Favoritos", "navigation_bar.filters": "Palavras silenciadas", "navigation_bar.follow_requests": "Seguidores pendentes", + "navigation_bar.follows_and_followers": "Follows and followers", "navigation_bar.info": "Sobre este servidor", "navigation_bar.keyboard_shortcuts": "Atalhos de teclado", "navigation_bar.lists": "Listas", @@ -244,6 +246,7 @@ "navigation_bar.personal": "Personal", "navigation_bar.pins": "Posts fixos", "navigation_bar.preferences": "Preferências", + "navigation_bar.profile_directory": "Profile directory", "navigation_bar.public_timeline": "Global", "navigation_bar.security": "Segurança", "notification.favourite": "{name} adicionou o teu post aos favoritos", diff --git a/app/javascript/mastodon/locales/ro.json b/app/javascript/mastodon/locales/ro.json index 0021846d6c..dcb7a088df 100644 --- a/app/javascript/mastodon/locales/ro.json +++ b/app/javascript/mastodon/locales/ro.json @@ -204,6 +204,7 @@ "keyboard_shortcuts.search": "să focuseze căutarea", "keyboard_shortcuts.start": "să deschidă coloana \"Începere\"", "keyboard_shortcuts.toggle_hidden": "să arate/ascundă textul in spatele CW", + "keyboard_shortcuts.toggle_sensitivity": "to show/hide media", "keyboard_shortcuts.toot": "să înceapă o postare nouă", "keyboard_shortcuts.unfocus": "să dezactiveze zona de compunere/căutare", "keyboard_shortcuts.up": "să mute mai sus în listă", @@ -236,6 +237,7 @@ "navigation_bar.favourites": "Favorite", "navigation_bar.filters": "Cuvinte oprite", "navigation_bar.follow_requests": "Cereri de urmărire", + "navigation_bar.follows_and_followers": "Follows and followers", "navigation_bar.info": "Despre această instanță", "navigation_bar.keyboard_shortcuts": "Prescurtări", "navigation_bar.lists": "Liste", @@ -244,6 +246,7 @@ "navigation_bar.personal": "Personal", "navigation_bar.pins": "Postări fixate", "navigation_bar.preferences": "Preferințe", + "navigation_bar.profile_directory": "Profile directory", "navigation_bar.public_timeline": "Flux global", "navigation_bar.security": "Securitate", "notification.favourite": "{name} a adăugat statusul tău la favorite", diff --git a/app/javascript/mastodon/locales/ru.json b/app/javascript/mastodon/locales/ru.json index 9e8e4e3248..2b98ba96bb 100644 --- a/app/javascript/mastodon/locales/ru.json +++ b/app/javascript/mastodon/locales/ru.json @@ -204,6 +204,7 @@ "keyboard_shortcuts.search": "перейти к поиску", "keyboard_shortcuts.start": "перейти к разделу \"добро пожаловать\"", "keyboard_shortcuts.toggle_hidden": "показать/скрыть текст за предупреждением", + "keyboard_shortcuts.toggle_sensitivity": "to show/hide media", "keyboard_shortcuts.toot": "начать писать новый пост", "keyboard_shortcuts.unfocus": "убрать фокус с поля ввода/поиска", "keyboard_shortcuts.up": "вверх по списку", @@ -236,6 +237,7 @@ "navigation_bar.favourites": "Понравившееся", "navigation_bar.filters": "Заглушенные слова", "navigation_bar.follow_requests": "Запросы на подписку", + "navigation_bar.follows_and_followers": "Follows and followers", "navigation_bar.info": "Об узле", "navigation_bar.keyboard_shortcuts": "Сочетания клавиш", "navigation_bar.lists": "Списки", @@ -244,6 +246,7 @@ "navigation_bar.personal": "Личное", "navigation_bar.pins": "Закреплённые посты", "navigation_bar.preferences": "Опции", + "navigation_bar.profile_directory": "Profile directory", "navigation_bar.public_timeline": "Глобальная лента", "navigation_bar.security": "Безопасность", "notification.favourite": "{name} понравился Ваш статус", diff --git a/app/javascript/mastodon/locales/sk.json b/app/javascript/mastodon/locales/sk.json index 88fc73d015..56edf54697 100644 --- a/app/javascript/mastodon/locales/sk.json +++ b/app/javascript/mastodon/locales/sk.json @@ -204,6 +204,7 @@ "keyboard_shortcuts.search": "zameraj sa na vyhľadávanie", "keyboard_shortcuts.start": "otvor panel ''začíname''", "keyboard_shortcuts.toggle_hidden": "ukáž/skry text za CW", + "keyboard_shortcuts.toggle_sensitivity": "to show/hide media", "keyboard_shortcuts.toot": "začni úplne nový príspevok", "keyboard_shortcuts.unfocus": "nesústreď sa na písaciu plochu, alebo hľadanie", "keyboard_shortcuts.up": "posuň sa vyššie v zozname", @@ -236,6 +237,7 @@ "navigation_bar.favourites": "Obľúbené", "navigation_bar.filters": "Filtrované slová", "navigation_bar.follow_requests": "Žiadosti o sledovanie", + "navigation_bar.follows_and_followers": "Follows and followers", "navigation_bar.info": "O tomto serveri", "navigation_bar.keyboard_shortcuts": "Klávesové skratky", "navigation_bar.lists": "Zoznamy", @@ -244,6 +246,7 @@ "navigation_bar.personal": "Osobné", "navigation_bar.pins": "Pripnuté príspevky", "navigation_bar.preferences": "Voľby", + "navigation_bar.profile_directory": "Profile directory", "navigation_bar.public_timeline": "Federovaná časová os", "navigation_bar.security": "Zabezbečenie", "notification.favourite": "{name} si obľúbil/a tvoj príspevok", diff --git a/app/javascript/mastodon/locales/sl.json b/app/javascript/mastodon/locales/sl.json index 4c07165cd9..1f7082d82c 100644 --- a/app/javascript/mastodon/locales/sl.json +++ b/app/javascript/mastodon/locales/sl.json @@ -204,6 +204,7 @@ "keyboard_shortcuts.search": "to focus search", "keyboard_shortcuts.start": "to open \"get started\" column", "keyboard_shortcuts.toggle_hidden": "to show/hide text behind CW", + "keyboard_shortcuts.toggle_sensitivity": "to show/hide media", "keyboard_shortcuts.toot": "da začnete povsem nov tut", "keyboard_shortcuts.unfocus": "to un-focus compose textarea/search", "keyboard_shortcuts.up": "to move up in the list", @@ -236,6 +237,7 @@ "navigation_bar.favourites": "Favourites", "navigation_bar.filters": "Muted words", "navigation_bar.follow_requests": "Follow requests", + "navigation_bar.follows_and_followers": "Follows and followers", "navigation_bar.info": "O tem vozlišču", "navigation_bar.keyboard_shortcuts": "Keyboard shortcuts", "navigation_bar.lists": "Lists", @@ -244,6 +246,7 @@ "navigation_bar.personal": "Personal", "navigation_bar.pins": "Pripeti tuti", "navigation_bar.preferences": "Preferences", + "navigation_bar.profile_directory": "Profile directory", "navigation_bar.public_timeline": "Federated timeline", "navigation_bar.security": "Security", "notification.favourite": "{name} favourited your status", diff --git a/app/javascript/mastodon/locales/sq.json b/app/javascript/mastodon/locales/sq.json index 95bb7bd9d9..5dc6d1ceb6 100644 --- a/app/javascript/mastodon/locales/sq.json +++ b/app/javascript/mastodon/locales/sq.json @@ -204,6 +204,7 @@ "keyboard_shortcuts.search": "për kalim fokusi te kërkimi", "keyboard_shortcuts.start": "për hapjen e shtyllës \"fillojani\"", "keyboard_shortcuts.toggle_hidden": "për shfaqje/fshehje teksti pas CW", + "keyboard_shortcuts.toggle_sensitivity": "to show/hide media", "keyboard_shortcuts.toot": "për të filluar një mesazh fringo të ri", "keyboard_shortcuts.unfocus": "për heqjen e fokusit nga fusha e hartimit të mesazheve apo kërkimeve", "keyboard_shortcuts.up": "për ngjitje sipër nëpër listë", @@ -236,6 +237,7 @@ "navigation_bar.favourites": "Të parapëlqyer", "navigation_bar.filters": "Fjalë të heshtuara", "navigation_bar.follow_requests": "Kërkesa për ndjekje", + "navigation_bar.follows_and_followers": "Follows and followers", "navigation_bar.info": "Mbi këtë shërbyes", "navigation_bar.keyboard_shortcuts": "Taste përkatës", "navigation_bar.lists": "Lista", @@ -244,6 +246,7 @@ "navigation_bar.personal": "Personale", "navigation_bar.pins": "Mesazhe të fiksuar", "navigation_bar.preferences": "Parapëlqime", + "navigation_bar.profile_directory": "Profile directory", "navigation_bar.public_timeline": "Rrjedhë kohore të federuarish", "navigation_bar.security": "Siguri", "notification.favourite": "{name} parapëlqeu gjendjen tuaj", diff --git a/app/javascript/mastodon/locales/sr-Latn.json b/app/javascript/mastodon/locales/sr-Latn.json index 17ce3964c3..1e5e89919d 100644 --- a/app/javascript/mastodon/locales/sr-Latn.json +++ b/app/javascript/mastodon/locales/sr-Latn.json @@ -204,6 +204,7 @@ "keyboard_shortcuts.search": "da se prebacite na pretragu", "keyboard_shortcuts.start": "to open \"get started\" column", "keyboard_shortcuts.toggle_hidden": "to show/hide text behind CW", + "keyboard_shortcuts.toggle_sensitivity": "to show/hide media", "keyboard_shortcuts.toot": "da započnete skroz novi tut", "keyboard_shortcuts.unfocus": "da ne budete više na pretrazi/pravljenju novog tuta", "keyboard_shortcuts.up": "da se pomerite na gore u listi", @@ -236,6 +237,7 @@ "navigation_bar.favourites": "Omiljeni", "navigation_bar.filters": "Muted words", "navigation_bar.follow_requests": "Zahtevi za praćenje", + "navigation_bar.follows_and_followers": "Follows and followers", "navigation_bar.info": "O ovoj instanci", "navigation_bar.keyboard_shortcuts": "Prečice na tastaturi", "navigation_bar.lists": "Liste", @@ -244,6 +246,7 @@ "navigation_bar.personal": "Personal", "navigation_bar.pins": "Prikačeni tutovi", "navigation_bar.preferences": "Podešavanja", + "navigation_bar.profile_directory": "Profile directory", "navigation_bar.public_timeline": "Federisana lajna", "navigation_bar.security": "Security", "notification.favourite": "{name} je stavio Vaš status kao omiljeni", diff --git a/app/javascript/mastodon/locales/sr.json b/app/javascript/mastodon/locales/sr.json index 8c430f6b34..845abe7b28 100644 --- a/app/javascript/mastodon/locales/sr.json +++ b/app/javascript/mastodon/locales/sr.json @@ -204,6 +204,7 @@ "keyboard_shortcuts.search": "да се пребаците на претрагу", "keyboard_shortcuts.start": "да отворите колону \"почнимо\"", "keyboard_shortcuts.toggle_hidden": "да прикажете/сакријте текст иза CW-а", + "keyboard_shortcuts.toggle_sensitivity": "to show/hide media", "keyboard_shortcuts.toot": "да започнете скроз нову трубу", "keyboard_shortcuts.unfocus": "да одфокусирате/не будете више на претрази/прављењу нове трубе", "keyboard_shortcuts.up": "да се померите на горе у листи", @@ -236,6 +237,7 @@ "navigation_bar.favourites": "Омиљене", "navigation_bar.filters": "Пригушене речи", "navigation_bar.follow_requests": "Захтеви за праћење", + "navigation_bar.follows_and_followers": "Follows and followers", "navigation_bar.info": "О овој инстанци", "navigation_bar.keyboard_shortcuts": "Пречице на тастатури", "navigation_bar.lists": "Листе", @@ -244,6 +246,7 @@ "navigation_bar.personal": "Personal", "navigation_bar.pins": "Прикачене трубе", "navigation_bar.preferences": "Подешавања", + "navigation_bar.profile_directory": "Profile directory", "navigation_bar.public_timeline": "Здружена временска линија", "navigation_bar.security": "Безбедност", "notification.favourite": "{name} је ставио/ла Ваш статус као омиљени", diff --git a/app/javascript/mastodon/locales/sv.json b/app/javascript/mastodon/locales/sv.json index 52bf6e8269..44d0c3d30a 100644 --- a/app/javascript/mastodon/locales/sv.json +++ b/app/javascript/mastodon/locales/sv.json @@ -204,6 +204,7 @@ "keyboard_shortcuts.search": "att fokusera sökfältet", "keyboard_shortcuts.start": "to open \"get started\" column", "keyboard_shortcuts.toggle_hidden": "att visa/gömma text bakom CW", + "keyboard_shortcuts.toggle_sensitivity": "to show/hide media", "keyboard_shortcuts.toot": "att börja en helt ny toot", "keyboard_shortcuts.unfocus": "att avfokusera komponera text fält / sökfält", "keyboard_shortcuts.up": "att flytta upp i listan", @@ -236,6 +237,7 @@ "navigation_bar.favourites": "Favoriter", "navigation_bar.filters": "Muted words", "navigation_bar.follow_requests": "Följförfrågningar", + "navigation_bar.follows_and_followers": "Follows and followers", "navigation_bar.info": "Om denna instans", "navigation_bar.keyboard_shortcuts": "Tangentbordsgenvägar", "navigation_bar.lists": "Listor", @@ -244,6 +246,7 @@ "navigation_bar.personal": "Personal", "navigation_bar.pins": "Nålade inlägg (toots)", "navigation_bar.preferences": "Inställningar", + "navigation_bar.profile_directory": "Profile directory", "navigation_bar.public_timeline": "Förenad tidslinje", "navigation_bar.security": "Säkerhet", "notification.favourite": "{name} favoriserade din status", diff --git a/app/javascript/mastodon/locales/ta.json b/app/javascript/mastodon/locales/ta.json index cc384e7ed8..19312633a0 100644 --- a/app/javascript/mastodon/locales/ta.json +++ b/app/javascript/mastodon/locales/ta.json @@ -204,6 +204,7 @@ "keyboard_shortcuts.search": "to focus search", "keyboard_shortcuts.start": "to open \"get started\" column", "keyboard_shortcuts.toggle_hidden": "to show/hide text behind CW", + "keyboard_shortcuts.toggle_sensitivity": "to show/hide media", "keyboard_shortcuts.toot": "to start a brand new toot", "keyboard_shortcuts.unfocus": "to un-focus compose textarea/search", "keyboard_shortcuts.up": "to move up in the list", @@ -236,6 +237,7 @@ "navigation_bar.favourites": "Favourites", "navigation_bar.filters": "Muted words", "navigation_bar.follow_requests": "Follow requests", + "navigation_bar.follows_and_followers": "Follows and followers", "navigation_bar.info": "About this instance", "navigation_bar.keyboard_shortcuts": "Hotkeys", "navigation_bar.lists": "Lists", @@ -244,6 +246,7 @@ "navigation_bar.personal": "Personal", "navigation_bar.pins": "Pinned toots", "navigation_bar.preferences": "Preferences", + "navigation_bar.profile_directory": "Profile directory", "navigation_bar.public_timeline": "Federated timeline", "navigation_bar.security": "Security", "notification.favourite": "{name} favourited your status", diff --git a/app/javascript/mastodon/locales/te.json b/app/javascript/mastodon/locales/te.json index 39c697b0b2..269ea45c3b 100644 --- a/app/javascript/mastodon/locales/te.json +++ b/app/javascript/mastodon/locales/te.json @@ -204,6 +204,7 @@ "keyboard_shortcuts.search": "శోధనపై దృష్టి పెట్టండి", "keyboard_shortcuts.start": "\"ఇక్కడ ప్రారంభించండి\" నిలువు వరుసను తెరవడానికి", "keyboard_shortcuts.toggle_hidden": "CW వెనుక ఉన్న పాఠ్యాన్ని చూపడానికి / దాచడానికి", + "keyboard_shortcuts.toggle_sensitivity": "to show/hide media", "keyboard_shortcuts.toot": "ఒక సరికొత్త టూట్ను ప్రారంభించడానికి", "keyboard_shortcuts.unfocus": "పాఠ్యం వ్రాసే ఏరియా/శోధన పట్టిక నుండి బయటకు రావడానికి", "keyboard_shortcuts.up": "జాబితాలో పైకి తరలించడానికి", @@ -236,6 +237,7 @@ "navigation_bar.favourites": "ఇష్టపడినవి", "navigation_bar.filters": "మ్యూట్ చేయబడిన పదాలు", "navigation_bar.follow_requests": "అనుసరించడానికి అభ్యర్ధనలు", + "navigation_bar.follows_and_followers": "Follows and followers", "navigation_bar.info": "ఈ సేవిక గురించి", "navigation_bar.keyboard_shortcuts": "హాట్ కీలు", "navigation_bar.lists": "జాబితాలు", @@ -244,6 +246,7 @@ "navigation_bar.personal": "వ్యక్తిగతం", "navigation_bar.pins": "అతికించిన టూట్లు", "navigation_bar.preferences": "ప్రాధాన్యతలు", + "navigation_bar.profile_directory": "Profile directory", "navigation_bar.public_timeline": "సమాఖ్య కాలక్రమం", "navigation_bar.security": "భద్రత", "notification.favourite": "{name} మీ స్టేటస్ ను ఇష్టపడ్డారు", diff --git a/app/javascript/mastodon/locales/th.json b/app/javascript/mastodon/locales/th.json index 86997b70f8..95ecdc0c84 100644 --- a/app/javascript/mastodon/locales/th.json +++ b/app/javascript/mastodon/locales/th.json @@ -204,6 +204,7 @@ "keyboard_shortcuts.search": "to focus search", "keyboard_shortcuts.start": "to open \"get started\" column", "keyboard_shortcuts.toggle_hidden": "to show/hide text behind CW", + "keyboard_shortcuts.toggle_sensitivity": "to show/hide media", "keyboard_shortcuts.toot": "to start a brand new toot", "keyboard_shortcuts.unfocus": "to un-focus compose textarea/search", "keyboard_shortcuts.up": "to move up in the list", @@ -236,6 +237,7 @@ "navigation_bar.favourites": "รายการโปรด", "navigation_bar.filters": "คำที่ปิดเสียงอยู่", "navigation_bar.follow_requests": "คำขอติดตาม", + "navigation_bar.follows_and_followers": "Follows and followers", "navigation_bar.info": "เกี่ยวกับเซิร์ฟเวอร์นี้", "navigation_bar.keyboard_shortcuts": "ปุ่มลัด", "navigation_bar.lists": "รายการ", @@ -244,6 +246,7 @@ "navigation_bar.personal": "ส่วนบุคคล", "navigation_bar.pins": "โพสต์ที่ปักหมุด", "navigation_bar.preferences": "การกำหนดลักษณะ", + "navigation_bar.profile_directory": "Profile directory", "navigation_bar.public_timeline": "เส้นเวลาที่ติดต่อกับภายนอก", "navigation_bar.security": "ความปลอดภัย", "notification.favourite": "{name} ได้ชื่นชอบสถานะของคุณ", diff --git a/app/javascript/mastodon/locales/tr.json b/app/javascript/mastodon/locales/tr.json index c3a0791b5d..ec4657b9bf 100644 --- a/app/javascript/mastodon/locales/tr.json +++ b/app/javascript/mastodon/locales/tr.json @@ -204,6 +204,7 @@ "keyboard_shortcuts.search": "aramaya odaklanmak için", "keyboard_shortcuts.start": "\"başlayın\" sütununu açmak için", "keyboard_shortcuts.toggle_hidden": "CW'den önceki yazıyı göstermek/gizlemek için", + "keyboard_shortcuts.toggle_sensitivity": "to show/hide media", "keyboard_shortcuts.toot": "yeni bir gönderiye başlamak için", "keyboard_shortcuts.unfocus": "aramada bir gönderiye odaklanmamak için", "keyboard_shortcuts.up": "listede yukarıya çıkmak için", @@ -236,6 +237,7 @@ "navigation_bar.favourites": "Favoriler", "navigation_bar.filters": "Susturulmuş kelimeler", "navigation_bar.follow_requests": "Takip istekleri", + "navigation_bar.follows_and_followers": "Follows and followers", "navigation_bar.info": "Genişletilmiş bilgi", "navigation_bar.keyboard_shortcuts": "Klavye kısayolları", "navigation_bar.lists": "Listeler", @@ -244,6 +246,7 @@ "navigation_bar.personal": "Kişisel", "navigation_bar.pins": "Sabitlenmiş gönderiler", "navigation_bar.preferences": "Tercihler", + "navigation_bar.profile_directory": "Profile directory", "navigation_bar.public_timeline": "Federe zaman tüneli", "navigation_bar.security": "Güvenlik", "notification.favourite": "{name} senin durumunu favorilere ekledi", diff --git a/app/javascript/mastodon/locales/uk.json b/app/javascript/mastodon/locales/uk.json index d02b652ffb..8aca4c1e79 100644 --- a/app/javascript/mastodon/locales/uk.json +++ b/app/javascript/mastodon/locales/uk.json @@ -204,6 +204,7 @@ "keyboard_shortcuts.search": "сфокусуватися на пошуку", "keyboard_shortcuts.start": "to open \"get started\" column", "keyboard_shortcuts.toggle_hidden": "показати/приховати прихований текст", + "keyboard_shortcuts.toggle_sensitivity": "to show/hide media", "keyboard_shortcuts.toot": "почати писати новий дмух", "keyboard_shortcuts.unfocus": "розфокусуватися з нового допису чи пошуку", "keyboard_shortcuts.up": "рухатися вверх списком", @@ -236,6 +237,7 @@ "navigation_bar.favourites": "Вподобане", "navigation_bar.filters": "Приховані слова", "navigation_bar.follow_requests": "Запити на підписку", + "navigation_bar.follows_and_followers": "Follows and followers", "navigation_bar.info": "Про сайт", "navigation_bar.keyboard_shortcuts": "Гарячі клавіши", "navigation_bar.lists": "Списки", @@ -244,6 +246,7 @@ "navigation_bar.personal": "Особисте", "navigation_bar.pins": "Закріплені дмухи", "navigation_bar.preferences": "Налаштування", + "navigation_bar.profile_directory": "Profile directory", "navigation_bar.public_timeline": "Глобальна стрічка", "navigation_bar.security": "Безпека", "notification.favourite": "{name} вподобав(-ла) ваш допис", diff --git a/app/javascript/mastodon/locales/zh-CN.json b/app/javascript/mastodon/locales/zh-CN.json index 960d4bb951..f6e3d73d3d 100644 --- a/app/javascript/mastodon/locales/zh-CN.json +++ b/app/javascript/mastodon/locales/zh-CN.json @@ -204,6 +204,7 @@ "keyboard_shortcuts.search": "选择搜索框", "keyboard_shortcuts.start": "to open \"get started\" column", "keyboard_shortcuts.toggle_hidden": "显示或隐藏被折叠的正文", + "keyboard_shortcuts.toggle_sensitivity": "to show/hide media", "keyboard_shortcuts.toot": "发送新嘟文", "keyboard_shortcuts.unfocus": "取消输入", "keyboard_shortcuts.up": "在列表中让光标上移", @@ -236,6 +237,7 @@ "navigation_bar.favourites": "收藏的内容", "navigation_bar.filters": "Muted words", "navigation_bar.follow_requests": "关注请求", + "navigation_bar.follows_and_followers": "Follows and followers", "navigation_bar.info": "关于本站", "navigation_bar.keyboard_shortcuts": "快捷键列表", "navigation_bar.lists": "列表", @@ -244,6 +246,7 @@ "navigation_bar.personal": "个人", "navigation_bar.pins": "置顶嘟文", "navigation_bar.preferences": "首选项", + "navigation_bar.profile_directory": "Profile directory", "navigation_bar.public_timeline": "跨站公共时间轴", "navigation_bar.security": "安全", "notification.favourite": "{name} 收藏了你的嘟文", diff --git a/app/javascript/mastodon/locales/zh-HK.json b/app/javascript/mastodon/locales/zh-HK.json index a2d7b0e828..d7303b91b5 100644 --- a/app/javascript/mastodon/locales/zh-HK.json +++ b/app/javascript/mastodon/locales/zh-HK.json @@ -204,6 +204,7 @@ "keyboard_shortcuts.search": "把標示移動到搜索", "keyboard_shortcuts.start": "to open \"get started\" column", "keyboard_shortcuts.toggle_hidden": "顯示或隱藏被標為敏感的文字", + "keyboard_shortcuts.toggle_sensitivity": "to show/hide media", "keyboard_shortcuts.toot": "新的推文", "keyboard_shortcuts.unfocus": "把標示移離文字輸入和搜索", "keyboard_shortcuts.up": "在列表往上移動", @@ -236,6 +237,7 @@ "navigation_bar.favourites": "最愛的內容", "navigation_bar.filters": "Muted words", "navigation_bar.follow_requests": "關注請求", + "navigation_bar.follows_and_followers": "Follows and followers", "navigation_bar.info": "關於本服務站", "navigation_bar.keyboard_shortcuts": "鍵盤快速鍵", "navigation_bar.lists": "列表", @@ -244,6 +246,7 @@ "navigation_bar.personal": "Personal", "navigation_bar.pins": "置頂文章", "navigation_bar.preferences": "偏好設定", + "navigation_bar.profile_directory": "Profile directory", "navigation_bar.public_timeline": "跨站時間軸", "navigation_bar.security": "安全", "notification.favourite": "{name} 收藏了你的文章", diff --git a/app/javascript/mastodon/locales/zh-TW.json b/app/javascript/mastodon/locales/zh-TW.json index 7b01ce4dd2..5715ef01a1 100644 --- a/app/javascript/mastodon/locales/zh-TW.json +++ b/app/javascript/mastodon/locales/zh-TW.json @@ -204,6 +204,7 @@ "keyboard_shortcuts.search": "將焦點移至搜尋框", "keyboard_shortcuts.start": "開啟「開始使用」欄位", "keyboard_shortcuts.toggle_hidden": "顯示/隱藏在內容警告之後的正文", + "keyboard_shortcuts.toggle_sensitivity": "to show/hide media", "keyboard_shortcuts.toot": "開始發出新嘟文", "keyboard_shortcuts.unfocus": "取消輸入文字區塊 / 搜尋的焦點", "keyboard_shortcuts.up": "在名單中往上移動", @@ -236,6 +237,7 @@ "navigation_bar.favourites": "最愛內容", "navigation_bar.filters": "靜音詞彙", "navigation_bar.follow_requests": "關注請求", + "navigation_bar.follows_and_followers": "Follows and followers", "navigation_bar.info": "關於此伺服器", "navigation_bar.keyboard_shortcuts": "快速鍵", "navigation_bar.lists": "名單", @@ -244,6 +246,7 @@ "navigation_bar.personal": "個人", "navigation_bar.pins": "釘選的嘟文", "navigation_bar.preferences": "偏好設定", + "navigation_bar.profile_directory": "Profile directory", "navigation_bar.public_timeline": "聯邦時間軸", "navigation_bar.security": "安全性", "notification.favourite": "{name} 把你的嘟文加入了最愛", From 13f112c1163efe002a94e4b52c47a48deeb40389 Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Sun, 9 Jun 2019 15:53:08 +0200 Subject: [PATCH 17/27] Bump version to 2.9.0rc1 (#11004) --- CHANGELOG.md | 51 +++++++++++++++++++++++++++++++++++++++++ lib/mastodon/version.rb | 6 ++--- 2 files changed, 54 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f183b6f5ad..3059a5f9d4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,57 @@ Changelog All notable changes to this project will be documented in this file. +## [Unreleased] +### Added + +- **Add single-column mode in web UI** ([Gargron](https://github.com/tootsuite/mastodon/pull/10807), [Gargron](https://github.com/tootsuite/mastodon/pull/10848), [Gargron](https://github.com/tootsuite/mastodon/pull/11003), [Gargron](https://github.com/tootsuite/mastodon/pull/10961), [Hanage999](https://github.com/tootsuite/mastodon/pull/10915), [noellabo](https://github.com/tootsuite/mastodon/pull/10917), [abcang](https://github.com/tootsuite/mastodon/pull/10859), [Gargron](https://github.com/tootsuite/mastodon/pull/10820), [Gargron](https://github.com/tootsuite/mastodon/pull/10835), [Gargron](https://github.com/tootsuite/mastodon/pull/10809), [Gargron](https://github.com/tootsuite/mastodon/pull/10963), [noellabo](https://github.com/tootsuite/mastodon/pull/10883), [Hanage999](https://github.com/tootsuite/mastodon/pull/10839)) +- Add waiting time to the list of pending accounts in admin UI ([Gargron](https://github.com/tootsuite/mastodon/pull/10985)) +- Add a keyboard shortcut to hide/show media in web UI ([ThibG](https://github.com/tootsuite/mastodon/pull/10647), [Gargron](https://github.com/tootsuite/mastodon/pull/10838), [ThibG](https://github.com/tootsuite/mastodon/pull/10872)) +- Add `account_id` param to `GET /api/v1/notifications` ([pwoolcoc](https://github.com/tootsuite/mastodon/pull/10796)) +- Add confirmation modal for unboosting toots in web UI ([aurelien-reeves](https://github.com/tootsuite/mastodon/pull/10287)) +- Add emoji suggestions to content warning and poll option fields in web UI ([ThibG](https://github.com/tootsuite/mastodon/pull/10555)) +- Add `source` attribute to response of `DELETE /api/v1/statuses/:id` ([ThibG](https://github.com/tootsuite/mastodon/pull/10669)) +- Add some caching for HTML versions of public status pages ([ThibG](https://github.com/tootsuite/mastodon/pull/10701)) + +### Changed + +- **Change default layout to single column in web UI** ([Gargron](https://github.com/tootsuite/mastodon/pull/10847)) +- **Change light theme** ([Gargron](https://github.com/tootsuite/mastodon/pull/10992), [Gargron](https://github.com/tootsuite/mastodon/pull/10996), [yuzulabo](https://github.com/tootsuite/mastodon/pull/10754), [Gargron](https://github.com/tootsuite/mastodon/pull/10845)) +- **Change preferences page into appearance, notifications, and other** ([Gargron](https://github.com/tootsuite/mastodon/pull/10977), [Gargron](https://github.com/tootsuite/mastodon/pull/10988)) +- Change priority of delete activity forwards for replies and reblogs ([Gargron](https://github.com/tootsuite/mastodon/pull/11002)) +- Change Mastodon logo to use primary text color of the given theme ([Gargron](https://github.com/tootsuite/mastodon/pull/10994)) +- Change reblogs counter to be updated when boosted privately ([Gargron](https://github.com/tootsuite/mastodon/pull/10964)) +- Change bio limit from 160 to 500 characters ([trwnh](https://github.com/tootsuite/mastodon/pull/10790)) +- Change API rate limiting to reduce allowed unauthenticated requests ([ThibG](https://github.com/tootsuite/mastodon/pull/10860), [hinaloe](https://github.com/tootsuite/mastodon/pull/10868), [mayaeh](https://github.com/tootsuite/mastodon/pull/10867)) +- Change help text of `tootctl emoji import` command to specify a gzipped TAR archive is required ([dariusk](https://github.com/tootsuite/mastodon/pull/11000)) +- Change web UI to hide poll options behind content warnings ([ThibG](https://github.com/tootsuite/mastodon/pull/10983)) +- Change silencing to ensure local effects and remote effects are the same for silenced local users ([ThibG](https://github.com/tootsuite/mastodon/pull/10575)) +- Change `tootctl domains purge` to remove custom emoji as well ([Kjwon15](https://github.com/tootsuite/mastodon/pull/10721)) +- Change Docker image to keep `apt` working ([SuperSandro2000](https://github.com/tootsuite/mastodon/pull/10830)) + +### Removed + +- Remove `dist-upgrade` from Docker image ([SuperSandro2000](https://github.com/tootsuite/mastodon/pull/10822)) + +### Fixed + +- Fix RTL layout not being RTL within the columns area in web UI ([Gargron](https://github.com/tootsuite/mastodon/pull/10990)) +- Fix display of alternative text when a media attachment is not available in web UI ([ThibG](https://github.com/tootsuite/mastodon/pull/10981)) +- Fix not being able to directly switch between list timelines in web UI ([Gargron](https://github.com/tootsuite/mastodon/pull/10973)) +- Fix media sensitivity not being maintained in delete & redraft in web UI ([ThibG](https://github.com/tootsuite/mastodon/pull/10980)) +- Fix emoji picker being always displayed in web UI ([noellabo](https://github.com/tootsuite/mastodon/pull/10979), [yuzulabo](https://github.com/tootsuite/mastodon/pull/10801), [wcpaez](https://github.com/tootsuite/mastodon/pull/10978)) +- Fix potential private status leak through caching ([ThibG](https://github.com/tootsuite/mastodon/pull/10969)) +- Fix refreshing featured toots when the new collection is empty in web UI ([ThibG](https://github.com/tootsuite/mastodon/pull/10971)) +- Fix undoing domain block also undoing individual moderation on users from before the domain block ([ThibG](https://github.com/tootsuite/mastodon/pull/10660)) +- Fix time not being local in the audit log ([yuzulabo](https://github.com/tootsuite/mastodon/pull/10751)) +- Fix statuses removed by moderation re-appearing on subsequent fetches ([Kjwon15](https://github.com/tootsuite/mastodon/pull/10732)) +- Fix misattribution of inlined announces if `attributedTo` isn't present in ActivityPub ([ThibG](https://github.com/tootsuite/mastodon/pull/10967)) +- Fix `GET /api/v1/polls/:id` not requiring authentication for non-public polls ([Gargron](https://github.com/tootsuite/mastodon/pull/10960)) +- Fix handling of blank poll options in ActivityPub ([ThibG](https://github.com/tootsuite/mastodon/pull/10946)) +- Fix avatar preview aspect ratio on edit profile page ([Kjwon15](https://github.com/tootsuite/mastodon/pull/10931)) +- Fix web push notifications not being sent for polls ([ThibG](https://github.com/tootsuite/mastodon/pull/10864)) +- Fix cut off letters in last paragraph of statuses in web UI ([ariasuni](https://github.com/tootsuite/mastodon/pull/10821)) + ## [2.8.4] - 2019-05-24 ### Fixed diff --git a/lib/mastodon/version.rb b/lib/mastodon/version.rb index 59ded05f78..8b0eb598d5 100644 --- a/lib/mastodon/version.rb +++ b/lib/mastodon/version.rb @@ -9,11 +9,11 @@ module Mastodon end def minor - 8 + 9 end def patch - 4 + 0 end def pre @@ -21,7 +21,7 @@ module Mastodon end def flags - '' + 'rc1' end def to_a From 6d44010dd49048bcef56526a4a635b96bf268476 Mon Sep 17 00:00:00 2001 From: Alix Rossi Date: Sun, 9 Jun 2019 16:23:30 +0200 Subject: [PATCH 18/27] i18n: Update Corsican front-end translation (#11010) --- app/javascript/mastodon/locales/co.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/javascript/mastodon/locales/co.json b/app/javascript/mastodon/locales/co.json index 6061713717..f439d4b19a 100644 --- a/app/javascript/mastodon/locales/co.json +++ b/app/javascript/mastodon/locales/co.json @@ -246,7 +246,7 @@ "navigation_bar.personal": "Persunale", "navigation_bar.pins": "Statuti puntarulati", "navigation_bar.preferences": "Preferenze", - "navigation_bar.profile_directory": "Profile directory", + "navigation_bar.profile_directory": "Annuariu di i prufili", "navigation_bar.public_timeline": "Linea pubblica glubale", "navigation_bar.security": "Sicurità", "notification.favourite": "{name} hà aghjuntu u vostru statutu à i so favuriti", From bd5ab2542c3ab6617e80d7a8c1c41143fa3cf3f5 Mon Sep 17 00:00:00 2001 From: Jeong Arm Date: Mon, 10 Jun 2019 04:07:50 +0900 Subject: [PATCH 19/27] Add missing Korean translations (#11014) --- config/locales/ko.yml | 9 +++++++++ config/locales/simple_form.ko.yml | 2 ++ 2 files changed, 11 insertions(+) diff --git a/config/locales/ko.yml b/config/locales/ko.yml index 274f68df74..ba459d2441 100644 --- a/config/locales/ko.yml +++ b/config/locales/ko.yml @@ -174,6 +174,7 @@ ko: statuses: 툿 수 subscribe: 구독하기 suspended: 정지 됨 + time_in_queue: "%{time}동안 기다림" title: 계정 unconfirmed_email: 미확인 된 이메일 주소 undo_silenced: 침묵 해제 @@ -500,6 +501,12 @@ ko: body: "%{reporter} 가 %{target} 를 신고했습니다" body_remote: "%{domain}의 누군가가 %{target}을 신고했습니다" subject: "%{instance} 에 새 신고 등록됨 (#%{id})" + appearance: + advanced_web_interface: 고급 웹 인터페이스 + advanced_web_interface_hint: '화면의 가로폭을 가득 채우고 싶다면, 고급 웹 인터페이스는 한 번에 여러 정보를 볼 수 있도록 여러 컬럼을 설정할 수 있도록 합니다: 홈, 알림, 연합타임라인, 리스트, 해시태그 등' + animations_and_accessibility: 애니메이션과 접근성 + confirmation_dialogs: 확인 대화상자 + sensitive_content: 민감한 내용 application_mailer: notification_preferences: 메일 설정 변경 salutation: "%{name} 님," @@ -780,6 +787,8 @@ ko: too_many_options: 항목은 %{max}개를 넘을 수 없습니다 preferences: other: 기타 + posting_defaults: 게시물 기본설정 + public_timelines: 공개 타임라인 relationships: activity: 계정 활동 dormant: 휴면 diff --git a/config/locales/simple_form.ko.yml b/config/locales/simple_form.ko.yml index 6d3f1b679a..efa11f7f0b 100644 --- a/config/locales/simple_form.ko.yml +++ b/config/locales/simple_form.ko.yml @@ -27,6 +27,7 @@ ko: phrase: 툿 내용이나 CW 내용 안에서 대소문자 구분 없이 매칭 됩니다 scopes: 애플리케이션에 허용할 API들입니다. 최상위 스코프를 선택하면 개별적인 것은 선택하지 않아도 됩니다. setting_aggregate_reblogs: 내가 부스트 했던 툿은 새로 부스트 되어도 보여주지 않습니다 + setting_default_sensitive: 민감한 미디어는 기본적으로 가려져 있으며 클릭해서 볼 수 있습니다 setting_display_media_default: 민감함으로 설정 된 미디어 가리기 setting_display_media_hide_all: 항상 모든 미디어를 가리기 setting_display_media_show_all: 민감함으로 설정 된 미디어를 항상 보이기 @@ -131,6 +132,7 @@ ko: reblog: 누군가 내 툿을 부스트 했을 때 이메일 보내기 report: 새 신고 등록시 이메일로 알리기 'no': 아니오 + recommended: 추천함 required: mark: "*" text: 필수 항목 From 585aa16ec01cbabb1b29fec9e0995b6c95f97533 Mon Sep 17 00:00:00 2001 From: ThibG Date: Sun, 9 Jun 2019 22:55:28 +0200 Subject: [PATCH 20/27] Fix old migrations failing because of new version of `strong_migrations` (#11018) --- db/migrate/20180402040909_create_report_notes.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/db/migrate/20180402040909_create_report_notes.rb b/db/migrate/20180402040909_create_report_notes.rb index 732ddf8259..429cb45349 100644 --- a/db/migrate/20180402040909_create_report_notes.rb +++ b/db/migrate/20180402040909_create_report_notes.rb @@ -8,7 +8,7 @@ class CreateReportNotes < ActiveRecord::Migration[5.1] t.timestamps end - add_foreign_key :report_notes, :reports, column: :report_id, on_delete: :cascade - add_foreign_key :report_notes, :accounts, column: :account_id, on_delete: :cascade + safety_assured { add_foreign_key :report_notes, :reports, column: :report_id, on_delete: :cascade } + safety_assured { add_foreign_key :report_notes, :accounts, column: :account_id, on_delete: :cascade } end end From 843bc1d3da4ada35e71b32d2383b8c7126702fdb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20=C4=BDach?= Date: Sun, 9 Jun 2019 22:55:37 +0200 Subject: [PATCH 21/27] Update sk.yml (#11015) * Update sk.yml * Update sk.yml * Update sk.yml * Update sk.yml * Update sk.yml * Update sk.yml --- config/locales/sk.yml | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/config/locales/sk.yml b/config/locales/sk.yml index 412f283b80..2bd340c901 100644 --- a/config/locales/sk.yml +++ b/config/locales/sk.yml @@ -111,7 +111,7 @@ sk: email_status: Stav emailu enable: Povoľ enabled: Povolený - feed_url: URL adresa časovej osi + feed_url: adresa časovej osi followers: Sledujúci followers_url: URL adresa sledujúcich follows: Sledovania @@ -226,9 +226,9 @@ sk: copy: Kopíruj copy_failed_msg: Nebolo možné vytvoriť miestnu kópiu tohto emoji created_msg: Emoji úspešne vytvorené! - delete: Zmazať - destroyed_msg: Emojo úspešne zničený! - disable: Zakázať + delete: Zmaž + destroyed_msg: Emoji úspešne zničené! + disable: Zakáž disabled_msg: Emoji bolo úspešne zakázané emoji: Emotikony enable: Povoľ @@ -388,7 +388,7 @@ sk: resolved_msg: Hlásenie úspešne vyriešené! status: Stav title: Hlásenia - unassign: Odobrať + unassign: Odober unresolved: Nevyriešené updated_at: Aktualizované settings: @@ -503,8 +503,13 @@ sk: body: "%{reporter} nahlásil/a %{target}" body_remote: Niekto z %{domain} nahlásil/a %{target} subject: Nové hlásenie pre %{instance} (#%{id}) + appearance: + advanced_web_interface: Pokročilé webové rozhranie + animations_and_accessibility: Animácie a prístupnosť + confirmation_dialogs: Potvrdzovacie dialógy + sensitive_content: Chúlostivý obsah application_mailer: - notification_preferences: Zmeniť e-mailové voľby + notification_preferences: Zmeň emailové voľby salutation: "%{name}," settings: 'Zmeň emailové voľby: %{link}' view: 'Zobraziť:' From efe4ef1b20cb54ee0011833bb43d132ca7f16d6a Mon Sep 17 00:00:00 2001 From: manuelviens Date: Mon, 10 Jun 2019 00:07:11 -0400 Subject: [PATCH 22/27] Update fr.json (#11024) --- app/javascript/mastodon/locales/fr.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/javascript/mastodon/locales/fr.json b/app/javascript/mastodon/locales/fr.json index 0dcee350d3..fe97bc9745 100644 --- a/app/javascript/mastodon/locales/fr.json +++ b/app/javascript/mastodon/locales/fr.json @@ -237,7 +237,7 @@ "navigation_bar.favourites": "Favoris", "navigation_bar.filters": "Mots silenciés", "navigation_bar.follow_requests": "Demandes de suivi", - "navigation_bar.follows_and_followers": "Follows and followers", + "navigation_bar.follows_and_followers": "Abonnements et abonné⋅e·s", "navigation_bar.info": "Plus d’informations", "navigation_bar.keyboard_shortcuts": "Raccourcis clavier", "navigation_bar.lists": "Listes", @@ -246,7 +246,7 @@ "navigation_bar.personal": "Personnel", "navigation_bar.pins": "Pouets épinglés", "navigation_bar.preferences": "Préférences", - "navigation_bar.profile_directory": "Profile directory", + "navigation_bar.profile_directory": "Annuaire des profils", "navigation_bar.public_timeline": "Fil public global", "navigation_bar.security": "Sécurité", "notification.favourite": "{name} a ajouté à ses favoris :", From 2e12b42f2b79ca3e81eb2e0af2b831569db47c13 Mon Sep 17 00:00:00 2001 From: manuelviens Date: Mon, 10 Jun 2019 00:12:28 -0400 Subject: [PATCH 23/27] Update fr.yml (#11023) --- config/locales/fr.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/config/locales/fr.yml b/config/locales/fr.yml index 2b06c77611..e4614e50ad 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -174,6 +174,7 @@ fr: statuses: Statuts subscribe: S’abonner suspended: Suspendu + time_in_queue: En file d’attente %{time} title: Comptes unconfirmed_email: Courriel non-confirmé undo_silenced: Démasquer @@ -498,6 +499,12 @@ fr: body: "%{reporter} a signalé %{target}" body_remote: Quelqu’un de %{domain} a signalé %{target} subject: Nouveau signalement sur %{instance} (#%{id}) + appearance: + advanced_web_interface: Interface web avancée + advanced_web_interface_hint: 'Si vous voulez utiliser toute la largeur de votre écran, l’interface web avancée vous permet de configurer plusieurs colonnes différentes pour voir autant d’informations que vous le souhaitez en même temps : Accueil, notifications, fil public fédéré, un nombre illimité de listes et hashtags.' + animations_and_accessibility: Animations et accessibilité + confirmation_dialogs: Dialogues de confirmation + sensitive_content: Contenu sensible application_mailer: notification_preferences: Modifier les préférences de courriel salutation: "%{name}," @@ -778,6 +785,8 @@ fr: too_many_options: ne peut contenir plus que %{max} propositions preferences: other: Autre + posting_defaults: Paramètres par défaut des pouets + public_timelines: Fils publics relationships: activity: Activité du compte dormant: Dormant From 602bccc0abef984accb1315fb59f62781e8f955a Mon Sep 17 00:00:00 2001 From: manuelviens Date: Mon, 10 Jun 2019 00:12:51 -0400 Subject: [PATCH 24/27] Update simple_form.fr.yml (#11021) --- config/locales/simple_form.fr.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/config/locales/simple_form.fr.yml b/config/locales/simple_form.fr.yml index 26f8d1a5ae..a1f9e293c8 100644 --- a/config/locales/simple_form.fr.yml +++ b/config/locales/simple_form.fr.yml @@ -27,6 +27,7 @@ fr: phrase: Sera trouvé sans que la case ou l’avertissement de contenu du pouet soit pris en compte scopes: À quelles APIs l’application sera autorisée à accéder. Si vous sélectionnez un périmètre de haut-niveau, vous n’avez pas besoin de sélectionner les individuels. setting_aggregate_reblogs: Ne pas afficher de nouveaux repartagés pour les pouets qui ont été récemment repartagés (n’affecte que les repartagés nouvellement reçus) + setting_default_sensitive: Les médias sensibles sont cachés par défaut et peuvent être révélés d’un simple clic setting_display_media_default: Masquer les supports marqués comme sensibles setting_display_media_hide_all: Toujours masquer tous les médias setting_display_media_show_all: Toujours afficher les médias marqués comme sensibles @@ -88,6 +89,7 @@ fr: otp_attempt: Code d’identification à deux facteurs password: Mot de passe phrase: Mot-clé ou phrase + setting_advanced_layout: Activer l’interface Web avancée setting_aggregate_reblogs: Repartagés en groupe dans la ligne de temps setting_auto_play_gif: Lire automatiquement les GIFs animés setting_boost_modal: Afficher une fenêtre de confirmation avant de partager @@ -130,6 +132,7 @@ fr: reblog: Envoyer un courriel lorsque quelqu’un partage mes statuts report: Envoyer un courriel lorsqu’un nouveau rapport est soumis 'no': Non + recommended: Recommandé required: mark: "*" text: Champs requis From 30946461be352a18b7182b907ddc74f70d939182 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20=C4=BDach?= Date: Mon, 10 Jun 2019 09:25:27 +0200 Subject: [PATCH 25/27] Update simple_form.sk.yml (#11028) --- config/locales/simple_form.sk.yml | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/config/locales/simple_form.sk.yml b/config/locales/simple_form.sk.yml index 5314b55350..86148e03ab 100644 --- a/config/locales/simple_form.sk.yml +++ b/config/locales/simple_form.sk.yml @@ -27,7 +27,8 @@ sk: phrase: Zhoda sa nájde nezávisle od toho, či je text napísaný, veľkými, alebo malými písmenami, či už v tele, alebo v hlavičke scopes: Ktoré API budú povolené aplikácii pre prístup. Ak vyberieš vrcholný stupeň, nemusíš už potom vyberať po jednom. setting_aggregate_reblogs: Nezobrazuj nové vyzdvihnutia pre príspevky, ktoré už boli len nedávno povýšené (týka sa iba nanovo získaných povýšení) - setting_display_media_default: Skry médiá označené ako citlivé + setting_default_sensitive: Chúlostivé médiá sú štandardne ukryté, a môžu byť zobrazené kliknutím + setting_display_media_default: Ukry médiá označené ako citlivé setting_display_media_hide_all: Vždy ukry všetky médiá setting_display_media_show_all: Stále zobrazuj médiá označené ako citlivé setting_hide_network: Koho následuješ, a kto následuje teba, nebude zobrazené na tvojom profile @@ -44,7 +45,7 @@ sk: sessions: otp: 'Napíš sem dvoj-faktorový kód z telefónu, alebo použi jeden z tvojích obnovovacích kódov:' user: - chosen_languages: Keď je zaškrtnuté, tak iba príspevky vo vybraných jazykoch budú zobrazené vo verejnej osi + chosen_languages: Keď je zaškrtnuté, vo verejnej osi budú zobrazené iba príspevky vo vybraných jazykoch labels: account: fields: @@ -53,7 +54,7 @@ sk: account_warning_preset: text: Text predlohy admin_account_action: - send_email_notification: Oznám užívateľovi cez email + send_email_notification: Oznam užívateľovi cez email text: Špecifické varovanie type: Úkon types: @@ -75,14 +76,14 @@ sk: discoverable: Zaraď tento účet do databázy profilov display_name: Zobrazované meno email: Emailová adresa - expires_in: Expirovať po + expires_in: Expiruj po fields: Metadáta profilu header: Obrázok v hlavičke inbox_url: URL adresa prechodnej schránky - irreversible: Zahoď, namiesto skritia + irreversible: Zahoď, namiesto ukrytia locale: Jazyk rozhrania locked: Zamknúť účet - max_uses: Maximálne možno použiť + max_uses: Najviac možno použiť new_password: Nové heslo note: O tebe otp_attempt: Dvoj-faktorový overovací (2FA) kód @@ -98,10 +99,10 @@ sk: setting_delete_modal: Zobrazuj potvrdzovacie okno pred vymazaním toot-u setting_display_media: Zobrazovanie médií setting_display_media_default: Štandard - setting_display_media_hide_all: Skry všetky + setting_display_media_hide_all: Ukry všetky setting_display_media_show_all: Ukáž všetky setting_expand_spoilers: Stále rozbaľ príspevky označené varovaním o obsahu - setting_hide_network: Ukri svoju sieť kontaktov + setting_hide_network: Ukry svoju sieť kontaktov setting_noindex: Nezaraďuj príspevky do indexu pre vyhľadávče setting_reduce_motion: Mierni pohyb pri animáciách setting_show_application: Zverejni akú aplikáciu používaš na posielanie príspevkov From 42a53e57d7344e3c9fc9bc6ced499ecf5d2e1ea8 Mon Sep 17 00:00:00 2001 From: mayaeh Date: Mon, 10 Jun 2019 19:27:17 +0900 Subject: [PATCH 26/27] Fix emoji-button appearing above privacy-dropdown (#11027) --- .../mastodon/features/compose/components/privacy_dropdown.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/javascript/mastodon/features/compose/components/privacy_dropdown.js b/app/javascript/mastodon/features/compose/components/privacy_dropdown.js index 3288f81f82..d02a55be00 100644 --- a/app/javascript/mastodon/features/compose/components/privacy_dropdown.js +++ b/app/javascript/mastodon/features/compose/components/privacy_dropdown.js @@ -129,7 +129,7 @@ class PrivacyDropdownMenu extends React.PureComponent { // It should not be transformed when mounting because the resulting // size will be used to determine the coordinate of the menu by // react-overlays -
+
{items.map(item => (
From 75ef673216511373672e02e04907848299bdd4b0 Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Mon, 10 Jun 2019 12:28:13 +0200 Subject: [PATCH 27/27] Fix login sometimes redirecting to paths that are not pages (#11019) Fix #11016 --- app/controllers/custom_css_controller.rb | 2 ++ app/controllers/manifests_controller.rb | 2 ++ app/controllers/media_controller.rb | 2 ++ app/controllers/media_proxy_controller.rb | 2 ++ 4 files changed, 8 insertions(+) diff --git a/app/controllers/custom_css_controller.rb b/app/controllers/custom_css_controller.rb index be768c0894..6e80feaf83 100644 --- a/app/controllers/custom_css_controller.rb +++ b/app/controllers/custom_css_controller.rb @@ -1,6 +1,8 @@ # frozen_string_literal: true class CustomCssController < ApplicationController + skip_before_action :store_current_location + before_action :set_cache_headers def show diff --git a/app/controllers/manifests_controller.rb b/app/controllers/manifests_controller.rb index ac267c2294..332d845d82 100644 --- a/app/controllers/manifests_controller.rb +++ b/app/controllers/manifests_controller.rb @@ -1,6 +1,8 @@ # frozen_string_literal: true class ManifestsController < ApplicationController + skip_before_action :store_current_location + def show render json: InstancePresenter.new, serializer: ManifestSerializer end diff --git a/app/controllers/media_controller.rb b/app/controllers/media_controller.rb index 8e1624ce1b..a245db2d1c 100644 --- a/app/controllers/media_controller.rb +++ b/app/controllers/media_controller.rb @@ -3,6 +3,8 @@ class MediaController < ApplicationController include Authorization + skip_before_action :store_current_location + before_action :set_media_attachment before_action :verify_permitted_status! diff --git a/app/controllers/media_proxy_controller.rb b/app/controllers/media_proxy_controller.rb index d820b257e0..950cf6d09f 100644 --- a/app/controllers/media_proxy_controller.rb +++ b/app/controllers/media_proxy_controller.rb @@ -3,6 +3,8 @@ class MediaProxyController < ApplicationController include RoutingHelper + skip_before_action :store_current_location + def show RedisLock.acquire(lock_options) do |lock| if lock.acquired?