commit b0b989754c20831dd4e3431fcd8f98e0bb5ada5b
parent d3677ada619f24b447ffa371e4c18eb5d8046234
Author: Paul Mangan <paul@claws-mail.org>
Date: Sat, 27 Aug 2011 10:45:08 +0000
2011-08-27 [paul] 3.7.10cvs1
* po/POTFILES.in
* src/common/ssl_certificate.c
* src/etpan/imap-thread.c
* src/etpan/nntp-thread.c
offer up some missing log_error() strings to translators
Diffstat:
7 files changed, 21 insertions(+), 6 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,11 @@
+2011-08-27 [paul] 3.7.10cvs1
+
+ * po/POTFILES.in
+ * src/common/ssl_certificate.c
+ * src/etpan/imap-thread.c
+ * src/etpan/nntp-thread.c
+ offer up some missing log_error() strings to translators
+
2011-08-27 [paul] 3.7.10
* NEWS
* README
diff --git a/PATCHSETS b/PATCHSETS
@@ -4204,3 +4204,4 @@
( cvs diff -u -r 1.9.2.43 -r 1.9.2.44 src/common/ssl.c; ) > 3.7.9cvs50.patchset
( cvs diff -u -r 1.1.2.6 -r 1.1.2.7 claws-mail.desktop; ) > 3.7.9cvs51.patchset
( cvs diff -u -r 1.9.2.22 -r 1.9.2.23 po/cs.po; cvs diff -u -r 1.42.2.54 -r 1.42.2.55 po/fr.po; cvs diff -u -r 1.5.2.19 -r 1.5.2.20 po/hu.po; cvs diff -u -r 1.1.2.3 -r 1.1.2.4 po/lt.po; cvs diff -u -r 1.50.2.41 -r 1.50.2.42 po/pt_BR.po; cvs diff -u -r 1.2.2.33 -r 1.2.2.34 po/sk.po; ) > 3.7.9cvs52.patchset
+( cvs diff -u -r 1.53.2.37 -r 1.53.2.38 po/POTFILES.in; cvs diff -u -r 1.4.2.38 -r 1.4.2.39 src/common/ssl_certificate.c; cvs diff -u -r 1.1.4.114 -r 1.1.4.115 src/etpan/imap-thread.c; cvs diff -u -r 1.1.2.16 -r 1.1.2.17 src/etpan/nntp-thread.c; ) > 3.7.10cvs1.patchset
diff --git a/configure.ac b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=7
MICRO_VERSION=10
INTERFACE_AGE=0
BINARY_AGE=0
-EXTRA_VERSION=0
+EXTRA_VERSION=1
EXTRA_RELEASE=
EXTRA_GTK2_VERSION=
diff --git a/po/POTFILES.in b/po/POTFILES.in
@@ -29,6 +29,8 @@ src/editldap_basedn.c
src/editldap.c
src/edittags.c
src/editvcard.c
+src/etpan/imap-thread.c
+src/etpan/nntp-thread.c
src/exphtmldlg.c
src/expldifdlg.c
src/export.c
diff --git a/src/common/ssl_certificate.c b/src/common/ssl_certificate.c
@@ -729,7 +729,7 @@ gnutls_x509_crt ssl_certificate_get_x509_from_pem_file(const gchar *file)
return x509;
}
} else {
- log_error(LOG_PROTOCOL, "Can not open certificate file %s\n", file);
+ log_error(LOG_PROTOCOL, _("Cannot open certificate file %s\n"), file);
}
return NULL;
}
@@ -748,7 +748,7 @@ gnutls_x509_privkey ssl_certificate_get_pkey_from_pem_file(const gchar *file)
return key;
}
} else {
- log_error(LOG_PROTOCOL, "Can not open key file %s\n", file);
+ log_error(LOG_PROTOCOL, _("Cannot open key file %s\n"), file);
}
return NULL;
}
@@ -896,7 +896,7 @@ void ssl_certificate_get_x509_and_pkey_from_p12_file(const gchar *file, const gc
fclose(fp);
}
} else {
- log_error(LOG_PROTOCOL, "Can not open certificate file %s\n", file);
+ log_error(LOG_PROTOCOL, _("Cannot open certificate file %s\n"), file);
}
if (p12 != NULL) {
if ((r = parse_pkcs12(p12, password, pkey, x509)) == 0) {
diff --git a/src/etpan/imap-thread.c b/src/etpan/imap-thread.c
@@ -23,6 +23,8 @@
#ifdef HAVE_LIBETPAN
+#include <glib.h>
+#include <glib/gi18n.h>
#include "imap-thread.h"
#include <imap.h>
#include <sys/types.h>
@@ -612,7 +614,7 @@ static void connect_ssl_context_cb(struct mailstream_ssl_context * ssl_context,
if (x509_len > 0 && pkey_len > 0) {
if (mailstream_ssl_set_client_certificate_data(ssl_context, x509_der, x509_len) < 0 ||
mailstream_ssl_set_client_private_key_data(ssl_context, pkey_der, pkey_len) < 0)
- log_error(LOG_PROTOCOL, "Impossible to set the client certificate.\n");
+ log_error(LOG_PROTOCOL, _("Impossible to set the client certificate.\n"));
g_free(x509_der);
g_free(pkey_der);
}
diff --git a/src/etpan/nntp-thread.c b/src/etpan/nntp-thread.c
@@ -23,6 +23,8 @@
#ifdef HAVE_LIBETPAN
+#include <glib.h>
+#include <glib/gi18n.h>
#include "nntp-thread.h"
#include "news.h"
#include <sys/types.h>
@@ -463,7 +465,7 @@ static void connect_ssl_context_cb(struct mailstream_ssl_context * ssl_context,
if (x509_len > 0 && pkey_len > 0) {
if (mailstream_ssl_set_client_certificate_data(ssl_context, x509_der, x509_len) < 0 ||
mailstream_ssl_set_client_private_key_data(ssl_context, pkey_der, pkey_len) < 0)
- log_error(LOG_PROTOCOL, "Impossible to set the client certificate.\n");
+ log_error(LOG_PROTOCOL, _("Impossible to set the client certificate.\n"));
g_free(x509_der);
g_free(pkey_der);
}
