diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 55c4004f0..1b5642bd3 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -419,6 +419,9 @@ Einige Anbieter fügen zusätzliche Informationen beim Eingang der Nachricht hin
     <string name="qrshow_join_verified_group_hint">Scannen Sie dies, um der verifizierten Gruppe beizutreten. \"%1$s\".</string>
     <string name="qrshow_join_verified_group_title">QR Einladungscode</string>
     <string name="qrshow_join_contact_title">QR Verifizierungscode</string>
+    <string name="qrshow_join_contact_hint">Scannen, um einen Kontakt mit \"%1$s\" herzustellen.</string>
+
+
     <!-- notifications  -->
     <string name="notify_n_messages_in_m_chats">%1$d neue Nachrichten in %2$d Chats</string>
     <string name="notify_most_recent_from">Letzter Stand von: %1$s</string>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 1c0bee156..aebc7005c 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -355,6 +355,12 @@
     <string name="pref_managekeys_secret_keys_exported_to_x">Secret keys written successfully to \"%1$s\".</string>
     <string name="pref_managekeys_secret_keys_imported_from_x">Secret keys imported from \"%1$s\".</string>
     <string name="pref_background">Chat-Background</string>
+    <string name="pref_imap_folder_handling">IMAP folder handling</string>
+    <string name="pref_watch_inbox_folder">Watch Inbox folder</string>
+    <string name="pref_watch_sent_folder">Watch Sent folder</string>
+    <string name="pref_watch_mvbox_folder">Watch DeltaChat folder</string>
+    <string name="pref_auto_folder_moves">Automatic Moves to DeltaChat folder</string>
+    <string name="pref_auto_folder_moves_explain">Chat conversations are moved to avoid cluttering the Inbox folder</string>
 
 
     <!-- autocrypt -->
diff --git a/res/xml/preferences_advanced.xml b/res/xml/preferences_advanced.xml
index 68ce9c234..8ce47fced 100644
--- a/res/xml/preferences_advanced.xml
+++ b/res/xml/preferences_advanced.xml
@@ -15,28 +15,28 @@
     <PreferenceCategory android:layout="@layout/preference_divider_explain_autocrypt"/>
 
 
-    <PreferenceCategory android:title="IMAP folder handling"> <!-- TRANSLATION_NEEDED -->
+    <PreferenceCategory android:title="@string/pref_imap_folder_handling">
 
         <org.thoughtcrime.securesms.components.SwitchPreferenceCompat
             android:defaultValue="true"
             android:key="pref_inbox_watch"
-            android:title="Watch Inbox folder"/> <!-- TRANSLATION_NEEDED -->
+            android:title="@string/pref_watch_inbox_folder"/>
 
         <org.thoughtcrime.securesms.components.SwitchPreferenceCompat
             android:defaultValue="true"
             android:key="pref_sentbox_watch"
-            android:title="Watch Sent folder"/> <!-- TRANSLATION_NEEDED -->
+            android:title="@string/pref_watch_sent_folder"/>
 
         <org.thoughtcrime.securesms.components.SwitchPreferenceCompat
             android:defaultValue="true"
             android:key="pref_mvbox_watch"
-            android:title="Watch DeltaChat folder"/> <!-- TRANSLATION_NEEDED -->
+            android:title="@string/pref_watch_mvbox_folder"/>
 
         <org.thoughtcrime.securesms.components.SwitchPreferenceCompat
             android:defaultValue="true"
             android:key="pref_mvbox_move"
-            android:title="Automatic Moves to DeltaChat folder"
-            android:summary="Chat conversations are moved to avoid cluttering the Inbox folder"/> <!-- TRANSLATION_NEEDED -->
+            android:title="@string/pref_auto_folder_moves"
+            android:summary="@string/pref_auto_folder_moves_explain"/>
 
     </PreferenceCategory>
     <PreferenceCategory android:layout="@layout/preference_divider" />