From 1cc63476b6b3b21b4acaf70ea67948173645a10e Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Tue, 4 Sep 2018 14:18:55 +0000
Subject: [PATCH] Added conversation to legend

---
 app/src/main/res/layout/fragment_legend.xml | 22 ++++++++++++++++++++-
 app/src/main/res/values-af/strings.xml      |  5 +++--
 app/src/main/res/values-ar-rBH/strings.xml  |  5 +++--
 app/src/main/res/values-ar-rEG/strings.xml  |  5 +++--
 app/src/main/res/values-ar-rSA/strings.xml  |  5 +++--
 app/src/main/res/values-ar-rYE/strings.xml  |  5 +++--
 app/src/main/res/values-ar/strings.xml      |  5 +++--
 app/src/main/res/values-ca/strings.xml      |  5 +++--
 app/src/main/res/values-cs/strings.xml      |  5 +++--
 app/src/main/res/values-da/strings.xml      |  5 +++--
 app/src/main/res/values-de/strings.xml      |  5 +++--
 app/src/main/res/values-el/strings.xml      |  5 +++--
 app/src/main/res/values-en/strings.xml      |  5 +++--
 app/src/main/res/values-es-rES/strings.xml  |  5 +++--
 app/src/main/res/values-fi/strings.xml      |  5 +++--
 app/src/main/res/values-fr/strings.xml      | 17 ++++++++--------
 app/src/main/res/values-he/strings.xml      |  5 +++--
 app/src/main/res/values-hu/strings.xml      |  5 +++--
 app/src/main/res/values-it/strings.xml      |  5 +++--
 app/src/main/res/values-iw/strings.xml      |  5 +++--
 app/src/main/res/values-ja/strings.xml      |  5 +++--
 app/src/main/res/values-ko/strings.xml      |  5 +++--
 app/src/main/res/values-nb/strings.xml      |  5 +++--
 app/src/main/res/values-nl/strings.xml      |  5 +++--
 app/src/main/res/values-no/strings.xml      |  5 +++--
 app/src/main/res/values-pl/strings.xml      |  5 +++--
 app/src/main/res/values-pt-rBR/strings.xml  |  5 +++--
 app/src/main/res/values-pt-rPT/strings.xml  |  5 +++--
 app/src/main/res/values-ro/strings.xml      |  5 +++--
 app/src/main/res/values-ru/strings.xml      |  5 +++--
 app/src/main/res/values-sr/strings.xml      |  5 +++--
 app/src/main/res/values-sv-rSE/strings.xml  |  5 +++--
 app/src/main/res/values-tr/strings.xml      |  5 +++--
 app/src/main/res/values-uk/strings.xml      |  5 +++--
 app/src/main/res/values-vi/strings.xml      |  5 +++--
 app/src/main/res/values-zh-rCN/strings.xml  |  5 +++--
 app/src/main/res/values-zh-rTW/strings.xml  |  5 +++--
 app/src/main/res/values/strings.xml         |  5 +++--
 38 files changed, 138 insertions(+), 81 deletions(-)

diff --git a/app/src/main/res/layout/fragment_legend.xml b/app/src/main/res/layout/fragment_legend.xml
index 94cd0f20c8..98db4f7431 100644
--- a/app/src/main/res/layout/fragment_legend.xml
+++ b/app/src/main/res/layout/fragment_legend.xml
@@ -48,6 +48,26 @@
             app:layout_constraintStart_toEndOf="@id/ivAttachment"
             app:layout_constraintTop_toTopOf="@id/ivAttachment" />
 
+        <ImageView
+            android:id="@+id/ivThread"
+            android:layout_width="24dp"
+            android:layout_height="24dp"
+            android:layout_marginTop="12dp"
+            android:src="@drawable/baseline_message_24"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/ivAttachment" />
+
+        <TextView
+            android:id="@+id/tvThread"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="18dp"
+            android:text="@string/title_legend_thread"
+            android:textAppearance="@style/TextAppearance.AppCompat.Medium"
+            app:layout_constraintBottom_toBottomOf="@id/ivThread"
+            app:layout_constraintStart_toEndOf="@id/ivThread"
+            app:layout_constraintTop_toTopOf="@id/ivThread" />
+
         <ImageView
             android:id="@+id/ivSynchronize"
             android:layout_width="24dp"
@@ -55,7 +75,7 @@
             android:layout_marginTop="12dp"
             android:src="@drawable/baseline_sync_24"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/ivAttachment" />
+            app:layout_constraintTop_toBottomOf="@id/ivThread" />
 
         <TextView
             android:id="@+id/tvSynchronize"
diff --git a/app/src/main/res/values-af/strings.xml b/app/src/main/res/values-af/strings.xml
index a92f7a9f21..c2cc87ef0f 100644
--- a/app/src/main/res/values-af/strings.xml
+++ b/app/src/main/res/values-af/strings.xml
@@ -106,14 +106,14 @@
   <string name="title_folder_sent">Sent</string>
   <string name="title_folder_user">User</string>
   <string name="title_folder_primary">Folders primary account</string>
-  <string name="title_folder_thread">Message thread</string>
+  <string name="title_folder_thread">Conversation</string>
   <string name="title_no_messages">No messages</string>
   <string name="title_link">link</string>
   <string name="title_image">image</string>
   <string name="title_show_images">Show images</string>
   <string name="title_subject_reply">Re: %1$s</string>
   <string name="title_subject_forward">Fwd: %1$s</string>
-  <string name="title_thread">Show thread</string>
+  <string name="title_thread">Show conversation</string>
   <string name="title_seen">Mark read</string>
   <string name="title_unseen">Mark unread</string>
   <string name="title_forward">Forward</string>
@@ -160,6 +160,7 @@
   <string name="title_answer_text">Answer text</string>
   <string name="title_legend_cc">CC/BCC</string>
   <string name="title_legend_attachment">Attachment</string>
+  <string name="title_legend_thread">Conversation</string>
   <string name="title_legend_synchronize">Synchronize</string>
   <string name="title_legend_primary">Primary</string>
   <string name="title_legend_disconnected">Disconnected</string>
diff --git a/app/src/main/res/values-ar-rBH/strings.xml b/app/src/main/res/values-ar-rBH/strings.xml
index c62a4039f9..065208977c 100644
--- a/app/src/main/res/values-ar-rBH/strings.xml
+++ b/app/src/main/res/values-ar-rBH/strings.xml
@@ -122,14 +122,14 @@
   <string name="title_folder_sent">Sent</string>
   <string name="title_folder_user">User</string>
   <string name="title_folder_primary">Folders primary account</string>
-  <string name="title_folder_thread">Message thread</string>
+  <string name="title_folder_thread">Conversation</string>
   <string name="title_no_messages">No messages</string>
   <string name="title_link">link</string>
   <string name="title_image">image</string>
   <string name="title_show_images">Show images</string>
   <string name="title_subject_reply">Re: %1$s</string>
   <string name="title_subject_forward">Fwd: %1$s</string>
-  <string name="title_thread">Show thread</string>
+  <string name="title_thread">Show conversation</string>
   <string name="title_seen">Mark read</string>
   <string name="title_unseen">Mark unread</string>
   <string name="title_forward">Forward</string>
@@ -176,6 +176,7 @@
   <string name="title_answer_text">Answer text</string>
   <string name="title_legend_cc">CC/BCC</string>
   <string name="title_legend_attachment">Attachment</string>
