From 4da1fc65f0c58842c86a276870c6a619b95f81f1 Mon Sep 17 00:00:00 2001 From: Chris Allegretta Date: Wed, 21 Jun 2000 03:00:43 +0000 Subject: [PATCH] Synch with official 0.9.11 git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@45 35c25a1d-7b9e-4130-9fde-d3aeb78583b8 --- ChangeLog | 6 +- NEWS | 5 +- configure | 2 +- configure.in | 2 +- cut.c | 2 +- files.c | 26 +++--- move.c | 6 +- nano.1 | 3 + nano.1.html | 6 +- nano.c | 239 +++++++++++++++++++++++++-------------------------- po/de.gmo | Bin 14994 -> 14994 bytes po/de.po | 192 ++++++++++++++++++++--------------------- po/es.gmo | Bin 15834 -> 15834 bytes po/es.po | 192 ++++++++++++++++++++--------------------- po/fr.po | 192 ++++++++++++++++++++--------------------- po/id.gmo | Bin 15093 -> 15093 bytes po/id.po | 195 +++++++++++++++++++++-------------------- po/it.gmo | Bin 13258 -> 13258 bytes po/it.po | 192 ++++++++++++++++++++--------------------- po/nano.pot | 196 +++++++++++++++++++++--------------------- search.c | 3 +- utils.c | 15 ++-- winio.c | 141 ++++++++++++++++-------------- 23 files changed, 816 insertions(+), 799 deletions(-) diff --git a/ChangeLog b/ChangeLog index 34a8750d..d2c11526 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,10 +1,12 @@ -nano-0.9.11 - 06/xx/2000 +nano-0.9.11 - 06/20/2000 - New flag "-T" or "--tabsize" to specify how to display tab widths. Affects main() in nano.c, strlenpt(), xpt() and actual_x() (et al) in winio.c, and nano.h. Many harcoded "8"s have been changed to the - TABSIZE int. + TABSIZE int. Added changes to nano.1 and nano.1.html. - id.po: - Indonesian translation by Tedi Heriyanto. +- es.po: + - Updated translation (Jordi Mallach). - winio.c - Rewrite of display functions to correct the display problems we had been seeing. Affects: add_marked_sameline, edit_add, diff --git a/NEWS b/NEWS index 53a3e243..16fea013 100644 --- a/NEWS +++ b/NEWS @@ -1,4 +1,4 @@ -06/xx/2000 - Nano 0.9.11 presents drastic rewrites of the most buggy +06/20/2000 - Nano 0.9.11 presents drastic rewrites of the most buggy routines in the program, specifically the wrapping code and almost all of the display routines. There are many improvements and bugfixes to the display subsystem in @@ -8,7 +8,8 @@ this function just changes the way tabs LOOK in the editor, the tabs you input are still real tabs of normal width (usually 8 characters); nano just makes them look - smaller or bigger whlie in the editor. + smaller or bigger whlie in the editor. New in the + translation department is an indonesian translation (id). 06/06/2000 - Nano 0.9.10 is primarily a bugfix for the loss of SIGINT when using "run and terminate" flags (for example, --help). diff --git a/configure b/configure index 1b96ede9..a0f7dd13 100755 --- a/configure +++ b/configure @@ -710,7 +710,7 @@ fi PACKAGE=nano -VERSION=0.9.10-cvs +VERSION=0.9.11-cvs if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; } diff --git a/configure.in b/configure.in index 0f78652f..b2f19776 100644 --- a/configure.in +++ b/configure.in @@ -1,6 +1,6 @@ dnl Process this file with autoconf to produce a configure script. AC_INIT(nano.c) -AM_INIT_AUTOMAKE(nano, 0.9.10-cvs) +AM_INIT_AUTOMAKE(nano, 0.9.11-cvs) AM_CONFIG_HEADER(config.h:config.h.in) ALL_LINGUAS="es de fr it id" diff --git a/cut.c b/cut.c index 3a3cf653..36517984 100644 --- a/cut.c +++ b/cut.c @@ -82,7 +82,7 @@ void cut_marked_segment(filestruct * top, int top_x, filestruct * bot, next = tmp->next; add_to_cutbuffer(tmp); totlines--; - totsize--; /* newline (add_to_cutbuffer doesn't count newlines) */ + totsize--; /* newline (add_to_cutbuffer doesn't count newlines) */ tmp = next; } while (next != bot && next != NULL); diff --git a/files.c b/files.c index 03b68cbb..2edf7ff5 100644 --- a/files.c +++ b/files.c @@ -30,7 +30,7 @@ #include "config.h" #include "proto.h" #include "nano.h" - + #ifndef NANO_SMALL #include #define _(string) gettext(string) @@ -252,14 +252,13 @@ int do_insertfile(void) set_modified(); /* Here we want to rebuild the edit window */ - for(i = 0, editbot = edittop; - i <= editwinrows - 1 - && i <= totlines - && editbot->next != NULL; - editbot = editbot->next, i++); + for (i = 0, editbot = edittop; + i <= editwinrows - 1 + && i <= totlines + && editbot->next != NULL; editbot = editbot->next, i++); /* If we've gone off the bottom, recenter, otherwise just redraw */ - if(current->lineno > editbot->lineno) + if (current->lineno > editbot->lineno) edit_update(current); else edit_refresh(); @@ -435,9 +434,9 @@ int do_writeout(int exiting) while (1) { i = statusq(writefile_list, WRITEFILE_LIST_LEN, answer, - _("File Name to write")); + _("File Name to write")); - if (i != -1) { + if (i != -1) { #ifdef DEBUG fprintf(stderr, _("filename is %s"), answer); @@ -449,17 +448,17 @@ int do_writeout(int exiting) if (!i || (i == -1)) continue; - } - } + } + } i = write_file(answer, 0); display_main_list(); return i; - } else { + } else { statusbar(_("Cancelled")); display_main_list(); return 0; - } + } } } @@ -467,4 +466,3 @@ int do_writeout_void(void) { return do_writeout(0); } - diff --git a/move.c b/move.c index b5941086..9db208ae 100644 --- a/move.c +++ b/move.c @@ -24,7 +24,7 @@ #include "config.h" #include "proto.h" #include "nano.h" - + #ifndef NANO_SMALL #include #define _(string) gettext(string) @@ -108,8 +108,8 @@ int do_down(void) check_statblank(); return 0; } - - if (current_y < editwinrows - 1 && current != editbot) + + if (current_y < editwinrows - 1 && current != editbot) current_y++; else page_down_center(); diff --git a/nano.1 b/nano.1 index d5801d11..06d9c723 100644 --- a/nano.1 +++ b/nano.1 @@ -39,6 +39,9 @@ default) features in Pico, such as "search and replace" and "goto line number". .SH OPTIONS .TP +.B \-T (\-\-tabsize) +Set the size (width) of a tab, if supported by your curses library. +.TP .B \-V (\-\-version) Show the current version number and author. .TP diff --git a/nano.1.html b/nano.1.html index d0be08b6..c43e053b 100644 --- a/nano.1.html +++ b/nano.1.html @@ -56,6 +56,10 @@ number".

OPTIONS

+
-T (--tabsize) + +
+Set the size (width) of a tab, if supported by your curses library.
-V (--version)
@@ -153,6 +157,6 @@ GNU/Linux system (but may be used by others). This document was created by man2html, using the manual pages.
-Time: 23:18:59 GMT, June 04, 2000 +Time: 02:19:33 GMT, June 21, 2000 diff --git a/nano.c b/nano.c index 8d79220b..1278f4dd 100644 --- a/nano.c +++ b/nano.c @@ -74,15 +74,14 @@ RETSIGTYPE finish(int sigage) if (!ISSET(NO_HELP)) { mvwaddstr(bottomwin, 1, 0, hblank); mvwaddstr(bottomwin, 2, 0, hblank); - } - else + } else mvwaddstr(bottomwin, 0, 0, hblank); wrefresh(bottomwin); endwin(); /* Restore the old term settings */ - tcsetattr (0, TCSANOW, &oldterm); + tcsetattr(0, TCSANOW, &oldterm); exit(sigage); } @@ -102,7 +101,7 @@ void die(char *msg, ...) write_file("nano.save", 0); /* Restore the old term settings */ - tcsetattr (0, TCSANOW, &oldterm); + tcsetattr(0, TCSANOW, &oldterm); clear(); refresh(); @@ -157,21 +156,21 @@ void init_help_msg(void) #ifndef NANO_SMALL help_text_init = - _(" nano help text\n\n " - "The nano editor is designed to emulate the functionality and " - "ease-of-use of the UW Pico text editor. There are four main " - "sections of the editor: The top line shows the program " - "version, the current filename being edited, and whether " - "or not the file has been modified. Next is the main editor " - "window showing the file being edited. The status line is " - "the third line from the bottom and shows important messages. " - "The bottom two lines show the most commonly used shortcuts " - "in the editor.\n\n " - "The notation for shortcuts is as follows: Control-key " - "sequences are notated 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"); + _(" nano help text\n\n " + "The nano editor is designed to emulate the functionality and " + "ease-of-use of the UW Pico text editor. There are four main " + "sections of the editor: The top line shows the program " + "version, the current filename being edited, and whether " + "or not the file has been modified. Next is the main editor " + "window showing the file being edited. The status line is " + "the third line from the bottom and shows important messages. " + "The bottom two lines show the most commonly used shortcuts " + "in the editor.\n\n " + "The notation for shortcuts is as follows: Control-key " + "sequences are notated 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"); #endif } @@ -353,8 +352,7 @@ void usage(void) printf(_("Usage: nano [option] +LINE \n\n")); printf(_("Option Meaning\n")); #ifdef HAVE_TABSIZE - printf(_ - (" -T [num] Set width of a tab to num\n")); + printf(_(" -T [num] Set width of a tab to num\n")); #endif printf(_(" -V Print version information and exit\n")); printf(_(" -c Constantly show cursor position\n")); @@ -452,7 +450,7 @@ void do_char(char ch) do_right(); if (!ISSET(NO_WRAP) && (ch != '\t')) - check_wrap(current, ch); + check_wrap(current, ch); set_modified(); check_statblank(); UNSET(KEEP_CUTBUFFER); @@ -567,57 +565,56 @@ void do_next_word(void) } -void do_wrap(filestruct *inptr, char input_char) +void do_wrap(filestruct * inptr, char input_char) { - int i = 0; /* Index into ->data for line.*/ - int i_tabs = 0; /* Screen position of ->data[i]. */ - int last_word_end = -1; /* Location of end of last word found. */ - int current_word_start = -1; /* Location of start of current word. */ - int current_word_start_t = -1; /* Location of start of current word screen position. */ - int current_word_end = -1; /* Location of end of current word */ - int current_word_end_t = -1; /* Location of end of current word screen position. */ + int i = 0; /* Index into ->data for line. */ + int i_tabs = 0; /* Screen position of ->data[i]. */ + int last_word_end = -1; /* Location of end of last word found. */ + int current_word_start = -1; /* Location of start of current word. */ + int current_word_start_t = -1; /* Location of start of current word screen position. */ + int current_word_end = -1; /* Location of end of current word */ + int current_word_end_t = -1; /* Location of end of current word screen position. */ int len = strlen(inptr->data); - int down = 0; + int down = 0; int right = 0; struct filestruct *temp = NULL; -assert (strlenpt(inptr->data) > fill); + assert(strlenpt(inptr->data) > fill); for (i = 0, i_tabs = 0; i < len; i++, i_tabs++) { if (!isspace(inptr->data[i])) { - last_word_end = current_word_end; + last_word_end = current_word_end; - current_word_start = i; + current_word_start = i; current_word_start_t = i_tabs; while (!isspace(inptr->data[i]) && inptr->data[i]) { i++; i_tabs++; - if (inptr->data[i] < 32) - i_tabs++; + if (inptr->data[i] < 32) + i_tabs++; } if (inptr->data[i]) { - current_word_end = i; + current_word_end = i; current_word_end_t = i_tabs; - } - else { - current_word_end = i - 1; + } else { + current_word_end = i - 1; current_word_end_t = i_tabs - 1; } } - if (inptr->data[i] == NANO_CONTROL_I) { - if (i_tabs % TABSIZE != 0); - i_tabs += TABSIZE - (i_tabs % TABSIZE); - } + if (inptr->data[i] == NANO_CONTROL_I) { + if (i_tabs % TABSIZE != 0); + i_tabs += TABSIZE - (i_tabs % TABSIZE); + } if (current_word_end_t > fill) break; } - assert (current_word_end_t > fill); + assert(current_word_end_t > fill); /* There are a few (ever changing) cases of what the line could look like. * 1) only one word on the line before wrap point. @@ -645,40 +642,39 @@ assert (strlenpt(inptr->data) > fill); * - white space at end of original line is cleared */ - temp = nmalloc (sizeof (filestruct)); + temp = nmalloc(sizeof(filestruct)); /* Category 1a: one word taking up the whole line with no beginning spaces. */ if ((last_word_end == -1) && (!isspace(inptr->data[0]))) { for (i = current_word_end; i < len; i++) { if (!isspace(inptr->data[i]) && i < len) { - current_word_start = i; + current_word_start = i; while (!isspace(inptr->data[i]) && (i < len)) { i++; } - last_word_end = current_word_end; + last_word_end = current_word_end; current_word_end = i; break; } } if (last_word_end == -1) { - free (temp); + free(temp); return; } if (current_x >= last_word_end) { right = (current_x - current_word_start) + 1; current_x = last_word_end; - down = 1; + down = 1; } temp->data = nmalloc(strlen(&inptr->data[current_word_start]) + 1); strcpy(temp->data, &inptr->data[current_word_start]); inptr->data = nrealloc(inptr->data, last_word_end + 2); inptr->data[last_word_end + 1] = 0; - } - else - /* Category 1b: one word on the line and word not taking up whole line - (i.e. there are spaces at the beginning of the line) */ + } else + /* Category 1b: one word on the line and word not taking up whole line + (i.e. there are spaces at the beginning of the line) */ if (last_word_end == -1) { temp->data = nmalloc(strlen(&inptr->data[current_word_start]) + 1); strcpy(temp->data, &inptr->data[current_word_start]); @@ -687,7 +683,7 @@ assert (strlenpt(inptr->data) > fill); if (current_x >= current_word_start) { right = current_x - current_word_start; current_x = 0; - down = 1; + down = 1; } inptr->data = nrealloc(inptr->data, current_x + 1); @@ -703,31 +699,32 @@ assert (strlenpt(inptr->data) > fill); else { /* Case 2a: cursor before word at wrap point. */ - if (current_x < current_word_start) { - temp->data = nmalloc(strlen(&inptr->data[current_word_start]) + 1); - strcpy(temp->data, &inptr->data[current_word_start]); - - if (!isspace(input_char)) { - i = current_word_start - 1; - while (isspace(inptr->data[i])) { - i--; - assert (i >= 0); - } - } - else if (current_x <= last_word_end) - i = last_word_end - 1; - else - i = current_x; - - inptr->data = nrealloc(inptr->data, i + 2); - inptr->data[i + 1] = 0; - } + if (current_x < current_word_start) { + temp->data = + nmalloc(strlen(&inptr->data[current_word_start]) + 1); + strcpy(temp->data, &inptr->data[current_word_start]); + + if (!isspace(input_char)) { + i = current_word_start - 1; + while (isspace(inptr->data[i])) { + i--; + assert(i >= 0); + } + } else if (current_x <= last_word_end) + i = last_word_end - 1; + else + i = current_x; + + inptr->data = nrealloc(inptr->data, i + 2); + inptr->data[i + 1] = 0; + } /* Case 2b: cursor at word at wrap point. */ - else if ((current_x >= current_word_start) - && (current_x <= (current_word_end + 1))) { - temp->data = nmalloc(strlen(&inptr->data[current_word_start]) + 1); + else if ((current_x >= current_word_start) + && (current_x <= (current_word_end + 1))) { + temp->data = + nmalloc(strlen(&inptr->data[current_word_start]) + 1); strcpy(temp->data, &inptr->data[current_word_start]); down = 1; @@ -737,24 +734,25 @@ assert (strlenpt(inptr->data) > fill); if (isspace(input_char) && (current_x == current_word_start)) { current_x = current_word_start; - inptr->data = nrealloc(inptr->data, current_word_start + 1); + inptr->data = + nrealloc(inptr->data, current_word_start + 1); inptr->data[current_word_start] = 0; - } - else { + } else { while (isspace(inptr->data[i])) { i--; - assert (i >= 0); + assert(i >= 0); } inptr->data = nrealloc(inptr->data, i + 2); inptr->data[i + 1] = 0; } - } + } /* Case 2c: cursor past word at wrap point. */ - else { - temp->data = nmalloc(strlen(&inptr->data[current_word_start]) + 1); + else { + temp->data = + nmalloc(strlen(&inptr->data[current_word_start]) + 1); strcpy(temp->data, &inptr->data[current_word_start]); down = 1; @@ -765,36 +763,37 @@ assert (strlenpt(inptr->data) > fill); while (isspace(inptr->data[i])) { i--; - assert (i >= 0); + assert(i >= 0); inptr->data = nrealloc(inptr->data, i + 2); inptr->data[i + 1] = 0; } - } + } } - /* We pre-pend wrapped part to next line. */ + /* We pre-pend wrapped part to next line. */ if (ISSET(SAMELINEWRAP) && inptr->next) { - /* Plus one for the space which concatenates the two lines together plus 1 for \0. */ - char *p = nmalloc(strlen(temp->data) + strlen(inptr->next->data) + 2); + /* Plus one for the space which concatenates the two lines together plus 1 for \0. */ + char *p = + nmalloc(strlen(temp->data) + strlen(inptr->next->data) + 2); int old_x = current_x, old_y = current_y; - strcpy (p, temp->data); - strcat (p, " "); - strcat (p, inptr->next->data); + strcpy(p, temp->data); + strcat(p, " "); + strcat(p, inptr->next->data); - free (inptr->next->data); + free(inptr->next->data); inptr->next->data = p; - free (temp->data); - free (temp); + free(temp->data); + free(temp); /* The next line line may need to be wrapped as well. */ current_y = old_y + 1; current_x = strlen(inptr->next->data); while (current_x >= 0) { - if (isspace(inptr->next->data[current_x]) && (current_x < fill)) - break; + if (isspace(inptr->next->data[current_x]) + && (current_x < fill)) break; current_x--; } if (current_x >= 0) @@ -803,7 +802,7 @@ assert (strlenpt(inptr->data) > fill); current_x = old_x; current_y = old_y; } - /* Else we start a new line. */ + /* Else we start a new line. */ else { temp->prev = inptr; temp->next = inptr->next; @@ -822,7 +821,7 @@ assert (strlenpt(inptr->data) > fill); totlines++; totsize++; - renumber (inptr); + renumber(inptr); edit_update_top(edittop); @@ -844,7 +843,7 @@ assert (strlenpt(inptr->data) > fill); /* Check to see if we've just caused the line to wrap to a new line */ void check_wrap(filestruct * inptr, char ch) { - int len = strlenpt(inptr->data); + int len = strlenpt(inptr->data); #ifdef DEBUG fprintf(stderr, _("check_wrap called with inptr->data=\"%s\"\n"), inptr->data); @@ -853,14 +852,14 @@ void check_wrap(filestruct * inptr, char ch) if (len <= fill) return; else { - int i = actual_x(inptr, fill); + int i = actual_x(inptr, fill); /* Do not wrap if there are no words on or after wrap point. */ int char_found = 0; while (isspace(inptr->data[i]) && inptr->data[i]) i++; - + if (!inptr->data[i]) return; @@ -869,11 +868,10 @@ void check_wrap(filestruct * inptr, char ch) if (isspace(inptr->data[i])) { if (!char_found) continue; - char_found = 2; /* 2 for yes do wrap. */ + char_found = 2; /* 2 for yes do wrap. */ break; - } - else - char_found = 1; /* 1 for yes found a word, but must check further. */ + } else + char_found = 1; /* 1 for yes found a word, but must check further. */ } if (char_found == 2) @@ -958,8 +956,7 @@ int do_backspace(void) } /* Ooops, sanity check */ - if (tmp == filebot) - { + if (tmp == filebot) { filebot = current; editbot = current; } @@ -1000,8 +997,7 @@ int do_delete(void) strcat(current->data, current->next->data); foo = current->next; - if (filebot == foo) - { + if (filebot == foo) { filebot = current; editbot = current; } @@ -1032,9 +1028,9 @@ void wrap_reset(void) void exit_spell(char *tmpfilename, char *foo) { free(foo); - + if (remove(tmpfilename) == -1) - statusbar(_("Error deleting tempfile, ack!")); + statusbar(_("Error deleting tempfile, ack!")); } /* @@ -1488,7 +1484,8 @@ int do_justify(void) werase(edit); - if ((current_y < 0) || (current_y >= editwinrows - 1) || (initial_y <= 0)) { + if ((current_y < 0) || (current_y >= editwinrows - 1) + || (initial_y <= 0)) { edit_update(current); center_cursor(); } else { @@ -1502,7 +1499,7 @@ int do_justify(void) edit_refresh(); - edit_refresh(); /* XXX FIXME XXX */ + edit_refresh(); /* XXX FIXME XXX */ statusbar("Justify Complete"); return 1; #else @@ -1623,7 +1620,7 @@ int main(int argc, char *argv[]) break; #else case 'T': - usage(); /* Oops! You dont really have that option */ + usage(); /* Oops! You dont really have that option */ finish(1); #endif case 'V': @@ -1676,7 +1673,7 @@ int main(int argc, char *argv[]) break; default: usage(); - exit(0); + exit(0); } } @@ -1709,15 +1706,15 @@ int main(int argc, char *argv[]) /* First back up the old settings so they can be restored, duh */ - tcgetattr (0, &oldterm); + tcgetattr(0, &oldterm); /* Adam's code to blow away intr character so ^C can show cursor pos */ - tcgetattr (0, &term); + tcgetattr(0, &term); for (i = 0; i < NCCS; i++) { if (term.c_cc[i] == CINTR || term.c_cc[i] == CQUIT) - term.c_cc[i] = 0; + term.c_cc[i] = 0; } - tcsetattr (0, TCSANOW, &term); + tcsetattr(0, TCSANOW, &term); /* now ncurses init stuff... */ initscr(); @@ -1734,7 +1731,7 @@ int main(int argc, char *argv[]) help_init(); /* Trap SIGINT and SIGQUIT cuz we want them to do useful things. */ - memset (&act, 0, sizeof (struct sigaction)); + memset(&act, 0, sizeof(struct sigaction)); act.sa_handler = SIG_IGN; sigaction(SIGINT, &act, NULL); sigaction(SIGQUIT, &act, NULL); diff --git a/po/de.gmo b/po/de.gmo index ee1e244653513dd5b0bd787516143eb88790df78..4ed6785e34bb211538879261d250dab0e84ac4bd 100644 GIT binary patch delta 21 dcmbPKI;nKS6D1BK0|g@^D`UgWZ\n" "Language-Team: German \n" @@ -55,55 +55,55 @@ msgstr "Lese Datei" msgid "File to insert [from ./] " msgstr "Datei zum Einfügen [von ./] " -#: files.c:271 files.c:295 files.c:459 nano.c:1167 +#: files.c:270 files.c:294 files.c:458 nano.c:1166 msgid "Cancelled" msgstr "Abgebrochen" -#: files.c:307 files.c:323 files.c:335 files.c:352 files.c:358 +#: files.c:306 files.c:322 files.c:334 files.c:351 files.c:357 #, c-format msgid "Could not open file for writing: %s" msgstr "Konnte nicht in Datei schreiben: %s" -#: files.c:315 +#: files.c:314 msgid "Could not open file: Path length exceeded." msgstr "Konnte Datei nicht öffnen: Pfad zu lang." -#: files.c:340 +#: files.c:339 #, c-format msgid "Wrote >%s\n" msgstr "Schrieb >%s\n" -#: files.c:367 +#: files.c:366 #, c-format msgid "Could not close %s: %s" msgstr "Konnte %s nicht schließen: %s" #. Try a rename?? -#: files.c:388 files.c:399 files.c:404 +#: files.c:387 files.c:398 files.c:403 #, c-format msgid "Could not open %s for writing: %s" msgstr "Konnte nicht in %s schreiben: %s" -#: files.c:410 +#: files.c:409 #, c-format msgid "Could not set permissions %o on %s: %s" msgstr "Konnte Rechte %o für %s nicht setzen: %s" -#: files.c:417 +#: files.c:416 #, c-format msgid "Wrote %d lines" msgstr "%d Zeilen geschrieben" -#: files.c:438 +#: files.c:437 msgid "File Name to write" msgstr "Dateiname zum speichern" -#: files.c:443 +#: files.c:442 #, c-format msgid "filename is %s" msgstr "Dateiname ist %s" -#: files.c:448 +#: files.c:447 msgid "File exists, OVERWRITE ?" msgstr "" @@ -350,7 +350,7 @@ msgid "To Replace" msgstr "Ersetzen" #: global.c:273 global.c:289 global.c:299 global.c:315 global.c:319 -#: global.c:325 winio.c:959 +#: global.c:325 winio.c:975 msgid "Cancel" msgstr "Abbrechen" @@ -359,7 +359,7 @@ msgstr "Abbrechen" msgid "To Search" msgstr "Suche%s" -#: nano.c:113 +#: nano.c:112 msgid "" "\n" "Buffer written to 'nano.save'\n" @@ -367,11 +367,11 @@ msgstr "" "\n" "Puffer in 'nano.save' geschrieben\n" -#: nano.c:120 +#: nano.c:119 msgid "Key illegal in VIEW mode" msgstr "Unzulässige Taste im View Modus" -#: nano.c:160 +#: nano.c:159 msgid "" " nano help text\n" "\n" @@ -405,15 +405,15 @@ msgstr "" "Optionale Tasten sind eingeklammert.\n" "\n" -#: nano.c:261 +#: nano.c:260 msgid "free_node(): free'd a node, YAY!\n" msgstr "free_node(): Knoten freigegeben.\n" -#: nano.c:266 +#: nano.c:265 msgid "free_node(): free'd last node.\n" msgstr "free_node(): letzter Knoten freigegeben.\n" -#: nano.c:311 +#: nano.c:310 msgid "" "Usage: nano [GNU long option] [option] +LINE \n" "\n" @@ -421,7 +421,7 @@ msgstr "" "Aufruf: nano [GNU lange Option] [Option] +ZEILE \n" "\n" -#: nano.c:312 +#: nano.c:311 msgid "Option\t\tLong option\t\tMeaning\n" msgstr "Option\t\tlange Option\t\tBedeutung\n" @@ -429,73 +429,73 @@ msgstr "Option\t\tlange Option\t\tBedeutung\n" msgid " -T \t\t--tabsize=[num]\t\tSet width of a tab to num\n" msgstr "" -#: nano.c:317 +#: nano.c:318 msgid " -V \t\t--version\t\tPrint version information and exit\n" msgstr " -V \t\t--version\t\tVersionsinfo ausgeben und beenden\n" -#: nano.c:319 +#: nano.c:320 msgid " -c \t\t--const\t\t\tConstantly show cursor position\n" msgstr " -c \t\t--const\t\t\tCursorposition ständig anzeigen\n" -#: nano.c:321 +#: nano.c:322 msgid " -h \t\t--help\t\t\tShow this message\n" msgstr " -h \t\t--help\t\t\tDiese Meldung anzeigen\n" -#: nano.c:323 +#: nano.c:324 msgid " -i \t\t--autoindent\t\tAutomatically indent new lines\n" msgstr " -i \t\t--autoindent\t\tNeue Zeilen automatisch einrücken\n" -#: nano.c:325 +#: nano.c:326 msgid " -l \t\t--nofollow\t\tDon't follow symbolic links, overwrite.\n" msgstr "" -#: nano.c:328 +#: nano.c:329 msgid " -m \t\t--mouse\t\t\tEnable mouse\n" msgstr " -m \t\t--mouse\t\t\tMaus aktivieren\n" -#: nano.c:333 +#: nano.c:334 msgid "" " -r [#cols] \t--fill=[#cols]\t\tSet fill cols to (wrap lines at) #cols\n" msgstr "" " -r [#Spalten] \t--fill=[#Spalten]\t\tSpalten auffüllen (Zeilenumbruch bei) " "#Spalten\n" -#: nano.c:335 +#: nano.c:336 msgid " -p\t \t--pico\t\t\tMake bottom 2 lines more Pico-like\n" msgstr " -p\t \t--pico\t\t\tErscheinungsbild von Pico stärker imitieren\n" -#: nano.c:337 +#: nano.c:338 msgid " -s [prog] \t--speller=[prog]\tEnable alternate speller\n" msgstr "" " -s [Programm] \t--speller=[Programm]\tAlternative Rechtschreibprüfung\n" -#: nano.c:339 +#: nano.c:340 msgid " -t \t\t--tempfile\t\tAuto save on exit, don't prompt\n" msgstr " -t \t\t--tempfile\t\tBeim Beenden ohne Rückfrage speichern\n" -#: nano.c:341 +#: nano.c:342 msgid " -v \t\t--view\t\t\tView (read only) mode\n" msgstr "" " -v \t\t--view\t\t\tNur zum Lesen öffnen (keine Veränderungen möglich)\n" -#: nano.c:343 +#: nano.c:344 msgid " -w \t\t--nowrap\t\tDon't wrap long lines\n" msgstr " -w \t\t--nowrap\t\tLange Zeilen nicht in neue Zeilen umbrechen\n" -#: nano.c:345 +#: nano.c:346 msgid " -x \t\t--nohelp\t\tDon't show help window\n" msgstr " -x \t\t--nohelp\t\tHilfe-Fenster nicht anzeigen\n" -#: nano.c:347 +#: nano.c:348 msgid " -z \t\t--suspend\t\tEnable suspend\n" msgstr "" " -z \t\t--suspend\t\tSuspend (anhalten und zurück zur Shell) aktivieren\n" -#: nano.c:349 +#: nano.c:350 msgid " +LINE\t\t\t\t\tStart at line number LINE\n" msgstr " +ZEILE\t\t\t\t\tBei Zeile ZEILE beginnen\n" -#: nano.c:351 +#: nano.c:352 msgid "" "Usage: nano [option] +LINE \n" "\n" @@ -503,97 +503,97 @@ msgstr "" "Aufruf: nano [Option] +ZEILE \n" "\n" -#: nano.c:352 +#: nano.c:353 msgid "Option\t\tMeaning\n" msgstr "Option\t\tBedeutung\n" -#: nano.c:354 +#: nano.c:355 msgid " -T [num]\tSet width of a tab to num\n" msgstr "" -#: nano.c:355 +#: nano.c:357 msgid " -V \t\tPrint version information and exit\n" msgstr " -V \t\tVersionsinfo ausgeben und beenden\n" -#: nano.c:356 +#: nano.c:358 msgid " -c \t\tConstantly show cursor position\n" msgstr " -c \t\tCursorposition ständig anzeigen\n" -#: nano.c:357 +#: nano.c:359 msgid " -h \t\tShow this message\n" msgstr " -h \t\tDiese Meldung anzeigen\n" -#: nano.c:358 +#: nano.c:360 msgid " -i \t\tAutomatically indent new lines\n" msgstr " -i \t\tNeue Zeilen automatisch einrücken\n" -#: nano.c:360 +#: nano.c:362 msgid " -l \t\tDon't follow symbolic links, overwrite.\n" msgstr "" -#: nano.c:363 +#: nano.c:365 msgid " -m \t\tEnable mouse\n" msgstr " -m \t\tMaus aktivieren\n" -#: nano.c:367 +#: nano.c:369 msgid " -r [#cols] \tSet fill cols to (wrap lines at) #cols\n" msgstr " -r [#Spalten] \tSpalten auffüllen (Zeilenumbruch bei) #Spalten\n" -#: nano.c:368 +#: nano.c:370 msgid " -s [prog] \tEnable alternate speller\n" msgstr " -s [Programm] \tAlternative Rechtschreibprüfung\n" -#: nano.c:369 +#: nano.c:371 msgid " -p \t\tMake bottom 2 lines more Pico-like\n" msgstr " -p \t\tErscheinungsbild von Pico stärker imitieren\n" -#: nano.c:370 +#: nano.c:372 msgid " -t \t\tAuto save on exit, don't prompt\n" msgstr " -t \t\tBeim Beenden ohne Rückfrage speichern\n" -#: nano.c:371 +#: nano.c:373 msgid " -v \t\tView (read only) mode\n" msgstr " -v \t\tNur zum Lesen öffnen (keine Veränderungen möglich)\n" -#: nano.c:372 +#: nano.c:374 msgid " -w \t\tDon't wrap long lines\n" msgstr " -w \t\tLange Zeilen nicht in neue Zeilen umbrechen\n" -#: nano.c:373 +#: nano.c:375 msgid " -x \t\tDon't show help window\n" msgstr " -x \t\tHilfe-Fenster nicht anzeigen\n" -#: nano.c:374 +#: nano.c:376 msgid " -z \t\tEnable suspend\n" msgstr " -z \t\tSuspend (anhalten und zurück zur Shell) aktivieren\n" -#: nano.c:375 +#: nano.c:377 msgid " +LINE\t\tStart at line number LINE\n" msgstr " +ZEILE\t\tBei Zeile ZEILE beginnen\n" -#: nano.c:382 +#: nano.c:384 #, c-format msgid " nano version %s by Chris Allegretta (compiled %s, %s)\n" msgstr " nano Version %s von Chris Allegretta (compiliert um %s, %s)\n" -#: nano.c:384 +#: nano.c:386 msgid " Email: nano@asty.org\tWeb: http://www.asty.org/nano\n" msgstr " Email: nano@asty.org\tWWW: http://www.asty.org/nano\n" -#: nano.c:409 +#: nano.c:411 msgid "Mark Set" msgstr "Markierung gesetzt" -#: nano.c:414 +#: nano.c:416 msgid "Mark UNset" msgstr "Markierung gelöscht" -#: nano.c:841 +#: nano.c:848 #, c-format msgid "check_wrap called with inptr->data=\"%s\"\n" msgstr "check_wrap aufgerufen mit inptr->data=\"%s\"\n" -#: nano.c:925 +#: nano.c:926 #, c-format msgid "current->data now = \"%s\"\n" msgstr "current->data jetzt = \"%s\"\n" @@ -603,75 +603,75 @@ msgstr "current->data jetzt = \"%s\"\n" msgid "After, data = \"%s\"\n" msgstr "Nachher, data = \"%s\"\n" -#: nano.c:1034 +#: nano.c:1033 msgid "Error deleting tempfile, ack!" msgstr "Konnte temporäre Datei nicht löschen" -#: nano.c:1047 nano.c:1097 +#: nano.c:1046 nano.c:1096 #, c-format msgid "Could not create a temporary filename: %s" msgstr "Konnte keine temporäre Datei erzeugen: %s" -#: nano.c:1069 nano.c:1119 +#: nano.c:1068 nano.c:1118 #, c-format msgid "Could not invoke spell program \"%s\"" msgstr "Konnte Rechtschreibprogramm \"%s\" nicht aufrufen" #. Why 32512? I dont know! -#: nano.c:1075 nano.c:1125 +#: nano.c:1074 nano.c:1124 msgid "Could not invoke \"ispell\"" msgstr "Konnte \"ispell\" nicht aufrufen" -#: nano.c:1087 nano.c:1137 +#: nano.c:1086 nano.c:1136 msgid "Finished checking spelling" msgstr "Rechtschreibprüfung abgeschlossen" -#: nano.c:1154 +#: nano.c:1153 msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? " msgstr "Veränderten Puffer speichern (\"Nein\" verwirft die Änderungen) ? " -#: nano.c:1277 +#: nano.c:1276 msgid "Cannot resize top win" msgstr "Kann die Größe des oberen Fensters nicht verändern" -#: nano.c:1279 +#: nano.c:1278 msgid "Cannot move top win" msgstr "Kann oberes Fenster nicht verschieben" -#: nano.c:1281 +#: nano.c:1280 msgid "Cannot resize edit win" msgstr "Kann Größe des Bearbeitungsfensters nicht verändern" -#: nano.c:1283 +#: nano.c:1282 msgid "Cannot move edit win" msgstr "Kann Bearbeitungsfenster nicht verschieben" -#: nano.c:1285 +#: nano.c:1284 msgid "Cannot resize bottom win" msgstr "Kann Größe des unteren Fensters nicht verändern" -#: nano.c:1287 +#: nano.c:1286 msgid "Cannot move bottom win" msgstr "Kann unteres Fenster nicht verschieben" -#: nano.c:1732 +#: nano.c:1750 msgid "Main: set up windows\n" msgstr "Hauptprogramm: Fenster konfigurieren\n" -#: nano.c:1754 +#: nano.c:1772 msgid "Main: bottom win\n" msgstr "Hauptprogramm: unteres Fenster\n" -#: nano.c:1760 +#: nano.c:1778 msgid "Main: open file\n" msgstr "Hauptprogramm: Datei öffnen\n" -#: nano.c:1831 +#: nano.c:1851 #, c-format msgid "I got Alt-[-%c! (%d)\n" msgstr "Erhielt Alt-[-%c! (%d)\n" -#: nano.c:1847 +#: nano.c:1867 #, c-format msgid "I got Alt-%c! (%d)\n" msgstr "Erhielt Alt-%c! (%d)\n" @@ -739,89 +739,89 @@ msgstr "Komm schon, sei vern msgid "Only %d lines available, skipping to last line" msgstr "Nur %d Zeilen vorhanden, springe zur letzten Zeile" -#: winio.c:116 +#: winio.c:118 #, fuzzy, c-format msgid "actual_x_from_start for xplus=%d returned %d\n" msgstr "actual_x für xplus=%d gab %d zurück\n" -#: winio.c:409 +#: winio.c:412 #, c-format msgid "input '%c' (%d)\n" msgstr "Eingabe '%c' (%d)\n" -#: winio.c:445 +#: winio.c:448 msgid "New Buffer" msgstr "Neuer Puffer" -#: winio.c:448 +#: winio.c:451 msgid " File: ..." msgstr " Datei: ..." -#: winio.c:456 +#: winio.c:459 msgid "Modified" msgstr "Verändert" -#: winio.c:876 +#: winio.c:892 #, c-format msgid "Moved to (%d, %d) in edit buffer\n" msgstr "Nach (%d, %d) im Bearbeitungspuffer verschoben\n" -#: winio.c:887 +#: winio.c:903 #, c-format msgid "current->data = \"%s\"\n" msgstr "current->data = \"%s\"\n" -#: winio.c:930 +#: winio.c:946 #, c-format msgid "I got \"%s\"\n" msgstr "Erhielt \"%s\"\n" -#: winio.c:954 +#: winio.c:970 msgid " Y" msgstr " J" -#: winio.c:954 +#: winio.c:970 msgid "Yes" msgstr "Ja" -#: winio.c:956 +#: winio.c:972 msgid " A" msgstr " A" -#: winio.c:956 +#: winio.c:972 msgid "All" msgstr "Alle" -#: winio.c:958 +#: winio.c:974 msgid " N" msgstr " N" -#: winio.c:958 +#: winio.c:974 msgid "No" msgstr "Nein" -#: winio.c:959 +#: winio.c:975 msgid "^C" msgstr "^C" -#: winio.c:1097 +#: winio.c:1114 #, c-format msgid "do_cursorpos: linepct = %f, bytepct = %f\n" msgstr "do_cursorpos: linepct = %f, bytepct = %f\n" -#: winio.c:1101 +#: winio.c:1118 msgid "line %d of %d (%.0f%%), character %d of %d (%.0f%%)" msgstr "Zeile %d von %d (%.0f%%), Zeichen %d von %d (%.0f%%)" -#: winio.c:1227 +#: winio.c:1242 msgid "Dumping file buffer to stderr...\n" msgstr "Gebe Datei Puffer nach stderr aus...\n" -#: winio.c:1229 +#: winio.c:1244 msgid "Dumping cutbuffer to stderr...\n" msgstr "Gebe Inhalt der Zwischenablage nach stderr aus...\n" -#: winio.c:1231 +#: winio.c:1246 msgid "Dumping a buffer to stderr...\n" msgstr "Gebe einen Puffer nach stderr aus...\n" diff --git a/po/es.gmo b/po/es.gmo index 1be72e3b66e9f4d4873396a1aa5e4ea4ce4fe4a7..4854c412a936edb3ad2b72806656bc12bac1e1d0 100644 GIT binary patch delta 21 ccmcareXDxI0Tm7-0|g@^D`UgWCsc$a0c0izl>h($ delta 21 ccmcareXDxI0Tm8IO9ev\n" "Language-Team: Spanish \n" @@ -55,55 +55,55 @@ msgstr "Leyendo Fichero" msgid "File to insert [from ./] " msgstr "Fichero a insertar [desde ./] " -#: files.c:271 files.c:295 files.c:459 nano.c:1167 +#: files.c:270 files.c:294 files.c:458 nano.c:1166 msgid "Cancelled" msgstr "Cancelado" -#: files.c:307 files.c:323 files.c:335 files.c:352 files.c:358 +#: files.c:306 files.c:322 files.c:334 files.c:351 files.c:357 #, c-format msgid "Could not open file for writing: %s" msgstr "No pude abrir el fichero para escribir: %s" -#: files.c:315 +#: files.c:314 msgid "Could not open file: Path length exceeded." msgstr "El fichero no pudo ser abierto: longitud del path excedida." -#: files.c:340 +#: files.c:339 #, c-format msgid "Wrote >%s\n" msgstr "Escribí >%s\n" -#: files.c:367 +#: files.c:366 #, c-format msgid "Could not close %s: %s" msgstr "No pude cerrar %s: %s" #. Try a rename?? -#: files.c:388 files.c:399 files.c:404 +#: files.c:387 files.c:398 files.c:403 #, c-format msgid "Could not open %s for writing: %s" msgstr "No pude abrir %s para escribir: %s" -#: files.c:410 +#: files.c:409 #, c-format msgid "Could not set permissions %o on %s: %s" msgstr "No pude establecer permisos %o en %s: %s" -#: files.c:417 +#: files.c:416 #, c-format msgid "Wrote %d lines" msgstr "%d líneas escritas" -#: files.c:438 +#: files.c:437 msgid "File Name to write" msgstr "Nombre de Fichero a escribir" -#: files.c:443 +#: files.c:442 #, c-format msgid "filename is %s" msgstr "filename es %s" -#: files.c:448 +#: files.c:447 msgid "File exists, OVERWRITE ?" msgstr "El fichero existe, SOBREESCRIBIR ?" @@ -348,7 +348,7 @@ msgid "To Replace" msgstr "Reemplazar" #: global.c:273 global.c:289 global.c:299 global.c:315 global.c:319 -#: global.c:325 winio.c:959 +#: global.c:325 winio.c:975 msgid "Cancel" msgstr "Cancelar" @@ -356,7 +356,7 @@ msgstr "Cancelar" msgid "To Search" msgstr "Buscar" -#: nano.c:113 +#: nano.c:112 msgid "" "\n" "Buffer written to 'nano.save'\n" @@ -364,11 +364,11 @@ msgstr "" "\n" "Buffer escrito en 'nano.save'\n" -#: nano.c:120 +#: nano.c:119 msgid "Key illegal in VIEW mode" msgstr "Tecla ilegal en modo VISUALIZACIÓN" -#: nano.c:160 +#: nano.c:159 msgid "" " nano help text\n" "\n" @@ -403,15 +403,15 @@ msgstr "" "opcionales están representadas entre paréntesis:\n" "\n" -#: nano.c:261 +#: nano.c:260 msgid "free_node(): free'd a node, YAY!\n" msgstr "free_node(): liberado un nodo, YEAH!\n" -#: nano.c:266 +#: nano.c:265 msgid "free_node(): free'd last node.\n" msgstr "free_node(): liberado el último nodo.\n" -#: nano.c:311 +#: nano.c:310 msgid "" "Usage: nano [GNU long option] [option] +LINE \n" "\n" @@ -419,7 +419,7 @@ msgstr "" "Uso: nano [opción larga GNU] [opción] +LÍNEA \n" "\n" -#: nano.c:312 +#: nano.c:311 msgid "Option\t\tLong option\t\tMeaning\n" msgstr "Opcion\t\tOpcion larga\t\tSignificado\n" @@ -427,69 +427,69 @@ msgstr "Opcion\t\tOpcion larga\t\tSignificado\n" msgid " -T \t\t--tabsize=[num]\t\tSet width of a tab to num\n" msgstr " -T \t\t--tabsize=[num]\t\tFijar el ancho de tab a num\n" -#: nano.c:317 +#: nano.c:318 msgid " -V \t\t--version\t\tPrint version information and exit\n" msgstr " -V \t\t--version\t\tImprimir versión y salir\n" -#: nano.c:319 +#: nano.c:320 msgid " -c \t\t--const\t\t\tConstantly show cursor position\n" msgstr " -c \t\t--const\t\t\tMostrar siempre la posición del cursor\n" -#: nano.c:321 +#: nano.c:322 msgid " -h \t\t--help\t\t\tShow this message\n" msgstr " -h \t\t--help\t\t\tMostrar este mensaje\n" -#: nano.c:323 +#: nano.c:324 msgid " -i \t\t--autoindent\t\tAutomatically indent new lines\n" msgstr " -i \t\t--autoindent\t\tIndentar automáticamente nuevas líneas\n" -#: nano.c:325 +#: nano.c:326 msgid " -l \t\t--nofollow\t\tDon't follow symbolic links, overwrite.\n" msgstr "" " -l \t\t--nofollow\t\tNo seguir enlaces simbólicos, sobreescribirlos.\n" -#: nano.c:328 +#: nano.c:329 msgid " -m \t\t--mouse\t\t\tEnable mouse\n" msgstr " -m \t\t--mouse\t\t\tHabilitar ratón\n" -#: nano.c:333 +#: nano.c:334 msgid "" " -r [#cols] \t--fill=[#cols]\t\tSet fill cols to (wrap lines at) #cols\n" msgstr " -r [#cols] \t--fill=[#cols]\t\tRellenar columnas (wrapear en) #cols\n" -#: nano.c:335 +#: nano.c:336 msgid " -p\t \t--pico\t\t\tMake bottom 2 lines more Pico-like\n" msgstr " -p\t \t--pico\t\t\tHacer el menú más parecido a Pico\n" -#: nano.c:337 +#: nano.c:338 msgid " -s [prog] \t--speller=[prog]\tEnable alternate speller\n" msgstr " -s [prog] \t--speller=[prog]\tHabilitar corrector alternativo\n" -#: nano.c:339 +#: nano.c:340 msgid " -t \t\t--tempfile\t\tAuto save on exit, don't prompt\n" msgstr " -t \t\t--tempfile\t\tAutosalvar al salir, sin preguntar\n" -#: nano.c:341 +#: nano.c:342 msgid " -v \t\t--view\t\t\tView (read only) mode\n" msgstr " -v \t\t--view\t\t\tModo visualización (sólo lectura)\n" -#: nano.c:343 +#: nano.c:344 msgid " -w \t\t--nowrap\t\tDon't wrap long lines\n" msgstr " -w \t\t--nowrap\t\tNo wrapear líneas largas\n" -#: nano.c:345 +#: nano.c:346 msgid " -x \t\t--nohelp\t\tDon't show help window\n" msgstr " -x \t\t--nohelp\t\tNo mostrar la ventana de ayuda\n" -#: nano.c:347 +#: nano.c:348 msgid " -z \t\t--suspend\t\tEnable suspend\n" msgstr " -z \t\t--suspend\t\tHabilitar suspensión\n" -#: nano.c:349 +#: nano.c:350 msgid " +LINE\t\t\t\t\tStart at line number LINE\n" msgstr " +LINE\t\t\t\t\tComenzar en la línea número LÍNEA\n" -#: nano.c:351 +#: nano.c:352 msgid "" "Usage: nano [option] +LINE \n" "\n" @@ -497,97 +497,97 @@ msgstr "" "Uso: nano [opción] +LÍNEA \n" "\n" -#: nano.c:352 +#: nano.c:353 msgid "Option\t\tMeaning\n" msgstr "Opción\t\tSignificado\n" -#: nano.c:354 +#: nano.c:355 msgid " -T [num]\tSet width of a tab to num\n" msgstr " -T [num]\tFijar el ancho de tab a num\n" -#: nano.c:355 +#: nano.c:357 msgid " -V \t\tPrint version information and exit\n" msgstr " -V \t\tImprimir información sobre la versión y salir\n" -#: nano.c:356 +#: nano.c:358 msgid " -c \t\tConstantly show cursor position\n" msgstr " -c \t\tMostrar constantemente la posición del cursor\n" -#: nano.c:357 +#: nano.c:359 msgid " -h \t\tShow this message\n" msgstr " -h \t\tMostrar este mensaje\n" -#: nano.c:358 +#: nano.c:360 msgid " -i \t\tAutomatically indent new lines\n" msgstr " -v \t\tIndentar automáticamente nuevas líneas\n" -#: nano.c:360 +#: nano.c:362 msgid " -l \t\tDon't follow symbolic links, overwrite.\n" msgstr " -l \t\tNo seguir enlaces simbólicos, sobreescribirlos.\n" -#: nano.c:363 +#: nano.c:365 msgid " -m \t\tEnable mouse\n" msgstr " -m \t\tHabilitar ratón\n" -#: nano.c:367 +#: nano.c:369 msgid " -r [#cols] \tSet fill cols to (wrap lines at) #cols\n" msgstr " -r [#cols] \tRellenar columnas (wrapear líneas en) #cols\n" -#: nano.c:368 +#: nano.c:370 msgid " -s [prog] \tEnable alternate speller\n" msgstr " -s [prog] \tHabilitar corrector alternativo\n" -#: nano.c:369 +#: nano.c:371 msgid " -p \t\tMake bottom 2 lines more Pico-like\n" msgstr " -p \t\tHacer el menú más parecido a Pico\n" -#: nano.c:370 +#: nano.c:372 msgid " -t \t\tAuto save on exit, don't prompt\n" msgstr " -t \t\tAutosalvar al salir, no preguntar\n" -#: nano.c:371 +#: nano.c:373 msgid " -v \t\tView (read only) mode\n" msgstr " -v \t\tModo visualización (sólo lectura)\n" -#: nano.c:372 +#: nano.c:374 msgid " -w \t\tDon't wrap long lines\n" msgstr " -w \t\tNo wrapear líneas largas\n" -#: nano.c:373 +#: nano.c:375 msgid " -x \t\tDon't show help window\n" msgstr " -x \t\tNo mostrar la ventana de ayuda\n" -#: nano.c:374 +#: nano.c:376 msgid " -z \t\tEnable suspend\n" msgstr " -z \t\tHabilitar suspensión\n" -#: nano.c:375 +#: nano.c:377 msgid " +LINE\t\tStart at line number LINE\n" msgstr " +LÍNEA\t\tComenzar en la línea número LÍNEA\n" -#: nano.c:382 +#: nano.c:384 #, c-format msgid " nano version %s by Chris Allegretta (compiled %s, %s)\n" msgstr " nano versión %s por Chris Allegretta (compilado %s, %s)\n" -#: nano.c:384 +#: nano.c:386 msgid " Email: nano@asty.org\tWeb: http://www.asty.org/nano\n" msgstr " Correo-e: nano@asty.org\tWeb: http://www.asty.org/nano\n" -#: nano.c:409 +#: nano.c:411 msgid "Mark Set" msgstr "Marca Establecida" -#: nano.c:414 +#: nano.c:416 msgid "Mark UNset" msgstr "Marca Borrada" -#: nano.c:841 +#: nano.c:848 #, c-format msgid "check_wrap called with inptr->data=\"%s\"\n" msgstr "check_wrap llamada con inptr->data=\"%s\"\n" -#: nano.c:925 +#: nano.c:926 #, c-format msgid "current->data now = \"%s\"\n" msgstr "current->data ahora = \"%d\"\n" @@ -597,75 +597,75 @@ msgstr "current->data ahora = \"%d\"\n" msgid "After, data = \"%s\"\n" msgstr "Después, data = \"%s\"\n" -#: nano.c:1034 +#: nano.c:1033 msgid "Error deleting tempfile, ack!" msgstr "Error borrando el fichero temporal, ouch!" -#: nano.c:1047 nano.c:1097 +#: nano.c:1046 nano.c:1096 #, c-format msgid "Could not create a temporary filename: %s" msgstr "No pude crear un fichero temporal: %s" -#: nano.c:1069 nano.c:1119 +#: nano.c:1068 nano.c:1118 #, c-format msgid "Could not invoke spell program \"%s\"" msgstr "No se pudo llamar al corrector \"%s\"" #. Why 32512? I dont know! -#: nano.c:1075 nano.c:1125 +#: nano.c:1074 nano.c:1124 msgid "Could not invoke \"ispell\"" msgstr "No pude llamar a \"ispell\"" -#: nano.c:1087 nano.c:1137 +#: nano.c:1086 nano.c:1136 msgid "Finished checking spelling" msgstr "Revisión de ortografía finalizada" -#: nano.c:1154 +#: nano.c:1153 msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? " msgstr "Salvar el buffer modificado (RESPONDER \"No\" DESTRUIRÁ LOS CAMBIOS) ?" -#: nano.c:1277 +#: nano.c:1276 msgid "Cannot resize top win" msgstr "No se puede cambiar el tamaño de la ventana superior" -#: nano.c:1279 +#: nano.c:1278 msgid "Cannot move top win" msgstr "No se puede mover la ventana superior" -#: nano.c:1281 +#: nano.c:1280 msgid "Cannot resize edit win" msgstr "No se puede cambiar el tamaño de la ventana de edición" -#: nano.c:1283 +#: nano.c:1282 msgid "Cannot move edit win" msgstr "No se puede mover la ventana de edición" -#: nano.c:1285 +#: nano.c:1284 msgid "Cannot resize bottom win" msgstr "No se puede cambiar el tamaño de la ventana inferior" -#: nano.c:1287 +#: nano.c:1286 msgid "Cannot move bottom win" msgstr "No se puede mover la ventana inferior" -#: nano.c:1732 +#: nano.c:1750 msgid "Main: set up windows\n" msgstr "Main: configurar las ventanas\n" -#: nano.c:1754 +#: nano.c:1772 msgid "Main: bottom win\n" msgstr "Main: ventana inferior\n" -#: nano.c:1760 +#: nano.c:1778 msgid "Main: open file\n" msgstr "Main: abrir fichero\n" -#: nano.c:1831 +#: nano.c:1851 #, c-format msgid "I got Alt-[-%c! (%d)\n" msgstr "Pillé Alt-[-%c! (%d)\n" -#: nano.c:1847 +#: nano.c:1867 #, c-format msgid "I got Alt-%c! (%d)\n" msgstr "Pillé Alt-%c! (%d)\n" @@ -733,89 +733,89 @@ msgstr "Venga ya, se razonable" msgid "Only %d lines available, skipping to last line" msgstr "Sólo hay %d líneas, saltando hasta la última" -#: winio.c:116 +#: winio.c:118 #, c-format msgid "actual_x_from_start for xplus=%d returned %d\n" msgstr "actual_x_from_start para xplus=%d devolvió %d\n" -#: winio.c:409 +#: winio.c:412 #, c-format msgid "input '%c' (%d)\n" msgstr "entrada '%c' (%d)\n" -#: winio.c:445 +#: winio.c:448 msgid "New Buffer" msgstr "Nuevo Buffer" -#: winio.c:448 +#: winio.c:451 msgid " File: ..." msgstr "Fichero: ..." -#: winio.c:456 +#: winio.c:459 msgid "Modified" msgstr "Modificado" -#: winio.c:876 +#: winio.c:892 #, c-format msgid "Moved to (%d, %d) in edit buffer\n" msgstr "Moviendo a (%d, %d) en buffer de edición\n" -#: winio.c:887 +#: winio.c:903 #, c-format msgid "current->data = \"%s\"\n" msgstr "current->data = \"%s\"\n" -#: winio.c:930 +#: winio.c:946 #, c-format msgid "I got \"%s\"\n" msgstr "Pillé \"%s\"\n" -#: winio.c:954 +#: winio.c:970 msgid " Y" msgstr " S" -#: winio.c:954 +#: winio.c:970 msgid "Yes" msgstr "Sí" -#: winio.c:956 +#: winio.c:972 msgid " A" msgstr " T" -#: winio.c:956 +#: winio.c:972 msgid "All" msgstr "Todas" -#: winio.c:958 +#: winio.c:974 msgid " N" msgstr " N" -#: winio.c:958 +#: winio.c:974 msgid "No" msgstr "No" -#: winio.c:959 +#: winio.c:975 msgid "^C" msgstr "^C" -#: winio.c:1097 +#: winio.c:1114 #, c-format msgid "do_cursorpos: linepct = %f, bytepct = %f\n" msgstr "do_cursorpos: linepct = %f, bytepct = %f\n" -#: winio.c:1101 +#: winio.c:1118 msgid "line %d of %d (%.0f%%), character %d of %d (%.0f%%)" msgstr "línea %d de %d (%.0f%%), carácter %d de %d (%.0f%%)" -#: winio.c:1227 +#: winio.c:1242 msgid "Dumping file buffer to stderr...\n" msgstr "Volcando buffer de fichero a stderr...\n" -#: winio.c:1229 +#: winio.c:1244 msgid "Dumping cutbuffer to stderr...\n" msgstr "Volcando el cutbuffer a stderr...\n" -#: winio.c:1231 +#: winio.c:1246 msgid "Dumping a buffer to stderr...\n" msgstr "Volcando un buffer a stderr...\n" diff --git a/po/fr.po b/po/fr.po index a5b8da4a..3f4e7fa3 100644 --- a/po/fr.po +++ b/po/fr.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: 0.8.9\n" -"POT-Creation-Date: 2000-06-19 18:16-0400\n" +"POT-Creation-Date: 2000-06-20 22:31-0400\n" "PO-Revision-Date: 2000-03-24 01:32+0100\n" "Last-Translator: Pierre Tane \n" "Language-Team: French \n" @@ -57,55 +57,55 @@ msgstr "Lecture du fichier" msgid "File to insert [from ./] " msgstr "Fichier à insérer [depuis ./] " -#: files.c:271 files.c:295 files.c:459 nano.c:1167 +#: files.c:270 files.c:294 files.c:458 nano.c:1166 msgid "Cancelled" msgstr "Annulé" -#: files.c:307 files.c:323 files.c:335 files.c:352 files.c:358 +#: files.c:306 files.c:322 files.c:334 files.c:351 files.c:357 #, c-format msgid "Could not open file for writing: %s" msgstr "Impossible d'ouvrir le fichier en écriture: %s" -#: files.c:315 +#: files.c:314 msgid "Could not open file: Path length exceeded." msgstr "Impossible d'ouvrir le fichier: la longueur du chemin a été dépassée" -#: files.c:340 +#: files.c:339 #, c-format msgid "Wrote >%s\n" msgstr "Écrit >%s\n" -#: files.c:367 +#: files.c:366 #, c-format msgid "Could not close %s: %s" msgstr "Impossible de fermer %s: %s" #. Try a rename?? -#: files.c:388 files.c:399 files.c:404 +#: files.c:387 files.c:398 files.c:403 #, c-format msgid "Could not open %s for writing: %s" msgstr "Impossible d'ouvrir %s en écriture: %s" -#: files.c:410 +#: files.c:409 #, c-format msgid "Could not set permissions %o on %s: %s" msgstr "Impossible de donner les permissions %o à %s: %s" -#: files.c:417 +#: files.c:416 #, c-format msgid "Wrote %d lines" msgstr "%d lignes écrites" -#: files.c:438 +#: files.c:437 msgid "File Name to write" msgstr "Nom du fichier dans lequel écrire" -#: files.c:443 +#: files.c:442 #, c-format msgid "filename is %s" msgstr "Le nom du fichier est %s" -#: files.c:448 +#: files.c:447 msgid "File exists, OVERWRITE ?" msgstr "" @@ -355,7 +355,7 @@ msgid "To Replace" msgstr "Rempacer par" #: global.c:273 global.c:289 global.c:299 global.c:315 global.c:319 -#: global.c:325 winio.c:959 +#: global.c:325 winio.c:975 msgid "Cancel" msgstr "Annuler" @@ -363,7 +363,7 @@ msgstr "Annuler" msgid "To Search" msgstr "" -#: nano.c:113 +#: nano.c:112 msgid "" "\n" "Buffer written to 'nano.save'\n" @@ -371,11 +371,11 @@ msgstr "" "\n" "Buffer écrit dans 'nano.save'\n" -#: nano.c:120 +#: nano.c:119 msgid "Key illegal in VIEW mode" msgstr "Touche illégale en mode VISUALISATION" -#: nano.c:160 +#: nano.c:159 msgid "" " nano help text\n" "\n" @@ -394,15 +394,15 @@ msgid "" "\n" msgstr "" -#: nano.c:261 +#: nano.c:260 msgid "free_node(): free'd a node, YAY!\n" msgstr "free_node(): libération d'un noeud, OUAIS!\n" -#: nano.c:266 +#: nano.c:265 msgid "free_node(): free'd last node.\n" msgstr "free_node(): libération du dernier noeud \n" -#: nano.c:311 +#: nano.c:310 msgid "" "Usage: nano [GNU long option] [option] +LINE \n" "\n" @@ -410,7 +410,7 @@ msgstr "" "Utilisation: nano [option longue GNU] [option] +LIGNE \n" "\n" -#: nano.c:312 +#: nano.c:311 msgid "Option\t\tLong option\t\tMeaning\n" msgstr "Option\t\tOption Longue\t\tSignification\n" @@ -418,75 +418,75 @@ msgstr "Option\t\tOption Longue\t\tSignification\n" msgid " -T \t\t--tabsize=[num]\t\tSet width of a tab to num\n" msgstr "" -#: nano.c:317 +#: nano.c:318 msgid " -V \t\t--version\t\tPrint version information and exit\n" msgstr " -V \t\t--version\t\tAfficher les informations de version et sortir\n" -#: nano.c:319 +#: nano.c:320 msgid " -c \t\t--const\t\t\tConstantly show cursor position\n" msgstr " -c \t\t--const\t\t\tAfficher constamment la position du curseur\n" -#: nano.c:321 +#: nano.c:322 msgid " -h \t\t--help\t\t\tShow this message\n" msgstr " -h \t\t--help\t\t\tAfficher ce message\n" -#: nano.c:323 +#: nano.c:324 msgid " -i \t\t--autoindent\t\tAutomatically indent new lines\n" msgstr "" " -i \t\t--autoindent\t\tIndenter automatiquement les nouvelles lignes\n" -#: nano.c:325 +#: nano.c:326 msgid " -l \t\t--nofollow\t\tDon't follow symbolic links, overwrite.\n" msgstr "" -#: nano.c:328 +#: nano.c:329 msgid " -m \t\t--mouse\t\t\tEnable mouse\n" msgstr " -m \t\t--mouse\t\t\tActiver le support souris\n" -#: nano.c:333 +#: nano.c:334 msgid "" " -r [#cols] \t--fill=[#cols]\t\tSet fill cols to (wrap lines at) #cols\n" msgstr "" " -r [#cols] \t--fill=[#cols]\t\tMettre la colonne de fin de ligne à (couper " "les lignes à) #cols\n" -#: nano.c:335 +#: nano.c:336 msgid " -p\t \t--pico\t\t\tMake bottom 2 lines more Pico-like\n" msgstr "" " -p\t \t--pico\t\t\tRendre les deux lignes du bas plus semblables à Pico\n" -#: nano.c:337 +#: nano.c:338 msgid " -s [prog] \t--speller=[prog]\tEnable alternate speller\n" msgstr "" " -s [prog] \t--speller=[prog]\tActiver un vérificateur orthographique " "alternatif\n" -#: nano.c:339 +#: nano.c:340 msgid " -t \t\t--tempfile\t\tAuto save on exit, don't prompt\n" msgstr "" " -t \t\t--tempfile\t\tSauver automatiquement à la sortie, sans demander\n" -#: nano.c:341 +#: nano.c:342 msgid " -v \t\t--view\t\t\tView (read only) mode\n" msgstr " -v \t\t--view\t\t\tMode Visualisation (lecture seule)\n" -#: nano.c:343 +#: nano.c:344 msgid " -w \t\t--nowrap\t\tDon't wrap long lines\n" msgstr " -w \t\t--nowrap\t\tNe pas couper les lignes trop longues\n" -#: nano.c:345 +#: nano.c:346 msgid " -x \t\t--nohelp\t\tDon't show help window\n" msgstr " -x \t\t--nohelp\t\tNe pas afficher la fenêtre d'aide\n" -#: nano.c:347 +#: nano.c:348 msgid " -z \t\t--suspend\t\tEnable suspend\n" msgstr " -z \t\t--suspend\t\tAutoriser la suspension\n" -#: nano.c:349 +#: nano.c:350 msgid " +LINE\t\t\t\t\tStart at line number LINE\n" msgstr " +LIGNE\t\t\t\t\tCommencer à la ligne LIGNE\n" -#: nano.c:351 +#: nano.c:352 msgid "" "Usage: nano [option] +LINE \n" "\n" @@ -494,99 +494,99 @@ msgstr "" "Utilisation: nano [option] +LIGNE \n" "\n" -#: nano.c:352 +#: nano.c:353 msgid "Option\t\tMeaning\n" msgstr "Option\t\tSignification\n" -#: nano.c:354 +#: nano.c:355 msgid " -T [num]\tSet width of a tab to num\n" msgstr "" -#: nano.c:355 +#: nano.c:357 msgid " -V \t\tPrint version information and exit\n" msgstr " -V \t\tAfficher les informations de version et sortir\n" -#: nano.c:356 +#: nano.c:358 msgid " -c \t\tConstantly show cursor position\n" msgstr " -c \t\tAfficher constamment la position du curseur\n" -#: nano.c:357 +#: nano.c:359 msgid " -h \t\tShow this message\n" msgstr " -h \t\tAfficher ce message\n" -#: nano.c:358 +#: nano.c:360 msgid " -i \t\tAutomatically indent new lines\n" msgstr " -i \t\tIndenter automatiquement les nouvelles lignes\n" -#: nano.c:360 +#: nano.c:362 msgid " -l \t\tDon't follow symbolic links, overwrite.\n" msgstr "" -#: nano.c:363 +#: nano.c:365 msgid " -m \t\tEnable mouse\n" msgstr " -m \t\tActiver la souris\n" -#: nano.c:367 +#: nano.c:369 msgid " -r [#cols] \tSet fill cols to (wrap lines at) #cols\n" msgstr "" " -r [#cols] \tMettre la colonne de fin de ligne à (couper les lignes à) " "#cols\n" -#: nano.c:368 +#: nano.c:370 msgid " -s [prog] \tEnable alternate speller\n" msgstr " -s [prog] \tActiver un vérificateur orthographique alternatif\n" -#: nano.c:369 +#: nano.c:371 msgid " -p \t\tMake bottom 2 lines more Pico-like\n" msgstr " -p \t\tRendre les 2 lignes du bas plus semblables à Pico\n" -#: nano.c:370 +#: nano.c:372 msgid " -t \t\tAuto save on exit, don't prompt\n" msgstr " -t \t\tSauver automatiquement à la sortie, sans demander\n" -#: nano.c:371 +#: nano.c:373 msgid " -v \t\tView (read only) mode\n" msgstr " -v \t\tMode Visualisation seule (lecture seule)\n" -#: nano.c:372 +#: nano.c:374 msgid " -w \t\tDon't wrap long lines\n" msgstr " -w \t\tNe pas couper les lignes longues\n" -#: nano.c:373 +#: nano.c:375 msgid " -x \t\tDon't show help window\n" msgstr " -x \t\tNe pas afficher la fenêtre d'aide\n" -#: nano.c:374 +#: nano.c:376 msgid " -z \t\tEnable suspend\n" msgstr " -z \t\tAutoriser la suspension\n" -#: nano.c:375 +#: nano.c:377 msgid " +LINE\t\tStart at line number LINE\n" msgstr " +LIGNE\t\tDémarrer à la ligne LIGNE\n" -#: nano.c:382 +#: nano.c:384 #, c-format msgid " nano version %s by Chris Allegretta (compiled %s, %s)\n" msgstr " nano version %s de Chris Allegretta (compilée %s, %s)\n" -#: nano.c:384 +#: nano.c:386 msgid " Email: nano@asty.org\tWeb: http://www.asty.org/nano\n" msgstr " Email: nano@asty.org\tWeb: http://www.asty.org/nano\n" -#: nano.c:409 +#: nano.c:411 msgid "Mark Set" msgstr "Marque enregistrée" -#: nano.c:414 +#: nano.c:416 msgid "Mark UNset" msgstr "Marque effacée" -#: nano.c:841 +#: nano.c:848 #, c-format msgid "check_wrap called with inptr->data=\"%s\"\n" msgstr "check_wrap appelée avec inptr->data=\"%s\"\n" -#: nano.c:925 +#: nano.c:926 #, c-format msgid "current->data now = \"%s\"\n" msgstr "current->data vaut maintenant \"%s\"\n" @@ -596,75 +596,75 @@ msgstr "current->data vaut maintenant \"%s\"\n" msgid "After, data = \"%s\"\n" msgstr "Après, data = \"%s\"\n" -#: nano.c:1034 +#: nano.c:1033 msgid "Error deleting tempfile, ack!" msgstr "Erreur lors de l'effacement du fichier temporaire, zut!" -#: nano.c:1047 nano.c:1097 +#: nano.c:1046 nano.c:1096 #, c-format msgid "Could not create a temporary filename: %s" msgstr "Impossible de créer un nom de fichier temporaire: %s" -#: nano.c:1069 nano.c:1119 +#: nano.c:1068 nano.c:1118 #, c-format msgid "Could not invoke spell program \"%s\"" msgstr "Impossible d'invoquer le programme spell \"%s\"" #. Why 32512? I dont know! -#: nano.c:1075 nano.c:1125 +#: nano.c:1074 nano.c:1124 msgid "Could not invoke \"ispell\"" msgstr "Impossible d'invoquer \"ispell\"" -#: nano.c:1087 nano.c:1137 +#: nano.c:1086 nano.c:1136 msgid "Finished checking spelling" msgstr "Vérification orthographique terminée" -#: nano.c:1154 +#: nano.c:1153 msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? " msgstr "Sauver le buffer modifié (RÉPONDRE \"No\" EFFACERA LES CHANGEMENTS" -#: nano.c:1277 +#: nano.c:1276 msgid "Cannot resize top win" msgstr "Impossible de redimensionner la fenêtre du haut" -#: nano.c:1279 +#: nano.c:1278 msgid "Cannot move top win" msgstr "Impossible de bouger la fenêtre du haut" -#: nano.c:1281 +#: nano.c:1280 msgid "Cannot resize edit win" msgstr "Impossible de redimensionner la fenêtre d'édition" -#: nano.c:1283 +#: nano.c:1282 msgid "Cannot move edit win" msgstr "Impossible de bouger la fenêtre d'édition" -#: nano.c:1285 +#: nano.c:1284 msgid "Cannot resize bottom win" msgstr "Impossible de redimensionner la fenêtre du bas" -#: nano.c:1287 +#: nano.c:1286 msgid "Cannot move bottom win" msgstr "Impossible de bouger la fenêtre du bas" -#: nano.c:1732 +#: nano.c:1750 msgid "Main: set up windows\n" msgstr "Main: configuration des fenêtres\n" -#: nano.c:1754 +#: nano.c:1772 msgid "Main: bottom win\n" msgstr "Main: fenêtre du bas\n" -#: nano.c:1760 +#: nano.c:1778 msgid "Main: open file\n" msgstr "Main: ouvrir fichier\n" -#: nano.c:1831 +#: nano.c:1851 #, c-format msgid "I got Alt-[-%c! (%d)\n" msgstr "J'ai reçu Alt-[-%c! (%d)\n" -#: nano.c:1847 +#: nano.c:1867 #, c-format msgid "I got Alt-%c! (%d)\n" msgstr "J'ai reçu Alt-%c! (%d)\n" @@ -732,89 +732,89 @@ msgstr "Allez, soyez raisonnable" msgid "Only %d lines available, skipping to last line" msgstr "Seulement %d lignes sont disponibles, saut jusqu'à la dernière ligne" -#: winio.c:116 +#: winio.c:118 #, fuzzy, c-format msgid "actual_x_from_start for xplus=%d returned %d\n" msgstr "actual_x renvoyé pour xplus=%d\n" -#: winio.c:409 +#: winio.c:412 #, c-format msgid "input '%c' (%d)\n" msgstr "taper '%c' (%d)\n" -#: winio.c:445 +#: winio.c:448 msgid "New Buffer" msgstr "Nouveau buffer" -#: winio.c:448 +#: winio.c:451 msgid " File: ..." msgstr " Fichier: ..." -#: winio.c:456 +#: winio.c:459 msgid "Modified" msgstr "Modifié" -#: winio.c:876 +#: winio.c:892 #, c-format msgid "Moved to (%d, %d) in edit buffer\n" msgstr "Déplacement jusqu'à (%d, %d) dans le buffer d'édition\n" -#: winio.c:887 +#: winio.c:903 #, c-format msgid "current->data = \"%s\"\n" msgstr "current->data = \"%s\"\n" -#: winio.c:930 +#: winio.c:946 #, c-format msgid "I got \"%s\"\n" msgstr "J'ai reçu \"%s\"\n" -#: winio.c:954 +#: winio.c:970 msgid " Y" msgstr " O" -#: winio.c:954 +#: winio.c:970 msgid "Yes" msgstr "Oui" -#: winio.c:956 +#: winio.c:972 msgid " A" msgstr " T" -#: winio.c:956 +#: winio.c:972 msgid "All" msgstr "Tous" -#: winio.c:958 +#: winio.c:974 msgid " N" msgstr " N" -#: winio.c:958 +#: winio.c:974 msgid "No" msgstr "Non" -#: winio.c:959 +#: winio.c:975 msgid "^C" msgstr "^C" -#: winio.c:1097 +#: winio.c:1114 #, c-format msgid "do_cursorpos: linepct = %f, bytepct = %f\n" msgstr "do_cursorpos: linepct = %f, bytepct = %f\n" -#: winio.c:1101 +#: winio.c:1118 msgid "line %d of %d (%.0f%%), character %d of %d (%.0f%%)" msgstr "ligne %d sur %d (%.0f%%), caractère %d sur %d (%.0f%%)" -#: winio.c:1227 +#: winio.c:1242 msgid "Dumping file buffer to stderr...\n" msgstr "Envoi du buffer fichier sur stderr...\n" -#: winio.c:1229 +#: winio.c:1244 msgid "Dumping cutbuffer to stderr...\n" msgstr "Envoi du cutbuffer sur stderr...\n" -#: winio.c:1231 +#: winio.c:1246 msgid "Dumping a buffer to stderr...\n" msgstr "Envoi d'un buffer sur stderr...\n" diff --git a/po/id.gmo b/po/id.gmo index d2eea1c3faefe12133caefe5c4975bb4102db208..f0bb352d1e1b45a20230e8357dafef7f1638eab1 100644 GIT binary patch delta 20 bcmexb`n7a{3Wt$_f{~GxvEgP8mA7I5Rj3CC delta 20 bcmexb`n7a{3WuSkf}w?#q1k2*mA7I5Rzn9D diff --git a/po/id.po b/po/id.po index db987c7e..e8c584c0 100644 --- a/po/id.po +++ b/po/id.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: nano-0.9.10\n" -"POT-Creation-Date: 2000-06-19 18:16-0400\n" +"POT-Creation-Date: 2000-06-20 22:31-0400\n" "PO-Revision-Date: 2000-06-08 20:56+07:00\n" "Last-Translator: Tedi Heriyanto \n" "Language-Team: Indonesian \n" @@ -54,55 +54,55 @@ msgstr "Membaca File" msgid "File to insert [from ./] " msgstr "File untuk disisipkan " -#: files.c:271 files.c:295 files.c:459 nano.c:1167 +#: files.c:270 files.c:294 files.c:458 nano.c:1166 msgid "Cancelled" msgstr "Dibatalkan" -#: files.c:307 files.c:323 files.c:335 files.c:352 files.c:358 +#: files.c:306 files.c:322 files.c:334 files.c:351 files.c:357 #, c-format msgid "Could not open file for writing: %s" msgstr "Tidak dapat membuka file untuk menulis: %s" -#: files.c:315 +#: files.c:314 msgid "Could not open file: Path length exceeded." msgstr "Tidak dapat membuka file: panjang path terlampaui" -#: files.c:340 +#: files.c:339 #, c-format msgid "Wrote >%s\n" msgstr "Tulis >%s\n" -#: files.c:367 +#: files.c:366 #, c-format msgid "Could not close %s: %s" msgstr "Tidak dapat menutup %s: %s" #. Try a rename?? -#: files.c:388 files.c:399 files.c:404 +#: files.c:387 files.c:398 files.c:403 #, c-format msgid "Could not open %s for writing: %s" msgstr "Tidak dapat membuka %s untuk menulis: %s" -#: files.c:410 +#: files.c:409 #, c-format msgid "Could not set permissions %o on %s: %s" msgstr "Tidak dapat menset permisi %o pada %s: %s" -#: files.c:417 +#: files.c:416 #, c-format msgid "Wrote %d lines" msgstr "Menulis %d baris" -#: files.c:438 +#: files.c:437 msgid "File Name to write" msgstr "Nama file untuk ditulis" -#: files.c:443 +#: files.c:442 #, c-format msgid "filename is %s" msgstr "Namafile adalah %s" -#: files.c:448 +#: files.c:447 msgid "File exists, OVERWRITE ?" msgstr "File ada, DITIMPA ?" @@ -348,7 +348,7 @@ msgid "To Replace" msgstr "Mengganti" #: global.c:273 global.c:289 global.c:299 global.c:315 global.c:319 -#: global.c:325 winio.c:959 +#: global.c:325 winio.c:975 msgid "Cancel" msgstr "Batal" @@ -356,7 +356,7 @@ msgstr "Batal" msgid "To Search" msgstr "Mencari" -#: nano.c:113 +#: nano.c:112 msgid "" "\n" "Buffer written to 'nano.save'\n" @@ -364,11 +364,11 @@ msgstr "" "\n" "Buffer ditulis ke 'nano.save'\n" -#: nano.c:120 +#: nano.c:119 msgid "Key illegal in VIEW mode" msgstr "Kunci ilegal dalam mode VIEW" -#: nano.c:160 +#: nano.c:159 msgid "" " nano help text\n" "\n" @@ -403,21 +403,21 @@ msgstr "" "Kunci-kunci opsional ditunjukkan dalam kurung:\n" "\n" -#: nano.c:261 +#: nano.c:260 msgid "free_node(): free'd a node, YAY!\n" msgstr "free_node(): bebaskan sebuah node, YAY!\n" -#: nano.c:266 +#: nano.c:265 msgid "free_node(): free'd last node.\n" msgstr "free_node(): bebaskan node terakhir.\n" -#: nano.c:311 +#: nano.c:310 msgid "" "Usage: nano [GNU long option] [option] +LINE \n" "\n" msgstr "Pemakaian: nano [GNU long option] [option] +LINE \n" -#: nano.c:312 +#: nano.c:311 msgid "Option\t\tLong option\t\tMeaning\n" msgstr "Option: Long option Arti\n" @@ -425,69 +425,69 @@ msgstr "Option: Long option Arti\n" msgid " -T \t\t--tabsize=[num]\t\tSet width of a tab to num\n" msgstr "" -#: nano.c:317 +#: nano.c:318 msgid " -V \t\t--version\t\tPrint version information and exit\n" msgstr "-V --version Tampilkan versi dan keluar\n" -#: nano.c:319 +#: nano.c:320 msgid " -c \t\t--const\t\t\tConstantly show cursor position\n" msgstr "-c --const Menampilkan posisi kursor secara konstan\n" -#: nano.c:321 +#: nano.c:322 msgid " -h \t\t--help\t\t\tShow this message\n" msgstr "-h --help Tampilkan pesan ini\n" -#: nano.c:323 +#: nano.c:324 msgid " -i \t\t--autoindent\t\tAutomatically indent new lines\n" msgstr "-i --autoindent Indentasi baris barus secara otomatis\n" -#: nano.c:325 +#: nano.c:326 msgid " -l \t\t--nofollow\t\tDon't follow symbolic links, overwrite.\n" msgstr "-l --nofollow Jangan ikuti link simbolik, timpa.\n" -#: nano.c:328 +#: nano.c:329 msgid " -m \t\t--mouse\t\t\tEnable mouse\n" msgstr "-m --mouse Aktifkan mouse\n" -#: nano.c:333 +#: nano.c:334 msgid "" " -r [#cols] \t--fill=[#cols]\t\tSet fill cols to (wrap lines at) #cols\n" msgstr "-r [#cols] --fill=[#cols] Set fill col ke (wrap line di) #cols\n" -#: nano.c:335 +#: nano.c:336 msgid " -p\t \t--pico\t\t\tMake bottom 2 lines more Pico-like\n" msgstr "-p --pico Buat dua baris terbawah seperti Pico\n" -#: nano.c:337 +#: nano.c:338 msgid " -s [prog] \t--speller=[prog]\tEnable alternate speller\n" msgstr "-s [prog] --speller=[prog] Aktifkan speller alternatif\n" -#: nano.c:339 +#: nano.c:340 msgid " -t \t\t--tempfile\t\tAuto save on exit, don't prompt\n" msgstr "" "-t --tempfile Autosave saat keluar, jangan minta konfirmasi\n" -#: nano.c:341 +#: nano.c:342 msgid " -v \t\t--view\t\t\tView (read only) mode\n" msgstr "-v --view Mode Tampil (baca saja)\n" -#: nano.c:343 +#: nano.c:344 msgid " -w \t\t--nowrap\t\tDon't wrap long lines\n" msgstr "-w --nowrap Jangan wrap baris panjang\n" -#: nano.c:345 +#: nano.c:346 msgid " -x \t\t--nohelp\t\tDon't show help window\n" msgstr "-x --nohelp Jangan tampilkan jendela bantuan\n" -#: nano.c:347 +#: nano.c:348 msgid " -z \t\t--suspend\t\tEnable suspend\n" msgstr "-z --suspend Aktifkan suspend\n" -#: nano.c:349 +#: nano.c:350 msgid " +LINE\t\t\t\t\tStart at line number LINE\n" msgstr "+LINE Mulai pada nomor baris LINE\n" -#: nano.c:351 +#: nano.c:352 msgid "" "Usage: nano [option] +LINE \n" "\n" @@ -495,97 +495,97 @@ msgstr "" "Pemakaian: nano [option] +LINE \n" "\n" -#: nano.c:352 +#: nano.c:353 msgid "Option\t\tMeaning\n" msgstr "Option Arti\n" -#: nano.c:354 +#: nano.c:355 msgid " -T [num]\tSet width of a tab to num\n" msgstr " -T [num]\tGanti lebar tabulasi manjadi num\n" -#: nano.c:355 +#: nano.c:357 msgid " -V \t\tPrint version information and exit\n" msgstr "-V Tampilkan informasi versi dan keluar\n" -#: nano.c:356 +#: nano.c:358 msgid " -c \t\tConstantly show cursor position\n" msgstr "-c Menampilkan posisi kursor secara konstan\n" -#: nano.c:357 +#: nano.c:359 msgid " -h \t\tShow this message\n" msgstr "-h Tampilkan pesan ini\n" -#: nano.c:358 +#: nano.c:360 msgid " -i \t\tAutomatically indent new lines\n" msgstr "-i Indent baris barus secara otomatis\n" -#: nano.c:360 +#: nano.c:362 msgid " -l \t\tDon't follow symbolic links, overwrite.\n" msgstr "-l Jangan ikuti link simbolik, timpa.\n" -#: nano.c:363 +#: nano.c:365 msgid " -m \t\tEnable mouse\n" msgstr "-m Aktifkan mouse\n" -#: nano.c:367 +#: nano.c:369 msgid " -r [#cols] \tSet fill cols to (wrap lines at) #cols\n" msgstr "-r [#cols] Set fill col ke (wrap line di) #cols\n" -#: nano.c:368 +#: nano.c:370 msgid " -s [prog] \tEnable alternate speller\n" msgstr "-s [prog] Aktifkan speller alternatif\n" -#: nano.c:369 +#: nano.c:371 msgid " -p \t\tMake bottom 2 lines more Pico-like\n" msgstr "-p Buat dua baris terbawah seperti Pico\n" -#: nano.c:370 +#: nano.c:372 msgid " -t \t\tAuto save on exit, don't prompt\n" msgstr "-t Autosave saat keluar, jangan minta konfirmasi.\n" -#: nano.c:371 +#: nano.c:373 msgid " -v \t\tView (read only) mode\n" msgstr "-v Mode Tampil (baca saja)\n" -#: nano.c:372 +#: nano.c:374 msgid " -w \t\tDon't wrap long lines\n" msgstr "-w Jangan wrap baris panjang\n" -#: nano.c:373 +#: nano.c:375 msgid " -x \t\tDon't show help window\n" msgstr "-x Jangan tampilkan jendela bantuan\n" -#: nano.c:374 +#: nano.c:376 msgid " -z \t\tEnable suspend\n" msgstr "-z Aktifkan suspend\n" -#: nano.c:375 +#: nano.c:377 msgid " +LINE\t\tStart at line number LINE\n" msgstr "+LINE Mulai pada nomor baris LINE\n" -#: nano.c:382 +#: nano.c:384 #, c-format msgid " nano version %s by Chris Allegretta (compiled %s, %s)\n" msgstr "nano versi %s oleh Chris Allegretta (compiled %s, %s)\n" -#: nano.c:384 +#: nano.c:386 msgid " Email: nano@asty.org\tWeb: http://www.asty.org/nano\n" msgstr "Email: nano@asty.org Web: http://www.asty.org/nano\n" -#: nano.c:409 +#: nano.c:411 msgid "Mark Set" msgstr "Set Tanda" -#: nano.c:414 +#: nano.c:416 msgid "Mark UNset" msgstr "Unset Tanda" -#: nano.c:841 +#: nano.c:848 #, c-format msgid "check_wrap called with inptr->data=\"%s\"\n" msgstr "check_wrap dipanggil dengan inptr->data=\"%s\"\n" -#: nano.c:925 +#: nano.c:926 #, c-format msgid "current->data now = \"%s\"\n" msgstr "current->data sekarang =\"%s\"\n" @@ -595,76 +595,75 @@ msgstr "current->data sekarang =\"%s\"\n" msgid "After, data = \"%s\"\n" msgstr "Setelah, data= \"%s\"\n" -#: nano.c:1034 +#: nano.c:1033 msgid "Error deleting tempfile, ack!" msgstr "Kesalahan menghapus tempfile, ack!" -#: nano.c:1047 nano.c:1097 +#: nano.c:1046 nano.c:1096 #, c-format msgid "Could not create a temporary filename: %s" msgstr "Tidak dapat membuat nama file sementara: %s" -#: nano.c:1069 nano.c:1119 +#: nano.c:1068 nano.c:1118 #, c-format msgid "Could not invoke spell program \"%s\"" msgstr "Tidak dapat memanggil program ejaan \"%s\"" #. Why 32512? I dont know! -#: nano.c:1075 nano.c:1125 +#: nano.c:1074 nano.c:1124 msgid "Could not invoke \"ispell\"" msgstr "Tidak dapat memanggil \"ispell\"" -#: nano.c:1087 nano.c:1137 +#: nano.c:1086 nano.c:1136 msgid "Finished checking spelling" msgstr "Selesai memeriksa ejaan" -#: nano.c:1154 +#: nano.c:1153 msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? " -msgstr "" -"Simpan buffer termodifikasi (JAWAB \"No\" AKAN MENGHAPUS PERUBAHAN) ?" +msgstr "Simpan buffer termodifikasi (JAWAB \"No\" AKAN MENGHAPUS PERUBAHAN) ?" -#: nano.c:1277 +#: nano.c:1276 msgid "Cannot resize top win" msgstr "Tidak dapat menganti ukuran jendela atas" -#: nano.c:1279 +#: nano.c:1278 msgid "Cannot move top win" msgstr "Tidak dapat memindahkan jendela atas" -#: nano.c:1281 +#: nano.c:1280 msgid "Cannot resize edit win" msgstr "Tidak dapat mengganti ukuran jendela edit" -#: nano.c:1283 +#: nano.c:1282 msgid "Cannot move edit win" msgstr "Tidak dapat memindah jendela edit" -#: nano.c:1285 +#: nano.c:1284 msgid "Cannot resize bottom win" msgstr "Tidak dapat mengganti ukuran jendela bawah" -#: nano.c:1287 +#: nano.c:1286 msgid "Cannot move bottom win" msgstr "Tidak dapat memindah jendela bawah" -#: nano.c:1732 +#: nano.c:1750 msgid "Main: set up windows\n" msgstr "Main: menset jendela\n" -#: nano.c:1754 +#: nano.c:1772 msgid "Main: bottom win\n" msgstr "Main: jendela bawah\n" -#: nano.c:1760 +#: nano.c:1778 msgid "Main: open file\n" msgstr "Main: membuka file\n" -#: nano.c:1831 +#: nano.c:1851 #, c-format msgid "I got Alt-[-%c! (%d)\n" msgstr "Saya mendapat Alt-%c! (%d)\n" -#: nano.c:1847 +#: nano.c:1867 #, c-format msgid "I got Alt-%c! (%d)\n" msgstr "Saya mendapat Alt-%c! (%d)\n" @@ -732,89 +731,89 @@ msgstr "Ayo, yang masuk akal" msgid "Only %d lines available, skipping to last line" msgstr "Hanya %d baris tersedia, melompat ke baris akhir" -#: winio.c:116 +#: winio.c:118 #, fuzzy, c-format msgid "actual_x_from_start for xplus=%d returned %d\n" msgstr "actual_x untuk xplus=%d mengembalikan %d\n" -#: winio.c:409 +#: winio.c:412 #, c-format msgid "input '%c' (%d)\n" msgstr "input '%c' (%d)\n" -#: winio.c:445 +#: winio.c:448 msgid "New Buffer" msgstr "Buffer baru" -#: winio.c:448 +#: winio.c:451 msgid " File: ..." msgstr " File: ..." -#: winio.c:456 +#: winio.c:459 msgid "Modified" msgstr "Dimodifikasi" -#: winio.c:876 +#: winio.c:892 #, c-format msgid "Moved to (%d, %d) in edit buffer\n" msgstr "Pindah ke (%d, %d) dalam buffer edit\n" -#: winio.c:887 +#: winio.c:903 #, c-format msgid "current->data = \"%s\"\n" msgstr "current->data = \"%s\"\n" -#: winio.c:930 +#: winio.c:946 #, c-format msgid "I got \"%s\"\n" msgstr "Saya mendapat \"%s\"\n" -#: winio.c:954 +#: winio.c:970 msgid " Y" msgstr "Y" -#: winio.c:954 +#: winio.c:970 msgid "Yes" msgstr "Ya" -#: winio.c:956 +#: winio.c:972 msgid " A" msgstr "A" -#: winio.c:956 +#: winio.c:972 msgid "All" msgstr "Semua" -#: winio.c:958 +#: winio.c:974 msgid " N" msgstr "N" -#: winio.c:958 +#: winio.c:974 msgid "No" msgstr "Tidak" -#: winio.c:959 +#: winio.c:975 msgid "^C" msgstr "^C" -#: winio.c:1097 +#: winio.c:1114 #, c-format msgid "do_cursorpos: linepct = %f, bytepct = %f\n" msgstr "do_cursorpos: linepct = %f, bytepct = %f\n" -#: winio.c:1101 +#: winio.c:1118 msgid "line %d of %d (%.0f%%), character %d of %d (%.0f%%)" msgstr "baris %d dari %d (%f.0f%%), karakter %d dari %d (%.0f%%)" -#: winio.c:1227 +#: winio.c:1242 msgid "Dumping file buffer to stderr...\n" msgstr "Kirim buffer file ke stderr...\n" -#: winio.c:1229 +#: winio.c:1244 msgid "Dumping cutbuffer to stderr...\n" msgstr "Kirim cutbuffer ke stderr...\n" -#: winio.c:1231 +#: winio.c:1246 msgid "Dumping a buffer to stderr...\n" msgstr "Kirim buffer ke stderr...\n" diff --git a/po/it.gmo b/po/it.gmo index cd6d7290126ea56ae512e7925d4883d817a4af6c..39d38f9e9eea8b0a8fed80d19c008a75c95a3fdb 100644 GIT binary patch delta 21 ccmX?=eky&#G\n" "MIME-Version: 1.0\n" @@ -54,55 +54,55 @@ msgstr "Lettura file" msgid "File to insert [from ./] " msgstr "File da inserire [da ./] " -#: files.c:271 files.c:295 files.c:459 nano.c:1167 +#: files.c:270 files.c:294 files.c:458 nano.c:1166 msgid "Cancelled" msgstr "Cancellato" -#: files.c:307 files.c:323 files.c:335 files.c:352 files.c:358 +#: files.c:306 files.c:322 files.c:334 files.c:351 files.c:357 #, c-format msgid "Could not open file for writing: %s" msgstr "Impossibile aprire il file in scrittura: %s" -#: files.c:315 +#: files.c:314 msgid "Could not open file: Path length exceeded." msgstr "Impossibile aprire il file: esagerata lunghezza del percorso." -#: files.c:340 +#: files.c:339 #, c-format msgid "Wrote >%s\n" msgstr "Scrivi >%s\n" -#: files.c:367 +#: files.c:366 #, c-format msgid "Could not close %s: %s" msgstr "Impossibile chiudere %s: %s" #. Try a rename?? -#: files.c:388 files.c:399 files.c:404 +#: files.c:387 files.c:398 files.c:403 #, c-format msgid "Could not open %s for writing: %s" msgstr "Impossibile aprire %s in scrittura: %s" -#: files.c:410 +#: files.c:409 #, c-format msgid "Could not set permissions %o on %s: %s" msgstr "Impossibile configurare i permessi di %o su %s: %s" -#: files.c:417 +#: files.c:416 #, c-format msgid "Wrote %d lines" msgstr "Scritte %d linee" -#: files.c:438 +#: files.c:437 msgid "File Name to write" msgstr "Salva con nome" -#: files.c:443 +#: files.c:442 #, c-format msgid "filename is %s" msgstr "Il nome file è %s" -#: files.c:448 +#: files.c:447 msgid "File exists, OVERWRITE ?" msgstr "File esistente, SOVRASCRIVERE?" @@ -348,7 +348,7 @@ msgid "To Replace" msgstr "Sostituisci" #: global.c:273 global.c:289 global.c:299 global.c:315 global.c:319 -#: global.c:325 winio.c:959 +#: global.c:325 winio.c:975 msgid "Cancel" msgstr "Cancella" @@ -357,7 +357,7 @@ msgstr "Cancella" msgid "To Search" msgstr "Ricerca%s" -#: nano.c:113 +#: nano.c:112 msgid "" "\n" "Buffer written to 'nano.save'\n" @@ -365,11 +365,11 @@ msgstr "" "\n" "Buffer scritto su 'nano.save'\n" -#: nano.c:120 +#: nano.c:119 msgid "Key illegal in VIEW mode" msgstr "Chiave illegale nella modalità VISTA" -#: nano.c:160 +#: nano.c:159 msgid "" " nano help text\n" "\n" @@ -388,15 +388,15 @@ msgid "" "\n" msgstr "" -#: nano.c:261 +#: nano.c:260 msgid "free_node(): free'd a node, YAY!\n" msgstr "free_node(): liberado un nodo, YEAH!\n" -#: nano.c:266 +#: nano.c:265 msgid "free_node(): free'd last node.\n" msgstr "free_node(): liberado el último nodo.\n" -#: nano.c:311 +#: nano.c:310 msgid "" "Usage: nano [GNU long option] [option] +LINE \n" "\n" @@ -404,7 +404,7 @@ msgstr "" "Utilizzo: nano [GNU opzioni lunghe] [opzioni] +LINEA \n" "\n" -#: nano.c:312 +#: nano.c:311 msgid "Option\t\tLong option\t\tMeaning\n" msgstr "Opzioni\t\tLunghe opzioni\t\tSignificato\n" @@ -412,69 +412,69 @@ msgstr "Opzioni\t\tLunghe opzioni\t\tSignificato\n" msgid " -T \t\t--tabsize=[num]\t\tSet width of a tab to num\n" msgstr "" -#: nano.c:317 +#: nano.c:318 msgid " -V \t\t--version\t\tPrint version information and exit\n" msgstr " -V \t\t--versione\t\tStampa informazioni sulla versione ed esci\n" -#: nano.c:319 +#: nano.c:320 msgid " -c \t\t--const\t\t\tConstantly show cursor position\n" msgstr " -c \t\t--const\t\t\tMostra sempre la posizione del cursore\n" -#: nano.c:321 +#: nano.c:322 msgid " -h \t\t--help\t\t\tShow this message\n" msgstr " -h \t\t--help\t\t\tMostra questo messaggio\n" -#: nano.c:323 +#: nano.c:324 msgid " -i \t\t--autoindent\t\tAutomatically indent new lines\n" msgstr " -i \t\t--autoindent\t\tIndentar automáticamente nuevas líneas\n" -#: nano.c:325 +#: nano.c:326 msgid " -l \t\t--nofollow\t\tDon't follow symbolic links, overwrite.\n" msgstr "" -#: nano.c:328 +#: nano.c:329 msgid " -m \t\t--mouse\t\t\tEnable mouse\n" msgstr " -m \t\t--mouse\t\t\tAttiva mouse\n" -#: nano.c:333 +#: nano.c:334 msgid "" " -r [#cols] \t--fill=[#cols]\t\tSet fill cols to (wrap lines at) #cols\n" msgstr " -r [#cols] \t--fill=[#cols]\t\tConfigura riempimento colonne\n" -#: nano.c:335 +#: nano.c:336 msgid " -p\t \t--pico\t\t\tMake bottom 2 lines more Pico-like\n" msgstr " -p\t \t--pico\t\t\tCrea in basso 2 linee come l'aspetto di Pico\n" -#: nano.c:337 +#: nano.c:338 msgid " -s [prog] \t--speller=[prog]\tEnable alternate speller\n" msgstr " -s [prog] \t--speller=[prog]\tAttiva correttore alternativo\n" -#: nano.c:339 +#: nano.c:340 msgid " -t \t\t--tempfile\t\tAuto save on exit, don't prompt\n" msgstr "" " -t \t\t--tempfile\t\tSalvataggio automatico in uscita senza richiesta\n" -#: nano.c:341 +#: nano.c:342 msgid " -v \t\t--view\t\t\tView (read only) mode\n" msgstr " -v \t\t--view\t\t\tVisualizzazione (sola lettura)\n" -#: nano.c:343 +#: nano.c:344 msgid " -w \t\t--nowrap\t\tDon't wrap long lines\n" msgstr " -w \t\t--nowrap\t\tNon interrompere linee lunghe\n" -#: nano.c:345 +#: nano.c:346 msgid " -x \t\t--nohelp\t\tDon't show help window\n" msgstr " -x \t\t--nohelp\t\tNon mostrare finestra aiuti\n" -#: nano.c:347 +#: nano.c:348 msgid " -z \t\t--suspend\t\tEnable suspend\n" msgstr " -z \t\t--suspend\t\tAbilita sospensione\n" -#: nano.c:349 +#: nano.c:350 msgid " +LINE\t\t\t\t\tStart at line number LINE\n" msgstr " +LINE\t\t\t\t\tInizia alla linea numero\n" -#: nano.c:351 +#: nano.c:352 msgid "" "Usage: nano [option] +LINE \n" "\n" @@ -482,97 +482,97 @@ msgstr "" "Uso: nano [opzioni] +LINEA \n" "\n" -#: nano.c:352 +#: nano.c:353 msgid "Option\t\tMeaning\n" msgstr "Opzioni\t\tSignificato\n" -#: nano.c:354 +#: nano.c:355 msgid " -T [num]\tSet width of a tab to num\n" msgstr "" -#: nano.c:355 +#: nano.c:357 msgid " -V \t\tPrint version information and exit\n" msgstr " -V \t\tStampa informazioni sulla versione ed esci\n" -#: nano.c:356 +#: nano.c:358 msgid " -c \t\tConstantly show cursor position\n" msgstr " -c \t\tMostra sempre la posizione del cursore\n" -#: nano.c:357 +#: nano.c:359 msgid " -h \t\tShow this message\n" msgstr " -h \t\tMostra questo messaggio\n" -#: nano.c:358 +#: nano.c:360 msgid " -i \t\tAutomatically indent new lines\n" msgstr " -v \t\tIndentazione automatica nuove linee\n" -#: nano.c:360 +#: nano.c:362 msgid " -l \t\tDon't follow symbolic links, overwrite.\n" msgstr " -l \t\tNon seguire i link simbolici, sovrascrivi.\n" -#: nano.c:363 +#: nano.c:365 msgid " -m \t\tEnable mouse\n" msgstr " -m \t\tAttiva mouse\n" -#: nano.c:367 +#: nano.c:369 msgid " -r [#cols] \tSet fill cols to (wrap lines at) #cols\n" msgstr " -r [#cols] \tRiempimento colonne (interrompi linee a) #cols\n" -#: nano.c:368 +#: nano.c:370 msgid " -s [prog] \tEnable alternate speller\n" msgstr " -s [prog] \tAttiva correttore alternativo\n" -#: nano.c:369 +#: nano.c:371 msgid " -p \t\tMake bottom 2 lines more Pico-like\n" msgstr " -p \t\tCrea in basso 2 linee sullo stile di Pico\n" -#: nano.c:370 +#: nano.c:372 msgid " -t \t\tAuto save on exit, don't prompt\n" msgstr " -t \t\tSalvataggio automatico in uscita senza avviso\n" -#: nano.c:371 +#: nano.c:373 msgid " -v \t\tView (read only) mode\n" msgstr " -v \t\tVisualizza (sola lettura)\n" -#: nano.c:372 +#: nano.c:374 msgid " -w \t\tDon't wrap long lines\n" msgstr " -w \t\tNon interrompere linee lunghe\n" -#: nano.c:373 +#: nano.c:375 msgid " -x \t\tDon't show help window\n" msgstr " -x \t\tNon mostrare la finestra Aiuti\n" -#: nano.c:374 +#: nano.c:376 msgid " -z \t\tEnable suspend\n" msgstr " -z \t\tAttiva sospensione\n" -#: nano.c:375 +#: nano.c:377 msgid " +LINE\t\tStart at line number LINE\n" msgstr " +LINEA\t\tInizia alla LINEA numero\n" -#: nano.c:382 +#: nano.c:384 #, c-format msgid " nano version %s by Chris Allegretta (compiled %s, %s)\n" msgstr " nano versione %s di Chris Allegretta (compilato %s, %s\n" -#: nano.c:384 +#: nano.c:386 msgid " Email: nano@asty.org\tWeb: http://www.asty.org/nano\n" msgstr "Email: nano@asty.org\tWeb: http://www.asty.org/nano\n" -#: nano.c:409 +#: nano.c:411 msgid "Mark Set" msgstr "" -#: nano.c:414 +#: nano.c:416 msgid "Mark UNset" msgstr "" -#: nano.c:841 +#: nano.c:848 #, c-format msgid "check_wrap called with inptr->data=\"%s\"\n" msgstr "check_wrap chiamata con inptr->data=\"%s\"\n" -#: nano.c:925 +#: nano.c:926 #, c-format msgid "current->data now = \"%s\"\n" msgstr "current->data ora = \"%d\"\n" @@ -582,77 +582,77 @@ msgstr "current->data ora = \"%d\"\n" msgid "After, data = \"%s\"\n" msgstr "Dopo, data = \"%s\"\n" -#: nano.c:1034 +#: nano.c:1033 msgid "Error deleting tempfile, ack!" msgstr "" -#: nano.c:1047 nano.c:1097 +#: nano.c:1046 nano.c:1096 #, c-format msgid "Could not create a temporary filename: %s" msgstr "Impossibile creare un nome file temporaneo: %s" -#: nano.c:1069 nano.c:1119 +#: nano.c:1068 nano.c:1118 #, c-format msgid "Could not invoke spell program \"%s\"" msgstr "Impossibile invocare correttore ortografico \"%s\"" #. Why 32512? I dont know! -#: nano.c:1075 nano.c:1125 +#: nano.c:1074 nano.c:1124 msgid "Could not invoke \"ispell\"" msgstr "Impossibile invocare \"ispell\"" -#: nano.c:1087 nano.c:1137 +#: nano.c:1086 nano.c:1136 msgid "Finished checking spelling" msgstr "Controllo ortografico terminato" -#: nano.c:1154 +#: nano.c:1153 msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? " msgstr "" "Salva il buffer modificato (RISPONDENDO \"No\" ANNULLERETE I CAMBIAMENTI " "AVVENUTI) ?" -#: nano.c:1277 +#: nano.c:1276 msgid "Cannot resize top win" msgstr "Impossibile ridimensionare la finestra superiore" -#: nano.c:1279 +#: nano.c:1278 msgid "Cannot move top win" msgstr "Impossibile spostare la finestra superiore" -#: nano.c:1281 +#: nano.c:1280 msgid "Cannot resize edit win" msgstr "Impossibile ridimensionare la finestra di modifica" -#: nano.c:1283 +#: nano.c:1282 msgid "Cannot move edit win" msgstr "Impossibile spostare finestra di modifica" -#: nano.c:1285 +#: nano.c:1284 msgid "Cannot resize bottom win" msgstr "Impossibile ridimensionare la finestra inferiore" -#: nano.c:1287 +#: nano.c:1286 msgid "Cannot move bottom win" msgstr "Impossibile spostare la finestra inferiore" -#: nano.c:1732 +#: nano.c:1750 msgid "Main: set up windows\n" msgstr "Main: configura finestre\n" -#: nano.c:1754 +#: nano.c:1772 msgid "Main: bottom win\n" msgstr "Main: finestra inferiore\n" -#: nano.c:1760 +#: nano.c:1778 msgid "Main: open file\n" msgstr "Main: apri file\n" -#: nano.c:1831 +#: nano.c:1851 #, c-format msgid "I got Alt-[-%c! (%d)\n" msgstr "Premuto Alt-[-%c! (%d)\n" -#: nano.c:1847 +#: nano.c:1867 #, c-format msgid "I got Alt-%c! (%d)\n" msgstr "Premuto Alt-%c! (%d)\n" @@ -720,89 +720,89 @@ msgstr "Avanti, sii ragionevole" msgid "Only %d lines available, skipping to last line" msgstr "Solo %d linee disponibili, vai all'ultima" -#: winio.c:116 +#: winio.c:118 #, fuzzy, c-format msgid "actual_x_from_start for xplus=%d returned %d\n" msgstr "actual_x per xplus=%d ha riportato %d\n" -#: winio.c:409 +#: winio.c:412 #, c-format msgid "input '%c' (%d)\n" msgstr "input '%c' (%d)\n" -#: winio.c:445 +#: winio.c:448 msgid "New Buffer" msgstr "Nuovo Buffer" -#: winio.c:448 +#: winio.c:451 msgid " File: ..." msgstr "File: ..." -#: winio.c:456 +#: winio.c:459 msgid "Modified" msgstr "Modificato" -#: winio.c:876 +#: winio.c:892 #, c-format msgid "Moved to (%d, %d) in edit buffer\n" msgstr "Mosso in (%d, %d) nel buffer di modifica\n" -#: winio.c:887 +#: winio.c:903 #, c-format msgid "current->data = \"%s\"\n" msgstr "current->data = \"%s\"\n" -#: winio.c:930 +#: winio.c:946 #, c-format msgid "I got \"%s\"\n" msgstr "Premuto \"%s\"\n" -#: winio.c:954 +#: winio.c:970 msgid " Y" msgstr " S" -#: winio.c:954 +#: winio.c:970 msgid "Yes" msgstr " Sì" -#: winio.c:956 +#: winio.c:972 msgid " A" msgstr " T" -#: winio.c:956 +#: winio.c:972 msgid "All" msgstr " Tutti" -#: winio.c:958 +#: winio.c:974 msgid " N" msgstr " N" -#: winio.c:958 +#: winio.c:974 msgid "No" msgstr " No" -#: winio.c:959 +#: winio.c:975 msgid "^C" msgstr "^C" -#: winio.c:1097 +#: winio.c:1114 #, c-format msgid "do_cursorpos: linepct = %f, bytepct = %f\n" msgstr "do_cursorpos: linepct = %f, bytepct = %f\n" -#: winio.c:1101 +#: winio.c:1118 msgid "line %d of %d (%.0f%%), character %d of %d (%.0f%%)" msgstr "linea %d di %d (%.0f%%), carattere %d di %d (%.0f%%)" -#: winio.c:1227 +#: winio.c:1242 msgid "Dumping file buffer to stderr...\n" msgstr "Copia file buffer sullo stderr...\n" -#: winio.c:1229 +#: winio.c:1244 msgid "Dumping cutbuffer to stderr...\n" msgstr "Copia cutbuffer sullo stderr...\n" -#: winio.c:1231 +#: winio.c:1246 msgid "Dumping a buffer to stderr...\n" msgstr "Copia un buffer sullo stderr...\n" diff --git a/po/nano.pot b/po/nano.pot index 542089e4..6cf3d168 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-19 19:19-0400\n" +"POT-Creation-Date: 2000-06-20 22:31-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -55,55 +55,55 @@ msgstr "" msgid "File to insert [from ./] " msgstr "" -#: files.c:271 files.c:295 files.c:459 nano.c:1171 +#: files.c:270 files.c:294 files.c:458 nano.c:1166 msgid "Cancelled" msgstr "" -#: files.c:307 files.c:323 files.c:335 files.c:352 files.c:358 +#: files.c:306 files.c:322 files.c:334 files.c:351 files.c:357 #, c-format msgid "Could not open file for writing: %s" msgstr "" -#: files.c:315 +#: files.c:314 msgid "Could not open file: Path length exceeded." msgstr "" -#: files.c:340 +#: files.c:339 #, c-format msgid "Wrote >%s\n" msgstr "" -#: files.c:367 +#: files.c:366 #, c-format msgid "Could not close %s: %s" msgstr "" #. Try a rename?? -#: files.c:388 files.c:399 files.c:404 +#: files.c:387 files.c:398 files.c:403 #, c-format msgid "Could not open %s for writing: %s" msgstr "" -#: files.c:410 +#: files.c:409 #, c-format msgid "Could not set permissions %o on %s: %s" msgstr "" -#: files.c:417 +#: files.c:416 #, c-format msgid "Wrote %d lines" msgstr "" -#: files.c:438 +#: files.c:437 msgid "File Name to write" msgstr "" -#: files.c:443 +#: files.c:442 #, c-format msgid "filename is %s" msgstr "" -#: files.c:448 +#: files.c:447 msgid "File exists, OVERWRITE ?" msgstr "" @@ -348,7 +348,7 @@ msgid "To Replace" msgstr "" #: global.c:273 global.c:289 global.c:299 global.c:315 global.c:319 -#: global.c:325 winio.c:959 +#: global.c:325 winio.c:975 msgid "Cancel" msgstr "" @@ -356,17 +356,17 @@ msgstr "" msgid "To Search" msgstr "" -#: nano.c:113 +#: nano.c:112 msgid "" "\n" "Buffer written to 'nano.save'\n" msgstr "" -#: nano.c:120 +#: nano.c:119 msgid "Key illegal in VIEW mode" msgstr "" -#: nano.c:160 +#: nano.c:159 msgid "" " nano help text\n" "\n" @@ -385,264 +385,264 @@ msgid "" "\n" msgstr "" -#: nano.c:261 +#: nano.c:260 msgid "free_node(): free'd a node, YAY!\n" msgstr "" -#: nano.c:266 +#: nano.c:265 msgid "free_node(): free'd last node.\n" msgstr "" -#: nano.c:311 +#: nano.c:310 msgid "" "Usage: nano [GNU long option] [option] +LINE \n" "\n" msgstr "" -#: nano.c:312 +#: nano.c:311 msgid "Option\t\tLong option\t\tMeaning\n" msgstr "" -#: nano.c:315 +#: nano.c:314 msgid " -T \t\t--tabsize=[num]\t\tSet width of a tab to num\n" msgstr "" -#: nano.c:319 +#: nano.c:318 msgid " -V \t\t--version\t\tPrint version information and exit\n" msgstr "" -#: nano.c:321 +#: nano.c:320 msgid " -c \t\t--const\t\t\tConstantly show cursor position\n" msgstr "" -#: nano.c:323 +#: nano.c:322 msgid " -h \t\t--help\t\t\tShow this message\n" msgstr "" -#: nano.c:325 +#: nano.c:324 msgid " -i \t\t--autoindent\t\tAutomatically indent new lines\n" msgstr "" -#: nano.c:327 +#: nano.c:326 msgid " -l \t\t--nofollow\t\tDon't follow symbolic links, overwrite.\n" msgstr "" -#: nano.c:330 +#: nano.c:329 msgid " -m \t\t--mouse\t\t\tEnable mouse\n" msgstr "" -#: nano.c:335 +#: nano.c:334 msgid "" " -r [#cols] \t--fill=[#cols]\t\tSet fill cols to (wrap lines at) #cols\n" msgstr "" -#: nano.c:337 +#: nano.c:336 msgid " -p\t \t--pico\t\t\tMake bottom 2 lines more Pico-like\n" msgstr "" -#: nano.c:339 +#: nano.c:338 msgid " -s [prog] \t--speller=[prog]\tEnable alternate speller\n" msgstr "" -#: nano.c:341 +#: nano.c:340 msgid " -t \t\t--tempfile\t\tAuto save on exit, don't prompt\n" msgstr "" -#: nano.c:343 +#: nano.c:342 msgid " -v \t\t--view\t\t\tView (read only) mode\n" msgstr "" -#: nano.c:345 +#: nano.c:344 msgid " -w \t\t--nowrap\t\tDon't wrap long lines\n" msgstr "" -#: nano.c:347 +#: nano.c:346 msgid " -x \t\t--nohelp\t\tDon't show help window\n" msgstr "" -#: nano.c:349 +#: nano.c:348 msgid " -z \t\t--suspend\t\tEnable suspend\n" msgstr "" -#: nano.c:351 +#: nano.c:350 msgid " +LINE\t\t\t\t\tStart at line number LINE\n" msgstr "" -#: nano.c:353 +#: nano.c:352 msgid "" "Usage: nano [option] +LINE \n" "\n" msgstr "" -#: nano.c:354 +#: nano.c:353 msgid "Option\t\tMeaning\n" msgstr "" -#: nano.c:357 +#: nano.c:355 msgid " -T [num]\tSet width of a tab to num\n" msgstr "" -#: nano.c:359 +#: nano.c:357 msgid " -V \t\tPrint version information and exit\n" msgstr "" -#: nano.c:360 +#: nano.c:358 msgid " -c \t\tConstantly show cursor position\n" msgstr "" -#: nano.c:361 +#: nano.c:359 msgid " -h \t\tShow this message\n" msgstr "" -#: nano.c:362 +#: nano.c:360 msgid " -i \t\tAutomatically indent new lines\n" msgstr "" -#: nano.c:364 +#: nano.c:362 msgid " -l \t\tDon't follow symbolic links, overwrite.\n" msgstr "" -#: nano.c:367 +#: nano.c:365 msgid " -m \t\tEnable mouse\n" msgstr "" -#: nano.c:371 +#: nano.c:369 msgid " -r [#cols] \tSet fill cols to (wrap lines at) #cols\n" msgstr "" -#: nano.c:372 +#: nano.c:370 msgid " -s [prog] \tEnable alternate speller\n" msgstr "" -#: nano.c:373 +#: nano.c:371 msgid " -p \t\tMake bottom 2 lines more Pico-like\n" msgstr "" -#: nano.c:374 +#: nano.c:372 msgid " -t \t\tAuto save on exit, don't prompt\n" msgstr "" -#: nano.c:375 +#: nano.c:373 msgid " -v \t\tView (read only) mode\n" msgstr "" -#: nano.c:376 +#: nano.c:374 msgid " -w \t\tDon't wrap long lines\n" msgstr "" -#: nano.c:377 +#: nano.c:375 msgid " -x \t\tDon't show help window\n" msgstr "" -#: nano.c:378 +#: nano.c:376 msgid " -z \t\tEnable suspend\n" msgstr "" -#: nano.c:379 +#: nano.c:377 msgid " +LINE\t\tStart at line number LINE\n" msgstr "" -#: nano.c:386 +#: nano.c:384 #, c-format msgid " nano version %s by Chris Allegretta (compiled %s, %s)\n" msgstr "" -#: nano.c:388 +#: nano.c:386 msgid " Email: nano@asty.org\tWeb: http://www.asty.org/nano\n" msgstr "" -#: nano.c:413 +#: nano.c:411 msgid "Mark Set" msgstr "" -#: nano.c:418 +#: nano.c:416 msgid "Mark UNset" msgstr "" -#: nano.c:845 +#: nano.c:848 #, c-format msgid "check_wrap called with inptr->data=\"%s\"\n" msgstr "" -#: nano.c:929 +#: nano.c:926 #, c-format msgid "current->data now = \"%s\"\n" msgstr "" -#: nano.c:974 +#: nano.c:970 #, c-format msgid "After, data = \"%s\"\n" msgstr "" -#: nano.c:1038 +#: nano.c:1033 msgid "Error deleting tempfile, ack!" msgstr "" -#: nano.c:1051 nano.c:1101 +#: nano.c:1046 nano.c:1096 #, c-format msgid "Could not create a temporary filename: %s" msgstr "" -#: nano.c:1073 nano.c:1123 +#: nano.c:1068 nano.c:1118 #, c-format msgid "Could not invoke spell program \"%s\"" msgstr "" #. Why 32512? I dont know! -#: nano.c:1079 nano.c:1129 +#: nano.c:1074 nano.c:1124 msgid "Could not invoke \"ispell\"" msgstr "" -#: nano.c:1091 nano.c:1141 +#: nano.c:1086 nano.c:1136 msgid "Finished checking spelling" msgstr "" -#: nano.c:1158 +#: nano.c:1153 msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? " msgstr "" -#: nano.c:1281 +#: nano.c:1276 msgid "Cannot resize top win" msgstr "" -#: nano.c:1283 +#: nano.c:1278 msgid "Cannot move top win" msgstr "" -#: nano.c:1285 +#: nano.c:1280 msgid "Cannot resize edit win" msgstr "" -#: nano.c:1287 +#: nano.c:1282 msgid "Cannot move edit win" msgstr "" -#: nano.c:1289 +#: nano.c:1284 msgid "Cannot resize bottom win" msgstr "" -#: nano.c:1291 +#: nano.c:1286 msgid "Cannot move bottom win" msgstr "" -#: nano.c:1746 +#: nano.c:1750 msgid "Main: set up windows\n" msgstr "" -#: nano.c:1768 +#: nano.c:1772 msgid "Main: bottom win\n" msgstr "" -#: nano.c:1774 +#: nano.c:1778 msgid "Main: open file\n" msgstr "" -#: nano.c:1847 +#: nano.c:1851 #, c-format msgid "I got Alt-[-%c! (%d)\n" msgstr "" -#: nano.c:1863 +#: nano.c:1867 #, c-format msgid "I got Alt-%c! (%d)\n" msgstr "" @@ -710,88 +710,88 @@ msgstr "" msgid "Only %d lines available, skipping to last line" msgstr "" -#: winio.c:116 +#: winio.c:118 #, c-format msgid "actual_x_from_start for xplus=%d returned %d\n" msgstr "" -#: winio.c:409 +#: winio.c:412 #, c-format msgid "input '%c' (%d)\n" msgstr "" -#: winio.c:445 +#: winio.c:448 msgid "New Buffer" msgstr "" -#: winio.c:448 +#: winio.c:451 msgid " File: ..." msgstr "" -#: winio.c:456 +#: winio.c:459 msgid "Modified" msgstr "" -#: winio.c:876 +#: winio.c:892 #, c-format msgid "Moved to (%d, %d) in edit buffer\n" msgstr "" -#: winio.c:887 +#: winio.c:903 #, c-format msgid "current->data = \"%s\"\n" msgstr "" -#: winio.c:930 +#: winio.c:946 #, c-format msgid "I got \"%s\"\n" msgstr "" -#: winio.c:954 +#: winio.c:970 msgid " Y" msgstr "" -#: winio.c:954 +#: winio.c:970 msgid "Yes" msgstr "" -#: winio.c:956 +#: winio.c:972 msgid " A" msgstr "" -#: winio.c:956 +#: winio.c:972 msgid "All" msgstr "" -#: winio.c:958 +#: winio.c:974 msgid " N" msgstr "" -#: winio.c:958 +#: winio.c:974 msgid "No" msgstr "" -#: winio.c:959 +#: winio.c:975 msgid "^C" msgstr "" -#: winio.c:1097 +#: winio.c:1114 #, c-format msgid "do_cursorpos: linepct = %f, bytepct = %f\n" msgstr "" -#: winio.c:1101 +#: winio.c:1118 msgid "line %d of %d (%.0f%%), character %d of %d (%.0f%%)" msgstr "" -#: winio.c:1227 +#: winio.c:1242 msgid "Dumping file buffer to stderr...\n" msgstr "" -#: winio.c:1229 +#: winio.c:1244 msgid "Dumping cutbuffer to stderr...\n" msgstr "" -#: winio.c:1231 +#: winio.c:1246 msgid "Dumping a buffer to stderr...\n" msgstr "" diff --git a/search.c b/search.c index 981cf06d..2c5a0aeb 100644 --- a/search.c +++ b/search.c @@ -24,7 +24,7 @@ #include "config.h" #include "proto.h" #include "nano.h" - + #ifndef NANO_SMALL #include #define _(string) gettext(string) @@ -405,4 +405,3 @@ int do_gotoline_void(void) { return do_gotoline(0); } - diff --git a/utils.c b/utils.c index 6649b4a2..e9af3a16 100644 --- a/utils.c +++ b/utils.c @@ -26,7 +26,7 @@ #include "nano.h" #include "proto.h" -#ifndef NANO_SMALL +#ifndef NANO_SMALL #include #define _(string) gettext(string) #else @@ -89,9 +89,9 @@ char *strstrwrapper(char *haystack, char *needle) /* Thanks BG, many ppl have been asking for this... */ void *nmalloc(size_t howmuch) -{ +{ void *r; - + /* Panic save? */ if (!(r = malloc(howmuch))) @@ -99,14 +99,13 @@ void *nmalloc(size_t howmuch) return r; } - + void *nrealloc(void *ptr, size_t howmuch) -{ +{ void *r; - + if (!(r = realloc(ptr, howmuch))) - die("nano: realloc: out of memory!"); + die("nano: realloc: out of memory!"); return r; } - diff --git a/winio.c b/winio.c index 54c38087..8a0e3a04 100644 --- a/winio.c +++ b/winio.c @@ -75,7 +75,7 @@ int xpt(filestruct * fileptr, int index) if (tabs % TABSIZE == 0); else tabs += TABSIZE - (tabs % TABSIZE); - } else if (fileptr->data[i] & 0x80) + } else if (fileptr->data[i] & 0x80) /* Make 8 bit chars only 1 collumn! */ ; else if (fileptr->data[i] < 32) @@ -103,17 +103,20 @@ int actual_x_from_start(filestruct * fileptr, int xplus, int start) if (fileptr == NULL || fileptr->data == NULL) return 0; - for (i = start; tot <= xplus && fileptr->data[i] != 0; i++,tot++) + for (i = start; tot <= xplus && fileptr->data[i] != 0; i++, tot++) if (fileptr->data[i] == NANO_CONTROL_I) { - if (tot % TABSIZE == 0) tot++; - else tot += TABSIZE - (tot % TABSIZE); + if (tot % TABSIZE == 0) + tot++; + else + tot += TABSIZE - (tot % TABSIZE); } else if (fileptr->data[i] & 0x80) tot++; /* Make 8 bit chars only 1 column (again) */ else if (fileptr->data[i] < 32) tot += 2; #ifdef DEBUG - fprintf(stderr, _("actual_x_from_start for xplus=%d returned %d\n"), xplus, i); + fprintf(stderr, _("actual_x_from_start for xplus=%d returned %d\n"), + xplus, i); #endif return i - start; } @@ -139,7 +142,7 @@ int strlenpt(char *buf) if (tabs % TABSIZE == 0); else tabs += TABSIZE - (tabs % TABSIZE); - } else if (buf[i] & 0x80) + } else if (buf[i] & 0x80) /* Make 8 bit chars only 1 collumn! */ ; else if (buf[i] < 32) @@ -169,7 +172,7 @@ void reset_cursor(void) wmove(edit, current_y, x); else wmove(edit, current_y, x - - get_page_start_virtual(get_page_from_virtual(x))); + get_page_start_virtual(get_page_from_virtual(x))); } @@ -524,10 +527,12 @@ void set_modified(void) } } -inline int get_page_from_virtual(int virtual) { +inline int get_page_from_virtual(int virtual) +{ int page = 2; - if(virtual <= COLS - 2) return 1; + if (virtual <= COLS - 2) + return 1; virtual -= (COLS - 2); while (virtual > COLS - 2 - 7) { @@ -538,52 +543,53 @@ inline int get_page_from_virtual(int virtual) { return page; } -inline int get_page_start_virtual(int page) { +inline int get_page_start_virtual(int page) +{ int virtual; virtual = --page * (COLS - 7); - if(page) virtual -= 2 * page - 1; + if (page) + virtual -= 2 * page - 1; return virtual; } -inline int get_page_end_virtual(int page) { +inline int get_page_end_virtual(int page) +{ return get_page_start_virtual(page) + COLS - 1; } #ifndef NANO_SMALL /* Called only from edit_add, and therefore expects a * converted-to-only-spaces line */ -void add_marked_sameline(int begin, int end, filestruct *fileptr, int y, - int virt_cur_x, int this_page) +void add_marked_sameline(int begin, int end, filestruct * fileptr, int y, + int virt_cur_x, int this_page) { - int this_page_start = get_page_start_virtual(this_page), + int this_page_start = get_page_start_virtual(this_page), this_page_end = get_page_end_virtual(this_page); /* 3 start points: 0 -> begin, begin->end, end->strlen(data) */ /* in data : pre sel post */ /* likewise, 3 data lengths */ - int pre_data_len = begin, - sel_data_len = end - begin, - post_data_len = 0; /* Determined from the other two */ + int pre_data_len = begin, sel_data_len = end - begin, post_data_len = 0; /* Determined from the other two */ /* now fix the start locations & lengths according to the cursor's * position (ie: our page) */ - if(pre_data_len < this_page_start) + if (pre_data_len < this_page_start) pre_data_len = 0; else pre_data_len -= this_page_start; - if(begin < this_page_start) + if (begin < this_page_start) begin = this_page_start; - if(end < this_page_start) + if (end < this_page_start) end = this_page_start; /* we don't care about end, because it will just get cropped * due to length */ - if(begin > this_page_end) + if (begin > this_page_end) begin = this_page_end; - if(end > this_page_end) + if (end > this_page_end) end = this_page_end; sel_data_len = end - begin; @@ -592,17 +598,17 @@ void add_marked_sameline(int begin, int end, filestruct *fileptr, int y, mvwaddnstr(edit, y, 0, &fileptr->data[this_page_start], pre_data_len); wattron(edit, A_REVERSE); mvwaddnstr(edit, y, begin - this_page_start, - &fileptr->data[begin], sel_data_len); + &fileptr->data[begin], sel_data_len); wattroff(edit, A_REVERSE); mvwaddnstr(edit, y, end - this_page_start, - &fileptr->data[end], post_data_len); + &fileptr->data[end], post_data_len); } #endif /* Called only from update_line. Expects a converted-to-not-have-tabs * line */ void edit_add(filestruct * fileptr, int yval, int start, int virt_cur_x, - int virt_mark_beginx, int this_page) + int virt_mark_beginx, int this_page) { #ifndef NANO_SMALL if (ISSET(MARK_ISSET)) { @@ -620,14 +626,16 @@ void edit_add(filestruct * fileptr, int yval, int start, int virt_cur_x, mvwaddnstr(edit, yval, 0, fileptr->data, COLS); wattroff(edit, A_REVERSE); } else if (fileptr == mark_beginbuf && fileptr == current) { - /* Special case, we're still on the same line we started + /* Special case, we're still on the same line we started * marking */ if (virt_cur_x < virt_mark_beginx) add_marked_sameline(virt_cur_x, virt_mark_beginx, - fileptr, yval, virt_cur_x, this_page); + fileptr, yval, virt_cur_x, + this_page); else add_marked_sameline(virt_mark_beginx, virt_cur_x, - fileptr, yval, virt_cur_x, this_page); + fileptr, yval, virt_cur_x, + this_page); } else if (fileptr == mark_beginbuf) { /* we're updating the line that was first marked */ int target; @@ -635,7 +643,9 @@ void edit_add(filestruct * fileptr, int yval, int start, int virt_cur_x, if (mark_beginbuf->lineno > current->lineno) wattron(edit, A_REVERSE); - target = (virt_mark_beginx < COLS - 1) ? virt_mark_beginx : COLS - 1; + target = + (virt_mark_beginx < + COLS - 1) ? virt_mark_beginx : COLS - 1; mvwaddnstr(edit, yval, 0, fileptr->data, target); @@ -645,11 +655,11 @@ void edit_add(filestruct * fileptr, int yval, int start, int virt_cur_x, wattroff(edit, A_REVERSE); target = (COLS - 1) - virt_mark_beginx; - if(target < 0) target = 0; + if (target < 0) + target = 0; mvwaddnstr(edit, yval, virt_mark_beginx, - &fileptr->data[virt_mark_beginx], - target); + &fileptr->data[virt_mark_beginx], target); if (mark_beginbuf->lineno < current->lineno) wattroff(edit, A_REVERSE); @@ -664,8 +674,9 @@ void edit_add(filestruct * fileptr, int yval, int start, int virt_cur_x, wattron(edit, A_REVERSE); if (virt_cur_x > COLS - 2) { - mvwaddnstr(edit, yval, 0, &fileptr->data[this_page_start], - virt_cur_x - this_page_start); + mvwaddnstr(edit, yval, 0, + &fileptr->data[this_page_start], + virt_cur_x - this_page_start); } else { mvwaddnstr(edit, yval, 0, fileptr->data, virt_cur_x); } @@ -678,7 +689,7 @@ void edit_add(filestruct * fileptr, int yval, int start, int virt_cur_x, if (virt_cur_x > COLS - 2) mvwaddnstr(edit, yval, virt_cur_x - this_page_start, &fileptr->data[virt_cur_x], - this_page_end - virt_cur_x); + this_page_end - virt_cur_x); else mvwaddnstr(edit, yval, virt_cur_x, &fileptr->data[virt_cur_x], @@ -692,7 +703,7 @@ void edit_add(filestruct * fileptr, int yval, int start, int virt_cur_x, } else #endif mvwaddnstr(edit, yval, 0, &fileptr->data[start], - get_page_end_virtual(this_page) - start); + get_page_end_virtual(this_page) - start); } /* @@ -707,9 +718,10 @@ void update_line(filestruct * fileptr, int index) int line = 0, col = 0; int virt_cur_x = current_x, virt_mark_beginx = mark_beginx; char *realdata, *tmp; - int i,pos,len,page; + int i, pos, len, page; - if(!fileptr) return; + if (!fileptr) + return; /* First, blank out the line (at a minimum) */ for (filetmp = edittop; filetmp != fileptr && filetmp != editbot; @@ -723,19 +735,23 @@ void update_line(filestruct * fileptr, int index) realdata = fileptr->data; len = strlen(realdata); - fileptr->data = nmalloc(xpt(fileptr,len) + 1); + fileptr->data = nmalloc(xpt(fileptr, len) + 1); pos = 0; - for(i=0;idata[pos++] = ' '; - if(i < current_x) virt_cur_x++; - if(i < mark_beginx) virt_mark_beginx++; - } while(pos % TABSIZE); + if (i < current_x) + virt_cur_x++; + if (i < mark_beginx) + virt_mark_beginx++; + } while (pos % TABSIZE); /* must decrement once to account for tab-is-one-character */ - if(i < current_x) virt_cur_x--; - if(i < mark_beginx) virt_mark_beginx--; + if (i < current_x) + virt_cur_x--; + if (i < mark_beginx) + virt_mark_beginx--; } else { fileptr->data[pos++] = realdata[i]; } @@ -754,14 +770,14 @@ void update_line(filestruct * fileptr, int index) mvwaddch(edit, line, 0, '$'); if (strlenpt(fileptr->data) > get_page_end_virtual(page)) - mvwaddch(edit, line, COLS - 1, '$'); + mvwaddch(edit, line, COLS - 1, '$'); } else { /* It's not the current line means that it's at x=0 and page=1 */ /* If it is the current line, then we're in the same boat */ edit_add(filetmp, line, 0, virt_cur_x, virt_mark_beginx, 1); if (strlenpt(&filetmp->data[col]) > COLS) - mvwaddch(edit, line, COLS - 1, '$'); + mvwaddch(edit, line, COLS - 1, '$'); } /* Clean up our mess */ @@ -1072,8 +1088,9 @@ int do_cursorpos(void) if (current == NULL || fileage == NULL) return 0; - for (fileptr = fileage; fileptr != current && fileptr != NULL; fileptr = fileptr->next) - tot += strlen(fileptr->data) + 1; + for (fileptr = fileage; fileptr != current && fileptr != NULL; + fileptr = fileptr->next) + tot += strlen(fileptr->data) + 1; if (fileptr == NULL) return -1; @@ -1081,7 +1098,7 @@ int do_cursorpos(void) i = tot + current_x;; for (fileptr = current->next; fileptr != NULL; fileptr = fileptr->next) - tot += strlen(fileptr->data) + 1; + tot += strlen(fileptr->data) + 1; if (totlines > 0) linepct = 100 * current->lineno / totlines; @@ -1120,15 +1137,14 @@ int do_help(void) if (ISSET(NO_HELP)) { no_help_flag = 1; - delwin (bottomwin); - bottomwin = newwin(3, COLS, LINES - 3, 0); + delwin(bottomwin); + bottomwin = newwin(3, COLS, LINES - 3, 0); keypad(bottomwin, TRUE); - - editwinrows -= no_help (); - UNSET(NO_HELP); + + editwinrows -= no_help(); + UNSET(NO_HELP); bottombars(help_list, HELP_LIST_LEN); - } - else + } else bottombars(help_list, HELP_LIST_LEN); do { @@ -1198,14 +1214,13 @@ int do_help(void) if (no_help_flag) { werase(bottomwin); - wrefresh(bottomwin); - delwin (bottomwin); + wrefresh(bottomwin); + delwin(bottomwin); SET(NO_HELP); bottomwin = newwin(3 - no_help(), COLS, LINES - 3 + no_help(), 0); keypad(bottomwin, TRUE); editwinrows += no_help(); - } - else + } else display_main_list(); curs_set(1); -- 2.39.5