gnome-control-center r8898 - in trunk: . capplets/sound

[claudep svn gnome org]

Author: claudep
Date: Thu Aug 28 20:51:35 2008
New Revision: 8898
URL: http://svn.gnome.org/viewvc/gnome-control-center?rev=8898&view=rev

Log:
2008-08-28  Claude Paroz  <claude 2xlibre net>

	reviewed by: Jens Granseuer  <jensgr gmx net>

	* sound-theme-definition.h: add context to event sound names.
	* sound-theme.c: (setup_sound_theme_custom): replace gettext by g_dpgettext2 to
	use context information added in sound-theme-definition.h (bug #549489)

Modified:
   trunk/ChangeLog
   trunk/capplets/sound/ChangeLog
   trunk/capplets/sound/sound-theme-definition.h
   trunk/capplets/sound/sound-theme.c
   trunk/configure.in

Modified: trunk/capplets/sound/sound-theme-definition.h
==============================================================================
--- trunk/capplets/sound/sound-theme-definition.h	(original)
+++ trunk/capplets/sound/sound-theme-definition.h	Thu Aug 28 20:51:35 2008
@@ -43,28 +43,28 @@
 	const char *names[6];
 } sounds[20] = {
 	/* Bell */
-	{ CATEGORY_BELL, SOUND_TYPE_AUDIO_BELL, N_("Alert sound"), { "bell-terminal", "bell-window-system", NULL } },
-	{ CATEGORY_BELL, SOUND_TYPE_VISUAL_BELL, N_("Visual alert"), { NULL } },
+	{ CATEGORY_BELL, SOUND_TYPE_AUDIO_BELL, NC_("Sound event", "Alert sound"), { "bell-terminal", "bell-window-system", NULL } },
+	{ CATEGORY_BELL, SOUND_TYPE_VISUAL_BELL, NC_("Sound event", "Visual alert"), { NULL } },
 	/* Windows and buttons */
-	{ CATEGORY_WINDOWS_BUTTONS, -1, N_("Windows and Buttons"), { NULL } },
-	{ CATEGORY_WINDOWS_BUTTONS, SOUND_TYPE_FEEDBACK, N_("Button clicked"), { "button-pressed", "menu-click", "menu-popup", "menu-popdown", "menu-replace", NULL } },
-	{ CATEGORY_WINDOWS_BUTTONS, SOUND_TYPE_FEEDBACK, N_("Toggle button clicked"), { "button-toggle-off", "button-toggle-on", NULL } },
-	{ CATEGORY_WINDOWS_BUTTONS, SOUND_TYPE_FEEDBACK, N_("Window maximized"), { "window-maximized", NULL } },
-	{ CATEGORY_WINDOWS_BUTTONS, SOUND_TYPE_FEEDBACK, N_("Window unmaximized"), { "window-unmaximized", NULL } },
-	{ CATEGORY_WINDOWS_BUTTONS, SOUND_TYPE_FEEDBACK, N_("Window minimised"), { "window-minimized", NULL } },
+	{ CATEGORY_WINDOWS_BUTTONS, -1, NC_("Sound event", "Windows and Buttons"), { NULL } },
+	{ CATEGORY_WINDOWS_BUTTONS, SOUND_TYPE_FEEDBACK, NC_("Sound event", "Button clicked"), { "button-pressed", "menu-click", "menu-popup", "menu-popdown", "menu-replace", NULL } },
+	{ CATEGORY_WINDOWS_BUTTONS, SOUND_TYPE_FEEDBACK, NC_("Sound event", "Toggle button clicked"), { "button-toggle-off", "button-toggle-on", NULL } },
+	{ CATEGORY_WINDOWS_BUTTONS, SOUND_TYPE_FEEDBACK, NC_("Sound event", "Window maximized"), { "window-maximized", NULL } },
+	{ CATEGORY_WINDOWS_BUTTONS, SOUND_TYPE_FEEDBACK, NC_("Sound event", "Window unmaximized"), { "window-unmaximized", NULL } },
+	{ CATEGORY_WINDOWS_BUTTONS, SOUND_TYPE_FEEDBACK, NC_("Sound event", "Window minimised"), { "window-minimized", NULL } },
 	/* Desktop */
-	{ CATEGORY_DESKTOP, -1, N_("Desktop"), { NULL } },
-	{ CATEGORY_DESKTOP, SOUND_TYPE_NORMAL, N_("Login"), { "desktop-login", NULL } },
-	{ CATEGORY_DESKTOP, SOUND_TYPE_NORMAL, N_("Logout"), { "desktop-logout", NULL } },
-	{ CATEGORY_DESKTOP, SOUND_TYPE_NORMAL, N_("New e-mail"), { "message-new-email", NULL } },
-	{ CATEGORY_DESKTOP, SOUND_TYPE_NORMAL, N_("Empty trash"), { "trash-empty", NULL } },
-	{ CATEGORY_DESKTOP, SOUND_TYPE_NORMAL, N_("Long action completed (download, CD burning, etc.)"), { "complete-copy", "complete-download", "complete-media-burn", "complete-media-rip", "complete-scan", NULL } },
+	{ CATEGORY_DESKTOP, -1, NC_("Sound event", "Desktop"), { NULL } },
+	{ CATEGORY_DESKTOP, SOUND_TYPE_NORMAL, NC_("Sound event", "Login"), { "desktop-login", NULL } },
+	{ CATEGORY_DESKTOP, SOUND_TYPE_NORMAL, NC_("Sound event", "Logout"), { "desktop-logout", NULL } },
+	{ CATEGORY_DESKTOP, SOUND_TYPE_NORMAL, NC_("Sound event", "New e-mail"), { "message-new-email", NULL } },
+	{ CATEGORY_DESKTOP, SOUND_TYPE_NORMAL, NC_("Sound event", "Empty trash"), { "trash-empty", NULL } },
+	{ CATEGORY_DESKTOP, SOUND_TYPE_NORMAL, NC_("Sound event", "Long action completed (download, CD burning, etc.)"), { "complete-copy", "complete-download", "complete-media-burn", "complete-media-rip", "complete-scan", NULL } },
 	/* Alerts? */
-	{ CATEGORY_ALERTS, -1, N_("Alerts"), { NULL } },
-	{ CATEGORY_ALERTS, SOUND_TYPE_NORMAL, N_("Information or question"), { "dialog-information", "dialog-question", NULL } },
-	{ CATEGORY_ALERTS, SOUND_TYPE_NORMAL, N_("Warning"), { "dialog-warning", NULL } },
-	{ CATEGORY_ALERTS, SOUND_TYPE_NORMAL, N_("Error"), { "dialog-error", NULL } },
-	{ CATEGORY_ALERTS, SOUND_TYPE_NORMAL, N_("Battery warning"), { "power-unplug-battery-low", "battery-low", "battery-caution", NULL } },
+	{ CATEGORY_ALERTS, -1, NC_("Sound event", "Alerts"), { NULL } },
+	{ CATEGORY_ALERTS, SOUND_TYPE_NORMAL, NC_("Sound event", "Information or question"), { "dialog-information", "dialog-question", NULL } },
+	{ CATEGORY_ALERTS, SOUND_TYPE_NORMAL, NC_("Sound event", "Warning"), { "dialog-warning", NULL } },
+	{ CATEGORY_ALERTS, SOUND_TYPE_NORMAL, NC_("Sound event", "Error"), { "dialog-error", NULL } },
+	{ CATEGORY_ALERTS, SOUND_TYPE_NORMAL, NC_("Sound event", "Battery warning"), { "power-unplug-battery-low", "battery-low", "battery-caution", NULL } },
 	/* Finish off */
 	{ -1, -1, NULL, { NULL } }
 };

