diff options
| author | Simon Weil <swdevelop1981@gmail.com> | 2016-07-31 21:39:08 +0300 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2016-07-31 14:39:08 -0400 |
| commit | af95037c965ca957764ac0e4051d1ad3b5a6a935 (patch) | |
| tree | 9512a06232d37d9648cbdcece46dae958b2624d6 | |
| parent | aa2c43994039b4d78ae628f96b80bf1a60b4da6b (diff) | |
| download | rneovim-af95037c965ca957764ac0e4051d1ad3b5a6a935.tar.gz rneovim-af95037c965ca957764ac0e4051d1ad3b5a6a935.tar.bz2 rneovim-af95037c965ca957764ac0e4051d1ad3b5a6a935.zip | |
vim-patch:7.4.1237 (#5092)
Problem: Can't translate message without adding a line break.
Solution: Join the two parts of the message.
https://github.com/vim/vim/commit/d9ea9069f5ef5b8b9f9e0d0daecdd124e2dcd818
| -rw-r--r-- | src/nvim/memline.c | 7 | ||||
| -rw-r--r-- | src/nvim/version.c | 2 |
2 files changed, 5 insertions, 4 deletions
diff --git a/src/nvim/memline.c b/src/nvim/memline.c index 673205f08f..08e82071d7 100644 --- a/src/nvim/memline.c +++ b/src/nvim/memline.c @@ -3165,9 +3165,10 @@ attention_message ( } /* Some of these messages are long to allow translation to * other languages. */ - MSG_PUTS(_( - "\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.")); - MSG_PUTS(_(" Quit, or continue with caution.\n")); + MSG_PUTS(_("\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." + " Quit, or continue with caution.\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_outtrans(buf->b_fname); diff --git a/src/nvim/version.c b/src/nvim/version.c index 4a17660cd5..0d37d6a91c 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -465,7 +465,7 @@ static int included_patches[] = { // 1240 NA // 1239 NA // 1238 NA - // 1237, + 1237, 1236, // 1235 NA // 1234 NA |