gallery-app

Merge lp:~schwann/gallery-app/gallery-translations into lp:gallery-app

  1. gallery-translations
  2. Merge into trunk
Proposed by Günter Schwann
Status: Merged
Approved by: Günter Schwann
Approved revision: 674
Merged at revision: 672
Proposed branch: lp:~schwann/gallery-app/gallery-translations
Merge into: lp:gallery-app
Diff against target: 746 lines (+572/-21)
11 files modified
CMakeLists.txt (+1/-0)
debian/control (+1/-0)
debian/gallery-app.install (+1/-0)
po/CMakeLists.txt (+16/-0)
po/de.po (+264/-0)
po/gallery-app.pot (+262/-0)
rc/qml/GalleryApplication.qml (+4/-0)
rc/qml/LoadingScreen.qml (+1/-1)
rc/qml/MainScreen.qml (+1/-0)
rc/qml/Utility/AlbumCoverList.qml (+1/-1)
rc/qml/Utility/EditingHUD.qml (+20/-19)
To merge this branch: bzr merge lp:~schwann/gallery-app/gallery-translations
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve
Olivier Tilloy Approve
Review via email: mp+165179@code.launchpad.net

Commit message

First german translation, and everything needed to make it work

Description of the change

First german translation, and everything needed to make it work.
The translation is not complete, but proves that the translation works.

To post a comment you must log in.
lp:~schwann/gallery-app/gallery-translations updated
670. By Günter Schwann

First german translation

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

FAILED: Continuous integration, rev:670
http://jenkins.qa.ubuntu.com/job/gallery-app-ci/165/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-raring-amd64-ci/58
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-raring-armhf-ci/151
        deb: http://jenkins.qa.ubuntu.com/job/gallery-app-raring-armhf-ci/151/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-raring-i386-ci/152
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/1594/console

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

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

FAILED: Continuous integration, rev:670
http://jenkins.qa.ubuntu.com/job/gallery-app-ci/166/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-raring-amd64-ci/59
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-raring-armhf-ci/152
        deb: http://jenkins.qa.ubuntu.com/job/gallery-app-raring-armhf-ci/152/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-raring-i386-ci/153
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/1598

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

review: Needs Fixing (continuous-integration)
Revision history for this message
Olivier Tilloy (osomon) wrote :

A tiny nitpick, not strictly related to this MR:

    rc/qml/LoadingScreen.qml:36: text: i18n.tr("Loading...")

