gallery-app

Merge lp:~timo-jyrinki/gallery-app/allow_translating_date_strings into lp:gallery-app

  1. allow_translating_date_strings
  2. Merge into trunk
Proposed by Timo Jyrinki on 2015-05-21
Status: Merged
Approved by: Bill Filler on 2015-06-30
Approved revision: 1197
Merged at revision: 1204
Proposed branch: lp:~timo-jyrinki/gallery-app/allow_translating_date_strings
Merge into: lp:gallery-app
Diff against target: 229 lines (+79/-46)
2 files modified
po/gallery-app.pot (+75/-44)
rc/qml/Components/EventCard.qml (+4/-2)
To merge this branch: bzr merge lp:~timo-jyrinki/gallery-app/allow_translating_date_strings
Reviewer Review Type Date Requested Status
Arthur Mello (community) 2015-05-21 Approve on 2015-05-29
PS Jenkins bot continuous-integration Needs Fixing on 2015-05-21
Review via email: mp+259755@code.launchpad.net

Commit Message

Allow translating the date strings in EventCard.qml, update .pot file (LP: #1457357)

Description of the Change

.pot file updated automatically by SDK, seems to add also a few strings not previously available?

To post a comment you must log in.
Timo Jyrinki (timo-jyrinki) wrote :

Tested locally successfully by adding the translation to fi.po and making the .mo available as gallery-app.mo in the system.

PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:1197
http://jenkins.qa.ubuntu.com/job/gallery-app-ci/1156/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-amd64-ci/84
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-armhf-ci/84
        deb: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-armhf-ci/84/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-i386-ci/84
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-vivid-touch/228
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-mako/880
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-vivid-armhf/570
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/20687

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

review: Approve (continuous-integration)
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:1197
http://jenkins.qa.ubuntu.com/job/gallery-app-ci/1156/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-amd64-ci/84
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-armhf-ci/84
        deb: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-armhf-ci/84/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-i386-ci/84
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-vivid-touch/228
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-mako/880
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-vivid-armhf/570
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/20687

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

review: Needs Fixing (continuous-integration)
Arthur Mello (artmello) wrote :

Change looks good to me, thanks for looking at this.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'po/gallery-app.pot'
2--- po/gallery-app.pot 2015-02-25 10:17:40 +0000
3+++ po/gallery-app.pot 2015-05-21 11:35:44 +0000
4@@ -8,7 +8,7 @@
5 msgstr ""
6 "Project-Id-Version: gallery-app\n"
7 "Report-Msgid-Bugs-To: \n"
8-"POT-Creation-Date: 2015-02-25 11:17+0100\n"
9+"POT-Creation-Date: 2015-05-21 13:13+0300\n"
10 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
11 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
12 "Language-Team: LANGUAGE <LL@li.org>\n"
13@@ -25,15 +25,17 @@
14 #: rc/qml/AlbumEditor/AlbumEditMenu.qml:50
15 #: rc/qml/AlbumViewer/AlbumViewer.qml:375
16 #: rc/qml/Components/DeleteDialog.qml:32
17-#: rc/qml/MediaViewer/MediaViewer.qml:466 rc/qml/Utility/EditingHUD.qml:67
18+#: rc/qml/MediaViewer/MediaViewer.qml:345 rc/qml/Utility/EditingHUD.qml:67
19 #: rc/qml/Utility/SelectionToolbarAction.qml:56
20 msgid "Delete"
21 msgstr ""
22
23 #: rc/qml/AlbumEditor/AlbumEditor.qml:39
24 #: rc/qml/Components/MediaSelector.qml:92
25-#: rc/qml/MediaViewer/MediaViewer.qml:294 rc/qml/PickerScreen.qml:235
26-#: rc/qml/Utility/SelectionToolbarAction.qml:75
27+#: rc/qml/MediaViewer/MediaViewer.qml:275
28+#: rc/qml/MediaViewer/PhotoEditor.qml:206
29+#: rc/qml/MediaViewer/PhotoEditor/ExposureAdjuster.qml:80
30+#: rc/qml/PickerScreen.qml:235 rc/qml/Utility/SelectionToolbarAction.qml:75
31 msgid "Cancel"
32 msgstr ""
33
34@@ -62,7 +64,7 @@
35 msgstr ""
36
37 #: rc/qml/AlbumViewer/AlbumViewer.qml:369
38-#: rc/qml/MediaViewer/MediaViewer.qml:456
39+#: rc/qml/MediaViewer/MediaViewer.qml:335
40 msgid "Add to album"
41 msgstr ""
42
43@@ -88,12 +90,12 @@
44 msgstr ""
45
46 #: rc/qml/Components/DeleteDialog.qml:36
47-#: rc/qml/MediaViewer/MediaViewer.qml:242
48+#: rc/qml/MediaViewer/MediaViewer.qml:223
49 msgid "Yes"
50 msgstr ""
51
52 #: rc/qml/Components/DeleteDialog.qml:45
53-#: rc/qml/MediaViewer/MediaViewer.qml:253
54+#: rc/qml/MediaViewer/MediaViewer.qml:234
55 msgid "No"
56 msgstr ""
57
58@@ -105,6 +107,14 @@
59 msgid "Delete album + contents"
60 msgstr ""
61
62+#: rc/qml/Components/EventCard.qml:59
63+msgid "MMM yyyy"
64+msgstr ""
65+
66+#: rc/qml/Components/EventCard.qml:73
67+msgid "dd"
68+msgstr ""
69+
70 #: rc/qml/Components/MediaSelector.qml:59
71 #: rc/qml/Components/MediaSelector.qml:80
72 msgid "Add to Album"
73@@ -179,64 +189,89 @@
74 msgid "Photos"
75 msgstr ""
76
77-#: rc/qml/MediaViewer/CropOverlay.qml:352
78-#: rc/qml/MediaViewer/EditPopover.qml:51 rc/qml/Utility/EditingHUD.qml:106
79-msgid "Crop"
80-msgstr ""
81-
82-#: rc/qml/MediaViewer/EditPopover.qml:42 rc/qml/Utility/EditingHUD.qml:99
83-msgid "Rotate"
84-msgstr ""
85-
86-#: rc/qml/MediaViewer/EditPopover.qml:60
87-msgid "Auto enhance"
88-msgstr ""
89-
90-#: rc/qml/MediaViewer/EditPopover.qml:69 rc/qml/Utility/EditingHUD.qml:82
91-msgid "Undo"
92-msgstr ""
93-
94-#: rc/qml/MediaViewer/EditPopover.qml:79 rc/qml/Utility/EditingHUD.qml:87
95-msgid "Redo"
96-msgstr ""
97-
98-#: rc/qml/MediaViewer/EditPopover.qml:89
99-msgid "Revert to original"
100-msgstr ""
101-
102-#: rc/qml/MediaViewer/MediaViewer.qml:231
103+#: rc/qml/MediaViewer/ExtrasPhotoEditorPage.qml:26
104+#: rc/qml/MediaViewer/GalleryPhotoEditorPage.qml:25
105+msgid "Edit Photo"
106+msgstr ""
107+
108+#: rc/qml/MediaViewer/MediaViewer.qml:212
109 msgid "Delete a photo"
110 msgstr ""
111
112-#: rc/qml/MediaViewer/MediaViewer.qml:231
113+#: rc/qml/MediaViewer/MediaViewer.qml:212
114 msgid "Delete a video"
115 msgstr ""
116
117-#: rc/qml/MediaViewer/MediaViewer.qml:264
118+#: rc/qml/MediaViewer/MediaViewer.qml:245
119 msgid "Remove a photo from album"
120 msgstr ""
121
122-#: rc/qml/MediaViewer/MediaViewer.qml:264
123+#: rc/qml/MediaViewer/MediaViewer.qml:245
124 msgid "Remove a video from album"
125 msgstr ""
126
127-#: rc/qml/MediaViewer/MediaViewer.qml:273
128+#: rc/qml/MediaViewer/MediaViewer.qml:254
129 msgid "Remove from Album"
130 msgstr ""
131
132-#: rc/qml/MediaViewer/MediaViewer.qml:284
133+#: rc/qml/MediaViewer/MediaViewer.qml:265
134 msgid "Remove from Album and Delete"
135 msgstr ""
136
137-#: rc/qml/MediaViewer/MediaViewer.qml:449
138+#: rc/qml/MediaViewer/MediaViewer.qml:312
139 msgid "Edit"
140 msgstr ""
141
142-#: rc/qml/MediaViewer/MediaViewer.qml:477 rc/qml/Utility/EditingHUD.qml:72
143+#: rc/qml/MediaViewer/MediaViewer.qml:356 rc/qml/Utility/EditingHUD.qml:72
144 #: rc/qml/Utility/SelectionToolbarAction.qml:65
145 msgid "Share"
146 msgstr ""
147
148+#: rc/qml/MediaViewer/PhotoEditor.qml:43
149+#: rc/qml/MediaViewer/PhotoEditor/CropOverlay.qml:349
150+#: rc/qml/Utility/EditingHUD.qml:106
151+msgid "Crop"
152+msgstr ""
153+
154+#: rc/qml/MediaViewer/PhotoEditor.qml:52 rc/qml/Utility/EditingHUD.qml:99
155+msgid "Rotate"
156+msgstr ""
157+
158+#: rc/qml/MediaViewer/PhotoEditor.qml:196
159+msgid "Revert to original"
160+msgstr ""
161+
162+#: rc/qml/MediaViewer/PhotoEditor.qml:197
163+msgid "This will undo all edits, including those from previous sessions."
164+msgstr ""
165+
166+#: rc/qml/MediaViewer/PhotoEditor.qml:212
167+msgid "Revert Photo"
168+msgstr ""
169+
170+#: rc/qml/MediaViewer/PhotoEditor.qml:226
171+msgid "Enhancing photo..."
172+msgstr ""
173+
174+#: rc/qml/MediaViewer/PhotoEditor/EditStack.qml:114
175+#: rc/qml/Utility/EditingHUD.qml:82
176+msgid "Undo"
177+msgstr ""
178+
179+#: rc/qml/MediaViewer/PhotoEditor/EditStack.qml:121
180+#: rc/qml/Utility/EditingHUD.qml:87
181+msgid "Redo"
182+msgstr ""
183+
184+#: rc/qml/MediaViewer/PhotoEditor/EditStack.qml:128
185+#: rc/qml/Utility/EditingHUD.qml:113
186+msgid "Revert to Original"
187+msgstr ""
188+
189+#: rc/qml/MediaViewer/PhotoEditor/ExposureAdjuster.qml:71
190+msgid "Done"
191+msgstr ""
192+
193 #: rc/qml/MediaViewer/PopupPhotoViewer.qml:46
194 #: desktop/gallery-app.desktop.in.in.h:1
195 msgid "Gallery"
196@@ -294,10 +329,6 @@
197 msgid "Crop the image"
198 msgstr ""
199
200-#: rc/qml/Utility/EditingHUD.qml:113
201-msgid "Revert to Original"
202-msgstr ""
203-
204 #: rc/qml/Utility/EditingHUD.qml:114
205 msgid "Discard Changes"
206 msgstr ""
207
208=== modified file 'rc/qml/Components/EventCard.qml'
209--- rc/qml/Components/EventCard.qml 2013-09-03 21:06:17 +0000
210+++ rc/qml/Components/EventCard.qml 2015-05-21 11:35:44 +0000
211@@ -55,7 +55,8 @@
212 font.capitalization: Font.AllUppercase
213 horizontalAlignment: Text.AlignHCenter
214
215- text: (event) ? Qt.formatDate(event.date, "MMM yyyy") : ""
216+ /// The event ubuntushape's month/year part, keep as is unless you know what you're doing
217+ text: (event) ? Qt.formatDate(event.date, i18n.tr("MMM yyyy")) : ""
218 }
219
220 Label {
221@@ -68,6 +69,7 @@
222
223 horizontalAlignment: Text.AlignHCenter
224
225- text: (event) ? Qt.formatDate(event.date, "dd") : ""
226+ /// The event ubuntushape's day part, keep as is unless you know what you're doing
227+ text: (event) ? Qt.formatDate(event.date, i18n.tr("dd")) : ""
228 }
229 }

Subscribers

People subscribed via source and target branches