dialer-app

Merge lp:~renatofilho/dialer-app/update-pot into lp:dialer-app

  1. update-pot
  2. Merge into trunk
Proposed by Renato Araujo Oliveira Filho
Status: Rejected
Rejected by: Renato Araujo Oliveira Filho
Proposed branch: lp:~renatofilho/dialer-app/update-pot
Merge into: lp:dialer-app
Prerequisite: lp:~renatofilho/dialer-app/new-history-visuals
Diff against target: 15045 lines (+4088/-3608) (has conflicts)
44 files modified
po/ar.po (+107/-89)
po/ast.po (+78/-54)
po/az.po (+90/-89)
po/br.po (+113/-89)
po/ca.po (+78/-54)
po/cs.po (+90/-89)
po/de.po (+113/-89)
po/dialer-app.pot (+78/-90)
po/el.po (+52/-63)
po/en_GB.po (+84/-21)
po/es.po (+78/-54)
po/eu.po (+56/-52)
po/fa.po (+80/-91)
po/fi.po (+113/-89)
po/fr.po (+113/-89)
po/gd.po (+113/-90)
po/gl.po (+78/-54)
po/he.po (+113/-89)
po/hu.po (+106/-88)
po/it.po (+113/-89)
po/ja.po (+81/-89)
po/km.po (+90/-89)
po/lo.po (+90/-89)
po/lv.po (+107/-90)
po/ms.po (+90/-89)
po/my.po (+90/-89)
po/nb.po (+113/-89)
po/nl.po (+80/-91)
po/nn.po (+80/-91)
po/pl.po (+113/-89)
po/pt.po (+47/-52)
po/pt_BR.po (+98/-92)
po/ru.po (+115/-91)
po/shn.po (+80/-91)
po/si.po (+80/-91)
po/sl.po (+115/-91)
po/sv.po (+103/-93)
po/ta.po (+90/-89)
po/tr.po (+90/-89)
po/ug.po (+82/-64)
po/uk.po (+115/-91)
po/zh_CN.po (+113/-89)
po/zh_HK.po (+90/-89)
po/zh_TW.po (+90/-89)
Text conflict in po/en_GB.po
To merge this branch: bzr merge lp:~renatofilho/dialer-app/update-pot
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Needs Fixing
Ubuntu Phablet Team Pending
Review via email: mp+226571@code.launchpad.net

Commit message

Update pot file.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:183
http://jenkins.qa.ubuntu.com/job/dialer-app-ci/284/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/dialer-app-utopic-amd64-ci/55
    SUCCESS: http://jenkins.qa.ubuntu.com/job/dialer-app-utopic-armhf-ci/54
        deb: http://jenkins.qa.ubuntu.com/job/dialer-app-utopic-armhf-ci/54/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/dialer-app-utopic-i386-ci/55
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/1918
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/1597
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/2172
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3021
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3021/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/9754
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/1340
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/1787
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/1787/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

Unmerged revisions

183. By Renato Araujo Oliveira Filho

