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