diff --git a/README.md b/README.md
index 9f4d83f..166c604 100644
--- a/README.md
+++ b/README.md
@@ -52,6 +52,15 @@ avoided for new code (e.g. the "m" member variable prefix).
 It's possible that contributions may be folded into future releases of Orange Squeeze. If so, the
 authors will be recognized in the release notes.
 
+## Languages and Translations
+
+Open Squeeze was developed by a native American English speaker. The German and French translations were
+initially machine generated and then heavily modified by users and contributors.
+
+Translations to new languages and modifications to existing translations should be done via
+[Weblate](https://hosted.weblate.org/projects/open-squeeze/) which is freely provided for
+Open Source projects. Thank you to them for providing this service!
+
 ## License
 
 The license for the code is [Apache License, Version 2.0](https://www.apache.org/licenses/LICENSE-2.0).
diff --git a/app/build.gradle b/app/build.gradle
index de33327..08f3bb4 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -190,7 +190,7 @@ dependencies {
     implementation "com.google.code.findbugs:jsr305:${obl_jsr305Version}"
 
     // ReactiveX
-    implementation "io.reactivex.rxjava3:rxandroid:3.0.0"
+    implementation "io.reactivex.rxjava3:rxandroid:3.0.2"
     implementation "io.reactivex.rxjava3:rxjava:3.1.5"
     implementation "io.reactivex.rxjava3:rxkotlin:3.0.1"
 
@@ -198,7 +198,7 @@ dependencies {
     implementation "com.squareup.sqldelight:android-driver:${sqldelight_version}"
     implementation "com.squareup.sqldelight:coroutines-extensions:${sqldelight_version}"
 
-    debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.9.1'
+    debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.10'
 
     implementation 'androidx.multidex:multidex:2.0.1'
 
@@ -211,17 +211,17 @@ dependencies {
     testImplementation "io.mockk:mockk-android:1.13.2"
     testImplementation "com.google.truth:truth:1.1.3"
 
-    androidTestImplementation "androidx.test:runner:1.4.0"
-    androidTestImplementation "androidx.test:rules:1.4.0"
-    androidTestImplementation "androidx.test:core:1.4.0"
-    androidTestImplementation "androidx.test:core-ktx:1.4.0"
-    androidTestImplementation "androidx.test.espresso:espresso-core:3.4.0"
-    androidTestImplementation "androidx.test.espresso:espresso-intents:3.4.0"
-    androidTestImplementation "androidx.test.ext:junit:1.1.3"
-    androidTestImplementation "androidx.test.ext:junit-ktx:1.1.3"
-    androidTestImplementation "androidx.test.ext:truth:1.4.0"
+    androidTestImplementation "androidx.test:runner:1.5.1"
+    androidTestImplementation "androidx.test:rules:1.5.0"
+    androidTestImplementation "androidx.test:core:1.5.0"
+    androidTestImplementation "androidx.test:core-ktx:1.5.0"
+    androidTestImplementation "androidx.test.espresso:espresso-core:3.5.0"
+    androidTestImplementation "androidx.test.espresso:espresso-intents:3.5.0"
+    androidTestImplementation "androidx.test.ext:junit:1.1.4"
+    androidTestImplementation "androidx.test.ext:junit-ktx:1.1.4"
+    androidTestImplementation "androidx.test.ext:truth:1.5.0"
     androidTestImplementation "io.mockk:mockk-android:1.13.2"
-    androidTestUtil "androidx.test:orchestrator:1.4.1"
+    androidTestUtil "androidx.test:orchestrator:1.4.2"
 }
 
 tasks.withType(JavaCompile) {
diff --git a/app/src/main/java/com/orangebikelabs/orangesqueeze/app/SBActivity.java b/app/src/main/java/com/orangebikelabs/orangesqueeze/app/SBActivity.java
index 68ca308..5b9f42d 100644
--- a/app/src/main/java/com/orangebikelabs/orangesqueeze/app/SBActivity.java
+++ b/app/src/main/java/com/orangebikelabs/orangesqueeze/app/SBActivity.java
@@ -11,6 +11,8 @@
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
+import android.os.Handler;
+import android.os.Looper;
 import android.support.v4.media.session.MediaControllerCompat;
 
 import androidx.appcompat.app.AppCompatActivity;
@@ -78,6 +80,8 @@ public static int getInstanceCount() {
         return sInstanceCount;
     }
 
+    final static private Handler sHandler = new Handler(Looper.getMainLooper());
+
     static public boolean sShouldAutoStart = true;
 
     static private int sInstanceCount = 0;
@@ -209,13 +213,15 @@ protected void onStart() {
         }
         setWindowFlags();
 
-        // show deferred player snackbar when the UI is ready
-        if (sDeferredPlayerSnackbar != null) {
-            PlayerStatus status = sDeferredPlayerSnackbar;
-            sDeferredPlayerSnackbar = null;
+        sHandler.postDelayed(() -> {
+            // show deferred player snackbar when the UI is ready
+            if (sDeferredPlayerSnackbar != null) {
+                PlayerStatus status = sDeferredPlayerSnackbar;
+                sDeferredPlayerSnackbar = null;
 
-            showPlayerSnackbar(status);
-        }
+                showPlayerSnackbar(status);
+            }
+        }, 250);
     }
 
     @Override
@@ -445,7 +451,8 @@ protected void setWindowFlags() {
 
     protected void showPlayerSnackbar(PlayerStatus status) {
         OSAssert.assertMainThread();
-        if (!mStarted || isFinishing() || !allowSnackbarDisplay() || getSnackbarView() == null) {
+        View snackbarView = getSnackbarView();
+        if (!mStarted || isFinishing() || !allowSnackbarDisplay() || snackbarView == null || snackbarView.getWidth() <= 0 || snackbarView.getHeight() <= 0) {
             sDeferredPlayerSnackbar = status;
             return;
         }
@@ -454,7 +461,10 @@ protected void showPlayerSnackbar(PlayerStatus status) {
         if (!status.getId().equals(mLastShownPlayerSnackbar)) {
             mLastShownPlayerSnackbar = status.getId();
             String text = getString(R.string.change_player_snackbar, status.getName());
-            Snackbar.make(getSnackbarView(), HtmlCompat.fromHtml(text, HtmlCompat.FROM_HTML_MODE_COMPACT), Snackbar.LENGTH_SHORT).show();
+            Snackbar
+                    .make(snackbarView, HtmlCompat.fromHtml(text, HtmlCompat.FROM_HTML_MODE_COMPACT), Snackbar.LENGTH_SHORT)
+                    .setAnchorView(snackbarView)
+                    .show();
         }
     }
 
diff --git a/app/src/main/java/com/orangebikelabs/orangesqueeze/menu/AbsMenuFragment.java b/app/src/main/java/com/orangebikelabs/orangesqueeze/menu/AbsMenuFragment.java
index ee0ae55..73c58ab 100644
--- a/app/src/main/java/com/orangebikelabs/orangesqueeze/menu/AbsMenuFragment.java
+++ b/app/src/main/java/com/orangebikelabs/orangesqueeze/menu/AbsMenuFragment.java
@@ -245,7 +245,7 @@ public void showSnackbar(CharSequence text, SnackbarLength length) {
         } else {
             translatedLength = Snackbar.LENGTH_SHORT;
         }
-        mLastSnackbar = Snackbar.make(getSnackbarView(), text, translatedLength);
+        mLastSnackbar = Snackbar.make(getSnackbarView(), text, translatedLength).setAnchorView(getSnackbarView());
         mLastSnackbar.show();
     }
 
diff --git a/app/src/main/java/com/orangebikelabs/orangesqueeze/nowplaying/NowPlayingActivity.java b/app/src/main/java/com/orangebikelabs/orangesqueeze/nowplaying/NowPlayingActivity.java
index f768b8d..b45aae8 100644
--- a/app/src/main/java/com/orangebikelabs/orangesqueeze/nowplaying/NowPlayingActivity.java
+++ b/app/src/main/java/com/orangebikelabs/orangesqueeze/nowplaying/NowPlayingActivity.java
@@ -23,6 +23,7 @@
 
 import android.view.Menu;
 import android.view.MenuItem;
+import android.view.View;
 
 import com.orangebikelabs.orangesqueeze.BuildConfig;
 import com.orangebikelabs.orangesqueeze.R;
@@ -191,6 +192,17 @@ public boolean onOptionsItemSelected(MenuItem item) {
         }
     }
 
+    @Override
+    protected boolean allowSnackbarDisplay() {
+        return true;
+    }
+
+    @Nullable
+    @Override
+    protected View getSnackbarView() {
+        return findViewById(R.id.controls);
+    }
+
     private void setHidePlaylistItemDrawable() {
         if (mHidePlaylistItem == null) {
             return;
diff --git a/app/src/main/java/com/orangebikelabs/orangesqueeze/players/ManagePlayersAdapter.java b/app/src/main/java/com/orangebikelabs/orangesqueeze/players/ManagePlayersAdapter.java
index ca35ff7..8c354df 100644
--- a/app/src/main/java/com/orangebikelabs/orangesqueeze/players/ManagePlayersAdapter.java
+++ b/app/src/main/java/com/orangebikelabs/orangesqueeze/players/ManagePlayersAdapter.java
@@ -5,7 +5,6 @@
 
 package com.orangebikelabs.orangesqueeze.players;
 
-import android.annotation.SuppressLint;
 import android.content.Context;
 
 import arrow.core.Option;
@@ -40,6 +39,7 @@
 
 import java.net.URI;
 import java.net.URISyntaxException;
+import java.text.NumberFormat;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
@@ -84,11 +84,13 @@ public interface OnPlayerCommandListener {
     private SyncStatus mSyncStatus;
     private boolean mDrawerMode;
     private int mPlayerItemLayoutRid;
+    final private NumberFormat mNumberFormat;
 
     public ManagePlayersAdapter(Context context) {
         super(context, 0);
 
         setDrawerMode(false);
+        mNumberFormat = NumberFormat.getInstance();
     }
 
     @Nonnull
@@ -291,15 +293,31 @@ public View getView(int pos, @Nullable View convertView, ViewGroup parent) {
         return convertView;
     }
 
-    @SuppressLint("SetTextI18n")
-    protected void setVolume(Slider sb, TextView playerVolumeLabel, int volume) {
+    /** called when volume is set by user */
+    protected void setVolumeFromUser(Slider sb, TextView playerVolumeLabel, int volume) {
         View parentView = (View) sb.getTag(R.id.tag_containerview);
         PlayerId pid = (PlayerId) parentView.getTag(R.id.tag_playerid);
-        playerVolumeLabel.setText(Integer.toString(volume));
+        updateVolumeText(playerVolumeLabel, volume);
 
         mOnPlayerCommandListener.onPlayerCommand(pid, PlayerCommand.VOLUME, volume);
     }
 
+    protected void hideVolumeText(@Nullable TextView playerVolumeLabel) {
+        if(playerVolumeLabel != null) {
+            playerVolumeLabel.setVisibility(View.INVISIBLE);
+        }
+    }
+
+    /** called to update the text field to a specific volume level */
+    protected void updateVolumeText(@Nullable TextView playerVolumeLabel, int volume) {
+        if(playerVolumeLabel != null) {
+            if(playerVolumeLabel.getVisibility() != View.VISIBLE) {
+                playerVolumeLabel.setVisibility(View.VISIBLE);
+            }
+            playerVolumeLabel.setText(mNumberFormat.format(volume));
+        }
+    }
+
     /**
      * tag should be the player status
      */
@@ -422,7 +440,7 @@ protected void updateView(View view) {
             SwitchMaterial powerButton = view.findViewById(R.id.player_power_toggle);
             Slider volumeBar = view.findViewById(R.id.volume_bar);
             View actionButton = view.findViewById(R.id.action_button);
-            TextView playerStatusText = view.findViewById(R.id.player_status_label);
+            TextView playerStatusLabel = view.findViewById(R.id.player_status_label);
             final TextView playerVolumeLabel = view.findViewById(R.id.player_volume_label);
 
             if (powerButton != null) {
@@ -441,7 +459,7 @@ protected void updateView(View view) {
                 volumeBar.addOnChangeListener((slider, value, fromUser) -> {
                     if (fromUser) {
                         // only respond to user-generated events
-                        setVolume(slider, playerVolumeLabel, (int) value);
+                        setVolumeFromUser(slider, playerVolumeLabel, (int) value);
                     }
                 });
                 volumeBar.addOnSliderTouchListener(new Slider.OnSliderTouchListener() {
@@ -457,7 +475,7 @@ public void onStopTrackingTouch(Slider slider) {
                         playerVolumeLabel.setVisibility(View.VISIBLE);
                         // called at the end of a touch/drag cycle, call with update to make
                         // sure we are in sync with remote volume
-                        setVolume(slider, playerVolumeLabel, (int) slider.getValue());
+                        setVolumeFromUser(slider, playerVolumeLabel, (int) slider.getValue());
                     }
                 });
                 volumeBar.setLabelFormatter((value -> Integer.toString((int) value)));
@@ -475,10 +493,11 @@ public void onStopTrackingTouch(Slider slider) {
             // when progress is visible, don't routinely update the volume,
             // power buttons because they may lag
 
+            int clampedVolume = MoreMath.coerceIn(mPlayerStatus.getVolume(), 0, 100);
             int playerStatusVisibility = View.GONE;
-            boolean progressVisible = false;
+            boolean statusInProgress = false;
             if (!mPlayerStatus.isInitialized()) {
-                progressVisible = true;
+                statusInProgress = true;
 
                 if (volumeBar != null) {
                     volumeBar.setValue(0);
@@ -489,7 +508,7 @@ public void onStopTrackingTouch(Slider slider) {
                     powerButton.setChecked(false);
                 }
             } else if (isWorkInProgress(mPlayerStatus.getId())) {
-                progressVisible = true;
+                statusInProgress = true;
             } else {
                 if (powerButton != null) {
                     powerButton.setChecked(mPlayerStatus.isPowered());
@@ -502,10 +521,10 @@ public void onStopTrackingTouch(Slider slider) {
                 } else {
                     if (volumeBar != null) {
                         // ensure received values are within 0 <= value <= 100
-                        int clampedVolume = MoreMath.coerceIn(mPlayerStatus.getVolume(), 0, 100);
                         volumeBar.setValue(clampedVolume);
                     }
                 }
+                updateVolumeText(playerVolumeLabel, clampedVolume);
 
                 // TODO add different text if mPlayerStatus.isVolumeLocked()
                 if (volumeBar != null) {
@@ -513,17 +532,23 @@ public void onStopTrackingTouch(Slider slider) {
                 }
                 if (mPlayerStatus.isPowered()) {
                     playerStatusVisibility = View.VISIBLE;
-                    if (playerStatusText != null) {
+                    if (playerStatusLabel != null) {
                         if (mPlayerStatus.isConnected()) {
-                            playerStatusText.setText(mPlayerStatus.getMode().getRid());
+                            playerStatusLabel.setText(mPlayerStatus.getMode().getRid());
                         } else {
-                            playerStatusText.setText(getContext().getString(R.string.disconnected));
+                            playerStatusLabel.setText(getContext().getString(R.string.disconnected));
                         }
                     }
                 }
             }
-            if (playerStatusText != null) {
-                playerStatusText.setVisibility(playerStatusVisibility);
+
+            if(statusInProgress) {
+                hideVolumeText(playerVolumeLabel);
+            } else {
+                updateVolumeText(playerVolumeLabel, clampedVolume);
+            }
+            if (playerStatusLabel != null) {
+                playerStatusLabel.setVisibility(playerStatusVisibility);
             }
             if (mPlayerStatus.getId().equals(mSelectedPlayer)) {
                 view.setBackgroundResource(R.drawable.manageplayers_item_selected);
diff --git a/app/src/main/java/com/orangebikelabs/orangesqueeze/ui/MainActivity.kt b/app/src/main/java/com/orangebikelabs/orangesqueeze/ui/MainActivity.kt
index 156f1c6..9521b7f 100644
--- a/app/src/main/java/com/orangebikelabs/orangesqueeze/ui/MainActivity.kt
+++ b/app/src/main/java/com/orangebikelabs/orangesqueeze/ui/MainActivity.kt
@@ -8,6 +8,7 @@ package com.orangebikelabs.orangesqueeze.ui
 import android.content.Context
 import android.content.Intent
 import android.os.Bundle
+import android.view.View
 import androidx.fragment.app.commitNow
 
 import com.orangebikelabs.orangesqueeze.BuildConfig
@@ -105,6 +106,11 @@ class MainActivity : DrawerActivity() {
         return true
     }
 
+    override fun getSnackbarView(): View? {
+        val retval = findViewById<View>(R.id.tiny_nowplaying_container)
+        return retval
+    }
+
     override fun applyDrawerState(drawerState: DrawerState) {
         if (drawerState !== DrawerState.BROWSE) {
             supportActionBar.title = title
diff --git a/app/src/main/java/com/orangebikelabs/orangesqueeze/ui/MaintenanceDialogFragment.java b/app/src/main/java/com/orangebikelabs/orangesqueeze/ui/MaintenanceDialogFragment.java
index 3b45f1b..ae17693 100644
--- a/app/src/main/java/com/orangebikelabs/orangesqueeze/ui/MaintenanceDialogFragment.java
+++ b/app/src/main/java/com/orangebikelabs/orangesqueeze/ui/MaintenanceDialogFragment.java
@@ -118,7 +118,7 @@ public View getView(int position, @Nullable View convertView, ViewGroup parent)
             }
             dialog.dismiss();
         });
-        builder.setNegativeButton(R.string.close, (dialog, which) -> {
+        builder.setNegativeButton(R.string.dismiss_dialog, (dialog, which) -> {
             // nothing to do
         });
         Dialog retval = builder.create();
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 87c84fd..ec5da4c 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -104,7 +104,7 @@
     <string name="nextbutton_label">Weiter</string>
     <string name="cancel">Abbrechen</string>
     <string name="ok">OK</string>
-    <string name="close">OK</string>
+    <string name="dismiss_dialog">OK</string>
     <string name="permission_write_external_storage_rationale_title">Speicherberechtigung</string>
     <string name="permission_write_external_storage_neverask">Die Berechtigung zu speichern wird nie wieder angefordert.</string>
     <string name="permission_write_external_storage_denied">Die Berechtigung zu speichern wurde abgelehnt.</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 7291500..6eb1e60 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -100,7 +100,7 @@
     <string name="pause_desc">Pause de la lecture</string>
     <string name="error_invalid_credentials">Nom d\'utilisateur et/ou mot de passe incorrect</string>
     <string name="no">Annuler</string>
-    <string name="close">OK</string>
+    <string name="dismiss_dialog">OK</string>
     <string name="empty_downloads_text">Aucun téléchargement actif ou terminé</string>
     <string name="empty_text">Pas d\'objet</string>
     <string name="select_player_prompt">Sélectionner un platine:</string>
diff --git a/app/src/main/res/values/about_strings.xml b/app/src/main/res/values/about_strings.xml
deleted file mode 100644
index 3f42ed3..0000000
--- a/app/src/main/res/values/about_strings.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright (c) 2020-2022 The OpenSqueeze Authors. All Rights Reserved.
-  ~ Use of this source code is governed by the license that can be found in the LICENSE file.
-  -->
-
-<resources>
-    <string name="about_title">About %1$s</string>
-    <string name="about_message">Version %1$s</string>
-</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/exception_strings.xml b/app/src/main/res/values/exception_strings.xml
deleted file mode 100644
index b171047..0000000
--- a/app/src/main/res/values/exception_strings.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (c) 2020-2022 The OpenSqueeze Authors. All Rights Reserved.
-  ~ Use of this source code is governed by the license that can be found in the LICENSE file.
-  -->
-
-<resources>
-    <string name="exception_connection_timeout">Timeout waiting for server connection to complete</string>
-    <string name="exception_no_network_available">No Network Available</string>
-    <string name="exception_connection_error">Connection error</string>
-</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/prefs.xml b/app/src/main/res/values/prefs.xml
deleted file mode 100644
index 80ce358..0000000
--- a/app/src/main/res/values/prefs.xml
+++ /dev/null
@@ -1,166 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright (c) 2020-2022 The OpenSqueeze Authors. All Rights Reserved.
-  ~ Use of this source code is governed by the license that can be found in the LICENSE file.
-  -->
-
-<resources>
-
-    <string name="pref_autoconnect_summary">Automatically connect to the last connected server</string>
-    <string name="pref_autoconnect_title">Automatic Connect</string>
-    <string name="pref_autodiscovery_summary">Periodically send discovery broadcast requests to
-		find local servers</string>
-    <string name="pref_autodiscovery_title">Automatic Discovery</string>
-    <string name="pref_advancedprefs_title">Advanced</string>
-    <string name="pref_advancedprefs_summary">Shows advanced preferences</string>
-    <string name="pref_downloadprefs_title">Download</string>
-    <string name="pref_downloadprefs_summary">Shows download preferences</string>
-    <string name="pref_cachelocation_title">Cache Location</string>
-    <string name="pref_cachelocation_summary">Artwork cache will be stored on %1$s</string>
-
-    <!-- update corresponding entries in prefs_nls.xml -->
-    <string-array name="pref_cachelocation_entries">
-        <item>Use Internal Storage</item>
-        <item>Use External Storage (SD card, etc)</item>
-    </string-array>
-
-    <string name="pref_cache_storagesize_title">Storage Cache Size</string>
-    <string name="pref_cache_storagesize_summary">The maximum amount of space that the artwork cache will
-		use on device storage.\n\nThe current maximum value is %1$s MB.</string>
-
-    <!-- update corresponding entries in prefs_nls.xml -->
-    <string-array name="pref_cache_storagesize_entries">
-        <item>Automatic</item>
-        <item>50 MB</item>
-        <item>100 MB</item>
-        <item>250 MB</item>
-        <item>500 MB</item>
-        <item>1000 MB</item>
-    </string-array>
-
-    <string name="pref_artwork_category">Artwork</string>
-    <string name="pref_cache_category">Caching</string>
-    <string name="pref_wipeartwork_summary">Removes all cache data from storage</string>
-    <string name="pref_wipeartwork_title">Wipe Cache</string>
-    <string name="pref_wipeartwork_message">Do you want to remove all cache data from
-		permanent storage? If you select yes, then the cache will begin to
-		fill again on demand.</string>
-    <string name="pref_automaticmute_category_title">On-Call Behavior</string>
-    <string name="pref_automaticmute_title">On Call Received</string>
-    <string name="pref_automaticmute_summary">What to do when a call is made or received and connected players are playing.\n\nCurrent value: \"%1$s\"</string>
-
-    <string-array name="pref_automaticmute_entries">
-        <item>Nothing</item>
-        <item>Mute All Players</item>
-        <item>Mute Current Player</item>
-        <item>Pause All Players</item>
-        <item>Pause Current Player</item>
-    </string-array>
-
-    <string name="pref_automaticunmute_title">Resume Playback</string>
-    <string name="pref_automaticunmute_summary">For paused and muted players, playback continues automatically if the call ends within the configured time.</string>
-
-    <string-array name="pref_automaticunmute_entries">
-        <item>Never</item>
-        <item>1 minute</item>
-        <item>5 minutes</item>
-        <item>10 minutes</item>
-        <item>30 minutes</item>
-        <item>60 minutes</item>
-        <item>Forever</item>
-    </string-array>
-
-    <string name="pref_systemvolumecontrol_title">Integrate with System Volume Control</string>
-    <string name="pref_systemvolumecontrol_summaryOn">The app will integrate into the system volume.</string>
-    <string name="pref_systemvolumecontrol_summaryOff">The app\'s volume control will operate independent of the system volume control.</string>
-
-    <string name="pref_silentaudiohack_title">Play Silent Audio</string>
-    <string name="pref_silentaudiohack_summaryOn">The app will play silent audio in the background to help manage audio focus on newer Android versions.</string>
-    <string name="pref_silentaudiohack_summaryOff">The app will not play silent audio.</string>
-
-    <string name="pref_pauseonheadphonedisconnect_title">Pause when Headphones Disconnect</string>
-    <string name="pref_pauseonheadphonedisconnect_summaryOn">The current player will pause whenever bluetooth or wired headphones disconnect when audio is playing (requires that "Play Silent Audio" be enabled).</string>
-    <string name="pref_pauseonheadphonedisconnect_summaryOff">Playback continues unaffected by headphones status.</string>
-
-    <string name="pref_use24hourtimeformat_title">Time Format</string>
-    <string name="pref_use24hourtimeformat_summaryOn">Use 24 hour time format.</string>
-    <string name="pref_use24hourtimeformat_summaryOff">Use 12 hour time format.</string>
-    <string name="pref_volumecontrol_notification">This app can use your device
-		volume controls to control your Squeezebox device volume. Would you like to
-		enable this behavior?\n\nIt can be changed at any time within
-		the app preferences.</string>
-    <string name="pref_browse_category">Browse Preferences</string>
-    <string name="pref_browse_albumsort_title">Album Sort</string>
-    <string name="pref_browse_albumsort_summary">Choose the way that albums are sorted. Please note that this preference is stored on the server and can only be changed when connected.</string>
-    <string name="pref_browse_showactionbar_title">Show Title Bar</string>
-    <string name="pref_browse_showactionbar_summary">If selected, during browsing the title bar has breadcrumbs to navigate the browse history.</string>
-    <string name="pref_browse_shownowplaying_title">Show Now Playing Bar</string>
-    <string name="pref_browse_shownowplaying_summary">If selected, during browsing the bottom bar shows the now playing information and allows quick access to the now playing screen.</string>
-    <string name="pref_browse_disableartistartwork_title">Disable Artist Artwork</string>
-    <string name="pref_browse_disableartistartwork_summary">Disables generation of the artist artwork on devices where this feature does not work properly or is undesired.</string>
-    <string name="pref_browse_gridcellcount_title">Browse Column Count</string>
-    <string name="pref_browse_gridcellcount_summary">Configure the number of columns (in portrait mode) that browsing will use for grid-based items.</string>
-    <string name="pref_general_category_title">General</string>
-    <string name="pref_keepscreenon_summary">Keep screen on whenever this app is in the foreground.</string>
-    <string name="pref_keepscreenon_title">Keep Screen On</string>
-    <string name="pref_autolaunch_squeezeplayer_title">SqueezePlayer Start</string>
-    <string name="pref_autolaunch_squeezeplayer_summary">When connection established to a server, automatically start SqueezePlayer and connect it to the server.</string>
-    <string name="pref_autolaunch_squeezeplayer_message">Great, you\'ve got SqueezePlayer installed!  Would you like to automatically start SqueezePlayer whenever this app connects to a server?</string>
-    <string name="pref_trackselect_playmode_title">Default Play Mode</string>
-    <string name="pref_trackselect_playmode_summary">Choose the play mode to use when selecting tracks directly</string>
-
-    <string-array name="pref_trackselect_playmode_entries">
-        <item>Prompt</item>
-        <item>Play Now</item>
-        <item>Play Next</item>
-        <item>Add to Playlist</item>
-    </string-array>
-
-    <string name="pref_other_category">Other</string>
-    <string name="pref_volume_category">Volume</string>
-    <string name="pref_verboselogging_summary">Temporarily enable this, then perform a troublesome operation. Then return and use the &#8220;Send Feedback&#8221; option.</string>
-    <string name="pref_verboselogging_title">Verbose Logging</string>
-    <string name="pref_showreleasenotes_summary">Disable this if you don\'t want to read the release notes whenever the app is upgraded.</string>
-    <string name="pref_showreleasenotes_title">Show Release Notes</string>
-    <string name="pref_theme_title">Theme</string>
-    <string name="pref_theme_summary">Choose a visual style for the app.</string>
-
-    <!-- make sure to change corresponding entry in prefs_nls.xml -->
-    <string-array name="pref_theme_entries" translatable="false">
-        <item>Light</item>
-        <item>Dark</item>
-        <item>Set by Battery Saver</item>
-    </string-array>
-
-    <string name="pref_compactmode_title">Compact Mode</string>
-    <string name="pref_compactmode_summaryOn">Use a compact visual style</string>
-    <string name="pref_compactmode_summaryOff">Use a normal visual style</string>
-
-    <string name="pref_language_title">Language</string>
-    <string name="pref_language_summary">Choose the language for text within this app</string>
-    <string-array name="pref_language_entries" translatable="false">
-        <item>English</item>
-        <item>Français</item>
-        <item>Deutsch</item>
-    </string-array>
-
-    <string name="pref_trackdownload_location_title">Download location</string>
-    <string name="pref_trackdownload_location_summary">The location on your device to which downloads will be stored.\n\nCurrent value:\n  %1$s</string>
-    <string name="pref_trackdownload_category">Track download</string>
-    <string name="pref_trackdownload_transcodeenabled_off">Tracks will be download in the native format as they are hosted on your server.</string>
-    <string name="pref_trackdownload_transcodeenabled_on">Tracks will be transcoded to an alternative format as they are downloaded to your device.</string>
-    <string name="pref_trackdownload_transcodeenabled_title">Transcoding</string>
-    <string name="pref_trackdownload_transcodeformat_summary">If transcoding is enabled, downloads will be transcoded to %1$s format.</string>
-    <string name="pref_trackdownload_transcodeformat_title">Transcode Format</string>
-    <string name="pref_trackdownload_transcodeoptions_summary">Comma-delimited list of transcoding options.\n\nCurrent value: %1$s</string>
-    <string name="pref_trackdownload_transcodeoptions_title">Transcode Options</string>
-
-    <string name="pref_browse_gridcellcount_uselist">Always use lists for browsing</string>
-
-    <string name="pref_shownowplayingnotification_title">Show Now Playing Notification</string>
-    <string name="pref_shownowplayingnotification_summaryOn">When leaving the app with a player playing, a notification will be presented that can be used to control that player.</string>
-    <string name="pref_shownowplayingnotification_summaryOff">No notification will be shown.</string>
-
-    <string name="pref_autosizetext_title">Automatic Text Size</string>
-    <string name="pref_autosizetext_summaryOn">The text size will dynamically shrink to fit more when necessary</string>
-    <string name="pref_autosizetext_summaryOff">Longer text will be truncated when necessary</string>
-</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 4072f2f..b6e8ffd 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -273,7 +273,174 @@
     <string name="nowplaying_shortcut_short_label">Now Playing</string>
     <string name="nowplaying_shortcut_long_label">Launch direct to Now Playing</string>
     <string name="all_items">All Items</string>
-    <string name="close">Close</string>
+    <string name="dismiss_dialog">Close</string>
     <string name="snap_to_current_item">Snap to Current Track</string>
     <string name="forgot_password">Forgot your password?</string>
+
+
+    <string name="pref_autoconnect_summary">Automatically connect to the last connected server</string>
+    <string name="pref_autoconnect_title">Automatic Connect</string>
+    <string name="pref_autodiscovery_summary">Periodically send discovery broadcast requests to
+		find local servers</string>
+    <string name="pref_autodiscovery_title">Automatic Discovery</string>
+    <string name="pref_advancedprefs_title">Advanced</string>
+    <string name="pref_advancedprefs_summary">Shows advanced preferences</string>
+    <string name="pref_downloadprefs_title">Download</string>
+    <string name="pref_downloadprefs_summary">Shows download preferences</string>
+    <string name="pref_cachelocation_title">Cache Location</string>
+    <string name="pref_cachelocation_summary">Artwork cache will be stored on %1$s</string>
+
+    <!-- update corresponding entries in prefs_nls.xml -->
+    <string-array name="pref_cachelocation_entries">
+        <item>Use Internal Storage</item>
+        <item>Use External Storage (SD card, etc)</item>
+    </string-array>
+
+    <string name="pref_cache_storagesize_title">Storage Cache Size</string>
+    <string name="pref_cache_storagesize_summary">The maximum amount of space that the artwork cache will
+		use on device storage.\n\nThe current maximum value is %1$s MB.</string>
+
+    <!-- update corresponding entries in prefs_nls.xml -->
+    <string-array name="pref_cache_storagesize_entries">
+        <item>Automatic</item>
+        <item>50 MB</item>
+        <item>100 MB</item>
+        <item>250 MB</item>
+        <item>500 MB</item>
+        <item>1000 MB</item>
+    </string-array>
+
+    <string name="pref_artwork_category">Artwork</string>
+    <string name="pref_cache_category">Caching</string>
+    <string name="pref_wipeartwork_summary">Removes all cache data from storage</string>
+    <string name="pref_wipeartwork_title">Wipe Cache</string>
+    <string name="pref_wipeartwork_message">Do you want to remove all cache data from
+		permanent storage? If you select yes, then the cache will begin to
+		fill again on demand.</string>
+    <string name="pref_automaticmute_category_title">On-Call Behavior</string>
+    <string name="pref_automaticmute_title">On Call Received</string>
+    <string name="pref_automaticmute_summary">What to do when a call is made or received and connected players are playing.\n\nCurrent value: \"%1$s\"</string>
+
+    <string-array name="pref_automaticmute_entries">
+        <item>Nothing</item>
+        <item>Mute All Players</item>
+        <item>Mute Current Player</item>
+        <item>Pause All Players</item>
+        <item>Pause Current Player</item>
+    </string-array>
+
+    <string name="pref_automaticunmute_title">Resume Playback</string>
+    <string name="pref_automaticunmute_summary">For paused and muted players, playback continues automatically if the call ends within the configured time.</string>
+
+    <string-array name="pref_automaticunmute_entries">
+        <item>Never</item>
+        <item>1 minute</item>
+        <item>5 minutes</item>
+        <item>10 minutes</item>
+        <item>30 minutes</item>
+        <item>60 minutes</item>
+        <item>Forever</item>
+    </string-array>
+
+    <string name="pref_systemvolumecontrol_title">Integrate with System Volume Control</string>
+    <string name="pref_systemvolumecontrol_summaryOn">The app will integrate into the system volume.</string>
+    <string name="pref_systemvolumecontrol_summaryOff">The app\'s volume control will operate independent of the system volume control.</string>
+
+    <string name="pref_silentaudiohack_title">Play Silent Audio</string>
+    <string name="pref_silentaudiohack_summaryOn">The app will play silent audio in the background to help manage audio focus on newer Android versions.</string>
+    <string name="pref_silentaudiohack_summaryOff">The app will not play silent audio.</string>
+
+    <string name="pref_pauseonheadphonedisconnect_title">Pause when Headphones Disconnect</string>
+    <string name="pref_pauseonheadphonedisconnect_summaryOn">The current player will pause whenever bluetooth or wired headphones disconnect when audio is playing (requires that "Play Silent Audio" be enabled).</string>
+    <string name="pref_pauseonheadphonedisconnect_summaryOff">Playback continues unaffected by headphones status.</string>
+
+    <string name="pref_use24hourtimeformat_title">Time Format</string>
+    <string name="pref_use24hourtimeformat_summaryOn">Use 24 hour time format.</string>
+    <string name="pref_use24hourtimeformat_summaryOff">Use 12 hour time format.</string>
+    <string name="pref_volumecontrol_notification">This app can use your device
+		volume controls to control your Squeezebox device volume. Would you like to
+		enable this behavior?\n\nIt can be changed at any time within
+		the app preferences.</string>
+    <string name="pref_browse_category">Browse Preferences</string>
+    <string name="pref_browse_albumsort_title">Album Sort</string>
+    <string name="pref_browse_albumsort_summary">Choose the way that albums are sorted. Please note that this preference is stored on the server and can only be changed when connected.</string>
+    <string name="pref_browse_showactionbar_title">Show Title Bar</string>
+    <string name="pref_browse_showactionbar_summary">If selected, during browsing the title bar has breadcrumbs to navigate the browse history.</string>
+    <string name="pref_browse_shownowplaying_title">Show Now Playing Bar</string>
+    <string name="pref_browse_shownowplaying_summary">If selected, during browsing the bottom bar shows the now playing information and allows quick access to the now playing screen.</string>
+    <string name="pref_browse_disableartistartwork_title">Disable Artist Artwork</string>
+    <string name="pref_browse_disableartistartwork_summary">Disables generation of the artist artwork on devices where this feature does not work properly or is undesired.</string>
+    <string name="pref_browse_gridcellcount_title">Browse Column Count</string>
+    <string name="pref_browse_gridcellcount_summary">Configure the number of columns (in portrait mode) that browsing will use for grid-based items.</string>
+    <string name="pref_general_category_title">General</string>
+    <string name="pref_keepscreenon_summary">Keep screen on whenever this app is in the foreground.</string>
+    <string name="pref_keepscreenon_title">Keep Screen On</string>
+    <string name="pref_autolaunch_squeezeplayer_title">SqueezePlayer Start</string>
+    <string name="pref_autolaunch_squeezeplayer_summary">When connection established to a server, automatically start SqueezePlayer and connect it to the server.</string>
+    <string name="pref_autolaunch_squeezeplayer_message">Great, you\'ve got SqueezePlayer installed!  Would you like to automatically start SqueezePlayer whenever this app connects to a server?</string>
+    <string name="pref_trackselect_playmode_title">Default Play Mode</string>
+    <string name="pref_trackselect_playmode_summary">Choose the play mode to use when selecting tracks directly</string>
+
+    <string-array name="pref_trackselect_playmode_entries">
+        <item>Prompt</item>
+        <item>Play Now</item>
+        <item>Play Next</item>
+        <item>Add to Playlist</item>
+    </string-array>
+
+    <string name="pref_other_category">Other</string>
+    <string name="pref_volume_category">Volume</string>
+    <string name="pref_verboselogging_summary">Temporarily enable this, then perform a troublesome operation. Then return and use the &#8220;Send Feedback&#8221; option.</string>
+    <string name="pref_verboselogging_title">Verbose Logging</string>
+    <string name="pref_showreleasenotes_summary">Disable this if you don\'t want to read the release notes whenever the app is upgraded.</string>
+    <string name="pref_showreleasenotes_title">Show Release Notes</string>
+    <string name="pref_theme_title">Theme</string>
+    <string name="pref_theme_summary">Choose a visual style for the app.</string>
+
+    <!-- make sure to change corresponding entry in prefs_nls.xml -->
+    <string-array name="pref_theme_entries" translatable="false">
+        <item>Light</item>
+        <item>Dark</item>
+        <item>Set by Battery Saver</item>
+    </string-array>
+
+    <string name="pref_compactmode_title">Compact Mode</string>
+    <string name="pref_compactmode_summaryOn">Use a compact visual style</string>
+    <string name="pref_compactmode_summaryOff">Use a normal visual style</string>
+
+    <string name="pref_language_title">Language</string>
+    <string name="pref_language_summary">Choose the language for text within this app</string>
+    <string-array name="pref_language_entries" translatable="false">
+        <item>English</item>
+        <item>Français</item>
+        <item>Deutsch</item>
+    </string-array>
+
+    <string name="pref_trackdownload_location_title">Download location</string>
+    <string name="pref_trackdownload_location_summary">The location on your device to which downloads will be stored.\n\nCurrent value:\n  %1$s</string>
+    <string name="pref_trackdownload_category">Track download</string>
+    <string name="pref_trackdownload_transcodeenabled_off">Tracks will be download in the native format as they are hosted on your server.</string>
+    <string name="pref_trackdownload_transcodeenabled_on">Tracks will be transcoded to an alternative format as they are downloaded to your device.</string>
+    <string name="pref_trackdownload_transcodeenabled_title">Transcoding</string>
+    <string name="pref_trackdownload_transcodeformat_summary">If transcoding is enabled, downloads will be transcoded to %1$s format.</string>
+    <string name="pref_trackdownload_transcodeformat_title">Transcode Format</string>
+    <string name="pref_trackdownload_transcodeoptions_summary">Comma-delimited list of transcoding options.\n\nCurrent value: %1$s</string>
+    <string name="pref_trackdownload_transcodeoptions_title">Transcode Options</string>
+
+    <string name="pref_browse_gridcellcount_uselist">Always use lists for browsing</string>
+
+    <string name="pref_shownowplayingnotification_title">Show Now Playing Notification</string>
+    <string name="pref_shownowplayingnotification_summaryOn">When leaving the app with a player playing, a notification will be presented that can be used to control that player.</string>
+    <string name="pref_shownowplayingnotification_summaryOff">No notification will be shown.</string>
+
+    <string name="pref_autosizetext_title">Automatic Text Size</string>
+    <string name="pref_autosizetext_summaryOn">The text size will dynamically shrink to fit more when necessary</string>
+    <string name="pref_autosizetext_summaryOff">Longer text will be truncated when necessary</string>
+
+    <string name="about_title">About %1$s</string>
+    <string name="about_message">Version %1$s</string>
+
+    <string name="exception_connection_timeout">Timeout waiting for server connection to complete</string>
+    <string name="exception_no_network_available">No Network Available</string>
+    <string name="exception_connection_error">Connection error</string>
 </resources>
diff --git a/build.gradle b/build.gradle
index a68dd3c..1207df3 100644
--- a/build.gradle
+++ b/build.gradle
@@ -4,7 +4,7 @@
  */
 
 buildscript {
-    ext.kotlin_version = '1.7.20'
+    ext.kotlin_version = '1.7.21'
     ext.sqldelight_version = '1.5.4'
 
     repositories {