yetangitu/deltachat
1
0
Fork 0
mirror of https://github.com/deltachat/deltachat-android.git synced 2025-10-03 09:49:21 +02:00
Code Issues Releases Wiki Activity

tone down verification wording

Browse source
This commit is contained in:
B. Petersen 2019-01-15 01:35:53 +01:00
parent 779457aa65
commit b6fa7d0c6b
No known key found for this signature in database
GPG key ID: 3B88E92DEA8E9AFC
5 changed files with 35 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

6
res/menu/text_secure_normal.xml
View file

@ -7,12 +7,12 @@
android:icon="@drawable/ic_ab_qr"
app:showAsAction="always"/>
<item android:title="@string/qrshow_title"
android:id="@+id/menu_qr_show" />
<item android:title="@string/menu_new_chat"
android:id="@+id/menu_new_chat" />
<item android:title="@string/qrshow_title"
android:id="@+id/menu_qr_show" />
<item android:title="@string/menu_deaddrop"
android:id="@+id/menu_deaddrop" />

38
res/values/strings.xml
View file

@ -278,10 +278,12 @@
<!-- Translators: %1$s will be replaced by the server name (eg. imap.somewhere.org) and %2$s will be replaced by the human-readable response from the server. this response may be a single word or some sentences and may or may not be localized. -->
<string name="login_error_server_response">Response from %1$s: %2$s\n\nSome providers place additional information in your inbox; you can check them it eg. in the web frontend. Consult your provider or friends if you run into problems.</string>
<!-- share and forward messages -->
<!-- Translators: Title shown above a chat/contact list; the user selects the recipient of the messages he wants to forward to -->
<string name="forward_to">Forward to …</string>
<!-- preferences -->
<string name="pref_summary_on">on</string>
<string name="pref_summary_off">off</string>
@ -416,24 +418,24 @@
<string name="qrscan_title">Scan QR code</string>
<string name="qrscan_hint">Place your camera over the QR code</string>
<string name="qrscan_ask_join_group">Do you want to join the group \"%1$s\"?</string>
<string name="qrscan_ask_join_verified_group">Do you want to join the verified group \"%1$s\"?</string>
<string name="qrscan_ask_fingerprint_ask_oob">Verify contact and start chatting with \"%1$s\"?</string>
<string name="qrscan_ask_chatting_fingerprint_ok">Contact \"%1$s\" verified. Start chatting?</string>
<string name="qrscan_fingerprint_mismatch">The scanned fingerprint does \"not match\" the fingerprint last seen for \"%1$s\".</string>
<string name="qrscan_no_addr_found">This QR code contains a fingerprint but no email address.\n\nFor an out-of-band-verification, please establish an encrpyted connection to the recipient first.</string>
<string name="qrscan_fingerprint_mismatch">The scanned fingerprint does not match the fingerprint last seen for %1$s</string>
<string name="qrscan_no_addr_found">This QR code contains a fingerprint but no email address.\n\nFor an out-of-band-verification, please establish an encrypted connection to the recipient first.</string>
<string name="qrscan_contains_text">Scanned QR code text:\n\n%1$s</string>
<string name="qrscan_contains_url">Scanned QR code URL:\n\n%1$s</string>
<string name="qrscan_fingerprint_label">Fingerprint</string>
<string name="qrscan_x_verified_introduce_myself">%1$s verified, introduce myself …</string>
<string name="qrshow_title">Show QR verify code</string>
<string name="qrshow_title">QR invite code</string>
<string name="qrshow_x_joining">%1$s joins.</string>
<string name="qrshow_x_verified">%1$s verified.</string>
<string name="qrshow_x_has_joined_group">%1$s securely joined the group.</string>
<string name="qrshow_x_has_joined_group">%1$s joined the group.</string>
<string name="qrshow_join_group_title">QR invite code</string>
<string name="qrshow_join_group_hint">Scan this to join the group \"%1$s\".</string>
<string name="qrshow_join_verified_group_hint">Scan this to join the verified group \"%1$s\".</string>
<string name="qrshow_join_verified_group_title">QR invite code</string>
<string name="qrshow_join_contact_title">QR verify code</string>
<string name="qrshow_join_contact_hint">\"%1$s\" Scan this to set up a verified contact.</string>
<string name="qrshow_join_contact_title">QR invite code</string>
<string name="qrshow_join_contact_hint">Scan this to set up a contact with %1$s</string>
<string name="contact_verified">%1$s verified.</string>
<string name="contact_not_verified">Cannot verify %1$s</string>
<!-- translators: "setup" is the "encryption setup" here, as in "Autocrypt Setup Message" -->
<string name="contact_setup_changed">Changed setup for %1$s</string>
<!-- notifications -->
@ -580,4 +582,18 @@
<string name="menu.view.developer.open.log.folder">Open Log Folder</string>
<string name="menu.view.developer.open.current.log.file">Open Current Logfile</string>
<!-- deprecated on android, please remove if unused on desktop -->
<!-- see qrscan_ask_join_group -->
<string name="qrscan_ask_join_verified_group">Do you want to join the verified group \"%1$s\"?</string>
<!-- see ask_start_chat_with -->
<string name="qrscan_ask_fingerprint_ask_oob">Start chatting with \"%1$s\"?</string>
<!-- see ask_start_chat_with -->
<string name="qrscan_ask_chatting_fingerprint_ok">Contact \"%1$s\" verified. Start chatting?</string>
<!-- see qrshow_join_group_title -->
<string name="qrshow_join_verified_group_title">QR invite code</string>
<!-- see qrshow_join_group_hint -->
<string name="qrshow_join_verified_group_hint">Scan this to join the verified group \"%1$s\".</string>
</resources>

