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

Change UI messages for more clarity

Browse source
This commit is contained in:
mbeko 2020-03-24 21:34:10 +01:00 committed by fiaxh
parent 909689827e
commit 5a98d2919b
6 changed files with 22 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -63,12 +63,12 @@ public class MucConfigFormProvider : Plugins.ContactDetailsProvider, Object {
label = _("Occupants may change the subject"); label = _("Occupants may change the subject");
break; break;
case "muc#roomconfig_whois": case "muc#roomconfig_whois":
label = _("Discover real JIDs"); label = _("Permission to view JIDs");
desc = _("Who may discover real JIDs?"); desc = _("Who is allowed to view the occupants' JIDs?");
break; break;
case "muc#roomconfig_roomsecret": case "muc#roomconfig_roomsecret":
label = _("Password"); label = _("Password");
desc = _("Password required for room entry, if any"); desc = _("A password to restrict access to the room");
break; break;
case "muc#roomconfig_moderatedroom": case "muc#roomconfig_moderatedroom":
label = _("Moderated"); label = _("Moderated");

2
main/src/ui/global_search.vala
View file

@ -137,7 +137,7 @@ public class GlobalSearch : Overlay {
results_empty_stack.set_visible_child_name("results"); results_empty_stack.set_visible_child_name("results");
int match_count = messages.size < 10 ? messages.size : stream_interactor.get_module(SearchProcessor.IDENTITY).count_match_messages(search); int match_count = messages.size < 10 ? messages.size : stream_interactor.get_module(SearchProcessor.IDENTITY).count_match_messages(search);
entry_number_label.label = "<i>" + _("%i search results").printf(match_count) + "</i>"; entry_number_label.label = "<i>" + n("%i search result", "%i search results", match_count).printf(match_count) + "</i>";
loaded_results += messages.size; loaded_results += messages.size;
append_messages(messages); append_messages(messages);
} }

4
main/src/ui/manage_accounts/add_account_dialog.vala
View file

