From b9ee422f50e9c634baa674347a139807b8085a5e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dan=20Vr=C3=A1til?= <dvratil@redhat.com>
Date: Wed, 29 Jun 2011 15:30:38 +0200
Subject: Bug #224687 - Various fixes in contact list editor

- fixed order of buttons in duplicate adding confirmation dialog
- in the editor, don't display email addresses in sublist nodes
- automatically remove sublists with no children
---
 addressbook/addressbook.error.xml | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'addressbook/addressbook.error.xml')

diff --git a/addressbook/addressbook.error.xml b/addressbook/addressbook.error.xml
index 6a7dc4be6a..88010edf12 100644
--- a/addressbook/addressbook.error.xml
+++ b/addressbook/addressbook.error.xml
@@ -98,8 +98,16 @@
   <button stock="gtk-ok" _label="_Add" response="GTK_RESPONSE_YES"/>
  </error>
  
+ <error id="ask-list-add-some-mails-exist" type="question" default="GTK_RESPONSE_CANCEL">
+  <_primary>Some addresses already exist in this contact list.</_primary>
+  <_secondary>You are trying to add addresses that are part of this list already. Would you like to add them anyway?</_secondary>
+  <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
+  <button _label="Skip duplicates" response="GTK_RESPONSE_NO"/>
+  <button _label="Add with duplicates" response="GTK_RESPONSE_YES"/>
+ </error>
+ 
  <error id="ask-list-add-list-exists" type="question" default="GTK_RESPONSE_NO">
-   <_primary>'{0}' is already in this contact list.</_primary>
+   <_primary>List '{0}' is already in this contact list.</_primary>
    <_secondary>A contact list named '{0}' is already in this contact list. Would you like to add it anyway?</_secondary>
    <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
    <button stock="gtk-ok" _label="_Add" response="GTK_RESPONSE_YES"/>
-- 
cgit v1.2.3