Menu
▾
▴
abook-cvs — Abook CVS commits
You can subscribe to this list here.
| 2005 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(17) |
Oct
(29) |
Nov
|
Dec
(4) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2006 |
Jan
|
Feb
(1) |
Mar
(2) |
Apr
(4) |
May
|
Jun
|
Jul
|
Aug
(28) |
Sep
(22) |
Oct
|
Nov
|
Dec
|
|
From: Cedric D. <cd...@us...> - 2006-09-10 21:38:35
|
Update of /cvsroot/abook/abook In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv21035 Modified Files: edit.c Log Message: * Reorganized code. * Support for %I (ISO8601) and %% (%). * Fix for empty format string. Index: edit.c =================================================================== RCS file: /cvsroot/abook/abook/edit.c,v retrieving revision 1.57 retrieving revision 1.58 diff -u -d -r1.57 -r1.58 --- edit.c 8 Sep 2006 09:14:45 -0000 1.57 +++ edit.c 10 Sep 2006 21:38:30 -0000 1.58 @@ -398,33 +398,18 @@ } /* - * str is a buffer of max length str_len, which, after calling, will - * contain a representation of the given [y, m, d] date using the - * current locale (as defined by LC_TIME). - * - * Default is an ISO 8601 representation. - * - * %-sequences available to translators: %y, %Y, %m, %M, %d, %D represent - * year, month, and day (the uppercase version telling to fill with leading - * zeros if necessary) + * available %-sequences: + * - %y, %Y, %m, %M, %d, %D represent year, month, and day + * (the uppercase version telling to fill with leading zeros + * if necessary) + * - %I for ISO 8601 representation */ -static void -locale_date(char *str, size_t str_len, int year, int month, int day) +static size_t +format_date(char *str, size_t str_len, char *fmt, int year, int month, int day) { - char *s = str, *fmt; + char *s = str; size_t len; -#if defined(HAVE_LOCALE_H) && defined(HAVE_SETLOCALE) - fmt = year ? dcgettext(PACKAGE, "%Y-%M-%D", LC_TIME) : - dcgettext(PACKAGE, "--%M-%D", LC_TIME); -#else - if(year) - snprintf(str, str_len, "%04d-%02d-%02d", year, month, day); - else - snprintf(str, str_len, "--%02d-%02d", month, day); - return; -#endif - while(*fmt && (s - str + 1 < str_len)) { if(*fmt != '%') { *s++ = *fmt++; @@ -439,15 +424,38 @@ case 'M': s += snprintf(s, len, "%02d", month); break; case 'd': s += snprintf(s, len, "%d", day); break; case 'D': s += snprintf(s, len, "%02d", day); break; - case '%': /* fall through */ - default: - *s++ = '%'; - *s++ = *fmt; - break; + case 'I': s += format_date(s, len, + year ? "%Y-%M-%D" : "--%M-%D", + year, month, day); + break; + case '%': *s++ = '%'; break; + default: *s++ = '%'; *s++ = *fmt; break; } fmt++; } - *++s = 0; + *s = 0; + return s - str; +} + +/* + * str is a buffer of max length str_len, which, after calling, will + * contain a representation of the given [y, m, d] date using the + * current locale (as defined by LC_TIME). + * + * In the absence of any localization, use an ISO 8601 representation. + */ +static void +locale_date(char *str, size_t str_len, int year, int month, int day) +{ + char *fmt; + +#if defined(HAVE_LOCALE_H) && defined(HAVE_SETLOCALE) + fmt = year ? dcgettext(PACKAGE, "%Y-%M-%D", LC_TIME) : + dcgettext(PACKAGE, "--%M-%D", LC_TIME); +#else + fmt = "%I"; +#endif + format_date(str, str_len, fmt, year, month, day); } static int is_valid_date(const int day, const int month, const int year) |
|
From: Cedric D. <cd...@us...> - 2006-09-08 12:38:55
|
Update of /cvsroot/abook/abook/po In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv7236 Modified Files: fr.po Log Message: Update (Michèle Garoche). Index: fr.po =================================================================== RCS file: /cvsroot/abook/abook/po/fr.po,v retrieving revision 1.17 retrieving revision 1.18 diff -u -d -r1.17 -r1.18 --- fr.po 7 Sep 2006 21:55:26 -0000 1.17 +++ fr.po 8 Sep 2006 12:38:51 -0000 1.18 @@ -1,15 +1,16 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR Free Software Foundation, Inc. -# This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. +# French translation for abook package. +# Copyright (C) 2005 Free Software Foundation, Inc. +# This file is distributed under the same license as the abook package. +# Cedric Duval <ced...@fr...>, 2005-2006. +# Michèle Garoche <mic...@ea...>, 2006. # msgid "" msgstr "" "Project-Id-Version: abook\n" "Report-Msgid-Bugs-To: <abo...@li...>\n" "POT-Creation-Date: 2006-09-07 23:31+0200\n" -"PO-Revision-Date: 2006-09-05 11:42+0200\n" -"Last-Translator: Cedric Duval <ced...@fr...>\n" +"PO-Revision-Date: 2006-09-08 14:37+0200\n" +"Last-Translator: Michèle Garoche <mic...@ea...>\n" "Language-Team: french\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" @@ -182,7 +183,7 @@ #: abook.c:649 #, c-format msgid "input format %s not supported\n" -msgstr "le format source %s n'est pas supporté\n" +msgstr "le format source %s n'est pas géré\n" #: abook.c:653 #, c-format @@ -192,7 +193,7 @@ #: abook.c:662 #, c-format msgid "output format %s not supported\n" -msgstr "le format de destination %s n'est pas supporté\n" +msgstr "le format de destination %s n'est pas géré\n" #: abook.c:668 #, c-format @@ -247,7 +248,7 @@ #: abook.h:16 msgid "q:quit ?:help a:add r:remove" -msgstr "q:quitter ?:aide a:ajouter r:supprimer" +msgstr "q:quitter ?:aide a:ajouter r:supprimer" #: database.c:45 msgid "Name" @@ -255,7 +256,7 @@ #: database.c:46 msgid "E-mail addresses" -msgstr "Adresses email:" +msgstr "Adresses email" #: database.c:47 msgid "Address" @@ -333,7 +334,6 @@ msgid "Invalid field value for sorting" msgstr "Valeur de champ invalide pour le classement" -# Comment traduire 'tab' ? #: edit.c:57 msgid "Tab name too wide for screen" msgstr "Intitulé d'onglet trop large pour l'écran" @@ -397,7 +397,7 @@ #: edit.h:14 msgid "?:help q:quit editor" -msgstr "?:aide q:quitter l'éditeur" +msgstr "?: aide q: quitter l'éditeur" #: filter.c:71 filter.c:82 msgid "abook native format" @@ -457,7 +457,7 @@ #: filter.c:95 msgid "BSD calendar" -msgstr "" +msgstr "Calendrier BSD" #: filter.c:108 msgid "input:" @@ -510,7 +510,7 @@ #: filter.c:1896 #, c-format msgid "%02d/%02d\tAnniversary of %s\n" -msgstr "" +msgstr "%02d/%02d\tAnniversaire de %s\n" #: help.h:11 msgid "\t?\t\thelp\n" @@ -548,7 +548,7 @@ #: help.h:20 msgid "\tr / del\t\tremove selected items\n" -msgstr "\tr / suppr\t\tsupprimer les entrées sélectionnées\n" +msgstr "\tr / suppr\tsupprimer les entrées sélectionnées\n" #: help.h:21 msgid "\tD\t\tduplicate item\n" @@ -638,7 +638,7 @@ #: help.h:55 msgid "\tarrows/h,l\t\tchange tab\n" -msgstr "\tflèches/h,l\tchanger de \"tab\"\n" +msgstr "\tflèches/h,l\tchanger d'onglet\n" #: help.h:57 msgid "\tq\t\t\tquit to main screen\n" @@ -863,12 +863,3 @@ #: views.c:169 msgid "Custom5" msgstr "Personnalisé5" - -#~ msgid "sorry, input for this field type is not yet implemented" -#~ msgstr "désolé, l'entrée pour ce type de champ n'est pas encore implémentée" - -#~ msgid "?:help c:contact a:address p:phone o:other" -#~ msgstr "?:aide c:contact a:adresse p:téléphone o:autre" - -#~ msgid "invalid custom field number" -#~ msgstr "numéro de champ personnalisé invalide" |
|
From: Cedric D. <cd...@us...> - 2006-09-08 09:32:40
|
Update of /cvsroot/abook/abook In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv32703 Modified Files: abookrc.5 Log Message: Gave phone field a width of 12, for consistency with sample.abookrc. Index: abookrc.5 =================================================================== RCS file: /cvsroot/abook/abook/abookrc.5,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- abookrc.5 4 Sep 2006 18:29:25 -0000 1.16 +++ abookrc.5 8 Sep 2006 09:32:35 -0000 1.17 @@ -90,7 +90,7 @@ \fI{name:22}\fP displays the \fIname\fP field with a maximal width of 22 characters. .TP -\fI{phone:-13|workphone|mobile}\fP +\fI{phone:-12|workphone|mobile}\fP displays (right aligned within a width of 13 characters), either the \fIphone\fP, \fIworkphone\fP or \fImobile\fP field, whichever being the first to be non-empty. .RE .IP |
|
From: Cedric D. <cd...@us...> - 2006-09-08 09:25:05
|
Update of /cvsroot/abook/abook In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv30012 Modified Files: views.c Log Message: Added anniversary as a default field (ie one that is available if the user did not enter any views configuration). Index: views.c =================================================================== RCS file: /cvsroot/abook/abook/views.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- views.c 7 Aug 2006 15:06:53 -0000 1.2 +++ views.c 8 Sep 2006 09:25:02 -0000 1.3 @@ -140,7 +140,7 @@ { N_("ADDRESS"), { ADDRESS, ADDRESS2, CITY, STATE, ZIP, COUNTRY, -1 } }, { N_("PHONE"), { PHONE, WORKPHONE, FAX, MOBILEPHONE, -1 } }, - { N_("OTHER"), { NICK, URL, NOTES, -1 } }, + { N_("OTHER"), { NICK, URL, NOTES, ANNIVERSARY, -1 } }, { 0 } }; |
|
From: Cedric D. <cd...@us...> - 2006-09-08 09:14:48
|
Update of /cvsroot/abook/abook In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv25268 Modified Files: edit.c filter.c Log Message: * parse_date_string(): don't modify string argument in place, since most if not all of the time this function is applied on a database entry. Too prone to dangerous oversight. * fixed bsdcal export not checking for validity of parsed date. Index: edit.c =================================================================== RCS file: /cvsroot/abook/abook/edit.c,v retrieving revision 1.56 retrieving revision 1.57 diff -u -d -r1.56 -r1.57 --- edit.c 7 Sep 2006 21:49:14 -0000 1.56 +++ edit.c 8 Sep 2006 09:14:45 -0000 1.57 @@ -250,12 +250,10 @@ int day, month, year; char buf[64]; - /* put raw representation of date in buf */ find_field_number(cur->field->key, &nb); - if((str = db_fget_byid(item, nb)) != NULL) - strncpy(buf, str, sizeof(buf)); - - if(str && parse_date_string(buf, &day, &month, &year)) { + str = db_fget_byid(item, nb); + + if(parse_date_string(str, &day, &month, &year)) { /* put locale representation of date in buf */ locale_date(buf, sizeof(buf), year, month, day); mvwaddnstr(editw, y, TAB_COLON_POS + 2, buf, @@ -475,11 +473,17 @@ } int -parse_date_string(char *s, int *day, int *month, int *year) +parse_date_string(char *str, int *day, int *month, int *year) { int i = 0; - char *p = s; - assert(s && day && month && year); + char buf[12], *s, *p; + + assert(day && month && year); + + if(!str || !*str) + return FALSE; + + p = s = strncpy(buf, str, sizeof(buf)); if(*s == '-' && *s++ == '-') { /* omitted year */ *year = 0; @@ -501,7 +505,7 @@ } p = s; } else - return FALSE; + return FALSE; } if (i != 2 || !*p) @@ -515,14 +519,11 @@ static void edit_date(int item, int nb) { - int i, date[3], old = FALSE; - char buf[12], *s = db_fget_byid(item, nb); + int i, date[3], old; + char *s = db_fget_byid(item, nb); char *field[] = { N_("Day: "), N_("Month: "), N_("Year (optional): ") }; - if(s) { - strncpy(buf, s, sizeof(buf)); - old = parse_date_string(buf, &date[0], &date[1], &date[2]); - } + old = parse_date_string(s, &date[0], &date[1], &date[2]); for(i = 0; i < 3; i++) { s = (old && date[i]) ? strdup_printf("%d", date[i]) : NULL; Index: filter.c =================================================================== RCS file: /cvsroot/abook/abook/filter.c,v retrieving revision 1.55 retrieving revision 1.56 diff -u -d -r1.55 -r1.56 --- filter.c 6 Sep 2006 02:46:44 -0000 1.55 +++ filter.c 8 Sep 2006 09:14:45 -0000 1.56 @@ -1890,7 +1890,8 @@ char *anniversary = db_fget(e.item, ANNIVERSARY); if(anniversary) { - parse_date_string(anniversary, &day, &month, &year); + if(!parse_date_string(anniversary, &day, &month, &year)) + continue; fprintf(out, _("%02d/%02d\tAnniversary of %s\n"), |
|
From: Cedric D. <cd...@us...> - 2006-09-07 23:17:56
|
Update of /cvsroot/abook/abook In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv31565 Modified Files: list.c Log Message: Fixed "out-of-screen" display. Index: list.c =================================================================== RCS file: /cvsroot/abook/abook/list.c,v retrieving revision 1.33 retrieving revision 1.34 diff -u -d -r1.33 -r1.34 --- list.c 5 Sep 2006 08:21:35 -0000 1.33 +++ list.c 7 Sep 2006 23:17:53 -0000 1.34 @@ -180,7 +180,7 @@ width = len ? bytes2width(s, len) : strwidth(s); x_start = *x_pos + ((e->d.field.len < 0) ? len - width : 0); if(width + x_start >= COLS) - width = COLS - x_start; + width = bytes2width(s, COLS - x_start); if(width) mvwaddnstr(list, line, x_start, s, width); @@ -306,7 +306,10 @@ x_pos += strwidth(e->d.text); else if(e->type == INDEX_FIELD) { get_field_info(e->d.field.id, NULL, &str, NULL); - width = e->d.field.len ? abs(e->d.field.len) : strwidth(str); + width = e->d.field.len ? + abs(e->d.field.len) : strwidth(str); + if(width + x_pos > COLS) + width = bytes2width(str, COLS - x_pos); mvaddnstr(2, x_pos, str, width); x_pos += width; } else |
|
From: Cedric D. <cd...@us...> - 2006-09-07 22:57:05
|
Update of /cvsroot/abook/abook In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv23371 Modified Files: gettext.h Log Message: Fixed dcgettext() definition (not used anywhere, but still...) Index: gettext.h =================================================================== RCS file: /cvsroot/abook/abook/gettext.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- gettext.h 7 Sep 2006 21:49:14 -0000 1.4 +++ gettext.h 7 Sep 2006 22:57:03 -0000 1.5 @@ -7,7 +7,7 @@ # include <libintl.h> # else # define gettext(Msgid) ((const char *) (Msgid)) -# define dcgettext(Domainname, Msgid, Category) do {} while (0) +# define dcgettext(Domainname, Msgid, Category) ((const char *) (Msgid)) # define textdomain(Domainname) do {} while(0) # define bindtextdomain(Domainname, Dirname) do {} while(0) # endif /* ENABLE_NLS */ |
|
From: Cedric D. <cd...@us...> - 2006-09-07 21:49:18
|
Update of /cvsroot/abook/abook/po In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv30012/po Modified Files: Makevars abook.pot Log Message: Display dates according to current locale (as defined by LC_TIME). Index: abook.pot =================================================================== RCS file: /cvsroot/abook/abook/po/abook.pot,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- abook.pot 31 Aug 2006 05:20:57 -0000 1.14 +++ abook.pot 7 Sep 2006 21:49:14 -0000 1.15 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: <abo...@li...>\n" -"POT-Creation-Date: 2006-08-31 08:12+0300\n" +"POT-Creation-Date: 2006-09-07 23:31+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL...@li...>\n" @@ -36,199 +36,199 @@ msgid "Press enter to continue...\n" msgstr "" -#: abook.c:141 +#: abook.c:143 #, c-format msgid "File %s is not writeable" msgstr "" -#: abook.c:146 +#: abook.c:148 msgid "If you continue all changes will be lost. Do you want to continue?" msgstr "" -#: abook.c:165 +#: abook.c:167 msgid "Save database" msgstr "" -#: abook.c:167 +#: abook.c:169 msgid "Quit without saving" msgstr "" -#: abook.c:223 +#: abook.c:227 #, c-format msgid "%s is not a valid HOME directory\n" msgstr "" -#: abook.c:254 +#: abook.c:258 #, c-format msgid "" "Cannot combine options --mutt-query, --convert, --add-email or --add-email-" "quiet\n" msgstr "" -#: abook.c:285 +#: abook.c:289 #, c-format msgid "please use option --%s after --convert option\n" msgstr "" -#: abook.c:384 +#: abook.c:388 #, c-format msgid "%s: unrecognized arguments on command line\n" msgstr "" -#: abook.c:406 +#: abook.c:410 msgid " -h\t--help\t\t\t\tshow usage" msgstr "" -#: abook.c:407 +#: abook.c:411 msgid " -C\t--config\t<file>\t\tuse an alternative configuration file" msgstr "" -#: abook.c:408 +#: abook.c:412 msgid "\t--datafile\t<file>\t\tuse an alternative addressbook file" msgstr "" -#: abook.c:409 +#: abook.c:413 msgid "\t--mutt-query\t<string>\tmake a query for mutt" msgstr "" -#: abook.c:410 +#: abook.c:414 msgid "" "\t--add-email\t\t\tread an e-mail message from stdin and\n" "\t\t\t\t\tadd the sender to the addressbook" msgstr "" -#: abook.c:414 +#: abook.c:418 msgid "" "\t--add-email-quiet\t\tsame as --add-email but doesn't\n" "\t\t\t\t\trequire to confirm adding" msgstr "" -#: abook.c:418 +#: abook.c:422 msgid "\t--convert\t\t\tconvert address book files" msgstr "" -#: abook.c:419 +#: abook.c:423 msgid "\toptions to use with --convert:" msgstr "" -#: abook.c:420 +#: abook.c:424 msgid "\t--informat\t<format>\tformat for input file" msgstr "" -#: abook.c:421 +#: abook.c:425 msgid "\t\t\t\t\t(default: abook)" msgstr "" -#: abook.c:422 +#: abook.c:426 msgid "\t--infile\t<file>\t\tsource file" msgstr "" -#: abook.c:423 +#: abook.c:427 msgid "\t\t\t\t\t(default: stdin)" msgstr "" -#: abook.c:424 +#: abook.c:428 msgid "\t--outformat\t<format>\tformat for output file" msgstr "" -#: abook.c:425 +#: abook.c:429 msgid "\t\t\t\t\t(default: text)" msgstr "" -#: abook.c:426 +#: abook.c:430 msgid "\t--outfile\t<file>\t\tdestination file" msgstr "" -#: abook.c:427 +#: abook.c:431 msgid "\t\t\t\t\t(default: stdout)" msgstr "" -#: abook.c:428 +#: abook.c:432 msgid "\t--formats\t\t\tlist available formats" msgstr "" -#: abook.c:499 +#: abook.c:503 #, c-format msgid "Cannot open database\n" msgstr "" -#: abook.c:625 +#: abook.c:629 #, c-format msgid "too few arguments to make conversion\n" msgstr "" -#: abook.c:626 +#: abook.c:630 #, c-format msgid "try --help\n" msgstr "" -#: abook.c:631 +#: abook.c:635 #, c-format msgid "" "input and output formats are the same\n" "exiting...\n" msgstr "" -#: abook.c:645 +#: abook.c:649 #, c-format msgid "input format %s not supported\n" msgstr "" -#: abook.c:649 +#: abook.c:653 #, c-format msgid "cannot read file %s\n" msgstr "" -#: abook.c:658 +#: abook.c:662 #, c-format msgid "output format %s not supported\n" msgstr "" -#: abook.c:664 +#: abook.c:668 #, c-format msgid "cannot write file %s\n" msgstr "" -#: abook.c:685 +#: abook.c:689 #, c-format msgid "cannot open %s\n" msgstr "" -#: abook.c:688 +#: abook.c:692 #, c-format msgid "%d item(s) added to %s\n" msgstr "" -#: abook.c:690 +#: abook.c:694 msgid "Valid sender address not found" msgstr "" -#: abook.c:730 +#: abook.c:734 #, c-format msgid "Address %s already in addressbook\n" msgstr "" -#: abook.c:740 +#: abook.c:744 #, c-format msgid "" "cannot open /dev/tty\n" "you may want to use --add-email-quiet\n" msgstr "" -#: abook.c:746 +#: abook.c:750 #, c-format msgid "Add \"%s <%s>\" to %s? (%c/%c)\n" msgstr "" -#: abook.c:750 abook.c:757 ui.c:343 ui.c:605 +#: abook.c:754 abook.c:761 ui.c:343 ui.c:609 msgid "keybinding for yes|y" msgstr "" -#: abook.c:751 abook.c:753 ui.c:341 +#: abook.c:755 abook.c:757 ui.c:341 msgid "keybinding for no|n" msgstr "" -#: abook.c:778 +#: abook.c:782 #, c-format msgid "stdin is a directory or cannot stat stdin\n" msgstr "" @@ -301,27 +301,27 @@ msgid "Anniversary day" msgstr "" -#: database.c:164 +#: database.c:166 msgid "field already defined" msgstr "" -#: database.c:168 +#: database.c:170 msgid "standard field does not need to be declared" msgstr "" -#: database.c:183 +#: database.c:185 msgid "unknown type" msgstr "" -#: database.c:583 +#: database.c:585 msgid "Invalid field value defined in configuration" msgstr "" -#: database.c:586 +#: database.c:588 msgid "Invalid field value for sorting" msgstr "" -#: edit.c:53 +#: edit.c:57 msgid "Tab name too wide for screen" msgstr "" @@ -354,134 +354,151 @@ msgid "Item: " msgstr "" -#: edit.c:478 +#: edit.c:420 +msgid "%Y-%M-%D" +msgstr "" + +#: edit.c:421 +msgid "--%M-%D" +msgstr "" + +#: edit.c:520 msgid "Day: " msgstr "" -#: edit.c:478 +#: edit.c:520 msgid "Month: " msgstr "" -#: edit.c:478 +#: edit.c:520 msgid "Year (optional): " msgstr "" -#: edit.c:511 +#: edit.c:553 msgid "Invalid date" msgstr "" -#: edit.c:666 +#: edit.c:708 msgid "Name: " msgstr "" -#: edit.h:13 +#: edit.h:14 msgid "?:help q:quit editor" msgstr "" -#: filter.c:70 filter.c:81 +#: filter.c:71 filter.c:82 msgid "abook native format" msgstr "" -#: filter.c:71 +#: filter.c:72 msgid "ldif / Netscape addressbook" msgstr "" -#: filter.c:72 filter.c:83 +#: filter.c:73 filter.c:84 msgid "mutt alias" msgstr "" -#: filter.c:73 filter.c:85 +#: filter.c:74 filter.c:86 msgid "pine addressbook" msgstr "" -#: filter.c:74 filter.c:87 +#: filter.c:75 filter.c:88 msgid "comma separated values" msgstr "" -#: filter.c:75 filter.c:88 +#: filter.c:76 filter.c:89 msgid "comma separated values (all fields)" msgstr "" -#: filter.c:76 filter.c:89 +#: filter.c:77 filter.c:90 msgid "Palm comma separated values" msgstr "" -#: filter.c:82 +#: filter.c:83 msgid "ldif / Netscape addressbook (.4ld)" msgstr "" -#: filter.c:84 +#: filter.c:85 msgid "html document" msgstr "" -#: filter.c:86 +#: filter.c:87 msgid "GnomeCard (VCard) addressbook" msgstr "" -#: filter.c:90 +#: filter.c:91 msgid "elm alias" msgstr "" -#: filter.c:91 +#: filter.c:92 msgid "plain text" msgstr "" -#: filter.c:92 +#: filter.c:93 msgid "Wanderlust address book" msgstr "" -#: filter.c:93 +#: filter.c:94 msgid "Spruce address book" msgstr "" -#: filter.c:106 +#: filter.c:95 +msgid "BSD calendar" +msgstr "" + +#: filter.c:108 msgid "input:" msgstr "" -#: filter.c:113 +#: filter.c:115 msgid "output:" msgstr "" -#: filter.c:178 +#: filter.c:180 msgid "import database" msgstr "" -#: filter.c:180 filter.c:297 +#: filter.c:182 filter.c:299 msgid "please select a filter" msgstr "" -#: filter.c:188 filter.c:305 +#: filter.c:190 filter.c:307 msgid "x -\tcancel" msgstr "" -#: filter.c:209 filter.c:343 +#: filter.c:211 filter.c:345 msgid "Filename: " msgstr "" -#: filter.c:216 +#: filter.c:218 msgid "Error occured while opening the file" msgstr "" -#: filter.c:218 +#: filter.c:220 msgid "File does not seem to be a valid addressbook" msgstr "" -#: filter.c:295 +#: filter.c:297 msgid "export database" msgstr "" -#: filter.c:328 +#: filter.c:330 msgid "Export <a>ll, export <s>elected, or <c>ancel?" msgstr "" -#: filter.c:329 ui.c:628 +#: filter.c:331 ui.c:632 msgid "keybindings:all/selected/cancel|asc" msgstr "" -#: filter.c:350 +#: filter.c:352 msgid "Error occured while exporting" msgstr "" +#: filter.c:1896 +#, c-format +msgid "%02d/%02d\tAnniversary of %s\n" +msgstr "" + #: help.h:11 msgid "\t?\t\thelp\n" msgstr "" @@ -642,19 +659,19 @@ msgid "\tv\t\t\tview url with web browser\n" msgstr "" -#: options.c:254 +#: options.c:250 msgid "quote mismatch" msgstr "" -#: options.c:260 +#: options.c:256 msgid "no assignment character found" msgstr "" -#: options.c:263 +#: options.c:259 msgid "error in comma separated list" msgstr "" -#: options.c:292 options.c:311 +#: options.c:289 options.c:308 msgid "invalid value" msgstr "" @@ -742,32 +759,32 @@ msgid "Clear WHOLE database" msgstr "" -#: ui.c:578 +#: ui.c:582 msgid "Search hit bottom, continuing at top" msgstr "" -#: ui.c:603 +#: ui.c:607 #, c-format msgid "Your current data will be lost - Press '%c' to continue" msgstr "" -#: ui.c:628 +#: ui.c:632 msgid "Print <a>ll, print <s>elected, or <c>ancel?" msgstr "" -#: ui.c:634 +#: ui.c:638 msgid "No selected items" msgstr "" -#: ui.c:660 +#: ui.c:664 msgid "File to open: " msgstr "" -#: ui.c:670 +#: ui.c:674 msgid "Save current database" msgstr "" -#: ui.c:678 +#: ui.c:682 msgid "Sorry, the specified file appears not to be a valid abook addressbook" msgstr "" Index: Makevars =================================================================== RCS file: /cvsroot/abook/abook/po/Makevars,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- Makevars 5 Aug 2006 12:25:47 -0000 1.3 +++ Makevars 7 Sep 2006 21:49:14 -0000 1.4 @@ -38,4 +38,4 @@ # This is the list of locale categories, beyond LC_MESSAGES, for which the # message catalogs shall be used. It is usually empty. -EXTRA_LOCALE_CATEGORIES = +EXTRA_LOCALE_CATEGORIES = LC_TIME |
|
From: Cedric D. <cd...@us...> - 2006-09-07 21:49:17
|
Update of /cvsroot/abook/abook In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv30012 Modified Files: abook.c edit.c gettext.h Log Message: Display dates according to current locale (as defined by LC_TIME). Index: edit.c =================================================================== RCS file: /cvsroot/abook/abook/edit.c,v retrieving revision 1.55 retrieving revision 1.56 diff -u -d -r1.55 -r1.56 --- edit.c 6 Sep 2006 02:46:44 -0000 1.55 +++ edit.c 7 Sep 2006 21:49:14 -0000 1.56 @@ -24,6 +24,12 @@ #ifdef HAVE_CONFIG_H # include "config.h" #endif +#if defined(HAVE_LOCALE_H) && defined(HAVE_SETLOCALE) +# include <locale.h> +#endif + + +static void locale_date(char *str, size_t str_len, int year, int month, int day); /* * some extern variables @@ -242,22 +248,18 @@ abook_list_free(&emails); } else if(cur->field->type == FIELD_DATE) { int day, month, year; - char buf[12]; + char buf[64]; + /* put raw representation of date in buf */ find_field_number(cur->field->key, &nb); if((str = db_fget_byid(item, nb)) != NULL) strncpy(buf, str, sizeof(buf)); if(str && parse_date_string(buf, &day, &month, &year)) { - if(year) - str = strdup_printf("%04d-%02d-%02d", - year, month, day); - else - str = strdup_printf("--%02d-%02d", - month, day); - mvwaddnstr(editw, y, TAB_COLON_POS + 2, str, - bytes2width(str, FIELD_MAX_WIDTH)); - free(str); + /* put locale representation of date in buf */ + locale_date(buf, sizeof(buf), year, month, day); + mvwaddnstr(editw, y, TAB_COLON_POS + 2, buf, + bytes2width(buf, FIELD_MAX_WIDTH)); } } else { find_field_number(cur->field->key, &nb); @@ -397,6 +399,59 @@ abook_list_free(&list); } +/* + * str is a buffer of max length str_len, which, after calling, will + * contain a representation of the given [y, m, d] date using the + * current locale (as defined by LC_TIME). + * + * Default is an ISO 8601 representation. + * + * %-sequences available to translators: %y, %Y, %m, %M, %d, %D represent + * year, month, and day (the uppercase version telling to fill with leading + * zeros if necessary) + */ +static void +locale_date(char *str, size_t str_len, int year, int month, int day) +{ + char *s = str, *fmt; + size_t len; + +#if defined(HAVE_LOCALE_H) && defined(HAVE_SETLOCALE) + fmt = year ? dcgettext(PACKAGE, "%Y-%M-%D", LC_TIME) : + dcgettext(PACKAGE, "--%M-%D", LC_TIME); +#else + if(year) + snprintf(str, str_len, "%04d-%02d-%02d", year, month, day); + else + snprintf(str, str_len, "--%02d-%02d", month, day); + return; +#endif + + while(*fmt && (s - str + 1 < str_len)) { + if(*fmt != '%') { + *s++ = *fmt++; + continue; + } + + len = str_len - (str - s); + switch(*++fmt) { + case 'y': s += snprintf(s, len, "%d", year); break; + case 'Y': s += snprintf(s, len, "%04d", year); break; + case 'm': s += snprintf(s, len, "%d", month); break; + case 'M': s += snprintf(s, len, "%02d", month); break; + case 'd': s += snprintf(s, len, "%d", day); break; + case 'D': s += snprintf(s, len, "%02d", day); break; + case '%': /* fall through */ + default: + *s++ = '%'; + *s++ = *fmt; + break; + } + fmt++; + } + *++s = 0; +} + static int is_valid_date(const int day, const int month, const int year) { int valid = 1; Index: abook.c =================================================================== RCS file: /cvsroot/abook/abook/abook.c,v retrieving revision 1.60 retrieving revision 1.61 diff -u -d -r1.60 -r1.61 --- abook.c 4 Sep 2006 18:29:24 -0000 1.60 +++ abook.c 7 Sep 2006 21:49:14 -0000 1.61 @@ -187,9 +187,11 @@ main(int argc, char **argv) { #if defined(HAVE_SETLOCALE) && defined(HAVE_LOCALE_H) - setlocale(LC_ALL, ""); + setlocale(LC_MESSAGES, ""); + setlocale(LC_TIME, ""); + setlocale(LC_CTYPE, ""); + setlocale(LC_COLLATE, ""); #endif - bindtextdomain(PACKAGE, LOCALEDIR); textdomain(PACKAGE); Index: gettext.h =================================================================== RCS file: /cvsroot/abook/abook/gettext.h,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- gettext.h 10 Apr 2006 08:15:46 -0000 1.3 +++ gettext.h 7 Sep 2006 21:49:14 -0000 1.4 @@ -7,6 +7,7 @@ # include <libintl.h> # else # define gettext(Msgid) ((const char *) (Msgid)) +# define dcgettext(Domainname, Msgid, Category) do {} while (0) # define textdomain(Domainname) do {} while(0) # define bindtextdomain(Domainname, Dirname) do {} while(0) # endif /* ENABLE_NLS */ |
|
From: Jaakko H. <jhe...@us...> - 2006-09-06 11:55:38
|
Update of /cvsroot/abook/abook/contrib In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv31821/contrib Log Message: Directory /cvsroot/abook/abook/contrib added to the repository |
|
From: Jaakko H. <jhe...@us...> - 2006-09-06 08:48:45
|
Update of /cvsroot/abook/abook In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv22155 Modified Files: options.c Log Message: - make sure that len - 1 is never < 0 - add some asserts Index: options.c =================================================================== RCS file: /cvsroot/abook/abook/options.c,v retrieving revision 1.32 retrieving revision 1.33 diff -u -d -r1.32 -r1.33 --- options.c 4 Sep 2006 18:41:58 -0000 1.32 +++ options.c 6 Sep 2006 08:48:33 -0000 1.33 @@ -279,11 +279,12 @@ { int len; - strtrim(p); + assert(p); + strtrim(p); len = strlen(p); - if(p[len - 1] == '\"' && *p == '\"') { + if(*p == '\"' && p[len - 1] == '\"') { if(len < 3) return _("invalid value"); p[len - 1] = 0; @@ -318,6 +319,9 @@ { int i; + assert(var); + assert(p); + for(i = 0; abook_vars[i].option; i++) if(!strcmp(abook_vars[i].option, var)) return opt_set_set_option(p, &abook_vars[i]); |
|
From: Cedric D. <cd...@us...> - 2006-09-06 03:33:41
|
Update of /cvsroot/abook/abook In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv6462 Modified Files: ui.c Log Message: Handle user aborting search (fixes Debian bug #386217). Index: ui.c =================================================================== RCS file: /cvsroot/abook/abook/ui.c,v retrieving revision 1.57 retrieving revision 1.58 diff -u -d -r1.57 -r1.58 --- ui.c 10 Apr 2006 08:15:46 -0000 1.57 +++ ui.c 6 Sep 2006 02:24:33 -0000 1.58 @@ -567,9 +567,13 @@ } else { char *s; s = ui_readline("/", findstr, MAX_FIELD_LEN - 1, 0); - strncpy(findstr, s, MAX_FIELD_LEN); - free(s); refresh_screen(); + if(s == NULL) { + return; /* user cancelled (ctrl-G) */ + } else { + strncpy(findstr, s, MAX_FIELD_LEN); + free(s); + } } if( (item = find_item(findstr, list_get_curitem() + !!next, |
|
From: Cedric D. <cd...@us...> - 2006-09-06 02:46:50
|
Update of /cvsroot/abook/abook In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv15483 Modified Files: abook.1 edit.c edit.h filter.c Log Message: Applied patch from Guillem Jover to add support for bsd calendar export. (Debian bug #386217) Index: edit.h =================================================================== RCS file: /cvsroot/abook/abook/edit.h,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- edit.h 25 Oct 2005 23:27:24 -0000 1.7 +++ edit.h 6 Sep 2006 02:46:44 -0000 1.8 @@ -4,6 +4,7 @@ void edit_item(int item); void get_first_email(char *str, int item); void add_item(); +int parse_date_string(char *s, int *day, int *month, int *year); #define EDITW_COLS (COLS - 6) #define EDITW_LINES (LINES - 5) Index: edit.c =================================================================== RCS file: /cvsroot/abook/abook/edit.c,v retrieving revision 1.54 retrieving revision 1.55 diff -u -d -r1.54 -r1.55 --- edit.c 4 Sep 2006 18:29:25 -0000 1.54 +++ edit.c 6 Sep 2006 02:46:44 -0000 1.55 @@ -33,8 +33,6 @@ WINDOW *editw; -static int parse_date_string(char *s, int *day, int *month, int *year); - static void editor_tab(const int tab) @@ -421,7 +419,7 @@ return valid; } -static int +int parse_date_string(char *s, int *day, int *month, int *year) { int i = 0; Index: abook.1 =================================================================== RCS file: /cvsroot/abook/abook/abook.1,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- abook.1 3 Oct 2005 05:22:49 -0000 1.9 +++ abook.1 6 Sep 2006 02:46:44 -0000 1.10 @@ -1,4 +1,4 @@ -.TH ABOOK 1 "June 6, 2003" +.TH ABOOK 1 2006-09-06 .nh .SH NAME abook \- text-based address book program @@ -79,6 +79,8 @@ - \fBspruce\fP Spruce address book .br - \fBwl\fP Wanderlust address book +.br +- \fBbsdcal\fP BSD calendar .TP \fB\-\-add-email\fP Read an e-mail message from stdin and add the sender to the addressbook. Index: filter.c =================================================================== RCS file: /cvsroot/abook/abook/filter.c,v retrieving revision 1.54 retrieving revision 1.55 diff -u -d -r1.54 -r1.55 --- filter.c 4 Sep 2006 18:29:25 -0000 1.54 +++ filter.c 6 Sep 2006 02:46:44 -0000 1.55 @@ -61,6 +61,7 @@ static int text_export_database(FILE *out, struct db_enumerator e); static int spruce_export_database(FILE *out, struct db_enumerator e); static int wl_export_database(FILE *out, struct db_enumerator e); +static int bsdcal_export_database(FILE *out, struct db_enumerator e); /* * end of function declarations @@ -91,6 +92,7 @@ { "text", N_("plain text"), text_export_database }, { "wl", N_("Wanderlust address book"), wl_export_database }, { "spruce", N_("Spruce address book"), spruce_export_database }, + { "bsdcal", N_("BSD calendar"), bsdcal_export_database }, { "\0", NULL, NULL } }; @@ -1876,3 +1878,33 @@ * end of wanderlust addressbook export filter */ +/* + * BSD calendar export filter + */ + +static int +bsdcal_export_database(FILE *out, struct db_enumerator e) +{ + db_enumerate_items(e) { + int year, month = 0, day = 0; + char *anniversary = db_fget(e.item, ANNIVERSARY); + + if(anniversary) { + parse_date_string(anniversary, &day, &month, &year); + + fprintf(out, + _("%02d/%02d\tAnniversary of %s\n"), + month, + day, + safe_str(db_name_get(e.item)) + ); + } + } + + return 0; +} + +/* + * end of BSD calendar export filter + */ + |
|
From: Cedric D. <cd...@us...> - 2006-09-05 09:44:08
|
Update of /cvsroot/abook/abook/po In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv6408 Modified Files: fr.po Log Message: Translation update from Michèle Garoche. Index: fr.po =================================================================== RCS file: /cvsroot/abook/abook/po/fr.po,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- fr.po 31 Aug 2006 05:20:57 -0000 1.15 +++ fr.po 5 Sep 2006 09:44:05 -0000 1.16 @@ -8,7 +8,7 @@ "Project-Id-Version: abook\n" "Report-Msgid-Bugs-To: <abo...@li...>\n" "POT-Creation-Date: 2006-08-31 08:12+0300\n" -"PO-Revision-Date: 2006-08-09 23:57+0200\n" +"PO-Revision-Date: 2006-09-05 11:42+0200\n" "Last-Translator: Cedric Duval <ced...@fr...>\n" "Language-Team: french\n" "MIME-Version: 1.0\n" @@ -43,7 +43,7 @@ #: abook.c:146 msgid "If you continue all changes will be lost. Do you want to continue?" msgstr "" -"En continuant vos modifications seront perdues. Voulez-vous continuer ?" +"Si vous continuez, vos modifications seront perdues. Voulez-vous continuer ?" #: abook.c:165 msgid "Save database" @@ -79,13 +79,12 @@ #: abook.c:406 msgid " -h\t--help\t\t\t\tshow usage" -msgstr " -h\t--help\t\t\t\tmontrer l'utilisation" +msgstr " -h\t--help\t\t\t\tafficher l'aide" #: abook.c:407 msgid " -C\t--config\t<file>\t\tuse an alternative configuration file" msgstr "" -" -C\t--config\t<fichier>\tutiliser un fichier de configuration\n" -"\t\t\t\t\talternatif" +" -C\t--config\t<fichier>\tutiliser un autre fichier de configuration" #: abook.c:408 msgid "\t--datafile\t<file>\t\tuse an alternative addressbook file" @@ -118,7 +117,7 @@ #: abook.c:419 msgid "\toptions to use with --convert:" -msgstr "\toptions à utiliser avec --convert :" +msgstr "\toptions à utiliser avec --convert:" #: abook.c:420 msgid "\t--informat\t<format>\tformat for input file" @@ -226,7 +225,7 @@ "you may want to use --add-email-quiet\n" msgstr "" "impossible d'ouvrir /dev/tty\n" -"peut-être souhaiter-vous utiliser --add-email-quiet\n" +"peut-être souhaitez-vous utiliser --add-email-quiet\n" #: abook.c:746 #, c-format @@ -337,7 +336,7 @@ # Comment traduire 'tab' ? #: edit.c:53 msgid "Tab name too wide for screen" -msgstr "Intitulé de \"tab\" trop large pour l'écran" +msgstr "Intitulé d'onglet trop large pour l'écran" #: edit.c:355 msgid "keybindings_new_123456789|n123456789" @@ -370,20 +369,19 @@ #: edit.c:478 msgid "Day: " -msgstr "" +msgstr "Jour: " #: edit.c:478 msgid "Month: " -msgstr "" +msgstr "Mois: " #: edit.c:478 msgid "Year (optional): " -msgstr "" +msgstr "Année (optionnelle): " #: edit.c:511 -#, fuzzy msgid "Invalid date" -msgstr "valeur invalide" +msgstr "Date invalide" #: edit.c:666 msgid "Name: " @@ -463,7 +461,7 @@ #: filter.c:180 filter.c:297 msgid "please select a filter" -msgstr "veuiller choisir un filtre" +msgstr "veuillez choisir un filtre" #: filter.c:188 filter.c:305 msgid "x -\tcancel" @@ -517,7 +515,7 @@ #: help.h:15 msgid "\t^L\t\trefresh screen\n" -msgstr "\t^L\t\traffraîchir l'écran\n" +msgstr "\t^L\t\trafraîchir l'écran\n" #: help.h:17 msgid "\tarrows / j,k\tscroll list\n" @@ -537,7 +535,7 @@ #: help.h:21 msgid "\tD\t\tduplicate item\n" -msgstr "\tD\t\tduppliquer une entrée\n" +msgstr "\tD\t\tdupliquer une entrée\n" #: help.h:23 msgid "\tspace\t\tselect item\n" @@ -651,7 +649,7 @@ #: help.h:67 msgid "\tu\t\t\tundo\n" -msgstr "\tu\t\t\tdéfaire\n" +msgstr "\tu\t\t\tannuler\n" #: help.h:69 msgid "\tm\t\t\tsend mail with mutt\n" @@ -663,11 +661,11 @@ #: options.c:254 msgid "quote mismatch" -msgstr "problème de correspondance de caractère de quotation" +msgstr "problème de correspondance de guillemets" #: options.c:260 msgid "no assignment character found" -msgstr "pas de caractère assignation trouvé" +msgstr "pas de caractère d'affectation trouvé" #: options.c:263 msgid "error in comma separated list" @@ -726,7 +724,7 @@ #: options.c:490 #, c-format msgid "%s: parse error at line %d: " -msgstr "%s: erreur d'analyse lexicale à la ligne %d:" +msgstr "%s: erreur d'analyse lexicale à la ligne %d: " #: options.c:494 #, c-format |
|
From: Jaakko H. <jhe...@us...> - 2006-09-05 08:21:37
|
Update of /cvsroot/abook/abook In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv6819 Modified Files: list.c Log Message: - move highlight_line Index: list.c =================================================================== RCS file: /cvsroot/abook/abook/list.c,v retrieving revision 1.32 retrieving revision 1.33 diff -u -d -r1.32 -r1.33 --- list.c 5 Sep 2006 08:17:17 -0000 1.32 +++ list.c 5 Sep 2006 08:21:35 -0000 1.33 @@ -192,6 +192,33 @@ } static void +highlight_line(WINDOW *win, int line) +{ + wstandout(win); + + /* + * this is a tricky one + */ +#if 0 +/*#ifdef mvwchgat*/ + mvwchgat(win, line, 0, -1, A_STANDOUT, 0, NULL); +#else + /* + * buggy function: FIXME + */ + scrollok(win, FALSE); + { + int i; + wmove(win, line, 0); + for(i = 0; i < COLS; i++) + waddch(win, ' '); + /*wattrset(win, 0);*/ + } + scrollok(win, TRUE); +#endif +} + +static void print_list_line(int item, int line, int highlight) { struct index_elem *cur; @@ -422,33 +449,6 @@ refresh_list(); } -static void -highlight_line(WINDOW *win, int line) -{ - wstandout(win); - - /* - * this is a tricky one - */ -#if 0 -/*#ifdef mvwchgat*/ - mvwchgat(win, line, 0, -1, A_STANDOUT, 0, NULL); -#else - /* - * buggy function: FIXME - */ - scrollok(win, FALSE); - { - int i; - wmove(win, line, 0); - for(i = 0; i < COLS; i++) - waddch(win, ' '); - /*wattrset(win, 0);*/ - } - scrollok(win, TRUE); -#endif -} - int selected_items() { |
|
From: Jaakko H. <jhe...@us...> - 2006-09-05 08:17:26
|
Update of /cvsroot/abook/abook In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv4762 Modified Files: list.c list.h Log Message: - highlight_line should be static Index: list.h =================================================================== RCS file: /cvsroot/abook/abook/list.h,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- list.h 4 Sep 2006 18:29:25 -0000 1.9 +++ list.h 5 Sep 2006 08:17:17 -0000 1.10 @@ -43,7 +43,6 @@ void move_curitem(int direction); void goto_home(); void goto_end(); -void highlight_line(WINDOW *win, int line); int selected_items(); void invert_selection(); int list_is_empty(); Index: list.c =================================================================== RCS file: /cvsroot/abook/abook/list.c,v retrieving revision 1.31 retrieving revision 1.32 diff -u -d -r1.31 -r1.32 --- list.c 4 Sep 2006 18:29:25 -0000 1.31 +++ list.c 5 Sep 2006 08:17:17 -0000 1.32 @@ -422,7 +422,7 @@ refresh_list(); } -void +static void highlight_line(WINDOW *win, int line) { wstandout(win); |
|
From: Jaakko H. <jhe...@us...> - 2006-09-05 08:11:05
|
Update of /cvsroot/abook/abook In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv2382 Modified Files: ChangeLog Makefile.am README configure.in Log Message: - prepare for 0.6.0pre2 Index: README =================================================================== RCS file: /cvsroot/abook/abook/README,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- README 18 Feb 2004 19:40:14 -0000 1.16 +++ README 5 Sep 2006 08:11:02 -0000 1.17 @@ -6,7 +6,7 @@ COMPILATION -To compile abook you must have ncurses developement libraries installed. +To compile abook you must have ncurses development libraries installed. Starting from version 0.4.10 abook is known to compile with the native curses library of SUN Solaris and OpenBSD. Since version 0.5.0 GNU readline is required. Please note that other readline implementations don't work. @@ -16,8 +16,8 @@ been compiled and tested successfully on following platforms: (NOTE: All versions of abook haven't been tested on all platforms.) -Linux (Debian GNU/Linux, RedHat Linux, all other distributions with GNU ncurses - and GNU readline should work) +Linux (distributions with moderately new GNU ncurses and GNU readline libraries + should work) Darwin Solaris FreeBSD @@ -43,9 +43,13 @@ and add sender e-mail addresses to the addressbook from pager using 'A' command. (Of course you can choose another keybinding if you like.) -It's also recommeded to set pipe_decode variable in mutt configuration. +It's also recommended to set pipe_decode variable in mutt configuration. See the mutt manual for details. +UPGRADING FROM VERSION 0.5 + +See RELEASE_NOTES . + UPGRADING FROM VERSION 0.4 You must import your abook 0.4 addressbook file because it is stored @@ -70,8 +74,8 @@ All files in this distribution are released under GNU GENERAL PUBLIC LICENSE. See COPYING for details. -CONTACT AUTHOR +CONTACT AUTHORS -Send bugreports, fixes, wishes etc. to Jaakko Heinonen -<jhe...@us...> or use the mailing list. +Send bugreports, fixes, wishes etc. to abook mailing list: +https://lists.sourceforge.net/lists/listinfo/abook-devel Index: ChangeLog =================================================================== RCS file: /cvsroot/abook/abook/ChangeLog,v retrieving revision 1.74 retrieving revision 1.75 diff -u -d -r1.74 -r1.75 --- ChangeLog 24 Aug 2006 09:46:08 -0000 1.74 +++ ChangeLog 5 Sep 2006 08:11:02 -0000 1.75 @@ -1,6 +1,7 @@ 0.6.0 - configurable views (Cedric Duval) - new field types, lists and improved custom field support (Cedric Duval) + - index_format option (Cedric Duval) - Italian translation (Claudio Stazzone) 0.5.6 Index: Makefile.am =================================================================== RCS file: /cvsroot/abook/abook/Makefile.am,v retrieving revision 1.17 retrieving revision 1.18 diff -u -d -r1.17 -r1.18 --- Makefile.am 25 Oct 2005 23:27:24 -0000 1.17 +++ Makefile.am 5 Sep 2006 08:11:02 -0000 1.18 @@ -12,7 +12,7 @@ ui.h views.h xmalloc.h EXTRA_DIST = config.rpath ANNOUNCE BUGS FAQ abook.1 abookrc.5 sample.abookrc \ - abook.spec contrib doc/HOWTO.translating_abook + abook.spec contrib doc/HOWTO.translating_abook RELEASE_NOTES abook_LDADD = @LIBINTL@ Index: configure.in =================================================================== RCS file: /cvsroot/abook/abook/configure.in,v retrieving revision 1.54 retrieving revision 1.55 diff -u -d -r1.54 -r1.55 --- configure.in 1 Sep 2006 10:00:22 -0000 1.54 +++ configure.in 5 Sep 2006 08:11:02 -0000 1.55 @@ -1,7 +1,7 @@ dnl abook configure.in AC_INIT(abook.c) -AM_INIT_AUTOMAKE(abook, 0.6.0pre1) +AM_INIT_AUTOMAKE(abook, 0.6.0pre2) AM_CONFIG_HEADER(config.h) dnl --------------- |
|
From: Cedric D. <cd...@us...> - 2006-09-04 19:02:56
|
Update of /cvsroot/abook/abook/po In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv2817/po Modified Files: de.po Log Message: Translation update (Gerfried Fuchs). Index: de.po =================================================================== RCS file: /cvsroot/abook/abook/po/de.po,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- de.po 31 Aug 2006 05:20:57 -0000 1.5 +++ de.po 4 Sep 2006 19:02:47 -0000 1.6 @@ -2,13 +2,14 @@ # Copyright (C) 2005 Free Software Foundation, Inc. # This file is distributed under the same license as the abook package. # Johannes WeiÃl <ja...@mo...>, 2005. +# Gerfried Fuchs <al...@is...>, 2006. # msgid "" msgstr "" "Project-Id-Version: abook 0.5.5pre1\n" "Report-Msgid-Bugs-To: <abo...@li...>\n" "POT-Creation-Date: 2006-08-31 08:12+0300\n" -"PO-Revision-Date: 2006-08-05 14:12+0200\n" +"PO-Revision-Date: 2006-09-04 21:00+0200\n" "Last-Translator: Johannes WeiÃl <ja...@mo...>\n" "Language-Team: German <de...@li...>\n" "MIME-Version: 1.0\n" @@ -257,9 +258,8 @@ msgstr "Name" #: database.c:46 -#, fuzzy msgid "E-mail addresses" -msgstr "E-Mail-Adressen:" +msgstr "E-Mail-Adressen" #: database.c:47 msgid "Address" @@ -322,16 +322,15 @@ #: database.c:164 msgid "field already defined" -msgstr "" +msgstr "Feld bereits definiert" #: database.c:168 msgid "standard field does not need to be declared" msgstr "" #: database.c:183 -#, fuzzy msgid "unknown type" -msgstr "unbekannte Option" +msgstr "unbekannter Typ" #: database.c:583 msgid "Invalid field value defined in configuration" @@ -348,7 +347,7 @@ #: edit.c:355 msgid "keybindings_new_123456789|n123456789" -msgstr "" +msgstr "n123456789" #: edit.c:357 #, c-format @@ -356,26 +355,24 @@ msgstr "" #: edit.c:358 -#, fuzzy msgid "email" -msgstr "E-Mails" +msgstr "E-Mail" #: edit.c:358 msgid "item" -msgstr "" +msgstr "Element" #: edit.c:363 msgid " or <n>ew" -msgstr "" +msgstr " oder <n>eu" #: edit.c:381 -#, fuzzy msgid "E-mail: " -msgstr "E-Mails" +msgstr "E-Mails: " #: edit.c:381 msgid "Item: " -msgstr "" +msgstr "Element: " #: edit.c:478 msgid "Day: " @@ -400,7 +397,7 @@ #: edit.h:13 msgid "?:help q:quit editor" -msgstr "" +msgstr "?:Hilfe q:Editor beenden" #: filter.c:70 filter.c:81 msgid "abook native format" @@ -687,9 +684,8 @@ msgstr "" #: options.c:263 -#, fuzzy msgid "error in comma separated list" -msgstr "komma-separierte Werte" +msgstr "Fehler in komma-separierter Liste" #: options.c:292 options.c:311 msgid "invalid value" @@ -834,17 +830,14 @@ msgstr "ADRESSE" #: views.c:142 -#, fuzzy msgid "PHONE" msgstr "TELEFON" #: views.c:143 -#, fuzzy msgid "OTHER" msgstr "ANDERE" #: views.c:165 views.c:166 views.c:167 views.c:168 views.c:169 -#, fuzzy msgid "CUSTOM" msgstr "BENUTZER" @@ -867,9 +860,3 @@ #: views.c:169 msgid "Custom5" msgstr "Benutzer5" - -#~ msgid "?:help c:contact a:address p:phone o:other" -#~ msgstr "?:Hilfe c:Kontakt a:Adresse p:Telefon o:Andere" - -#~ msgid "invalid custom field number" -#~ msgstr "ungültige benutzerdefinierte Feldnummer" |
|
From: Cedric D. <cd...@us...> - 2006-09-04 18:42:05
|
Update of /cvsroot/abook/abook In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv24513 Modified Files: options.c Log Message: Obsoleted the emailpos, extra_column, extra_alternative and extrapos configuration options. Index: options.c =================================================================== RCS file: /cvsroot/abook/abook/options.c,v retrieving revision 1.31 retrieving revision 1.32 diff -u -d -r1.31 -r1.32 --- options.c 4 Sep 2006 18:29:25 -0000 1.31 +++ options.c 4 Sep 2006 18:41:58 -0000 1.32 @@ -50,10 +50,6 @@ { "autosave", OT_BOOL, BOOL_AUTOSAVE, TRUE }, { "show_all_emails", OT_BOOL, BOOL_SHOW_ALL_EMAILS, TRUE }, - { "emailpos", OT_INT, INT_EMAILPOS, 25 }, - { "extra_column", OT_STR, STR_EXTRA_COLUMN, UL "phone" }, - { "extra_alternative", OT_STR, STR_EXTRA_ALTERNATIVE, UL "-1" }, - { "extrapos", OT_INT, INT_EXTRAPOS, 65 }, { "index_format", OT_STR, STR_INDEX_FORMAT, UL " {name:22} {email:40} {phone:12|workphone|mobile}" }, { "mutt_command", OT_STR, STR_MUTT_COMMAND, UL "mutt" }, { "mutt_return_all_emails", OT_BOOL, BOOL_MUTT_RETURN_ALL_EMAILS, |
|
From: Cedric D. <cd...@us...> - 2006-09-04 18:29:36
|
Update of /cvsroot/abook/abook In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv17639 Modified Files: abook.c abookrc.5 configure database.c database.h edit.c filter.c list.c list.h misc.c misc.h options.c options.h sample.abookrc Added Files: RELEASE_NOTES Log Message: New index_format option. Index: database.c =================================================================== RCS file: /cvsroot/abook/abook/database.c,v retrieving revision 1.38 retrieving revision 1.39 diff -u -d -r1.38 -r1.39 --- database.c 25 Aug 2006 22:51:00 -0000 1.38 +++ database.c 4 Sep 2006 18:29:25 -0000 1.39 @@ -121,7 +121,7 @@ } void -get_field_keyname(int i, char **key, char **name) +get_field_info(int i, char **key, char **name, int *type) { abook_field_list *cur = fields_list; int j; @@ -135,6 +135,8 @@ *key = (i < 0) ? NULL : cur->field->key; if(name) *name = (i < 0) ? NULL : cur->field->name; + if(type) + *type = (i < 0) ? -1 : cur->field->type; } void Index: options.h =================================================================== RCS file: /cvsroot/abook/abook/options.h,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- options.h 25 Oct 2005 23:27:24 -0000 1.10 +++ options.h 4 Sep 2006 18:29:25 -0000 1.11 @@ -46,6 +46,7 @@ enum str_opts { STR_EXTRA_COLUMN, STR_EXTRA_ALTERNATIVE, + STR_INDEX_FORMAT, STR_MUTT_COMMAND, STR_PRINT_COMMAND, STR_WWW_COMMAND, Index: database.h =================================================================== RCS file: /cvsroot/abook/abook/database.h,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- database.h 25 Aug 2006 22:51:01 -0000 1.15 +++ database.h 4 Sep 2006 18:29:25 -0000 1.16 @@ -66,7 +66,7 @@ #define find_field(key, list) real_find_field(key, list, NULL) #define find_field_number(key, pt_nb) real_find_field(key, NULL, pt_nb) #define find_declared_field(key) find_field(key,NULL) -void get_field_keyname(int i, char **key, char **name); +void get_field_info(int i, char **key, char **name, int *type); void add_field(abook_field_list **list, abook_field *f); char *declare_new_field(char *key, char *name, char *type, int accept_standard); void init_standard_fields(); Index: sample.abookrc =================================================================== RCS file: /cvsroot/abook/abook/sample.abookrc,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- sample.abookrc 25 Aug 2006 22:51:01 -0000 1.12 +++ sample.abookrc 4 Sep 2006 18:29:25 -0000 1.13 @@ -73,27 +73,14 @@ # Show all email addresses in list set show_all_emails=true -# Screen column for email field to start -set emailpos=25 - -# Field to be used in the extra column -set extra_column=phone -# frequently used values: -# -1 disabled -# phone Home Phone -# workphone Work Phone -# fax Fax -# mobile Mobile Phone -# nick Nick / Alias -# url URL - -# Specify an alternative field to be displayed in the extra -# column if there is no data for the field specified in -# extra_column for a particular item. -set extra_alternative=-1 - -# Screen column for the extra field to start -set extrapos=65 +# Format of an entry's line in the main abook screen +# +# The below example displays: +# * the content of the 'name' field (with a maximum of 22 characters) +# * the first of the 'phone', 'workphone' or 'mobile' fields +# happening not to be empty (right aligned within 12 characters) +# * the 'anniversary' field, with no length limit +set index_format=" {name:25} {phone:-12|workphone|mobile} {anniversary}" # Command used to start mutt set mutt_command=mutt Index: misc.c =================================================================== RCS file: /cvsroot/abook/abook/misc.c,v retrieving revision 1.22 retrieving revision 1.23 diff -u -d -r1.22 -r1.23 --- misc.c 25 Oct 2005 23:27:24 -0000 1.22 +++ misc.c 4 Sep 2006 18:29:25 -0000 1.23 @@ -64,6 +64,19 @@ return s; } +int +is_number(char *p) +{ + if(!p || !*p || (*p == '-' && !*++p)) + return 0; + + for(; *p; p++) + if(!isdigit(*p)) + return 0; + + return 1; +} + #ifdef HAVE_CONFIG_H # include "config.h" Index: misc.h =================================================================== RCS file: /cvsroot/abook/abook/misc.h,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- misc.h 25 Oct 2005 23:27:24 -0000 1.5 +++ misc.h 4 Sep 2006 18:29:25 -0000 1.6 @@ -16,6 +16,8 @@ char *strlower(char *str); char *strtrim(char *); +int is_number(char *s); + char *strdup_printf(const char *format, ... ); char *strconcat(const char *str, ...); Index: options.c =================================================================== RCS file: /cvsroot/abook/abook/options.c,v retrieving revision 1.30 retrieving revision 1.31 diff -u -d -r1.30 -r1.31 --- options.c 7 Aug 2006 11:39:53 -0000 1.30 +++ options.c 4 Sep 2006 18:29:25 -0000 1.31 @@ -54,7 +54,7 @@ { "extra_column", OT_STR, STR_EXTRA_COLUMN, UL "phone" }, { "extra_alternative", OT_STR, STR_EXTRA_ALTERNATIVE, UL "-1" }, { "extrapos", OT_INT, INT_EXTRAPOS, 65 }, - + { "index_format", OT_STR, STR_INDEX_FORMAT, UL " {name:22} {email:40} {phone:12|workphone|mobile}" }, { "mutt_command", OT_STR, STR_MUTT_COMMAND, UL "mutt" }, { "mutt_return_all_emails", OT_BOOL, BOOL_MUTT_RETURN_ALL_EMAILS, TRUE }, Index: list.c =================================================================== RCS file: /cvsroot/abook/abook/list.c,v retrieving revision 1.30 retrieving revision 1.31 diff -u -d -r1.30 -r1.31 --- list.c 7 Aug 2006 19:20:26 -0000 1.30 +++ list.c 4 Sep 2006 18:29:25 -0000 1.31 @@ -25,30 +25,103 @@ int first_list_item = -1; char *selected = NULL; -int extra_column = -1; -int extra_alternative = -1; - extern abook_field_list *fields_list; +struct index_elem *index_elements = NULL; static WINDOW *list = NULL; -int -init_extra_field(enum str_opts option) +static void +index_elem_add(int type, char *a, char *b) { - int ret = -1; - char *option_str; + struct index_elem *tmp = NULL, *cur, *cur2; + int field, len = 0; - option_str = opt_get_str(option); + if(!a || !*a) + return; - if(option_str && *option_str) { - find_field_number(option_str, &ret); + switch(type) { + case INDEX_TEXT: + tmp = xmalloc(sizeof(struct index_elem)); + tmp->d.text = xstrdup(a); + break; + case INDEX_FIELD: /* fall through */ + case INDEX_ALT_FIELD: + find_field_number(a, &field); + if(field == -1) + return; + len = (b && *b && is_number(b)) ? atoi(b) : 0; + tmp = xmalloc(sizeof(struct index_elem)); + tmp->d.field.id = field; + tmp->d.field.len = len; + break; + default: + assert(0); + } + tmp->type = type; + tmp->next = NULL; + tmp->d.field.next = NULL; - if(!strcmp(option_str, "name") || !strcmp(option_str, "email")) - ret = -1; + if(!index_elements) { /* first element */ + index_elements = tmp; + return; } - return ret; + for(cur = index_elements; cur->next; cur = cur->next) + ; + if(type != INDEX_ALT_FIELD) + cur->next = tmp; + else { /* add as an alternate field */ + tmp->d.field.len = cur->d.field.len; + for(cur2 = cur; cur2->d.field.next; cur2 = cur2->d.field.next) + ; + cur2->d.field.next = tmp; + } +} + +static void +parse_index_format(char *s) +{ + char *p, *start, *lstart = NULL; + int in_field = 0, in_alternate = 0, in_length = 0, type; + + p = start = s; + + while(*p) { + if(*p == '{' && !in_field) { + *p = 0; + index_elem_add(INDEX_TEXT, start, NULL); + start = ++p; + in_field = 1; + } else if(*p == ':' && in_field && !in_alternate) { + *p = 0; + lstart = ++p; + in_length = 1; + } else if(*p == '|' && in_field) { + *p = 0; + type = in_alternate ? INDEX_ALT_FIELD : INDEX_FIELD; + index_elem_add(type, start, in_length ? lstart : NULL); + start = ++p; + in_length = 0; + in_alternate = 1; + } else if(*p == '}' && in_field) { + *p = 0; + type = in_alternate ? INDEX_ALT_FIELD : INDEX_FIELD; + index_elem_add(type, start, in_length ? lstart : NULL); + start = ++p; + in_field = in_alternate = in_length = 0; + } else + p++; + } + if(!in_field) + index_elem_add(INDEX_TEXT, start, NULL); +} + +void +init_index() +{ + assert(!index_elements); + parse_index_format(opt_get_str(STR_INDEX_FORMAT)); } void @@ -56,13 +129,6 @@ { list = newwin(LIST_LINES, LIST_COLS, LIST_TOP, 0); scrollok(list, TRUE); - - /* - * init extra_column and extra alternative - */ - - extra_column = init_extra_field(STR_EXTRA_COLUMN); - extra_alternative = init_extra_field(STR_EXTRA_ALTERNATIVE); } void @@ -73,6 +139,90 @@ } void +get_list_field(int item, struct index_elem *e, struct list_field *res) +{ + char *s; + + res->data = s = NULL; + + do { /* find first non-empty field data in the alternate fields list */ + s = db_fget_byid(item, e->d.field.id); + } while(!(s && *s) && ((e = e->d.field.next) != NULL)); + + if(!e || !s || !*s) + return; + + res->data = s; + get_field_info(e->d.field.id, NULL, NULL, &res->type); +} + +static void +print_list_field(int item, int line, int *x_pos, struct index_elem *e) +{ + char *s, *p; + int width, x_start, mustfree = FALSE, len = abs(e->d.field.len); + struct list_field f; + + get_list_field(item, e, &f); + s = f.data; + + if(!s || !*s) { + *x_pos += len; + return; + } + + if(f.type == FIELD_EMAILS && !opt_get_bool(BOOL_SHOW_ALL_EMAILS)) + if((p = strchr(s, ',')) != NULL) { + s = xstrndup(s, p - s); + mustfree = TRUE; + } + + width = len ? bytes2width(s, len) : strwidth(s); + x_start = *x_pos + ((e->d.field.len < 0) ? len - width : 0); + if(width + x_start >= COLS) + width = COLS - x_start; + + if(width) + mvwaddnstr(list, line, x_start, s, width); + + if(mustfree) + free(s); + + *x_pos += len ? len : width; +} + +static void +print_list_line(int item, int line, int highlight) +{ + struct index_elem *cur; + int x_pos = 1; + + scrollok(list, FALSE); + if(highlight) + highlight_line(list, line); + + if(selected[item]) + mvwaddch(list, line, 0, '*' ); + + for(cur = index_elements; cur; cur = cur->next) + switch(cur->type) { + case INDEX_TEXT: + mvwaddstr(list, line, x_pos, cur->d.text); + x_pos += strwidth(cur->d.text); + break; + case INDEX_FIELD: + print_list_field(item, line, &x_pos, cur); + break; + default: + assert(0); + } + + scrollok(list, TRUE); + if(highlight) + wstandend(list); +} + +void refresh_list() { int i, line; @@ -114,62 +264,26 @@ } void -print_list_line(int i, int line, int highlight) -{ - int extra = extra_column; - char tmp[MAX_EMAILSTR_LEN], *emails; - int real_emaillen = (extra_column > 0 || extra_alternative > 0) ? - EMAILLEN : COLS - EMAILPOS; - - scrollok(list, FALSE); - if(highlight) - highlight_line(list, line); - - if(selected[i]) - mvwaddch(list, line, 0, '*' ); - - mvwaddnstr(list, line, NAMEPOS, db_name_get(i), - bytes2width(db_name_get(i), NAMELEN)); - - if(opt_get_bool(BOOL_SHOW_ALL_EMAILS)) { - emails = db_email_get(i); - mvwaddnstr(list, line, EMAILPOS, emails, - bytes2width(emails, real_emaillen)); - free(emails); - } else { - get_first_email(tmp, i); - mvwaddnstr(list, line, EMAILPOS, tmp, - bytes2width(tmp, real_emaillen)); - } - - if(extra < 0 || !db_fget_byid(i, extra)) - extra = extra_alternative; - if(extra >= 0) - mvwaddnstr(list, line, EXTRAPOS, - safe_str(db_fget_byid(i, extra)), - bytes2width(safe_str(db_fget_byid(i, extra)), - EXTRALEN)); - - scrollok(list, TRUE); - if(highlight) - wstandend(list); -} - -void list_headerline() { + struct index_elem *e; + int x_pos = 1, width; char *str = NULL; #if defined(A_BOLD) && defined(A_NORMAL) attrset(A_BOLD); #endif - mvaddstr(2, NAMEPOS, find_field("name", NULL)->name); - mvaddstr(2, EMAILPOS, find_field("email", NULL)->name); - if(extra_column > 0) { - get_field_keyname(extra_column, NULL, &str); - mvaddnstr(2, EXTRAPOS, str, COLS - EXTRAPOS); - } + for(e = index_elements; e; e = e->next) + if(e->type == INDEX_TEXT) + x_pos += strwidth(e->d.text); + else if(e->type == INDEX_FIELD) { + get_field_info(e->d.field.id, NULL, &str, NULL); + width = e->d.field.len ? abs(e->d.field.len) : strwidth(str); + mvaddnstr(2, x_pos, str, width); + x_pos += width; + } else + assert(0); #if defined(A_BOLD) && defined(A_NORMAL) attrset(A_NORMAL); Index: list.h =================================================================== RCS file: /cvsroot/abook/abook/list.h,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- list.h 26 Oct 2005 19:29:16 -0000 1.8 +++ list.h 4 Sep 2006 18:29:25 -0000 1.9 @@ -3,11 +3,34 @@ #include "ui.h" +#define INDEX_TEXT 1 +#define INDEX_FIELD 2 +#define INDEX_ALT_FIELD 3 + +struct index_elem { + int type; + union { + char *text; + struct { + int id; + int len; + struct index_elem *next; + } field; + } d; + struct index_elem *next; +}; + +struct list_field { + char *data; + int type; +}; + +void init_index(); void init_list(); int init_extra_field(enum str_opts option); void close_list(); void refresh_list(); -void print_list_line(int i, int line, int highlight); +void get_list_field(int item, struct index_elem *e, struct list_field *res); void list_headerline(); void scroll_up(); void scroll_down(); @@ -35,19 +58,11 @@ }; #define LIST_TOP 3 -#define LIST_BOTTOM (LINES-2) +#define LIST_BOTTOM (LINES - 2) -#define LIST_LINES (LIST_BOTTOM-LIST_TOP) +#define LIST_LINES (LIST_BOTTOM - LIST_TOP) #define LIST_COLS COLS -#define NAMEPOS 2 -#define EMAILPOS opt_get_int(INT_EMAILPOS) -#define EXTRAPOS opt_get_int(INT_EXTRAPOS) - -#define NAMELEN (EMAILPOS - NAMEPOS - 1) -#define EMAILLEN (EXTRAPOS - EMAILPOS - 1) -#define EXTRALEN (COLS - EXTRAPOS) - #define LAST_LIST_ITEM (first_list_item + LIST_LINES - 1) #endif Index: abookrc.5 =================================================================== RCS file: /cvsroot/abook/abook/abookrc.5,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- abookrc.5 25 Aug 2006 22:51:00 -0000 1.15 +++ abookrc.5 4 Sep 2006 18:29:25 -0000 1.16 @@ -78,51 +78,41 @@ .TP .B none discards any unknown field. +.RE .IP Default is \fIstandard\fP. -.RE .TP -\fBshow_all_emails\fP=[true|false] -Defines whether all email addresses for a contact are shown in the main list view. Default is true - +\fBindex_format\fP=format_string +Defines the way entries are displayed in the main list. This is a string containing field names enclosed between braces, with an optional width limit specified by a number (right alignment if negative) after the field name and a colon, and an arbitrary number of alternative fields (first with non empty content is to be displayed) separated by vertical bars. For instance: +.RS .TP -\fBemailpos\fP=column -Defines the screen column on the main list where the email address is to begin. Default is 25. - +\fI{name:22}\fP +displays the \fIname\fP field with a maximal width of 22 characters. .TP -\fBextra_column\fP=field -Defines the field to display in the extra (third) column on the main list. Default is "phone" (Home Phone). +\fI{phone:-13|workphone|mobile}\fP +displays (right aligned within a width of 13 characters), either the \fIphone\fP, \fIworkphone\fP or \fImobile\fP field, whichever being the first to be non-empty. +.RE .IP -\fIfield\fP can be any of the following: -.br --1 disabled -.br -phone Home Phone -.br -workphone Work Phone -.br -fax Fax -.br -mobile Mobile Phone -.br -nick Nickname/Alias -.br -url URL -.br -notes Notes +Default is \fI" {name:22} {email:40} {phone:12|workphone|mobile}"\fP .TP -\fBextra_alternative\fP=field -This is an optional setting that allows you to specify an alternative field to be displayed in the extra (third) column if there is no data for the field specified in extra_column for a particular item. The strings for the fields are the same as above. Please note that the data shown where the alternative field has been used will NOT be marked differently in any way from the rest of the extra column. There is no default. +\fBshow_all_emails\fP=[true|false] +Defines whether all email addresses for a contact are shown in the main list view. Default is true. .TP -\fBextrapos\fP=column -Defines the screen column on the main list where the extra field is to begin. Default is 65. - +.PD 0 +\fBemailpos\fP .TP -\fBmutt_command\fP=command -Defines the command to start mutt. Default is "mutt". +.PD 0 +\fBextra_column\fP +.TP +.PD 0 +\fBextra_alternative\fP +.TP +.PD +\fBextrapos\fP +Obsoleted by \fBindex_format\fP. .TP \fBmutt_return_all_emails\fP=[true|false] @@ -180,29 +170,12 @@ # Automatically save database on exit set autosave=true +# Format of entries lines in list +set index_format=" {name:22} {email:40} {phone:12|workphone|mobile}" + # Show all email addresses in list set show_all_emails=true -# Screen column for email field to start -set emailpos=25 - -# Field to be used in the extra column -set extra_column=phone -# frequently used values: -# -1 disabled -# phone Home Phone -# workphone Work Phone -# fax Fax -# mobile Mobile Phone -# nick Nickname/Alias -# url URL - -# -set extra_alternative=-1 - -# Screen column for the extra field to start -set extrapos=65 - # Command used to start mutt set mutt_command=mutt @@ -215,19 +188,19 @@ # Command used to start the web browser set www_command=lynx -# address style [eu|us|uk] +# Address style [eu|us|uk] set address_style=eu -# use ASCII characters only +# Use ASCII characters only set use_ascii_only=false # Prevent double entry set add_email_prevent_duplicates=false -# field to be used with "sort by field" command +# Field to be used with "sort by field" command set sort_field=nick -# show cursor in main display +# Show cursor in main display set show_cursor=false .fi Index: filter.c =================================================================== RCS file: /cvsroot/abook/abook/filter.c,v retrieving revision 1.53 retrieving revision 1.54 diff -u -d -r1.53 -r1.54 --- filter.c 7 Aug 2006 19:20:26 -0000 1.53 +++ filter.c 4 Sep 2006 18:29:25 -0000 1.54 @@ -832,39 +832,56 @@ * html export filter */ -static void html_export_write_head(FILE *out, int extra_column); +static void html_export_write_head(FILE *out); static void html_export_write_tail(FILE *out); +extern struct index_elem *index_elements; + +static void +html_print_emails(FILE *out, struct list_field *f) +{ + abook_list *l = csv_to_abook_list(f->data); + + for(; l; l = l->next) { + fprintf(out, "<a href=\"mailto:%s\">%s</a>", l->data, l->data); + if(l->next) + fprintf(out, ", "); + } + + abook_list_free(&l); +} + static int html_export_database(FILE *out, struct db_enumerator e) { - char tmp[MAX_EMAILSTR_LEN], *emails; - int extra_column; + struct list_field f; + struct index_elem *cur; if(list_is_empty()) return 2; - extra_column = init_extra_field(STR_EXTRA_COLUMN); - html_export_write_head(out, extra_column); + init_index(); + + html_export_write_head(out); db_enumerate_items(e) { - get_first_email(tmp, e.item); - if (*tmp) - fprintf(out, "<tr>\n<td>" - "<a href=\"mailto:%s\">%s</a>" - "</td>\n", - tmp, - db_name_get(e.item)); - else - fprintf(out, "<tr>\n<td>%s</td>\n", db_name_get(e.item)); + fprintf(out, "<tr>"); + for(cur = index_elements; cur; cur = cur->next) { + if(cur->type != INDEX_FIELD) + continue; - emails = db_email_get(e.item); - fprintf(out, "<td>%s</td>\n", emails); - free(emails); - if(extra_column >= 0) - fprintf(out, "<td>%s</td>\n", - safe_str(db_fget_byid(e.item, extra_column))); - fprintf(out, "</tr>\n\n"); + get_list_field(e.item, cur, &f); + + if(f.type == FIELD_EMAILS) { + fprintf(out, "<td>"); + html_print_emails(out, &f); + fprintf(out, "</td>"); + continue; + } else { + fprintf(out, "<td>%s</td>", safe_str(f.data)); + } + } + fprintf(out, "</tr>\n"); } html_export_write_tail(out); @@ -873,9 +890,10 @@ } static void -html_export_write_head(FILE *out, int extra_column) +html_export_write_head(FILE *out) { - char *realname = get_real_name(), *extra_column_name = NULL; + char *realname = get_real_name(), *str; + struct index_elem *cur; fprintf(out, "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\">\n"); fprintf(out, "<html>\n<head>\n <title>%s's addressbook</title>", @@ -884,11 +902,13 @@ fprintf(out, "\n<h2>%s's addressbook</h2>\n", realname ); fprintf(out, "<br><br>\n\n"); - fprintf(out, "<table border=\"1\" align=\"center\">\n"); - fprintf(out, "\n<tr><th>Name</th><th>E-mail address(es)</th>"); - if(extra_column >= 0) { - get_field_keyname(extra_column, NULL, &extra_column_name); - fprintf(out, "<th>%s</th>", safe_str(extra_column_name)); + fprintf(out, "<table border=\"1\" align=\"center\">\n<tr>"); + for(cur = index_elements; cur; cur = cur->next) { + if(cur->type != INDEX_FIELD) + continue; + + get_field_info(cur->d.field.id, NULL, &str, NULL); + fprintf(out, "<th>%s</th>", str); } fprintf(out, "</tr>\n\n"); @@ -1744,8 +1764,8 @@ fprintf(out, "\n"); for(j = PHONE; j <= MOBILEPHONE; j++) if(db_fget(e.item, j)) { - get_field_keyname(field_id(j), - NULL, &str); + get_field_info(field_id(j), + NULL, &str, NULL); fprintf(out, "%s: %s\n", str, db_fget(e.item, j)); } Index: abook.c =================================================================== RCS file: /cvsroot/abook/abook/abook.c,v retrieving revision 1.59 retrieving revision 1.60 diff -u -d -r1.59 -r1.60 --- abook.c 7 Aug 2006 19:20:25 -0000 1.59 +++ abook.c 4 Sep 2006 18:29:24 -0000 1.60 @@ -132,6 +132,8 @@ signal(SIGTERM, quit_abook_sig); + init_index(); + if(init_ui()) exit(EXIT_FAILURE); Index: edit.c =================================================================== RCS file: /cvsroot/abook/abook/edit.c,v retrieving revision 1.53 retrieving revision 1.54 diff -u -d -r1.53 -r1.54 --- edit.c 30 Aug 2006 10:49:34 -0000 1.53 +++ edit.c 4 Sep 2006 18:29:25 -0000 1.54 @@ -459,17 +459,6 @@ return is_valid_date(*day, *month, *year); } -static int -is_number(char *s) -{ - char *p; - - for(p = s; *p; p++) - if(!isdigit(*p)) - return FALSE; - return TRUE; -} - static void edit_date(int item, int nb) { --- NEW FILE: RELEASE_NOTES --- This file lists major changes affecting abook's behavior. Please read this file carefully when upgrading abook. A more comprehensive list of changes can be found in the ChangeLog file. -- 0.6.0pre2: * The four following configuration options have been deprecated and will no longer be accepted by abook: * emailpos * extra_column * extra_alternative * extrapos They have been replaced with a single more flexible option: index_format. This option is a string defining the format of a line in the main list. It allows displaying of as many fields as desired, with optional width limit, as well as an arbitrary number of alternative fields. 0.6.0pre1 (2006-08-30): * The 'customfield' command has been obsoleted by a more flexible set of commands: 'field' and 'view'. Those two commands make it possible to define fields and organize them within tabs as you see fit. Not using these commands, the look and feel of previous releases will mostly be kept the same. Also see the related 'preserve_fields' configuration variable. Index: configure =================================================================== RCS file: /cvsroot/abook/abook/configure,v retrieving revision 1.50 retrieving revision 1.51 diff -u -d -r1.50 -r1.51 --- configure 4 Aug 2006 20:30:07 -0000 1.50 +++ configure 4 Sep 2006 18:29:25 -0000 1.51 @@ -2072,7 +2072,7 @@ # Define the identity of the package. PACKAGE=abook - VERSION=0.5.5 + VERSION=0.6.0pre1 cat >>confdefs.h <<_ACEOF |
|
From: Jaakko H. <jhe...@us...> - 2006-09-01 13:30:13
|
Update of /cvsroot/abook/abook In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv5810 Modified Files: ANNOUNCE THANKS Log Message: - update ANNOUNCE and THANKS Index: ANNOUNCE =================================================================== RCS file: /cvsroot/abook/abook/ANNOUNCE,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- ANNOUNCE 29 May 2003 08:26:57 -0000 1.3 +++ ANNOUNCE 1 Sep 2006 13:29:55 -0000 1.4 @@ -1,4 +1,4 @@ -abook v 0.5 +abook Abook is small and powerful addressbook program designed to use with mutt mail client. Abook runs on Linux / FreeBSD and probably with small changes on other Index: THANKS =================================================================== RCS file: /cvsroot/abook/abook/THANKS,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- THANKS 1 Sep 2005 16:04:21 -0000 1.9 +++ THANKS 1 Sep 2006 13:29:55 -0000 1.10 @@ -19,5 +19,7 @@ Giuseppe Corbelli Mariusz Balewski Marc Tardif +Gerfried Fuchs +Josef Schugt See also AUTHORS |
|
From: Jaakko H. <jhe...@us...> - 2006-09-01 10:00:30
|
Update of /cvsroot/abook/abook In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv11286 Modified Files: configure.in Log Message: * compatibility fix for autoconf < 2.60 (Cedric Duval) Index: configure.in =================================================================== RCS file: /cvsroot/abook/abook/configure.in,v retrieving revision 1.53 retrieving revision 1.54 diff -u -d -r1.53 -r1.54 --- configure.in 24 Aug 2006 09:46:08 -0000 1.53 +++ configure.in 1 Sep 2006 10:00:22 -0000 1.54 @@ -13,12 +13,16 @@ AC_DEFUN([ABOOK_EXPAND_PREFIX], [ $1=$2 + dnl expanding twice, since from autoconf 2.60 on, $datadir refers to + dnl $datarootdir which in turn refers to $prefix $1=`( test "x$prefix" = xNONE && prefix="$ac_default_prefix" - eval echo \""[$]$1"\" )` + eval tmp_abook_prefix=\""[$]$1"\" + eval echo $tmp_abook_prefix + )` ]) -ABOOK_EXPAND_PREFIX(abook_localedir, "$datarootdir/locale") -localedir="\$(datarootdir)/locale" +ABOOK_EXPAND_PREFIX(abook_localedir, "$datadir/locale") +localedir="\$(datadir)/locale" AC_ARG_WITH(localedir, [ --with-localedir=PATH Where the locale files are installed ]) |
|
From: Jaakko H. <jhe...@us...> - 2006-08-31 05:21:00
|
Update of /cvsroot/abook/abook/po In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv5497/po Modified Files: abook.pot de.po fr.po it.po ja.po sv.po Log Message: * fix incorrect key for opening web browser in the help screen * update .pot and .po files accordingly Index: sv.po =================================================================== RCS file: /cvsroot/abook/abook/po/sv.po,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- sv.po 5 Aug 2006 12:25:46 -0000 1.11 +++ sv.po 31 Aug 2006 05:20:57 -0000 1.12 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: abook 0.5.4\n" "Report-Msgid-Bugs-To: <abo...@li...>\n" -"POT-Creation-Date: 2006-08-05 14:17+0200\n" +"POT-Creation-Date: 2006-08-31 08:12+0300\n" "PO-Revision-Date: 2006-08-05 14:20+0200\n" "Last-Translator: Susanna Björverud <sus...@te...>\n" "Language-Team: none\n" @@ -154,22 +154,22 @@ msgid "\t--formats\t\t\tlist available formats" msgstr "\t--formats\t\t\tlista tillgängliga format" -#: abook.c:497 +#: abook.c:499 #, c-format msgid "Cannot open database\n" msgstr "Kan inte öppna databasen\n" -#: abook.c:623 +#: abook.c:625 #, c-format msgid "too few arguments to make conversion\n" msgstr "alltför fÃ¥ parametrar för att kunna konvertera\n" -#: abook.c:624 +#: abook.c:626 #, c-format msgid "try --help\n" msgstr "prova --help\n" -#: abook.c:629 +#: abook.c:631 #, c-format msgid "" "input and output formats are the same\n" @@ -178,46 +178,46 @@ "input- och outputformat är identiska\n" "avslutar...\n" -#: abook.c:643 +#: abook.c:645 #, c-format msgid "input format %s not supported\n" msgstr "inputformater %s stöds ej\n" -#: abook.c:647 +#: abook.c:649 #, c-format msgid "cannot read file %s\n" msgstr "kan inte läsa filen %s\n" -#: abook.c:656 +#: abook.c:658 #, c-format msgid "output format %s not supported\n" msgstr "outputformatet %s stöds ej\n" -#: abook.c:662 +#: abook.c:664 #, c-format msgid "cannot write file %s\n" msgstr "kan inte skriva till filen %s\n" -#: abook.c:683 +#: abook.c:685 #, c-format msgid "cannot open %s\n" msgstr "kan inte öppna %s\n" -#: abook.c:686 +#: abook.c:688 #, c-format msgid "%d item(s) added to %s\n" msgstr "%d post(er) har lagts till i %s\n" -#: abook.c:688 +#: abook.c:690 msgid "Valid sender address not found" msgstr "Kunde inte hitta en giltig avsändaradress" -#: abook.c:728 +#: abook.c:730 #, c-format msgid "Address %s already in addressbook\n" msgstr "Addressen %s finns redan i adressboken\n" -#: abook.c:738 +#: abook.c:740 #, c-format msgid "" "cannot open /dev/tty\n" @@ -226,20 +226,20 @@ "kan inte öppna /dev/tty\n" "du bör kanske använda --add-email-quiet\n" -#: abook.c:744 +#: abook.c:746 #, fuzzy, c-format msgid "Add \"%s <%s>\" to %s? (%c/%c)\n" msgstr "Lägg till \"%s <%s>\" i %s? (j/n)\n" -#: abook.c:748 abook.c:755 ui.c:343 ui.c:605 +#: abook.c:750 abook.c:757 ui.c:343 ui.c:605 msgid "keybinding for yes|y" msgstr "j" -#: abook.c:749 abook.c:751 ui.c:341 +#: abook.c:751 abook.c:753 ui.c:341 msgid "keybinding for no|n" msgstr "n" -#: abook.c:776 +#: abook.c:778 #, c-format msgid "stdin is a directory or cannot stat stdin\n" msgstr "" @@ -328,55 +328,68 @@ msgid "unknown type" msgstr "okänd flagga" -#: database.c:591 +#: database.c:583 msgid "Invalid field value defined in configuration" msgstr "Ogiltigt fältvärde i konfigurationen" -#: database.c:594 +#: database.c:586 #, fuzzy msgid "Invalid field value for sorting" msgstr "Ogiltigt fältvärde i konfigurationen" -#: edit.c:51 +#: edit.c:53 msgid "Tab name too wide for screen" msgstr "Flikrubrik för bred för skärmen" -#: edit.c:330 +#: edit.c:355 msgid "keybindings_new_123456789|n123456789" msgstr "" -#: edit.c:332 +#: edit.c:357 #, c-format msgid "Choose %s to modify (<1>%s%c%s%s." msgstr "" -#: edit.c:333 +#: edit.c:358 #, fuzzy msgid "email" msgstr "Ebrev" -#: edit.c:333 +#: edit.c:358 msgid "item" msgstr "" -#: edit.c:338 +#: edit.c:363 msgid " or <n>ew" msgstr "" -#: edit.c:356 +#: edit.c:381 #, fuzzy msgid "E-mail: " msgstr "Ebrev" -#: edit.c:356 +#: edit.c:381 msgid "Item: " msgstr "" -#: edit.c:439 -msgid "sorry, input for this field type is not yet implemented" +#: edit.c:478 +msgid "Day: " msgstr "" -#: edit.c:531 +#: edit.c:478 +msgid "Month: " +msgstr "" + +#: edit.c:478 +msgid "Year (optional): " +msgstr "" + +#: edit.c:511 +#, fuzzy +msgid "Invalid date" +msgstr "ogiltigt värde" + +#: edit.c:666 msgid "Name: " msgstr "Namn: " @@ -606,8 +619,8 @@ msgstr "\tm\t\tskicka post med mutt\n" #: help.h:47 -msgid "\tu\t\tview URL with web browser\n" -msgstr "\tu\t\tvisa URL i webbläsare\n" +msgid "\tv\t\tview URL with web browser\n" +msgstr "\tv\t\tvisa URL i webbläsare\n" #: help.h:55 #, fuzzy Index: fr.po =================================================================== RCS file: /cvsroot/abook/abook/po/fr.po,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- fr.po 9 Aug 2006 21:58:04 -0000 1.14 +++ fr.po 31 Aug 2006 05:20:57 -0000 1.15 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: abook\n" "Report-Msgid-Bugs-To: <abo...@li...>\n" -"POT-Creation-Date: 2006-08-05 14:17+0200\n" +"POT-Creation-Date: 2006-08-31 08:12+0300\n" "PO-Revision-Date: 2006-08-09 23:57+0200\n" "Last-Translator: Cedric Duval <ced...@fr...>\n" "Language-Team: french\n" @@ -156,22 +156,22 @@ msgid "\t--formats\t\t\tlist available formats" msgstr "\t--formats\t\t\tlister les formats disponibles" -#: abook.c:497 +#: abook.c:499 #, c-format msgid "Cannot open database\n" msgstr "Impossible d'ouvrir la base de données\n" -#: abook.c:623 +#: abook.c:625 #, c-format msgid "too few arguments to make conversion\n" msgstr "trop peu de paramètres pour effectuer la conversion\n" -#: abook.c:624 +#: abook.c:626 #, c-format msgid "try --help\n" msgstr "essayez --help\n" -#: abook.c:629 +#: abook.c:631 #, c-format msgid "" "input and output formats are the same\n" @@ -180,46 +180,46 @@ "la source et la destination sont identiques\n" "arrêt...\n" -#: abook.c:643 +#: abook.c:645 #, c-format msgid "input format %s not supported\n" msgstr "le format source %s n'est pas supporté\n" -#: abook.c:647 +#: abook.c:649 #, c-format msgid "cannot read file %s\n" msgstr "Impossible de lire le fichier %s\n" -#: abook.c:656 +#: abook.c:658 #, c-format msgid "output format %s not supported\n" msgstr "le format de destination %s n'est pas supporté\n" -#: abook.c:662 +#: abook.c:664 #, c-format msgid "cannot write file %s\n" msgstr "impossible d'écrire le fichier %s\n" -#: abook.c:683 +#: abook.c:685 #, c-format msgid "cannot open %s\n" msgstr "impossible d'ouvrir %s\n" -#: abook.c:686 +#: abook.c:688 #, c-format msgid "%d item(s) added to %s\n" msgstr "%d entrées ajoutées à %s\n" -#: abook.c:688 +#: abook.c:690 msgid "Valid sender address not found" msgstr "Aucune adresse d'expéditeur valide trouvée" -#: abook.c:728 +#: abook.c:730 #, c-format msgid "Address %s already in addressbook\n" msgstr "L'adresse %s figure déjà dans le carnet d'adresses\n" -#: abook.c:738 +#: abook.c:740 #, c-format msgid "" "cannot open /dev/tty\n" @@ -228,20 +228,20 @@ "impossible d'ouvrir /dev/tty\n" "peut-être souhaiter-vous utiliser --add-email-quiet\n" -#: abook.c:744 +#: abook.c:746 #, c-format msgid "Add \"%s <%s>\" to %s? (%c/%c)\n" msgstr "Ajouter \"%s <%s>\" à %s ? (%c/%c)\n" -#: abook.c:748 abook.c:755 ui.c:343 ui.c:605 +#: abook.c:750 abook.c:757 ui.c:343 ui.c:605 msgid "keybinding for yes|y" msgstr "o" -#: abook.c:749 abook.c:751 ui.c:341 +#: abook.c:751 abook.c:753 ui.c:341 msgid "keybinding for no|n" msgstr "n" -#: abook.c:776 +#: abook.c:778 #, c-format msgid "stdin is a directory or cannot stat stdin\n" msgstr "stdin est un répertoire, ou impossible d'en quérir son état\n" @@ -326,53 +326,66 @@ msgid "unknown type" msgstr "type inconnu" -#: database.c:591 +#: database.c:583 msgid "Invalid field value defined in configuration" msgstr "Valeur de champ invalide définie dans la configuration" -#: database.c:594 +#: database.c:586 msgid "Invalid field value for sorting" msgstr "Valeur de champ invalide pour le classement" # Comment traduire 'tab' ? -#: edit.c:51 +#: edit.c:53 msgid "Tab name too wide for screen" msgstr "Intitulé de \"tab\" trop large pour l'écran" -#: edit.c:330 +#: edit.c:355 msgid "keybindings_new_123456789|n123456789" msgstr "n123456789" -#: edit.c:332 +#: edit.c:357 #, c-format msgid "Choose %s to modify (<1>%s%c%s%s." msgstr "Choisir %s à modifier (<1>%s%c%s%s." -#: edit.c:333 +#: edit.c:358 msgid "email" msgstr "email" -#: edit.c:333 +#: edit.c:358 msgid "item" msgstr "entrée" -#: edit.c:338 +#: edit.c:363 msgid " or <n>ew" msgstr " ou <n>nouveau" -#: edit.c:356 +#: edit.c:381 msgid "E-mail: " msgstr "Emails: " -#: edit.c:356 +#: edit.c:381 msgid "Item: " msgstr "Entrée: " -#: edit.c:439 -msgid "sorry, input for this field type is not yet implemented" -msgstr "désolé, l'entrée pour ce type de champ n'est pas encore implémentée" +#: edit.c:478 +msgid "Day: " +msgstr "" -#: edit.c:531 +#: edit.c:478 +msgid "Month: " +msgstr "" + +#: edit.c:478 +msgid "Year (optional): " +msgstr "" + +#: edit.c:511 +#, fuzzy +msgid "Invalid date" +msgstr "valeur invalide" + +#: edit.c:666 msgid "Name: " msgstr "Nom: " @@ -605,8 +618,8 @@ msgstr "\tm\t\tenvoyer un courrier électronique avec mutt\n" #: help.h:47 -msgid "\tu\t\tview URL with web browser\n" -msgstr "\tu\t\tvisualiser l'URL avec un navigateur web\n" +msgid "\tv\t\tview URL with web browser\n" +msgstr "\tv\t\tvisualiser l'URL avec un navigateur web\n" #: help.h:55 msgid "\tarrows/h,l\t\tchange tab\n" @@ -836,6 +849,9 @@ msgid "Custom5" msgstr "Personnalisé5" +#~ msgid "sorry, input for this field type is not yet implemented" +#~ msgstr "désolé, l'entrée pour ce type de champ n'est pas encore implémentée" + #~ msgid "?:help c:contact a:address p:phone o:other" #~ msgstr "?:aide c:contact a:adresse p:téléphone o:autre" Index: de.po =================================================================== RCS file: /cvsroot/abook/abook/po/de.po,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- de.po 5 Aug 2006 12:25:46 -0000 1.4 +++ de.po 31 Aug 2006 05:20:57 -0000 1.5 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: abook 0.5.5pre1\n" "Report-Msgid-Bugs-To: <abo...@li...>\n" -"POT-Creation-Date: 2006-08-05 14:17+0200\n" +"POT-Creation-Date: 2006-08-31 08:12+0300\n" "PO-Revision-Date: 2006-08-05 14:12+0200\n" "Last-Translator: Johannes WeiÃl <ja...@mo...>\n" "Language-Team: German <de...@li...>\n" @@ -154,23 +154,23 @@ msgid "\t--formats\t\t\tlist available formats" msgstr "\t--formats\t\t\tVerfügbare Formate auflisten" -#: abook.c:497 +#: abook.c:499 #, c-format msgid "Cannot open database\n" msgstr "Kann die Datenbank nicht öffnen\n" -#: abook.c:623 +#: abook.c:625 #, c-format msgid "too few arguments to make conversion\n" msgstr "zu wenig Argumente um die Konvertierung durchzuführen\n" -#: abook.c:624 +#: abook.c:626 #, c-format msgid "try --help\n" msgstr "versuche einmal --help\n" # I think "Abbruch" is better than e.g. "Beenden" -#: abook.c:629 +#: abook.c:631 #, c-format msgid "" "input and output formats are the same\n" @@ -179,47 +179,47 @@ "Eingabe- und Ausgabedatei sind identisch\n" "Abbruch...\n" -#: abook.c:643 +#: abook.c:645 #, c-format msgid "input format %s not supported\n" msgstr "Eingabeformat %s wird nicht unterstützt\n" -#: abook.c:647 +#: abook.c:649 #, c-format msgid "cannot read file %s\n" msgstr "kann die Datei %s nicht lesen\n" -#: abook.c:656 +#: abook.c:658 #, c-format msgid "output format %s not supported\n" msgstr "Ausgabeformat %s wird nicht unterstützt\n" -#: abook.c:662 +#: abook.c:664 #, c-format msgid "cannot write file %s\n" msgstr "kann die Datei %s nicht schreiben\n" -#: abook.c:683 +#: abook.c:685 #, c-format msgid "cannot open %s\n" msgstr "kann %s nicht öffnen\n" -#: abook.c:686 +#: abook.c:688 #, c-format msgid "%d item(s) added to %s\n" msgstr "%d Element(e) zu %s hinzugefügt\n" -#: abook.c:688 +#: abook.c:690 msgid "Valid sender address not found" msgstr "Keine gültige Absender-Adresse gefunden" -#: abook.c:728 +#: abook.c:730 #, c-format msgid "Address %s already in addressbook\n" msgstr "Adresse %s befindet sich bereits im Adressbuch\n" # I don't want to translate 'you' with 'du' -#: abook.c:738 +#: abook.c:740 #, c-format msgid "" "cannot open /dev/tty\n" @@ -228,20 +228,20 @@ "kann /dev/tty nicht öffnen\n" "versuche es einmal mit --add-email-quiet\n" -#: abook.c:744 +#: abook.c:746 #, c-format msgid "Add \"%s <%s>\" to %s? (%c/%c)\n" msgstr "Füge \"%s <%s>\" zu %s hinzu? (%c/%c)\n" -#: abook.c:748 abook.c:755 ui.c:343 ui.c:605 +#: abook.c:750 abook.c:757 ui.c:343 ui.c:605 msgid "keybinding for yes|y" msgstr "j" -#: abook.c:749 abook.c:751 ui.c:341 +#: abook.c:751 abook.c:753 ui.c:341 msgid "keybinding for no|n" msgstr "n" -#: abook.c:776 +#: abook.c:778 #, c-format msgid "stdin is a directory or cannot stat stdin\n" msgstr "" @@ -333,55 +333,68 @@ msgid "unknown type" msgstr "unbekannte Option" -#: database.c:591 +#: database.c:583 msgid "Invalid field value defined in configuration" msgstr "Ungültiger Feld-Wert in der Konfiguration festgelegt" -#: database.c:594 +#: database.c:586 #, fuzzy msgid "Invalid field value for sorting" msgstr "Ungültiger Feld-Wert in der Konfiguration festgelegt" -#: edit.c:51 +#: edit.c:53 msgid "Tab name too wide for screen" msgstr "Kartei-Name zu breit für den Bildschirm" -#: edit.c:330 +#: edit.c:355 msgid "keybindings_new_123456789|n123456789" msgstr "" -#: edit.c:332 +#: edit.c:357 #, c-format msgid "Choose %s to modify (<1>%s%c%s%s." msgstr "" -#: edit.c:333 +#: edit.c:358 #, fuzzy msgid "email" msgstr "E-Mails" -#: edit.c:333 +#: edit.c:358 msgid "item" msgstr "" -#: edit.c:338 +#: edit.c:363 msgid " or <n>ew" msgstr "" -#: edit.c:356 +#: edit.c:381 #, fuzzy msgid "E-mail: " msgstr "E-Mails" -#: edit.c:356 +#: edit.c:381 msgid "Item: " msgstr "" -#: edit.c:439 -msgid "sorry, input for this field type is not yet implemented" +#: edit.c:478 +msgid "Day: " msgstr "" -#: edit.c:531 +#: edit.c:478 +msgid "Month: " +msgstr "" + +#: edit.c:478 +msgid "Year (optional): " +msgstr "" + +#: edit.c:511 +#, fuzzy +msgid "Invalid date" +msgstr "ungültiger Wert" + +#: edit.c:666 msgid "Name: " msgstr "Name: " @@ -617,8 +630,8 @@ msgstr "\tm\t\tE-Mail mit Mutt senden\n" #: help.h:47 -msgid "\tu\t\tview URL with web browser\n" -msgstr "\tu\t\tURL mit Web-Browser anzeigen\n" +msgid "\tv\t\tview URL with web browser\n" +msgstr "\tv\t\tURL mit Web-Browser anzeigen\n" #: help.h:55 #, fuzzy Index: abook.pot =================================================================== RCS file: /cvsroot/abook/abook/po/abook.pot,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- abook.pot 5 Aug 2006 12:25:47 -0000 1.13 +++ abook.pot 31 Aug 2006 05:20:57 -0000 1.14 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: <abo...@li...>\n" -"POT-Creation-Date: 2006-08-05 14:17+0200\n" +"POT-Creation-Date: 2006-08-31 08:12+0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL...@li...>\n" @@ -147,88 +147,88 @@ msgid "\t--formats\t\t\tlist available formats" msgstr "" -#: abook.c:497 +#: abook.c:499 #, c-format msgid "Cannot open database\n" msgstr "" -#: abook.c:623 +#: abook.c:625 #, c-format msgid "too few arguments to make conversion\n" msgstr "" -#: abook.c:624 +#: abook.c:626 #, c-format msgid "try --help\n" msgstr "" -#: abook.c:629 +#: abook.c:631 #, c-format msgid "" "input and output formats are the same\n" "exiting...\n" msgstr "" -#: abook.c:643 +#: abook.c:645 #, c-format msgid "input format %s not supported\n" msgstr "" -#: abook.c:647 +#: abook.c:649 #, c-format msgid "cannot read file %s\n" msgstr "" -#: abook.c:656 +#: abook.c:658 #, c-format msgid "output format %s not supported\n" msgstr "" -#: abook.c:662 +#: abook.c:664 #, c-format msgid "cannot write file %s\n" msgstr "" -#: abook.c:683 +#: abook.c:685 #, c-format msgid "cannot open %s\n" msgstr "" -#: abook.c:686 +#: abook.c:688 #, c-format msgid "%d item(s) added to %s\n" msgstr "" -#: abook.c:688 +#: abook.c:690 msgid "Valid sender address not found" msgstr "" -#: abook.c:728 +#: abook.c:730 #, c-format msgid "Address %s already in addressbook\n" msgstr "" -#: abook.c:738 +#: abook.c:740 #, c-format msgid "" "cannot open /dev/tty\n" "you may want to use --add-email-quiet\n" msgstr "" -#: abook.c:744 +#: abook.c:746 #, c-format msgid "Add \"%s <%s>\" to %s? (%c/%c)\n" msgstr "" -#: abook.c:748 abook.c:755 ui.c:343 ui.c:605 +#: abook.c:750 abook.c:757 ui.c:343 ui.c:605 msgid "keybinding for yes|y" msgstr "" -#: abook.c:749 abook.c:751 ui.c:341 +#: abook.c:751 abook.c:753 ui.c:341 msgid "keybinding for no|n" msgstr "" -#: abook.c:776 +#: abook.c:778 #, c-format msgid "stdin is a directory or cannot stat stdin\n" msgstr "" @@ -313,52 +313,64 @@ msgid "unknown type" msgstr "" -#: database.c:591 +#: database.c:583 msgid "Invalid field value defined in configuration" msgstr "" -#: database.c:594 +#: database.c:586 msgid "Invalid field value for sorting" msgstr "" -#: edit.c:51 +#: edit.c:53 msgid "Tab name too wide for screen" msgstr "" -#: edit.c:330 +#: edit.c:355 msgid "keybindings_new_123456789|n123456789" msgstr "" -#: edit.c:332 +#: edit.c:357 #, c-format msgid "Choose %s to modify (<1>%s%c%s%s." msgstr "" -#: edit.c:333 +#: edit.c:358 msgid "email" msgstr "" -#: edit.c:333 +#: edit.c:358 msgid "item" msgstr "" -#: edit.c:338 +#: edit.c:363 msgid " or <n>ew" msgstr "" -#: edit.c:356 +#: edit.c:381 msgid "E-mail: " msgstr "" -#: edit.c:356 +#: edit.c:381 msgid "Item: " msgstr "" -#: edit.c:439 -msgid "sorry, input for this field type is not yet implemented" +#: edit.c:478 +msgid "Day: " msgstr "" -#: edit.c:531 +#: edit.c:478 +msgid "Month: " +msgstr "" + +#: edit.c:478 +msgid "Year (optional): " +msgstr "" + +#: edit.c:511 +msgid "Invalid date" +msgstr "" + +#: edit.c:666 msgid "Name: " msgstr "" @@ -587,7 +599,7 @@ msgstr "" #: help.h:47 -msgid "\tu\t\tview URL with web browser\n" +msgid "\tv\t\tview URL with web browser\n" msgstr "" #: help.h:55 Index: ja.po =================================================================== RCS file: /cvsroot/abook/abook/po/ja.po,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- ja.po 5 Aug 2006 12:25:46 -0000 1.3 +++ ja.po 31 Aug 2006 05:20:57 -0000 1.4 @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: 0.5.5\n" "Report-Msgid-Bugs-To: <abo...@li...>\n" -"POT-Creation-Date: 2006-08-05 14:17+0200\n" +"POT-Creation-Date: 2006-08-31 08:12+0300\n" "PO-Revision-Date: 2005-10-18 18:10+0200\n" "Last-Translator: TAKAHASHI Tamotsu <tt...@la...>\n" "Language-Team: japanese\n" @@ -152,22 +152,22 @@ msgid "\t--formats\t\t\tlist available formats" msgstr "\t--formats\t\t\tÍøÍѲÄǽ¤Ê·Á¼°°ìÍ÷¤òɽ¼¨¤¹¤ë" -#: abook.c:497 +#: abook.c:499 #, c-format msgid "Cannot open database\n" msgstr "¥Ç¡¼¥¿¥Ù¡¼¥¹¤¬³«¤±¤Þ¤»¤ó\n" -#: abook.c:623 +#: abook.c:625 #, c-format msgid "too few arguments to make conversion\n" msgstr "ÊÑ´¹¤ËɬÍפʥª¥×¥·¥ç¥ó¤¬»ØÄꤵ¤ì¤Æ¤¤¤Þ¤»¤ó\n" -#: abook.c:624 +#: abook.c:626 #, c-format msgid "try --help\n" msgstr "--help ¤ò¤´Í÷¤¯¤À¤µ¤¤\n" -#: abook.c:629 +#: abook.c:631 #, c-format msgid "" "input and output formats are the same\n" @@ -176,46 +176,46 @@ "ÆþÎϤȽÐÎϤηÁ¼°¤¬Æ±¤¸¤Ç¤¹\n" "½ªÎ»¤·¤Þ¤¹\n" -#: abook.c:643 +#: abook.c:645 #, c-format msgid "input format %s not supported\n" msgstr "ÆþÎÏ·Á¼°¤È¤·¤Æ %s ¤Ï¤´ÍøÍѤ¤¤¿¤À¤±¤Þ¤»¤ó\n" -#: abook.c:647 +#: abook.c:649 #, c-format msgid "cannot read file %s\n" msgstr "¥Õ¥¡¥¤¥ë %s ¤¬Æɤ߽Ф»¤Þ¤»¤ó\n" -#: abook.c:656 +#: abook.c:658 #, c-format msgid "output format %s not supported\n" msgstr "½ÐÎÏ·Á¼°¤È¤·¤Æ %s ¤Ï¤´ÍøÍѤ¤¤¿¤À¤±¤Þ¤»¤ó\n" -#: abook.c:662 +#: abook.c:664 #, c-format msgid "cannot write file %s\n" msgstr "¥Õ¥¡¥¤¥ë %s ¤Ë½ñ¤¹þ¤á¤Þ¤»¤ó\n" -#: abook.c:683 +#: abook.c:685 #, c-format msgid "cannot open %s\n" msgstr "%s ¤¬³«¤±¤Þ¤»¤ó\n" -#: abook.c:686 +#: abook.c:688 #, c-format msgid "%d item(s) added to %s\n" msgstr "%d ¸Ä¤Î¹àÌܤò %s ¤ËÄɲä·¤Þ¤·¤¿\n" -#: abook.c:688 +#: abook.c:690 msgid "Valid sender address not found" msgstr "ǧ¼±²Äǽ¤Êº¹½Ð¿Í¥¢¥É¥ì¥¹¤¬¤¢¤ê¤Þ¤»¤ó¤Ç¤·¤¿" -#: abook.c:728 +#: abook.c:730 #, c-format msgid "Address %s already in addressbook\n" msgstr "¥¢¥É¥ì¥¹ %s ¤Ï´û¤Ë¥¢¥É¥ì¥¹Ä¢¤ËÆþ¤Ã¤Æ¤¤¤Þ¤¹\n" -#: abook.c:738 +#: abook.c:740 #, c-format msgid "" "cannot open /dev/tty\n" @@ -224,20 +224,20 @@ "/dev/tty ¤¬³«¤±¤Þ¤»¤ó\n" "--add-email-quiet ¤ò¤´ÍøÍѤˤʤä¿Êý¤¬Îɤ¤¤«¤â¤·¤ì¤Þ¤»¤ó\n" -#: abook.c:744 +#: abook.c:746 #, c-format msgid "Add \"%s <%s>\" to %s? (%c/%c)\n" msgstr "\"%s <%s>\" ¤ò %s ¤ËÄɲä·¤Þ¤¹¤«? (%c/%c)\n" -#: abook.c:748 abook.c:755 ui.c:343 ui.c:605 +#: abook.c:750 abook.c:757 ui.c:343 ui.c:605 msgid "keybinding for yes|y" msgstr "y" -#: abook.c:749 abook.c:751 ui.c:341 +#: abook.c:751 abook.c:753 ui.c:341 msgid "keybinding for no|n" msgstr "n" -#: abook.c:776 +#: abook.c:778 #, c-format msgid "stdin is a directory or cannot stat stdin\n" msgstr "ɸ½àÆþÎϤ¬¥Ç¥£¥ì¥¯¥È¥ê¤«¡¢stat ÉÔ²Äǽ¤Ç¤¹\n" @@ -324,55 +324,68 @@ msgid "unknown type" msgstr "ÉÔÌÀ¤Ê¥ª¥×¥·¥ç¥ó¤Ç¤¹" -#: database.c:591 +#: database.c:583 msgid "Invalid field value defined in configuration" msgstr "ÉÔÀµ¤Ê¹àÌÜ̾¤¬ÀßÄꤵ¤ì¤Æ¤¤¤Þ¤¹" -#: database.c:594 +#: database.c:586 #, fuzzy msgid "Invalid field value for sorting" msgstr "ÉÔÀµ¤Ê¹àÌÜ̾¤¬ÀßÄꤵ¤ì¤Æ¤¤¤Þ¤¹" -#: edit.c:51 +#: edit.c:53 msgid "Tab name too wide for screen" msgstr "¥¿¥Ö̾¤¬²èÌ̤«¤é¤Ï¤ß½Ð¤Þ¤¹" -#: edit.c:330 +#: edit.c:355 msgid "keybindings_new_123456789|n123456789" msgstr "" -#: edit.c:332 +#: edit.c:357 #, c-format msgid "Choose %s to modify (<1>%s%c%s%s." msgstr "" -#: edit.c:333 +#: edit.c:358 #, fuzzy msgid "email" msgstr "¥¢¥É¥ì¥¹" -#: edit.c:333 +#: edit.c:358 msgid "item" msgstr "" -#: edit.c:338 +#: edit.c:363 msgid " or <n>ew" msgstr "" -#: edit.c:356 +#: edit.c:381 #, fuzzy msgid "E-mail: " msgstr "¥¢¥É¥ì¥¹" -#: edit.c:356 +#: edit.c:381 msgid "Item: " msgstr "" -#: edit.c:439 -msgid "sorry, input for this field type is not yet implemented" +#: edit.c:478 +msgid "Day: " msgstr "" -#: edit.c:531 +#: edit.c:478 +msgid "Month: " +msgstr "" + +#: edit.c:478 +msgid "Year (optional): " +msgstr "" + +#: edit.c:511 +#, fuzzy +msgid "Invalid date" +msgstr "ÉÔÀµ¤ÊÃͤǤ¹" + +#: edit.c:666 #, fuzzy msgid "Name: " msgstr "»á̾" @@ -602,8 +615,8 @@ msgstr "\tm\t\tMutt ¤Ç¥á¡¼¥ë¤òÁ÷¤ë\n" #: help.h:47 -msgid "\tu\t\tview URL with web browser\n" -msgstr "\tu\t\tURL ¤ò¥Ö¥é¥¦¥¶¤Ç±ÜÍ÷¤¹¤ë\n" +msgid "\tv\t\tview URL with web browser\n" +msgstr "\tv\t\tURL ¤ò¥Ö¥é¥¦¥¶¤Ç±ÜÍ÷¤¹¤ë\n" #: help.h:55 #, fuzzy Index: it.po =================================================================== RCS file: /cvsroot/abook/abook/po/it.po,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- it.po 25 Aug 2006 23:26:55 -0000 1.3 +++ it.po 31 Aug 2006 05:20:57 -0000 1.4 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: abook 0.5.5\n" "Report-Msgid-Bugs-To: <abo...@li...>\n" -"POT-Creation-Date: 2006-08-05 14:17+0200\n" +"POT-Creation-Date: 2006-08-31 08:12+0300\n" "PO-Revision-Date: 2006-08-26 01:26+0200\n" "Last-Translator: Claudio Stazzone <c.s...@ju...>\n" "Language-Team: none\n" @@ -156,22 +156,22 @@ msgid "\t--formats\t\t\tlist available formats" msgstr "\t--formats\t\t\tlista dei formati disponibili" -#: abook.c:497 +#: abook.c:499 #, c-format msgid "Cannot open database\n" msgstr "Non posso aprire il database\n" -#: abook.c:623 +#: abook.c:625 #, c-format msgid "too few arguments to make conversion\n" msgstr "argomenti insufficienti per convertire\n" -#: abook.c:624 +#: abook.c:626 #, c-format msgid "try --help\n" msgstr "prova --help\n" -#: abook.c:629 +#: abook.c:631 #, c-format msgid "" "input and output formats are the same\n" @@ -180,46 +180,46 @@ "i formati di input e output sono gli stessi\n" "uscita...\n" -#: abook.c:643 +#: abook.c:645 #, c-format msgid "input format %s not supported\n" msgstr "formato di input %s non supportato\n" -#: abook.c:647 +#: abook.c:649 #, c-format msgid "cannot read file %s\n" msgstr "non posso leggere il file %s\n" -#: abook.c:656 +#: abook.c:658 #, c-format msgid "output format %s not supported\n" msgstr "formato di output %s non supportato\n" -#: abook.c:662 +#: abook.c:664 #, c-format msgid "cannot write file %s\n" msgstr "non posso scrivere il file %s\n" -#: abook.c:683 +#: abook.c:685 #, c-format msgid "cannot open %s\n" msgstr "non posso aprire %s\n" -#: abook.c:686 +#: abook.c:688 #, c-format msgid "%d item(s) added to %s\n" msgstr "%d oggetto/i aggiunto/i a %s\n" -#: abook.c:688 +#: abook.c:690 msgid "Valid sender address not found" msgstr "Impossibile trovare un valido indirizzo del mittente" -#: abook.c:728 +#: abook.c:730 #, c-format msgid "Address %s already in addressbook\n" msgstr "Indirizzo %s già presente in rubrica\n" -#: abook.c:738 +#: abook.c:740 #, c-format msgid "" "cannot open /dev/tty\n" @@ -228,20 +228,20 @@ "non posso aprire /dev/tty\n" "puoi usare --add-email-quiet\n" -#: abook.c:744 +#: abook.c:746 #, c-format msgid "Add \"%s <%s>\" to %s? (%c/%c)\n" msgstr "Aggiungi \"%s <%s>\" a %s? (%c/%c)\n" -#: abook.c:748 abook.c:755 ui.c:343 ui.c:605 +#: abook.c:750 abook.c:757 ui.c:343 ui.c:605 msgid "keybinding for yes|y" msgstr "s" -#: abook.c:749 abook.c:751 ui.c:341 +#: abook.c:751 abook.c:753 ui.c:341 msgid "keybinding for no|n" msgstr "n" -#: abook.c:776 +#: abook.c:778 #, c-format msgid "stdin is a directory or cannot stat stdin\n" msgstr "standard input è una directory o non posso usare standard input\n" @@ -326,52 +326,65 @@ msgid "unknown type" msgstr "tipo sconosciuto" -#: database.c:591 +#: database.c:583 msgid "Invalid field value defined in configuration" msgstr "Valore di campo errato nella configurazione" -#: database.c:594 +#: database.c:586 msgid "Invalid field value for sorting" msgstr "Valore di campo errato per l'ordinamento" -#: edit.c:51 +#: edit.c:53 msgid "Tab name too wide for screen" msgstr "Nome etichetta troppo largo per lo schermo" -#: edit.c:330 +#: edit.c:355 msgid "keybindings_new_123456789|n123456789" msgstr "keybindings_new_123456789|n123456789" -#: edit.c:332 +#: edit.c:357 #, c-format msgid "Choose %s to modify (<1>%s%c%s%s." msgstr "Scegli %s per modificare (<1>%s%c%s%s." -#: edit.c:333 +#: edit.c:358 msgid "email" msgstr "email" -#: edit.c:333 +#: edit.c:358 msgid "item" msgstr "oggetto" -#: edit.c:338 +#: edit.c:363 msgid " or <n>ew" msgstr "o <n>uovo" -#: edit.c:356 +#: edit.c:381 msgid "E-mail: " msgstr "E-mails:" -#: edit.c:356 +#: edit.c:381 msgid "Item: " msgstr "Oggetto:" -#: edit.c:439 -msgid "sorry, input for this field type is not yet implemented" -msgstr "mi dispiace, questo tipo di campo non e' ancora stato implementato" +#: edit.c:478 +msgid "Day: " +msgstr "" -#: edit.c:531 +#: edit.c:478 +msgid "Month: " +msgstr "" + +#: edit.c:478 +msgid "Year (optional): " +msgstr "" + +#: edit.c:511 +#, fuzzy +msgid "Invalid date" +msgstr "valore non valido" + +#: edit.c:666 msgid "Name: " msgstr "Nome: " @@ -604,8 +617,8 @@ msgstr "\tm\t\tspedisci mail con mutt\n" #: help.h:47 -msgid "\tu\t\tview URL with web browser\n" -msgstr "\tu\t\tmostra URL con browser html\n" +msgid "\tv\t\tview URL with web browser\n" +msgstr "\tv\t\tmostra URL con browser html\n" #: help.h:55 msgid "\tarrows/h,l\t\tchange tab\n" @@ -833,6 +846,9 @@ msgid "Custom5" msgstr "Personalizzato 5" +#~ msgid "sorry, input for this field type is not yet implemented" +#~ msgstr "mi dispiace, questo tipo di campo non e' ancora stato implementato" + #~ msgid "?:help c:contact a:address p:phone o:other" #~ msgstr "?:aiuto c:contatto a:indirizzo p:telefono o:altro" |
|
From: Jaakko H. <jhe...@us...> - 2006-08-31 05:21:00
|
Update of /cvsroot/abook/abook In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv5497 Modified Files: help.h Log Message: * fix incorrect key for opening web browser in the help screen * update .pot and .po files accordingly Index: help.h =================================================================== RCS file: /cvsroot/abook/abook/help.h,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- help.h 25 Oct 2005 23:27:24 -0000 1.14 +++ help.h 31 Aug 2006 05:20:57 -0000 1.15 @@ -44,7 +44,7 @@ N_(" Z move current item down\n"), "\n", N_(" m send mail with mutt\n"), -N_(" u view URL with web browser\n"), +N_(" v view URL with web browser\n"), NULL }; |
|
From: Jaakko H. <jhe...@us...> - 2006-08-30 10:49:38
|
Update of /cvsroot/abook/abook In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv29566 Modified Files: edit.c Log Message: * max_len should be size_t Index: edit.c =================================================================== RCS file: /cvsroot/abook/abook/edit.c,v retrieving revision 1.52 retrieving revision 1.53 diff -u -d -r1.52 -r1.53 --- edit.c 26 Aug 2006 19:16:41 -0000 1.52 +++ edit.c 30 Aug 2006 10:49:34 -0000 1.53 @@ -289,7 +289,7 @@ * valid string */ static int -change_field(char *msg, char **field, int max_len) +change_field(char *msg, char **field, size_t max_len) { char *old; int ret = 0; @@ -314,7 +314,7 @@ } static int -change_name_field(char *msg, char **field, int max_len) +change_name_field(char *msg, char **field, size_t max_len) { char *tmp; int ret; |
