diff --git a/app/controllers/relationships_controller.rb b/app/controllers/relationships_controller.rb new file mode 100644 index 0000000000000000000000000000000000000000..e6dd65e4455f7b7c5bb71f8b6d4ec28e059b6024 --- /dev/null +++ b/app/controllers/relationships_controller.rb @@ -0,0 +1,98 @@ +# frozen_string_literal: true + +class RelationshipsController < ApplicationController + layout 'admin' + + before_action :authenticate_user! + before_action :set_accounts, only: :show + before_action :set_body_classes + + helper_method :following_relationship?, :followed_by_relationship?, :mutual_relationship? + + def show + @form = Form::AccountBatch.new + end + + def update + @form = Form::AccountBatch.new(form_account_batch_params.merge(current_account: current_account, action: action_from_button)) + @form.save + rescue ActionController::ParameterMissing + # Do nothing + ensure + redirect_to relationships_path(current_params) + end + + private + + def set_accounts + @accounts = relationships_scope.page(params[:page]).per(40) + end + + def relationships_scope + scope = begin + if following_relationship? + current_account.following.includes(:account_stat) + else + current_account.followers.includes(:account_stat) + end + end + + scope.merge!(Follow.recent) + scope.merge!(mutual_relationship_scope) if mutual_relationship? + scope.merge!(abandoned_account_scope) if params[:status] == 'abandoned' + scope.merge!(active_account_scope) if params[:status] == 'active' + scope.merge!(by_domain_scope) if params[:by_domain].present? + + scope + end + + def mutual_relationship_scope + Account.where(id: current_account.following) + end + + def abandoned_account_scope + Account.where.not(moved_to_account_id: nil) + end + + def active_account_scope + Account.where(moved_to_account_id: nil) + end + + def by_domain_scope + Account.where(domain: params[:by_domain]) + end + + def form_account_batch_params + params.require(:form_account_batch).permit(:action, account_ids: []) + end + + def following_relationship? + params[:relationship].blank? || params[:relationship] == 'following' + end + + def mutual_relationship? + params[:relationship] == 'mutual' + end + + def followed_by_relationship? + params[:relationship] == 'followed_by' + end + + def current_params + params.slice(:page, :status, :relationship, :by_domain).permit(:page, :status, :relationship, :by_domain) + end + + def action_from_button + if params[:unfollow] + 'unfollow' + elsif params[:remove_from_followers] + 'remove_from_followers' + elsif params[:block_domains] + 'block_domains' + end + end + + def set_body_classes + @body_classes = 'admin' + end +end diff --git a/app/controllers/settings/follower_domains_controller.rb b/app/controllers/settings/follower_domains_controller.rb deleted file mode 100644 index ce8ec985d62b5772a09f0ce3ee058b4b1606fd35..0000000000000000000000000000000000000000 --- a/app/controllers/settings/follower_domains_controller.rb +++ /dev/null @@ -1,28 +0,0 @@ -# frozen_string_literal: true - -class Settings::FollowerDomainsController < Settings::BaseController - layout 'admin' - - before_action :authenticate_user! - - def show - @account = current_account - @domains = current_account.followers.reorder(Arel.sql('MIN(follows.id) DESC')).group('accounts.domain').select('accounts.domain, count(accounts.id) as accounts_from_domain').page(params[:page]).per(10) - end - - def update - domains = bulk_params[:select] || [] - - AfterAccountDomainBlockWorker.push_bulk(domains) do |domain| - [current_account.id, domain] - end - - redirect_to settings_follower_domains_path, notice: I18n.t('followers.success', count: domains.size) - end - - private - - def bulk_params - params.permit(select: []) - end -end diff --git a/app/helpers/admin/filter_helper.rb b/app/helpers/admin/filter_helper.rb index 8f78bf5f846de0acb5ff92095a7260a5f1dc8324..09a35629694a3cf094b8e42de4b5b372e90853a5 100644 --- a/app/helpers/admin/filter_helper.rb +++ b/app/helpers/admin/filter_helper.rb @@ -7,8 +7,9 @@ module Admin::FilterHelper CUSTOM_EMOJI_FILTERS = %i(local remote by_domain shortcode).freeze TAGS_FILTERS = %i(hidden).freeze INSTANCES_FILTERS = %i(limited by_domain).freeze + FOLLOWERS_FILTERS = %i(relationship status by_domain).freeze - FILTERS = ACCOUNT_FILTERS + REPORT_FILTERS + INVITE_FILTER + CUSTOM_EMOJI_FILTERS + TAGS_FILTERS + INSTANCES_FILTERS + FILTERS = ACCOUNT_FILTERS + REPORT_FILTERS + INVITE_FILTER + CUSTOM_EMOJI_FILTERS + TAGS_FILTERS + INSTANCES_FILTERS + FOLLOWERS_FILTERS def filter_link_to(text, link_to_params, link_class_params = link_to_params) new_url = filtered_url_for(link_to_params) diff --git a/app/javascript/styles/mastodon/tables.scss b/app/javascript/styles/mastodon/tables.scss index 9e87856795523814f171b5c6823b58efd52ed8a6..d3a0ea03d026efcc7da68e56e3397b9e1fbc7963 100644 --- a/app/javascript/styles/mastodon/tables.scss +++ b/app/javascript/styles/mastodon/tables.scss @@ -140,6 +140,15 @@ a.table-action-link { input { margin-top: 8px; } + + &--aligned { + display: flex; + align-items: center; + + input { + margin-top: 0; + } + } } &__actions, @@ -183,6 +192,10 @@ a.table-action-link { &__content { padding-top: 12px; padding-bottom: 16px; + + &--unpadded { + padding: 0; + } } } @@ -197,4 +210,10 @@ a.table-action-link { font-weight: 700; } } + + .nothing-here { + border: 1px solid darken($ui-base-color, 8%); + border-top: 0; + box-shadow: none; + } } diff --git a/app/models/form/account_batch.rb b/app/models/form/account_batch.rb new file mode 100644 index 0000000000000000000000000000000000000000..60eaaf0e2bae0e65804e77eae8701640e32a6cb5 --- /dev/null +++ b/app/models/form/account_batch.rb @@ -0,0 +1,60 @@ +# frozen_string_literal: true + +class Form::AccountBatch + include ActiveModel::Model + + attr_accessor :account_ids, :action, :current_account + + def save + case action + when 'unfollow' + unfollow! + when 'remove_from_followers' + remove_from_followers! + when 'block_domains' + block_domains! + end + end + + private + + def unfollow! + accounts.find_each do |target_account| + UnfollowService.new.call(current_account, target_account) + end + end + + def remove_from_followers! + current_account.passive_relationships.where(account_id: account_ids).find_each do |follow| + reject_follow!(follow) + end + end + + def block_domains! + AfterAccountDomainBlockWorker.push_bulk(account_domains) do |domain| + [current_account.id, domain] + end + end + + def account_domains + accounts.pluck(Arel.sql('distinct domain')).compact + end + + def accounts + Account.where(id: account_ids) + end + + def reject_follow!(follow) + follow.destroy + + return unless follow.account.activitypub? + + json = ActiveModelSerializers::SerializableResource.new( + follow, + serializer: ActivityPub::RejectFollowSerializer, + adapter: ActivityPub::Adapter + ).to_json + + ActivityPub::DeliveryWorker.perform_async(json, current_account.id, follow.account.inbox_url) + end +end diff --git a/app/views/relationships/_account.html.haml b/app/views/relationships/_account.html.haml new file mode 100644 index 0000000000000000000000000000000000000000..6c22deb515e26bcb02f6a2088854d705edd228fd --- /dev/null +++ b/app/views/relationships/_account.html.haml @@ -0,0 +1,20 @@ +.batch-table__row + %label.batch-table__row__select.batch-table__row__select--aligned.batch-checkbox + = f.check_box :account_ids, { multiple: true, include_hidden: false }, account.id + .batch-table__row__content.batch-table__row__content--unpadded + %table.accounts-table + %tbody + %tr + %td= account_link_to account + %td.accounts-table__count.optional + = number_to_human account.statuses_count, strip_insignificant_zeros: true + %small= t('accounts.posts', count: account.statuses_count).downcase + %td.accounts-table__count.optional + = number_to_human account.followers_count, strip_insignificant_zeros: true + %small= t('accounts.followers', count: account.followers_count).downcase + %td.accounts-table__count + - if account.last_status_at.present? + %time.time-ago{ datetime: account.last_status_at.iso8601, title: l(account.last_status_at) }= l account.last_status_at + - else + \- + %small= t('accounts.last_active') diff --git a/app/views/relationships/show.html.haml b/app/views/relationships/show.html.haml new file mode 100644 index 0000000000000000000000000000000000000000..33a43f1a87c62d9d1230f50a8886b8ec87146d8d --- /dev/null +++ b/app/views/relationships/show.html.haml @@ -0,0 +1,43 @@ +- content_for :page_title do + = t('settings.relationships') + +- content_for :header_tags do + = javascript_pack_tag 'admin', integrity: true, async: true, crossorigin: 'anonymous' + +.filters + .filter-subset + %strong= t 'relationships.relationship' + %ul + %li= filter_link_to t('accounts.following', count: current_account.following_count), relationship: nil + %li= filter_link_to t('accounts.followers', count: current_account.followers_count), relationship: 'followed_by' + %li= filter_link_to t('relationships.mutual'), relationship: 'mutual' + + .filter-subset + %strong= t 'relationships.status' + %ul + %li= filter_link_to t('generic.all'), status: nil + %li= filter_link_to t('relationships.active'), status: 'active' + %li= filter_link_to t('relationships.abandoned'), status: 'abandoned' + += form_for(@form, url: relationships_path, method: :patch) do |f| + = hidden_field_tag :page, params[:page] || 1 + = hidden_field_tag :relationship, params[:relationship] + = hidden_field_tag :status, params[:status] + + .batch-table + .batch-table__toolbar + %label.batch-table__toolbar__select.batch-checkbox-all + = check_box_tag :batch_checkbox_all, nil, false + .batch-table__toolbar__actions + = f.button safe_join([fa_icon('user-times'), t('relationships.remove_selected_follows')]), name: :unfollow, class: 'table-action-link', type: :submit, data: { confirm: t('admin.reports.are_you_sure') } unless followed_by_relationship? + + = f.button safe_join([fa_icon('trash'), t('relationships.remove_selected_followers')]), name: :remove_from_followers, class: 'table-action-link', type: :submit, data: { confirm: t('admin.reports.are_you_sure') } unless following_relationship? + + = f.button safe_join([fa_icon('trash'), t('relationships.remove_selected_domains')]), name: :block_domains, class: 'table-action-link', type: :submit, data: { confirm: t('admin.reports.are_you_sure') } if followed_by_relationship? + .batch-table__body + - if @accounts.empty? + = nothing_here 'nothing-here--under-tabs' + - else + = render partial: 'account', collection: @accounts, locals: { f: f } + += paginate @accounts diff --git a/app/views/settings/follower_domains/show.html.haml b/app/views/settings/follower_domains/show.html.haml deleted file mode 100644 index f1687d4d2f176ed70c3ae28e99914ac56bee2168..0000000000000000000000000000000000000000 --- a/app/views/settings/follower_domains/show.html.haml +++ /dev/null @@ -1,34 +0,0 @@ -- content_for :page_title do - = t('settings.followers') - -= form_tag settings_follower_domains_path, method: :patch, class: 'table-form' do - - unless @account.locked? - .warning - %strong - = fa_icon('warning') - = t('followers.unlocked_warning_title') - = t('followers.unlocked_warning_html', lock_link: link_to(t('followers.lock_link'), settings_profile_url)) - - %p= t('followers.explanation_html') - %p= t('followers.true_privacy_html') - - .table-wrapper - %table.table - %thead - %tr - %th - %th= t('followers.domain') - %th= t('followers.followers_count') - %tbody - - @domains.each do |domain| - %tr - %td - = check_box_tag 'select[]', domain.domain, false, disabled: !@account.locked? unless domain.domain.nil? - %td - %samp= domain.domain.presence || Rails.configuration.x.local_domain - %td= number_with_delimiter domain.accounts_from_domain - - .action-pagination - .actions - = button_tag t('followers.purge'), type: :submit, class: 'button', disabled: !@account.locked? - = paginate @domains diff --git a/config/locales/ar.yml b/config/locales/ar.yml index b0b8d8b40df454d5e04c9adc367d92bde5c0c6e9..d409ad99ac2d00c10eb1a6b063a6cefbedd455d3 100644 --- a/config/locales/ar.yml +++ b/config/locales/ar.yml @@ -607,15 +607,6 @@ ar: title: عوامل التصÙية new: title: Ø¥Ø¶Ø§ÙØ© عامل تصÙية جديد - followers: - domain: النطاق - followers_count: عدد Ø§Ù„Ù…ØªØ§Ø¨ÙØ¹ÙŠÙ† - lock_link: قم بتجميد ØØ³Ø§Ø¨Ùƒ - purge: تنØÙŠØ© من بين متابعيك - success: جارية عملية ØØ¸Ø± Ø§Ù„Ù…ØªØ§Ø¨ÙØ¹ÙŠÙ† بسلاسة من %{count} نطاقات أخرى ... - true_privacy_html: تذكر دائمًا أنّ <strong>الخصوصية التامة لا يمكن بلوغها إلّا بالتعمية Ùˆ التشÙير من طر٠إلى آخَر</strong>. - unlocked_warning_html: يمكن لأي كان متابعة ØØ³Ø§Ø¨Ùƒ Ùˆ الإطلاع مباشرة على تبويقاتك. إستخدÙÙ… %{lock_link} Ù„Ù…ÙØ¹Ø§ÙŠÙ†Ø© أو Ø±ÙØ¶ طلبات Ø§Ù„Ù…ØªØ§Ø¨ÙØ¹ÙŠÙ† Ø§Ù„Ø¬ÙØ¯Ùد. - unlocked_warning_title: إنّ ØØ³Ø§Ø¨Ùƒ غير مقÙÙ„ footer: developers: المطورون more: المزيد … @@ -818,7 +809,6 @@ ar: development: التطوير edit_profile: تعديل المل٠الشخصي export: تصدير البيانات - followers: Ø§Ù„Ù…ØªØ§Ø¨ÙØ¹ÙˆÙ† Ø§Ù„Ù…ÙØ±ÙŽØ®Ù‘صون import: إستيراد migrate: تهجير Ø§Ù„ØØ³Ø§Ø¨ notifications: الإخطارات diff --git a/config/locales/ast.yml b/config/locales/ast.yml index ebf6a379982cddac74c4c18848a6b9db19147b2a..cbfd27b047ef10e7f2a51bc7c1eda641a93e7f53 100644 --- a/config/locales/ast.yml +++ b/config/locales/ast.yml @@ -182,10 +182,6 @@ ast: title: Peñeres new: title: Amestar una peñera nueva - followers: - domain: Dominiu - followers_count: Númberu de siguidores - purge: Desaniciar de los siguidores generic: changes_saved_msg: "¡Los cambeos guardáronse con ésitu!" save_changes: Guardar cambeos @@ -302,7 +298,6 @@ ast: back: Volver a Mastodon edit_profile: Edición del perfil export: Esportación de datos - followers: Siguidores autorizaos import: Importación notifications: Avisos preferences: Preferencies diff --git a/config/locales/ca.yml b/config/locales/ca.yml index 417ba95f75a0897b1c12d17d3a09a14b719d430c..4f5012d56de54976cb32d5881011a61851dbe675 100644 --- a/config/locales/ca.yml +++ b/config/locales/ca.yml @@ -588,18 +588,6 @@ ca: title: Filtres new: title: Afegir nou filtre - followers: - domain: Domini - explanation_html: Si desitges garantir la privacitat de les teves publicacions, has de ser conscient de qui t'està seguint. <strong> Les publicacions privades es lliuren a totes les instà ncies on tens seguidors </strong>. És possible que vulguis revisar-los i eliminar seguidors si no confies en que la teva privacitat sigui respectada pel personal o el programari d'aquestes instà ncies. - followers_count: Nombre de seguidors - lock_link: Bloca el teu compte - purge: Elimina dels seguidors - success: - one: En el procés de bloqueig suau de seguidors d'un domini... - other: En el procés de bloqueig suau de seguidors de %{count} dominis... - true_privacy_html: Considera que <strong>la autèntica privacitat només es pot aconseguir amb xifratge d'extrem a extrem</strong>. - unlocked_warning_html: Tothom pot seguir-te per a veure inmediatament les teves publicacions privades. %{lock_link} per poder revisar i rebutjar seguidors. - unlocked_warning_title: El teu compte no està blocat footer: developers: Desenvolupadors more: Més… @@ -785,7 +773,6 @@ ca: development: Desenvolupament edit_profile: Editar perfil export: Exportar informació - followers: Seguidors autoritzats import: Importar migrate: Migració del compte notifications: Notificacions diff --git a/config/locales/co.yml b/config/locales/co.yml index 77c3efeda748f047e49fb9ae4e32736ecf8152d0..651d297810f1645d825206a6a040ee9d4778e73d 100644 --- a/config/locales/co.yml +++ b/config/locales/co.yml @@ -593,18 +593,6 @@ co: title: Filtri new: title: Aghjustà un novu filtru - followers: - domain: Duminiu - explanation_html: Per assicuravi di a cunfidenzialità di i vostri statuti, duvete avè primura di quale vi seguita. <strong>I vostri statuti privati sò mandati à tutti i servori induve avete abbunati</strong>. Pensate à u vostru livellu di cunfidenza in i so amministratori. - followers_count: Numeru d’abbunati - lock_link: Rendete u contu privatu - purge: Toglie di a lista d’abbunati - success: - one: Suppressione di l’abbunati d’un duminiu... - other: Suppressione di l’abbunati da %{count} duminii... - true_privacy_html: Ùn vi scurdate chì <strong>una vera cunfidenzialità pò solu esse ottenuta cù crittografia da un capu à l’altru</strong>. - unlocked_warning_html: Tuttu u mondu pò seguitavi è vede i vostri statuti privati. %{lock_link} per pudè cunfirmà o righjittà abbunamenti. - unlocked_warning_title: U vostru contu hè pubblicu footer: developers: Sviluppatori more: Di più… @@ -807,7 +795,6 @@ co: edit_profile: Mudificà u prufile export: Spurtazione d’infurmazione featured_tags: Hashtag in vista - followers: Abbunati auturizati import: Impurtazione migrate: Migrazione di u contu notifications: Nutificazione diff --git a/config/locales/cs.yml b/config/locales/cs.yml index b0b317ac8000a7f0cb167931f6a2e27c428e8f6e..97e68eb4edb61ed19b71a1a78db4181fd425e5bf 100644 --- a/config/locales/cs.yml +++ b/config/locales/cs.yml @@ -628,19 +628,6 @@ cs: title: Filtry new: title: PÅ™idat nový filtr - followers: - domain: Doména - explanation_html: Chcete-li zaruÄit soukromà vaÅ¡ich tootů, musÃte mÃt na vÄ›domÃ, kdo vás sleduje. <strong>VaÅ¡e soukromé tooty jsou doruÄeny na vÅ¡echny servery, kde máte sledujÃcÃ</strong>. NejspÃÅ¡ si je budete chtÃt zkontrolovat a odstranit sledujÃcà na serverech, jejichž provozovatelům Äi softwaru nedůvěřujete s respektovánÃm vaÅ¡eho soukromÃ. - followers_count: PoÄet sledujÃcÃch - lock_link: UzamknÄ›te svůj úÄet - purge: Odstranit ze sledujÃcÃch - success: - few: V průbÄ›hu blokovánà sledujÃcÃch ze %{count} domén... - one: V průbÄ›hu blokovánà sledujÃcÃch z jedné domény... - other: V průbÄ›hu blokovánà sledujÃcÃch z %{count} domén... - true_privacy_html: Berte prosÃm na vÄ›domÃ, že <strong>skuteÄného soukromà se dá dosáhnout pouze za pomoci end-to-end Å¡ifrovánÃ</strong>. - unlocked_warning_html: Kdokoliv vás může sledovat a okamžitÄ› vidÄ›t vaÅ¡e soukromé tooty. %{lock_link}, abyste mohl/a kontrolovat a odmÃtat sledujÃcÃ. - unlocked_warning_title: Váš úÄet nenà uzamÄen footer: developers: Vývojáři more: VÃce… @@ -846,7 +833,6 @@ cs: edit_profile: Upravit profil export: Export dat featured_tags: ZvýraznÄ›né hashtagy - followers: Autorizovanà sledujÃcà import: Import migrate: PÅ™esunutà úÄtu notifications: Oznámenà diff --git a/config/locales/cy.yml b/config/locales/cy.yml index b6f94606d0a8be0d73276b7548eca07f86747c5b..900aedd572f79a44fbba08209d9da810027cf0a4 100644 --- a/config/locales/cy.yml +++ b/config/locales/cy.yml @@ -614,22 +614,6 @@ cy: title: Hidlyddion new: title: Ychwanegu hidlydd newydd - followers: - domain: Parth - explanation_html: Os ydych am sicrhau preifatrwydd eich tŵtiau, rhaid i chi fod yn ymwybodol o bwy sy'n eich dilyn. <strong>Mae eich tŵtiau preifat yn cael eu hanfon at bob achos lle mae gennych ddilynwyr</strong>. Efallai hoffech chi i'w hadolygu o bryd i'w gilydd, a chael gwared ar ddilynwyr os nad ydych yn credu i'r staff neu'r meddalwedd ar yr achosion hynny barchu eich preifatrwydd. - followers_count: Nifer y dilynwyr - lock_link: Cloi eich cyfrif - purge: Dileu o dilynwyr - success: - few: Yn y broses o ysgafn-flocio defnyddwyr o %{count} parth... - many: Yn y broses o ysgafn-flocio defnyddwyr o %{count} parth... - one: Yn y broses o ysgafn-flocio dilynwyr o un parth... - other: Yn y broses o ysgafn-flocio defnyddwyr o %{count} parth... - two: Yn y broses o ysgafn-flocio defnyddwyr o %{count} parth... - zero: Yn y broses o ysgafn-flocio defnyddwyr o %{count} parth... - true_privacy_html: Cofiwch <strong>mai ond amgryptio pen-i-ben all sicrhau gwir breifatrwydd</strong>. - unlocked_warning_html: Gall unrhywun eich dilyn yn syth i weld eich tŵtiau preifat. %{lock_link} i gael adolygu a gwrthod dilynwyr. - unlocked_warning_title: Nid yw eich cyfrif wedi ei gloi footer: developers: Datblygwyr more: Mwy… @@ -815,7 +799,6 @@ cy: development: Datblygu edit_profile: Golygu proffil export: Allforio data - followers: Dilynwyr awdurdodedig import: Mewnforio migrate: Mudo cyfrif notifications: Hysbysiadau diff --git a/config/locales/da.yml b/config/locales/da.yml index a44a345d7aeb543042ea3fa205edaf6aae0b82b2..4953f70dff2b82bc8aff132602a59b3ab76f2ce6 100644 --- a/config/locales/da.yml +++ b/config/locales/da.yml @@ -526,18 +526,6 @@ da: title: Filtrer new: title: Tilføj nyt filter - followers: - domain: Domæne - explanation_html: Hvis du vil sikre dig privatliv over dine statusser, skal du være klar over hvem der følger dig. <strong>Dine private statusser leveres til alle instanser som du har følger fra</strong>. Det kan være en ide at gennemgÃ¥ dem, og fjerne følgere hvis du ikke føler dit privatliv respekteres af personalet eller software fra disse instanser. - followers_count: Antal følgere - lock_link: LÃ¥s din konto - purge: Fjern fra følgere - success: - one: I gang med at soft-blokere følgere fra et domæne... - other: I gang med at soft-blokere følgere fra %{count} domæner... - true_privacy_html: Husk pÃ¥, at <strong>sand privatliv kan kun opnÃ¥s via end-to-end kryptering</strong>. - unlocked_warning_html: Alle kan følge dig med det samme for at se dine private statusser. %{lock_link} for at være i stand til at gennemse og afvise følgere. - unlocked_warning_title: Din konto er ikke lÃ¥st footer: developers: Udviklere more: Mere… @@ -708,7 +696,6 @@ da: development: Udvikling edit_profile: Rediger profil export: Data eksportering - followers: Godkendte følgere import: Importer migrate: Konto migrering notifications: Notifikationer diff --git a/config/locales/de.yml b/config/locales/de.yml index ae2948fb5e309d2e755e975a714ebac4f65c8b0f..5c095c58aca60ed88c26714c83a04e002be817e1 100644 --- a/config/locales/de.yml +++ b/config/locales/de.yml @@ -592,18 +592,6 @@ de: title: Filter new: title: Neuen Filter hinzufügen - followers: - domain: Instanz - explanation_html: Wenn du sicherstellen willst, dass deine Beiträge privat sind, musst du wissen, wer dir folgt. <strong>Deine privaten Beiträge werden an alle Server weitergegeben, auf denen Menschen registriert sind, die dir folgen.</strong> Wenn du den Betreibenden eines Servers misstraust und du befürchtest, dass sie deine Privatsphäre missachten könnten, kannst du sie hier entfernen. - followers_count: Zahl der Folgenden - lock_link: dein Konto sperrst - purge: Von der Liste deiner Folgenden löschen - success: - one: Folgende von einer Domain werden soft-geblockt … - other: Folgende von %{count} Domains werden soft-geblockt … - true_privacy_html: Bitte beachte, dass <strong>wirklicher Schutz deiner Privatsphäre nur durch Ende-zu-Ende-Verschlüsselung erreicht werden kann.</strong>. - unlocked_warning_html: Wer dir folgen will, kann dies jederzeit ohne deine vorige Einverständnis tun und erhält damit automatisch Zugriff auf deine privaten Beiträge. Wenn du %{lock_link}, kannst du vorab entscheiden, wer dir folgen darf und wer nicht. - unlocked_warning_title: Dein Konto ist nicht gesperrt footer: developers: Entwickler more: Mehr… @@ -796,7 +784,6 @@ de: edit_profile: Profil bearbeiten export: Datenexport featured_tags: Empfohlene Hashtags - followers: Autorisierte Folgende import: Datenimport migrate: Konto-Umzug notifications: Benachrichtigungen diff --git a/config/locales/el.yml b/config/locales/el.yml index f5a2c5d4bc02f0a6c03810ced251f519566da173..d78d63955809c65583eced74a90ba55b80f387eb 100644 --- a/config/locales/el.yml +++ b/config/locales/el.yml @@ -593,18 +593,6 @@ el: title: ΦίλτÏα new: title: Î Ïόσθεσε νÎο φίλτÏο - followers: - domain: ΤομÎας - explanation_html: Αν θÎλεις να διασφαλίσεις την ιδιωτικότητα των ενημεÏώσεών σου, Ï€ÏÎπει να ξÎÏεις ποιος σε ακολουθεί. <strong>Οι ιδιωτικÎÏ‚ ενημεÏώσεις σου μεταφÎÏονται σε όλους τους κόμβους στους οποίους Îχεις ακόλουθους</strong>. Ίσως να θÎλεις να κάνεις μια ανασκόπηση σε αυτοÏÏ‚ και να αφαιÏÎσεις ακολοÏθους αν δεν εμπιστεÏεσαι το Ï€Ïοσωπικό αυτών των κόμβων πως θα σεβαστοÏν την ιδιωτικότητά σου. - followers_count: Πλήθος ακολοÏθων - lock_link: Κλείδωσε το λογαÏιασμό σου - purge: ΑφαίÏεσε από ακόλουθο - success: - one: Ημι-μπλοκάÏοντας τους ακόλουθους από Îναν τομÎα... - other: Ημι-μπλοκάÏοντας τους ακόλουθους από %{count} τομείς... - true_privacy_html: Έχε Ï…Ï€' όψιν σου πως <strong>η Ï€Ïαγματική ιδιωτικότητα επιτυγχάνεται μόνο με κÏυπτογÏάφηση από άκÏη σε άκÏη</strong>. - unlocked_warning_html: ΜποÏεί ο οποιοσδήποτε να σε ακολουθήσει και να βλÎπει κατευθείαν τις ιδιωτικÎÏ‚ ενημεÏώσεις σου. %{lock_link} για να αναθεωÏήσεις και αποÏÏίψεις ακόλουθους. - unlocked_warning_title: Ο λογαÏιασμός σου δεν είναι κλειδωμÎνος footer: developers: Ανάπτυξη more: ΠεÏισσότεÏα… @@ -806,7 +794,6 @@ el: edit_profile: ΕπεξεÏγασία Ï€Ïοφίλ export: Εξαγωγή δεδομÎνων featured_tags: ΧαÏακτηÏιστικÎÏ‚ ταμπÎλες - followers: ΕγκεκÏιμÎνοι ακόλουθοι import: Εισαγωγή migrate: Μετακόμιση λογαÏÎ¹Î±ÏƒÎ¼Î¿Ï notifications: Ειδοποιήσεις diff --git a/config/locales/en.yml b/config/locales/en.yml index d11aa9262848340fc4a2f8433a6a5814a46678e1..4f9104eeabcff233e99c55e81340e38c6794377f 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -621,23 +621,12 @@ en: title: Filters new: title: Add new filter - followers: - domain: Domain - explanation_html: If you want to ensure the privacy of your statuses, you must be aware of who is following you. <strong>Your private statuses are delivered to all servers where you have followers</strong>. You may wish to review them, and remove followers if you do not trust your privacy to be respected by the staff or software of those servers. - followers_count: Number of followers - lock_link: Lock your account - purge: Remove from followers - success: - one: In the process of soft-blocking followers from one domain... - other: In the process of soft-blocking followers from %{count} domains... - true_privacy_html: Please mind that <strong>true privacy can only be achieved with end-to-end encryption</strong>. - unlocked_warning_html: Anyone can follow you to immediately view your private statuses. %{lock_link} to be able to review and reject followers. - unlocked_warning_title: Your account is not locked footer: developers: Developers more: More… resources: Resources generic: + all: All changes_saved_msg: Changes successfully saved! copy: Copy save_changes: Save changes @@ -761,6 +750,15 @@ en: other: Other publishing: Publishing web: Web + relationships: + abandoned: Abandoned + active: Active + mutual: Mutual + relationship: Relationship + remove_selected_domains: Remove all followers from the selected domains + remove_selected_followers: Remove selected followers + remove_selected_follows: Unfollow selected users + status: Account status remote_follow: acct: Enter your username@domain you want to act from missing_resource: Could not find the required redirect URL for your account @@ -835,11 +833,11 @@ en: edit_profile: Edit profile export: Data export featured_tags: Featured hashtags - followers: Authorized followers import: Import migrate: Account migration notifications: Notifications preferences: Preferences + relationships: Follows and followers settings: Settings two_factor_authentication: Two-factor Auth your_apps: Your applications diff --git a/config/locales/eo.yml b/config/locales/eo.yml index 9673963260575bd41cebc86be855e64f7d72f1f8..58d898fab7f0b79b394e7dc448afd6529ea1b793 100644 --- a/config/locales/eo.yml +++ b/config/locales/eo.yml @@ -595,18 +595,6 @@ eo: title: Filtriloj new: title: Aldoni novan filtrilon - followers: - domain: Domajno - explanation_html: Se vi volas esti certa pri la privateco de viaj mesaÄoj, vi bezonas esti atenta pri tiuj, kiuj sekvas vin. <strong>Viaj privataj mesaÄoj estas liveritaj al ĉiuj serviloj, kie vi havas sekvantojn</strong>. Eble vi Åatus kontroli ilin, kaj forigi la sekvantojn de la serviloj, kie vi ne certas ĉu via privateco estos respektita de la tiea teamo aÅ programo. - followers_count: Nombro de sekvantoj - lock_link: Åœlosu vian konton - purge: Forigi el la sekvantoj - success: - one: Forigado de sekvantoj el iu domajno... - other: Forigado de sekvantoj el %{count} domajnoj... - true_privacy_html: Bonvolu atenti, ke <strong>vera privateco povas esti atingita nur per ĉifrado de komenco al fino</strong>. - unlocked_warning_html: Iu ajn povas eksekvi vin por tuj vidi viajn privatajn mesaÄojn. %{lock_link} por povi akcepti kaj rifuzi petojn de sekvado. - unlocked_warning_title: Via konto ne estas Ålosita footer: developers: Programistoj more: Pli… @@ -799,7 +787,6 @@ eo: edit_profile: Redakti profilon export: Eksporti datumojn featured_tags: Elstarigitaj kradvortoj - followers: Rajtigitaj sekvantoj import: Importi migrate: Konta migrado notifications: Sciigoj diff --git a/config/locales/es.yml b/config/locales/es.yml index 648541eda99c560042de002ba00ec63fd2609016..a79c3fb5dae1e120f9a9cfd9119536ba7d6558b5 100644 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -529,18 +529,6 @@ es: title: Filtros new: title: Añadir un nuevo filtro - followers: - domain: Dominio - explanation_html: Si deseas asegurar la privacidad de tus estados, tienes que cuidarte de quién te sigue. <strong>Tus estados privados son enviados a todas las instancias de tus seguidores</strong>. Puede que desees revisarlas, y remover seguidores si no confÃas en tu privacidad para ser respetado por el staff o software de esas instancias. - followers_count: Número de seguidores - lock_link: Bloquear tu cuenta - purge: Remover de los seguidores - success: - one: En el proceso de bloquear suavemente usuarios de un solo dominio... - other: En el proceso de bloquear suavemente usuarios de %{count} dominios... - true_privacy_html: Por favor ten en cuenta que <strong>la verdadera privacidad se consigue con encriptación de punto a punto</strong>. - unlocked_warning_html: Todos pueden seguirte para ver tus estados privados inmediatamente. %{lock_link} para poder chequear y rechazar seguidores. - unlocked_warning_title: Tu cuenta no está bloqueada footer: developers: Desarrolladores more: Mas… @@ -711,7 +699,6 @@ es: development: Desarrollo edit_profile: Editar perfil export: Exportar información - followers: Seguidores autorizados import: Importar migrate: Migración de cuenta notifications: Notificaciones diff --git a/config/locales/eu.yml b/config/locales/eu.yml index 59cba6287b5c264190d47ad5e617c33649895cce..187a5325b1f6ed21ec1f7886000bca68d60dd44c 100644 --- a/config/locales/eu.yml +++ b/config/locales/eu.yml @@ -592,18 +592,6 @@ eu: title: Iragazkiak new: title: Gehitu iragazki berria - followers: - domain: Domeinua - explanation_html: Zure mezuen pribatutasuna bermatu nahi baduzu, nork jarraitzen zaituen jakin behar duzu. <strong>Zure mezu pribatuak zure jarraitzaileak dituzten zerbitzari guztietara bidaltzen dira</strong>. Zerbitzari bateko langileek edo softwareak zure pribatutasunari dagokion begirunea ez dutela izango uste baduzu, berrikusi eta kendu jarraitzaileak. - followers_count: Jarraitzaile kopurua - lock_link: Giltzapetu zure kontua - purge: Kendu jarraitzaileetatik - success: - one: Domeinu bateko jarraitzaileei blokeo leuna ezartzen... - other: "%{count} domeinuetako jarraitzaileei blokeo leuna ezartzen..." - true_privacy_html: Kontuan izan <strong>egiazko pribatutasuna lortzeko muturretik muturrerako zifratzea ezinbestekoa dela</strong>. - unlocked_warning_html: Edonork jarraitu zaitzake eta berehala zure mezu pribatuak ikusi. %{lock_link} jarraitzaileak berrikusi eta ukatu ahal izateko. - unlocked_warning_title: Zure kontua ez dago giltzapetuta footer: developers: Garatzaileak more: Gehiago… @@ -796,7 +784,6 @@ eu: edit_profile: Aldatu profila export: Datuen esportazioa featured_tags: Nabarmendutako traolak - followers: Baimendutako jarraitzaileak import: Inportazioa migrate: Kontuaren migrazioa notifications: Jakinarazpenak diff --git a/config/locales/fa.yml b/config/locales/fa.yml index a1c891bc724738c5e9eff30b112e2f5f0d628bc3..be19ff3dad4cb47fffc7e4683fc544a54804664f 100644 --- a/config/locales/fa.yml +++ b/config/locales/fa.yml @@ -593,18 +593,6 @@ fa: title: Ùیلترها new: title: Ø§ÙØ²ÙˆØ¯Ù† Ùیلتر تازه - followers: - domain: دامین - explanation_html: اگر می‌خواهید از خصوصی‌بودن نوشته‌های خود مطمئن شوید، باید بدانید Ú©Ù‡ Ú†Ù‡ کسانی پیگیر شما هستند. <strong>نوشته‌های خصوصی شما به همهٔ سرورهایی Ú©Ù‡ در آن‌ها پیگیر دارید ÙØ±Ø³ØªØ§Ø¯Ù‡ می‌شود</strong>. شاید بخواهید این سرورها را بررسی کنید، Ùˆ اگر به مسئولان یا Ù†Ø±Ù…â€ŒØ§ÙØ²Ø§Ø±Ù‡Ø§ÛŒ آن‌ها در رعایت ØØ±ÛŒÙ… خصوصی خود اعتماد ندارید، می‌توانید آن‌ها را ØØ°Ù کنید. - followers_count: تعداد پیگیران - lock_link: ØØ³Ø§Ø¨ خود را خصوصی کنید - purge: برداشتن پیگیری - success: - one: در ØØ§Ù„ انجام مسدودسازی نرم روی کاربران یک دامین... - other: در ØØ§Ù„ انجام مسدودسازی نرم روی کاربران %{count} دامین... - true_privacy_html: Ù„Ø·ÙØ§Ù‹ بدانید Ú©Ù‡ <strong>داشتن ØØ±ÛŒÙ… خصوصی واقعی تنها با رمزگذاری سرتاسر (end-to-end encryption) ممکن است</strong>. - unlocked_warning_html: هر کسی می‌تواند پیگیر شما شود تا Ø¨Ù„Ø§ÙØ§ØµÙ„Ù‡ نوشته‌های خصوصی شما را ببیند. اگر %{lock_link} خواهید توانست درخواست‌های پیگیری را بررسی کرده Ùˆ نپذیرید. - unlocked_warning_title: ØØ³Ø§Ø¨ شما خصوصی نیست footer: developers: برنامه‌نویسان more: بیشتر… @@ -807,7 +795,6 @@ fa: edit_profile: ویرایش نمایه export: برون‌سپاری داده‌ها featured_tags: برچسب‌های منتخب - followers: پیگیران مورد تأیید import: درون‌ریزی migrate: انتقال ØØ³Ø§Ø¨ notifications: اعلان‌ها diff --git a/config/locales/fi.yml b/config/locales/fi.yml index deacd351a29ddd9e3f525935f599923e6d214821..029696f7dead9520d0ee27e51213a0769902c694 100644 --- a/config/locales/fi.yml +++ b/config/locales/fi.yml @@ -449,18 +449,6 @@ fi: follows: Seurattavat mutes: Mykistetyt storage: Media-arkisto - followers: - domain: Verkkotunnus - explanation_html: Jos haluat olla varma tilapäivitystesi yksityisyydestä, sinun täytyy tietää, ketkä seuraavat sinua. <strong>Yksityiset tilapäivityksesi lähetetään kaikkiin niihin instansseihin, joissa sinulla on seuraajia</strong>. Jos et luota siihen, että näiden instanssien ylläpitäjät tai ohjelmisto kunnioittavat yksityisyyttäsi, käy läpi seuraajaluettelosi ja poista tarvittaessa käyttäjiä. - followers_count: Seuraajien määrä - lock_link: Lukitse tili - purge: Poista seuraajista - success: - one: Estetään kevyesti seuraajia yhdestä verkkotunnuksesta... - other: Estetään kevyesti seuraajia %{count} verkkotunnuksesta... - true_privacy_html: Muista, että <strong>kunnollinen yksityisyys voidaan varmistaa vain päästä päähän -salauksella</strong>. - unlocked_warning_html: Kuka tahansa voi seurata sinua ja nähdä saman tien yksityiset tilapäivityksesi. %{lock_link}, niin voit tarkastaa ja torjua seuraajia. - unlocked_warning_title: Tiliäsi ei ole lukittu generic: changes_saved_msg: Muutosten tallennus onnistui! save_changes: Tallenna muutokset @@ -622,7 +610,6 @@ fi: development: Kehittäminen edit_profile: Muokkaa profiilia export: Vie tietoja - followers: Valtuutetut seuraajat import: Tuo migrate: Tilin muutto muualle notifications: Ilmoitukset diff --git a/config/locales/fr.yml b/config/locales/fr.yml index 1694fda82fb1e8a4e3477215261eecef9d5df6cf..cf5b768d380cc417e609261cbd7cd686adb66559 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -593,18 +593,6 @@ fr: title: Filtres new: title: Ajouter un nouveau filtre - followers: - domain: Domaine - explanation_html: Si vous voulez vous assurer que vos statuts restent privés, vous devez savoir qui vous suit. <strong>Vos statuts privés seront diffusés sur toutes les instances où vous avez des abonné·e·s</strong>. Vous voudrez peut-être les passer en revue et les supprimer si vous pensez que votre vie privée ne sera pas respectée par l’administration ou le logiciel de ces instances. - followers_count: Nombre d’abonné⋅eâ‹…s - lock_link: Rendez votre compte privé - purge: Retirer de la liste d’abonné⋅eâ‹…s - success: - one: Suppression des abonné⋅eâ‹…s venant d’un domaine en cours… - other: Suppression des abonné⋅eâ‹…s venant de %{count} domaines en cours… - true_privacy_html: Soyez conscientâ‹…eâ‹…s <strong>qu’une vraie confidentialité ne peut être atteinte que par un chiffrement de bout-en-bout</strong>. - unlocked_warning_html: N’importe qui peut vous suivre et voir vos statuts privés. %{lock_link} afin de pouvoir vérifier et rejeter des abonné⋅eâ‹…s. - unlocked_warning_title: Votre compte n’est pas privé footer: developers: Développeurs more: Davantage… @@ -807,7 +795,6 @@ fr: edit_profile: Modifier le profil export: Export de données featured_tags: Hashtags mis en avant - followers: Abonné⋅es autorisé⋅es import: Import de données migrate: Migration de compte notifications: Notifications diff --git a/config/locales/gl.yml b/config/locales/gl.yml index 2491284261e40387c05191ecd6cd5f63eb0a5e22..1a1f6c5905e66d425a12b77872bd950e84aba62e 100644 --- a/config/locales/gl.yml +++ b/config/locales/gl.yml @@ -593,18 +593,6 @@ gl: title: Filtros new: title: Engadir novo filtro - followers: - domain: Dominio - explanation_html: Se quere asegurar a intimidade dos seus estados, debe ser consciente de quen a está a seguir. <strong>Os seus estados privados son enviados a todas os servidores onde ten seguidoras</strong>. PoderÃa querer revisalas, e elminar seguidoras si non confÃa que a súa intimidade sexa respetada polos administradores ou o software de ese servidor. - followers_count: Número de seguidoras - lock_link: Bloquear a súa conta - purge: Eliminar das seguidoras - success: - one: En proceso de bloquear seguidoras de un dominio... - other: No proceso de bloquear seguidoras de %{count} dominios... - true_privacy_html: Por favor teña en conta que <strong>a verdadeira intimidade só pode ser conseguida con cifrado de extremo-a-extremo</strong>. - unlocked_warning_html: Calquera pode seguila para inmediatamente ver os seus estados privados. %{lock_link} para poder revisar e rexeitar seguidoras. - unlocked_warning_title: A súa conta non está pechada footer: developers: Desenvolvedoras more: Máis… @@ -807,7 +795,6 @@ gl: edit_profile: Editar perfil export: Exportar datos featured_tags: Etiquetas destacadas - followers: Seguidoras autorizadas import: Importar migrate: Migrar conta notifications: Notificacións diff --git a/config/locales/he.yml b/config/locales/he.yml index 1ddb1361ddf334555b81ee5075b964f567d4c442..089af2bebdef4ca87158a55e216769565a4bf57e 100644 --- a/config/locales/he.yml +++ b/config/locales/he.yml @@ -240,18 +240,6 @@ he: follows: רשימת × ×¢×§×‘×™× mutes: רשימת השתקות storage: ×חסון מדיה - followers: - domain: קהילה - explanation_html: ×× ×‘×¨×¦×•× ×š להבטיח ×ת הפרטיות של הודעותיך, יש ×œ×©×™× ×œ×‘ מי עוקב ×חריך. <strong>הודעותיך הפרטיות יועברו לכל ×”×©×¨×ª×™× ×‘×”× ×™×© לך עוקבי×</strong>. כד××™ לעבור על הרשימה ולהסיר ×¢×•×§×‘×™× ×× ×ין לך ×מון ×‘×ª×•×›× ×” ×ו בצוות ×”×ž×¤×¢×™×œ×™× ×©×œ השרת הרחוק שיכבד ×ת פרטיותך. - followers_count: מספר ×”×¢×•×§×‘×™× - lock_link: ×œ× ×¢×•×œ ×ת ×—×©×‘×•× ×š - purge: הסרה ×ž×”×¢×•×§×‘×™× - success: - one: בתהליך חסימה של ×¢×•×§×‘×™× ×ž×ž×ª×—× ×חד... - other: בתהליך חסימה של ×¢×•×§×‘×™× ×”×ž×’×™×¢×™× ×žÖ¾%{count} מתחמי×... - true_privacy_html: 'לתשומת ליבך: <strong>פרטיות ×מיתית × ×™×ª×Ÿ להשיג ×ך ורק על ידי ×”×¦×¤× ×” מקצה לקצה</strong>.' - unlocked_warning_html: כל ×חד יכול לעקוב ×חריך כדי לר×ות מיידית ×ת חצרוציך הפרטיי×. %{lock_link} כדי לבחון ולדחות עוקבי×. - unlocked_warning_title: ×—×©×‘×•× ×š ××™× ×• × ×¢×•×œ generic: changes_saved_msg: ×”×©×™× ×•×™×™× × ×©×ž×¨×• בהצלחה! save_changes: שמור ×©×™× ×•×™×™× @@ -320,7 +308,6 @@ he: back: חזרה למסטודון edit_profile: עריכת פרופיל export: ×™×¦×•× ×ž×™×“×¢ - followers: ×¢×•×§×‘×™× ×ž××•×©×¨×™× import: ×™×‘×•× preferences: העדפות settings: הגדרות diff --git a/config/locales/hu.yml b/config/locales/hu.yml index 44399778c2bdb31267ea65056b4d597bb771ffba..04318f5e4426ca0c3b9d24ca2e29fd323df7eadb 100644 --- a/config/locales/hu.yml +++ b/config/locales/hu.yml @@ -374,18 +374,6 @@ hu: follows: Követettjeid mutes: NémÃtásaid storage: Médiatároló - followers: - domain: Domain - explanation_html: Ahhoz, hogy biztosÃtsd a tülkjeid adatvédelmét, tudnod kell, kik követnek téged. <strong>Még privátnak jelölt tülkjeid is továbbÃtódnak minden instanciára, ahol követÅ‘id vannak</strong>. Az alábbi listában láthatod, melyek ezek az instanciák; eltávolÃthatod Å‘ket, ha nem vagy biztos benne, hogy az adott instancia üzemeltetÅ‘i tiszteletben tartják az adatvédelmi beállÃtásaidat. - followers_count: KövetÅ‘k száma - lock_link: Fiókod priváttá tétele - purge: EltávolÃtás a követÅ‘id közül - success: - one: Egy domainen található követÅ‘id tiltása folyamatban... - other: "%{count} domainen található követÅ‘id tiltása folyamatban..." - true_privacy_html: Tartsd észben, hogy <strong>valódi biztonság csak végponttól-végpontig titkosÃtással érhetÅ‘ el</strong>. - unlocked_warning_html: Bárki követhet és Ãgy azonnal láthatja a privát tülkjeid. A %{lock_link} funkció bekapcsolásával lehetÅ‘séged van egyenként felülvizsgálni a követési kérelmeket. - unlocked_warning_title: A fiókod jelenleg nem privát generic: changes_saved_msg: Változások sikeresen elmentve! save_changes: Változások mentése @@ -542,7 +530,6 @@ hu: development: FejlesztÅ‘knek edit_profile: Profil szerkesztése export: Adatok exportálása - followers: Jóváhagyott követÅ‘k import: Importálás migrate: Fiók átirányÃtása notifications: ÉrtesÃtések diff --git a/config/locales/id.yml b/config/locales/id.yml index a91f459a4f22149799fb8f95203d27f58c9bdb99..a27f1f00886bc6bbc1aaa1eaf0f115a3b396d4bf 100644 --- a/config/locales/id.yml +++ b/config/locales/id.yml @@ -266,18 +266,6 @@ id: follows: Anda ikuti mutes: Anda bisukan storage: Penyimpanan media - followers: - domain: Domain - explanation_html: Jika anda ingin memastikan privasi dari status anda, anda harus tahu siapa yang mengikuti anda. <strong>Status pribadi anda dikirim ke semua server dimana pengikut anda berada</strong>. Anda mungkin ingin untuk mengkaji ulang dan menghapus pengikut jika anda tidak mempercayai bahwa privasi anda di tangan staf atau software di server tersebut. - followers_count: Jumlah pengikut - lock_link: Kunci akun anda - purge: Hapus dari pengikut - success: - one: Dalam proses memblokir pengikut dari satu domain... - other: Dalam proses memblokir pengikut dari %{count} domain... - true_privacy_html: Mohon diingat bahwa <strong>privasi yang sebenarnya hanya dapat dicapai dengan enkripsi end-to-end</strong>. - unlocked_warning_html: Semua orang dapat mengikuti anda untuk langsung dapat melihat status pribadi anda. %{lock_link} untuk dapat meninjau dan menolak calon pengikut. - unlocked_warning_title: Akun anda tidak dikunci generic: changes_saved_msg: Perubahan berhasil disimpan! save_changes: Simpan perubahan @@ -344,7 +332,6 @@ id: back: Kembali ke Mastodon edit_profile: Ubah profil export: Expor data - followers: Pengikut yang diizinkan import: Impor preferences: Pilihan settings: Pengaturan diff --git a/config/locales/it.yml b/config/locales/it.yml index 1af8bc08c5c29d5bde05f3b1e8bd598a3ae5379a..7d2e1dd29468b89a743d91530ebb449eb5a2ed46 100644 --- a/config/locales/it.yml +++ b/config/locales/it.yml @@ -554,15 +554,6 @@ it: title: Filtri new: title: Aggiungi filtro - followers: - domain: Dominio - explanation_html: Se vuoi garantire la privacy dei tuoi status, devi sapere chi ti sta seguendo. <strong>I tuoi status privati vengono inviati a tutti i server su cui hai dei seguaci</strong>. Puoi controllare chi sono i tuoi seguaci, ed eliminarli se non hai fiducia che la tua privacy venga rispettata dallo staff o dal software di quei server. - followers_count: Numero di seguaci - lock_link: Blocca il tuo account - purge: Elimina dai seguaci - true_privacy_html: Tieni presente che <strong>l'effettiva riservatezza si può ottenere solo con la crittografia end-to-end</strong>. - unlocked_warning_html: Chiunque può seguirti per vedere immediatamente i tuoi status privati. %{lock_link} per poter esaminare e respingere gli utenti che vogliono seguirti. - unlocked_warning_title: Il tuo account non è bloccato footer: developers: Sviluppatori more: Altro… @@ -722,7 +713,6 @@ it: development: Sviluppo edit_profile: Modifica profilo export: Esporta impostazioni - followers: Seguaci autorizzati import: Importa migrate: Migrazione dell'account notifications: Notifiche diff --git a/config/locales/ja.yml b/config/locales/ja.yml index 19845caa7eeaf7f2e9e6993a7817e83026dbd73f..c3fa76530a153e9f0d7d2994ce8e0808b4c72beb 100644 --- a/config/locales/ja.yml +++ b/config/locales/ja.yml @@ -607,18 +607,6 @@ ja: title: フィルター new: title: æ–°è¦ãƒ•ã‚£ãƒ«ã‚¿ãƒ¼ã‚’è¿½åŠ - followers: - domain: ドメイン - explanation_html: ã‚ãªãŸã®æŠ•稿ã®ãƒ—ライãƒã‚·ãƒ¼ã‚’確ä¿ã—ãŸã„å ´åˆã€èª°ãŒã‚ãªãŸã‚’フォãƒãƒ¼ã—ã¦ã„ã‚‹ã®ã‹ã‚’把æ¡ã—ã¦ã„ã‚‹å¿…è¦ãŒã‚りã¾ã™ã€‚ <strong>プライベート投稿ã¯ã€ã‚ãªãŸã®ãƒ•ã‚©ãƒãƒ¯ãƒ¼ãŒã„ã‚‹å…¨ã¦ã®ã‚µãƒ¼ãƒãƒ¼ã«é…ä¿¡ã•れã¾ã™</strong>。 フォãƒãƒ¯ãƒ¼ã®ã‚µãƒ¼ãƒãƒ¼ã®ç®¡ç†è€…やソフトウェアãŒã‚ãªãŸã®ãƒ—ライãƒã‚·ãƒ¼ã‚’å°Šé‡ã—ã¦ãれるã‹ã©ã†ã‹æ€ªã—ã„å ´åˆã¯ã€ãã®ãƒ•ã‚©ãƒãƒ¯ãƒ¼ã‚’削除ã—ãŸæ–¹ãŒã‚ˆã„ã‹ã‚‚ã—れã¾ã›ã‚“。 - followers_count: フォãƒãƒ¯ãƒ¼æ•° - lock_link: 承èªåˆ¶ã‚¢ã‚«ã‚¦ãƒ³ãƒˆã«ã™ã‚‹ - purge: フォãƒãƒ¯ãƒ¼ã‹ã‚‰å‰Šé™¤ã™ã‚‹ - success: - one: 1個ã®ãƒ‰ãƒ¡ã‚¤ãƒ³ã‹ã‚‰ã‚½ãƒ•トブãƒãƒƒã‚¯ã™ã‚‹ãƒ•ã‚©ãƒãƒ¯ãƒ¼ã‚’処ç†ä¸... - other: "%{count} 個ã®ãƒ‰ãƒ¡ã‚¤ãƒ³ã‹ã‚‰ã‚½ãƒ•トブãƒãƒƒã‚¯ã™ã‚‹ãƒ•ã‚©ãƒãƒ¯ãƒ¼ã‚’処ç†ä¸..." - true_privacy_html: "<strong>プライãƒã‚·ãƒ¼ã®ä¿è·ã¯ã‚¨ãƒ³ãƒ‰ãƒ„ãƒ¼ã‚¨ãƒ³ãƒ‰ã®æš—å·åŒ–ã§ã®ã¿å®Ÿç¾å¯èƒ½</strong>ã§ã‚ã‚‹ã“ã¨ã«ç•™æ„ãã ã•ã„。" - unlocked_warning_html: 誰ã§ã‚‚ã‚ãªãŸã‚’フォãƒãƒ¼ã™ã‚‹ã“ã¨ãŒã§ãã€ãƒ•ã‚©ãƒãƒ¯ãƒ¼é™å®šã®æŠ•稿をã™ãã«è¦‹ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚フォãƒãƒ¼ã™ã‚‹äººã‚’é™å®šã—ãŸã„å ´åˆã¯%{lock_link}ã«è¨å®šã—ã¦ãã ã•ã„。 - unlocked_warning_title: ã“ã®ã‚¢ã‚«ã‚¦ãƒ³ãƒˆã¯æ‰¿èªåˆ¶ã‚¢ã‚«ã‚¦ãƒ³ãƒˆã«è¨å®šã•れã¦ã„ã¾ã›ã‚“ footer: developers: 開発者å‘ã‘ more: ã•らã«â€¦ @@ -820,7 +808,6 @@ ja: edit_profile: プãƒãƒ•ィールを編集 export: データã®ã‚¨ã‚¯ã‚¹ãƒãƒ¼ãƒˆ featured_tags: 注目ã®ãƒãƒƒã‚·ãƒ¥ã‚¿ã‚° - followers: ä¿¡é ¼æ¸ˆã¿ã®ã‚µãƒ¼ãƒãƒ¼ import: データã®ã‚¤ãƒ³ãƒãƒ¼ãƒˆ migrate: アカウントã®å¼•ã£è¶Šã— notifications: 通知 diff --git a/config/locales/ka.yml b/config/locales/ka.yml index 5d0bba510a7f5402b003307ad456d7cfb3f89a67..8e537c745aff5c037beafc54d1c9d771bfba4d24 100644 --- a/config/locales/ka.yml +++ b/config/locales/ka.yml @@ -496,18 +496,6 @@ ka: title: ფილტრები new: title: áƒáƒ®áƒáƒšáƒ˜ ფილტრის დáƒáƒ›áƒáƒ¢áƒ”ბრ- followers: - domain: დáƒáƒ›áƒ”ნი - explanation_html: თუ გსურთ უზრუნველყáƒáƒ— თქვენი სტáƒáƒ¢áƒ£áƒ¡áƒ”ბის კáƒáƒœáƒ¤áƒ˜áƒ“ენციáƒáƒšáƒ£áƒ áƒáƒ‘áƒ, უნდრიცáƒáƒ“ეთ თუ ვინ მáƒáƒ’ყვებáƒáƒ—. <strong>კერძრსტáƒáƒ¢áƒ£áƒ¡áƒ”ბი მიეწáƒáƒ“ებრყველრინსტáƒáƒœáƒªáƒ˜áƒáƒ¡, სáƒáƒ“áƒáƒª გყáƒáƒ•თ მიმდევრები</strong>. შესáƒáƒ«áƒšáƒáƒ გსურდეთ გáƒáƒœáƒ˜áƒ®áƒ˜áƒšáƒáƒ— ისინი დრáƒáƒ›áƒáƒ¨áƒáƒšáƒáƒ— მიმდევრები თუ áƒáƒ ენდáƒáƒ‘ით თქვენი კáƒáƒœáƒ¤áƒ˜áƒ“ენციáƒáƒšáƒ£áƒ áƒáƒ‘ის პáƒáƒ¢áƒ˜áƒ•ისცემáƒáƒ¡ სტáƒáƒ¤áƒ˜áƒ¡áƒ თუ პრáƒáƒ’რáƒáƒ›áƒ˜áƒ¡áƒ’áƒáƒœ იმ ინსტáƒáƒœáƒªáƒ˜áƒ”ბში. - followers_count: მიმდევრების რáƒáƒáƒ“ენáƒáƒ‘რ- lock_link: თქვენი áƒáƒœáƒ’áƒáƒ იშის ჩáƒáƒ™áƒ”ტვრ- purge: მიმდევრებიდáƒáƒœ áƒáƒ›áƒáƒ¨áƒšáƒ - success: - one: მიმდევრების სáƒáƒ¤áƒ¢-ბლáƒáƒ™áƒ˜áƒ ების პრáƒáƒªáƒ”სი ერთი დáƒáƒ›áƒ”ნზე... - other: მიმდევრების სáƒáƒ¤áƒ¢-ბლáƒáƒ™áƒ˜áƒ ების პრáƒáƒªáƒ”სი %{count} დáƒáƒ›áƒ”ნზე... - true_privacy_html: გთხáƒáƒ•თ გáƒáƒ˜áƒ—ვáƒáƒšáƒ˜áƒ¡áƒ¬áƒ˜áƒœáƒ”თ, <strong>áƒáƒ”შმáƒáƒ იტი კáƒáƒœáƒ¤áƒ˜áƒ“ენციáƒáƒšáƒ£áƒ áƒáƒ‘რმიღწევáƒáƒ“ირმხáƒáƒšáƒáƒ“ ენდ-თუ-ენდ შიფრáƒáƒªáƒ˜áƒ˜áƒ—</strong>. - unlocked_warning_html: ყველáƒáƒ¡ შეუძლირგáƒáƒ›áƒáƒ’ყვეთ, რáƒáƒ› უცბáƒáƒ“ იხილáƒáƒ¡ თქვენი სტáƒáƒ¢áƒ£áƒ¡áƒ”ბი. %{lock_link} რáƒáƒ› შეძლáƒáƒ— გáƒáƒœáƒ˜áƒ®áƒ˜áƒšáƒáƒ— დრუáƒáƒ ყáƒáƒ— მიმდევრები. - unlocked_warning_title: თქვენი áƒáƒœáƒ’áƒáƒ იში áƒáƒ áƒáƒ ჩáƒáƒ™áƒ”ტილი footer: developers: დეველáƒáƒžáƒ”რები more: მეტი… @@ -677,7 +665,6 @@ ka: development: დეველáƒáƒžáƒ›áƒ”ნტი edit_profile: პრáƒáƒ¤áƒ˜áƒšáƒ˜áƒ¡ ცვლილებრexport: მáƒáƒœáƒáƒªáƒ”მის ექსპáƒáƒ ტი - followers: áƒáƒ•ტáƒáƒ იზირებული მიმდევრები import: იმპáƒáƒ ტი migrate: áƒáƒœáƒ’áƒáƒ იშის მიგრáƒáƒªáƒ˜áƒ notifications: შეტყáƒáƒ‘ინებები diff --git a/config/locales/kk.yml b/config/locales/kk.yml index 4897bc095147f6eacb727a51249178f26b779b3c..aeea2593908d2b803508dea16a901d3b9229b5ed 100644 --- a/config/locales/kk.yml +++ b/config/locales/kk.yml @@ -593,18 +593,6 @@ kk: title: Фильтрлер new: title: Жаңа фильтр қоÑу - followers: - domain: Домен - explanation_html: Егер Ñіз жазбаларыңыздың құпиÑлылығын қамтамаÑыз еткіңіз келÑе, Ñізді кім іздейтінін білуіңіз керек. <strong> Сіздің жазбаларыңыз оқырмандарыңыз бар барлық Ñерверлерге жеткізіледі </strong>. Оларды оқырмандарыңызға және админдерге немеÑе оÑÑ‹ Ñерверлердің бағдарламалық жаÑақтамаÑына жауапты қызметкерлерге ÑенбеÑеңіз, оқырмандарыңызды алып таÑтауыңызға болады. - followers_count: Оқырман Ñаны - lock_link: Ðккаунтыңызды құлыптау - purge: Оқырмандар тізімінен шығару - success: - one: Бір доменнен оқырмандарды бұғаттау барыÑында... - other: "%{count} доменнен оқырмандарды бұғаттау барыÑында..." - true_privacy_html: Ұмытпаңыз, <strong>нақты құпиÑлылықты шифрлаудан Ñоң ғана қол жеткізуге болатындығын еÑкеріңіз.</strong>. - unlocked_warning_html: Кез келген адам жазбаларыңызды оқу үшін Ñізге жазыла алады. Жазылушыларды қарап, қабылдамау үшін %{lock_link}. - unlocked_warning_title: Ðккаунтыңыз қазір құлыпталды footer: developers: ЖаÑаушылар more: Тағы… @@ -796,7 +784,6 @@ kk: edit_profile: Профиль өңдеу export: ÐкÑпорт уақыты featured_tags: Таңдаулы Ñ…Ñштегтер - followers: ÐвторизациÑланған оқырмандар import: Импорт migrate: Ðккаунт көшіру notifications: ЕÑкертпелер diff --git a/config/locales/ko.yml b/config/locales/ko.yml index 9d480e7bc470053ce529c79aeabda73d3a3a4fbb..52042ae1abcd22a2aede7bd7f41b3048175cef7c 100644 --- a/config/locales/ko.yml +++ b/config/locales/ko.yml @@ -595,18 +595,6 @@ ko: title: í•„í„° new: title: í•„í„° 추가 - followers: - domain: ë„ë©”ì¸ - explanation_html: 프ë¼ì´ë²„시를 í™•ë³´í•˜ê³ ì‹¶ì€ ê²½ìš°, 누가 ì—¬ëŸ¬ë¶„ì„ íŒ”ë¡œìš° í•˜ê³ ìžˆëŠ”ì§€ 파악해둘 필요가 있습니다. <strong>프ë¼ì´ë¹— í¬ìŠ¤íŒ…ì€ ì—¬ëŸ¬ë¶„ì˜ íŒ”ë¡œì›Œê°€ 소ì†í•˜ëŠ” ëª¨ë“ ì„œë²„ë¡œ 배달ë©ë‹ˆë‹¤</strong>. 팔로워가 소ì†ëœ 서버 관리ìžë‚˜ 소프트웨어가 ì—¬ëŸ¬ë¶„ì˜ í”„ë¼ì´ë²„시를 ì¡´ì¤‘í•˜ê³ ìžˆëŠ”ì§€ 잘 모를 경우, ê·¸ 팔로워를 ì‚ì œí•˜ëŠ” ê²ƒì´ ì¢‹ì„ ìˆ˜ë„ ìžˆìŠµë‹ˆë‹¤. - followers_count: 팔로워 수 - lock_link: 비공개 ê³„ì • - purge: 팔로워ì—서 ì‚ì œ - success: - one: 1ê°œ ë„ë©”ì¸ì—서 팔로워를 soft-block 처리 중... - other: "%{count}ê°œ ë„ë©”ì¸ì—서 팔로워를 soft-block 처리 중..." - true_privacy_html: "<strong>프ë¼ì´ë²„시 보호는 End-to-End 암호화로만 ì´ë£¨ì–´ 질 수 있다는 ê²ƒì— ìœ ì˜</strong>í•´ 주ì‹ì‹œì˜¤." - unlocked_warning_html: ëˆ„êµ¬ë“ ì—¬ëŸ¬ë¶„ì„ íŒ”ë¡œìš° í• ìˆ˜ 있으며, ì—¬ëŸ¬ë¶„ì˜ í”„ë¼ì´ë¹— íˆ¬ê³ ë¥¼ ë³¼ 수 있습니다. 팔로우 í• ìˆ˜ 있는 ì‚¬ëžŒì„ ì œí•œí•˜ê³ ì‹¶ì€ ê²½ìš° %{lock_link}ì—서 ì„¤ì •í•´ 주ì‹ì‹œì˜¤. - unlocked_warning_title: ì´ ê³„ì •ì€ ë¹„ê³µê°œë¡œ ì„¤ì •ë˜ì–´ 있지 않습니다 footer: developers: ê°œë°œìž more: ë” ë³´ê¸°â€¦ @@ -809,7 +797,6 @@ ko: edit_profile: 프로필 편집 export: ë°ì´í„° 내보내기 featured_tags: 추천 해시태그 - followers: ì‹ ë¢° ì¤‘ì¸ ì¸ìŠ¤í„´ìŠ¤ import: ë°ì´í„° ê°€ì ¸ì˜¤ê¸° migrate: ê³„ì • ì´ë™ notifications: 알림 diff --git a/config/locales/lt.yml b/config/locales/lt.yml index 4f8fd5825b2539e2f59eb6952270066529333bdc..0f5ca3091fb0518c1732655a574ce23899afad8f 100644 --- a/config/locales/lt.yml +++ b/config/locales/lt.yml @@ -602,19 +602,6 @@ lt: title: Filtrai new: title: PridÄ—ti naujÄ… filtrÄ… - followers: - domain: Domenas - explanation_html: Jeigu norite garantuoti savo statusų privatumÄ…, turite žinoti, kas jus seka. <strong>JÅ«sų privatÅ«s statusai yra pristatyti visiems serveriams, kur jÅ«s turite sekÄ—ju</strong>. GalbÅ«t jÅ«s norite juos peržiÅ«rÄ—ti ir panaikinti sekÄ—jus, kuriais nepasitikite. - followers_count: SekÄ—jų skaiÄius - lock_link: Užrakinti savo paskyrÄ… - purge: Panaikint iÅ¡ sekÄ—ju - success: - few: Å velnaus sekÄ—jų blokavimo procedÅ«roje iÅ¡ %{count} domenų... - one: Å velnaus sekÄ—jų blokavimo procedÅ«roje iÅ¡ vieno domeno... - other: Å velnaus sekÄ—jų blokavimo procedÅ«roje iÅ¡ %{count} domenų... - true_privacy_html: PraÅ¡au prisiminti, kad <strong> tikras privatumas gali bÅ«ti pasiekamas tik su end-to-end užsifravimu</strong>. - unlocked_warning_html: Visi, kurie nori matyti JÅ«sų privatų statusÄ…, gali jus sekti. %{lock_link} kad galÄ—tumÄ—te peržiurÄ—ti ir paÅ¡alinti sekÄ—jus. - unlocked_warning_title: JÅ«sų paskyra neužrakinta footer: developers: Programuotojai more: Daugiau… @@ -810,7 +797,6 @@ lt: edit_profile: Keisti profilį export: Informacijos eksportas featured_tags: Rodomi saitažodžiai(#) - followers: Autorizuoti sekÄ—jai import: Importuoti migrate: Paskyros migracija notifications: PraneÅ¡imai diff --git a/config/locales/ms.yml b/config/locales/ms.yml index 0b1269fb2e894242bac1e968b635e3069e0af90c..fbadd80fde4994209343e6c0e29ad40d71fcf0b5 100644 --- a/config/locales/ms.yml +++ b/config/locales/ms.yml @@ -317,10 +317,6 @@ ms: exports: archive_takeout: in_progress: Mengkompil arkib anda... - followers: - success: - one: Dalam proses menyekat-lembut pengikut daripada satu domain... - other: Dalam proses menyekat-lembut pengikut daripada %{count} domain... notification_mailer: digest: title: Ketika anda tiada di sini... diff --git a/config/locales/nl.yml b/config/locales/nl.yml index f92ae3bf1707a15c991d60186543f1f0bf3b0729..e75d684f1b79b5b2670562fd7a803d83a262d421 100644 --- a/config/locales/nl.yml +++ b/config/locales/nl.yml @@ -593,18 +593,6 @@ nl: title: Filters new: title: Nieuw filter toevoegen - followers: - domain: Domein - explanation_html: Wanneer je de privacy van jouw toots wilt garanderen, moet je goed weten wie jouw volgers zijn. <strong>Toots die alleen aan jouw volgers zijn gericht, worden aan de Mastodonservers van jouw volgers afgeleverd.</strong> Daarom wil je ze misschien controleren en desnoods volgers verwijderen die zich op een Mastodonserver bevinden die jij niet vertrouwd. Bijvoorbeeld omdat de beheerder(s) of de software van zo'n server jouw privacy niet respecteert. - followers_count: Aantal volgers - lock_link: Maak jouw account besloten - purge: Volgers verwijderen - success: - one: Bezig om volgers van één domein te verwijderen... - other: Bezig om volgers van %{count} domeinen te verwijderen... - true_privacy_html: Hou er wel rekening mee dat <strong>echte privacy alleen gegarandeerd kan worden met behulp van end-to-end-encryptie</strong>. - unlocked_warning_html: Iedereen kan jou volgen en daarmee meteen toots zien die je alleen aan jouw volgers hebt gericht. %{lock_link} om volgers te kunnen beoordelen en desnoods te weigeren. - unlocked_warning_title: Jouw account is niet besloten footer: developers: Ontwikkelaars more: Meer… @@ -797,7 +785,6 @@ nl: edit_profile: Profiel bewerken export: Exporteren featured_tags: Uitgelichte hashtags - followers: Geautoriseerde volgers import: Importeren migrate: Accountmigratie notifications: Meldingen diff --git a/config/locales/no.yml b/config/locales/no.yml index 6ee42a7cac7fee0a430569d73a758033c51cce60..773f2d0603fb186ebada7bb4c1d7ccd4f8cfdbaf 100644 --- a/config/locales/no.yml +++ b/config/locales/no.yml @@ -374,18 +374,6 @@ follows: Du følger mutes: Du demper storage: Medialagring - followers: - domain: Domene - explanation_html: Hvis du vil styre hvem som ser statusene dine, mÃ¥ du være klar over hvem som følger deg. <strong>Dine private statuser leveres til alle instanser der du har følgere</strong>. Du bør kanskje se over dem, og fjerne følgere hvis du ikke stoler pÃ¥ at ditt privatliv vil bli respektert av staben eller programvaren pÃ¥ de instansene. - followers_count: Antall følgere - lock_link: LÃ¥s kontoen din - purge: Fjern fra følgere - success: - one: I ferd med Ã¥ mykblokkere følgere fra ett domene... - other: I ferd med Ã¥ mykblokkere følgere fra %{count} domener... - true_privacy_html: Merk deg at <strong>virkelig privatliv kun kan oppnÃ¥s med ende-til-ende-kryptering</strong>. - unlocked_warning_html: Alle kan følge deg for Ã¥ umiddelbart se dine private statuser. %{lock_link} for Ã¥ kunne se over og avvise følgere. - unlocked_warning_title: Din konto er ikke lÃ¥st generic: changes_saved_msg: Vellykket lagring av endringer! save_changes: Lagre endringer @@ -542,7 +530,6 @@ development: Utvikling edit_profile: Endre profil export: Dataeksport - followers: Godkjente følgere import: Importér migrate: Kontomigrering notifications: Varslinger diff --git a/config/locales/oc.yml b/config/locales/oc.yml index b1d7c46d65257830909108ea295649010cd3d216..d87f7446f3f217af8ff1cc9e8602641d82a41a32 100644 --- a/config/locales/oc.yml +++ b/config/locales/oc.yml @@ -649,18 +649,6 @@ oc: title: Filtres new: title: Ajustar un nòu filtre - followers: - domain: Domeni - explanation_html: Se volètz vos assegurar de la confidencialitat de vòstres estatuts, vos cal saber qual sèc vòstre compte. <strong>Vòstres estatuts privats son enviats a totas las instà ncias qu’an de monde que vos sègon.</strong>. Benlèu que volètz repassar vòstra lista e tirar los seguidors s’avètz de dobtes tocant las politicas de confidencialitat dels gestionaris de lor instà ncia o sul logicial qu’utilizan. - followers_count: Nombre de seguidors - lock_link: Clavar vòstre compte - purge: Tirar dels seguidors - success: - one: Soi a blocar los seguidors d’un domeni… - other: Soi a blocar los seguidors de %{count} domenis… - true_privacy_html: Mèfi que la <strong>vertadièra confidencialitat pòt solament èsser amb un chiframent del cap a la fin (end-to-end)</strong>. - unlocked_warning_html: Tot lo monde pòt vos sègre e veire sulpic vòstres estatuts privats. %{lock_link} per poder repassar e regetar los seguidors. - unlocked_warning_title: Vòstre compte es pas clavat footer: developers: Desvolopaires more: Mai… @@ -853,7 +841,6 @@ oc: edit_profile: Modificar lo perfil export: Exportar de donadas featured_tags: Etiquetas en avant - followers: Seguidors autorizats import: Importar de donadas migrate: Migracion de compte notifications: Notificacions diff --git a/config/locales/pl.yml b/config/locales/pl.yml index 6a2b15ba55901d341120689b503323b2ae17f57f..878416dcffcbc0ec0487f8978a99a978818d89db 100644 --- a/config/locales/pl.yml +++ b/config/locales/pl.yml @@ -606,20 +606,6 @@ pl: title: Filtry new: title: Dodaj nowy filtr - followers: - domain: Domena - explanation_html: Jeżeli chcesz mieć pewność, kto może przeczytać Twoje wpisy, musisz kontrolować, kto Å›ledzi Twój profil. <strong>Twoje prywatne wpisy sÄ… dostarczane na te instancje, na których jesteÅ› Å›ledzony</strong>. Możesz sprawdzać, kto CiÄ™ Å›ledzi i blokować ich, jeÅ›li nie ufasz wÅ‚aÅ›cicielom lub oprogramowaniu danej instancji. - followers_count: Liczba Å›ledzÄ…cych - lock_link: Zablokuj swoje konto - purge: PrzestaÅ„ Å›ledzić - success: - few: W trakcie usuwania Å›ledzÄ…cych z %{count} domen… - many: W trakcie usuwania Å›ledzÄ…cych z %{count} domen… - one: W trakcie usuwania Å›ledzÄ…cych z jednej domeny… - other: W trakcie usuwania Å›ledzÄ…cych z %{count} domen… - true_privacy_html: PamiÄ™taj, że <strong>rzeczywista prywatność może zostać uzyskana wyłącznie dziÄ™ki szyfrowaniu end-to-end</strong>. - unlocked_warning_html: Każdy może CiÄ™ Å›ledzić, dziÄ™ki czemu może zobaczyć Twoje niepubliczne wpisy. %{lock_link} aby móc kontrolować, kto CiÄ™ Å›ledzi. - unlocked_warning_title: Twoje konto nie jest zablokowane footer: developers: Dla programistów more: WiÄ™cej… @@ -820,7 +806,6 @@ pl: edit_profile: Edytuj profil export: Eksportowanie danych featured_tags: Wyróżnione hashtagi - followers: Autoryzowani Å›ledzÄ…cy import: Importowanie danych migrate: Migracja konta notifications: Powiadomienia diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml index ae4b0a271b4f9f86fcf1d582614ae6cf9182b8e4..be1ea6155f467554eb31970eda143d5fd49caaff 100644 --- a/config/locales/pt-BR.yml +++ b/config/locales/pt-BR.yml @@ -585,18 +585,6 @@ pt-BR: title: Filtros new: title: Adicionar novo filtro - followers: - domain: DomÃnio - explanation_html: Se você quer garantir a privacidade de suas postagens, você deve ficar atento a quem está te seguindo.<strong>Suas postagens privadas são enviadas para todas as instâncias em que você tem seguidores</strong>. Convém revisá-las e remover seguidores se você acredita que a sua privacidade não será respeitada pela equipe ou software destas instâncias. - followers_count: Número de seguidores - lock_link: Tranque a sua conta - purge: Remover de seus seguidores - success: - one: No processo de bloqueio suave de seguidores de outro domÃnio... - other: No processo de bloqueio suave de seguidores de outros %{count} domÃnios... - true_privacy_html: Lembre-se de que <strong>a verdadeira privacidade só pode ser alcançada através de encriptação ponto-a-ponto</strong>. - unlocked_warning_html: Qualquer pessoa pode te seguir e ver as suas postagens privadas. %{lock_link} para ser capaz de revisar e rejeitar seguidores. - unlocked_warning_title: A sua conta não está trancada footer: developers: Desenvolvedores more: Mais… @@ -782,7 +770,6 @@ pt-BR: development: Desenvolvimento edit_profile: Editar perfil export: Exportar dados - followers: Seguidores autorizados import: Importar migrate: Migração de conta notifications: Notificações diff --git a/config/locales/pt.yml b/config/locales/pt.yml index c2a7c36f010be92c2a78a219fd8b5721aecf6b66..a024d12b57e13cd2363dece7565b7c8d0aa18db2 100644 --- a/config/locales/pt.yml +++ b/config/locales/pt.yml @@ -377,18 +377,6 @@ pt: follows: Segues mutes: Tens em silêncio storage: Armazenamento de média - followers: - domain: DomÃnio - explanation_html: Se queres garantir a privacidade das tuas publicações, deves ficar atento a quem te está a seguir.<strong>As tuas publicações privadas são enviadas para todas as instâncias nas que tens seguidores</strong>. Convém revisá-las e remover seguidores se achares que a tua privacidade não será respeitada pela equipa ou software destas instâncias. - followers_count: Número de seguidores - lock_link: Bloquear a tua conta - purge: Eliminar dos seguidores - success: - one: No processo de bloqueio suave de seguidores de outro domÃnio... - other: No processo de bloqueio suave de seguidores de outros %{count} domÃnios... - true_privacy_html: Por favor leva em conta que <strong>a verdadeira privacidade só pode ser alcançada através de encriptação ponto-a-ponto</strong>. - unlocked_warning_html: Qualquer pessoa pode seguir-te e ver as tuas publicações privadas. %{lock_link} para ser capaz de revisar e rejeitar seguidores. - unlocked_warning_title: A tua conta não está bloqueada generic: changes_saved_msg: Alterações guardadas! save_changes: Guardar alterações @@ -544,7 +532,6 @@ pt: development: Desenvolvimento edit_profile: Editar perfil export: Exportar dados - followers: Seguidores autorizados import: Importar migrate: Migração de conta notifications: Notificações diff --git a/config/locales/ro.yml b/config/locales/ro.yml index 82872e651d2dc21c7ba4655717712630d34ddaab..0331f002f604007ada5467485de6a3140bc73b60 100644 --- a/config/locales/ro.yml +++ b/config/locales/ro.yml @@ -109,9 +109,3 @@ ro: title: Filtre new: title: Adaugă un filtru nou - followers: - domain: Domeniu - explanation_html: Dacă vrei să fi sigur de confidenÈ›ialitatea statusurilor tale, ar trebui să fi conÈ™tient de cine te urmăreÈ™te. <strong>Statusurile tale private sunt livrate către toate instanÈ›ele unde ai urmăritori</strong>. Este recomandabil să verifici È™i să È™tergi urmăritorii în care nu ai încredere că îți vor respecta intimitatea. - followers_count: Numărul de urmăritori - lock_link: Privează contul tău - purge: Elimină de la urmăritori diff --git a/config/locales/ru.yml b/config/locales/ru.yml index 72513e58c8b30f99d0b4bec0456485b6d19443d7..ffc9471cd30f40425ce5874dffe319f10c005105 100644 --- a/config/locales/ru.yml +++ b/config/locales/ru.yml @@ -519,20 +519,6 @@ ru: title: Фильтры new: title: Добавить фильтр - followers: - domain: Домен - explanation_html: ЕÑли Ð’Ñ‹ хотите быть уверены в приватноÑти Ваших ÑтатуÑов, Ð’Ñ‹ должны иметь четкое предÑтавление о том, кто на Ð’Ð°Ñ Ð¿Ð¾Ð´Ð¿Ð¸Ñан. <strong>Ваши приватные ÑтатуÑÑ‹ отправлÑÑŽÑ‚ÑÑ Ð²Ñем узлам, на которых у Ð’Ð°Ñ ÐµÑть подпиÑчики</strong>. Рекомендуем удалить из подпиÑчиков пользователей узлов, админиÑтрации или программному обеÑпечению которых Ð’Ñ‹ не доверÑете. - followers_count: КоличеÑтво подпиÑчиков - lock_link: Закройте аккаунт - purge: Удалить из подпиÑчиков - success: - few: Ð’ процеÑÑе мÑгкой блокировки подпиÑчиков Ñ %{count} доменов... - many: Ð’ процеÑÑе мÑгкой блокировки подпиÑчиков Ñ %{count} доменов... - one: Ð’ процеÑÑе мÑгкой блокировки подпиÑчиков Ñ Ð¾Ð´Ð½Ð¾Ð³Ð¾ домена... - other: Ð’ процеÑÑе мÑгкой блокировки подпиÑчиков Ñ %{count} доменов... - true_privacy_html: ПожалуйÑта, заметьте, что <strong>наÑтоÑÑ‰Ð°Ñ ÐºÐ¾Ð½Ñ„Ð¸Ð´ÐµÐ½Ñ†Ð¸Ð°Ð»ÑŒÐ½Ð¾Ñть может быть доÑтигнута только при помощи end-to-end шифрованиÑ</strong>. - unlocked_warning_html: Кто угодно может подпиÑатьÑÑ Ð½Ð° Ð’Ð°Ñ Ð¸ получить доÑтуп к проÑмотру Ваших приватных ÑтатуÑов. %{lock_link}, чтобы получить возможноÑть раÑÑматривать и вручную подтверждать запроÑÑ‹ о подпиÑке. - unlocked_warning_title: Ваш аккаунт не закрыт Ð´Ð»Ñ Ð¿Ð¾Ð´Ð¿Ð¸Ñки footer: developers: Разработчикам more: Ещё… @@ -709,7 +695,6 @@ ru: development: Разработка edit_profile: Изменить профиль export: ÐкÑпорт данных - followers: Ðвторизованные подпиÑчики import: Импорт migrate: ÐŸÐµÑ€ÐµÐ½Ð¾Ñ Ð°ÐºÐºÐ°ÑƒÐ½Ñ‚Ð° notifications: Ð£Ð²ÐµÐ´Ð¾Ð¼Ð»ÐµÐ½Ð¸Ñ diff --git a/config/locales/sk.yml b/config/locales/sk.yml index 565b2e8a8c2ce9b691dd93e60ea50f887fac3bb6..550fc4fe81f79fa2bc087acbcb5253daeb279cf2 100644 --- a/config/locales/sk.yml +++ b/config/locales/sk.yml @@ -600,19 +600,6 @@ sk: title: Triedenia new: title: Pridaj nové triedenie - followers: - domain: Doména - explanation_html: Pokiaľ chceÅ¡ zaruÄiÅ¥ súkromie svojÃch prÃspevkov, musÃÅ¡ maÅ¥ na vedomÃ, kto Å¥a sleduje. <strong> Tvoje súkromné prÃspevky sú doruÄené na každý server z ktorého Å¥a niekto následuje. </strong> Takže možno by si ich chcel/a skontrolovaÅ¥, a odstrániÅ¥ tých následovnÃkov, Äo sú na serveroch ktorÃm dostatoÄne nedôverujeÅ¡ v zmysle, že ich moderátori, alebo ich softvérové úpravy, budú tiež reÅ¡pektovaÅ¥ tvoje súkromie. - followers_count: PoÄet následovateľov - lock_link: Zamkni svoj úÄet - purge: Odstráň sledovateľa - success: - few: PoÄas utiÅ¡ovania sledovateľov z %{count} domén... - one: PoÄas utiÅ¡ovania sledovateľov z jednej domény... - other: PoÄas utiÅ¡ovania sledovateľov z %{count} domén... - true_privacy_html: ProsÃm ber na vedomie, <strong> že ozajstné súkromie sa dá dosiahnúť iba za pomoci end-to-end enkrypcie</strong>. - unlocked_warning_html: Hocikto Å¥a môže následovaÅ¥ aby mohol/a ihneÄ vidieÅ¥ tvoje súkromné prÃspevky. %{lock_link} aby si mohla skontrolovaÅ¥ a odmietaÅ¥ sledovateľov. - unlocked_warning_title: Tvoj úÄet nieje zamknutý footer: developers: Vývojári more: Viac… @@ -818,7 +805,6 @@ sk: edit_profile: Uprav profil export: ExportovaÅ¥ dáta featured_tags: Popredne zvýraznené haÅ¡tagy - followers: Povolenà následovatelia import: ImportovaÅ¥ migrate: Presunutie úÄtu notifications: Oznámenia diff --git a/config/locales/sq.yml b/config/locales/sq.yml index b29564e74bab01347b366571ec3ef26e773f1c20..f02c994ebc1cdaf54763d3484e8c3a0466fae014 100644 --- a/config/locales/sq.yml +++ b/config/locales/sq.yml @@ -590,18 +590,6 @@ sq: title: Filtra new: title: Shtoni filtër të ri - followers: - domain: Përkatësi - explanation_html: Nëse doni të garantoni privatësinë e gjendjeve tuaja, duhet të jeni në dijeni se cilët ju ndjekin. <strong>Gjendjet tuaja private u dërgohen krejt shërbyes ku keni ndjekës</strong>. Mund të donit t’i rishqyrtoni ato, dhe të hiqni ndjekës, nëse nuk besoni se privatësia juaj respektohet nga stafi apo software-i i këtyre shërbyesve. - followers_count: Numër ndjekësish - lock_link: Kyçeni llogarinë tuaj - purge: Hiqe nga ndjekësit - success: - one: Në përmbushje e sipër të bllokimit të butë të ndjekësve nga një përkatësi… - other: Në përmbushje e sipër të bllokimit të butë të ndjekësve nga %{count} përkatësi… - true_privacy_html: Ju lutemi, kini parasysh se <strong>privatësi e vërtetë mund të arrihet vetëm me fshehtëzim skaj-më-skaj</strong>. - unlocked_warning_html: Mund t’ju ndjekë cilido, që të shohë menjëherë gjendjet tuaja private. %{lock_link} që të jeni në gjendje të shqyrtoni dhe hidhni poshtë ndjekës. - unlocked_warning_title: Llogaria juaj s’është kyçur footer: developers: Zhvillues more: Më tepër… @@ -793,7 +781,6 @@ sq: edit_profile: Përpunoni profilin export: Eksportim të dhënash featured_tags: Hashtagë të zgjedhur - followers: Ndjekës të autorizuar import: Importo migrate: Migrim llogarie notifications: Njoftime diff --git a/config/locales/sr-Latn.yml b/config/locales/sr-Latn.yml index a43c639c0e0a0d60035f5ab7e925198ce2a6650b..a2d57ce29a8f07a3916a48a1224095bd50aead05 100644 --- a/config/locales/sr-Latn.yml +++ b/config/locales/sr-Latn.yml @@ -367,20 +367,6 @@ sr-Latn: follows: Pratite mutes: Ućutkali ste storage: Multimedijalno skladiÅ¡te - followers: - domain: Domen - explanation_html: Ako želite da osigurate privatnost VaÅ¡ih statusa, morate biti svesni ko Vas prati. <strong>VaÅ¡i privatni statusi se Å¡alju na sve instance na kojima imate pratioce</strong>. Možda želite da ih pregledate i da uklonite one pratioce na onim instancama za koje nemate poverenja da će poÅ¡tovati VaÅ¡u privatnost. - followers_count: Broj pratilaca - lock_link: ZakljuÄajte nalog - purge: Ukloni iz pratioca - success: - few: U procesu blokiranja pratioca sa %{count} domena... - many: U procesu blokiranja pratioca sa %{count} domena... - one: U procesu blokiranja pratioca sa jednog domena... - other: U procesu blokiranja pratioca sa %{count} domena... - true_privacy_html: Zapamtite da se <strong>prava privatnost može postići samo Å¡ifrovanjem sa kraja na kraj</strong>. - unlocked_warning_html: Svako može da Vas zaprati da odmah vidi VaÅ¡e privatne statuse. %{lock_link} da biste pregledali i odbacili pratioce. - unlocked_warning_title: VaÅ¡ nalog nije zakljuÄan generic: changes_saved_msg: Izmene uspeÅ¡no saÄuvane! save_changes: Snimi izmene @@ -534,7 +520,6 @@ sr-Latn: development: Razvoj edit_profile: Izmena profila export: Izvoz podataka - followers: Autorizovani pratioci import: Uvoz migrate: Prebacivanje naloga notifications: ObaveÅ¡tenja diff --git a/config/locales/sr.yml b/config/locales/sr.yml index 5f7533ee15b665410bf50fe5ee676ca6de4311ae..45a59bcb1f556acb0893cb94b48fc7dd6d1e25da 100644 --- a/config/locales/sr.yml +++ b/config/locales/sr.yml @@ -599,20 +599,6 @@ sr: title: Филтери new: title: Додај нови филтер - followers: - domain: Домен - explanation_html: Ðко желите да оÑигурате приватноÑÑ‚ Ваших ÑтатуÑа, морате бити ÑвеÑни ко Ð’Ð°Ñ Ð¿Ñ€Ð°Ñ‚Ð¸. <strong>Ваши приватни ÑтатуÑи Ñе шаљу на Ñве инÑтанце на којима имате пратиоце</strong>. Можда желите да их прегледате и да уклоните оне пратиоце на оним инÑтанцама за које немате поверења да ће поштовати Вашу приватноÑÑ‚. - followers_count: Број пратилаца - lock_link: Закључајте налог - purge: Уклони из пратиоца - success: - few: У процеÑу блокирања пратиоца Ñа %{count} домена... - many: У процеÑу блокирања пратиоца Ñа %{count} домена... - one: У процеÑу блокирања пратиоца Ñа једног домена... - other: У процеÑу блокирања пратиоца Ñа %{count} домена... - true_privacy_html: Запамтите да Ñе <strong>права приватноÑÑ‚ може поÑтићи Ñамо шифровањем Ñа краја на крај</strong>. - unlocked_warning_html: Свако може да Ð’Ð°Ñ Ð·Ð°Ð¿Ñ€Ð°Ñ‚Ð¸ да одмах види Ваше приватне ÑтатуÑе. %{lock_link} да биÑте прегледали и одбацили пратиоце. - unlocked_warning_title: Ваш налог није закључан footer: developers: Програмери more: Више… @@ -803,7 +789,6 @@ sr: development: Развој edit_profile: Измена профила export: Извоз података - followers: Ðуторизовани пратиоци import: Увоз migrate: Пребацивање налога notifications: Обавештења diff --git a/config/locales/sv.yml b/config/locales/sv.yml index 7478bef6c39103f76179e2c03be3fe6abb3f21ff..b0c04329a751f703f63f1b61f479eb081864ca3c 100644 --- a/config/locales/sv.yml +++ b/config/locales/sv.yml @@ -433,18 +433,6 @@ sv: follows: Du följer mutes: Du tystar storage: Medialagring - followers: - domain: Domän - explanation_html: Om du vill försäkra integriteten av dina statusar mÃ¥ste du vara medveten om vem som följer dig. <strong>Dina privata statusar levereras till alla instanser där du har följare</strong>. Du kanske vill granska och eventuellt ta bort följare om du inte litar pÃ¥ att din integritet respekteras hos medarbetarna eller programvara i dessa instanser. - followers_count: Antal följare - lock_link: LÃ¥s ditt konto - purge: Ta bort frÃ¥n följare - success: - one: I processen med soft-blocking följare frÃ¥n en domän ... - other: I processen med soft-blocking följare frÃ¥n %{count} domäner... - true_privacy_html: Kom ihÃ¥g att <strong>sann integritet kan bara uppnÃ¥s med end-to-end kryptering</strong>. - unlocked_warning_html: Vem som helst kan följa dig för att omedelbart se dina privata statusar. %{lock_link} för att kunna granska och avvisa följare. - unlocked_warning_title: Ditt konto är inte lÃ¥st generic: changes_saved_msg: Ändringar sparades framgÃ¥ngsrikt! save_changes: Spara ändringar @@ -609,7 +597,6 @@ sv: development: Utveckling edit_profile: Redigera profil export: Exportera data - followers: Auktoriserade följare import: Import migrate: Kontoflytt notifications: Meddelanden diff --git a/config/locales/th.yml b/config/locales/th.yml index 5e9be4da700e5056b72e54f6b426461871c6f54a..788bf62eb399c8cd8d68806c9731c69ec2132de0 100644 --- a/config/locales/th.yml +++ b/config/locales/th.yml @@ -176,18 +176,6 @@ th: follows: คุณติดตาม mutes: คุณปิดเสียง storage: ที่เà¸à¹‡à¸šà¸ªà¸·à¹ˆà¸ - followers: - domain: โดเมน - explanation_html: If you want to ensure the privacy of your statuses, you must be aware of who is following you. <strong>Your private statuses are delivered to all instances where you have followers</strong>. You may wish to review them, and remove followers if you do not trust your privacy to be respected by the staff or software of those instances. - followers_count: จำนวนผู้ติดตาม - lock_link: ล๊à¸à¸„à¹à¸à¸„เค๊าท์ขà¸à¸‡à¸„ุณ - purge: นำผู้ติดตามà¸à¸à¸ - success: - one: In the process of soft-blocking followers from one domain... - other: In the process of soft-blocking followers from %{count} domains... - true_privacy_html: Please mind that <strong>true privacy can only be achieved with end-to-end encryption</strong>. - unlocked_warning_html: Anyone can follow you to immediately view your private statuses. %{lock_link} to be able to review and reject followers. - unlocked_warning_title: à¹à¸à¸„เค๊าท์ขà¸à¸‡à¸„ุณไม่ได้ล๊à¸à¸„ generic: changes_saved_msg: บันทึà¸à¸à¸²à¸£à¹à¸à¹‰à¹„ขà¹à¸¥à¹‰à¸§! save_changes: บันทึà¸à¸à¸²à¸£à¹€à¸›à¸¥à¸µà¹ˆà¸¢à¸™à¹à¸›à¸¥à¸‡ @@ -256,7 +244,6 @@ th: back: à¸à¸¥à¸±à¸šà¹„ปที่à¹à¸¡à¸ªà¹‚ทดà¸à¸™ edit_profile: à¹à¸à¹‰à¹„ขโปรไฟล์ export: นำข้à¸à¸¡à¸¹à¸¥à¸à¸à¸ - followers: Authorized followers import: นำเข้า preferences: Preferences settings: ตั้งค่า diff --git a/config/locales/tr.yml b/config/locales/tr.yml index d5f48ee45f2c851708518b3aefa41da854654a05..14e7f34df52619474e377943b45740f9d42d2b17 100644 --- a/config/locales/tr.yml +++ b/config/locales/tr.yml @@ -277,18 +277,6 @@ tr: follows: Takip ettikleriniz mutes: Susturduklarınız storage: Ortam deposu - followers: - domain: Domain - explanation_html: EÄŸer gönderilerinizin gizliliÄŸini garanti altına almak istiyorsanız, sizi kimin takip ettiÄŸinden emin olmak zorundasınız. <strong> Gizli gönderileriniz, takipçilerinizin olduÄŸu bütün sunuculara iletilir</strong>. Gönderilerinizi gözden geçirmek isteyebilir, ve o sunuculardaki yazılımın veya ilgili çalışanın, gizliliÄŸinizi suistimal edeceÄŸinizi düşünüyorsanız, o sunucudaki takipçilerinizi silebilirsiniz. - followers_count: Takipçi sayısı - lock_link: Hesabımı kilitle - purge: Takipçilerimden çıkar - success: - one: Domaindeki takipçilerin engellenmesi sürüyor... - other: "%{count} domaindeki takipçilerin engellenmesi sürüyor..." - true_privacy_html: 'Lütfen aklınızda bulundurun: <strong>gerçek gizlilik yalnızca uçtan-uca ÅŸifreleme ile saÄŸlanır</strong>.' - unlocked_warning_html: Herhangi bir kiÅŸi sizi takip edebilir ve paylaÅŸtığınız gizli gönderilerinizi görebilir. %{lock_link}'e tıklayarak takipçilerinizi gözden geçirebilir ve reddedebilirsiniz. - unlocked_warning_title: Hesabınız kilitlendi generic: changes_saved_msg: DeÄŸiÅŸiklikler baÅŸarıyla kaydedildi! save_changes: DeÄŸiÅŸiklikleri kaydet @@ -357,7 +345,6 @@ tr: back: Mastodon'a geri dön edit_profile: Profili düzenle export: Dışa aktar - followers: İzin verilmiÅŸ takipçiler import: İçe aktar preferences: Tercihler settings: Ayarlar diff --git a/config/locales/uk.yml b/config/locales/uk.yml index d8e2aa0660b82b7b9e4ef4946514dad93d54a8b9..e72e2f46115a17a758f0beb713f01f5ddbaa7cb6 100644 --- a/config/locales/uk.yml +++ b/config/locales/uk.yml @@ -481,16 +481,6 @@ uk: title: Фільтри new: title: Додати фільтр - followers: - domain: Домен - explanation_html: Якщо Ви хочете бути впевнені в приватноÑті Ваших ÑтатуÑів, Ви повинні мати чітке уÑÐ²Ð»ÐµÐ½Ð½Ñ Ð¿Ñ€Ð¾ те, хто на Ð’Ð°Ñ Ð¿Ñ–Ð´Ð¿Ð¸Ñаний. <strong>Ваші приватні ÑтатуÑÑ– відправлÑютьÑÑ ÑƒÑім Ñайтам, на Ñких у Ð’Ð°Ñ Ñ” підпиÑники</strong>. Рекомендуємо видалити з підпиÑників кориÑтувачів інÑтанцій, адмініÑтрації чи програмному забезпеченню Ñких Ви не довірÑєте. - followers_count: КількіÑть підпиÑників - lock_link: Закрийте акаунт - purge: Видалити з підпиÑників - success: У процеÑÑ– м'Ñкого Ð±Ð»Ð¾ÐºÑƒÐ²Ð°Ð½Ð½Ñ Ð¿Ñ–Ð´Ð¿Ð¸Ñників з %{count} доменів... - true_privacy_html: Будь лаÑка, помітьте, що <strong>ÑправжнÑÑ ÐºÐ¾Ð½Ñ„Ñ–Ð´ÐµÐ½Ñ†Ñ–Ð¹Ð½Ñ–Ñть може бути доÑÑгнена тільки за допомогою end-to-end шифруваннÑ</strong>. - unlocked_warning_html: Хто завгодно може підпиÑатиÑÑ Ð½Ð° Ð’Ð°Ñ Ñ‚Ð° отримати доÑтуп до переглÑду Ваших приватних ÑтатуÑів. %{lock_link}, щоб отримати можливіÑть роздивлÑтиÑÑ Ñ‚Ð° вручну підтверджувати запити щодо підпиÑки. - unlocked_warning_title: Ваш аккаунт не закритий Ð´Ð»Ñ Ð¿Ñ–Ð´Ð¿Ð¸Ñки generic: changes_saved_msg: Зміни уÑпішно збережені! save_changes: Зберегти зміни @@ -655,7 +645,6 @@ uk: development: Розробка edit_profile: Редагувати профіль export: ЕкÑпорт даних - followers: Ðвторизовані підпиÑники import: Імпорт migrate: ÐœÑ–Ð³Ñ€Ð°Ñ†Ñ–Ñ Ð°ÐºÐ°ÑƒÐ½Ñ‚Ñƒ notifications: Ð¡Ð¿Ð¾Ð²Ñ–Ñ‰ÐµÐ½Ð½Ñ diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml index f91cef4a422901ee9e61755a48d26ba9c4604db4..77cf321361768bdae053ed2e44d077098462003a 100644 --- a/config/locales/zh-CN.yml +++ b/config/locales/zh-CN.yml @@ -498,16 +498,6 @@ zh-CN: title: 过滤器 new: title: æ·»åŠ æ–°çš„è¿‡æ»¤å™¨ - followers: - domain: 域å - explanation_html: 为ä¿è¯ä½ 的嘟文的éšç§å®‰å…¨ï¼Œä½ 应当ç»å¸¸æ£€æŸ¥ä½ 的关注者列表。<strong>å—ä¿æŠ¤çš„å˜Ÿæ–‡å°†ä¼šå‘é€åˆ°æ‰€æœ‰å…³æ³¨è€…所在的实例上</strong>ã€‚æœ‰äº›å®žä¾‹ä½¿ç”¨çš„è½¯ä»¶ä»£ç æˆ–其管ç†å‘˜å¯èƒ½ä¸ä¼šå°Šé‡ä½ çš„éšç§è®¾ç½®ï¼Œå› æ¤ä½ åº”å½“å¤æŸ¥ä¸€ä¸‹å…³æ³¨è€…åˆ—è¡¨ï¼Œå¹¶ç§»é™¤é‚£äº›ä½ æ— æ³•ä¿¡ä»»çš„å…³æ³¨è€…ã€‚ - followers_count: å…³æ³¨è€…æ•°é‡ - lock_link: ä¸ºä½ çš„å¸æˆ·å¼€å¯ä¿æŠ¤ - purge: 从关注者ä¸ç§»é™¤ - success: æ£åœ¨ä»Ž %{count} 个域åä¸ç§»é™¤å…³æ³¨è€……… - true_privacy_html: 请始终é“记:<strong>真æ£çš„éšç§åªèƒ½é ç«¯åˆ°ç«¯åŠ å¯†æ¥å®žçް</strong>ï¼ - unlocked_warning_html: 任何人都å¯ä»¥åœ¨å…³æ³¨ä½ åŽç«‹å³æŸ¥çœ‹éžå…¬å¼€çš„嘟文。åªè¦%{lock_link}ï¼Œä½ å°±å¯ä»¥å®¡æ ¸å¹¶æ‹’ç»å…³æ³¨è¯·æ±‚。 - unlocked_warning_title: ä½ çš„å¸æˆ·æœªå—åˆ°ä¿æŠ¤ generic: changes_saved_msg: 更改ä¿å˜æˆåŠŸï¼ save_changes: ä¿å˜æ›´æ”¹ @@ -671,7 +661,6 @@ zh-CN: development: å¼€å‘ edit_profile: 更改个人资料 export: 导出 - followers: 已授æƒçš„关注者 import: 导入 migrate: 叿ˆ·è¿ç§» notifications: 通知 diff --git a/config/locales/zh-HK.yml b/config/locales/zh-HK.yml index a2cfe56a942129974b076700db82129ec598d631..7b200e91ac02dbaa12564fa2ce2a4fcafe8b73c1 100644 --- a/config/locales/zh-HK.yml +++ b/config/locales/zh-HK.yml @@ -431,18 +431,6 @@ zh-HK: follows: ä½ æ‰€é—œæ³¨çš„ç”¨æˆ¶ mutes: ä½ æ‰€éœéŸ³çš„用戶 storage: 媒體容é‡å¤§å° - followers: - domain: 網域 - explanation_html: å¦‚æžœä½ æƒ³ç¢ºä¿ä½ çš„ç§éš±ï¼Œè«‹ç•™æ„æ˜¯ç”šéº¼ç”¨æˆ¶åœ¨é—œæ³¨ä½ ã€‚<strong>å³ä½¿ä½ çš„å°‡æ–‡ç« è¨å®šã€Œç§äººæ–‡ç« ã€ï¼Œå®ƒä»ç‚ºæœƒè¢«éžé€è‡³ä½ 所有關注者的æœå‹™ç«™</strong>ã€‚å¦‚æžœä½ ä¸ä¿¡ä»»æŸäº›ç”¨æˆ¶ã€æˆ–å…¶æœå‹™ç«™çš„管ç†è€…會尊é‡ä½ ç§éš±ï¼Œè«‹å°‡ä»–們自關注者åå–®ç§é™¤ã€‚ - followers_count: 關注者數目 - lock_link: 將用戶轉為「ç§äººã€ - purge: ç§é™¤é—œæ³¨è€… - success: - one: æ£æº–備軟性阻擋 1 個網域的關注者…… - other: æ£æº–備軟性阻擋 %{count} 個網域的關注者…… - true_privacy_html: 請謹記,唯有<strong>點å°é»žåŠ å¯†æ–¹å¯ä»¥çœŸæ£ç¢ºä¿ä½ çš„ç§éš±</strong>。 - unlocked_warning_html: ç›®å‰ä»»ä½•人都å¯ä»¥çœ‹åˆ°ä½ çš„ç§äººæ–‡ç« ,若%{lock_link}çš„è©±ï¼Œä½ å°‡å¯ä»¥å¯©æ‰¹é—œæ³¨è€…。 - unlocked_warning_title: ä½ çš„ç”¨æˆ¶ç›®å‰ç‚ºã€Œå…¬å…±ã€ generic: changes_saved_msg: å·²æˆåŠŸå„²å˜ä¿®æ”¹ã€‚ save_changes: 儲å˜ä¿®æ”¹ @@ -606,7 +594,6 @@ zh-HK: development: 開發 edit_profile: 修改個人資料 export: 匯出 - followers: 授權關注 import: 匯入 migrate: 帳戶é·ç§» notifications: 通知 diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml index 4498eff954a21c08fda1334864a0bdc3a553d597..d05514b830bd3fe4beb4bece927beef1f25bef03 100644 --- a/config/locales/zh-TW.yml +++ b/config/locales/zh-TW.yml @@ -436,16 +436,6 @@ zh-TW: follows: 您關注的使用者 mutes: 您éœéŸ³çš„使用者 storage: 儲å˜ç©ºé–“å¤§å° - followers: - domain: 網域 - explanation_html: 為確ä¿å€‹äººéš±ç§ï¼Œæ‚¨å¿…é ˆçŸ¥é“æœ‰å“ªäº›ä½¿ç”¨è€…æ£é—œæ³¨ä½ 。<strong>您的ç§å¯†å…§å®¹æœƒè¢«ç™¼é€åˆ°æ‰€æœ‰æ‚¨æœ‰è¢«é—œæ³¨çš„站點上</strong>。如果您ä¸ä¿¡ä»»é€™äº›ç«™é»žçš„管ç†è€…,您å¯ä»¥é¸æ“‡æª¢æŸ¥æˆ–刪除您的關注者。 - followers_count: é—œæ³¨è€…æ•¸é‡ - lock_link: å°‡ä½ çš„å¸³æˆ¶è¨å®šç‚ºç§äºº - purge: 移除關注者 - success: æ£æº–備軟性å°éŽ– %{count} 個網域的關注者…… - true_privacy_html: 請謹記,唯有<strong>點å°é»žåŠ å¯†æ–¹å¯ä»¥çœŸæ£ç¢ºä¿ä½ 的隱ç§</strong>。 - unlocked_warning_html: 任何人都å¯ä»¥åœ¨é—œæ³¨ä½ å¾Œç«‹å³æŸ¥çœ‹éžå…¬é–‹çš„嘟文。åªè¦%{lock_link}ï¼Œä½ å°±å¯ä»¥å¯©æ ¸ä¸¦æ‹’絕關注請求。 - unlocked_warning_title: ä½ çš„å¸³æˆ¶æ˜¯å…¬é–‹çš„ generic: changes_saved_msg: å·²æˆåŠŸå„²å˜ä¿®æ”¹! save_changes: 儲å˜ä¿®æ”¹ @@ -594,7 +584,6 @@ zh-TW: development: 開發 edit_profile: 編輯使用者資訊 export: 匯出 - followers: 授權關注者 import: 匯入 migrate: 帳戶æ¬é· notifications: 通知 diff --git a/config/navigation.rb b/config/navigation.rb index 1be621ac242932c0259bc37d15d8ab948ca31386..77a300bbf8c12a1f7bc09ea9ca47ac0fa585f898 100644 --- a/config/navigation.rb +++ b/config/navigation.rb @@ -14,9 +14,9 @@ SimpleNavigation::Configuration.run do |navigation| settings.item :import, safe_join([fa_icon('cloud-upload fw'), t('settings.import')]), settings_import_url settings.item :export, safe_join([fa_icon('cloud-download fw'), t('settings.export')]), settings_export_url settings.item :authorized_apps, safe_join([fa_icon('list fw'), t('settings.authorized_apps')]), oauth_authorized_applications_url - settings.item :follower_domains, safe_join([fa_icon('users fw'), t('settings.followers')]), settings_follower_domains_url end + primary.item :relationships, safe_join([fa_icon('users fw'), t('settings.relationships')]), relationships_url primary.item :filters, safe_join([fa_icon('filter fw'), t('filters.index.title')]), filters_path, highlights_on: %r{/filters} primary.item :invites, safe_join([fa_icon('user-plus fw'), t('invites.title')]), invites_path, if: proc { Setting.min_invite_role == 'user' } diff --git a/config/routes.rb b/config/routes.rb index 1bb875264207f410622f2f15607edb9d77d8b25c..dc5633a68d273c5c874c03dfc761a8bba7a09a6a 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -106,8 +106,6 @@ Rails.application.routes.draw do resource :confirmation, only: [:new, :create] end - resource :follower_domains, only: [:show, :update] - resources :applications, except: [:edit] do member do post :regenerate @@ -129,6 +127,7 @@ Rails.application.routes.draw do resources :emojis, only: [:show] resources :invites, only: [:index, :create, :destroy] resources :filters, except: [:show] + resource :relationships, only: [:show, :update] get '/public', to: 'public_timelines#show', as: :public_timeline get '/media_proxy/:id/(*any)', to: 'media_proxy#show', as: :media_proxy diff --git a/spec/controllers/settings/follower_domains_controller_spec.rb b/spec/controllers/relationships_controller_spec.rb similarity index 64% rename from spec/controllers/settings/follower_domains_controller_spec.rb rename to spec/controllers/relationships_controller_spec.rb index 6d415a654962ea5ee7fdaa9866326245635c90c4..16e255afe118ea210dd06989a6bff7f2fced54e8 100644 --- a/spec/controllers/settings/follower_domains_controller_spec.rb +++ b/spec/controllers/relationships_controller_spec.rb @@ -1,6 +1,6 @@ require 'rails_helper' -describe Settings::FollowerDomainsController do +describe RelationshipsController do render_views let(:user) { Fabricate(:user) } @@ -12,24 +12,17 @@ describe Settings::FollowerDomainsController do end describe 'GET #show' do - subject { get :show, params: { page: 2 } } + subject { get :show, params: { page: 2, relationship: 'followed_by' } } - it 'assigns @account' do - sign_in user, scope: :user - subject - expect(assigns(:account)).to eq user.account - end - - it 'assigns @domains' do + it 'assigns @accounts' do Fabricate(:account, domain: 'old').follow!(user.account) Fabricate(:account, domain: 'recent').follow!(user.account) sign_in user, scope: :user subject - assigned = assigns(:domains).per(1).to_a + assigned = assigns(:accounts).per(1).to_a expect(assigned.size).to eq 1 - expect(assigned[0].accounts_from_domain).to eq 1 expect(assigned[0].domain).to eq 'old' end @@ -49,25 +42,24 @@ describe Settings::FollowerDomainsController do stub_request(:post, 'http://example.com/salmon').to_return(status: 200) end - shared_examples 'redirects back to followers page' do |notice| + shared_examples 'redirects back to followers page' do it 'redirects back to followers page' do poopfeast.follow!(user.account) sign_in user, scope: :user subject - expect(flash[:notice]).to eq notice - expect(response).to redirect_to(settings_follower_domains_path) + expect(response).to redirect_to(relationships_path) end end context 'when select parameter is not provided' do subject { patch :update } - include_examples 'redirects back to followers page', 'In the process of soft-blocking followers from 0 domains...' + include_examples 'redirects back to followers page' end context 'when select parameter is provided' do - subject { patch :update, params: { select: ['example.com'] } } + subject { patch :update, params: { form_account_batch: { account_ids: [poopfeast.id] }, block_domains: '' } } it 'soft-blocks followers from selected domains' do poopfeast.follow!(user.account) @@ -79,7 +71,7 @@ describe Settings::FollowerDomainsController do end include_examples 'authenticate user' - include_examples 'redirects back to followers page', 'In the process of soft-blocking followers from one domain...' + include_examples 'redirects back to followers page' end end end