webbrowser-app

Merge lp:~osomon/webbrowser-app/pot-only-under-src-app into lp:webbrowser-app

  1. pot-only-under-src-app
  2. Merge into trunk
Proposed by Olivier Tilloy
Status: Merged
Approved by: Bill Filler
Approved revision: 319
Merged at revision: 323
Proposed branch: lp:~osomon/webbrowser-app/pot-only-under-src-app
Merge into: lp:webbrowser-app
Diff against target: 12 lines (+1/-1)
1 file modified
CMakeLists.txt (+1/-1)
To merge this branch: bzr merge lp:~osomon/webbrowser-app/pot-only-under-src-app
Reviewer Review Type Date Requested Status
Bill Filler (community) Approve
PS Jenkins bot continuous-integration Approve
Review via email: mp+186546@code.launchpad.net

Commit message

Generate translation templates only for files under src/app/.
Files under src/Ubuntu/… are the UbuntuWebView component, and they shouldn’t have any translatable strings.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:319
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/359/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/3646/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/1174
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-saucy-amd64-ci/242
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-saucy-armhf-ci/242
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-saucy-armhf-ci/242/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-saucy-i386-ci/242
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-saucy/6
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/3658
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/3658/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/1176
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/1176/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-maguro/971
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/983

Click here to trigger a rebuild:
http://s-jenkins:8080/job/webbrowser-app-ci/359/rebuild

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

FAILED: Continuous integration, rev:319
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/362/
Executed test runs:
    ABORTED: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/3656/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/1184
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-saucy-amd64-ci/245
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-saucy-armhf-ci/245
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-saucy-armhf-ci/245/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-saucy-i386-ci/245
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/3668
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/3668/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/1186
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/1186/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-maguro/981
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/993

Click here to trigger a rebuild:
http://s-jenkins:8080/job/webbrowser-app-ci/362/rebuild

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

FAILED: Continuous integration, rev:319
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/365/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/3666
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/1194
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-saucy-amd64-ci/248
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-saucy-armhf-ci/248
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-saucy-armhf-ci/248/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-saucy-i386-ci/248
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-saucy/18
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/3677
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/3677/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/1196
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/1196/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-maguro/990
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/1002

Click here to trigger a rebuild:
http://s-jenkins:8080/job/webbrowser-app-ci/365/rebuild

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

PASSED: Continuous integration, rev:319
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/369/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/3728
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/1256
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-saucy-amd64-ci/252
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-saucy-armhf-ci/252
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-saucy-armhf-ci/252/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-saucy-i386-ci/252
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-saucy/74
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/3740
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/3740/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/1258
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/1258/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-maguro/1049
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/1061

Click here to trigger a rebuild:
http://s-jenkins:8080/job/webbrowser-app-ci/369/rebuild

review: Approve (continuous-integration)
Revision history for this message
Bill Filler (bfiller) wrote :

approved

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'CMakeLists.txt'
2--- CMakeLists.txt 2013-07-29 18:33:36 +0000
3+++ CMakeLists.txt 2013-09-19 14:02:26 +0000
4@@ -51,7 +51,7 @@
5
6 file(GLOB_RECURSE I18N_SRC_FILES
7 RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
8- src/**.qml src/**.desktop.in)
9+ src/app/**.qml src/app/**.desktop.in)
10 list(SORT I18N_SRC_FILES)
11
12 # for dh_translations to extract the domain

Subscribers

People subscribed via source and target branches

to status/vote changes: