dialer-app

Merge lp:~phablet-team/dialer-app/desktop-translation-fixes into lp:dialer-app

  1. desktop-translation-fixes
  2. Merge into trunk
Proposed by Ugo Riboni
Status: Merged
Approved by: Gustavo Pichorim Boiko
Approved revision: 231
Merged at revision: 255
Proposed branch: lp:~phablet-team/dialer-app/desktop-translation-fixes
Merge into: lp:dialer-app
Diff against target: 659 lines (+158/-126)
5 files modified
CMakeLists.txt (+1/-1)
po/CMakeLists.txt (+14/-5)
po/dialer-app.pot (+140/-119)
src/qml/ContactsPage/ContactsPage.qml (+1/-0)
src/qml/Dialogs/SetDefaultSIMCardDialog.qml (+2/-1)
To merge this branch: bzr merge lp:~phablet-team/dialer-app/desktop-translation-fixes
Reviewer Review Type Date Requested Status
Gustavo Pichorim Boiko (community) Approve
PS Jenkins bot continuous-integration Needs Fixing
David Planella (community) Needs Fixing
Renato Araujo Oliveira Filho Pending
Review via email: mp+230944@code.launchpad.net

Commit message

Make sure the strings from the .desktop file end up in the .pot file. Follow convention and make paths in .pot file relative to po dir as well.

Description of the change

Make sure the strings from the .desktop file end up in the .pot file. Follow convention and make paths in .pot file relative to po dir as well.

To post a comment you must log in.
Revision history for this message
David Planella (dpm) wrote :

Looks good to me, thanks, just a couple of comments inline.

review: Needs Fixing
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:227
http://jenkins.qa.ubuntu.com/job/dialer-app-ci/393/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/dialer-app-utopic-amd64-ci/164/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/dialer-app-utopic-armhf-ci/163/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/dialer-app-utopic-i386-ci/164/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/3590/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/2820/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/4837/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/3104/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/dialer-app-ci/393/rebuild

review: Needs Fixing (continuous-integration)
lp:~phablet-team/dialer-app/desktop-translation-fixes updated
228. By Renato Araujo Oliveira Filho

Append TRANSLATORS comments.
Fixed dialer-app.pot cmake target build.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:228
http://jenkins.qa.ubuntu.com/job/dialer-app-ci/409/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/dialer-app-utopic-i386-ci/180
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/3833
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/2947/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/3693
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5080
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5080/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/11810
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/2395/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/3231
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/3231/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/dialer-app-ci/409/rebuild

review: Needs Fixing (continuous-integration)
lp:~phablet-team/dialer-app/desktop-translation-fixes updated
229. By Renato Araujo Oliveira Filho

Updated pot file with source files path relative from po/ source dir.

230. By Renato Araujo Oliveira Filho

Trunk merged.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:229
http://jenkins.qa.ubuntu.com/job/dialer-app-ci/417/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/dialer-app-utopic-i386-ci/188/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/4006/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/3084/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5257/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/3369/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/dialer-app-ci/417/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:230
http://jenkins.qa.ubuntu.com/job/dialer-app-ci/418/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/dialer-app-utopic-i386-ci/189
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/4007
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/3085
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/3850
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5258
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5258/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/12058
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/2516
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/3370
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/3370/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/dialer-app-ci/418/rebuild

review: Needs Fixing (continuous-integration)
lp:~phablet-team/dialer-app/desktop-translation-fixes updated
231. By Gustavo Pichorim Boiko

Merge latest changes from trunk.

Revision history for this message
Renato Araujo Oliveira Filho (renatofilho) wrote :

Are there any related MPs required for this MP to build/function as expected? NO

Is your branch in sync with latest trunk? YES

Did you perform an exploratory manual test run of your code change and any related functionality on device or emulator? YES

Did you successfully run all tests found in your component's Test Plan on device or emulator? YES

If you changed the UI, was the change specified/approved by design? YES

If you changed UI labels, did you update the pot file? YES

If you changed the packaging (debian), did you add a core-dev as a reviewer to this MP? NO PACKAGE CHANGE

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:231
http://jenkins.qa.ubuntu.com/job/dialer-app-ci/430/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/dialer-app-utopic-i386-ci/201
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/4357
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/3260
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/4149
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5609
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5609/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/12509
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/2676
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/3554
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/3554/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/dialer-app-ci/430/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Gustavo Pichorim Boiko (boiko) wrote :

