Files

Merge lp:~jeremywootten/pantheon-files/fix-policy-file-name into lp:~elementary-apps/pantheon-files/trunk

  1. fix-policy-file-name
  2. Merge into trunk
Proposed by Jeremy Wootten
Status: Merged
Approved by: Leonardo Lemos
Approved revision: 2514
Merged at revision: 2514
Proposed branch: lp:~jeremywootten/pantheon-files/fix-policy-file-name
Merge into: lp:~elementary-apps/pantheon-files/trunk
Diff against target: 274 lines (+66/-37)
3 files modified
data/CMakeLists.txt (+2/-2)
po/extra/extra.pot (+19/-2)
po/pantheon-files.pot (+45/-33)
To merge this branch: bzr merge lp:~jeremywootten/pantheon-files/fix-policy-file-name
Reviewer Review Type Date Requested Status
elementary Apps team Pending
Review via email: mp+318468@code.launchpad.net

Commit message

Rename .xml.in policy file extension to .policy at build time (lp:1666250)

Description of the change

Install polkit policy file with name ending .policy to fix regression caused by r2476.

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 'data/CMakeLists.txt'
2--- data/CMakeLists.txt 2017-02-04 11:51:45 +0000
3+++ data/CMakeLists.txt 2017-02-28 12:14:41 +0000
4@@ -6,13 +6,13 @@
5
6 configure_file_translation(pantheon-files.desktop.in ${CMAKE_CURRENT_BINARY_DIR}/org.pantheon.files.desktop ${CMAKE_SOURCE_DIR}/po/)
7 configure_file_translation(org.pantheon.files.appdata.xml.in ${CMAKE_CURRENT_BINARY_DIR}/org.pantheon.files.appdata.xml ${CMAKE_SOURCE_DIR}/po/)
8-configure_file_translation(${CMAKE_CURRENT_BINARY_DIR}/net.launchpad.pantheon-files.policy.xml.in ${CMAKE_CURRENT_BINARY_DIR}/net.launchpad.pantheon-files.policy.xml ${CMAKE_SOURCE_DIR}/po/)
9+configure_file_translation(${CMAKE_CURRENT_BINARY_DIR}/net.launchpad.pantheon-files.policy.xml.in ${CMAKE_CURRENT_BINARY_DIR}/net.launchpad.pantheon-files.policy ${CMAKE_SOURCE_DIR}/po/)
10
11 install (FILES ${CMAKE_CURRENT_BINARY_DIR}/org.pantheon.files.appdata.xml DESTINATION share/appdata)
12 install (FILES ${CMAKE_CURRENT_BINARY_DIR}/org.pantheon.files.desktop DESTINATION share/applications)
13 install (FILES ${CMAKE_CURRENT_BINARY_DIR}/pantheon-files.service DESTINATION share/dbus-1/services/)
14 install (PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/pantheon-files-pkexec DESTINATION bin)
15-install (FILES ${CMAKE_CURRENT_BINARY_DIR}/net.launchpad.pantheon-files.policy.xml DESTINATION share/polkit-1/actions/)
16+install (FILES ${CMAKE_CURRENT_BINARY_DIR}/net.launchpad.pantheon-files.policy DESTINATION share/polkit-1/actions/)
17
18 add_subdirectory (icons)
19 add_subdirectory (schemas)
20
21=== modified file 'po/extra/extra.pot'
22--- po/extra/extra.pot 2017-02-10 16:48:41 +0000
23+++ po/extra/extra.pot 2017-02-28 12:14:41 +0000
24@@ -8,7 +8,7 @@
25 msgstr ""
26 "Project-Id-Version: PACKAGE VERSION\n"
27 "Report-Msgid-Bugs-To: \n"
28-"POT-Creation-Date: 2017-02-10 16:45+0000\n"
29+"POT-Creation-Date: 2017-02-28 12:05+0000\n"
30 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
31 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
32 "Language-Team: LANGUAGE <LL@li.org>\n"
33@@ -48,7 +48,21 @@
34 "remotely using FTP, SFTP, AFP, Webdav, or Windows share."
35 msgstr ""
36
37-msgid "Enable drag and drop tabs between windows"
38+msgid ""
39+"Web browsers like Firefox now remember the most recently used downloads "
40+"directory"
41+msgstr ""
42+
43+msgid "Remember preferred zoom level"
44+msgstr ""
45+
46+msgid "Improved input method support"
47+msgstr ""
48+
49+msgid "910x640 minimum window size"
50+msgstr ""
51+
52+msgid "Security fixes"
53 msgstr ""
54
55 msgid "Various crash fixes"
56@@ -60,6 +74,9 @@
57 msgid "Minor bug fixes"
58 msgstr ""
59
60+msgid "Enable drag and drop tabs between windows"
61+msgstr ""
62+
63 msgid "Merge search functionality into Ctrl+F"
64 msgstr ""
65
66
67=== modified file 'po/pantheon-files.pot'
68--- po/pantheon-files.pot 2017-02-10 16:48:41 +0000
69+++ po/pantheon-files.pot 2017-02-28 12:14:41 +0000
70@@ -8,7 +8,7 @@
71 msgstr ""
72 "Project-Id-Version: PACKAGE VERSION\n"
73 "Report-Msgid-Bugs-To: \n"
74-"POT-Creation-Date: 2017-02-10 16:45+0000\n"
75+"POT-Creation-Date: 2017-02-28 12:05+0000\n"
76 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
77 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
78 "Language-Team: LANGUAGE <LL@li.org>\n"
79@@ -1416,28 +1416,28 @@
80 msgid "link to %s"
81 msgstr ""
82
83-#: ../libcore/gof-file.c:1925
84+#: ../libcore/gof-file.c:1935
85 #, c-format
86 msgid "Failed to parse the desktop file: %s"
87 msgstr ""
88
89-#: ../libcore/gof-file.c:1962
90+#: ../libcore/gof-file.c:1972
91 msgid "No Exec field specified"
92 msgstr ""
93
94-#: ../libcore/gof-file.c:1981
95+#: ../libcore/gof-file.c:1991
96 msgid "No URL field specified"
97 msgstr ""
98
99-#: ../libcore/gof-file.c:1987
100+#: ../libcore/gof-file.c:1997
101 msgid "Invalid desktop file"
102 msgstr ""
103
104-#: ../libcore/gof-file.c:2282
105+#: ../libcore/gof-file.c:2292
106 msgid "Slashes are not allowed in filenames"
107 msgstr ""
108
109-#: ../libcore/gof-file.c:2302
110+#: ../libcore/gof-file.c:2312
111 msgid "Toplevel files cannot be renamed"
112 msgstr ""
113
114@@ -1449,87 +1449,95 @@
115 msgid " (invalid Unicode)"
116 msgstr ""
117
118-#: ../filechooser-module/FileChooserDialog.vala:70
119+#: ../filechooser-module/FileChooserDialog.vala:72
120 #: ../src/View/Widgets/TopMenu.vala:64
121 msgid "Previous"
122 msgstr ""
123
124-#: ../filechooser-module/FileChooserDialog.vala:74
125+#: ../filechooser-module/FileChooserDialog.vala:76
126 #: ../src/View/Widgets/TopMenu.vala:68
127 msgid "Next"
128 msgstr ""
129
130-#: ../src/View/ViewContainer.vala:347 ../src/View/Sidebar.vala:494
131+#: ../src/View/ViewContainer.vala:352 ../src/View/Sidebar.vala:494
132 msgid "Home"
133 msgstr ""
134
135-#: ../src/View/ViewContainer.vala:349 ../src/View/Sidebar.vala:555
136+#: ../src/View/ViewContainer.vala:354 ../src/View/Sidebar.vala:555
137 #: ../src/Dialogs/VolumePropertiesWindow.vala:44
138 #: ../libwidgets/Resources.vala:93
139 msgid "File System"
140 msgstr ""
141
142-#: ../src/View/ViewContainer.vala:358
143+#: ../src/View/ViewContainer.vala:363
144 msgid "(as Administrator)"
145 msgstr ""
146
147-#: ../src/View/ViewContainer.vala:371 ../src/View/DirectoryNotFound.vala:28
148+#: ../src/View/ViewContainer.vala:376 ../src/View/DirectoryNotFound.vala:28
149 msgid "This Folder Does Not Exist"
150 msgstr ""
151
152-#: ../src/View/ViewContainer.vala:372
153+#: ../src/View/ViewContainer.vala:377
154 msgid "You cannot create a folder here."
155 msgstr ""
156
157-#: ../src/View/ViewContainer.vala:374
158+#: ../src/View/ViewContainer.vala:379
159 msgid "The network is unavailable"
160 msgstr ""
161
162-#: ../src/View/ViewContainer.vala:375
163+#: ../src/View/ViewContainer.vala:380
164 msgid "A working network is needed to reach this folder"
165 msgstr ""
166
167-#: ../src/View/ViewContainer.vala:377
168+#: ../src/View/ViewContainer.vala:382
169 msgid "This Folder Does Not Belong to You"
170 msgstr ""
171
172-#: ../src/View/ViewContainer.vala:378
173+#: ../src/View/ViewContainer.vala:383
174 msgid "You don't have permission to view this folder."
175 msgstr ""
176
177-#: ../src/View/ViewContainer.vala:380
178+#: ../src/View/ViewContainer.vala:385
179 msgid "Unable to Mount Folder"
180 msgstr ""
181
182-#: ../src/View/ViewContainer.vala:381
183+#: ../src/View/ViewContainer.vala:386
184 msgid "Could not connect to the server for this folder."
185 msgstr ""
186
187-#: ../src/View/ViewContainer.vala:383
188+#: ../src/View/ViewContainer.vala:388
189+msgid "Unable to Display Folder Contents"
190+msgstr ""
191+
192+#: ../src/View/ViewContainer.vala:389
193+msgid "The operation timed out."
194+msgstr ""
195+
196+#: ../src/View/ViewContainer.vala:391
197 msgid "Unable to Show Folder"
198 msgstr ""
199
200-#: ../src/View/ViewContainer.vala:384
201+#: ../src/View/ViewContainer.vala:392
202 msgid "The server for this folder could not be located."
203 msgstr ""
204
205-#: ../src/View/ViewContainer.vala:394
206+#: ../src/View/ViewContainer.vala:402
207 msgid "File not Found"
208 msgstr ""
209
210-#: ../src/View/ViewContainer.vala:395
211+#: ../src/View/ViewContainer.vala:403
212 msgid "The file selected no longer exists."
213 msgstr ""
214
215-#: ../src/View/Window.vala:207
216+#: ../src/View/Window.vala:208
217 msgid "Files isn't your default file manager."
218 msgstr ""
219
220-#: ../src/View/Window.vala:213
221+#: ../src/View/Window.vala:214
222 msgid "Set as Default"
223 msgstr ""
224
225-#: ../src/View/Window.vala:219
226+#: ../src/View/Window.vala:220
227 msgid "Ignore"
228 msgstr ""
229
230@@ -1870,27 +1878,27 @@
231 msgid "Cancel All In-progress Actions"
232 msgstr ""
233
234-#: ../src/DesktopLauncher.vala:6
235+#: ../src/DesktopLauncher.vala:21
236 msgid "Browse your files"
237 msgstr ""
238
239-#: ../src/DesktopLauncher.vala:7
240+#: ../src/DesktopLauncher.vala:22
241 msgid "File Manager"
242 msgstr ""
243
244-#: ../src/DesktopLauncher.vala:8
245+#: ../src/DesktopLauncher.vala:23
246 msgid "New _Window"
247 msgstr ""
248
249-#: ../src/DesktopLauncher.vala:9
250+#: ../src/DesktopLauncher.vala:24
251 msgid "New Window As _Administrator"
252 msgstr ""
253
254-#: ../src/DesktopLauncher.vala:10
255+#: ../src/DesktopLauncher.vala:25
256 msgid "About _Files"
257 msgstr ""
258
259-#: ../src/DesktopLauncher.vala:11 ../libwidgets/Resources.vala:22
260+#: ../src/DesktopLauncher.vala:26 ../libwidgets/Resources.vala:22
261 msgid "Files"
262 msgstr ""
263
264@@ -2116,6 +2124,10 @@
265 msgid "Format:"
266 msgstr ""
267
268+#: ../libcore/gof-directory-async.vala:588
269+msgid "Server did not respond within time limit"
270+msgstr ""
271+
272 #: ../libcore/FileUtils.vala:60
273 msgid "Could not determine original location of \"%s\" "
274 msgstr ""

Subscribers

People subscribed via source and target branches

to all changes: