[orca] GNOME Goal: Remove markup in messages
- From: Joanmarie Diggs <joanied src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [orca] GNOME Goal: Remove markup in messages
- Date: Tue, 15 May 2012 16:35:56 +0000 (UTC)
commit e24b6e4d42f3b403596773db9f78d832e8e879a7
Author: Joanmarie Diggs <jdiggs igalia com>
Date: Tue May 15 12:26:22 2012 -0400
GNOME Goal: Remove markup in messages
src/orca/orca-find.ui | 21 +++++--
src/orca/orca-setup.ui | 141 +++++++++++++++++++++++++++++++-------------
src/orca/orca_gui_prefs.py | 44 +++++++++++---
3 files changed, 150 insertions(+), 56 deletions(-)
---
diff --git a/src/orca/orca-find.ui b/src/orca/orca-find.ui
index 1b2c1ed..8ec943d 100644
--- a/src/orca/orca-find.ui
+++ b/src/orca/orca-find.ui
@@ -220,13 +220,16 @@
<object class="GtkLabel" id="startFromLabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes"><b>Start from:</b></property>
- <property name="use_markup">True</property>
+ <property name="label" translatable="yes">Start from:</property>
+ <property name="use_markup">False</property>
<child internal-child="accessible">
<object class="AtkObject" id="startFromLabel-atkobject">
<property name="AtkObject::accessible-name" translatable="yes">Start from:</property>
</object>
</child>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
</object>
</child>
</object>
@@ -299,8 +302,11 @@
<object class="GtkLabel" id="searchDirectionLabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes"><b>Search direction:</b></property>
- <property name="use_markup">True</property>
+ <property name="label" translatable="yes">Search direction:</property>
+ <property name="use_markup">False</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
</object>
</child>
</object>
@@ -372,8 +378,11 @@
<object class="GtkLabel" id="resultsMustLabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes"><b>Results must:</b></property>
- <property name="use_markup">True</property>
+ <property name="label" translatable="yes">Results must:</property>
+ <property name="use_markup">False</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
</object>
</child>
</object>
diff --git a/src/orca/orca-setup.ui b/src/orca/orca-setup.ui
index bd2d0ee..c41b43c 100644
--- a/src/orca/orca-setup.ui
+++ b/src/orca/orca-setup.ui
@@ -355,8 +355,11 @@
<object class="GtkLabel" id="keyboardLayoutLabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes"><b>Keyboard Layout</b></property>
- <property name="use_markup">True</property>
+ <property name="label" translatable="yes">Keyboard Layout</property>
+ <property name="use_markup">False</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
</object>
</child>
</object>
@@ -429,8 +432,11 @@
<object class="GtkLabel" id="userInterfaceLabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes"><b>User Interface</b></property>
- <property name="use_markup">True</property>
+ <property name="label" translatable="yes">User Interface</property>
+ <property name="use_markup">False</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
</object>
</child>
</object>
@@ -581,8 +587,11 @@
<object class="GtkLabel" id="profilesLabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes"><b>Profiles</b></property>
- <property name="use_markup">True</property>
+ <property name="label" translatable="yes">Profiles</property>
+ <property name="use_markup">False</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
</object>
</child>
</object>
@@ -696,8 +705,11 @@
<object class="GtkLabel" id="timeAndDateLabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes"><b>Time and Date</b></property>
- <property name="use_markup">True</property>
+ <property name="label" translatable="yes">Time and Date</property>
+ <property name="use_markup">False</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
</object>
</child>
</object>
@@ -770,8 +782,11 @@
<object class="GtkLabel" id="mouseLabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes"><b>Mouse</b></property>
- <property name="use_markup">True</property>
+ <property name="label" translatable="yes">Mouse</property>
+ <property name="use_markup">False</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
</object>
</child>
</object>
@@ -1061,8 +1076,11 @@
<object class="GtkLabel" id="voiceTypeSettingsLabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes" comments="Translators: Having multiple 'voice types' in Orca makes it possible for the user to more quickly identify properties of text non-visually, such as the fact that text is written in capital letters or is a link; or that text is actually visible on the screen as opposed to an Orca-specific message. The available 'voice types' in Orca include 'default', 'uppercase', 'hyperlink', and 'system' -- each of which can be configured by the user to sound the way he/she finds most helpful. This string is displayed in the label for the group of all of the controls associated with configuring a particular voice type."><b>Voice Type Settings</b></property>
- <property name="use_markup">True</property>
+ <property name="label" translatable="yes" comments="Translators: Having multiple 'voice types' in Orca makes it possible for the user to more quickly identify properties of text non-visually, such as the fact that text is written in capital letters or is a link; or that text is actually visible on the screen as opposed to an Orca-specific message. The available 'voice types' in Orca include 'default', 'uppercase', 'hyperlink', and 'system' -- each of which can be configured by the user to sound the way he/she finds most helpful. This string is displayed in the label for the group of all of the controls associated with configuring a particular voice type.">Voice Type Settings</property>
+ <property name="use_markup">False</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
</object>
</child>
</object>
@@ -1188,8 +1206,11 @@
<object class="GtkLabel" id="globalVoiceSettingsLabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes"><b>Global Voice Settings</b></property>
- <property name="use_markup">True</property>
+ <property name="label" translatable="yes">Global Voice Settings</property>
+ <property name="use_markup">False</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
</object>
</child>
</object>
@@ -1319,8 +1340,11 @@
<object class="GtkLabel" id="speechVerbosityLabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes"><b>Verbosity</b></property>
- <property name="use_markup">True</property>
+ <property name="label" translatable="yes">Verbosity</property>
+ <property name="use_markup">False</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
</object>
</child>
</object>
@@ -1394,8 +1418,11 @@
<object class="GtkLabel" id="tableRowsLabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes" comments="Translators: This is label in the Preferences dialog box. It refers to what Orca will speak when the user arrows Up or Down in a table. The choices are to speak just the new cell or to speak the entire row."><b>Table Rows</b></property>
- <property name="use_markup">True</property>
+ <property name="label" translatable="yes" comments="Translators: This is label in the Preferences dialog box. It refers to what Orca will speak when the user arrows Up or Down in a table. The choices are to speak just the new cell or to speak the entire row.">Table Rows</property>
+ <property name="use_markup">False</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
</object>
</child>
</object>
@@ -1509,8 +1536,11 @@
<object class="GtkLabel" id="punctuationLabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes"><b>Punctuation Level</b></property>
- <property name="use_markup">True</property>
+ <property name="label" translatable="yes">Punctuation Level</property>
+ <property name="use_markup">False</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
</object>
</child>
</object>
@@ -1689,8 +1719,11 @@
<object class="GtkLabel" id="spokenContextLabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes"><b>Spoken Context</b></property>
- <property name="use_markup">True</property>
+ <property name="label" translatable="yes">Spoken Context</property>
+ <property name="use_markup">False</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
</object>
</child>
</object>
@@ -1831,9 +1864,12 @@
<object class="GtkLabel" id="progressBarUpdatesLabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes" comments="Translators: This is a label in the Preferences dialog box. It applies to several options related to which progress bars Orca should speak and how often Orca should speak them."><b>Progress Bar Updates</b></property>
- <property name="use_markup">True</property>
+ <property name="label" translatable="yes" comments="Translators: This is a label in the Preferences dialog box. It applies to several options related to which progress bars Orca should speak and how often Orca should speak them.">Progress Bar Updates</property>
+ <property name="use_markup">False</property>
</object>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
</child>
</object>
<packing>
@@ -2065,8 +2101,11 @@
<object class="GtkLabel" id="displaySettingsLabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes"><b>Display Settings</b></property>
- <property name="use_markup">True</property>
+ <property name="label" translatable="yes">Display Settings</property>
+ <property name="use_markup">False</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
</object>
</child>
</object>
@@ -2140,8 +2179,11 @@
<object class="GtkLabel" id="brailleVerbosityLabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes"><b>Verbosity</b></property>
- <property name="use_markup">True</property>
+ <property name="label" translatable="yes">Verbosity</property>
+ <property name="use_markup">False</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
</object>
</child>
</object>
@@ -2256,9 +2298,12 @@
<object class="GtkLabel" id="brailleSelectionLabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes"><b>Selection Indicator</b></property>
- <property name="use_markup">True</property>
+ <property name="label" translatable="yes">Selection Indicator</property>
+ <property name="use_markup">False</property>
</object>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
</child>
</object>
<packing>
@@ -2372,8 +2417,11 @@
<object class="GtkLabel" id="brailleHyperlinkLabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes"><b>Hyperlink Indicator</b></property>
- <property name="use_markup">True</property>
+ <property name="label" translatable="yes">Hyperlink Indicator</property>
+ <property name="use_markup">False</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
</object>
</child>
</object>
@@ -2781,8 +2829,11 @@
<object class="GtkLabel" id="pronunciationDictionaryLabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes"><b>Pronunciation Dictionary</b></property>
- <property name="use_markup">True</property>
+ <property name="label" translatable="yes">Pronunciation Dictionary</property>
+ <property name="use_markup">False</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
</object>
</child>
</object>
@@ -2981,8 +3032,11 @@
<object class="GtkLabel" id="textAttributesFrameLabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes"><b>Text attributes</b></property>
- <property name="use_markup">True</property>
+ <property name="label" translatable="yes">Text attributes</property>
+ <property name="use_markup">False</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
</object>
</child>
</object>
@@ -3093,9 +3147,11 @@
<object class="GtkLabel" id="label26">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes"><b>Adjust selected
-attributes</b></property>
- <property name="use_markup">True</property>
+ <property name="label" translatable="yes">Adjust selected attributes</property>
+ <property name="use_markup">False</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
</object>
</child>
</object>
@@ -3210,8 +3266,11 @@ attributes</b></property>
<object class="GtkLabel" id="textAttributesBrailleIndicatorLabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes"><b>Braille Indicator</b></property>
- <property name="use_markup">True</property>
+ <property name="label" translatable="yes">Braille Indicator</property>
+ <property name="use_markup">False</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
</object>
</child>
</object>
diff --git a/src/orca/orca_gui_prefs.py b/src/orca/orca_gui_prefs.py
index f88e0a6..cb625f6 100644
--- a/src/orca/orca_gui_prefs.py
+++ b/src/orca/orca_gui_prefs.py
@@ -3354,20 +3354,36 @@ class OrcaSetupGUI(orca_gtkbuilder.GtkBuilderWrapper):
saveActiveProfile()
else:
if profileToSave != None:
- # We're here because given profile name exists, so we have
- # to give that info to the user and give him the chance
- # to continue, or not saving the profile
- message = _("Profile <b>%s</b> already exists.\n" \
+ # Translators: This text is shown in a message dialog informing
+ # the user that he/she attempted to save a new user profile
+ # under a name which already exists. A "user profile" is a
+ # collection of settings which apply to a given task, such as
+ # a "Spanish" profile which would use Spanish text-to-speech
+ # and Spanish braille and selected when reading Spanish content.
+ message = _("Profile %s already exists.\n" \
"Continue updating the existing profile with " \
- "these new changes?") % profileToSaveLabel
+ "these new changes?") % \
+ ("<b>%s</b>" % profileToSaveLabel)
dialog = Gtk.MessageDialog(None,
Gtk.DialogFlags.MODAL,
type=Gtk.MessageType.INFO,
buttons=Gtk.ButtonsType.YES_NO)
- dialog.set_markup(_("<b>User Profile Conflict!</b>"))
+ # Translators: This is a label in a message dialog informing
+ # the user that he/she attempted to save a new user profile
+ # under a name which already exists. A "user profile" is a
+ # collection of settings which apply to a given task, such as
+ # a "Spanish" profile which would use Spanish text-to-speech
+ # and Spanish braille and selected when reading Spanish content.
+ dialog.set_markup("<b>%s</b>" % _("User Profile Conflict!"))
dialog.format_secondary_markup(message)
+ # Translators: This is the title of a message dialog informing
+ # the user that he/she attempted to save a new user profile
+ # under a name which already exists. A "user profile" is a
+ # collection of settings which apply to a given task, such as
+ # a "Spanish" profile which would use Spanish text-to-speech
+ # and Spanish braille and selected when reading Spanish content.
dialog.set_title(_("Save Profile As Conflict"))
response = dialog.run()
@@ -3384,7 +3400,12 @@ class OrcaSetupGUI(orca_gtkbuilder.GtkBuilderWrapper):
if self._isInitialSetup:
return
- # First of all, we give a chance of cancel profile change
+ # Translators: This text is displayed in a message dialog when a user
+ # indicates he/she wants to switch to a new user profile and, in the
+ # process, lose settings which have been altered but not yet saved. A
+ # "user profile" is a collection of settings which apply to a given task
+ # such as a "Spanish" profile which would use Spanish text-to-speech and
+ # Spanish braille and selected when reading Spanish content.
message = _("You are about to change the active profile. If you\n" \
"have just made changes in your preferences, they will\n" \
"be dropped at profile load.\n\n" \
@@ -3395,9 +3416,14 @@ class OrcaSetupGUI(orca_gtkbuilder.GtkBuilderWrapper):
type=Gtk.MessageType.INFO,
buttons=Gtk.ButtonsType.YES_NO)
- dialog.set_markup(_("<b>Load user profile info</b>"))
+ # Translators: This text is displayed in a message dialog when a user
+ # indicates he/she wants to switch to a new user profile and, in the
+ # process, lose settings which have been altered but not yet saved. A
+ # "user profile" is a collection of settings which apply to a given task
+ # such as a "Spanish" profile which would use Spanish text-to-speech and
+ # Spanish braille and selected when reading Spanish content.
+ dialog.set_markup("<b>%s</b>" % _("Load user profile"))
dialog.format_secondary_markup(message)
- dialog.set_title(_("Load User Profile"))
response = dialog.run()
if response == Gtk.ResponseType.YES:
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
