- spelling fixes (Cedric Duval & co)

- remove dead code (Cedric Duval)

diff --git a/abook.c b/abook.c
index c2367bbec44bf18c76986fa0df9086c48eae4124..daffe43adab1bd0245e63d4684b469d4f1fe2bc5 100644 (file)
--- 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 ef4b67bb51bc27ce7eaee4bc5fb4fee4569907cd..092f56351911766aa44cda62e0116d785ef91454 100644 (file)
--- 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 4b5330e4b383eadd8e59e25b645f0a458cb1696a..1d93d62bee2fcdc9c2c493d4f56fa8ad4fd98efd 100644 (file)
--- 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 dcc031e800ec301280345b8e02805838a0048c93..7de967ee1c115e59a0b8c192cc9db490507d14c5 100644 (file)
--- 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 8a0f7e9db71cccf22d879f29cac0d8bb537776cc..0783173a1293131c90d733ddef1effa28e07528d 100644 (file)
--- 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 dd0858850075d631cf67ca1a6f1c06dd268a9723..8a3cb7fae5abee079ebfb103ea6b993b9cfcd7d2 100644 (file)
--- 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 99ac53036e528f3ccd549557d89374fe66843b5d..5a27fa3dd352cc94246f135e75753991a3f06903 100644 (file)
--- a/po/abook.pot
+++ b/po/abook.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: <cedricduval+abook@free.fr>\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 <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -154,7 +154,7 @@ msgstr ""
 
 #: abook.c:619
 #, c-format
-msgid "too few argumets to make conversion\n"
+msgid "too few arguments to make conversion\n"
 msgstr ""
 
 #: abook.c:620

diff --git a/po/fr.gmo b/po/fr.gmo
index e0bea311f1a82579d908085064eb984d83ede1f3..187f88765d702fb5029d0571b0e5134f9033f68c 100644 (file)
Binary files a/po/fr.gmo and b/po/fr.gmo differ

diff --git a/po/fr.po b/po/fr.po
index 2be1a9f9cba0fc00697f23e5867d832bf59d4a93..3527cbb6e24f62f26f977cdd7bd035fab0503e3c 100644 (file)
--- a/po/fr.po
+++ b/po/fr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: abook\n"
 "Report-Msgid-Bugs-To: <cedricduval+abook@free.fr>\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 <E-MAIL@ADDRESS>\n"
 "Language-Team: french\n"
@@ -162,8 +162,8 @@ msgid "Cannot open database\n"
 msgstr "Impossible d'ouvrir la base de données\n"
 
 #: abook.c:619
-#, c-format
-msgid "too few argumets to make conversion\n"
+#, fuzzy, c-format
+msgid "too few arguments to make conversion\n"
 msgstr "trop peu de paramètres pour effectuer la conversion\n"
 
 #: abook.c:620

diff --git a/po/sv.gmo b/po/sv.gmo
index 9d57a5826a53b48faa416faaeb093476f4e0c9ff..7e79633c11d4d36a96bb29c8d61c313bcca24a24 100644 (file)
Binary files a/po/sv.gmo and b/po/sv.gmo differ

diff --git a/po/sv.po b/po/sv.po
index 72bedf68ead9603ae74dfd16c543875ae713eefd..d0448e0fdc05bc2d37633526a96f3a1982efc239 100644 (file)
--- 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: <cedricduval+abook@free.fr>\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 b58ec5965bca3739c75c37c05d5ac158598d8000..e899be6cd463517f2aa7fe3ae4272b50a4fc7269 100644 (file)
--- 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: