Merge lp:~seb128/ubuntu-ui-toolkit/correct-translation-quoting into lp:ubuntu-ui-toolkit

Proposed by Sebastien Bacher
Status: Superseded
Proposed branch: lp:~seb128/ubuntu-ui-toolkit/correct-translation-quoting
Merge into: lp:ubuntu-ui-toolkit
Diff against target: 38 lines (+3/-3)
3 files modified
modules/Ubuntu/Components/ListItems/Empty.qml (+1/-1)
modules/Ubuntu/Components/ToolbarItems.qml (+1/-1)
tests/unit/tst_i18n/src/LocalizedApp.qml (+1/-1)
To merge this branch: bzr merge lp:~seb128/ubuntu-ui-toolkit/correct-translation-quoting
Reviewer Review Type Date Requested Status
Cris Dywan Needs Fixing
PS Jenkins bot continuous-integration Needs Fixing
David Planella (community) Approve
Review via email: mp+236393@code.launchpad.net

This proposal has been superseded by a proposal from 2014-10-02.

Commit message

don't use simple quotes around translatable strings, xgetting ignore those

Description of the change

don't use simple quotes around translatable strings, xgetting ignore those

To post a comment you must log in.
Revision history for this message
Sebastien Bacher (seb128) wrote :

the "Delete" string is not listed in the current template (running update-po.sh doesn't change that), it is with the double quotes in use though

Revision history for this message
David Planella (dpm) wrote :

LGTM, thanks!

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

Sensible.

review: Approve
1268. By Cris Dywan

Hide pop over when changing orientation. Fixes: https://bugs.launchpad.net/bugs/1369506, https://bugs.launchpad.net/bugs/1375837.

Approved by PS Jenkins bot, Tim Peeters.

1269. By Tim Peeters

Implement header animations in PageHeadStyle and prepare PageStack for enabling the animations.

Approved by PS Jenkins bot, Zsombor Egri.

1270. By Cris Dywan

autopilot package should source-depend on QML plugin. Fixes: https://bugs.launchpad.net/bugs/1236085.

Approved by PS Jenkins bot, Zoltan Balogh.

Revision history for this message
Cris Dywan (kalikiana) wrote :

I just now spotted this request is wrong, you need to propose against staging!

review: Needs Fixing
1271. By Sebastien Bacher

don't use simple quotes around translatable strings, xgetting ignore those

Unmerged revisions

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'modules/Ubuntu/Components/ListItems/Empty.qml'
--- modules/Ubuntu/Components/ListItems/Empty.qml 2014-09-09 16:03:39 +0000
+++ modules/Ubuntu/Components/ListItems/Empty.qml 2014-09-29 17:29:23 +0000
@@ -410,7 +410,7 @@
410 width: units.gu(5)410 width: units.gu(5)
411 }411 }
412 Label {412 Label {
413 text: i18n.dtr('ubuntu-ui-toolkit', 'Delete')413 text: i18n.dtr('ubuntu-ui-toolkit', "Delete")
414 verticalAlignment: Text.AlignVCenter414 verticalAlignment: Text.AlignVCenter
415 anchors {415 anchors {
416 verticalCenter: parent.verticalCenter416 verticalCenter: parent.verticalCenter
417417
=== modified file 'modules/Ubuntu/Components/ToolbarItems.qml'
--- modules/Ubuntu/Components/ToolbarItems.qml 2014-05-23 09:27:57 +0000
+++ modules/Ubuntu/Components/ToolbarItems.qml 2014-09-29 17:29:23 +0000
@@ -139,7 +139,7 @@
139 property Item back: ToolbarButton {139 property Item back: ToolbarButton {
140 objectName: "back_toolbar_button"140 objectName: "back_toolbar_button"
141 iconSource: Qt.resolvedUrl("artwork/back.png")141 iconSource: Qt.resolvedUrl("artwork/back.png")
142 text: i18n.dtr('ubuntu-ui-toolkit', 'Back')142 text: i18n.dtr('ubuntu-ui-toolkit', "Back")
143 visible: toolbarItems.pageStack && toolbarItems.pageStack.depth > 1143 visible: toolbarItems.pageStack && toolbarItems.pageStack.depth > 1
144 /*!144 /*!
145 If there is a \l PageStack of sufficient depth, triggering the back button145 If there is a \l PageStack of sufficient depth, triggering the back button
146146
=== modified file 'tests/unit/tst_i18n/src/LocalizedApp.qml'
--- tests/unit/tst_i18n/src/LocalizedApp.qml 2014-04-23 08:50:20 +0000
+++ tests/unit/tst_i18n/src/LocalizedApp.qml 2014-09-29 17:29:23 +0000
@@ -24,7 +24,7 @@
2424
25 Page {25 Page {
26 objectName: 'page'26 objectName: 'page'
27 title: i18n.dtr('localizedApp', 'Welcome')27 title: i18n.dtr('localizedApp', "Welcome")
28 Button {28 Button {
29 objectName: 'button'29 objectName: 'button'
30 anchors.centerIn: parent30 anchors.centerIn: parent

Subscribers

People subscribed via source and target branches

to status/vote changes: