From 805838fa3f991e9e077ebc1a2b9efc8eed491ab9 Mon Sep 17 00:00:00 2001
From: mengjie yu <meng-jie.yu@sun.com>
Date: Tue, 2 Nov 2004 09:49:26 +0000
Subject: remove the hard line breaks.
2004-11-02 mengjie yu <meng-jie.yu@sun.com>
* evolution-startup-wizard.glade:remove the hard line breaks.
svn path=/trunk/; revision=27793
---
shell/ChangeLog | 4 ++++
shell/evolution-startup-wizard.glade | 12 +++++++-----
2 files changed, 11 insertions(+), 5 deletions(-)
(limited to 'shell')
diff --git a/shell/ChangeLog b/shell/ChangeLog
index 7412630195..67d49a3b05 100644
--- a/shell/ChangeLog
+++ b/shell/ChangeLog
@@ -1,3 +1,7 @@
+2004-11-02 mengjie yu <meng-jie.yu@sun.com>
+
+ * evolution-startup-wizard.glade:remove the hard line breaks.
+
2004-10-25 Not Zed <NotZed@Ximian.com>
* main.c (main): register event hook.
diff --git a/shell/evolution-startup-wizard.glade b/shell/evolution-startup-wizard.glade
index 7b5ff163c9..e5b003b459 100644
--- a/shell/evolution-startup-wizard.glade
+++ b/shell/evolution-startup-wizard.glade
@@ -12,6 +12,11 @@
<property name="modal">False</property>
<property name="resizable">True</property>
<property name="destroy_with_parent">False</property>
+ <property name="decorated">True</property>
+ <property name="skip_taskbar_hint">False</property>
+ <property name="skip_pager_hint">False</property>
+ <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
+ <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
<child>
<widget class="GnomeDruid" id="startup-druid">
@@ -24,9 +29,7 @@
<property name="visible">True</property>
<property name="position">GNOME_EDGE_START</property>
<property name="title" translatable="yes">Welcome</property>
- <property name="text" translatable="yes">Welcome to Evolution. The next few screens will allow
-Evolution to connect to your email accounts, and to import
-files from other applications.
+ <property name="text" translatable="yes">Welcome to Evolution. The next few screens will allow Evolution to connect to your email accounts, and to import files from other applications.
Please click the "Forward" button to continue. </property>
</widget>
@@ -77,8 +80,7 @@ Please click the "Forward" button to continue. </property>
<property name="visible">True</property>
<property name="position">GNOME_EDGE_FINISH</property>
<property name="title" translatable="yes">Done</property>
- <property name="text" translatable="yes">You have successfully entered all of the information
-needed to set up Evolution.
+ <property name="text" translatable="yes">You have successfully entered all of the information needed to set up Evolution.
Click the "Apply" button to save your settings. </property>
</widget>
--
cgit v1.2.3