diff --git a/app/src/main/res/layout-land/welcome_final.xml b/app/src/main/res/layout-land/welcome_final.xml
index e6277bf49..62d2a9e00 100644
--- a/app/src/main/res/layout-land/welcome_final.xml
+++ b/app/src/main/res/layout-land/welcome_final.xml
@@ -41,8 +41,7 @@
                 android:textStyle="bold"
                 android:textAlignment="center"
                 android:gravity="center_horizontal"
-                android:textColor="@android:color/white"
-                android:singleLine="false"/>
+                android:textColor="@android:color/white"/>
 
         <Button
                 android:layout_width="120dp"
diff --git a/app/src/main/res/layout/fragment_categorization.xml b/app/src/main/res/layout/fragment_categorization.xml
index 7328ed8f4..35a71fb7a 100644
--- a/app/src/main/res/layout/fragment_categorization.xml
+++ b/app/src/main/res/layout/fragment_categorization.xml
@@ -22,7 +22,7 @@
             android:layout_height="wrap_content"
             android:layout_width="match_parent"
             android:hint="@string/categories_search_text_hint"
-            android:singleLine="true"
+            android:maxLines="1"
             android:imeOptions="flagNoExtractUi"
             />
 
diff --git a/app/src/main/res/layout/fragment_media_detail.xml b/app/src/main/res/layout/fragment_media_detail.xml
index a311fb3c2..557c571a3 100644
--- a/app/src/main/res/layout/fragment_media_detail.xml
+++ b/app/src/main/res/layout/fragment_media_detail.xml
@@ -73,7 +73,7 @@
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:textColor="@android:color/white"
-                        android:text="Title"
+                        android:text="@string/media_detail_title"
                         android:textSize="16sp"
                         android:textStyle="bold"
                         android:paddingBottom="6dp"
@@ -81,7 +81,7 @@
                     <TextView
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:text="Title of the media"
+                        android:text="@string/media_detail_media_title"
                         android:id="@+id/mediaDetailTitle"
                         android:layout_gravity="left|start"
                         android:textColor="@android:color/white"
@@ -106,7 +106,7 @@
                     <TextView
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:text="Description"
+                        android:text="@string/media_detail_description"
                         android:textColor="@android:color/white"
                         android:textSize="16sp"
                         android:textStyle="bold"
@@ -115,7 +115,7 @@
                     <TextView
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:text="Description of the media goes here. This can potentially be fairly long, and will need to wrap across multiple lines. We hope it looks nice though."
+                        android:text="@string/media_detail_description_explanation"
                         android:background="#20ffffff"
                         android:id="@+id/mediaDetailDesc"
                         android:textColor="@android:color/white"
diff --git a/app/src/main/res/layout/fragment_single_upload.xml b/app/src/main/res/layout/fragment_single_upload.xml
index 6fc61bca0..d59292b29 100644
--- a/app/src/main/res/layout/fragment_single_upload.xml
+++ b/app/src/main/res/layout/fragment_single_upload.xml
@@ -18,7 +18,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:scrollHorizontally="false"
-        android:singleLine="true"
+        android:maxLines="1"
         android:hint="@string/share_title_hint"
         android:imeOptions="flagNoExtractUi"
         />
diff --git a/app/src/main/res/layout/welcome_final.xml b/app/src/main/res/layout/welcome_final.xml
index 96a604e72..cdf5d8e7a 100644
--- a/app/src/main/res/layout/welcome_final.xml
+++ b/app/src/main/res/layout/welcome_final.xml
@@ -44,7 +44,6 @@
         android:textAlignment="center"
         android:gravity="center_horizontal"
         android:textColor="@android:color/white"
-        android:singleLine="false"
         />
 
     <Button
diff --git a/app/src/main/res/values-frr/strings.xml b/app/src/main/res/values-frr/strings.xml
index 4757e7461..a5de8cd80 100644
--- a/app/src/main/res/values-frr/strings.xml
+++ b/app/src/main/res/values-frr/strings.xml
@@ -82,7 +82,7 @@ Wikimedia Commons an det Wikimedia-Commons-Logo san markintiaken faan\'t Wikimed
   <string name="no_uploads_yet">Dü heest noch nian bilen huuchschüürd.</string>
   <string name="menu_retry_upload">Noch ans ferschük</string>
   <string name="menu_cancel_upload">Ufbreeg</string>
-  <string name="share_license_summary">Detdiar bil feit det lisens %$1 .</string>
+  <string name="share_license_summary">Detdiar bil feit det lisens %1$s</string>
   <string name="menu_download">Deelloose</string>
   <string name="preference_license">Lisens</string>
   <string name="use_previous">Ual tiitel/beskriiwang brük</string>
diff --git a/app/src/main/res/values-haw/strings.xml b/app/src/main/res/values-haw/strings.xml
index c60ad7c72..d8d295356 100644
--- a/app/src/main/res/values-haw/strings.xml
+++ b/app/src/main/res/values-haw/strings.xml
@@ -14,7 +14,7 @@
   <string name="upload_completed_notification_title">Ua hoʻouka ʻia ʻo %1$s</string>
   <string name="upload_completed_notification_text">Kīkē no ka ʻike ʻana o kāu hoʻouka</string>
   <string name="upload_progress_notification_title_start">Hoʻomaka nei i ka hoʻouka ʻana o %1$s</string>
-  <string name="upload_progress_notification_title_in_progress">Hoʻouka nei ʻo</string>
+  <string name="upload_progress_notification_title_in_progress">Hoʻouka nei ʻo %1$s</string>
   <string name="upload_progress_notification_title_finishing">Hele a pau ka hoʻouka ʻana o %1$s</string>
   <string name="upload_failed_notification_title">Ua hāʻule ʻo %1$s i ka hoʻouka ʻana</string>
   <string name="upload_failed_notification_subtitle">Kīkē no ka ʻike ʻana</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 5f064d7f2..e1c748024 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -154,4 +154,8 @@ Tap this message (or hit back) to skip this step.</string>
   <string name="file_exists">This file already exists on Commons. Are you sure you want to proceed?</string>
   <string name="yes">Yes</string>
   <string name="no">No</string>
+  <string name="media_detail_title">Title</string>
+  <string name="media_detail_media_title">Title of the media</string>
+  <string name="media_detail_description">Description</string>
+  <string name="media_detail_description_explanation">Description of the media goes here. This can potentially be fairly long, and will need to wrap across multiple lines. We hope it looks nice though.</string>
 </resources>