# HG changeset patch
# User William Roberts <williamr@symbian.org>
# Date 1279812657 -3600
# Node ID b73d0bdd62de1c05079672956f39ada99476c133
# Parent  a84e691b1955c1b97283d50a8f4e37cba12a46e7# Parent  624e91e1e0299d38d45f0363132faf021bae82a3
Catchup to latest Symbian^4

diff -r a84e691b1955 -r b73d0bdd62de ftuapplication/ftuapplication.pro
--- a/ftuapplication/ftuapplication.pro	Fri Jun 11 16:23:41 2010 +0100
+++ b/ftuapplication/ftuapplication.pro	Thu Jul 22 16:30:57 2010 +0100
@@ -36,7 +36,7 @@
 
 CONFIG += hb    
 CONFIG += console
-
+#DEFINES += LOGGING
 nft:DEFINES += NFT
 
 DEPENDPATH += . \
diff -r a84e691b1955 -r b73d0bdd62de ftuapplication/inc/ftufirsttimeuse.h
--- a/ftuapplication/inc/ftufirsttimeuse.h	Fri Jun 11 16:23:41 2010 +0100
+++ b/ftuapplication/inc/ftufirsttimeuse.h	Thu Jul 22 16:30:57 2010 +0100
@@ -23,10 +23,15 @@
 
 #include <QObject>
 
+#ifdef LOGGING
+#define QDEBUG(a)   qDebug() <<a
+#else
+#define QDEBUG(a)  
+#endif //LOGGING
+
 FTU_TEST_CLASS(FtuFirstTimeUseTest)
 
 class QStateMachine;
-class XQSettingsManager;
 
 /**
  * @ingroup group_ftuapplication
@@ -122,8 +127,6 @@
      */
     QStateMachine*     mRuntime;
     
-    XQSettingsManager* mSettingsManager;
-
     FTU_TEST_FRIEND_CLASS(FtuFirstTimeUseTest)
 
 };
diff -r a84e691b1955 -r b73d0bdd62de ftuapplication/src/ftufirsttimeuse.cpp
--- a/ftuapplication/src/ftufirsttimeuse.cpp	Fri Jun 11 16:23:41 2010 +0100
+++ b/ftuapplication/src/ftufirsttimeuse.cpp	Thu Jul 22 16:30:57 2010 +0100
@@ -26,8 +26,6 @@
 #include <QDir>
 #include <QApplication>
 
-#include "xqsettingskey.h"
-#include "xqpublishandsubscribeutils.h"
 
 QTM_USE_NAMESPACE
 
@@ -39,15 +37,13 @@
 //
 
 
-#include <xqpublishandsubscribeutils.h>
-#include <xqpublishandsubscribesecuritypolicy.h>
 #include <QList>
 
 FtuFirstTimeUse::FtuFirstTimeUse(QObject* aParent) : 
     QObject(aParent),
     mRuntime(NULL)
 {  
-    FTUTEST_FUNC_ENTRY("FTU::FtuFirstTimeUse::FtuFirstTimeUse");
+    QDEBUG("FTU::FtuFirstTimeUse::FtuFirstTimeUse");
     
     registerServicePlugins();
 
@@ -56,8 +52,8 @@
     QList<QServiceInterfaceDescriptor> interfaces = manager.findInterfaces(
                                                                     filter);
     
-    qDebug() << "ftu: found " << interfaces.count() 
-             << " instances of runtime";
+    QDEBUG("ftu: found " << interfaces.count() 
+             << " instances of runtime";)
     
     if(interfaces.count() > 0){
         mRuntime = (QStateMachine*)(manager.loadInterface(
@@ -73,15 +69,8 @@
         connect(mRuntime, SIGNAL(faulted()), SLOT(handleRuntimeFaulted()));    
     }
     
-    FTUTEST_FUNC_EXIT("FTU::FtuFirstTimeUse::FtuFirstTimeUse");
+    QDEBUG("FTU::FtuFirstTimeUse::FtuFirstTimeUse");
      
-    const quint32 KDefaultKey = 0x00000001;
-    const qint32 KFtuUidProperty = {0x20026F95}; //SID of FirstTimeUseApplication
-
-    mSettingsManager = new XQSettingsManager(this);
-    XQPublishAndSubscribeUtils utils(*mSettingsManager);
-    XQPublishAndSubscribeSettingsKey pAndSKey(KFtuUidProperty, KDefaultKey);
-    bool err = utils.defineProperty(pAndSKey, XQSettingsManager::TypeInt);
 }
 
 // ---------------------------------------------------------------------------
@@ -106,7 +95,7 @@
 //
 void FtuFirstTimeUse::start()
 {
-    FTUTEST_FUNC_ENTRY("FTU::FtuFirstTimeUse::start");
+    QDEBUG("FTU::FtuFirstTimeUse::start");
     
     if(mRuntime) {
         mRuntime->start();
@@ -114,7 +103,7 @@
         emit exit();
     }
     
-    FTUTEST_FUNC_EXIT("FTU::FtuFirstTimeUse::start");
+    QDEBUG("FTU::FtuFirstTimeUse::start");
 }
 
 // ---------------------------------------------------------------------------
@@ -123,7 +112,7 @@
 //
 void FtuFirstTimeUse::stop()
 {
-    FTUTEST_FUNC_ENTRY("FTU::FtuFirstTimeUse::stop");
+    QDEBUG("FTU::FtuFirstTimeUse::stop");
     
     
     if (mRuntime && mRuntime->isRunning()) {
@@ -131,7 +120,7 @@
         }
 
     
-    FTUTEST_FUNC_EXIT("FTU::FtuFirstTimeUse::stop");
+    QDEBUG("FTU::FtuFirstTimeUse::stop");
 }
 
 // ---------------------------------------------------------------------------
@@ -165,7 +154,7 @@
 //
 void FtuFirstTimeUse::registerServicePlugins()
 {
-    FTUTEST_FUNC_ENTRY("FTU::FtuFirstTimeUse::registerServicePlugins()");
+    QDEBUG("FTU::FtuFirstTimeUse::registerServicePlugins()");
     QStringList pluginPaths;
 
     pluginPaths << "fturesources/plugins";
@@ -187,7 +176,7 @@
             registerServicePlugins(pluginPath);
         }
     }
-    FTUTEST_FUNC_EXIT("FTU::FtuFirstTimeUse::registerServicePlugins()");
+    QDEBUG("FTU::FtuFirstTimeUse::registerServicePlugins()");
 }
 
 // ---------------------------------------------------------------------------
@@ -196,8 +185,8 @@
 //
 void FtuFirstTimeUse::registerServicePlugins(const QString &root)
 {
-    FTUTEST_FUNC_ENTRY("FTU::FtuFirstTimeUse::registerServicePlugins(const QString &)");
-    qDebug() << "FTU: root: " << root;
+    QDEBUG("FTU::FtuFirstTimeUse::registerServicePlugins(const QString &)");
+    QDEBUG("FTU: root: " << root;)
     QDir dir = QDir(root);
     QFileInfoList fileInfos = dir.entryInfoList(QDir::AllDirs | QDir::NoDotAndDotDot);
 
@@ -210,13 +199,13 @@
     if (!fileInfos.isEmpty()) {
         //Plugin dll and xml are in the same directory
         QApplication::addLibraryPath(root);
-        qDebug() << QString("FTU::FtuFirstTimeUse::registerServicePlugins - Directory added to application's library paths: ")
-                 << root;
+        QDEBUG("FTU::FtuFirstTimeUse::registerServicePlugins - Directory added to application's library paths: "
+                 << root;)
         QServiceManager manager;
         foreach(QFileInfo fileInfo, fileInfos) {
             manager.addService(fileInfo.absoluteFilePath());
-            qDebug() << QString("FTU::FtuFirstTimeUse::registerServicePlugins - Plugin registered: ") + fileInfo.fileName();
+            QDEBUG("FTU::FtuFirstTimeUse::registerServicePlugins - Plugin registered: " << fileInfo.fileName();)
         }
     }
-    FTUTEST_FUNC_EXIT("FTU::FtuFirstTimeUse::registerServicePlugins(const QString &)");
+    QDEBUG("FTU::FtuFirstTimeUse::registerServicePlugins(const QString &)");
 }
diff -r a84e691b1955 -r b73d0bdd62de ftuapplication/src/main.cpp
--- a/ftuapplication/src/main.cpp	Fri Jun 11 16:23:41 2010 +0100
+++ b/ftuapplication/src/main.cpp	Thu Jul 22 16:30:57 2010 +0100
@@ -23,6 +23,8 @@
 #include <hbapplication.h>
 #include <QTranslator>
 #include <QLocale>
+#include <QTime>
+#include <QDebug>
 
 // ---------------------------------------------------------------------------
 // main
@@ -30,6 +32,7 @@
 //
 int main(int argc, char *argv[])
 {
+    QDEBUG(__FILE__<<__FUNCTION__<<"~~~~~~~"<<QTime::currentTime().toString("hh:mm:ss.zzz");)
     FTUTEST_FUNC_ENTRY("FTU::FtuFirstTimeUse::main");
     
     HbApplication app(argc, argv);    
@@ -64,12 +67,14 @@
     QDir::setCurrent("Z:/");    
 #else
     QDir::setCurrent("C:/");
-    FTUDEBUG("main() - FtuApplication's current dir set to C:/");
+    QDEBUG("main() - FtuApplication's current dir set to C:/");
 #endif //ROM
     QObject::connect(&app,SIGNAL(aboutToQuit()),&ftuFirstTimeUse,SLOT(stop()));
     QObject::connect(&ftuFirstTimeUse, SIGNAL(exit()), &app, SLOT(quit()),Qt::QueuedConnection);    
     ftuFirstTimeUse.start();
     int ret = app.exec();
-    FTUTEST_FUNC_EXIT("FTU::FtuFirstTimeUse::main");
+    QDEBUG("FTU::FtuFirstTimeUse::main");
+    //Work around to make sure that ftu exits
+    User::Exit(0);
     return ret;       
 }
diff -r a84e691b1955 -r b73d0bdd62de runtimeproviders/ftudefaultruntimeprovider/ftudefaultruntimeprovider.pro
--- a/runtimeproviders/ftudefaultruntimeprovider/ftudefaultruntimeprovider.pro	Fri Jun 11 16:23:41 2010 +0100
+++ b/runtimeproviders/ftudefaultruntimeprovider/ftudefaultruntimeprovider.pro	Thu Jul 22 16:30:57 2010 +0100
@@ -16,7 +16,6 @@
 
 TEMPLATE = lib
 
-
 symbian {
     CONFIG(debug, debug|release) {
         DESTDIR = debug
@@ -48,6 +47,7 @@
 QT += xml sql
 
 DEFINES += FTUDEFAULTRUNTIMEPROVIDER_LIB
+#DEFINES += LOGGING
 
 coverage:DEFINES += COVERAGE_MEASUREMENT
 
diff -r a84e691b1955 -r b73d0bdd62de runtimeproviders/ftudefaultruntimeprovider/inc/ftudefaultruntime.h
--- a/runtimeproviders/ftudefaultruntimeprovider/inc/ftudefaultruntime.h	Fri Jun 11 16:23:41 2010 +0100
+++ b/runtimeproviders/ftudefaultruntimeprovider/inc/ftudefaultruntime.h	Thu Jul 22 16:30:57 2010 +0100
@@ -19,6 +19,13 @@
 #ifndef FTU_RUNTIMES_DEFAULTRUNTIME_H
 #define FTU_RUNTIMES_DEFAULTRUNTIME_H
 
+#ifdef LOGGING
+#define QDEBUG(a)   qDebug() <<a
+#else
+#define QDEBUG(a)  
+#endif //LOGGING
+
+
 #include "ftutest_global.h"
 #include <QHash>
 #include <QStateMachine>
diff -r a84e691b1955 -r b73d0bdd62de runtimeproviders/ftudefaultruntimeprovider/src/ftudefaultruntime.cpp
--- a/runtimeproviders/ftudefaultruntimeprovider/src/ftudefaultruntime.cpp	Fri Jun 11 16:23:41 2010 +0100
+++ b/runtimeproviders/ftudefaultruntimeprovider/src/ftudefaultruntime.cpp	Thu Jul 22 16:30:57 2010 +0100
@@ -26,7 +26,7 @@
 #include <QState>
 #include <QFinalState>
 #include <QDebug>
-
+#include <QTime>
 #include <hbmainwindow.h>
 
 
@@ -98,7 +98,9 @@
 void FtuDefaultRuntime::createGuiServiceParts()
 {
     mWindow = new HbMainWindow();
+    QDEBUG("FtuDefaultRuntime Window created"<<__FUNCTION__<<"~~~~~~~"<<QTime::currentTime().toString("hh:mm:ss.zzz");)
     mWindow->show();
+    QDEBUG("FtuDefaultRuntime Window Shown"<<__FUNCTION__<<"~~~~~~~"<<QTime::currentTime().toString("hh:mm:ss.zzz");)
 }
 
 // ---------------------------------------------------------------------------
@@ -188,14 +190,14 @@
         foreach (const QVariant& service, services)
         {           
             QString name = service.toString();
-            qDebug() << "Assign service:" << name << "\n to " << state->objectName();
+            QDEBUG("Assign service:" << name << "\n to " << state->objectName();)
             if (name == FTU_CONTENT_SERVICE_KEY) 
             {
                 state->setProperty(name.toAscii().data(), qVariantFromValue(mFtuContentService));
             }
             else 
             {
-                qWarning() << "WARNING: Service " << name << " is unknown";
+                QDEBUG("WARNING: Service " << name << " is unknown";)
             }
         }
     }
diff -r a84e691b1955 -r b73d0bdd62de stateproviders/ftustateprovider/ftustateprovider.pro
--- a/stateproviders/ftustateprovider/ftustateprovider.pro	Fri Jun 11 16:23:41 2010 +0100
+++ b/stateproviders/ftustateprovider/ftustateprovider.pro	Thu Jul 22 16:30:57 2010 +0100
@@ -17,7 +17,7 @@
 TEMPLATE = lib
 
 DEFINES += FTUSTATEPROVIDER_LIB
-
+#DEFINES += LOGGING
 
 symbian {
     CONFIG(debug, debug|release) {
diff -r a84e691b1955 -r b73d0bdd62de stateproviders/ftustateprovider/inc/ftustateprovider_global.h
--- a/stateproviders/ftustateprovider/inc/ftustateprovider_global.h	Fri Jun 11 16:23:41 2010 +0100
+++ b/stateproviders/ftustateprovider/inc/ftustateprovider_global.h	Thu Jul 22 16:30:57 2010 +0100
@@ -32,4 +32,11 @@
     #endif	
 #endif
 
+#ifdef LOGGING
+#define QDEBUG(a)   qDebug() <<a
+#else
+#define QDEBUG(a)  
+#endif //LOGGING
+
+
 #endif // FTUSTATEPROVIDER_GLOBAL_H
diff -r a84e691b1955 -r b73d0bdd62de stateproviders/ftustateprovider/inc/ftuwizardactivatedstate.h
--- a/stateproviders/ftustateprovider/inc/ftuwizardactivatedstate.h	Fri Jun 11 16:23:41 2010 +0100
+++ b/stateproviders/ftustateprovider/inc/ftuwizardactivatedstate.h	Thu Jul 22 16:30:57 2010 +0100
@@ -49,13 +49,6 @@
 class FtuWizardActivatedState : public QState
 {
     Q_OBJECT
-public: 
-    /*
-     * The plugin's display mode enumeration.
-     * FullScreen means menustrip is not shown.
-     * PartialScreen means menustrip is shown.
-     */
-    enum PluginDisplayMode{FullScreen, PartialScreen};
     
 public:
 
@@ -101,12 +94,6 @@
     HbMainWindow* mainWindow();
     
     /**
-     * Creates the menustrip.
-     * @since S60 ?S60_version.
-     */   
-    void constructGrid();
-
-    /**
      * Connects signals and slots for active wizard.
      * @since S60 ?S60_version.
      */  
@@ -128,21 +115,17 @@
     void handleBackEvent();
     
     /**
+     * Signalled when plugin emits wizardDeactivated signal.
+     * @since S60 ?S60_version.
+     */
+    void handleGotoToC();
+    
+    /**
      * @copydoc FtuWizard::onViewChanged
      */
     void changeWizardView(FtuWizard *caller, QGraphicsWidget* viewWidget);
     
     /**
-      * @copydoc FtuWizard::fullScreenModeRequested
-      */
-    void enableFullScreenMode(FtuWizard *caller);
-     
-    /**
-      * @copydoc FtuWizard::partialScreenModeRequested
-      */
-    void enablePartialScreenMode(FtuWizard *caller);
-    
-    /**
      * @copydoc FtuWizard::onInfoTextUpdated
      */
     void updateInfoText(FtuWizard *caller, QString text);
@@ -208,11 +191,6 @@
     HbAction*               mBackAction;
     
     /**
-     * The menustrip component.
-     */     
-    HbGridView*             mMenustrip;
-    
-    /**
      * Plugin's previously activated view.
      */
     QGraphicsWidget*        mPreviousView;
@@ -222,10 +200,6 @@
      */
     QGraphicsWidget*        mCurrentView;
 
-    /**
-     * The Plugin's display mode.
-     */
-    PluginDisplayMode       mPluginDisplayMode;
     
     FTU_TEST_FRIEND_CLASS(FtuStateProviderTest)    
 };
diff -r a84e691b1955 -r b73d0bdd62de stateproviders/ftustateprovider/resources/ftustateprovider.docml
--- a/stateproviders/ftustateprovider/resources/ftustateprovider.docml	Fri Jun 11 16:23:41 2010 +0100
+++ b/stateproviders/ftustateprovider/resources/ftustateprovider.docml	Thu Jul 22 16:30:57 2010 +0100
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<hbdocument version="0.5">
+<hbdocument version="1.1">
     <widget name="tocView" type="HbView">
         <widget name="content" role="HbView:widget" type="HbWidget">
             <widget name="tocInfoTextLabel" type="HbLabel">
-                <sizehint height="5un" type="PREFERRED" width="45.97015un"/>
+                <real name="z" value="1"/>
                 <sizepolicy horizontalPolicy="Preferred" horizontalStretch="0" verticalPolicy="Preferred" verticalStretch="0"/>
-                <zvalue value="1.0"/>
+                <sizehint height="5un" type="PREFERRED" width="45.97015un"/>
             </widget>
             <widget name="tocListView" type="HbListView">
-                <sizehint height="81.04478un" type="PREFERRED" width="51.64179un"/>
+                <real name="z" value="2"/>
                 <sizepolicy horizontalPolicy="Expanding" horizontalStretch="0" verticalPolicy="Expanding" verticalStretch="0"/>
-                <zvalue value="2.0"/>
+                <sizehint height="81.04478un" type="PREFERRED" width="51.64179un"/>
             </widget>
-            <zvalue value="0.0"/>
-            <layout type="anchor" widget="content">
+            <real name="z" value="0"/>
+            <layout type="anchor">
                 <anchoritem dst="tocInfoTextLabel" dstEdge="LEFT" spacing="1un" src="" srcEdge="LEFT"/>
                 <anchoritem dst="tocInfoTextLabel" dstEdge="TOP" spacing="1un" src="" srcEdge="TOP"/>
                 <anchoritem dst="tocInfoTextLabel" dstEdge="RIGHT" spacing="-1un" src="" srcEdge="RIGHT"/>
@@ -26,35 +26,29 @@
     </widget>
     <widget name="wizardView" type="HbView">
         <widget name="content_2" role="HbView:widget" type="HbWidget">
-            <widget name="wizardGridView" type="HbGridView">
-                <sizehint height="10un" type="PREFERRED" width="51.64179un"/>
-                <sizepolicy horizontalPolicy="Expanding" horizontalStretch="0" verticalPolicy="Expanding" verticalStretch="0"/>
-                <zvalue value="1.0"/>
-            </widget>
             <widget name="wizardInfoTextLabel" type="HbLabel">
+                <real name="z" value="2"/>
                 <sizehint height="5un" type="PREFERRED" width="51.64179un"/>
-                <zvalue value="2.0"/>
             </widget>
             <widget name="wizardStackedWidget" type="HbStackedWidget">
+                <real name="z" value="3"/>
                 <sizehint height="23.8806un" type="PREFERRED" width="23.8806un"/>
-                <zvalue value="3.0"/>
             </widget>
-            <string name="id" value="content_2"/>
-            <zvalue value="0.0"/>
-            <layout type="anchor" widget="content_2">
-                <anchoritem dst="wizardGridView" dstEdge="LEFT" spacing="1un" src="" srcEdge="LEFT"/>
-                <anchoritem dst="wizardGridView" dstEdge="RIGHT" spacing="-1un" src="" srcEdge="RIGHT"/>
-                <anchoritem dst="wizardGridView" dstEdge="BOTTOM" spacing="-1un" src="" srcEdge="BOTTOM"/>
+            <real name="z" value="0"/>
+            <layout type="anchor">
                 <anchoritem dst="wizardInfoTextLabel" dstEdge="LEFT" spacing="1un" src="" srcEdge="LEFT"/>
                 <anchoritem dst="wizardInfoTextLabel" dstEdge="TOP" spacing="1un" src="" srcEdge="TOP"/>
                 <anchoritem dst="wizardInfoTextLabel" dstEdge="RIGHT" spacing="-1un" src="" srcEdge="RIGHT"/>
                 <anchoritem dst="wizardStackedWidget" dstEdge="LEFT" spacing="1un" src="" srcEdge="LEFT"/>
                 <anchoritem dst="wizardStackedWidget" dstEdge="TOP" spacing="6un" src="" srcEdge="TOP"/>
                 <anchoritem dst="wizardStackedWidget" dstEdge="RIGHT" spacing="-1un" src="" srcEdge="RIGHT"/>
-                <anchoritem dst="wizardStackedWidget" dstEdge="BOTTOM" spacing="-11un" src="" srcEdge="BOTTOM"/>
+                <anchoritem dst="wizardStackedWidget" dstEdge="BOTTOM" spacing="-1un" src="" srcEdge="BOTTOM"/>
             </layout>
         </widget>
-        <zvalue value="1.0"/>
+        <real name="z" value="1"/>
     </widget>
-    <metadata display="QHD portrait" unit="un"/>
+    <metadata activeUIState="Common ui state" display="NHD-3.2-inch_portrait" unit="un">
+        <uistate name="Common ui state" sections="#common"/>
+        <dummydata objectName="tocListView" section="#common" value="app_list_template5"/>
+    </metadata>
 </hbdocument>
diff -r a84e691b1955 -r b73d0bdd62de stateproviders/ftustateprovider/src/ftustateprovider.cpp
--- a/stateproviders/ftustateprovider/src/ftustateprovider.cpp	Fri Jun 11 16:23:41 2010 +0100
+++ b/stateproviders/ftustateprovider/src/ftustateprovider.cpp	Thu Jul 22 16:30:57 2010 +0100
@@ -21,7 +21,7 @@
 #include "ftuwizardmenustate.h"
 #include "ftuwizardloaderstate.h"
 #include "ftuwizardactivatedstate.h"
-
+#include "ftustateprovider_global.h"
 #include <QState>
 #include <QDebug>
 
@@ -57,7 +57,7 @@
         return new FtuWizardActivatedState();
     }
     else {
-        qDebug() << "FTU: No state found for uri: " << uri;
+        QDEBUG("FTU: No state found for uri: " << uri;)
         return NULL;
     }
 }
diff -r a84e691b1955 -r b73d0bdd62de stateproviders/ftustateprovider/src/ftuwizardactivatedstate.cpp
--- a/stateproviders/ftustateprovider/src/ftuwizardactivatedstate.cpp	Fri Jun 11 16:23:41 2010 +0100
+++ b/stateproviders/ftustateprovider/src/ftuwizardactivatedstate.cpp	Thu Jul 22 16:30:57 2010 +0100
@@ -19,6 +19,7 @@
 #include "ftuwizardactivatedstate.h"
 #include "fturuntimeservices_global.h"
 #include "ftucontentservice.h"
+#include "ftustateprovider_global.h"
 #include <ftuwizard.h>
 
 #include <hbmainwindow.h>
@@ -36,7 +37,6 @@
 #include <QDir>
 #include <hbmenu.h>
 
-const int gridRowCount = 1;
 
 const char *FTUSTATEPROVIDER_DOCML2 = ":/xml/ftustateprovider.docml";
 const char *WIZARD_VIEW = "wizardView";
@@ -67,10 +67,8 @@
     mPluginTitleLabel(NULL),
     mWizardStackedWidget(NULL),
     mBackAction(NULL),
-    mMenustrip(NULL), 
     mPreviousView(NULL), 
-    mCurrentView(NULL),
-    mPluginDisplayMode(PartialScreen) 
+    mCurrentView(NULL)
 {
     mMainWindow = hbInstance->allMainWindows().at(0);
     mDocumentLoader = new HbDocumentLoader();
@@ -116,20 +114,13 @@
 //
 void FtuWizardActivatedState::onEntry(QEvent *event)
 {
-    qDebug() << "ftu:FtuWizardActivatedState::onEntry";
+    QDEBUG("ftu:FtuWizardActivatedState::onEntry";)
     QState::onEntry(event);    
 
     int activeIndex = content()->activeWizard();
     mActiveWizard = content()->wizard(activeIndex);
     
     mPluginView->setNavigationAction(mBackAction);
-    // Make menustrip for testing purposes.
-    if(!mMenustrip)
-    {
-        constructGrid();
-    }
-    mMenustrip->setVisible(true);
-
     connect(mBackAction, SIGNAL(triggered()),
             this, SLOT(handleBackEvent()));
 
@@ -152,22 +143,21 @@
     QState::onExit(event);
     mMainWindow->currentView()->takeMenu();
     disconnect(mBackAction, SIGNAL(triggered()),
-               this, SLOT(handleBackEvent()));
+                   this, SLOT(handleBackEvent()));
+    
+    
+    disconnect(mActiveWizard, SIGNAL(wizardDeactivated(FtuWizard *)),
+               this, SLOT(handleGotoToC()));
     
     disconnect(mActiveWizard, SIGNAL(viewChanged(FtuWizard *, 
                                                  QGraphicsWidget* )),
                this, SLOT(changeWizardView(FtuWizard*, QGraphicsWidget*)));
     
-    disconnect(mActiveWizard, SIGNAL(fullScreenModeRequested(FtuWizard *)),
-               this, SLOT(enableFullScreenMode(FtuWizard*)));
-    
-    disconnect(mActiveWizard, SIGNAL(partialScreenModeRequested(FtuWizard * )),
-               this, SLOT(enablePartialScreenMode(FtuWizard*)));
 
     disconnect(mActiveWizard, SIGNAL(infoTextUpdated(FtuWizard *, QString )),
             this, SLOT(updateInfoText(FtuWizard *, QString)));
     
-    //disconnect from the existing existing wizard's updateMainMenu signal
+    //disconnect from the existing wizard's updateMainMenu signal
     disconnect(mActiveWizard,SIGNAL(updateMainMenu(FtuWizard *, HbMenu * )),
             this,SLOT(updateMainMenu(FtuWizard *, HbMenu * )));
 }
@@ -179,16 +169,13 @@
 void FtuWizardActivatedState::setActiveWizardConnections()
 {
     // first disconnect possible old connections with active wizard
+    disconnect(mActiveWizard, SIGNAL(wizardDeactivated(FtuWizard *)),
+                   this, SLOT(handleGotoToC()));
+    
     disconnect(mActiveWizard, SIGNAL(viewChanged(FtuWizard *, 
                                                  QGraphicsWidget* )),
                this, SLOT(changeWizardView(FtuWizard*, QGraphicsWidget*)));
     
-    disconnect(mActiveWizard, SIGNAL(fullScreenModeRequested(FtuWizard *)),
-               this, SLOT(enableFullScreenMode(FtuWizard*)));
-    
-    disconnect(mActiveWizard, SIGNAL(partialScreenModeRequested(FtuWizard * )),
-               this, SLOT(enablePartialScreenMode(FtuWizard*)));
-
     disconnect(mActiveWizard, SIGNAL(infoTextUpdated(FtuWizard *, QString )),
             this, SLOT(updateInfoText(FtuWizard *, QString)));
     
@@ -200,18 +187,15 @@
     connect(mActiveWizard, SIGNAL(viewChanged(FtuWizard *, QGraphicsWidget* )),
             this, SLOT(changeWizardView(FtuWizard*, QGraphicsWidget*)));
     
-    connect(mActiveWizard, SIGNAL(fullScreenModeRequested(FtuWizard *)),
-            this, SLOT(enableFullScreenMode(FtuWizard*)));
-    
-    connect(mActiveWizard, SIGNAL(partialScreenModeRequested(FtuWizard * )),
-            this, SLOT(enablePartialScreenMode(FtuWizard*)));
-    
     connect(mActiveWizard, SIGNAL(infoTextUpdated(FtuWizard *, QString )),
             this, SLOT(updateInfoText(FtuWizard *, QString)));
     
     // connect to the updateMainMenu wizard signal
     connect(mActiveWizard,SIGNAL(updateMainMenu(FtuWizard *, HbMenu * )),
             this,SLOT(updateMainMenu(FtuWizard *, HbMenu * )));
+    
+    connect(mActiveWizard, SIGNAL(wizardDeactivated(FtuWizard *)),
+                   this, SLOT(handleGotoToC()));
 }
 
 // ---------------------------------------------------------------------------
@@ -236,6 +220,10 @@
     }    
 }
 
