diff -Nru indicator-network-0.8.0+16.10.20160804/CMakeLists.txt indicator-network-0.8.0+16.10.20160817.2/CMakeLists.txt
--- indicator-network-0.8.0+16.10.20160804/CMakeLists.txt	2016-08-04 11:58:54.000000000 +0000
+++ indicator-network-0.8.0+16.10.20160817.2/CMakeLists.txt	2016-08-17 11:49:40.000000000 +0000
@@ -113,6 +113,7 @@
 add_subdirectory(po)
 add_subdirectory(doc)
 
+if(ENABLE_TESTS)
 enable_testing()
 add_subdirectory(tests)
 
@@ -138,6 +139,13 @@
     ${CMAKE_BINARY_DIR}/*
 )
 
+else()
+
+# The autopilot tests need this fixture
+add_subdirectory(tests/data)
+
+endif()
+
 endif()
 
 add_subdirectory(scripts)
diff -Nru indicator-network-0.8.0+16.10.20160804/debian/changelog indicator-network-0.8.0+16.10.20160817.2/debian/changelog
--- indicator-network-0.8.0+16.10.20160804/debian/changelog	2016-08-23 10:36:01.000000000 +0000
+++ indicator-network-0.8.0+16.10.20160817.2/debian/changelog	2016-08-23 10:36:01.000000000 +0000
@@ -1,3 +1,14 @@
+indicator-network (0.8.0+16.10.20160817.2-0ubuntu1) yakkety; urgency=medium
+
+  [ Antti Kaijanmäki ]
+  * Use a timer to set the sim for mobile data if only one sim exists.
+    (LP: #1598010)
+
+  [ Pete Woods ]
+  * Re-enable tests on all architectures (LP: #1612619)
+
+ -- Pete Woods <pete.woods@canonical.com>  Wed, 17 Aug 2016 11:50:15 +0000
+
 indicator-network (0.8.0+16.10.20160804-0ubuntu1) yakkety; urgency=medium
 
   [ Antti Kaijanmäki ]
diff -Nru indicator-network-0.8.0+16.10.20160804/debian/rules indicator-network-0.8.0+16.10.20160817.2/debian/rules
--- indicator-network-0.8.0+16.10.20160804/debian/rules	2016-08-23 10:36:01.000000000 +0000
+++ indicator-network-0.8.0+16.10.20160817.2/debian/rules	2016-08-23 10:36:01.000000000 +0000
@@ -7,13 +7,17 @@
 
 export DPKG_GENSYMBOLS_CHECK_LEVEL = 4
 
+ifneq (,$(filter $(DEB_HOST_ARCH),arm64 s390x powerpc))
+        ENABLE_TESTS = OFF
+else
+        ENABLE_TESTS = ON
+endif
+
 %:
 	dh $@ --parallel --fail-missing --with python3
 
-ifneq (,filter(s390x ,$(DEB_HOST_ARCH)))
-override_dh_auto_test:
-	dh_auto_test || true
-endif
+override_dh_auto_configure:
+	dh_auto_configure -- -DENABLE_TESTS=${ENABLE_TESTS}
 
 override_dh_install:
 	cd tests/autopilot; \
diff -Nru indicator-network-0.8.0+16.10.20160804/po/am.po indicator-network-0.8.0+16.10.20160817.2/po/am.po
--- indicator-network-0.8.0+16.10.20160804/po/am.po	2016-08-04 11:58:54.000000000 +0000
+++ indicator-network-0.8.0+16.10.20160817.2/po/am.po	2016-08-17 11:49:25.000000000 +0000
@@ -8,15 +8,15 @@
 "Project-Id-Version: indicator-network\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-04-29 12:38+0300\n"
-"PO-Revision-Date: 2016-02-15 17:40+0000\n"
+"PO-Revision-Date: 2016-08-14 14:18+0000\n"
 "Last-Translator: samson <Unknown>\n"
 "Language-Team: Amharic <am@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Launchpad-Export-Date: 2016-07-27 06:47+0000\n"
-"X-Generator: Launchpad (build 18153)\n"
+"X-Launchpad-Export-Date: 2016-08-15 05:48+0000\n"
+"X-Generator: Launchpad (build 18169)\n"
 "Language: am\n"
 
 #: ../src/agent/SecretRequest.cpp:61
@@ -92,7 +92,7 @@
 
 #: ../src/indicator/factory.cpp:208
 msgid "Cellular data"
-msgstr ""
+msgstr "ሴሉላር ዳታ"
 
 #. TODO Move this into a new class
 #: ../src/indicator/factory.cpp:221
diff -Nru indicator-network-0.8.0+16.10.20160804/po/ar.po indicator-network-0.8.0+16.10.20160817.2/po/ar.po
--- indicator-network-0.8.0+16.10.20160804/po/ar.po	2016-08-04 11:58:54.000000000 +0000
+++ indicator-network-0.8.0+16.10.20160817.2/po/ar.po	2016-08-17 11:49:25.000000000 +0000
@@ -16,8 +16,8 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n % 100 >= "
 "3 && n % 100 <= 10 ? 3 : n % 100 >= 11 && n % 100 <= 99 ? 4 : 5;\n"
-"X-Launchpad-Export-Date: 2016-07-27 06:47+0000\n"
-"X-Generator: Launchpad (build 18153)\n"
+"X-Launchpad-Export-Date: 2016-08-13 06:16+0000\n"
+"X-Generator: Launchpad (build 18169)\n"
 "Language: ar\n"
 
 #: ../src/agent/SecretRequest.cpp:61
diff -Nru indicator-network-0.8.0+16.10.20160804/po/ast.po indicator-network-0.8.0+16.10.20160817.2/po/ast.po
--- indicator-network-0.8.0+16.10.20160804/po/ast.po	2016-08-04 11:58:54.000000000 +0000
+++ indicator-network-0.8.0+16.10.20160817.2/po/ast.po	2016-08-17 11:49:25.000000000 +0000
@@ -15,8 +15,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2016-07-27 06:47+0000\n"
-"X-Generator: Launchpad (build 18153)\n"
+"X-Launchpad-Export-Date: 2016-08-13 06:16+0000\n"
+"X-Generator: Launchpad (build 18169)\n"
 "Language: ast\n"
 
 #: ../src/agent/SecretRequest.cpp:61
diff -Nru indicator-network-0.8.0+16.10.20160804/po/az.po indicator-network-0.8.0+16.10.20160817.2/po/az.po
--- indicator-network-0.8.0+16.10.20160804/po/az.po	2016-08-04 11:58:54.000000000 +0000
+++ indicator-network-0.8.0+16.10.20160817.2/po/az.po	2016-08-17 11:49:25.000000000 +0000
@@ -15,8 +15,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2016-07-27 06:47+0000\n"
-"X-Generator: Launchpad (build 18153)\n"
+"X-Launchpad-Export-Date: 2016-08-13 06:16+0000\n"
+"X-Generator: Launchpad (build 18169)\n"
 "Language: az\n"
 
 #: ../src/agent/SecretRequest.cpp:61
diff -Nru indicator-network-0.8.0+16.10.20160804/po/be.po indicator-network-0.8.0+16.10.20160817.2/po/be.po
--- indicator-network-0.8.0+16.10.20160804/po/be.po	2016-08-04 11:58:54.000000000 +0000
+++ indicator-network-0.8.0+16.10.20160817.2/po/be.po	2016-08-17 11:49:25.000000000 +0000
@@ -16,8 +16,8 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
 "n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-"X-Launchpad-Export-Date: 2016-07-27 06:47+0000\n"
-"X-Generator: Launchpad (build 18153)\n"
+"X-Launchpad-Export-Date: 2016-08-13 06:16+0000\n"
+"X-Generator: Launchpad (build 18169)\n"
 "Language: be\n"
 
 #: ../src/agent/SecretRequest.cpp:61
diff -Nru indicator-network-0.8.0+16.10.20160804/po/bg.po indicator-network-0.8.0+16.10.20160817.2/po/bg.po
--- indicator-network-0.8.0+16.10.20160804/po/bg.po	2016-08-04 11:58:54.000000000 +0000
+++ indicator-network-0.8.0+16.10.20160817.2/po/bg.po	2016-08-17 11:49:25.000000000 +0000
@@ -15,8 +15,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2016-07-27 06:47+0000\n"
-"X-Generator: Launchpad (build 18153)\n"
+"X-Launchpad-Export-Date: 2016-08-13 06:17+0000\n"
+"X-Generator: Launchpad (build 18169)\n"
 "Language: bg\n"
 
 #: ../src/agent/SecretRequest.cpp:61
diff -Nru indicator-network-0.8.0+16.10.20160804/po/br.po indicator-network-0.8.0+16.10.20160817.2/po/br.po
--- indicator-network-0.8.0+16.10.20160804/po/br.po	2016-08-04 11:58:54.000000000 +0000
+++ indicator-network-0.8.0+16.10.20160817.2/po/br.po	2016-08-17 11:49:25.000000000 +0000
@@ -15,8 +15,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Launchpad-Export-Date: 2016-07-27 06:47+0000\n"
-"X-Generator: Launchpad (build 18153)\n"
+"X-Launchpad-Export-Date: 2016-08-13 06:16+0000\n"
+"X-Generator: Launchpad (build 18169)\n"
 "Language: br\n"
 
 #: ../src/agent/SecretRequest.cpp:61
diff -Nru indicator-network-0.8.0+16.10.20160804/po/bs.po indicator-network-0.8.0+16.10.20160817.2/po/bs.po
--- indicator-network-0.8.0+16.10.20160804/po/bs.po	2016-08-04 11:58:54.000000000 +0000
+++ indicator-network-0.8.0+16.10.20160817.2/po/bs.po	2016-08-17 11:49:25.000000000 +0000
@@ -16,8 +16,8 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
 "n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2016-07-27 06:47+0000\n"
-"X-Generator: Launchpad (build 18153)\n"
+"X-Launchpad-Export-Date: 2016-08-13 06:16+0000\n"
+"X-Generator: Launchpad (build 18169)\n"
 "Language: bs\n"
 
 #: ../src/agent/SecretRequest.cpp:61
diff -Nru indicator-network-0.8.0+16.10.20160804/po/ca.po indicator-network-0.8.0+16.10.20160817.2/po/ca.po
--- indicator-network-0.8.0+16.10.20160804/po/ca.po	2016-08-04 11:58:54.000000000 +0000
+++ indicator-network-0.8.0+16.10.20160817.2/po/ca.po	2016-08-17 11:49:25.000000000 +0000
@@ -15,8 +15,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2016-07-27 06:47+0000\n"
-"X-Generator: Launchpad (build 18153)\n"
+"X-Launchpad-Export-Date: 2016-08-13 06:17+0000\n"
+"X-Generator: Launchpad (build 18169)\n"
 "Language: ca\n"
 
 #: ../src/agent/SecretRequest.cpp:61
diff -Nru indicator-network-0.8.0+16.10.20160804/po/ca@valencia.po indicator-network-0.8.0+16.10.20160817.2/po/ca@valencia.po
--- indicator-network-0.8.0+16.10.20160804/po/ca@valencia.po	2016-08-04 11:58:54.000000000 +0000
+++ indicator-network-0.8.0+16.10.20160817.2/po/ca@valencia.po	2016-08-17 11:49:25.000000000 +0000
@@ -15,8 +15,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2016-07-27 06:48+0000\n"
-"X-Generator: Launchpad (build 18153)\n"
+"X-Launchpad-Export-Date: 2016-08-13 06:17+0000\n"
+"X-Generator: Launchpad (build 18169)\n"
 "Language: ca\n"
 
 #: ../src/agent/SecretRequest.cpp:61
diff -Nru indicator-network-0.8.0+16.10.20160804/po/ckb.po indicator-network-0.8.0+16.10.20160817.2/po/ckb.po
--- indicator-network-0.8.0+16.10.20160804/po/ckb.po	2016-08-04 11:58:54.000000000 +0000
+++ indicator-network-0.8.0+16.10.20160817.2/po/ckb.po	2016-08-17 11:49:25.000000000 +0000
@@ -15,8 +15,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2016-07-27 06:48+0000\n"
-"X-Generator: Launchpad (build 18153)\n"
+"X-Launchpad-Export-Date: 2016-08-13 06:17+0000\n"
+"X-Generator: Launchpad (build 18169)\n"
 "Language: \n"
 
 #: ../src/agent/SecretRequest.cpp:61
diff -Nru indicator-network-0.8.0+16.10.20160804/po/cs.po indicator-network-0.8.0+16.10.20160817.2/po/cs.po
--- indicator-network-0.8.0+16.10.20160804/po/cs.po	2016-08-04 11:58:54.000000000 +0000
+++ indicator-network-0.8.0+16.10.20160817.2/po/cs.po	2016-08-17 11:49:25.000000000 +0000
@@ -15,8 +15,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2016-07-27 06:47+0000\n"
-"X-Generator: Launchpad (build 18153)\n"
+"X-Launchpad-Export-Date: 2016-08-13 06:17+0000\n"
+"X-Generator: Launchpad (build 18169)\n"
 "Language: cs\n"
 
 #: ../src/agent/SecretRequest.cpp:61
diff -Nru indicator-network-0.8.0+16.10.20160804/po/cy.po indicator-network-0.8.0+16.10.20160817.2/po/cy.po
--- indicator-network-0.8.0+16.10.20160804/po/cy.po	2016-08-04 11:58:54.000000000 +0000
+++ indicator-network-0.8.0+16.10.20160817.2/po/cy.po	2016-08-17 11:49:25.000000000 +0000
@@ -16,8 +16,8 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=4; plural=n==1 ? 0 : n==2 ? 1 : (n != 8 && n != 11) ? "
 "2 : 3;\n"
-"X-Launchpad-Export-Date: 2016-07-27 06:48+0000\n"
-"X-Generator: Launchpad (build 18153)\n"
+"X-Launchpad-Export-Date: 2016-08-13 06:17+0000\n"
+"X-Generator: Launchpad (build 18169)\n"
 "Language: cy\n"
 
 #: ../src/agent/SecretRequest.cpp:61
diff -Nru indicator-network-0.8.0+16.10.20160804/po/da.po indicator-network-0.8.0+16.10.20160817.2/po/da.po
--- indicator-network-0.8.0+16.10.20160804/po/da.po	2016-08-04 11:58:54.000000000 +0000
+++ indicator-network-0.8.0+16.10.20160817.2/po/da.po	2016-08-17 11:49:25.000000000 +0000
@@ -16,8 +16,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2016-07-27 06:47+0000\n"
-"X-Generator: Launchpad (build 18153)\n"
+"X-Launchpad-Export-Date: 2016-08-13 06:17+0000\n"
+"X-Generator: Launchpad (build 18169)\n"
 "Language: da\n"
 
 #: ../src/agent/SecretRequest.cpp:61
diff -Nru indicator-network-0.8.0+16.10.20160804/po/de.po indicator-network-0.8.0+16.10.20160817.2/po/de.po
--- indicator-network-0.8.0+16.10.20160804/po/de.po	2016-08-04 11:58:54.000000000 +0000
+++ indicator-network-0.8.0+16.10.20160817.2/po/de.po	2016-08-17 11:49:25.000000000 +0000
@@ -15,8 +15,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2016-07-27 06:47+0000\n"
-"X-Generator: Launchpad (build 18153)\n"
+"X-Launchpad-Export-Date: 2016-08-13 06:17+0000\n"
+"X-Generator: Launchpad (build 18169)\n"
 "Language: de\n"
 
 #: ../src/agent/SecretRequest.cpp:61
diff -Nru indicator-network-0.8.0+16.10.20160804/po/el.po indicator-network-0.8.0+16.10.20160817.2/po/el.po
--- indicator-network-0.8.0+16.10.20160804/po/el.po	2016-08-04 11:58:54.000000000 +0000
+++ indicator-network-0.8.0+16.10.20160817.2/po/el.po	2016-08-17 11:49:25.000000000 +0000
@@ -15,8 +15,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2016-07-27 06:47+0000\n"
-"X-Generator: Launchpad (build 18153)\n"
+"X-Launchpad-Export-Date: 2016-08-13 06:17+0000\n"
+"X-Generator: Launchpad (build 18169)\n"
 "Language: el\n"
 
 #: ../src/agent/SecretRequest.cpp:61
diff -Nru indicator-network-0.8.0+16.10.20160804/po/en_AU.po indicator-network-0.8.0+16.10.20160817.2/po/en_AU.po
--- indicator-network-0.8.0+16.10.20160804/po/en_AU.po	2016-08-04 11:58:54.000000000 +0000
+++ indicator-network-0.8.0+16.10.20160817.2/po/en_AU.po	2016-08-17 11:49:25.000000000 +0000
@@ -15,8 +15,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2016-07-27 06:48+0000\n"
-"X-Generator: Launchpad (build 18153)\n"
+"X-Launchpad-Export-Date: 2016-08-13 06:17+0000\n"
+"X-Generator: Launchpad (build 18169)\n"
 "Language: \n"
 
 #: ../src/agent/SecretRequest.cpp:61
diff -Nru indicator-network-0.8.0+16.10.20160804/po/en_GB.po indicator-network-0.8.0+16.10.20160817.2/po/en_GB.po
--- indicator-network-0.8.0+16.10.20160804/po/en_GB.po	2016-08-04 11:58:54.000000000 +0000
+++ indicator-network-0.8.0+16.10.20160817.2/po/en_GB.po	2016-08-17 11:49:25.000000000 +0000
@@ -15,8 +15,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2016-07-27 06:48+0000\n"
-"X-Generator: Launchpad (build 18153)\n"
+"X-Launchpad-Export-Date: 2016-08-13 06:17+0000\n"
+"X-Generator: Launchpad (build 18169)\n"
 "Language: \n"
 
 #: ../src/agent/SecretRequest.cpp:61
diff -Nru indicator-network-0.8.0+16.10.20160804/po/eo.po indicator-network-0.8.0+16.10.20160817.2/po/eo.po
--- indicator-network-0.8.0+16.10.20160804/po/eo.po	2016-08-04 11:58:54.000000000 +0000
+++ indicator-network-0.8.0+16.10.20160817.2/po/eo.po	2016-08-17 11:49:25.000000000 +0000
@@ -15,8 +15,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2016-07-27 06:47+0000\n"
-"X-Generator: Launchpad (build 18153)\n"
+"X-Launchpad-Export-Date: 2016-08-13 06:17+0000\n"
+"X-Generator: Launchpad (build 18169)\n"
 "Language: eo\n"
 
 #: ../src/agent/SecretRequest.cpp:61
diff -Nru indicator-network-0.8.0+16.10.20160804/po/es.po indicator-network-0.8.0+16.10.20160817.2/po/es.po
--- indicator-network-0.8.0+16.10.20160804/po/es.po	2016-08-04 11:58:54.000000000 +0000
+++ indicator-network-0.8.0+16.10.20160817.2/po/es.po	2016-08-17 11:49:25.000000000 +0000
@@ -15,8 +15,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2016-07-27 06:48+0000\n"
-"X-Generator: Launchpad (build 18153)\n"
+"X-Launchpad-Export-Date: 2016-08-13 06:17+0000\n"
+"X-Generator: Launchpad (build 18169)\n"
 "Language: es\n"
 
 #: ../src/agent/SecretRequest.cpp:61
diff -Nru indicator-network-0.8.0+16.10.20160804/po/eu.po indicator-network-0.8.0+16.10.20160817.2/po/eu.po
--- indicator-network-0.8.0+16.10.20160804/po/eu.po	2016-08-04 11:58:54.000000000 +0000
+++ indicator-network-0.8.0+16.10.20160817.2/po/eu.po	2016-08-17 11:49:25.000000000 +0000
@@ -15,8 +15,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2016-07-27 06:47+0000\n"
-"X-Generator: Launchpad (build 18153)\n"
+"X-Launchpad-Export-Date: 2016-08-13 06:16+0000\n"
+"X-Generator: Launchpad (build 18169)\n"
 "Language: eu\n"
 
 #: ../src/agent/SecretRequest.cpp:61
diff -Nru indicator-network-0.8.0+16.10.20160804/po/fa.po indicator-network-0.8.0+16.10.20160817.2/po/fa.po
--- indicator-network-0.8.0+16.10.20160804/po/fa.po	2016-08-04 11:58:54.000000000 +0000
+++ indicator-network-0.8.0+16.10.20160817.2/po/fa.po	2016-08-17 11:49:25.000000000 +0000
@@ -15,8 +15,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2016-07-27 06:48+0000\n"
-"X-Generator: Launchpad (build 18153)\n"
+"X-Launchpad-Export-Date: 2016-08-13 06:17+0000\n"
+"X-Generator: Launchpad (build 18169)\n"
 "Language: fa\n"
 
 #: ../src/agent/SecretRequest.cpp:61
diff -Nru indicator-network-0.8.0+16.10.20160804/po/fi.po indicator-network-0.8.0+16.10.20160817.2/po/fi.po
--- indicator-network-0.8.0+16.10.20160804/po/fi.po	2016-08-04 11:58:54.000000000 +0000
+++ indicator-network-0.8.0+16.10.20160817.2/po/fi.po	2016-08-17 11:49:25.000000000 +0000
@@ -15,8 +15,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2016-07-27 06:47+0000\n"
-"X-Generator: Launchpad (build 18153)\n"
+"X-Launchpad-Export-Date: 2016-08-13 06:17+0000\n"
+"X-Generator: Launchpad (build 18169)\n"
 "Language: fi\n"
 
 #: ../src/agent/SecretRequest.cpp:61
diff -Nru indicator-network-0.8.0+16.10.20160804/po/fr_CA.po indicator-network-0.8.0+16.10.20160817.2/po/fr_CA.po
--- indicator-network-0.8.0+16.10.20160804/po/fr_CA.po	2016-08-04 11:58:54.000000000 +0000
+++ indicator-network-0.8.0+16.10.20160817.2/po/fr_CA.po	2016-08-17 11:49:25.000000000 +0000
@@ -15,8 +15,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Launchpad-Export-Date: 2016-07-27 06:48+0000\n"
-"X-Generator: Launchpad (build 18153)\n"
+"X-Launchpad-Export-Date: 2016-08-13 06:17+0000\n"
+"X-Generator: Launchpad (build 18169)\n"
 "Language: \n"
 
 #: ../src/agent/SecretRequest.cpp:61
diff -Nru indicator-network-0.8.0+16.10.20160804/po/fr.po indicator-network-0.8.0+16.10.20160817.2/po/fr.po
--- indicator-network-0.8.0+16.10.20160804/po/fr.po	2016-08-04 11:58:54.000000000 +0000
+++ indicator-network-0.8.0+16.10.20160817.2/po/fr.po	2016-08-17 11:49:25.000000000 +0000
@@ -15,8 +15,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Launchpad-Export-Date: 2016-07-27 06:47+0000\n"
-"X-Generator: Launchpad (build 18153)\n"
+"X-Launchpad-Export-Date: 2016-08-13 06:17+0000\n"
+"X-Generator: Launchpad (build 18169)\n"
 "Language: fr\n"
 
 #: ../src/agent/SecretRequest.cpp:61
diff -Nru indicator-network-0.8.0+16.10.20160804/po/gd.po indicator-network-0.8.0+16.10.20160817.2/po/gd.po
--- indicator-network-0.8.0+16.10.20160804/po/gd.po	2016-08-04 11:58:54.000000000 +0000
+++ indicator-network-0.8.0+16.10.20160817.2/po/gd.po	2016-08-17 11:49:25.000000000 +0000
@@ -16,8 +16,8 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=4; plural=(n==1 || n==11) ? 0 : (n==2 || n==12) ? 1 : "
 "(n > 2 && n < 20) ? 2 : 3;\n"
-"X-Launchpad-Export-Date: 2016-07-27 06:47+0000\n"
-"X-Generator: Launchpad (build 18153)\n"
+"X-Launchpad-Export-Date: 2016-08-13 06:17+0000\n"
+"X-Generator: Launchpad (build 18169)\n"
 "Language: gd\n"
 
 #: ../src/agent/SecretRequest.cpp:61
diff -Nru indicator-network-0.8.0+16.10.20160804/po/gl.po indicator-network-0.8.0+16.10.20160817.2/po/gl.po
--- indicator-network-0.8.0+16.10.20160804/po/gl.po	2016-08-04 11:58:54.000000000 +0000
+++ indicator-network-0.8.0+16.10.20160817.2/po/gl.po	2016-08-17 11:49:25.000000000 +0000
@@ -15,8 +15,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2016-07-27 06:47+0000\n"
-"X-Generator: Launchpad (build 18153)\n"
+"X-Launchpad-Export-Date: 2016-08-13 06:17+0000\n"
+"X-Generator: Launchpad (build 18169)\n"
 "Language: gl\n"
 
 #: ../src/agent/SecretRequest.cpp:61
diff -Nru indicator-network-0.8.0+16.10.20160804/po/he.po indicator-network-0.8.0+16.10.20160817.2/po/he.po
--- indicator-network-0.8.0+16.10.20160804/po/he.po	2016-08-04 11:58:54.000000000 +0000
+++ indicator-network-0.8.0+16.10.20160817.2/po/he.po	2016-08-17 11:49:25.000000000 +0000
@@ -15,8 +15,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2016-07-27 06:47+0000\n"
-"X-Generator: Launchpad (build 18153)\n"
+"X-Launchpad-Export-Date: 2016-08-13 06:17+0000\n"
+"X-Generator: Launchpad (build 18169)\n"
 "Language: he\n"
 
 #: ../src/agent/SecretRequest.cpp:61
diff -Nru indicator-network-0.8.0+16.10.20160804/po/hr.po indicator-network-0.8.0+16.10.20160817.2/po/hr.po
--- indicator-network-0.8.0+16.10.20160804/po/hr.po	2016-08-04 11:58:54.000000000 +0000
+++ indicator-network-0.8.0+16.10.20160817.2/po/hr.po	2016-08-17 11:49:25.000000000 +0000
@@ -16,8 +16,8 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
 "n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2016-07-27 06:48+0000\n"
-"X-Generator: Launchpad (build 18153)\n"
+"X-Launchpad-Export-Date: 2016-08-13 06:17+0000\n"
+"X-Generator: Launchpad (build 18169)\n"
 "Language: hr\n"
 
 #: ../src/agent/SecretRequest.cpp:61
diff -Nru indicator-network-0.8.0+16.10.20160804/po/hu.po indicator-network-0.8.0+16.10.20160817.2/po/hu.po
--- indicator-network-0.8.0+16.10.20160804/po/hu.po	2016-08-04 11:58:54.000000000 +0000
+++ indicator-network-0.8.0+16.10.20160817.2/po/hu.po	2016-08-17 11:49:25.000000000 +0000
@@ -15,8 +15,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2016-07-27 06:47+0000\n"
-"X-Generator: Launchpad (build 18153)\n"
+"X-Launchpad-Export-Date: 2016-08-13 06:17+0000\n"
+"X-Generator: Launchpad (build 18169)\n"
 "Language: hu\n"
 
 #: ../src/agent/SecretRequest.cpp:61
diff -Nru indicator-network-0.8.0+16.10.20160804/po/ia.po indicator-network-0.8.0+16.10.20160817.2/po/ia.po
--- indicator-network-0.8.0+16.10.20160804/po/ia.po	2016-08-04 11:58:54.000000000 +0000
+++ indicator-network-0.8.0+16.10.20160817.2/po/ia.po	2016-08-17 11:49:25.000000000 +0000
@@ -15,8 +15,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2016-07-27 06:47+0000\n"
-"X-Generator: Launchpad (build 18153)\n"
+"X-Launchpad-Export-Date: 2016-08-13 06:17+0000\n"
+"X-Generator: Launchpad (build 18169)\n"
 "Language: ia\n"
 
 #: ../src/agent/SecretRequest.cpp:61
diff -Nru indicator-network-0.8.0+16.10.20160804/po/id.po indicator-network-0.8.0+16.10.20160817.2/po/id.po
--- indicator-network-0.8.0+16.10.20160804/po/id.po	2016-08-04 11:58:54.000000000 +0000
+++ indicator-network-0.8.0+16.10.20160817.2/po/id.po	2016-08-17 11:49:25.000000000 +0000
@@ -15,8 +15,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2016-07-27 06:47+0000\n"
-"X-Generator: Launchpad (build 18153)\n"
+"X-Launchpad-Export-Date: 2016-08-13 06:17+0000\n"
+"X-Generator: Launchpad (build 18169)\n"
 "Language: id\n"
 
 #: ../src/agent/SecretRequest.cpp:61
diff -Nru indicator-network-0.8.0+16.10.20160804/po/is.po indicator-network-0.8.0+16.10.20160817.2/po/is.po
--- indicator-network-0.8.0+16.10.20160804/po/is.po	2016-08-04 11:58:54.000000000 +0000
+++ indicator-network-0.8.0+16.10.20160817.2/po/is.po	2016-08-17 11:49:25.000000000 +0000
@@ -17,8 +17,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2016-07-27 06:47+0000\n"
-"X-Generator: Launchpad (build 18153)\n"
+"X-Launchpad-Export-Date: 2016-08-13 06:17+0000\n"
+"X-Generator: Launchpad (build 18169)\n"
 "Language: is\n"
 
 #: ../src/agent/SecretRequest.cpp:61
diff -Nru indicator-network-0.8.0+16.10.20160804/po/it.po indicator-network-0.8.0+16.10.20160817.2/po/it.po
--- indicator-network-0.8.0+16.10.20160804/po/it.po	2016-08-04 11:58:54.000000000 +0000
+++ indicator-network-0.8.0+16.10.20160817.2/po/it.po	2016-08-17 11:49:25.000000000 +0000
@@ -15,8 +15,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2016-07-27 06:47+0000\n"
-"X-Generator: Launchpad (build 18153)\n"
+"X-Launchpad-Export-Date: 2016-08-13 06:17+0000\n"
+"X-Generator: Launchpad (build 18169)\n"
 "Language: it\n"
 
 #: ../src/agent/SecretRequest.cpp:61
diff -Nru indicator-network-0.8.0+16.10.20160804/po/ja.po indicator-network-0.8.0+16.10.20160817.2/po/ja.po
--- indicator-network-0.8.0+16.10.20160804/po/ja.po	2016-08-04 11:58:54.000000000 +0000
+++ indicator-network-0.8.0+16.10.20160817.2/po/ja.po	2016-08-17 11:49:25.000000000 +0000
@@ -15,8 +15,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2016-07-27 06:47+0000\n"
-"X-Generator: Launchpad (build 18153)\n"
+"X-Launchpad-Export-Date: 2016-08-13 06:17+0000\n"
+"X-Generator: Launchpad (build 18169)\n"
 "Language: ja\n"
 
 #: ../src/agent/SecretRequest.cpp:61
diff -Nru indicator-network-0.8.0+16.10.20160804/po/ka.po indicator-network-0.8.0+16.10.20160817.2/po/ka.po
--- indicator-network-0.8.0+16.10.20160804/po/ka.po	2016-08-04 11:58:54.000000000 +0000
+++ indicator-network-0.8.0+16.10.20160817.2/po/ka.po	2016-08-17 11:49:25.000000000 +0000
@@ -15,8 +15,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2016-07-27 06:47+0000\n"
-"X-Generator: Launchpad (build 18153)\n"
+"X-Launchpad-Export-Date: 2016-08-13 06:17+0000\n"
+"X-Generator: Launchpad (build 18169)\n"
 "Language: ka\n"
 
 #: ../src/agent/SecretRequest.cpp:61
diff -Nru indicator-network-0.8.0+16.10.20160804/po/km.po indicator-network-0.8.0+16.10.20160817.2/po/km.po
--- indicator-network-0.8.0+16.10.20160804/po/km.po	2016-08-04 11:58:54.000000000 +0000
+++ indicator-network-0.8.0+16.10.20160817.2/po/km.po	2016-08-17 11:49:25.000000000 +0000
@@ -15,8 +15,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2016-07-27 06:47+0000\n"
-"X-Generator: Launchpad (build 18153)\n"
+"X-Launchpad-Export-Date: 2016-08-13 06:17+0000\n"
+"X-Generator: Launchpad (build 18169)\n"
 "Language: \n"
 
 #: ../src/agent/SecretRequest.cpp:61
diff -Nru indicator-network-0.8.0+16.10.20160804/po/ko.po indicator-network-0.8.0+16.10.20160817.2/po/ko.po
--- indicator-network-0.8.0+16.10.20160804/po/ko.po	2016-08-04 11:58:54.000000000 +0000
+++ indicator-network-0.8.0+16.10.20160817.2/po/ko.po	2016-08-17 11:49:25.000000000 +0000
@@ -15,8 +15,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2016-07-27 06:47+0000\n"
-"X-Generator: Launchpad (build 18153)\n"
+"X-Launchpad-Export-Date: 2016-08-13 06:17+0000\n"
+"X-Generator: Launchpad (build 18169)\n"
 "Language: ko\n"
 
 #: ../src/agent/SecretRequest.cpp:61
diff -Nru indicator-network-0.8.0+16.10.20160804/po/ku.po indicator-network-0.8.0+16.10.20160817.2/po/ku.po
--- indicator-network-0.8.0+16.10.20160804/po/ku.po	2016-08-04 11:58:54.000000000 +0000
+++ indicator-network-0.8.0+16.10.20160817.2/po/ku.po	2016-08-17 11:49:25.000000000 +0000
@@ -15,8 +15,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2016-07-27 06:47+0000\n"
-"X-Generator: Launchpad (build 18153)\n"
+"X-Launchpad-Export-Date: 2016-08-13 06:17+0000\n"
+"X-Generator: Launchpad (build 18169)\n"
 "Language: ku\n"
 
 #: ../src/agent/SecretRequest.cpp:61
diff -Nru indicator-network-0.8.0+16.10.20160804/po/lb.po indicator-network-0.8.0+16.10.20160817.2/po/lb.po
--- indicator-network-0.8.0+16.10.20160804/po/lb.po	2016-08-04 11:58:54.000000000 +0000
+++ indicator-network-0.8.0+16.10.20160817.2/po/lb.po	2016-08-17 11:49:25.000000000 +0000
@@ -15,8 +15,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2016-07-27 06:47+0000\n"
-"X-Generator: Launchpad (build 18153)\n"
+"X-Launchpad-Export-Date: 2016-08-13 06:17+0000\n"
+"X-Generator: Launchpad (build 18169)\n"
 "Language: \n"
 
 #: ../src/agent/SecretRequest.cpp:61
diff -Nru indicator-network-0.8.0+16.10.20160804/po/lt.po indicator-network-0.8.0+16.10.20160817.2/po/lt.po
--- indicator-network-0.8.0+16.10.20160804/po/lt.po	2016-08-04 11:58:54.000000000 +0000
+++ indicator-network-0.8.0+16.10.20160817.2/po/lt.po	2016-08-17 11:49:25.000000000 +0000
@@ -16,8 +16,8 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
 "(n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2016-07-27 06:47+0000\n"
-"X-Generator: Launchpad (build 18153)\n"
+"X-Launchpad-Export-Date: 2016-08-13 06:17+0000\n"
+"X-Generator: Launchpad (build 18169)\n"
 
 #: ../src/agent/SecretRequest.cpp:61
 msgid "Connect to “%1”"
diff -Nru indicator-network-0.8.0+16.10.20160804/po/lv.po indicator-network-0.8.0+16.10.20160817.2/po/lv.po
--- indicator-network-0.8.0+16.10.20160804/po/lv.po	2016-08-04 11:58:54.000000000 +0000
+++ indicator-network-0.8.0+16.10.20160817.2/po/lv.po	2016-08-17 11:49:25.000000000 +0000
@@ -15,8 +15,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2016-07-27 06:47+0000\n"
-"X-Generator: Launchpad (build 18153)\n"
+"X-Launchpad-Export-Date: 2016-08-13 06:17+0000\n"
+"X-Generator: Launchpad (build 18169)\n"
 "Language: lv\n"
 
 #: ../src/agent/SecretRequest.cpp:61
diff -Nru indicator-network-0.8.0+16.10.20160804/po/ms.po indicator-network-0.8.0+16.10.20160817.2/po/ms.po
--- indicator-network-0.8.0+16.10.20160804/po/ms.po	2016-08-04 11:58:54.000000000 +0000
+++ indicator-network-0.8.0+16.10.20160817.2/po/ms.po	2016-08-17 11:49:25.000000000 +0000
@@ -15,8 +15,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2016-07-27 06:47+0000\n"
-"X-Generator: Launchpad (build 18153)\n"
+"X-Launchpad-Export-Date: 2016-08-13 06:17+0000\n"
+"X-Generator: Launchpad (build 18169)\n"
 "Language: ms\n"
 
 #: ../src/agent/SecretRequest.cpp:61
diff -Nru indicator-network-0.8.0+16.10.20160804/po/nb.po indicator-network-0.8.0+16.10.20160817.2/po/nb.po
--- indicator-network-0.8.0+16.10.20160804/po/nb.po	2016-08-04 11:58:54.000000000 +0000
+++ indicator-network-0.8.0+16.10.20160817.2/po/nb.po	2016-08-17 11:49:25.000000000 +0000
@@ -15,8 +15,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2016-07-27 06:48+0000\n"
-"X-Generator: Launchpad (build 18153)\n"
+"X-Launchpad-Export-Date: 2016-08-13 06:17+0000\n"
+"X-Generator: Launchpad (build 18169)\n"
 "Language: nb\n"
 
 #: ../src/agent/SecretRequest.cpp:61
diff -Nru indicator-network-0.8.0+16.10.20160804/po/ne.po indicator-network-0.8.0+16.10.20160817.2/po/ne.po
--- indicator-network-0.8.0+16.10.20160804/po/ne.po	2016-08-04 11:58:54.000000000 +0000
+++ indicator-network-0.8.0+16.10.20160817.2/po/ne.po	2016-08-17 11:49:25.000000000 +0000
@@ -15,8 +15,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2016-07-27 06:47+0000\n"
-"X-Generator: Launchpad (build 18153)\n"
+"X-Launchpad-Export-Date: 2016-08-13 06:17+0000\n"
+"X-Generator: Launchpad (build 18169)\n"
 
 #: ../src/agent/SecretRequest.cpp:61
 msgid "Connect to “%1”"
diff -Nru indicator-network-0.8.0+16.10.20160804/po/nl.po indicator-network-0.8.0+16.10.20160817.2/po/nl.po
--- indicator-network-0.8.0+16.10.20160804/po/nl.po	2016-08-04 11:58:54.000000000 +0000
+++ indicator-network-0.8.0+16.10.20160817.2/po/nl.po	2016-08-17 11:49:25.000000000 +0000
@@ -15,8 +15,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2016-07-27 06:47+0000\n"
-"X-Generator: Launchpad (build 18153)\n"
+"X-Launchpad-Export-Date: 2016-08-13 06:17+0000\n"
+"X-Generator: Launchpad (build 18169)\n"
 "Language: nl\n"
 
 #: ../src/agent/SecretRequest.cpp:61
diff -Nru indicator-network-0.8.0+16.10.20160804/po/oc.po indicator-network-0.8.0+16.10.20160817.2/po/oc.po
--- indicator-network-0.8.0+16.10.20160804/po/oc.po	2016-08-04 11:58:54.000000000 +0000
+++ indicator-network-0.8.0+16.10.20160817.2/po/oc.po	2016-08-17 11:49:25.000000000 +0000
@@ -15,8 +15,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Launchpad-Export-Date: 2016-07-27 06:48+0000\n"
-"X-Generator: Launchpad (build 18153)\n"
+"X-Launchpad-Export-Date: 2016-08-13 06:17+0000\n"
+"X-Generator: Launchpad (build 18169)\n"
 "Language: \n"
 
 #: ../src/agent/SecretRequest.cpp:61
diff -Nru indicator-network-0.8.0+16.10.20160804/po/pa.po indicator-network-0.8.0+16.10.20160817.2/po/pa.po
--- indicator-network-0.8.0+16.10.20160804/po/pa.po	2016-08-04 11:58:54.000000000 +0000
+++ indicator-network-0.8.0+16.10.20160817.2/po/pa.po	2016-08-17 11:49:25.000000000 +0000
@@ -15,8 +15,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2016-07-27 06:48+0000\n"
-"X-Generator: Launchpad (build 18153)\n"
+"X-Launchpad-Export-Date: 2016-08-13 06:17+0000\n"
+"X-Generator: Launchpad (build 18169)\n"
 "Language: pa\n"
 
 #: ../src/agent/SecretRequest.cpp:61
diff -Nru indicator-network-0.8.0+16.10.20160804/po/pl.po indicator-network-0.8.0+16.10.20160817.2/po/pl.po
--- indicator-network-0.8.0+16.10.20160804/po/pl.po	2016-08-04 11:58:54.000000000 +0000
+++ indicator-network-0.8.0+16.10.20160817.2/po/pl.po	2016-08-17 11:49:25.000000000 +0000
@@ -16,8 +16,8 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
 "|| n%100>=20) ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2016-07-27 06:48+0000\n"
-"X-Generator: Launchpad (build 18153)\n"
+"X-Launchpad-Export-Date: 2016-08-13 06:17+0000\n"
+"X-Generator: Launchpad (build 18169)\n"
 "Language: pl\n"
 
 #: ../src/agent/SecretRequest.cpp:61
diff -Nru indicator-network-0.8.0+16.10.20160804/po/pt_BR.po indicator-network-0.8.0+16.10.20160817.2/po/pt_BR.po
--- indicator-network-0.8.0+16.10.20160804/po/pt_BR.po	2016-08-04 11:58:54.000000000 +0000
+++ indicator-network-0.8.0+16.10.20160817.2/po/pt_BR.po	2016-08-17 11:49:25.000000000 +0000
@@ -15,8 +15,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Launchpad-Export-Date: 2016-07-27 06:48+0000\n"
-"X-Generator: Launchpad (build 18153)\n"
+"X-Launchpad-Export-Date: 2016-08-13 06:17+0000\n"
+"X-Generator: Launchpad (build 18169)\n"
 "Language: pt_BR\n"
 
 #: ../src/agent/SecretRequest.cpp:61
diff -Nru indicator-network-0.8.0+16.10.20160804/po/pt.po indicator-network-0.8.0+16.10.20160817.2/po/pt.po
--- indicator-network-0.8.0+16.10.20160804/po/pt.po	2016-08-04 11:58:54.000000000 +0000
+++ indicator-network-0.8.0+16.10.20160817.2/po/pt.po	2016-08-17 11:49:25.000000000 +0000
@@ -15,8 +15,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2016-07-27 06:48+0000\n"
-"X-Generator: Launchpad (build 18153)\n"
+"X-Launchpad-Export-Date: 2016-08-13 06:17+0000\n"
+"X-Generator: Launchpad (build 18169)\n"
 "Language: pt\n"
 
 #: ../src/agent/SecretRequest.cpp:61
diff -Nru indicator-network-0.8.0+16.10.20160804/po/ro.po indicator-network-0.8.0+16.10.20160817.2/po/ro.po
--- indicator-network-0.8.0+16.10.20160804/po/ro.po	2016-08-04 11:58:54.000000000 +0000
+++ indicator-network-0.8.0+16.10.20160817.2/po/ro.po	2016-08-17 11:49:25.000000000 +0000
@@ -16,8 +16,8 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n == 1 ? 0: (((n % 100 > 19) || ((n % 100 "
 "== 0) && (n != 0))) ? 2: 1));\n"
-"X-Launchpad-Export-Date: 2016-07-27 06:48+0000\n"
-"X-Generator: Launchpad (build 18153)\n"
+"X-Launchpad-Export-Date: 2016-08-13 06:17+0000\n"
+"X-Generator: Launchpad (build 18169)\n"
 "Language: ro\n"
 
 #: ../src/agent/SecretRequest.cpp:61
diff -Nru indicator-network-0.8.0+16.10.20160804/po/ru.po indicator-network-0.8.0+16.10.20160817.2/po/ru.po
--- indicator-network-0.8.0+16.10.20160804/po/ru.po	2016-08-04 11:58:54.000000000 +0000
+++ indicator-network-0.8.0+16.10.20160817.2/po/ru.po	2016-08-17 11:49:25.000000000 +0000
@@ -16,8 +16,8 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
 "n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2016-07-27 06:48+0000\n"
-"X-Generator: Launchpad (build 18153)\n"
+"X-Launchpad-Export-Date: 2016-08-13 06:17+0000\n"
+"X-Generator: Launchpad (build 18169)\n"
 "Language: ru\n"
 
 #: ../src/agent/SecretRequest.cpp:61
diff -Nru indicator-network-0.8.0+16.10.20160804/po/sk.po indicator-network-0.8.0+16.10.20160817.2/po/sk.po
--- indicator-network-0.8.0+16.10.20160804/po/sk.po	2016-08-04 11:58:54.000000000 +0000
+++ indicator-network-0.8.0+16.10.20160817.2/po/sk.po	2016-08-17 11:49:25.000000000 +0000
@@ -15,8 +15,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 1 : (n>=2 && n<=4) ? 2 : 0;\n"
-"X-Launchpad-Export-Date: 2016-07-27 06:48+0000\n"
-"X-Generator: Launchpad (build 18153)\n"
+"X-Launchpad-Export-Date: 2016-08-13 06:17+0000\n"
+"X-Generator: Launchpad (build 18169)\n"
 
 #: ../src/agent/SecretRequest.cpp:61
 msgid "Connect to “%1”"
diff -Nru indicator-network-0.8.0+16.10.20160804/po/sl.po indicator-network-0.8.0+16.10.20160817.2/po/sl.po
--- indicator-network-0.8.0+16.10.20160804/po/sl.po	2016-08-04 11:58:54.000000000 +0000
+++ indicator-network-0.8.0+16.10.20160817.2/po/sl.po	2016-08-17 11:49:25.000000000 +0000
@@ -16,8 +16,8 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || "
 "n%100==4 ? 3 : 0);\n"
-"X-Launchpad-Export-Date: 2016-07-27 06:48+0000\n"
-"X-Generator: Launchpad (build 18153)\n"
+"X-Launchpad-Export-Date: 2016-08-13 06:17+0000\n"
+"X-Generator: Launchpad (build 18169)\n"
 "Language: sl\n"
 
 #: ../src/agent/SecretRequest.cpp:61
diff -Nru indicator-network-0.8.0+16.10.20160804/po/sq.po indicator-network-0.8.0+16.10.20160817.2/po/sq.po
--- indicator-network-0.8.0+16.10.20160804/po/sq.po	2016-08-04 11:58:54.000000000 +0000
+++ indicator-network-0.8.0+16.10.20160817.2/po/sq.po	2016-08-17 11:49:25.000000000 +0000
@@ -15,8 +15,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2016-07-27 06:47+0000\n"
-"X-Generator: Launchpad (build 18153)\n"
+"X-Launchpad-Export-Date: 2016-08-13 06:16+0000\n"
+"X-Generator: Launchpad (build 18169)\n"
 
 #: ../src/agent/SecretRequest.cpp:61
 msgid "Connect to “%1”"
diff -Nru indicator-network-0.8.0+16.10.20160804/po/sr.po indicator-network-0.8.0+16.10.20160817.2/po/sr.po
--- indicator-network-0.8.0+16.10.20160804/po/sr.po	2016-08-04 11:58:54.000000000 +0000
+++ indicator-network-0.8.0+16.10.20160817.2/po/sr.po	2016-08-17 11:49:25.000000000 +0000
@@ -16,8 +16,8 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
 "n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2016-07-27 06:48+0000\n"
-"X-Generator: Launchpad (build 18153)\n"
+"X-Launchpad-Export-Date: 2016-08-13 06:17+0000\n"
+"X-Generator: Launchpad (build 18169)\n"
 "Language: sr\n"
 
 #: ../src/agent/SecretRequest.cpp:61
diff -Nru indicator-network-0.8.0+16.10.20160804/po/sv.po indicator-network-0.8.0+16.10.20160817.2/po/sv.po
--- indicator-network-0.8.0+16.10.20160804/po/sv.po	2016-08-04 11:58:54.000000000 +0000
+++ indicator-network-0.8.0+16.10.20160817.2/po/sv.po	2016-08-17 11:49:25.000000000 +0000
@@ -15,8 +15,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2016-07-27 06:48+0000\n"
-"X-Generator: Launchpad (build 18153)\n"
+"X-Launchpad-Export-Date: 2016-08-13 06:17+0000\n"
+"X-Generator: Launchpad (build 18169)\n"
 "Language: sv\n"
 
 #: ../src/agent/SecretRequest.cpp:61
diff -Nru indicator-network-0.8.0+16.10.20160804/po/ta.po indicator-network-0.8.0+16.10.20160817.2/po/ta.po
--- indicator-network-0.8.0+16.10.20160804/po/ta.po	2016-08-04 11:58:54.000000000 +0000
+++ indicator-network-0.8.0+16.10.20160817.2/po/ta.po	2016-08-17 11:49:25.000000000 +0000
@@ -15,8 +15,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2016-07-27 06:48+0000\n"
-"X-Generator: Launchpad (build 18153)\n"
+"X-Launchpad-Export-Date: 2016-08-13 06:17+0000\n"
+"X-Generator: Launchpad (build 18169)\n"
 "Language: ta\n"
 
 #: ../src/agent/SecretRequest.cpp:61
diff -Nru indicator-network-0.8.0+16.10.20160804/po/th.po indicator-network-0.8.0+16.10.20160817.2/po/th.po
--- indicator-network-0.8.0+16.10.20160804/po/th.po	2016-08-04 11:58:54.000000000 +0000
+++ indicator-network-0.8.0+16.10.20160817.2/po/th.po	2016-08-17 11:49:25.000000000 +0000
@@ -15,8 +15,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2016-07-27 06:48+0000\n"
-"X-Generator: Launchpad (build 18153)\n"
+"X-Launchpad-Export-Date: 2016-08-13 06:17+0000\n"
+"X-Generator: Launchpad (build 18169)\n"
 "Language: th\n"
 
 #: ../src/agent/SecretRequest.cpp:61
diff -Nru indicator-network-0.8.0+16.10.20160804/po/tr.po indicator-network-0.8.0+16.10.20160817.2/po/tr.po
--- indicator-network-0.8.0+16.10.20160804/po/tr.po	2016-08-04 11:58:54.000000000 +0000
+++ indicator-network-0.8.0+16.10.20160817.2/po/tr.po	2016-08-17 11:49:25.000000000 +0000
@@ -15,8 +15,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2016-07-27 06:48+0000\n"
-"X-Generator: Launchpad (build 18153)\n"
+"X-Launchpad-Export-Date: 2016-08-13 06:17+0000\n"
+"X-Generator: Launchpad (build 18169)\n"
 "Language: tr\n"
 
 #: ../src/agent/SecretRequest.cpp:61
diff -Nru indicator-network-0.8.0+16.10.20160804/po/ug.po indicator-network-0.8.0+16.10.20160817.2/po/ug.po
--- indicator-network-0.8.0+16.10.20160804/po/ug.po	2016-08-04 11:58:54.000000000 +0000
+++ indicator-network-0.8.0+16.10.20160817.2/po/ug.po	2016-08-17 11:49:25.000000000 +0000
@@ -15,8 +15,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2016-07-27 06:48+0000\n"
-"X-Generator: Launchpad (build 18153)\n"
+"X-Launchpad-Export-Date: 2016-08-13 06:17+0000\n"
+"X-Generator: Launchpad (build 18169)\n"
 "Language: \n"
 
 #: ../src/agent/SecretRequest.cpp:61
diff -Nru indicator-network-0.8.0+16.10.20160804/po/uk.po indicator-network-0.8.0+16.10.20160817.2/po/uk.po
--- indicator-network-0.8.0+16.10.20160804/po/uk.po	2016-08-04 11:58:54.000000000 +0000
+++ indicator-network-0.8.0+16.10.20160817.2/po/uk.po	2016-08-17 11:49:25.000000000 +0000
@@ -16,8 +16,8 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
 "n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2016-07-27 06:48+0000\n"
-"X-Generator: Launchpad (build 18153)\n"
+"X-Launchpad-Export-Date: 2016-08-13 06:17+0000\n"
+"X-Generator: Launchpad (build 18169)\n"
 "Language: uk\n"
 
 #: ../src/agent/SecretRequest.cpp:61
diff -Nru indicator-network-0.8.0+16.10.20160804/po/wo.po indicator-network-0.8.0+16.10.20160817.2/po/wo.po
--- indicator-network-0.8.0+16.10.20160804/po/wo.po	2016-08-04 11:58:54.000000000 +0000
+++ indicator-network-0.8.0+16.10.20160817.2/po/wo.po	2016-08-17 11:49:25.000000000 +0000
@@ -15,8 +15,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Launchpad-Export-Date: 2016-07-27 06:48+0000\n"
-"X-Generator: Launchpad (build 18153)\n"
+"X-Launchpad-Export-Date: 2016-08-13 06:17+0000\n"
+"X-Generator: Launchpad (build 18169)\n"
 
 #: ../src/agent/SecretRequest.cpp:61
 msgid "Connect to “%1”"
diff -Nru indicator-network-0.8.0+16.10.20160804/po/zh_CN.po indicator-network-0.8.0+16.10.20160817.2/po/zh_CN.po
--- indicator-network-0.8.0+16.10.20160804/po/zh_CN.po	2016-08-04 11:58:54.000000000 +0000
+++ indicator-network-0.8.0+16.10.20160817.2/po/zh_CN.po	2016-08-17 11:49:25.000000000 +0000
@@ -15,8 +15,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2016-07-27 06:48+0000\n"
-"X-Generator: Launchpad (build 18153)\n"
+"X-Launchpad-Export-Date: 2016-08-13 06:17+0000\n"
+"X-Generator: Launchpad (build 18169)\n"
 "Language: \n"
 
 #: ../src/agent/SecretRequest.cpp:61
diff -Nru indicator-network-0.8.0+16.10.20160804/po/zh_TW.po indicator-network-0.8.0+16.10.20160817.2/po/zh_TW.po
--- indicator-network-0.8.0+16.10.20160804/po/zh_TW.po	2016-08-04 11:58:54.000000000 +0000
+++ indicator-network-0.8.0+16.10.20160817.2/po/zh_TW.po	2016-08-17 11:49:25.000000000 +0000
@@ -15,8 +15,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2016-07-27 06:48+0000\n"
-"X-Generator: Launchpad (build 18153)\n"
+"X-Launchpad-Export-Date: 2016-08-13 06:17+0000\n"
+"X-Generator: Launchpad (build 18169)\n"
 "Language: \n"
 
 #: ../src/agent/SecretRequest.cpp:61
diff -Nru indicator-network-0.8.0+16.10.20160804/src/indicator/nmofono/manager-impl.cpp indicator-network-0.8.0+16.10.20160817.2/src/indicator/nmofono/manager-impl.cpp
--- indicator-network-0.8.0+16.10.20160804/src/indicator/nmofono/manager-impl.cpp	2016-08-04 11:59:28.000000000 +0000
+++ indicator-network-0.8.0+16.10.20160817.2/src/indicator/nmofono/manager-impl.cpp	2016-08-17 11:49:49.000000000 +0000
@@ -93,11 +93,50 @@
 
     ConnectivityServiceSettings::Ptr m_settings;
 
+    QTimer m_checkSimForMobileDataTimer;
+
     Private(Manager& parent) :
         p(parent)
     {
     }
 
+
+public Q_SLOTS:
+
+    void startCheckSimForMobileDataTimer()
+    {
+        m_checkSimForMobileDataTimer.start();
+    }
+
+    void checkSimForMobileData()
+    {
+        if (m_simForMobileData && m_simForMobileData->present())
+        {
+            return;
+        }
+
+        int presentSimCount = 0;
+        for (auto modem : m_modems)
+        {
+            if (modem->sim())
+            {
+                presentSimCount++;
+            }
+        }
+
+        if (presentSimCount == 1)
+        {
+            for (auto modem : m_modems)
+            {
+                if (modem->sim())
+                {
+                    setSimForMobileData(modem->sim());
+                    break;
+                }
+            }
+        }
+    }
+
     void matchModemsAndSims()
     {
         for (wwan::Modem::Ptr modem: m_ofonoLinks)
@@ -132,6 +171,7 @@
     {
         m_sims.append(sim);
         connect(sim.get(), &wwan::Sim::presentChanged, this, &Private::matchModemsAndSims);
+        connect(sim.get(), &wwan::Sim::presentChanged, this, &Private::startCheckSimForMobileDataTimer);
         Q_EMIT p.simsChanged();
 
         QString iccid = m_settings->simForMobileData().toString();
@@ -143,6 +183,7 @@
         }
 
         matchModemsAndSims();
+        m_checkSimForMobileDataTimer.start();
     }
 
     void initialDataOnSet()
@@ -183,6 +224,8 @@
 
         m_modems.append(modem);
         Q_EMIT p.modemsChanged();
+
+        m_checkSimForMobileDataTimer.start();
     }
 
     void setUnstoppableOperationHappening(bool happening)
@@ -240,7 +283,6 @@
         }
     }
 
-public Q_SLOTS:
     void updateHasWifi()
     {
         if (m_killSwitch->state() != KillSwitch::State::not_available)
@@ -521,6 +563,14 @@
     d->loadSettings();
 
     d->updateHasWifi();
+
+    d->m_checkSimForMobileDataTimer.setInterval(5000);
+    d->m_checkSimForMobileDataTimer.setSingleShot(true);
+    connect(&d->m_checkSimForMobileDataTimer, &QTimer::timeout, d.get(), &Private::checkSimForMobileData);
+    for(auto sim : d->m_sims) {
+        connect(sim.get(), &wwan::Sim::presentChanged, d.get(), &Private::startCheckSimForMobileDataTimer);
+    }
+    d->m_checkSimForMobileDataTimer.start();
 }
 
 bool
diff -Nru indicator-network-0.8.0+16.10.20160804/tests/integration/test-indicator.cpp indicator-network-0.8.0+16.10.20160817.2/tests/integration/test-indicator.cpp
--- indicator-network-0.8.0+16.10.20160804/tests/integration/test-indicator.cpp	2016-08-04 11:58:54.000000000 +0000
+++ indicator-network-0.8.0+16.10.20160817.2/tests/integration/test-indicator.cpp	2016-08-17 11:49:40.000000000 +0000
@@ -3193,12 +3193,21 @@
 
     ASSERT_NO_THROW(startIndicator());
 
+
+    auto modems = con->modems();
+    QSignalSpy rowsInsertedSpy(modems, SIGNAL(rowsInserted(const QModelIndex &, int, int)));
+    if (modems->rowCount() == 0) {
+        ASSERT_TRUE(rowsInsertedSpy.wait());
+    }
+
+    ASSERT_EQ(1, modems->rowCount());
+
     // Check that the indicator switch is enabled when we are not in flightmode
     // and there is a SIM for mobile data set.
 
     con->setMobileDataEnabled(true);
     con->setFlightMode(false);
-    con->setSimForMobileData(getModemSim(*con->modems(), 0));
+    con->setSimForMobileData(getModemSim(*modems, 0));
 
     EXPECT_MATCHRESULT(mh::MenuMatcher(phoneParameters())
         .item(mh::MenuItemMatcher()
@@ -3254,11 +3263,19 @@
 
     ASSERT_NO_THROW(startIndicator());
 
+    auto modems = con->modems();
+    QSignalSpy rowsInsertedSpy(modems, SIGNAL(rowsInserted(const QModelIndex &, int, int)));
+    if (modems->rowCount() == 0) {
+        ASSERT_TRUE(rowsInsertedSpy.wait());
+    }
+
+    ASSERT_EQ(1, modems->rowCount());
+
     // Check that Connectivity::mobileDataEnabled follows the indicator switch
 
     con->setMobileDataEnabled(true);
     con->setFlightMode(false);
-    con->setSimForMobileData(getModemSim(*con->modems(), 0));
+    con->setSimForMobileData(getModemSim(*modems, 0));
     QTest::qWait(250);
     QSignalSpy spy(con.get(), SIGNAL(mobileDataEnabledUpdated(bool)));