gnome-control-center r8844 - trunk/capplets/sound

[jensg svn gnome org]

Author: jensg
Date: Thu Aug  7 20:19:32 2008
New Revision: 8844
URL: http://svn.gnome.org/viewvc/gnome-control-center?rev=8844&view=rev

Log:
2008-08-07  Jens Granseuer  <jensgr gmx net>

	Based on a patch by: Bastien Nocera <hadess hadess net>

	* sound-properties.glade:
	* sound-theme-definition.h: HIG fixes and improved wording (bug
	#545219)


Modified:
   trunk/capplets/sound/ChangeLog
   trunk/capplets/sound/sound-properties.glade
   trunk/capplets/sound/sound-theme-definition.h

Modified: trunk/capplets/sound/sound-properties.glade
==============================================================================
--- trunk/capplets/sound/sound-properties.glade	(original)
+++ trunk/capplets/sound/sound-properties.glade	Thu Aug  7 20:19:32 2008
@@ -950,7 +950,7 @@
 		<widget class="GtkCheckButton" id="events_toggle">
 		  <property name="visible">True</property>
 		  <property name="can_focus">True</property>
-		  <property name="label" translatable="yes">_Play system sounds</property>
+		  <property name="label" translatable="yes">_Play alerts and sound effects</property>
 		  <property name="use_underline">True</property>
 		  <property name="relief">GTK_RELIEF_NORMAL</property>
 		  <property name="focus_on_click">True</property>
@@ -988,7 +988,7 @@
 			<widget class="GtkCheckButton" id="input_feedback_toggle">
 			  <property name="visible">True</property>
 			  <property name="can_focus">True</property>
-			  <property name="label" translatable="yes">Play sounds when buttons are pressed</property>
+			  <property name="label" translatable="yes">Play _sound effects when buttons are clicked</property>
 			  <property name="use_underline">True</property>
 			  <property name="relief">GTK_RELIEF_NORMAL</property>
 			  <property name="focus_on_click">True</property>
@@ -1007,7 +1007,7 @@
 			<widget class="GtkCheckButton" id="bell_audible_toggle">
 			  <property name="visible">True</property>
 			  <property name="can_focus">True</property>
-			  <property name="label" translatable="yes">_Play system beep sound</property>
+			  <property name="label" translatable="yes">Play _alert sound</property>
 			  <property name="use_underline">True</property>
 			  <property name="relief">GTK_RELIEF_NORMAL</property>
 			  <property name="focus_on_click">True</property>
@@ -1063,7 +1063,7 @@
 		  <child>
 		    <widget class="GtkLabel" id="label17">
 		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">&lt;b&gt;Sound theme&lt;/b&gt;</property>
+		      <property name="label" translatable="yes">&lt;b&gt;Sound Theme&lt;/b&gt;</property>
 		      <property name="use_underline">False</property>
 		      <property name="use_markup">True</property>
 		      <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -1139,7 +1139,7 @@
 		  <child>
 		    <widget class="GtkLabel" id="label18">
 		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">&lt;b&gt;System sounds&lt;/b&gt;</property>
+		      <property name="label" translatable="yes">&lt;b&gt;Alerts and Sound Effects&lt;/b&gt;</property>
 		      <property name="use_underline">False</property>
 		      <property name="use_markup">True</property>
 		      <property name="justify">GTK_JUSTIFY_LEFT</property>

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  7 20:19:32 2008
@@ -43,12 +43,12 @@
 	const char *names[6];
 } sounds[20] = {
 	/* Bell */
-	{ CATEGORY_BELL, SOUND_TYPE_AUDIO_BELL, N_("Audible bell"), { "bell-terminal", "bell-window-system", NULL } },
-	{ CATEGORY_BELL, SOUND_TYPE_VISUAL_BELL, N_("Visual bell"), { NULL } },
+	{ 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 } },
 	/* 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_("Button toggled"), { "button-toggle-off", "button-toggle-on", 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 } },
@@ -57,11 +57,11 @@
 	{ 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_("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 } },
 	/* 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_("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 } },