+void FtuWizardActivatedState::handleGotoToC()
+    {
+    emit backEventTriggered();
+    }
 
 // ---------------------------------------------------------------------------
 // FtuWizardActivatedState::updateMainMenu
@@ -271,7 +259,7 @@
             // set wizard's widget as current widget
             mWizardStackedWidget->setCurrentWidget(viewWidget);
             
-            qDebug() << "Ftu: switching view due plugin view change";
+            QDEBUG("Ftu: switching view due plugin view change";)
             mainWindow()->setCurrentView(mPluginView, true);
             
             QList<FtuWizard*> wizards = content()->wizards();
@@ -281,45 +269,10 @@
             // temp solution to skip edge indexes - start
             if (index == 0) { index++; }
             if (index == wizards.count()-1) { index--; }
-            // temp solution to skip edge indexes - end  
-                      
-            // create model index for active wizard
-            QModelIndex modelIndex = mMenustrip->model()->index(index, 0);
-            // scroll to correct position in menustrip
-            HbAbstractItemView::ScrollHint hint = HbAbstractItemView::PositionAtCenter;
-            mMenustrip->scrollTo(modelIndex, hint);
         }        
     }
 }
 
-// ---------------------------------------------------------------------------
-// FtuWizardActivatedState::enableFullScreenMode
-// ---------------------------------------------------------------------------
-//
-void FtuWizardActivatedState::enableFullScreenMode(FtuWizard *caller)
-{
-    if(caller == mActiveWizard)
-    {
-        mPluginDisplayMode = FullScreen;
-        // Remove menustrip
-		mMenustrip->setVisible(false);
-        caller->resizeWizard(calculateWizardGeometry()); 
-    }    
-}
-
-// ---------------------------------------------------------------------------
-// FtuWizardActivatedState::enablePartialScreenMode
-// ---------------------------------------------------------------------------
-//
-void FtuWizardActivatedState::enablePartialScreenMode(FtuWizard *caller)
-{
-    if(caller == mActiveWizard)
-    {
-        mPluginDisplayMode = PartialScreen;
-        mMenustrip->setVisible(true);
-        caller->resizeWizard(calculateWizardGeometry());
-    }
-}
 
 // ---------------------------------------------------------------------------
 // FtuWizardActivatedState::updateInfoText
@@ -344,49 +297,6 @@
 }
 
 // ---------------------------------------------------------------------------
-// FtuWizardActivatedState::constructGrid
-// ---------------------------------------------------------------------------
-//
-void FtuWizardActivatedState::constructGrid()
-{
-    // fetch grid view from docml
-    mMenustrip = qobject_cast<HbGridView *>(mDocumentLoader->findWidget(WIZARD_GRID_VIEW));
-    // set row amount for grid
-    mMenustrip->setRowCount(gridRowCount);
-
-    mMenustrip->setScrollDirections(Qt::Horizontal);
-
-    FtuContentService* ftuContentService = content();
-    // get wizards
-    QList<FtuWizard*> wizards = ftuContentService->wizards();
-    
-    QStandardItemModel* model = new QStandardItemModel(this);
-    
-    for(int i = 0 ; i < wizards.size() ; ++i)
-    {
-        // get wizard settings
-        const FtuWizardSetting& settings = wizards.at(i)->wizardSettings();
-        QStandardItem* item = new QStandardItem();
-        HbIcon icon(settings.mMenustripDefaultIcon.absoluteFilePath());
-
-        item->setBackground(QBrush(Qt::lightGray));
-        item->setData(icon, Qt::DecorationRole);
-        
-        QStringList data;
-        data << settings.mMenustripLabel;
-        
-        item->setData(QVariant(data), Qt::DisplayRole);
-
-        model->appendRow(item);
-    }
-    // set above defined model for menustrip
-    mMenustrip->setModel(model);
-
-    connect(mMenustrip, SIGNAL(activated(const QModelIndex)),
-            this, SLOT(activateWizard(const QModelIndex)));
-}
-
-// ---------------------------------------------------------------------------
 // FtuWizardActivatedState::activateWizard
 // ---------------------------------------------------------------------------
 //
