diff --git a/main/src/ui/add_conversation/conference_details_fragment.vala b/main/src/ui/add_conversation/conference_details_fragment.vala index 027483f4..13bf1c5a 100644 --- a/main/src/ui/add_conversation/conference_details_fragment.vala +++ b/main/src/ui/add_conversation/conference_details_fragment.vala @@ -146,12 +146,12 @@ protected class ConferenceDetailsFragment : Box { case Xmpp.Xep.Muc.MucEnterError.CREATION_RESTRICTED: label_text = _("Not allowed to create room"); break; case Xmpp.Xep.Muc.MucEnterError.NOT_IN_MEMBER_LIST: - label_text = _("Room is members only"); break; + label_text = _("Members-only room"); break; case Xmpp.Xep.Muc.MucEnterError.USE_RESERVED_ROOMNICK: case Xmpp.Xep.Muc.MucEnterError.NICK_CONFLICT: label_text = _("Choose a different nick"); break; case Xmpp.Xep.Muc.MucEnterError.OCCUPANT_LIMIT_REACHED: - label_text = _("Room has too many occupants"); break; + label_text = _("Too many occupants in room"); break; } notification_label.label = label_text; notification_revealer.set_reveal_child(true); diff --git a/main/src/ui/contact_details/muc_config_form_provider.vala b/main/src/ui/contact_details/muc_config_form_provider.vala index d4598265..8340740a 100644 --- a/main/src/ui/contact_details/muc_config_form_provider.vala +++ b/main/src/ui/contact_details/muc_config_form_provider.vala @@ -43,13 +43,13 @@ public class MucConfigFormProvider : Plugins.ContactDetailsProvider, Object { break; case "muc#roomconfig_persistentroom": label = _("Persistent"); - desc = _("The room will persist after the last occupant exits"); + desc = _("The room will persist after the last occupant leaves"); break; case "muc#roomconfig_publicroom": label = _("Publicly searchable"); break; case "muc#roomconfig_changesubject": - label = _("Occupants may change subject"); + label = _("Occupants may change the subject"); break; case "muc#roomconfig_whois": label = _("Discover real JIDs"); @@ -57,7 +57,7 @@ public class MucConfigFormProvider : Plugins.ContactDetailsProvider, Object { break; case "muc#roomconfig_roomsecret": label = _("Password"); - desc = _("Password required to enter the room. Leave empty for none"); + desc = _("Password required for room entry, if any"); break; case "muc#roomconfig_moderatedroom": label = _("Moderated"); @@ -69,7 +69,7 @@ public class MucConfigFormProvider : Plugins.ContactDetailsProvider, Object { break; case "muc#roomconfig_historylength": label = _("Message history"); - desc = _("Maximum number of history messages returned by the room"); + desc = _("Maximum amount of backlog issued by the room"); break; } } diff --git a/main/src/ui/unified_window.vala b/main/src/ui/unified_window.vala index be5b0805..06dde74f 100644 --- a/main/src/ui/unified_window.vala +++ b/main/src/ui/unified_window.vala @@ -134,7 +134,7 @@ public class UnifiedWindow : Window { public class NoAccountsPlaceholder : UnifiedWindowPlaceholder { public NoAccountsPlaceholder() { - label.label = _("No accounts active"); + label.label = _("No active accounts"); primary_button.label = _("Manage accounts"); secondary_button.visible = false; } @@ -142,7 +142,7 @@ public class NoAccountsPlaceholder : UnifiedWindowPlaceholder { public class NoConversationsPlaceholder : UnifiedWindowPlaceholder { public NoConversationsPlaceholder() { - label.label = _("No conversation active"); + label.label = _("No active conversations"); primary_button.label = _("Start Chat"); secondary_button.label = _("Join Conference"); secondary_button.visible = true;