2
src/org/thoughtcrime/securesms/QrShowActivity.java
View file

@ -64,7 +64,7 @@ public class QrShowActivity extends AppCompatActivity implements DcEventCenter.D
String groupName = dcContext.getChat(chatId).getName();
hint = String.format(this.getString(R.string.qrshow_join_group_hint), groupName);
supportActionBar.setTitle(groupName);
supportActionBar.setSubtitle(R.string.qrshow_join_verified_group_title);
supportActionBar.setSubtitle(R.string.qrshow_join_group_title);
} else {
// verify-contact
String selfName = DcHelper.get(this, DcHelper.CONFIG_DISPLAY_NAME); // we cannot use MrContact.getDisplayName() as this would result in "Me" instead of

3
src/org/thoughtcrime/securesms/connect/ApplicationDcContext.java
View file

@ -632,6 +632,9 @@ public class ApplicationDcContext extends DcContext {
case 31: s = context.getString(R.string.systemmsg_read_receipt_subject); break;
case 32: s = context.getString(R.string.systemmsg_read_receipt_body); break;
case 33: s = context.getString(R.string.systemmsg_group_image_deleted); break;
case 35: s = context.getString(R.string.contact_verified); break;
case 36: s = context.getString(R.string.contact_not_verified); break;
case 37: s = context.getString(R.string.contact_setup_changed); break;
case 40: s = context.getString(R.string.chat_archived_chats_title); break;
case 42: s = context.getString(R.string.autocrypt_asm_subject); break;
case 43: s = context.getString(R.string.autocrypt_asm_general_body); break;

2
src/org/thoughtcrime/securesms/qr/QrScanHandler.java
View file

@ -152,7 +152,7 @@ public class QrScanHandler implements DcEventCenter.DcEventDelegate {
msg = String.format(activity.getString(R.string.qrscan_ask_join_group), qrParsed.getText1());
break;
default:
msg = String.format(activity.getString(R.string.qrscan_ask_fingerprint_ask_oob), nameNAddr);
msg = String.format(activity.getString(R.string.ask_start_chat_with), nameNAddr);
break;
}
builder.setMessage(Html.fromHtml(msg));