diff --git a/ChangeLog b/ChangeLog
index 472181332..398b90a6f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-11-24  Jerome Rapinat <romjerome@yahoo.fr>
+	* src/DataViews/_PersonView.py: TransUtils issue with gettext context 
+        * src/glade/gramps.glade: Inconsistent label in "Associations", issue #1390
+        * src/TipOfDay.py: display bold tags, issue #1368
+
 2007-11-23 Benny Malengier <benny.malengier@gramps-project.org>
 	* src/plugins/rel_nl.py: new half sibling types
 	* src/plugins/rel_it.py: new half sibling types
diff --git a/src/TipOfDay.py b/src/TipOfDay.py
index 0d5eef360..4295ffad8 100644
--- a/src/TipOfDay.py
+++ b/src/TipOfDay.py
@@ -98,9 +98,14 @@ class TipOfDay(ManagedWindow.ManagedWindow):
         
         window.show_all()
 
+    def escape(self,text):
+        text = text.replace('&','&amp;');       # Must be first
+        text = text.replace(' > ',' &gt; ');    # Replace standalone > char
+        text = text.replace('"','&quot;')       # quotes
+        return text
+
     def next_tip_cb(self, dummy=None):
-        tip_text = escape(self.tip_list[self.new_index[self.index]],
-                          { '"' : '&quot;' })
+        tip_text = self.escape(self.tip_list[self.new_index[self.index]])
         self.tip.set_text(_(tip_text))
         self.tip.set_use_markup(True)
         if self.index >= len(self.tip_list)-1:
diff --git a/src/glade/gramps.glade b/src/glade/gramps.glade
index cdaee1781..4a3c860aa 100644
--- a/src/glade/gramps.glade
+++ b/src/glade/gramps.glade
@@ -13862,7 +13862,7 @@ Very High</property>
 	      <child>
 		<widget class="GtkLabel" id="label650">
 		  <property name="visible">True</property>
-		  <property name="label" translatable="yes">_Relationship:</property>
+		  <property name="label" translatable="yes">_Association:</property>
 		  <property name="use_underline">True</property>
 		  <property name="use_markup">False</property>
 		  <property name="justify">GTK_JUSTIFY_CENTER</property>