telephony-service

Merge lp:~tiagosh/telephony-service/rtm-1389234 into lp:telephony-service/rtm-14.09

  1. rtm-1389234
  2. Merge into rtm-14.09
Proposed by Tiago Salem Herrmann
Status: Merged
Approved by: Bill Filler
Approved revision: 917
Merged at revision: 918
Proposed branch: lp:~tiagosh/telephony-service/rtm-1389234
Merge into: lp:telephony-service/rtm-14.09
Diff against target: 194 lines (+52/-20)
2 files modified
indicator/messagingmenu.cpp (+3/-3)
po/telephony-service.pot (+49/-17)
To merge this branch: bzr merge lp:~tiagosh/telephony-service/rtm-1389234
Reviewer Review Type Date Requested Status
Bill Filler (community) Approve
Review via email: mp+245673@code.launchpad.net

Commit message

Provide the translated string to messaging-menu.

Description of the change

Provide the translated string to messaging-menu.

To post a comment you must log in.
Revision history for this message
Bill Filler (bfiller) wrote :

approved

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'indicator/messagingmenu.cpp'
2--- indicator/messagingmenu.cpp 2014-09-18 12:25:28 +0000
3+++ indicator/messagingmenu.cpp 2015-01-06 17:23:29 +0000
4@@ -148,7 +148,7 @@
5 timestamp.toMSecsSinceEpoch() * 1000); // the value is expected to be in microseconds
6 messaging_menu_message_add_action(message,
7 "quickReply",
8- NULL, // label
9+ C::gettext("Send"), // label
10 G_VARIANT_TYPE("s"),
11 NULL // predefined values
12 );
13@@ -196,7 +196,7 @@
14 if (call.number != "x-ofono-private" && call.number != "x-ofono-unknown") {
15 messaging_menu_message_add_action(message,
16 "callBack",
17- NULL, // label
18+ C::gettext("Call back"), // label
19 NULL, // argument type
20 NULL // predefined values
21 );
22@@ -211,7 +211,7 @@
23 messages = g_variant_new_strv(predefinedMessages, -1);
24 messaging_menu_message_add_action(message,
25 "replyWithMessage",
26- NULL, // label
27+ C::gettext("Send"), // label
28 G_VARIANT_TYPE("s"),
29 messages // predefined values
30 );
31
32=== modified file 'po/telephony-service.pot'
33--- po/telephony-service.pot 2014-08-21 21:21:41 +0000
34+++ po/telephony-service.pot 2015-01-06 17:23:29 +0000
35@@ -8,7 +8,7 @@
36 msgstr ""
37 "Project-Id-Version: PACKAGE VERSION\n"
38 "Report-Msgid-Bugs-To: \n"
39-"POT-Creation-Date: 2014-08-20 11:37+0200\n"
40+"POT-Creation-Date: 2014-11-04 18:46-0200\n"
41 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
42 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
43 "Language-Team: LANGUAGE <LL@li.org>\n"
44@@ -25,7 +25,7 @@
45 msgstr[0] ""
46 msgstr[1] ""
47
48-#: indicator/messagingmenu.cpp:313
49+#: indicator/messagingmenu.cpp:308
50 #, qt-format
51 msgid "%1 voicemail message"
52 msgid_plural "%1 voicemail messages"
53@@ -52,24 +52,28 @@
54 msgid "<b>%1</b> text messages sent today"
55 msgstr ""
56
57-#: approver/approver.cpp:292
58+#: approver/approver.cpp:293
59 msgid "Accept"
60 msgstr ""
61
62-#: approver/approver.cpp:275
63+#: indicator/messagingmenu.cpp:199
64+msgid "Call back"
65+msgstr ""
66+
67+#: approver/approver.cpp:276
68 msgid "Caller number is not available"
69 msgstr ""
70
71-#: approver/approver.cpp:272
72+#: approver/approver.cpp:273
73 #, qt-format
74 msgid "Calling from %1"
75 msgstr ""
76
77-#: approver/approver.cpp:268
78+#: approver/approver.cpp:269
79 msgid "Calling from private number"
80 msgstr ""
81
82-#: approver/approver.cpp:270
83+#: approver/approver.cpp:271
84 msgid "Calling from unknown number"
85 msgstr ""
86
87@@ -77,11 +81,15 @@
88 msgid "Cancel"
89 msgstr ""
90
91-#: approver/approver.cpp:314
92+#: indicator/textchannelobserver.cpp:208
93+msgid "Deactivate flight mode and try again from the messaging application."
94+msgstr ""
95+
96+#: approver/approver.cpp:315
97 msgid "Decline"
98 msgstr ""
99
100-#: approver/approver.cpp:291
101+#: approver/approver.cpp:292
102 msgid "Hold + Answer"
103 msgstr ""
104
105@@ -101,7 +109,7 @@
106 msgid "I'm running late. I'm on my way."
107 msgstr ""
108
109-#: indicator/textchannelobserver.cpp:220 indicator/textchannelobserver.cpp:295
110+#: indicator/textchannelobserver.cpp:343 indicator/textchannelobserver.cpp:418
111 #, qt-format
112 msgid "Message from %1"
113 msgstr ""
114@@ -122,7 +130,7 @@
115 msgid "No text messages sent today"
116 msgstr ""
117
118-#: indicator/textchannelobserver.cpp:169 indicator/ussdindicator.cpp:79
119+#: indicator/textchannelobserver.cpp:271 indicator/ussdindicator.cpp:79
120 msgid "Ok"
121 msgstr ""
122
123@@ -130,7 +138,11 @@
124 msgid "Phone Calls"
125 msgstr ""
126
127-#: Ubuntu/Telephony/contactwatcher.cpp:107
128+#: indicator/textchannelobserver.cpp:517
129+msgid "Please, select a SIM card:"
130+msgstr ""
131+
132+#: Ubuntu/Telephony/contactwatcher.cpp:136
133 msgid "Private Number"
134 msgstr ""
135
136@@ -151,10 +163,14 @@
137 msgid "SMS"
138 msgstr ""
139
140-#: indicator/textchannelobserver.cpp:175
141+#: indicator/textchannelobserver.cpp:277
142 msgid "Save"
143 msgstr ""
144
145+#: indicator/messagingmenu.cpp:151 indicator/messagingmenu.cpp:214
146+msgid "Send"
147+msgstr ""
148+
149 #: indicator/messagingmenu.cpp:208
150 msgid "Sorry, I'm still busy. I'll call you later."
151 msgstr ""
152@@ -176,11 +192,19 @@
153 msgid "Telephony Service Indicator"
154 msgstr ""
155
156-#: Ubuntu/Telephony/contactwatcher.cpp:109
157+#: indicator/textchannelobserver.cpp:216
158+msgid "The message could not be sent"
159+msgstr ""
160+
161+#: indicator/textchannelobserver.cpp:211
162+msgid "Try again from the messaging application."
163+msgstr ""
164+
165+#: Ubuntu/Telephony/contactwatcher.cpp:138
166 msgid "Unknown Number"
167 msgstr ""
168
169-#: approver/approver.cpp:58
170+#: approver/approver.cpp:59
171 msgid "Unknown caller"
172 msgstr ""
173
174@@ -188,10 +212,18 @@
175 msgid "Unknown number"
176 msgstr ""
177
178-#: indicator/textchannelobserver.cpp:240
179+#: indicator/textchannelobserver.cpp:206
180+msgid "Unlock your sim card and try again from the messaging application."
181+msgstr ""
182+
183+#: indicator/textchannelobserver.cpp:228 indicator/textchannelobserver.cpp:363
184 msgid "View message"
185 msgstr ""
186
187-#: indicator/messagingmenu.cpp:311
188+#: indicator/messagingmenu.cpp:313
189+msgid "Voicemail"
190+msgstr ""
191+
192+#: indicator/messagingmenu.cpp:305
193 msgid "Voicemail messages"
194 msgstr ""

Subscribers

People subscribed via source and target branches