From 8c2b40f06c23d255c3ecdae145645d5763216afd Mon Sep 17 00:00:00 2001 From: Chris Allegretta Date: Thu, 29 Jun 2000 01:30:04 +0000 Subject: [PATCH] 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 --- ChangeLog | 9 +++++- global.c | 12 ++++++-- nano.h | 7 +++-- po/cat-id-tbl.c | 2 +- po/de.gmo | Bin 15478 -> 15478 bytes po/de.po | 78 +++++++++++++++++++++++++----------------------- po/es.gmo | Bin 15698 -> 15665 bytes po/es.po | 78 +++++++++++++++++++++++++----------------------- po/fi.gmo | Bin 15222 -> 15186 bytes po/fi.po | 78 +++++++++++++++++++++++++----------------------- po/fr.po | 75 +++++++++++++++++++++++----------------------- po/id.gmo | Bin 14984 -> 14950 bytes po/id.po | 78 +++++++++++++++++++++++++----------------------- po/it.gmo | Bin 13146 -> 13146 bytes po/it.po | 78 +++++++++++++++++++++++++----------------------- po/nano.pot | 72 ++++++++++++++++++++++---------------------- search.c | 3 ++ winio.c | 1 - 18 files changed, 304 insertions(+), 267 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3a9e3dbf..3fd79c67 100644 --- a/ChangeLog +++ b/ChangeLog @@ -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. diff --git a/global.c b/global.c index 416c0398..c0afedef 100644 --- a/global.c +++ b/global.c @@ -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); diff --git a/nano.h b/nano.h index 774a1613..03461912 100644 --- a/nano.h +++ b/nano.h @@ -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 diff --git a/po/cat-id-tbl.c b/po/cat-id-tbl.c index e26ff7ea..e24601e3 100644 --- a/po/cat-id-tbl.c +++ b/po/cat-id-tbl.c @@ -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}, diff --git a/po/de.gmo b/po/de.gmo index f93ebd65d7240fbeed4129a29a89d83719842171..2f4c56f8dabf4ddb873fb4715a798724f7a95f45 100644 GIT binary patch delta 23 fcmexX@vUOReq}BT1tUW%LknF4lg%fU*Gd2Ycq|Ca delta 23 fcmexX@vUOReq}CW1p^~16Ju=yqs=Fk*Gd2Ycc=)! diff --git a/po/de.po b/po/de.po index f1331cd8..7c60bec0 100644 --- a/po/de.po +++ b/po/de.po @@ -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 \n" "Language-Team: German \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" diff --git a/po/es.gmo b/po/es.gmo index 0d147c6b65bfa7e5e6cf5120a1155995952da8e8..9d21e2cdbd45fe88a41349673f6065e012008b0d 100644 GIT binary patch delta 3114 zcmXZddu+{T9LMqRuT*>5(}U8MYUij!TXi|7I=!f!x`idy4OwiA7!$H%W{Zhg*26|J zBFp&MCDzWETh*-&V;BESCK+MFkcBQI5hIh0kg3_S_owG4{hinIJm+_w@AvsW&+q5l z^48_?U$Z-ZX#8vCD&X3dYW61%&g6rCzX#0v;!V_$udCSr%)ufYi4mNIA^ZR<@GzF* zEevDNZe{~E^pIrJyNDQk+O<0fo z*&IIf{adKSHlQZng-l@wz3)$YUPV>x0rtisKH~jp)Y8zN%trO!!9lnKRhhG>6+OUo zwESdAeW=81QCl?@Rod54EByo?!zR=j`W6-E3aTRiqE2}| zs?^g_rCo%>a22ZLhp+@sp|<88>dg4aUV$U1g;evQ#HXPGE=DbMIdaZzU7UsjG~wfz zKxKRr^@F>p6+J=)OrxIqK8)JqYE(rgqbl$cYLDZnt!zf!cN(?O>!`pEWzbf{vuP+m z1#03bD)2;1!6~S{eHO{VR-q=?in=d>`u#Dle+vEdFQ6)M4VB0(uOA2|E0Bxi61Nf> zD(M8&4`-oD6hn=_jVkd*9EHuO1a6?t#skz!()iEzMq3iJcdK{ z{J%j%E8T|Lf}N<0+fYAnc+HWiWnf1DRN!*d#G_GxCgBi#234^JEWy2~Exw34tbbrB zb|FZB_!g!?EQ=ylvKLV+T#3VR18U+E7psQU)+tf^w-QQuF&GF*ZB-5%8A`x_3z zG&&Vnj+Hnc;~LmZBZNPr4oN$X#2k*aCZ3FAFpeYeI}BnwYK!t&W&|Us70=~E_pifh z{1LTvK9)TgC!i|5q*VJ)V>bhu;5@3IO1d;{C~Bq8p&q|w$YN|4lB1nLC43*XqV6nz zQ70Z_RN$lRgPxANn2xDTqOAyEDu#wpe>Da%&;`TD_E;tA2h&lH)m-#p11f>{kj2|R zuYVC$$w#OPMZ(Gc0!*XdgsSj%RK-rB61f_up$Y#+9gafE!1h`tDv=q;;;aF+CC#V` zT}MqEC{HGqi~L!T4<$YoRq7W|XKM{=p)IJ2wxZ^bpQWLd+(Rm71)Ln+7(^vB5VaL` z-uTOyL4Psoeb9is{Hzf*;a8}qLshZ@`95w>&xq3)E2uyPn94_YT#L%Q5jEis)YEau>t92a_BN_A8JtK3DnnJc9<{KgsP8wS{{OL~ zG!*axs?_&T&-G(f$v|bOy{^U-9F5xBai{>Vp%UMSDseM*!-J@Vk7HLn?e*JGmAHX% zt)w&0iYDla$}EIB^LE@cz0x7az*L2$-a@DmS;bk~8CB&9xSHHovidupyX&)J&K~#Q ztUPCzn-i#X4!BPR@|>;iyueszr`sHu;Cz<26Ih*{SkdqMl#Hrid88&%H6&b-csevX LH}P@JH!1%EE^$k+ delta 3141 zcmXZc3rtpJ9LMqhL6F+Uon`J&bcc&vV{$p8x;(KhHS_8qPNa zF2{wwVf-EBNaffYW_A-xqB-&Rx8E!c@1ZUwcQfmYeX%!=!GX8{GjRtN;t9;b`sXAjv1X584L*oVFdjE!KDMF)T)|3=iVFrFhlA;_ zLIpg6`S^p^Ph=3qDZy0Y+YB1IG0=IztOc{^cc21a$8?NLFiXT-)C?=o>0(xoMf4XZ znNcL$kKuR}dDKoKx7h^@#mg9pKVlN`?FNmm7)Cu((1*Gq8+%|r62q!d15QW&t&Wp^ zUyDkt3H97Z$dGo-`~8CFZB)e~l37N~=M?BeqlSjo-8LcO(d!SR<$?lELGAMCs8Y{G zm3BD}z)h%C9N z94hc+48a+wwVj3JWSdX}97NsMfqMR|*T0B9`ah#8aR-&ieXrjuJy?N$NG<^zLPI5; zgnDoRszggr*Iz}IxEV|FFe-t&sJ#)vG&GYWPMW|_0(T!*@EX=guR zwwi`!xE?j*qo}3$6qWg1)B`De?#S3OQT>sq1Zq$LrlJBqjSu5o)VPh9jh~^G`W9-_ zc4hD!;#)cm4Kx~wWmAx9*%H)Dw_*YAMGbrf^BkVZ4Bl7HJEzJ$h5G$j?2lVe&z(fQ z#`iH7Gw2jz4F-y6tne-zM#i*1P@5&5Ejy^dYRxVf|I=*SMeuj-v*+;q}udxQ?2MpB+QxY%uD^ zVpKvEsHJ$qyS@se=&wP27aEa|p|zvN`x^DO{DlgfNEvj05h}4NB;kOKrJ)-pV>&jV zZrqBhKnrR~PGK~j!+5-es@!eVW(;Q|=~G*VN??-LZ$SRd<)m@HKqdMO_9njFrlHp- zfl>6S%)kU3ikiV#CzV!P4qDmXiPE=*GPzhC`Dm(`@u?_m2 z`1T>#@8FdaejnfihHuYEg+igIe09 zsEWOU`XsOOJTmO@;A`|77ZUj)z9cxa9Mlq2p=SOZDv{;b51UZ|P9q!KE@L^ymAbjn zW0SYg)Z;2*=lrmOW2^gmbc(arZH-QIK5)-Qmxt}=>OMEtSLD3wR{OFBHqlp!HTXP^ zcQ{sYutz&To!gM@VS6|fc!#^wmlgRwEnWj_cF*~eoVVO-zH;ZFn-h~2)529%D3xQo z`(#WXXQ#U&W}egP-iS$Z-gCqJMa}`Y)Su++awqynI=kJ?{zsj++phXo$A!(Rt(!Tg ltv2ISNK`?3UVd?5LI1q`wn3T0dxVatUpTXEVe!$B{{hBqP}Kkc diff --git a/po/es.po b/po/es.po index 699261fa..a4268dd1 100644 --- a/po/es.po +++ b/po/es.po @@ -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 \n" "Language-Team: Spanish \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" diff --git a/po/fi.gmo b/po/fi.gmo index 29240cf921d50cb304b212313e2ccd07383d47e3..36cb8b07788b17876017beccdf46552e3586fabe 100644 GIT binary patch delta 3113 zcmXZe32YQq9LMqhENshe+XZ@1S`Z2aN-L$irPAHnrb;m!K|tj23Id@)Q$!?42p)?F zMiUWX1U#rninaIG(8L6jqJ|?i7>-DzB4{*%m|`mN`|A$bna_J~X5Rn3|9dm# zpEak~#4l#{-ERDA=NQVd*KhVGj!Wajzh6UU!|@8LDbU|+H0Iz)yb~k15J%zbSb?8n zFAz9D!Lm8rs^wfJVFn z6Q~hiK|OE{HKQI>z*O?7>tWOy$50u$50!zXs5OqGma-Lf-?ylV{)`IjkOnP9Jd=U~ zRG>PpMFpOUKAeME+j+JsK_25EOiW*Su&!JNM2G(FJY5|RL6It0?oiuoQ=xZ^Eeg{qL%o3)Mou1 zi!p^DA>vz@0uU2*&($OQ&^BQhn{X7K z@#@{k&x(1cC*mxOkE8Gs1$B@>rTh#=@hX;JAzOPc&cr%wM(u^msJFz=G&SQqRDh{i zg)2}4ZACrTi5gfQ)1QRXi^;zlHq$^~b_|v3Uyz^qiLQZ_A!D&ws2Q$74ctX#?n~5+ zy0G3y0HUfMCv8goVbp8=4QdI_VhUa>jVIUiCJjLvd`v@|Z2;eaijw_iRU8fXypd>QKbX>khNV~?R`xD#1kJBG?k7m_v0qEdm? zsP?Bg^}{CAz}ip&5~!JVqB3+I^?V?boKQI`a3$*g_`;_aGCFTPp=Ua1s^Z1}fz}s3pke z6;KNEP+zbjRKPl<16zz)_%gEmwhIT~*QiXMMNOy&wYhzyQSEsc)capUA&Z8osKAe) z0<6Yb+=l(}G^*n+%*5-cfGK=5v=kB4b5*D{egL&uS9xynt{?EOcSz#fPhP_<)ax>s zt*hNS88!3So(qx9ZI2^ATh2+Ft{JryU!exli5l=lRLcMGu6Ls*5UfmQVhF~S@^T7# zAm&||hPl)iVK%Ns&1f@f<}Ij>K1037Cs5Ca_-JTv3`2d&OHl);Lj7@?jM@v2q9(R1 zO8(WbiUzIGI#dSMqt^Za&cJrB{g&5W5=;K)vkW!kIjDg?jLO7HRDTtRvq*pro+y~Q(B73N7?F4S@pilI=|zE7N^CxBb}yypI=kGP>9tO~8_Oulc%N3SsP`$R^e^Pamkqro}g z{+E&K?00iQmCi@*y`fyE$*m97IW2B$Xo~Z0;;+!A%*6T;9ll_+pgd9)iI#>d5_3mI LvlBa_Kl=U$swPXw delta 3145 zcmXZddrZ}39LMqRK@M^`9Oa-K2@(X9i($w?L6V_jGn8UY&0NY7G;fMX8*9Bkp5yqP*Yo_&d7kh0`99C@=TD7y z8-rJUkslfVj&h}PwYbf?acmqP{JZZpOT!1KTgm;*hT>4nz$rKqmtYp|!6H0|x%dzZ zFsr}WFr1DeO?(?mF(JWh1XkhW*o29=4GXaq72q09#8_V_a5avm zzZMnnBo^Wy;r>7-QJk@uN_?xOp&tex-7wpa+4S2{fp23v#tbkUh6^MY6-#7tbI=?L6``yM&Q=6=U!^`iXB{G@{T=JyOtv`aupRVIdO3Dp3>GAb(cR zhrZu{N^Bo$+}FsI_D%TvOJV;(RV+H0ZNx%8f|)d`XlPHCqWYUL509ZL(}`M9^kZDu zA63$1RN_^rt(uA|?Hbfd58_~KMV+DVQE~2|D&kF{{%#sRmd!TWAXLfoP!l|ZD(SOG z@-_?EMq3{4uSasTy~vz)5@YcN5JCO4A`dE{ANBn>)E-x&Dl!LEfdOS@GJ5FWL{*{(mB_hA8f>uI9 zC7pp9xCB+ACe;1+P$h20GCYAw;2!F1M6(R7#LtHoFb4U`CZG;k9V)^3sD$fLzgzjJ zA2eG>Lo3{bTJagwR-8p;eh)Puh1VS!TNbKcfl8nX72qXQz*jII7oq0;7<2GD)K>qE zI;8YFrRGm$n-V z@D%b>>k9XMJkvC-0)wMzETr)S?m;;pF4 zT|zCW7w1I~fT-$kqiibu1=QpHCu$3N@`Ir_n1{5Zxsiymn2I`dd8qe7IqET*h<$Mu zYJ$0_L|29TJ5h-qN0t2daK9HH&C5$fiDsk5R|aWlf;!|kwg$DrBgi(}MO0;ak*Zlf zog#bzb$M0ABQ90;ZtOLOyEmr=TjZ41Ks2mEa+a!6Tu5&`#3OirY~G{z3)l$B|db zlTceQ0#(8Q>Pv6cd=n<(K4kmt81~0bR3&>*3reDVI^3z4$@#MY4NW`)6R{Q* zxDgfLeJsZo?1y(y6ZfJIV|iI9U^;3mrl7`6L+x=r>acDMdno+|>a^CN5?mDa4dig!+sL22!-o#tY1CF+K_$|SO87pi=CV)c71;8af*#=)p;-1g4?>ld3_Tg*Qv6 zzgD(7{DY0*FSergY8R>!&8RbQ0ju!W@coQ2q5IEa2KT3;R^Et8IEbpq7Sw$Ekz!a2 zQf#|EraJT(CG(mZ$c@REj4z{JJS$KWHKPvE3DjeB1-0_1r$T%0N6wc`aB}0SlRu%Q z(K-cM-a4*vT-%)w<5FBLPHSA6>no=tuH1c?yI(p9o?_Plr_z%>avy!2K~;A#*JoU7 zxs+@f*A6a\n" "Language-Team: Finnish \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" diff --git a/po/fr.po b/po/fr.po index 4ff217fc..9e173812 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-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 \n" "Language-Team: French \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" diff --git a/po/id.gmo b/po/id.gmo index b7a4648b26cac54ea6f54447f33dd1a7fad54268..10e24c97b45f788bc0156f66b09e91f7443a99a3 100644 GIT binary patch delta 3039 zcmXxm3rv+|9LMqhA&v@%iy(6IcI-%U5K-WufTpE(adT-}l5W-%SIp+7nRC|QHN3>M zY4vK}P|-9M%Po&)S!v>|ES)o1b82cfS*E1a%*<+ifAYr8dp^(eUY`H|`9IHlM%~<& zmz@i#v8#-~-5lLH-te1U#lPeE;;$jetQT&^03OC1Jc0M)@7M>^lg%PH1j9HB2jV(> z0KdiF_#0+oT4%FjGspVV(12619AC!*Y{DMchFvf@#jFTJr~ngj6fQsoK8l0zFI2$7 z)b{(ILG_oR;_N|9^vu2Uj@d2mM0cX}0}a>XV#MiO-=*dIJZbpPiyo zmS8T9K`qH#)LvPN3cLq3fdi<-&!7Ufp(c12*~b>oO&Y%^mSDu8p^Rss9+-ogQ8g-H zop=31)Y=|ERpdKV1+JjhR`u4J=ArI;0-1w7j|yCiS^^g}{ytP(=L;GNd<fg7)+o)5mkvwR3a~W{S~MRtVV{kov4a_jXdYrMel~|-i3cr zCGHwDdl2(b2~?r>#(dOF>QFOiL_QYfOPi}1mEalF^`B6QUq?;s57b0+7^H;wmPgbH*5HQ*`CMg1IVZNsQdIvm3|3HAI!;g{i+vvWgRBxF2<68}hMiveD}_3N_FaJQriO((BKnT-qz!F&;nj`d^`+ z{(0<#moW~npaP>YETjeqA*)~osKlN`s%vwQn6?I$*b!8st*C+1`LWQN z2T=)?qh8Oks3n?#+EeeKp4;bn!J(mnJF-xPScD2N9hJ~>4B%QMmTg1LtQnQ)SyZ5Z zyz`k1qJB@*>sy8@c?IgZd7jm%M4g2+G|(FCjGv-rejN2f@++!B9au2!g>2OMLR5mI zQ3F??eg~$Y-hvsZ`xl^=U^VKw28_jzk#QaSoQ8JgDbH3^1>%a^2P#IDZZs<6Dhy&Z zsxliO#H14e_vW#{X6(GQt?}}ke z#o?#~#-j$PL?t*AJK`&tjdUl0^CLQlLniO#31VY zbW~~QVLGnFdo#fd`ukD8h$m5rokk_}18R?4L4H!~CTi_7O8F-RyO&abmHKIVdY~E= zU@>Y2^{5$dK@Ai|UVl4?yf}6kd6lgVRjFPqtSVQ6+Cvji6R1YLc5kAV;uF-k7t8pG z6g@~uXlY+d}*+#u)MIe|G-Fe NduT#hG^TV(%zwXJN}K=y delta 3065 zcmXZeZBSHI9LMqhf-4WpDvKgMq%0x=Vn{5CY(k@;L!;JAHsjckNtCJ83q-@|!7a7v zfzWg@@exf;Q&W^|)E71y_QFXGW~_`TQ-?Grdy$cuj(vaZW%l0BIp^Mc&j0++xp(MV z^6t{m&q;mO8-Is59^hzjo87l3#8;qkcU>34s3hJ;LgSY{6u^oq_%V#zKQ!yU{r~&3<8GeWw_##fg_@u~y zlTr6CaO#^;rXDs{J=>pm(9 zEDQBq33AEGQP0nFtVLyPH4edJn2zlj(wg)*4THHlhWaGbn!SLU(Q1svk1!vburIcw zmg*8JwXs7ZGtI>j)B~u!^8{*~#i)!lpc@;9vi>ZaZKFXcZ$_o^JQ9<2BFkhwPCbq^ zF_w))nrsrr<7`x*&!Pfdgnq0+1<-)X(C5g{PIA(c{5XvKYghk5gHqg$O6h$ZhskUV zrE)4}VFhYQ-bU?}O{jrSqb6_`75H`3fG!#}K@YN@Z8)m`TpW*OAqtB4Rn!A3Q8TJX z4cO>hKZRP`v#5+*L1o}?)Y>MJZ>?z%b>CcM4)zLa;B}}a*oo@@3~Joaw-hw+C5*zW zs5R|E`nF{9rw#(B`^r!qJm%CZFoF7fR3>UrfxPC_n@}0pgLG-fQ5pRKc`jssIyc;P zF7)$9Qk;Rs+!#a!une^~-b2l#5jBGo$j`pwq|J2=72tJLz<;6cyXVyV@~|eDh*6Ah zk5JHBOhHAy4E4YkRK&ZTdMhe`bEpA+LJjyEs>5!~!l8T?wZ^5W%{m9Ou?F@0R^(PY zfT@gc=P780H!*-roU7o{9Yc>m&sYR#(w&PShhx#rIVESb^4K?FB zoQ6kn0^UV_7T}^LRFO^o_2BC?C?$um2-{FMdWedm6`)?Lxu}k6u_KBvrBi>Obm_G` zh4J{EQ~wp+)O#=%?_wOfSuefr{d38`Zb)|;vQZrrBdcKLsK8!CvTXIpn05peSSKpb z7(N#2I1jbvK~z9bqF&R5s3ls3+EdM_=Prbt!fjN?X)M%3I0H4na#TQjQ6H)nWK8=K z75Gh5ptn#1rSP!Y^HKGQsMmNFD&^JA^|g+n4HOjVR#ZnvFcB}JX5NMRpv1CHN|_(E z7Yb1A(@_Cdp$4u-eGh6;Z^0_m{hLrra2WO63GAcyzny|Q{vNd}yB%ZL%E~}Gs-u~x z)K#GZUV(nxfXd7<)E;R?zP{Fp{qPRz{f)Aq$BLgI( z>RDKdL8pB=Dz$5I5FW(dnP3X_Hq;mK1}d;WPyzkpcptS_VkSoZzet)${@DapL<2u7 z;iQz;q8@BQ4YUU}lar{Kx1u__h*C!PEw$i$ZV+hAv9NWU3 z3Bz2Uh5t>+bnOkNc{AOcY26>5>CJQ<3@`PLbL|T6_U5>@hub)R(sIxHdy@P4%EeU+ jTCVtaM8yaEdHKPDKu%tMOMUvRfzef!i(5Jh>!SV#UK>#U diff --git a/po/id.po b/po/id.po index 88d7928a..b48bf523 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-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 \n" "Language-Team: Indonesian \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" diff --git a/po/it.gmo b/po/it.gmo index 6a09b5a34b139b7376a316f5d570b2e5a4a25770..8c8451f7a070a45bf2e0b9c5e9aaaa6c69e77acd 100644 GIT binary patch delta 23 ecmcbWb}Mazu{@WBf{~$>p@pu2$!1%5SrGtY>;}95 delta 23 ecmcbWb}Mazu{@Wtf`O5hiLthU(PmqDSrGtYXa=wV diff --git a/po/it.po b/po/it.po index d9601924..ac648b0a 100644 --- a/po/it.po +++ b/po/it.po @@ -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 \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" diff --git a/po/nano.pot b/po/nano.pot index b75c4188..4f002f2e 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-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 \n" "Language-Team: LANGUAGE \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 "" diff --git a/search.c b/search.c index 2c5a0aeb..c3630802 100644 --- a/search.c +++ b/search.c @@ -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; diff --git a/winio.c b/winio.c index ef217421..4bd23a2b 100644 --- a/winio.c +++ b/winio.c @@ -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) -- 2.39.5