Skip to content

Commit

Permalink
Use "done" button to close license dialogs.
Browse files Browse the repository at this point in the history
Rename string res "recaptcha_done_button" to "done".
  • Loading branch information
TobiGr committed Sep 23, 2023
1 parent e206a26 commit 94c1438
Show file tree
Hide file tree
Showing 75 changed files with 79 additions and 82 deletions.
13 changes: 5 additions & 8 deletions app/src/main/java/org/schabi/newpipe/about/LicenseFragment.kt
Original file line number Diff line number Diff line change
Expand Up @@ -106,15 +106,12 @@ class LicenseFragment : Fragment() {
.setView(webView)
.setOnCancelListener { activeSoftwareComponent = null }
.setOnDismissListener { activeSoftwareComponent = null }
if (softwareComponent == NEWPIPE_SOFTWARE_COMPONENT) {
builder.setPositiveButton(R.string.ok) { dialog, _ -> dialog.dismiss() }
} else {
builder.setPositiveButton(R.string.dismiss) { dialog, _ ->
dialog.dismiss()
.setPositiveButton(R.string.done) { dialog, _ -> dialog.dismiss() }

if (softwareComponent != NEWPIPE_SOFTWARE_COMPONENT) {
builder.setNeutralButton(R.string.open_website_license) { _, _ ->
ShareUtils.openUrlInApp(requireContext(), softwareComponent.link)
}
.setNeutralButton(R.string.open_website_license) { _, _ ->
ShareUtils.openUrlInApp(requireContext(), softwareComponent.link)
}
}

builder.show()
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/menu/menu_recaptcha.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@
<item
android:id="@+id/menu_item_done"
android:icon="@drawable/ic_done"
android:title="@string/recaptcha_done_button"
android:title="@string/done"
app:showAsAction="always" />
</menu>
2 changes: 1 addition & 1 deletion app/src/main/res/values-ar/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -466,7 +466,7 @@
<string name="app_language_title">لغة التطبيق</string>
<string name="systems_language">النظام الافتراضي</string>
<string name="subtitle_activity_recaptcha">اضغط على \"تم\" عند حلها</string>
<string name="recaptcha_done_button">منجز</string>
<string name="done">منجز</string>
<string name="videos_string">الفيديوهات</string>
<plurals name="seconds">
<item quantity="zero">%d ثانية</item>
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/values-az/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -327,7 +327,7 @@
<string name="no_dir_yet">Hələ endirmə qovluğu təyin edilməyib, indi standart endirmə qovluğu seç</string>
<string name="title_activity_recaptcha">reCAPTCHA çağırışı</string>
<string name="recaptcha_request_toast">reCAPTCHA sorğusu göndərildi</string>
<string name="recaptcha_done_button">Bitdi</string>
<string name="done">Bitdi</string>
<string name="settings_file_replacement_character_summary">Etibarsız simvollar bu dəyərlə əvəz olunur</string>
<string name="settings_file_replacement_character_title">Əvəzedici xarakter</string>
<string name="charset_most_special_characters">Ən xüsusi simvollar</string>
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/values-b+ast/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -420,7 +420,7 @@
<string name="app_description">Un aplicación llibre pa ver/sentir plataformes de tresmisión n\'Android.</string>
<string name="settings_file_replacement_character_title">Caráuteres de troquéu</string>
<string name="settings_file_replacement_character_summary">Los caráuteres que nun son válidos van trocase por esti valor</string>
<string name="recaptcha_done_button">Fecho</string>
<string name="done">Fecho</string>
<string name="subtitle_activity_recaptcha">Primi «Fecho» al resolvelu</string>
<string name="one_item_deleted">Desanicióse 1 elementu.</string>
<string name="no_available_dir">Defini una capeta de descargues dempués, nos axustes de l\'aplicación</string>
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/values-b+uz+Latn/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,7 @@
<string name="settings_file_replacement_character_summary">Noto\'g\'ri belgilar ushbu qiymat bilan almashtiriladi</string>
<string name="settings_file_charset_title">Fayl nomidagi ruxsat berilgan belgilar</string>
<string name="settings_category_downloads_title">Yuklab olish</string>
<string name="recaptcha_done_button">Bajarildi</string>
<string name="done">Bajarildi</string>
<string name="recaptcha_request_toast">reCAPTCHA muammosi so\'raldi</string>
<string name="subtitle_activity_recaptcha">Hal etilganda \"Bajarildi\" tugmasini bosing</string>
<string name="title_activity_recaptcha">reCAPTCHA muammosi</string>
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/values-be/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -453,7 +453,7 @@
<string name="no_playlist_bookmarked_yet">Няма закладак у плейлісце</string>
<string name="select_a_playlist">Выберыце плэйліст</string>
<string name="default_kiosk_page_summary">Кіёск па змаўчанні</string>
<string name="recaptcha_done_button">Так</string>
<string name="done">Так</string>
<string name="subtitle_activity_recaptcha">Націсніце \"Так\" калі вырашана</string>
<string name="infinite_videos">∞ відэа</string>
<string name="more_than_100_videos">100+ відэа</string>
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/values-bg/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -445,7 +445,7 @@
<string name="detail_heart_img_view_description">Отбелязан със сърце от автора</string>
<string name="conferences">Конференции</string>
<string name="most_liked">Най-харесвани</string>
<string name="recaptcha_done_button">Готово</string>
<string name="done">Готово</string>
<string name="comments_tab_description">Коментари</string>
<string name="localization_changes_requires_app_restart">Езикът ще се смени след рестартиране на приложението</string>
<string name="metadata_privacy_unlisted">Скрит</string>
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/values-bn-rBD/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -257,7 +257,7 @@
<string name="peertube_instance_url_title">পিয়ার টিউব এর ইন্সটান্স সমূহ</string>
<string name="grid">ছক</string>
<string name="local">স্থানীয়</string>
<string name="recaptcha_done_button">হয়েছে</string>
<string name="done">হয়েছে</string>
<string name="events">ইভেন্টগুলো</string>
<string name="settings_category_updates_title">আপডেট</string>
<string name="minimize_on_exit_none_description">কোনোটি না</string>
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/values-bn-rIN/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,7 @@
<string name="contribution_title">যোগদান</string>
<string name="title_activity_about">নিউ পাইপ এর সম্বন্ধে</string>
<string name="charset_letters_and_digits">শব্দ ও নম্বর</string>
<string name="recaptcha_done_button">হয়েছে</string>
<string name="done">হয়েছে</string>
<string name="no_comments">কোন মন্তব্য নেই</string>
<string name="no_subscribers">কোন সাবস্ক্রাইবার নেই</string>
<string name="no_streams_available_download">ডাউন লোড এর জন্য কোন স্ট্রিম নেই</string>
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/values-bn/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@
<string name="title_activity_about">নিউপাইপ এর সম্বন্ধে</string>
<string name="charset_letters_and_digits">শব্দ ও নম্বর</string>
<string name="settings_category_downloads_title">ডাউনলোড</string>
<string name="recaptcha_done_button">হয়েছে</string>
<string name="done">হয়েছে</string>
<string name="recaptcha_request_toast">reCAPTCHA চ্যালেঞ্জ অনুরোধ করা হয়েছে</string>
<string name="title_activity_recaptcha">reCAPTCHA চ্যালেঞ্জ</string>
<string name="one_item_deleted">একটি আইটেম ডিলিট হয়েছে।</string>
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/values-ca/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -535,7 +535,7 @@
<string name="local">Local</string>
<string name="no_playlist_bookmarked_yet">Encara no hi ha llistes de reproducció favorites</string>
<string name="select_a_playlist">Sel·leccioneu una llista de reproducció</string>
<string name="recaptcha_done_button">Fet</string>
<string name="done">Fet</string>
<string name="msg_calculating_hash">Calculant-ne la funció de verificació</string>
<string name="error_report_open_github_notice">Si us plau, comproveu abans si el problema que ha causat aquesta fallada ja ha estat informat. Els tiquets per duplicat fan que perdem temps que podríem aprofitar resolent-los.</string>
<string name="error_report_open_issue_button_text">Avisa del problema a GitHub</string>
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/values-ckb/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -293,7 +293,7 @@
<string name="download_already_pending">دابه‌زاندنێكی دیكه‌ له‌ نۆره‌دایه‌ بەهەمان ناو</string>
<string name="feed_group_dialog_empty_selection">هیچ بەژدارییەک دیار نەکراوە</string>
<string name="feed_group_dialog_empty_name">ناوی کۆمەڵە بەتاڵە</string>
<string name="recaptcha_done_button">كرا</string>
<string name="done">كرا</string>
<string name="detail_likes_img_view_description">بەدڵه‌كان</string>
<string name="popup_remember_size_pos_summary">بیرهاتنه‌وه‌ی كۆتا قه‌باره‌ و شوێنی په‌نجه‌ره‌</string>
<string name="create">سازکردن</string>
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/values-cs/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -451,7 +451,7 @@
<string name="app_language_title">Jazyk aplikace</string>
<string name="systems_language">Jazyk systému</string>
<string name="subtitle_activity_recaptcha">Po vyřešení klepněte na „Hotovo“</string>
<string name="recaptcha_done_button">Hotovo</string>
<string name="done">Hotovo</string>
<string name="videos_string">Videa</string>
<plurals name="seconds">
<item quantity="one">%d vteřina</item>
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/values-da/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -620,7 +620,7 @@
<string name="most_liked">Mest likede</string>
<string name="error_unable_to_load_comments">Kunne ikke indlæse kommentarer</string>
<string name="default_kiosk_page_summary">Standard Kiosk</string>
<string name="recaptcha_done_button">Færdig</string>
<string name="done">Færdig</string>
<string name="subtitle_activity_recaptcha">Tryk på \"Færdig\" når den er løst</string>
<string name="no_comments">Ingen kommentarer</string>
<string name="infinite_videos">∞ videoer</string>
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/values-de/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -455,7 +455,7 @@
<string name="app_language_title">Sprache der App</string>
<string name="systems_language">Systemstandard</string>
<string name="subtitle_activity_recaptcha">„Fertig“ drücken, wenn es gelöst wurde</string>
<string name="recaptcha_done_button">Fertig</string>
<string name="done">Fertig</string>
<string name="videos_string">Videos</string>
<plurals name="seconds">
<item quantity="one">%d Sekunde</item>
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/values-el/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -459,7 +459,7 @@
<string name="title_activity_play_queue">Αναπαραγωγή ουράς</string>
<string name="no_playlist_bookmarked_yet">Δεν υπάρχουν σελιδοδείκτες λίστας αναπαραγωγής ακόμα</string>
<string name="select_a_playlist">Επιλέξτε μια λίστα αναπαραγωγής</string>
<string name="recaptcha_done_button">Τέλος</string>
<string name="done">Τέλος</string>
<string name="subtitle_activity_recaptcha">Πατήστε «Τέλος» όταν επιλυθεί</string>
<string name="infinite_videos">∞ βίντεο</string>
<string name="more_than_100_videos">100+ βίντεο</string>
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/values-eo/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -445,7 +445,7 @@
<string name="app_language_title">Preferata aplingvo</string>
<string name="systems_language">Sistemnormo</string>
<string name="subtitle_activity_recaptcha">Premu “Finita” kiam solvita</string>
<string name="recaptcha_done_button">Finita</string>
<string name="done">Finita</string>
<plurals name="seconds">
<item quantity="one">%d sekundo</item>
<item quantity="other">%d sekundoj</item>
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/values-es/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -454,7 +454,7 @@
<string name="app_language_title">Idioma de aplicación</string>
<string name="systems_language">Predefinido del sistema</string>
<string name="subtitle_activity_recaptcha">Pulsa en «Hecho» al resolverlo</string>
<string name="recaptcha_done_button">Hecho</string>
<string name="done">Hecho</string>
<string name="videos_string">Vídeos</string>
<plurals name="seconds">
<item quantity="one">%d segundo</item>
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/values-et/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -494,7 +494,7 @@
<string name="no_playlist_bookmarked_yet">Esitusloendi järjehoidjaid veel pole</string>
<string name="select_a_playlist">Vali esitusloend</string>
<string name="default_kiosk_page_summary">Vaikimisi seadistatud kiosk</string>
<string name="recaptcha_done_button">Valmis</string>
<string name="done">Valmis</string>
<string name="subtitle_activity_recaptcha">Kui oled lõpetanud, siis vajuta „Valmis“ nuppu</string>
<string name="no_comments">Kommentaare pole</string>
<string name="infinite_videos">∞ videot</string>
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/values-eu/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -446,7 +446,7 @@
<string name="app_language_title">Aplikazioaren hizkuntza</string>
<string name="systems_language">Sistemaren lehenetsia</string>
<string name="subtitle_activity_recaptcha">Sakatu \"Egina\" konponduta dagoenean</string>
<string name="recaptcha_done_button">Egina</string>
<string name="done">Egina</string>
<string name="videos_string">Bideoak</string>
<plurals name="seconds">
<item quantity="one">segundu %d</item>
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/values-fa/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -471,7 +471,7 @@
<string name="local">محلی</string>
<string name="localization_changes_requires_app_restart">با آغاز دوبارهٔ کاره، زبان تغییر خواهد کرد</string>
<string name="default_kiosk_page_summary">کیوسک پیش‌فرض</string>
<string name="recaptcha_done_button">انجام شد</string>
<string name="done">انجام شد</string>
<string name="subtitle_activity_recaptcha">وقتی انجام شد، «Done» یا «انجام شد» را بفشارید</string>
<string name="infinite_videos">∞ ویدیو</string>
<string name="more_than_100_videos">بیش از ۱۰۰ ویدیو</string>
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/values-fi/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -340,7 +340,7 @@
<string name="localization_changes_requires_app_restart">Kieli vaihtuu, kun sovellus uudelleenkäynnistetään</string>
<string name="error_unable_to_load_comments">Kommentteja ei voitu ladata</string>
<string name="main_page_content_summary">Mitkä välilehdet näytetään pääsivulla</string>
<string name="recaptcha_done_button">Valmis</string>
<string name="done">Valmis</string>
<string name="subtitle_activity_recaptcha">Paina ”Valmis”, kun ratkaistu</string>
<string name="infinite_videos">∞ videota</string>
<string name="more_than_100_videos">100+ videota</string>
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/values-fr/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -451,7 +451,7 @@
<string name="app_language_title">Langue de l’application</string>
<string name="systems_language">Prédéfini par le système</string>
<string name="subtitle_activity_recaptcha">Appuyez sur « Terminé » une fois résolu</string>
<string name="recaptcha_done_button">Terminé</string>
<string name="done">Terminé</string>
<string name="videos_string">Vidéos</string>
<string name="new_seek_duration_toast">En raison des contraintes d’ExoPlayer, le pas de déplacement a été réglée à %d secondes</string>
<string name="mute">Couper le son</string>
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/values-gl/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -469,7 +469,7 @@
<string name="select_a_playlist">Seleccionar unha lista de reprodución</string>
<string name="default_kiosk_page_summary">Quiosco predeterminado</string>
<string name="main_page_content_summary">Que lapelas se amosan na páxina principal</string>
<string name="recaptcha_done_button">Feito</string>
<string name="done">Feito</string>
<string name="subtitle_activity_recaptcha">Prema \"Feito\" cando o resolva</string>
<string name="no_comments">Ningún comentario</string>
<string name="infinite_videos">∞ vídeos</string>
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/values-he/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -456,7 +456,7 @@
<string name="app_language_title">שפת היישומון</string>
<string name="systems_language">ברירת המחדל של המערכת</string>
<string name="subtitle_activity_recaptcha">יש ללחוץ על „סיום” לאחר הפתירה</string>
<string name="recaptcha_done_button">סיום</string>
<string name="done">סיום</string>
<string name="videos_string">סרטונים</string>
<plurals name="seconds">
<item quantity="one">שנייה אחת</item>
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/values-hi/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -445,7 +445,7 @@
<string name="channel_created_by">%s के द्वारा बनाया गया</string>
<string name="playlist_page_summary">प्लेलिस्ट पन्ना</string>
<string name="search_showing_result_for">%s : के लिए परिणाम दिखाया जा रहा है</string>
<string name="recaptcha_done_button">संपन्न</string>
<string name="done">संपन्न</string>
<string name="artists">कलाकार</string>
<string name="songs">गीत</string>
<string name="never">कभी नहीं</string>
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/values-hr/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -429,7 +429,7 @@
<string name="error_insufficient_storage">Memorija uređaja je popunjena</string>
<string name="most_liked">Najomiljeniji</string>
<string name="subtitle_activity_recaptcha">Pritisni „Gotovo” kad je riješeno</string>
<string name="recaptcha_done_button">Gotovo</string>
<string name="done">Gotovo</string>
<string name="infinite_videos">∞ videa</string>
<string name="more_than_100_videos">Više od 100 videa</string>
<string name="error_report_open_issue_button_text">Prijavi grešku na GitHub-u</string>
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/values-hu/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -457,7 +457,7 @@
<string name="feed_group_dialog_select_subscriptions">Feliratkozások kiválasztása</string>
<string name="copyright">© %1$s %2$s, %3$s licenc alatt</string>
<string name="title_licenses">Harmadik féltől származó licencek</string>
<string name="recaptcha_done_button">Kész</string>
<string name="done">Kész</string>
<string name="no_comments">Nincs megjegyzés</string>
<string name="infinite_videos">∞ videó</string>
<string name="more_than_100_videos">100+ videó</string>
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/values-hy/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@
<string name="select_a_playlist">Նշել նվագացանկ</string>
<string name="charset_letters_and_digits">Տառեր և թվեր</string>
<string name="settings_category_downloads_title">Բեռնումներ</string>
<string name="recaptcha_done_button">Եղավ</string>
<string name="done">Եղավ</string>
<string name="play_all">Նվագել ամենը</string>
<string name="duration_live">Ուղիղ</string>
<string name="enable_playback_resume_title">Շարունակել նվագարկումը</string>
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/values-ia/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@
<string name="title_most_played">Le plus reproducite</string>
<string name="main_page_content">Contento del pagina principal</string>
<string name="select_a_channel">Selige un canal</string>
<string name="recaptcha_done_button">Preste</string>
<string name="done">Preste</string>
<string name="popup_remember_size_pos_summary">Rememorar ultime grandor e position del reproductor emergente</string>
<string name="popup_remember_size_pos_title">Rememorar grandor e position del fenestra emergente</string>
<plurals name="videos">
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/values-in/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -439,7 +439,7 @@
<string name="permission_display_over_apps">Izinkan untuk ditampilkan di atas aplikasi lain</string>
<string name="app_language_title">Bahasa apl</string>
<string name="systems_language">Default sistem</string>
<string name="recaptcha_done_button">Selesai</string>
<string name="done">Selesai</string>
<string name="seek_duration_title">Durasi maju/mundur cepat</string>
<string name="subtitle_activity_recaptcha">Tekan \"Selesai\" saat selesai</string>
<string name="videos_string">Video</string>
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/values-is/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,7 @@
<string name="msg_copied">Afritað á klemmuspjald</string>
<string name="one_item_deleted">1 atriði eytt.</string>
<string name="recaptcha_solve">Leysa</string>
<string name="recaptcha_done_button">Lokið</string>
<string name="done">Lokið</string>
<string name="recaptcha_request_toast">Beðið eftir þraut reCAPTCHA</string>
<string name="title_licenses">Leyfi þriðja aðila</string>
<string name="tab_licenses">Hugbúnaðarleyfi</string>
Expand Down
Loading

0 comments on commit 94c1438

Please sign in to comment.