aniani/profanity
1
0
Fork 0
mirror of https://github.com/profanity-im/profanity.git synced 2024-12-04 14:46:46 -05:00
Code

Merge branch 'master' into clear

Browse Source
This commit is contained in:
James Booth 2016-09-27 20:36:23 +01:00
commit 3a8177552a
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/command/cmd_funcs.c
View File

@ -6486,7 +6486,7 @@ cmd_pgp(ProfWin *window, const char *const command, gchar **args)
}
chatwin->pgp_send = TRUE;
ui_current_print_formatted_line('!', 0, "PGP encyption enabled.");
ui_current_print_formatted_line('!', 0, "PGP encryption enabled.");
return TRUE;
}
@ -6509,7 +6509,7 @@ cmd_pgp(ProfWin *window, const char *const command, gchar **args)
}
chatwin->pgp_send = FALSE;
ui_current_print_formatted_line('!', 0, "PGP encyption disabled.");
ui_current_print_formatted_line('!', 0, "PGP encryption disabled.");
return TRUE;
}

2
src/otr/otrlibv4.c
View File

@ -120,7 +120,7 @@ cb_handle_msg_event(void *opdata, OtrlMessageEvent msg_event,
ui_handle_otr_error(context->username, "OTR: Policy requires encryption, but attempting to send an unencrypted message.");
break;
case OTRL_MSGEVENT_ENCRYPTION_ERROR:
ui_handle_otr_error(context->username, "OTR: Error occured while encrypting a message, message not sent.");
ui_handle_otr_error(context->username, "OTR: Error occurred while encrypting a message, message not sent.");
break;
case OTRL_MSGEVENT_CONNECTION_ENDED:
ui_handle_otr_error(context->username, "OTR: Message not sent because contact has ended the private conversation.");

2
src/ui/notifier.c
View File

@ -140,7 +140,7 @@ notify_subscription(const char *const from)
{
GString *message = g_string_new("Subscription request: \n");
g_string_append(message, from);
notify(message->str, 10000, "Incomming message");
notify(message->str, 10000, "Incoming message");
g_string_free(message, TRUE);
}