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");

2
src/mrstock.c
View file

@ -75,7 +75,7 @@ static char* default_string(int id, int qty)
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_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