From 1db4117030ac69b1083ddfe7390dedb02cede421 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Fri, 7 Jun 2019 03:39:24 +0200
Subject: [PATCH] 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 | 48 ++++---------------
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, 129 insertions(+), 295 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
- .fields-group
- = f.input :setting_aggregate_reblogs, as: :boolean, wrapper: :with_label
+ %h4= t 'preferences.public_timelines'
.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 <a href='%{sign_up_path}' target='_blank'>rexistrate equÃ</a>"
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
--
GitLab