diff options
| author | Daniel Gultsch <daniel@gultsch.de> | 2015-12-07 13:17:06 +0100 |
|---|---|---|
| committer | Christian S <christian@pix-art.de> | 2015-12-12 15:49:28 +0100 |
| commit | edb439d93386d12bd82df40f9552213f8d1ea81b (patch) | |
| tree | d5a7e031177db4823d3aeebca664258ced69518f | |
| parent | 9c2b7c76d2eb21212dd8f285f0699b34a835aff5 (diff) | |
modified contact permission dialog
| -rw-r--r-- | src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java | 2 | ||||
| -rw-r--r-- | src/main/res/values/strings.xml | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java b/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java index f6a386478..caf3d3db8 100644 --- a/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java @@ -600,7 +600,7 @@ public class StartConversationActivity extends XmppActivity implements OnRosterU AlertDialog.Builder builder = new AlertDialog.Builder(this); builder.setTitle(R.string.sync_with_contacts); builder.setMessage(R.string.sync_with_contacts_long); - builder.setPositiveButton(R.string.sync_now, new OnClickListener() { + builder.setPositiveButton(R.string.next, new OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index 75825cbf9..c4ea72555 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -578,6 +578,5 @@ <string name="shared_image_with_x">Shared image with %s</string> <string name="no_storage_permission">Conversations need access to external storage</string> <string name="sync_with_contacts">Synchronize with contacts</string> - <string name="sync_with_contacts_long">Conversations wants to match your XMPP roster with your contacts to show their full names and avatars.\n\nConversations will only read your contacts and match them locally without uploading them to your server.</string> - <string name="sync_now">Synchronize now</string> + <string name="sync_with_contacts_long">Conversations wants to match your XMPP roster with your contacts to show their full names and avatars.\n\nConversations will only read your contacts and match them locally without uploading them to your server.\n\nYou will now be asked to grant permission to access your contacts.</string> </resources> |