conduit r1285 - in trunk: . data
- From: thomasvm svn gnome org
- To: svn-commits-list gnome org
- Subject: conduit r1285 - in trunk: . data
- Date: Thu, 7 Feb 2008 07:28:59 +0000 (GMT)
Author: thomasvm
Date: Thu Feb 7 07:28:58 2008
New Revision: 1285
URL: http://svn.gnome.org/viewvc/conduit?rev=1285&view=rev
Log:
2008-02-07 Thomas Van Machelen <thomas vanmachelen gmail com>
* conduit/data/conduit.glade: Fix #512540 by making the Conflict
Preferences a bit better
Modified:
trunk/ChangeLog
trunk/data/conduit.glade
Modified: trunk/data/conduit.glade
==============================================================================
--- trunk/data/conduit.glade (original)
+++ trunk/data/conduit.glade Thu Feb 7 07:28:58 2008
@@ -718,18 +718,19 @@
<widget class="GtkVBox" id="vbox34">
<property name="visible">True</property>
<child>
- <widget class="GtkLabel" id="label77">
+ <widget class="GtkLabel" id="label78">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">When There is a Conflict</property>
+ <property name="label" translatable="yes">When an Item Has Been Deleted</property>
</widget>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
+ <property name="position">1</property>
</packing>
</child>
<child>
- <widget class="GtkRadioButton" id="conflict_ask_rb">
+ <widget class="GtkRadioButton" id="deleted_ask_rb">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="label" translatable="yes">Ask Me What to Do</property>
@@ -744,14 +745,14 @@
</packing>
</child>
<child>
- <widget class="GtkRadioButton" id="conflict_replace_rb">
+ <widget class="GtkRadioButton" id="deleted_replace_rb">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">Replace the Older Item</property>
+ <property name="label" translatable="yes">Delete from the corresponding Sink</property>
<property name="use_underline">True</property>
<property name="response_id">0</property>
<property name="draw_indicator">True</property>
- <property name="group">conflict_ask_rb</property>
+ <property name="group">deleted_ask_rb</property>
</widget>
<packing>
<property name="expand">False</property>
@@ -760,14 +761,14 @@
</packing>
</child>
<child>
- <widget class="GtkRadioButton" id="conflict_skip_rb">
+ <widget class="GtkRadioButton" id="deleted_skip_rb">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="label" translatable="yes">Skip</property>
<property name="use_underline">True</property>
<property name="response_id">0</property>
<property name="draw_indicator">True</property>
- <property name="group">conflict_ask_rb</property>
+ <property name="group">deleted_ask_rb</property>
</widget>
<packing>
<property name="expand">False</property>
@@ -776,10 +777,10 @@
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label78">
+ <widget class="GtkLabel" id="label77">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">When an Item Has Been Deleted</property>
+ <property name="label" translatable="yes">When There is a Two Way Conflict</property>
</widget>
<packing>
<property name="expand">False</property>
@@ -788,7 +789,7 @@
</packing>
</child>
<child>
- <widget class="GtkRadioButton" id="deleted_ask_rb">
+ <widget class="GtkRadioButton" id="conflict_ask_rb">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="label" translatable="yes">Ask Me What to Do</property>
@@ -803,14 +804,14 @@
</packing>
</child>
<child>
- <widget class="GtkRadioButton" id="deleted_replace_rb">
+ <widget class="GtkRadioButton" id="conflict_replace_rb">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">Delete from the corresponding Sink</property>
+ <property name="label" translatable="yes">Replace the Older Item</property>
<property name="use_underline">True</property>
<property name="response_id">0</property>
<property name="draw_indicator">True</property>
- <property name="group">deleted_ask_rb</property>
+ <property name="group">conflict_ask_rb</property>
</widget>
<packing>
<property name="expand">False</property>
@@ -819,14 +820,14 @@
</packing>
</child>
<child>
- <widget class="GtkRadioButton" id="deleted_skip_rb">
+ <widget class="GtkRadioButton" id="conflict_skip_rb">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="label" translatable="yes">Skip</property>
<property name="use_underline">True</property>
<property name="response_id">0</property>
<property name="draw_indicator">True</property>
- <property name="group">deleted_ask_rb</property>
+ <property name="group">conflict_ask_rb</property>
</widget>
<packing>
<property name="expand">False</property>
@@ -841,7 +842,7 @@
<child>
<widget class="GtkLabel" id="label76">
<property name="visible">True</property>
- <property name="label" translatable="yes"><b>Two Way Synchronisation</b></property>
+ <property name="label" translatable="yes"><b>Synchronisation Options</b></property>
<property name="use_markup">True</property>
</widget>
<packing>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
