provide the same fab submenu for both tabs. rename tab to bookmark

1 files changed, 2 insertions, 2 deletions

diff --git a/src/main/java/de/pixart/messenger/ui/JoinConferenceDialog.java b/src/main/java/de/pixart/messenger/ui/JoinConferenceDialog.java
index 4d05d6d2c..67cc3a9d2 100644
--- a/src/main/java/de/pixart/messenger/ui/JoinConferenceDialog.java
+++ b/src/main/java/de/pixart/messenger/ui/JoinConferenceDialog.java
@@ -54,9 +54,9 @@ public class JoinConferenceDialog extends DialogFragment implements OnBackendCon
     @Override
     public Dialog onCreateDialog(Bundle savedInstanceState) {
         final AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
-        builder.setTitle(R.string.join_conference);
+        builder.setTitle(R.string.join_public_channel);
         DialogJoinConferenceBinding binding = DataBindingUtil.inflate(getActivity().getLayoutInflater(), R.layout.dialog_join_conference, null, false);
-        DelayedHintHelper.setHint(R.string.conference_address_example, binding.jid);
+        DelayedHintHelper.setHint(R.string.channel_full_jid_example, binding.jid);
         this.knownHostsAdapter = new KnownHostsAdapter(getActivity(), R.layout.simple_list_item);
         binding.jid.setAdapter(knownHostsAdapter);
         String prefilledJid = getArguments().getString(PREFILLED_JID_KEY);