Merge lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/untranslatableStrings into lp:ubuntu-ui-toolkit/staging

[Cris Dywan]

Fix wrong sheet labels and pick up dtr strings

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1217
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/948/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/4298
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-amd64-ci/780
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-ci/780
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-ci/780/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-i386-ci/780
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/4106
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5550
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5550/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/12444

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/948/rebuild

review: Approve (continuous-integration)

[Zsombor Egri (zsombi)]

Looks good, thanks!!

review: Approve

=== modified file 'modules/Ubuntu/Components/Popups/ComposerSheet.qml'
--- modules/Ubuntu/Components/Popups/ComposerSheet.qml	2014-06-04 21:17:06 +0000
+++ modules/Ubuntu/Components/Popups/ComposerSheet.qml	2014-09-01 17:05:51 +0000
@@ -77,7 +77,7 @@
     signal confirmClicked
 
     __leftButton: Button {
-        text: i18n.dtr("ubuntu-sdk", "cancel")
+        text: i18n.dtr("ubuntu-ui-toolkit", "Cancel")
         objectName: "cancelButton"
         /*! \internal */ // avoid warning when generating documentation
         onClicked: {
@@ -87,7 +87,7 @@
     }
 
     __rightButton: Button {
-        text: i18n.dtr("ubuntu-sdk", "confirm")
+        text: i18n.dtr("ubuntu-ui-toolkit", "Confirm")
         objectName: "confirmButton"
         color: UbuntuColors.orange
         /*! \internal */ // avoid warning when generating documentation

=== modified file 'modules/Ubuntu/Components/Popups/DefaultSheet.qml'
--- modules/Ubuntu/Components/Popups/DefaultSheet.qml	2014-06-04 21:17:06 +0000
+++ modules/Ubuntu/Components/Popups/DefaultSheet.qml	2014-09-01 17:05:51 +0000
@@ -86,7 +86,7 @@
     signal doneClicked
 
     __leftButton: Button {
-        text: i18n.dtr("ubuntu-sdk", "close")
+        text: i18n.dtr("ubuntu-ui-toolkit", "Close")
         visible: !doneButton
         /*! \internal */
         onClicked: {
@@ -96,7 +96,7 @@
     }
 
     __rightButton: Button {
-        text: i18n.dtr("ubuntu-sdk", "done")
+        text: i18n.dtr("ubuntu-ui-toolkit", "Done")
         color: UbuntuColors.orange
         visible: doneButton
         /*! \internal */

=== modified file 'po/ubuntu-ui-toolkit.pot'
--- po/ubuntu-ui-toolkit.pot	2013-05-30 12:07:03 +0000
+++ po/ubuntu-ui-toolkit.pot	2014-09-01 17:05:51 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: ubuntu-ui-toolkit\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-05-30 14:06+0200\n"
+"POT-Creation-Date: 2014-09-01 19:02+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -17,374 +17,116 @@
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: examples/ubuntu-ui-toolkit-gallery/Animations.qml:22
-msgid "NumberAnimation"
-msgstr ""
-
-#: examples/ubuntu-ui-toolkit-gallery/Animations.qml:26
-#: examples/ubuntu-ui-toolkit-gallery/Buttons.qml:25
-#: examples/ubuntu-ui-toolkit-gallery/Dialog.qml:27
-#: examples/ubuntu-ui-toolkit-gallery/ListItems.qml:23
-#: examples/ubuntu-ui-toolkit-gallery/ProgressBars.qml:26
-#: examples/ubuntu-ui-toolkit-gallery/ProgressBars.qml:59
-#: examples/ubuntu-ui-toolkit-gallery/Sheet.qml:38
-#: examples/ubuntu-ui-toolkit-gallery/Sheet.qml:71
-#: examples/ubuntu-ui-toolkit-gallery/Sliders.qml:25
-#: examples/ubuntu-ui-toolkit-gallery/TextInputs.qml:44
-msgid "Standard"
-msgstr ""
-
-#: examples/ubuntu-ui-toolkit-gallery/Animations.qml:56
-msgid "Standard Durations"
-msgstr ""
-
-#: examples/ubuntu-ui-toolkit-gallery/Animations.qml:60
-msgid "Snap"
-msgstr ""
-
-#: examples/ubuntu-ui-toolkit-gallery/Animations.qml:96
-msgid "Fast"
-msgstr ""
-
-#: examples/ubuntu-ui-toolkit-gallery/Animations.qml:132
-msgid "Slow"
-msgstr ""
-
-#: examples/ubuntu-ui-toolkit-gallery/Animations.qml:157
-msgid "Sleepy"
-msgstr ""
-
-#: examples/ubuntu-ui-toolkit-gallery/Buttons.qml:28
-#: examples/ubuntu-ui-toolkit-gallery/Buttons.qml:36
-#: examples/ubuntu-ui-toolkit-gallery/Buttons.qml:50
-#: examples/ubuntu-ui-toolkit-gallery/Buttons.qml:59
-msgid "Call"
-msgstr ""
-
-#: examples/ubuntu-ui-toolkit-gallery/Buttons.qml:33
-#: examples/ubuntu-ui-toolkit-gallery/UbuntuShape.qml:26
-msgid "Color"
-msgstr ""
-
-#: examples/ubuntu-ui-toolkit-gallery/Buttons.qml:42
-#: examples/ubuntu-ui-toolkit-gallery/ListItems.qml:41
-msgid "Icon"
-msgstr ""
-
-#: examples/ubuntu-ui-toolkit-gallery/Buttons.qml:56
-#: examples/ubuntu-ui-toolkit-gallery/TextInputs.qml:73
-#: examples/ubuntu-ui-toolkit-gallery/Toggles.qml:41
-#: examples/ubuntu-ui-toolkit-gallery/Toggles.qml:75
-msgid "Disabled"
-msgstr ""
-
-#: examples/ubuntu-ui-toolkit-gallery/Dialog.qml:30
-#: examples/ubuntu-ui-toolkit-gallery/Popover.qml:42
-#: examples/ubuntu-ui-toolkit-gallery/Sheet.qml:41
-#: examples/ubuntu-ui-toolkit-gallery/Sheet.qml:74
-msgid "Open"
-msgstr ""
-
-#: examples/ubuntu-ui-toolkit-gallery/Icons.qml:25
-msgid "Scaling"
-msgstr ""
-
-#: examples/ubuntu-ui-toolkit-gallery/Icons.qml:50
-msgid "Colorization"
-msgstr ""
-
-#: examples/ubuntu-ui-toolkit-gallery/ListItems.qml:26
-#: examples/ubuntu-ui-toolkit-gallery/ListItems.qml:34
-#: examples/ubuntu-ui-toolkit-gallery/ListItems.qml:44
-#: examples/ubuntu-ui-toolkit-gallery/ListItems.qml:53
-#: examples/ubuntu-ui-toolkit-gallery/ListItems.qml:62
-#: examples/ubuntu-ui-toolkit-gallery/ListItems.qml:71
-#: examples/ubuntu-ui-toolkit-gallery/ListItems.qml:83
-#: examples/ubuntu-ui-toolkit-gallery/ListItems.qml:95
-msgid "Label"
-msgstr ""
-
-#: examples/ubuntu-ui-toolkit-gallery/ListItems.qml:31
-msgid "Subtitled"
-msgstr ""
-
-#: examples/ubuntu-ui-toolkit-gallery/ListItems.qml:35
-msgid "Secondary label"
-msgstr ""
-
-#: examples/ubuntu-ui-toolkit-gallery/ListItems.qml:50
-msgid "Progression"
-msgstr ""
-
-#: examples/ubuntu-ui-toolkit-gallery/ListItems.qml:59
-msgid "Single value"
-msgstr ""
-
-#: examples/ubuntu-ui-toolkit-gallery/ListItems.qml:63
-msgid "Value"
-msgstr ""
-
-#: examples/ubuntu-ui-toolkit-gallery/ListItems.qml:68
-msgid "Multi value"
-msgstr ""
-
-#: examples/ubuntu-ui-toolkit-gallery/ListItems.qml:72
-#: examples/ubuntu-ui-toolkit-gallery/ListItems.qml:84
-msgid "Value 1"
-msgstr ""
-
-#: examples/ubuntu-ui-toolkit-gallery/ListItems.qml:73
-#: examples/ubuntu-ui-toolkit-gallery/ListItems.qml:85
-msgid "Value 2"
-msgstr ""
-
-#: examples/ubuntu-ui-toolkit-gallery/ListItems.qml:74
-#: examples/ubuntu-ui-toolkit-gallery/ListItems.qml:86
-msgid "Value 3"
-msgstr ""
-
-#: examples/ubuntu-ui-toolkit-gallery/ListItems.qml:75
-#: examples/ubuntu-ui-toolkit-gallery/ListItems.qml:87
-msgid "Value 4"
-msgstr ""
-
-#: examples/ubuntu-ui-toolkit-gallery/ListItems.qml:80
-msgid "Value selector"
-msgstr ""
-
-#: examples/ubuntu-ui-toolkit-gallery/ListItems.qml:92
-msgid "Control"
-msgstr ""
-
-#: examples/ubuntu-ui-toolkit-gallery/ListItems.qml:103
-msgid "Removable"
-msgstr ""
-
-#: examples/ubuntu-ui-toolkit-gallery/ListItems.qml:106
-msgid "Slide to remove"
-msgstr ""
-
-#: examples/ubuntu-ui-toolkit-gallery/ListItems.qml:116
-msgid "Grouped list"
-msgstr ""
-
-#: examples/ubuntu-ui-toolkit-gallery/Popover.qml:38
-msgid "Flickable"
-msgstr ""
-
-#: examples/ubuntu-ui-toolkit-gallery/Popover.qml:74
-msgid "Action #1"
-msgstr ""
-
-#: examples/ubuntu-ui-toolkit-gallery/Popover.qml:78
-msgid "Action #2"
-msgstr ""
-
-#: examples/ubuntu-ui-toolkit-gallery/Popover.qml:82
-msgid "Action #3"
-msgstr ""
-
-#: examples/ubuntu-ui-toolkit-gallery/Popover.qml:86
-msgid "Action #4"
-msgstr ""
-
-#: examples/ubuntu-ui-toolkit-gallery/Popover.qml:90
-msgid "Action #5"
-msgstr ""
-
-#: examples/ubuntu-ui-toolkit-gallery/ProgressBars.qml:22
-msgid "Progress Bar"
-msgstr ""
-
-#: examples/ubuntu-ui-toolkit-gallery/ProgressBars.qml:45
-msgid "Infinite"
-msgstr ""
-
-#: examples/ubuntu-ui-toolkit-gallery/ProgressBars.qml:55
-msgid "Activity Indicator"
-msgstr ""
-
-#: examples/ubuntu-ui-toolkit-gallery/Sheet.qml:26
-msgid "The visual style of the Sheet is early work and thus clunky looking."
-msgstr ""
-
-#: examples/ubuntu-ui-toolkit-gallery/Sheet.qml:51
-#: examples/ubuntu-ui-toolkit-gallery/Sheet.qml:84
-msgid "Title"
-msgstr ""
-
-#: examples/ubuntu-ui-toolkit-gallery/Sliders.qml:32
-#: examples/ubuntu-ui-toolkit-gallery/Sliders.qml:45
-#: examples/ubuntu-ui-toolkit-gallery/Sliders.qml:60
-#, qt-format
-msgid "value = %1"
-msgstr ""
-
-#: examples/ubuntu-ui-toolkit-gallery/Sliders.qml:37
-msgid "Live Update"
-msgstr ""
-
-#: examples/ubuntu-ui-toolkit-gallery/Sliders.qml:50
-msgid "Range"
-msgstr ""
-
-#: examples/ubuntu-ui-toolkit-gallery/TextInputs.qml:47
-msgid "Type me in..."
-msgstr ""
-
-#: examples/ubuntu-ui-toolkit-gallery/TextInputs.qml:53
-msgid "Password"
-msgstr ""
-
-#: examples/ubuntu-ui-toolkit-gallery/TextInputs.qml:63
-msgid "Numbers"
-msgstr ""
-
-#: examples/ubuntu-ui-toolkit-gallery/TextInputs.qml:87
-msgid "Default"
-msgstr ""
-
-#: examples/ubuntu-ui-toolkit-gallery/TextInputs.qml:96
-msgid "Expanding"
-msgstr ""
-
-#: examples/ubuntu-ui-toolkit-gallery/TextInputs.qml:107
-msgid "Rich Text"
-msgstr ""
-
-#: examples/ubuntu-ui-toolkit-gallery/Toggles.qml:26
-#: examples/ubuntu-ui-toolkit-gallery/Toggles.qml:60
-msgid "Unchecked"
-msgstr ""
-
-#: examples/ubuntu-ui-toolkit-gallery/Toggles.qml:33
-#: examples/ubuntu-ui-toolkit-gallery/Toggles.qml:67
-msgid "Checked"
-msgstr ""
-
-#: examples/ubuntu-ui-toolkit-gallery/UbuntuShape.qml:44
-msgid "Image"
-msgstr ""
-
-#: examples/ubuntu-ui-toolkit-gallery/UbuntuShape.qml:57
-msgid "Radius"
-msgstr ""
-
-#: examples/ubuntu-ui-toolkit-gallery/UbuntuShape.qml:87
-msgid "Sizes"
-msgstr ""
-
-#: examples/unit-converter/unit-converter.qml:147
-msgid "Clear"
-msgstr ""
-
-#: examples/unit-converter/unit-converter.qml:161
-msgid "Lengths"
-msgstr ""
-
-#: examples/unit-converter/unit-converter.qml:179
-msgid "Weights"
-msgstr ""
-
-#: modules/Ubuntu/Components/plugin/ucarguments.cpp:188
+#: Ubuntu/Components/plugin/statesaverbackend_p.cpp:154
+#, qt-format
+msgid ""
+"property \"%1\" of object %2 has type %3 and cannot be set to value \"%4\" "
+"of type %5"
+msgstr ""
+
+#: Ubuntu/Components/plugin/statesaverbackend_p.cpp:163
+#, qt-format
+msgid "property \"%1\" does not exist or is not writable for object %2"
+msgstr ""
+
+#: Ubuntu/Components/plugin/ucalarm.cpp:42
+#: Ubuntu/Components/plugin/ucalarm.cpp:136
+msgid "Alarm"
+msgstr ""
+
+#: Ubuntu/Components/plugin/ucalarm.cpp:684
+#: Ubuntu/Components/plugin/ucalarm.cpp:716
+msgid "Alarm has a pending operation."
+msgstr ""
+
+#: Ubuntu/Components/plugin/ucarguments.cpp:188
 msgid "Usage: "
 msgstr ""
 
-#: modules/Ubuntu/Components/plugin/ucarguments.cpp:209
+#: Ubuntu/Components/plugin/ucarguments.cpp:209
 msgid "Options:"
 msgstr ""
 
-#: modules/Ubuntu/Components/plugin/ucarguments.cpp:498
+#: Ubuntu/Components/plugin/ucarguments.cpp:498
 #, qt-format
 msgid "%1 is expecting an additional argument: %2"
 msgstr ""
 
-#: modules/Ubuntu/Components/plugin/ucarguments.cpp:503
+#: Ubuntu/Components/plugin/ucarguments.cpp:503
 #, qt-format
 msgid "%1 is expecting a value for argument: %2"
 msgstr ""
 
-#: modules/Ubuntu/Components/plugin/ucarguments.cpp:520
+#: Ubuntu/Components/plugin/ucarguments.cpp:520
 #, qt-format
 msgid "%1 is expecting additional arguments: %2"
 msgstr ""
 
-#: modules/Ubuntu/Components/TextInputPopover.qml:24
+#: Ubuntu/Components/plugin/ucmousefilters.cpp:1064
+msgid "Ignoring AfterItem priority for InverseMouse filters."
+msgstr ""
+
+#: Ubuntu/Components/plugin/ucstatesaver.cpp:46
+msgid "Warning: attachee must have an ID. State will not be saved."
+msgstr ""
+
+#: Ubuntu/Components/plugin/ucstatesaver.cpp:56
+#, qt-format
+msgid ""
+"Warning: attachee's UUID is already registered, state won't be saved: %1"
+msgstr ""
+
+#: Ubuntu/Components/plugin/ucstatesaver.cpp:102
+#, qt-format
+msgid ""
+"All the parents must have an id.\n"
+"State saving disabled for %1, class %2"
+msgstr ""
+
+#: Ubuntu/Components/plugin/uctheme.cpp:233
+msgid "Theme not found: "
+msgstr ""
+
+#: Ubuntu/Components/Popups/ComposerSheet.qml:80
+msgid "Cancel"
+msgstr ""
+
+#: Ubuntu/Components/Popups/ComposerSheet.qml:90
+msgid "Confirm"
+msgstr ""
+
+#: Ubuntu/Components/Popups/DefaultSheet.qml:89
+msgid "Close"
+msgstr ""
+
+#: Ubuntu/Components/Popups/DefaultSheet.qml:99
+msgid "Done"
+msgstr ""
+
+#: Ubuntu/Components/TextInputPopover.qml:27
 msgid "Select All"
 msgstr ""
 
-#: modules/Ubuntu/Components/TextInputPopover.qml:29
-msgid "Select Word"
-msgstr ""
-
-#: modules/Ubuntu/Components/TextInputPopover.qml:34
+#: Ubuntu/Components/TextInputPopover.qml:33
 msgid "Cut"
 msgstr ""
 
-#: modules/Ubuntu/Components/TextInputPopover.qml:39
+#: Ubuntu/Components/TextInputPopover.qml:42
 msgid "Copy"
 msgstr ""
 
-#: modules/Ubuntu/Components/TextInputPopover.qml:44
+#: Ubuntu/Components/TextInputPopover.qml:49
 msgid "Paste"
 msgstr ""
 
-#: modules/Ubuntu/Components/TextInputPopover.qml:49
-msgid "Undo"
-msgstr ""
-
-#: modules/Ubuntu/Components/TextInputPopover.qml:54
-msgid "Redo"
-msgstr ""
-
-#: modules/Ubuntu/Components/ToolbarActions.qml:86
-msgid "Back"
-msgstr ""
-
-#: tests/resources/pagestack/MyCustomPage.qml:21
-#: tests/resources/tabs/MyCustomPage.qml:21
-msgid "My custom page"
-msgstr ""
-
-#: tests/resources/pagestack/MyCustomPage.qml:33
-#: tests/resources/tabs/MyCustomPage.qml:33
-msgid ""
-"This is an external page\n"
-"with a locked toolbar."
-msgstr ""
-
-#: tests/resources/pagestack/PageStack.qml:38
-msgid "Root page"
-msgstr ""
-
-#: tests/resources/pagestack/PageStack.qml:44
-msgid "Page one"
-msgstr ""
-
-#: tests/resources/pagestack/PageStack.qml:49
-msgid "External page"
-msgstr ""
-
-#: tests/resources/pagestack/PageStack.qml:58
-msgid "First page"
-msgstr ""
-
-#: tests/resources/pagestack/PageStack.qml:64
-msgid "Root page (again)"
-msgstr ""
-
-#: tests/resources/pagestack/PageStack.qml:69
-msgid "Red rectangle"
-msgstr ""
-
-#: tests/resources/tabs/Tabs.qml:32
-msgid "Simple page"
-msgstr ""
-
-#: tests/resources/tabs/Tabs.qml:77
-msgid "External"
-msgstr ""
-
-#: tests/resources/tabs/Tabs.qml:85
-msgid "List view"
+#: Ubuntu/Components/Themes/Ambiance/ProgressBarStyle.qml:57
+msgid "In Progress"
+msgstr ""
+
+#: Ubuntu/Components/Themes/Ambiance/PullToRefreshStyle.qml:28
+msgid "Release to refresh..."
+msgstr ""
+
+#: Ubuntu/Components/Themes/Ambiance/PullToRefreshStyle.qml:28
+msgid "Pull to refresh..."
 msgstr ""

=== modified file 'po/update-pot.sh'
--- po/update-pot.sh	2014-07-14 17:34:44 +0000
+++ po/update-pot.sh	2014-09-01 17:05:51 +0000
@@ -48,6 +48,9 @@
     --add-comments=TRANSLATORS \
     --keyword=tr \
     --keyword=tr:1,2 \
+    --keyword=dtr:2 \
+    --keyword=dtr:2,3 \
+    --package-name $DOMAIN \
     --package-name $DOMAIN \
     --copyright-holder "Canonical Ltd"