diff -Nru telephony-service-0.1+16.04.20160321.2/cmake/modules/GenerateTest.cmake telephony-service-0.1+16.04.20160331.4/cmake/modules/GenerateTest.cmake
--- telephony-service-0.1+16.04.20160321.2/cmake/modules/GenerateTest.cmake	2016-03-21 20:11:03.000000000 +0000
+++ telephony-service-0.1+16.04.20160331.4/cmake/modules/GenerateTest.cmake	2016-03-31 22:17:38.000000000 +0000
@@ -131,7 +131,7 @@
     if (NOT DEFINED ARG_WAIT_FOR)
         set(ARG_WAIT_FOR org.freedesktop.Telepathy.Client.TelephonyServiceHandler)
     endif (NOT DEFINED ARG_WAIT_FOR)
-    generate_test(${TESTNAME} ${ARGN}
+    generate_test(${TESTNAME} ${ARG_UNPARSED_ARGUMENTS}
                   TASKS ${TASKS}
                   LIBRARIES ${ARG_LIBRARIES} 
                   QT5_MODULES ${ARG_QT5_MODULES} 
diff -Nru telephony-service-0.1+16.04.20160321.2/debian/changelog telephony-service-0.1+16.04.20160331.4/debian/changelog
--- telephony-service-0.1+16.04.20160321.2/debian/changelog	2016-04-05 14:36:19.000000000 +0000
+++ telephony-service-0.1+16.04.20160331.4/debian/changelog	2016-04-05 14:36:19.000000000 +0000
@@ -1,3 +1,11 @@
+telephony-service (0.1+16.04.20160331.4-0ubuntu1) xenial; urgency=medium
+
+  * Do not change power mode on incoming MMS'. This is done by unity
+    now. (LP: #1562923)
+  * Fix duplicate tasks launched during tests
+
+ -- Tiago Salem Herrmann <tiago.herrmann@canonical.com>  Thu, 31 Mar 2016 22:17:43 +0000
+
 telephony-service (0.1+16.04.20160321.2-0ubuntu1) xenial; urgency=medium
 
   [ Jim Hodapp ]
diff -Nru telephony-service-0.1+16.04.20160321.2/indicator/textchannelobserver.cpp telephony-service-0.1+16.04.20160331.4/indicator/textchannelobserver.cpp
--- telephony-service-0.1+16.04.20160321.2/indicator/textchannelobserver.cpp	2016-03-21 20:11:03.000000000 +0000
+++ telephony-service-0.1+16.04.20160331.4/indicator/textchannelobserver.cpp	2016-03-31 22:17:34.000000000 +0000
@@ -446,21 +446,6 @@
         }
     }
 
-    // WORKAROUND: powerd can't decide when to wake up the screen on incoming mms's
-    // (or other telepathy accounts) as the download of the attachments is made by 
-    // another daemon, so we wake up the screen here.
-    if (!CallManager::instance()->hasCalls() &&
-           (mms || account->type() != AccountEntry::PhoneAccount)) {
-        QDBusInterface unityIface("com.canonical.Unity.Screen",
-                                  "/com/canonical/Unity/Screen",
-                                  "com.canonical.Unity.Screen",
-                                  QDBusConnection::systemBus());
-        QList<QVariant> args;
-        args.append("on");
-        args.append(0);
-        unityIface.callWithArgumentList(QDBus::NoBlock, "setScreenPowerMode", args);
-    }
-
     // add the message to the messaging menu (use hex format to avoid invalid characters)
     QByteArray token(message.messageToken().toUtf8());
 
diff -Nru telephony-service-0.1+16.04.20160321.2/po/am.po telephony-service-0.1+16.04.20160331.4/po/am.po
--- telephony-service-0.1+16.04.20160321.2/po/am.po	2016-03-21 20:11:03.000000000 +0000
+++ telephony-service-0.1+16.04.20160331.4/po/am.po	2016-03-31 22:17:29.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-03-15 06:08+0000\n"
-"X-Generator: Launchpad (build 17939)\n"
+"X-Launchpad-Export-Date: 2016-03-29 05:40+0000\n"
+"X-Generator: Launchpad (build 17967)\n"
 
 #: indicator/messagingmenu.cpp:299
 #, qt-format
@@ -146,7 +146,7 @@
 msgid "No text messages sent today"
 msgstr "ዛሬ ምንም የ ጽሁፍ መልእክቶች አልላኩም"
 
-#: indicator/ussdindicator.cpp:116 indicator/textchannelobserver.cpp:312
+#: indicator/textchannelobserver.cpp:312 indicator/ussdindicator.cpp:116
 msgid "Ok"
 msgstr "እሺ"
 
diff -Nru telephony-service-0.1+16.04.20160321.2/po/ar.po telephony-service-0.1+16.04.20160331.4/po/ar.po
--- telephony-service-0.1+16.04.20160321.2/po/ar.po	2016-03-21 20:11:03.000000000 +0000
+++ telephony-service-0.1+16.04.20160331.4/po/ar.po	2016-03-31 22:17:29.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-03-15 06:08+0000\n"
-"X-Generator: Launchpad (build 17939)\n"
+"X-Launchpad-Export-Date: 2016-03-29 05:40+0000\n"
+"X-Generator: Launchpad (build 17967)\n"
 "Language: ar\n"
 
 #: indicator/messagingmenu.cpp:299
@@ -156,7 +156,7 @@
 msgid "No text messages sent today"
 msgstr "لا رسائل نصية تم إرسالها اليوم"
 
-#: indicator/ussdindicator.cpp:116 indicator/textchannelobserver.cpp:312
+#: indicator/textchannelobserver.cpp:312 indicator/ussdindicator.cpp:116
 msgid "Ok"
 msgstr "موافق"
 
diff -Nru telephony-service-0.1+16.04.20160321.2/po/ast.po telephony-service-0.1+16.04.20160331.4/po/ast.po
--- telephony-service-0.1+16.04.20160321.2/po/ast.po	2016-03-21 20:11:03.000000000 +0000
+++ telephony-service-0.1+16.04.20160331.4/po/ast.po	2016-03-31 22:17:29.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-03-15 06:08+0000\n"
-"X-Generator: Launchpad (build 17939)\n"
+"X-Launchpad-Export-Date: 2016-03-29 05:40+0000\n"
+"X-Generator: Launchpad (build 17967)\n"
 
 #: indicator/messagingmenu.cpp:299
 #, qt-format
@@ -147,7 +147,7 @@
 msgid "No text messages sent today"
 msgstr "Güei nun s'unviaron mensaxes de testu"
 
-#: indicator/ussdindicator.cpp:116 indicator/textchannelobserver.cpp:312
+#: indicator/textchannelobserver.cpp:312 indicator/ussdindicator.cpp:116
 msgid "Ok"
 msgstr "Aceutar"
 
diff -Nru telephony-service-0.1+16.04.20160321.2/po/az.po telephony-service-0.1+16.04.20160331.4/po/az.po
--- telephony-service-0.1+16.04.20160321.2/po/az.po	2016-03-21 20:11:03.000000000 +0000
+++ telephony-service-0.1+16.04.20160331.4/po/az.po	2016-03-31 22:17:29.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-03-15 06:08+0000\n"
-"X-Generator: Launchpad (build 17939)\n"
+"X-Launchpad-Export-Date: 2016-03-29 05:40+0000\n"
+"X-Generator: Launchpad (build 17967)\n"
 
 #: indicator/messagingmenu.cpp:299
 #, qt-format
@@ -146,7 +146,7 @@
 msgid "No text messages sent today"
 msgstr "Bu gün heç bir mәtn mesajı göndәrilmәyib"
 
-#: indicator/ussdindicator.cpp:116 indicator/textchannelobserver.cpp:312
+#: indicator/textchannelobserver.cpp:312 indicator/ussdindicator.cpp:116
 msgid "Ok"
 msgstr "Oldu"
 
diff -Nru telephony-service-0.1+16.04.20160321.2/po/be.po telephony-service-0.1+16.04.20160331.4/po/be.po
--- telephony-service-0.1+16.04.20160321.2/po/be.po	2016-03-21 20:11:03.000000000 +0000
+++ telephony-service-0.1+16.04.20160331.4/po/be.po	2016-03-31 22:17:29.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-03-15 06:08+0000\n"
-"X-Generator: Launchpad (build 17939)\n"
+"X-Launchpad-Export-Date: 2016-03-29 05:40+0000\n"
+"X-Generator: Launchpad (build 17967)\n"
 
 #: indicator/messagingmenu.cpp:299
 #, qt-format
@@ -149,7 +149,7 @@
 msgid "No text messages sent today"
 msgstr "Няма дасланых паведамленьняў на сёньня"
 
-#: indicator/ussdindicator.cpp:116 indicator/textchannelobserver.cpp:312
+#: indicator/textchannelobserver.cpp:312 indicator/ussdindicator.cpp:116
 msgid "Ok"
 msgstr "Добра"
 
diff -Nru telephony-service-0.1+16.04.20160321.2/po/br.po telephony-service-0.1+16.04.20160331.4/po/br.po
--- telephony-service-0.1+16.04.20160321.2/po/br.po	2016-03-21 20:11:03.000000000 +0000
+++ telephony-service-0.1+16.04.20160331.4/po/br.po	2016-03-31 22:17:29.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-03-15 06:08+0000\n"
-"X-Generator: Launchpad (build 17939)\n"
+"X-Launchpad-Export-Date: 2016-03-29 05:40+0000\n"
+"X-Generator: Launchpad (build 17967)\n"
 
 #: indicator/messagingmenu.cpp:299
 #, qt-format
@@ -148,7 +148,7 @@
 msgid "No text messages sent today"
 msgstr "N'eus bet kaset kemennadenn destenn ebet hiziv"
 
-#: indicator/ussdindicator.cpp:116 indicator/textchannelobserver.cpp:312
+#: indicator/textchannelobserver.cpp:312 indicator/ussdindicator.cpp:116
 msgid "Ok"
 msgstr "Mat eo"
 
diff -Nru telephony-service-0.1+16.04.20160321.2/po/bs.po telephony-service-0.1+16.04.20160331.4/po/bs.po
--- telephony-service-0.1+16.04.20160321.2/po/bs.po	2016-03-21 20:11:03.000000000 +0000
+++ telephony-service-0.1+16.04.20160331.4/po/bs.po	2016-03-31 22:17:29.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-03-15 06:08+0000\n"
-"X-Generator: Launchpad (build 17939)\n"
+"X-Launchpad-Export-Date: 2016-03-29 05:40+0000\n"
+"X-Generator: Launchpad (build 17967)\n"
 
 #: indicator/messagingmenu.cpp:299
 #, qt-format
@@ -149,7 +149,7 @@
 msgid "No text messages sent today"
 msgstr "Nema poslanih poruka danas"
 
-#: indicator/ussdindicator.cpp:116 indicator/textchannelobserver.cpp:312
+#: indicator/textchannelobserver.cpp:312 indicator/ussdindicator.cpp:116
 msgid "Ok"
 msgstr ""
 
diff -Nru telephony-service-0.1+16.04.20160321.2/po/ca.po telephony-service-0.1+16.04.20160331.4/po/ca.po
--- telephony-service-0.1+16.04.20160321.2/po/ca.po	2016-03-21 20:11:03.000000000 +0000
+++ telephony-service-0.1+16.04.20160331.4/po/ca.po	2016-03-31 22:17:29.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-03-15 06:08+0000\n"
-"X-Generator: Launchpad (build 17939)\n"
+"X-Launchpad-Export-Date: 2016-03-29 05:40+0000\n"
+"X-Generator: Launchpad (build 17967)\n"
 "Language: ca\n"
 
 #: indicator/messagingmenu.cpp:299
@@ -149,7 +149,7 @@
 msgid "No text messages sent today"
 msgstr "Avui no heu enviat cap missatge de text"
 
-#: indicator/ussdindicator.cpp:116 indicator/textchannelobserver.cpp:312
+#: indicator/textchannelobserver.cpp:312 indicator/ussdindicator.cpp:116
 msgid "Ok"
 msgstr "D'acord"
 
diff -Nru telephony-service-0.1+16.04.20160321.2/po/ca@valencia.po telephony-service-0.1+16.04.20160331.4/po/ca@valencia.po
--- telephony-service-0.1+16.04.20160321.2/po/ca@valencia.po	2016-03-21 20:11:03.000000000 +0000
+++ telephony-service-0.1+16.04.20160331.4/po/ca@valencia.po	2016-03-31 22:17:29.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-03-15 06:08+0000\n"
-"X-Generator: Launchpad (build 17939)\n"
+"X-Launchpad-Export-Date: 2016-03-29 05:40+0000\n"
+"X-Generator: Launchpad (build 17967)\n"
 "Language: ca\n"
 
 #: indicator/messagingmenu.cpp:299
@@ -149,7 +149,7 @@
 msgid "No text messages sent today"
 msgstr "Hui no heu enviat cap missatge de text"
 
-#: indicator/ussdindicator.cpp:116 indicator/textchannelobserver.cpp:312
+#: indicator/textchannelobserver.cpp:312 indicator/ussdindicator.cpp:116
 msgid "Ok"
 msgstr "D'acord"
 
diff -Nru telephony-service-0.1+16.04.20160321.2/po/cs.po telephony-service-0.1+16.04.20160331.4/po/cs.po
--- telephony-service-0.1+16.04.20160321.2/po/cs.po	2016-03-21 20:11:03.000000000 +0000
+++ telephony-service-0.1+16.04.20160331.4/po/cs.po	2016-03-31 22:17:29.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-03-15 06:08+0000\n"
-"X-Generator: Launchpad (build 17939)\n"
+"X-Launchpad-Export-Date: 2016-03-29 05:40+0000\n"
+"X-Generator: Launchpad (build 17967)\n"
 "Language: cs\n"
 
 #: indicator/messagingmenu.cpp:299
@@ -149,7 +149,7 @@
 msgid "No text messages sent today"
 msgstr "Dnes nebyly odeslány žádné textové zprávy"
 
-#: indicator/ussdindicator.cpp:116 indicator/textchannelobserver.cpp:312
+#: indicator/textchannelobserver.cpp:312 indicator/ussdindicator.cpp:116
 msgid "Ok"
 msgstr "Ok"
 
diff -Nru telephony-service-0.1+16.04.20160321.2/po/cy.po telephony-service-0.1+16.04.20160331.4/po/cy.po
--- telephony-service-0.1+16.04.20160321.2/po/cy.po	2016-03-21 20:11:03.000000000 +0000
+++ telephony-service-0.1+16.04.20160331.4/po/cy.po	2016-03-31 22:17:29.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-03-15 06:08+0000\n"
-"X-Generator: Launchpad (build 17939)\n"
+"X-Launchpad-Export-Date: 2016-03-29 05:40+0000\n"
+"X-Generator: Launchpad (build 17967)\n"
 
 #: indicator/messagingmenu.cpp:299
 #, qt-format
@@ -151,7 +151,7 @@
 msgid "No text messages sent today"
 msgstr "Heb anfon neges destun heddiw."
 
-#: indicator/ussdindicator.cpp:116 indicator/textchannelobserver.cpp:312
+#: indicator/textchannelobserver.cpp:312 indicator/ussdindicator.cpp:116
 msgid "Ok"
 msgstr "Iawn"
 
diff -Nru telephony-service-0.1+16.04.20160321.2/po/da.po telephony-service-0.1+16.04.20160331.4/po/da.po
--- telephony-service-0.1+16.04.20160321.2/po/da.po	2016-03-21 20:11:03.000000000 +0000
+++ telephony-service-0.1+16.04.20160331.4/po/da.po	2016-03-31 22:17:29.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-03-15 06:08+0000\n"
-"X-Generator: Launchpad (build 17939)\n"
+"X-Launchpad-Export-Date: 2016-03-29 05:40+0000\n"
+"X-Generator: Launchpad (build 17967)\n"
 "Language: da\n"
 
 #: indicator/messagingmenu.cpp:299
@@ -147,7 +147,7 @@
 msgid "No text messages sent today"
 msgstr ""
 
-#: indicator/ussdindicator.cpp:116 indicator/textchannelobserver.cpp:312
+#: indicator/textchannelobserver.cpp:312 indicator/ussdindicator.cpp:116
 msgid "Ok"
 msgstr "O.k."
 
diff -Nru telephony-service-0.1+16.04.20160321.2/po/de.po telephony-service-0.1+16.04.20160331.4/po/de.po
--- telephony-service-0.1+16.04.20160321.2/po/de.po	2016-03-21 20:11:03.000000000 +0000
+++ telephony-service-0.1+16.04.20160331.4/po/de.po	2016-03-31 22:17:29.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-03-15 06:08+0000\n"
-"X-Generator: Launchpad (build 17939)\n"
+"X-Launchpad-Export-Date: 2016-03-29 05:40+0000\n"
+"X-Generator: Launchpad (build 17967)\n"
 "Language: de\n"
 
 #: indicator/messagingmenu.cpp:299
@@ -149,7 +149,7 @@
 msgid "No text messages sent today"
 msgstr "Heute keine SMS gesendet"
 
-#: indicator/ussdindicator.cpp:116 indicator/textchannelobserver.cpp:312
+#: indicator/textchannelobserver.cpp:312 indicator/ussdindicator.cpp:116
 msgid "Ok"
 msgstr "OK"
 
diff -Nru telephony-service-0.1+16.04.20160321.2/po/el.po telephony-service-0.1+16.04.20160331.4/po/el.po
--- telephony-service-0.1+16.04.20160321.2/po/el.po	2016-03-21 20:11:03.000000000 +0000
+++ telephony-service-0.1+16.04.20160331.4/po/el.po	2016-03-31 22:17:29.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-03-15 06:08+0000\n"
-"X-Generator: Launchpad (build 17939)\n"
+"X-Launchpad-Export-Date: 2016-03-29 05:40+0000\n"
+"X-Generator: Launchpad (build 17967)\n"
 
 #: indicator/messagingmenu.cpp:299
 #, qt-format
@@ -148,7 +148,7 @@
 msgid "No text messages sent today"
 msgstr "Δεν στάλθηκαν μηνύματα σήμερα"
 
-#: indicator/ussdindicator.cpp:116 indicator/textchannelobserver.cpp:312
+#: indicator/textchannelobserver.cpp:312 indicator/ussdindicator.cpp:116
 msgid "Ok"
 msgstr "Εντάξει"
 
diff -Nru telephony-service-0.1+16.04.20160321.2/po/en_AU.po telephony-service-0.1+16.04.20160331.4/po/en_AU.po
--- telephony-service-0.1+16.04.20160321.2/po/en_AU.po	2016-03-21 20:11:03.000000000 +0000
+++ telephony-service-0.1+16.04.20160331.4/po/en_AU.po	2016-03-31 22:17:29.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-03-15 06:08+0000\n"
-"X-Generator: Launchpad (build 17939)\n"
+"X-Launchpad-Export-Date: 2016-03-29 05:40+0000\n"
+"X-Generator: Launchpad (build 17967)\n"
 "Language: \n"
 
 #: indicator/messagingmenu.cpp:299
@@ -147,7 +147,7 @@
 msgid "No text messages sent today"
 msgstr "No text messages sent today"
 
-#: indicator/ussdindicator.cpp:116 indicator/textchannelobserver.cpp:312
+#: indicator/textchannelobserver.cpp:312 indicator/ussdindicator.cpp:116
 msgid "Ok"
 msgstr "Ok"
 
diff -Nru telephony-service-0.1+16.04.20160321.2/po/en_GB.po telephony-service-0.1+16.04.20160331.4/po/en_GB.po
--- telephony-service-0.1+16.04.20160321.2/po/en_GB.po	2016-03-21 20:11:03.000000000 +0000
+++ telephony-service-0.1+16.04.20160331.4/po/en_GB.po	2016-03-31 22:17:29.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-03-15 06:08+0000\n"
-"X-Generator: Launchpad (build 17939)\n"
+"X-Launchpad-Export-Date: 2016-03-29 05:40+0000\n"
+"X-Generator: Launchpad (build 17967)\n"
 "Language: \n"
 
 #: indicator/messagingmenu.cpp:299
@@ -147,7 +147,7 @@
 msgid "No text messages sent today"
 msgstr "No text messages sent today"
 
-#: indicator/ussdindicator.cpp:116 indicator/textchannelobserver.cpp:312
+#: indicator/textchannelobserver.cpp:312 indicator/ussdindicator.cpp:116
 msgid "Ok"
 msgstr "Ok"
 
diff -Nru telephony-service-0.1+16.04.20160321.2/po/es.po telephony-service-0.1+16.04.20160331.4/po/es.po
--- telephony-service-0.1+16.04.20160321.2/po/es.po	2016-03-21 20:11:03.000000000 +0000
+++ telephony-service-0.1+16.04.20160331.4/po/es.po	2016-03-31 22:17:29.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-03-15 06:08+0000\n"
-"X-Generator: Launchpad (build 17939)\n"
+"X-Launchpad-Export-Date: 2016-03-29 05:40+0000\n"
+"X-Generator: Launchpad (build 17967)\n"
 "Language: es\n"
 
 #: indicator/messagingmenu.cpp:299
@@ -149,7 +149,7 @@
 msgid "No text messages sent today"
 msgstr "No se enviaron mensajes de texto hoy"
 
-#: indicator/ussdindicator.cpp:116 indicator/textchannelobserver.cpp:312
+#: indicator/textchannelobserver.cpp:312 indicator/ussdindicator.cpp:116
 msgid "Ok"
 msgstr "Aceptar"
 
diff -Nru telephony-service-0.1+16.04.20160321.2/po/eu.po telephony-service-0.1+16.04.20160331.4/po/eu.po
--- telephony-service-0.1+16.04.20160321.2/po/eu.po	2016-03-21 20:11:03.000000000 +0000
+++ telephony-service-0.1+16.04.20160331.4/po/eu.po	2016-03-31 22:17:29.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-03-15 06:08+0000\n"
-"X-Generator: Launchpad (build 17939)\n"
+"X-Launchpad-Export-Date: 2016-03-29 05:40+0000\n"
+"X-Generator: Launchpad (build 17967)\n"
 
 #: indicator/messagingmenu.cpp:299
 #, qt-format
@@ -147,7 +147,7 @@
 msgid "No text messages sent today"
 msgstr "Gaur ez duzu testu-mezurik bidali"
 
-#: indicator/ussdindicator.cpp:116 indicator/textchannelobserver.cpp:312
+#: indicator/textchannelobserver.cpp:312 indicator/ussdindicator.cpp:116
 msgid "Ok"
 msgstr "Ados"
 
diff -Nru telephony-service-0.1+16.04.20160321.2/po/fa.po telephony-service-0.1+16.04.20160331.4/po/fa.po
--- telephony-service-0.1+16.04.20160321.2/po/fa.po	2016-03-21 20:11:03.000000000 +0000
+++ telephony-service-0.1+16.04.20160331.4/po/fa.po	2016-03-31 22:17:29.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-03-15 06:08+0000\n"
-"X-Generator: Launchpad (build 17939)\n"
+"X-Launchpad-Export-Date: 2016-03-29 05:40+0000\n"
+"X-Generator: Launchpad (build 17967)\n"
 
 #: indicator/messagingmenu.cpp:299
 #, qt-format
@@ -144,7 +144,7 @@
 msgid "No text messages sent today"
 msgstr "امروز پیام متنی‌ای فرستاده نشد"
 
-#: indicator/ussdindicator.cpp:116 indicator/textchannelobserver.cpp:312
+#: indicator/textchannelobserver.cpp:312 indicator/ussdindicator.cpp:116
 msgid "Ok"
 msgstr "باشه"
 
diff -Nru telephony-service-0.1+16.04.20160321.2/po/fi.po telephony-service-0.1+16.04.20160331.4/po/fi.po
--- telephony-service-0.1+16.04.20160321.2/po/fi.po	2016-03-21 20:11:03.000000000 +0000
+++ telephony-service-0.1+16.04.20160331.4/po/fi.po	2016-03-31 22:17:29.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-03-15 06:08+0000\n"
-"X-Generator: Launchpad (build 17939)\n"
+"X-Launchpad-Export-Date: 2016-03-29 05:40+0000\n"
+"X-Generator: Launchpad (build 17967)\n"
 "Language: fi\n"
 
 #: indicator/messagingmenu.cpp:299
@@ -149,7 +149,7 @@
 msgid "No text messages sent today"
 msgstr "Ei lähetettyjä tekstiviestejä tänään"
 
-#: indicator/ussdindicator.cpp:116 indicator/textchannelobserver.cpp:312
+#: indicator/textchannelobserver.cpp:312 indicator/ussdindicator.cpp:116
 msgid "Ok"
 msgstr "OK"
 
diff -Nru telephony-service-0.1+16.04.20160321.2/po/fr.po telephony-service-0.1+16.04.20160331.4/po/fr.po
--- telephony-service-0.1+16.04.20160321.2/po/fr.po	2016-03-21 20:11:03.000000000 +0000
+++ telephony-service-0.1+16.04.20160331.4/po/fr.po	2016-03-31 22:17:29.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-03-15 06:08+0000\n"
-"X-Generator: Launchpad (build 17939)\n"
+"X-Launchpad-Export-Date: 2016-03-29 05:40+0000\n"
+"X-Generator: Launchpad (build 17967)\n"
 "Language: fr\n"
 
 #: indicator/messagingmenu.cpp:299
@@ -148,7 +148,7 @@
 msgid "No text messages sent today"
 msgstr "Pas de SMS envoyés aujourd'hui"
 
-#: indicator/ussdindicator.cpp:116 indicator/textchannelobserver.cpp:312
+#: indicator/textchannelobserver.cpp:312 indicator/ussdindicator.cpp:116
 msgid "Ok"
 msgstr "Ok"
 
diff -Nru telephony-service-0.1+16.04.20160321.2/po/gd.po telephony-service-0.1+16.04.20160331.4/po/gd.po
--- telephony-service-0.1+16.04.20160321.2/po/gd.po	2016-03-21 20:11:03.000000000 +0000
+++ telephony-service-0.1+16.04.20160331.4/po/gd.po	2016-03-31 22:17:29.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-03-15 06:08+0000\n"
-"X-Generator: Launchpad (build 17939)\n"
+"X-Launchpad-Export-Date: 2016-03-29 05:40+0000\n"
+"X-Generator: Launchpad (build 17967)\n"
 "Language: gd\n"
 
 #: indicator/messagingmenu.cpp:299
@@ -154,7 +154,7 @@
 msgid "No text messages sent today"
 msgstr "Cha do chuireadh teachdaireachd an-diugh"
 
-#: indicator/ussdindicator.cpp:116 indicator/textchannelobserver.cpp:312
+#: indicator/textchannelobserver.cpp:312 indicator/ussdindicator.cpp:116
 msgid "Ok"
 msgstr "Ceart ma-thà"
 
diff -Nru telephony-service-0.1+16.04.20160321.2/po/gl.po telephony-service-0.1+16.04.20160331.4/po/gl.po
--- telephony-service-0.1+16.04.20160321.2/po/gl.po	2016-03-21 20:11:03.000000000 +0000
+++ telephony-service-0.1+16.04.20160331.4/po/gl.po	2016-03-31 22:17:29.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-03-15 06:08+0000\n"
-"X-Generator: Launchpad (build 17939)\n"
+"X-Launchpad-Export-Date: 2016-03-29 05:40+0000\n"
+"X-Generator: Launchpad (build 17967)\n"
 
 #: indicator/messagingmenu.cpp:299
 #, qt-format
@@ -146,7 +146,7 @@
 msgid "No text messages sent today"
 msgstr "Hoxe non enviou mensaxes de texto"
 
-#: indicator/ussdindicator.cpp:116 indicator/textchannelobserver.cpp:312
+#: indicator/textchannelobserver.cpp:312 indicator/ussdindicator.cpp:116
 msgid "Ok"
 msgstr "Aceptar"
 
diff -Nru telephony-service-0.1+16.04.20160321.2/po/he.po telephony-service-0.1+16.04.20160331.4/po/he.po
--- telephony-service-0.1+16.04.20160321.2/po/he.po	2016-03-21 20:11:03.000000000 +0000
+++ telephony-service-0.1+16.04.20160331.4/po/he.po	2016-03-31 22:17:29.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-03-15 06:08+0000\n"
-"X-Generator: Launchpad (build 17939)\n"
+"X-Launchpad-Export-Date: 2016-03-29 05:40+0000\n"
+"X-Generator: Launchpad (build 17967)\n"
 "Language: he\n"
 
 #: indicator/messagingmenu.cpp:299
@@ -147,7 +147,7 @@
 msgid "No text messages sent today"
 msgstr "לא נשלחו הודעות היום"
 
-#: indicator/ussdindicator.cpp:116 indicator/textchannelobserver.cpp:312
+#: indicator/textchannelobserver.cpp:312 indicator/ussdindicator.cpp:116
 msgid "Ok"
 msgstr "אישור"
 
diff -Nru telephony-service-0.1+16.04.20160321.2/po/hr.po telephony-service-0.1+16.04.20160331.4/po/hr.po
--- telephony-service-0.1+16.04.20160321.2/po/hr.po	2016-03-21 20:11:03.000000000 +0000
+++ telephony-service-0.1+16.04.20160331.4/po/hr.po	2016-03-31 22:17:29.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-03-15 06:08+0000\n"
-"X-Generator: Launchpad (build 17939)\n"
+"X-Launchpad-Export-Date: 2016-03-29 05:40+0000\n"
+"X-Generator: Launchpad (build 17967)\n"
 
 #: indicator/messagingmenu.cpp:299
 #, qt-format
@@ -151,7 +151,7 @@
 msgid "No text messages sent today"
 msgstr "Danas nema poslanih poruka"
 
-#: indicator/ussdindicator.cpp:116 indicator/textchannelobserver.cpp:312
+#: indicator/textchannelobserver.cpp:312 indicator/ussdindicator.cpp:116
 msgid "Ok"
 msgstr "U redu"
 
diff -Nru telephony-service-0.1+16.04.20160321.2/po/hu.po telephony-service-0.1+16.04.20160331.4/po/hu.po
--- telephony-service-0.1+16.04.20160321.2/po/hu.po	2016-03-21 20:11:03.000000000 +0000
+++ telephony-service-0.1+16.04.20160331.4/po/hu.po	2016-03-31 22:17:29.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-03-15 06:08+0000\n"
-"X-Generator: Launchpad (build 17939)\n"
+"X-Launchpad-Export-Date: 2016-03-29 05:40+0000\n"
+"X-Generator: Launchpad (build 17967)\n"
 "Language: hu\n"
 
 #: indicator/messagingmenu.cpp:299
@@ -149,7 +149,7 @@
 msgid "No text messages sent today"
 msgstr "Nem küldött szöveges üzenetet ma"
 
-#: indicator/ussdindicator.cpp:116 indicator/textchannelobserver.cpp:312
+#: indicator/textchannelobserver.cpp:312 indicator/ussdindicator.cpp:116
 msgid "Ok"
 msgstr "OK"
 
diff -Nru telephony-service-0.1+16.04.20160321.2/po/ia.po telephony-service-0.1+16.04.20160331.4/po/ia.po
--- telephony-service-0.1+16.04.20160321.2/po/ia.po	2016-03-21 20:11:03.000000000 +0000
+++ telephony-service-0.1+16.04.20160331.4/po/ia.po	2016-03-31 22:17:29.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-03-15 06:08+0000\n"
-"X-Generator: Launchpad (build 17939)\n"
+"X-Launchpad-Export-Date: 2016-03-29 05:40+0000\n"
+"X-Generator: Launchpad (build 17967)\n"
 
 #: indicator/messagingmenu.cpp:299
 #, qt-format
@@ -146,7 +146,7 @@
 msgid "No text messages sent today"
 msgstr "Necun messages de texto expedite hodie"
 
-#: indicator/ussdindicator.cpp:116 indicator/textchannelobserver.cpp:312
+#: indicator/textchannelobserver.cpp:312 indicator/ussdindicator.cpp:116
 msgid "Ok"
 msgstr "OK"
 
diff -Nru telephony-service-0.1+16.04.20160321.2/po/id.po telephony-service-0.1+16.04.20160331.4/po/id.po
--- telephony-service-0.1+16.04.20160321.2/po/id.po	2016-03-21 20:11:03.000000000 +0000
+++ telephony-service-0.1+16.04.20160331.4/po/id.po	2016-03-31 22:17:29.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-03-15 06:08+0000\n"
-"X-Generator: Launchpad (build 17939)\n"
+"X-Launchpad-Export-Date: 2016-03-29 05:40+0000\n"
+"X-Generator: Launchpad (build 17967)\n"
 
 #: indicator/messagingmenu.cpp:299
 #, qt-format
@@ -146,7 +146,7 @@
 msgid "No text messages sent today"
 msgstr ""
 
-#: indicator/ussdindicator.cpp:116 indicator/textchannelobserver.cpp:312
+#: indicator/textchannelobserver.cpp:312 indicator/ussdindicator.cpp:116
 msgid "Ok"
 msgstr ""
 
diff -Nru telephony-service-0.1+16.04.20160321.2/po/is.po telephony-service-0.1+16.04.20160331.4/po/is.po
--- telephony-service-0.1+16.04.20160321.2/po/is.po	2016-03-21 20:11:03.000000000 +0000
+++ telephony-service-0.1+16.04.20160331.4/po/is.po	2016-03-31 22:17:29.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-03-15 06:08+0000\n"
-"X-Generator: Launchpad (build 17939)\n"
+"X-Launchpad-Export-Date: 2016-03-29 05:40+0000\n"
+"X-Generator: Launchpad (build 17967)\n"
 
 #: indicator/messagingmenu.cpp:299
 #, qt-format
@@ -146,7 +146,7 @@
 msgid "No text messages sent today"
 msgstr "Engin textaskilaboð send í dag"
 
-#: indicator/ussdindicator.cpp:116 indicator/textchannelobserver.cpp:312
+#: indicator/textchannelobserver.cpp:312 indicator/ussdindicator.cpp:116
 msgid "Ok"
 msgstr "Í lagi"
 
diff -Nru telephony-service-0.1+16.04.20160321.2/po/it.po telephony-service-0.1+16.04.20160331.4/po/it.po
--- telephony-service-0.1+16.04.20160321.2/po/it.po	2016-03-21 20:11:03.000000000 +0000
+++ telephony-service-0.1+16.04.20160331.4/po/it.po	2016-03-31 22:17:29.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-03-15 06:08+0000\n"
-"X-Generator: Launchpad (build 17939)\n"
+"X-Launchpad-Export-Date: 2016-03-29 05:40+0000\n"
+"X-Generator: Launchpad (build 17967)\n"
 "Language: it\n"
 
 #: indicator/messagingmenu.cpp:299
@@ -147,7 +147,7 @@
 msgid "No text messages sent today"
 msgstr "Nessun messaggio di testo inviato oggi"
 
-#: indicator/ussdindicator.cpp:116 indicator/textchannelobserver.cpp:312
+#: indicator/textchannelobserver.cpp:312 indicator/ussdindicator.cpp:116
 msgid "Ok"
 msgstr "OK"
 
diff -Nru telephony-service-0.1+16.04.20160321.2/po/ja.po telephony-service-0.1+16.04.20160331.4/po/ja.po
--- telephony-service-0.1+16.04.20160321.2/po/ja.po	2016-03-21 20:11:03.000000000 +0000
+++ telephony-service-0.1+16.04.20160331.4/po/ja.po	2016-03-31 22:17:29.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-03-15 06:08+0000\n"
-"X-Generator: Launchpad (build 17939)\n"
+"X-Launchpad-Export-Date: 2016-03-29 05:40+0000\n"
+"X-Generator: Launchpad (build 17967)\n"
 
 #: indicator/messagingmenu.cpp:299
 #, qt-format
@@ -144,7 +144,7 @@
 msgid "No text messages sent today"
 msgstr "本日のメッセージの送信なし"
 
-#: indicator/ussdindicator.cpp:116 indicator/textchannelobserver.cpp:312
+#: indicator/textchannelobserver.cpp:312 indicator/ussdindicator.cpp:116
 msgid "Ok"
 msgstr "OK"
 
diff -Nru telephony-service-0.1+16.04.20160321.2/po/km.po telephony-service-0.1+16.04.20160331.4/po/km.po
--- telephony-service-0.1+16.04.20160321.2/po/km.po	2016-03-21 20:11:03.000000000 +0000
+++ telephony-service-0.1+16.04.20160331.4/po/km.po	2016-03-31 22:17:29.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-03-15 06:08+0000\n"
-"X-Generator: Launchpad (build 17939)\n"
+"X-Launchpad-Export-Date: 2016-03-29 05:40+0000\n"
+"X-Generator: Launchpad (build 17967)\n"
 
 #: indicator/messagingmenu.cpp:299
 #, qt-format
@@ -145,7 +145,7 @@
 msgid "No text messages sent today"
 msgstr "ថ្ងៃនេះ​មិន​បាន​ផ្ញើ​សារ"
 
-#: indicator/ussdindicator.cpp:116 indicator/textchannelobserver.cpp:312
+#: indicator/textchannelobserver.cpp:312 indicator/ussdindicator.cpp:116
 msgid "Ok"
 msgstr "យល់ព្រម"
 
diff -Nru telephony-service-0.1+16.04.20160321.2/po/ko.po telephony-service-0.1+16.04.20160331.4/po/ko.po
--- telephony-service-0.1+16.04.20160321.2/po/ko.po	2016-03-21 20:11:03.000000000 +0000
+++ telephony-service-0.1+16.04.20160331.4/po/ko.po	2016-03-31 22:17:29.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-03-15 06:08+0000\n"
-"X-Generator: Launchpad (build 17939)\n"
+"X-Launchpad-Export-Date: 2016-03-29 05:40+0000\n"
+"X-Generator: Launchpad (build 17967)\n"
 "Language: ko\n"
 
 #: indicator/messagingmenu.cpp:299
@@ -145,7 +145,7 @@
 msgid "No text messages sent today"
 msgstr "오늘 보낸 텍스트 메시지가 없습니다."
 
-#: indicator/ussdindicator.cpp:116 indicator/textchannelobserver.cpp:312
+#: indicator/textchannelobserver.cpp:312 indicator/ussdindicator.cpp:116
 msgid "Ok"
 msgstr "확인"
 
diff -Nru telephony-service-0.1+16.04.20160321.2/po/lv.po telephony-service-0.1+16.04.20160331.4/po/lv.po
--- telephony-service-0.1+16.04.20160321.2/po/lv.po	2016-03-21 20:11:03.000000000 +0000
+++ telephony-service-0.1+16.04.20160331.4/po/lv.po	2016-03-31 22:17:29.000000000 +0000
@@ -16,8 +16,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-03-15 06:08+0000\n"
-"X-Generator: Launchpad (build 17939)\n"
+"X-Launchpad-Export-Date: 2016-03-29 05:40+0000\n"
+"X-Generator: Launchpad (build 17967)\n"
 "Language: lv\n"
 
 #: indicator/messagingmenu.cpp:299
@@ -151,7 +151,7 @@
 msgid "No text messages sent today"
 msgstr "Šodien nav sūtītu īsziņu"
 
-#: indicator/ussdindicator.cpp:116 indicator/textchannelobserver.cpp:312
+#: indicator/textchannelobserver.cpp:312 indicator/ussdindicator.cpp:116
 msgid "Ok"
 msgstr "Labi"
 
diff -Nru telephony-service-0.1+16.04.20160321.2/po/ms.po telephony-service-0.1+16.04.20160331.4/po/ms.po
--- telephony-service-0.1+16.04.20160321.2/po/ms.po	2016-03-21 20:11:03.000000000 +0000
+++ telephony-service-0.1+16.04.20160331.4/po/ms.po	2016-03-31 22:17:29.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-03-15 06:08+0000\n"
-"X-Generator: Launchpad (build 17939)\n"
+"X-Launchpad-Export-Date: 2016-03-29 05:40+0000\n"
+"X-Generator: Launchpad (build 17967)\n"
 
 #: indicator/messagingmenu.cpp:299
 #, qt-format
@@ -146,7 +146,7 @@
 msgid "No text messages sent today"
 msgstr "Tiada mesej teks dihantar hari ini"
 
-#: indicator/ussdindicator.cpp:116 indicator/textchannelobserver.cpp:312
+#: indicator/textchannelobserver.cpp:312 indicator/ussdindicator.cpp:116
 msgid "Ok"
 msgstr "Ok"
 
diff -Nru telephony-service-0.1+16.04.20160321.2/po/my.po telephony-service-0.1+16.04.20160331.4/po/my.po
--- telephony-service-0.1+16.04.20160321.2/po/my.po	2016-03-21 20:11:03.000000000 +0000
+++ telephony-service-0.1+16.04.20160331.4/po/my.po	2016-03-31 22:17:29.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-03-15 06:08+0000\n"
-"X-Generator: Launchpad (build 17939)\n"
+"X-Launchpad-Export-Date: 2016-03-29 05:40+0000\n"
+"X-Generator: Launchpad (build 17967)\n"
 "Language: my\n"
 
 #: indicator/messagingmenu.cpp:299
@@ -145,7 +145,7 @@
 msgid "No text messages sent today"
 msgstr ""
 
-#: indicator/ussdindicator.cpp:116 indicator/textchannelobserver.cpp:312
+#: indicator/textchannelobserver.cpp:312 indicator/ussdindicator.cpp:116
 msgid "Ok"
 msgstr ""
 
diff -Nru telephony-service-0.1+16.04.20160321.2/po/nb.po telephony-service-0.1+16.04.20160331.4/po/nb.po
--- telephony-service-0.1+16.04.20160321.2/po/nb.po	2016-03-21 20:11:03.000000000 +0000
+++ telephony-service-0.1+16.04.20160331.4/po/nb.po	2016-03-31 22:17:29.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-03-15 06:08+0000\n"
-"X-Generator: Launchpad (build 17939)\n"
+"X-Launchpad-Export-Date: 2016-03-29 05:40+0000\n"
+"X-Generator: Launchpad (build 17967)\n"
 "Language: nb\n"
 
 #: indicator/messagingmenu.cpp:299
@@ -147,7 +147,7 @@
 msgid "No text messages sent today"
 msgstr "Ingen sendte tekstmeldinger i dag"
 
-#: indicator/ussdindicator.cpp:116 indicator/textchannelobserver.cpp:312
+#: indicator/textchannelobserver.cpp:312 indicator/ussdindicator.cpp:116
 msgid "Ok"
 msgstr "OK"
 
diff -Nru telephony-service-0.1+16.04.20160321.2/po/ne.po telephony-service-0.1+16.04.20160331.4/po/ne.po
--- telephony-service-0.1+16.04.20160321.2/po/ne.po	2016-03-21 20:11:03.000000000 +0000
+++ telephony-service-0.1+16.04.20160331.4/po/ne.po	2016-03-31 22:17:29.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-03-15 06:08+0000\n"
-"X-Generator: Launchpad (build 17939)\n"
+"X-Launchpad-Export-Date: 2016-03-29 05:40+0000\n"
+"X-Generator: Launchpad (build 17967)\n"
 
 #: indicator/messagingmenu.cpp:299
 #, qt-format
@@ -146,7 +146,7 @@
 msgid "No text messages sent today"
 msgstr ""
 
-#: indicator/ussdindicator.cpp:116 indicator/textchannelobserver.cpp:312
+#: indicator/textchannelobserver.cpp:312 indicator/ussdindicator.cpp:116
 msgid "Ok"
 msgstr "ठिक छ"
 
diff -Nru telephony-service-0.1+16.04.20160321.2/po/nl.po telephony-service-0.1+16.04.20160331.4/po/nl.po
--- telephony-service-0.1+16.04.20160321.2/po/nl.po	2016-03-21 20:11:03.000000000 +0000
+++ telephony-service-0.1+16.04.20160331.4/po/nl.po	2016-03-31 22:17:29.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-03-15 06:08+0000\n"
-"X-Generator: Launchpad (build 17939)\n"
+"X-Launchpad-Export-Date: 2016-03-29 05:40+0000\n"
+"X-Generator: Launchpad (build 17967)\n"
 
 #: indicator/messagingmenu.cpp:299
 #, qt-format
@@ -148,7 +148,7 @@
 msgid "No text messages sent today"
 msgstr "Geen sms-berichten verstuurd vandaag"
 
-#: indicator/ussdindicator.cpp:116 indicator/textchannelobserver.cpp:312
+#: indicator/textchannelobserver.cpp:312 indicator/ussdindicator.cpp:116
 msgid "Ok"
 msgstr "Ok"
 
diff -Nru telephony-service-0.1+16.04.20160321.2/po/oc.po telephony-service-0.1+16.04.20160331.4/po/oc.po
--- telephony-service-0.1+16.04.20160321.2/po/oc.po	2016-03-21 20:11:03.000000000 +0000
+++ telephony-service-0.1+16.04.20160331.4/po/oc.po	2016-03-31 22:17:29.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-03-15 06:08+0000\n"
-"X-Generator: Launchpad (build 17939)\n"
+"X-Launchpad-Export-Date: 2016-03-29 05:40+0000\n"
+"X-Generator: Launchpad (build 17967)\n"
 
 #: indicator/messagingmenu.cpp:299
 #, qt-format
@@ -146,7 +146,7 @@
 msgid "No text messages sent today"
 msgstr "Pas de SMS recebuts uèi"
 
-#: indicator/ussdindicator.cpp:116 indicator/textchannelobserver.cpp:312
+#: indicator/textchannelobserver.cpp:312 indicator/ussdindicator.cpp:116
 msgid "Ok"
 msgstr "D'acòrdi"
 
diff -Nru telephony-service-0.1+16.04.20160321.2/po/pa.po telephony-service-0.1+16.04.20160331.4/po/pa.po
--- telephony-service-0.1+16.04.20160321.2/po/pa.po	2016-03-21 20:11:03.000000000 +0000
+++ telephony-service-0.1+16.04.20160331.4/po/pa.po	2016-03-31 22:17:29.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-03-15 06:08+0000\n"
-"X-Generator: Launchpad (build 17939)\n"
+"X-Launchpad-Export-Date: 2016-03-29 05:40+0000\n"
+"X-Generator: Launchpad (build 17967)\n"
 
 #: indicator/messagingmenu.cpp:299
 #, qt-format
@@ -146,7 +146,7 @@
 msgid "No text messages sent today"
 msgstr "ਅੱਜ ਕੋਈ ਟੈਕਸਟ ਸੁਨੇਹਾ ਨਹੀਂ ਭੇਜਿਆ"
 
-#: indicator/ussdindicator.cpp:116 indicator/textchannelobserver.cpp:312
+#: indicator/textchannelobserver.cpp:312 indicator/ussdindicator.cpp:116
 msgid "Ok"
 msgstr "ਠੀਕ"
 
diff -Nru telephony-service-0.1+16.04.20160321.2/po/pl.po telephony-service-0.1+16.04.20160331.4/po/pl.po
--- telephony-service-0.1+16.04.20160321.2/po/pl.po	2016-03-21 20:11:03.000000000 +0000
+++ telephony-service-0.1+16.04.20160331.4/po/pl.po	2016-03-31 22:17:29.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-03-15 06:08+0000\n"
-"X-Generator: Launchpad (build 17939)\n"
+"X-Launchpad-Export-Date: 2016-03-29 05:40+0000\n"
+"X-Generator: Launchpad (build 17967)\n"
 "Language: pl\n"
 
 #: indicator/messagingmenu.cpp:299
@@ -152,7 +152,7 @@
 msgid "No text messages sent today"
 msgstr "Dziś nie wysyłano wiadomości"
 
-#: indicator/ussdindicator.cpp:116 indicator/textchannelobserver.cpp:312
+#: indicator/textchannelobserver.cpp:312 indicator/ussdindicator.cpp:116
 msgid "Ok"
 msgstr "Ok"
 
diff -Nru telephony-service-0.1+16.04.20160321.2/po/pt_BR.po telephony-service-0.1+16.04.20160331.4/po/pt_BR.po
--- telephony-service-0.1+16.04.20160321.2/po/pt_BR.po	2016-03-21 20:11:03.000000000 +0000
+++ telephony-service-0.1+16.04.20160331.4/po/pt_BR.po	2016-03-31 22:17:29.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-03-15 06:08+0000\n"
-"X-Generator: Launchpad (build 17939)\n"
+"X-Launchpad-Export-Date: 2016-03-29 05:40+0000\n"
+"X-Generator: Launchpad (build 17967)\n"
 "Language: pt_BR\n"
 
 #: indicator/messagingmenu.cpp:299
@@ -148,7 +148,7 @@
 msgid "No text messages sent today"
 msgstr "Nenhuma mensagem de texto enviada hoje"
 
-#: indicator/ussdindicator.cpp:116 indicator/textchannelobserver.cpp:312
+#: indicator/textchannelobserver.cpp:312 indicator/ussdindicator.cpp:116
 msgid "Ok"
 msgstr "Ok"
 
diff -Nru telephony-service-0.1+16.04.20160321.2/po/pt.po telephony-service-0.1+16.04.20160331.4/po/pt.po
--- telephony-service-0.1+16.04.20160321.2/po/pt.po	2016-03-21 20:11:03.000000000 +0000
+++ telephony-service-0.1+16.04.20160331.4/po/pt.po	2016-03-31 22:17:29.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-03-15 06:08+0000\n"
-"X-Generator: Launchpad (build 17939)\n"
+"X-Launchpad-Export-Date: 2016-03-29 05:40+0000\n"
+"X-Generator: Launchpad (build 17967)\n"
 
 #: indicator/messagingmenu.cpp:299
 #, qt-format
@@ -146,7 +146,7 @@
 msgid "No text messages sent today"
 msgstr "Sem mensagens de texto enviadas hoje"
 
-#: indicator/ussdindicator.cpp:116 indicator/textchannelobserver.cpp:312
+#: indicator/textchannelobserver.cpp:312 indicator/ussdindicator.cpp:116
 msgid "Ok"
 msgstr "Ok"
 
diff -Nru telephony-service-0.1+16.04.20160321.2/po/ro.po telephony-service-0.1+16.04.20160331.4/po/ro.po
--- telephony-service-0.1+16.04.20160321.2/po/ro.po	2016-03-21 20:11:03.000000000 +0000
+++ telephony-service-0.1+16.04.20160331.4/po/ro.po	2016-03-31 22:17:29.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-03-15 06:08+0000\n"
-"X-Generator: Launchpad (build 17939)\n"
+"X-Launchpad-Export-Date: 2016-03-29 05:40+0000\n"
+"X-Generator: Launchpad (build 17967)\n"
 
 #: indicator/messagingmenu.cpp:299
 #, qt-format
@@ -150,7 +150,7 @@
 msgid "No text messages sent today"
 msgstr "Niciun mesaj text trimis astăzi"
 
-#: indicator/ussdindicator.cpp:116 indicator/textchannelobserver.cpp:312
+#: indicator/textchannelobserver.cpp:312 indicator/ussdindicator.cpp:116
 msgid "Ok"
 msgstr "În regulă"
 
diff -Nru telephony-service-0.1+16.04.20160321.2/po/ru.po telephony-service-0.1+16.04.20160331.4/po/ru.po
--- telephony-service-0.1+16.04.20160321.2/po/ru.po	2016-03-21 20:11:03.000000000 +0000
+++ telephony-service-0.1+16.04.20160331.4/po/ru.po	2016-03-31 22:17:29.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-03-15 06:08+0000\n"
-"X-Generator: Launchpad (build 17939)\n"
+"X-Launchpad-Export-Date: 2016-03-29 05:40+0000\n"
+"X-Generator: Launchpad (build 17967)\n"
 "Language: ru\n"
 
 #: indicator/messagingmenu.cpp:299
@@ -150,7 +150,7 @@
 msgid "No text messages sent today"
 msgstr "Нет отправленных сообщений сегодня"
 
-#: indicator/ussdindicator.cpp:116 indicator/textchannelobserver.cpp:312
+#: indicator/textchannelobserver.cpp:312 indicator/ussdindicator.cpp:116
 msgid "Ok"
 msgstr "ОК"
 
diff -Nru telephony-service-0.1+16.04.20160321.2/po/sk.po telephony-service-0.1+16.04.20160331.4/po/sk.po
--- telephony-service-0.1+16.04.20160321.2/po/sk.po	2016-03-21 20:11:03.000000000 +0000
+++ telephony-service-0.1+16.04.20160331.4/po/sk.po	2016-03-31 22:17:29.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-03-15 06:08+0000\n"
-"X-Generator: Launchpad (build 17939)\n"
+"X-Launchpad-Export-Date: 2016-03-29 05:40+0000\n"
+"X-Generator: Launchpad (build 17967)\n"
 "Language: sk\n"
 
 #: indicator/messagingmenu.cpp:299
@@ -149,7 +149,7 @@
 msgid "No text messages sent today"
 msgstr "Dnes žiadna odoslaná správa"
 
-#: indicator/ussdindicator.cpp:116 indicator/textchannelobserver.cpp:312
+#: indicator/textchannelobserver.cpp:312 indicator/ussdindicator.cpp:116
 msgid "Ok"
 msgstr "Ok"
 
diff -Nru telephony-service-0.1+16.04.20160321.2/po/sl.po telephony-service-0.1+16.04.20160331.4/po/sl.po
--- telephony-service-0.1+16.04.20160321.2/po/sl.po	2016-03-21 20:11:03.000000000 +0000
+++ telephony-service-0.1+16.04.20160331.4/po/sl.po	2016-03-31 22:17:29.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-03-15 06:08+0000\n"
-"X-Generator: Launchpad (build 17939)\n"
+"X-Launchpad-Export-Date: 2016-03-29 05:40+0000\n"
+"X-Generator: Launchpad (build 17967)\n"
 
 #: indicator/messagingmenu.cpp:299
 #, qt-format
@@ -152,7 +152,7 @@
 msgid "No text messages sent today"
 msgstr "Danes ni bilo poslanih besedilnih sporočil"
 
-#: indicator/ussdindicator.cpp:116 indicator/textchannelobserver.cpp:312
+#: indicator/textchannelobserver.cpp:312 indicator/ussdindicator.cpp:116
 msgid "Ok"
 msgstr "V redu"
 
diff -Nru telephony-service-0.1+16.04.20160321.2/po/sr.po telephony-service-0.1+16.04.20160331.4/po/sr.po
--- telephony-service-0.1+16.04.20160321.2/po/sr.po	2016-03-21 20:11:03.000000000 +0000
+++ telephony-service-0.1+16.04.20160331.4/po/sr.po	2016-03-31 22:17:29.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-03-15 06:08+0000\n"
-"X-Generator: Launchpad (build 17939)\n"
+"X-Launchpad-Export-Date: 2016-03-29 05:40+0000\n"
+"X-Generator: Launchpad (build 17967)\n"
 
 #: indicator/messagingmenu.cpp:299
 #, qt-format
@@ -149,7 +149,7 @@
 msgid "No text messages sent today"
 msgstr "Данас није било послатих порука"
 
-#: indicator/ussdindicator.cpp:116 indicator/textchannelobserver.cpp:312
+#: indicator/textchannelobserver.cpp:312 indicator/ussdindicator.cpp:116
 msgid "Ok"
 msgstr "У реду"
 
diff -Nru telephony-service-0.1+16.04.20160321.2/po/sv.po telephony-service-0.1+16.04.20160331.4/po/sv.po
--- telephony-service-0.1+16.04.20160321.2/po/sv.po	2016-03-21 20:11:03.000000000 +0000
+++ telephony-service-0.1+16.04.20160331.4/po/sv.po	2016-03-31 22:17:29.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-03-15 06:08+0000\n"
-"X-Generator: Launchpad (build 17939)\n"
+"X-Launchpad-Export-Date: 2016-03-29 05:40+0000\n"
+"X-Generator: Launchpad (build 17967)\n"
 "Language: sv\n"
 
 #: indicator/messagingmenu.cpp:299
@@ -147,7 +147,7 @@
 msgid "No text messages sent today"
 msgstr "Inga textmeddelanden skickade idag"
 
-#: indicator/ussdindicator.cpp:116 indicator/textchannelobserver.cpp:312
+#: indicator/textchannelobserver.cpp:312 indicator/ussdindicator.cpp:116
 msgid "Ok"
 msgstr "OK"
 
diff -Nru telephony-service-0.1+16.04.20160321.2/po/ta.po telephony-service-0.1+16.04.20160331.4/po/ta.po
--- telephony-service-0.1+16.04.20160321.2/po/ta.po	2016-03-21 20:11:03.000000000 +0000
+++ telephony-service-0.1+16.04.20160331.4/po/ta.po	2016-03-31 22:17:29.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-03-15 06:08+0000\n"
-"X-Generator: Launchpad (build 17939)\n"
+"X-Launchpad-Export-Date: 2016-03-29 05:40+0000\n"
+"X-Generator: Launchpad (build 17967)\n"
 
 #: indicator/messagingmenu.cpp:299
 #, qt-format
@@ -146,7 +146,7 @@
 msgid "No text messages sent today"
 msgstr ""
 
-#: indicator/ussdindicator.cpp:116 indicator/textchannelobserver.cpp:312
+#: indicator/textchannelobserver.cpp:312 indicator/ussdindicator.cpp:116
 msgid "Ok"
 msgstr ""
 
diff -Nru telephony-service-0.1+16.04.20160321.2/po/tr.po telephony-service-0.1+16.04.20160331.4/po/tr.po
--- telephony-service-0.1+16.04.20160321.2/po/tr.po	2016-03-21 20:11:03.000000000 +0000
+++ telephony-service-0.1+16.04.20160331.4/po/tr.po	2016-03-31 22:17:29.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-03-15 06:08+0000\n"
-"X-Generator: Launchpad (build 17939)\n"
+"X-Launchpad-Export-Date: 2016-03-29 05:40+0000\n"
+"X-Generator: Launchpad (build 17967)\n"
 "Language: tr\n"
 
 #: indicator/messagingmenu.cpp:299
@@ -148,7 +148,7 @@
 msgid "No text messages sent today"
 msgstr "Bugün mesaj gönderilmedi"
 
-#: indicator/ussdindicator.cpp:116 indicator/textchannelobserver.cpp:312
+#: indicator/textchannelobserver.cpp:312 indicator/ussdindicator.cpp:116
 msgid "Ok"
 msgstr "Tamam"
 
diff -Nru telephony-service-0.1+16.04.20160321.2/po/ug.po telephony-service-0.1+16.04.20160331.4/po/ug.po
--- telephony-service-0.1+16.04.20160321.2/po/ug.po	2016-03-21 20:11:03.000000000 +0000
+++ telephony-service-0.1+16.04.20160331.4/po/ug.po	2016-03-31 22:17:29.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-03-15 06:08+0000\n"
-"X-Generator: Launchpad (build 17939)\n"
+"X-Launchpad-Export-Date: 2016-03-29 05:40+0000\n"
+"X-Generator: Launchpad (build 17967)\n"
 
 #: indicator/messagingmenu.cpp:299
 #, qt-format
@@ -145,7 +145,7 @@
 msgid "No text messages sent today"
 msgstr "بۈگۈن ھېچقانداق تېكىست ئۇچۇرى ئەۋەتىلمىدى"
 
-#: indicator/ussdindicator.cpp:116 indicator/textchannelobserver.cpp:312
+#: indicator/textchannelobserver.cpp:312 indicator/ussdindicator.cpp:116
 msgid "Ok"
 msgstr "تامام"
 
diff -Nru telephony-service-0.1+16.04.20160321.2/po/uk.po telephony-service-0.1+16.04.20160331.4/po/uk.po
--- telephony-service-0.1+16.04.20160321.2/po/uk.po	2016-03-21 20:11:03.000000000 +0000
+++ telephony-service-0.1+16.04.20160331.4/po/uk.po	2016-03-31 22:17:29.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-03-15 06:08+0000\n"
-"X-Generator: Launchpad (build 17939)\n"
+"X-Launchpad-Export-Date: 2016-03-29 05:40+0000\n"
+"X-Generator: Launchpad (build 17967)\n"
 "Language: uk\n"
 
 #: indicator/messagingmenu.cpp:299
@@ -152,7 +152,7 @@
 msgid "No text messages sent today"
 msgstr "Сьогодні текстових повідомлень не надсилалося"
 
-#: indicator/ussdindicator.cpp:116 indicator/textchannelobserver.cpp:312
+#: indicator/textchannelobserver.cpp:312 indicator/ussdindicator.cpp:116
 msgid "Ok"
 msgstr "Гаразд"
 
diff -Nru telephony-service-0.1+16.04.20160321.2/po/zh_CN.po telephony-service-0.1+16.04.20160331.4/po/zh_CN.po
--- telephony-service-0.1+16.04.20160321.2/po/zh_CN.po	2016-03-21 20:11:03.000000000 +0000
+++ telephony-service-0.1+16.04.20160331.4/po/zh_CN.po	2016-03-31 22:17:29.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-03-15 06:08+0000\n"
-"X-Generator: Launchpad (build 17939)\n"
+"X-Launchpad-Export-Date: 2016-03-29 05:40+0000\n"
+"X-Generator: Launchpad (build 17967)\n"
 "Language: \n"
 
 #: indicator/messagingmenu.cpp:299
@@ -145,7 +145,7 @@
 msgid "No text messages sent today"
 msgstr "今日未发送短信"
 
-#: indicator/ussdindicator.cpp:116 indicator/textchannelobserver.cpp:312
+#: indicator/textchannelobserver.cpp:312 indicator/ussdindicator.cpp:116
 msgid "Ok"
 msgstr "确定"
 
diff -Nru telephony-service-0.1+16.04.20160321.2/po/zh_HK.po telephony-service-0.1+16.04.20160331.4/po/zh_HK.po
--- telephony-service-0.1+16.04.20160321.2/po/zh_HK.po	2016-03-21 20:11:03.000000000 +0000
+++ telephony-service-0.1+16.04.20160331.4/po/zh_HK.po	2016-03-31 22:17:29.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-03-15 06:08+0000\n"
-"X-Generator: Launchpad (build 17939)\n"
+"X-Launchpad-Export-Date: 2016-03-29 05:40+0000\n"
+"X-Generator: Launchpad (build 17967)\n"
 "Language: zh_HK\n"
 
 #: indicator/messagingmenu.cpp:299
@@ -147,7 +147,7 @@
 msgid "No text messages sent today"
 msgstr ""
 
-#: indicator/ussdindicator.cpp:116 indicator/textchannelobserver.cpp:312
+#: indicator/textchannelobserver.cpp:312 indicator/ussdindicator.cpp:116
 msgid "Ok"
 msgstr ""
 
diff -Nru telephony-service-0.1+16.04.20160321.2/po/zh_TW.po telephony-service-0.1+16.04.20160331.4/po/zh_TW.po
--- telephony-service-0.1+16.04.20160321.2/po/zh_TW.po	2016-03-21 20:11:03.000000000 +0000
+++ telephony-service-0.1+16.04.20160331.4/po/zh_TW.po	2016-03-31 22:17:29.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-03-15 06:08+0000\n"
-"X-Generator: Launchpad (build 17939)\n"
+"X-Launchpad-Export-Date: 2016-03-29 05:40+0000\n"
+"X-Generator: Launchpad (build 17967)\n"
 "Language: \n"
 
 #: indicator/messagingmenu.cpp:299
@@ -145,7 +145,7 @@
 msgid "No text messages sent today"
 msgstr "今日沒有發出文字訊息"
 
-#: indicator/ussdindicator.cpp:116 indicator/textchannelobserver.cpp:312
+#: indicator/textchannelobserver.cpp:312 indicator/ussdindicator.cpp:116
 msgid "Ok"
 msgstr "確定"
 
diff -Nru telephony-service-0.1+16.04.20160321.2/tests/common/mock/connection.cpp telephony-service-0.1+16.04.20160331.4/tests/common/mock/connection.cpp
--- telephony-service-0.1+16.04.20160321.2/tests/common/mock/connection.cpp	2016-03-21 20:11:03.000000000 +0000
+++ telephony-service-0.1+16.04.20160331.4/tests/common/mock/connection.cpp	2016-03-31 22:17:38.000000000 +0000
@@ -277,6 +277,11 @@
     simplePresenceIface->setPresences(presences);
 }
 
