diff --git a/build.gradle b/build.gradle index 4d454a7aa..248fdf795 100644 --- a/build.gradle +++ b/build.gradle @@ -91,7 +91,7 @@ android { defaultConfig { minSdkVersion 21 targetSdkVersion 32 - versionCode 42050 + versionCode 42051 versionName "2.12.2" archivesBaseName += "-$versionName" applicationId "eu.siacs.conversations" diff --git a/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java b/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java index 7a2ffc0d8..dd14d1f63 100644 --- a/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java @@ -765,7 +765,7 @@ public class StartConversationActivity extends XmppActivity implements XmppConne if (QuickConversationsService.isConversations()) { confirmButtonText = R.string.next; } else { - confirmButtonText = R.string.confirm; + confirmButtonText = R.string.agree_and_continue; } builder.setPositiveButton(confirmButtonText, (dialog, which) -> { if (requestPermission.compareAndSet(false, true)) { diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index 4edf1ae7d..3f743bbae 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -517,7 +517,7 @@ Grant %1$s access to the camera Synchronize with contacts %1$s wants permission to access your address book to match it with your XMPP contact list.\nThis will display your contacts’ full names and avatars.\n\n%1$s will only read your address book and match it locally without uploading anything to your server. -
We will not store a copy of those phone numbers.\n\nFor more information read our privacy policy.

You will now be asked to grant permission to access your contacts.]]>
+
We will not store a copy of those phone numbers.\n\nFor more information read our privacy policy.

You will now be asked to grant permission to access your contacts.]]>
Notify on all messages Notify only when mentioned Notifications disabled @@ -542,7 +542,7 @@ Share URI with… Join the Conversation Have some Quick Conversations -
You sign up with your phone number and Quicksy will automatically—based on the phone numbers in your address book—suggest possible contacts to you.

By signing up you agree to our privacy policy.]]>
+
You sign up with your phone number and Quicksy will automatically—based on the phone numbers in your address book—suggest possible contacts to you.

By signing up you agree to our privacy policy.]]>
Agree and continue A guide is set up for account creation on conversations.im.\nWhen picking conversations.im as a provider you will be able to communicate with users of other providers by giving them your full XMPP address. Your full XMPP address will be: %s