Merge lp://qastaging/~gang65/ubuntu-calculator-app/ubuntu-calculator-app-update-template into lp://qastaging/~ubuntu-calculator-dev/ubuntu-calculator-app/old_trunk
Proposed by
Bartosz Kosiorek
Status: | Merged | ||||||||
---|---|---|---|---|---|---|---|---|---|
Approved by: | David Planella | ||||||||
Approved revision: | 253 | ||||||||
Merged at revision: | 257 | ||||||||
Proposed branch: | lp://qastaging/~gang65/ubuntu-calculator-app/ubuntu-calculator-app-update-template | ||||||||
Merge into: | lp://qastaging/~ubuntu-calculator-dev/ubuntu-calculator-app/old_trunk | ||||||||
Diff against target: |
294 lines (+64/-101) 8 files modified
.bzrignore (+12/-4) CMakeLists.txt (+9/-2) README.translations (+7/-3) com.ubuntu.calculator_calculator.desktop.in (+1/-1) po/CMakeLists.txt (+13/-9) po/com.ubuntu.calculator.pot (+21/-22) po/po.pro (+0/-59) ubuntu-calculator-app.qmlproject (+1/-1) |
||||||||
To merge this branch: | bzr merge lp://qastaging/~gang65/ubuntu-calculator-app/ubuntu-calculator-app-update-template | ||||||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
David Planella | Approve | ||
Ubuntu Phone Apps Jenkins Bot | continuous-integration | Approve | |
Review via email:
|
Commit message
Updated translation template (fix lp:1317683 and lp:1290814)
Description of the change
Updated translation template (fix lp:1317683 and lp:1290814)
To post a comment you must log in.
PASSED: Continuous integration, rev:253 91.189. 93.70:8080/ job/ubuntu- calculator- app-ci/ 206/ 91.189. 93.70:8080/ job/generic- mediumtests- trusty/ 2572 91.189. 93.70:8080/ job/generic- mediumtests- trusty/ 2572/artifact/ work/output/ *zip*/output. zip 91.189. 93.70:8080/ job/generic- mediumtests- utopic/ 108 91.189. 93.70:8080/ job/generic- mediumtests- utopic/ 108/artifact/ work/output/ *zip*/output. zip 91.189. 93.70:8080/ job/ubuntu- calculator- app-trusty- amd64-ci/ 77 91.189. 93.70:8080/ job/ubuntu- calculator- app-utopic- amd64-ci/ 1
http://
Executed test runs:
SUCCESS: http://
deb: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
SUCCESS: http://
Click here to trigger a rebuild: 91.189. 93.70:8080/ job/ubuntu- calculator- app-ci/ 206/rebuild
http://