From 4a19712f5e327d4b622d4d78b745e5c52f2ec71c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Allan=20Nordh=C3=B8y?= <epost@anotheragency.no>
Date: Wed, 23 Nov 2022 05:33:53 +0000
Subject: [PATCH 1/2] App strings reworked

---
 app/src/main/res/values/strings.xml | 116 ++++++++++++++--------------
 1 file changed, 58 insertions(+), 58 deletions(-)

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index ff1abb53..67bd4fc5 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -12,34 +12,34 @@
     <string name="music_directory">Music Directory</string>
     <string name="video_directory">Video Directory</string>
     <string name="updating">Updating</string>
-    <string name="ytdl_update_hint">Click this if you face download issues</string>
+    <string name="ytdl_update_hint">Useful if you have problems downloading</string>
     <string name="update_ytdl">Update YTDL</string>
     <string name="about">About</string>
-    <string name="source_code">Source Code</string>
+    <string name="source_code">Copylefted Libre (GPLv3+) Source Code</string>
     <string name="search_hint">Search from YouTube</string>
-    <string name="download_already_started">Can\'t Start Download! Another one is not done yet!</string>
-    <string name="try_again_after_permission">Try again after accepting the permission!</string>
-    <string name="download_success">Download Complete!</string>
-    <string name="failed_download">Failed Downloading! :(</string>
-    <string name="download_start">Download Started!</string>
+    <string name="download_already_started">Waiting for other download to finish before starting this one…</string>
+    <string name="try_again_after_permission">Retry after granting the permission.</string>
+    <string name="download_success">Downloaded.</string>
+    <string name="failed_download">Could not download file.</string>
+    <string name="download_start">Downloading…</string>
     <string name="download_notification_channel_name">File Downloads</string>
-    <string name="download_notification_channel_description">Notification that shows the download progress of audio and video files</string>
-    <string name="failed_making_directory">Failed to create the new Directory! :(</string>
-    <string name="added_to_queue">Added to the Queue!</string>
-    <string name="you_are_in_latest_version">You are at the latest version</string>
-    <string name="ytld_update_success">Updated Succesfully</string>
-    <string name="ytdl_update_failed">Failed Updating</string>
-    <string name="ytdl_already_updating">Updating in Progress! Please Wait!</string>
-    <string name="ytdl_updating_started">Updating Started</string>
+    <string name="download_notification_channel_description">Notification showing the progress of downloading audio and video files</string>
+    <string name="failed_making_directory">Could not creat the new folder.</string>
+    <string name="added_to_queue">Enqueued.</string>
+    <string name="you_are_in_latest_version">Using the latest version</string>
+    <string name="ytld_update_success">New version installed</string>
+    <string name="ytdl_update_failed">Could not install the new version</string>
+    <string name="ytdl_already_updating">Installing new version…</string>
+    <string name="ytdl_updating_started">Downloading new version…</string>
     <string name="Open_Link">Open link</string>
     <string name="Remove">Remove</string>
     <string name="refresh_results">Refresh Results</string>
     <string name="refresh_history">Refresh History</string>
     <string name="ok">OK</string>
     <string name="cancel">Cancel</string>
-    <string name="confirm_delete_history_desc">This will delete every item on your history! You can\'t recover them!</string>
-    <string name="confirm_delete_history_deleted_desc">This will delete any item in your history that doesn\'t find a file matching it\'s download path!</string>
-    <string name="confirm_delete_history_duplicates_desc">This will delete every duplicate in your history (same url and download type), and keeping the latest version!</string>
+    <string name="confirm_delete_history_desc">Delete the entire history, permanently.</string>
+    <string name="confirm_delete_history_deleted_desc">Deletes any item in your history without a file matching its download path.</string>
+    <string name="confirm_delete_history_duplicates_desc">Deletes every duplicate in your history (same URL and download type), and keeps the latest version.</string>
     <string name="confirm_delete_history">Confirm</string>
     <string name="search_history_hint">Search from History</string>
     <string name="no_results">No Results</string>
@@ -53,71 +53,70 @@
     <string name="run">Run</string>
     <string name="running_ytdlp_command">Running yt-dlp Custom Command</string>
     <string name="command_directory">Custom Command Directory</string>
-    <string name="error_checking_latest_version">Error checking for latest version!</string>
-    <string name="couldnt_find_apk">Couldn\'t find a suitable apk!</string>
-    <string name="downloading_update">Downloading Update</string>
-    <string name="chooose_range">Choose Range</string>
+    <string name="error_checking_latest_version">Could not check for latest version.</string>
+    <string name="couldnt_find_apk">Could not find a suitable APK.</string>
+    <string name="downloading_update">Downloading new version…</string>
+    <string name="chooose_range">Limit download to …</string>
     <string name="audio">Audio</string>
     <string name="video">Video</string>
     <string name="first">First</string>
     <string name="last">Last</string>
-    <string name="choose_range_desc">Write the range to download from the playlist. Leave as it is to download everything!</string>
-    <string name="last_cant_be_smaller_than_first">Last index cannot be smaller than the first!</string>
-    <string name="first_cant_be_larger_than_last">First index cannot be larger than the last!</string>
+    <string name="choose_range_desc">Pick a range to download from the playlist (to not download everything).</string>
+    <string name="last_cant_be_smaller_than_first">Last index cannot be smaller than the first.</string>
+    <string name="first_cant_be_larger_than_last">First index cannot be larger than the last.</string>
     <string name="music_path" translatable="false">/storage/emulated/0/Download</string>
     <string name="video_path" translatable="false">/storage/emulated/0/Download</string>
     <string name="command_path" translatable="false">/storage/emulated/0/Download</string>
-    <string name="concurrent_fragments_summary">Number of fragments of a dash/hlsnative video that should be downloaded concurrently</string>
+    <string name="concurrent_fragments_summary">Number of fragments of a DASH/HLS native video to download concurrently</string>
     <string name="concurrent_fragments">Concurrent Fragments</string>
     <string name="downloading">Downloading</string>
     <string name="limit_rate">Limit Rate</string>
-    <string name="limit_rate_summary">Maximum download rate in bytes per second, e.g. 50K or 4.2M</string>
-    <string name="aria2_summary">Use Aria2c as a downloader instead of the default one</string>
-    <string name="remove_non_music">Remove non music parts</string>
-    <string name="remove_non_music_summary">Remove SponsorBlock segments that contain non music parts for audio files</string>
+    <string name="limit_rate_summary">Maximum download rate (in bytes per second), e.g. 50K or 4.2M</string>
+    <string name="aria2_summary">Use aria2c as downloader instead of the default</string>
+    <string name="remove_non_music">Remove non-music parts</string>
+    <string name="remove_non_music_summary">Strips non-music parts of audio files with SponsorBlock</string>
     <string name="processing">Processing</string>
-    <string name="embed_subs">Embed Subtitles on Videos</string>
-    <string name="embed_subs_summary">Embed subtitles in the video</string>
-    <string name="embed_thumb">Embed Thumbnail</string>
-    <string name="embed_thumb_summary">Embed thumbnail as cover art</string>
-    <string name="add_chapters">Add Chapters on Videos</string>
-    <string name="add_chapters_summary">Mark Youtube / Sponsorblock segments as chapters for the video</string>
+    <string name="embed_subs">Subtitles in Videos</string>
+    <string name="embed_subs_summary">Adds subtitles in the video</string>
+    <string name="embed_thumb">Thumbnail Covers</string>
+    <string name="embed_thumb_summary">Uses the thumbnail as cover art</string>
+    <string name="add_chapters">Chapters in Videos</string>
+    <string name="add_chapters_summary">Marks YouTube / SponsorBlock segments as chapters for the video</string>
     <string name="save_thumb">Save Thumbnail</string>
-    <string name="save_thumb_summary">Write Video Thumbnail as a file on the Download Directory</string>
+    <string name="save_thumb_summary">Adds an extra file in the download folder</string>
     <string name="audio_format">Audio Format</string>
     <string name="video_format">Video Format</string>
     <string name="audio_quality">Audio Quality</string>
-    <string name="audio_quality_summary">0 (Best) 10 (Worst)</string>
+    <string name="audio_quality_summary">0 (best) 10 (worst)</string>
     <string name="cancel_download">Cancel Download</string>
     <string name="run_command">Run Command</string>
     <string name="command_download_notification_channel_name">Command Downloads</string>
-    <string name="command_download_notification_channel_description">Notification that shows the download progress of a yt-dlp command</string>
+    <string name="command_download_notification_channel_description">Notification showing the progress of downloading using a yt-dlp command</string>
     <string name="items_left">item(s) left</string>
-    <string name="history_is_empty">History is Empty!</string>
-    <string name="you_are_going_to_delete">You are going to delete</string>
+    <string name="history_is_empty">History empty.</string>
+    <string name="you_are_going_to_delete">Deleting</string>
     <string name="url">URL</string>
     <string name="link_copied_to_clipboard">Link copied to clipboard</string>
-    <string name="api_key">YouTube API Key</string>
-    <string name="api_key_summary">Use an api key to get faster results from YouTube</string>
-    <string name="update_app_summary">Let you know when updates are available right when you open the application</string>
+    <string name="api_key">Use API Key</string>
+    <string name="api_key_summary">Faster results from YouTube</string>
+    <string name="update_app_summary">Announces new versions of the app when it is opened</string>
     <string name="downloads">Downloads</string>
     <string name="filter_history">Filter History</string>
-    <string name="removed_from_queue">removed from queue!</string>
+    <string name="removed_from_queue">Removed from queue.</string>
     <string name="remove_deleted">Remove Deleted</string>
     <string name="remove_duplicates">Remove Duplicates</string>
-    <string name="sort_by">Sort by</string>
-    <string name="newest_first">Newest First</string>
-    <string name="oldest_first">Oldest First</string>
+    <string name="sort_by">Sorting</string>
+    <string name="newest_first">Newest</string>
+    <string name="oldest_first">Oldest</string>
     <item type="id" name="cancelDownload" />
     <string name="trendingPlaylist" translatable="false">ytdlnis-TRENDING</string>
     <string name="currently_downloading">Downloading</string>
     <string name="remove_downloading">Remove Downloading</string>
-    <string name="confirm_delete_downloading_desc">You are going to remove all items that have a downloading state and then cancel the download service!</string>
-    <string name="error_deleting_file">Error on deleting file! :(</string>
-    <string name="delete_file_too">Delete the file from the system</string>
-    <string name="incognito_summary">Download privately without a download history</string>
+    <string name="confirm_delete_downloading_desc">Removing all items with a downloading state and then cancelling the download service!</string>
+    <string name="error_deleting_file">Could not delete file.</string>
+    <string name="incognito_summary">Download without adding to history</string>
     <string name="download_audio">Download Audio</string>
-    <string name="configure_download">Configure Download</string>
+    <string name="configure_download">Adjust Download</string>
     <string name="title">Title</string>
     <string name="author">Author</string>
     <string name="download">Download</string>
@@ -126,13 +125,14 @@
     <string name="video_quality">Video Quality</string>
     <string name="embed_subtitles">Embed Subtitles</string>
     <string name="add_chapter">Add Chapters</string>
-    <string name="show_download_card">Show Download Card</string>
-    <string name="download_card_summary">Configure the item before downloading it</string>
+    <string name="show_download_card">Options for Downloading</string>
+    <string name="download_card_summary">Settings for how to download an items</string>
     <string name="mutliple_titles">Multiple Titles</string>
     <string name="mutliple_authors">Multiple Authors</string>
     <string name="Open_File">Open File</string>
     <string name="delete_selected">Delete Selected</string>
-    <string name="you_are_going_to_delete_multiple_items">You are going to delete multiple items</string>
-    <string name="delete_files_too">Delete the files from the system</string>
-    <string name="finished_loading">Finished Loading!</string>
+    <string name="you_are_going_to_delete_multiple_items">You are deleting multiple items</string>
+    <string name="delete_file_too">Delete the file from the device</string>
+    <string name="delete_files_too">Delete the files from the device</string>
+    <string name="finished_loading">Loaded.</string>
 </resources>

From eef5a44ec77c514d327b4ddd2f42e8267108ed77 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Allan=20Nordh=C3=B8y?= <epost@anotheragency.no>
Date: Wed, 23 Nov 2022 06:31:19 +0000
Subject: [PATCH 2/2] Small fixes

---
 app/src/main/res/values/strings.xml | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 67bd4fc5..cbc6081a 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -4,16 +4,16 @@
     <string name="remove_all">Remove All</string>
     <string name="remove_results">Clear Results</string>
     <string name="Trending"><b>Trending</b></string>
-    <string name="end_of_results"><b>You reached the end of results</b></string>
+    <string name="end_of_results"><b>No more results</b></string>
     <string name="download_all">Download All</string>
     <string name="settings">Settings</string>
     <string name="home">Home</string>
-    <string name="directories">Directories</string>
-    <string name="music_directory">Music Directory</string>
-    <string name="video_directory">Video Directory</string>
+    <string name="directories">Folders</string>
+    <string name="music_directory">Music Folder</string>
+    <string name="video_directory">Video Folder</string>
     <string name="updating">Updating</string>
     <string name="ytdl_update_hint">Useful if you have problems downloading</string>
-    <string name="update_ytdl">Update YTDL</string>
+    <string name="update_ytdl">Install new version of youtube-dl</string>
     <string name="about">About</string>
     <string name="source_code">Copylefted Libre (GPLv3+) Source Code</string>
     <string name="search_hint">Search from YouTube</string>
@@ -24,7 +24,7 @@
     <string name="download_start">Downloading…</string>
     <string name="download_notification_channel_name">File Downloads</string>
     <string name="download_notification_channel_description">Notification showing the progress of downloading audio and video files</string>
-    <string name="failed_making_directory">Could not creat the new folder.</string>
+    <string name="failed_making_directory">Could not create the new folder.</string>
     <string name="added_to_queue">Enqueued.</string>
     <string name="you_are_in_latest_version">Using the latest version</string>
     <string name="ytld_update_success">New version installed</string>
@@ -51,8 +51,8 @@
     <string name="custom_command">Run Custom Command</string>
     <string name="write_ytdlp_command">Write yt-dlp command</string>
     <string name="run">Run</string>
-    <string name="running_ytdlp_command">Running yt-dlp Custom Command</string>
-    <string name="command_directory">Custom Command Directory</string>
+    <string name="running_ytdlp_command">Running custom yt-dlp command…</string>
+    <string name="command_directory">Folder for Custom Command</string>
     <string name="error_checking_latest_version">Could not check for latest version.</string>
     <string name="couldnt_find_apk">Could not find a suitable APK.</string>
     <string name="downloading_update">Downloading new version…</string>
@@ -111,8 +111,8 @@
     <item type="id" name="cancelDownload" />
     <string name="trendingPlaylist" translatable="false">ytdlnis-TRENDING</string>
     <string name="currently_downloading">Downloading</string>
-    <string name="remove_downloading">Remove Downloading</string>
-    <string name="confirm_delete_downloading_desc">Removing all items with a downloading state and then cancelling the download service!</string>
+    <string name="remove_downloading">Cancel Downloads</string>
+    <string name="confirm_delete_downloading_desc">Remove all items being downloaded and stop the downloading service?</string>
     <string name="error_deleting_file">Could not delete file.</string>
     <string name="incognito_summary">Download without adding to history</string>
     <string name="download_audio">Download Audio</string>
@@ -131,7 +131,7 @@
     <string name="mutliple_authors">Multiple Authors</string>
     <string name="Open_File">Open File</string>
     <string name="delete_selected">Delete Selected</string>
-    <string name="you_are_going_to_delete_multiple_items">You are deleting multiple items</string>
+    <string name="you_are_going_to_delete_multiple_items">Deleting multiple items…</string>
     <string name="delete_file_too">Delete the file from the device</string>
     <string name="delete_files_too">Delete the files from the device</string>
     <string name="finished_loading">Loaded.</string>