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
1=== modified file 'OptionsOverlay.qml'
2--- OptionsOverlay.qml 2014-08-26 23:56:22 +0000
3+++ OptionsOverlay.qml 2014-09-05 12:05:41 +0000
4@@ -105,7 +105,7 @@
5 right: optionValueSelector.right
6 left: optionValueSelector.left
7 }
8- label: model.label
9+ label: i18n.tr(model.label)
10 iconName: model.icon
11 selected: optionsRepeater.model.selectedIndex == index
12 isLast: index === optionsRepeater.count - 1
13
14=== modified file 'ViewFinderOverlay.qml'
15--- ViewFinderOverlay.qml 2014-09-03 18:52:29 +0000
16+++ ViewFinderOverlay.qml 2014-09-05 12:05:41 +0000
17@@ -108,12 +108,12 @@
18
19 ListElement {
20 icon: ""
21- label: "On"
22+ label: QT_TR_NOOP("On")
23 value: true
24 }
25 ListElement {
26 icon: ""
27- label: "Off"
28+ label: QT_TR_NOOP("Off")
29 value: false
30 }
31 },
32@@ -130,17 +130,17 @@
33
34 ListElement {
35 icon: "flash-on"
36- label: "On"
37+ label: QT_TR_NOOP("On")
38 value: Camera.FlashOn
39 }
40 ListElement {
41 icon: "flash-auto"
42- label: "Auto"
43+ label: QT_TR_NOOP("Auto")
44 value: Camera.FlashAuto
45 }
46 ListElement {
47 icon: "flash-off"
48- label: "Off"
49+ label: QT_TR_NOOP("Off")
50 value: Camera.FlashOff
51 }
52 },
53@@ -157,12 +157,12 @@
54
55 ListElement {
56 icon: "torch-on"
57- label: "On"
58+ label: QT_TR_NOOP("On")
59 value: Camera.FlashVideoLight
60 }
61 ListElement {
62 icon: "torch-off"
63- label: "Off"
64+ label: QT_TR_NOOP("Off")
65 value: Camera.FlashOff
66 }
67 },
68@@ -171,7 +171,7 @@
69
70 property string settingsProperty: "hdrEnabled"
71 property string icon: ""
72- property string label: "HDR"
73+ property string label: i18n.tr("HDR")
74 property bool isToggle: true
75 property int selectedIndex: bottomEdge.indexForValue(hdrOptionsModel, settings.hdrEnabled)
76 property bool available: camera.advanced.hasHdr
77@@ -179,12 +179,12 @@
78
79 ListElement {
80 icon: ""
81- label: "On"
82+ label: QT_TR_NOOP("On")
83 value: true
84 }
85 ListElement {
86 icon: ""
87- label: "Off"
88+ label: QT_TR_NOOP("Off")
89 value: false
90 }
91 }
92
93=== modified file 'po/CMakeLists.txt'
94--- po/CMakeLists.txt 2014-08-14 08:10:53 +0000
95+++ po/CMakeLists.txt 2014-09-05 12:05:41 +0000
96@@ -18,6 +18,7 @@
97 --from-code=UTF-8
98 --c++ --qt --add-comments=TRANSLATORS
99 --keyword=tr --keyword=N_ --keyword=tr:1,2
100+ --keyword=QT_TR_NOOP
101 --package-name=camera-app
102 --copyright-holder='Canonical Ltd.'
103 ${I18N_SRC_FILES})
104
105=== modified file 'po/camera-app.pot'
106--- po/camera-app.pot 2014-09-01 11:29:10 +0000
107+++ po/camera-app.pot 2014-09-05 12:05:41 +0000
108@@ -8,7 +8,7 @@
109 msgstr ""
110 "Project-Id-Version: camera-app\n"
111 "Report-Msgid-Bugs-To: \n"
112-"POT-Creation-Date: 2014-09-01 13:28+0200\n"
113+"POT-Creation-Date: 2014-09-05 09:03-0300\n"
114 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
115 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
116 "Language-Team: LANGUAGE <LL@li.org>\n"
117@@ -17,7 +17,7 @@
118 "Content-Type: text/plain; charset=CHARSET\n"
119 "Content-Transfer-Encoding: 8bit\n"
120
121-#: ../GalleryView.qml:112
122+#: ../GalleryView.qml:121
123 msgid "No media available."
124 msgstr ""
125
126@@ -29,55 +29,73 @@
127 msgid "Share"
128 msgstr ""
129
130-#: ../SlideshowView.qml:41 ../SlideshowView.qml:301
131+#: ../SlideshowView.qml:41 ../SlideshowView.qml:312
132 msgid "Delete"
133 msgstr ""
134
135-#: ../SlideshowView.qml:289
136+#: ../SlideshowView.qml:300
137 msgid "Delete media?"
138 msgstr ""
139
140-#: ../SlideshowView.qml:296
141+#: ../SlideshowView.qml:307
142 msgid "Cancel"
143 msgstr ""
144
145-#: ../camera-app-integration/camera-app.qml:35 ../camera-app.qml:36
146+#: ../ViewFinderOverlay.qml:111 ../ViewFinderOverlay.qml:133
147+#: ../ViewFinderOverlay.qml:160 ../ViewFinderOverlay.qml:182
148+msgid "On"
149+msgstr ""
150+
151+#: ../ViewFinderOverlay.qml:116 ../ViewFinderOverlay.qml:143
152+#: ../ViewFinderOverlay.qml:165 ../ViewFinderOverlay.qml:187
153+msgid "Off"
154+msgstr ""
155+
156+#: ../ViewFinderOverlay.qml:138
157+msgid "Auto"
158+msgstr ""
159+
160+#: ../ViewFinderOverlay.qml:174
161+msgid "HDR"
162+msgstr ""
163+
164+#: ../camera-app.qml:36
165 msgid "Flash"
166 msgstr ""
167
168-#: ../camera-app-integration/camera-app.qml:36 ../camera-app.qml:37
169+#: ../camera-app.qml:37
170 msgid "Light;Dark"
171 msgstr ""
172
173-#: ../camera-app-integration/camera-app.qml:40 ../camera-app.qml:40
174+#: ../camera-app.qml:40
175 msgid "Flip Camera"
176 msgstr ""
177
178-#: ../camera-app-integration/camera-app.qml:41 ../camera-app.qml:41
179+#: ../camera-app.qml:41
180 msgid "Front Facing;Back Facing"
181 msgstr ""
182
183-#: ../camera-app-integration/camera-app.qml:45 ../camera-app.qml:44
184+#: ../camera-app.qml:44
185 msgid "Shutter"
186 msgstr ""
187
188-#: ../camera-app-integration/camera-app.qml:46 ../camera-app.qml:45
189+#: ../camera-app.qml:45
190 msgid "Take a Photo;Snap;Record"
191 msgstr ""
192
193-#: ../camera-app-integration/camera-app.qml:50 ../camera-app.qml:48
194+#: ../camera-app.qml:48
195 msgid "Mode"
196 msgstr ""
197
198-#: ../camera-app-integration/camera-app.qml:51 ../camera-app.qml:49
199+#: ../camera-app.qml:49
200 msgid "Stills;Video"
201 msgstr ""
202
203-#: ../camera-app-integration/camera-app.qml:55 ../camera-app.qml:53
204+#: ../camera-app.qml:53
205 msgid "White Balance"
206 msgstr ""
207
208-#: ../camera-app-integration/camera-app.qml:56 ../camera-app.qml:54
209+#: ../camera-app.qml:54
210 msgid "Lighting Condition;Day;Cloudy;Inside"
211 msgstr ""
212

Subscribers

People subscribed via source and target branches