+void MockConnection::simulateDisconnect()
+{
+    setStatus(Tp::ConnectionStatusDisconnected, Tp::ConnectionStatusReasonRequested);
+}
+
 void MockConnection::simulateAuthFailure()
 {
     setStatus(Tp::ConnectionStatusDisconnected, Tp::ConnectionStatusReasonAuthenticationFailed);
diff -Nru telephony-service-0.1+16.04.20160321.2/tests/common/mock/connection.h telephony-service-0.1+16.04.20160331.4/tests/common/mock/connection.h
--- telephony-service-0.1+16.04.20160321.2/tests/common/mock/connection.h	2016-03-21 20:11:03.000000000 +0000
+++ telephony-service-0.1+16.04.20160331.4/tests/common/mock/connection.h	2016-03-31 22:17:38.000000000 +0000
@@ -63,6 +63,7 @@
     void connect(Tp::DBusError *error);
     void setOnline(bool online);
     void simulateAuthFailure();
+    void simulateDisconnect();
 
     Tp::BaseConnectionRequestsInterfacePtr requestsIface;
     Tp::BaseConnectionSimplePresenceInterfacePtr simplePresenceIface;
diff -Nru telephony-service-0.1+16.04.20160321.2/tests/common/mock/mockconnectiondbus.cpp telephony-service-0.1+16.04.20160331.4/tests/common/mock/mockconnectiondbus.cpp
--- telephony-service-0.1+16.04.20160321.2/tests/common/mock/mockconnectiondbus.cpp	2016-03-21 20:11:03.000000000 +0000
+++ telephony-service-0.1+16.04.20160331.4/tests/common/mock/mockconnectiondbus.cpp	2016-03-31 22:17:38.000000000 +0000
@@ -144,6 +144,11 @@
     mConnection->simulateAuthFailure();
 }
 
