Merge lp:~dpm/address-book-app/small-i18n-fixes into lp:address-book-app

Proposed by David Planella
Status: Rejected
Rejected by: Renato Araujo Oliveira Filho
Proposed branch: lp:~dpm/address-book-app/small-i18n-fixes
Merge into: lp:address-book-app
Diff against target: 37 lines (+3/-3)
3 files modified
src/imports/ContactView/ContactFetchError.qml (+1/-1)
src/imports/MainWindow.qml (+1/-1)
src/imports/Ubuntu/Contacts/ContactDetailPickerPhoneNumberDelegate.qml (+1/-1)
To merge this branch: bzr merge lp:~dpm/address-book-app/small-i18n-fixes
Reviewer Review Type Date Requested Status
Leo Arias (community) Approve
PS Jenkins bot continuous-integration Approve
Ubuntu Phablet Team Pending
Review via email: mp+228932@code.launchpad.net

Commit message

Marks for translation the "No phone numbers" message that appears when a contact has no numbers set.

Description of the change

Marks for translation the "No phone numbers" message that appears when a contact has no numbers set. A couple of other untranslatable messages have been fixed as well.

This branch (or a follow-up one) should probably update the .pot file as well, but I couldn't figure out how it's done in system apps. Is there a cmake rule to do it? Any hints welcome!

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

PASSED: Continuous integration, rev:259
http://jenkins.qa.ubuntu.com/job/address-book-app-ci/654/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-utopic-amd64-ci/107
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-utopic-armhf-ci/107
        deb: http://jenkins.qa.ubuntu.com/job/address-book-app-utopic-armhf-ci/107/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-utopic-i386-ci/107
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/2765
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/2206
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/2855
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/4008
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/4008/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/10718
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/1826
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/2465
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/2465/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)
Revision history for this message
Leo Arias (elopio) wrote :

Thanks David.

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

Unmerged revisions

259. By David Planella

Marked several strings for translation

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/imports/ContactView/ContactFetchError.qml'
2--- src/imports/ContactView/ContactFetchError.qml 2014-06-09 22:45:19 +0000
3+++ src/imports/ContactView/ContactFetchError.qml 2014-07-30 19:37:52 +0000
4@@ -26,7 +26,7 @@
5 text: i18n.tr("Contact not found")
6
7 Button {
8- text: "Cancel"
9+ text: i18n.tr("Cancel")
10 gradient: UbuntuColors.greyGradient
11 onClicked: {
12 PopupUtils.close(dialogue)
13
14=== modified file 'src/imports/MainWindow.qml'
15--- src/imports/MainWindow.qml 2014-07-16 23:14:44 +0000
16+++ src/imports/MainWindow.qml 2014-07-30 19:37:52 +0000
17@@ -122,7 +122,7 @@
18 text: mainWindow.modelErrorMessage
19
20 Button {
21- text: "Cancel"
22+ text: i18n.tr("Cancel")
23 gradient: UbuntuColors.greyGradient
24 onClicked: PopupUtils.close(dialogue)
25 }
26
27=== modified file 'src/imports/Ubuntu/Contacts/ContactDetailPickerPhoneNumberDelegate.qml'
28--- src/imports/Ubuntu/Contacts/ContactDetailPickerPhoneNumberDelegate.qml 2014-07-10 16:45:26 +0000
29+++ src/imports/Ubuntu/Contacts/ContactDetailPickerPhoneNumberDelegate.qml 2014-07-30 19:37:52 +0000
30@@ -52,7 +52,7 @@
31 ListItem.Standard {
32 id: noNumberMessage
33 showDivider: false
34- text: "No phone numbers."
35+ text: i18n.tr("No phone numbers.")
36 visible: phoneNumberEntries.count == 0
37 }
38

Subscribers

People subscribed via source and target branches