diff options
| author | Beriain <beriain@bitmessage.ch> | 2014-05-13 16:46:03 +0200 |
|---|---|---|
| committer | Beriain <beriain@bitmessage.ch> | 2014-05-13 16:46:03 +0200 |
| commit | 8d27d0c44a4c35ce4606628eb5a280df4b1a8c5b (patch) | |
| tree | d5d45d67e14e707446fd0a427cc8f00fc58e8685 /src/eu/siacs/conversations/ui | |
| parent | 1150f47addba09889fd64fd6d59d98c115ea71cf (diff) | |
| parent | 7e667319607aa5ed9fd2a2aa1573c40ffae3a613 (diff) | |
Merge https://github.com/siacs/Conversations into development
Diffstat (limited to 'src/eu/siacs/conversations/ui')
| -rw-r--r-- | src/eu/siacs/conversations/ui/ContactDetailsActivity.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/eu/siacs/conversations/ui/ContactDetailsActivity.java b/src/eu/siacs/conversations/ui/ContactDetailsActivity.java index eaa9b8ee..06179bc6 100644 --- a/src/eu/siacs/conversations/ui/ContactDetailsActivity.java +++ b/src/eu/siacs/conversations/ui/ContactDetailsActivity.java @@ -173,7 +173,7 @@ public class ContactDetailsActivity extends XmppActivity { if (contact.getSubscriptionOption(Contact.Subscription.FROM)) { send.setChecked(true); } else { - send.setText("Preemptively grant subscription request"); + send.setText(R.string.preemptively_grant); if (contact .getSubscriptionOption(Contact.Subscription.PREEMPTIVE_GRANT)) { send.setChecked(true); @@ -184,7 +184,7 @@ public class ContactDetailsActivity extends XmppActivity { if (contact.getSubscriptionOption(Contact.Subscription.TO)) { receive.setChecked(true); } else { - receive.setText("Ask for presence updates"); + receive.setText(R.string.ask_for_presence_updates); askAgain.setVisibility(View.VISIBLE); askAgain.setOnClickListener(new OnClickListener() { |