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
=== modified file 'po/gallery-app.pot'
--- po/gallery-app.pot 2014-06-05 15:26:44 +0000
+++ po/gallery-app.pot 2014-09-06 20:54:02 +0000
@@ -8,7 +8,7 @@
8msgstr ""8msgstr ""
9"Project-Id-Version: gallery-app\n"9"Project-Id-Version: gallery-app\n"
10"Report-Msgid-Bugs-To: \n"10"Report-Msgid-Bugs-To: \n"
11"POT-Creation-Date: 2014-06-05 11:23-0400\n"11"POT-Creation-Date: 2014-08-29 16:32+0100\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=UTF-8\n"17"Content-Type: text/plain; charset=UTF-8\n"
18"Content-Transfer-Encoding: 8bit\n"18"Content-Transfer-Encoding: 8bit\n"
1919
20#: desktop/gallery-app.desktop.in:3 rc/qml/MediaViewer/PopupPhotoViewer.qml:6420#: desktop/gallery-app.desktop.in:3 rc/qml/MediaViewer/PopupPhotoViewer.qml:56
21msgid "Gallery"21msgid "Gallery"
22msgstr ""22msgstr ""
2323
@@ -30,20 +30,23 @@
30msgstr ""30msgstr ""
3131
32#: rc/qml/AlbumEditor/AlbumEditMenu.qml:4332#: rc/qml/AlbumEditor/AlbumEditMenu.qml:43
33#: rc/qml/AlbumEditor/AlbumEditor.qml:35
33msgid "Edit album"34msgid "Edit album"
34msgstr ""35msgstr ""
3536
36#: rc/qml/AlbumEditor/AlbumEditMenu.qml:5037#: rc/qml/AlbumEditor/AlbumEditMenu.qml:50
37#: rc/qml/AlbumViewer/AlbumViewer.qml:43838#: rc/qml/AlbumViewer/AlbumViewer.qml:371
38#: rc/qml/MediaViewer/MediaViewer.qml:47939#: rc/qml/Components/DeleteDialog.qml:32
39#: rc/qml/MediaViewer/MediaViewer.qml:48540#: rc/qml/MediaViewer/MediaViewer.qml:520
40#: rc/qml/MediaViewer/MediaViewer.qml:538 rc/qml/Utility/EditingHUD.qml:6741#: rc/qml/MediaViewer/MediaViewer.qml:529
42#: rc/qml/MediaViewer/MediaViewer.qml:582 rc/qml/Utility/EditingHUD.qml:67
41#: rc/qml/Utility/SelectionToolbarAction.qml:5143#: rc/qml/Utility/SelectionToolbarAction.qml:51
42msgid "Delete"44msgid "Delete"
43msgstr ""45msgstr ""
4446
45#: rc/qml/AlbumEditor/AlbumEditor.qml:4047#: rc/qml/AlbumEditor/AlbumEditor.qml:40
46#: rc/qml/Components/MediaSelector.qml:92 rc/qml/PickerScreen.qml:11448#: rc/qml/Components/MediaSelector.qml:93
49#: rc/qml/MediaViewer/MediaViewer.qml:339 rc/qml/PickerScreen.qml:115
47#: rc/qml/Utility/SelectionToolbarAction.qml:6650#: rc/qml/Utility/SelectionToolbarAction.qml:66
48msgid "Cancel"51msgid "Cancel"
49msgstr ""52msgstr ""
@@ -68,42 +71,42 @@
68msgid "Red"71msgid "Red"
69msgstr ""72msgstr ""
7073
71#: rc/qml/AlbumViewer/AlbumViewer.qml:9074#: rc/qml/AlbumViewer/AlbumViewer.qml:107
72msgid "Album"75msgid "Album"
73msgstr ""76msgstr ""
7477
75#: rc/qml/AlbumViewer/AlbumViewer.qml:42778#: rc/qml/AlbumViewer/AlbumViewer.qml:360
76msgid "Add to album"79msgid "Add to album"
77msgstr ""80msgstr ""
7881
79#: rc/qml/AlbumViewer/AlbumViewer.qml:43382#: rc/qml/AlbumViewer/AlbumViewer.qml:366 rc/qml/AlbumsOverview.qml:238
80#: rc/qml/MediaViewer/MediaViewer.qml:47483#: rc/qml/MediaViewer/MediaViewer.qml:515
81#: rc/qml/MediaViewer/MediaViewer.qml:528 rc/qml/Utility/EditingHUD.qml:7784#: rc/qml/MediaViewer/MediaViewer.qml:572 rc/qml/Utility/EditingHUD.qml:77
82#: rc/qml/Utility/SelectionToolbarAction.qml:4485#: rc/qml/Utility/SelectionToolbarAction.qml:44
83msgid "Add"86msgid "Add"
84msgstr ""87msgstr ""
8588
86#: rc/qml/AlbumViewer/AlbumViewer.qml:44789#: rc/qml/AlbumViewer/AlbumViewer.qml:380
87#: rc/qml/MediaViewer/MediaViewer.qml:50290#: rc/qml/MediaViewer/MediaViewer.qml:546
88#: rc/qml/MediaViewer/MediaViewer.qml:55791#: rc/qml/MediaViewer/MediaViewer.qml:601
89msgid "Back"92msgid "Back"
90msgstr ""93msgstr ""
9194
92#: rc/qml/AlbumsOverview.qml:197 rc/qml/Components/PopupAlbumPicker.qml:9195#: rc/qml/AlbumsOverview.qml:226 rc/qml/Components/PopupAlbumPicker.qml:91
93msgid "Add new album"96msgid "Add new album"
94msgstr ""97msgstr ""
9598
96#: rc/qml/AlbumsOverview.qml:215 rc/qml/Utility/PhotosToolbarActions.qml:4699#: rc/qml/AlbumsOverview.qml:244 rc/qml/Utility/PhotosToolbarActions.qml:46
97msgid "Camera"100msgid "Camera"
98msgstr ""101msgstr ""
99102
100#: rc/qml/Components/DeleteDialog.qml:36103#: rc/qml/Components/DeleteDialog.qml:36
101#: rc/qml/MediaViewer/MediaViewer.qml:288104#: rc/qml/MediaViewer/MediaViewer.qml:287
102msgid "Yes"105msgid "Yes"
103msgstr ""106msgstr ""
104107
105#: rc/qml/Components/DeleteDialog.qml:45108#: rc/qml/Components/DeleteDialog.qml:45
106#: rc/qml/MediaViewer/MediaViewer.qml:299109#: rc/qml/MediaViewer/MediaViewer.qml:298
107msgid "No"110msgid "No"
108msgstr ""111msgstr ""
109112
@@ -172,33 +175,45 @@
172msgid "Revert to original"175msgid "Revert to original"
173msgstr ""176msgstr ""
174177
175#: rc/qml/MediaViewer/MediaViewer.qml:277 rc/qml/PhotosOverview.qml:75178#: rc/qml/MediaViewer/MediaViewer.qml:276 rc/qml/PhotosOverview.qml:75
176msgid "Delete a photo"179msgid "Delete a photo"
177msgstr ""180msgstr ""
178181
179#: rc/qml/MediaViewer/MediaViewer.qml:455182#: rc/qml/MediaViewer/MediaViewer.qml:309
183msgid "Remove a photo from album"
184msgstr ""
185
186#: rc/qml/MediaViewer/MediaViewer.qml:318
187msgid "Remove from Album"
188msgstr ""
189
190#: rc/qml/MediaViewer/MediaViewer.qml:329
191msgid "Remove from Album and Delete"
192msgstr ""
193
194#: rc/qml/MediaViewer/MediaViewer.qml:496
180msgid "Edit"195msgid "Edit"
181msgstr ""196msgstr ""
182197
183#: rc/qml/MediaViewer/MediaViewer.qml:466198#: rc/qml/MediaViewer/MediaViewer.qml:507
184msgid "Add photo to album"199msgid "Add photo to album"
185msgstr ""200msgstr ""
186201
187#: rc/qml/MediaViewer/MediaViewer.qml:492202#: rc/qml/MediaViewer/MediaViewer.qml:536
188msgid "Share photo"203msgid "Share photo"
189msgstr ""204msgstr ""
190205
191#: rc/qml/MediaViewer/MediaViewer.qml:498206#: rc/qml/MediaViewer/MediaViewer.qml:542
192#: rc/qml/MediaViewer/MediaViewer.qml:548 rc/qml/Utility/EditingHUD.qml:72207#: rc/qml/MediaViewer/MediaViewer.qml:592 rc/qml/Utility/EditingHUD.qml:72
193#: rc/qml/Utility/SelectionToolbarAction.qml:58208#: rc/qml/Utility/SelectionToolbarAction.qml:58
194msgid "Share"209msgid "Share"
195msgstr ""210msgstr ""
196211
197#: rc/qml/MediaViewer/MediaViewer.qml:515212#: rc/qml/MediaViewer/MediaViewer.qml:559
198msgid "Pause"213msgid "Pause"
199msgstr ""214msgstr ""
200215
201#: rc/qml/MediaViewer/MediaViewer.qml:515216#: rc/qml/MediaViewer/MediaViewer.qml:559
202msgid "Play"217msgid "Play"
203msgstr ""218msgstr ""
204219
@@ -206,7 +221,7 @@
206msgid "Delete photos"221msgid "Delete photos"
207msgstr ""222msgstr ""
208223
209#: rc/qml/PickerScreen.qml:99224#: rc/qml/PickerScreen.qml:100
210msgid "Pick"225msgid "Pick"
211msgstr ""226msgstr ""
212227
213228
=== modified file 'rc/qml/AlbumEditor/AlbumEditor.qml'
--- rc/qml/AlbumEditor/AlbumEditor.qml 2014-09-06 20:54:02 +0000
+++ rc/qml/AlbumEditor/AlbumEditor.qml 2014-09-06 20:54:02 +0000
@@ -32,7 +32,7 @@
32 id: albumEditor32 id: albumEditor
33 objectName: "mainAlbumEditor"33 objectName: "mainAlbumEditor"
3434
35 title: "Edit album"35 title: i18n.tr("Edit album")
36 head.backAction: Action {36 head.backAction: Action {
37 objectName: "cancelButton"37 objectName: "cancelButton"
38 text: i18n.tr("Cancel")38 text: i18n.tr("Cancel")
3939
=== modified file 'rc/qml/AlbumsOverview.qml'
--- rc/qml/AlbumsOverview.qml 2014-09-06 20:54:02 +0000
+++ rc/qml/AlbumsOverview.qml 2014-09-06 20:54:02 +0000
@@ -234,7 +234,7 @@
234 albumEditor.open();234 albumEditor.open();
235 }235 }
236 }236 }
237 text: "Add" // text in toolbar237 text: i18n.tr("Add") // text in toolbar
238 }238 }
239 ToolbarButton {239 ToolbarButton {
240 action: Action {240 action: Action {
241241
=== modified file 'rc/qml/Components/DeleteDialog.qml'
--- rc/qml/Components/DeleteDialog.qml 2013-10-15 19:50:44 +0000
+++ rc/qml/Components/DeleteDialog.qml 2014-09-06 20:54:02 +0000
@@ -29,7 +29,7 @@
29 /// Emitted if delete should be performed29 /// Emitted if delete should be performed
30 signal deleteClicked()30 signal deleteClicked()
3131
32 title: "Delete"32 title: i18n.tr("Delete")
3333
34 Button {34 Button {
35 objectName: "deleteDialogYes"35 objectName: "deleteDialogYes"

Subscribers

People subscribed via source and target branches