[Commits] fetchinfo_plugin.c 1.4.2.17 1.4.2.18 fetchinfo_plugin_gtk.c 1.3.2.14 1.3.2.15 gettext.h NONE 1.1.2.1
ticho at claws-mail.org
ticho at claws-mail.org
Wed Jan 4 20:17:48 CET 2012
Update of /home/claws-mail/plugins/fetchinfo/src
In directory claws-mail:/tmp/cvs-serv12965/src
Modified Files:
Tag: gtk2
fetchinfo_plugin.c fetchinfo_plugin_gtk.c
Added Files:
Tag: gtk2
gettext.h
Log Message:
2012-01-04 [ticho] 0.4.24cvs2
* ABOUT-NLS
* Makefile.am
* configure.ac
* config/config.rpath
* po/Makefile.in.in
* po/Makevars
* po/POTFILES.in
* po/remove-potcdate.sed
* src/fetchinfo_plugin.c
* src/fetchinfo_plugin_gtk.c
* src/gettext.h
Added internationalization support.
Index: fetchinfo_plugin_gtk.c
===================================================================
RCS file: /home/claws-mail/plugins/fetchinfo/src/fetchinfo_plugin_gtk.c,v
retrieving revision 1.3.2.14
retrieving revision 1.3.2.15
diff -u -d -r1.3.2.14 -r1.3.2.15
--- fetchinfo_plugin_gtk.c 2 Jan 2012 18:21:48 -0000 1.3.2.14
+++ fetchinfo_plugin_gtk.c 4 Jan 2012 19:17:46 -0000 1.3.2.15
@@ -36,6 +36,7 @@
#include "pluginconfig.h"
#include "fetchinfo_plugin.h"
+#include "gettext.h"
struct FetchinfoPage
{
@@ -67,7 +68,7 @@
}
#define ADD_NEW_CHECKBOX(line, button, text) \
- button = gtk_check_button_new_with_label (_(text)); \
+ button = gtk_check_button_new_with_label (text); \
gtk_widget_show (button); \
gtk_table_attach (GTK_TABLE (table), button, 1, 2, line, line+1, \
(GtkAttachOptions) (GTK_EXPAND | GTK_FILL), \
@@ -90,17 +91,23 @@
gtk_table_set_row_spacings(GTK_TABLE(table), 4);
gtk_table_set_col_spacings(GTK_TABLE(table), 8);
+ /* i18n: Heading of a preferences section determining which headers to add */
fetchinfo_enable = gtk_check_button_new_with_label (_("Add fetchinfo headers"));
gtk_widget_show (fetchinfo_enable);
gtk_table_attach (GTK_TABLE (table), fetchinfo_enable, 0, 2, 0, 1,
(GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
(GtkAttachOptions) (0), 0, 0);
- ADD_NEW_CHECKBOX(1, fetchinfo_uidl, "UIDL");
- ADD_NEW_CHECKBOX(2, fetchinfo_account, "Account name");
- ADD_NEW_CHECKBOX(3, fetchinfo_server, "Receive server");
- ADD_NEW_CHECKBOX(4, fetchinfo_userid, "UserID");
- ADD_NEW_CHECKBOX(5, fetchinfo_time, "Fetch time");
+ /* i18n: Description of a header to be added */
+ ADD_NEW_CHECKBOX(1, fetchinfo_uidl, _("UIDL"));
+ /* i18n: Description of a header to be added */
+ ADD_NEW_CHECKBOX(2, fetchinfo_account, _("Account name"));
+ /* i18n: Description of a header to be added */
+ ADD_NEW_CHECKBOX(3, fetchinfo_server, _("Receive server"));
+ /* i18n: Description of a header to be added */
+ ADD_NEW_CHECKBOX(4, fetchinfo_userid, _("UserID"));
+ /* i18n: Description of a header to be added */
+ ADD_NEW_CHECKBOX(5, fetchinfo_time, _("Fetch time"));
config = fetchinfo_get_config();
@@ -169,7 +176,7 @@
{
static gchar *path[3];
- path[0] = dgettext("claws-mail", "Plugins");
+ path[0] = D_("claws-mail", "Plugins");
path[1] = _("Fetchinfo");
path[2] = NULL;
Index: fetchinfo_plugin.c
===================================================================
RCS file: /home/claws-mail/plugins/fetchinfo/src/fetchinfo_plugin.c,v
retrieving revision 1.4.2.17
retrieving revision 1.4.2.18
diff -u -d -r1.4.2.17 -r1.4.2.18
--- fetchinfo_plugin.c 4 Oct 2007 17:40:22 -0000 1.4.2.17
+++ fetchinfo_plugin.c 4 Jan 2012 19:17:46 -0000 1.4.2.18
@@ -45,6 +45,8 @@
#include "pluginconfig.h"
+#include "gettext.h"
+
static guint mail_receive_hook_id;
static FetchinfoConfig config;
@@ -148,7 +150,8 @@
return;
if (prefs_write_param(param, pfile->fp) < 0) {
- g_warning("failed to write Fetchinfo configuration to file\n");
+ /* i18n: Possible error message during plugin load */
+ g_warning(_("failed to write Fetchinfo configuration to file\n"));
prefs_file_close_revert(pfile);
return;
}
@@ -169,7 +172,8 @@
mail_receive_hook_id = hooks_register_hook(MAIL_RECEIVE_HOOKLIST, mail_receive_hook, NULL);
if (mail_receive_hook_id == (guint)-1) {
- *error = g_strdup("Failed to register mail receive hook");
+ /* i18n: Possible error message during plugin load */
+ *error = g_strdup(_("Failed to register mail receive hook"));
return -1;
}
@@ -201,6 +205,10 @@
const gchar *plugin_desc(void)
{
+ /* i18n: Description seen in plugins dialog.
+ * Translation of "Plugins" part of preferences path should to be
+ * the same as translation of "Plugins" string in Claws Mail message
+ * catalog. */
return _("This plugin modifies the downloaded messages. "
"It inserts headers containing some download "
"information: UIDL, Claws Mail account name, "
@@ -227,6 +235,7 @@
struct PluginFeature *plugin_provides(void)
{
static struct PluginFeature features[] =
+ /* i18n: Description of functionality added by this plugin */
{ {PLUGIN_UTILITY, N_("Mail marking")},
{PLUGIN_NOTHING, NULL}};
return features;
--- NEW FILE: gettext.h ---
/* Convenience header for conditional use of GNU <libintl.h>.
Copyright (C) 1995-1998, 2000-2002, 2004-2006, 2009 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify it
under the terms of the GNU General Public License as published
by the Free Software Foundation; either version 3, or (at your option)
any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Library General Public License for more details.
You should have received a copy of the GNU General Public
License along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
USA. */
#ifndef _LIBGETTEXT_H
#define _LIBGETTEXT_H 1
/* NLS can be disabled through the configure --disable-nls option. */
#if ENABLE_NLS
#define D_(domain, string) dgettext(domain, string)
/* Get declarations of GNU message catalog functions. */
# include <libintl.h>
/* You can set the DEFAULT_TEXT_DOMAIN macro to specify the domain used by
the gettext() and ngettext() macros. This is an alternative to calling
textdomain(), and is useful for libraries. */
# ifdef DEFAULT_TEXT_DOMAIN
# undef gettext
# define gettext(Msgid) \
dgettext (DEFAULT_TEXT_DOMAIN, Msgid)
# undef ngettext
# define ngettext(Msgid1, Msgid2, N) \
dngettext (DEFAULT_TEXT_DOMAIN, Msgid1, Msgid2, N)
# endif
#else
/* Solaris /usr/include/locale.h includes /usr/include/libintl.h, which
chokes if dcgettext is defined as a macro. So include it now, to make
later inclusions of <locale.h> a NOP. We don't include <libintl.h>
as well because people using "gettext.h" will not include <libintl.h>,
and also including <libintl.h> would fail on SunOS 4, whereas <locale.h>
is OK. */
#if defined(__sun)
# include <locale.h>
#endif
/* Many header files from the libstdc++ coming with g++ 3.3 or newer include
<libintl.h>, which chokes if dcgettext is defined as a macro. So include
it now, to make later inclusions of <libintl.h> a NOP. */
#if defined(__cplusplus) && defined(__GNUG__) && (__GNUC__ >= 3)
# include <cstdlib>
# if (__GLIBC__ >= 2) || _GLIBCXX_HAVE_LIBINTL_H
# include <libintl.h>
# endif
#endif
/* Disabled NLS.
The casts to 'const char *' serve the purpose of producing warnings
for invalid uses of the value returned from these functions.
On pre-ANSI systems without 'const', the config.h file is supposed to
contain "#define const". */
# undef gettext
# define gettext(Msgid) ((const char *) (Msgid))
# undef dgettext
# define dgettext(Domainname, Msgid) ((void) (Domainname), gettext (Msgid))
# undef dcgettext
# define dcgettext(Domainname, Msgid, Category) \
((void) (Category), dgettext (Domainname, Msgid))
# undef ngettext
# define ngettext(Msgid1, Msgid2, N) \
((N) == 1 \
? ((void) (Msgid2), (const char *) (Msgid1)) \
: ((void) (Msgid1), (const char *) (Msgid2)))
# undef dngettext
# define dngettext(Domainname, Msgid1, Msgid2, N) \
((void) (Domainname), ngettext (Msgid1, Msgid2, N))
# undef dcngettext
# define dcngettext(Domainname, Msgid1, Msgid2, N, Category) \
((void) (Category), dngettext(Domainname, Msgid1, Msgid2, N))
# undef textdomain
# define textdomain(Domainname) ((const char *) (Domainname))
# undef bindtextdomain
# define bindtextdomain(Domainname, Dirname) \
((void) (Domainname), (const char *) (Dirname))
# undef bind_textdomain_codeset
# define bind_textdomain_codeset(Domainname, Codeset) \
((void) (Domainname), (const char *) (Codeset))
#endif
/* A pseudo function call that serves as a marker for the automated
extraction of messages, but does not call gettext(). The run-time
translation is done at a different place in the code.
The argument, String, should be a literal string. Concatenated strings
and other string expressions won't work.
The macro's expansion is not parenthesized, so that it is suitable as
initializer for static 'char[]' or 'const char[]' variables. */
#define gettext_noop(String) String
/* The separator between msgctxt and msgid in a .mo file. */
#define GETTEXT_CONTEXT_GLUE "\004"
/* Pseudo function calls, taking a MSGCTXT and a MSGID instead of just a
MSGID. MSGCTXT and MSGID must be string literals. MSGCTXT should be
short and rarely need to change.
The letter 'p' stands for 'particular' or 'special'. */
#ifdef DEFAULT_TEXT_DOMAIN
# define pgettext(Msgctxt, Msgid) \
pgettext_aux (DEFAULT_TEXT_DOMAIN, Msgctxt GETTEXT_CONTEXT_GLUE Msgid, Msgid, LC_MESSAGES)
#else
# define pgettext(Msgctxt, Msgid) \
pgettext_aux (NULL, Msgctxt GETTEXT_CONTEXT_GLUE Msgid, Msgid, LC_MESSAGES)
#endif
#define dpgettext(Domainname, Msgctxt, Msgid) \
pgettext_aux (Domainname, Msgctxt GETTEXT_CONTEXT_GLUE Msgid, Msgid, LC_MESSAGES)
#define dcpgettext(Domainname, Msgctxt, Msgid, Category) \
pgettext_aux (Domainname, Msgctxt GETTEXT_CONTEXT_GLUE Msgid, Msgid, Category)
#ifdef DEFAULT_TEXT_DOMAIN
# define npgettext(Msgctxt, Msgid, MsgidPlural, N) \
npgettext_aux (DEFAULT_TEXT_DOMAIN, Msgctxt GETTEXT_CONTEXT_GLUE Msgid, Msgid, MsgidPlural, N, LC_MESSAGES)
#else
# define npgettext(Msgctxt, Msgid, MsgidPlural, N) \
npgettext_aux (NULL, Msgctxt GETTEXT_CONTEXT_GLUE Msgid, Msgid, MsgidPlural, N, LC_MESSAGES)
#endif
#define dnpgettext(Domainname, Msgctxt, Msgid, MsgidPlural, N) \
npgettext_aux (Domainname, Msgctxt GETTEXT_CONTEXT_GLUE Msgid, Msgid, MsgidPlural, N, LC_MESSAGES)
#define dcnpgettext(Domainname, Msgctxt, Msgid, MsgidPlural, N, Category) \
npgettext_aux (Domainname, Msgctxt GETTEXT_CONTEXT_GLUE Msgid, Msgid, MsgidPlural, N, Category)
#ifdef __GNUC__
__inline
#else
#ifdef __cplusplus
inline
#endif
#endif
static const char *
pgettext_aux (const char *domain,
const char *msg_ctxt_id, const char *msgid,
int category)
{
const char *translation = dcgettext (domain, msg_ctxt_id, category);
if (translation == msg_ctxt_id)
return msgid;
else
return translation;
}
#ifdef __GNUC__
__inline
#else
#ifdef __cplusplus
inline
#endif
#endif
static const char *
npgettext_aux (const char *domain,
const char *msg_ctxt_id, const char *msgid,
const char *msgid_plural, unsigned long int n,
int category)
{
const char *translation =
dcngettext (domain, msg_ctxt_id, msgid_plural, n, category);
if (translation == msg_ctxt_id || translation == msgid_plural)
return (n == 1 ? msgid : msgid_plural);
else
return translation;
}
/* The same thing extended for non-constant arguments. Here MSGCTXT and MSGID
can be arbitrary expressions. But for string literals these macros are
less efficient than those above. */
#include <string.h>
#define _LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS \
(((__GNUC__ >= 3 || __GNUG__ >= 2) && !__STRICT_ANSI__) \
/* || __STDC_VERSION__ >= 199901L */ )
#if !_LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS
#include <stdlib.h>
#endif
#define pgettext_expr(Msgctxt, Msgid) \
dcpgettext_expr (NULL, Msgctxt, Msgid, LC_MESSAGES)
#define dpgettext_expr(Domainname, Msgctxt, Msgid) \
dcpgettext_expr (Domainname, Msgctxt, Msgid, LC_MESSAGES)
#ifdef __GNUC__
__inline
#else
#ifdef __cplusplus
inline
#endif
#endif
static const char *
dcpgettext_expr (const char *domain,
const char *msgctxt, const char *msgid,
int category)
{
size_t msgctxt_len = strlen (msgctxt) + 1;
size_t msgid_len = strlen (msgid) + 1;
const char *translation;
#if _LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS
char msg_ctxt_id[msgctxt_len + msgid_len];
#else
char buf[1024];
char *msg_ctxt_id =
(msgctxt_len + msgid_len <= sizeof (buf)
? buf
: (char *) malloc (msgctxt_len + msgid_len));
if (msg_ctxt_id != NULL)
#endif
{
memcpy (msg_ctxt_id, msgctxt, msgctxt_len - 1);
msg_ctxt_id[msgctxt_len - 1] = '\004';
memcpy (msg_ctxt_id + msgctxt_len, msgid, msgid_len);
translation = dcgettext (domain, msg_ctxt_id, category);
#if !_LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS
if (msg_ctxt_id != buf)
free (msg_ctxt_id);
#endif
if (translation != msg_ctxt_id)
return translation;
}
return msgid;
}
#define npgettext_expr(Msgctxt, Msgid, MsgidPlural, N) \
dcnpgettext_expr (NULL, Msgctxt, Msgid, MsgidPlural, N, LC_MESSAGES)
#define dnpgettext_expr(Domainname, Msgctxt, Msgid, MsgidPlural, N) \
dcnpgettext_expr (Domainname, Msgctxt, Msgid, MsgidPlural, N, LC_MESSAGES)
#ifdef __GNUC__
__inline
#else
#ifdef __cplusplus
inline
#endif
#endif
static const char *
dcnpgettext_expr (const char *domain,
const char *msgctxt, const char *msgid,
const char *msgid_plural, unsigned long int n,
int category)
{
size_t msgctxt_len = strlen (msgctxt) + 1;
size_t msgid_len = strlen (msgid) + 1;
const char *translation;
#if _LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS
char msg_ctxt_id[msgctxt_len + msgid_len];
#else
char buf[1024];
char *msg_ctxt_id =
(msgctxt_len + msgid_len <= sizeof (buf)
? buf
: (char *) malloc (msgctxt_len + msgid_len));
if (msg_ctxt_id != NULL)
#endif
{
memcpy (msg_ctxt_id, msgctxt, msgctxt_len - 1);
msg_ctxt_id[msgctxt_len - 1] = '\004';
memcpy (msg_ctxt_id + msgctxt_len, msgid, msgid_len);
translation = dcngettext (domain, msg_ctxt_id, msgid_plural, n, category);
#if !_LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS
if (msg_ctxt_id != buf)
free (msg_ctxt_id);
#endif
if (!(translation == msg_ctxt_id || translation == msgid_plural))
return translation;
}
return (n == 1 ? msgid : msgid_plural);
}
#endif /* _LIBGETTEXT_H */
More information about the Commits
mailing list