[eog] Remove Pango markup from translatable strings where possible
- From: Felix Riemann <friemann src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [eog] Remove Pango markup from translatable strings where possible
- Date: Sat, 2 Jan 2010 12:44:51 +0000 (UTC)
commit 36f6627b43776776b199a109ab982996b8d12905
Author: Philip Withnall <philip tecnocode co uk>
Date: Fri Jan 1 14:02:35 2010 +0000
Remove Pango markup from translatable strings where possible
Use GtkBuilder attributes on labels instead. Fixes bug #605852.
data/eog-image-properties-dialog.ui | 120 +++++++++++++++++++++++------------
data/eog-multiple-save-as-dialog.ui | 30 +++++++---
data/eog-preferences-dialog.ui | 24 +++++---
3 files changed, 118 insertions(+), 56 deletions(-)
---
diff --git a/data/eog-image-properties-dialog.ui b/data/eog-image-properties-dialog.ui
index a05fd99..e6834bf 100644
--- a/data/eog-image-properties-dialog.ui
+++ b/data/eog-image-properties-dialog.ui
@@ -56,9 +56,11 @@
<object class="GtkLabel" id="label36">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes"><b>Name:</b></property>
- <property name="use_markup">True</property>
+ <property name="label" translatable="yes">Name:</property>
<property name="justify">right</property>
+ <attributes>
+ <attribute name="weight" value="PANGO_WEIGHT_BOLD"/>
+ </attributes>
</object>
<packing>
<property name="expand">False</property>
@@ -70,8 +72,10 @@
<object class="GtkLabel" id="label37">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes"><b>Width:</b></property>
- <property name="use_markup">True</property>
+ <property name="label" translatable="yes">Width:</property>
+ <attributes>
+ <attribute name="weight" value="PANGO_WEIGHT_BOLD"/>
+ </attributes>
</object>
<packing>
<property name="expand">False</property>
@@ -83,8 +87,10 @@
<object class="GtkLabel" id="label38">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes"><b>Height:</b></property>
- <property name="use_markup">True</property>
+ <property name="label" translatable="yes">Height:</property>
+ <attributes>
+ <attribute name="weight" value="PANGO_WEIGHT_BOLD"/>
+ </attributes>
</object>
<packing>
<property name="expand">False</property>
@@ -96,8 +102,10 @@
<object class="GtkLabel" id="label39">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes"><b>Type:</b></property>
- <property name="use_markup">True</property>
+ <property name="label" translatable="yes">Type:</property>
+ <attributes>
+ <attribute name="weight" value="PANGO_WEIGHT_BOLD"/>
+ </attributes>
</object>
<packing>
<property name="expand">False</property>
@@ -109,8 +117,10 @@
<object class="GtkLabel" id="label40">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes"><b>Bytes:</b></property>
- <property name="use_markup">True</property>
+ <property name="label" translatable="yes">Bytes:</property>
+ <attributes>
+ <attribute name="weight" value="PANGO_WEIGHT_BOLD"/>
+ </attributes>
</object>
<packing>
<property name="expand">False</property>
@@ -122,8 +132,10 @@
<object class="GtkLabel" id="label73">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes"><b>Location:</b></property>
- <property name="use_markup">True</property>
+ <property name="label" translatable="yes">Location:</property>
+ <attributes>
+ <attribute name="weight" value="PANGO_WEIGHT_BOLD"/>
+ </attributes>
</object>
<packing>
<property name="expand">False</property>
@@ -256,8 +268,10 @@
<object class="GtkLabel" id="label88">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes"><b>Aperture Value:</b></property>
- <property name="use_markup">True</property>
+ <property name="label" translatable="yes">Aperture Value:</property>
+ <attributes>
+ <attribute name="weight" value="PANGO_WEIGHT_BOLD"/>
+ </attributes>
</object>
<packing>
<property name="expand">False</property>
@@ -269,8 +283,10 @@
<object class="GtkLabel" id="label83">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes"><b>Exposure Time:</b></property>
- <property name="use_markup">True</property>
+ <property name="label" translatable="yes">Exposure Time:</property>
+ <attributes>
+ <attribute name="weight" value="PANGO_WEIGHT_BOLD"/>
+ </attributes>
</object>
<packing>
<property name="expand">False</property>
@@ -282,8 +298,10 @@
<object class="GtkLabel" id="label96">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes"><b>Focal Length:</b></property>
- <property name="use_markup">True</property>
+ <property name="label" translatable="yes">Focal Length:</property>
+ <attributes>
+ <attribute name="weight" value="PANGO_WEIGHT_BOLD"/>
+ </attributes>
</object>
<packing>
<property name="expand">False</property>
@@ -295,8 +313,10 @@
<object class="GtkLabel" id="label95">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes"><b>Flash:</b></property>
- <property name="use_markup">True</property>
+ <property name="label" translatable="yes">Flash:</property>
+ <attributes>
+ <attribute name="weight" value="PANGO_WEIGHT_BOLD"/>
+ </attributes>
</object>
<packing>
<property name="expand">False</property>
@@ -308,8 +328,10 @@
<object class="GtkLabel" id="label94">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes"><b>ISO Speed Rating:</b></property>
- <property name="use_markup">True</property>
+ <property name="label" translatable="yes">ISO Speed Rating:</property>
+ <attributes>
+ <attribute name="weight" value="PANGO_WEIGHT_BOLD"/>
+ </attributes>
</object>
<packing>
<property name="expand">False</property>
@@ -321,8 +343,10 @@
<object class="GtkLabel" id="label93">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes"><b>Metering Mode:</b></property>
- <property name="use_markup">True</property>
+ <property name="label" translatable="yes">Metering Mode:</property>
+ <attributes>
+ <attribute name="weight" value="PANGO_WEIGHT_BOLD"/>
+ </attributes>
</object>
<packing>
<property name="expand">False</property>
@@ -334,9 +358,11 @@
<object class="GtkLabel" id="label92">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes"><b>Camera Model:</b></property>
- <property name="use_markup">True</property>
+ <property name="label" translatable="yes">Camera Model:</property>
<property name="justify">right</property>
+ <attributes>
+ <attribute name="weight" value="PANGO_WEIGHT_BOLD"/>
+ </attributes>
</object>
<packing>
<property name="expand">False</property>
@@ -348,8 +374,10 @@
<object class="GtkLabel" id="label91">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes"><b>Date/Time:</b></property>
- <property name="use_markup">True</property>
+ <property name="label" translatable="yes">Date/Time:</property>
+ <attributes>
+ <attribute name="weight" value="PANGO_WEIGHT_BOLD"/>
+ </attributes>
</object>
<packing>
<property name="expand">False</property>
@@ -371,8 +399,10 @@
<object class="GtkLabel" id="label111">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes"><b>Description:</b></property>
- <property name="use_markup">True</property>
+ <property name="label" translatable="yes">Description:</property>
+ <attributes>
+ <attribute name="weight" value="PANGO_WEIGHT_BOLD"/>
+ </attributes>
</object>
<packing>
<property name="expand">False</property>
@@ -384,8 +414,10 @@
<object class="GtkLabel" id="label110">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes"><b>Location:</b></property>
- <property name="use_markup">True</property>
+ <property name="label" translatable="yes">Location:</property>
+ <attributes>
+ <attribute name="weight" value="PANGO_WEIGHT_BOLD"/>
+ </attributes>
</object>
<packing>
<property name="expand">False</property>
@@ -397,8 +429,10 @@
<object class="GtkLabel" id="label112">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes"><b>Keywords:</b></property>
- <property name="use_markup">True</property>
+ <property name="label" translatable="yes">Keywords:</property>
+ <attributes>
+ <attribute name="weight" value="PANGO_WEIGHT_BOLD"/>
+ </attributes>
</object>
<packing>
<property name="expand">False</property>
@@ -410,8 +444,10 @@
<object class="GtkLabel" id="label113">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes"><b>Author:</b></property>
- <property name="use_markup">True</property>
+ <property name="label" translatable="yes">Author:</property>
+ <attributes>
+ <attribute name="weight" value="PANGO_WEIGHT_BOLD"/>
+ </attributes>
</object>
<packing>
<property name="expand">False</property>
@@ -423,8 +459,10 @@
<object class="GtkLabel" id="label114">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes"><b>Copyright:</b></property>
- <property name="use_markup">True</property>
+ <property name="label" translatable="yes">Copyright:</property>
+ <attributes>
+ <attribute name="weight" value="PANGO_WEIGHT_BOLD"/>
+ </attributes>
</object>
<packing>
<property name="expand">False</property>
@@ -670,8 +708,10 @@
<child type="label">
<object class="GtkLabel" id="details_expander">
<property name="visible">True</property>
- <property name="label" translatable="yes"><b>Details</b></property>
- <property name="use_markup">True</property>
+ <property name="label" translatable="yes">Details</property>
+ <attributes>
+ <attribute name="weight" value="PANGO_WEIGHT_BOLD"/>
+ </attributes>
</object>
</child>
</object>
diff --git a/data/eog-multiple-save-as-dialog.ui b/data/eog-multiple-save-as-dialog.ui
index 147d32a..b85af20 100644
--- a/data/eog-multiple-save-as-dialog.ui
+++ b/data/eog-multiple-save-as-dialog.ui
@@ -101,7 +101,7 @@
<child>
<object class="GtkLabel" id="label12">
<property name="visible">True</property>
- <property name="label" translatable="yes"><small><i><b>%f:</b> original filename</i></small></property>
+ <property name="label" translatable="yes"><b>%f:</b> original filename</property>
<property name="use_underline">False</property>
<property name="use_markup">True</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -115,6 +115,10 @@
<property name="width_chars">-1</property>
<property name="single_line_mode">False</property>
<property name="angle">0</property>
+ <attributes>
+ <attribute name="style" value="PANGO_STYLE_ITALIC"/>
+ <attribute name="scale" value="0.8"/><!-- PANGO_SCALE_SMALL -->
+ </attributes>
</object>
<packing>
<property name="padding">0</property>
@@ -125,7 +129,7 @@
<child>
<object class="GtkLabel" id="label17">
<property name="visible">True</property>
- <property name="label" translatable="yes"><small><i><b>%n:</b> counter</i></small></property>
+ <property name="label" translatable="yes"><b>%n:</b> counter</property>
<property name="use_underline">False</property>
<property name="use_markup">True</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -139,6 +143,10 @@
<property name="width_chars">-1</property>
<property name="single_line_mode">False</property>
<property name="angle">0</property>
+ <attributes>
+ <attribute name="style" value="PANGO_STYLE_ITALIC"/>
+ <attribute name="scale" value="0.8"/><!-- PANGO_SCALE_SMALL -->
+ </attributes>
</object>
<packing>
<property name="padding">0</property>
@@ -261,9 +269,8 @@
<child type="label">
<object class="GtkLabel" id="label1">
<property name="visible">True</property>
- <property name="label" translatable="yes"><b>File Path Specifications</b></property>
+ <property name="label" translatable="yes">File Path Specifications</property>
<property name="use_underline">False</property>
- <property name="use_markup">True</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
<property name="wrap">False</property>
<property name="selectable">False</property>
@@ -275,6 +282,9 @@
<property name="width_chars">-1</property>
<property name="single_line_mode">False</property>
<property name="angle">0</property>
+ <attributes>
+ <attribute name="weight" value="PANGO_WEIGHT_BOLD"/>
+ </attributes>
</object>
</child>
</object>
@@ -386,9 +396,8 @@
<child type="label">
<object class="GtkLabel" id="label2">
<property name="visible">True</property>
- <property name="label" translatable="yes"><b>Options</b></property>
+ <property name="label" translatable="yes">Options</property>
<property name="use_underline">False</property>
- <property name="use_markup">True</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
<property name="wrap">False</property>
<property name="selectable">False</property>
@@ -400,6 +409,9 @@
<property name="width_chars">-1</property>
<property name="single_line_mode">False</property>
<property name="angle">0</property>
+ <attributes>
+ <attribute name="weight" value="PANGO_WEIGHT_BOLD"/>
+ </attributes>
</object>
</child>
</object>
@@ -541,9 +553,8 @@
<child type="label">
<object class="GtkLabel" id="label3">
<property name="visible">True</property>
- <property name="label" translatable="yes"><b>File Name Preview</b></property>
+ <property name="label" translatable="yes">File Name Preview</property>
<property name="use_underline">False</property>
- <property name="use_markup">True</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
<property name="wrap">False</property>
<property name="selectable">False</property>
@@ -555,6 +566,9 @@
<property name="width_chars">-1</property>
<property name="single_line_mode">False</property>
<property name="angle">0</property>
+ <attributes>
+ <attribute name="weight" value="PANGO_WEIGHT_BOLD"/>
+ </attributes>
</object>
</child>
</object>
diff --git a/data/eog-preferences-dialog.ui b/data/eog-preferences-dialog.ui
index 09cc25b..1e267ea 100644
--- a/data/eog-preferences-dialog.ui
+++ b/data/eog-preferences-dialog.ui
@@ -88,9 +88,8 @@
<child>
<object class="GtkLabel" id="label6">
<property name="visible">True</property>
- <property name="label" translatable="yes"><b>Image Enhancements</b></property>
+ <property name="label" translatable="yes">Image Enhancements</property>
<property name="use_underline">False</property>
- <property name="use_markup">True</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
<property name="wrap">False</property>
<property name="selectable">False</property>
@@ -102,6 +101,9 @@
<property name="width_chars">-1</property>
<property name="single_line_mode">False</property>
<property name="angle">0</property>
+ <attributes>
+ <attribute name="weight" value="PANGO_WEIGHT_BOLD"/>
+ </attributes>
</object>
<packing>
<property name="padding">0</property>
@@ -286,9 +288,8 @@
<child>
<object class="GtkLabel" id="label8">
<property name="visible">True</property>
- <property name="label" translatable="yes"><b>Transparent Parts</b></property>
+ <property name="label" translatable="yes">Transparent Parts</property>
<property name="use_underline">False</property>
- <property name="use_markup">True</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
<property name="wrap">False</property>
<property name="selectable">False</property>
@@ -300,6 +301,9 @@
<property name="width_chars">-1</property>
<property name="single_line_mode">False</property>
<property name="angle">0</property>
+ <attributes>
+ <attribute name="weight" value="PANGO_WEIGHT_BOLD"/>
+ </attributes>
</object>
<packing>
<property name="padding">0</property>
@@ -483,9 +487,8 @@
<child>
<object class="GtkLabel" id="label13">
<property name="visible">True</property>
- <property name="label" translatable="yes"><b>Image Zoom</b></property>
+ <property name="label" translatable="yes">Image Zoom</property>
<property name="use_underline">False</property>
- <property name="use_markup">True</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
<property name="wrap">False</property>
<property name="selectable">False</property>
@@ -497,6 +500,9 @@
<property name="width_chars">-1</property>
<property name="single_line_mode">False</property>
<property name="angle">0</property>
+ <attributes>
+ <attribute name="weight" value="PANGO_WEIGHT_BOLD"/>
+ </attributes>
</object>
<packing>
<property name="padding">0</property>
@@ -585,9 +591,8 @@
<child>
<object class="GtkLabel" id="label15">
<property name="visible">True</property>
- <property name="label" translatable="yes"><b>Sequence</b></property>
+ <property name="label" translatable="yes">Sequence</property>
<property name="use_underline">False</property>
- <property name="use_markup">True</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
<property name="wrap">False</property>
<property name="selectable">False</property>
@@ -599,6 +604,9 @@
<property name="width_chars">-1</property>
<property name="single_line_mode">False</property>
<property name="angle">0</property>
+ <attributes>
+ <attribute name="weight" value="PANGO_WEIGHT_BOLD"/>
+ </attributes>
</object>
<packing>
<property name="padding">0</property>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
