diff --git a/app/src/main/res/layout/dialog_select_language.xml b/app/src/main/res/layout/dialog_select_language.xml
index b63d3ceac..6fa70dcdb 100644
--- a/app/src/main/res/layout/dialog_select_language.xml
+++ b/app/src/main/res/layout/dialog_select_language.xml
@@ -12,7 +12,7 @@
     android:layout_marginStart="8dp"
     android:layout_marginTop="8dp"
     android:layout_marginEnd="8dp"
-    android:hint="Type Language Name"
+    android:hint="@string/language_search_type_language_name"
     android:padding="12dp"
     app:layout_constraintEnd_toEndOf="parent"
     app:layout_constraintStart_toStartOf="parent"
@@ -22,7 +22,7 @@
     android:id="@+id/recent_searches"
     android:layout_width="0dp"
     android:layout_height="wrap_content"
-    android:text="Recent Searches"
+    android:text="@string/language_search_recent_searches"
     app:layout_constraintTop_toBottomOf="@id/search_language"
     app:layout_constraintEnd_toEndOf="@+id/language_history_list"
     android:layout_marginEnd="8dp"
@@ -55,7 +55,7 @@
     android:id="@+id/all_languages"
     android:layout_width="0dp"
     android:layout_height="wrap_content"
-    android:text="All Languages"
+    android:text="@string/language_search_all_languages"
     app:layout_constraintTop_toBottomOf="@id/separator"
     app:layout_constraintEnd_toEndOf="@+id/language_history_list"
     android:layout_margin="8dp"
diff --git a/app/src/main/res/values-qq/strings.xml b/app/src/main/res/values-qq/strings.xml
index 09d73b6fb..7cd68db41 100644
--- a/app/src/main/res/values-qq/strings.xml
+++ b/app/src/main/res/values-qq/strings.xml
@@ -97,6 +97,9 @@
   <string name="no_uploads_yet">Message shown on contribution list during non-first sync if no uploads present.</string>
   <string name="menu_retry_upload">Menu item text prompting user to retry a failed upload.\n{{Identical|Retry}}</string>
   <string name="menu_cancel_upload">Menu item text prompting user to cancel and delete a failed upload.\n{{Identical|Cancel}}</string>
+  <string name="language_search_type_language_name">Placeholder text in the top search box in the language search dialog.</string>
+  <string name="language_search_recent_searches">A title in the language search dialog.</string>
+  <string name="language_search_all_languages">A title in the language search dialog.</string>
   <string name="menu_download">Menu item text prompting user to download a selected photo or media file locally.\n{{Identical|Download}}</string>
   <string name="preference_license">{{Identical|License}}</string>
   <string name="use_previous">This is a button text. Concise wording is preferred (e.g. \"&amp;\" instead of \"and\"), where possible. It should ideally be rendered in one line, even on small devices.</string>
@@ -151,6 +154,7 @@
   <string name="navigation_item_notification">{{Identical|Notification}}</string>
   <string name="navigation_item_review">{{Identical|Review}}</string>
   <string name="upload_connection_error_alert_title">{{Identical/Connection Error}}</string>
+  <string name="preferences_uploads">A section title in preferences.</string>
   <string name="nominated_see_more">&lt;u&gt;See webpage for details&lt;/u&gt;</string>
   <string name="skip_login">{{Identical|Skip}}</string>
   <string name="navigation_item_login">{{Identical|Log in}}</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 6447f552a..4f22abaf7 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -150,6 +150,9 @@
   <string name="no_uploads_yet">You have not yet uploaded any photos.</string>
   <string name="menu_retry_upload">Retry</string>
   <string name="menu_cancel_upload">Cancel</string>
+  <string name="language_search_type_language_name">Type Language Name</string>
+  <string name="language_search_recent_searches">Recent Searches</string>
+  <string name="language_search_all_languages">All Languages</string>
   <string name="media_upload_policy">By submitting this picture, I declare that this is my own work, that it does not contain copyrighted material or selfies, and otherwise adheres to &lt;a href=\"https://commons.wikimedia.org/wiki/Commons:Policies_and_guidelines\"&gt;Wikimedia Commons policies&lt;/a&gt;.</string>
   <string name="menu_download">Download</string>
   <string name="preference_license">Default License</string>
@@ -266,6 +269,7 @@
 
   <string name="upload_problem_image">Problems found in image</string>
   <string name="internet_downloaded">Please only upload pictures that you have taken by yourself. Don\'t upload pictures that you have downloaded from the Internet.</string>
+  <string name="preferences_uploads">Uploads</string>
   <string name="use_external_storage">Save In-app shots</string>
   <string name="use_external_storage_summary">Save pictures taken with the in-app camera to your device storage</string>
   <string name="login_to_your_account">Log in to your account</string>
@@ -461,6 +465,8 @@ Upload your first media by tapping on the add button.</string>
   <string name="ends_on">Ends on:</string>
   <string name="display_campaigns">Display campaigns</string>
   <string name="display_campaigns_explanation">See the ongoing campaigns</string>
+  <string name="show_deletion_button">Show deletion button</string>
+  <string name="show_deletion_button_explanation">Enable the \"Delete Folder\" button in the custom picker</string>
   <string name="in_app_camera_location_access_explanation">Allow the app to fetch location in case the camera does not record it. Some device cameras do not record location. In such cases, letting the app fetch and attach location to it makes your contribution more useful. You may change this any time from the Settings</string>
   <string name="option_allow">Allow</string>
   <string name="option_dismiss">Dismiss</string>
diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
index fb3cb0ca1..3b7604026 100644
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -55,13 +55,13 @@
           android:defaultValue="false"
           android:key="displayDeletionButton"
           app:singleLineTitle="false"
-          android:summary="Enable the &quot;Delete folder&quot; button in the custom picker"
-          android:title="Show Deletion Button" />
+          android:summary="@string/show_deletion_button_explanation"
+          android:title="@string/show_deletion_button" />
 
     </PreferenceCategory>
 
     <PreferenceCategory
-        android:title="Uploads">
+        android:title="@string/preferences_uploads">
 
         <SwitchPreference