From 4d4aeba878846fd621b6b45d14bb73153f595f4e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Allan=20Nordh=C3=B8y?= <epost@anotheragency.no>
Date: Mon, 11 Jan 2021 13:19:01 +0100
Subject: [PATCH 1/3] App strings reworked

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

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 08a5b4cc..bfde0521 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -8,7 +8,7 @@
     <string name="fragment_settings_title">Settings</string>
     <!-- Dialogs -->
     <string name="dialog_edit_choose_station_image">Choose</string>
-    <string name="dialog_edit_place_on_home_screen">Place on Home screen</string>
+    <string name="dialog_edit_place_on_home_screen">Place on \"Home\" screen</string>
     <string name="dialog_edit_title">Edit Station</string>
     <string name="dialog_edit_update_station">Update station</string>
     <string name="dialog_error_message_default">An error occurred</string>
@@ -77,11 +77,11 @@
     <string name="pref_maintenance_title">Maintenance</string>
     <string name="pref_report_issue_summary">Report bugs and suggest improvements on GitHub.</string>
     <string name="pref_report_issue_title">Report Issue</string>
-    <string name="pref_theme_selection_mode_dark">Dark mode</string>
+    <string name="pref_theme_selection_mode_dark">Dark</string>
     <string name="pref_theme_selection_mode_device_default">Same as device</string>
-    <string name="pref_theme_selection_mode_light">Light mode</string>
-    <string name="pref_theme_selection_summary">Current theme:</string>
-    <string name="pref_theme_selection_title">App Theme</string>
+    <string name="pref_theme_selection_mode_light">Light</string>
+    <string name="pref_theme_selection_summary">Current:</string>
+    <string name="pref_theme_selection_title">Theme</string>
     <string name="pref_update_collection_summary">Look for updated audio streams and new station images.</string>
     <string name="pref_update_collection_title">Update Stations</string>
     <string name="pref_update_station_images_summary">Download latest version of all station images.</string>
@@ -95,7 +95,7 @@
     <string name="descr_card_small_edit_button">Edit</string>
     <string name="descr_card_starred_station">Starred station</string>
     <string name="descr_card_station_image">Station image</string>
-    <string name="descr_dialog_edit_place_on_home_screen_icon">Place on Home screen</string>
+    <string name="descr_dialog_edit_place_on_home_screen_icon">Place on \"Home\" screen</string>
     <string name="descr_dialog_edit_station_image">Station image</string>
     <string name="descr_dialog_edit_update_icon">Update</string>
     <string name="descr_expanded_player_sleep_timer_cancel_button">Cancel sleep timer</string>
@@ -113,12 +113,12 @@
     <!-- Sample Text -->
     <string name="sample_text_station_metadata" translatable="false">David Bowie - The Man Who Sold The World</string>
     <string name="sample_text_station_name" translatable="false">Byte FM</string>
-    <string name="sample_text_steam_url" translatable="false">http://bytefm.cast.addradio.de/bytefm/main/mid/stream</string>
+    <string name="sample_text_steam_url" translatable="false">https://bytefm.cast.addradio.de/bytefm/main/mid/stream</string>
     <string name="sample_text_sleep_timer_remaining_time" translatable="false">00:00</string>
-    <!-- Allowed Caller Template -->
-    <string name="allowed_caller_log" translatable="false">
-        Caller has a valid certificate, but its package doesn\'t match any expected package for the
-        given certificate. To allow this caller, add the following to the allowed callers list:\n
+    <!-- Allowed Template -->
+    <string name="allowed_caller_log">
+        The caller has a valid certificate, but the wrong package for it.
+        To allow this caller, add the following to the allowed callers list:\n
         <![CDATA[
         <signature name=\"%1$s\" package=\"%2$s\">\n\t<key>%3$s</key>\n</signature>\n
         ]]>
@@ -128,7 +128,7 @@
     <!-- app shortcuts -->
     <string name="shortcut_last_station_short_label">Last station</string>
     <string name="shortcut_last_station_long_label">Play last station</string>
-    <string name="shortcut_last_station_disabled_message">Shortcut for playback of last station disabled.</string>
+    <string name="shortcut_last_station_disabled_message">Removed shortcut for playback of last station.</string>
     <!-- menu entries -->
     <string name="menu_icon">Change icon</string>
     <string name="menu_delete">Delete</string>
@@ -174,20 +174,20 @@
     <!-- error dialogs -->
     <string name="dialog_error_details_button_default">Show details</string>
     <string name="dialog_error_details_default">No details available</string>
-    <string name="dialog_error_details_write">This station is probably a duplicate or else you might want to check your external storage.</string>
+    <string name="dialog_error_details_write">Check your external storage if this station isn't a duplicate.</string>
     <string name="dialog_error_title_fetch_download">Download Issue</string>
     <string name="dialog_error_title_fetch_read">Read Issue</string>
     <string name="dialog_error_title_fetch_write">Write Issue</string>
     <string name="dialog_error_message_fetch_general_external_storage">External storage:</string>
-    <string name="dialog_error_message_fetch_general_hint_m3u">Hint: Transistor can only process MP3, AAC and Ogg/Opus encoded streams or links ending in .m3u or .pls.</string>
+    <string name="dialog_error_message_fetch_general_hint_m3u">Hint: Transistor can only process MP3, AAC and Ogg Opus encoded streams or links ending in .m3u or .pls.</string>
     <string name="dialog_error_message_fetch_general_playlist_type">Media type of file:</string>
-    <string name="dialog_error_message_fetch_general_stream_type">MIME type of stream:</string>
+    <string name="dialog_error_message_fetch_general_stream_type">Media type of stream:</string>
     <string name="dialog_error_message_fetch_general_file_content">Content of file:</string>
-    <string name="dialog_error_message_fetch_download">Transistor tried hard but could not make sense of the link.</string>
+    <string name="dialog_error_message_fetch_download">Could not make sense of that link.</string>
     <string name="dialog_error_message_fetch_download_station_url">Streaming link of station:</string>
     <string name="dialog_error_message_fetch_read">Transistor tried hard but could not make sense of the file.</string>
     <string name="dialog_error_message_fetch_read_file_location">Location of file:</string>
-    <string name="dialog_error_message_fetch_write">Transistor tried hard but could not save the station.</string>
+    <string name="dialog_error_message_fetch_write">Could not save the station.</string>
     <!-- messages -->
     <string name="toastmessage_add_download_started">Download started.</string>
     <string name="toastmessage_add_open_file_started">Opening file.</string>
@@ -205,18 +205,18 @@
     <string name="toastmessage_timer_cancelled">Sleep timer cancelled.</string>
     <string name="toastmessage_timer_duration_increased">Duration increased.</string>
     <string name="toastmessage_sleep_timer_unable_to_start">Please start playback first.</string>
-    <string name="toastalert_unable_to_connect">Unable to connect. Device does not have an internet connection or stream may be outdated.</string>
+    <string name="toastalert_unable_to_connect">Unable to connect. Device does not have an internet connection or the stream is outdated.</string>
     <string name="toastalert_rename_unsuccessful">Unable to rename station. Please choose a different name.</string>
-    <string name="toastalert_delete_successful">The station was removed.</string>
+    <string name="toastalert_delete_successful">Station removed.</string>
     <string name="toastalert_no_external_storage">Unable to access external storage.</string>
-    <string name="toastalert_no_image_picker">No image picker available. Consider installing a Gallery application.</string>
+    <string name="toastalert_no_image_picker">No image picker available. Consider installing a Gallery app.</string>
     <string name="toastalert_headphones_unplugged">Headphones unplugged. Playback stopped.</string>
     <string name="toastalert_permission_denied">Permission denied:</string>
     <string name="toastalert_station_not_found">Unable to find station.</string>
-    <string name="snackbar_request_storage_access">Transistor needs to be granted read permissions to be able access data from external storage.</string>
+    <string name="snackbar_request_storage_access">Grant \"Read storage\" permission to access data from external storage.</string>
     <string name="snackbar_message_timer_set">Sleep timer set to</string>
     <!-- notification -->
     <string name="notification_stop">Stop</string>
     <string name="notification_channel_playback_name">Playback Controls</string>
     <string name="notification_channel_playback_description">Playback controls, station logo and now playing info.</string>
-</resources>
\ No newline at end of file
+</resources>

From 0a06782dbfa9976c3513d21ac6bd997611d15f28 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Allan=20Nordh=C3=B8y?= <epost@anotheragency.no>
Date: Tue, 12 Jan 2021 10:46:32 +0100
Subject: [PATCH 2/3] Suggested changes made

---
 app/src/main/res/values/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index bfde0521..086af98e 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -174,7 +174,7 @@
     <!-- error dialogs -->
     <string name="dialog_error_details_button_default">Show details</string>
     <string name="dialog_error_details_default">No details available</string>
-    <string name="dialog_error_details_write">Check your external storage if this station isn't a duplicate.</string>
+    <string name="dialog_error_details_write">Station possibly duplicated.</string>
     <string name="dialog_error_title_fetch_download">Download Issue</string>
     <string name="dialog_error_title_fetch_read">Read Issue</string>
     <string name="dialog_error_title_fetch_write">Write Issue</string>

From 3be84f89990f413a89e10925b4eac83882b18798 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Allan=20Nordh=C3=B8y?= <epost@anotheragency.no>
Date: Tue, 12 Jan 2021 10:47:15 +0100
Subject: [PATCH 3/3] Removed unused string

---
 app/src/main/res/values/strings.xml | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 086af98e..7b9e54f4 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -116,13 +116,6 @@
     <string name="sample_text_steam_url" translatable="false">https://bytefm.cast.addradio.de/bytefm/main/mid/stream</string>
     <string name="sample_text_sleep_timer_remaining_time" translatable="false">00:00</string>
     <!-- Allowed Template -->
-    <string name="allowed_caller_log">
-        The caller has a valid certificate, but the wrong package for it.
-        To allow this caller, add the following to the allowed callers list:\n
-        <![CDATA[
-        <signature name=\"%1$s\" package=\"%2$s\">\n\t<key>%3$s</key>\n</signature>\n
-        ]]>
-    </string>
     <!-- Strings from Classic Transistor -->
     <!-- please do not translate app_name - transcription into different alphabet types is fine though -->
     <!-- app shortcuts -->