2006-09-28 [ticho] 2.5.2cvs13

	* src/export.c
	* src/messageview.c
	* src/mimeview.c
	* src/news.c
	* src/pop.c
	* src/prefs_themes.c
	* src/procmsg.c
		Small i18n string optimization.
	* src/send_message.c
	* src/summaryview.c
	* src/common/session.c
	* src/common/smtp.c
	* src/common/ssl_certificate.c
	* src/common/utils.c
		Use "Couldn't" instead of "Can't" in UI messages,
		where appropriate.

diff --git a/ChangeLog b/ChangeLog
index f39466c..6d6f8af 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,22 @@
+2006-09-28 [ticho]     2.5.2cvs13
+
+       * src/export.c
+       * src/messageview.c
+       * src/mimeview.c
+       * src/news.c
+       * src/pop.c
+       * src/prefs_themes.c
+       * src/procmsg.c
+               Small i18n string optimization.
+       * src/send_message.c
+       * src/summaryview.c
+       * src/common/session.c
+       * src/common/smtp.c
+       * src/common/ssl_certificate.c
+       * src/common/utils.c
+               Use "Couldn't" instead of "Can't" in UI messages,
+               where appropriate.
+
 2006-09-28 [colin]     2.5.2cvs12
 
        * configure.ac

diff --git a/PATCHSETS b/PATCHSETS
index c0d26ad..e7b0e5b 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -1926,3 +1926,4 @@
 ( cvs diff -u -r 1.60.2.65 -r 1.60.2.66 src/addressbook.c;  ) > 2.5.2cvs10.patchset
 ( cvs diff -u -r 1.1.2.25 -r 1.1.2.26 src/gtk/authors.h;  cvs diff -u -r 1.1.2.4 -r 1.1.2.5 doc/man/sylpheed-claws.1;  cvs diff -u -r 1.1.2.6 -r 1.1.2.7 manual/ack.xml;  cvs diff -u -r 1.1.2.2 -r 1.1.2.3 manual/es/ack.xml;  cvs diff -u -r 1.1.2.5 -r 1.1.2.6 manual/fr/ack.xml;  cvs diff -u -r 1.1.2.2 -r 1.1.2.3 manual/pl/ack.xml;  ) > 2.5.2cvs11.patchset
 ( cvs diff -u -r 1.654.2.1975 -r 1.654.2.1976 configure.ac;  ) > 2.5.2cvs12.patchset
+( cvs diff -u -r 1.8.2.19 -r 1.8.2.20 src/export.c;  cvs diff -u -r 1.94.2.106 -r 1.94.2.107 src/messageview.c;  cvs diff -u -r 1.83.2.90 -r 1.83.2.91 src/mimeview.c;  cvs diff -u -r 1.101.2.30 -r 1.101.2.31 src/news.c;  cvs diff -u -r 1.56.2.43 -r 1.56.2.44 src/pop.c;  cvs diff -u -r 1.3.2.43 -r 1.3.2.44 src/prefs_themes.c;  cvs diff -u -r 1.150.2.79 -r 1.150.2.80 src/procmsg.c;  cvs diff -u -r 1.17.2.33 -r 1.17.2.34 src/send_message.c;  cvs diff -u -r 1.395.2.255 -r 1.395.2.256 src/summaryview.c;  cvs diff -u -r 1.23.2.8 -r 1.23.2.9 src/common/session.c;  cvs diff -u -r 1.11.2.17 -r 1.11.2.18 src/common/smtp.c;  cvs diff -u -r 1.4.2.12 -r 1.4.2.13 src/common/ssl_certificate.c;  cvs diff -u -r 1.36.2.79 -r 1.36.2.80 src/common/utils.c;  ) > 2.5.2cvs13.patchset

diff --git a/configure.ac b/configure.ac
index 3e28530..abb2f05 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=5
 MICRO_VERSION=2
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=12
+EXTRA_VERSION=13
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/common/session.c b/src/common/session.c
index dc407cb..612eea9 100644 (file)
--- a/src/common/session.c
+++ b/src/common/session.c
@@ -343,7 +343,7 @@ gint session_start_tls(Session *session)
                sock_set_nonblocking_mode(session->sock, FALSE);
 
        if (!ssl_init_socket_with_method(session->sock, SSL_METHOD_TLSv1)) {
-               g_warning("can't start TLS session.\n");
+               g_warning("couldn't start TLS session.\n");
                if (nb_mode)
                        sock_set_nonblocking_mode(session->sock, TRUE);
                return -1;

diff --git a/src/common/smtp.c b/src/common/smtp.c
index 653b4d5..60915a3 100644 (file)
--- a/src/common/smtp.c
+++ b/src/common/smtp.c
@@ -632,7 +632,7 @@ static gint smtp_session_recv_msg(Session *session, const gchar *msg)
        case SMTP_STARTTLS:
 #if USE_OPENSSL
                if (session_start_tls(session) < 0) {
-                       log_warning(_("can't start TLS session\n"));
+                       log_warning(_("couldn't start TLS session\n"));
                        smtp_session->state = SMTP_ERROR;
                        smtp_session->error_val = SM_ERROR;
                        return -1;

diff --git a/src/common/ssl_certificate.c b/src/common/ssl_certificate.c
index ff24372..1b57acc 100644 (file)
--- a/src/common/ssl_certificate.c
+++ b/src/common/ssl_certificate.c
@@ -345,7 +345,7 @@ char *ssl_certificate_check_signer (X509 *cert)
        }
        if (!X509_STORE_set_default_paths(store)) {
                X509_STORE_free (store);
-               return g_strdup(_("Can't load X509 default paths"));
+               return g_strdup(_("Couldn't load X509 default paths"));
        }
        
        X509_STORE_CTX_init (&store_ctx, store, cert, NULL);

diff --git a/src/common/utils.c b/src/common/utils.c
index ebd4020..6ebe191 100644 (file)
--- a/src/common/utils.c
+++ b/src/common/utils.c
@@ -3277,7 +3277,7 @@ gint execute_async(gchar *const argv[])
 
        if (g_spawn_async(NULL, (gchar **)argv, NULL, G_SPAWN_SEARCH_PATH,
                          NULL, NULL, NULL, FALSE) == FALSE) {
-               g_warning("Can't execute command: %s\n", argv[0]);
+               g_warning("Couldn't execute command: %s\n", argv[0]);
                return -1;
        }
 
@@ -3292,7 +3292,7 @@ gint execute_sync(gchar *const argv[])
 
        if (g_spawn_sync(NULL, (gchar **)argv, NULL, G_SPAWN_SEARCH_PATH,
                         NULL, NULL, NULL, NULL, &status, NULL) == FALSE) {
-               g_warning("Can't execute command: %s\n", argv[0]);
+               g_warning("Couldn't execute command: %s\n", argv[0]);
                return -1;
        }
 
@@ -3336,7 +3336,7 @@ gchar *get_command_output(const gchar *cmdline)
 
        if (g_spawn_command_line_sync(cmdline, &child_stdout, NULL, &status,
                                      NULL) == FALSE) {
-               g_warning("Can't execute command: %s\n", cmdline);
+               g_warning("Couldn't execute command: %s\n", cmdline);
                return NULL;
        }
 

diff --git a/src/export.c b/src/export.c
index 3fbaa55..c88f9e3 100644 (file)
--- a/src/export.c
+++ b/src/export.c
@@ -226,7 +226,7 @@ static void export_ok_cb(GtkWidget *widget, gpointer data)
 
        src = folder_find_item_from_identifier(srcdir);
        if (!src) {
-               alertpanel_error(_("Can't find the source folder."));
+               alertpanel_error(_("Couldn't find the source folder."));
                gtk_widget_grab_focus(src_entry);
                return;
        } else {

diff --git a/src/messageview.c b/src/messageview.c
index c3f21bc..53bc756 100644 (file)
--- a/src/messageview.c
+++ b/src/messageview.c
@@ -1151,7 +1151,7 @@ void messageview_save_as(MessageView *messageview)
        src = procmsg_get_message_file(msginfo);
        if (copy_file(src, dest, TRUE) < 0) {
                tmp =  g_path_get_basename(dest);
-               alertpanel_error(_("Can't save the file '%s'."), tmp);
+               alertpanel_error(_("Couldn't save the file '%s'."), tmp);
                g_free(tmp);
        }
        g_free(dest);

diff --git a/src/mimeview.c b/src/mimeview.c
index a30d1c6..5ce0421 100644 (file)
--- a/src/mimeview.c
+++ b/src/mimeview.c
@@ -1346,7 +1346,7 @@ static void mimeview_drag_data_get(GtkWidget          *widget,
 
        if (procmime_get_part(filename, partinfo) < 0)
                alertpanel_error
-                       (_("Can't save the part of multipart message."));
+                       (_("Couldn't save the part of multipart message."));
        uriname = g_strconcat("file://", filename, "\r\n", NULL);
 
        gtk_selection_data_set(selection_data, selection_data->target, 8,
@@ -1427,7 +1427,7 @@ static gboolean mimeview_write_part(const gchar *filename,
 
        if (procmime_get_part(filename, partinfo) < 0) {
                alertpanel_error
-                       (_("Can't save the part of multipart message."));
+                       (_("Couldn't save the part of multipart message."));
                return FALSE;
        }
 
@@ -1603,7 +1603,7 @@ static void mimeview_launch(MimeView *mimeview, MimeInfo *partinfo)
 
        if (procmime_get_part(filename, partinfo) < 0)
                alertpanel_error
-                       (_("Can't save the part of multipart message."));
+                       (_("Couldn't save the part of multipart message."));
        else
                mimeview_view_file(filename, partinfo, NULL, mimeview);
 
@@ -1636,7 +1636,7 @@ static void mimeview_open_part_with(MimeView *mimeview, MimeInfo *partinfo, gboo
 
        if (procmime_get_part(filename, partinfo) < 0) {
                alertpanel_error
-                       (_("Can't save the part of multipart message."));
+                       (_("Couldn't save the part of multipart message."));
                g_free(filename);
                return;
        }

diff --git a/src/news.c b/src/news.c
index 7ddfe10..889fb71 100644 (file)
--- a/src/news.c
+++ b/src/news.c
@@ -585,7 +585,7 @@ gint news_post_stream(Folder *folder, FILE *fp)
 
        ok = nntp_post(session, fp);
        if (ok != NN_SUCCESS) {
-               log_warning(_("can't post article.\n"));
+               log_warning(_("couldn't post article.\n"));
                if (ok == NN_SOCKET) {
                        session_destroy(SESSION(session));
                        REMOTE_FOLDER(folder)->session = NULL;
@@ -611,7 +611,7 @@ static gint news_get_article_cmd(NNTPSession *session, const gchar *cmd,
 
        ok = recv_write_to_file(SESSION(session)->sock, filename);
        if (ok < 0) {
-               log_warning(_("can't retrieve article %d\n"), num);
+               log_warning(_("couldn't retrieve article %d\n"), num);
                if (ok == -2)
                        return NN_SOCKET;
                else
@@ -660,7 +660,7 @@ static gint news_select_group(NNTPSession *session, const gchar *group,
        if (ok == NN_SUCCESS)
                session->group = g_strdup(group);
        else
-               log_warning(_("can't select group: %s\n"), group);
+               log_warning(_("couldn't select group: %s\n"), group);
 
        return ok;
 }
@@ -885,7 +885,7 @@ gint news_get_num_list(Folder *folder, FolderItem *item, GSList **msgnum_list, g
 
        ok = news_select_group(session, item->path, &num, &first, &last);
        if (ok != NN_SUCCESS) {
-               log_warning(_("can't set group: %s\n"), item->path);
+               log_warning(_("couldn't set group: %s\n"), item->path);
                news_folder_unlock(NEWS_FOLDER(item->folder));
                return -1;
        }
@@ -959,7 +959,7 @@ MsgInfo *news_get_msginfo(Folder *folder, FolderItem *item, gint num)
        news_folder_lock(NEWS_FOLDER(item->folder));
        
        if (ok != NN_SUCCESS) {
-               log_warning(_("can't get xover\n"));
+               log_warning(_("couldn't get xover\n"));
                if (ok == NN_SOCKET) {
                        session_destroy(SESSION(session));
                        REMOTE_FOLDER(item->folder)->session = NULL;
@@ -994,7 +994,7 @@ MsgInfo *news_get_msginfo(Folder *folder, FolderItem *item, gint num)
 
        ok = nntp_xhdr(session, "to", num, num);
        if (ok != NN_SUCCESS) {
-               log_warning(_("can't get xhdr\n"));
+               log_warning(_("couldn't get xhdr\n"));
                if (ok == NN_SOCKET) {
                        session_destroy(SESSION(session));
                        REMOTE_FOLDER(item->folder)->session = NULL;
@@ -1015,7 +1015,7 @@ MsgInfo *news_get_msginfo(Folder *folder, FolderItem *item, gint num)
 
        ok = nntp_xhdr(session, "cc", num, num);
        if (ok != NN_SUCCESS) {
-               log_warning(_("can't get xhdr\n"));
+               log_warning(_("couldn't get xhdr\n"));
                if (ok == NN_SOCKET) {
                        session_destroy(SESSION(session));
                        REMOTE_FOLDER(item->folder)->session = NULL;
@@ -1053,7 +1053,7 @@ static GSList *news_get_msginfos_for_range(NNTPSession *session, FolderItem *ite
                    begin, end, item->path);
        ok = nntp_xover(session, begin, end);
        if (ok != NN_SUCCESS) {
-               log_warning(_("can't get xover\n"));
+               log_warning(_("couldn't get xover\n"));
                if (ok == NN_SOCKET) {
                        session_destroy(SESSION(session));
                        REMOTE_FOLDER(item->folder)->session = NULL;
@@ -1098,7 +1098,7 @@ static GSList *news_get_msginfos_for_range(NNTPSession *session, FolderItem *ite
 
        ok = nntp_xhdr(session, "to", begin, end);
        if (ok != NN_SUCCESS) {
-               log_warning(_("can't get xhdr\n"));
+               log_warning(_("couldn't get xhdr\n"));
                if (ok == NN_SOCKET) {
                        session_destroy(SESSION(session));
                        REMOTE_FOLDER(item->folder)->session = NULL;
@@ -1130,7 +1130,7 @@ static GSList *news_get_msginfos_for_range(NNTPSession *session, FolderItem *ite
 
        ok = nntp_xhdr(session, "cc", begin, end);
        if (ok != NN_SUCCESS) {
-               log_warning(_("can't get xhdr\n"));
+               log_warning(_("couldn't get xhdr\n"));
                if (ok == NN_SOCKET) {
                        session_destroy(SESSION(session));
                        REMOTE_FOLDER(item->folder)->session = NULL;

diff --git a/src/pop.c b/src/pop.c
index 318e7fb..da9b7d4 100644 (file)
--- a/src/pop.c
+++ b/src/pop.c
@@ -832,7 +832,7 @@ static Pop3ErrorValue pop3_ok(Pop3Session *session, const gchar *msg)
                        switch (session->state) {
 #if USE_OPENSSL
                        case POP3_STLS:
-                               log_error(_("can't start TLS session\n"));
+                               log_error(_("couldn't start TLS session\n"));
                                ok = PS_ERROR;
                                break;
 #endif

diff --git a/src/prefs_themes.c b/src/prefs_themes.c
index bd8905e..6f9678c 100644 (file)
--- a/src/prefs_themes.c
+++ b/src/prefs_themes.c
@@ -729,7 +729,7 @@ static void prefs_themes_get_theme_info(ThemesData *tdata)
 
                info->status = prefs_themes_get_theme_stats(path);
                if (info->status == NULL) {
-                       info->status = g_strdup(_("Error: can't get theme status"));
+                       info->status = g_strdup(_("Error: couldn't get theme status"));
                }
        }
 

diff --git a/src/procmsg.c b/src/procmsg.c
index 9e44318..c434512 100644 (file)
--- a/src/procmsg.c
+++ b/src/procmsg.c
@@ -904,7 +904,8 @@ gint procmsg_send_queue(FolderItem *queue, gboolean save_msgs, gchar **errstr)
        GNode *node, *next;
        
        if (send_queue_lock) {
-               log_warning(_("Already trying to send\n"));
+               /* Avoid having to translate two similar strings */
+               log_warning("%s\n", _("Already trying to send."));
                if (errstr) {
                        if (*errstr) g_free(*errstr);
                        *errstr = g_strdup_printf(_("Already trying to send."));
@@ -1683,7 +1684,7 @@ send_mail:
                if ((tmpfp = g_fopen(tmp, "wb")) == NULL) {
                        FILE_OP_ERROR(tmp, "fopen");
                        newsval = -1;
-                       alertpanel_error(_("Could not create temporary file for news sending."));
+                       alertpanel_error(_("Couldn't create temporary file for news sending."));
                } else {
                        if (change_file_mode_rw(tmpfp, tmp) < 0) {
                                FILE_OP_ERROR(tmp, "chmod");

diff --git a/src/send_message.c b/src/send_message.c
index 3935154..0653967 100644 (file)
--- a/src/send_message.c
+++ b/src/send_message.c
@@ -148,7 +148,7 @@ gint send_message_local(const gchar *command, FILE *fp)
                                     &pid, &child_stdin, NULL, NULL,
                                     NULL) == FALSE) {
                g_snprintf(buf, sizeof(buf),
-                          _("Can't execute command: %s"), command);
+                          _("Couldn't execute command: %s"), command);
                log_warning("%s\n", buf);
                alertpanel_error("%s", buf);
                g_strfreev(argv);

diff --git a/src/summaryview.c b/src/summaryview.c
index b8532cd..7db4bd6 100644 (file)
--- a/src/summaryview.c
+++ b/src/summaryview.c
@@ -4037,10 +4037,10 @@ void summary_save_as(SummaryView *summaryview)
 
        if ( aval==0 ) { /* append */
                if (append_file(src, dest, TRUE) < 0) 
-                       alertpanel_error(_("Can't save the file '%s'."), tmp);
+                       alertpanel_error(_("Couldn't save the file '%s'."), tmp);
        } else { /* overwrite */
                if (copy_file(src, dest, TRUE) < 0)
-                       alertpanel_error(_("Can't save the file '%s'."), tmp);
+                       alertpanel_error(_("Couldn't save the file '%s'."), tmp);
        }
        g_free(src);
        
@@ -4055,7 +4055,7 @@ void summary_save_as(SummaryView *summaryview)
                        if (!msginfo) break;
                        src = procmsg_get_message_file(msginfo);
                        if (append_file(src, dest, TRUE) < 0)
-                               alertpanel_error(_("Can't save the file '%s'."), tmp);
+                               alertpanel_error(_("Couldn't save the file '%s'."), tmp);
                }
                g_free(src);
        }