mirror
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Added identity hint

This commit is contained in:
M66B 2019-03-04 09:24:15 +00:00
parent 68a7abed74
commit 630744b4e3
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/src/main/res/layout/fragment_identity.xml
View File

@ -395,6 +395,16 @@
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/etRealm" /> app:layout_constraintTop_toBottomOf="@id/etRealm" />
<TextView
android:id="@+id/tvUseIpHint"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/title_identity_use_ip_hint"
android:textAppearance="@style/TextAppearance.AppCompat.Small"
android:textStyle="italic"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/cbUseIp" />
<CheckBox <CheckBox
android:id="@+id/cbSynchronize" android:id="@+id/cbSynchronize"
android:layout_width="wrap_content" android:layout_width="wrap_content"
@ -402,7 +412,7 @@
android:layout_marginTop="12dp" android:layout_marginTop="12dp"
android:text="@string/title_synchronize_identity" android:text="@string/title_synchronize_identity"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/cbUseIp" /> app:layout_constraintTop_toBottomOf="@id/tvUseIpHint" />
<CheckBox <CheckBox
android:id="@+id/cbPrimary" android:id="@+id/cbPrimary"
@ -587,7 +597,7 @@
tvSmtp,tvHost,etHost,cbStartTls,cbInsecure,tvPort,etPort, tvSmtp,tvHost,etHost,cbStartTls,cbInsecure,tvPort,etPort,
tvUser,etUser,tvPassword,tilPassword, tvUser,etUser,tvPassword,tilPassword,
tvRealm,etRealm, tvRealm,etRealm,
cbUseIp, cbUseIp,tvUseIpHint,
cbSynchronize,cbPrimary, cbSynchronize,cbPrimary,
tvReplyTo,etReplyTo,tvBcc,etBcc, tvReplyTo,etReplyTo,tvBcc,etBcc,
cbPlainOnly,cbEncrypt,cbDeliveryReceipt,cbReadReceipt,tvReceipt, cbPlainOnly,cbEncrypt,cbDeliveryReceipt,cbReadReceipt,tvReceipt,

1
app/src/main/res/values/strings.xml
View File

@ -203,6 +203,7 @@
<string name="title_identity_reply_to">Reply to address</string> <string name="title_identity_reply_to">Reply to address</string>
<string name="title_identity_plain_text">Send plain text only</string> <string name="title_identity_plain_text">Send plain text only</string>
<string name="title_identity_encrypt">Encrypt by default</string> <string name="title_identity_encrypt">Encrypt by default</string>
<string name="title_identity_use_ip_hint">In case of \'invalid greeting\', \'requires valid address\' or a similar error, try to change this setting</string>
<string name="title_identity_read_receipt">Request read receipt</string> <string name="title_identity_read_receipt">Request read receipt</string>
<string name="title_identity_delivery_receipt">Request delivery receipt</string> <string name="title_identity_delivery_receipt">Request delivery receipt</string>
<string name="title_identity_receipt_remark">Most providers ignore receipt requests</string> <string name="title_identity_receipt_remark">Most providers ignore receipt requests</string>