From 6a91d18003b4cc1e6d939fa40493340afdc087b3 Mon Sep 17 00:00:00 2001
From: johndoe4221 <lkdeatour-briarproject@yahoo.com>
Date: Thu, 9 Jun 2022 21:47:50 +0200
Subject: [PATCH 01/10] feat: [2329] adding initial translations for contact
 trust levels

---
 briar-android/src/main/res/values/strings.xml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/briar-android/src/main/res/values/strings.xml b/briar-android/src/main/res/values/strings.xml
index 5e4347bdf..8f397c9da 100644
--- a/briar-android/src/main/res/values/strings.xml
+++ b/briar-android/src/main/res/values/strings.xml
@@ -312,6 +312,14 @@
 	<string name="duplicate_link_dialog_text_3">%1$s and %2$s sent you the same link.\n\nOne of them may be trying to discover who your contacts are.\n\nDon\'t tell them you received the same link from someone else.</string>
 	<string name="pending_contact_updated_toast">Pending contact updated</string>
 
+	<!-- Contact trust levels -->
+
+	<string name="contact_trust_level_anonymous">Anonymous contact</string>
+	<string name="contact_trust_level_unverified">Unverified contact</string>
+	<string name="contact_trust_level_verified">Verified contact</string>
+	<string name="contact_trust_level_ourselves">Me</string>
+	<string name="contact_trust_level_default">Unknown contact</string>
+
 	<!-- Introductions -->
 
 	<string name="introduction_onboarding_title">Introduce your contacts</string>

From b24a18b23192e826c516c9de51bf631b4f3fa289 Mon Sep 17 00:00:00 2001
From: johndoe4221 <lkdeatour-briarproject@yahoo.com>
Date: Thu, 16 Jun 2022 18:10:21 +0200
Subject: [PATCH 02/10] feat: [2329][1630] remove translation for anonymous
 trust level

---
 briar-android/src/main/res/values/strings.xml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/briar-android/src/main/res/values/strings.xml b/briar-android/src/main/res/values/strings.xml
index 7e1e35c68..d05f55d51 100644
--- a/briar-android/src/main/res/values/strings.xml
+++ b/briar-android/src/main/res/values/strings.xml
@@ -316,11 +316,10 @@
 
 	<!-- Contact trust levels -->
 
-	<string name="contact_trust_level_anonymous">Anonymous contact</string>
 	<string name="contact_trust_level_unverified">Unverified contact</string>
 	<string name="contact_trust_level_verified">Verified contact</string>
 	<string name="contact_trust_level_ourselves">Me</string>
-	<string name="contact_trust_level_default">Unknown contact</string>
+	<string name="contact_trust_level_stranger">Stranger</string>
 
 	<!-- Introductions -->
 

From 2a969f8e0be4321ffce1aad491efe052faf9f12e Mon Sep 17 00:00:00 2001
From: johndoe4221 <lkdeatour-briarproject@yahoo.com>
Date: Thu, 9 Jun 2022 21:47:50 +0200
Subject: [PATCH 03/10] feat: [2329] adding initial translations for contact
 trust levels

---
 briar-android/src/main/res/values/strings.xml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/briar-android/src/main/res/values/strings.xml b/briar-android/src/main/res/values/strings.xml
index 3753bd33e..4140607a4 100644
--- a/briar-android/src/main/res/values/strings.xml
+++ b/briar-android/src/main/res/values/strings.xml
@@ -315,6 +315,14 @@
 	<string name="duplicate_link_dialog_text_3">%1$s and %2$s sent you the same link.\n\nOne of them may be trying to discover who your contacts are.\n\nDon\'t tell them you received the same link from someone else.</string>
 	<string name="pending_contact_updated_toast">Pending contact updated</string>
 
+	<!-- Contact trust levels -->
+
+	<string name="contact_trust_level_anonymous">Anonymous contact</string>
+	<string name="contact_trust_level_unverified">Unverified contact</string>
+	<string name="contact_trust_level_verified">Verified contact</string>
+	<string name="contact_trust_level_ourselves">Me</string>
+	<string name="contact_trust_level_default">Unknown contact</string>
+
 	<!-- Introductions -->
 
 	<string name="introduction_onboarding_title">Introduce your contacts</string>

From afd92dd916b4c5e09429ac14b51c53a6579c1f07 Mon Sep 17 00:00:00 2001
From: johndoe4221 <lkdeatour-briarproject@yahoo.com>
Date: Thu, 16 Jun 2022 18:10:21 +0200
Subject: [PATCH 04/10] feat: [2329][1630] remove translation for anonymous
 trust level

---
 briar-android/src/main/res/values/strings.xml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/briar-android/src/main/res/values/strings.xml b/briar-android/src/main/res/values/strings.xml
