[Commits] gettext.h 1.1.2.1 1.1.2.2 notification_prefs.c 1.1.2.43 1.1.2.44

[ticho at claws-mail.org]

Update of /home/claws-mail/plugins/notification/src
In directory claws-mail:/tmp/cvs-serv8950/src

Modified Files:
      Tag: gtk2
	gettext.h notification_prefs.c 
Log Message:
2012-01-06 [ticho]	0.29cvs4

	* src/gettext.h
	* src/notification_prefs.c
	Exclude "Plugins" string from translation, since it will be
	looked up from different gettext domain anyway.

Index: notification_prefs.c
===================================================================
RCS file: /home/claws-mail/plugins/notification/src/Attic/notification_prefs.c,v
retrieving revision 1.1.2.43
retrieving revision 1.1.2.44
diff -u -d -r1.1.2.43 -r1.1.2.44
--- notification_prefs.c	2 Jan 2012 18:25:08 -0000	1.1.2.43
+++ notification_prefs.c	6 Jan 2012 14:25:22 -0000	1.1.2.44
@@ -389,7 +389,7 @@
 {
 	static gchar *path[3];
 
-	path[0] = dgettext("claws-mail", "Plugins");
+	path[0] = D_("claws-mail", "Plugins");
 	path[1] = _("Notification");
 	path[2] = NULL;
 
@@ -403,7 +403,7 @@
     {
         static gchar *hotkeys_path[4];
 
-        hotkeys_path[0] = dgettext("claws-mail", "Plugins");
+        hotkeys_path[0] = D_("claws-mail", "Plugins");
         hotkeys_path[1] = _("Notification");
         hotkeys_path[2] = _("Hotkeys");
         hotkeys_path[3] = NULL;
@@ -421,7 +421,7 @@
 	{
 		static gchar *banner_path[4];
 
-		banner_path[0] = dgettext("claws-mail", "Plugins");
+		banner_path[0] = D_("claws-mail", "Plugins");
 		banner_path[1] = _("Notification");
 		banner_path[2] = _("Banner");
 		banner_path[3] = NULL;
@@ -438,7 +438,7 @@
 	{
 		static gchar *popup_path[4];
 
-		popup_path[0] = dgettext("claws-mail", "Plugins");
+		popup_path[0] = D_("claws-mail", "Plugins");
 		popup_path[1] = _("Notification");
 		popup_path[2] = _("Popup");
 		popup_path[3] = NULL;
@@ -455,7 +455,7 @@
 	{
 		static gchar *command_path[4];
 
-		command_path[0] = dgettext("claws-mail", "Plugins");
+		command_path[0] = D_("claws-mail", "Plugins");
 		command_path[1] = _("Notification");
 		command_path[2] = _("Command");
 		command_path[3] = NULL;
@@ -472,7 +472,7 @@
 	{
 		static gchar *lcdproc_path[4];
 
-		lcdproc_path[0] = dgettext("claws-mail", "Plugins");
+		lcdproc_path[0] = D_("claws-mail", "Plugins");
 		lcdproc_path[1] = _("Notification");
 		lcdproc_path[2] = _("LCD");
 		lcdproc_path[3] = NULL;
@@ -489,7 +489,7 @@
 	{
 		static gchar *trayicon_path[4];
 
-		trayicon_path[0] = dgettext("claws-mail", "Plugins");
+		trayicon_path[0] = D_("claws-mail", "Plugins");
 		trayicon_path[1] = _("Notification");
 		trayicon_path[2] = _("SysTrayicon");
 		trayicon_path[3] = NULL;
@@ -506,7 +506,7 @@
 	{
 		static gchar *indicator_path[4];
 
-		indicator_path[0] = dgettext("claws-mail", "Plugins");
+		indicator_path[0] = D_("claws-mail", "Plugins");
 		indicator_path[1] = _("Notification");
 		indicator_path[2] = _("Indicator");
 		indicator_path[3] = NULL;

Index: gettext.h
===================================================================
RCS file: /home/claws-mail/plugins/notification/src/Attic/gettext.h,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -d -r1.1.2.1 -r1.1.2.2
--- gettext.h	17 Mar 2007 08:59:50 -0000	1.1.2.1
+++ gettext.h	6 Jan 2012 14:25:22 -0000	1.1.2.2
@@ -26,6 +26,7 @@
 # include <libintl.h>
 
 #define _(str)		dgettext(TEXTDOMAIN, str)
+#define D_(domain, str)		dgettext(domain, str)
 
 #else