Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-15 20:29:52 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'change-contact-name' into 'master'

Browse Source 
Change button text to match name of action

See merge request briar/briar!979
This commit is contained in:
Torsten Grote
2018-11-07 12:11:22 +00:00
parent 866be99179 4738bfdd85
commit 391732b239
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
briar-android/src/main/res/layout/fragment_alias_dialog.xml
View File

@@ -47,7 +47,7 @@
style="@style/BriarButtonFlat.Positive" style="@style/BriarButtonFlat.Positive"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/set_alias"/> android:text="@string/set_alias_button"/>
</LinearLayout> </LinearLayout>

5
briar-android/src/main/res/values/strings.xml
View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
<string name="app_name" translatable="false">Briar</string> <string name="app_name" translatable="false">Briar</string>
<string name="app_package" translatable="false">org.briarproject.briar.android</string> <string name="app_package" translatable="false">org.briarproject.briar.android</string>
@@ -129,7 +129,7 @@
<string name="message_hint">Type message</string> <string name="message_hint">Type message</string>
<string name="set_contact_alias">Change contact name</string> <string name="set_contact_alias">Change contact name</string>
<string name="set_contact_alias_hint">Contact name</string> <string name="set_contact_alias_hint">Contact name</string>
<string name="set_alias">Set</string> <string name="set_alias_button">Change</string>
<string name="delete_contact">Delete contact</string> <string name="delete_contact">Delete contact</string>
<string name="dialog_title_delete_contact">Confirm Contact Deletion</string> <string name="dialog_title_delete_contact">Confirm Contact Deletion</string>
<string name="dialog_message_delete_contact">Are you sure that you want to remove this contact and all messages exchanged with this contact?</string> <string name="dialog_message_delete_contact">Are you sure that you want to remove this contact and all messages exchanged with this contact?</string>
@@ -502,5 +502,4 @@
<!-- This is a message to be used in screenshots. --> <!-- This is a message to be used in screenshots. -->
<string name="screenshot_message_3">No problem, hope you like it 😀</string> <string name="screenshot_message_3">No problem, hope you like it 😀</string>
</resources> </resources>