diff -Nru sync-monitor-0.1+15.04.20150113~rtm/accounts/applications/contacts-sync.application.in sync-monitor-0.1+15.04.20150127~rtm/accounts/applications/contacts-sync.application.in
--- sync-monitor-0.1+15.04.20150113~rtm/accounts/applications/contacts-sync.application.in	2015-01-13 14:19:36.000000000 +0000
+++ sync-monitor-0.1+15.04.20150127~rtm/accounts/applications/contacts-sync.application.in	2015-01-27 13:43:24.000000000 +0000
@@ -2,7 +2,7 @@
 <application id="contacts-sync">
   <_description>Contacts</_description>
   <desktop-entry>sync-monitor-contacts.desktop</desktop-entry>
-  <translations>contacts-sync</translations>
+  <translations>sync-monitor</translations>
 
   <service-types>
     <service-type id="contacts">
diff -Nru sync-monitor-0.1+15.04.20150113~rtm/accounts/services/google-caldav.service.in sync-monitor-0.1+15.04.20150127~rtm/accounts/services/google-caldav.service.in
--- sync-monitor-0.1+15.04.20150113~rtm/accounts/services/google-caldav.service.in	2015-01-13 14:19:36.000000000 +0000
+++ sync-monitor-0.1+15.04.20150127~rtm/accounts/services/google-caldav.service.in	2015-01-27 13:43:24.000000000 +0000
@@ -4,4 +4,5 @@
   <name>Google Calendar</name>
   <provider>google</provider>
   <icon>calendar</icon>
+  <translations>sync-monitor</translations>
 </service>
diff -Nru sync-monitor-0.1+15.04.20150113~rtm/accounts/services/google-carddav.service.in sync-monitor-0.1+15.04.20150127~rtm/accounts/services/google-carddav.service.in
--- sync-monitor-0.1+15.04.20150113~rtm/accounts/services/google-carddav.service.in	2015-01-13 14:19:36.000000000 +0000
+++ sync-monitor-0.1+15.04.20150127~rtm/accounts/services/google-carddav.service.in	2015-01-27 13:43:24.000000000 +0000
@@ -4,6 +4,7 @@
   <name>Google Contacts</name>
   <provider>google</provider>
   <icon>contacts-app</icon>
+  <translations>sync-monitor</translations>
 
   <!-- default settings (account settings have precedence over these) -->
   <template>
diff -Nru sync-monitor-0.1+15.04.20150113~rtm/CMakeLists.txt sync-monitor-0.1+15.04.20150127~rtm/CMakeLists.txt
--- sync-monitor-0.1+15.04.20150113~rtm/CMakeLists.txt	2015-01-13 14:19:36.000000000 +0000
+++ sync-monitor-0.1+15.04.20150127~rtm/CMakeLists.txt	2015-01-27 13:43:24.000000000 +0000
@@ -14,6 +14,7 @@
 pkg_check_modules(LIBNOTIFY libnotify)
 
 find_program(INTLTOOL_MERGE_EXECUTABLE intltool-merge)
+find_program(INTLTOOL_EXTRACT_EXECUTABLE intltool-extract)
 
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 set(CMAKE_AUTOMOC ON)
diff -Nru sync-monitor-0.1+15.04.20150113~rtm/debian/changelog sync-monitor-0.1+15.04.20150127~rtm/debian/changelog
--- sync-monitor-0.1+15.04.20150113~rtm/debian/changelog	2015-01-27 13:47:21.000000000 +0000
+++ sync-monitor-0.1+15.04.20150127~rtm/debian/changelog	2015-01-27 13:47:21.000000000 +0000
@@ -1,10 +1,24 @@
-sync-monitor (0.1+15.04.20150113~rtm-0ubuntu1) 14.09; urgency=low
+sync-monitor (0.1+15.04.20150127~rtm-0ubuntu1) 14.09; urgency=low
+
+  [ Ubuntu daily release ]
+  * New rebuild forced
 
   [ Renato Araujo Oliveira Filho ]
   * Use the new "startDate" filter to limit the number of events
     retrieved on the first calendar sync. (LP: #1339016)
 
- -- Ubuntu daily release <ps-jenkins@lists.canonical.com>  Tue, 13 Jan 2015 14:19:56 +0000
+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com>  Tue, 27 Jan 2015 13:43:48 +0000
+
+sync-monitor (0.1+15.04.20150121~rtm-0ubuntu1) 14.09; urgency=low
+
+  [ Ubuntu daily release ]
+  * New rebuild forced
+
+  [ Renato Araujo Oliveira Filho ]
+  * Add support for i18n (LP: #1350534)
+  * Fixed device online detection.
+
+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com>  Wed, 21 Jan 2015 18:05:47 +0000
 
 sync-monitor (0.1+15.04.20141106.1~rtm-0ubuntu1) 14.09; urgency=low
 
diff -Nru sync-monitor-0.1+15.04.20150113~rtm/po/CMakeLists.txt sync-monitor-0.1+15.04.20150127~rtm/po/CMakeLists.txt
--- sync-monitor-0.1+15.04.20150113~rtm/po/CMakeLists.txt	2015-01-13 14:19:36.000000000 +0000
+++ sync-monitor-0.1+15.04.20150127~rtm/po/CMakeLists.txt	2015-01-27 13:43:24.000000000 +0000
@@ -12,6 +12,14 @@
 file(GLOB_RECURSE I18N_SRCS RELATIVE ${CMAKE_SOURCE_DIR}
     ${CMAKE_SOURCE_DIR}/src/*.cpp
 )
+file(GLOB_RECURSE I18N_XMLS RELATIVE ${CMAKE_CURRENT_BINARY_DIR}
+    ${CMAKE_SOURCE_DIR}/accounts/applications/*.in
+)
+string(REPLACE "${CMAKE_SOURCE_DIR}/" "" RELATIVE_BUILD_DIR ${CMAKE_CURRENT_BINARY_DIR})
+foreach(XML_FILE ${I18N_XMLS})
+    get_filename_component(XML_BASE_NAME ${XML_FILE} NAME)
+    list(APPEND I18N_SRCS "${RELATIVE_BUILD_DIR}/tmp/${XML_BASE_NAME}.h")
+endforeach(XML_FILE)
 
 foreach(PO_FILE ${PO_FILES})
     get_filename_component(LANG ${PO_FILE} NAME_WE)
@@ -22,17 +30,18 @@
             RENAME ${DOMAIN}.mo)
 endforeach(PO_FILE)
 
-
 find_program(XGETTEXT_EXECUTABLE xgettext)
 if(XGETTEXT_EXECUTABLE)
     add_custom_target(${POT_FILE})
     add_custom_command(TARGET ${POT_FILE}
+        COMMAND ${INTLTOOL_EXTRACT_EXECUTABLE}
+                -l --type=gettext/xml ${I18N_XMLS}
         COMMAND ${XGETTEXT_EXECUTABLE} -o ${POT_FILE}
                 --c++ --qt --add-comments=TRANSLATORS
-                --keyword=_
+                --keyword=_ --keyword=N_
                 --package-name=${DOMAIN}
                 --copyright-holder='Canonical Ltd.'
                 -D ${CMAKE_SOURCE_DIR} -s
-                -p ${CMAKE_CURRENT_SOURCE_DIR}  ${I18N_SRCS}
+                -p ${CMAKE_CURRENT_SOURCE_DIR} ${I18N_SRCS}
     )
 endif()
diff -Nru sync-monitor-0.1+15.04.20150113~rtm/po/sync-monitor.pot sync-monitor-0.1+15.04.20150127~rtm/po/sync-monitor.pot
--- sync-monitor-0.1+15.04.20150113~rtm/po/sync-monitor.pot	1970-01-01 00:00:00.000000000 +0000
+++ sync-monitor-0.1+15.04.20150127~rtm/po/sync-monitor.pot	2015-01-27 13:43:24.000000000 +0000
@@ -0,0 +1,125 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR Canonical Ltd.
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: sync-monitor\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-11-13 10:43-0300\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: src/sync-daemon.cpp:378
+#, qt-format
+msgid "Account %1 removed. Do you want to keep the account data?"
+msgstr ""
+
+#: src/sync-account.cpp:532
+msgid "Command not allowed"
+msgstr ""
+
+#: src/sync-account.cpp:552
+msgid "Connection certificate has expired"
+msgstr ""
+
+#: src/sync-account.cpp:554
+msgid "Connection certificate is invalid"
+msgstr ""
+
+#: src/sync-account.cpp:550
+msgid "Connection timeout"
+msgstr ""
+
+#: qbuild/po/tmp/contacts-sync.application.in.h:1
+msgid "Contacts"
+msgstr ""
+
+#: src/sync-account.cpp:537
+msgid "Disk full"
+msgstr ""
+
+#: src/sync-account.cpp:558
+msgid "Fail to connect with the server"
+msgstr ""
+
+#: src/sync-account.cpp:541
+msgid "Fail to run \"two-way\" sync"
+msgstr ""
+
+#: src/sync-daemon.cpp:469
+#, qt-format
+msgid ""
+"Fail to sync %1 (%2).\n"
+"%3"
+msgstr ""
+
+#: src/sync-account.cpp:539
+msgid "Fail to sync due some remote problem"
+msgstr ""
+
+#: src/sync-account.cpp:543
+msgid "Fail to sync some items"
+msgstr ""
+
+#: src/sync-account.cpp:528
+msgid "Forbidden / access denied"
+msgstr ""
+
+#: src/notify-message.cpp:88
+msgid "No"
+msgstr ""
+
+#: src/sync-account.cpp:530
+msgid "Object not found / unassigned field"
+msgstr ""
+
+#: src/sync-account.cpp:545
+msgid "Process unexpected die."
+msgstr ""
+
+#: src/sync-account.cpp:535
+msgid "Proxy authentication required"
+msgstr ""
+
+#: src/sync-account.cpp:561
+msgid "Server not found"
+msgstr ""
+
+#: src/sync-account.cpp:548
+msgid "Server sent bad content"
+msgstr ""
+
+#: src/sync-daemon.cpp:409
+#, qt-format
+msgid "Start sync:  %1 (%2)"
+msgstr ""
+
+#: src/sync-daemon.cpp:433
+#, qt-format
+msgid "Sync done: %1 (%2)"
+msgstr ""
+
+#: src/sync-daemon.cpp:377 src/sync-daemon.cpp:408 src/sync-daemon.cpp:432
+#: src/sync-daemon.cpp:468
+msgid "Synchronization"
+msgstr ""
+
+#: qbuild/po/tmp/contacts-sync.application.in.h:2
+msgid "Synchronize your contacts"
+msgstr ""
+
+#: src/sync-account.cpp:563
+msgid "Unknown status"
+msgstr ""
+
+#: src/notify-message.cpp:83
+msgid "Yes"
+msgstr ""
diff -Nru sync-monitor-0.1+15.04.20150113~rtm/src/notify-message.cpp sync-monitor-0.1+15.04.20150127~rtm/src/notify-message.cpp
--- sync-monitor-0.1+15.04.20150113~rtm/src/notify-message.cpp	2015-01-13 14:19:36.000000000 +0000
+++ sync-monitor-0.1+15.04.20150127~rtm/src/notify-message.cpp	2015-01-27 13:43:24.000000000 +0000
@@ -17,6 +17,7 @@
  */
 
 #include "notify-message.h"
+#include "sync-i18n.h"
 
 #include <QtCore/QCoreApplication>
 #include <QtCore/QDebug>
@@ -79,12 +80,12 @@
                                         "x-canonical-non-shaped-icon",
                                         "true");
     notify_notification_add_action(m_notification,
-                                   "action_accept", "Yes",
+                                   "action_accept", _("Yes"),
                                    (NotifyActionCallback) NotifyMessage::onQuestionAccepted,
                                    this,
                                    NULL);
     notify_notification_add_action(m_notification,
-                                   "action_reject", "No",
+                                   "action_reject", _("No"),
                                    (NotifyActionCallback) NotifyMessage::onQuestionRejected,
                                    this,
                                    NULL);
diff -Nru sync-monitor-0.1+15.04.20150113~rtm/src/sync-daemon.cpp sync-monitor-0.1+15.04.20150127~rtm/src/sync-daemon.cpp
--- sync-monitor-0.1+15.04.20150113~rtm/src/sync-daemon.cpp	2015-01-13 14:19:36.000000000 +0000
+++ sync-monitor-0.1+15.04.20150127~rtm/src/sync-daemon.cpp	2015-01-27 13:43:24.000000000 +0000
@@ -52,7 +52,7 @@
     m_syncQueue = new SyncQueue();
     m_offlineQueue = new SyncQueue();
     m_networkStatus = new SyncNetwork(this);
-    connect(m_networkStatus, SIGNAL(onlineChanged(bool)), SLOT(onOnlineStatusChanged(bool)));
+    connect(m_networkStatus, SIGNAL(stateChanged(SyncNetwork::NetworkState)), SLOT(onOnlineStatusChanged(SyncNetwork::NetworkState)));
 
     m_timeout = new QTimer(this);
     m_timeout->setInterval(DAEMON_SYNC_TIMEOUT);
@@ -120,12 +120,12 @@
      }
 }
 
-void SyncDaemon::onOnlineStatusChanged(bool isOnline)
+void SyncDaemon::onOnlineStatusChanged(SyncNetwork::NetworkState state)
 {
-    Q_EMIT isOnlineChanged(isOnline);
-    if (isOnline) {
+    Q_EMIT isOnlineChanged(state != SyncNetwork::NetworkOffline);
+    if (state == SyncNetwork::NetworkOnline) {
         qDebug() << "Device is online sync pending changes" << m_offlineQueue->count();
-        m_syncQueue->push(m_offlineQueue->values());
+        m_syncQueue->push(*m_offlineQueue);
         m_offlineQueue->clear();
         if (!m_syncing && !m_syncQueue->isEmpty()) {
             qDebug() << "Will sync in" << DAEMON_SYNC_TIMEOUT / 1000 << "secs;";
@@ -134,10 +134,10 @@
         } else {
             qDebug() << "No change to sync";
         }
-    } else {
+    } else if (state == SyncNetwork::NetworkOffline) {
         qDebug() << "Device is offline cancel active syncs. There is a sync in progress?" << (m_currentAccount ? "Yes" : "No");
         if (m_currentAccount) {
-            m_offlineQueue->push(m_currentAccount, m_currentServiceName);
+            m_offlineQueue->push(m_currentAccount, m_currentServiceName, false);
             m_currentAccount->cancel(m_currentServiceName);
             qDebug() << "Current account pushed to late sync with sevice" << m_currentServiceName;
         }
@@ -152,6 +152,7 @@
 
 void SyncDaemon::syncAll(const QString &serviceName, bool runNow)
 {
+    // if runNow is set we will sync all accounts
     Q_FOREACH(SyncAccount *acc, m_accounts.values()) {
         if (serviceName.isEmpty()) {
             sync(acc, QString(), runNow);
@@ -172,27 +173,18 @@
     }
 }
 
-void SyncDaemon::sync(bool runNow)
-{
-    m_syncing = true;
-    if (runNow) {
-        m_timeout->stop();
-        continueSync();
-    } else {
-        // wait some time for new sync requests
-        m_timeout->start();
-    }
-}
-
 void SyncDaemon::continueSync()
 {
-    if (!m_networkStatus->isOnline()) {
+    SyncJob job = m_syncQueue->popNext();
+    SyncNetwork::NetworkState netState = m_networkStatus->state();
+    bool continueSync = (netState == SyncNetwork::NetworkOnline) ||
+                        (netState != SyncNetwork::NetworkOffline && job.runOnPayedConnection());
+    if (!continueSync) {
         qDebug() << "Device is offline we will skip the sync.";
-        m_offlineQueue->push(m_syncQueue->values());
+        m_offlineQueue->push(*m_syncQueue);
+        m_offlineQueue->push(job);
         m_syncQueue->clear();
-        m_currentAccount = 0;
-        m_syncing = false;
-        Q_EMIT done();
+        syncFinishedImpl();
         return;
     }
     m_syncing = true;
@@ -204,13 +196,16 @@
     m_eds->freezeNotify();
 
     // sync the next service on the queue
-    if (!m_aboutToQuit && !m_syncQueue->isEmpty()) {
-        m_currentServiceName = m_syncQueue->popNext(&m_currentAccount);
+    if (!m_aboutToQuit && job.isValid()) {
+        m_currentServiceName = job.serviceName();
+        m_currentAccount = job.account();
     } else {
         m_currentAccount = 0;
     }
 
     if (m_currentAccount) {
+        // remove sync reqeust from offline queue
+        m_offlineQueue->remove(m_currentAccount, m_currentServiceName);
         m_currentAccount->sync(m_currentServiceName);
     } else {
         syncFinishedImpl();
@@ -296,7 +291,7 @@
 
 bool SyncDaemon::isOnline() const
 {
-    return m_networkStatus->isOnline();
+    return m_networkStatus->state() != SyncNetwork::NetworkOffline;
 }
 
 void SyncDaemon::addAccount(const AccountId &accountId, bool startSync)
@@ -325,6 +320,18 @@
     }
 }
 
+void SyncDaemon::sync(bool runNow)
+{
+    m_syncing = true;
+    if (runNow) {
+        m_timeout->stop();
+        continueSync();
+    } else {
+        // wait some time for new sync requests
+        m_timeout->start();
+    }
+}
+
 void SyncDaemon::sync(SyncAccount *syncAcc, const QString &serviceName, bool runNow)
 {
     qDebug() << "syn requested for account:" << syncAcc->displayName() << serviceName;
@@ -334,10 +341,11 @@
         ((m_currentAccount == syncAcc) && (serviceName.isEmpty() || (serviceName == m_currentServiceName))) ) {
         qDebug() << "Account aready in the queue, ignore request;";
     } else {
-        qDebug() << "Pushed into queue with immediately sync?" << runNow;
-        m_syncQueue->push(syncAcc, serviceName);
+        qDebug() << "Pushed into queue with immediately sync?" << runNow << "Sync is running" << m_syncing;
+        m_syncQueue->push(syncAcc, serviceName, runNow);
         // if not syncing start a full sync
         if (!m_syncing) {
+            qDebug() << "Request sync";
             sync(runNow);
             Q_EMIT syncAboutToStart();
             return;
@@ -462,7 +470,7 @@
     // only re-sync if sync mode != "slow", to avoid sync loops
     if ((mode != "slow") && !errorMessage.isEmpty() && whiteListStatus.contains(status)) {
         // white list error retry the sync
-        m_syncQueue->push(acc, serviceName);
+        m_syncQueue->push(acc, serviceName, false);
     } else if (!errorMessage.isEmpty()) {
         NotifyMessage *notify = new NotifyMessage(true, this);
         notify->show(_("Synchronization"),
@@ -510,14 +518,16 @@
 
     // cancel all sync operation
     while(m_syncQueue->count()) {
-        SyncAccount *acc = m_syncQueue->popNext();
+        SyncJob job = m_syncQueue->popNext();
+        SyncAccount *acc = job.account();
         acc->cancel();
         acc->wait();
         delete acc;
     }
 
     while(m_offlineQueue->count()) {
-        SyncAccount *acc = m_syncQueue->popNext();
+        SyncJob job = m_offlineQueue->popNext();
+        SyncAccount *acc = job.account();
         acc->cancel();
         acc->wait();
         delete acc;
diff -Nru sync-monitor-0.1+15.04.20150113~rtm/src/sync-daemon.h sync-monitor-0.1+15.04.20150127~rtm/src/sync-daemon.h
--- sync-monitor-0.1+15.04.20150113~rtm/src/sync-daemon.h	2015-01-13 14:19:36.000000000 +0000
+++ sync-monitor-0.1+15.04.20150127~rtm/src/sync-daemon.h	2015-01-27 13:43:24.000000000 +0000
@@ -26,12 +26,13 @@
 
 #include <Accounts/Manager>
 
+#include "sync-network.h"
+
 class SyncAccount;
 class EdsHelper;
 class ProviderTemplate;
 class SyncQueue;
 class SyncDBus;
-class SyncNetwork;
 
 class SyncDaemon : public QObject
 {
@@ -74,7 +75,7 @@
     void onDataChanged(const QString &serviceName, const QString &sourceName);
     void onClientAttached();
 
-    void onOnlineStatusChanged(bool isOnline);
+    void onOnlineStatusChanged(SyncNetwork::NetworkState state);
 
 private:
     Accounts::Manager *m_manager;
diff -Nru sync-monitor-0.1+15.04.20150113~rtm/src/sync-network.cpp sync-monitor-0.1+15.04.20150127~rtm/src/sync-network.cpp
--- sync-monitor-0.1+15.04.20150113~rtm/src/sync-network.cpp	2015-01-13 14:19:36.000000000 +0000
+++ sync-monitor-0.1+15.04.20150127~rtm/src/sync-network.cpp	2015-01-27 13:43:24.000000000 +0000
@@ -1,51 +1,83 @@
 #include "sync-network.h"
 
 #include <QDebug>
+#include <QTimer>
 
 SyncNetwork::SyncNetwork(QObject *parent)
     : QObject(parent),
       m_configManager(new QNetworkConfigurationManager(this)),
-      m_isOnline(false)
+      m_state(SyncNetwork::NetworkOffline)
 {
     refresh();
+
+    connect(m_configManager.data(),
+            SIGNAL(onlineStateChanged(bool)),
+            SLOT(refresh()), Qt::QueuedConnection);
     connect(m_configManager.data(),
             SIGNAL(configurationAdded(QNetworkConfiguration)),
-            SLOT(refresh()));
+            SLOT(refresh()), Qt::QueuedConnection);
     connect(m_configManager.data(),
             SIGNAL(configurationChanged(QNetworkConfiguration)),
-            SLOT(refresh()));
+            SLOT(refresh()), Qt::QueuedConnection);
     connect(m_configManager.data(),
             SIGNAL(configurationRemoved(QNetworkConfiguration)),
-            SLOT(refresh()));
+            SLOT(refresh()), Qt::QueuedConnection);
+    connect(m_configManager.data(),
+            SIGNAL(updateCompleted()),
+            SLOT(refresh()), Qt::QueuedConnection);
+
+    m_idleRefresh.setSingleShot(true);
+    connect(&m_idleRefresh,
+            SIGNAL(timeout()),
+            SLOT(idleRefresh()));
 }
 
 SyncNetwork::~SyncNetwork()
 {
 }
 
-bool SyncNetwork::isOnline() const
+SyncNetwork::NetworkState SyncNetwork::state() const
 {
-    return m_isOnline;
+    return m_state;
+}
+
+void SyncNetwork::setState(SyncNetwork::NetworkState newState)
+{
+    if (m_state != newState) {
+        m_state = newState;
+        qDebug() << "Network state changed:" << (m_state == SyncNetwork::NetworkOffline ? "Offline" :
+                                                 m_state == SyncNetwork::NetworkPartialOnline ? "Partial online" : "Online");
+        Q_EMIT stateChanged(m_state);
+    }
 }
 
 void SyncNetwork::refresh()
 {
-    bool isOnline = m_configManager->isOnline();
+    m_idleRefresh.start(3000);
+}
+
+void SyncNetwork::idleRefresh()
+{
 
-    // Check if is connected in a wifi or network
+    // Check if is online
     QList<QNetworkConfiguration> activeConfigs = m_configManager->allConfigurations(QNetworkConfiguration::Active);
-    Q_FOREACH(const QNetworkConfiguration &config, activeConfigs) {
-        if ((config.bearerType() > 0) && (config.bearerType() <= QNetworkConfiguration::BearerWLAN)) {
-            isOnline = true;
-        } else {
-            // if the connection is not wifi or ethernet it will consider it as offline
-            isOnline = false;
+    SyncNetwork::NetworkState newState = SyncNetwork::NetworkOffline;
+    bool isOnline = activeConfigs.size() > 0;
+    if (isOnline) {
+        // Check if the connection is wifi or ethernet
+        QNetworkConfiguration defaultConfig = m_configManager->defaultConfiguration();
+        if (defaultConfig.isValid()) {
+            if ((defaultConfig.bearerType() == QNetworkConfiguration::BearerWLAN) ||
+                (defaultConfig.bearerType() == QNetworkConfiguration::BearerEthernet)) {
+                newState = SyncNetwork::NetworkOnline;
+            } else {
+                // if the connection is not wifi or ethernet it will consider it as offline
+                newState = SyncNetwork::NetworkPartialOnline;
+            }
         }
+        qDebug() << "New connection type:" << defaultConfig.bearerTypeName();
+    } else {
+        qDebug() << "Network is offline";
     }
-
-    if (m_isOnline != isOnline) {
-        m_isOnline = isOnline;
-        qDebug() << "Network state changed:" << (m_isOnline ? "Online" : "Offline");
-        Q_EMIT onlineChanged(m_isOnline);
-    }
+    setState(newState);
 }
diff -Nru sync-monitor-0.1+15.04.20150113~rtm/src/sync-network.h sync-monitor-0.1+15.04.20150127~rtm/src/sync-network.h
--- sync-monitor-0.1+15.04.20150113~rtm/src/sync-network.h	2015-01-13 14:19:36.000000000 +0000
+++ sync-monitor-0.1+15.04.20150127~rtm/src/sync-network.h	2015-01-27 13:43:24.000000000 +0000
@@ -20,29 +20,38 @@
 #define __SYNC_NETWORK_H__
 
 #include <QtCore/QScopedPointer>
+#include <QtCore/QTimer>
 #include <QtNetwork/QNetworkConfigurationManager>
 
 
 class SyncNetwork : public QObject
 {
     Q_OBJECT
-    Q_PROPERTY(bool online READ isOnline NOTIFY onlineChanged)
+    Q_PROPERTY(NetworkState state READ state NOTIFY stateChanged)
 
 public:
+    enum NetworkState {
+        NetworkOffline = 0,
+        NetworkPartialOnline,
+        NetworkOnline
+    };
     SyncNetwork(QObject *parent=0);
     ~SyncNetwork();
 
-    bool isOnline() const;
+    NetworkState state() const;
+    void setState(NetworkState newState);
 
 Q_SIGNALS:
-    void onlineChanged(bool isOnline);
+    void stateChanged(SyncNetwork::NetworkState state);
 
 private Q_SLOTS:
     void refresh();
+    void idleRefresh();
 
 private:
     QScopedPointer<QNetworkConfigurationManager> m_configManager;
-    bool m_isOnline;
+    NetworkState m_state;
+    QTimer m_idleRefresh;
 };
 
 #endif
diff -Nru sync-monitor-0.1+15.04.20150113~rtm/src/sync-queue.cpp sync-monitor-0.1+15.04.20150127~rtm/src/sync-queue.cpp
--- sync-monitor-0.1+15.04.20150113~rtm/src/sync-queue.cpp	2015-01-13 14:19:36.000000000 +0000
+++ sync-monitor-0.1+15.04.20150127~rtm/src/sync-queue.cpp	2015-01-27 13:43:24.000000000 +0000
@@ -21,110 +21,135 @@
 
 int SyncQueue::count() const
 {
-    QList<QStringList > values = m_queue.values();
-    int size = 0;
-    for(int i=0; i < values.size(); i++) {
-        size += values[i].size();
-    }
-    return size;
+    return m_jobs.count();
 }
 
 bool SyncQueue::isEmpty() const
 {
-    return m_queue.isEmpty();
+    return m_jobs.isEmpty();
 }
 
 void SyncQueue::clear()
 {
-    m_queue.clear();;
+    m_jobs.clear();;
 }
 
-QMap<SyncAccount *, QStringList> SyncQueue::values() const
+QList<SyncJob>  SyncQueue::jobs() const
 {
-    return m_queue;
+    return m_jobs;
 }
 
-void SyncQueue::push(SyncAccount *account, const QStringList &serviceNames)
+void SyncQueue::push(SyncAccount *account,
+                     const QStringList &serviceNames,
+                     bool syncOnPayedConnection)
 {
+    QStringList newServices;
     if (serviceNames.isEmpty()) {
-        m_queue.remove(account);
+        newServices = account->availableServices();
     } else {
-        m_queue.insert(account, serviceNames);
+        newServices = serviceNames;
+    }
+
+    Q_FOREACH(const QString &serviceName, newServices) {
+        SyncJob job(account, serviceName, syncOnPayedConnection);
+        push(job);
     }
 }
 
-void SyncQueue::push(SyncAccount *account, const QString &serviceName)
+void SyncQueue::push(SyncAccount *account,
+                     const QString &serviceName,
+                     bool syncOnPayedConnection)
 {
-    QStringList services = m_queue.value(account);
-    if (serviceName.isEmpty()) {
-        // empty serviceName means all services
-        services = account->availableServices();
-    } else if (!services.contains(serviceName)) {
-        services.push_back(serviceName);
+    QStringList services;
+    if (!serviceName.isEmpty()) {
+        services << serviceName;
     }
-    push(account, services);
+    push(account, services, syncOnPayedConnection);
 }
 
-void SyncQueue::push(const QMap<SyncAccount *, QStringList> &values)
+void SyncQueue::push(const SyncQueue &other)
 {
-    if (!values.isEmpty()) {
-        QMap<SyncAccount *, QStringList>::const_iterator i = values.constBegin();
-        while (i != values.constEnd()) {
-            push(i.key(), i.value());
-            i++;
-        }
+    Q_FOREACH(const SyncJob &job, other.jobs()) {
+        push(job);
     }
 }
 
-bool SyncQueue::contains(SyncAccount *account, const QString &serviceName) const
+void SyncQueue::push(const SyncJob &job)
 {
-    if (serviceName.isEmpty()) {
-        return m_queue.contains(account);
-    } else {
-        QStringList services = m_queue.value(account);
-        return services.contains(serviceName);
+    if (!contains(job)) {
+        m_jobs << job;
     }
 }
 
-QString SyncQueue::popNext(SyncAccount **account)
+bool SyncQueue::contains(const SyncJob &otherJob) const
 {
-    if (m_queue.isEmpty()) {
-        *account = 0;
-        return QString();
-    }
+    return contains(otherJob.account(), otherJob.serviceName());
+}
 
-    *account = m_queue.keys().first();
-    QStringList services = m_queue.value(*account);
-    QString nextService = *(services.begin());
-    if (services.size() == 1) {
-        m_queue.remove(*account);
-    } else {
-        services.removeOne(nextService);
-        m_queue.insert(*account, services);
+bool SyncQueue::contains(SyncAccount *account, const QString &serviceName) const
+{
+    Q_FOREACH(const SyncJob &job, m_jobs) {
+        if ((job.account() == account) &&
+            (serviceName.isEmpty() || (job.serviceName() == serviceName))) {
+            return true;
+        }
     }
-    return nextService;
+    return false;
 }
 
-SyncAccount *SyncQueue::popNext()
+SyncJob SyncQueue::popNext()
 {
-    SyncAccount *acc = m_queue.keys().first();
-    m_queue.remove(acc);
-    return acc;
+    if (m_jobs.isEmpty()) {
+        return SyncJob();
+    }
+    return m_jobs.takeFirst();
 }
 
 void SyncQueue::remove(SyncAccount *account, const QString &serviceName)
 {
-    if (serviceName.isEmpty()) {
-        m_queue.remove(account);
-    } else {
-        QStringList services = m_queue.value(account);
-        if (services.contains(serviceName)) {
-            if (services.size() == 1) {
-                m_queue.remove(account);
-            } else {
-                services.removeOne(serviceName);
-                m_queue.insert(account, services);
-            }
+    QList<SyncJob> newList = m_jobs;
+    for(int i=0; i < m_jobs.count(); i++) {
+        const SyncJob &job =  m_jobs[i];
+        if ((job.account() == account) &&
+            (serviceName.isEmpty() || (job.serviceName() == serviceName))) {
+                newList.removeOne(job);
         }
     }
+
+    m_jobs = newList;
+}
+
+
+SyncJob::SyncJob()
+{
+}
+
+SyncJob::SyncJob(SyncAccount *account, const QString &serviceName, bool runOnPayedConnection)
+    : m_account(account), m_serviceName(serviceName), m_runOnPayedConnection(runOnPayedConnection)
+{
+}
+
+SyncAccount *SyncJob::account() const
+{
+    return m_account;
+}
+
+QString SyncJob::serviceName() const
+{
+    return m_serviceName;
+}
+
+bool SyncJob::runOnPayedConnection() const
+{
+    return m_runOnPayedConnection;
+}
+
+bool SyncJob::operator==(const SyncJob &other) const
+{
+    return (m_account == other.account()) && (m_serviceName == other.serviceName());
+}
+
+bool SyncJob::isValid() const
+{
+    return ((m_account != 0) && !m_serviceName.isEmpty());
 }
diff -Nru sync-monitor-0.1+15.04.20150113~rtm/src/sync-queue.h sync-monitor-0.1+15.04.20150127~rtm/src/sync-queue.h
--- sync-monitor-0.1+15.04.20150113~rtm/src/sync-queue.h	2015-01-13 14:19:36.000000000 +0000
+++ sync-monitor-0.1+15.04.20150127~rtm/src/sync-queue.h	2015-01-27 13:43:24.000000000 +0000
@@ -25,24 +25,46 @@
 
 class SyncAccount;
 
+class SyncJob
+{
+public:
+    SyncJob();
+    SyncJob(SyncAccount *account, const QString &serviceName, bool runOnPayedConnection);
+
+    SyncAccount *account() const;
+    QString serviceName() const;
+    bool runOnPayedConnection() const;
+    bool operator==(const SyncJob &other) const;
+    bool isValid() const;
+
+private:
+    SyncAccount *m_account;
+    QString m_serviceName;
+    bool m_runOnPayedConnection;
+};
+
 class SyncQueue
 {
 public:
-    void push(SyncAccount *account, const QString &serviceName = QString());
-    void push(SyncAccount *account, const QStringList &serviceNames);
-    void push(const QMap<SyncAccount*, QStringList> &values);
-    QString popNext(SyncAccount **account);
-    SyncAccount *popNext();
-    void remove(SyncAccount *account, const QString &serviceName = QString());
+    SyncJob popNext();
+
+    void push(const SyncQueue &other);
+    void push(const SyncJob &job);
+    void push(SyncAccount *account, const QString &serviceName, bool syncOnPayedConnection);
+    void push(SyncAccount *account, const QStringList &serviceNames = QStringList(), bool syncOnPayedConnection = false);
 
+    bool contains(const SyncJob &otherJob) const;
     bool contains(SyncAccount *account, const QString &serviceName) const;
+
+    void remove(SyncAccount *account, const QString &serviceName = QString());
+
     int count() const;
     bool isEmpty() const;
     void clear();
-    QMap<SyncAccount*, QStringList> values() const;
+    QList<SyncJob> jobs() const;
 
 private:
-    QMap<SyncAccount*, QStringList> m_queue;
+    QList<SyncJob> m_jobs;
 };
 
 
diff -Nru sync-monitor-0.1+15.04.20150113~rtm/tests/unittest/sync-queue-test.cpp sync-monitor-0.1+15.04.20150127~rtm/tests/unittest/sync-queue-test.cpp
--- sync-monitor-0.1+15.04.20150113~rtm/tests/unittest/sync-queue-test.cpp	2015-01-13 14:19:36.000000000 +0000
+++ sync-monitor-0.1+15.04.20150127~rtm/tests/unittest/sync-queue-test.cpp	2015-01-27 13:43:24.000000000 +0000
@@ -31,6 +31,7 @@
     Q_OBJECT
 
 private Q_SLOTS:
+
     void testRegisterNewAccount()
     {
         QStringList expectedServices;
@@ -156,33 +157,28 @@
              .WillRepeatedly(::testing::Return(expectedServices));
 
         queue.push(&account);
-        queue.push(&account2);
-
-        SyncAccountMock *nextAccount;
-        QString serviceName;
+        queue.push(&account2,"", false);
 
         // account with contacts
-        serviceName = queue.popNext(reinterpret_cast<SyncAccount**>(&nextAccount));
-        QCOMPARE(serviceName, expectedServices.first());
-        QVERIFY(nextAccount == &account);
+        SyncJob job = queue.popNext();
+        QCOMPARE(job.serviceName(), expectedServices.first());
+        QVERIFY(job.account() == &account);
 
         // account with calendar
-        serviceName = queue.popNext(reinterpret_cast<SyncAccount**>(&nextAccount));
-        QCOMPARE(serviceName, expectedServices[1]);
-        QVERIFY(nextAccount == &account);
+        job = queue.popNext();
+        QCOMPARE(job.serviceName(), expectedServices[1]);
+        QVERIFY(job.account() == &account);
 
         // account2 with contacts
-        serviceName = queue.popNext(reinterpret_cast<SyncAccount**>(&nextAccount));
-        QCOMPARE(serviceName, expectedServices.first());
-        QVERIFY(nextAccount == &account2);
+        job = queue.popNext();
+        QCOMPARE(job.serviceName(), expectedServices.first());
+        QVERIFY(job.account() == &account2);
 
         // acount2 with calendar
-        serviceName = queue.popNext(reinterpret_cast<SyncAccount**>(&nextAccount));
-        QCOMPARE(serviceName, expectedServices[1]);
-        QVERIFY(nextAccount == &account2);
+        job = queue.popNext();
+        QCOMPARE(job.serviceName(), expectedServices[1]);
+        QVERIFY(job.account() == &account2);
     }
-
-
 };
 
 int main(int argc, char *argv[])