From: Jaakko Heinonen Date: Wed, 21 Sep 2005 16:50:31 +0000 (+0000) Subject: - spelling fixes (Cedric Duval & co) X-Git-Tag: upstream/0.6.1~2^2~166 X-Git-Url: https://git.deb.at/w?a=commitdiff_plain;h=e34f84be19f4ff5c2ea7299ef9cfae0d450a6c24;p=pkg%2Fabook.git - spelling fixes (Cedric Duval & co) - remove dead code (Cedric Duval) --- diff --git a/abook.c b/abook.c index c2367bb..daffe43 100644 --- a/abook.c +++ b/abook.c @@ -407,7 +407,7 @@ show_usage() "add the sender to the addressbook")); puts (_(" --add-email-quiet " "same as --add-email but doesn't\n" - " confirm adding")); + " require to confirm adding")); putchar('\n'); puts (_(" --convert convert address book files")); puts (_(" options to use with --convert:")); @@ -737,7 +737,7 @@ add_email_add_item(int quiet, char *name, char *email) do { /* TODO gettext: handle translated keypresses? */ - printf(_("Add ``%s <%s>'' to %s ? (y/n)\n"), + printf(_("Add \"%s <%s>\" to %s? (y/n)\n"), name, email, datafile); diff --git a/database.c b/database.c index ef4b67b..092f563 100644 --- a/database.c +++ b/database.c @@ -403,7 +403,7 @@ sort_by_field(int field) if(field < 0) { field = name2field(opt_get_str(STR_SORT_FIELD)); if(field < 0) { - statusline_msg(_("Not valid field value defined " + statusline_msg(_("Invalid field value defined " "in configuration")); return; } diff --git a/filter.c b/filter.c index 4b5330e..1d93d62 100644 --- a/filter.c +++ b/filter.c @@ -71,7 +71,7 @@ struct abook_input_filter i_filters[] = { { "mutt", N_("mutt alias"), mutt_parse_file }, { "pine", N_("pine addressbook"), pine_parse_file }, { "csv", N_("comma separated values"), csv_parse_file }, - { "allcsv", N_("comma separated all values"), allcsv_parse_file }, + { "allcsv", N_("comma separated values (all fields)"), allcsv_parse_file }, { "palmcsv", N_("Palm comma separated values"), palmcsv_parse_file }, { "\0", NULL, NULL } }; @@ -213,7 +213,7 @@ import_database() if(i_read_file(filename, i_filters[filter].func )) statusline_msg(_("Error occured while opening the file")); else if(tmp == items) - statusline_msg(_("Hmm.., file seems not to be a valid file")); + statusline_msg(_("File does not seem to be a valid addressbook")); refresh_screen(); free(filename); @@ -323,7 +323,7 @@ export_database() if(selected_items()) { /* TODO gettext: handle translated keypresses? */ - statusline_addstr(_("Export All/Selected/Cancel (A/s/c)")); + statusline_addstr(_("Export All/Selected/Cancel (A/s/c)?")); switch( tolower(getch()) ) { case 's': enum_mode = ENUM_SELECTED; diff --git a/help.h b/help.h index dcc031e..7de967e 100644 --- a/help.h +++ b/help.h @@ -11,7 +11,7 @@ static char *mainhelp[] = { N_(" ? help\n"), N_(" q quit\n"), N_(" Q quit without saving\n"), -N_(" P quit and print selected item(s) to stderr\n"), +N_(" P quit and output selected item(s) to stderr\n"), N_(" ^L refresh screen\n"), "\n", N_(" arrows / j,k scroll list\n"), @@ -22,7 +22,7 @@ N_(" D duplicate item\n"), "\n", N_(" space select item\n"), N_(" + select all\n"), -N_(" - select none\n"), +N_(" - unselect all\n"), N_(" * invert selection\n"), "\n", N_(" w write database to disk\n"), @@ -37,14 +37,14 @@ N_(" s sort database\n"), N_(" S \"surname sort\"\n"), N_(" F sort by field (defined in configuration file)\n"), "\n", -N_(" / find\n"), -N_(" \\ find next\n"), +N_(" / search\n"), +N_(" \\ search next occurrence\n"), "\n", N_(" A move current item up\n"), N_(" Z move current item down\n"), "\n", N_(" m send mail with mutt\n"), -N_(" u view URL with www browser\n"), +N_(" u view URL with web browser\n"), NULL }; @@ -64,7 +64,7 @@ N_(" r roll e-mail addresses\n"), N_(" u undo\n"), "\n", N_(" m send mail with mutt\n"), -N_(" v view url with WWW browser\n"), +N_(" v view url with web browser\n"), "\n", NULL diff --git a/options.c b/options.c index 8a0f7e9..0783173 100644 --- a/options.c +++ b/options.c @@ -189,10 +189,8 @@ opt_line_remove_comments(char *p) for(; *p; p++) { switch(*p) { case '\"': - if(!escape) { + if(!escape) in_quote = !in_quote; - escape = FALSE; - } break; case '\\': escape = TRUE; diff --git a/po/LINGUAS b/po/LINGUAS index dd08588..8a3cb7f 100644 --- a/po/LINGUAS +++ b/po/LINGUAS @@ -1,2 +1,2 @@ # Set of available languages -fr sv +fr sv fi diff --git a/po/abook.pot b/po/abook.pot index 99ac530..5a27fa3 100644 --- a/po/abook.pot +++ b/po/abook.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-09-17 12:43+0300\n" +"POT-Creation-Date: 2005-09-17 13:55+0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -154,7 +154,7 @@ msgstr "" #: abook.c:619 #, c-format -msgid "too few argumets to make conversion\n" +msgid "too few arguments to make conversion\n" msgstr "" #: abook.c:620 diff --git a/po/fr.gmo b/po/fr.gmo index e0bea31..187f887 100644 Binary files a/po/fr.gmo and b/po/fr.gmo differ diff --git a/po/fr.po b/po/fr.po index 2be1a9f..3527cbb 100644 --- a/po/fr.po +++ b/po/fr.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: abook\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-09-17 12:43+0300\n" +"POT-Creation-Date: 2005-09-17 13:55+0300\n" "PO-Revision-Date: 2005-09-14 22:48+0200\n" "Last-Translator: YOUR NAME \n" "Language-Team: french\n" @@ -162,8 +162,8 @@ msgid "Cannot open database\n" msgstr "Impossible d'ouvrir la base de données\n" #: abook.c:619 -#, c-format -msgid "too few argumets to make conversion\n" +#, fuzzy, c-format +msgid "too few arguments to make conversion\n" msgstr "trop peu de paramètres pour effectuer la conversion\n" #: abook.c:620 diff --git a/po/sv.gmo b/po/sv.gmo index 9d57a58..7e79633 100644 Binary files a/po/sv.gmo and b/po/sv.gmo differ diff --git a/po/sv.po b/po/sv.po index 72bedf6..d0448e0 100644 --- a/po/sv.po +++ b/po/sv.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: abook 0.5.4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-09-17 12:43+0300\n" +"POT-Creation-Date: 2005-09-17 13:55+0300\n" "PO-Revision-Date: 2005-09-14 23:12+0200\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" @@ -160,8 +160,8 @@ msgid "Cannot open database\n" msgstr "Kan inte öppna databasen\n" #: abook.c:619 -#, c-format -msgid "too few argumets to make conversion\n" +#, fuzzy, c-format +msgid "too few arguments to make conversion\n" msgstr "Alltför få parametrar för att kunna konvertera\n" #: abook.c:620 diff --git a/ui.c b/ui.c index b58ec59..e899be6 100644 --- a/ui.c +++ b/ui.c @@ -261,11 +261,9 @@ statusline_ask_boolean(char *msg, int def) switch(tolower(getch())) { case 'n': - case 'N': ret = FALSE; break; case 'y': - case 'Y': ret = TRUE; break; default: