diff options
| author | sobomax <sobomax@FreeBSD.org> | 2001-03-27 13:51:18 +0000 |
|---|---|---|
| committer | sobomax <sobomax@FreeBSD.org> | 2001-03-27 13:51:18 +0000 |
| commit | ea073d6e59d921c61b6208e0c93897e5782aa622 (patch) | |
| tree | 8e1321f929fb3ee593632b61092b14ba7b64438c /usr.bin/ee/nls | |
| parent | a27d1d954d337d973c8c98834c505c64472f2aeb (diff) | |
| download | FreeBSD-src-ea073d6e59d921c61b6208e0c93897e5782aa622.zip FreeBSD-src-ea073d6e59d921c61b6208e0c93897e5782aa622.tar.gz | |
Resolve conflicts.
Diffstat (limited to 'usr.bin/ee/nls')
| -rw-r--r-- | usr.bin/ee/nls/en_US.ISO_8859-1/ee.msg | 23 | ||||
| -rw-r--r-- | usr.bin/ee/nls/en_US.US-ASCII/ee.msg | 23 |
2 files changed, 26 insertions, 20 deletions
diff --git a/usr.bin/ee/nls/en_US.ISO_8859-1/ee.msg b/usr.bin/ee/nls/en_US.ISO_8859-1/ee.msg index 1e71ddd..ccefcc4 100644 --- a/usr.bin/ee/nls/en_US.ISO_8859-1/ee.msg +++ b/usr.bin/ee/nls/en_US.ISO_8859-1/ee.msg @@ -5,15 +5,16 @@ $ For ee patchlevel 3 $ $ $FreeBSD$ $ +$ $set 1 $quote " 1 "modes menu" -2 "tabs to spaces " -3 "case sensitive search" -4 "margins observed " -5 "auto-paragraph format" -6 "eightbit characters " -7 "info window " +2 "tabs to spaces " +3 "case sensitive search" +4 "margins observed " +5 "auto-paragraph format" +6 "eightbit characters " +7 "info window " 8 "right margin " 9 "leave menu" 10 "save changes" @@ -41,7 +42,7 @@ $quote " 32 "settings" 33 "search" 34 "miscellaneous" -35 "Control keys: " +35 "Control keys: " 36 "^a ascii code ^i tab ^r right " 37 "^b bottom of text ^j newline ^t top of text " 38 "^c command ^k delete char ^u up " @@ -61,8 +62,8 @@ $quote " 52 "line : display line # 0-9 : go to line \"#\" " 53 "expand : expand tabs noexpand: do not expand tabs " 54 " " -55 " ee [-i] [-e] [-h] [file(s)] " -56 " -i : no information window -e : do not expand tabs -h : no highlight " +55 " ee [+#] [-i] [-e] [-h] [file(s)] " +56 "+# :go to line # -i :no info window -e : don't expand tabs -h :no highlight" 57 "^[ (escape) menu ^e search prompt ^y delete line ^u up ^p prev page " 58 "^a ascii code ^x search ^z undelete line ^d down ^n next page " 59 "^b bottom of text ^g begin of line ^w delete word ^l left " @@ -176,7 +177,9 @@ $quote " 167 "save in home directory" 168 "ee configuration not saved" 169 "must specify a file when invoking ree" -170 "press Esc to cancel" 180 "menu too large for window" 181 "^^more^^" 182 "VVmoreVV" +183 "16 bit characters " +184 "16BIT" +185 "NO16BIT" diff --git a/usr.bin/ee/nls/en_US.US-ASCII/ee.msg b/usr.bin/ee/nls/en_US.US-ASCII/ee.msg index 1e71ddd..ccefcc4 100644 --- a/usr.bin/ee/nls/en_US.US-ASCII/ee.msg +++ b/usr.bin/ee/nls/en_US.US-ASCII/ee.msg @@ -5,15 +5,16 @@ $ For ee patchlevel 3 $ $ $FreeBSD$ $ +$ $set 1 $quote " 1 "modes menu" -2 "tabs to spaces " -3 "case sensitive search" -4 "margins observed " -5 "auto-paragraph format" -6 "eightbit characters " -7 "info window " +2 "tabs to spaces " +3 "case sensitive search" +4 "margins observed " +5 "auto-paragraph format" +6 "eightbit characters " +7 "info window " 8 "right margin " 9 "leave menu" 10 "save changes" @@ -41,7 +42,7 @@ $quote " 32 "settings" 33 "search" 34 "miscellaneous" -35 "Control keys: " +35 "Control keys: " 36 "^a ascii code ^i tab ^r right " 37 "^b bottom of text ^j newline ^t top of text " 38 "^c command ^k delete char ^u up " @@ -61,8 +62,8 @@ $quote " 52 "line : display line # 0-9 : go to line \"#\" " 53 "expand : expand tabs noexpand: do not expand tabs " 54 " " -55 " ee [-i] [-e] [-h] [file(s)] " -56 " -i : no information window -e : do not expand tabs -h : no highlight " +55 " ee [+#] [-i] [-e] [-h] [file(s)] " +56 "+# :go to line # -i :no info window -e : don't expand tabs -h :no highlight" 57 "^[ (escape) menu ^e search prompt ^y delete line ^u up ^p prev page " 58 "^a ascii code ^x search ^z undelete line ^d down ^n next page " 59 "^b bottom of text ^g begin of line ^w delete word ^l left " @@ -176,7 +177,9 @@ $quote " 167 "save in home directory" 168 "ee configuration not saved" 169 "must specify a file when invoking ree" -170 "press Esc to cancel" 180 "menu too large for window" 181 "^^more^^" 182 "VVmoreVV" +183 "16 bit characters " +184 "16BIT" +185 "NO16BIT" |
