[Xfce4-commits] <parole:master> Merge branch 'master' of ssh://git.xfce.org/apps/parole

[Sean Davis]

Updating branch refs/heads/master
         to cf9d75184df39a68b94b1a444aa8b09b0b1ad988 (commit)
       from fea1ce32704fbee0c8642b33906dafc515d57dcb (commit)

commit cf9d75184df39a68b94b1a444aa8b09b0b1ad988
Merge: fea1ce3 d20b61c
Author: Sean Davis <smd.seandavis at gmail.com>
Date:   Mon Jul 23 20:47:38 2012 -0400

    Merge branch 'master' of ssh://git.xfce.org/apps/parole

commit d20b61c416165c12188463ea617155f78145bcc4
Author: Simon Steinbeiss <ochosi at xfce.org>
Date:   Tue Jul 24 00:17:10 2012 +0200

    Duration and position labels shouldn't be marked translatable

 data/interfaces/parole.ui |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/data/interfaces/parole.ui b/data/interfaces/parole.ui
index 78df4f8..ae4a7fa 100644
--- a/data/interfaces/parole.ui
+++ b/data/interfaces/parole.ui
@@ -762,7 +762,7 @@
                                                           <object class="GtkLabel" id="label_elapsed">
                                                             <property name="visible">True</property>
                                                             <property name="can_focus">False</property>
-                                                            <property name="label" translatable="yes">0:00</property>
+                                                            <property name="label">0:00</property>
                                                           </object>
                                                           <packing>
                                                             <property name="expand">False</property>
@@ -792,7 +792,7 @@
                                                           <object class="GtkLabel" id="label_duration">
                                                             <property name="visible">True</property>
                                                             <property name="can_focus">False</property>
-                                                            <property name="label" translatable="yes">0:00</property>
+                                                            <property name="label">0:00</property>
                                                           </object>
                                                           <packing>
                                                             <property name="expand">False</property>