gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-06-25 14:40:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update strings

Browse Source 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
This commit is contained in:
Mario Danic 2018-07-13 15:39:21 +02:00
parent d234722c7c
commit 4031412f85
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/com/nextcloud/talk/controllers/bottomsheet/CallMenuController.java
View File

@ -125,12 +125,18 @@ public class CallMenuController extends BaseController implements FlexibleAdapte
if (menuType.equals(MenuType.REGULAR)) { if (menuType.equals(MenuType.REGULAR)) {
if (!TextUtils.isEmpty(room.getDisplayName())) { if (!TextUtils.isEmpty(room.getDisplayName())) {
<<<<<<< Updated upstream
menuItems.add(new MenuItem( menuItems.add(new MenuItem(
getResources().getString( getResources().getString(
R.string.nc_configure_named_room, room.getDisplayName()), 0, null)); R.string.nc_configure_named_room, room.getDisplayName()), 0, null));
} else if (!TextUtils.isEmpty(room.getName())) { } else if (!TextUtils.isEmpty(room.getName())) {
menuItems.add(new MenuItem(getResources().getString( menuItems.add(new MenuItem(getResources().getString(
R.string.nc_configure_named_room, room.getName()), 0, null)); R.string.nc_configure_named_room, room.getName()), 0, null));
=======
menuItems.add(new MenuItem(room.getDisplayName(), 0, null));
} else if (!TextUtils.isEmpty(room.getName())) {
menuItems.add(new MenuItem(room.getName(), 0, null));
>>>>>>> Stashed changes
} else { } else {
menuItems.add(new MenuItem(getResources().getString(R.string.nc_configure_room), 0, null)); menuItems.add(new MenuItem(getResources().getString(R.string.nc_configure_room), 0, null));
} }

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

@ -85,7 +85,6 @@
<!-- Room menu --> <!-- Room menu -->
<string name="nc_start_conversation">Start a conversation</string> <string name="nc_start_conversation">Start a conversation</string>
<string name="nc_configure_room">Configure conversation</string> <string name="nc_configure_room">Configure conversation</string>
<string name="nc_configure_named_room">%1$s</string>
<string name="nc_leave">Leave conversation</string> <string name="nc_leave">Leave conversation</string>
<string name="nc_rename">Rename conversation</string> <string name="nc_rename">Rename conversation</string>
<string name="nc_set_password">Set a password</string> <string name="nc_set_password">Set a password</string>
@ -145,7 +144,6 @@
<string name="nc_share_text_pass">\nPassword: %1$s</string> <string name="nc_share_text_pass">\nPassword: %1$s</string>
<!-- Magical stuff --> <!-- Magical stuff -->
<string name="nc_empty"></string>
<string name="nc_push_to_talk">Push-to-talk</string> <string name="nc_push_to_talk">Push-to-talk</string>
<string name="nc_push_to_talk_desc">With microphone disabled, click&amp;hold to use Push-to-talk</string> <string name="nc_push_to_talk_desc">With microphone disabled, click&amp;hold to use Push-to-talk</string>
<string name="nc_store_short_desc">Have private video calls and chat using your own server.</string> <string name="nc_store_short_desc">Have private video calls and chat using your own server.</string>