aboutsummaryrefslogtreecommitdiffstats
path: root/addressbook
diff options
context:
space:
mode:
authorJohnny Jacob <jjohnny@src.gnome.org>2007-08-27 13:15:24 +0800
committerJohnny Jacob <jjohnny@src.gnome.org>2007-08-27 13:15:24 +0800
commiteda9be1e893bd521c696c612093577c88a40b162 (patch)
tree3827a4db46cf9fd219cd13696a71c7caa3901332 /addressbook
parent0fa6ea955ab14de12f1c41da30be54d6ae4f894e (diff)
downloadgsoc2013-evolution-eda9be1e893bd521c696c612093577c88a40b162.tar
gsoc2013-evolution-eda9be1e893bd521c696c612093577c88a40b162.tar.gz
gsoc2013-evolution-eda9be1e893bd521c696c612093577c88a40b162.tar.bz2
gsoc2013-evolution-eda9be1e893bd521c696c612093577c88a40b162.tar.lz
gsoc2013-evolution-eda9be1e893bd521c696c612093577c88a40b162.tar.xz
gsoc2013-evolution-eda9be1e893bd521c696c612093577c88a40b162.tar.zst
gsoc2013-evolution-eda9be1e893bd521c696c612093577c88a40b162.zip
Committed on behalf of Ushveen Kaur <kushveen@novell.com>
Committed on behalf of Ushveen Kaur <kushveen@novell.com> ** Fixes bug #352358 svn path=/trunk/; revision=34109
Diffstat (limited to 'addressbook')
-rw-r--r--addressbook/ChangeLog13
-rw-r--r--addressbook/gui/component/addressbook-view.c2
-rw-r--r--addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade3
3 files changed, 15 insertions, 3 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index 60d233f51b..b7d8ea6784 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,3 +1,16 @@
+2007-08-27 Johnny Jacob <jjohnny@novell.com>
+
+ Committed on behalf of Ushveen Kaur <kushveen@novell.com>
+
+ ** Fixes bug #352358
+
+ * gui/merging/eab-contact-commit-duplicate-detected.glade: Label
+ string of GtkLabel,id="label1" harmonised.
+ * gui/component/addressbook-view.c (rename-addressbook-folder):
+ Error tag changed from 'addressbook:no-rename-folder' to
+ 'addressbook:no-rename-folder-exists' so that error messages
+ are harmonised.
+
2007-08-24 Suman Manjunath <msuman@novell.com>
** Fix for bug #440328
diff --git a/addressbook/gui/component/addressbook-view.c b/addressbook/gui/component/addressbook-view.c
index ebf20e06d6..318c0f5361 100644
--- a/addressbook/gui/component/addressbook-view.c
+++ b/addressbook/gui/component/addressbook-view.c
@@ -442,7 +442,7 @@ rename_addressbook_folder (AddressbookView *view)
"addressbook:no-rename-folder", old_name, new_name, _("Folder names cannot contain '/'"), NULL);
done = TRUE;
} else if (e_source_group_peek_source_by_name(e_source_peek_group(source), new_name)) {
- e_error_run (NULL, "addressbook:no-rename-folder", old_name, new_name, _("A Folder with this name already exists"), NULL);
+ e_error_run (NULL, "addressbook:no-rename-folder-exists", old_name, new_name, NULL);
} else {
e_source_set_name (source, new_name);
done = TRUE;
diff --git a/addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade b/addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade
index e6bcb71026..bf8f4fc9ce 100644
--- a/addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade
+++ b/addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade
@@ -86,8 +86,7 @@
<child>
<widget class="GtkLabel" id="label1">
<property name="visible">True</property>
- <property name="label" translatable="yes">The changed email or name of this contact already
-exists in this folder. Would you like to add it anyway?</property>
+ <property name="label" translatable="yes">The name or email of this contact already exists in this folder. Would you like to add it anyway?</property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>