From: Chris Allegretta Date: Mon, 27 Nov 2000 22:58:23 +0000 (+0000) Subject: Okay, now make the shortcut list reflect the unjustify availability X-Git-Tag: v0.9.22~43 X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=0779835ce4834be92c1fb5a6f9e2ab3384eccfda;p=nano.git Okay, now make the shortcut list reflect the unjustify availability git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@332 35c25a1d-7b9e-4130-9fde-d3aeb78583b8 --- diff --git a/ChangeLog b/ChangeLog index fb589e18..ed2b8158 100644 --- a/ChangeLog +++ b/ChangeLog @@ -15,6 +15,11 @@ CVS code - - Added call to real_name_from tilde, oops. read_file() - Added check for fileptr == NULL. +- global.c: + shortcut_init() + - Now takes an argument as to whether to display the unjustify + shortcut or the normal uncut text one. Needed to accomodate + the klugey unjustify code. - nano.c: do_justify() - Wrote unjustify code. Borrows cutbuffer and stores the unjustified text there, diff --git a/global.c b/global.c index 7cad4150..15a1717a 100644 --- a/global.c +++ b/global.c @@ -156,7 +156,7 @@ void toggle_init(void) #endif } -void shortcut_init(void) +void shortcut_init(int unjustify) { char *nano_help_msg = "", *nano_writeout_msg = "", *nano_exit_msg = "", *nano_goto_msg = "", *nano_justify_msg = "", *nano_replace_msg = @@ -170,7 +170,7 @@ void shortcut_init(void) "", *nano_mark_msg = "", *nano_delete_msg = "", *nano_backspace_msg = "", *nano_tab_msg = "", *nano_enter_msg = "", *nano_case_msg = - "", *nano_cancel_msg = ""; + "", *nano_cancel_msg = "", *nano_unjustify_msg; #ifndef NANO_SMALL nano_help_msg = _("Invoke the help menu"); @@ -178,6 +178,7 @@ void shortcut_init(void) nano_exit_msg = _("Exit from nano"); nano_goto_msg = _("Goto a specific line number"); nano_justify_msg = _("Justify the current paragraph"); + nano_unjustify_msg = _("Unjustify after a justify"); nano_replace_msg = _("Replace text within the editor"); nano_insert_msg = _("Insert another file into the current one"); nano_whereis_msg = _("Search for text within the editor"); @@ -255,7 +256,11 @@ void shortcut_init(void) sc_init_one(&main_list[8], NANO_CUT_KEY, _("Cut Text"), nano_cut_msg, 0, NANO_CUT_FKEY, 0, NOVIEW, do_cut_text); - sc_init_one(&main_list[9], NANO_UNCUT_KEY, _("UnCut Txt"), + if (unjustify) + sc_init_one(&main_list[9], NANO_UNJUSTIFY_KEY, _("UnJustify"), + nano_unjustify_msg, 0, 0, 0, NOVIEW, do_uncut_text); + else + sc_init_one(&main_list[9], NANO_UNCUT_KEY, _("UnCut Txt"), nano_uncut_msg, 0, NANO_UNCUT_FKEY, 0, NOVIEW, do_uncut_text); diff --git a/nano.c b/nano.c index bd0ab90c..83d3f1e0 100644 --- a/nano.c +++ b/nano.c @@ -1813,12 +1813,18 @@ int do_justify(void) edit_refresh(); statusbar(_("Can now UnJustify!")); + /* Change the shortcut list to display the unjustify code */ + shortcut_init(1); + display_main_list(); reset_cursor(); - /* Now get a keystroke and see if it's unjustify, if not unget the keytreoke + /* Now get a keystroke and see if it's unjustify, if not unget the keytroke and return */ - if ((kbinput = wgetch(edit)) != NANO_UNJUSTIFY_KEY) - ungetch(kbinput); + if ((kbinput = wgetch(edit)) != NANO_UNJUSTIFY_KEY) { + ungetch(kbinput); + shortcut_init(0); + display_main_list(); + } else { /* Else restore the justify we just did (ungrateful user!) */ if (tmptop->prev != NULL) @@ -1927,7 +1933,7 @@ void do_toggle(int which) switch (toggles[which].val) { case TOGGLE_PICOMODE_KEY: - shortcut_init(); + shortcut_init(0); display_main_list(); break; case TOGGLE_SUSPEND_KEY: @@ -2142,7 +2148,7 @@ int main(int argc, char *argv[]) /* Set up some global variables */ global_init(); - shortcut_init(); + shortcut_init(0); init_help_msg(); help_init(); signal_init(); diff --git a/po/cat-id-tbl.c b/po/cat-id-tbl.c index c3f58406..5e47a8d5 100644 --- a/po/cat-id-tbl.c +++ b/po/cat-id-tbl.c @@ -43,66 +43,68 @@ const struct _msg_ent _msg_tbl[] = { {"Exit from nano", 34}, {"Goto a specific line number", 35}, {"Justify the current paragraph", 36}, - {"Replace text within the editor", 37}, - {"Insert another file into the current one", 38}, - {"Search for text within the editor", 39}, - {"Move to the previous screen", 40}, - {"Move to the next screen", 41}, - {"Cut the current line and store it in the cutbuffer", 42}, - {"Uncut from the cutbuffer into the current line", 43}, - {"Show the posititon of the cursor", 44}, - {"Invoke the spell checker (if available)", 45}, - {"Move up one line", 46}, - {"Move down one line", 47}, - {"Move forward one character", 48}, - {"Move back one character", 49}, - {"Move to the beginning of the current line", 50}, - {"Move to the end of the current line", 51}, - {"Go to the first line of the file", 52}, - {"Go to the last line of the file", 53}, - {"Refresh (redraw) the current screen", 54}, - {"Mark text at the current cursor location", 55}, - {"Delete the character under the cursor", 56}, - {"Delete the character to the left of the cursor", 57}, - {"Insert a tab character", 58}, - {"Insert a carriage return at the cursor position", 59}, - {"Make the current search or replace case (in)sensitive", 60}, - {"Cancel the current function", 61}, - {"Get Help", 62}, - {"WriteOut", 63}, - {"Exit", 64}, - {"Goto Line", 65}, - {"Justify", 66}, - {"Replace", 67}, - {"Read File", 68}, - {"Where Is", 69}, - {"Prev Page", 70}, - {"Next Page", 71}, - {"Cut Text", 72}, - {"UnCut Txt", 73}, - {"Cur Pos", 74}, - {"To Spell", 75}, - {"Up", 76}, - {"Down", 77}, - {"Forward", 78}, - {"Back", 79}, - {"Home", 80}, - {"End", 81}, - {"Refresh", 82}, - {"Mark Text", 83}, - {"Delete", 84}, - {"Backspace", 85}, - {"Tab", 86}, - {"Enter", 87}, - {"First Line", 88}, - {"Last Line", 89}, - {"Case Sens", 90}, - {"Cancel", 91}, - {"No Replace", 92}, + {"Unjustify after a justify", 37}, + {"Replace text within the editor", 38}, + {"Insert another file into the current one", 39}, + {"Search for text within the editor", 40}, + {"Move to the previous screen", 41}, + {"Move to the next screen", 42}, + {"Cut the current line and store it in the cutbuffer", 43}, + {"Uncut from the cutbuffer into the current line", 44}, + {"Show the posititon of the cursor", 45}, + {"Invoke the spell checker (if available)", 46}, + {"Move up one line", 47}, + {"Move down one line", 48}, + {"Move forward one character", 49}, + {"Move back one character", 50}, + {"Move to the beginning of the current line", 51}, + {"Move to the end of the current line", 52}, + {"Go to the first line of the file", 53}, + {"Go to the last line of the file", 54}, + {"Refresh (redraw) the current screen", 55}, + {"Mark text at the current cursor location", 56}, + {"Delete the character under the cursor", 57}, + {"Delete the character to the left of the cursor", 58}, + {"Insert a tab character", 59}, + {"Insert a carriage return at the cursor position", 60}, + {"Make the current search or replace case (in)sensitive", 61}, + {"Cancel the current function", 62}, + {"Get Help", 63}, + {"WriteOut", 64}, + {"Exit", 65}, + {"Goto Line", 66}, + {"Justify", 67}, + {"Replace", 68}, + {"Read File", 69}, + {"Where Is", 70}, + {"Prev Page", 71}, + {"Next Page", 72}, + {"Cut Text", 73}, + {"UnJustify", 74}, + {"UnCut Txt", 75}, + {"Cur Pos", 76}, + {"To Spell", 77}, + {"Up", 78}, + {"Down", 79}, + {"Forward", 80}, + {"Back", 81}, + {"Home", 82}, + {"End", 83}, + {"Refresh", 84}, + {"Mark Text", 85}, + {"Delete", 86}, + {"Backspace", 87}, + {"Tab", 88}, + {"Enter", 89}, + {"First Line", 90}, + {"Last Line", 91}, + {"Case Sens", 92}, + {"Cancel", 93}, + {"No Replace", 94}, {"\ \n\ -Buffer written to 'nano.save'\n", 93}, - {"Key illegal in VIEW mode", 94}, +Buffer written to 'nano.save'\n", 95}, + {"Key illegal in VIEW mode", 96}, {"\ nano help text\n\ \n\ @@ -120,130 +122,130 @@ Escape-key sequences are notated with the Meta (M) symbol and can be entered \ using either the Esc, Alt or Meta key depending on your keyboard setup. The \ following keystrokes are available in the main editor window. Optional keys \ are shown in parentheses:\n\ -\n", 95}, - {"free_node(): free'd a node, YAY!\n", 96}, - {"free_node(): free'd last node.\n", 97}, +\n", 97}, + {"free_node(): free'd a node, YAY!\n", 98}, + {"free_node(): free'd last node.\n", 99}, {"\ Usage: nano [GNU long option] [option] +LINE \n\ -\n", 98}, - {"Option\t\tLong option\t\tMeaning\n", 99}, - {" -T \t\t--tabsize=[num]\t\tSet width of a tab to num\n", 100}, - {" -R\t\t--regexp\t\tUse regular expressions for search\n", 101}, - {" -V \t\t--version\t\tPrint version information and exit\n", 102}, - {" -c \t\t--const\t\t\tConstantly show cursor position\n", 103}, - {" -h \t\t--help\t\t\tShow this message\n", 104}, - {" -k \t\t--cut\t\t\tLet ^K cut from cursor to end of line\n", 105}, - {" -i \t\t--autoindent\t\tAutomatically indent new lines\n", 106}, - {" -l \t\t--nofollow\t\tDon't follow symbolic links, overwrite\n", 107}, - {" -m \t\t--mouse\t\t\tEnable mouse\n", 108}, +\n", 100}, + {"Option\t\tLong option\t\tMeaning\n", 101}, + {" -T \t\t--tabsize=[num]\t\tSet width of a tab to num\n", 102}, + {" -R\t\t--regexp\t\tUse regular expressions for search\n", 103}, + {" -V \t\t--version\t\tPrint version information and exit\n", 104}, + {" -c \t\t--const\t\t\tConstantly show cursor position\n", 105}, + {" -h \t\t--help\t\t\tShow this message\n", 106}, + {" -k \t\t--cut\t\t\tLet ^K cut from cursor to end of line\n", 107}, + {" -i \t\t--autoindent\t\tAutomatically indent new lines\n", 108}, + {" -l \t\t--nofollow\t\tDon't follow symbolic links, overwrite\n", 109}, + {" -m \t\t--mouse\t\t\tEnable mouse\n", 110}, {"\ - -r [#cols] \t--fill=[#cols]\t\tSet fill cols to (wrap lines at) #cols\n", 109}, - {" -p\t \t--pico\t\t\tEmulate Pico as closely as possible\n", 110}, - {" -s [prog] \t--speller=[prog]\tEnable alternate speller\n", 111}, - {" -t \t\t--tempfile\t\tAuto save on exit, don't prompt\n", 112}, - {" -v \t\t--view\t\t\tView (read only) mode\n", 113}, - {" -w \t\t--nowrap\t\tDon't wrap long lines\n", 114}, - {" -x \t\t--nohelp\t\tDon't show help window\n", 115}, - {" -z \t\t--suspend\t\tEnable suspend\n", 116}, - {" +LINE\t\t\t\t\tStart at line number LINE\n", 117}, + -r [#cols] \t--fill=[#cols]\t\tSet fill cols to (wrap lines at) #cols\n", 111}, + {" -p\t \t--pico\t\t\tEmulate Pico as closely as possible\n", 112}, + {" -s [prog] \t--speller=[prog]\tEnable alternate speller\n", 113}, + {" -t \t\t--tempfile\t\tAuto save on exit, don't prompt\n", 114}, + {" -v \t\t--view\t\t\tView (read only) mode\n", 115}, + {" -w \t\t--nowrap\t\tDon't wrap long lines\n", 116}, + {" -x \t\t--nohelp\t\tDon't show help window\n", 117}, + {" -z \t\t--suspend\t\tEnable suspend\n", 118}, + {" +LINE\t\t\t\t\tStart at line number LINE\n", 119}, {"\ Usage: nano [option] +LINE \n\ -\n", 118}, - {"Option\t\tMeaning\n", 119}, - {" -T [num]\tSet width of a tab to num\n", 120}, - {" -R\t\tUse regular expressions for search\n", 121}, - {" -V \t\tPrint version information and exit\n", 122}, - {" -c \t\tConstantly show cursor position\n", 123}, - {" -h \t\tShow this message\n", 124}, - {" -k \t\tLet ^K cut from cursor to end of line\n", 125}, - {" -i \t\tAutomatically indent new lines\n", 126}, - {" -l \t\tDon't follow symbolic links, overwrite\n", 127}, - {" -m \t\tEnable mouse\n", 128}, - {" -r [#cols] \tSet fill cols to (wrap lines at) #cols\n", 129}, - {" -s [prog] \tEnable alternate speller\n", 130}, - {" -p \t\tEmulate Pico as closely as possible\n", 131}, - {" -t \t\tAuto save on exit, don't prompt\n", 132}, - {" -v \t\tView (read only) mode\n", 133}, - {" -w \t\tDon't wrap long lines\n", 134}, - {" -x \t\tDon't show help window\n", 135}, - {" -z \t\tEnable suspend\n", 136}, - {" +LINE\t\tStart at line number LINE\n", 137}, - {" nano version %s by Chris Allegretta (compiled %s, %s)\n", 138}, - {" Email: nano@nano-editor.org\tWeb: http://www.nano-editor.org", 139}, +\n", 120}, + {"Option\t\tMeaning\n", 121}, + {" -T [num]\tSet width of a tab to num\n", 122}, + {" -R\t\tUse regular expressions for search\n", 123}, + {" -V \t\tPrint version information and exit\n", 124}, + {" -c \t\tConstantly show cursor position\n", 125}, + {" -h \t\tShow this message\n", 126}, + {" -k \t\tLet ^K cut from cursor to end of line\n", 127}, + {" -i \t\tAutomatically indent new lines\n", 128}, + {" -l \t\tDon't follow symbolic links, overwrite\n", 129}, + {" -m \t\tEnable mouse\n", 130}, + {" -r [#cols] \tSet fill cols to (wrap lines at) #cols\n", 131}, + {" -s [prog] \tEnable alternate speller\n", 132}, + {" -p \t\tEmulate Pico as closely as possible\n", 133}, + {" -t \t\tAuto save on exit, don't prompt\n", 134}, + {" -v \t\tView (read only) mode\n", 135}, + {" -w \t\tDon't wrap long lines\n", 136}, + {" -x \t\tDon't show help window\n", 137}, + {" -z \t\tEnable suspend\n", 138}, + {" +LINE\t\tStart at line number LINE\n", 139}, + {" nano version %s by Chris Allegretta (compiled %s, %s)\n", 140}, + {" Email: nano@nano-editor.org\tWeb: http://www.nano-editor.org", 141}, {"\ \n\ - Compiled options:", 140}, - {"Mark Set", 141}, - {"Mark UNset", 142}, - {"check_wrap called with inptr->data=\"%s\"\n", 143}, - {"current->data now = \"%s\"\n", 144}, - {"After, data = \"%s\"\n", 145}, - {"Edit a replacement", 146}, - {"Could not create a temporary filename: %s", 147}, - {"Finished checking spelling", 148}, - {"Spell checking failed", 149}, - {"Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? ", 150}, - {"Cannot resize top win", 151}, - {"Cannot move top win", 152}, - {"Cannot resize edit win", 153}, - {"Cannot move edit win", 154}, - {"Cannot resize bottom win", 155}, - {"Cannot move bottom win", 156}, - {"Can now UnJustify!", 157}, - {"%s enable/disable", 158}, - {"enabled", 159}, - {"disabled", 160}, - {"Main: set up windows\n", 161}, - {"Main: bottom win\n", 162}, - {"Main: open file\n", 163}, - {"I got Alt-O-%c! (%d)\n", 164}, - {"I got Alt-[-1-%c! (%d)\n", 165}, - {"I got Alt-[-2-%c! (%d)\n", 166}, - {"I got Alt-[-%c! (%d)\n", 167}, - {"I got Alt-%c! (%d)\n", 168}, - {"Case Sensitive Regexp Search%s%s", 169}, - {"Regexp Search%s%s", 170}, - {"Case Sensitive Search%s%s", 171}, - {"Search%s%s", 172}, - {" (to replace)", 173}, - {"Search Cancelled", 174}, - {"\"%s...\" not found", 175}, - {"Search Wrapped", 176}, - {"Replaced %d occurences", 177}, - {"Replaced 1 occurence", 178}, - {"Replace Cancelled", 179}, - {"Replace this instance?", 180}, - {"Replace failed: unknown subexpression!", 181}, - {"Replace with [%s]", 182}, - {"Replace with", 183}, - {"Enter line number", 184}, - {"Aborted", 185}, - {"Come on, be reasonable", 186}, - {"Only %d lines available, skipping to last line", 187}, - {"actual_x_from_start for xplus=%d returned %d\n", 188}, - {"input '%c' (%d)\n", 189}, - {"New Buffer", 190}, - {" File: ...", 191}, - {"Modified", 192}, - {"Moved to (%d, %d) in edit buffer\n", 193}, - {"current->data = \"%s\"\n", 194}, - {"I got \"%s\"\n", 195}, - {"Yes", 196}, - {"All", 197}, - {"No", 198}, - {"do_cursorpos: linepct = %f, bytepct = %f\n", 199}, - {"line %d of %d (%.0f%%), character %d of %d (%.0f%%)", 200}, - {"Dumping file buffer to stderr...\n", 201}, - {"Dumping cutbuffer to stderr...\n", 202}, - {"Dumping a buffer to stderr...\n", 203}, - {"The nano text editor", 204}, - {"version ", 205}, - {"Brought to you by:", 206}, - {"Special thanks to:", 207}, - {"The Free Software Foundation", 208}, - {"Pavel Curtis, Zeyd Ben-Halim and Eric S. Raymond for ncurses", 209}, - {"and anyone else we forgot...", 210}, - {"Thank you for using nano!\n", 211}, + Compiled options:", 142}, + {"Mark Set", 143}, + {"Mark UNset", 144}, + {"check_wrap called with inptr->data=\"%s\"\n", 145}, + {"current->data now = \"%s\"\n", 146}, + {"After, data = \"%s\"\n", 147}, + {"Edit a replacement", 148}, + {"Could not create a temporary filename: %s", 149}, + {"Finished checking spelling", 150}, + {"Spell checking failed", 151}, + {"Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? ", 152}, + {"Cannot resize top win", 153}, + {"Cannot move top win", 154}, + {"Cannot resize edit win", 155}, + {"Cannot move edit win", 156}, + {"Cannot resize bottom win", 157}, + {"Cannot move bottom win", 158}, + {"Can now UnJustify!", 159}, + {"%s enable/disable", 160}, + {"enabled", 161}, + {"disabled", 162}, + {"Main: set up windows\n", 163}, + {"Main: bottom win\n", 164}, + {"Main: open file\n", 165}, + {"I got Alt-O-%c! (%d)\n", 166}, + {"I got Alt-[-1-%c! (%d)\n", 167}, + {"I got Alt-[-2-%c! (%d)\n", 168}, + {"I got Alt-[-%c! (%d)\n", 169}, + {"I got Alt-%c! (%d)\n", 170}, + {"Case Sensitive Regexp Search%s%s", 171}, + {"Regexp Search%s%s", 172}, + {"Case Sensitive Search%s%s", 173}, + {"Search%s%s", 174}, + {" (to replace)", 175}, + {"Search Cancelled", 176}, + {"\"%s...\" not found", 177}, + {"Search Wrapped", 178}, + {"Replaced %d occurences", 179}, + {"Replaced 1 occurence", 180}, + {"Replace Cancelled", 181}, + {"Replace this instance?", 182}, + {"Replace failed: unknown subexpression!", 183}, + {"Replace with [%s]", 184}, + {"Replace with", 185}, + {"Enter line number", 186}, + {"Aborted", 187}, + {"Come on, be reasonable", 188}, + {"Only %d lines available, skipping to last line", 189}, + {"actual_x_from_start for xplus=%d returned %d\n", 190}, + {"input '%c' (%d)\n", 191}, + {"New Buffer", 192}, + {" File: ...", 193}, + {"Modified", 194}, + {"Moved to (%d, %d) in edit buffer\n", 195}, + {"current->data = \"%s\"\n", 196}, + {"I got \"%s\"\n", 197}, + {"Yes", 198}, + {"All", 199}, + {"No", 200}, + {"do_cursorpos: linepct = %f, bytepct = %f\n", 201}, + {"line %d of %d (%.0f%%), character %d of %d (%.0f%%)", 202}, + {"Dumping file buffer to stderr...\n", 203}, + {"Dumping cutbuffer to stderr...\n", 204}, + {"Dumping a buffer to stderr...\n", 205}, + {"The nano text editor", 206}, + {"version ", 207}, + {"Brought to you by:", 208}, + {"Special thanks to:", 209}, + {"The Free Software Foundation", 210}, + {"Pavel Curtis, Zeyd Ben-Halim and Eric S. Raymond for ncurses", 211}, + {"and anyone else we forgot...", 212}, + {"Thank you for using nano!\n", 213}, }; -int _msg_tbl_length = 211; +int _msg_tbl_length = 213; diff --git a/po/nano.pot b/po/nano.pot index ca382c1e..30388215 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-11-26 21:50-0500\n" +"POT-Creation-Date: 2000-11-27 17:57-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -168,227 +168,235 @@ msgid "Justify the current paragraph" msgstr "" #: global.c:181 -msgid "Replace text within the editor" +msgid "Unjustify after a justify" msgstr "" #: global.c:182 -msgid "Insert another file into the current one" +msgid "Replace text within the editor" msgstr "" #: global.c:183 -msgid "Search for text within the editor" +msgid "Insert another file into the current one" msgstr "" #: global.c:184 -msgid "Move to the previous screen" +msgid "Search for text within the editor" msgstr "" #: global.c:185 -msgid "Move to the next screen" +msgid "Move to the previous screen" msgstr "" #: global.c:186 -msgid "Cut the current line and store it in the cutbuffer" +msgid "Move to the next screen" msgstr "" #: global.c:187 -msgid "Uncut from the cutbuffer into the current line" +msgid "Cut the current line and store it in the cutbuffer" msgstr "" #: global.c:188 -msgid "Show the posititon of the cursor" +msgid "Uncut from the cutbuffer into the current line" msgstr "" #: global.c:189 -msgid "Invoke the spell checker (if available)" +msgid "Show the posititon of the cursor" msgstr "" #: global.c:190 -msgid "Move up one line" +msgid "Invoke the spell checker (if available)" msgstr "" #: global.c:191 -msgid "Move down one line" +msgid "Move up one line" msgstr "" #: global.c:192 -msgid "Move forward one character" +msgid "Move down one line" msgstr "" #: global.c:193 -msgid "Move back one character" +msgid "Move forward one character" msgstr "" #: global.c:194 -msgid "Move to the beginning of the current line" +msgid "Move back one character" msgstr "" #: global.c:195 -msgid "Move to the end of the current line" +msgid "Move to the beginning of the current line" msgstr "" #: global.c:196 -msgid "Go to the first line of the file" +msgid "Move to the end of the current line" msgstr "" #: global.c:197 -msgid "Go to the last line of the file" +msgid "Go to the first line of the file" msgstr "" #: global.c:198 -msgid "Refresh (redraw) the current screen" +msgid "Go to the last line of the file" msgstr "" #: global.c:199 -msgid "Mark text at the current cursor location" +msgid "Refresh (redraw) the current screen" msgstr "" #: global.c:200 +msgid "Mark text at the current cursor location" +msgstr "" + +#: global.c:201 msgid "Delete the character under the cursor" msgstr "" -#: global.c:202 +#: global.c:203 msgid "Delete the character to the left of the cursor" msgstr "" -#: global.c:203 +#: global.c:204 msgid "Insert a tab character" msgstr "" -#: global.c:204 +#: global.c:205 msgid "Insert a carriage return at the cursor position" msgstr "" -#: global.c:206 +#: global.c:207 msgid "Make the current search or replace case (in)sensitive" msgstr "" -#: global.c:207 +#: global.c:208 msgid "Cancel the current function" msgstr "" -#: global.c:211 global.c:323 global.c:408 +#: global.c:212 global.c:328 global.c:413 msgid "Get Help" msgstr "" -#: global.c:214 global.c:222 +#: global.c:215 global.c:223 msgid "WriteOut" msgstr "" -#: global.c:218 global.c:397 +#: global.c:219 global.c:402 msgid "Exit" msgstr "" -#: global.c:226 global.c:319 global.c:341 global.c:361 +#: global.c:227 global.c:324 global.c:346 global.c:366 msgid "Goto Line" msgstr "" -#: global.c:231 global.c:310 +#: global.c:232 global.c:315 msgid "Justify" msgstr "" -#: global.c:235 global.c:306 global.c:337 +#: global.c:236 global.c:311 global.c:342 msgid "Replace" msgstr "" -#: global.c:239 +#: global.c:240 msgid "Read File" msgstr "" -#: global.c:243 +#: global.c:244 msgid "Where Is" msgstr "" -#: global.c:247 global.c:389 +#: global.c:248 global.c:394 msgid "Prev Page" msgstr "" -#: global.c:251 global.c:393 +#: global.c:252 global.c:398 msgid "Next Page" msgstr "" -#: global.c:255 +#: global.c:256 msgid "Cut Text" msgstr "" -#: global.c:258 +#: global.c:260 +msgid "UnJustify" +msgstr "" + +#: global.c:263 msgid "UnCut Txt" msgstr "" -#: global.c:262 +#: global.c:267 msgid "Cur Pos" msgstr "" -#: global.c:266 +#: global.c:271 msgid "To Spell" msgstr "" -#: global.c:270 +#: global.c:275 msgid "Up" msgstr "" -#: global.c:273 +#: global.c:278 msgid "Down" msgstr "" -#: global.c:276 +#: global.c:281 msgid "Forward" msgstr "" -#: global.c:279 +#: global.c:284 msgid "Back" msgstr "" -#: global.c:282 +#: global.c:287 msgid "Home" msgstr "" -#: global.c:285 +#: global.c:290 msgid "End" msgstr "" -#: global.c:288 +#: global.c:293 msgid "Refresh" msgstr "" -#: global.c:291 +#: global.c:296 msgid "Mark Text" msgstr "" -#: global.c:294 +#: global.c:299 msgid "Delete" msgstr "" -#: global.c:298 +#: global.c:303 msgid "Backspace" msgstr "" -#: global.c:302 +#: global.c:307 msgid "Tab" msgstr "" -#: global.c:314 +#: global.c:319 msgid "Enter" msgstr "" -#: global.c:327 global.c:348 global.c:369 global.c:379 +#: global.c:332 global.c:353 global.c:374 global.c:384 msgid "First Line" msgstr "" -#: global.c:330 global.c:351 global.c:372 global.c:382 +#: global.c:335 global.c:356 global.c:377 global.c:387 msgid "Last Line" msgstr "" -#: global.c:333 global.c:354 +#: global.c:338 global.c:359 msgid "Case Sens" msgstr "" -#: global.c:344 global.c:364 global.c:375 global.c:385 global.c:401 -#: global.c:405 global.c:411 winio.c:1026 +#: global.c:349 global.c:369 global.c:380 global.c:390 global.c:406 +#: global.c:410 global.c:416 winio.c:1026 msgid "Cancel" msgstr "" -#: global.c:357 +#: global.c:362 msgid "No Replace" msgstr "" @@ -683,52 +691,52 @@ msgstr "" msgid "Can now UnJustify!" msgstr "" -#: nano.c:1908 +#: nano.c:1914 #, c-format msgid "%s enable/disable" msgstr "" -#: nano.c:1920 +#: nano.c:1926 msgid "enabled" msgstr "" -#: nano.c:1921 +#: nano.c:1927 msgid "disabled" msgstr "" -#: nano.c:2151 +#: nano.c:2157 msgid "Main: set up windows\n" msgstr "" -#: nano.c:2164 +#: nano.c:2170 msgid "Main: bottom win\n" msgstr "" -#: nano.c:2170 +#: nano.c:2176 msgid "Main: open file\n" msgstr "" -#: nano.c:2207 +#: nano.c:2213 #, c-format msgid "I got Alt-O-%c! (%d)\n" msgstr "" -#: nano.c:2229 +#: nano.c:2235 #, c-format msgid "I got Alt-[-1-%c! (%d)\n" msgstr "" -#: nano.c:2262 +#: nano.c:2268 #, c-format msgid "I got Alt-[-2-%c! (%d)\n" msgstr "" -#: nano.c:2310 +#: nano.c:2316 #, c-format msgid "I got Alt-[-%c! (%d)\n" msgstr "" -#: nano.c:2336 +#: nano.c:2342 #, c-format msgid "I got Alt-%c! (%d)\n" msgstr "" diff --git a/proto.h b/proto.h index cb35492d..14e47773 100644 --- a/proto.h +++ b/proto.h @@ -92,7 +92,7 @@ int check_wildcard_match(const char *text, const char *pattern); char *input_tab(char *buf, int place, int *lastWasTab, int *newplace); char *real_dir_from_tilde(char *buf); -void shortcut_init(void); +void shortcut_init(int unjustify); void lowercase(char *src); void blank_bottombars(void); void check_wrap(filestruct * inptr, char ch);