#
#
# patch "ChangeLog.pm"
#  from [811c554cf93c14ca9f01851b33e122280470fbfa]
#    to [0bcce5bab01ed8d7f2ad28c2a11c2be78674f6b7]
# 
# patch "mtn-browse.glade"
#  from [ec7ec4bdb1b3d30d8d849e2b41d665727deb8904]
#    to [1bfb2911bbcd59175423e0283fb32ed1fb0960d2]
#
============================================================
--- ChangeLog.pm	811c554cf93c14ca9f01851b33e122280470fbfa
+++ ChangeLog.pm	0bcce5bab01ed8d7f2ad28c2a11c2be78674f6b7
@@ -45,6 +45,25 @@ use warnings;
 use strict;
 use warnings;
 
+# ***** GLOBAL DATA DECLARATIONS *****
+
+# The translated revision change type strings.
+
+my $__added      = __("Added");
+my $__removed    = __("Removed");
+my $__changed    = __("Changed");
+my $__renamed    = __("Renamed");
+my $__attributes = __("Attributes");
+
+# A translated list of all possible revision change types that we need to check
+# for.
+
+my @__types = ($__added,
+	       $__removed,
+	       $__changed,
+	       $__renamed,
+	       $__attributes);
+
 # ***** FUNCTIONAL PROTOTYPES *****
 
 # Public routines.
@@ -150,11 +169,6 @@ sub generate_revision_report($$$$;$)
        %revision_data,
        %seen,
        @unique);
-    my @types = (__("Added"),
-		 __("Removed"),
-		 __("Changed"),
-		 __("Renamed"),
-		 __("Attributes"));
 
     # Sort out colour attributes.
 
@@ -177,7 +191,7 @@ sub generate_revision_report($$$$;$)
 					   __("Revision id: "),
 					   $bold);
     $text_buffer->insert_with_tags_by_name($text_buffer->get_end_iter(),
-					   $revision_id . "\n\n",
+					   $revision_id . "\n",
 					   $normal);
 
     # Certs.
@@ -195,23 +209,30 @@ sub generate_revision_report($$$$;$)
 	{
 	    my $change_log = $cert->{value};
 	    $change_log =~ s/\s+$//s;
-	    push(@change_logs, $change_log);
+	    push(@change_logs, $change_log) if ($change_log ne "");
 	}
 	else
 	{
-	    $cert->{value} =~ s/T/ / if ($cert->{name} eq "date");
+	    if ($cert->{name} eq "date")
+	    {
+		$cert->{value} =~ s/T/ /;
+	    }
+	    elsif (index($cert->{value}, "\n") >= 0)
+	    {
+		my $padding = sprintf("\n%-*s", $cert_max_len + 2, "");
+		$cert->{value} =~ s/\n/$padding/g;
+	    }
 	    $text_buffer->insert_with_tags_by_name
 		($text_buffer->get_end_iter(),
-		 sprintf("%-*s ",
+		 sprintf("\n%-*s ",
 			 $cert_max_len + 1, ucfirst($cert->{name}) . ":"),
 		 $bold);
 	    $text_buffer->insert_with_tags_by_name
 		($text_buffer->get_end_iter(),
-		 sprintf("%s\n", $cert->{value}),
+		 sprintf("%s", $cert->{value}),
 		 $normal);
 	}
     }
-    push(@change_logs, "") if (scalar(@change_logs) == 0);
 
     # Change log(s).
 
@@ -220,8 +241,7 @@ sub generate_revision_report($$$$;$)
     {
 	$text_buffer->insert_with_tags_by_name($text_buffer->get_end_iter(),
 					       "\n",
-					       $normal)
-	    if ($i > 1);
+					       $normal);
 	$text_buffer->insert_with_tags_by_name
 	    ($text_buffer->get_end_iter(),
 	     __x("\nChange Log{optional_count}:\n",
@@ -244,7 +264,7 @@ sub generate_revision_report($$$$;$)
 	$text_buffer->insert_with_tags_by_name($text_buffer->get_end_iter(),
 					       __("\n\nChanges Made:\n"),
 					       $bold);
-	foreach my $type (@types)
+	foreach my $type (@__types)
 	{
 	    $revision_data{$type} = [];
 	}
@@ -252,35 +272,35 @@ sub generate_revision_report($$$$;$)
 	{
 	    if ($change->{type} eq "add_dir")
 	    {
-		push(@{$revision_data{__("Added")}}, $change->{name} . "/");
+		push(@{$revision_data{$__added}}, $change->{name} . "/");
 	    }
 	    elsif ($change->{type} eq "add_file")
 	    {
-		push(@{$revision_data{__("Added")}}, $change->{name});
+		push(@{$revision_data{$__added}}, $change->{name});
 	    }
 	    elsif ($change->{type} eq "delete")
 	    {
-		push(@{$revision_data{__("Removed")}}, $change->{name});
+		push(@{$revision_data{$__removed}}, $change->{name});
 	    }
 	    elsif ($change->{type} eq "patch")
 	    {
-		push(@{$revision_data{__("Changed")}}, $change->{name});
+		push(@{$revision_data{$__changed}}, $change->{name});
 	    }
 	    elsif ($change->{type} eq "rename")
 	    {
-		push(@{$revision_data{__("Renamed")}},
+		push(@{$revision_data{$__renamed}},
 		     $change->{from_name} . " -> " . $change->{to_name});
 	    }
 	    elsif ($change->{type} eq "clear")
 	    {
-		push(@{$revision_data{__("Attributes")}},
+		push(@{$revision_data{$__attributes}},
 		     __x("{name}: {attribute} was cleared",
 			 name      => $change->{name},
 			 attribute => $change->{attribute}));
 	    }
 	    elsif ($change->{type} eq "set")
 	    {
-		push(@{$revision_data{__("Attributes")}},
+		push(@{$revision_data{$__attributes}},
 		     sprintf("%s: %s = %s",
 			     $change->{name},
 			     $change->{attribute},
@@ -295,7 +315,7 @@ sub generate_revision_report($$$$;$)
 		$manifest_id = $change->{manifest_id};
 	    }
 	}
-	foreach my $type (@types)
+	foreach my $type (@__types)
 	{
 	    if (scalar(@{$revision_data{$type}}) > 0)
 	    {
============================================================
--- mtn-browse.glade	ec7ec4bdb1b3d30d8d849e2b41d665727deb8904
+++ mtn-browse.glade	1bfb2911bbcd59175423e0283fb32ed1fb0960d2
@@ -523,7 +523,7 @@ criteria for selecting a revision</prope
 criteria for selecting a revision</property>
 			      <property name="can_focus">True</property>
 			      <property name="relief">GTK_RELIEF_NONE</property>
-			      <property name="focus_on_click">True</property>
+			      <property name="focus_on_click">False</property>
 			      <signal name="clicked" handler="advanced_find_button_clicked_cb" last_modification_time="Sat, 08 Dec 2007 10:21:50 GMT"/>
 
 			      <child>
@@ -552,7 +552,7 @@ in Monotone-Viz</property>
 in Monotone-Viz</property>
 			      <property name="can_focus">True</property>
 			      <property name="relief">GTK_RELIEF_NONE</property>
-			      <property name="focus_on_click">True</property>
+			      <property name="focus_on_click">False</property>
 			      <signal name="clicked" handler="monotone_viz_button_clicked_cb" last_modification_time="Thu, 24 Apr 2008 15:10:30 GMT"/>
 
 			      <child>
@@ -579,7 +579,7 @@ in Monotone-Viz</property>
 			      <property name="tooltip" translatable="yes">View revision's change history</property>
 			      <property name="can_focus">True</property>
 			      <property name="relief">GTK_RELIEF_NONE</property>
-			      <property name="focus_on_click">True</property>
+			      <property name="focus_on_click">False</property>
 			      <signal name="clicked" handler="revision_change_history_button_clicked_cb" last_modification_time="Sat, 01 Mar 2008 11:52:45 GMT"/>
 
 			      <child>
@@ -607,7 +607,7 @@ in Monotone-Viz</property>
 			      <property name="tooltip" translatable="yes">View revision's change log</property>
 			      <property name="can_focus">True</property>
 			      <property name="relief">GTK_RELIEF_NONE</property>
-			      <property name="focus_on_click">True</property>
+			      <property name="focus_on_click">False</property>
 			      <signal name="clicked" handler="revision_change_log_button_clicked_cb" last_modification_time="Sat, 01 Mar 2008 11:47:54 GMT"/>
 
 			      <child>
@@ -777,7 +777,7 @@ in Monotone-Viz</property>
 				      <property name="tooltip" translatable="yes">Go up one directory level</property>
 				      <property name="can_focus">True</property>
 				      <property name="relief">GTK_RELIEF_NONE</property>
-				      <property name="focus_on_click">True</property>
+				      <property name="focus_on_click">False</property>
 				      <signal name="clicked" handler="directory_up_button_clicked_cb" last_modification_time="Sun, 11 Nov 2007 09:45:55 GMT"/>
 
 				      <child>
@@ -806,7 +806,7 @@ or more search criteria</property>
 or more search criteria</property>
 				      <property name="can_focus">True</property>
 				      <property name="relief">GTK_RELIEF_NONE</property>
-				      <property name="focus_on_click">True</property>
+				      <property name="focus_on_click">False</property>
 				      <signal name="clicked" handler="find_files_button_clicked_cb" last_modification_time="Fri, 20 Jun 2008 13:44:34 GMT"/>
 
 				      <child>
@@ -1393,7 +1393,7 @@ of line numbers</property>
 of line numbers</property>
 				      <property name="can_focus">True</property>
 				      <property name="relief">GTK_RELIEF_NONE</property>
-				      <property name="focus_on_click">True</property>
+				      <property name="focus_on_click">False</property>
 				      <property name="active">False</property>
 				      <property name="inconsistent">False</property>
 				      <signal name="toggled" handler="show_line_numbers_togglebutton_toggled_cb" last_modification_time="Wed, 06 Aug 2008 16:28:08 GMT"/>
@@ -1423,7 +1423,7 @@ of line numbers</property>
 				      <property name="tooltip" translatable="yes">Search text</property>
 				      <property name="can_focus">True</property>
 				      <property name="relief">GTK_RELIEF_NONE</property>
-				      <property name="focus_on_click">True</property>
+				      <property name="focus_on_click">False</property>
 				      <signal name="clicked" handler="search_text_button_clicked_cb" last_modification_time="Sun, 16 Mar 2008 11:37:14 GMT"/>
 
 				      <child>
@@ -1451,7 +1451,7 @@ of line numbers</property>
 				      <property name="tooltip" translatable="yes">Save file contents to disk</property>
 				      <property name="can_focus">True</property>
 				      <property name="relief">GTK_RELIEF_NONE</property>
-				      <property name="focus_on_click">True</property>
+				      <property name="focus_on_click">False</property>
 				      <signal name="clicked" handler="save_as_button_clicked_cb" last_modification_time="Wed, 23 Apr 2008 17:33:27 GMT"/>
 
 				      <child>
@@ -1480,7 +1480,7 @@ into a viewer</property>
 into a viewer</property>
 				      <property name="can_focus">True</property>
 				      <property name="relief">GTK_RELIEF_NONE</property>
-				      <property name="focus_on_click">True</property>
+				      <property name="focus_on_click">False</property>
 				      <signal name="clicked" handler="view_button_clicked_cb" last_modification_time="Wed, 23 Apr 2008 17:33:42 GMT"/>
 
 				      <child>
@@ -1508,7 +1508,7 @@ into a viewer</property>
 				      <property name="tooltip" translatable="yes">Annotate file contents</property>
 				      <property name="can_focus">True</property>
 				      <property name="relief">GTK_RELIEF_NONE</property>
-				      <property name="focus_on_click">True</property>
+				      <property name="focus_on_click">False</property>
 				      <signal name="clicked" handler="annotate_button_clicked_cb" last_modification_time="Sat, 15 Mar 2008 10:28:06 GMT"/>
 
 				      <child>
@@ -1535,7 +1535,7 @@ into a viewer</property>
 				      <property name="tooltip" translatable="yes">View file's change history</property>
 				      <property name="can_focus">True</property>
 				      <property name="relief">GTK_RELIEF_NONE</property>
-				      <property name="focus_on_click">True</property>
+				      <property name="focus_on_click">False</property>
 				      <signal name="clicked" handler="file_change_history_button_clicked_cb" last_modification_time="Sat, 01 Mar 2008 11:43:13 GMT"/>
 
 				      <child>
@@ -2527,7 +2527,7 @@ entry field if you cannot remember the s
 				  <property name="tooltip" translatable="yes">Execute the query</property>
 				  <property name="can_focus">True</property>
 				  <property name="relief">GTK_RELIEF_NONE</property>
-				  <property name="focus_on_click">True</property>
+				  <property name="focus_on_click">False</property>
 				  <signal name="clicked" handler="execute_button_clicked_cb" last_modification_time="Sat, 05 Jan 2008 17:29:35 GMT"/>
 
 				  <child>
@@ -2556,7 +2556,7 @@ entry field if you cannot remember the s
 				  <property name="tooltip" translatable="yes">Stop the query</property>
 				  <property name="can_focus">True</property>
 				  <property name="relief">GTK_RELIEF_NONE</property>
-				  <property name="focus_on_click">True</property>
+				  <property name="focus_on_click">False</property>
 
 				  <child>
 				    <widget class="GtkImage" id="image45">
@@ -2603,7 +2603,7 @@ entry field if you cannot remember the s
 			      <property name="tooltip" translatable="yes">Enter the current selector into the query above</property>
 			      <property name="can_focus">True</property>
 			      <property name="relief">GTK_RELIEF_NONE</property>
-			      <property name="focus_on_click">True</property>
+			      <property name="focus_on_click">False</property>
 			      <signal name="clicked" handler="populate_button_clicked_cb" last_modification_time="Sat, 05 Jan 2008 17:29:10 GMT"/>
 
 			      <child>
@@ -3339,7 +3339,7 @@ Tag</property>
 			      <property name="tooltip" translatable="yes">Stop gathering history details</property>
 			      <property name="can_focus">True</property>
 			      <property name="relief">GTK_RELIEF_NONE</property>
-			      <property name="focus_on_click">True</property>
+			      <property name="focus_on_click">False</property>
 
 			      <child>
 				<widget class="GtkImage" id="image39">
@@ -3647,7 +3647,7 @@ file version that is to be compared</pro
 			      <property name="tooltip" translatable="yes">Compare the two selected files</property>
 			      <property name="can_focus">True</property>
 			      <property name="relief">GTK_RELIEF_NONE</property>
-			      <property name="focus_on_click">True</property>
+			      <property name="focus_on_click">False</property>
 			      <signal name="clicked" handler="compare_button_clicked_cb" last_modification_time="Sun, 10 Feb 2008 17:52:14 GMT"/>
 
 			      <child>
@@ -3854,7 +3854,7 @@ selected file in an external viewer</pro
 selected file in an external viewer</property>
 			      <property name="can_focus">True</property>
 			      <property name="relief">GTK_RELIEF_NONE</property>
-			      <property name="focus_on_click">True</property>
+			      <property name="focus_on_click">False</property>
 			      <signal name="clicked" handler="external_diffs_button_clicked_cb" last_modification_time="Sun, 15 Jun 2008 07:21:32 GMT"/>
 
 			      <child>
@@ -3881,7 +3881,7 @@ selected file in an external viewer</pro
 			      <property name="tooltip" translatable="yes">Save the differences to disk</property>
 			      <property name="can_focus">True</property>
 			      <property name="relief">GTK_RELIEF_NONE</property>
-			      <property name="focus_on_click">True</property>
+			      <property name="focus_on_click">False</property>
 			      <signal name="clicked" handler="save_differences_button_clicked_cb" last_modification_time="Thu, 12 Jun 2008 09:16:37 GMT"/>
 
 			      <child>
@@ -3910,7 +3910,7 @@ selected file in an external viewer</pro
 			      <property name="tooltip" translatable="yes">Stop formatting the comparison results</property>
 			      <property name="can_focus">True</property>
 			      <property name="relief">GTK_RELIEF_NONE</property>
-			      <property name="focus_on_click">True</property>
+			      <property name="focus_on_click">False</property>
 
 			      <child>
 				<widget class="GtkImage" id="image44">
@@ -5405,7 +5405,7 @@ make sure it is mono-spaced)</property>
 			      <property name="show_size">True</property>
 			      <property name="use_font">True</property>
 			      <property name="use_size">True</property>
-			      <property name="focus_on_click">True</property>
+			      <property name="focus_on_click">False</property>
 			    </widget>
 			    <packing>
 			      <property name="padding">0</property>
@@ -5778,7 +5778,7 @@ in comparison listings</property>
 			      <property name="can_focus">True</property>
 			      <property name="use_alpha">False</property>
 			      <property name="title" translatable="yes">Pick A Colour</property>
-			      <property name="focus_on_click">True</property>
+			      <property name="focus_on_click">False</property>
 			    </widget>
 			    <packing>
 			      <property name="left_attach">2</property>
@@ -5796,7 +5796,7 @@ in comparison listings</property>
 			      <property name="can_focus">True</property>
 			      <property name="use_alpha">False</property>
 			      <property name="title" translatable="yes">Pick A Colour</property>
-			      <property name="focus_on_click">True</property>
+			      <property name="focus_on_click">False</property>
 			    </widget>
 			    <packing>
 			      <property name="left_attach">2</property>
@@ -5814,7 +5814,7 @@ in comparison listings</property>
 			      <property name="can_focus">True</property>
 			      <property name="use_alpha">False</property>
 			      <property name="title" translatable="yes">Pick A Colour</property>
-			      <property name="focus_on_click">True</property>
+			      <property name="focus_on_click">False</property>
 			    </widget>
 			    <packing>
 			      <property name="left_attach">2</property>
@@ -5832,7 +5832,7 @@ in comparison listings</property>
 			      <property name="can_focus">True</property>
 			      <property name="use_alpha">False</property>
 			      <property name="title" translatable="yes">Pick A Colour</property>
-			      <property name="focus_on_click">True</property>
+			      <property name="focus_on_click">False</property>
 			    </widget>
 			    <packing>
 			      <property name="left_attach">4</property>
@@ -5850,7 +5850,7 @@ in comparison listings</property>
 			      <property name="can_focus">True</property>
 			      <property name="use_alpha">False</property>
 			      <property name="title" translatable="yes">Pick A Colour</property>
-			      <property name="focus_on_click">True</property>
+			      <property name="focus_on_click">False</property>
 			    </widget>
 			    <packing>
 			      <property name="left_attach">4</property>
@@ -5868,7 +5868,7 @@ in comparison listings</property>
 			      <property name="can_focus">True</property>
 			      <property name="use_alpha">False</property>
 			      <property name="title" translatable="yes">Pick A Colour</property>
-			      <property name="focus_on_click">True</property>
+			      <property name="focus_on_click">False</property>
 			    </widget>
 			    <packing>
 			      <property name="left_attach">4</property>
@@ -5986,7 +5986,7 @@ used in context lines</property>
 			      <property name="can_focus">True</property>
 			      <property name="use_alpha">False</property>
 			      <property name="title" translatable="yes">Pick A Colour</property>
-			      <property name="focus_on_click">True</property>
+			      <property name="focus_on_click">False</property>
 			    </widget>
 			    <packing>
 			      <property name="left_attach">6</property>
@@ -6038,7 +6038,7 @@ used in context lines</property>
 			      <property name="can_focus">True</property>
 			      <property name="use_alpha">False</property>
 			      <property name="title" translatable="yes">Pick A Colour</property>
-			      <property name="focus_on_click">True</property>
+			      <property name="focus_on_click">False</property>
 			    </widget>
 			    <packing>
 			      <property name="left_attach">6</property>
@@ -6122,7 +6122,7 @@ used in annotated listings</property>
 			      <property name="can_focus">True</property>
 			      <property name="use_alpha">False</property>
 			      <property name="title" translatable="yes">Pick A Colour</property>
-			      <property name="focus_on_click">True</property>
+			      <property name="focus_on_click">False</property>
 			    </widget>
 			    <packing>
 			      <property name="left_attach">2</property>
@@ -6173,7 +6173,7 @@ used in annotated listings</property>
 			      <property name="can_focus">True</property>
 			      <property name="use_alpha">False</property>
 			      <property name="title" translatable="yes">Pick A Colour</property>
-			      <property name="focus_on_click">True</property>
+			      <property name="focus_on_click">False</property>
 			    </widget>
 			    <packing>
 			      <property name="left_attach">4</property>
@@ -6389,7 +6389,7 @@ used in annotated listings</property>
 			      <property name="can_focus">True</property>
 			      <property name="use_alpha">False</property>
 			      <property name="title" translatable="yes">Pick A Colour</property>
-			      <property name="focus_on_click">True</property>
+			      <property name="focus_on_click">False</property>
 			    </widget>
 			    <packing>
 			      <property name="left_attach">2</property>
@@ -6407,7 +6407,7 @@ used in annotated listings</property>
 			      <property name="can_focus">True</property>
 			      <property name="use_alpha">False</property>
 			      <property name="title" translatable="yes">Pick A Colour</property>
-			      <property name="focus_on_click">True</property>
+			      <property name="focus_on_click">False</property>
 			    </widget>
 			    <packing>
 			      <property name="left_attach">2</property>
@@ -6425,7 +6425,7 @@ used in annotated listings</property>
 			      <property name="can_focus">True</property>
 			      <property name="use_alpha">False</property>
 			      <property name="title" translatable="yes">Pick A Colour</property>
-			      <property name="focus_on_click">True</property>
+			      <property name="focus_on_click">False</property>
 			    </widget>
 			    <packing>
 			      <property name="left_attach">4</property>
@@ -6443,7 +6443,7 @@ used in annotated listings</property>
 			      <property name="can_focus">True</property>
 			      <property name="use_alpha">False</property>
 			      <property name="title" translatable="yes">Pick A Colour</property>
-			      <property name="focus_on_click">True</property>
+			      <property name="focus_on_click">False</property>
 			    </widget>
 			    <packing>
 			      <property name="left_attach">4</property>
@@ -6610,7 +6610,7 @@ type to the list</property>
 type to the list</property>
 				      <property name="can_focus">True</property>
 				      <property name="relief">GTK_RELIEF_NONE</property>
-				      <property name="focus_on_click">True</property>
+				      <property name="focus_on_click">False</property>
 				      <signal name="clicked" handler="add_mime_type_button_clicked_cb" last_modification_time="Fri, 06 Jun 2008 17:36:17 GMT"/>
 
 				      <child>
@@ -6639,7 +6639,7 @@ MIME type from the list</property>
 MIME type from the list</property>
 				      <property name="can_focus">True</property>
 				      <property name="relief">GTK_RELIEF_NONE</property>
-				      <property name="focus_on_click">True</property>
+				      <property name="focus_on_click">False</property>
 				      <signal name="clicked" handler="remove_mime_type_button_clicked_cb" last_modification_time="Fri, 06 Jun 2008 17:36:27 GMT"/>
 
 				      <child>
@@ -6780,7 +6780,7 @@ pattern to the list</property>
 pattern to the list</property>
 				      <property name="can_focus">True</property>
 				      <property name="relief">GTK_RELIEF_NONE</property>
-				      <property name="focus_on_click">True</property>
+				      <property name="focus_on_click">False</property>
 				      <signal name="clicked" handler="add_file_name_pattern_button_clicked_cb" last_modification_time="Fri, 16 May 2008 11:41:25 GMT"/>
 
 				      <child>
@@ -6812,7 +6812,7 @@ file name pattern from the list</propert
 file name pattern from the list</property>
 				      <property name="can_focus">True</property>
 				      <property name="relief">GTK_RELIEF_NONE</property>
-				      <property name="focus_on_click">True</property>
+				      <property name="focus_on_click">False</property>
 				      <signal name="clicked" handler="remove_file_name_pattern_button_clicked_cb" last_modification_time="Fri, 16 May 2008 11:42:14 GMT"/>
 
 				      <child>
@@ -8038,7 +8038,7 @@ MB</property>
 			      <property name="tooltip" translatable="yes">Stop finding files</property>
 			      <property name="can_focus">True</property>
 			      <property name="relief">GTK_RELIEF_NONE</property>
-			      <property name="focus_on_click">True</property>
+			      <property name="focus_on_click">False</property>
 
 			      <child>
 				<widget class="GtkImage" id="image47">
@@ -8066,7 +8066,7 @@ MB</property>
 			      <property name="tooltip" translatable="yes">Find the files</property>
 			      <property name="can_focus">True</property>
 			      <property name="relief">GTK_RELIEF_NONE</property>
-			      <property name="focus_on_click">True</property>
+			      <property name="focus_on_click">False</property>
 			      <signal name="clicked" handler="search_files_button_clicked_cb" last_modification_time="Fri, 20 Jun 2008 18:13:00 GMT"/>
 
 			      <child>