blallo
/
Signal-Android
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix some wording for group conversations 

Closes #6204
Fixes #6193

// FREEBIE
master
RiseT 2017-02-10 11:46:01 +01:00 committed by Moxie Marlinspike
parent e1f09e0437
commit 917389131c
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
res/menu/conversation_push_group_options.xml
View File

@ -2,7 +2,7 @@
<menu xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
<item android:id="@+id/menu_edit_group"
android:title="@string/conversation__menu_update_group"
android:title="@string/conversation__menu_edit_group"
app:showAsAction="collapseActionView" />
<item android:id="@+id/menu_leave"

2
res/menu/group_create.xml
View File

@ -2,7 +2,7 @@
<menu xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
<item android:title="@string/GroupCreateActivity_menu_create_title"
<item android:title="@string/GroupCreateActivity_menu_apply_button"
android:id="@+id/menu_create_group"
android:icon="?menu_accept_icon"
app:showAsAction="always|withText"/>

6
res/values/strings.xml
View File

@ -285,7 +285,7 @@
<!-- GroupCreateActivity -->
<string name="GroupCreateActivity_actionbar_title">New group</string>
<string name="GroupCreateActivity_actionbar_update_title">Update group</string>
<string name="GroupCreateActivity_actionbar_edit_title">Edit group</string>
<string name="GroupCreateActivity_group_name_hint">Group name</string>
<string name="GroupCreateActivity_actionbar_mms_title">New MMS group</string>
<string name="GroupCreateActivity_contacts_dont_support_push">You have selected a contact that doesn\'t support Signal groups, so this group will be MMS.</string>
@ -294,7 +294,7 @@
<string name="GroupCreateActivity_contacts_no_members">You need at least one person in your group!</string>
<string name="GroupCreateActivity_contacts_invalid_number">One of the members of your group has a number that can\'t be read correctly. Please fix or remove that contact and try again.</string>
<string name="GroupCreateActivity_avatar_content_description">Group avatar</string>
<string name="GroupCreateActivity_menu_create_title">Create group</string>
<string name="GroupCreateActivity_menu_apply_button">Apply</string>
<string name="GroupCreateActivity_creating_group">Creating %1$s&#8230;</string>
<string name="GroupCreateActivity_updating_group">Updating %1$s...</string>
<string name="GroupCreateActivity_cannot_add_non_push_to_existing_group">Couldn\'t add %1$s because they\'re not a Signal user.</string>
@ -1229,7 +1229,7 @@
<!-- conversation -->
<string name="conversation__menu_add_attachment">Add attachment</string>
<string name="conversation__menu_update_group">Update group</string>
<string name="conversation__menu_edit_group">Edit group</string>
<string name="conversation__menu_leave_group">Leave group</string>
<string name="conversation__menu_delete_thread">Delete conversation</string>
<string name="conversation__menu_view_media">All images</string>

2
src/org/thoughtcrime/securesms/GroupCreateActivity.java
View File

@ -167,7 +167,7 @@ public class GroupCreateActivity extends PassphraseRequiredActionBarActivity
} else {
enableSignalGroupViews();
getSupportActionBar().setTitle(groupToUpdate.isPresent()
? R.string.GroupCreateActivity_actionbar_update_title
? R.string.GroupCreateActivity_actionbar_edit_title
: R.string.GroupCreateActivity_actionbar_title);
}
}