diff --git a/app/src/main/java/org/schabi/newpipe/download/DownloadDialog.java b/app/src/main/java/org/schabi/newpipe/download/DownloadDialog.java
index 49b9024cd..0386b890d 100644
--- a/app/src/main/java/org/schabi/newpipe/download/DownloadDialog.java
+++ b/app/src/main/java/org/schabi/newpipe/download/DownloadDialog.java
@@ -692,7 +692,7 @@ public class DownloadDialog extends DialogFragment
         try {
             launcher.launch(StoredDirectoryHelper.getPicker(context));
         } catch (final ActivityNotFoundException aex) {
-            Log.w(TAG, "Unable to launch directory-picker", aex);
+            Log.w(TAG, "Unable to launch directory picker", aex);
             NoFileManagerHelper.showActivityNotFoundAlert(getContext());
         }
     }
@@ -777,7 +777,7 @@ public class DownloadDialog extends DialogFragment
                 requestDownloadSaveAsLauncher.launch(StoredFileHelper.getNewPicker(context,
                         filenameTmp, mimeTmp, initialPath));
             } catch (final ActivityNotFoundException aex) {
-                Log.w(TAG, "Unable to launch file-picker", aex);
+                Log.w(TAG, "Unable to launch file picker", aex);
                 NoFileManagerHelper.showActivityNotFoundAlert(getContext());
             }
 
diff --git a/app/src/main/java/org/schabi/newpipe/local/subscription/SubscriptionFragment.kt b/app/src/main/java/org/schabi/newpipe/local/subscription/SubscriptionFragment.kt
index 8b170279d..264fb17e7 100644
--- a/app/src/main/java/org/schabi/newpipe/local/subscription/SubscriptionFragment.kt
+++ b/app/src/main/java/org/schabi/newpipe/local/subscription/SubscriptionFragment.kt
@@ -185,7 +185,7 @@ class SubscriptionFragment : BaseStateFragment<SubscriptionState>() {
         try {
             requestImportLauncher.launch(StoredFileHelper.getPicker(activity, JSON_MIME_TYPE))
         } catch (aex: ActivityNotFoundException) {
-            Log.w(TAG, "Unable to launch file-picker", aex)
+            Log.w(TAG, "Unable to launch file picker", aex)
             NoFileManagerHelper.showActivityNotFoundAlert(context)
         }
     }
@@ -199,7 +199,7 @@ class SubscriptionFragment : BaseStateFragment<SubscriptionState>() {
                 StoredFileHelper.getNewPicker(activity, exportName, JSON_MIME_TYPE, null)
             )
         } catch (aex: ActivityNotFoundException) {
-            Log.w(TAG, "Unable to launch file-picker", aex)
+            Log.w(TAG, "Unable to launch file picker", aex)
             NoFileManagerHelper.showActivityNotFoundAlert(context)
         }
     }
diff --git a/app/src/main/java/org/schabi/newpipe/local/subscription/SubscriptionsImportFragment.java b/app/src/main/java/org/schabi/newpipe/local/subscription/SubscriptionsImportFragment.java
index 10816922b..112300f1f 100644
--- a/app/src/main/java/org/schabi/newpipe/local/subscription/SubscriptionsImportFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/local/subscription/SubscriptionsImportFragment.java
@@ -183,7 +183,7 @@ public class SubscriptionsImportFragment extends BaseFragment {
             // with different mime types and file extensions
             requestImportFileLauncher.launch(StoredFileHelper.getPicker(activity, "*/*"));
         } catch (final ActivityNotFoundException aex) {
-            Log.w(TAG, "Unable to launch file-picker", aex);
+            Log.w(TAG, "Unable to launch file picker", aex);
             NoFileManagerHelper.showActivityNotFoundAlert(getContext());
         }
     }
