Index: /home/usera/cvs/evolution/addressbook/gui/merging/eab-contact-duplicate-detected.glade
===================================================================
--- /home/usera/cvs/evolution/addressbook/gui/merging/eab-contact-duplicate-detected.glade	(revision 33668)
+++ /home/usera/cvs/evolution/addressbook/gui/merging/eab-contact-duplicate-detected.glade	(working copy)
@@ -16,9 +16,9 @@
   <property name="skip_pager_hint">False</property>
   <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
   <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
+  <property name="focus_on_map">True</property>
+  <property name="urgency_hint">False</property>
   <property name="has_separator">False</property>
-  <property name="height-request">400</property>
-  <property name="width-request">500</property>
 
   <child internal-child="vbox">
     <widget class="GtkVBox" id="dialog-vbox1">
@@ -56,12 +56,14 @@
 	      <property name="response_id">0</property>
 	    </widget>
 	  </child>
+
 	  <child>
 	    <widget class="GtkButton" id="button5">
 	      <property name="visible">True</property>
 	      <property name="can_default">True</property>
 	      <property name="can_focus">True</property>
-	      <property name="label">Merge</property>
+	      <property name="label">_Merge</property>
+	      <property name="use_underline">True</property>
 	      <property name="relief">GTK_RELIEF_NORMAL</property>
 	      <property name="focus_on_click">True</property>
 	      <property name="response_id">2</property>
@@ -77,30 +79,34 @@
       </child>
 
       <child>
-        <widget class="GtkScrolledWindow" id="scrolledwindow2">
-          <property name="visible">True</property>
-          <property name="can_focus">True</property>
-          <property name="hscrollbar_policy">GTK_POLICY_NEVER</property>
-          <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-          <property name="shadow_type">GTK_SHADOW_IN</property>
+	<widget class="GtkScrolledWindow" id="scrolledwindow2">
+	  <property name="border_width">20</property>
+	  <property name="width_request">750</property>
+	  <property name="height_request">450</property>
+	  <property name="visible">True</property>
+	  <property name="can_focus">True</property>
+	  <property name="hscrollbar_policy">GTK_POLICY_NEVER</property>
+	  <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+	  <property name="shadow_type">GTK_SHADOW_IN</property>
 	  <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
 
 	  <child>
-  	    <widget class="GtkViewport" id="viewport1">
-		    
+	    <widget class="GtkViewport" id="viewport1">
+	      <property name="shadow_type">GTK_SHADOW_IN</property>
+
 	      <child>
-	        <widget class="GtkTable" id="table1">
-	          <property name="border_width">12</property>
-  	          <property name="visible">True</property>
-	          <property name="n_rows">5</property>
-	          <property name="n_columns">2</property>
-	  	  <property name="homogeneous">False</property>
-	   	  <property name="row_spacing">6</property>
+		<widget class="GtkTable" id="table1">
+		  <property name="border_width">12</property>
+		  <property name="visible">True</property>
+		  <property name="n_rows">5</property>
+		  <property name="n_columns">2</property>
+		  <property name="homogeneous">False</property>
+		  <property name="row_spacing">6</property>
 		  <property name="column_spacing">12</property>
 
-	          <child>
-	    	    <widget class="Custom" id="custom-old-contact">
- 		      <property name="visible">True</property>
+		  <child>
+		    <widget class="Custom" id="custom-old-contact">
+		      <property name="visible">True</property>
 		      <property name="creation_function">_eab_contact_merging_create_contact_display</property>
 		      <property name="int1">0</property>
 		      <property name="int2">0</property>
@@ -117,10 +123,10 @@
 		  <child>
 		    <widget class="GtkLabel" id="label1">
 		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">The name or email address of this contact already exists
-in this folder.  Would you like to add it anyway?</property>
+		      <property name="label" translatable="yes">&lt;b&gt;The name or email address of this contact already exists
+in this folder.  Would you like to add it anyway?&lt;/b&gt;</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="selectable">False</property>
@@ -128,7 +134,11 @@
 		      <property name="yalign">0.5</property>
 		      <property name="xpad">0</property>
 		      <property name="ypad">0</property>
-	   	    </widget>
+		      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+		      <property name="width_chars">-1</property>
+		      <property name="single_line_mode">False</property>
+		      <property name="angle">0</property>
+		    </widget>
 		    <packing>
 		      <property name="left_attach">1</property>
 		      <property name="right_attach">2</property>
@@ -151,6 +161,10 @@
 		      <property name="yalign">0.5</property>
 		      <property name="xpad">0</property>
 		      <property name="ypad">0</property>
+		      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+		      <property name="width_chars">-1</property>
+		      <property name="single_line_mode">False</property>
+		      <property name="angle">0</property>
 		    </widget>
 		    <packing>
 		      <property name="left_attach">1</property>
@@ -159,7 +173,7 @@
 		      <property name="bottom_attach">4</property>
 		      <property name="y_options">fill</property>
 		    </packing>
-	 	  </child>
+		  </child>
 
 		  <child>
 		    <widget class="GtkLabel" id="label4">
@@ -174,6 +188,10 @@
 		      <property name="yalign">0.5</property>
 		      <property name="xpad">0</property>
 		      <property name="ypad">0</property>
+		      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+		      <property name="width_chars">-1</property>
+		      <property name="single_line_mode">False</property>
+		      <property name="angle">0</property>
 		    </widget>
 		    <packing>
 		      <property name="left_attach">1</property>
@@ -212,19 +230,19 @@
 		      <property name="bottom_padding">0</property>
 		      <property name="left_padding">0</property>
 		      <property name="right_padding">0</property>
-	
+
 		      <child>
-		     	<widget class="Custom" id="custom2">
-		       	  <property name="visible">True</property>
- 	       	          <property name="creation_function">e_create_image_widget</property>
- 	                  <property name="string1">stock_person</property>
-		          <property name="int1">0</property>
-		          <property name="int2">0</property>
-		          <property name="last_modification_time">Fri, 08 Jun 2001 00:18:39 GMT</property>
-		        </widget>
-	 	      </child>
-	    	    </widget>
-	   	    <packing>
+			<widget class="Custom" id="custom2">
+			  <property name="visible">True</property>
+			  <property name="creation_function">e_create_image_widget</property>
+			  <property name="string1">stock_person</property>
+			  <property name="int1">0</property>
+			  <property name="int2">0</property>
+			  <property name="last_modification_time">Fri, 08 Jun 2001 00:18:39 GMT</property>
+			</widget>
+		      </child>
+		    </widget>
+		    <packing>
 		      <property name="left_attach">0</property>
 		      <property name="right_attach">1</property>
 		      <property name="top_attach">0</property>
@@ -238,9 +256,14 @@
 	    </widget>
 	  </child>
 	</widget>
+	<packing>
+	  <property name="padding">0</property>
+	  <property name="expand">True</property>
+	  <property name="fill">True</property>
+	</packing>
       </child>
     </widget>
   </child>
 </widget>
-	
+
 </glade-interface>