Did you perform an exploratory manual test run of the code change and any related functionality on device or emulator?
Yes

Did CI run pass? If not, please explain why.
No, but not related to this MR.

Have you checked that submitter has accurately filled out the submitter checklist and has taken no shortcut?
Yes

Code looks good and works as expected!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'CMakeLists.txt'
2--- CMakeLists.txt 2014-06-16 17:28:15 +0000
3+++ CMakeLists.txt 2014-09-02 20:24:45 +0000
4@@ -71,6 +71,6 @@
5
6 enable_testing()
7
8+add_subdirectory(po)
9 add_subdirectory(src)
10 add_subdirectory(tests)
11-add_subdirectory(po)
12
13=== modified file 'po/CMakeLists.txt'
14--- po/CMakeLists.txt 2014-08-13 19:04:18 +0000
15+++ po/CMakeLists.txt 2014-09-02 20:24:45 +0000
16@@ -9,12 +9,15 @@
17 set(DOMAIN dialer-app)
18 set(POT_FILE ${DOMAIN}.pot)
19 file(GLOB PO_FILES *.po)
20-file(GLOB_RECURSE I18N_SRCS RELATIVE ${CMAKE_SOURCE_DIR}
21+file(GLOB_RECURSE I18N_SRCS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
22 ${CMAKE_SOURCE_DIR}/src/*.qml
23 ${CMAKE_SOURCE_DIR}/src/*.js
24 ${CMAKE_SOURCE_DIR}/src/*.cpp
25 )
26-list(APPEND I18N_SRCS src/${DESKTOP_FILE}.in.in)
27+list(SORT I18N_SRCS)
28+file(RELATIVE_PATH DESKTOP_FILE_IN_IN ${CMAKE_CURRENT_SOURCE_DIR}
29+ ${CMAKE_SOURCE_DIR}/src/${DESKTOP_FILE}.in.in)
30+
31
32 foreach(PO_FILE ${PO_FILES})
33 get_filename_component(LANG ${PO_FILE} NAME_WE)
34@@ -27,12 +30,18 @@
35
36 find_program(XGETTEXT_EXECUTABLE xgettext)
37 if(XGETTEXT_EXECUTABLE)
38- add_custom_target(${POT_FILE} ALL
39+ add_custom_target(${POT_FILE}
40 COMMENT "Generating translation template"
41 COMMAND ${INTLTOOL_EXTRACT} --update --type=gettext/ini
42- --srcdir=${CMAKE_SOURCE_DIR} src/${DESKTOP_FILE}.in.in
43+ --srcdir=${CMAKE_CURRENT_SOURCE_DIR} ${DESKTOP_FILE_IN_IN}
44
45- COMMAND ${XGETTEXT_EXECUTABLE} --c++ --qt --add-comments=TRANSLATORS --keyword=tr --keyword=tr:1,2 -D ${CMAKE_SOURCE_DIR} -s -p ${CMAKE_CURRENT_SOURCE_DIR} -o ${POT_FILE} ${I18N_SRCS}
46+ COMMAND ${XGETTEXT_EXECUTABLE}
47+ --c++ --qt --add-comments=TRANSLATORS
48+ --keyword=tr --keyword=tr:1,2 --keyword=N_
49+ -s -p ${CMAKE_CURRENT_SOURCE_DIR}
50+ -o ${POT_FILE} ${I18N_SRCS}
51+ -D ${CMAKE_CURRENT_SOURCE_DIR} ${I18N_SRCS}
52+ -D ${CMAKE_CURRENT_BINARY_DIR} ${DESKTOP_FILE_IN_IN}.h
53 )
54
55 add_custom_target(translations
56
57=== modified file 'po/dialer-app.pot'
58--- po/dialer-app.pot 2014-09-01 13:50:50 +0000
59+++ po/dialer-app.pot 2014-09-02 20:24:45 +0000
60@@ -8,7 +8,7 @@
61 msgstr ""
62 "Project-Id-Version: PACKAGE VERSION\n"
63 "Report-Msgid-Bugs-To: \n"
64-"POT-Creation-Date: 2014-09-01 15:47+0200\n"
65+"POT-Creation-Date: 2014-09-02 17:23-0300\n"
66 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
67 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
68 "Language-Team: LANGUAGE <LL@li.org>\n"
69@@ -18,31 +18,31 @@
70 "Content-Transfer-Encoding: 8bit\n"
71 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
72
73-#: src/qml/DialerPage/Keypad.qml:174
74+#: ../src/qml/DialerPage/Keypad.qml:174
75 msgid "#"
76 msgstr ""
77
78 #. TRANSLATORS: %1 is the call duration here.
79-#: src/qml/LiveCallPage/LiveCall.qml:381
80+#: ../src/qml/LiveCallPage/LiveCall.qml:381
81 #, qt-format
82 msgid "%1 - on hold"
83 msgstr ""
84
85-#: src/qml/HistoryPage/dateUtils.js:92
86+#: ../src/qml/HistoryPage/dateUtils.js:92
87 #, qt-format
88 msgid "%1 hour"
89 msgid_plural "%1 hours"
90 msgstr[0] ""
91 msgstr[1] ""
92
93-#: src/qml/HistoryPage/dateUtils.js:94
94+#: ../src/qml/HistoryPage/dateUtils.js:94
95 #, qt-format
96 msgid "%1 min"
97 msgid_plural "%1 mins"
98 msgstr[0] ""
99 msgstr[1] ""
100
101-#: src/qml/HistoryPage/dateUtils.js:96
102+#: ../src/qml/HistoryPage/dateUtils.js:96
103 #, qt-format
104 msgid "%1 sec"
105 msgid_plural "%1 secs"
106@@ -50,393 +50,414 @@
107 msgstr[1] ""
108
109 #. TRANSLATORS: this is the count of events grouped into this single item
110-#: src/qml/HistoryPage/HistoryDelegate.qml:207
111+#: ../src/qml/HistoryPage/HistoryDelegate.qml:207
112 #, qt-format
113 msgid "(%1)"
114 msgstr ""
115
116-#: src/qml/DialerPage/Keypad.qml:150
117+#: ../src/qml/DialerPage/Keypad.qml:150
118 msgid "*"
119 msgstr ""
120
121-#: src/qml/DialerPage/Keypad.qml:161 src/qml/DialerPage/DialerPage.qml:344
122+#: ../src/qml/DialerPage/DialerPage.qml:344
123+#: ../src/qml/DialerPage/Keypad.qml:161
124 msgid "+"
125 msgstr ""
126
127-#: src/qml/ContactsPage/ContactsPage.qml:186
128+#. TRANSLATORS: this refers to a new contact
129+#: ../src/qml/ContactsPage/ContactsPage.qml:187
130 msgid "+ Create New"
131 msgstr ""
132
133-#: src/qml/DialerPage/Keypad.qml:160
134+#: ../src/qml/DialerPage/Keypad.qml:160
135 msgid "0"
136 msgstr ""
137
138-#: src/qml/DialerPage/Keypad.qml:49
139+#: ../src/qml/DialerPage/Keypad.qml:49
140 msgid "1"
141 msgstr ""
142
143-#: src/qml/DialerPage/Keypad.qml:60
144+#: ../src/qml/DialerPage/Keypad.qml:60
145 msgid "2"
146 msgstr ""
147
148-#: src/qml/DialerPage/Keypad.qml:71
149+#: ../src/qml/DialerPage/Keypad.qml:71
150 msgid "3"
151 msgstr ""
152
153-#: src/qml/DialerPage/Keypad.qml:82
154+#: ../src/qml/DialerPage/Keypad.qml:82
155 msgid "4"
156 msgstr ""
157
158-#: src/qml/DialerPage/Keypad.qml:93
159+#: ../src/qml/DialerPage/Keypad.qml:93
160 msgid "5"
161 msgstr ""
162
163-#: src/qml/DialerPage/Keypad.qml:104
164+#: ../src/qml/DialerPage/Keypad.qml:104
165 msgid "6"
166 msgstr ""
167
168-#: src/qml/DialerPage/Keypad.qml:115
169+#: ../src/qml/DialerPage/Keypad.qml:115
170 msgid "7"
171 msgstr ""
172
173-#: src/qml/DialerPage/Keypad.qml:126
174+#: ../src/qml/DialerPage/Keypad.qml:126
175 msgid "8"
176 msgstr ""
177
178-#: src/qml/DialerPage/Keypad.qml:137
179+#: ../src/qml/DialerPage/Keypad.qml:137
180 msgid "9"
181 msgstr ""
182
183-#: src/qml/DialerPage/Keypad.qml:61
184+#: ../src/qml/DialerPage/Keypad.qml:61
185 msgid "ABC"
186 msgstr ""
187
188-#: src/qml/LiveCallPage/MultiCallDisplay.qml:123
189+#: ../src/qml/LiveCallPage/MultiCallDisplay.qml:123
190 msgid "Active"
191 msgstr ""
192
193-#: src/qml/HistoryPage/HistoryPage.qml:47
194-#: src/qml/ContactsPage/ContactsPage.qml:71
195+#: ../src/qml/ContactsPage/ContactsPage.qml:71
196+#: ../src/qml/HistoryPage/HistoryPage.qml:47
197 msgid "All"
198 msgstr ""
199
200-#: src/qml/LiveCallPage/LiveCall.qml:277
201+#: ../src/qml/LiveCallPage/LiveCall.qml:277
202 msgid "Bluetooth device"
203 msgstr ""
204
205-#: src/qml/dialer-app.qml:409
206+#: ../src/qml/dialer-app.qml:409
207 msgid "Call Barring"
208 msgstr ""
209
210-#: src/qml/dialer-app.qml:420
211+#: ../src/qml/dialer-app.qml:420
212 msgid "Call Forwarding"
213 msgstr ""
214
215-#: src/qml/dialer-app.qml:431
216+#: ../src/qml/dialer-app.qml:431
217 msgid "Call Waiting"
218 msgstr ""
219
220-#: src/qml/LiveCallPage/LiveCall.qml:109
221+#: ../src/qml/LiveCallPage/LiveCall.qml:109
222 msgid "Call ended"
223 msgstr ""
224
225-#: src/qml/LiveCallPage/LiveCall.qml:248
226+#: ../src/qml/LiveCallPage/LiveCall.qml:248
227 msgid "Call failed"
228 msgstr ""
229
230-#: src/qml/LiveCallPage/MultiCallDisplay.qml:100
231-#: src/qml/LiveCallPage/LiveCall.qml:383
232-#: src/qml/LiveCallPage/ConferenceCallDisplay.qml:107
233+#: ../src/qml/LiveCallPage/ConferenceCallDisplay.qml:107
234+#: ../src/qml/LiveCallPage/LiveCall.qml:383
235+#: ../src/qml/LiveCallPage/MultiCallDisplay.qml:100
236 msgid "Calling"
237 msgstr ""
238
239-#: src/qml/dialer-app.qml:442
240+#: ../src/qml/dialer-app.qml:442
241 msgid "Calling Line Presentation"
242 msgstr ""
243
244-#: src/qml/dialer-app.qml:454
245+#: ../src/qml/dialer-app.qml:454
246 msgid "Calling Line Restriction"
247 msgstr ""
248
249-#: src/qml/ContactsPage/ContactsPage.qml:85
250+#: ../src/qml/ContactsPage/ContactsPage.qml:85
251 msgid "Cancel"
252 msgstr ""
253
254-#: src/qml/Dialogs/SetDefaultSIMCardDialog.qml:29
255-msgid "Change all Call associations to "
256+#. TRANSLATORS: this refers to which SIM card will be used as default for calls
257+#: ../src/qml/Dialogs/SetDefaultSIMCardDialog.qml:30
258+#, qt-format
259+msgid "Change all Call associations to %1?"
260 msgstr ""
261
262-#: src/qml/dialer-app.qml:303 src/qml/Dialogs/NoSIMCardSelectedDialog.qml:30
263-#: src/qml/DialerPage/DialerPage.qml:51
264+#: ../src/qml/DialerPage/DialerPage.qml:51
265+#: ../src/qml/Dialogs/NoSIMCardSelectedDialog.qml:30
266+#: ../src/qml/dialer-app.qml:303
267 msgid "Close"
268 msgstr ""
269
270-#: src/qml/LiveCallPage/MultiCallDisplay.qml:82
271-#: src/qml/LiveCallPage/LiveCall.qml:47
272+#: ../src/qml/LiveCallPage/LiveCall.qml:47
273+#: ../src/qml/LiveCallPage/MultiCallDisplay.qml:82
274 msgid "Conference"
275 msgstr ""
276
277-#: src/qml/dialer-app.qml:448
278+#: ../src/qml/dialer-app.qml:448
279 msgid "Connected Line Presentation"
280 msgstr ""
281
282-#: src/qml/dialer-app.qml:460
283+#: ../src/qml/dialer-app.qml:460
284 msgid "Connected Line Restriction"
285 msgstr ""
286
287-#: src/qml/HistoryPage/HistoryPage.qml:332
288-#: src/qml/HistoryPage/HistoryDetailsPage.qml:54
289+#: ../src/qml/HistoryPage/HistoryDetailsPage.qml:54
290+#: ../src/qml/HistoryPage/HistoryPage.qml:332
291 msgid "Contact Details"
292 msgstr ""
293
294-#: src/qml/DialerPage/DialerPage.qml:39
295-#: src/qml/ContactsPage/ContactsPage.qml:32
296+#: ../src/qml/ContactsPage/ContactsPage.qml:32
297+#: ../src/qml/DialerPage/DialerPage.qml:39
298 msgid "Contacts"
299 msgstr ""
300
301-#: src/qml/DialerPage/Keypad.qml:72
302+#: ../src/qml/DialerPage/Keypad.qml:72
303 msgid "DEF"
304 msgstr ""
305
306-#: src/qml/HistoryPage/HistoryPage.qml:310
307-#: src/qml/HistoryPage/HistoryDetailsPage.qml:74
308-#: src/qml/HistoryPage/HistoryDetailsPage.qml:248
309+#: ../src/qml/HistoryPage/HistoryDetailsPage.qml:74
310+#: ../src/qml/HistoryPage/HistoryDetailsPage.qml:248
311+#: ../src/qml/HistoryPage/HistoryPage.qml:310
312 msgid "Delete"
313 msgstr ""
314
315-#: src/qml/HistoryPage/HistoryPage.qml:322
316+#: ../src/qml/HistoryPage/HistoryPage.qml:322
317 msgid "Details"
318 msgstr ""
319
320-#: src/qml/dialer-app.qml:339 src/qml/dialer-app.qml:353
321-#: src/qml/MMI/IMEI.qml:39
322+#: ../src/qml/MMI/IMEI.qml:39 ../src/qml/dialer-app.qml:339
323+#: ../src/qml/dialer-app.qml:353
324 msgid "Dismiss"
325 msgstr ""
326
327-#: src/qml/Dialogs/SetDefaultSIMCardDialog.qml:66
328+#: ../src/qml/Dialogs/SetDefaultSIMCardDialog.qml:67
329 msgid "Don't ask again"
330 msgstr ""
331
332-#: src/qml/DialerPage/DialerPage.qml:241
333+#: ../src/qml/DialerPage/DialerPage.qml:241
334 msgid "Enter a number"
335 msgstr ""
336
337-#: src/qml/dialer-app.qml:336
338+#: ../src/qml/dialer-app.qml:336
339 msgid "Error"
340 msgstr ""
341
342-#: src/qml/ContactsPage/ContactsPage.qml:71
343+#: ../src/qml/ContactsPage/ContactsPage.qml:71
344 msgid "Favorites"
345 msgstr ""
346
347-#: src/qml/DialerPage/DialerPage.qml:60
348+#: ../src/qml/DialerPage/DialerPage.qml:60
349 msgid "Flight mode"
350 msgstr ""
351
352-#: src/qml/DialerPage/Keypad.qml:83
353+#: ../src/qml/DialerPage/Keypad.qml:83
354 msgid "GHI"
355 msgstr ""
356
357-#: src/qml/MMI/IMEI.qml:36
358+#: ../src/qml/MMI/IMEI.qml:36
359 msgid "IMEI"
360 msgstr ""
361
362-#: src/qml/HistoryPage/HistoryDetailsPage.qml:309
363-#: src/qml/HistoryPage/HistoryDelegate.qml:60
364+#: ../src/qml/HistoryPage/HistoryDelegate.qml:60
365+#: ../src/qml/HistoryPage/HistoryDetailsPage.qml:309
366 msgid "Incoming"
367 msgstr ""
368
369-#: src/qml/dialer-app.qml:337
370+#: ../src/qml/dialer-app.qml:337
371 msgid "Invalid USSD code"
372 msgstr ""
373
374-#: src/qml/DialerPage/Keypad.qml:94
375+#: ../src/qml/DialerPage/Keypad.qml:94
376 msgid "JKL"
377 msgstr ""
378
379-#: src/qml/DialerPage/DialerPage.qml:66
380+#: ../src/qml/DialerPage/DialerPage.qml:66
381 msgid "Keypad"
382 msgstr ""
383
384-#: src/qml/Dialogs/NoDefaultSIMCardDialog.qml:80
385+#: ../src/qml/Dialogs/NoDefaultSIMCardDialog.qml:80
386 msgid "Later"
387 msgstr ""
388
389-#: src/qml/DialerPage/Keypad.qml:105
390+#: ../src/qml/DialerPage/Keypad.qml:105
391 msgid "MNO"
392 msgstr ""
393
394-#: src/qml/LiveCallPage/LiveCall.qml:483
395+#: ../src/qml/LiveCallPage/LiveCall.qml:483
396 msgid "Merge calls"
397 msgstr ""
398
399-#: src/qml/HistoryPage/HistoryPage.qml:47
400-#: src/qml/HistoryPage/HistoryDetailsPage.qml:307
401-#: src/qml/HistoryPage/HistoryDelegate.qml:58
402+#: ../src/qml/HistoryPage/HistoryDelegate.qml:58
403+#: ../src/qml/HistoryPage/HistoryDetailsPage.qml:307
404+#: ../src/qml/HistoryPage/HistoryPage.qml:47
405 msgid "Missed"
406 msgstr ""
407
408-#: src/qml/LiveCallPage/LiveCall.qml:66
409+#: ../src/qml/LiveCallPage/LiveCall.qml:66
410 msgid "New Call"
411 msgstr ""
412
413-#: src/qml/Dialogs/SetDefaultSIMCardDialog.qml:39
414-#: src/qml/Dialogs/NoDefaultSIMCardDialog.qml:70
415+#: ../src/qml/Dialogs/NoDefaultSIMCardDialog.qml:70
416+#: ../src/qml/Dialogs/SetDefaultSIMCardDialog.qml:40
417 msgid "No"
418 msgstr ""
419
420-#: src/qml/Dialogs/NoSIMCardSelectedDialog.qml:26
421+#: ../src/qml/Dialogs/NoSIMCardSelectedDialog.qml:26
422 msgid "No SIM card selected"
423 msgstr ""
424
425-#: src/qml/LiveCallPage/LiveCall.qml:98
426+#: ../src/qml/LiveCallPage/LiveCall.qml:98
427 msgid "No calls"
428 msgstr ""
429
430-#: src/qml/dialer-app.qml:298 src/qml/DialerPage/DialerPage.qml:68
431+#: ../src/qml/DialerPage/DialerPage.qml:68 ../src/qml/dialer-app.qml:298
432 msgid "No network"
433 msgstr ""
434
435-#: src/qml/LiveCallPage/MultiCallDisplay.qml:121
436+#: ../src/qml/LiveCallPage/MultiCallDisplay.qml:121
437 msgid "On hold"
438 msgstr ""
439
440-#: src/qml/HistoryPage/HistoryDetailsPage.qml:311
441-#: src/qml/HistoryPage/HistoryDelegate.qml:62
442+#: ../src/qml/HistoryPage/HistoryDelegate.qml:62
443+#: ../src/qml/HistoryPage/HistoryDetailsPage.qml:311
444 msgid "Outgoing"
445 msgstr ""
446
447-#: src/qml/DialerPage/Keypad.qml:116
448+#: ../src/qml/DialerPage/Keypad.qml:116
449 msgid "PQRS"
450 msgstr ""
451
452-#: src/qml/LiveCallPage/LiveCall.qml:281
453+#: ../src/dialer-app.desktop.in.in.h:1
454+msgid "Phone"
455+msgstr ""
456+
457+#: ../src/dialer-app.desktop.in.in.h:2
458+msgid "Phone App"
459+msgstr ""
460+
461+#: ../src/qml/LiveCallPage/LiveCall.qml:281
462 msgid "Phone Speaker"
463 msgstr ""
464
465-#: src/qml/dialer-app.qml:317
466+#: ../src/dialer-app.desktop.in.in.h:3
467+msgid "Phone application"
468+msgstr ""
469+
470+#: ../src/dialer-app.desktop.in.in.h:4
471+msgid "Phone;Dialer;Dial;Call;Keypad"
472+msgstr ""
473+
474+#: ../src/qml/dialer-app.qml:317
475 msgid "Please wait"
476 msgstr ""
477
478-#: src/qml/LiveCallPage/ConferenceCallDisplay.qml:135
479+#: ../src/qml/LiveCallPage/ConferenceCallDisplay.qml:135
480 msgid "Private"
481 msgstr ""
482
483-#: src/qml/HistoryPage/HistoryDetailsPage.qml:42
484-#: src/qml/HistoryPage/HistoryDelegate.qml:173
485+#: ../src/qml/HistoryPage/HistoryDelegate.qml:173
486+#: ../src/qml/HistoryPage/HistoryDetailsPage.qml:42
487 msgid "Private number"
488 msgstr ""
489
490-#: src/qml/HistoryPage/HistoryPage.qml:43
491-#: src/qml/DialerPage/DialerPage.qml:103
492+#: ../src/qml/DialerPage/DialerPage.qml:103
493+#: ../src/qml/HistoryPage/HistoryPage.qml:43
494 msgid "Recent"
495 msgstr ""
496
497-#: src/qml/ContactsPage/ContactsPage.qml:60
498+#: ../src/qml/ContactsPage/ContactsPage.qml:60
499 msgid "Search"
500 msgstr ""
501
502-#: src/qml/ContactsPage/ContactsPage.qml:48
503+#: ../src/qml/ContactsPage/ContactsPage.qml:48
504 msgid "Search..."
505 msgstr ""
506
507-#: src/qml/HistoryPage/HistoryPage.qml:43
508+#: ../src/qml/HistoryPage/HistoryPage.qml:43
509 msgid "Select"
510 msgstr ""
511
512-#: src/qml/Dialogs/NoDefaultSIMCardDialog.qml:58
513+#: ../src/qml/Dialogs/NoDefaultSIMCardDialog.qml:58
514 msgid ""
515 "Select a default SIM for all outgoing calls. You can always alter your "
516 "choice in <a href=\"system_settings\">System Settings</a>."
517 msgstr ""
518
519-#: src/qml/HistoryPage/HistoryPage.qml:345
520+#: ../src/qml/HistoryPage/HistoryPage.qml:345
521 msgid "Send message"
522 msgstr ""
523
524-#: src/qml/DialerPage/DialerPage.qml:44
525+#: ../src/qml/DialerPage/DialerPage.qml:44
526 msgid "Settings"
527 msgstr ""
528
529-#: src/qml/HistoryPage/HistoryDetailsPage.qml:66
530+#: ../src/qml/HistoryPage/HistoryDetailsPage.qml:66
531 msgid "Share"
532 msgstr ""
533
534-#: src/qml/LiveCallPage/LiveCall.qml:468
535+#: ../src/qml/LiveCallPage/LiveCall.qml:468
536 msgid "Switch calls"
537 msgstr ""
538
539-#: src/qml/Dialogs/NoDefaultSIMCardDialog.qml:27
540+#: ../src/qml/Dialogs/NoDefaultSIMCardDialog.qml:27
541 msgid "Switch to default SIM:"
542 msgstr ""
543
544-#: src/qml/DialerPage/Keypad.qml:127
545+#: ../src/qml/DialerPage/Keypad.qml:127
546 msgid "TUV"
547 msgstr ""
548
549-#: src/qml/dialer-app.qml:299
550+#: ../src/qml/dialer-app.qml:299
551 #, qt-format
552 msgid "There is currently no network on %1"
553 msgstr ""
554
555-#: src/qml/dialer-app.qml:300
556+#: ../src/qml/dialer-app.qml:300
557 msgid "There is currently no network."
558 msgstr ""
559
560-#: src/qml/HistoryPage/dateUtils.js:45
561+#: ../src/qml/HistoryPage/dateUtils.js:45
562 msgid "Today"
563 msgstr ""
564
565-#: src/qml/LiveCallPage/LiveCall.qml:279
566+#: ../src/qml/LiveCallPage/LiveCall.qml:279
567 msgid "Ubuntu Phone"
568 msgstr ""
569
570-#: src/qml/LiveCallPage/LiveCall.qml:283
571+#: ../src/qml/LiveCallPage/LiveCall.qml:283
572 msgid "Unknown device"
573 msgstr ""
574
575-#: src/qml/HistoryPage/HistoryDetailsPage.qml:44
576-#: src/qml/HistoryPage/HistoryDelegate.qml:175
577+#: ../src/qml/HistoryPage/HistoryDelegate.qml:175
578+#: ../src/qml/HistoryPage/HistoryDetailsPage.qml:44
579 msgid "Unknown number"
580 msgstr ""
581
582-#: src/qml/LiveCallPage/MultiCallDisplay.qml:84
583-#: src/qml/LiveCallPage/ConferenceCallDisplay.qml:69
584+#: ../src/qml/LiveCallPage/ConferenceCallDisplay.qml:69
585+#: ../src/qml/LiveCallPage/MultiCallDisplay.qml:84
586 msgid "Voicemail"
587 msgstr ""
588
589-#: src/qml/DialerPage/Keypad.qml:138
590+#: ../src/qml/DialerPage/Keypad.qml:138
591 msgid "WXYZ"
592 msgstr ""
593
594-#: src/qml/Dialogs/SetDefaultSIMCardDialog.qml:49
595+#: ../src/qml/Dialogs/SetDefaultSIMCardDialog.qml:50
596 msgid "Yes"
597 msgstr ""
598
599-#: src/qml/HistoryPage/dateUtils.js:47
600+#: ../src/qml/HistoryPage/dateUtils.js:47
601 msgid "Yesterday"
602 msgstr ""
603
604-#: src/qml/Dialogs/NoSIMCardSelectedDialog.qml:27
605+#: ../src/qml/Dialogs/NoSIMCardSelectedDialog.qml:27
606 msgid "You need to select a SIM card"
607 msgstr ""
608
609-#. TRANSLATORS: HH:mm is the time format, translate it according to:
610-#. http://qt-project.org/doc/qt-5/qml-qtqml-qt.html#formatDate-method
611 #. TRANSLATORS: this string is the time a call has happenend. It represents the format to be used, according to:
612 #. http://qt-project.org/doc/qt-5/qml-qtqml-qt.html#formatDate-method
613 #. please change according to your language
614-#: src/qml/HistoryPage/HistoryDetailsPage.qml:265
615-#: src/qml/HistoryPage/HistoryDelegate.qml:239
616+#. TRANSLATORS: HH:mm is the time format, translate it according to:
617+#. http://qt-project.org/doc/qt-5/qml-qtqml-qt.html#formatDate-method
618+#: ../src/qml/HistoryPage/HistoryDelegate.qml:239
619+#: ../src/qml/HistoryPage/HistoryDetailsPage.qml:265
620 msgid "hh:mm ap"
621 msgstr ""
622
623 #. TRANSLATORS: this is the duration time format when the call lasted more than an hour
624-#: src/qml/HistoryPage/dateUtils.js:112
625+#: ../src/qml/HistoryPage/dateUtils.js:112
626 msgid "hh:mm:ss"
627 msgstr ""
628
629 #. TRANSLATORS: this is the duration time format when the call lasted less than an hour
630-#: src/qml/HistoryPage/dateUtils.js:115
631+#: ../src/qml/HistoryPage/dateUtils.js:115
632 msgid "mm:ss"
633 msgstr ""
634
635=== modified file 'src/qml/ContactsPage/ContactsPage.qml'
636--- src/qml/ContactsPage/ContactsPage.qml 2014-08-13 15:18:39 +0000
637+++ src/qml/ContactsPage/ContactsPage.qml 2014-09-02 20:24:45 +0000
638@@ -183,6 +183,7 @@
639 rightMargin: units.gu(2)
640 }
641 color: UbuntuColors.lightAubergine
642+ // TRANSLATORS: this refers to a new contact
643 text: i18n.tr("+ Create New")
644 elide: Text.ElideRight
645 }
646
647=== modified file 'src/qml/Dialogs/SetDefaultSIMCardDialog.qml'
648--- src/qml/Dialogs/SetDefaultSIMCardDialog.qml 2014-08-11 21:58:24 +0000
649+++ src/qml/Dialogs/SetDefaultSIMCardDialog.qml 2014-09-02 20:24:45 +0000
650@@ -26,7 +26,8 @@
651 id: dialogue
652 property string phoneNumber: ""
653 property string accountId: ""
654- text: i18n.tr("Change all Call associations to " + mainView.account.displayName +"?")
655+ // TRANSLATORS: this refers to which SIM card will be used as default for calls
656+ text: i18n.tr("Change all Call associations to %1?").arg(mainView.account.displayName)
657 Column {
658 anchors.left: parent.left
659 anchors.right: parent.right

Subscribers

People subscribed via source and target branches