From 2dadfef80ed6961df9b96af50dcbe70d621d6c33 Mon Sep 17 00:00:00 2001 From: Jens Granseuer Date: Thu, 7 Aug 2008 20:19:32 +0000 Subject: [PATCH] Based on a patch by: Bastien Nocera 2008-08-07 Jens Granseuer Based on a patch by: Bastien Nocera * sound-properties.glade: * sound-theme-definition.h: HIG fixes and improved wording (bug #545219) svn path=/trunk/; revision=8844 --- capplets/sound/ChangeLog | 8 ++++++++ capplets/sound/sound-properties.glade | 10 +++++----- capplets/sound/sound-theme-definition.h | 10 +++++----- 3 files changed, 18 insertions(+), 10 deletions(-) diff --git a/capplets/sound/ChangeLog b/capplets/sound/ChangeLog index ec99699b7..748db37ff 100644 --- a/capplets/sound/ChangeLog +++ b/capplets/sound/ChangeLog @@ -1,3 +1,11 @@ +2008-08-07 Jens Granseuer + + Based on a patch by: Bastien Nocera + + * sound-properties.glade: + * sound-theme-definition.h: HIG fixes and improved wording (bug + #545219) + 2008-08-06 Jens Granseuer * sound-properties-capplet.c: (create_dialog): fix warning due to diff --git a/capplets/sound/sound-properties.glade b/capplets/sound/sound-properties.glade index cba7a1bc4..82f362681 100644 --- a/capplets/sound/sound-properties.glade +++ b/capplets/sound/sound-properties.glade @@ -950,7 +950,7 @@ True True - _Play system sounds + _Play alerts and sound effects True GTK_RELIEF_NORMAL True @@ -988,7 +988,7 @@ True True - Play sounds when buttons are pressed + Play _sound effects when buttons are clicked True GTK_RELIEF_NORMAL True @@ -1007,7 +1007,7 @@ True True - _Play system beep sound + Play _alert sound True GTK_RELIEF_NORMAL True @@ -1063,7 +1063,7 @@ True - <b>Sound theme</b> + <b>Sound Theme</b> False True GTK_JUSTIFY_LEFT @@ -1139,7 +1139,7 @@ True - <b>System sounds</b> + <b>Alerts and Sound Effects</b> False True GTK_JUSTIFY_LEFT diff --git a/capplets/sound/sound-theme-definition.h b/capplets/sound/sound-theme-definition.h index ce36e86fd..d458a34f7 100644 --- a/capplets/sound/sound-theme-definition.h +++ b/capplets/sound/sound-theme-definition.h @@ -43,12 +43,12 @@ static struct { 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 @@ static struct { { 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 } },