diff --git a/app/src/main/java/org/schabi/newpipe/settings/ContentSettingsFragment.java b/app/src/main/java/org/schabi/newpipe/settings/ContentSettingsFragment.java
index 3e72cf9a6..0a5e50be0 100644
--- a/app/src/main/java/org/schabi/newpipe/settings/ContentSettingsFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/settings/ContentSettingsFragment.java
@@ -80,7 +80,7 @@ public class ContentSettingsFragment extends BasePreferenceFragment {
                         StoredFileHelper.getPicker(requireContext(),
                                 ZIP_MIME_TYPE, getImportExportDataUri()));
             } catch (final ActivityNotFoundException aex) {
-                Log.w(TAG, "Unable to launch file-picker", aex);
+                Log.w(TAG, "Unable to launch file picker", aex);
                 NoFileManagerHelper.showActivityNotFoundAlert(getContext());
             }
             return true;
@@ -95,7 +95,7 @@ public class ContentSettingsFragment extends BasePreferenceFragment {
                                 "NewPipeData-" + exportDateFormat.format(new Date()) + ".zip",
                                 ZIP_MIME_TYPE, getImportExportDataUri()));
             } catch (final ActivityNotFoundException aex) {
-                Log.w(TAG, "Unable to launch file-picker", aex);
+                Log.w(TAG, "Unable to launch file picker", aex);
                 NoFileManagerHelper.showActivityNotFoundAlert(getContext());
             }
             return true;
diff --git a/app/src/main/java/org/schabi/newpipe/settings/DownloadSettingsFragment.java b/app/src/main/java/org/schabi/newpipe/settings/DownloadSettingsFragment.java
index b083cc71d..45006bec4 100644
--- a/app/src/main/java/org/schabi/newpipe/settings/DownloadSettingsFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/settings/DownloadSettingsFragment.java
@@ -219,7 +219,7 @@ public class DownloadSettingsFragment extends BasePreferenceFragment {
         try {
             launcher.launch(StoredDirectoryHelper.getPicker(ctx));
         } catch (final ActivityNotFoundException aex) {
-            Log.w(TAG, "Unable to launch directory-picker", aex);
+            Log.w(TAG, "Unable to launch directory picker", aex);
             NoFileManagerHelper.showActivityNotFoundAlert(getContext());
         }
     }
diff --git a/app/src/main/java/us/shandian/giga/ui/fragment/MissionsFragment.java b/app/src/main/java/us/shandian/giga/ui/fragment/MissionsFragment.java
index 5aa3d2a53..e08cc4dec 100644
--- a/app/src/main/java/us/shandian/giga/ui/fragment/MissionsFragment.java
+++ b/app/src/main/java/us/shandian/giga/ui/fragment/MissionsFragment.java
@@ -266,7 +266,7 @@ public class MissionsFragment extends Fragment {
                     StoredFileHelper.getNewPicker(mContext, mission.storage.getName(),
                             mission.storage.getType(), initialPath));
         } catch (final ActivityNotFoundException aex) {
-            Log.w(TAG, "Unable to launch file-picker", aex);
+            Log.w(TAG, "Unable to launch file picker", aex);
             NoFileManagerHelper.showActivityNotFoundAlert(getContext());
         }
     }
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 112f1a94c..a8d308cd9 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -671,7 +671,7 @@
     <string name="recent">Recent</string>
     <string name="chapters">Chapters</string>
     <string name="no_app_to_open_intent">No app on your device can open this</string>
-    <string name="no_appropriate_file_manager_message">No appropriate file-manager was found for this action.\nPlease install a file-manager or try to enable/disable \'%s\' in the download-settings.</string>
+    <string name="no_appropriate_file_manager_message">No appropriate file manager was found for this action.\nPlease install a file manager or try to enable/disable \'%s\' in the download settings.</string>
     <string name="georestricted_content">This content is not available in your country.</string>
     <string name="soundcloud_go_plus_content">This is a SoundCloud Go+ track, at least in your country, so it cannot be streamed or downloaded by NewPipe.</string>
     <string name="private_content">This content is private, so it cannot be streamed or downloaded by NewPipe.</string>