Merge pull request #2536 from nailyk-weblate/weblate-tusky-tusky

None

app/src/main/res/values-de/strings.xml

@@ -536,4 +536,9 @@
     <string name="title_login">Anmelden</string>
     <string name="error_could_not_load_login_page">Die Anmeldeseite konnte nicht geladen werden.</string>
     <string name="notification_update_name">Beitragsbearbeitungen</string>
+    <string name="title_migration_relogin">Neuanmeldung für Push-Benachrichtigungen</string>
+    <string name="action_dismiss">Ablehnen</string>
+    <string name="dialog_push_notification_migration_other_accounts">Du hast dich erneut in dein aktuelles Konto eingeloggt, um Tusky die Genehmigung für Push-Abonnements zu erteilen. Du hast jedoch noch andere Konten, die nicht auf diese Weise migriert wurden. Wechsel zu diesen Konten und melde dich nacheinander neu an, um die Unterstützung für UnifiedPush-Benachrichtigungen zu aktivieren.</string>
+    <string name="dialog_push_notification_migration">Um Push-Benachrichtigungen über UnifiedPush verwenden zu können, benötigt Tusky die Erlaubnis, Benachrichtigungen auf Ihrem Mastodon-Server zu abonnieren. Dies erfordert eine erneute Anmeldung, um die Tusky gewährten OAuth-Bereiche zu ändern. Wenn du die Option zum erneuten Einloggen hier oder in den Kontoeinstellungen verwendest, bleiben alle deine lokalen Entwürfe und der Cache erhalten.</string>
+    <string name="tips_push_notification_migration">Melde alle Konten neu an, um die Unterstützung für Push-Benachrichtigungen zu aktivieren.</string>
 </resources>

app/src/main/res/values-fr/strings.xml

@@ -547,4 +547,7 @@
     <string name="notification_update_name">Messages modifiés</string>
     <string name="notification_update_description">Notifications quand un post avec lequel vous avez interagi est modifié</string>
     <string name="title_login">Se connecter</string>
+    <string name="account_date_joined">Ici depuis %1$s</string>
+    <string name="action_details">Détails</string>
+    <string name="saving_draft">Sauvegarde du brouillon …</string>
 </resources>

app/src/main/res/values-gd/strings.xml

@@ -556,4 +556,12 @@
     <string name="title_login">Clàraich a-steach</string>
     <string name="error_could_not_load_login_page">Cha b’ urrainn dhuinn duilleag a’ chlàraidh a-steach fhosgladh.</string>
     <string name="saving_draft">A’ sàbhaladh na dreuchd…</string>
+    <string name="action_dismiss">Leig seachad</string>
+    <string name="action_details">Fiosrachadh</string>
+    <string name="account_date_joined">Air ballrachd fhaighinn %1$s</string>
+    <string name="tips_push_notification_migration">Clàraich a-steach às ùr leis a h-uile cunntas a chur na taice ri brathan putaidh an comas.</string>
+    <string name="title_migration_relogin">Clàraich a-steach às ùr airson brathan putaidh</string>
+    <string name="status_count_one_plus">1+</string>
+    <string name="error_media_edit_failed">Cha deach le deasachadh a’ cheanglachain.</string>
+    <string name="action_edit_image">Deasaich an dealbh</string>
 </resources>

app/src/main/res/values-gl/strings.xml

@@ -521,4 +521,18 @@
     <string name="pref_title_notification_filter_sign_ups">hai unha nova usuaria</string>
     <string name="notification_sign_up_name">Rexistros</string>
     <string name="notification_sign_up_description">Notificacións sobre novas usuarias</string>
+    <string name="pref_title_notification_filter_updates">Foi editada unha publicación coa que interactuei</string>
+    <string name="notification_update_name">Edicións da publicación</string>
+    <string name="account_date_joined">Creada %1$s</string>
+    <string name="tips_push_notification_migration">Volver a conectar tódalas contas para activar as notificacións push.</string>
+    <string name="title_login">Acceder</string>
+    <string name="notification_update_description">Notificacións cando son editadas publicacións coas que interactuaches</string>
+    <string name="dialog_push_notification_migration">Para poder usar as notificacións push vía UnifiedPush, Tusky require o permiso para subscribirse ás notificacións do teu servidor Mastodon. É necesario volver a acceder para cambiar os ámbitos OAuth concedidos a Tusky. Usando aquí ou nas Preferencias da Conta a opción de volver a acceder conservarás os borradores locais e caché.</string>
+    <string name="dialog_push_notification_migration_other_accounts">Volveches a acceder para obter as notificacións push en Tusky. Aínda así tes algunha outra conta que non foi migrada a este modo. Cambia a esas contas e volve a conectar unha a unha para activar o soporte para notificacións de UnifiedPush.</string>
+    <string name="title_migration_relogin">Volve a acceder para ter notificacións push</string>
+    <string name="notification_update_format">%s editou a publicación</string>
+    <string name="action_dismiss">Desbotar</string>
+    <string name="action_details">Detalles</string>
+    <string name="error_could_not_load_login_page">Non se puido cargar a páxina de inicio.</string>
+    <string name="saving_draft">Gardando borrador…</string>
 </resources>

app/src/main/res/values-hu/strings.xml

@@ -533,4 +533,17 @@
     <string name="notification_update_name">Bejegyzések szerkesztése</string>
     <string name="notification_update_description">Értesítések olyan bejegyzések szerkesztéséről, melyekkel már dolgod volt</string>
     <string name="tusky_compose_post_quicksetting_label">Bejegyzés Létrehozása</string>
+    <string name="title_migration_relogin">Bejelentkezés újra a leküldési értesítések érdekében</string>
+    <string name="action_dismiss">Elvetés</string>
+    <string name="action_details">Részletek</string>
+    <string name="account_date_joined">Csatlakozva %1$s</string>
+    <string name="tips_push_notification_migration">Bejelentkezés újra minden fiókkal a leküldéses értesítések engedélyezése érdekében.</string>
+    <string name="title_login">Bejelentkezés</string>
+    <string name="status_count_one_plus">1+</string>
+    <string name="error_could_not_load_login_page">Nem tudtuk betölteni a bejelentkező oldalt.</string>
+    <string name="saving_draft">Vázlat mentése…</string>
+    <string name="error_media_edit_failed">A csatolmány nem szerkeszthető.</string>
+    <string name="dialog_push_notification_migration">Ahhoz, hogy használhass leküldési értesítéseket a UnifiedPush szolgáltatással, a Tusky-nak fel kell iratkoznia az értesítésekre a Mastodon szervereden. Ehhez új bejelentkezésre van szükség, hogy a Tusky számára kiosztott OAuth jogosultságok megváltozzanak. Az újbóli bejelentkezés funkció használata itt vagy a Fiókbeállításoknál meg fogja őrizni a helyi piszkozataidat és a cache tartalmát.</string>
+    <string name="dialog_push_notification_migration_other_accounts">Újra bejelentkeztél a fiókodba, hogy feliratkoztasd a Tusky-t a leküldési értesítések használatára. Ugyanakkor vannak még fiókjaid, melyek még nem lettek így migrálva. Válts át rájuk és jelentkezz be újra mindegyikben, hogy ezekben is engedélyezd a UnifiedPush értesítések támogatását.</string>
+    <string name="action_edit_image">Kép szerkesztése</string>
 </resources>

app/src/main/res/values-it/strings.xml

@@ -30,7 +30,7 @@
     <string name="title_posts_with_replies">Con risposte</string>
     <string name="title_posts_pinned">Fissati</string>
     <string name="title_follows">Seguiti</string>
-    <string name="title_followers">Seguono</string>
+    <string name="title_followers">Seguaci</string>
     <string name="title_favourites">Preferiti</string>
     <string name="title_mutes">Utenti silenziati</string>
     <string name="title_blocks">Utenti bloccati</string>
@@ -39,7 +39,7 @@
     <string name="title_drafts">Bozze</string>
     <string name="title_licenses">Licenze</string>
     <string name="post_username_format">\@%s</string>
-    <string name="post_boosted_format">%s ha boostato</string>
+    <string name="post_boosted_format">%s ha condiviso</string>
     <string name="post_sensitive_media_title">Contenuto sensibile</string>
     <string name="post_media_hidden_title">Media nascosto</string>
     <string name="post_sensitive_media_directions">Clicca per visualizzare</string>
@@ -49,15 +49,15 @@
     <string name="post_content_show_less">Riduci</string>
     <string name="message_empty">Qui non c\'è nulla.</string>
     <string name="footer_empty">Qui non c\'è nulla. Trascina verso il basso per aggiornare!</string>
-    <string name="notification_reblog_format">%s ha boostato il tuo post</string>
+    <string name="notification_reblog_format">%s ha condiviso il tuo post</string>
     <string name="notification_favourite_format">%s ha messo il tuo post nei preferiti</string>
     <string name="notification_follow_format">%s ti ha seguito</string>
     <string name="report_username_format">Segnala @%s</string>
     <string name="report_comment_hint">Commenti aggiuntivi?</string>
     <string name="action_quick_reply">Risposta veloce</string>
     <string name="action_reply">Rispondi</string>
-    <string name="action_reblog">Boosta</string>
+    <string name="action_reblog">Condividi</string>
-    <string name="action_unreblog">Rimuovi boost</string>
+    <string name="action_unreblog">Rimuovi condivisione</string>
     <string name="action_favourite">Aggiungi ai preferiti</string>
     <string name="action_unfavourite">Rimuovi preferito</string>
     <string name="action_more">Di più</string>
@@ -69,8 +69,8 @@
     <string name="action_unfollow">Smetti di seguire</string>
     <string name="action_block">Blocca</string>
     <string name="action_unblock">Sblocca</string>
-    <string name="action_hide_reblogs">Nascondi boost</string>
+    <string name="action_hide_reblogs">Nascondi condivisioni</string>
-    <string name="action_show_reblogs">Mostra boost</string>
+    <string name="action_show_reblogs">Mostra condivisioni</string>
     <string name="action_report">Segnala</string>
     <string name="action_delete">Elimina</string>
     <string name="action_send">TOOT</string>
@@ -109,8 +109,8 @@
     <string name="action_links">Collegamenti</string>
     <string name="action_mentions">Menzioni</string>
     <string name="action_hashtags">Hashtag</string>
-    <string name="action_open_reblogger">Vai all\'autore del boost</string>
+    <string name="action_open_reblogger">Vai all\'autore della condivisione</string>
-    <string name="action_open_reblogged_by">Mostra boost</string>
+    <string name="action_open_reblogged_by">Mostra condivisioni</string>
     <string name="action_open_faved_by">Mostra preferiti</string>
     <string name="title_hashtags_dialog">Hashtag</string>
     <string name="title_mentions_dialog">Menzioni</string>
@@ -153,8 +153,8 @@
     <string name="dialog_message_cancel_follow_request">Revocare la richiesta di seguire?</string>
     <string name="dialog_unfollow_warning">Smettere di seguire questo account?</string>
     <string name="dialog_delete_post_warning">Eliminare questo post\?</string>
-    <string name="visibility_public">Pubblico: visibile sulla timeline pubblica</string>
+    <string name="visibility_public">Pubblico: visibile sulle timeline pubbliche</string>
-    <string name="visibility_unlisted">Non in elenco: non visibile sulla timeline pubblica e locale</string>
+    <string name="visibility_unlisted">Non in elenco: non visibile sulle timeline pubbliche</string>
     <string name="visibility_private">Solo follower: visibile solo dai tuoi follower</string>
     <string name="visibility_direct">Diretto: visibile solo agli utenti menzionati</string>
     <string name="pref_title_edit_notification_settings">Notifiche</string>
@@ -166,7 +166,7 @@
     <string name="pref_title_notification_filters">Notificami quando</string>
     <string name="pref_title_notification_filter_mentions">vengo menzionato</string>
     <string name="pref_title_notification_filter_follows">vengo seguito</string>
-    <string name="pref_title_notification_filter_reblogs">i miei post vengono boostati</string>
+    <string name="pref_title_notification_filter_reblogs">i miei post vengono condivisi</string>
     <string name="pref_title_notification_filter_favourites">i miei post vengono messi nei preferiti</string>
     <string name="pref_title_appearance_settings">Aspetto</string>
     <string name="pref_title_app_theme">Tema dell\'app</string>
@@ -183,7 +183,7 @@
     <string name="pref_title_language">Lingua</string>
     <string name="pref_title_post_filter">Filtraggio della timeline</string>
     <string name="pref_title_post_tabs">Schede</string>
-    <string name="pref_title_show_boosts">Mostra boost</string>
+    <string name="pref_title_show_boosts">Mostra condivisioni</string>
     <string name="pref_title_show_replies">Mostra risposte</string>
     <string name="pref_title_show_media_preview">Mostra anteprime media</string>
     <string name="pref_title_proxy_settings">Proxy</string>
@@ -208,8 +208,8 @@
     <string name="notification_mention_descriptions">Notifiche di quando vieni menzionato da qualcuno</string>
     <string name="notification_follow_name">Nuovi follower</string>
     <string name="notification_follow_description">Notifiche su nuovi follower</string>
-    <string name="notification_boost_name">Boost</string>
+    <string name="notification_boost_name">Condivisioni</string>
-    <string name="notification_boost_description">Notifiche sui tuoi post che vengono boostati</string>
+    <string name="notification_boost_description">Notifiche sui tuoi post che vengono condivisi</string>
     <string name="notification_favourite_name">Preferiti</string>
     <string name="notification_favourite_description">Notifiche sui tuoi post che vengono segnati come preferiti</string>
     <string name="notification_mention_format">%s ti ha menzionato</string>
@@ -312,8 +312,8 @@
     <string name="download_failed">Download fallito</string>
     <string name="profile_badge_bot_text">Bot</string>
     <string name="account_moved_description">%1$s si è spostato su:</string>
-    <string name="reblog_private">Boost con la visibilità del post di origine</string>
+    <string name="reblog_private">Condividi con la visibilità del post originale</string>
-    <string name="unreblog_private">Annulla boost</string>
+    <string name="unreblog_private">Annulla condivisione</string>
     <string name="license_description">Tusky contiene codice e risorse dai seguenti progetti open source:</string>
     <string name="license_apache_2">Licenziata sotto la Licenza Apache (copia sotto)</string>
     <string name="license_cc_by_4">CC-BY 4.0</string>
@@ -334,7 +334,7 @@
         <item quantity="one">&lt;b&gt;%s&lt;/b&gt; Boost</item>
         <item quantity="other">&lt;b&gt;%s&lt;/b&gt; Boost</item>
     </plurals>
-    <string name="title_reblogged_by">Boostato da</string>
+    <string name="title_reblogged_by">Condiviso da</string>
     <string name="title_favourited_by">Aggiunto ai preferiti da</string>
     <string name="conversation_1_recipients">%1$s</string>
     <string name="conversation_2_recipients">%1$s e %2$s</string>
@@ -402,7 +402,7 @@
     <string name="select_list_title">Scegli lista</string>
     <string name="list">Lista</string>
     <string name="compose_preview_image_description">Azioni per l\'immagine %s</string>
-    <string name="poll_ended_voted">Un sondaggio che hai votato si è concluso</string>
+    <string name="poll_ended_voted">Un sondaggio in cui hai votato si è concluso</string>
     <string name="poll_ended_created">Un sondaggio che hai creato si è concluso</string>
     <plurals name="poll_timespan_days">
         <item quantity="one">%d giorno rimasto</item>
@@ -470,7 +470,7 @@
     <string name="account_note_saved">Salvato!</string>
     <string name="account_note_hint">La tua nota privata su questo account</string>
     <string name="pref_title_hide_top_toolbar">Nascondi il titolo della barra degli strumenti in alto</string>
-    <string name="pref_title_confirm_reblogs">Mostra la finestra di conferma prima di boostare</string>
+    <string name="pref_title_confirm_reblogs">Mostra la finestra di conferma prima di condividere</string>
     <string name="pref_title_show_cards_in_timelines">Mostra le anteprime dei collegamenti nelle timelines</string>
     <string name="warning_scheduling_interval">Mastodon ha un intervallo di programmazione minimo di 5 minuti.</string>
     <string name="no_announcements">Non ci sono annunci.</string>
@@ -515,13 +515,13 @@
     <string name="action_delete_conversation">Elimina conversazione</string>
     <string name="wellbeing_mode_notice">Alcune informazioni che potrebbero influenzare il tuo benessere mentale saranno nascoste. Questo include:
 \n
-\n - Notifiche riguardo a Preferiti/Boost/Following
+\n - Notifiche riguardo a Preferiti/Condivisioni/Following
-\n - Conteggio dei Preferiti/Boost nei post
+\n - Conteggio dei Preferiti/Condivisioni nei post
 \n - Statistiche riguardo a Preferiti/Post nei profili
 \n
 \n Le notifiche push non saranno influenzate, ma puoi modificare le tue impostazioni delle notifiche manualmente.</string>
     <string name="action_unbookmark">Rimuovi segnalibro</string>
-    <string name="pref_title_confirm_favourites">Chiedi conferma prima di boostare</string>
+    <string name="pref_title_confirm_favourites">Chiedi conferma prima di condividere</string>
     <string name="duration_14_days">14 giorni</string>
     <string name="duration_30_days">30 giorni</string>
     <string name="duration_60_days">60 giorni</string>
@@ -540,4 +540,9 @@
     <string name="notification_update_name">Modifiche ai post</string>
     <string name="notification_update_description">Notifiche di quando i post con cui hai interagito vengono modificati</string>
     <string name="error_could_not_load_login_page">Non è stato possibile caricare la pagina di login.</string>
+    <string name="error_media_edit_failed">L\'allegato non può essere modificato.</string>
+    <string name="action_edit_image">Modifica immagine</string>
+    <string name="saving_draft">Salvataggio bozza…</string>
+    <string name="action_dismiss">Scartare</string>
+    <string name="action_details">Dettagli</string>
 </resources>

app/src/main/res/values-no-rNB/strings.xml

@@ -527,4 +527,15 @@
     <string name="notification_update_description">Varslinger når et innlegg du har hatt en interaksjon med er redigert</string>
     <string name="title_login">Innlogging</string>
     <string name="error_could_not_load_login_page">Klarte ikke å laste innloggingssiden.</string>
+    <string name="title_migration_relogin">Logg inn på nytt for pushvarsler</string>
+    <string name="action_dismiss">Avvis</string>
+    <string name="action_details">Detaljer</string>
+    <string name="account_date_joined">Ble med %1$s</string>
+    <string name="tips_push_notification_migration">Logg inn all konti på nytt for å skru på pushvarsler.</string>
+    <string name="dialog_push_notification_migration">For å kunne sende pushvarsler via UnifiedPush trenger Tusky tillatelse til å abonnere på varsler på Mastodon-serveren. Dette krever at du logger inn på nytt. Ved å bruke muligheten til å logge inn på nytt her eller i kontoinstillinger vil alle lokale kladder være tilgjengelig også etter at du har logget inn på nytt.</string>
+    <string name="dialog_push_notification_migration_other_accounts">Du har logget inn på nytt for å tillate Tusky til å sende pushvarsler, men du har fortsatt andre konti som ikke har fått den nødvendige tillatelsen. Bytt til dem og logg inn på nytt på samme måte for å skru på støtte for pushvarsler via UnifiedPush.</string>
+    <string name="saving_draft">Lagrer kladd…</string>
+    <string name="status_count_one_plus">1+</string>
+    <string name="error_media_edit_failed">Vedlegget kan ikke redigeres.</string>
+    <string name="action_edit_image">Rediger bilde</string>
 </resources>

app/src/main/res/values-pt-rPT/strings.xml

@@ -65,10 +65,10 @@
     <string name="title_announcements">Anúncios</string>
     <string name="title_licenses">Licenças</string>
     <string name="post_username_format">\@%s</string>
-    <string name="post_boosted_format">%s fez boost</string>
+    <string name="post_boosted_format">%s deu boost</string>
     <string name="message_empty">Nada aqui.</string>
     <string name="footer_empty">Nada para ver aqui. Arraste para baixo para atualizar!</string>
-    <string name="notification_reblog_format">%s fez boost ao seu toot</string>
+    <string name="notification_reblog_format">%s deu boost ao seu toot</string>
     <string name="notification_favourite_format">%s adicionou o seu toot aos favoritos</string>
     <string name="notification_follow_format">%s está a seguir-te</string>
     <string name="notification_follow_request_format">%s pediu para te seguir</string>
@@ -134,7 +134,7 @@
     <string name="action_open_drawer">Abrir menu</string>
     <string name="action_search">Pesquisar</string>
     <string name="action_access_drafts">Rascunhos</string>
-    <string name="action_access_scheduled_posts">Toots agendados</string>
+    <string name="action_access_scheduled_posts">Toots Agendados</string>
     <string name="action_toggle_visibility">Privacidade do toot</string>
     <string name="action_content_warning">Aviso de conteúdo</string>
     <string name="action_emoji_keyboard">Teclado de emojis</string>
@@ -325,7 +325,6 @@
     <string name="action_lists">Listas</string>
     <string name="error_rename_list">Não foi possível renomear a lista</string>
     <string name="title_lists">Listas</string>
-
     <string name="error_create_list">Não foi possível criar a lista</string>
     <string name="error_delete_list">Não foi possível apagar a lista</string>
     <string name="action_create_list">Criar uma lista</string>

app/src/main/res/values-uk/strings.xml

@@ -550,4 +550,11 @@
     <string name="title_login">Вхід</string>
     <string name="error_could_not_load_login_page">Не вдалося завантажити сторінку входу.</string>
     <string name="saving_draft">Збереження чернетки…</string>
+    <string name="action_dismiss">Відхилити</string>
+    <string name="action_details">Подробиці</string>
+    <string name="title_migration_relogin">Увійдіть повторно, щоб отримувати push-сповіщення</string>
+    <string name="tips_push_notification_migration">Увійдіть повторно до всіх облікових записів, щоб увімкнути підтримку push-сповіщень.</string>
+    <string name="dialog_push_notification_migration">Щоб використовувати push-сповіщення через UnifiedPush, Tusky потребує дозволу стежити за сповіщеннями на вашому сервері Mastodon. Це вимагає повторного входу, щоб змінити області OAuth, надані Tusky. Використання параметра повторного входу тут або в налаштуваннях облікового запису збереже всі ваші локальні чернетки та кеш.</string>
+    <string name="dialog_push_notification_migration_other_accounts">Ви повторно увійшли до свого поточного облікового запису, щоб надати дозвіл на стеження Tusky. Однак у вас все ще є інші облікові записи, які не мігрували таким чином. Перейдіть до них і повторно увійдіть до них по одному, щоб забезпечити підтримку UnifiedPush сповіщень.</string>
+    <string name="account_date_joined">Приєднується %1$s</string>
 </resources>

app/src/main/res/values-vi/strings.xml

@@ -517,4 +517,14 @@
     <string name="title_login">Đăng nhập</string>
     <string name="error_could_not_load_login_page">Không thể tải trang đăng nhập.</string>
     <string name="saving_draft">Đang lưu nháp…</string>
+    <string name="action_dismiss">Bỏ qua</string>
+    <string name="title_migration_relogin">Đăng nhập lại để hiện thông báo đẩy</string>
+    <string name="action_details">Chi tiết</string>
+    <string name="account_date_joined">Tham gia vào %1$s</string>
+    <string name="tips_push_notification_migration">Đăng nhập lại tất cả tài khoản để kích hoạt thông báo đẩy.</string>
+    <string name="dialog_push_notification_migration_other_accounts">Bạn đã đăng nhập lại vào tài khoản hiện tại của mình để cấp quyền thông báo đẩy cho Tusky. Tuy nhiên, bạn vẫn có các tài khoản khác chưa kích hoạt thông báo đẩy theo cách này. Chuyển sang chúng và đăng nhập từng cái một để cho phép hỗ trợ thông báo UnifiedPush.</string>
+    <string name="dialog_push_notification_migration">Để sử dụng thông báo đẩy qua UnifiedPush, Tusky cần có quyền đăng ký thông báo trên máy chủ Mastodon của bạn. Bạn hãy thoát ra rồi đăng nhập lại để thay đổi phạm vi OAuth được cấp cho Tusky. Sử dụng đăng nhập lại ở đây hoặc trong cài đặt Tài khoản sẽ bảo toàn tất cả các tút nháp và bộ nhớ đệm trên điện thoại của bạn.</string>
+    <string name="status_count_one_plus">1+</string>
+    <string name="error_media_edit_failed">Tập tin đính kèm không thể chỉnh sửa.</string>
+    <string name="action_edit_image">Sửa ảnh</string>
 </resources>

app/src/main/res/values-zh-rCN/strings.xml

@@ -31,7 +31,7 @@
     <string name="title_posts_pinned">已置顶</string>
     <string name="title_follows">正在关注</string>
     <string name="title_followers">关注者</string>
-    <string name="title_favourites">收藏</string>
+    <string name="title_favourites">喜欢</string>
     <string name="title_mutes">被隐藏的用户</string>
     <string name="title_blocks">被屏蔽的用户</string>
     <string name="title_follow_requests">关注请求</string>
@@ -50,7 +50,7 @@
     <string name="message_empty">还没有内容。</string>
     <string name="footer_empty">还没有内容，向下拉动即可刷新！</string>
     <string name="notification_reblog_format">%s 转嘟了你的嘟文</string>
-    <string name="notification_favourite_format">%s 收藏了你的嘟文</string>
+    <string name="notification_favourite_format">%s 喜欢了你的嘟文</string>
     <string name="notification_follow_format">%s 关注了你</string>
     <string name="report_username_format">举报 @%s</string>
     <string name="report_comment_hint">是否有更多信息需报告？</string>
@@ -58,8 +58,8 @@
     <string name="action_reply">回复</string>
     <string name="action_reblog">转嘟</string>
     <string name="action_unreblog">取消转嘟</string>
-    <string name="action_favourite">收藏</string>
+    <string name="action_favourite">喜欢</string>
-    <string name="action_unfavourite">取消收藏</string>
+    <string name="action_unfavourite">取消喜欢</string>
     <string name="action_more">更多</string>
     <string name="action_compose">发表嘟文</string>
     <string name="action_login">登录 Mastodon 帐号</string>
@@ -81,7 +81,7 @@
     <string name="action_view_profile">个人资料</string>
     <string name="action_view_preferences">设置</string>
     <string name="action_view_account_preferences">帐户设置</string>
-    <string name="action_view_favourites">收藏</string>
+    <string name="action_view_favourites">喜欢</string>
     <string name="action_view_mutes">被隐藏的用户</string>
     <string name="action_view_blocks">被屏蔽的用户</string>
     <string name="action_view_follow_requests">关注请求</string>
@@ -171,7 +171,7 @@
     <string name="pref_title_notification_filter_mentions">被提及</string>
     <string name="pref_title_notification_filter_follows">有新的关注者</string>
     <string name="pref_title_notification_filter_reblogs">嘟文被转嘟</string>
-    <string name="pref_title_notification_filter_favourites">嘟文被收藏</string>
+    <string name="pref_title_notification_filter_favourites">嘟文被喜欢</string>
     <string name="pref_title_notification_filter_poll">投票已结束</string>
     <string name="pref_title_appearance_settings">外观</string>
     <string name="pref_title_app_theme">应用主题</string>
@@ -215,8 +215,8 @@
     <string name="notification_follow_description">当有用户关注我时</string>
     <string name="notification_boost_name">转嘟</string>
     <string name="notification_boost_description">当我的嘟文被转发时通知</string>
-    <string name="notification_favourite_name">收藏</string>
+    <string name="notification_favourite_name">喜欢</string>
-    <string name="notification_favourite_description">当有用户收藏了我的嘟文时通知</string>
+    <string name="notification_favourite_description">当有用户喜欢了我的嘟文时</string>
     <string name="notification_poll_name">投票</string>
     <string name="notification_poll_description">当我参与的投票结束时</string>
     <string name="notification_mention_format">%s 提及了你</string>
@@ -343,7 +343,7 @@
         <item quantity="other">&lt;b&gt;%s&lt;/b&gt; 次转嘟</item>
     </plurals>
     <string name="title_reblogged_by">转嘟</string>
-    <string name="title_favourited_by">收藏</string>
+    <string name="title_favourited_by">喜欢</string>
     <string name="conversation_1_recipients">%1$s</string>
     <string name="conversation_2_recipients">%1$s 和 %2$s</string>
     <string name="conversation_more_recipients">%1$s，%2$s 和 %3$d 等人</string>
@@ -354,7 +354,7 @@
     <string name="description_post_cw">内容警告：%s</string>
     <string name="description_post_media_no_description_placeholder">没有描述信息</string>
     <string name="description_post_reblogged">被转嘟</string>
-    <string name="description_post_favourited">被收藏</string>
+    <string name="description_post_favourited">被喜欢</string>
     <string name="description_visiblity_public">
         公开
     </string>
@@ -516,7 +516,7 @@
     <string name="follow_requests_info">即使您的账号未上锁，管理员 %1$s 认为您可能需要手动处理来自这些账号的关注请求。</string>
     <string name="dialog_delete_conversation_warning">删除此对话吗？</string>
     <string name="action_delete_conversation">删除对话</string>
-    <string name="pref_title_confirm_favourites">收藏前显示确认对话框</string>
+    <string name="pref_title_confirm_favourites">喜欢前显示确认对话框</string>
     <string name="action_unbookmark">删除书签</string>
     <string name="duration_30_days">30 天</string>
     <string name="duration_60_days">60 天</string>
@@ -536,4 +536,14 @@
     <string name="notification_update_description">当你进行过互动的嘟文被编辑时发出通知</string>
     <string name="error_could_not_load_login_page">无法加载登录页。</string>
     <string name="saving_draft">正在保存草稿…</string>
+    <string name="title_migration_relogin">重新登陆以启用通知推送</string>
+    <string name="action_dismiss">不理会</string>
+    <string name="action_details">详情</string>
+    <string name="dialog_push_notification_migration_other_accounts">你已重新登录当前账户，向 Tusky 授予推送订阅权限。但是，你仍然有其他没有以这种方式迁移的账户。切换到它们，逐个重新登录，以启用 UnifiedPush 通知支持。</string>
+    <string name="account_date_joined">加入于%1$s</string>
+    <string name="tips_push_notification_migration">重新登录所有账户来启用推送通知支持。</string>
+    <string name="dialog_push_notification_migration">为了通过 UnifiedPush 使用推送通知，Tusky 需要订阅你 Mastodon 服务器通知的权限。这需要重新登录来更改授予 Tusky 的 OAuth 作用域。使用此处或账户首选项中“重新登录”选项将保留你所有的本地草稿和缓存。</string>
+    <string name="status_count_one_plus">1+</string>
+    <string name="error_media_edit_failed">无法编辑附件。</string>
+    <string name="action_edit_image">编辑图片</string>
 </resources>