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
1=== modified file 'GalleryView.qml'
2--- GalleryView.qml 2016-03-17 10:07:57 +0000
3+++ GalleryView.qml 2016-03-17 14:17:17 +0000
4@@ -16,7 +16,7 @@
5
6 import QtQuick 2.4
7 import Ubuntu.Components 1.3
8-import Ubuntu.Content 0.1
9+import Ubuntu.Content 1.3
10 import Ubuntu.Thumbnailer 0.1
11 import CameraApp 0.1
12 import "MimeTypeMapper.js" as MimeTypeMapper
13
14=== modified file 'MimeTypeMapper.js'
15--- MimeTypeMapper.js 2014-07-31 18:41:17 +0000
16+++ MimeTypeMapper.js 2016-03-17 14:17:17 +0000
17@@ -17,7 +17,7 @@
18 */
19
20 .pragma library
21-.import Ubuntu.Content 0.1 as UbuntuContent
22+.import Ubuntu.Content 1.3 as UbuntuContent
23
24 function startsWith(string, prefix) {
25 return string.indexOf(prefix) === 0;
26
27=== modified file 'PhotogridView.qml'
28--- PhotogridView.qml 2016-03-17 10:07:57 +0000
29+++ PhotogridView.qml 2016-03-17 14:17:17 +0000
30@@ -18,7 +18,7 @@
31 import Ubuntu.Components 1.3
32 import Ubuntu.Components.Popups 1.3
33 import Ubuntu.Thumbnailer 0.1
34-import Ubuntu.Content 0.1
35+import Ubuntu.Content 1.3
36 import CameraApp 0.1
37 import "MimeTypeMapper.js" as MimeTypeMapper
38
39
40=== modified file 'SlideshowView.qml'
41--- SlideshowView.qml 2016-03-17 10:07:57 +0000
42+++ SlideshowView.qml 2016-03-17 14:17:17 +0000
43@@ -18,7 +18,7 @@
44 import Ubuntu.Components 1.3
45 import Ubuntu.Components.ListItems 1.3 as ListItems
46 import Ubuntu.Components.Popups 1.3
47-import Ubuntu.Content 0.1
48+import Ubuntu.Content 1.3
49 import Ubuntu.Thumbnailer 0.1
50 import CameraApp 0.1
51 import "MimeTypeMapper.js" as MimeTypeMapper
52
53=== modified file 'ViewFinderView.qml'
54--- ViewFinderView.qml 2016-03-17 13:48:26 +0000
55+++ ViewFinderView.qml 2016-03-17 14:17:17 +0000
56@@ -21,7 +21,7 @@
57 import QtMultimedia 5.0
58 import CameraApp 0.1
59 import QtGraphicalEffects 1.0
60-import Ubuntu.Content 0.1
61+import Ubuntu.Content 1.3
62
63 Item {
64 id: viewFinderView
65
66=== modified file 'camera-app.qml'
67--- camera-app.qml 2016-03-17 10:07:57 +0000
68+++ camera-app.qml 2016-03-17 14:17:17 +0000
69@@ -20,7 +20,7 @@
70 import Ubuntu.Components 1.3
71 import Ubuntu.Unity.Action 1.1 as UnityActions
72 import UserMetrics 0.1
73-import Ubuntu.Content 0.1
74+import Ubuntu.Content 1.3
75 import CameraApp 0.1
76
77 Window {
78
79=== modified file 'po/ast.po'
80--- po/ast.po 2016-01-19 05:44:59 +0000
81+++ po/ast.po 2016-03-17 14:17:17 +0000
82@@ -8,14 +8,14 @@
83 "Project-Id-Version: camera-app\n"
84 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
85 "POT-Creation-Date: 2016-01-14 16:57+0100\n"
86-"PO-Revision-Date: 2015-10-06 11:55+0000\n"
87-"Last-Translator: Xuacu Saturio <xuacusk8@gmail.com>\n"
88+"PO-Revision-Date: 2016-03-11 23:54+0000\n"
89+"Last-Translator: enolp <enolp@softastur.org>\n"
90 "Language-Team: Asturian <ast@li.org>\n"
91 "MIME-Version: 1.0\n"
92 "Content-Type: text/plain; charset=UTF-8\n"
93 "Content-Transfer-Encoding: 8bit\n"
94-"X-Launchpad-Export-Date: 2016-01-19 05:44+0000\n"
95-"X-Generator: Launchpad (build 17886)\n"
96+"X-Launchpad-Export-Date: 2016-03-12 06:03+0000\n"
97+"X-Generator: Launchpad (build 17939)\n"
98
99 #: ../DeleteDialog.qml:24
100 msgid "Delete media?"
101@@ -139,7 +139,7 @@
102
103 #: ../ViewFinderOverlay.qml:1007
104 msgid "Cannot access camera"
105-msgstr ""
106+msgstr "Nun pue accedese a la cámara"
107
108 #: ../ViewFinderOverlay.qml:1008
109 msgid ""
110@@ -148,10 +148,14 @@
111 "\n"
112 "If granting permission does not resolve this problem, reboot your phone."
113 msgstr ""
114+"L'aplicación Cámara nun tien permisu p'acceder al hardware de la cámara o "
115+"asocedió otru fallu.\n"
116+"\n"
117+"Si conceder permisu nun igua esti problema, reanicia'l to teléfonu."
118
119 #: ../ViewFinderOverlay.qml:1017
120 msgid "Edit Permissions"
121-msgstr ""
122+msgstr "Editar permisos"
123
124 #: ../camera-app.qml:37
125 msgid "Flash"
126
127=== modified file 'po/cy.po'
128--- po/cy.po 2016-01-19 05:44:59 +0000
129+++ po/cy.po 2016-03-17 14:17:17 +0000
130@@ -8,14 +8,14 @@
131 "Project-Id-Version: camera-app\n"
132 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
133 "POT-Creation-Date: 2016-01-14 16:57+0100\n"
134-"PO-Revision-Date: 2015-07-30 13:14+0000\n"
135+"PO-Revision-Date: 2016-03-07 19:42+0000\n"
136 "Last-Translator: Owen Llywelyn <owen.llywelyn@gmail.com>\n"
137 "Language-Team: Welsh <cy@li.org>\n"
138 "MIME-Version: 1.0\n"
139 "Content-Type: text/plain; charset=UTF-8\n"
140 "Content-Transfer-Encoding: 8bit\n"
141-"X-Launchpad-Export-Date: 2016-01-19 05:44+0000\n"
142-"X-Generator: Launchpad (build 17886)\n"
143+"X-Launchpad-Export-Date: 2016-03-08 05:50+0000\n"
144+"X-Generator: Launchpad (build 17936)\n"
145
146 #: ../DeleteDialog.qml:24
147 msgid "Delete media?"
148@@ -139,7 +139,7 @@
149
150 #: ../ViewFinderOverlay.qml:1007
151 msgid "Cannot access camera"
152-msgstr ""
153+msgstr "Methu cael mynediad i'r camera"
154
155 #: ../ViewFinderOverlay.qml:1008
156 msgid ""
157@@ -148,10 +148,14 @@
158 "\n"
159 "If granting permission does not resolve this problem, reboot your phone."
160 msgstr ""
161+"Does gan yr ap Camera ddim caniatâd i gael mynediad i galedwedd y camera neu "
162+"digwyddodd gwall arall.\n"
163+"\n"
164+"Os nad yw rhoi caniatâd yn gweithio ailgychwynwch eich ffôn."
165
166 #: ../ViewFinderOverlay.qml:1017
167 msgid "Edit Permissions"
168-msgstr ""
169+msgstr "Golygu Caniatâd"
170
171 #: ../camera-app.qml:37
172 msgid "Flash"
173
174=== modified file 'po/sk.po'
175--- po/sk.po 2016-03-03 06:09:10 +0000
176+++ po/sk.po 2016-03-17 14:17:17 +0000
177@@ -8,14 +8,14 @@
178 "Project-Id-Version: camera-app\n"
179 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
180 "POT-Creation-Date: 2016-01-14 16:57+0100\n"
181-"PO-Revision-Date: 2016-02-29 20:42+0000\n"
182+"PO-Revision-Date: 2016-03-14 09:41+0000\n"
183 "Last-Translator: P_E_T_O <Unknown>\n"
184 "Language-Team: Slovak <sk@li.org>\n"
185 "MIME-Version: 1.0\n"
186 "Content-Type: text/plain; charset=UTF-8\n"
187 "Content-Transfer-Encoding: 8bit\n"
188-"X-Launchpad-Export-Date: 2016-03-03 06:09+0000\n"
189-"X-Generator: Launchpad (build 17925)\n"
190+"X-Launchpad-Export-Date: 2016-03-15 06:06+0000\n"
191+"X-Generator: Launchpad (build 17939)\n"
192 "Language: sk\n"
193
194 #: ../DeleteDialog.qml:24
195@@ -200,7 +200,7 @@
196 #: ../camera-app.qml:335
197 #, qt-format
198 msgid "<b>%1</b> photos taken today"
199-msgstr "Dnes zachytené <b>%1</b> fotografie"
200+msgstr "Dnes zachytené fotografie: <b>%1</b>"
201
202 #: ../camera-app.qml:336
203 msgid "No photos taken today"
204@@ -209,7 +209,7 @@
205 #: ../camera-app.qml:346
206 #, qt-format
207 msgid "<b>%1</b> videos recorded today"
208-msgstr "Dnes nahrané <b>%1</b> videá"
209+msgstr "Dnes nahrané videá: <b>%1</b>"
210
211 #: ../camera-app.qml:347
212 msgid "No videos recorded today"

Subscribers

People subscribed via source and target branches