+  <string name="title_legend_thread">Conversation</string>
   <string name="title_legend_synchronize">Synchronize</string>
   <string name="title_legend_primary">Primary</string>
   <string name="title_legend_disconnected">Disconnected</string>
diff --git a/app/src/main/res/values-ar-rEG/strings.xml b/app/src/main/res/values-ar-rEG/strings.xml
index c62a4039f9..065208977c 100644
--- a/app/src/main/res/values-ar-rEG/strings.xml
+++ b/app/src/main/res/values-ar-rEG/strings.xml
@@ -122,14 +122,14 @@
   <string name="title_folder_sent">Sent</string>
   <string name="title_folder_user">User</string>
   <string name="title_folder_primary">Folders primary account</string>
-  <string name="title_folder_thread">Message thread</string>
+  <string name="title_folder_thread">Conversation</string>
   <string name="title_no_messages">No messages</string>
   <string name="title_link">link</string>
   <string name="title_image">image</string>
   <string name="title_show_images">Show images</string>
   <string name="title_subject_reply">Re: %1$s</string>
   <string name="title_subject_forward">Fwd: %1$s</string>
-  <string name="title_thread">Show thread</string>
+  <string name="title_thread">Show conversation</string>
   <string name="title_seen">Mark read</string>
   <string name="title_unseen">Mark unread</string>
   <string name="title_forward">Forward</string>
@@ -176,6 +176,7 @@
   <string name="title_answer_text">Answer text</string>
   <string name="title_legend_cc">CC/BCC</string>
   <string name="title_legend_attachment">Attachment</string>
+  <string name="title_legend_thread">Conversation</string>
   <string name="title_legend_synchronize">Synchronize</string>
   <string name="title_legend_primary">Primary</string>
   <string name="title_legend_disconnected">Disconnected</string>
diff --git a/app/src/main/res/values-ar-rSA/strings.xml b/app/src/main/res/values-ar-rSA/strings.xml
index c62a4039f9..065208977c 100644
--- a/app/src/main/res/values-ar-rSA/strings.xml
+++ b/app/src/main/res/values-ar-rSA/strings.xml
@@ -122,14 +122,14 @@
   <string name="title_folder_sent">Sent</string>
   <string name="title_folder_user">User</string>
   <string name="title_folder_primary">Folders primary account</string>
-  <string name="title_folder_thread">Message thread</string>
+  <string name="title_folder_thread">Conversation</string>
   <string name="title_no_messages">No messages</string>
   <string name="title_link">link</string>
   <string name="title_image">image</string>
   <string name="title_show_images">Show images</string>
   <string name="title_subject_reply">Re: %1$s</string>
   <string name="title_subject_forward">Fwd: %1$s</string>
-  <string name="title_thread">Show thread</string>
+  <string name="title_thread">Show conversation</string>
   <string name="title_seen">Mark read</string>
   <string name="title_unseen">Mark unread</string>
   <string name="title_forward">Forward</string>
@@ -176,6 +176,7 @@
   <string name="title_answer_text">Answer text</string>
   <string name="title_legend_cc">CC/BCC</string>
   <string name="title_legend_attachment">Attachment</string>
+  <string name="title_legend_thread">Conversation</string>
   <string name="title_legend_synchronize">Synchronize</string>
   <string name="title_legend_primary">Primary</string>
   <string name="title_legend_disconnected">Disconnected</string>
diff --git a/app/src/main/res/values-ar-rYE/strings.xml b/app/src/main/res/values-ar-rYE/strings.xml
index c62a4039f9..065208977c 100644
--- a/app/src/main/res/values-ar-rYE/strings.xml
+++ b/app/src/main/res/values-ar-rYE/strings.xml
@@ -122,14 +122,14 @@
   <string name="title_folder_sent">Sent</string>
   <string name="title_folder_user">User</string>
   <string name="title_folder_primary">Folders primary account</string>
-  <string name="title_folder_thread">Message thread</string>
+  <string name="title_folder_thread">Conversation</string>
   <string name="title_no_messages">No messages</string>
   <string name="title_link">link</string>
   <string name="title_image">image</string>
   <string name="title_show_images">Show images</string>
   <string name="title_subject_reply">Re: %1$s</string>
   <string name="title_subject_forward">Fwd: %1$s</string>
-  <string name="title_thread">Show thread</string>
+  <string name="title_thread">Show conversation</string>
   <string name="title_seen">Mark read</string>
   <string name="title_unseen">Mark unread</string>
   <string name="title_forward">Forward</string>
@@ -176,6 +176,7 @@
   <string name="title_answer_text">Answer text</string>
   <string name="title_legend_cc">CC/BCC</string>
   <string name="title_legend_attachment">Attachment</string>
+  <string name="title_legend_thread">Conversation</string>
   <string name="title_legend_synchronize">Synchronize</string>
   <string name="title_legend_primary">Primary</string>
   <string name="title_legend_disconnected">Disconnected</string>
diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index c62a4039f9..065208977c 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -122,14 +122,14 @@
   <string name="title_folder_sent">Sent</string>
   <string name="title_folder_user">User</string>
   <string name="title_folder_primary">Folders primary account</string>
-  <string name="title_folder_thread">Message thread</string>
+  <string name="title_folder_thread">Conversation</string>
   <string name="title_no_messages">No messages</string>
   <string name="title_link">link</string>
   <string name="title_image">image</string>
   <string name="title_show_images">Show images</string>
   <string name="title_subject_reply">Re: %1$s</string>
   <string name="title_subject_forward">Fwd: %1$s</string>
-  <string name="title_thread">Show thread</string>
+  <string name="title_thread">Show conversation</string>
   <string name="title_seen">Mark read</string>
   <string name="title_unseen">Mark unread</string>
   <string name="title_forward">Forward</string>
@@ -176,6 +176,7 @@
   <string name="title_answer_text">Answer text</string>
   <string name="title_legend_cc">CC/BCC</string>
   <string name="title_legend_attachment">Attachment</string>
+  <string name="title_legend_thread">Conversation</string>
   <string name="title_legend_synchronize">Synchronize</string>
   <string name="title_legend_primary">Primary</string>
   <string name="title_legend_disconnected">Disconnected</string>
diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml
index a92f7a9f21..c2cc87ef0f 100644
--- a/app/src/main/res/values-ca/strings.xml
+++ b/app/src/main/res/values-ca/strings.xml
@@ -106,14 +106,14 @@
   <string name="title_folder_sent">Sent</string>
   <string name="title_folder_user">User</string>
   <string name="title_folder_primary">Folders primary account</string>
-  <string name="title_folder_thread">Message thread</string>
+  <string name="title_folder_thread">Conversation</string>
   <string name="title_no_messages">No messages</string>
   <string name="title_link">link</string>
   <string name="title_image">image</string>
   <string name="title_show_images">Show images</string>
   <string name="title_subject_reply">Re: %1$s</string>
   <string name="title_subject_forward">Fwd: %1$s</string>
-  <string name="title_thread">Show thread</string>
+  <string name="title_thread">Show conversation</string>
   <string name="title_seen">Mark read</string>
   <string name="title_unseen">Mark unread</string>
   <string name="title_forward">Forward</string>
@@ -160,6 +160,7 @@
   <string name="title_answer_text">Answer text</string>
   <string name="title_legend_cc">CC/BCC</string>
   <string name="title_legend_attachment">Attachment</string>
+  <string name="title_legend_thread">Conversation</string>
   <string name="title_legend_synchronize">Synchronize</string>
   <string name="title_legend_primary">Primary</string>
   <string name="title_legend_disconnected">Disconnected</string>
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index 9d6a0c5882..27d684f971 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -114,14 +114,14 @@
   <string name="title_folder_sent">Sent</string>
   <string name="title_folder_user">User</string>
   <string name="title_folder_primary">Folders primary account</string>
-  <string name="title_folder_thread">Message thread</string>
+  <string name="title_folder_thread">Conversation</string>
   <string name="title_no_messages">No messages</string>
   <string name="title_link">link</string>
   <string name="title_image">image</string>
   <string name="title_show_images">Show images</string>
   <string name="title_subject_reply">Re: %1$s</string>
   <string name="title_subject_forward">Fwd: %1$s</string>
-  <string name="title_thread">Show thread</string>
+  <string name="title_thread">Show conversation</string>
   <string name="title_seen">Mark read</string>
   <string name="title_unseen">Mark unread</string>
   <string name="title_forward">Forward</string>
@@ -168,6 +168,7 @@
   <string name="title_answer_text">Answer text</string>
   <string name="title_legend_cc">CC/BCC</string>
   <string name="title_legend_attachment">Attachment</string>
+  <string name="title_legend_thread">Conversation</string>
   <string name="title_legend_synchronize">Synchronize</string>
   <string name="title_legend_primary">Primary</string>
   <string name="title_legend_disconnected">Disconnected</string>
diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml
index 4b217c60b3..bde4406cb4 100644
--- a/app/src/main/res/values-da/strings.xml
+++ b/app/src/main/res/values-da/strings.xml
@@ -106,14 +106,14 @@
   <string name="title_folder_sent">Sendt</string>
   <string name="title_folder_user">Bruger</string>
   <string name="title_folder_primary">Mapper primærkonto</string>
-  <string name="title_folder_thread">Meddelelsestråd</string>
+  <string name="title_folder_thread">Conversation</string>
   <string name="title_no_messages">Ingen beskeder</string>
   <string name="title_link">link</string>
   <string name="title_image">billede</string>
   <string name="title_show_images">Vis billeder</string>
   <string name="title_subject_reply">Sv: %1$s</string>
   <string name="title_subject_forward">Videresend: %1$s</string>
-  <string name="title_thread">Vis tråd</string>
+  <string name="title_thread">Show conversation</string>
   <string name="title_seen">Markér som læst</string>
   <string name="title_unseen">Markér som ulæst</string>
   <string name="title_forward">Videresend</string>
@@ -160,6 +160,7 @@
   <string name="title_answer_text">Svartekst</string>
   <string name="title_legend_cc">CC/BCC</string>
   <string name="title_legend_attachment">Vedhæftning</string>
+  <string name="title_legend_thread">Conversation</string>
   <string name="title_legend_synchronize">Synkronisér</string>
   <string name="title_legend_primary">Primær</string>
   <string name="title_legend_disconnected">Afbrudt</string>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 779ffe0e08..7b66a040c1 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -106,14 +106,14 @@
   <string name="title_folder_sent">Gesendet</string>
   <string name="title_folder_user">Benutzer</string>
   <string name="title_folder_primary">Ordner primäres Konto</string>
-  <string name="title_folder_thread">Nachrichtenthread</string>
+  <string name="title_folder_thread">Conversation</string>
   <string name="title_no_messages">Keine E-Mails</string>
   <string name="title_link">Link</string>
   <string name="title_image">Bild</string>
   <string name="title_show_images">Bilder anzeigen</string>
   <string name="title_subject_reply">Re: %1$s</string>
   <string name="title_subject_forward">Fwd: %1$s</string>
-  <string name="title_thread">Thread anzeigen</string>
+  <string name="title_thread">Show conversation</string>
   <string name="title_seen">Als gelesen markieren</string>
   <string name="title_unseen">Als ungelesen markieren</string>
   <string name="title_forward">Weiterleiten</string>
@@ -160,6 +160,7 @@
   <string name="title_answer_text">Antworttext</string>
   <string name="title_legend_cc">CC/BCC</string>
   <string name="title_legend_attachment">Anhang</string>
+  <string name="title_legend_thread">Conversation</string>
   <string name="title_legend_synchronize">Synchronisieren</string>
   <string name="title_legend_primary">Primär</string>
   <string name="title_legend_disconnected">Keine Verbindung</string>
diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml
index a92f7a9f21..c2cc87ef0f 100644
--- a/app/src/main/res/values-el/strings.xml
+++ b/app/src/main/res/values-el/strings.xml
@@ -106,14 +106,14 @@
   <string name="title_folder_sent">Sent</string>
   <string name="title_folder_user">User</string>
   <string name="title_folder_primary">Folders primary account</string>
-  <string name="title_folder_thread">Message thread</string>
+  <string name="title_folder_thread">Conversation</string>
   <string name="title_no_messages">No messages</string>
   <string name="title_link">link</string>
   <string name="title_image">image</string>
   <string name="title_show_images">Show images</string>
   <string name="title_subject_reply">Re: %1$s</string>
   <string name="title_subject_forward">Fwd: %1$s</string>
-  <string name="title_thread">Show thread</string>
+  <string name="title_thread">Show conversation</string>
   <string name="title_seen">Mark read</string>
   <string name="title_unseen">Mark unread</string>
   <string name="title_forward">Forward</string>
@@ -160,6 +160,7 @@
   <string name="title_answer_text">Answer text</string>
   <string name="title_legend_cc">CC/BCC</string>
   <string name="title_legend_attachment">Attachment</string>
+  <string name="title_legend_thread">Conversation</string>
   <string name="title_legend_synchronize">Synchronize</string>
   <string name="title_legend_primary">Primary</string>
   <string name="title_legend_disconnected">Disconnected</string>
diff --git a/app/src/main/res/values-en/strings.xml b/app/src/main/res/values-en/strings.xml
index a92f7a9f21..c2cc87ef0f 100644
--- a/app/src/main/res/values-en/strings.xml
+++ b/app/src/main/res/values-en/strings.xml
@@ -106,14 +106,14 @@
   <string name="title_folder_sent">Sent</string>
   <string name="title_folder_user">User</string>
   <string name="title_folder_primary">Folders primary account</string>
-  <string name="title_folder_thread">Message thread</string>
+  <string name="title_folder_thread">Conversation</string>
   <string name="title_no_messages">No messages</string>
   <string name="title_link">link</string>
   <string name="title_image">image</string>
   <string name="title_show_images">Show images</string>
   <string name="title_subject_reply">Re: %1$s</string>
   <string name="title_subject_forward">Fwd: %1$s</string>
-  <string name="title_thread">Show thread</string>
+  <string name="title_thread">Show conversation</string>
   <string name="title_seen">Mark read</string>
   <string name="title_unseen">Mark unread</string>
   <string name="title_forward">Forward</string>
@@ -160,6 +160,7 @@
   <string name="title_answer_text">Answer text</string>
   <string name="title_legend_cc">CC/BCC</string>
   <string name="title_legend_attachment">Attachment</string>
+  <string name="title_legend_thread">Conversation</string>
   <string name="title_legend_synchronize">Synchronize</string>
   <string name="title_legend_primary">Primary</string>
   <string name="title_legend_disconnected">Disconnected</string>
diff --git a/app/src/main/res/values-es-rES/strings.xml b/app/src/main/res/values-es-rES/strings.xml
index a92f7a9f21..c2cc87ef0f 100644
--- a/app/src/main/res/values-es-rES/strings.xml
+++ b/app/src/main/res/values-es-rES/strings.xml
@@ -106,14 +106,14 @@
   <string name="title_folder_sent">Sent</string>
   <string name="title_folder_user">User</string>
   <string name="title_folder_primary">Folders primary account</string>
-  <string name="title_folder_thread">Message thread</string>
+  <string name="title_folder_thread">Conversation</string>
   <string name="title_no_messages">No messages</string>
   <string name="title_link">link</string>
   <string name="title_image">image</string>
   <string name="title_show_images">Show images</string>
   <string name="title_subject_reply">Re: %1$s</string>
   <string name="title_subject_forward">Fwd: %1$s</string>
-  <string name="title_thread">Show thread</string>
+  <string name="title_thread">Show conversation</string>
   <string name="title_seen">Mark read</string>
   <string name="title_unseen">Mark unread</string>
   <string name="title_forward">Forward</string>
@@ -160,6 +160,7 @@
   <string name="title_answer_text">Answer text</string>
   <string name="title_legend_cc">CC/BCC</string>
   <string name="title_legend_attachment">Attachment</string>
+  <string name="title_legend_thread">Conversation</string>
   <string name="title_legend_synchronize">Synchronize</string>
   <string name="title_legend_primary">Primary</string>
   <string name="title_legend_disconnected">Disconnected</string>
diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml
index a92f7a9f21..c2cc87ef0f 100644
--- a/app/src/main/res/values-fi/strings.xml
+++ b/app/src/main/res/values-fi/strings.xml
@@ -106,14 +106,14 @@
   <string name="title_folder_sent">Sent</string>
   <string name="title_folder_user">User</string>
   <string name="title_folder_primary">Folders primary account</string>
-  <string name="title_folder_thread">Message thread</string>
+  <string name="title_folder_thread">Conversation</string>
   <string name="title_no_messages">No messages</string>
   <string name="title_link">link</string>
   <string name="title_image">image</string>
   <string name="title_show_images">Show images</string>
   <string name="title_subject_reply">Re: %1$s</string>
   <string name="title_subject_forward">Fwd: %1$s</string>
-  <string name="title_thread">Show thread</string>
+  <string name="title_thread">Show conversation</string>
   <string name="title_seen">Mark read</string>
   <string name="title_unseen">Mark unread</string>
   <string name="title_forward">Forward</string>
@@ -160,6 +160,7 @@
   <string name="title_answer_text">Answer text</string>
   <string name="title_legend_cc">CC/BCC</string>
   <string name="title_legend_attachment">Attachment</string>
+  <string name="title_legend_thread">Conversation</string>
   <string name="title_legend_synchronize">Synchronize</string>
   <string name="title_legend_primary">Primary</string>
   <string name="title_legend_disconnected">Disconnected</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 8285ec3698..33834ba1a0 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -76,7 +76,7 @@
   <string name="title_authorize">Sélectionner un compte</string>
   <string name="title_instructions">Instructions</string>
   <string name="title_store_sent">Stocker les messages envoyés (à activer si nécessaire)</string>
-  <string name="title_interval">Keep-alive interval (minutes)</string>
+  <string name="title_interval">Intervalle de maintien de connexion (minutes)</string>
   <string name="title_synchronize_account">Synchroniser (recevoir des messages)</string>
   <string name="title_synchronize_identity">Synchroniser (envoyer des messages)</string>
   <string name="title_primary_account">Principal (compte par défaut)</string>
@@ -106,19 +106,19 @@
   <string name="title_folder_sent">Envoyés</string>
   <string name="title_folder_user">Utilisateur</string>
   <string name="title_folder_primary">Dossiers du compte principal</string>
-  <string name="title_folder_thread">Fil de discussion</string>
+  <string name="title_folder_thread">Conversation</string>
   <string name="title_no_messages">Aucun message</string>
   <string name="title_link">lien</string>
   <string name="title_image">image</string>
   <string name="title_show_images">Afficher les images</string>
   <string name="title_subject_reply">Re : %1$s</string>
   <string name="title_subject_forward">Tr : %1$s</string>
-  <string name="title_thread">Afficher le fil de discussion</string>
+  <string name="title_thread">Show conversation</string>
   <string name="title_seen">Marquer comme lu</string>
   <string name="title_unseen">Marquer comme non lu</string>
   <string name="title_forward">Transférer</string>
   <string name="title_reply_all">Répondre à tous</string>
-  <string name="title_show_html">Show original</string>
+  <string name="title_show_html">Afficher l\'original</string>
   <string name="title_trash">Corbeille</string>
   <string name="title_spam">Spam</string>
   <string name="title_move">Déplacer</string>
@@ -147,19 +147,20 @@
   <string name="title_decrypt">Déchiffrer</string>
   <string name="title_from_missing">Expéditeur manquant</string>
   <string name="title_to_missing">Destinataire manquant</string>
-  <string name="title_to_one">One recipient expected</string>
+  <string name="title_to_one">Un destinataire requis</string>
   <string name="title_attachments_missing">Pièces jointes en cours de chargement</string>
   <string name="title_draft_trashed">Brouillon supprimé</string>
   <string name="title_draft_saved">Brouillon enregistré</string>
   <string name="title_queued">Envoi du message</string>
   <string name="title_search">Rechercher</string>
-  <string name="title_search_hint">Search sender/subject/text</string>
+  <string name="title_search_hint">Rechercher expéditeur / objet / texte</string>
   <string name="title_searching">Recherche de \'%1$s\'</string>
   <string name="title_answer_reply">Réponse standard</string>
   <string name="title_answer_name">Nom de la réponse</string>
   <string name="title_answer_text">Texte de la réponse</string>
   <string name="title_legend_cc">Cc/Cci</string>
   <string name="title_legend_attachment">Pièce jointe</string>
+  <string name="title_legend_thread">Conversation</string>
   <string name="title_legend_synchronize">Synchroniser</string>
   <string name="title_legend_primary">Principal</string>
   <string name="title_legend_disconnected">Déconnecté</string>
@@ -167,7 +168,7 @@
   <string name="title_legend_connected">Connecté</string>
   <string name="title_legend_synchronizing">Synchronisation en cours</string>
   <string name="title_legend_closing">Fermeture en cours</string>
-  <string name="title_hint_actions">Swipe left to trash; swipe right to archive (if available); long press to mark read/unread</string>
+  <string name="title_hint_actions">Balayer vers la gauche pour supprimer ; balayer vers la droite pour archiver (si disponible) ; appuyer longtemps pour marquer lu/non lu</string>
   <string name="title_understood">Compris</string>
   <string name="title_pro_feature">Il s’agit d’une fonctionnalité Pro</string>
   <string name="title_pro_list">Liste des fonctionnalités Pro</string>
@@ -176,7 +177,7 @@
   <string name="title_pro_activated">Toutes les fonctionnalités Pro sont activées</string>
   <string name="title_pro_valid">Toutes les fonctionnalités Pro activées</string>
   <string name="title_pro_invalid">Réponse non valide</string>
-  <string name="title_log">Log</string>
+  <string name="title_log">Journal</string>
   <string name="title_debug_info">Information de débogage</string>
   <string name="title_debug_info_remark">Veuillez décrire le problème et indiquer l\'heure à laquelle il est survenu :</string>
 </resources>
diff --git a/app/src/main/res/values-he/strings.xml b/app/src/main/res/values-he/strings.xml
index bd745818dd..f90e9956b8 100644
--- a/app/src/main/res/values-he/strings.xml
+++ b/app/src/main/res/values-he/strings.xml
@@ -114,14 +114,14 @@
   <string name="title_folder_sent">Sent</string>
   <string name="title_folder_user">User</string>
   <string name="title_folder_primary">Folders primary account</string>
-  <string name="title_folder_thread">Message thread</string>
+  <string name="title_folder_thread">Conversation</string>
   <string name="title_no_messages">No messages</string>
   <string name="title_link">link</string>
   <string name="title_image">image</string>
   <string name="title_show_images">Show images</string>
   <string name="title_subject_reply">Re: %1$s</string>
   <string name="title_subject_forward">Fwd: %1$s</string>
-  <string name="title_thread">Show thread</string>
+  <string name="title_thread">Show conversation</string>
   <string name="title_seen">Mark read</string>
   <string name="title_unseen">Mark unread</string>
   <string name="title_forward">Forward</string>
@@ -168,6 +168,7 @@
   <string name="title_answer_text">Answer text</string>
   <string name="title_legend_cc">CC/BCC</string>
   <string name="title_legend_attachment">Attachment</string>
+  <string name="title_legend_thread">Conversation</string>
   <string name="title_legend_synchronize">Synchronize</string>
   <string name="title_legend_primary">Primary</string>
   <string name="title_legend_disconnected">Disconnected</string>
diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
index a92f7a9f21..c2cc87ef0f 100644
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -106,14 +106,14 @@
   <string name="title_folder_sent">Sent</string>
   <string name="title_folder_user">User</string>
   <string name="title_folder_primary">Folders primary account</string>
-  <string name="title_folder_thread">Message thread</string>
+  <string name="title_folder_thread">Conversation</string>
   <string name="title_no_messages">No messages</string>
   <string name="title_link">link</string>
   <string name="title_image">image</string>
   <string name="title_show_images">Show images</string>
   <string name="title_subject_reply">Re: %1$s</string>
   <string name="title_subject_forward">Fwd: %1$s</string>
-  <string name="title_thread">Show thread</string>
+  <string name="title_thread">Show conversation</string>
   <string name="title_seen">Mark read</string>
   <string name="title_unseen">Mark unread</string>
   <string name="title_forward">Forward</string>
@@ -160,6 +160,7 @@
   <string name="title_answer_text">Answer text</string>
   <string name="title_legend_cc">CC/BCC</string>
   <string name="title_legend_attachment">Attachment</string>
+  <string name="title_legend_thread">Conversation</string>
   <string name="title_legend_synchronize">Synchronize</string>
   <string name="title_legend_primary">Primary</string>
   <string name="title_legend_disconnected">Disconnected</string>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 403ed048a7..968f52b825 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -106,14 +106,14 @@
   <string name="title_folder_sent">Inviato</string>
   <string name="title_folder_user">Utente</string>
   <string name="title_folder_primary">Cartelle account principale</string>
-  <string name="title_folder_thread">Thread del messaggio</string>
+  <string name="title_folder_thread">Conversation</string>
   <string name="title_no_messages">Nessun messaggio</string>
   <string name="title_link">collegamento</string>
   <string name="title_image">immagine</string>
   <string name="title_show_images">Show images</string>
   <string name="title_subject_reply">Re: %1$s</string>
   <string name="title_subject_forward">Fwd: %1$s</string>
-  <string name="title_thread">Visualizza thread</string>
+  <string name="title_thread">Show conversation</string>
   <string name="title_seen">Segna come letto</string>
   <string name="title_unseen">Segna come non letto</string>
   <string name="title_forward">Inoltra</string>
@@ -160,6 +160,7 @@
   <string name="title_answer_text">Answer text</string>
   <string name="title_legend_cc">CC/BCC</string>
   <string name="title_legend_attachment">Allegato</string>
+  <string name="title_legend_thread">Conversation</string>
   <string name="title_legend_synchronize">Sincronizza</string>
   <string name="title_legend_primary">Principale</string>
   <string name="title_legend_disconnected">Disconnesso</string>
diff --git a/app/src/main/res/values-iw/strings.xml b/app/src/main/res/values-iw/strings.xml
index bd745818dd..f90e9956b8 100644
--- a/app/src/main/res/values-iw/strings.xml
+++ b/app/src/main/res/values-iw/strings.xml
@@ -114,14 +114,14 @@
   <string name="title_folder_sent">Sent</string>
   <string name="title_folder_user">User</string>
   <string name="title_folder_primary">Folders primary account</string>
-  <string name="title_folder_thread">Message thread</string>
+  <string name="title_folder_thread">Conversation</string>
   <string name="title_no_messages">No messages</string>
   <string name="title_link">link</string>
   <string name="title_image">image</string>
   <string name="title_show_images">Show images</string>
   <string name="title_subject_reply">Re: %1$s</string>
   <string name="title_subject_forward">Fwd: %1$s</string>
-  <string name="title_thread">Show thread</string>
+  <string name="title_thread">Show conversation</string>
   <string name="title_seen">Mark read</string>
   <string name="title_unseen">Mark unread</string>
   <string name="title_forward">Forward</string>
@@ -168,6 +168,7 @@
   <string name="title_answer_text">Answer text</string>
   <string name="title_legend_cc">CC/BCC</string>
   <string name="title_legend_attachment">Attachment</string>
+  <string name="title_legend_thread">Conversation</string>
   <string name="title_legend_synchronize">Synchronize</string>
   <string name="title_legend_primary">Primary</string>
   <string name="title_legend_disconnected">Disconnected</string>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 91ed306227..a3911edbad 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -102,14 +102,14 @@
   <string name="title_folder_sent">Sent</string>
   <string name="title_folder_user">User</string>
   <string name="title_folder_primary">Folders primary account</string>
-  <string name="title_folder_thread">Message thread</string>
+  <string name="title_folder_thread">Conversation</string>
   <string name="title_no_messages">No messages</string>
   <string name="title_link">link</string>
   <string name="title_image">image</string>
   <string name="title_show_images">Show images</string>
   <string name="title_subject_reply">Re: %1$s</string>
   <string name="title_subject_forward">Fwd: %1$s</string>
-  <string name="title_thread">Show thread</string>
+  <string name="title_thread">Show conversation</string>
   <string name="title_seen">Mark read</string>
   <string name="title_unseen">Mark unread</string>
   <string name="title_forward">Forward</string>
@@ -156,6 +156,7 @@
   <string name="title_answer_text">Answer text</string>
   <string name="title_legend_cc">CC/BCC</string>
   <string name="title_legend_attachment">Attachment</string>
+  <string name="title_legend_thread">Conversation</string>
   <string name="title_legend_synchronize">Synchronize</string>
   <string name="title_legend_primary">Primary</string>
   <string name="title_legend_disconnected">Disconnected</string>
diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml
index 91ed306227..a3911edbad 100644
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -102,14 +102,14 @@
   <string name="title_folder_sent">Sent</string>
   <string name="title_folder_user">User</string>
   <string name="title_folder_primary">Folders primary account</string>
-  <string name="title_folder_thread">Message thread</string>
+  <string name="title_folder_thread">Conversation</string>
   <string name="title_no_messages">No messages</string>
   <string name="title_link">link</string>
   <string name="title_image">image</string>
   <string name="title_show_images">Show images</string>
   <string name="title_subject_reply">Re: %1$s</string>
   <string name="title_subject_forward">Fwd: %1$s</string>
-  <string name="title_thread">Show thread</string>
+  <string name="title_thread">Show conversation</string>
   <string name="title_seen">Mark read</string>
   <string name="title_unseen">Mark unread</string>
   <string name="title_forward">Forward</string>
@@ -156,6 +156,7 @@
   <string name="title_answer_text">Answer text</string>
   <string name="title_legend_cc">CC/BCC</string>
   <string name="title_legend_attachment">Attachment</string>
+  <string name="title_legend_thread">Conversation</string>
   <string name="title_legend_synchronize">Synchronize</string>
   <string name="title_legend_primary">Primary</string>
   <string name="title_legend_disconnected">Disconnected</string>
diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml
index a92f7a9f21..c2cc87ef0f 100644
--- a/app/src/main/res/values-nb/strings.xml
+++ b/app/src/main/res/values-nb/strings.xml
@@ -106,14 +106,14 @@
   <string name="title_folder_sent">Sent</string>
   <string name="title_folder_user">User</string>
   <string name="title_folder_primary">Folders primary account</string>
-  <string name="title_folder_thread">Message thread</string>
+  <string name="title_folder_thread">Conversation</string>
   <string name="title_no_messages">No messages</string>
   <string name="title_link">link</string>
   <string name="title_image">image</string>
   <string name="title_show_images">Show images</string>
   <string name="title_subject_reply">Re: %1$s</string>
   <string name="title_subject_forward">Fwd: %1$s</string>
-  <string name="title_thread">Show thread</string>
+  <string name="title_thread">Show conversation</string>
   <string name="title_seen">Mark read</string>
   <string name="title_unseen">Mark unread</string>
   <string name="title_forward">Forward</string>
@@ -160,6 +160,7 @@
   <string name="title_answer_text">Answer text</string>
   <string name="title_legend_cc">CC/BCC</string>
   <string name="title_legend_attachment">Attachment</string>
+  <string name="title_legend_thread">Conversation</string>
   <string name="title_legend_synchronize">Synchronize</string>
   <string name="title_legend_primary">Primary</string>
   <string name="title_legend_disconnected">Disconnected</string>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index a92f7a9f21..c2cc87ef0f 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -106,14 +106,14 @@
   <string name="title_folder_sent">Sent</string>
   <string name="title_folder_user">User</string>
   <string name="title_folder_primary">Folders primary account</string>
-  <string name="title_folder_thread">Message thread</string>
+  <string name="title_folder_thread">Conversation</string>
   <string name="title_no_messages">No messages</string>
   <string name="title_link">link</string>
   <string name="title_image">image</string>
   <string name="title_show_images">Show images</string>
   <string name="title_subject_reply">Re: %1$s</string>
   <string name="title_subject_forward">Fwd: %1$s</string>
-  <string name="title_thread">Show thread</string>
+  <string name="title_thread">Show conversation</string>
   <string name="title_seen">Mark read</string>
   <string name="title_unseen">Mark unread</string>
   <string name="title_forward">Forward</string>
@@ -160,6 +160,7 @@
   <string name="title_answer_text">Answer text</string>
   <string name="title_legend_cc">CC/BCC</string>
   <string name="title_legend_attachment">Attachment</string>
+  <string name="title_legend_thread">Conversation</string>
   <string name="title_legend_synchronize">Synchronize</string>
   <string name="title_legend_primary">Primary</string>
   <string name="title_legend_disconnected">Disconnected</string>
diff --git a/app/src/main/res/values-no/strings.xml b/app/src/main/res/values-no/strings.xml
index a92f7a9f21..c2cc87ef0f 100644
--- a/app/src/main/res/values-no/strings.xml
+++ b/app/src/main/res/values-no/strings.xml
@@ -106,14 +106,14 @@
   <string name="title_folder_sent">Sent</string>
   <string name="title_folder_user">User</string>
   <string name="title_folder_primary">Folders primary account</string>
-  <string name="title_folder_thread">Message thread</string>
+  <string name="title_folder_thread">Conversation</string>
   <string name="title_no_messages">No messages</string>
   <string name="title_link">link</string>
   <string name="title_image">image</string>
   <string name="title_show_images">Show images</string>
   <string name="title_subject_reply">Re: %1$s</string>
   <string name="title_subject_forward">Fwd: %1$s</string>
-  <string name="title_thread">Show thread</string>
+  <string name="title_thread">Show conversation</string>
   <string name="title_seen">Mark read</string>
   <string name="title_unseen">Mark unread</string>
   <string name="title_forward">Forward</string>
@@ -160,6 +160,7 @@
   <string name="title_answer_text">Answer text</string>
   <string name="title_legend_cc">CC/BCC</string>
   <string name="title_legend_attachment">Attachment</string>
+  <string name="title_legend_thread">Conversation</string>
   <string name="title_legend_synchronize">Synchronize</string>
   <string name="title_legend_primary">Primary</string>
   <string name="title_legend_disconnected">Disconnected</string>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index 315e5e78a4..497e09896c 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -114,14 +114,14 @@
   <string name="title_folder_sent">Wysłane</string>
   <string name="title_folder_user">Użytkownik</string>
   <string name="title_folder_primary">Podstawowe konto folderów</string>
-  <string name="title_folder_thread">Wątek wiadomości</string>
+  <string name="title_folder_thread">Conversation</string>
   <string name="title_no_messages">Brak wiadomości</string>
   <string name="title_link">link</string>
   <string name="title_image">obraz</string>
   <string name="title_show_images">Pokaż obrazy</string>
   <string name="title_subject_reply">Odp: %1$s</string>
   <string name="title_subject_forward">Pd: %1$s</string>
-  <string name="title_thread">Pokaż wątek</string>
+  <string name="title_thread">Show conversation</string>
   <string name="title_seen">Oznacz jako przeczytane</string>
   <string name="title_unseen">Oznacz jako nieprzeczytane</string>
   <string name="title_forward">Prześlij dalej</string>
@@ -168,6 +168,7 @@
   <string name="title_answer_text">Tekst odpowiedzi</string>
   <string name="title_legend_cc">DW/UDW</string>
   <string name="title_legend_attachment">Załącznik</string>
+  <string name="title_legend_thread">Conversation</string>
   <string name="title_legend_synchronize">Synchronizuj</string>
   <string name="title_legend_primary">Podstawowe</string>
   <string name="title_legend_disconnected">Rozłączony</string>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 9a43fc5206..9507f9c62c 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -106,14 +106,14 @@
   <string name="title_folder_sent">Enviado</string>
   <string name="title_folder_user">Usuário</string>
   <string name="title_folder_primary">Folders primary account</string>
-  <string name="title_folder_thread">Tópico da mensagem</string>
+  <string name="title_folder_thread">Conversation</string>
   <string name="title_no_messages">Sem mensagens</string>
   <string name="title_link">link</string>
   <string name="title_image">imagem</string>
   <string name="title_show_images">Show images</string>
   <string name="title_subject_reply">Re: %1$s</string>
   <string name="title_subject_forward">Enc: %1$s</string>
-  <string name="title_thread">Show thread</string>
+  <string name="title_thread">Show conversation</string>
   <string name="title_seen">Mark read</string>
   <string name="title_unseen">Mark unread</string>
   <string name="title_forward">Encaminhar</string>
@@ -160,6 +160,7 @@
   <string name="title_answer_text">Answer text</string>
   <string name="title_legend_cc">CC/BCC</string>
   <string name="title_legend_attachment">Attachment</string>
+  <string name="title_legend_thread">Conversation</string>
   <string name="title_legend_synchronize">Synchronize</string>
   <string name="title_legend_primary">Primary</string>
   <string name="title_legend_disconnected">Disconnected</string>
diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml
index a92f7a9f21..c2cc87ef0f 100644
--- a/app/src/main/res/values-pt-rPT/strings.xml
+++ b/app/src/main/res/values-pt-rPT/strings.xml
@@ -106,14 +106,14 @@
   <string name="title_folder_sent">Sent</string>
   <string name="title_folder_user">User</string>
   <string name="title_folder_primary">Folders primary account</string>
-  <string name="title_folder_thread">Message thread</string>
+  <string name="title_folder_thread">Conversation</string>
   <string name="title_no_messages">No messages</string>
   <string name="title_link">link</string>
   <string name="title_image">image</string>
   <string name="title_show_images">Show images</string>
   <string name="title_subject_reply">Re: %1$s</string>
   <string name="title_subject_forward">Fwd: %1$s</string>
-  <string name="title_thread">Show thread</string>
+  <string name="title_thread">Show conversation</string>
   <string name="title_seen">Mark read</string>
   <string name="title_unseen">Mark unread</string>
   <string name="title_forward">Forward</string>
@@ -160,6 +160,7 @@
   <string name="title_answer_text">Answer text</string>
   <string name="title_legend_cc">CC/BCC</string>
   <string name="title_legend_attachment">Attachment</string>
+  <string name="title_legend_thread">Conversation</string>
   <string name="title_legend_synchronize">Synchronize</string>
   <string name="title_legend_primary">Primary</string>
   <string name="title_legend_disconnected">Disconnected</string>
diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml
index 982c4afa1b..aa23a2fda2 100644
--- a/app/src/main/res/values-ro/strings.xml
+++ b/app/src/main/res/values-ro/strings.xml
@@ -110,14 +110,14 @@
   <string name="title_folder_sent">Trimise</string>
   <string name="title_folder_user">Utilizator</string>
   <string name="title_folder_primary">Dosare cont primar</string>
-  <string name="title_folder_thread">Mesaje discuție</string>
+  <string name="title_folder_thread">Conversation</string>
   <string name="title_no_messages">Nici un mesaj</string>
   <string name="title_link">legătură</string>
   <string name="title_image">imagine</string>
   <string name="title_show_images">Afișare imagini</string>
   <string name="title_subject_reply">Răsp: %1$s</string>
   <string name="title_subject_forward">Redir: %1$s</string>
-  <string name="title_thread">Arată discuția</string>
+  <string name="title_thread">Show conversation</string>
   <string name="title_seen">Marchează ca Citit</string>
   <string name="title_unseen">Marcare ca necitit</string>
   <string name="title_forward">Redirecționează</string>
@@ -164,6 +164,7 @@
   <string name="title_answer_text">Text răspuns</string>
   <string name="title_legend_cc">CC/BCC</string>
   <string name="title_legend_attachment">Atașament</string>
+  <string name="title_legend_thread">Conversation</string>
   <string name="title_legend_synchronize">Sincronizare</string>
   <string name="title_legend_primary">Primar</string>
   <string name="title_legend_disconnected">Deconectat</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 9d6a0c5882..27d684f971 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -114,14 +114,14 @@
   <string name="title_folder_sent">Sent</string>
   <string name="title_folder_user">User</string>
   <string name="title_folder_primary">Folders primary account</string>
-  <string name="title_folder_thread">Message thread</string>
+  <string name="title_folder_thread">Conversation</string>
   <string name="title_no_messages">No messages</string>
   <string name="title_link">link</string>
   <string name="title_image">image</string>
   <string name="title_show_images">Show images</string>
   <string name="title_subject_reply">Re: %1$s</string>
   <string name="title_subject_forward">Fwd: %1$s</string>
-  <string name="title_thread">Show thread</string>
+  <string name="title_thread">Show conversation</string>
   <string name="title_seen">Mark read</string>
   <string name="title_unseen">Mark unread</string>
   <string name="title_forward">Forward</string>
@@ -168,6 +168,7 @@
   <string name="title_answer_text">Answer text</string>
   <string name="title_legend_cc">CC/BCC</string>
   <string name="title_legend_attachment">Attachment</string>
+  <string name="title_legend_thread">Conversation</string>
   <string name="title_legend_synchronize">Synchronize</string>
   <string name="title_legend_primary">Primary</string>
   <string name="title_legend_disconnected">Disconnected</string>
diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml
index 36023cae11..9c8796a57f 100644
--- a/app/src/main/res/values-sr/strings.xml
+++ b/app/src/main/res/values-sr/strings.xml
@@ -110,14 +110,14 @@
   <string name="title_folder_sent">Sent</string>
   <string name="title_folder_user">User</string>
   <string name="title_folder_primary">Folders primary account</string>
-  <string name="title_folder_thread">Message thread</string>
+  <string name="title_folder_thread">Conversation</string>
   <string name="title_no_messages">No messages</string>
   <string name="title_link">link</string>
   <string name="title_image">image</string>
   <string name="title_show_images">Show images</string>
   <string name="title_subject_reply">Re: %1$s</string>
   <string name="title_subject_forward">Fwd: %1$s</string>
-  <string name="title_thread">Show thread</string>
+  <string name="title_thread">Show conversation</string>
   <string name="title_seen">Mark read</string>
   <string name="title_unseen">Mark unread</string>
   <string name="title_forward">Forward</string>
@@ -164,6 +164,7 @@
   <string name="title_answer_text">Answer text</string>
   <string name="title_legend_cc">CC/BCC</string>
   <string name="title_legend_attachment">Attachment</string>
+  <string name="title_legend_thread">Conversation</string>
   <string name="title_legend_synchronize">Synchronize</string>
   <string name="title_legend_primary">Primary</string>
   <string name="title_legend_disconnected">Disconnected</string>
diff --git a/app/src/main/res/values-sv-rSE/strings.xml b/app/src/main/res/values-sv-rSE/strings.xml
index a92f7a9f21..c2cc87ef0f 100644
--- a/app/src/main/res/values-sv-rSE/strings.xml
+++ b/app/src/main/res/values-sv-rSE/strings.xml
@@ -106,14 +106,14 @@
   <string name="title_folder_sent">Sent</string>
   <string name="title_folder_user">User</string>
   <string name="title_folder_primary">Folders primary account</string>
-  <string name="title_folder_thread">Message thread</string>
+  <string name="title_folder_thread">Conversation</string>
   <string name="title_no_messages">No messages</string>
   <string name="title_link">link</string>
   <string name="title_image">image</string>
   <string name="title_show_images">Show images</string>
   <string name="title_subject_reply">Re: %1$s</string>
   <string name="title_subject_forward">Fwd: %1$s</string>
-  <string name="title_thread">Show thread</string>
+  <string name="title_thread">Show conversation</string>
   <string name="title_seen">Mark read</string>
   <string name="title_unseen">Mark unread</string>
   <string name="title_forward">Forward</string>
@@ -160,6 +160,7 @@
   <string name="title_answer_text">Answer text</string>
   <string name="title_legend_cc">CC/BCC</string>
   <string name="title_legend_attachment">Attachment</string>
+  <string name="title_legend_thread">Conversation</string>
   <string name="title_legend_synchronize">Synchronize</string>
   <string name="title_legend_primary">Primary</string>
   <string name="title_legend_disconnected">Disconnected</string>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index 9c6753d775..8664c4e427 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -106,14 +106,14 @@
   <string name="title_folder_sent">Gönderilen</string>
   <string name="title_folder_user">Kullanıcı</string>
   <string name="title_folder_primary">Klasörler birincil hesap</string>
