Mercurial > vim

diff src/memline.c @ 7881:e7afe45a202a v7.4.1237

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
commit https://github.com/vim/vim/commit/d9ea9069f5ef5b8b9f9e0d0daecdd124e2dcd818 Author: Bram Moolenaar <Bram@vim.org> Date: Tue Feb 2 12:38:02 2016 +0100 patch 7.4.1237 Problem: Can't translate message without adding a line break. Solution: Join the two parts of the message.
author Christian Brabandt <cb@256bit.org>
date Tue, 02 Feb 2016 12:45:04 +0100
parents 41789f16d6b2
children a7e58c6e4e9a
line wrap: on
line diff
--- 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);