index 4140607a4..119b71c3a 100644
--- a/briar-android/src/main/res/values/strings.xml
+++ b/briar-android/src/main/res/values/strings.xml
@@ -317,11 +317,10 @@
 
 	<!-- Contact trust levels -->
 
-	<string name="contact_trust_level_anonymous">Anonymous contact</string>
 	<string name="contact_trust_level_unverified">Unverified contact</string>
 	<string name="contact_trust_level_verified">Verified contact</string>
 	<string name="contact_trust_level_ourselves">Me</string>
-	<string name="contact_trust_level_default">Unknown contact</string>
+	<string name="contact_trust_level_stranger">Stranger</string>
 
 	<!-- Introductions -->
 

From 44acda204502333e3c9506e0dbf5dba6cf8e2542 Mon Sep 17 00:00:00 2001
From: johndoe4221 <lkdeatour-briarproject@yahoo.com>
Date: Sat, 2 Jul 2022 09:43:53 +0200
Subject: [PATCH 05/10] feat: [2329] changing terminology from
 contact-trust-level to author-trust-level

---
 briar-android/src/main/res/values/strings.xml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/briar-android/src/main/res/values/strings.xml b/briar-android/src/main/res/values/strings.xml
index 119b71c3a..da81d0e97 100644
--- a/briar-android/src/main/res/values/strings.xml
+++ b/briar-android/src/main/res/values/strings.xml
@@ -315,12 +315,12 @@
 	<string name="duplicate_link_dialog_text_3">%1$s and %2$s sent you the same link.\n\nOne of them may be trying to discover who your contacts are.\n\nDon\'t tell them you received the same link from someone else.</string>
 	<string name="pending_contact_updated_toast">Pending contact updated</string>
 
-	<!-- Contact trust levels -->
+	<!-- Author trust levels -->
 
-	<string name="contact_trust_level_unverified">Unverified contact</string>
-	<string name="contact_trust_level_verified">Verified contact</string>
-	<string name="contact_trust_level_ourselves">Me</string>
-	<string name="contact_trust_level_stranger">Stranger</string>
+	<string name="author_trust_level_unverified">Unverified author</string>
+	<string name="author_trust_level_verified">Verified author</string>
+	<string name="author_trust_level_ourselves">Me</string>
+	<string name="author_trust_level_stranger">Stranger</string>
 
 	<!-- Introductions -->
 

From 9e5029917e5f1e65850ed2dbf2831bf4337bbeee Mon Sep 17 00:00:00 2001
From: johndoe4221 <lkdeatour-briarproject@yahoo.com>
Date: Thu, 9 Jun 2022 21:47:50 +0200
Subject: [PATCH 06/10] feat: [2329] adding initial translations for contact
 trust levels

---
 briar-android/src/main/res/values/strings.xml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/briar-android/src/main/res/values/strings.xml b/briar-android/src/main/res/values/strings.xml
index 3753bd33e..4140607a4 100644
--- a/briar-android/src/main/res/values/strings.xml
+++ b/briar-android/src/main/res/values/strings.xml
@@ -315,6 +315,14 @@
 	<string name="duplicate_link_dialog_text_3">%1$s and %2$s sent you the same link.\n\nOne of them may be trying to discover who your contacts are.\n\nDon\'t tell them you received the same link from someone else.</string>
 	<string name="pending_contact_updated_toast">Pending contact updated</string>
 
+	<!-- Contact trust levels -->
+
+	<string name="contact_trust_level_anonymous">Anonymous contact</string>
+	<string name="contact_trust_level_unverified">Unverified contact</string>
+	<string name="contact_trust_level_verified">Verified contact</string>
+	<string name="contact_trust_level_ourselves">Me</string>
+	<string name="contact_trust_level_default">Unknown contact</string>
+
 	<!-- Introductions -->
 
 	<string name="introduction_onboarding_title">Introduce your contacts</string>

From b58b0c74a92651e24ca59a1bcc7675de05477d14 Mon Sep 17 00:00:00 2001
From: johndoe4221 <lkdeatour-briarproject@yahoo.com>
Date: Thu, 16 Jun 2022 18:10:21 +0200
Subject: [PATCH 07/10] feat: [2329][1630] remove translation for anonymous
 trust level

---
 briar-android/src/main/res/values/strings.xml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/briar-android/src/main/res/values/strings.xml b/briar-android/src/main/res/values/strings.xml
index 4140607a4..119b71c3a 100644
--- a/briar-android/src/main/res/values/strings.xml
+++ b/briar-android/src/main/res/values/strings.xml
@@ -317,11 +317,10 @@
 
 	<!-- Contact trust levels -->
 
-	<string name="contact_trust_level_anonymous">Anonymous contact</string>
 	<string name="contact_trust_level_unverified">Unverified contact</string>
 	<string name="contact_trust_level_verified">Verified contact</string>
 	<string name="contact_trust_level_ourselves">Me</string>
