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