Merge lp:~artmello/ubuntu-ui-extras/ubuntu-ui-extras-i18n_set_domain into lp:ubuntu-ui-extras

[Arthur Mello]

Specify the domain "ubuntu-ui-extras" for i18n messages

Specify the domain "ubuntu-ui-extras" for i18n messages

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:95
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-extras-ci/95/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-extras-vivid-amd64-ci/56
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-extras-vivid-armhf-ci/56
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-extras-vivid-armhf-ci/56/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-ui-extras-ci/95/rebuild

review: Approve (continuous-integration)

[lp:~artmello/ubuntu-ui-extras/ubuntu-ui-extras-i18n_set_domain]

96. By Arthur Mello on 2016-06-07

Merge with trunk

=== modified file 'modules/Ubuntu/Components/Extras/PhotoEditor/CropOverlay.qml'
--- modules/Ubuntu/Components/Extras/PhotoEditor/CropOverlay.qml	2014-12-15 13:32:18 +0000
+++ modules/Ubuntu/Components/Extras/PhotoEditor/CropOverlay.qml	2016-06-07 13:31:04 +0000
@@ -346,7 +346,7 @@
         Button {
             objectName: "centerCropIcon"
             anchors.centerIn: parent
-            text: i18n.tr("Crop")
+            text: i18n.dtr("ubuntu-ui-extras", "Crop")
             color: frame.border.color
             opacity: 0.9
             onClicked: cropOverlay.cropButtonPressed()

=== modified file 'modules/Ubuntu/Components/Extras/PhotoEditor/EditStack.qml'
--- modules/Ubuntu/Components/Extras/PhotoEditor/EditStack.qml	2015-02-11 14:46:34 +0000
+++ modules/Ubuntu/Components/Extras/PhotoEditor/EditStack.qml	2016-06-07 13:31:04 +0000
@@ -111,21 +111,21 @@
     }
 
     property Action undoAction: Action {
-            text: i18n.tr("Undo")
+            text: i18n.dtr("ubuntu-ui-extras", "Undo")
             iconName: "undo"
             enabled: items.length > 0 && level > 0 && actionsEnabled
             onTriggered: restoreSnapshot(--level);
     }
 
     property Action redoAction: Action {
-            text: i18n.tr("Redo")
+            text: i18n.dtr("ubuntu-ui-extras", "Redo")
             iconName: "redo"
             enabled: level < items.length - 1 && actionsEnabled
             onTriggered: restoreSnapshot(++level);
     }
 
     property Action revertAction: Action {
-            text: i18n.tr("Revert to Original")
+            text: i18n.dtr("ubuntu-ui-extras", "Revert to Original")
             iconSource: Qt.resolvedUrl("assets/edit_revert.png")
             enabled: actionsEnabled &&
                      (level > 0 || (!_revertedInThisSession && _pristineFileExists))

=== modified file 'modules/Ubuntu/Components/Extras/PhotoEditor/ExposureAdjuster.qml'
--- modules/Ubuntu/Components/Extras/PhotoEditor/ExposureAdjuster.qml	2015-02-11 14:46:34 +0000
+++ modules/Ubuntu/Components/Extras/PhotoEditor/ExposureAdjuster.qml	2016-06-07 13:31:04 +0000
@@ -69,7 +69,7 @@
             anchors.horizontalCenter: parent.horizontalCenter
             spacing: units.gu(2)
             Button {
-                text: i18n.tr("Done")
+                text: i18n.dtr("ubuntu-ui-extras", "Done")
                 color: UbuntuColors.green
                 enabled: adjuster.enabled
                 onTriggered: {
@@ -78,7 +78,7 @@
                 }
             }
             Button {
-                text: i18n.tr("Cancel")
+                text: i18n.dtr("ubuntu-ui-extras", "Cancel")
                 color: UbuntuColors.red
                 enabled: adjuster.enabled
                 onTriggered: {