From e34f84be19f4ff5c2ea7299ef9cfae0d450a6c24 Mon Sep 17 00:00:00 2001 From: Jaakko Heinonen Date: Wed, 21 Sep 2005 16:50:31 +0000 Subject: [PATCH] - spelling fixes (Cedric Duval & co) - remove dead code (Cedric Duval) --- abook.c | 4 ++-- database.c | 2 +- filter.c | 6 +++--- help.h | 12 ++++++------ options.c | 4 +--- po/LINGUAS | 2 +- po/abook.pot | 4 ++-- po/fr.gmo | Bin 12355 -> 12248 bytes po/fr.po | 6 +++--- po/sv.gmo | Bin 11375 -> 11271 bytes po/sv.po | 6 +++--- ui.c | 2 -- 12 files changed, 22 insertions(+), 26 deletions(-) diff --git a/abook.c b/abook.c index c2367bb..daffe43 100644 --- a/abook.c +++ b/abook.c @@ -407,7 +407,7 @@ show_usage() "add the sender to the addressbook")); puts (_(" --add-email-quiet " "same as --add-email but doesn't\n" - " confirm adding")); + " require to confirm adding")); putchar('\n'); puts (_(" --convert convert address book files")); puts (_(" options to use with --convert:")); @@ -737,7 +737,7 @@ add_email_add_item(int quiet, char *name, char *email) do { /* TODO gettext: handle translated keypresses? */ - printf(_("Add ``%s <%s>'' to %s ? (y/n)\n"), + printf(_("Add \"%s <%s>\" to %s? (y/n)\n"), name, email, datafile); diff --git a/database.c b/database.c index ef4b67b..092f563 100644 --- a/database.c +++ b/database.c @@ -403,7 +403,7 @@ sort_by_field(int field) if(field < 0) { field = name2field(opt_get_str(STR_SORT_FIELD)); if(field < 0) { - statusline_msg(_("Not valid field value defined " + statusline_msg(_("Invalid field value defined " "in configuration")); return; } diff --git a/filter.c b/filter.c index 4b5330e..1d93d62 100644 --- a/filter.c +++ b/filter.c @@ -71,7 +71,7 @@ struct abook_input_filter i_filters[] = { { "mutt", N_("mutt alias"), mutt_parse_file }, { "pine", N_("pine addressbook"), pine_parse_file }, { "csv", N_("comma separated values"), csv_parse_file }, - { "allcsv", N_("comma separated all values"), allcsv_parse_file }, + { "allcsv", N_("comma separated values (all fields)"), allcsv_parse_file }, { "palmcsv", N_("Palm comma separated values"), palmcsv_parse_file }, { "\0", NULL, NULL } }; @@ -213,7 +213,7 @@ import_database() if(i_read_file(filename, i_filters[filter].func )) statusline_msg(_("Error occured while opening the file")); else if(tmp == items) - statusline_msg(_("Hmm.., file seems not to be a valid file")); + statusline_msg(_("File does not seem to be a valid addressbook")); refresh_screen(); free(filename); @@ -323,7 +323,7 @@ export_database() if(selected_items()) { /* TODO gettext: handle translated keypresses? */ - statusline_addstr(_("Export All/Selected/Cancel (A/s/c)")); + statusline_addstr(_("Export All/Selected/Cancel (A/s/c)?")); switch( tolower(getch()) ) { case 's': enum_mode = ENUM_SELECTED; diff --git a/help.h b/help.h index dcc031e..7de967e 100644 --- a/help.h +++ b/help.h @@ -11,7 +11,7 @@ static char *mainhelp[] = { N_(" ? help\n"), N_(" q quit\n"), N_(" Q quit without saving\n"), -N_(" P quit and print selected item(s) to stderr\n"), +N_(" P quit and output selected item(s) to stderr\n"), N_(" ^L refresh screen\n"), "\n", N_(" arrows / j,k scroll list\n"), @@ -22,7 +22,7 @@ N_(" D duplicate item\n"), "\n", N_(" space select item\n"), N_(" + select all\n"), -N_(" - select none\n"), +N_(" - unselect all\n"), N_(" * invert selection\n"), "\n", N_(" w write database to disk\n"), @@ -37,14 +37,14 @@ N_(" s sort database\n"), N_(" S \"surname sort\"\n"), N_(" F sort by field (defined in configuration file)\n"), "\n", -N_(" / find\n"), -N_(" \\ find next\n"), +N_(" / search\n"), +N_(" \\ search next occurrence\n"), "\n", N_(" A move current item up\n"), N_(" Z move current item down\n"), "\n", N_(" m send mail with mutt\n"), -N_(" u view URL with www browser\n"), +N_(" u view URL with web browser\n"), NULL }; @@ -64,7 +64,7 @@ N_(" r roll e-mail addresses\n"), N_(" u undo\n"), "\n", N_(" m send mail with mutt\n"), -N_(" v view url with WWW browser\n"), +N_(" v view url with web browser\n"), "\n", NULL diff --git a/options.c b/options.c index 8a0f7e9..0783173 100644 --- a/options.c +++ b/options.c @@ -189,10 +189,8 @@ opt_line_remove_comments(char *p) for(; *p; p++) { switch(*p) { case '\"': - if(!escape) { + if(!escape) in_quote = !in_quote; - escape = FALSE; - } break; case '\\': escape = TRUE; diff --git a/po/LINGUAS b/po/LINGUAS index dd08588..8a3cb7f 100644 --- a/po/LINGUAS +++ b/po/LINGUAS @@ -1,2 +1,2 @@ # Set of available languages -fr sv +fr sv fi diff --git a/po/abook.pot b/po/abook.pot index 99ac530..5a27fa3 100644 --- a/po/abook.pot +++ b/po/abook.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-09-17 12:43+0300\n" +"POT-Creation-Date: 2005-09-17 13:55+0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -154,7 +154,7 @@ msgstr "" #: abook.c:619 #, c-format -msgid "too few argumets to make conversion\n" +msgid "too few arguments to make conversion\n" msgstr "" #: abook.c:620 diff --git a/po/fr.gmo b/po/fr.gmo index e0bea311f1a82579d908085064eb984d83ede1f3..187f88765d702fb5029d0571b0e5134f9033f68c 100644 GIT binary patch delta 2439 zcmXZdeN5F=9LMqR%`0*rFhWrAM&2vgMd2zzXkJ3|DQ4Nk%vC@<*luQ+GYyMs-rAbQ z44PdP{<68+TA`aoTd{I&`LGH{P8u3*@z5VGmxjx=+?0BMmj$!Q1Kogqb*mH8_Tq zxHiKqiu-XfeuMdDNxMcPkAay}&F14GEW$?Q0&92u&rvZAp#u8D_5Z_M`aWit`8W+L zumsoR0(=W+Vz)bg21Cqm!!&q?-9W7vjGd?(dQcOeK|hY*UHB*JK>;q(eTBFb zD^UUL!72EmvkMh?H);!eF{u@f(kMhPdD9jYqi(EmK7(`UH(@%qyYUX^2e_W`k5PeK zM{Q9KQBzJbbjSPy@?oq!`dj`%w{}N3G-^T!bE$ zuN&@1O4T-^9++_b7A&XViX_EOp#mC2)$bS*iv=i3mD?QDbBdBQl#&NfkuP^A*5SSM z>rnyiL#6N-Dl=cAGSQE>0!7uMhuO5v5v2BQ9_oA?6~Jm#rfX5xC->5rPooP1IDoog z6qk6+E~8cwW%*&OK;2k}8sCiyXg`uHJBHk1-{Wrl9km6UD3lm}f=lo`QupjX%L_A5 zfx4g$7vsA)4^N`D;0h{3bD5oIS}7`(Rj3tJqwa6TTN%Pi`u(^LL*a>HZ9-+P6=V7a z9dQGLs2gu0+hw`Do(iA@^@i3WzxECXeH=eUJ*W?L-&JHT%V1Ce#ZX&Vi^bTEVf+^7 z;xI;--_m#*Uur8ro?&HJiceq|_aeV`goCR0Eb1#ggj#WsQrCoW)JnHt6nju_(+Fy7 zFQPK{w=~)$713#DAC}P{Kz)OP_e`A6L2XGMK8=N_iCa z4!Zs@dg=SPNDG-7CI4#Vxq%{Qx$|MvYw{GP;TF`2x1&;f2q)oL)sct&(2Hi+}YTYcr_f0 XJ(t+J-EXgiV_{$8wr$N@6FcmGv6=g= delta 2532 zcmYM$e@vBC9LMo5@k4&;6$KHYc+mJ|C3rC%(hy`q)55fATfyK;S1FWxy>N5Q>1{1) zE|=QHShKL-vf8YTw$?~yveqd1qbOI)>C8p;OU<=4vu5v4o-GE?>zwmE=bZ2Pp7T8V zP1{&|?98mBgT_xke+B$~lw|e^wxn_4C!A@PgWH|Y;2i2NV>Z6;+Q-pH{VdMJOZX7l zbh9RC!BTt!m*GiVU>38a8D=-rP=*V!5pT!s$OAU$>L*Y!T|xzP)zy8>nnyj)S%tHy z--~_>;3DkDxj5$TpT>OVx62e5%Q6XDE6PWLvq~(&TAYXN?*2~9rM}kE@uzUr@j+YanQ9NalVV|X#W5e zNE*>Ii8@X{p%(BbHevw}>G_Ua&VVM~L4yW<8du=!sFj{aMf@Xb zB`GX>DQ2ObzZ*Hi7DNpgb@e@1L;Xc0IrcRwpr29aS%;HYEI&p;=g*HC=q^-7?m!y#OV zBdC;3VFqR}i#q0Fbpn&2R@6coJdB|F$5HLWsKCaNKgM#rirR_=%&JU1h>UHWsEqcZ7Pb%7e-stauh@jCp4nP` zgYKiCQ~L@kg`=nr=TLQD(T$FNWc#cc6~Go$pa+m&JH|yH&9kU}iCi>c2{NaxL9r~wzDR^~@#tPXW3TTv@Ihzj74 za{@Kdb<{lbd9`$g)*?x;&KLy_vh8yoMWuWKH=s_KI&4H`CWQRjZY~Y@HY%`-s0ps1 zR$54<9;=YKEs7a<82J~+-a);Vu~7=^DV##BxSTvLz%@vdg^=yGmoN=apicEk)RtYq z>G+##zlM4(b2)h=(V9^i+<_YZ3D^D_rt7~cpHtA`I)&44TE&eolMgegm!LizRk$3R zQK{R5EATzkA-s$}EMYM9TUr@kopv!H9+mxy`(o13VY#T)O$GSg#(em jwy~k!NU+BXhoTWLxOsE1qc<9icv}PikI)_eu%hr^!A202 diff --git a/po/fr.po b/po/fr.po index 2be1a9f..3527cbb 100644 --- a/po/fr.po +++ b/po/fr.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: abook\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-09-17 12:43+0300\n" +"POT-Creation-Date: 2005-09-17 13:55+0300\n" "PO-Revision-Date: 2005-09-14 22:48+0200\n" "Last-Translator: YOUR NAME \n" "Language-Team: french\n" @@ -162,8 +162,8 @@ msgid "Cannot open database\n" msgstr "Impossible d'ouvrir la base de données\n" #: abook.c:619 -#, c-format -msgid "too few argumets to make conversion\n" +#, fuzzy, c-format +msgid "too few arguments to make conversion\n" msgstr "trop peu de paramètres pour effectuer la conversion\n" #: abook.c:620 diff --git a/po/sv.gmo b/po/sv.gmo index 9d57a5826a53b48faa416faaeb093476f4e0c9ff..7e79633c11d4d36a96bb29c8d61c313bcca24a24 100644 GIT binary patch delta 2419 zcmXZde@xVM9LMqZafsXndGRAWPVGQ`q3*UAE>wpe>4)OY9e>D_6GBQ2K{*S!%YlA#T-XhJW;Y>F0Lb2JY2-0jAPaUT6+7{Zg- zif3^h)@PfQYivkNp9GLU(z*-|XSW!QwAV12GXh>GbXDxjZS{|bibUvuUX zMK1jquD}OyIVN#F4!Pq;Fv9wFiUxCS8kNy35|f2UqX-vaA;wY1Td@GUTz{)`A8LV* zQI#A=1$NPmr`=|jLqCFd;Bw4mecM1onYCjCJ28q|Q4@wy3m?HCPU0f`8Fisq)Vv5M z--k7*0D5pPrkwAf0v|%%!ZGxe;SV$_@E_DIh*CdIOgNjdn0_l}VxJrDckaX{#@|8( zatU>d<`6a8$s(u(qWtK()y~yK5yfjRgeDhZWHRa}7T*P@E>D3YJ` zqN=$anPU4<+vW>Y;NRg|yo@@(ijx)iL#XR+#QQN>z#dSBqYNn0&rlgm;YvJ@nh+*^ zwx+E_U2v`IZ^BjdHzP%`cToY2q4w=05`#^nwwa$zsq18;DzVU`p~#EffxGb@`f*f1 z-Kf&-LRDffsuH7kBT&>nJde7)X{^egw;<|x1QkFTs?w`b=Xc^#^tRKug~q3-3CFR+ zXEuSFSVj6WffU2qQ5n9B%J@xGMhD#ZVcbZ69M|JwHb@yhk2Sa#%kdNvvuFRhfgIAU z=0F{Cz`Ae=ZbOxB6se*eMFl*COts&TulYzzwpI$Q3G-8-UZMH$@FzQ|%L|yPl=ULR_dJ&(%8B|7(@a!q`&8Xe|8ma=@Tz@}m z-mvqd66&vk!){>A`4wtYopAjr)bo1=Re@>rV`k~i1+q{TDnq>_D^cgwqY`XEZSGgF z8F!#6b*_~9YoebmnvNmVn<*dpS~)*Dz5%J8wW8kEeMr*wzHi(DBF$Ah)Sdi zRpAG*5xY^3>6ac2ZLSH_0)OBp4Dvozh8?Kq^l8k--M9`1QP1(6S)=tF3T7aWiQ=>&-ZkL&h zHYb+1(lw{+hnX?g)@3$Z%|e`+R$G6B<$`Frrm=MBiZ=T3{#*`&`#R^`=bZEXexLI^ zbT`~?2oHH&uN!_M{LSUB&t=R-tWDs9pQn3@qUIE;;W z2Wzl)hB0~g8kXUwm}^Yf+@q1rK*s&XEXGnSKp%2}>9PHfP%#ao0=jAY|KS|^3G6O& zF%?%}32wk8xF0hxYQMjVS?q6qrokF!0+mrB;S-Z_Fb9`lCf1|AZ^hZzW&201XHXmT zqbhkF70|dH_slfLL*I+@u>w=s-)y6y%z~JOd(pw8s0rs#8(&2?j^I2TMJ<%bMVjZu z3ami|@DfhLcdWgrz@w;Jcm>1C@E00hbWu0mf+Ez!Mr#v3K))5IV~-s_Vm*Ny7(ayy z0}6700d0I4bzZLH6m(N6C6$7zYJu&q zK^4W1Sf}3prXc{%4jRFO7Sx8F=-^>oiBV(;a}RYU z(s{M3a`Q0k&{#x68LmO~x1jbgs)^}az>3k&cAT!(|G4RaZc z1%g_5dqHGb!XI&mBl+&?xK|_X?u~Jg=ojw4l5+w9r`f;9@dbBuw);c7olwAO_qF<+ zra;HD{^0JGK%_78fU9KL(ubneS-mO6Rc&pd<_l+oPV\n" -"POT-Creation-Date: 2005-09-17 12:43+0300\n" +"POT-Creation-Date: 2005-09-17 13:55+0300\n" "PO-Revision-Date: 2005-09-14 23:12+0200\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" @@ -160,8 +160,8 @@ msgid "Cannot open database\n" msgstr "Kan inte öppna databasen\n" #: abook.c:619 -#, c-format -msgid "too few argumets to make conversion\n" +#, fuzzy, c-format +msgid "too few arguments to make conversion\n" msgstr "Alltför få parametrar för att kunna konvertera\n" #: abook.c:620 diff --git a/ui.c b/ui.c index b58ec59..e899be6 100644 --- a/ui.c +++ b/ui.c @@ -261,11 +261,9 @@ statusline_ask_boolean(char *msg, int def) switch(tolower(getch())) { case 'n': - case 'N': ret = FALSE; break; case 'y': - case 'Y': ret = TRUE; break; default: -- 2.39.2