-  <string name="title_folder_thread">İleti dizisi</string>
+  <string name="title_folder_thread">Conversation</string>
   <string name="title_no_messages">İleti yok</string>
   <string name="title_link">bağlantı</string>
   <string name="title_image">resim</string>
   <string name="title_show_images">Resimleri göster</string>
   <string name="title_subject_reply">Ynt: %1$s</string>
   <string name="title_subject_forward">İlet: %1$s</string>
-  <string name="title_thread">Konuyu göster</string>
+  <string name="title_thread">Show conversation</string>
   <string name="title_seen">Okundu olarak işaretle</string>
   <string name="title_unseen">Okunmadı olarak işaretle</string>
   <string name="title_forward">İlet</string>
@@ -160,6 +160,7 @@
   <string name="title_answer_text">Yanıt metni</string>
   <string name="title_legend_cc">CC/BCC</string>
   <string name="title_legend_attachment">Ek</string>
+  <string name="title_legend_thread">Conversation</string>
   <string name="title_legend_synchronize">Senkronize et</string>
   <string name="title_legend_primary">Birincil</string>
   <string name="title_legend_disconnected">Bağlantı kesildi</string>
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index 9d6a0c5882..27d684f971 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -114,14 +114,14 @@
   <string name="title_folder_sent">Sent</string>
   <string name="title_folder_user">User</string>
   <string name="title_folder_primary">Folders primary account</string>
-  <string name="title_folder_thread">Message thread</string>
+  <string name="title_folder_thread">Conversation</string>
   <string name="title_no_messages">No messages</string>
   <string name="title_link">link</string>
   <string name="title_image">image</string>
   <string name="title_show_images">Show images</string>
   <string name="title_subject_reply">Re: %1$s</string>
   <string name="title_subject_forward">Fwd: %1$s</string>
-  <string name="title_thread">Show thread</string>
+  <string name="title_thread">Show conversation</string>
   <string name="title_seen">Mark read</string>
   <string name="title_unseen">Mark unread</string>
   <string name="title_forward">Forward</string>
@@ -168,6 +168,7 @@
   <string name="title_answer_text">Answer text</string>
   <string name="title_legend_cc">CC/BCC</string>
   <string name="title_legend_attachment">Attachment</string>
+  <string name="title_legend_thread">Conversation</string>
   <string name="title_legend_synchronize">Synchronize</string>
   <string name="title_legend_primary">Primary</string>
   <string name="title_legend_disconnected">Disconnected</string>
diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml
index 91ed306227..a3911edbad 100644
--- a/app/src/main/res/values-vi/strings.xml
+++ b/app/src/main/res/values-vi/strings.xml
@@ -102,14 +102,14 @@
   <string name="title_folder_sent">Sent</string>
   <string name="title_folder_user">User</string>
   <string name="title_folder_primary">Folders primary account</string>
-  <string name="title_folder_thread">Message thread</string>
+  <string name="title_folder_thread">Conversation</string>
   <string name="title_no_messages">No messages</string>
   <string name="title_link">link</string>
   <string name="title_image">image</string>
   <string name="title_show_images">Show images</string>
   <string name="title_subject_reply">Re: %1$s</string>
   <string name="title_subject_forward">Fwd: %1$s</string>
-  <string name="title_thread">Show thread</string>
+  <string name="title_thread">Show conversation</string>
   <string name="title_seen">Mark read</string>
   <string name="title_unseen">Mark unread</string>
   <string name="title_forward">Forward</string>
@@ -156,6 +156,7 @@
   <string name="title_answer_text">Answer text</string>
   <string name="title_legend_cc">CC/BCC</string>
   <string name="title_legend_attachment">Attachment</string>
+  <string name="title_legend_thread">Conversation</string>
   <string name="title_legend_synchronize">Synchronize</string>
   <string name="title_legend_primary">Primary</string>
   <string name="title_legend_disconnected">Disconnected</string>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index f383a7b7dc..bbda898da6 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -102,14 +102,14 @@
   <string name="title_folder_sent">已发送邮件</string>
   <string name="title_folder_user">用户</string>
   <string name="title_folder_primary">文件夹主账户</string>
-  <string name="title_folder_thread">邮件会话</string>
+  <string name="title_folder_thread">Conversation</string>
   <string name="title_no_messages">没有邮件</string>
   <string name="title_link">链接</string>
   <string name="title_image">图片</string>
   <string name="title_show_images">显示图片</string>
   <string name="title_subject_reply">回复：%1$s</string>
   <string name="title_subject_forward">转发：%1$s</string>
-  <string name="title_thread">显示会话</string>
+  <string name="title_thread">Show conversation</string>
   <string name="title_seen">标记为已读</string>
   <string name="title_unseen">标记为未读</string>
   <string name="title_forward">转发</string>
@@ -156,6 +156,7 @@
   <string name="title_answer_text">回复文本</string>
   <string name="title_legend_cc">抄送或密送</string>
   <string name="title_legend_attachment">附件</string>
+  <string name="title_legend_thread">Conversation</string>
   <string name="title_legend_synchronize">同步</string>
   <string name="title_legend_primary">首选</string>
   <string name="title_legend_disconnected">未连接</string>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index 91ed306227..a3911edbad 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -102,14 +102,14 @@
   <string name="title_folder_sent">Sent</string>
   <string name="title_folder_user">User</string>
   <string name="title_folder_primary">Folders primary account</string>
-  <string name="title_folder_thread">Message thread</string>
+  <string name="title_folder_thread">Conversation</string>
   <string name="title_no_messages">No messages</string>
   <string name="title_link">link</string>
   <string name="title_image">image</string>
   <string name="title_show_images">Show images</string>
   <string name="title_subject_reply">Re: %1$s</string>
   <string name="title_subject_forward">Fwd: %1$s</string>
-  <string name="title_thread">Show thread</string>
+  <string name="title_thread">Show conversation</string>
   <string name="title_seen">Mark read</string>
   <string name="title_unseen">Mark unread</string>
   <string name="title_forward">Forward</string>
@@ -156,6 +156,7 @@
   <string name="title_answer_text">Answer text</string>
   <string name="title_legend_cc">CC/BCC</string>
   <string name="title_legend_attachment">Attachment</string>
+  <string name="title_legend_thread">Conversation</string>
   <string name="title_legend_synchronize">Synchronize</string>
   <string name="title_legend_primary">Primary</string>
   <string name="title_legend_disconnected">Disconnected</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index f7698f9103..b3dac82660 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -125,7 +125,7 @@
     <string name="title_folder_sent">Sent</string>
     <string name="title_folder_user">User</string>
     <string name="title_folder_primary">Folders primary account</string>
-    <string name="title_folder_thread">Message thread</string>
+    <string name="title_folder_thread">Conversation</string>
     <string name="title_no_messages">No messages</string>
 
     <string name="title_link">link</string>
@@ -134,7 +134,7 @@
     <string name="title_subject_reply">Re: %1$s</string>
     <string name="title_subject_forward">Fwd: %1$s</string>
 
-    <string name="title_thread">Show thread</string>
+    <string name="title_thread">Show conversation</string>
     <string name="title_seen">Mark read</string>
     <string name="title_unseen">Mark unread</string>
     <string name="title_forward">Forward</string>
@@ -190,6 +190,7 @@
 
     <string name="title_legend_cc">CC/BCC</string>
     <string name="title_legend_attachment">Attachment</string>
+    <string name="title_legend_thread">Conversation</string>
     <string name="title_legend_synchronize">Synchronize</string>
     <string name="title_legend_primary">Primary</string>
     <string name="title_legend_disconnected">Disconnected</string>