From 583200d22adef6ea48e7208bd1c1deba803c338a Mon Sep 17 00:00:00 2001
From: "B. Petersen" <r10s@b44t.com>
Date: Mon, 22 Apr 2024 18:31:48 +0200
Subject: [PATCH 1/6] add strings needed for instant onboarding

---
 res/values/strings.xml | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 7da4764f6c..ef3692bb47 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -549,6 +549,31 @@
 
 
     <!-- welcome and login -->
+    <!-- Primary button on the welcome screen, allows to create an instant account -->
+    <string name="onboarding_create_instant_account">Let\'s Get Started!</string>
+    <!-- Secondary button on the welcome screen, allows to "Add as Second Device", "Restore from Backup", "Manual Login"  -->
+    <string name="onboarding_alternative_logins">I Already Have a Login</string>
+    <!-- Button, allows to log in to existing email accounts, setting ports, passwords and so on -->
+    <string name="manual_account_setup_option">Manual Login</string>
+    <!-- Instant onboarding title (there is not more to do than to set name and avatar) -->
+    <string name="instant_onboarding_title">Your Profile</string>
+    <!-- Confirmation button on the instant onboarding screen -->
+    <string name="instant_onboarding_create">Create Profile</string>
+    <!-- Hint about on which instance (server) the account will be created -->
+    <string name="instant_onboarding_default_info">Your profile will be created on the default instance.</string>
+    <!-- Hint about on which instance (server) the account will be created; next line follows the instance domain name -->
+    <string name="instant_onboarding_instance_info">Your profile will be created on the following instance:</string>
+    <!-- Secondary, link-like button to open a page with other possible instances -->
+    <string name="instant_onboarding_show_more_instances">Show other instances</string>
+    <!-- Hint about what happens when "Create Profile" button in pressed; the placeholder will be replaced by the group name -->
+    <string name="instant_onboarding_group_info">Create a profile to join the group \"%1$s\".</string>
+    <!-- Hint about what happens when "Create Profile" button in pressed; the placeholder will be replaced by contact name and/or address -->
+    <string name="instant_onboarding_contact_info">Create a profile to chat with %1$s.</string>
+    <!-- Question shown when another user's QR code is scanned from onboarding screen -->
+    <string name="instant_onboarding_confirm_contact">Do you want to create a new profile and start chatting with %1$s?</string>
+    <!-- Question shown when group's QR code is scanned from onboarding screen -->
+    <string name="instant_onboarding_confirm_group">Do you want to create a new profile and join the \"%1$s\" chat group?</string>
+
     <string name="welcome_chat_over_email">Chat over E-Mail.</string>
     <string name="scan_invitation_code">Scan Invitation Code</string>
     <string name="login_title">Log In</string>

From e1b34f9e193491b8ee9c46879ab67a754e84fa4f Mon Sep 17 00:00:00 2001
From: "B. Petersen" <r10s@b44t.com>
Date: Tue, 23 Apr 2024 15:57:17 +0200
Subject: [PATCH 2/6] refine strings: link to 'privacy policy', avoid
 'instance' wording

---
 res/values/strings.xml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/res/values/strings.xml b/res/values/strings.xml
index ef3692bb47..d0f2086c0d 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -557,14 +557,14 @@
     <string name="manual_account_setup_option">Manual Login</string>
     <!-- Instant onboarding title (there is not more to do than to set name and avatar) -->
     <string name="instant_onboarding_title">Your Profile</string>
+    <!-- The two placeholders mark beginning and end of a tappable link -->
+    <string name="instant_onboarding_agree_default">I agree to the %1$sPrivacy Policy%2$s</string>
+    <!-- The placeholder will be replaced by the tappable name of the instance -->
+    <string name="instant_onboarding_agree_instance">I agree to create a profile on %1$s</string>
     <!-- Confirmation button on the instant onboarding screen -->
-    <string name="instant_onboarding_create">Create Profile</string>
-    <!-- Hint about on which instance (server) the account will be created -->
-    <string name="instant_onboarding_default_info">Your profile will be created on the default instance.</string>
-    <!-- Hint about on which instance (server) the account will be created; next line follows the instance domain name -->
-    <string name="instant_onboarding_instance_info">Your profile will be created on the following instance:</string>
+    <string name="instant_onboarding_create">Create New Profile</string>
     <!-- Secondary, link-like button to open a page with other possible instances -->
-    <string name="instant_onboarding_show_more_instances">Show other instances</string>
+    <string name="instant_onboarding_show_more_instances">Explore Other Options</string>
     <!-- Hint about what happens when "Create Profile" button in pressed; the placeholder will be replaced by the group name -->
     <string name="instant_onboarding_group_info">Create a profile to join the group \"%1$s\".</string>
     <!-- Hint about what happens when "Create Profile" button in pressed; the placeholder will be replaced by contact name and/or address -->

From 37f5ffd43f934be77b859f10e0f0f3ab12c86623 Mon Sep 17 00:00:00 2001
From: "B. Petersen" <r10s@b44t.com>
Date: Wed, 24 Apr 2024 14:48:00 +0200
Subject: [PATCH 3/6] make 'I agree to 'Privacy Policy' easier tappable and
 usable

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

