anotherim/anotherim-desktop
2
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Reword some strings (#215)

Browse source 
* conference_s_, Members only room, Too many occupants in room

* conferences → conference

* No active conversations/accounts

* "the account" and escaped apostrophe

* leaves, the subject, Required password, voiced, backlog

* Members-only room

* Remove the \'%s\' account?

* Chosen password required for room entry

* if any

* muc password, voiced, remove account
This commit is contained in:
Allan Nordhøy 2017-11-23 17:07:19 +01:00 committed by fiaxh
parent 64774241e5
commit e0eba9a1ea
3 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
main/src/ui/add_conversation/conference_details_fragment.vala
View file

@ -146,12 +146,12 @@ protected class ConferenceDetailsFragment : Box {
case Xmpp.Xep.Muc.MucEnterError.CREATION_RESTRICTED: case Xmpp.Xep.Muc.MucEnterError.CREATION_RESTRICTED:
label_text = _("Not allowed to create room"); break; label_text = _("Not allowed to create room"); break;
case Xmpp.Xep.Muc.MucEnterError.NOT_IN_MEMBER_LIST: 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.USE_RESERVED_ROOMNICK:
case Xmpp.Xep.Muc.MucEnterError.NICK_CONFLICT: case Xmpp.Xep.Muc.MucEnterError.NICK_CONFLICT:
label_text = _("Choose a different nick"); break; label_text = _("Choose a different nick"); break;
case Xmpp.Xep.Muc.MucEnterError.OCCUPANT_LIMIT_REACHED: 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_label.label = label_text;
notification_revealer.set_reveal_child(true); notification_revealer.set_reveal_child(true);

8
main/src/ui/contact_details/muc_config_form_provider.vala
View file

@ -43,13 +43,13 @@ public class MucConfigFormProvider : Plugins.ContactDetailsProvider, Object {
break; break;
case "muc#roomconfig_persistentroom": case "muc#roomconfig_persistentroom":
label = _("Persistent"); label = _("Persistent");
desc = _("The room will persist after the last occupant exits"); desc = _("The room will persist after the last occupant leaves");
break; break;
case "muc#roomconfig_publicroom": case "muc#roomconfig_publicroom":
label = _("Publicly searchable"); label = _("Publicly searchable");
break; break;
case "muc#roomconfig_changesubject": case "muc#roomconfig_changesubject":
label = _("Occupants may change subject"); label = _("Occupants may change the subject");
break; break;
case "muc#roomconfig_whois": case "muc#roomconfig_whois":
label = _("Discover real JIDs"); label = _("Discover real JIDs");
@ -57,7 +57,7 @@ public class MucConfigFormProvider : Plugins.ContactDetailsProvider, Object {
break; break;
case "muc#roomconfig_roomsecret": case "muc#roomconfig_roomsecret":
label = _("Password"); label = _("Password");
desc = _("Password required to enter the room. Leave empty for none"); desc = _("Password required for room entry, if any");
break; break;
case "muc#roomconfig_moderatedroom": case "muc#roomconfig_moderatedroom":
label = _("Moderated"); label = _("Moderated");
@ -69,7 +69,7 @@ public class MucConfigFormProvider : Plugins.ContactDetailsProvider, Object {
break; break;
case "muc#roomconfig_historylength": case "muc#roomconfig_historylength":
label = _("Message history"); label = _("Message history");
desc = _("Maximum number of history messages returned by the room"); desc = _("Maximum amount of backlog issued by the room");
break; break;
} }
} }

4
main/src/ui/unified_window.vala
View file

@ -134,7 +134,7 @@ public class UnifiedWindow : Window {
public class NoAccountsPlaceholder : UnifiedWindowPlaceholder { public class NoAccountsPlaceholder : UnifiedWindowPlaceholder {
public NoAccountsPlaceholder() { public NoAccountsPlaceholder() {
label.label = _("No accounts active"); label.label = _("No active accounts");
primary_button.label = _("Manage accounts"); primary_button.label = _("Manage accounts");
secondary_button.visible = false; secondary_button.visible = false;
} }
@ -142,7 +142,7 @@ public class NoAccountsPlaceholder : UnifiedWindowPlaceholder {
public class NoConversationsPlaceholder : UnifiedWindowPlaceholder { public class NoConversationsPlaceholder : UnifiedWindowPlaceholder {
public NoConversationsPlaceholder() { public NoConversationsPlaceholder() {
label.label = _("No conversation active"); label.label = _("No active conversations");
primary_button.label = _("Start Chat"); primary_button.label = _("Start Chat");
secondary_button.label = _("Join Conference"); secondary_button.label = _("Join Conference");
secondary_button.visible = true; secondary_button.visible = true;