diff --git a/app/controllers/remote_interaction_controller.rb b/app/controllers/remote_interaction_controller.rb index 6299a1e13d62fb7a8a0af66f66f7104ecc290b29..cc6993c52b22236dd4b95a4aa698c5e5527e8eed 100644 --- a/app/controllers/remote_interaction_controller.rb +++ b/app/controllers/remote_interaction_controller.rb @@ -5,6 +5,7 @@ class RemoteInteractionController < ApplicationController layout 'modal' + before_action :set_interaction_type before_action :set_status before_action :set_body_classes @@ -45,4 +46,8 @@ class RemoteInteractionController < ApplicationController @body_classes = 'modal-layout' @hide_header = true end + + def set_interaction_type + @interaction_type = %w(reply reblog favourite).include?(params[:type]) ? params[:type] : 'reply' + end end diff --git a/app/views/remote_follow/new.html.haml b/app/views/remote_follow/new.html.haml index 9b679015f1a2a72b611984c38985128b8eaf809c..5cf6977ba17014fb4d3d156e41f1d1e129fcd66e 100644 --- a/app/views/remote_follow/new.html.haml +++ b/app/views/remote_follow/new.html.haml @@ -16,4 +16,6 @@ .actions = f.button :button, t('remote_follow.proceed'), type: :submit - %p.hint.subtle-hint= t('remote_follow.no_account_html', sign_up_path: open_registrations? ? new_user_registration_path : 'https://joinmastodon.org/#getting-started') + %p.hint.subtle-hint + = t('remote_follow.reason_html', instance: site_hostname) + = t('remote_follow.no_account_html', sign_up_path: open_registrations? ? new_user_registration_path : 'https://joinmastodon.org/#getting-started') diff --git a/app/views/remote_interaction/new.html.haml b/app/views/remote_interaction/new.html.haml index 7357546b6e66253d24fccd3a862006b10f10287d..a0b10681483d97e76221390acf558de7a83a8110 100644 --- a/app/views/remote_interaction/new.html.haml +++ b/app/views/remote_interaction/new.html.haml @@ -1,6 +1,6 @@ .form-container .follow-prompt - %h2= t('remote_interaction.prompt') + %h2= t("remote_interaction.#{@interaction_type}.prompt") .public-layout .activity-stream.activity-stream--highlighted @@ -9,9 +9,13 @@ = simple_form_for @remote_follow, as: :remote_follow, url: remote_interaction_path(@status) do |f| = render 'shared/error_messages', object: @remote_follow + = hidden_field_tag :type, @interaction_type + = f.input :acct, placeholder: t('remote_follow.acct'), input_html: { autocapitalize: 'none', autocorrect: 'off' } .actions - = f.button :button, t('remote_interaction.proceed'), type: :submit + = f.button :button, t("remote_interaction.#{@interaction_type}.proceed"), type: :submit - %p.hint.subtle-hint= t('remote_follow.no_account_html', sign_up_path: open_registrations? ? new_user_registration_path : 'https://joinmastodon.org/#getting-started') + %p.hint.subtle-hint + = t('remote_follow.reason_html', instance: site_hostname) + = t('remote_follow.no_account_html', sign_up_path: open_registrations? ? new_user_registration_path : 'https://joinmastodon.org/#getting-started') diff --git a/app/views/stream_entries/_detailed_status.html.haml b/app/views/stream_entries/_detailed_status.html.haml index b3072997057f157339aa34e07b291ca910009fd7..41d4714b904aad0a7c0a1d86bab1e99c05b0166f 100644 --- a/app/views/stream_entries/_detailed_status.html.haml +++ b/app/views/stream_entries/_detailed_status.html.haml @@ -43,7 +43,7 @@ - else = link_to status.application.name, status.application.website, class: 'detailed-status__application', target: '_blank', rel: 'noopener' · - = link_to remote_interaction_path(status), class: 'modal-button detailed-status__link' do + = link_to remote_interaction_path(status, type: :reply), class: 'modal-button detailed-status__link' do = fa_icon('reply') %span.detailed-status__reblogs>= number_to_human status.replies_count, strip_insignificant_zeros: true = " " @@ -55,12 +55,12 @@ %span.detailed-status__link< = fa_icon('lock') - else - = link_to remote_interaction_path(status), class: 'modal-button detailed-status__link' do + = link_to remote_interaction_path(status, type: :reblog), class: 'modal-button detailed-status__link' do = fa_icon('retweet') %span.detailed-status__reblogs>= number_to_human status.reblogs_count, strip_insignificant_zeros: true = " " · - = link_to remote_interaction_path(status), class: 'modal-button detailed-status__link' do + = link_to remote_interaction_path(status, type: :favourite), class: 'modal-button detailed-status__link' do = fa_icon('star') %span.detailed-status__favorites>= number_to_human status.favourites_count, strip_insignificant_zeros: true = " " diff --git a/app/views/stream_entries/_simple_status.html.haml b/app/views/stream_entries/_simple_status.html.haml index f92fac86b8b39f68d7c3afe31b0a6b0d59828428..89a6fe048161b8d93d5e91036d5cfaf2a40d7f53 100644 --- a/app/views/stream_entries/_simple_status.html.haml +++ b/app/views/stream_entries/_simple_status.html.haml @@ -37,15 +37,15 @@ .status__action-bar .status__action-bar__counter - = link_to remote_interaction_path(status), class: 'status__action-bar-button icon-button modal-button', style: 'font-size: 18px; width: 23.1429px; height: 23.1429px; line-height: 23.15px;' do + = link_to remote_interaction_path(status, type: :reply), class: 'status__action-bar-button icon-button modal-button', style: 'font-size: 18px; width: 23.1429px; height: 23.1429px; line-height: 23.15px;' do = fa_icon 'reply fw' .status__action-bar__counter__label= obscured_counter status.replies_count - = link_to remote_interaction_path(status), class: 'status__action-bar-button icon-button modal-button', style: 'font-size: 18px; width: 23.1429px; height: 23.1429px; line-height: 23.15px;' do + = link_to remote_interaction_path(status, type: :reblog), class: 'status__action-bar-button icon-button modal-button', style: 'font-size: 18px; width: 23.1429px; height: 23.1429px; line-height: 23.15px;' do - if status.public_visibility? || status.unlisted_visibility? = fa_icon 'retweet fw' - elsif status.private_visibility? = fa_icon 'lock fw' - else = fa_icon 'envelope fw' - = link_to remote_interaction_path(status), class: 'status__action-bar-button icon-button modal-button', style: 'font-size: 18px; width: 23.1429px; height: 23.1429px; line-height: 23.15px;' do + = link_to remote_interaction_path(status, type: :favourite), class: 'status__action-bar-button icon-button modal-button', style: 'font-size: 18px; width: 23.1429px; height: 23.1429px; line-height: 23.15px;' do = fa_icon 'star fw' diff --git a/config/locales/ar.yml b/config/locales/ar.yml index 49ee567f36a73a9a87650bfac5e4b146259225cd..8766190e37738cd7b4aa2aab12f0fa7c14ff7bb9 100644 --- a/config/locales/ar.yml +++ b/config/locales/ar.yml @@ -730,9 +730,6 @@ ar: no_account_html: أليس عندك Øساب بعد٠؟ ÙŠÙمْكنك <a href='%{sign_up_path}' target='_blank'>التسجيل Ù…ÙÙ† هنا</a> proceed: أكمل المتابعة prompt: 'إنك بصدد متابعة :' - remote_interaction: - proceed: إبدأ التÙاعل - prompt: 'تريد التÙاعÙÙ„ مع هذا التبويق:' remote_unfollow: error: خطأ title: العنوان diff --git a/config/locales/ast.yml b/config/locales/ast.yml index c18c398eb9363a47813cdd1624e3ccae18aa9029..6c7ffc9bdc882f8dcc3a3acb171ef129129e9b33 100644 --- a/config/locales/ast.yml +++ b/config/locales/ast.yml @@ -268,9 +268,6 @@ ast: no_account_html: "¿Nun tienes una cuenta? Pues <a href='%{sign_up_path}' target='_blank'>rexistrate equÃ</a>" proceed: Siguir prompt: 'Vas siguir a:' - remote_interaction: - proceed: Interactuar - prompt: 'Quies interactuar con esti toot:' remote_unfollow: error: Fallu sessions: diff --git a/config/locales/ca.yml b/config/locales/ca.yml index ed23a0e8bee8d3a2abf6d7f34790dbafdfa28aa1..9cb9722c1ea6dbf3707e4e6ef5ea043e9e76ef0c 100644 --- a/config/locales/ca.yml +++ b/config/locales/ca.yml @@ -702,9 +702,6 @@ ca: no_account_html: No tens cap compte? Pots <a href='%{sign_up_path}' target='_blank'>registrar-te aquÃ</a> proceed: Comença a seguir prompt: 'Seguirà s a:' - remote_interaction: - proceed: Procedeix a interactuar - prompt: 'Vols interactuar amb aquest toot:' remote_unfollow: error: Error title: TÃtol diff --git a/config/locales/co.yml b/config/locales/co.yml index 47c094f43e5783763957e887a8990ae89faaf1b1..1529c4fa3220f0777a5d82b02e5bfdf302064c99 100644 --- a/config/locales/co.yml +++ b/config/locales/co.yml @@ -704,9 +704,6 @@ co: no_account_html: Ùn avete micca un contu? Pudete <a href='%{sign_up_path}' target='_blank'>arregistravi quì</a> proceed: Cuntinuà per siguità prompt: 'Avete da siguità :' - remote_interaction: - proceed: Cunfirmà l'interazzione - prompt: 'Vulete interagisce cù u statutu:' remote_unfollow: error: Errore title: Titulu diff --git a/config/locales/cs.yml b/config/locales/cs.yml index f7b1fbef0c1732417e05a46ed7c1b2eb3278a561..0b666a23b6d57c66fb0c201cd42cc957a953b0f2 100644 --- a/config/locales/cs.yml +++ b/config/locales/cs.yml @@ -714,9 +714,6 @@ cs: no_account_html: JeÅ¡tÄ› nemáte úÄet? Můžete se <a href='%{sign_up_path}' target='_blank'>registrovat zde</a> proceed: PokraÄovat ke sledovánà prompt: 'Budete sledovat:' - remote_interaction: - proceed: PokraÄovat k interakci - prompt: 'Chcete interagovat s tÃmto tootem:' remote_unfollow: error: Chyba title: Nadpis diff --git a/config/locales/cy.yml b/config/locales/cy.yml index af37278e260252da47706ea8f1c987c7c836d728..22b70d1fd6eca4b287d08a12606e8c21ab412e80 100644 --- a/config/locales/cy.yml +++ b/config/locales/cy.yml @@ -660,9 +660,6 @@ cy: no_account_html: Heb gyfrif? Mae modd i chi <a href='%{sign_up_path}' target='_blank'>gofrestru yma</a> proceed: Ymlaen i ddilyn prompt: 'Yr ydych am ddilyn:' - remote_interaction: - proceed: Ymlaen i ryngweithio - prompt: 'Rydych eisiau rhyngweithio a''r tŵt hwn:' remote_unfollow: error: Gwall title: Teitl diff --git a/config/locales/da.yml b/config/locales/da.yml index 074a774f0d6f4a848ea2560d54479da8b7b8fbd1..5a9fb7881807b7383fec1510d6357f0a643410d0 100644 --- a/config/locales/da.yml +++ b/config/locales/da.yml @@ -675,9 +675,6 @@ da: no_account_html: Har du ikke en konto? Du kan <a href='%{sign_up_path}' target='_blank'>oprette dig her</a> proceed: Fortsæt for at følge prompt: 'Du er ved at følge:' - remote_interaction: - proceed: Fortsæt for at interagere - prompt: 'Du ønsker at interagere med dette trut:' remote_unfollow: error: Fejl title: Titel diff --git a/config/locales/de.yml b/config/locales/de.yml index 5be2928960074cc8a574406b2172f5afb0a20322..c505bd8bb71142e44a984d761ad1a791f3ad503c 100644 --- a/config/locales/de.yml +++ b/config/locales/de.yml @@ -704,9 +704,6 @@ de: no_account_html: Noch keinen Account? Du kannst dich <a href='%{sign_up_path}' target='_blank'>hier anmelden</a> proceed: Weiter prompt: 'Du wirst dieser Person folgen:' - remote_interaction: - proceed: Fortfahren zum Interagieren - prompt: 'Du wirst mit diesem Beitrag interagieren:' remote_unfollow: error: Fehler title: Titel diff --git a/config/locales/el.yml b/config/locales/el.yml index 9f2da4c732fffddb3cc334980ef4b6253f9bf150..e453b581f61ff2af57317302d23b15c71425ba6d 100644 --- a/config/locales/el.yml +++ b/config/locales/el.yml @@ -703,9 +703,6 @@ el: no_account_html: Δεν Îχεις λογαÏιασμό; ΜποÏείς <a href='%{sign_up_path}' target='_blank'>να γÏαφτείς εδώ</a> proceed: ΣυνÎχισε για να ακολουθήσεις prompt: 'Θα ακολουθήσεις:' - remote_interaction: - proceed: ΣυνÎχισε για να αλληλεπιδÏάσεις - prompt: 'ΘÎλεις να αλληλεπιδÏάσεις με αυτό το τουτ:' remote_unfollow: error: Σφάλμα title: Τίτλος diff --git a/config/locales/en.yml b/config/locales/en.yml index 1f240f27262947b568ee571db4d665e82119c273..0d01ad46663a1d23f3ddcb392a6590d947634baf 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -723,9 +723,17 @@ en: no_account_html: Don't have an account? You can <a href='%{sign_up_path}' target='_blank'>sign up here</a> proceed: Proceed to follow prompt: 'You are going to follow:' + reason_html: "<strong>Why is this step necessary?</strong> <code>%{instance}</code> might not be the server where you are registered, so we need to redirect you to your home server first." remote_interaction: - proceed: Proceed to interact - prompt: 'You want to interact with this toot:' + favourite: + proceed: Proceed to favourite + prompt: 'You want to favourite this toot:' + reblog: + proceed: Proceed to boost + prompt: 'You want to boost this toot:' + reply: + proceed: Proceed to reply + prompt: 'You want to reply to this toot:' remote_unfollow: error: Error title: Title diff --git a/config/locales/eo.yml b/config/locales/eo.yml index 8e30ed679070d16a1c053fd49b7fdb36311cc853..c05b21108e48d5ad12501d2a5012c823a7a01158 100644 --- a/config/locales/eo.yml +++ b/config/locales/eo.yml @@ -696,9 +696,6 @@ eo: no_account_html: Ĉu vi ne havas konton? Vi povas <a href='%{sign_up_path}' target='_blank'>registriÄi tie</a> proceed: DaÅrigi por eksekvi prompt: 'Vi eksekvos:' - remote_interaction: - proceed: Efektivigi la interagon - prompt: 'Vi volas interagi kun ĉi tiu mesaÄo:' remote_unfollow: error: Eraro title: Titolo diff --git a/config/locales/es.yml b/config/locales/es.yml index 957d852b807df516b9245d169acaf5b5b2b4f25a..bf4cc29fe325fa375a5f7e3c70a5840befdca1cb 100644 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -681,9 +681,6 @@ es: no_account_html: "¿No tienes una cuenta? Puedes <a href='%{sign_up_path}' target='_blank'>registrarte aqui</a>" proceed: Proceder a seguir prompt: 'Vas a seguir a:' - remote_interaction: - proceed: Proceder para interactuar - prompt: 'Quieres interactuar con este toot:' remote_unfollow: error: Error title: TÃtulo diff --git a/config/locales/eu.yml b/config/locales/eu.yml index 819e22b26d60e27175b29a9060ec045a781c330b..78fd4895880f2aec9c1e43c0b766d8271a3be6a5 100644 --- a/config/locales/eu.yml +++ b/config/locales/eu.yml @@ -698,9 +698,6 @@ eu: no_account_html: Ez duzu konturik? <a href='%{sign_up_path}' target='_blank'>Izena eman</a> dezakezu proceed: Ekin jarraitzeari prompt: 'Hau jarraituko duzu:' - remote_interaction: - proceed: Jarraitu interakziora - prompt: 'Toot honekin interakzioa nahi duzu:' remote_unfollow: error: Errorea title: Izenburua diff --git a/config/locales/fa.yml b/config/locales/fa.yml index d8f89a91bb66cc5d641a1f4b0277c5c8bfdbd3f8..5fccefc6d080e33062c376a3a5ec87528de92915 100644 --- a/config/locales/fa.yml +++ b/config/locales/fa.yml @@ -681,9 +681,6 @@ fa: no_account_html: هنوز عضو نیستید؟ <a href='%{sign_up_path}' target='_blank'>این‌جا می‌توانید Øساب باز کنید</a> proceed: درخواست پیگیری prompt: 'شما قرار است این Øساب را پیگیری کنید:' - remote_interaction: - proceed: ادامهٔ برهم‌کنش - prompt: 'شما می‌خواهید دربارهٔ این بوق کاری کنید:' remote_unfollow: error: خطا title: عنوان diff --git a/config/locales/fr.yml b/config/locales/fr.yml index b38e9f8e44fa07d270ab979e0c47985aef2b2aea..857288110301d9087d5b80d6a1041154fd814dff 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -704,9 +704,6 @@ fr: no_account_html: Vous n’avez pas de compte ? Vous pouvez <a href='%{sign_up_path}' target='_blank'>vous inscrire ici</a> proceed: Confirmer l’abonnement prompt: 'Vous allez suivre :' - remote_interaction: - proceed: Confirmer l’interaction - prompt: 'Vous désirez interagir avec ce pouet :' remote_unfollow: error: Erreur title: Titre diff --git a/config/locales/gl.yml b/config/locales/gl.yml index ac7d55cda3d23343e440ce38f57478a2bc6ce35b..5908e773b9d88d1c5e7a8c53d660fb0eb0658a5c 100644 --- a/config/locales/gl.yml +++ b/config/locales/gl.yml @@ -704,9 +704,6 @@ gl: no_account_html: Non ten unha conta? Pode <a href='%{sign_up_path}' target='_blank'>rexistrarse aquÃ</a> proceed: Proceda para seguir prompt: 'Vostede vai seguir:' - remote_interaction: - proceed: Proceda para interactuar - prompt: 'Vostede quere interactuar con este toot:' remote_unfollow: error: Fallo title: TÃtulo diff --git a/config/locales/it.yml b/config/locales/it.yml index cc23b8cf7e4c8a3ad5356abde26f1fc0ebd83810..0b96ef46a298a4ba70b0f1ca0cbe997f3f78eb39 100644 --- a/config/locales/it.yml +++ b/config/locales/it.yml @@ -660,9 +660,6 @@ it: no_account_html: Non hai un account? Puoi <a href='%{sign_up_path}' target='_blank'>iscriverti qui</a> proceed: Conferma prompt: 'Stai per seguire:' - remote_interaction: - proceed: Continua per interagire - prompt: 'Vuoi interagire con questo toot:' remote_unfollow: error: Errore title: Titolo diff --git a/config/locales/ja.yml b/config/locales/ja.yml index a8773c4d2601de3b2bf4a89838a458e55a0db036..22965a5952f9756c865f31dc34781c96bc1cc852 100644 --- a/config/locales/ja.yml +++ b/config/locales/ja.yml @@ -703,9 +703,6 @@ ja: no_account_html: アカウントをãŠæŒã¡ã§ã¯ãªã„ã§ã™ã‹ï¼Ÿ<a href='%{sign_up_path}' target='_blank'>ã“ã¡ã‚‰</a>ã‹ã‚‰ã‚µã‚¤ãƒ³ã‚¢ãƒƒãƒ—ã§ãã¾ã™ proceed: フォãƒãƒ¼ã™ã‚‹ prompt: 'フォãƒãƒ¼ã—よã†ã¨ã—ã¦ã„ã¾ã™:' - remote_interaction: - proceed: 進む - prompt: 'ã“ã®ãƒˆã‚¥ãƒ¼ãƒˆã«è¿”ä¿¡ã—よã†ã¨ã—ã¦ã„ã¾ã™:' remote_unfollow: error: エラー title: タイトル diff --git a/config/locales/ka.yml b/config/locales/ka.yml index 21e01c8c90fa7763a5d637a4d634be8bf2a316d7..7dd586aee8f379f81d44ef09b19db8ab1c0e81b7 100644 --- a/config/locales/ka.yml +++ b/config/locales/ka.yml @@ -651,9 +651,6 @@ ka: no_account_html: áƒáƒ გáƒáƒ¥áƒ•áƒ— áƒáƒœáƒ’áƒáƒ იში? შეგიძლიáƒáƒ— <a href='%{sign_up_path}' target='_blank'>დáƒáƒ ეგისტრირდეთ áƒáƒ¥</a> proceed: გáƒáƒáƒ’რძელეთ გáƒáƒ¡áƒáƒ§áƒáƒšáƒáƒ“ prompt: 'თქვენ გáƒáƒ°áƒ§áƒ•áƒ”ბით:' - remote_interaction: - proceed: გáƒáƒáƒ’რძელეთ ურთიერთქმედებრ- prompt: 'თქვენ გსურთ ურთიერთქმედებრáƒáƒ› ტუტთáƒáƒœ:' remote_unfollow: error: შეცდáƒáƒ›áƒ title: სáƒáƒ—áƒáƒ£áƒ ი diff --git a/config/locales/ko.yml b/config/locales/ko.yml index 9ac1cd6b956a107dd49e6dd4a9fcbed10bb42f96..acfc811f3dc531d9b84f5e076410d2de52a3b002 100644 --- a/config/locales/ko.yml +++ b/config/locales/ko.yml @@ -706,9 +706,6 @@ ko: no_account_html: ê³„ì •ì´ ì—†ë‚˜ìš”? <a href='%{sign_up_path}' target='_blank'>여기ì—ì„œ 가입 í• ìˆ˜ 있습니다</a> proceed: 팔로우 하기 prompt: '팔로우 í•˜ë ¤ í•˜ê³ ìžˆìŠµë‹ˆë‹¤:' - remote_interaction: - proceed: 진행 - prompt: 'ì´ ê²Œì‹œë¬¼ì— ìƒí˜¸ìž‘ìš©í•˜ë ¤ í•˜ê³ ìžˆìŠµë‹ˆë‹¤:' remote_unfollow: error: ì—러 title: 타ì´í‹€ diff --git a/config/locales/nl.yml b/config/locales/nl.yml index 1d85ab4c900b761c2d87b45cc9dbc1a7d30add77..92acb71d1588ddbe2429b88d2fda06d2f99c4004 100644 --- a/config/locales/nl.yml +++ b/config/locales/nl.yml @@ -704,9 +704,6 @@ nl: no_account_html: Heb je geen account? Je kunt er <a href='%{sign_up_path}' target='_blank'>hier een registreren</a> proceed: Ga verder om te volgen prompt: 'Jij gaat volgen:' - remote_interaction: - proceed: Ga de interactie aan - prompt: 'Jij wilt de interactie aangaan met deze toot:' remote_unfollow: error: Fout title: Titel diff --git a/config/locales/oc.yml b/config/locales/oc.yml index daabea18adee3e628c2d9cf76df443a284c337a9..e81b10dac0e2d7ff9124bc7a1e8934d34f424a24 100644 --- a/config/locales/oc.yml +++ b/config/locales/oc.yml @@ -760,9 +760,6 @@ oc: no_account_html: Avètz pas cap de compte ? Podètz <a href='%{sign_up_path}' target='_blank'>vos marcar aquÃ</a> proceed: Clicatz per sègre prompt: 'Sètz per sègre :' - remote_interaction: - proceed: Confirmar l’interaccion - prompt: 'Volètz interagir amb aqueste tut :' remote_unfollow: error: Error title: TÃtol diff --git a/config/locales/pl.yml b/config/locales/pl.yml index 7478d0ea76f7abb07bc6b29e92973abcee10989c..80259d013ae98465ae6511113e01e126372ebe56 100644 --- a/config/locales/pl.yml +++ b/config/locales/pl.yml @@ -715,9 +715,6 @@ pl: no_account_html: Nie masz konta? Możesz <a href='%{sign_up_path}' target='_blank'>zarejestrować siÄ™ tutaj</a> proceed: Åšledź prompt: 'Zamierzasz Å›ledzić:' - remote_interaction: - proceed: Przejdź do interakcji - prompt: 'Chcesz dokonać interakcji z tym wpisem:' remote_unfollow: error: BÅ‚Ä…d title: TytuÅ‚ diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml index bd5cd7b36b9ad03daedb539d3bfd430d8da7be7d..efb8b1bf88258a848ff4d2f8ba3b56b6096a1376 100644 --- a/config/locales/pt-BR.yml +++ b/config/locales/pt-BR.yml @@ -702,9 +702,6 @@ pt-BR: no_account_html: Não tem uma conta? Você pode <a href='%{sign_up_path}' target='_blank'>cadastrar-se aqui</a> proceed: Prosseguir para seguir prompt: 'Você irá seguir:' - remote_interaction: - proceed: Continue para interagir - prompt: 'Você quer interagir com este toot:' remote_unfollow: error: Erro title: TÃtulo diff --git a/config/locales/ru.yml b/config/locales/ru.yml index 3b81c9ebc75e6feca87fc0f253181b959638695d..40e66ceac9b06cf678e527eb68195abd08481503 100644 --- a/config/locales/ru.yml +++ b/config/locales/ru.yml @@ -683,9 +683,6 @@ ru: no_account_html: Ðет учётной запиÑи? Ð’Ñ‹ можете <a href='%{sign_up_path}' target='_blank'>зарегиÑтрироватьÑÑ Ð·Ð´ÐµÑÑŒ</a> proceed: Продолжить подпиÑку prompt: 'Ð’Ñ‹ хотите подпиÑатьÑÑ Ð½Ð°:' - remote_interaction: - proceed: Продолжить - prompt: 'Ð’Ñ‹ ÑобираетеÑÑŒ взаимодейÑтвовать Ñо ÑтатуÑом:' remote_unfollow: error: Ошибка title: Заголовок diff --git a/config/locales/sk.yml b/config/locales/sk.yml index d30978e4658a63cde5a911bb55a5e84c71bd9476..36399d7523c3c0509fd554f3d1ec53d198227ba9 100644 --- a/config/locales/sk.yml +++ b/config/locales/sk.yml @@ -714,9 +714,6 @@ sk: no_account_html: Nemáš eÅ¡te úÄet? MôžeÅ¡ sa <a href='%{sign_up_path}' target='_blank'>zaregistrovaÅ¥ tu</a> proceed: ZaÄni následovaÅ¥ prompt: 'BudeÅ¡ sledovaÅ¥:' - remote_interaction: - proceed: PokraÄuj k interakcii - prompt: 'ChceÅ¡ narábaÅ¥ s týmto prÃspevkom:' remote_unfollow: error: Chyba title: Názov diff --git a/config/locales/sl.yml b/config/locales/sl.yml index f35d5f09e2dc0479d2964ced6bc0bd91b74fecc9..594c58acc1e73106d034de9d320bb9e98a27eca7 100644 --- a/config/locales/sl.yml +++ b/config/locales/sl.yml @@ -130,8 +130,6 @@ sl: most_recent_activity: Zadnja aktivnost most_recent_ip: Zadnji IP promote: Spodbujanje - remote_interaction: - prompt: 'Želite interakcijo s tem trobom:' statuses: pin_errors: ownership: Trob nekoga drugega ne more biti pripet diff --git a/config/locales/sr.yml b/config/locales/sr.yml index 8dc869c8f37926d5d45aa95c382aa34030da88b6..009281339d5bea6507dc8de38e788ece653d1ed7 100644 --- a/config/locales/sr.yml +++ b/config/locales/sr.yml @@ -701,9 +701,6 @@ sr: no_account_html: Ðемате налог? Можете Ñе <a href='%{sign_up_path}' target='_blank'>пријавити овде</a> proceed: ÐаÑтавите да би Ñте запратили prompt: 'Запратићете:' - remote_interaction: - proceed: ÐаÑтавите за интеракцију - prompt: 'Желите да интерактирате Ñа овом трубом:' remote_unfollow: error: Грешка title: ÐаÑлов