address-book-app

Merge lp:~phablet-team/address-book-app/address-book-app-desktop-translations into lp:~phablet-team/address-book-app/staging

  1. address-book-app-desktop-translations
  2. Merge into staging
Proposed by Renato Araujo Oliveira Filho
Status: Merged
Merge reported by: Renato Araujo Oliveira Filho
Merged at revision: not available
Proposed branch: lp:~phablet-team/address-book-app/address-book-app-desktop-translations
Merge into: lp:~phablet-team/address-book-app/staging
Diff against target: 298 lines (+54/-48)
5 files modified
CMakeLists.txt (+4/-0)
data/CMakeLists.txt (+5/-7)
data/address-book-app.desktop.in.in (+4/-4)
po/CMakeLists.txt (+7/-4)
po/address-book-app.pot (+34/-33)
To merge this branch: bzr merge lp:~phablet-team/address-book-app/address-book-app-desktop-translations
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Needs Fixing
Renato Araujo Oliveira Filho (community) Approve
Review via email: mp+227017@code.launchpad.net

This proposal supersedes a proposal from 2014-06-17.

Commit message

Add translations inside .desktop files

Description of the change

Add translations inside .desktop files

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

FAILED: Continuous integration, rev:210
http://jenkins.qa.ubuntu.com/job/address-book-app-ci/588/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/address-book-app-utopic-amd64-ci/41/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/address-book-app-utopic-armhf-ci/41/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/address-book-app-utopic-i386-ci/41/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/930/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/846/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/1681/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/986/console

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

review: Needs Fixing (continuous-integration)
Revision history for this message
Renato Araujo Oliveira Filho (renatofilho) wrote : Posted in a previous version of this proposal

could you create a new mr against the staging branch?

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

looks good to me

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

FAILED: Autolanding.
No commit message was specified in the merge proposal. Hit 'Add commit message' on the merge proposal web page or follow the link below. You can approve the merge proposal yourself to rerun.
https://code.launchpad.net/~phablet-team/address-book-app/address-book-app-desktop-translations/+merge/227017/+edit-commit-message

review: Needs Fixing (continuous-integration)
Revision history for this message
Renato Araujo Oliveira Filho (renatofilho) :
review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:212
http://jenkins.qa.ubuntu.com/job/phablet-team-address-book-app-staging-ci/246/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/2083
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/1746
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-team-address-book-app-staging-utopic-amd64-ci/246
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-team-address-book-app-staging-utopic-armhf-ci/246
        deb: http://jenkins.qa.ubuntu.com/job/phablet-team-address-book-app-staging-utopic-armhf-ci/246/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-team-address-book-app-staging-utopic-i386-ci/246
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/2313
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3217
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3217/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/9948
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/1466
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/1956
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/1956/artifact/work/output/*zip*/output.zip

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

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

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/phablet-team-address-book-app-staging-autolanding/52/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/2085
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/1748
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-team-address-book-app-staging-utopic-amd64-autolanding/52
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-team-address-book-app-staging-utopic-armhf-autolanding/52
        deb: http://jenkins.qa.ubuntu.com/job/phablet-team-address-book-app-staging-utopic-armhf-autolanding/52/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-team-address-book-app-staging-utopic-i386-autolanding/52
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/2314
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3219
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3219/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/9949
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/1467
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/1958
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/1958/artifact/work/output/*zip*/output.zip

review: Needs Fixing (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'CMakeLists.txt'
2--- CMakeLists.txt 2014-07-07 19:46:23 +0000
3+++ CMakeLists.txt 2014-07-16 12:57:07 +0000
4@@ -18,9 +18,13 @@
5 find_package(Qt5DBus)
6 find_package(PkgConfig REQUIRED)
7
8+find_program(INTLTOOL_MERGE intltool-merge)
9+find_program(INTLTOOL_EXTRACT intltool-extract)
10+
11 set(ADDRESS_BOOK_APP_DIR ${CMAKE_INSTALL_DATADIR}/address-book-app)
12 set(ADDRESS_BOOK_APP_FULL_DIR ${CMAKE_INSTALL_FULL_DATADIR}/address-book-app)
13 set(ADDRESS_BOOK_APP_NAME "Address Book")
14+set(DESKTOP_FILE address-book-app.desktop)
15 set(API_VERSION 0.1)
16
17 # for dh_translations to extract the domain
18
19=== modified file 'data/CMakeLists.txt'
20--- data/CMakeLists.txt 2014-07-07 19:46:23 +0000
21+++ data/CMakeLists.txt 2014-07-16 12:57:07 +0000
22@@ -5,13 +5,11 @@
23 set(ADDRESS_BOOK_APP_ICON "address-book-app.svg")
24 endif()
25
26-file(REMOVE ${CMAKE_CURRENT_BINARY_DIR}/${ADDRESS_BOOK_APP_DESKTOP_FILE})
27-file(STRINGS ${ADDRESS_BOOK_APP_DESKTOP_FILE}.in DESKTOP_FILE_CONTENTS)
28-foreach(LINE ${DESKTOP_FILE_CONTENTS})
29- string(REGEX REPLACE "tr\\\(\"(.*)\"\\\)" "\\1" LINE "${LINE}")
30- string(CONFIGURE "${LINE}" LINE)
31- file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/${ADDRESS_BOOK_APP_DESKTOP_FILE} "${LINE}\n")
32-endforeach(LINE)
33+configure_file(${DESKTOP_FILE}.in.in ${DESKTOP_FILE}.in)
34+add_custom_target(${DESKTOP_FILE} ALL
35+ COMMENT "Merging translations into ${DESKTOP_FILE}"
36+ COMMAND LC_ALL=C ${INTLTOOL_MERGE} -d -u ${CMAKE_SOURCE_DIR}/po ${DESKTOP_FILE}.in ${DESKTOP_FILE} >/dev/null
37+)
38
39 if(CLICK_MODE)
40 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${ADDRESS_BOOK_APP_DESKTOP_FILE}
41
42=== renamed file 'data/address-book-app.desktop.in' => 'data/address-book-app.desktop.in.in'
43--- data/address-book-app.desktop.in 2014-07-07 19:46:23 +0000
44+++ data/address-book-app.desktop.in.in 2014-07-16 12:57:07 +0000
45@@ -3,13 +3,13 @@
46 Version=1.0
47 Terminal=false
48 Type=Application
49-Name=tr("Contacts")
50-GenericName=tr("Contacts")
51-Comment=tr("Contacts Address Book")
52+_Name=Contacts
53+_GenericName=Contacts
54+_Comment=Contacts Address Book
55+_Keywords=Contacts;People;Numbers
56 Exec=@DESKTOP_EXEC@ %u
57 Icon=@ADDRESS_BOOK_APP_ICON@
58 X-Ubuntu-Touch=true
59 X-Ubuntu-StageHint=SideStage
60-X-Ubuntu-Gettext-Domain=address-book-app
61 X-Ubuntu-Single-Instance=true
62 @XSCREENSHOT@
63
64=== modified file 'po/CMakeLists.txt'
65--- po/CMakeLists.txt 2014-05-28 19:56:00 +0000
66+++ po/CMakeLists.txt 2014-07-16 12:57:07 +0000
67@@ -4,8 +4,8 @@
68 set(POT_FILE ${DOMAIN}.pot)
69 file(GLOB PO_FILES *.po)
70 file(GLOB_RECURSE I18N_SRCS RELATIVE ${CMAKE_SOURCE_DIR}
71- ${CMAKE_SOURCE_DIR}/src/*.qml
72- ${CMAKE_SOURCE_DIR}/data/*.desktop.in)
73+ ${CMAKE_SOURCE_DIR}/src/*.qml)
74+list(APPEND I18N_SRCS data/${DESKTOP_FILE}.in.in)
75 list(SORT I18N_SRCS)
76
77 foreach(PO_FILE ${PO_FILES})
78@@ -19,8 +19,11 @@
79
80 find_program(XGETTEXT_EXECUTABLE xgettext)
81 if(XGETTEXT_EXECUTABLE)
82- add_custom_target(${POT_FILE})
83- add_custom_command(TARGET ${POT_FILE}
84+ add_custom_target(${POT_FILE} ALL
85+ COMMENT "Generating translation template"
86+ COMMAND ${INTLTOOL_EXTRACT} --update --type=gettext/ini
87+ --srcdir=${CMAKE_SOURCE_DIR} data/${DESKTOP_FILE}.in.in
88+
89 COMMAND ${XGETTEXT_EXECUTABLE} -o ${POT_FILE}
90 --c++ --qt --add-comments=TRANSLATORS
91 --keyword=tr --keyword=tr:1,2
92
93=== modified file 'po/address-book-app.pot'
94--- po/address-book-app.pot 2014-06-30 18:01:45 +0000
95+++ po/address-book-app.pot 2014-07-16 12:57:07 +0000
96@@ -8,7 +8,7 @@
97 msgstr ""
98 "Project-Id-Version: address-book-app\n"
99 "Report-Msgid-Bugs-To: \n"
100-"POT-Creation-Date: 2014-06-30 15:01-0300\n"
101+"POT-Creation-Date: 2014-07-16 09:55-0300\n"
102 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
103 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
104 "Language-Team: LANGUAGE <LL@li.org>\n"
105@@ -22,10 +22,18 @@
106 msgid "%1 vCards imported"
107 msgstr ""
108
109+#: src/imports/ContactList/ContactListPage.qml:202
110+msgid "+ New Contact"
111+msgstr ""
112+
113 #: src/imports/ContactEdit/ContactEditor.qml:322
114 msgid "Add Field"
115 msgstr ""
116
117+#: src/imports/ContactList/ContactListPage.qml:462
118+msgid "Add contact"
119+msgstr ""
120+
121 #: src/imports/ContactEdit/AddFieldDialog.qml:59
122 #: src/imports/ContactEdit/ContactDetailAddressesEditor.qml:23
123 #: src/imports/ContactView/ContactDetailAddressesView.qml:24
124@@ -55,12 +63,12 @@
125
126 #: src/imports/ContactEdit/AddFieldDialog.qml:133
127 #: src/imports/ContactEdit/ContactEditor.qml:372
128-#: src/imports/ContactList/ContactListPage.qml:314
129+#: src/imports/ContactList/ContactListPage.qml:418
130 #: src/imports/Ubuntu/Contacts/DialogButtons.qml:37
131 msgid "Cancel"
132 msgstr ""
133
134-#: src/imports/ContactList/ContactListPage.qml:242
135+#: src/imports/ContactList/ContactListPage.qml:330
136 msgid "Cancel selection"
137 msgstr ""
138
139@@ -72,22 +80,17 @@
140 msgid "Contact not found"
141 msgstr ""
142
143-#: data/address-book-app.desktop.in:6 data/address-book-app.desktop.in:7
144-#: src/imports/ContactList/ContactListPage.qml:75
145+#: src/imports/ContactList/ContactListPage.qml:146
146 msgid "Contacts"
147 msgstr ""
148
149-#: data/address-book-app.desktop.in:8
150-msgid "Contacts Address Book"
151-msgstr ""
152-
153 #: src/imports/ContactEdit/ContactDetailAddressesEditor.qml:35
154 msgid "Country"
155 msgstr ""
156
157 #: src/imports/ContactEdit/ContactEditor.qml:337
158-#: src/imports/ContactList/ContactListPage.qml:146
159-#: src/imports/ContactList/ContactListPage.qml:267
160+#: src/imports/ContactList/ContactListPage.qml:235
161+#: src/imports/ContactList/ContactListPage.qml:355
162 msgid "Delete"
163 msgstr ""
164
165@@ -120,7 +123,7 @@
166 msgstr ""
167
168 #: src/imports/ContactView/ContactFetchError.qml:25
169-#: src/imports/MainWindow.qml:98
170+#: src/imports/MainWindow.qml:112
171 msgid "Error"
172 msgstr ""
173
174@@ -136,12 +139,12 @@
175 msgid "First name"
176 msgstr ""
177
178-#: src/imports/Ubuntu/Contacts/ContactListView.qml:427
179+#: src/imports/Ubuntu/Contacts/ContactListView.qml:442
180 msgid "Frequently called"
181 msgstr ""
182
183 #: src/imports/Common/ContactDetailGroupWithTypeBase.qml:116
184-#: src/imports/Ubuntu/Contacts/ContactDetailPhoneNumberTypeModel.qml:94
185+#: src/imports/Ubuntu/Contacts/ContactDetailPhoneNumberTypeModel.qml:99
186 msgid "Home"
187 msgstr ""
188
189@@ -173,7 +176,7 @@
190 msgid "Loading"
191 msgstr ""
192
193-#: src/imports/ContactList/ContactListPage.qml:232
194+#: src/imports/ContactList/ContactListPage.qml:320
195 msgid "Loading..."
196 msgstr ""
197
198@@ -185,7 +188,7 @@
199 msgid "MSN"
200 msgstr ""
201
202-#: src/imports/Ubuntu/Contacts/ContactDetailPhoneNumberTypeModel.qml:98
203+#: src/imports/Ubuntu/Contacts/ContactDetailPhoneNumberTypeModel.qml:103
204 msgid "Mobile"
205 msgstr ""
206
207@@ -193,7 +196,7 @@
208 msgid "Multiple contacts"
209 msgstr ""
210
211-#: src/imports/ContactEdit/TextInputDetail.qml:77
212+#: src/imports/ContactEdit/TextInputDetail.qml:74
213 msgid "Next"
214 msgstr ""
215
216@@ -211,7 +214,7 @@
217 msgstr ""
218
219 #: src/imports/Common/ContactDetailGroupWithTypeBase.qml:118
220-#: src/imports/Ubuntu/Contacts/ContactDetailPhoneNumberTypeModel.qml:102
221+#: src/imports/Ubuntu/Contacts/ContactDetailPhoneNumberTypeModel.qml:107
222 msgid "Other"
223 msgstr ""
224
225@@ -234,6 +237,10 @@
226 msgid "Professional details"
227 msgstr ""
228
229+#: src/imports/ContactList/ContactListPage.qml:372
230+msgid "Quit"
231+msgstr ""
232+
233 #: src/imports/ContactEdit/ContactDetailAddressesEditor.qml:33
234 msgid "Region"
235 msgstr ""
236@@ -246,19 +253,19 @@
237 msgid "Save"
238 msgstr ""
239
240-#: src/imports/ContactList/ContactListPage.qml:292
241+#: src/imports/ContactList/ContactListPage.qml:396
242 msgid "Search"
243 msgstr ""
244
245-#: src/imports/ContactList/ContactListPage.qml:267
246+#: src/imports/ContactList/ContactListPage.qml:355
247 msgid "Select"
248 msgstr ""
249
250-#: src/imports/ContactList/ContactListPage.qml:251
251+#: src/imports/ContactList/ContactListPage.qml:339
252 msgid "Select All"
253 msgstr ""
254
255-#: src/imports/ContactList/ContactListPage.qml:75
256+#: src/imports/ContactList/ContactListPage.qml:512
257 msgid "Select Contacts"
258 msgstr ""
259
260@@ -283,15 +290,15 @@
261 msgid "Street"
262 msgstr ""
263
264-#: src/imports/ContactList/ContactListPage.qml:283
265+#: src/imports/ContactList/ContactListPage.qml:387
266 msgid "Sync"
267 msgstr ""
268
269-#: src/imports/ContactList/ContactListPage.qml:283
270+#: src/imports/ContactList/ContactListPage.qml:387
271 msgid "Syncing"
272 msgstr ""
273
274-#: src/imports/ContactList/ContactListPage.qml:232
275+#: src/imports/ContactList/ContactListPage.qml:320
276 msgid "Syncing..."
277 msgstr ""
278
279@@ -303,18 +310,12 @@
280 msgid "Touch"
281 msgstr ""
282
283-#. TRANSLATORS: This value is used as default value for phone number format, when no coutry code is provided
284-#. the supported values can be found in: https://www.iso.org/obp/ui/#search
285-#: src/imports/ContactEdit/TextInputDetail.qml:73
286-msgid "US"
287-msgstr ""
288-
289 #: src/imports/Common/ContactDetailGroupWithTypeBase.qml:117
290-#: src/imports/Ubuntu/Contacts/ContactDetailPhoneNumberTypeModel.qml:96
291+#: src/imports/Ubuntu/Contacts/ContactDetailPhoneNumberTypeModel.qml:101
292 msgid "Work"
293 msgstr ""
294
295-#: src/imports/Ubuntu/Contacts/ContactDetailPhoneNumberTypeModel.qml:100
296+#: src/imports/Ubuntu/Contacts/ContactDetailPhoneNumberTypeModel.qml:105
297 msgid "Work Mobile"
298 msgstr ""
299

Subscribers

People subscribed via source and target branches

to all changes: