address-book-app

Merge lp:~aacid/address-book-app/addi18ntr into lp:~phablet-team/address-book-app/staging

  1. addi18ntr
  2. Merge into staging
Proposed by Albert Astals Cid
Status: Merged
Approved by: Renato Araujo Oliveira Filho
Approved revision: 308
Merged at revision: 308
Proposed branch: lp:~aacid/address-book-app/addi18ntr
Merge into: lp:~phablet-team/address-book-app/staging
Diff against target: 145 lines (+19/-18)
2 files modified
po/address-book-app.pot (+18/-17)
src/imports/ContactView/ContactFetchError.qml (+1/-1)
To merge this branch: bzr merge lp:~aacid/address-book-app/addi18ntr
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve
Renato Araujo Oliveira Filho (community) Approve
Ubuntu Phablet Team Pending
Gustavo Pichorim Boiko Pending
Review via email: mp+236325@code.launchpad.net

This proposal supersedes a proposal from 2014-09-25.

Commit message

Add i18n.tr

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

PASSED: Continuous integration, rev:313
http://jenkins.qa.ubuntu.com/job/address-book-app-ci/688/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-utopic-i386-ci/141
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/5166
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/3770
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/4909
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6418
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6418/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/13729
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/3156
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4081
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4081/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/address-book-app-ci/688/rebuild

review: Approve (continuous-integration)
lp:~aacid/address-book-app/addi18ntr updated
308. By Albert Astals Cid

Add i18n.tr

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

looks good. Thanks

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'po/address-book-app.pot'
2--- po/address-book-app.pot 2014-09-18 19:24:02 +0000
3+++ po/address-book-app.pot 2014-09-29 13:22:00 +0000
4@@ -8,7 +8,7 @@
5 msgstr ""
6 "Project-Id-Version: address-book-app\n"
7 "Report-Msgid-Bugs-To: \n"
8-"POT-Creation-Date: 2014-09-18 16:18-0300\n"
9+"POT-Creation-Date: 2014-09-29 15:21+0200\n"
10 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
11 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
12 "Language-Team: LANGUAGE <LL@li.org>\n"
13@@ -31,7 +31,7 @@
14 msgid "Add Field"
15 msgstr ""
16
17-#: ../src/imports/ContactList/ContactListPage.qml:528
18+#: ../src/imports/ContactList/ContactListPage.qml:532
19 msgid "Add contact"
20 msgstr ""
21
22@@ -55,7 +55,7 @@
23 msgstr ""
24
25 #. TRANSLATORS: this refers to all contacts
26-#: ../src/imports/ContactList/ContactListPage.qml:410
27+#: ../src/imports/ContactList/ContactListPage.qml:414
28 msgid "All"
29 msgstr ""
30
31@@ -68,12 +68,13 @@
32 msgstr ""
33
34 #: ../src/imports/ContactEdit/ContactEditor.qml:398
35-#: ../src/imports/ContactList/ContactListPage.qml:423
36+#: ../src/imports/ContactList/ContactListPage.qml:427
37+#: ../src/imports/ContactView/ContactFetchError.qml:29
38 #: ../src/imports/MainWindow.qml:133
39 msgid "Cancel"
40 msgstr ""
41
42-#: ../src/imports/ContactList/ContactListPage.qml:447
43+#: ../src/imports/ContactList/ContactListPage.qml:451
44 msgid "Cancel selection"
45 msgstr ""
46
47@@ -102,13 +103,13 @@
48 msgid "Country"
49 msgstr ""
50
51-#: ../src/imports/ContactList/ContactListPage.qml:607
52+#: ../src/imports/ContactList/ContactListPage.qml:613
53 msgid "Create a new contact by swiping up from the bottom of the screen."
54 msgstr ""
55
56 #: ../src/imports/ContactEdit/ContactEditor.qml:355
57 #: ../src/imports/ContactList/ContactListPage.qml:267
58-#: ../src/imports/ContactList/ContactListPage.qml:489
59+#: ../src/imports/ContactList/ContactListPage.qml:493
60 msgid "Delete"
61 msgstr ""
62
63@@ -141,7 +142,7 @@
64 msgid "Error"
65 msgstr ""
66
67-#: ../src/imports/ContactList/ContactListPage.qml:410
68+#: ../src/imports/ContactList/ContactListPage.qml:414
69 msgid "Favorites"
70 msgstr ""
71
72@@ -183,7 +184,7 @@
73 msgid "Last name"
74 msgstr ""
75
76-#: ../src/imports/ContactList/ContactListPage.qml:338
77+#: ../src/imports/ContactList/ContactListPage.qml:342
78 msgid "Loading..."
79 msgstr ""
80
81@@ -243,7 +244,7 @@
82 msgid "Professional Details"
83 msgstr ""
84
85-#: ../src/imports/ContactList/ContactListPage.qml:381
86+#: ../src/imports/ContactList/ContactListPage.qml:385
87 msgid "Quit"
88 msgstr ""
89
90@@ -259,19 +260,19 @@
91 msgid "Save"
92 msgstr ""
93
94-#: ../src/imports/ContactList/ContactListPage.qml:396
95+#: ../src/imports/ContactList/ContactListPage.qml:400
96 msgid "Search"
97 msgstr ""
98
99-#: ../src/imports/ContactList/ContactListPage.qml:353
100+#: ../src/imports/ContactList/ContactListPage.qml:357
101 msgid "Search..."
102 msgstr ""
103
104-#: ../src/imports/ContactList/ContactListPage.qml:453
105+#: ../src/imports/ContactList/ContactListPage.qml:457
106 msgid "Select All"
107 msgstr ""
108
109-#: ../src/imports/ContactList/ContactListPage.qml:466
110+#: ../src/imports/ContactList/ContactListPage.qml:470
111 #: ../src/imports/ContactView/ContactView.qml:98
112 msgid "Share"
113 msgstr ""
114@@ -289,15 +290,15 @@
115 msgid "Street"
116 msgstr ""
117
118-#: ../src/imports/ContactList/ContactListPage.qml:390
119+#: ../src/imports/ContactList/ContactListPage.qml:394
120 msgid "Sync"
121 msgstr ""
122
123-#: ../src/imports/ContactList/ContactListPage.qml:390
124+#: ../src/imports/ContactList/ContactListPage.qml:394
125 msgid "Syncing"
126 msgstr ""
127
128-#: ../src/imports/ContactList/ContactListPage.qml:338
129+#: ../src/imports/ContactList/ContactListPage.qml:342
130 msgid "Syncing..."
131 msgstr ""
132
133
134=== modified file 'src/imports/ContactView/ContactFetchError.qml'
135--- src/imports/ContactView/ContactFetchError.qml 2014-07-20 20:23:20 +0000
136+++ src/imports/ContactView/ContactFetchError.qml 2014-09-29 13:22:00 +0000
137@@ -26,7 +26,7 @@
138 text: i18n.tr("Contact not found")
139
140 Button {
141- text: "Cancel"
142+ text: i18n.tr("Cancel")
143 gradient: UbuntuColors.greyGradient
144 onClicked: {
145 PopupUtils.close(dialogue)

Subscribers

People subscribed via source and target branches