camera-app

Merge lp:~ken-vandine/camera-app/lp1554621 into lp:camera-app/staging

  1. lp1554621
  2. Merge into staging
Proposed by Florian Boucault
Status: Merged
Approved by: Florian Boucault
Approved revision: 643
Merged at revision: 674
Proposed branch: lp:~ken-vandine/camera-app/lp1554621
Merge into: lp:camera-app/staging
Diff against target: 212 lines (+30/-22)
9 files modified
GalleryView.qml (+1/-1)
MimeTypeMapper.js (+1/-1)
PhotogridView.qml (+1/-1)
SlideshowView.qml (+1/-1)
ViewFinderView.qml (+1/-1)
camera-app.qml (+1/-1)
po/ast.po (+10/-6)
po/cy.po (+9/-5)
po/sk.po (+5/-5)
To merge this branch: bzr merge lp:~ken-vandine/camera-app/lp1554621
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Needs Fixing
Ubuntu Phablet Team Pending
Review via email: mp+289370@code.launchpad.net

This proposal supersedes a proposal from 2016-03-16.

Commit message

Bump Ubuntu.Content import to 1.3 to fix theme issue

Description of the change

Bump Ubuntu.Content import to 1.3 to fix theme issue

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

FAILED: Continuous integration, rev:643
http://jenkins.qa.ubuntu.com/job/camera-app-ci/489/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-amd64-ci/184
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-armhf-ci/185
        deb: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-armhf-ci/185/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-i386-ci/184
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-vivid-touch/437/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-touch/1107/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-vivid-armhf/1041
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/28043

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/camera-app-ci/489/rebuild

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

FAILED: Continuous integration, rev:643
http://jenkins.qa.ubuntu.com/job/camera-app-staging-ci/59/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-staging-vivid-amd64-ci/59
        deb: http://jenkins.qa.ubuntu.com/job/camera-app-staging-vivid-amd64-ci/59/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-staging-vivid-armhf-ci/59
        deb: http://jenkins.qa.ubuntu.com/job/camera-app-staging-vivid-armhf-ci/59/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-staging-vivid-i386-ci/59
        deb: http://jenkins.qa.ubuntu.com/job/camera-app-staging-vivid-i386-ci/59/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-vivid-touch/439
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-touch/1109
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-vivid-armhf/1043
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/28046

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/camera-app-staging-ci/59/rebuild

review: Needs Fixing (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'GalleryView.qml'
--- GalleryView.qml 2016-03-17 10:07:57 +0000
+++ GalleryView.qml 2016-03-17 14:17:17 +0000
@@ -16,7 +16,7 @@
1616
17import QtQuick 2.417import QtQuick 2.4
18import Ubuntu.Components 1.318import Ubuntu.Components 1.3
19import Ubuntu.Content 0.119import Ubuntu.Content 1.3
20import Ubuntu.Thumbnailer 0.120import Ubuntu.Thumbnailer 0.1
21import CameraApp 0.121import CameraApp 0.1
22import "MimeTypeMapper.js" as MimeTypeMapper22import "MimeTypeMapper.js" as MimeTypeMapper
2323
=== modified file 'MimeTypeMapper.js'
--- MimeTypeMapper.js 2014-07-31 18:41:17 +0000
+++ MimeTypeMapper.js 2016-03-17 14:17:17 +0000
@@ -17,7 +17,7 @@
17*/17*/
1818
19.pragma library19.pragma library
20.import Ubuntu.Content 0.1 as UbuntuContent20.import Ubuntu.Content 1.3 as UbuntuContent
2121
22function startsWith(string, prefix) {22function startsWith(string, prefix) {
23 return string.indexOf(prefix) === 0;23 return string.indexOf(prefix) === 0;
2424
=== modified file 'PhotogridView.qml'
--- PhotogridView.qml 2016-03-17 10:07:57 +0000
+++ PhotogridView.qml 2016-03-17 14:17:17 +0000
@@ -18,7 +18,7 @@
18import Ubuntu.Components 1.318import Ubuntu.Components 1.3
19import Ubuntu.Components.Popups 1.319import Ubuntu.Components.Popups 1.3
20import Ubuntu.Thumbnailer 0.120import Ubuntu.Thumbnailer 0.1
21import Ubuntu.Content 0.121import Ubuntu.Content 1.3
22import CameraApp 0.122import CameraApp 0.1
23import "MimeTypeMapper.js" as MimeTypeMapper23import "MimeTypeMapper.js" as MimeTypeMapper
2424
2525
=== modified file 'SlideshowView.qml'
--- SlideshowView.qml 2016-03-17 10:07:57 +0000
+++ SlideshowView.qml 2016-03-17 14:17:17 +0000
@@ -18,7 +18,7 @@
18import Ubuntu.Components 1.318import Ubuntu.Components 1.3
19import Ubuntu.Components.ListItems 1.3 as ListItems19import Ubuntu.Components.ListItems 1.3 as ListItems
20import Ubuntu.Components.Popups 1.320import Ubuntu.Components.Popups 1.3
21import Ubuntu.Content 0.121import Ubuntu.Content 1.3
22import Ubuntu.Thumbnailer 0.122import Ubuntu.Thumbnailer 0.1
23import CameraApp 0.123import CameraApp 0.1
24import "MimeTypeMapper.js" as MimeTypeMapper24import "MimeTypeMapper.js" as MimeTypeMapper
2525
=== modified file 'ViewFinderView.qml'
--- ViewFinderView.qml 2016-03-17 13:48:26 +0000
+++ ViewFinderView.qml 2016-03-17 14:17:17 +0000
@@ -21,7 +21,7 @@
21import QtMultimedia 5.021import QtMultimedia 5.0
22import CameraApp 0.122import CameraApp 0.1
23import QtGraphicalEffects 1.023import QtGraphicalEffects 1.0
24import Ubuntu.Content 0.124import Ubuntu.Content 1.3
2525
26Item {26Item {
27 id: viewFinderView27 id: viewFinderView
2828
=== modified file 'camera-app.qml'
--- camera-app.qml 2016-03-17 10:07:57 +0000
+++ camera-app.qml 2016-03-17 14:17:17 +0000
@@ -20,7 +20,7 @@
20import Ubuntu.Components 1.320import Ubuntu.Components 1.3
21import Ubuntu.Unity.Action 1.1 as UnityActions21import Ubuntu.Unity.Action 1.1 as UnityActions
22import UserMetrics 0.122import UserMetrics 0.1
23import Ubuntu.Content 0.123import Ubuntu.Content 1.3
24import CameraApp 0.124import CameraApp 0.1
2525
26Window {26Window {
2727
=== modified file 'po/ast.po'
--- po/ast.po 2016-01-19 05:44:59 +0000
+++ po/ast.po 2016-03-17 14:17:17 +0000
@@ -8,14 +8,14 @@
8"Project-Id-Version: camera-app\n"8"Project-Id-Version: camera-app\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10"POT-Creation-Date: 2016-01-14 16:57+0100\n"10"POT-Creation-Date: 2016-01-14 16:57+0100\n"
11"PO-Revision-Date: 2015-10-06 11:55+0000\n"11"PO-Revision-Date: 2016-03-11 23:54+0000\n"
12"Last-Translator: Xuacu Saturio <xuacusk8@gmail.com>\n"12"Last-Translator: enolp <enolp@softastur.org>\n"
13"Language-Team: Asturian <ast@li.org>\n"13"Language-Team: Asturian <ast@li.org>\n"
14"MIME-Version: 1.0\n"14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"16"Content-Transfer-Encoding: 8bit\n"
17"X-Launchpad-Export-Date: 2016-01-19 05:44+0000\n"17"X-Launchpad-Export-Date: 2016-03-12 06:03+0000\n"
18"X-Generator: Launchpad (build 17886)\n"18"X-Generator: Launchpad (build 17939)\n"
1919
20#: ../DeleteDialog.qml:2420#: ../DeleteDialog.qml:24
21msgid "Delete media?"21msgid "Delete media?"
@@ -139,7 +139,7 @@
139139
140#: ../ViewFinderOverlay.qml:1007140#: ../ViewFinderOverlay.qml:1007
141msgid "Cannot access camera"141msgid "Cannot access camera"
142msgstr ""142msgstr "Nun pue accedese a la cámara"
143143
144#: ../ViewFinderOverlay.qml:1008144#: ../ViewFinderOverlay.qml:1008
145msgid ""145msgid ""
@@ -148,10 +148,14 @@
148"\n"148"\n"
149"If granting permission does not resolve this problem, reboot your phone."149"If granting permission does not resolve this problem, reboot your phone."
150msgstr ""150msgstr ""
151"L'aplicación Cámara nun tien permisu p'acceder al hardware de la cámara o "
152"asocedió otru fallu.\n"
153"\n"
154"Si conceder permisu nun igua esti problema, reanicia'l to teléfonu."
151155
152#: ../ViewFinderOverlay.qml:1017156#: ../ViewFinderOverlay.qml:1017
153msgid "Edit Permissions"157msgid "Edit Permissions"
154msgstr ""158msgstr "Editar permisos"
155159
156#: ../camera-app.qml:37160#: ../camera-app.qml:37
157msgid "Flash"161msgid "Flash"
158162
=== modified file 'po/cy.po'
--- po/cy.po 2016-01-19 05:44:59 +0000
+++ po/cy.po 2016-03-17 14:17:17 +0000
@@ -8,14 +8,14 @@
8"Project-Id-Version: camera-app\n"8"Project-Id-Version: camera-app\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10"POT-Creation-Date: 2016-01-14 16:57+0100\n"10"POT-Creation-Date: 2016-01-14 16:57+0100\n"
11"PO-Revision-Date: 2015-07-30 13:14+0000\n"11"PO-Revision-Date: 2016-03-07 19:42+0000\n"
12"Last-Translator: Owen Llywelyn <owen.llywelyn@gmail.com>\n"12"Last-Translator: Owen Llywelyn <owen.llywelyn@gmail.com>\n"
13"Language-Team: Welsh <cy@li.org>\n"13"Language-Team: Welsh <cy@li.org>\n"
14"MIME-Version: 1.0\n"14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"16"Content-Transfer-Encoding: 8bit\n"
17"X-Launchpad-Export-Date: 2016-01-19 05:44+0000\n"17"X-Launchpad-Export-Date: 2016-03-08 05:50+0000\n"
18"X-Generator: Launchpad (build 17886)\n"18"X-Generator: Launchpad (build 17936)\n"
1919
20#: ../DeleteDialog.qml:2420#: ../DeleteDialog.qml:24
21msgid "Delete media?"21msgid "Delete media?"
@@ -139,7 +139,7 @@
139139
140#: ../ViewFinderOverlay.qml:1007140#: ../ViewFinderOverlay.qml:1007
141msgid "Cannot access camera"141msgid "Cannot access camera"
142msgstr ""142msgstr "Methu cael mynediad i'r camera"
143143
144#: ../ViewFinderOverlay.qml:1008144#: ../ViewFinderOverlay.qml:1008
145msgid ""145msgid ""
@@ -148,10 +148,14 @@
148"\n"148"\n"
149"If granting permission does not resolve this problem, reboot your phone."149"If granting permission does not resolve this problem, reboot your phone."
150msgstr ""150msgstr ""
151"Does gan yr ap Camera ddim caniatâd i gael mynediad i galedwedd y camera neu "
152"digwyddodd gwall arall.\n"
153"\n"
154"Os nad yw rhoi caniatâd yn gweithio ailgychwynwch eich ffôn."
151155
152#: ../ViewFinderOverlay.qml:1017156#: ../ViewFinderOverlay.qml:1017
153msgid "Edit Permissions"157msgid "Edit Permissions"
154msgstr ""158msgstr "Golygu Caniatâd"
155159
156#: ../camera-app.qml:37160#: ../camera-app.qml:37
157msgid "Flash"161msgid "Flash"
158162
=== modified file 'po/sk.po'
--- po/sk.po 2016-03-03 06:09:10 +0000
+++ po/sk.po 2016-03-17 14:17:17 +0000
@@ -8,14 +8,14 @@
8"Project-Id-Version: camera-app\n"8"Project-Id-Version: camera-app\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10"POT-Creation-Date: 2016-01-14 16:57+0100\n"10"POT-Creation-Date: 2016-01-14 16:57+0100\n"
11"PO-Revision-Date: 2016-02-29 20:42+0000\n"11"PO-Revision-Date: 2016-03-14 09:41+0000\n"
12"Last-Translator: P_E_T_O <Unknown>\n"12"Last-Translator: P_E_T_O <Unknown>\n"
13"Language-Team: Slovak <sk@li.org>\n"13"Language-Team: Slovak <sk@li.org>\n"
14"MIME-Version: 1.0\n"14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"16"Content-Transfer-Encoding: 8bit\n"
17"X-Launchpad-Export-Date: 2016-03-03 06:09+0000\n"17"X-Launchpad-Export-Date: 2016-03-15 06:06+0000\n"
18"X-Generator: Launchpad (build 17925)\n"18"X-Generator: Launchpad (build 17939)\n"
19"Language: sk\n"19"Language: sk\n"
2020
21#: ../DeleteDialog.qml:2421#: ../DeleteDialog.qml:24
@@ -200,7 +200,7 @@
200#: ../camera-app.qml:335200#: ../camera-app.qml:335
201#, qt-format201#, qt-format
202msgid "<b>%1</b> photos taken today"202msgid "<b>%1</b> photos taken today"
203msgstr "Dnes zachytené <b>%1</b> fotografie"203msgstr "Dnes zachytené fotografie: <b>%1</b>"
204204
205#: ../camera-app.qml:336205#: ../camera-app.qml:336
206msgid "No photos taken today"206msgid "No photos taken today"
@@ -209,7 +209,7 @@
209#: ../camera-app.qml:346209#: ../camera-app.qml:346
210#, qt-format210#, qt-format
211msgid "<b>%1</b> videos recorded today"211msgid "<b>%1</b> videos recorded today"
212msgstr "Dnes nahrané <b>%1</b> videá"212msgstr "Dnes nahrané videá: <b>%1</b>"
213213
214#: ../camera-app.qml:347214#: ../camera-app.qml:347
215msgid "No videos recorded today"215msgid "No videos recorded today"

Subscribers

People subscribed via source and target branches