aboutsummaryrefslogtreecommitdiff
path: root/main/src
diff options
context:
space:
mode:
Diffstat (limited to 'main/src')
-rw-r--r--main/src/ui/add_conversation/add_conference_dialog.vala2
-rw-r--r--main/src/ui/contact_details/settings_provider.vala2
-rw-r--r--main/src/ui/unified_window.vala2
3 files changed, 3 insertions, 3 deletions
diff --git a/main/src/ui/add_conversation/add_conference_dialog.vala b/main/src/ui/add_conversation/add_conference_dialog.vala
index 5c5b458c..c9bc42ad 100644
--- a/main/src/ui/add_conversation/add_conference_dialog.vala
+++ b/main/src/ui/add_conversation/add_conference_dialog.vala
@@ -24,7 +24,7 @@ public class AddConferenceDialog : Gtk.Dialog {
public AddConferenceDialog(StreamInteractor stream_interactor) {
Object(use_header_bar : 1);
- this.title = _("Join Conference");
+ this.title = _("Join Channel");
this.modal = true;
this.stream_interactor = stream_interactor;
diff --git a/main/src/ui/contact_details/settings_provider.vala b/main/src/ui/contact_details/settings_provider.vala
index b6da329d..2f5d31a0 100644
--- a/main/src/ui/contact_details/settings_provider.vala
+++ b/main/src/ui/contact_details/settings_provider.vala
@@ -22,7 +22,7 @@ public class SettingsProvider : Plugins.ContactDetailsProvider, Object {
contact_details.add(_("Settings"), _("Send typing notifications"), "", combobox_typing);
ComboBoxText combobox_marker = get_combobox(Dino.Application.get_default().settings.send_marker);
- contact_details.add(_("Settings"), _("Send message marker"), "", combobox_marker);
+ contact_details.add(_("Settings"), _("Send read receipts"), "", combobox_marker);
combobox_marker.active_id = get_setting_id(conversation.send_marker);
combobox_marker.changed.connect(() => { conversation.send_marker = get_setting(combobox_marker.active_id); } );
diff --git a/main/src/ui/unified_window.vala b/main/src/ui/unified_window.vala
index ac069697..e2798def 100644
--- a/main/src/ui/unified_window.vala
+++ b/main/src/ui/unified_window.vala
@@ -173,7 +173,7 @@ public class NoConversationsPlaceholder : UnifiedWindowPlaceholder {
public NoConversationsPlaceholder() {
label.label = _("No active conversations");
primary_button.label = _("Start Conversation");
- secondary_button.label = _("Join Conference");
+ secondary_button.label = _("Join Channel");
secondary_button.visible = true;
}
}