Commit 715e7dd4 authored by Chris Allegretta's avatar Chris Allegretta
Browse files

Change 'To Replace' to just 'Replace', more like Pico

git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@57 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
parent 518b8ef7
Showing with 104 additions and 109 deletions
+104 -109
CVS code changes since last release - CVS code changes since last release -
- Made search functions & keys more like Pico. Added goto line from - Made search functions & keys more like Pico. Added goto line from
search and replace function, changed wording to "No Replace" instead of search and replace function, changed wording to "No Replace" instead of
"To Search" and changed to Pico's ketstroke by default, ^R. "To Search", "To Replace" to simply "Replace", and changed to Pico's
Affects search_init(), do_search() in search.c, globals in nano.h keystroke by default, ^R. Affects search_init(), do_search() in
and shortcut_init() in global.c. search.c, globals in nano.h and shortcut_init() in global.c.
- nano.c: - nano.c:
- Removed dual alt_speller variables, oops! (Rocco Corsi) - Removed dual alt_speller variables, oops! (Rocco Corsi)
- de.po: - de.po:
......
...@@ -267,7 +267,7 @@ void shortcut_init(void) ...@@ -267,7 +267,7 @@ void shortcut_init(void)
nano_case_msg, 0, 0, 0, VIEW, 0); nano_case_msg, 0, 0, 0, VIEW, 0);
sc_init_one(&whereis_list[3], NANO_OTHERSEARCH_KEY, _("To Replace"), sc_init_one(&whereis_list[3], NANO_OTHERSEARCH_KEY, _("Replace"),
nano_replace_msg, 0, 0, 0, VIEW, do_replace); nano_replace_msg, 0, 0, 0, VIEW, do_replace);
sc_init_one(&whereis_list[4], NANO_FROMSEARCHTOGOTO_KEY, _("Goto Line"), sc_init_one(&whereis_list[4], NANO_FROMSEARCHTOGOTO_KEY, _("Goto Line"),
......
...@@ -87,13 +87,12 @@ const struct _msg_ent _msg_tbl[] = { ...@@ -87,13 +87,12 @@ const struct _msg_ent _msg_tbl[] = {
{"First Line", 78}, {"First Line", 78},
{"Last Line", 79}, {"Last Line", 79},
{"Case Sens", 80}, {"Case Sens", 80},
{"To Replace", 81}, {"Cancel", 81},
{"Cancel", 82}, {"No Replace", 82},
{"No Replace", 83},
{"\ {"\
\n\ \n\
Buffer written to 'nano.save'\n", 84}, Buffer written to 'nano.save'\n", 83},
{"Key illegal in VIEW mode", 85}, {"Key illegal in VIEW mode", 84},
{"\ {"\
nano help text\n\ nano help text\n\
\n\ \n\
...@@ -109,104 +108,104 @@ commonly used shortcuts in the editor.\n\ ...@@ -109,104 +108,104 @@ commonly used shortcuts in the editor.\n\
with a caret (^) symbol. Alt-key sequences are notated with an at (@) \ with a caret (^) symbol. Alt-key sequences are notated with an at (@) \
symbol. The following keystrokes are available in the main editor window. \ symbol. The following keystrokes are available in the main editor window. \
Optional keys are shown in parentheses:\n\ Optional keys are shown in parentheses:\n\
\n", 86}, \n", 85},
{"free_node(): free'd a node, YAY!\n", 87}, {"free_node(): free'd a node, YAY!\n", 86},
{"free_node(): free'd last node.\n", 88}, {"free_node(): free'd last node.\n", 87},
{"\ {"\
Usage: nano [GNU long option] [option] +LINE <file>\n\ Usage: nano [GNU long option] [option] +LINE <file>\n\
\n", 89}, \n", 88},
{"Option\t\tLong option\t\tMeaning\n", 90}, {"Option\t\tLong option\t\tMeaning\n", 89},
{" -T \t\t--tabsize=[num]\t\tSet width of a tab to num\n", 91}, {" -T \t\t--tabsize=[num]\t\tSet width of a tab to num\n", 90},
{" -V \t\t--version\t\tPrint version information and exit\n", 92}, {" -V \t\t--version\t\tPrint version information and exit\n", 91},
{" -c \t\t--const\t\t\tConstantly show cursor position\n", 93}, {" -c \t\t--const\t\t\tConstantly show cursor position\n", 92},
{" -h \t\t--help\t\t\tShow this message\n", 94}, {" -h \t\t--help\t\t\tShow this message\n", 93},
{" -i \t\t--autoindent\t\tAutomatically indent new lines\n", 95}, {" -i \t\t--autoindent\t\tAutomatically indent new lines\n", 94},
{" -l \t\t--nofollow\t\tDon't follow symbolic links, overwrite.\n", 96}, {" -l \t\t--nofollow\t\tDon't follow symbolic links, overwrite.\n", 95},
{" -m \t\t--mouse\t\t\tEnable mouse\n", 97}, {" -m \t\t--mouse\t\t\tEnable mouse\n", 96},
{"\ {"\
-r [#cols] \t--fill=[#cols]\t\tSet fill cols to (wrap lines at) #cols\n", 98}, -r [#cols] \t--fill=[#cols]\t\tSet fill cols to (wrap lines at) #cols\n", 97},
{" -p\t \t--pico\t\t\tMake bottom 2 lines more Pico-like\n", 99}, {" -p\t \t--pico\t\t\tMake bottom 2 lines more Pico-like\n", 98},
{" -s [prog] \t--speller=[prog]\tEnable alternate speller\n", 100}, {" -s [prog] \t--speller=[prog]\tEnable alternate speller\n", 99},
{" -t \t\t--tempfile\t\tAuto save on exit, don't prompt\n", 101}, {" -t \t\t--tempfile\t\tAuto save on exit, don't prompt\n", 100},
{" -v \t\t--view\t\t\tView (read only) mode\n", 102}, {" -v \t\t--view\t\t\tView (read only) mode\n", 101},
{" -w \t\t--nowrap\t\tDon't wrap long lines\n", 103}, {" -w \t\t--nowrap\t\tDon't wrap long lines\n", 102},
{" -x \t\t--nohelp\t\tDon't show help window\n", 104}, {" -x \t\t--nohelp\t\tDon't show help window\n", 103},
{" -z \t\t--suspend\t\tEnable suspend\n", 105}, {" -z \t\t--suspend\t\tEnable suspend\n", 104},
{" +LINE\t\t\t\t\tStart at line number LINE\n", 106}, {" +LINE\t\t\t\t\tStart at line number LINE\n", 105},
{"\ {"\
Usage: nano [option] +LINE <file>\n\ Usage: nano [option] +LINE <file>\n\
\n", 107}, \n", 106},
{"Option\t\tMeaning\n", 108}, {"Option\t\tMeaning\n", 107},
{" -T [num]\tSet width of a tab to num\n", 109}, {" -T [num]\tSet width of a tab to num\n", 108},
{" -V \t\tPrint version information and exit\n", 110}, {" -V \t\tPrint version information and exit\n", 109},
{" -c \t\tConstantly show cursor position\n", 111}, {" -c \t\tConstantly show cursor position\n", 110},
{" -h \t\tShow this message\n", 112}, {" -h \t\tShow this message\n", 111},
{" -i \t\tAutomatically indent new lines\n", 113}, {" -i \t\tAutomatically indent new lines\n", 112},
{" -l \t\tDon't follow symbolic links, overwrite.\n", 114}, {" -l \t\tDon't follow symbolic links, overwrite.\n", 113},
{" -m \t\tEnable mouse\n", 115}, {" -m \t\tEnable mouse\n", 114},
{" -r [#cols] \tSet fill cols to (wrap lines at) #cols\n", 116}, {" -r [#cols] \tSet fill cols to (wrap lines at) #cols\n", 115},
{" -s [prog] \tEnable alternate speller\n", 117}, {" -s [prog] \tEnable alternate speller\n", 116},
{" -p \t\tMake bottom 2 lines more Pico-like\n", 118}, {" -p \t\tMake bottom 2 lines more Pico-like\n", 117},
{" -t \t\tAuto save on exit, don't prompt\n", 119}, {" -t \t\tAuto save on exit, don't prompt\n", 118},
{" -v \t\tView (read only) mode\n", 120}, {" -v \t\tView (read only) mode\n", 119},
{" -w \t\tDon't wrap long lines\n", 121}, {" -w \t\tDon't wrap long lines\n", 120},
{" -x \t\tDon't show help window\n", 122}, {" -x \t\tDon't show help window\n", 121},
{" -z \t\tEnable suspend\n", 123}, {" -z \t\tEnable suspend\n", 122},
{" +LINE\t\tStart at line number LINE\n", 124}, {" +LINE\t\tStart at line number LINE\n", 123},
{" nano version %s by Chris Allegretta (compiled %s, %s)\n", 125}, {" nano version %s by Chris Allegretta (compiled %s, %s)\n", 124},
{" Email: nano@asty.org\tWeb: http://www.asty.org/nano\n", 126}, {" Email: nano@asty.org\tWeb: http://www.asty.org/nano\n", 125},
{"Mark Set", 127}, {"Mark Set", 126},
{"Mark UNset", 128}, {"Mark UNset", 127},
{"check_wrap called with inptr->data=\"%s\"\n", 129}, {"check_wrap called with inptr->data=\"%s\"\n", 128},
{"current->data now = \"%s\"\n", 130}, {"current->data now = \"%s\"\n", 129},
{"After, data = \"%s\"\n", 131}, {"After, data = \"%s\"\n", 130},
{"Error deleting tempfile, ack!", 132}, {"Error deleting tempfile, ack!", 131},
{"Could not create a temporary filename: %s", 133}, {"Could not create a temporary filename: %s", 132},
{"Could not invoke spell program \"%s\"", 134}, {"Could not invoke spell program \"%s\"", 133},
{"Could not invoke \"ispell\"", 135}, {"Could not invoke \"ispell\"", 134},
{"Finished checking spelling", 136}, {"Finished checking spelling", 135},
{"Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? ", 137}, {"Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? ", 136},
{"Cannot resize top win", 138}, {"Cannot resize top win", 137},
{"Cannot move top win", 139}, {"Cannot move top win", 138},
{"Cannot resize edit win", 140}, {"Cannot resize edit win", 139},
{"Cannot move edit win", 141}, {"Cannot move edit win", 140},
{"Cannot resize bottom win", 142}, {"Cannot resize bottom win", 141},
{"Cannot move bottom win", 143}, {"Cannot move bottom win", 142},
{"Main: set up windows\n", 144}, {"Main: set up windows\n", 143},
{"Main: bottom win\n", 145}, {"Main: bottom win\n", 144},
{"Main: open file\n", 146}, {"Main: open file\n", 145},
{"I got Alt-[-%c! (%d)\n", 147}, {"I got Alt-[-%c! (%d)\n", 146},
{"I got Alt-%c! (%d)\n", 148}, {"I got Alt-%c! (%d)\n", 147},
{"Case Sensitive Search%s", 149}, {"Case Sensitive Search%s", 148},
{"Search%s", 150}, {"Search%s", 149},
{"Search Cancelled", 151}, {"Search Cancelled", 150},
{"Search Wrapped", 152}, {"Search Wrapped", 151},
{"Replaced %d occurences", 153}, {"Replaced %d occurences", 152},
{"Replaced 1 occurence", 154}, {"Replaced 1 occurence", 153},
{"Replace Cancelled", 155}, {"Replace Cancelled", 154},
{"Replace with [%s]", 156}, {"Replace with [%s]", 155},
{"Replace with", 157}, {"Replace with", 156},
{"Replace this instance?", 158}, {"Replace this instance?", 157},
{"Enter line number", 159}, {"Enter line number", 158},
{"Aborted", 160}, {"Aborted", 159},
{"Come on, be reasonable", 161}, {"Come on, be reasonable", 160},
{"Only %d lines available, skipping to last line", 162}, {"Only %d lines available, skipping to last line", 161},
{"actual_x_from_start for xplus=%d returned %d\n", 163}, {"actual_x_from_start for xplus=%d returned %d\n", 162},
{"input '%c' (%d)\n", 164}, {"input '%c' (%d)\n", 163},
{"New Buffer", 165}, {"New Buffer", 164},
{" File: ...", 166}, {" File: ...", 165},
{"Modified", 167}, {"Modified", 166},
{"Moved to (%d, %d) in edit buffer\n", 168}, {"Moved to (%d, %d) in edit buffer\n", 167},
{"current->data = \"%s\"\n", 169}, {"current->data = \"%s\"\n", 168},
{"I got \"%s\"\n", 170}, {"I got \"%s\"\n", 169},
{"Yes", 171}, {"Yes", 170},
{"All", 172}, {"All", 171},
{"No", 173}, {"No", 172},
{"do_cursorpos: linepct = %f, bytepct = %f\n", 174}, {"do_cursorpos: linepct = %f, bytepct = %f\n", 173},
{"line %d of %d (%.0f%%), character %d of %d (%.0f%%)", 175}, {"line %d of %d (%.0f%%), character %d of %d (%.0f%%)", 174},
{"Dumping file buffer to stderr...\n", 176}, {"Dumping file buffer to stderr...\n", 175},
{"Dumping cutbuffer to stderr...\n", 177}, {"Dumping cutbuffer to stderr...\n", 176},
{"Dumping a buffer to stderr...\n", 178}, {"Dumping a buffer to stderr...\n", 177},
}; };
int _msg_tbl_length = 178; int _msg_tbl_length = 177;
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2000-06-28 21:18-0400\n" "POT-Creation-Date: 2000-06-30 16:38-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
...@@ -247,7 +247,7 @@ msgstr "" ...@@ -247,7 +247,7 @@ msgstr ""
msgid "Justify" msgid "Justify"
msgstr "" msgstr ""
#: global.c:169 global.c:240 #: global.c:169 global.c:240 global.c:270
msgid "Replace" msgid "Replace"
msgstr "" msgstr ""
...@@ -343,10 +343,6 @@ msgstr "" ...@@ -343,10 +343,6 @@ msgstr ""
msgid "Case Sens" msgid "Case Sens"
msgstr "" msgstr ""
#: global.c:270
msgid "To Replace"
msgstr ""
#: global.c:276 global.c:295 global.c:305 global.c:321 global.c:325 #: global.c:276 global.c:295 global.c:305 global.c:321 global.c:325
#: global.c:331 winio.c:969 #: global.c:331 winio.c:969
msgid "Cancel" msgid "Cancel"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment