telephony-service

Merge lp:~phablet-team/telephony-service/change_group_title into lp:telephony-service/staging

  1. change_group_title
  2. Merge into staging
Proposed by Tiago Salem Herrmann
Status: Merged
Approved by: Gustavo Pichorim Boiko
Approved revision: 1249
Merged at revision: 1216
Proposed branch: lp:~phablet-team/telephony-service/change_group_title
Merge into: lp:telephony-service/staging
Prerequisite: lp:~phablet-team/telephony-service/split-multipart-messages
Diff against target: 522 lines (+174/-54)
8 files modified
handler/Handler.xml (+7/-0)
handler/handlerdbus.cpp (+5/-0)
handler/handlerdbus.h (+2/-2)
handler/texthandler.cpp (+33/-8)
handler/texthandler.h (+2/-0)
libtelephonyservice/chatentry.cpp (+22/-0)
libtelephonyservice/chatentry.h (+2/-1)
po/telephony-service.pot (+101/-43)
To merge this branch: bzr merge lp:~phablet-team/telephony-service/change_group_title
Reviewer Review Type Date Requested Status
Gustavo Pichorim Boiko (community) Approve
Roberto Mier Escandon Pending
PS Jenkins bot continuous-integration Pending
system-apps-ci-bot continuous-integration Pending
Review via email: mp+308441@code.launchpad.net

This proposal supersedes a proposal from 2016-06-15.

Commit message

Make it possible to change the group title.

Description of the change

Make it possible to change the group title.

To post a comment you must log in.
Revision history for this message
Roberto Mier Escandon (rmescandon) : Posted in a previous version of this proposal
review: Approve
Revision history for this message
system-apps-ci-bot (system-apps-ci-bot) wrote : Posted in a previous version of this proposal

FAILED: Continuous integration, rev:1220
https://jenkins.canonical.com/system-apps/job/lp-telephony-service-ci/10/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-apps/job/build/545/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/545
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=vivid+overlay/533
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=xenial/533
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/529
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/529/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial/529
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial/529/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/529
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/529/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial/529
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial/529/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/529
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/529/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial/529/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-telephony-service-ci/10/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
system-apps-ci-bot (system-apps-ci-bot) wrote : Posted in a previous version of this proposal

FAILED: Continuous integration, rev:1223
https://jenkins.canonical.com/system-apps/job/lp-telephony-service-ci/15/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-apps/job/build/557/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/557
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=vivid+overlay/545
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=xenial/545/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-telephony-service-ci/15/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
system-apps-ci-bot (system-apps-ci-bot) wrote : Posted in a previous version of this proposal

FAILED: Continuous integration, rev:1224
https://jenkins.canonical.com/system-apps/job/lp-telephony-service-ci/19/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-apps/job/build/603/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/603
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=vivid+overlay/573
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=xenial/573
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/566/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial/566/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/566
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/566/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial/566
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial/566/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/566
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/566/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial/566/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-telephony-service-ci/19/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
system-apps-ci-bot (system-apps-ci-bot) wrote : Posted in a previous version of this proposal

FAILED: Continuous integration, rev:1225
https://jenkins.canonical.com/system-apps/job/lp-telephony-service-ci/20/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-apps/job/build/609/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/609
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=vivid+overlay/579
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=xenial/579
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/572/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial/572/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/572
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/572/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial/572
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial/572/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/572
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/572/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial/572
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial/572/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-telephony-service-ci/20/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
system-apps-ci-bot (system-apps-ci-bot) wrote : Posted in a previous version of this proposal

FAILED: Continuous integration, rev:1227
https://jenkins.canonical.com/system-apps/job/lp-telephony-service-ci/23/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-apps/job/build/612/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/612
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=vivid+overlay/582
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=xenial/582
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/575
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/575/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial/575/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/575
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/575/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial/575
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial/575/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/575/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial/575
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial/575/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-telephony-service-ci/23/rebuild

review: Needs Fixing (continuous-integration)
lp:~phablet-team/telephony-service/change_group_title updated
1249. By Gustavo Pichorim Boiko

Merge parent branch

Revision history for this message
Gustavo Pichorim Boiko (boiko) wrote :

Looks good!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'handler/Handler.xml'
--- handler/Handler.xml 2016-07-08 02:20:21 +0000
+++ handler/Handler.xml 2016-10-21 09:43:34 +0000
@@ -54,6 +54,13 @@
54 <arg name="objectPath" type="s" direction="in"/>54 <arg name="objectPath" type="s" direction="in"/>
55 <arg name="result" type="b" direction="out"/>55 <arg name="result" type="b" direction="out"/>
56 </method>56 </method>
57 <method name="ChangeRoomTitle">
58 <dox:d><![CDATA[
59 Changes the title of a group.
60 ]]></dox:d>
61 <arg name="objectPath" type="s" direction="in"/>
62 <arg name="title" type="s" direction="in"/>
63 </method>
57 <!-- Call Related -->64 <!-- Call Related -->
58 <method name="StartCall">65 <method name="StartCall">
59 <dox:d><![CDATA[66 <dox:d><![CDATA[
6067
=== modified file 'handler/handlerdbus.cpp'
--- handler/handlerdbus.cpp 2016-07-13 03:32:01 +0000
+++ handler/handlerdbus.cpp 2016-10-21 09:43:34 +0000
@@ -106,6 +106,11 @@
106 return TextHandler::instance()->destroyTextChannel(objectPath);106 return TextHandler::instance()->destroyTextChannel(objectPath);
107}107}
108108
109void HandlerDBus::ChangeRoomTitle(const QString &objectPath, const QString &title)
110{
111 TextHandler::instance()->changeRoomTitle(objectPath, title);
112}
113
109bool HandlerDBus::connectToBus()114bool HandlerDBus::connectToBus()
110{115{
111 bool ok = QDBusConnection::sessionBus().registerService(DBUS_SERVICE);116 bool ok = QDBusConnection::sessionBus().registerService(DBUS_SERVICE);
112117
=== modified file 'handler/handlerdbus.h'
--- handler/handlerdbus.h 2016-07-13 03:32:01 +0000
+++ handler/handlerdbus.h 2016-10-21 09:43:34 +0000
@@ -56,8 +56,6 @@
5656
57 static HandlerDBus *instance();57 static HandlerDBus *instance();
5858
59 bool DestroyTextChannel(const QString &objectPath);
60
61public Q_SLOTS:59public Q_SLOTS:
62 bool connectToBus();60 bool connectToBus();
6361
@@ -66,6 +64,8 @@
66 Q_NOREPLY void AcknowledgeMessages(const QVariantList &messages);64 Q_NOREPLY void AcknowledgeMessages(const QVariantList &messages);
67 QString StartChat(const QString &accountId, const QVariantMap &properties);65 QString StartChat(const QString &accountId, const QVariantMap &properties);
68 Q_NOREPLY void AcknowledgeAllMessages(const QVariantMap &properties);66 Q_NOREPLY void AcknowledgeAllMessages(const QVariantMap &properties);
67 bool DestroyTextChannel(const QString &objectPath);
68 Q_NOREPLY void ChangeRoomTitle(const QString &objectPath, const QString &title);
6969
70 // call related70 // call related
71 Q_NOREPLY void StartCall(const QString &number, const QString &accountId);71 Q_NOREPLY void StartCall(const QString &number, const QString &accountId);
7272
=== modified file 'handler/texthandler.cpp'
--- handler/texthandler.cpp 2016-10-21 09:38:39 +0000
+++ handler/texthandler.cpp 2016-10-21 09:43:34 +0000
@@ -99,14 +99,7 @@
9999
100bool TextHandler::destroyTextChannel(const QString &objectPath)100bool TextHandler::destroyTextChannel(const QString &objectPath)
101{101{
102 Tp::TextChannelPtr channelToDestroy;102 Tp::TextChannelPtr channelToDestroy = existingChannelFromObjectPath(objectPath);
103 Q_FOREACH(Tp::TextChannelPtr channel, mChannels) {
104 if (channel->objectPath() == objectPath) {
105 channelToDestroy = channel;
106 break;
107 }
108 }
109
110 if (!channelToDestroy ||103 if (!channelToDestroy ||
111 !channelToDestroy->hasInterface(TP_QT_IFACE_CHANNEL_INTERFACE_DESTROYABLE)) {104 !channelToDestroy->hasInterface(TP_QT_IFACE_CHANNEL_INTERFACE_DESTROYABLE)) {
112 return false;105 return false;
@@ -123,6 +116,28 @@
123 return !reply.isError();116 return !reply.isError();
124}117}
125118
119void TextHandler::changeRoomTitle(const QString &objectPath, const QString &title)
120{
121 qDebug() << __PRETTY_FUNCTION__;
122 Tp::TextChannelPtr channel = existingChannelFromObjectPath(objectPath);
123 if (!channel) {
124 qWarning() << "Could not find channel for object path" << objectPath;
125 return;
126 }
127
128 Tp::Client::ChannelInterfaceRoomConfigInterface *roomConfigInterface;
129 roomConfigInterface = channel->optionalInterface<Tp::Client::ChannelInterfaceRoomConfigInterface>();
130 if (!roomConfigInterface) {
131 qWarning() << "Could not find RoomConfig interface in the channel" << objectPath;
132 return;
133 }
134
135 QVariantMap properties;
136 properties["Title"] = title;
137 // FIXME: we better check for the result here and maybe notify the app
138 roomConfigInterface->UpdateConfiguration(properties);
139}
140
126void TextHandler::onTextChannelInvalidated()141void TextHandler::onTextChannelInvalidated()
127{142{
128 Tp::TextChannelPtr textChannel(qobject_cast<Tp::TextChannel*>(sender()));143 Tp::TextChannelPtr textChannel(qobject_cast<Tp::TextChannel*>(sender()));
@@ -201,3 +216,13 @@
201 }216 }
202 return channels;217 return channels;
203}218}
219
220Tp::TextChannelPtr TextHandler::existingChannelFromObjectPath(const QString &objectPath)
221{
222 Q_FOREACH(Tp::TextChannelPtr channel, mChannels) {
223 if (channel->objectPath() == objectPath) {
224 return channel;
225 }
226 }
227 return Tp::TextChannelPtr();
228}
204229
=== modified file 'handler/texthandler.h'
--- handler/texthandler.h 2016-07-08 02:20:21 +0000
+++ handler/texthandler.h 2016-10-21 09:43:34 +0000
@@ -43,6 +43,7 @@
43 void acknowledgeMessages(const QVariantList &messages);43 void acknowledgeMessages(const QVariantList &messages);
44 void acknowledgeAllMessages(const QVariantMap &properties);44 void acknowledgeAllMessages(const QVariantMap &properties);
45 bool destroyTextChannel(const QString &objectPath);45 bool destroyTextChannel(const QString &objectPath);
46 void changeRoomTitle(const QString &objectPath, const QString &title);
4647
47protected Q_SLOTS:48protected Q_SLOTS:
48 void onTextChannelAvailable(Tp::TextChannelPtr channel);49 void onTextChannelAvailable(Tp::TextChannelPtr channel);
@@ -50,6 +51,7 @@
5051
51protected:52protected:
52 QList<Tp::TextChannelPtr> existingChannels(const QString &accountId, const QVariantMap &properties);53 QList<Tp::TextChannelPtr> existingChannels(const QString &accountId, const QVariantMap &properties);
54 Tp::TextChannelPtr existingChannelFromObjectPath(const QString &objectPath);
5355
54private:56private:
55 explicit TextHandler(QObject *parent = 0);57 explicit TextHandler(QObject *parent = 0);
5658
=== modified file 'libtelephonyservice/chatentry.cpp'
--- libtelephonyservice/chatentry.cpp 2016-07-13 03:32:01 +0000
+++ libtelephonyservice/chatentry.cpp 2016-10-21 09:43:34 +0000
@@ -31,6 +31,7 @@
31#include <TelepathyQt/Contact>31#include <TelepathyQt/Contact>
32#include <TelepathyQt/PendingReady>32#include <TelepathyQt/PendingReady>
33#include <TelepathyQt/Connection>33#include <TelepathyQt/Connection>
34#include <TelepathyQt/PendingVariantMap>
3435
35Q_DECLARE_METATYPE(ContactChatStates)36Q_DECLARE_METATYPE(ContactChatStates)
3637
@@ -105,6 +106,21 @@
105 return mTitle;106 return mTitle;
106}107}
107108
109void ChatEntry::setTitle(const QString &title)
110{
111 // FIXME: remove this debug before going into production.
112 qDebug() << __PRETTY_FUNCTION__ << "Changing group title to" << title;
113 QDBusInterface *handlerIface = TelepathyHelper::instance()->handlerInterface();
114 Q_FOREACH(const Tp::TextChannelPtr channel, mChannels) {
115 if (!channel->hasInterface(TP_QT_IFACE_CHANNEL_INTERFACE_ROOM_CONFIG)) {
116 qWarning() << "Channel doesn't have the RoomConfig interface";
117 return;
118 }
119
120 handlerIface->asyncCall("ChangeRoomTitle", channel->objectPath(), title);
121 }
122}
123
108ChatEntry::~ChatEntry()124ChatEntry::~ChatEntry()
109{125{
110 QMap<QString, ContactChatState*> tmp = mChatStates;126 QMap<QString, ContactChatState*> tmp = mChatStates;
@@ -278,6 +294,12 @@
278 if (roomConfigInterface) {294 if (roomConfigInterface) {
279 roomConfigInterface->setProperty("channel", QVariant::fromValue(channel.data()));295 roomConfigInterface->setProperty("channel", QVariant::fromValue(channel.data()));
280 roomConfigInterface->setMonitorProperties(true);296 roomConfigInterface->setMonitorProperties(true);
297 Tp::PendingVariantMap *pendingResult = roomConfigInterface->requestAllProperties();
298 connect(pendingResult, &Tp::PendingOperation::finished, [=](){
299 if (!pendingResult->isError()) {
300 onRoomPropertiesChanged(pendingResult->result(), QStringList());
301 }
302 });
281 connect(roomConfigInterface, SIGNAL(propertiesChanged(const QVariantMap &,const QStringList &)),303 connect(roomConfigInterface, SIGNAL(propertiesChanged(const QVariantMap &,const QStringList &)),
282 SLOT(onRoomPropertiesChanged(const QVariantMap &,const QStringList &)));304 SLOT(onRoomPropertiesChanged(const QVariantMap &,const QStringList &)));
283 }305 }
284306
=== modified file 'libtelephonyservice/chatentry.h'
--- libtelephonyservice/chatentry.h 2016-07-13 03:32:01 +0000
+++ libtelephonyservice/chatentry.h 2016-10-21 09:43:34 +0000
@@ -61,7 +61,7 @@
61 Q_PROPERTY(QString roomName READ roomName WRITE setRoomName NOTIFY roomNameChanged)61 Q_PROPERTY(QString roomName READ roomName WRITE setRoomName NOTIFY roomNameChanged)
62 Q_PROPERTY(QString chatId READ chatId WRITE setChatId NOTIFY chatIdChanged)62 Q_PROPERTY(QString chatId READ chatId WRITE setChatId NOTIFY chatIdChanged)
63 Q_PROPERTY(QString accountId READ accountId WRITE setAccountId NOTIFY accountIdChanged)63 Q_PROPERTY(QString accountId READ accountId WRITE setAccountId NOTIFY accountIdChanged)
64 Q_PROPERTY(QString title READ title NOTIFY titleChanged)64 Q_PROPERTY(QString title READ title WRITE setTitle NOTIFY titleChanged)
65 Q_PROPERTY(QQmlListProperty<ContactChatState> chatStates65 Q_PROPERTY(QQmlListProperty<ContactChatState> chatStates
66 READ chatStates66 READ chatStates
67 NOTIFY chatStatesChanged)67 NOTIFY chatStatesChanged)
@@ -97,6 +97,7 @@
97 QString roomName() const;97 QString roomName() const;
98 void setRoomName(const QString &name);98 void setRoomName(const QString &name);
99 QString title() const;99 QString title() const;
100 void setTitle(const QString & title);
100 static int chatStatesCount(QQmlListProperty<ContactChatState> *p);101 static int chatStatesCount(QQmlListProperty<ContactChatState> *p);
101 static ContactChatState *chatStatesAt(QQmlListProperty<ContactChatState> *p, int index);102 static ContactChatState *chatStatesAt(QQmlListProperty<ContactChatState> *p, int index);
102103
103104
=== modified file 'po/telephony-service.pot'
--- po/telephony-service.pot 2015-11-03 14:19:20 +0000
+++ po/telephony-service.pot 2016-10-21 09:43:34 +0000
@@ -8,7 +8,7 @@
8msgstr ""8msgstr ""
9"Project-Id-Version: PACKAGE VERSION\n"9"Project-Id-Version: PACKAGE VERSION\n"
10"Report-Msgid-Bugs-To: \n"10"Report-Msgid-Bugs-To: \n"
11"POT-Creation-Date: 2015-01-16 15:24-0200\n"11"POT-Creation-Date: 2016-06-27 10:54-0300\n"
12"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"12"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"13"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14"Language-Team: LANGUAGE <LL@li.org>\n"14"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,14 +18,14 @@
18"Content-Transfer-Encoding: 8bit\n"18"Content-Transfer-Encoding: 8bit\n"
19"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"19"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
2020
21#: indicator/messagingmenu.cpp:25621#: indicator/messagingmenu.cpp:299
22#, qt-format22#, qt-format
23msgid "%1 missed call"23msgid "%1 missed call"
24msgid_plural "%1 missed calls"24msgid_plural "%1 missed calls"
25msgstr[0] ""25msgstr[0] ""
26msgstr[1] ""26msgstr[1] ""
2727
28#: indicator/messagingmenu.cpp:30828#: indicator/messagingmenu.cpp:398
29#, qt-format29#, qt-format
30msgid "%1 voicemail message"30msgid "%1 voicemail message"
31msgid_plural "%1 voicemail messages"31msgid_plural "%1 voicemail messages"
@@ -52,84 +52,132 @@
52msgid "<b>%1</b> text messages sent today"52msgid "<b>%1</b> text messages sent today"
53msgstr ""53msgstr ""
5454
55#: approver/approver.cpp:42655#: approver/approver.cpp:520
56msgid "Accept"56msgid "Accept"
57msgstr ""57msgstr ""
5858
59#: indicator/messagingmenu.cpp:19959#: indicator/textchannelobserver.cpp:448
60#, qt-format
61msgid "Attachment: %1 audio clip"
62msgid_plural "Attachments: %1 audio clips"
63msgstr[0] ""
64msgstr[1] ""
65
66#: indicator/textchannelobserver.cpp:446
67#, qt-format
68msgid "Attachment: %1 contact"
69msgid_plural "Attachments: %1 contacts"
70msgstr[0] ""
71msgstr[1] ""
72
73#: indicator/textchannelobserver.cpp:450
74#, qt-format
75msgid "Attachment: %1 file"
76msgid_plural "Attachments: %1 files"
77msgstr[0] ""
78msgstr[1] ""
79
80#: indicator/textchannelobserver.cpp:442
81#, qt-format
82msgid "Attachment: %1 image"
83msgid_plural "Attachments: %1 images"
84msgstr[0] ""
85msgstr[1] ""
86
87#: indicator/textchannelobserver.cpp:444
88#, qt-format
89msgid "Attachment: %1 video"
90msgid_plural "Attachments: %1 videos"
91msgstr[0] ""
92msgstr[1] ""
93
94#: indicator/authhandler.cpp:72
95msgid "Authentication failed. Do you want to review your credentials?"
96msgstr ""
97
98#: indicator/messagingmenu.cpp:236
60msgid "Call back"99msgid "Call back"
61msgstr ""100msgstr ""
62101
63#: approver/approver.cpp:392102#: approver/approver.cpp:466 approver/approver.cpp:481
64msgid "Caller number is not available"103msgid "Caller number is not available"
65msgstr ""104msgstr ""
66105
67#: approver/approver.cpp:389106#: approver/approver.cpp:478
68#, qt-format107#, qt-format
69msgid "Calling from %1"108msgid "Calling from %1"
70msgstr ""109msgstr ""
71110
72#: approver/approver.cpp:385111#: approver/approver.cpp:472
73msgid "Calling from private number"112msgid "Calling from private number"
74msgstr ""113msgstr ""
75114
76#: approver/approver.cpp:387115#: approver/approver.cpp:475
77msgid "Calling from unknown number"116msgid "Calling from unknown number"
78msgstr ""117msgstr ""
79118
80#: indicator/ussdindicator.cpp:104119#: indicator/ussdindicator.cpp:142
81msgid "Cancel"120msgid "Cancel"
82msgstr ""121msgstr ""
83122
84#: indicator/textchannelobserver.cpp:207123#: indicator/textchannelobserver.cpp:236
85msgid "Deactivate flight mode and try again from the messaging application."124msgid "Deactivate flight mode and try again from the messaging application."
86msgstr ""125msgstr ""
87126
88#: approver/approver.cpp:448127#: approver/approver.cpp:542
89msgid "Decline"128msgid "Decline"
90msgstr ""129msgstr ""
91130
92#: approver/approver.cpp:439131#: approver/approver.cpp:533
93msgid "End + Answer"132msgid "End + Answer"
94msgstr ""133msgstr ""
95134
96#: approver/approver.cpp:425135#: approver/approver.cpp:519
97msgid "Hold + Answer"136msgid "Hold + Answer"
98msgstr ""137msgstr ""
99138
100#: indicator/messagingmenu.cpp:204139#: indicator/messagingmenu.cpp:241
101msgid "I missed your call - can you call me now?"140msgid "I missed your call - can you call me now?"
102msgstr ""141msgstr ""
103142
104#: indicator/messagingmenu.cpp:207143#: indicator/messagingmenu.cpp:244
105msgid "I'll be 20 minutes late."144msgid "I'll be 20 minutes late."
106msgstr ""145msgstr ""
107146
108#: approver/approver.cpp:79147#: approver/approver.cpp:91
109msgid "I'm busy at the moment. I'll call later."148msgid "I'm busy at the moment. I'll call later."
110msgstr ""149msgstr ""
111150
112#: indicator/messagingmenu.cpp:206151#: indicator/messagingmenu.cpp:243
113msgid "I'm busy at the moment. I'll call you later."152msgid "I'm busy at the moment. I'll call you later."
114msgstr ""153msgstr ""
115154
116#: approver/approver.cpp:80155#: approver/approver.cpp:92
117msgid "I'm running late, on my way now."156msgid "I'm running late, on my way now."
118msgstr ""157msgstr ""
119158
120#: indicator/messagingmenu.cpp:205159#: indicator/messagingmenu.cpp:242
121msgid "I'm running late. I'm on my way."160msgid "I'm running late. I'm on my way."
122msgstr ""161msgstr ""
123162
124#: approver/approver.cpp:456163#: approver/approver.cpp:550
125msgid "Message & decline"164msgid "Message & decline"
126msgstr ""165msgstr ""
127166
128#: indicator/textchannelobserver.cpp:393 indicator/textchannelobserver.cpp:440167#: indicator/textchannelobserver.cpp:550
129#, qt-format168#, qt-format
130msgid "Message from %1"169msgid "Message from %1"
131msgstr ""170msgstr ""
132171
172#: indicator/textchannelobserver.cpp:486 indicator/messagingmenu.cpp:163
173#, qt-format
174msgid "Message to group from %1"
175msgstr ""
176
177#: indicator/authhandler.cpp:94
178msgid "No"
179msgstr ""
180
133#: indicator/metrics.cpp:49 indicator/metrics.cpp:51181#: indicator/metrics.cpp:49 indicator/metrics.cpp:51
134msgid "No calls made today"182msgid "No calls made today"
135msgstr ""183msgstr ""
@@ -146,35 +194,40 @@
146msgid "No text messages sent today"194msgid "No text messages sent today"
147msgstr ""195msgstr ""
148196
149#: indicator/ussdindicator.cpp:79 indicator/textchannelobserver.cpp:270197#: indicator/ussdindicator.cpp:116 indicator/textchannelobserver.cpp:314
150msgid "Ok"198msgid "Ok"
151msgstr ""199msgstr ""
152200
201#: approver/approver.cpp:453
202#, qt-format
203msgid "On [%1]"
204msgstr ""
205
153#: indicator/telephony-service-call.desktop.in:3206#: indicator/telephony-service-call.desktop.in:3
154msgid "Phone Calls"207msgid "Phone Calls"
155msgstr ""208msgstr ""
156209
157#: approver/approver.cpp:81210#: approver/approver.cpp:93
158msgid "Please call me back later."211msgid "Please call me back later."
159msgstr ""212msgstr ""
160213
161#: indicator/textchannelobserver.cpp:539214#: indicator/textchannelobserver.cpp:687
162msgid "Please, select a SIM card:"215msgid "Please, select a SIM card:"
163msgstr ""216msgstr ""
164217
165#: Ubuntu/Telephony/contactwatcher.cpp:136218#: Ubuntu/Telephony/contactwatcher.cpp:131
166msgid "Private Number"219msgid "Private Number"
167msgstr ""220msgstr ""
168221
169#: indicator/messagingmenu.cpp:259222#: approver/approver.cpp:457 indicator/messagingmenu.cpp:304
170msgid "Private number"223msgid "Private number"
171msgstr ""224msgstr ""
172225
173#: indicator/ussdindicator.cpp:82226#: indicator/ussdindicator.cpp:119
174msgid "Reply"227msgid "Reply"
175msgstr ""228msgstr ""
176229
177#: handler/displaynamesettings.cpp:34230#: indicator/displaynamesettings.cpp:35
178#, qt-format231#, qt-format
179msgid "SIM %1"232msgid "SIM %1"
180msgstr ""233msgstr ""
@@ -183,15 +236,15 @@
183msgid "SMS"236msgid "SMS"
184msgstr ""237msgstr ""
185238
186#: indicator/textchannelobserver.cpp:276239#: indicator/textchannelobserver.cpp:320
187msgid "Save"240msgid "Save"
188msgstr ""241msgstr ""
189242
190#: indicator/messagingmenu.cpp:151 indicator/messagingmenu.cpp:214243#: indicator/messagingmenu.cpp:185 indicator/messagingmenu.cpp:251
191msgid "Send"244msgid "Send"
192msgstr ""245msgstr ""
193246
194#: indicator/messagingmenu.cpp:208247#: indicator/messagingmenu.cpp:245
195msgid "Sorry, I'm still busy. I'll call you later."248msgid "Sorry, I'm still busy. I'll call you later."
196msgstr ""249msgstr ""
197250
@@ -200,7 +253,7 @@
200msgid "Spent <b>%1</b> minutes in calls today"253msgid "Spent <b>%1</b> minutes in calls today"
201msgstr ""254msgstr ""
202255
203#: indicator/messagingmenu.cpp:55 indicator/messagingmenu.cpp:59256#: indicator/messagingmenu.cpp:56 indicator/messagingmenu.cpp:60
204msgid "Telephony Service"257msgid "Telephony Service"
205msgstr ""258msgstr ""
206259
@@ -208,42 +261,47 @@
208msgid "Telephony Service Approver"261msgid "Telephony Service Approver"
209msgstr ""262msgstr ""
210263
211#: indicator/main.cpp:50264#: indicator/main.cpp:53
212msgid "Telephony Service Indicator"265msgid "Telephony Service Indicator"
213msgstr ""266msgstr ""
214267
215#: indicator/textchannelobserver.cpp:215268#: indicator/textchannelobserver.cpp:245
216msgid "The message could not be sent"269msgid "The message could not be sent"
217msgstr ""270msgstr ""
218271
219#: indicator/textchannelobserver.cpp:210272#: indicator/textchannelobserver.cpp:239
220msgid "Try again from the messaging application."273msgid "Try again from the messaging application."
221msgstr ""274msgstr ""
222275
223#: Ubuntu/Telephony/contactwatcher.cpp:138276#: Ubuntu/Telephony/contactwatcher.cpp:133
224msgid "Unknown Number"277msgid "Unknown Number"
225msgstr ""278msgstr ""
226279
227#: approver/approver.cpp:59280#: approver/approver.cpp:63
228msgid "Unknown caller"281msgid "Unknown caller"
229msgstr ""282msgstr ""
230283
231#: indicator/messagingmenu.cpp:263284#: approver/approver.cpp:460 indicator/textchannelobserver.cpp:477
285#: indicator/messagingmenu.cpp:151 indicator/messagingmenu.cpp:308
232msgid "Unknown number"286msgid "Unknown number"
233msgstr ""287msgstr ""
234288
235#: indicator/textchannelobserver.cpp:205289#: indicator/textchannelobserver.cpp:234
236msgid "Unlock your sim card and try again from the messaging application."290msgid "Unlock your sim card and try again from the messaging application."
237msgstr ""291msgstr ""
238292
239#: indicator/textchannelobserver.cpp:227 indicator/textchannelobserver.cpp:411293#: indicator/textchannelobserver.cpp:260 indicator/textchannelobserver.cpp:514
240msgid "View message"294msgid "View message"
241msgstr ""295msgstr ""
242296
243#: indicator/messagingmenu.cpp:313297#: indicator/messagingmenu.cpp:403
244msgid "Voicemail"298msgid "Voicemail"
245msgstr ""299msgstr ""
246300
247#: indicator/messagingmenu.cpp:305301#: indicator/messagingmenu.cpp:395
248msgid "Voicemail messages"302msgid "Voicemail messages"
249msgstr ""303msgstr ""
304
305#: indicator/authhandler.cpp:91
306msgid "Yes"
307msgstr ""

Subscribers

People subscribed via source and target branches

to all changes: