Merge lp:~facundo/ubuntu/maverick/magicicada/0.2-update into lp:ubuntu/maverick/magicicada

Proposed by Facundo Batista
Status: Merged
Merged at revision: 5
Proposed branch: lp:~facundo/ubuntu/maverick/magicicada/0.2-update
Merge into: lp:ubuntu/maverick/magicicada
Diff against target: 16280 lines (+90/-7705)
22 files modified
COPYING (+0/-676)
PKG-INFO (+1/-1)
README.txt (+0/-32)
bin/magicicada (+0/-57)
data/media/active.svg (+0/-203)
data/media/logo.svg (+0/-630)
data/ui/gui.glade (+0/-1043)
debian/changelog (+6/-0)
magicicada.desktop.in (+0/-8)
magicicada/__init__.py (+0/-506)
magicicada/dbusiface.py (+0/-431)
magicicada/helpers.py (+0/-107)
magicicada/logger.py (+0/-55)
magicicada/magicicadaconfig.py (+0/-57)
magicicada/syncdaemon.py (+0/-299)
magicicada/tests/__init__.py (+0/-19)
magicicada/tests/helpers.py (+0/-53)
magicicada/tests/test_dbusiface.py (+0/-1091)
magicicada/tests/test_logger.py (+83/-0)
magicicada/tests/test_magicicada.py (+0/-1407)
magicicada/tests/test_syncdaemon.py (+0/-934)
setup.py (+0/-96)
To merge this branch: bzr merge lp:~facundo/ubuntu/maverick/magicicada/0.2-update
Reviewer Review Type Date Requested Status
Stefano Rivera Approve
Review via email: mp+35442@code.launchpad.net

Description of the change

Update to 0.2 with some bug fixes:

- When the first MQChanged signal is received, stop polling syncdaemon about it

- Support NOT_SYNCHED_PATH as metadata value. Support symlinks when asking for
  metadata to underlying layers (LP: #612191).

- Log and show in stderr all unhandled exceptions. (LP: #615389)

- Visual update is done more consistently within the update method.
  (LP: #612192, #612193)

- Support syncdaemon new MetaQueue structure (and show paths when available!).

- Multiple metadata windows are now supported. (LP: #594268)

- Better instructions for releases in the README

To post a comment you must log in.
Revision history for this message
Stefano Rivera (stefanor) wrote :

 COPYING | 1352 ++++----
 PKG-INFO | 2
 README.txt | 88
 bin/magicicada | 114
 data/media/active-016.png 1970-01-01 00:00:00 +0000 |binary
 data/media/active-016.png 2010-09-15 12:40:32 +0000 |binary
 data/media/active.svg | 406 +-
 data/media/loader-ball.gif 1970-01-01 00:00:00 +0000 |binary
 data/media/loader-ball.gif 2010-09-15 12:40:32 +0000 |binary
 data/media/logo-014.png 1970-01-01 00:00:00 +0000 |binary
 data/media/logo-014.png 2010-09-15 12:40:32 +0000 |binary
 data/media/logo-016.png 1970-01-01 00:00:00 +0000 |binary
 data/media/logo-016.png 2010-09-15 12:40:32 +0000 |binary
 data/media/logo-032.png 1970-01-01 00:00:00 +0000 |binary
 data/media/logo-032.png 2010-09-15 12:40:32 +0000 |binary
 data/media/logo-064.png 1970-01-01 00:00:00 +0000 |binary
 data/media/logo-064.png 2010-09-15 12:40:32 +0000 |binary
 data/media/logo-128.png 1970-01-01 00:00:00 +0000 |binary
 data/media/logo-128.png 2010-09-15 12:40:32 +0000 |binary
 data/media/logo-192.png 1970-01-01 00:00:00 +0000 |binary
 data/media/logo-192.png 2010-09-15 12:40:32 +0000 |binary
 data/media/logo.svg | 1260 ++++----
 data/ui/gui.glade | 2086 ++++++-------
 debian/changelog | 6
 magicicada.desktop.in | 16
 magicicada/__init__.py | 1046 +++---
 magicicada/dbusiface.py | 906 +++--
 magicicada/helpers.py | 214 -
 magicicada/logger.py | 127
 magicicada/magicicadaconfig.py | 114
 magicicada/syncdaemon.py | 606 +--
 magicicada/tests/__init__.py | 38
 magicicada/tests/helpers.py | 106
 magicicada/tests/test_dbusiface.py | 2363 ++++++++-------
 magicicada/tests/test_logger.py | 83
 magicicada/tests/test_magicicada.py | 2967 +++++++++----------
 magicicada/tests/test_syncdaemon.py | 1924 ++++++------
 setup.py | 192 -
 38 files changed, 8311 insertions(+), 7705 deletions(-)

I think this needs a freeze exception:
https://wiki.ubuntu.com/FreezeExceptionProcess

review: Disapprove
Revision history for this message
Facundo Batista (facundo) wrote :

Oh, I'm very sorry to hear this, as because of updates in Syncdaemon (the backend to whom Magicicada is frontend), this will be broken and useless in Maverick.

How did you get that report? AFAIK, there isn't those many changes since 0.1.3

See that in Maverick should be that version, as it was merged here:

  https://code.edge.launchpad.net/~facundo/ubuntu/maverick/magicicada/0.1.3-update

That version corresponds to revno 64, and:

$ bzr diff -r64 | grep "==="
=== modified file 'README.txt'
=== modified file 'data/ui/gui.glade'
=== modified file 'magicicada/__init__.py'
=== modified file 'magicicada/dbusiface.py'
=== modified file 'magicicada/helpers.py'
=== modified file 'magicicada/logger.py'
=== modified file 'magicicada/syncdaemon.py'
=== modified file 'magicicada/tests/helpers.py'
=== modified file 'magicicada/tests/test_dbusiface.py'
=== added file 'magicicada/tests/test_logger.py'
=== modified file 'magicicada/tests/test_magicicada.py'
=== modified file 'magicicada/tests/test_syncdaemon.py'
=== modified file 'pylintrc'
=== modified file 'setup.py'
=== modified file 'test'

See that this is *very* different.

Sadly, we're in bugfix freeze now. What can we do?

Revision history for this message
Stefano Rivera (stefanor) wrote :

> How did you get that report?

bzr diff | diffstat

> there isn't those many changes since 0.1.3

The diff is against 0.1.3-0ubuntu1 (i.e. the current version in the maverick UDD branch, also visible at the bottom of this page)

> Sadly, we're in bugfix freeze now. What can we do?

File for an FFe. This is a universe package so if the upload is mostly bugfixes and not too heavy on new features, you should get the exception (quite quickly).

Revision history for this message
Natalia Bidart (nataliabidart) wrote :

Hello Stefano!

First of all, thanks for looking at this merge proposal.
Secondly, Facundo and I are having a hard time trying to understand your (bigger) diff. I'm not an extremely skilled packager, but I weekly package some projects, and by performing the usual steps, I get a smaller diff.

The steps I'm performing are:

* bzr branch lp:ubuntu/magicicada magicicada-0.2
* cd magicicada-0.2
* uscan --verbose --rename
* bzr merge-upstream --version 0.2 ../magicicada_0.2.orig.tar.gz
* bzr st (see output below)

nessita@dali:~/canonical/ubuntu/magicicada/magicicada-0.2$ bzr st
added:
  magicicada/tests/test_logger.py
modified:
  PKG-INFO
  README.txt
  data/ui/gui.glade
  debian/changelog
  magicicada/__init__.py
  magicicada/dbusiface.py
  magicicada/helpers.py
  magicicada/logger.py
  magicicada/syncdaemon.py
  magicicada/tests/helpers.py
  magicicada/tests/test_dbusiface.py
  magicicada/tests/test_magicicada.py
  magicicada/tests/test_syncdaemon.py
  setup.py
pending merge tips: (use -v to see all merge revisions)
  natalia.bidart@ca... 2010-09-20 Import upstream version 0.2
nessita@dali:~/canonical/ubuntu/magicicada/magicicada-0.2$ bzr diff | wc -l
2245

The complete diff output can be seen at: http://pastebin.ubuntu.com/497060/

Cheers, Naty.

Revision history for this message
Stefano Rivera (stefanor) wrote :

Naty: I did bzr merge-package lp:~facundo/ubuntu/maverick/magicicada/0.2-update (i.e. the update this review is about)

Revision history for this message
Facundo Batista (facundo) wrote :

Stefano, Naty:

I don't know much about packages, so to don't get lost I sticked to the basics in the following procedure. See, I branched both "Proposed branch" and "Merge into" branches from this MP, and checked *one* file:

$ cd /tmp
$ mkdir magicicada
$ bzr branch lp:~facundo/ubuntu/maverick/magicicada/0.2-update
Branched 6 revision(s).
$ bzr branch lp:ubuntu/magicicada current-magicicada
Branched 4 revision(s).
$ cd current-magicicada/
$ diff COPYING ../0.2-update/COPYING
$

The COPYING file is the same!

So, I don't understand Stefano why you're finding differences for it, or why Launchpad is showing differences in the "Preview Diff" here below.

Revision history for this message
Stefano Rivera (stefanor) wrote :

> So, I don't understand Stefano why you're finding differences for it

It's because they come from different sources (there isn't a common ancestry). I'm not going to dig into it, but I do agree that this diff is actually rather small and I'm happy to merge it.

BTW, I see you have a test suite, in future it would be nice to run this during build.

Also, you have some lintian warnings:

I: magicicada: description-synopsis-might-not-be-phrased-properly
I: magicicada: extended-description-is-probably-too-short
W: magicicada: spelling-error-in-changelog unecessary unnecessary
I: magicicada: package-contains-empty-directory usr/share/omf/magicicada/

review: Approve
Revision history for this message
Stefano Rivera (stefanor) wrote :

Err, that "unecessary" spelling error was my own

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added file 'COPYING'
2--- COPYING 1970-01-01 00:00:00 +0000
3+++ COPYING 2010-09-14 17:29:44 +0000
4@@ -0,0 +1,676 @@
5+
6+ GNU GENERAL PUBLIC LICENSE
7+ Version 3, 29 June 2007
8+
9+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
10+ Everyone is permitted to copy and distribute verbatim copies
11+ of this license document, but changing it is not allowed.
12+
13+ Preamble
14+
15+ The GNU General Public License is a free, copyleft license for
16+software and other kinds of works.
17+
18+ The licenses for most software and other practical works are designed
19+to take away your freedom to share and change the works. By contrast,
20+the GNU General Public License is intended to guarantee your freedom to
21+share and change all versions of a program--to make sure it remains free
22+software for all its users. We, the Free Software Foundation, use the
23+GNU General Public License for most of our software; it applies also to
24+any other work released this way by its authors. You can apply it to
25+your programs, too.
26+
27+ When we speak of free software, we are referring to freedom, not
28+price. Our General Public Licenses are designed to make sure that you
29+have the freedom to distribute copies of free software (and charge for
30+them if you wish), that you receive source code or can get it if you
31+want it, that you can change the software or use pieces of it in new
32+free programs, and that you know you can do these things.
33+
34+ To protect your rights, we need to prevent others from denying you
35+these rights or asking you to surrender the rights. Therefore, you have
36+certain responsibilities if you distribute copies of the software, or if
37+you modify it: responsibilities to respect the freedom of others.
38+
39+ For example, if you distribute copies of such a program, whether
40+gratis or for a fee, you must pass on to the recipients the same
41+freedoms that you received. You must make sure that they, too, receive
42+or can get the source code. And you must show them these terms so they
43+know their rights.
44+
45+ Developers that use the GNU GPL protect your rights with two steps:
46+(1) assert copyright on the software, and (2) offer you this License
47+giving you legal permission to copy, distribute and/or modify it.
48+
49+ For the developers' and authors' protection, the GPL clearly explains
50+that there is no warranty for this free software. For both users' and
51+authors' sake, the GPL requires that modified versions be marked as
52+changed, so that their problems will not be attributed erroneously to
53+authors of previous versions.
54+
55+ Some devices are designed to deny users access to install or run
56+modified versions of the software inside them, although the manufacturer
57+can do so. This is fundamentally incompatible with the aim of
58+protecting users' freedom to change the software. The systematic
59+pattern of such abuse occurs in the area of products for individuals to
60+use, which is precisely where it is most unacceptable. Therefore, we
61+have designed this version of the GPL to prohibit the practice for those
62+products. If such problems arise substantially in other domains, we
63+stand ready to extend this provision to those domains in future versions
64+of the GPL, as needed to protect the freedom of users.
65+
66+ Finally, every program is threatened constantly by software patents.
67+States should not allow patents to restrict development and use of
68+software on general-purpose computers, but in those that do, we wish to
69+avoid the special danger that patents applied to a free program could
70+make it effectively proprietary. To prevent this, the GPL assures that
71+patents cannot be used to render the program non-free.
72+
73+ The precise terms and conditions for copying, distribution and
74+modification follow.
75+
76+ TERMS AND CONDITIONS
77+
78+ 0. Definitions.
79+
80+ "This License" refers to version 3 of the GNU General Public License.
81+
82+ "Copyright" also means copyright-like laws that apply to other kinds of
83+works, such as semiconductor masks.
84+
85+ "The Program" refers to any copyrightable work licensed under this
86+License. Each licensee is addressed as "you". "Licensees" and
87+"recipients" may be individuals or organizations.
88+
89+ To "modify" a work means to copy from or adapt all or part of the work
90+in a fashion requiring copyright permission, other than the making of an
91+exact copy. The resulting work is called a "modified version" of the
92+earlier work or a work "based on" the earlier work.
93+
94+ A "covered work" means either the unmodified Program or a work based
95+on the Program.
96+
97+ To "propagate" a work means to do anything with it that, without
98+permission, would make you directly or secondarily liable for
99+infringement under applicable copyright law, except executing it on a
100+computer or modifying a private copy. Propagation includes copying,
101+distribution (with or without modification), making available to the
102+public, and in some countries other activities as well.
103+
104+ To "convey" a work means any kind of propagation that enables other
105+parties to make or receive copies. Mere interaction with a user through
106+a computer network, with no transfer of a copy, is not conveying.
107+
108+ An interactive user interface displays "Appropriate Legal Notices"
109+to the extent that it includes a convenient and prominently visible
110+feature that (1) displays an appropriate copyright notice, and (2)
111+tells the user that there is no warranty for the work (except to the
112+extent that warranties are provided), that licensees may convey the
113+work under this License, and how to view a copy of this License. If
114+the interface presents a list of user commands or options, such as a
115+menu, a prominent item in the list meets this criterion.
116+
117+ 1. Source Code.
118+
119+ The "source code" for a work means the preferred form of the work
120+for making modifications to it. "Object code" means any non-source
121+form of a work.
122+
123+ A "Standard Interface" means an interface that either is an official
124+standard defined by a recognized standards body, or, in the case of
125+interfaces specified for a particular programming language, one that
126+is widely used among developers working in that language.
127+
128+ The "System Libraries" of an executable work include anything, other
129+than the work as a whole, that (a) is included in the normal form of
130+packaging a Major Component, but which is not part of that Major
131+Component, and (b) serves only to enable use of the work with that
132+Major Component, or to implement a Standard Interface for which an
133+implementation is available to the public in source code form. A
134+"Major Component", in this context, means a major essential component
135+(kernel, window system, and so on) of the specific operating system
136+(if any) on which the executable work runs, or a compiler used to
137+produce the work, or an object code interpreter used to run it.
138+
139+ The "Corresponding Source" for a work in object code form means all
140+the source code needed to generate, install, and (for an executable
141+work) run the object code and to modify the work, including scripts to
142+control those activities. However, it does not include the work's
143+System Libraries, or general-purpose tools or generally available free
144+programs which are used unmodified in performing those activities but
145+which are not part of the work. For example, Corresponding Source
146+includes interface definition files associated with source files for
147+the work, and the source code for shared libraries and dynamically
148+linked subprograms that the work is specifically designed to require,
149+such as by intimate data communication or control flow between those
150+subprograms and other parts of the work.
151+
152+ The Corresponding Source need not include anything that users
153+can regenerate automatically from other parts of the Corresponding
154+Source.
155+
156+ The Corresponding Source for a work in source code form is that
157+same work.
158+
159+ 2. Basic Permissions.
160+
161+ All rights granted under this License are granted for the term of
162+copyright on the Program, and are irrevocable provided the stated
163+conditions are met. This License explicitly affirms your unlimited
164+permission to run the unmodified Program. The output from running a
165+covered work is covered by this License only if the output, given its
166+content, constitutes a covered work. This License acknowledges your
167+rights of fair use or other equivalent, as provided by copyright law.
168+
169+ You may make, run and propagate covered works that you do not
170+convey, without conditions so long as your license otherwise remains
171+in force. You may convey covered works to others for the sole purpose
172+of having them make modifications exclusively for you, or provide you
173+with facilities for running those works, provided that you comply with
174+the terms of this License in conveying all material for which you do
175+not control copyright. Those thus making or running the covered works
176+for you must do so exclusively on your behalf, under your direction
177+and control, on terms that prohibit them from making any copies of
178+your copyrighted material outside their relationship with you.
179+
180+ Conveying under any other circumstances is permitted solely under
181+the conditions stated below. Sublicensing is not allowed; section 10
182+makes it unnecessary.
183+
184+ 3. Protecting Users' Legal Rights From Anti-Circumvention Law.
185+
186+ No covered work shall be deemed part of an effective technological
187+measure under any applicable law fulfilling obligations under article
188+11 of the WIPO copyright treaty adopted on 20 December 1996, or
189+similar laws prohibiting or restricting circumvention of such
190+measures.
191+
192+ When you convey a covered work, you waive any legal power to forbid
193+circumvention of technological measures to the extent such circumvention
194+is effected by exercising rights under this License with respect to
195+the covered work, and you disclaim any intention to limit operation or
196+modification of the work as a means of enforcing, against the work's
197+users, your or third parties' legal rights to forbid circumvention of
198+technological measures.
199+
200+ 4. Conveying Verbatim Copies.
201+
202+ You may convey verbatim copies of the Program's source code as you
203+receive it, in any medium, provided that you conspicuously and
204+appropriately publish on each copy an appropriate copyright notice;
205+keep intact all notices stating that this License and any
206+non-permissive terms added in accord with section 7 apply to the code;
207+keep intact all notices of the absence of any warranty; and give all
208+recipients a copy of this License along with the Program.
209+
210+ You may charge any price or no price for each copy that you convey,
211+and you may offer support or warranty protection for a fee.
212+
213+ 5. Conveying Modified Source Versions.
214+
215+ You may convey a work based on the Program, or the modifications to
216+produce it from the Program, in the form of source code under the
217+terms of section 4, provided that you also meet all of these conditions:
218+
219+ a) The work must carry prominent notices stating that you modified
220+ it, and giving a relevant date.
221+
222+ b) The work must carry prominent notices stating that it is
223+ released under this License and any conditions added under section
224+ 7. This requirement modifies the requirement in section 4 to
225+ "keep intact all notices".
226+
227+ c) You must license the entire work, as a whole, under this
228+ License to anyone who comes into possession of a copy. This
229+ License will therefore apply, along with any applicable section 7
230+ additional terms, to the whole of the work, and all its parts,
231+ regardless of how they are packaged. This License gives no
232+ permission to license the work in any other way, but it does not
233+ invalidate such permission if you have separately received it.
234+
235+ d) If the work has interactive user interfaces, each must display
236+ Appropriate Legal Notices; however, if the Program has interactive
237+ interfaces that do not display Appropriate Legal Notices, your
238+ work need not make them do so.
239+
240+ A compilation of a covered work with other separate and independent
241+works, which are not by their nature extensions of the covered work,
242+and which are not combined with it such as to form a larger program,
243+in or on a volume of a storage or distribution medium, is called an
244+"aggregate" if the compilation and its resulting copyright are not
245+used to limit the access or legal rights of the compilation's users
246+beyond what the individual works permit. Inclusion of a covered work
247+in an aggregate does not cause this License to apply to the other
248+parts of the aggregate.
249+
250+ 6. Conveying Non-Source Forms.
251+
252+ You may convey a covered work in object code form under the terms
253+of sections 4 and 5, provided that you also convey the
254+machine-readable Corresponding Source under the terms of this License,
255+in one of these ways:
256+
257+ a) Convey the object code in, or embodied in, a physical product
258+ (including a physical distribution medium), accompanied by the
259+ Corresponding Source fixed on a durable physical medium
260+ customarily used for software interchange.
261+
262+ b) Convey the object code in, or embodied in, a physical product
263+ (including a physical distribution medium), accompanied by a
264+ written offer, valid for at least three years and valid for as
265+ long as you offer spare parts or customer support for that product
266+ model, to give anyone who possesses the object code either (1) a
267+ copy of the Corresponding Source for all the software in the
268+ product that is covered by this License, on a durable physical
269+ medium customarily used for software interchange, for a price no
270+ more than your reasonable cost of physically performing this
271+ conveying of source, or (2) access to copy the
272+ Corresponding Source from a network server at no charge.
273+
274+ c) Convey individual copies of the object code with a copy of the
275+ written offer to provide the Corresponding Source. This
276+ alternative is allowed only occasionally and noncommercially, and
277+ only if you received the object code with such an offer, in accord
278+ with subsection 6b.
279+
280+ d) Convey the object code by offering access from a designated
281+ place (gratis or for a charge), and offer equivalent access to the
282+ Corresponding Source in the same way through the same place at no
283+ further charge. You need not require recipients to copy the
284+ Corresponding Source along with the object code. If the place to
285+ copy the object code is a network server, the Corresponding Source
286+ may be on a different server (operated by you or a third party)
287+ that supports equivalent copying facilities, provided you maintain
288+ clear directions next to the object code saying where to find the
289+ Corresponding Source. Regardless of what server hosts the
290+ Corresponding Source, you remain obligated to ensure that it is
291+ available for as long as needed to satisfy these requirements.
292+
293+ e) Convey the object code using peer-to-peer transmission, provided
294+ you inform other peers where the object code and Corresponding
295+ Source of the work are being offered to the general public at no
296+ charge under subsection 6d.
297+
298+ A separable portion of the object code, whose source code is excluded
299+from the Corresponding Source as a System Library, need not be
300+included in conveying the object code work.
301+
302+ A "User Product" is either (1) a "consumer product", which means any
303+tangible personal property which is normally used for personal, family,
304+or household purposes, or (2) anything designed or sold for incorporation
305+into a dwelling. In determining whether a product is a consumer product,
306+doubtful cases shall be resolved in favor of coverage. For a particular
307+product received by a particular user, "normally used" refers to a
308+typical or common use of that class of product, regardless of the status
309+of the particular user or of the way in which the particular user
310+actually uses, or expects or is expected to use, the product. A product
311+is a consumer product regardless of whether the product has substantial
312+commercial, industrial or non-consumer uses, unless such uses represent
313+the only significant mode of use of the product.
314+
315+ "Installation Information" for a User Product means any methods,
316+procedures, authorization keys, or other information required to install
317+and execute modified versions of a covered work in that User Product from
318+a modified version of its Corresponding Source. The information must
319+suffice to ensure that the continued functioning of the modified object
320+code is in no case prevented or interfered with solely because
321+modification has been made.
322+
323+ If you convey an object code work under this section in, or with, or
324+specifically for use in, a User Product, and the conveying occurs as
325+part of a transaction in which the right of possession and use of the
326+User Product is transferred to the recipient in perpetuity or for a
327+fixed term (regardless of how the transaction is characterized), the
328+Corresponding Source conveyed under this section must be accompanied
329+by the Installation Information. But this requirement does not apply
330+if neither you nor any third party retains the ability to install
331+modified object code on the User Product (for example, the work has
332+been installed in ROM).
333+
334+ The requirement to provide Installation Information does not include a
335+requirement to continue to provide support service, warranty, or updates
336+for a work that has been modified or installed by the recipient, or for
337+the User Product in which it has been modified or installed. Access to a
338+network may be denied when the modification itself materially and
339+adversely affects the operation of the network or violates the rules and
340+protocols for communication across the network.
341+
342+ Corresponding Source conveyed, and Installation Information provided,
343+in accord with this section must be in a format that is publicly
344+documented (and with an implementation available to the public in
345+source code form), and must require no special password or key for
346+unpacking, reading or copying.
347+
348+ 7. Additional Terms.
349+
350+ "Additional permissions" are terms that supplement the terms of this
351+License by making exceptions from one or more of its conditions.
352+Additional permissions that are applicable to the entire Program shall
353+be treated as though they were included in this License, to the extent
354+that they are valid under applicable law. If additional permissions
355+apply only to part of the Program, that part may be used separately
356+under those permissions, but the entire Program remains governed by
357+this License without regard to the additional permissions.
358+
359+ When you convey a copy of a covered work, you may at your option
360+remove any additional permissions from that copy, or from any part of
361+it. (Additional permissions may be written to require their own
362+removal in certain cases when you modify the work.) You may place
363+additional permissions on material, added by you to a covered work,
364+for which you have or can give appropriate copyright permission.
365+
366+ Notwithstanding any other provision of this License, for material you
367+add to a covered work, you may (if authorized by the copyright holders of
368+that material) supplement the terms of this License with terms:
369+
370+ a) Disclaiming warranty or limiting liability differently from the
371+ terms of sections 15 and 16 of this License; or
372+
373+ b) Requiring preservation of specified reasonable legal notices or
374+ author attributions in that material or in the Appropriate Legal
375+ Notices displayed by works containing it; or
376+
377+ c) Prohibiting misrepresentation of the origin of that material, or
378+ requiring that modified versions of such material be marked in
379+ reasonable ways as different from the original version; or
380+
381+ d) Limiting the use for publicity purposes of names of licensors or
382+ authors of the material; or
383+
384+ e) Declining to grant rights under trademark law for use of some
385+ trade names, trademarks, or service marks; or
386+
387+ f) Requiring indemnification of licensors and authors of that
388+ material by anyone who conveys the material (or modified versions of
389+ it) with contractual assumptions of liability to the recipient, for
390+ any liability that these contractual assumptions directly impose on
391+ those licensors and authors.
392+
393+ All other non-permissive additional terms are considered "further
394+restrictions" within the meaning of section 10. If the Program as you
395+received it, or any part of it, contains a notice stating that it is
396+governed by this License along with a term that is a further
397+restriction, you may remove that term. If a license document contains
398+a further restriction but permits relicensing or conveying under this
399+License, you may add to a covered work material governed by the terms
400+of that license document, provided that the further restriction does
401+not survive such relicensing or conveying.
402+
403+ If you add terms to a covered work in accord with this section, you
404+must place, in the relevant source files, a statement of the
405+additional terms that apply to those files, or a notice indicating
406+where to find the applicable terms.
407+
408+ Additional terms, permissive or non-permissive, may be stated in the
409+form of a separately written license, or stated as exceptions;
410+the above requirements apply either way.
411+
412+ 8. Termination.
413+
414+ You may not propagate or modify a covered work except as expressly
415+provided under this License. Any attempt otherwise to propagate or
416+modify it is void, and will automatically terminate your rights under
417+this License (including any patent licenses granted under the third
418+paragraph of section 11).
419+
420+ However, if you cease all violation of this License, then your
421+license from a particular copyright holder is reinstated (a)
422+provisionally, unless and until the copyright holder explicitly and
423+finally terminates your license, and (b) permanently, if the copyright
424+holder fails to notify you of the violation by some reasonable means
425+prior to 60 days after the cessation.
426+
427+ Moreover, your license from a particular copyright holder is
428+reinstated permanently if the copyright holder notifies you of the
429+violation by some reasonable means, this is the first time you have
430+received notice of violation of this License (for any work) from that
431+copyright holder, and you cure the violation prior to 30 days after
432+your receipt of the notice.
433+
434+ Termination of your rights under this section does not terminate the
435+licenses of parties who have received copies or rights from you under
436+this License. If your rights have been terminated and not permanently
437+reinstated, you do not qualify to receive new licenses for the same
438+material under section 10.
439+
440+ 9. Acceptance Not Required for Having Copies.
441+
442+ You are not required to accept this License in order to receive or
443+run a copy of the Program. Ancillary propagation of a covered work
444+occurring solely as a consequence of using peer-to-peer transmission
445+to receive a copy likewise does not require acceptance. However,
446+nothing other than this License grants you permission to propagate or
447+modify any covered work. These actions infringe copyright if you do
448+not accept this License. Therefore, by modifying or propagating a
449+covered work, you indicate your acceptance of this License to do so.
450+
451+ 10. Automatic Licensing of Downstream Recipients.
452+
453+ Each time you convey a covered work, the recipient automatically
454+receives a license from the original licensors, to run, modify and
455+propagate that work, subject to this License. You are not responsible
456+for enforcing compliance by third parties with this License.
457+
458+ An "entity transaction" is a transaction transferring control of an
459+organization, or substantially all assets of one, or subdividing an
460+organization, or merging organizations. If propagation of a covered
461+work results from an entity transaction, each party to that
462+transaction who receives a copy of the work also receives whatever
463+licenses to the work the party's predecessor in interest had or could
464+give under the previous paragraph, plus a right to possession of the
465+Corresponding Source of the work from the predecessor in interest, if
466+the predecessor has it or can get it with reasonable efforts.
467+
468+ You may not impose any further restrictions on the exercise of the
469+rights granted or affirmed under this License. For example, you may
470+not impose a license fee, royalty, or other charge for exercise of
471+rights granted under this License, and you may not initiate litigation
472+(including a cross-claim or counterclaim in a lawsuit) alleging that
473+any patent claim is infringed by making, using, selling, offering for
474+sale, or importing the Program or any portion of it.
475+
476+ 11. Patents.
477+
478+ A "contributor" is a copyright holder who authorizes use under this
479+License of the Program or a work on which the Program is based. The
480+work thus licensed is called the contributor's "contributor version".
481+
482+ A contributor's "essential patent claims" are all patent claims
483+owned or controlled by the contributor, whether already acquired or
484+hereafter acquired, that would be infringed by some manner, permitted
485+by this License, of making, using, or selling its contributor version,
486+but do not include claims that would be infringed only as a
487+consequence of further modification of the contributor version. For
488+purposes of this definition, "control" includes the right to grant
489+patent sublicenses in a manner consistent with the requirements of
490+this License.
491+
492+ Each contributor grants you a non-exclusive, worldwide, royalty-free
493+patent license under the contributor's essential patent claims, to
494+make, use, sell, offer for sale, import and otherwise run, modify and
495+propagate the contents of its contributor version.
496+
497+ In the following three paragraphs, a "patent license" is any express
498+agreement or commitment, however denominated, not to enforce a patent
499+(such as an express permission to practice a patent or covenant not to
500+sue for patent infringement). To "grant" such a patent license to a
501+party means to make such an agreement or commitment not to enforce a
502+patent against the party.
503+
504+ If you convey a covered work, knowingly relying on a patent license,
505+and the Corresponding Source of the work is not available for anyone
506+to copy, free of charge and under the terms of this License, through a
507+publicly available network server or other readily accessible means,
508+then you must either (1) cause the Corresponding Source to be so
509+available, or (2) arrange to deprive yourself of the benefit of the
510+patent license for this particular work, or (3) arrange, in a manner
511+consistent with the requirements of this License, to extend the patent
512+license to downstream recipients. "Knowingly relying" means you have
513+actual knowledge that, but for the patent license, your conveying the
514+covered work in a country, or your recipient's use of the covered work
515+in a country, would infringe one or more identifiable patents in that
516+country that you have reason to believe are valid.
517+
518+ If, pursuant to or in connection with a single transaction or
519+arrangement, you convey, or propagate by procuring conveyance of, a
520+covered work, and grant a patent license to some of the parties
521+receiving the covered work authorizing them to use, propagate, modify
522+or convey a specific copy of the covered work, then the patent license
523+you grant is automatically extended to all recipients of the covered
524+work and works based on it.
525+
526+ A patent license is "discriminatory" if it does not include within
527+the scope of its coverage, prohibits the exercise of, or is
528+conditioned on the non-exercise of one or more of the rights that are
529+specifically granted under this License. You may not convey a covered
530+work if you are a party to an arrangement with a third party that is
531+in the business of distributing software, under which you make payment
532+to the third party based on the extent of your activity of conveying
533+the work, and under which the third party grants, to any of the
534+parties who would receive the covered work from you, a discriminatory
535+patent license (a) in connection with copies of the covered work
536+conveyed by you (or copies made from those copies), or (b) primarily
537+for and in connection with specific products or compilations that
538+contain the covered work, unless you entered into that arrangement,
539+or that patent license was granted, prior to 28 March 2007.
540+
541+ Nothing in this License shall be construed as excluding or limiting
542+any implied license or other defenses to infringement that may
543+otherwise be available to you under applicable patent law.
544+
545+ 12. No Surrender of Others' Freedom.
546+
547+ If conditions are imposed on you (whether by court order, agreement or
548+otherwise) that contradict the conditions of this License, they do not
549+excuse you from the conditions of this License. If you cannot convey a
550+covered work so as to satisfy simultaneously your obligations under this
551+License and any other pertinent obligations, then as a consequence you may
552+not convey it at all. For example, if you agree to terms that obligate you
553+to collect a royalty for further conveying from those to whom you convey
554+the Program, the only way you could satisfy both those terms and this
555+License would be to refrain entirely from conveying the Program.
556+
557+ 13. Use with the GNU Affero General Public License.
558+
559+ Notwithstanding any other provision of this License, you have
560+permission to link or combine any covered work with a work licensed
561+under version 3 of the GNU Affero General Public License into a single
562+combined work, and to convey the resulting work. The terms of this
563+License will continue to apply to the part which is the covered work,
564+but the special requirements of the GNU Affero General Public License,
565+section 13, concerning interaction through a network will apply to the
566+combination as such.
567+
568+ 14. Revised Versions of this License.
569+
570+ The Free Software Foundation may publish revised and/or new versions of
571+the GNU General Public License from time to time. Such new versions will
572+be similar in spirit to the present version, but may differ in detail to
573+address new problems or concerns.
574+
575+ Each version is given a distinguishing version number. If the
576+Program specifies that a certain numbered version of the GNU General
577+Public License "or any later version" applies to it, you have the
578+option of following the terms and conditions either of that numbered
579+version or of any later version published by the Free Software
580+Foundation. If the Program does not specify a version number of the
581+GNU General Public License, you may choose any version ever published
582+by the Free Software Foundation.
583+
584+ If the Program specifies that a proxy can decide which future
585+versions of the GNU General Public License can be used, that proxy's
586+public statement of acceptance of a version permanently authorizes you
587+to choose that version for the Program.
588+
589+ Later license versions may give you additional or different
590+permissions. However, no additional obligations are imposed on any
591+author or copyright holder as a result of your choosing to follow a
592+later version.
593+
594+ 15. Disclaimer of Warranty.
595+
596+ THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
597+APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
598+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
599+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
600+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
601+PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
602+IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
603+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
604+
605+ 16. Limitation of Liability.
606+
607+ IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
608+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
609+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
610+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
611+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
612+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
613+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
614+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
615+SUCH DAMAGES.
616+
617+ 17. Interpretation of Sections 15 and 16.
618+
619+ If the disclaimer of warranty and limitation of liability provided
620+above cannot be given local legal effect according to their terms,
621+reviewing courts shall apply local law that most closely approximates
622+an absolute waiver of all civil liability in connection with the
623+Program, unless a warranty or assumption of liability accompanies a
624+copy of the Program in return for a fee.
625+
626+ END OF TERMS AND CONDITIONS
627+
628+ How to Apply These Terms to Your New Programs
629+
630+ If you develop a new program, and you want it to be of the greatest
631+possible use to the public, the best way to achieve this is to make it
632+free software which everyone can redistribute and change under these terms.
633+
634+ To do so, attach the following notices to the program. It is safest
635+to attach them to the start of each source file to most effectively
636+state the exclusion of warranty; and each file should have at least
637+the "copyright" line and a pointer to where the full notice is found.
638+
639+ <one line to give the program's name and a brief idea of what it does.>
640+ Copyright (C) <year> <name of author>
641+
642+ This program is free software: you can redistribute it and/or modify
643+ it under the terms of the GNU General Public License as published by
644+ the Free Software Foundation, either version 3 of the License, or
645+ (at your option) any later version.
646+
647+ This program is distributed in the hope that it will be useful,
648+ but WITHOUT ANY WARRANTY; without even the implied warranty of
649+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
650+ GNU General Public License for more details.
651+
652+ You should have received a copy of the GNU General Public License
653+ along with this program. If not, see <http://www.gnu.org/licenses/>.
654+
655+Also add information on how to contact you by electronic and paper mail.
656+
657+ If the program does terminal interaction, make it output a short
658+notice like this when it starts in an interactive mode:
659+
660+ <program> Copyright (C) <year> <name of author>
661+ This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
662+ This is free software, and you are welcome to redistribute it
663+ under certain conditions; type `show c' for details.
664+
665+The hypothetical commands `show w' and `show c' should show the appropriate
666+parts of the General Public License. Of course, your program's commands
667+might be different; for a GUI interface, you would use an "about box".
668+
669+ You should also get your employer (if you work as a programmer) or school,
670+if any, to sign a "copyright disclaimer" for the program, if necessary.
671+For more information on this, and how to apply and follow the GNU GPL, see
672+<http://www.gnu.org/licenses/>.
673+
674+ The GNU General Public License does not permit incorporating your program
675+into proprietary programs. If your program is a subroutine library, you
676+may consider it more useful to permit linking proprietary applications with
677+the library. If this is what you want to do, use the GNU Lesser General
678+Public License instead of this License. But first, please read
679+<http://www.gnu.org/philosophy/why-not-lgpl.html>.
680+
681
682=== removed file 'COPYING'
683--- COPYING 2010-06-08 10:53:02 +0000
684+++ COPYING 1970-01-01 00:00:00 +0000
685@@ -1,676 +0,0 @@
686-
687- GNU GENERAL PUBLIC LICENSE
688- Version 3, 29 June 2007
689-
690- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
691- Everyone is permitted to copy and distribute verbatim copies
692- of this license document, but changing it is not allowed.
693-
694- Preamble
695-
696- The GNU General Public License is a free, copyleft license for
697-software and other kinds of works.
698-
699- The licenses for most software and other practical works are designed
700-to take away your freedom to share and change the works. By contrast,
701-the GNU General Public License is intended to guarantee your freedom to
702-share and change all versions of a program--to make sure it remains free
703-software for all its users. We, the Free Software Foundation, use the
704-GNU General Public License for most of our software; it applies also to
705-any other work released this way by its authors. You can apply it to
706-your programs, too.
707-
708- When we speak of free software, we are referring to freedom, not
709-price. Our General Public Licenses are designed to make sure that you
710-have the freedom to distribute copies of free software (and charge for
711-them if you wish), that you receive source code or can get it if you
712-want it, that you can change the software or use pieces of it in new
713-free programs, and that you know you can do these things.
714-
715- To protect your rights, we need to prevent others from denying you
716-these rights or asking you to surrender the rights. Therefore, you have
717-certain responsibilities if you distribute copies of the software, or if
718-you modify it: responsibilities to respect the freedom of others.
719-
720- For example, if you distribute copies of such a program, whether
721-gratis or for a fee, you must pass on to the recipients the same
722-freedoms that you received. You must make sure that they, too, receive
723-or can get the source code. And you must show them these terms so they
724-know their rights.
725-
726- Developers that use the GNU GPL protect your rights with two steps:
727-(1) assert copyright on the software, and (2) offer you this License
728-giving you legal permission to copy, distribute and/or modify it.
729-
730- For the developers' and authors' protection, the GPL clearly explains
731-that there is no warranty for this free software. For both users' and
732-authors' sake, the GPL requires that modified versions be marked as
733-changed, so that their problems will not be attributed erroneously to
734-authors of previous versions.
735-
736- Some devices are designed to deny users access to install or run
737-modified versions of the software inside them, although the manufacturer
738-can do so. This is fundamentally incompatible with the aim of
739-protecting users' freedom to change the software. The systematic
740-pattern of such abuse occurs in the area of products for individuals to
741-use, which is precisely where it is most unacceptable. Therefore, we
742-have designed this version of the GPL to prohibit the practice for those
743-products. If such problems arise substantially in other domains, we
744-stand ready to extend this provision to those domains in future versions
745-of the GPL, as needed to protect the freedom of users.
746-
747- Finally, every program is threatened constantly by software patents.
748-States should not allow patents to restrict development and use of
749-software on general-purpose computers, but in those that do, we wish to
750-avoid the special danger that patents applied to a free program could
751-make it effectively proprietary. To prevent this, the GPL assures that
752-patents cannot be used to render the program non-free.
753-
754- The precise terms and conditions for copying, distribution and
755-modification follow.
756-
757- TERMS AND CONDITIONS
758-
759- 0. Definitions.
760-
761- "This License" refers to version 3 of the GNU General Public License.
762-
763- "Copyright" also means copyright-like laws that apply to other kinds of
764-works, such as semiconductor masks.
765-
766- "The Program" refers to any copyrightable work licensed under this
767-License. Each licensee is addressed as "you". "Licensees" and
768-"recipients" may be individuals or organizations.
769-
770- To "modify" a work means to copy from or adapt all or part of the work
771-in a fashion requiring copyright permission, other than the making of an
772-exact copy. The resulting work is called a "modified version" of the
773-earlier work or a work "based on" the earlier work.
774-
775- A "covered work" means either the unmodified Program or a work based
776-on the Program.
777-
778- To "propagate" a work means to do anything with it that, without
779-permission, would make you directly or secondarily liable for
780-infringement under applicable copyright law, except executing it on a
781-computer or modifying a private copy. Propagation includes copying,
782-distribution (with or without modification), making available to the
783-public, and in some countries other activities as well.
784-
785- To "convey" a work means any kind of propagation that enables other
786-parties to make or receive copies. Mere interaction with a user through
787-a computer network, with no transfer of a copy, is not conveying.
788-
789- An interactive user interface displays "Appropriate Legal Notices"
790-to the extent that it includes a convenient and prominently visible
791-feature that (1) displays an appropriate copyright notice, and (2)
792-tells the user that there is no warranty for the work (except to the
793-extent that warranties are provided), that licensees may convey the
794-work under this License, and how to view a copy of this License. If
795-the interface presents a list of user commands or options, such as a
796-menu, a prominent item in the list meets this criterion.
797-
798- 1. Source Code.
799-
800- The "source code" for a work means the preferred form of the work
801-for making modifications to it. "Object code" means any non-source
802-form of a work.
803-
804- A "Standard Interface" means an interface that either is an official
805-standard defined by a recognized standards body, or, in the case of
806-interfaces specified for a particular programming language, one that
807-is widely used among developers working in that language.
808-
809- The "System Libraries" of an executable work include anything, other
810-than the work as a whole, that (a) is included in the normal form of
811-packaging a Major Component, but which is not part of that Major
812-Component, and (b) serves only to enable use of the work with that
813-Major Component, or to implement a Standard Interface for which an
814-implementation is available to the public in source code form. A
815-"Major Component", in this context, means a major essential component
816-(kernel, window system, and so on) of the specific operating system
817-(if any) on which the executable work runs, or a compiler used to
818-produce the work, or an object code interpreter used to run it.
819-
820- The "Corresponding Source" for a work in object code form means all
821-the source code needed to generate, install, and (for an executable
822-work) run the object code and to modify the work, including scripts to
823-control those activities. However, it does not include the work's
824-System Libraries, or general-purpose tools or generally available free
825-programs which are used unmodified in performing those activities but
826-which are not part of the work. For example, Corresponding Source
827-includes interface definition files associated with source files for
828-the work, and the source code for shared libraries and dynamically
829-linked subprograms that the work is specifically designed to require,
830-such as by intimate data communication or control flow between those
831-subprograms and other parts of the work.
832-
833- The Corresponding Source need not include anything that users
834-can regenerate automatically from other parts of the Corresponding
835-Source.
836-
837- The Corresponding Source for a work in source code form is that
838-same work.
839-
840- 2. Basic Permissions.
841-
842- All rights granted under this License are granted for the term of
843-copyright on the Program, and are irrevocable provided the stated
844-conditions are met. This License explicitly affirms your unlimited
845-permission to run the unmodified Program. The output from running a
846-covered work is covered by this License only if the output, given its
847-content, constitutes a covered work. This License acknowledges your
848-rights of fair use or other equivalent, as provided by copyright law.
849-
850- You may make, run and propagate covered works that you do not
851-convey, without conditions so long as your license otherwise remains
852-in force. You may convey covered works to others for the sole purpose
853-of having them make modifications exclusively for you, or provide you
854-with facilities for running those works, provided that you comply with
855-the terms of this License in conveying all material for which you do
856-not control copyright. Those thus making or running the covered works
857-for you must do so exclusively on your behalf, under your direction
858-and control, on terms that prohibit them from making any copies of
859-your copyrighted material outside their relationship with you.
860-
861- Conveying under any other circumstances is permitted solely under
862-the conditions stated below. Sublicensing is not allowed; section 10
863-makes it unnecessary.
864-
865- 3. Protecting Users' Legal Rights From Anti-Circumvention Law.
866-
867- No covered work shall be deemed part of an effective technological
868-measure under any applicable law fulfilling obligations under article
869-11 of the WIPO copyright treaty adopted on 20 December 1996, or
870-similar laws prohibiting or restricting circumvention of such
871-measures.
872-
873- When you convey a covered work, you waive any legal power to forbid
874-circumvention of technological measures to the extent such circumvention
875-is effected by exercising rights under this License with respect to
876-the covered work, and you disclaim any intention to limit operation or
877-modification of the work as a means of enforcing, against the work's
878-users, your or third parties' legal rights to forbid circumvention of
879-technological measures.
880-
881- 4. Conveying Verbatim Copies.
882-
883- You may convey verbatim copies of the Program's source code as you
884-receive it, in any medium, provided that you conspicuously and
885-appropriately publish on each copy an appropriate copyright notice;
886-keep intact all notices stating that this License and any
887-non-permissive terms added in accord with section 7 apply to the code;
888-keep intact all notices of the absence of any warranty; and give all
889-recipients a copy of this License along with the Program.
890-
891- You may charge any price or no price for each copy that you convey,
892-and you may offer support or warranty protection for a fee.
893-
894- 5. Conveying Modified Source Versions.
895-
896- You may convey a work based on the Program, or the modifications to
897-produce it from the Program, in the form of source code under the
898-terms of section 4, provided that you also meet all of these conditions:
899-
900- a) The work must carry prominent notices stating that you modified
901- it, and giving a relevant date.
902-
903- b) The work must carry prominent notices stating that it is
904- released under this License and any conditions added under section
905- 7. This requirement modifies the requirement in section 4 to
906- "keep intact all notices".
907-
908- c) You must license the entire work, as a whole, under this
909- License to anyone who comes into possession of a copy. This
910- License will therefore apply, along with any applicable section 7
911- additional terms, to the whole of the work, and all its parts,
912- regardless of how they are packaged. This License gives no
913- permission to license the work in any other way, but it does not
914- invalidate such permission if you have separately received it.
915-
916- d) If the work has interactive user interfaces, each must display
917- Appropriate Legal Notices; however, if the Program has interactive
918- interfaces that do not display Appropriate Legal Notices, your
919- work need not make them do so.
920-
921- A compilation of a covered work with other separate and independent
922-works, which are not by their nature extensions of the covered work,
923-and which are not combined with it such as to form a larger program,
924-in or on a volume of a storage or distribution medium, is called an
925-"aggregate" if the compilation and its resulting copyright are not
926-used to limit the access or legal rights of the compilation's users
927-beyond what the individual works permit. Inclusion of a covered work
928-in an aggregate does not cause this License to apply to the other
929-parts of the aggregate.
930-
931- 6. Conveying Non-Source Forms.
932-
933- You may convey a covered work in object code form under the terms
934-of sections 4 and 5, provided that you also convey the
935-machine-readable Corresponding Source under the terms of this License,
936-in one of these ways:
937-
938- a) Convey the object code in, or embodied in, a physical product
939- (including a physical distribution medium), accompanied by the
940- Corresponding Source fixed on a durable physical medium
941- customarily used for software interchange.
942-
943- b) Convey the object code in, or embodied in, a physical product
944- (including a physical distribution medium), accompanied by a
945- written offer, valid for at least three years and valid for as
946- long as you offer spare parts or customer support for that product
947- model, to give anyone who possesses the object code either (1) a
948- copy of the Corresponding Source for all the software in the
949- product that is covered by this License, on a durable physical
950- medium customarily used for software interchange, for a price no
951- more than your reasonable cost of physically performing this
952- conveying of source, or (2) access to copy the
953- Corresponding Source from a network server at no charge.
954-
955- c) Convey individual copies of the object code with a copy of the
956- written offer to provide the Corresponding Source. This
957- alternative is allowed only occasionally and noncommercially, and
958- only if you received the object code with such an offer, in accord
959- with subsection 6b.
960-
961- d) Convey the object code by offering access from a designated
962- place (gratis or for a charge), and offer equivalent access to the
963- Corresponding Source in the same way through the same place at no
964- further charge. You need not require recipients to copy the
965- Corresponding Source along with the object code. If the place to
966- copy the object code is a network server, the Corresponding Source
967- may be on a different server (operated by you or a third party)
968- that supports equivalent copying facilities, provided you maintain
969- clear directions next to the object code saying where to find the
970- Corresponding Source. Regardless of what server hosts the
971- Corresponding Source, you remain obligated to ensure that it is
972- available for as long as needed to satisfy these requirements.
973-
974- e) Convey the object code using peer-to-peer transmission, provided
975- you inform other peers where the object code and Corresponding
976- Source of the work are being offered to the general public at no
977- charge under subsection 6d.
978-
979- A separable portion of the object code, whose source code is excluded
980-from the Corresponding Source as a System Library, need not be
981-included in conveying the object code work.
982-
983- A "User Product" is either (1) a "consumer product", which means any
984-tangible personal property which is normally used for personal, family,
985-or household purposes, or (2) anything designed or sold for incorporation
986-into a dwelling. In determining whether a product is a consumer product,
987-doubtful cases shall be resolved in favor of coverage. For a particular
988-product received by a particular user, "normally used" refers to a
989-typical or common use of that class of product, regardless of the status
990-of the particular user or of the way in which the particular user
991-actually uses, or expects or is expected to use, the product. A product
992-is a consumer product regardless of whether the product has substantial
993-commercial, industrial or non-consumer uses, unless such uses represent
994-the only significant mode of use of the product.
995-
996- "Installation Information" for a User Product means any methods,
997-procedures, authorization keys, or other information required to install
998-and execute modified versions of a covered work in that User Product from
999-a modified version of its Corresponding Source. The information must
1000-suffice to ensure that the continued functioning of the modified object
1001-code is in no case prevented or interfered with solely because
1002-modification has been made.
1003-
1004- If you convey an object code work under this section in, or with, or
1005-specifically for use in, a User Product, and the conveying occurs as
1006-part of a transaction in which the right of possession and use of the
1007-User Product is transferred to the recipient in perpetuity or for a
1008-fixed term (regardless of how the transaction is characterized), the
1009-Corresponding Source conveyed under this section must be accompanied
1010-by the Installation Information. But this requirement does not apply
1011-if neither you nor any third party retains the ability to install
1012-modified object code on the User Product (for example, the work has
1013-been installed in ROM).
1014-
1015- The requirement to provide Installation Information does not include a
1016-requirement to continue to provide support service, warranty, or updates
1017-for a work that has been modified or installed by the recipient, or for
1018-the User Product in which it has been modified or installed. Access to a
1019-network may be denied when the modification itself materially and
1020-adversely affects the operation of the network or violates the rules and
1021-protocols for communication across the network.
1022-
1023- Corresponding Source conveyed, and Installation Information provided,
1024-in accord with this section must be in a format that is publicly
1025-documented (and with an implementation available to the public in
1026-source code form), and must require no special password or key for
1027-unpacking, reading or copying.
1028-
1029- 7. Additional Terms.
1030-
1031- "Additional permissions" are terms that supplement the terms of this
1032-License by making exceptions from one or more of its conditions.
1033-Additional permissions that are applicable to the entire Program shall
1034-be treated as though they were included in this License, to the extent
1035-that they are valid under applicable law. If additional permissions
1036-apply only to part of the Program, that part may be used separately
1037-under those permissions, but the entire Program remains governed by
1038-this License without regard to the additional permissions.
1039-
1040- When you convey a copy of a covered work, you may at your option
1041-remove any additional permissions from that copy, or from any part of
1042-it. (Additional permissions may be written to require their own
1043-removal in certain cases when you modify the work.) You may place
1044-additional permissions on material, added by you to a covered work,
1045-for which you have or can give appropriate copyright permission.
1046-
1047- Notwithstanding any other provision of this License, for material you
1048-add to a covered work, you may (if authorized by the copyright holders of
1049-that material) supplement the terms of this License with terms:
1050-
1051- a) Disclaiming warranty or limiting liability differently from the
1052- terms of sections 15 and 16 of this License; or
1053-
1054- b) Requiring preservation of specified reasonable legal notices or
1055- author attributions in that material or in the Appropriate Legal
1056- Notices displayed by works containing it; or
1057-
1058- c) Prohibiting misrepresentation of the origin of that material, or
1059- requiring that modified versions of such material be marked in
1060- reasonable ways as different from the original version; or
1061-
1062- d) Limiting the use for publicity purposes of names of licensors or
1063- authors of the material; or
1064-
1065- e) Declining to grant rights under trademark law for use of some
1066- trade names, trademarks, or service marks; or
1067-
1068- f) Requiring indemnification of licensors and authors of that
1069- material by anyone who conveys the material (or modified versions of
1070- it) with contractual assumptions of liability to the recipient, for
1071- any liability that these contractual assumptions directly impose on
1072- those licensors and authors.
1073-
1074- All other non-permissive additional terms are considered "further
1075-restrictions" within the meaning of section 10. If the Program as you
1076-received it, or any part of it, contains a notice stating that it is
1077-governed by this License along with a term that is a further
1078-restriction, you may remove that term. If a license document contains
1079-a further restriction but permits relicensing or conveying under this
1080-License, you may add to a covered work material governed by the terms
1081-of that license document, provided that the further restriction does
1082-not survive such relicensing or conveying.
1083-
1084- If you add terms to a covered work in accord with this section, you
1085-must place, in the relevant source files, a statement of the
1086-additional terms that apply to those files, or a notice indicating
1087-where to find the applicable terms.
1088-
1089- Additional terms, permissive or non-permissive, may be stated in the
1090-form of a separately written license, or stated as exceptions;
1091-the above requirements apply either way.
1092-
1093- 8. Termination.
1094-
1095- You may not propagate or modify a covered work except as expressly
1096-provided under this License. Any attempt otherwise to propagate or
1097-modify it is void, and will automatically terminate your rights under
1098-this License (including any patent licenses granted under the third
1099-paragraph of section 11).
1100-
1101- However, if you cease all violation of this License, then your
1102-license from a particular copyright holder is reinstated (a)
1103-provisionally, unless and until the copyright holder explicitly and
1104-finally terminates your license, and (b) permanently, if the copyright
1105-holder fails to notify you of the violation by some reasonable means
1106-prior to 60 days after the cessation.
1107-
1108- Moreover, your license from a particular copyright holder is
1109-reinstated permanently if the copyright holder notifies you of the
1110-violation by some reasonable means, this is the first time you have
1111-received notice of violation of this License (for any work) from that
1112-copyright holder, and you cure the violation prior to 30 days after
1113-your receipt of the notice.
1114-
1115- Termination of your rights under this section does not terminate the
1116-licenses of parties who have received copies or rights from you under
1117-this License. If your rights have been terminated and not permanently
1118-reinstated, you do not qualify to receive new licenses for the same
1119-material under section 10.
1120-
1121- 9. Acceptance Not Required for Having Copies.
1122-
1123- You are not required to accept this License in order to receive or
1124-run a copy of the Program. Ancillary propagation of a covered work
1125-occurring solely as a consequence of using peer-to-peer transmission
1126-to receive a copy likewise does not require acceptance. However,
1127-nothing other than this License grants you permission to propagate or
1128-modify any covered work. These actions infringe copyright if you do
1129-not accept this License. Therefore, by modifying or propagating a
1130-covered work, you indicate your acceptance of this License to do so.
1131-
1132- 10. Automatic Licensing of Downstream Recipients.
1133-
1134- Each time you convey a covered work, the recipient automatically
1135-receives a license from the original licensors, to run, modify and
1136-propagate that work, subject to this License. You are not responsible
1137-for enforcing compliance by third parties with this License.
1138-
1139- An "entity transaction" is a transaction transferring control of an
1140-organization, or substantially all assets of one, or subdividing an
1141-organization, or merging organizations. If propagation of a covered
1142-work results from an entity transaction, each party to that
1143-transaction who receives a copy of the work also receives whatever
1144-licenses to the work the party's predecessor in interest had or could
1145-give under the previous paragraph, plus a right to possession of the
1146-Corresponding Source of the work from the predecessor in interest, if
1147-the predecessor has it or can get it with reasonable efforts.
1148-
1149- You may not impose any further restrictions on the exercise of the
1150-rights granted or affirmed under this License. For example, you may
1151-not impose a license fee, royalty, or other charge for exercise of
1152-rights granted under this License, and you may not initiate litigation
1153-(including a cross-claim or counterclaim in a lawsuit) alleging that
1154-any patent claim is infringed by making, using, selling, offering for
1155-sale, or importing the Program or any portion of it.
1156-
1157- 11. Patents.
1158-
1159- A "contributor" is a copyright holder who authorizes use under this
1160-License of the Program or a work on which the Program is based. The
1161-work thus licensed is called the contributor's "contributor version".
1162-
1163- A contributor's "essential patent claims" are all patent claims
1164-owned or controlled by the contributor, whether already acquired or
1165-hereafter acquired, that would be infringed by some manner, permitted
1166-by this License, of making, using, or selling its contributor version,
1167-but do not include claims that would be infringed only as a
1168-consequence of further modification of the contributor version. For
1169-purposes of this definition, "control" includes the right to grant
1170-patent sublicenses in a manner consistent with the requirements of
1171-this License.
1172-
1173- Each contributor grants you a non-exclusive, worldwide, royalty-free
1174-patent license under the contributor's essential patent claims, to
1175-make, use, sell, offer for sale, import and otherwise run, modify and
1176-propagate the contents of its contributor version.
1177-
1178- In the following three paragraphs, a "patent license" is any express
1179-agreement or commitment, however denominated, not to enforce a patent
1180-(such as an express permission to practice a patent or covenant not to
1181-sue for patent infringement). To "grant" such a patent license to a
1182-party means to make such an agreement or commitment not to enforce a
1183-patent against the party.
1184-
1185- If you convey a covered work, knowingly relying on a patent license,
1186-and the Corresponding Source of the work is not available for anyone
1187-to copy, free of charge and under the terms of this License, through a
1188-publicly available network server or other readily accessible means,
1189-then you must either (1) cause the Corresponding Source to be so
1190-available, or (2) arrange to deprive yourself of the benefit of the
1191-patent license for this particular work, or (3) arrange, in a manner
1192-consistent with the requirements of this License, to extend the patent
1193-license to downstream recipients. "Knowingly relying" means you have
1194-actual knowledge that, but for the patent license, your conveying the
1195-covered work in a country, or your recipient's use of the covered work
1196-in a country, would infringe one or more identifiable patents in that
1197-country that you have reason to believe are valid.
1198-
1199- If, pursuant to or in connection with a single transaction or
1200-arrangement, you convey, or propagate by procuring conveyance of, a
1201-covered work, and grant a patent license to some of the parties
1202-receiving the covered work authorizing them to use, propagate, modify
1203-or convey a specific copy of the covered work, then the patent license
1204-you grant is automatically extended to all recipients of the covered
1205-work and works based on it.
1206-
1207- A patent license is "discriminatory" if it does not include within
1208-the scope of its coverage, prohibits the exercise of, or is
1209-conditioned on the non-exercise of one or more of the rights that are
1210-specifically granted under this License. You may not convey a covered
1211-work if you are a party to an arrangement with a third party that is
1212-in the business of distributing software, under which you make payment
1213-to the third party based on the extent of your activity of conveying
1214-the work, and under which the third party grants, to any of the
1215-parties who would receive the covered work from you, a discriminatory
1216-patent license (a) in connection with copies of the covered work
1217-conveyed by you (or copies made from those copies), or (b) primarily
1218-for and in connection with specific products or compilations that
1219-contain the covered work, unless you entered into that arrangement,
1220-or that patent license was granted, prior to 28 March 2007.
1221-
1222- Nothing in this License shall be construed as excluding or limiting
1223-any implied license or other defenses to infringement that may
1224-otherwise be available to you under applicable patent law.
1225-
1226- 12. No Surrender of Others' Freedom.
1227-
1228- If conditions are imposed on you (whether by court order, agreement or
1229-otherwise) that contradict the conditions of this License, they do not
1230-excuse you from the conditions of this License. If you cannot convey a
1231-covered work so as to satisfy simultaneously your obligations under this
1232-License and any other pertinent obligations, then as a consequence you may
1233-not convey it at all. For example, if you agree to terms that obligate you
1234-to collect a royalty for further conveying from those to whom you convey
1235-the Program, the only way you could satisfy both those terms and this
1236-License would be to refrain entirely from conveying the Program.
1237-
1238- 13. Use with the GNU Affero General Public License.
1239-
1240- Notwithstanding any other provision of this License, you have
1241-permission to link or combine any covered work with a work licensed
1242-under version 3 of the GNU Affero General Public License into a single
1243-combined work, and to convey the resulting work. The terms of this
1244-License will continue to apply to the part which is the covered work,
1245-but the special requirements of the GNU Affero General Public License,
1246-section 13, concerning interaction through a network will apply to the
1247-combination as such.
1248-
1249- 14. Revised Versions of this License.
1250-
1251- The Free Software Foundation may publish revised and/or new versions of
1252-the GNU General Public License from time to time. Such new versions will
1253-be similar in spirit to the present version, but may differ in detail to
1254-address new problems or concerns.
1255-
1256- Each version is given a distinguishing version number. If the
1257-Program specifies that a certain numbered version of the GNU General
1258-Public License "or any later version" applies to it, you have the
1259-option of following the terms and conditions either of that numbered
1260-version or of any later version published by the Free Software
1261-Foundation. If the Program does not specify a version number of the
1262-GNU General Public License, you may choose any version ever published
1263-by the Free Software Foundation.
1264-
1265- If the Program specifies that a proxy can decide which future
1266-versions of the GNU General Public License can be used, that proxy's
1267-public statement of acceptance of a version permanently authorizes you
1268-to choose that version for the Program.
1269-
1270- Later license versions may give you additional or different
1271-permissions. However, no additional obligations are imposed on any
1272-author or copyright holder as a result of your choosing to follow a
1273-later version.
1274-
1275- 15. Disclaimer of Warranty.
1276-
1277- THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
1278-APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
1279-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
1280-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
1281-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
1282-PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
1283-IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
1284-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
1285-
1286- 16. Limitation of Liability.
1287-
1288- IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
1289-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
1290-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
1291-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
1292-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
1293-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
1294-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
1295-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
1296-SUCH DAMAGES.
1297-
1298- 17. Interpretation of Sections 15 and 16.
1299-
1300- If the disclaimer of warranty and limitation of liability provided
1301-above cannot be given local legal effect according to their terms,
1302-reviewing courts shall apply local law that most closely approximates
1303-an absolute waiver of all civil liability in connection with the
1304-Program, unless a warranty or assumption of liability accompanies a
1305-copy of the Program in return for a fee.
1306-
1307- END OF TERMS AND CONDITIONS
1308-
1309- How to Apply These Terms to Your New Programs
1310-
1311- If you develop a new program, and you want it to be of the greatest
1312-possible use to the public, the best way to achieve this is to make it
1313-free software which everyone can redistribute and change under these terms.
1314-
1315- To do so, attach the following notices to the program. It is safest
1316-to attach them to the start of each source file to most effectively
1317-state the exclusion of warranty; and each file should have at least
1318-the "copyright" line and a pointer to where the full notice is found.
1319-
1320- <one line to give the program's name and a brief idea of what it does.>
1321- Copyright (C) <year> <name of author>
1322-
1323- This program is free software: you can redistribute it and/or modify
1324- it under the terms of the GNU General Public License as published by
1325- the Free Software Foundation, either version 3 of the License, or
1326- (at your option) any later version.
1327-
1328- This program is distributed in the hope that it will be useful,
1329- but WITHOUT ANY WARRANTY; without even the implied warranty of
1330- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1331- GNU General Public License for more details.
1332-
1333- You should have received a copy of the GNU General Public License
1334- along with this program. If not, see <http://www.gnu.org/licenses/>.
1335-
1336-Also add information on how to contact you by electronic and paper mail.
1337-
1338- If the program does terminal interaction, make it output a short
1339-notice like this when it starts in an interactive mode:
1340-
1341- <program> Copyright (C) <year> <name of author>
1342- This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
1343- This is free software, and you are welcome to redistribute it
1344- under certain conditions; type `show c' for details.
1345-
1346-The hypothetical commands `show w' and `show c' should show the appropriate
1347-parts of the General Public License. Of course, your program's commands
1348-might be different; for a GUI interface, you would use an "about box".
1349-
1350- You should also get your employer (if you work as a programmer) or school,
1351-if any, to sign a "copyright disclaimer" for the program, if necessary.
1352-For more information on this, and how to apply and follow the GNU GPL, see
1353-<http://www.gnu.org/licenses/>.
1354-
1355- The GNU General Public License does not permit incorporating your program
1356-into proprietary programs. If your program is a subroutine library, you
1357-may consider it more useful to permit linking proprietary applications with
1358-the library. If this is what you want to do, use the GNU Lesser General
1359-Public License instead of this License. But first, please read
1360-<http://www.gnu.org/philosophy/why-not-lgpl.html>.
1361-
1362
1363=== modified file 'PKG-INFO'
1364--- PKG-INFO 2010-07-29 12:47:10 +0000
1365+++ PKG-INFO 2010-09-14 17:29:44 +0000
1366@@ -1,6 +1,6 @@
1367 Metadata-Version: 1.1
1368 Name: magicicada
1369-Version: 0.1.3
1370+Version: 0.2
1371 Summary: A GTK+ frontend for the "Chicharra" part of Ubuntu One.
1372 Home-page: https://launchpad.net/magicicada
1373 Author: Natalia Bidart
1374
1375=== added file 'README.txt'
1376--- README.txt 1970-01-01 00:00:00 +0000
1377+++ README.txt 2010-09-14 17:29:44 +0000
1378@@ -0,0 +1,56 @@
1379+This is Magicicada!
1380+
1381+A GTK+ frontend for the "Chicharra" part of Ubuntu One client.
1382+
1383+
1384+
1385+HOWTO do a source release
1386+-------------------------
1387+
1388+ * edit setup.py and increment the version number.
1389+ * 'python setup.py sdist'
1390+ * look at the contents of the tarball created in dist/ to be sure they are ok
1391+ * step into the dist directory for the following commands
1392+ * sign the tarball by a command like:
1393+ gpg -a --detach-sign magicicada-VERSION.tar.gz
1394+ this should create a file like magicicada-VERSION.tar.gz.asc
1395+ * Upload the new release to launchpad with a command like:
1396+ lp-project-upload magicicada VERSION magicicada-VERSION.tar.gz
1397+ * Announce the release, ping someone to build updated packages for the PPA and Ubuntu.
1398+
1399+
1400+HOWTO prepare an updated Ubuntu package
1401+---------------------------------------
1402+
1403+ * bzr get lp:ubuntu/magicicada
1404+ * cd magicicada
1405+ * uscan --verbose --rename (this gets the new upstream release from launchpad)
1406+ * bzr merge-upstream ../magicicada_VERSION.orig.tar.gz --version=VERSION lp:magicicada
1407+
1408+Now, the action depends on where to release: You will need to build versions
1409+for lucid (for the PPA) and for the current dev release of Ubuntu. On each
1410+case you'll need to edit debian/changelog and check version, distro, etc.
1411+
1412+For the chicharrero sPPA:
1413+
1414+ * The version depends on the distro:
1415+
1416+ magicicada-VERSION-0ubuntu1~lucid1
1417+ magicicada-VERSION-0ubuntu1~maverick1
1418+
1419+ * debuild -S -sa
1420+ * dput ppa:chicharreros/ppa <source.changes>
1421+
1422+
1423+For the version to upload to Ubuntu Universe:
1424+
1425+ * The version number would be magicicada-VERSION-0ubuntu1.
1426+ * Don't forget to put "LP: #XXXXXX" in the message, LP does stuff with it
1427+ * Push the changes to lp:~USER/ubuntu/maverick/magicicada/VERSION-update
1428+ * Open it with 'bzr lp-open', propose it to merge, and set
1429+ the 'reviewer' to "ubuntu-sponsors".
1430+ * File a bug in Launchpad:
1431+
1432+ http://bugs.launchpad.net/ubuntu/+source/magicicada/+filebug
1433+
1434+ and subscribe it (not "assign") to 'ubuntu-sponsors'
1435
1436=== removed file 'README.txt'
1437--- README.txt 2010-07-29 12:47:10 +0000
1438+++ README.txt 1970-01-01 00:00:00 +0000
1439@@ -1,32 +0,0 @@
1440-This is Magicicada!
1441-
1442-A GTK+ frontend for the "Chicharra" part of Ubuntu One client.
1443-
1444-
1445-
1446-HOWTO do a source release
1447--------------------------
1448-
1449- * edit setup.py and increment the version number.
1450- * 'python setup.py sdist'
1451- * look at the contents of the tarball created in dist/ to be sure they are ok
1452- * step into the dist directory for the following commands
1453- * sign the tarball by a command like:
1454- gpg -a --detach-sign magicicada-VERSION.tar.gz
1455- this should create a file like magicicada-VERSION.tar.gz.asc
1456- * Upload the new release to launchpad with a command like:
1457- lp-project-upload magicicada VERSION magicicada-VERSION.tar.gz
1458- * Announce the release, ping someone to build updated packages for the PPA and Ubuntu.
1459-
1460-
1461-HOWTO prepare an updated Ubuntu package
1462----------------------------------------
1463-
1464- * bzr get lp:ubuntu/magicicada
1465- * cd magicicada
1466- * uscan --verbose --rename (this gets the new upstream release from launchpad)
1467- * bzr merge-package ../magicicada_0.1.2.orig.tar.gz --version=0.1.2
1468- * vim debian/changelog, check version, distro, and changes are correct.
1469- * you will need to build versions for lucid (for the PPA) and for the current dev release of Ubuntu. For example, if you are working on updating to release 0.1.2 of magicicada, and you want to build a package for lucid in the chicharreros PPA, the version number would be magicicada-0.1.2-0ubuntu1~lucid1. Then for the maverick version in the PPA, the version number would be magicicada-0.1.2-0ubuntu1~maverick1. And, for the version you upload to ubuntu universe, the version number would be magicicada-0.1.2-0ubuntu1.
1470- * To upload to the chicharreros PPA: do dput ppa:chicharreros/ppa <source.changes>
1471- * To get an upload into Ubuntu, prepare the source package and ask for a sponsor.
1472
1473=== added directory 'bin'
1474=== removed directory 'bin'
1475=== added file 'bin/magicicada'
1476--- bin/magicicada 1970-01-01 00:00:00 +0000
1477+++ bin/magicicada 2010-09-14 17:29:44 +0000
1478@@ -0,0 +1,57 @@
1479+#!/usr/bin/python
1480+# -*- coding: utf-8 -*-
1481+#
1482+# Copyright 2010 Chicharreros
1483+#
1484+# This program is free software: you can redistribute it and/or modify it
1485+# under the terms of the GNU General Public License version 3, as published
1486+# by the Free Software Foundation.
1487+#
1488+# This program is distributed in the hope that it will be useful, but
1489+# WITHOUT ANY WARRANTY; without even the implied warranties of
1490+# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
1491+# PURPOSE. See the GNU General Public License for more details.
1492+#
1493+# You should have received a copy of the GNU General Public License along
1494+# with this program. If not, see <http://www.gnu.org/licenses/>.
1495+
1496+"""Script to run Magicicada."""
1497+
1498+import sys
1499+import os
1500+
1501+import gettext
1502+from gettext import gettext as _
1503+gettext.textdomain('magicicada')
1504+
1505+# Add project root directory (enable symlink, and trunk execution).
1506+PROJECT_ROOT_DIRECTORY = os.path.abspath(
1507+ os.path.dirname(os.path.dirname(os.path.realpath(sys.argv[0]))))
1508+
1509+if (os.path.exists(os.path.join(PROJECT_ROOT_DIRECTORY, 'magicicada'))
1510+ and PROJECT_ROOT_DIRECTORY not in sys.path):
1511+ sys.path.insert(0, PROJECT_ROOT_DIRECTORY)
1512+ os.putenv('PYTHONPATH', PROJECT_ROOT_DIRECTORY) # for subprocesses
1513+
1514+from magicicada import MagicicadaUI
1515+
1516+if __name__ == "__main__":
1517+ # Support for command line options.
1518+ import logging
1519+ import optparse
1520+ parser = optparse.OptionParser(version="%prog %ver")
1521+ parser.add_option(
1522+ "-v", "--verbose", action="store_true", dest="verbose",
1523+ help=_("Show debug messages"))
1524+ (options, args) = parser.parse_args()
1525+
1526+ # Set the logging level to show debug messages.
1527+ if options.verbose:
1528+ logging.basicConfig(level=logging.DEBUG)
1529+ logging.debug('logging enabled')
1530+
1531+ from twisted.internet import reactor
1532+
1533+ # Run the application.
1534+ window = MagicicadaUI(on_destroy=lambda *a, **kw: reactor.stop())
1535+ reactor.run()
1536
1537=== removed file 'bin/magicicada'
1538--- bin/magicicada 2010-07-09 18:14:53 +0000
1539+++ bin/magicicada 1970-01-01 00:00:00 +0000
1540@@ -1,57 +0,0 @@
1541-#!/usr/bin/python
1542-# -*- coding: utf-8 -*-
1543-#
1544-# Copyright 2010 Chicharreros
1545-#
1546-# This program is free software: you can redistribute it and/or modify it
1547-# under the terms of the GNU General Public License version 3, as published
1548-# by the Free Software Foundation.
1549-#
1550-# This program is distributed in the hope that it will be useful, but
1551-# WITHOUT ANY WARRANTY; without even the implied warranties of
1552-# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
1553-# PURPOSE. See the GNU General Public License for more details.
1554-#
1555-# You should have received a copy of the GNU General Public License along
1556-# with this program. If not, see <http://www.gnu.org/licenses/>.
1557-
1558-"""Script to run Magicicada."""
1559-
1560-import sys
1561-import os
1562-
1563-import gettext
1564-from gettext import gettext as _
1565-gettext.textdomain('magicicada')
1566-
1567-# Add project root directory (enable symlink, and trunk execution).
1568-PROJECT_ROOT_DIRECTORY = os.path.abspath(
1569- os.path.dirname(os.path.dirname(os.path.realpath(sys.argv[0]))))
1570-
1571-if (os.path.exists(os.path.join(PROJECT_ROOT_DIRECTORY, 'magicicada'))
1572- and PROJECT_ROOT_DIRECTORY not in sys.path):
1573- sys.path.insert(0, PROJECT_ROOT_DIRECTORY)
1574- os.putenv('PYTHONPATH', PROJECT_ROOT_DIRECTORY) # for subprocesses
1575-
1576-from magicicada import MagicicadaUI
1577-
1578-if __name__ == "__main__":
1579- # Support for command line options.
1580- import logging
1581- import optparse
1582- parser = optparse.OptionParser(version="%prog %ver")
1583- parser.add_option(
1584- "-v", "--verbose", action="store_true", dest="verbose",
1585- help=_("Show debug messages"))
1586- (options, args) = parser.parse_args()
1587-
1588- # Set the logging level to show debug messages.
1589- if options.verbose:
1590- logging.basicConfig(level=logging.DEBUG)
1591- logging.debug('logging enabled')
1592-
1593- from twisted.internet import reactor
1594-
1595- # Run the application.
1596- window = MagicicadaUI(on_destroy=lambda *a, **kw: reactor.stop())
1597- reactor.run()
1598
1599=== added directory 'data'
1600=== removed directory 'data'
1601=== added directory 'data/media'
1602=== removed directory 'data/media'
1603=== added file 'data/media/active-016.png'
1604Binary files data/media/active-016.png 1970-01-01 00:00:00 +0000 and data/media/active-016.png 2010-09-14 17:29:44 +0000 differ
1605=== removed file 'data/media/active-016.png'
1606Binary files data/media/active-016.png 2010-06-08 10:53:02 +0000 and data/media/active-016.png 1970-01-01 00:00:00 +0000 differ
1607=== added file 'data/media/active.svg'
1608--- data/media/active.svg 1970-01-01 00:00:00 +0000
1609+++ data/media/active.svg 2010-09-14 17:29:44 +0000
1610@@ -0,0 +1,203 @@
1611+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
1612+<!-- Created with Inkscape (http://www.inkscape.org/) -->
1613+
1614+<svg
1615+ xmlns:dc="http://purl.org/dc/elements/1.1/"
1616+ xmlns:cc="http://creativecommons.org/ns#"
1617+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
1618+ xmlns:svg="http://www.w3.org/2000/svg"
1619+ xmlns="http://www.w3.org/2000/svg"
1620+ xmlns:xlink="http://www.w3.org/1999/xlink"
1621+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
1622+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
1623+ width="425.71429"
1624+ height="461.42856"
1625+ id="svg2"
1626+ sodipodi:version="0.32"
1627+ inkscape:version="0.47 r22583"
1628+ version="1.0"
1629+ sodipodi:docname="active.svg"
1630+ inkscape:output_extension="org.inkscape.output.svg.inkscape">
1631+ <defs
1632+ id="defs4">
1633+ <linearGradient
1634+ id="linearGradient3250">
1635+ <stop
1636+ style="stop-color:#b8b8b8;stop-opacity:0;"
1637+ offset="0"
1638+ id="stop3252" />
1639+ <stop
1640+ id="stop3258"
1641+ offset="0.40588239"
1642+ style="stop-color:#b8b8b8;stop-opacity:1;" />
1643+ <stop
1644+ style="stop-color:#b8b8b8;stop-opacity:0;"
1645+ offset="1"
1646+ id="stop3254" />
1647+ </linearGradient>
1648+ <linearGradient
1649+ id="linearGradient3224">
1650+ <stop
1651+ style="stop-color:#ffffff;stop-opacity:1;"
1652+ offset="0"
1653+ id="stop3226" />
1654+ <stop
1655+ style="stop-color:#c8c8c8;stop-opacity:1;"
1656+ offset="1"
1657+ id="stop3228" />
1658+ </linearGradient>
1659+ <linearGradient
1660+ id="linearGradient3214">
1661+ <stop
1662+ style="stop-color:#3b3b3b;stop-opacity:1;"
1663+ offset="0"
1664+ id="stop3216" />
1665+ <stop
1666+ style="stop-color:#afafaf;stop-opacity:1;"
1667+ offset="1"
1668+ id="stop3218" />
1669+ </linearGradient>
1670+ <linearGradient
1671+ id="linearGradient3176">
1672+ <stop
1673+ style="stop-color:#c1ffb6;stop-opacity:1;"
1674+ offset="0"
1675+ id="stop3178" />
1676+ <stop
1677+ id="stop3184"
1678+ offset="0.40630153"
1679+ style="stop-color:#00e632;stop-opacity:1;" />
1680+ <stop
1681+ style="stop-color:#1c3a4f;stop-opacity:1"
1682+ offset="1"
1683+ id="stop3180" />
1684+ </linearGradient>
1685+ <inkscape:perspective
1686+ sodipodi:type="inkscape:persp3d"
1687+ inkscape:vp_x="0 : 526.18109 : 1"
1688+ inkscape:vp_y="0 : 1000 : 0"
1689+ inkscape:vp_z="744.09448 : 526.18109 : 1"
1690+ inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
1691+ id="perspective10" />
1692+ <inkscape:perspective
1693+ id="perspective2390"
1694+ inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
1695+ inkscape:vp_z="744.09448 : 526.18109 : 1"
1696+ inkscape:vp_y="0 : 1000 : 0"
1697+ inkscape:vp_x="0 : 526.18109 : 1"
1698+ sodipodi:type="inkscape:persp3d" />
1699+ <radialGradient
1700+ inkscape:collect="always"
1701+ xlink:href="#linearGradient3176"
1702+ id="radialGradient3182"
1703+ cx="346.42856"
1704+ cy="338.07645"
1705+ fx="346.42856"
1706+ fy="338.07645"
1707+ r="165.71428"
1708+ gradientUnits="userSpaceOnUse"
1709+ gradientTransform="matrix(-1.2831103,0.3438084,-0.3438084,-1.2831103,907.16815,652.76078)" />
1710+ <radialGradient
1711+ inkscape:collect="always"
1712+ xlink:href="#linearGradient3214"
1713+ id="radialGradient3220"
1714+ cx="317.60519"
1715+ cy="539.41315"
1716+ fx="317.60519"
1717+ fy="539.41315"
1718+ r="165.53342"
1719+ gradientTransform="matrix(1,0,0,0.2054734,0,428.57808)"
1720+ gradientUnits="userSpaceOnUse" />
1721+ <radialGradient
1722+ inkscape:collect="always"
1723+ xlink:href="#linearGradient3224"
1724+ id="radialGradient3230"
1725+ cx="317.60394"
1726+ cy="220.94547"
1727+ fx="317.60394"
1728+ fy="220.94547"
1729+ r="164.06058"
1730+ gradientTransform="matrix(1.0076229,0,0,0.1968921,-2.4553843,177.59098)"
1731+ gradientUnits="userSpaceOnUse" />
1732+ <linearGradient
1733+ inkscape:collect="always"
1734+ xlink:href="#linearGradient3250"
1735+ id="linearGradient3256"
1736+ x1="318.47412"
1737+ y1="651.00037"
1738+ x2="309.90268"
1739+ y2="413.85742"
1740+ gradientUnits="userSpaceOnUse"
1741+ spreadMethod="pad" />
1742+ <radialGradient
1743+ inkscape:collect="always"
1744+ xlink:href="#linearGradient3214"
1745+ id="radialGradient3274"
1746+ gradientUnits="userSpaceOnUse"
1747+ gradientTransform="matrix(1,0,0,0.2054734,11.428571,428.57808)"
1748+ cx="317.60519"
1749+ cy="539.41315"
1750+ fx="317.60519"
1751+ fy="539.41315"
1752+ r="165.53342" />
1753+ <radialGradient
1754+ inkscape:collect="always"
1755+ xlink:href="#linearGradient3224"
1756+ id="radialGradient3276"
1757+ gradientUnits="userSpaceOnUse"
1758+ gradientTransform="matrix(1.0076229,0,0,0.1922742,8.9731871,177.85367)"
1759+ cx="317.60394"
1760+ cy="220.94547"
1761+ fx="317.60394"
1762+ fy="220.94547"
1763+ r="164.06058" />
1764+ </defs>
1765+ <sodipodi:namedview
1766+ id="base"
1767+ pagecolor="#ffffff"
1768+ bordercolor="#666666"
1769+ borderopacity="1.0"
1770+ gridtolerance="10000"
1771+ guidetolerance="10"
1772+ objecttolerance="10"
1773+ inkscape:pageopacity="0.0"
1774+ inkscape:pageshadow="2"
1775+ inkscape:zoom="0.70710678"
1776+ inkscape:cx="577.43933"
1777+ inkscape:cy="433.43027"
1778+ inkscape:document-units="px"
1779+ inkscape:current-layer="layer1"
1780+ showgrid="false"
1781+ inkscape:window-width="1250"
1782+ inkscape:window-height="775"
1783+ inkscape:window-x="0"
1784+ inkscape:window-y="0"
1785+ inkscape:window-maximized="1" />
1786+ <metadata
1787+ id="metadata7">
1788+ <rdf:RDF>
1789+ <cc:Work
1790+ rdf:about="">
1791+ <dc:format>image/svg+xml</dc:format>
1792+ <dc:type
1793+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
1794+ </cc:Work>
1795+ </rdf:RDF>
1796+ </metadata>
1797+ <g
1798+ inkscape:label="Layer 1"
1799+ inkscape:groupmode="layer"
1800+ id="layer1"
1801+ transform="translate(-105.61697,-158.14316)">
1802+ <path
1803+ sodipodi:type="arc"
1804+ style="opacity:1;fill:url(#radialGradient3182);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
1805+ id="path2396"
1806+ sodipodi:cx="323.57144"
1807+ sodipodi:cy="389.50504"
1808+ sodipodi:rx="165.71428"
1809+ sodipodi:ry="165.71428"
1810+ d="m 489.28572,389.50504 c 0,91.52146 -74.19281,165.71427 -165.71428,165.71427 -91.52147,0 -165.71428,-74.19281 -165.71428,-165.71427 0,-91.52147 74.19281,-165.71428 165.71428,-165.71428 91.52147,0 165.71428,74.19281 165.71428,165.71428 z"
1811+ transform="translate(5.643371,-11.272676)" />
1812+ </g>
1813+</svg>
1814
1815=== removed file 'data/media/active.svg'
1816--- data/media/active.svg 2010-06-08 10:53:02 +0000
1817+++ data/media/active.svg 1970-01-01 00:00:00 +0000
1818@@ -1,203 +0,0 @@
1819-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
1820-<!-- Created with Inkscape (http://www.inkscape.org/) -->
1821-
1822-<svg
1823- xmlns:dc="http://purl.org/dc/elements/1.1/"
1824- xmlns:cc="http://creativecommons.org/ns#"
1825- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
1826- xmlns:svg="http://www.w3.org/2000/svg"
1827- xmlns="http://www.w3.org/2000/svg"
1828- xmlns:xlink="http://www.w3.org/1999/xlink"
1829- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
1830- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
1831- width="425.71429"
1832- height="461.42856"
1833- id="svg2"
1834- sodipodi:version="0.32"
1835- inkscape:version="0.47 r22583"
1836- version="1.0"
1837- sodipodi:docname="active.svg"
1838- inkscape:output_extension="org.inkscape.output.svg.inkscape">
1839- <defs
1840- id="defs4">
1841- <linearGradient
1842- id="linearGradient3250">
1843- <stop
1844- style="stop-color:#b8b8b8;stop-opacity:0;"
1845- offset="0"
1846- id="stop3252" />
1847- <stop
1848- id="stop3258"
1849- offset="0.40588239"
1850- style="stop-color:#b8b8b8;stop-opacity:1;" />
1851- <stop
1852- style="stop-color:#b8b8b8;stop-opacity:0;"
1853- offset="1"
1854- id="stop3254" />
1855- </linearGradient>
1856- <linearGradient
1857- id="linearGradient3224">
1858- <stop
1859- style="stop-color:#ffffff;stop-opacity:1;"
1860- offset="0"
1861- id="stop3226" />
1862- <stop
1863- style="stop-color:#c8c8c8;stop-opacity:1;"
1864- offset="1"
1865- id="stop3228" />
1866- </linearGradient>
1867- <linearGradient
1868- id="linearGradient3214">
1869- <stop
1870- style="stop-color:#3b3b3b;stop-opacity:1;"
1871- offset="0"
1872- id="stop3216" />
1873- <stop
1874- style="stop-color:#afafaf;stop-opacity:1;"
1875- offset="1"
1876- id="stop3218" />
1877- </linearGradient>
1878- <linearGradient
1879- id="linearGradient3176">
1880- <stop
1881- style="stop-color:#c1ffb6;stop-opacity:1;"
1882- offset="0"
1883- id="stop3178" />
1884- <stop
1885- id="stop3184"
1886- offset="0.40630153"
1887- style="stop-color:#00e632;stop-opacity:1;" />
1888- <stop
1889- style="stop-color:#1c3a4f;stop-opacity:1"
1890- offset="1"
1891- id="stop3180" />
1892- </linearGradient>
1893- <inkscape:perspective
1894- sodipodi:type="inkscape:persp3d"
1895- inkscape:vp_x="0 : 526.18109 : 1"
1896- inkscape:vp_y="0 : 1000 : 0"
1897- inkscape:vp_z="744.09448 : 526.18109 : 1"
1898- inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
1899- id="perspective10" />
1900- <inkscape:perspective
1901- id="perspective2390"
1902- inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
1903- inkscape:vp_z="744.09448 : 526.18109 : 1"
1904- inkscape:vp_y="0 : 1000 : 0"
1905- inkscape:vp_x="0 : 526.18109 : 1"
1906- sodipodi:type="inkscape:persp3d" />
1907- <radialGradient
1908- inkscape:collect="always"
1909- xlink:href="#linearGradient3176"
1910- id="radialGradient3182"
1911- cx="346.42856"
1912- cy="338.07645"
1913- fx="346.42856"
1914- fy="338.07645"
1915- r="165.71428"
1916- gradientUnits="userSpaceOnUse"
1917- gradientTransform="matrix(-1.2831103,0.3438084,-0.3438084,-1.2831103,907.16815,652.76078)" />
1918- <radialGradient
1919- inkscape:collect="always"
1920- xlink:href="#linearGradient3214"
1921- id="radialGradient3220"
1922- cx="317.60519"
1923- cy="539.41315"
1924- fx="317.60519"
1925- fy="539.41315"
1926- r="165.53342"
1927- gradientTransform="matrix(1,0,0,0.2054734,0,428.57808)"
1928- gradientUnits="userSpaceOnUse" />
1929- <radialGradient
1930- inkscape:collect="always"
1931- xlink:href="#linearGradient3224"
1932- id="radialGradient3230"
1933- cx="317.60394"
1934- cy="220.94547"
1935- fx="317.60394"
1936- fy="220.94547"
1937- r="164.06058"
1938- gradientTransform="matrix(1.0076229,0,0,0.1968921,-2.4553843,177.59098)"
1939- gradientUnits="userSpaceOnUse" />
1940- <linearGradient
1941- inkscape:collect="always"
1942- xlink:href="#linearGradient3250"
1943- id="linearGradient3256"
1944- x1="318.47412"
1945- y1="651.00037"
1946- x2="309.90268"
1947- y2="413.85742"
1948- gradientUnits="userSpaceOnUse"
1949- spreadMethod="pad" />
1950- <radialGradient
1951- inkscape:collect="always"
1952- xlink:href="#linearGradient3214"
1953- id="radialGradient3274"
1954- gradientUnits="userSpaceOnUse"
1955- gradientTransform="matrix(1,0,0,0.2054734,11.428571,428.57808)"
1956- cx="317.60519"
1957- cy="539.41315"
1958- fx="317.60519"
1959- fy="539.41315"
1960- r="165.53342" />
1961- <radialGradient
1962- inkscape:collect="always"
1963- xlink:href="#linearGradient3224"
1964- id="radialGradient3276"
1965- gradientUnits="userSpaceOnUse"
1966- gradientTransform="matrix(1.0076229,0,0,0.1922742,8.9731871,177.85367)"
1967- cx="317.60394"
1968- cy="220.94547"
1969- fx="317.60394"
1970- fy="220.94547"
1971- r="164.06058" />
1972- </defs>
1973- <sodipodi:namedview
1974- id="base"
1975- pagecolor="#ffffff"
1976- bordercolor="#666666"
1977- borderopacity="1.0"
1978- gridtolerance="10000"
1979- guidetolerance="10"
1980- objecttolerance="10"
1981- inkscape:pageopacity="0.0"
1982- inkscape:pageshadow="2"
1983- inkscape:zoom="0.70710678"
1984- inkscape:cx="577.43933"
1985- inkscape:cy="433.43027"
1986- inkscape:document-units="px"
1987- inkscape:current-layer="layer1"
1988- showgrid="false"
1989- inkscape:window-width="1250"
1990- inkscape:window-height="775"
1991- inkscape:window-x="0"
1992- inkscape:window-y="0"
1993- inkscape:window-maximized="1" />
1994- <metadata
1995- id="metadata7">
1996- <rdf:RDF>
1997- <cc:Work
1998- rdf:about="">
1999- <dc:format>image/svg+xml</dc:format>
2000- <dc:type
2001- rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
2002- </cc:Work>
2003- </rdf:RDF>
2004- </metadata>
2005- <g
2006- inkscape:label="Layer 1"
2007- inkscape:groupmode="layer"
2008- id="layer1"
2009- transform="translate(-105.61697,-158.14316)">
2010- <path
2011- sodipodi:type="arc"
2012- style="opacity:1;fill:url(#radialGradient3182);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
2013- id="path2396"
2014- sodipodi:cx="323.57144"
2015- sodipodi:cy="389.50504"
2016- sodipodi:rx="165.71428"
2017- sodipodi:ry="165.71428"
2018- d="m 489.28572,389.50504 c 0,91.52146 -74.19281,165.71427 -165.71428,165.71427 -91.52147,0 -165.71428,-74.19281 -165.71428,-165.71427 0,-91.52147 74.19281,-165.71428 165.71428,-165.71428 91.52147,0 165.71428,74.19281 165.71428,165.71428 z"
2019- transform="translate(5.643371,-11.272676)" />
2020- </g>
2021-</svg>
2022
2023=== added symlink 'data/media/icon.png'
2024=== target is u'logo-032.png'
2025=== removed symlink 'data/media/icon.png'
2026=== target was u'logo-032.png'
2027=== added file 'data/media/loader-ball.gif'
2028Binary files data/media/loader-ball.gif 1970-01-01 00:00:00 +0000 and data/media/loader-ball.gif 2010-09-14 17:29:44 +0000 differ
2029=== removed file 'data/media/loader-ball.gif'
2030Binary files data/media/loader-ball.gif 2010-06-08 10:53:02 +0000 and data/media/loader-ball.gif 1970-01-01 00:00:00 +0000 differ
2031=== added file 'data/media/logo-014.png'
2032Binary files data/media/logo-014.png 1970-01-01 00:00:00 +0000 and data/media/logo-014.png 2010-09-14 17:29:44 +0000 differ
2033=== removed file 'data/media/logo-014.png'
2034Binary files data/media/logo-014.png 2010-06-08 10:53:02 +0000 and data/media/logo-014.png 1970-01-01 00:00:00 +0000 differ
2035=== added file 'data/media/logo-016.png'
2036Binary files data/media/logo-016.png 1970-01-01 00:00:00 +0000 and data/media/logo-016.png 2010-09-14 17:29:44 +0000 differ
2037=== removed file 'data/media/logo-016.png'
2038Binary files data/media/logo-016.png 2010-06-08 10:53:02 +0000 and data/media/logo-016.png 1970-01-01 00:00:00 +0000 differ
2039=== added file 'data/media/logo-032.png'
2040Binary files data/media/logo-032.png 1970-01-01 00:00:00 +0000 and data/media/logo-032.png 2010-09-14 17:29:44 +0000 differ
2041=== removed file 'data/media/logo-032.png'
2042Binary files data/media/logo-032.png 2010-06-08 10:53:02 +0000 and data/media/logo-032.png 1970-01-01 00:00:00 +0000 differ
2043=== added file 'data/media/logo-064.png'
2044Binary files data/media/logo-064.png 1970-01-01 00:00:00 +0000 and data/media/logo-064.png 2010-09-14 17:29:44 +0000 differ
2045=== removed file 'data/media/logo-064.png'
2046Binary files data/media/logo-064.png 2010-06-08 10:53:02 +0000 and data/media/logo-064.png 1970-01-01 00:00:00 +0000 differ
2047=== added file 'data/media/logo-128.png'
2048Binary files data/media/logo-128.png 1970-01-01 00:00:00 +0000 and data/media/logo-128.png 2010-09-14 17:29:44 +0000 differ
2049=== removed file 'data/media/logo-128.png'
2050Binary files data/media/logo-128.png 2010-06-08 10:53:02 +0000 and data/media/logo-128.png 1970-01-01 00:00:00 +0000 differ
2051=== added file 'data/media/logo-192.png'
2052Binary files data/media/logo-192.png 1970-01-01 00:00:00 +0000 and data/media/logo-192.png 2010-09-14 17:29:44 +0000 differ
2053=== removed file 'data/media/logo-192.png'
2054Binary files data/media/logo-192.png 2010-06-08 10:53:02 +0000 and data/media/logo-192.png 1970-01-01 00:00:00 +0000 differ
2055=== added file 'data/media/logo.svg'
2056--- data/media/logo.svg 1970-01-01 00:00:00 +0000
2057+++ data/media/logo.svg 2010-09-14 17:29:44 +0000
2058@@ -0,0 +1,630 @@
2059+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
2060+<!-- Created with Inkscape (http://www.inkscape.org/) -->
2061+
2062+<svg
2063+ xmlns:dc="http://purl.org/dc/elements/1.1/"
2064+ xmlns:cc="http://creativecommons.org/ns#"
2065+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
2066+ xmlns:svg="http://www.w3.org/2000/svg"
2067+ xmlns="http://www.w3.org/2000/svg"
2068+ xmlns:xlink="http://www.w3.org/1999/xlink"
2069+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
2070+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
2071+ width="784.8244"
2072+ height="784.10883"
2073+ id="svg2"
2074+ version="1.1"
2075+ inkscape:version="0.47 r22583"
2076+ sodipodi:docname="logo.svg">
2077+ <defs
2078+ id="defs4">
2079+ <linearGradient
2080+ id="linearGradient6036">
2081+ <stop
2082+ id="stop6038"
2083+ offset="0"
2084+ style="stop-color:#ff0000;stop-opacity:1;" />
2085+ <stop
2086+ id="stop6040"
2087+ offset="0.15040193"
2088+ style="stop-color:#ffbf00;stop-opacity:0.97647059;" />
2089+ <stop
2090+ style="stop-color:#ffff00;stop-opacity:0.96862745;"
2091+ offset="0.27645355"
2092+ id="stop6042" />
2093+ <stop
2094+ id="stop6044"
2095+ offset="0.40514705"
2096+ style="stop-color:#bfff00;stop-opacity:0.96078431;" />
2097+ <stop
2098+ style="stop-color:#3fff00;stop-opacity:0.94509804;"
2099+ offset="0.54492491"
2100+ id="stop6046" />
2101+ <stop
2102+ id="stop6048"
2103+ offset="0.65421808"
2104+ style="stop-color:#00df1f;stop-opacity:0.92941176;" />
2105+ <stop
2106+ id="stop6050"
2107+ offset="0.77951556"
2108+ style="stop-color:#00bf3f;stop-opacity:0.92156863;" />
2109+ <stop
2110+ id="stop6052"
2111+ offset="0.88955659"
2112+ style="stop-color:#007f7f;stop-opacity:0.90588235;" />
2113+ <stop
2114+ style="stop-color:#0000ff;stop-opacity:0.87450981;"
2115+ offset="1"
2116+ id="stop6054" />
2117+ </linearGradient>
2118+ <linearGradient
2119+ id="linearGradient6010">
2120+ <stop
2121+ id="stop6012"
2122+ offset="0"
2123+ style="stop-color:#ff0000;stop-opacity:1;" />
2124+ <stop
2125+ style="stop-color:#ff7f00;stop-opacity:0.98431373;"
2126+ offset="0.13393337"
2127+ id="stop6014" />
2128+ <stop
2129+ id="stop6016"
2130+ offset="0.23890866"
2131+ style="stop-color:#ffbf00;stop-opacity:0.97647059;" />
2132+ <stop
2133+ style="stop-color:#ffff00;stop-opacity:0.96862745;"
2134+ offset="0.37702307"
2135+ id="stop6018" />
2136+ <stop
2137+ id="stop6020"
2138+ offset="0.42686233"
2139+ style="stop-color:#dfff00;stop-opacity:0.96470588;" />
2140+ <stop
2141+ id="stop6022"
2142+ offset="0.51511705"
2143+ style="stop-color:#bfff00;stop-opacity:0.96078431;" />
2144+ <stop
2145+ style="stop-color:#3fff00;stop-opacity:0.94509804;"
2146+ offset="0.60455"
2147+ id="stop6024" />
2148+ <stop
2149+ id="stop6026"
2150+ offset="0.67739385"
2151+ style="stop-color:#00df1f;stop-opacity:0.92941176;" />
2152+ <stop
2153+ id="stop6028"
2154+ offset="0.74737048"
2155+ style="stop-color:#00bf3f;stop-opacity:0.92156863;" />
2156+ <stop
2157+ style="stop-color:#009f5f;stop-opacity:0.91372549;"
2158+ offset="0.81486219"
2159+ id="stop6030" />
2160+ <stop
2161+ id="stop6032"
2162+ offset="0.86383885"
2163+ style="stop-color:#007f7f;stop-opacity:0.90588235;" />
2164+ <stop
2165+ style="stop-color:#0000ff;stop-opacity:0.87450981;"
2166+ offset="1"
2167+ id="stop6034" />
2168+ </linearGradient>
2169+ <inkscape:perspective
2170+ sodipodi:type="inkscape:persp3d"
2171+ inkscape:vp_x="0 : 526.18109 : 1"
2172+ inkscape:vp_y="0 : 1000 : 0"
2173+ inkscape:vp_z="744.09448 : 526.18109 : 1"
2174+ inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
2175+ id="perspective10" />
2176+ <inkscape:perspective
2177+ id="perspective2905"
2178+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
2179+ inkscape:vp_z="1 : 0.5 : 1"
2180+ inkscape:vp_y="0 : 1000 : 0"
2181+ inkscape:vp_x="0 : 0.5 : 1"
2182+ sodipodi:type="inkscape:persp3d" />
2183+ <inkscape:perspective
2184+ id="perspective2948"
2185+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
2186+ inkscape:vp_z="1 : 0.5 : 1"
2187+ inkscape:vp_y="0 : 1000 : 0"
2188+ inkscape:vp_x="0 : 0.5 : 1"
2189+ sodipodi:type="inkscape:persp3d" />
2190+ <inkscape:perspective
2191+ id="perspective3740"
2192+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
2193+ inkscape:vp_z="1 : 0.5 : 1"
2194+ inkscape:vp_y="0 : 1000 : 0"
2195+ inkscape:vp_x="0 : 0.5 : 1"
2196+ sodipodi:type="inkscape:persp3d" />
2197+ <inkscape:perspective
2198+ id="perspective2872"
2199+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
2200+ inkscape:vp_z="1 : 0.5 : 1"
2201+ inkscape:vp_y="0 : 1000 : 0"
2202+ inkscape:vp_x="0 : 0.5 : 1"
2203+ sodipodi:type="inkscape:persp3d" />
2204+ <linearGradient
2205+ inkscape:collect="always"
2206+ xlink:href="#linearGradient6010"
2207+ id="linearGradient3775"
2208+ x1="1867.9991"
2209+ y1="391.83505"
2210+ x2="2113.4824"
2211+ y2="391.83505"
2212+ gradientUnits="userSpaceOnUse" />
2213+ <linearGradient
2214+ inkscape:collect="always"
2215+ xlink:href="#linearGradient6010"
2216+ id="linearGradient3777"
2217+ x1="1822.2806"
2218+ y1="509.23386"
2219+ x2="2067.0618"
2220+ y2="509.23386"
2221+ gradientUnits="userSpaceOnUse" />
2222+ <linearGradient
2223+ inkscape:collect="always"
2224+ xlink:href="#linearGradient6010"
2225+ id="linearGradient3779"
2226+ x1="1550.7804"
2227+ y1="561.81555"
2228+ x2="1888.9661"
2229+ y2="561.81555"
2230+ gradientUnits="userSpaceOnUse" />
2231+ <linearGradient
2232+ inkscape:collect="always"
2233+ xlink:href="#linearGradient6010"
2234+ id="linearGradient3781"
2235+ x1="1564.0616"
2236+ y1="720.4718"
2237+ x2="1703.3741"
2238+ y2="720.4718"
2239+ gradientUnits="userSpaceOnUse" />
2240+ <linearGradient
2241+ inkscape:collect="always"
2242+ xlink:href="#linearGradient6010"
2243+ id="linearGradient3783"
2244+ x1="1517.1554"
2245+ y1="660.521"
2246+ x2="1841.8"
2247+ y2="660.521"
2248+ gradientUnits="userSpaceOnUse" />
2249+ <linearGradient
2250+ inkscape:collect="always"
2251+ xlink:href="#linearGradient6010"
2252+ id="linearGradient3785"
2253+ x1="1519.3741"
2254+ y1="503.64713"
2255+ x2="1744.6722"
2256+ y2="503.64713"
2257+ gradientUnits="userSpaceOnUse" />
2258+ <linearGradient
2259+ inkscape:collect="always"
2260+ xlink:href="#linearGradient6010"
2261+ id="linearGradient3787"
2262+ x1="2037.218"
2263+ y1="46.237438"
2264+ x2="2133.968"
2265+ y2="46.237438"
2266+ gradientUnits="userSpaceOnUse" />
2267+ <linearGradient
2268+ inkscape:collect="always"
2269+ xlink:href="#linearGradient6010"
2270+ id="linearGradient3789"
2271+ x1="1803.3429"
2272+ y1="216.79991"
2273+ x2="1965.9542"
2274+ y2="216.79991"
2275+ gradientUnits="userSpaceOnUse" />
2276+ <linearGradient
2277+ inkscape:collect="always"
2278+ xlink:href="#linearGradient6010"
2279+ id="linearGradient3791"
2280+ x1="1772.3429"
2281+ y1="281.62592"
2282+ x2="2026.1866"
2283+ y2="281.62592"
2284+ gradientUnits="userSpaceOnUse" />
2285+ <linearGradient
2286+ inkscape:collect="always"
2287+ xlink:href="#linearGradient6010"
2288+ id="linearGradient3793"
2289+ x1="2000.7491"
2290+ y1="83.488998"
2291+ x2="2177.7493"
2292+ y2="83.488998"
2293+ gradientUnits="userSpaceOnUse" />
2294+ <linearGradient
2295+ inkscape:collect="always"
2296+ xlink:href="#linearGradient6010"
2297+ id="linearGradient3795"
2298+ x1="1933.0292"
2299+ y1="191.26004"
2300+ x2="2188.7668"
2301+ y2="191.26004"
2302+ gradientUnits="userSpaceOnUse" />
2303+ <linearGradient
2304+ inkscape:collect="always"
2305+ xlink:href="#linearGradient6010"
2306+ id="linearGradient3797"
2307+ x1="1956.7218"
2308+ y1="305.36465"
2309+ x2="2159.1868"
2310+ y2="305.36465"
2311+ gradientUnits="userSpaceOnUse" />
2312+ <linearGradient
2313+ inkscape:collect="always"
2314+ xlink:href="#linearGradient6010"
2315+ id="linearGradient3799"
2316+ x1="1674.0616"
2317+ y1="420.89871"
2318+ x2="1941.7629"
2319+ y2="420.89871"
2320+ gradientUnits="userSpaceOnUse" />
2321+ <inkscape:perspective
2322+ id="perspective5910"
2323+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
2324+ inkscape:vp_z="1 : 0.5 : 1"
2325+ inkscape:vp_y="0 : 1000 : 0"
2326+ inkscape:vp_x="0 : 0.5 : 1"
2327+ sodipodi:type="inkscape:persp3d" />
2328+ <linearGradient
2329+ inkscape:collect="always"
2330+ xlink:href="#linearGradient5835"
2331+ id="linearGradient5841"
2332+ x1="233.53571"
2333+ y1="549.50507"
2334+ x2="695.03571"
2335+ y2="549.50507"
2336+ gradientUnits="userSpaceOnUse" />
2337+ <linearGradient
2338+ id="linearGradient5835">
2339+ <stop
2340+ style="stop-color:#ff0000;stop-opacity:1;"
2341+ offset="0"
2342+ id="stop5837" />
2343+ <stop
2344+ style="stop-color:#ffbf00;stop-opacity:0.97647059;"
2345+ offset="0.16954298"
2346+ id="stop5865" />
2347+ <stop
2348+ id="stop5851"
2349+ offset="0.25013462"
2350+ style="stop-color:#ffff00;stop-opacity:0.96862745;" />
2351+ <stop
2352+ style="stop-color:#bfff00;stop-opacity:0.96078431;"
2353+ offset="0.40514705"
2354+ id="stop5867" />
2355+ <stop
2356+ id="stop5877"
2357+ offset="0.5521028"
2358+ style="stop-color:#3fff00;stop-opacity:0.94509804;" />
2359+ <stop
2360+ style="stop-color:#00df1f;stop-opacity:0.92941176;"
2361+ offset="0.70446336"
2362+ id="stop5875" />
2363+ <stop
2364+ style="stop-color:#00bf3f;stop-opacity:0.92156863;"
2365+ offset="0.77951556"
2366+ id="stop5871" />
2367+ <stop
2368+ style="stop-color:#007f7f;stop-opacity:0.90588235;"
2369+ offset="0.92305344"
2370+ id="stop5863" />
2371+ <stop
2372+ id="stop5847"
2373+ offset="1"
2374+ style="stop-color:#0000ff;stop-opacity:0.87450981;" />
2375+ </linearGradient>
2376+ <linearGradient
2377+ y2="549.50507"
2378+ x2="695.03571"
2379+ y1="549.50507"
2380+ x1="233.53571"
2381+ gradientUnits="userSpaceOnUse"
2382+ id="linearGradient5931"
2383+ xlink:href="#linearGradient6010"
2384+ inkscape:collect="always" />
2385+ <linearGradient
2386+ inkscape:collect="always"
2387+ xlink:href="#linearGradient6010"
2388+ id="linearGradient6008"
2389+ x1="594.60907"
2390+ y1="353.40845"
2391+ x2="1266.2205"
2392+ y2="353.40845"
2393+ gradientUnits="userSpaceOnUse" />
2394+ <linearGradient
2395+ inkscape:collect="always"
2396+ xlink:href="#linearGradient5835"
2397+ id="linearGradient6056"
2398+ gradientUnits="userSpaceOnUse"
2399+ x1="594.60907"
2400+ y1="353.40845"
2401+ x2="1266.2205"
2402+ y2="353.40845" />
2403+ <linearGradient
2404+ inkscape:collect="always"
2405+ xlink:href="#linearGradient6010"
2406+ id="linearGradient6058"
2407+ gradientUnits="userSpaceOnUse"
2408+ x1="594.60907"
2409+ y1="353.40845"
2410+ x2="1266.2205"
2411+ y2="353.40845" />
2412+ <linearGradient
2413+ inkscape:collect="always"
2414+ xlink:href="#linearGradient6010"
2415+ id="linearGradient6060"
2416+ gradientUnits="userSpaceOnUse"
2417+ x1="594.60907"
2418+ y1="353.40845"
2419+ x2="1266.2205"
2420+ y2="353.40845" />
2421+ <linearGradient
2422+ inkscape:collect="always"
2423+ xlink:href="#linearGradient6010"
2424+ id="linearGradient6062"
2425+ gradientUnits="userSpaceOnUse"
2426+ x1="594.60907"
2427+ y1="353.40845"
2428+ x2="1266.2205"
2429+ y2="353.40845" />
2430+ <linearGradient
2431+ inkscape:collect="always"
2432+ xlink:href="#linearGradient6010"
2433+ id="linearGradient6064"
2434+ gradientUnits="userSpaceOnUse"
2435+ x1="594.60907"
2436+ y1="353.40845"
2437+ x2="1266.2205"
2438+ y2="353.40845" />
2439+ <linearGradient
2440+ inkscape:collect="always"
2441+ xlink:href="#linearGradient6010"
2442+ id="linearGradient6066"
2443+ gradientUnits="userSpaceOnUse"
2444+ x1="594.60907"
2445+ y1="353.40845"
2446+ x2="1266.2205"
2447+ y2="353.40845" />
2448+ <linearGradient
2449+ inkscape:collect="always"
2450+ xlink:href="#linearGradient6010"
2451+ id="linearGradient6068"
2452+ gradientUnits="userSpaceOnUse"
2453+ x1="594.60907"
2454+ y1="353.40845"
2455+ x2="1266.2205"
2456+ y2="353.40845" />
2457+ <linearGradient
2458+ inkscape:collect="always"
2459+ xlink:href="#linearGradient6010"
2460+ id="linearGradient6070"
2461+ gradientUnits="userSpaceOnUse"
2462+ x1="594.60907"
2463+ y1="353.40845"
2464+ x2="1266.2205"
2465+ y2="353.40845" />
2466+ <linearGradient
2467+ inkscape:collect="always"
2468+ xlink:href="#linearGradient6010"
2469+ id="linearGradient6072"
2470+ gradientUnits="userSpaceOnUse"
2471+ x1="594.60907"
2472+ y1="353.40845"
2473+ x2="1266.2205"
2474+ y2="353.40845" />
2475+ <linearGradient
2476+ inkscape:collect="always"
2477+ xlink:href="#linearGradient6010"
2478+ id="linearGradient6074"
2479+ gradientUnits="userSpaceOnUse"
2480+ x1="594.60907"
2481+ y1="353.40845"
2482+ x2="1266.2205"
2483+ y2="353.40845" />
2484+ <linearGradient
2485+ inkscape:collect="always"
2486+ xlink:href="#linearGradient6010"
2487+ id="linearGradient6076"
2488+ gradientUnits="userSpaceOnUse"
2489+ x1="594.60907"
2490+ y1="353.40845"
2491+ x2="1266.2205"
2492+ y2="353.40845" />
2493+ <linearGradient
2494+ inkscape:collect="always"
2495+ xlink:href="#linearGradient6010"
2496+ id="linearGradient6078"
2497+ gradientUnits="userSpaceOnUse"
2498+ x1="594.60907"
2499+ y1="353.40845"
2500+ x2="1266.2205"
2501+ y2="353.40845" />
2502+ <linearGradient
2503+ inkscape:collect="always"
2504+ xlink:href="#linearGradient6010"
2505+ id="linearGradient6080"
2506+ gradientUnits="userSpaceOnUse"
2507+ x1="594.60907"
2508+ y1="353.40845"
2509+ x2="1266.2205"
2510+ y2="353.40845" />
2511+ </defs>
2512+ <sodipodi:namedview
2513+ id="base"
2514+ pagecolor="#ffffff"
2515+ bordercolor="#666666"
2516+ borderopacity="1.0"
2517+ inkscape:pageopacity="0.0"
2518+ inkscape:pageshadow="2"
2519+ inkscape:zoom="0.45281676"
2520+ inkscape:cx="108.47293"
2521+ inkscape:cy="319.89813"
2522+ inkscape:document-units="px"
2523+ inkscape:current-layer="layer1"
2524+ showgrid="false"
2525+ inkscape:window-width="1380"
2526+ inkscape:window-height="875"
2527+ inkscape:window-x="30"
2528+ inkscape:window-y="0"
2529+ inkscape:window-maximized="1"
2530+ showborder="false" />
2531+ <metadata
2532+ id="metadata7">
2533+ <rdf:RDF>
2534+ <cc:Work
2535+ rdf:about="">
2536+ <dc:format>image/svg+xml</dc:format>
2537+ <dc:type
2538+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
2539+ <dc:title></dc:title>
2540+ </cc:Work>
2541+ </rdf:RDF>
2542+ </metadata>
2543+ <g
2544+ inkscape:label="Capa 1"
2545+ inkscape:groupmode="layer"
2546+ id="layer1"
2547+ transform="translate(-939.21814,94.69993)">
2548+ <path
2549+ style="color:#000000;fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.5714916px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
2550+ d=""
2551+ id="path3772" />
2552+ <path
2553+ style="color:#000000;fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.5714916px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
2554+ d=""
2555+ id="path3774" />
2556+ <path
2557+ style="color:#000000;fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.5714916px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
2558+ d=""
2559+ id="path3776" />
2560+ <path
2561+ style="color:#000000;fill:#55ff55;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.5714916px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
2562+ d=""
2563+ id="path3864"
2564+ transform="translate(939.21814,-94.69993)" />
2565+ <path
2566+ style="color:#000000;fill:#7fff2a;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.5714916px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
2567+ d=""
2568+ id="path3886"
2569+ transform="translate(939.21814,-94.69993)" />
2570+ <path
2571+ style="fill:#000000"
2572+ d="m 349.08468,846.90605 c 0.26917,10.7682 3.2281,21.30128 7.9375,30.90625 20.46429,-10.79074 26.0108,-35.28275 35.125,-54.875 6.20007,-14.24125 12.82573,-30.33655 26.5625,-38.78125 1.58611,-0.4174 6.39597,-3.3676 4.84375,0.625 -2.19091,16.535 -11.81523,31.4283 -15.86937,46.23719 0.81854,14.2695 -15.6966,12.97272 -9.13063,35.29406 7.83221,14.15213 27.26199,16.11051 41.3125,11.1875 17.25691,-7.58089 35.86376,-11.04582 53.92492,-16.28831 25.14777,-7.07842 50.84819,-13.47303 74.56626,-24.4093 31.24631,-24.55204 70.89713,-36.37274 100.69632,-63.05234 21.97923,-15.0095 41.83869,-33.9648 67.53125,-42.5938 29.21493,-13.0907 54.01114,-35.8582 84.78125,-45.9062 4.75508,-5.2173 11.73563,-9.2063 13.71875,-16.6563 14.63684,-11.1457 -14.59993,6.2284 -22.09375,8.875 -4.77817,2.4994 -13.13233,5.3388 -15.96875,-1.2187 -5.8151,-4.7879 -28.72679,-10.5161 -40.61584,-14.2408 -6.65387,-4.5106 -17.08712,-10.6388 -13.63416,-19.6968 5.90007,-19.1913 23.71274,-31.6622 40.59124,-40.4593 9.6801,-5.0391 20.85081,-7.1229 31.62751,-4.9781 9.40465,0.4529 17.77799,-7.5951 17.4375,-17.0938 1.29543,-11.1981 -1.73524,-23.1209 3,-33.6562 27.92405,-21.0104 64.37995,-21.772 97.82525,-25.4466 16.2585,-1.3349 32.4519,-4.199 48.1435,-8.2097 8.5671,-1.2676 17.4661,5.1766 17.3125,14.1875 1.65252,10.9769 -4.087,21.1727 -11.5129,28.67 -3.7866,5.7712 -8.4485,11.2367 -15.0183,13.6738 -27.7535,18.9167 -63.0765,15.9836 -95.1562,15.9108 -12.6139,-0.1127 -25.2536,0.3798 -37.7501,2.1829 9.35565,11.8615 25.4177,14.3192 39.6563,12.9375 17.1795,-0.9013 34.0785,-4.9579 51.1875,-5.6562 8.4681,7.1659 22.0677,9.7867 30.6875,1.375 11.8918,-8.7447 20.0476,-21.5467 31.375,-30.7813 8.40132,-9.389 12.75382,-21.3848 21.02592,-30.9794 10.5256,-14.3725 19.1114,-30.3755 30.3803,-44.1143 6.9187,-5.8613 9.9597,-14.7166 12.6563,-22.9376 4.9385,-8.8188 3.604,-19.7943 8.5044,-28.7499 3.8438,-11.3712 10.8722,-21.1603 16.9956,-31.2813 8.3168,-18.1676 19.265,-35.65521 20.75,-56.03121 0.9855,-6.1022 0.023,-13.2484 0.5312,-18.7188 5.1817,-2.8741 6.2191,-10.0524 9.3304,-14.7806 10.6524,-21.1581 11.6565,-45.3836 16.1307,-68.3712 5.8077,-36.6164 8.5496,-76.0408 -6.1798,-110.9107 -8.8486,-20.6039 -28.6418,-34.2076 -49.9326,-39.485304 -23.7116,-6.0042 -49.4405,-4.1252 -72.2289,4.509604 -98.00342,48.8699 -183.35901,119.6913 -258.64805,198.5468 -17.22945,14.8334 -33.4177,30.6946 -49.31552,46.8352 -78.6551,70.57961 -143.05563,155.02661 -207.92413,238.16261 -39.10861,58.9335 -82.23211,115.9059 -111.77012,180.4144 -3.94725,14.62 -24.16747,45.575 -21.462,58.29795 -1.43956,7.08577 -2.17394,14.27225 -1.9375,21.53125 z m 84.75,13.84375 c 12.19456,-10.36481 27.43507,-16.59452 42.81555,-20.43339 18.33392,-9.87646 36.93366,-19.82574 55.9032,-28.66036 41.11408,-19.9245 83.77577,-36.1306 126.37806,-52.5489 7.61222,-3.1832 15.21211,-6.382 23.18444,-8.4823 -12.92947,10.909 -28.49911,18.0804 -42.35566,27.705 -44.79045,27.78 -92.01196,52.74492 -143.69642,64.67239 -19.861,1.97104 -42.96917,16.88658 -62.22917,17.74756 z m 2.15625,-31.625 c 1.32849,-8.64139 7.93128,-15.75195 13.87523,-21.85125 14.45037,-12.3347 32.93845,-18.7363 48.78189,-29.186 43.24286,-25.4972 85.73746,-52.4123 129.45153,-76.9441 30.70001,-18.4504 63.1991,-38.5234 100.26635,-38.5499 8.11827,0.3333 16.85237,1.6363 24.375,3.375 3.85604,2.0097 10.71973,3.58 14.875,7.5313 9.45738,6.3837 9.37105,22.5028 -1.21875,27.6874 -10.32228,5.5451 -22.32651,6.3887 -33.11131,10.8902 -64.49445,20.2383 -127.14652,46.1279 -189.47387,71.922 -31.04813,13.7115 -60.1996,31.4223 -90.41482,46.7191 -5.20403,1.11575 -12.87373,4.89018 -17.125,0.375 -0.22769,-0.62887 -0.23175,-1.30969 -0.28125,-1.96875 z m 3.03125,-82.28125 c 2.05845,-19.5041 15.12655,-35.1816 26.65625,-50.125 34.9546,-54.7159 70.64072,-109.3294 110.5625,-160.6875 29.80867,-33.2517 51.54343,-74.3295 87.84375,-101.125 4.33677,-3.1584 12.56449,-3.5327 13.84375,3 5.46259,16.7762 -3.69234,33.4147 -9.75,48.6875 -23.2926,49.3671 -68.22953,84.1812 -96.38255,130.4729 -18.36505,41.0458 -56.13664,68.3742 -87.05849,99.6015 -10.32541,8.8655 -18.66953,19.9734 -29.09021,28.5193 -4.41448,3.0506 -10.82713,6.3154 -16,4.3126 -0.54293,-0.7678 -0.51877,-1.7509 -0.625,-2.6563 z m 19.03125,26.4063 c 3.1557,-16.4732 20.87384,-22.2647 31.83314,-32.6061 31.91166,-26.9271 55.1502,-65.111 94.06679,-83.2532 39.31319,-20.1325 79.24089,-39.8051 114.22507,-66.922 25.00706,-16.9893 42.91529,-45.1071 73.34375,-53.0937 7.7929,-1.1146 15.83845,-0.9939 23.3125,-3.7188 13.29069,-2.1448 25.87061,8.9622 27.03125,21.875 1.28574,7.9728 -0.34331,16.4088 -4.34375,23.4688 -12.68375,4.825 -25.69081,8.348 -38.9375,10.9062 -23.15681,7.4568 -35.26022,30.4723 -49.8125,48.1875 -5.90201,6.9554 -13.40537,14.1737 -23.21035,13.7231 -46.55799,6.4308 -86.81567,32.507 -126.9408,55.1887 -38.41015,22.7558 -75.87383,47.4316 -116.59885,65.6819 -1.28502,0.2595 -2.69823,0.8826 -3.96875,0.5626 z m 132.34375,-145.5313 c 13.80462,-35.2687 46.34122,-57.3516 67.70268,-87.4557 16.00341,-20.8253 37.0322,-37.0896 58.39611,-52.5063 25.02598,-18.4092 48.66206,-38.7687 70.98262,-60.1872 19.74619,-17.5693 42.37151,-35.5322 69.51239,-38.6633 6.2927,-0.3166 16.1025,-0.3566 18.1875,7.0938 1.3202,14.4414 -8.8108,26.4222 -15.3438,38.3437 -6.0741,8.2821 -9.6213,19.6623 -19.80162,23.7064 -52.97977,29.9225 -96.13313,74.0288 -144.32338,110.6373 -34.71223,20.18 -65.01076,51.209 -105.40625,59.2813 l 0.0937,-0.25 5e-5,0 z m 102.21875,-158.8437 c 4.72671,-15.0269 0.36909,-30.2945 6.8125,-44.8438 4.16579,-4.0289 10.1314,-5.6576 14.53125,-9.5938 10.95554,-8.9754 22.80599,-13.3035 33.53072,-22.0995 39.63952,-34.98531 72.52538,-77.44861 115.01138,-108.86621 27.1658,-27.1851 73.7483,-29.6957 105.2079,-9.9093 -38.5642,15.0989 -76.7053,34.0757 -106.8125,63.0626 -14.44132,14.1099 -25.67127,31.1666 -41.00157,44.34981 -27.83085,25.7078 -59.41994,47.7547 -87.14345,73.7882 -10.93953,8.6869 -21.78724,19.5725 -36.13623,21.737 -3.34066,-0.5148 -3.8919,-4.876 -4,-7.625 z m 46.5625,-119.62501 c 22.70405,-21.5909 50.38139,-50.7056 73.18269,-75.6378 29.27789,-29.3129 70.25256,-45.6581 111.34856,-48.1748 -69.8759,37.1601 -125.08328,95.2166 -183.125,147.875 -2.5927,1.4466 -4.18548,5.1429 -6.5,6.09381 -3.85015,-6.47121 -14.90923,-2.75251 -12.16838,-12.04751 7.72595,-9.1768 8.72145,-9.6804 17.26213,-18.1087 z m 47.0625,173.21871 c 5.65384,-18.0865 23.88148,-27.6384 39.0283,-36.6769 14.48877,-7.725 29.21785,-15.8647 44.62795,-21.4168 41.7701,-7.1174 81.8242,-23.3848 124.0313,-27.4688 8.24292,-5.2561 18.71842,-2.277 27.93752,-4.0312 12.9401,1.81 22.7923,14.0649 25.3125,26.375 1.8666,8.7106 -5.8669,15.0906 -9.1875,22.375 -3.1785,5.8643 -9.27,9.4133 -12.125,15.6562 -7.5624,9.5248 -21.2509,11.6053 -32.37502,7.8438 -68.9423,-10.9185 -134.9538,26.0771 -203.8687,17.8875 -1.03704,-0.1301 -2.52876,-0.1786 -3.38135,-0.5438 z m 57.21875,142.5937 c 3.19719,4.7141 10.1509,1.2059 14.5313,0.25 25.2349,-7.9562 46.3117,-24.8088 69.6875,-36.6562 6.0021,-4.7061 9.8057,-11.88 15.5937,-16.5938 41.6227,-37.7701 -1.9826,-7.684 -5.5625,-5.3124 -29.3453,20.1735 -64.9496,43.6672 -97.73906,57.7584 -1.34286,0.8054 -3.82736,0.3071 3.48906,0.554 z m 9.4063,-301.12501 c 2.9517,-12.248 14.6204,-19.8059 24.3437,-26.7812 39.1056,-29.0647 83.8706,-49.7174 130.21882,-64.375 3.2991,-1.0193 4.715,-6.4291 0.3125,-6.9062 -16.18632,0.2742 -31.51682,-6.3232 -46.99342,-10.5666 -12.5995,-3.8598 -25.3787,-7.2494 -38.3504,-9.5897 27.409,-12.6065 53.7785,-27.7821 82.71882,-36.4375 32.7958,-7.1278 61.685,-30.0982 96.2761,-28.7116 5.3679,0.8275 12.3279,0.7562 16.2239,4.8991 7.8956,14.8889 6.4045,35.542 -7.25,46.625 -7.6915,6.4993 -16.9127,13.5471 -27.4688,12.4063 -9.652,0.1712 -18.222,5.6054 -27.5312,6.875 -8.5555,-0.693 -17.35,-0.5602 -25.125,3.1874 -4.0604,0.5121 -7.6805,6.1511 -3.625,8.875 8.5829,2.7079 17.498,-1.0547 25.9687,-2.375 11.9587,-2.8614 24.5906,-3.1425 36.1563,-7.4687 9.7775,-1.6041 18.6791,6.8446 22.4687,15.3125 6.1087,13.961 0.2248,29.2948 -6.75,41.7188 -2.3795,5.5312 -5.759,11.0276 -6.4375,17.0624 0.1702,2.4853 2.4385,4.2066 -0.25,6.2813 -11.7217,19.0379 -12.012,42.6672 -20.7812,62.90631 -5.2118,9.3721 -9.6151,21.0713 -21,24.5 -10.3313,3.7163 -21.8936,3.3116 -32.6563,2.8124 -9.9783,-3.0222 -20.357,-0.092 -29.92982,2.6446 -35.8164,2.9172 -71.5321,8.7921 -105.9764,19.168 -5.5724,1.151 -11.8254,-3.0262 -10.3125,-9.1876 1.0407,-16.964 12.1409,-32.1138 24.5,-42.9374 9.6915,-7.7455 22.7962,-7.6486 34,-12.3126 38.2838,-11.55131 76.18492,-24.58571 114.80022,-34.90591 13.9495,-1.8644 28.7272,-2.4934 41.0748,-10.2191 -35.3552,-8.5945 -71.6228,2.3986 -104.94872,13.9152 -28.7153,9.5981 -56.8053,22.0636 -86.7388,26.7411 -14.1843,1.4177 -29.5452,1.0039 -42.375,-5.5313 -2.4954,-1.8552 -4.5825,-4.4913 -4.5625,-7.625 z m 14.3125,-138.8437 c 8.5441,-11.8335 20.724,-20.6674 32.125,-29.7813 17.5733,-11.7737 35.2431,-23.701 51.5312,-37.375 27.6091,-21.7173 56.87452,-44.9657 92.84382,-50.1874 8.2799,-0.6819 18.1361,-4.5114 25.7187,0.1562 0.6018,5.7068 -5.5104,9.6405 -9.125,13.2188 -7.7767,6.6646 -17.6704,9.6781 -27.4504,11.2689 -31.1626,13.7503 -63.29002,25.6753 -93.75472,40.739 -25.7104,15.2293 -42.241,44.5011 -72.0449,52.7421 -0.8944,0.3432 -0.1021,-0.3894 0.1563,-0.7813 z m 52.7187,-17.4687 c 3.0193,-9.8668 13.2023,-14.9101 20.6602,-21.1713 21.6879,-14.6697 47.4261,-21.3365 71.33212,-31.6531 20.6595,-7.6531 40.8523,-16.8161 61.3515,-24.6132 11.2016,-3.9817 24.9102,-1.977 32.4687,7.5626 6.8554,6.9633 8.8591,20.895 -0.7187,26.4062 -10.6085,6.0155 -23.569,3.1361 -35.0216,6.9025 -46.4946,10.3523 -88.02182,39.9818 -136.66592,40.5975 -4.1533,-0.9841 -11.542,0.6773 -13.4063,-4.0312 z"
2573+ id="path2954-0"
2574+ inkscape:export-filename="/tmp/logo-016.png"
2575+ inkscape:export-xdpi="1.84"
2576+ inkscape:export-ydpi="1.84"
2577+ sodipodi:nodetypes="cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc" />
2578+ <g
2579+ id="g2849"
2580+ style="fill:url(#linearGradient6008);fill-opacity:1"
2581+ transform="translate(-150.17112,121.46194)"
2582+ inkscape:export-filename="/tmp/logo-016.png"
2583+ inkscape:export-xdpi="1.84"
2584+ inkscape:export-ydpi="1.84">
2585+ <path
2586+ inkscape:export-ydpi="3.6700001"
2587+ inkscape:export-xdpi="3.6700001"
2588+ inkscape:export-filename="/tmp/logo-032.png"
2589+ id="path3868"
2590+ d="m 751.5153,497.17405 c 17.69893,-6.31836 33.34273,-17.78203 49.44258,-27.46879 41.77847,-26.65775 79.91951,-58.13179 117.96424,-89.74534 22.33543,-18.07868 46.33334,-33.9813 69.78326,-50.53812 13.69242,-12.24771 22.80862,-28.87287 29.67282,-45.6253 1.0868,-2.76713 1.9446,-8.68847 -2.9879,-7.62245 -20.91596,-2.76027 -41.00913,7.2869 -56.37576,20.77951 -30.06757,24.5948 -59.28835,50.10281 -89.7715,74.1683 -26.57256,21.27378 -51.55771,44.32242 -72.85556,70.80882 -15.53362,17.8901 -31.92782,35.53962 -44.87218,55.24337 z"
2591+ style="color:#000000;fill:url(#linearGradient6058);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.5714916px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
2592+ <path
2593+ inkscape:export-ydpi="3.6700001"
2594+ inkscape:export-xdpi="3.6700001"
2595+ inkscape:export-filename="/tmp/logo-032.png"
2596+ id="path3870"
2597+ d="m 1034.3278,314.8303 c -0.8242,2.82259 1.8606,4.04154 4.0821,2.72294 22.4915,-4.0724 44.6295,-10.01178 67.4155,-12.73348 28.6733,-4.65875 57.5985,-7.64174 86.6587,-8.36446 12.3838,-1.23052 23.3907,-9.6213 27.5312,-21.4375 7.7721,-16.29509 11.7368,-33.9564 16.625,-51.2813 -40.9842,7.8833 -80.6393,21.2579 -120.6304,33.1931 -21.1775,6.87837 -42.8904,13.17396 -62.8383,22.9632 -10.5604,8.21665 -17.4111,21.77589 -18.8438,34.9375 z"
2598+ style="color:#000000;fill:url(#linearGradient6060);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.5714916px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
2599+ <path
2600+ inkscape:export-ydpi="3.6700001"
2601+ inkscape:export-xdpi="3.6700001"
2602+ inkscape:export-filename="/tmp/logo-032.png"
2603+ id="path3872"
2604+ d="m 1010.4841,241.7365 c 2.7299,7.5449 12.9126,6.0789 19.2812,6.75 23.645,1.3696 46.959,-3.7725 68.9039,-12.1499 40.1691,-13.3391 80.6429,-29.1157 123.4393,-30.2224 6.8529,-0.018 14.1356,2.1048 20.1256,4.1223 2.7818,-19.6549 18.6428,-37.5156 13.7187,-58.0937 -2.5753,-8.0356 -10.5676,-17.5414 -19.9215,-13.5366 -19.5187,4.0775 -39.4969,10.0049 -59.6722,8.5366 -7.4896,-2.379 -7.6262,-13.7129 -0.8125,-17.0937 10.2229,-7.3346 23.8336,-3.6568 35.2416,-7.865 17.0353,-3.4328 36.3697,-5.7644 48.0905,-20.0922 5.9064,-5.2267 8.5227,-13.0552 6.8397,-20.7898 -0.8638,-5.0648 -1.052,-12.2468 -5.8593,-15.0968 -13.9783,-3.9036 -28.2236,1.8636 -41.5744,5.7518 -42.8206,14.9781 -86.6413,28.8819 -126.7694,50.1544 20.8599,6.66 42.0557,13.0973 63.7813,15.7188 6.3248,-0.7897 12.6531,6.9676 8,12.375 -8.9446,9.5023 -22.4632,12.6004 -34.1089,17.9254 -40.9989,16.594 -81.55,36.2927 -114.4536,66.0434 -1.9051,2.0556 -4.3166,4.5708 -4.25,7.5624 z"
2605+ style="color:#000000;fill:url(#linearGradient6062);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.5714916px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
2606+ <path
2607+ inkscape:export-ydpi="3.6700001"
2608+ inkscape:export-xdpi="3.6700001"
2609+ inkscape:export-filename="/tmp/logo-032.png"
2610+ id="path3874"
2611+ d="m 1078.2028,83.8615 c 9.7606,2.0056 19.9758,-1.5761 29.5664,-3.2636 43.7739,-10.6641 84.5036,-32.3146 129.3274,-39.0896 6.8114,-1.3313 17.4675,-3.37 18.1062,-11.9905 -1.8948,-9.2869 -11.162,-18.7048 -21.2812,-15.125 -27.4665,5.8492 -53.0859,18.4371 -79.453,28.2371 -25.9088,10.6151 -54.1446,19.6642 -74.922,39.0129 -0.5127,0.6108 -1.2825,1.4717 -1.3438,2.2187 z"
2612+ style="color:#000000;fill:url(#linearGradient6064);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.5714916px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
2613+ <path
2614+ inkscape:export-ydpi="3.6700001"
2615+ inkscape:export-xdpi="3.6700001"
2616+ inkscape:export-filename="/tmp/logo-032.png"
2617+ id="path3876"
2618+ d="m 849.79655,348.54905 c 33.18847,-20.32789 61.55413,-47.43615 91.04447,-72.53054 27.47122,-23.95071 52.43983,-50.92671 79.80918,-75.12481 24.619,-20.9604 52.942,-37.319 82.9901,-49.0322 -23.4457,-7.7886 -51.4112,-9.8383 -72.7187,4.5626 -22.1313,14.8065 -40.52244,34.4232 -60.0313,52.25 -34.20639,32.9553 -68.27857,66.42473 -108.10272,92.61277 -5.03998,3.79168 -10.64071,8.04337 -10.17853,15.07468 -1.66479,10.59903 -2.59569,21.52239 -2.8125,32.1875 z"
2619+ style="color:#000000;fill:url(#linearGradient6056);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.5714916px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
2620+ <path
2621+ inkscape:export-ydpi="3.6700001"
2622+ inkscape:export-xdpi="3.6700001"
2623+ inkscape:export-filename="/tmp/logo-032.png"
2624+ id="path3878"
2625+ d="m 880.79655,249.0803 c 3.70944,2.6491 5.42578,-3.8587 8.46372,-4.8806 49.1354,-43.2121 96.18552,-89.1557 150.03633,-126.3694 8.2196,-4.4245 2.4483,-2.7556 -2.875,-1.2188 -23.4068,6.1207 -44.84905,17.9551 -62.21384,34.865 -30.48618,27.547 -58.82169,58.226 -86.9294,88.2445 -2.43147,2.8587 -4.92227,6.1091 -6.48181,9.3593 z"
2626+ style="color:#000000;fill:url(#linearGradient6066);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.5714916px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
2627+ <path
2628+ inkscape:export-ydpi="3.6700001"
2629+ inkscape:export-xdpi="3.6700001"
2630+ inkscape:export-filename="/tmp/logo-032.png"
2631+ id="path3880"
2632+ d="m 1116.8591,32.7678 c 25.5849,-10.6526 50.8528,-22.3941 77.1875,-30.9375 6.4567,-2.8411 12.3915,-6.9044 17.375,-11.9062 -26.2064,2.2628 -52.2545,11.1884 -73.4374,26.9338 -7.9209,5.3916 -15.7255,10.9339 -23.3126,16.7849 0.7291,-0.2917 1.4583,-0.5833 2.1875,-0.875 z"
2633+ style="color:#000000;fill:url(#linearGradient6068);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.5714916px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
2634+ <path
2635+ inkscape:export-ydpi="3.6700001"
2636+ inkscape:export-xdpi="3.6700001"
2637+ inkscape:export-filename="/tmp/logo-032.png"
2638+ id="path3882"
2639+ d="m 597.3903,619.2678 c 17.65974,-12.46149 32.37459,-28.36781 48.50776,-42.76193 27.08538,-25.03567 53.04471,-51.78802 72.07475,-83.69741 24.50069,-37.49877 55.40161,-70.38209 81.15189,-106.89226 11.19732,-17.84724 23.52019,-37.4766 22.98435,-59.3984 -0.45947,-2.40059 -0.5313,-7.9048 -3.59375,-7.8125 -13.52759,9.05859 -23.97477,22.21914 -34.97831,34.12572 -50.89369,60.70315 -96.7254,125.89297 -140.61544,191.90553 -15.42799,24.34711 -32.29232,47.93877 -45.5,73.5625 0.11509,0.18032 -1.36931,2.24562 -0.0312,0.96875 z"
2640+ style="color:#000000;fill:url(#linearGradient6070);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.5714916px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
2641+ <path
2642+ inkscape:export-ydpi="3.6700001"
2643+ inkscape:export-xdpi="3.6700001"
2644+ inkscape:export-filename="/tmp/logo-032.png"
2645+ id="path3884"
2646+ d="m 594.60905,704.67405 c 35.79971,-15.10364 69.49489,-35.20685 105.60325,-49.89906 62.87779,-27.77589 127.74792,-51.05409 192.48146,-73.76268 8.65637,-3.67732 18.53461,-5.83279 25.79029,-11.93201 2.90495,-4.39214 -3.18454,-8.16016 -5.5,-11.28125 -13.71313,-11.37597 -33.26412,-11.46964 -50.0625,-9.125 -36.09904,7.54143 -66.81978,29.3842 -98.83699,46.58989 -51.72783,29.60232 -103.33553,59.70033 -153.88106,91.40029 -6.55309,4.57905 -13.25888,10.55884 -15.59445,18.00982 z"
2647+ style="color:#000000;fill:url(#linearGradient6072);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.5714916px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
2648+ <path
2649+ inkscape:export-ydpi="3.6700001"
2650+ inkscape:export-xdpi="3.6700001"
2651+ inkscape:export-filename="/tmp/logo-032.png"
2652+ id="path3888"
2653+ d="m 645.54655,715.67405 c 35.72193,-10.42551 70.78021,-23.23122 102.96875,-41.78125 10.91159,-6.01259 21.75038,-12.14494 32.3125,-18.75 -47.41496,18.3869 -93.51136,39.66925 -139.3125,61.75 1.34375,-0.40625 2.6875,-0.8125 4.03125,-1.21875 z"
2654+ style="color:#000000;fill:url(#linearGradient6074);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.5714916px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
2655+ <path
2656+ inkscape:export-ydpi="3.6700001"
2657+ inkscape:export-xdpi="3.6700001"
2658+ inkscape:export-filename="/tmp/logo-032.png"
2659+ id="path3890"
2660+ d="m 632.5153,634.2053 c 60.14394,-30.74655 115.66832,-70.8232 177.96875,-97.28125 14.26222,-5.97556 29.35043,-9.39673 44.5,-12.09375 18.95443,-6.17109 28.4865,-25.97596 41.50355,-39.75144 13.57652,-16.00862 34.00127,-23.62201 54.01318,-28.20348 6.19162,-1.89798 15.7533,-3.68127 15.51452,-12.01383 2.08663,-10.98591 -4.02012,-24.31983 -15.59375,-26.53125 -16.90374,0.27667 -33.58361,4.49058 -47.6875,13.9375 -22.9606,15.48193 -41.79786,35.95315 -65.1477,51.00862 -35.74563,24.86524 -75.16047,43.70949 -112.7273,65.52263 -28.46057,18.88652 -49.92871,46.12416 -75.56336,68.41906 -7.01077,6.41829 -14.12156,12.70109 -21.06164,19.17469 1.42708,-0.72917 2.85417,-1.45833 4.28125,-2.1875 z"
2661+ style="color:#000000;fill:url(#linearGradient6076);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.5714916px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
2662+ <path
2663+ inkscape:export-ydpi="3.6700001"
2664+ inkscape:export-xdpi="3.6700001"
2665+ inkscape:export-filename="/tmp/logo-032.png"
2666+ id="path3892"
2667+ d="m 899.79655,525.6428 c 3.51089,7.82332 13.2238,9.26496 20.09375,13 10.79867,2.80411 21.65609,5.63079 30.90625,12.09375 5.11243,4.54553 10.33545,-1.21207 15.35186,-3.0042 39.48479,-19.22194 79.01709,-39.09854 114.46069,-65.33955 -27.154,-1.42919 -54.6501,1.25915 -81.5938,-2.71875 -6.84472,-1.83715 -14.6702,-8.46744 -12.6875,-16.09375 4.38512,-5.41078 12.4788,-2.62909 18.4944,-4.24386 30.8382,-2.55598 62.2768,-0.71955 92.6251,-7.11835 21.4753,-5.9014 40.2441,-22.70775 47.068,-43.95029 -0.5436,-4.58705 -5.3064,-7.60544 -8.7187,-10.1875 -5.8774,-2.94298 -12.1394,1.78838 -18.2813,1.625 -36.7565,6.15401 -74.7601,7.77894 -110.3125,19.03125 -9.7045,3.55183 -17.78411,12.04656 -18.71875,22.5625 -2.37586,11.56234 -0.38446,26.01529 -9.9375,34.71875 -9.86563,7.03084 -22.96979,1.75056 -33.54415,6.93604 -18.46505,6.38579 -36.58846,18.72192 -44.4246,37.22021 -0.50221,1.79331 -1.02655,3.61709 -0.78125,5.46875 z"
2668+ style="color:#000000;fill:url(#linearGradient6078);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.5714916px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
2669+ <path
2670+ inkscape:export-ydpi="3.6700001"
2671+ inkscape:export-xdpi="3.6700001"
2672+ inkscape:export-filename="/tmp/logo-032.png"
2673+ id="path3894"
2674+ d="m 945.4528,396.54905 c 22.4751,1.38692 44.82133,-2.89278 66.9854,-5.76396 34.7809,-6.04143 69.5064,-13.86385 105.0146,-12.99513 16.1655,-0.39189 33.1503,2.07772 48.6563,-2.86591 10.8635,-5.891 16.1867,-17.84527 23.1562,-27.53125 4.4328,-8.52492 -0.6092,-18.27302 -7.4687,-23.59375 -7.9505,-7.64738 -19.8734,-6.25667 -29.888,-4.38602 -42.6818,6.87561 -84.727,17.60627 -126.112,29.91727 -22.1097,6.70955 -43.24672,16.65481 -61.80645,30.65386 -6.62998,4.90758 -13.30481,10.50103 -18.53735,16.56489 z"
2675+ style="color:#000000;fill:url(#linearGradient6080);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.5714916px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
2676+ </g>
2677+ <path
2678+ transform="translate(33.252667,-741.24731)"
2679+ sodipodi:type="arc"
2680+ style="color:#000000;fill:url(#linearGradient5931);fill-opacity:1.0;fill-rule:nonzero;stroke:#967b71;stroke-width:1.50000000000000000;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
2681+ id="path5313"
2682+ sodipodi:cx="464.28571"
2683+ sodipodi:cy="549.50507"
2684+ sodipodi:rx="230"
2685+ sodipodi:ry="225.71428"
2686+ d="m 694.28571,549.50507 c 0,124.65855 -102.97451,225.71428 -230,225.71428 -127.0255,0 -230,-101.05573 -230,-225.71428 0,-124.65856 102.9745,-225.71428 230,-225.71428 127.02549,0 230,101.05572 230,225.71428 z" />
2687+ </g>
2688+</svg>
2689
2690=== removed file 'data/media/logo.svg'
2691--- data/media/logo.svg 2010-06-08 10:53:02 +0000
2692+++ data/media/logo.svg 1970-01-01 00:00:00 +0000
2693@@ -1,630 +0,0 @@
2694-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
2695-<!-- Created with Inkscape (http://www.inkscape.org/) -->
2696-
2697-<svg
2698- xmlns:dc="http://purl.org/dc/elements/1.1/"
2699- xmlns:cc="http://creativecommons.org/ns#"
2700- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
2701- xmlns:svg="http://www.w3.org/2000/svg"
2702- xmlns="http://www.w3.org/2000/svg"
2703- xmlns:xlink="http://www.w3.org/1999/xlink"
2704- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
2705- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
2706- width="784.8244"
2707- height="784.10883"
2708- id="svg2"
2709- version="1.1"
2710- inkscape:version="0.47 r22583"
2711- sodipodi:docname="logo.svg">
2712- <defs
2713- id="defs4">
2714- <linearGradient
2715- id="linearGradient6036">
2716- <stop
2717- id="stop6038"
2718- offset="0"
2719- style="stop-color:#ff0000;stop-opacity:1;" />
2720- <stop
2721- id="stop6040"
2722- offset="0.15040193"
2723- style="stop-color:#ffbf00;stop-opacity:0.97647059;" />
2724- <stop
2725- style="stop-color:#ffff00;stop-opacity:0.96862745;"
2726- offset="0.27645355"
2727- id="stop6042" />
2728- <stop
2729- id="stop6044"
2730- offset="0.40514705"
2731- style="stop-color:#bfff00;stop-opacity:0.96078431;" />
2732- <stop
2733- style="stop-color:#3fff00;stop-opacity:0.94509804;"
2734- offset="0.54492491"
2735- id="stop6046" />
2736- <stop
2737- id="stop6048"
2738- offset="0.65421808"
2739- style="stop-color:#00df1f;stop-opacity:0.92941176;" />
2740- <stop
2741- id="stop6050"
2742- offset="0.77951556"
2743- style="stop-color:#00bf3f;stop-opacity:0.92156863;" />
2744- <stop
2745- id="stop6052"
2746- offset="0.88955659"
2747- style="stop-color:#007f7f;stop-opacity:0.90588235;" />
2748- <stop
2749- style="stop-color:#0000ff;stop-opacity:0.87450981;"
2750- offset="1"
2751- id="stop6054" />
2752- </linearGradient>
2753- <linearGradient
2754- id="linearGradient6010">
2755- <stop
2756- id="stop6012"
2757- offset="0"
2758- style="stop-color:#ff0000;stop-opacity:1;" />
2759- <stop
2760- style="stop-color:#ff7f00;stop-opacity:0.98431373;"
2761- offset="0.13393337"
2762- id="stop6014" />
2763- <stop
2764- id="stop6016"
2765- offset="0.23890866"
2766- style="stop-color:#ffbf00;stop-opacity:0.97647059;" />
2767- <stop
2768- style="stop-color:#ffff00;stop-opacity:0.96862745;"
2769- offset="0.37702307"
2770- id="stop6018" />
2771- <stop
2772- id="stop6020"
2773- offset="0.42686233"
2774- style="stop-color:#dfff00;stop-opacity:0.96470588;" />
2775- <stop
2776- id="stop6022"
2777- offset="0.51511705"
2778- style="stop-color:#bfff00;stop-opacity:0.96078431;" />
2779- <stop
2780- style="stop-color:#3fff00;stop-opacity:0.94509804;"
2781- offset="0.60455"
2782- id="stop6024" />
2783- <stop
2784- id="stop6026"
2785- offset="0.67739385"
2786- style="stop-color:#00df1f;stop-opacity:0.92941176;" />
2787- <stop
2788- id="stop6028"
2789- offset="0.74737048"
2790- style="stop-color:#00bf3f;stop-opacity:0.92156863;" />
2791- <stop
2792- style="stop-color:#009f5f;stop-opacity:0.91372549;"
2793- offset="0.81486219"
2794- id="stop6030" />
2795- <stop
2796- id="stop6032"
2797- offset="0.86383885"
2798- style="stop-color:#007f7f;stop-opacity:0.90588235;" />
2799- <stop
2800- style="stop-color:#0000ff;stop-opacity:0.87450981;"
2801- offset="1"
2802- id="stop6034" />
2803- </linearGradient>
2804- <inkscape:perspective
2805- sodipodi:type="inkscape:persp3d"
2806- inkscape:vp_x="0 : 526.18109 : 1"
2807- inkscape:vp_y="0 : 1000 : 0"
2808- inkscape:vp_z="744.09448 : 526.18109 : 1"
2809- inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
2810- id="perspective10" />
2811- <inkscape:perspective
2812- id="perspective2905"
2813- inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
2814- inkscape:vp_z="1 : 0.5 : 1"
2815- inkscape:vp_y="0 : 1000 : 0"
2816- inkscape:vp_x="0 : 0.5 : 1"
2817- sodipodi:type="inkscape:persp3d" />
2818- <inkscape:perspective
2819- id="perspective2948"
2820- inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
2821- inkscape:vp_z="1 : 0.5 : 1"
2822- inkscape:vp_y="0 : 1000 : 0"
2823- inkscape:vp_x="0 : 0.5 : 1"
2824- sodipodi:type="inkscape:persp3d" />
2825- <inkscape:perspective
2826- id="perspective3740"
2827- inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
2828- inkscape:vp_z="1 : 0.5 : 1"
2829- inkscape:vp_y="0 : 1000 : 0"
2830- inkscape:vp_x="0 : 0.5 : 1"
2831- sodipodi:type="inkscape:persp3d" />
2832- <inkscape:perspective
2833- id="perspective2872"
2834- inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
2835- inkscape:vp_z="1 : 0.5 : 1"
2836- inkscape:vp_y="0 : 1000 : 0"
2837- inkscape:vp_x="0 : 0.5 : 1"
2838- sodipodi:type="inkscape:persp3d" />
2839- <linearGradient
2840- inkscape:collect="always"
2841- xlink:href="#linearGradient6010"
2842- id="linearGradient3775"
2843- x1="1867.9991"
2844- y1="391.83505"
2845- x2="2113.4824"
2846- y2="391.83505"
2847- gradientUnits="userSpaceOnUse" />
2848- <linearGradient
2849- inkscape:collect="always"
2850- xlink:href="#linearGradient6010"
2851- id="linearGradient3777"
2852- x1="1822.2806"
2853- y1="509.23386"
2854- x2="2067.0618"
2855- y2="509.23386"
2856- gradientUnits="userSpaceOnUse" />
2857- <linearGradient
2858- inkscape:collect="always"
2859- xlink:href="#linearGradient6010"
2860- id="linearGradient3779"
2861- x1="1550.7804"
2862- y1="561.81555"
2863- x2="1888.9661"
2864- y2="561.81555"
2865- gradientUnits="userSpaceOnUse" />
2866- <linearGradient
2867- inkscape:collect="always"
2868- xlink:href="#linearGradient6010"
2869- id="linearGradient3781"
2870- x1="1564.0616"
2871- y1="720.4718"
2872- x2="1703.3741"
2873- y2="720.4718"
2874- gradientUnits="userSpaceOnUse" />
2875- <linearGradient
2876- inkscape:collect="always"
2877- xlink:href="#linearGradient6010"
2878- id="linearGradient3783"
2879- x1="1517.1554"
2880- y1="660.521"
2881- x2="1841.8"
2882- y2="660.521"
2883- gradientUnits="userSpaceOnUse" />
2884- <linearGradient
2885- inkscape:collect="always"
2886- xlink:href="#linearGradient6010"
2887- id="linearGradient3785"
2888- x1="1519.3741"
2889- y1="503.64713"
2890- x2="1744.6722"
2891- y2="503.64713"
2892- gradientUnits="userSpaceOnUse" />
2893- <linearGradient
2894- inkscape:collect="always"
2895- xlink:href="#linearGradient6010"
2896- id="linearGradient3787"
2897- x1="2037.218"
2898- y1="46.237438"
2899- x2="2133.968"
2900- y2="46.237438"
2901- gradientUnits="userSpaceOnUse" />
2902- <linearGradient
2903- inkscape:collect="always"
2904- xlink:href="#linearGradient6010"
2905- id="linearGradient3789"
2906- x1="1803.3429"
2907- y1="216.79991"
2908- x2="1965.9542"
2909- y2="216.79991"
2910- gradientUnits="userSpaceOnUse" />
2911- <linearGradient
2912- inkscape:collect="always"
2913- xlink:href="#linearGradient6010"
2914- id="linearGradient3791"
2915- x1="1772.3429"
2916- y1="281.62592"
2917- x2="2026.1866"
2918- y2="281.62592"
2919- gradientUnits="userSpaceOnUse" />
2920- <linearGradient
2921- inkscape:collect="always"
2922- xlink:href="#linearGradient6010"
2923- id="linearGradient3793"
2924- x1="2000.7491"
2925- y1="83.488998"
2926- x2="2177.7493"
2927- y2="83.488998"
2928- gradientUnits="userSpaceOnUse" />
2929- <linearGradient
2930- inkscape:collect="always"
2931- xlink:href="#linearGradient6010"
2932- id="linearGradient3795"
2933- x1="1933.0292"
2934- y1="191.26004"
2935- x2="2188.7668"
2936- y2="191.26004"
2937- gradientUnits="userSpaceOnUse" />
2938- <linearGradient
2939- inkscape:collect="always"
2940- xlink:href="#linearGradient6010"
2941- id="linearGradient3797"
2942- x1="1956.7218"
2943- y1="305.36465"
2944- x2="2159.1868"
2945- y2="305.36465"
2946- gradientUnits="userSpaceOnUse" />
2947- <linearGradient
2948- inkscape:collect="always"
2949- xlink:href="#linearGradient6010"
2950- id="linearGradient3799"
2951- x1="1674.0616"
2952- y1="420.89871"
2953- x2="1941.7629"
2954- y2="420.89871"
2955- gradientUnits="userSpaceOnUse" />
2956- <inkscape:perspective
2957- id="perspective5910"
2958- inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
2959- inkscape:vp_z="1 : 0.5 : 1"
2960- inkscape:vp_y="0 : 1000 : 0"
2961- inkscape:vp_x="0 : 0.5 : 1"
2962- sodipodi:type="inkscape:persp3d" />
2963- <linearGradient
2964- inkscape:collect="always"
2965- xlink:href="#linearGradient5835"
2966- id="linearGradient5841"
2967- x1="233.53571"
2968- y1="549.50507"
2969- x2="695.03571"
2970- y2="549.50507"
2971- gradientUnits="userSpaceOnUse" />
2972- <linearGradient
2973- id="linearGradient5835">
2974- <stop
2975- style="stop-color:#ff0000;stop-opacity:1;"
2976- offset="0"
2977- id="stop5837" />
2978- <stop
2979- style="stop-color:#ffbf00;stop-opacity:0.97647059;"
2980- offset="0.16954298"
2981- id="stop5865" />
2982- <stop
2983- id="stop5851"
2984- offset="0.25013462"
2985- style="stop-color:#ffff00;stop-opacity:0.96862745;" />
2986- <stop
2987- style="stop-color:#bfff00;stop-opacity:0.96078431;"
2988- offset="0.40514705"
2989- id="stop5867" />
2990- <stop
2991- id="stop5877"
2992- offset="0.5521028"
2993- style="stop-color:#3fff00;stop-opacity:0.94509804;" />
2994- <stop
2995- style="stop-color:#00df1f;stop-opacity:0.92941176;"
2996- offset="0.70446336"
2997- id="stop5875" />
2998- <stop
2999- style="stop-color:#00bf3f;stop-opacity:0.92156863;"
3000- offset="0.77951556"
3001- id="stop5871" />
3002- <stop
3003- style="stop-color:#007f7f;stop-opacity:0.90588235;"
3004- offset="0.92305344"
3005- id="stop5863" />
3006- <stop
3007- id="stop5847"
3008- offset="1"
3009- style="stop-color:#0000ff;stop-opacity:0.87450981;" />
3010- </linearGradient>
3011- <linearGradient
3012- y2="549.50507"
3013- x2="695.03571"
3014- y1="549.50507"
3015- x1="233.53571"
3016- gradientUnits="userSpaceOnUse"
3017- id="linearGradient5931"
3018- xlink:href="#linearGradient6010"
3019- inkscape:collect="always" />
3020- <linearGradient
3021- inkscape:collect="always"
3022- xlink:href="#linearGradient6010"
3023- id="linearGradient6008"
3024- x1="594.60907"
3025- y1="353.40845"
3026- x2="1266.2205"
3027- y2="353.40845"
3028- gradientUnits="userSpaceOnUse" />
3029- <linearGradient
3030- inkscape:collect="always"
3031- xlink:href="#linearGradient5835"
3032- id="linearGradient6056"
3033- gradientUnits="userSpaceOnUse"
3034- x1="594.60907"
3035- y1="353.40845"
3036- x2="1266.2205"
3037- y2="353.40845" />
3038- <linearGradient
3039- inkscape:collect="always"
3040- xlink:href="#linearGradient6010"
3041- id="linearGradient6058"
3042- gradientUnits="userSpaceOnUse"
3043- x1="594.60907"
3044- y1="353.40845"
3045- x2="1266.2205"
3046- y2="353.40845" />
3047- <linearGradient
3048- inkscape:collect="always"
3049- xlink:href="#linearGradient6010"
3050- id="linearGradient6060"
3051- gradientUnits="userSpaceOnUse"
3052- x1="594.60907"
3053- y1="353.40845"
3054- x2="1266.2205"
3055- y2="353.40845" />
3056- <linearGradient
3057- inkscape:collect="always"
3058- xlink:href="#linearGradient6010"
3059- id="linearGradient6062"
3060- gradientUnits="userSpaceOnUse"
3061- x1="594.60907"
3062- y1="353.40845"
3063- x2="1266.2205"
3064- y2="353.40845" />
3065- <linearGradient
3066- inkscape:collect="always"
3067- xlink:href="#linearGradient6010"
3068- id="linearGradient6064"
3069- gradientUnits="userSpaceOnUse"
3070- x1="594.60907"
3071- y1="353.40845"
3072- x2="1266.2205"
3073- y2="353.40845" />
3074- <linearGradient
3075- inkscape:collect="always"
3076- xlink:href="#linearGradient6010"
3077- id="linearGradient6066"
3078- gradientUnits="userSpaceOnUse"
3079- x1="594.60907"
3080- y1="353.40845"
3081- x2="1266.2205"
3082- y2="353.40845" />
3083- <linearGradient
3084- inkscape:collect="always"
3085- xlink:href="#linearGradient6010"
3086- id="linearGradient6068"
3087- gradientUnits="userSpaceOnUse"
3088- x1="594.60907"
3089- y1="353.40845"
3090- x2="1266.2205"
3091- y2="353.40845" />
3092- <linearGradient
3093- inkscape:collect="always"
3094- xlink:href="#linearGradient6010"
3095- id="linearGradient6070"
3096- gradientUnits="userSpaceOnUse"
3097- x1="594.60907"
3098- y1="353.40845"
3099- x2="1266.2205"
3100- y2="353.40845" />
3101- <linearGradient
3102- inkscape:collect="always"
3103- xlink:href="#linearGradient6010"
3104- id="linearGradient6072"
3105- gradientUnits="userSpaceOnUse"
3106- x1="594.60907"
3107- y1="353.40845"
3108- x2="1266.2205"
3109- y2="353.40845" />
3110- <linearGradient
3111- inkscape:collect="always"
3112- xlink:href="#linearGradient6010"
3113- id="linearGradient6074"
3114- gradientUnits="userSpaceOnUse"
3115- x1="594.60907"
3116- y1="353.40845"
3117- x2="1266.2205"
3118- y2="353.40845" />
3119- <linearGradient
3120- inkscape:collect="always"
3121- xlink:href="#linearGradient6010"
3122- id="linearGradient6076"
3123- gradientUnits="userSpaceOnUse"
3124- x1="594.60907"
3125- y1="353.40845"
3126- x2="1266.2205"
3127- y2="353.40845" />
3128- <linearGradient
3129- inkscape:collect="always"
3130- xlink:href="#linearGradient6010"
3131- id="linearGradient6078"
3132- gradientUnits="userSpaceOnUse"
3133- x1="594.60907"
3134- y1="353.40845"
3135- x2="1266.2205"
3136- y2="353.40845" />
3137- <linearGradient
3138- inkscape:collect="always"
3139- xlink:href="#linearGradient6010"
3140- id="linearGradient6080"
3141- gradientUnits="userSpaceOnUse"
3142- x1="594.60907"
3143- y1="353.40845"
3144- x2="1266.2205"
3145- y2="353.40845" />
3146- </defs>
3147- <sodipodi:namedview
3148- id="base"
3149- pagecolor="#ffffff"
3150- bordercolor="#666666"
3151- borderopacity="1.0"
3152- inkscape:pageopacity="0.0"
3153- inkscape:pageshadow="2"
3154- inkscape:zoom="0.45281676"
3155- inkscape:cx="108.47293"
3156- inkscape:cy="319.89813"
3157- inkscape:document-units="px"
3158- inkscape:current-layer="layer1"
3159- showgrid="false"
3160- inkscape:window-width="1380"
3161- inkscape:window-height="875"
3162- inkscape:window-x="30"
3163- inkscape:window-y="0"
3164- inkscape:window-maximized="1"
3165- showborder="false" />
3166- <metadata
3167- id="metadata7">
3168- <rdf:RDF>
3169- <cc:Work
3170- rdf:about="">
3171- <dc:format>image/svg+xml</dc:format>
3172- <dc:type
3173- rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
3174- <dc:title></dc:title>
3175- </cc:Work>
3176- </rdf:RDF>
3177- </metadata>
3178- <g
3179- inkscape:label="Capa 1"
3180- inkscape:groupmode="layer"
3181- id="layer1"
3182- transform="translate(-939.21814,94.69993)">
3183- <path
3184- style="color:#000000;fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.5714916px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
3185- d=""
3186- id="path3772" />
3187- <path
3188- style="color:#000000;fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.5714916px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
3189- d=""
3190- id="path3774" />
3191- <path
3192- style="color:#000000;fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.5714916px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
3193- d=""
3194- id="path3776" />
3195- <path
3196- style="color:#000000;fill:#55ff55;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.5714916px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
3197- d=""
3198- id="path3864"
3199- transform="translate(939.21814,-94.69993)" />
3200- <path
3201- style="color:#000000;fill:#7fff2a;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.5714916px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
3202- d=""
3203- id="path3886"
3204- transform="translate(939.21814,-94.69993)" />
3205- <path
3206- style="fill:#000000"
3207- d="m 349.08468,846.90605 c 0.26917,10.7682 3.2281,21.30128 7.9375,30.90625 20.46429,-10.79074 26.0108,-35.28275 35.125,-54.875 6.20007,-14.24125 12.82573,-30.33655 26.5625,-38.78125 1.58611,-0.4174 6.39597,-3.3676 4.84375,0.625 -2.19091,16.535 -11.81523,31.4283 -15.86937,46.23719 0.81854,14.2695 -15.6966,12.97272 -9.13063,35.29406 7.83221,14.15213 27.26199,16.11051 41.3125,11.1875 17.25691,-7.58089 35.86376,-11.04582 53.92492,-16.28831 25.14777,-7.07842 50.84819,-13.47303 74.56626,-24.4093 31.24631,-24.55204 70.89713,-36.37274 100.69632,-63.05234 21.97923,-15.0095 41.83869,-33.9648 67.53125,-42.5938 29.21493,-13.0907 54.01114,-35.8582 84.78125,-45.9062 4.75508,-5.2173 11.73563,-9.2063 13.71875,-16.6563 14.63684,-11.1457 -14.59993,6.2284 -22.09375,8.875 -4.77817,2.4994 -13.13233,5.3388 -15.96875,-1.2187 -5.8151,-4.7879 -28.72679,-10.5161 -40.61584,-14.2408 -6.65387,-4.5106 -17.08712,-10.6388 -13.63416,-19.6968 5.90007,-19.1913 23.71274,-31.6622 40.59124,-40.4593 9.6801,-5.0391 20.85081,-7.1229 31.62751,-4.9781 9.40465,0.4529 17.77799,-7.5951 17.4375,-17.0938 1.29543,-11.1981 -1.73524,-23.1209 3,-33.6562 27.92405,-21.0104 64.37995,-21.772 97.82525,-25.4466 16.2585,-1.3349 32.4519,-4.199 48.1435,-8.2097 8.5671,-1.2676 17.4661,5.1766 17.3125,14.1875 1.65252,10.9769 -4.087,21.1727 -11.5129,28.67 -3.7866,5.7712 -8.4485,11.2367 -15.0183,13.6738 -27.7535,18.9167 -63.0765,15.9836 -95.1562,15.9108 -12.6139,-0.1127 -25.2536,0.3798 -37.7501,2.1829 9.35565,11.8615 25.4177,14.3192 39.6563,12.9375 17.1795,-0.9013 34.0785,-4.9579 51.1875,-5.6562 8.4681,7.1659 22.0677,9.7867 30.6875,1.375 11.8918,-8.7447 20.0476,-21.5467 31.375,-30.7813 8.40132,-9.389 12.75382,-21.3848 21.02592,-30.9794 10.5256,-14.3725 19.1114,-30.3755 30.3803,-44.1143 6.9187,-5.8613 9.9597,-14.7166 12.6563,-22.9376 4.9385,-8.8188 3.604,-19.7943 8.5044,-28.7499 3.8438,-11.3712 10.8722,-21.1603 16.9956,-31.2813 8.3168,-18.1676 19.265,-35.65521 20.75,-56.03121 0.9855,-6.1022 0.023,-13.2484 0.5312,-18.7188 5.1817,-2.8741 6.2191,-10.0524 9.3304,-14.7806 10.6524,-21.1581 11.6565,-45.3836 16.1307,-68.3712 5.8077,-36.6164 8.5496,-76.0408 -6.1798,-110.9107 -8.8486,-20.6039 -28.6418,-34.2076 -49.9326,-39.485304 -23.7116,-6.0042 -49.4405,-4.1252 -72.2289,4.509604 -98.00342,48.8699 -183.35901,119.6913 -258.64805,198.5468 -17.22945,14.8334 -33.4177,30.6946 -49.31552,46.8352 -78.6551,70.57961 -143.05563,155.02661 -207.92413,238.16261 -39.10861,58.9335 -82.23211,115.9059 -111.77012,180.4144 -3.94725,14.62 -24.16747,45.575 -21.462,58.29795 -1.43956,7.08577 -2.17394,14.27225 -1.9375,21.53125 z m 84.75,13.84375 c 12.19456,-10.36481 27.43507,-16.59452 42.81555,-20.43339 18.33392,-9.87646 36.93366,-19.82574 55.9032,-28.66036 41.11408,-19.9245 83.77577,-36.1306 126.37806,-52.5489 7.61222,-3.1832 15.21211,-6.382 23.18444,-8.4823 -12.92947,10.909 -28.49911,18.0804 -42.35566,27.705 -44.79045,27.78 -92.01196,52.74492 -143.69642,64.67239 -19.861,1.97104 -42.96917,16.88658 -62.22917,17.74756 z m 2.15625,-31.625 c 1.32849,-8.64139 7.93128,-15.75195 13.87523,-21.85125 14.45037,-12.3347 32.93845,-18.7363 48.78189,-29.186 43.24286,-25.4972 85.73746,-52.4123 129.45153,-76.9441 30.70001,-18.4504 63.1991,-38.5234 100.26635,-38.5499 8.11827,0.3333 16.85237,1.6363 24.375,3.375 3.85604,2.0097 10.71973,3.58 14.875,7.5313 9.45738,6.3837 9.37105,22.5028 -1.21875,27.6874 -10.32228,5.5451 -22.32651,6.3887 -33.11131,10.8902 -64.49445,20.2383 -127.14652,46.1279 -189.47387,71.922 -31.04813,13.7115 -60.1996,31.4223 -90.41482,46.7191 -5.20403,1.11575 -12.87373,4.89018 -17.125,0.375 -0.22769,-0.62887 -0.23175,-1.30969 -0.28125,-1.96875 z m 3.03125,-82.28125 c 2.05845,-19.5041 15.12655,-35.1816 26.65625,-50.125 34.9546,-54.7159 70.64072,-109.3294 110.5625,-160.6875 29.80867,-33.2517 51.54343,-74.3295 87.84375,-101.125 4.33677,-3.1584 12.56449,-3.5327 13.84375,3 5.46259,16.7762 -3.69234,33.4147 -9.75,48.6875 -23.2926,49.3671 -68.22953,84.1812 -96.38255,130.4729 -18.36505,41.0458 -56.13664,68.3742 -87.05849,99.6015 -10.32541,8.8655 -18.66953,19.9734 -29.09021,28.5193 -4.41448,3.0506 -10.82713,6.3154 -16,4.3126 -0.54293,-0.7678 -0.51877,-1.7509 -0.625,-2.6563 z m 19.03125,26.4063 c 3.1557,-16.4732 20.87384,-22.2647 31.83314,-32.6061 31.91166,-26.9271 55.1502,-65.111 94.06679,-83.2532 39.31319,-20.1325 79.24089,-39.8051 114.22507,-66.922 25.00706,-16.9893 42.91529,-45.1071 73.34375,-53.0937 7.7929,-1.1146 15.83845,-0.9939 23.3125,-3.7188 13.29069,-2.1448 25.87061,8.9622 27.03125,21.875 1.28574,7.9728 -0.34331,16.4088 -4.34375,23.4688 -12.68375,4.825 -25.69081,8.348 -38.9375,10.9062 -23.15681,7.4568 -35.26022,30.4723 -49.8125,48.1875 -5.90201,6.9554 -13.40537,14.1737 -23.21035,13.7231 -46.55799,6.4308 -86.81567,32.507 -126.9408,55.1887 -38.41015,22.7558 -75.87383,47.4316 -116.59885,65.6819 -1.28502,0.2595 -2.69823,0.8826 -3.96875,0.5626 z m 132.34375,-145.5313 c 13.80462,-35.2687 46.34122,-57.3516 67.70268,-87.4557 16.00341,-20.8253 37.0322,-37.0896 58.39611,-52.5063 25.02598,-18.4092 48.66206,-38.7687 70.98262,-60.1872 19.74619,-17.5693 42.37151,-35.5322 69.51239,-38.6633 6.2927,-0.3166 16.1025,-0.3566 18.1875,7.0938 1.3202,14.4414 -8.8108,26.4222 -15.3438,38.3437 -6.0741,8.2821 -9.6213,19.6623 -19.80162,23.7064 -52.97977,29.9225 -96.13313,74.0288 -144.32338,110.6373 -34.71223,20.18 -65.01076,51.209 -105.40625,59.2813 l 0.0937,-0.25 5e-5,0 z m 102.21875,-158.8437 c 4.72671,-15.0269 0.36909,-30.2945 6.8125,-44.8438 4.16579,-4.0289 10.1314,-5.6576 14.53125,-9.5938 10.95554,-8.9754 22.80599,-13.3035 33.53072,-22.0995 39.63952,-34.98531 72.52538,-77.44861 115.01138,-108.86621 27.1658,-27.1851 73.7483,-29.6957 105.2079,-9.9093 -38.5642,15.0989 -76.7053,34.0757 -106.8125,63.0626 -14.44132,14.1099 -25.67127,31.1666 -41.00157,44.34981 -27.83085,25.7078 -59.41994,47.7547 -87.14345,73.7882 -10.93953,8.6869 -21.78724,19.5725 -36.13623,21.737 -3.34066,-0.5148 -3.8919,-4.876 -4,-7.625 z m 46.5625,-119.62501 c 22.70405,-21.5909 50.38139,-50.7056 73.18269,-75.6378 29.27789,-29.3129 70.25256,-45.6581 111.34856,-48.1748 -69.8759,37.1601 -125.08328,95.2166 -183.125,147.875 -2.5927,1.4466 -4.18548,5.1429 -6.5,6.09381 -3.85015,-6.47121 -14.90923,-2.75251 -12.16838,-12.04751 7.72595,-9.1768 8.72145,-9.6804 17.26213,-18.1087 z m 47.0625,173.21871 c 5.65384,-18.0865 23.88148,-27.6384 39.0283,-36.6769 14.48877,-7.725 29.21785,-15.8647 44.62795,-21.4168 41.7701,-7.1174 81.8242,-23.3848 124.0313,-27.4688 8.24292,-5.2561 18.71842,-2.277 27.93752,-4.0312 12.9401,1.81 22.7923,14.0649 25.3125,26.375 1.8666,8.7106 -5.8669,15.0906 -9.1875,22.375 -3.1785,5.8643 -9.27,9.4133 -12.125,15.6562 -7.5624,9.5248 -21.2509,11.6053 -32.37502,7.8438 -68.9423,-10.9185 -134.9538,26.0771 -203.8687,17.8875 -1.03704,-0.1301 -2.52876,-0.1786 -3.38135,-0.5438 z m 57.21875,142.5937 c 3.19719,4.7141 10.1509,1.2059 14.5313,0.25 25.2349,-7.9562 46.3117,-24.8088 69.6875,-36.6562 6.0021,-4.7061 9.8057,-11.88 15.5937,-16.5938 41.6227,-37.7701 -1.9826,-7.684 -5.5625,-5.3124 -29.3453,20.1735 -64.9496,43.6672 -97.73906,57.7584 -1.34286,0.8054 -3.82736,0.3071 3.48906,0.554 z m 9.4063,-301.12501 c 2.9517,-12.248 14.6204,-19.8059 24.3437,-26.7812 39.1056,-29.0647 83.8706,-49.7174 130.21882,-64.375 3.2991,-1.0193 4.715,-6.4291 0.3125,-6.9062 -16.18632,0.2742 -31.51682,-6.3232 -46.99342,-10.5666 -12.5995,-3.8598 -25.3787,-7.2494 -38.3504,-9.5897 27.409,-12.6065 53.7785,-27.7821 82.71882,-36.4375 32.7958,-7.1278 61.685,-30.0982 96.2761,-28.7116 5.3679,0.8275 12.3279,0.7562 16.2239,4.8991 7.8956,14.8889 6.4045,35.542 -7.25,46.625 -7.6915,6.4993 -16.9127,13.5471 -27.4688,12.4063 -9.652,0.1712 -18.222,5.6054 -27.5312,6.875 -8.5555,-0.693 -17.35,-0.5602 -25.125,3.1874 -4.0604,0.5121 -7.6805,6.1511 -3.625,8.875 8.5829,2.7079 17.498,-1.0547 25.9687,-2.375 11.9587,-2.8614 24.5906,-3.1425 36.1563,-7.4687 9.7775,-1.6041 18.6791,6.8446 22.4687,15.3125 6.1087,13.961 0.2248,29.2948 -6.75,41.7188 -2.3795,5.5312 -5.759,11.0276 -6.4375,17.0624 0.1702,2.4853 2.4385,4.2066 -0.25,6.2813 -11.7217,19.0379 -12.012,42.6672 -20.7812,62.90631 -5.2118,9.3721 -9.6151,21.0713 -21,24.5 -10.3313,3.7163 -21.8936,3.3116 -32.6563,2.8124 -9.9783,-3.0222 -20.357,-0.092 -29.92982,2.6446 -35.8164,2.9172 -71.5321,8.7921 -105.9764,19.168 -5.5724,1.151 -11.8254,-3.0262 -10.3125,-9.1876 1.0407,-16.964 12.1409,-32.1138 24.5,-42.9374 9.6915,-7.7455 22.7962,-7.6486 34,-12.3126 38.2838,-11.55131 76.18492,-24.58571 114.80022,-34.90591 13.9495,-1.8644 28.7272,-2.4934 41.0748,-10.2191 -35.3552,-8.5945 -71.6228,2.3986 -104.94872,13.9152 -28.7153,9.5981 -56.8053,22.0636 -86.7388,26.7411 -14.1843,1.4177 -29.5452,1.0039 -42.375,-5.5313 -2.4954,-1.8552 -4.5825,-4.4913 -4.5625,-7.625 z m 14.3125,-138.8437 c 8.5441,-11.8335 20.724,-20.6674 32.125,-29.7813 17.5733,-11.7737 35.2431,-23.701 51.5312,-37.375 27.6091,-21.7173 56.87452,-44.9657 92.84382,-50.1874 8.2799,-0.6819 18.1361,-4.5114 25.7187,0.1562 0.6018,5.7068 -5.5104,9.6405 -9.125,13.2188 -7.7767,6.6646 -17.6704,9.6781 -27.4504,11.2689 -31.1626,13.7503 -63.29002,25.6753 -93.75472,40.739 -25.7104,15.2293 -42.241,44.5011 -72.0449,52.7421 -0.8944,0.3432 -0.1021,-0.3894 0.1563,-0.7813 z m 52.7187,-17.4687 c 3.0193,-9.8668 13.2023,-14.9101 20.6602,-21.1713 21.6879,-14.6697 47.4261,-21.3365 71.33212,-31.6531 20.6595,-7.6531 40.8523,-16.8161 61.3515,-24.6132 11.2016,-3.9817 24.9102,-1.977 32.4687,7.5626 6.8554,6.9633 8.8591,20.895 -0.7187,26.4062 -10.6085,6.0155 -23.569,3.1361 -35.0216,6.9025 -46.4946,10.3523 -88.02182,39.9818 -136.66592,40.5975 -4.1533,-0.9841 -11.542,0.6773 -13.4063,-4.0312 z"
3208- id="path2954-0"
3209- inkscape:export-filename="/tmp/logo-016.png"
3210- inkscape:export-xdpi="1.84"
3211- inkscape:export-ydpi="1.84"
3212- sodipodi:nodetypes="cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc" />
3213- <g
3214- id="g2849"
3215- style="fill:url(#linearGradient6008);fill-opacity:1"
3216- transform="translate(-150.17112,121.46194)"
3217- inkscape:export-filename="/tmp/logo-016.png"
3218- inkscape:export-xdpi="1.84"
3219- inkscape:export-ydpi="1.84">
3220- <path
3221- inkscape:export-ydpi="3.6700001"
3222- inkscape:export-xdpi="3.6700001"
3223- inkscape:export-filename="/tmp/logo-032.png"
3224- id="path3868"
3225- d="m 751.5153,497.17405 c 17.69893,-6.31836 33.34273,-17.78203 49.44258,-27.46879 41.77847,-26.65775 79.91951,-58.13179 117.96424,-89.74534 22.33543,-18.07868 46.33334,-33.9813 69.78326,-50.53812 13.69242,-12.24771 22.80862,-28.87287 29.67282,-45.6253 1.0868,-2.76713 1.9446,-8.68847 -2.9879,-7.62245 -20.91596,-2.76027 -41.00913,7.2869 -56.37576,20.77951 -30.06757,24.5948 -59.28835,50.10281 -89.7715,74.1683 -26.57256,21.27378 -51.55771,44.32242 -72.85556,70.80882 -15.53362,17.8901 -31.92782,35.53962 -44.87218,55.24337 z"
3226- style="color:#000000;fill:url(#linearGradient6058);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.5714916px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
3227- <path
3228- inkscape:export-ydpi="3.6700001"
3229- inkscape:export-xdpi="3.6700001"
3230- inkscape:export-filename="/tmp/logo-032.png"
3231- id="path3870"
3232- d="m 1034.3278,314.8303 c -0.8242,2.82259 1.8606,4.04154 4.0821,2.72294 22.4915,-4.0724 44.6295,-10.01178 67.4155,-12.73348 28.6733,-4.65875 57.5985,-7.64174 86.6587,-8.36446 12.3838,-1.23052 23.3907,-9.6213 27.5312,-21.4375 7.7721,-16.29509 11.7368,-33.9564 16.625,-51.2813 -40.9842,7.8833 -80.6393,21.2579 -120.6304,33.1931 -21.1775,6.87837 -42.8904,13.17396 -62.8383,22.9632 -10.5604,8.21665 -17.4111,21.77589 -18.8438,34.9375 z"
3233- style="color:#000000;fill:url(#linearGradient6060);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.5714916px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
3234- <path
3235- inkscape:export-ydpi="3.6700001"
3236- inkscape:export-xdpi="3.6700001"
3237- inkscape:export-filename="/tmp/logo-032.png"
3238- id="path3872"
3239- d="m 1010.4841,241.7365 c 2.7299,7.5449 12.9126,6.0789 19.2812,6.75 23.645,1.3696 46.959,-3.7725 68.9039,-12.1499 40.1691,-13.3391 80.6429,-29.1157 123.4393,-30.2224 6.8529,-0.018 14.1356,2.1048 20.1256,4.1223 2.7818,-19.6549 18.6428,-37.5156 13.7187,-58.0937 -2.5753,-8.0356 -10.5676,-17.5414 -19.9215,-13.5366 -19.5187,4.0775 -39.4969,10.0049 -59.6722,8.5366 -7.4896,-2.379 -7.6262,-13.7129 -0.8125,-17.0937 10.2229,-7.3346 23.8336,-3.6568 35.2416,-7.865 17.0353,-3.4328 36.3697,-5.7644 48.0905,-20.0922 5.9064,-5.2267 8.5227,-13.0552 6.8397,-20.7898 -0.8638,-5.0648 -1.052,-12.2468 -5.8593,-15.0968 -13.9783,-3.9036 -28.2236,1.8636 -41.5744,5.7518 -42.8206,14.9781 -86.6413,28.8819 -126.7694,50.1544 20.8599,6.66 42.0557,13.0973 63.7813,15.7188 6.3248,-0.7897 12.6531,6.9676 8,12.375 -8.9446,9.5023 -22.4632,12.6004 -34.1089,17.9254 -40.9989,16.594 -81.55,36.2927 -114.4536,66.0434 -1.9051,2.0556 -4.3166,4.5708 -4.25,7.5624 z"
3240- style="color:#000000;fill:url(#linearGradient6062);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.5714916px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
3241- <path
3242- inkscape:export-ydpi="3.6700001"
3243- inkscape:export-xdpi="3.6700001"
3244- inkscape:export-filename="/tmp/logo-032.png"
3245- id="path3874"
3246- d="m 1078.2028,83.8615 c 9.7606,2.0056 19.9758,-1.5761 29.5664,-3.2636 43.7739,-10.6641 84.5036,-32.3146 129.3274,-39.0896 6.8114,-1.3313 17.4675,-3.37 18.1062,-11.9905 -1.8948,-9.2869 -11.162,-18.7048 -21.2812,-15.125 -27.4665,5.8492 -53.0859,18.4371 -79.453,28.2371 -25.9088,10.6151 -54.1446,19.6642 -74.922,39.0129 -0.5127,0.6108 -1.2825,1.4717 -1.3438,2.2187 z"
3247- style="color:#000000;fill:url(#linearGradient6064);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.5714916px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
3248- <path
3249- inkscape:export-ydpi="3.6700001"
3250- inkscape:export-xdpi="3.6700001"
3251- inkscape:export-filename="/tmp/logo-032.png"
3252- id="path3876"
3253- d="m 849.79655,348.54905 c 33.18847,-20.32789 61.55413,-47.43615 91.04447,-72.53054 27.47122,-23.95071 52.43983,-50.92671 79.80918,-75.12481 24.619,-20.9604 52.942,-37.319 82.9901,-49.0322 -23.4457,-7.7886 -51.4112,-9.8383 -72.7187,4.5626 -22.1313,14.8065 -40.52244,34.4232 -60.0313,52.25 -34.20639,32.9553 -68.27857,66.42473 -108.10272,92.61277 -5.03998,3.79168 -10.64071,8.04337 -10.17853,15.07468 -1.66479,10.59903 -2.59569,21.52239 -2.8125,32.1875 z"
3254- style="color:#000000;fill:url(#linearGradient6056);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.5714916px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
3255- <path
3256- inkscape:export-ydpi="3.6700001"
3257- inkscape:export-xdpi="3.6700001"
3258- inkscape:export-filename="/tmp/logo-032.png"
3259- id="path3878"
3260- d="m 880.79655,249.0803 c 3.70944,2.6491 5.42578,-3.8587 8.46372,-4.8806 49.1354,-43.2121 96.18552,-89.1557 150.03633,-126.3694 8.2196,-4.4245 2.4483,-2.7556 -2.875,-1.2188 -23.4068,6.1207 -44.84905,17.9551 -62.21384,34.865 -30.48618,27.547 -58.82169,58.226 -86.9294,88.2445 -2.43147,2.8587 -4.92227,6.1091 -6.48181,9.3593 z"
3261- style="color:#000000;fill:url(#linearGradient6066);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.5714916px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
3262- <path
3263- inkscape:export-ydpi="3.6700001"
3264- inkscape:export-xdpi="3.6700001"
3265- inkscape:export-filename="/tmp/logo-032.png"
3266- id="path3880"
3267- d="m 1116.8591,32.7678 c 25.5849,-10.6526 50.8528,-22.3941 77.1875,-30.9375 6.4567,-2.8411 12.3915,-6.9044 17.375,-11.9062 -26.2064,2.2628 -52.2545,11.1884 -73.4374,26.9338 -7.9209,5.3916 -15.7255,10.9339 -23.3126,16.7849 0.7291,-0.2917 1.4583,-0.5833 2.1875,-0.875 z"
3268- style="color:#000000;fill:url(#linearGradient6068);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.5714916px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
3269- <path
3270- inkscape:export-ydpi="3.6700001"
3271- inkscape:export-xdpi="3.6700001"
3272- inkscape:export-filename="/tmp/logo-032.png"
3273- id="path3882"
3274- d="m 597.3903,619.2678 c 17.65974,-12.46149 32.37459,-28.36781 48.50776,-42.76193 27.08538,-25.03567 53.04471,-51.78802 72.07475,-83.69741 24.50069,-37.49877 55.40161,-70.38209 81.15189,-106.89226 11.19732,-17.84724 23.52019,-37.4766 22.98435,-59.3984 -0.45947,-2.40059 -0.5313,-7.9048 -3.59375,-7.8125 -13.52759,9.05859 -23.97477,22.21914 -34.97831,34.12572 -50.89369,60.70315 -96.7254,125.89297 -140.61544,191.90553 -15.42799,24.34711 -32.29232,47.93877 -45.5,73.5625 0.11509,0.18032 -1.36931,2.24562 -0.0312,0.96875 z"
3275- style="color:#000000;fill:url(#linearGradient6070);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.5714916px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
3276- <path
3277- inkscape:export-ydpi="3.6700001"
3278- inkscape:export-xdpi="3.6700001"
3279- inkscape:export-filename="/tmp/logo-032.png"
3280- id="path3884"
3281- d="m 594.60905,704.67405 c 35.79971,-15.10364 69.49489,-35.20685 105.60325,-49.89906 62.87779,-27.77589 127.74792,-51.05409 192.48146,-73.76268 8.65637,-3.67732 18.53461,-5.83279 25.79029,-11.93201 2.90495,-4.39214 -3.18454,-8.16016 -5.5,-11.28125 -13.71313,-11.37597 -33.26412,-11.46964 -50.0625,-9.125 -36.09904,7.54143 -66.81978,29.3842 -98.83699,46.58989 -51.72783,29.60232 -103.33553,59.70033 -153.88106,91.40029 -6.55309,4.57905 -13.25888,10.55884 -15.59445,18.00982 z"
3282- style="color:#000000;fill:url(#linearGradient6072);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.5714916px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
3283- <path
3284- inkscape:export-ydpi="3.6700001"
3285- inkscape:export-xdpi="3.6700001"
3286- inkscape:export-filename="/tmp/logo-032.png"
3287- id="path3888"
3288- d="m 645.54655,715.67405 c 35.72193,-10.42551 70.78021,-23.23122 102.96875,-41.78125 10.91159,-6.01259 21.75038,-12.14494 32.3125,-18.75 -47.41496,18.3869 -93.51136,39.66925 -139.3125,61.75 1.34375,-0.40625 2.6875,-0.8125 4.03125,-1.21875 z"
3289- style="color:#000000;fill:url(#linearGradient6074);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.5714916px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
3290- <path
3291- inkscape:export-ydpi="3.6700001"
3292- inkscape:export-xdpi="3.6700001"
3293- inkscape:export-filename="/tmp/logo-032.png"
3294- id="path3890"
3295- d="m 632.5153,634.2053 c 60.14394,-30.74655 115.66832,-70.8232 177.96875,-97.28125 14.26222,-5.97556 29.35043,-9.39673 44.5,-12.09375 18.95443,-6.17109 28.4865,-25.97596 41.50355,-39.75144 13.57652,-16.00862 34.00127,-23.62201 54.01318,-28.20348 6.19162,-1.89798 15.7533,-3.68127 15.51452,-12.01383 2.08663,-10.98591 -4.02012,-24.31983 -15.59375,-26.53125 -16.90374,0.27667 -33.58361,4.49058 -47.6875,13.9375 -22.9606,15.48193 -41.79786,35.95315 -65.1477,51.00862 -35.74563,24.86524 -75.16047,43.70949 -112.7273,65.52263 -28.46057,18.88652 -49.92871,46.12416 -75.56336,68.41906 -7.01077,6.41829 -14.12156,12.70109 -21.06164,19.17469 1.42708,-0.72917 2.85417,-1.45833 4.28125,-2.1875 z"
3296- style="color:#000000;fill:url(#linearGradient6076);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.5714916px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
3297- <path
3298- inkscape:export-ydpi="3.6700001"
3299- inkscape:export-xdpi="3.6700001"
3300- inkscape:export-filename="/tmp/logo-032.png"
3301- id="path3892"
3302- d="m 899.79655,525.6428 c 3.51089,7.82332 13.2238,9.26496 20.09375,13 10.79867,2.80411 21.65609,5.63079 30.90625,12.09375 5.11243,4.54553 10.33545,-1.21207 15.35186,-3.0042 39.48479,-19.22194 79.01709,-39.09854 114.46069,-65.33955 -27.154,-1.42919 -54.6501,1.25915 -81.5938,-2.71875 -6.84472,-1.83715 -14.6702,-8.46744 -12.6875,-16.09375 4.38512,-5.41078 12.4788,-2.62909 18.4944,-4.24386 30.8382,-2.55598 62.2768,-0.71955 92.6251,-7.11835 21.4753,-5.9014 40.2441,-22.70775 47.068,-43.95029 -0.5436,-4.58705 -5.3064,-7.60544 -8.7187,-10.1875 -5.8774,-2.94298 -12.1394,1.78838 -18.2813,1.625 -36.7565,6.15401 -74.7601,7.77894 -110.3125,19.03125 -9.7045,3.55183 -17.78411,12.04656 -18.71875,22.5625 -2.37586,11.56234 -0.38446,26.01529 -9.9375,34.71875 -9.86563,7.03084 -22.96979,1.75056 -33.54415,6.93604 -18.46505,6.38579 -36.58846,18.72192 -44.4246,37.22021 -0.50221,1.79331 -1.02655,3.61709 -0.78125,5.46875 z"
3303- style="color:#000000;fill:url(#linearGradient6078);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.5714916px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
3304- <path
3305- inkscape:export-ydpi="3.6700001"
3306- inkscape:export-xdpi="3.6700001"
3307- inkscape:export-filename="/tmp/logo-032.png"
3308- id="path3894"
3309- d="m 945.4528,396.54905 c 22.4751,1.38692 44.82133,-2.89278 66.9854,-5.76396 34.7809,-6.04143 69.5064,-13.86385 105.0146,-12.99513 16.1655,-0.39189 33.1503,2.07772 48.6563,-2.86591 10.8635,-5.891 16.1867,-17.84527 23.1562,-27.53125 4.4328,-8.52492 -0.6092,-18.27302 -7.4687,-23.59375 -7.9505,-7.64738 -19.8734,-6.25667 -29.888,-4.38602 -42.6818,6.87561 -84.727,17.60627 -126.112,29.91727 -22.1097,6.70955 -43.24672,16.65481 -61.80645,30.65386 -6.62998,4.90758 -13.30481,10.50103 -18.53735,16.56489 z"
3310- style="color:#000000;fill:url(#linearGradient6080);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.5714916px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
3311- </g>
3312- <path
3313- transform="translate(33.252667,-741.24731)"
3314- sodipodi:type="arc"
3315- style="color:#000000;fill:url(#linearGradient5931);fill-opacity:1.0;fill-rule:nonzero;stroke:#967b71;stroke-width:1.50000000000000000;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
3316- id="path5313"
3317- sodipodi:cx="464.28571"
3318- sodipodi:cy="549.50507"
3319- sodipodi:rx="230"
3320- sodipodi:ry="225.71428"
3321- d="m 694.28571,549.50507 c 0,124.65855 -102.97451,225.71428 -230,225.71428 -127.0255,0 -230,-101.05573 -230,-225.71428 0,-124.65856 102.9745,-225.71428 230,-225.71428 127.02549,0 230,101.05572 230,225.71428 z" />
3322- </g>
3323-</svg>
3324
3325=== added directory 'data/tests'
3326=== removed directory 'data/tests'
3327=== added file 'data/tests/metadata-test.txt'
3328=== removed file 'data/tests/metadata-test.txt'
3329=== added directory 'data/ui'
3330=== removed directory 'data/ui'
3331=== added file 'data/ui/gui.glade'
3332--- data/ui/gui.glade 1970-01-01 00:00:00 +0000
3333+++ data/ui/gui.glade 2010-09-14 17:29:44 +0000
3334@@ -0,0 +1,1043 @@
3335+<?xml version="1.0"?>
3336+<interface>
3337+ <requires lib="gtk+" version="2.16"/>
3338+ <!-- interface-naming-policy project-wide -->
3339+ <object class="GtkListStore" id="contentq_store">
3340+ <columns>
3341+ <!-- column-name operation -->
3342+ <column type="gchararray"/>
3343+ <!-- column-name path -->
3344+ <column type="gchararray"/>
3345+ <!-- column-name share -->
3346+ <column type="gchararray"/>
3347+ <!-- column-name node -->
3348+ <column type="gchararray"/>
3349+ </columns>
3350+ </object>
3351+ <object class="GtkListStore" id="metaq_store">
3352+ <columns>
3353+ <!-- column-name operation -->
3354+ <column type="gchararray"/>
3355+ <!-- column-name path -->
3356+ <column type="gchararray"/>
3357+ <!-- column-name share -->
3358+ <column type="gchararray"/>
3359+ <!-- column-name node -->
3360+ <column type="gchararray"/>
3361+ </columns>
3362+ </object>
3363+ <object class="GtkListStore" id="folders_store">
3364+ <columns>
3365+ <!-- column-name path -->
3366+ <column type="gchararray"/>
3367+ <!-- column-name suggested_path -->
3368+ <column type="gchararray"/>
3369+ <!-- column-name subscribed -->
3370+ <column type="gboolean"/>
3371+ <!-- column-name node -->
3372+ <column type="gchararray"/>
3373+ <!-- column-name volume -->
3374+ <column type="gchararray"/>
3375+ </columns>
3376+ </object>
3377+ <object class="GtkListStore" id="shares_to_others_store">
3378+ <columns>
3379+ <!-- column-name name -->
3380+ <column type="gchararray"/>
3381+ <!-- column-name other_visible_name -->
3382+ <column type="gchararray"/>
3383+ <!-- column-name accepted -->
3384+ <column type="gboolean"/>
3385+ <!-- column-name access_level -->
3386+ <column type="gchararray"/>
3387+ <!-- column-name free_bytes -->
3388+ <column type="gchararray"/>
3389+ <!-- column-name path -->
3390+ <column type="gchararray"/>
3391+ <!-- column-name other_username -->
3392+ <column type="gchararray"/>
3393+ <!-- column-name node -->
3394+ <column type="gchararray"/>
3395+ <!-- column-name volume -->
3396+ <column type="gchararray"/>
3397+ </columns>
3398+ </object>
3399+ <object class="GtkListStore" id="shares_to_me_store">
3400+ <columns>
3401+ <!-- column-name name -->
3402+ <column type="gchararray"/>
3403+ <!-- column-name other_visible_name -->
3404+ <column type="gchararray"/>
3405+ <!-- column-name accepted -->
3406+ <column type="gboolean"/>
3407+ <!-- column-name access_level -->
3408+ <column type="gchararray"/>
3409+ <!-- column-name free_bytes -->
3410+ <column type="gchararray"/>
3411+ <!-- column-name path -->
3412+ <column type="gchararray"/>
3413+ <!-- column-name other_username -->
3414+ <column type="gchararray"/>
3415+ <!-- column-name node -->
3416+ <column type="gchararray"/>
3417+ <!-- column-name volume -->
3418+ <column type="gchararray"/>
3419+ </columns>
3420+ </object>
3421+ <object class="GtkWindow" id="main_window">
3422+ <property name="width_request">800</property>
3423+ <property name="height_request">600</property>
3424+ <property name="visible">True</property>
3425+ <property name="title" translatable="yes">Magicicada</property>
3426+ <property name="window_position">center</property>
3427+ <signal name="destroy" handler="on_main_window_destroy"/>
3428+ <child>
3429+ <object class="GtkVBox" id="vbox1">
3430+ <property name="visible">True</property>
3431+ <child>
3432+ <object class="GtkMenuBar" id="menubar">
3433+ <property name="visible">True</property>
3434+ <child>
3435+ <object class="GtkMenuItem" id="menuitem1">
3436+ <property name="visible">True</property>
3437+ <property name="label" translatable="yes">_File</property>
3438+ <property name="use_underline">True</property>
3439+ <child type="submenu">
3440+ <object class="GtkMenu" id="menu1">
3441+ <property name="visible">True</property>
3442+ <child>
3443+ <object class="GtkImageMenuItem" id="quit">
3444+ <property name="label">gtk-quit</property>
3445+ <property name="visible">True</property>
3446+ <property name="use_underline">True</property>
3447+ <property name="use_stock">True</property>
3448+ <signal name="activate" handler="on_quit_activate"/>
3449+ </object>
3450+ </child>
3451+ </object>
3452+ </child>
3453+ </object>
3454+ </child>
3455+ <child>
3456+ <object class="GtkMenuItem" id="menuitem4">
3457+ <property name="visible">True</property>
3458+ <property name="label" translatable="yes">_Help</property>
3459+ <property name="use_underline">True</property>
3460+ <child type="submenu">
3461+ <object class="GtkMenu" id="menu3">
3462+ <property name="visible">True</property>
3463+ <child>
3464+ <object class="GtkImageMenuItem" id="about">
3465+ <property name="label">gtk-about</property>
3466+ <property name="visible">True</property>
3467+ <property name="use_underline">True</property>
3468+ <property name="use_stock">True</property>
3469+ <signal name="activate" handler="on_about_activate"/>
3470+ </object>
3471+ </child>
3472+ </object>
3473+ </child>
3474+ </object>
3475+ </child>
3476+ </object>
3477+ <packing>
3478+ <property name="expand">False</property>
3479+ <property name="position">0</property>
3480+ </packing>
3481+ </child>
3482+ <child>
3483+ <object class="GtkToolbar" id="toolbar">
3484+ <property name="visible">True</property>
3485+ <property name="toolbar_style">both</property>
3486+ <child>
3487+ <object class="GtkToolButton" id="start">
3488+ <property name="width_request">50</property>
3489+ <property name="visible">True</property>
3490+ <property name="label" translatable="yes">Start</property>
3491+ <property name="use_underline">True</property>
3492+ <property name="stock_id">gtk-apply</property>
3493+ <signal name="clicked" handler="on_start_clicked"/>
3494+ </object>
3495+ <packing>
3496+ <property name="expand">False</property>
3497+ <property name="homogeneous">True</property>
3498+ </packing>
3499+ </child>
3500+ <child>
3501+ <object class="GtkToolButton" id="stop">
3502+ <property name="width_request">50</property>
3503+ <property name="label" translatable="yes">Stop</property>
3504+ <property name="use_underline">True</property>
3505+ <property name="stock_id">gtk-stop</property>
3506+ <signal name="clicked" handler="on_stop_clicked"/>
3507+ </object>
3508+ <packing>
3509+ <property name="expand">False</property>
3510+ <property name="homogeneous">True</property>
3511+ </packing>
3512+ </child>
3513+ <child>
3514+ <object class="GtkToolButton" id="connect">
3515+ <property name="width_request">85</property>
3516+ <property name="visible">True</property>
3517+ <property name="sensitive">False</property>
3518+ <property name="label" translatable="yes">Connect</property>
3519+ <property name="use_underline">True</property>
3520+ <property name="stock_id">gtk-connect</property>
3521+ <signal name="clicked" handler="on_connect_clicked"/>
3522+ </object>
3523+ <packing>
3524+ <property name="expand">False</property>
3525+ <property name="homogeneous">True</property>
3526+ </packing>
3527+ </child>
3528+ <child>
3529+ <object class="GtkToolButton" id="disconnect">
3530+ <property name="width_request">85</property>
3531+ <property name="label" translatable="yes">Disconnect</property>
3532+ <property name="use_underline">True</property>
3533+ <property name="stock_id">gtk-disconnect</property>
3534+ <signal name="clicked" handler="on_disconnect_clicked"/>
3535+ </object>
3536+ <packing>
3537+ <property name="expand">False</property>
3538+ <property name="homogeneous">True</property>
3539+ </packing>
3540+ </child>
3541+ <child>
3542+ <object class="GtkSeparatorToolItem" id="separator">
3543+ <property name="visible">True</property>
3544+ </object>
3545+ <packing>
3546+ <property name="expand">False</property>
3547+ <property name="homogeneous">True</property>
3548+ </packing>
3549+ </child>
3550+ <child>
3551+ <object class="GtkToolButton" id="folders">
3552+ <property name="visible">True</property>
3553+ <property name="sensitive">False</property>
3554+ <property name="label" translatable="yes">Folders</property>
3555+ <property name="use_underline">True</property>
3556+ <property name="stock_id">gtk-directory</property>
3557+ <signal name="clicked" handler="on_folders_clicked"/>
3558+ </object>
3559+ <packing>
3560+ <property name="expand">False</property>
3561+ <property name="homogeneous">True</property>
3562+ </packing>
3563+ </child>
3564+ <child>
3565+ <object class="GtkToolButton" id="shares_to_me">
3566+ <property name="visible">True</property>
3567+ <property name="sensitive">False</property>
3568+ <property name="label" translatable="yes">Shares to me</property>
3569+ <property name="use_underline">True</property>
3570+ <property name="stock_id">gtk-network</property>
3571+ <signal name="clicked" handler="on_shares_to_me_clicked"/>
3572+ </object>
3573+ <packing>
3574+ <property name="expand">False</property>
3575+ <property name="homogeneous">True</property>
3576+ </packing>
3577+ </child>
3578+ <child>
3579+ <object class="GtkToolButton" id="shares_to_others">
3580+ <property name="visible">True</property>
3581+ <property name="sensitive">False</property>
3582+ <property name="label" translatable="yes">Shares to others</property>
3583+ <property name="use_underline">True</property>
3584+ <property name="stock_id">gtk-network</property>
3585+ <signal name="clicked" handler="on_shares_to_others_clicked"/>
3586+ </object>
3587+ <packing>
3588+ <property name="expand">False</property>
3589+ <property name="homogeneous">True</property>
3590+ </packing>
3591+ </child>
3592+ <child>
3593+ <object class="GtkToolButton" id="metadata">
3594+ <property name="visible">True</property>
3595+ <property name="sensitive">False</property>
3596+ <property name="label" translatable="yes">Metadata</property>
3597+ <property name="use_underline">True</property>
3598+ <property name="stock_id">gtk-find</property>
3599+ <signal name="clicked" handler="on_metadata_clicked"/>
3600+ </object>
3601+ <packing>
3602+ <property name="expand">False</property>
3603+ <property name="homogeneous">True</property>
3604+ </packing>
3605+ </child>
3606+ </object>
3607+ <packing>
3608+ <property name="expand">False</property>
3609+ <property name="position">1</property>
3610+ </packing>
3611+ </child>
3612+ <child>
3613+ <object class="GtkHBox" id="hbox1">
3614+ <property name="visible">True</property>
3615+ <child>
3616+ <object class="GtkHBox" id="hbox2">
3617+ <property name="visible">True</property>
3618+ <child>
3619+ <object class="GtkImage" id="is_started">
3620+ <property name="width_request">30</property>
3621+ <property name="visible">True</property>
3622+ <property name="sensitive">False</property>
3623+ <property name="xpad">3</property>
3624+ <property name="ypad">3</property>
3625+ <property name="stock">gtk-yes</property>
3626+ </object>
3627+ <packing>
3628+ <property name="position">0</property>
3629+ </packing>
3630+ </child>
3631+ <child>
3632+ <object class="GtkImage" id="is_connected">
3633+ <property name="width_request">30</property>
3634+ <property name="visible">True</property>
3635+ <property name="sensitive">False</property>
3636+ <property name="xpad">3</property>
3637+ <property name="ypad">3</property>
3638+ <property name="stock">gtk-yes</property>
3639+ </object>
3640+ <packing>
3641+ <property name="position">1</property>
3642+ </packing>
3643+ </child>
3644+ <child>
3645+ <object class="GtkImage" id="is_online">
3646+ <property name="width_request">30</property>
3647+ <property name="visible">True</property>
3648+ <property name="sensitive">False</property>
3649+ <property name="xpad">3</property>
3650+ <property name="ypad">3</property>
3651+ <property name="stock">gtk-yes</property>
3652+ </object>
3653+ <packing>
3654+ <property name="position">2</property>
3655+ </packing>
3656+ </child>
3657+ </object>
3658+ <packing>
3659+ <property name="expand">False</property>
3660+ <property name="position">0</property>
3661+ </packing>
3662+ </child>
3663+ <child>
3664+ <object class="GtkLabel" id="status_label">
3665+ <property name="visible">True</property>
3666+ <property name="ellipsize">end</property>
3667+ </object>
3668+ <packing>
3669+ <property name="position">1</property>
3670+ </packing>
3671+ </child>
3672+ </object>
3673+ <packing>
3674+ <property name="expand">False</property>
3675+ <property name="padding">3</property>
3676+ <property name="position">2</property>
3677+ </packing>
3678+ </child>
3679+ <child>
3680+ <object class="GtkVPaned" id="vpaned1">
3681+ <property name="visible">True</property>
3682+ <property name="can_focus">True</property>
3683+ <child>
3684+ <object class="GtkHBox" id="hbox3">
3685+ <property name="visible">True</property>
3686+ <child>
3687+ <object class="GtkLabel" id="metaq_label">
3688+ <property name="visible">True</property>
3689+ <property name="label" translatable="yes">Metadata Queue</property>
3690+ <property name="angle">90</property>
3691+ </object>
3692+ <packing>
3693+ <property name="expand">False</property>
3694+ <property name="fill">False</property>
3695+ <property name="position">0</property>
3696+ </packing>
3697+ </child>
3698+ <child>
3699+ <object class="GtkScrolledWindow" id="scrolledwindow1">
3700+ <property name="visible">True</property>
3701+ <property name="can_focus">True</property>
3702+ <property name="hscrollbar_policy">automatic</property>
3703+ <child>
3704+ <object class="GtkTreeView" id="metaq_view">
3705+ <property name="visible">True</property>
3706+ <property name="sensitive">False</property>
3707+ <property name="can_focus">True</property>
3708+ <property name="model">metaq_store</property>
3709+ <property name="headers_clickable">False</property>
3710+ <property name="rules_hint">True</property>
3711+ <property name="search_column">0</property>
3712+ <property name="enable_grid_lines">both</property>
3713+ <property name="enable_tree_lines">True</property>
3714+ <child>
3715+ <object class="GtkTreeViewColumn" id="metaq_operation">
3716+ <property name="resizable">True</property>
3717+ <property name="title">Operation</property>
3718+ <property name="expand">True</property>
3719+ <child>
3720+ <object class="GtkCellRendererText" id="cellrenderertext1"/>
3721+ <attributes>
3722+ <attribute name="markup">0</attribute>
3723+ </attributes>
3724+ </child>
3725+ </object>
3726+ </child>
3727+ <child>
3728+ <object class="GtkTreeViewColumn" id="metaq_path">
3729+ <property name="title">Path</property>
3730+ <property name="expand">True</property>
3731+ <child>
3732+ <object class="GtkCellRendererText" id="cellrenderertext2"/>
3733+ <attributes>
3734+ <attribute name="markup">1</attribute>
3735+ </attributes>
3736+ </child>
3737+ </object>
3738+ </child>
3739+ <child>
3740+ <object class="GtkTreeViewColumn" id="metaq_share">
3741+ <property name="title">Share</property>
3742+ <property name="expand">True</property>
3743+ <child>
3744+ <object class="GtkCellRendererText" id="cellrenderertext4"/>
3745+ <attributes>
3746+ <attribute name="markup">2</attribute>
3747+ </attributes>
3748+ </child>
3749+ </object>
3750+ </child>
3751+ <child>
3752+ <object class="GtkTreeViewColumn" id="metaq_node">
3753+ <property name="title">Node</property>
3754+ <property name="expand">True</property>
3755+ <child>
3756+ <object class="GtkCellRendererText" id="cellrenderertext3"/>
3757+ <attributes>
3758+ <attribute name="markup">3</attribute>
3759+ </attributes>
3760+ </child>
3761+ </object>
3762+ </child>
3763+ </object>
3764+ </child>
3765+ </object>
3766+ <packing>
3767+ <property name="position">1</property>
3768+ </packing>
3769+ </child>
3770+ </object>
3771+ <packing>
3772+ <property name="resize">True</property>
3773+ <property name="shrink">True</property>
3774+ </packing>
3775+ </child>
3776+ <child>
3777+ <object class="GtkHBox" id="hbox4">
3778+ <property name="visible">True</property>
3779+ <child>
3780+ <object class="GtkLabel" id="contentq_label">
3781+ <property name="visible">True</property>
3782+ <property name="label" translatable="yes">Content Queue</property>
3783+ <property name="angle">90</property>
3784+ </object>
3785+ <packing>
3786+ <property name="expand">False</property>
3787+ <property name="fill">False</property>
3788+ <property name="position">0</property>
3789+ </packing>
3790+ </child>
3791+ <child>
3792+ <object class="GtkScrolledWindow" id="scrolledwindow2">
3793+ <property name="visible">True</property>
3794+ <property name="can_focus">True</property>
3795+ <property name="hscrollbar_policy">automatic</property>
3796+ <child>
3797+ <object class="GtkTreeView" id="contentq_view">
3798+ <property name="visible">True</property>
3799+ <property name="sensitive">False</property>
3800+ <property name="can_focus">True</property>
3801+ <property name="model">contentq_store</property>
3802+ <property name="headers_clickable">False</property>
3803+ <property name="rules_hint">True</property>
3804+ <property name="search_column">0</property>
3805+ <property name="enable_grid_lines">both</property>
3806+ <property name="enable_tree_lines">True</property>
3807+ <child>
3808+ <object class="GtkTreeViewColumn" id="contentq_operation">
3809+ <property name="title">Operation</property>
3810+ <property name="expand">True</property>
3811+ <child>
3812+ <object class="GtkCellRendererText" id="cellrenderertext5"/>
3813+ <attributes>
3814+ <attribute name="markup">0</attribute>
3815+ </attributes>
3816+ </child>
3817+ </object>
3818+ </child>
3819+ <child>
3820+ <object class="GtkTreeViewColumn" id="contentq_path">
3821+ <property name="title">Path</property>
3822+ <property name="expand">True</property>
3823+ <child>
3824+ <object class="GtkCellRendererText" id="cellrenderertext6"/>
3825+ <attributes>
3826+ <attribute name="markup">1</attribute>
3827+ </attributes>
3828+ </child>
3829+ </object>
3830+ </child>
3831+ <child>
3832+ <object class="GtkTreeViewColumn" id="contentq_share">
3833+ <property name="title">Share</property>
3834+ <property name="expand">True</property>
3835+ <child>
3836+ <object class="GtkCellRendererText" id="cellrenderertext8"/>
3837+ <attributes>
3838+ <attribute name="markup">2</attribute>
3839+ </attributes>
3840+ </child>
3841+ </object>
3842+ </child>
3843+ <child>
3844+ <object class="GtkTreeViewColumn" id="contentq_node">
3845+ <property name="title">Node</property>
3846+ <property name="expand">True</property>
3847+ <child>
3848+ <object class="GtkCellRendererText" id="cellrenderertext7"/>
3849+ <attributes>
3850+ <attribute name="markup">3</attribute>
3851+ </attributes>
3852+ </child>
3853+ </object>
3854+ </child>
3855+ </object>
3856+ </child>
3857+ </object>
3858+ <packing>
3859+ <property name="position">1</property>
3860+ </packing>
3861+ </child>
3862+ </object>
3863+ <packing>
3864+ <property name="resize">True</property>
3865+ <property name="shrink">True</property>
3866+ </packing>
3867+ </child>
3868+ </object>
3869+ <packing>
3870+ <property name="position">3</property>
3871+ </packing>
3872+ </child>
3873+ </object>
3874+ </child>
3875+ </object>
3876+ <object class="GtkStatusIcon" id="status_icon">
3877+ <property name="has_tooltip">True</property>
3878+ <property name="tooltip_text">Magicicada</property>
3879+ <property name="title">Magicicada</property>
3880+ <signal name="activate" handler="on_status_icon_activate"/>
3881+ </object>
3882+ <object class="GtkAboutDialog" id="about_dialog">
3883+ <property name="border_width">5</property>
3884+ <property name="type_hint">normal</property>
3885+ <property name="has_separator">False</property>
3886+ <property name="program_name">Magicicada</property>
3887+ <property name="copyright" translatable="yes">Copyright 2010 Chicharreros
3888+Copyright 2010 Natalia Bidart &lt;natalia.bidart@gmail.com&gt;
3889+Copyright 2010 Facundo Batista &lt;facundo@taniquetil.com.ar&gt;</property>
3890+ <property name="website">http://launchpad.net/magicicada</property>
3891+ <property name="license" translatable="yes">GNU General Public License
3892+
3893+This program is free software: you can redistribute it and/or modify it
3894+under the terms of the GNU General Public License version 3, as published
3895+by the Free Software Foundation.
3896+
3897+This program is distributed in the hope that it will be useful, but
3898+WITHOUT ANY WARRANTY; without even the implied warranties of
3899+MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
3900+PURPOSE. See the GNU General Public License for more details.
3901+
3902+You should have received a copy of the GNU General Public License along
3903+with this program. If not, see &lt;http://www.gnu.org/licenses/&gt;.</property>
3904+ <property name="authors">Natalia Bidart &lt;natalia.bidart@gmail.com&gt;
3905+Facundo Batista &lt;facundo@taniquetil.com.ar&gt;</property>
3906+ <child internal-child="vbox">
3907+ <object class="GtkVBox" id="dialog-vbox1">
3908+ <property name="visible">True</property>
3909+ <property name="spacing">2</property>
3910+ <child>
3911+ <placeholder/>
3912+ </child>
3913+ <child internal-child="action_area">
3914+ <object class="GtkHButtonBox" id="dialog-action_area1">
3915+ <property name="visible">True</property>
3916+ <property name="layout_style">end</property>
3917+ </object>
3918+ <packing>
3919+ <property name="expand">False</property>
3920+ <property name="pack_type">end</property>
3921+ <property name="position">0</property>
3922+ </packing>
3923+ </child>
3924+ </object>
3925+ </child>
3926+ </object>
3927+ <object class="GtkDialog" id="folders_dialog">
3928+ <property name="width_request">600</property>
3929+ <property name="height_request">300</property>
3930+ <property name="border_width">5</property>
3931+ <property name="title" translatable="yes">Folders</property>
3932+ <property name="modal">True</property>
3933+ <property name="window_position">center</property>
3934+ <property name="type_hint">normal</property>
3935+ <property name="has_separator">False</property>
3936+ <child internal-child="vbox">
3937+ <object class="GtkVBox" id="dialog-vbox2">
3938+ <property name="visible">True</property>
3939+ <property name="spacing">2</property>
3940+ <child>
3941+ <object class="GtkScrolledWindow" id="scrolledwindow3">
3942+ <property name="visible">True</property>
3943+ <property name="can_focus">True</property>
3944+ <property name="hscrollbar_policy">automatic</property>
3945+ <child>
3946+ <object class="GtkTreeView" id="folders_view">
3947+ <property name="visible">True</property>
3948+ <property name="can_focus">True</property>
3949+ <property name="model">folders_store</property>
3950+ <property name="headers_clickable">False</property>
3951+ <property name="rules_hint">True</property>
3952+ <property name="search_column">0</property>
3953+ <property name="enable_grid_lines">both</property>
3954+ <property name="enable_tree_lines">True</property>
3955+ <child>
3956+ <object class="GtkTreeViewColumn" id="folders_path">
3957+ <property name="resizable">True</property>
3958+ <property name="title">Path</property>
3959+ <property name="expand">True</property>
3960+ <child>
3961+ <object class="GtkCellRendererText" id="cellrenderertext10"/>
3962+ <attributes>
3963+ <attribute name="text">0</attribute>
3964+ </attributes>
3965+ </child>
3966+ </object>
3967+ </child>
3968+ <child>
3969+ <object class="GtkTreeViewColumn" id="folders_suggested_path">
3970+ <property name="resizable">True</property>
3971+ <property name="title">Suggested Path</property>
3972+ <property name="expand">True</property>
3973+ <child>
3974+ <object class="GtkCellRendererText" id="cellrenderertext11"/>
3975+ <attributes>
3976+ <attribute name="text">1</attribute>
3977+ </attributes>
3978+ </child>
3979+ </object>
3980+ </child>
3981+ <child>
3982+ <object class="GtkTreeViewColumn" id="folders_subscribed">
3983+ <property name="resizable">True</property>
3984+ <property name="title">Subscribed</property>
3985+ <property name="expand">True</property>
3986+ <child>
3987+ <object class="GtkCellRendererToggle" id="cellrenderertoggle1"/>
3988+ <attributes>
3989+ <attribute name="active">2</attribute>
3990+ </attributes>
3991+ </child>
3992+ </object>
3993+ </child>
3994+ </object>
3995+ </child>
3996+ </object>
3997+ <packing>
3998+ <property name="position">1</property>
3999+ </packing>
4000+ </child>
4001+ <child internal-child="action_area">
4002+ <object class="GtkHButtonBox" id="dialog-action_area2">
4003+ <property name="visible">True</property>
4004+ <property name="layout_style">end</property>
4005+ <child>
4006+ <object class="GtkButton" id="folders_close">
4007+ <property name="label">gtk-close</property>
4008+ <property name="visible">True</property>
4009+ <property name="can_focus">False</property>
4010+ <property name="receives_default">False</property>
4011+ <property name="use_stock">True</property>
4012+ <signal name="clicked" handler="on_folders_close_clicked"/>
4013+ <signal name="activate" handler="on_folders_close_clicked"/>
4014+ </object>
4015+ <packing>
4016+ <property name="expand">False</property>
4017+ <property name="fill">False</property>
4018+ <property name="position">0</property>
4019+ </packing>
4020+ </child>
4021+ </object>
4022+ <packing>
4023+ <property name="expand">False</property>
4024+ <property name="pack_type">end</property>
4025+ <property name="position">0</property>
4026+ </packing>
4027+ </child>
4028+ </object>
4029+ </child>
4030+ <action-widgets>
4031+ <action-widget response="0">folders_close</action-widget>
4032+ </action-widgets>
4033+ </object>
4034+ <object class="GtkDialog" id="shares_to_me_dialog">
4035+ <property name="width_request">600</property>
4036+ <property name="height_request">300</property>
4037+ <property name="border_width">5</property>
4038+ <property name="title" translatable="yes">Shares to me</property>
4039+ <property name="modal">True</property>
4040+ <property name="window_position">center</property>
4041+ <property name="type_hint">normal</property>
4042+ <property name="has_separator">False</property>
4043+ <child internal-child="vbox">
4044+ <object class="GtkVBox" id="dialog-vbox3">
4045+ <property name="visible">True</property>
4046+ <property name="spacing">2</property>
4047+ <child>
4048+ <object class="GtkScrolledWindow" id="scrolledwindow4">
4049+ <property name="visible">True</property>
4050+ <property name="can_focus">True</property>
4051+ <property name="hscrollbar_policy">automatic</property>
4052+ <property name="vscrollbar_policy">automatic</property>
4053+ <child>
4054+ <object class="GtkTreeView" id="shares_to_me_view">
4055+ <property name="visible">True</property>
4056+ <property name="can_focus">True</property>
4057+ <property name="model">shares_to_me_store</property>
4058+ <property name="rules_hint">True</property>
4059+ <property name="enable_grid_lines">both</property>
4060+ <property name="enable_tree_lines">True</property>
4061+ <child>
4062+ <object class="GtkTreeViewColumn" id="shares_to_me_name">
4063+ <property name="title">Name</property>
4064+ <property name="expand">True</property>
4065+ <child>
4066+ <object class="GtkCellRendererText" id="cellrenderertext15"/>
4067+ <attributes>
4068+ <attribute name="text">0</attribute>
4069+ </attributes>
4070+ </child>
4071+ </object>
4072+ </child>
4073+ <child>
4074+ <object class="GtkTreeViewColumn" id="shares_to_me_other">
4075+ <property name="title">Shared from</property>
4076+ <property name="expand">True</property>
4077+ <child>
4078+ <object class="GtkCellRendererText" id="cellrenderertext19"/>
4079+ <attributes>
4080+ <attribute name="text">1</attribute>
4081+ </attributes>
4082+ </child>
4083+ </object>
4084+ </child>
4085+ <child>
4086+ <object class="GtkTreeViewColumn" id="shates_to_me_accepted">
4087+ <property name="title">Accepted</property>
4088+ <property name="expand">True</property>
4089+ <child>
4090+ <object class="GtkCellRendererToggle" id="cellrenderertoggle2"/>
4091+ <attributes>
4092+ <attribute name="active">2</attribute>
4093+ </attributes>
4094+ </child>
4095+ </object>
4096+ </child>
4097+ <child>
4098+ <object class="GtkTreeViewColumn" id="shares_to_me_access_level">
4099+ <property name="title">Access level</property>
4100+ <property name="expand">True</property>
4101+ <child>
4102+ <object class="GtkCellRendererText" id="cellrenderertext13"/>
4103+ <attributes>
4104+ <attribute name="text">3</attribute>
4105+ </attributes>
4106+ </child>
4107+ </object>
4108+ </child>
4109+ <child>
4110+ <object class="GtkTreeViewColumn" id="shares_to_me_free_bytes">
4111+ <property name="title">Free bytes</property>
4112+ <property name="expand">True</property>
4113+ <child>
4114+ <object class="GtkCellRendererText" id="cellrenderertext14"/>
4115+ <attributes>
4116+ <attribute name="text">4</attribute>
4117+ </attributes>
4118+ </child>
4119+ </object>
4120+ </child>
4121+ <child>
4122+ <object class="GtkTreeViewColumn" id="shares_to_me_path">
4123+ <property name="title">Path</property>
4124+ <property name="expand">True</property>
4125+ <child>
4126+ <object class="GtkCellRendererText" id="cellrenderertext18"/>
4127+ <attributes>
4128+ <attribute name="text">5</attribute>
4129+ </attributes>
4130+ </child>
4131+ </object>
4132+ </child>
4133+ </object>
4134+ </child>
4135+ </object>
4136+ <packing>
4137+ <property name="position">1</property>
4138+ </packing>
4139+ </child>
4140+ <child internal-child="action_area">
4141+ <object class="GtkHButtonBox" id="dialog-action_area3">
4142+ <property name="visible">True</property>
4143+ <property name="layout_style">end</property>
4144+ <child>
4145+ <object class="GtkButton" id="shares_to_me_close">
4146+ <property name="label">gtk-close</property>
4147+ <property name="visible">True</property>
4148+ <property name="can_focus">True</property>
4149+ <property name="receives_default">True</property>
4150+ <property name="use_stock">True</property>
4151+ <signal name="clicked" handler="on_shares_to_me_close_clicked"/>
4152+ <signal name="activate" handler="on_shares_to_me_close_clicked"/>
4153+ </object>
4154+ <packing>
4155+ <property name="expand">False</property>
4156+ <property name="fill">False</property>
4157+ <property name="position">0</property>
4158+ </packing>
4159+ </child>
4160+ </object>
4161+ <packing>
4162+ <property name="expand">False</property>
4163+ <property name="pack_type">end</property>
4164+ <property name="position">0</property>
4165+ </packing>
4166+ </child>
4167+ </object>
4168+ </child>
4169+ <action-widgets>
4170+ <action-widget response="0">shares_to_me_close</action-widget>
4171+ </action-widgets>
4172+ </object>
4173+ <object class="GtkDialog" id="shares_to_others_dialog">
4174+ <property name="width_request">600</property>
4175+ <property name="height_request">300</property>
4176+ <property name="border_width">5</property>
4177+ <property name="title" translatable="yes">Shares to others</property>
4178+ <property name="modal">True</property>
4179+ <property name="window_position">center</property>
4180+ <property name="type_hint">normal</property>
4181+ <property name="has_separator">False</property>
4182+ <child internal-child="vbox">
4183+ <object class="GtkVBox" id="dialog-vbox5">
4184+ <property name="visible">True</property>
4185+ <property name="spacing">2</property>
4186+ <child>
4187+ <object class="GtkScrolledWindow" id="scrolledwindow5">
4188+ <property name="visible">True</property>
4189+ <property name="can_focus">True</property>
4190+ <property name="hscrollbar_policy">automatic</property>
4191+ <property name="vscrollbar_policy">automatic</property>
4192+ <child>
4193+ <object class="GtkTreeView" id="shares_to_others_view">
4194+ <property name="visible">True</property>
4195+ <property name="can_focus">True</property>
4196+ <property name="model">shares_to_others_store</property>
4197+ <property name="headers_clickable">False</property>
4198+ <property name="rules_hint">True</property>
4199+ <property name="search_column">0</property>
4200+ <property name="enable_grid_lines">both</property>
4201+ <property name="enable_tree_lines">True</property>
4202+ <child>
4203+ <object class="GtkTreeViewColumn" id="shares_to_others_name">
4204+ <property name="title">Name</property>
4205+ <property name="expand">True</property>
4206+ <child>
4207+ <object class="GtkCellRendererText" id="cellrenderertext20"/>
4208+ <attributes>
4209+ <attribute name="text">0</attribute>
4210+ </attributes>
4211+ </child>
4212+ </object>
4213+ </child>
4214+ <child>
4215+ <object class="GtkTreeViewColumn" id="shares_to_others_other">
4216+ <property name="title">Shared to</property>
4217+ <property name="expand">True</property>
4218+ <child>
4219+ <object class="GtkCellRendererText" id="cellrenderertext21"/>
4220+ <attributes>
4221+ <attribute name="text">1</attribute>
4222+ </attributes>
4223+ </child>
4224+ </object>
4225+ </child>
4226+ <child>
4227+ <object class="GtkTreeViewColumn" id="shates_to_others_accepted">
4228+ <property name="title">Accepted</property>
4229+ <property name="expand">True</property>
4230+ <child>
4231+ <object class="GtkCellRendererToggle" id="cellrenderertoggle3"/>
4232+ <attributes>
4233+ <attribute name="active">2</attribute>
4234+ </attributes>
4235+ </child>
4236+ </object>
4237+ </child>
4238+ <child>
4239+ <object class="GtkTreeViewColumn" id="shares_to_others_access_level">
4240+ <property name="title">Access level</property>
4241+ <property name="expand">True</property>
4242+ <child>
4243+ <object class="GtkCellRendererText" id="cellrenderertext22"/>
4244+ <attributes>
4245+ <attribute name="text">3</attribute>
4246+ </attributes>
4247+ </child>
4248+ </object>
4249+ </child>
4250+ <child>
4251+ <object class="GtkTreeViewColumn" id="shares_to_others_free_bytes">
4252+ <property name="title">Free bytes</property>
4253+ <property name="expand">True</property>
4254+ <child>
4255+ <object class="GtkCellRendererText" id="cellrenderertext23"/>
4256+ <attributes>
4257+ <attribute name="text">4</attribute>
4258+ </attributes>
4259+ </child>
4260+ </object>
4261+ </child>
4262+ <child>
4263+ <object class="GtkTreeViewColumn" id="shares_to_others_path">
4264+ <property name="title">Path</property>
4265+ <property name="expand">True</property>
4266+ <child>
4267+ <object class="GtkCellRendererText" id="cellrenderertext24"/>
4268+ <attributes>
4269+ <attribute name="text">5</attribute>
4270+ </attributes>
4271+ </child>
4272+ </object>
4273+ </child>
4274+ </object>
4275+ </child>
4276+ </object>
4277+ <packing>
4278+ <property name="position">1</property>
4279+ </packing>
4280+ </child>
4281+ <child internal-child="action_area">
4282+ <object class="GtkHButtonBox" id="dialog-action_area5">
4283+ <property name="visible">True</property>
4284+ <property name="layout_style">end</property>
4285+ <child>
4286+ <object class="GtkButton" id="shares_to_others_close">
4287+ <property name="label">gtk-close</property>
4288+ <property name="visible">True</property>
4289+ <property name="can_focus">True</property>
4290+ <property name="receives_default">True</property>
4291+ <property name="use_stock">True</property>
4292+ <signal name="clicked" handler="on_shares_to_others_close_clicked"/>
4293+ <signal name="activate" handler="on_shares_to_others_close_clicked"/>
4294+ </object>
4295+ <packing>
4296+ <property name="expand">False</property>
4297+ <property name="fill">False</property>
4298+ <property name="position">0</property>
4299+ </packing>
4300+ </child>
4301+ </object>
4302+ <packing>
4303+ <property name="expand">False</property>
4304+ <property name="pack_type">end</property>
4305+ <property name="position">0</property>
4306+ </packing>
4307+ </child>
4308+ </object>
4309+ </child>
4310+ <action-widgets>
4311+ <action-widget response="0">shares_to_others_close</action-widget>
4312+ </action-widgets>
4313+ </object>
4314+ <object class="GtkFileChooserDialog" id="file_chooser">
4315+ <property name="border_width">5</property>
4316+ <property name="window_position">center</property>
4317+ <property name="type_hint">normal</property>
4318+ <property name="has_separator">False</property>
4319+ <property name="create_folders">False</property>
4320+ <signal name="file_activated" handler="on_file_chooser_open_clicked"/>
4321+ <signal name="show" handler="on_file_chooser_show"/>
4322+ <child internal-child="vbox">
4323+ <object class="GtkVBox" id="dialog-vbox7">
4324+ <property name="visible">True</property>
4325+ <property name="spacing">2</property>
4326+ <child>
4327+ <placeholder/>
4328+ </child>
4329+ <child internal-child="action_area">
4330+ <object class="GtkHButtonBox" id="dialog-action_area7">
4331+ <property name="visible">True</property>
4332+ <property name="layout_style">end</property>
4333+ <child>
4334+ <object class="GtkButton" id="file_chooser_cancel">
4335+ <property name="label">gtk-cancel</property>
4336+ <property name="visible">True</property>
4337+ <property name="can_focus">True</property>
4338+ <property name="receives_default">True</property>
4339+ <property name="use_stock">True</property>
4340+ </object>
4341+ <packing>
4342+ <property name="expand">False</property>
4343+ <property name="fill">False</property>
4344+ <property name="position">0</property>
4345+ </packing>
4346+ </child>
4347+ <child>
4348+ <object class="GtkButton" id="file_chooser_open">
4349+ <property name="label">gtk-open</property>
4350+ <property name="visible">True</property>
4351+ <property name="can_focus">True</property>
4352+ <property name="receives_default">True</property>
4353+ <property name="use_stock">True</property>
4354+ <signal name="clicked" handler="on_file_chooser_open_clicked"/>
4355+ <signal name="activate" handler="on_file_chooser_open_clicked"/>
4356+ </object>
4357+ <packing>
4358+ <property name="expand">False</property>
4359+ <property name="fill">False</property>
4360+ <property name="position">1</property>
4361+ </packing>
4362+ </child>
4363+ </object>
4364+ <packing>
4365+ <property name="expand">False</property>
4366+ <property name="pack_type">end</property>
4367+ <property name="position">0</property>
4368+ </packing>
4369+ </child>
4370+ </object>
4371+ </child>
4372+ <action-widgets>
4373+ <action-widget response="-6">file_chooser_cancel</action-widget>
4374+ <action-widget response="0">file_chooser_open</action-widget>
4375+ </action-widgets>
4376+ </object>
4377+</interface>
4378
4379=== removed file 'data/ui/gui.glade'
4380--- data/ui/gui.glade 2010-07-29 12:47:10 +0000
4381+++ data/ui/gui.glade 1970-01-01 00:00:00 +0000
4382@@ -1,1043 +0,0 @@
4383-<?xml version="1.0"?>
4384-<interface>
4385- <requires lib="gtk+" version="2.16"/>
4386- <!-- interface-naming-policy project-wide -->
4387- <object class="GtkListStore" id="contentq_store">
4388- <columns>
4389- <!-- column-name operation -->
4390- <column type="gchararray"/>
4391- <!-- column-name path -->
4392- <column type="gchararray"/>
4393- <!-- column-name share -->
4394- <column type="gchararray"/>
4395- <!-- column-name node -->
4396- <column type="gchararray"/>
4397- </columns>
4398- </object>
4399- <object class="GtkListStore" id="metaq_store">
4400- <columns>
4401- <!-- column-name operation -->
4402- <column type="gchararray"/>
4403- <!-- column-name path -->
4404- <column type="gchararray"/>
4405- <!-- column-name share -->
4406- <column type="gchararray"/>
4407- <!-- column-name node -->
4408- <column type="gchararray"/>
4409- </columns>
4410- </object>
4411- <object class="GtkListStore" id="folders_store">
4412- <columns>
4413- <!-- column-name path -->
4414- <column type="gchararray"/>
4415- <!-- column-name suggested_path -->
4416- <column type="gchararray"/>
4417- <!-- column-name subscribed -->
4418- <column type="gboolean"/>
4419- <!-- column-name node -->
4420- <column type="gchararray"/>
4421- <!-- column-name volume -->
4422- <column type="gchararray"/>
4423- </columns>
4424- </object>
4425- <object class="GtkListStore" id="shares_to_others_store">
4426- <columns>
4427- <!-- column-name name -->
4428- <column type="gchararray"/>
4429- <!-- column-name other_visible_name -->
4430- <column type="gchararray"/>
4431- <!-- column-name accepted -->
4432- <column type="gboolean"/>
4433- <!-- column-name access_level -->
4434- <column type="gchararray"/>
4435- <!-- column-name free_bytes -->
4436- <column type="gchararray"/>
4437- <!-- column-name path -->
4438- <column type="gchararray"/>
4439- <!-- column-name other_username -->
4440- <column type="gchararray"/>
4441- <!-- column-name node -->
4442- <column type="gchararray"/>
4443- <!-- column-name volume -->
4444- <column type="gchararray"/>
4445- </columns>
4446- </object>
4447- <object class="GtkListStore" id="shares_to_me_store">
4448- <columns>
4449- <!-- column-name name -->
4450- <column type="gchararray"/>
4451- <!-- column-name other_visible_name -->
4452- <column type="gchararray"/>
4453- <!-- column-name accepted -->
4454- <column type="gboolean"/>
4455- <!-- column-name access_level -->
4456- <column type="gchararray"/>
4457- <!-- column-name free_bytes -->
4458- <column type="gchararray"/>
4459- <!-- column-name path -->
4460- <column type="gchararray"/>
4461- <!-- column-name other_username -->
4462- <column type="gchararray"/>
4463- <!-- column-name node -->
4464- <column type="gchararray"/>
4465- <!-- column-name volume -->
4466- <column type="gchararray"/>
4467- </columns>
4468- </object>
4469- <object class="GtkWindow" id="main_window">
4470- <property name="width_request">800</property>
4471- <property name="height_request">600</property>
4472- <property name="visible">True</property>
4473- <property name="title" translatable="yes">Magicicada</property>
4474- <property name="window_position">center</property>
4475- <signal name="destroy" handler="on_main_window_destroy"/>
4476- <child>
4477- <object class="GtkVBox" id="vbox1">
4478- <property name="visible">True</property>
4479- <child>
4480- <object class="GtkMenuBar" id="menubar">
4481- <property name="visible">True</property>
4482- <child>
4483- <object class="GtkMenuItem" id="menuitem1">
4484- <property name="visible">True</property>
4485- <property name="label" translatable="yes">_File</property>
4486- <property name="use_underline">True</property>
4487- <child type="submenu">
4488- <object class="GtkMenu" id="menu1">
4489- <property name="visible">True</property>
4490- <child>
4491- <object class="GtkImageMenuItem" id="quit">
4492- <property name="label">gtk-quit</property>
4493- <property name="visible">True</property>
4494- <property name="use_underline">True</property>
4495- <property name="use_stock">True</property>
4496- <signal name="activate" handler="on_quit_activate"/>
4497- </object>
4498- </child>
4499- </object>
4500- </child>
4501- </object>
4502- </child>
4503- <child>
4504- <object class="GtkMenuItem" id="menuitem4">
4505- <property name="visible">True</property>
4506- <property name="label" translatable="yes">_Help</property>
4507- <property name="use_underline">True</property>
4508- <child type="submenu">
4509- <object class="GtkMenu" id="menu3">
4510- <property name="visible">True</property>
4511- <child>
4512- <object class="GtkImageMenuItem" id="about">
4513- <property name="label">gtk-about</property>
4514- <property name="visible">True</property>
4515- <property name="use_underline">True</property>
4516- <property name="use_stock">True</property>
4517- <signal name="activate" handler="on_about_activate"/>
4518- </object>
4519- </child>
4520- </object>
4521- </child>
4522- </object>
4523- </child>
4524- </object>
4525- <packing>
4526- <property name="expand">False</property>
4527- <property name="position">0</property>
4528- </packing>
4529- </child>
4530- <child>
4531- <object class="GtkToolbar" id="toolbar">
4532- <property name="visible">True</property>
4533- <property name="toolbar_style">both</property>
4534- <child>
4535- <object class="GtkToolButton" id="start">
4536- <property name="width_request">50</property>
4537- <property name="visible">True</property>
4538- <property name="label" translatable="yes">Start</property>
4539- <property name="use_underline">True</property>
4540- <property name="stock_id">gtk-apply</property>
4541- <signal name="clicked" handler="on_start_clicked"/>
4542- </object>
4543- <packing>
4544- <property name="expand">False</property>
4545- <property name="homogeneous">True</property>
4546- </packing>
4547- </child>
4548- <child>
4549- <object class="GtkToolButton" id="stop">
4550- <property name="width_request">50</property>
4551- <property name="label" translatable="yes">Stop</property>
4552- <property name="use_underline">True</property>
4553- <property name="stock_id">gtk-stop</property>
4554- <signal name="clicked" handler="on_stop_clicked"/>
4555- </object>
4556- <packing>
4557- <property name="expand">False</property>
4558- <property name="homogeneous">True</property>
4559- </packing>
4560- </child>
4561- <child>
4562- <object class="GtkToolButton" id="connect">
4563- <property name="width_request">85</property>
4564- <property name="visible">True</property>
4565- <property name="sensitive">False</property>
4566- <property name="label" translatable="yes">Connect</property>
4567- <property name="use_underline">True</property>
4568- <property name="stock_id">gtk-connect</property>
4569- <signal name="clicked" handler="on_connect_clicked"/>
4570- </object>
4571- <packing>
4572- <property name="expand">False</property>
4573- <property name="homogeneous">True</property>
4574- </packing>
4575- </child>
4576- <child>
4577- <object class="GtkToolButton" id="disconnect">
4578- <property name="width_request">85</property>
4579- <property name="label" translatable="yes">Disconnect</property>
4580- <property name="use_underline">True</property>
4581- <property name="stock_id">gtk-disconnect</property>
4582- <signal name="clicked" handler="on_disconnect_clicked"/>
4583- </object>
4584- <packing>
4585- <property name="expand">False</property>
4586- <property name="homogeneous">True</property>
4587- </packing>
4588- </child>
4589- <child>
4590- <object class="GtkSeparatorToolItem" id="separator">
4591- <property name="visible">True</property>
4592- </object>
4593- <packing>
4594- <property name="expand">False</property>
4595- <property name="homogeneous">True</property>
4596- </packing>
4597- </child>
4598- <child>
4599- <object class="GtkToolButton" id="folders">
4600- <property name="visible">True</property>
4601- <property name="sensitive">False</property>
4602- <property name="label" translatable="yes">Folders</property>
4603- <property name="use_underline">True</property>
4604- <property name="stock_id">gtk-directory</property>
4605- <signal name="clicked" handler="on_folders_clicked"/>
4606- </object>
4607- <packing>
4608- <property name="expand">False</property>
4609- <property name="homogeneous">True</property>
4610- </packing>
4611- </child>
4612- <child>
4613- <object class="GtkToolButton" id="shares_to_me">
4614- <property name="visible">True</property>
4615- <property name="sensitive">False</property>
4616- <property name="label" translatable="yes">Shares to me</property>
4617- <property name="use_underline">True</property>
4618- <property name="stock_id">gtk-network</property>
4619- <signal name="clicked" handler="on_shares_to_me_clicked"/>
4620- </object>
4621- <packing>
4622- <property name="expand">False</property>
4623- <property name="homogeneous">True</property>
4624- </packing>
4625- </child>
4626- <child>
4627- <object class="GtkToolButton" id="shares_to_others">
4628- <property name="visible">True</property>
4629- <property name="sensitive">False</property>
4630- <property name="label" translatable="yes">Shares to others</property>
4631- <property name="use_underline">True</property>
4632- <property name="stock_id">gtk-network</property>
4633- <signal name="clicked" handler="on_shares_to_others_clicked"/>
4634- </object>
4635- <packing>
4636- <property name="expand">False</property>
4637- <property name="homogeneous">True</property>
4638- </packing>
4639- </child>
4640- <child>
4641- <object class="GtkToolButton" id="raw_metadata">
4642- <property name="visible">True</property>
4643- <property name="sensitive">False</property>
4644- <property name="label" translatable="yes">Metadata</property>
4645- <property name="use_underline">True</property>
4646- <property name="stock_id">gtk-find</property>
4647- <signal name="clicked" handler="on_raw_metadata_clicked"/>
4648- </object>
4649- <packing>
4650- <property name="expand">False</property>
4651- <property name="homogeneous">True</property>
4652- </packing>
4653- </child>
4654- </object>
4655- <packing>
4656- <property name="expand">False</property>
4657- <property name="position">1</property>
4658- </packing>
4659- </child>
4660- <child>
4661- <object class="GtkHBox" id="hbox1">
4662- <property name="visible">True</property>
4663- <child>
4664- <object class="GtkHBox" id="hbox2">
4665- <property name="visible">True</property>
4666- <child>
4667- <object class="GtkImage" id="is_started">
4668- <property name="width_request">30</property>
4669- <property name="visible">True</property>
4670- <property name="sensitive">False</property>
4671- <property name="xpad">3</property>
4672- <property name="ypad">3</property>
4673- <property name="stock">gtk-yes</property>
4674- </object>
4675- <packing>
4676- <property name="position">0</property>
4677- </packing>
4678- </child>
4679- <child>
4680- <object class="GtkImage" id="is_connected">
4681- <property name="width_request">30</property>
4682- <property name="visible">True</property>
4683- <property name="sensitive">False</property>
4684- <property name="xpad">3</property>
4685- <property name="ypad">3</property>
4686- <property name="stock">gtk-yes</property>
4687- </object>
4688- <packing>
4689- <property name="position">1</property>
4690- </packing>
4691- </child>
4692- <child>
4693- <object class="GtkImage" id="is_online">
4694- <property name="width_request">30</property>
4695- <property name="visible">True</property>
4696- <property name="sensitive">False</property>
4697- <property name="xpad">3</property>
4698- <property name="ypad">3</property>
4699- <property name="stock">gtk-yes</property>
4700- </object>
4701- <packing>
4702- <property name="position">2</property>
4703- </packing>
4704- </child>
4705- </object>
4706- <packing>
4707- <property name="expand">False</property>
4708- <property name="position">0</property>
4709- </packing>
4710- </child>
4711- <child>
4712- <object class="GtkLabel" id="status_label">
4713- <property name="visible">True</property>
4714- <property name="ellipsize">end</property>
4715- </object>
4716- <packing>
4717- <property name="position">1</property>
4718- </packing>
4719- </child>
4720- </object>
4721- <packing>
4722- <property name="expand">False</property>
4723- <property name="padding">3</property>
4724- <property name="position">2</property>
4725- </packing>
4726- </child>
4727- <child>
4728- <object class="GtkVPaned" id="vpaned1">
4729- <property name="visible">True</property>
4730- <property name="can_focus">True</property>
4731- <child>
4732- <object class="GtkHBox" id="hbox3">
4733- <property name="visible">True</property>
4734- <child>
4735- <object class="GtkLabel" id="metaq_label">
4736- <property name="visible">True</property>
4737- <property name="label" translatable="yes">Metadata Queue</property>
4738- <property name="angle">90</property>
4739- </object>
4740- <packing>
4741- <property name="expand">False</property>
4742- <property name="fill">False</property>
4743- <property name="position">0</property>
4744- </packing>
4745- </child>
4746- <child>
4747- <object class="GtkScrolledWindow" id="scrolledwindow1">
4748- <property name="visible">True</property>
4749- <property name="can_focus">True</property>
4750- <property name="hscrollbar_policy">automatic</property>
4751- <child>
4752- <object class="GtkTreeView" id="metaq_view">
4753- <property name="visible">True</property>
4754- <property name="sensitive">False</property>
4755- <property name="can_focus">True</property>
4756- <property name="model">metaq_store</property>
4757- <property name="headers_clickable">False</property>
4758- <property name="rules_hint">True</property>
4759- <property name="search_column">0</property>
4760- <property name="enable_grid_lines">both</property>
4761- <property name="enable_tree_lines">True</property>
4762- <child>
4763- <object class="GtkTreeViewColumn" id="metaq_operation">
4764- <property name="resizable">True</property>
4765- <property name="title">Operation</property>
4766- <property name="expand">True</property>
4767- <child>
4768- <object class="GtkCellRendererText" id="cellrenderertext1"/>
4769- <attributes>
4770- <attribute name="markup">0</attribute>
4771- </attributes>
4772- </child>
4773- </object>
4774- </child>
4775- <child>
4776- <object class="GtkTreeViewColumn" id="metaq_path">
4777- <property name="title">Path</property>
4778- <property name="expand">True</property>
4779- <child>
4780- <object class="GtkCellRendererText" id="cellrenderertext2"/>
4781- <attributes>
4782- <attribute name="markup">1</attribute>
4783- </attributes>
4784- </child>
4785- </object>
4786- </child>
4787- <child>
4788- <object class="GtkTreeViewColumn" id="metaq_share">
4789- <property name="title">Share</property>
4790- <property name="expand">True</property>
4791- <child>
4792- <object class="GtkCellRendererText" id="cellrenderertext4"/>
4793- <attributes>
4794- <attribute name="markup">2</attribute>
4795- </attributes>
4796- </child>
4797- </object>
4798- </child>
4799- <child>
4800- <object class="GtkTreeViewColumn" id="metaq_node">
4801- <property name="title">Node</property>
4802- <property name="expand">True</property>
4803- <child>
4804- <object class="GtkCellRendererText" id="cellrenderertext3"/>
4805- <attributes>
4806- <attribute name="markup">3</attribute>
4807- </attributes>
4808- </child>
4809- </object>
4810- </child>
4811- </object>
4812- </child>
4813- </object>
4814- <packing>
4815- <property name="position">1</property>
4816- </packing>
4817- </child>
4818- </object>
4819- <packing>
4820- <property name="resize">True</property>
4821- <property name="shrink">True</property>
4822- </packing>
4823- </child>
4824- <child>
4825- <object class="GtkHBox" id="hbox4">
4826- <property name="visible">True</property>
4827- <child>
4828- <object class="GtkLabel" id="contentq_label">
4829- <property name="visible">True</property>
4830- <property name="label" translatable="yes">Content Queue</property>
4831- <property name="angle">90</property>
4832- </object>
4833- <packing>
4834- <property name="expand">False</property>
4835- <property name="fill">False</property>
4836- <property name="position">0</property>
4837- </packing>
4838- </child>
4839- <child>
4840- <object class="GtkScrolledWindow" id="scrolledwindow2">
4841- <property name="visible">True</property>
4842- <property name="can_focus">True</property>
4843- <property name="hscrollbar_policy">automatic</property>
4844- <child>
4845- <object class="GtkTreeView" id="contentq_view">
4846- <property name="visible">True</property>
4847- <property name="sensitive">False</property>
4848- <property name="can_focus">True</property>
4849- <property name="model">contentq_store</property>
4850- <property name="headers_clickable">False</property>
4851- <property name="rules_hint">True</property>
4852- <property name="search_column">0</property>
4853- <property name="enable_grid_lines">both</property>
4854- <property name="enable_tree_lines">True</property>
4855- <child>
4856- <object class="GtkTreeViewColumn" id="contentq_operation">
4857- <property name="title">Operation</property>
4858- <property name="expand">True</property>
4859- <child>
4860- <object class="GtkCellRendererText" id="cellrenderertext5"/>
4861- <attributes>
4862- <attribute name="markup">0</attribute>
4863- </attributes>
4864- </child>
4865- </object>
4866- </child>
4867- <child>
4868- <object class="GtkTreeViewColumn" id="contentq_path">
4869- <property name="title">Path</property>
4870- <property name="expand">True</property>
4871- <child>
4872- <object class="GtkCellRendererText" id="cellrenderertext6"/>
4873- <attributes>
4874- <attribute name="markup">1</attribute>
4875- </attributes>
4876- </child>
4877- </object>
4878- </child>
4879- <child>
4880- <object class="GtkTreeViewColumn" id="contentq_share">
4881- <property name="title">Share</property>
4882- <property name="expand">True</property>
4883- <child>
4884- <object class="GtkCellRendererText" id="cellrenderertext8"/>
4885- <attributes>
4886- <attribute name="markup">2</attribute>
4887- </attributes>
4888- </child>
4889- </object>
4890- </child>
4891- <child>
4892- <object class="GtkTreeViewColumn" id="contentq_node">
4893- <property name="title">Node</property>
4894- <property name="expand">True</property>
4895- <child>
4896- <object class="GtkCellRendererText" id="cellrenderertext7"/>
4897- <attributes>
4898- <attribute name="markup">3</attribute>
4899- </attributes>
4900- </child>
4901- </object>
4902- </child>
4903- </object>
4904- </child>
4905- </object>
4906- <packing>
4907- <property name="position">1</property>
4908- </packing>
4909- </child>
4910- </object>
4911- <packing>
4912- <property name="resize">True</property>
4913- <property name="shrink">True</property>
4914- </packing>
4915- </child>
4916- </object>
4917- <packing>
4918- <property name="position">3</property>
4919- </packing>
4920- </child>
4921- </object>
4922- </child>
4923- </object>
4924- <object class="GtkStatusIcon" id="status_icon">
4925- <property name="has_tooltip">True</property>
4926- <property name="tooltip_text">Magicicada</property>
4927- <property name="title">Magicicada</property>
4928- <signal name="activate" handler="on_status_icon_activate"/>
4929- </object>
4930- <object class="GtkAboutDialog" id="about_dialog">
4931- <property name="border_width">5</property>
4932- <property name="type_hint">normal</property>
4933- <property name="has_separator">False</property>
4934- <property name="program_name">Magicicada</property>
4935- <property name="copyright" translatable="yes">Copyright 2010 Chicharreros
4936-Copyright 2010 Natalia Bidart &lt;natalia.bidart@gmail.com&gt;
4937-Copyright 2010 Facundo Batista &lt;facundo@taniquetil.com.ar&gt;</property>
4938- <property name="website">http://launchpad.net/magicicada</property>
4939- <property name="license" translatable="yes">GNU General Public License
4940-
4941-This program is free software: you can redistribute it and/or modify it
4942-under the terms of the GNU General Public License version 3, as published
4943-by the Free Software Foundation.
4944-
4945-This program is distributed in the hope that it will be useful, but
4946-WITHOUT ANY WARRANTY; without even the implied warranties of
4947-MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
4948-PURPOSE. See the GNU General Public License for more details.
4949-
4950-You should have received a copy of the GNU General Public License along
4951-with this program. If not, see &lt;http://www.gnu.org/licenses/&gt;.</property>
4952- <property name="authors">Natalia Bidart &lt;natalia.bidart@gmail.com&gt;
4953-Facundo Batista &lt;facundo@taniquetil.com.ar&gt;</property>
4954- <child internal-child="vbox">
4955- <object class="GtkVBox" id="dialog-vbox1">
4956- <property name="visible">True</property>
4957- <property name="spacing">2</property>
4958- <child>
4959- <placeholder/>
4960- </child>
4961- <child internal-child="action_area">
4962- <object class="GtkHButtonBox" id="dialog-action_area1">
4963- <property name="visible">True</property>
4964- <property name="layout_style">end</property>
4965- </object>
4966- <packing>
4967- <property name="expand">False</property>
4968- <property name="pack_type">end</property>
4969- <property name="position">0</property>
4970- </packing>
4971- </child>
4972- </object>
4973- </child>
4974- </object>
4975- <object class="GtkDialog" id="folders_dialog">
4976- <property name="width_request">600</property>
4977- <property name="height_request">300</property>
4978- <property name="border_width">5</property>
4979- <property name="title" translatable="yes">Folders</property>
4980- <property name="modal">True</property>
4981- <property name="window_position">center</property>
4982- <property name="type_hint">normal</property>
4983- <property name="skip_taskbar_hint">True</property>
4984- <property name="has_separator">False</property>
4985- <child internal-child="vbox">
4986- <object class="GtkVBox" id="dialog-vbox2">
4987- <property name="visible">True</property>
4988- <property name="spacing">2</property>
4989- <child>
4990- <object class="GtkScrolledWindow" id="scrolledwindow3">
4991- <property name="visible">True</property>
4992- <property name="can_focus">True</property>
4993- <property name="hscrollbar_policy">automatic</property>
4994- <child>
4995- <object class="GtkTreeView" id="folders_view">
4996- <property name="visible">True</property>
4997- <property name="can_focus">True</property>
4998- <property name="model">folders_store</property>
4999- <property name="headers_clickable">False</property>
5000- <property name="rules_hint">True</property>
The diff has been truncated for viewing.

Subscribers

People subscribed via source and target branches

to all changes: