yetangitu/deltachat-core
1
0
Fork 0
mirror of https://github.com/deltachat/deltachat-core.git synced 2025-10-06 03:50:08 +02:00
Code Issues Releases Wiki Activity

wording

Browse source
This commit is contained in:
B. Petersen 2017-12-04 15:56:30 +01:00
parent 48c02961b0
commit 91531188f0
5 changed files with 42 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/mrmailbox_imex.c
View file

@ -332,7 +332,7 @@ int mrmailbox_render_setup_file(mrmailbox_t* mailbox, const char* passphrase, ch
/* wrap HTML-commands with instructions around the encrypted payload */
{
char* setup_message_title = mrstock_str(MR_STR_AC_SETUP_MSG_TITLE);
char* setup_message_title = mrstock_str(MR_STR_AC_SETUP_MSG_SUBJECT);
char* setup_message_body = mrstock_str(MR_STR_AC_SETUP_MSG_BODY);
mr_str_replace(&setup_message_body, "\r", NULL);

2
src/mrmimefactory.c
View file

@ -404,7 +404,7 @@ static char* get_subject(const mrchat_t* chat, const mrmsg_t* msg, int afwd_emai
if( mrparam_get_int(msg->m_param, MRP_SYSTEM_CMD, 0) == MR_SYSTEM_AUTOCRYPT_SETUP_MESSAGE )
{
ret = mrstock_str(MR_STR_AC_SETUP_MSG_TITLE); /* do not add the "Chat:" prefix for setup messages */
ret = mrstock_str(MR_STR_AC_SETUP_MSG_SUBJECT); /* do not add the "Chat:" prefix for setup messages */
}
else if( chat->m_type==MR_CHAT_TYPE_GROUP )
{

2
src/mrmsg.c
View file

@ -825,7 +825,7 @@ char* mrmsg_get_summarytext_by_raw(int type, const char* text, mrparam_t* param,
case MR_MSG_FILE:
if( mrparam_get_int(param, MRP_SYSTEM_CMD, 0)==MR_SYSTEM_AUTOCRYPT_SETUP_MESSAGE ) {
ret = mrstock_str(MR_STR_AC_SETUP_MSG_TITLE);
ret = mrstock_str(MR_STR_AC_SETUP_MSG_SUBJECT);
}
else {
pathNfilename = mrparam_get(param, MRP_FILE, "ErrFilename");

76
src/mrstock.c
View file

@ -39,44 +39,44 @@ mrmailbox_t* s_localize_mb_obj = NULL;
static char* default_string(int id, int qty)
{
switch( id ) {
case MR_STR_NOMESSAGES: return safe_strdup("No messages.");
case MR_STR_SELF: return safe_strdup("Me");
case MR_STR_DRAFT: return safe_strdup("Draft");
case MR_STR_MEMBER: return mr_mprintf("%i member(s)", qty);
case MR_STR_CONTACT: return mr_mprintf("%i contact(s)", qty);
case MR_STR_VOICEMESSAGE: return safe_strdup("Voice message");
case MR_STR_DEADDROP: return safe_strdup("Mailbox");
case MR_STR_IMAGE: return safe_strdup("Image");
case MR_STR_GIF: return safe_strdup("GIF");
case MR_STR_VIDEO: return safe_strdup("Video");
case MR_STR_AUDIO: return safe_strdup("Audio");
case MR_STR_FILE: return safe_strdup("File");
case MR_STR_ENCRYPTEDMSG: return safe_strdup("Encrypted message");
case MR_STR_STATUSLINE: return safe_strdup("Sent with my Delta Chat Messenger");
case MR_STR_NEWGROUPDRAFT: return safe_strdup("Hello, I've just created the group \"%1$s\" for us.");
case MR_STR_MSGGRPNAME: return safe_strdup("Group name changed from \"%1$s\" to \"%2$s\".");
case MR_STR_MSGGRPIMGCHANGED: return safe_strdup("Group image changed.");
case MR_STR_MSGADDMEMBER: return safe_strdup("Member %1$s added.");
case MR_STR_MSGDELMEMBER: return safe_strdup("Member %1$s removed.");
case MR_STR_MSGGROUPLEFT: return safe_strdup("Group left.");
case MR_STR_ERROR: return safe_strdup("Error: %1$s");
case MR_STR_SELFNOTINGRP: return safe_strdup("You must be a member of the group to perform this action.");
case MR_STR_NONETWORK: return safe_strdup("No network available.");
case MR_STR_ENCR_E2E: return safe_strdup("End-to-end encryption enabled.");
case MR_STR_ENCR_TRANSP: return safe_strdup("Transport-encryption.");
case MR_STR_ENCR_NONE: return safe_strdup("No encryption.");
case MR_STR_FINGERPRINTS: return safe_strdup("Fingerprints");
case MR_STR_READRCPT: return safe_strdup("Return receipt");
case MR_STR_READRCPT_MAILBODY: return safe_strdup("This is a return receipt for the message \"%1$s\".");
case MR_STR_MSGGRPIMGDELETED: return safe_strdup("Group image deleted.");
case MR_STR_E2E_FINE: return safe_strdup("Please check, if all fingerprints match.");
case MR_STR_E2E_NO_AUTOCRYPT: return safe_strdup("E2EE will be enabled automatically.");
case MR_STR_E2E_DIS_BY_YOU: return safe_strdup("E2EE will be endable if you enable the corresponding option.");
case MR_STR_E2E_DIS_BY_RCPT: return safe_strdup("E2EE will be enabled if the recipients enables the corresponding option.");/* do not say, the recipient has _disabled_ the option, this may not be true! */
case MR_STR_ARCHIVEDCHATS: return safe_strdup("Archived chats");
case MR_STR_STARREDMSGS: return safe_strdup("Starred messages");
case MR_STR_AC_SETUP_MSG_TITLE:return safe_strdup("Autocrypt Setup Message");
case MR_STR_AC_SETUP_MSG_BODY: return safe_strdup("This is the Autocrypt Setup Message used to transfer your secret key between clients.\n\nYou can decrypt it using the setup code presented on your old device.");
case MR_STR_NOMESSAGES: return safe_strdup("No messages.");
case MR_STR_SELF: return safe_strdup("Me");
case MR_STR_DRAFT: return safe_strdup("Draft");
case MR_STR_MEMBER: return mr_mprintf("%i member(s)", qty);
case MR_STR_CONTACT: return mr_mprintf("%i contact(s)", qty);
case MR_STR_VOICEMESSAGE: return safe_strdup("Voice message");
case MR_STR_DEADDROP: return safe_strdup("Mailbox");
case MR_STR_IMAGE: return safe_strdup("Image");
case MR_STR_GIF: return safe_strdup("GIF");
case MR_STR_VIDEO: return safe_strdup("Video");
case MR_STR_AUDIO: return safe_strdup("Audio");
case MR_STR_FILE: return safe_strdup("File");
case MR_STR_ENCRYPTEDMSG: return safe_strdup("Encrypted message");
case MR_STR_STATUSLINE: return safe_strdup("Sent with my Delta Chat Messenger");
case MR_STR_NEWGROUPDRAFT: return safe_strdup("Hello, I've just created the group \"%1$s\" for us.");
case MR_STR_MSGGRPNAME: return safe_strdup("Group name changed from \"%1$s\" to \"%2$s\".");
case MR_STR_MSGGRPIMGCHANGED: return safe_strdup("Group image changed.");
case MR_STR_MSGADDMEMBER: return safe_strdup("Member %1$s added.");
case MR_STR_MSGDELMEMBER: return safe_strdup("Member %1$s removed.");
case MR_STR_MSGGROUPLEFT: return safe_strdup("Group left.");
case MR_STR_ERROR: return safe_strdup("Error: %1$s");
case MR_STR_SELFNOTINGRP: return safe_strdup("You must be a member of the group to perform this action.");
case MR_STR_NONETWORK: return safe_strdup("No network available.");
case MR_STR_ENCR_E2E: return safe_strdup("End-to-end encryption enabled.");
case MR_STR_ENCR_TRANSP: return safe_strdup("Transport-encryption.");
case MR_STR_ENCR_NONE: return safe_strdup("No encryption.");
case MR_STR_FINGERPRINTS: return safe_strdup("Fingerprints");
case MR_STR_READRCPT: return safe_strdup("Return receipt");
case MR_STR_READRCPT_MAILBODY: return safe_strdup("This is a return receipt for the message \"%1$s\".");
case MR_STR_MSGGRPIMGDELETED: return safe_strdup("Group image deleted.");
case MR_STR_E2E_FINE: return safe_strdup("Please check, if all fingerprints match.");
case MR_STR_E2E_NO_AUTOCRYPT: return safe_strdup("E2EE will be enabled automatically.");
case MR_STR_E2E_DIS_BY_YOU: return safe_strdup("E2EE will be endable if you enable the corresponding option.");
case MR_STR_E2E_DIS_BY_RCPT: return safe_strdup("E2EE will be enabled if the recipients enables the corresponding option.");/* do not say, the recipient has _disabled_ the option, this may not be true! */
case MR_STR_ARCHIVEDCHATS: return safe_strdup("Archived chats");
case MR_STR_STARREDMSGS: return safe_strdup("Starred messages");
case MR_STR_AC_SETUP_MSG_SUBJECT: return safe_strdup("Autocrypt Setup Message");
case MR_STR_AC_SETUP_MSG_BODY: return safe_strdup("This is the Autocrypt Setup Message used to transfer your secret key between clients.\n\nYou can decrypt it using the setup code presented on your old device.");
}
return safe_strdup("ErrStr");
}

2
src/mrstock.h
View file

@ -70,7 +70,7 @@ extern "C" {
#define MR_STR_E2E_DIS_BY_RCPT 37
#define MR_STR_ARCHIVEDCHATS 40
#define MR_STR_STARREDMSGS 41
#define MR_STR_AC_SETUP_MSG_TITLE 42
#define MR_STR_AC_SETUP_MSG_SUBJECT 42
#define MR_STR_AC_SETUP_MSG_BODY 43