camera-app

Merge lp:~fboucault/camera-app/make_options_strings_translatable into lp:camera-app

  1. make_options_strings_translatable
  2. Merge into trunk
Proposed by Florian Boucault
Status: Merged
Approved by: Florian Boucault
Approved revision: 382
Merged at revision: 386
Proposed branch: lp:~fboucault/camera-app/make_options_strings_translatable
Merge into: lp:camera-app
Diff against target: 211 lines (+45/-26)
4 files modified
OptionsOverlay.qml (+1/-1)
ViewFinderOverlay.qml (+10/-10)
po/CMakeLists.txt (+1/-0)
po/camera-app.pot (+33/-15)
To merge this branch: bzr merge lp:~fboucault/camera-app/make_options_strings_translatable
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Needs Fixing
Víctor R. Ruiz (community) Approve
Review via email: mp+233504@code.launchpad.net

Commit message

Mark options strings for translation.

To post a comment you must log in.
Revision history for this message
Víctor R. Ruiz (vrruiz) wrote :

Looks good to me.

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:382
http://jenkins.qa.ubuntu.com/job/camera-app-ci/284/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-utopic-amd64-ci/100
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-utopic-armhf-ci/100
        deb: http://jenkins.qa.ubuntu.com/job/camera-app-utopic-armhf-ci/100/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-utopic-i386-ci/100
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-utopic-touch/357/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/3346
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-mako/496/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-utopic-armhf/561
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/12727
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/2752
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/3648
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/3648/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/camera-app-ci/284/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 'OptionsOverlay.qml'
--- OptionsOverlay.qml 2014-08-26 23:56:22 +0000
+++ OptionsOverlay.qml 2014-09-05 12:05:41 +0000
@@ -105,7 +105,7 @@
105 right: optionValueSelector.right105 right: optionValueSelector.right
106 left: optionValueSelector.left106 left: optionValueSelector.left
107 }107 }
108 label: model.label108 label: i18n.tr(model.label)
109 iconName: model.icon109 iconName: model.icon
110 selected: optionsRepeater.model.selectedIndex == index110 selected: optionsRepeater.model.selectedIndex == index
111 isLast: index === optionsRepeater.count - 1111 isLast: index === optionsRepeater.count - 1
112112
=== modified file 'ViewFinderOverlay.qml'
--- ViewFinderOverlay.qml 2014-09-03 18:52:29 +0000
+++ ViewFinderOverlay.qml 2014-09-05 12:05:41 +0000
@@ -108,12 +108,12 @@
108108
109 ListElement {109 ListElement {
110 icon: ""110 icon: ""
111 label: "On"111 label: QT_TR_NOOP("On")
112 value: true112 value: true
113 }113 }
114 ListElement {114 ListElement {
115 icon: ""115 icon: ""
116 label: "Off"116 label: QT_TR_NOOP("Off")
117 value: false117 value: false
118 }118 }
119 },119 },
@@ -130,17 +130,17 @@
130130
131 ListElement {131 ListElement {
132 icon: "flash-on"132 icon: "flash-on"
133 label: "On"133 label: QT_TR_NOOP("On")
134 value: Camera.FlashOn134 value: Camera.FlashOn
135 }135 }
136 ListElement {136 ListElement {
137 icon: "flash-auto"137 icon: "flash-auto"
138 label: "Auto"138 label: QT_TR_NOOP("Auto")
139 value: Camera.FlashAuto139 value: Camera.FlashAuto
140 }140 }
141 ListElement {141 ListElement {
142 icon: "flash-off"142 icon: "flash-off"
143 label: "Off"143 label: QT_TR_NOOP("Off")
144 value: Camera.FlashOff144 value: Camera.FlashOff
145 }145 }
146 },146 },
@@ -157,12 +157,12 @@
157157
158 ListElement {158 ListElement {
159 icon: "torch-on"159 icon: "torch-on"
160 label: "On"160 label: QT_TR_NOOP("On")
161 value: Camera.FlashVideoLight161 value: Camera.FlashVideoLight
162 }162 }
163 ListElement {163 ListElement {
164 icon: "torch-off"164 icon: "torch-off"
165 label: "Off"165 label: QT_TR_NOOP("Off")
166 value: Camera.FlashOff166 value: Camera.FlashOff
167 }167 }
168 },168 },
@@ -171,7 +171,7 @@
171171
172 property string settingsProperty: "hdrEnabled"172 property string settingsProperty: "hdrEnabled"
173 property string icon: ""173 property string icon: ""
174 property string label: "HDR"174 property string label: i18n.tr("HDR")
175 property bool isToggle: true175 property bool isToggle: true
176 property int selectedIndex: bottomEdge.indexForValue(hdrOptionsModel, settings.hdrEnabled)176 property int selectedIndex: bottomEdge.indexForValue(hdrOptionsModel, settings.hdrEnabled)
177 property bool available: camera.advanced.hasHdr177 property bool available: camera.advanced.hasHdr
@@ -179,12 +179,12 @@
179179
180 ListElement {180 ListElement {
181 icon: ""181 icon: ""
182 label: "On"182 label: QT_TR_NOOP("On")
183 value: true183 value: true
184 }184 }
185 ListElement {185 ListElement {
186 icon: ""186 icon: ""
187 label: "Off"187 label: QT_TR_NOOP("Off")
188 value: false188 value: false
189 }189 }
190 }190 }
191191
=== modified file 'po/CMakeLists.txt'
--- po/CMakeLists.txt 2014-08-14 08:10:53 +0000
+++ po/CMakeLists.txt 2014-09-05 12:05:41 +0000
@@ -18,6 +18,7 @@
18 --from-code=UTF-818 --from-code=UTF-8
19 --c++ --qt --add-comments=TRANSLATORS19 --c++ --qt --add-comments=TRANSLATORS
20 --keyword=tr --keyword=N_ --keyword=tr:1,220 --keyword=tr --keyword=N_ --keyword=tr:1,2
21 --keyword=QT_TR_NOOP
21 --package-name=camera-app22 --package-name=camera-app
22 --copyright-holder='Canonical Ltd.'23 --copyright-holder='Canonical Ltd.'
23 ${I18N_SRC_FILES})24 ${I18N_SRC_FILES})
2425
=== modified file 'po/camera-app.pot'
--- po/camera-app.pot 2014-09-01 11:29:10 +0000
+++ po/camera-app.pot 2014-09-05 12:05:41 +0000
@@ -8,7 +8,7 @@
8msgstr ""8msgstr ""
9"Project-Id-Version: camera-app\n"9"Project-Id-Version: camera-app\n"
10"Report-Msgid-Bugs-To: \n"10"Report-Msgid-Bugs-To: \n"
11"POT-Creation-Date: 2014-09-01 13:28+0200\n"11"POT-Creation-Date: 2014-09-05 09:03-0300\n"
12"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"12"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"13"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14"Language-Team: LANGUAGE <LL@li.org>\n"14"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,7 +17,7 @@
17"Content-Type: text/plain; charset=CHARSET\n"17"Content-Type: text/plain; charset=CHARSET\n"
18"Content-Transfer-Encoding: 8bit\n"18"Content-Transfer-Encoding: 8bit\n"
1919
20#: ../GalleryView.qml:11220#: ../GalleryView.qml:121
21msgid "No media available."21msgid "No media available."
22msgstr ""22msgstr ""
2323
@@ -29,55 +29,73 @@
29msgid "Share"29msgid "Share"
30msgstr ""30msgstr ""
3131
32#: ../SlideshowView.qml:41 ../SlideshowView.qml:30132#: ../SlideshowView.qml:41 ../SlideshowView.qml:312
33msgid "Delete"33msgid "Delete"
34msgstr ""34msgstr ""
3535
36#: ../SlideshowView.qml:28936#: ../SlideshowView.qml:300
37msgid "Delete media?"37msgid "Delete media?"
38msgstr ""38msgstr ""
3939
40#: ../SlideshowView.qml:29640#: ../SlideshowView.qml:307
41msgid "Cancel"41msgid "Cancel"
42msgstr ""42msgstr ""
4343
44#: ../camera-app-integration/camera-app.qml:35 ../camera-app.qml:3644#: ../ViewFinderOverlay.qml:111 ../ViewFinderOverlay.qml:133
45#: ../ViewFinderOverlay.qml:160 ../ViewFinderOverlay.qml:182
46msgid "On"
47msgstr ""
48
49#: ../ViewFinderOverlay.qml:116 ../ViewFinderOverlay.qml:143
50#: ../ViewFinderOverlay.qml:165 ../ViewFinderOverlay.qml:187
51msgid "Off"
52msgstr ""
53
54#: ../ViewFinderOverlay.qml:138
55msgid "Auto"
56msgstr ""
57
58#: ../ViewFinderOverlay.qml:174
59msgid "HDR"
60msgstr ""
61
62#: ../camera-app.qml:36
45msgid "Flash"63msgid "Flash"
46msgstr ""64msgstr ""
4765
48#: ../camera-app-integration/camera-app.qml:36 ../camera-app.qml:3766#: ../camera-app.qml:37
49msgid "Light;Dark"67msgid "Light;Dark"
50msgstr ""68msgstr ""
5169
52#: ../camera-app-integration/camera-app.qml:40 ../camera-app.qml:4070#: ../camera-app.qml:40
53msgid "Flip Camera"71msgid "Flip Camera"
54msgstr ""72msgstr ""
5573
56#: ../camera-app-integration/camera-app.qml:41 ../camera-app.qml:4174#: ../camera-app.qml:41
57msgid "Front Facing;Back Facing"75msgid "Front Facing;Back Facing"
58msgstr ""76msgstr ""
5977
60#: ../camera-app-integration/camera-app.qml:45 ../camera-app.qml:4478#: ../camera-app.qml:44
61msgid "Shutter"79msgid "Shutter"
62msgstr ""80msgstr ""
6381
64#: ../camera-app-integration/camera-app.qml:46 ../camera-app.qml:4582#: ../camera-app.qml:45
65msgid "Take a Photo;Snap;Record"83msgid "Take a Photo;Snap;Record"
66msgstr ""84msgstr ""
6785
68#: ../camera-app-integration/camera-app.qml:50 ../camera-app.qml:4886#: ../camera-app.qml:48
69msgid "Mode"87msgid "Mode"
70msgstr ""88msgstr ""
7189
72#: ../camera-app-integration/camera-app.qml:51 ../camera-app.qml:4990#: ../camera-app.qml:49
73msgid "Stills;Video"91msgid "Stills;Video"
74msgstr ""92msgstr ""
7593
76#: ../camera-app-integration/camera-app.qml:55 ../camera-app.qml:5394#: ../camera-app.qml:53
77msgid "White Balance"95msgid "White Balance"
78msgstr ""96msgstr ""
7997
80#: ../camera-app-integration/camera-app.qml:56 ../camera-app.qml:5498#: ../camera-app.qml:54
81msgid "Lighting Condition;Day;Cloudy;Inside"99msgid "Lighting Condition;Day;Cloudy;Inside"
82msgstr ""100msgstr ""
83101

Subscribers

People subscribed via source and target branches