bring vi/ex up to 1.71

1 files changed, 6 insertions, 5 deletions

diff --git a/usr.bin/vi/catalog/english.base b/usr.bin/vi/catalog/english.base
index acc129b1ae4..498762a6cc7 100644
--- a/usr.bin/vi/catalog/english.base
+++ b/usr.bin/vi/catalog/english.base
@@ -136,7 +136,7 @@
 142 "Preservation of this file not possible"
 143 "File preserved"
 144 "%s: expanded into too many file names"
-145 "Only regular files may be read"
+145 "Only regular files and named pipes may be read"
 146 "%s: read lock was unavailable"
 147 "Reading..."
 148 "%s: %lu lines, %lu characters"
@@ -155,10 +155,10 @@
 161 "Press Enter to continue: "
 162 "%s: tag not found"
 163 "%s: corrupted tag in %s"
-164 "%s: the tag line doesn't exist"
+164 "%s: the tag's line number is past the end of the file"
 165 "The tags stack is empty"
 166 "%s: search pattern not found"
-167 "More files to edit; use n[ext] to go to the next file, q[uit]! to quit"
+167 "%d more files to edit"
 168 "Buffer %s is empty"
 169 "Confirm change? [n]"
 170 "Interrupted"
@@ -246,7 +246,7 @@
 254 "%s: WARNING: FILE TRUNCATED"
 255 "Already at the first tag of this group"
 256 "%s: new file: %lu lines, %lu characters"
-257 "%s: %s%lu lines, %lu characters"
+257 "%s: %lu lines, %lu characters"
 258 "%s expanded into too many file names"
 259 "%s: not a regular file"
 260 "%s: not owned by you"
@@ -277,7 +277,6 @@
 285 "Unexpected string event"
 286 "Unexpected timeout event"
 287 "Unexpected write event"
-288 "Unexpected write-and-quit event"
 289 "Shell expansions not supported when the secure edit option is set"
 290 "The %s command is not supported when the secure edit option is set"
 291 "set: the %s option may not be turned off"
@@ -304,3 +303,5 @@
 312 "%d: no such cscope session"
 313 "set: the %s option may never be turned on"
 314 "set: the %s option may never be set to 0"
+315 "%s: appended: %lu lines, %lu characters"
+316 "Unexpected resize event"