From 1b65b19abd40fe9cfedcd6c967da312bd90a46f6 Mon Sep 17 00:00:00 2001 From: Benno Schulenberg Date: Sun, 15 Feb 2015 16:28:08 +0000 Subject: [PATCH] The user does the editing, not the editor. So rephrasing. git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@5118 35c25a1d-7b9e-4130-9fde-d3aeb78583b8 --- ChangeLog | 1 + src/files.c | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index adec0124..e75b0543 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,7 @@ 2015-02-15 Benno Schulenberg * src/file.c (do_lockfile): Also show the name of the affected file when finding a lock file, for when many files are opened at once. + * src/file.c (do_lockfile): The user does the editing, not the editor. 2015-02-09 Chris Allegretta * nano.spec.in: Add dependency on texinfo, docdir files for diff --git a/src/files.c b/src/files.c index 5885358a..65c151be 100644 --- a/src/files.c +++ b/src/files.c @@ -293,8 +293,9 @@ int do_lockfile(const char *filename) fprintf(stderr, "user which created this lock file should be %s\n", lockuser); #endif - sprintf(promptstr, _("File %s is being edited (by %s, PID %d, user %s); continue?"), - filename, lockprog, lockpid, lockuser); + /* TRANSLATORS: The second %s is the name of the user, the third that of the editor. */ + sprintf(promptstr, _("File %s is being edited (by %s with %s, PID %d); continue?"), + filename, lockuser, lockprog, lockpid); ans = do_yesno_prompt(FALSE, promptstr); if (ans < 1) { blank_statusbar();