@@ -425,16 +335,6 @@
                 mActiveWizard->activateWizard();
             }
         }
-        
-        // temp solution to skip edge indexes - start
-        if (wizardIndex == 0) { wizardIndex++; }
-        if (wizardIndex == content()->wizards().count()-1) { wizardIndex--; }
-        QModelIndex modelIndex = mMenustrip->model()->index(wizardIndex, 0);
-        // temp solution to skip edge indexes - end         
-              
-        HbAbstractItemView::ScrollHint hint = HbAbstractItemView::PositionAtCenter;
-        // scroll to correct position in menustrip
-        mMenustrip->scrollTo(modelIndex, hint);
     }
 }
 
@@ -446,17 +346,7 @@
 {
 	QRectF widgetRect = mWizardStackedWidget->geometry();
 	QRectF pluginRect = mPluginView->geometry();	
-    if(mPluginDisplayMode == FullScreen)
-    {		
-		pluginRect.setSize(QSizeF(widgetRect.width(),
-								  (widgetRect.height() +
-						           mMenustrip->geometry().height())));
-    }
-	else
-	{	
-		pluginRect.setSize(QSizeF(widgetRect.width(),
-			                      widgetRect.height()));	
-	}
-
+	pluginRect.setSize(QSizeF(widgetRect.width(),
+	                                widgetRect.height()));
     return pluginRect;
 }
diff -r a84e691b1955 -r b73d0bdd62de stateproviders/ftustateprovider/src/ftuwizardloaderstate.cpp
--- a/stateproviders/ftustateprovider/src/ftuwizardloaderstate.cpp	Fri Jun 11 16:23:41 2010 +0100
+++ b/stateproviders/ftustateprovider/src/ftuwizardloaderstate.cpp	Thu Jul 22 16:30:57 2010 +0100
@@ -24,7 +24,7 @@
 #include "ftutest_global.h"
 #include "ftustatecenrephandler.h"
 #include <QDebug>
-
+#include <QTime>
 // ---------------------------------------------------------------------------
 // FtuWizardLoaderState::FtuWizardLoaderState
 // ---------------------------------------------------------------------------
@@ -51,7 +51,7 @@
 void FtuWizardLoaderState::addWizard(FtuWizard* wizard, bool success)
 {
     if(NULL!=wizard) {
-        qDebug() << "Wizard " << wizard->objectName() << " initialized with " << success;
+        QDEBUG("Wizard " << wizard->objectName() << " initialized with " << success;)
      }
     else {
        qFatal("void FtuWizardLoaderState::addWizard(FtuWizard* wizard, bool success): Null pointer argument wizard");
@@ -65,6 +65,7 @@
         disconnect(wizard, SIGNAL(wizardInitialized(FtuWizard*, bool)),
                    this, SLOT(addWizard(FtuWizard*, bool)));
     }
+    QDEBUG("FtuWizardLoaderState.cpp"<<__FUNCTION__<<"~~~~~~~"<<QTime::currentTime().toString("hh:mm:ss.zzz");)
 }
 
 // ---------------------------------------------------------------------------
diff -r a84e691b1955 -r b73d0bdd62de stateproviders/ftustateprovider/src/ftuwizardmenustate.cpp
--- a/stateproviders/ftustateprovider/src/ftuwizardmenustate.cpp	Fri Jun 11 16:23:41 2010 +0100
+++ b/stateproviders/ftustateprovider/src/ftuwizardmenustate.cpp	Thu Jul 22 16:30:57 2010 +0100
@@ -19,7 +19,7 @@
 #include "ftuwizardmenustate.h"
 #include "ftucontentservice.h"
 #include <ftuwizard.h>
-
+#include "ftustateprovider_global.h"
 #include <hbmainwindow.h>
 #include <hbview.h>
 #include <hblabel.h>
@@ -30,7 +30,7 @@
 
 #include <QStandardItemModel>
 #include <QDate>
-
+#include <QTime>
 #include <xqsettingsmanager.h>
 
 #include "ftustatecenrephandler.h"
@@ -38,8 +38,6 @@
 const int progressCompelete = 100;
 const char* emptyLine = " ";
 
-#define WMS_LOG qDebug() << "ftu:FtuWizardMenuState"
-
 const char *FTUSTATEPROVIDER_DOCML = ":/xml/ftustateprovider.docml";
 const char *TOC_VIEW = "tocView";
 const char *TOC_INFOTEXT_LABEL = "tocInfoTextLabel";
@@ -62,17 +60,14 @@
     mMainWindow = hbInstance->allMainWindows().at(0);
     mModel = new QStandardItemModel(this);
     
-    //TODO Read number of wizards supported and init the following list
-    //mCompletedWizardList << false << false << false << false << false <<false;
-
-	mDocumentLoader = new HbDocumentLoader();
+    mDocumentLoader = new HbDocumentLoader();
 	bool ok = false;
 	mDocumentLoader->load(FTUSTATEPROVIDER_DOCML, &ok);
 	QGraphicsWidget *widget = mDocumentLoader->findWidget(TOC_VIEW);
 	Q_ASSERT_X(ok && (widget != 0), "ftustateprovider", "invalid DocML file");
 	mTocView = qobject_cast<HbView*>(widget);
 
-    mTocView->setTitle(qtTrId("txt_ftu_title_setup"));
+	mTocView->setTitle(qtTrId("txt_long_caption_FTU_widget"));
 
 	mMainWindow->addView(mTocView);
     // Set as initial view.
@@ -105,7 +100,7 @@
 //
 void FtuWizardMenuState::onEntry(QEvent *event)
 {    
-    WMS_LOG << "::onEntry";
+    QDEBUG("FtuWizardMenuState::onEntry";)
     QState::onEntry(event);
 
     if(!mInfoText)
@@ -171,7 +166,8 @@
 //
 void FtuWizardMenuState::addWizardToListModel(int aIndex)
 {    
-    WMS_LOG << "::addWizardToListModel idx : " << aIndex;
+
+    QDEBUG("FtuWizardMenuState::addWizardToListModel idx : " << aIndex;)
     FtuContentService* ftuContentService = content();
 
     FtuWizard* addedWizard = ftuContentService->wizard(aIndex);
@@ -181,9 +177,13 @@
         connect(addedWizard, SIGNAL(progressUpdated(FtuWizard *, bool, int)), 
                 this, SLOT(updateProgress(FtuWizard *, bool, int)));
 
-    	const FtuWizardSetting& settings = addedWizard->wizardSettings();
-	    QStandardItem* newItem = new QStandardItem();
-	    HbIcon icon (settings.mTocDefaultIcon.absoluteFilePath());
+        const FtuWizardSetting& settings = addedWizard->wizardSettings();
+        QStandardItem* newItem = new QStandardItem();
+        QList<QVariant> iconList;
+        HbIcon icon (settings.mTocDefaultIcon.filePath() );
+        iconList.append(icon);
+        HbIcon rightIcon(QString(qtTrId("qtg_small_tick")));
+        
         QStringList data;
         data << settings.mTocLabel;
         QDate date = addedWizard->wizardCompletedDate();
@@ -193,11 +193,12 @@
         }
         else
         {
+            //Plugin has already completed, Append tick mark on right side
+            iconList.append(rightIcon);
             data << updatedAsString(date);
         }
 
-        newItem->setBackground(QBrush(Qt::lightGray));
-        newItem->setData(icon, Qt::DecorationRole);
+        newItem->setData(iconList, Qt::DecorationRole);
         newItem->setData(QVariant(data), Qt::DisplayRole);
 
         mModel->appendRow(newItem);        
@@ -220,6 +221,7 @@
                 SLOT(activateWizard(const QModelIndex)));
 
         mListView->setModel(mModel);
+        QDEBUG("FtuWizardMenuState.cpp Model is set"<<__FUNCTION__<<"~~~~~~~"<<QTime::currentTime().toString("hh:mm:ss.zzz");)
     }
 }
 
@@ -230,7 +232,7 @@
 void FtuWizardMenuState::createInfoText()
 {
     mInfoText = qobject_cast<HbLabel *>(mDocumentLoader->findWidget(TOC_INFOTEXT_LABEL));                               
-    mInfoText->setPlainText(qtTrId("txt_ftu_subtitle_toc"));
+    mInfoText->setPlainText(qtTrId("txt_ftu_subhead_select_setting_you_want_to_edit"));
 }
 
 // ---------------------------------------------------------------------------
@@ -265,14 +267,18 @@
     {
         if(caller == wizards[i])
         {
-            WMS_LOG << "::updateProgress wizard found at: " << i;
+            QDEBUG("::updateProgress wizard found at: " << i;)
             index = i;
         }
     }
     if(index != -1)
     {  
         QStringList data;
-        data << wizards[index]->wizardSettings().mTocLabel;           
+        data << wizards[index]->wizardSettings().mTocLabel;
+        QList<QVariant> iconList;
+        HbIcon icon (wizards[index]->wizardSettings().mTocDefaultIcon.filePath());
+        iconList.append(icon);
+        HbIcon rightIcon(QString(qtTrId("qtg_small_tick")));
         
         if(progress < progressCompelete)
         {
@@ -285,7 +291,10 @@
         else
         {         
             QDate date = wizards[index]->wizardCompletedDate();
-            data << updatedAsString(date);            
+            data << updatedAsString(date);
+
+            //Plugin has completed 100%, Append tick mark on right side
+            iconList.append(rightIcon);
 
             XQSettingsManager settingsManager;
             
@@ -297,5 +306,6 @@
 
         }
         mModel->item(index)->setData(QVariant(data), Qt::DisplayRole);
+        mModel->item(index)->setData(iconList, Qt::DecorationRole);
     }
 }
diff -r a84e691b1955 -r b73d0bdd62de translations/FTU_textmap_10_1.xls
Binary file translations/FTU_textmap_10_1.xls has changed
diff -r a84e691b1955 -r b73d0bdd62de translations/FTU_textmap_10_1_v4_edit.xls
Binary file translations/FTU_textmap_10_1_v4_edit.xls has changed
diff -r a84e691b1955 -r b73d0bdd62de translations/ftu_en.ts
--- a/translations/ftu_en.ts	Fri Jun 11 16:23:41 2010 +0100
+++ b/translations/ftu_en.ts	Thu Jul 22 16:30:57 2010 +0100
@@ -1,315 +1,485 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="3.0" language="en_GB" sourcelanguage="en_GB">
+<TS version="3.0" sourcelanguage="en_GB">
 <context>
+<message numerus="no" id="txt_ftu_dblist_from_old_phone_val_via_bluetooth">
+    <comment>Secondary value for double list 10, and appears if the user has not done any import for old phone from this application before</comment>        
+    <source>via bluetooth</source>
+    <translation variants="no" type="unfinished"></translation>
+    <extra-loc-layout_id>qtl_list_pri_large_graphic_add</extra-loc-layout_id>    
+    <extra-loc-viewid>FTU_15</extra-loc-viewid>
+    <extra-loc-positionid>dblist_10_val</extra-loc-positionid>
+    <extra-loc-feature>FTU</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_ftu_dblist_from_sim_card_val_importing">
+    <comment>Inprogress indication shown in the sencond row of the db 11, which say the the sim contacts are being imported and not finshed yet</comment>        
+    <source>Importing</source>
+    <translation variants="no" type="unfinished"></translation>
+    <extra-loc-layout_id>qtl_list_sec_large_graphic</extra-loc-layout_id>    
+    <extra-loc-viewid>FTU_15</extra-loc-viewid>
+    <extra-loc-positionid>dblist_11_val</extra-loc-positionid>
+    <extra-loc-feature>FTU</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_ftu_dblist_nokia_account_setup_val_and_enjoy_o">
+    <comment>Secondary Row text for Setup Item&quot;Setup Nokia account&quot;. The secondary is only descriptive of what the Setup Item will provide</comment>        
+    <source>And Enjoy Ovi services</source>
+    <translation variants="no" type="unfinished"></translation>
+    <extra-loc-layout_id></extra-loc-layout_id>    
+    <extra-loc-viewid>FTU_13</extra-loc-viewid>
+    <extra-loc-positionid>dblist_7_val</extra-loc-positionid>
+    <extra-loc-feature>FTU</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_ftu_list_time_date_location">
+    <comment>TOC item, setting in sync with control panel´s settings</comment>        
+    <source>Time, date and location</source>
+    <translation variants="no" type="unfinished"></translation>
+    <extra-loc-layout_id></extra-loc-layout_id>    
+    <extra-loc-viewid>ftu_09</extra-loc-viewid>
+    <extra-loc-positionid>dblist</extra-loc-positionid>
+    <extra-loc-feature>ftu</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_ftu_subhead_import_from_ovi">
+    <comment>Subheading as a status of current status of import</comment>        
+    <source>Import from OVI </source>
+    <translation variants="no" type="unfinished"></translation>
+    <extra-loc-layout_id>qtl_groupbox_simple_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>FTU_23</extra-loc-viewid>
+    <extra-loc-positionid>subhead</extra-loc-positionid>
+    <extra-loc-feature>FTU</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_ftu_grid_import_data">
+    <comment>menustrip item</comment>        
+    <source>Import data</source>
+    <translation variants="no" type="unfinished"></translation>
+    <extra-loc-layout_id></extra-loc-layout_id>    
+    <extra-loc-viewid>ftu_10</extra-loc-viewid>
+    <extra-loc-positionid>grid </extra-loc-positionid>
+    <extra-loc-feature>ftu</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_ftu_list_activate_sync_for_future_use">
+    <comment>It’s a list with a check box</comment>        
+    <source>Synchronize  my data  automatically in future</source>
+    <translation variants="no" type="unfinished"></translation>
+    <extra-loc-layout_id>qtl_checkbox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>FTU_25</extra-loc-viewid>
+    <extra-loc-positionid>List</extra-loc-positionid>
+    <extra-loc-feature>FTU</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_ftu_dialog_button_no">
+    <comment></comment>        
+    <source>no</source>
+    <translation variants="no" type="unfinished"></translation>
+    <extra-loc-layout_id></extra-loc-layout_id>    
+    <extra-loc-viewid>ftu_08</extra-loc-viewid>
+    <extra-loc-positionid>button</extra-loc-positionid>
+    <extra-loc-feature>ftu</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_ftu_subhead_select_setting_you_want_to_edit">
+    <comment>Subheading for one of the module of FTU</comment>        
+    <source>Select what you want to do </source>
+    <translation variants="no" type="unfinished"></translation>
+    <extra-loc-layout_id>qtl_groupbox_simple_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>FTU_13</extra-loc-viewid>
+    <extra-loc-positionid>subhead</extra-loc-positionid>
+    <extra-loc-feature>FTU</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_ftu_dblist_nokia_account_setup">
+    <comment>First row of the Double list, with large Icon and can have a seondary ICon</comment>        
+    <source>Nokia Account Setup</source>
+    <translation variants="no" type="unfinished"></translation>
+    <extra-loc-layout_id></extra-loc-layout_id>    
+    <extra-loc-viewid>FTU_13</extra-loc-viewid>
+    <extra-loc-positionid>dblist_7</extra-loc-positionid>
+    <extra-loc-feature>FTU</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_ftu_dblist_from_old_phone_ovi_val_importing_from_1">
+    <comment>Where %1 the user name for OVI or the BT name of the phone where the data is being imported</comment>        
+    <source>Importing from %1</source>
+    <translation variants="no" type="unfinished"></translation>
+    <extra-loc-layout_id>qtl_list_sec_large_graphic</extra-loc-layout_id>    
+    <extra-loc-viewid>FTU_15</extra-loc-viewid>
+    <extra-loc-positionid>dblist_10_val</extra-loc-positionid>
+    <extra-loc-feature>FTU</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_ftu_dblist_from_source_val_imported_on_2">
+    <comment>The Secondary text &apos;imported on %2&apos;. Wherer  %2 is the date  (formatted as system date): ex Imported on 23.09.10</comment>        
+    <source>Imported on %2</source>
+    <translation variants="no" type="unfinished"></translation>
+    <extra-loc-layout_id>qtl_list_sec_large_graphic</extra-loc-layout_id>    
+    <extra-loc-viewid>FTU_15</extra-loc-viewid>
+    <extra-loc-positionid>dblist_11_val</extra-loc-positionid>
+    <extra-loc-feature>FTU</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_ftu_grid_im ">
+    <comment>menustrip item</comment>        
+    <source>Instant messaging</source>
+    <translation variants="no" type="unfinished"></translation>
+    <extra-loc-layout_id></extra-loc-layout_id>    
+    <extra-loc-viewid>ftu_10</extra-loc-viewid>
+    <extra-loc-positionid>grid </extra-loc-positionid>
+    <extra-loc-feature>ftu</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_ftu_dblist_from_ovi">
+    <comment>Primary text in double row list that might /might not have a additional secondary Icon .List is predefined in the device, to import data form OVI</comment>        
+    <source>From Ovi</source>
+    <translation variants="no" type="unfinished"></translation>
+    <extra-loc-layout_id>qtl_list_pri_large_graphic_add</extra-loc-layout_id>    
+    <extra-loc-viewid>FTU_15</extra-loc-viewid>
+    <extra-loc-positionid>dblist_9</extra-loc-positionid>
+    <extra-loc-feature>FTU</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_ftu_subhead_import_contacts_personal_data">
+    <comment>subhead : instuctional text asking the source for importing data from</comment>        
+    <source>Import contacts &amp; personal data </source>
+    <translation variants="no" type="unfinished"></translation>
+    <extra-loc-layout_id>qtl_groupbox_simple_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>FTU_15</extra-loc-viewid>
+    <extra-loc-positionid>subhead</extra-loc-positionid>
+    <extra-loc-feature>FTU</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_ftu_info_terms_of_use">
+    <comment>placeholder, correct text from services later</comment>        
+    <source>&lt;terms of use&gt;</source>
+    <translation variants="no" type="unfinished"></translation>
+    <extra-loc-layout_id></extra-loc-layout_id>    
+    <extra-loc-viewid>ftu_07</extra-loc-viewid>
+    <extra-loc-positionid>info</extra-loc-positionid>
+    <extra-loc-feature>ftu</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_ftu_dblist_from_source_val_imported_at_1">
+    <comment>The Secondary text &apos;, &apos;imported at %1&apos;, . Wherer %1 is the time (formatted as system time) when data was imported.example: imported at 12:00 </comment>        
+    <source>Imported at %1 </source>
+    <translation variants="no" type="unfinished"></translation>
+    <extra-loc-layout_id>qtl_list_sec_large_graphic</extra-loc-layout_id>    
+    <extra-loc-viewid>FTU_15</extra-loc-viewid>
+    <extra-loc-positionid>dblist_11_val</extra-loc-positionid>
+    <extra-loc-feature>FTU</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_ftu_grid_style">
+    <comment>menustrip item</comment>        
+    <source>Style of phone</source>
+    <translation variants="no" type="unfinished"></translation>
+    <extra-loc-layout_id></extra-loc-layout_id>    
+    <extra-loc-viewid>ftu_10</extra-loc-viewid>
+    <extra-loc-positionid>grid </extra-loc-positionid>
+    <extra-loc-feature>ftu</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_ftu_grid_social_networks">
+    <comment>menustrip item</comment>        
+    <source>Social media</source>
+    <translation variants="no" type="unfinished"></translation>
+    <extra-loc-layout_id></extra-loc-layout_id>    
+    <extra-loc-viewid>ftu_10</extra-loc-viewid>
+    <extra-loc-positionid>grid </extra-loc-positionid>
+    <extra-loc-feature>ftu</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_ftu_title_setup">
+    <comment>Title shown in all FTU views, excluding videos&amp; pin code query</comment>        
+    <source>Setup</source>
+    <translation variants="no" type="unfinished"></translation>
+    <extra-loc-layout_id></extra-loc-layout_id>    
+    <extra-loc-viewid>ftu</extra-loc-viewid>
+    <extra-loc-positionid>title</extra-loc-positionid>
+    <extra-loc-feature>ftu</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_ftu_list_update_date">
+    <comment>TOC item, second row, tells last time user has edited plugin/module, where U is the date</comment>        
+    <source>updated %1</source>
+    <translation variants="no" type="unfinished"></translation>
+    <extra-loc-layout_id></extra-loc-layout_id>    
+    <extra-loc-viewid>ftu_09</extra-loc-viewid>
+    <extra-loc-positionid>dblist_val</extra-loc-positionid>
+    <extra-loc-feature>ftu</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_ftu_dblist_from_ovi_val_contacts_caledars_no">
+    <comment>Seconday list value, displayes the contents that start importing from OVI once the user chooses this list pootion</comment>        
+    <source>Contacts caledars &amp; Notes</source>
+    <translation variants="no" type="unfinished"></translation>
+    <extra-loc-layout_id>qtl_list_sec_large_graphic</extra-loc-layout_id>    
+    <extra-loc-viewid>FTU_15</extra-loc-viewid>
+    <extra-loc-positionid>dblist_9_val</extra-loc-positionid>
+    <extra-loc-feature>FTU</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_ftu_subtitle_toc">
+    <comment>text hints what user can do with the the Table Of Concents (TOC) items</comment>        
+    <source>Select setting you want to edit</source>
+    <translation variants="no" type="unfinished"></translation>
+    <extra-loc-layout_id></extra-loc-layout_id>    
+    <extra-loc-viewid>ftu_09</extra-loc-viewid>
+    <extra-loc-positionid>subhead</extra-loc-positionid>
+    <extra-loc-feature>ftu</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_ftu_dblist_from_old_phone">
+    <comment>Primary text in double row list that might /might not have a additional secondary Icon .Import from phone, triggers the process to import data from another Nokia Device</comment>        
+    <source>From old phone</source>
+    <translation variants="no" type="unfinished"></translation>
+    <extra-loc-layout_id>qtl_list_pri_large_graphic_add</extra-loc-layout_id>    
+    <extra-loc-viewid>FTU_15</extra-loc-viewid>
+    <extra-loc-positionid>dblist_10</extra-loc-positionid>
+    <extra-loc-feature>FTU</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
 <message numerus="no" id="txt_ftu_info_sign_to_tips">
     <comment>markable setting item: marked or unmarked , shown only in some marketing areas</comment>        
     <source>Sign up for tips &amp; tricks</source>
-    <translation variants="no">Sign up for tips &amp; tricks</translation>
+    <translation variants="no" type="unfinished"></translation>
     <extra-loc-layout_id></extra-loc-layout_id>    
     <extra-loc-viewid>ftu_07</extra-loc-viewid>
     <extra-loc-positionid>setlabel</extra-loc-positionid>
-    <extra-loc-feature>ft</extra-loc-feature>
-    <extra-loc-blank>False</extra-loc-blank>
-</message>
-<message numerus="no" id="txt_ftu_list_import_Data">
-    <comment>TOC item, data sync </comment>        
-    <source>Import data</source>
-    <translation variants="no">Import data</translation>
-    <extra-loc-layout_id></extra-loc-layout_id>    
-    <extra-loc-viewid>ftu_09</extra-loc-viewid>
-    <extra-loc-positionid>list item</extra-loc-positionid>
-    <extra-loc-feature>ft</extra-loc-feature>
+    <extra-loc-feature>ftu</extra-loc-feature>
     <extra-loc-blank>False</extra-loc-blank>
 </message>
 <message numerus="no" id="txt_ftu_button_accept">
     <comment>related to terms of use below</comment>        
     <source>Accept</source>
-    <translation variants="no">Accept</translation>
+    <translation variants="no" type="unfinished"></translation>
     <extra-loc-layout_id></extra-loc-layout_id>    
     <extra-loc-viewid>ftu_07</extra-loc-viewid>
     <extra-loc-positionid>button</extra-loc-positionid>
-    <extra-loc-feature>ft</extra-loc-feature>
+    <extra-loc-feature>ftu</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_ftu_list_import_Data">
+    <comment>TOC item, data sync </comment>        
+    <source>Import data</source>
+    <translation variants="no" type="unfinished"></translation>
+    <extra-loc-layout_id></extra-loc-layout_id>    
+    <extra-loc-viewid>ftu_09</extra-loc-viewid>
+    <extra-loc-positionid>list item</extra-loc-positionid>
+    <extra-loc-feature>ftu</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_ftu_dblist_from_sim_card">
+    <comment>Primary text in double row list that might /might not have a additional secondary Icon .Import from SIM triggers the process to import data from another Nokia SIM</comment>        
+    <source>From SIM card</source>
+    <translation variants="no" type="unfinished"></translation>
+    <extra-loc-layout_id>qtl_list_pri_large_graphic_add</extra-loc-layout_id>    
+    <extra-loc-viewid>FTU_15</extra-loc-viewid>
+    <extra-loc-positionid>dblist_11</extra-loc-positionid>
+    <extra-loc-feature>FTU</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_long_caption_FTU_widget">
+    <comment>Parent Custom Layout Parent.Primary text for Ftu widget (list) on home screen </comment>        
+    <source>Setup your device</source>
+    <translation variants="no" type="unfinished"></translation>
+    <extra-loc-layout_id>txt_long_caption_FTU_widget</extra-loc-layout_id>    
+    <extra-loc-viewid>FTUwidget_14</extra-loc-viewid>
+    <extra-loc-positionid>list</extra-loc-positionid>
+    <extra-loc-feature>FTUwidget</extra-loc-feature>
     <extra-loc-blank>False</extra-loc-blank>
 </message>
 <message numerus="no" id="txt_ftu_grid_email">
     <comment>menustrip item</comment>        
     <source>Email accounts</source>
-    <translation variants="no">Email accounts</translation>
+    <translation variants="no" type="unfinished"></translation>
     <extra-loc-layout_id></extra-loc-layout_id>    
     <extra-loc-viewid>ftu_10</extra-loc-viewid>
     <extra-loc-positionid>grid </extra-loc-positionid>
-    <extra-loc-feature>ft</extra-loc-feature>
-    <extra-loc-blank>False</extra-loc-blank>
-</message>
-<message numerus="no" id="txt_ftu_list_time_date_location">
-    <comment>TOC item, setting in sync with control panel´s settings</comment>        
-    <source>Time, date and location</source>
-    <translation variants="no">Time, date and location</translation>
-    <extra-loc-layout_id></extra-loc-layout_id>    
-    <extra-loc-viewid>ftu_09</extra-loc-viewid>
-    <extra-loc-positionid>dblist</extra-loc-positionid>
-    <extra-loc-feature>ft</extra-loc-feature>
-    <extra-loc-blank>False</extra-loc-blank>
-</message>
-<message numerus="no" id="txt_ftu_grid_import_data">
-    <comment>menustrip item</comment>        
-    <source>Import data</source>
-    <translation variants="no">Import data</translation>
-    <extra-loc-layout_id></extra-loc-layout_id>    
-    <extra-loc-viewid>ftu_10</extra-loc-viewid>
-    <extra-loc-positionid>grid </extra-loc-positionid>
-    <extra-loc-feature>ft</extra-loc-feature>
+    <extra-loc-feature>ftu</extra-loc-feature>
     <extra-loc-blank>False</extra-loc-blank>
 </message>
 <message numerus="no" id="txt_ftu_list_email">
     <comment>TOC item, email account creation</comment>        
     <source>Email accounts</source>
-    <translation variants="no">Email accounts</translation>
+    <translation variants="no" type="unfinished"></translation>
     <extra-loc-layout_id></extra-loc-layout_id>    
     <extra-loc-viewid>ftu_09</extra-loc-viewid>
     <extra-loc-positionid>dblist</extra-loc-positionid>
-    <extra-loc-feature>ft</extra-loc-feature>
+    <extra-loc-feature>ftu</extra-loc-feature>
     <extra-loc-blank>False</extra-loc-blank>
 </message>
 <message numerus="no" id="txt_ftu_list_im ">
     <comment>TOC item, IM account creation</comment>        
     <source>Instant messaging</source>
-    <translation variants="no">Instant messaging</translation>
+    <translation variants="no" type="unfinished"></translation>
     <extra-loc-layout_id></extra-loc-layout_id>    
     <extra-loc-viewid>ftu_09</extra-loc-viewid>
     <extra-loc-positionid>dblist</extra-loc-positionid>
-    <extra-loc-feature>ft</extra-loc-feature>
-    <extra-loc-blank>False</extra-loc-blank>
-</message>
-<message numerus="no" id="txt_ftu_dialog_button_no">
-    <comment></comment>        
-    <source>no</source>
-    <translation variants="no">no</translation>
-    <extra-loc-layout_id></extra-loc-layout_id>    
-    <extra-loc-viewid>ftu_08</extra-loc-viewid>
-    <extra-loc-positionid>button</extra-loc-positionid>
-    <extra-loc-feature>ft</extra-loc-feature>
+    <extra-loc-feature>ftu</extra-loc-feature>
     <extra-loc-blank>False</extra-loc-blank>
 </message>
 <message numerus="no" id="txt_ftu_grid_time_data_location">
     <comment>menustrip item</comment>        
     <source>time, date&amp; location</source>
-    <translation variants="no">time, date&amp; location</translation>
+    <translation variants="no" type="unfinished"></translation>
     <extra-loc-layout_id></extra-loc-layout_id>    
     <extra-loc-viewid>ftu_10</extra-loc-viewid>
     <extra-loc-positionid>grid </extra-loc-positionid>
-    <extra-loc-feature>ft</extra-loc-feature>
+    <extra-loc-feature>ftu</extra-loc-feature>
     <extra-loc-blank>False</extra-loc-blank>
 </message>
 <message numerus="no" id="txt_ftu_dialog_settings_found_later">
     <comment>info text that user can find settings later, dialog view</comment>        
     <source>You can find later link to setup from your home screen. </source>
-    <translation variants="no">You can find later link to setup from your home screen. </translation>
+    <translation variants="no" type="unfinished"></translation>
     <extra-loc-layout_id></extra-loc-layout_id>    
     <extra-loc-viewid>ftu_08</extra-loc-viewid>
     <extra-loc-positionid>info</extra-loc-positionid>
-    <extra-loc-feature>ft</extra-loc-feature>
+    <extra-loc-feature>ftu</extra-loc-feature>
     <extra-loc-blank>False</extra-loc-blank>
 </message>
 <message numerus="no" id="txt_ftu_subtitle_terms_of_use">
     <comment>subtitle hints to the view</comment>        
     <source>Please read terms of use and accept to continue</source>
-    <translation variants="no">Please read terms of use and accept to continue</translation>
+    <translation variants="no" type="unfinished"></translation>
     <extra-loc-layout_id></extra-loc-layout_id>    
     <extra-loc-viewid>ftu_07</extra-loc-viewid>
     <extra-loc-positionid>subhead</extra-loc-positionid>
-    <extra-loc-feature>ft</extra-loc-feature>
+    <extra-loc-feature>ftu</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_ftu_dialog_settings_now_or_later">
+    <comment>info text for user choices, related to buttons below, dialog view</comment>        
+    <source>Do you want to do start up settings now (recommended)?</source>
+    <translation variants="no" type="unfinished"></translation>
+    <extra-loc-layout_id></extra-loc-layout_id>    
+    <extra-loc-viewid>ftu_08</extra-loc-viewid>
+    <extra-loc-positionid>info</extra-loc-positionid>
+    <extra-loc-feature>ftu</extra-loc-feature>
     <extra-loc-blank>False</extra-loc-blank>
 </message>
 <message numerus="no" id="txt_ftu_list_update_today">
     <comment>TOC item, second row, tells last time user has edited plugin/module, shown only if the update has been today</comment>        
     <source>updated today</source>
-    <translation variants="no">updated today</translation>
+    <translation variants="no" type="unfinished"></translation>
     <extra-loc-layout_id></extra-loc-layout_id>    
     <extra-loc-viewid>ftu_09</extra-loc-viewid>
     <extra-loc-positionid>dblist_val</extra-loc-positionid>
-    <extra-loc-feature>ft</extra-loc-feature>
-    <extra-loc-blank>False</extra-loc-blank>
-</message>
-<message numerus="no" id="txt_ftu_dialog_settings_now_or_later">
-    <comment>info text for user choices, related to buttons below, dialog view</comment>        
-    <source>Do you want to do start up settings now (recommended)?</source>
-    <translation variants="no">Do you want to do start up settings now (recommended)?</translation>
-    <extra-loc-layout_id></extra-loc-layout_id>    
-    <extra-loc-viewid>ftu_08</extra-loc-viewid>
-    <extra-loc-positionid>info</extra-loc-positionid>
-    <extra-loc-feature>ft</extra-loc-feature>
-    <extra-loc-blank>False</extra-loc-blank>
-</message>
-<message numerus="no" id="txt_ftu_list_mycard">
-    <comment>TOC item, sync with the Phonebook mycard</comment>        
-    <source>My contact card</source>
-    <translation variants="no">My contact card</translation>
-    <extra-loc-layout_id></extra-loc-layout_id>    
-    <extra-loc-viewid>ftu_09</extra-loc-viewid>
-    <extra-loc-positionid>list item</extra-loc-positionid>
-    <extra-loc-feature>ft</extra-loc-feature>
+    <extra-loc-feature>ftu</extra-loc-feature>
     <extra-loc-blank>False</extra-loc-blank>
 </message>
 <message numerus="no" id="txt_ftu_dialog_button_yes">
     <comment></comment>        
     <source>yes</source>
-    <translation variants="no">yes</translation>
+    <translation variants="no" type="unfinished"></translation>
     <extra-loc-layout_id></extra-loc-layout_id>    
     <extra-loc-viewid>ftu_08</extra-loc-viewid>
     <extra-loc-positionid>button</extra-loc-positionid>
-    <extra-loc-feature>ft</extra-loc-feature>
+    <extra-loc-feature>ftu</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_ftu_list_mycard">
+    <comment>TOC item, sync with the Phonebook mycard</comment>        
+    <source>My contact card</source>
+    <translation variants="no" type="unfinished"></translation>
+    <extra-loc-layout_id></extra-loc-layout_id>    
+    <extra-loc-viewid>ftu_09</extra-loc-viewid>
+    <extra-loc-positionid>list item</extra-loc-positionid>
+    <extra-loc-feature>ftu</extra-loc-feature>
     <extra-loc-blank>False</extra-loc-blank>
 </message>
 <message numerus="no" id="txt_ftu_grid_importing ">
     <comment>menustrip item</comment>        
     <source>Importing…</source>
-    <translation variants="no">Importing…</translation>
+    <translation variants="no" type="unfinished"></translation>
     <extra-loc-layout_id></extra-loc-layout_id>    
     <extra-loc-viewid>ftu_10</extra-loc-viewid>
     <extra-loc-positionid>grid </extra-loc-positionid>
-    <extra-loc-feature>ft</extra-loc-feature>
-    <extra-loc-blank>False</extra-loc-blank>
-</message>
-<message numerus="no" id="txt_ftu_grid_im ">
-    <comment>menustrip item</comment>        
-    <source>Instant messaging</source>
-    <translation variants="no">Instant messaging</translation>
-    <extra-loc-layout_id></extra-loc-layout_id>    
-    <extra-loc-viewid>ftu_10</extra-loc-viewid>
-    <extra-loc-positionid>grid </extra-loc-positionid>
-    <extra-loc-feature>ft</extra-loc-feature>
+    <extra-loc-feature>ftu</extra-loc-feature>
     <extra-loc-blank>False</extra-loc-blank>
 </message>
 <message numerus="no" id="txt_ftu_list_importing_data">
     <comment>TOC item, data sync list item, where U is the source where the data is imported in to the phone (e.g. name of the PC or phone)</comment>        
     <source>Import data from %1</source>
-    <translation variants="no">Import data from %1</translation>
+    <translation variants="no" type="unfinished"></translation>
     <extra-loc-layout_id></extra-loc-layout_id>    
     <extra-loc-viewid>ftu_09</extra-loc-viewid>
     <extra-loc-positionid>list item</extra-loc-positionid>
-    <extra-loc-feature>ft</extra-loc-feature>
-    <extra-loc-blank>False</extra-loc-blank>
-</message>
-<message numerus="no" id="txt_ftu_info_terms_of_use">
-    <comment>placeholder, correct text from services later</comment>        
-    <source>&lt;terms of use&gt;</source>
-    <translation variants="no">&lt;terms of use&gt;</translation>
-    <extra-loc-layout_id></extra-loc-layout_id>    
-    <extra-loc-viewid>ftu_07</extra-loc-viewid>
-    <extra-loc-positionid>info</extra-loc-positionid>
-    <extra-loc-feature>ft</extra-loc-feature>
-    <extra-loc-blank>False</extra-loc-blank>
-</message>
-<message numerus="no" id="txt_ftu_grid_style">
-    <comment>menustrip item</comment>        
-    <source>Style of phone</source>
-    <translation variants="no">Style of phone</translation>
-    <extra-loc-layout_id></extra-loc-layout_id>    
-    <extra-loc-viewid>ftu_10</extra-loc-viewid>
-    <extra-loc-positionid>grid </extra-loc-positionid>
-    <extra-loc-feature>ft</extra-loc-feature>
-    <extra-loc-blank>False</extra-loc-blank>
-</message>
-<message numerus="no" id="txt_ftu_grid_social_networks">
-    <comment>menustrip item</comment>        
-    <source>Social media</source>
-    <translation variants="no">Social media</translation>
-    <extra-loc-layout_id></extra-loc-layout_id>    
-    <extra-loc-viewid>ftu_10</extra-loc-viewid>
-    <extra-loc-positionid>grid </extra-loc-positionid>
-    <extra-loc-feature>ft</extra-loc-feature>
+    <extra-loc-feature>ftu</extra-loc-feature>
     <extra-loc-blank>False</extra-loc-blank>
 </message>
 <message numerus="no" id="txt_ftu_grid_mycard">
     <comment>menustrip item, these items open same stuff as TOC items </comment>        
     <source>My contact card</source>
-    <translation variants="no">My contact card</translation>
+    <translation variants="no" type="unfinished"></translation>
     <extra-loc-layout_id></extra-loc-layout_id>    
     <extra-loc-viewid>ftu_10</extra-loc-viewid>
     <extra-loc-positionid>grid </extra-loc-positionid>
-    <extra-loc-feature>ft</extra-loc-feature>
-    <extra-loc-blank>False</extra-loc-blank>
-</message>
-<message numerus="no" id="txt_ftu_title_setup">
-    <comment>Title shown in all FTU views, excluding videos&amp; pin code query</comment>        
-    <source>Setup</source>
-    <translation variants="no">Setup</translation>
-    <extra-loc-layout_id></extra-loc-layout_id>    
-    <extra-loc-viewid>ftu</extra-loc-viewid>
-    <extra-loc-positionid>title</extra-loc-positionid>
-    <extra-loc-feature>ft</extra-loc-feature>
-    <extra-loc-blank>False</extra-loc-blank>
-</message>
-<message numerus="no" id="txt_ftu_list_progress_status">
-    <comment>TOC item, second row, tells the status of the user initiated progress (data sync from source x)</comment>        
-    <source>%1% done…</source>
-    <translation variants="no">%1% done…</translation>
-    <extra-loc-layout_id></extra-loc-layout_id>    
-    <extra-loc-viewid>ftu_09</extra-loc-viewid>
-    <extra-loc-positionid>dblist_val</extra-loc-positionid>
-    <extra-loc-feature>ft</extra-loc-feature>
-    <extra-loc-blank>False</extra-loc-blank>
-</message>
-<message numerus="no" id="txt_ftu_list_update_date">
-    <comment>TOC item, second row, tells last time user has edited plugin/module, where U is the date</comment>        
-    <source>updated %1</source>
-    <translation variants="no">updated %1</translation>
-    <extra-loc-layout_id></extra-loc-layout_id>    
-    <extra-loc-viewid>ftu_09</extra-loc-viewid>
-    <extra-loc-positionid>dblist_val</extra-loc-positionid>
-    <extra-loc-feature>ft</extra-loc-feature>
+    <extra-loc-feature>ftu</extra-loc-feature>
     <extra-loc-blank>False</extra-loc-blank>
 </message>
 <message numerus="no" id="txt_ftu_info_set_language">
     <comment>info text for language selection, uses main view</comment>        
     <source>Set your phone language:</source>
-    <translation variants="no">Set your phone language:</translation>
+    <translation variants="no" type="unfinished"></translation>
     <extra-loc-layout_id></extra-loc-layout_id>    
     <extra-loc-viewid>ftu_06</extra-loc-viewid>
     <extra-loc-positionid>setlabel</extra-loc-positionid>
-    <extra-loc-feature>ft</extra-loc-feature>
+    <extra-loc-feature>ftu</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_ftu_list_progress_status">
+    <comment>TOC item, second row, tells the status of the user initiated progress (data sync from source x)</comment>        
+    <source>%1% done…</source>
+    <translation variants="no" type="unfinished"></translation>
+    <extra-loc-layout_id></extra-loc-layout_id>    
+    <extra-loc-viewid>ftu_09</extra-loc-viewid>
+    <extra-loc-positionid>dblist_val</extra-loc-positionid>
+    <extra-loc-feature>ftu</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_tsw_caption_setup_your_device">
+    <comment>Name in task switcher</comment>        
+    <source>Setup your device</source>
+    <translation variants="no" type="unfinished"></translation>
+    <extra-loc-layout_id>qtl_grid_taskswitcher_tiny_setup</extra-loc-layout_id>    
+    <extra-loc-viewid>tsw_01</extra-loc-viewid>
+    <extra-loc-positionid>caption</extra-loc-positionid>
+    <extra-loc-feature>tsw</extra-loc-feature>
     <extra-loc-blank>False</extra-loc-blank>
 </message>
 <message numerus="no" id="txt_ftu_list_style">
     <comment>TOC item, main phone style settings (ringing tone, wallpaper, theme)</comment>        
     <source>Style of phone</source>
-    <translation variants="no">Style of phone</translation>
+    <translation variants="no" type="unfinished"></translation>
     <extra-loc-layout_id></extra-loc-layout_id>    
     <extra-loc-viewid>ftu_09</extra-loc-viewid>
     <extra-loc-positionid>dblist</extra-loc-positionid>
-    <extra-loc-feature>ft</extra-loc-feature>
+    <extra-loc-feature>ftu</extra-loc-feature>
     <extra-loc-blank>False</extra-loc-blank>
 </message>
-<message numerus="no" id="txt_ftu_subtitle_toc">
-    <comment>text hints what user can do with the the Table Of Concents (TOC) items</comment>        
-    <source>Select setting you want to edit</source>
-    <translation variants="no">Select setting you want to edit</translation>
+<message numerus="no" id="txt_ftu_list_social_networks">
+    <comment>TOC item, SM account creation (facebook etc) </comment>        
+    <source>Social media</source>
+    <translation variants="no" type="unfinished"></translation>
     <extra-loc-layout_id></extra-loc-layout_id>    
     <extra-loc-viewid>ftu_09</extra-loc-viewid>
-    <extra-loc-positionid>subhead</extra-loc-positionid>
-    <extra-loc-feature>ft</extra-loc-feature>
+    <extra-loc-positionid>dblist</extra-loc-positionid>
+    <extra-loc-feature>ftu</extra-loc-feature>
     <extra-loc-blank>False</extra-loc-blank>
 </message>
 <message numerus="no" id="txt_ftu_subtitle_change_language">
     <comment>info text to user´s choices, uses main view</comment>        
     <source>Select language you want to use</source>
-    <translation variants="no">Select language you want to use</translation>
+    <translation variants="no" type="unfinished"></translation>
     <extra-loc-layout_id></extra-loc-layout_id>    
     <extra-loc-viewid>ftu_06</extra-loc-viewid>
     <extra-loc-positionid>subhead</extra-loc-positionid>
-    <extra-loc-feature>ft</extra-loc-feature>
-    <extra-loc-blank>False</extra-loc-blank>
-</message>
-<message numerus="no" id="txt_ftu_list_social_networks">
-    <comment>TOC item, SM account creation (facebook etc) </comment>        
-    <source>Social media</source>
-    <translation variants="no">Social media</translation>
-    <extra-loc-layout_id></extra-loc-layout_id>    
-    <extra-loc-viewid>ftu_09</extra-loc-viewid>
-    <extra-loc-positionid>dblist</extra-loc-positionid>
-    <extra-loc-feature>ft</extra-loc-feature>
+    <extra-loc-feature>ftu</extra-loc-feature>
     <extra-loc-blank>False</extra-loc-blank>
 </message>
 </context>
diff -r a84e691b1955 -r b73d0bdd62de translations/ftu_en_GB.qm
Binary file translations/ftu_en_GB.qm has changed
diff -r a84e691b1955 -r b73d0bdd62de translations/ftu_en_US.qm
Binary file translations/ftu_en_US.qm has changed
diff -r a84e691b1955 -r b73d0bdd62de wizardproviders/ftuwizardprovider/conf/ftuwizardprovider.confml
--- a/wizardproviders/ftuwizardprovider/conf/ftuwizardprovider.confml	Fri Jun 11 16:23:41 2010 +0100
+++ b/wizardproviders/ftuwizardprovider/conf/ftuwizardprovider.confml	Thu Jul 22 16:30:57 2010 +0100
@@ -54,8 +54,8 @@
   <data>
     <KCrUidFtuWizardProvider>
       <KFtuNumberOfWizardPlugins>2</KFtuNumberOfWizardPlugins>
-      <KFtuWizardPluginPlaceholder1>ftudatetimewizard.manifest</KFtuWizardPluginPlaceholder1>
-      <KFtuWizardPluginPlaceholder2>dataimportftuwizard.manifest</KFtuWizardPluginPlaceholder2>
+      <KFtuWizardPluginPlaceholder1>dataimportftuwizard.manifest</KFtuWizardPluginPlaceholder1>
+      <KFtuWizardPluginPlaceholder2>ftuemailwizardplugin.manifest</KFtuWizardPluginPlaceholder2>
       <KFtuWizardPluginPlaceholder3></KFtuWizardPluginPlaceholder3>
       <KFtuWizardPluginPlaceholder4></KFtuWizardPluginPlaceholder4>
       <KFtuWizardPluginPlaceholder5></KFtuWizardPluginPlaceholder5>
diff -r a84e691b1955 -r b73d0bdd62de wizardproviders/ftuwizardprovider/ftuwizardprovider.pro
--- a/wizardproviders/ftuwizardprovider/ftuwizardprovider.pro	Fri Jun 11 16:23:41 2010 +0100
+++ b/wizardproviders/ftuwizardprovider/ftuwizardprovider.pro	Thu Jul 22 16:30:57 2010 +0100
@@ -22,6 +22,7 @@
 
 
 DEFINES += FTUWIZARDPROVIDER_LIB
+#DEFINES += LOGGING
 
 win32 {
     CONFIG(debug, debug|release) {
diff -r a84e691b1955 -r b73d0bdd62de wizardproviders/ftuwizardprovider/inc/ftuwizardprovider_global.h
--- a/wizardproviders/ftuwizardprovider/inc/ftuwizardprovider_global.h	Fri Jun 11 16:23:41 2010 +0100
+++ b/wizardproviders/ftuwizardprovider/inc/ftuwizardprovider_global.h	Thu Jul 22 16:30:57 2010 +0100
@@ -32,5 +32,11 @@
     #endif	
 #endif
 
+#ifdef LOGGING
+#define QDEBUG(a)   qDebug() <<a
+#else
+#define QDEBUG(a)  
+#endif //LOGGING
+
 
 #endif // FTUWIZARDPROVIDER_GLOBAL
diff -r a84e691b1955 -r b73d0bdd62de wizardproviders/ftuwizardprovider/src/ftumanifestparser.cpp
--- a/wizardproviders/ftuwizardprovider/src/ftumanifestparser.cpp	Fri Jun 11 16:23:41 2010 +0100
+++ b/wizardproviders/ftuwizardprovider/src/ftumanifestparser.cpp	Thu Jul 22 16:30:57 2010 +0100
@@ -26,7 +26,7 @@
 #include <QFileInfo>
 #include <QDir>
 #include <QDebug>
-
+#include "ftuwizardprovider_global.h"
 #ifdef Q_OS_SYMBIAN
 
 #include <XQSettingsManager> // for reading cenrep keys
@@ -70,7 +70,7 @@
         QString path = driveLetter + manifestPath;
         if(QDir(path).exists())
         {
-            qDebug() << "ftu:: append to path list: " << path;
+            QDEBUG("ftu:: append to path list: " << path;)
             pathList << path;
         }
     }      
@@ -87,21 +87,21 @@
         dir.setNameFilters(filesToRead);
         QStringList entries = dir.entryList(filesToRead, QDir::Files);
     
-        qDebug() << "ftu: Configured manifest file count " 
+        QDEBUG("ftu: Configured manifest file count " 
                  << filesToRead.count()
-                 << " found manifest files from system " << entries.count();
+                 << " found manifest files from system " << entries.count();)
         
         // Go through the configured list and find the manifest files.
         for(int j=0; j < filesToRead.count() ; ++j)
         {
             int index = entries.indexOf(filesToRead[j]);
-            qDebug() << "ftu:reading manifest file from "<< index;
+            QDEBUG("ftu:reading manifest file from "<< index;)
             if(index > -1 && index <= entries.count())
             {
                 QString fileName = entries[index]; 
-                qDebug() << "ftu:: loading from manifest file: " << fileName;
+                QDEBUG("ftu:: loading from manifest file: " << fileName;)
                 QString path = loadFromXml(dir.absoluteFilePath(fileName));
-                qDebug() << "ftu:: path from manifest: " << path;
+                QDEBUG("ftu:: path from manifest: " << path;)
                 if(!path.isEmpty())
                 {
                     dllNameList << path;
@@ -132,13 +132,13 @@
     int numberOfPlugins = settingsManager->readItemValue(
                                               numberOfPluginsKey).toInt(&ok);
 
-    qDebug() << "Ftu:FtuManifestParser reading the nbr of plugins resulted: "
-             << ok;
+    QDEBUG("Ftu:FtuManifestParser reading the nbr of plugins resulted: "
+             << ok;)
     
     if(ok)
     {
-        qDebug() << "Ftu:reading config for " << numberOfPlugins 
-                 << " plugins";
+    QDEBUG("Ftu:reading config for " << numberOfPlugins 
+                 << " plugins";)
         
         
         for(int i=1; i <= numberOfPlugins ; ++i)
@@ -149,7 +149,7 @@
             
             QString file = settingsManager->readItemValue(fileKey, 
                                    XQSettingsManager::TypeString).toString();
-            qDebug() << "Ftu:Reading filename from conf :" << file;            
+            QDEBUG("Ftu:Reading filename from conf :" << file;)            
             filesFromConf << file;
         }
     }
@@ -172,12 +172,12 @@
 QString FtuManifestParser::loadFromXml(const QString& aFileName)
 {
 
-    qDebug() << "ftu:: ManifestParser::loadFromXml " << aFileName;
+    QDEBUG("ftu:: ManifestParser::loadFromXml " << aFileName;)
     QFile file(aFileName);
     
     if(!file.exists())
     {
-        qDebug() << "ftu: file does not exist";
+        QDEBUG("ftu: file does not exist";)
         return QString();
     }
 
@@ -190,7 +190,7 @@
     QDomElement element = document.documentElement();
     if(element.tagName() != "plugin")
     {
-        qDebug() << "ftu: Tag name plugin not found";
+        QDEBUG("ftu: Tag name plugin not found";)
         return QString();
     }
 
@@ -200,7 +200,7 @@
     {
         element = plugins.at(i).toElement();
         QString attr = parseAttribute(element, "library");
-        qDebug() << "ftu::parsed attr " << attr;
+        QDEBUG("ftu::parsed attr " << attr;)
         return attr;
     }
     return QString();
@@ -217,7 +217,7 @@
     QDomAttr attribute = element.attributeNode(attributeName);
     if(attribute.isNull() || attribute.value().isEmpty())
     {
-        qDebug() << "ftu: attribute not parsed [attr name]" << attributeName;
+        QDEBUG("ftu: attribute not parsed [attr name]" << attributeName;)
         return QString();
     }
 
diff -r a84e691b1955 -r b73d0bdd62de wizardproviders/ftuwizardprovider/src/ftuwizardprovider.cpp
--- a/wizardproviders/ftuwizardprovider/src/ftuwizardprovider.cpp	Fri Jun 11 16:23:41 2010 +0100
+++ b/wizardproviders/ftuwizardprovider/src/ftuwizardprovider.cpp	Thu Jul 22 16:30:57 2010 +0100
@@ -18,7 +18,7 @@
 
 #include "ftuwizardprovider.h"
 #include "ftumanifestparser.h"
-
+#include "ftuwizardprovider_global.h"
 #include <ftuwizardfactory.h>
 
 #include <QDebug>
@@ -109,8 +109,8 @@
     
     if(ok)
     {
-        qDebug() << "Ftu:reading config for " << numberOfPlugins 
-                 << " plugins";
+        QDEBUG("Ftu:reading config for " << numberOfPlugins 
+                 << " plugins";)
         
         
         for(int i=1; i <= numberOfPlugins ; ++i)
@@ -121,7 +121,7 @@
             
             QString interface = settingsManager.readItemValue(fileKey,
                                     XQSettingsManager::TypeString).toString();
-            qDebug() << "Ftu:Reading interface name from conf :" << interface;
+            QDEBUG("Ftu:Reading interface name from conf :" << interface;)
             QObject* obj = serviceManager->loadInterface(interface);
             if(obj)
             {
@@ -140,17 +140,17 @@
 #else
     foreach (QString filename, pluginList) 
     {
-        qDebug () << "Ftu: Loading instance from : "<< filename;
+        QDEBUG("Ftu: Loading instance from : "<< filename;)
         QPluginLoader loader(pluginsDir.absoluteFilePath(filename));
         QObject* instance = loader.instance();
         if(instance)
         {
-            qDebug() << "ftu: instance loaded";
+            QDEBUG("ftu: instance loaded";)
             FtuWizardFactory* factory = qobject_cast<FtuWizardFactory*>
                                                     (instance);
             if(factory)
             {
-                qDebug() << "ftu: appending factory to list";
+                QDEBUG("ftu: appending factory to list";)
                 plugins.append(factory);
             }
         }