nano

commit 1b65b19abd40fe9cfedcd6c967da312bd90a46f6
parent 35cd49ec502efde425057c3ac1bd583b410d0d41
Author: Benno Schulenberg <bensberg@justemail.net>
Date:   Sun, 15 Feb 2015 16:28:08 +0000

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

Diffstat:
M
ChangeLog
 | 
1
+
M
src/files.c
 | 
5
+++--

2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,6 +1,7 @@
 2015-02-15  Benno Schulenberg  <bensberg@justemail.net>
 	* 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 <chrisa@asty.org>
 	* nano.spec.in: Add dependency on texinfo, docdir files for
diff --git 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();