diff --git a/res/values/strings.xml b/res/values/strings.xml
index d0f2086c0d..88bd248ac4 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -557,8 +557,8 @@
     <string name="manual_account_setup_option">Manual Login</string>
     <!-- Instant onboarding title (there is not more to do than to set name and avatar) -->
     <string name="instant_onboarding_title">Your Profile</string>
-    <!-- The two placeholders mark beginning and end of a tappable link -->
-    <string name="instant_onboarding_agree_default">I agree to the %1$sPrivacy Policy%2$s</string>
+    <!-- The placeholder will be replaced by the tappable string "Privacy Policy" (privacy_policy) -->
+    <string name="instant_onboarding_agree_default">I agree to the %1$s</string>
     <!-- The placeholder will be replaced by the tappable name of the instance -->
     <string name="instant_onboarding_agree_instance">I agree to create a profile on %1$s</string>
     <!-- Confirmation button on the instant onboarding screen -->

From b8a8052541659df1b84697d30f6b3e0814518a49 Mon Sep 17 00:00:00 2001
From: "B. Petersen" <r10s@b44t.com>
Date: Wed, 24 Apr 2024 15:04:51 +0200
Subject: [PATCH 4/6] make 'I agree to 'Privacy Policy' usable for react

---
 res/values/strings.xml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 88bd248ac4..5380e8acd9 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -557,8 +557,9 @@
     <string name="manual_account_setup_option">Manual Login</string>
     <!-- Instant onboarding title (there is not more to do than to set name and avatar) -->
     <string name="instant_onboarding_title">Your Profile</string>
-    <!-- The placeholder will be replaced by the tappable string "Privacy Policy" (privacy_policy) -->
-    <string name="instant_onboarding_agree_default">I agree to the %1$s</string>
+    <!-- The string will be followed by a space and the tappable text "Privacy Policy" (instant_onboarding_agree_privacy_policy). We know, this is not optimal for all languages, but it is the easiest way for React for now :) -->
+    <string name="instant_onboarding_agree_default">I agree to the</string>
+    <string name="instant_onboarding_agree_privacy_policy">Privacy Policy</string>
     <!-- The placeholder will be replaced by the tappable name of the instance -->
     <string name="instant_onboarding_agree_instance">I agree to create a profile on %1$s</string>
     <!-- Confirmation button on the instant onboarding screen -->

From 7e09c40c1f07d9ac7f43de34a84fd9758ec40176 Mon Sep 17 00:00:00 2001
From: "B. Petersen" <r10s@b44t.com>
Date: Wed, 24 Apr 2024 17:14:04 +0200
Subject: [PATCH 5/6] simplify 'Privacy Policy' handling

---
 res/values/strings.xml | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 5380e8acd9..a07423f982 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -557,13 +557,12 @@
     <string name="manual_account_setup_option">Manual Login</string>
     <!-- Instant onboarding title (there is not more to do than to set name and avatar) -->
     <string name="instant_onboarding_title">Your Profile</string>
-    <!-- The string will be followed by a space and the tappable text "Privacy Policy" (instant_onboarding_agree_privacy_policy). We know, this is not optimal for all languages, but it is the easiest way for React for now :) -->
-    <string name="instant_onboarding_agree_default">I agree to the</string>
-    <string name="instant_onboarding_agree_privacy_policy">Privacy Policy</string>
-    <!-- The placeholder will be replaced by the tappable name of the instance -->
-    <string name="instant_onboarding_agree_instance">I agree to create a profile on %1$s</string>
+    <!-- This is a link to the default Privacy Policy -->
+    <string name="instant_onboarding_agree_default">Read the Privacy Policy</string>
+    <!-- The placeholder will be replaced by instance name, the whole text will link to the instance page -->
+    <string name="instant_onboarding_agree_instance">Create profile on %1$s</string>
     <!-- Confirmation button on the instant onboarding screen -->
-    <string name="instant_onboarding_create">Create New Profile</string>
+    <string name="instant_onboarding_create">Agree &amp; Create Profile</string>
     <!-- Secondary, link-like button to open a page with other possible instances -->
     <string name="instant_onboarding_show_more_instances">Explore Other Options</string>
     <!-- Hint about what happens when "Create Profile" button in pressed; the placeholder will be replaced by the group name -->

From 249ec8ec96225b6e0ddf7eaae436373579470464 Mon Sep 17 00:00:00 2001
From: "B. Petersen" <r10s@b44t.com>
Date: Wed, 24 Apr 2024 17:16:42 +0200
Subject: [PATCH 6/6] tweak other-instance text

---
 res/values/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/res/values/strings.xml b/res/values/strings.xml
index a07423f982..29ab49d791 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -560,7 +560,7 @@
     <!-- This is a link to the default Privacy Policy -->
     <string name="instant_onboarding_agree_default">Read the Privacy Policy</string>
     <!-- The placeholder will be replaced by instance name, the whole text will link to the instance page -->
-    <string name="instant_onboarding_agree_instance">Create profile on %1$s</string>
+    <string name="instant_onboarding_agree_instance">About profiles on %1$s</string>
     <!-- Confirmation button on the instant onboarding screen -->
     <string name="instant_onboarding_create">Agree &amp; Create Profile</string>
     <!-- Secondary, link-like button to open a page with other possible instances -->