Merge remote-tracking branch 'origin/develop' into develop

app/src/full/res/values-ar/strings.xml

@@ -14,6 +14,7 @@
     <string name="set_autoplay_description">If enabled, videos will be played automatically</string>
     <string name="set_fullscreen">Fullscreen</string>
     <string name="set_fullscreen_description">Automatically open videos in fullscreen</string>
+    <string name="set_autoplay_next_video_settings">Autoplay</string>
     <string name="set_autoplay_next_video">Automatically start playing the next video</string>
     <string name="set_autoplay_next_video_description">When a video ends, follow up with the next suggested video.</string>
     <string name="add_public_reply">Add a public reply</string>
@@ -123,7 +124,7 @@
     <string name="toast_error_loading_account">طرأ هناك خطأ أثناء التحوّل مِن حساب إلى آخر!</string>
     <string name="toast_error_search">وقع خطأ أثناء عملية البحث!</string>
     <string name="nothing_to_do">لا يمكن اتخاذ أي إجراء</string>
-    <string name="action_follow">اتبع</string>
+    <string name="action_follow">Subscribe</string>
     <string name="action_mute">كتم</string>
     <string name="search">البحث</string>
     <string name="delete">حذف</string>
@@ -284,7 +285,7 @@
     <string name="agreement_check_peertube">أبلُغ مِن العُمر 16 سنة على الأقل وأوافق على %1$s هذا الخادم</string>
     <string name="edit_profile">عدّل الصفحة التعريفية</string>
     <string name="make_an_action">القيام بإجراء</string>
-    <string name="action_unfollow">إلغاء المتابعة</string>
+    <string name="action_unfollow">Unsubscribe</string>
     <string name="display_nsfw_videos">Display sensitive videos</string>
     <string name="fullscreen">Fullscreen</string>
     <string name="bookmark_peertube_empty">There are no videos in your favourites!</string>

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

@@ -14,6 +14,7 @@
     <string name="set_autoplay_description">Wenn aktiviert, werden Videos automatisch abgespielt</string>
     <string name="set_fullscreen">Vollbild</string>
     <string name="set_fullscreen_description">Videos automatisch im Vollbildmodus öffnen</string>
+    <string name="set_autoplay_next_video_settings">Autoplay</string>
     <string name="set_autoplay_next_video">Automatisch nächstes Video starten</string>
     <string name="set_autoplay_next_video_description">Wenn ein Video endet, nächstes vorgeschlagene starten.</string>
     <string name="add_public_reply">Öffentliche Antwort hinzufügen</string>
@@ -119,7 +120,7 @@
     <string name="toast_error_loading_account">Ein Fehler ist während des Kontowechsels aufgetreten!</string>
     <string name="toast_error_search">Ein Fehler ist während der Suche aufgetreten!</string>
     <string name="nothing_to_do">Keine Aktion möglich</string>
-    <string name="action_follow">Folgen</string>
+    <string name="action_follow">Subscribe</string>
     <string name="action_mute">Stummschalten</string>
     <string name="search">Suche</string>
     <string name="delete">Löschen</string>
@@ -280,7 +281,7 @@
     <string name="agreement_check_peertube">Ich bin mindestens 16 Jahre alt und stimme den %1$s dieser Instanz zu</string>
     <string name="edit_profile">Profil bearbeiten</string>
     <string name="make_an_action">Aktion ausführen</string>
-    <string name="action_unfollow">Nicht mehr folgen</string>
+    <string name="action_unfollow">Unsubscribe</string>
     <string name="display_nsfw_videos">Heikle Videos anzeigen</string>
     <string name="fullscreen">Vollbildmodus</string>
     <string name="bookmark_peertube_empty">Keine Videos in den Favoriten!</string>

app/src/full/res/values-el/strings.xml

@@ -14,6 +14,7 @@
     <string name="set_autoplay_description">If enabled, videos will be played automatically</string>
     <string name="set_fullscreen">Fullscreen</string>
     <string name="set_fullscreen_description">Automatically open videos in fullscreen</string>
+    <string name="set_autoplay_next_video_settings">Autoplay</string>
     <string name="set_autoplay_next_video">Automatically start playing the next video</string>
     <string name="set_autoplay_next_video_description">When a video ends, follow up with the next suggested video.</string>
     <string name="add_public_reply">Προσθήκη δημόσιας απάντησης</string>
@@ -119,7 +120,7 @@
     <string name="toast_error_loading_account">Παρουσιάστηκε κάποιο σφάλμα, κατά την εναλλαγή μεταξύ των λογαριασμών!</string>
     <string name="toast_error_search">Παρουσιάστηκε κάποιο σφάλμα κατά την αναζήτηση!</string>
     <string name="nothing_to_do">Δεν μπορεί να εκτελεστεί καμία ενέργεια</string>
-    <string name="action_follow">Ακολούθηση</string>
+    <string name="action_follow">Subscribe</string>
     <string name="action_mute">Σίγαση</string>
     <string name="search">Αναζήτηση</string>
     <string name="delete">Διαγραφή</string>
@@ -279,7 +280,7 @@
     <string name="agreement_check_peertube">Είμαι τουλάχιστον 16 χρονών, και συμφωνώ με %1$s αυτής της υπόστασης</string>
     <string name="edit_profile">Επεξεργασία προφίλ</string>
     <string name="make_an_action">Κάντε μια ενέργεια</string>
-    <string name="action_unfollow">Διακοπή παρακολούθησης</string>
+    <string name="action_unfollow">Unsubscribe</string>
     <string name="display_nsfw_videos">Εμφάνιση ευαίσθητων βίντεο</string>
     <string name="fullscreen">Πλήρης οθόνη</string>
     <string name="bookmark_peertube_empty">Δεν υπάρχουν βίντεο στα αγαπημένα σας!</string>

app/src/full/res/values-es/strings.xml

@@ -14,6 +14,7 @@
     <string name="set_autoplay_description">If enabled, videos will be played automatically</string>
     <string name="set_fullscreen">Fullscreen</string>
     <string name="set_fullscreen_description">Automatically open videos in fullscreen</string>
+    <string name="set_autoplay_next_video_settings">Autoplay</string>
     <string name="set_autoplay_next_video">Automatically start playing the next video</string>
     <string name="set_autoplay_next_video_description">When a video ends, follow up with the next suggested video.</string>
     <string name="add_public_reply">Añade una respuesta pública</string>
@@ -119,7 +120,7 @@
     <string name="toast_error_loading_account">¡Ocurrió un error al cambiar de cuentas!</string>
     <string name="toast_error_search">¡Ocurrió un error durante la búsqueda!</string>
     <string name="nothing_to_do">No hay ninguna acción disponible</string>
-    <string name="action_follow">Seguir</string>
+    <string name="action_follow">Subscribe</string>
     <string name="action_mute">Silenciar</string>
     <string name="search">Buscar</string>
     <string name="delete">Eliminar</string>
@@ -280,7 +281,7 @@
     <string name="agreement_check_peertube">Tengo por lo menos 16 años y estoy de acuerdo con los %1$s de esta instancia</string>
     <string name="edit_profile">Editar perfil</string>
     <string name="make_an_action">Haga una acción</string>
-    <string name="action_unfollow">Unfollow</string>
+    <string name="action_unfollow">Unsubscribe</string>
     <string name="display_nsfw_videos">Mostrar videos sensibles</string>
     <string name="fullscreen">Pantalla completa</string>
     <string name="bookmark_peertube_empty">No hay videos en tus favoritos!</string>

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

@@ -14,6 +14,7 @@
     <string name="set_autoplay_description">If enabled, videos will be played automatically</string>
     <string name="set_fullscreen">Fullscreen</string>
     <string name="set_fullscreen_description">Automatically open videos in fullscreen</string>
+    <string name="set_autoplay_next_video_settings">Autoplay</string>
     <string name="set_autoplay_next_video">Automatically start playing the next video</string>
     <string name="set_autoplay_next_video_description">When a video ends, follow up with the next suggested video.</string>
     <string name="add_public_reply">Ajouter une réponse publique</string>
