Made search functions and keys more like Pico

git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@55 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
master
Chris Allegretta 2000-06-29 01:30:04 +00:00
parent 8b709372b7
commit 8c2b40f06c
18 changed files with 304 additions and 267 deletions

View File

@ -1,15 +1,22 @@
CVS code changes since last release -
- Made search functions & keys more like Pico. Added goto line from
search and replace function, changed wording to "No Replace" instead of
"To Search" and changed to Pico's ketstroke by default, ^R.
Affects search_init(), do_search() in search.c, globals in nano.h
and shortcut_init() in global.c.
- nano.c:
- Removed dual alt_speller variables, oops! (Rocco Corsi)
- de.po:
- Revised translations by floki@bigfoot.com.
- fi.po:
- Finnish translation by pauli.virtanen@saunalahti.fi.
- winio.c
- winio.c:
do_yesno(), nanogetstr():
- Removed now unnecessary raw/cbreak combos.
- Removed gettext calls from "Y(es)", "N(o)", "A(ll)" and "^C", till
we decide if those keybindings should be translated. (Jordi)
clear_bottomwin():
- Removed wrefresh(edit) call.
nano-0.9.11 - 06/20/2000
- New flag "-T" or "--tabsize" to specify how to display tab widths.

View File

@ -270,7 +270,10 @@ void shortcut_init(void)
sc_init_one(&whereis_list[3], NANO_OTHERSEARCH_KEY, _("To Replace"),
nano_replace_msg, 0, 0, 0, VIEW, do_replace);
sc_init_one(&whereis_list[4], NANO_CANCEL_KEY, _("Cancel"),
sc_init_one(&whereis_list[4], NANO_FROMSEARCHTOGOTO_KEY, _("Goto Line"),
nano_goto_msg, 0, 0, 0, VIEW, do_gotoline_void);
sc_init_one(&whereis_list[5], NANO_CANCEL_KEY, _("Cancel"),
nano_cancel_msg, 0, 0, 0, VIEW, 0);
@ -283,10 +286,13 @@ void shortcut_init(void)
sc_init_one(&replace_list[2], NANO_CASE_KEY, _("Case Sens"),
nano_case_msg, 0, 0, 0, VIEW, 0);
sc_init_one(&replace_list[3], NANO_OTHERSEARCH_KEY, _("To Search"),
sc_init_one(&replace_list[3], NANO_OTHERSEARCH_KEY, _("No Replace"),
nano_whereis_msg, 0, 0, 0, VIEW, do_search);
sc_init_one(&replace_list[4], NANO_CANCEL_KEY, _("Cancel"),
sc_init_one(&replace_list[4], NANO_FROMSEARCHTOGOTO_KEY, _("Goto Line"),
nano_goto_msg, 0, 0, 0, VIEW, do_gotoline_void);
sc_init_one(&replace_list[5], NANO_CANCEL_KEY, _("Cancel"),
nano_cancel_msg, 0, 0, 0, VIEW, 0);

7
nano.h
View File

@ -184,7 +184,7 @@ know what you're doing */
#define NANO_REPLACE_KEY NANO_CONTROL_4
#define NANO_REPLACE_FKEY KEY_F(14)
#define NANO_ALT_REPLACE_KEY NANO_ALT_R
#define NANO_OTHERSEARCH_KEY NANO_CONTROL_T
#define NANO_OTHERSEARCH_KEY NANO_CONTROL_R
#define NANO_PREVPAGE_KEY NANO_CONTROL_Y
#define NANO_PREVPAGE_FKEY KEY_F(7)
#define NANO_NEXTPAGE_KEY NANO_CONTROL_V
@ -216,11 +216,12 @@ know what you're doing */
#define NANO_TAB_KEY NANO_CONTROL_I
#define NANO_SUSPEND_KEY NANO_CONTROL_Z
#define NANO_ENTER_KEY NANO_CONTROL_M
#define NANO_FROMSEARCHTOGOTO_KEY NANO_CONTROL_T
#define MAIN_LIST_LEN 26
#define MAIN_VISIBLE 12
#define WHEREIS_LIST_LEN 5
#define REPLACE_LIST_LEN 5
#define WHEREIS_LIST_LEN 6
#define REPLACE_LIST_LEN 6
#define GOTO_LIST_LEN 3
#define WRITEFILE_LIST_LEN 1
#define HELP_LIST_LEN 3

View File

@ -89,7 +89,7 @@ const struct _msg_ent _msg_tbl[] = {
{"Case Sens", 80},
{"To Replace", 81},
{"Cancel", 82},
{"To Search", 83},
{"No Replace", 83},
{"\
\n\
Buffer written to 'nano.save'\n", 84},

BIN
po/de.gmo

Binary file not shown.

View File

@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: nano 0.9.11\n"
"POT-Creation-Date: 2000-06-23 02:43+0200\n"
"POT-Creation-Date: 2000-06-28 21:18-0400\n"
"PO-Revision-Date: 2000-06-21 12:19+0200\n"
"Last-Translator: Florian König <floki@bigfoot.com>\n"
"Language-Team: German <floki@bigfoot.com>\n"
@ -32,7 +32,7 @@ msgstr "read_line: nicht in der ersten Zeile und prev ist NULL"
msgid "Read %d lines"
msgstr "%d Zeilen gelesen"
#: files.c:211 search.c:126 search.c:144
#: files.c:211 search.c:129 search.c:147
#, c-format
msgid "\"%s\" not found"
msgstr "\"%s\" nicht gefunden"
@ -228,7 +228,7 @@ msgstr ""
msgid "Cancel the current function"
msgstr "Funktion abbrechen"
#: global.c:146 global.c:256 global.c:322
#: global.c:146 global.c:256 global.c:328
msgid "Get Help"
msgstr "Hilfe"
@ -236,11 +236,11 @@ msgstr "Hilfe"
msgid "WriteOut"
msgstr "Speichern"
#: global.c:153 global.c:311
#: global.c:153 global.c:317
msgid "Exit"
msgstr "Beenden"
#: global.c:161 global.c:252
#: global.c:161 global.c:252 global.c:273 global.c:292
msgid "Goto Line"
msgstr "Zu Zeile"
@ -260,11 +260,11 @@ msgstr "Datei
msgid "Where Is"
msgstr "Wo ist"
#: global.c:181 global.c:303
#: global.c:181 global.c:309
msgid "Prev Page"
msgstr "Seite zurück"
#: global.c:185 global.c:307
#: global.c:185 global.c:313
msgid "Next Page"
msgstr "Seite vor"
@ -332,15 +332,15 @@ msgstr "Tab"
msgid "Enter"
msgstr "Enter"
#: global.c:260 global.c:277 global.c:293
#: global.c:260 global.c:280 global.c:299
msgid "First Line"
msgstr "Erste Zeile"
#: global.c:263 global.c:280 global.c:296
#: global.c:263 global.c:283 global.c:302
msgid "Last Line"
msgstr "Letzte Zeile"
#: global.c:266 global.c:283
#: global.c:266 global.c:286
msgid "Case Sens"
msgstr "GROSZ/klein"
@ -349,15 +349,15 @@ msgstr "GROSZ/klein"
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:970
#: global.c:276 global.c:295 global.c:305 global.c:321 global.c:325
#: global.c:331 winio.c:969
msgid "Cancel"
msgstr "Abbrechen"
#: global.c:286
#: global.c:289
#, fuzzy
msgid "To Search"
msgstr "Suche"
msgid "No Replace"
msgstr "Ersetzen"
#: nano.c:111
msgid ""
@ -692,51 +692,51 @@ msgstr "Suche%s"
msgid "Search Cancelled"
msgstr "Suche abgebrochen"
#: search.c:140
#: search.c:143
msgid "Search Wrapped"
msgstr "Suche in neue Zeile umgebrochen"
#: search.c:190
#: search.c:193
#, c-format
msgid "Replaced %d occurences"
msgstr "%d mal Ersetzung vorgenommen"
#: search.c:192
#: search.c:195
msgid "Replaced 1 occurence"
msgstr "1 Ersetzung vorgenommen"
#: search.c:210 search.c:232 search.c:255
#: search.c:213 search.c:235 search.c:258
msgid "Replace Cancelled"
msgstr "Ersetzung abgebrochen"
#: search.c:228
#: search.c:231
#, c-format
msgid "Replace with [%s]"
msgstr "Ersetzen mit [%s]"
#. last_search is empty
#: search.c:253
#: search.c:256
msgid "Replace with"
msgstr "Ersetzen mit"
#: search.c:294
#: search.c:297
msgid "Replace this instance?"
msgstr "Ersetzen?"
#. Ask for it
#: search.c:359
#: search.c:362
msgid "Enter line number"
msgstr "Zeilennummer eingeben"
#: search.c:361
#: search.c:364
msgid "Aborted"
msgstr "Abgebrochen"
#: search.c:381
#: search.c:384
msgid "Come on, be reasonable"
msgstr "Komm schon, sei vernünftig"
#: search.c:386
#: search.c:389
#, c-format
msgid "Only %d lines available, skipping to last line"
msgstr "Nur %d Zeilen vorhanden, springe zur letzten Zeile"
@ -763,54 +763,58 @@ msgstr " Datei: ..."
msgid "Modified"
msgstr "Verändert"
#: winio.c:886
#: winio.c:885
#, c-format
msgid "Moved to (%d, %d) in edit buffer\n"
msgstr "Nach (%d, %d) im Bearbeitungspuffer verschoben\n"
#: winio.c:897
#: winio.c:896
#, c-format
msgid "current->data = \"%s\"\n"
msgstr "current->data = \"%s\"\n"
#: winio.c:940
#: winio.c:939
#, c-format
msgid "I got \"%s\"\n"
msgstr "Erhielt \"%s\"\n"
#: winio.c:965
#: winio.c:964
msgid "Yes"
msgstr "Ja"
#: winio.c:967
#: winio.c:966
msgid "All"
msgstr "Alle"
#: winio.c:969
#: winio.c:968
msgid "No"
msgstr "Nein"
#: winio.c:1105
#: winio.c:1104
#, c-format
msgid "do_cursorpos: linepct = %f, bytepct = %f\n"
msgstr "do_cursorpos: linepct = %f, bytepct = %f\n"
#: winio.c:1109
#: winio.c:1108
msgid "line %d of %d (%.0f%%), character %d of %d (%.0f%%)"
msgstr "Zeile %d von %d (%.0f%%), Zeichen %d von %d (%.0f%%)"
#: winio.c:1233
#: winio.c:1232
msgid "Dumping file buffer to stderr...\n"
msgstr "Gebe Datei Puffer nach stderr aus...\n"
#: winio.c:1235
#: winio.c:1234
msgid "Dumping cutbuffer to stderr...\n"
msgstr "Gebe Inhalt der Zwischenablage nach stderr aus...\n"
#: winio.c:1237
#: winio.c:1236
msgid "Dumping a buffer to stderr...\n"
msgstr "Gebe einen Puffer nach stderr aus...\n"
#, fuzzy
#~ msgid "To Search"
#~ msgstr "Suche"
#~ msgid " Y"
#~ msgstr " J"

BIN
po/es.gmo

Binary file not shown.

View File

@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: 0.9.11\n"
"POT-Creation-Date: 2000-06-23 02:43+0200\n"
"POT-Creation-Date: 2000-06-28 21:18-0400\n"
"PO-Revision-Date: 2000-06-20 02:56+0200\n"
"Last-Translator: Jordi Mallach <jordi@sindominio.net>\n"
"Language-Team: Spanish <jordi@sindominio.net>\n"
@ -32,7 +32,7 @@ msgstr "read_line: no estamos en la primera l
msgid "Read %d lines"
msgstr "%d líneas leídas"
#: files.c:211 search.c:126 search.c:144
#: files.c:211 search.c:129 search.c:147
#, c-format
msgid "\"%s\" not found"
msgstr "\"%s\" no encontrado"
@ -227,7 +227,7 @@ msgstr "Hacer que la b
msgid "Cancel the current function"
msgstr "Cancelar la función actual"
#: global.c:146 global.c:256 global.c:322
#: global.c:146 global.c:256 global.c:328
msgid "Get Help"
msgstr "Ver Ayuda"
@ -235,11 +235,11 @@ msgstr "Ver Ayuda"
msgid "WriteOut"
msgstr "Guardar"
#: global.c:153 global.c:311
#: global.c:153 global.c:317
msgid "Exit"
msgstr "Salir"
#: global.c:161 global.c:252
#: global.c:161 global.c:252 global.c:273 global.c:292
msgid "Goto Line"
msgstr "Ir a Línea"
@ -259,11 +259,11 @@ msgstr "L Fichero"
msgid "Where Is"
msgstr "Buscar"
#: global.c:181 global.c:303
#: global.c:181 global.c:309
msgid "Prev Page"
msgstr "Pag Prev"
#: global.c:185 global.c:307
#: global.c:185 global.c:313
msgid "Next Page"
msgstr "Pag Sig"
@ -331,15 +331,15 @@ msgstr "Tab"
msgid "Enter"
msgstr "Enter"
#: global.c:260 global.c:277 global.c:293
#: global.c:260 global.c:280 global.c:299
msgid "First Line"
msgstr "Primera Línea"
#: global.c:263 global.c:280 global.c:296
#: global.c:263 global.c:283 global.c:302
msgid "Last Line"
msgstr "Última Línea"
#: global.c:266 global.c:283
#: global.c:266 global.c:286
msgid "Case Sens"
msgstr "May/Min"
@ -347,14 +347,15 @@ msgstr "May/Min"
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:970
#: global.c:276 global.c:295 global.c:305 global.c:321 global.c:325
#: global.c:331 winio.c:969
msgid "Cancel"
msgstr "Cancelar"
#: global.c:286
msgid "To Search"
msgstr "Buscar"
#: global.c:289
#, fuzzy
msgid "No Replace"
msgstr "Reemplazar"
#: nano.c:111
msgid ""
@ -684,51 +685,51 @@ msgstr "Buscar%s"
msgid "Search Cancelled"
msgstr "Búsqueda Cancelada"
#: search.c:140
#: search.c:143
msgid "Search Wrapped"
msgstr "Búsqueda Recomenzada"
#: search.c:190
#: search.c:193
#, c-format
msgid "Replaced %d occurences"
msgstr "%d ocurrencias reemplazadas"
#: search.c:192
#: search.c:195
msgid "Replaced 1 occurence"
msgstr "1 ocurrencia reemplazada"
#: search.c:210 search.c:232 search.c:255
#: search.c:213 search.c:235 search.c:258
msgid "Replace Cancelled"
msgstr "Reemplazar Cancelado"
#: search.c:228
#: search.c:231
#, c-format
msgid "Replace with [%s]"
msgstr "Reemplazar con [%s]"
#. last_search is empty
#: search.c:253
#: search.c:256
msgid "Replace with"
msgstr "Reemplazar con"
#: search.c:294
#: search.c:297
msgid "Replace this instance?"
msgstr "Reemplazar esta instancia?"
#. Ask for it
#: search.c:359
#: search.c:362
msgid "Enter line number"
msgstr "Introduce número de línea"
#: search.c:361
#: search.c:364
msgid "Aborted"
msgstr "Abortado"
#: search.c:381
#: search.c:384
msgid "Come on, be reasonable"
msgstr "Venga ya, se razonable"
#: search.c:386
#: search.c:389
#, c-format
msgid "Only %d lines available, skipping to last line"
msgstr "Sólo hay %d líneas, saltando hasta la última"
@ -755,54 +756,57 @@ msgstr "Fichero: ..."
msgid "Modified"
msgstr "Modificado"
#: winio.c:886
#: winio.c:885
#, c-format
msgid "Moved to (%d, %d) in edit buffer\n"
msgstr "Moviendo a (%d, %d) en buffer de edición\n"
#: winio.c:897
#: winio.c:896
#, c-format
msgid "current->data = \"%s\"\n"
msgstr "current->data = \"%s\"\n"
#: winio.c:940
#: winio.c:939
#, c-format
msgid "I got \"%s\"\n"
msgstr "Pillé \"%s\"\n"
#: winio.c:965
#: winio.c:964
msgid "Yes"
msgstr "Sí"
#: winio.c:967
#: winio.c:966
msgid "All"
msgstr "Todas"
#: winio.c:969
#: winio.c:968
msgid "No"
msgstr "No"
#: winio.c:1105
#: winio.c:1104
#, c-format
msgid "do_cursorpos: linepct = %f, bytepct = %f\n"
msgstr "do_cursorpos: linepct = %f, bytepct = %f\n"
#: winio.c:1109
#: winio.c:1108
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:1233
#: winio.c:1232
msgid "Dumping file buffer to stderr...\n"
msgstr "Volcando buffer de fichero a stderr...\n"
#: winio.c:1235
#: winio.c:1234
msgid "Dumping cutbuffer to stderr...\n"
msgstr "Volcando el cutbuffer a stderr...\n"
#: winio.c:1237
#: winio.c:1236
msgid "Dumping a buffer to stderr...\n"
msgstr "Volcando un buffer a stderr...\n"
#~ msgid "To Search"
#~ msgstr "Buscar"
#~ msgid " Y"
#~ msgstr " Y"

BIN
po/fi.gmo

Binary file not shown.

View File

@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: nano 0.9.11\n"
"POT-Creation-Date: 2000-06-23 02:43+0200\n"
"POT-Creation-Date: 2000-06-28 21:18-0400\n"
"PO-Revision-Date: 2000-06-21 23:08+03:00\n"
"Last-Translator: Pauli Virtanen <pauli.virtanen@saunalahti.fi>\n"
"Language-Team: Finnish <fi@li.org>\n"
@ -31,7 +31,7 @@ msgstr "read_line: ei ensimm
msgid "Read %d lines"
msgstr "%d riviä luettu"
#: files.c:211 search.c:126 search.c:144
#: files.c:211 search.c:129 search.c:147
#, c-format
msgid "\"%s\" not found"
msgstr "Tiedostoa \"%s\" ei ole"
@ -226,7 +226,7 @@ msgstr "Muuta etsint
msgid "Cancel the current function"
msgstr "Peru nykyinen toiminto."
#: global.c:146 global.c:256 global.c:322
#: global.c:146 global.c:256 global.c:328
msgid "Get Help"
msgstr "Ohjeita"
@ -234,11 +234,11 @@ msgstr "Ohjeita"
msgid "WriteOut"
msgstr "Kirjoita"
#: global.c:153 global.c:311
#: global.c:153 global.c:317
msgid "Exit"
msgstr "Lopeta"
#: global.c:161 global.c:252
#: global.c:161 global.c:252 global.c:273 global.c:292
msgid "Goto Line"
msgstr "Siirry"
@ -258,11 +258,11 @@ msgstr "Lue tied."
msgid "Where Is"
msgstr "Etsi"
#: global.c:181 global.c:303
#: global.c:181 global.c:309
msgid "Prev Page"
msgstr "Ed. sivu"
#: global.c:185 global.c:307
#: global.c:185 global.c:313
msgid "Next Page"
msgstr "Seur. sivu"
@ -330,15 +330,15 @@ msgstr "Sarkain"
msgid "Enter"
msgstr "Enter"
#: global.c:260 global.c:277 global.c:293
#: global.c:260 global.c:280 global.c:299
msgid "First Line"
msgstr "1. rivi"
#: global.c:263 global.c:280 global.c:296
#: global.c:263 global.c:283 global.c:302
msgid "Last Line"
msgstr "Viim. rivi"
#: global.c:266 global.c:283
#: global.c:266 global.c:286
msgid "Case Sens"
msgstr "Kirj. koko"
@ -346,14 +346,15 @@ msgstr "Kirj. koko"
msgid "To Replace"
msgstr "Korvattava"
#: global.c:273 global.c:289 global.c:299 global.c:315 global.c:319
#: global.c:325 winio.c:970
#: global.c:276 global.c:295 global.c:305 global.c:321 global.c:325
#: global.c:331 winio.c:969
msgid "Cancel"
msgstr "Peru"
#: global.c:286
msgid "To Search"
msgstr "Etsittävä"
#: global.c:289
#, fuzzy
msgid "No Replace"
msgstr "Korvattava"
#: nano.c:111
msgid ""
@ -683,51 +684,51 @@ msgstr "Etsint
msgid "Search Cancelled"
msgstr "Etsintä peruttu"
#: search.c:140
#: search.c:143
msgid "Search Wrapped"
msgstr "Etsintä jatkuu"
#: search.c:190
#: search.c:193
#, c-format
msgid "Replaced %d occurences"
msgstr "%d kohtaa korvattu"
#: search.c:192
#: search.c:195
msgid "Replaced 1 occurence"
msgstr "1 kohta korvattu"
#: search.c:210 search.c:232 search.c:255
#: search.c:213 search.c:235 search.c:258
msgid "Replace Cancelled"
msgstr "Korvaus peruttu"
#: search.c:228
#: search.c:231
#, c-format
msgid "Replace with [%s]"
msgstr "Korvaa merkkijonolla [%s]"
#. last_search is empty
#: search.c:253
#: search.c:256
msgid "Replace with"
msgstr "Korvaa merkkijonolla"
#: search.c:294
#: search.c:297
msgid "Replace this instance?"
msgstr "Korvataanko tämä kohta?"
#. Ask for it
#: search.c:359
#: search.c:362
msgid "Enter line number"
msgstr "Kirjoita rivin numero"
#: search.c:361
#: search.c:364
msgid "Aborted"
msgstr "Keskeytetty"
#: search.c:381
#: search.c:384
msgid "Come on, be reasonable"
msgstr "Jotakin järkevää, kiitos?"
#: search.c:386
#: search.c:389
#, c-format
msgid "Only %d lines available, skipping to last line"
msgstr "Vain %d riviä olemassa, siirrytään viimeiselle riville"
@ -754,54 +755,57 @@ msgstr " Tiedosto: ..."
msgid "Modified"
msgstr "Muokattu"
#: winio.c:886
#: winio.c:885
#, c-format
msgid "Moved to (%d, %d) in edit buffer\n"
msgstr "Kohtaan (%d,%d) siirrytty muokkausruudussa\n"
#: winio.c:897
#: winio.c:896
#, c-format
msgid "current->data = \"%s\"\n"
msgstr "current->data = \"%s\"\n"
#: winio.c:940
#: winio.c:939
#, c-format
msgid "I got \"%s\"\n"
msgstr "Saatiin \"%s\"\n"
#: winio.c:965
#: winio.c:964
msgid "Yes"
msgstr "Kyllä"
#: winio.c:967
#: winio.c:966
msgid "All"
msgstr "Kaikki"
#: winio.c:969
#: winio.c:968
msgid "No"
msgstr "Ei"
#: winio.c:1105
#: winio.c:1104
#, c-format
msgid "do_cursorpos: linepct = %f, bytepct = %f\n"
msgstr "do_cursorpos: linepct = %f, bytepct = %f\n"
#: winio.c:1109
#: winio.c:1108
msgid "line %d of %d (%.0f%%), character %d of %d (%.0f%%)"
msgstr "rivi %d/%d (%.0f%%), merkki %d/%d (%.0f%%)"
#: winio.c:1233
#: winio.c:1232
msgid "Dumping file buffer to stderr...\n"
msgstr "Syötetään tiedosto stderriin...\n"
#: winio.c:1235
#: winio.c:1234
msgid "Dumping cutbuffer to stderr...\n"
msgstr "Syötetään leiketila stderriin...\n"
#: winio.c:1237
#: winio.c:1236
msgid "Dumping a buffer to stderr...\n"
msgstr "Syötetään teksti stderriin...\n"
#~ msgid "To Search"
#~ msgstr "Etsittävä"
#~ msgid " Y"
#~ msgstr " Y"

View File

@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: 0.8.9\n"
"POT-Creation-Date: 2000-06-23 02:43+0200\n"
"POT-Creation-Date: 2000-06-28 21:18-0400\n"
"PO-Revision-Date: 2000-03-24 01:32+0100\n"
"Last-Translator: Pierre Tane <tanep@bigfoot.com>\n"
"Language-Team: French <LL@li.org>\n"
@ -34,7 +34,7 @@ msgstr ""
msgid "Read %d lines"
msgstr "%d lignes lues"
#: files.c:211 search.c:126 search.c:144
#: files.c:211 search.c:129 search.c:147
#, c-format
msgid "\"%s\" not found"
msgstr "\"%s\" non trouvé"
@ -230,7 +230,7 @@ msgstr ""
msgid "Cancel the current function"
msgstr ""
#: global.c:146 global.c:256 global.c:322
#: global.c:146 global.c:256 global.c:328
msgid "Get Help"
msgstr ""
@ -238,11 +238,11 @@ msgstr ""
msgid "WriteOut"
msgstr ""
#: global.c:153 global.c:311
#: global.c:153 global.c:317
msgid "Exit"
msgstr ""
#: global.c:161 global.c:252
#: global.c:161 global.c:252 global.c:273 global.c:292
msgid "Goto Line"
msgstr ""
@ -264,11 +264,11 @@ msgstr "Lecture du fichier"
msgid "Where Is"
msgstr ""
#: global.c:181 global.c:303
#: global.c:181 global.c:309
msgid "Prev Page"
msgstr ""
#: global.c:185 global.c:307
#: global.c:185 global.c:313
msgid "Next Page"
msgstr ""
@ -337,15 +337,15 @@ msgstr ""
msgid "Enter"
msgstr ""
#: global.c:260 global.c:277 global.c:293
#: global.c:260 global.c:280 global.c:299
msgid "First Line"
msgstr ""
#: global.c:263 global.c:280 global.c:296
#: global.c:263 global.c:283 global.c:302
msgid "Last Line"
msgstr ""
#: global.c:266 global.c:283
#: global.c:266 global.c:286
msgid "Case Sens"
msgstr ""
@ -354,14 +354,15 @@ msgstr ""
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:970
#: global.c:276 global.c:295 global.c:305 global.c:321 global.c:325
#: global.c:331 winio.c:969
msgid "Cancel"
msgstr "Annuler"
#: global.c:286
msgid "To Search"
msgstr ""
#: global.c:289
#, fuzzy
msgid "No Replace"
msgstr "Rempacer par"
#: nano.c:111
msgid ""
@ -683,51 +684,51 @@ msgstr ""
msgid "Search Cancelled"
msgstr "Recherche annulée"
#: search.c:140
#: search.c:143
msgid "Search Wrapped"
msgstr "La recherche a bouclé"
#: search.c:190
#: search.c:193
#, c-format
msgid "Replaced %d occurences"
msgstr "%d occurences remplacées"
#: search.c:192
#: search.c:195
msgid "Replaced 1 occurence"
msgstr "1 occurence remplacée"
#: search.c:210 search.c:232 search.c:255
#: search.c:213 search.c:235 search.c:258
msgid "Replace Cancelled"
msgstr "Remplacement annulé"
#: search.c:228
#: search.c:231
#, c-format
msgid "Replace with [%s]"
msgstr "Remplacer par [%s]"
#. last_search is empty
#: search.c:253
#: search.c:256
msgid "Replace with"
msgstr "Rempacer par"
#: search.c:294
#: search.c:297
msgid "Replace this instance?"
msgstr "Remplacer cette occurence?"
#. Ask for it
#: search.c:359
#: search.c:362
msgid "Enter line number"
msgstr "Entrer le numéro de ligne"
#: search.c:361
#: search.c:364
msgid "Aborted"
msgstr "Annulé"
#: search.c:381
#: search.c:384
msgid "Come on, be reasonable"
msgstr "Allez, soyez raisonnable"
#: search.c:386
#: search.c:389
#, c-format
msgid "Only %d lines available, skipping to last line"
msgstr "Seulement %d lignes sont disponibles, saut jusqu'à la dernière ligne"
@ -754,51 +755,51 @@ msgstr " Fichier: ..."
msgid "Modified"
msgstr "Modifié"
#: winio.c:886
#: winio.c:885
#, 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:897
#: winio.c:896
#, c-format
msgid "current->data = \"%s\"\n"
msgstr "current->data = \"%s\"\n"
#: winio.c:940
#: winio.c:939
#, c-format
msgid "I got \"%s\"\n"
msgstr "J'ai reçu \"%s\"\n"
#: winio.c:965
#: winio.c:964
msgid "Yes"
msgstr "Oui"
#: winio.c:967
#: winio.c:966
msgid "All"
msgstr "Tous"
#: winio.c:969
#: winio.c:968
msgid "No"
msgstr "Non"
#: winio.c:1105
#: winio.c:1104
#, c-format
msgid "do_cursorpos: linepct = %f, bytepct = %f\n"
msgstr "do_cursorpos: linepct = %f, bytepct = %f\n"
#: winio.c:1109
#: winio.c:1108
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:1233
#: winio.c:1232
msgid "Dumping file buffer to stderr...\n"
msgstr "Envoi du buffer fichier sur stderr...\n"
#: winio.c:1235
#: winio.c:1234
msgid "Dumping cutbuffer to stderr...\n"
msgstr "Envoi du cutbuffer sur stderr...\n"
#: winio.c:1237
#: winio.c:1236
msgid "Dumping a buffer to stderr...\n"
msgstr "Envoi d'un buffer sur stderr...\n"

BIN
po/id.gmo

Binary file not shown.

View File

@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: nano-0.9.10\n"
"POT-Creation-Date: 2000-06-23 02:43+0200\n"
"POT-Creation-Date: 2000-06-28 21:18-0400\n"
"PO-Revision-Date: 2000-06-08 20:56+07:00\n"
"Last-Translator: Tedi Heriyanto <tedi-h@usa.net>\n"
"Language-Team: Indonesian <id@li.org>\n"
@ -31,7 +31,7 @@ msgstr "read_line: tidak di baris pertama dan sebelumnya adalah NULL"
msgid "Read %d lines"
msgstr "Membaca %d baris"
#: files.c:211 search.c:126 search.c:144
#: files.c:211 search.c:129 search.c:147
#, c-format
msgid "\"%s\" not found"
msgstr "\"%s\" tidak ditemukan"
@ -226,7 +226,7 @@ msgstr "Jadikan pencarian/penggantian saat ini case (in)sensitive"
msgid "Cancel the current function"
msgstr "Batalkan fungsi ini"
#: global.c:146 global.c:256 global.c:322
#: global.c:146 global.c:256 global.c:328
msgid "Get Help"
msgstr "Cari Bantuan"
@ -234,12 +234,12 @@ msgstr "Cari Bantuan"
msgid "WriteOut"
msgstr "Tulis"
#: global.c:153 global.c:311
#: global.c:153 global.c:317
#, fuzzy
msgid "Exit"
msgstr "Keluar"
#: global.c:161 global.c:252
#: global.c:161 global.c:252 global.c:273 global.c:292
msgid "Goto Line"
msgstr "Ke baris"
@ -259,11 +259,11 @@ msgstr "Baca File"
msgid "Where Is"
msgstr "Di mana"
#: global.c:181 global.c:303
#: global.c:181 global.c:309
msgid "Prev Page"
msgstr "Halaman sebelumnya"
#: global.c:185 global.c:307
#: global.c:185 global.c:313
msgid "Next Page"
msgstr "Halaman berikutnya"
@ -331,15 +331,15 @@ msgstr "Tab"
msgid "Enter"
msgstr "Enter"
#: global.c:260 global.c:277 global.c:293
#: global.c:260 global.c:280 global.c:299
msgid "First Line"
msgstr "Baris pertama"
#: global.c:263 global.c:280 global.c:296
#: global.c:263 global.c:283 global.c:302
msgid "Last Line"
msgstr "Baris terakhir"
#: global.c:266 global.c:283
#: global.c:266 global.c:286
msgid "Case Sens"
msgstr "Case Sens"
@ -347,14 +347,15 @@ msgstr "Case Sens"
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:970
#: global.c:276 global.c:295 global.c:305 global.c:321 global.c:325
#: global.c:331 winio.c:969
msgid "Cancel"
msgstr "Batal"
#: global.c:286
msgid "To Search"
msgstr "Mencari"
#: global.c:289
#, fuzzy
msgid "No Replace"
msgstr "Mengganti"
#: nano.c:111
msgid ""
@ -682,51 +683,51 @@ msgstr "Pencarian%s"
msgid "Search Cancelled"
msgstr "Batalkan pencarian"
#: search.c:140
#: search.c:143
msgid "Search Wrapped"
msgstr "Pancarian diulangi dari awal"
#: search.c:190
#: search.c:193
#, c-format
msgid "Replaced %d occurences"
msgstr "%d tempat terganti"
#: search.c:192
#: search.c:195
msgid "Replaced 1 occurence"
msgstr "Terganti 1 tempat"
#: search.c:210 search.c:232 search.c:255
#: search.c:213 search.c:235 search.c:258
msgid "Replace Cancelled"
msgstr "Batalkan penggantian"
#: search.c:228
#: search.c:231
#, c-format
msgid "Replace with [%s]"
msgstr "Ganti dengan [%s]"
#. last_search is empty
#: search.c:253
#: search.c:256
msgid "Replace with"
msgstr "Ganti dengan"
#: search.c:294
#: search.c:297
msgid "Replace this instance?"
msgstr "Ganti kata ini?"
#. Ask for it
#: search.c:359
#: search.c:362
msgid "Enter line number"
msgstr "Masukkan nomor baris"
#: search.c:361
#: search.c:364
msgid "Aborted"
msgstr "Dibatalkan"
#: search.c:381
#: search.c:384
msgid "Come on, be reasonable"
msgstr "Ayo, yang masuk akal"
#: search.c:386
#: search.c:389
#, c-format
msgid "Only %d lines available, skipping to last line"
msgstr "Hanya %d baris tersedia, melompat ke baris akhir"
@ -753,54 +754,57 @@ msgstr " File: ..."
msgid "Modified"
msgstr "Dimodifikasi"
#: winio.c:886
#: winio.c:885
#, c-format
msgid "Moved to (%d, %d) in edit buffer\n"
msgstr "Pindah ke (%d, %d) dalam buffer edit\n"
#: winio.c:897
#: winio.c:896
#, c-format
msgid "current->data = \"%s\"\n"
msgstr "current->data = \"%s\"\n"
#: winio.c:940
#: winio.c:939
#, c-format
msgid "I got \"%s\"\n"
msgstr "Saya mendapat \"%s\"\n"
#: winio.c:965
#: winio.c:964
msgid "Yes"
msgstr "Ya"
#: winio.c:967
#: winio.c:966
msgid "All"
msgstr "Semua"
#: winio.c:969
#: winio.c:968
msgid "No"
msgstr "Tidak"
#: winio.c:1105
#: winio.c:1104
#, c-format
msgid "do_cursorpos: linepct = %f, bytepct = %f\n"
msgstr "do_cursorpos: linepct = %f, bytepct = %f\n"
#: winio.c:1109
#: winio.c:1108
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:1233
#: winio.c:1232
msgid "Dumping file buffer to stderr...\n"
msgstr "Kirim buffer file ke stderr...\n"
#: winio.c:1235
#: winio.c:1234
msgid "Dumping cutbuffer to stderr...\n"
msgstr "Kirim cutbuffer ke stderr...\n"
#: winio.c:1237
#: winio.c:1236
msgid "Dumping a buffer to stderr...\n"
msgstr "Kirim buffer ke stderr...\n"
#~ msgid "To Search"
#~ msgstr "Mencari"
#~ msgid " Y"
#~ msgstr "Y"

BIN
po/it.gmo

Binary file not shown.

View File

@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: 0.8.7\n"
"POT-Creation-Date: 2000-06-23 02:43+0200\n"
"POT-Creation-Date: 2000-06-28 21:18-0400\n"
"PO-Revision-Date: 2000-03-03 04:57+0100\n"
"Last-Translator: Daniele Medri <madrid@linux.it>\n"
"MIME-Version: 1.0\n"
@ -31,7 +31,7 @@ msgstr "read_line: no estamos en la primera l
msgid "Read %d lines"
msgstr "Leggi %d linee"
#: files.c:211 search.c:126 search.c:144
#: files.c:211 search.c:129 search.c:147
#, c-format
msgid "\"%s\" not found"
msgstr "\"%s\" non trovato"
@ -226,7 +226,7 @@ msgstr "Ricerca/Sostituisci con case (in)sensitive"
msgid "Cancel the current function"
msgstr "Cancella la funzione corrente"
#: global.c:146 global.c:256 global.c:322
#: global.c:146 global.c:256 global.c:328
msgid "Get Help"
msgstr "Aiuto"
@ -234,11 +234,11 @@ msgstr "Aiuto"
msgid "WriteOut"
msgstr "Sovrascrivi"
#: global.c:153 global.c:311
#: global.c:153 global.c:317
msgid "Exit"
msgstr "Esci"
#: global.c:161 global.c:252
#: global.c:161 global.c:252 global.c:273 global.c:292
msgid "Goto Line"
msgstr "Vai alla linea"
@ -258,11 +258,11 @@ msgstr "Leggi file"
msgid "Where Is"
msgstr "Dov'è"
#: global.c:181 global.c:303
#: global.c:181 global.c:309
msgid "Prev Page"
msgstr "Pag Prec"
#: global.c:185 global.c:307
#: global.c:185 global.c:313
msgid "Next Page"
msgstr "Pag Seg"
@ -330,15 +330,15 @@ msgstr "Tab"
msgid "Enter"
msgstr "Invio"
#: global.c:260 global.c:277 global.c:293
#: global.c:260 global.c:280 global.c:299
msgid "First Line"
msgstr "Prima linea"
#: global.c:263 global.c:280 global.c:296
#: global.c:263 global.c:283 global.c:302
msgid "Last Line"
msgstr "Ultima linea"
#: global.c:266 global.c:283
#: global.c:266 global.c:286
msgid "Case Sens"
msgstr "Case sens"
@ -347,15 +347,15 @@ msgstr "Case sens"
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:970
#: global.c:276 global.c:295 global.c:305 global.c:321 global.c:325
#: global.c:331 winio.c:969
msgid "Cancel"
msgstr "Cancella"
#: global.c:286
#: global.c:289
#, fuzzy
msgid "To Search"
msgstr "Ricerca%s"
msgid "No Replace"
msgstr "Sostituisci"
#: nano.c:111
msgid ""
@ -671,51 +671,51 @@ msgstr "Ricerca%s"
msgid "Search Cancelled"
msgstr "Ricerca annullata"
#: search.c:140
#: search.c:143
msgid "Search Wrapped"
msgstr "Ricerca interrotta"
#: search.c:190
#: search.c:193
#, c-format
msgid "Replaced %d occurences"
msgstr "Sostituite %d occorrenze"
#: search.c:192
#: search.c:195
msgid "Replaced 1 occurence"
msgstr "Sostituita 1 occorrenza"
#: search.c:210 search.c:232 search.c:255
#: search.c:213 search.c:235 search.c:258
msgid "Replace Cancelled"
msgstr "Sostituzione annullata"
#: search.c:228
#: search.c:231
#, c-format
msgid "Replace with [%s]"
msgstr "Sostituisci con [%s]"
#. last_search is empty
#: search.c:253
#: search.c:256
msgid "Replace with"
msgstr "Sostituisci con"
#: search.c:294
#: search.c:297
msgid "Replace this instance?"
msgstr "Sostituisci questa istanza?"
#. Ask for it
#: search.c:359
#: search.c:362
msgid "Enter line number"
msgstr "Inserire numero linea"
#: search.c:361
#: search.c:364
msgid "Aborted"
msgstr "Operazione fallita"
#: search.c:381
#: search.c:384
msgid "Come on, be reasonable"
msgstr "Avanti, sii ragionevole"
#: search.c:386
#: search.c:389
#, c-format
msgid "Only %d lines available, skipping to last line"
msgstr "Solo %d linee disponibili, vai all'ultima"
@ -742,54 +742,58 @@ msgstr "File: ..."
msgid "Modified"
msgstr "Modificato"
#: winio.c:886
#: winio.c:885
#, c-format
msgid "Moved to (%d, %d) in edit buffer\n"
msgstr "Mosso in (%d, %d) nel buffer di modifica\n"
#: winio.c:897
#: winio.c:896
#, c-format
msgid "current->data = \"%s\"\n"
msgstr "current->data = \"%s\"\n"
#: winio.c:940
#: winio.c:939
#, c-format
msgid "I got \"%s\"\n"
msgstr "Premuto \"%s\"\n"
#: winio.c:965
#: winio.c:964
msgid "Yes"
msgstr " Sì"
#: winio.c:967
#: winio.c:966
msgid "All"
msgstr " Tutti"
#: winio.c:969
#: winio.c:968
msgid "No"
msgstr " No"
#: winio.c:1105
#: winio.c:1104
#, c-format
msgid "do_cursorpos: linepct = %f, bytepct = %f\n"
msgstr "do_cursorpos: linepct = %f, bytepct = %f\n"
#: winio.c:1109
#: winio.c:1108
msgid "line %d of %d (%.0f%%), character %d of %d (%.0f%%)"
msgstr "linea %d di %d (%.0f%%), carattere %d di %d (%.0f%%)"
#: winio.c:1233
#: winio.c:1232
msgid "Dumping file buffer to stderr...\n"
msgstr "Copia file buffer sullo stderr...\n"
#: winio.c:1235
#: winio.c:1234
msgid "Dumping cutbuffer to stderr...\n"
msgstr "Copia cutbuffer sullo stderr...\n"
#: winio.c:1237
#: winio.c:1236
msgid "Dumping a buffer to stderr...\n"
msgstr "Copia un buffer sullo stderr...\n"
#, fuzzy
#~ msgid "To Search"
#~ msgstr "Ricerca%s"
#~ msgid " Y"
#~ msgstr " S"

View File

@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2000-06-23 02:43+0200\n"
"POT-Creation-Date: 2000-06-28 21:18-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@ -32,7 +32,7 @@ msgstr ""
msgid "Read %d lines"
msgstr ""
#: files.c:211 search.c:126 search.c:144
#: files.c:211 search.c:129 search.c:147
#, c-format
msgid "\"%s\" not found"
msgstr ""
@ -227,7 +227,7 @@ msgstr ""
msgid "Cancel the current function"
msgstr ""
#: global.c:146 global.c:256 global.c:322
#: global.c:146 global.c:256 global.c:328
msgid "Get Help"
msgstr ""
@ -235,11 +235,11 @@ msgstr ""
msgid "WriteOut"
msgstr ""
#: global.c:153 global.c:311
#: global.c:153 global.c:317
msgid "Exit"
msgstr ""
#: global.c:161 global.c:252
#: global.c:161 global.c:252 global.c:273 global.c:292
msgid "Goto Line"
msgstr ""
@ -259,11 +259,11 @@ msgstr ""
msgid "Where Is"
msgstr ""
#: global.c:181 global.c:303
#: global.c:181 global.c:309
msgid "Prev Page"
msgstr ""
#: global.c:185 global.c:307
#: global.c:185 global.c:313
msgid "Next Page"
msgstr ""
@ -331,15 +331,15 @@ msgstr ""
msgid "Enter"
msgstr ""
#: global.c:260 global.c:277 global.c:293
#: global.c:260 global.c:280 global.c:299
msgid "First Line"
msgstr ""
#: global.c:263 global.c:280 global.c:296
#: global.c:263 global.c:283 global.c:302
msgid "Last Line"
msgstr ""
#: global.c:266 global.c:283
#: global.c:266 global.c:286
msgid "Case Sens"
msgstr ""
@ -347,13 +347,13 @@ msgstr ""
msgid "To Replace"
msgstr ""
#: global.c:273 global.c:289 global.c:299 global.c:315 global.c:319
#: global.c:325 winio.c:970
#: global.c:276 global.c:295 global.c:305 global.c:321 global.c:325
#: global.c:331 winio.c:969
msgid "Cancel"
msgstr ""
#: global.c:286
msgid "To Search"
#: global.c:289
msgid "No Replace"
msgstr ""
#: nano.c:111
@ -661,51 +661,51 @@ msgstr ""
msgid "Search Cancelled"
msgstr ""
#: search.c:140
#: search.c:143
msgid "Search Wrapped"
msgstr ""
#: search.c:190
#: search.c:193
#, c-format
msgid "Replaced %d occurences"
msgstr ""
#: search.c:192
#: search.c:195
msgid "Replaced 1 occurence"
msgstr ""
#: search.c:210 search.c:232 search.c:255
#: search.c:213 search.c:235 search.c:258
msgid "Replace Cancelled"
msgstr ""
#: search.c:228
#: search.c:231
#, c-format
msgid "Replace with [%s]"
msgstr ""
#. last_search is empty
#: search.c:253
#: search.c:256
msgid "Replace with"
msgstr ""
#: search.c:294
#: search.c:297
msgid "Replace this instance?"
msgstr ""
#. Ask for it
#: search.c:359
#: search.c:362
msgid "Enter line number"
msgstr ""
#: search.c:361
#: search.c:364
msgid "Aborted"
msgstr ""
#: search.c:381
#: search.c:384
msgid "Come on, be reasonable"
msgstr ""
#: search.c:386
#: search.c:389
#, c-format
msgid "Only %d lines available, skipping to last line"
msgstr ""
@ -732,50 +732,50 @@ msgstr ""
msgid "Modified"
msgstr ""
#: winio.c:886
#: winio.c:885
#, c-format
msgid "Moved to (%d, %d) in edit buffer\n"
msgstr ""
#: winio.c:897
#: winio.c:896
#, c-format
msgid "current->data = \"%s\"\n"
msgstr ""
#: winio.c:940
#: winio.c:939
#, c-format
msgid "I got \"%s\"\n"
msgstr ""
#: winio.c:965
#: winio.c:964
msgid "Yes"
msgstr ""
#: winio.c:967
#: winio.c:966
msgid "All"
msgstr ""
#: winio.c:969
#: winio.c:968
msgid "No"
msgstr ""
#: winio.c:1105
#: winio.c:1104
#, c-format
msgid "do_cursorpos: linepct = %f, bytepct = %f\n"
msgstr ""
#: winio.c:1109
#: winio.c:1108
msgid "line %d of %d (%.0f%%), character %d of %d (%.0f%%)"
msgstr ""
#: winio.c:1233
#: winio.c:1232
msgid "Dumping file buffer to stderr...\n"
msgstr ""
#: winio.c:1235
#: winio.c:1234
msgid "Dumping cutbuffer to stderr...\n"
msgstr ""
#: winio.c:1237
#: winio.c:1236
msgid "Dumping a buffer to stderr...\n"
msgstr ""

View File

@ -76,6 +76,9 @@ int search_init(int replacing)
return 1;
} else if (i == NANO_OTHERSEARCH_KEY) {
return -2; /* Call the opposite search function */
} else if (i == NANO_FROMSEARCHTOGOTO_KEY) {
do_gotoline_void();
return -3;
} else { /* First line key, etc. */
do_early_abort();
return -3;

View File

@ -474,7 +474,6 @@ void clear_bottomwin(void)
mvwaddstr(bottomwin, 1, 0, hblank);
mvwaddstr(bottomwin, 2, 0, hblank);
wrefresh(bottomwin);
}
void bottombars(shortcut s[], int slen)