2007-10-11 [mones] 3.0.2cvs62
authorRicardo Mones <mones@claws-mail.org>
Thu, 11 Oct 2007 16:43:22 +0000 (16:43 +0000)
committerRicardo Mones <mones@claws-mail.org>
Thu, 11 Oct 2007 16:43:22 +0000 (16:43 +0000)
* src/addrduplicates.c
* src/addressbook.c
* src/compose.c
* src/expldifdlg.c
* src/mainwindow.c
* src/messageview.c
* src/pop.c
* src/prefs_customheader.c
* src/prefs_send.c
* src/prefs_themes.c
* src/common/plugin.c
* src/gtk/pluginwindow.c
* src/gtk/quicksearch.c
Fix several typos and capitalisation issues

16 files changed:
ChangeLog
PATCHSETS
configure.ac
src/addrduplicates.c
src/addressbook.c
src/common/plugin.c
src/compose.c
src/expldifdlg.c
src/gtk/pluginwindow.c
src/gtk/quicksearch.c
src/mainwindow.c
src/messageview.c
src/pop.c
src/prefs_customheader.c
src/prefs_send.c
src/prefs_themes.c

index ed78859..e5b5152 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,20 @@
+2007-10-11 [mones]     3.0.2cvs62
+
+       * src/addrduplicates.c
+       * src/addressbook.c
+       * src/compose.c
+       * src/expldifdlg.c
+       * src/mainwindow.c
+       * src/messageview.c
+       * src/pop.c
+       * src/prefs_customheader.c
+       * src/prefs_send.c
+       * src/prefs_themes.c
+       * src/common/plugin.c
+       * src/gtk/pluginwindow.c
+       * src/gtk/quicksearch.c
+               Fix several typos and capitalisation issues
+
 2007-10-11 [wwp]       3.0.2cvs61
 
        * src/editaddress.c
index 5ae71c7..4f6054f 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
 ( diff -u /dev/null src/pixmaps/anonymous.xpm;  cvs diff -u -r 1.14.2.37 -r 1.14.2.38 src/editaddress.c;  cvs diff -u -r 1.155.2.78 -r 1.155.2.79 src/Makefile.am;  cvs diff -u -r 1.25.2.48 -r 1.25.2.49 src/stock_pixmap.c;  cvs diff -u -r 1.18.2.31 -r 1.18.2.32 src/stock_pixmap.h;  ) > 3.0.2cvs59.patchset
 ( cvs diff -u -r 1.14.2.38 -r 1.14.2.39 src/editaddress.c;  ) > 3.0.2cvs60.patchset
 ( cvs diff -u -r 1.14.2.39 -r 1.14.2.40 src/editaddress.c;  ) > 3.0.2cvs61.patchset
+( cvs diff -u -r 1.1.2.5 -r 1.1.2.6 src/addrduplicates.c;  cvs diff -u -r 1.60.2.102 -r 1.60.2.103 src/addressbook.c;  cvs diff -u -r 1.382.2.416 -r 1.382.2.417 src/compose.c;  cvs diff -u -r 1.1.4.26 -r 1.1.4.27 src/expldifdlg.c;  cvs diff -u -r 1.274.2.214 -r 1.274.2.215 src/mainwindow.c;  cvs diff -u -r 1.94.2.159 -r 1.94.2.160 src/messageview.c;  cvs diff -u -r 1.56.2.57 -r 1.56.2.58 src/pop.c;  cvs diff -u -r 1.16.2.28 -r 1.16.2.29 src/prefs_customheader.c;  cvs diff -u -r 1.1.2.19 -r 1.1.2.20 src/prefs_send.c;  cvs diff -u -r 1.3.2.51 -r 1.3.2.52 src/prefs_themes.c;  cvs diff -u -r 1.13.2.33 -r 1.13.2.34 src/common/plugin.c;  cvs diff -u -r 1.5.2.49 -r 1.5.2.50 src/gtk/pluginwindow.c;  cvs diff -u -r 1.1.2.80 -r 1.1.2.81 src/gtk/quicksearch.c;  ) > 3.0.2cvs62.patchset
index ab0d685..7e5acf4 100644 (file)
@@ -11,7 +11,7 @@ MINOR_VERSION=0
 MICRO_VERSION=2
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=61
+EXTRA_VERSION=62
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
index 1ada1a9..aa4c09a 100644 (file)
@@ -143,7 +143,7 @@ static gboolean create_dialog()
        g_object_ref(check_other_book);
 
        val = alertpanel_full(_("Find address book email duplicates"),
-                             _("Claws-Mail will now search for duplicate email "
+                             _("Claws Mail will now search for duplicate email "
                                "addresses in the address book."),
                              GTK_STOCK_CANCEL,GTK_STOCK_FIND,NULL, FALSE, vbox, ALERT_NOTICE,
                              G_ALERTALTERNATE);
index d82f76b..3c59959 100644 (file)
@@ -551,7 +551,7 @@ static ErrMsgTableEntry _lutErrorsLDAP_[] = {
        { LDAPRC_NOENTRIES,                     N_("No LDAP entries found for search criteria") },
        { LDAPRC_STOP_FLAG,                     N_("LDAP search terminated on request") },
        { LDAPRC_TLS,                           N_("Error starting TLS connection") },
-       { LDAPRC_NODN,                          N_("Distinguised Name (dn) is missing") },
+       { LDAPRC_NODN,                          N_("Distinguished Name (dn) is missing") },
        { LDAPRC_NAMING_VIOLATION,              N_("Missing required information") },
        { LDAPRC_ALREADY_EXIST,                 N_("Another contact exists with that key") },
        { LDAPRC_STRONG_AUTH,                   N_("Strong(er) authentication required") },
@@ -4658,7 +4658,7 @@ static void addrbookctl_build_map( GtkWidget *window ) {
        atci->showInTree = FALSE;
        atci->treeExpand = FALSE;
        atci->treeLeaf = TRUE;
-       atci->displayName = _( "EMail Address" );
+       atci->displayName = _( "Email Address" );
        atci->iconXpm = addressxpm;
        atci->maskXpm = addressxpmmask;
        atci->iconXpmOpen = addressxpm;
index f105481..8fa623f 100644 (file)
@@ -361,7 +361,7 @@ init_plugin:
        
        if (strcmp(plugin_licence(), "GPL2+") && strncmp(plugin_licence(), "GPL3", strlen("GPL3"))
        &&  strncmp(plugin_licence(), "GPL2+-compatible", strlen("GPL2+-compatible"))) {
-               *error = g_strdup(_("This module is not licenced under a GPL v2 or later compatible licence."));
+               *error = g_strdup(_("This module is not licensed under a GPL v2 or later compatible license."));
                if (plugin->unloaded_hidden)
                        return NULL;
                g_module_close(plugin->module);
index e96b28f..e090932 100644 (file)
@@ -723,7 +723,7 @@ static GtkItemFactoryEntry compose_entries[] =
                        NULL, compose_set_encoding_cb, C_AUTO, "<RadioItem>"},
        {N_("/_Options/Character _encoding/---"), NULL, NULL, 0, "<Separator>"},
 
-       {N_("/_Options/Character _encoding/7bit ascii (US-ASC_II)"),
+       {N_("/_Options/Character _encoding/7bit ASCII (US-ASC_II)"),
         ENC_ACTION(C_US_ASCII)},
        {N_("/_Options/Character _encoding/Unicode (_UTF-8)"),
         ENC_ACTION(C_UTF_8)},
index 32ae18d..9849f61 100644 (file)
@@ -733,7 +733,7 @@ static void export_ldif_dialog_create( void ) {
 static void export_ldif_create( void ) {
        export_ldif_dialog_create();
        export_ldif_page_file( PAGE_FILE_INFO, _( "File Info" ) );
-       export_ldif_page_dn( PAGE_DN, _( "Distguished Name" ) );
+       export_ldif_page_dn( PAGE_DN, _( "Distinguished Name" ) );
        export_ldif_page_finish( PAGE_FINISH, _( "Finish" ) );
        gtk_widget_show_all( expldif_dlg.window );
 }
index 689188a..a74c914 100644 (file)
@@ -205,7 +205,7 @@ static void load_cb(GtkButton *button, PluginWindow *pluginwindow)
                        if (error != NULL) {
                                gchar *basename = g_path_get_basename(file);
                                alertpanel_error(
-                               _("The following error occured while loading %s :\n\n%s\n"),
+                               _("The following error occurred while loading %s :\n\n%s\n"),
                                basename, error);
                                g_free(basename);
                                g_free(error);
index baf212e..880a565 100644 (file)
@@ -425,7 +425,7 @@ static gchar *search_descr_strings[] = {
        "F",     N_("forwarded messages"),
        "h S",   N_("messages which contain header S"),
        "i S",   N_("messages which contain S in Message-ID header"),
-       "I S",   N_("messages which contain S in inreplyto header"),
+       "I S",   N_("messages which contain S in In-Reply-To header"),
        "k #",   N_("messages which are marked with color #"),
        "L",     N_("locked messages"),
        "n S",   N_("messages which are in newsgroup S"),
index fc152e7..9582686 100644 (file)
@@ -670,7 +670,7 @@ static GtkItemFactoryEntry mainwin_entries[] =
         NULL, set_charset_cb, C_AUTO, "<RadioItem>"},
        ENC_SEPARATOR,
 
-       {N_("/_View/Character _encoding/7bit ascii (US-ASC_II)"),
+       {N_("/_View/Character _encoding/7bit ASCII (US-ASC_II)"),
         ENC_ACTION(C_US_ASCII)},
        {N_("/_View/Character _encoding/Unicode (_UTF-8)"),
         ENC_ACTION(C_UTF_8)},
index 142c37b..04a011a 100644 (file)
@@ -268,7 +268,7 @@ static GtkItemFactoryEntry msgview_entries[] =
        {N_("/_View/Character _encoding/_Auto detect"),
                                        NULL, set_charset_cb, C_AUTO, "<RadioItem>"},
        ENC_SEPARATOR,
-       {N_("/_View/Character _encoding/7bit ascii (US-ASC_II)"),
+       {N_("/_View/Character _encoding/7bit ASCII (US-ASC_II)"),
         ENC_ACTION(C_US_ASCII)},
 
        {N_("/_View/Character _encoding/Unicode (_UTF-8)"),
@@ -1718,7 +1718,7 @@ static void print_cb(gpointer data, guint action, GtkWidget *widget)
 
 #if !defined(USE_GNOMEPRINT) && !GTK_CHECK_VERSION(2,10,0)
        cmdline = input_dialog(_("Print"),
-                              _("Ente the print command line:\n"
+                              _("Enter the print command line:\n"
                                 "('%s' will be replaced with file name)"),
                               prefs_common.print_cmd);
        if (!cmdline) return;
index 7aad105..37ece01 100644 (file)
--- a/src/pop.c
+++ b/src/pop.c
@@ -161,7 +161,7 @@ static gint pop3_getauth_apop_send(Pop3Session *session)
        *(end + 1) = '\0';
 
        if (!is_ascii_str(start)) {
-               log_error(LOG_PROTOCOL, _("Timestamp syntax error in greeting (not ascii)\n"));
+               log_error(LOG_PROTOCOL, _("Timestamp syntax error in greeting (not ASCII)\n"));
                session->error_val = PS_PROTOCOL;
                return -1;
        }
index 69c1b8d..5a70eff 100644 (file)
@@ -559,9 +559,9 @@ static void prefs_custom_header_val_from_file_cb(void)
        const gchar *hdr = gtk_entry_get_text(GTK_ENTRY(customhdr.hdr_entry));
        
        if (!strcmp(hdr, "Face"))
-               filename = filesel_select_file_open(_("Choose a png file"), NULL);
+               filename = filesel_select_file_open(_("Choose a PNG file"), NULL);
        else if (!strcmp(hdr, "X-Face"))
-               filename = filesel_select_file_open(_("Choose an xbm file"), NULL);
+               filename = filesel_select_file_open(_("Choose an XBM file"), NULL);
        else
                filename = filesel_select_file_open(_("Choose a text file"), NULL);
 
index d6255c8..090953f 100644 (file)
@@ -219,7 +219,7 @@ static void prefs_send_create_widget(PrefsPage *_page, GtkWindow *window,
 
        SET_MENUITEM(_("Automatic (Recommended)"),       CS_AUTO);
        SET_MENUITEM(NULL, NULL);
-       SET_MENUITEM(_("7bit ascii (US-ASCII)"),         CS_US_ASCII);
+       SET_MENUITEM(_("7bit ASCII (US-ASCII)"),         CS_US_ASCII);
        SET_MENUITEM(_("Unicode (UTF-8)"),               CS_UTF_8);
        SET_MENUITEM(NULL, NULL);
        SET_MENUITEM(_("Western European (ISO-8859-1)"),  CS_ISO_8859_1);
index 9b80474..73ba142 100644 (file)
@@ -475,7 +475,7 @@ static void prefs_themes_btn_remove_clicked_cb(GtkWidget *widget, gpointer data)
                                alertpanel_error(_("Removing theme directory failed."));
                }
                else {  
-                       alertpanel_notice(_("Theme removed succesfully"));
+                       alertpanel_notice(_("Theme removed successfully"));
                        /* update interface back to first theme */
                        prefs_themes_get_themes_and_names(tdata);
                        prefs_themes_set_themes_menu(GTK_OPTION_MENU(tdata->page->op_menu), tdata);
@@ -558,7 +558,7 @@ static void prefs_themes_btn_install_clicked_cb(GtkWidget *widget, gpointer data
                                            (gpointer)(cinfo->dest), 
                                            (GCompareFunc)strcmp2);
                if (NULL != insted) {
-                       alertpanel_notice(_("Theme installed succesfully"));
+                       alertpanel_notice(_("Theme installed successfully"));
                        tdata->displayed = (gchar *)(insted->data);
                        prefs_themes_set_themes_menu(GTK_OPTION_MENU(tdata->page->op_menu), tdata);
                        prefs_themes_display_global_stats(tdata);