gallery-app

Merge lp:~bfiller/gallery-app/i18n-strings into lp:gallery-app

  1. i18n-strings
  2. Merge into trunk
Proposed by Bill Filler
Status: Merged
Approved by: Bill Filler
Approved revision: 1079
Merged at revision: 1054
Proposed branch: lp:~bfiller/gallery-app/i18n-strings
Merge into: lp:gallery-app
Prerequisite: lp:~artmello/gallery-app/gallery-app-new_header
Diff against target: 207 lines (+46/-31)
4 files modified
po/gallery-app.pot (+43/-28)
rc/qml/AlbumEditor/AlbumEditor.qml (+1/-1)
rc/qml/AlbumsOverview.qml (+1/-1)
rc/qml/Components/DeleteDialog.qml (+1/-1)
To merge this branch: bzr merge lp:~bfiller/gallery-app/i18n-strings
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Pending
Leo Arias Pending
Arthur Mello Pending
Review via email: mp+233635@code.launchpad.net

Commit message

Mark strings for translation

Description of the change

Mark strings for translation.

To post a comment you must log in.

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 2014-06-05 15:26:44 +0000
3+++ po/gallery-app.pot 2014-09-06 20:54:02 +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: 2014-06-05 11:23-0400\n"
9+"POT-Creation-Date: 2014-08-29 16:32+0100\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@@ -17,7 +17,7 @@
14 "Content-Type: text/plain; charset=UTF-8\n"
15 "Content-Transfer-Encoding: 8bit\n"
16
17-#: desktop/gallery-app.desktop.in:3 rc/qml/MediaViewer/PopupPhotoViewer.qml:64
18+#: desktop/gallery-app.desktop.in:3 rc/qml/MediaViewer/PopupPhotoViewer.qml:56
19 msgid "Gallery"
20 msgstr ""
21
22@@ -30,20 +30,23 @@
23 msgstr ""
24
25 #: rc/qml/AlbumEditor/AlbumEditMenu.qml:43
26+#: rc/qml/AlbumEditor/AlbumEditor.qml:35
27 msgid "Edit album"
28 msgstr ""
29
30 #: rc/qml/AlbumEditor/AlbumEditMenu.qml:50
31-#: rc/qml/AlbumViewer/AlbumViewer.qml:438
32-#: rc/qml/MediaViewer/MediaViewer.qml:479
33-#: rc/qml/MediaViewer/MediaViewer.qml:485
34-#: rc/qml/MediaViewer/MediaViewer.qml:538 rc/qml/Utility/EditingHUD.qml:67
35+#: rc/qml/AlbumViewer/AlbumViewer.qml:371
36+#: rc/qml/Components/DeleteDialog.qml:32
37+#: rc/qml/MediaViewer/MediaViewer.qml:520
38+#: rc/qml/MediaViewer/MediaViewer.qml:529
39+#: rc/qml/MediaViewer/MediaViewer.qml:582 rc/qml/Utility/EditingHUD.qml:67
40 #: rc/qml/Utility/SelectionToolbarAction.qml:51
41 msgid "Delete"
42 msgstr ""
43
44 #: rc/qml/AlbumEditor/AlbumEditor.qml:40
45-#: rc/qml/Components/MediaSelector.qml:92 rc/qml/PickerScreen.qml:114
46+#: rc/qml/Components/MediaSelector.qml:93
47+#: rc/qml/MediaViewer/MediaViewer.qml:339 rc/qml/PickerScreen.qml:115
48 #: rc/qml/Utility/SelectionToolbarAction.qml:66
49 msgid "Cancel"
50 msgstr ""
51@@ -68,42 +71,42 @@
52 msgid "Red"
53 msgstr ""
54
55-#: rc/qml/AlbumViewer/AlbumViewer.qml:90
56+#: rc/qml/AlbumViewer/AlbumViewer.qml:107
57 msgid "Album"
58 msgstr ""
59
60-#: rc/qml/AlbumViewer/AlbumViewer.qml:427
61+#: rc/qml/AlbumViewer/AlbumViewer.qml:360
62 msgid "Add to album"
63 msgstr ""
64
65-#: rc/qml/AlbumViewer/AlbumViewer.qml:433
66-#: rc/qml/MediaViewer/MediaViewer.qml:474
67-#: rc/qml/MediaViewer/MediaViewer.qml:528 rc/qml/Utility/EditingHUD.qml:77
68+#: rc/qml/AlbumViewer/AlbumViewer.qml:366 rc/qml/AlbumsOverview.qml:238
69+#: rc/qml/MediaViewer/MediaViewer.qml:515
70+#: rc/qml/MediaViewer/MediaViewer.qml:572 rc/qml/Utility/EditingHUD.qml:77
71 #: rc/qml/Utility/SelectionToolbarAction.qml:44
72 msgid "Add"
73 msgstr ""
74
75-#: rc/qml/AlbumViewer/AlbumViewer.qml:447
76-#: rc/qml/MediaViewer/MediaViewer.qml:502
77-#: rc/qml/MediaViewer/MediaViewer.qml:557
78+#: rc/qml/AlbumViewer/AlbumViewer.qml:380
79+#: rc/qml/MediaViewer/MediaViewer.qml:546
80+#: rc/qml/MediaViewer/MediaViewer.qml:601
81 msgid "Back"
82 msgstr ""
83
84-#: rc/qml/AlbumsOverview.qml:197 rc/qml/Components/PopupAlbumPicker.qml:91
85+#: rc/qml/AlbumsOverview.qml:226 rc/qml/Components/PopupAlbumPicker.qml:91
86 msgid "Add new album"
87 msgstr ""
88
89-#: rc/qml/AlbumsOverview.qml:215 rc/qml/Utility/PhotosToolbarActions.qml:46
90+#: rc/qml/AlbumsOverview.qml:244 rc/qml/Utility/PhotosToolbarActions.qml:46
91 msgid "Camera"
92 msgstr ""
93
94 #: rc/qml/Components/DeleteDialog.qml:36
95-#: rc/qml/MediaViewer/MediaViewer.qml:288
96+#: rc/qml/MediaViewer/MediaViewer.qml:287
97 msgid "Yes"
98 msgstr ""
99
100 #: rc/qml/Components/DeleteDialog.qml:45
101-#: rc/qml/MediaViewer/MediaViewer.qml:299
102+#: rc/qml/MediaViewer/MediaViewer.qml:298
103 msgid "No"
104 msgstr ""
105
106@@ -172,33 +175,45 @@
107 msgid "Revert to original"
108 msgstr ""
109
110-#: rc/qml/MediaViewer/MediaViewer.qml:277 rc/qml/PhotosOverview.qml:75
111+#: rc/qml/MediaViewer/MediaViewer.qml:276 rc/qml/PhotosOverview.qml:75
112 msgid "Delete a photo"
113 msgstr ""
114
115-#: rc/qml/MediaViewer/MediaViewer.qml:455
116+#: rc/qml/MediaViewer/MediaViewer.qml:309
117+msgid "Remove a photo from album"
118+msgstr ""
119+
120+#: rc/qml/MediaViewer/MediaViewer.qml:318
121+msgid "Remove from Album"
122+msgstr ""
123+
124+#: rc/qml/MediaViewer/MediaViewer.qml:329
125+msgid "Remove from Album and Delete"
126+msgstr ""
127+
128+#: rc/qml/MediaViewer/MediaViewer.qml:496
129 msgid "Edit"
130 msgstr ""
131
132-#: rc/qml/MediaViewer/MediaViewer.qml:466
133+#: rc/qml/MediaViewer/MediaViewer.qml:507
134 msgid "Add photo to album"
135 msgstr ""
136
137-#: rc/qml/MediaViewer/MediaViewer.qml:492
138+#: rc/qml/MediaViewer/MediaViewer.qml:536
139 msgid "Share photo"
140 msgstr ""
141
142-#: rc/qml/MediaViewer/MediaViewer.qml:498
143-#: rc/qml/MediaViewer/MediaViewer.qml:548 rc/qml/Utility/EditingHUD.qml:72
144+#: rc/qml/MediaViewer/MediaViewer.qml:542
145+#: rc/qml/MediaViewer/MediaViewer.qml:592 rc/qml/Utility/EditingHUD.qml:72
146 #: rc/qml/Utility/SelectionToolbarAction.qml:58
147 msgid "Share"
148 msgstr ""
149
150-#: rc/qml/MediaViewer/MediaViewer.qml:515
151+#: rc/qml/MediaViewer/MediaViewer.qml:559
152 msgid "Pause"
153 msgstr ""
154
155-#: rc/qml/MediaViewer/MediaViewer.qml:515
156+#: rc/qml/MediaViewer/MediaViewer.qml:559
157 msgid "Play"
158 msgstr ""
159
160@@ -206,7 +221,7 @@
161 msgid "Delete photos"
162 msgstr ""
163
164-#: rc/qml/PickerScreen.qml:99
165+#: rc/qml/PickerScreen.qml:100
166 msgid "Pick"
167 msgstr ""
168
169
170=== modified file 'rc/qml/AlbumEditor/AlbumEditor.qml'
171--- rc/qml/AlbumEditor/AlbumEditor.qml 2014-09-06 20:54:02 +0000
172+++ rc/qml/AlbumEditor/AlbumEditor.qml 2014-09-06 20:54:02 +0000
173@@ -32,7 +32,7 @@
174 id: albumEditor
175 objectName: "mainAlbumEditor"
176
177- title: "Edit album"
178+ title: i18n.tr("Edit album")
179 head.backAction: Action {
180 objectName: "cancelButton"
181 text: i18n.tr("Cancel")
182
183=== modified file 'rc/qml/AlbumsOverview.qml'
184--- rc/qml/AlbumsOverview.qml 2014-09-06 20:54:02 +0000
185+++ rc/qml/AlbumsOverview.qml 2014-09-06 20:54:02 +0000
186@@ -234,7 +234,7 @@
187 albumEditor.open();
188 }
189 }
190- text: "Add" // text in toolbar
191+ text: i18n.tr("Add") // text in toolbar
192 }
193 ToolbarButton {
194 action: Action {
195
196=== modified file 'rc/qml/Components/DeleteDialog.qml'
197--- rc/qml/Components/DeleteDialog.qml 2013-10-15 19:50:44 +0000
198+++ rc/qml/Components/DeleteDialog.qml 2014-09-06 20:54:02 +0000
199@@ -29,7 +29,7 @@
200 /// Emitted if delete should be performed
201 signal deleteClicked()
202
203- title: "Delete"
204+ title: i18n.tr("Delete")
205
206 Button {
207 objectName: "deleteDialogYes"

Subscribers

People subscribed via source and target branches