Merge lp:dash-privacy-interface into lp:~cm-t/dash-privacy-interface/quickly_trunk
- dash-privacy-interface
- Merge into quickly_trunk
Proposed by
Kanor
Status: | Merged |
---|---|
Approved by: | cm-t 🦄🏂🌈🎵 |
Approved revision: | 6 |
Merged at revision: | 9 |
Proposed branch: | lp:dash-privacy-interface |
Merge into: | lp:~cm-t/dash-privacy-interface/quickly_trunk |
Diff against target: |
450 lines (+137/-155) 9 files modified
build/share/applications/dash-privacy-interface.desktop (+0/-8) dash_privacy_interface/DashPrivacyInterfaceWindow.py (+31/-26) data/dash-privacy-interface.desktop (+8/-0) data/legalnotice/searchingthedashlegalnotice_fr.html (+67/-0) data/ui/DashPrivacyInterfaceWindow.ui (+2/-1) debian/changelog (+2/-98) debian/copyright (+1/-0) po/dash-privacy-interface.pot (+5/-10) setup.py (+21/-12) |
To merge this branch: | bzr merge lp:dash-privacy-interface |
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
cm-t 🦄🏂🌈🎵 | Pending | ||
Review via email: mp+130697@code.launchpad.net |
Commit message
Description of the change
To post a comment you must log in.
lp:dash-privacy-interface
updated
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === removed file 'bin/dash-privacy-interfacec' | |||
2 | 0 | Binary files bin/dash-privacy-interfacec 2012-10-20 07:41:01 +0000 and bin/dash-privacy-interfacec 1970-01-01 00:00:00 +0000 differ | 0 | Binary files bin/dash-privacy-interfacec 2012-10-20 07:41:01 +0000 and bin/dash-privacy-interfacec 1970-01-01 00:00:00 +0000 differ |
3 | === removed directory 'build' | |||
4 | === removed directory 'build/share' | |||
5 | === removed directory 'build/share/applications' | |||
6 | === removed file 'build/share/applications/dash-privacy-interface.desktop' | |||
7 | --- build/share/applications/dash-privacy-interface.desktop 2012-10-20 07:54:32 +0000 | |||
8 | +++ build/share/applications/dash-privacy-interface.desktop 1970-01-01 00:00:00 +0000 | |||
9 | @@ -1,8 +0,0 @@ | |||
10 | 1 | [Desktop Entry] | ||
11 | 2 | Name=Dash Privacy Interface | ||
12 | 3 | Comment=DashPrivacyInterface application | ||
13 | 4 | Categories=GNOME;Utility; | ||
14 | 5 | Exec=dash-privacy-interface | ||
15 | 6 | Icon=dash-privacy-interface | ||
16 | 7 | Terminal=false | ||
17 | 8 | Type=Application | ||
18 | 9 | 0 | ||
19 | === modified file 'dash_privacy_interface/DashPrivacyInterfaceWindow.py' | |||
20 | --- dash_privacy_interface/DashPrivacyInterfaceWindow.py 2012-10-20 07:41:01 +0000 | |||
21 | +++ dash_privacy_interface/DashPrivacyInterfaceWindow.py 2012-10-22 16:50:24 +0000 | |||
22 | @@ -1,44 +1,53 @@ | |||
23 | 1 | # -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*- | 1 | # -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*- |
24 | 2 | ### BEGIN LICENSE | 2 | ### BEGIN LICENSE |
27 | 3 | # Copyright (C) | 3 | # Copyright (C) |
28 | 4 | # ubuntu-fr <LoCo Team> | 4 | # ubuntu-fr <LoCo Team> |
29 | 5 | # kanor <Romain DUBREIL> <contact@kanor.fr> | 5 | # kanor <Romain DUBREIL> <contact@kanor.fr> |
30 | 6 | # cm-t <Rudy ANDRÉ> <arudy@ubuntu-fr.org> | 6 | # cm-t <Rudy ANDRÉ> <arudy@ubuntu-fr.org> |
31 | 7 | # olive <Olivier FRAYSSE> <olive@picapo.org> | 7 | # olive <Olivier FRAYSSE> <olive@picapo.org> |
32 | 8 | # quesh <Frédéric MANDE> <quesh@quesh.fr> | 8 | # quesh <Frédéric MANDE> <quesh@quesh.fr> |
35 | 9 | # This program is free software: you can redistribute it and/or modify it | 9 | # This program is free software: you can redistribute it and/or modify it |
36 | 10 | # under the terms of the GNU General Public License version 3, as published | 10 | # under the terms of the GNU General Public License version 3, as published |
37 | 11 | # by the Free Software Foundation. | 11 | # by the Free Software Foundation. |
42 | 12 | # | 12 | # |
43 | 13 | # This program is distributed in the hope that it will be useful, but | 13 | # This program is distributed in the hope that it will be useful, but |
44 | 14 | # WITHOUT ANY WARRANTY; without even the implied warranties of | 14 | # WITHOUT ANY WARRANTY; without even the implied warranties of |
45 | 15 | # MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR | 15 | # MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR |
46 | 16 | # PURPOSE. See the GNU General Public License for more details. | 16 | # PURPOSE. See the GNU General Public License for more details. |
49 | 17 | # | 17 | # |
50 | 18 | # You should have received a copy of the GNU General Public License along | 18 | # You should have received a copy of the GNU General Public License along |
51 | 19 | # with this program. If not, see <http://www.gnu.org/licenses/>. | 19 | # with this program. If not, see <http://www.gnu.org/licenses/>. |
52 | 20 | ### END LICENSE | 20 | ### END LICENSE |
53 | 21 | 21 | ||
54 | 22 | from locale import gettext as _ | 22 | from locale import gettext as _ |
55 | 23 | import locale | ||
56 | 23 | import os | 24 | import os |
57 | 24 | from gi.repository import Gio, Gtk # pylint: disable=E0611 | 25 | from gi.repository import Gio, Gtk # pylint: disable=E0611 |
58 | 25 | import logging | 26 | import logging |
59 | 26 | logger = logging.getLogger('dash_privacy_interface') | 27 | logger = logging.getLogger('dash_privacy_interface') |
60 | 27 | 28 | ||
61 | 28 | from dash_privacy_interface_lib import Window | 29 | from dash_privacy_interface_lib import Window |
62 | 29 | from dash_privacy_interface.AboutDashPrivacyInterfaceDialog import AboutDashPrivacyInterfaceDialog | ||
63 | 30 | from dash_privacy_interface.PreferencesDashPrivacyInterfaceDialog import PreferencesDashPrivacyInterfaceDialog | ||
64 | 31 | 30 | ||
65 | 32 | # See dash_privacy_interface_lib.Window.py for more details about how this class works | 31 | # See dash_privacy_interface_lib.Window.py for more details about how this class works |
66 | 33 | class DashPrivacyInterfaceWindow(Window): | 32 | class DashPrivacyInterfaceWindow(Window): |
67 | 34 | __gtype_name__ = "DashPrivacyInterfaceWindow" | 33 | __gtype_name__ = "DashPrivacyInterfaceWindow" |
69 | 35 | 34 | ||
70 | 36 | def finish_initializing(self, builder): # pylint: disable=E1002 | 35 | def finish_initializing(self, builder): # pylint: disable=E1002 |
71 | 37 | """Set up the main window""" | 36 | """Set up the main window""" |
72 | 38 | super(DashPrivacyInterfaceWindow, self).finish_initializing(builder) | 37 | super(DashPrivacyInterfaceWindow, self).finish_initializing(builder) |
76 | 39 | 38 | #Add url to read legal notice with local language | |
77 | 40 | #self.AboutDialog = AboutDashPrivacyInterfaceDialog | 39 | btn_label = builder.get_object("lbl_do_later_descrp") |
78 | 41 | #self.PreferencesDialog = PreferencesDashPrivacyInterfaceDialog | 40 | text_label = btn_label.get_label() |
79 | 41 | language = locale.getdefaultlocale()[0].split('_')[0] | ||
80 | 42 | lien = "/usr/share/unity/6/searchingthedashlegalnotice%s.html" | ||
81 | 43 | lien_locale = lien % ( "_%s" % language) | ||
82 | 44 | if os.path.exists(lien_locale) and language != 'en': | ||
83 | 45 | lien = lien_locale | ||
84 | 46 | else: | ||
85 | 47 | lien = lien % "" | ||
86 | 48 | lien = "file:" + lien | ||
87 | 49 | text_label = text_label % {'url': lien} | ||
88 | 50 | btn_label.set_label(text_label) | ||
89 | 42 | 51 | ||
90 | 43 | # Code for other initialization actions should be added here. | 52 | # Code for other initialization actions should be added here. |
91 | 44 | settings = Gtk.Settings.get_default() | 53 | settings = Gtk.Settings.get_default() |
92 | @@ -61,16 +70,12 @@ | |||
93 | 61 | self.quit_after_choice() | 70 | self.quit_after_choice() |
94 | 62 | 71 | ||
95 | 63 | def quit_after_choice(self): | 72 | def quit_after_choice(self): |
98 | 64 | self.set_has_been_displayed() | 73 | self.disable_auto_start() |
97 | 65 | self.disable_auto_start() | ||
99 | 66 | Gtk.main_quit() | 74 | Gtk.main_quit() |
106 | 67 | 75 | ||
101 | 68 | def set_has_been_displayed(self): | ||
102 | 69 | cookiFile = os.path.expanduser("~/config/.dash-privacy-interface/screen_seen") | ||
103 | 70 | if os.path.exists(cookiFile): | ||
104 | 71 | with open(cookiFile, 'w') as f: | ||
105 | 72 | f.write(_("The file was created after the current user has manualy chosen his dash privacy search result setting (online and local or local only). \n For more information: https://launchpad.net/dash-privacy-interface ")) | ||
107 | 73 | 76 | ||
108 | 74 | def disable_auto_start(self): | 77 | def disable_auto_start(self): |
111 | 75 | return | 78 | desktopFile = os.path.expanduser("~/.config/autostart/dash-privacy-interface.desktop") |
112 | 76 | 79 | if os.path.exists(desktopFile): | |
113 | 80 | os.remove(desktopFile) | ||
114 | 81 | |||
115 | 77 | 82 | ||
116 | === added file 'data/dash-privacy-interface.desktop' | |||
117 | --- data/dash-privacy-interface.desktop 1970-01-01 00:00:00 +0000 | |||
118 | +++ data/dash-privacy-interface.desktop 2012-10-22 16:50:24 +0000 | |||
119 | @@ -0,0 +1,8 @@ | |||
120 | 1 | [Desktop Entry] | ||
121 | 2 | Name=Dash Privacy Interface | ||
122 | 3 | Comment=DashPrivacyInterface application | ||
123 | 4 | Categories=GNOME;Utility; | ||
124 | 5 | Exec=dash-privacy-interface | ||
125 | 6 | Icon=dash-privacy-interface | ||
126 | 7 | Terminal=false | ||
127 | 8 | Type=Application | ||
128 | 0 | 9 | ||
129 | === added directory 'data/legalnotice' | |||
130 | === added file 'data/legalnotice/searchingthedashlegalnotice_fr.html' | |||
131 | --- data/legalnotice/searchingthedashlegalnotice_fr.html 1970-01-01 00:00:00 +0000 | |||
132 | +++ data/legalnotice/searchingthedashlegalnotice_fr.html 2012-10-22 16:50:24 +0000 | |||
133 | @@ -0,0 +1,67 @@ | |||
134 | 1 | <html><head><title>Recherche dans le tableau de bord, mentions légales.</title> | ||
135 | 2 | <meta http-equiv="content-type" content="text/html; charset=UTF-8"> | ||
136 | 3 | <style type="text/css"> | ||
137 | 4 | body {font-family:Ubuntu; font-size:9pt;padding:50pt} | ||
138 | 5 | h1{font-size:11pt;font-weight:bold;text-align:center;padding:10pt} | ||
139 | 6 | h2{font-size:11pt;font-weight:bold;} | ||
140 | 7 | </style> | ||
141 | 8 | </head> | ||
142 | 9 | <body> | ||
143 | 10 | <h1>Recherche dans le tableau de bord - Mentions légales<br>Traduction non-officielle datée du 20 octobre 2012</h1> | ||
144 | 11 | <p><a href="file:///usr/share/unity/6/searchingthedashlegalnotice.html">Consultez la version originale (en anglais).</a></p> | ||
145 | 12 | |||
146 | 13 | <p>Cette fonction de recherche est fournie par la société Canonical | ||
147 | 14 | Group Limited (Canonical). Cette notice légale s'applique à la fonction | ||
148 | 15 | de recherche et inclue les | ||
149 | 16 | <a href="http://www.canonical.com/legal">mentions légales</a> et la politique de respect de la vie privée, de Canonical.</p> | ||
150 | 17 | |||
151 | 18 | <h2>Collecte et usage des données</h2> | ||
152 | 19 | <p>Quand vous entrez une recherche dans le dash, Ubuntu cherchera sur votre ordinateur et enregistrera cette recherche localement.</p> | ||
153 | 20 | |||
154 | 21 | <p>À moins que vous ayez désactivé cette option, (voir la section | ||
155 | 22 | « Recherche en ligne » ci-dessous), nous enverrons aussi vos | ||
156 | 23 | frappes de clavier en tant que recherches à productsearch.ubuntu.com et à | ||
157 | 24 | des tiers sélectionnés afin de pouvoir compléter vos recherches par des | ||
158 | 25 | résultats de recherches en ligne de tierces parties telles que : | ||
159 | 26 | Facebook, Twitter, BBC et Amazon. Canonical et ces tiers sélectionnés | ||
160 | 27 | collecteront vos recherches et les utiliseront pour vous fournir des | ||
161 | 28 | résultats de recherche durant votre utilisation d'Ubuntu.</p> | ||
162 | 29 | <p>En effectuant des recherches dans le tableau de bord, vous acceptez :</p> | ||
163 | 30 | |||
164 | 31 | <ul> | ||
165 | 32 | <li>la collecte et l'utilisation de vos recherches et de votre adresse IP de cette façon, et</li> | ||
166 | 33 | <li>le stockage de vos recherches et adresses IP par Canonical et ces tierces parties (si applicable).</li> | ||
167 | 34 | </ul> | ||
168 | 35 | |||
169 | 36 | <p>Canonical n'utilisera ces recherches et adresses IP qu'en accord avec ces mentions légales et | ||
170 | 37 | <a href="http://www.ubuntu.com/aboutus/privacypolicy">notre politique de respect de la vie privée</a>. Veuillez consulter <a href="http://www.ubuntu.com/aboutus/privacypolicy">notre politique de respect de la vie privée</a> | ||
171 | 38 | pour toute information complémentaire sur la façon dont Canonical | ||
172 | 39 | protège vos informations personelles. Pour toute information sur la | ||
173 | 40 | manière dont les parties tierces peuvent utiliser vos informations, | ||
174 | 41 | veuillez consulter leurs politiques de respect de la vie privée.</p> | ||
175 | 42 | |||
176 | 43 | <h2>Recherche en ligne</h2> | ||
177 | 44 | <p>Vous pouvez restreindre votre tableau de bord de telle sorte que nous | ||
178 | 45 | n'envoyions pas les recherches à des tiers et que vous ne receviez pas | ||
179 | 46 | de résultat de recherche en ligne. Pour ce faire, allez dans le panneau | ||
180 | 47 | de configuration « vie privée » et désactivez « Inclure | ||
181 | 48 | les résultats de la recherche en ligne ». Le panneau de | ||
182 | 49 | configuration « vie privée » peut être trouvé dans les | ||
183 | 50 | paramètres système ou via une recherche dans le tableau de bord. Pour | ||
184 | 51 | une liste actualisée des parties tierces sélectionnées veuillez | ||
185 | 52 | consulter | ||
186 | 53 | <a href="http://www.ubuntu.com/privacypolicy/thirdparties">www.ubuntu.com/privacypolicy/thirdparties</a>.</p> | ||
187 | 54 | |||
188 | 55 | <h2>Modifications</h2> | ||
189 | 56 | <p>Même si les changements seront probablement mineurs, Canonical peut | ||
190 | 57 | modifier ces mentions légales de temps à autres et à la seule discrétion | ||
191 | 58 | de Canonical. Veuillez consulter régulièrement cette page pour tout | ||
192 | 59 | changement dans les mentions légales, il nous est impossible de vous en | ||
193 | 60 | avertir directement.</p> | ||
194 | 61 | |||
195 | 62 | <h2>Comment nous contacter</h2> | ||
196 | 63 | <p>Veuillez soumettre toute question ou commentaire à propos de la | ||
197 | 64 | recherche dans le tableau de bord ou de ces mentions légales, en nous | ||
198 | 65 | contactant à l'adresse suivante : </p><address>Canonical Group Ltd, 5th Floor, Blue Fin Building, 110 Southwark Street, London, England, SE1 0SU.</address><p></p> | ||
199 | 66 | |||
200 | 67 | </body></html> | ||
201 | 0 | \ No newline at end of file | 68 | \ No newline at end of file |
202 | 1 | 69 | ||
203 | === modified file 'data/ui/DashPrivacyInterfaceWindow.ui' | |||
204 | --- data/ui/DashPrivacyInterfaceWindow.ui 2012-10-20 07:41:01 +0000 | |||
205 | +++ data/ui/DashPrivacyInterfaceWindow.ui 2012-10-22 16:50:24 +0000 | |||
206 | @@ -195,7 +195,8 @@ | |||
207 | 195 | <property name="xpad">27</property> | 195 | <property name="xpad">27</property> |
208 | 196 | <property name="ypad">5</property> | 196 | <property name="ypad">5</property> |
209 | 197 | <property name="label" translatable="yes" comments="This field explain that you can change this setting later + legal notice">You can go back on your choice at any time, in the private life menu in the system settings. | 197 | <property name="label" translatable="yes" comments="This field explain that you can change this setting later + legal notice">You can go back on your choice at any time, in the private life menu in the system settings. |
211 | 198 | Learn more about this function and browse the legal notice.</property> | 198 | Learn more about this function and browse <a href="%(url)s">the legal notice</a>.</property> |
212 | 199 | <property name="use_markup">True</property> | ||
213 | 199 | <property name="justify">fill</property> | 200 | <property name="justify">fill</property> |
214 | 200 | <property name="wrap">True</property> | 201 | <property name="wrap">True</property> |
215 | 201 | <property name="ellipsize">start</property> | 202 | <property name="ellipsize">start</property> |
216 | 202 | 203 | ||
217 | === modified file 'debian/changelog' | |||
218 | --- debian/changelog 2012-10-20 08:03:08 +0000 | |||
219 | +++ debian/changelog 2012-10-22 16:50:24 +0000 | |||
220 | @@ -1,101 +1,5 @@ | |||
318 | 1 | dash-privacy-interface (12.10.1) quantal; urgency=low | 1 | dash-privacy-interface (12.10.1) precise; urgency=low |
222 | 2 | |||
223 | 3 | * translation added | ||
224 | 4 | |||
225 | 5 | -- cm-t arudy <arudy@ubuntu-fr.org> Sat, 20 Oct 2012 10:03:05 +0200 | ||
226 | 6 | |||
227 | 7 | dash-privacy-interface (12.10) quantal; urgency=low | ||
228 | 8 | |||
229 | 9 | * New release. | ||
230 | 10 | |||
231 | 11 | -- cm-t arudy <arudy@ubuntu-fr.org> Sat, 20 Oct 2012 09:41:05 +0200 | ||
232 | 12 | |||
233 | 13 | dash-privacy-interface (0.1-public17) quantal; urgency=low | ||
234 | 14 | |||
235 | 15 | * New release. | ||
236 | 16 | |||
237 | 17 | -- cm-t arudy <arudy@ubuntu-fr.org> Sat, 20 Oct 2012 09:37:26 +0200 | ||
238 | 18 | |||
239 | 19 | dash-privacy-interface (0.1-public16) quantal; urgency=low | ||
240 | 20 | |||
241 | 21 | * New release. | ||
242 | 22 | |||
243 | 23 | -- cm-t arudy <arudy@ubuntu-fr.org> Sat, 20 Oct 2012 09:15:13 +0200 | ||
244 | 24 | |||
245 | 25 | dash-privacy-interface (0.1-public15) quantal; urgency=low | ||
246 | 26 | |||
247 | 27 | * New release. | ||
248 | 28 | |||
249 | 29 | -- cm-t arudy <arudy@ubuntu-fr.org> Sat, 20 Oct 2012 09:08:30 +0200 | ||
250 | 30 | |||
251 | 31 | dash-privacy-interface (0.1-public14) quantal; urgency=low | ||
252 | 32 | |||
253 | 33 | * New release. | ||
254 | 34 | |||
255 | 35 | -- cm-t arudy <arudy@ubuntu-fr.org> Sat, 20 Oct 2012 09:02:33 +0200 | ||
256 | 36 | |||
257 | 37 | dash-privacy-interface (0.1-public13) quantal; urgency=low | ||
258 | 38 | |||
259 | 39 | * New release. | ||
260 | 40 | |||
261 | 41 | -- cm-t arudy <arudy@ubuntu-fr.org> Sat, 20 Oct 2012 08:57:51 +0200 | ||
262 | 42 | |||
263 | 43 | dash-privacy-interface (0.1-public12) quantal; urgency=low | ||
264 | 44 | |||
265 | 45 | * New release. | ||
266 | 46 | |||
267 | 47 | -- cm-t arudy <arudy@ubuntu-fr.org> Sat, 20 Oct 2012 08:54:18 +0200 | ||
268 | 48 | |||
269 | 49 | dash-privacy-interface (0.1-public11) quantal; urgency=low | ||
270 | 50 | |||
271 | 51 | * New release. | ||
272 | 52 | |||
273 | 53 | -- cm-t arudy <arudy@ubuntu-fr.org> Sat, 20 Oct 2012 08:51:30 +0200 | ||
274 | 54 | |||
275 | 55 | dash-privacy-interface (0.1-public10) quantal; urgency=low | ||
276 | 56 | |||
277 | 57 | * New release. | ||
278 | 58 | |||
279 | 59 | -- cm-t arudy <arudy@ubuntu-fr.org> Sat, 20 Oct 2012 08:49:04 +0200 | ||
280 | 60 | |||
281 | 61 | dash-privacy-interface (0.1-public9) quantal; urgency=low | ||
282 | 62 | |||
283 | 63 | * New release. | ||
284 | 64 | |||
285 | 65 | -- cm-t arudy <arudy@ubuntu-fr.org> Sat, 20 Oct 2012 08:47:47 +0200 | ||
286 | 66 | |||
287 | 67 | dash-privacy-interface (0.1-public8) quantal; urgency=low | ||
288 | 68 | |||
289 | 69 | * New release. | ||
290 | 70 | |||
291 | 71 | -- cm-t arudy <arudy@ubuntu-fr.org> Sat, 20 Oct 2012 08:45:06 +0200 | ||
292 | 72 | |||
293 | 73 | dash-privacy-interface (0.1-public7) quantal; urgency=low | ||
294 | 74 | |||
295 | 75 | * New release. | ||
296 | 76 | |||
297 | 77 | -- cm-t arudy <arudy@ubuntu-fr.org> Sat, 20 Oct 2012 08:38:50 +0200 | ||
298 | 78 | |||
299 | 79 | dash-privacy-interface (0.1-public6) quantal; urgency=low | ||
300 | 80 | |||
301 | 81 | * New release. | ||
302 | 82 | |||
303 | 83 | -- cm-t arudy <arudy@ubuntu-fr.org> Sat, 20 Oct 2012 08:36:49 +0200 | ||
304 | 84 | |||
305 | 85 | dash-privacy-interface (0.1-public5) quantal; urgency=low | ||
306 | 86 | |||
307 | 87 | * New release. | ||
308 | 88 | |||
309 | 89 | -- cm-t arudy <arudy@ubuntu-fr.org> Sat, 20 Oct 2012 08:34:39 +0200 | ||
310 | 90 | |||
311 | 91 | dash-privacy-interface (0.1-public4) quantal; urgency=low | ||
312 | 92 | |||
313 | 93 | * New release. | ||
314 | 94 | |||
315 | 95 | -- cm-t arudy <arudy@ubuntu-fr.org> Sat, 20 Oct 2012 08:33:06 +0200 | ||
316 | 96 | |||
317 | 97 | dash-privacy-interface (0.1-public3) quantal; urgency=low | ||
319 | 98 | 2 | ||
320 | 99 | * Initial release. | 3 | * Initial release. |
321 | 100 | 4 | ||
323 | 101 | -- cm-t arudy <arudy@ubuntu-fr.org> Sat, 20 Oct 2012 08:31:23 +0200 | 5 | -- Tyrus <tyrus@tyrus-carthage> Sun, 21 Oct 2012 21:25:06 +0200 |
324 | 102 | 6 | ||
325 | === modified file 'debian/copyright' | |||
326 | --- debian/copyright 2012-10-20 07:41:10 +0000 | |||
327 | +++ debian/copyright 2012-10-22 16:50:24 +0000 | |||
328 | @@ -4,6 +4,7 @@ | |||
329 | 4 | Source: https://launchpad.net/dash-privacy-interface | 4 | Source: https://launchpad.net/dash-privacy-interface |
330 | 5 | 5 | ||
331 | 6 | Files: * | 6 | Files: * |
332 | 7 | Copyright: (C) | ||
333 | 7 | Copyright: (C) | 8 | Copyright: (C) |
334 | 8 | Copyright: (C) </property><property name="can_focus">False</property> | 9 | Copyright: (C) </property><property name="can_focus">False</property> |
335 | 9 | License: GPL-3 | 10 | License: GPL-3 |
336 | 10 | 11 | ||
337 | === modified file 'po/dash-privacy-interface.pot' | |||
338 | --- po/dash-privacy-interface.pot 2012-10-20 07:54:32 +0000 | |||
339 | +++ po/dash-privacy-interface.pot 2012-10-22 16:50:24 +0000 | |||
340 | @@ -8,7 +8,7 @@ | |||
341 | 8 | msgstr "" | 8 | msgstr "" |
342 | 9 | "Project-Id-Version: PACKAGE VERSION\n" | 9 | "Project-Id-Version: PACKAGE VERSION\n" |
343 | 10 | "Report-Msgid-Bugs-To: \n" | 10 | "Report-Msgid-Bugs-To: \n" |
345 | 11 | "POT-Creation-Date: 2012-10-20 09:52+0200\n" | 11 | "POT-Creation-Date: 2012-10-21 21:25+0200\n" |
346 | 12 | "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" | 12 | "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" |
347 | 13 | "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" | 13 | "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" |
348 | 14 | "Language-Team: LANGUAGE <LL@li.org>\n" | 14 | "Language-Team: LANGUAGE <LL@li.org>\n" |
349 | @@ -17,13 +17,6 @@ | |||
350 | 17 | "Content-Type: text/plain; charset=UTF-8\n" | 17 | "Content-Type: text/plain; charset=UTF-8\n" |
351 | 18 | "Content-Transfer-Encoding: 8bit\n" | 18 | "Content-Transfer-Encoding: 8bit\n" |
352 | 19 | 19 | ||
353 | 20 | #: ../dash_privacy_interface/DashPrivacyInterfaceWindow.py:72 | ||
354 | 21 | msgid "" | ||
355 | 22 | "The file was created after the current user has manualy chosen his dash " | ||
356 | 23 | "privacy search result setting (online and local or local only). \n" | ||
357 | 24 | " For more information: https://launchpad.net/dash-privacy-interface " | ||
358 | 25 | msgstr "" | ||
359 | 26 | |||
360 | 27 | #. Code for other initialization actions should be added here. | 20 | #. Code for other initialization actions should be added here. |
361 | 28 | #. Window title | 21 | #. Window title |
362 | 29 | #: ../data/ui/DashPrivacyInterfaceWindow.ui.h:2 | 22 | #: ../data/ui/DashPrivacyInterfaceWindow.ui.h:2 |
363 | @@ -63,11 +56,13 @@ | |||
364 | 63 | msgstr "" | 56 | msgstr "" |
365 | 64 | 57 | ||
366 | 65 | #. This field explain that you can change this setting later + legal notice | 58 | #. This field explain that you can change this setting later + legal notice |
368 | 66 | #: ../data/ui/DashPrivacyInterfaceWindow.ui.h:15 | 59 | #: ../data/ui/DashPrivacyInterfaceWindow.ui.h:16 |
369 | 60 | #, no-c-format | ||
370 | 67 | msgid "" | 61 | msgid "" |
371 | 68 | "You can go back on your choice at any time, in the private life menu in the " | 62 | "You can go back on your choice at any time, in the private life menu in the " |
372 | 69 | "system settings.\n" | 63 | "system settings.\n" |
374 | 70 | "Learn more about this function and browse the legal notice." | 64 | " Learn more about this function and browse <a href=\"%(url)s" |
375 | 65 | "\">the legal notice</a>." | ||
376 | 71 | msgstr "" | 66 | msgstr "" |
377 | 72 | 67 | ||
378 | 73 | #: ../data/ui/PreferencesDashPrivacyInterfaceDialog.ui.h:1 | 68 | #: ../data/ui/PreferencesDashPrivacyInterfaceDialog.ui.h:1 |
379 | 74 | 69 | ||
380 | === modified file 'setup.py' | |||
381 | --- setup.py 2012-10-20 08:03:02 +0000 | |||
382 | +++ setup.py 2012-10-22 16:50:24 +0000 | |||
383 | @@ -1,22 +1,22 @@ | |||
384 | 1 | #!/usr/bin/env python | 1 | #!/usr/bin/env python |
385 | 2 | # -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*- | 2 | # -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*- |
386 | 3 | ### BEGIN LICENSE | 3 | ### BEGIN LICENSE |
389 | 4 | # Copyright (C) | 4 | # Copyright (C) |
390 | 5 | # ubuntu-fr <LoCo Team> | 5 | # ubuntu-fr <LoCo Team> |
391 | 6 | # kanor <Romain DUBREIL> <contact@kanor.fr> | 6 | # kanor <Romain DUBREIL> <contact@kanor.fr> |
392 | 7 | # cm-t <Rudy ANDRÉ> <arudy@ubuntu-fr.org> | 7 | # cm-t <Rudy ANDRÉ> <arudy@ubuntu-fr.org> |
393 | 8 | # olive <Olivier FRAYSSE> <olive@picapo.org> | 8 | # olive <Olivier FRAYSSE> <olive@picapo.org> |
394 | 9 | # quesh <Frédéric MANDE> <quesh@quesh.fr> | 9 | # quesh <Frédéric MANDE> <quesh@quesh.fr> |
397 | 10 | # This program is free software: you can redistribute it and/or modify it | 10 | # This program is free software: you can redistribute it and/or modify it |
398 | 11 | # under the terms of the GNU General Public License version 3, as published | 11 | # under the terms of the GNU General Public License version 3, as published |
399 | 12 | # by the Free Software Foundation. | 12 | # by the Free Software Foundation. |
404 | 13 | # | 13 | # |
405 | 14 | # This program is distributed in the hope that it will be useful, but | 14 | # This program is distributed in the hope that it will be useful, but |
406 | 15 | # WITHOUT ANY WARRANTY; without even the implied warranties of | 15 | # WITHOUT ANY WARRANTY; without even the implied warranties of |
407 | 16 | # MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR | 16 | # MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR |
408 | 17 | # PURPOSE. See the GNU General Public License for more details. | 17 | # PURPOSE. See the GNU General Public License for more details. |
411 | 18 | # | 18 | # |
412 | 19 | # You should have received a copy of the GNU General Public License along | 19 | # You should have received a copy of the GNU General Public License along |
413 | 20 | # with this program. If not, see <http://www.gnu.org/licenses/>. | 20 | # with this program. If not, see <http://www.gnu.org/licenses/>. |
414 | 21 | ### END LICENSE | 21 | ### END LICENSE |
415 | 22 | 22 | ||
416 | @@ -24,6 +24,7 @@ | |||
417 | 24 | 24 | ||
418 | 25 | import os | 25 | import os |
419 | 26 | import sys | 26 | import sys |
420 | 27 | import glob | ||
421 | 27 | 28 | ||
422 | 28 | try: | 29 | try: |
423 | 29 | import DistUtilsExtra.auto | 30 | import DistUtilsExtra.auto |
424 | @@ -134,10 +135,14 @@ | |||
425 | 134 | update_desktop_file(desktop_file, target_pkgdata, target_scripts) | 135 | update_desktop_file(desktop_file, target_pkgdata, target_scripts) |
426 | 135 | compile_schemas(self.root, target_data) | 136 | compile_schemas(self.root, target_data) |
427 | 136 | 137 | ||
429 | 137 | 138 | ||
430 | 138 | ################################################################################## | 139 | ################################################################################## |
431 | 139 | ###################### YOU SHOULD MODIFY ONLY WHAT IS BELOW ###################### | 140 | ###################### YOU SHOULD MODIFY ONLY WHAT IS BELOW ###################### |
432 | 140 | ################################################################################## | 141 | ################################################################################## |
433 | 142 | #List translate legal notice | ||
434 | 143 | l_file_legal_notice = glob.glob(os.path.join( | ||
435 | 144 | os.path.dirname(os.path.abspath(__file__)), | ||
436 | 145 | "data/legalnotice/*.html")) | ||
437 | 141 | 146 | ||
438 | 142 | DistUtilsExtra.auto.setup( | 147 | DistUtilsExtra.auto.setup( |
439 | 143 | name='dash-privacy-interface', | 148 | name='dash-privacy-interface', |
440 | @@ -148,6 +153,10 @@ | |||
441 | 148 | #description='UI for managing …', | 153 | #description='UI for managing …', |
442 | 149 | #long_description='Here a longer description', | 154 | #long_description='Here a longer description', |
443 | 150 | url='https://launchpad.net/dash-privacy-interface', | 155 | url='https://launchpad.net/dash-privacy-interface', |
445 | 151 | cmdclass={'install': InstallAndUpdateDataDirectory} | 156 | cmdclass={'install': InstallAndUpdateDataDirectory}, |
446 | 157 | data_files=[("/etc/skel/.config/autostart/", | ||
447 | 158 | ["data/dash-privacy-interface.desktop"]), | ||
448 | 159 | ("/usr/share/unity/6/", | ||
449 | 160 | l_file_legal_notice)] | ||
450 | 152 | ) | 161 | ) |
451 | 153 | 162 |