diff -r 5b6f26637ad3 -r f4a778e096c2 phonebookui/Phonebook2/CommandsExtension/rss/MergeContactsCmd.rss
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/phonebookui/Phonebook2/CommandsExtension/rss/MergeContactsCmd.rss	Wed Sep 01 12:29:52 2010 +0100
@@ -0,0 +1,87 @@
+/*
+* Copyright (c) 2005-2007 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:  This file contains resources for Phonebook 2
+*
+*/
+
+
+// ---------------------------------------------------------
+// Dialog for merge contacts error note
+// ---------------------------------------------------------
+//
+RESOURCE DIALOG r_pbk2_merge_contacts_error_note
+{
+flags = EAknDialogGenericNoteFlags;
+buttons = R_AVKON_SOFTKEYS_OK_EMPTY__OK;
+items =
+    {
+    DLG_LINE
+        {
+        type=EAknCtQuery;
+        id=EGeneralQuery;
+        control=AVKON_CONFIRMATION_QUERY
+            {
+            layout = EConfirmationQueryLayout;
+            animation = R_QGN_NOTE_ERROR_ANIM;
+            };
+        }
+    };
+}
+
+// ---------------------------------------------------------
+// Dialog for merge contacts confirmation note
+// ---------------------------------------------------------
+//
+RESOURCE DIALOG r_pbk2_merge_contacts_confirmation_note
+{
+flags = EAknDialogGenericNoteFlags;
+buttons = R_AVKON_SOFTKEYS_OK_EMPTY__OK;
+items =
+    {
+    DLG_LINE
+        {
+        type=EAknCtQuery;
+        id=EGeneralQuery;
+        control=AVKON_CONFIRMATION_QUERY
+            {
+            layout = EConfirmationQueryLayout;
+            animation = R_QGN_NOTE_OK_ANIM;
+            };
+        }
+    };
+}
+
+// --------------------------------------------------------------------------
+// "Merging contacts..." wait note
+// --------------------------------------------------------------------------
+//
+RESOURCE DIALOG r_qtn_merge_contacts_wait_note
+{
+flags = EAknWaitNoteFlags;
+buttons = R_AVKON_SOFTKEYS_EMPTY;
+items =
+    {
+    DLG_LINE
+        {
+        type = EAknCtNote;
+        id = EGeneralNote;
+        control = AVKON_NOTE
+            {
+            layout = EWaitLayout;
+            animation = R_QGN_GRAF_WAIT_BAR_ANIM;
+            singular_label = qtn_phob_note_merging_contacts;
+            };
+        }
+    };
+}