diff --git a/.rubocop.yml b/.rubocop.yml
index fcdc4e06cb..64021b4cec 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -109,6 +109,16 @@ Rails/LexicallyScopedActionFilter:
Exclude:
- 'app/controllers/auth/*'
+# Reason: These tasks are doing local work which do not need full env loaded
+# https://docs.rubocop.org/rubocop-rails/cops_rails.html#railsrakeenvironment
+Rails/RakeEnvironment:
+ Exclude:
+ - 'lib/tasks/auto_annotate_models.rake'
+ - 'lib/tasks/emojis.rake'
+ - 'lib/tasks/mastodon.rake'
+ - 'lib/tasks/repo.rake'
+ - 'lib/tasks/statistics.rake'
+
# Reason: There are appropriate times to use these features
# https://docs.rubocop.org/rubocop-rails/cops_rails.html#railsskipsmodelvalidations
Rails/SkipsModelValidations:
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 510f4a4a7c..f170032189 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -13,13 +13,6 @@ Bundler/OrderedGems:
Exclude:
- 'Gemfile'
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: Max, AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, AllowedPatterns.
-# URISchemes: http, https
-Layout/LineLength:
- Exclude:
- - 'app/models/account.rb'
-
Lint/NonLocalExitFromIterator:
Exclude:
- 'app/helpers/jsonld_helper.rb'
@@ -68,18 +61,6 @@ Rails/OutputSafety:
Exclude:
- 'config/initializers/simple_form.rb'
-# This cop supports unsafe autocorrection (--autocorrect-all).
-# Configuration parameters: Include.
-# Include: **/Rakefile, **/*.rake
-Rails/RakeEnvironment:
- Exclude:
- - 'lib/tasks/auto_annotate_models.rake'
- - 'lib/tasks/db.rake'
- - 'lib/tasks/emojis.rake'
- - 'lib/tasks/mastodon.rake'
- - 'lib/tasks/repo.rake'
- - 'lib/tasks/statistics.rake'
-
# Configuration parameters: Include.
# Include: app/models/**/*.rb
Rails/UniqueValidationWithoutIndex:
diff --git a/Gemfile.lock b/Gemfile.lock
index d8e67b6bec..6cf0504b51 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -21,35 +21,35 @@ GIT
GEM
remote: https://rubygems.org/
specs:
- actioncable (7.1.2)
- actionpack (= 7.1.2)
- activesupport (= 7.1.2)
+ actioncable (7.1.3)
+ actionpack (= 7.1.3)
+ activesupport (= 7.1.3)
nio4r (~> 2.0)
websocket-driver (>= 0.6.1)
zeitwerk (~> 2.6)
- actionmailbox (7.1.2)
- actionpack (= 7.1.2)
- activejob (= 7.1.2)
- activerecord (= 7.1.2)
- activestorage (= 7.1.2)
- activesupport (= 7.1.2)
+ actionmailbox (7.1.3)
+ actionpack (= 7.1.3)
+ activejob (= 7.1.3)
+ activerecord (= 7.1.3)
+ activestorage (= 7.1.3)
+ activesupport (= 7.1.3)
mail (>= 2.7.1)
net-imap
net-pop
net-smtp
- actionmailer (7.1.2)
- actionpack (= 7.1.2)
- actionview (= 7.1.2)
- activejob (= 7.1.2)
- activesupport (= 7.1.2)
+ actionmailer (7.1.3)
+ actionpack (= 7.1.3)
+ actionview (= 7.1.3)
+ activejob (= 7.1.3)
+ activesupport (= 7.1.3)
mail (~> 2.5, >= 2.5.4)
net-imap
net-pop
net-smtp
rails-dom-testing (~> 2.2)
- actionpack (7.1.2)
- actionview (= 7.1.2)
- activesupport (= 7.1.2)
+ actionpack (7.1.3)
+ actionview (= 7.1.3)
+ activesupport (= 7.1.3)
nokogiri (>= 1.8.5)
racc
rack (>= 2.2.4)
@@ -57,15 +57,15 @@ GEM
rack-test (>= 0.6.3)
rails-dom-testing (~> 2.2)
rails-html-sanitizer (~> 1.6)
- actiontext (7.1.2)
- actionpack (= 7.1.2)
- activerecord (= 7.1.2)
- activestorage (= 7.1.2)
- activesupport (= 7.1.2)
+ actiontext (7.1.3)
+ actionpack (= 7.1.3)
+ activerecord (= 7.1.3)
+ activestorage (= 7.1.3)
+ activesupport (= 7.1.3)
globalid (>= 0.6.0)
nokogiri (>= 1.8.5)
- actionview (7.1.2)
- activesupport (= 7.1.2)
+ actionview (7.1.3)
+ activesupport (= 7.1.3)
builder (~> 3.1)
erubi (~> 1.11)
rails-dom-testing (~> 2.2)
@@ -75,22 +75,22 @@ GEM
activemodel (>= 4.1)
case_transform (>= 0.2)
jsonapi-renderer (>= 0.1.1.beta1, < 0.3)
- activejob (7.1.2)
- activesupport (= 7.1.2)
+ activejob (7.1.3)
+ activesupport (= 7.1.3)
globalid (>= 0.3.6)
- activemodel (7.1.2)
- activesupport (= 7.1.2)
- activerecord (7.1.2)
- activemodel (= 7.1.2)
- activesupport (= 7.1.2)
+ activemodel (7.1.3)
+ activesupport (= 7.1.3)
+ activerecord (7.1.3)
+ activemodel (= 7.1.3)
+ activesupport (= 7.1.3)
timeout (>= 0.4.0)
- activestorage (7.1.2)
- actionpack (= 7.1.2)
- activejob (= 7.1.2)
- activerecord (= 7.1.2)
- activesupport (= 7.1.2)
+ activestorage (7.1.3)
+ actionpack (= 7.1.3)
+ activejob (= 7.1.3)
+ activerecord (= 7.1.3)
+ activesupport (= 7.1.3)
marcel (~> 1.0)
- activesupport (7.1.2)
+ activesupport (7.1.3)
base64
bigdecimal
concurrent-ruby (~> 1.0, >= 1.0.2)
@@ -188,7 +188,7 @@ GEM
climate_control (0.2.0)
cocoon (1.2.15)
color_diff (0.1)
- concurrent-ruby (1.2.2)
+ concurrent-ruby (1.2.3)
connection_pool (2.4.1)
cose (1.3.0)
cbor (~> 0.5.9)
@@ -454,7 +454,7 @@ GEM
uri
net-http-persistent (4.0.2)
connection_pool (~> 2.2)
- net-imap (0.4.4)
+ net-imap (0.4.9.1)
date
net-protocol
net-ldap (0.19.0)
@@ -462,7 +462,7 @@ GEM
net-protocol
net-protocol (0.2.2)
timeout
- net-smtp (0.4.0)
+ net-smtp (0.4.0.1)
net-protocol
nio4r (2.5.9)
nokogiri (1.16.0)
@@ -552,27 +552,27 @@ GEM
rack
rack-proxy (0.7.6)
rack
- rack-session (1.0.1)
+ rack-session (1.0.2)
rack (< 3)
rack-test (2.1.0)
rack (>= 1.3)
rackup (1.0.0)
rack (< 3)
webrick
- rails (7.1.2)
- actioncable (= 7.1.2)
- actionmailbox (= 7.1.2)
- actionmailer (= 7.1.2)
- actionpack (= 7.1.2)
- actiontext (= 7.1.2)
- actionview (= 7.1.2)
- activejob (= 7.1.2)
- activemodel (= 7.1.2)
- activerecord (= 7.1.2)
- activestorage (= 7.1.2)
- activesupport (= 7.1.2)
+ rails (7.1.3)
+ actioncable (= 7.1.3)
+ actionmailbox (= 7.1.3)
+ actionmailer (= 7.1.3)
+ actionpack (= 7.1.3)
+ actiontext (= 7.1.3)
+ actionview (= 7.1.3)
+ activejob (= 7.1.3)
+ activemodel (= 7.1.3)
+ activerecord (= 7.1.3)
+ activestorage (= 7.1.3)
+ activesupport (= 7.1.3)
bundler (>= 1.15.0)
- railties (= 7.1.2)
+ railties (= 7.1.3)
rails-controller-testing (1.0.5)
actionpack (>= 5.0.1.rc1)
actionview (>= 5.0.1.rc1)
@@ -587,9 +587,9 @@ GEM
rails-i18n (7.0.8)
i18n (>= 0.7, < 2)
railties (>= 6.0.0, < 8)
- railties (7.1.2)
- actionpack (= 7.1.2)
- activesupport (= 7.1.2)
+ railties (7.1.3)
+ actionpack (= 7.1.3)
+ activesupport (= 7.1.3)
irb
rackup (>= 1.0.0)
rake (>= 12.2)
@@ -955,4 +955,4 @@ RUBY VERSION
ruby 3.2.2p53
BUNDLED WITH
- 2.4.20
+ 2.5.4
diff --git a/app/helpers/accounts_helper.rb b/app/helpers/accounts_helper.rb
index b8277ee17e..110a53e4e1 100644
--- a/app/helpers/accounts_helper.rb
+++ b/app/helpers/accounts_helper.rb
@@ -31,22 +31,26 @@ module AccountsHelper
Setting.hide_followers_count || account.user&.settings&.[]('hide_followers_count')
end
+ def account_formatted_stat(value)
+ number_to_human(value, precision: 3, strip_insignificant_zeros: true)
+ end
+
def account_description(account)
prepend_stats = [
[
- number_to_human(account.statuses_count, precision: 3, strip_insignificant_zeros: true),
+ account_formatted_stat(account.statuses_count),
I18n.t('accounts.posts', count: account.statuses_count),
].join(' '),
[
- number_to_human(account.following_count, precision: 3, strip_insignificant_zeros: true),
+ account_formatted_stat(account.following_count),
I18n.t('accounts.following', count: account.following_count),
].join(' '),
]
unless hide_followers_count?(account)
prepend_stats << [
- number_to_human(account.followers_count, precision: 3, strip_insignificant_zeros: true),
+ account_formatted_stat(account.followers_count),
I18n.t('accounts.followers', count: account.followers_count),
].join(' ')
end
diff --git a/app/helpers/mascot_helper.rb b/app/helpers/mascot_helper.rb
index 8ee04383ec..34b656411e 100644
--- a/app/helpers/mascot_helper.rb
+++ b/app/helpers/mascot_helper.rb
@@ -2,7 +2,7 @@
module MascotHelper
def mascot_url
- full_asset_url(instance_presenter.mascot&.file&.url || asset_pack_path('media/images/elephant_ui_plane.svg'))
+ full_asset_url(instance_presenter.mascot&.file&.url || frontend_asset_path('images/elephant_ui_plane.svg'))
end
def instance_presenter
diff --git a/app/helpers/routing_helper.rb b/app/helpers/routing_helper.rb
index 2fb9ce72cb..15d988f64d 100644
--- a/app/helpers/routing_helper.rb
+++ b/app/helpers/routing_helper.rb
@@ -24,8 +24,12 @@ module RoutingHelper
Rails.configuration.action_controller.asset_host || root_url
end
- def full_pack_url(source, **options)
- full_asset_url(asset_pack_path(source, **options))
+ def frontend_asset_path(source, **options)
+ asset_pack_path("media/#{source}", **options)
+ end
+
+ def frontend_asset_url(source, **options)
+ full_asset_url(frontend_asset_path(source, **options))
end
def use_storage?
diff --git a/app/javascript/mastodon/components/media_gallery.jsx b/app/javascript/mastodon/components/media_gallery.jsx
index e5200371ae..91459a1285 100644
--- a/app/javascript/mastodon/components/media_gallery.jsx
+++ b/app/javascript/mastodon/components/media_gallery.jsx
@@ -103,7 +103,7 @@ class Item extends PureComponent {
}
if (attachment.get('description')?.length > 0) {
- badges.push(ALT);
+ badges.push(ALT);
}
const description = attachment.getIn(['translation', 'description']) || attachment.get('description');
diff --git a/app/javascript/mastodon/locales/fo.json b/app/javascript/mastodon/locales/fo.json
index 9259f20154..94d13e8d91 100644
--- a/app/javascript/mastodon/locales/fo.json
+++ b/app/javascript/mastodon/locales/fo.json
@@ -393,6 +393,7 @@
"lists.search": "Leita millum fólk, sum tú fylgir",
"lists.subheading": "Tínir listar",
"load_pending": "{count, plural, one {# nýtt evni} other {# nýggj evni}}",
+ "loading_indicator.label": "Innlesur…",
"media_gallery.toggle_visible": "{number, plural, one {Fjal mynd} other {Fjal myndir}}",
"moved_to_account_banner.text": "Konta tín {disabledAccount} er í løtuni óvirkin, tí tú flutti til {movedToAccount}.",
"mute_modal.duration": "Tíðarbil",
@@ -483,6 +484,15 @@
"onboarding.follows.title": "Vælumtókt á Mastodon",
"onboarding.profile.discoverable": "Ger tað møguligt hjá øðrum at finna vangan hjá mær",
"onboarding.profile.discoverable_hint": "Tá tú játtar at onnur skulu kunna finna teg á Mastodon, so kann henda, at postar tínir síggjast í leitiúrslitum og rákum, og vangin hjá tær kann vera skotin upp fyri fólki við áhugamálum sum minna um tíni.",
+ "onboarding.profile.display_name": "Navn, sum skal vísast",
+ "onboarding.profile.display_name_hint": "Títt fulla navn ella títt stuttliga navn…",
+ "onboarding.profile.lead": "Tú kanst altíð gera hetta liðugt seinni í stillingunum, har enn fleiri tillagingarmøguleikar eru tøkir.",
+ "onboarding.profile.note": "Ævilýsing",
+ "onboarding.profile.note_hint": "Tú kanst @umrøða onnur fólk ella #frámerki…",
+ "onboarding.profile.save_and_continue": "Goym og halt fram",
+ "onboarding.profile.title": "Vangauppsetan",
+ "onboarding.profile.upload_avatar": "Legg vangamynd upp",
+ "onboarding.profile.upload_header": "Legg vangahøvd upp",
"onboarding.share.lead": "Lat fólk vita, hvussu tey kunnu finna teg á Mastodon!",
"onboarding.share.message": "Eg eri {username} á #Mastodon! Kom og fylg mær á {url}",
"onboarding.share.next_steps": "Møgulig næstu stig:",
diff --git a/app/javascript/mastodon/locales/gl.json b/app/javascript/mastodon/locales/gl.json
index 48bbb6b307..e857b69554 100644
--- a/app/javascript/mastodon/locales/gl.json
+++ b/app/javascript/mastodon/locales/gl.json
@@ -20,7 +20,7 @@
"account.block_short": "Bloquear",
"account.blocked": "Bloqueada",
"account.browse_more_on_origin_server": "Busca máis no perfil orixinal",
- "account.cancel_follow_request": "Cancelar a solicitude de seguimento",
+ "account.cancel_follow_request": "Desbotar a solicitude de seguimento",
"account.copy": "Copiar ligazón ao perfil",
"account.direct": "Mencionar de xeito privado a @{name}",
"account.disable_notifications": "Deixar de notificarme cando @{name} publica",
@@ -184,7 +184,7 @@
"confirmations.mute.explanation": "Isto agochará as súas publicacións ou as que a mencionen, mais poderá ler as túas publicacións e ser seguidora túa.",
"confirmations.mute.message": "Tes a certeza de querer acalar a {name}?",
"confirmations.redraft.confirm": "Eliminar e reescribir",
- "confirmations.redraft.message": "Tes a certeza de querer eliminar esta publicación e reescribila? Perderás as comparticións e favoritas, e as respostas á publicación orixinal ficarán orfas.",
+ "confirmations.redraft.message": "Tes a certeza de querer eliminar esta publicación e reescribila? Perderás as promocións e favorecementos, e as respostas á publicación orixinal ficarán orfas.",
"confirmations.reply.confirm": "Responder",
"confirmations.reply.message": "Ao responder sobrescribirás a mensaxe que estás a compor. Tes a certeza de que queres continuar?",
"confirmations.unfollow.confirm": "Deixar de seguir",
@@ -204,7 +204,7 @@
"disabled_account_banner.text": "Actualmente a túa conta {disabledAccount} está desactivada.",
"dismissable_banner.community_timeline": "Estas son as publicacións máis recentes das persoas que teñen a súa conta en {domain}.",
"dismissable_banner.dismiss": "Desbotar",
- "dismissable_banner.explore_links": "As persoas deste servidor e da rede descentralizada están a falar destas historias agora mesmo.",
+ "dismissable_banner.explore_links": "Estas son as novas historias más compartidas hoxe na web social. Aparecen primeiro as novas compartidas por máis persoas diferentes.",
"dismissable_banner.explore_statuses": "Estas son as publicacións da web social que hoxe están gañando popularidade. As publicacións con máis promocións e favorecemento teñen puntuación máis alta.",
"dismissable_banner.explore_tags": "Estes cancelos están gañando popularidade entre as persoas deste servidor e noutros servidores da rede descentralizada.",
"dismissable_banner.public_timeline": "Estas son as publicacións públicas máis recentes das persoas que as usuarias de {domain} están a seguir.",
@@ -240,7 +240,7 @@
"empty_column.follow_requests": "Non tes peticións de seguimento. Cando recibas unha, amosarase aquí.",
"empty_column.followed_tags": "Aínda non seguiches ningún cancelo. Cando o fagas aparecerán aquí.",
"empty_column.hashtag": "Aínda non hai nada con este cancelo.",
- "empty_column.home": "A túa cronoloxía inicial está baleira! Segue a outras usuarias para enchela. {suggestions}",
+ "empty_column.home": "A túa cronoloxía inicial está baleira! Sigue a outras usuarias para enchela.",
"empty_column.list": "Aínda non hai nada nesta listaxe. Cando as usuarias incluídas na listaxe publiquen mensaxes, amosaranse aquí.",
"empty_column.lists": "Aínda non tes listaxes. Cando crees unha, amosarase aquí.",
"empty_column.mutes": "Aínda non silenciaches a ningúnha usuaria.",
@@ -346,7 +346,7 @@
"keyboard_shortcuts.down": "Para mover cara abaixo na listaxe",
"keyboard_shortcuts.enter": "Para abrir publicación",
"keyboard_shortcuts.favourite": "Marcar como favorita",
- "keyboard_shortcuts.favourites": "Para abrir a listaxe das favoritas",
+ "keyboard_shortcuts.favourites": "Para abrir a lista das favoritas",
"keyboard_shortcuts.federated": "Para abrir a cronoloxía federada",
"keyboard_shortcuts.heading": "Atallos do teclado",
"keyboard_shortcuts.home": "Para abrir a cronoloxía inicial",
@@ -383,7 +383,7 @@
"lists.delete": "Eliminar listaxe",
"lists.edit": "Editar listaxe",
"lists.edit.submit": "Mudar o título",
- "lists.exclusive": "Agocha estas publicacións no inicio",
+ "lists.exclusive": "Agocha estas publicacións no Inicio",
"lists.new.create": "Engadir listaxe",
"lists.new.title_placeholder": "Título da nova listaxe",
"lists.replies_policy.followed": "Toda usuaria seguida",
@@ -480,8 +480,8 @@
"onboarding.actions.go_to_home": "Vai á cronoloxía de inicio",
"onboarding.compose.template": "Ola #Mastodon!",
"onboarding.follows.empty": "Desgraciadamente agora mesmo non hai nada que mostrar. Podes intentalo coa busca ou na páxina descubrir para atopar persoas ás que seguir, ou intentalo máis tarde.",
- "onboarding.follows.lead": "Podes facer que a túa cronoloxía de inicio sexa como ti a queres. Canta máis xente sigas máis interesante será. Estes perfís poderían axudarche a comezar —sempre poderás deixar de seguilos despois!",
- "onboarding.follows.title": "Popular en Mastodon",
+ "onboarding.follows.lead": "A cronoloxía de Inicio é o principal xeito de desfrutar Mastodon. Cantas máis persoas sigas mais interesante e activa será. Para comezar, aquí tes algunhas suxestións:",
+ "onboarding.follows.title": "Personaliza a cronoloxía de inicio",
"onboarding.profile.discoverable": "Que o meu perfil se poida atopar",
"onboarding.profile.discoverable_hint": "Cando elixes que poidan atoparte en Mastodon as túas publicacións aparecerán nos resultados das buscas e nos temas en voga, e o teu perfil podería ser suxerido para seguimento a persoas con intereses semellantes aos teus.",
"onboarding.profile.display_name": "Nome público",
@@ -494,20 +494,20 @@
"onboarding.profile.upload_avatar": "Subir imaxe do perfil",
"onboarding.profile.upload_header": "Subir cabeceira para o perfil",
"onboarding.share.lead": "Fai que as persoas saiban como atoparte en Mastodon!",
- "onboarding.share.message": "Son {username} en #Mastodon! Ségueme en {url}",
+ "onboarding.share.message": "Son {username} en #Mastodon! Sígueme en {url}",
"onboarding.share.next_steps": "Seguintes pasos:",
"onboarding.share.title": "Comparte o teu perfil",
- "onboarding.start.lead": "A túa nova conta en Mastodon está preparada. Mira de que xeito lle podes sacar proveito:",
+ "onboarding.start.lead": "Xa formas parte de Mastodon, unha plataforma de relacións sociais descentralizada, única, onde ti —e non un algoritmo— elixes o que les. Axudámosche cos primeiros pasos:",
"onboarding.start.skip": "Queres omitir todo isto?",
"onboarding.start.title": "Pois xa está!",
- "onboarding.steps.follow_people.body": "Constrúes a túa cronoloxía. Énchea con persoas interesantes.",
- "onboarding.steps.follow_people.title": "Segue a {count, plural, one {unha persoa} other {# persoas}}",
- "onboarding.steps.publish_status.body": "Saúda a todo o mundo.",
+ "onboarding.steps.follow_people.body": "Mastodon consiste en seguir a persoas interesantes.",
+ "onboarding.steps.follow_people.title": "Personaliza a túa cronoloxía",
+ "onboarding.steps.publish_status.body": "Exprésate con texto, fotos, vídeos ou enquisas {emoji}",
"onboarding.steps.publish_status.title": "Escribe a túa primeira publicación",
"onboarding.steps.setup_profile.body": "Ao engadir información ao teu perfil é máis probable que teñas máis interaccións.",
"onboarding.steps.setup_profile.title": "Personaliza o perfil",
"onboarding.steps.share_profile.body": "Dille ás amizades como poden atoparte en Mastodon!",
- "onboarding.steps.share_profile.title": "Comparte o teu perfil",
+ "onboarding.steps.share_profile.title": "Comparte o teu perfil en Mastodon",
"onboarding.tips.2fa": "Sabes que? Podes protexer a túa conta configurando un segundo factor de autenticación nos axustes. Funciona con calquera app TOTP, non precisas un número de teléfono!",
"onboarding.tips.accounts_from_other_servers": "Sabes que? Como Mastodon é descentralizado, algúns perfís que atopes estarán en servidores diferentes ao teu. Pero podes interactuar igualmente con eles! O seu servidor é o que ven despois da @ no seu identificador!",
"onboarding.tips.migration": "Sabes que? Se cres que {domain} non é o servidor axeitado para ti, podes mover a conta a outro servidor Mastodon sen perder as túas seguidoras. Incluso podes hospedar o teu propio servidor!",
@@ -573,7 +573,7 @@
"report.reasons.dislike": "Non me gusta",
"report.reasons.dislike_description": "Non é algo que queiras ver",
"report.reasons.legal": "É ilegal",
- "report.reasons.legal_description": "Cres que atenta contra as leis do país do teu servidor",
+ "report.reasons.legal_description": "Cres que atenta contra as leis do país do teu pais ou servidor",
"report.reasons.other": "É outra cousa",
"report.reasons.other_description": "O problema non cae dentro de outras categorías",
"report.reasons.spam": "É spam",
diff --git a/app/javascript/mastodon/locales/ia.json b/app/javascript/mastodon/locales/ia.json
index e790306e9c..a660eb77ff 100644
--- a/app/javascript/mastodon/locales/ia.json
+++ b/app/javascript/mastodon/locales/ia.json
@@ -9,14 +9,20 @@
"account.block": "Blocar @{name}",
"account.block_short": "Blocar",
"account.blocked": "Blocate",
+ "account.browse_more_on_origin_server": "Navigar plus sur le profilo original",
"account.copy": "Copiar ligamine a profilo",
+ "account.domain_blocked": "Dominio blocate",
"account.edit_profile": "Modificar profilo",
+ "account.enable_notifications": "Notifica me quando @{name} publica",
"account.endorse": "Evidentiar sur le profilo",
"account.featured_tags.last_status_at": "Ultime message in {date}",
"account.featured_tags.last_status_never": "Necun messages",
+ "account.featured_tags.title": "Hashtags eminente de {name}",
"account.follow": "Sequer",
"account.follow_back": "Sequer etiam",
"account.followers": "Sequitores",
+ "account.followers.empty": "Iste usator ancora non ha sequitores.",
+ "account.followers_counter": "{count, plural, one {{counter} sequitor} other {{counter} sequitores}}",
"account.following": "Sequente",
"account.go_to_profile": "Vader al profilo",
"account.hide_reblogs": "Celar boosts de @{name}",
@@ -30,6 +36,7 @@
"account.mute_short": "Silentiar",
"account.muted": "Silentiate",
"account.no_bio": "Nulle description fornite.",
+ "account.open_original_page": "Aperir le pagina original",
"account.posts": "Messages",
"account.posts_with_replies": "Messages e responsas",
"account.share": "Compartir profilo de @{name}",
diff --git a/app/javascript/mastodon/locales/lt.json b/app/javascript/mastodon/locales/lt.json
index ec0d30363c..623ff2248f 100644
--- a/app/javascript/mastodon/locales/lt.json
+++ b/app/javascript/mastodon/locales/lt.json
@@ -9,7 +9,7 @@
"about.domain_blocks.suspended.explanation": "Jokie duomenys iš šio serverio nebus apdorojami, saugomi ar keičiami, todėl bet kokia sąveika ar bendravimas su šio serverio naudotojais bus neįmanomas.",
"about.domain_blocks.suspended.title": "Uždrausta",
"about.not_available": "Ši informacija nebuvo pateikta šiame serveryje.",
- "about.powered_by": "Decentralizuota socialinė žiniasklaida, kurią valdo {mastodon}",
+ "about.powered_by": "Decentralizuota socialinė medija, kurią valdo {mastodon}",
"about.rules": "Serverio taisyklės",
"account.account_note_header": "Pastaba",
"account.add_or_remove_from_list": "Pridėti arba ištrinti iš sąrašų",
@@ -27,24 +27,24 @@
"account.domain_blocked": "Užblokuotas domenas",
"account.edit_profile": "Redaguoti profilį",
"account.enable_notifications": "Pranešti man, kai @{name} paskelbia",
- "account.endorse": "Savybė profilyje",
+ "account.endorse": "Rekomenduoti profilyje",
"account.featured_tags.last_status_at": "Paskutinį kartą paskelbta {date}",
"account.featured_tags.last_status_never": "Nėra įrašų",
- "account.featured_tags.title": "{name} rekomenduojamos grotažymės",
+ "account.featured_tags.title": "{name} rekomenduojami saitažodžiai",
"account.follow": "Sekti",
"account.follow_back": "Sekti atgal",
"account.followers": "Sekėjai",
"account.followers.empty": "Šio naudotojo dar niekas neseka.",
"account.followers_counter": "{count, plural, one {{counter} sekėjas} few {{counter} sekėjai} many {{counter} sekėjo} other {{counter} sekėjų}}",
- "account.following": "Seka",
- "account.following_counter": "{count, plural, one {{counter} Seka} few {{counter} Seka} many {{counter} Seka} other {{counter} Seka}}",
+ "account.following": "Sekama",
+ "account.following_counter": "{count, plural, one {{counter} sekimas} few {{counter} sekimai} many {{counter} sekimo} other {{counter} sekimų}}",
"account.follows.empty": "Šis (-i) naudotojas (-a) dar nieko neseka.",
"account.go_to_profile": "Eiti į profilį",
"account.hide_reblogs": "Slėpti pakėlimus iš @{name}",
"account.in_memoriam": "Atminimui.",
"account.joined_short": "Prisijungė",
"account.languages": "Keisti prenumeruojamas kalbas",
- "account.link_verified_on": "Šios nuorodos nuosavybė buvo patikrinta {date}",
+ "account.link_verified_on": "Šios nuorodos nuosavybė buvo patikrinta {date}.",
"account.locked_info": "Šios paskyros privatumo būsena nustatyta kaip užrakinta. Savininkas (-ė) rankiniu būdu peržiūri, kas gali sekti.",
"account.media": "Medija",
"account.mention": "Paminėti @{name}",
@@ -58,8 +58,8 @@
"account.open_original_page": "Atidaryti originalinį puslapį",
"account.posts": "Įrašai",
"account.posts_with_replies": "Įrašai ir atsakymai",
- "account.report": "Pranešti @{name}",
- "account.requested": "Laukiama patvirtinimo. Spausk, kad atšaukti sekimo užklausą",
+ "account.report": "Pranešti apie @{name}",
+ "account.requested": "Laukiama patvirtinimo. Spustelėk, jei nori atšaukti sekimo prašymą.",
"account.requested_follow": "{name} paprašė tave sekti",
"account.share": "Bendrinti @{name} profilį",
"account.show_reblogs": "Rodyti pakėlimus iš @{name}",
@@ -69,28 +69,28 @@
"account.unblock_short": "Atblokuoti",
"account.unendorse": "Nerodyti profilyje",
"account.unfollow": "Nebesekti",
- "account.unmute": "Atitildyti @{name}",
- "account.unmute_notifications_short": "Atitildyti pranešimus",
- "account.unmute_short": "Atitildyti",
- "account_note.placeholder": "Spausk norėdamas (-a) pridėti pastabą",
- "admin.dashboard.daily_retention": "Vartotojų išbuvimo rodiklis pagal dieną po registracijos",
- "admin.dashboard.monthly_retention": "Naudotojų išlaikymo rodiklis pagal mėnesį po registracijos",
+ "account.unmute": "Atšaukti nutildymą @{name}",
+ "account.unmute_notifications_short": "Atšaukti nutildymą pranešimams",
+ "account.unmute_short": "Atšaukti nutildymą",
+ "account_note.placeholder": "Spustelėk norėdamas (-a) pridėti pastabą",
+ "admin.dashboard.daily_retention": "Naudotojų pasilikimo rodiklis pagal dieną po registracijos",
+ "admin.dashboard.monthly_retention": "Naudotojų pasilikimo rodiklis pagal mėnesį po registracijos",
"admin.dashboard.retention.average": "Vidurkis",
- "admin.dashboard.retention.cohort": "Registravimo mėnuo",
+ "admin.dashboard.retention.cohort": "Registracijos mėnuo",
"admin.dashboard.retention.cohort_size": "Nauji naudotojai",
"admin.impact_report.instance_accounts": "Paskyrų profiliai, kuriuos tai ištrintų",
"admin.impact_report.instance_followers": "Sekėjai, kuriuos prarastų mūsų naudotojai",
"admin.impact_report.instance_follows": "Sekėjai, kuriuos prarastų jų naudotojai",
"admin.impact_report.title": "Poveikio apibendrinimas",
"alert.rate_limited.message": "Pabandyk vėliau po {retry_time, time, medium}.",
- "alert.rate_limited.title": "Spartos ribojimas",
+ "alert.rate_limited.title": "Sparta ribota",
"alert.unexpected.message": "Įvyko netikėta klaida.",
"alert.unexpected.title": "Ups!",
"announcement.announcement": "Skelbimas",
"attachments_list.unprocessed": "(neapdorotas)",
"audio.hide": "Slėpti garsą",
"autosuggest_hashtag.per_week": "{count} per savaitę",
- "boost_modal.combo": "Gali spausti {combo}, kad praleisti kitą kartą",
+ "boost_modal.combo": "Gali paspausti {combo}, kad praleisti kitą kartą",
"bundle_column_error.copy_stacktrace": "Kopijuoti klaidos ataskaitą",
"bundle_column_error.error.body": "Užklausos puslapio nepavyko atvaizduoti. Tai gali būti dėl mūsų kodo klaidos arba naršyklės suderinamumo problemos.",
"bundle_column_error.error.title": "O, ne!",
@@ -104,10 +104,10 @@
"bundle_modal_error.message": "Kraunant šį komponentą kažkas nepavyko.",
"bundle_modal_error.retry": "Bandyti dar kartą",
"closed_registrations.other_server_instructions": "Kadangi Mastodon yra decentralizuotas, gali susikurti paskyrą kitame serveryje ir vis tiek bendrauti su šiuo serveriu.",
- "closed_registrations_modal.description": "Sukurti paskyrą {domain} šiuo metu neįmanoma, tačiau nepamiršk, kad norint naudotis Mastodon nebūtina turėti paskyrą {domain}.",
+ "closed_registrations_modal.description": "Sukurti paskyrą {domain} šiuo metu neįmanoma, tačiau nepamiršk, kad norint naudotis Mastodon nebūtina turėti paskyrą domene {domain}.",
"closed_registrations_modal.find_another_server": "Rasti kitą serverį",
"closed_registrations_modal.preamble": "Mastodon yra decentralizuotas, todėl nesvarbu, kur susikursi paskyrą, galėsi sekti ir bendrauti su bet kuriuo šiame serveryje esančiu asmeniu. Jį gali net savarankiškai talpinti!",
- "closed_registrations_modal.title": "Užsiregistravimas į Mastodon",
+ "closed_registrations_modal.title": "Užsiregistruoti Mastodon",
"column.about": "Apie",
"column.blocks": "Užblokuoti naudotojai",
"column.bookmarks": "Žymės",
@@ -116,15 +116,15 @@
"column.directory": "Naršyti profilius",
"column.domain_blocks": "Užblokuoti domenai",
"column.favourites": "Mėgstamiausi",
- "column.firehose": "Tiesioginiai padavimai",
- "column.follow_requests": "Sekti prašymus",
+ "column.firehose": "Tiesioginiai srautai",
+ "column.follow_requests": "Sekimo prašymus",
"column.home": "Pagrindinis",
"column.lists": "Sąrašai",
"column.mutes": "Nutildyti naudotojai",
"column.notifications": "Pranešimai",
"column.pins": "Prisegti įrašai",
"column.public": "Federacinė laiko skalė",
- "column_back_button.label": "Atgal",
+ "column_back_button.label": "Grįžti",
"column_header.hide_settings": "Slėpti nustatymus",
"column_header.moveLeft_settings": "Judinti stulpelį į kairę",
"column_header.moveRight_settings": "Judinti stulpelį į dešinę",
diff --git a/app/javascript/styles/mailer.scss b/app/javascript/styles/mailer.scss
index 6d0168969e..bd220bb1a8 100644
--- a/app/javascript/styles/mailer.scss
+++ b/app/javascript/styles/mailer.scss
@@ -88,6 +88,85 @@ table + p {
padding: 24px;
}
+// Account
+.email-account-banner-table {
+ background-color: #f3f2f5;
+ border-top-left-radius: 12px;
+ border-top-right-radius: 12px;
+}
+
+.email-account-banner-td {
+ border-top-left-radius: 12px;
+ border-top-right-radius: 12px;
+ height: 140px;
+ vertical-align: bottom;
+ background-color: #f3f2f5;
+ background-position: center;
+ background-size: cover;
+}
+
+.email-account-banner-inner-td {
+ padding: 24px 24px 0;
+ mso-padding-alt: 24px;
+}
+
+.email-account-banner-overlap-div {
+ max-height: 42px;
+}
+
+.email-account-banner-icon-table {
+ width: auto;
+ margin: 0;
+ overflow: hidden;
+ border-radius: 8px;
+ border-collapse: separate;
+ background-color: #fff;
+ border: 2px solid #fff;
+
+ img {
+ display: block;
+ max-width: 100%;
+ border: none;
+ border-radius: 6px;
+ }
+}
+
+.email-account-body-td {
+ padding: 56px 24px 24px;
+ mso-padding-alt: 24px;
+}
+
+.email-account-name {
+ font-size: 16px;
+ font-weight: 600;
+ line-height: 24px;
+ color: #17063b;
+}
+
+.email-account-handle {
+ font-size: 14px;
+ line-height: 20px;
+ color: #746a89;
+}
+
+.email-account-stats-table {
+ td {
+ padding-right: 16px;
+ font-size: 14px;
+ line-height: 20px;
+ color: #746a89;
+ }
+
+ b {
+ font-weight: 600;
+ color: #17063b;
+ }
+
+ span {
+ white-space: nowrap;
+ }
+}
+
// Utility classes
.email-w-full {
width: 100%;
@@ -122,6 +201,14 @@ table + p {
padding-top: 24px;
}
+.email-padding-top-16 {
+ padding-top: 16px;
+}
+
+.email-padding-top-0 {
+ padding-top: 0;
+}
+
.email-border-top {
border-top: 1px solid #dfdee3;
}
diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss
index b28e98cc32..803fd50053 100644
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@ -1398,8 +1398,7 @@ body > [data-popper-placement] {
.icon {
width: 15px;
height: 15px;
- position: relative;
- top: 0.145em;
+ vertical-align: middle;
}
}
@@ -5544,6 +5543,10 @@ a.status-card {
padding-inline-end: 10px;
}
+ .icon {
+ vertical-align: middle;
+ }
+
.button {
flex: 0 0 auto;
}
@@ -6094,6 +6097,7 @@ a.status-card {
gap: 2px;
}
+.media-gallery__alt__label,
.media-gallery__gifv__label {
display: flex;
align-items: center;
@@ -6170,6 +6174,7 @@ a.status-card {
.icon {
color: $dark-text-color;
+ vertical-align: middle;
}
}
}
@@ -7415,6 +7420,13 @@ noscript {
span {
user-select: all;
}
+
+ .icon-lock {
+ height: 16px;
+ width: 16px;
+ position: relative;
+ top: 3px;
+ }
}
}
}
diff --git a/app/models/announcement.rb b/app/models/announcement.rb
index 86f7037a56..e630570020 100644
--- a/app/models/announcement.rb
+++ b/app/models/announcement.rb
@@ -75,22 +75,41 @@ class Announcement < ApplicationRecord
end
def reactions(account = nil)
- records = begin
- scope = announcement_reactions.group(:announcement_id, :name, :custom_emoji_id).order(Arel.sql('MIN(created_at) ASC'))
-
- if account.nil?
- scope.select('name, custom_emoji_id, count(*) as count, false as me')
- else
- scope.select("name, custom_emoji_id, count(*) as count, exists(select 1 from announcement_reactions r where r.account_id = #{account.id} and r.announcement_id = announcement_reactions.announcement_id and r.name = announcement_reactions.name) as me")
+ grouped_ordered_announcement_reactions.select(
+ [:name, :custom_emoji_id, 'COUNT(*) as count'].tap do |values|
+ values << value_for_reaction_me_column(account)
end
- end.to_a
-
- ActiveRecord::Associations::Preloader.new(records: records, associations: :custom_emoji).call
- records
+ ).to_a.tap do |records|
+ ActiveRecord::Associations::Preloader.new(records: records, associations: :custom_emoji).call
+ end
end
private
+ def grouped_ordered_announcement_reactions
+ announcement_reactions
+ .group(:announcement_id, :name, :custom_emoji_id)
+ .order(
+ Arel.sql('MIN(created_at)').asc
+ )
+ end
+
+ def value_for_reaction_me_column(account)
+ if account.nil?
+ 'FALSE AS me'
+ else
+ <<~SQL.squish
+ EXISTS(
+ SELECT 1
+ FROM announcement_reactions inner_reactions
+ WHERE inner_reactions.account_id = #{account.id}
+ AND inner_reactions.announcement_id = announcement_reactions.announcement_id
+ AND inner_reactions.name = announcement_reactions.name
+ ) AS me
+ SQL
+ end
+ end
+
def set_published
return unless scheduled_at.blank? || scheduled_at.past?
diff --git a/app/serializers/manifest_serializer.rb b/app/serializers/manifest_serializer.rb
index 501bb788e7..1c1f7d0ad5 100644
--- a/app/serializers/manifest_serializer.rb
+++ b/app/serializers/manifest_serializer.rb
@@ -39,7 +39,7 @@ class ManifestSerializer < ActiveModel::Serializer
def icons
ICON_SIZES.map do |size|
{
- src: full_pack_url("media/icons/android-chrome-#{size}x#{size}.png"),
+ src: frontend_asset_url("icons/android-chrome-#{size}x#{size}.png"),
sizes: "#{size}x#{size}",
type: 'image/png',
purpose: 'any maskable',
diff --git a/app/serializers/rest/instance_serializer.rb b/app/serializers/rest/instance_serializer.rb
index 0434687999..e7d4a646d4 100644
--- a/app/serializers/rest/instance_serializer.rb
+++ b/app/serializers/rest/instance_serializer.rb
@@ -28,7 +28,7 @@ class REST::InstanceSerializer < ActiveModel::Serializer
}
else
{
- url: full_pack_url('media/images/preview.png'),
+ url: frontend_asset_url('images/preview.png'),
}
end
end
diff --git a/app/serializers/rest/v1/instance_serializer.rb b/app/serializers/rest/v1/instance_serializer.rb
index 0c21014046..c6cbaba489 100644
--- a/app/serializers/rest/v1/instance_serializer.rb
+++ b/app/serializers/rest/v1/instance_serializer.rb
@@ -33,7 +33,7 @@ class REST::V1::InstanceSerializer < ActiveModel::Serializer
end
def thumbnail
- instance_presenter.thumbnail ? full_asset_url(instance_presenter.thumbnail.file.url(:'@1x')) : full_pack_url('media/images/preview.png')
+ instance_presenter.thumbnail ? full_asset_url(instance_presenter.thumbnail.file.url(:'@1x')) : frontend_asset_url('images/preview.png')
end
def max_toot_chars
diff --git a/app/views/application/mailer/_account.html.haml b/app/views/application/mailer/_account.html.haml
new file mode 100644
index 0000000000..b0ef4f1e02
--- /dev/null
+++ b/app/views/application/mailer/_account.html.haml
@@ -0,0 +1,30 @@
+%table.email-w-full.email-account-banner-table{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
+ %tr
+ %td.email-account-banner-td{ height: 140, background: full_asset_url(account.header.url) }
+ %table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
+ %tr
+ %td.email-account-banner-inner-td
+ .email-account-banner-overlap-div
+ %table.email-account-banner-icon-table{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
+ %tr
+ %td
+ %img{ src: full_asset_url(account.avatar.url), width: 80, height: 80, alt: '' }
+%table.email-w-full.email-account-body-table{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
+ %tr
+ %td.email-account-body-td
+ %p.email-account-name= display_name(account)
+ %p.email-account-handle= acct(account)
+ %table{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
+ %tr
+ %td.email-padding-top-16
+ %table.email-w-full.email-account-stats-table{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
+ %tr
+ %td
+ %b= account_formatted_stat(account.statuses_count)
+ %span= t('accounts.posts', count: account.statuses_count)
+ %td
+ %b= account_formatted_stat(account.following_count)
+ %span= t('accounts.following')
+ %td
+ %b= hide_followers_count?(account) ? '-' : account_formatted_stat(account.followers_count)
+ %span= t('accounts.followers', count: account.followers_count)
diff --git a/app/views/application/mailer/_checklist.html.haml b/app/views/application/mailer/_checklist.html.haml
index 9ee9655939..83072bd36b 100644
--- a/app/views/application/mailer/_checklist.html.haml
+++ b/app/views/application/mailer/_checklist.html.haml
@@ -11,9 +11,9 @@
%tr
%td.email-checklist-icons-checkbox-td
- if defined?(checked) && checked
- = image_tag full_pack_url('media/images/mailer-new/welcome/checkbox-on.png'), alt: '', width: 20, height: 20
+ = image_tag frontend_asset_url('images/mailer-new/welcome/checkbox-on.png'), alt: '', width: 20, height: 20
- else
- = image_tag full_pack_url('media/images/mailer-new/welcome/checkbox-off.png'), alt: '', width: 20, height: 20
+ = image_tag frontend_asset_url('images/mailer-new/welcome/checkbox-off.png'), alt: '', width: 20, height: 20
%td.email-checklist-icons-step-td
- if defined?(step_image_url)
= image_tag step_image_url, alt: '', width: 40, height: 40
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
index 674d395118..213b988ec2 100755
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@@ -14,12 +14,12 @@
%link{ rel: 'icon', href: '/favicon.ico', type: 'image/x-icon' }/
- %w(16 32 48).each do |size|
- %link{ rel: 'icon', sizes: "#{size}x#{size}", href: asset_pack_path("media/icons/favicon-#{size}x#{size}.png"), type: 'image/png' }/
+ %link{ rel: 'icon', sizes: "#{size}x#{size}", href: frontend_asset_path("icons/favicon-#{size}x#{size}.png"), type: 'image/png' }/
- %w(57 60 72 76 114 120 144 152 167 180 1024).each do |size|
- %link{ rel: 'apple-touch-icon', sizes: "#{size}x#{size}", href: asset_pack_path("media/icons/apple-touch-icon-#{size}x#{size}.png") }/
+ %link{ rel: 'apple-touch-icon', sizes: "#{size}x#{size}", href: frontend_asset_path("icons/apple-touch-icon-#{size}x#{size}.png") }/
- %link{ rel: 'mask-icon', href: asset_pack_path('media/images/logo-symbol-icon.svg'), color: '#6364FF' }/
+ %link{ rel: 'mask-icon', href: frontend_asset_path('images/logo-symbol-icon.svg'), color: '#6364FF' }/
%link{ rel: 'manifest', href: manifest_path(format: :json) }/
%meta{ name: 'theme-color', content: '#191b22' }/
%meta{ name: 'apple-mobile-web-app-capable', content: 'yes' }/
diff --git a/app/views/layouts/mailer.html.haml b/app/views/layouts/mailer.html.haml
index dc8f9328ac..c16f29bd77 100644
--- a/app/views/layouts/mailer.html.haml
+++ b/app/views/layouts/mailer.html.haml
@@ -50,7 +50,7 @@
/[if mso]
= link_to root_url, class: 'email-header-logo-a' do
- = image_tag full_pack_url('media/images/mailer-new/common/logo-header.png'), alt: 'Mastodon', width: 157, height: 40
+ = image_tag frontend_asset_url('images/mailer-new/common/logo-header.png'), alt: 'Mastodon', width: 157, height: 40
-# Heading
= yield :heading
@@ -75,7 +75,7 @@
%td.email-footer-td
%p.email-footer-p
= link_to root_url, class: 'email-footer-logo-a' do
- = image_tag full_pack_url('media/images/mailer-new/common/logo-footer.png'), alt: 'Mastodon', width: 44, height: 44
+ = image_tag frontend_asset_url('images/mailer-new/common/logo-footer.png'), alt: 'Mastodon', width: 44, height: 44
%p.email-footer-p
= t 'about.hosted_on', domain: site_hostname
%p.email-footer-p
diff --git a/app/views/notification_mailer/favourite.html.haml b/app/views/notification_mailer/favourite.html.haml
index 26bb31731a..62c0a39abe 100644
--- a/app/views/notification_mailer/favourite.html.haml
+++ b/app/views/notification_mailer/favourite.html.haml
@@ -1,5 +1,5 @@
= content_for :heading do
- = render 'application/mailer/heading', heading_title: t('notification_mailer.favourite.title'), heading_subtitle: t('notification_mailer.favourite.body', name: @account.pretty_acct), heading_image_url: full_pack_url('media/images/mailer-new/heading/favorite.png')
+ = render 'application/mailer/heading', heading_title: t('notification_mailer.favourite.title'), heading_subtitle: t('notification_mailer.favourite.body', name: @account.pretty_acct), heading_image_url: frontend_asset_url('images/mailer-new/heading/favorite.png')
%table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
%tr
%td.email-body-padding-td
diff --git a/app/views/notification_mailer/follow.html.haml b/app/views/notification_mailer/follow.html.haml
index 2f7ba0a9c5..8247aa5b44 100644
--- a/app/views/notification_mailer/follow.html.haml
+++ b/app/views/notification_mailer/follow.html.haml
@@ -1,9 +1,13 @@
= content_for :heading do
- = render 'application/mailer/heading', heading_title: t('notification_mailer.follow.title'), heading_subtitle: t('notification_mailer.follow.body', name: @account.pretty_acct), heading_image_url: full_pack_url('media/images/mailer-new/heading/user.png')
+ = render 'application/mailer/heading', heading_title: t('notification_mailer.follow.title'), heading_subtitle: t('notification_mailer.follow.body', name: @account.pretty_acct), heading_image_url: frontend_asset_url('images/mailer-new/heading/user.png')
%table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
%tr
%td.email-body-padding-td
%table.email-inner-card-table{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
%tr
- %td.email-inner-card-td
- = render 'application/mailer/button', text: t('application_mailer.view_profile'), url: web_url("@#{@account.pretty_acct}")
+ %td.email-inner-card-td-without-padding
+ = render 'application/mailer/account', account: @account
+ %table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
+ %tr
+ %td.email-padding-24.email-padding-top-0
+ = render 'application/mailer/button', text: t('application_mailer.view_profile'), url: web_url("@#{@account.pretty_acct}")
diff --git a/app/views/notification_mailer/follow_request.html.haml b/app/views/notification_mailer/follow_request.html.haml
index 275d0c5b0e..9344ef7eb3 100644
--- a/app/views/notification_mailer/follow_request.html.haml
+++ b/app/views/notification_mailer/follow_request.html.haml
@@ -1,9 +1,13 @@
= content_for :heading do
- = render 'application/mailer/heading', heading_title: t('notification_mailer.follow_request.title'), heading_subtitle: t('notification_mailer.follow_request.body', name: @account.pretty_acct), heading_image_url: full_pack_url('media/images/mailer-new/heading/follow.png')
+ = render 'application/mailer/heading', heading_title: t('notification_mailer.follow_request.title'), heading_subtitle: t('notification_mailer.follow_request.body', name: @account.pretty_acct), heading_image_url: frontend_asset_url('images/mailer-new/heading/follow.png')
%table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
%tr
%td.email-body-padding-td
%table.email-inner-card-table{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
%tr
- %td.email-inner-card-td
- = render 'application/mailer/button', text: t('notification_mailer.follow_request.action'), url: web_url('follow_requests')
+ %td.email-inner-card-td-without-padding
+ = render 'application/mailer/account', account: @account
+ %table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
+ %tr
+ %td.email-padding-24.email-padding-top-0
+ = render 'application/mailer/button', text: t('notification_mailer.follow_request.action'), url: web_url('follow_requests')
diff --git a/app/views/notification_mailer/mention.html.haml b/app/views/notification_mailer/mention.html.haml
index 2420a42bf7..83fa5086a6 100644
--- a/app/views/notification_mailer/mention.html.haml
+++ b/app/views/notification_mailer/mention.html.haml
@@ -1,5 +1,5 @@
= content_for :heading do
- = render 'application/mailer/heading', heading_title: t('notification_mailer.mention.title'), heading_subtitle: t('notification_mailer.mention.body', name: @status.account.pretty_acct), heading_image_url: full_pack_url('media/images/mailer-new/heading/mention.png')
+ = render 'application/mailer/heading', heading_title: t('notification_mailer.mention.title'), heading_subtitle: t('notification_mailer.mention.body', name: @status.account.pretty_acct), heading_image_url: frontend_asset_url('images/mailer-new/heading/mention.png')
%table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
%tr
%td.email-body-padding-td
diff --git a/app/views/notification_mailer/reblog.html.haml b/app/views/notification_mailer/reblog.html.haml
index b32c984708..f91c678cf5 100644
--- a/app/views/notification_mailer/reblog.html.haml
+++ b/app/views/notification_mailer/reblog.html.haml
@@ -1,5 +1,5 @@
= content_for :heading do
- = render 'application/mailer/heading', heading_title: t('notification_mailer.reblog.title'), heading_subtitle: t('notification_mailer.reblog.body', name: @account.pretty_acct), heading_image_url: full_pack_url('media/images/mailer-new/heading/boost.png')
+ = render 'application/mailer/heading', heading_title: t('notification_mailer.reblog.title'), heading_subtitle: t('notification_mailer.reblog.body', name: @account.pretty_acct), heading_image_url: frontend_asset_url('images/mailer-new/heading/boost.png')
%table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
%tr
%td.email-body-padding-td
diff --git a/app/views/settings/flavours/show.html.haml b/app/views/settings/flavours/show.html.haml
index ea2540858e..b04479b260 100644
--- a/app/views/settings/flavours/show.html.haml
+++ b/app/views/settings/flavours/show.html.haml
@@ -4,8 +4,8 @@
= simple_form_for current_user, url: settings_flavour_path(@selected), html: { method: :put } do |f|
= render 'shared/error_messages', object: current_user
- - Themes.instance.flavour(@selected)['screenshot'].each do |screen|
- %img.flavour-screen{ src: full_pack_url("media/#{screen}"), alt: '' }
+ - Themes.instance.flavour(@selected)['screenshot'].each do |screenshot|
+ %img.flavour-screen{ src: frontend_asset_url(screenshot), alt: '' }
.flavour-description
= t "flavours.#{@selected}.description", default: ''
diff --git a/app/views/shared/_og.html.haml b/app/views/shared/_og.html.haml
index 385351ee14..d1e3cd9c6f 100644
--- a/app/views/shared/_og.html.haml
+++ b/app/views/shared/_og.html.haml
@@ -8,7 +8,7 @@
= opengraph 'og:type', 'website'
= opengraph 'og:title', instance_presenter.title
= opengraph 'og:description', description
-= opengraph 'og:image', full_asset_url(thumbnail&.file&.url(:'@1x') || asset_pack_path('media/images/preview.png', protocol: :request))
+= opengraph 'og:image', full_asset_url(thumbnail&.file&.url(:'@1x') || frontend_asset_path('images/preview.png'))
= opengraph 'og:image:width', thumbnail ? thumbnail.meta['width'] : '1200'
= opengraph 'og:image:height', thumbnail ? thumbnail.meta['height'] : '630'
= opengraph 'twitter:card', 'summary_large_image'
diff --git a/app/views/user_mailer/appeal_approved.html.haml b/app/views/user_mailer/appeal_approved.html.haml
index 2cf62de39b..54e9a94a54 100644
--- a/app/views/user_mailer/appeal_approved.html.haml
+++ b/app/views/user_mailer/appeal_approved.html.haml
@@ -1,5 +1,5 @@
= content_for :heading do
- = render 'application/mailer/heading', heading_title: t('user_mailer.appeal_approved.title'), heading_subtitle: t('user_mailer.appeal_approved.subtitle'), heading_image_url: full_pack_url('media/images/mailer-new/heading/appeal-approved.png')
+ = render 'application/mailer/heading', heading_title: t('user_mailer.appeal_approved.title'), heading_subtitle: t('user_mailer.appeal_approved.subtitle'), heading_image_url: frontend_asset_url('images/mailer-new/heading/appeal-approved.png')
%table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
%tr
%td.email-body-padding-td
diff --git a/app/views/user_mailer/appeal_rejected.html.haml b/app/views/user_mailer/appeal_rejected.html.haml
index c24cf7647f..b493712b05 100644
--- a/app/views/user_mailer/appeal_rejected.html.haml
+++ b/app/views/user_mailer/appeal_rejected.html.haml
@@ -1,5 +1,5 @@
= content_for :heading do
- = render 'application/mailer/heading', heading_title: t('user_mailer.appeal_rejected.title'), heading_subtitle: t('user_mailer.appeal_rejected.subtitle'), heading_image_url: full_pack_url('media/images/mailer-new/heading/appeal-rejected.png')
+ = render 'application/mailer/heading', heading_title: t('user_mailer.appeal_rejected.title'), heading_subtitle: t('user_mailer.appeal_rejected.subtitle'), heading_image_url: frontend_asset_url('images/mailer-new/heading/appeal-rejected.png')
%table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
%tr
%td.email-body-padding-td
diff --git a/app/views/user_mailer/backup_ready.html.haml b/app/views/user_mailer/backup_ready.html.haml
index 4a1e7b1c65..99a48e7fdb 100644
--- a/app/views/user_mailer/backup_ready.html.haml
+++ b/app/views/user_mailer/backup_ready.html.haml
@@ -1,5 +1,5 @@
= content_for :heading do
- = render 'application/mailer/heading', heading_title: t('user_mailer.backup_ready.title'), heading_subtitle: t('user_mailer.backup_ready.explanation'), heading_image_url: full_pack_url('media/images/mailer-new/heading/archive.png')
+ = render 'application/mailer/heading', heading_title: t('user_mailer.backup_ready.title'), heading_subtitle: t('user_mailer.backup_ready.explanation'), heading_image_url: frontend_asset_url('images/mailer-new/heading/archive.png')
%table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
%tr
%td.email-body-padding-td
diff --git a/app/views/user_mailer/confirmation_instructions.html.haml b/app/views/user_mailer/confirmation_instructions.html.haml
index 4fd66d0791..74b2d49a47 100644
--- a/app/views/user_mailer/confirmation_instructions.html.haml
+++ b/app/views/user_mailer/confirmation_instructions.html.haml
@@ -1,5 +1,5 @@
= content_for :heading do
- = render 'application/mailer/heading', heading_title: t('devise.mailer.confirmation_instructions.title'), heading_image_url: full_pack_url('media/images/mailer-new/heading/email.png')
+ = render 'application/mailer/heading', heading_title: t('devise.mailer.confirmation_instructions.title'), heading_image_url: frontend_asset_url('images/mailer-new/heading/email.png')
%table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
%tr
%td.email-body-padding-td
diff --git a/app/views/user_mailer/email_changed.html.haml b/app/views/user_mailer/email_changed.html.haml
index 741c2bde18..71678ad029 100644
--- a/app/views/user_mailer/email_changed.html.haml
+++ b/app/views/user_mailer/email_changed.html.haml
@@ -1,5 +1,5 @@
= content_for :heading do
- = render 'application/mailer/heading', heading_title: t('devise.mailer.email_changed.title'), heading_subtitle: t('devise.mailer.email_changed.explanation'), heading_image_url: full_pack_url('media/images/mailer-new/heading/email.png')
+ = render 'application/mailer/heading', heading_title: t('devise.mailer.email_changed.title'), heading_subtitle: t('devise.mailer.email_changed.explanation'), heading_image_url: frontend_asset_url('images/mailer-new/heading/email.png')
%table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
%tr
%td.email-body-padding-td
diff --git a/app/views/user_mailer/password_change.html.haml b/app/views/user_mailer/password_change.html.haml
index 08b4ecbbd6..44c8c0dcaf 100644
--- a/app/views/user_mailer/password_change.html.haml
+++ b/app/views/user_mailer/password_change.html.haml
@@ -1,5 +1,5 @@
= content_for :heading do
- = render 'application/mailer/heading', heading_title: t('devise.mailer.password_change.title'), heading_subtitle: t('devise.mailer.password_change.explanation'), heading_image_url: full_pack_url('media/images/mailer-new/heading/password.png')
+ = render 'application/mailer/heading', heading_title: t('devise.mailer.password_change.title'), heading_subtitle: t('devise.mailer.password_change.explanation'), heading_image_url: frontend_asset_url('images/mailer-new/heading/password.png')
%table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
%tr
%td.email-body-padding-td
diff --git a/app/views/user_mailer/reconfirmation_instructions.html.haml b/app/views/user_mailer/reconfirmation_instructions.html.haml
index 8aa2230151..854887a7e0 100644
--- a/app/views/user_mailer/reconfirmation_instructions.html.haml
+++ b/app/views/user_mailer/reconfirmation_instructions.html.haml
@@ -1,5 +1,5 @@
= content_for :heading do
- = render 'application/mailer/heading', heading_title: t('devise.mailer.reconfirmation_instructions.title'), heading_image_url: full_pack_url('media/images/mailer-new/heading/email.png')
+ = render 'application/mailer/heading', heading_title: t('devise.mailer.reconfirmation_instructions.title'), heading_image_url: frontend_asset_url('images/mailer-new/heading/email.png')
%table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
%tr
%td.email-body-padding-td
diff --git a/app/views/user_mailer/reset_password_instructions.html.haml b/app/views/user_mailer/reset_password_instructions.html.haml
index 0db79daaf1..a1384fcc27 100644
--- a/app/views/user_mailer/reset_password_instructions.html.haml
+++ b/app/views/user_mailer/reset_password_instructions.html.haml
@@ -1,5 +1,5 @@
= content_for :heading do
- = render 'application/mailer/heading', heading_title: t('devise.mailer.reset_password_instructions.title'), heading_subtitle: t('devise.mailer.reset_password_instructions.explanation'), heading_image_url: full_pack_url('media/images/mailer-new/heading/password.png')
+ = render 'application/mailer/heading', heading_title: t('devise.mailer.reset_password_instructions.title'), heading_subtitle: t('devise.mailer.reset_password_instructions.explanation'), heading_image_url: frontend_asset_url('images/mailer-new/heading/password.png')
%table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
%tr
%td.email-body-padding-td
diff --git a/app/views/user_mailer/suspicious_sign_in.html.haml b/app/views/user_mailer/suspicious_sign_in.html.haml
index e2cb916bfe..deee7a1ce1 100644
--- a/app/views/user_mailer/suspicious_sign_in.html.haml
+++ b/app/views/user_mailer/suspicious_sign_in.html.haml
@@ -1,5 +1,5 @@
= content_for :heading do
- = render 'application/mailer/heading', heading_title: t('user_mailer.suspicious_sign_in.title'), heading_subtitle: t('user_mailer.suspicious_sign_in.explanation'), heading_image_url: full_pack_url('media/images/mailer-new/heading/login.png')
+ = render 'application/mailer/heading', heading_title: t('user_mailer.suspicious_sign_in.title'), heading_subtitle: t('user_mailer.suspicious_sign_in.explanation'), heading_image_url: frontend_asset_url('images/mailer-new/heading/login.png')
%table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
%tr
%td.email-body-padding-td
diff --git a/app/views/user_mailer/two_factor_disabled.html.haml b/app/views/user_mailer/two_factor_disabled.html.haml
index 0d8ff5c690..28f6ca6600 100644
--- a/app/views/user_mailer/two_factor_disabled.html.haml
+++ b/app/views/user_mailer/two_factor_disabled.html.haml
@@ -1,5 +1,5 @@
= content_for :heading do
- = render 'application/mailer/heading', heading_title: t('devise.mailer.two_factor_disabled.title'), heading_subtitle: t('devise.mailer.two_factor_disabled.subtitle'), heading_image_url: full_pack_url('media/images/mailer-new/heading/2fa-disabled.png')
+ = render 'application/mailer/heading', heading_title: t('devise.mailer.two_factor_disabled.title'), heading_subtitle: t('devise.mailer.two_factor_disabled.subtitle'), heading_image_url: frontend_asset_url('images/mailer-new/heading/2fa-disabled.png')
%table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
%tr
%td.email-body-padding-td
diff --git a/app/views/user_mailer/two_factor_enabled.html.haml b/app/views/user_mailer/two_factor_enabled.html.haml
index 6fe03eab2b..691dc661a0 100644
--- a/app/views/user_mailer/two_factor_enabled.html.haml
+++ b/app/views/user_mailer/two_factor_enabled.html.haml
@@ -1,5 +1,5 @@
= content_for :heading do
- = render 'application/mailer/heading', heading_title: t('devise.mailer.two_factor_enabled.title'), heading_subtitle: t('devise.mailer.two_factor_enabled.subtitle'), heading_image_url: full_pack_url('media/images/mailer-new/heading/2fa-enabled.png')
+ = render 'application/mailer/heading', heading_title: t('devise.mailer.two_factor_enabled.title'), heading_subtitle: t('devise.mailer.two_factor_enabled.subtitle'), heading_image_url: frontend_asset_url('images/mailer-new/heading/2fa-enabled.png')
%table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
%tr
%td.email-body-padding-td
diff --git a/app/views/user_mailer/two_factor_recovery_codes_changed.html.haml b/app/views/user_mailer/two_factor_recovery_codes_changed.html.haml
index dff0620cef..2d063e4c76 100644
--- a/app/views/user_mailer/two_factor_recovery_codes_changed.html.haml
+++ b/app/views/user_mailer/two_factor_recovery_codes_changed.html.haml
@@ -1,5 +1,5 @@
= content_for :heading do
- = render 'application/mailer/heading', heading_title: t('devise.mailer.two_factor_recovery_codes_changed.title'), heading_subtitle: t('devise.mailer.two_factor_recovery_codes_changed.subtitle'), heading_image_url: full_pack_url('media/images/mailer-new/heading/2fa-recovery.png')
+ = render 'application/mailer/heading', heading_title: t('devise.mailer.two_factor_recovery_codes_changed.title'), heading_subtitle: t('devise.mailer.two_factor_recovery_codes_changed.subtitle'), heading_image_url: frontend_asset_url('images/mailer-new/heading/2fa-recovery.png')
%table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
%tr
%td.email-body-padding-td
diff --git a/app/views/user_mailer/warning.html.haml b/app/views/user_mailer/warning.html.haml
index 4dfbfc231d..837cde550e 100644
--- a/app/views/user_mailer/warning.html.haml
+++ b/app/views/user_mailer/warning.html.haml
@@ -1,5 +1,5 @@
= content_for :heading do
- = render 'application/mailer/heading', heading_title: t("user_mailer.warning.title.#{@warning.action}"), heading_image_url: full_pack_url('media/images/mailer-new/heading/warning.png')
+ = render 'application/mailer/heading', heading_title: t("user_mailer.warning.title.#{@warning.action}"), heading_image_url: frontend_asset_url('images/mailer-new/heading/warning.png')
%table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
%tr
%td.email-body-padding-td
diff --git a/app/views/user_mailer/webauthn_credential_added.html.haml b/app/views/user_mailer/webauthn_credential_added.html.haml
index 334eb3e32d..3e16766238 100644
--- a/app/views/user_mailer/webauthn_credential_added.html.haml
+++ b/app/views/user_mailer/webauthn_credential_added.html.haml
@@ -1,5 +1,5 @@
= content_for :heading do
- = render 'application/mailer/heading', heading_title: t('devise.mailer.webauthn_credential.added.title'), heading_subtitle: t('devise.mailer.webauthn_credential.added.explanation'), heading_image_url: full_pack_url('media/images/mailer-new/heading/key-added.png')
+ = render 'application/mailer/heading', heading_title: t('devise.mailer.webauthn_credential.added.title'), heading_subtitle: t('devise.mailer.webauthn_credential.added.explanation'), heading_image_url: frontend_asset_url('images/mailer-new/heading/key-added.png')
%table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
%tr
%td.email-body-padding-td
diff --git a/app/views/user_mailer/webauthn_credential_deleted.html.haml b/app/views/user_mailer/webauthn_credential_deleted.html.haml
index 5fad523b4e..59dcb75d3a 100644
--- a/app/views/user_mailer/webauthn_credential_deleted.html.haml
+++ b/app/views/user_mailer/webauthn_credential_deleted.html.haml
@@ -1,5 +1,5 @@
= content_for :heading do
- = render 'application/mailer/heading', heading_title: t('devise.mailer.webauthn_credential.deleted.title'), heading_subtitle: t('devise.mailer.webauthn_credential.deleted.explanation'), heading_image_url: full_pack_url('media/images/mailer-new/heading/key-deleted.png')
+ = render 'application/mailer/heading', heading_title: t('devise.mailer.webauthn_credential.deleted.title'), heading_subtitle: t('devise.mailer.webauthn_credential.deleted.explanation'), heading_image_url: frontend_asset_url('images/mailer-new/heading/key-deleted.png')
%table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
%tr
%td.email-body-padding-td
diff --git a/app/views/user_mailer/webauthn_disabled.html.haml b/app/views/user_mailer/webauthn_disabled.html.haml
index 0174125362..0f7c534bc4 100644
--- a/app/views/user_mailer/webauthn_disabled.html.haml
+++ b/app/views/user_mailer/webauthn_disabled.html.haml
@@ -1,5 +1,5 @@
= content_for :heading do
- = render 'application/mailer/heading', heading_title: t('devise.mailer.webauthn_disabled.title'), heading_subtitle: t('devise.mailer.webauthn_disabled.explanation'), heading_image_url: full_pack_url('media/images/mailer-new/heading/key-disabled.png')
+ = render 'application/mailer/heading', heading_title: t('devise.mailer.webauthn_disabled.title'), heading_subtitle: t('devise.mailer.webauthn_disabled.explanation'), heading_image_url: frontend_asset_url('images/mailer-new/heading/key-disabled.png')
%table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
%tr
%td.email-body-padding-td
diff --git a/app/views/user_mailer/webauthn_enabled.html.haml b/app/views/user_mailer/webauthn_enabled.html.haml
index 3257d14df9..cd11aa5a40 100644
--- a/app/views/user_mailer/webauthn_enabled.html.haml
+++ b/app/views/user_mailer/webauthn_enabled.html.haml
@@ -1,5 +1,5 @@
= content_for :heading do
- = render 'application/mailer/heading', heading_title: t('devise.mailer.webauthn_enabled.title'), heading_subtitle: t('devise.mailer.webauthn_enabled.explanation'), heading_image_url: full_pack_url('media/images/mailer-new/heading/key-enabled.png')
+ = render 'application/mailer/heading', heading_title: t('devise.mailer.webauthn_enabled.title'), heading_subtitle: t('devise.mailer.webauthn_enabled.explanation'), heading_image_url: frontend_asset_url('images/mailer-new/heading/key-enabled.png')
%table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
%tr
%td.email-body-padding-td
diff --git a/bin/bundle b/bin/bundle
index f19acf5b5c..50da5fdf9e 100755
--- a/bin/bundle
+++ b/bin/bundle
@@ -1,3 +1,109 @@
#!/usr/bin/env ruby
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__)
-load Gem.bin_path('bundler', 'bundle')
+# frozen_string_literal: true
+
+#
+# This file was generated by Bundler.
+#
+# The application 'bundle' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require "rubygems"
+
+m = Module.new do
+ module_function
+
+ def invoked_as_script?
+ File.expand_path($0) == File.expand_path(__FILE__)
+ end
+
+ def env_var_version
+ ENV["BUNDLER_VERSION"]
+ end
+
+ def cli_arg_version
+ return unless invoked_as_script? # don't want to hijack other binstubs
+ return unless "update".start_with?(ARGV.first || " ") # must be running `bundle update`
+ bundler_version = nil
+ update_index = nil
+ ARGV.each_with_index do |a, i|
+ if update_index && update_index.succ == i && a.match?(Gem::Version::ANCHORED_VERSION_PATTERN)
+ bundler_version = a
+ end
+ next unless a =~ /\A--bundler(?:[= ](#{Gem::Version::VERSION_PATTERN}))?\z/
+ bundler_version = $1
+ update_index = i
+ end
+ bundler_version
+ end
+
+ def gemfile
+ gemfile = ENV["BUNDLE_GEMFILE"]
+ return gemfile if gemfile && !gemfile.empty?
+
+ File.expand_path("../Gemfile", __dir__)
+ end
+
+ def lockfile
+ lockfile =
+ case File.basename(gemfile)
+ when "gems.rb" then gemfile.sub(/\.rb$/, ".locked")
+ else "#{gemfile}.lock"
+ end
+ File.expand_path(lockfile)
+ end
+
+ def lockfile_version
+ return unless File.file?(lockfile)
+ lockfile_contents = File.read(lockfile)
+ return unless lockfile_contents =~ /\n\nBUNDLED WITH\n\s{2,}(#{Gem::Version::VERSION_PATTERN})\n/
+ Regexp.last_match(1)
+ end
+
+ def bundler_requirement
+ @bundler_requirement ||=
+ env_var_version ||
+ cli_arg_version ||
+ bundler_requirement_for(lockfile_version)
+ end
+
+ def bundler_requirement_for(version)
+ return "#{Gem::Requirement.default}.a" unless version
+
+ bundler_gem_version = Gem::Version.new(version)
+
+ bundler_gem_version.approximate_recommendation
+ end
+
+ def load_bundler!
+ ENV["BUNDLE_GEMFILE"] ||= gemfile
+
+ activate_bundler
+ end
+
+ def activate_bundler
+ gem_error = activation_error_handling do
+ gem "bundler", bundler_requirement
+ end
+ return if gem_error.nil?
+ require_error = activation_error_handling do
+ require "bundler/version"
+ end
+ return if require_error.nil? && Gem::Requirement.new(bundler_requirement).satisfied_by?(Gem::Version.new(Bundler::VERSION))
+ warn "Activating bundler (#{bundler_requirement}) failed:\n#{gem_error.message}\n\nTo install the version of bundler this project requires, run `gem install bundler -v '#{bundler_requirement}'`"
+ exit 42
+ end
+
+ def activation_error_handling
+ yield
+ nil
+ rescue StandardError, LoadError => e
+ e
+ end
+end
+
+m.load_bundler!
+
+if m.invoked_as_script?
+ load Gem.bin_path("bundler", "bundle")
+end
diff --git a/config/initializers/content_security_policy.rb b/config/initializers/content_security_policy.rb
index a8b61e356f..e43e38786c 100644
--- a/config/initializers/content_security_policy.rb
+++ b/config/initializers/content_security_policy.rb
@@ -52,9 +52,9 @@ Rails.application.config.content_security_policy do |p|
if Rails.env.development?
webpacker_public_host = ENV.fetch('WEBPACKER_DEV_SERVER_PUBLIC', Webpacker.config.dev_server[:public])
- webpacker_urls = %w(ws http).map { |protocol| "#{protocol}#{Webpacker.dev_server.https? ? 's' : ''}://#{webpacker_public_host}" }
+ front_end_build_urls = %w(ws http).map { |protocol| "#{protocol}#{Webpacker.dev_server.https? ? 's' : ''}://#{webpacker_public_host}" }
- p.connect_src :self, :data, :blob, *media_hosts, Rails.configuration.x.streaming_api_base_url, *webpacker_urls
+ p.connect_src :self, :data, :blob, *media_hosts, Rails.configuration.x.streaming_api_base_url, *front_end_build_urls
p.script_src :self, :unsafe_inline, :unsafe_eval, assets_host
else
p.connect_src :self, :data, :blob, *media_hosts, Rails.configuration.x.streaming_api_base_url
diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb
index 2c6099623d..f935090efc 100644
--- a/config/initializers/devise.rb
+++ b/config/initializers/devise.rb
@@ -2,15 +2,6 @@
require 'devise/strategies/authenticatable'
-# TODO: Remove this patch when this PR or similar is merged into Devise:
-# https://github.com/heartcombo/devise/pull/5645
-# We rely on ENV vars and not secrets/credentials, so the deprecation is just noise.
-class Devise::SecretKeyFinder
- def find
- @application.secret_key_base
- end
-end
-
Warden::Manager.after_set_user except: :fetch do |user, warden|
session_id = warden.cookies.signed['_session_id'] || warden.raw_session['auth_id']
session_id = user.activate_session(warden.request) unless user.session_activations.active?(session_id)
@@ -133,9 +124,11 @@ Devise.setup do |config|
# The secret key used by Devise. Devise uses this key to generate
# random tokens. Changing this key will render invalid all existing
# confirmation, reset password and unlock tokens in the database.
- # Devise will use the `secret_key_base` on Rails 4+ applications as its `secret_key`
- # by default. You can change it below and use your own secret key.
- # config.secret_key = '2f86974c4dd7735170fd70fbf399f7a477ffd635ef240d07a22cf4bd7cd13dbae17c4383a2996d0c1e79a991ec18a91a17424c53e4771adb75a8b21904bd1403'
+ #
+ # Set explicitly to Rails default to avoid deprecation warnings.
+ # https://github.com/heartcombo/devise/pull/5645#issuecomment-1871849856
+ # Remove when Devise changes `SecretKeyFinder` to not emit deprecations.
+ config.secret_key = Rails.application.secret_key_base
# ==> Mailer Configuration
# Configure the e-mail address which will be shown in Devise::Mailer,
diff --git a/config/locales/an.yml b/config/locales/an.yml
index de791679b6..17077041da 100644
--- a/config/locales/an.yml
+++ b/config/locales/an.yml
@@ -1548,7 +1548,6 @@ an:
webauthn: Claus de seguranza
user_mailer:
appeal_approved:
- action: Ir ta la tuya cuenta
explanation: L'apelación de l'amonestación contra la tuya cuenta d'o %{strike_date} que ninviés lo %{appeal_date} estió aprebada. La tuya cuenta se troba de nuevo en buen estau.
subject: La tuya apelación d'o %{date} ha estau aprebada
title: Apelación aprebada
@@ -1557,7 +1556,6 @@ an:
subject: La tuya apelación d'o %{date} ha estau refusada
title: Apelación refusada
backup_ready:
- explanation: Has solicitau una copia completa d'a tuya cuenta de Mastodon. Ya ye preparada pa descargar!
subject: Lo tuyo fichero ye preparau pa descargar
title: Descargar fichero
suspicious_sign_in:
diff --git a/config/locales/ar.yml b/config/locales/ar.yml
index c1b2677dcc..3c8c643fe7 100644
--- a/config/locales/ar.yml
+++ b/config/locales/ar.yml
@@ -1871,7 +1871,6 @@ ar:
webauthn: مفاتيح الأمان
user_mailer:
appeal_approved:
- action: انتقل إلى حسابك
explanation: تمت الموافقة على استئناف السجل ضد حسابك في %{strike_date} الذي قدمته في %{appeal_date}. حسابك مرة أخرى في حالة جيدة.
subject: تم قبول طعنك الذي قدمته بتاريخ %{date}
title: تم قبول طعنك
@@ -1880,7 +1879,6 @@ ar:
subject: تم رفض طعنك الذي قدمته بتاريخ %{date}
title: رُفض الاستئناف
backup_ready:
- explanation: لقد قمت بطلب نسخة كاملة لحسابك على ماستدون. إنها متوفرة الآن للتنزيل!
subject: نسخة بيانات حسابك جاهزة للتنزيل
title: المغادرة بأرشيف الحساب
suspicious_sign_in:
diff --git a/config/locales/be.yml b/config/locales/be.yml
index ca9b0d2b88..c0ed043f8e 100644
--- a/config/locales/be.yml
+++ b/config/locales/be.yml
@@ -1838,7 +1838,6 @@ be:
webauthn: Ключы бяспекі
user_mailer:
appeal_approved:
- action: Перайсці ў свой уліковы запіс
explanation: Апеляцыя на папярэджанне супраць вашага ўліковага запісу ад %{strike_date}, якую вы падалі %{appeal_date}, была ўхвалена. Ваш уліковы запіс зноў на добрым рахунку.
subject: Вашая апеляцыя ад %{date} была ўхваленая
title: Абскарджанне ўхвалена
@@ -1847,7 +1846,6 @@ be:
subject: Вашая апеляцыя ад %{date} была адхіленая
title: Абскарджанне адхілена
backup_ready:
- explanation: Вы запатрабавалі поўнае рэзервовае капіраванне вашага ўліковага запісу Mastodon. Цяпер яго можна спампаваць!
subject: Ваш архіў гатовы да спампавання
title: Ваш архіў можна спампаваць
suspicious_sign_in:
diff --git a/config/locales/bg.yml b/config/locales/bg.yml
index 1865aa5fca..377babe22e 100644
--- a/config/locales/bg.yml
+++ b/config/locales/bg.yml
@@ -1608,6 +1608,7 @@ bg:
unknown_browser: Неизвестен браузър
weibo: Weibo
current_session: Текуща сесия
+ date: Дата
description: "%{browser} на %{platform}"
explanation: Това са уеб браузърите, от които в момента сте влезли с вашия Mastodon акаунт.
ip: IP адрес
@@ -1774,16 +1775,19 @@ bg:
webauthn: Ключове за сигурност
user_mailer:
appeal_approved:
- action: Към акаунта ви
+ action: Настройки на акаунта
explanation: Жалбата, която изпратихте на %{appeal_date}, срещу нарушението за вашия акаунт, направено на %{strike_date}, е приета. Вашият акаунт е отново с добра репутация.
subject: Вашето обжалване от %{date} е било одобрено
+ subtitle: Вашият акаунт още веднъж е в добра репутация.
title: Одобрено обжалване
appeal_rejected:
explanation: Жалбата, която изпратихте на %{appeal_date}, срещу нарушението за вашия акаунт, направено на %{strike_date}, е отхвърлена.
subject: Вашето обжалване от %{date} е било отхвърлено
+ subtitle: Обжалването ви е отхвърлено.
title: Отхвърлено обжалване
backup_ready:
- explanation: Изискахте пълно резервно копиране на акаунта си в Mastodon. Вече е готово за изтегляне!
+ explanation: Изисквахте пълно резервно копие на акаунта си в Mastodon.
+ extra: Вече е готово за теглене!
subject: Вашият архив е готов за изтегляне
title: Сваляне на архива
suspicious_sign_in:
diff --git a/config/locales/br.yml b/config/locales/br.yml
index 8a70a90cfe..7af72457d0 100644
--- a/config/locales/br.yml
+++ b/config/locales/br.yml
@@ -471,6 +471,7 @@ br:
safari: Safari
uc_browser: UC Browser
weibo: Weibo
+ date: Deiziad
description: "%{browser} war %{platform}"
ip: IP
platforms:
@@ -529,6 +530,10 @@ br:
disable: Diweredekaat
edit: Kemmañ
user_mailer:
+ appeal_approved:
+ action: Arventennoù ar gont
+ backup_ready:
+ extra: Prest eo da vezañ pellgarget!
warning:
categories:
spam: Spam
diff --git a/config/locales/ca.yml b/config/locales/ca.yml
index 25f19ef25f..580c4a3ed9 100644
--- a/config/locales/ca.yml
+++ b/config/locales/ca.yml
@@ -1605,6 +1605,7 @@ ca:
unknown_browser: Navegador Desconegut
weibo: Weibo
current_session: Sessió actual
+ date: Data
description: "%{browser} de %{platform}"
explanation: Aquests són els navegadors web que actualment han iniciat la sessió amb el teu compte de Mastodon.
ip: IP
@@ -1771,16 +1772,19 @@ ca:
webauthn: Claus de seguretat
user_mailer:
appeal_approved:
- action: Ves al teu compte
+ action: Configuració del compte
explanation: L'apel·lació a l'acció contra el teu compte del %{strike_date} que has enviat el %{appeal_date} ha estat aprovada. El teu compte torna a estar en bon estat.
subject: La teva apel·lació del %{date} ha estat aprovada
+ subtitle: El vostre compte torna a estar correcte.
title: Apel·lació aprovada
appeal_rejected:
explanation: L'apel·lació a l'acció contra el teu compte del %{strike_date} que has enviat el %{appeal_date} ha estat rebutjada.
subject: La teva apel·lació del %{date} ha estat rebutjada
+ subtitle: S'ha rebutjat la vostra apel·lació.
title: Apel·lació rebutjada
backup_ready:
- explanation: Has sol·licitat una copia completa del teu compte Mastodon. Ara ja està a punt per a descàrrega!
+ explanation: Heu demanat una còpia completa de les dades del vostre compte de Mastodon.
+ extra: Ja us ho podeu baixar
subject: L'arxiu està preparat per a descàrrega
title: Recollida de l'arxiu
suspicious_sign_in:
diff --git a/config/locales/ckb.yml b/config/locales/ckb.yml
index 9a974b9ed7..7905024381 100644
--- a/config/locales/ckb.yml
+++ b/config/locales/ckb.yml
@@ -1015,7 +1015,6 @@ ckb:
webauthn: کلیلەکانی پاراستن
user_mailer:
backup_ready:
- explanation: ئێوە وشانێکی پاڵپشتی تەواوت لە هەژمارەکەی خۆت داوا کردووە، ئەم پاڵپشتییە ئێستا ئامادەی بارکردنە!
subject: ئارشیڤی ئێوە ئامادەی داگرتنە
title: وەرگرتنی ئارشیڤ
warning:
diff --git a/config/locales/co.yml b/config/locales/co.yml
index e613ea7606..f5b6b46d92 100644
--- a/config/locales/co.yml
+++ b/config/locales/co.yml
@@ -1034,7 +1034,6 @@ co:
webauthn: Chjave di sicurità
user_mailer:
backup_ready:
- explanation: Avete dumandatu un’archiviu cumpletu di u vostru contu Mastodon. Avà hè prontu per scaricà!
subject: U vostru archiviu hè prontu à scaricà
title: Archiviu prontu
warning:
diff --git a/config/locales/cs.yml b/config/locales/cs.yml
index e3e804172a..eafbead761 100644
--- a/config/locales/cs.yml
+++ b/config/locales/cs.yml
@@ -1792,7 +1792,6 @@ cs:
webauthn: Bezpečnostní klíče
user_mailer:
appeal_approved:
- action: Přejít do vašeho účtu
explanation: Odvolání proti prohřešku vašeho účtu ze dne %{strike_date}, které jste podali %{appeal_date}, bylo schváleno. Váš účet je opět v pořádku.
subject: Vaše odvolání ze dne %{date} bylo schváleno
title: Odvolání schváleno
@@ -1801,7 +1800,6 @@ cs:
subject: Vaše odvolání z %{date} bylo zamítnuto
title: Odvolání zamítnuto
backup_ready:
- explanation: Vyžádali jste si úplnou zálohu svého účtu Mastodon. Nyní je připravena ke stažení!
subject: Váš archiv je připraven ke stažení
title: Stažení archivu
suspicious_sign_in:
diff --git a/config/locales/cy.yml b/config/locales/cy.yml
index 70b994903e..768dd3e0c8 100644
--- a/config/locales/cy.yml
+++ b/config/locales/cy.yml
@@ -21,7 +21,7 @@ cy:
link_verified_on: Gwiriwyd perchnogaeth y ddolen yma ar %{date}
nothing_here: Does dim byd yma!
pin_errors:
- following: Rhaid i chi fod yn dilyn y person yr ydych am ei gymeradwyo yn barod
+ following: Rhaid i chi fod yn dilyn yn barod y person rydych am ei gymeradwyo
posts:
few: Postiadau
many: Postiadau
@@ -74,7 +74,7 @@ cy:
edit: Golygu
email: E-bost
email_status: Statws e-bost
- enable: Dad rewi
+ enable: Dadrewi
enable_sign_in_token_auth: Galluogi dilysu tocynnau e-bost
enabled: Wedi ei alluogi
enabled_msg: Wedi dadrewi cyfrif %{username} yn llwyddiannus
@@ -85,7 +85,7 @@ cy:
invite_request_text: Rhesymau dros ymuno
invited_by: Gwahoddwyd gan
ip: IP
- joined: Ymunwyd
+ joined: Wedi ymuno
location:
all: Popeth
local: Lleol
@@ -1712,6 +1712,7 @@ cy:
unknown_browser: Porwr Anhysbys
weibo: Weibo
current_session: Sesiwn gyfredol
+ date: Dyddiad
description: "%{browser} ar %{platform}"
explanation: Dyma'r porwyr gwe sydd wedi mewngofnodi i'ch cyfrif Mastodon ar hyn o bryd.
ip: IP
@@ -1902,16 +1903,19 @@ cy:
webauthn: Allweddi diogelwch
user_mailer:
appeal_approved:
- action: Ewch i'ch cyfrif
+ action: Gosodiadau Cyfrif
explanation: Mae apêl y rhybudd yn erbyn eich cyfrif ar %{strike_date} a gyflwynwyd gennych ar %{appeal_date} wedi'i chymeradwyo. Mae eich cyfrif unwaith eto yn gadarnhaol.
subject: Mae eich apêl gan %{date} wedi'i chymeradwyo
+ subtitle: Mae eich cyfrif unwaith eto mewn sefyllfa dda.
title: Cymeradwywyd yr apêl
appeal_rejected:
explanation: Mae apêl y rhybudd yn erbyn eich cyfrif ar %{strike_date} a gyflwynwyd gennych ar %{appeal_date} wedi'i gwrthod.
subject: Mae eich apêl ar %{date} wedi'i gwrthod
+ subtitle: Mae eich apêl wedi'i gwrthod
title: Mae'r apêl wedi'i gwrthod
backup_ready:
- explanation: Fe wnaethoch chi gais am gopi wrth gefn llawn o'ch cyfrif Mastodon. Mae nawr yn barod i'w lawrlwytho!
+ explanation: Rydych wedi gofyn am gopi wrth gefn llawn o'ch cyfrif Mastodon.
+ extra: Mae nawr yn barod i'w lwytho i lawr!
subject: Mae eich archif yn barod i'w lawrlwytho
title: Allfudo archif
suspicious_sign_in:
diff --git a/config/locales/da.yml b/config/locales/da.yml
index 3d6850ca5e..e09a6eb2f5 100644
--- a/config/locales/da.yml
+++ b/config/locales/da.yml
@@ -1608,6 +1608,7 @@ da:
unknown_browser: Ukendt browser
weibo: Weibo
current_session: Aktuelle session
+ date: Dato
description: "%{browser} på %{platform}"
explanation: Disse webbrowsere er pt. logget ind på din Mastodon-konto.
ip: IP
@@ -1774,16 +1775,19 @@ da:
webauthn: Sikkerhedsnøgler
user_mailer:
appeal_approved:
- action: Gå til din konto
+ action: Kontoindstillinger
explanation: Appellen af kontoadvarslen fra %{strike_date}, indsendt af dig pr. %{appeal_date}, er blevet godkendt. Din kontostatus er igen god.
subject: Din appel pr. %{date} er godkendt
+ subtitle: Dit kontoomdømme er nu igen godt.
title: Appel godkendt
appeal_rejected:
explanation: Appellen af kontoadvarslen fra %{strike_date}, indsendt af dig pr. %{appeal_date}, er blevet afvist.
subject: Din appel pr. %{date} er afvist
+ subtitle: Din appel er afvist.
title: Appel afvist
backup_ready:
- explanation: Den anmodede fulde sikkerhedskopi af din Mastodon-konto er nu klar til download!
+ explanation: Der er anmodet om en fuld sikkerhedskopi af din Mastodon-konto.
+ extra: Sikkerhedskopien kan nu downloades!
subject: Dit arkiv er klar til download
title: Arkiv download
suspicious_sign_in:
diff --git a/config/locales/de.yml b/config/locales/de.yml
index 4542871d80..dc78b188e2 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -1608,6 +1608,7 @@ de:
unknown_browser: Unbekannter Browser
weibo: Weibo
current_session: Aktuelle Sitzung
+ date: Datum
description: "%{browser} auf %{platform}"
explanation: Dies sind die Webbrowser, die derzeit mit deinem Mastodon-Konto verbunden sind.
ip: IP-Adresse
@@ -1774,16 +1775,19 @@ de:
webauthn: Sicherheitsschlüssel
user_mailer:
appeal_approved:
- action: Dein Konto aufrufen
- explanation: Der Einspruch gegen deinen Verstoß vom %{strike_date}, den du am %{appeal_date} eingereicht hast, wurde genehmigt. Dein Konto ist wieder in gutem Zustand.
+ action: Kontoeinstellungen
+ explanation: Der Einspruch gegen deinen Verstoß vom %{strike_date}, den du am %{appeal_date} eingereicht hast, wurde genehmigt. Dein Konto ist wieder in Ordnung.
subject: Dein Einspruch vom %{date} wurde angenommen
+ subtitle: Dein Konto ist wieder in Ordnung.
title: Einspruch angenommen
appeal_rejected:
explanation: Der Einspruch gegen deinen Verstoß vom %{strike_date}, den du am %{appeal_date} eingereicht hast, wurde abgelehnt.
subject: Dein Einspruch vom %{date} wurde abgelehnt
+ subtitle: Dein Einspruch wurde abgelehnt.
title: Einspruch abgelehnt
backup_ready:
- explanation: Du hast eine vollständige Sicherung deines Mastodon-Kontos angefordert. Die Sicherung kann jetzt heruntergeladen werden!
+ explanation: Du hast eine vollständige Datensicherung deines Mastodon-Kontos angefordert.
+ extra: Sie ist jetzt zum Herunterladen bereit!
subject: Dein persönliches Archiv kann heruntergeladen werden
title: Archiv-Download
suspicious_sign_in:
diff --git a/config/locales/devise.an.yml b/config/locales/devise.an.yml
index f179f915dc..4be18845cc 100644
--- a/config/locales/devise.an.yml
+++ b/config/locales/devise.an.yml
@@ -47,11 +47,9 @@ an:
subject: 'Mastodon: Instruccions pa reiniciar clau'
title: Reiniciar clau
two_factor_disabled:
- explanation: L'autenticación de dos factors pa la tuya cuenta ha estau deshabilitada. Agora puetz connectar-te nomás usando l'adreza de correu electronico y la clau.
subject: 'Mastodon: L''autenticación de dos factors ye deshabilitada'
title: 2FA desactivada
two_factor_enabled:
- explanation: L'autenticación de dos factors pa la tuya cuenta ha estau habilitada. Se requiere un token chenerau per l'aplicación TOTP emparellada pa ingresar.
subject: 'Mastodon: L''autenticación de dos factors ye habilitada'
title: 2FA activada
two_factor_recovery_codes_changed:
@@ -70,11 +68,9 @@ an:
subject: 'Mastodon: Clau de seguranza eliminada'
title: Una d'as tuyas claus de seguranza ha estau eliminada
webauthn_disabled:
- explanation: L'autenticación con claus de seguranza ha estau deshabilitada pa la tuya cuenta. Agora l'inicio de sesión nomás ye posible utilizando lo token chenerau per l'aplicación TOTP emparellada.
subject: 'Mastodon: Autenticación con claus de seguranza deshabilitada'
title: Claus de seguranza deshabilitadas
webauthn_enabled:
- explanation: L'autenticación con clau de seguranza ha estau habilitada pa la tuya cuenta. Agora la tuya clau de seguranza puede estar utilizada pa iniciar sesión.
subject: 'Mastodon: Autenticación de clau de seguranza habilitada'
title: Claus de seguranza habilitadas
omniauth_callbacks:
diff --git a/config/locales/devise.ar.yml b/config/locales/devise.ar.yml
index 97d1710edf..28e721e667 100644
--- a/config/locales/devise.ar.yml
+++ b/config/locales/devise.ar.yml
@@ -47,11 +47,9 @@ ar:
subject: 'ماستدون: تعليمات استعادة كلمة المرور'
title: إعادة تعيين كلمة السر
two_factor_disabled:
- explanation: تم تعطيل المصادقة بخطوتين لحسابك الخاص. إنّ الولوج ممكن الآن باستخدام عنوان البريد الإلكتروني وكلمة المرور فقط.
subject: 'ماستدون: نظام المصادقة بخطوتين مُعطّل'
title: إنّ 2FA معطّل
two_factor_enabled:
- explanation: تم تفعيل المصادقة بخطوتين على حسابك. سيُطلب منك رمز تم توليده بواسطة تطبيق TOTP المقترن للولوج.
subject: 'ماستدون: تم تفعيل نظام المصادقة بخطوتين'
title: إنّ 2FA نشِط
two_factor_recovery_codes_changed:
@@ -70,11 +68,9 @@ ar:
subject: 'ماستدون: تم حذف مفتاح الأمان'
title: تم حذف أحد مفاتيح الأمان الخاصة بك
webauthn_disabled:
- explanation: تم تعطيل الاستيثاق مع مفاتيح الأمان لحسابك. تسجيل الدخول الآن ممكن باستخدام الرمز (token) الذي تم إنشاؤه بواسطة تطبيق TOTP المقترن.
subject: 'ماستدون: الاستيثاق مع مفاتيح الأمان معطلة'
title: مفاتيح الأمان معطلة
webauthn_enabled:
- explanation: تم تفعيل استيثاق مفتاح الأمان للحساب الخاص بك. يمكن الآن استخدام مفتاح الأمان الخاص بك لتسجيل الدخول.
subject: 'ماستدون: تم تفعيل نظام استيثاق مفتاح الأمان'
title: مفاتيح الأمان مفعلة
omniauth_callbacks:
diff --git a/config/locales/devise.ast.yml b/config/locales/devise.ast.yml
index a4378dee92..47372c2f07 100644
--- a/config/locales/devise.ast.yml
+++ b/config/locales/devise.ast.yml
@@ -42,11 +42,9 @@ ast:
subject: 'Mastodon: instrucciones pa camudar la contraseña'
title: Cambéu de la contaseña
two_factor_disabled:
- explanation: Desactivóse l'autenticación en dos pasos na cuenta. Agora ye posible aniciar la sesión cola direición de corréu electrónicu ya la contraseña.
subject: 'Mastodon: desactivóse l''autenticación en dos pasos'
title: Autenticación de dos pasos activada
two_factor_enabled:
- explanation: Activóse l'autenticación en dos pasos na cuenta. Agora los pases que xenere l'aplicación TOTP empareyada son obligatorios p'aniciar la sesión.
subject: 'Mastodon: activóse l''autenticación en dos pasos'
title: Autenticación de dos pasos desactivada
two_factor_recovery_codes_changed:
@@ -62,11 +60,9 @@ ast:
deleted:
title: Desanicióse una de les to llaves de seguranza
webauthn_disabled:
- explanation: Desactivóse l'autenticación con llaves de seguranza na cuenta. Agora namás ye posible aniciar la sesión col pase xeneráu pola aplicación TOTP empareyada.
subject: 'Mastodon: desactivóse l''autenticación con llaves de seguranza'
title: Llaves de seguranza desactivaes
webauthn_enabled:
- explanation: Activóse l'autenticación con llaves de seguranza na cuenta. Agora pues usar la llave p'aniciar la sesión.
subject: 'Mastodon: activóse l''autenticación con llaves de seguranza'
title: Llaves de seguranza activaes
passwords:
diff --git a/config/locales/devise.be.yml b/config/locales/devise.be.yml
index e5e8aea91e..8679275c20 100644
--- a/config/locales/devise.be.yml
+++ b/config/locales/devise.be.yml
@@ -47,11 +47,9 @@ be:
subject: 'Mastodon: Інструкцыі па скіданню пароля'
title: Скіданне пароля
two_factor_disabled:
- explanation: Двухфактарная аўтэнтыфікацыя на вашым акаўнце была адключана. Цяпер для ўваходу патрэбны толькі электронная пошта і пароль.
subject: 'Mastodon: двухфактарная аўтэнтыфікацыя адключана'
title: двухэтапнае спраўджанне адключана
two_factor_enabled:
- explanation: Двухфактарная аўтэнтыфікацыя на вашым акаўнце была ўключана. Цяпер для ўваходу ў сістэму патрэбны токен, згенераваны даданай TOTP праграмай.
subject: 'Mastodon: двухфактарная аўтэнтыфікацыя ўключана'
title: двухэтапнае спраўджанне уключана
two_factor_recovery_codes_changed:
@@ -70,11 +68,9 @@ be:
subject: 'Mastodon: ключ бяспекі выдалены'
title: Адзін з вашых ключоў бяспекі быў выдалены
webauthn_disabled:
- explanation: Аўтэнтыфікацыя з дапамогай ключоў бяспекі была адключана для вашага ўліковага запісу. Уваход цяпер магчымы толькі з токенам, згенераваным спалучаным TOTP прыкладаннем.
subject: 'Mastodon: Аўтэнтыфікацыя з дапамогай ключоў бяспекі адключана'
title: Ключы бяспекі адключаны
webauthn_enabled:
- explanation: Аўтэнтыфікацыя праз ключ бяспекі была ўключана для вашага ўліковага запісу. Цяпер вы можаце выкарыстоўваць ваш ключ бяспекі для ўваходу.
subject: 'Mastodon: Аўтэнтыфікацыя праз ключ бяспекі была ўключана'
title: Ключы бяспекі ўключаны
omniauth_callbacks:
diff --git a/config/locales/devise.bg.yml b/config/locales/devise.bg.yml
index 5046771340..f3586bcd85 100644
--- a/config/locales/devise.bg.yml
+++ b/config/locales/devise.bg.yml
@@ -18,7 +18,7 @@ bg:
unconfirmed: Преди да продължите, трябва да потвърдите адреса на имейла си.
mailer:
confirmation_instructions:
- action: Потвърдете адреса на имейла
+ action: Потвърждаване на адреса на имейла
action_with_app: Потвърдете и се върнете към %{app}
explanation: Създали сте акаунт на %{host} с този имейл адрес. Само на едно щракване разстояние сте от активирането му. Ако това не сте били вие, моля, игнорирайте този имейл.
explanation_when_pending: Кандидатствахте за покана до %{host} с този имейл адрес. След като потвърдите своя имейл адрес, ние ще разгледаме вашето заявление. Можете да влезете, за да промените данните си или да изтриете акаунта си, но нямате достъп до повечето функции, докато акаунтът ви не бъде одобрен. Ако вашето заявление бъде отхвърлено, вашите данни ще бъдат премахнати, така че няма да се изискват допълнителни действия от вас. Ако това не сте били вие, моля, игнорирайте този имейл.
@@ -39,7 +39,7 @@ bg:
explanation: Потвърдете новия адрес, за да промените имейла си.
extra: Ако тази промяна не е започната от вас, то пренебрегнете този имейл. Адресът на имейла за акаунта в Mastodon няма да се промени, докато не влезете в горната връзка.
subject: 'Mastodon: Потвърдете имейла за %{instance}'
- title: Потвърдете своя имейл адрес
+ title: Потвърждаване на адреса на имейла
reset_password_instructions:
action: Промяна на паролата
explanation: Поискахте нова парола за акаунта си.
@@ -47,16 +47,19 @@ bg:
subject: 'Mastodon: Указания за задаване на нова парола'
title: Нулиране на парола
two_factor_disabled:
- explanation: Двуфакторното удостоверяване за вашия акаунт е деактивирано. Влизането вече е възможно, като се използват само имейл адрес и парола.
+ explanation: Влизането вече е възможно, употребявайки само адрес на имейла и парола.
subject: 'Mastodon: Двуфакторното удостоверяване е деактивирано'
+ subtitle: Двуфакторното удостоверяване за акаунта ви е изключено.
title: Двуфакторното изключено
two_factor_enabled:
- explanation: За акаунта ви е включено двуфакторно удостоверяване. Отсега нататък ще ви трябва и временен код от сдвоеното приложение за удостоверяване TOTP, за да влезете.
+ explanation: Породени токени от сдвоено приложение TOTP ще се изискват за вход.
subject: 'Mastodon: Включено двуфакторно удостоверяване'
+ subtitle: Двуфакторното удостоверяване е включено за акаунта ви.
title: 2FA активирано
two_factor_recovery_codes_changed:
explanation: Предишните кодове за възстановяване са анулирани и се пораждат нови.
subject: 'Mastodon: Породени пак са двуфакторни кодове за възстановяване'
+ subtitle: Предишните кодове за възстановяване са обезсилени и се пораждат нови.
title: Кодове за 2 факт. удост. за възстановяване са променени
unlock_instructions:
subject: 'Mastodon: указания за отключване'
@@ -70,11 +73,13 @@ bg:
subject: 'Mastodon: Ключът за сигурност е изтрит'
title: Един от ключовете ви за сигурност е изтрит
webauthn_disabled:
- explanation: Удостоверяването с ключове за сигурност е изключено за акаунта ви. Влизането вече е възможно, използвайки само ключа, породен от сдвоеното приложение TOTP.
+ explanation: Удостоверяването на ключовете за сигурност е изключено за акаунта ви.
+ extra: Влизането вече е възможно, употребявайки само породени токени от сдвоено приложение TOTP.
subject: 'Mastodon: Изключено удостоверяване с ключове за сигурност'
title: Изключени ключове за сигурност
webauthn_enabled:
- explanation: Удостоверяването с ключ за сигурност е активирано за вашия акаунт. Вашият ключ за сигурност вече може да се използва за вход.
+ explanation: Удостоверяването на ключа за сигурност е включено за акаунта ви.
+ extra: Вашият ключ за сигурност вече може да се употребява за вход.
subject: 'Mastodon: Включено удостоверяване с ключ за сигурност'
title: Включени ключове за сигурност
omniauth_callbacks:
@@ -82,8 +87,8 @@ bg:
success: Успешно упълномощаване от акаунт на %{kind}.
passwords:
no_token: Не можете да осъществите достъп до тази страница, ако не сте я отворили чрез линк от получен имейл за възстановяване на паролата. Ако сте отворили линка за възстановяване на паролата от имейл, моля, уверете се, че сте използвали целия предоставен URL адрес.
- send_instructions: Ако адресът на имейла ви съществува в базата ни данни, то ще получите връзка за възстановяване на парола на е-пощата си до няколко минути. Проверете си папката за спам, ако не сте получили това е-писмо.
- send_paranoid_instructions: Ако адресът на имейла ви съществува в базата ни данни, то ще получите връзка за възстановяване на парола на е-пощата си до няколко минути. Проверете си папката за спам, ако не сте получили това е-писмо.
+ send_instructions: Ако адресът на имейла ви съществува в базата ни данни, то ще получите връзка за възстановяване на парола на имейла си до няколко минути. Проверете папката си за спам, ако не сте получили това е-писмо.
+ send_paranoid_instructions: Ако адресът на имейла ви съществува в базата ни данни, то ще получите връзка за възстановяване на парола на имейла си до няколко минути. Проверете папката си за спам, ако не сте получили това е-писмо.
updated: Паролата ви беше променена успешно. Сега сте влезли.
updated_not_active: Паролата ви беше променена успешно.
registrations:
@@ -101,7 +106,7 @@ bg:
signed_out: Успешно излизане.
unlocks:
send_instructions: Ще получите имейл с указания как да отключите акаунта си до няколко минути. Проверете папката си за спам, ако не сте получили такъв имейл.
- send_paranoid_instructions: Ако вашият акаунт съществува, ще получите имейл с указания за отключването му до няколко минути. Проверете спам папката си, ако не сте получили такъв имейл.
+ send_paranoid_instructions: Ако акаунта ви съществува, то ще получите е-писмо с указания за отключването му до няколко минути. Проверете папката си за спам, ако не сте получили това е-писмо.
unlocked: Акаунтът ви е успешно отключен. Влезте, за да продължите.
errors:
messages:
diff --git a/config/locales/devise.bn.yml b/config/locales/devise.bn.yml
index e0d83613e8..b046289039 100644
--- a/config/locales/devise.bn.yml
+++ b/config/locales/devise.bn.yml
@@ -47,11 +47,9 @@ bn:
subject: 'মাস্টাডন: পাসওয়ার্ড বদলানোর নির্দেশনা'
title: পাসওয়ার্ড বদলানো
two_factor_disabled:
- explanation: আপনার অ্যাকাউন্টের জন্য দ্বি-ফ্যাক্টর প্রমাণীকরণ অক্ষম করা হয়েছে। লগইন এখন কেবলমাত্র ইমেল ঠিকানা এবং পাসওয়ার্ড ব্যবহার করে সম্ভব।
subject: 'মস্তোডন: দ্বি-গুণক প্রমাণীকরণ অক্ষম'
title: 2FA অক্ষম
two_factor_enabled:
- explanation: আপনার অ্যাকাউন্টের জন্য দ্বি-ফ্যাক্টর প্রমাণীকরণ সক্ষম করা হয়েছে। জোড়যুক্ত TOTP অ্যাপ্লিকেশন দ্বারা উত্পাদিত একটি টোকেন লগইনের জন্য প্রয়োজন হবে।
subject: 'মস্তোডন: দ্বি-গুণক প্রমাণীকরণ সক্ষম হয়েছে'
title: 2FA সক্ষম
two_factor_recovery_codes_changed:
diff --git a/config/locales/devise.br.yml b/config/locales/devise.br.yml
index 4a16157f81..205e11e797 100644
--- a/config/locales/devise.br.yml
+++ b/config/locales/devise.br.yml
@@ -47,11 +47,9 @@ br:
subject: 'Mastodon: Adkorañ kemennoù ar ger-tremen'
title: Adderaouekaat ar ger-tremen
two_factor_disabled:
- explanation: Dilesadur dre eil-elfenn a zo bet nac'het. Gallout a reer mont-tre en ur implijout nemet ur chomlec'h-postel hag ur ger-tremen.
subject: 'Mastodon: dilesadur dre eil-elfenn nac''het'
title: 2FA diweredekaet
two_factor_enabled:
- explanation: Dilesadur dre eil-elfenn a zo aotreet evit ho kont. Ret a vo implij ur jedouer krouet gant an app TOTP koublet evit mont-tre.
subject: 'Mastodon: dilesadur dre eil-elfenn aotreet'
title: 2FA gweredekaet
two_factor_recovery_codes_changed:
@@ -70,11 +68,9 @@ br:
subject: 'Mastodon: alc''hwezioù surentez dilamet'
title: Unan eus hoc'h alc'hwezioù surentez a zo bet dilamet
webauthn_disabled:
- explanation: Dilezadur dre alc'hwezioù surentel a zo bet nac'het evit ho kont. Gallout a reer mont-tre en ur implijout ar jedouer krouet gant app TOTP koublet.
subject: 'Mastodon: dilesadur dre alc''hwezioù surentez nac''het'
title: Alc'hwezioù surentez nac'het
webauthn_enabled:
- explanation: Dilesadur dre alc'hwez surentez a zo bet aotreet evit ho kont. Hoc'h alc'hwez surentez a c'hell bezañ implijet evit mont-tre.
subject: 'Mastodon: dilesadur dre alc''hwezioù surentez aotreet'
title: Alc'hwezioù surentez aotreet
omniauth_callbacks:
diff --git a/config/locales/devise.ca.yml b/config/locales/devise.ca.yml
index 6ebdafb9ec..2bf741ee40 100644
--- a/config/locales/devise.ca.yml
+++ b/config/locales/devise.ca.yml
@@ -49,16 +49,19 @@ ca:
subject: 'Mastodon: Instruccions per a reiniciar contrasenya'
title: Contrasenya restablerta
two_factor_disabled:
- explanation: L'autenticació de doble factor per al teu compte s'ha desactivat. Ara només pots iniciar la sessió fent servir la teva adreça de correu-e i la contrasenya.
+ explanation: Només es pot accedir amb compte de correu i contrasenya.
subject: 'Mastodon: Autenticació de doble factor desactivada'
+ subtitle: S'ha deshabilitat l'autenticació de doble factor al vostre compte.
title: A2F desactivada
two_factor_enabled:
- explanation: L'autenticació de doble factor s'ha habilitat per al teu compte. Per a iniciar la sessió es requerirà un token generat per l'aplicació TOTP que hi hagis emparellat.
+ explanation: Per accedir fa falta un token generat per l'aplicació TOTP aparellada.
subject: 'Mastodon: Autenticació de doble factor activada'
+ subtitle: S'ha habilitat l'autenticació de doble factor al vostre compte.
title: A2F activada
two_factor_recovery_codes_changed:
explanation: Els codis de recuperació anteriors ja no són vàlids i se n'han generat de nous.
subject: 'Mastodon: codis de recuperació de doble factor regenerats'
+ subtitle: S'han invalidat els codis de recuperació anteriors i se n'ha generat de nous.
title: Codis de recuperació A2F canviats
unlock_instructions:
subject: 'Mastodon: Instruccions per a desblocar'
@@ -72,11 +75,13 @@ ca:
subject: 'Mastodon: Clau de seguretat esborrada'
title: Una de les teves claus de seguretat ha estat esborrada
webauthn_disabled:
- explanation: S'ha desactivat l'autenticació amb claus de seguretat per al teu compte. Ara només pots iniciar la sessió usant el token generat per l'aplicació TOTP.
+ explanation: S'ha deshabilitat l'autenticació amb claus de seguretat al vostre compte.
+ extra: Ara només podeu accedir amb el token generat amb l'aplicació TOTP aparellada.
subject: 'Mastodon: S''ha desactivat l''autenticació amb claus de seguretat'
title: Claus de seguretat desactivades
webauthn_enabled:
- explanation: S'ha activat l'autenticació amb claus de seguretat. Ja pots usar la teva clau de seguretat per a iniciar sessió.
+ explanation: S'ha habilitat l'accés amb clau de seguretat al vostre compte.
+ extra: Ara podeu accedir amb la vostra clau de seguretat.
subject: 'Mastodon: Autenticació amb clau de seguretat activada'
title: Claus de seguretat activades
omniauth_callbacks:
diff --git a/config/locales/devise.ckb.yml b/config/locales/devise.ckb.yml
index 1261ebb648..f33959d76c 100644
--- a/config/locales/devise.ckb.yml
+++ b/config/locales/devise.ckb.yml
@@ -47,11 +47,9 @@ ckb:
subject: 'ماستۆدۆن: رێکردنەوەی رێنماییەکانی تێپەڕوشە'
title: گەڕانەوەی تێپەڕوشە
two_factor_disabled:
- explanation: سەلماندنی دوو-فاکتەر بۆ هەژمارەکەت کە لە کارخراوە. چوونەژوورەوە ئێستا دەکرێت تەنها ناونیشانی ئیمەیڵ و تێپەڕوشەکەت بەکاربهێنی.
subject: 'ماستۆدۆن: سەلماندنی دوو-فاکتەری ناچالاک کراوە'
title: 2FA ناچالاک کرا
two_factor_enabled:
- explanation: سەلماندنی دوو-فاکتەر بۆ هەژمارەکەت چالاک کراوە. ئاماژەیەک کە لەلایەن نەرمەکالایTOTP جووتکراو دروست کراوە پێویستە بە چوونە ژوورەوە.
subject: 'ماستۆدۆن: سەلماندنی دوو-فاکتەری چالاک کراوە'
title: 2FA چالاک کرا
two_factor_recovery_codes_changed:
@@ -70,11 +68,9 @@ ckb:
subject: 'ماستۆدۆن: کلیلی پاراستن سڕایەوە'
title: کلیلە کانی پاراستنی یەکێک لە ئێوە سڕایەوە
webauthn_disabled:
- explanation: سەلماندن بە کلیلەپارێزراوەکان لە کارخراوە بۆ هەژمارەکەت. چوونەژوورەوە ئێستا دەکرێت تەنها ئەو نیشانەیە بەکاربێنیت کە لەلایەن نەرمەکالایTOTP دروست کراوە.
subject: 'ماستۆدۆن: سەلماندن لەگەڵ کلیلە پاسایشی ناچالاک کراوە'
title: کلیلە پارستنەکان ناچالاک کراون
webauthn_enabled:
- explanation: سەلماندنی کلیلی ئاسایش چالاک کراوە بۆ هەژمارەکەت. ئێستا کلیلی پاراستن دەتوانرێت بۆ چوونە ژوورەوە بەکار بێت.
subject: 'ماستۆدۆن: سەلماندنی کلیلی پاراستن چالاک کراوە'
title: کلیلە کانی پاراستن چالاک کرا
omniauth_callbacks:
diff --git a/config/locales/devise.co.yml b/config/locales/devise.co.yml
index 8409cfad9b..d661637875 100644
--- a/config/locales/devise.co.yml
+++ b/config/locales/devise.co.yml
@@ -47,11 +47,9 @@ co:
subject: 'Mastodon: Cambià a chjave d’accessu'
title: Cambià a chjave
two_factor_disabled:
- explanation: L'autentificazione à dui fattori per u vostru contu hè stata disattivata. A cunnessione hè avà pussibule cù l'usu solu di u vostru e-mail è di a chjave d'accessu.
subject: 'Mastodon: Autentificazione à dui fattori disattivata'
title: A2F disattivata
two_factor_enabled:
- explanation: L'autentificazione à dui fattori hè stata attivata per u vostru contu. Un codice, o fiscia, generata da l'applicazione TOTP assuciata sarà dumandata per cunnettavvi.
subject: 'Mastodon: Autentificazione à dui fattori attivata'
title: A2F attivata
two_factor_recovery_codes_changed:
@@ -70,11 +68,9 @@ co:
subject: 'Mastodon: Chjave di sicurità sguassata'
title: Una di e vostre chjave di sicurità hè stata sguassata
webauthn_disabled:
- explanation: L'autentificazione cù una chjave di sicurità hè stata disattivata per u vostru contu. Avà pudete solu cunnettavi cù u codice di cunnessione generatu da l'applicazione TOTP appaghjata.
subject: 'Mastodon: Autentificazione cù chjave di sicurità disattivata'
title: Chjave di sicurità disattivate
webauthn_enabled:
- explanation: L'autentificazione cù una chjave di sicurità hè stata attivata per u vostru contu. Avà a vostra chjave pò esse utilizata per cunnettavi.
subject: 'Mastodon: Identificazione cù chjave di sicurità attivata'
title: Chjave di sicurità attivate
omniauth_callbacks:
diff --git a/config/locales/devise.cs.yml b/config/locales/devise.cs.yml
index 32a1ed2c67..fb3893325c 100644
--- a/config/locales/devise.cs.yml
+++ b/config/locales/devise.cs.yml
@@ -47,11 +47,9 @@ cs:
subject: 'Mastodon: Instrukce pro obnovení hesla'
title: Obnovení hesla
two_factor_disabled:
- explanation: Dvoufázové ověřování bylo pro váš účet vypnuto. Pro přihlášení vám nyní stačí pouze e-mailová adresa a heslo.
subject: 'Mastodon: Dvoufázové ověření bylo vypnuto'
title: 2FA bylo vypnuto
two_factor_enabled:
- explanation: Dvoufázové ověřování bylo pro váš účet zapnuto. Pro přihlášení bude vyžadován token vygenerovaný spárovanou TOTP aplikací.
subject: 'Mastodon: Dvoufázové ověření bylo zapnuto'
title: 2FA bylo zapnuto
two_factor_recovery_codes_changed:
@@ -70,11 +68,9 @@ cs:
subject: 'Mastodon: Bezpečnostní klíč byl smazán'
title: Jeden z vašich bezpečnostních klíčů byl smazán
webauthn_disabled:
- explanation: Pro váš účet bylo vypnuto ověření bezpečnostními klíči. Přihlášení je nyní možné pouze s tokenem vygenerovaným spárovanou TOTP aplikací.
subject: 'Mastodon: Přihlašování bezpečnostními klíči bylo vypnuto'
title: Bezpečnostní klíče byly zakázány
webauthn_enabled:
- explanation: Pro váš účet bylo povoleno ověření bezpečnostními klíči. Nyní můžete svůj bezpečnostní klíč použít pro přihlášení.
subject: 'Mastodon: Přihlašování bezpečnostními klíči bylo povoleno'
title: Bezpečnostní klíče byly povoleny
omniauth_callbacks:
diff --git a/config/locales/devise.cy.yml b/config/locales/devise.cy.yml
index 44c09153ff..d3eeb8eeb6 100644
--- a/config/locales/devise.cy.yml
+++ b/config/locales/devise.cy.yml
@@ -47,16 +47,19 @@ cy:
subject: 'Mastodon: Ailosod cyfarwyddiadau cyfrinair'
title: Ailosod cyfrinair
two_factor_disabled:
- explanation: Mae dilysiad dau ffactor ar gyfer eich cyfrif wedi'i analluogi. Mae modd mewngofnodi nawr gan ddefnyddio cyfeiriad e-bost a chyfrinair yn unig.
+ explanation: Mae modd mewngofnodi nawr gan ddefnyddio dim ond cyfeiriad e-bost a chyfrinair.
subject: 'Mastodon: mae dilysu dau ffactor wedi''i alluogi'
+ subtitle: Mae dilysiad dau ffactor ar gyfer eich cyfrif wedi'i analluogi.
title: Dilysu dau ffactor yn anabl
two_factor_enabled:
- explanation: Mae dilysu dau ffactor wedi'i alluogi ar gyfer eich cyfrif. Bydd angen tocyn a gynhyrchir gan yr ap TOTP pâr i fewngofnodi.
+ explanation: Bydd angen tocyn wedi'i gynhyrchu gan yr ap TOTP pâr i fewngofnodi.
subject: 'Mastodon: mae dilysu dau ffactor wedi''i alluogi'
+ subtitle: Mae dilysiad dau ffactor wedi'i alluogi ar gyfer eich cyfrif.
title: Mae dilysu dau ffactor wedi'i alluogi
two_factor_recovery_codes_changed:
explanation: Mae'r codau adfer blaenorol wedi'u hannilysu a chynhyrchwyd rhai newydd.
subject: 'Mastodon: Mae codau adfer dau ffactor wedi''u hadfywio'
+ subtitle: Mae'r codau adfer blaenorol wedi'u hannilysu a rhai newydd wedi'u cynhyrchu.
title: Newidiodd codau adfer 2FA
unlock_instructions:
subject: 'Mastodon: Cyfarwyddiadau datgloi'
@@ -70,11 +73,13 @@ cy:
subject: 'Mastodon: Allwedd ddiogelwch wedi''i dileu'
title: Mae un o'ch allweddi diogelwch wedi'i ddileu
webauthn_disabled:
- explanation: Mae dilysu gydag allweddi diogelwch wedi'i analluogi ar gyfer eich cyfrif. Mae mewngofnodi bellach yn bosibl gan ddefnyddio'r tocyn a gynhyrchir gan yr ap TOTP pâr yn unig.
+ explanation: Mae dilysu gydag allweddi diogelwch wedi'i analluogi ar gyfer eich cyfrif.
+ extra: Mae mewngofnodi bellach yn bosibl gan ddefnyddio'r tocyn wedi'i gynhyrchu gan yr ap TOTP pâr yn unig.
subject: 'Mastodon: Dilysiad gydag allweddi diogelwch wedi''i analluogi'
title: Allweddi diogelwch wedi'u hanalluogi
webauthn_enabled:
- explanation: Mae dilysiad allwedd diogelwch wedi'i alluogi ar gyfer eich cyfrif. Gellir defnyddio'ch allwedd ddiogelwch nawr ar gyfer mewngofnodi.
+ explanation: Mae dilysiad allwedd diogelwch wedi'i alluogi ar gyfer eich cyfrif.
+ extra: Mae modd defnyddio'ch allwedd ddiogelwch nawr i fewngofnodi.
subject: 'Mastodon: Dilysiad allwedd diogelwch wedi''i alluogi'
title: Allweddi diogelwch wedi'u galluogi
omniauth_callbacks:
diff --git a/config/locales/devise.da.yml b/config/locales/devise.da.yml
index 17593be3fd..daf802cdb7 100644
--- a/config/locales/devise.da.yml
+++ b/config/locales/devise.da.yml
@@ -47,16 +47,19 @@ da:
subject: 'Mastodon: Instruktioner til adgangskodenulstilling'
title: Adgangskodenulstilling
two_factor_disabled:
- explanation: Tofaktorgodkendelse for kontoen er blevet deaktiveret. Indlogning er nu kun mulig via email og adgangskode.
+ explanation: Indlogning er nu mulig via kun e-mailadresse og adgangskode.
subject: 'Mastodon: Tofaktorgodkendelse deaktiveret'
+ subtitle: Tofaktorgodkendelse for kontoen er blevet deaktiveret.
title: 2FA deaktiveret
two_factor_enabled:
- explanation: Tofaktorgodkendelse er blevet aktiveret for kontoen. Indlogning vil kærve et token genereret af den parrede TOTP-app.
+ explanation: Token genereret af parret TOTP-app vil være nødvendig for indlogning.
subject: 'Mastodon: Tofaktorgodkendelse aktiveret'
+ subtitle: Tofaktorgodkendelse er blevet aktiveret for kontoen.
title: 2FA aktiveret
two_factor_recovery_codes_changed:
explanation: De tidligere gendannelseskoder er ugyldiggjorte og nye er genereret.
subject: 'Mastodan: Tofaktorgendannelseskoder genereret igen'
+ subtitle: Tidligere gendannelseskoder er ugyldiggjorte og nye er genereret.
title: 2FA gendannelseskoder skiftet
unlock_instructions:
subject: 'Mastodon: Oplåsningsinstruktioner'
@@ -70,11 +73,13 @@ da:
subject: 'Mastodon: Sikkerhedsnøgle slettet'
title: En af dine sikkerhedsnøgler er blevet slettet
webauthn_disabled:
- explanation: Godkendelse med sikkerhedsnøgler er blevet deaktiveret for kontoen. Indlogning er nu kun mulig via token genereret af den parrede TOTP-app.
+ explanation: Godkendelse med sikkerhedsnøgler er blevet deaktiveret for kontoen.
+ extra: Indlogning er nu mulig kun via tokenet genereret af parret TOTP-app.
subject: 'Mastodon: Godkendelse med sikkerhedsnøgler deaktiveret'
title: Sikkerhedsnøgler deaktiveret
webauthn_enabled:
- explanation: Sikkerhedsnøglegodkendelse er aktiveret for kontoen. Din sikkerhedsnøgle kan nu bruges til indlogning.
+ explanation: Sikkerhedsnøglegodkendelse er blevet aktiveret for kontoen.
+ extra: Sikkerhedsnøglen kan nu bruges til indlogning.
subject: 'Mastodon: Sikkerhedsnøglegodkendelse aktiveret'
title: Sikkerhedsnøgler aktiveret
omniauth_callbacks:
diff --git a/config/locales/devise.de.yml b/config/locales/devise.de.yml
index a77240dabe..cf05ddc16b 100644
--- a/config/locales/devise.de.yml
+++ b/config/locales/devise.de.yml
@@ -47,16 +47,19 @@ de:
subject: 'Mastodon: Anleitung zum Zurücksetzen deines Passworts'
title: Passwort zurücksetzen
two_factor_disabled:
- explanation: Zwei-Faktor-Authentisierung (2FA) für dein Konto wurde deaktiviert. Eine Anmeldung ist jetzt nur noch mit E-Mail-Adresse und Passwort möglich.
+ explanation: Das Anmelden ist jetzt nur noch mit einer E-Mail-Adresse und einem Passwort möglich.
subject: 'Mastodon: Zwei‐Faktor‐Authentisierung (2FA) deaktiviert'
+ subtitle: Zwei-Faktor-Authentisierung wurde für dein Konto deaktiviert.
title: 2FA deaktiviert
two_factor_enabled:
- explanation: Die Zwei-Faktor-Authentisierung (2FA) wurde für dein Konto aktiviert. Das zeitbasierte Einmalpasswort, das von deiner TOTP-App generiert wird, muss bei jeder Anmeldung zusätzlich eingegeben werden.
+ explanation: Für das Anmelden wird ein Token benötigt, das von der hinterlegten TOTP-App generiert wird.
subject: 'Mastodon: Zwei‐Faktor‐Authentisierung (2FA) aktiviert'
+ subtitle: Zwei-Faktor-Authentisierung wurde für dein Konto aktiviert.
title: 2FA aktiviert
two_factor_recovery_codes_changed:
explanation: Die vorherigen Wiederherstellungscodes wurden ungültig gemacht und es wurden neue erstellt.
subject: 'Mastodon: Zwei-Faktor-Wiederherstellungscodes neu erstellt'
+ subtitle: Die vorherigen Wiederherstellungscodes wurden ungültig gemacht und es wurden neue erstellt.
title: 2FA-Wiederherstellungscodes geändert
unlock_instructions:
subject: 'Mastodon: Anleitung zum Entsperren deines Kontos'
@@ -70,11 +73,13 @@ de:
subject: 'Mastodon: Sicherheitsschlüssel entfernt'
title: Einer deiner Sicherheitsschlüssel wurde entfernt
webauthn_disabled:
- explanation: Das Authentisieren mit Sicherheitsschlüsseln wurde für dein Konto deaktiviert. Die Anmeldung ist jetzt nur noch mit dem zeitbasierten Einmalpasswort möglich, das von deiner TOTP-App generiert wird.
+ explanation: Die Authentisierung mit Sicherheitsschlüsseln wurde für dein Konto deaktiviert.
+ extra: Das Anmelden ist jetzt nur noch mit Token aus der TOTP-App möglich, die im Konto hinterlegt wurde.
subject: 'Mastodon: Authentisierung mit Sicherheitsschlüsseln deaktiviert'
title: Sicherheitsschlüssel deaktiviert
webauthn_enabled:
- explanation: Die Authentisierung mit Sicherheitsschlüssel wurde für dein Konto aktiviert. Dein Sicherheitsschlüssel kann nun für die Anmeldung verwendet werden.
+ explanation: Die Authentisierung mit Sicherheitsschlüsseln wurde für dein Konto aktiviert.
+ extra: Dein Sicherheitsschlüssel kann jetzt zum Anmelden verwendet werden.
subject: 'Mastodon: Authentisierung mit Sicherheitsschlüssel aktiviert'
title: Sicherheitsschlüssel aktiviert
omniauth_callbacks:
diff --git a/config/locales/devise.el.yml b/config/locales/devise.el.yml
index 13daa4b97a..52674dc849 100644
--- a/config/locales/devise.el.yml
+++ b/config/locales/devise.el.yml
@@ -47,16 +47,19 @@ el:
subject: 'Mastodon: Οδηγίες επαναφοράς συνθηματικού'
title: Επαναφορά συνθηματικού
two_factor_disabled:
- explanation: Η επαλήθευση 2 βημάτων (2FA) έχει απενεργοποιηθεί για το λογαριασμό σου. Η σύνδεση γίνεται απλά με το email και το συνθηματικό.
+ explanation: Η σύνδεση είναι τώρα δυνατή χρησιμοποιώντας μόνο τη διεύθυνση ηλεκτρονικού ταχυδρομείου και τον κωδικό πρόσβασης.
subject: 'Mastodon: Απενεργοποιήθηκε η επαλήθευση 2 βημάτων (2FA)'
+ subtitle: Ο έλεγχος ταυτότητας δύο παραγόντων για τον λογαριασμό σας έχει απενεργοποιηθεί.
title: Επαλήθευση 2 βημάτων ανενεργή (2FA)
two_factor_enabled:
- explanation: Έχει ενεργοποιηθεί η πιστοποίηση 2 παραγόντων για το λογαριασμό σου (2FA). Για να συνδεθείς θα απαιτηθεί πιστοποιημένο τεκμήριο από κάποια ζευγαρωμένη εφαρμογή.
+ explanation: Ένα διακριτικό που δημιουργείται από τη συνδεδεμένη εφαρμογή TOTP θα απαιτείται για τη σύνδεση.
subject: 'Mastodon: Ενεργοποιήθηκε η επαλήθευση 2 βημάτων (2FA)'
+ subtitle: Ο έλεγχος ταυτότητας δύο παραγόντων έχει ενεργοποιηθεί για τον λογαριασμό σας.
title: Επαλήθευση 2 βημάτων ενεργή (2FA)
two_factor_recovery_codes_changed:
explanation: Οι προηγούμενοι κωδικοί ανάκτησης ακυρώθηκαν και δημιουργήθηκαν νέοι.
subject: 'Mastodon: Δημιουργήθηκαν νέοι κωδικοί ανάκτησης'
+ subtitle: Οι προηγούμενοι κωδικοί ανάκτησης ακυρώθηκαν και δημιουργήθηκαν νέοι.
title: Οι κωδικοί ανάκτησης επαλήθευσης 2 βημάτων (2FA) άλλαξαν
unlock_instructions:
subject: 'Mastodon: Οδηγίες ξεκλειδώματος'
@@ -70,11 +73,13 @@ el:
subject: 'Mastodon: Διαγράφηκε ένα κλειδί ασφαλείας'
title: Ένα από τα κλειδιά ασφαλείας σου διαγράφηκε
webauthn_disabled:
- explanation: Η επαλήθευση με κλειδί ασφαλείας έχει απενεργοποιηθεί για τον λογαριασμό σας. Η σύνδεση είναι τώρα εφικτή μόνο με τη χρήση κλειδιού που δημιουργημένου με την συνδεδεμένη εφαρμογή TOTP.
+ explanation: Ο έλεγχος ταυτότητας με κλειδιά ασφαλείας έχει απενεργοποιηθεί για τον λογαριασμό σας.
+ extra: Η σύνδεση είναι πλέον δυνατή χρησιμοποιώντας μόνο το διακριτικό που δημιουργείται από την εφαρμογή TOTP.
subject: 'Mastodon: Η αυθεντικοποίηση με χρήση κλειδιών ασφαλείας απενεργοποιήθηκε'
title: Τα κλειδιά ασφαλείας απενεργοποιήθηκαν
webauthn_enabled:
- explanation: Η επαλήθευση με κλειδί ασφαλείας έχει ενεργοποιηθεί για τον λογαριασμό σας. Μπορείτε να το χρησιμοποιήσετε για να συνδεθείτε.
+ explanation: Ο έλεγχος ταυτότητας κλειδιού ασφαλείας έχει ενεργοποιηθεί για τον λογαριασμό σας.
+ extra: Το κλειδί ασφαλείας σας μπορεί τώρα να χρησιμοποιηθεί για τη σύνδεση.
subject: 'Mastodon: Ενεργοποιήθηκε η επαλήθευση με κλειδί ασφαλείας'
title: Τα κλειδιά ασφαλείας ενεργοποιήθηκαν
omniauth_callbacks:
diff --git a/config/locales/devise.en-GB.yml b/config/locales/devise.en-GB.yml
index e7ab9462dc..8fa02bbd4a 100644
--- a/config/locales/devise.en-GB.yml
+++ b/config/locales/devise.en-GB.yml
@@ -47,11 +47,9 @@ en-GB:
subject: 'Mastodon: Reset password instructions'
title: Password reset
two_factor_disabled:
- explanation: Two-factor authentication for your account has been disabled. Login is now possible using only e-mail address and password.
subject: 'Mastodon: Two-factor authentication disabled'
title: 2FA disabled
two_factor_enabled:
- explanation: Two-factor authentication has been enabled for your account. A token generated by the paired TOTP app will be required for login.
subject: 'Mastodon: Two-factor authentication enabled'
title: 2FA enabled
two_factor_recovery_codes_changed:
@@ -70,11 +68,9 @@ en-GB:
subject: 'Mastodon: Security key deleted'
title: One of your security keys has been deleted
webauthn_disabled:
- explanation: Authentication with security keys has been disabled for your account. Login is now possible using only the token generated by the paired TOTP app.
subject: 'Mastodon: Authentication with security keys disabled'
title: Security keys disabled
webauthn_enabled:
- explanation: Security key authentication has been enabled for your account. Your security key can now be used for login.
subject: 'Mastodon: Security key authentication enabled'
title: Security keys enabled
omniauth_callbacks:
diff --git a/config/locales/devise.eo.yml b/config/locales/devise.eo.yml
index 1c13490e53..af1769aa66 100644
--- a/config/locales/devise.eo.yml
+++ b/config/locales/devise.eo.yml
@@ -47,11 +47,9 @@ eo:
subject: 'Mastodon: Instrukcioj por ŝanĝi pasvorton'
title: Pasvorto restarigita
two_factor_disabled:
- explanation: Dufaktora aŭtentigo por via konto malebligis. Ensalutado nun eblas per nur retpoŝtadreso kaj pasvorto.
subject: 'Mastodon: dufaktora aŭtentigo malebligita'
title: 2FA estas malŝaltita
two_factor_enabled:
- explanation: Dufaktora aŭtentigo sukcese ebligita por via akonto. Vi bezonos ĵetonon kreitan per parigitan aplikaĵon por ensaluti.
subject: 'Mastodon: Dufaktora aŭtentigo ebligita'
title: 2FA aktivigita
two_factor_recovery_codes_changed:
@@ -70,11 +68,9 @@ eo:
subject: 'Mastodon: sekureca ŝlosilo forigita'
title: Unu el viaj sekurecaj ŝlosiloj estis forigita
webauthn_disabled:
- explanation: Aŭtentikigo per sekurecaj ŝlosiloj estis malebligita por via konto. Ensaluto nun eblas per nur la signo generita de la parigita TOTP-programo.
subject: 'Mastodon: sekureca-ŝlosila aŭtentigo malebligita'
title: Sekurecaj ŝlosiloj malaktivigitaj
webauthn_enabled:
- explanation: Sekureca ŝlosila aŭtentokontrolo estis ebligita por via konto. Via sekureca ŝlosilo nun uzeblas por ensaluti.
subject: 'Mastodon: sekureca-ŝlosila aŭtentigo ebligita'
title: Sekurecaj ŝlosiloj aktivigitaj
omniauth_callbacks:
diff --git a/config/locales/devise.es-AR.yml b/config/locales/devise.es-AR.yml
index d9c922ed86..ca60ee5deb 100644
--- a/config/locales/devise.es-AR.yml
+++ b/config/locales/devise.es-AR.yml
@@ -47,16 +47,19 @@ es-AR:
subject: 'Mastodon: instrucciones para cambiar la contraseña'
title: Cambiar contraseña
two_factor_disabled:
- explanation: La autenticación de dos factores para tu cuenta está deshabilitada. Ahora el inicio de sesión sólo es posible usando la dirección de correo electrónico y la contraseña.
+ explanation: Ahora es posible iniciar sesión utilizando sólo la dirección de correo electrónico y la contraseña.
subject: 'Mastodon: autenticación de dos factores, deshabilitada'
+ subtitle: Se deshabilitó la autenticación de dos factores para tu cuenta.
title: 2FA deshabilitada
two_factor_enabled:
- explanation: La autenticación de dos factores para tu cuenta está habilitada. Se requiere una clave generada por la aplicación TOTP asociada para iniciar sesión.
+ explanation: Para iniciar sesión, se requerirá una clave numérica ("token") generada por la aplicación TOTP emparejada.
subject: 'Mastodon: autenticación de dos factores, habilitada'
+ subtitle: Se habilitó la autenticación de dos factores para tu cuenta.
title: 2FA habilitada
two_factor_recovery_codes_changed:
explanation: Los códigos anteriores de recuperación fueron invalidados y se generaron unos nuevos.
subject: 'Mastodon: códigos de recuperación de dos factores, regenerados'
+ subtitle: Los códigos de recuperación anteriores ya no son válidos y se generaron códigos nuevos.
title: Códigos de recuperación 2FA cambiados
unlock_instructions:
subject: 'Mastodon: instrucciones de desbloqueo'
@@ -70,11 +73,13 @@ es-AR:
subject: 'Mastodon: llave de seguridad eliminada'
title: Se eliminó una de tus llaves de seguridad
webauthn_disabled:
- explanation: Se deshabilitó la autenticación con llaves de seguridad en tu cuenta. El inicio de sesión ahora es posible usando sólo la clave generada por la aplicación TOTP asociada.
+ explanation: Se deshabilitó la autenticación con claves de seguridad para tu cuenta.
+ extra: Ahora es posible iniciar sesión utilizando sólo la clave numérica ("token") generada por la aplicación TOTP emparejada.
subject: 'Mastodon: autenticación con llaves de seguridad, deshabilitada'
title: Llaves de seguridad deshabilitadas
webauthn_enabled:
- explanation: Se habilitó la autenticación de llave de seguridad en tu cuenta. Ahora tu llave de seguridad se puede usar para iniciar sesión.
+ explanation: Se habilitó la autenticación con llave de seguridad para tu cuenta.
+ extra: Ahora es posible iniciar sesión utilizando tu llave de seguridad.
subject: 'Mastodon: autenticación con llaves de seguridad, habilitada'
title: Llaves de seguridad habilitadas
omniauth_callbacks:
diff --git a/config/locales/devise.es-MX.yml b/config/locales/devise.es-MX.yml
index 83b425d441..c4a7f319af 100644
--- a/config/locales/devise.es-MX.yml
+++ b/config/locales/devise.es-MX.yml
@@ -47,16 +47,19 @@ es-MX:
subject: 'Mastodon: Instrucciones para reiniciar contraseña'
title: Reiniciar contraseña
two_factor_disabled:
- explanation: La autenticación de dos factores para tu cuenta ha sido deshabilitada. Ahora puedes conectarte solamente usando la dirección de correo electrónico y la contraseña.
+ explanation: Ahora es posible iniciar sesión utilizando solamente la dirección de correo electrónico y la contraseña.
subject: 'Mastodon: La autenticación de dos factores está deshabilitada'
+ subtitle: La autenticación de doble factor para tu cuenta ha sido deshabilitada.
title: 2FA desactivada
two_factor_enabled:
- explanation: La autenticación de dos factores para tu cuenta ha sido habilitada. Se requiere un token generado por la aplicación TOTP emparejada para ingresar.
+ explanation: Se requerirá un token generado por la aplicación TOTP emparejada para iniciar sesión.
subject: 'Mastodon: La autenticación de dos factores está habilitada'
+ subtitle: La autenticación de doble factor ha sido habilitada para tu cuenta.
title: 2FA activada
two_factor_recovery_codes_changed:
explanation: Los códigos de recuperación previos han sido invalidados y se generaron códigos nuevos.
subject: 'Mastodon: Los códigos de recuperación de dos factores fueron regenerados'
+ subtitle: Los códigos de recuperación anteriores han sido invalidados y se han generado códigos nuevos.
title: Códigos de recuperación 2FA cambiados
unlock_instructions:
subject: 'Mastodon: Instrucciones para desbloquear'
@@ -70,11 +73,13 @@ es-MX:
subject: 'Mastodon: Clave de seguridad eliminada'
title: Una de sus claves de seguridad ha sido eliminada
webauthn_disabled:
- explanation: La autenticación con claves de seguridad ha sido desactivada para tu cuenta. El inicio de sesión es ahora posible únicamente utilizando el token generado por la aplicación emparejada TOTP.
+ explanation: La autenticación con claves de seguridad ha sido desactivada para tu cuenta.
+ extra: Ahora es posible iniciar sesión utilizando únicamente el token generado por la aplicación TOTP emparejada.
subject: 'Mastodon: Autenticación con claves de seguridad desactivada'
title: Claves de seguridad desactivadas
webauthn_enabled:
- explanation: La autenticación con clave de seguridad ha sido habilitada para su cuenta. Su clave de seguridad ahora puede ser usada para iniciar sesión.
+ explanation: La autenticación con clave de seguridad ha sido habilitada para tu cuenta.
+ extra: Tu clave de seguridad ahora puede usarse para iniciar sesión.
subject: 'Mastodon: Autenticación con clave de seguridad activada'
title: Claves de seguridad activadas
omniauth_callbacks:
diff --git a/config/locales/devise.es.yml b/config/locales/devise.es.yml
index ef6a70ee4f..642871710d 100644
--- a/config/locales/devise.es.yml
+++ b/config/locales/devise.es.yml
@@ -47,16 +47,19 @@ es:
subject: 'Mastodon: Instrucciones para reiniciar contraseña'
title: Reiniciar contraseña
two_factor_disabled:
- explanation: La autenticación de dos factores para tu cuenta ha sido deshabilitada. Ahora puedes conectarte solamente usando la dirección de correo electrónico y la contraseña.
+ explanation: Ahora es posible iniciar sesión utilizando únicamente la dirección de correo electrónico y la contraseña.
subject: 'Mastodon: La autenticación de dos factores está deshabilitada'
+ subtitle: La autenticación de doble factor para tu cuenta ha sido deshabilitada.
title: 2FA desactivada
two_factor_enabled:
- explanation: La autenticación de dos factores para tu cuenta ha sido habilitada. Se requiere un token generado por la aplicación TOTP emparejada para ingresar.
+ explanation: Se requerirá un token generado por la aplicación TOTP emparejada para iniciar sesión.
subject: 'Mastodon: La autenticación de dos factores está habilitada'
+ subtitle: La autenticación de doble factor ha sido habilitada para tu cuenta.
title: 2FA activada
two_factor_recovery_codes_changed:
explanation: Los códigos de recuperación previos han sido invalidados y se generaron códigos nuevos.
subject: 'Mastodon: Los códigos de recuperación de dos factores fueron regenerados'
+ subtitle: Los códigos de recuperación anteriores han sido invalidados y se han generado códigos nuevos.
title: Códigos de recuperación 2FA cambiados
unlock_instructions:
subject: 'Mastodon: Instrucciones para desbloquear'
@@ -70,11 +73,13 @@ es:
subject: 'Mastodon: Clave de seguridad eliminada'
title: Una de tus claves de seguridad ha sido eliminada
webauthn_disabled:
- explanation: La autenticación con claves de seguridad ha sido deshabilitada para tu cuenta. Ahora el inicio de sesión solo es posible utilizando el token generado por la aplicación TOTP emparejada.
+ explanation: La autenticación con claves de seguridad ha sido desactivada para tu cuenta.
+ extra: Ahora es posible iniciar sesión utilizando únicamente el token generado por la aplicación TOTP emparejada.
subject: 'Mastodon: Autenticación con claves de seguridad deshabilitada'
title: Claves de seguridad deshabilitadas
webauthn_enabled:
- explanation: La autenticación con clave de seguridad ha sido habilitada para tu cuenta. Ahora tu clave de seguridad puede ser utilizada para iniciar sesión.
+ explanation: La autenticación con clave de seguridad ha sido habilitada para tu cuenta.
+ extra: Tu clave de seguridad ahora puede usarse para iniciar sesión.
subject: 'Mastodon: Autenticación de clave de seguridad habilitada'
title: Claves de seguridad habilitadas
omniauth_callbacks:
diff --git a/config/locales/devise.et.yml b/config/locales/devise.et.yml
index da1cc989d2..3e749f9a0b 100644
--- a/config/locales/devise.et.yml
+++ b/config/locales/devise.et.yml
@@ -47,16 +47,19 @@ et:
subject: 'Mastodon: salasõna lähtestamisjuhendid'
title: Salasõna lähtestamine
two_factor_disabled:
- explanation: Kontol on kaheastmeline autentimine välja lülitatud. Sisenemine on võimalik ainult kasutades e-postiaadressi ja salasõna.
+ explanation: Sisselogimine on nüüd võimalik vaid e-postiaadressi ja salasõnaga.
subject: 'Mastodon: Kaheastmeline autentimine välja lülitatud'
+ subtitle: Kaheastmeline autoriseerimine on sinu konto jaoks nüüd välja lülitatud.
title: 2FA keelatud
two_factor_enabled:
- explanation: Kontol on sisse lülitatud kaheastmeline autentimine. Sisenemiseks on vajalik ühekordne aeguv võti TOTP-rakenduse poolt.
+ explanation: Sisenemiseks on vaja seotud kaheastmelise autoriseerimise äpi genereeritud võtit.
subject: 'Mastodon: kaheastmeline autentimine sisse lülitatud'
+ subtitle: Sinu konto jaoks on kaheastmeline autoriseerimine sisse lülitatud.
title: 2FA lubatud
two_factor_recovery_codes_changed:
explanation: Eelmised taastekoodid on nüüd kehtetud ning loodud uued.
subject: 'Mastodon: Kaheastmelise autentimise taastuskoodid taasloodud'
+ subtitle: Eelmised taastekoodid on tühistatud ja uued genereeritud.
title: 2FA taastekoodid muudetud
unlock_instructions:
subject: 'Mastodon: Lahti lukustamis juhendid'
@@ -70,11 +73,13 @@ et:
subject: 'Mastodon: turvavõti kustutatud'
title: Üks sinu turvavõtmetest on kustutatud
webauthn_disabled:
- explanation: Autentimine turvavõtmetega on kontol välja lülitatud. Sisse logimine on nüüd võimalik ainult kasutades seotud TOTP rakenduse poolt genereeritud võtit.
+ explanation: Turvavõtmega autoriseerimine on sinu konto jaoks välja lülitatud.
+ extra: Sisenemine on nüüd võimalik vaid seotud kaheastmelise autoriseerimise äpi genereeritud võtmega.
subject: 'Mastodon: autentimine turvavõtmega on välja lülitatud'
title: Turvavõtmed on välja lülitatud
webauthn_enabled:
- explanation: Turvavõtmega autentimine on nüüd kontol sisse lülitatud. Nüüd saab kasutada sisse logimiseks sinu turvavõtit.
+ explanation: Turvavõtmega autoriseerimine on sinu konto jaoks nüüd sisse lülitatud.
+ extra: Nüüd saab sisselogimiseks kasutada sinu turvavõtit.
subject: 'Mastodon: turvavõtme autentimine sisse lülitatud'
title: Turvavõtmed on sisse lülitatud
omniauth_callbacks:
diff --git a/config/locales/devise.eu.yml b/config/locales/devise.eu.yml
index eb23e06d4a..624f9ee93d 100644
--- a/config/locales/devise.eu.yml
+++ b/config/locales/devise.eu.yml
@@ -47,16 +47,19 @@ eu:
subject: 'Mastodon: Pasahitza berrezartzeko argibideak'
title: Pasahitza berrezartzea
two_factor_disabled:
- explanation: Bi faktoreetako autentifikazioa desgaitu da zure kontuan. Orain saioa hasi daiteke e-mail helbidea eta pasahitza bakarrik erabilita.
+ explanation: Orain posible da helbide elektronikoa eta pasahitza erabiliz saioa hastea.
subject: 'Mastodon: Bi faktoreetako autentifikazioa desgaituta'
+ subtitle: Kontuaren bi faktoreko autentifikazioa desgaitu da.
title: 2FA desgaituta
two_factor_enabled:
- explanation: Bi faktoreetako autentifikazioa gaitu da zure kontuan. Token bat sortu du lotutako TOTP aplikazioak eta saioa hasteko eskatuko da.
+ explanation: Parekatutako TOTP aplikazioak sortutako tokena beharko da saioa hasteko.
subject: 'Mastodon: Bi faktoreetako autentifikazioa gaituta'
+ subtitle: Kontuaren bi faktoreko autentifikazioa gaitu da.
title: 2FA gaituta
two_factor_recovery_codes_changed:
explanation: Aurreko kodeak baliogabetu dira eta berriak sortu dira.
subject: 'Mastodon: Bi faktoreetako berreskuratze kodeak birsortuta'
+ subtitle: Aurreko berreskuratze-kodeak baliogabetu eta berriak sortu dira.
title: 2FA berreskuratze kodeak aldatuta
unlock_instructions:
subject: 'Mastodon: Desblokeatzeko argibideak'
@@ -70,11 +73,13 @@ eu:
subject: 'Mastodon: Segurtasun gakoa ezabatu da'
title: Zure segurtasun gakoetako bat ezabatu da
webauthn_disabled:
- explanation: Segurtasun gako bidezko autentifikazioa desgaitu da zure kontuan. Saioa hasteko modu bakarra parekatutako TOTP aplikazioak sortutako tokena erabiltzea da orain.
+ explanation: Kontuaren segurtasun-gako bidezko autentifikazioa desgaitu da.
+ extra: Parekatutako TOTP aplikazioak sortutako tokena erabiliz bakarrik has daiteke saioa orain.
subject: 'Mastodon: Segurtasun gakoekin autentifikatzea desgaituta'
title: Segurtasun gakoak desgaituta
webauthn_enabled:
- explanation: Segurtasun gako bidezko autentifikazioa gaitu da zure kontuan. Orain zure segurtasun gakoa erabil dezakezu saioa hasteko.
+ explanation: Kontuaren segurtasun-gako bidezko autentifikazioa gaitu da.
+ extra: Orain, segurtasun-gakoa erabil daiteke saioa hasteko.
subject: 'Mastodon: Segurtasun gako bidezko autentifikazioa gaituta'
title: Segurtasun gakoak gaituta
omniauth_callbacks:
diff --git a/config/locales/devise.fa.yml b/config/locales/devise.fa.yml
index 07db5395da..d4198626d4 100644
--- a/config/locales/devise.fa.yml
+++ b/config/locales/devise.fa.yml
@@ -47,11 +47,9 @@ fa:
subject: 'ماستودون: راهنمایی برای بازنشانی گذرواژه'
title: بازنشانی گذرواژه
two_factor_disabled:
- explanation: ورود دومرحلهای برای حساب شما غیرفعال شده است. از الان میتوانید تنها با نشانی ایمیل و گذرواژه وارد حساب خود شوید.
subject: 'ماستودون: تأیید هویت دو مرحلهای از کار افتاد'
title: ورود دومرحلهای غیرفعال
two_factor_enabled:
- explanation: ورود دومرحلهای برای حساب شما فعال شده است. برای ورود به کدی نیاز خواهید داشت که نرمافزار TOTP از پیش تنظیم شده برایتان میسازد.
subject: 'ماستودون: تأیید هویت دومرحلهای به کار افتاد'
title: ورود دومرحلهای فعال
two_factor_recovery_codes_changed:
@@ -70,11 +68,9 @@ fa:
subject: 'ماستودون: کلید امنیتی حذف شد'
title: یکی از کلیدهای امنیتیتان حذف شد
webauthn_disabled:
- explanation: تأیید هویت با کلیدهای امنیتی برای حسابتان از کار افتاده است. ورود اکنون فقط با ژتون ایجاد شده با کارهٔ TOTP جفتشده امکانپذیر است.
subject: 'ماستودون: تأیید هویت با کلیدهای امنیتی از کار افتاد'
title: کلیدهای امنیتی از کار افتادند
webauthn_enabled:
- explanation: تأیید هویت با کلید امنیتی برای حسابتان به کار افتاده است. اکنون کلید امنیتیتان میتواند برای ورود استفاده شود.
subject: 'ماستودون: تأیید هویت با کلید امنیتی به کار افتاد'
title: کلیدهای امنیتی به کار افتادند
omniauth_callbacks:
diff --git a/config/locales/devise.fi.yml b/config/locales/devise.fi.yml
index 7846ebd8c2..bedf8a56f6 100644
--- a/config/locales/devise.fi.yml
+++ b/config/locales/devise.fi.yml
@@ -47,11 +47,9 @@ fi:
subject: 'Mastodon: ohjeet salasanan vaihtoon'
title: Salasanan vaihto
two_factor_disabled:
- explanation: Tilisi kaksivaiheinen todennus poistettiin käytöstä. Kirjautuminen onnistuu nyt pelkällä sähköpostiosoitella ja salasanalla.
subject: 'Mastodon: kaksivaiheinen todennus poistettu käytöstä'
title: 2-vaiheinen todennus pois käytöstä
two_factor_enabled:
- explanation: Kaksivaiheinen todennus on otettu käyttöön tilillesi. Kirjautumiseen tarvitaan kaksivaiheisen todennuksen sovelluksesta saatu koodi.
subject: 'Mastodon: kaksivaiheinen todennus otettu käyttöön'
title: 2-vaiheinen todennus käytössä
two_factor_recovery_codes_changed:
@@ -70,11 +68,9 @@ fi:
subject: 'Mastodon: suojausavain poistettu'
title: Yksi suojausavaimistasi on poistettu
webauthn_disabled:
- explanation: Suojausavaimilla todennus on poistettu käytöstä tililtäsi. Kirjautuminen on nyt mahdollista vain paritetun TOTP-sovelluksen luomaa koodia käyttämällä.
subject: 'Mastodon: Todennus suojausavaimilla poistettu käytöstä'
title: Suojausavaimet poistettu käytöstä
webauthn_enabled:
- explanation: Todennus suojausavaimella on otettu käyttöön tilillesi. Suojausavaintasi voidaan nyt käyttää kirjautumiseen.
subject: 'Mastodon: Todennus suojausavaimella on otettu käyttöön'
title: Suojausavaimet käytössä
omniauth_callbacks:
diff --git a/config/locales/devise.fo.yml b/config/locales/devise.fo.yml
index 35fa0954f4..1f7708bb44 100644
--- a/config/locales/devise.fo.yml
+++ b/config/locales/devise.fo.yml
@@ -47,16 +47,19 @@ fo:
subject: 'Mastodon: Vegleiðing at skifta loyniorð'
title: Skift loyniorð
two_factor_disabled:
- explanation: Tvey-faktor samgildi (2FA) fyri tína kontu er gjørt óvirkið. Nú er møguligt at rita inn við einans at nýta teldupost og loyniorð.
+ explanation: Innritan er nú møgulig við einans at brúka teldupost og loyniorð.
subject: 'Mastodon: Váttan í tveimum stigum er gjørd óvirkin'
+ subtitle: Váttan í tveimum stigum (2FA) er gjørd óvirkin fyri tína kontu.
title: 2FA óvirkið
two_factor_enabled:
- explanation: Váttan í tveimum stigum er gjørd virkin fyri tína kontu. Eitt merki framleitt av paraðu TOTP appini verður framyvir kravt fyri at rita inn.
+ explanation: Eitt tekin, sum er gjørt við eini paraðari TOTP app, verður kravt fyri at rita inn.
subject: 'Mastodon: Váttan í tveimum stigum er virkin'
+ subtitle: Váttan í tveimum stigum (2FA) er gjørd virkin fyri tína kontu.
title: 2FA virkið
two_factor_recovery_codes_changed:
explanation: Undanfarnu endurskapanarkodurnar eru ógildaðar og nýggjar eru framleiddar.
subject: 'Mastodon: Endurskapanarkodurnar til váttan í tveimum stigum eru framleiddar umaftur'
+ subtitle: Undanfarnu kodur til endurgerð eru nú óvirknar og nýggjar eru gjørdar.
title: 2FA endurskapanarkodur eru broyttar
unlock_instructions:
subject: 'Mastodon: Vegleiðing í at læsa upp'
@@ -70,11 +73,13 @@ fo:
subject: 'Mastodon: Trygdarlykilin strikaður'
title: Ein av trygdarlyklunum hjá tær er strikaður
webauthn_disabled:
- explanation: Váttan við trygdarlyklum er gjørd óvirkin fyri tína kontu. Nú ber til at rita inn einans við teknum, sum eru framleidd av paraðu TOTP appini.
+ explanation: Samgildi við trygdarlyklum er gjørt óvirkið fyri tína kontu.
+ extra: Innritan er nú møgulig við einans at brúka teknið, sum er gjørt við paraðu TOTP appini.
subject: 'Mastodon: Váttan við trygdarlyklum er gjørd óvirkin'
title: Trygdarlyklar óvirknir
webauthn_enabled:
- explanation: Váttan við trygdarlyklum er gjørd virkin á tínari kontu. Nú kann tín trygdarlykil nýtast at rita inn við.
+ explanation: Trygdarlyklasamgildi er gjørt virkið fyri tína kontu.
+ extra: Trygdarlyklarnir hjá tær kunnu nú brúkast til innritan.
subject: 'Mastodon: Váttan við trygdarlykli gjørd virkin'
title: Trygdarlyklar gjørdir virknir
omniauth_callbacks:
diff --git a/config/locales/devise.fr-CA.yml b/config/locales/devise.fr-CA.yml
index e9f09a6980..34104e0ac5 100644
--- a/config/locales/devise.fr-CA.yml
+++ b/config/locales/devise.fr-CA.yml
@@ -47,16 +47,19 @@ fr-CA:
subject: 'Mastodon: Instructions pour changer votre mot de passe'
title: Réinitialisation du mot de passe
two_factor_disabled:
- explanation: L'authentification à deux facteurs pour votre compte a été désactivée. La connexion est maintenant possible en utilisant uniquement l'adresse courriel et le mot de passe.
+ explanation: La connexion est maintenant possible en n'utilisant uniquement l'adresse e-mail et le mot de passe.
subject: 'Mastodon: authentification à deux facteurs désactivée'
+ subtitle: L'authentification à deux facteurs pour votre compte a été désactivée.
title: A2F désactivée
two_factor_enabled:
- explanation: L'authentification à deux facteurs a été activée pour votre compte. Un jeton généré par l'application appairée TOTP sera nécessaire pour vous connecter.
+ explanation: Un jeton généré par l'application appairée TOTP sera nécessaire pour vous connecter.
subject: 'Mastodon: authentification à deux facteurs activée'
+ subtitle: L'authentification à deux facteurs est maintenant activée pour votre compte.
title: A2F activée
two_factor_recovery_codes_changed:
explanation: Les codes de récupération précédents ont été invalidés et de nouveaux ont été générés.
subject: 'Mastodon: codes de récupération à deux facteurs régénérés'
+ subtitle: Les codes de récupération précédents ont été invalidés et de nouveaux codes ont été générés.
title: Codes de récupération A2F modifiés
unlock_instructions:
subject: 'Mastodon: Instructions pour déverrouiller votre compte'
@@ -70,11 +73,9 @@ fr-CA:
subject: 'Mastodon: Clé de sécurité supprimée'
title: Une de vos clés de sécurité a été supprimée
webauthn_disabled:
- explanation: L'authentification avec les clés de sécurité a été désactivée pour votre compte. La connexion est maintenant possible en utilisant uniquement le jeton généré par l'application TOTP appairée.
subject: 'Mastodon: Authentification avec clés de sécurité désactivée'
title: Clés de sécurité désactivées
webauthn_enabled:
- explanation: L'authentification par clé de sécurité a été activée pour votre compte. Votre clé de sécurité peut maintenant être utilisée pour vous connecter.
subject: 'Mastodon: Authentification de la clé de sécurité activée'
title: Clés de sécurité activées
omniauth_callbacks:
diff --git a/config/locales/devise.fr.yml b/config/locales/devise.fr.yml
index 8eb744d94c..1fc6663bfe 100644
--- a/config/locales/devise.fr.yml
+++ b/config/locales/devise.fr.yml
@@ -47,16 +47,19 @@ fr:
subject: 'Mastodon : Instructions pour changer votre mot de passe'
title: Réinitialisation du mot de passe
two_factor_disabled:
- explanation: L'authentification à deux facteurs pour votre compte a été désactivée. La connexion est maintenant possible en utilisant uniquement l'adresse courriel et le mot de passe.
+ explanation: La connexion est maintenant possible en n'utilisant uniquement l'adresse e-mail et le mot de passe.
subject: 'Mastodon : authentification à deux facteurs désactivée'
+ subtitle: L'authentification à deux facteurs pour votre compte a été désactivée.
title: 2FA désactivée
two_factor_enabled:
- explanation: L'authentification à deux facteurs a été activée pour votre compte. Un jeton généré par l'application appairée TOTP sera nécessaire pour vous connecter.
+ explanation: Un jeton généré par l'application appairée TOTP sera nécessaire pour vous connecter.
subject: 'Mastodon : authentification à deux facteurs activée'
+ subtitle: L'authentification à deux facteurs est maintenant activée pour votre compte.
title: A2F activée
two_factor_recovery_codes_changed:
explanation: Les codes de récupération précédents ont été invalidés et de nouveaux ont été générés.
subject: 'Mastodon : codes de récupération à deux facteurs régénérés'
+ subtitle: Les codes de récupération précédents ont été invalidés et de nouveaux codes ont été générés.
title: Codes de récupération A2F modifiés
unlock_instructions:
subject: 'Mastodon : Instructions pour déverrouiller votre compte'
@@ -70,11 +73,9 @@ fr:
subject: 'Mastodon: Clé de sécurité supprimée'
title: Une de vos clés de sécurité a été supprimée
webauthn_disabled:
- explanation: L'authentification avec les clés de sécurité a été désactivée pour votre compte. La connexion est maintenant possible en utilisant uniquement le jeton généré par l'application TOTP appairée.
subject: 'Mastodon: Authentification avec clés de sécurité désactivée'
title: Clés de sécurité désactivées
webauthn_enabled:
- explanation: L'authentification par clé de sécurité a été activée pour votre compte. Votre clé de sécurité peut maintenant être utilisée pour vous connecter.
subject: 'Mastodon: Authentification de la clé de sécurité activée'
title: Clés de sécurité activées
omniauth_callbacks:
diff --git a/config/locales/devise.fy.yml b/config/locales/devise.fy.yml
index 910d2d3094..05fd7b8071 100644
--- a/config/locales/devise.fy.yml
+++ b/config/locales/devise.fy.yml
@@ -49,16 +49,19 @@ fy:
subject: 'Mastodon: Wachtwurd opnij ynstelle'
title: Wachtwurd opnij ynstelle
two_factor_disabled:
- explanation: Twa-stapsferifikaasje foar jo account is útskeakele. Jo kinne no allinnich oanmelde mei in e-mailadres en wachtwurd.
+ explanation: Jo kinne no oanmelde mei allinnich in e-mailadres en wachtwurd.
subject: 'Mastodon: Twa-stapsferifikaasje útskeakele'
+ subtitle: Twastapsferifikaasje foar jo account is útskeakele.
title: Twa-stapsferifikaasje útskeakele
two_factor_enabled:
- explanation: Twa-stapsferifikaasje foar jo account is ynskeakele. Om oanmelde te kinnen is in troch in twa-stapsferifikaasje-app generearre tagongskoade nedich.
+ explanation: Jo hawwe in troch de autentikaasje-app genearre tagongskoade nedich om oan te melden.
subject: 'Mastodon: Twa-stapsferifikaasje ynskeakele'
+ subtitle: Twastapsferifikaasje is foar jo account ynskeakele.
title: Twa-stapsferifikaasje ynskeakele
two_factor_recovery_codes_changed:
explanation: De foarige werstelkoaden binne ûnjildich makke en nije binne oanmakke.
subject: 'Mastodon: Twa-staps-werstelkoaden binne opnij oanmakke'
+ subtitle: De foarige werstelkoaden binne ûnjildich makke en nije binne oanmakke.
title: Werstelkoaden twa-stapsferifikaasje wizige
unlock_instructions:
subject: 'Mastodon: Ynstruksjes foar ûntskoatteljen'
@@ -72,11 +75,13 @@ fy:
subject: 'Mastodon: Befeiligingskaai fuortsmiten'
title: Ien fan jo befeiligingskaaien is fuortsmiten
webauthn_disabled:
- explanation: Ferifikaasje mei befeiligingskaaien is útskeakele foar jo account. Oanmelden is no allinnich mooglik mei it gebrûk fan in troch in keppele TOTP-app generearre kaai.
+ explanation: Ferifikaasje mei befeiligingskaaien is foar jo account útskeakele.
+ extra: It is no allinnich mooglik om oan te melden mei in troch de autentikaasje-app genearre tagongskoade.
subject: 'Mastodon: Ferifikaasje mei befeiligingskaaien is útskeakele'
title: Befeiligingskaaien útskeakele
webauthn_enabled:
- explanation: Ferifikaasje mei befeiligingskaaien is ynskeakele foar jo account. Jo befeiligingskaai kin no brûkt wurde om oan te melden.
+ explanation: Ferifikaasje mei befeiligingskaaien is foar jo account ynskeakele.
+ extra: Jo befeiligingskaai kin no brûkt wurde om oan te melden.
subject: 'Mastodon: Ferifikaasje mei befeiligingskaaien is ynskeakele'
title: Befeiligingskaaien ynskeakele
omniauth_callbacks:
diff --git a/config/locales/devise.gd.yml b/config/locales/devise.gd.yml
index c8a34054cf..1bf489cfbb 100644
--- a/config/locales/devise.gd.yml
+++ b/config/locales/devise.gd.yml
@@ -47,11 +47,9 @@ gd:
subject: 'Mastodon: Stiùireadh air ath-shuidheachadh an fhacail-fhaire'
title: Ath-shuidheachadh an fhacail-fhaire
two_factor_disabled:
- explanation: Chaidh an dearbhadh dà-cheumnach a chur à comas dhan chunntas agad. ’S urrainn dhut clàradh a-steach le seòladh puist-d is facal-faire a-mhàin a-nis.
subject: 'Mastodon: Tha an dearbhadh dà-cheumnach à comas'
title: Dearbhadh dà-cheumnach à comas
two_factor_enabled:
- explanation: Chaidh an dearbhadh dà-cheumnach a chur an comas dhan chunntas agad. Bidh feum air tòcan a ghineas an aplacaid TOTP a chaidh a phaidhreachadh airson clàradh a-steach.
subject: 'Mastodon: Tha an dearbhadh dà-cheumnach an comas'
title: Dearbhadh dà-cheumnach an comas
two_factor_recovery_codes_changed:
@@ -70,11 +68,9 @@ gd:
subject: 'Mastodon: Chaidh iuchair tèarainteachd a sguabadh às'
title: Chaidh tè dhe na h-iuchraichean tèarainteachd agad a sguabadh às
webauthn_disabled:
- explanation: Chaidh an dearbhadh le iuchraichean tèarainteachd a chur à comas dhan chunntas agad. ’S urrainn dhut clàradh a-steach leis an tòcan a ghineas an aplacaid TOTP paidhrichte a-mhàin a-nis.
subject: 'Mastodon: Tha dearbhadh le iuchraichean tèarainteachd à comas'
title: Chaidh na h-iuchraichean tèarainteachd a chur à comas
webauthn_enabled:
- explanation: Chaidh an dearbhadh le iuchair tèarainteachd a chur an comas dhan chunntas agad. ’S urrainn dhut an iuchair tèarainteachd agad a chleachdadh airson clàradh a-steach a-nis.
subject: 'Mastodon: Tha dearbhadh le iuchair tèarainteachd an comas'
title: Chaidh na h-iuchraichean tèarainteachd a chur an comas
omniauth_callbacks:
diff --git a/config/locales/devise.gl.yml b/config/locales/devise.gl.yml
index b392f4642c..b9f4a0a005 100644
--- a/config/locales/devise.gl.yml
+++ b/config/locales/devise.gl.yml
@@ -47,16 +47,19 @@ gl:
subject: 'Mastodon: Instrucións para restabelecer o contrasinal'
title: Restabelecer contrasinal
two_factor_disabled:
- explanation: A autenticación de dobre factor para a túa conta foi desactivada. É agora posíbel acceder só co teu enderezo de email e contrasinal.
+ explanation: Agora xa podes acceder usando simplemente o correo e contrasinal.
subject: 'Mastodon: Autenticación de dobre factor desactivada'
+ subtitle: Desactivouse o segundo factor de autenticación.
title: 2FA desactivado
two_factor_enabled:
- explanation: A autenticación de dobre factor foi activada para a túa conta. Un token, xerado pola aplicación TOTP emparellada, será necesario para acceder.
+ explanation: Vai ser preciso usar un código creado pola app TOTP emparellada.
subject: 'Mastodon: Activouse a autenticación de dobre factor'
+ subtitle: Activouse o segundo factor de autenticación para a conta.
title: 2FA activado
two_factor_recovery_codes_changed:
explanation: Os códigos de recuperación anteriores fican anulados e os novos foron xerados.
subject: 'Mastodon: Xerados novos códigos de recuperación de dobre factor'
+ subtitle: Os anteriores códigos de recuperación quedaron desactivados e crearonse uns novos.
title: Códigos de recuperación 2FA mudados
unlock_instructions:
subject: 'Mastodon: Instrucións para desbloquear'
@@ -70,11 +73,13 @@ gl:
subject: 'Mastodon: Chave de seguridade eliminada'
title: Eliminouse unha das túas chaves de seguridade
webauthn_disabled:
- explanation: Desactivouse para a túa conta a autenticación con chaves de seguridade. Agora a conexión é posible usando só o token creado pola app TOTP emparellada.
+ explanation: Desactivouse para a conta a autenticación con chaves de seguridade.
+ extra: Agora só se pode acceder usando o código creado pola app TOTP emparellada.
subject: 'Mastodon: Desactivouse a autenticación con chave de seguridade'
title: Chaves de seguridade desactivadas
webauthn_enabled:
- explanation: Activouse para a conta a autenticación con chave de seguridade. Xa podes usar a chave de seguridade para contectar.
+ explanation: Activouse para a conta a autenticación con chave de seguridade.
+ extra: Xa podes usar a chave de seguridade para acceder.
subject: 'Mastodon: Autenticación con chave de seguridade activada'
title: Chaves de seguridade activas
omniauth_callbacks:
diff --git a/config/locales/devise.he.yml b/config/locales/devise.he.yml
index e45f62b031..f2ec3a6716 100644
--- a/config/locales/devise.he.yml
+++ b/config/locales/devise.he.yml
@@ -47,16 +47,19 @@ he:
subject: 'מסטודון: הוראות לאיפוס סיסמה'
title: איפוס סיסמה
two_factor_disabled:
- explanation: האימות הדו-גורמי לחשבונך בוטל. ניתן עתה להכנס לחשבון עם כתובת דוא"ל וסיסמא בלבד.
+ explanation: החיבור כרגע אפשרי בעזרת שם משתמש וסיסמא ותו לא.
subject: 'מסטודון: אימות דו גורמי מושבת'
+ subtitle: אימות דו-שלבי כובה לחשבון זה.
title: אימות דו-גורמי הושעה
two_factor_enabled:
- explanation: אימות דו-גורמי הופעל בחשבונך. עתה על מנת להכנס לחשבון נדרש אסימון המיוצר על אפליקציית ה-TOTP המצומדת.
+ explanation: כדי להתחבר דרוש קוד חד פעמי מיישומון TOTP ששידכת לחשבון זה.
subject: 'מסטודון: אימות דו גורמי הופעל'
+ subtitle: אימות דו־שלבי הופעל לחשבונך.
title: אימות דו־גורמי הופעל
two_factor_recovery_codes_changed:
explanation: צפני האיחזור הקודמים בוטלו, וחדשים נוצרו.
subject: 'מסטודון: צפני אחזור דו-גורמי יוצרו מחדש'
+ subtitle: צפני האיחזור הקודמים בוטלו, וחדשים נוצרו.
title: צפני אחזור דו-גורמי השתנו
unlock_instructions:
subject: 'מסטודון: הוראות לביטול נעילה'
@@ -70,11 +73,13 @@ he:
subject: 'מסטודון: מפתח האבטחה נמחק'
title: אחד ממפתחות האבטחה שלך נמחק
webauthn_disabled:
- explanation: בוטלה האפשרות לאמת את חשבונך בעזרת מפתחות אבטחה. כניסה לחשבון אפשרית עכשיו רק בעזרת אסימון שיוצר באפליקציית ה-TOTP המצומדת.
+ explanation: אימות במפתחות אבטחה כובה לחשבונך.
+ extra: חיבור כעת ניתן רק על ידי הקוד שיוצר על ידי יישומון TOTP ששודך.
subject: 'מסטודון: אימות בעזרת מפתחות אבטחה הושעה'
title: מפתחות אבטחה הושעו
webauthn_enabled:
- explanation: אימות בעזרת מפתחות אבטחה הופעלו עבור חשבונך. ניתן עתה להשתמש במפתח האבטחה שלך על מנת להכנס לחשבון.
+ explanation: אימות מפתח בטחון הופעל בחשבונך.
+ extra: ניתן להשתמש כעת במפתח האבטחה שלך כדי להתחבר.
subject: 'מסטודון: אימות בעזרת מפתח אבטחה אופשר'
title: מפתחות אבטחה אופשרו
omniauth_callbacks:
diff --git a/config/locales/devise.hu.yml b/config/locales/devise.hu.yml
index 6eb1524ed1..522ac66ad3 100644
--- a/config/locales/devise.hu.yml
+++ b/config/locales/devise.hu.yml
@@ -47,11 +47,9 @@ hu:
subject: 'Mastodon: Jelszóvisszaállítási utasítások'
title: Jelszó visszaállítása
two_factor_disabled:
- explanation: A fiókod kétlépcsős hitelesítését kikapcsoltuk. A bejelentkezés mostantól csak az e-mail cím és a jelszó használatával lesz lehetséges.
subject: Kétlépcsős azonosítás kikapcsolva
title: Kétlépcsős hitelesítés kikapcsolva
two_factor_enabled:
- explanation: A kétlépcsős hitelesítést engedélyeztük a fiókodban. A bejelentkezéshez a párosított TOTP alkalmazás által generált tokenre lesz szükség.
subject: 'Mastodon: Kétlépcsős azonosítás engedélyezve'
title: Kétlépcsős hitelesítés engedélyezve
two_factor_recovery_codes_changed:
@@ -70,11 +68,9 @@ hu:
subject: 'Mastodon: A biztonsági kulcs törlésre került'
title: Az egyik biztonsági kulcsodat törölték
webauthn_disabled:
- explanation: A biztonsági kulccsal történő hitelesítést letiltottuk a fiókodon. Bejelentkezni csak a párosított TOTP app által generált tokennel lehet.
subject: 'Mastodon: A biztonsági kulccsal történő hitelesítés letiltásra került'
title: A biztonsági kulcsok letiltásra kerültek
webauthn_enabled:
- explanation: A biztonsági kulccsal történő hitelesítést engedélyeztük a fiókodon. A biztonsági kulcsodat mostantól használhatod bejelentkezésre.
subject: 'Mastodon: A biztonsági kulcsos hitelesítés engedélyezésre került'
title: A biztonsági kulcsok engedélyezésre kerültek
omniauth_callbacks:
diff --git a/config/locales/devise.hy.yml b/config/locales/devise.hy.yml
index 2d235c0af1..ee23163f51 100644
--- a/config/locales/devise.hy.yml
+++ b/config/locales/devise.hy.yml
@@ -47,11 +47,9 @@ hy:
subject: Մաստոդոն․ Գաղտնաբառի վերականգնման նկարագրութիւններ
title: Վերականգնել գաղտնաբառը
two_factor_disabled:
- explanation: 2FA֊ն քո հաշուի համար անջատուեց։ Մուտքն այժմ հնարաւոր է միայն էլ․ փոտի եւ գաղտնաբառի միջոցով։
subject: Մաստոդոն․ 2FA֊ն անջատուեց
title: 2FA անջատուած է
two_factor_enabled:
- explanation: 2FA֊ն քո հաշուի համար միացուած է։ TOTP ծրագրի միջոցով գեներացուած token֊ը պէտք է օգտագործես մուտք գործելու համար։
subject: Մաստոդոն․ 2FA-ն միացուեց
title: 2FA միացուած է
two_factor_recovery_codes_changed:
@@ -70,11 +68,9 @@ hy:
subject: Մաստոդոն․ Անվտանգութեան բանալին ջնջուել է
title: Անվտանգութեան բանալիներիցդ մեկը ջնջուել է
webauthn_disabled:
- explanation: Անվտանգութեան բանալիներով նոյնականացումը քո հաշուից կասեցուել է։ Մուտք գործելն այժմ հնարաւոր է՝ օգտագործելով միայն զուգաւորուած TOTP յաւելուածից գեներացուած կտրօնը։
subject: Մաստոդոն․ Նոյնականացումն անվտանգութեան բանալիներով կասեցուած է
title: Անվտանգութեան բանալիները կասեցուել են
webauthn_enabled:
- explanation: Անվտանգութեան բանալիով նոյնականացումը քո հաշուի համար միացուած է։ Քո անվտանգութեան բանալին այժմ կարող է օգտագործուել մուտք գործելու համար։
subject: Մաստոդոն․ Անվտանգութեան բանալիով նոյնականացումը միացուած է
title: Անվտանգութեան բանալիները միացուել են
omniauth_callbacks:
diff --git a/config/locales/devise.id.yml b/config/locales/devise.id.yml
index 2e51a69dc2..c0dede95aa 100644
--- a/config/locales/devise.id.yml
+++ b/config/locales/devise.id.yml
@@ -47,11 +47,9 @@ id:
subject: 'Mastodon: Petunjuk mereset kata sandi'
title: Reset kata sandi
two_factor_disabled:
- explanation: Otentifikasi dua-faktor untuk akun Anda dimatikan. Kini Masuk dapat dilakukan hanya dengan alamat email dan kata sandi.
subject: 'Mastodon: Otentifikasi dua-faktor dimatikan'
title: 2FA dimatikan
two_factor_enabled:
- explanation: Otentifikasi dua-faktor telah dimatikan untuk Akun Anda. Token yang dibuat menggunakan aplikasi TOTP berpasangan akan diperlukan untuk masuk.
subject: 'Mastodon: Otentifikasi dua-faktor diaktifkan'
title: 2FA diaktifkan
two_factor_recovery_codes_changed:
@@ -70,11 +68,9 @@ id:
subject: 'Mastodon: Kunci keamanan dihapus'
title: Salah satu dari kunci keamanan Anda telah dihapus
webauthn_disabled:
- explanation: Autentikasi dengan kunci keamanan telah dinonaktifkan untuk akun ini. Proses masuk akun hanya mungkin menggunakan token yang dibuat dengan aplikasi TOTP.
subject: 'Mastodon: Autentikasi dengan kunci keamanan dinoaktifkan'
title: Kunci keamanan dinonaktifkan
webauthn_enabled:
- explanation: Autentikasi kunci keamanan telah diaktifkan untuk akun Anda. Kunci keamanan Anda kini dapat dipakai untuk masuk.
subject: 'Mastodon: Autentikasi kunci keamanan aktif'
title: Kunci keamanan aktif
omniauth_callbacks:
diff --git a/config/locales/devise.ie.yml b/config/locales/devise.ie.yml
index 05a41147d8..97cda4e8c6 100644
--- a/config/locales/devise.ie.yml
+++ b/config/locales/devise.ie.yml
@@ -47,16 +47,18 @@ ie:
subject: 'Mastodon: Instructiones por reiniciar li passa-parol'
title: Reiniciar passa-parol
two_factor_disabled:
- explanation: 2-factor autentication por tui conto ha esset desactivisat. Aperter session nu es possibil solmen per email-adresse e passa-parol.
+ explanation: Aperter session es nu possibil solmen per email-adresse e passa-parol.
subject: 'Mastodon: 2-factor autentication desactivat'
+ subtitle: 2-factor autentication por tui conto ha esset desactivisat.
title: 2FA desvalidat
two_factor_enabled:
- explanation: 2-factor autentication ha esset activat por tui conto. Un gage generat per li acuplat apli TOTP va esser besonat por intrar.
subject: 'Mastodon: 2-factor autentication activat'
+ subtitle: 2-factor autentication ha esset activisat por tui conto.
title: 2FA permisset
two_factor_recovery_codes_changed:
explanation: Li anteyan codes de recuperation ha esset ínvalidat, e novis generat.
subject: 'Mastodon: 2-factor codes de recuperation regenerat'
+ subtitle: Li anteyan codes de recuperation ha esset ínvalidat, e novis generat.
title: 2FA codes de recuperation changeat
unlock_instructions:
subject: 'Mastodon: Desserral instructiones'
@@ -70,11 +72,12 @@ ie:
subject: 'Mastodon: Clave de securitá deletet'
title: Un ex tui claves de securitá ha esset deletet
webauthn_disabled:
- explanation: Autentication per claves de securitá ha esset desactivat por tui conto. Ja on posse intrar solmen con li gage generat per li acuplat apli TOTP.
+ explanation: Autentication per clave de securitá ha esset desactivisat por tui conto.
subject: 'Mastodon: Autentication con claves de securitá desactivisat'
title: Claves de securitá desactivisat
webauthn_enabled:
- explanation: Autentication per clave de securitá ha esset activat por tui conto. Ja li clave de securitá posse esser usat por intrar.
+ explanation: Autentication per clave de securitá ha esset activisat por tui conto.
+ extra: Tui clave de securitá nu posse esser usat por aperter session.
subject: 'Mastodon: Autentication per clave de securitá activat'
title: Claves de securitá activisat
omniauth_callbacks:
diff --git a/config/locales/devise.io.yml b/config/locales/devise.io.yml
index fb90c08c7f..6bf0b52cef 100644
--- a/config/locales/devise.io.yml
+++ b/config/locales/devise.io.yml
@@ -47,11 +47,9 @@ io:
subject: Instrucioni por chanjar la pasvorto
title: Richanjo di pasvorto
two_factor_disabled:
- explanation: 2-faktorverifiko por vua konto deaktivigesis. Eniro esas nun posible per nur retpostadreso e pasvorto.
subject: 'Mastodon: 2-faktorverifiko deaktivigesis'
title: 2FA deaktivigesis
two_factor_enabled:
- explanation: 2-faktorverifiko aktivigesis por vua konto. Fisho quo facesis da parigita softwaro TOTP bezonesos por eniro.
subject: 'Mastodon: 2-faktorverifiko aktivigesis'
title: 2FA aktivigesis
two_factor_recovery_codes_changed:
@@ -70,11 +68,9 @@ io:
subject: 'Mastodon: Sekurklefo efacesis'
title: 1 de vua sekurklefi efacesis
webauthn_disabled:
- explanation: Verifiko per sekurklefi deaktivigesis por vua konto. Eniro nun esas posibla per nur ficho quo facesis da parita softwaro TOTP.
subject: 'Mastodon: Verifiko per sekurklefi deaktivigesis'
title: Sekurklefi deaktivigesis
webauthn_enabled:
- explanation: Sekurklefverifiko aktivigesis por vua konto. Vua sekurklefo nun povas uzesar por eniro.
subject: 'Mastodon: Sekurklefverifiko aktivigesis'
title: Sekurklefi aktivigesis
omniauth_callbacks:
diff --git a/config/locales/devise.is.yml b/config/locales/devise.is.yml
index 3b7cf10987..12015fa29d 100644
--- a/config/locales/devise.is.yml
+++ b/config/locales/devise.is.yml
@@ -47,16 +47,19 @@ is:
subject: 'Mastodon: Leiðbeiningar til að endurstilla lykilorð'
title: Endurstilling lykilorðs
two_factor_disabled:
- explanation: Tveggja-þátta auðkenning fyrir aðganginn þinn hefur verið gerð óvirk. Núna er einungis hægt að skrá inn með tölvupóstfangi og lykilorði.
+ explanation: Innskráning er núna möguleg með því að nota aðeins tölvupóstfang og lykilorð.
subject: 'Mastodon: Tveggja-þátta auðkenning er óvirk'
+ subtitle: Tveggja-þátta auðkenning fyrir aðganginn þinn hefur verið gerð óvirk.
title: 2FA tveggja-þátta auðkenning er óvirk
two_factor_enabled:
- explanation: Tveggja-þátta auðkenning hefur verið gerð virk fyrir aðganginn þinn. Krafist er teikns útbúnu af paraða TOTP-forritinu til að skrá inn.
+ explanation: Teikn sem útbúið hefur verið af pöruðu TOTP-forriti verður nauðsynlegt til innskráningar.
subject: 'Mastodon: Tveggja-þátta auðkenning er virk'
+ subtitle: Tveggja-þátta auðkenning fyrir aðganginn þinn hefur verið gerð virk.
title: 2FA tveggja-þátta auðkenning er virk
two_factor_recovery_codes_changed:
explanation: Fyrri endurheimtukóðar tveggja-þátta auðkenningar voru ógiltir og nýir útbúnir í staðinn.
subject: 'Mastodon: Endurheimtukóðar tveggja-þátta auðkenningar voru endurnýjaðir'
+ subtitle: Fyrri endurheimtukóðar tveggja-þátta auðkenningar voru ógiltir og nýir útbúnir í staðinn.
title: Endurheimtukóðar tveggja-þátta auðkenningar breyttust
unlock_instructions:
subject: 'Mastodon: Leiðbeiningar til að aflæsa'
@@ -70,11 +73,13 @@ is:
subject: 'Mastodon: Öryggislykli eytt'
title: Einum af öryggilyklunum þínum hefur verið eytt
webauthn_disabled:
- explanation: Auðkenning með öryggislyklum hefur verið gerð óvirk fyrir aðganginn þinn. Innskráning er núna einungis möguleg með teikni útbúnu af paraða TOTP-forritinu.
+ explanation: Auðkenning með öryggislyklum hefur verið gerð óvirk fyrir aðganginn þinn.
+ extra: Innskráning er núna möguleg með því að nota einungis teikn útbúnu af paraða TOTP-forritinu.
subject: 'Mastodon: Auðkenning með öryggislyklum er óvirk'
title: Öryggislyklar eru óvirkir
webauthn_enabled:
- explanation: Auðkenning með öryggislykli hefur verið gerð virk fyrir aðganginn þinn. Nú er hægt að nota öryggislykilinn þinn til að skrá inn.
+ explanation: Auðkenning með öryggislykli hefur verið gerð virk fyrir aðganginn þinn.
+ extra: Nú er hægt að nota öryggislykilinn þinn til að skrá inn.
subject: 'Mastodon: Auðkenning með öryggislykli er virk'
title: Öryggislyklar eru virkir
omniauth_callbacks:
diff --git a/config/locales/devise.it.yml b/config/locales/devise.it.yml
index 5ea3aeac47..19bd999aad 100644
--- a/config/locales/devise.it.yml
+++ b/config/locales/devise.it.yml
@@ -47,16 +47,19 @@ it:
subject: 'Mastodon: Istruzioni di ripristino della password'
title: Ripristino della password
two_factor_disabled:
- explanation: L'autenticazione a due fattori per il tuo profilo è stata disabilitata. L'accesso è ora possibile utilizzando solo l'indirizzo email e la password.
+ explanation: Il login è ora possibile utilizzando solo un indirizzo e-mail e una password.
subject: 'Mastodon: Autenticazione a due fattori disabilitata'
+ subtitle: L'autenticazione a due fattori per il tuo account è stata disabilitata.
title: A2F disabilitata
two_factor_enabled:
- explanation: L'autenticazione a due fattori è stata abilitata per il tuo profilo. Un token, generato dall'app TOTP collegata, sarà richiesto per l'accesso.
+ explanation: Un token generato dall'app TOTP accoppiata sarà richiesto per il login.
subject: 'Mastodon: Autenticazione a due fattori abilitata'
+ subtitle: L'autenticazione a due fattori è stata abilitata per il tuo account.
title: A2F abilitata
two_factor_recovery_codes_changed:
explanation: I precedenti codici di recupero sono stati annullati e dei nuovi sono stati generati.
subject: 'Mastodon: Codici di recupero a due fattori rigenerati'
+ subtitle: I precedenti codici di recupero sono stati annullati e dei nuovi sono stati generati.
title: Codici di recupero A2F cambiati
unlock_instructions:
subject: 'Mastodon: Istruzioni di sblocco'
@@ -70,11 +73,13 @@ it:
subject: 'Mastodon: Chiave di sicurezza eliminata'
title: Una delle tue chiavi di sicurezza è stata eliminata
webauthn_disabled:
- explanation: L'autenticazione con le chiavi di sicurezza è stata disabilitata per il tuo profilo. L'accesso è ora possibile utilizzando solo il token, generato dall'app TOTP associata.
+ explanation: L'autenticazione con le chiavi di sicurezza è stata disabilitata per il tuo account.
+ extra: Il login è ora possibile utilizzando solo il token generato dall'app TOTP accoppiata.
subject: 'Mastodon: Autenticazione con chiavi di sicurezza disabilitata'
title: Chiavi di sicurezza disabilitate
webauthn_enabled:
- explanation: L'autenticazione con chiavi di sicurezza è stata abilitata per il tuo profilo. La tua chiave di sicurezza è ora utilizzabile per l'accesso.
+ explanation: L'autenticazione della chiave di sicurezza è stata abilitata per il tuo account.
+ extra: La tua chiave di sicurezza può ora essere utilizzata per il login.
subject: 'Mastodon: Autenticazione con chiavi di sicurezza abilitata'
title: Chiavi di sicurezza abilitate
omniauth_callbacks:
diff --git a/config/locales/devise.ja.yml b/config/locales/devise.ja.yml
index ca8ac05847..9a3ffd9c4d 100644
--- a/config/locales/devise.ja.yml
+++ b/config/locales/devise.ja.yml
@@ -47,16 +47,19 @@ ja:
subject: 'Mastodon: パスワード再発行'
title: パスワード再発行
two_factor_disabled:
- explanation: あなたのアカウントの二要素認証が無効化されました。メールとパスワードのみでログインできます。
+ explanation: メールアドレスとパスワードのみでログイン可能になりました。
subject: 'Mastodon: 二要素認証が無効になりました'
+ subtitle: 二要素認証が無効になっています。
title: 二要素認証が無効化されました
two_factor_enabled:
- explanation: あなたのアカウントの二要素認証が有効化されました。ログインするには TOTP アプリで生成されたコードが必要です。
+ explanation: ログインには設定済みのTOTPアプリが生成したトークンが必要です。
subject: 'Mastodon: 二要素認証が有効になりました'
+ subtitle: 二要素認証が有効になりました。
title: 二要素認証が有効化されました
two_factor_recovery_codes_changed:
explanation: 以前のリカバリーコードが無効化され、新しいコードが生成されました。
subject: 'Mastodon: 二要素認証のリカバリーコードが再生成されました'
+ subtitle: 以前のリカバリーコードが無効化され、新しいコードが生成されました。
title: 二要素認証のリカバリーコードが変更されました
unlock_instructions:
subject: 'Mastodon: アカウントのロックの解除'
@@ -70,11 +73,13 @@ ja:
subject: 'Mastodon: セキュリティキーが削除されました'
title: セキュリティキーが削除されました
webauthn_disabled:
- explanation: アカウントのセキュリティキーによる認証が無効になりました。ペアリングされたTOTPアプリによって生成されたトークンのみを使用してログインが可能になりました。
+ explanation: セキュリティキー認証が無効になっています。
+ extra: 設定済みのTOTPアプリが生成したトークンのみでログインできるようになりました。
subject: 'Mastodon: セキュリティキー認証が無効になりました'
title: セキュリティキーは無効になっています
webauthn_enabled:
- explanation: あなたのアカウントでセキュリティキー認証が有効になりました。セキュリティキーをログインに使用できるようになりました。
+ explanation: セキュリティキー認証が有効になりました。
+ extra: ログインにセキュリティキーを使用できるようになりました。
subject: 'Mastodon: セキュリティキー認証が有効になりました'
title: セキュリティキーは有効になっています
omniauth_callbacks:
diff --git a/config/locales/devise.kab.yml b/config/locales/devise.kab.yml
index eb599e55e8..2f60629fd7 100644
--- a/config/locales/devise.kab.yml
+++ b/config/locales/devise.kab.yml
@@ -47,11 +47,9 @@ kab:
subject: 'Mastodon: Iwellihen n uwennez n wawal uffir'
title: Aɛiwed n wawal uffir
two_factor_disabled:
- explanation: Asesṭeb s snat n tarayin insa i umiḍan-ik·im. Tzemreḍ ad teqnneḍ tura s imayl d wawal uffir kan.
subject: 'Mastodon: Asesteb s snat n tarrayin yensa'
title: Asesteb s snat n tarrayin insa
two_factor_enabled:
- explanation: Asesṭeb s snat n tarayin yermed i umiḍan-ik·im. anekcum isra tangalt akken ad yeddu.
subject: 'Mastodon: Asesteb s snat n tarrayin yermed'
title: Asesteb s snat n tarrayin irmed
two_factor_recovery_codes_changed:
diff --git a/config/locales/devise.kk.yml b/config/locales/devise.kk.yml
index 7ddeb86047..06fad30aec 100644
--- a/config/locales/devise.kk.yml
+++ b/config/locales/devise.kk.yml
@@ -47,11 +47,9 @@ kk:
subject: 'Mastodon: Құпиясөзді қалпына келтіру нұсқаулықтары'
title: Құпиясөзді қалпына келтіру
two_factor_disabled:
- explanation: Екі факторлы аутентификация сіздің аккаунтыңыз үшін жабық. Email адресіңіз және құпиясөзіңіз арқылы кіруіңізге болады.
subject: 'Mastodon: Екі факторлы аутентификация жабық'
title: 2FA жабық
two_factor_enabled:
- explanation: Екі факторлы аутентификация аккаунтыңызға қосылды. TOTP арқылы жасалған токен міндетті кіруіңіз үшін.
subject: 'Mastodon: Екі факторлы аутентификация ашық'
title: 2FA ашық
two_factor_recovery_codes_changed:
diff --git a/config/locales/devise.ko.yml b/config/locales/devise.ko.yml
index 65f660f105..88865aec58 100644
--- a/config/locales/devise.ko.yml
+++ b/config/locales/devise.ko.yml
@@ -47,11 +47,9 @@ ko:
subject: 'Mastodon: 암호 재설정 설명'
title: 암호 재설정
two_factor_disabled:
- explanation: 당신의 계정에 설정된 이중 인증이 비활성화 되었습니다. 이제 이메일과 암호만으로 로그인이 가능합니다.
subject: '마스토돈: 이중 인증 비활성화'
title: 2FA 비활성화 됨
two_factor_enabled:
- explanation: 당신의 계정에 이중 인증이 활성화되었습니다. 로그인시 페어링된 T-OTP 앱에서 생성된 토큰이 필요합니다.
subject: '마스토돈: 이중 인증 활성화'
title: 2FA 활성화 됨
two_factor_recovery_codes_changed:
@@ -70,11 +68,9 @@ ko:
subject: '마스토돈: 보안 키 삭제'
title: 보안 키가 삭제되었습니다
webauthn_disabled:
- explanation: 보안 키를 이용한 인증이 당신의 계정에 대해 비활성화 되어 있습니다. TOTP 앱의 토큰만으로 로그인 할 수 있습니다.
subject: '마스토돈: 보안 키를 이용한 인증이 비활성화 됨'
title: 보안 키 비활성화 됨
webauthn_enabled:
- explanation: 보안 키 인증이 당신의 계정에 대해 활성화 되어 있습니다. 보안 키를 통해 로그인 할 수 있습니다.
subject: '마스토돈: 보안 키 인증 활성화 됨'
title: 보안 키 활성화 됨
omniauth_callbacks:
diff --git a/config/locales/devise.ku.yml b/config/locales/devise.ku.yml
index 6debd96e05..33a868a8a5 100644
--- a/config/locales/devise.ku.yml
+++ b/config/locales/devise.ku.yml
@@ -51,11 +51,9 @@ ku:
subject: 'Mastodon: rêwerzên jê birina pêborîn'
title: Borînpeyv ji nû ve saz bike
two_factor_disabled:
- explanation: Ji bo ajimêrê te piştrastkirina du-faktorî hat asteng kirin. Niha tu tenê bi navnîşana e-name û borînpeyva xwe dikarî têketinê bikî.
subject: 'Mastodon: piştrastkirina du- faktorî neçalak bike'
title: 2FA Neçalak e
two_factor_enabled:
- explanation: Piştrastkirinê du-faktorî ya ajimêrê te hat çalak kirin. Ji bo têketinê ji alî sepanê cotkirî TOTP ve hewceyî nîşanderek heye.
subject: 'Mastodon: piştrastkirina du-faktorî hat çalak kirin'
title: 2FA Çalak e
two_factor_recovery_codes_changed:
@@ -74,11 +72,9 @@ ku:
subject: 'Mastodon: Kilîta ewlehiyê hate jêbirin'
title: Yek ji kilîta ewlehiyê yên te hate jêbirin
webauthn_disabled:
- explanation: Rastandina kilîta ewlehiyê hate çalakkirin bo ajimêra te. kilîta te ya ewlehiyê niha bo têketinê dikarê bê karanîn. Têketin niha gengaz e ku mirov tenê nîşana ku ji hêla sepana cotkirî ya TOTP ve hatî avakirin bi kar bîne.
subject: 'Mastodon: Rastandin bi kilîta ewlehiyê re nehate çalakirin'
title: Kilîta ewlehiyê neçalak e
webauthn_enabled:
- explanation: Rastandina kilîta ewlehiyê hate çalakkirin bo ajimêra te. kilîta te ya ewlehiyê niha bo têketinê dikarê bê karanîn.
subject: 'Mastodon: Rastandina kilîta ewlehiyê hate çalakkirin'
title: Kilîta ewlehiyê çalak e
omniauth_callbacks:
diff --git a/config/locales/devise.lad.yml b/config/locales/devise.lad.yml
index 63933b80fc..bec76d82f9 100644
--- a/config/locales/devise.lad.yml
+++ b/config/locales/devise.lad.yml
@@ -47,16 +47,15 @@ lad:
subject: 'Mastodon: Instruksyones para reinisyar kod'
title: Reinisyar kod
two_factor_disabled:
- explanation: La autentifikasyon de dos pasos para tu kuento a sido inkapasitada. Agora puedes konektarte solamente uzando el adreso de posta elektronika i el kod.
subject: 'Mastodon: La autentifikasyon de dos pasos esta inkapasitada'
title: Autentifikasyon 2FA inkapasitada
two_factor_enabled:
- explanation: La autentifikasyon de dos pasos para tu kuento a sido kapasitada. Se rekiere un token djenerado por la aplikasyon TOTP konektada para entrar.
subject: 'Mastodon: La autentifikasyon de dos pasos esta kapasitada'
title: Autentifikasyon 2FA aktivada
two_factor_recovery_codes_changed:
explanation: Los kodiches de rekuperasyon previos tienen sido invalidados i se djeneraron kodiches muevos.
subject: 'Mastodon: Los kodiches de rekuperasyon de dos pasos fueron rejenerados'
+ subtitle: Los kodiches de rekuperasyon previos tienen sido invalidados i se djeneraron kodiches muevos.
title: Kodiches de rekuperasyon 2FA trokados
unlock_instructions:
subject: 'Mastodon: Instruksyones para dezblokar'
@@ -70,11 +69,9 @@ lad:
subject: 'Mastodon: Yave de sigurita supremida'
title: Una de tus yaves de sigurita tiene sido supremida
webauthn_disabled:
- explanation: La autentifikasyon kon yaves de sigurita a sido inkapasitada para tu kuento. Agora el inisyo de sesyon solo es posivle utilizando el token djeenerado por la aplikasyon TOTP konektada.
subject: 'Mastodon: autentifikasyon kon yaves de sigurita inkapasitada'
title: Yaves de sigurita inkapasitadas
webauthn_enabled:
- explanation: La autentifikasyon kon yave de sigurita a sido kapasitada para tu kuento. Agora tu yave de sigurita puede ser utilizada para inisyar sesyon.
subject: 'Mastodon: Autentifikasyon de yave de sigurita aktivada'
title: Yaves de sigurita kapasitadas
omniauth_callbacks:
diff --git a/config/locales/devise.lt.yml b/config/locales/devise.lt.yml
index 5429b217d0..3fba5ed08e 100644
--- a/config/locales/devise.lt.yml
+++ b/config/locales/devise.lt.yml
@@ -47,16 +47,19 @@ lt:
subject: 'Mastodon: slaptažodžio keitimo instrukcijos'
title: Slaptažodžio keitimas
two_factor_disabled:
- explanation: Dviejų tapatybės patikrinimas tavo paskyrai buvo išjungtas. Prisijungimas dabar galimas naudojant tik el. pašto adresą ir slaptažodį.
+ explanation: Prisijungimas dabar galimas naudojant tik el. pašto adresą ir slaptažodį.
subject: 'Mastodon: dviejų tapatybės patikrinimas išjungtas'
+ subtitle: Dviejų tapatybės patikrinimas tavo paskyrai buvo išjungtas.
title: 2FA išjungta
two_factor_enabled:
- explanation: Tavo paskyrai įgalintas dvejų tapatybės patikrinimas. Prisijungiant reikės susietos TOTP programėlės sugeneruoto priegos rakto.
+ explanation: Prisijungiant reikės susietos TOTP programėlės sugeneruoto priegos rakto.
subject: 'Mastodon: dviejų tapatybės patikrinimas įgalintas'
+ subtitle: Tavo paskyrai įjungtas dviejų tapatybės patikrinimas.
title: 2FA įgalinta
two_factor_recovery_codes_changed:
explanation: Ankstesnieji atkūrimo kodai yra negaliojantys ir sugeneruojami nauji.
subject: 'Mastodon: dviejų tapatybės atkūrimo kodai iš naujo sugeneruoti'
+ subtitle: Ankstesnieji atkūrimo kodai yra negaliojantys ir sugeneruojami nauji.
title: Pakeisti 2FA atkūrimo kodai
unlock_instructions:
subject: 'Mastodon: atrakinimo instrukcijos'
@@ -70,11 +73,13 @@ lt:
subject: 'Mastodon: saugumo raktas ištrintas'
title: Vienas iš tavo saugumo raktų buvo ištrintas
webauthn_disabled:
- explanation: Tavo paskyrai buvo išjungtas tapatybės nustatymas naudojant saugumo raktus. Prisijungimas dabar galimas naudojant tik susietos TOTP programėlės sugeneruotą prieigos raktą.
+ explanation: Tavo paskyrai išjungtas tapatybės nustatymas naudojant saugumo raktus.
+ extra: Prisijungimas dabar galimas naudojant tik susietos TOTP programėlės sugeneruotą prieigos raktą.
subject: 'Mastodon: tapatybės nustatymas naudojant saugumo raktai išjungta'
title: Saugumo raktai išjungti
webauthn_enabled:
- explanation: Saugumo rakto tapatybės nustatymas tavo paskyrai įgalintas. Dabar prisijungimui galima naudoti saugumo raktą.
+ explanation: Tavo paskyrai įjungtas saugumo rakto tapatybės nustatymas.
+ extra: Tavo saugumo raktą dabar galima naudoti prisijungimui.
subject: 'Mastodon: saugumo rakto tapatybės nustatymas įgalintas'
title: Saugumo raktai įgalinti
omniauth_callbacks:
diff --git a/config/locales/devise.lv.yml b/config/locales/devise.lv.yml
index e61e1b7fd9..ed4b4fb8c6 100644
--- a/config/locales/devise.lv.yml
+++ b/config/locales/devise.lv.yml
@@ -47,11 +47,9 @@ lv:
subject: 'Mastodon: Norādījumi paroles atiestatīšanai'
title: Paroles atiestatīšana
two_factor_disabled:
- explanation: Tavam kontam divfaktoru autentifikācija ir atspējota. Pieteikšanās tagad ir iespējama, izmantojot tikai e-pasta adresi un paroli.
subject: 'Mastodon: Divfaktoru autentifikācija atspējota'
title: 2FA atspējota
two_factor_enabled:
- explanation: Tavam kontam ir iespējota divfaktoru autentifikācija. Lai pieteiktos, būs nepieciešams kods, ko ģenerējusi pārī savienotā TOTP lietotne.
subject: 'Mastodon: Divfaktoru autentifikācija iespējota'
title: 2FA iespējota
two_factor_recovery_codes_changed:
@@ -70,11 +68,9 @@ lv:
subject: 'Mastodon: Drošības atslēga izdzēsta'
title: Viena no tavām drošības atslēgām tika izdzēsta
webauthn_disabled:
- explanation: Tavam kontam ir atspējota autentifikācija ar drošības atslēgām. Pieteikšanās tagad ir iespējama, izmantojot tikai kodu, ko ģenerējusi pārī savienotā TOTP lietotne.
subject: 'Mastodon: Autentifikācija ar drošības atslēgām ir atspējota'
title: Drošības atslēgas atspējotas
webauthn_enabled:
- explanation: Tavam kontam ir iespējota drošības atslēgas autentifikācija. Tavu drošības atslēgu tagad var izmantot, lai pieteiktos.
subject: 'Mastodon: Drošības atslēgas autentifikācija iespējota'
title: Drošības atslēgas iespējotas
omniauth_callbacks:
diff --git a/config/locales/devise.ms.yml b/config/locales/devise.ms.yml
index 30eceb239d..da18d1896e 100644
--- a/config/locales/devise.ms.yml
+++ b/config/locales/devise.ms.yml
@@ -47,11 +47,9 @@ ms:
subject: 'Mastodon: Arahan set semula kata laluan'
title: Set semula kata laluan
two_factor_disabled:
- explanation: Pengesahan dwifaktor untuk akaun anda telah dilumpuhkan. Log masuk kini dibenarkan dengan hanya menggunakan alamat e-mel dan kata laluan.
subject: 'Mastodon: Pengesahan dwifaktor dilumpuhkan'
title: 2FA dinyahaktifkan
two_factor_enabled:
- explanation: Pengesahan dwifaktor untuk akaun anda telah didayakan. Satu token yang dijanakan oleh aplikasi TOTP diperlukan untuk melog masuk.
subject: 'Mastodon: Pengesahan dwifaktor didayakan'
title: 2FA diaktifkan
two_factor_recovery_codes_changed:
@@ -70,11 +68,9 @@ ms:
subject: 'Mastodon: Kunci keselamatan dihapuskan'
title: Salah satu daripada kunci keselamatan anda telah dihapuskan
webauthn_disabled:
- explanation: Pengesahan dengan kunci keselamatan untuk akaun anda telah dilumpuhkan. Log masuk kini dibenarkan dengan hanya menggunakan token yang dijanakan oleh aplikasi TOTP.
subject: 'Mastodon: Pengesahan dengan kunci keselamatan dilumpuhkan'
title: Kunci keselamatan dilumpuhkan
webauthn_enabled:
- explanation: Pengesahan kunci keselamatan untuk akaun anda kini didayakan. Kunci keselamatan anda kini boleh digunakan untuk melog masuk.
subject: 'Mastodon: Pengesahan kunci keselamatan didayakan'
title: Kunci keselamatan didayakan
omniauth_callbacks:
diff --git a/config/locales/devise.my.yml b/config/locales/devise.my.yml
index 04d744cf2b..126ecd7404 100644
--- a/config/locales/devise.my.yml
+++ b/config/locales/devise.my.yml
@@ -47,11 +47,9 @@ my:
subject: 'Mastodon: စကားဝှက်ညွှန်ကြားချက် ပြန်လည်သတ်မှတ်မည်'
title: စကားဝှက်ပြန်လည်သတ်မှတ်မည်
two_factor_disabled:
- explanation: သင့်အကောင့်အတွက် နှစ်ဆင့်ခံလုံခြုံရေးစနစ်အထောက်အထားပြခြင်းကို ပိတ်ထားသည်။ အီးမေးလ်လိပ်စာနှင့် စကားဝှက်ကိုသာ အသုံးပြု၍ အကောင့်ဝင်ရောက်နိုင်ပါသည်။
subject: 'Mastodon: နှစ်ဆင့်ခံလုံခြုံရေးစနစ်ပိတ်ထားသည်'
title: နှစ်ဆင့်ခံလုံခြုံရေးစနစ်ပိတ်ထားသည်
two_factor_enabled:
- explanation: သင့်အကောင့်အတွက် နှစ်ဆင့်ခံလုံခြုံရေးစနစ်အထောက်အထားပြခြင်းကို ဖွင့်ထားသည်။ TOTP အက်ပ်မှ ထုတ်ပေးသည့် တိုကင်တစ်ခုမှာ အကောင့်ဝင်ရန်အတွက် လိုအပ်ပါသည်။
subject: 'Mastodon: နှစ်ဆင့်ခံလုံခြုံရေးစနစ်ဖွင့်ထားသည်'
title: နှစ်ဆင့်ခံလုံခြုံရေးစနစ်ဖွင့်ထားသည်
two_factor_recovery_codes_changed:
@@ -70,11 +68,9 @@ my:
subject: 'Mastodon: လုံခြုံရေးသော့ချက် ဖျက်လိုက်ပါပြီ'
title: လုံခြုံရေးသော့ချက်များထဲမှတစ်ခု ဖျက်လိုက်ပါပြီ
webauthn_disabled:
- explanation: သင့်အကောင့်အတွက် လုံခြုံရေးကီးများဖြင့် အထောက်အထားပြခြင်းကို ပိတ်ထားသည်။ TOTP အက်ပ်မှထုတ်ပေးသည့် တိုကင်ကိုသာ အသုံးပြု၍ အကောင့်ဝင်ရောက်နိုင်ပါသည်။
subject: Mastodon - လုံခြုံရေးကီးများဖြင့် အထောက်အထားစိစစ်ခြင်းကို ပိတ်ထားသည်
title: လုံခြုံရေးသော့ချက်များ ပိတ်ပြီးပါပြီ
webauthn_enabled:
- explanation: သင့်အကောင့်အတွက် လုံခြုံရေးကီး အထောက်အထားစိစစ်ခြင်းကို ဖွင့်ထားသည်။ အကောင့်ဝင်ရန်အတွက် သင်၏လုံခြုံရေးကီးကို ယခုအသုံးပြုနိုင်ပါပြီ။
subject: Mastodon - လုံခြုံရေးကီး အထောက်အထားစိစစ်ခြင်းကို ဖွင့်ထားသည်
title: လုံခြုံရေးသော့ချက်များ ဖွင့်ပြီးပါပြီ
omniauth_callbacks:
diff --git a/config/locales/devise.nl.yml b/config/locales/devise.nl.yml
index 1b5081fe8c..33d777e2cc 100644
--- a/config/locales/devise.nl.yml
+++ b/config/locales/devise.nl.yml
@@ -47,16 +47,19 @@ nl:
subject: 'Mastodon: Wachtwoord opnieuw instellen'
title: Wachtwoord opnieuw instellen
two_factor_disabled:
- explanation: Tweestapsverificatie voor jouw account is uitgeschakeld. Je kunt nu alleen inloggen met een e-mailadres en wachtwoord.
+ explanation: Je kunt nu inloggen met alleen een e-mailadres en wachtwoord.
subject: 'Mastodon: Tweestapsverificatie uitgeschakeld'
+ subtitle: Tweestapsverificatie voor je account is uitgeschakeld.
title: Tweestapsverificatie uitgeschakeld
two_factor_enabled:
- explanation: Tweestapsverificatie voor jouw account is ingeschakeld. Om te kunnen inloggen is een door een tweestapsverificatie-app genereerde toegangscode nodig.
+ explanation: Je hebt een door de authenticatie-app gegeneerde toegangscode nodig om in te loggen.
subject: 'Mastodon: Tweestapsverificatie ingeschakeld'
+ subtitle: Tweestapsverificatie voor je account is ingeschakeld.
title: Tweestapsverificatie ingeschakeld
two_factor_recovery_codes_changed:
explanation: De vorige herstelcodes zijn ongeldig gemaakt en nieuwe zijn aangemaakt.
subject: 'Mastodon: Tweestaps-herstelcodes zijn opnieuw aangemaakt'
+ subtitle: De vorige herstelcodes zijn ongeldig gemaakt en er zijn nieuwe gegenereerd.
title: Herstelcodes tweestapsverificatie veranderd
unlock_instructions:
subject: 'Mastodon: Instructies om opschorten account ongedaan te maken'
@@ -70,11 +73,13 @@ nl:
subject: 'Mastodon: Beveiligingssleutel verwijderd'
title: Een van jouw beveiligingssleutels is verwijderd
webauthn_disabled:
- explanation: Verificatie met beveiligingssleutels is uitgeschakeld voor jouw account. Inloggen is nu alleen mogelijk met het gebruik van een door een gepaarde TOTP-app genereerde sleutel.
+ explanation: Verificatie met beveiligingssleutels is uitgeschakeld voor je account.
+ extra: Het is nu alleen mogelijk om te te loggen met een door de authenticatie-app gegeneerde toegangscode.
subject: 'Mastodon: Verificatie met beveiligingssleutels is uitgeschakeld'
title: Beveiligingssleutels uitgeschakeld
webauthn_enabled:
- explanation: Verificatie met beveiligingssleutels is ingeschakeld voor jouw account. Jouw beveiligingssleutel kan nu gebruikt worden om in te loggen.
+ explanation: Verificatie met beveiligingssleutels is ingeschakeld voor je account.
+ extra: Jouw beveiligingssleutel kan nu gebruikt worden om in te loggen.
subject: 'Mastodon: Verificatie met beveiligingssleutels is ingeschakeld'
title: Beveiligingssleutels ingeschakeld
omniauth_callbacks:
diff --git a/config/locales/devise.nn.yml b/config/locales/devise.nn.yml
index eee9928475..acee9fdcdc 100644
--- a/config/locales/devise.nn.yml
+++ b/config/locales/devise.nn.yml
@@ -47,11 +47,9 @@ nn:
subject: 'Mastodon: Instuksjonar for å endra passord'
title: Attstilling av passord
two_factor_disabled:
- explanation: To-faktor-autentisering har vorte slått av for kontoen din. Det går no an logge inn med berre e-postadresse og passord.
subject: 'Mastodon: To-faktor-autentisering deaktivert'
title: 2FA deaktivert
two_factor_enabled:
- explanation: To-faktor-autentisering har vorte slått på for kontoen din. Ein kode frå den samankopla TOTP-appen er kravd for å logge inn.
subject: 'Mastodon: To-faktor-autentisering aktivert'
title: 2FA aktivert
two_factor_recovery_codes_changed:
@@ -70,11 +68,9 @@ nn:
subject: 'Mastodon: Sikkerheitsnøkkel sletta'
title: Ein av sikkerheitsnøklane dine har blitt sletta
webauthn_disabled:
- explanation: Du kan ikkje bruke tryggleiksnyklar til å logga inn på kontoen din. Du kan berre logga inn med koden frå tofaktor-appen som er kopla saman med brukarkontoen din.
subject: 'Mastodon: Autentisering med sikkerheitsnøklar vart skrudd av'
title: Sikkerheitsnøklar deaktivert
webauthn_enabled:
- explanation: Pålogging med tryggleiksnyklar er skrudd på. No kan du bruka nykelen din for å logga på.
subject: 'Mastodon: Sikkerheitsnøkkelsautentisering vart skrudd på'
title: Sikkerheitsnøklar aktivert
omniauth_callbacks:
diff --git a/config/locales/devise.no.yml b/config/locales/devise.no.yml
index a5d6cad7a1..0d824da815 100644
--- a/config/locales/devise.no.yml
+++ b/config/locales/devise.no.yml
@@ -47,11 +47,9 @@
subject: 'Mastodon: Hvordan nullstille passord'
title: Nullstill passord
two_factor_disabled:
- explanation: Tofaktorautentisering for kontoen din har blitt skrudd av. Pålogging er nå mulig ved å bruke kun e-postadresse og passord.
subject: 'Mastodon: Tofaktorautentisering deaktivert'
title: 2FA deaktivert
two_factor_enabled:
- explanation: Tofaktorautentisering er aktivert for kontoen din. Et token som er generert av appen for tidsbasert engangspassord (TOTP) som er koblet til kontoen kreves for innlogging.
subject: 'Mastodon: Tofaktorautentisering aktivert'
title: 2FA aktivert
two_factor_recovery_codes_changed:
@@ -70,11 +68,9 @@
subject: 'Mastodon: Sikkerhetsnøkkel slettet'
title: En av sikkerhetsnøklene dine har blitt slettet
webauthn_disabled:
- explanation: Autentisering med sikkerhetsnøkler er deaktivert for kontoen din. Innlogging er nå mulig ved hjelp av kun et token som er generert av engangspassord-appen som er koblet til kontoen.
subject: 'Mastodon: Autentisering med sikkerhetsnøkler ble skrudd av'
title: Sikkerhetsnøkler deaktivert
webauthn_enabled:
- explanation: Sikkerhetsnøkkel-autentisering er aktivert for din konto. Din sikkerhetsnøkkel kan nå brukes til innlogging.
subject: 'Mastodon: Sikkerhetsnøkkelsautentisering ble skrudd på'
title: Sikkerhetsnøkler aktivert
omniauth_callbacks:
diff --git a/config/locales/devise.oc.yml b/config/locales/devise.oc.yml
index 16419cd1e3..2640777e00 100644
--- a/config/locales/devise.oc.yml
+++ b/config/locales/devise.oc.yml
@@ -47,11 +47,9 @@ oc:
subject: Mastodon : consignas per reïnicializar lo senhal
title: Reïnicializacion del senhal
two_factor_disabled:
- explanation: L’autentificacion dos factors per vòstre compte es estada desactivada. La connexion es ara possibla solament amb l’adreça electronica e lo senhal.
subject: 'Mastodon : autentificacion dos factors desactivada'
title: 2FA desactivat
two_factor_enabled:
- explanation: L’autentificacion dos factors es estada activada per vòstre compte. La connexion demandarà un geton generat per l’aplicacion TOTP associada.
subject: 'Mastodon : autentificacion dos factor activada'
title: 2FA activat
two_factor_recovery_codes_changed:
@@ -70,11 +68,9 @@ oc:
subject: 'Mastodon : clau de seguretat suprimida'
title: Una de vòstras claus de seguretats es estada suprimida
webauthn_disabled:
- explanation: L’autentificacion amb de claus de seguretat foguèt estada desactivada per vòstre compte. L’identificacion es ara possible en utilizan un geton generat per una aplicacion TOTP associada.
subject: 'Mastodon : autentificacion amb claus de seguretat desactivada'
title: Claus de seguretat desactivadas
webauthn_enabled:
- explanation: L’autentificacion amb de claus de seguretat foguèt estada activada per vòstre compte. Vòstra clau de seguretat pòt ara èsser utilizada per l’identificacion.
subject: 'Mastodon : autentificacion via clau de seguretat activada'
title: Claus de seguretat activadas
omniauth_callbacks:
diff --git a/config/locales/devise.pl.yml b/config/locales/devise.pl.yml
index ff086888f3..a6d48f11ef 100644
--- a/config/locales/devise.pl.yml
+++ b/config/locales/devise.pl.yml
@@ -47,16 +47,19 @@ pl:
subject: 'Mastodon: Instrukcje ustawienia nowego hasła'
title: Przywracanie hasła
two_factor_disabled:
- explanation: Uwierzytelnianie dwuskładnikowe dla Twojego konta zostało wyłączone. Możesz się teraz logować korzystając z samego adresu e-mail i hasła.
+ explanation: Logowanie teraz możliwe tylko adresem mejlowym i hasłem.
subject: Mastodon – wyłączono uwierzytelnianie dwustopniowe
+ subtitle: Wyłączono uwierzytelnienie dwuskładnikowe dla twojego konta.
title: Wyłączono 2FA
two_factor_enabled:
- explanation: Uwierzytelnianie dwuskładnikowe dla Twojego konta zostało włączone. Logując się, będziesz potrzebować tokenu z połączonej aplikacji TOTP.
+ explanation: Do zalogowanie potrzebny będzie token sparowanej aplikacji TOTP.
subject: Mastodon – włączono uwierzytelnianie dwustopniowe
+ subtitle: Włączono uwierzytelnienie dwuskładnikowe dla twojego konta.
title: Włączono 2FA
two_factor_recovery_codes_changed:
explanation: Poprzednie kody zapasowe zostały unieważnione, a nowe zostały wygenerowane.
subject: Mastodon – wygenerowano nowe kody ratunkowe 2FA
+ subtitle: Unieważniono stare kody przywracania i wygenerowano nowe.
title: Zmieniono kody odzyskiwania 2FA
unlock_instructions:
subject: 'Mastodon: Instrukcje odblokowania konta'
@@ -70,11 +73,13 @@ pl:
subject: 'Mastodon: Klucz bezpieczeństwa usunięty'
title: Usunięto jeden z twoich kluczy bezpieczeństwa
webauthn_disabled:
- explanation: Uwierzytelnianie kluczem bezpieczeństwa zostało wyłączone dla Twojego konta. Logowanie jest teraz możliwe tylko przy użyciu tokenu generowanego przez sparowaną aplikację TOTP.
+ explanation: Wyłączono autoryzację kluczami bezpieczeństwa dla twojego konta.
+ extra: Logowanie teraz możliwe tylko tokenem wygenerowanym przez sparowaną aplikację TOTP.
subject: 'Mastodon: Wyłączono uwierzytelnianie z kluczami bezpieczeństwa'
title: Wyłączono klucze bezpieczeństwa
webauthn_enabled:
- explanation: Uwierzytelnianie klucza bezpieczeństwa zostało włączone dla Twojego konta. Klucz bezpieczeństwa może być teraz wykorzystywany do logowania.
+ explanation: Włączono autoryzację kluczami bezpieczeństwa dla twojego konta.
+ extra: Twój klucz bezpieczeństwa może być teraz użyty do logowania.
subject: 'Mastodon: Włączono uwierzytelnianie z kluczami bezpieczeństwa'
title: Włączono klucze bezpieczeństwa
omniauth_callbacks:
diff --git a/config/locales/devise.pt-BR.yml b/config/locales/devise.pt-BR.yml
index 6345a103b8..8b53f96514 100644
--- a/config/locales/devise.pt-BR.yml
+++ b/config/locales/devise.pt-BR.yml
@@ -47,16 +47,18 @@ pt-BR:
subject: 'Mastodon: Instruções para alterar senha'
title: Redefinir senha
two_factor_disabled:
- explanation: A autenticação de dois fatores para sua conta foi desativada. Agora é possível entrar apenas com seu endereço de e-mail e senha.
+ explanation: O ‘login’ agora é possível usando apenas o endereço de e-mail e senha.
subject: 'Mastodon: Autenticação de dois fatores desativada'
+ subtitle: A autenticação de dois fatores foi desativada.
title: 2FA desativada
two_factor_enabled:
- explanation: A autenticação de dois fatores foi ativada para sua conta. Um código gerado no aplicativo TOTP pareado será necessário para entrar.
subject: 'Mastodon: Autenticação de dois fatores ativada'
+ subtitle: A autenticação de dois fatores foi ativada para sua conta.
title: 2FA ativada
two_factor_recovery_codes_changed:
explanation: Os códigos de recuperação anteriores foram invalidados e novos códigos foram gerados.
subject: 'Mastodon: Novos códigos de recuperação de dois fatores'
+ subtitle: Os códigos de recuperação anteriores foram invalidados, e novos códigos foram gerados.
title: Códigos de recuperação de dois fatores alterados
unlock_instructions:
subject: 'Mastodon: Instruções de desbloqueio'
@@ -70,11 +72,12 @@ pt-BR:
subject: 'Mastodon: Chave de segurança excluída'
title: Uma das suas chaves de segurança foi excluída
webauthn_disabled:
- explanation: A autenticação por chaves de segurança foi desativada para a sua conta. Agora é possível entrar apenas com seu código gerado no aplicativo TOTP pareado.
+ explanation: A autenticação por chaves de segurança foi desativada para sua conta.
subject: 'Mastodon: Autenticação por chaves de segurança desativada'
title: Chaves de segurança desativadas
webauthn_enabled:
- explanation: A autenticação por chave de segurança foi ativada para a sua conta. Sua chave de segurança agora pode ser usada para entrar.
+ explanation: Autenticação por chave de segurança foi ativada para sua conta.
+ extra: Sua chave de segurança agora pode ser usada para ‘login’.
subject: 'Mastodon: Autenticação por chaves de segurança ativada'
title: Chaves de segurança ativadas
omniauth_callbacks:
diff --git a/config/locales/devise.pt-PT.yml b/config/locales/devise.pt-PT.yml
index 0571598ae0..c169ddeb97 100644
--- a/config/locales/devise.pt-PT.yml
+++ b/config/locales/devise.pt-PT.yml
@@ -47,16 +47,19 @@ pt-PT:
subject: 'Mastodon: Instruções para redefinir a palavra-passe'
title: Solicitar nova palavra-passe
two_factor_disabled:
- explanation: A autenticação em duas etapas para a sua conta foi desativada. É agora possível aceder apenas com o seu endereço de e-mail e palavra-passe.
+ explanation: O acesso agora é possível usando apenas o endereço de correio eletrónico e palavra-passe.
subject: 'Mastodon: Autenticação de duas etapas desativada'
+ subtitle: A autenticação de dois fatores foi desativada para a sua conta.
title: 2FA desativado
two_factor_enabled:
- explanation: A autenticação em duas etapas foi ativada para a sua conta. Um token, gerado pela aplicação TOTP emparelhada, será necessário para aceder.
+ explanation: Um token gerado pelo aplicativo TOTP emparelhado será necessário para login.
subject: 'Mastodon: Autenticação em duas etapas ativada'
+ subtitle: A autenticação de dois fatores foi habilitada para sua conta.
title: 2FA ativado
two_factor_recovery_codes_changed:
explanation: Os códigos de recuperação anteriores foram invalidados e novos foram gerados.
subject: 'Mastodon: Gerados novos códigos de recuperação em duas etapas'
+ subtitle: Os códigos de recuperação anteriores foram invalidados e novos foram gerados.
title: Códigos de recuperação 2FA alterados
unlock_instructions:
subject: 'Mastodon: Instruções para desbloquear a tua conta'
@@ -70,11 +73,13 @@ pt-PT:
subject: 'Mastodon: Chave de segurança eliminada'
title: Uma das suas chaves de segurança foi eliminada
webauthn_disabled:
- explanation: A autenticação com chave de segurança foi desativada para a sua conta. Tornou-se possível aceder à sua conta usando apenas o token gerado pela aplicação TOTP emparelhada.
+ explanation: A autenticação com chaves de segurança foi desativada para sua conta.
+ extra: O login agora é possível usando apenas o token gerado pelo aplicativo TOTP emparelhado.
subject: 'Mastodon: Autenticação com chave de segurança desativada'
title: Chaves de segurança desativadas
webauthn_enabled:
- explanation: A autenticação com chave de segurança foi ativada para sua conta. A sua chave de segurança pode agora ser utilizada para aceder à sua conta.
+ explanation: A autenticação da chave de segurança foi habilitada para sua conta.
+ extra: Sua chave de segurança agora pode ser usada para login.
subject: 'Mastodon: Autenticação com chave de segurança ativada'
title: Chaves de segurança ativadas
omniauth_callbacks:
diff --git a/config/locales/devise.ro.yml b/config/locales/devise.ro.yml
index d25d0f6b3e..1a6a3ecd77 100644
--- a/config/locales/devise.ro.yml
+++ b/config/locales/devise.ro.yml
@@ -47,11 +47,9 @@ ro:
subject: Instrucțiuni pentru resetarea parolei
title: Resetare parolă
two_factor_disabled:
- explanation: Autentificarea în doi pași pentru contul tău a fost dezactivată. Autentificarea este posibilă acum folosind doar adresa de e-mail și parola.
subject: Autentificare cu doi factori dezactivată
title: 2FA dezactivat
two_factor_enabled:
- explanation: Autentificarea în doi pași a fost activată pentru contul dvs. Un token generat de aplicația TOTP împerecheată va fi necesar pentru autentificare.
subject: Autentificare în doi pași activată
title: 2FA activat
two_factor_recovery_codes_changed:
@@ -70,11 +68,9 @@ ro:
subject: 'Mastodon: Cheie de securitate ștearsă'
title: Una dintre cheile tale de securitate a fost ștearsă
webauthn_disabled:
- explanation: Autentificarea cu chei de securitate a fost dezactivată pentru contul tău. Conectarea este posibilă acum folosind doar token-ul generat de aplicația TOTP.
subject: 'Mastodon: Autentificarea cu chei de securitate dezactivată'
title: Chei de securitate dezactivate
webauthn_enabled:
- explanation: Autentificarea cheii de securitate a fost activată pentru contul tău. Cheia ta de securitate poate fi acum folosită pentru conectare.
subject: 'Mastodon: Autentificarea cheii de securitate activată'
title: Chei de securitate activate
omniauth_callbacks:
diff --git a/config/locales/devise.ru.yml b/config/locales/devise.ru.yml
index d2903ce23d..ccbd13438d 100644
--- a/config/locales/devise.ru.yml
+++ b/config/locales/devise.ru.yml
@@ -47,11 +47,9 @@ ru:
subject: 'Mastodon: Инструкция по сбросу пароля'
title: Сброс пароля
two_factor_disabled:
- explanation: Для вашей учётной записи была отключена двухфакторная авторизация. Выполнить вход теперь можно используя лишь e-mail и пароль.
subject: 'Mastodon: Двухфакторная авторизация отключена'
title: 2ФА отключена
two_factor_enabled:
- explanation: Для вашей учётной записи была настроена двухфакторная авторизация. Отныне для входа потребуется также временный код из приложения-аутентификатора.
subject: 'Mastodon: Настроена двухфакторная авторизация'
title: 2ФА включена
two_factor_recovery_codes_changed:
@@ -70,11 +68,9 @@ ru:
subject: 'Мастодон: Ключ Безопасности удален'
title: Один из ваших защитных ключей был удален
webauthn_disabled:
- explanation: Аутентификация с помощью ключей безопасности отключена для вашей учётной записи. Теперь вход возможен с использованием только токена, сгенерированного в приложении TOTP.
subject: 'Мастодон: Аутентификация с ключами безопасности отключена'
title: Ключи безопасности отключены
webauthn_enabled:
- explanation: Для вашей учётной записи включена аутентификация по ключу безопасности. Теперь ваш ключ безопасности может быть использован для входа.
subject: 'Мастодон: Включена аутентификация по ключу безопасности'
title: Ключи безопасности включены
omniauth_callbacks:
diff --git a/config/locales/devise.sc.yml b/config/locales/devise.sc.yml
index 02bcab0d11..5486371a4c 100644
--- a/config/locales/devise.sc.yml
+++ b/config/locales/devise.sc.yml
@@ -47,11 +47,9 @@ sc:
subject: 'Mastodon: Istrutziones pro resetare sa crae'
title: Càmbiu de crae
two_factor_disabled:
- explanation: S'autenticatzione a duos fatores est istada disativada pro su contu tuo. Immoe podes intrare impreende isceti indiritzu de posta eletrònica e crae.
subject: 'Mastodon: Autenticatzione a duos fatores disativada'
title: 2FA disativada
two_factor_enabled:
- explanation: S'autenticatzione a duos fatores est istada ativada pro su contu tuo. Pro s'atzessu at èssere rechèdidu unu còdighe de autorizatzione generadu dae s'aplicatzione TOTP.
subject: 'Mastodon: Autenticatzione a duos fatores ativada'
title: 2FA ativada
two_factor_recovery_codes_changed:
@@ -70,11 +68,9 @@ sc:
subject: 'Mastodon: Crae de seguresa cantzellada'
title: Una de is craes de seguresa tuas est istada cantzellada
webauthn_disabled:
- explanation: S'autenticatzione cun craes de seguresa est istada disabilitada pro su contu tuo. S'intrada immoe est possìbile impreende isceti su getone ingendradu dae s'aplicatzione TOTP ligada.
subject: 'Mastodon: Autenticatzione cun craes de seguresa disabilitada'
title: Craes de seguresa disabilitadas
webauthn_enabled:
- explanation: S'autenticatzione cun crae de seguresa est istada abilitada pro su contu tuo. Sa crae de seguresa tua immoe si podet impreare pro intrare.
subject: 'Mastodon: Autenticatzione cun sa crae de seguresa ativada'
title: Craes de seguresa abilitadas
omniauth_callbacks:
diff --git a/config/locales/devise.sco.yml b/config/locales/devise.sco.yml
index 8563b4ee24..1db6bbe303 100644
--- a/config/locales/devise.sco.yml
+++ b/config/locales/devise.sco.yml
@@ -47,11 +47,9 @@ sco:
subject: 'Mastodon: Reset passwird instructions'
title: Passwird reset
two_factor_disabled:
- explanation: Twa factor authentication fir yer accoont haes been turnt aff. Login is noo possible uisin ainly a email address an passwird.
subject: 'Mastodon: Twa-factor authentication turnt aff'
title: 2FA turnt aff
two_factor_enabled:
- explanation: Twa-factor authentication haes been turnt on fir yer accoont. A token gien bi the pairt TOTP app wull be needit fir login.
subject: 'Mastodon: Twa-factor authentication turnt on'
title: 2FA turnt on
two_factor_recovery_codes_changed:
@@ -70,11 +68,9 @@ sco:
subject: 'Mastodon: Security key deletit'
title: Ane o yer security keys haes been deletit
webauthn_disabled:
- explanation: Authentication wi security keys haes been turnt aff on yer accoont. Login is noo possible uisin ainly the token generatit bi the pairt TOTP app.
subject: 'Mastodon: Authentication wi security keys turnt aff'
title: Security keys turnt aff
webauthn_enabled:
- explanation: Security key authentication haes been turnt on fir yer accoont. Yer security key kin noo be uised fir login.
subject: 'Mastodon: Security key authentication turnt on'
title: Security keys turnt on
omniauth_callbacks:
diff --git a/config/locales/devise.si.yml b/config/locales/devise.si.yml
index 362f97b8a9..d0bfa719bc 100644
--- a/config/locales/devise.si.yml
+++ b/config/locales/devise.si.yml
@@ -44,10 +44,8 @@ si:
subject: 'මාස්ටඩන්: මුරපදය යළි සැකසීමේ උපදෙස්'
title: මුරපදය යළි සැකසීම
two_factor_disabled:
- explanation: ඔබගේ ගිණුම සඳහා ද්වි-සාධක සත්යාපනය අබල කර ඇත. විද්යුත් තැපැල් ලිපිනය සහ මුරපදය පමණක් භාවිතයෙන් දැන් පුරනය විය හැක.
title: ද්විපියවර අබලයි
two_factor_enabled:
- explanation: ඔබගේ ගිණුම සඳහා ද්වි-සාධක සත්යාපනය සක්රීය කර ඇත. යුගල කළ TOTP යෙදුම මගින් ජනනය කරන ලද ටෝකනයක් පුරනය වීමට අවශ්ය වනු ඇත.
title: ද්විපියවර සබලයි
two_factor_recovery_codes_changed:
explanation: පෙර ප්රතිසාධන කේත අවලංගු කර නව ඒවා උත්පාදනය කර ඇත.
@@ -65,10 +63,8 @@ si:
subject: 'මාස්ටඩන්: ආරක්ෂණ යතුර මකා ඇත'
title: ඔබගේ ආරක්ෂක යතුරු වලින් එකක් මකා ඇත
webauthn_disabled:
- explanation: ඔබගේ ගිණුම සඳහා ආරක්ෂක යතුරු සමඟ සත්යාපනය අබල කර ඇත. යුගල කළ TOTP යෙදුම මගින් ජනනය කරන ලද ටෝකනය පමණක් භාවිතයෙන් දැන් පුරනය විය හැක.
title: ආරක්ෂණ යතුරු අබල කර ඇත
webauthn_enabled:
- explanation: ඔබගේ ගිණුම සඳහා ආරක්ෂක යතුරු සත්යාපනය සක්රීය කර ඇත. ඔබගේ ආරක්ෂක යතුර දැන් පුරනය වීම සඳහා භාවිතා කළ හැක.
title: ආරක්ෂණ යතුරු සබල කර ඇත
omniauth_callbacks:
failure: '"%{reason}" නිසා %{kind} සිට ඔබව සත්යාපනය කළ නොහැක.'
diff --git a/config/locales/devise.sk.yml b/config/locales/devise.sk.yml
index e11c7f1db3..3eb4b5304c 100644
--- a/config/locales/devise.sk.yml
+++ b/config/locales/devise.sk.yml
@@ -47,11 +47,11 @@ sk:
subject: 'Mastodon: Pokyny pre obnovu hesla'
title: Nastav nové heslo
two_factor_disabled:
- explanation: Dvojfázové overovanie tvojho účtu bolo vypnuté. Teraz sa môžeš prihlásiť len pomocou emailu a hesla.
+ explanation: Prihlásenie je teraz možné iba pomocou emailu a hesla.
subject: 'Mastodon: Dvojfázové overovanie vypnuté'
+ subtitle: Dvoj-faktorové overenie bolo pre tvoj účet vypnuté.
title: Dvoj-faktorové overovanie vypnuté
two_factor_enabled:
- explanation: Dvojfázové overovanie bolo zapnuté pre tvoj účet. Pre prihlásenie budeš potrebovať token vygenerovaný pre TOTP aplikáciu, ktorá je spárovaná.
subject: 'Mastodon: Dvojfázové overovanie zapnuté'
title: Dvoj-faktorové overovanie zapnuté
two_factor_recovery_codes_changed:
@@ -70,11 +70,9 @@ sk:
subject: 'Mastodon: Bezpečnostný kľúč odstránený'
title: Jeden z vašich bezpečnostných kľúčov bol odstránený
webauthn_disabled:
- explanation: Overovanie pomocou bezpečnostných kľúčov bolo pre vaše konto vypnuté. Prihlásenie je teraz možné len pomocou tokenu vygenerovaného spárovanou aplikáciou TOTP.
subject: 'Mastodon: Overovanie s vypnutými bezpečnostnými kľúčmi'
title: Bezpečnostné kľúče sú vypnuté
webauthn_enabled:
- explanation: Pre vaše konto bolo povolené overovanie bezpečnostným kľúčom. Váš bezpečnostný kľúč teraz môžete použiť na prihlásenie.
subject: 'Mastodon: Povolené overovanie bezpečnostného kľúča'
title: Povolené bezpečnostné kľúče
omniauth_callbacks:
diff --git a/config/locales/devise.sl.yml b/config/locales/devise.sl.yml
index be0f98ae11..72269e4826 100644
--- a/config/locales/devise.sl.yml
+++ b/config/locales/devise.sl.yml
@@ -47,11 +47,9 @@ sl:
subject: 'Mastodon: navodila za ponastavitev gesla'
title: Ponastavitev gesla
two_factor_disabled:
- explanation: Dvojno oz. dvofazno preverjanje pristnosti je za vaš račun onemogočeno. Prijava je zdaj možna le z e-poštnim naslovom in geslom.
subject: 'Mastodon: dvojno preverjanje pristnosti je onemogočeno'
title: 2FA onemogočeno
two_factor_enabled:
- explanation: Dvojno oz. dvofazno preverjanje pristnosti je za vaš račun omogočeno. Žeton, izdelan z aplikacijo TOTP, bo zahtevan zs prijavo.
subject: 'Mastodon: dvojno preverjanje pristnosti je omogočeno'
title: 2FA omogočeno
two_factor_recovery_codes_changed:
@@ -70,11 +68,9 @@ sl:
subject: 'Mastodon: varnostna koda izbrisana'
title: Ena od vaših varnostnih kod je bila izbrisana
webauthn_disabled:
- explanation: Overjanje pristnosti z varnostnimi kodami je za vaš račun onemogočeno. Prijava je zdaj možna le z uporabo žetona, ki ga izdela oparjena aplikacija TOTP.
subject: 'Mastodon: overjanje pristnosti z varnosnimi kodami je onemogočeno'
title: Varnostne kode onemogočene
webauthn_enabled:
- explanation: Overjanje z varnostno kodo je za vaš račun omogočeno. Svojo varnostno kodo lahko zdaj uporabite za prijavo.
subject: 'Mastodon: preverjanje pristnosti z varnostno kodo je omogočeno'
title: Varnostne kode omogočene
omniauth_callbacks:
diff --git a/config/locales/devise.sq.yml b/config/locales/devise.sq.yml
index 6e2f1b4113..7cea2f8e2e 100644
--- a/config/locales/devise.sq.yml
+++ b/config/locales/devise.sq.yml
@@ -47,11 +47,9 @@ sq:
subject: 'Mastodon: Udhëzime ricaktimi fjalëkalimi'
title: Ricaktim fjalëkalimi
two_factor_disabled:
- explanation: Mirëfilltësimi dyfaktorësh për llogarinë tuaj është çaktivizuar. Hyrja tanimë është e mundur vetëm duke përdorur adresën email dhe fjalëkalimin.
subject: 'Mastodon: U çaktivizua mirëfilltësimi dyfaktorësh'
title: 2FA u çaktivizua
two_factor_enabled:
- explanation: Mirëfilltësimi dyfaktorësh është aktivizuar për llogarinë tuaj. Për hyrje, do të kërkohet doemos një token i prodhuar nga aplikacioni TOTP i çiftuar.
subject: 'Mastodon: U aktivizua mirëfilltësimi dyfaktorësh'
title: 2FA u aktivizua
two_factor_recovery_codes_changed:
@@ -70,11 +68,9 @@ sq:
subject: 'Mastodon: Fshirje kyçi sigurie'
title: Një nga kyçet tuaj të sigurisë është fshirë
webauthn_disabled:
- explanation: Mirëfilltësimi me kyçe sigurie është çaktivizuar për llogarinë tuaj. Hyrja tani është e mundshme vetëm duke përdorur token-in e prodhuar nga aplikacioni TOTP i çiftuar.
subject: 'Mastodon: U çaktivizua mirëfilltësimi me kyçe sigurie'
title: U çaktivizuan kyçe sigurie
webauthn_enabled:
- explanation: Mirëfilltësimi përmes kyçesh sigurie është aktivizuar për llogarinë tuaj. Tani, për hyrje mund të përdoren kyçet tuaj të sigurisë.
subject: 'Mastodon: U aktivizua mirëfilltësim me kyçe sigurie'
title: U aktivizuan kyçe sigurie
omniauth_callbacks:
diff --git a/config/locales/devise.sr-Latn.yml b/config/locales/devise.sr-Latn.yml
index 40f3d51c30..c48ed87dca 100644
--- a/config/locales/devise.sr-Latn.yml
+++ b/config/locales/devise.sr-Latn.yml
@@ -47,16 +47,19 @@ sr-Latn:
subject: 'Mastodont: Uputstvo za resetovanje lozinke'
title: Lozinka resetovana
two_factor_disabled:
- explanation: Dvofaktorska autentifikacija za vaš nalog je onemogućena. Prijava je sada moguća samo pomoću imejla i lozinke.
+ explanation: Prijavljivanje je sada moguće koristeći samo adresu e-pošte i lozinku.
subject: 'Mastodon: Dvofaktorska autentifikacija je onemogućena'
+ subtitle: Dvofaktorska autentifikacija za vaš nalog je onemogućena.
title: 2FA isključena
two_factor_enabled:
- explanation: Dvofaktorska autentifikacija je omogućena za vaš nalog. Za prijavu će biti potreban token koji generiše uparena TOTP aplikacija.
+ explanation: Za prijavljivanje će biti potreban token koji generiše uparena aplikacija TOTP.
subject: 'Mastodon: Dvofaktorska autentifikacija je omogućena'
+ subtitle: Dvofaktorska autentifikacija je omogućena za vaš nalog.
title: 2FA uključena
two_factor_recovery_codes_changed:
explanation: Prethodni kodovi za oporavak su poništeni i generisani su novi.
subject: 'Mastodon: Ponovo su generisani kodovi za oporavak'
+ subtitle: Prethodni kodovi za oporavak su poništeni i generisani su novi.
title: 2FA kodovi oporavka promenjeni
unlock_instructions:
subject: 'Mastodont: Uputstvo za otključavanje korisničkog naloga'
@@ -70,11 +73,13 @@ sr-Latn:
subject: 'Mastodon: Sigurnosni ključ je izbrisan'
title: Jedan od vaših bezbednosnih ključeva je izbrisan
webauthn_disabled:
- explanation: Autentifikacija pomoću bezbednosnih ključeva je onemogućena za vaš nalog. Prijava je sada moguća samo pomoću tokena koji generiše uparena TOTP aplikacija.
+ explanation: Potvrda identiteta pomoću bezbednosnih ključeva je onemogućena za vaš nalog.
+ extra: Prijavljivanje je sada moguće koristeći samo token koji generiše uparena aplikacija TOTP.
subject: 'Mastodon: Autentifikacija sa sigurnosnim ključevima onemogućena'
title: Sigurnosni ključevi su onemogućeni
webauthn_enabled:
- explanation: Autentifikacija sa bezbednosnim ključem je omogućena za vaš nalog. Vaš sigurnosni ključ se sada može koristiti za prijavljivanje.
+ explanation: Autentifikacija pomoću bezbednosnog ključa je omogućena za vaš nalog.
+ extra: Vaš bezbednosni ključ se sada može koristiti za prijavljivanje.
subject: 'Mastodon: Omogućena autentifikacija sa bezbednim ključem'
title: Sigurnosni ključevi su omogućeni
omniauth_callbacks:
diff --git a/config/locales/devise.sr.yml b/config/locales/devise.sr.yml
index f61431de60..3e49cf97ee 100644
--- a/config/locales/devise.sr.yml
+++ b/config/locales/devise.sr.yml
@@ -47,16 +47,19 @@ sr:
subject: 'Mastodon: Упутство за ресетовање лозинке'
title: Лозинка ресетована
two_factor_disabled:
- explanation: Двофакторска аутентификација за ваш налог је онемогућена. Пријава је сада могућа само помоћу имејла и лозинке.
+ explanation: Пријављивање је сада могуће користећи само адресу е-поште и лозинку.
subject: 'Mastodon: Двофакторска аутентификација је онемогућена'
+ subtitle: Двофакторска аутентификација за ваш налог је онемогућена.
title: 2FA искључена
two_factor_enabled:
- explanation: Двофакторска аутентификација је омогућена за ваш налог. За пријаву ће бити потребан токен који генерише упарена ТОТП апликација.
+ explanation: За пријављивање ће бити потребан токен који генерише упарена апликација TOTP.
subject: 'Mastodon: Двофакторска аутентификација је омогућена'
+ subtitle: Двофакторска аутентификација је омогућена за ваш налог.
title: 2FA укључена
two_factor_recovery_codes_changed:
explanation: Претходни кодови за опоравак су поништени и генерисани су нови.
subject: 'Mastodon: Поново су генерисани кодови за опоравак'
+ subtitle: Претходни кодови за опоравак су поништени и генерисани су нови.
title: 2FA кодови опоравка промењени
unlock_instructions:
subject: 'Mastodon: Упутство за откључавање корисничког налога'
@@ -70,11 +73,13 @@ sr:
subject: 'Mastodon: Сигурносни кључ је избрисан'
title: Један од ваших безбедносних кључева је избрисан
webauthn_disabled:
- explanation: Аутентификација помоћу безбедносних кључева је онемогућена за ваш налог. Пријава је сада могућа само помоћу токена који генерише упарена ТОТП апликација.
+ explanation: Потврда идентитета помоћу безбедносних кључева је онемогућена за ваш налог.
+ extra: Пријављивање је сада могуће користећи само токен који генерише упарена апликација TOTP.
subject: 'Mastodon: Аутентификација са сигурносним кључевима онемогућена'
title: Сигурносни кључеви су онемогућени
webauthn_enabled:
- explanation: Аутентификација са безбедносним кључем је омогућена за ваш налог. Ваш сигурносни кључ се сада може користити за пријављивање.
+ explanation: Аутентификација помоћу безбедносног кључа је омогућена за ваш налог.
+ extra: Ваш безбедносни кључ се сада може користити за пријављивање.
subject: 'Mastodon: Омогућена аутентификација са безбедним кључем'
title: Сигурносни кључеви су омогућени
omniauth_callbacks:
diff --git a/config/locales/devise.sv.yml b/config/locales/devise.sv.yml
index e02983ad5f..b089f21427 100644
--- a/config/locales/devise.sv.yml
+++ b/config/locales/devise.sv.yml
@@ -47,16 +47,19 @@ sv:
subject: 'Mastodon: Instruktioner för återställning av lösenord'
title: Lösenordsåterställning
two_factor_disabled:
- explanation: Tvåfaktorsautentisering för ditt konto har inaktiverats. Det är nu möjligt att logga in med enbart e-postadress och lösenord.
+ explanation: Inloggning är nu möjlig med endast e-postadress och lösenord.
subject: 'Mastodon: Tvåfaktorsautentisering inaktiverad'
+ subtitle: Tvåfaktorsautentisering för ditt konto har inaktiverats.
title: 2FA inaktiverad
two_factor_enabled:
- explanation: Tvåfaktorsautentisering har aktiverats för ditt konto. En token som genereras av en kopplad TOTP-app kommer att krävas vid inloggning.
+ explanation: En token skapad av den parkopplade TOTP-appen kommer att krävas för inloggning.
subject: 'Mastodon: Tvåfaktorsautentisering aktiverad'
+ subtitle: Tvåfaktorsautentisering har aktiverats för ditt konto.
title: 2FA aktiverad
two_factor_recovery_codes_changed:
explanation: De tidigare återställningskoderna har ogiltigförklarats och nya har genererats.
subject: Mastodon Tvåfaktors-återställningskoder genererades på nytt
+ subtitle: De tidigare återhämtningskoderna har ogiltigförklarats och nya har skapats.
title: 2FA-återställningskoder ändrades
unlock_instructions:
subject: 'Mastodon: Lås upp instruktioner'
@@ -70,11 +73,10 @@ sv:
subject: 'Mastodon: Säkerhetsnyckeln borttagen'
title: En av dina säkerhetsnycklar har raderats
webauthn_disabled:
- explanation: Autentisering med säkerhetsnycklar till ditt konto har inaktiverats. Inloggning är nu endast möjligt med den token som genereras av den sammankopplade TOTP-appen.
+ explanation: Autentisering med säkerhetsnycklar har inaktiverats för ditt konto.
subject: 'Mastodon: Autentisering med säkerhetsnycklar är inaktiverat'
title: Säkerhetsnycklar inaktiverade
webauthn_enabled:
- explanation: Autentisering med säkerhetsnyckel till ditt konto har aktiverats. Din säkerhetsnyckel kan nu användas för inloggning.
subject: 'Mastodon: Autentisering med säkerhetsnyckel är aktiverat'
title: Säkerhetsnycklar aktiverade
omniauth_callbacks:
diff --git a/config/locales/devise.ta.yml b/config/locales/devise.ta.yml
index d4b4eeefc6..a0e6187ec4 100644
--- a/config/locales/devise.ta.yml
+++ b/config/locales/devise.ta.yml
@@ -47,11 +47,9 @@ ta:
subject: 'மாஸ்டோடான்: கடவுச்சொல்லை மீட்டமைப்பதற்கான வழிமுறைகள்'
title: கடவுச்சொல் மீட்டமைப்பு
two_factor_disabled:
- explanation: உங்களுடைய கணக்கிற்கான இரண்டு கட்டப் பாதுகாப்பு முடக்கப்பட்டுள்ளது. உங்கள் மின்னஞ்சல் முகவரி மற்றும் கடவுச்சொல் மூலமாக மட்டுமே தற்பொழுது உள்நுழைய முடியும்.
subject: 'மாஸ்டடான்: இரண்டு கட்டப் பாதுகாப்பு முடக்கப்பட்டுள்ளது'
title: 2FA உபயோகத்தில் இல்லை
two_factor_enabled:
- explanation: உங்களுடைய கணக்கிற்கான இரண்டு கட்டப் பாதுகாப்பு செயல்படுத்தப்பட்டுள்ளது. இணைக்கப்படும் TOTP செயலியில் ஒரு குறியீடு தோன்றும். உங்கள் கணக்கிற்குள் நுழைய அந்தக் குறியீடு தேவைப்படும்.
subject: 'மாஸ்டடான்: இரண்டு கட்டப் பாதுகாப்பு செயல்படுத்தப்பட்டுள்ளது'
title: 2FA செயல்படுத்தப்பட்டுள்ளது
two_factor_recovery_codes_changed:
diff --git a/config/locales/devise.th.yml b/config/locales/devise.th.yml
index dce498525f..13fdea3fef 100644
--- a/config/locales/devise.th.yml
+++ b/config/locales/devise.th.yml
@@ -47,11 +47,9 @@ th:
subject: 'Mastodon: คำแนะนำการตั้งรหัสผ่านใหม่'
title: การตั้งรหัสผ่านใหม่
two_factor_disabled:
- explanation: ปิดใช้งานการรับรองความถูกต้องด้วยสองปัจจัยสำหรับบัญชีของคุณแล้ว ตอนนี้สามารถเข้าสู่ระบบได้โดยใช้ที่อยู่อีเมลและรหัสผ่านเท่านั้น
subject: 'Mastodon: ปิดใช้งานการรับรองความถูกต้องด้วยสองปัจจัยแล้ว'
title: ปิดใช้งาน 2FA แล้ว
two_factor_enabled:
- explanation: เปิดใช้งานการรับรองความถูกต้องด้วยสองปัจจัยสำหรับบัญชีของคุณแล้ว จะต้องใช้โทเคนที่สร้างโดยแอป TOTP ที่จับคู่สำหรับการเข้าสู่ระบบ
subject: 'Mastodon: เปิดใช้งานการรับรองความถูกต้องด้วยสองปัจจัยแล้ว'
title: เปิดใช้งาน 2FA แล้ว
two_factor_recovery_codes_changed:
@@ -70,11 +68,9 @@ th:
subject: 'Mastodon: ลบกุญแจความปลอดภัยแล้ว'
title: ลบหนึ่งในกุญแจความปลอดภัยของคุณแล้ว
webauthn_disabled:
- explanation: ปิดใช้งานการรับรองความถูกต้องด้วยกุญแจความปลอดภัยสำหรับบัญชีของคุณแล้ว ตอนนี้สามารถเข้าสู่ระบบได้โดยใช้เพียงโทเคนที่สร้างโดยแอป TOTP ที่จับคู่เท่านั้น
subject: 'Mastodon: ปิดใช้งานการรับรองความถูกต้องด้วยกุญแจความปลอดภัยแล้ว'
title: ปิดใช้งานกุญแจความปลอดภัยแล้ว
webauthn_enabled:
- explanation: เปิดใช้งานการรับรองความถูกต้องด้วยกุญแจความปลอดภัยสำหรับบัญชีของคุณแล้ว ตอนนี้สามารถใช้กุญแจความปลอดภัยของคุณสำหรับการเข้าสู่ระบบ
subject: 'Mastodon: เปิดใช้งานการรับรองความถูกต้องด้วยกุญแจความปลอดภัยแล้ว'
title: เปิดใช้งานกุญแจความปลอดภัยแล้ว
omniauth_callbacks:
diff --git a/config/locales/devise.tr.yml b/config/locales/devise.tr.yml
index 86b1c951f7..66ca9b2816 100644
--- a/config/locales/devise.tr.yml
+++ b/config/locales/devise.tr.yml
@@ -47,16 +47,19 @@ tr:
subject: 'Mastodon: Parola sıfırlama talimatları'
title: Parola sıfırlama
two_factor_disabled:
- explanation: Hesabınız için iki-adımlı kimlik doğrulama devre dışı bırakıldı. Şimdi sadece e-posta adresi ve parola kullanarak giriş yapabilirsiniz.
+ explanation: Oturum açma şimdi sadece e-posta adresi ve parola ile mümkün.
subject: 'Mastodon: İki-adımlı kimlik doğrulama devre dışı bırakıldı'
+ subtitle: Hesabınız için iki aşamalı kimlik doğrulama devre dışı bırakılmıştır.
title: 2FA devre dışı bırakıldı
two_factor_enabled:
- explanation: Hesabınız için iki-adımlı kimlik doğrulama etkinleştirildi. Giriş yapmak için eşleştirilmiş TOTP uygulaması tarafından oluşturulan bir belirteç gereklidir.
+ explanation: Oturum açmanız için eşlenmiş TOTP uygulaması tarafından oluşturulmuş bir tokene ihtiyaç var.
subject: 'Mastodon: İki adımlı kimlik doğrulama etkinleştirildi'
+ subtitle: Hesabınız için iki aşamalı kimlik doğrulama etkinleştirilmiştir.
title: 2FA etkinleştirildi
two_factor_recovery_codes_changed:
explanation: Önceki kurtarma kodları geçersiz kılındı ve yenileri oluşturuldu.
subject: 'Mastodon: İki adımlı kurtarma kodları yeniden oluşturuldu'
+ subtitle: Önceki kurtarma kodları geçersiz kılındı ve yenileri oluşturuldu.
title: 2FA kurtarma kodları değiştirildi
unlock_instructions:
subject: 'Mastodon: Kilit açma talimatları'
@@ -70,11 +73,13 @@ tr:
subject: 'Mastodon: Güvenlik anahtarı silindi'
title: Güvenlik anahtarlarınızdan biri silindi
webauthn_disabled:
- explanation: Hesabınız için güvenlik anahtarlarıyla kimlik doğrulama devre dışı bırakıldı. Artık yalnızca eşleştirilmiş TOTP uygulaması tarafından oluşturulan kodu kullanarak giriş yapmak mümkündür.
+ explanation: Hesabınız için güvenlik anahtarıyla kimlik doğrulama devre dışı bırakılmıştır.
+ extra: Oturum açma şimdi sadece eşlenmiş TOTP uygulaması tarafından oluşturulmuş token ile mümkündür.
subject: 'Mastodon: Güvenlik anahtarlarıyla kimlik doğrulama devre dışı'
title: Güvenlik anahtarları devre dışı
webauthn_enabled:
- explanation: Hesabınız için güvenlik anahtarı doğrulaması etkinleştirildi. Güvenlik anahtarınız artık giriş yapmak için kullanılabilir.
+ explanation: Hesabınız için güvenlik anahtarıyla kimlik doğrulama etkinleştirilmiştir.
+ extra: Güvenlik anahtarınız şimdi oturum açma için kullanılabilir.
subject: 'Mastodon: Güvenlik anahtarı doğrulaması etkinleştirildi'
title: Güvenlik anahtarları etkin
omniauth_callbacks:
diff --git a/config/locales/devise.uk.yml b/config/locales/devise.uk.yml
index bb81a2a1b8..55429b3c76 100644
--- a/config/locales/devise.uk.yml
+++ b/config/locales/devise.uk.yml
@@ -47,11 +47,9 @@ uk:
subject: 'Mastodon: Інструкції для скидання паролю'
title: Скидання пароля
two_factor_disabled:
- explanation: Двофакторну аутентифікацію для вашого облікового запису відключено. Тепер ви можете увійти за допомогою лише адреси електронної пошти та пароля.
subject: 'Mastodon: двофакторну авторизацію вимкнено'
title: Двофакторна автентифікація вимкнена
two_factor_enabled:
- explanation: Двофакторну аутентифікацію для вашого облікового запису було увімкнено. Для входу до системи буде потрібний токен, згенерований спареним застосунком TOTP.
subject: 'Mastodon: двофакторну авторизацію увімкнено'
title: Двофакторна автентифікація увімкнена
two_factor_recovery_codes_changed:
@@ -70,11 +68,9 @@ uk:
subject: 'Mastodon: Ключ безпеки видалено'
title: Один з ваших ключів безпеки було видалено
webauthn_disabled:
- explanation: Авторизацію з ключами безпеки було відключено для вашого облікового запису. Вхід тепер можливий лише через токен, згенерований додатком TOTP.
subject: 'Mastodon: Аутентифікація за допомогою ключів безпеки вимкнена'
title: Ключі безпеки вимкнуто
webauthn_enabled:
- explanation: Авторизація ключа безпеки була увімкнена для вашого облікового запису. Ваш ключ безпеки тепер можна використовувати для входу.
subject: 'Mastodon: Авторизація ключа безпеки увімкнена'
title: Ключі безпеки увімкнено
omniauth_callbacks:
diff --git a/config/locales/devise.vi.yml b/config/locales/devise.vi.yml
index 904cc51fe9..190f7282c4 100644
--- a/config/locales/devise.vi.yml
+++ b/config/locales/devise.vi.yml
@@ -47,16 +47,19 @@ vi:
subject: 'Mastodon: Hướng dẫn đổi lại mật khẩu'
title: Đổi lại mật khẩu
two_factor_disabled:
- explanation: Đã vô hiệu hóa xác minh 2 bước cho tài khoản của bạn. Bây giờ chỉ có thể đăng nhập bằng địa chỉ email và mật khẩu.
+ explanation: Đăng nhập bây giờ chỉ có thể sử dụng địa chỉ email và mật khẩu.
subject: 'Mastodon: Xác minh 2 bước đã bị vô hiệu hóa'
+ subtitle: Xác minh hai bước cho tài khoản của bạn đã bị vô hiệu hóa.
title: Vô hiệu hóa xác minh 2 bước
two_factor_enabled:
- explanation: Tài khoản của bạn đã kích hoạt xác minh 2 bước. Lần đăng nhập tới sẽ cần thêm mã đăng nhập được tạo bởi ứng dụng TOTP.
+ explanation: Cần có mã token được tạo bởi ứng dụng TOTP được ghép nối để đăng nhập.
subject: 'Mastodon: Kích hoạt xác minh 2 bước'
+ subtitle: Xác minh hai bước đã được bật cho tài khoản của bạn.
title: Kích hoạt xác minh 2 bước
two_factor_recovery_codes_changed:
explanation: Các mã khôi phục trước đó đã bị vô hiệu hóa và thay bằng mã mới.
subject: 'Mastodon: Mã khôi phục xác thực hai yếu tố đã được tạo lại'
+ subtitle: Các mã khôi phục trước đó đã bị vô hiệu hóa và thay bằng mã mới.
title: Mã khôi phục xác thực hai yếu tố đã thay đổi
unlock_instructions:
subject: 'Mastodon: Hướng dẫn mở khóa'
@@ -70,11 +73,13 @@ vi:
subject: 'Mastodon: Xóa khóa bảo mật'
title: Một trong những khóa bảo mật của bạn vừa bị xóa
webauthn_disabled:
- explanation: Bạn vừa vô hiệu hóa xác thực tài khoản bằng khóa bảo mật. Từ bây giờ, bạn sẽ dùng ứng dụng TOTP để tạo token đăng nhập.
+ explanation: Xác minh bằng khóa bảo mật đã bị vô hiệu hóa đối với tài khoản của bạn.
+ extra: Hiện tại, bạn chỉ có thể đăng nhập bằng cách sử dụng mã token được tạo bởi ứng dụng TOTP được ghép nối.
subject: 'Mastodon: Vô hiệu hóa xác thực bằng khóa bảo mật'
title: Đã vô hiệu hóa khóa bảo mật
webauthn_enabled:
- explanation: Bạn vừa kích hoạt xác thực tài khoản bằng khóa bảo mật. Từ bây giờ, khóa bảo mật của bạn sẽ được dùng để đăng nhập.
+ explanation: Khóa bảo mật đã được bật cho tài khoản của bạn.
+ extra: Hiện bạn đã có thể dùng khóa bảo mật để đăng nhập.
subject: 'Mastodon: Kích hoạt xác minh bằng khóa bảo mật'
title: Đã kích hoạt khóa bảo mật
omniauth_callbacks:
diff --git a/config/locales/devise.zh-CN.yml b/config/locales/devise.zh-CN.yml
index e46c433530..9b4b3ae203 100644
--- a/config/locales/devise.zh-CN.yml
+++ b/config/locales/devise.zh-CN.yml
@@ -47,16 +47,19 @@ zh-CN:
subject: Mastodon：重置密码说明
title: 重置密码
two_factor_disabled:
- explanation: 账号的双因素认证已禁用。现在仅使用邮箱和密码即可登录。
+ explanation: 目前只能通过电子邮件地址和密码登录。
subject: Mastodon：双因素认证已禁用
+ subtitle: 您账户的双因素认证已被停用。
title: 双因素认证已停用
two_factor_enabled:
- explanation: 账号双因素认证已启用。登录时将需要来自已配对的 TOTP 应用生成的验证码。
+ explanation: 登录时需要输入先前配对好的TOTP应用生成的令牌。
subject: Mastodon：双因素认证已启用
+ subtitle: 您账户的双因素认证已被启用。
title: 双因素认证已启用
two_factor_recovery_codes_changed:
explanation: 新恢复码已生成，同时旧恢复码已失效。
subject: Mastodon：双因素认证恢复码已重新生成
+ subtitle: 新恢复码已生成，同时旧恢复码已失效。
title: 双因素认证恢复码已更改
unlock_instructions:
subject: Mastodon：账户解锁信息
@@ -70,11 +73,13 @@ zh-CN:
subject: Mastodon：安全密钥已删除
title: 你的安全密钥之一已被删除
webauthn_disabled:
- explanation: 你的帐户已禁用安全密钥认证。现在只能使用配对的 TOTP 应用程序生成的令牌登录。
+ explanation: 您账户的安全密钥身份认证已被停用。
+ extra: 目前只能用先前配对的TOTP应用生成的令牌登录。
subject: Mastodon：安全密钥认证已禁用
title: 安全密钥已禁用
webauthn_enabled:
- explanation: 你的账户已启用安全密钥身份验证。你的安全密钥现在可以用于登录。
+ explanation: 您账户的安全密钥身份认证已被启用。
+ extra: 您的安全密钥现在可用于登录。
subject: Mastodon：安全密钥认证已启用
title: 已启用安全密钥
omniauth_callbacks:
diff --git a/config/locales/devise.zh-HK.yml b/config/locales/devise.zh-HK.yml
index 2d9e8ddead..7f728bf0ad 100644
--- a/config/locales/devise.zh-HK.yml
+++ b/config/locales/devise.zh-HK.yml
@@ -47,16 +47,19 @@ zh-HK:
subject: 'Mastodon: 重設密碼'
title: 重設密碼
two_factor_disabled:
- explanation: 帳號的雙重認證已被停用。現在只需使用電郵地址和密碼，即可登入。
+ explanation: 現在只需使用電郵地址和密碼即可登入。
subject: Mastodon：已關閉雙重認證
+ subtitle: 你帳號的雙重認證已被停用。
title: 已關閉雙重認證
two_factor_enabled:
- explanation: 賬號的雙重認證已被啟用。登錄時，將需要已配對 TOTP 應用程式生成的驗證碼。
+ explanation: 登入時將需要由配對的一次性密碼應用程式生成的憑證。
subject: Mastodon：已啟用雙重認證
+ subtitle: 你的帳號已啟用雙重認證。
title: 已啟用雙重認證
two_factor_recovery_codes_changed:
explanation: 之前的恢復碼失效了，新的已生成。
subject: Mastodon：已產生新的雙重認證恢復碼
+ subtitle: 先前的恢復碼已經無效，並且已生成新的恢復碼。
title: 雙重認證恢復碼已更改
unlock_instructions:
subject: 'Mastodon: 解除帳號鎖定'
@@ -70,11 +73,13 @@ zh-HK:
subject: 'Mastodon: 安全鑰匙已移除'
title: 你其中的一個安全鑰匙已經被移除了
webauthn_disabled:
- explanation: 你的帳號的安全鑰匙身份驗證已經停用。你只可以用過去已經配對好的基於時間一次性密碼程式生成的密碼來登錄。
+ explanation: 你的帳號已停用安全密鑰認證。
+ extra: 現在只能使用配對的一次性密碼應用程式生成的憑證登入。
subject: 'Mastodon: 安全鑰匙身份驗證已經停用'
title: 已停用安全鑰匙
webauthn_enabled:
- explanation: 安全鑰匙身份驗證已啟用。你的安全鑰匙現在可以用來登錄。
+ explanation: 你的帳號已啟用安全密鑰認證。
+ extra: 你現在可以使用安全密鑰來登入。
subject: 'Mastodon: 安全鑰匙身份驗證已啟用'
title: 已啟用安全鑰匙
omniauth_callbacks:
diff --git a/config/locales/devise.zh-TW.yml b/config/locales/devise.zh-TW.yml
index de977426f2..762c8eba84 100644
--- a/config/locales/devise.zh-TW.yml
+++ b/config/locales/devise.zh-TW.yml
@@ -47,16 +47,19 @@ zh-TW:
subject: Mastodon：重設密碼指引
title: 重設密碼
two_factor_disabled:
- explanation: 您帳號的兩階段驗證已停用。現在只使用電子郵件及密碼登入。
+ explanation: 現在僅可使用電子郵件地址與密碼登入。
subject: Mastodon：已停用兩階段驗證
+ subtitle: 您帳號的兩步驟驗證已停用。
title: 已停用兩階段驗證
two_factor_enabled:
- explanation: 已對您的帳號啟用兩階段驗證。登入時將需要已配對的 TOTP 應用程式所產生之 Token。
+ explanation: 登入時需要配對的 TOTP 應用程式產生的權杖。
subject: Mastodon：已啟用兩階段驗證
+ subtitle: 您的帳號已啟用兩步驟驗證。
title: 已啟用兩階段驗證
two_factor_recovery_codes_changed:
explanation: 之前的備用驗證碼已經失效，且已產生新的。
subject: Mastodon：兩階段驗證備用驗證碼已經重新產生
+ subtitle: 之前的備用驗證碼已經失效，且已產生新的。
title: 兩階段驗證備用驗證碼已變更
unlock_instructions:
subject: Mastodon：解鎖指引
@@ -70,11 +73,13 @@ zh-TW:
subject: Mastodon：安全密鑰已移除
title: 您的一支安全密鑰已經被移除
webauthn_disabled:
- explanation: 您的帳號已停用安全密鑰認證。只能透過已配對的 TOTP 應用程式所產生之 Token 登入。
+ explanation: 您的帳號已停用安全金鑰身份驗證。
+ extra: 現在僅可使用配對的 TOTP 應用程式產生的權杖登入。
subject: Mastodon：安全密鑰認證方式已停用
title: 已停用安全密鑰
webauthn_enabled:
- explanation: 您的帳號已啟用安全密鑰認證。您可以使用安全密鑰登入了。
+ explanation: 您的帳號已啟用安全金鑰驗證。
+ extra: 您的安全金鑰現在可用於登入。
subject: Mastodon：已啟用安全密鑰認證
title: 已啟用安全密鑰
omniauth_callbacks:
diff --git a/config/locales/el.yml b/config/locales/el.yml
index 4c31bfdde0..8b632a358b 100644
--- a/config/locales/el.yml
+++ b/config/locales/el.yml
@@ -1475,6 +1475,7 @@ el:
unknown_browser: Άγνωστος φυλλομετρητής
weibo: Weibo
current_session: Τρέχουσα συνεδρία
+ date: Ημερομηνία
description: "%{browser} σε %{platform}"
explanation: Αυτοί είναι οι φυλλομετρητές που είναι συνδεδεμένοι στον λογαριασμό σου στο Mastodon αυτή τη στιγμή.
ip: IP
@@ -1636,16 +1637,19 @@ el:
webauthn: Κλειδιά ασφαλείας
user_mailer:
appeal_approved:
- action: Μετάβαση στον λογαριασμό σου
+ action: Ρυθμίσεις Λογαριασμού
explanation: Η έφεση του παραπτώματος εναντίον του λογαριασμού σου στις %{strike_date}, που υπέβαλες στις %{appeal_date} έχει εγκριθεί. Ο λογαριασμός σου είναι και πάλι σε καλή κατάσταση.
subject: Η έφεση σου από τις %{date} έχει εγκριθεί
+ subtitle: Ο λογαριασμός σας είναι για άλλη μια φορά σε καλή κατάσταση.
title: Έφεση εγκρίθηκε
appeal_rejected:
explanation: Η έφεση του παραπτώματος εναντίον του λογαριασμού σου στις %{strike_date}, που υπέβαλες στις %{appeal_date} έχει απορριφθεί.
subject: Η έφεση σου από τις %{date} έχει απορριφθεί
+ subtitle: Η έφεση σου απορρίφθηκε.
title: Έφεση απορρίφθηκε
backup_ready:
- explanation: Είχες ζητήσει εφεδρικό αντίγραφο του λογαριασμού σου στο Mastodon. Είναι έτοιμο για λήψη!
+ explanation: Ζητήσατε ένα πλήρες αντίγραφο ασφαλείας του λογαριασμού σας Mastodon.
+ extra: Είναι τώρα έτοιμο για λήψη!
subject: Το αρχείο σου είναι έτοιμο για λήψη
title: Λήψη εφεδρικού αρχείου
suspicious_sign_in:
diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml
index a6e74c4836..b11c6de11f 100644
--- a/config/locales/en-GB.yml
+++ b/config/locales/en-GB.yml
@@ -1773,7 +1773,6 @@ en-GB:
webauthn: Security keys
user_mailer:
appeal_approved:
- action: Go to your account
explanation: The appeal of the strike against your account on %{strike_date} that you submitted on %{appeal_date} has been approved. Your account is once again in good standing.
subject: Your appeal from %{date} has been approved
title: Appeal approved
@@ -1782,7 +1781,6 @@ en-GB:
subject: Your appeal from %{date} has been rejected
title: Appeal rejected
backup_ready:
- explanation: You requested a full backup of your Mastodon account. It's now ready for download!
subject: Your archive is ready for download
title: Archive takeout
suspicious_sign_in:
diff --git a/config/locales/eo.yml b/config/locales/eo.yml
index 8a0033ee6a..1bcf36700b 100644
--- a/config/locales/eo.yml
+++ b/config/locales/eo.yml
@@ -1693,7 +1693,6 @@ eo:
webauthn: Sekurecaj ŝlosiloj
user_mailer:
appeal_approved:
- action: Iri al via konto
explanation: La apelacio de la admono kontra via konto je %{strike_date} pri sendodato %{appeal_date} aprobitas.
subject: Via apelacio de %{date} aprobitas
title: Apelacio estis aprobita
@@ -1702,7 +1701,6 @@ eo:
subject: Via apelacio de %{date} estis malaprobita
title: Apelacio estis malaprobita
backup_ready:
- explanation: Vi petis kompletan arkivon de via Mastodon-konto. Ĝi nun pretas por elŝutado!
subject: Via arkivo estas preta por elŝutado
title: Arkiva elŝuto
suspicious_sign_in:
diff --git a/config/locales/es-AR.yml b/config/locales/es-AR.yml
index f214c92d2a..26c18b5feb 100644
--- a/config/locales/es-AR.yml
+++ b/config/locales/es-AR.yml
@@ -1608,6 +1608,7 @@ es-AR:
unknown_browser: "[Navegador web desconocido]"
weibo: Weibo
current_session: Sesión actual
+ date: Fecha
description: "%{browser} en %{platform}"
explanation: Estos son los navegadores web en los que actualmente iniciaste sesión en tu cuenta de Mastodon.
ip: Dirección IP
@@ -1774,16 +1775,19 @@ es-AR:
webauthn: Llaves de seguridad
user_mailer:
appeal_approved:
- action: Ir a tu cuenta
+ action: Configuración de la cuenta
explanation: La apelación del incumplimiento contra tu cuenta del %{strike_date} que enviaste el %{appeal_date} fue aprobada. Tu cuenta se encuentra de nuevo en buen estado.
subject: Tu apelación del %{date} fue aprobada
+ subtitle: Tu cuenta está, de nuevo, en perfecto estado.
title: Apelación aprobada
appeal_rejected:
explanation: La apelación del incumplimiento contra tu cuenta del %{strike_date} que enviaste el %{appeal_date} fue rechazada.
subject: Tu apelación del %{date} fue rechazada
+ subtitle: Se rechazó tu apelación.
title: Apelación rechazada
backup_ready:
- explanation: Solicitaste un resguardo completo de tu cuenta de Mastodon. ¡Ya está listo para descargar!
+ explanation: Solicitaste una copia de seguridad completa de tu cuenta de Mastodon.
+ extra: "¡Ya está lista para descargar!"
subject: Tu archivo historial está listo para descargar
title: Descargar archivo historial
suspicious_sign_in:
diff --git a/config/locales/es-MX.yml b/config/locales/es-MX.yml
index 7f5b282873..32178d0b04 100644
--- a/config/locales/es-MX.yml
+++ b/config/locales/es-MX.yml
@@ -1608,6 +1608,7 @@ es-MX:
unknown_browser: Navegador desconocido
weibo: Weibo
current_session: Sesión actual
+ date: Fecha
description: "%{browser} en %{platform}"
explanation: Estos son los navegadores web conectados actualmente en tu cuenta de Mastodon.
ip: IP
@@ -1774,16 +1775,19 @@ es-MX:
webauthn: Claves de seguridad
user_mailer:
appeal_approved:
- action: Ir a tu cuenta
+ action: Ajustes de la cuenta
explanation: La apelación de la amonestación contra tu cuenta del %{strike_date} que enviaste el %{appeal_date} fue aprobada. Tu cuenta se encuentra de nuevo en buen estado.
subject: Tu apelación del %{date} ha sido aprobada
+ subtitle: Tu cuenta se encuentra de nuevo en buen estado.
title: Apelación aprobada
appeal_rejected:
explanation: La apelación de la amonestación contra tu cuenta del %{strike_date} que enviaste el %{appeal_date} fue rechazada.
subject: Tu apelación del %{date} ha sido rechazada
+ subtitle: Tu apelación ha sido rechazada.
title: Apelación rechazada
backup_ready:
- explanation: Has solicitado una copia completa de tu cuenta de Mastodon. ¡Ya está preparada para descargar!
+ explanation: Has solicitado una copia de seguridad completa de tu cuenta de Mastodon.
+ extra: "¡Ya está listo para descargar!"
subject: Tu archivo está preparado para descargar
title: Descargar archivo
suspicious_sign_in:
diff --git a/config/locales/es.yml b/config/locales/es.yml
index a1e9401f5a..9235b985fb 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -1608,6 +1608,7 @@ es:
unknown_browser: Navegador Desconocido
weibo: Weibo
current_session: Sesión actual
+ date: Fecha
description: "%{browser} en %{platform}"
explanation: Estos son los navegadores web conectados actualmente en tu cuenta de Mastodon.
ip: IP
@@ -1774,16 +1775,19 @@ es:
webauthn: Claves de seguridad
user_mailer:
appeal_approved:
- action: Ir a tu cuenta
+ action: Ajustes de la cuenta
explanation: La apelación de la amonestación contra tu cuenta del %{strike_date} que enviaste el %{appeal_date} fue aprobada. Tu cuenta se encuentra de nuevo en buen estado.
subject: Tu apelación del %{date} ha sido aprobada
+ subtitle: Tu cuenta se encuentra de nuevo en perfecto estado.
title: Apelación aprobada
appeal_rejected:
explanation: La apelación de la amonestación contra tu cuenta del %{strike_date} que enviaste el %{appeal_date} fue rechazada.
subject: Tu apelación del %{date} ha sido rechazada
+ subtitle: Tu apelación ha sido rechazada.
title: Apelación rechazada
backup_ready:
- explanation: Has solicitado una copia completa de tu cuenta de Mastodon. ¡Ya está preparada para descargar!
+ explanation: Has solicitado una copia de seguridad completa de tu cuenta de Mastodon.
+ extra: "¡Ya está listo para descargar!"
subject: Tu archivo está preparado para descargar
title: Descargar archivo
suspicious_sign_in:
diff --git a/config/locales/et.yml b/config/locales/et.yml
index 806238431d..71f49e1abb 100644
--- a/config/locales/et.yml
+++ b/config/locales/et.yml
@@ -1608,6 +1608,7 @@ et:
unknown_browser: Tundmatu veebilehitseja
weibo: Weibo
current_session: Praegune seanss
+ date: Kuupäev
description: "%{browser} platvormil %{platform}"
explanation: Need veebilehitsejad on praegu su Mastodoni kontole sisse loginud.
ip: IP
@@ -1776,16 +1777,19 @@ et:
webauthn: Turvavõtmed
user_mailer:
appeal_approved:
- action: Oma kontole
+ action: Konto seaded
explanation: "%{appeal_date} esitatud vaidlustus %{strike_date} otsuse kohta on rahuldatud. Konto on ennistatud."
subject: "%{date} esitatud vaidlustus on rahuldatud"
+ subtitle: Sinu konto on jälle heas seisukorras.
title: Vaidlustus rahuldatud
appeal_rejected:
explanation: "%{appeal_date} esitatud vaidlustus %{strike_date} otsuse kohta on tagasi lükatud."
subject: "%{date} esitatud vaidlustus on tagasi lükatud"
+ subtitle: Sinu vaidlustus lükati tagasi.
title: Vaidlustus tagasi lükatud
backup_ready:
- explanation: Taotlesid oma Mastodoni konto varukoopiat. See on nüüd valmis allalaadimiseks!
+ explanation: Taotlesid oma Mastodoni konto täisvarundust.
+ extra: See on nüüd allalaadimiseks valmis!
subject: Arhiiv on allalaadimiseks valmis
title: Arhiivi väljavõte
suspicious_sign_in:
diff --git a/config/locales/eu.yml b/config/locales/eu.yml
index 9174b83b43..4b91f7a524 100644
--- a/config/locales/eu.yml
+++ b/config/locales/eu.yml
@@ -1612,6 +1612,7 @@ eu:
unknown_browser: Nabigatzaile ezezaguna
weibo: Weibo
current_session: Uneko saioa
+ date: Data
description: "%{browser} - %{platform}"
explanation: Zure Mastodon kontuan saioa hasita duten nabigatzaileak daude.
ip: IP-a
@@ -1778,16 +1779,19 @@ eu:
webauthn: Segurtasun gakoak
user_mailer:
appeal_approved:
- action: Joan zure kontura
+ action: Kontuaren ezarpenak
explanation: "%{strike_date}(e)an zure kontuari ezarritako neurriaren aurka %{appeal_date}(e)an jarri zenuen apelazioa onartu da. Zure kontua egoera onean dago berriro."
subject: "%{date}(e)ko zure apelazioa onartu da"
+ subtitle: Zure kontua egoera onean dago berriro.
title: Apelazioa onartuta
appeal_rejected:
explanation: "%{strike_date}(e)an zure kontuari ezarritako neurriaren aurka %{appeal_date}(e)an jarri zenuen apelazioa baztertu da."
subject: "%{date}(e)ko zure apelazioa baztertu da"
+ subtitle: Zure apelazioa baztertu da.
title: Apelazioa baztertuta
backup_ready:
- explanation: Zure Mastodon kontuaren babes-kopia osoa eskatu duzu. Deskargatzeko prest dago!
+ explanation: Mastodon kontuaren babeskopia osoa eskatu duzu.
+ extra: Deskargatzeko prest!
subject: Zure artxiboa deskargatzeko prest dago
title: Artxiboa jasotzea
suspicious_sign_in:
diff --git a/config/locales/fa.yml b/config/locales/fa.yml
index f93aac6031..0514772c1d 100644
--- a/config/locales/fa.yml
+++ b/config/locales/fa.yml
@@ -1540,7 +1540,6 @@ fa:
webauthn: کلیدهای امنیتی
user_mailer:
appeal_approved:
- action: به حساب خودتان بروید
explanation: درخواست تجدیدنظر اخطار علیه حساب شما در %{strike_date} که در %{appeal_date} ارسال کردهاید، پذیرفته شده است. حساب شما بار دیگر در وضعیت خوبی قرار دارد.
subject: درخواست تجدیدنظر شما در %{date} پذیرفته شد
title: درخواست تجدیدنظر پذیرفته شد
@@ -1549,7 +1548,6 @@ fa:
subject: درخواست تجدیدنظر شما در %{date} رد شده است
title: درخواست تجدیدنظر رد شد
backup_ready:
- explanation: شما یک نسخهٔ پشتیبان کامل از حساب خود را درخواست کردید. این پشتیبان الان آمادهٔ بارگیری است!
subject: بایگانی شما آمادهٔ دریافت است
title: گرفتن بایگانی
suspicious_sign_in:
diff --git a/config/locales/fi.yml b/config/locales/fi.yml
index 75052c949d..a719f3496f 100644
--- a/config/locales/fi.yml
+++ b/config/locales/fi.yml
@@ -1774,7 +1774,6 @@ fi:
webauthn: Suojausavaimet
user_mailer:
appeal_approved:
- action: Siirry tilillesi
explanation: Valitus tiliäsi koskevasta varoituksesta %{strike_date} jonka lähetit %{appeal_date} on hyväksytty. Tilisi on jälleen hyvässä kunnossa.
subject: Valituksesi %{date} on hyväksytty
title: Valitus hyväksytty
@@ -1783,7 +1782,6 @@ fi:
subject: Valituksesi %{date} on hylätty
title: Valitus hylätty
backup_ready:
- explanation: Pyysit täydellistä varmuuskopiota Mastodon-tilistäsi. Voit nyt ladata sen!
subject: Arkisto on valmiina ladattavaksi
title: Arkiston tallennus
suspicious_sign_in:
diff --git a/config/locales/fo.yml b/config/locales/fo.yml
index 00fb9c5560..03a525fa5d 100644
--- a/config/locales/fo.yml
+++ b/config/locales/fo.yml
@@ -612,6 +612,7 @@ fo:
created_at: Meldað
delete_and_resolve: Strika postar
forwarded: Víðarisent
+ forwarded_replies_explanation: Hendan fráboðanin er frá einum fjarbrúkara og er viðvíkjandi tilfari á einum fjarum ambætara. Tað er sent til tín, tí fráboðaða innihaldið er í svari til ein av tínum brúkarum.
forwarded_to: Víðarisent til %{domain}
mark_as_resolved: Marka sum loyst
mark_as_sensitive: Merkt sum viðkvæmt
@@ -1607,6 +1608,7 @@ fo:
unknown_browser: Ókendur kagi
weibo: Weibo
current_session: Verandi seta
+ date: Dagfesting
description: "%{browser} á %{platform}"
explanation: Hetta eru vevkagarnir, sum í løtuni eru ritaðir inn á tína Mastodon kontu.
ip: IP
@@ -1773,16 +1775,19 @@ fo:
webauthn: Trygdarlyklar
user_mailer:
appeal_approved:
- action: Far til kontu tína
+ action: Kontustillingar
explanation: Kæran um atsóknina móti kontu tínari %{strike_date}, sum tú sendi inn %{appeal_date}, er góðkend. Konta tín er aftur tignarlig.
subject: Kæra tín frá %{date} er góðkend
+ subtitle: Kontan hjá tær er aftur í góðari støðu.
title: Kæra góðkend
appeal_rejected:
explanation: Kæran um atsóknina móti kontu tínari %{strike_date}, sum tú sendi inn %{appeal_date}, er vrakað.
subject: Kæra tín frá %{date} er vrakað
+ subtitle: Kæra tín er vrakað.
title: Kæra vrakað
backup_ready:
- explanation: Tú bað um eitt fult trygdaravrit av tíni Mastodon kontu. Tað er nú klárt at taka niður!
+ explanation: Tú hevur biðið um eitt fult trygdaravrit av Mastodon-kontuni hjá tær.
+ extra: Tað er nú klárt at taka niður!
subject: Savnið hjá tær er tøkt at taka niður
title: Tak savn niður
suspicious_sign_in:
diff --git a/config/locales/fr-CA.yml b/config/locales/fr-CA.yml
index c43fa013c7..dbdff5f52c 100644
--- a/config/locales/fr-CA.yml
+++ b/config/locales/fr-CA.yml
@@ -1608,6 +1608,7 @@ fr-CA:
unknown_browser: Navigateur inconnu
weibo: Weibo
current_session: Session courante
+ date: Date
description: "%{browser} sur %{platform}"
explanation: Ceci est la liste des navigateurs actuellement connectés à votre compte Mastodon.
ip: Adresse IP
@@ -1774,16 +1775,19 @@ fr-CA:
webauthn: Clés de sécurité
user_mailer:
appeal_approved:
- action: Aller à votre compte
+ action: Paramètres du compte
explanation: L'appel de la sanction contre votre compte mise en place le %{strike_date} que vous avez soumis le %{appeal_date} a été approuvé. Votre compte est de nouveau en règle.
subject: Votre appel du %{date} a été approuvé
+ subtitle: Votre compte est de nouveau en règle.
title: Appel approuvé
appeal_rejected:
explanation: L'appel de la sanction contre votre compte mise en place le %{strike_date} que vous avez soumis le %{appeal_date} a été rejeté.
subject: Votre appel du %{date} a été rejeté
+ subtitle: Votre appel a été rejeté.
title: Appel rejeté
backup_ready:
- explanation: Vous avez demandé une sauvegarde complète de votre compte Mastodon. Elle est maintenant prête à être téléchargée !
+ explanation: Vous avez demandé une sauvegarde complète de votre compte Mastodon.
+ extra: Elle est maintenant prête à être téléchargée !
subject: Votre archive est prête à être téléchargée
title: Récupération de l’archive
suspicious_sign_in:
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 5c6166ddc3..fe1a219a31 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -1608,6 +1608,7 @@ fr:
unknown_browser: Navigateur inconnu
weibo: Weibo
current_session: Session courante
+ date: Date
description: "%{browser} sur %{platform}"
explanation: Ceci est la liste des navigateurs actuellement connectés à votre compte Mastodon.
ip: Adresse IP
@@ -1774,16 +1775,19 @@ fr:
webauthn: Clés de sécurité
user_mailer:
appeal_approved:
- action: Aller à votre compte
+ action: Paramètres du compte
explanation: L'appel de la sanction contre votre compte mise en place le %{strike_date} que vous avez soumis le %{appeal_date} a été approuvé. Votre compte est de nouveau en règle.
subject: Votre appel du %{date} a été approuvé
+ subtitle: Votre compte est de nouveau en règle.
title: Appel approuvé
appeal_rejected:
explanation: L'appel de la sanction contre votre compte mise en place le %{strike_date} que vous avez soumis le %{appeal_date} a été rejeté.
subject: Votre appel du %{date} a été rejeté
+ subtitle: Votre appel a été rejeté.
title: Appel rejeté
backup_ready:
- explanation: Vous avez demandé une sauvegarde complète de votre compte Mastodon. Elle est maintenant prête à être téléchargée !
+ explanation: Vous avez demandé une sauvegarde complète de votre compte Mastodon.
+ extra: Elle est maintenant prête à être téléchargée !
subject: Votre archive est prête à être téléchargée
title: Récupération de l’archive
suspicious_sign_in:
diff --git a/config/locales/fy.yml b/config/locales/fy.yml
index 9471c03b92..1d648f4790 100644
--- a/config/locales/fy.yml
+++ b/config/locales/fy.yml
@@ -1608,6 +1608,7 @@ fy:
unknown_browser: Unbekende browser
weibo: Weibo
current_session: Aktuele sesje
+ date: Datum
description: "%{browser} op %{platform}"
explanation: Dit binne de webbrowsers dy’t op dit stuit mei jo Mastodon-account oanmeld binne.
ip: IP
@@ -1774,16 +1775,19 @@ fy:
webauthn: Befeiligingskaaien
user_mailer:
appeal_approved:
- action: Gean nei jo account
+ action: Accountynstellingen
explanation: It beswier tsjin in troch in moderator fêststelde skeining fan jo op %{strike_date}, yntsjinne op %{appeal_date}, is goedkard. De earder fêststelde skeining is hjirby net langer jildich.
subject: Jo beswier fan %{date} is goedkard
+ subtitle: Jo account hat wer in goede reputaasje.
title: Beswier goedkard
appeal_rejected:
explanation: It beswier tsjin in troch in moderator fêststelde skeining fan jo op %{strike_date}, yntsjinne op %{appeal_date}, is ôfwêzen. De fêststelde skeining bliuwt wurdt dêrom net wizige.
subject: Jo beswier fan %{date} is ôfwêzen
+ subtitle: Jo beswier is ôfwêzen.
title: Beswier ôfwêzen
backup_ready:
- explanation: Jo hawwe in folsleine reservekopy fan jo Mastodon-account opfrege. It stiet no klear om download te wurden!
+ explanation: Jo hawwe in folsleine reservekopy fan jo Mastodon-account oanfrege.
+ extra: It stiet no klear om download te wurden!
subject: Jo argyf stiet klear om download te wurden
title: Argyf ophelje
suspicious_sign_in:
diff --git a/config/locales/gd.yml b/config/locales/gd.yml
index 965447d4f9..521f4fd60d 100644
--- a/config/locales/gd.yml
+++ b/config/locales/gd.yml
@@ -1827,7 +1827,6 @@ gd:
webauthn: Iuchraichean tèarainteachd
user_mailer:
appeal_approved:
- action: Tadhail air a’ chunntas agad
explanation: Chaidh aontachadh ris an ath-thagradh agad air an rabhadh o %{strike_date} a chuir thu a-null %{appeal_date}. Tha deagh chliù air a’ chunntas agad a-rithist.
subject: Chaidh aontachadh ris an ath-thagradh agad o %{date}
title: Chaidh aontachadh ri ath-thagradh
@@ -1836,7 +1835,6 @@ gd:
subject: Chaidh an t-ath-thagradh agad o %{date} a dhiùltadh
title: Chaidh ath-thagradh a dhiùltadh
backup_ready:
- explanation: Dh’iarr thu lethbhreac-glèidhidh slàn dhen chunntas Mastodon agad. Tha e deis ri luchdadh a-nuas a-nis!
subject: Tha an tasg-lann agad deis ri luchdadh a-nuas
title: Tasg-lann dhut
suspicious_sign_in:
diff --git a/config/locales/gl.yml b/config/locales/gl.yml
index cff9427c66..1398f6ad0b 100644
--- a/config/locales/gl.yml
+++ b/config/locales/gl.yml
@@ -1608,6 +1608,7 @@ gl:
unknown_browser: Navegador descoñecido
weibo: Weibo
current_session: Sesión actual
+ date: Data
description: "%{browser} en %{platform}"
explanation: Estos son os navegadores web nos que actualmente tes sesión iniciada.
ip: IP
@@ -1774,16 +1775,19 @@ gl:
webauthn: Chaves de seguridade
user_mailer:
appeal_approved:
- action: Vai á túa conta
+ action: Axustes da conta
explanation: A apelación da acción contra a túa conta o %{strike_date} que enviaches o %{appeal_date} foi aprobada. A túa conta volve ao estado normal de uso.
subject: O recurso presentado o %{date} foi aprobado
+ subtitle: A túa conta volve a estar en boa forma.
title: Apelación aprobada
appeal_rejected:
explanation: A apelación contra a acción tomada contra a túa conta o %{strike_date} que enviaches o %{appeal_date} foi rexeitada.
subject: A túa apelación do %{date} foi rexeitada
+ subtitle: A apelación foi rexeitada.
title: Apelación rexeitada
backup_ready:
- explanation: Solicitaches os datos completos da túa conta de Mastodon. Xa está preparados para descargar!
+ explanation: Solicitaches unha copia completa da túa conta Mastodon.
+ extra: Está preparada para descargala!
subject: O teu ficheiro xa está preparado para descargar
title: Leve o ficheiro
suspicious_sign_in:
diff --git a/config/locales/he.yml b/config/locales/he.yml
index 23a4e0c3a6..2969cf33e8 100644
--- a/config/locales/he.yml
+++ b/config/locales/he.yml
@@ -1660,6 +1660,7 @@ he:
unknown_browser: דפדפן לא מזוהה
weibo: Weibo
current_session: חיבור נוכחי
+ date: תאריך
description: "%{browser} על %{platform}"
explanation: אלה הם הדפדפנים המחוברים כרגע לחשבון המסטודון שלך.
ip: IP
@@ -1838,16 +1839,19 @@ he:
webauthn: מפתחות אבטחה
user_mailer:
appeal_approved:
- action: מעבר לחשבונך
+ action: הגדרות חשבון
explanation: הערעור על העברה שנרשמה כנגד חשבונך ב-%{strike_date} שהגשת ב-%{appeal_date} התקבל. חשבונך חזר להיות נקי מכל רבב.
subject: ערעורך מתאריך %{date} התקבל
+ subtitle: חשבונך חזר למצב מאושר.
title: הערעור התקבל
appeal_rejected:
explanation: הערעור על העברה שנרשמה כנגד חשבונך ב-%{strike_date} שהגשת ב-%{appeal_date} נדחה.
subject: ערעורך מתאריך %{date} נדחה
+ subtitle: ערעורך נדחה.
title: הערעור נדחה
backup_ready:
- explanation: ביקשת גיבוי מלא של חשבון המסטודון שלך. הוא מוכן להורדה!
+ explanation: ביקשת גיבוי מלא של חשבון המסטודון שלך.
+ extra: הגיבוי מוכן להורדה!
subject: הארכיון שלך מוכן להורדה
title: הוצאת ארכיון
suspicious_sign_in:
diff --git a/config/locales/hu.yml b/config/locales/hu.yml
index 5c8d1cf9a4..536af8b6b5 100644
--- a/config/locales/hu.yml
+++ b/config/locales/hu.yml
@@ -1774,7 +1774,6 @@ hu:
webauthn: Biztonsági kulcsok
user_mailer:
appeal_approved:
- action: Ugrás a fiókodhoz
explanation: A fiókod %{appeal_date}-i fellebbezése, mely a %{strike_date}-i vétségeddel kapcsolatos, jóváhagyásra került. A fiókod megint makulátlan.
subject: A %{date}-i fellebbezésedet jóváhagyták
title: Fellebbezés jóváhagyva
@@ -1783,7 +1782,6 @@ hu:
subject: A %{date}-i fellebbezésedet visszautasították
title: Fellebbezés visszautasítva
backup_ready:
- explanation: A Mastodon-fiókod teljes mentését kérted. A mentés elkészült, és letölthető.
subject: Az adataidról készült archív letöltésre kész
title: Archiválás
suspicious_sign_in:
diff --git a/config/locales/ia.yml b/config/locales/ia.yml
index c4f236881d..48a802a2cd 100644
--- a/config/locales/ia.yml
+++ b/config/locales/ia.yml
@@ -114,8 +114,6 @@ ia:
add: Adder
disable: Disactivar 2FA
user_mailer:
- appeal_approved:
- action: Vader a tu conto
welcome:
subject: Benvenite in Mastodon
webauthn_credentials:
diff --git a/config/locales/id.yml b/config/locales/id.yml
index c231fea576..ec8cf9e031 100644
--- a/config/locales/id.yml
+++ b/config/locales/id.yml
@@ -1508,7 +1508,6 @@ id:
webauthn: Kunci keamanan
user_mailer:
appeal_approved:
- action: Ke akun Anda
explanation: Banding peringatan terhadap akun Anda pada %{strike_date} yang Anda kirim pada %{appeal_date} telah disetujui. Akun Anda akan kembali ditandai sebagai akun bagus.
subject: Banding Anda dari %{date} telah disetujui
title: Banding disetujui
@@ -1517,7 +1516,6 @@ id:
subject: Banding Anda dari %{date} telah ditolak
title: Banding ditolak
backup_ready:
- explanation: Cadangan penuh akun Mastodon Anda sudah dapat diunduh!
subject: Arsip Anda sudah siap diunduh
title: Ambil arsip
suspicious_sign_in:
diff --git a/config/locales/ie.yml b/config/locales/ie.yml
index c85e97b51d..c8cd5d5f8d 100644
--- a/config/locales/ie.yml
+++ b/config/locales/ie.yml
@@ -1608,6 +1608,7 @@ ie:
unknown_browser: Ínconosset navigator
weibo: Weibo
current_session: Actual session
+ date: Date
description: "%{browser} in %{platform}"
explanation: Tis-ci es li navigatores queles actualmen ha initiat sessiones a tui Mastodon-conto.
ip: IP
@@ -1774,16 +1775,18 @@ ie:
webauthn: Claves de securitá
user_mailer:
appeal_approved:
- action: Ear a tui conto
+ action: Parametres del Conto
explanation: Li apelle del admoniment contra tui conto ye %{strike_date} quel tu fat ye %{appeal_date} ha esset aprobat. Tui conto retorna a esser in bon statu.
subject: Tui apelle de %{date} ha esset aprobat
+ subtitle: Tui conto denov es in bon statu.
title: Apelle aprobat
appeal_rejected:
explanation: Li apelle del admoniment contra tui conto ye %{strike_date} quel tu fat ye %{appeal_date} ha esset rejectet.
subject: Tui apelle de %{date} ha esset rejectet
+ subtitle: Tui apelle ha esset rejectet.
title: Apelle rejectet
backup_ready:
- explanation: Tu solicitat un complet archive de tui Mastodon-conto. Nu it es pret por descargar!
+ extra: It es ja pret a descargar!
subject: Tui archive es pret por descargar
title: Descargar archive
suspicious_sign_in:
diff --git a/config/locales/io.yml b/config/locales/io.yml
index eb5fcc709d..341477852f 100644
--- a/config/locales/io.yml
+++ b/config/locales/io.yml
@@ -1747,7 +1747,6 @@ io:
webauthn: Sekuresklefi
user_mailer:
appeal_approved:
- action: Irez a vua konto
explanation: Apelo di streko kontre vua konto en %{strike_date} quale vu sendis en %{appeal_date} aprobesis. Vua konto itere standas bone.
subject: Vua apelo de %{date} aprobesis
title: Apelo aprobesis
@@ -1756,7 +1755,6 @@ io:
subject: Vua apelo de %{date} refuzesis
title: Apelo refuzesis
backup_ready:
- explanation: Vu demandis kompleta kopiur di vua konto di Mastodon. Ol esas nun pronte deschargebla!
subject: Vua arkivo pronte deschargebla
title: Arkivekpreno
suspicious_sign_in:
diff --git a/config/locales/is.yml b/config/locales/is.yml
index 7083a226dd..9f8d5d42dc 100644
--- a/config/locales/is.yml
+++ b/config/locales/is.yml
@@ -1612,6 +1612,7 @@ is:
unknown_browser: Óþekktur vafri
weibo: Weibo
current_session: Núverandi seta
+ date: Dagsetning
description: "%{browser} á %{platform}"
explanation: Þetta eru vafrarnir sem núna eru skráðir inn á Mastodon-aðganginn þinn.
ip: IP-vistfang
@@ -1778,16 +1779,19 @@ is:
webauthn: Öryggislyklar
user_mailer:
appeal_approved:
- action: Farðu inn á notandaaðganginn þinn
+ action: Stillingar notandaaðgangs
explanation: Áfrýjun refsingarinnar gagnvart aðgangnum þínum þann %{strike_date} sem þú sendir inn þann %{appeal_date} hefur verið samþykkt. Notandaaðgangurinn þinn er aftur í góðu lagi.
subject: Áfrýjun þín frá %{date} hefur verið samþykkt
+ subtitle: Notandaaðgangurinn þinn er í góðu lagi.
title: Áfrýjun samþykkt
appeal_rejected:
explanation: Áfrýjun refsingarinnar gagnvart aðgangnum þínum þann %{strike_date} sem þú sendir inn þann %{appeal_date} hefur verið hafnað.
subject: Áfrýjun þinni frá %{date} hefur verið hafnað
+ subtitle: Áfrýjun þinni hefur verið hafnað.
title: Áfrýjun hafnað
backup_ready:
- explanation: Þú baðst um fullt öryggisafrit af Mastodon notandaaðgangnum þínum. Það er núna tilbúið til niðurhals!
+ explanation: Þú baðst um fullt öryggisafrit af Mastodon notandaaðgangnum þínum.
+ extra: Það er núna tilbúið til niðurhals!
subject: Safnskráin þín er tilbúin til niðurhals
title: Taka út í safnskrá
suspicious_sign_in:
diff --git a/config/locales/it.yml b/config/locales/it.yml
index 16b327f3e1..a17fae4804 100644
--- a/config/locales/it.yml
+++ b/config/locales/it.yml
@@ -1610,6 +1610,7 @@ it:
unknown_browser: Browser sconosciuto
weibo: Weibo
current_session: Sessione corrente
+ date: Data
description: "%{browser} su %{platform}"
explanation: Questi sono i browser da cui attualmente è avvenuto l'accesso al tuo account Mastodon.
ip: IP
@@ -1776,16 +1777,19 @@ it:
webauthn: Chiavi di sicurezza
user_mailer:
appeal_approved:
- action: Vai al tuo account
+ action: Impostazioni account
explanation: L'appello della sanzione contro il tuo account del %{strike_date} che hai inviato il %{appeal_date} è stato approvato. Il tuo account ha riottenuto la buona reputazione.
subject: Il tuo appello del %{date} è stato approvato
+ subtitle: Il tuo account è ancora una volta in buona posizione.
title: Appello approvato
appeal_rejected:
explanation: L'appello della sanzione contro il tuo account del %{strike_date} che hai inviato il %{appeal_date} è stato respinto.
subject: Il tuo appello del %{date} è stato respinto
+ subtitle: Il tuo appello è stato respinto.
title: Appello respinto
backup_ready:
- explanation: Hai richiesto un backup completo del tuo account Mastodon. È pronto per essere scaricato!
+ explanation: Hai richiesto un backup completo del tuo account Mastodon.
+ extra: Ora è pronto per il download!
subject: Il tuo archivio è pronto per essere scaricato
title: Esportazione archivio
suspicious_sign_in:
diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index 97ec886112..a68426cb53 100644
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -1582,6 +1582,7 @@ ja:
unknown_browser: 不明なブラウザ
weibo: Weibo
current_session: 現在のセッション
+ date: 日時
description: "%{platform}上の%{browser}"
explanation: あなたのMastodonアカウントに現在ログインしているウェブブラウザの一覧です。
ip: IP
@@ -1742,16 +1743,19 @@ ja:
webauthn: セキュリティキー
user_mailer:
appeal_approved:
- action: アカウントへ
+ action: アカウント設定
explanation: "%{strike_date}のストライクに対して、あなたが%{appeal_date}に行った申し立ては承認されました。アカウントは正常な状態に戻りました。"
subject: "%{date}の申し立てが承認されました"
+ subtitle: あなたのアカウントは正常な状態に戻りました。
title: 申し立てが承認されました。
appeal_rejected:
explanation: "%{strike_date}のストライクに対して、あなたが%{appeal_date}に行った申し立ては却下されました。"
subject: "%{date}の申し立てが拒否されました"
+ subtitle: 申し立ては拒否されました。
title: 却下された抗議
backup_ready:
- explanation: Mastodonアカウントのアーカイブを受け付けました。今すぐダウンロードできます！
+ explanation: Mastodonアカウントの完全バックアップをリクエストしました。
+ extra: ダウンロードの準備ができました！
subject: アーカイブの準備ができました
title: アーカイブの取り出し
suspicious_sign_in:
diff --git a/config/locales/ka.yml b/config/locales/ka.yml
index d67f432688..926922154f 100644
--- a/config/locales/ka.yml
+++ b/config/locales/ka.yml
@@ -467,7 +467,6 @@ ka:
recovery_instructions_html: თუ როდესმე დაკარგავთ წვდომას თქვენს ტელეფონთან, შეგიძლიათ ქვემოთ მოცემული აღდგენის კოდები გამოიყენოთ, რათა მოიპოვოთ ხელმეორე წვდომა თქვენი ანგარიშისადმი. იქონიეთ აღდგენის კოდები დაცულად. მაგალითისთვის, შეგიძლიათ ამობეჭდოთ და შეინახოთ სხვა საბუთებთან ერთად.
user_mailer:
backup_ready:
- explanation: თქვენ მოითხოვეთ თქვენი მასტოდონის ანგარიშის სრული რეზერვაცია. ის ახლა უკვე მზადაა გადმოსაწერად!
subject: თქვენი არქივი გადმოსაწერად მზადაა
title: არქივის მიღება
welcome:
diff --git a/config/locales/kab.yml b/config/locales/kab.yml
index eeb8f16ae4..66aeafde60 100644
--- a/config/locales/kab.yml
+++ b/config/locales/kab.yml
@@ -745,8 +745,6 @@ kab:
otp: Asnas n usesteb
webauthn: Tisura n teɣlist
user_mailer:
- appeal_approved:
- action: Ddu ɣer umiḍan-ik·im
warning:
categories:
spam: Aspam
diff --git a/config/locales/kk.yml b/config/locales/kk.yml
index 98fe37f296..27c76b4378 100644
--- a/config/locales/kk.yml
+++ b/config/locales/kk.yml
@@ -705,7 +705,6 @@ kk:
recovery_instructions_html: Егер сіз телефонға кіруді жоғалтсаңыз, тіркелгіңізге кіру үшін төмендегі қалпына келтіру кодтарының бірін пайдалануға болады. Қалпына келтіру кодтарын қауіпсіз ұстаңыз . Мысалы, оларды басып шығарып, оларды басқа маңызды құжаттармен сақтауға болады.
user_mailer:
backup_ready:
- explanation: Сіз Mastodon аккаунтыңыздың толық мұрағатын сұрадыңыз. Қазір жүктеуге дайын!
subject: Мұрағатыңыз түсіріп алуға дайын
title: Мұрағатты алу
warning:
diff --git a/config/locales/ko.yml b/config/locales/ko.yml
index 76bb3bd9f1..b0eadc0504 100644
--- a/config/locales/ko.yml
+++ b/config/locales/ko.yml
@@ -1687,7 +1687,7 @@ ko:
keep_pinned: 고정된 게시물 유지
keep_pinned_hint: 고정 게시물을 삭제하지 않습니다
keep_polls: 설문 유지
- keep_polls_hint: 설문을 삭제하지 않았음
+ keep_polls_hint: 설문을 삭제하지 않습니다
keep_self_bookmark: 북마크한 게시물 유지
keep_self_bookmark_hint: 북마크한 본인의 게시물을 삭제하지 않습니다
keep_self_fav: 내가 좋아요한 게시물 유지
@@ -1744,7 +1744,6 @@ ko:
webauthn: 보안 키
user_mailer:
appeal_approved:
- action: 내 계정으로 가기
explanation: "%{strike_date}에 일어난 중재결정에 대한 소명을 %{appeal_date}에 작성했으며 승낙되었습니다. 당신의 계정은 정상적인 상태로 돌아왔습니다."
subject: 귀하가 %{date}에 작성한 소명이 승낙되었습니다
title: 소명이 받아들여짐
@@ -1753,7 +1752,6 @@ ko:
subject: "%{date}에 작성한 소명이 반려되었습니다."
title: 이의 제기가 거절되었습니다
backup_ready:
- explanation: 마스토돈 계정의 전체 백업을 요청하셨지요. 이제 다운로드할 수 있습니다!
subject: 아카이브를 다운로드할 수 있습니다
title: 아카이브 테이크아웃
suspicious_sign_in:
diff --git a/config/locales/ku.yml b/config/locales/ku.yml
index b9cc5fe77e..e78e7ecfbb 100644
--- a/config/locales/ku.yml
+++ b/config/locales/ku.yml
@@ -1542,7 +1542,6 @@ ku:
webauthn: Kilîdên ewlehiyê
user_mailer:
appeal_approved:
- action: Biçe ajimêra xwe
explanation: Îtîraza binpêkirinê ya li dijî ajimêrê te ya %{strike_date} ku te di %{appeal_date} de şandibû hate pejirandin. Ajimêrê te careke din di rewşek baş de ye.
subject: Îtîraza te ji %{date} hate pejirandin
title: Îtîraz hate pejirandin
@@ -1551,7 +1550,6 @@ ku:
subject: Îtîraza te ji %{date} nehate pejirandin
title: Îtîraz nehate pejirandin
backup_ready:
- explanation: Te yedekîya tijê ya ajimêrê xwe Mastodonê xwest. Niha ji daxistinê re amade ye!
subject: Arşîva te amede ye bo daxistinê
title: Pakêtkirina arşîvan
suspicious_sign_in:
diff --git a/config/locales/lad.yml b/config/locales/lad.yml
index 550036b340..d1247fc781 100644
--- a/config/locales/lad.yml
+++ b/config/locales/lad.yml
@@ -1542,6 +1542,7 @@ lad:
unknown_browser: Navigador deskonosido
weibo: Weibo
current_session: Sesyon aktuala
+ date: Data
description: "%{browser} en %{platform}"
explanation: Estos son los navigadores internetikos konektados aktualmente kon tu kuento de Mastodon.
ip: IP
@@ -1707,16 +1708,16 @@ lad:
webauthn: Yaves de sigurita
user_mailer:
appeal_approved:
- action: Va a tu kuento
+ action: Preferensyas de kuento
explanation: La apelasyon del amonestamiento kontra tu kuento del %{strike_date} ke mandates el %{appeal_date} fue achetada. Tu kuento se topa de muevo en dobro estado.
subject: Tu apelasyon del %{date} fue achetada
title: Apelasyon achetada
appeal_rejected:
explanation: La apelasyon del amonestamiento kontra tu kuento del %{strike_date} ke mandates el %{appeal_date} fue refuzada.
subject: Tu apelasyon del %{date} fue refuzada
+ subtitle: Tu apelasyon fue refuzada.
title: Apelasyon refuzada
backup_ready:
- explanation: Tienes solisitado una kopia kompleta de tu kuento de Mastodon. Ya esta pronta para abashar!
subject: Tu dosya esta pronta para abashar
title: Abasha dosya
suspicious_sign_in:
diff --git a/config/locales/lt.yml b/config/locales/lt.yml
index 8de969f646..f3715fd2ee 100644
--- a/config/locales/lt.yml
+++ b/config/locales/lt.yml
@@ -490,6 +490,7 @@ lt:
browsers:
generic: Nežinoma naršyklė
current_session: Dabartinė sesija
+ date: Data
description: "%{browser} ant %{platform}"
explanation: Čia rodomos web naršyklės prijungtos prie Jūsų Mastodon paskyros.
revoke: Atšaukti
@@ -548,8 +549,14 @@ lt:
recovery_codes_regenerated: Atkūrimo kodai sėkmingai sugeneruoti
recovery_instructions_html: Jeigu prarandate prieiga prie telefono, jūs galite naudoti atkūrimo kodus esančius žemiau, kad atgautumėte priega prie savo paskyros.Laikykite atkūrimo kodus saugiai Pavyzdžiui, galite norėti juos išspausdinti, ir laikyti kartu su kitais svarbiais dokumentais.
user_mailer:
+ appeal_approved:
+ action: Paskyros nustatymai
+ subtitle: Tavo paskyros būklė vėl yra gera.
+ appeal_rejected:
+ subtitle: Tavo apeliacija buvo atmesta.
backup_ready:
- explanation: Jūs prašėte pilnos Mastodon paskyros atsarginės kopijos. Ji paruošta parsisiuntimui!
+ explanation: Prašai sukurti pilną Mastodon paskyros atsarginę kopiją.
+ extra: Jį jau galima atsisiųsti!
subject: Jūsų archyvas paruoštas parsisiuntimui
title: Archyvas išimtas
warning:
diff --git a/config/locales/lv.yml b/config/locales/lv.yml
index c532b84e27..fcf478cf93 100644
--- a/config/locales/lv.yml
+++ b/config/locales/lv.yml
@@ -1803,7 +1803,6 @@ lv:
webauthn: Drošības atslēgas
user_mailer:
appeal_approved:
- action: Dodies uz savu kontu
explanation: Apelācija par brīdinājumu jūsu kontam %{strike_date}, ko iesniedzāt %{appeal_date}, ir apstiprināta. Jūsu konts atkal ir labā stāvoklī.
subject: Jūsu %{date} apelācija ir apstiprināta
title: Apelācija apstiprināta
@@ -1812,7 +1811,6 @@ lv:
subject: Jūsu %{date} apelācija ir noraidīta
title: Apelācija noraidīta
backup_ready:
- explanation: Tu pieprasīji pilnu sava Mastodon konta dublējumu. Tagad tas ir gatavs lejupielādei!
subject: Tavs arhīvs ir gatavs lejupielādei
title: Arhīva līdzņemšana
suspicious_sign_in:
diff --git a/config/locales/ms.yml b/config/locales/ms.yml
index 74acf87552..6625a13b3b 100644
--- a/config/locales/ms.yml
+++ b/config/locales/ms.yml
@@ -1720,7 +1720,6 @@ ms:
webauthn: Kunci keselamatan
user_mailer:
appeal_approved:
- action: Pergi ke akaun anda
explanation: Rayuan pelanggaran yang dikemukakan pada %{appeal_date} terhadap akaun anda pada %{strike_date} telah diluluskan. Akaun anda kini dalam kedudukan yang baik.
subject: Rayuan anda dari %{date} telah diluluskan
title: Rayuan diluluskan
@@ -1729,7 +1728,6 @@ ms:
subject: Rayuan anda dari %{date} telah ditolak
title: Rayuan ditolak
backup_ready:
- explanation: Anda meminta sandaran penuh akaun Mastodon anda. Ia kini sedia untuk dimuat turun!
subject: Arkib anda sedia untuk dimuat turun
title: Arkibkan bawa pulang
suspicious_sign_in:
diff --git a/config/locales/my.yml b/config/locales/my.yml
index 4ba4fcfad3..094f581eb9 100644
--- a/config/locales/my.yml
+++ b/config/locales/my.yml
@@ -1719,7 +1719,6 @@ my:
webauthn: လုံခြုံရေးကီးများ
user_mailer:
appeal_approved:
- action: သင့်အကောင့်သို့ သွားပါ
explanation: "%{appeal_date} တွင် သင်တင်သွင်းခဲ့သည့် %{strike_date} တွင် သင့်အကောင့်ကို ဆန့်ကျင်သည့် တိုင်ချက်၏ အယူခံဝင်မှုကို အတည်ပြုပြီးဖြစ်သည်။ သင့်အကောင့်သည် ကောင်းမွန်သောအနေအထားတွင် ရှိနေပြန်သည်။"
subject: "%{date} တွင် သင့်အယူခံဝင်ချက်ကို အတည်ပြုပြီးပါပြီ"
title: အယူခံဝင်သည်
@@ -1728,7 +1727,6 @@ my:
subject: "%{date} တွင် သင့်တင်ပြချက်ကို ပယ်ချခဲ့သည်"
title: အယူခံကို ပယ်ချခဲ့သည်
backup_ready:
- explanation: သင့် Mastodon အကောင့် အရန်ကူးယူရန် တောင်းဆိုပြီးဖြစ်သည်။ ယခု ဒေါင်းလုဒ်လုပ်နိုင်ပါပြီ။
subject: သင့်မှတ်တမ်း ဒေါင်းလုဒ်ဆွဲရန် အသင့်ဖြစ်ပါပြီ
title: မှတ်တမ်းသိမ်းရန်
suspicious_sign_in:
diff --git a/config/locales/nl.yml b/config/locales/nl.yml
index 3429ab0e82..9235b99fed 100644
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@@ -1608,6 +1608,7 @@ nl:
unknown_browser: Onbekende browser
weibo: Weibo
current_session: Huidige sessie
+ date: Datum
description: "%{browser} op %{platform}"
explanation: Dit zijn de webbrowsers die momenteel met jouw Mastodonaccount zijn ingelogd.
ip: IP
@@ -1774,16 +1775,19 @@ nl:
webauthn: Beveiligingssleutels
user_mailer:
appeal_approved:
- action: Ga naar je account
+ action: Accountinstellingen
explanation: Het bezwaar tegen een door een moderator vastgestelde overtreding van jou op %{strike_date}, ingediend op %{appeal_date}, is goedgekeurd. De eerder vastgestelde overtreding is hierbij niet langer geldig.
subject: Jouw bezwaar van %{date} is goedgekeurd
+ subtitle: Jouw account heeft weer een goede reputatie.
title: Bezwaar goedgekeurd
appeal_rejected:
explanation: Het bezwaar tegen een door een moderator vastgestelde overtreding van jou op %{strike_date}, ingediend op %{appeal_date}, is afgewezen. De vastgestelde overtreding blijft daarom ongewijzigd.
subject: Jouw bezwaar van %{date} is afgewezen
+ subtitle: Jouw bezwaar is afgewezen.
title: Bezwaar afgewezen
backup_ready:
- explanation: Je hebt een volledige back-up van jouw Mastodon-account opgevraagd. Het staat nu klaar om te worden gedownload!
+ explanation: Je hebt een volledige back-up van je Mastodon-account aangevraagd.
+ extra: Het staat nu klaar om te worden gedownload!
subject: Jouw archief staat klaar om te worden gedownload
title: Archief ophalen
suspicious_sign_in:
diff --git a/config/locales/nn.yml b/config/locales/nn.yml
index de23096ed1..914ee7fb04 100644
--- a/config/locales/nn.yml
+++ b/config/locales/nn.yml
@@ -1774,7 +1774,6 @@ nn:
webauthn: Sikkerhetsnøkler
user_mailer:
appeal_approved:
- action: Gå til din konto
explanation: Apellen på prikken mot din kontor på %{strike_date} som du la inn på %{appeal_date} har blitt godkjend. Din konto er nok ein gong i god stand.
subject: Din klage fra %{date} er godkjent
title: Anke godkjend
@@ -1783,7 +1782,6 @@ nn:
subject: Din klage fra %{date} er avvist
title: Anke avvist
backup_ready:
- explanation: Du ba om en fullstendig sikkerhetskopi av Mastodon-kontoen din. Den er nå klar for nedlasting!
subject: Arkivet ditt er klart til å lastes ned
title: Nedlasting av arkiv
suspicious_sign_in:
diff --git a/config/locales/no.yml b/config/locales/no.yml
index 54f82550b7..61cc89181e 100644
--- a/config/locales/no.yml
+++ b/config/locales/no.yml
@@ -1774,7 +1774,6 @@
webauthn: Sikkerhetsnøkler
user_mailer:
appeal_approved:
- action: Gå til kontoen din
explanation: Klagen på advarselen mot din konto den %{strike_date} som du sendte inn den %{appeal_date} har blitt godkjent. Din konto er nok en gang i god stand.
subject: Din klage fra %{date} er godkjent
title: Klage godkjent
@@ -1783,7 +1782,6 @@
subject: Din klage fra %{date} er avvist
title: Klage avvist
backup_ready:
- explanation: Du ba om en fullstendig sikkerhetskopi av Mastodon-kontoen din. Den er nå klar for nedlasting!
subject: Arkivet ditt er klart til å lastes ned
title: Nedlasting av arkiv
suspicious_sign_in:
diff --git a/config/locales/oc.yml b/config/locales/oc.yml
index 83c2638b51..2887fc98b3 100644
--- a/config/locales/oc.yml
+++ b/config/locales/oc.yml
@@ -948,10 +948,7 @@ oc:
recovery_instructions_html: Se vos arriba de perdre vòstre mobil, podètz utilizar un dels còdis de recuperacion cai-jos per poder tornar accedir a vòstre compte. Gardatz los còdis en seguretat, per exemple, imprimissètz los e gardatz los amb vòstres documents importants.
webauthn: Claus de seguretat
user_mailer:
- appeal_approved:
- action: Anatz al vòstre compte
backup_ready:
- explanation: Avètz demandat una salvagarda complèta de vòstre compte Mastodon. Es prèsta per telecargament !
subject: Vòstre archiu es prèst per telecargament
title: Archiu per emportar
warning:
diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index 15aefe5f74..8a973b71c7 100644
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -1660,6 +1660,7 @@ pl:
unknown_browser: Nieznana Przeglądarka
weibo: Weibo
current_session: Obecna sesja
+ date: Data
description: "%{browser} na %{platform}"
explanation: Przeglądarki z aktywną sesją Twojego konta.
ip: Adres IP
@@ -1838,16 +1839,19 @@ pl:
webauthn: Klucze bezpieczeństwa
user_mailer:
appeal_approved:
- action: Przejdź do swojego konta
+ action: Ustawienia Konta
explanation: Twoje odwołanie dotyczące ostrzeżenia nałożonego na twoje konto dnia %{strike_date}, które zostało wysłane dnia %{appeal_date} zostało zatwierdzone. Twoje konto jest ponownie w dobrej kondycji.
subject: Twoje odwołanie z dnia %{date} zostało zatwierdzone
+ subtitle: Reputacja twojego konta została przywrócona.
title: Odwołanie zatwierdzone
appeal_rejected:
explanation: Twoje odwołanie dotyczące ostrzeżenia nałożonego na twoje konto dnia %{strike_date}, które zostało wysłane dnia %{appeal_date} zostało odrzucone.
subject: Twoje odwołanie z dnia %{date} zostało odrzucone
+ subtitle: Twoje odwołanie zostało odrzucone.
title: Odwołanie odrzucone
backup_ready:
- explanation: Zażądałeś pełnej kopii zapasowej konta na Mastodonie. Jest ona dostępna do pobrania!
+ explanation: Zamówiono pełną kopię zapasową twojego konta Mastodon.
+ extra: Gotowe do pobrania!
subject: Twoje archiwum jest gotowe do pobrania
title: Odbiór archiwum
suspicious_sign_in:
diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml
index 2c485283b1..47ad0ac448 100644
--- a/config/locales/pt-BR.yml
+++ b/config/locales/pt-BR.yml
@@ -1608,6 +1608,7 @@ pt-BR:
unknown_browser: Navegador desconhecido
weibo: Weibo
current_session: Sessão atual
+ date: Data
description: "%{browser} em %{platform}"
explanation: Estes são os navegadores que estão conectados com a sua conta Mastodon.
ip: IP
@@ -1774,16 +1775,18 @@ pt-BR:
webauthn: Chaves de segurança
user_mailer:
appeal_approved:
- action: Acessar perfil
+ action: Configurações da conta
explanation: A revisão da punição na sua conta em %{strike_date} que você enviou em %{appeal_date} foi aprovada. Sua conta está novamente em situação regular.
subject: Sua revisão de %{date} foi aprovada
title: Revisão aprovada
appeal_rejected:
explanation: A revisão da punição na sua conta em %{strike_date} que você enviou em %{appeal_date} foi rejeitada.
subject: Sua revisão de %{date} foi rejeitada
+ subtitle: Sua revisão foi rejeitada.
title: Revisão rejeitada
backup_ready:
- explanation: Você pediu um backup completo da sua conta no Mastodon. E agora está pronto para ser baixado!
+ explanation: Você solicitou um ‘backup’ completo da sua conta Mastodon.
+ extra: Agora está pronto para baixar!
subject: Seu arquivo está pronto para ser baixado
title: Baixar arquivo
suspicious_sign_in:
diff --git a/config/locales/pt-PT.yml b/config/locales/pt-PT.yml
index 111f0fa8ee..fc1e3e6367 100644
--- a/config/locales/pt-PT.yml
+++ b/config/locales/pt-PT.yml
@@ -1608,6 +1608,7 @@ pt-PT:
unknown_browser: Navegador Desconhecido
weibo: Weibo
current_session: Sessão atual
+ date: Data
description: "%{browser} em %{platform}"
explanation: Estes são os navegadores que estão conectados com a tua conta do Mastodon.
ip: IP
@@ -1774,16 +1775,19 @@ pt-PT:
webauthn: Chaves de segurança
user_mailer:
appeal_approved:
- action: Ir para a sua conta
+ action: Configurações de Conta
explanation: O recurso à reprimenda contra a sua conta de %{strike_date}, enviado a %{appeal_date}, foi deferido. A sua conta encontra-se novamente em situação regular.
subject: O seu recurso de %{date} foi deferido
+ subtitle: A sua conta está em situação regular novamente.
title: Recurso deferido
appeal_rejected:
explanation: O recurso à punição contra a sua conta de %{strike_date}, submetido em %{appeal_date}, foi indeferido.
subject: O seu recurso de %{date} foi indeferido
+ subtitle: O seu recurso foi rejeitado.
title: Recurso indeferido
backup_ready:
- explanation: Pediu uma cópia integral de salvaguarda da sua conta Mastodon. Já está pronta para descarregar!
+ explanation: Pediu uma cópia completa da sua conta Mastodon.
+ extra: Está pronta para transferir!
subject: O seu arquivo está pronto para descarregar
title: Arquivo de ficheiros
suspicious_sign_in:
diff --git a/config/locales/ro.yml b/config/locales/ro.yml
index 12c06505b8..1bdc4e8ca5 100644
--- a/config/locales/ro.yml
+++ b/config/locales/ro.yml
@@ -693,7 +693,6 @@ ro:
recovery_instructions_html: Dacă îți pierzi vreodată accesul la telefon, poți folosi unul dintre codurile de recuperare de mai jos pentru a recâștiga accesul la contul tău. Păstrați codurile de recuperare în condiții de siguranță. De exemplu, le puteți tipări și stoca cu alte documente importante.
user_mailer:
backup_ready:
- explanation: Ai solicitat o copie de rezervă completă a contului tău. Acum este gata pentru descărcare!
subject: Arhiva ta este gata pentru descărcare
title: Preluare arhivă
warning:
diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index b1c86494c7..2644275c37 100644
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -1837,7 +1837,6 @@ ru:
webauthn: Ключи безопасности
user_mailer:
appeal_approved:
- action: Перейти к своему профилю
explanation: Апелляция на разблокировку против вашей учетной записи %{strike_date}, которую вы подали на %{appeal_date}, была одобрена. Ваша учетная запись снова на хорошем счету.
subject: Ваше обжалование от %{date} была одобрено
title: Обжалование одобрено
@@ -1846,7 +1845,6 @@ ru:
subject: Ваше обжалование от %{date} отклонено
title: Обжалование отклонено
backup_ready:
- explanation: Вы запросили архив всех данных вашей учётной записи Mastodon. Что ж, он готов к скачиванию.
subject: Ваш архив готов к загрузке
title: Архив ваших данных готов
suspicious_sign_in:
diff --git a/config/locales/sc.yml b/config/locales/sc.yml
index d92b64783a..273ef9d2d9 100644
--- a/config/locales/sc.yml
+++ b/config/locales/sc.yml
@@ -1077,7 +1077,6 @@ sc:
webauthn: Craes de seguresa
user_mailer:
backup_ready:
- explanation: As pedidu una còpia de seguresa totale de su contu de Mastodon tuo. Immoe est pronta pro s'iscarrigamentu!
subject: S'archìviu tuo est prontu pro èssere iscarrigadu
title: Collida dae s'archìviu
warning:
diff --git a/config/locales/sco.yml b/config/locales/sco.yml
index f77c4c7978..a1071197f1 100644
--- a/config/locales/sco.yml
+++ b/config/locales/sco.yml
@@ -1532,7 +1532,6 @@ sco:
webauthn: Security keys
user_mailer:
appeal_approved:
- action: Gang tae yer accoont
explanation: The appeal o the strike agin yer accoont on %{strike_date} thit ye submittit on %{appeal_date} haes been approved. Yer accoont is ance again in guid staunnin.
subject: Yer appeal fae %{date} haes been approved
title: Appeal approved
@@ -1541,7 +1540,6 @@ sco:
subject: Yer appeal fae %{date} haes been rejectit
title: Appeal rejectit
backup_ready:
- explanation: Ye wantit a ful backup o yer Mastodon accoont. It's riddy fir tae doonload noo!
subject: Yer archive is riddy fir doonload
title: Archive takoot
suspicious_sign_in:
diff --git a/config/locales/si.yml b/config/locales/si.yml
index 70aefafc11..660fd3ba31 100644
--- a/config/locales/si.yml
+++ b/config/locales/si.yml
@@ -1389,7 +1389,6 @@ si:
webauthn: ආරක්ෂණ යතුරු
user_mailer:
appeal_approved:
- action: ඔබගේ ගිණුමට යන්න
explanation: ඔබ %{appeal_date} දින ඉදිරිපත් කළ %{strike_date} හි ඔබේ ගිණුමට එරෙහි වර්ජනයේ අභියාචනය අනුමත කර ඇත. ඔබගේ ගිණුම නැවත වරක් හොඳ තත්වයක පවතී.
subject: "%{date} සිට ඔබගේ අභියාචනය අනුමත කර ඇත"
title: අභියාචනය අනුමත කර ඇත
@@ -1398,7 +1397,6 @@ si:
subject: "%{date} සිට ඔබගේ අභියාචනය ප්රතික්ෂේප කර ඇත"
title: අභියාචනය ප්රතික්ෂේප විය
backup_ready:
- explanation: ඔබගේ මාස්ටඩන් ගිණුමේ පූර්ණ උපස්ථයක් ඉල්ලා ඇත. එය දැන් බාගැනීමට හැකිය!
subject: ඔබගේ සංරක්ෂිතය බාගැනීමට සූදානම්ය
title: සංරක්ෂිත රැගෙන යාම
suspicious_sign_in:
diff --git a/config/locales/sk.yml b/config/locales/sk.yml
index 9390a713bc..fdd64b5bb7 100644
--- a/config/locales/sk.yml
+++ b/config/locales/sk.yml
@@ -1138,6 +1138,7 @@ sk:
unknown_browser: Neznámy prehliadač
weibo: Sina/Tencent Weibo
current_session: Aktuálna sezóna
+ date: Dátum
description: "%{browser} na %{platform}"
explanation: Tieto sú prehliadače ktoré sú teraz prihlásené na tvoj Mastodon účet.
ip: IP adresa
@@ -1245,9 +1246,12 @@ sk:
recovery_instructions_html: Keď hocikedy stratíš prístup k svojmu telefónu, môžeš použiť jeden z prístupových kódov nižšie pre obnovenie prístupu k svojmu účtu. Skladuj tieto prístupové kódy na bezpečnom mieste. Napríklad ich môžeš vytlačiť a uložiť ich spolu s inými dôležitými dokumentami.
user_mailer:
appeal_approved:
- action: Choď na svoj účet
+ action: Nastavenia účtu
+ appeal_rejected:
+ subtitle: Tvoje odvolanie bolo zamietnuté.
backup_ready:
- explanation: Vyžiadal/a si si úplnú zálohu svojho Mastodon účtu. Táto záloha je teraz pripravená na stiahnutie!
+ explanation: Vyžiadal/a si si úplnú zálohu svojho Mastodon účtu.
+ extra: Teraz je pripravená na stiahnutie!
subject: Tvoj archív je pripravený na stiahnutie
title: Odber archívu
warning:
diff --git a/config/locales/sl.yml b/config/locales/sl.yml
index 83d52ae0e7..1a0afe034f 100644
--- a/config/locales/sl.yml
+++ b/config/locales/sl.yml
@@ -1660,6 +1660,7 @@ sl:
unknown_browser: Neznan brskalnik
weibo: Weibo
current_session: Trenutna seja
+ date: Datum
description: "%{browser} na %{platform}"
explanation: To so spletni brskalniki, ki so trenutno prijavljeni v vaš Mastodon račun.
ip: IP
@@ -1838,16 +1839,19 @@ sl:
webauthn: Varnostni ključi
user_mailer:
appeal_approved:
- action: Pojdite na svoj račun
+ action: Nastavitve računa
explanation: Pritožbi na ukrep proti vašemu računu z dne %{strike_date}, ki ste jo oddali dne %{appeal_date}, je bilo ugodeno. Vaš račun je znova nesporen.
subject: Vaši pritožbi z dne %{date} je bilo ugodeno
+ subtitle: Vaš račun je znova na dobrem glasu.
title: Pritožbi ugodeno
appeal_rejected:
explanation: Pritožba na ukrep proti vašemu računu z dne %{strike_date}, ki ste jo oddali dne %{appeal_date}, je bila zavrnjena.
subject: Vaša pritožba z dne %{date} je bila zavrnjena
+ subtitle: Vaša pritožba je bila zavržena.
title: Pritožba zavrnjena
backup_ready:
- explanation: Zahtevali ste popolno varnostno kopijo računa Mastodon. Zdaj je pripravljen za prenos!
+ explanation: Zahtevali ste polno varnostno kopijo svojega računa Mastodon.
+ extra: Zdaj je na voljo za prenos!
subject: Vaš arhiv je pripravljen za prenos
title: Prevzem arhiva
suspicious_sign_in:
diff --git a/config/locales/sq.yml b/config/locales/sq.yml
index 9ab6e85361..1693db7f31 100644
--- a/config/locales/sq.yml
+++ b/config/locales/sq.yml
@@ -1770,7 +1770,6 @@ sq:
webauthn: Kyçe sigurie
user_mailer:
appeal_approved:
- action: Kaloni te llogaria juaj
explanation: Apelimi i paralajmërimit kundër llogarisë tuaj më %{strike_date}, të cilin e parashtruar më %{appeal_date} është miratuar. Llogaria juaj është sërish në pozita të mira.
subject: Apelimi juaj i datës %{date} u miratua
title: Apelimi u miratua
@@ -1779,7 +1778,6 @@ sq:
subject: Apelimi juaj prej %{date} është hedhur poshtë
title: Apelimi u hodh poshtë
backup_ready:
- explanation: Kërkuat një kopjeruajtje të plotë të llogarisë tuaj Mastodon. E keni gati për shkarkim!
subject: Arkivi juaj është gati për shkarkim
title: Marrje arkivi me vete
suspicious_sign_in:
diff --git a/config/locales/sr-Latn.yml b/config/locales/sr-Latn.yml
index 02f63ede71..fc1239bedf 100644
--- a/config/locales/sr-Latn.yml
+++ b/config/locales/sr-Latn.yml
@@ -1634,6 +1634,7 @@ sr-Latn:
unknown_browser: Nepoznati pregledač
weibo: Veibo
current_session: Trenutna sesija
+ date: Datum
description: "%{browser} sa %{platform}"
explanation: Ovo su veb pretraživači koji su trenutno prijavljeni na vaš Mastodon nalog.
ip: IP
@@ -1806,16 +1807,19 @@ sr-Latn:
webauthn: Sigurnosni ključevi
user_mailer:
appeal_approved:
- action: Idite na svoj nalog
+ action: Podešavanja naloga
explanation: Žalba podneta datuma %{appeal_date} na upisan prestup na Vaše ime datuma %{strike_date} je uvažena. Vaš nalog je ponovo u povoljnom položaju.
subject: Vaša žalba podneta %{date} je uvažena
+ subtitle: Vaš nalog je ponovo na dobrom glasu.
title: Žalba uvažena
appeal_rejected:
explanation: Žalba podneta datuma %{appeal_date} na upisan prestup na Vaše ime datuma %{strike_date} je odbijena.
subject: Vaša žalba podneta %{date} je odbijena
+ subtitle: Vaša žalba je odbijena.
title: Žalba odbijena
backup_ready:
- explanation: Tražili ste potpunu rezervnu kopiju vašeg Mastodon naloga. Spremna je za preuzimanje!
+ explanation: Zahtevali ste punu rezervnu kopiju Mastodon naloga.
+ extra: Sada je spremno za preuzimanje!
subject: Vaša arhiva je spremna za preuzimanje
title: Izvoz arhive
suspicious_sign_in:
diff --git a/config/locales/sr.yml b/config/locales/sr.yml
index 51613940bc..4e5e58c859 100644
--- a/config/locales/sr.yml
+++ b/config/locales/sr.yml
@@ -1634,6 +1634,7 @@ sr:
unknown_browser: Непознати прегледач
weibo: Веибо
current_session: Тренутна сесија
+ date: Датум
description: "%{browser} са %{platform}"
explanation: Ово су веб претраживачи који су тренутно пријављени на ваш Mastodon налог.
ip: IP
@@ -1806,16 +1807,19 @@ sr:
webauthn: Сигурносни кључеви
user_mailer:
appeal_approved:
- action: Идите на свој налог
+ action: Подешавања налога
explanation: Жалба поднета датума %{appeal_date} на уписан преступ на Ваше име датума %{strike_date} је уважена. Ваш налог је поново у повољном положају.
subject: Ваша жалба поднета %{date} је уважена
+ subtitle: Ваш налог је поново на добром гласу.
title: Жалба уважена
appeal_rejected:
explanation: Жалба поднета датума %{appeal_date} на уписан преступ на Ваше име датума %{strike_date} је одбијена.
subject: Ваша жалба поднета %{date} је одбијена
+ subtitle: Ваша жалба је одбијена.
title: Жалба одбијена
backup_ready:
- explanation: Тражили сте потпуну резервну копију вашег Mastodon налога. Спремна је за преузимање!
+ explanation: Захтевали сте пуну резервну копију Mastodon налога.
+ extra: Сада је спремно за преузимање!
subject: Ваша архива је спремна за преузимање
title: Извоз архиве
suspicious_sign_in:
diff --git a/config/locales/sv.yml b/config/locales/sv.yml
index 9a2bedbdfe..d4657e9743 100644
--- a/config/locales/sv.yml
+++ b/config/locales/sv.yml
@@ -1607,6 +1607,7 @@ sv:
unknown_browser: Okänd browser
weibo: Weibo
current_session: Nuvarande session
+ date: Datum
description: "%{browser} på %{platform}"
explanation: Detta är inloggade webbläsare på Mastodon just nu.
ip: IP
@@ -1773,16 +1774,19 @@ sv:
webauthn: Säkerhetsnycklar
user_mailer:
appeal_approved:
- action: Gå till ditt konto
+ action: Kontoinställningar
explanation: Överklagandet du skickade in den %{appeal_date} för pricken på ditt konto den %{strike_date} har godkänts. Ditt konto har återigen bra anseende.
subject: Din överklagan den %{date} har godkänts
+ subtitle: Ditt konto är återigen i gott skick.
title: Överklagan godkänd
appeal_rejected:
explanation: Överklagandet du skickade in den %{appeal_date} för pricken på ditt konto den %{strike_date} har avslagits.
subject: Din överklagan den %{date} har avslagits
+ subtitle: Din överklagan har avvisats.
title: Överklagan avslagen
backup_ready:
- explanation: Du begärde en fullständig säkerhetskopiering av ditt Mastodon-konto. Det är nu klart för nedladdning!
+ explanation: Du begärde en fullständig säkerhetskopia av ditt Mastodon-konto.
+ extra: Nu redo för nedladdning!
subject: Ditt arkiv är klart för nedladdning
title: Arkivuttagning
suspicious_sign_in:
diff --git a/config/locales/th.yml b/config/locales/th.yml
index f553f6a41c..7bea8f9de8 100644
--- a/config/locales/th.yml
+++ b/config/locales/th.yml
@@ -1742,7 +1742,6 @@ th:
webauthn: กุญแจความปลอดภัย
user_mailer:
appeal_approved:
- action: ไปยังบัญชีของคุณ
explanation: อนุมัติการอุทธรณ์การดำเนินการต่อบัญชีของคุณเมื่อ %{strike_date} ที่คุณได้ส่งเมื่อ %{appeal_date} แล้ว บัญชีของคุณอยู่ในสถานะที่ดีอีกครั้งหนึ่ง
subject: อนุมัติการอุทธรณ์ของคุณจาก %{date} แล้ว
title: อนุมัติการอุทธรณ์แล้ว
@@ -1751,7 +1750,6 @@ th:
subject: ปฏิเสธการอุทธรณ์ของคุณจาก %{date} แล้ว
title: ปฏิเสธการอุทธรณ์แล้ว
backup_ready:
- explanation: คุณได้ขอข้อมูลสำรองแบบเต็มของบัญชี Mastodon ของคุณ ตอนนี้ข้อมูลสำรองพร้อมสำหรับการดาวน์โหลดแล้ว!
subject: การเก็บถาวรของคุณพร้อมสำหรับการดาวน์โหลดแล้ว
title: การส่งออกการเก็บถาวร
suspicious_sign_in:
diff --git a/config/locales/tr.yml b/config/locales/tr.yml
index da8935f6ca..99b5e782ce 100644
--- a/config/locales/tr.yml
+++ b/config/locales/tr.yml
@@ -1608,6 +1608,7 @@ tr:
unknown_browser: Bilinmeyen Tarayıcı
weibo: Weibo
current_session: Geçerli oturum
+ date: Tarih
description: "%{platform} - %{browser}"
explanation: Bunlar, Mastodon hesabınızda şu anda oturum açmış web tarayıcılarıdır.
ip: IP
@@ -1774,16 +1775,19 @@ tr:
webauthn: Güvenlik anahtarları
user_mailer:
appeal_approved:
- action: Hesabınıza gidin
+ action: Hesap Ayarları
explanation: "%{appeal_date} tarihinde gönderdiğiniz, hesabınıza yönelik %{strike_date} tarihli eyleme itirazınız onaylandı. Hesabınız artık tekrar iyi durumda."
subject: "%{date} tarihli itirazınız kabul edildi"
+ subtitle: Hesabınız yeniden iyi bir halde.
title: İtiraz onaylandı
appeal_rejected:
explanation: "%{appeal_date} tarihinde gönderdiğiniz, hesabınıza yönelik %{strike_date} tarihli eyleme itirazınız reddedildi."
subject: "%{date} tarihli itirazınız reddedildi"
+ subtitle: İtirazınız reddedildi.
title: İtiraz reddedildi
backup_ready:
- explanation: Mastodon hesabınızın tam yedeğini istemiştiniz. Şimdi indirilebilir durumda!
+ explanation: Mastodon hesabınız tam bir yedeğini istediniz.
+ extra: Şimdi indirebilirsiniz!
subject: Arşiviniz indirilmeye hazır
title: Arşiv paketlemesi
suspicious_sign_in:
diff --git a/config/locales/uk.yml b/config/locales/uk.yml
index 7a1957eba7..a80fbf1404 100644
--- a/config/locales/uk.yml
+++ b/config/locales/uk.yml
@@ -1660,6 +1660,7 @@ uk:
unknown_browser: Невідомий браузер
weibo: Weibo
current_session: Поточний сеанс
+ date: Дата
description: "%{browser} на %{platform}"
explanation: Це веб-браузери, авторизовані у вашому обліковому записі Mastodon.
ip: IP
@@ -1838,7 +1839,7 @@ uk:
webauthn: Ключі безпеки
user_mailer:
appeal_approved:
- action: Перейти у ваш обліковий запис
+ action: Налаштування облікового запису
explanation: Оскарження попередження вашому обліковому запису %{strike_date}, яке ви надіслали %{appeal_date} було схвалено. Ваш обліковий запис знову вважається добропорядним.
subject: Вашу апеляцію від %{date} було схвалено
title: Апеляцію схвалено
@@ -1847,7 +1848,6 @@ uk:
subject: Вашу апеляцію від %{date} було відхилено
title: Апеляцію відхилено
backup_ready:
- explanation: Ви робили запит повної резервної копії вашого облікового запису Mastodon. Вона вже готова для завантаження!
subject: Ваш архів готовий до завантаження
title: Винесення архіву
suspicious_sign_in:
diff --git a/config/locales/vi.yml b/config/locales/vi.yml
index f37132b6eb..dabb73a475 100644
--- a/config/locales/vi.yml
+++ b/config/locales/vi.yml
@@ -1582,6 +1582,7 @@ vi:
unknown_browser: Trình duyệt khác
weibo: Weibo
current_session: Phiên hiện tại
+ date: Thời gian
description: "%{browser} trên %{platform}"
explanation: Đây là các ứng dụng đã từng đăng nhập vào tài khoản Mastodon của bạn.
ip: IP
@@ -1742,16 +1743,19 @@ vi:
webauthn: Khóa bảo mật
user_mailer:
appeal_approved:
- action: Đến trang hồ sơ của bạn
+ action: Cài đặt tài khoản
explanation: Khiếu nại về tài khoản của bạn vào %{strike_date}, được gửi lúc %{appeal_date} đã được chấp nhận. Tài khoản của bạn đã có thể sử dụng bình thường.
subject: Khiếu nại của bạn từ %{date} đã được chấp nhận
+ subtitle: Tài khoản của bạn có thể hoạt động lại bình thường.
title: Khiếu nại đã được chấp nhận
appeal_rejected:
explanation: Khiếu nại về tài khoản của bạn vào %{strike_date}, được gửi lúc %{appeal_date} đã bị từ chối.
subject: Khiếu nại của bạn từ %{date} đã bị từ chối
+ subtitle: Khiếu nại của bạn bị từ chối.
title: Khiếu nại bị từ chối
backup_ready:
- explanation: Bạn đã yêu cầu sao lưu toàn bộ tài khoản Mastodon của mình. Bây giờ có thể tải về!
+ explanation: Bạn đã yêu cầu bản sao tài khoản Mastodon của mình.
+ extra: Hiện nó đã sẵn sàng tải xuống!
subject: Dữ liệu cá nhân của bạn đã sẵn sàng để tải về
title: Nhận dữ liệu cá nhân
suspicious_sign_in:
diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml
index a573c8f99b..6611510b7d 100644
--- a/config/locales/zh-CN.yml
+++ b/config/locales/zh-CN.yml
@@ -1582,6 +1582,7 @@ zh-CN:
unknown_browser: 未知浏览器
weibo: 新浪微博
current_session: 当前会话
+ date: 日期
description: "%{platform} 上的 %{browser}"
explanation: 你的 Mastodon 账户目前已在这些浏览器上登录。
ip: IP 地址
@@ -1742,16 +1743,19 @@ zh-CN:
webauthn: 安全密钥
user_mailer:
appeal_approved:
- action: 前往你的账号
+ action: 账户设置
explanation: 你于 %{appeal_date} 对 %{strike_date} 在你账号上做出的处罚提出的申诉已被批准，你的账号已回到正常状态。
subject: 你于 %{date} 提出的申诉已被批准
+ subtitle: 您的账户已再次回到良好状态。
title: 申诉已批准
appeal_rejected:
explanation: 你于 %{appeal_date} 对 %{strike_date} 在你账号上做出的处罚提出的申诉已被驳回。
subject: 你于 %{date} 提出的申诉已被驳回
+ subtitle: 您的申诉已被驳回。
title: 申诉已驳回
backup_ready:
- explanation: 你请求了一份 Mastodon 账户的完整备份。现在你可以下载了！
+ explanation: 您之前请求为您的 Mastodon 账户创建一份完整的备份。
+ extra: 现在它可以下载了！
subject: 你的存档已经准备完毕
title: 存档导出
suspicious_sign_in:
diff --git a/config/locales/zh-HK.yml b/config/locales/zh-HK.yml
index 61355a4c53..4b682f9358 100644
--- a/config/locales/zh-HK.yml
+++ b/config/locales/zh-HK.yml
@@ -1582,6 +1582,7 @@ zh-HK:
unknown_browser: 未知的瀏覽器
weibo: 新浪微博
current_session: 目前的作業階段
+ date: 日期
description: "%{platform} 上的 %{browser}"
explanation: 這些是現在正登入於你的 Mastodon 帳號的瀏覽器。
ip: IP 位址
@@ -1742,16 +1743,19 @@ zh-HK:
webauthn: 安全密鑰
user_mailer:
appeal_approved:
- action: 前往你的帳號
+ action: 帳號設定
explanation: 你在 %{appeal_date} 提交針對你帳號於 %{strike_date} 被警告的申訴已獲得批准。你的帳號再次回到良好狀態。
subject: 你在 %{date} 提出的申訴已獲批准
+ subtitle: 你的帳號再次恢復正常。
title: 申訴已批准
appeal_rejected:
explanation: 你在 %{appeal_date} 提交針對你帳號於 %{strike_date} 被警告的申訴已被駁回。
subject: 你在 %{date} 提出的申訴已被駁回
+ subtitle: 你的申訴已被駁回.
title: 申訴被駁回
backup_ready:
- explanation: 你要求的 Mastodon 帳號完整備份檔案現已就緒，可供下載。
+ explanation: 你要求完整備份你的 Mastodon 帳號。
+ extra: 現在可以下載了！
subject: 你的備份檔已可供下載
title: 檔案匯出
suspicious_sign_in:
diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml
index 3f3057cc05..dd17de7ef1 100644
--- a/config/locales/zh-TW.yml
+++ b/config/locales/zh-TW.yml
@@ -1584,6 +1584,7 @@ zh-TW:
unknown_browser: 未知的瀏覽器
weibo: 新浪微博
current_session: 目前的 session
+ date: 日期
description: "%{platform} 上的 %{browser}"
explanation: 這些是現在正登入於您 Mastodon 帳號的瀏覽器。
ip: IP 位址
@@ -1744,16 +1745,19 @@ zh-TW:
webauthn: 安全金鑰
user_mailer:
appeal_approved:
- action: 前往您的帳號
+ action: 帳號設定
explanation: 您於 %{appeal_date} 遞交的針對您帳號的 %{strike_date} 警示之申訴已獲批准。您的帳號再次享有良好的信譽。
subject: 您於 %{date} 提出之申訴已獲批准
+ subtitle: 您的帳號再次保持良好信譽。
title: 申訴已批准
appeal_rejected:
explanation: 您於 %{appeal_date} 遞交的針對您帳號的 %{strike_date} 警示之申訴已被駁回。
subject: 您於 %{date} 提出之申訴已被駁回
+ subtitle: 您的申訴已被駁回。
title: 申訴被駁回
backup_ready:
- explanation: 您要求的 Mastodon 帳號完整備份檔案現已就緒，可供下載！
+ explanation: 您要求完整備份您的 Mastodon 帳號。
+ extra: 準備好下載了！
subject: 您的備份檔已可供下載
title: 檔案匯出
suspicious_sign_in:
diff --git a/lib/tasks/db.rake b/lib/tasks/db.rake
index e8a64b8fb2..3bc526bd21 100644
--- a/lib/tasks/db.rake
+++ b/lib/tasks/db.rake
@@ -15,7 +15,7 @@ namespace :db do
end
end
- task :pre_migration_check do
+ task pre_migration_check: :environment do
version = ActiveRecord::Base.connection.select_one("SELECT current_setting('server_version_num') AS v")['v'].to_i
abort 'This version of Mastodon requires PostgreSQL 9.5 or newer. Please update PostgreSQL before updating Mastodon' if version < 90_500
end
diff --git a/spec/lib/mastodon/cli/accounts_spec.rb b/spec/lib/mastodon/cli/accounts_spec.rb
index 64df29ebb3..26ad983bbc 100644
--- a/spec/lib/mastodon/cli/accounts_spec.rb
+++ b/spec/lib/mastodon/cli/accounts_spec.rb
@@ -660,106 +660,69 @@ describe Mastodon::CLI::Accounts do
end
describe '#refresh' do
+ let(:action) { :refresh }
+
context 'with --all option' do
- let!(:local_account) { Fabricate(:account, domain: nil) }
- let!(:remote_account_example_com) { Fabricate(:account, domain: 'example.com') }
- let!(:account_example_net) { Fabricate(:account, domain: 'example.net') }
- let(:scope) { Account.remote }
+ let(:options) { { all: true } }
+ let!(:local_account) { Fabricate(:account, domain: nil) }
+ let(:remote_com_avatar_url) { 'https://example.host/avatar/com' }
+ let(:remote_com_header_url) { 'https://example.host/header/com' }
+ let(:remote_account_example_com) { Fabricate(:account, domain: 'example.com', avatar_remote_url: remote_com_avatar_url, header_remote_url: remote_com_header_url) }
+ let(:remote_net_avatar_url) { 'https://example.host/avatar/net' }
+ let(:remote_net_header_url) { 'https://example.host/header/net' }
+ let(:account_example_net) { Fabricate(:account, domain: 'example.net', avatar_remote_url: remote_net_avatar_url, header_remote_url: remote_net_header_url) }
+ let(:scope) { Account.remote }
before do
- # TODO: we should be using `stub_parallelize_with_progress!` but
- # this makes the assertions harder to write
- allow(cli).to receive(:parallelize_with_progress).and_yield(remote_account_example_com)
- .and_yield(account_example_net)
- .and_return([2, nil])
- cli.options = { all: true }
+ stub_parallelize_with_progress!
+
+ stub_request(:get, remote_com_avatar_url)
+ .to_return request_fixture('avatar.txt')
+ stub_request(:get, remote_com_header_url)
+ .to_return request_fixture('avatar.txt')
+ stub_request(:get, remote_net_avatar_url)
+ .to_return request_fixture('avatar.txt')
+ stub_request(:get, remote_net_header_url)
+ .to_return request_fixture('avatar.txt')
+
+ remote_account_example_com
+ .update_column(:avatar_file_name, nil)
+ account_example_net
+ .update_column(:avatar_file_name, nil)
end
- it 'refreshes the avatar for all remote accounts' do
- allow(remote_account_example_com).to receive(:reset_avatar!)
- allow(account_example_net).to receive(:reset_avatar!)
-
- expect { cli.refresh }
+ it 'refreshes the avatar and header for all remote accounts' do
+ expect { subject }
.to output_results('Refreshed 2 accounts')
+ .and not_change(local_account, :updated_at)
- expect(cli).to have_received(:parallelize_with_progress).with(scope).once
- expect(remote_account_example_com).to have_received(:reset_avatar!).once
- expect(account_example_net).to have_received(:reset_avatar!).once
- end
-
- it 'does not refresh avatar for local accounts' do
- allow(local_account).to receive(:reset_avatar!)
-
- expect { cli.refresh }
- .to output_results('Refreshed 2 accounts')
-
- expect(cli).to have_received(:parallelize_with_progress).with(scope).once
- expect(local_account).to_not have_received(:reset_avatar!)
- end
-
- it 'refreshes the header for all remote accounts' do
- allow(remote_account_example_com).to receive(:reset_header!)
- allow(account_example_net).to receive(:reset_header!)
-
- expect { cli.refresh }
- .to output_results('Refreshed 2 accounts')
-
- expect(cli).to have_received(:parallelize_with_progress).with(scope).once
- expect(remote_account_example_com).to have_received(:reset_header!).once
- expect(account_example_net).to have_received(:reset_header!).once
- end
-
- it 'does not refresh the header for local accounts' do
- allow(local_account).to receive(:reset_header!)
-
- expect { cli.refresh }
- .to output_results('Refreshed 2 accounts')
-
- expect(cli).to have_received(:parallelize_with_progress).with(scope).once
- expect(local_account).to_not have_received(:reset_header!)
- end
-
- it 'displays a successful message' do
- expect { cli.refresh }
- .to output_results('Refreshed 2 accounts')
+ # One request from factory creation, one more from task
+ expect(a_request(:get, remote_com_avatar_url))
+ .to have_been_made.at_least_times(2)
+ expect(a_request(:get, remote_com_header_url))
+ .to have_been_made.at_least_times(2)
+ expect(a_request(:get, remote_net_avatar_url))
+ .to have_been_made.at_least_times(2)
+ expect(a_request(:get, remote_net_header_url))
+ .to have_been_made.at_least_times(2)
end
context 'with --dry-run option' do
- before do
- cli.options = { all: true, dry_run: true }
- end
+ let(:options) { { all: true, dry_run: true } }
- it 'does not refresh the avatar for any account' do
- allow(local_account).to receive(:reset_avatar!)
- allow(remote_account_example_com).to receive(:reset_avatar!)
- allow(account_example_net).to receive(:reset_avatar!)
-
- expect { cli.refresh }
+ it 'does not refresh the avatar or header for any account' do
+ expect { subject }
.to output_results('Refreshed 2 accounts')
- expect(cli).to have_received(:parallelize_with_progress).with(scope).once
- expect(local_account).to_not have_received(:reset_avatar!)
- expect(remote_account_example_com).to_not have_received(:reset_avatar!)
- expect(account_example_net).to_not have_received(:reset_avatar!)
- end
-
- it 'does not refresh the header for any account' do
- allow(local_account).to receive(:reset_header!)
- allow(remote_account_example_com).to receive(:reset_header!)
- allow(account_example_net).to receive(:reset_header!)
-
- expect { cli.refresh }
- .to output_results('Refreshed 2 accounts')
-
- expect(cli).to have_received(:parallelize_with_progress).with(scope).once
- expect(local_account).to_not have_received(:reset_header!)
- expect(remote_account_example_com).to_not have_received(:reset_header!)
- expect(account_example_net).to_not have_received(:reset_header!)
- end
-
- it 'displays a successful message with (DRY RUN)' do
- expect { cli.refresh }
- .to output_results('Refreshed 2 accounts (DRY RUN)')
+ # One request from factory creation, none from task due to dry run
+ expect(a_request(:get, remote_com_avatar_url))
+ .to have_been_made.once
+ expect(a_request(:get, remote_com_header_url))
+ .to have_been_made.once
+ expect(a_request(:get, remote_net_avatar_url))
+ .to have_been_made.once
+ expect(a_request(:get, remote_net_header_url))
+ .to have_been_made.once
end
end
end
@@ -782,7 +745,7 @@ describe Mastodon::CLI::Accounts do
allow(account_example_com_a).to receive(:reset_avatar!)
allow(account_example_com_b).to receive(:reset_avatar!)
- expect { cli.refresh(*arguments) }
+ expect { subject }
.to output_results('OK')
expect(account_example_com_a).to have_received(:reset_avatar!).once
@@ -792,7 +755,7 @@ describe Mastodon::CLI::Accounts do
it 'does not reset the avatar for unspecified accounts' do
allow(account_example_net).to receive(:reset_avatar!)
- expect { cli.refresh(*arguments) }
+ expect { subject }
.to output_results('OK')
expect(account_example_net).to_not have_received(:reset_avatar!)
@@ -802,7 +765,7 @@ describe Mastodon::CLI::Accounts do
allow(account_example_com_a).to receive(:reset_header!)
allow(account_example_com_b).to receive(:reset_header!)
- expect { cli.refresh(*arguments) }
+ expect { subject }
.to output_results('OK')
expect(account_example_com_a).to have_received(:reset_header!).once
@@ -812,7 +775,7 @@ describe Mastodon::CLI::Accounts do
it 'does not reset the header for unspecified accounts' do
allow(account_example_net).to receive(:reset_header!)
- expect { cli.refresh(*arguments) }
+ expect { subject }
.to output_results('OK')
expect(account_example_net).to_not have_received(:reset_header!)
@@ -822,7 +785,7 @@ describe Mastodon::CLI::Accounts do
it 'displays a failure message' do
allow(account_example_com_a).to receive(:reset_avatar!).and_raise(Mastodon::UnexpectedResponseError)
- expect { cli.refresh(*arguments) }
+ expect { subject }
.to output_results("Account failed: #{account_example_com_a.username}@#{account_example_com_a.domain}")
end
end
@@ -831,22 +794,20 @@ describe Mastodon::CLI::Accounts do
it 'exits with an error message' do
allow(Account).to receive(:find_remote).with(account_example_com_b.username, account_example_com_b.domain).and_return(nil)
- expect { cli.refresh(*arguments) }
+ expect { subject }
.to output_results('No such account')
.and raise_error(SystemExit)
end
end
context 'with --dry-run option' do
- before do
- cli.options = { dry_run: true }
- end
+ let(:options) { { dry_run: true } }
it 'does not refresh the avatar for any account' do
allow(account_example_com_a).to receive(:reset_avatar!)
allow(account_example_com_b).to receive(:reset_avatar!)
- expect { cli.refresh(*arguments) }
+ expect { subject }
.to output_results('OK (DRY RUN)')
expect(account_example_com_a).to_not have_received(:reset_avatar!)
@@ -857,7 +818,7 @@ describe Mastodon::CLI::Accounts do
allow(account_example_com_a).to receive(:reset_header!)
allow(account_example_com_b).to receive(:reset_header!)
- expect { cli.refresh(*arguments) }
+ expect { subject }
.to output_results('OK (DRY RUN)')
expect(account_example_com_a).to_not have_received(:reset_header!)
@@ -867,67 +828,70 @@ describe Mastodon::CLI::Accounts do
end
context 'with --domain option' do
- let!(:account_example_com_a) { Fabricate(:account, domain: 'example.com') }
- let!(:account_example_com_b) { Fabricate(:account, domain: 'example.com') }
- let!(:account_example_net) { Fabricate(:account, domain: 'example.net') }
- let(:domain) { 'example.com' }
- let(:scope) { Account.remote.where(domain: domain) }
+ let(:domain) { 'example.com' }
+ let(:options) { { domain: domain } }
+
+ let(:com_a_avatar_url) { 'https://example.host/avatar/a' }
+ let(:com_a_header_url) { 'https://example.host/header/a' }
+ let(:account_example_com_a) { Fabricate(:account, domain: domain, avatar_remote_url: com_a_avatar_url, header_remote_url: com_a_header_url) }
+
+ let(:com_b_avatar_url) { 'https://example.host/avatar/b' }
+ let(:com_b_header_url) { 'https://example.host/header/b' }
+ let(:account_example_com_b) { Fabricate(:account, domain: domain, avatar_remote_url: com_b_avatar_url, header_remote_url: com_b_header_url) }
+
+ let(:net_avatar_url) { 'https://example.host/avatar/net' }
+ let(:net_header_url) { 'https://example.host/header/net' }
+ let(:account_example_net) { Fabricate(:account, domain: 'example.net', avatar_remote_url: net_avatar_url, header_remote_url: net_header_url) }
before do
- allow(cli).to receive(:parallelize_with_progress).and_yield(account_example_com_a)
- .and_yield(account_example_com_b)
- .and_return([2, nil])
- cli.options = { domain: domain }
+ stub_parallelize_with_progress!
+
+ stub_request(:get, com_a_avatar_url)
+ .to_return request_fixture('avatar.txt')
+ stub_request(:get, com_a_header_url)
+ .to_return request_fixture('avatar.txt')
+ stub_request(:get, com_b_avatar_url)
+ .to_return request_fixture('avatar.txt')
+ stub_request(:get, com_b_header_url)
+ .to_return request_fixture('avatar.txt')
+ stub_request(:get, net_avatar_url)
+ .to_return request_fixture('avatar.txt')
+ stub_request(:get, net_header_url)
+ .to_return request_fixture('avatar.txt')
+
+ account_example_com_a
+ .update_column(:avatar_file_name, nil)
+ account_example_com_b
+ .update_column(:avatar_file_name, nil)
+ account_example_net
+ .update_column(:avatar_file_name, nil)
end
- it 'refreshes the avatar for all accounts on specified domain' do
- allow(account_example_com_a).to receive(:reset_avatar!)
- allow(account_example_com_b).to receive(:reset_avatar!)
-
- expect { cli.refresh }
+ it 'refreshes the avatar and header for all accounts on specified domain' do
+ expect { subject }
.to output_results('Refreshed 2 accounts')
- expect(cli).to have_received(:parallelize_with_progress).with(scope).once
- expect(account_example_com_a).to have_received(:reset_avatar!).once
- expect(account_example_com_b).to have_received(:reset_avatar!).once
- end
+ # One request from factory creation, one more from task
+ expect(a_request(:get, com_a_avatar_url))
+ .to have_been_made.at_least_times(2)
+ expect(a_request(:get, com_a_header_url))
+ .to have_been_made.at_least_times(2)
+ expect(a_request(:get, com_b_avatar_url))
+ .to have_been_made.at_least_times(2)
+ expect(a_request(:get, com_b_header_url))
+ .to have_been_made.at_least_times(2)
- it 'does not refresh the avatar for accounts outside specified domain' do
- allow(account_example_net).to receive(:reset_avatar!)
-
- expect { cli.refresh }
- .to output_results('Refreshed 2 accounts')
-
- expect(cli).to have_received(:parallelize_with_progress).with(scope).once
- expect(account_example_net).to_not have_received(:reset_avatar!)
- end
-
- it 'refreshes the header for all accounts on specified domain' do
- allow(account_example_com_a).to receive(:reset_header!)
- allow(account_example_com_b).to receive(:reset_header!)
-
- expect { cli.refresh }
- .to output_results('Refreshed 2 accounts')
-
- expect(cli).to have_received(:parallelize_with_progress).with(scope)
- expect(account_example_com_a).to have_received(:reset_header!).once
- expect(account_example_com_b).to have_received(:reset_header!).once
- end
-
- it 'does not refresh the header for accounts outside specified domain' do
- allow(account_example_net).to receive(:reset_header!)
-
- expect { cli.refresh }
- .to output_results('Refreshed 2 accounts')
-
- expect(cli).to have_received(:parallelize_with_progress).with(scope).once
- expect(account_example_net).to_not have_received(:reset_header!)
+ # One request from factory creation, none from task
+ expect(a_request(:get, net_avatar_url))
+ .to have_been_made.once
+ expect(a_request(:get, net_header_url))
+ .to have_been_made.once
end
end
context 'when neither a list of accts nor options are provided' do
it 'exits with an error message' do
- expect { cli.refresh }
+ expect { subject }
.to output_results('No account(s) given')
.and raise_error(SystemExit)
end
diff --git a/spec/models/announcement_spec.rb b/spec/models/announcement_spec.rb
index 612ba8bb0d..1e7283ca77 100644
--- a/spec/models/announcement_spec.rb
+++ b/spec/models/announcement_spec.rb
@@ -115,26 +115,35 @@ describe Announcement do
describe '#reactions' do
context 'with announcement_reactions present' do
+ let(:account_reaction_emoji) { Fabricate :custom_emoji }
+ let(:other_reaction_emoji) { Fabricate :custom_emoji }
let!(:account) { Fabricate(:account) }
let!(:announcement) { Fabricate(:announcement) }
- let!(:announcement_reaction) { Fabricate(:announcement_reaction, announcement: announcement, created_at: 10.days.ago) }
- let!(:announcement_reaction_account) { Fabricate(:announcement_reaction, announcement: announcement, created_at: 5.days.ago, account: account) }
before do
- Fabricate(:announcement_reaction)
+ Fabricate(:announcement_reaction, announcement: announcement, created_at: 10.days.ago, name: other_reaction_emoji.shortcode)
+ Fabricate(:announcement_reaction, announcement: announcement, created_at: 5.days.ago, account: account, name: account_reaction_emoji.shortcode)
+ Fabricate(:announcement_reaction) # For some other announcement
end
it 'returns the announcement reactions for the announcement' do
results = announcement.reactions
- expect(results.first.name).to eq(announcement_reaction.name)
- expect(results.last.name).to eq(announcement_reaction_account.name)
+ expect(results).to have_attributes(
+ size: eq(2),
+ first: have_attributes(name: other_reaction_emoji.shortcode, me: false),
+ last: have_attributes(name: account_reaction_emoji.shortcode, me: false)
+ )
end
- it 'returns the announcement reactions for the announcement limited to account' do
+ it 'returns the announcement reactions for the announcement with `me` set correctly' do
results = announcement.reactions(account)
- expect(results.first.name).to eq(announcement_reaction.name)
+ expect(results).to have_attributes(
+ size: eq(2),
+ first: have_attributes(name: other_reaction_emoji.shortcode, me: false),
+ last: have_attributes(name: account_reaction_emoji.shortcode, me: true)
+ )
end
end
end
diff --git a/yarn.lock b/yarn.lock
index d4b83a683d..1c3ef5c647 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1811,6 +1811,16 @@ __metadata:
languageName: node
linkType: hard
+"@formatjs/ecma402-abstract@npm:1.18.2":
+ version: 1.18.2
+ resolution: "@formatjs/ecma402-abstract@npm:1.18.2"
+ dependencies:
+ "@formatjs/intl-localematcher": "npm:0.5.4"
+ tslib: "npm:^2.4.0"
+ checksum: 87afb37dd937555e712ca85d5142a9083d617c491d1dddf8d660fdfb6186272d2bc75b78809b076388d26f016200c8bddbce73281fd707eb899da2bf3bc9b7ca
+ languageName: node
+ linkType: hard
+
"@formatjs/fast-memoize@npm:2.2.0":
version: 2.2.0
resolution: "@formatjs/fast-memoize@npm:2.2.0"
@@ -1831,6 +1841,17 @@ __metadata:
languageName: node
linkType: hard
+"@formatjs/icu-messageformat-parser@npm:2.7.5":
+ version: 2.7.5
+ resolution: "@formatjs/icu-messageformat-parser@npm:2.7.5"
+ dependencies:
+ "@formatjs/ecma402-abstract": "npm:1.18.2"
+ "@formatjs/icu-skeleton-parser": "npm:1.7.2"
+ tslib: "npm:^2.4.0"
+ checksum: b1995ee0844c48d1b4bf184017a65600eb1d324107046c8b67d77e08d7da74bbbbf00dccbf2bc418480c8510443b3eb157646404fbacd71fa6e7d572d0ffc910
+ languageName: node
+ linkType: hard
+
"@formatjs/icu-skeleton-parser@npm:1.7.0":
version: 1.7.0
resolution: "@formatjs/icu-skeleton-parser@npm:1.7.0"
@@ -1841,25 +1862,35 @@ __metadata:
languageName: node
linkType: hard
-"@formatjs/intl-displaynames@npm:6.6.4":
- version: 6.6.4
- resolution: "@formatjs/intl-displaynames@npm:6.6.4"
+"@formatjs/icu-skeleton-parser@npm:1.7.2":
+ version: 1.7.2
+ resolution: "@formatjs/icu-skeleton-parser@npm:1.7.2"
dependencies:
- "@formatjs/ecma402-abstract": "npm:1.18.0"
- "@formatjs/intl-localematcher": "npm:0.5.2"
+ "@formatjs/ecma402-abstract": "npm:1.18.2"
tslib: "npm:^2.4.0"
- checksum: 009e443dd0d10776b8573d0181407d4c0d6c7a2ff537a5ea1e36413d1b08db9c21dfef272eabab8efabd01a58b64f663a30e4d584fd761df3fd68a5d23fe444b
+ checksum: 7ca30ac360a5a971b5a06b4ae0263f0ddbde4751ff470486767f544f0399c5c85affab7170e5dd227c65afac4797e79a5e8abe65a70a335b96ab77b5d314abcb
languageName: node
linkType: hard
-"@formatjs/intl-listformat@npm:7.5.3":
- version: 7.5.3
- resolution: "@formatjs/intl-listformat@npm:7.5.3"
+"@formatjs/intl-displaynames@npm:6.6.6":
+ version: 6.6.6
+ resolution: "@formatjs/intl-displaynames@npm:6.6.6"
dependencies:
- "@formatjs/ecma402-abstract": "npm:1.18.0"
- "@formatjs/intl-localematcher": "npm:0.5.2"
+ "@formatjs/ecma402-abstract": "npm:1.18.2"
+ "@formatjs/intl-localematcher": "npm:0.5.4"
tslib: "npm:^2.4.0"
- checksum: de741ce84b16fed57016afbfe446ebd57cd23a046859a9353f5d455f8bc9114493bf83b9e18429268c7ce8f77bc54516a9b8190baf09fbb25c9b06cfc80101d4
+ checksum: 4ba40057cfafaabf04485137bc96705d5ed7ac48f17ed7dfe8dbd7f71119667b6c0b7fa75469e32b70c9bada2c5d03af37a5261d655a37b81c63ba907edbb2e8
+ languageName: node
+ linkType: hard
+
+"@formatjs/intl-listformat@npm:7.5.5":
+ version: 7.5.5
+ resolution: "@formatjs/intl-listformat@npm:7.5.5"
+ dependencies:
+ "@formatjs/ecma402-abstract": "npm:1.18.2"
+ "@formatjs/intl-localematcher": "npm:0.5.4"
+ tslib: "npm:^2.4.0"
+ checksum: bc9d8cbe42bd9513db0b2b221c0b1a752892005a90fa629b4cf7df1cbd3b96997cddbf420e562ebdfdc691a28d9b759ccae9633d5987aa0bceed5aef77a07ca4
languageName: node
linkType: hard
@@ -1872,34 +1903,63 @@ __metadata:
languageName: node
linkType: hard
-"@formatjs/intl-pluralrules@npm:^5.2.2":
- version: 5.2.10
- resolution: "@formatjs/intl-pluralrules@npm:5.2.10"
+"@formatjs/intl-localematcher@npm:0.5.4":
+ version: 0.5.4
+ resolution: "@formatjs/intl-localematcher@npm:0.5.4"
dependencies:
- "@formatjs/ecma402-abstract": "npm:1.18.0"
- "@formatjs/intl-localematcher": "npm:0.5.2"
tslib: "npm:^2.4.0"
- checksum: 1050416613e80bff2c58546c80c8d52ed97847d13c90535a53d058e44969369b50e1cfdb464e9e9ef4802c934c84ea0e656c3f4e3b4d5ac7496b722c759da4cf
+ checksum: c9ff5d34ca8b6fe59f8f303a3cc31a92d343e095a6987e273e5cc23f0fe99feb557a392a05da95931c7d24106acb6988e588d00ddd05b0934005aafd7fdbafe6
languageName: node
linkType: hard
-"@formatjs/intl@npm:2.9.9":
- version: 2.9.9
- resolution: "@formatjs/intl@npm:2.9.9"
+"@formatjs/intl-pluralrules@npm:^5.2.2":
+ version: 5.2.12
+ resolution: "@formatjs/intl-pluralrules@npm:5.2.12"
dependencies:
- "@formatjs/ecma402-abstract": "npm:1.18.0"
+ "@formatjs/ecma402-abstract": "npm:1.18.2"
+ "@formatjs/intl-localematcher": "npm:0.5.4"
+ tslib: "npm:^2.4.0"
+ checksum: 0f4d9f4f272dd962b2f742519045ad43a1b6358755787d3394efcc5884b02184cc8d76fb13d98b1f30c41a813b81f82dd2342e1fb0fbd7b7efa69f5d0d59c4d0
+ languageName: node
+ linkType: hard
+
+"@formatjs/intl@npm:2.9.11":
+ version: 2.9.11
+ resolution: "@formatjs/intl@npm:2.9.11"
+ dependencies:
+ "@formatjs/ecma402-abstract": "npm:1.18.2"
"@formatjs/fast-memoize": "npm:2.2.0"
- "@formatjs/icu-messageformat-parser": "npm:2.7.3"
- "@formatjs/intl-displaynames": "npm:6.6.4"
- "@formatjs/intl-listformat": "npm:7.5.3"
- intl-messageformat: "npm:10.5.8"
+ "@formatjs/icu-messageformat-parser": "npm:2.7.5"
+ "@formatjs/intl-displaynames": "npm:6.6.6"
+ "@formatjs/intl-listformat": "npm:7.5.5"
+ intl-messageformat: "npm:10.5.10"
tslib: "npm:^2.4.0"
peerDependencies:
- typescript: 5
+ typescript: ^4.7 || 5
peerDependenciesMeta:
typescript:
optional: true
- checksum: b26904da605ab309535dfbbfbd403a3bb33d51d3c969c548b88fa04755be3aff60b1bddd1c453514a84048c7432271cef507ac66de32dcfa66b3f842a1ddb977
+ checksum: 003a4356e698cf847aeb701565cad701f3afba2a31d8d3c2fe0d5790d90ef866bea30cf2cc20151b15085db10e436376d38c10b911b3fe5afdef5c32333d09f3
+ languageName: node
+ linkType: hard
+
+"@formatjs/ts-transformer@npm:3.13.11":
+ version: 3.13.11
+ resolution: "@formatjs/ts-transformer@npm:3.13.11"
+ dependencies:
+ "@formatjs/icu-messageformat-parser": "npm:2.7.5"
+ "@types/json-stable-stringify": "npm:^1.0.32"
+ "@types/node": "npm:14 || 16 || 17"
+ chalk: "npm:^4.0.0"
+ json-stable-stringify: "npm:^1.0.1"
+ tslib: "npm:^2.4.0"
+ typescript: "npm:5"
+ peerDependencies:
+ ts-jest: ">=27"
+ peerDependenciesMeta:
+ ts-jest:
+ optional: true
+ checksum: 2f7c48e742a152d0499615d01113fab23089c3c56beaa3234f53bbe48393b6351c68eba1aa23d6dec57ebfd7b1d12b165215950eeb87dd90072519dcc0a2e022
languageName: node
linkType: hard
@@ -2618,9 +2678,9 @@ __metadata:
linkType: hard
"@rails/ujs@npm:^7.1.1":
- version: 7.1.2
- resolution: "@rails/ujs@npm:7.1.2"
- checksum: 072962733c371fa0fff5e88a0aecd8e91c892f9dc2d31723b7586b45c723206d6b82ac71b0d7db26ea0a5ce60e0832430b061e4669b8f2aa813c3ea975aac98a
+ version: 7.1.3
+ resolution: "@rails/ujs@npm:7.1.3"
+ checksum: 68112d9add9dbc59b40c2ec1bc095a67445c57d20d0ab7d817ce3de0cd90374e2690af8ad54ce6ecc2d1c748b34c0c44d0fbd2f515ce2c443d7c5d23d00b9ce5
languageName: node
linkType: hard
@@ -4704,21 +4764,21 @@ __metadata:
linkType: hard
"babel-plugin-formatjs@npm:^10.5.1":
- version: 10.5.10
- resolution: "babel-plugin-formatjs@npm:10.5.10"
+ version: 10.5.12
+ resolution: "babel-plugin-formatjs@npm:10.5.12"
dependencies:
"@babel/core": "npm:^7.10.4"
"@babel/helper-plugin-utils": "npm:^7.10.4"
"@babel/plugin-syntax-jsx": "npm:7"
"@babel/traverse": "npm:7"
"@babel/types": "npm:^7.12.11"
- "@formatjs/icu-messageformat-parser": "npm:2.7.3"
- "@formatjs/ts-transformer": "npm:3.13.9"
+ "@formatjs/icu-messageformat-parser": "npm:2.7.5"
+ "@formatjs/ts-transformer": "npm:3.13.11"
"@types/babel__core": "npm:^7.1.7"
"@types/babel__helper-plugin-utils": "npm:^7.10.0"
"@types/babel__traverse": "npm:^7.1.7"
tslib: "npm:^2.4.0"
- checksum: bff65cd2a88a0ae00eabab1d022ffc44c4385b7e529cac42375bb1828c678c7a71a78f644512e5d1dd8cd532d418c16acdbabcef2bf6670e24404f4f164a74ce
+ checksum: 64fe3a38b283bb46e5528ad2f72287ca8a163227b0eea3bbe1bedff6d885b2be38c9fb8ed3843a72b723aeb2a7ad4d32b48e52030698631dc646aa15017f4208
languageName: node
linkType: hard
@@ -9284,15 +9344,15 @@ __metadata:
languageName: node
linkType: hard
-"intl-messageformat@npm:10.5.8, intl-messageformat@npm:^10.3.5":
- version: 10.5.8
- resolution: "intl-messageformat@npm:10.5.8"
+"intl-messageformat@npm:10.5.10, intl-messageformat@npm:^10.3.5":
+ version: 10.5.10
+ resolution: "intl-messageformat@npm:10.5.10"
dependencies:
- "@formatjs/ecma402-abstract": "npm:1.18.0"
+ "@formatjs/ecma402-abstract": "npm:1.18.2"
"@formatjs/fast-memoize": "npm:2.2.0"
- "@formatjs/icu-messageformat-parser": "npm:2.7.3"
+ "@formatjs/icu-messageformat-parser": "npm:2.7.5"
tslib: "npm:^2.4.0"
- checksum: 1d2854aae8471ec48165ca265760d6c5b1814eca831c88db698eb29b5ed20bee21ca8533090c9d28d9c6f1d844dda210b0bc58a2e036446158fae0845e5eed4f
+ checksum: 2016c0561e5172b28f180669e28992d04944752d61ebcb539232cc289e7627fd92fe64c73985bc32bddd5cc683f7b77863c1b58507d214ce3a87982d50571658
languageName: node
linkType: hard
@@ -13592,26 +13652,26 @@ __metadata:
linkType: hard
"react-intl@npm:^6.4.2":
- version: 6.5.5
- resolution: "react-intl@npm:6.5.5"
+ version: 6.6.1
+ resolution: "react-intl@npm:6.6.1"
dependencies:
- "@formatjs/ecma402-abstract": "npm:1.18.0"
- "@formatjs/icu-messageformat-parser": "npm:2.7.3"
- "@formatjs/intl": "npm:2.9.9"
- "@formatjs/intl-displaynames": "npm:6.6.4"
- "@formatjs/intl-listformat": "npm:7.5.3"
+ "@formatjs/ecma402-abstract": "npm:1.18.2"
+ "@formatjs/icu-messageformat-parser": "npm:2.7.5"
+ "@formatjs/intl": "npm:2.9.11"
+ "@formatjs/intl-displaynames": "npm:6.6.6"
+ "@formatjs/intl-listformat": "npm:7.5.5"
"@types/hoist-non-react-statics": "npm:^3.3.1"
"@types/react": "npm:16 || 17 || 18"
hoist-non-react-statics: "npm:^3.3.2"
- intl-messageformat: "npm:10.5.8"
+ intl-messageformat: "npm:10.5.10"
tslib: "npm:^2.4.0"
peerDependencies:
react: ^16.6.0 || 17 || 18
- typescript: 5
+ typescript: ^4.7 || 5
peerDependenciesMeta:
typescript:
optional: true
- checksum: 9ff6200f195557804b735d618ee593aed7848e84213ac4eb9c57708f55c0d93232e0dd338c990348ba3b1d73dca071502a2051d4a2790838d962c3ccde87fa6c
+ checksum: 9277269eadbe432a9651af66402240b8a91a567c769ac9c1a774575999f63689a31dccf22a09a1d78d1b8fed4ecad103bdcc609e476ee7e60dabf0cbce6556d3
languageName: node
linkType: hard