Update pot file.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'po/ar.po'
2--- po/ar.po 2014-05-25 06:12:36 +0000
3+++ po/ar.po 2014-07-12 12:27:17 +0000
4@@ -6,11 +6,12 @@
5 msgid ""
6 msgstr ""
7 "Project-Id-Version: dialer-app\n"
8-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9-"POT-Creation-Date: 2014-05-09 15:20-0300\n"
10+"Report-Msgid-Bugs-To: \n"
11+"POT-Creation-Date: 2014-07-12 09:22-0300\n"
12 "PO-Revision-Date: 2014-05-24 11:50+0000\n"
13 "Last-Translator: Ibrahim Saed <ibraheem5000@gmail.com>\n"
14 "Language-Team: Arabic <ar@li.org>\n"
15+"Language: ar\n"
16 "MIME-Version: 1.0\n"
17 "Content-Type: text/plain; charset=UTF-8\n"
18 "Content-Transfer-Encoding: 8bit\n"
19@@ -19,7 +20,7 @@
20 "X-Launchpad-Export-Date: 2014-05-25 06:12+0000\n"
21 "X-Generator: Launchpad (build 17017)\n"
22
23-#: src/qml/DialerPage/Keypad.qml:202
24+#: src/qml/DialerPage/Keypad.qml:161
25 msgid "#"
26 msgstr "#"
27
28@@ -56,127 +57,107 @@
29 msgstr[4] "%1 ثانية"
30 msgstr[5] "%1 ثانية"
31
32-#: src/qml/DialerPage/Keypad.qml:179
33+#: src/qml/DialerPage/Keypad.qml:138
34 msgid "*"
35 msgstr "*"
36
37-#: src/qml/DialerPage/Keypad.qml:189
38+#: src/qml/DialerPage/Keypad.qml:148
39 msgid "+"
40 msgstr "+"
41
42-#: src/qml/DialerPage/Keypad.qml:188
43+#: src/qml/DialerPage/Keypad.qml:147
44 msgid "0"
45 msgstr "٠"
46
47-#: src/qml/DialerPage/Keypad.qml:86
48+#: src/qml/DialerPage/Keypad.qml:45
49 msgid "1"
50 msgstr "١"
51
52-#: src/qml/DialerPage/Keypad.qml:97
53+#: src/qml/DialerPage/Keypad.qml:56
54 msgid "2"
55 msgstr "٢"
56
57-#: src/qml/DialerPage/Keypad.qml:107
58+#: src/qml/DialerPage/Keypad.qml:66
59 msgid "3"
60 msgstr "٣"
61
62-#: src/qml/DialerPage/Keypad.qml:117
63+#: src/qml/DialerPage/Keypad.qml:76
64 msgid "4"
65 msgstr "٤"
66
67-#: src/qml/DialerPage/Keypad.qml:127
68+#: src/qml/DialerPage/Keypad.qml:86
69 msgid "5"
70 msgstr "٥"
71
72-#: src/qml/DialerPage/Keypad.qml:137
73+#: src/qml/DialerPage/Keypad.qml:96
74 msgid "6"
75 msgstr "٦"
76
77-#: src/qml/DialerPage/Keypad.qml:147
78+#: src/qml/DialerPage/Keypad.qml:106
79 msgid "7"
80 msgstr "٧"
81
82-#: src/qml/DialerPage/Keypad.qml:157
83+#: src/qml/DialerPage/Keypad.qml:116
84 msgid "8"
85 msgstr "٨"
86
87-#: src/qml/DialerPage/Keypad.qml:167
88+#: src/qml/DialerPage/Keypad.qml:126
89 msgid "9"
90 msgstr "٩"
91
92-#: src/qml/DialerPage/Keypad.qml:98
93+#: src/qml/DialerPage/Keypad.qml:57
94 msgid "ABC"
95 msgstr "ABC"
96
97-#: src/qml/HistoryPage/CallLogContactDelegate.qml:80
98-msgid "Add Contact"
99-msgstr "إضافة شخص"
100-
101-#: src/qml/HistoryPage/CallLogContactDelegate.qml:42
102-msgid "Add to existing contact"
103-msgstr "أضف إلى شخص موجود"
104-
105-#: src/qml/dialer-app.qml:207
106+#: src/qml/dialer-app.qml:309
107 msgid "Call Barring"
108 msgstr "حظر المكالمات"
109
110-#: src/qml/dialer-app.qml:218
111+#: src/qml/dialer-app.qml:320
112 msgid "Call Forwarding"
113 msgstr "تحويل المكالمات"
114
115-#: src/qml/dialer-app.qml:229
116+#: src/qml/dialer-app.qml:331
117 msgid "Call Waiting"
118 msgstr "انتظار المكالمات"
119
120-#: src/qml/MainPage.qml:56
121-msgid "Call log"
122-msgstr "سجل المكالمات"
123-
124-#: src/qml/HistoryPage/CallLogContactDelegate.qml:114
125-msgid "Call now"
126-msgstr ""
127-
128-#: src/qml/dialer-app.qml:240
129+#: src/qml/dialer-app.qml:342
130 msgid "Calling Line Presentation"
131 msgstr ""
132
133-#: src/qml/dialer-app.qml:252
134+#: src/qml/dialer-app.qml:354
135 msgid "Calling Line Restriction"
136 msgstr ""
137
138-#: src/qml/HistoryPage/CallLogContactDelegate.qml:60
139-msgid "Cancel"
140-msgstr "إلغاء"
141-
142-#: src/qml/LiveCallPage/LiveCall.qml:49
143 #: src/qml/LiveCallPage/MultiCallDisplay.qml:114
144 msgid "Conference"
145 msgstr ""
146
147-#: src/qml/dialer-app.qml:246
148+#: src/qml/dialer-app.qml:348
149 msgid "Connected Line Presentation"
150 msgstr ""
151
152-#: src/qml/dialer-app.qml:258
153+#: src/qml/dialer-app.qml:360
154 msgid "Connected Line Restriction"
155 msgstr ""
156
157-#: src/qml/MainPage.qml:45
158+#: src/qml/DialerPage/DialerPage.qml:41
159+#: src/qml/ContactsPage/ContactsPage.qml:29
160 msgid "Contacts"
161 msgstr "الأشخاص"
162
163-#: src/qml/HistoryPage/CallLogContactDelegate.qml:51
164-msgid "Create new contact"
165-msgstr "أنشئ شخصا جديدا"
166-
167-#: src/qml/DialerPage/Keypad.qml:108
168+#: src/qml/DialerPage/Keypad.qml:67
169 msgid "DEF"
170 msgstr ""
171
172-#: src/qml/HistoryPage/HistoryPage.qml:69
173+#: src/qml/HistoryPage/HistoryPage.qml:256
174 msgid "Delete"
175 msgstr "احذف"
176
177+#: src/qml/HistoryPage/HistoryPage.qml:263
178+msgid "Details"
179+msgstr ""
180+
181 #: src/dialer-app.desktop.in:3
182 msgid "Dialer"
183 msgstr "الاتصال"
184@@ -189,19 +170,19 @@
185 msgid "Dialer application"
186 msgstr "تطبيق الاتصال"
187
188-#: src/qml/dialer-app.qml:143 src/qml/dialer-app.qml:157
189+#: src/qml/dialer-app.qml:239 src/qml/dialer-app.qml:253
190 msgid "Dismiss"
191 msgstr "رفض"
192
193-#: src/qml/DialerPage/DialerPage.qml:79
194+#: src/qml/DialerPage/DialerPage.qml:146
195 msgid "Enter a number"
196 msgstr "أدخِل رقما"
197
198-#: src/qml/dialer-app.qml:140
199+#: src/qml/dialer-app.qml:236
200 msgid "Error"
201 msgstr "خطأ"
202
203-#: src/qml/DialerPage/Keypad.qml:118
204+#: src/qml/DialerPage/Keypad.qml:77
205 msgid "GHI"
206 msgstr ""
207
208@@ -209,23 +190,23 @@
209 msgid "Hangup"
210 msgstr "إغلاق الخط"
211
212-#: src/qml/HistoryPage/CallLogContactDelegate.qml:39
213-msgid "How do you want to save the contact?"
214-msgstr "كيف ترغب بحفظ الشخص؟"
215+#: src/qml/HistoryPage/HistoryDelegate.qml:55
216+msgid "Incoming"
217+msgstr ""
218
219-#: src/qml/dialer-app.qml:141
220+#: src/qml/dialer-app.qml:237
221 msgid "Invalid USSD code"
222 msgstr ""
223
224-#: src/qml/DialerPage/Keypad.qml:128
225+#: src/qml/DialerPage/Keypad.qml:87
226 msgid "JKL"
227 msgstr ""
228
229-#: src/qml/MainPage.qml:35
230+#: src/qml/DialerPage/DialerPage.qml:52
231 msgid "Keypad"
232 msgstr "لوحة المفاتيح"
233
234-#: src/qml/DialerPage/Keypad.qml:138
235+#: src/qml/DialerPage/Keypad.qml:97
236 msgid "MNO"
237 msgstr ""
238
239@@ -233,15 +214,24 @@
240 msgid "Merge calls"
241 msgstr "دمج المكالمات"
242
243-#: src/qml/LiveCallPage/LiveCall.qml:75
244-msgid "New call"
245+#: src/qml/HistoryPage/HistoryDelegate.qml:53
246+msgid "Missed"
247+msgstr ""
248+
249+#: src/qml/LiveCallPage/LiveCall.qml:62
250+#, fuzzy
251+msgid "New Call"
252 msgstr "مكالمة جديدة"
253
254-#: src/qml/DialerPage/Keypad.qml:148
255+#: src/qml/HistoryPage/HistoryDelegate.qml:57
256+msgid "Outgoing"
257+msgstr ""
258+
259+#: src/qml/DialerPage/Keypad.qml:107
260 msgid "PQRS"
261 msgstr ""
262
263-#: src/qml/dialer-app.qml:121
264+#: src/qml/dialer-app.qml:217
265 msgid "Please wait"
266 msgstr "انتظر من فضلك"
267
268@@ -249,16 +239,20 @@
269 msgid "Private"
270 msgstr "خاص"
271
272-#: src/qml/HistoryPage/CallLogContactDelegate.qml:38
273-#: src/qml/HistoryPage/CallLogContactDelegate.qml:134
274-msgid "Save contact"
275-msgstr "حفظ الشخص"
276-
277-#: src/qml/HistoryPage/CallLogContactDelegate.qml:124
278-msgid "Send text message"
279+#: src/qml/DialerPage/DialerPage.qml:76 src/qml/HistoryPage/HistoryPage.qml:43
280+msgid "Recent"
281+msgstr ""
282+
283+#: src/qml/HistoryPage/HistoryPage.qml:43
284+msgid "Select"
285+msgstr ""
286+
287+#: src/qml/HistoryPage/HistoryPage.qml:274
288+#, fuzzy
289+msgid "Send message"
290 msgstr "إرسال رسالة نصية"
291
292-#: src/qml/DialerPage/Keypad.qml:158
293+#: src/qml/DialerPage/Keypad.qml:117
294 msgid "TUV"
295 msgstr ""
296
297@@ -266,23 +260,20 @@
298 msgid "Today"
299 msgstr "اليوم"
300
301-#: src/qml/LiveCallPage/LiveCall.qml:47
302-msgid "Two Calls"
303-msgstr ""
304-
305-#: src/qml/HistoryPage/HistoryDelegate.qml:139
306-msgid "Unknown"
307-msgstr "مجهول"
308-
309-#: src/qml/HistoryPage/CallLogContactDelegate.qml:134
310-msgid "View contact"
311-msgstr "عرض الشخص"
312+#: src/qml/ContactsPage/ContactsPage.qml:46
313+msgid "Type a name or phone to search"
314+msgstr ""
315+
316+#: src/qml/DialerPage/KeypadEntry.qml:54
317+#: src/qml/HistoryPage/HistoryDelegate.qml:163
318+msgid "US"
319+msgstr ""
320
321 #: src/qml/LiveCallPage/MultiCallDisplay.qml:116
322 msgid "Voicemail"
323 msgstr "البريد الصوتي"
324
325-#: src/qml/DialerPage/Keypad.qml:168
326+#: src/qml/DialerPage/Keypad.qml:127
327 msgid "WXYZ"
328 msgstr ""
329
330@@ -290,17 +281,44 @@
331 msgid "Yesterday"
332 msgstr "أمس"
333
334+#: src/qml/LiveCallPage/ConferenceCallDisplay.qml:128
335 #: src/qml/LiveCallPage/MultiCallDisplay.qml:138
336-#: src/qml/LiveCallPage/ConferenceCallDisplay.qml:128
337 msgid "active"
338 msgstr "نشط"
339
340-#: src/qml/LiveCallPage/LiveCall.qml:409
341+#: src/qml/LiveCallPage/LiveCall.qml:244
342 #: src/qml/LiveCallPage/MultiCallDisplay.qml:134
343 msgid "calling"
344 msgstr ""
345
346+#: src/qml/LiveCallPage/ConferenceCallDisplay.qml:128
347 #: src/qml/LiveCallPage/MultiCallDisplay.qml:136
348-#: src/qml/LiveCallPage/ConferenceCallDisplay.qml:128
349 msgid "on hold"
350 msgstr "في الانتظار"
351+
352+#~ msgid "Add Contact"
353+#~ msgstr "إضافة شخص"
354+
355+#~ msgid "Add to existing contact"
356+#~ msgstr "أضف إلى شخص موجود"
357+
358+#~ msgid "Call log"
359+#~ msgstr "سجل المكالمات"
360+
361+#~ msgid "Cancel"
362+#~ msgstr "إلغاء"
363+
364+#~ msgid "Create new contact"
365+#~ msgstr "أنشئ شخصا جديدا"
366+
367+#~ msgid "How do you want to save the contact?"
368+#~ msgstr "كيف ترغب بحفظ الشخص؟"
369+
370+#~ msgid "Save contact"
371+#~ msgstr "حفظ الشخص"
372+
373+#~ msgid "Unknown"
374+#~ msgstr "مجهول"
375+
376+#~ msgid "View contact"
377+#~ msgstr "عرض الشخص"
378
379=== modified file 'po/ast.po'
380--- po/ast.po 2014-07-06 06:04:03 +0000
381+++ po/ast.po 2014-07-12 12:27:17 +0000
382@@ -6,11 +6,12 @@
383 msgid ""
384 msgstr ""
385 "Project-Id-Version: dialer-app\n"
386-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
387-"POT-Creation-Date: 2014-05-09 15:20-0300\n"
388+"Report-Msgid-Bugs-To: \n"
389+"POT-Creation-Date: 2014-07-12 09:22-0300\n"
390 "PO-Revision-Date: 2014-07-05 16:31+0000\n"
391 "Last-Translator: ivarela <ivarela@ubuntu.com>\n"
392 "Language-Team: Asturian <ast@li.org>\n"
393+"Language: ast\n"
394 "MIME-Version: 1.0\n"
395 "Content-Type: text/plain; charset=UTF-8\n"
396 "Content-Transfer-Encoding: 8bit\n"
397@@ -95,14 +96,6 @@
398 msgid "ABC"
399 msgstr "ABC"
400
401-#: src/qml/HistoryPage/CallLogContactDelegate.qml:73
402-msgid "Add Contact"
403-msgstr "Amestar contautu"
404-
405-#: src/qml/HistoryPage/CallLogContactDelegate.qml:42
406-msgid "Add to existing contact"
407-msgstr "Amestar a contautu esistente"
408-
409 #: src/qml/dialer-app.qml:309
410 msgid "Call Barring"
411 msgstr "Restricción de llamaes"
412@@ -115,14 +108,6 @@
413 msgid "Call Waiting"
414 msgstr "Llamada n'espera"
415
416-#: src/qml/MainPage.qml:56
417-msgid "Call log"
418-msgstr "Llista de llamaes"
419-
420-#: src/qml/HistoryPage/CallLogContactDelegate.qml:107
421-msgid "Call now"
422-msgstr "Llamar agora"
423-
424 #: src/qml/dialer-app.qml:342
425 msgid "Calling Line Presentation"
426 msgstr "Amosar llinia de llamada"
427@@ -131,10 +116,6 @@
428 msgid "Calling Line Restriction"
429 msgstr "Restrinxir llinia de llamada"
430
431-#: src/qml/HistoryPage/CallLogContactDelegate.qml:60
432-msgid "Cancel"
433-msgstr "Encaboxar"
434-
435 #: src/qml/LiveCallPage/MultiCallDisplay.qml:114
436 msgid "Conference"
437 msgstr "Conferencia"
438@@ -147,23 +128,23 @@
439 msgid "Connected Line Restriction"
440 msgstr "Restricción de llinia coneutada"
441
442+#: src/qml/DialerPage/DialerPage.qml:41
443 #: src/qml/ContactsPage/ContactsPage.qml:29
444-#: src/qml/DialerPage/DialerPage.qml:41
445 msgid "Contacts"
446 msgstr "Contautos"
447
448-#: src/qml/HistoryPage/CallLogContactDelegate.qml:51
449-msgid "Create new contact"
450-msgstr "Crear un contautu nuevu"
451-
452 #: src/qml/DialerPage/Keypad.qml:67
453 msgid "DEF"
454 msgstr "DEF"
455
456-#: src/qml/HistoryPage/HistoryPage.qml:69
457+#: src/qml/HistoryPage/HistoryPage.qml:256
458 msgid "Delete"
459 msgstr "Desaniciar"
460
461+#: src/qml/HistoryPage/HistoryPage.qml:263
462+msgid "Details"
463+msgstr ""
464+
465 #: src/dialer-app.desktop.in:3
466 msgid "Dialer"
467 msgstr "Marcador"
468@@ -180,7 +161,7 @@
469 msgid "Dismiss"
470 msgstr "Inorar"
471
472-#: src/qml/DialerPage/DialerPage.qml:132
473+#: src/qml/DialerPage/DialerPage.qml:146
474 msgid "Enter a number"
475 msgstr "Escribi un númberu"
476
477@@ -196,9 +177,9 @@
478 msgid "Hangup"
479 msgstr "Colgar"
480
481-#: src/qml/HistoryPage/CallLogContactDelegate.qml:39
482-msgid "How do you want to save the contact?"
483-msgstr "¿Cómo quies guardar el contautu?"
484+#: src/qml/HistoryPage/HistoryDelegate.qml:55
485+msgid "Incoming"
486+msgstr ""
487
488 #: src/qml/dialer-app.qml:237
489 msgid "Invalid USSD code"
490@@ -220,10 +201,19 @@
491 msgid "Merge calls"
492 msgstr "Combinar llamaes"
493
494-#: src/qml/LiveCallPage/LiveCall.qml:75
495-msgid "New call"
496+#: src/qml/HistoryPage/HistoryDelegate.qml:53
497+msgid "Missed"
498+msgstr ""
499+
500+#: src/qml/LiveCallPage/LiveCall.qml:62
501+#, fuzzy
502+msgid "New Call"
503 msgstr "Llamada nueva"
504
505+#: src/qml/HistoryPage/HistoryDelegate.qml:57
506+msgid "Outgoing"
507+msgstr ""
508+
509 #: src/qml/DialerPage/Keypad.qml:107
510 msgid "PQRS"
511 msgstr "PQRS"
512@@ -236,13 +226,17 @@
513 msgid "Private"
514 msgstr "Priváu"
515
516-#: src/qml/HistoryPage/CallLogContactDelegate.qml:38
517-#: src/qml/HistoryPage/CallLogContactDelegate.qml:127
518-msgid "Save contact"
519-msgstr "Guardar contautu"
520-
521-#: src/qml/HistoryPage/CallLogContactDelegate.qml:117
522-msgid "Send text message"
523+#: src/qml/DialerPage/DialerPage.qml:76 src/qml/HistoryPage/HistoryPage.qml:43
524+msgid "Recent"
525+msgstr ""
526+
527+#: src/qml/HistoryPage/HistoryPage.qml:43
528+msgid "Select"
529+msgstr ""
530+
531+#: src/qml/HistoryPage/HistoryPage.qml:274
532+#, fuzzy
533+msgid "Send message"
534 msgstr "Unviar mensaxe de testu"
535
536 #: src/qml/DialerPage/Keypad.qml:117
537@@ -253,17 +247,14 @@
538 msgid "Today"
539 msgstr "Güei"
540
541-#: src/qml/LiveCallPage/LiveCall.qml:47
542-msgid "Two Calls"
543-msgstr "Dos llamaes"
544-
545-#: src/qml/HistoryPage/HistoryDelegate.qml:139
546-msgid "Unknown"
547-msgstr "Desconocíu"
548-
549-#: src/qml/HistoryPage/CallLogContactDelegate.qml:127
550-msgid "View contact"
551-msgstr "Ver contautu"
552+#: src/qml/ContactsPage/ContactsPage.qml:46
553+msgid "Type a name or phone to search"
554+msgstr ""
555+
556+#: src/qml/DialerPage/KeypadEntry.qml:54
557+#: src/qml/HistoryPage/HistoryDelegate.qml:163
558+msgid "US"
559+msgstr ""
560
561 #: src/qml/LiveCallPage/MultiCallDisplay.qml:116
562 msgid "Voicemail"
563@@ -277,8 +268,8 @@
564 msgid "Yesterday"
565 msgstr "Ayeri"
566
567+#: src/qml/LiveCallPage/ConferenceCallDisplay.qml:128
568 #: src/qml/LiveCallPage/MultiCallDisplay.qml:138
569-#: src/qml/LiveCallPage/ConferenceCallDisplay.qml:128
570 msgid "active"
571 msgstr "activa"
572
573@@ -287,7 +278,40 @@
574 msgid "calling"
575 msgstr "llamando"
576
577+#: src/qml/LiveCallPage/ConferenceCallDisplay.qml:128
578 #: src/qml/LiveCallPage/MultiCallDisplay.qml:136
579-#: src/qml/LiveCallPage/ConferenceCallDisplay.qml:128
580 msgid "on hold"
581 msgstr "n'espera"
582+
583+#~ msgid "Add Contact"
584+#~ msgstr "Amestar contautu"
585+
586+#~ msgid "Add to existing contact"
587+#~ msgstr "Amestar a contautu esistente"
588+
589+#~ msgid "Call log"
590+#~ msgstr "Llista de llamaes"
591+
592+#~ msgid "Call now"
593+#~ msgstr "Llamar agora"
594+
595+#~ msgid "Cancel"
596+#~ msgstr "Encaboxar"
597+
598+#~ msgid "Create new contact"
599+#~ msgstr "Crear un contautu nuevu"
600+
601+#~ msgid "How do you want to save the contact?"
602+#~ msgstr "¿Cómo quies guardar el contautu?"
603+
604+#~ msgid "Save contact"
605+#~ msgstr "Guardar contautu"
606+
607+#~ msgid "Two Calls"
608+#~ msgstr "Dos llamaes"
609+
610+#~ msgid "Unknown"
611+#~ msgstr "Desconocíu"
612+
613+#~ msgid "View contact"
614+#~ msgstr "Ver contautu"
615
616=== modified file 'po/az.po'
617--- po/az.po 2014-05-17 07:15:32 +0000
618+++ po/az.po 2014-07-12 12:27:17 +0000
619@@ -6,11 +6,12 @@
620 msgid ""
621 msgstr ""
622 "Project-Id-Version: dialer-app\n"
623-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
624-"POT-Creation-Date: 2014-05-09 15:20-0300\n"
625+"Report-Msgid-Bugs-To: \n"
626+"POT-Creation-Date: 2014-07-12 09:22-0300\n"
627 "PO-Revision-Date: 2014-01-06 19:19+0000\n"
628 "Last-Translator: Emin Mastizada <emin25@ovi.com>\n"
629 "Language-Team: Azerbaijani <az@li.org>\n"
630+"Language: az\n"
631 "MIME-Version: 1.0\n"
632 "Content-Type: text/plain; charset=UTF-8\n"
633 "Content-Transfer-Encoding: 8bit\n"
634@@ -18,7 +19,7 @@
635 "X-Launchpad-Export-Date: 2014-05-17 07:15+0000\n"
636 "X-Generator: Launchpad (build 17007)\n"
637
638-#: src/qml/DialerPage/Keypad.qml:202
639+#: src/qml/DialerPage/Keypad.qml:161
640 msgid "#"
641 msgstr "#"
642
643@@ -43,127 +44,107 @@
644 msgstr[0] ""
645 msgstr[1] ""
646
647-#: src/qml/DialerPage/Keypad.qml:179
648+#: src/qml/DialerPage/Keypad.qml:138
649 msgid "*"
650 msgstr "*"
651
652-#: src/qml/DialerPage/Keypad.qml:189
653+#: src/qml/DialerPage/Keypad.qml:148
654 msgid "+"
655 msgstr "+"
656
657-#: src/qml/DialerPage/Keypad.qml:188
658+#: src/qml/DialerPage/Keypad.qml:147
659 msgid "0"
660 msgstr "0"
661
662-#: src/qml/DialerPage/Keypad.qml:86
663+#: src/qml/DialerPage/Keypad.qml:45
664 msgid "1"
665 msgstr "1"
666
667-#: src/qml/DialerPage/Keypad.qml:97
668+#: src/qml/DialerPage/Keypad.qml:56
669 msgid "2"
670 msgstr "2"
671
672-#: src/qml/DialerPage/Keypad.qml:107
673+#: src/qml/DialerPage/Keypad.qml:66
674 msgid "3"
675 msgstr "3"
676
677-#: src/qml/DialerPage/Keypad.qml:117
678+#: src/qml/DialerPage/Keypad.qml:76
679 msgid "4"
680 msgstr "4"
681
682-#: src/qml/DialerPage/Keypad.qml:127
683+#: src/qml/DialerPage/Keypad.qml:86
684 msgid "5"
685 msgstr "5"
686
687-#: src/qml/DialerPage/Keypad.qml:137
688+#: src/qml/DialerPage/Keypad.qml:96
689 msgid "6"
690 msgstr "6"
691
692-#: src/qml/DialerPage/Keypad.qml:147
693+#: src/qml/DialerPage/Keypad.qml:106
694 msgid "7"
695 msgstr "7"
696
697-#: src/qml/DialerPage/Keypad.qml:157
698+#: src/qml/DialerPage/Keypad.qml:116
699 msgid "8"
700 msgstr "8"
701
702-#: src/qml/DialerPage/Keypad.qml:167
703+#: src/qml/DialerPage/Keypad.qml:126
704 msgid "9"
705 msgstr "9"
706
707-#: src/qml/DialerPage/Keypad.qml:98
708+#: src/qml/DialerPage/Keypad.qml:57
709 msgid "ABC"
710 msgstr "ABCÇ"
711
712-#: src/qml/HistoryPage/CallLogContactDelegate.qml:80
713-msgid "Add Contact"
714-msgstr ""
715-
716-#: src/qml/HistoryPage/CallLogContactDelegate.qml:42
717-msgid "Add to existing contact"
718-msgstr "Mövcud əlaqələrə əlavə et"
719-
720-#: src/qml/dialer-app.qml:207
721+#: src/qml/dialer-app.qml:309
722 msgid "Call Barring"
723 msgstr ""
724
725-#: src/qml/dialer-app.qml:218
726+#: src/qml/dialer-app.qml:320
727 msgid "Call Forwarding"
728 msgstr ""
729
730-#: src/qml/dialer-app.qml:229
731+#: src/qml/dialer-app.qml:331
732 msgid "Call Waiting"
733 msgstr ""
734
735-#: src/qml/MainPage.qml:56
736-msgid "Call log"
737-msgstr "Zəng jurnalı"
738-
739-#: src/qml/HistoryPage/CallLogContactDelegate.qml:114
740-msgid "Call now"
741-msgstr ""
742-
743-#: src/qml/dialer-app.qml:240
744+#: src/qml/dialer-app.qml:342
745 msgid "Calling Line Presentation"
746 msgstr ""
747
748-#: src/qml/dialer-app.qml:252
749+#: src/qml/dialer-app.qml:354
750 msgid "Calling Line Restriction"
751 msgstr ""
752
753-#: src/qml/HistoryPage/CallLogContactDelegate.qml:60
754-msgid "Cancel"
755-msgstr ""
756-
757-#: src/qml/LiveCallPage/LiveCall.qml:49
758 #: src/qml/LiveCallPage/MultiCallDisplay.qml:114
759 msgid "Conference"
760 msgstr ""
761
762-#: src/qml/dialer-app.qml:246
763+#: src/qml/dialer-app.qml:348
764 msgid "Connected Line Presentation"
765 msgstr ""
766
767-#: src/qml/dialer-app.qml:258
768+#: src/qml/dialer-app.qml:360
769 msgid "Connected Line Restriction"
770 msgstr ""
771
772-#: src/qml/MainPage.qml:45
773+#: src/qml/DialerPage/DialerPage.qml:41
774+#: src/qml/ContactsPage/ContactsPage.qml:29
775 msgid "Contacts"
776 msgstr "Əlaqələr"
777
778-#: src/qml/HistoryPage/CallLogContactDelegate.qml:51
779-msgid "Create new contact"
780-msgstr "Yeni əlaqə yarat"
781-
782-#: src/qml/DialerPage/Keypad.qml:108
783+#: src/qml/DialerPage/Keypad.qml:67
784 msgid "DEF"
785 msgstr "DEƏF"
786
787-#: src/qml/HistoryPage/HistoryPage.qml:69
788+#: src/qml/HistoryPage/HistoryPage.qml:256
789 msgid "Delete"
790 msgstr "Sil"
791
792+#: src/qml/HistoryPage/HistoryPage.qml:263
793+msgid "Details"
794+msgstr ""
795+
796 #: src/dialer-app.desktop.in:3
797 msgid "Dialer"
798 msgstr "Yığan"
799@@ -176,19 +157,19 @@
800 msgid "Dialer application"
801 msgstr "Dialer tətbiq"
802
803-#: src/qml/dialer-app.qml:143 src/qml/dialer-app.qml:157
804+#: src/qml/dialer-app.qml:239 src/qml/dialer-app.qml:253
805 msgid "Dismiss"
806 msgstr ""
807
808-#: src/qml/DialerPage/DialerPage.qml:79
809+#: src/qml/DialerPage/DialerPage.qml:146
810 msgid "Enter a number"
811 msgstr "Nömrəni daxil et"
812
813-#: src/qml/dialer-app.qml:140
814+#: src/qml/dialer-app.qml:236
815 msgid "Error"
816 msgstr ""
817
818-#: src/qml/DialerPage/Keypad.qml:118
819+#: src/qml/DialerPage/Keypad.qml:77
820 msgid "GHI"
821 msgstr "GĞHX"
822
823@@ -196,23 +177,23 @@
824 msgid "Hangup"
825 msgstr ""
826
827-#: src/qml/HistoryPage/CallLogContactDelegate.qml:39
828-msgid "How do you want to save the contact?"
829+#: src/qml/HistoryPage/HistoryDelegate.qml:55
830+msgid "Incoming"
831 msgstr ""
832
833-#: src/qml/dialer-app.qml:141
834+#: src/qml/dialer-app.qml:237
835 msgid "Invalid USSD code"
836 msgstr ""
837
838-#: src/qml/DialerPage/Keypad.qml:128
839+#: src/qml/DialerPage/Keypad.qml:87
840 msgid "JKL"
841 msgstr "JKL"
842
843-#: src/qml/MainPage.qml:35
844+#: src/qml/DialerPage/DialerPage.qml:52
845 msgid "Keypad"
846 msgstr "Klaviatura"
847
848-#: src/qml/DialerPage/Keypad.qml:138
849+#: src/qml/DialerPage/Keypad.qml:97
850 msgid "MNO"
851 msgstr "MNOÖ"
852
853@@ -220,15 +201,23 @@
854 msgid "Merge calls"
855 msgstr ""
856
857-#: src/qml/LiveCallPage/LiveCall.qml:75
858-msgid "New call"
859-msgstr ""
860-
861-#: src/qml/DialerPage/Keypad.qml:148
862+#: src/qml/HistoryPage/HistoryDelegate.qml:53
863+msgid "Missed"
864+msgstr ""
865+
866+#: src/qml/LiveCallPage/LiveCall.qml:62
867+msgid "New Call"
868+msgstr ""
869+
870+#: src/qml/HistoryPage/HistoryDelegate.qml:57
871+msgid "Outgoing"
872+msgstr ""
873+
874+#: src/qml/DialerPage/Keypad.qml:107
875 msgid "PQRS"
876 msgstr "PQRSŞ"
877
878-#: src/qml/dialer-app.qml:121
879+#: src/qml/dialer-app.qml:217
880 msgid "Please wait"
881 msgstr ""
882
883@@ -236,16 +225,19 @@
884 msgid "Private"
885 msgstr ""
886
887-#: src/qml/HistoryPage/CallLogContactDelegate.qml:38
888-#: src/qml/HistoryPage/CallLogContactDelegate.qml:134
889-msgid "Save contact"
890-msgstr ""
891-
892-#: src/qml/HistoryPage/CallLogContactDelegate.qml:124
893-msgid "Send text message"
894-msgstr ""
895-
896-#: src/qml/DialerPage/Keypad.qml:158
897+#: src/qml/DialerPage/DialerPage.qml:76 src/qml/HistoryPage/HistoryPage.qml:43
898+msgid "Recent"
899+msgstr ""
900+
901+#: src/qml/HistoryPage/HistoryPage.qml:43
902+msgid "Select"
903+msgstr ""
904+
905+#: src/qml/HistoryPage/HistoryPage.qml:274
906+msgid "Send message"
907+msgstr ""
908+
909+#: src/qml/DialerPage/Keypad.qml:117
910 msgid "TUV"
911 msgstr "TUÜ"
912
913@@ -253,23 +245,20 @@
914 msgid "Today"
915 msgstr "Bu gün"
916
917-#: src/qml/LiveCallPage/LiveCall.qml:47
918-msgid "Two Calls"
919+#: src/qml/ContactsPage/ContactsPage.qml:46
920+msgid "Type a name or phone to search"
921 msgstr ""
922
923-#: src/qml/HistoryPage/HistoryDelegate.qml:139
924-msgid "Unknown"
925-msgstr "Naməlum"
926-
927-#: src/qml/HistoryPage/CallLogContactDelegate.qml:134
928-msgid "View contact"
929+#: src/qml/DialerPage/KeypadEntry.qml:54
930+#: src/qml/HistoryPage/HistoryDelegate.qml:163
931+msgid "US"
932 msgstr ""
933
934 #: src/qml/LiveCallPage/MultiCallDisplay.qml:116
935 msgid "Voicemail"
936 msgstr "Səsli Poçt"
937
938-#: src/qml/DialerPage/Keypad.qml:168
939+#: src/qml/DialerPage/Keypad.qml:127
940 msgid "WXYZ"
941 msgstr "VXYZ"
942
943@@ -277,17 +266,29 @@
944 msgid "Yesterday"
945 msgstr "Dünən"
946
947+#: src/qml/LiveCallPage/ConferenceCallDisplay.qml:128
948 #: src/qml/LiveCallPage/MultiCallDisplay.qml:138
949-#: src/qml/LiveCallPage/ConferenceCallDisplay.qml:128
950 msgid "active"
951 msgstr ""
952
953-#: src/qml/LiveCallPage/LiveCall.qml:409
954+#: src/qml/LiveCallPage/LiveCall.qml:244
955 #: src/qml/LiveCallPage/MultiCallDisplay.qml:134
956 msgid "calling"
957 msgstr "çağırır"
958
959+#: src/qml/LiveCallPage/ConferenceCallDisplay.qml:128
960 #: src/qml/LiveCallPage/MultiCallDisplay.qml:136
961-#: src/qml/LiveCallPage/ConferenceCallDisplay.qml:128
962 msgid "on hold"
963 msgstr ""
964+
965+#~ msgid "Add to existing contact"
966+#~ msgstr "Mövcud əlaqələrə əlavə et"
967+
968+#~ msgid "Call log"
969+#~ msgstr "Zəng jurnalı"
970+
971+#~ msgid "Create new contact"
972+#~ msgstr "Yeni əlaqə yarat"
973+
974+#~ msgid "Unknown"
975+#~ msgstr "Naməlum"
976
977=== modified file 'po/br.po'
978--- po/br.po 2014-05-29 05:49:36 +0000
979+++ po/br.po 2014-07-12 12:27:17 +0000
980@@ -6,11 +6,12 @@
981 msgid ""
982 msgstr ""
983 "Project-Id-Version: dialer-app\n"
984-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
985-"POT-Creation-Date: 2014-05-09 15:20-0300\n"
986+"Report-Msgid-Bugs-To: \n"
987+"POT-Creation-Date: 2014-07-12 09:22-0300\n"
988 "PO-Revision-Date: 2014-05-28 06:55+0000\n"
989 "Last-Translator: Fohanno Thierry <thierry.fohanno@ofis-bzh.org>\n"
990 "Language-Team: Breton <br@li.org>\n"
991+"Language: br\n"
992 "MIME-Version: 1.0\n"
993 "Content-Type: text/plain; charset=UTF-8\n"
994 "Content-Transfer-Encoding: 8bit\n"
995@@ -18,7 +19,7 @@
996 "X-Launchpad-Export-Date: 2014-05-29 05:49+0000\n"
997 "X-Generator: Launchpad (build 17017)\n"
998
999-#: src/qml/DialerPage/Keypad.qml:202
1000+#: src/qml/DialerPage/Keypad.qml:161
1001 msgid "#"
1002 msgstr "Niv."
1003
1004@@ -43,127 +44,107 @@
1005 msgstr[0] "%1 eil"
1006 msgstr[1] "%1 eil"
1007
1008-#: src/qml/DialerPage/Keypad.qml:179
1009+#: src/qml/DialerPage/Keypad.qml:138
1010 msgid "*"
1011 msgstr "*"
1012
1013-#: src/qml/DialerPage/Keypad.qml:189
1014+#: src/qml/DialerPage/Keypad.qml:148
1015 msgid "+"
1016 msgstr "+"
1017
1018-#: src/qml/DialerPage/Keypad.qml:188
1019+#: src/qml/DialerPage/Keypad.qml:147
1020 msgid "0"
1021 msgstr "0"
1022
1023-#: src/qml/DialerPage/Keypad.qml:86
1024+#: src/qml/DialerPage/Keypad.qml:45
1025 msgid "1"
1026 msgstr "1"
1027
1028-#: src/qml/DialerPage/Keypad.qml:97
1029+#: src/qml/DialerPage/Keypad.qml:56
1030 msgid "2"
1031 msgstr "2"
1032
1033-#: src/qml/DialerPage/Keypad.qml:107
1034+#: src/qml/DialerPage/Keypad.qml:66
1035 msgid "3"
1036 msgstr "3"
1037
1038-#: src/qml/DialerPage/Keypad.qml:117
1039+#: src/qml/DialerPage/Keypad.qml:76
1040 msgid "4"
1041 msgstr "4"
1042
1043-#: src/qml/DialerPage/Keypad.qml:127
1044+#: src/qml/DialerPage/Keypad.qml:86
1045 msgid "5"
1046 msgstr "5"
1047
1048-#: src/qml/DialerPage/Keypad.qml:137
1049+#: src/qml/DialerPage/Keypad.qml:96
1050 msgid "6"
1051 msgstr "6"
1052
1053-#: src/qml/DialerPage/Keypad.qml:147
1054+#: src/qml/DialerPage/Keypad.qml:106
1055 msgid "7"
1056 msgstr "7"
1057
1058-#: src/qml/DialerPage/Keypad.qml:157
1059+#: src/qml/DialerPage/Keypad.qml:116
1060 msgid "8"
1061 msgstr "8"
1062
1063-#: src/qml/DialerPage/Keypad.qml:167
1064+#: src/qml/DialerPage/Keypad.qml:126
1065 msgid "9"
1066 msgstr "9"
1067
1068-#: src/qml/DialerPage/Keypad.qml:98
1069+#: src/qml/DialerPage/Keypad.qml:57
1070 msgid "ABC"
1071 msgstr "ABC"
1072
1073-#: src/qml/HistoryPage/CallLogContactDelegate.qml:80
1074-msgid "Add Contact"
1075-msgstr "Ouzhpennañ un darempred"
1076-
1077-#: src/qml/HistoryPage/CallLogContactDelegate.qml:42
1078-msgid "Add to existing contact"
1079-msgstr "Ouzhpennañ d'un darempred a zo anezhañ dija"
1080-
1081-#: src/qml/dialer-app.qml:207
1082+#: src/qml/dialer-app.qml:309
1083 msgid "Call Barring"
1084 msgstr "Herzel ar pellgomzadennoù"
1085
1086-#: src/qml/dialer-app.qml:218
1087+#: src/qml/dialer-app.qml:320
1088 msgid "Call Forwarding"
1089 msgstr "Adkas ur bellgomzadenn"
1090
1091-#: src/qml/dialer-app.qml:229
1092+#: src/qml/dialer-app.qml:331
1093 msgid "Call Waiting"
1094 msgstr "Pellgomzadenn en gortoz"
1095
1096-#: src/qml/MainPage.qml:56
1097-msgid "Call log"
1098-msgstr "Marilh ar pellgomzadennoù"
1099-
1100-#: src/qml/HistoryPage/CallLogContactDelegate.qml:114
1101-msgid "Call now"
1102-msgstr "Pellgomz bremañ"
1103-
1104-#: src/qml/dialer-app.qml:240
1105+#: src/qml/dialer-app.qml:342
1106 msgid "Calling Line Presentation"
1107 msgstr "Kinnig ar re a bellgomz"
1108
1109-#: src/qml/dialer-app.qml:252
1110+#: src/qml/dialer-app.qml:354
1111 msgid "Calling Line Restriction"
1112 msgstr "Strishaat ar re a bellgomz"
1113
1114-#: src/qml/HistoryPage/CallLogContactDelegate.qml:60
1115-msgid "Cancel"
1116-msgstr "Nullañ"
1117-
1118-#: src/qml/LiveCallPage/LiveCall.qml:49
1119 #: src/qml/LiveCallPage/MultiCallDisplay.qml:114
1120 msgid "Conference"
1121 msgstr "Kendiviz"
1122
1123-#: src/qml/dialer-app.qml:246
1124+#: src/qml/dialer-app.qml:348
1125 msgid "Connected Line Presentation"
1126 msgstr "Kinnig ar re a zo o pellgomz"
1127
1128-#: src/qml/dialer-app.qml:258
1129+#: src/qml/dialer-app.qml:360
1130 msgid "Connected Line Restriction"
1131 msgstr "Strishaat ar re a zo o pellgomz"
1132
1133-#: src/qml/MainPage.qml:45
1134+#: src/qml/DialerPage/DialerPage.qml:41
1135+#: src/qml/ContactsPage/ContactsPage.qml:29
1136 msgid "Contacts"
1137 msgstr "Darempredoù"
1138
1139-#: src/qml/HistoryPage/CallLogContactDelegate.qml:51
1140-msgid "Create new contact"
1141-msgstr "Krouiñ un darempred nevez"
1142-
1143-#: src/qml/DialerPage/Keypad.qml:108
1144+#: src/qml/DialerPage/Keypad.qml:67
1145 msgid "DEF"
1146 msgstr "DEF"
1147
1148-#: src/qml/HistoryPage/HistoryPage.qml:69
1149+#: src/qml/HistoryPage/HistoryPage.qml:256
1150 msgid "Delete"
1151 msgstr "Diverkañ"
1152
1153+#: src/qml/HistoryPage/HistoryPage.qml:263
1154+msgid "Details"
1155+msgstr ""
1156+
1157 #: src/dialer-app.desktop.in:3
1158 msgid "Dialer"
1159 msgstr "Niverenner"
1160@@ -176,19 +157,19 @@
1161 msgid "Dialer application"
1162 msgstr "Arload niverenniñ"
1163
1164-#: src/qml/dialer-app.qml:143 src/qml/dialer-app.qml:157
1165+#: src/qml/dialer-app.qml:239 src/qml/dialer-app.qml:253
1166 msgid "Dismiss"
1167 msgstr "Disteurel"
1168
1169-#: src/qml/DialerPage/DialerPage.qml:79
1170+#: src/qml/DialerPage/DialerPage.qml:146
1171 msgid "Enter a number"
1172 msgstr "Lakait un niverenn"
1173
1174-#: src/qml/dialer-app.qml:140
1175+#: src/qml/dialer-app.qml:236
1176 msgid "Error"
1177 msgstr "Fazi"
1178
1179-#: src/qml/DialerPage/Keypad.qml:118
1180+#: src/qml/DialerPage/Keypad.qml:77
1181 msgid "GHI"
1182 msgstr "GHI"
1183
1184@@ -196,23 +177,23 @@
1185 msgid "Hangup"
1186 msgstr "Advarc'hañ"
1187
1188-#: src/qml/HistoryPage/CallLogContactDelegate.qml:39
1189-msgid "How do you want to save the contact?"
1190-msgstr "Penaos e fell deoc'h enrollañ an darempred ?"
1191+#: src/qml/HistoryPage/HistoryDelegate.qml:55
1192+msgid "Incoming"
1193+msgstr ""
1194
1195-#: src/qml/dialer-app.qml:141
1196+#: src/qml/dialer-app.qml:237
1197 msgid "Invalid USSD code"
1198 msgstr "Kod USSD direizh"
1199
1200-#: src/qml/DialerPage/Keypad.qml:128
1201+#: src/qml/DialerPage/Keypad.qml:87
1202 msgid "JKL"
1203 msgstr "JKL"
1204
1205-#: src/qml/MainPage.qml:35
1206+#: src/qml/DialerPage/DialerPage.qml:52
1207 msgid "Keypad"
1208 msgstr "Klavier niverenniñ"
1209
1210-#: src/qml/DialerPage/Keypad.qml:138
1211+#: src/qml/DialerPage/Keypad.qml:97
1212 msgid "MNO"
1213 msgstr "MNO"
1214
1215@@ -220,15 +201,24 @@
1216 msgid "Merge calls"
1217 msgstr "Meskañ pellgomzadennoù"
1218
1219-#: src/qml/LiveCallPage/LiveCall.qml:75
1220-msgid "New call"
1221+#: src/qml/HistoryPage/HistoryDelegate.qml:53
1222+msgid "Missed"
1223+msgstr ""
1224+
1225+#: src/qml/LiveCallPage/LiveCall.qml:62
1226+#, fuzzy
1227+msgid "New Call"
1228 msgstr "Pellgomzadenn nevez"
1229
1230-#: src/qml/DialerPage/Keypad.qml:148
1231+#: src/qml/HistoryPage/HistoryDelegate.qml:57
1232+msgid "Outgoing"
1233+msgstr ""
1234+
1235+#: src/qml/DialerPage/Keypad.qml:107
1236 msgid "PQRS"
1237 msgstr "PQRS"
1238
1239-#: src/qml/dialer-app.qml:121
1240+#: src/qml/dialer-app.qml:217
1241 msgid "Please wait"
1242 msgstr "Gortozit, mar plij"
1243
1244@@ -236,16 +226,20 @@
1245 msgid "Private"
1246 msgstr "Prevez"
1247
1248-#: src/qml/HistoryPage/CallLogContactDelegate.qml:38
1249-#: src/qml/HistoryPage/CallLogContactDelegate.qml:134
1250-msgid "Save contact"
1251-msgstr "Enrollañ an darempred"
1252-
1253-#: src/qml/HistoryPage/CallLogContactDelegate.qml:124
1254-msgid "Send text message"
1255+#: src/qml/DialerPage/DialerPage.qml:76 src/qml/HistoryPage/HistoryPage.qml:43
1256+msgid "Recent"
1257+msgstr ""
1258+
1259+#: src/qml/HistoryPage/HistoryPage.qml:43
1260+msgid "Select"
1261+msgstr ""
1262+
1263+#: src/qml/HistoryPage/HistoryPage.qml:274
1264+#, fuzzy
1265+msgid "Send message"
1266 msgstr "Kas ur gemenadenn testenn"
1267
1268-#: src/qml/DialerPage/Keypad.qml:158
1269+#: src/qml/DialerPage/Keypad.qml:117
1270 msgid "TUV"
1271 msgstr "TUV"
1272
1273@@ -253,23 +247,20 @@
1274 msgid "Today"
1275 msgstr "Hiziv"
1276
1277-#: src/qml/LiveCallPage/LiveCall.qml:47
1278-msgid "Two Calls"
1279-msgstr "Div bellgomzadenn"
1280-
1281-#: src/qml/HistoryPage/HistoryDelegate.qml:139
1282-msgid "Unknown"
1283-msgstr "Dianav"
1284-
1285-#: src/qml/HistoryPage/CallLogContactDelegate.qml:134
1286-msgid "View contact"
1287-msgstr "Gwelet an darempred"
1288+#: src/qml/ContactsPage/ContactsPage.qml:46
1289+msgid "Type a name or phone to search"
1290+msgstr ""
1291+
1292+#: src/qml/DialerPage/KeypadEntry.qml:54
1293+#: src/qml/HistoryPage/HistoryDelegate.qml:163
1294+msgid "US"
1295+msgstr ""
1296
1297 #: src/qml/LiveCallPage/MultiCallDisplay.qml:116
1298 msgid "Voicemail"
1299 msgstr "Boest komz"
1300
1301-#: src/qml/DialerPage/Keypad.qml:168
1302+#: src/qml/DialerPage/Keypad.qml:127
1303 msgid "WXYZ"
1304 msgstr "WXYZ"
1305
1306@@ -277,17 +268,50 @@
1307 msgid "Yesterday"
1308 msgstr "Dec'h"
1309
1310+#: src/qml/LiveCallPage/ConferenceCallDisplay.qml:128
1311 #: src/qml/LiveCallPage/MultiCallDisplay.qml:138
1312-#: src/qml/LiveCallPage/ConferenceCallDisplay.qml:128
1313 msgid "active"
1314 msgstr "oberiat"
1315
1316-#: src/qml/LiveCallPage/LiveCall.qml:409
1317+#: src/qml/LiveCallPage/LiveCall.qml:244
1318 #: src/qml/LiveCallPage/MultiCallDisplay.qml:134
1319 msgid "calling"
1320 msgstr "o pellgomz"
1321
1322+#: src/qml/LiveCallPage/ConferenceCallDisplay.qml:128
1323 #: src/qml/LiveCallPage/MultiCallDisplay.qml:136
1324-#: src/qml/LiveCallPage/ConferenceCallDisplay.qml:128
1325 msgid "on hold"
1326 msgstr "en gortoz"
1327+
1328+#~ msgid "Add Contact"
1329+#~ msgstr "Ouzhpennañ un darempred"
1330+
1331+#~ msgid "Add to existing contact"
1332+#~ msgstr "Ouzhpennañ d'un darempred a zo anezhañ dija"
1333+
1334+#~ msgid "Call log"
1335+#~ msgstr "Marilh ar pellgomzadennoù"
1336+
1337+#~ msgid "Call now"
1338+#~ msgstr "Pellgomz bremañ"
1339+
1340+#~ msgid "Cancel"
1341+#~ msgstr "Nullañ"
1342+
1343+#~ msgid "Create new contact"
1344+#~ msgstr "Krouiñ un darempred nevez"
1345+
1346+#~ msgid "How do you want to save the contact?"
1347+#~ msgstr "Penaos e fell deoc'h enrollañ an darempred ?"
1348+
1349+#~ msgid "Save contact"
1350+#~ msgstr "Enrollañ an darempred"
1351+
1352+#~ msgid "Two Calls"
1353+#~ msgstr "Div bellgomzadenn"
1354+
1355+#~ msgid "Unknown"
1356+#~ msgstr "Dianav"
1357+
1358+#~ msgid "View contact"
1359+#~ msgstr "Gwelet an darempred"
1360
1361=== modified file 'po/ca.po'
1362--- po/ca.po 2014-07-09 06:37:39 +0000
1363+++ po/ca.po 2014-07-12 12:27:17 +0000
1364@@ -6,11 +6,12 @@
1365 msgid ""
1366 msgstr ""
1367 "Project-Id-Version: dialer-app\n"
1368-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
1369-"POT-Creation-Date: 2014-05-09 15:20-0300\n"
1370+"Report-Msgid-Bugs-To: \n"
1371+"POT-Creation-Date: 2014-07-12 09:22-0300\n"
1372 "PO-Revision-Date: 2014-07-08 19:20+0000\n"
1373 "Last-Translator: David Planella <david.planella@ubuntu.com>\n"
1374 "Language-Team: Catalan <ca@li.org>\n"
1375+"Language: ca\n"
1376 "MIME-Version: 1.0\n"
1377 "Content-Type: text/plain; charset=UTF-8\n"
1378 "Content-Transfer-Encoding: 8bit\n"
1379@@ -95,14 +96,6 @@
1380 msgid "ABC"
1381 msgstr "ABC"
1382
1383-#: src/qml/HistoryPage/CallLogContactDelegate.qml:73
1384-msgid "Add Contact"
1385-msgstr "Afegeix un contacte"
1386-
1387-#: src/qml/HistoryPage/CallLogContactDelegate.qml:42
1388-msgid "Add to existing contact"
1389-msgstr "Afegeix a un contacte existent"
1390-
1391 #: src/qml/dialer-app.qml:309
1392 msgid "Call Barring"
1393 msgstr ""
1394@@ -115,14 +108,6 @@
1395 msgid "Call Waiting"
1396 msgstr ""
1397
1398-#: src/qml/MainPage.qml:56
1399-msgid "Call log"
1400-msgstr "Registre de trucades"
1401-
1402-#: src/qml/HistoryPage/CallLogContactDelegate.qml:107
1403-msgid "Call now"
1404-msgstr "Truca-hi ara"
1405-
1406 #: src/qml/dialer-app.qml:342
1407 msgid "Calling Line Presentation"
1408 msgstr ""
1409@@ -131,10 +116,6 @@
1410 msgid "Calling Line Restriction"
1411 msgstr ""
1412
1413-#: src/qml/HistoryPage/CallLogContactDelegate.qml:60
1414-msgid "Cancel"
1415-msgstr "Canceŀla"
1416-
1417 #: src/qml/LiveCallPage/MultiCallDisplay.qml:114
1418 msgid "Conference"
1419 msgstr "Conferència"
1420@@ -147,23 +128,23 @@
1421 msgid "Connected Line Restriction"
1422 msgstr ""
1423
1424+#: src/qml/DialerPage/DialerPage.qml:41
1425 #: src/qml/ContactsPage/ContactsPage.qml:29
1426-#: src/qml/DialerPage/DialerPage.qml:41
1427 msgid "Contacts"
1428 msgstr "Contactes"
1429
1430-#: src/qml/HistoryPage/CallLogContactDelegate.qml:51
1431-msgid "Create new contact"
1432-msgstr "Crea un contacte nou"
1433-
1434 #: src/qml/DialerPage/Keypad.qml:67
1435 msgid "DEF"
1436 msgstr "DEF"
1437
1438-#: src/qml/HistoryPage/HistoryPage.qml:69
1439+#: src/qml/HistoryPage/HistoryPage.qml:256
1440 msgid "Delete"
1441 msgstr "Suprimeix"
1442
1443+#: src/qml/HistoryPage/HistoryPage.qml:263
1444+msgid "Details"
1445+msgstr ""
1446+
1447 #: src/dialer-app.desktop.in:3
1448 msgid "Dialer"
1449 msgstr "Marcador"
1450@@ -180,7 +161,7 @@
1451 msgid "Dismiss"
1452 msgstr "Descarta"
1453
1454-#: src/qml/DialerPage/DialerPage.qml:132
1455+#: src/qml/DialerPage/DialerPage.qml:146
1456 msgid "Enter a number"
1457 msgstr "Introduïu un número"
1458
1459@@ -196,9 +177,9 @@
1460 msgid "Hangup"
1461 msgstr "Penja"
1462
1463-#: src/qml/HistoryPage/CallLogContactDelegate.qml:39
1464-msgid "How do you want to save the contact?"
1465-msgstr "Com voleu desar el contacte?"
1466+#: src/qml/HistoryPage/HistoryDelegate.qml:55
1467+msgid "Incoming"
1468+msgstr ""
1469
1470 #: src/qml/dialer-app.qml:237
1471 msgid "Invalid USSD code"
1472@@ -220,10 +201,19 @@
1473 msgid "Merge calls"
1474 msgstr "Combina les trucades"
1475
1476-#: src/qml/LiveCallPage/LiveCall.qml:75
1477-msgid "New call"
1478+#: src/qml/HistoryPage/HistoryDelegate.qml:53
1479+msgid "Missed"
1480+msgstr ""
1481+
1482+#: src/qml/LiveCallPage/LiveCall.qml:62
1483+#, fuzzy
1484+msgid "New Call"
1485 msgstr "Trucada nova"
1486
1487+#: src/qml/HistoryPage/HistoryDelegate.qml:57
1488+msgid "Outgoing"
1489+msgstr ""
1490+
1491 #: src/qml/DialerPage/Keypad.qml:107
1492 msgid "PQRS"
1493 msgstr "PQRS"
1494@@ -236,13 +226,17 @@
1495 msgid "Private"
1496 msgstr "Privat"
1497
1498-#: src/qml/HistoryPage/CallLogContactDelegate.qml:38
1499-#: src/qml/HistoryPage/CallLogContactDelegate.qml:127
1500-msgid "Save contact"
1501-msgstr "Desa el contacte"
1502-
1503-#: src/qml/HistoryPage/CallLogContactDelegate.qml:117
1504-msgid "Send text message"
1505+#: src/qml/DialerPage/DialerPage.qml:76 src/qml/HistoryPage/HistoryPage.qml:43
1506+msgid "Recent"
1507+msgstr ""
1508+
1509+#: src/qml/HistoryPage/HistoryPage.qml:43
1510+msgid "Select"
1511+msgstr ""
1512+
1513+#: src/qml/HistoryPage/HistoryPage.qml:274
1514+#, fuzzy
1515+msgid "Send message"
1516 msgstr "Envia un missatge de text"
1517
1518 #: src/qml/DialerPage/Keypad.qml:117
1519@@ -253,17 +247,14 @@
1520 msgid "Today"
1521 msgstr "Avui"
1522
1523-#: src/qml/LiveCallPage/LiveCall.qml:47
1524-msgid "Two Calls"
1525-msgstr "Dues trucades"
1526-
1527-#: src/qml/HistoryPage/HistoryDelegate.qml:139
1528-msgid "Unknown"
1529-msgstr "Desconegut"
1530-
1531-#: src/qml/HistoryPage/CallLogContactDelegate.qml:127
1532-msgid "View contact"
1533-msgstr "Mostra el contacte"
1534+#: src/qml/ContactsPage/ContactsPage.qml:46
1535+msgid "Type a name or phone to search"
1536+msgstr ""
1537+
1538+#: src/qml/DialerPage/KeypadEntry.qml:54
1539+#: src/qml/HistoryPage/HistoryDelegate.qml:163
1540+msgid "US"
1541+msgstr ""
1542
1543 #: src/qml/LiveCallPage/MultiCallDisplay.qml:116
1544 msgid "Voicemail"
1545@@ -277,8 +268,8 @@
1546 msgid "Yesterday"
1547 msgstr "Ahir"
1548
1549+#: src/qml/LiveCallPage/ConferenceCallDisplay.qml:128
1550 #: src/qml/LiveCallPage/MultiCallDisplay.qml:138
1551-#: src/qml/LiveCallPage/ConferenceCallDisplay.qml:128
1552 msgid "active"
1553 msgstr "activa"
1554
1555@@ -287,7 +278,40 @@
1556 msgid "calling"
1557 msgstr "s'està trucant"
1558
1559+#: src/qml/LiveCallPage/ConferenceCallDisplay.qml:128
1560 #: src/qml/LiveCallPage/MultiCallDisplay.qml:136
1561-#: src/qml/LiveCallPage/ConferenceCallDisplay.qml:128
1562 msgid "on hold"
1563 msgstr "en espera"
1564+
1565+#~ msgid "Add Contact"
1566+#~ msgstr "Afegeix un contacte"
1567+
1568+#~ msgid "Add to existing contact"
1569+#~ msgstr "Afegeix a un contacte existent"
1570+
1571+#~ msgid "Call log"
1572+#~ msgstr "Registre de trucades"
1573+
1574+#~ msgid "Call now"
1575+#~ msgstr "Truca-hi ara"
1576+
1577+#~ msgid "Cancel"
1578+#~ msgstr "Canceŀla"
1579+
1580+#~ msgid "Create new contact"
1581+#~ msgstr "Crea un contacte nou"
1582+
1583+#~ msgid "How do you want to save the contact?"
1584+#~ msgstr "Com voleu desar el contacte?"
1585+
1586+#~ msgid "Save contact"
1587+#~ msgstr "Desa el contacte"
1588+
1589+#~ msgid "Two Calls"
1590+#~ msgstr "Dues trucades"
1591+
1592+#~ msgid "Unknown"
1593+#~ msgstr "Desconegut"
1594+
1595+#~ msgid "View contact"
1596+#~ msgstr "Mostra el contacte"
1597
1598=== modified file 'po/cs.po'
1599--- po/cs.po 2014-05-17 07:15:32 +0000
1600+++ po/cs.po 2014-07-12 12:27:17 +0000
1601@@ -6,11 +6,12 @@
1602 msgid ""
1603 msgstr ""
1604 "Project-Id-Version: dialer-app\n"
1605-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
1606-"POT-Creation-Date: 2014-05-09 15:20-0300\n"
1607+"Report-Msgid-Bugs-To: \n"
1608+"POT-Creation-Date: 2014-07-12 09:22-0300\n"
1609 "PO-Revision-Date: 2014-01-03 13:05+0000\n"
1610 "Last-Translator: Tadeáš Pařík <tadeas.parik@gmail.com>\n"
1611 "Language-Team: Czech <cs@li.org>\n"
1612+"Language: cs\n"
1613 "MIME-Version: 1.0\n"
1614 "Content-Type: text/plain; charset=UTF-8\n"
1615 "Content-Transfer-Encoding: 8bit\n"
1616@@ -18,7 +19,7 @@
1617 "X-Launchpad-Export-Date: 2014-05-17 07:15+0000\n"
1618 "X-Generator: Launchpad (build 17007)\n"
1619
1620-#: src/qml/DialerPage/Keypad.qml:202
1621+#: src/qml/DialerPage/Keypad.qml:161
1622 msgid "#"
1623 msgstr "#"
1624
1625@@ -43,127 +44,107 @@
1626 msgstr[0] ""
1627 msgstr[1] ""
1628
1629-#: src/qml/DialerPage/Keypad.qml:179
1630+#: src/qml/DialerPage/Keypad.qml:138
1631 msgid "*"
1632 msgstr "*"
1633
1634-#: src/qml/DialerPage/Keypad.qml:189
1635+#: src/qml/DialerPage/Keypad.qml:148
1636 msgid "+"
1637 msgstr "+"
1638
1639-#: src/qml/DialerPage/Keypad.qml:188
1640+#: src/qml/DialerPage/Keypad.qml:147
1641 msgid "0"
1642 msgstr "0"
1643
1644-#: src/qml/DialerPage/Keypad.qml:86
1645+#: src/qml/DialerPage/Keypad.qml:45
1646 msgid "1"
1647 msgstr "1"
1648
1649-#: src/qml/DialerPage/Keypad.qml:97
1650+#: src/qml/DialerPage/Keypad.qml:56
1651 msgid "2"
1652 msgstr "2"
1653
1654-#: src/qml/DialerPage/Keypad.qml:107
1655+#: src/qml/DialerPage/Keypad.qml:66
1656 msgid "3"
1657 msgstr "3"
1658
1659-#: src/qml/DialerPage/Keypad.qml:117
1660+#: src/qml/DialerPage/Keypad.qml:76
1661 msgid "4"
1662 msgstr "4"
1663
1664-#: src/qml/DialerPage/Keypad.qml:127
1665+#: src/qml/DialerPage/Keypad.qml:86
1666 msgid "5"
1667 msgstr "5"
1668
1669-#: src/qml/DialerPage/Keypad.qml:137
1670+#: src/qml/DialerPage/Keypad.qml:96
1671 msgid "6"
1672 msgstr "6"
1673
1674-#: src/qml/DialerPage/Keypad.qml:147
1675+#: src/qml/DialerPage/Keypad.qml:106
1676 msgid "7"
1677 msgstr "7"
1678
1679-#: src/qml/DialerPage/Keypad.qml:157
1680+#: src/qml/DialerPage/Keypad.qml:116
1681 msgid "8"
1682 msgstr "8"
1683
1684-#: src/qml/DialerPage/Keypad.qml:167
1685+#: src/qml/DialerPage/Keypad.qml:126
1686 msgid "9"
1687 msgstr "9"
1688
1689-#: src/qml/DialerPage/Keypad.qml:98
1690+#: src/qml/DialerPage/Keypad.qml:57
1691 msgid "ABC"
1692 msgstr "ABC"
1693
1694-#: src/qml/HistoryPage/CallLogContactDelegate.qml:80
1695-msgid "Add Contact"
1696-msgstr ""
1697-
1698-#: src/qml/HistoryPage/CallLogContactDelegate.qml:42
1699-msgid "Add to existing contact"
1700-msgstr "Přidat do existujícího kontaktu"
1701-
1702-#: src/qml/dialer-app.qml:207
1703+#: src/qml/dialer-app.qml:309
1704 msgid "Call Barring"
1705 msgstr ""
1706
1707-#: src/qml/dialer-app.qml:218
1708+#: src/qml/dialer-app.qml:320
1709 msgid "Call Forwarding"
1710 msgstr ""
1711
1712-#: src/qml/dialer-app.qml:229
1713+#: src/qml/dialer-app.qml:331
1714 msgid "Call Waiting"
1715 msgstr ""
1716
1717-#: src/qml/MainPage.qml:56
1718-msgid "Call log"
1719-msgstr "Záznam hovorů"
1720-
1721-#: src/qml/HistoryPage/CallLogContactDelegate.qml:114
1722-msgid "Call now"
1723-msgstr ""
1724-
1725-#: src/qml/dialer-app.qml:240
1726+#: src/qml/dialer-app.qml:342
1727 msgid "Calling Line Presentation"
1728 msgstr ""
1729
1730-#: src/qml/dialer-app.qml:252
1731+#: src/qml/dialer-app.qml:354
1732 msgid "Calling Line Restriction"
1733 msgstr ""
1734
1735-#: src/qml/HistoryPage/CallLogContactDelegate.qml:60
1736-msgid "Cancel"
1737-msgstr ""
1738-
1739-#: src/qml/LiveCallPage/LiveCall.qml:49
1740 #: src/qml/LiveCallPage/MultiCallDisplay.qml:114
1741 msgid "Conference"
1742 msgstr ""
1743
1744-#: src/qml/dialer-app.qml:246
1745+#: src/qml/dialer-app.qml:348
1746 msgid "Connected Line Presentation"
1747 msgstr ""
1748
1749-#: src/qml/dialer-app.qml:258
1750+#: src/qml/dialer-app.qml:360
1751 msgid "Connected Line Restriction"
1752 msgstr ""
1753
1754-#: src/qml/MainPage.qml:45
1755+#: src/qml/DialerPage/DialerPage.qml:41
1756+#: src/qml/ContactsPage/ContactsPage.qml:29
1757 msgid "Contacts"
1758 msgstr "Kontakty"
1759
1760-#: src/qml/HistoryPage/CallLogContactDelegate.qml:51
1761-msgid "Create new contact"
1762-msgstr "Vytvořit nový kontakt"
1763-
1764-#: src/qml/DialerPage/Keypad.qml:108
1765+#: src/qml/DialerPage/Keypad.qml:67
1766 msgid "DEF"
1767 msgstr "DEF"
1768
1769-#: src/qml/HistoryPage/HistoryPage.qml:69
1770+#: src/qml/HistoryPage/HistoryPage.qml:256
1771 msgid "Delete"
1772 msgstr "Vymazat"
1773
1774+#: src/qml/HistoryPage/HistoryPage.qml:263
1775+msgid "Details"
1776+msgstr ""
1777+
1778 #: src/dialer-app.desktop.in:3
1779 msgid "Dialer"
1780 msgstr "Vytáčení čísel"
1781@@ -176,19 +157,19 @@
1782 msgid "Dialer application"
1783 msgstr "Aplikace vytáčení čísel"
1784
1785-#: src/qml/dialer-app.qml:143 src/qml/dialer-app.qml:157
1786+#: src/qml/dialer-app.qml:239 src/qml/dialer-app.qml:253
1787 msgid "Dismiss"
1788 msgstr ""
1789
1790-#: src/qml/DialerPage/DialerPage.qml:79
1791+#: src/qml/DialerPage/DialerPage.qml:146
1792 msgid "Enter a number"
1793 msgstr "Zadejte číslo"
1794
1795-#: src/qml/dialer-app.qml:140
1796+#: src/qml/dialer-app.qml:236
1797 msgid "Error"
1798 msgstr ""
1799
1800-#: src/qml/DialerPage/Keypad.qml:118
1801+#: src/qml/DialerPage/Keypad.qml:77
1802 msgid "GHI"
1803 msgstr "GHI"
1804
1805@@ -196,23 +177,23 @@
1806 msgid "Hangup"
1807 msgstr ""
1808
1809-#: src/qml/HistoryPage/CallLogContactDelegate.qml:39
1810-msgid "How do you want to save the contact?"
1811+#: src/qml/HistoryPage/HistoryDelegate.qml:55
1812+msgid "Incoming"
1813 msgstr ""
1814
1815-#: src/qml/dialer-app.qml:141
1816+#: src/qml/dialer-app.qml:237
1817 msgid "Invalid USSD code"
1818 msgstr ""
1819
1820-#: src/qml/DialerPage/Keypad.qml:128
1821+#: src/qml/DialerPage/Keypad.qml:87
1822 msgid "JKL"
1823 msgstr "JKL"
1824
1825-#: src/qml/MainPage.qml:35
1826+#: src/qml/DialerPage/DialerPage.qml:52
1827 msgid "Keypad"
1828 msgstr "Numerická klávesnice"
1829
1830-#: src/qml/DialerPage/Keypad.qml:138
1831+#: src/qml/DialerPage/Keypad.qml:97
1832 msgid "MNO"
1833 msgstr "MNO"
1834
1835@@ -220,15 +201,23 @@
1836 msgid "Merge calls"
1837 msgstr ""
1838
1839-#: src/qml/LiveCallPage/LiveCall.qml:75
1840-msgid "New call"
1841-msgstr ""
1842-
1843-#: src/qml/DialerPage/Keypad.qml:148
1844+#: src/qml/HistoryPage/HistoryDelegate.qml:53
1845+msgid "Missed"
1846+msgstr ""
1847+
1848+#: src/qml/LiveCallPage/LiveCall.qml:62
1849+msgid "New Call"
1850+msgstr ""
1851+
1852+#: src/qml/HistoryPage/HistoryDelegate.qml:57
1853+msgid "Outgoing"
1854+msgstr ""
1855+
1856+#: src/qml/DialerPage/Keypad.qml:107
1857 msgid "PQRS"
1858 msgstr "PQRS"
1859
1860-#: src/qml/dialer-app.qml:121
1861+#: src/qml/dialer-app.qml:217
1862 msgid "Please wait"
1863 msgstr ""
1864
1865@@ -236,16 +225,19 @@
1866 msgid "Private"
1867 msgstr ""
1868
1869-#: src/qml/HistoryPage/CallLogContactDelegate.qml:38
1870-#: src/qml/HistoryPage/CallLogContactDelegate.qml:134
1871-msgid "Save contact"
1872-msgstr ""
1873-
1874-#: src/qml/HistoryPage/CallLogContactDelegate.qml:124
1875-msgid "Send text message"
1876-msgstr ""
1877-
1878-#: src/qml/DialerPage/Keypad.qml:158
1879+#: src/qml/DialerPage/DialerPage.qml:76 src/qml/HistoryPage/HistoryPage.qml:43
1880+msgid "Recent"
1881+msgstr ""
1882+
1883+#: src/qml/HistoryPage/HistoryPage.qml:43
1884+msgid "Select"
1885+msgstr ""
1886+
1887+#: src/qml/HistoryPage/HistoryPage.qml:274
1888+msgid "Send message"
1889+msgstr ""
1890+
1891+#: src/qml/DialerPage/Keypad.qml:117
1892 msgid "TUV"
1893 msgstr "TUV"
1894
1895@@ -253,23 +245,20 @@
1896 msgid "Today"
1897 msgstr "Dnes"
1898
1899-#: src/qml/LiveCallPage/LiveCall.qml:47
1900-msgid "Two Calls"
1901+#: src/qml/ContactsPage/ContactsPage.qml:46
1902+msgid "Type a name or phone to search"
1903 msgstr ""
1904
1905-#: src/qml/HistoryPage/HistoryDelegate.qml:139
1906-msgid "Unknown"
1907-msgstr "Neznámý"
1908-
1909-#: src/qml/HistoryPage/CallLogContactDelegate.qml:134
1910-msgid "View contact"
1911+#: src/qml/DialerPage/KeypadEntry.qml:54
1912+#: src/qml/HistoryPage/HistoryDelegate.qml:163
1913+msgid "US"
1914 msgstr ""
1915
1916 #: src/qml/LiveCallPage/MultiCallDisplay.qml:116
1917 msgid "Voicemail"
1918 msgstr "Hlasová pošta"
1919
1920-#: src/qml/DialerPage/Keypad.qml:168
1921+#: src/qml/DialerPage/Keypad.qml:127
1922 msgid "WXYZ"
1923 msgstr "WXYZ"
1924
1925@@ -277,17 +266,29 @@
1926 msgid "Yesterday"
1927 msgstr "Včera"
1928
1929+#: src/qml/LiveCallPage/ConferenceCallDisplay.qml:128
1930 #: src/qml/LiveCallPage/MultiCallDisplay.qml:138
1931-#: src/qml/LiveCallPage/ConferenceCallDisplay.qml:128
1932 msgid "active"
1933 msgstr ""
1934
1935-#: src/qml/LiveCallPage/LiveCall.qml:409
1936+#: src/qml/LiveCallPage/LiveCall.qml:244
1937 #: src/qml/LiveCallPage/MultiCallDisplay.qml:134
1938 msgid "calling"
1939 msgstr "volání"
1940
1941+#: src/qml/LiveCallPage/ConferenceCallDisplay.qml:128
1942 #: src/qml/LiveCallPage/MultiCallDisplay.qml:136
1943-#: src/qml/LiveCallPage/ConferenceCallDisplay.qml:128
1944 msgid "on hold"
1945 msgstr ""
1946+
1947+#~ msgid "Add to existing contact"
1948+#~ msgstr "Přidat do existujícího kontaktu"
1949+
1950+#~ msgid "Call log"
1951+#~ msgstr "Záznam hovorů"
1952+
1953+#~ msgid "Create new contact"
1954+#~ msgstr "Vytvořit nový kontakt"
1955+
1956+#~ msgid "Unknown"
1957+#~ msgstr "Neznámý"
1958
1959=== modified file 'po/de.po'
1960--- po/de.po 2014-06-11 06:37:46 +0000
1961+++ po/de.po 2014-07-12 12:27:17 +0000
1962@@ -6,11 +6,12 @@
1963 msgid ""
1964 msgstr ""
1965 "Project-Id-Version: dialer-app\n"
1966-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
1967-"POT-Creation-Date: 2014-05-09 15:20-0300\n"
1968+"Report-Msgid-Bugs-To: \n"
1969+"POT-Creation-Date: 2014-07-12 09:22-0300\n"
1970 "PO-Revision-Date: 2014-06-10 15:44+0000\n"
1971 "Last-Translator: Tobias Bannert <Unknown>\n"
1972 "Language-Team: German <de@li.org>\n"
1973+"Language: de\n"
1974 "MIME-Version: 1.0\n"
1975 "Content-Type: text/plain; charset=UTF-8\n"
1976 "Content-Transfer-Encoding: 8bit\n"
1977@@ -18,7 +19,7 @@
1978 "X-Launchpad-Export-Date: 2014-06-11 06:37+0000\n"
1979 "X-Generator: Launchpad (build 17031)\n"
1980
1981-#: src/qml/DialerPage/Keypad.qml:202
1982+#: src/qml/DialerPage/Keypad.qml:161
1983 msgid "#"
1984 msgstr "#"
1985
1986@@ -43,127 +44,107 @@
1987 msgstr[0] "%1 Sek"
1988 msgstr[1] "%1 Sek"
1989
1990-#: src/qml/DialerPage/Keypad.qml:179
1991+#: src/qml/DialerPage/Keypad.qml:138
1992 msgid "*"
1993 msgstr "*"
1994
1995-#: src/qml/DialerPage/Keypad.qml:189
1996+#: src/qml/DialerPage/Keypad.qml:148
1997 msgid "+"
1998 msgstr "+"
1999
2000-#: src/qml/DialerPage/Keypad.qml:188
2001+#: src/qml/DialerPage/Keypad.qml:147
2002 msgid "0"
2003 msgstr "0"
2004
2005-#: src/qml/DialerPage/Keypad.qml:86
2006+#: src/qml/DialerPage/Keypad.qml:45
2007 msgid "1"
2008 msgstr "1"
2009
2010-#: src/qml/DialerPage/Keypad.qml:97
2011+#: src/qml/DialerPage/Keypad.qml:56
2012 msgid "2"
2013 msgstr "2"
2014
2015-#: src/qml/DialerPage/Keypad.qml:107
2016+#: src/qml/DialerPage/Keypad.qml:66
2017 msgid "3"
2018 msgstr "3"
2019
2020-#: src/qml/DialerPage/Keypad.qml:117
2021+#: src/qml/DialerPage/Keypad.qml:76
2022 msgid "4"
2023 msgstr "4"
2024
2025-#: src/qml/DialerPage/Keypad.qml:127
2026+#: src/qml/DialerPage/Keypad.qml:86
2027 msgid "5"
2028 msgstr "5"
2029
2030-#: src/qml/DialerPage/Keypad.qml:137
2031+#: src/qml/DialerPage/Keypad.qml:96
2032 msgid "6"
2033 msgstr "6"
2034
2035-#: src/qml/DialerPage/Keypad.qml:147
2036+#: src/qml/DialerPage/Keypad.qml:106
2037 msgid "7"
2038 msgstr "7"
2039
2040-#: src/qml/DialerPage/Keypad.qml:157
2041+#: src/qml/DialerPage/Keypad.qml:116
2042 msgid "8"
2043 msgstr "8"
2044
2045-#: src/qml/DialerPage/Keypad.qml:167
2046+#: src/qml/DialerPage/Keypad.qml:126
2047 msgid "9"
2048 msgstr "9"
2049
2050-#: src/qml/DialerPage/Keypad.qml:98
2051+#: src/qml/DialerPage/Keypad.qml:57
2052 msgid "ABC"
2053 msgstr "ABC"
2054
2055-#: src/qml/HistoryPage/CallLogContactDelegate.qml:80
2056-msgid "Add Contact"
2057-msgstr "Kontakt hinzufügen"
2058-
2059-#: src/qml/HistoryPage/CallLogContactDelegate.qml:42
2060-msgid "Add to existing contact"
2061-msgstr "Zu einem existierenden Kontakt hinzufügen"
2062-
2063-#: src/qml/dialer-app.qml:207
2064+#: src/qml/dialer-app.qml:309
2065 msgid "Call Barring"
2066 msgstr "Anrufsperre"
2067
2068-#: src/qml/dialer-app.qml:218
2069+#: src/qml/dialer-app.qml:320
2070 msgid "Call Forwarding"
2071 msgstr "Anrufweiterleitung"
2072
2073-#: src/qml/dialer-app.qml:229
2074+#: src/qml/dialer-app.qml:331
2075 msgid "Call Waiting"
2076 msgstr "Anklopfen"
2077
2078-#: src/qml/MainPage.qml:56
2079-msgid "Call log"
2080-msgstr "Anrufprotokoll"
2081-
2082-#: src/qml/HistoryPage/CallLogContactDelegate.qml:114
2083-msgid "Call now"
2084-msgstr "Jetzt anrufen"
2085-
2086-#: src/qml/dialer-app.qml:240
2087+#: src/qml/dialer-app.qml:342
2088 msgid "Calling Line Presentation"
2089 msgstr "Rufnummernübermittlung des Anrufers"
2090
2091-#: src/qml/dialer-app.qml:252
2092+#: src/qml/dialer-app.qml:354
2093 msgid "Calling Line Restriction"
2094 msgstr "Rufnummernunterdrückung des Anrufers"
2095
2096-#: src/qml/HistoryPage/CallLogContactDelegate.qml:60
2097-msgid "Cancel"
2098-msgstr "Abbrechen"
2099-
2100-#: src/qml/LiveCallPage/LiveCall.qml:49
2101 #: src/qml/LiveCallPage/MultiCallDisplay.qml:114
2102 msgid "Conference"
2103 msgstr "Konferenz"
2104
2105-#: src/qml/dialer-app.qml:246
2106+#: src/qml/dialer-app.qml:348
2107 msgid "Connected Line Presentation"
2108 msgstr "Rufnummernanzeige des Angerufenen"
2109
2110-#: src/qml/dialer-app.qml:258
2111+#: src/qml/dialer-app.qml:360
2112 msgid "Connected Line Restriction"
2113 msgstr "Rufnummernunterdrückung des Angerufenen"
2114
2115-#: src/qml/MainPage.qml:45
2116+#: src/qml/DialerPage/DialerPage.qml:41
2117+#: src/qml/ContactsPage/ContactsPage.qml:29
2118 msgid "Contacts"
2119 msgstr "Kontakte"
2120
2121-#: src/qml/HistoryPage/CallLogContactDelegate.qml:51
2122-msgid "Create new contact"
2123-msgstr "Neuen Kontakt erstellen"
2124-
2125-#: src/qml/DialerPage/Keypad.qml:108
2126+#: src/qml/DialerPage/Keypad.qml:67
2127 msgid "DEF"
2128 msgstr "DEF"
2129
2130-#: src/qml/HistoryPage/HistoryPage.qml:69
2131+#: src/qml/HistoryPage/HistoryPage.qml:256
2132 msgid "Delete"
2133 msgstr "Löschen"
2134
2135+#: src/qml/HistoryPage/HistoryPage.qml:263
2136+msgid "Details"
2137+msgstr ""
2138+
2139 #: src/dialer-app.desktop.in:3
2140 msgid "Dialer"
2141 msgstr "Telefon"
2142@@ -176,19 +157,19 @@
2143 msgid "Dialer application"
2144 msgstr "Telefonanwendung"
2145
2146-#: src/qml/dialer-app.qml:143 src/qml/dialer-app.qml:157
2147+#: src/qml/dialer-app.qml:239 src/qml/dialer-app.qml:253
2148 msgid "Dismiss"
2149 msgstr "Ablehnen"
2150
2151-#: src/qml/DialerPage/DialerPage.qml:79
2152+#: src/qml/DialerPage/DialerPage.qml:146
2153 msgid "Enter a number"
2154 msgstr "Bitte eine Nummer eingeben"
2155
2156-#: src/qml/dialer-app.qml:140
2157+#: src/qml/dialer-app.qml:236
2158 msgid "Error"
2159 msgstr "Fehler"
2160
2161-#: src/qml/DialerPage/Keypad.qml:118
2162+#: src/qml/DialerPage/Keypad.qml:77
2163 msgid "GHI"
2164 msgstr "GHI"
2165
2166@@ -196,23 +177,23 @@
2167 msgid "Hangup"
2168 msgstr "Auflegen"
2169
2170-#: src/qml/HistoryPage/CallLogContactDelegate.qml:39
2171-msgid "How do you want to save the contact?"
2172-msgstr "Wie möchten Sie den Kontakt speichern?"
2173+#: src/qml/HistoryPage/HistoryDelegate.qml:55
2174+msgid "Incoming"
2175+msgstr ""
2176
2177-#: src/qml/dialer-app.qml:141
2178+#: src/qml/dialer-app.qml:237
2179 msgid "Invalid USSD code"
2180 msgstr "Ungültiger USSD-Code"
2181
2182-#: src/qml/DialerPage/Keypad.qml:128
2183+#: src/qml/DialerPage/Keypad.qml:87
2184 msgid "JKL"
2185 msgstr "JKL"
2186
2187-#: src/qml/MainPage.qml:35
2188+#: src/qml/DialerPage/DialerPage.qml:52
2189 msgid "Keypad"
2190 msgstr "Nummernblock"
2191
2192-#: src/qml/DialerPage/Keypad.qml:138
2193+#: src/qml/DialerPage/Keypad.qml:97
2194 msgid "MNO"
2195 msgstr "MNO"
2196
2197@@ -220,15 +201,24 @@
2198 msgid "Merge calls"
2199 msgstr "Anrufe zusammenführen"
2200
2201-#: src/qml/LiveCallPage/LiveCall.qml:75
2202-msgid "New call"
2203+#: src/qml/HistoryPage/HistoryDelegate.qml:53
2204+msgid "Missed"
2205+msgstr ""
2206+
2207+#: src/qml/LiveCallPage/LiveCall.qml:62
2208+#, fuzzy
2209+msgid "New Call"
2210 msgstr "Neuer Anruf"
2211
2212-#: src/qml/DialerPage/Keypad.qml:148
2213+#: src/qml/HistoryPage/HistoryDelegate.qml:57
2214+msgid "Outgoing"
2215+msgstr ""
2216+
2217+#: src/qml/DialerPage/Keypad.qml:107
2218 msgid "PQRS"
2219 msgstr "PQRS"
2220
2221-#: src/qml/dialer-app.qml:121
2222+#: src/qml/dialer-app.qml:217
2223 msgid "Please wait"
2224 msgstr "Bitte warten"
2225
2226@@ -236,16 +226,20 @@
2227 msgid "Private"
2228 msgstr "Privat"
2229
2230-#: src/qml/HistoryPage/CallLogContactDelegate.qml:38
2231-#: src/qml/HistoryPage/CallLogContactDelegate.qml:134
2232-msgid "Save contact"
2233-msgstr "Kontakt speichern"
2234-
2235-#: src/qml/HistoryPage/CallLogContactDelegate.qml:124
2236-msgid "Send text message"
2237+#: src/qml/DialerPage/DialerPage.qml:76 src/qml/HistoryPage/HistoryPage.qml:43
2238+msgid "Recent"
2239+msgstr ""
2240+
2241+#: src/qml/HistoryPage/HistoryPage.qml:43
2242+msgid "Select"
2243+msgstr ""
2244+
2245+#: src/qml/HistoryPage/HistoryPage.qml:274
2246+#, fuzzy
2247+msgid "Send message"
2248 msgstr "SMS senden"
2249
2250-#: src/qml/DialerPage/Keypad.qml:158
2251+#: src/qml/DialerPage/Keypad.qml:117
2252 msgid "TUV"
2253 msgstr "TUV"
2254
2255@@ -253,23 +247,20 @@
2256 msgid "Today"
2257 msgstr "Heute"
2258
2259-#: src/qml/LiveCallPage/LiveCall.qml:47
2260-msgid "Two Calls"
2261-msgstr "Zwei Anrufe"
2262-
2263-#: src/qml/HistoryPage/HistoryDelegate.qml:139
2264-msgid "Unknown"
2265-msgstr "Unbekannt"
2266-
2267-#: src/qml/HistoryPage/CallLogContactDelegate.qml:134
2268-msgid "View contact"
2269-msgstr "Kontakt anzeigen"
2270+#: src/qml/ContactsPage/ContactsPage.qml:46
2271+msgid "Type a name or phone to search"
2272+msgstr ""
2273+
2274+#: src/qml/DialerPage/KeypadEntry.qml:54
2275+#: src/qml/HistoryPage/HistoryDelegate.qml:163
2276+msgid "US"
2277+msgstr ""
2278
2279 #: src/qml/LiveCallPage/MultiCallDisplay.qml:116
2280 msgid "Voicemail"
2281 msgstr "Sprachnachricht"
2282
2283-#: src/qml/DialerPage/Keypad.qml:168
2284+#: src/qml/DialerPage/Keypad.qml:127
2285 msgid "WXYZ"
2286 msgstr "WXYZ"
2287
2288@@ -277,17 +268,50 @@
2289 msgid "Yesterday"
2290 msgstr "Gestern"
2291
2292+#: src/qml/LiveCallPage/ConferenceCallDisplay.qml:128
2293 #: src/qml/LiveCallPage/MultiCallDisplay.qml:138
2294-#: src/qml/LiveCallPage/ConferenceCallDisplay.qml:128
2295 msgid "active"
2296 msgstr "aktiv"
2297
2298-#: src/qml/LiveCallPage/LiveCall.qml:409
2299+#: src/qml/LiveCallPage/LiveCall.qml:244
2300 #: src/qml/LiveCallPage/MultiCallDisplay.qml:134
2301 msgid "calling"
2302 msgstr "wählen"
2303
2304+#: src/qml/LiveCallPage/ConferenceCallDisplay.qml:128
2305 #: src/qml/LiveCallPage/MultiCallDisplay.qml:136
2306-#: src/qml/LiveCallPage/ConferenceCallDisplay.qml:128
2307 msgid "on hold"
2308 msgstr "gehalten"
2309+
2310+#~ msgid "Add Contact"
2311+#~ msgstr "Kontakt hinzufügen"
2312+
2313+#~ msgid "Add to existing contact"
2314+#~ msgstr "Zu einem existierenden Kontakt hinzufügen"
2315+
2316+#~ msgid "Call log"
2317+#~ msgstr "Anrufprotokoll"
2318+
2319+#~ msgid "Call now"
2320+#~ msgstr "Jetzt anrufen"
2321+
2322+#~ msgid "Cancel"
2323+#~ msgstr "Abbrechen"
2324+
2325+#~ msgid "Create new contact"
2326+#~ msgstr "Neuen Kontakt erstellen"
2327+
2328+#~ msgid "How do you want to save the contact?"
2329+#~ msgstr "Wie möchten Sie den Kontakt speichern?"
2330+
2331+#~ msgid "Save contact"
2332+#~ msgstr "Kontakt speichern"
2333+
2334+#~ msgid "Two Calls"
2335+#~ msgstr "Zwei Anrufe"
2336+
2337+#~ msgid "Unknown"
2338+#~ msgstr "Unbekannt"
2339+
2340+#~ msgid "View contact"
2341+#~ msgstr "Kontakt anzeigen"
2342
2343=== modified file 'po/dialer-app.pot'
2344--- po/dialer-app.pot 2014-05-09 18:20:23 +0000
2345+++ po/dialer-app.pot 2014-07-12 12:27:17 +0000
2346@@ -8,7 +8,7 @@
2347 msgstr ""
2348 "Project-Id-Version: PACKAGE VERSION\n"
2349 "Report-Msgid-Bugs-To: \n"
2350-"POT-Creation-Date: 2014-05-09 15:20-0300\n"
2351+"POT-Creation-Date: 2014-07-12 09:22-0300\n"
2352 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
2353 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
2354 "Language-Team: LANGUAGE <LL@li.org>\n"
2355@@ -18,7 +18,7 @@
2356 "Content-Transfer-Encoding: 8bit\n"
2357 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
2358
2359-#: src/qml/DialerPage/Keypad.qml:202
2360+#: src/qml/DialerPage/Keypad.qml:161
2361 msgid "#"
2362 msgstr ""
2363
2364@@ -43,127 +43,107 @@
2365 msgstr[0] ""
2366 msgstr[1] ""
2367
2368-#: src/qml/DialerPage/Keypad.qml:179
2369+#: src/qml/DialerPage/Keypad.qml:138
2370 msgid "*"
2371 msgstr ""
2372
2373-#: src/qml/DialerPage/Keypad.qml:189
2374+#: src/qml/DialerPage/Keypad.qml:148
2375 msgid "+"
2376 msgstr ""
2377
2378-#: src/qml/DialerPage/Keypad.qml:188
2379+#: src/qml/DialerPage/Keypad.qml:147
2380 msgid "0"
2381 msgstr ""
2382
2383-#: src/qml/DialerPage/Keypad.qml:86
2384+#: src/qml/DialerPage/Keypad.qml:45
2385 msgid "1"
2386 msgstr ""
2387
2388-#: src/qml/DialerPage/Keypad.qml:97
2389+#: src/qml/DialerPage/Keypad.qml:56
2390 msgid "2"
2391 msgstr ""
2392
2393-#: src/qml/DialerPage/Keypad.qml:107
2394+#: src/qml/DialerPage/Keypad.qml:66
2395 msgid "3"
2396 msgstr ""
2397
2398-#: src/qml/DialerPage/Keypad.qml:117
2399+#: src/qml/DialerPage/Keypad.qml:76
2400 msgid "4"
2401 msgstr ""
2402
2403-#: src/qml/DialerPage/Keypad.qml:127
2404+#: src/qml/DialerPage/Keypad.qml:86
2405 msgid "5"
2406 msgstr ""
2407
2408-#: src/qml/DialerPage/Keypad.qml:137
2409+#: src/qml/DialerPage/Keypad.qml:96
2410 msgid "6"
2411 msgstr ""
2412
2413-#: src/qml/DialerPage/Keypad.qml:147
2414+#: src/qml/DialerPage/Keypad.qml:106
2415 msgid "7"
2416 msgstr ""
2417
2418-#: src/qml/DialerPage/Keypad.qml:157
2419+#: src/qml/DialerPage/Keypad.qml:116
2420 msgid "8"
2421 msgstr ""
2422
2423-#: src/qml/DialerPage/Keypad.qml:167
2424+#: src/qml/DialerPage/Keypad.qml:126
2425 msgid "9"
2426 msgstr ""
2427
2428-#: src/qml/DialerPage/Keypad.qml:98
2429+#: src/qml/DialerPage/Keypad.qml:57
2430 msgid "ABC"
2431 msgstr ""
2432
2433-#: src/qml/HistoryPage/CallLogContactDelegate.qml:80
2434-msgid "Add Contact"
2435-msgstr ""
2436-
2437-#: src/qml/HistoryPage/CallLogContactDelegate.qml:42
2438-msgid "Add to existing contact"
2439-msgstr ""
2440-
2441-#: src/qml/dialer-app.qml:207
2442+#: src/qml/dialer-app.qml:309
2443 msgid "Call Barring"
2444 msgstr ""
2445
2446-#: src/qml/dialer-app.qml:218
2447+#: src/qml/dialer-app.qml:320
2448 msgid "Call Forwarding"
2449 msgstr ""
2450
2451-#: src/qml/dialer-app.qml:229
2452+#: src/qml/dialer-app.qml:331
2453 msgid "Call Waiting"
2454 msgstr ""
2455
2456-#: src/qml/MainPage.qml:56
2457-msgid "Call log"
2458-msgstr ""
2459-
2460-#: src/qml/HistoryPage/CallLogContactDelegate.qml:114
2461-msgid "Call now"
2462-msgstr ""
2463-
2464-#: src/qml/dialer-app.qml:240
2465+#: src/qml/dialer-app.qml:342
2466 msgid "Calling Line Presentation"
2467 msgstr ""
2468
2469-#: src/qml/dialer-app.qml:252
2470+#: src/qml/dialer-app.qml:354
2471 msgid "Calling Line Restriction"
2472 msgstr ""
2473
2474-#: src/qml/HistoryPage/CallLogContactDelegate.qml:60
2475-msgid "Cancel"
2476-msgstr ""
2477-
2478-#: src/qml/LiveCallPage/LiveCall.qml:49
2479 #: src/qml/LiveCallPage/MultiCallDisplay.qml:114
2480 msgid "Conference"
2481 msgstr ""
2482
2483-#: src/qml/dialer-app.qml:246
2484+#: src/qml/dialer-app.qml:348
2485 msgid "Connected Line Presentation"
2486 msgstr ""
2487
2488-#: src/qml/dialer-app.qml:258
2489+#: src/qml/dialer-app.qml:360
2490 msgid "Connected Line Restriction"
2491 msgstr ""
2492
2493-#: src/qml/MainPage.qml:45
2494+#: src/qml/DialerPage/DialerPage.qml:41
2495+#: src/qml/ContactsPage/ContactsPage.qml:29
2496 msgid "Contacts"
2497 msgstr ""
2498
2499-#: src/qml/HistoryPage/CallLogContactDelegate.qml:51
2500-msgid "Create new contact"
2501-msgstr ""
2502-
2503-#: src/qml/DialerPage/Keypad.qml:108
2504+#: src/qml/DialerPage/Keypad.qml:67
2505 msgid "DEF"
2506 msgstr ""
2507
2508-#: src/qml/HistoryPage/HistoryPage.qml:69
2509+#: src/qml/HistoryPage/HistoryPage.qml:256
2510 msgid "Delete"
2511 msgstr ""
2512
2513+#: src/qml/HistoryPage/HistoryPage.qml:263
2514+msgid "Details"
2515+msgstr ""
2516+
2517 #: src/dialer-app.desktop.in:3
2518 msgid "Dialer"
2519 msgstr ""
2520@@ -176,19 +156,19 @@
2521 msgid "Dialer application"
2522 msgstr ""
2523
2524-#: src/qml/dialer-app.qml:143 src/qml/dialer-app.qml:157
2525+#: src/qml/dialer-app.qml:239 src/qml/dialer-app.qml:253
2526 msgid "Dismiss"
2527 msgstr ""
2528
2529-#: src/qml/DialerPage/DialerPage.qml:79
2530+#: src/qml/DialerPage/DialerPage.qml:146
2531 msgid "Enter a number"
2532 msgstr ""
2533
2534-#: src/qml/dialer-app.qml:140
2535+#: src/qml/dialer-app.qml:236
2536 msgid "Error"
2537 msgstr ""
2538
2539-#: src/qml/DialerPage/Keypad.qml:118
2540+#: src/qml/DialerPage/Keypad.qml:77
2541 msgid "GHI"
2542 msgstr ""
2543
2544@@ -196,23 +176,23 @@
2545 msgid "Hangup"
2546 msgstr ""
2547
2548-#: src/qml/HistoryPage/CallLogContactDelegate.qml:39
2549-msgid "How do you want to save the contact?"
2550+#: src/qml/HistoryPage/HistoryDelegate.qml:55
2551+msgid "Incoming"
2552 msgstr ""
2553
2554-#: src/qml/dialer-app.qml:141
2555+#: src/qml/dialer-app.qml:237
2556 msgid "Invalid USSD code"
2557 msgstr ""
2558
2559-#: src/qml/DialerPage/Keypad.qml:128
2560+#: src/qml/DialerPage/Keypad.qml:87
2561 msgid "JKL"
2562 msgstr ""
2563
2564-#: src/qml/MainPage.qml:35
2565+#: src/qml/DialerPage/DialerPage.qml:52
2566 msgid "Keypad"
2567 msgstr ""
2568
2569-#: src/qml/DialerPage/Keypad.qml:138
2570+#: src/qml/DialerPage/Keypad.qml:97
2571 msgid "MNO"
2572 msgstr ""
2573
2574@@ -220,15 +200,23 @@
2575 msgid "Merge calls"
2576 msgstr ""
2577
2578-#: src/qml/LiveCallPage/LiveCall.qml:75
2579-msgid "New call"
2580-msgstr ""
2581-
2582-#: src/qml/DialerPage/Keypad.qml:148
2583+#: src/qml/HistoryPage/HistoryDelegate.qml:53
2584+msgid "Missed"
2585+msgstr ""
2586+
2587+#: src/qml/LiveCallPage/LiveCall.qml:62
2588+msgid "New Call"
2589+msgstr ""
2590+
2591+#: src/qml/HistoryPage/HistoryDelegate.qml:57
2592+msgid "Outgoing"
2593+msgstr ""
2594+
2595+#: src/qml/DialerPage/Keypad.qml:107
2596 msgid "PQRS"
2597 msgstr ""
2598
2599-#: src/qml/dialer-app.qml:121
2600+#: src/qml/dialer-app.qml:217
2601 msgid "Please wait"
2602 msgstr ""
2603
2604@@ -236,16 +224,19 @@
2605 msgid "Private"
2606 msgstr ""
2607
2608-#: src/qml/HistoryPage/CallLogContactDelegate.qml:38
2609-#: src/qml/HistoryPage/CallLogContactDelegate.qml:134
2610-msgid "Save contact"
2611-msgstr ""
2612-
2613-#: src/qml/HistoryPage/CallLogContactDelegate.qml:124
2614-msgid "Send text message"
2615-msgstr ""
2616-
2617-#: src/qml/DialerPage/Keypad.qml:158
2618+#: src/qml/DialerPage/DialerPage.qml:76 src/qml/HistoryPage/HistoryPage.qml:43
2619+msgid "Recent"
2620+msgstr ""
2621+
2622+#: src/qml/HistoryPage/HistoryPage.qml:43
2623+msgid "Select"
2624+msgstr ""
2625+
2626+#: src/qml/HistoryPage/HistoryPage.qml:274
2627+msgid "Send message"
2628+msgstr ""
2629+
2630+#: src/qml/DialerPage/Keypad.qml:117
2631 msgid "TUV"
2632 msgstr ""
2633
2634@@ -253,23 +244,20 @@
2635 msgid "Today"
2636 msgstr ""
2637
2638-#: src/qml/LiveCallPage/LiveCall.qml:47
2639-msgid "Two Calls"
2640-msgstr ""
2641-
2642-#: src/qml/HistoryPage/HistoryDelegate.qml:139
2643-msgid "Unknown"
2644-msgstr ""
2645-
2646-#: src/qml/HistoryPage/CallLogContactDelegate.qml:134
2647-msgid "View contact"
2648+#: src/qml/ContactsPage/ContactsPage.qml:46
2649+msgid "Type a name or phone to search"
2650+msgstr ""
2651+
2652+#: src/qml/DialerPage/KeypadEntry.qml:54
2653+#: src/qml/HistoryPage/HistoryDelegate.qml:163
2654+msgid "US"
2655 msgstr ""
2656
2657 #: src/qml/LiveCallPage/MultiCallDisplay.qml:116
2658 msgid "Voicemail"
2659 msgstr ""
2660
2661-#: src/qml/DialerPage/Keypad.qml:168
2662+#: src/qml/DialerPage/Keypad.qml:127
2663 msgid "WXYZ"
2664 msgstr ""
2665
2666@@ -277,17 +265,17 @@
2667 msgid "Yesterday"
2668 msgstr ""
2669
2670+#: src/qml/LiveCallPage/ConferenceCallDisplay.qml:128
2671 #: src/qml/LiveCallPage/MultiCallDisplay.qml:138
2672-#: src/qml/LiveCallPage/ConferenceCallDisplay.qml:128
2673 msgid "active"
2674 msgstr ""
2675
2676-#: src/qml/LiveCallPage/LiveCall.qml:409
2677+#: src/qml/LiveCallPage/LiveCall.qml:244
2678 #: src/qml/LiveCallPage/MultiCallDisplay.qml:134
2679 msgid "calling"
2680 msgstr ""
2681
2682+#: src/qml/LiveCallPage/ConferenceCallDisplay.qml:128
2683 #: src/qml/LiveCallPage/MultiCallDisplay.qml:136
2684-#: src/qml/LiveCallPage/ConferenceCallDisplay.qml:128
2685 msgid "on hold"
2686 msgstr ""
2687
2688=== modified file 'po/el.po'
2689--- po/el.po 2014-06-22 05:59:49 +0000
2690+++ po/el.po 2014-07-12 12:27:17 +0000
2691@@ -6,11 +6,12 @@
2692 msgid ""
2693 msgstr ""
2694 "Project-Id-Version: dialer-app\n"
2695-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
2696-"POT-Creation-Date: 2014-05-09 15:20-0300\n"
2697+"Report-Msgid-Bugs-To: \n"
2698+"POT-Creation-Date: 2014-07-12 09:22-0300\n"
2699 "PO-Revision-Date: 2014-06-21 23:11+0000\n"
2700 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
2701 "Language-Team: Greek <el@li.org>\n"
2702+"Language: el\n"
2703 "MIME-Version: 1.0\n"
2704 "Content-Type: text/plain; charset=UTF-8\n"
2705 "Content-Transfer-Encoding: 8bit\n"
2706@@ -95,75 +96,55 @@
2707 msgid "ABC"
2708 msgstr ""
2709
2710-#: src/qml/HistoryPage/CallLogContactDelegate.qml:73
2711-msgid "Add Contact"
2712-msgstr ""
2713-
2714-#: src/qml/HistoryPage/CallLogContactDelegate.qml:42
2715-msgid "Add to existing contact"
2716-msgstr ""
2717-
2718-#: src/qml/dialer-app.qml:272
2719+#: src/qml/dialer-app.qml:309
2720 msgid "Call Barring"
2721 msgstr ""
2722
2723-#: src/qml/dialer-app.qml:283
2724+#: src/qml/dialer-app.qml:320
2725 msgid "Call Forwarding"
2726 msgstr ""
2727
2728-#: src/qml/dialer-app.qml:294
2729+#: src/qml/dialer-app.qml:331
2730 msgid "Call Waiting"
2731 msgstr ""
2732
2733-#: src/qml/MainPage.qml:56
2734-msgid "Call log"
2735-msgstr ""
2736-
2737-#: src/qml/HistoryPage/CallLogContactDelegate.qml:107
2738-msgid "Call now"
2739-msgstr ""
2740-
2741-#: src/qml/dialer-app.qml:305
2742+#: src/qml/dialer-app.qml:342
2743 msgid "Calling Line Presentation"
2744 msgstr ""
2745
2746-#: src/qml/dialer-app.qml:317
2747+#: src/qml/dialer-app.qml:354
2748 msgid "Calling Line Restriction"
2749 msgstr ""
2750
2751-#: src/qml/HistoryPage/CallLogContactDelegate.qml:60
2752-msgid "Cancel"
2753-msgstr ""
2754-
2755 #: src/qml/LiveCallPage/MultiCallDisplay.qml:114
2756 msgid "Conference"
2757 msgstr ""
2758
2759-#: src/qml/dialer-app.qml:311
2760+#: src/qml/dialer-app.qml:348
2761 msgid "Connected Line Presentation"
2762 msgstr ""
2763
2764-#: src/qml/dialer-app.qml:323
2765+#: src/qml/dialer-app.qml:360
2766 msgid "Connected Line Restriction"
2767 msgstr ""
2768
2769-#: src/qml/DialerPage/DialerPage.qml:38
2770+#: src/qml/DialerPage/DialerPage.qml:41
2771 #: src/qml/ContactsPage/ContactsPage.qml:29
2772 msgid "Contacts"
2773 msgstr ""
2774
2775-#: src/qml/HistoryPage/CallLogContactDelegate.qml:51
2776-msgid "Create new contact"
2777-msgstr ""
2778-
2779 #: src/qml/DialerPage/Keypad.qml:67
2780 msgid "DEF"
2781 msgstr ""
2782
2783-#: src/qml/HistoryPage/HistoryPage.qml:69
2784+#: src/qml/HistoryPage/HistoryPage.qml:256
2785 msgid "Delete"
2786 msgstr ""
2787
2788+#: src/qml/HistoryPage/HistoryPage.qml:263
2789+msgid "Details"
2790+msgstr ""
2791+
2792 #: src/dialer-app.desktop.in:3
2793 msgid "Dialer"
2794 msgstr ""
2795@@ -176,15 +157,15 @@
2796 msgid "Dialer application"
2797 msgstr ""
2798
2799-#: src/qml/dialer-app.qml:199 src/qml/dialer-app.qml:213
2800+#: src/qml/dialer-app.qml:239 src/qml/dialer-app.qml:253
2801 msgid "Dismiss"
2802 msgstr ""
2803
2804-#: src/qml/DialerPage/DialerPage.qml:105
2805+#: src/qml/DialerPage/DialerPage.qml:146
2806 msgid "Enter a number"
2807 msgstr ""
2808
2809-#: src/qml/dialer-app.qml:196
2810+#: src/qml/dialer-app.qml:236
2811 msgid "Error"
2812 msgstr ""
2813
2814@@ -196,11 +177,11 @@
2815 msgid "Hangup"
2816 msgstr ""
2817
2818-#: src/qml/HistoryPage/CallLogContactDelegate.qml:39
2819-msgid "How do you want to save the contact?"
2820+#: src/qml/HistoryPage/HistoryDelegate.qml:55
2821+msgid "Incoming"
2822 msgstr ""
2823
2824-#: src/qml/dialer-app.qml:197
2825+#: src/qml/dialer-app.qml:237
2826 msgid "Invalid USSD code"
2827 msgstr ""
2828
2829@@ -208,7 +189,7 @@
2830 msgid "JKL"
2831 msgstr ""
2832
2833-#: src/qml/DialerPage/DialerPage.qml:44
2834+#: src/qml/DialerPage/DialerPage.qml:52
2835 msgid "Keypad"
2836 msgstr ""
2837
2838@@ -220,15 +201,23 @@
2839 msgid "Merge calls"
2840 msgstr ""
2841
2842-#: src/qml/LiveCallPage/LiveCall.qml:75
2843-msgid "New call"
2844+#: src/qml/HistoryPage/HistoryDelegate.qml:53
2845+msgid "Missed"
2846+msgstr ""
2847+
2848+#: src/qml/LiveCallPage/LiveCall.qml:62
2849+msgid "New Call"
2850+msgstr ""
2851+
2852+#: src/qml/HistoryPage/HistoryDelegate.qml:57
2853+msgid "Outgoing"
2854 msgstr ""
2855
2856 #: src/qml/DialerPage/Keypad.qml:107
2857 msgid "PQRS"
2858 msgstr ""
2859
2860-#: src/qml/dialer-app.qml:177
2861+#: src/qml/dialer-app.qml:217
2862 msgid "Please wait"
2863 msgstr ""
2864
2865@@ -236,13 +225,16 @@
2866 msgid "Private"
2867 msgstr ""
2868
2869-#: src/qml/HistoryPage/CallLogContactDelegate.qml:38
2870-#: src/qml/HistoryPage/CallLogContactDelegate.qml:127
2871-msgid "Save contact"
2872-msgstr ""
2873-
2874-#: src/qml/HistoryPage/CallLogContactDelegate.qml:117
2875-msgid "Send text message"
2876+#: src/qml/DialerPage/DialerPage.qml:76 src/qml/HistoryPage/HistoryPage.qml:43
2877+msgid "Recent"
2878+msgstr ""
2879+
2880+#: src/qml/HistoryPage/HistoryPage.qml:43
2881+msgid "Select"
2882+msgstr ""
2883+
2884+#: src/qml/HistoryPage/HistoryPage.qml:274
2885+msgid "Send message"
2886 msgstr ""
2887
2888 #: src/qml/DialerPage/Keypad.qml:117
2889@@ -253,16 +245,13 @@
2890 msgid "Today"
2891 msgstr ""
2892
2893-#: src/qml/LiveCallPage/LiveCall.qml:47
2894-msgid "Two Calls"
2895-msgstr ""
2896-
2897-#: src/qml/HistoryPage/HistoryDelegate.qml:139
2898-msgid "Unknown"
2899-msgstr ""
2900-
2901-#: src/qml/HistoryPage/CallLogContactDelegate.qml:127
2902-msgid "View contact"
2903+#: src/qml/ContactsPage/ContactsPage.qml:46
2904+msgid "Type a name or phone to search"
2905+msgstr ""
2906+
2907+#: src/qml/DialerPage/KeypadEntry.qml:54
2908+#: src/qml/HistoryPage/HistoryDelegate.qml:163
2909+msgid "US"
2910 msgstr ""
2911
2912 #: src/qml/LiveCallPage/MultiCallDisplay.qml:116
2913@@ -282,8 +271,8 @@
2914 msgid "active"
2915 msgstr ""
2916
2917+#: src/qml/LiveCallPage/LiveCall.qml:244
2918 #: src/qml/LiveCallPage/MultiCallDisplay.qml:134
2919-#: src/qml/LiveCallPage/LiveCall.qml:222
2920 msgid "calling"
2921 msgstr ""
2922
2923
2924=== modified file 'po/en_GB.po'
2925--- po/en_GB.po 2014-07-11 06:16:01 +0000
2926+++ po/en_GB.po 2014-07-12 12:27:17 +0000
2927@@ -6,11 +6,19 @@
2928 msgid ""
2929 msgstr ""
2930 "Project-Id-Version: dialer-app\n"
2931+<<<<<<< TREE
2932 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
2933 "POT-Creation-Date: 2014-05-09 15:20-0300\n"
2934 "PO-Revision-Date: 2014-07-10 15:52+0000\n"
2935 "Last-Translator: Alan Pope ㋛ <alan@ubuntu.com>\n"
2936+=======
2937+"Report-Msgid-Bugs-To: \n"
2938+"POT-Creation-Date: 2014-07-12 09:22-0300\n"
2939+"PO-Revision-Date: 2014-07-02 13:42+0000\n"
2940+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
2941+>>>>>>> MERGE-SOURCE
2942 "Language-Team: English (United Kingdom) <en_GB@li.org>\n"
2943+"Language: \n"
2944 "MIME-Version: 1.0\n"
2945 "Content-Type: text/plain; charset=UTF-8\n"
2946 "Content-Transfer-Encoding: 8bit\n"
2947@@ -95,14 +103,6 @@
2948 msgid "ABC"
2949 msgstr "ABC"
2950
2951-#: src/qml/HistoryPage/CallLogContactDelegate.qml:73
2952-msgid "Add Contact"
2953-msgstr "Add Contact"
2954-
2955-#: src/qml/HistoryPage/CallLogContactDelegate.qml:42
2956-msgid "Add to existing contact"
2957-msgstr "Add to existing contact"
2958-
2959 #: src/qml/dialer-app.qml:309
2960 msgid "Call Barring"
2961 msgstr "Call Barring"
2962@@ -115,6 +115,7 @@
2963 msgid "Call Waiting"
2964 msgstr "Call Waiting"
2965
2966+<<<<<<< TREE
2967 #: src/qml/MainPage.qml:56
2968 msgid "Call log"
2969 msgstr "Call log"
2970@@ -123,6 +124,8 @@
2971 msgid "Call now"
2972 msgstr "Call now"
2973
2974+=======
2975+>>>>>>> MERGE-SOURCE
2976 #: src/qml/dialer-app.qml:342
2977 msgid "Calling Line Presentation"
2978 msgstr "Calling Line Presentation"
2979@@ -131,10 +134,6 @@
2980 msgid "Calling Line Restriction"
2981 msgstr "Calling Line Restriction"
2982
2983-#: src/qml/HistoryPage/CallLogContactDelegate.qml:60
2984-msgid "Cancel"
2985-msgstr "Cancel"
2986-
2987 #: src/qml/LiveCallPage/MultiCallDisplay.qml:114
2988 msgid "Conference"
2989 msgstr "Conference"
2990@@ -147,23 +146,23 @@
2991 msgid "Connected Line Restriction"
2992 msgstr "Connected Line Restriction"
2993
2994+#: src/qml/DialerPage/DialerPage.qml:41
2995 #: src/qml/ContactsPage/ContactsPage.qml:29
2996-#: src/qml/DialerPage/DialerPage.qml:41
2997 msgid "Contacts"
2998 msgstr "Contacts"
2999
3000-#: src/qml/HistoryPage/CallLogContactDelegate.qml:51
3001-msgid "Create new contact"
3002-msgstr "Create new contact"
3003-
3004 #: src/qml/DialerPage/Keypad.qml:67
3005 msgid "DEF"
3006 msgstr "DEF"
3007
3008-#: src/qml/HistoryPage/HistoryPage.qml:69
3009+#: src/qml/HistoryPage/HistoryPage.qml:256
3010 msgid "Delete"
3011 msgstr "Delete"
3012
3013+#: src/qml/HistoryPage/HistoryPage.qml:263
3014+msgid "Details"
3015+msgstr ""
3016+
3017 #: src/dialer-app.desktop.in:3
3018 msgid "Dialer"
3019 msgstr "Dialer"
3020@@ -180,7 +179,7 @@
3021 msgid "Dismiss"
3022 msgstr "Dismiss"
3023
3024-#: src/qml/DialerPage/DialerPage.qml:132
3025+#: src/qml/DialerPage/DialerPage.qml:146
3026 msgid "Enter a number"
3027 msgstr "Enter a number"
3028
3029@@ -196,9 +195,15 @@
3030 msgid "Hangup"
3031 msgstr "Hang up"
3032
3033+<<<<<<< TREE
3034 #: src/qml/HistoryPage/CallLogContactDelegate.qml:39
3035 msgid "How do you want to save the contact?"
3036 msgstr "How do you want to save the contact?"
3037+=======
3038+#: src/qml/HistoryPage/HistoryDelegate.qml:55
3039+msgid "Incoming"
3040+msgstr ""
3041+>>>>>>> MERGE-SOURCE
3042
3043 #: src/qml/dialer-app.qml:237
3044 msgid "Invalid USSD code"
3045@@ -220,9 +225,23 @@
3046 msgid "Merge calls"
3047 msgstr "Merge calls"
3048
3049+<<<<<<< TREE
3050 #: src/qml/LiveCallPage/LiveCall.qml:75
3051 msgid "New call"
3052 msgstr "New call"
3053+=======
3054+#: src/qml/HistoryPage/HistoryDelegate.qml:53
3055+msgid "Missed"
3056+msgstr ""
3057+
3058+#: src/qml/LiveCallPage/LiveCall.qml:62
3059+msgid "New Call"
3060+msgstr ""
3061+
3062+#: src/qml/HistoryPage/HistoryDelegate.qml:57
3063+msgid "Outgoing"
3064+msgstr ""
3065+>>>>>>> MERGE-SOURCE
3066
3067 #: src/qml/DialerPage/Keypad.qml:107
3068 msgid "PQRS"
3069@@ -236,6 +255,7 @@
3070 msgid "Private"
3071 msgstr "Private"
3072
3073+<<<<<<< TREE
3074 #: src/qml/HistoryPage/CallLogContactDelegate.qml:38
3075 #: src/qml/HistoryPage/CallLogContactDelegate.qml:127
3076 msgid "Save contact"
3077@@ -244,6 +264,19 @@
3078 #: src/qml/HistoryPage/CallLogContactDelegate.qml:117
3079 msgid "Send text message"
3080 msgstr "Send text message"
3081+=======
3082+#: src/qml/DialerPage/DialerPage.qml:76 src/qml/HistoryPage/HistoryPage.qml:43
3083+msgid "Recent"
3084+msgstr ""
3085+
3086+#: src/qml/HistoryPage/HistoryPage.qml:43
3087+msgid "Select"
3088+msgstr ""
3089+
3090+#: src/qml/HistoryPage/HistoryPage.qml:274
3091+msgid "Send message"
3092+msgstr ""
3093+>>>>>>> MERGE-SOURCE
3094
3095 #: src/qml/DialerPage/Keypad.qml:117
3096 msgid "TUV"
3097@@ -253,6 +286,7 @@
3098 msgid "Today"
3099 msgstr "Today"
3100
3101+<<<<<<< TREE
3102 #: src/qml/LiveCallPage/LiveCall.qml:47
3103 msgid "Two Calls"
3104 msgstr "Two Calls"
3105@@ -264,6 +298,16 @@
3106 #: src/qml/HistoryPage/CallLogContactDelegate.qml:127
3107 msgid "View contact"
3108 msgstr "View contact"
3109+=======
3110+#: src/qml/ContactsPage/ContactsPage.qml:46
3111+msgid "Type a name or phone to search"
3112+msgstr ""
3113+
3114+#: src/qml/DialerPage/KeypadEntry.qml:54
3115+#: src/qml/HistoryPage/HistoryDelegate.qml:163
3116+msgid "US"
3117+msgstr ""
3118+>>>>>>> MERGE-SOURCE
3119
3120 #: src/qml/LiveCallPage/MultiCallDisplay.qml:116
3121 msgid "Voicemail"
3122@@ -277,8 +321,8 @@
3123 msgid "Yesterday"
3124 msgstr "Yesterday"
3125
3126+#: src/qml/LiveCallPage/ConferenceCallDisplay.qml:128
3127 #: src/qml/LiveCallPage/MultiCallDisplay.qml:138
3128-#: src/qml/LiveCallPage/ConferenceCallDisplay.qml:128
3129 msgid "active"
3130 msgstr "active"
3131
3132@@ -287,7 +331,26 @@
3133 msgid "calling"
3134 msgstr "calling"
3135
3136+#: src/qml/LiveCallPage/ConferenceCallDisplay.qml:128
3137 #: src/qml/LiveCallPage/MultiCallDisplay.qml:136
3138-#: src/qml/LiveCallPage/ConferenceCallDisplay.qml:128
3139 msgid "on hold"
3140+<<<<<<< TREE
3141 msgstr "on hold"
3142+=======
3143+msgstr ""
3144+
3145+#~ msgid "Add Contact"
3146+#~ msgstr "Add Contact"
3147+
3148+#~ msgid "Add to existing contact"
3149+#~ msgstr "Add to existing contact"
3150+
3151+#~ msgid "Call now"
3152+#~ msgstr "Call now"
3153+
3154+#~ msgid "Cancel"
3155+#~ msgstr "Cancel"
3156+
3157+#~ msgid "Create new contact"
3158+#~ msgstr "Create new contact"
3159+>>>>>>> MERGE-SOURCE
3160
3161=== modified file 'po/es.po'
3162--- po/es.po 2014-07-08 07:01:34 +0000
3163+++ po/es.po 2014-07-12 12:27:17 +0000
3164@@ -6,11 +6,12 @@
3165 msgid ""
3166 msgstr ""
3167 "Project-Id-Version: dialer-app\n"
3168-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
3169-"POT-Creation-Date: 2014-05-09 15:20-0300\n"
3170+"Report-Msgid-Bugs-To: \n"
3171+"POT-Creation-Date: 2014-07-12 09:22-0300\n"
3172 "PO-Revision-Date: 2014-07-07 08:43+0000\n"
3173 "Last-Translator: Adolfo Jayme <fitoschido@gmail.com>\n"
3174 "Language-Team: Spanish <es@li.org>\n"
3175+"Language: es\n"
3176 "MIME-Version: 1.0\n"
3177 "Content-Type: text/plain; charset=UTF-8\n"
3178 "Content-Transfer-Encoding: 8bit\n"
3179@@ -95,14 +96,6 @@
3180 msgid "ABC"
3181 msgstr "ABC"
3182
3183-#: src/qml/HistoryPage/CallLogContactDelegate.qml:73
3184-msgid "Add Contact"
3185-msgstr "Añadir contacto"
3186-
3187-#: src/qml/HistoryPage/CallLogContactDelegate.qml:42
3188-msgid "Add to existing contact"
3189-msgstr "Añadir a contacto existente"
3190-
3191 #: src/qml/dialer-app.qml:309
3192 msgid "Call Barring"
3193 msgstr "Restricción de llamadas"
3194@@ -115,14 +108,6 @@
3195 msgid "Call Waiting"
3196 msgstr "Llamada en espera"
3197
3198-#: src/qml/MainPage.qml:56
3199-msgid "Call log"
3200-msgstr "Lista de llamadas"
3201-
3202-#: src/qml/HistoryPage/CallLogContactDelegate.qml:107
3203-msgid "Call now"
3204-msgstr "Llamar ahora"
3205-
3206 #: src/qml/dialer-app.qml:342
3207 msgid "Calling Line Presentation"
3208 msgstr "Mostrar línea de llamada"
3209@@ -131,10 +116,6 @@
3210 msgid "Calling Line Restriction"
3211 msgstr "Restringir línea de llamada"
3212
3213-#: src/qml/HistoryPage/CallLogContactDelegate.qml:60
3214-msgid "Cancel"
3215-msgstr "Cancelar"
3216-
3217 #: src/qml/LiveCallPage/MultiCallDisplay.qml:114
3218 msgid "Conference"
3219 msgstr "Conferencia"
3220@@ -147,23 +128,23 @@
3221 msgid "Connected Line Restriction"
3222 msgstr "Restricción de línea conectada"
3223
3224+#: src/qml/DialerPage/DialerPage.qml:41
3225 #: src/qml/ContactsPage/ContactsPage.qml:29
3226-#: src/qml/DialerPage/DialerPage.qml:41
3227 msgid "Contacts"
3228 msgstr "Contactos"
3229
3230-#: src/qml/HistoryPage/CallLogContactDelegate.qml:51
3231-msgid "Create new contact"
3232-msgstr "Crear contacto nuevo"
3233-
3234 #: src/qml/DialerPage/Keypad.qml:67
3235 msgid "DEF"
3236 msgstr "DEF"
3237
3238-#: src/qml/HistoryPage/HistoryPage.qml:69
3239+#: src/qml/HistoryPage/HistoryPage.qml:256
3240 msgid "Delete"
3241 msgstr "Eliminar"
3242
3243+#: src/qml/HistoryPage/HistoryPage.qml:263
3244+msgid "Details"
3245+msgstr ""
3246+
3247 #: src/dialer-app.desktop.in:3
3248 msgid "Dialer"
3249 msgstr "Marcador"
3250@@ -180,7 +161,7 @@
3251 msgid "Dismiss"
3252 msgstr "Ignorar"
3253
3254-#: src/qml/DialerPage/DialerPage.qml:132
3255+#: src/qml/DialerPage/DialerPage.qml:146
3256 msgid "Enter a number"
3257 msgstr "Escriba un número"
3258
3259@@ -196,9 +177,9 @@
3260 msgid "Hangup"
3261 msgstr "Colgar"
3262
3263-#: src/qml/HistoryPage/CallLogContactDelegate.qml:39
3264-msgid "How do you want to save the contact?"
3265-msgstr "¿Cómo quiere guardar el contacto?"
3266+#: src/qml/HistoryPage/HistoryDelegate.qml:55
3267+msgid "Incoming"
3268+msgstr ""
3269
3270 #: src/qml/dialer-app.qml:237
3271 msgid "Invalid USSD code"
3272@@ -220,10 +201,19 @@
3273 msgid "Merge calls"
3274 msgstr "Combinar llamadas"
3275
3276-#: src/qml/LiveCallPage/LiveCall.qml:75
3277-msgid "New call"
3278+#: src/qml/HistoryPage/HistoryDelegate.qml:53
3279+msgid "Missed"
3280+msgstr ""
3281+
3282+#: src/qml/LiveCallPage/LiveCall.qml:62
3283+#, fuzzy
3284+msgid "New Call"
3285 msgstr "Llamada nueva"
3286
3287+#: src/qml/HistoryPage/HistoryDelegate.qml:57
3288+msgid "Outgoing"
3289+msgstr ""
3290+
3291 #: src/qml/DialerPage/Keypad.qml:107
3292 msgid "PQRS"
3293 msgstr "PQRS"
3294@@ -236,13 +226,17 @@
3295 msgid "Private"
3296 msgstr "Privado"
3297
3298-#: src/qml/HistoryPage/CallLogContactDelegate.qml:38
3299-#: src/qml/HistoryPage/CallLogContactDelegate.qml:127
3300-msgid "Save contact"
3301-msgstr "Guardar contacto"
3302-
3303-#: src/qml/HistoryPage/CallLogContactDelegate.qml:117
3304-msgid "Send text message"
3305+#: src/qml/DialerPage/DialerPage.qml:76 src/qml/HistoryPage/HistoryPage.qml:43
3306+msgid "Recent"
3307+msgstr ""
3308+
3309+#: src/qml/HistoryPage/HistoryPage.qml:43
3310+msgid "Select"
3311+msgstr ""
3312+
3313+#: src/qml/HistoryPage/HistoryPage.qml:274
3314+#, fuzzy
3315+msgid "Send message"
3316 msgstr "Enviar mensaje de texto"
3317
3318 #: src/qml/DialerPage/Keypad.qml:117
3319@@ -253,17 +247,14 @@
3320 msgid "Today"
3321 msgstr "Hoy"
3322
3323-#: src/qml/LiveCallPage/LiveCall.qml:47
3324-msgid "Two Calls"
3325-msgstr "Dos llamadas"
3326-
3327-#: src/qml/HistoryPage/HistoryDelegate.qml:139
3328-msgid "Unknown"
3329-msgstr "Desconocido"
3330-
3331-#: src/qml/HistoryPage/CallLogContactDelegate.qml:127
3332-msgid "View contact"
3333-msgstr "Ver contacto"
3334+#: src/qml/ContactsPage/ContactsPage.qml:46
3335+msgid "Type a name or phone to search"
3336+msgstr ""
3337+
3338+#: src/qml/DialerPage/KeypadEntry.qml:54
3339+#: src/qml/HistoryPage/HistoryDelegate.qml:163
3340+msgid "US"
3341+msgstr ""
3342
3343 #: src/qml/LiveCallPage/MultiCallDisplay.qml:116
3344 msgid "Voicemail"
3345@@ -277,8 +268,8 @@
3346 msgid "Yesterday"
3347 msgstr "Ayer"
3348
3349+#: src/qml/LiveCallPage/ConferenceCallDisplay.qml:128
3350 #: src/qml/LiveCallPage/MultiCallDisplay.qml:138
3351-#: src/qml/LiveCallPage/ConferenceCallDisplay.qml:128
3352 msgid "active"
3353 msgstr "activa"
3354
3355@@ -287,7 +278,40 @@
3356 msgid "calling"
3357 msgstr "llamando"
3358
3359+#: src/qml/LiveCallPage/ConferenceCallDisplay.qml:128
3360 #: src/qml/LiveCallPage/MultiCallDisplay.qml:136
3361-#: src/qml/LiveCallPage/ConferenceCallDisplay.qml:128
3362 msgid "on hold"
3363 msgstr "en espera"
3364+
3365+#~ msgid "Add Contact"
3366+#~ msgstr "Añadir contacto"
3367+
3368+#~ msgid "Add to existing contact"
3369+#~ msgstr "Añadir a contacto existente"
3370+
3371+#~ msgid "Call log"
3372+#~ msgstr "Lista de llamadas"
3373+
3374+#~ msgid "Call now"
3375+#~ msgstr "Llamar ahora"
3376+
3377+#~ msgid "Cancel"
3378+#~ msgstr "Cancelar"
3379+
3380+#~ msgid "Create new contact"
3381+#~ msgstr "Crear contacto nuevo"
3382+
3383+#~ msgid "How do you want to save the contact?"
3384+#~ msgstr "¿Cómo quiere guardar el contacto?"
3385+
3386+#~ msgid "Save contact"
3387+#~ msgstr "Guardar contacto"
3388+
3389+#~ msgid "Two Calls"
3390+#~ msgstr "Dos llamadas"
3391+
3392+#~ msgid "Unknown"
3393+#~ msgstr "Desconocido"
3394+
3395+#~ msgid "View contact"
3396+#~ msgstr "Ver contacto"
3397
3398=== modified file 'po/eu.po'
3399--- po/eu.po 2014-07-09 06:37:39 +0000
3400+++ po/eu.po 2014-07-12 12:27:17 +0000
3401@@ -6,11 +6,12 @@
3402 msgid ""
3403 msgstr ""
3404 "Project-Id-Version: dialer-app\n"
3405-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
3406-"POT-Creation-Date: 2014-05-09 15:20-0300\n"
3407+"Report-Msgid-Bugs-To: \n"
3408+"POT-Creation-Date: 2014-07-12 09:22-0300\n"
3409 "PO-Revision-Date: 2014-07-08 12:09+0000\n"
3410 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
3411 "Language-Team: Basque <eu@li.org>\n"
3412+"Language: eu\n"
3413 "MIME-Version: 1.0\n"
3414 "Content-Type: text/plain; charset=UTF-8\n"
3415 "Content-Transfer-Encoding: 8bit\n"
3416@@ -95,14 +96,6 @@
3417 msgid "ABC"
3418 msgstr "ABC"
3419
3420-#: src/qml/HistoryPage/CallLogContactDelegate.qml:73
3421-msgid "Add Contact"
3422-msgstr "Gehitu kontaktua"
3423-
3424-#: src/qml/HistoryPage/CallLogContactDelegate.qml:42
3425-msgid "Add to existing contact"
3426-msgstr "Gehitu existitzen den kontaktura"
3427-
3428 #: src/qml/dialer-app.qml:309
3429 msgid "Call Barring"
3430 msgstr "Dei-murrizketa"
3431@@ -115,14 +108,6 @@
3432 msgid "Call Waiting"
3433 msgstr "Dei-itxarotea"
3434
3435-#: src/qml/MainPage.qml:56
3436-msgid "Call log"
3437-msgstr ""
3438-
3439-#: src/qml/HistoryPage/CallLogContactDelegate.qml:107
3440-msgid "Call now"
3441-msgstr "Deitu orain"
3442-
3443 #: src/qml/dialer-app.qml:342
3444 msgid "Calling Line Presentation"
3445 msgstr ""
3446@@ -131,10 +116,6 @@
3447 msgid "Calling Line Restriction"
3448 msgstr ""
3449
3450-#: src/qml/HistoryPage/CallLogContactDelegate.qml:60
3451-msgid "Cancel"
3452-msgstr "Utzi"
3453-
3454 #: src/qml/LiveCallPage/MultiCallDisplay.qml:114
3455 msgid "Conference"
3456 msgstr "Konferentzia"
3457@@ -147,23 +128,23 @@
3458 msgid "Connected Line Restriction"
3459 msgstr ""
3460
3461+#: src/qml/DialerPage/DialerPage.qml:41
3462 #: src/qml/ContactsPage/ContactsPage.qml:29
3463-#: src/qml/DialerPage/DialerPage.qml:41
3464 msgid "Contacts"
3465 msgstr "Kontaktuak"
3466
3467-#: src/qml/HistoryPage/CallLogContactDelegate.qml:51
3468-msgid "Create new contact"
3469-msgstr "Sortu kontaktu berria"
3470-
3471 #: src/qml/DialerPage/Keypad.qml:67
3472 msgid "DEF"
3473 msgstr "DEF"
3474
3475-#: src/qml/HistoryPage/HistoryPage.qml:69
3476+#: src/qml/HistoryPage/HistoryPage.qml:256
3477 msgid "Delete"
3478 msgstr ""
3479
3480+#: src/qml/HistoryPage/HistoryPage.qml:263
3481+msgid "Details"
3482+msgstr ""
3483+
3484 #: src/dialer-app.desktop.in:3
3485 msgid "Dialer"
3486 msgstr "Markatzailea"
3487@@ -180,7 +161,7 @@
3488 msgid "Dismiss"
3489 msgstr "Baztertu"
3490
3491-#: src/qml/DialerPage/DialerPage.qml:132
3492+#: src/qml/DialerPage/DialerPage.qml:146
3493 msgid "Enter a number"
3494 msgstr "Sartu zenbakia"
3495
3496@@ -196,8 +177,8 @@
3497 msgid "Hangup"
3498 msgstr "Eseki"
3499
3500-#: src/qml/HistoryPage/CallLogContactDelegate.qml:39
3501-msgid "How do you want to save the contact?"
3502+#: src/qml/HistoryPage/HistoryDelegate.qml:55
3503+msgid "Incoming"
3504 msgstr ""
3505
3506 #: src/qml/dialer-app.qml:237
3507@@ -220,8 +201,16 @@
3508 msgid "Merge calls"
3509 msgstr ""
3510
3511-#: src/qml/LiveCallPage/LiveCall.qml:75
3512-msgid "New call"
3513+#: src/qml/HistoryPage/HistoryDelegate.qml:53
3514+msgid "Missed"
3515+msgstr ""
3516+
3517+#: src/qml/LiveCallPage/LiveCall.qml:62
3518+msgid "New Call"
3519+msgstr ""
3520+
3521+#: src/qml/HistoryPage/HistoryDelegate.qml:57
3522+msgid "Outgoing"
3523 msgstr ""
3524
3525 #: src/qml/DialerPage/Keypad.qml:107
3526@@ -236,13 +225,16 @@
3527 msgid "Private"
3528 msgstr ""
3529
3530-#: src/qml/HistoryPage/CallLogContactDelegate.qml:38
3531-#: src/qml/HistoryPage/CallLogContactDelegate.qml:127
3532-msgid "Save contact"
3533-msgstr ""
3534-
3535-#: src/qml/HistoryPage/CallLogContactDelegate.qml:117
3536-msgid "Send text message"
3537+#: src/qml/DialerPage/DialerPage.qml:76 src/qml/HistoryPage/HistoryPage.qml:43
3538+msgid "Recent"
3539+msgstr ""
3540+
3541+#: src/qml/HistoryPage/HistoryPage.qml:43
3542+msgid "Select"
3543+msgstr ""
3544+
3545+#: src/qml/HistoryPage/HistoryPage.qml:274
3546+msgid "Send message"
3547 msgstr ""
3548
3549 #: src/qml/DialerPage/Keypad.qml:117
3550@@ -253,16 +245,13 @@
3551 msgid "Today"
3552 msgstr ""
3553
3554-#: src/qml/LiveCallPage/LiveCall.qml:47
3555-msgid "Two Calls"
3556-msgstr ""
3557-
3558-#: src/qml/HistoryPage/HistoryDelegate.qml:139
3559-msgid "Unknown"
3560-msgstr ""
3561-
3562-#: src/qml/HistoryPage/CallLogContactDelegate.qml:127
3563-msgid "View contact"
3564+#: src/qml/ContactsPage/ContactsPage.qml:46
3565+msgid "Type a name or phone to search"
3566+msgstr ""
3567+
3568+#: src/qml/DialerPage/KeypadEntry.qml:54
3569+#: src/qml/HistoryPage/HistoryDelegate.qml:163
3570+msgid "US"
3571 msgstr ""
3572
3573 #: src/qml/LiveCallPage/MultiCallDisplay.qml:116
3574@@ -277,8 +266,8 @@
3575 msgid "Yesterday"
3576 msgstr ""
3577
3578+#: src/qml/LiveCallPage/ConferenceCallDisplay.qml:128
3579 #: src/qml/LiveCallPage/MultiCallDisplay.qml:138
3580-#: src/qml/LiveCallPage/ConferenceCallDisplay.qml:128
3581 msgid "active"
3582 msgstr ""
3583
3584@@ -287,7 +276,22 @@
3585 msgid "calling"
3586 msgstr ""
3587
3588+#: src/qml/LiveCallPage/ConferenceCallDisplay.qml:128
3589 #: src/qml/LiveCallPage/MultiCallDisplay.qml:136
3590-#: src/qml/LiveCallPage/ConferenceCallDisplay.qml:128
3591 msgid "on hold"
3592 msgstr ""
3593+
3594+#~ msgid "Add Contact"
3595+#~ msgstr "Gehitu kontaktua"
3596+
3597+#~ msgid "Add to existing contact"
3598+#~ msgstr "Gehitu existitzen den kontaktura"
3599+
3600+#~ msgid "Call now"
3601+#~ msgstr "Deitu orain"
3602+
3603+#~ msgid "Cancel"
3604+#~ msgstr "Utzi"
3605+
3606+#~ msgid "Create new contact"
3607+#~ msgstr "Sortu kontaktu berria"
3608
3609=== modified file 'po/fa.po'
3610--- po/fa.po 2014-05-17 07:15:32 +0000
3611+++ po/fa.po 2014-07-12 12:27:17 +0000
3612@@ -6,11 +6,12 @@
3613 msgid ""
3614 msgstr ""
3615 "Project-Id-Version: dialer-app\n"
3616-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
3617-"POT-Creation-Date: 2014-05-09 15:20-0300\n"
3618+"Report-Msgid-Bugs-To: \n"
3619+"POT-Creation-Date: 2014-07-12 09:22-0300\n"
3620 "PO-Revision-Date: 2013-10-03 08:31+0000\n"
3621 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
3622 "Language-Team: Persian <fa@li.org>\n"
3623+"Language: fa\n"
3624 "MIME-Version: 1.0\n"
3625 "Content-Type: text/plain; charset=UTF-8\n"
3626 "Content-Transfer-Encoding: 8bit\n"
3627@@ -18,7 +19,7 @@
3628 "X-Launchpad-Export-Date: 2014-05-17 07:15+0000\n"
3629 "X-Generator: Launchpad (build 17007)\n"
3630
3631-#: src/qml/DialerPage/Keypad.qml:202
3632+#: src/qml/DialerPage/Keypad.qml:161
3633 msgid "#"
3634 msgstr ""
3635
3636@@ -43,127 +44,107 @@
3637 msgstr[0] ""
3638 msgstr[1] ""
3639
3640-#: src/qml/DialerPage/Keypad.qml:179
3641+#: src/qml/DialerPage/Keypad.qml:138
3642 msgid "*"
3643 msgstr ""
3644
3645-#: src/qml/DialerPage/Keypad.qml:189
3646+#: src/qml/DialerPage/Keypad.qml:148
3647 msgid "+"
3648 msgstr ""
3649
3650-#: src/qml/DialerPage/Keypad.qml:188
3651+#: src/qml/DialerPage/Keypad.qml:147
3652 msgid "0"
3653 msgstr ""
3654
3655-#: src/qml/DialerPage/Keypad.qml:86
3656+#: src/qml/DialerPage/Keypad.qml:45
3657 msgid "1"
3658 msgstr ""
3659
3660-#: src/qml/DialerPage/Keypad.qml:97
3661+#: src/qml/DialerPage/Keypad.qml:56
3662 msgid "2"
3663 msgstr ""
3664
3665-#: src/qml/DialerPage/Keypad.qml:107
3666+#: src/qml/DialerPage/Keypad.qml:66
3667 msgid "3"
3668 msgstr ""
3669
3670-#: src/qml/DialerPage/Keypad.qml:117
3671+#: src/qml/DialerPage/Keypad.qml:76
3672 msgid "4"
3673 msgstr ""
3674
3675-#: src/qml/DialerPage/Keypad.qml:127
3676+#: src/qml/DialerPage/Keypad.qml:86
3677 msgid "5"
3678 msgstr ""
3679
3680-#: src/qml/DialerPage/Keypad.qml:137
3681+#: src/qml/DialerPage/Keypad.qml:96
3682 msgid "6"
3683 msgstr ""
3684
3685-#: src/qml/DialerPage/Keypad.qml:147
3686+#: src/qml/DialerPage/Keypad.qml:106
3687 msgid "7"
3688 msgstr ""
3689
3690-#: src/qml/DialerPage/Keypad.qml:157
3691+#: src/qml/DialerPage/Keypad.qml:116
3692 msgid "8"
3693 msgstr ""
3694
3695-#: src/qml/DialerPage/Keypad.qml:167
3696+#: src/qml/DialerPage/Keypad.qml:126
3697 msgid "9"
3698 msgstr ""
3699
3700-#: src/qml/DialerPage/Keypad.qml:98
3701+#: src/qml/DialerPage/Keypad.qml:57
3702 msgid "ABC"
3703 msgstr ""
3704
3705-#: src/qml/HistoryPage/CallLogContactDelegate.qml:80
3706-msgid "Add Contact"
3707-msgstr ""
3708-
3709-#: src/qml/HistoryPage/CallLogContactDelegate.qml:42
3710-msgid "Add to existing contact"
3711-msgstr ""
3712-
3713-#: src/qml/dialer-app.qml:207
3714+#: src/qml/dialer-app.qml:309
3715 msgid "Call Barring"
3716 msgstr ""
3717
3718-#: src/qml/dialer-app.qml:218
3719+#: src/qml/dialer-app.qml:320
3720 msgid "Call Forwarding"
3721 msgstr ""
3722
3723-#: src/qml/dialer-app.qml:229
3724+#: src/qml/dialer-app.qml:331
3725 msgid "Call Waiting"
3726 msgstr ""
3727
3728-#: src/qml/MainPage.qml:56
3729-msgid "Call log"
3730-msgstr ""
3731-
3732-#: src/qml/HistoryPage/CallLogContactDelegate.qml:114
3733-msgid "Call now"
3734-msgstr ""
3735-
3736-#: src/qml/dialer-app.qml:240
3737+#: src/qml/dialer-app.qml:342
3738 msgid "Calling Line Presentation"
3739 msgstr ""
3740
3741-#: src/qml/dialer-app.qml:252
3742+#: src/qml/dialer-app.qml:354
3743 msgid "Calling Line Restriction"
3744 msgstr ""
3745
3746-#: src/qml/HistoryPage/CallLogContactDelegate.qml:60
3747-msgid "Cancel"
3748-msgstr ""
3749-
3750-#: src/qml/LiveCallPage/LiveCall.qml:49
3751 #: src/qml/LiveCallPage/MultiCallDisplay.qml:114
3752 msgid "Conference"
3753 msgstr ""
3754
3755-#: src/qml/dialer-app.qml:246
3756+#: src/qml/dialer-app.qml:348
3757 msgid "Connected Line Presentation"
3758 msgstr ""
3759
3760-#: src/qml/dialer-app.qml:258
3761+#: src/qml/dialer-app.qml:360
3762 msgid "Connected Line Restriction"
3763 msgstr ""
3764
3765-#: src/qml/MainPage.qml:45
3766+#: src/qml/DialerPage/DialerPage.qml:41
3767+#: src/qml/ContactsPage/ContactsPage.qml:29
3768 msgid "Contacts"
3769 msgstr ""
3770
3771-#: src/qml/HistoryPage/CallLogContactDelegate.qml:51
3772-msgid "Create new contact"
3773-msgstr ""
3774-
3775-#: src/qml/DialerPage/Keypad.qml:108
3776+#: src/qml/DialerPage/Keypad.qml:67
3777 msgid "DEF"
3778 msgstr ""
3779
3780-#: src/qml/HistoryPage/HistoryPage.qml:69
3781+#: src/qml/HistoryPage/HistoryPage.qml:256
3782 msgid "Delete"
3783 msgstr ""
3784
3785+#: src/qml/HistoryPage/HistoryPage.qml:263
3786+msgid "Details"
3787+msgstr ""
3788+
3789 #: src/dialer-app.desktop.in:3
3790 msgid "Dialer"
3791 msgstr ""
3792@@ -176,19 +157,19 @@
3793 msgid "Dialer application"
3794 msgstr ""
3795
3796-#: src/qml/dialer-app.qml:143 src/qml/dialer-app.qml:157
3797+#: src/qml/dialer-app.qml:239 src/qml/dialer-app.qml:253
3798 msgid "Dismiss"
3799 msgstr ""
3800
3801-#: src/qml/DialerPage/DialerPage.qml:79
3802+#: src/qml/DialerPage/DialerPage.qml:146
3803 msgid "Enter a number"
3804 msgstr ""
3805
3806-#: src/qml/dialer-app.qml:140
3807+#: src/qml/dialer-app.qml:236
3808 msgid "Error"
3809 msgstr ""
3810
3811-#: src/qml/DialerPage/Keypad.qml:118
3812+#: src/qml/DialerPage/Keypad.qml:77
3813 msgid "GHI"
3814 msgstr ""
3815
3816@@ -196,23 +177,23 @@
3817 msgid "Hangup"
3818 msgstr ""
3819
3820-#: src/qml/HistoryPage/CallLogContactDelegate.qml:39
3821-msgid "How do you want to save the contact?"
3822+#: src/qml/HistoryPage/HistoryDelegate.qml:55
3823+msgid "Incoming"
3824 msgstr ""
3825
3826-#: src/qml/dialer-app.qml:141
3827+#: src/qml/dialer-app.qml:237
3828 msgid "Invalid USSD code"
3829 msgstr ""
3830
3831-#: src/qml/DialerPage/Keypad.qml:128
3832+#: src/qml/DialerPage/Keypad.qml:87
3833 msgid "JKL"
3834 msgstr ""
3835
3836-#: src/qml/MainPage.qml:35
3837+#: src/qml/DialerPage/DialerPage.qml:52
3838 msgid "Keypad"
3839 msgstr ""
3840
3841-#: src/qml/DialerPage/Keypad.qml:138
3842+#: src/qml/DialerPage/Keypad.qml:97
3843 msgid "MNO"
3844 msgstr ""
3845
3846@@ -220,15 +201,23 @@
3847 msgid "Merge calls"
3848 msgstr ""
3849
3850-#: src/qml/LiveCallPage/LiveCall.qml:75
3851-msgid "New call"
3852-msgstr ""
3853-
3854-#: src/qml/DialerPage/Keypad.qml:148
3855+#: src/qml/HistoryPage/HistoryDelegate.qml:53
3856+msgid "Missed"
3857+msgstr ""
3858+
3859+#: src/qml/LiveCallPage/LiveCall.qml:62
3860+msgid "New Call"
3861+msgstr ""
3862+
3863+#: src/qml/HistoryPage/HistoryDelegate.qml:57
3864+msgid "Outgoing"
3865+msgstr ""
3866+
3867+#: src/qml/DialerPage/Keypad.qml:107
3868 msgid "PQRS"
3869 msgstr ""
3870
3871-#: src/qml/dialer-app.qml:121
3872+#: src/qml/dialer-app.qml:217
3873 msgid "Please wait"
3874 msgstr ""
3875
3876@@ -236,16 +225,19 @@
3877 msgid "Private"
3878 msgstr ""
3879
3880-#: src/qml/HistoryPage/CallLogContactDelegate.qml:38
3881-#: src/qml/HistoryPage/CallLogContactDelegate.qml:134
3882-msgid "Save contact"
3883-msgstr ""
3884-
3885-#: src/qml/HistoryPage/CallLogContactDelegate.qml:124
3886-msgid "Send text message"
3887-msgstr ""
3888-
3889-#: src/qml/DialerPage/Keypad.qml:158
3890+#: src/qml/DialerPage/DialerPage.qml:76 src/qml/HistoryPage/HistoryPage.qml:43
3891+msgid "Recent"
3892+msgstr ""
3893+
3894+#: src/qml/HistoryPage/HistoryPage.qml:43
3895+msgid "Select"
3896+msgstr ""
3897+
3898+#: src/qml/HistoryPage/HistoryPage.qml:274
3899+msgid "Send message"
3900+msgstr ""
3901+
3902+#: src/qml/DialerPage/Keypad.qml:117
3903 msgid "TUV"
3904 msgstr ""
3905
3906@@ -253,23 +245,20 @@
3907 msgid "Today"
3908 msgstr ""
3909
3910-#: src/qml/LiveCallPage/LiveCall.qml:47
3911-msgid "Two Calls"
3912-msgstr ""
3913-
3914-#: src/qml/HistoryPage/HistoryDelegate.qml:139
3915-msgid "Unknown"
3916-msgstr ""
3917-
3918-#: src/qml/HistoryPage/CallLogContactDelegate.qml:134
3919-msgid "View contact"
3920+#: src/qml/ContactsPage/ContactsPage.qml:46
3921+msgid "Type a name or phone to search"
3922+msgstr ""
3923+
3924+#: src/qml/DialerPage/KeypadEntry.qml:54
3925+#: src/qml/HistoryPage/HistoryDelegate.qml:163
3926+msgid "US"
3927 msgstr ""
3928
3929 #: src/qml/LiveCallPage/MultiCallDisplay.qml:116
3930 msgid "Voicemail"
3931 msgstr ""
3932
3933-#: src/qml/DialerPage/Keypad.qml:168
3934+#: src/qml/DialerPage/Keypad.qml:127
3935 msgid "WXYZ"
3936 msgstr ""
3937
3938@@ -277,17 +266,17 @@
3939 msgid "Yesterday"
3940 msgstr ""
3941
3942+#: src/qml/LiveCallPage/ConferenceCallDisplay.qml:128
3943 #: src/qml/LiveCallPage/MultiCallDisplay.qml:138
3944-#: src/qml/LiveCallPage/ConferenceCallDisplay.qml:128
3945 msgid "active"
3946 msgstr ""
3947
3948-#: src/qml/LiveCallPage/LiveCall.qml:409
3949+#: src/qml/LiveCallPage/LiveCall.qml:244
3950 #: src/qml/LiveCallPage/MultiCallDisplay.qml:134
3951 msgid "calling"
3952 msgstr ""
3953
3954+#: src/qml/LiveCallPage/ConferenceCallDisplay.qml:128
3955 #: src/qml/LiveCallPage/MultiCallDisplay.qml:136
3956-#: src/qml/LiveCallPage/ConferenceCallDisplay.qml:128
3957 msgid "on hold"
3958 msgstr ""
3959
3960=== modified file 'po/fi.po'
3961--- po/fi.po 2014-05-17 07:15:32 +0000
3962+++ po/fi.po 2014-07-12 12:27:17 +0000
3963@@ -6,11 +6,12 @@
3964 msgid ""
3965 msgstr ""
3966 "Project-Id-Version: dialer-app\n"
3967-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
3968-"POT-Creation-Date: 2014-05-09 15:20-0300\n"
3969+"Report-Msgid-Bugs-To: \n"
3970+"POT-Creation-Date: 2014-07-12 09:22-0300\n"
3971 "PO-Revision-Date: 2014-05-15 17:30+0000\n"
3972 "Last-Translator: Jiri Grönroos <Unknown>\n"
3973 "Language-Team: Finnish <fi@li.org>\n"
3974+"Language: fi\n"
3975 "MIME-Version: 1.0\n"
3976 "Content-Type: text/plain; charset=UTF-8\n"
3977 "Content-Transfer-Encoding: 8bit\n"
3978@@ -18,7 +19,7 @@
3979 "X-Launchpad-Export-Date: 2014-05-17 07:15+0000\n"
3980 "X-Generator: Launchpad (build 17007)\n"
3981
3982-#: src/qml/DialerPage/Keypad.qml:202
3983+#: src/qml/DialerPage/Keypad.qml:161
3984 msgid "#"
3985 msgstr "#"
3986
3987@@ -43,127 +44,107 @@
3988 msgstr[0] "%1 s"
3989 msgstr[1] "%1 s"
3990
3991-#: src/qml/DialerPage/Keypad.qml:179
3992+#: src/qml/DialerPage/Keypad.qml:138
3993 msgid "*"
3994 msgstr "*"
3995
3996-#: src/qml/DialerPage/Keypad.qml:189
3997+#: src/qml/DialerPage/Keypad.qml:148
3998 msgid "+"
3999 msgstr "+"
4000
4001-#: src/qml/DialerPage/Keypad.qml:188
4002+#: src/qml/DialerPage/Keypad.qml:147
4003 msgid "0"
4004 msgstr "0"
4005
4006-#: src/qml/DialerPage/Keypad.qml:86
4007+#: src/qml/DialerPage/Keypad.qml:45
4008 msgid "1"
4009 msgstr "1"
4010
4011-#: src/qml/DialerPage/Keypad.qml:97
4012+#: src/qml/DialerPage/Keypad.qml:56
4013 msgid "2"
4014 msgstr "2"
4015
4016-#: src/qml/DialerPage/Keypad.qml:107
4017+#: src/qml/DialerPage/Keypad.qml:66
4018 msgid "3"
4019 msgstr "3"
4020
4021-#: src/qml/DialerPage/Keypad.qml:117
4022+#: src/qml/DialerPage/Keypad.qml:76
4023 msgid "4"
4024 msgstr "4"
4025
4026-#: src/qml/DialerPage/Keypad.qml:127
4027+#: src/qml/DialerPage/Keypad.qml:86
4028 msgid "5"
4029 msgstr "5"
4030
4031-#: src/qml/DialerPage/Keypad.qml:137
4032+#: src/qml/DialerPage/Keypad.qml:96
4033 msgid "6"
4034 msgstr "6"
4035
4036-#: src/qml/DialerPage/Keypad.qml:147
4037+#: src/qml/DialerPage/Keypad.qml:106
4038 msgid "7"
4039 msgstr "7"
4040
4041-#: src/qml/DialerPage/Keypad.qml:157
4042+#: src/qml/DialerPage/Keypad.qml:116
4043 msgid "8"
4044 msgstr "8"
4045
4046-#: src/qml/DialerPage/Keypad.qml:167
4047+#: src/qml/DialerPage/Keypad.qml:126
4048 msgid "9"
4049 msgstr "9"
4050
4051-#: src/qml/DialerPage/Keypad.qml:98
4052+#: src/qml/DialerPage/Keypad.qml:57
4053 msgid "ABC"
4054 msgstr "ABC"
4055
4056-#: src/qml/HistoryPage/CallLogContactDelegate.qml:80
4057-msgid "Add Contact"
4058-msgstr "Lisää yhteystieto"
4059-
4060-#: src/qml/HistoryPage/CallLogContactDelegate.qml:42
4061-msgid "Add to existing contact"
4062-msgstr "Lisää olemassa olevaan yhteystietoon"
4063-
4064-#: src/qml/dialer-app.qml:207
4065+#: src/qml/dialer-app.qml:309
4066 msgid "Call Barring"
4067 msgstr "Puhelurajoitus"
4068
4069-#: src/qml/dialer-app.qml:218
4070+#: src/qml/dialer-app.qml:320
4071 msgid "Call Forwarding"
4072 msgstr "Puhelunohjaus"
4073
4074-#: src/qml/dialer-app.qml:229
4075+#: src/qml/dialer-app.qml:331
4076 msgid "Call Waiting"
4077 msgstr "Koputus"
4078
4079-#: src/qml/MainPage.qml:56
4080-msgid "Call log"
4081-msgstr "Puheluloki"
4082-
4083-#: src/qml/HistoryPage/CallLogContactDelegate.qml:114
4084-msgid "Call now"
4085-msgstr "Soita nyt"
4086-
4087-#: src/qml/dialer-app.qml:240
4088+#: src/qml/dialer-app.qml:342
4089 msgid "Calling Line Presentation"
4090 msgstr ""
4091
4092-#: src/qml/dialer-app.qml:252
4093+#: src/qml/dialer-app.qml:354
4094 msgid "Calling Line Restriction"
4095 msgstr ""
4096
4097-#: src/qml/HistoryPage/CallLogContactDelegate.qml:60
4098-msgid "Cancel"
4099-msgstr "Peru"
4100-
4101-#: src/qml/LiveCallPage/LiveCall.qml:49
4102 #: src/qml/LiveCallPage/MultiCallDisplay.qml:114
4103 msgid "Conference"
4104 msgstr "Ryhmäpuhelu"
4105
4106-#: src/qml/dialer-app.qml:246
4107+#: src/qml/dialer-app.qml:348
4108 msgid "Connected Line Presentation"
4109 msgstr ""
4110
4111-#: src/qml/dialer-app.qml:258
4112+#: src/qml/dialer-app.qml:360
4113 msgid "Connected Line Restriction"
4114 msgstr ""
4115
4116-#: src/qml/MainPage.qml:45
4117+#: src/qml/DialerPage/DialerPage.qml:41
4118+#: src/qml/ContactsPage/ContactsPage.qml:29
4119 msgid "Contacts"
4120 msgstr "Yhteystiedot"
4121
4122-#: src/qml/HistoryPage/CallLogContactDelegate.qml:51
4123-msgid "Create new contact"
4124-msgstr "Luo uusi yhteystieto"
4125-
4126-#: src/qml/DialerPage/Keypad.qml:108
4127+#: src/qml/DialerPage/Keypad.qml:67
4128 msgid "DEF"
4129 msgstr "DEF"
4130
4131-#: src/qml/HistoryPage/HistoryPage.qml:69
4132+#: src/qml/HistoryPage/HistoryPage.qml:256
4133 msgid "Delete"
4134 msgstr "Poista"
4135
4136+#: src/qml/HistoryPage/HistoryPage.qml:263
4137+msgid "Details"
4138+msgstr ""
4139+
4140 #: src/dialer-app.desktop.in:3
4141 msgid "Dialer"
4142 msgstr "Puhelin"
4143@@ -176,19 +157,19 @@
4144 msgid "Dialer application"
4145 msgstr "Puhelinsovellus"
4146
4147-#: src/qml/dialer-app.qml:143 src/qml/dialer-app.qml:157
4148+#: src/qml/dialer-app.qml:239 src/qml/dialer-app.qml:253
4149 msgid "Dismiss"
4150 msgstr "Hylkää"
4151
4152-#: src/qml/DialerPage/DialerPage.qml:79
4153+#: src/qml/DialerPage/DialerPage.qml:146
4154 msgid "Enter a number"
4155 msgstr "Anna numero"
4156
4157-#: src/qml/dialer-app.qml:140
4158+#: src/qml/dialer-app.qml:236
4159 msgid "Error"
4160 msgstr "Virhe"
4161
4162-#: src/qml/DialerPage/Keypad.qml:118
4163+#: src/qml/DialerPage/Keypad.qml:77
4164 msgid "GHI"
4165 msgstr "GHI"
4166
4167@@ -196,23 +177,23 @@
4168 msgid "Hangup"
4169 msgstr "Katkaise"
4170
4171-#: src/qml/HistoryPage/CallLogContactDelegate.qml:39
4172-msgid "How do you want to save the contact?"
4173-msgstr "Miten haluat tallentaa yhteystiedon?"
4174+#: src/qml/HistoryPage/HistoryDelegate.qml:55
4175+msgid "Incoming"
4176+msgstr ""
4177
4178-#: src/qml/dialer-app.qml:141
4179+#: src/qml/dialer-app.qml:237
4180 msgid "Invalid USSD code"
4181 msgstr "Virheellinen USSD-koodi"
4182
4183-#: src/qml/DialerPage/Keypad.qml:128
4184+#: src/qml/DialerPage/Keypad.qml:87
4185 msgid "JKL"
4186 msgstr "JKL"
4187
4188-#: src/qml/MainPage.qml:35
4189+#: src/qml/DialerPage/DialerPage.qml:52
4190 msgid "Keypad"
4191 msgstr "Numeronäppäimistö"
4192
4193-#: src/qml/DialerPage/Keypad.qml:138
4194+#: src/qml/DialerPage/Keypad.qml:97
4195 msgid "MNO"
4196 msgstr "MNO"
4197
4198@@ -220,15 +201,24 @@
4199 msgid "Merge calls"
4200 msgstr "Yhdistä puhelut"
4201
4202-#: src/qml/LiveCallPage/LiveCall.qml:75
4203-msgid "New call"
4204+#: src/qml/HistoryPage/HistoryDelegate.qml:53
4205+msgid "Missed"
4206+msgstr ""
4207+
4208+#: src/qml/LiveCallPage/LiveCall.qml:62
4209+#, fuzzy
4210+msgid "New Call"
4211 msgstr "Uusi puhelu"
4212
4213-#: src/qml/DialerPage/Keypad.qml:148
4214+#: src/qml/HistoryPage/HistoryDelegate.qml:57
4215+msgid "Outgoing"
4216+msgstr ""
4217+
4218+#: src/qml/DialerPage/Keypad.qml:107
4219 msgid "PQRS"
4220 msgstr "PQRS"
4221
4222-#: src/qml/dialer-app.qml:121
4223+#: src/qml/dialer-app.qml:217
4224 msgid "Please wait"
4225 msgstr "Odota hetki"
4226
4227@@ -236,16 +226,20 @@
4228 msgid "Private"
4229 msgstr "Yksityinen"
4230
4231-#: src/qml/HistoryPage/CallLogContactDelegate.qml:38
4232-#: src/qml/HistoryPage/CallLogContactDelegate.qml:134
4233-msgid "Save contact"
4234-msgstr "Tallenna yhteystieto"
4235-
4236-#: src/qml/HistoryPage/CallLogContactDelegate.qml:124
4237-msgid "Send text message"
4238+#: src/qml/DialerPage/DialerPage.qml:76 src/qml/HistoryPage/HistoryPage.qml:43
4239+msgid "Recent"
4240+msgstr ""
4241+
4242+#: src/qml/HistoryPage/HistoryPage.qml:43
4243+msgid "Select"
4244+msgstr ""
4245+
4246+#: src/qml/HistoryPage/HistoryPage.qml:274
4247+#, fuzzy
4248+msgid "Send message"
4249 msgstr "Lähetä tekstiviesti"
4250
4251-#: src/qml/DialerPage/Keypad.qml:158
4252+#: src/qml/DialerPage/Keypad.qml:117
4253 msgid "TUV"
4254 msgstr "TUV"
4255
4256@@ -253,23 +247,20 @@
4257 msgid "Today"
4258 msgstr "Tänään"
4259
4260-#: src/qml/LiveCallPage/LiveCall.qml:47
4261-msgid "Two Calls"
4262-msgstr "Kaksi puhelua"
4263-
4264-#: src/qml/HistoryPage/HistoryDelegate.qml:139
4265-msgid "Unknown"
4266-msgstr "Tuntematon"
4267-
4268-#: src/qml/HistoryPage/CallLogContactDelegate.qml:134
4269-msgid "View contact"
4270-msgstr "Näytä yhteystieto"
4271+#: src/qml/ContactsPage/ContactsPage.qml:46
4272+msgid "Type a name or phone to search"
4273+msgstr ""
4274+
4275+#: src/qml/DialerPage/KeypadEntry.qml:54
4276+#: src/qml/HistoryPage/HistoryDelegate.qml:163
4277+msgid "US"
4278+msgstr ""
4279
4280 #: src/qml/LiveCallPage/MultiCallDisplay.qml:116
4281 msgid "Voicemail"
4282 msgstr "Vastaaja"
4283
4284-#: src/qml/DialerPage/Keypad.qml:168
4285+#: src/qml/DialerPage/Keypad.qml:127
4286 msgid "WXYZ"
4287 msgstr "WXYZ"
4288
4289@@ -277,17 +268,50 @@
4290 msgid "Yesterday"
4291 msgstr "Eilen"
4292
4293+#: src/qml/LiveCallPage/ConferenceCallDisplay.qml:128
4294 #: src/qml/LiveCallPage/MultiCallDisplay.qml:138
4295-#: src/qml/LiveCallPage/ConferenceCallDisplay.qml:128
4296 msgid "active"
4297 msgstr "aktiivisena"
4298
4299-#: src/qml/LiveCallPage/LiveCall.qml:409
4300+#: src/qml/LiveCallPage/LiveCall.qml:244
4301 #: src/qml/LiveCallPage/MultiCallDisplay.qml:134
4302 msgid "calling"
4303 msgstr "soitetaan"
4304
4305+#: src/qml/LiveCallPage/ConferenceCallDisplay.qml:128
4306 #: src/qml/LiveCallPage/MultiCallDisplay.qml:136
4307-#: src/qml/LiveCallPage/ConferenceCallDisplay.qml:128
4308 msgid "on hold"
4309 msgstr "pidossa"
4310+
4311+#~ msgid "Add Contact"
4312+#~ msgstr "Lisää yhteystieto"
4313+
4314+#~ msgid "Add to existing contact"
4315+#~ msgstr "Lisää olemassa olevaan yhteystietoon"
4316+
4317+#~ msgid "Call log"
4318+#~ msgstr "Puheluloki"
4319+
4320+#~ msgid "Call now"
4321+#~ msgstr "Soita nyt"
4322+
4323+#~ msgid "Cancel"
4324+#~ msgstr "Peru"
4325+
4326+#~ msgid "Create new contact"
4327+#~ msgstr "Luo uusi yhteystieto"
4328+
4329+#~ msgid "How do you want to save the contact?"
4330+#~ msgstr "Miten haluat tallentaa yhteystiedon?"
4331+
4332+#~ msgid "Save contact"
4333+#~ msgstr "Tallenna yhteystieto"
4334+
4335+#~ msgid "Two Calls"
4336+#~ msgstr "Kaksi puhelua"
4337+
4338+#~ msgid "Unknown"
4339+#~ msgstr "Tuntematon"
4340+
4341+#~ msgid "View contact"
4342+#~ msgstr "Näytä yhteystieto"
4343
4344=== modified file 'po/fr.po'
4345--- po/fr.po 2014-05-24 06:52:15 +0000
4346+++ po/fr.po 2014-07-12 12:27:17 +0000
4347@@ -6,11 +6,12 @@
4348 msgid ""
4349 msgstr ""
4350 "Project-Id-Version: dialer-app\n"
4351-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
4352-"POT-Creation-Date: 2014-05-09 15:20-0300\n"
4353+"Report-Msgid-Bugs-To: \n"
4354+"POT-Creation-Date: 2014-07-12 09:22-0300\n"
4355 "PO-Revision-Date: 2014-05-23 18:46+0000\n"
4356 "Last-Translator: Anne <anneonyme017@gmail.com>\n"
4357 "Language-Team: French <fr@li.org>\n"
4358+"Language: fr\n"
4359 "MIME-Version: 1.0\n"
4360 "Content-Type: text/plain; charset=UTF-8\n"
4361 "Content-Transfer-Encoding: 8bit\n"
4362@@ -18,7 +19,7 @@
4363 "X-Launchpad-Export-Date: 2014-05-24 06:52+0000\n"
4364 "X-Generator: Launchpad (build 17017)\n"
4365
4366-#: src/qml/DialerPage/Keypad.qml:202
4367+#: src/qml/DialerPage/Keypad.qml:161
4368 msgid "#"
4369 msgstr "#"
4370
4371@@ -43,127 +44,107 @@
4372 msgstr[0] "%1 s"
4373 msgstr[1] "%1 s"
4374
4375-#: src/qml/DialerPage/Keypad.qml:179
4376+#: src/qml/DialerPage/Keypad.qml:138
4377 msgid "*"
4378 msgstr "*"
4379
4380-#: src/qml/DialerPage/Keypad.qml:189
4381+#: src/qml/DialerPage/Keypad.qml:148
4382 msgid "+"
4383 msgstr "+"
4384
4385-#: src/qml/DialerPage/Keypad.qml:188
4386+#: src/qml/DialerPage/Keypad.qml:147
4387 msgid "0"
4388 msgstr "0"
4389
4390-#: src/qml/DialerPage/Keypad.qml:86
4391+#: src/qml/DialerPage/Keypad.qml:45
4392 msgid "1"
4393 msgstr "1"
4394
4395-#: src/qml/DialerPage/Keypad.qml:97
4396+#: src/qml/DialerPage/Keypad.qml:56
4397 msgid "2"
4398 msgstr "2"
4399
4400-#: src/qml/DialerPage/Keypad.qml:107
4401+#: src/qml/DialerPage/Keypad.qml:66
4402 msgid "3"
4403 msgstr "3"
4404
4405-#: src/qml/DialerPage/Keypad.qml:117
4406+#: src/qml/DialerPage/Keypad.qml:76
4407 msgid "4"
4408 msgstr "4"
4409
4410-#: src/qml/DialerPage/Keypad.qml:127
4411+#: src/qml/DialerPage/Keypad.qml:86
4412 msgid "5"
4413 msgstr "5"
4414
4415-#: src/qml/DialerPage/Keypad.qml:137
4416+#: src/qml/DialerPage/Keypad.qml:96
4417 msgid "6"
4418 msgstr "6"
4419
4420-#: src/qml/DialerPage/Keypad.qml:147
4421+#: src/qml/DialerPage/Keypad.qml:106
4422 msgid "7"
4423 msgstr "7"
4424
4425-#: src/qml/DialerPage/Keypad.qml:157
4426+#: src/qml/DialerPage/Keypad.qml:116
4427 msgid "8"
4428 msgstr "8"
4429
4430-#: src/qml/DialerPage/Keypad.qml:167
4431+#: src/qml/DialerPage/Keypad.qml:126
4432 msgid "9"
4433 msgstr "9"
4434
4435-#: src/qml/DialerPage/Keypad.qml:98
4436+#: src/qml/DialerPage/Keypad.qml:57
4437 msgid "ABC"
4438 msgstr "ABC"
4439
4440-#: src/qml/HistoryPage/CallLogContactDelegate.qml:80
4441-msgid "Add Contact"
4442-msgstr "Ajouter un contact"
4443-
4444-#: src/qml/HistoryPage/CallLogContactDelegate.qml:42
4445-msgid "Add to existing contact"
4446-msgstr "Ajouter à un contact existant"
4447-
4448-#: src/qml/dialer-app.qml:207
4449+#: src/qml/dialer-app.qml:309
4450 msgid "Call Barring"
4451 msgstr "Interdiction d'appel"
4452
4453-#: src/qml/dialer-app.qml:218
4454+#: src/qml/dialer-app.qml:320
4455 msgid "Call Forwarding"
4456 msgstr "Transfert d'appel"
4457
4458-#: src/qml/dialer-app.qml:229
4459+#: src/qml/dialer-app.qml:331
4460 msgid "Call Waiting"
4461 msgstr "Appel en attente"
4462
4463-#: src/qml/MainPage.qml:56
4464-msgid "Call log"
4465-msgstr "Journal d'appels"
4466-
4467-#: src/qml/HistoryPage/CallLogContactDelegate.qml:114
4468-msgid "Call now"
4469-msgstr "Appeler maintenant"
4470-
4471-#: src/qml/dialer-app.qml:240
4472+#: src/qml/dialer-app.qml:342
4473 msgid "Calling Line Presentation"
4474 msgstr "Présentation de la ligne d'appel"
4475
4476-#: src/qml/dialer-app.qml:252
4477+#: src/qml/dialer-app.qml:354
4478 msgid "Calling Line Restriction"
4479 msgstr "Restriction de la ligne d'appel"
4480
4481-#: src/qml/HistoryPage/CallLogContactDelegate.qml:60
4482-msgid "Cancel"
4483-msgstr "Annuler"
4484-
4485-#: src/qml/LiveCallPage/LiveCall.qml:49
4486 #: src/qml/LiveCallPage/MultiCallDisplay.qml:114
4487 msgid "Conference"
4488 msgstr "Conférence"
4489
4490-#: src/qml/dialer-app.qml:246
4491+#: src/qml/dialer-app.qml:348
4492 msgid "Connected Line Presentation"
4493 msgstr "Présentation de la ligne connectée"
4494
4495-#: src/qml/dialer-app.qml:258
4496+#: src/qml/dialer-app.qml:360
4497 msgid "Connected Line Restriction"
4498 msgstr "Restriction de la ligne connectée"
4499
4500-#: src/qml/MainPage.qml:45
4501+#: src/qml/DialerPage/DialerPage.qml:41
4502+#: src/qml/ContactsPage/ContactsPage.qml:29
4503 msgid "Contacts"
4504 msgstr "Contacts"
4505
4506-#: src/qml/HistoryPage/CallLogContactDelegate.qml:51
4507-msgid "Create new contact"
4508-msgstr "Créer un nouveau contact"
4509-
4510-#: src/qml/DialerPage/Keypad.qml:108
4511+#: src/qml/DialerPage/Keypad.qml:67
4512 msgid "DEF"
4513 msgstr "DEF"
4514
4515-#: src/qml/HistoryPage/HistoryPage.qml:69
4516+#: src/qml/HistoryPage/HistoryPage.qml:256
4517 msgid "Delete"
4518 msgstr "Supprimer"
4519
4520+#: src/qml/HistoryPage/HistoryPage.qml:263
4521+msgid "Details"
4522+msgstr ""
4523+
4524 #: src/dialer-app.desktop.in:3
4525 msgid "Dialer"
4526 msgstr "Composeur"
4527@@ -176,19 +157,19 @@
4528 msgid "Dialer application"
4529 msgstr "Application Composeur"
4530
4531-#: src/qml/dialer-app.qml:143 src/qml/dialer-app.qml:157
4532+#: src/qml/dialer-app.qml:239 src/qml/dialer-app.qml:253
4533 msgid "Dismiss"
4534 msgstr "Rejeter"
4535
4536-#: src/qml/DialerPage/DialerPage.qml:79
4537+#: src/qml/DialerPage/DialerPage.qml:146
4538 msgid "Enter a number"
4539 msgstr "Composer un numéro"
4540
4541-#: src/qml/dialer-app.qml:140
4542+#: src/qml/dialer-app.qml:236
4543 msgid "Error"
4544 msgstr "Erreur"
4545
4546-#: src/qml/DialerPage/Keypad.qml:118
4547+#: src/qml/DialerPage/Keypad.qml:77
4548 msgid "GHI"
4549 msgstr "GHI"
4550
4551@@ -196,23 +177,23 @@
4552 msgid "Hangup"
4553 msgstr "Raccrocher"
4554
4555-#: src/qml/HistoryPage/CallLogContactDelegate.qml:39
4556-msgid "How do you want to save the contact?"
4557-msgstr "Comment souhaitez-vous enregistrer le contact ?"
4558+#: src/qml/HistoryPage/HistoryDelegate.qml:55
4559+msgid "Incoming"
4560+msgstr ""
4561
4562-#: src/qml/dialer-app.qml:141
4563+#: src/qml/dialer-app.qml:237
4564 msgid "Invalid USSD code"
4565 msgstr "Code USSD invalide"
4566
4567-#: src/qml/DialerPage/Keypad.qml:128
4568+#: src/qml/DialerPage/Keypad.qml:87
4569 msgid "JKL"
4570 msgstr "JKL"
4571
4572-#: src/qml/MainPage.qml:35
4573+#: src/qml/DialerPage/DialerPage.qml:52
4574 msgid "Keypad"
4575 msgstr "Pavé numérique"
4576
4577-#: src/qml/DialerPage/Keypad.qml:138
4578+#: src/qml/DialerPage/Keypad.qml:97
4579 msgid "MNO"
4580 msgstr "MNO"
4581
4582@@ -220,15 +201,24 @@
4583 msgid "Merge calls"
4584 msgstr "Fusionner les appels"
4585
4586-#: src/qml/LiveCallPage/LiveCall.qml:75
4587-msgid "New call"
4588+#: src/qml/HistoryPage/HistoryDelegate.qml:53
4589+msgid "Missed"
4590+msgstr ""
4591+
4592+#: src/qml/LiveCallPage/LiveCall.qml:62
4593+#, fuzzy
4594+msgid "New Call"
4595 msgstr "Nouvel appel"
4596
4597-#: src/qml/DialerPage/Keypad.qml:148
4598+#: src/qml/HistoryPage/HistoryDelegate.qml:57
4599+msgid "Outgoing"
4600+msgstr ""
4601+
4602+#: src/qml/DialerPage/Keypad.qml:107
4603 msgid "PQRS"
4604 msgstr "PQRS"
4605
4606-#: src/qml/dialer-app.qml:121
4607+#: src/qml/dialer-app.qml:217
4608 msgid "Please wait"
4609 msgstr "Veuillez patienter"
4610
4611@@ -236,16 +226,20 @@
4612 msgid "Private"
4613 msgstr "Privé"
4614
4615-#: src/qml/HistoryPage/CallLogContactDelegate.qml:38
4616-#: src/qml/HistoryPage/CallLogContactDelegate.qml:134
4617-msgid "Save contact"
4618-msgstr "Enregistrer le contact"
4619-
4620-#: src/qml/HistoryPage/CallLogContactDelegate.qml:124
4621-msgid "Send text message"
4622+#: src/qml/DialerPage/DialerPage.qml:76 src/qml/HistoryPage/HistoryPage.qml:43
4623+msgid "Recent"
4624+msgstr ""
4625+
4626+#: src/qml/HistoryPage/HistoryPage.qml:43
4627+msgid "Select"
4628+msgstr ""
4629+
4630+#: src/qml/HistoryPage/HistoryPage.qml:274
4631+#, fuzzy
4632+msgid "Send message"
4633 msgstr "Envoyer un texto"
4634
4635-#: src/qml/DialerPage/Keypad.qml:158
4636+#: src/qml/DialerPage/Keypad.qml:117
4637 msgid "TUV"
4638 msgstr "TUV"
4639
4640@@ -253,23 +247,20 @@
4641 msgid "Today"
4642 msgstr "Aujourd'hui"
4643
4644-#: src/qml/LiveCallPage/LiveCall.qml:47
4645-msgid "Two Calls"
4646-msgstr "Deux appels"
4647-
4648-#: src/qml/HistoryPage/HistoryDelegate.qml:139
4649-msgid "Unknown"
4650-msgstr "Inconnu"
4651-
4652-#: src/qml/HistoryPage/CallLogContactDelegate.qml:134
4653-msgid "View contact"
4654-msgstr "Voir le contact"
4655+#: src/qml/ContactsPage/ContactsPage.qml:46
4656+msgid "Type a name or phone to search"
4657+msgstr ""
4658+
4659+#: src/qml/DialerPage/KeypadEntry.qml:54
4660+#: src/qml/HistoryPage/HistoryDelegate.qml:163
4661+msgid "US"
4662+msgstr ""
4663
4664 #: src/qml/LiveCallPage/MultiCallDisplay.qml:116
4665 msgid "Voicemail"
4666 msgstr "Messagerie vocale"
4667
4668-#: src/qml/DialerPage/Keypad.qml:168
4669+#: src/qml/DialerPage/Keypad.qml:127
4670 msgid "WXYZ"
4671 msgstr "WXYZ"
4672
4673@@ -277,17 +268,50 @@
4674 msgid "Yesterday"
4675 msgstr "Hier"
4676
4677+#: src/qml/LiveCallPage/ConferenceCallDisplay.qml:128
4678 #: src/qml/LiveCallPage/MultiCallDisplay.qml:138
4679-#: src/qml/LiveCallPage/ConferenceCallDisplay.qml:128
4680 msgid "active"
4681 msgstr "actif"
4682
4683-#: src/qml/LiveCallPage/LiveCall.qml:409
4684+#: src/qml/LiveCallPage/LiveCall.qml:244
4685 #: src/qml/LiveCallPage/MultiCallDisplay.qml:134
4686 msgid "calling"
4687 msgstr "appel en cours"
4688
4689+#: src/qml/LiveCallPage/ConferenceCallDisplay.qml:128
4690 #: src/qml/LiveCallPage/MultiCallDisplay.qml:136
4691-#: src/qml/LiveCallPage/ConferenceCallDisplay.qml:128
4692 msgid "on hold"
4693 msgstr "en attente"
4694+
4695+#~ msgid "Add Contact"
4696+#~ msgstr "Ajouter un contact"
4697+
4698+#~ msgid "Add to existing contact"
4699+#~ msgstr "Ajouter à un contact existant"
4700+
4701+#~ msgid "Call log"
4702+#~ msgstr "Journal d'appels"
4703+
4704+#~ msgid "Call now"
4705+#~ msgstr "Appeler maintenant"
4706+
4707+#~ msgid "Cancel"
4708+#~ msgstr "Annuler"
4709+
4710+#~ msgid "Create new contact"
4711+#~ msgstr "Créer un nouveau contact"
4712+
4713+#~ msgid "How do you want to save the contact?"
4714+#~ msgstr "Comment souhaitez-vous enregistrer le contact ?"
4715+
4716+#~ msgid "Save contact"
4717+#~ msgstr "Enregistrer le contact"
4718+
4719+#~ msgid "Two Calls"
4720+#~ msgstr "Deux appels"
4721+
4722+#~ msgid "Unknown"
4723+#~ msgstr "Inconnu"
4724+
4725+#~ msgid "View contact"
4726+#~ msgstr "Voir le contact"
4727
4728=== modified file 'po/gd.po'
4729--- po/gd.po 2014-05-22 06:49:33 +0000
4730+++ po/gd.po 2014-07-12 12:27:17 +0000
4731@@ -6,11 +6,12 @@
4732 msgid ""
4733 msgstr ""
4734 "Project-Id-Version: dialer-app\n"
4735-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
4736-"POT-Creation-Date: 2014-05-09 15:20-0300\n"
4737+"Report-Msgid-Bugs-To: \n"
4738+"POT-Creation-Date: 2014-07-12 09:22-0300\n"
4739 "PO-Revision-Date: 2014-05-20 05:05+0000\n"
4740 "Last-Translator: Akerbeltz <fios@akerbeltz.org>\n"
4741 "Language-Team: Akerbeltz\n"
4742+"Language: gd\n"
4743 "MIME-Version: 1.0\n"
4744 "Content-Type: text/plain; charset=UTF-8\n"
4745 "Content-Transfer-Encoding: 8bit\n"
4746@@ -18,9 +19,8 @@
4747 "(n > 2 && n < 20) ? 2 : 3;\n"
4748 "X-Launchpad-Export-Date: 2014-05-22 06:49+0000\n"
4749 "X-Generator: Launchpad (build 17017)\n"
4750-"Language: gd\n"
4751
4752-#: src/qml/DialerPage/Keypad.qml:202
4753+#: src/qml/DialerPage/Keypad.qml:161
4754 msgid "#"
4755 msgstr "#"
4756
4757@@ -51,127 +51,107 @@
4758 msgstr[2] "%1 diogan"
4759 msgstr[3] "%1 diog"
4760
4761-#: src/qml/DialerPage/Keypad.qml:179
4762+#: src/qml/DialerPage/Keypad.qml:138
4763 msgid "*"
4764 msgstr "*"
4765
4766-#: src/qml/DialerPage/Keypad.qml:189
4767+#: src/qml/DialerPage/Keypad.qml:148
4768 msgid "+"
4769 msgstr "+"
4770
4771-#: src/qml/DialerPage/Keypad.qml:188
4772+#: src/qml/DialerPage/Keypad.qml:147
4773 msgid "0"
4774 msgstr "0"
4775
4776-#: src/qml/DialerPage/Keypad.qml:86
4777+#: src/qml/DialerPage/Keypad.qml:45
4778 msgid "1"
4779 msgstr "1"
4780
4781-#: src/qml/DialerPage/Keypad.qml:97
4782+#: src/qml/DialerPage/Keypad.qml:56
4783 msgid "2"
4784 msgstr "2"
4785
4786-#: src/qml/DialerPage/Keypad.qml:107
4787+#: src/qml/DialerPage/Keypad.qml:66
4788 msgid "3"
4789 msgstr "3"
4790
4791-#: src/qml/DialerPage/Keypad.qml:117
4792+#: src/qml/DialerPage/Keypad.qml:76
4793 msgid "4"
4794 msgstr "4"
4795
4796-#: src/qml/DialerPage/Keypad.qml:127
4797+#: src/qml/DialerPage/Keypad.qml:86
4798 msgid "5"
4799 msgstr "5"
4800
4801-#: src/qml/DialerPage/Keypad.qml:137
4802+#: src/qml/DialerPage/Keypad.qml:96
4803 msgid "6"
4804 msgstr "6"
4805
4806-#: src/qml/DialerPage/Keypad.qml:147
4807+#: src/qml/DialerPage/Keypad.qml:106
4808 msgid "7"
4809 msgstr "7"
4810
4811-#: src/qml/DialerPage/Keypad.qml:157
4812+#: src/qml/DialerPage/Keypad.qml:116
4813 msgid "8"
4814 msgstr "8"
4815
4816-#: src/qml/DialerPage/Keypad.qml:167
4817+#: src/qml/DialerPage/Keypad.qml:126
4818 msgid "9"
4819 msgstr "9"
4820
4821-#: src/qml/DialerPage/Keypad.qml:98
4822+#: src/qml/DialerPage/Keypad.qml:57
4823 msgid "ABC"
4824 msgstr "ABC"
4825
4826-#: src/qml/HistoryPage/CallLogContactDelegate.qml:80
4827-msgid "Add Contact"
4828-msgstr "Cuir neach-aithne ris"
4829-
4830-#: src/qml/HistoryPage/CallLogContactDelegate.qml:42
4831-msgid "Add to existing contact"
4832-msgstr "Cuir ri neach-aithne làithreach"
4833-
4834-#: src/qml/dialer-app.qml:207
4835+#: src/qml/dialer-app.qml:309
4836 msgid "Call Barring"
4837 msgstr "Bacadh ghairmean"
4838
4839-#: src/qml/dialer-app.qml:218
4840+#: src/qml/dialer-app.qml:320
4841 msgid "Call Forwarding"
4842 msgstr "Sìneadh air adhart ghairmean"
4843
4844-#: src/qml/dialer-app.qml:229
4845+#: src/qml/dialer-app.qml:331
4846 msgid "Call Waiting"
4847 msgstr "Tha gairm a' feitheamh"
4848
4849-#: src/qml/MainPage.qml:56
4850-msgid "Call log"
4851-msgstr "Loga nan gairmean"
4852-
4853-#: src/qml/HistoryPage/CallLogContactDelegate.qml:114
4854-msgid "Call now"
4855-msgstr "Cuir fòn an-dràsta"
4856-
4857-#: src/qml/dialer-app.qml:240
4858+#: src/qml/dialer-app.qml:342
4859 msgid "Calling Line Presentation"
4860 msgstr "Taisbeanadh de ghairmean a thig a-steach"
4861
4862-#: src/qml/dialer-app.qml:252
4863+#: src/qml/dialer-app.qml:354
4864 msgid "Calling Line Restriction"
4865 msgstr "Bacadh de ghairmean a thig a-steach"
4866
4867-#: src/qml/HistoryPage/CallLogContactDelegate.qml:60
4868-msgid "Cancel"
4869-msgstr "Sguir dheth"
4870-
4871-#: src/qml/LiveCallPage/LiveCall.qml:49
4872 #: src/qml/LiveCallPage/MultiCallDisplay.qml:114
4873 msgid "Conference"
4874 msgstr "Gairm co-labhairt"
4875
4876-#: src/qml/dialer-app.qml:246
4877+#: src/qml/dialer-app.qml:348
4878 msgid "Connected Line Presentation"
4879 msgstr "Taisbeanadh de ghairmean ceangailte"
4880
4881-#: src/qml/dialer-app.qml:258
4882+#: src/qml/dialer-app.qml:360
4883 msgid "Connected Line Restriction"
4884 msgstr "Bacadh de ghairmean ceangailte"
4885
4886-#: src/qml/MainPage.qml:45
4887+#: src/qml/DialerPage/DialerPage.qml:41
4888+#: src/qml/ContactsPage/ContactsPage.qml:29
4889 msgid "Contacts"
4890 msgstr "Luchd-aithne"
4891
4892-#: src/qml/HistoryPage/CallLogContactDelegate.qml:51
4893-msgid "Create new contact"
4894-msgstr "Cruthaich neach-aithne ùr"
4895-
4896-#: src/qml/DialerPage/Keypad.qml:108
4897+#: src/qml/DialerPage/Keypad.qml:67
4898 msgid "DEF"
4899 msgstr "DEF"
4900
4901-#: src/qml/HistoryPage/HistoryPage.qml:69
4902+#: src/qml/HistoryPage/HistoryPage.qml:256
4903 msgid "Delete"
4904 msgstr "Sguab às"
4905
4906+#: src/qml/HistoryPage/HistoryPage.qml:263
4907+msgid "Details"
4908+msgstr ""
4909+
4910 #: src/dialer-app.desktop.in:3
4911 msgid "Dialer"
4912 msgstr "Daithealair"
4913@@ -184,19 +164,19 @@
4914 msgid "Dialer application"
4915 msgstr "An aplacaid daithealaidh"
4916
4917-#: src/qml/dialer-app.qml:143 src/qml/dialer-app.qml:157
4918+#: src/qml/dialer-app.qml:239 src/qml/dialer-app.qml:253
4919 msgid "Dismiss"
4920 msgstr "Cuir air falbh"
4921
4922-#: src/qml/DialerPage/DialerPage.qml:79
4923+#: src/qml/DialerPage/DialerPage.qml:146
4924 msgid "Enter a number"
4925 msgstr "Cuir a-steach àireamh"
4926
4927-#: src/qml/dialer-app.qml:140
4928+#: src/qml/dialer-app.qml:236
4929 msgid "Error"
4930 msgstr "Mearachd"
4931
4932-#: src/qml/DialerPage/Keypad.qml:118
4933+#: src/qml/DialerPage/Keypad.qml:77
4934 msgid "GHI"
4935 msgstr "GHI"
4936
4937@@ -204,23 +184,23 @@
4938 msgid "Hangup"
4939 msgstr "Cuir sìos am fòn"
4940
4941-#: src/qml/HistoryPage/CallLogContactDelegate.qml:39
4942-msgid "How do you want to save the contact?"
4943-msgstr "Ciamar a shàbhaileas sinn an neach-aithne dhut?"
4944+#: src/qml/HistoryPage/HistoryDelegate.qml:55
4945+msgid "Incoming"
4946+msgstr ""
4947
4948-#: src/qml/dialer-app.qml:141
4949+#: src/qml/dialer-app.qml:237
4950 msgid "Invalid USSD code"
4951 msgstr "Còd USSD mì-dhligheach"
4952
4953-#: src/qml/DialerPage/Keypad.qml:128
4954+#: src/qml/DialerPage/Keypad.qml:87
4955 msgid "JKL"
4956 msgstr "JKL"
4957
4958-#: src/qml/MainPage.qml:35
4959+#: src/qml/DialerPage/DialerPage.qml:52
4960 msgid "Keypad"
4961 msgstr "Pada-iuchraichean"
4962
4963-#: src/qml/DialerPage/Keypad.qml:138
4964+#: src/qml/DialerPage/Keypad.qml:97
4965 msgid "MNO"
4966 msgstr "MNO"
4967
4968@@ -228,15 +208,24 @@
4969 msgid "Merge calls"
4970 msgstr "Co-aonaich na gairmean"
4971
4972-#: src/qml/LiveCallPage/LiveCall.qml:75
4973-msgid "New call"
4974+#: src/qml/HistoryPage/HistoryDelegate.qml:53
4975+msgid "Missed"
4976+msgstr ""
4977+
4978+#: src/qml/LiveCallPage/LiveCall.qml:62
4979+#, fuzzy
4980+msgid "New Call"
4981 msgstr "Gairm ùr"
4982
4983-#: src/qml/DialerPage/Keypad.qml:148
4984+#: src/qml/HistoryPage/HistoryDelegate.qml:57
4985+msgid "Outgoing"
4986+msgstr ""
4987+
4988+#: src/qml/DialerPage/Keypad.qml:107
4989 msgid "PQRS"
4990 msgstr "PQRS"
4991
4992-#: src/qml/dialer-app.qml:121
4993+#: src/qml/dialer-app.qml:217
4994 msgid "Please wait"
4995 msgstr "Fuirich ort"
4996
4997@@ -244,16 +233,20 @@
4998 msgid "Private"
4999 msgstr "Prìobhaideach"
5000
The diff has been truncated for viewing.

Subscribers

People subscribed via source and target branches