telephony-service

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

  1. change_group_title
  2. Merge into trunk
Proposed by Gustavo Pichorim Boiko
Status: Superseded
Proposed branch: lp:~phablet-team/telephony-service/change_group_title
Merge into: lp:telephony-service
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
system-apps-ci-bot continuous-integration Needs Fixing
PS Jenkins bot continuous-integration Pending
Roberto Mier Escandon Pending
Review via email: mp+297444@code.launchpad.net

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

This proposal has been superseded by a proposal from 2016-10-13.

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 :

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
1228. By Tiago Salem Herrmann

merge parent branch

1229. By Tiago Salem Herrmann

merge parent branch

1230. By Tiago Salem Herrmann

merge parent branch

1231. By Tiago Salem Herrmann

merge parent branch

1232. By Tiago Salem Herrmann

merge parent branch

1233. By Tiago Salem Herrmann

merge parent branch

1234. By Gustavo Pichorim Boiko

Merge parent

1235. By Tiago Salem Herrmann

merge parent branch

1236. By Tiago Salem Herrmann

merge parent branch

1237. By Tiago Salem Herrmann

merge parent branch

1238. By Tiago Salem Herrmann

merge parent branch

1239. By Tiago Salem Herrmann

merge parent branch

1240. By Tiago Salem Herrmann

merge parent branch

1241. By Gustavo Pichorim Boiko

merge parent

1242. By Tiago Salem Herrmann

merge parent branch

1243. By Tiago Salem Herrmann

merge parent branch

1244. By Tiago Salem Herrmann

merge parent branch

1245. By Tiago Salem Herrmann

merge parent branch

1246. By Tiago Salem Herrmann

merge parent branch

1247. By Tiago Salem Herrmann

merge parent branch

1248. By Tiago Salem Herrmann

merge parent branch

1249. By Gustavo Pichorim Boiko

Merge parent branch

Unmerged revisions

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'handler/Handler.xml'
2--- handler/Handler.xml 2016-10-06 19:38:39 +0000
3+++ handler/Handler.xml 2016-10-06 19:38:39 +0000
4@@ -54,6 +54,13 @@
5 <arg name="objectPath" type="s" direction="in"/>
6 <arg name="result" type="b" direction="out"/>
7 </method>
8+ <method name="ChangeRoomTitle">
9+ <dox:d><![CDATA[
10+ Changes the title of a group.
11+ ]]></dox:d>
12+ <arg name="objectPath" type="s" direction="in"/>
13+ <arg name="title" type="s" direction="in"/>
14+ </method>
15 <!-- Call Related -->
16 <method name="StartCall">
17 <dox:d><![CDATA[
18
19=== modified file 'handler/handlerdbus.cpp'
20--- handler/handlerdbus.cpp 2016-10-06 19:38:39 +0000
21+++ handler/handlerdbus.cpp 2016-10-06 19:38:39 +0000
22@@ -106,6 +106,11 @@
23 return TextHandler::instance()->destroyTextChannel(objectPath);
24 }
25
26+void HandlerDBus::ChangeRoomTitle(const QString &objectPath, const QString &title)
27+{
28+ TextHandler::instance()->changeRoomTitle(objectPath, title);
29+}
30+
31 bool HandlerDBus::connectToBus()
32 {
33 bool ok = QDBusConnection::sessionBus().registerService(DBUS_SERVICE);
34
35=== modified file 'handler/handlerdbus.h'
36--- handler/handlerdbus.h 2016-10-06 19:38:39 +0000
37+++ handler/handlerdbus.h 2016-10-06 19:38:39 +0000
38@@ -56,8 +56,6 @@
39
40 static HandlerDBus *instance();
41
42- bool DestroyTextChannel(const QString &objectPath);
43-
44 public Q_SLOTS:
45 bool connectToBus();
46
47@@ -66,6 +64,8 @@
48 Q_NOREPLY void AcknowledgeMessages(const QVariantList &messages);
49 QString StartChat(const QString &accountId, const QVariantMap &properties);
50 Q_NOREPLY void AcknowledgeAllMessages(const QVariantMap &properties);
51+ bool DestroyTextChannel(const QString &objectPath);
52+ Q_NOREPLY void ChangeRoomTitle(const QString &objectPath, const QString &title);
53
54 // call related
55 Q_NOREPLY void StartCall(const QString &number, const QString &accountId);
56
57=== modified file 'handler/texthandler.cpp'
58--- handler/texthandler.cpp 2016-10-06 19:38:39 +0000
59+++ handler/texthandler.cpp 2016-10-06 19:38:39 +0000
60@@ -99,14 +99,7 @@
61
62 bool TextHandler::destroyTextChannel(const QString &objectPath)
63 {
64- Tp::TextChannelPtr channelToDestroy;
65- Q_FOREACH(Tp::TextChannelPtr channel, mChannels) {
66- if (channel->objectPath() == objectPath) {
67- channelToDestroy = channel;
68- break;
69- }
70- }
71-
72+ Tp::TextChannelPtr channelToDestroy = existingChannelFromObjectPath(objectPath);
73 if (!channelToDestroy ||
74 !channelToDestroy->hasInterface(TP_QT_IFACE_CHANNEL_INTERFACE_DESTROYABLE)) {
75 return false;
76@@ -123,6 +116,28 @@
77 return !reply.isError();
78 }
79
80+void TextHandler::changeRoomTitle(const QString &objectPath, const QString &title)
81+{
82+ qDebug() << __PRETTY_FUNCTION__;
83+ Tp::TextChannelPtr channel = existingChannelFromObjectPath(objectPath);
84+ if (!channel) {
85+ qWarning() << "Could not find channel for object path" << objectPath;
86+ return;
87+ }
88+
89+ Tp::Client::ChannelInterfaceRoomConfigInterface *roomConfigInterface;
90+ roomConfigInterface = channel->optionalInterface<Tp::Client::ChannelInterfaceRoomConfigInterface>();
91+ if (!roomConfigInterface) {
92+ qWarning() << "Could not find RoomConfig interface in the channel" << objectPath;
93+ return;
94+ }
95+
96+ QVariantMap properties;
97+ properties["Title"] = title;
98+ // FIXME: we better check for the result here and maybe notify the app
99+ roomConfigInterface->UpdateConfiguration(properties);
100+}
101+
102 void TextHandler::onTextChannelInvalidated()
103 {
104 Tp::TextChannelPtr textChannel(qobject_cast<Tp::TextChannel*>(sender()));
105@@ -201,3 +216,13 @@
106 }
107 return channels;
108 }
109+
110+Tp::TextChannelPtr TextHandler::existingChannelFromObjectPath(const QString &objectPath)
111+{
112+ Q_FOREACH(Tp::TextChannelPtr channel, mChannels) {
113+ if (channel->objectPath() == objectPath) {
114+ return channel;
115+ }
116+ }
117+ return Tp::TextChannelPtr();
118+}
119
120=== modified file 'handler/texthandler.h'
121--- handler/texthandler.h 2016-10-06 19:38:39 +0000
122+++ handler/texthandler.h 2016-10-06 19:38:39 +0000
123@@ -43,6 +43,7 @@
124 void acknowledgeMessages(const QVariantList &messages);
125 void acknowledgeAllMessages(const QVariantMap &properties);
126 bool destroyTextChannel(const QString &objectPath);
127+ void changeRoomTitle(const QString &objectPath, const QString &title);
128
129 protected Q_SLOTS:
130 void onTextChannelAvailable(Tp::TextChannelPtr channel);
131@@ -50,6 +51,7 @@
132
133 protected:
134 QList<Tp::TextChannelPtr> existingChannels(const QString &accountId, const QVariantMap &properties);
135+ Tp::TextChannelPtr existingChannelFromObjectPath(const QString &objectPath);
136
137 private:
138 explicit TextHandler(QObject *parent = 0);
139
140=== modified file 'libtelephonyservice/chatentry.cpp'
141--- libtelephonyservice/chatentry.cpp 2016-10-06 19:38:39 +0000
142+++ libtelephonyservice/chatentry.cpp 2016-10-06 19:38:39 +0000
143@@ -31,6 +31,7 @@
144 #include <TelepathyQt/Contact>
145 #include <TelepathyQt/PendingReady>
146 #include <TelepathyQt/Connection>
147+#include <TelepathyQt/PendingVariantMap>
148
149 Q_DECLARE_METATYPE(ContactChatStates)
150
151@@ -105,6 +106,21 @@
152 return mTitle;
153 }
154
155+void ChatEntry::setTitle(const QString &title)
156+{
157+ // FIXME: remove this debug before going into production.
158+ qDebug() << __PRETTY_FUNCTION__ << "Changing group title to" << title;
159+ QDBusInterface *handlerIface = TelepathyHelper::instance()->handlerInterface();
160+ Q_FOREACH(const Tp::TextChannelPtr channel, mChannels) {
161+ if (!channel->hasInterface(TP_QT_IFACE_CHANNEL_INTERFACE_ROOM_CONFIG)) {
162+ qWarning() << "Channel doesn't have the RoomConfig interface";
163+ return;
164+ }
165+
166+ handlerIface->asyncCall("ChangeRoomTitle", channel->objectPath(), title);
167+ }
168+}
169+
170 ChatEntry::~ChatEntry()
171 {
172 QMap<QString, ContactChatState*> tmp = mChatStates;
173@@ -278,6 +294,12 @@
174 if (roomConfigInterface) {
175 roomConfigInterface->setProperty("channel", QVariant::fromValue(channel.data()));
176 roomConfigInterface->setMonitorProperties(true);
177+ Tp::PendingVariantMap *pendingResult = roomConfigInterface->requestAllProperties();
178+ connect(pendingResult, &Tp::PendingOperation::finished, [=](){
179+ if (!pendingResult->isError()) {
180+ onRoomPropertiesChanged(pendingResult->result(), QStringList());
181+ }
182+ });
183 connect(roomConfigInterface, SIGNAL(propertiesChanged(const QVariantMap &,const QStringList &)),
184 SLOT(onRoomPropertiesChanged(const QVariantMap &,const QStringList &)));
185 }
186
187=== modified file 'libtelephonyservice/chatentry.h'
188--- libtelephonyservice/chatentry.h 2016-10-06 19:38:39 +0000
189+++ libtelephonyservice/chatentry.h 2016-10-06 19:38:39 +0000
190@@ -61,7 +61,7 @@
191 Q_PROPERTY(QString roomName READ roomName WRITE setRoomName NOTIFY roomNameChanged)
192 Q_PROPERTY(QString chatId READ chatId WRITE setChatId NOTIFY chatIdChanged)
193 Q_PROPERTY(QString accountId READ accountId WRITE setAccountId NOTIFY accountIdChanged)
194- Q_PROPERTY(QString title READ title NOTIFY titleChanged)
195+ Q_PROPERTY(QString title READ title WRITE setTitle NOTIFY titleChanged)
196 Q_PROPERTY(QQmlListProperty<ContactChatState> chatStates
197 READ chatStates
198 NOTIFY chatStatesChanged)
199@@ -97,6 +97,7 @@
200 QString roomName() const;
201 void setRoomName(const QString &name);
202 QString title() const;
203+ void setTitle(const QString & title);
204 static int chatStatesCount(QQmlListProperty<ContactChatState> *p);
205 static ContactChatState *chatStatesAt(QQmlListProperty<ContactChatState> *p, int index);
206
207
208=== modified file 'po/telephony-service.pot'
209--- po/telephony-service.pot 2015-11-03 14:19:20 +0000
210+++ po/telephony-service.pot 2016-10-06 19:38:39 +0000
211@@ -8,7 +8,7 @@
212 msgstr ""
213 "Project-Id-Version: PACKAGE VERSION\n"
214 "Report-Msgid-Bugs-To: \n"
215-"POT-Creation-Date: 2015-01-16 15:24-0200\n"
216+"POT-Creation-Date: 2016-06-27 10:54-0300\n"
217 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
218 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
219 "Language-Team: LANGUAGE <LL@li.org>\n"
220@@ -18,14 +18,14 @@
221 "Content-Transfer-Encoding: 8bit\n"
222 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
223
224-#: indicator/messagingmenu.cpp:256
225+#: indicator/messagingmenu.cpp:299
226 #, qt-format
227 msgid "%1 missed call"
228 msgid_plural "%1 missed calls"
229 msgstr[0] ""
230 msgstr[1] ""
231
232-#: indicator/messagingmenu.cpp:308
233+#: indicator/messagingmenu.cpp:398
234 #, qt-format
235 msgid "%1 voicemail message"
236 msgid_plural "%1 voicemail messages"
237@@ -52,84 +52,132 @@
238 msgid "<b>%1</b> text messages sent today"
239 msgstr ""
240
241-#: approver/approver.cpp:426
242+#: approver/approver.cpp:520
243 msgid "Accept"
244 msgstr ""
245
246-#: indicator/messagingmenu.cpp:199
247+#: indicator/textchannelobserver.cpp:448
248+#, qt-format
249+msgid "Attachment: %1 audio clip"
250+msgid_plural "Attachments: %1 audio clips"
251+msgstr[0] ""
252+msgstr[1] ""
253+
254+#: indicator/textchannelobserver.cpp:446
255+#, qt-format
256+msgid "Attachment: %1 contact"
257+msgid_plural "Attachments: %1 contacts"
258+msgstr[0] ""
259+msgstr[1] ""
260+
261+#: indicator/textchannelobserver.cpp:450
262+#, qt-format
263+msgid "Attachment: %1 file"
264+msgid_plural "Attachments: %1 files"
265+msgstr[0] ""
266+msgstr[1] ""
267+
268+#: indicator/textchannelobserver.cpp:442
269+#, qt-format
270+msgid "Attachment: %1 image"
271+msgid_plural "Attachments: %1 images"
272+msgstr[0] ""
273+msgstr[1] ""
274+
275+#: indicator/textchannelobserver.cpp:444
276+#, qt-format
277+msgid "Attachment: %1 video"
278+msgid_plural "Attachments: %1 videos"
279+msgstr[0] ""
280+msgstr[1] ""
281+
282+#: indicator/authhandler.cpp:72
283+msgid "Authentication failed. Do you want to review your credentials?"
284+msgstr ""
285+
286+#: indicator/messagingmenu.cpp:236
287 msgid "Call back"
288 msgstr ""
289
290-#: approver/approver.cpp:392
291+#: approver/approver.cpp:466 approver/approver.cpp:481
292 msgid "Caller number is not available"
293 msgstr ""
294
295-#: approver/approver.cpp:389
296+#: approver/approver.cpp:478
297 #, qt-format
298 msgid "Calling from %1"
299 msgstr ""
300
301-#: approver/approver.cpp:385
302+#: approver/approver.cpp:472
303 msgid "Calling from private number"
304 msgstr ""
305
306-#: approver/approver.cpp:387
307+#: approver/approver.cpp:475
308 msgid "Calling from unknown number"
309 msgstr ""
310
311-#: indicator/ussdindicator.cpp:104
312+#: indicator/ussdindicator.cpp:142
313 msgid "Cancel"
314 msgstr ""
315
316-#: indicator/textchannelobserver.cpp:207
317+#: indicator/textchannelobserver.cpp:236
318 msgid "Deactivate flight mode and try again from the messaging application."
319 msgstr ""
320
321-#: approver/approver.cpp:448
322+#: approver/approver.cpp:542
323 msgid "Decline"
324 msgstr ""
325
326-#: approver/approver.cpp:439
327+#: approver/approver.cpp:533
328 msgid "End + Answer"
329 msgstr ""
330
331-#: approver/approver.cpp:425
332+#: approver/approver.cpp:519
333 msgid "Hold + Answer"
334 msgstr ""
335
336-#: indicator/messagingmenu.cpp:204
337+#: indicator/messagingmenu.cpp:241
338 msgid "I missed your call - can you call me now?"
339 msgstr ""
340
341-#: indicator/messagingmenu.cpp:207
342+#: indicator/messagingmenu.cpp:244
343 msgid "I'll be 20 minutes late."
344 msgstr ""
345
346-#: approver/approver.cpp:79
347+#: approver/approver.cpp:91
348 msgid "I'm busy at the moment. I'll call later."
349 msgstr ""
350
351-#: indicator/messagingmenu.cpp:206
352+#: indicator/messagingmenu.cpp:243
353 msgid "I'm busy at the moment. I'll call you later."
354 msgstr ""
355
356-#: approver/approver.cpp:80
357+#: approver/approver.cpp:92
358 msgid "I'm running late, on my way now."
359 msgstr ""
360
361-#: indicator/messagingmenu.cpp:205
362+#: indicator/messagingmenu.cpp:242
363 msgid "I'm running late. I'm on my way."
364 msgstr ""
365
366-#: approver/approver.cpp:456
367+#: approver/approver.cpp:550
368 msgid "Message & decline"
369 msgstr ""
370
371-#: indicator/textchannelobserver.cpp:393 indicator/textchannelobserver.cpp:440
372+#: indicator/textchannelobserver.cpp:550
373 #, qt-format
374 msgid "Message from %1"
375 msgstr ""
376
377+#: indicator/textchannelobserver.cpp:486 indicator/messagingmenu.cpp:163
378+#, qt-format
379+msgid "Message to group from %1"
380+msgstr ""
381+
382+#: indicator/authhandler.cpp:94
383+msgid "No"
384+msgstr ""
385+
386 #: indicator/metrics.cpp:49 indicator/metrics.cpp:51
387 msgid "No calls made today"
388 msgstr ""
389@@ -146,35 +194,40 @@
390 msgid "No text messages sent today"
391 msgstr ""
392
393-#: indicator/ussdindicator.cpp:79 indicator/textchannelobserver.cpp:270
394+#: indicator/ussdindicator.cpp:116 indicator/textchannelobserver.cpp:314
395 msgid "Ok"
396 msgstr ""
397
398+#: approver/approver.cpp:453
399+#, qt-format
400+msgid "On [%1]"
401+msgstr ""
402+
403 #: indicator/telephony-service-call.desktop.in:3
404 msgid "Phone Calls"
405 msgstr ""
406
407-#: approver/approver.cpp:81
408+#: approver/approver.cpp:93
409 msgid "Please call me back later."
410 msgstr ""
411
412-#: indicator/textchannelobserver.cpp:539
413+#: indicator/textchannelobserver.cpp:687
414 msgid "Please, select a SIM card:"
415 msgstr ""
416
417-#: Ubuntu/Telephony/contactwatcher.cpp:136
418+#: Ubuntu/Telephony/contactwatcher.cpp:131
419 msgid "Private Number"
420 msgstr ""
421
422-#: indicator/messagingmenu.cpp:259
423+#: approver/approver.cpp:457 indicator/messagingmenu.cpp:304
424 msgid "Private number"
425 msgstr ""
426
427-#: indicator/ussdindicator.cpp:82
428+#: indicator/ussdindicator.cpp:119
429 msgid "Reply"
430 msgstr ""
431
432-#: handler/displaynamesettings.cpp:34
433+#: indicator/displaynamesettings.cpp:35
434 #, qt-format
435 msgid "SIM %1"
436 msgstr ""
437@@ -183,15 +236,15 @@
438 msgid "SMS"
439 msgstr ""
440
441-#: indicator/textchannelobserver.cpp:276
442+#: indicator/textchannelobserver.cpp:320
443 msgid "Save"
444 msgstr ""
445
446-#: indicator/messagingmenu.cpp:151 indicator/messagingmenu.cpp:214
447+#: indicator/messagingmenu.cpp:185 indicator/messagingmenu.cpp:251
448 msgid "Send"
449 msgstr ""
450
451-#: indicator/messagingmenu.cpp:208
452+#: indicator/messagingmenu.cpp:245
453 msgid "Sorry, I'm still busy. I'll call you later."
454 msgstr ""
455
456@@ -200,7 +253,7 @@
457 msgid "Spent <b>%1</b> minutes in calls today"
458 msgstr ""
459
460-#: indicator/messagingmenu.cpp:55 indicator/messagingmenu.cpp:59
461+#: indicator/messagingmenu.cpp:56 indicator/messagingmenu.cpp:60
462 msgid "Telephony Service"
463 msgstr ""
464
465@@ -208,42 +261,47 @@
466 msgid "Telephony Service Approver"
467 msgstr ""
468
469-#: indicator/main.cpp:50
470+#: indicator/main.cpp:53
471 msgid "Telephony Service Indicator"
472 msgstr ""
473
474-#: indicator/textchannelobserver.cpp:215
475+#: indicator/textchannelobserver.cpp:245
476 msgid "The message could not be sent"
477 msgstr ""
478
479-#: indicator/textchannelobserver.cpp:210
480+#: indicator/textchannelobserver.cpp:239
481 msgid "Try again from the messaging application."
482 msgstr ""
483
484-#: Ubuntu/Telephony/contactwatcher.cpp:138
485+#: Ubuntu/Telephony/contactwatcher.cpp:133
486 msgid "Unknown Number"
487 msgstr ""
488
489-#: approver/approver.cpp:59
490+#: approver/approver.cpp:63
491 msgid "Unknown caller"
492 msgstr ""
493
494-#: indicator/messagingmenu.cpp:263
495+#: approver/approver.cpp:460 indicator/textchannelobserver.cpp:477
496+#: indicator/messagingmenu.cpp:151 indicator/messagingmenu.cpp:308
497 msgid "Unknown number"
498 msgstr ""
499
500-#: indicator/textchannelobserver.cpp:205
501+#: indicator/textchannelobserver.cpp:234
502 msgid "Unlock your sim card and try again from the messaging application."
503 msgstr ""
504
505-#: indicator/textchannelobserver.cpp:227 indicator/textchannelobserver.cpp:411
506+#: indicator/textchannelobserver.cpp:260 indicator/textchannelobserver.cpp:514
507 msgid "View message"
508 msgstr ""
509
510-#: indicator/messagingmenu.cpp:313
511+#: indicator/messagingmenu.cpp:403
512 msgid "Voicemail"
513 msgstr ""
514
515-#: indicator/messagingmenu.cpp:305
516+#: indicator/messagingmenu.cpp:395
517 msgid "Voicemail messages"
518 msgstr ""
519+
520+#: indicator/authhandler.cpp:91
521+msgid "Yes"
522+msgstr ""

Subscribers

People subscribed via source and target branches

to all changes: