fix merge conflict between #2743 and #2746

Closes #2789

//FREEBIE
pull/1/head
agrajaghh 9 years ago committed by Moxie Marlinspike
parent 62181a3d7f
commit 6f600a80b8

@ -197,8 +197,7 @@ public class RegistrationActivity extends BaseActionBarActivity {
AlertDialogWrapper.Builder dialog = new AlertDialogWrapper.Builder(self);
dialog.setTitle(PhoneNumberFormatter.getInternationalFormatFromE164(e164number));
dialog.setMessage(String.format(getString(R.string.RegistrationActivity_we_will_now_verify_that_the_following_number_is_associated_with_your_device_s),
PhoneNumberFormatter.getInternationalFormatFromE164(e164number)));
dialog.setMessage(R.string.RegistrationActivity_we_will_now_verify_that_the_following_number_is_associated_with_your_device_s);
dialog.setPositiveButton(getString(R.string.RegistrationActivity_continue),
new DialogInterface.OnClickListener() {
@Override

Loading…
Cancel
Save