Modified: trunk/capplets/sound/sound-theme.c
==============================================================================
--- trunk/capplets/sound/sound-theme.c	(original)
+++ trunk/capplets/sound/sound-theme.c	Thu Aug 28 20:51:35 2008
@@ -1178,7 +1178,7 @@
 
 		if (sounds[i].type == SOUND_TYPE_VISUAL_BELL)
 			gtk_tree_store_insert_with_values (store, &iter, _parent, G_MAXINT,
-							   DISPLAY_COL, _(sounds[i].display_name),
+							   DISPLAY_COL, g_dpgettext2 (NULL, "Sound event", sounds[i].display_name),
 							   SETTING_COL, visual_bell_setting,
 							   TYPE_COL, sounds[i].type,
 							   HAS_PREVIEW_COL, FALSE,
@@ -1186,7 +1186,7 @@
 							   -1);
 		else if (sounds[i].type != -1)
 			gtk_tree_store_insert_with_values (store, &iter, _parent, G_MAXINT,
-							   DISPLAY_COL, _(sounds[i].display_name),
+							   DISPLAY_COL, g_dpgettext2 (NULL, "Sound event", sounds[i].display_name),
 							   SETTING_COL, SOUND_BUILTIN,
 							   TYPE_COL, sounds[i].type,
 							   SOUND_NAMES_COL, sounds[i].names,
@@ -1196,7 +1196,7 @@
 		else
 			/* Category */
 			gtk_tree_store_insert_with_values (store, &iter, _parent, G_MAXINT,
-							   DISPLAY_COL, _(sounds[i].display_name),
+							   DISPLAY_COL, g_dpgettext2 (NULL, "Sound event", sounds[i].display_name),
 							   SETTING_COL, SOUND_UNSET,
 							   TYPE_COL, sounds[i].type,
 							   SENSITIVE_COL, TRUE,

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Thu Aug 28 20:51:35 2008
@@ -92,6 +92,7 @@
 AM_CONDITIONAL(ENABLE_DYNAMIC_LIBSLAB, test "x$ENABLE_DYNAMIC_LIBSLAB" = "x1")
 
 COMMON_MODULES="gtk+-2.0 >= 2.11.6 dnl
+ glib-2.0 >= 2.17.4 dnl
  gio-2.0 dnl
  gconf-2.0 dnl
  libgnomeui-2.0 >= 2.2.0 dnl