IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:7.4.1237 (#5092)

Browse Source 
Problem:    Can't translate message without adding a line break.
Solution:   Join the two parts of the message.

d9ea9069f5
This commit is contained in:
Simon Weil 2016-07-31 21:39:08 +03:00 committed by Justin M. Keyes
parent aa2c439940
commit af95037c96
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/nvim/memline.c
View File

@ -3165,9 +3165,10 @@ attention_message (
} }
/* Some of these messages are long to allow translation to /* Some of these messages are long to allow translation to
* other languages. */ * other languages. */
MSG_PUTS(_( MSG_PUTS(_("\n(1) Another program may be editing the same file. If this is"
"\n(1) Another program may be editing the same file. If this is the case,\n be careful not to end up with two different instances of the same\n file when making changes.")); " the case,\n be careful not to end up with two different"
MSG_PUTS(_(" Quit, or continue with caution.\n")); " instances of the same\n file when making changes."
" Quit, or continue with caution.\n"));
MSG_PUTS(_("(2) An edit session for this file crashed.\n")); MSG_PUTS(_("(2) An edit session for this file crashed.\n"));
MSG_PUTS(_(" If this is the case, use \":recover\" or \"vim -r ")); MSG_PUTS(_(" If this is the case, use \":recover\" or \"vim -r "));
msg_outtrans(buf->b_fname); msg_outtrans(buf->b_fname);

2
src/nvim/version.c
View File

@ -465,7 +465,7 @@ static int included_patches[] = {
// 1240 NA // 1240 NA
// 1239 NA // 1239 NA
// 1238 NA // 1238 NA
// 1237, 1237,
1236, 1236,
// 1235 NA // 1235 NA
// 1234 NA // 1234 NA