diff -r 000000000000 -r e686773b3f54 phonebookui/Phonebook2/UIControls/rss/Pbk2MergeContacts.rss
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/phonebookui/Phonebook2/UIControls/rss/Pbk2MergeContacts.rss	Tue Feb 02 10:12:17 2010 +0200
@@ -0,0 +1,116 @@
+/*
+* 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:  Phonebook 2 conflict resolution dialog resources.
+*
+*/
+
+// --------------------------------------------------------------------------
+// Navi pane label for merge contact fetch dialog
+// --------------------------------------------------------------------------
+//
+RESOURCE NAVI_DECORATOR r_pbk2_merge_contacts_fetch_navilabel
+    {
+    type = ENaviDecoratorLabel;
+    control = NAVI_LABEL
+        {
+        txt = qtn_phob_title_select_contacts_to_merge;
+        };
+    }
+
+// --------------------------------------------------------------------------
+// Merging contacts conflict resolution dialog.
+// --------------------------------------------------------------------------
+//
+
+RESOURCE DIALOG r_pbk2_merge_contacts_conflict_resolution_dlg
+    {
+    flags = EEikDialogFlagWait | EEikDialogFlagFillAppClientRect | EEikDialogFlagNotifyEsc | EEikDialogFlagCbaButtons;
+    pages = 0;  // Single page
+    buttons = 0; // assigned dynamically during construction
+    items = 
+        {
+        DLG_LINE 
+            {
+            id = ESelectionListControl;
+            itemflags = EEikDlgItemTakesEnterKey;
+            type = EAknCtSingleGraphicListBox;
+            control = LISTBOX 
+                {
+                flags = EAknListBoxSelectionList;
+                };
+            }
+       };
+    }
+
+// --------------------------------------------------------------------------
+// Merging contacts photo conflict resolution dialog.
+// --------------------------------------------------------------------------
+//
+
+RESOURCE DIALOG r_pbk2_merge_contacts_photo_conflict_resolution_dlg
+    {
+    flags = EEikDialogFlagWait | EEikDialogFlagFillAppClientRect | EEikDialogFlagNotifyEsc | EEikDialogFlagCbaButtons;
+    pages = 0;  // Single page
+    buttons = r_pbk2_softkeys_done_cancel_select;
+    items = 
+        {
+        DLG_LINE 
+            {
+            id = ESelectionListControl;
+            itemflags = EEikDlgItemTakesEnterKey;
+            type = EAknCtDoubleLargeListBox;
+            control = LISTBOX 
+                {
+                flags = EAknListBoxSelectionList;
+                };
+            }
+       };
+    }
+
+// --------------------------------------------------------------------------
+// r_qtn_phob_title_conflict_resolution
+// --------------------------------------------------------------------------
+//
+RESOURCE TBUF r_qtn_phob_title_conflict_resolution
+    {
+    buf = qtn_phob_title_conflict_resolution;
+    }
+
+// --------------------------------------------------------------------------
+// r_qtn_phob_title_select_value
+// --------------------------------------------------------------------------
+//
+RESOURCE TBUF r_qtn_phob_title_select_value
+    {
+    buf = qtn_phob_title_select_value;
+    }
+
+// --------------------------------------------------------------------------
+// r_qtn_phob_title_select_image
+// --------------------------------------------------------------------------
+//
+RESOURCE TBUF r_qtn_phob_title_select_image
+    {
+    buf = qtn_phob_title_select_image;
+    }
+
+// --------------------------------------------------------------------------
+// r_qtn_phob_title_select_image
+// --------------------------------------------------------------------------
+//
+RESOURCE TBUF r_qtn_phob_title_selected
+    {
+    buf = qtn_phob_title_selected;
+    }
+// End of File