mirror of
https://github.com/ArcaneChat/android.git
synced 2026-07-03 14:05:24 +02:00
Merge remote-tracking branch 'origin/main'
This commit is contained in:
@@ -63,6 +63,17 @@
|
||||
|
||||
</com.google.android.material.textfield.TextInputLayout>
|
||||
|
||||
<TextView
|
||||
android:id="@+id/information_label"
|
||||
app:layout_constraintTop_toBottomOf="@id/email"
|
||||
app:layout_constraintEnd_toEndOf="@id/guideline_root_end"
|
||||
app:layout_constraintStart_toStartOf="@id/guideline_root_start"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="32dp"
|
||||
android:text="@string/new_classic_contact_explain"
|
||||
android:textColor="@color/gray50" />
|
||||
|
||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||
|
||||
</ScrollView>
|
||||
|
||||
@@ -200,6 +200,7 @@
|
||||
<!-- menu labels (or icon, buttons...) -->
|
||||
<string name="menu_new_contact">New Contact</string>
|
||||
<string name="menu_new_classic_contact">Add Contact Manually</string>
|
||||
<string name="new_classic_contact_explain">Manually added contacts can be used to text to classic e-mail and are not guaranteed end-to-end encrypted.</string>
|
||||
<string name="menu_new_chat">New Chat</string>
|
||||
<string name="menu_new_group">New Group</string>
|
||||
<string name="clone_chat">Clone Chat</string>
|
||||
|
||||
Reference in New Issue
Block a user