From bb71538bb503159177d46d8956bd466973c0876b Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Sat, 28 Jul 2018 19:25:33 +0200 Subject: Redesign public profiles and toots (#8068) --- app/views/accounts/_bio.html.haml | 15 ++++ app/views/accounts/_follow_button.html.haml | 28 -------- app/views/accounts/_follow_grid.html.haml | 8 --- app/views/accounts/_follow_grid_hidden.html.haml | 3 - app/views/accounts/_grid_card.html.haml | 12 ---- app/views/accounts/_header.html.haml | 82 ++++++++++------------ app/views/accounts/_moved.html.haml | 18 +++++ app/views/accounts/_moved_strip.html.haml | 17 ----- app/views/accounts/_nothing_here.html.haml | 1 - app/views/accounts/show.html.haml | 69 +++++++++--------- app/views/application/_card.html.haml | 16 +++++ app/views/application/_sidebar.html.haml | 6 ++ app/views/auth/registrations/new.html.haml | 2 +- app/views/authorize_follows/_card.html.haml | 23 ------ app/views/authorize_follows/show.html.haml | 2 +- app/views/authorize_follows/success.html.haml | 2 +- app/views/follower_accounts/index.html.haml | 9 ++- app/views/following_accounts/index.html.haml | 9 ++- app/views/layouts/public.html.haml | 55 ++++++++++++--- app/views/remote_follow/new.html.haml | 2 +- app/views/remote_unfollows/success.html.haml | 2 +- app/views/settings/migrations/show.html.haml | 2 +- app/views/settings/profiles/show.html.haml | 3 +- app/views/shared/_landing_strip.html.haml | 6 -- .../stream_entries/_content_spoiler.html.haml | 7 -- .../stream_entries/_detailed_status.html.haml | 34 ++++----- app/views/stream_entries/_media.html.haml | 4 -- app/views/stream_entries/_more.html.haml | 2 - app/views/stream_entries/_simple_status.html.haml | 34 ++++++--- app/views/stream_entries/_status.html.haml | 23 +++--- app/views/stream_entries/embed.html.haml | 2 +- app/views/stream_entries/show.html.haml | 11 +-- 32 files changed, 253 insertions(+), 256 deletions(-) create mode 100644 app/views/accounts/_bio.html.haml delete mode 100644 app/views/accounts/_follow_button.html.haml delete mode 100644 app/views/accounts/_follow_grid.html.haml delete mode 100644 app/views/accounts/_follow_grid_hidden.html.haml delete mode 100644 app/views/accounts/_grid_card.html.haml create mode 100644 app/views/accounts/_moved.html.haml delete mode 100644 app/views/accounts/_moved_strip.html.haml delete mode 100644 app/views/accounts/_nothing_here.html.haml create mode 100644 app/views/application/_card.html.haml create mode 100644 app/views/application/_sidebar.html.haml delete mode 100644 app/views/authorize_follows/_card.html.haml delete mode 100644 app/views/shared/_landing_strip.html.haml delete mode 100644 app/views/stream_entries/_content_spoiler.html.haml delete mode 100644 app/views/stream_entries/_media.html.haml delete mode 100644 app/views/stream_entries/_more.html.haml (limited to 'app/views') diff --git a/app/views/accounts/_bio.html.haml b/app/views/accounts/_bio.html.haml new file mode 100644 index 000000000..c9a4d8f1b --- /dev/null +++ b/app/views/accounts/_bio.html.haml @@ -0,0 +1,15 @@ +.public-account-bio + - unless account.fields.empty? + .account__header__fields + - account.fields.each do |field| + %dl + %dt.emojify{ title: field.name }= field.name + %dd.emojify{ title: field.value }= Formatter.instance.format_field(account, field.value, custom_emojify: true) + + = account_badge(account) + + - if account.note.present? + .account__header__content.emojify= Formatter.instance.simplified_format(account, custom_emojify: true) + + .public-account-bio__extra + = t 'accounts.joined', date: l(account.created_at, format: :month) diff --git a/app/views/accounts/_follow_button.html.haml b/app/views/accounts/_follow_button.html.haml deleted file mode 100644 index 558ced010..000000000 --- a/app/views/accounts/_follow_button.html.haml +++ /dev/null @@ -1,28 +0,0 @@ -- relationships ||= nil - -- unless account.memorial? || account.moved? - - if user_signed_in? - - requested = relationships ? relationships.requested[account.id].present? : current_account.requested?(account) - - following = relationships ? relationships.following[account.id].present? : current_account.following?(account) - - - if user_signed_in? && current_account.id != account.id && !requested - .controls - - if following - = link_to (account.local? ? account_unfollow_path(account) : remote_unfollow_path(acct: account.acct)), data: { method: :post }, class: 'icon-button' do - = fa_icon 'user-times' - = t('accounts.unfollow') - - else - = link_to (account.local? ? account_follow_path(account) : authorize_follow_path(acct: account.acct)), data: { method: :post }, class: 'icon-button' do - = fa_icon 'user-plus' - = t('accounts.follow') - - elsif user_signed_in? && current_account.id == account.id - .controls - = link_to settings_profile_url, class: 'icon-button' do - = fa_icon 'pencil' - = t('settings.edit_profile') - - elsif !user_signed_in? - .controls - .remote-follow - = link_to (account.local? ? account_remote_follow_path(account) : "web+mastodon://follow?uri=#{account.uri}"), class: 'icon-button' do - = fa_icon 'user-plus' - = t('accounts.remote_follow') diff --git a/app/views/accounts/_follow_grid.html.haml b/app/views/accounts/_follow_grid.html.haml deleted file mode 100644 index fdcef84be..000000000 --- a/app/views/accounts/_follow_grid.html.haml +++ /dev/null @@ -1,8 +0,0 @@ -.accounts-grid{ class: accounts.empty? ? 'empty' : '' } - - if accounts.empty? - = image_tag asset_pack_path('elephant_ui_greeting.svg'), alt: '', role: 'presentational' - = render partial: 'accounts/nothing_here' - - else - = render partial: 'accounts/grid_card', collection: accounts, as: :account, cached: !user_signed_in? - -= paginate follows diff --git a/app/views/accounts/_follow_grid_hidden.html.haml b/app/views/accounts/_follow_grid_hidden.html.haml deleted file mode 100644 index e970350e6..000000000 --- a/app/views/accounts/_follow_grid_hidden.html.haml +++ /dev/null @@ -1,3 +0,0 @@ -.accounts-grid.empty - = image_tag asset_pack_path('elephant_ui_greeting.svg'), alt: '', role: 'presentational' - %p.nothing-here= t('accounts.network_hidden') diff --git a/app/views/accounts/_grid_card.html.haml b/app/views/accounts/_grid_card.html.haml deleted file mode 100644 index a59ed128e..000000000 --- a/app/views/accounts/_grid_card.html.haml +++ /dev/null @@ -1,12 +0,0 @@ -.account-grid-card - .account-grid-card__header{ style: "background-image: url(#{account.header.url(:original)})" } - = render 'accounts/follow_button', account: account, relationships: @relationships - .account-grid-card__avatar - .avatar= image_tag account.avatar.url(:original) - .name - = link_to TagManager.instance.url_for(account) do - %span.display_name.emojify= display_name(account, custom_emojify: true) - %span.username - @#{account.local? ? account.local_username_and_domain : account.acct} - = fa_icon('lock') if account.locked? - .account__header__content.p-note.emojify= Formatter.instance.simplified_format(account) diff --git a/app/views/accounts/_header.html.haml b/app/views/accounts/_header.html.haml index 4098d6778..e343be820 100644 --- a/app/views/accounts/_header.html.haml +++ b/app/views/accounts/_header.html.haml @@ -1,51 +1,43 @@ -.card.h-card.p-author{ style: "background-image: url(#{account.header.url(:original)})" } - .card__illustration - = render 'accounts/follow_button', account: account - .avatar= image_tag account.avatar.url(:original), class: 'u-photo' +.public-account-header + .public-account-header__image + = image_tag account.header.url, class: 'parallax' + .public-account-header__bar + = link_to short_account_url(account), class: 'avatar' do + = image_tag account.avatar.url + .public-account-header__tabs + .public-account-header__tabs__name + %h1 + = display_name(account) + %small + = acct(account) + = fa_icon('lock') if account.locked? + .public-account-header__tabs__tabs + .details-counters + .counter{ class: active_nav_class(short_account_url(account)) } + = link_to short_account_url(account), class: 'u-url u-uid' do + %span.counter-number= number_to_human account.statuses_count, strip_insignificant_zeros: true + %span.counter-label= t('accounts.posts') - .card__bio - %h1.name - %span.p-name.emojify= display_name(account, custom_emojify: true) - %small< - %span>< @#{account.local_username_and_domain} - = fa_icon('lock') if account.locked? + .counter{ class: active_nav_class(account_following_index_url(account)) } + = link_to account_following_index_url(account) do + %span.counter-number= number_to_human account.following_count, strip_insignificant_zeros: true + %span.counter-label= t('accounts.following') - - if account.bot? - .roles - .account-role.bot - = t 'accounts.roles.bot' - - elsif Setting.show_staff_badge - - if account.user_admin? - .roles - .account-role.admin - = t 'accounts.roles.admin' - - elsif account.user_moderator? - .roles - .account-role.moderator - = t 'accounts.roles.moderator' + .counter{ class: active_nav_class(account_followers_url(account)) } + = link_to account_followers_url(account) do + %span.counter-number= number_to_human account.followers_count, strip_insignificant_zeros: true + %span.counter-label= t('accounts.followers') + .spacer + .public-account-header__tabs__tabs__buttons + = account_action_button(account) - .bio - .account__header__content.p-note.emojify= Formatter.instance.simplified_format(account, custom_emojify: true) + .public-account-header__extra + = render 'accounts/bio', account: account - - unless account.fields.empty? - .account__header__fields - - account.fields.each do |field| - %dl - %dt.emojify{ title: field.name }= field.name - %dd.emojify{ title: field.value }= Formatter.instance.format_field(account, field.value, custom_emojify: true) - - .details-counters - .counter{ class: active_nav_class(short_account_url(account)) } - = link_to short_account_url(account), class: 'u-url u-uid' do - %span.counter-number= number_to_human account.statuses_count, strip_insignificant_zeros: true - %span.counter-label= t('accounts.posts') - - .counter{ class: active_nav_class(account_following_index_url(account)) } + .public-account-header__extra__links = link_to account_following_index_url(account) do - %span.counter-number= number_to_human account.following_count, strip_insignificant_zeros: true - %span.counter-label= t('accounts.following') - - .counter{ class: active_nav_class(account_followers_url(account)) } + %strong= number_to_human account.following_count, strip_insignificant_zeros: true + = t('accounts.following') = link_to account_followers_url(account) do - %span.counter-number= number_to_human account.followers_count, strip_insignificant_zeros: true - %span.counter-label= t('accounts.followers') + %strong= number_to_human account.followers_count, strip_insignificant_zeros: true + = t('accounts.followers') diff --git a/app/views/accounts/_moved.html.haml b/app/views/accounts/_moved.html.haml new file mode 100644 index 000000000..f99328dbd --- /dev/null +++ b/app/views/accounts/_moved.html.haml @@ -0,0 +1,18 @@ +- moved_to_account = account.moved_to_account + +.moved-account-widget + .moved-account-widget__message + = fa_icon 'suitcase' + = t('accounts.moved_html', name: content_tag(:bdi, content_tag(:strong, display_name(account, custom_emojify: true), class: :emojify)), new_profile_link: link_to(content_tag(:strong, safe_join(['@', content_tag(:span, moved_to_account.acct)])), TagManager.instance.url_for(moved_to_account), class: 'mention')) + + .moved-account-widget__card + = link_to TagManager.instance.url_for(moved_to_account), class: 'detailed-status__display-name p-author h-card', target: '_blank', rel: 'noopener' do + .detailed-status__display-avatar + .account__avatar-overlay + .account__avatar-overlay-base{ style: "background-image: url('#{moved_to_account.avatar.url(:original)}')" } + .account__avatar-overlay-overlay{ style: "background-image: url('#{account.avatar.url(:original)}')" } + + %span.display-name + %bdi + %strong.emojify= display_name(moved_to_account, custom_emojify: true) + %span @#{moved_to_account.acct} diff --git a/app/views/accounts/_moved_strip.html.haml b/app/views/accounts/_moved_strip.html.haml deleted file mode 100644 index ae18c6dc7..000000000 --- a/app/views/accounts/_moved_strip.html.haml +++ /dev/null @@ -1,17 +0,0 @@ -- moved_to_account = account.moved_to_account - -.moved-strip - .moved-strip__message - = fa_icon 'suitcase' - = t('accounts.moved_html', name: content_tag(:strong, display_name(account, custom_emojify: true), class: :emojify), new_profile_link: link_to(content_tag(:strong, safe_join(['@', content_tag(:span, moved_to_account.acct)])), TagManager.instance.url_for(moved_to_account), class: 'mention')) - - .moved-strip__card - = link_to TagManager.instance.url_for(moved_to_account), class: 'detailed-status__display-name p-author h-card', target: '_blank', rel: 'noopener' do - .detailed-status__display-avatar - .account__avatar-overlay - .account__avatar-overlay-base{ style: "background-image: url('#{moved_to_account.avatar.url(:original)}')" } - .account__avatar-overlay-overlay{ style: "background-image: url('#{account.avatar.url(:original)}')" } - - %span.display-name - %strong.emojify= display_name(moved_to_account, custom_emojify: true) - %span @#{moved_to_account.acct} diff --git a/app/views/accounts/_nothing_here.html.haml b/app/views/accounts/_nothing_here.html.haml deleted file mode 100644 index 0c6dc1168..000000000 --- a/app/views/accounts/_nothing_here.html.haml +++ /dev/null @@ -1 +0,0 @@ -%p.nothing-here= t('accounts.nothing_here') diff --git a/app/views/accounts/show.html.haml b/app/views/accounts/show.html.haml index cfdd3a945..b30755d94 100644 --- a/app/views/accounts/show.html.haml +++ b/app/views/accounts/show.html.haml @@ -20,36 +20,39 @@ = opengraph 'og:type', 'profile' = render 'og', account: @account, url: short_account_url(@account, only_path: false) -- if @account.memorial? - .memoriam-strip= t('in_memoriam_html') -- elsif @account.moved? - = render partial: 'moved_strip', locals: { account: @account } -- elsif show_landing_strip? - = render partial: 'shared/landing_strip', locals: { account: @account } - -.h-feed - %data.p-name{ value: "#{@account.username} on #{site_hostname}" }/ - - = render 'header', account: @account - - .activity-stream-tabs - = active_link_to t('accounts.posts'), short_account_url(@account) - = active_link_to t('accounts.posts_with_replies'), short_account_with_replies_url(@account) - = active_link_to t('accounts.media'), short_account_media_url(@account) - - - if @statuses.empty? - .accounts-grid - = render 'nothing_here' - - else - .activity-stream.with-header - - if params[:page].to_i.zero? - = render partial: 'stream_entries/status', collection: @pinned_statuses, as: :status, locals: { pinned: true } - - = render partial: 'stream_entries/status', collection: @statuses, as: :status - - - if @newer_url || @older_url - .pagination - - if @older_url - = link_to safe_join([fa_icon('chevron-left'), t('pagination.older')], ' '), @older_url, class: 'older', rel: 'next' - - if @newer_url - = link_to safe_join([t('pagination.newer'), fa_icon('chevron-right')], ' '), @newer_url, class: 'newer', rel: 'prev' + += render 'header', account: @account, with_bio: true + +.grid + .column-0 + .h-feed + %data.p-name{ value: "#{@account.username} on #{site_hostname}" }/ + + .account__section-headline + = active_link_to t('accounts.posts'), short_account_url(@account) + = active_link_to t('accounts.posts_with_replies'), short_account_with_replies_url(@account) + = active_link_to t('accounts.media'), short_account_media_url(@account) + + - if @statuses.empty? + = nothing_here 'nothing-here--under-tabs' + - else + .activity-stream + - if params[:page].to_i.zero? + = render partial: 'stream_entries/status', collection: @pinned_statuses, as: :status, locals: { pinned: true } + + - if @newer_url + .entry= link_to_more @newer_url + + = render partial: 'stream_entries/status', collection: @statuses, as: :status + + - if @older_url + .entry= link_to_more @older_url + + .column-1 + - if @account.memorial? + .memoriam-widget= t('in_memoriam_html') + - elsif @account.moved? + = render 'moved', account: @account + + = render 'bio', account: @account + = render 'application/sidebar' diff --git a/app/views/application/_card.html.haml b/app/views/application/_card.html.haml new file mode 100644 index 000000000..9cf8f8ff2 --- /dev/null +++ b/app/views/application/_card.html.haml @@ -0,0 +1,16 @@ +- account_url = local_assigns[:admin] ? admin_account_path(account.id) : TagManager.instance.url_for(account) + +.card.h-card + = link_to account_url, target: '_blank', rel: 'noopener' do + .card__img + = image_tag account.header.url, alt: '' + .card__bar + .avatar + = image_tag account.avatar.url, alt: '', width: 48, height: 48, class: 'u-photo' + + .display-name + %bdi + %strong.emojify.p-name= display_name(account, custom_emojify: true) + %span + = acct(account) + = fa_icon('lock') if account.locked? diff --git a/app/views/application/_sidebar.html.haml b/app/views/application/_sidebar.html.haml new file mode 100644 index 000000000..3d8832bb4 --- /dev/null +++ b/app/views/application/_sidebar.html.haml @@ -0,0 +1,6 @@ +.hero-widget + .hero-widget__img + = image_tag @instance_presenter.hero&.file&.url || @instance_presenter.thumbnail&.file&.url || asset_pack_path('preview.jpg'), alt: @instance_presenter.site_title + + .hero-widget__text + %p= @instance_presenter.site_description.html_safe.presence || t('about.generic_description', domain: site_hostname) diff --git a/app/views/auth/registrations/new.html.haml b/app/views/auth/registrations/new.html.haml index 0fac8e10d..200ed42de 100644 --- a/app/views/auth/registrations/new.html.haml +++ b/app/views/auth/registrations/new.html.haml @@ -10,7 +10,7 @@ - if @invite.present? && @invite.autofollow? .fields-group{ style: 'margin-bottom: 30px' } %p.hint{ style: 'text-align: center' }= t('invites.invited_by') - = render 'authorize_follows/card', account: @invite.user.account + = render 'application/card', account: @invite.user.account = f.simple_fields_for :account do |ff| .input-with-append diff --git a/app/views/authorize_follows/_card.html.haml b/app/views/authorize_follows/_card.html.haml deleted file mode 100644 index edc03131f..000000000 --- a/app/views/authorize_follows/_card.html.haml +++ /dev/null @@ -1,23 +0,0 @@ -.account-card - .account-card__header{ style: "background-image: url(#{account.header.url(:original)})" } - .detailed-status__display-name - %div - = image_tag account.avatar.url(:original), alt: '', width: 48, height: 48, class: 'avatar' - - %span.display-name - - account_url = local_assigns[:admin] ? admin_account_path(account.id) : TagManager.instance.url_for(account) - = link_to account_url, class: 'detailed-status__display-name p-author h-card', target: '_blank', rel: 'noopener' do - %strong.emojify= display_name(account, custom_emojify: true) - %span @#{account.acct} - - .counter - %span.counter-number= number_to_human account.statuses_count, strip_insignificant_zeros: true - %span.counter-label= t('accounts.posts') - - .counter - %span.counter-number= number_to_human account.following_count, strip_insignificant_zeros: true - %span.counter-label= t('accounts.following') - - .counter - %span.counter-number= number_to_human account.followers_count, strip_insignificant_zeros: true - %span.counter-label= t('accounts.followers') diff --git a/app/views/authorize_follows/show.html.haml b/app/views/authorize_follows/show.html.haml index a1fd01dd6..90e65b34f 100644 --- a/app/views/authorize_follows/show.html.haml +++ b/app/views/authorize_follows/show.html.haml @@ -3,7 +3,7 @@ .form-container .follow-prompt - = render 'card', account: @account + = render 'application/card', account: @account - if current_account.following?(@account) .flash-message diff --git a/app/views/authorize_follows/success.html.haml b/app/views/authorize_follows/success.html.haml index fa59b24b8..cf9cb50ea 100644 --- a/app/views/authorize_follows/success.html.haml +++ b/app/views/authorize_follows/success.html.haml @@ -8,6 +8,6 @@ - else %h2= t('authorize_follow.following') - = render 'card', account: @account + = render 'application/card', account: @account = render 'post_follow_actions' diff --git a/app/views/follower_accounts/index.html.haml b/app/views/follower_accounts/index.html.haml index 65af81a5b..31dab68bf 100644 --- a/app/views/follower_accounts/index.html.haml +++ b/app/views/follower_accounts/index.html.haml @@ -8,6 +8,11 @@ = render 'accounts/header', account: @account - if @account.user_hides_network? - = render 'accounts/follow_grid_hidden' + .nothing-here= t('accounts.network_hidden') +- elsif @follows.empty? + = nothing_here - else - = render 'accounts/follow_grid', follows: @follows, accounts: @follows.map(&:account) + .card-grid + = render partial: 'application/card', collection: @follows.map(&:account), as: :account + + = paginate @follows diff --git a/app/views/following_accounts/index.html.haml b/app/views/following_accounts/index.html.haml index 8fd95a0b4..8b49b529b 100644 --- a/app/views/following_accounts/index.html.haml +++ b/app/views/following_accounts/index.html.haml @@ -8,6 +8,11 @@ = render 'accounts/header', account: @account - if @account.user_hides_network? - = render 'accounts/follow_grid_hidden' + .nothing-here= t('accounts.network_hidden') +- elsif @follows.empty? + = nothing_here - else - = render 'accounts/follow_grid', follows: @follows, accounts: @follows.map(&:target_account) + .card-grid + = render partial: 'application/card', collection: @follows.map(&:target_account), as: :account + + = paginate @follows diff --git a/app/views/layouts/public.html.haml b/app/views/layouts/public.html.haml index 600290297..f9d808bed 100644 --- a/app/views/layouts/public.html.haml +++ b/app/views/layouts/public.html.haml @@ -2,16 +2,49 @@ = javascript_pack_tag 'public', integrity: true, crossorigin: 'anonymous' - content_for :content do - .container-alt= yield - .footer - - if !user_signed_in? && single_user_mode? - %span.single-user-login - = link_to t('auth.login'), new_user_session_path - — - %span.footer__domain= link_to site_hostname, about_path - - else - %span.footer__domain= link_to site_hostname, root_path - %span.powered-by - != t('generic.powered_by', link: link_to('https://joinmastodon.org') { image_tag asset_pack_path('logo_full.svg'), alt: 'Mastodon' }) + .public-layout + .container + %nav.header + .nav-left + = link_to root_url, class: 'brand' do + = image_tag asset_pack_path('logo_full.svg'), alt: 'Mastodon' + .nav-center + .nav-right + - if user_signed_in? + = link_to t('settings.back'), root_url, class: 'nav-link nav-button webapp-btn' + - else + = link_to t('auth.login'), new_user_session_path, class: 'webapp-btn nav-link nav-button' + = link_to t('auth.register'), new_user_registration_path, class: 'webapp-btn nav-link nav-button' + + .container= yield + + .container + .footer + .grid + .column-0 + %h4= t 'footer.resources' + %ul + %li= link_to t('about.terms'), terms_path + %li= link_to t('about.privacy_policy'), terms_path + .column-1 + %h4= t 'footer.developers' + %ul + %li= link_to t('about.documentation'), 'https://github.com/tootsuite/documentation' + %li= link_to t('about.api'), 'https://github.com/tootsuite/documentation/blob/master/Using-the-API/API.md' + .column-2 + %h4= link_to t('about.what_is_mastodon'), 'https://joinmastodon.org/' + + = link_to root_url, class: 'brand' do + = render file: Rails.root.join('app', 'javascript', 'images', 'logo_transparent.svg') + .column-3 + %h4= site_hostname + %ul + %li= link_to t('about.about_this'), about_more_path + %li= "v#{Mastodon::Version.to_s}" + .column-4 + %h4= t 'footer.more' + %ul + %li= link_to t('about.source_code'), Mastodon::Version.source_url + %li= link_to 'joinmastodon.org', 'https://joinmastodon.org' = render template: 'layouts/application' diff --git a/app/views/remote_follow/new.html.haml b/app/views/remote_follow/new.html.haml index 9b22fda5f..9b679015f 100644 --- a/app/views/remote_follow/new.html.haml +++ b/app/views/remote_follow/new.html.haml @@ -6,7 +6,7 @@ .follow-prompt %h2= t('remote_follow.prompt') - = render partial: 'authorize_follows/card', locals: { account: @account } + = render partial: 'application/card', locals: { account: @account } = simple_form_for @remote_follow, as: :remote_follow, url: account_remote_follow_path(@account) do |f| = render 'shared/error_messages', object: @remote_follow diff --git a/app/views/remote_unfollows/success.html.haml b/app/views/remote_unfollows/success.html.haml index aa3c838a0..b007eedc7 100644 --- a/app/views/remote_unfollows/success.html.haml +++ b/app/views/remote_unfollows/success.html.haml @@ -5,6 +5,6 @@ .follow-prompt %h2= t('remote_unfollow.unfollowed') - = render 'card', account: @account + = render 'application/card', account: @account = render 'post_follow_actions' diff --git a/app/views/settings/migrations/show.html.haml b/app/views/settings/migrations/show.html.haml index b7c34761f..c69061d50 100644 --- a/app/views/settings/migrations/show.html.haml +++ b/app/views/settings/migrations/show.html.haml @@ -6,7 +6,7 @@ %p.hint= t('migrations.currently_redirecting') .fields-group - = render partial: 'authorize_follows/card', locals: { account: @migration.account } + = render partial: 'application/card', locals: { account: @migration.account } = render 'shared/error_messages', object: @migration diff --git a/app/views/settings/profiles/show.html.haml b/app/views/settings/profiles/show.html.haml index a84f8a7da..3940eb855 100644 --- a/app/views/settings/profiles/show.html.haml +++ b/app/views/settings/profiles/show.html.haml @@ -8,8 +8,7 @@ = f.input :display_name, placeholder: t('simple_form.labels.defaults.display_name'), hint: t('simple_form.hints.defaults.display_name', count: 30 - @account.display_name.size).html_safe = f.input :note, placeholder: t('simple_form.labels.defaults.note'), hint: t('simple_form.hints.defaults.note', count: 160 - @account.note.size).html_safe - .card.compact{ style: "background-image: url(#{@account.header.url(:original)})", data: { original_src: @account.header.url(:original) } } - .avatar= image_tag @account.avatar.url(:original), data: { original_src: @account.avatar.url(:original) } + = render 'application/card', account: @account .fields-group = f.input :avatar, wrapper: :with_label, input_html: { accept: AccountAvatar::IMAGE_MIME_TYPES.join(',') }, hint: t('simple_form.hints.defaults.avatar') diff --git a/app/views/shared/_landing_strip.html.haml b/app/views/shared/_landing_strip.html.haml deleted file mode 100644 index 9a4144723..000000000 --- a/app/views/shared/_landing_strip.html.haml +++ /dev/null @@ -1,6 +0,0 @@ -.landing-strip - = image_tag asset_pack_path('logo.svg'), class: 'logo' - - %div - = t('landing_strip_html', name: content_tag(:span, display_name(account, custom_emojify: true), class: :emojify), link_to_root_path: link_to(content_tag(:strong, site_hostname), root_path)) - = t('landing_strip_signup_html', sign_up_path: open_registrations? ? new_user_registration_path : 'https://joinmastodon.org/#getting-started') diff --git a/app/views/stream_entries/_content_spoiler.html.haml b/app/views/stream_entries/_content_spoiler.html.haml deleted file mode 100644 index 798dfce67..000000000 --- a/app/views/stream_entries/_content_spoiler.html.haml +++ /dev/null @@ -1,7 +0,0 @@ -.media-spoiler-wrapper{ class: sensitive == false && 'media-spoiler-wrapper__visible' } - .spoiler-button - .icon-button.overlayed - %i.fa.fa-fw.fa-eye - .media-spoiler - %span= t('stream_entries.sensitive_content') - %span= t('stream_entries.click_to_show') diff --git a/app/views/stream_entries/_detailed_status.html.haml b/app/views/stream_entries/_detailed_status.html.haml index 85e90a237..aa160b979 100644 --- a/app/views/stream_entries/_detailed_status.html.haml +++ b/app/views/stream_entries/_detailed_status.html.haml @@ -1,16 +1,15 @@ -.detailed-status.light +.detailed-status.detailed-status--flex = link_to TagManager.instance.url_for(status.account), class: 'detailed-status__display-name p-author h-card', target: stream_link_target, rel: 'noopener' do - %div - .avatar - = image_tag status.account.avatar.url(:original), width: 48, height: 48, alt: '', class: 'u-photo' + .detailed-status__display-avatar + = image_tag status.account.avatar.url(:original), width: 48, height: 48, alt: '', class: 'account__avatar u-photo' %span.display-name - %strong.p-name.emojify= display_name(status.account, custom_emojify: true) - %span= acct(status.account) + %bdi + %strong.display-name__html.p-name.emojify= display_name(status.account, custom_emojify: true) + %span.display-name__account + = acct(status.account) + = fa_icon('lock') if status.account.locked? - - if !user_signed_in? || embedded_view? - = link_to account_remote_follow_path(status.account), class: 'button button-secondary logo-button', target: '_new' do - = render file: Rails.root.join('app', 'javascript', 'images', 'logo.svg') - = t('accounts.follow') + = account_action_button(status.account) .status__content.emojify< - if status.spoiler_text? @@ -30,6 +29,7 @@ .detailed-status__meta %data.dt-published{ value: status.created_at.to_time.iso8601 } + = link_to TagManager.instance.url_for(status), class: 'detailed-status__datetime u-url u-uid', target: stream_link_target, rel: 'noopener' do %time.formatted{ datetime: status.created_at.iso8601, title: l(status.created_at) }= l(status.created_at) · @@ -40,20 +40,20 @@ = link_to status.application.name, status.application.website, class: 'detailed-status__application', target: '_blank', rel: 'noopener' · - if status.direct_visibility? - %span< + %span.detailed-status__link< = fa_icon('envelope') - elsif status.private_visibility? - %span< + %span.detailed-status__link< = fa_icon('lock') - else - %span< + %span.detailed-status__link< = fa_icon('retweet') - %span= status.reblogs_count + %span.detailed-status__reblogs= number_to_human status.reblogs_count, strip_insignificant_zeros: true · - %span< + %span.detailed-status__link< = fa_icon('star') - %span= status.favourites_count + %span.detailed-status__favorites= number_to_human status.favourites_count, strip_insignificant_zeros: true - if user_signed_in? · - = link_to t('statuses.open_in_web'), web_url("statuses/#{status.id}"), class: 'open-in-web-link', target: '_blank' + = link_to t('statuses.open_in_web'), web_url("statuses/#{status.id}"), class: 'detailed-status__application', target: '_blank' diff --git a/app/views/stream_entries/_media.html.haml b/app/views/stream_entries/_media.html.haml deleted file mode 100644 index 779f02c8d..000000000 --- a/app/views/stream_entries/_media.html.haml +++ /dev/null @@ -1,4 +0,0 @@ -.media-item - = link_to media.remote_url.blank? ? media.file.url(:original) : media.remote_url, style: media.image? ? "background-image: url(#{media.file.url(:original)})" : '', target: '_blank', rel: 'noopener', class: "u-#{media.video? || media.gifv? ? 'video' : 'photo'}" do - - unless media.image? - %video{ src: media.file.url(:original), autoplay: true, loop: true }/ diff --git a/app/views/stream_entries/_more.html.haml b/app/views/stream_entries/_more.html.haml deleted file mode 100644 index 9b1dfe4a7..000000000 --- a/app/views/stream_entries/_more.html.haml +++ /dev/null @@ -1,2 +0,0 @@ -= link_to url, class: 'more light' do - = t('statuses.show_more') diff --git a/app/views/stream_entries/_simple_status.html.haml b/app/views/stream_entries/_simple_status.html.haml index 0f27585a1..676d367ca 100644 --- a/app/views/stream_entries/_simple_status.html.haml +++ b/app/views/stream_entries/_simple_status.html.haml @@ -1,18 +1,19 @@ -.status.light - .status__header - .status__meta - = link_to TagManager.instance.url_for(status), class: 'status__relative-time u-url u-uid', target: stream_link_target, rel: 'noopener' do - %time.time-ago{ datetime: status.created_at.iso8601, title: l(status.created_at) }= l(status.created_at) - %data.dt-published{ value: status.created_at.to_time.iso8601 } +.status + .status__info + = link_to TagManager.instance.url_for(status), class: 'status__relative-time u-url u-uid', target: stream_link_target, rel: 'noopener' do + %time.time-ago{ datetime: status.created_at.iso8601, title: l(status.created_at) }= l(status.created_at) + %data.dt-published{ value: status.created_at.to_time.iso8601 } = link_to TagManager.instance.url_for(status.account), class: 'status__display-name p-author h-card', target: stream_link_target, rel: 'noopener' do .status__avatar %div - = image_tag status.account.avatar(:original), width: 48, height: 48, alt: '', class: 'u-photo' + = image_tag status.account.avatar(:original), width: 48, height: 48, alt: '', class: 'u-photo account__avatar' %span.display-name - %strong.p-name.emojify= display_name(status.account, custom_emojify: true) - %span= acct(status.account) - + %bdi + %strong.display-name__html.p-name.emojify= display_name(status.account, custom_emojify: true) + %span.display-name__account + = acct(status.account) + = fa_icon('lock') if status.account.locked? .status__content.emojify< - if status.spoiler_text? %p{ style: 'margin-bottom: 0' }< @@ -26,3 +27,16 @@ = react_component :video, src: video.file.url(:original), preview: video.file.url(:small), sensitive: status.sensitive? && !current_account&.user&.setting_display_sensitive_media, width: 610, height: 343, inline: true - else = react_component :media_gallery, height: 343, sensitive: status.sensitive? && !current_account&.user&.setting_display_sensitive_media, 'autoPlayGif': current_account&.user&.setting_auto_play_gif, media: status.media_attachments.map { |a| ActiveModelSerializers::SerializableResource.new(a, serializer: REST::MediaAttachmentSerializer).as_json } + + .status__action-bar + .status__action-bar-button.static-icon-button< + - if status.public_visibility? || status.unlisted_visibility? + = fa_icon 'retweet fw' + %span.detailed-status__reblogs= number_to_human status.reblogs_count, strip_insignificant_zeros: true + - elsif status.private_visibility? + = fa_icon 'lock fw' + - else + = fa_icon 'envelope fw' + .status__action-bar-button.static-icon-button< + = fa_icon 'star fw' + %span.detailed-status__favorites= number_to_human status.favourites_count, strip_insignificant_zeros: true diff --git a/app/views/stream_entries/_status.html.haml b/app/views/stream_entries/_status.html.haml index b87ca2177..320c9bc4f 100644 --- a/app/views/stream_entries/_status.html.haml +++ b/app/views/stream_entries/_status.html.haml @@ -16,24 +16,25 @@ - if status.reply? && include_threads - if @next_ancestor .entry{ class: entry_classes } - = render 'stream_entries/more', url: TagManager.instance.url_for(@next_ancestor) + = link_to_more TagManager.instance.url_for(@next_ancestor) = render partial: 'stream_entries/status', collection: @ancestors, as: :status, locals: { is_predecessor: true, direct_reply_id: status.in_reply_to_id } .entry{ class: entry_classes } - if status.reblog? - .pre-header - .pre-header__icon - = fa_icon('retweet fw') + .status__prepend + .status__prepend-icon-wrapper + %i.status__prepend-icon.fa.fa-fw.fa-retweet %span = link_to TagManager.instance.url_for(status.account), class: 'status__display-name muted' do - %strong.emojify= display_name(status.account, custom_emojify: true) + %bdi + %strong.emojify= display_name(status.account, custom_emojify: true) = t('stream_entries.reblogged') - elsif pinned - .pre-header - .pre-header__icon - = fa_icon('thumb-tack fw') + .status__prepend + .status__prepend-icon-wrapper + %i.status__prepend-icon.fa.fa-fw.fa-thumb-tack %span = t('stream_entries.pinned') @@ -42,13 +43,13 @@ - if include_threads - if @since_descendant_thread_id .entry{ class: entry_classes } - = render 'stream_entries/more', url: short_account_status_url(status.account.username, status, max_descendant_thread_id: @since_descendant_thread_id + 1) + = link_to_more short_account_status_url(status.account.username, status, max_descendant_thread_id: @since_descendant_thread_id + 1) - @descendant_threads.each do |thread| = render partial: 'stream_entries/status', collection: thread[:statuses], as: :status, locals: { is_successor: true, parent_id: status.id } - if thread[:next_status] .entry{ class: entry_classes } - = render 'stream_entries/more', url: TagManager.instance.url_for(thread[:next_status]) + = link_to_more TagManager.instance.url_for(thread[:next_status]) - if @next_descendant_thread .entry{ class: entry_classes } - = render 'stream_entries/more', url: short_account_status_url(status.account.username, status, since_descendant_thread_id: @max_descendant_thread_id - 1) + = link_to_more short_account_status_url(status.account.username, status, since_descendant_thread_id: @max_descendant_thread_id - 1) diff --git a/app/views/stream_entries/embed.html.haml b/app/views/stream_entries/embed.html.haml index b703c15d2..d20c1e93e 100644 --- a/app/views/stream_entries/embed.html.haml +++ b/app/views/stream_entries/embed.html.haml @@ -1,3 +1,3 @@ - cache @stream_entry.activity do - .activity-stream.activity-stream-headless + .activity-stream.activity-stream--headless = render "stream_entries/#{@type}", @type.to_sym => @stream_entry.activity, centered: true diff --git a/app/views/stream_entries/show.html.haml b/app/views/stream_entries/show.html.haml index dfb83e747..9da6245dc 100644 --- a/app/views/stream_entries/show.html.haml +++ b/app/views/stream_entries/show.html.haml @@ -17,8 +17,9 @@ = render 'stream_entries/og_description', activity: @stream_entry.activity = render 'stream_entries/og_image', activity: @stream_entry.activity, account: @account -- if show_landing_strip? - = render partial: 'shared/landing_strip', locals: { account: @stream_entry.account } - -.activity-stream.activity-stream-headless.h-entry - = render partial: "stream_entries/#{@type}", locals: { @type.to_sym => @stream_entry.activity, include_threads: true } +.grid + .column-0 + .activity-stream.activity-stream-headless.h-entry + = render partial: "stream_entries/#{@type}", locals: { @type.to_sym => @stream_entry.activity, include_threads: true } + .column-1 + = render 'application/sidebar' -- cgit From 0a3cc246acca9645d5d41a25d73f510ff67af6f6 Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Sun, 29 Jul 2018 02:57:13 +0200 Subject: Fix size/dimension values in avatar/header hint localizations (#8088) --- app/views/settings/profiles/show.html.haml | 4 +-- config/locales/activerecord.ast.yml | 3 +- config/locales/devise.ast.yml | 3 +- config/locales/devise.tr.yml | 51 ------------------------------ config/locales/doorkeeper.ast.yml | 3 +- config/locales/simple_form.ar.yml | 4 +-- config/locales/simple_form.ast.yml | 3 +- config/locales/simple_form.bg.yml | 4 +-- config/locales/simple_form.ca.yml | 4 +-- config/locales/simple_form.co.yml | 4 +-- config/locales/simple_form.cs.yml | 2 +- config/locales/simple_form.da.yml | 4 +-- config/locales/simple_form.de.yml | 4 +-- config/locales/simple_form.el.yml | 4 +-- config/locales/simple_form.en.yml | 4 +-- config/locales/simple_form.eo.yml | 4 +-- config/locales/simple_form.es.yml | 4 +-- config/locales/simple_form.eu.yml | 4 +-- config/locales/simple_form.fr.yml | 4 +-- config/locales/simple_form.gl.yml | 4 +-- config/locales/simple_form.he.yml | 4 +-- config/locales/simple_form.hr.yml | 4 +-- config/locales/simple_form.hu.yml | 4 +-- config/locales/simple_form.id.yml | 4 +-- config/locales/simple_form.io.yml | 4 +-- config/locales/simple_form.it.yml | 4 +-- config/locales/simple_form.ja.yml | 4 +-- config/locales/simple_form.ko.yml | 4 +-- config/locales/simple_form.nl.yml | 4 +-- config/locales/simple_form.no.yml | 4 +-- config/locales/simple_form.oc.yml | 4 +-- config/locales/simple_form.pl.yml | 4 +-- config/locales/simple_form.pt-BR.yml | 4 +-- config/locales/simple_form.pt.yml | 4 +-- config/locales/simple_form.ru.yml | 4 +-- config/locales/simple_form.sk.yml | 4 +-- config/locales/simple_form.sl.yml | 4 +-- config/locales/simple_form.sr-Latn.yml | 4 +-- config/locales/simple_form.sr.yml | 4 +-- config/locales/simple_form.sv.yml | 4 +-- config/locales/simple_form.th.yml | 4 +-- config/locales/simple_form.tr.yml | 4 +-- config/locales/simple_form.uk.yml | 4 +-- config/locales/simple_form.zh-CN.yml | 4 +-- config/locales/simple_form.zh-HK.yml | 4 +-- config/locales/simple_form.zh-TW.yml | 4 +-- 46 files changed, 89 insertions(+), 136 deletions(-) delete mode 100644 config/locales/devise.tr.yml (limited to 'app/views') diff --git a/app/views/settings/profiles/show.html.haml b/app/views/settings/profiles/show.html.haml index 3940eb855..9518bcb61 100644 --- a/app/views/settings/profiles/show.html.haml +++ b/app/views/settings/profiles/show.html.haml @@ -11,9 +11,9 @@ = render 'application/card', account: @account .fields-group - = f.input :avatar, wrapper: :with_label, input_html: { accept: AccountAvatar::IMAGE_MIME_TYPES.join(',') }, hint: t('simple_form.hints.defaults.avatar') + = f.input :avatar, wrapper: :with_label, input_html: { accept: AccountAvatar::IMAGE_MIME_TYPES.join(',') }, hint: t('simple_form.hints.defaults.avatar', dimensions: '400x400', size: number_to_human_size(AccountAvatar::LIMIT)) - = f.input :header, wrapper: :with_label, input_html: { accept: AccountHeader::IMAGE_MIME_TYPES.join(',') }, hint: t('simple_form.hints.defaults.header') + = f.input :header, wrapper: :with_label, input_html: { accept: AccountHeader::IMAGE_MIME_TYPES.join(',') }, hint: t('simple_form.hints.defaults.header', dimensions: '1500x500', size: number_to_human_size(AccountHeader::LIMIT)) .fields-group = f.input :locked, as: :boolean, wrapper: :with_label, hint: t('simple_form.hints.defaults.locked') diff --git a/config/locales/activerecord.ast.yml b/config/locales/activerecord.ast.yml index 0967ef424..0b77eecf2 100644 --- a/config/locales/activerecord.ast.yml +++ b/config/locales/activerecord.ast.yml @@ -1 +1,2 @@ -{} +--- +ast: diff --git a/config/locales/devise.ast.yml b/config/locales/devise.ast.yml index 0967ef424..0b77eecf2 100644 --- a/config/locales/devise.ast.yml +++ b/config/locales/devise.ast.yml @@ -1 +1,2 @@ -{} +--- +ast: diff --git a/config/locales/devise.tr.yml b/config/locales/devise.tr.yml deleted file mode 100644 index fb819978f..000000000 --- a/config/locales/devise.tr.yml +++ /dev/null @@ -1,51 +0,0 @@ ---- -tr: - simple_form: - hints: - defaults: - avatar: En fazla 2MB olacak şekilde PNG, GIF veya JPG formatında yükleyiniz. 400x400px büyüklüğüne indirgenecektir - display_name: "%{count} karakter kaldı" - header: En fazla 2MB olacak şekilde PNG, GIF veya JPG formatında yükleyiniz. 700x335px büyüklüğüne indirgenecektir. - locked: Takipçilerinizi manuel olarak kabul etmenizi ve gönderilerinizi varsayılan olarak sadece takipçilerinizin göreceği şekilde paylaşmanızı sağlar. - note: "%{count} karakter kaldı" - imports: - data: Diğer Mastodon sunucusundan dışarı aktardığınız CSV dosyası - sessions: - otp: Telefonunuzdaki two-factor kodunuzu giriniz veya kurtarma kodlarınızdan birini giriniz. - labels: - defaults: - avatar: Profil resmi - confirm_new_password: Yeni parolanız (tekrar) - confirm_password: Parolanız (tekrar) - current_password: Mevcut parolanız - data: Dosya - display_name: Görünen adınız - email: E-posta adresiniz - header: Kapak resmi - locale: Dil - locked: Hesabımı kilitle - new_password: Yeni parolanız - note: Kişisel bilgiler - otp_attempt: İki-faktörlü kod - password: Parolanız - setting_auto_play_gif: GIF'leri otomatik oynatt - setting_boost_modal: Boost etmeden önce onay diyaloğu göster - setting_default_privacy: Gönderi gizliliği - severity: Zorluk - type: Dosya türü - username: Kullanıcı adınız - interactions: - must_be_follower: Takipçim olmayan kişilerden gelen bildirimleri engelle - must_be_following: Takip etmediğim kişilerden gelen bildirimleri engelle - notification_emails: - digest: Özet e-postaları gönder - favourite: Biri durumumu favorilerine eklediginde bana e-posta gönder - follow: Biri beni takip ettiğinde bana e-posta gönder - follow_request: Biri bana takip isteği gönderdiğinde, bana e-posta gönder - mention: Biri benden bahsettiğinde, bana e-posta gönder - reblog: Biri durumumu paylaştığında, bana e-posta gönder - 'no': Hayır - required: - mark: "*" - text: gerekli - 'yes': Evet diff --git a/config/locales/doorkeeper.ast.yml b/config/locales/doorkeeper.ast.yml index 0967ef424..0b77eecf2 100644 --- a/config/locales/doorkeeper.ast.yml +++ b/config/locales/doorkeeper.ast.yml @@ -1 +1,2 @@ -{} +--- +ast: diff --git a/config/locales/simple_form.ar.yml b/config/locales/simple_form.ar.yml index 8f3e685a6..0474e1ef2 100644 --- a/config/locales/simple_form.ar.yml +++ b/config/locales/simple_form.ar.yml @@ -4,7 +4,7 @@ ar: hints: defaults: autofollow: سوف يتابعك تلقائيًا الأشخاص الذين يقومون بالتسجيل من خلال الدعوة - avatar: ملف PNG أو GIF أو JPG. حجمه على أقصى تصدير 2MB. سيتم تصغيره إلى 400x400px + avatar: ملف PNG أو GIF أو JPG. حجمه على أقصى تصدير %{size}. سيتم تصغيره إلى %{dimensions}px bot: يُعلِم أنّ هذا الحساب لا يمثل شخصًا context: واحد أو أكثر من السياقات التي يجب أن ينطبق عليها عامل التصفية digest: تُرسَل إليك بعد مُضيّ مدة مِن خمول نشاطك و فقط إذا ما تلقيت رسائل شخصية مباشِرة أثناء فترة غيابك مِن الشبكة @@ -12,7 +12,7 @@ ar: one: 1 حرف باق other: %{count} حرف باق fields: يُمكنك عرض 4 عناصر على شكل جدول في ملفك الشخصي - header: ملف PNG أو GIF أو JPG. حجمه على أقصى تصدير 2MB. سيتم تصغيره إلى 700x335px + header: ملف PNG أو GIF أو JPG. حجمه على أقصى تصدير %{size}. سيتم تصغيره إلى %{dimensions}px irreversible: التبويقات التي تم تصفيتها ستختفي لا محالة حتى و إن تمت إزالة عامِل التصفية لاحقًا locale: لغة واجهة المستخدم و الرسائل الإلكترونية و الإشعارات locked: يتطلب منك الموافقة يدويا على طلبات المتابعة diff --git a/config/locales/simple_form.ast.yml b/config/locales/simple_form.ast.yml index 0967ef424..0b77eecf2 100644 --- a/config/locales/simple_form.ast.yml +++ b/config/locales/simple_form.ast.yml @@ -1 +1,2 @@ -{} +--- +ast: diff --git a/config/locales/simple_form.bg.yml b/config/locales/simple_form.bg.yml index 720a8391d..938dacc95 100644 --- a/config/locales/simple_form.bg.yml +++ b/config/locales/simple_form.bg.yml @@ -3,9 +3,9 @@ bg: simple_form: hints: defaults: - avatar: PNG, GIF или JPG. До 2MB. Ще бъде смалена до 400x400 пиксела + avatar: PNG, GIF или JPG. До %{size}. Ще бъде смалена до %{dimensions} пиксела display_name: До 30 символа - header: PNG, GIF или JPG. До 2MB. Ще бъде смалена до 700x335 пиксела + header: PNG, GIF или JPG. До %{size}. Ще бъде смалена до %{dimensions} пиксела locked: Изисква ръчно одобрение на последователите. По подразбиране, публикациите са достъпни само до последователи. note: До 160 символа imports: diff --git a/config/locales/simple_form.ca.yml b/config/locales/simple_form.ca.yml index 482ddd7be..d45b84971 100644 --- a/config/locales/simple_form.ca.yml +++ b/config/locales/simple_form.ca.yml @@ -4,7 +4,7 @@ ca: hints: defaults: autofollow: Les persones que es registrin a través de la invitació et seguiran automàticament - avatar: PNG, GIF o JPG. Màxim 2MB. S'escalarà a 400x400px + avatar: PNG, GIF o JPG. Màxim %{size}. S'escalarà a %{dimensions}px bot: Aquest compte realitza principalment accions automatitzades i pot no estar controlat per cap persona context: Un o diversos contextos on s'ha d'aplicar el filtre digest: Només s'envia després d'un llarg període d'inactivitat amb un resum de les mencions que has rebut en la teva absència @@ -12,7 +12,7 @@ ca: one: 1 càracter restant other: %{count} càracters restans fields: Pots tenir fins a 4 elements que es mostren com a taula al teu perfil - header: PNG, GIF o JPG. Màxim 2MB. S'escalarà a 700x335px + header: PNG, GIF o JPG. Màxim %{size}. S'escalarà a %{dimensions}px irreversible: Els nodes filtrats desapareixeran de manera irreversible, fins i tot si el filtre es retira més tard locale: El llenguatge de l’interfície d’usuari, els correus i les notificacions push locked: Requereix que aprovis manualment els seguidors diff --git a/config/locales/simple_form.co.yml b/config/locales/simple_form.co.yml index ac8b89a7b..85a98a3f6 100644 --- a/config/locales/simple_form.co.yml +++ b/config/locales/simple_form.co.yml @@ -3,14 +3,14 @@ co: simple_form: hints: defaults: - avatar: Furmatu PNG, GIF o JPG. 2Mo o menu. Sarà ridottu à 400x400px + avatar: Furmatu PNG, GIF o JPG. 2Mo o menu. Sarà ridottu à %{dimensions}px bot: Stu contu hè autumatizatu è ùn hè forse micca survegliatu digest: Solu mandatu dopu à una longa perioda d’inattività, è solu s’elli ci sò novi missaghji diretti display_name: one: Ci ferma 1 caratteru other: Ci fermanu %{count} caratteri fields: Pudete avè fin’à 4 elementi mustrati cum’un tavulone nant’à u vostru prufile - header: Furmatu PNG, GIF o JPG. 2Mo o menu. Sarà ridottu à 700x335px + header: Furmatu PNG, GIF o JPG. 2Mo o menu. Sarà ridottu à %{dimensions}px locked: Duvarete appruvà e dumande d’abbunamentu note: one: Ci ferma 1 caratteru diff --git a/config/locales/simple_form.cs.yml b/config/locales/simple_form.cs.yml index e8e7628f3..f909d402d 100644 --- a/config/locales/simple_form.cs.yml +++ b/config/locales/simple_form.cs.yml @@ -3,7 +3,7 @@ cs: simple_form: hints: defaults: - avatar: PNG, GIF či JPG. Maximálně 2 MB. Bude zmenšena na 400x400px + avatar: PNG, GIF či JPG. Maximálně %{size}. Bude zmenšena na %{dimensions}px bot: Tento účet provádí hlavně automatizované akce a nemusí být spravován. display_name: one: Zbývá 1 znak diff --git a/config/locales/simple_form.da.yml b/config/locales/simple_form.da.yml index 716ee7e1c..fc3258993 100644 --- a/config/locales/simple_form.da.yml +++ b/config/locales/simple_form.da.yml @@ -4,7 +4,7 @@ da: hints: defaults: autofollow: Folk der har oprettet sig gennem invitationen vil automatisk følge dig - avatar: PNG, GIF eller JPG. Højest 2MB. Vil blive skaleret ned til 400x400px + avatar: PNG, GIF eller JPG. Højest %{size}. Vil blive skaleret ned til %{dimensions}px bot: Denne konto udfører hovedsageligt automatiserede handlinger og bliver muligvis ikke overvåget context: En eller flere sammenhænge hvor filteret skal være gældende digest: Sendes kun efter en lang periode med inaktivitet og kun hvis du har modtaget nogle personlige beskeder mens du er væk @@ -12,7 +12,7 @@ da: one: 1 tegn tilbage other: %{count}tegn tilbage fields: Du kan have op til 4 ting vist som en tabel på din profil - header: PNG, GIF eller JPG. Højest 2MB. Vil blive skaleret ned til 700x335px + header: PNG, GIF eller JPG. Højest %{size}. Vil blive skaleret ned til %{dimensions}px inbox_url: Kopiere linket fra forsiden af den relay som du ønsker at bruge irreversible: Filtrerede toots vil forsvinde fulstændigt, selv hvis filteret senere skulle blive fjernet locale: Sproget på interfacet, emails og push beskeder diff --git a/config/locales/simple_form.de.yml b/config/locales/simple_form.de.yml index 0c0679605..e9e795bf4 100644 --- a/config/locales/simple_form.de.yml +++ b/config/locales/simple_form.de.yml @@ -4,7 +4,7 @@ de: hints: defaults: autofollow: Leute die sich über deine Einladung registrieren werden dir automatisch folgen - avatar: PNG, GIF oder JPG. Maximal 2 MB. Wird auf 400×400 px herunterskaliert + avatar: PNG, GIF oder JPG. Maximal %{size}. Wird auf 400×400 px herunterskaliert bot: Dieses Konto führt lediglich automatisierte Aktionen durch und wird möglicherweise nicht überwacht context: Ein oder mehrere Aspekte, wo der Filter greifen soll digest: Wenn du lange Zeit inaktiv bist, wird dir eine Zusammenfassung von Erwähnungen in deiner Abwesenheit zugeschickt @@ -12,7 +12,7 @@ de: one: 1 Zeichen verbleibt other: %{count} Zeichen verbleiben fields: Du kannst bis zu 4 Elemente als Tabelle dargestellt auf deinem Profil anzeigen lassen - header: PNG, GIF oder JPG. Maximal 2 MB. Wird auf 700×335 px herunterskaliert + header: PNG, GIF oder JPG. Maximal %{size}. Wird auf 700×335 px herunterskaliert irreversible: Gefilterte Beiträge werden unwiderruflich gefiltert, selbst wenn der Filter später entfernt wurde locale: Die Sprache der Oberfläche, E-Mails und Push-Benachrichtigungen locked: Wer dir folgen möchte, muss um deine Erlaubnis bitten diff --git a/config/locales/simple_form.el.yml b/config/locales/simple_form.el.yml index 58bae8dc1..75d97dcd0 100644 --- a/config/locales/simple_form.el.yml +++ b/config/locales/simple_form.el.yml @@ -4,7 +4,7 @@ el: hints: defaults: autofollow: Όσοι εγγραφούν μέσω της πρόσκλησης θα σε ακολουθούν αυτόματα - avatar: PNG, GIF ή JPG. Έως 2MB. Θα περιοριστεί σε διάσταση 400x400px + avatar: PNG, GIF ή JPG. Έως %{size}. Θα περιοριστεί σε διάσταση %{dimensions}px bot: Ο λογαριασμός αυτός εκτελεί κυρίως αυτοματοποιημένες ενέργειες και ίσως να μην παρακολουθείται context: Ένα ή περισσότερα πλαίσια στα οποία μπορεί να εφαρμόζεται αυτό το φίλτρο digest: Αποστέλλεται μόνο μετά από μακρά περίοδο αδράνειας και μόνο αν έχεις λάβει προσωπικά μηνύματα κατά την απουσία σου @@ -12,7 +12,7 @@ el: one: απομένει 1 χαρακτήρας other: απομένουν %{count} χαρακτήρες fields: Μπορείς να έχεις έως 4 σημειώσεις σε μορφή πίνακα στο προφίλ σου - header: PNG, GIF ή JPG. Έως 2MB. Θα περιοριστεί σε διάσταση 700x335px + header: PNG, GIF ή JPG. Έως %{size}. Θα περιοριστεί σε διάσταση %{dimensions}px inbox_url: Αντέγραψε το URL της αρχικής σελίδας του ανταποκριτή (relay) που θέλεις να χρησιμοποιήσεις irreversible: Τα φιλτραρισμένα τουτ θα εξαφανιστούν αμετάκλητα, ακόμα και αν το φίλτρο αργότερα αφαιρεθεί locale: Η γλώσσα του περιβάλλοντος χρήσης, των email και των ειδοποιήσεων ώθησης diff --git a/config/locales/simple_form.en.yml b/config/locales/simple_form.en.yml index 9ff548f40..59ebe0a7e 100644 --- a/config/locales/simple_form.en.yml +++ b/config/locales/simple_form.en.yml @@ -4,7 +4,7 @@ en: hints: defaults: autofollow: People who sign up through the invite will automatically follow you - avatar: PNG, GIF or JPG. At most 2MB. Will be downscaled to 400x400px + avatar: PNG, GIF or JPG. At most %{size}. Will be downscaled to %{dimensions}px bot: This account mainly performs automated actions and might not be monitored context: One or multiple contexts where the filter should apply digest: Only sent after a long period of inactivity and only if you have received any personal messages in your absence @@ -12,7 +12,7 @@ en: one: 1 character left other: %{count} characters left fields: You can have up to 4 items displayed as a table on your profile - header: PNG, GIF or JPG. At most 2MB. Will be downscaled to 700x335px + header: PNG, GIF or JPG. At most %{size}. Will be downscaled to %{dimensions}px inbox_url: Copy the URL from the frontpage of the relay you want to use irreversible: Filtered toots will disappear irreversibly, even if filter is later removed locale: The language of the user interface, e-mails and push notifications diff --git a/config/locales/simple_form.eo.yml b/config/locales/simple_form.eo.yml index 7d73f2553..9b6e7cd9e 100644 --- a/config/locales/simple_form.eo.yml +++ b/config/locales/simple_form.eo.yml @@ -4,7 +4,7 @@ eo: hints: defaults: autofollow: Homoj, kiuj registriĝos per la invito aŭtomate sekvos vin - avatar: Formato PNG, GIF aŭ JPG. Ĝis 2MB. Estos malgrandigita al 400x400px + avatar: Formato PNG, GIF aŭ JPG. Ĝis %{size}. Estos malgrandigita al %{dimensions}px bot: Tiu konto ĉefe faras aŭtomatajn agojn, kaj povas esti ne kontrolata context: Unu ol pluraj kuntekstoj kie la filtrilo devus agi digest: Sendita nur post longa tempo de neaktiveco, kaj nur se vi ricevis personan mesaĝon en via foresto @@ -12,7 +12,7 @@ eo: one: 1 signo restas other: %{count} signoj restas fields: Vi povas havi ĝis 4 tabelajn elementojn en via profilo - header: Formato PNG, GIF aŭ JPG. Ĝis 2MB. Estos malgrandigita al 700x335px + header: Formato PNG, GIF aŭ JPG. Ĝis %{size}. Estos malgrandigita al %{dimensions}px inbox_url: Kopiu la URL de la ĉefpaĝo de la ripetilo, kiun vi volas uzi irreversible: Elfiltritaj mesaĝoj malaperos por ĉiam, eĉ se la filtrilo estas poste forigita locale: La lingvo de la uzant-interfaco, retmesaĝoj kaj puŝ-sciigoj diff --git a/config/locales/simple_form.es.yml b/config/locales/simple_form.es.yml index 000a33edc..483f79058 100644 --- a/config/locales/simple_form.es.yml +++ b/config/locales/simple_form.es.yml @@ -3,12 +3,12 @@ es: simple_form: hints: defaults: - avatar: PNG, GIF o JPG. Máximo 2MB. Será escalado a 400x400px + avatar: PNG, GIF o JPG. Máximo %{size}. Será escalado a %{dimensions}px digest: Solo enviado tras un largo periodo de inactividad y solo si has recibido mensajes personales durante tu ausencia display_name: one: 1 caracter restante other: %{count} caracteres restantes - header: PNG, GIF o JPG. Máximo 2MB. Será escalado a 700x335px + header: PNG, GIF o JPG. Máximo %{size}. Será escalado a %{dimensions}px locked: Requiere que manualmente apruebes seguidores y las publicaciones serán mostradas solamente a tus seguidores note: one: 1 carácter restante diff --git a/config/locales/simple_form.eu.yml b/config/locales/simple_form.eu.yml index 2d60030ec..481e95e39 100644 --- a/config/locales/simple_form.eu.yml +++ b/config/locales/simple_form.eu.yml @@ -4,14 +4,14 @@ eu: hints: defaults: autofollow: Gonbidapena erabiliz izena ematen dutenek automatikoki jarraituko zaituzte - avatar: PNG, GIF edo JPG. Gehienez 2MB. 400x400px neurrira eskalatuko da + avatar: PNG, GIF edo JPG. Gehienez %{size}. %{dimensions}px neurrira eskalatuko da bot: Kontu honek nagusiki automatizatutako ekintzak burutzen ditu eta agian ez du inork monitorizatzen digest: Soilik jarduerarik gabeko epe luze bat eta gero, eta soilik ez zeudela mezu pertsonalen bat jaso baduzu display_name: one: Karaktere 1 geratzen da other: %{count} karaktere geratzen dira fields: 4 elementu bistaratu ditzakezu taula batean zure profilean - header: PNG, GIF edo JPG. Gehienez 2MB. 700x335px eskalara txikituko da + header: PNG, GIF edo JPG. Gehienez %{size}. %{dimensions}px eskalara txikituko da locale: Erabiltzaile-interfazea, e-mail mezuen eta jakinarazpenen hizkuntza locked: Jarraitzaileak eskuz onartu behar dituzu note: diff --git a/config/locales/simple_form.fr.yml b/config/locales/simple_form.fr.yml index e510bd155..1a5bb3494 100644 --- a/config/locales/simple_form.fr.yml +++ b/config/locales/simple_form.fr.yml @@ -4,7 +4,7 @@ fr: hints: defaults: autofollow: Les personnes qui s'inscrivent grâce à l'invitation vous suivront automatiquement - avatar: Au format PNG, GIF ou JPG. 2 Mo maximum. Sera réduit à 400x400px + avatar: Au format PNG, GIF ou JPG. 2 Mo maximum. Sera réduit à %{dimensions}px bot: Ce compte exécute principalement des actions automatisées et pourrait ne pas être surveillé context: Un ou plusieurs contextes où le filtre devrait s'appliquer digest: Uniquement envoyé après une longue période d’inactivité et uniquement si vous avez reçu des messages personnels pendant votre absence @@ -12,7 +12,7 @@ fr: one: 1 caractère restant other: %{count} caractères restants fields: Vous pouvez avoir jusqu'à 4 éléments affichés en tant que tableau sur votre profil - header: Au format PNG, GIF ou JPG. 2 Mo maximum. Sera réduit à 700x335px + header: Au format PNG, GIF ou JPG. 2 Mo maximum. Sera réduit à %{dimensions}px irreversible: Les pouets filtrés disparaîtront irrémédiablement, même si le filtre est supprimé plus tard locale: La langue de l'interface-utilisateur, des courriels, et des notifications locked: Vous devrez approuver chaque abonné⋅e et vos statuts ne s’afficheront qu’à vos abonné⋅es diff --git a/config/locales/simple_form.gl.yml b/config/locales/simple_form.gl.yml index 84990a66f..b84a95826 100644 --- a/config/locales/simple_form.gl.yml +++ b/config/locales/simple_form.gl.yml @@ -4,7 +4,7 @@ gl: hints: defaults: autofollow: As persoas que se conectaron a través de un convite seguirana automáticamente a vostede - avatar: PNG, GIF ou JPG. Máximo 2MB. Será reducida a 400x400px + avatar: PNG, GIF ou JPG. Máximo %{size}. Será reducida a %{dimensions}px bot: Esta conta realiza principalmente accións automatizadas e podería non estar monitorizada context: Un ou varios contextos onde se debería aplicar o filtro digest: Enviar só tras un longo período de inactividade e só si recibeu algunha mensaxe personal na súa ausencia @@ -12,7 +12,7 @@ gl: one: 1 caracter restante other: %{count} caracteres restantes fields: Pode ter ate 4 elementos no seu perfil mostrados como unha táboa - header: PNG, GIF ou JPG. Máximo 2MB. Será reducida a 700x335px + header: PNG, GIF ou JPG. Máximo %{size}. Será reducida a %{dimensions}px inbox_url: Copiar o URL desde a páxina de inicio do repetidor que quere utilizar irreversible: Os toots filtrados desaparecerán de xeito irreversible, incluso si despois se elimina o filtro locale: O idioma da interface de usuaria, correos e notificacións diff --git a/config/locales/simple_form.he.yml b/config/locales/simple_form.he.yml index 96cdccd2b..aa5c7e827 100644 --- a/config/locales/simple_form.he.yml +++ b/config/locales/simple_form.he.yml @@ -3,12 +3,12 @@ he: simple_form: hints: defaults: - avatar: PNG, GIF או JPG. מקסימום 2MB. גודל התמונה יוקטן ל-400x400px + avatar: PNG, GIF או JPG. מקסימום %{size}. גודל התמונה יוקטן ל-%{dimensions}px digest: נשלח לאחר תקופה ארוכה של אי-פעילות עם סיכום איזכורים שקיבלת בהעדרך display_name: one: נותרה אותאחת other: נותרו%{count} אותיות - header: PNG, GIF או JPG. מקסימום 2MB. גודל התמונה יוקטן 700x335px + header: PNG, GIF או JPG. מקסימום %{size}. גודל התמונה יוקטן %{dimensions}px locked: מחייב אישור עוקבים באופן ידני. פרטיות ההודעות תהיה עוקבים-בלבד אלא אם יצוין אחרת note: one: נותרה אותאחת diff --git a/config/locales/simple_form.hr.yml b/config/locales/simple_form.hr.yml index 2506c8d92..2b3ebf91e 100644 --- a/config/locales/simple_form.hr.yml +++ b/config/locales/simple_form.hr.yml @@ -3,9 +3,9 @@ hr: simple_form: hints: defaults: - avatar: PNG, GIF ili JPG. Najviše 2MB. Bit će smanjen na 400x400px + avatar: PNG, GIF ili JPG. Najviše %{size}. Bit će smanjen na %{dimensions}px display_name: Najviše 30 znakova - header: PNG, GIF ili JPG. Najviše 2MB. Bit će smanjen na 700x335px + header: PNG, GIF ili JPG. Najviše %{size}. Bit će smanjen na %{dimensions}px locked: traži te da ručno odobriš sljedbenike i postavlja privatnost postova na dostupnu samo sljedbenicima note: Najviše 160 znakova imports: diff --git a/config/locales/simple_form.hu.yml b/config/locales/simple_form.hu.yml index 2b36dc85b..ef915dec5 100644 --- a/config/locales/simple_form.hu.yml +++ b/config/locales/simple_form.hu.yml @@ -3,12 +3,12 @@ hu: simple_form: hints: defaults: - avatar: PNG, GIF vagy JPG. Maximum 2MB. Át lesz méretezve 400x400 pixelre + avatar: PNG, GIF vagy JPG. Maximum %{size}. Át lesz méretezve %{dimensions} pixelre digest: Csak hosszú távollét esetén küldve és csak ha személyes üzenetet kaptál távollétedben display_name: one: 1karakter maradt other: %{count}karakter maradt - header: PNG, GIF vagy JPG. Maximum 2MB. Át lesz méretezve 700x335 pixelre + header: PNG, GIF vagy JPG. Maximum %{size}. Át lesz méretezve %{dimensions} pixelre locked: Egyenként engedélyezned kell a követőidet note: one: 1karakter maradt diff --git a/config/locales/simple_form.id.yml b/config/locales/simple_form.id.yml index 6b2868e02..fcd9d862c 100644 --- a/config/locales/simple_form.id.yml +++ b/config/locales/simple_form.id.yml @@ -3,9 +3,9 @@ id: simple_form: hints: defaults: - avatar: PNG, GIF atau JPG. Maksimal 2MB. Ukuran dikecilkan menjadi 400x400px + avatar: PNG, GIF atau JPG. Maksimal %{size}. Ukuran dikecilkan menjadi %{dimensions}px display_name: Maksimal 30 karakter - header: PNG, GIF atau JPG. Maksimal 2MB. Ukuran dikecilkan menjadi 700x335px + header: PNG, GIF atau JPG. Maksimal %{size}. Ukuran dikecilkan menjadi %{dimensions}px locked: Anda harus menerima permintaan pengikut secara manual dan setting privasi postingan akan diubah khusus untuk pengikut note: Maksimum 160 karakter imports: diff --git a/config/locales/simple_form.io.yml b/config/locales/simple_form.io.yml index 60b578a12..cf87aa6d9 100644 --- a/config/locales/simple_form.io.yml +++ b/config/locales/simple_form.io.yml @@ -3,9 +3,9 @@ io: simple_form: hints: defaults: - avatar: En la formato PNG, GIF o JPG. Til 2Mo. Esos mikrigita a 400x400px + avatar: En la formato PNG, GIF o JPG. Til 2Mo. Esos mikrigita a %{dimensions}px display_name: 30 signi maxime - header: En la formato PNG, GIF o JPG. Til 2Mo. Esos mikrigita a 700x335px + header: En la formato PNG, GIF o JPG. Til 2Mo. Esos mikrigita a %{dimensions}px locked: Tu devos aprobar omna demandi di sequado, e tua mesaji esos senchanje nur por tua sequanti. note: 160 signi maxime imports: diff --git a/config/locales/simple_form.it.yml b/config/locales/simple_form.it.yml index 16de1efd2..810ac813e 100644 --- a/config/locales/simple_form.it.yml +++ b/config/locales/simple_form.it.yml @@ -4,7 +4,7 @@ it: hints: defaults: autofollow: Le persone che si iscrivono attraverso l'invito ti seguiranno automaticamente - avatar: PNG, GIF o JPG. Al massimo 2MB. Verranno scalate a 400x400px + avatar: PNG, GIF o JPG. Al massimo %{size}. Verranno scalate a %{dimensions}px bot: Questo account esegue principalmente operazioni automatiche e potrebbe non essere tenuto sotto controllo da una persona context: Uno o più contesti nei quali il filtro dovrebbe essere applicato digest: Inviata solo dopo un lungo periodo di inattività e solo se hai ricevuto qualche messaggio personale in tua assenza @@ -12,7 +12,7 @@ it: one: 1 carattere rimanente other: %{count} caratteri rimanenti fields: Puoi avere fino a 4 voci visualizzate come una tabella sul tuo profilo - header: PNG, GIF o JPG. Al massimo 2MB. Verranno scalate a 700x335px + header: PNG, GIF o JPG. Al massimo %{size}. Verranno scalate a %{dimensions}px inbox_url: Copia la URL dalla pagina iniziale del ripetitore che vuoi usare irreversible: I toot filtrati scompariranno in modo irreversibile, anche se il filtro viene eliminato locale: La lingua dell'interfaccia utente, di email e notifiche push diff --git a/config/locales/simple_form.ja.yml b/config/locales/simple_form.ja.yml index 2bce145cb..6aa7af979 100644 --- a/config/locales/simple_form.ja.yml +++ b/config/locales/simple_form.ja.yml @@ -4,13 +4,13 @@ ja: hints: defaults: autofollow: 招待から登録した人が自動的にあなたをフォローするようになります - avatar: 2MBまでのPNG、GIF、JPGが利用可能です。400x400pxまで縮小されます + avatar: "%{size}までのPNG、GIF、JPGが利用可能です。%{dimensions}pxまで縮小されます" bot: このアカウントは主に自動で動作し、人が見ていない可能性があります context: フィルターを適用する対象 (複数選択可) digest: 長期間使用していない場合と不在時に返信を受けた場合のみ送信されます display_name: あと%{count}文字入力できます。 fields: プロフィールに表として4つまでの項目を表示することができます - header: 2MBまでのPNG、GIF、JPGが利用可能です。 700x335pxまで縮小されます + header: "%{size}までのPNG、GIF、JPGが利用可能です。 %{dimensions}pxまで縮小されます" inbox_url: 使用したいリレーサーバーのトップページからURLをコピーします irreversible: フィルターが後で削除されても、除外されたトゥートは元に戻せなくなります locale: ユーザーインターフェース、メールやプッシュ通知の言語 diff --git a/config/locales/simple_form.ko.yml b/config/locales/simple_form.ko.yml index 392c24e82..2982a84bf 100644 --- a/config/locales/simple_form.ko.yml +++ b/config/locales/simple_form.ko.yml @@ -4,7 +4,7 @@ ko: hints: defaults: autofollow: 이 초대를 통해 가입하는 사람은 당신을 자동으로 팔로우 하게 됩니다 - avatar: PNG, GIF 혹은 JPG. 최대 2MB. 400x400px로 다운스케일 될 것임 + avatar: PNG, GIF 혹은 JPG. 최대 %{size}. %{dimensions}px로 다운스케일 될 것임 bot: 사람들에게 계정이 사람이 아님을 알립니다 context: 필터를 적용 할 한 개 이상의 컨텍스트 digest: 오랫동안 활동하지 않았을 때 받은 멘션들에 대한 요약 받기 @@ -12,7 +12,7 @@ ko: one: 1 글자 남음 other: %{count} 글자 남음 fields: 당신의 프로파일에 최대 4개까지 표 형식으로 나타낼 수 있습니다 - header: PNG, GIF 혹은 JPG. 최대 2MB. 700x335px로 다운스케일 됨 + header: PNG, GIF 혹은 JPG. 최대 %{size}. %{dimensions}px로 다운스케일 됨 irreversible: 필터링 된 툿은 나중에 필터가 사라지더라도 돌아오지 않게 됩니다 locale: 유저 인터페이스, 이메일, 푸시 알림 언어 locked: 수동으로 팔로워를 승인하고, 기본 툿 프라이버시 설정을 팔로워 전용으로 변경 diff --git a/config/locales/simple_form.nl.yml b/config/locales/simple_form.nl.yml index 47520a55b..ddbc58978 100644 --- a/config/locales/simple_form.nl.yml +++ b/config/locales/simple_form.nl.yml @@ -4,7 +4,7 @@ nl: hints: defaults: autofollow: Mensen die zich via de uitnodiging hebben geregistreerd, volgen jou automatisch - avatar: PNG, GIF of JPG. Maximaal 2MB. Wordt teruggeschaald naar 400x400px + avatar: PNG, GIF of JPG. Maximaal %{size}. Wordt teruggeschaald naar %{dimensions}px bot: Dit is een geautomatiseerd account en wordt mogelijk niet gemonitord context: Een of meerdere locaties waar de filter actief moet zijn digest: Wordt alleen na een lange periode van inactiviteit verzonden en alleen wanneer je tijdens jouw afwezigheid persoonlijke berichten hebt ontvangen @@ -12,7 +12,7 @@ nl: one: 1 teken over other: %{count} tekens over fields: Je kan maximaal 4 items als een tabel op je profiel weergeven - header: PNG, GIF of JPG. Maximaal 2MB. Wordt teruggeschaald naar 700x335px + header: PNG, GIF of JPG. Maximaal %{size}. Wordt teruggeschaald naar %{dimensions}px inbox_url: Kopieer de URL van de voorpagina van de relayserver die je wil gebruiken irreversible: Gefilterde toots verdwijnen onomkeerbaar, zelfs als de filter later wordt verwijderd locale: De taal van de gebruikersomgeving, e-mails en pushmeldingen diff --git a/config/locales/simple_form.no.yml b/config/locales/simple_form.no.yml index aba8feeb6..98c6b82fe 100644 --- a/config/locales/simple_form.no.yml +++ b/config/locales/simple_form.no.yml @@ -3,12 +3,12 @@ simple_form: hints: defaults: - avatar: PNG, GIF eller JPG. Maksimalt 2 MB. Vil bli nedskalert til 400x400px + avatar: PNG, GIF eller JPG. Maksimalt %{size}. Vil bli nedskalert til %{dimensions}px digest: Kun sendt etter en lang periode med inaktivitet og bare dersom du har mottatt noen personlige meldinger mens du var borte display_name: one: 1 tegn igjen other: %{count} tegn igjen - header: PNG, GIF eller JPG. Maksimalt 2MB. Vil bli nedskalert til 700x335px + header: PNG, GIF eller JPG. Maksimalt %{size}. Vil bli nedskalert til %{dimensions}px locked: Krever at du manuelt godkjenner følgere note: one: 1 tegn igjen diff --git a/config/locales/simple_form.oc.yml b/config/locales/simple_form.oc.yml index 293ad964a..4842e5c4e 100644 --- a/config/locales/simple_form.oc.yml +++ b/config/locales/simple_form.oc.yml @@ -4,7 +4,7 @@ oc: hints: defaults: autofollow: Lo monde que se marcan gràcia a l’invitacion vos segràn automaticament - avatar: PNG, GIF o JPG. Maximum 2 Mo. Serà retalhat en 400x400px + avatar: PNG, GIF o JPG. Maximum 2 Mo. Serà retalhat en %{dimensions}px bot: Avisar lo monde qu’aqueste compte es pas d’una persona context: Un o mai de contèxtes ont lo filtre deuriá s’aplicar digest: Solament enviat aprèp un long moment d’inactivitat e solament s’avètz recebut de messatges personals pendent vòstra abséncia @@ -12,7 +12,7 @@ oc: one: Demòra encara 1 caractèr other: Demòran encara %{count} caractèrs fields: Podètz far veire cap a 4 elements sus vòstre perfil - header: PNG, GIF o JPG. Maximum 2 Mo. Serà retalhada en 700x335px + header: PNG, GIF o JPG. Maximum 2 Mo. Serà retalhada en %{dimensions}px inbox_url: Copiatz l’URL de la pagina màger del relai que volètz utilizar irreversible: Los tuts filtrats desapareisseràn irreversiblament, encara que lo filtre siá suprimit mai tard locale: La lenga de l’interfàcia d’utilizacion, los messatges e las notificacions diff --git a/config/locales/simple_form.pl.yml b/config/locales/simple_form.pl.yml index 55c5e1c6d..96dd5191f 100644 --- a/config/locales/simple_form.pl.yml +++ b/config/locales/simple_form.pl.yml @@ -4,7 +4,7 @@ pl: hints: defaults: autofollow: Osoby, które zarejestrują się z Twojego zaproszenia automatycznie zaczną Cię śledzić - avatar: PNG, GIF lub JPG. Maksymalnie 2MB. Zostanie zmniejszony do 400x400px + avatar: PNG, GIF lub JPG. Maksymalnie %{size}. Zostanie zmniejszony do %{dimensions}px bot: To konto wykonuje głównie zautomatyzowane działania i może nie być monitorowane context: Jedno lub wiele miejsc, w których filtr zostanie zastosowany digest: Wysyłane tylko po długiej nieaktywności, jeżeli w tym czasie otrzymaleś jakąś wiadomość bezpośrednią @@ -14,7 +14,7 @@ pl: one: Pozostał 1 znak other: Pozostało %{count} znaków fields: Możesz ustawić maksymalnie 4 niestandardowe pola wyświetlane jako tabela na Twoim profilu - header: PNG, GIF lub JPG. Maksymalnie 2MB. Zostanie zmniejszony do 700x335px + header: PNG, GIF lub JPG. Maksymalnie %{size}. Zostanie zmniejszony do %{dimensions}px irreversible: Filtrowane wpisy znikną bezpowrotnie, nawet gdy filtr zostanie usunięty locale: Język interfejsu, wiadomości e-mail i powiadomieniach push locked: Musisz akceptować prośby o śledzenie diff --git a/config/locales/simple_form.pt-BR.yml b/config/locales/simple_form.pt-BR.yml index f6738b73f..013b26066 100644 --- a/config/locales/simple_form.pt-BR.yml +++ b/config/locales/simple_form.pt-BR.yml @@ -4,7 +4,7 @@ pt-BR: hints: defaults: autofollow: Pessoas que se cadastrarem através de seu convite te seguirão automaticamente - avatar: PNG, GIF or JPG. Arquivos de até 2MB. Eles serão diminuídos para 400x400px + avatar: PNG, GIF or JPG. Arquivos de até %{size}. Eles serão diminuídos para %{dimensions}px bot: Essa conta executa principalmente ações automatizadas e pode não ser monitorada context: Um ou mais contextos onde o filtro deve ser aplicado digest: Enviado após um longo período de inatividade com um resumo das menções que você recebeu em sua ausência @@ -12,7 +12,7 @@ pt-BR: one: 1 caracter restante other: %{count} caracteres restantes fields: Você pode ter até 4 itens exibidos em forma de tabela no seu perfil - header: PNG, GIF or JPG. Arquivos de até 2MB. Eles serão diminuídos para 700x335px + header: PNG, GIF or JPG. Arquivos de até %{size}. Eles serão diminuídos para %{dimensions}px inbox_url: Copie a URL da página inicial do repetidor que você quer usar irreversible: Os toots filtrados vão desaparecer irreversivelmente, mesmo se o filtro for removido depois locale: O idioma das telas de usuário, e-mails e notificações push diff --git a/config/locales/simple_form.pt.yml b/config/locales/simple_form.pt.yml index 5b79bd29f..8c515c1de 100644 --- a/config/locales/simple_form.pt.yml +++ b/config/locales/simple_form.pt.yml @@ -3,12 +3,12 @@ pt: simple_form: hints: defaults: - avatar: PNG, GIF or JPG. Arquivos até 2MB. Vão ser reduzidos para 400x400px + avatar: PNG, GIF or JPG. Arquivos até %{size}. Vão ser reduzidos para %{dimensions}px digest: Enviado após um longo período de inatividade e apenas se foste mencionado na tua ausência display_name: one: 1 caracter restante other: %{count} caracteres restantes - header: PNG, GIF or JPG. Arquivos até 2MB. Vão ser reduzidos para 700x335px + header: PNG, GIF or JPG. Arquivos até %{size}. Vão ser reduzidos para %{dimensions}px locked: Requer aprovação manual de seguidores note: one: 1 caracter restante diff --git a/config/locales/simple_form.ru.yml b/config/locales/simple_form.ru.yml index 6bb95b13f..9174237bc 100644 --- a/config/locales/simple_form.ru.yml +++ b/config/locales/simple_form.ru.yml @@ -3,7 +3,7 @@ ru: simple_form: hints: defaults: - avatar: PNG, GIF или JPG. Максимально 2MB. Будет уменьшено до 400x400px + avatar: PNG, GIF или JPG. Максимально %{size}. Будет уменьшено до %{dimensions}px bot: Этот аккаунт обычно выполяет автоматизированные действия и может не просматриваться владельцем digest: Отсылается лишь после длительной неактивности, если Вы в это время получали личные сообщения display_name: @@ -12,7 +12,7 @@ ru: one: Остался 1 символ other: Осталось %{count} символов fields: В профиле можно отобразить до 4 пунктов как таблицу - header: PNG, GIF или JPG. Максимально 2MB. Будет уменьшено до 700x335px + header: PNG, GIF или JPG. Максимально %{size}. Будет уменьшено до %{dimensions}px locked: Потребует от Вас ручного подтверждения подписчиков, изменит приватность постов по умолчанию на "только для подписчиков" note: few: Осталось %{count} символа diff --git a/config/locales/simple_form.sk.yml b/config/locales/simple_form.sk.yml index 8064dbdae..c9ec7fb20 100644 --- a/config/locales/simple_form.sk.yml +++ b/config/locales/simple_form.sk.yml @@ -4,7 +4,7 @@ sk: hints: defaults: autofollow: Ľudia ktorí sa zaregistrujú prostredníctvom pozvánky, ťa budú inheď následovať - avatar: PNG, GIF alebo JPG. Maximálne 2MB. Bude zmenšený na 400x400px + avatar: PNG, GIF alebo JPG. Maximálne %{size}. Bude zmenšený na %{dimensions}px bot: Tento účet vykonáva hlavne automatizované akcie, a je pravdepodobne nespravovaný context: Jedno, alebo viac kritérií, v ktorých má byť filtrovanie uplatnené digest: Odoslané iba v prípade dlhodobej neprítomnosti, a len ak si obdŕžal/a nejaké osobné správy kým si bol/a preč @@ -13,7 +13,7 @@ sk: one: Ostáva ti 1 znak other: Ostáva ti %{count} znakov fields: Môžeš mať 4 položky na svojom profile zobrazené vo forme tabuľky - header: PNG, GIF alebo JPG. Maximálne 2MB. Bude zmenšený na 700x335px + header: PNG, GIF alebo JPG. Maximálne %{size}. Bude zmenšený na %{dimensions}px inbox_url: Skopíruj adresu z hlavnej stránky mostíka, ktorý chceš používať irreversible: Vytriedené príspevky zmiznú nenávratne, aj keď triedenie neskôr zrušíš locale: Jazyk užívateľského rozhrania, emailových a nástenkových oboznámení diff --git a/config/locales/simple_form.sl.yml b/config/locales/simple_form.sl.yml index 31d1e1170..0f86841d3 100644 --- a/config/locales/simple_form.sl.yml +++ b/config/locales/simple_form.sl.yml @@ -3,13 +3,13 @@ sl: simple_form: hints: defaults: - avatar: PNG, GIF ali JPG. Največ 2MB. Zmanjšana bo na 400x400px + avatar: PNG, GIF ali JPG. Največ %{size}. Zmanjšana bo na %{dimensions}px bot: Opozarja ljudi, da račun ne predstavlja osebe digest: Pošlje se le po dolgem obdobju nedejavnosti in samo, če ste prejeli osebna sporočila v vaši odsotnosti display_name: one: 1 znak ostane other: %{count} znakov ostane fields: Na svojem profilu lahko imate do 4 predmete prikazane kot tabelo. - header: PNG, GIF ali JPG. Največ 2MB. Zmanjšana bo na 700x335px + header: PNG, GIF ali JPG. Največ %{size}. Zmanjšana bo na %{dimensions}px imports: data: Izvožena CSV datoteka iz drugega Mastodon vozlišča diff --git a/config/locales/simple_form.sr-Latn.yml b/config/locales/simple_form.sr-Latn.yml index 608630c0c..259ac0046 100644 --- a/config/locales/simple_form.sr-Latn.yml +++ b/config/locales/simple_form.sr-Latn.yml @@ -3,14 +3,14 @@ sr-Latn: simple_form: hints: defaults: - avatar: PNG, GIF ili JPG. Najviše 2MB. Biće smanjena na 400x400px + avatar: PNG, GIF ili JPG. Najviše %{size}. Biće smanjena na %{dimensions}px digest: Poslato posle dužeg perioda neaktivnosti sa pregledom svih bitnih stvari koje ste dobili dok ste bili odsutni display_name: few: %{count} karaktera preostala many: %{count} karaktera preostalo one: 1 karakter preostao other: %{count} karaktera preostalo - header: PNG, GIF ili JPG. Najviše 2MB. Biće smanjena na 700x335px + header: PNG, GIF ili JPG. Najviše %{size}. Biće smanjena na %{dimensions}px locked: Zahteva da pojedinačno odobrite pratioce note: few: %{count} karaktera preostal diff --git a/config/locales/simple_form.sr.yml b/config/locales/simple_form.sr.yml index ab9ef0f49..d84052c66 100644 --- a/config/locales/simple_form.sr.yml +++ b/config/locales/simple_form.sr.yml @@ -3,14 +3,14 @@ sr: simple_form: hints: defaults: - avatar: PNG, GIF или JPG. Највише 2MB. Биће смањена на 400x400px + avatar: PNG, GIF или JPG. Највише %{size}. Биће смањена на %{dimensions}px digest: Послато после дужег периода неактивности са прегледом свих битних ствари које сте добили док сте били одсутни display_name: few: %{count} карактера преостала many: %{count} карактера преостало one: 1 карактер преостао other: %{count} карактера преостало - header: PNG, GIF или JPG. Највише 2MB. Биће смањена на 700x335px + header: PNG, GIF или JPG. Највише %{size}. Биће смањена на %{dimensions}px locked: Захтева да појединачно одобрите пратиоце note: few: %{count} карактера преостал diff --git a/config/locales/simple_form.sv.yml b/config/locales/simple_form.sv.yml index e761f3d99..7a10aa1e2 100644 --- a/config/locales/simple_form.sv.yml +++ b/config/locales/simple_form.sv.yml @@ -4,14 +4,14 @@ sv: hints: defaults: autofollow: Användarkonton som skapas genom din inbjudan kommer automatiskt följa dig - avatar: Högst 2 MB. Kommer att skalas ner till 400x400px + avatar: Högst %{size}. Kommer att skalas ner till %{dimensions}px bot: Detta konto utför huvudsakligen automatiserade åtgärder och kanske inte övervakas digest: Skickas endast efter en lång period av inaktivitet och endast om du har fått några personliga meddelanden i din frånvaro display_name: one: 1 tecken kvar other: %{count} tecken kvar fields: Du kan ha upp till 4 objekt visade som en tabell på din profil - header: NG, GIF eller JPG. Högst 2 MB. Kommer nedskalas till 700x335px + header: NG, GIF eller JPG. Högst %{size}. Kommer nedskalas till %{dimensions}px locale: Användargränssnittets språk, e-post och push aviseringar locked: Kräver att du manuellt godkänner följare note: diff --git a/config/locales/simple_form.th.yml b/config/locales/simple_form.th.yml index 575b6a9f4..29491de0b 100644 --- a/config/locales/simple_form.th.yml +++ b/config/locales/simple_form.th.yml @@ -3,11 +3,11 @@ th: simple_form: hints: defaults: - avatar: PNG, GIF or JPG. At most 2MB. Will be downscaled to 400x400px + avatar: PNG, GIF or JPG. At most %{size}. Will be downscaled to %{dimensions}px display_name: one: 1 character left other: %{count} characters left - header: PNG, GIF or JPG. At most 2MB. Will be downscaled to 700x335px + header: PNG, GIF or JPG. At most %{size}. Will be downscaled to %{dimensions}px locked: Requires you to manually approve followers and defaults post privacy to followers-only note: one: 1 character left diff --git a/config/locales/simple_form.tr.yml b/config/locales/simple_form.tr.yml index c827aac46..bd5c65d83 100644 --- a/config/locales/simple_form.tr.yml +++ b/config/locales/simple_form.tr.yml @@ -3,9 +3,9 @@ tr: simple_form: hints: defaults: - avatar: En fazla 2MB olacak şekilde PNG, GIF veya JPG formatında yükleyiniz. 400x400px büyüklüğüne indirgenecektir + avatar: En fazla %{size} olacak şekilde PNG, GIF veya JPG formatında yükleyiniz. %{dimensions}px büyüklüğüne indirgenecektir display_name: %{count} karakter kaldı - header: En fazla 2MB olacak şekilde PNG, GIF veya JPG formatında yükleyiniz. 700x335px büyüklüğüne indirgenecektir. + header: En fazla %{size} olacak şekilde PNG, GIF veya JPG formatında yükleyiniz. %{dimensions}px büyüklüğüne indirgenecektir. locked: Takipçilerinizi manuel olarak kabul etmenizi ve gönderilerinizi varsayılan olarak sadece takipçilerinizin göreceği şekilde paylaşmanızı sağlar. note: %{count} karakter kaldı imports: diff --git a/config/locales/simple_form.uk.yml b/config/locales/simple_form.uk.yml index 7bc3ee4b8..b4d2d6a80 100644 --- a/config/locales/simple_form.uk.yml +++ b/config/locales/simple_form.uk.yml @@ -3,9 +3,9 @@ uk: simple_form: hints: defaults: - avatar: PNG, GIF, або JPG. Максимум - 2МБ. Буде зменшено до 400x400px + avatar: PNG, GIF, або JPG. Максимум - 2МБ. Буде зменшено до %{dimensions}px display_name: 'Залишилося символів: %{count}' - header: PNG, GIF, або JPG. Максимум - 2МБ. Буде зменшено до 700x335px + header: PNG, GIF, або JPG. Максимум - 2МБ. Буде зменшено до %{dimensions}px locked: Буде вимагати від Вас самостійного підтверждення підписників, змінить приватність постів за замовчуванням на "тільки для підписників" note: 'Осталось символов: %{count}' imports: diff --git a/config/locales/simple_form.zh-CN.yml b/config/locales/simple_form.zh-CN.yml index ce990d692..b84f7107d 100644 --- a/config/locales/simple_form.zh-CN.yml +++ b/config/locales/simple_form.zh-CN.yml @@ -4,12 +4,12 @@ zh-CN: hints: defaults: autofollow: 通过邀请链接注册的用户将会自动关注你 - avatar: 文件大小限制 2MB，只支持 PNG、GIF 或 JPG 格式。图片分辨率将会压缩至 400×400px + avatar: 文件大小限制 %{size}，只支持 PNG、GIF 或 JPG 格式。图片分辨率将会压缩至 400×400px bot: 来自这个帐户的绝大多数操作都是自动进行的，并且可能无人监控 digest: 仅在你长时间未登录，且收到了私信时发送 display_name: 还能输入 %{count} 个字符 fields: 这将会在个人资料页上以表格的形式展示，最多 4 个项目 - header: 文件大小限制 2MB，只支持 PNG、GIF 或 JPG 格式。图片分辨率将会压缩至 700×335px + header: 文件大小限制 %{size}，只支持 PNG、GIF 或 JPG 格式。图片分辨率将会压缩至 700×335px locale: 用户界面、电子邮件和推送通知中使用的语言 locked: 你需要手动审核所有关注请求 note: 还能输入 %{count} 个字符 diff --git a/config/locales/simple_form.zh-HK.yml b/config/locales/simple_form.zh-HK.yml index 0575c09f8..abe6b7e06 100644 --- a/config/locales/simple_form.zh-HK.yml +++ b/config/locales/simple_form.zh-HK.yml @@ -4,14 +4,14 @@ zh-HK: hints: defaults: autofollow: 通過邀請網址註冊的用戶將會自動關注你 - avatar: 支援 PNG, GIF 或 JPG 圖片，檔案最大為 2MB，會縮裁成 400x400px + avatar: 支援 PNG, GIF 或 JPG 圖片，檔案最大為 %{size}，會縮裁成 %{dimensions}px bot: 提醒用戶本帳號是機械人 digest: 僅在你長時間未登錄，且收到了私信時發送 display_name: one: 尚餘 1 個字 other: 尚餘 %{count} 個字 fields: 個人資料頁可顯示多至 4 個項目 - header: 支援 PNG, GIF 或 JPG 圖片，檔案最大為 2MB，會縮裁成 700x335px + header: 支援 PNG, GIF 或 JPG 圖片，檔案最大為 %{size}，會縮裁成 %{dimensions}px locale: 使用者介面、電郵和通知的語言 locked: 你必須人手核准每個用戶對你的關注請求，而你的文章私隱會被預設為「只有關注你的人能看」 note: diff --git a/config/locales/simple_form.zh-TW.yml b/config/locales/simple_form.zh-TW.yml index 6b1dbae91..3763fc747 100644 --- a/config/locales/simple_form.zh-TW.yml +++ b/config/locales/simple_form.zh-TW.yml @@ -4,14 +4,14 @@ zh-TW: hints: defaults: autofollow: 通過邀請網址註冊的使用者將會自動關注你 - avatar: 支援 PNG, GIF 或 JPG 圖片，檔案最大為 2MB，會縮裁成 400x400px + avatar: 支援 PNG, GIF 或 JPG 圖片，檔案最大為 %{size}，會縮裁成 %{dimensions}px bot: 這個帳號由程式進行自動式操作 digest: 僅在你長時間未登入，並且收到了私訊時發送 display_name: one: 尚餘 1 個字 other: 尚餘 %{count} 個字 fields: 個人資訊頁至多可顯示 4 個項目 - header: 支援 PNG, GIF 或 JPG 圖片，檔案最大為 2MB，會縮裁成 700x335px + header: 支援 PNG, GIF 或 JPG 圖片，檔案最大為 %{size}，會縮裁成 %{dimensions}px locale: 使用者介面、 E-mail 與通知的語言 locked: 你必須手動核准每個使用者對你的關注請求，而你的貼文隱私將會被設定為「只有關注你的人能看」 note: -- cgit