Merge lp:~aacid/ubuntu-filemanager-app/update_pot into lp:ubuntu-filemanager-app

Proposed by Albert Astals Cid
Status: Merged
Approved by: David Planella
Approved revision: 247
Merged at revision: 249
Proposed branch: lp:~aacid/ubuntu-filemanager-app/update_pot
Merge into: lp:ubuntu-filemanager-app
Diff against target: 336 lines (+91/-108)
1 file modified
po/com.ubuntu.filemanager.pot (+91/-108)
To merge this branch: bzr merge lp:~aacid/ubuntu-filemanager-app/update_pot
Reviewer Review Type Date Requested Status
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
David Planella Pending
Ubuntu File Manager Developers Pending
Review via email: mp+230134@code.launchpad.net

Commit message

Update pot file

Description of the change

Obtained running
make com.ubuntu.filemanager.pot

To post a comment you must log in.
Revision history for this message
Leo Arias (elopio) wrote :

8 +# SOME DESCRIPTIVE TITLE.
9 +# Copyright (C) YEAR Canonical Ltd.
10 +# This file is distributed under the same license as the PACKAGE package.

This looks weird.

On the README.translations there are some instructions of how to generate the pot, but it fails for me.
I'll add David to the list of reviewers so he can take a look.

Revision history for this message
Albert Astals Cid (aacid) wrote :

It's pretty stadandard xgettext boilerplate, .pot is a template after all should not matter. I'm going to be away next week so if this needs changes please someone else take over.

Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'po/com.ubuntu.filemanager.pot'
2--- po/com.ubuntu.filemanager.pot 2014-05-15 09:14:55 +0000
3+++ po/com.ubuntu.filemanager.pot 2014-08-08 15:49:24 +0000
4@@ -1,14 +1,14 @@
5-# Filemanager App Translations
6-# Copyright (C) 2014 Canonical Ltd.
7-# This file is distributed under the same license as the ubuntu-filemanager-app package.
8+# SOME DESCRIPTIVE TITLE.
9+# Copyright (C) YEAR Canonical Ltd.
10+# This file is distributed under the same license as the PACKAGE package.
11 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
12 #
13 #, fuzzy
14 msgid ""
15 msgstr ""
16-"Project-Id-Version: ubuntu-filemanager-app\n"
17+"Project-Id-Version: \n"
18 "Report-Msgid-Bugs-To: \n"
19-"POT-Creation-Date: 2014-05-15 10:53+0200\n"
20+"POT-Creation-Date: 2014-08-08 17:46+0200\n"
21 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
22 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
23 "Language-Team: LANGUAGE <LL@li.org>\n"
24@@ -16,6 +16,7 @@
25 "MIME-Version: 1.0\n"
26 "Content-Type: text/plain; charset=CHARSET\n"
27 "Content-Transfer-Encoding: 8bit\n"
28+"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
29
30 #: src/app/qml/components/FolderIconView.qml:58
31 #: src/app/qml/components/FolderListView.qml:36
32@@ -29,30 +30,25 @@
33 msgid "%1 (%2 files)"
34 msgstr ""
35
36-#: src/app/qml/components/PathBar.qml:120
37-#: src/app/qml/ui/FolderListPage.qml:151
38-msgid "Home"
39-msgstr ""
40-
41-#: src/app/qml/components/PlacesSidebar.qml:85
42-#: src/app/qml/ui/FolderListPage.qml:421
43+#: src/app/qml/components/PlacesSidebar.qml:54
44+#: src/app/qml/ui/FolderListPage.qml:305
45 msgid "Places"
46 msgstr ""
47
48-#: src/app/qml/filemanager.qml:66 src/app/qml/ui/SettingsSheet.qml:31
49+#: src/app/qml/filemanager.qml:83 src/app/qml/ui/SettingsSheet.qml:31
50 msgid "Settings"
51 msgstr ""
52
53-#: src/app/qml/filemanager.qml:67
54+#: src/app/qml/filemanager.qml:84
55 msgid "Change app settings"
56 msgstr ""
57
58-#: src/app/qml/filemanager.qml:186 src/app/qml/ui/FolderListPage.qml:492
59+#: src/app/qml/filemanager.qml:246 src/app/qml/ui/FolderListPage.qml:408
60 #: src/app/qml/ui/ViewPopover.qml:70
61 msgid "Icons"
62 msgstr ""
63
64-#: src/app/qml/filemanager.qml:186 src/app/qml/ui/FolderListPage.qml:508
65+#: src/app/qml/filemanager.qml:246 src/app/qml/ui/FolderListPage.qml:425
66 #: src/app/qml/ui/ViewPopover.qml:71
67 msgid "List"
68 msgstr ""
69@@ -67,7 +63,7 @@
70 #: src/app/qml/ui/ConfirmDialogWithInput.qml:51
71 #: src/app/qml/ui/FileActionDialog.qml:45
72 #: src/app/qml/ui/FileOperationProgressDialog.qml:44
73-#: src/app/qml/ui/GoToDialog.qml:66
74+#: src/app/qml/ui/FolderListPage.qml:385 src/app/qml/ui/GoToDialog.qml:66
75 msgid "Cancel"
76 msgstr ""
77
78@@ -124,169 +120,156 @@
79 msgid "Operation in progress"
80 msgstr ""
81
82-#: src/app/qml/ui/FolderListPage.qml:122
83-msgid "~/Desktop"
84-msgstr ""
85+#: src/app/qml/ui/FolderListPage.qml:93
86+#, qt-format
87+msgid "%1 file"
88+msgid_plural "%1 files"
89+msgstr[0] ""
90+msgstr[1] ""
91
92-#: src/app/qml/ui/FolderListPage.qml:124
93-msgid "~/Documents"
94+#: src/app/qml/ui/FolderListPage.qml:118
95+msgid "Open in a new tab"
96 msgstr ""
97
98 #: src/app/qml/ui/FolderListPage.qml:126
99-msgid "~/Downloads"
100-msgstr ""
101-
102-#: src/app/qml/ui/FolderListPage.qml:128
103-msgid "~/Music"
104-msgstr ""
105-
106-#: src/app/qml/ui/FolderListPage.qml:130
107-msgid "~/Pictures"
108-msgstr ""
109-
110-#: src/app/qml/ui/FolderListPage.qml:132
111-msgid "~/Public"
112-msgstr ""
113-
114-#: src/app/qml/ui/FolderListPage.qml:134
115-msgid "~/Programs"
116-msgstr ""
117-
118-#: src/app/qml/ui/FolderListPage.qml:136
119-msgid "~/Templates"
120-msgstr ""
121-
122-#: src/app/qml/ui/FolderListPage.qml:138
123-msgid "~/Videos"
124-msgstr ""
125-
126-#: src/app/qml/ui/FolderListPage.qml:153
127-msgid "File System"
128-msgstr ""
129-
130-#: src/app/qml/ui/FolderListPage.qml:200
131-msgid "1 file"
132-msgstr ""
133-
134-#: src/app/qml/ui/FolderListPage.qml:201
135-#, qt-format
136-msgid "%1 files"
137-msgstr ""
138-
139-#: src/app/qml/ui/FolderListPage.qml:226
140-msgid "Open in a new tab"
141-msgstr ""
142-
143-#: src/app/qml/ui/FolderListPage.qml:234
144 msgid "Close this tab"
145 msgstr ""
146
147-#: src/app/qml/ui/FolderListPage.qml:254
148+#: src/app/qml/ui/FolderListPage.qml:146
149 msgid "Create New Folder"
150 msgstr ""
151
152-#: src/app/qml/ui/FolderListPage.qml:274
153+#: src/app/qml/ui/FolderListPage.qml:166
154 msgid "Paste"
155 msgstr ""
156
157-#: src/app/qml/ui/FolderListPage.qml:276
158+#: src/app/qml/ui/FolderListPage.qml:167
159 #, qt-format
160 msgid "Paste %1 File"
161-msgstr ""
162-
163-#: src/app/qml/ui/FolderListPage.qml:277
164-#, qt-format
165-msgid "Paste %1 Files"
166-msgstr ""
167-
168-#: src/app/qml/ui/FolderListPage.qml:280
169+msgid_plural "Paste %1 Files"
170+msgstr[0] ""
171+msgstr[1] ""
172+
173+#: src/app/qml/ui/FolderListPage.qml:170
174 msgid "Paste files"
175 msgstr ""
176
177-#: src/app/qml/ui/FolderListPage.qml:292
178+#: src/app/qml/ui/FolderListPage.qml:182
179 msgid "Open in Terminal"
180 msgstr ""
181
182-#: src/app/qml/ui/FolderListPage.qml:304 src/app/qml/ui/FolderListPage.qml:650
183+#: src/app/qml/ui/FolderListPage.qml:194 src/app/qml/ui/FolderListPage.qml:567
184 msgid "Properties"
185 msgstr ""
186
187-#: src/app/qml/ui/FolderListPage.qml:321
188+#: src/app/qml/ui/FolderListPage.qml:211
189 msgid "Create folder"
190 msgstr ""
191
192-#: src/app/qml/ui/FolderListPage.qml:322
193+#: src/app/qml/ui/FolderListPage.qml:212
194 msgid "Enter name for new folder"
195 msgstr ""
196
197-#: src/app/qml/ui/FolderListPage.qml:338
198+#: src/app/qml/ui/FolderListPage.qml:228
199 msgid "Create file"
200 msgstr ""
201
202-#: src/app/qml/ui/FolderListPage.qml:339
203+#: src/app/qml/ui/FolderListPage.qml:229
204 msgid "Enter name for new file"
205 msgstr ""
206
207-#: src/app/qml/ui/FolderListPage.qml:354 src/app/qml/ui/FolderListPage.qml:669
208-msgid "File operation error"
209-msgstr ""
210-
211-#: src/app/qml/ui/FolderListPage.qml:354
212-#, qt-format
213-msgid "Unable to open '%11"
214-msgstr ""
215-
216-#: src/app/qml/ui/FolderListPage.qml:396
217+#: src/app/qml/ui/FolderListPage.qml:251
218+msgid "Up"
219+msgstr ""
220+
221+#: src/app/qml/ui/FolderListPage.qml:280
222 msgid "Actions"
223 msgstr ""
224
225-#: src/app/qml/ui/FolderListPage.qml:406
226+#: src/app/qml/ui/FolderListPage.qml:290
227 msgid "View"
228 msgstr ""
229
230-#: src/app/qml/ui/FolderListPage.qml:523
231+#: src/app/qml/ui/FolderListPage.qml:371
232+msgid "Select"
233+msgstr ""
234+
235+#: src/app/qml/ui/FolderListPage.qml:440
236 msgid "No files"
237 msgstr ""
238
239-#: src/app/qml/ui/FolderListPage.qml:543 src/app/qml/ui/FolderListPage.qml:624
240+#: src/app/qml/ui/FolderListPage.qml:460 src/app/qml/ui/FolderListPage.qml:541
241 msgid "Delete"
242 msgstr ""
243
244-#: src/app/qml/ui/FolderListPage.qml:544
245+#: src/app/qml/ui/FolderListPage.qml:461
246 #, qt-format
247 msgid "Are you sure you want to permanently delete '%1'?"
248 msgstr ""
249
250-#: src/app/qml/ui/FolderListPage.qml:567 src/app/qml/ui/FolderListPage.qml:637
251+#: src/app/qml/ui/FolderListPage.qml:484 src/app/qml/ui/FolderListPage.qml:554
252 msgid "Rename"
253 msgstr ""
254
255-#: src/app/qml/ui/FolderListPage.qml:568
256+#: src/app/qml/ui/FolderListPage.qml:485
257 msgid "Enter a new name"
258 msgstr ""
259
260-#: src/app/qml/ui/FolderListPage.qml:577
261+#: src/app/qml/ui/FolderListPage.qml:494
262 msgid "Could not rename"
263 msgstr ""
264
265-#: src/app/qml/ui/FolderListPage.qml:578
266+#: src/app/qml/ui/FolderListPage.qml:495
267 msgid "Insufficient permissions or name already exists?"
268 msgstr ""
269
270-#: src/app/qml/ui/FolderListPage.qml:601
271+#: src/app/qml/ui/FolderListPage.qml:518
272 msgid "Cut"
273 msgstr ""
274
275-#: src/app/qml/ui/FolderListPage.qml:612
276+#: src/app/qml/ui/FolderListPage.qml:529
277 msgid "Copy"
278 msgstr ""
279
280-#: src/app/qml/ui/FolderListPage.qml:688
281+#: src/app/qml/ui/FolderListPage.qml:586 src/app/qml/ui/FolderListPage.qml:709
282+msgid "File operation error"
283+msgstr ""
284+
285+#: src/app/qml/ui/FolderListPage.qml:635
286+msgid "~/Desktop"
287+msgstr ""
288+
289+#: src/app/qml/ui/FolderListPage.qml:645
290+msgid "~/Public"
291+msgstr ""
292+
293+#: src/app/qml/ui/FolderListPage.qml:647
294+msgid "~/Programs"
295+msgstr ""
296+
297+#: src/app/qml/ui/FolderListPage.qml:649
298+msgid "~/Templates"
299+msgstr ""
300+
301+#: src/app/qml/ui/FolderListPage.qml:662
302+msgid "Home"
303+msgstr ""
304+
305+#: src/app/qml/ui/FolderListPage.qml:664
306+msgid "Device"
307+msgstr ""
308+
309+#: src/app/qml/ui/FolderListPage.qml:709
310+#, qt-format
311+msgid "Unable to open '%1'"
312+msgstr ""
313+
314+#: src/app/qml/ui/FolderListPage.qml:721
315 msgid "Folder not accessible"
316 msgstr ""
317
318 #. TRANSLATORS: this refers to a folder name
319-#: src/app/qml/ui/FolderListPage.qml:690
320+#: src/app/qml/ui/FolderListPage.qml:723
321 #, qt-format
322 msgid "Can not access %1"
323 msgstr ""
324@@ -299,11 +282,11 @@
325 msgid "Enter a location to go to:"
326 msgstr ""
327
328-#: src/app/qml/ui/GoToDialog.qml:44 src/app/qml/ui/PlacesPopover.qml:84
329+#: src/app/qml/ui/GoToDialog.qml:44 src/app/qml/ui/PlacesPopover.qml:53
330 msgid "Location..."
331 msgstr ""
332
333-#: src/app/qml/ui/GoToDialog.qml:53 src/app/qml/ui/PlacesPopover.qml:99
334+#: src/app/qml/ui/GoToDialog.qml:53 src/app/qml/ui/PlacesPopover.qml:68
335 msgid "Go"
336 msgstr ""
337

Subscribers

People subscribed via source and target branches