-	<string name="contact_trust_level_default">Unknown contact</string>
+	<string name="contact_trust_level_stranger">Stranger</string>
 
 	<!-- Introductions -->
 

From e8c694fe0099533923cc5f753c7fb6c81e0c0dc9 Mon Sep 17 00:00:00 2001
From: johndoe4221 <lkdeatour-briarproject@yahoo.com>
Date: Sat, 2 Jul 2022 09:43:53 +0200
Subject: [PATCH 08/10] feat: [2329] changing terminology from
 contact-trust-level to author-trust-level

---
 briar-android/src/main/res/values/strings.xml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/briar-android/src/main/res/values/strings.xml b/briar-android/src/main/res/values/strings.xml
index 119b71c3a..da81d0e97 100644
--- a/briar-android/src/main/res/values/strings.xml
+++ b/briar-android/src/main/res/values/strings.xml
@@ -315,12 +315,12 @@
 	<string name="duplicate_link_dialog_text_3">%1$s and %2$s sent you the same link.\n\nOne of them may be trying to discover who your contacts are.\n\nDon\'t tell them you received the same link from someone else.</string>
 	<string name="pending_contact_updated_toast">Pending contact updated</string>
 
-	<!-- Contact trust levels -->
+	<!-- Author trust levels -->
 
-	<string name="contact_trust_level_unverified">Unverified contact</string>
-	<string name="contact_trust_level_verified">Verified contact</string>
-	<string name="contact_trust_level_ourselves">Me</string>
-	<string name="contact_trust_level_stranger">Stranger</string>
+	<string name="author_trust_level_unverified">Unverified author</string>
+	<string name="author_trust_level_verified">Verified author</string>
+	<string name="author_trust_level_ourselves">Me</string>
+	<string name="author_trust_level_stranger">Stranger</string>
 
 	<!-- Introductions -->
 

From 7f1071f5cd8029b1b5325a99d8286101e89b449d Mon Sep 17 00:00:00 2001
From: johndoe4221 <lkdeatour-briarproject@yahoo.com>
Date: Thu, 9 Jun 2022 21:47:50 +0200
Subject: [PATCH 09/10] feat: [2329] adding initial translations for contact
 trust levels

---
 briar-android/src/main/res/values/strings.xml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/briar-android/src/main/res/values/strings.xml b/briar-android/src/main/res/values/strings.xml
index da81d0e97..a43fd87a4 100644
--- a/briar-android/src/main/res/values/strings.xml
+++ b/briar-android/src/main/res/values/strings.xml
@@ -315,12 +315,12 @@
 	<string name="duplicate_link_dialog_text_3">%1$s and %2$s sent you the same link.\n\nOne of them may be trying to discover who your contacts are.\n\nDon\'t tell them you received the same link from someone else.</string>
 	<string name="pending_contact_updated_toast">Pending contact updated</string>
 
-	<!-- Author trust levels -->
+	<!-- Peer trust levels -->
 
-	<string name="author_trust_level_unverified">Unverified author</string>
-	<string name="author_trust_level_verified">Verified author</string>
-	<string name="author_trust_level_ourselves">Me</string>
-	<string name="author_trust_level_stranger">Stranger</string>
+	<string name="peer_trust_level_unverified">Unverified</string>
+	<string name="peer_trust_level_verified">Verified</string>
+	<string name="peer_trust_level_ourselves">Me</string>
+	<string name="peer_trust_level_stranger">Stranger</string>
 
 	<!-- Introductions -->
 

From 65029982cec9b2757564233fdacb8cc02a1a3696 Mon Sep 17 00:00:00 2001
From: johndoe4221 <lkdeatour-briarproject@yahoo.com>
Date: Mon, 11 Jul 2022 14:31:54 +0200
Subject: [PATCH 10/10] feat: [2329] changing translation of trustlevel to
 'verifified contact'/'unverified contact'

---
 briar-android/src/main/res/values/strings.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/briar-android/src/main/res/values/strings.xml b/briar-android/src/main/res/values/strings.xml
index 1479fd4fe..cf78b4ec9 100644
--- a/briar-android/src/main/res/values/strings.xml
+++ b/briar-android/src/main/res/values/strings.xml
@@ -317,8 +317,8 @@
 	
 	<!-- Peer trust levels -->
 
-	<string name="peer_trust_level_unverified">Unverified</string>
-	<string name="peer_trust_level_verified">Verified</string>
+	<string name="peer_trust_level_unverified">Unverified contact</string>
+	<string name="peer_trust_level_verified">Verified contact</string>
 	<string name="peer_trust_level_ourselves">Me</string>
 	<string name="peer_trust_level_stranger">Stranger</string>