Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix typos, correct grammar #1897

Merged
merged 1 commit into from
Oct 14, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions CHANGELOG
Original file line number Diff line number Diff line change
Expand Up @@ -261,7 +261,7 @@ Changes:
`/affiliation register`
- Fix segfault on `/sendfile` using OMEMO on Raspberry Pi (#1512)
- Use shorter IDs (#1520)
- Add abbility to launch external editor to write (multiline) messages (#1485, #1546)
- Add ability to launch external editor to write (multiline) messages (#1485, #1546)
`/editor`
- Introdcue OMEMO trustmode (#1506)
`/omemo trustmode manual|firstusage|blind`
Expand Down Expand Up @@ -683,7 +683,7 @@ Changes:
- HTTP file upload (xep-0363) (/sendfile)
- Blocking command (xep-0191) (/blocked)
- Allow auto extended away (/autoaway)
- Include last acitvity in initial presence (xep-0256) (/lastactivity)
- Include last activity in initial presence (xep-0256) (/lastactivity)
- Last Activity (xep-0012) (/lastactivity)
- Ability to run command scripts (/script)
- Account startscript property to execute a command script on connect (/account)
Expand Down
4 changes: 2 additions & 2 deletions src/command/cmd_defs.c
Original file line number Diff line number Diff line change
Expand Up @@ -2325,12 +2325,12 @@ static const struct cmd_t command_defs[] = {
CMD_DESC(
"OMEMO commands to manage keys, and perform encryption during chat sessions.")
CMD_ARGS(
{ "gen", "Generate OMEMO crytographic materials for current account." },
{ "gen", "Generate OMEMO cryptographic materials for current account." },
{ "start [<contact>]", "Start an OMEMO session with contact, or current recipient if omitted." },
{ "end", "End the current OMEMO session." },
{ "log on|off", "Enable or disable plaintext logging of OMEMO encrypted messages." },
{ "log redact", "Log OMEMO encrypted messages, but replace the contents with [redacted]." },
{ "fingerprint [<contact>]", "Show contact fingerprints, or current recipient if omitted." },
{ "fingerprint [<contact>]", "Show contact's fingerprints, or current recipient's if omitted." },
jubalh marked this conversation as resolved.
Show resolved Hide resolved
{ "char <char>", "Set the character to be displayed next to OMEMO encrypted messages." },
{ "trustmode manual", "Set the global OMEMO trust mode to manual, OMEMO keys has to be trusted manually." },
{ "trustmode firstusage", "Set the global OMEMO trust mode to ToFu, first OMEMO keys trusted automatically." },
Expand Down
6 changes: 3 additions & 3 deletions src/command/cmd_funcs.c
Original file line number Diff line number Diff line change
Expand Up @@ -8645,15 +8645,15 @@ cmd_omemo_gen(ProfWin* window, const char* const command, gchar** args)
}

if (omemo_loaded()) {
cons_show("OMEMO crytographic materials have already been generated.");
cons_show("OMEMO cryptographic materials have already been generated.");
return TRUE;
}

cons_show("Generating OMEMO crytographic materials, it may take a while…");
cons_show("Generating OMEMO cryptographic materials, it may take a while…");
ui_update();
ProfAccount* account = accounts_get_account(session_get_account_name());
omemo_generate_crypto_materials(account);
cons_show("OMEMO crytographic materials generated. Your Device ID is %d.", omemo_device_id());
cons_show("OMEMO cryptographic materials generated. Your Device ID is %d.", omemo_device_id());
return TRUE;
#else
cons_show("This version of Profanity has not been built with OMEMO support enabled");
Expand Down
2 changes: 1 addition & 1 deletion src/xmpp/iq.c
Original file line number Diff line number Diff line change
Expand Up @@ -1843,7 +1843,7 @@ _room_config_id_handler(xmpp_stanza_t* const stanza, void* const userdata)

if (from == NULL) {
log_warning("No from attribute for IQ config request result");
ui_handle_room_configuration_form_error(from, "No from attribute for room cofig response.");
ui_handle_room_configuration_form_error(from, "No from attribute for room config response.");
return 0;
}

Expand Down
Loading