aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--addressbook/ChangeLog9
-rw-r--r--addressbook/gui/merging/eab-contact-duplicate-detected.glade2
2 files changed, 10 insertions, 1 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index ad2d3d62df..55fca53e1d 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,3 +1,12 @@
+2008-07-30 Takao Fujiwara <takao.fujiwara@sun.com>
+
+ Reviewed by Andre Klapper <a9016009@gmx.de>
+
+ ** Fix for bug #545300
+
+ * gui/merging/eab-contact-duplicate-detected.glade:
+ Add a translatable tag in "_Merge" string.
+
2008-07-28 Milan Crha <mcrha@redhat.com>
** Fix for bug #544383
diff --git a/addressbook/gui/merging/eab-contact-duplicate-detected.glade b/addressbook/gui/merging/eab-contact-duplicate-detected.glade
index 1a85fac29e..70efc737ca 100644
--- a/addressbook/gui/merging/eab-contact-duplicate-detected.glade
+++ b/addressbook/gui/merging/eab-contact-duplicate-detected.glade
@@ -61,7 +61,7 @@
<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" translatable="yes">_Merge</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>