Merge lp:~kissiel/checkbox/translations into lp:checkbox
- translations
- Merge into trunk
Status: | Merged |
---|---|
Approved by: | Sylvain Pineau |
Approved revision: | 4015 |
Merged at revision: | 4044 |
Proposed branch: | lp:~kissiel/checkbox/translations |
Merge into: | lp:checkbox |
Diff against target: |
568 lines (+337/-28) 12 files modified
checkbox-touch/Makefile (+22/-0) checkbox-touch/checkbox-touch.qml (+8/-5) checkbox-touch/components/CheckboxTouchApplication.qml (+1/-1) checkbox-touch/components/CommandOutputPage.qml (+2/-0) checkbox-touch/components/InteractIntroPage.qml (+1/-1) checkbox-touch/components/ResultsPage.qml (+1/-0) checkbox-touch/components/ResumeSessionPage.qml (+1/-1) checkbox-touch/components/TestVerificationPage.qml (+2/-0) checkbox-touch/components/UserInteractSummaryPage.qml (+2/-1) checkbox-touch/components/WelcomePage.qml (+3/-3) checkbox-touch/confinement/plainbox-confined-shell.qml (+1/-1) checkbox-touch/po/checkbox-touch.pot (+293/-15) |
To merge this branch: | bzr merge lp:~kissiel/checkbox/translations |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Maciej Kisielewski | Approve | ||
Review via email: mp+273655@code.launchpad.net |
Commit message
Description of the change
This MR brings bunch of fixes to get translating checkbox-converged going.
4222e31 checkbox-touch: add translations-
8e2be56 checkbox-touch: add comments for translators
e55c697 checkbox-touch: reword some strings
62ddb10 checkbox-touch: translation template update
Sylvain Pineau (sylvain-pineau) wrote : | # |
The attempt to merge lp:~kissiel/checkbox/translations into lp:checkbox failed. Below is the output from the failed tests.
[precise] starting container
[precise] (timing) 0.09user 0.06system 0:05.30elapsed 2%CPU (0avgtext+0avgdata 10196maxresident)k
[precise] (timing) 0inputs+32outputs (0major+
[precise] provisioning container
[precise] (timing) 40.40user 10.31system 0:59.85elapsed 84%CPU (0avgtext+0avgdata 94852maxresident)k
[precise] (timing) 0inputs+
[precise-testing] Starting tests...
Found a test script: ./checkbox-
[precise-testing] container-
[precise-testing] (timing) 0.92user 0.19system 0:01.21elapsed 92%CPU (0avgtext+0avgdata 50416maxresident)k
[precise-testing] (timing) 0inputs+1976outputs (0major+
Found a test script: ./checkbox-
[precise-testing] container-
[precise-testing] (timing) 26.38user 0.20system 0:26.64elapsed 99%CPU (0avgtext+0avgdata 150484maxresident)k
[precise-testing] (timing) 0inputs+1320outputs (0major+
Found a test script: ./checkbox-
[precise-testing] container-
[precise-testing] (timing) 0.00user 0.02system 0:00.03elapsed 78%CPU (0avgtext+0avgdata 2180maxresident)k
[precise-testing] (timing) 0inputs+8outputs (0major+
Found a test script: ./plainbox/
[precise-testing] container-
[precise-testing] (timing) 1.02user 0.10system 0:01.13elapsed 98%CPU (0avgtext+0avgdata 45828maxresident)k
[precise-testing] (timing) 0inputs+64outputs (0major+
Found a test script: ./plainbox/
[precise-testing] 001-container-
[precise-testing] (timing) 0.24user 0.05system 0:00.30elapsed 96%CPU (0avgtext+0avgdata 14508maxresident)k
[precise-testing] (timing) 0inputs+96outputs (0major+
Found a test script: ./plainbox/
[precise-testing] container-
[precise-testing] (timing) 53.73user 1.40system 0:55.30elapsed 99%CPU (0avgtext+0avgdata 196568maxresident)k
[precise-testing] (timing) 0inputs+3256outputs (0major+
Found a test script: ./plainbox/
[precise-testing] container-
[precise-testing] (timing) 149.81user 0.65system 2:30.75elapsed 99%CPU (0avgtext+0avgdata 176848maxresident)k
[precise-testing] (timing) 0inputs+
Found a test script: ./plainbox/
[precise-testing] container-
[precise-testing] (timing) ...
Sylvain Pineau (sylvain-pineau) wrote : | # |
The attempt to merge lp:~kissiel/checkbox/translations into lp:checkbox failed. Below is the output from the failed tests.
[precise] starting container
[precise] (timing) 0.09user 0.06system 0:04.30elapsed 3%CPU (0avgtext+0avgdata 10196maxresident)k
[precise] (timing) 0inputs+32outputs (0major+
[precise] provisioning container
[precise] (timing) 41.18user 10.25system 1:25.63elapsed 60%CPU (0avgtext+0avgdata 94848maxresident)k
[precise] (timing) 0inputs+
[precise-testing] Starting tests...
Found a test script: ./checkbox-
[precise-testing] container-
[precise-testing] (timing) 0.95user 0.16system 0:01.21elapsed 92%CPU (0avgtext+0avgdata 50408maxresident)k
[precise-testing] (timing) 0inputs+1976outputs (0major+
Found a test script: ./checkbox-
[precise-testing] container-
[precise-testing] (timing) 25.33user 0.21system 0:25.60elapsed 99%CPU (0avgtext+0avgdata 150408maxresident)k
[precise-testing] (timing) 0inputs+1320outputs (0major+
Found a test script: ./checkbox-
[precise-testing] container-
[precise-testing] (timing) 0.01user 0.01system 0:00.03elapsed 77%CPU (0avgtext+0avgdata 2180maxresident)k
[precise-testing] (timing) 0inputs+8outputs (0major+
Found a test script: ./plainbox/
[precise-testing] container-
[precise-testing] (timing) 0.99user 0.10system 0:01.10elapsed 98%CPU (0avgtext+0avgdata 45824maxresident)k
[precise-testing] (timing) 0inputs+64outputs (0major+
Found a test script: ./plainbox/
[precise-testing] 001-container-
[precise-testing] (timing) 0.22user 0.05system 0:00.29elapsed 96%CPU (0avgtext+0avgdata 14504maxresident)k
[precise-testing] (timing) 0inputs+96outputs (0major+
Found a test script: ./plainbox/
[precise-testing] container-
[precise-testing] (timing) 53.99user 1.55system 0:55.72elapsed 99%CPU (0avgtext+0avgdata 196560maxresident)k
[precise-testing] (timing) 0inputs+3256outputs (0major+
Found a test script: ./plainbox/
[precise-testing] container-
[precise-testing] (timing) 149.87user 0.76system 2:30.91elapsed 99%CPU (0avgtext+0avgdata 176888maxresident)k
[precise-testing] (timing) 0inputs+
Found a test script: ./plainbox/
[precise-testing] container-
[precise-testing] (timing) ...
Preview Diff
1 | === modified file 'checkbox-touch/Makefile' | |||
2 | --- checkbox-touch/Makefile 2015-09-18 16:40:09 +0000 | |||
3 | +++ checkbox-touch/Makefile 2015-10-07 17:05:15 +0000 | |||
4 | @@ -8,6 +8,14 @@ | |||
5 | 8 | # sudo apt-get install python-autopilot autopilot-qt | 8 | # sudo apt-get install python-autopilot autopilot-qt |
6 | 9 | ############################################################# | 9 | ############################################################# |
7 | 10 | 10 | ||
8 | 11 | TRANSLATION_ROOT=. | ||
9 | 12 | |||
10 | 13 | APP_ID=com.ubuntu.checkbox | ||
11 | 14 | |||
12 | 15 | MO_FILES=$(foreach infile,$(basename $(notdir $(wildcard ./po/*.po))),$(TRANSLATION_ROOT)/share/locale/$(infile)/LC_MESSAGES/$(APP_ID).mo) | ||
13 | 16 | QMLJS_FILES:=$(shell find . -name "*.qml" -o -name "*.js" | grep -v ./tests) | ||
14 | 17 | PY_FILES=$(wildcard ./py/*.py) build-me get-libs | ||
15 | 18 | |||
16 | 11 | all: | 19 | all: |
17 | 12 | 20 | ||
18 | 13 | autopilot: | 21 | autopilot: |
19 | @@ -21,3 +29,17 @@ | |||
20 | 21 | run: | 29 | run: |
21 | 22 | /usr/bin/qmlscene $@ checkbox-touch.qml | 30 | /usr/bin/qmlscene $@ checkbox-touch.qml |
22 | 23 | 31 | ||
23 | 32 | build-translations: $(MO_FILES) | ||
24 | 33 | echo $(MO_FILES) | ||
25 | 34 | |||
26 | 35 | po: | ||
27 | 36 | mkdir -p $(CURDIR)/po | ||
28 | 37 | |||
29 | 38 | po/checkbox-touch.pot: $(QMLJS_FILES) $(PY_FILES) | po | ||
30 | 39 | xgettext -o po/checkbox-touch.pot --qt --c++ --add-comments=TRANSLATORS --keyword=tr --keyword=tr:1,2 $(QMLJS_FILES) --from-code=UTF-8 | ||
31 | 40 | xgettext -o po/checkbox-touch.pot --join-existing --language=python --add-comments=TRANSLATORS --keyword=_ --keyword=N_ $(PY_FILES) | ||
32 | 41 | |||
33 | 42 | |||
34 | 43 | $(TRANSLATION_ROOT)/share/locale/%/LC_MESSAGES/$(APP_ID).mo: po/%.po | ||
35 | 44 | mkdir -p $(TRANSLATION_ROOT)/share/locale/$*/LC_MESSAGES && msgfmt -o $@ $^ | ||
36 | 45 | |||
37 | 24 | 46 | ||
38 | === modified file 'checkbox-touch/checkbox-touch.qml' | |||
39 | --- checkbox-touch/checkbox-touch.qml 2015-09-21 04:58:38 +0000 | |||
40 | +++ checkbox-touch/checkbox-touch.qml 2015-10-07 17:05:15 +0000 | |||
41 | @@ -191,6 +191,9 @@ | |||
42 | 191 | 191 | ||
43 | 192 | WelcomePage { | 192 | WelcomePage { |
44 | 193 | id: welcomePage | 193 | id: welcomePage |
45 | 194 | // TRANSLATORS: %1 means program version, %2 repository revision and %3 | ||
46 | 195 | // date when the package was built | ||
47 | 196 | // TRANSLATORS: keep the '\n' characters at the end of each line | ||
48 | 194 | welcomeText: i18n.tr("Welcome to Checkbox Touch\nVersion: %1\n(%2 %3)") | 197 | welcomeText: i18n.tr("Welcome to Checkbox Touch\nVersion: %1\n(%2 %3)") |
49 | 195 | .arg(app.applicationVersion).arg(appSettings.revision).arg(appSettings.clickBuildDate) | 198 | .arg(app.applicationVersion).arg(appSettings.revision).arg(appSettings.clickBuildDate) |
50 | 196 | onStartTestingTriggered: { | 199 | onStartTestingTriggered: { |
51 | @@ -271,8 +274,8 @@ | |||
52 | 271 | id: resumeSessionPage | 274 | id: resumeSessionPage |
53 | 272 | onRerunLast: app.resumeSession(true, processNextTest) | 275 | onRerunLast: app.resumeSession(true, processNextTest) |
54 | 273 | onContinueSession: app.resumeSession(false, processNextTest) | 276 | onContinueSession: app.resumeSession(false, processNextTest) |
57 | 274 | resumeText: i18n.tr("Checkbox did not finish completely.\nDo you want \ | 277 | resumeText: i18n.tr("Previous session did not finish completely.\nDo you want \ |
58 | 275 | to rerun last test, continue to the next test, or restart from the beginning?") | 278 | to rerun last test, continue to the next test, or start a new session?") |
59 | 276 | onRestartSession: { | 279 | onRestartSession: { |
60 | 277 | pageStack.clear(); | 280 | pageStack.clear(); |
61 | 278 | pageStack.push(welcomePage); | 281 | pageStack.push(welcomePage); |
62 | @@ -339,7 +342,7 @@ | |||
63 | 339 | id: testSelectionPage | 342 | id: testSelectionPage |
64 | 340 | objectName: "testSelectionPage" | 343 | objectName: "testSelectionPage" |
65 | 341 | title: i18n.tr("Select tests") | 344 | title: i18n.tr("Select tests") |
67 | 342 | continueText: i18n.tr("Start Testing") | 345 | continueText: i18n.tr("Start testing") |
68 | 343 | largeBuffer: args.values["autopilot"] | 346 | largeBuffer: args.values["autopilot"] |
69 | 344 | 347 | ||
70 | 345 | function setup(continuation) { | 348 | function setup(continuation) { |
71 | @@ -541,7 +544,7 @@ | |||
72 | 541 | app.exportResults('2013.com.canonical.plainbox::xlsx', ["with-sys-info", "with-summary", "with-job-description", "with-text-attachments", "with-unit-categories"], function(uri) { | 544 | app.exportResults('2013.com.canonical.plainbox::xlsx', ["with-sys-info", "with-summary", "with-job-description", "with-text-attachments", "with-unit-categories"], function(uri) { |
73 | 542 | console.log(uri) | 545 | console.log(uri) |
74 | 543 | CbtDialogLogic.showDialog(resultsPage, i18n.tr("Reports have been saved to your Documents folder"), | 546 | CbtDialogLogic.showDialog(resultsPage, i18n.tr("Reports have been saved to your Documents folder"), |
76 | 544 | [{ "text": i18n.tr("OK"), "color": UbuntuColors.green}, {"text": i18n.tr("View Report"), "color": UbuntuColors.green, "onClicked": function(uri) { | 547 | [{ "text": i18n.tr("OK"), "color": UbuntuColors.green}, {"text": i18n.tr("View report"), "color": UbuntuColors.green, "onClicked": function(uri) { |
77 | 545 | var webviewer = Qt.createComponent(Qt.resolvedUrl("components/WebViewer.qml")).createObject(); | 548 | var webviewer = Qt.createComponent(Qt.resolvedUrl("components/WebViewer.qml")).createObject(); |
78 | 546 | webviewer.uri = htmlReportUrl; | 549 | webviewer.uri = htmlReportUrl; |
79 | 547 | pageStack.push(webviewer); | 550 | pageStack.push(webviewer); |
80 | @@ -564,7 +567,7 @@ | |||
81 | 564 | }, | 567 | }, |
82 | 565 | function(error) { | 568 | function(error) { |
83 | 566 | ErrorLogic.showError(mainView, | 569 | ErrorLogic.showError(mainView, |
85 | 567 | i18n.tr("Could not submit results. Reason:\n" + error), | 570 | i18n.tr("Could not submit report. Reason:\n" + error), |
86 | 568 | function(){}, | 571 | function(){}, |
87 | 569 | i18n.tr("OK")); | 572 | i18n.tr("OK")); |
88 | 570 | resultsPage.unlatchSubmission(); | 573 | resultsPage.unlatchSubmission(); |
89 | 571 | 574 | ||
90 | === modified file 'checkbox-touch/components/CheckboxTouchApplication.qml' | |||
91 | --- checkbox-touch/components/CheckboxTouchApplication.qml 2015-10-05 18:39:26 +0000 | |||
92 | +++ checkbox-touch/components/CheckboxTouchApplication.qml 2015-10-07 17:05:15 +0000 | |||
93 | @@ -62,7 +62,7 @@ | |||
94 | 62 | if (!result["session_id"]) { | 62 | if (!result["session_id"]) { |
95 | 63 | pageStack.pop(); | 63 | pageStack.pop(); |
96 | 64 | ErrorLogic.showError(mainView, | 64 | ErrorLogic.showError(mainView, |
98 | 65 | i18n.tr("Could not resume session "), | 65 | i18n.tr("Could not resume session"), |
99 | 66 | function() { | 66 | function() { |
100 | 67 | startSession(); | 67 | startSession(); |
101 | 68 | return; | 68 | return; |
102 | 69 | 69 | ||
103 | === modified file 'checkbox-touch/components/CommandOutputPage.qml' | |||
104 | --- checkbox-touch/components/CommandOutputPage.qml 2015-09-07 20:06:44 +0000 | |||
105 | +++ checkbox-touch/components/CommandOutputPage.qml 2015-10-07 17:05:15 +0000 | |||
106 | @@ -50,6 +50,7 @@ | |||
107 | 50 | id: skipAction | 50 | id: skipAction |
108 | 51 | objectName: "copyOutputAction" | 51 | objectName: "copyOutputAction" |
109 | 52 | iconName: "edit-copy" | 52 | iconName: "edit-copy" |
110 | 53 | // TRANSLATORS: a verb (call to action) | ||
111 | 53 | text: i18n.tr("Copy") | 54 | text: i18n.tr("Copy") |
112 | 54 | onTriggered: Clipboard.push(mimeData) | 55 | onTriggered: Clipboard.push(mimeData) |
113 | 55 | } | 56 | } |
114 | @@ -93,6 +94,7 @@ | |||
115 | 93 | 94 | ||
116 | 94 | Button { | 95 | Button { |
117 | 95 | Layout.fillWidth: true | 96 | Layout.fillWidth: true |
118 | 97 | // TRANSLATORS: This is a label on the button that goes back a page | ||
119 | 96 | text: i18n.tr("Back") | 98 | text: i18n.tr("Back") |
120 | 97 | onClicked: pageStack.pop() | 99 | onClicked: pageStack.pop() |
121 | 98 | } | 100 | } |
122 | 99 | 101 | ||
123 | === modified file 'checkbox-touch/components/InteractIntroPage.qml' | |||
124 | --- checkbox-touch/components/InteractIntroPage.qml 2015-09-15 10:58:58 +0000 | |||
125 | +++ checkbox-touch/components/InteractIntroPage.qml 2015-10-07 17:05:15 +0000 | |||
126 | @@ -96,7 +96,7 @@ | |||
127 | 96 | objectName: "startTestButton" | 96 | objectName: "startTestButton" |
128 | 97 | unlatchedColor: UbuntuColors.green | 97 | unlatchedColor: UbuntuColors.green |
129 | 98 | Layout.fillWidth: true | 98 | Layout.fillWidth: true |
131 | 99 | text: i18n.tr("Test") | 99 | text: i18n.tr("Start the test") |
132 | 100 | onLatchedClicked: { | 100 | onLatchedClicked: { |
133 | 101 | userInteractVerifyIntroPage.state = "testing" | 101 | userInteractVerifyIntroPage.state = "testing" |
134 | 102 | testStarted(); | 102 | testStarted(); |
135 | 103 | 103 | ||
136 | === modified file 'checkbox-touch/components/ResultsPage.qml' | |||
137 | --- checkbox-touch/components/ResultsPage.qml 2015-09-04 13:15:26 +0000 | |||
138 | +++ checkbox-touch/components/ResultsPage.qml 2015-10-07 17:05:15 +0000 | |||
139 | @@ -167,6 +167,7 @@ | |||
140 | 167 | unlatchedColor: UbuntuColors.green | 167 | unlatchedColor: UbuntuColors.green |
141 | 168 | visible: submissionName | 168 | visible: submissionName |
142 | 169 | Layout.fillWidth: true | 169 | Layout.fillWidth: true |
143 | 170 | // TRANSLATORS: follwing string will be followed by a service name, e.g. "certification website" | ||
144 | 170 | text: i18n.tr("Submit results to " + submissionName) | 171 | text: i18n.tr("Submit results to " + submissionName) |
145 | 171 | onLatchedClicked: submitReportClicked(); | 172 | onLatchedClicked: submitReportClicked(); |
146 | 172 | } | 173 | } |
147 | 173 | 174 | ||
148 | === modified file 'checkbox-touch/components/ResumeSessionPage.qml' | |||
149 | --- checkbox-touch/components/ResumeSessionPage.qml 2015-07-17 08:36:57 +0000 | |||
150 | +++ checkbox-touch/components/ResumeSessionPage.qml 2015-10-07 17:05:15 +0000 | |||
151 | @@ -114,7 +114,7 @@ | |||
152 | 114 | Layout.fillHeight: true | 114 | Layout.fillHeight: true |
153 | 115 | Layout.fillWidth: true | 115 | Layout.fillWidth: true |
154 | 116 | color: "white" | 116 | color: "white" |
156 | 117 | text: i18n.tr("Restart") | 117 | text: i18n.tr("Start new session") |
157 | 118 | } | 118 | } |
158 | 119 | onLatchedClicked: { | 119 | onLatchedClicked: { |
159 | 120 | restartSession(); | 120 | restartSession(); |
160 | 121 | 121 | ||
161 | === modified file 'checkbox-touch/components/TestVerificationPage.qml' | |||
162 | --- checkbox-touch/components/TestVerificationPage.qml 2015-09-15 11:00:43 +0000 | |||
163 | +++ checkbox-touch/components/TestVerificationPage.qml 2015-10-07 17:05:15 +0000 | |||
164 | @@ -68,6 +68,7 @@ | |||
165 | 68 | objectName: "passButton" | 68 | objectName: "passButton" |
166 | 69 | unlatchedColor: UbuntuColors.green | 69 | unlatchedColor: UbuntuColors.green |
167 | 70 | Layout.fillWidth: true | 70 | Layout.fillWidth: true |
168 | 71 | // TRANSLATORS: this string is on a button that marks the given test as passed | ||
169 | 71 | text: i18n.tr("Pass") | 72 | text: i18n.tr("Pass") |
170 | 72 | onLatchedClicked: { | 73 | onLatchedClicked: { |
171 | 73 | test["outcome"] = "pass"; | 74 | test["outcome"] = "pass"; |
172 | @@ -81,6 +82,7 @@ | |||
173 | 81 | objectName: "failButton" | 82 | objectName: "failButton" |
174 | 82 | unlatchedColor: UbuntuColors.red | 83 | unlatchedColor: UbuntuColors.red |
175 | 83 | Layout.fillWidth: true | 84 | Layout.fillWidth: true |
176 | 85 | // TRANSLATORS: this string is on a button that marks the given test as failed | ||
177 | 84 | text: i18n.tr("Fail") | 86 | text: i18n.tr("Fail") |
178 | 85 | onLatchedClicked: { | 87 | onLatchedClicked: { |
179 | 86 | test["outcome"] = "fail"; | 88 | test["outcome"] = "fail"; |
180 | 87 | 89 | ||
181 | === modified file 'checkbox-touch/components/UserInteractSummaryPage.qml' | |||
182 | --- checkbox-touch/components/UserInteractSummaryPage.qml 2015-09-15 11:02:02 +0000 | |||
183 | +++ checkbox-touch/components/UserInteractSummaryPage.qml 2015-10-07 17:05:15 +0000 | |||
184 | @@ -56,6 +56,7 @@ | |||
185 | 56 | Label { | 56 | Label { |
186 | 57 | fontSize: "large" | 57 | fontSize: "large" |
187 | 58 | Layout.fillHeight: true | 58 | Layout.fillHeight: true |
188 | 59 | // TRANSLATORS: this string will be followed by either "PASSED" or "FAILED" | ||
189 | 59 | text : i18n.tr("This test ") | 60 | text : i18n.tr("This test ") |
190 | 60 | wrapMode: Text.WrapAtWordBoundaryOrAnywhere | 61 | wrapMode: Text.WrapAtWordBoundaryOrAnywhere |
191 | 61 | } | 62 | } |
192 | @@ -84,7 +85,7 @@ | |||
193 | 84 | Layout.fillHeight: true | 85 | Layout.fillHeight: true |
194 | 85 | Layout.fillWidth: true | 86 | Layout.fillWidth: true |
195 | 86 | wrapMode: Text.WrapAtWordBoundaryOrAnywhere | 87 | wrapMode: Text.WrapAtWordBoundaryOrAnywhere |
197 | 87 | text : i18n.tr("You can go back to rerun it or continue to the next test.") | 88 | text : i18n.tr("You can go back to rerun the test or continue to the next test.") |
198 | 88 | } | 89 | } |
199 | 89 | 90 | ||
200 | 90 | Button { | 91 | Button { |
201 | 91 | 92 | ||
202 | === modified file 'checkbox-touch/components/WelcomePage.qml' | |||
203 | --- checkbox-touch/components/WelcomePage.qml 2015-07-17 08:36:57 +0000 | |||
204 | +++ checkbox-touch/components/WelcomePage.qml 2015-10-07 17:05:15 +0000 | |||
205 | @@ -60,7 +60,7 @@ | |||
206 | 60 | bottom: startTestButton.top | 60 | bottom: startTestButton.top |
207 | 61 | } | 61 | } |
208 | 62 | 62 | ||
210 | 63 | text: i18n.tr("Welcome text") | 63 | text: "" |
211 | 64 | fontSize: "large" | 64 | fontSize: "large" |
212 | 65 | verticalAlignment: Text.AlignVCenter | 65 | verticalAlignment: Text.AlignVCenter |
213 | 66 | horizontalAlignment: Text.AlignHCenter | 66 | horizontalAlignment: Text.AlignHCenter |
214 | @@ -76,7 +76,7 @@ | |||
215 | 76 | }, | 76 | }, |
216 | 77 | State { | 77 | State { |
217 | 78 | name: "loaded" | 78 | name: "loaded" |
219 | 79 | PropertyChanges { target: startTestButton; enabled: true; color: UbuntuColors.green; text: i18n.tr("Start Testing")} | 79 | PropertyChanges { target: startTestButton; enabled: true; color: UbuntuColors.green; text: i18n.tr("Start testing")} |
220 | 80 | PropertyChanges { target: loadingSpinner; running: false} | 80 | PropertyChanges { target: loadingSpinner; running: false} |
221 | 81 | } | 81 | } |
222 | 82 | ] | 82 | ] |
223 | @@ -114,7 +114,7 @@ | |||
224 | 114 | } | 114 | } |
225 | 115 | 115 | ||
226 | 116 | unlatchedColor: UbuntuColors.green | 116 | unlatchedColor: UbuntuColors.green |
228 | 117 | text: i18n.tr("Start Testing") | 117 | text: i18n.tr("Start testing") |
229 | 118 | onLatchedClicked: startTestingTriggered(); | 118 | onLatchedClicked: startTestingTriggered(); |
230 | 119 | } | 119 | } |
231 | 120 | } | 120 | } |
232 | 121 | 121 | ||
233 | === modified file 'checkbox-touch/confinement/plainbox-confined-shell.qml' | |||
234 | --- checkbox-touch/confinement/plainbox-confined-shell.qml 2015-07-23 10:48:33 +0000 | |||
235 | +++ checkbox-touch/confinement/plainbox-confined-shell.qml 2015-10-07 17:05:15 +0000 | |||
236 | @@ -94,7 +94,7 @@ | |||
237 | 94 | anchors.fill: parent | 94 | anchors.fill: parent |
238 | 95 | Label { | 95 | Label { |
239 | 96 | anchors.fill: parent | 96 | anchors.fill: parent |
241 | 97 | text: i18n.tr("sending results - you should not see this page :-)") | 97 | text: i18n.tr("Sending report - you should not see this page :-)") |
242 | 98 | } | 98 | } |
243 | 99 | } | 99 | } |
244 | 100 | ContentPeer { | 100 | ContentPeer { |
245 | 101 | 101 | ||
246 | === modified file 'checkbox-touch/po/checkbox-touch.pot' | |||
247 | --- checkbox-touch/po/checkbox-touch.pot 2014-08-11 14:17:45 +0000 | |||
248 | +++ checkbox-touch/po/checkbox-touch.pot 2015-10-07 17:05:15 +0000 | |||
249 | @@ -8,7 +8,7 @@ | |||
250 | 8 | msgstr "" | 8 | msgstr "" |
251 | 9 | "Project-Id-Version: PACKAGE VERSION\n" | 9 | "Project-Id-Version: PACKAGE VERSION\n" |
252 | 10 | "Report-Msgid-Bugs-To: \n" | 10 | "Report-Msgid-Bugs-To: \n" |
254 | 11 | "POT-Creation-Date: 2014-08-11 15:18+0200\n" | 11 | "POT-Creation-Date: 2015-10-07 17:43+0200\n" |
255 | 12 | "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" | 12 | "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" |
256 | 13 | "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" | 13 | "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" |
257 | 14 | "Language-Team: LANGUAGE <LL@li.org>\n" | 14 | "Language-Team: LANGUAGE <LL@li.org>\n" |
258 | @@ -17,18 +17,296 @@ | |||
259 | 17 | "Content-Type: text/plain; charset=CHARSET\n" | 17 | "Content-Type: text/plain; charset=CHARSET\n" |
260 | 18 | "Content-Transfer-Encoding: 8bit\n" | 18 | "Content-Transfer-Encoding: 8bit\n" |
261 | 19 | 19 | ||
276 | 20 | #: main.qml:26 | 20 | #: checkbox-touch.qml:70 |
277 | 21 | msgid "Simple" | 21 | msgid "Run Checkbox-Touch in autopilot-testing mode" |
278 | 22 | msgstr "" | 22 | msgstr "" |
279 | 23 | 23 | ||
280 | 24 | #: main.qml:39 | 24 | #: checkbox-touch.qml:75 |
281 | 25 | msgid "Hello.." | 25 | msgid "Write only warnings and errors to standard error" |
282 | 26 | msgstr "" | 26 | msgstr "" |
283 | 27 | 27 | ||
284 | 28 | #: main.qml:46 | 28 | #: checkbox-touch.qml:81 |
285 | 29 | msgid "Tap me!" | 29 | msgid "Path to a file containing checkbox-touch settings" |
286 | 30 | msgstr "" | 30 | msgstr "" |
287 | 31 | 31 | ||
288 | 32 | #: main.qml:49 | 32 | #. TRANSLATORS: %1 means program version, %2 repository revision and %3 |
289 | 33 | msgid "..world!" | 33 | #. date when the package was built |
290 | 34 | #. TRANSLATORS: keep the '\n' characters at the end of each line | ||
291 | 35 | #: checkbox-touch.qml:197 | ||
292 | 36 | #, qt-format | ||
293 | 37 | msgid "" | ||
294 | 38 | "Welcome to Checkbox Touch\n" | ||
295 | 39 | "Version: %1\n" | ||
296 | 40 | "(%2 %3)" | ||
297 | 41 | msgstr "" | ||
298 | 42 | |||
299 | 43 | #: checkbox-touch.qml:277 | ||
300 | 44 | msgid "" | ||
301 | 45 | "Previous session did not finish completely.\n" | ||
302 | 46 | "Do you want to rerun last test, continue to the next test, or start a new " | ||
303 | 47 | "session?" | ||
304 | 48 | msgstr "" | ||
305 | 49 | |||
306 | 50 | #: checkbox-touch.qml:288 | ||
307 | 51 | msgid "Select test plan" | ||
308 | 52 | msgstr "" | ||
309 | 53 | |||
310 | 54 | #: checkbox-touch.qml:315 | ||
311 | 55 | msgid "Select categories" | ||
312 | 56 | msgstr "" | ||
313 | 57 | |||
314 | 58 | #: checkbox-touch.qml:344 | ||
315 | 59 | msgid "Select tests" | ||
316 | 60 | msgstr "" | ||
317 | 61 | |||
318 | 62 | #: checkbox-touch.qml:345 components/WelcomePage.qml:79 | ||
319 | 63 | #: components/WelcomePage.qml:117 | ||
320 | 64 | msgid "Start testing" | ||
321 | 65 | msgstr "" | ||
322 | 66 | |||
323 | 67 | #: checkbox-touch.qml:372 | ||
324 | 68 | msgid "Select tests to re-run" | ||
325 | 69 | msgstr "" | ||
326 | 70 | |||
327 | 71 | #: checkbox-touch.qml:374 | ||
328 | 72 | msgid "Finish" | ||
329 | 73 | msgstr "" | ||
330 | 74 | |||
331 | 75 | #: checkbox-touch.qml:374 | ||
332 | 76 | msgid "Re-run" | ||
333 | 77 | msgstr "" | ||
334 | 78 | |||
335 | 79 | #: checkbox-touch.qml:414 | ||
336 | 80 | msgid "Could not create component '" | ||
337 | 81 | msgstr "" | ||
338 | 82 | |||
339 | 83 | #: checkbox-touch.qml:416 components/ErrorLogic.js:13 | ||
340 | 84 | #: components/CheckboxTouchApplication.qml:57 | ||
341 | 85 | msgid "Quit" | ||
342 | 86 | msgstr "" | ||
343 | 87 | |||
344 | 88 | #: checkbox-touch.qml:435 | ||
345 | 89 | msgid "Could not resume session." | ||
346 | 90 | msgstr "" | ||
347 | 91 | |||
348 | 92 | #: checkbox-touch.qml:437 components/ResumeSessionPage.qml:117 | ||
349 | 93 | #: components/CheckboxTouchApplication.qml:70 | ||
350 | 94 | msgid "Start new session" | ||
351 | 95 | msgstr "" | ||
352 | 96 | |||
353 | 97 | #: checkbox-touch.qml:546 | ||
354 | 98 | msgid "Reports have been saved to your Documents folder" | ||
355 | 99 | msgstr "" | ||
356 | 100 | |||
357 | 101 | #: checkbox-touch.qml:547 checkbox-touch.qml:566 checkbox-touch.qml:572 | ||
358 | 102 | #: components/CbtDialogLogic.js:5 components/PasswordDialog.qml:60 | ||
359 | 103 | #: components/InputDialog.qml:58 | ||
360 | 104 | msgid "OK" | ||
361 | 105 | msgstr "" | ||
362 | 106 | |||
363 | 107 | #: checkbox-touch.qml:547 | ||
364 | 108 | msgid "View report" | ||
365 | 109 | msgstr "" | ||
366 | 110 | |||
367 | 111 | #: checkbox-touch.qml:565 | ||
368 | 112 | msgid "Report has been submited.\n" | ||
369 | 113 | msgstr "" | ||
370 | 114 | |||
371 | 115 | #: checkbox-touch.qml:570 | ||
372 | 116 | msgid "Could not submit report. Reason:\n" | ||
373 | 117 | msgstr "" | ||
374 | 118 | |||
375 | 119 | #: confinement/plainbox-confined-shell.qml:97 | ||
376 | 120 | msgid "Sending report - you should not see this page :-)" | ||
377 | 121 | msgstr "" | ||
378 | 122 | |||
379 | 123 | #: components/WelcomePage.qml:35 | ||
380 | 124 | msgid "System Testing" | ||
381 | 125 | msgstr "" | ||
382 | 126 | |||
383 | 127 | #: components/WelcomePage.qml:47 components/AboutPage.qml:39 | ||
384 | 128 | msgid "About" | ||
385 | 129 | msgstr "" | ||
386 | 130 | |||
387 | 131 | #: components/WelcomePage.qml:73 | ||
388 | 132 | msgid "Checkbox is loading..." | ||
389 | 133 | msgstr "" | ||
390 | 134 | |||
391 | 135 | #: components/QmlConfinedPage.qml:40 components/InteractIntroPage.qml:48 | ||
392 | 136 | #: components/QmlNativePage.qml:38 components/ManualIntroPage.qml:42 | ||
393 | 137 | msgid "Test Description" | ||
394 | 138 | msgstr "" | ||
395 | 139 | |||
396 | 140 | #: components/QmlConfinedPage.qml:98 | ||
397 | 141 | msgid "Waiting for the test to finish" | ||
398 | 142 | msgstr "" | ||
399 | 143 | |||
400 | 144 | #: components/QmlConfinedPage.qml:107 components/InteractIntroPage.qml:99 | ||
401 | 145 | #: components/QmlNativePage.qml:65 components/ManualIntroPage.qml:57 | ||
402 | 146 | msgid "Start the test" | ||
403 | 147 | msgstr "" | ||
404 | 148 | |||
405 | 149 | #: components/ResumeSessionPage.qml:39 | ||
406 | 150 | msgid "Resume session" | ||
407 | 151 | msgstr "" | ||
408 | 152 | |||
409 | 153 | #: components/ResumeSessionPage.qml:79 | ||
410 | 154 | msgid "Rerun last" | ||
411 | 155 | msgstr "" | ||
412 | 156 | |||
413 | 157 | #: components/ResumeSessionPage.qml:98 components/SelectionPage.qml:36 | ||
414 | 158 | #: components/ErrorLogic.js:11 components/UserInteractSummaryPage.qml:95 | ||
415 | 159 | msgid "Continue" | ||
416 | 160 | msgstr "" | ||
417 | 161 | |||
418 | 162 | #: components/TestVerificationPage.qml:41 | ||
419 | 163 | #: components/UserInteractSummaryPage.qml:41 | ||
420 | 164 | msgid "Verification" | ||
421 | 165 | msgstr "" | ||
422 | 166 | |||
423 | 167 | #. TRANSLATORS: this string is on a button that marks the given test as passed | ||
424 | 168 | #: components/TestVerificationPage.qml:72 | ||
425 | 169 | msgid "Pass" | ||
426 | 170 | msgstr "" | ||
427 | 171 | |||
428 | 172 | #. TRANSLATORS: this string is on a button that marks the given test as failed | ||
429 | 173 | #: components/TestVerificationPage.qml:86 | ||
430 | 174 | msgid "Fail" | ||
431 | 175 | msgstr "" | ||
432 | 176 | |||
433 | 177 | #: components/CommandOutputPage.qml:46 | ||
434 | 178 | msgid "Command output" | ||
435 | 179 | msgstr "" | ||
436 | 180 | |||
437 | 181 | #. TRANSLATORS: a verb (call to action) | ||
438 | 182 | #: components/CommandOutputPage.qml:54 | ||
439 | 183 | msgid "Copy" | ||
440 | 184 | msgstr "" | ||
441 | 185 | |||
442 | 186 | #. TRANSLATORS: This is a label on the button that goes back a page | ||
443 | 187 | #: components/CommandOutputPage.qml:98 | ||
444 | 188 | msgid "Back" | ||
445 | 189 | msgstr "" | ||
446 | 190 | |||
447 | 191 | #: components/PasswordDialog.qml:47 | ||
448 | 192 | msgid "Enter password" | ||
449 | 193 | msgstr "" | ||
450 | 194 | |||
451 | 195 | #: components/PasswordDialog.qml:53 | ||
452 | 196 | msgid "password" | ||
453 | 197 | msgstr "" | ||
454 | 198 | |||
455 | 199 | #: components/PasswordDialog.qml:72 components/InputDialog.qml:68 | ||
456 | 200 | msgid "Cancel" | ||
457 | 201 | msgstr "" | ||
458 | 202 | |||
459 | 203 | #: components/SelectionPage.qml:77 | ||
460 | 204 | msgid "Select All" | ||
461 | 205 | msgstr "" | ||
462 | 206 | |||
463 | 207 | #: components/SelectionPage.qml:90 | ||
464 | 208 | msgid "Deselect All" | ||
465 | 209 | msgstr "" | ||
466 | 210 | |||
467 | 211 | #: components/WebViewer.qml:28 | ||
468 | 212 | msgid "Test Report" | ||
469 | 213 | msgstr "" | ||
470 | 214 | |||
471 | 215 | #: components/AutomatedTestPage.qml:39 | ||
472 | 216 | msgid "Automated test" | ||
473 | 217 | msgstr "" | ||
474 | 218 | |||
475 | 219 | #. TRANSLATORS: this string will be followed by either "PASSED" or "FAILED" | ||
476 | 220 | #: components/UserInteractSummaryPage.qml:60 | ||
477 | 221 | msgid "This test " | ||
478 | 222 | msgstr "" | ||
479 | 223 | |||
480 | 224 | #: components/UserInteractSummaryPage.qml:77 | ||
481 | 225 | msgid "PASSED" | ||
482 | 226 | msgstr "" | ||
483 | 227 | |||
484 | 228 | #: components/UserInteractSummaryPage.qml:77 | ||
485 | 229 | msgid "FAILED" | ||
486 | 230 | msgstr "" | ||
487 | 231 | |||
488 | 232 | #: components/UserInteractSummaryPage.qml:88 | ||
489 | 233 | msgid "You can go back to rerun the test or continue to the next test." | ||
490 | 234 | msgstr "" | ||
491 | 235 | |||
492 | 236 | #: components/actions/SkipAction.qml:33 | ||
493 | 237 | msgid "Skip" | ||
494 | 238 | msgstr "" | ||
495 | 239 | |||
496 | 240 | #: components/actions/SkipAction.qml:36 | ||
497 | 241 | msgid "Do you really want to skip this test?" | ||
498 | 242 | msgstr "" | ||
499 | 243 | |||
500 | 244 | #: components/actions/AddCommentAction.qml:31 components/CommentsDialog.qml:54 | ||
501 | 245 | msgid "Add comment" | ||
502 | 246 | msgstr "" | ||
503 | 247 | |||
504 | 248 | #: components/CommentsDialog.qml:64 | ||
505 | 249 | msgid "Done" | ||
506 | 250 | msgstr "" | ||
507 | 251 | |||
508 | 252 | #: components/ConfirmationDialog.qml:50 | ||
509 | 253 | msgid "Are you sure?" | ||
510 | 254 | msgstr "" | ||
511 | 255 | |||
512 | 256 | #: components/ConfirmationDialog.qml:69 | ||
513 | 257 | msgid "YES" | ||
514 | 258 | msgstr "" | ||
515 | 259 | |||
516 | 260 | #: components/ConfirmationDialog.qml:78 | ||
517 | 261 | msgid "NO" | ||
518 | 262 | msgstr "" | ||
519 | 263 | |||
520 | 264 | #: components/ConfirmationDialog.qml:93 | ||
521 | 265 | msgid "Do not ask me this question again" | ||
522 | 266 | msgstr "" | ||
523 | 267 | |||
524 | 268 | #: components/ResultsPage.qml:34 | ||
525 | 269 | msgid "Test Results" | ||
526 | 270 | msgstr "" | ||
527 | 271 | |||
528 | 272 | #: components/ResultsPage.qml:52 components/AboutPage.qml:81 | ||
529 | 273 | msgid "Close" | ||
530 | 274 | msgstr "" | ||
531 | 275 | |||
532 | 276 | #: components/ResultsPage.qml:162 | ||
533 | 277 | msgid "Save detailed report" | ||
534 | 278 | msgstr "" | ||
535 | 279 | |||
536 | 280 | #. TRANSLATORS: follwing string will be followed by a service name, e.g. "certification website" | ||
537 | 281 | #: components/ResultsPage.qml:171 | ||
538 | 282 | msgid "Submit results to " | ||
539 | 283 | msgstr "" | ||
540 | 284 | |||
541 | 285 | #: components/AboutPage.qml:74 | ||
542 | 286 | msgid "version: " | ||
543 | 287 | msgstr "" | ||
544 | 288 | |||
545 | 289 | #: components/AboutPage.qml:75 | ||
546 | 290 | msgid "Plainbox version: " | ||
547 | 291 | msgstr "" | ||
548 | 292 | |||
549 | 293 | #: components/ErrorDialog.qml:43 | ||
550 | 294 | msgid "Um, OK" | ||
551 | 295 | msgstr "" | ||
552 | 296 | |||
553 | 297 | #: components/ErrorDialog.qml:53 components/ErrorDialog.qml:61 | ||
554 | 298 | msgid "Error encountered" | ||
555 | 299 | msgstr "" | ||
556 | 300 | |||
557 | 301 | #: components/CheckboxTouchApplication.qml:55 | ||
558 | 302 | msgid "Could not start a session. Reason:\n" | ||
559 | 303 | msgstr "" | ||
560 | 304 | |||
561 | 305 | #: components/CheckboxTouchApplication.qml:65 | ||
562 | 306 | msgid "Could not resume session" | ||
563 | 307 | msgstr "" | ||
564 | 308 | |||
565 | 309 | #: py/sudo_with_pass_ctrl.py:160 | ||
566 | 310 | #, python-format | ||
567 | 311 | msgid "job[%s] executing %r with env %r in cwd %r" | ||
568 | 34 | msgstr "" | 312 | msgstr "" |
It was reviewd and co-polished with zyga.
+1