+void MockConnectionDBus::SimulateDisconnect()
+{
+    mConnection->simulateDisconnect();
+}
+
 void MockConnectionDBus::SetVoicemailIndicator(bool active)
 {
     qDebug() << __PRETTY_FUNCTION__ << active;
diff -Nru telephony-service-0.1+16.04.20160321.2/tests/common/mock/mockconnectiondbus.h telephony-service-0.1+16.04.20160331.4/tests/common/mock/mockconnectiondbus.h
--- telephony-service-0.1+16.04.20160321.2/tests/common/mock/mockconnectiondbus.h	2016-03-21 20:11:03.000000000 +0000
+++ telephony-service-0.1+16.04.20160331.4/tests/common/mock/mockconnectiondbus.h	2016-03-31 22:17:38.000000000 +0000
@@ -42,6 +42,7 @@
     void SetPresence(const QString &status, const QString &statusMessage);
     void SetContactPresence(const QString &id, int presenceType, const QString &status, const QString &statusMessage);
     void SimulateAuthFailure();
+    void SimulateDisconnect();
 
     // voicemail stuff
     void SetVoicemailIndicator(bool active);
diff -Nru telephony-service-0.1+16.04.20160321.2/tests/common/mock/MockConnection.xml telephony-service-0.1+16.04.20160331.4/tests/common/mock/MockConnection.xml
--- telephony-service-0.1+16.04.20160321.2/tests/common/mock/MockConnection.xml	2016-03-21 20:11:03.000000000 +0000
+++ telephony-service-0.1+16.04.20160331.4/tests/common/mock/MockConnection.xml	2016-03-31 22:17:38.000000000 +0000
@@ -59,6 +59,11 @@
             <arg name="status" type="s" direction="in"/>
             <arg name="statusMessage" type="s" direction="in"/>
         </method>
+        <method name="SimulateDisconnect">
+            <dox:d><![CDATA[
+                Simulate disconnection
+            ]]></dox:d>
+        </method>
         <method name="SimulateAuthFailure">
             <dox:d><![CDATA[
                 Simulate an authentication failure
diff -Nru telephony-service-0.1+16.04.20160321.2/tests/handler/HandlerTest.cpp telephony-service-0.1+16.04.20160331.4/tests/handler/HandlerTest.cpp
--- telephony-service-0.1+16.04.20160321.2/tests/handler/HandlerTest.cpp	2016-03-21 20:11:03.000000000 +0000
+++ telephony-service-0.1+16.04.20160331.4/tests/handler/HandlerTest.cpp	2016-03-31 22:17:38.000000000 +0000
@@ -127,6 +127,7 @@
 
     // and finally request the hangup
     QSignalSpy callEndedSpy(mMockController, SIGNAL(CallEnded(QString)));
+    TRY_VERIFY(HandlerController::instance()->hasCalls());
     HandlerController::instance()->hangUpCall(objectPath);
     TRY_COMPARE(callEndedSpy.count(), 1);
 }
@@ -151,6 +152,7 @@
 
     QSignalSpy callStateSpy(mMockController, SIGNAL(CallStateChanged(QString,QString,QString)));
 
+    TRY_VERIFY(HandlerController::instance()->hasCalls());
     // set the call on hold
     HandlerController::instance()->setHold(objectPath, true);
     TRY_COMPARE(callStateSpy.count(), 1);
@@ -373,9 +375,10 @@
     TRY_COMPARE(messageReceivedSpy.count(), 1);
     QString receivedMessageId = messageReceivedSpy.first()[3].toString();
 
-    // then acknoledge the message that arrived in the second channel and make sure handler
+    // then acknowledge the message that arrived in the second channel and make sure handler
     // does the right thing
     QSignalSpy messageReadSpy(mMockController, SIGNAL(MessageRead(QString)));
+    QTest::qWait(1000);
     ChatManager::instance()->acknowledgeMessage(properties["Recipients"].toStringList(), receivedMessageId, mTpAccount->uniqueIdentifier());
 
     TRY_COMPARE(messageReadSpy.count(), 1);
@@ -410,6 +413,7 @@
 
     // then acknowledge the messages that arrived in the second channel and make sure handler
     // does the right thing
+    QTest::qWait(1000);
     QSignalSpy messageReadSpy(mMockController, SIGNAL(MessageRead(QString)));
     ChatManager::instance()->acknowledgeAllMessages(properties["Recipients"].toStringList(), mTpAccount->uniqueIdentifier());
 
diff -Nru telephony-service-0.1+16.04.20160321.2/tests/libtelephonyservice/AccountEntryTest.cpp telephony-service-0.1+16.04.20160331.4/tests/libtelephonyservice/AccountEntryTest.cpp
--- telephony-service-0.1+16.04.20160321.2/tests/libtelephonyservice/AccountEntryTest.cpp	2016-03-21 20:11:03.000000000 +0000
+++ telephony-service-0.1+16.04.20160331.4/tests/libtelephonyservice/AccountEntryTest.cpp	2016-03-31 22:17:38.000000000 +0000
@@ -181,14 +181,14 @@
     QVERIFY(mAccount->connected());
 
     // now set the account offline and see if the active flag changes correctly
-    //mMockController->SetPresence("offline", "offline");
-    mAccount->account()->reconnect();
+    mMockController->SimulateDisconnect();
     TRY_VERIFY(connectedChangedSpy.count() > 0);
     TRY_VERIFY(!mAccount->connected());
 
     // now re-enable the account and check that the entry is updated
     connectedChangedSpy.clear();
-    mMockController->SetPresence("available", "online");
+    mAccount->account()->reconnect();
+
     // because of the way the mock was implemented, sometimes this can return two connectedChanged() signals.
     TRY_VERIFY(connectedChangedSpy.count() > 0);
     TRY_VERIFY(mAccount->connected());
diff -Nru telephony-service-0.1+16.04.20160321.2/tests/libtelephonyservice/CallEntryTest.cpp telephony-service-0.1+16.04.20160331.4/tests/libtelephonyservice/CallEntryTest.cpp
--- telephony-service-0.1+16.04.20160321.2/tests/libtelephonyservice/CallEntryTest.cpp	2016-03-21 20:11:03.000000000 +0000
+++ telephony-service-0.1+16.04.20160331.4/tests/libtelephonyservice/CallEntryTest.cpp	2016-03-31 22:17:38.000000000 +0000
@@ -116,6 +116,7 @@
     CallEntry *callEntry = new CallEntry(mCallChannel);
     QCOMPARE(callEntry->isVoicemail(), isVoicemail);
 
+    TRY_VERIFY(CallManager::instance()->hasCalls());
     callEntry->endCall();
     callEntry->deleteLater();
 }