diff options
| author | Bram Moolenaar <Bram@vim.org> | 2016-02-02 12:38:02 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2016-02-02 12:38:02 +0100 |
| commit | d9ea9069f5ef5b8b9f9e0d0daecdd124e2dcd818 (patch) | |
| tree | c94840d3027eb1d9e1d602835d126314a11abfd4 | |
| parent | 885f24fbcae2a39ae496ffb3a1e139379be8fae1 (diff) | |
patch 7.4.1237v7.4.1237
Problem: Can't translate message without adding a line break.
Solution: Join the two parts of the message.
| -rw-r--r-- | src/memline.c | 3 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/memline.c b/src/memline.c index 15810fdad0..969e1e292f 100644 --- a/src/memline.c +++ b/src/memline.c @@ -4075,8 +4075,7 @@ 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/version.c b/src/version.c index 165b396c9f..53949e63d9 100644 --- a/src/version.c +++ b/src/version.c @@ -743,6 +743,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1237, +/**/ 1236, /**/ 1235, |