From f466590c7b5329f9ca84c3c03a698aeff3c50a42 Mon Sep 17 00:00:00 2001
From: Nikos Kouremenos <kourem@gmail.com>
Date: Wed, 9 Nov 2005 17:08:09 +0000
Subject: [PATCH] wizard texts on failure success are now pangoed and look
 nicer. also no more hardcoding \n and using word wrap; making translators
 life easier by ommiting some \n etc

---
 src/config.py    | 22 +++++++++++-----------
 src/gtkgui.glade | 12 ++++++------
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/config.py b/src/config.py
index be33b645a..06050a42e 100644
--- a/src/config.py
+++ b/src/config.py
@@ -2570,10 +2570,10 @@ class AccountCreationWizardWindow:
 			self.back_button.hide()
 			self.forward_button.hide()
 			if self.modify:
-				#FIXME: pango me
-				finish_text = _('Account has been added successfully.\n'
-'You can set advanced account options by pressing Advanced button,\nor later by clicking in Accounts menuitem under Edit menu from the main window.')
-				self.finish_label.set_text(finish_text)
+				finish_text = '<big><b>%s</b></big>\n\n%s' % (
+					_('Account has been added successfully'),
+_('You can set advanced account options by pressing Advanced button, or later by clicking in Accounts menuitem under Edit menu from the main window.'))
+				self.finish_label.set_markup(finish_text)
 				self.finish_button.set_sensitive(True)
 				self.finish_button.set_property('has-default', True)
 				self.advanced_button.show()
@@ -2601,10 +2601,11 @@ class AccountCreationWizardWindow:
 		self.go_online_checkbutton.show()
 		img = self.xml.get_widget('finish_image')
 		img.set_from_stock(gtk.STOCK_APPLY, gtk.ICON_SIZE_DIALOG)
-		#FIXME: pango me
-		finish_text = _('Your new account has been created successfully.\n'
-'You can set advanced account options by pressing Advanced button,\nor later by clicking in Accounts menuitem under Edit menu from the main window.')
-		self.finish_label.set_text(finish_text)
+		
+		finish_text = '<big><b>%s</b></big>\n\n%s' % ( 
+			_('Your new account has been created successfully'),
+_('You can set advanced account options by pressing Advanced button,or later by clicking in Accounts menuitem under Edit menu from the main window.'))
+		self.finish_label.set_markup(finish_text)
 		self.notebook.set_current_page(3) # show finish page
 		
 		if self.update_progressbar_timeout_id is not None:
@@ -2617,9 +2618,8 @@ class AccountCreationWizardWindow:
 		self.go_online_checkbutton.hide()
 		img = self.xml.get_widget('finish_image')
 		img.set_from_stock(gtk.STOCK_DIALOG_ERROR, gtk.ICON_SIZE_DIALOG)
-		#FIXME: pango me
-		finish_text = _('An error occured during account creation:\n') + reason
-		self.finish_label.set_text(finish_text)
+		finish_text = '<big><b>%s</b></big>\n\n%s' % (_('An error occured during account creation') , reason)
+		self.finish_label.set_markup(finish_text)
 		self.notebook.set_current_page(3) # show finish page
 
 	def on_advanced_button_clicked(self, widget):
diff --git a/src/gtkgui.glade b/src/gtkgui.glade
index 821d74ee5..a49b7985c 100644
--- a/src/gtkgui.glade
+++ b/src/gtkgui.glade
@@ -13147,7 +13147,7 @@ Status message</property>
 	      <child>
 		<widget class="GtkLabel" id="advanced_desc_label">
 		  <property name="visible">True</property>
-		  <property name="label" translatable="yes" comments="we talk about Description">(None)</property>
+		  <property name="label" translatable="yes"></property>
 		  <property name="use_underline">False</property>
 		  <property name="use_markup">False</property>
 		  <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -14402,7 +14402,7 @@ Please wait...</property>
 		    <packing>
 		      <property name="padding">0</property>
 		      <property name="expand">False</property>
-		      <property name="fill">True</property>
+		      <property name="fill">False</property>
 		    </packing>
 		  </child>
 
@@ -14411,9 +14411,9 @@ Please wait...</property>
 		      <property name="visible">True</property>
 		      <property name="label" translatable="yes"></property>
 		      <property name="use_underline">False</property>
-		      <property name="use_markup">False</property>
+		      <property name="use_markup">True</property>
 		      <property name="justify">GTK_JUSTIFY_LEFT</property>
-		      <property name="wrap">False</property>
+		      <property name="wrap">True</property>
 		      <property name="selectable">False</property>
 		      <property name="xalign">0.5</property>
 		      <property name="yalign">0.5</property>
@@ -14426,8 +14426,8 @@ Please wait...</property>
 		    </widget>
 		    <packing>
 		      <property name="padding">0</property>
-		      <property name="expand">False</property>
-		      <property name="fill">False</property>
+		      <property name="expand">True</property>
+		      <property name="fill">True</property>
 		    </packing>
 		  </child>
 		</widget>