[goobox] removed markup from tranlatable messages
- From: Paolo Bacchilega <paobac src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [goobox] removed markup from tranlatable messages
- Date: Sun, 3 Jun 2012 19:52:22 +0000 (UTC)
commit ec481e1bd1dd74e2741d57aaf002e9771e5bd3dd
Author: Paolo Bacchilega <paobac src gnome org>
Date: Sun Jun 3 16:14:47 2012 +0200
removed markup from tranlatable messages
src/dlg-ripper.c | 7 +++++--
src/ui/cover-chooser.ui | 9 +++++++--
src/ui/extract.ui | 13 ++++++++++---
src/ui/format-options.ui | 3 ++-
src/ui/preferences.ui | 43 ++++++++++++++++++++++++++++++-------------
src/ui/properties.ui | 12 ++++++++++--
src/ui/ripper.ui | 10 +++++++---
7 files changed, 71 insertions(+), 26 deletions(-)
---
diff --git a/src/dlg-ripper.c b/src/dlg-ripper.c
index 31a8a82..f7b08e3 100644
--- a/src/dlg-ripper.c
+++ b/src/dlg-ripper.c
@@ -571,6 +571,7 @@ rip_current_track (DialogData *data)
{
TrackInfo *track;
char *msg;
+ char *escaped;
GFile *folder;
GError *error = NULL;
char *filename;
@@ -605,8 +606,10 @@ rip_current_track (DialogData *data)
track = data->current_track->data;
- msg = g_markup_printf_escaped (_("<i>Extracting \"%s\"</i>"), track->title);
- gtk_label_set_markup (GTK_LABEL (GET_WIDGET ("track_label")), msg);
+ msg = g_strdup_printf (_("Extracting \"%s\""), track->title);
+ escaped = g_markup_printf_escaped ("<i>%s</i>", msg);
+ gtk_label_set_markup (GTK_LABEL (GET_WIDGET ("track_label")), escaped);
+ g_free (escaped);
g_free (msg);
/* Set the destination file */
diff --git a/src/ui/cover-chooser.ui b/src/ui/cover-chooser.ui
index e1e0957..3bbc216 100644
--- a/src/ui/cover-chooser.ui
+++ b/src/ui/cover-chooser.ui
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
- <requires lib="gtk+" version="2.16"/>
+ <!-- interface-requires gtk+ 3.0 -->
<object class="GtkDialog" id="cover_chooser_dialog">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -22,6 +22,7 @@
<child>
<object class="GtkButton" id="help_button">
<property name="label">gtk-help</property>
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
@@ -39,6 +40,7 @@
<child>
<object class="GtkButton" id="revert_button">
<property name="label">gtk-undo</property>
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
@@ -55,6 +57,7 @@
<child>
<object class="GtkButton" id="ok_button">
<property name="label">gtk-apply</property>
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
@@ -71,6 +74,7 @@
<child>
<object class="GtkButton" id="cancel_button">
<property name="label">gtk-close</property>
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
@@ -123,6 +127,7 @@
</child>
<child>
<object class="GtkButton" id="cancel_search_button">
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -187,7 +192,7 @@
</child>
</object>
<packing>
- <property name="expand">False</property>
+ <property name="expand">True</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
diff --git a/src/ui/extract.ui b/src/ui/extract.ui
index 3a8b48a..901e37f 100644
--- a/src/ui/extract.ui
+++ b/src/ui/extract.ui
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
- <requires lib="gtk+" version="2.16"/>
+ <!-- interface-requires gtk+ 3.0 -->
<object class="GtkDialog" id="extract_dialog">
<property name="can_focus">False</property>
<property name="border_width">6</property>
@@ -22,6 +22,7 @@
<child>
<object class="GtkButton" id="cancel_button">
<property name="label">gtk-cancel</property>
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
@@ -37,6 +38,7 @@
</child>
<child>
<object class="GtkButton" id="ok_button">
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
@@ -55,6 +57,7 @@
<child>
<object class="GtkButton" id="help_button">
<property name="label">gtk-help</property>
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
@@ -93,8 +96,10 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes"><b>Extract</b></property>
- <property name="use_markup">True</property>
+ <property name="label" translatable="yes">Extract</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
</object>
<packing>
<property name="expand">False</property>
@@ -130,6 +135,7 @@
<child>
<object class="GtkRadioButton" id="all_tracks_radiobutton">
<property name="label" translatable="yes">_All tracks</property>
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -147,6 +153,7 @@
<child>
<object class="GtkRadioButton" id="selected_tracks_radiobutton">
<property name="label" translatable="yes">_Selected tracks</property>
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
diff --git a/src/ui/format-options.ui b/src/ui/format-options.ui
index 9786143..3805b8b 100644
--- a/src/ui/format-options.ui
+++ b/src/ui/format-options.ui
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
- <requires lib="gtk+" version="2.16"/>
+ <!-- interface-requires gtk+ 3.0 -->
<object class="GtkDialog" id="format_dialog">
<property name="can_focus">False</property>
<property name="title" translatable="yes">Format Properties</property>
@@ -21,6 +21,7 @@
<child>
<object class="GtkButton" id="ok_button">
<property name="label">gtk-close</property>
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
diff --git a/src/ui/preferences.ui b/src/ui/preferences.ui
index 4d4b7df..2274826 100644
--- a/src/ui/preferences.ui
+++ b/src/ui/preferences.ui
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
- <requires lib="gtk+" version="2.16"/>
+ <!-- interface-requires gtk+ 3.0 -->
<object class="GtkDialog" id="preferences_dialog">
<property name="can_focus">False</property>
<property name="border_width">5</property>
@@ -22,6 +22,7 @@
<child>
<object class="GtkButton" id="help_button">
<property name="label">gtk-help</property>
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
@@ -39,6 +40,7 @@
<child>
<object class="GtkButton" id="close_button">
<property name="label">gtk-close</property>
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
@@ -86,8 +88,10 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes"><b>CD Drive</b></property>
- <property name="use_markup">True</property>
+ <property name="label" translatable="yes">CD Drive</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
</object>
<packing>
<property name="expand">False</property>
@@ -126,6 +130,7 @@
<child>
<object class="GtkCheckButton" id="autoplay_checkbutton">
<property name="label" translatable="yes">Automatically play newly inserted discs</property>
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -168,8 +173,10 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes"><b>Destination folder</b></property>
- <property name="use_markup">True</property>
+ <property name="label" translatable="yes">Destination folder</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
</object>
<packing>
<property name="expand">False</property>
@@ -242,8 +249,10 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes"><b>Output format</b></property>
- <property name="use_markup">True</property>
+ <property name="label" translatable="yes">Output format</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
</object>
<packing>
<property name="expand">False</property>
@@ -288,6 +297,7 @@
<child>
<object class="GtkButton" id="filetype_properties_button">
<property name="label">gtk-properties</property>
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -324,9 +334,11 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes"><small><i>Vorbis is an open source, lossy audio codec with high quality output at a lower file size than MP3.</i></small></property>
- <property name="use_markup">True</property>
<property name="wrap">True</property>
+ <attributes>
+ <attribute name="style" value="italic"/>
+ <attribute name="size" value="8500"/>
+ </attributes>
</object>
<packing>
<property name="expand">False</property>
@@ -355,9 +367,11 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes"><small><i>Free Lossless Audio Codec (FLAC) is an open source codec that compresses but does not degrade audio quality.</i></small></property>
- <property name="use_markup">True</property>
<property name="wrap">True</property>
+ <attributes>
+ <attribute name="style" value="italic"/>
+ <attribute name="size" value="8500"/>
+ </attributes>
</object>
<packing>
<property name="expand">False</property>
@@ -389,9 +403,11 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes"><small><i>WAV+PCM is a lossless format that holds uncompressed, raw pulse-code modulated (PCM) audio.</i></small></property>
- <property name="use_markup">True</property>
<property name="wrap">True</property>
+ <attributes>
+ <attribute name="style" value="italic"/>
+ <attribute name="size" value="8500"/>
+ </attributes>
</object>
<packing>
<property name="expand">False</property>
@@ -452,6 +468,7 @@
<child>
<object class="GtkCheckButton" id="save_playlist_checkbutton">
<property name="label" translatable="yes">_Save playlist</property>
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
diff --git a/src/ui/properties.ui b/src/ui/properties.ui
index 83aaf21..7e8a62a 100644
--- a/src/ui/properties.ui
+++ b/src/ui/properties.ui
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
- <requires lib="gtk+" version="2.16"/>
+ <!-- interface-requires gtk+ 3.0 -->
<object class="GtkAdjustment" id="adjustment1">
<property name="upper">9999</property>
<property name="value">2000</property>
@@ -41,6 +41,7 @@
<child>
<object class="GtkButton" id="help_button">
<property name="label">gtk-help</property>
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
@@ -58,6 +59,7 @@
<child>
<object class="GtkButton" id="undo_button">
<property name="label">gtk-undo</property>
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
@@ -74,6 +76,7 @@
<child>
<object class="GtkButton" id="cancel_button">
<property name="label">gtk-cancel</property>
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
@@ -90,6 +93,7 @@
<child>
<object class="GtkButton" id="ok_button">
<property name="label">gtk-ok</property>
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
@@ -243,12 +247,14 @@
<property name="spacing">6</property>
<child>
<object class="GtkCheckButton" id="year_checkbutton">
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
<property name="focus_on_click">False</property>
+ <property name="xalign">0.5</property>
<property name="draw_indicator">True</property>
</object>
<packing>
@@ -300,12 +306,12 @@
</child>
<child>
<object class="GtkButton" id="search_button">
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="tooltip_text" translatable="yes">Search for the remaining data</property>
<property name="use_action_appearance">False</property>
- <property name="relief">none</property>
<child>
<object class="GtkImage" id="image5">
<property name="visible">True</property>
@@ -391,6 +397,7 @@
<property name="spacing">12</property>
<child>
<object class="GtkButton" id="prev_album_button">
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -424,6 +431,7 @@
</child>
<child>
<object class="GtkButton" id="next_album_button">
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
diff --git a/src/ui/ripper.ui b/src/ui/ripper.ui
index 0f37f7d..33088fb 100644
--- a/src/ui/ripper.ui
+++ b/src/ui/ripper.ui
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
- <requires lib="gtk+" version="2.16"/>
+ <!-- interface-requires gtk+ 3.0 -->
<object class="GtkDialog" id="ripper_dialog">
<property name="can_focus">False</property>
<property name="border_width">6</property>
@@ -22,6 +22,7 @@
<child>
<object class="GtkButton" id="cancel_button">
<property name="label">gtk-cancel</property>
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
@@ -83,8 +84,11 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes"><big><b>Extracting tracks</b></big></property>
- <property name="use_markup">True</property>
+ <property name="label" translatable="yes">Extracting tracks</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ <attribute name="size" value="12000"/>
+ </attributes>
</object>
<packing>
<property name="expand">False</property>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