@@ -119,7 +120,7 @@
     <string name="toast_error_loading_account">Une erreur s’est produite pendant le chargement du compte !</string>
     <string name="toast_error_search">Une erreur s’est produite lors de la recherche !</string>
     <string name="nothing_to_do">Aucune action ne peut être réalisée</string>
-    <string name="action_follow">S\'abonner</string>
+    <string name="action_follow">Subscribe</string>
     <string name="action_mute">Mettre en sourdine</string>
     <string name="search">Chercher</string>
     <string name="delete">Supprimer</string>
@@ -276,7 +277,7 @@
     <string name="agreement_check_peertube">J\'ai au moins 16 ans et je suis d\'accord avec les %1$s de cette instance</string>
     <string name="edit_profile">Éditer le profil</string>
     <string name="make_an_action">Faire une action</string>
-    <string name="action_unfollow">Se désabonner</string>
+    <string name="action_unfollow">Unsubscribe</string>
     <string name="display_nsfw_videos">Afficher les vidéos sensibles</string>
     <string name="fullscreen">Vidéo plein écran</string>
     <string name="bookmark_peertube_empty">Il n’y a aucune vidéo Peertube dans vos favoris !</string>

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

@@ -14,6 +14,7 @@
     <string name="set_autoplay_description">If enabled, videos will be played automatically</string>
     <string name="set_fullscreen">Fullscreen</string>
     <string name="set_fullscreen_description">Automatically open videos in fullscreen</string>
+    <string name="set_autoplay_next_video_settings">Autoplay</string>
     <string name="set_autoplay_next_video">Automatically start playing the next video</string>
     <string name="set_autoplay_next_video_description">When a video ends, follow up with the next suggested video.</string>
     <string name="add_public_reply">Aggiungere una risposta pubblica</string>
@@ -119,7 +120,7 @@
     <string name="toast_error_loading_account">Si è verificato un errore durante il cambio tra gli account!</string>
     <string name="toast_error_search">Si è verificato un errore durante la ricerca!</string>
     <string name="nothing_to_do">Nessuna azione può essere intrapresa</string>
-    <string name="action_follow">Segui</string>
+    <string name="action_follow">Subscribe</string>
     <string name="action_mute">Silenzia</string>
     <string name="search">Cerca</string>
     <string name="delete">Elimina</string>
@@ -280,7 +281,7 @@
     <string name="agreement_check_peertube">Ho almeno 16 anni e accetto le %1$s di questa istanza</string>
     <string name="edit_profile">Modifica profilo</string>
     <string name="make_an_action">Scegli un\'azione</string>
-    <string name="action_unfollow">Smetti di seguire</string>
+    <string name="action_unfollow">Unsubscribe</string>
     <string name="display_nsfw_videos">Mostra video sensibili</string>
     <string name="fullscreen">A tutto schermo</string>
     <string name="bookmark_peertube_empty">Non c\'è nessun video nei tuoi favoriti!</string>

app/src/full/res/values-ja/strings.xml

@@ -14,6 +14,7 @@
     <string name="set_autoplay_description">If enabled, videos will be played automatically</string>
     <string name="set_fullscreen">Fullscreen</string>
     <string name="set_fullscreen_description">Automatically open videos in fullscreen</string>
+    <string name="set_autoplay_next_video_settings">Autoplay</string>
     <string name="set_autoplay_next_video">Automatically start playing the next video</string>
     <string name="set_autoplay_next_video_description">When a video ends, follow up with the next suggested video.</string>
     <string name="add_public_reply">Add a public reply</string>
@@ -118,7 +119,7 @@
     <string name="toast_error_loading_account">アカウントの切り替え中にエラーが発生しました！</string>
     <string name="toast_error_search">検索中にエラーが発生しました！</string>
     <string name="nothing_to_do">何もすることはできません</string>
-    <string name="action_follow">フォローする</string>
+    <string name="action_follow">Subscribe</string>
     <string name="action_mute">ミュート</string>
     <string name="search">検索</string>
     <string name="delete">削除</string>
@@ -279,7 +280,7 @@
     <string name="agreement_check_peertube">私は16歳以上で、インスタンスの %1$s に同意します。</string>
     <string name="edit_profile">プロフィールを編集</string>
     <string name="make_an_action">アクションを作成</string>
-    <string name="action_unfollow">フォロー解除</string>
+    <string name="action_unfollow">Unsubscribe</string>
     <string name="display_nsfw_videos">Display sensitive videos</string>
     <string name="fullscreen">Fullscreen</string>
     <string name="bookmark_peertube_empty">There are no videos in your favourites!</string>

app/src/full/res/values-ko/strings.xml

@@ -14,6 +14,7 @@
     <string name="set_autoplay_description">If enabled, videos will be played automatically</string>
     <string name="set_fullscreen">Fullscreen</string>
     <string name="set_fullscreen_description">Automatically open videos in fullscreen</string>
+    <string name="set_autoplay_next_video_settings">Autoplay</string>
     <string name="set_autoplay_next_video">Automatically start playing the next video</string>
     <string name="set_autoplay_next_video_description">When a video ends, follow up with the next suggested video.</string>
     <string name="add_public_reply">Add a public reply</string>
@@ -118,7 +119,7 @@
     <string name="toast_error_loading_account">An error occurred while switching between accounts!</string>
     <string name="toast_error_search">An error occurred while searching!</string>
     <string name="nothing_to_do">아무 조치를 취할 수 없습니다</string>
-    <string name="action_follow">팔로우</string>
+    <string name="action_follow">Subscribe</string>
     <string name="action_mute">뮤트</string>
     <string name="search">검색</string>
     <string name="delete">삭제</string>
@@ -279,7 +280,7 @@
     <string name="agreement_check_peertube">I am at least 16 years old and agree to the %1$s of this instance</string>
     <string name="edit_profile">프로필 수정</string>
     <string name="make_an_action">Make an action</string>
-    <string name="action_unfollow">언팔로우</string>
+    <string name="action_unfollow">Unsubscribe</string>
     <string name="display_nsfw_videos">Display sensitive videos</string>
     <string name="fullscreen">Fullscreen</string>
     <string name="bookmark_peertube_empty">There are no videos in your favourites!</string>

app/src/full/res/values-nl/strings.xml

@@ -14,6 +14,7 @@
     <string name="set_autoplay_description">Als deze optie is ingeschakeld, worden de video\'s automatisch afgespeeld</string>
     <string name="set_fullscreen">Volledig scherm</string>
     <string name="set_fullscreen_description">Video\'s automatisch openen op volledig scherm</string>
+    <string name="set_autoplay_next_video_settings">Autoplay</string>
     <string name="set_autoplay_next_video">De volgende video automatisch afspelen</string>
     <string name="set_autoplay_next_video_description">Wanneer een video eindigt, begin dan met de volgende voorgestelde video.</string>
     <string name="add_public_reply">Voeg een openbaar antwoord toe</string>
@@ -119,7 +120,7 @@
     <string name="toast_error_loading_account">Er is een fout opgetreden bij het wisselen tussen de accounts!</string>
     <string name="toast_error_search">Er is een fout opgetreden tijdens het zoeken!</string>
     <string name="nothing_to_do">Er kan geen actie worden ondernomen</string>
-    <string name="action_follow">Volg</string>
+    <string name="action_follow">Subscribe</string>
     <string name="action_mute">Stomme</string>
     <string name="search">Zoek</string>
     <string name="delete">Verwijder</string>
@@ -280,7 +281,7 @@
     <string name="agreement_check_peertube">Ik ben minstens 16 jaar oud en ga akkoord met de %1$s van dit geval</string>
     <string name="edit_profile">Profiel bewerken</string>
     <string name="make_an_action">Maak een actie</string>
-    <string name="action_unfollow">Ontvouw</string>
+    <string name="action_unfollow">Unsubscribe</string>
     <string name="display_nsfw_videos">Gevoelige video\'s weergeven</string>
     <string name="fullscreen">Volledig scherm</string>
     <string name="bookmark_peertube_empty">Er zijn geen video\'s in uw favorieten!</string>

app/src/full/res/values-pl/strings.xml

@@ -14,6 +14,7 @@
     <string name="set_autoplay_description">Jeśli włączone, filmy będą odtwarzane automatycznie</string>
     <string name="set_fullscreen">Pełny ekran</string>
     <string name="set_fullscreen_description">Automatycznie otwieraj filmy w trybie pełnoekranowym</string>
+    <string name="set_autoplay_next_video_settings">Autoplay</string>
     <string name="set_autoplay_next_video">Automatycznie rozpocznij odtwarzanie następnego filmu</string>
     <string name="set_autoplay_next_video_description">Kiedy film się skończy, odtwórz następny sugerowany film.</string>
     <string name="add_public_reply">Dodaj publiczną odpowiedź</string>
@@ -121,7 +122,7 @@
     <string name="toast_error_loading_account">Wystąpił błąd podczas przełączania konta!</string>
     <string name="toast_error_search">Podczas wyszukiwania wystąpił błąd!</string>
     <string name="nothing_to_do">Nie można podjąć żadnych działań</string>
-    <string name="action_follow">Obserwuj</string>
+    <string name="action_follow">Subscribe</string>
     <string name="action_mute">Wycisz</string>
     <string name="search">Szukaj</string>
     <string name="delete">Usuń</string>
@@ -282,7 +283,7 @@
     <string name="agreement_check_peertube">Mam co najmniej 16 lat i zgadzam się na %1$s w tym przypadku</string>
     <string name="edit_profile">Profil edycyjny</string>
     <string name="make_an_action">Podejmij działania</string>
-    <string name="action_unfollow">Rozwiń</string>
+    <string name="action_unfollow">Unsubscribe</string>
     <string name="display_nsfw_videos">Wyświetlanie wrażliwych filmów wideo</string>
     <string name="fullscreen">Fullscreen</string>
     <string name="bookmark_peertube_empty">Nie ma żadnych filmów w twoich ulubionych!</string>

app/src/full/res/values-pt/strings.xml

@@ -14,6 +14,7 @@
     <string name="set_autoplay_description">If enabled, videos will be played automatically</string>
     <string name="set_fullscreen">Fullscreen</string>
     <string name="set_fullscreen_description">Automatically open videos in fullscreen</string>
+    <string name="set_autoplay_next_video_settings">Autoplay</string>
     <string name="set_autoplay_next_video">Automatically start playing the next video</string>
     <string name="set_autoplay_next_video_description">When a video ends, follow up with the next suggested video.</string>
     <string name="add_public_reply">Add a public reply</string>
@@ -119,7 +120,7 @@
     <string name="toast_error_loading_account">Ocorreu um erro ao alternar entre as contas!</string>
     <string name="toast_error_search">Ocorreu um erro na pesquisa!</string>
     <string name="nothing_to_do">A ação não pode ser feita ou não é suportada</string>
-    <string name="action_follow">Seguir</string>
+    <string name="action_follow">Subscribe</string>
     <string name="action_mute">Silenciar</string>
     <string name="search">Pesquisa</string>
     <string name="delete">Remover</string>
@@ -280,7 +281,7 @@
     <string name="agreement_check_peertube">I am at least 16 years old and agree to the %1$s of this instance</string>
     <string name="edit_profile">Editar perfil</string>
     <string name="make_an_action">Make an action</string>
-    <string name="action_unfollow">Deixar de seguir</string>
+    <string name="action_unfollow">Unsubscribe</string>
     <string name="display_nsfw_videos">Display sensitive videos</string>
     <string name="fullscreen">Fullscreen</string>
     <string name="bookmark_peertube_empty">There are no videos in your favourites!</string>

app/src/full/res/values-ro/strings.xml

@@ -14,6 +14,7 @@
     <string name="set_autoplay_description">If enabled, videos will be played automatically</string>
     <string name="set_fullscreen">Fullscreen</string>
     <string name="set_fullscreen_description">Automatically open videos in fullscreen</string>
+    <string name="set_autoplay_next_video_settings">Autoplay</string>
     <string name="set_autoplay_next_video">Automatically start playing the next video</string>
     <string name="set_autoplay_next_video_description">When a video ends, follow up with the next suggested video.</string>
     <string name="add_public_reply">Add a public reply</string>
@@ -120,7 +121,7 @@
     <string name="toast_error_loading_account">A apărut o eroare în timp ce schimbați între conturi!</string>
     <string name="toast_error_search">S-a produs o eroare în timpul căutării!</string>
     <string name="nothing_to_do">Nu se poate efectua nici o acțiune</string>
-    <string name="action_follow">Urmărește</string>
+    <string name="action_follow">Subscribe</string>
     <string name="action_mute">Mod silențios</string>
     <string name="search">Căutare</string>
     <string name="delete">Șterge</string>
@@ -281,7 +282,7 @@
     <string name="agreement_check_peertube">I am at least 16 years old and agree to the %1$s of this instance</string>
     <string name="edit_profile">Editează profilul</string>
     <string name="make_an_action">Make an action</string>
-    <string name="action_unfollow">Nu mai urmări</string>
+    <string name="action_unfollow">Unsubscribe</string>
     <string name="display_nsfw_videos">Display sensitive videos</string>
     <string name="fullscreen">Fullscreen</string>
     <string name="bookmark_peertube_empty">There are no videos in your favourites!</string>

app/src/full/res/values-ru/strings.xml

@@ -14,6 +14,7 @@
     <string name="set_autoplay_description">Если включено, видео будут воспроизводиться автоматически</string>
     <string name="set_fullscreen">Полноэкранный режим</string>
     <string name="set_fullscreen_description">Автоматически открывать видео в полноэкранном режиме</string>
+    <string name="set_autoplay_next_video_settings">Autoplay</string>
     <string name="set_autoplay_next_video">Автоматически начать воспроизведение следующего видео</string>
     <string name="set_autoplay_next_video_description">Когда видео заканчивается, перейдите к следующему предложенному видео.</string>
     <string name="add_public_reply">Добавить публичный ответ</string>
@@ -121,7 +122,7 @@
     <string name="toast_error_loading_account">Произошла ошибка при переключении между аккаунтами!</string>
     <string name="toast_error_search">Произошла ошибка при поиске!</string>
     <string name="nothing_to_do">Ничего нельзя сделать</string>
-    <string name="action_follow">Подписаться</string>
+    <string name="action_follow">Subscribe</string>
     <string name="action_mute">Игнорировать</string>
     <string name="search">Поиск</string>
     <string name="delete">Удалить</string>
@@ -282,7 +283,7 @@
     <string name="agreement_check_peertube">Мне 16 или более лет и я согласен с %1$s этого экземпляра</string>
     <string name="edit_profile">Редактировать профиль</string>
     <string name="make_an_action">Предпринять действие</string>
-    <string name="action_unfollow">Отписаться</string>
+    <string name="action_unfollow">Unsubscribe</string>
     <string name="display_nsfw_videos">Показывать неприличные видео</string>
     <string name="fullscreen">На полный экран</string>
     <string name="bookmark_peertube_empty">В избранном нет видео!</string>

app/src/full/res/values-sv/strings.xml

@@ -14,6 +14,7 @@
     <string name="set_autoplay_description">If enabled, videos will be played automatically</string>
     <string name="set_fullscreen">Fullscreen</string>
     <string name="set_fullscreen_description">Automatically open videos in fullscreen</string>
+    <string name="set_autoplay_next_video_settings">Autoplay</string>
     <string name="set_autoplay_next_video">Automatically start playing the next video</string>
     <string name="set_autoplay_next_video_description">When a video ends, follow up with the next suggested video.</string>
     <string name="add_public_reply">Add a public reply</string>
@@ -119,7 +120,7 @@
     <string name="toast_error_loading_account">Ett fel uppstod vid växling mellan konton!</string>
     <string name="toast_error_search">Ett fel uppstod under sökningen!</string>
     <string name="nothing_to_do">Inga åtgärder kan vidtas</string>
-    <string name="action_follow">Följ</string>
+    <string name="action_follow">Subscribe</string>
     <string name="action_mute">Tysta</string>
     <string name="search">Sök</string>
     <string name="delete">Ta bort</string>
@@ -280,7 +281,7 @@
     <string name="agreement_check_peertube">Jag är minst 16 år gammal och godkänner %1$s för denna instans</string>
     <string name="edit_profile">Ändra profil</string>
     <string name="make_an_action">Gör en handling</string>
-    <string name="action_unfollow">Sluta följa</string>
+    <string name="action_unfollow">Unsubscribe</string>
     <string name="display_nsfw_videos">Display sensitive videos</string>
     <string name="fullscreen">Fullscreen</string>
     <string name="bookmark_peertube_empty">There are no videos in your favourites!</string>

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

@@ -14,6 +14,7 @@
     <string name="set_autoplay_description">If enabled, videos will be played automatically</string>
     <string name="set_fullscreen">Fullscreen</string>
     <string name="set_fullscreen_description">Automatically open videos in fullscreen</string>
+    <string name="set_autoplay_next_video_settings">Autoplay</string>
     <string name="set_autoplay_next_video">Automatically start playing the next video</string>
     <string name="set_autoplay_next_video_description">When a video ends, follow up with the next suggested video.</string>
     <string name="add_public_reply">添加公开回复</string>
@@ -118,7 +119,7 @@
     <string name="toast_error_loading_account">在切换帐户时出现了错误！</string>
     <string name="toast_error_search">搜索时出现了错误！</string>
     <string name="nothing_to_do">无法进行任何操作</string>
-    <string name="action_follow">订阅</string>
+    <string name="action_follow">Subscribe</string>
     <string name="action_mute">静音</string>
     <string name="search">搜索​​​​</string>
     <string name="delete">删除</string>
@@ -278,7 +279,7 @@
     <string name="agreement_check_peertube">我已至少年满十六岁，并且同意该实例的 %1$s</string>
     <string name="edit_profile">编辑个人资料</string>
     <string name="make_an_action">请选择其中一项操作</string>
-    <string name="action_unfollow">取消订阅</string>
+    <string name="action_unfollow">Unsubscribe</string>
     <string name="display_nsfw_videos">显示敏感视频</string>
     <string name="fullscreen">全屏</string>
     <string name="bookmark_peertube_empty">您的收藏列表为空！</string>

app/src/full/res/values-zh-rTW/strings.xml

@@ -14,6 +14,7 @@
     <string name="set_autoplay_description">If enabled, videos will be played automatically</string>
     <string name="set_fullscreen">Fullscreen</string>
     <string name="set_fullscreen_description">Automatically open videos in fullscreen</string>
+    <string name="set_autoplay_next_video_settings">Autoplay</string>
     <string name="set_autoplay_next_video">Automatically start playing the next video</string>
     <string name="set_autoplay_next_video_description">When a video ends, follow up with the next suggested video.</string>
     <string name="add_public_reply">Add a public reply</string>
@@ -118,7 +119,7 @@
     <string name="toast_error_loading_account">在帳號間切換時發生錯誤！</string>
     <string name="toast_error_search">搜尋時發生錯誤！</string>
     <string name="nothing_to_do">無法採取行動</string>
-    <string name="action_follow">關注</string>
+    <string name="action_follow">Subscribe</string>
     <string name="action_mute">靜音</string>
     <string name="search">搜尋</string>
     <string name="delete">刪除</string>
@@ -279,7 +280,7 @@
     <string name="agreement_check_peertube">我至少 16 歲並同意此站台的 %1$s</string>
     <string name="edit_profile">編輯個人資料</string>
     <string name="make_an_action">做動作</string>
-    <string name="action_unfollow">取消追蹤</string>
+    <string name="action_unfollow">Unsubscribe</string>
     <string name="display_nsfw_videos">Display sensitive videos</string>
     <string name="fullscreen">Fullscreen</string>
     <string name="bookmark_peertube_empty">There are no videos in your favourites!</string>