From 0f834972842879de7ef78c88ebda30ffec05ee6f Mon Sep 17 00:00:00 2001 From: TacoTheDank Date: Fri, 7 Jan 2022 21:24:01 -0500 Subject: [PATCH 1/3] Move untranslatable strings to a donottranslate file --- app/src/main/res/values/donottranslate.xml | 28 ++++++++++++++++++++++ app/src/main/res/values/settings_keys.xml | 2 +- app/src/main/res/values/strings.xml | 27 --------------------- 3 files changed, 29 insertions(+), 28 deletions(-) create mode 100644 app/src/main/res/values/donottranslate.xml diff --git a/app/src/main/res/values/donottranslate.xml b/app/src/main/res/values/donottranslate.xml new file mode 100644 index 000000000..43647ceba --- /dev/null +++ b/app/src/main/res/values/donottranslate.xml @@ -0,0 +1,28 @@ + + + https://f-droid.org/repository/browse/?fdfilter=vlc&fdid=org.videolan.vlc + RSS + org.xbmc.kore + https://joinpeertube.org/instances#instances-list + newpipe + newpipeAppUpdate + newpipeHash + newpipeErrorReport + Guru Meditation. + @string/no_videos + @string/no_comments + 100+ + ∞ + MD5 + SHA-1 + reCAPTCHA + https://github.com/TeamNewPipe/NewPipe + https://newpipe.net/donate + https://newpipe.net/ + https://newpipe.net/legal/privacy/ + %1$s/%2$s + YouTube + SoundCloud + @string/app_name + LeakCanary + diff --git a/app/src/main/res/values/settings_keys.xml b/app/src/main/res/values/settings_keys.xml index b6f76fce2..20998a90d 100644 --- a/app/src/main/res/values/settings_keys.xml +++ b/app/src/main/res/values/settings_keys.xml @@ -1219,7 +1219,7 @@ limit_mobile_data_usage limit_data_usage_none - + @string/limit_data_usage_none_key @string/limit_data_usage_none_key 1080p60 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 9f254b069..ba7f18ce8 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -7,7 +7,6 @@ Install Cancel OK - https://f-droid.org/repository/browse/?fdfilter=vlc&fdid=org.videolan.vlc Open in browser Mark as watched Open in popup mode @@ -23,7 +22,6 @@ Use external video player Removes audio at some resolutions Use external audio player - RSS Subscribe Subscribed Unsubscribe @@ -49,7 +47,6 @@ Only some devices can play 2K/4K videos Play with Kodi Install missing Kore app? - org.xbmc.kore Show \"Play with Kodi\" option Display an option to play a video via Kodi media center Crash the player @@ -132,7 +129,6 @@ PeerTube instances Select your favorite PeerTube instances Find the instances you like on %s - https://joinpeertube.org/instances#instances-list Add instance Enter instance URL Could not validate instance @@ -180,16 +176,12 @@ Always Just Once File - newpipe NewPipe notification Notifications for NewPipe\'s player - newpipeAppUpdate App update notification Notifications for new NewPipe versions - newpipeHash Video hash notification Notifications for video hashing progress - newpipeErrorReport Error report notification Notifications to report errors [Unknown] @@ -248,7 +240,6 @@ NewPipe encountered an error, tap to report An error occurred, see the notification Sorry, that should not have happened. - Guru Meditation. Report this error via e-mail Copy formatted report Report on GitHub @@ -269,8 +260,6 @@ Related items Description No results - @string/no_videos - @string/no_comments Nothing here but crickets Drag to reorder Video @@ -305,8 +294,6 @@ No videos 100+ videos ∞ videos - 100+ - ∞ %s video %s videos @@ -334,11 +321,7 @@ No download folder set yet, choose the default download folder now This permission is needed to\nopen in popup mode 1 item deleted. - - MD5 - SHA-1 - reCAPTCHA reCAPTCHA challenge Press \"Done\" when solved reCAPTCHA challenge requested @@ -361,18 +344,14 @@ Libre lightweight streaming on Android. Contribute Whether you have ideas of; translation, design changes, code cleaning, or real heavy code changes—help is always welcome. The more is done the better it gets! - https://github.com/TeamNewPipe/NewPipe View on GitHub Donate NewPipe is developed by volunteers spending their free time bringing you the best user experience. Give back to help developers make NewPipe even better while they enjoy a cup of coffee. - https://newpipe.net/donate Give back Website Visit the NewPipe Website for more info and news. - https://newpipe.net/ NewPipe\'s Privacy Policy The NewPipe project takes your privacy very seriously. Therefore, the app does not collect any data without your consent.\nNewPipe\'s privacy policy explains in detail what data is sent and stored when you send a crash report. - https://newpipe.net/legal/privacy/ Read privacy policy NewPipe\'s License NewPipe is copyleft libre software: You can use, study share and improve it at will. Specifically you can redistribute and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. @@ -412,7 +391,6 @@ Recently added Most liked Conferences - %1$s/%2$s Play queue Remove @@ -429,10 +407,7 @@ Open Drawer Close Drawer - YouTube - SoundCloud - @string/app_name Preferred \'open\' action Default action when opening content — %s Video player @@ -467,7 +442,6 @@ Captions Modify player caption text scale and background styles. Requires app restart to take effect - LeakCanary Memory leak monitoring may cause the app to become unresponsive when heap dumping Show memory leaks Report out-of-lifecycle errors @@ -512,7 +486,6 @@ No limit Limit resolution when using mobile data - @string/limit_data_usage_none_key @string/limit_data_usage_none_description 1080p60 From 45d8fef00c6e65a0ee83c0ff9c4cfc871eeaeb99 Mon Sep 17 00:00:00 2001 From: TacoTheDank Date: Fri, 7 Jan 2022 21:24:25 -0500 Subject: [PATCH 2/3] Update F-Droid VLC link --- app/src/main/res/values/donottranslate.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/res/values/donottranslate.xml b/app/src/main/res/values/donottranslate.xml index 43647ceba..92fd5f397 100644 --- a/app/src/main/res/values/donottranslate.xml +++ b/app/src/main/res/values/donottranslate.xml @@ -1,6 +1,6 @@ - https://f-droid.org/repository/browse/?fdfilter=vlc&fdid=org.videolan.vlc + https://f-droid.org/packages/org.videolan.vlc/ RSS org.xbmc.kore https://joinpeertube.org/instances#instances-list @@ -17,7 +17,7 @@ SHA-1 reCAPTCHA https://github.com/TeamNewPipe/NewPipe - https://newpipe.net/donate + https://newpipe.net/donate/ https://newpipe.net/ https://newpipe.net/legal/privacy/ %1$s/%2$s From 7268e04361c60efdded9d54a8f0ece1e2ed20c55 Mon Sep 17 00:00:00 2001 From: TacoTheDank Date: Fri, 7 Jan 2022 21:26:51 -0500 Subject: [PATCH 3/3] Remove redundant XML attributes in settings_keys --- app/src/main/res/values/settings_keys.xml | 414 +++++++++++----------- 1 file changed, 207 insertions(+), 207 deletions(-) diff --git a/app/src/main/res/values/settings_keys.xml b/app/src/main/res/values/settings_keys.xml index 20998a90d..07d98c069 100644 --- a/app/src/main/res/values/settings_keys.xml +++ b/app/src/main/res/values/settings_keys.xml @@ -1,42 +1,42 @@ - last_used_preferences_version + last_used_preferences_version - + @string/youtube @string/soundcloud - service - @string/youtube + service + @string/youtube - saved_tabs_key + saved_tabs_key - download_path - download_path_audio + download_path + download_path_audio - use_external_video_player - use_external_audio_player + use_external_video_player + use_external_audio_player - volume_gesture_control - brightness_gesture_control - resume_on_audio_focus_gain - popup_remember_size_pos_key - use_inexact_seek_key - auto_queue_key - screen_brightness_key - screen_brightness_timestamp_key - clear_queue_confirmation_key + volume_gesture_control + brightness_gesture_control + resume_on_audio_focus_gain + popup_remember_size_pos_key + use_inexact_seek_key + auto_queue_key + screen_brightness_key + screen_brightness_timestamp_key + clear_queue_confirmation_key - popup_saved_width - popup_saved_x - popup_saved_y + popup_saved_width + popup_saved_x + popup_saved_y - seek_duration - 10000 - + seek_duration + 10000 + 5 seconds @@ -46,7 +46,7 @@ 25 seconds 30 seconds - + 5000 10000 15000 @@ -55,63 +55,63 @@ 30000 - minimize_on_exit_key - @string/minimize_on_exit_background_key - minimize_on_exit_none_key - minimize_on_exit_background_key - minimize_on_exit_popup_key - + minimize_on_exit_key + @string/minimize_on_exit_background_key + minimize_on_exit_none_key + minimize_on_exit_background_key + minimize_on_exit_popup_key + @string/minimize_on_exit_none_key @string/minimize_on_exit_background_key @string/minimize_on_exit_popup_key - + @string/minimize_on_exit_none_description @string/minimize_on_exit_background_description @string/minimize_on_exit_popup_description - start_main_player_fullscreen_key + start_main_player_fullscreen_key - autoplay_key - @string/autoplay_wifi_key - autoplay_always_key - autoplay_wifi_key - autoplay_never_key - + autoplay_key + @string/autoplay_wifi_key + autoplay_always_key + autoplay_wifi_key + autoplay_never_key + @string/autoplay_always_key @string/autoplay_wifi_key @string/autoplay_never_key - + @string/always @string/wifi_only @string/never - seekbar_preview_thumbnail_key - seekbar_preview_thumbnail_high_quality - seekbar_preview_thumbnail_low_quality - seekbar_preview_thumbnail_none - + seekbar_preview_thumbnail_key + seekbar_preview_thumbnail_high_quality + seekbar_preview_thumbnail_low_quality + seekbar_preview_thumbnail_none + @string/seekbar_preview_thumbnail_high_quality @string/seekbar_preview_thumbnail_low_quality @string/seekbar_preview_thumbnail_none - + @string/high_quality_larger @string/low_quality_smaller @string/dont_show - default_resolution - 720p60 - show_higher_resolutions - default_popup_resolution - 480p - best_resolution + default_resolution + 720p60 + show_higher_resolutions + default_popup_resolution + 480p + best_resolution - + @string/best_resolution_key 1080p60 1080p @@ -122,7 +122,7 @@ 240p 144p - + @string/best_resolution 1080p60 1080p @@ -134,144 +134,144 @@ 144p - scale_to_square_image_in_notifications + scale_to_square_image_in_notifications - notification_slot_0_key - notification_slot_1_key - notification_slot_2_key - notification_slot_3_key - notification_slot_4_key + notification_slot_0_key + notification_slot_1_key + notification_slot_2_key + notification_slot_3_key + notification_slot_4_key - notification_slot_compact_0_key - notification_slot_compact_1_key - notification_slot_compact_2_key + notification_slot_compact_0_key + notification_slot_compact_1_key + notification_slot_compact_2_key - notification_colorize_key + notification_colorize_key - video_mp4 - video_webm - video_3gp - default_video_format - @string/video_mp4_key - + video_mp4 + video_webm + video_3gp + default_video_format + @string/video_mp4_key + MPEG-4 WebM 3GP - + @string/video_mp4_key @string/video_webm_key @string/video_3gp_key - default_audio_format - @string/audio_m4a_key - audio_m4a - audio_webm - + default_audio_format + @string/audio_m4a_key + audio_m4a + audio_webm + M4A WebM - + @string/audio_m4a_key @string/audio_webm_key - last_resize_mode + last_resize_mode - debug_pref_screen_key - allow_heap_dumping_key - show_memory_leaks_key - allow_disposed_exceptions_key - show_original_time_ago_key - disable_media_tunneling_key - show_image_indicators_key - show_crash_the_player_key - crash_the_app_key - show_error_snackbar_key - create_error_notification_key + debug_pref_screen_key + allow_heap_dumping_key + show_memory_leaks_key + allow_disposed_exceptions_key + show_original_time_ago_key + disable_media_tunneling_key + show_image_indicators_key + show_crash_the_player_key + crash_the_app_key + show_error_snackbar_key + create_error_notification_key - theme - night_theme - light_theme - dark_theme - black_theme - auto_device_theme - @string/auto_device_theme_key - @string/dark_theme_key - + theme + night_theme + light_theme + dark_theme + black_theme + auto_device_theme + @string/auto_device_theme_key + @string/dark_theme_key + @string/light_theme_key @string/dark_theme_key @string/black_theme_key @string/auto_device_theme_key - + @string/light_theme_title @string/dark_theme_title @string/black_theme_title @string/auto_device_theme_title - + @string/dark_theme_key @string/black_theme_key - + @string/dark_theme_title @string/black_theme_title - caption_settings_key - caption_user_set_key + caption_settings_key + caption_user_set_key - show_search_suggestions - show_local_search_suggestions - show_remote_search_suggestions - + show_search_suggestions + show_local_search_suggestions + show_remote_search_suggestions + @string/show_local_search_suggestions_key @string/show_remote_search_suggestions_key - + @string/local_search_suggestions @string/remote_search_suggestions - show_play_with_kodi - show_comments - show_next_video - show_description - show_meta_info - stream_info_selected_tab - show_hold_to_append - content_language - peertube_instance_setup - peertube_selected_instance - peertube_instance_list - content_country - show_age_restricted_content - youtube_restricted_mode_enabled - enable_search_history - enable_watch_history - main_page_content - enable_playback_resume - enable_playback_state_lists - playback_unhook_key - playback_speed_key - playback_pitch_key - playback_skip_silence_key + show_play_with_kodi + show_comments + show_next_video + show_description + show_meta_info + stream_info_selected_tab + show_hold_to_append + content_language + peertube_instance_setup + peertube_selected_instance + peertube_instance_list + content_country + show_age_restricted_content + youtube_restricted_mode_enabled + enable_search_history + enable_watch_history + main_page_content + enable_playback_resume + enable_playback_state_lists + playback_unhook_key + playback_speed_key + playback_pitch_key + playback_skip_silence_key - app_language_key + app_language_key - feed_update_threshold_key - 300 - feed_show_played_items + feed_update_threshold_key + 300 + feed_show_played_items - show_thumbnail_key + show_thumbnail_key - + @string/feed_update_threshold_option_always_update 5 minutes 15 minutes @@ -281,7 +281,7 @@ 1 day - + 0 300 900 @@ -290,53 +290,53 @@ 43200 86400 - feed_use_dedicated_fetch_method + feed_use_dedicated_fetch_method - import_export_data_path - import_data - export_data + import_export_data_path + import_data + export_data - clear_cookie + clear_cookie - download_thumbnail_key + download_thumbnail_key - cache_wipe_key - clear_play_history - clear_playback_states - clear_search_history + cache_wipe_key + clear_play_history + clear_playback_states + clear_search_history - @string/last_download_type_video_key - last_dl_type_video - last_dl_type_audio - last_dl_type_subtitle + @string/last_download_type_video_key + last_dl_type_video + last_dl_type_audio + last_dl_type_subtitle - downloads_storage_ask - storage_use_saf + downloads_storage_ask + storage_use_saf - file_rename_charset - file_replacement_character - _ + file_rename_charset + file_replacement_character + _ - CHARSET_LETTERS_AND_DIGITS - CHARSET_MOST_SPECIAL + CHARSET_LETTERS_AND_DIGITS + CHARSET_MOST_SPECIAL - + @string/charset_letters_and_digits_value @string/charset_most_special_value - + @string/charset_letters_and_digits @string/charset_most_special_characters - @string/charset_most_special_value + @string/charset_most_special_value - downloads_max_retry - 3 - + downloads_max_retry + 3 + @string/minimize_on_exit_none_description 1 2 @@ -348,25 +348,25 @@ 15 - cross_network_downloads - downloads_queue_limit + cross_network_downloads + downloads_queue_limit - default_download_threads + default_download_threads - preferred_open_action_key - @string/always_ask_open_action_key - preferred_open_action_last_selected + preferred_open_action_key + @string/always_ask_open_action_key + preferred_open_action_last_selected - show_info - video_player - background_player - popup_player - download - add_to_playlist - always_ask_player + show_info + video_player + background_player + popup_player + download + add_to_playlist + always_ask_player - + @string/show_info @string/video_player @string/background_player @@ -375,7 +375,7 @@ @string/add_to_playlist @string/always_ask_open_action - + @string/show_info_key @string/video_player_key @string/background_player_key @@ -386,15 +386,15 @@ - update_app_key + update_app_key manual_update_key - update_pref_screen_key - update_expiry_key + update_pref_screen_key + update_expiry_key - system + system - + @string/default_localization_key af az @@ -473,7 +473,7 @@ ja ko - + @string/systems_language Afrikaans Azərbaycan @@ -554,7 +554,7 @@ - + @string/systems_language Afghanistan Aland Islands @@ -805,7 +805,7 @@ Zimbabwe - + @string/default_localization_key AF AX @@ -1057,7 +1057,7 @@ - + @string/default_localization_key ace ar @@ -1136,7 +1136,7 @@ zh-hk zh-tw - + @string/systems_language Basa Acèh العربية @@ -1217,9 +1217,9 @@ - limit_mobile_data_usage - limit_data_usage_none - @string/limit_data_usage_none_key + limit_mobile_data_usage + limit_data_usage_none + @string/limit_data_usage_none_key @string/limit_data_usage_none_key 1080p60 @@ -1232,40 +1232,40 @@ 144p - list_view_mode - @string/list_view_mode_auto_key + list_view_mode + @string/list_view_mode_auto_key - auto - list - grid + auto + list + grid - + @string/list_view_mode_auto_key @string/list_view_mode_list_key @string/list_view_mode_grid_key - + @string/auto @string/list @string/grid - tablet_mode + tablet_mode - auto - on - off - + auto + on + off + @string/tablet_mode_auto_key @string/tablet_mode_on_key @string/tablet_mode_off_key - + @string/auto @string/on @string/off - recaptcha_cookies_key + recaptcha_cookies_key