@ -207,7 +207,7 @@ public class AddAccountDialog : Gtk.Dialog {
sign_in_password_box.visible = false; sign_in_password_box.visible = false;
create_account_box.visible = false; create_account_box.visible = false;
register_box.visible = false; register_box.visible = false;
success_description.label = _("You can now start using %s").printf("<b>" + Markup.escape_text(account.bare_jid.to_string()) + "</b>"); success_description.label = _("You can now start using the account %s").printf("<b>" + Markup.escape_text(account.bare_jid.to_string()) + "</b>");
set_default(success_continue_button); set_default(success_continue_button);
} }
@ -329,7 +329,7 @@ public class AddAccountDialog : Gtk.Dialog {
if (form.oob != null) { if (form.oob != null) {
form_box.add(new Label(_("The server requires to sign up through a website")){ visible=true } ); form_box.add(new Label(_("The server requires to sign up through a website")){ visible=true } );
form_box.add(new Label(@"<a href=\"$(form.oob)\">$(form.oob)</a>") { use_markup=true, visible=true }); form_box.add(new Label(@"<a href=\"$(form.oob)\">$(form.oob)</a>") { use_markup=true, visible=true });
register_form_continue_label.label = _("Open Registration"); register_form_continue_label.label = _("Open website");
register_form_continue.visible = true; register_form_continue.visible = true;
register_form_continue.grab_focus(); register_form_continue.grab_focus();
} else if (form.fields.size > 0) { } else if (form.fields.size > 0) {

2
plugins/omemo/src/ui/account_settings_widget.vala
View file

@ -39,7 +39,7 @@ public class AccountSettingWidget : Plugins.AccountSettingsWidget, Box {
btn.visible = false; btn.visible = false;
Qlite.Row? row = plugin.db.identity.row_with(plugin.db.identity.account_id, account.id).inner; Qlite.Row? row = plugin.db.identity.row_with(plugin.db.identity.account_id, account.id).inner;
if (row == null) { if (row == null) {
fingerprint.set_markup("%s\n<span font='8'>%s</span>".printf(_("Own fingerprint"), _("Will be generated on first connect"))); fingerprint.set_markup("%s\n<span font='8'>%s</span>".printf(_("Own fingerprint"), _("Will be generated on first connection")));
} else { } else {
string res = fingerprint_markup(fingerprint_from_base64(((!)row)[plugin.db.identity.identity_key_public_base64])); string res = fingerprint_markup(fingerprint_from_base64(((!)row)[plugin.db.identity.identity_key_public_base64]));
fingerprint.set_markup("%s\n<span font_family='monospace' font='8'>%s</span>".printf(_("Own fingerprint"), res)); fingerprint.set_markup("%s\n<span font_family='monospace' font='8'>%s</span>".printf(_("Own fingerprint"), res));

4
plugins/omemo/src/ui/contact_details_dialog.vala
View file

@ -45,7 +45,7 @@ public class ContactDetailsDialog : Gtk.Dialog {
// If we set the strings in the .ui file, they don't get translated // If we set the strings in the .ui file, they don't get translated
title = _("OMEMO Key Management"); title = _("OMEMO Key Management");
automatically_accept_new_label.label = _("Automatically accept new keys"); automatically_accept_new_label.label = _("Automatically accept new keys");
automatically_accept_new_descr.label = _("When this contact adds new encryption keys to their account, automatically accept them."); automatically_accept_new_descr.label = _("New encryption keys from this contact will be accepted automatically.");
own_key_label.label = _("Own key"); own_key_label.label = _("Own key");
new_keys_label.label = _("New keys"); new_keys_label.label = _("New keys");
associated_keys_label.label = _("Associated keys"); associated_keys_label.label = _("Associated keys");
@ -81,7 +81,7 @@ public class ContactDetailsDialog : Gtk.Dialog {
own = true; own = true;
own_id = plugin.db.identity.row_with(plugin.db.identity.account_id, account.id)[plugin.db.identity.device_id]; own_id = plugin.db.identity.row_with(plugin.db.identity.account_id, account.id)[plugin.db.identity.device_id];
automatically_accept_new_descr.label = _("When you add new encryption keys to your account, automatically accept them."); automatically_accept_new_descr.label = _("New encryption keys from your other devices will be accepted automatically.");
own_fingerprint_container.visible = true; own_fingerprint_container.visible = true;

26
plugins/omemo/src/ui/manage_key_dialog.vala
View file

@ -33,9 +33,9 @@ public class ManageKeyDialog : Gtk.Dialog {
construct { construct {
// If we set the strings in the .ui file, they don't get translated // If we set the strings in the .ui file, they don't get translated
headerbar.title = _("Manage Key"); headerbar.title = _("Manage Key");
compare_fingerprint_label.label = _("Compare the fingerprint, character by character, with the one shown on your contacts device."); compare_fingerprint_label.label = _("Compare the fingerprint, character by character, with the one shown on your contact's device.");
verify_no_button.label = _("Not matching"); verify_no_button.label = _("Fingerprints differ");
verify_yes_button.label = _("Matching"); verify_yes_button.label = _("Fingerprints match");
cancel_button.label = _("Cancel"); cancel_button.label = _("Cancel");
ok_button.label = _("Confirm"); ok_button.label = _("Confirm");
} }
@ -58,7 +58,7 @@ public class ManageKeyDialog : Gtk.Dialog {
verify_yes_button.clicked.connect(() => { verify_yes_button.clicked.connect(() => {
confirm_image.set_from_icon_name("security-high-symbolic", IconSize.DIALOG); confirm_image.set_from_icon_name("security-high-symbolic", IconSize.DIALOG);
confirm_title_label.label = _("Verify key"); confirm_title_label.label = _("Verify key");
confirm_desc_label.set_markup(_("Once confirmed, any future messages sent by %s using this key will be highlighted accordingly in the chat window.").printf(@"<b>$(device[db.identity_meta.address_name])</b>")); confirm_desc_label.set_markup(_("Future messages sent by %s from the device that uses this key will be highlighted accordingly in the chat window.").printf(@"<b>$(device[db.identity_meta.address_name])</b>"));
manage_stack.set_visible_child_name("confirm"); manage_stack.set_visible_child_name("confirm");
ok_button.sensitive = true; ok_button.sensitive = true;
return_to_main = false; return_to_main = false;
@ -95,7 +95,7 @@ public class ManageKeyDialog : Gtk.Dialog {
} }
private Box make_action_box(string title, string desc){ private Box make_action_box(string title, string desc){
Box box = new Box(Orientation.VERTICAL, 0) { visible = true, margin_start = 20, margin_end = 20, margin_top = 14, margin_bottom = 14 }; Box box = new Box(Orientation.VERTICAL, 0) { visible = true, margin_start = 20, margin_end = 20, margin_top = 14, margin_bottom = 14 };
Label lbl_title = new Label(title) { visible = true, halign = Align.START }; Label lbl_title = new Label(title) { visible = true, halign = Align.START };
Label lbl_desc = new Label(desc) { visible = true, xalign = 0, wrap = true, max_width_chars = 40 }; Label lbl_desc = new Label(desc) { visible = true, xalign = 0, wrap = true, max_width_chars = 40 };
@ -111,7 +111,7 @@ public class ManageKeyDialog : Gtk.Dialog {
box.add(lbl_desc); box.add(lbl_desc);
return box; return box;
} }
private void setup_main_screen() { private void setup_main_screen() {
main_action_list.set_header_func((row, before_row) => { main_action_list.set_header_func((row, before_row) => {
@ -123,22 +123,22 @@ public class ManageKeyDialog : Gtk.Dialog {
ListBoxRow verify_row = new ListBoxRow() { visible = true }; ListBoxRow verify_row = new ListBoxRow() { visible = true };
verify_row.add(make_action_box(_("Verify key fingerprint"), _("Compare this key's fingerprint with the fingerprint displayed on the contact's device."))); verify_row.add(make_action_box(_("Verify key fingerprint"), _("Compare this key's fingerprint with the fingerprint displayed on the contact's device.")));
ListBoxRow reject_row = new ListBoxRow() { visible = true }; ListBoxRow reject_row = new ListBoxRow() { visible = true };
reject_row.add(make_action_box(_("Reject key"), _("Stop accepting this key during communication with its associated contact."))); reject_row.add(make_action_box(_("Reject key"), _("Block encrypted communication with the contact's device that uses this key.")));
ListBoxRow accept_row = new ListBoxRow() {visible = true }; ListBoxRow accept_row = new ListBoxRow() {visible = true };
accept_row.add(make_action_box(_("Accept key"), _("Start accepting this key during communication with its associated contact"))); accept_row.add(make_action_box(_("Accept key"), _("Allow encrypted communication with the contact's device that uses this key.")));
switch((TrustLevel) device[db.identity_meta.trust_level]) { switch((TrustLevel) device[db.identity_meta.trust_level]) {
case TrustLevel.TRUSTED: case TrustLevel.TRUSTED:
main_desc_label.set_markup(_("This key is currently %s.").printf("<span color='#1A63D9'>"+_("accepted")+"</span>")+" "+_("This means it can be used by %s to receive and send messages.").printf(@"<b>$(device[db.identity_meta.address_name])</b>")); main_desc_label.set_markup(_("This key is currently %s.").printf("<span color='#1A63D9'>"+_("accepted")+"</span>")+" "+_("This means it can be used by %s to receive and send encrypted messages.").printf(@"<b>$(device[db.identity_meta.address_name])</b>"));
main_action_list.add(verify_row); main_action_list.add(verify_row);
main_action_list.add(reject_row); main_action_list.add(reject_row);
break; break;
case TrustLevel.VERIFIED: case TrustLevel.VERIFIED:
main_desc_label.set_markup(_("This key is currently %s.").printf("<span color='#1A63D9'>"+_("verified")+"</span>")+" "+_("This means it can be used by %s to receive and send messages.").printf(@"<b>$(device[db.identity_meta.address_name])</b>") + " " + _("Additionally it has been verified to match the key on the contact's device.")); main_desc_label.set_markup(_("This key is currently %s.").printf("<span color='#1A63D9'>"+_("verified")+"</span>")+" "+_("This means it can be used by %s to receive and send encrypted messages.").printf(@"<b>$(device[db.identity_meta.address_name])</b>") + " " + _("Additionally it has been verified to match the key on the contact's device."));
main_action_list.add(reject_row); main_action_list.add(reject_row);
break; break;
case TrustLevel.UNTRUSTED: case TrustLevel.UNTRUSTED:
main_desc_label.set_markup(_("This key is currently %s.").printf("<span color='#D91900'>"+_("rejected")+"</span>")+" "+_("This means it cannot be used by %s to receive messages, and any messages sent by it will be ignored.").printf(@"<b>$(device[db.identity_meta.address_name])</b>")); main_desc_label.set_markup(_("This key is currently %s.").printf("<span color='#D91900'>"+_("rejected")+"</span>")+" "+_("This means it cannot be used by %s to decipher your messages, and you won't see messages encrypted with it.").printf(@"<b>$(device[db.identity_meta.address_name])</b>"));
main_action_list.add(accept_row); main_action_list.add(accept_row);
break; break;
} }
@ -150,7 +150,7 @@ public class ManageKeyDialog : Gtk.Dialog {
} else if (row == reject_row) { } else if (row == reject_row) {
confirm_image.set_from_icon_name("action-unavailable-symbolic", IconSize.DIALOG); confirm_image.set_from_icon_name("action-unavailable-symbolic", IconSize.DIALOG);
confirm_title_label.label = _("Reject key"); confirm_title_label.label = _("Reject key");
confirm_desc_label.set_markup(_("Once confirmed, any future messages sent by %s using this key will be ignored and none of your messages will be readable using this key.").printf(@"<b>$(device[db.identity_meta.address_name])</b>")); confirm_desc_label.set_markup(_("You won't see encrypted messages from the device of %s that uses this key. Conversely, that device won't be able to decipher your messages anymore.").printf(@"<b>$(device[db.identity_meta.address_name])</b>"));
manage_stack.set_visible_child_name("confirm"); manage_stack.set_visible_child_name("confirm");
ok_button.sensitive = true; ok_button.sensitive = true;
return_to_main = true; return_to_main = true;
@ -158,7 +158,7 @@ public class ManageKeyDialog : Gtk.Dialog {
} else if (row == accept_row) { } else if (row == accept_row) {
confirm_image.set_from_icon_name("emblem-ok-symbolic", IconSize.DIALOG); confirm_image.set_from_icon_name("emblem-ok-symbolic", IconSize.DIALOG);
confirm_title_label.label = _("Accept key"); confirm_title_label.label = _("Accept key");
confirm_desc_label.set_markup(_("Once confirmed this key will be usable by %s to receive and send messages.").printf(@"<b>$(device[db.identity_meta.address_name])</b>")); confirm_desc_label.set_markup(_("You will be able to exchange encrypted messages with the device of %s that uses this key.").printf(@"<b>$(device[db.identity_meta.address_name])</b>"));
manage_stack.set_visible_child_name("confirm"); manage_stack.set_visible_child_name("confirm");
ok_button.sensitive = true; ok_button.sensitive = true;
return_to_main = true; return_to_main = true;