There is a unicode character for the ellipsis ("…", see http://en.wikipedia.org/wiki/Ellipsis), it shouldn’t be represented by three dots. Now would be a good time to fix it, before people start translating it.

Revision history for this message
Olivier Tilloy (osomon) wrote :

In rc/qml/Utility/EditingHUD.qml, HUD keywords should also be internationalized.

review: Needs Fixing
Revision history for this message
Olivier Tilloy (osomon) wrote :

If I build a package from this branch, install it locally and run the app with LANGUAGE=de, I get most of the UI translated in German as expected (except for untranslated strings), but the initial loading screen that reads "Loading..." is not translated, despite the string being translated in de.po ("Laden..."). I’m suspecting that the translation domain is not set right away, thus delaying loading the translations.

If my hypothesis is correct, since this application is C++, you could work around this by calling textdomain("gallery-app") in the early initialization of the app (need to #include <libintl.h>).

Not sure this is worth it though, maybe we want to file a bug against the UITK and go ahead with what we currently have.

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

PASSED: Continuous integration, rev:670
http://jenkins.qa.ubuntu.com/job/gallery-app-ci/167/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-raring-amd64-ci/60
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-raring-armhf-ci/153
        deb: http://jenkins.qa.ubuntu.com/job/gallery-app-raring-armhf-ci/153/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-raring-i386-ci/154
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/1600

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

review: Approve (continuous-integration)
Revision history for this message
Günter Schwann (schwann) wrote :

The "Loading..." issues - solution is to make gallery start fast enough, so it's not needed anymore ;)
But I can/will fix this in QML.

lp:~schwann/gallery-app/gallery-translations updated
671. By Günter Schwann

Add HUD keywords and descriptions
Use "…" instead of "..."
Set the i18n.domain in main qml file, so the Loading page is translated

Revision history for this message
Olivier Tilloy (osomon) wrote :

333 +#: rc/qml/Utility/AlbumCoverList.qml:118

This is not in the right place. Unwanted cut&paste maybe?

review: Needs Fixing
Revision history for this message
Olivier Tilloy (osomon) wrote :

> 333 +#: rc/qml/Utility/AlbumCoverList.qml:118
>
> This is not in the right place. Unwanted cut&paste maybe?

Not. In fact it’s because an empty string shouldn’t be i18n’d. Please remove the call to i18n.tr() on line 118 of rc/qml/Utility/AlbumCoverList.qml.

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

FAILED: Continuous integration, rev:671
http://jenkins.qa.ubuntu.com/job/gallery-app-ci/169/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-raring-amd64-ci/62
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-raring-armhf-ci/155
        deb: http://jenkins.qa.ubuntu.com/job/gallery-app-raring-armhf-ci/155/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-raring-i386-ci/156
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/1608

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

review: Needs Fixing (continuous-integration)
lp:~schwann/gallery-app/gallery-translations updated
672. By Günter Schwann

Remove translation of empty string

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

FAILED: Continuous integration, rev:672
http://jenkins.qa.ubuntu.com/job/gallery-app-ci/171/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-raring-amd64-ci/64
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-raring-armhf-ci/157
        deb: http://jenkins.qa.ubuntu.com/job/gallery-app-raring-armhf-ci/157/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-raring-i386-ci/158
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/1616

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

review: Needs Fixing (continuous-integration)
lp:~schwann/gallery-app/gallery-translations updated
673. By Günter Schwann

Merge trunk

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

FAILED: Continuous integration, rev:673
http://jenkins.qa.ubuntu.com/job/gallery-app-ci/174/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-raring-amd64-ci/67
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-raring-armhf-ci/160
        deb: http://jenkins.qa.ubuntu.com/job/gallery-app-raring-armhf-ci/160/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-raring-i386-ci/161
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/1625

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

review: Needs Fixing (continuous-integration)
Revision history for this message
Olivier Tilloy (osomon) wrote :

Looks good now.

review: Approve
lp:~schwann/gallery-app/gallery-translations updated
674. By Günter Schwann

Merge trunk

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

PASSED: Continuous integration, rev:674
http://jenkins.qa.ubuntu.com/job/gallery-app-ci/175/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-raring-amd64-ci/68
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-raring-armhf-ci/161
        deb: http://jenkins.qa.ubuntu.com/job/gallery-app-raring-armhf-ci/161/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-raring-i386-ci/162
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/1634

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

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'CMakeLists.txt'
2--- CMakeLists.txt 2013-05-03 01:31:38 +0000
3+++ CMakeLists.txt 2013-05-23 12:54:31 +0000
4@@ -49,6 +49,7 @@
5 enable_testing()
6
7 add_subdirectory(desktop)
8+add_subdirectory(po)
9 add_subdirectory(rc)
10 add_subdirectory(src)
11 add_subdirectory(tests)
12
13=== modified file 'debian/control'
14--- debian/control 2013-04-23 15:01:30 +0000
15+++ debian/control 2013-05-23 12:54:31 +0000
16@@ -4,6 +4,7 @@
17 Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
18 Build-Depends: debhelper (>= 9),
19 cmake,
20+ gettext,
21 libexiv2-dev,
22 libgl1-mesa-dev | libgl-dev,
23 libgles2-mesa-dev,
24
25=== modified file 'debian/gallery-app.install'
26--- debian/gallery-app.install 2013-04-15 12:05:00 +0000
27+++ debian/gallery-app.install 2013-05-23 12:54:31 +0000
28@@ -2,3 +2,4 @@
29 usr/share/applications
30 usr/share/gallery-app
31 usr/share/icons
32+usr/share/locale/*/LC_MESSAGES/gallery-app.mo
33
34=== added directory 'po'
35=== added file 'po/CMakeLists.txt'
36--- po/CMakeLists.txt 1970-01-01 00:00:00 +0000
37+++ po/CMakeLists.txt 2013-05-23 12:54:31 +0000
38@@ -0,0 +1,16 @@
39+project(gallery-translations)
40+
41+include(FindGettext)
42+
43+set(DOMAIN gallery-app)
44+set(POT_FILE ${DOMAIN}.pot)
45+file(GLOB PO_FILES *.po)
46+
47+foreach(PO_FILE ${PO_FILES})
48+ get_filename_component(LANG ${PO_FILE} NAME_WE)
49+ gettext_process_po_files(${LANG} ALL PO_FILES ${PO_FILE})
50+ set(INSTALL_DIR ${CMAKE_INSTALL_LOCALEDIR}/${LANG}/LC_MESSAGES)
51+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${LANG}.gmo
52+ DESTINATION ${INSTALL_DIR}
53+ RENAME ${DOMAIN}.mo)
54+endforeach(PO_FILE)
55
56=== added file 'po/de.po'
57--- po/de.po 1970-01-01 00:00:00 +0000
58+++ po/de.po 2013-05-23 12:54:31 +0000
59@@ -0,0 +1,264 @@
60+# Ubuntu gallery app translation.
61+# Copyright 2013 Canonical Ltd.
62+# This file is distributed under the same license as the gallery-app package.
63+#
64+msgid ""
65+msgstr ""
66+"Project-Id-Version: gallery-app VERSION\n"
67+"Report-Msgid-Bugs-To: \n"
68+"POT-Creation-Date: 2013-05-23 06:59+0000\n"
69+"PO-Revision-Date: 2013-05-22 18:22-0000\n"
70+"Last-Translator: Guenter Schwann <guenter.schwann@canonical.com>\n"
71+"Language-Team: German\n"
72+"Language: de\n"
73+"MIME-Version: 1.0\n"
74+"Content-Type: text/plain; charset=UTF-8\n"
75+"Content-Transfer-Encoding: 8bit\n"
76+"X-Generator: Poedit 1.5.4\n"
77+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
78+
79+#: rc/qml/Utility/SelectionToolbarAction.qml:42
80+#: rc/qml/Utility/EditingHUD.qml:77 rc/qml/AlbumViewer.qml:466
81+#: rc/qml/GalleryPhotoViewer.qml:206 rc/qml/AlbumsOverview.qml:177
82+msgid "Add"
83+msgstr ""
84+
85+#: rc/qml/Utility/SelectionToolbarAction.qml:48
86+#: rc/qml/Utility/EditingHUD.qml:67 rc/qml/AlbumViewer.qml:473
87+#: rc/qml/GalleryPhotoViewer.qml:214 rc/qml/Widgets/AlbumEditMenu.qml:59
88+msgid "Delete"
89+msgstr ""
90+
91+#: rc/qml/Utility/SelectionToolbarAction.qml:54
92+#: rc/qml/Utility/EditingHUD.qml:72 rc/qml/AlbumViewer.qml:483
93+#: rc/qml/GalleryPhotoViewer.qml:221 rc/qml/Widgets/AlbumEditMenu.qml:52
94+msgid "Share"
95+msgstr "Freigeben"
96+
97+#: rc/qml/Utility/SelectionToolbarAction.qml:61 rc/qml/MediaSelector.qml:94
98+#: rc/qml/AlbumEditor.qml:40
99+msgid "Cancel"
100+msgstr "Abbrechen"
101+
102+#: rc/qml/Utility/PhotosToolbarActions.qml:32 rc/qml/MainScreen.qml:92
103+#: rc/qml/MainScreen.qml:124
104+msgid "Select"
105+msgstr ""
106+
107+#: rc/qml/Utility/PhotosToolbarActions.qml:38
108+msgid "Import"
109+msgstr ""
110+
111+#: rc/qml/Utility/PhotosToolbarActions.qml:43 rc/qml/AlbumsOverview.qml:185
112+msgid "Camera"
113+msgstr "Kamera"
114+
115+#: rc/qml/Utility/EditingHUD.qml:68
116+msgid "Trash;Erase"
117+msgstr ""
118+
119+#: rc/qml/Utility/EditingHUD.qml:73
120+msgid "Post;Upload;Attach"
121+msgstr ""
122+
123+#: rc/qml/Utility/EditingHUD.qml:78 rc/qml/Widgets/PopupAlbumPicker.qml:113
124+msgid "Add Photo to Album"
125+msgstr ""
126+
127+#: rc/qml/Utility/EditingHUD.qml:82 rc/qml/Widgets/EditPopover.qml:63
128+msgid "Undo"
129+msgstr ""
130+
131+#: rc/qml/Utility/EditingHUD.qml:83
132+msgid "Cancel Action;Backstep"
133+msgstr ""
134+
135+#: rc/qml/Utility/EditingHUD.qml:87 rc/qml/Widgets/EditPopover.qml:72
136+msgid "Redo"
137+msgstr ""
138+
139+#: rc/qml/Utility/EditingHUD.qml:88
140+msgid "Reapply;Make Again"
141+msgstr ""
142+
143+#: rc/qml/Utility/EditingHUD.qml:92
144+msgid "Auto Enhance"
145+msgstr "Automatisch verbessern"
146+
147+#: rc/qml/Utility/EditingHUD.qml:93
148+msgid "Adjust the image automatically"
149+msgstr ""
150+
151+#: rc/qml/Utility/EditingHUD.qml:94
152+msgid "Automatically Adjust Photo"
153+msgstr ""
154+
155+#: rc/qml/Utility/EditingHUD.qml:99 rc/qml/Widgets/EditPopover.qml:39
156+msgid "Rotate"
157+msgstr "Drehen"
158+
159+#: rc/qml/Utility/EditingHUD.qml:100
160+msgid "Turn Clockwise"
161+msgstr ""
162+
163+#: rc/qml/Utility/EditingHUD.qml:101
164+msgid "Rotate the image clockwise"
165+msgstr ""
166+
167+#: rc/qml/Utility/EditingHUD.qml:106 rc/qml/Utility/CropOverlay.qml:355
168+#: rc/qml/Widgets/EditPopover.qml:47
169+msgid "Crop"
170+msgstr "Ausschneiden"
171+
172+#: rc/qml/Utility/EditingHUD.qml:107
173+msgid "Trim;Cut"
174+msgstr ""
175+
176+#: rc/qml/Utility/EditingHUD.qml:108
177+msgid "Crop the image"
178+msgstr ""
179+
180+#: rc/qml/Utility/EditingHUD.qml:113
181+msgid "Revert to Original"
182+msgstr "Original wiederherstellen"
183+
184+#: rc/qml/Utility/EditingHUD.qml:114
185+msgid "Discard Changes"
186+msgstr ""
187+
188+#: rc/qml/Utility/EditingHUD.qml:115
189+msgid "Discard all changes"
190+msgstr ""
191+
192+#: rc/qml/Utility/EditingHUD.qml:119
193+msgid "Exposure"
194+msgstr "Belichtung"
195+
196+#: rc/qml/Utility/EditingHUD.qml:120
197+msgid "Adjust the exposure"
198+msgstr ""
199+
200+#: rc/qml/Utility/EditingHUD.qml:121
201+msgid "Underexposed;Overexposed"
202+msgstr ""
203+
204+#: rc/qml/Utility/EditingHUD.qml:123 rc/qml/Utility/EditingHUD.qml:165
205+msgid "Confirm"
206+msgstr ""
207+
208+#: rc/qml/Utility/EditingHUD.qml:127
209+msgid "Compensation"
210+msgstr "Farbabgleich"
211+
212+#: rc/qml/Utility/EditingHUD.qml:161
213+msgid "Color Balance"
214+msgstr "Farbabgleich"
215+
216+#: rc/qml/Utility/EditingHUD.qml:162
217+#, fuzzy
218+msgid "Adjust color balance"
219+msgstr "Farbabgleich"
220+
221+#: rc/qml/Utility/EditingHUD.qml:163
222+msgid "Saturation;Hue"
223+msgstr ""
224+
225+#: rc/qml/Utility/EditingHUD.qml:169
226+msgid "Brightness"
227+msgstr "Helligkeit"
228+
229+#: rc/qml/Utility/EditingHUD.qml:181
230+msgid "Contrast"
231+msgstr "Kontrast"
232+
233+#: rc/qml/Utility/EditingHUD.qml:193
234+msgid "Saturation"
235+msgstr ""
236+
237+#: rc/qml/Utility/EditingHUD.qml:205
238+msgid "Hue"
239+msgstr "Farbton"
240+
241+#: rc/qml/Utility/AlbumCoverList.qml:113
242+msgid "Default"
243+msgstr "Standard"
244+
245+#: rc/qml/Utility/AlbumCoverList.qml:114
246+msgid "Blue"
247+msgstr "Blau"
248+
249+#: rc/qml/Utility/AlbumCoverList.qml:115
250+msgid "Green"
251+msgstr ""
252+
253+#: rc/qml/Utility/AlbumCoverList.qml:116
254+msgid "Pattern"
255+msgstr "Muster"
256+
257+#: rc/qml/Utility/AlbumCoverList.qml:117
258+msgid "Red"
259+msgstr "Rot"
260+
261+#: rc/qml/AlbumViewer.qml:488 rc/qml/GalleryPhotoViewer.qml:229
262+msgid "Back"
263+msgstr ""
264+
265+#: rc/qml/PhotosOverview.qml:148
266+msgid "Delete photos"
267+msgstr ""
268+
269+#: rc/qml/PhotosOverview.qml:149 rc/qml/GalleryPhotoViewer.qml:264
270+msgid "Delete a photo"
271+msgstr ""
272+
273+#: rc/qml/MainScreen.qml:56
274+msgid "Albums"
275+msgstr "Alben"
276+
277+#: rc/qml/MainScreen.qml:72 rc/qml/MainScreen.qml:94
278+msgid "Events"
279+msgstr "Ereignisse"
280+
281+#: rc/qml/MainScreen.qml:104 rc/qml/MainScreen.qml:126
282+msgid "Photos"
283+msgstr "Fotos"
284+
285+#: rc/qml/GalleryPhotoViewer.qml:199
286+msgid "Edit"
287+msgstr "Bearbeiten"
288+
289+#: rc/qml/GalleryPhotoViewer.qml:275 rc/qml/Widgets/DeleteDialog.qml:36
290+msgid "Yes"
291+msgstr "Ja"
292+
293+#: rc/qml/GalleryPhotoViewer.qml:286 rc/qml/Widgets/DeleteDialog.qml:45
294+msgid "No"
295+msgstr "Nein"
296+
297+#: rc/qml/MediaSelector.qml:56 rc/qml/MediaSelector.qml:82
298+msgid "Add to Album"
299+msgstr ""
300+
301+#: rc/qml/LoadingScreen.qml:36
302+msgid "Loading…"
303+msgstr "Laden…"
304+
305+#: rc/qml/Widgets/AlbumEditMenu.qml:45
306+msgid "Edit album"
307+msgstr "Album bearbeiten"
308+
309+#: rc/qml/Widgets/DeleteOrDeleteWithContentsDialog.qml:51
310+msgid "Delete album"
311+msgstr ""
312+
313+#: rc/qml/Widgets/DeleteOrDeleteWithContentsDialog.qml:60
314+msgid "Delete album + contents"
315+msgstr ""
316+
317+#: rc/qml/Widgets/EditPopover.qml:55
318+msgid "Auto enhance"
319+msgstr "Automatisch verbessern"
320+
321+#: rc/qml/Widgets/EditPopover.qml:81
322+msgid "Revert to original"
323+msgstr "Original wiederherstellen"
324
325=== added file 'po/gallery-app.pot'
326--- po/gallery-app.pot 1970-01-01 00:00:00 +0000
327+++ po/gallery-app.pot 2013-05-23 12:54:31 +0000
328@@ -0,0 +1,262 @@
329+# Ubuntu gallery app translation.
330+# Copyright 2013 Canonical Ltd.
331+# This file is distributed under the same license as the gallery-app package.
332+#
333+#, fuzzy
334+msgid ""
335+msgstr ""
336+"Project-Id-Version: gallery-app\n"
337+"Report-Msgid-Bugs-To: \n"
338+"POT-Creation-Date: 2013-05-23 06:59+0000\n"
339+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
340+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
341+"Language-Team: LANGUAGE <LL@li.org>\n"
342+"Language: \n"
343+"MIME-Version: 1.0\n"
344+"Content-Type: text/plain; charset=UTF-8\n"
345+"Content-Transfer-Encoding: 8bit\n"
346+
347+#: rc/qml/Utility/SelectionToolbarAction.qml:42
348+#: rc/qml/Utility/EditingHUD.qml:77 rc/qml/AlbumViewer.qml:466
349+#: rc/qml/GalleryPhotoViewer.qml:206 rc/qml/AlbumsOverview.qml:177
350+msgid "Add"
351+msgstr ""
352+
353+#: rc/qml/Utility/SelectionToolbarAction.qml:48
354+#: rc/qml/Utility/EditingHUD.qml:67 rc/qml/AlbumViewer.qml:473
355+#: rc/qml/GalleryPhotoViewer.qml:214 rc/qml/Widgets/AlbumEditMenu.qml:59
356+msgid "Delete"
357+msgstr ""
358+
359+#: rc/qml/Utility/SelectionToolbarAction.qml:54
360+#: rc/qml/Utility/EditingHUD.qml:72 rc/qml/AlbumViewer.qml:483
361+#: rc/qml/GalleryPhotoViewer.qml:221 rc/qml/Widgets/AlbumEditMenu.qml:52
362+msgid "Share"
363+msgstr ""
364+
365+#: rc/qml/Utility/SelectionToolbarAction.qml:61 rc/qml/MediaSelector.qml:94
366+#: rc/qml/AlbumEditor.qml:40
367+msgid "Cancel"
368+msgstr ""
369+
370+#: rc/qml/Utility/PhotosToolbarActions.qml:32 rc/qml/MainScreen.qml:92
371+#: rc/qml/MainScreen.qml:124
372+msgid "Select"
373+msgstr ""
374+
375+#: rc/qml/Utility/PhotosToolbarActions.qml:38
376+msgid "Import"
377+msgstr ""
378+
379+#: rc/qml/Utility/PhotosToolbarActions.qml:43 rc/qml/AlbumsOverview.qml:185
380+msgid "Camera"
381+msgstr ""
382+
383+#: rc/qml/Utility/EditingHUD.qml:68
384+msgid "Trash;Erase"
385+msgstr ""
386+
387+#: rc/qml/Utility/EditingHUD.qml:73
388+msgid "Post;Upload;Attach"
389+msgstr ""
390+
391+#: rc/qml/Utility/EditingHUD.qml:78 rc/qml/Widgets/PopupAlbumPicker.qml:113
392+msgid "Add Photo to Album"
393+msgstr ""
394+
395+#: rc/qml/Utility/EditingHUD.qml:82 rc/qml/Widgets/EditPopover.qml:63
396+msgid "Undo"
397+msgstr ""
398+
399+#: rc/qml/Utility/EditingHUD.qml:83
400+msgid "Cancel Action;Backstep"
401+msgstr ""
402+
403+#: rc/qml/Utility/EditingHUD.qml:87 rc/qml/Widgets/EditPopover.qml:72
404+msgid "Redo"
405+msgstr ""
406+
407+#: rc/qml/Utility/EditingHUD.qml:88
408+msgid "Reapply;Make Again"
409+msgstr ""
410+
411+#: rc/qml/Utility/EditingHUD.qml:92
412+msgid "Auto Enhance"
413+msgstr ""
414+
415+#: rc/qml/Utility/EditingHUD.qml:93
416+msgid "Adjust the image automatically"
417+msgstr ""
418+
419+#: rc/qml/Utility/EditingHUD.qml:94
420+msgid "Automatically Adjust Photo"
421+msgstr ""
422+
423+#: rc/qml/Utility/EditingHUD.qml:99 rc/qml/Widgets/EditPopover.qml:39
424+msgid "Rotate"
425+msgstr ""
426+
427+#: rc/qml/Utility/EditingHUD.qml:100
428+msgid "Turn Clockwise"
429+msgstr ""
430+
431+#: rc/qml/Utility/EditingHUD.qml:101
432+msgid "Rotate the image clockwise"
433+msgstr ""
434+
435+#: rc/qml/Utility/EditingHUD.qml:106 rc/qml/Utility/CropOverlay.qml:355
436+#: rc/qml/Widgets/EditPopover.qml:47
437+msgid "Crop"
438+msgstr ""
439+
440+#: rc/qml/Utility/EditingHUD.qml:107
441+msgid "Trim;Cut"
442+msgstr ""
443+
444+#: rc/qml/Utility/EditingHUD.qml:108
445+msgid "Crop the image"
446+msgstr ""
447+
448+#: rc/qml/Utility/EditingHUD.qml:113
449+msgid "Revert to Original"
450+msgstr ""
451+
452+#: rc/qml/Utility/EditingHUD.qml:114
453+msgid "Discard Changes"
454+msgstr ""
455+
456+#: rc/qml/Utility/EditingHUD.qml:115
457+msgid "Discard all changes"
458+msgstr ""
459+
460+#: rc/qml/Utility/EditingHUD.qml:119
461+msgid "Exposure"
462+msgstr ""
463+
464+#: rc/qml/Utility/EditingHUD.qml:120
465+msgid "Adjust the exposure"
466+msgstr ""
467+
468+#: rc/qml/Utility/EditingHUD.qml:121
469+msgid "Underexposed;Overexposed"
470+msgstr ""
471+
472+#: rc/qml/Utility/EditingHUD.qml:123 rc/qml/Utility/EditingHUD.qml:165
473+msgid "Confirm"
474+msgstr ""
475+
476+#: rc/qml/Utility/EditingHUD.qml:127
477+msgid "Compensation"
478+msgstr ""
479+
480+#: rc/qml/Utility/EditingHUD.qml:161
481+msgid "Color Balance"
482+msgstr ""
483+
484+#: rc/qml/Utility/EditingHUD.qml:162
485+msgid "Adjust color balance"
486+msgstr ""
487+
488+#: rc/qml/Utility/EditingHUD.qml:163
489+msgid "Saturation;Hue"
490+msgstr ""
491+
492+#: rc/qml/Utility/EditingHUD.qml:169
493+msgid "Brightness"
494+msgstr ""
495+
496+#: rc/qml/Utility/EditingHUD.qml:181
497+msgid "Contrast"
498+msgstr ""
499+
500+#: rc/qml/Utility/EditingHUD.qml:193
501+msgid "Saturation"
502+msgstr ""
503+
504+#: rc/qml/Utility/EditingHUD.qml:205
505+msgid "Hue"
506+msgstr ""
507+
508+#: rc/qml/Utility/AlbumCoverList.qml:113
509+msgid "Default"
510+msgstr ""
511+
512+#: rc/qml/Utility/AlbumCoverList.qml:114
513+msgid "Blue"
514+msgstr ""
515+
516+#: rc/qml/Utility/AlbumCoverList.qml:115
517+msgid "Green"
518+msgstr ""
519+
520+#: rc/qml/Utility/AlbumCoverList.qml:116
521+msgid "Pattern"
522+msgstr ""
523+
524+#: rc/qml/Utility/AlbumCoverList.qml:117
525+msgid "Red"
526+msgstr ""
527+
528+#: rc/qml/AlbumViewer.qml:488 rc/qml/GalleryPhotoViewer.qml:229
529+msgid "Back"
530+msgstr ""
531+
532+#: rc/qml/PhotosOverview.qml:148
533+msgid "Delete photos"
534+msgstr ""
535+
536+#: rc/qml/PhotosOverview.qml:149 rc/qml/GalleryPhotoViewer.qml:264
537+msgid "Delete a photo"
538+msgstr ""
539+
540+#: rc/qml/MainScreen.qml:56
541+msgid "Albums"
542+msgstr ""
543+
544+#: rc/qml/MainScreen.qml:72 rc/qml/MainScreen.qml:94
545+msgid "Events"
546+msgstr ""
547+
548+#: rc/qml/MainScreen.qml:104 rc/qml/MainScreen.qml:126
549+msgid "Photos"
550+msgstr ""
551+
552+#: rc/qml/GalleryPhotoViewer.qml:199
553+msgid "Edit"
554+msgstr ""
555+
556+#: rc/qml/GalleryPhotoViewer.qml:275 rc/qml/Widgets/DeleteDialog.qml:36
557+msgid "Yes"
558+msgstr ""
559+
560+#: rc/qml/GalleryPhotoViewer.qml:286 rc/qml/Widgets/DeleteDialog.qml:45
561+msgid "No"
562+msgstr ""
563+
564+#: rc/qml/MediaSelector.qml:56 rc/qml/MediaSelector.qml:82
565+msgid "Add to Album"
566+msgstr ""
567+
568+#: rc/qml/LoadingScreen.qml:36
569+msgid "Loading…"
570+msgstr ""
571+
572+#: rc/qml/Widgets/AlbumEditMenu.qml:45
573+msgid "Edit album"
574+msgstr ""
575+
576+#: rc/qml/Widgets/DeleteOrDeleteWithContentsDialog.qml:51
577+msgid "Delete album"
578+msgstr ""
579+
580+#: rc/qml/Widgets/DeleteOrDeleteWithContentsDialog.qml:60
581+msgid "Delete album + contents"
582+msgstr ""
583+
584+#: rc/qml/Widgets/EditPopover.qml:55
585+msgid "Auto enhance"
586+msgstr ""
587+
588+#: rc/qml/Widgets/EditPopover.qml:81
589+msgid "Revert to original"
590+msgstr ""
591
592=== modified file 'rc/qml/GalleryApplication.qml'
593--- rc/qml/GalleryApplication.qml 2013-05-02 17:24:59 +0000
594+++ rc/qml/GalleryApplication.qml 2013-05-23 12:54:31 +0000
595@@ -190,4 +190,8 @@
596 }
597 }
598 }
599+
600+ Component.onCompleted: {
601+ i18n.domain = "gallery-app";
602+ }
603 }
604
605=== modified file 'rc/qml/LoadingScreen.qml'
606--- rc/qml/LoadingScreen.qml 2013-05-02 17:24:59 +0000
607+++ rc/qml/LoadingScreen.qml 2013-05-23 12:54:31 +0000
608@@ -33,7 +33,7 @@
609
610 Text {
611 anchors.centerIn: parent
612- text: i18n.tr("Loading...")
613+ text: i18n.tr("Loading…")
614 font.pointSize: pointUnits(20)
615 }
616 }
617
618=== modified file 'rc/qml/MainScreen.qml'
619--- rc/qml/MainScreen.qml 2013-04-12 14:19:20 +0000
620+++ rc/qml/MainScreen.qml 2013-05-23 12:54:31 +0000
621@@ -30,6 +30,7 @@
622 objectName: "overview"
623
624 anchors.fill: parent
625+ applicationName: "gallery-app"
626
627 Tabs {
628 id: tabs
629
630=== modified file 'rc/qml/Utility/AlbumCoverList.qml'
631--- rc/qml/Utility/AlbumCoverList.qml 2013-05-15 07:27:18 +0000
632+++ rc/qml/Utility/AlbumCoverList.qml 2013-05-23 12:54:31 +0000
633@@ -115,7 +115,7 @@
634 case 2: elem.title = i18n.tr("Green"); break;
635 case 3: elem.title = i18n.tr("Pattern"); break;
636 case 4: elem.title = i18n.tr("Red"); break;
637- default: elem.title = i18n.tr("");
638+ default: elem.title = "";
639 }
640 albumCoverList.set(i, elem);
641 }
642
643=== modified file 'rc/qml/Utility/EditingHUD.qml'
644--- rc/qml/Utility/EditingHUD.qml 2013-04-23 14:46:11 +0000
645+++ rc/qml/Utility/EditingHUD.qml 2013-05-23 12:54:31 +0000
646@@ -16,6 +16,7 @@
647
648 import QtQuick 2.0
649 import Gallery 1.0
650+import Ubuntu.Components 0.1
651 import Ubuntu.HUD 1.0 as HUD
652
653 /*!
654@@ -64,62 +65,62 @@
655 HUD.Action {
656 id: deleteAction
657 label: i18n.tr("Delete")
658- keywords: "Trash;Erase"
659+ keywords: i18n.tr("Trash;Erase")
660 }
661 HUD.Action {
662 id: shareAction
663 label: i18n.tr("Share")
664- keywords: "Post;Upload;Attach"
665+ keywords: i18n.tr("Post;Upload;Attach")
666 }
667 HUD.Action {
668 id: addAction
669 label: i18n.tr("Add")
670- keywords: "Add Photo to Album"
671+ keywords: i18n.tr("Add Photo to Album")
672 }
673 HUD.Action {
674 id: undoAction
675 label: i18n.tr("Undo")
676- keywords: "Cancel Action;Backstep"
677+ keywords: i18n.tr("Cancel Action;Backstep")
678 }
679 HUD.Action {
680 id: redoAction
681 label: i18n.tr("Redo")
682- keywords: "Reapply;Make Again"
683+ keywords: i18n.tr("Reapply;Make Again")
684 }
685 HUD.Action {
686 id: autoEnhanceAction
687 label: i18n.tr("Auto Enhance")
688- description: "Adjust the image automatically"
689- keywords: "Automatically Adjust Photo"
690+ description: i18n.tr("Adjust the image automatically")
691+ keywords: i18n.tr("Automatically Adjust Photo")
692 onTriggered: photo.autoEnhance()
693 }
694 HUD.Action {
695 id: rotateAction
696 label: i18n.tr("Rotate")
697- keywords: "Turn Clockwise"
698- description: "Rotate the image clockwise"
699+ keywords: i18n.tr("Turn Clockwise")
700+ description: i18n.tr("Rotate the image clockwise")
701 onTriggered: photo.rotateRight()
702 }
703 HUD.Action {
704 id: cropAction
705 label: i18n.tr("Crop")
706- keywords: "Trim;Cut"
707- description: "Crop the image"
708+ keywords: i18n.tr("Trim;Cut")
709+ description: i18n.tr("Crop the image")
710 onTriggered: cropper.show(photo)
711 }
712 HUD.Action {
713 id: revertAction
714 label: i18n.tr("Revert to Original")
715- keywords: "Discard Changes"
716- description: "Discard all changes"
717+ keywords: i18n.tr("Discard Changes")
718+ description: i18n.tr("Discard all changes")
719 }
720 HUD.Action {
721 id: exposureAction
722 label: i18n.tr("Exposure")
723- description: "Adjust the exposure"
724- keywords: "Underexposed;Overexposed"
725+ description: i18n.tr("Adjust the exposure")
726+ keywords: i18n.tr("Underexposed;Overexposed")
727 hasLivePreview: true
728- commitLabel: "Confirm" // string to show in the confirm button
729+ commitLabel: i18n.tr("Confirm") // string to show in the confirm button
730
731 HUD.SliderParameter {
732 id: compensationParam
733@@ -158,10 +159,10 @@
734 HUD.Action {
735 id: colorBalanceAction
736 label: i18n.tr("Color Balance")
737- description: "Adjust color balance"
738- keywords: "Saturation;Hue"
739+ description: i18n.tr("Adjust color balance")
740+ keywords: i18n.tr("Saturation;Hue")
741 hasLivePreview: true
742- commitLabel: "Confirm"
743+ commitLabel: i18n.tr("Confirm")
744
745 HUD.SliderParameter {
746 id: brightnessParam

Subscribers

People subscribed via source and target branches