brewtarget
My previous emails with attachments did not stick. So I try again now
as my version of brewtarget has somehow made it into unstable. Please
unblock this.
diff -Nru brewtarget-1.2.4/brewtarget.desktop.in brewtarget-1.2.5/brewtarget.desktop.in
--- brewtarget-1.2.4/brewtarget.desktop.in 2011-10-31 21:37:21.000000000 +0000
+++ brewtarget-1.2.5/brewtarget.desktop.in 2012-07-14 18:49:41.000000000 +0100
@@ -1,6 +1,5 @@
[Desktop Entry]
Categories=Qt;KDE;Education;Utility;Engineering
-Encoding=UTF-8
Exec=brewtarget
Name=Brewtarget
GenericName=Beer calculator
diff -Nru brewtarget-1.2.4/brewtarget.qrc brewtarget-1.2.5/brewtarget.qrc
--- brewtarget-1.2.4/brewtarget.qrc 2011-10-31 21:37:21.000000000 +0000
+++ brewtarget-1.2.5/brewtarget.qrc 2012-07-14 18:49:41.000000000 +0100
@@ -26,19 +26,19 @@
<file>images/clock.svg</file>
<file>css/brewday.css</file>
<file>css/recipe.css</file>
- <file>images/btFlagCatalonia.png</file>
- <file>images/flagFrance.png</file>
- <file>images/flagGermany.png</file>
- <file>images/flagPoland.png</file>
- <file>images/flagPortugal.png</file>
- <file>images/flagNetherlands.png</file>
- <file>images/flagSpain.png</file>
- <file>images/flagUK.png</file>
- <file>images/flagCzech.png</file>
+ <file>images/flagCatalonia.svg</file>
+ <file>images/flagFrance.svg</file>
+ <file>images/flagGermany.svg</file>
+ <file>images/flagPoland.svg</file>
+ <file>images/flagPortugal.svg</file>
+ <file>images/flagNetherlands.svg</file>
+ <file>images/flagSpain.svg</file>
+ <file>images/flagUK.svg</file>
+ <file>images/flagCzech.svg</file>
<file>images/server-database.png</file>
<file>images/printer.png</file>
<file>images/merge.png</file>
- <file>images/restore.png</file>
+ <file>images/restore.svg</file>
<file>images/edit-copy.png</file>
<file>images/document-print-preview.png</file>
<file>images/document-export.png</file>
diff -Nru brewtarget-1.2.4/CMakeLists.txt brewtarget-1.2.5/CMakeLists.txt
--- brewtarget-1.2.4/CMakeLists.txt 2011-10-31 21:37:21.000000000 +0000
+++ brewtarget-1.2.5/CMakeLists.txt 2012-07-14 18:49:41.000000000 +0100
@@ -11,7 +11,7 @@
#=================================Version======================================
SET( brewtarget_VERSION_MAJOR 1 )
SET( brewtarget_VERSION_MINOR 2 )
-SET( brewtarget_VERSION_PATCH 4 )
+SET( brewtarget_VERSION_PATCH 5 )
SET( brewtarget_VERSION_STRING "${brewtarget_VERSION_MAJOR}.${brewtarget_VERSION_MINOR}.${brewtarget_VERSION_PATCH}" )
#===================================Options====================================
@@ -31,7 +31,7 @@
"Update source translation *.ts files (WARNING: 'make clean' will delete the source .ts files! Danger!)"
OFF)
#==============================Compile flags===================================
-SET( CMAKE_CXX_FLAGS_RELEASE "-Wall -ansi -pedantic -O2" )
+SET( CMAKE_CXX_FLAGS_RELEASE "-Wall -ansi -pedantic -O2 -Wno-long-long" )
SET( CMAKE_CXX_FLAGS_DEBUG "-Wall -gstabs+" )
IF( ${ENABLE_PROFILING} )
diff -Nru brewtarget-1.2.4/COPYRIGHT brewtarget-1.2.5/COPYRIGHT
--- brewtarget-1.2.4/COPYRIGHT 2011-10-31 21:37:21.000000000 +0000
+++ brewtarget-1.2.5/COPYRIGHT 2012-07-14 18:49:41.000000000 +0100
@@ -1,5 +1,5 @@
Files: *
-Copyright: 2009-2011, Philip G. Lee <rocketman768@gmail.com>
+Copyright: 2009-2012, Philip G. Lee <rocketman768@gmail.com>
License: GPL-3
Files: data/sounds/*
@@ -8,26 +8,22 @@
Files: images/*
Copyright: 2009-2011, Philip G. Lee <rocketman768@gmail.com>
- 2009-2011, Eric Tamme
+ 2009-2010, Eric Tamme
License: WTFPL-2
-Files: images/flag*
-Copyright: 2009-2010 A68 Freelance Graphics Designs <a68designs@gmail.com>
-License: CC-BY-NC-ND-3.0
+Files: images/flag*.png images/restore.svg
+Copyright: 2012, Philip G. Lee <rocketman768@gmail.com>
+License: WTFPL-2
Files: images/edit-copy.png images/document-print-preview.png
images/merge.png images/printer.png images/server-database.png
Copyright: David Vignoni et al. <www.oxygen-icons.org>
-License: CC-BY-SA-3.0
+License: CC-BY-SA-3.0 or LGPL-3.0
Files: images/backup.png
Copyright: David Vignoni <www.icon-king.com/projects/nuvola>
License: LGPL-2.1
-Files: images/restore.png
-Copyright: FatCow Web Hosting <www.fatcow.com/free-icons>
-License: CC-BY-3.0
-
License: GPL-3
This package is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -62,3 +58,376 @@
A copy of the WTFPL-2 license can be found in the brewtarget source package
in the file COPYING.WTFPL.
+
+License: CC-BY-SA-3.0
+ THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS
+ CREATIVE COMMONS PUBLIC LICENSE ("CCPL" OR "LICENSE"). THE WORK IS
+ PROTECTED BY COPYRIGHT AND/OR OTHER APPLICABLE LAW. ANY USE OF THE
+ WORK OTHER THAN AS AUTHORIZED UNDER THIS LICENSE OR COPYRIGHT LAW IS
+ PROHIBITED.
+
+ BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND
+ AGREE TO BE BOUND BY THE TERMS OF THIS LICENSE. TO THE EXTENT THIS
+ LICENSE MAY BE CONSIDERED TO BE A CONTRACT, THE LICENSOR GRANTS YOU
+ THE RIGHTS CONTAINED HERE IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH
+ TERMS AND CONDITIONS.
+
+ 1. Definitions
+
+ a. "Adaptation" means a work based upon the Work, or upon the Work
+ and other pre-existing works, such as a translation, adaptation,
+ derivative work, arrangement of music or other alterations of a
+ literary or artistic work, or phonogram or performance and
+ includes cinematographic adaptations or any other form in which
+ the Work may be recast, transformed, or adapted including in any
+ form recognizably derived from the original, except that a work
+ that constitutes a Collection will not be considered an
+ Adaptation for the purpose of this License. For the avoidance of
+ doubt, where the Work is a musical work, performance or
+ phonogram, the synchronization of the Work in timed-relation with
+ a moving image ("synching") will be considered an Adaptation for
+ the purpose of this License.
+ b. "Collection" means a collection of literary or artistic works,
+ such as encyclopedias and anthologies, or performances,
+ phonograms or broadcasts, or other works or subject matter other
+ than works listed in Section 1(f) below, which, by reason of the
+ selection and arrangement of their contents, constitute
+ intellectual creations, in which the Work is included in its
+ entirety in unmodified form along with one or more other
+ contributions, each constituting separate and independent works
+ in themselves, which together are assembled into a collective
+ whole. A work that constitutes a Collection will not be
+ considered an Adaptation (as defined below) for the purposes of
+ this License.
+ c. "Creative Commons Compatible License" means a license that is
+ listed at http://creativecommons.org/compatiblelicenses that has
+ been approved by Creative Commons as being essentially equivalent
+ to this License, including, at a minimum, because that license:
+ (i) contains terms that have the same purpose, meaning and effect
+ as the License Elements of this License; and, (ii) explicitly
+ permits the relicensing of adaptations of works made available
+ under that license under this License or a Creative Commons
+ jurisdiction license with the same License Elements as this
+ License.
+ d. "Distribute" means to make available to the public the original
+ and copies of the Work or Adaptation, as appropriate, through
+ sale or other transfer of ownership.
+ e. "License Elements" means the following high-level license
+ attributes as selected by Licensor and indicated in the title of
+ this License: Attribution, ShareAlike.
+ f. "Licensor" means the individual, individuals, entity or entities
+ that offer(s) the Work under the terms of this License.
+ g. "Original Author" means, in the case of a literary or artistic
+ work, the individual, individuals, entity or entities who created
+ the Work or if no individual or entity can be identified, the
+ publisher; and in addition (i) in the case of a performance the
+ actors, singers, musicians, dancers, and other persons who act,
+ sing, deliver, declaim, play in, interpret or otherwise perform
+ literary or artistic works or expressions of folklore; (ii) in
+ the case of a phonogram the producer being the person or legal
+ entity who first fixes the sounds of a performance or other
+ sounds; and, (iii) in the case of broadcasts, the organization
+ that transmits the broadcast.
+ h. "Work" means the literary and/or artistic work offered under the
+ terms of this License including without limitation any production
+ in the literary, scientific and artistic domain, whatever may be
+ the mode or form of its expression including digital form, such
+ as a book, pamphlet and other writing; a lecture, address, sermon
+ or other work of the same nature; a dramatic or dramatico-musical
+ work; a choreographic work or entertainment in dumb show; a
+ musical composition with or without words; a cinematographic work
+ to which are assimilated works expressed by a process analogous
+ to cinematography; a work of drawing, painting, architecture,
+ sculpture, engraving or lithography; a photographic work to which
+ are assimilated works expressed by a process analogous to
+ photography; a work of applied art; an illustration, map, plan,
+ sketch or three-dimensional work relative to geography,
+ topography, architecture or science; a performance; a broadcast;
+ a phonogram; a compilation of data to the extent it is protected
+ as a copyrightable work; or a work performed by a variety or
+ circus performer to the extent it is not otherwise considered a
+ literary or artistic work.
+ i. "You" means an individual or entity exercising rights under this
+ License who has not previously violated the terms of this License
+ with respect to the Work, or who has received express permission
+ from the Licensor to exercise rights under this License despite a
+ previous violation.
+ j. "Publicly Perform" means to perform public recitations of the
+ Work and to communicate to the public those public recitations,
+ by any means or process, including by wire or wireless means or
+ public digital performances; to make available to the public
+ Works in such a way that members of the public may access these
+ Works from a place and at a place individually chosen by them; to
+ perform the Work to the public by any means or process and the
+ communication to the public of the performances of the Work,
+ including by public digital performance; to broadcast and
+ rebroadcast the Work by any means including signs, sounds or
+ images.
+ k. "Reproduce" means to make copies of the Work by any means
+ including without limitation by sound or visual recordings and
+ the right of fixation and reproducing fixations of the Work,
+ including storage of a protected performance or phonogram in
+ digital form or other electronic medium.
+
+ 2. Fair Dealing Rights. Nothing in this License is intended to
+ reduce, limit, or restrict any uses free from copyright or rights
+ arising from limitations or exceptions that are provided for in
+ connection with the copyright protection under copyright law or other
+ applicable laws.
+
+ 3. License Grant. Subject to the terms and conditions of this
+ License, Licensor hereby grants You a worldwide, royalty-free,
+ non-exclusive, perpetual (for the duration of the applicable
+ copyright) license to exercise the rights in the Work as stated
+ below:
+
+ a. to Reproduce the Work, to incorporate the Work into one or more
+ Collections, and to Reproduce the Work as incorporated in the
+ Collections;
+ b. to create and Reproduce Adaptations provided that any such
+ Adaptation, including any translation in any medium, takes
+ reasonable steps to clearly label, demarcate or otherwise
+ identify that changes were made to the original Work. For
+ example, a translation could be marked "The original work was
+ translated from English to Spanish," or a modification could
+ indicate "The original work has been modified.";
+ c. to Distribute and Publicly Perform the Work including as
+ incorporated in Collections; and,
+ d. to Distribute and Publicly Perform Adaptations.
+ e. For the avoidance of doubt:
+
+ i. Non-waivable Compulsory License Schemes. In those
+ jurisdictions in which the right to collect royalties through
+ any statutory or compulsory licensing scheme cannot be
+ waived, the Licensor reserves the exclusive right to collect
+ such royalties for any exercise by You of the rights granted
+ under this License;
+ ii. Waivable Compulsory License Schemes. In those jurisdictions
+ in which the right to collect royalties through any statutory
+ or compulsory licensing scheme can be waived, the Licensor
+ waives the exclusive right to collect such royalties for any
+ exercise by You of the rights granted under this License;
+ and,
+ iii. Voluntary License Schemes. The Licensor waives the right to
+ collect royalties, whether individually or, in the event that
+ the Licensor is a member of a collecting society that
+ administers voluntary licensing schemes, via that society,
+ from any exercise by You of the rights granted under this
+ License.
+
+ The above rights may be exercised in all media and formats whether
+ now known or hereafter devised. The above rights include the right to
+ make such modifications as are technically necessary to exercise the
+ rights in other media and formats. Subject to Section 8(f), all
+ rights not expressly granted by Licensor are hereby reserved.
+
+ 4. Restrictions. The license granted in Section 3 above is expressly
+ made subject to and limited by the following restrictions:
+
+ a. You may Distribute or Publicly Perform the Work only under the
+ terms of this License. You must include a copy of, or the Uniform
+ Resource Identifier (URI) for, this License with every copy of
+ the Work You Distribute or Publicly Perform. You may not offer or
+ impose any terms on the Work that restrict the terms of this
+ License or the ability of the recipient of the Work to exercise
+ the rights granted to that recipient under the terms of the
+ License. You may not sublicense the Work. You must keep intact
+ all notices that refer to this License and to the disclaimer of
+ warranties with every copy of the Work You Distribute or Publicly
+ Perform. When You Distribute or Publicly Perform the Work, You
+ may not impose any effective technological measures on the Work
+ that restrict the ability of a recipient of the Work from You to
+ exercise the rights granted to that recipient under the terms of
+ the License. This Section 4(a) applies to the Work as
+ incorporated in a Collection, but this does not require the
+ Collection apart from the Work itself to be made subject to the
+ terms of this License. If You create a Collection, upon notice
+ from any Licensor You must, to the extent practicable, remove
+ from the Collection any credit as required by Section 4(c), as
+ requested. If You create an Adaptation, upon notice from any
+ Licensor You must, to the extent practicable, remove from the
+ Adaptation any credit as required by Section 4(c), as requested.
+ b. You may Distribute or Publicly Perform an Adaptation only under
+ the terms of: (i) this License; (ii) a later version of this
+ License with the same License Elements as this License; (iii) a
+ Creative Commons jurisdiction license (either this or a later
+ license version) that contains the same License Elements as this
+ License (e.g., Attribution-ShareAlike 3.0 US)); (iv) a Creative
+ Commons Compatible License. If you license the Adaptation under
+ one of the licenses mentioned in (iv), you must comply with the
+ terms of that license. If you license the Adaptation under the
+ terms of any of the licenses mentioned in (i), (ii) or (iii) (the
+ "Applicable License"), you must comply with the terms of the
+ Applicable License generally and the following provisions: (I)
+ You must include a copy of, or the URI for, the Applicable
+ License with every copy of each Adaptation You Distribute or
+ Publicly Perform; (II) You may not offer or impose any terms on
+ the Adaptation that restrict the terms of the Applicable License
+ or the ability of the recipient of the Adaptation to exercise the
+ rights granted to that recipient under the terms of the
+ Applicable License; (III) You must keep intact all notices that
+ refer to the Applicable License and to the disclaimer of
+ warranties with every copy of the Work as included in the
+ Adaptation You Distribute or Publicly Perform; (IV) when You
+ Distribute or Publicly Perform the Adaptation, You may not impose
+ any effective technological measures on the Adaptation that
+ restrict the ability of a recipient of the Adaptation from You to
+ exercise the rights granted to that recipient under the terms of
+ the Applicable License. This Section 4(b) applies to the
+ Adaptation as incorporated in a Collection, but this does not
+ require the Collection apart from the Adaptation itself to be
+ made subject to the terms of the Applicable License.
+ c. If You Distribute, or Publicly Perform the Work or any
+ Adaptations or Collections, You must, unless a request has been
+ made pursuant to Section 4(a), keep intact all copyright notices
+ for the Work and provide, reasonable to the medium or means You
+ are utilizing: (i) the name of the Original Author (or pseudonym,
+ if applicable) if supplied, and/or if the Original Author and/or
+ Licensor designate another party or parties (e.g., a sponsor
+ institute, publishing entity, journal) for attribution
+ ("Attribution Parties") in Licensor's copyright notice, terms of
+ service or by other reasonable means, the name of such party or
+ parties; (ii) the title of the Work if supplied; (iii) to the
+ extent reasonably practicable, the URI, if any, that Licensor
+ specifies to be associated with the Work, unless such URI does
+ not refer to the copyright notice or licensing information for
+ the Work; and (iv) , consistent with Ssection 3(b), in the case
+ of an Adaptation, a credit identifying the use of the Work in the
+ Adaptation (e.g., "French translation of the Work by Original
+ Author," or "Screenplay based on original Work by Original
+ Author"). The credit required by this Section 4(c) may be
+ implemented in any reasonable manner; provided, however, that in
+ the case of a Adaptation or Collection, at a minimum such credit
+ will appear, if a credit for all contributing authors of the
+ Adaptation or Collection appears, then as part of these credits
+ and in a manner at least as prominent as the credits for the
+ other contributing authors. For the avoidance of doubt, You may
+ only use the credit required by this Section for the purpose of
+ attribution in the manner set out above and, by exercising Your
+ rights under this License, You may not implicitly or explicitly
+ assert or imply any connection with, sponsorship or endorsement
+ by the Original Author, Licensor and/or Attribution Parties, as
+ appropriate, of You or Your use of the Work, without the
+ separate, express prior written permission of the Original
+ Author, Licensor and/or Attribution Parties.
+ d. Except as otherwise agreed in writing by the Licensor or as may
+ be otherwise permitted by applicable law, if You Reproduce,
+ Distribute or Publicly Perform the Work either by itself or as
+ part of any Adaptations or Collections, You must not distort,
+ mutilate, modify or take other derogatory action in relation to
+ the Work which would be prejudicial to the Original Author's
+ honor or reputation. Licensor agrees that in those jurisdictions
+ (e.g. Japan), in which any exercise of the right granted in
+ Section 3(b) of this License (the right to make Adaptations)
+ would be deemed to be a distortion, mutilation, modification or
+ other derogatory action prejudicial to the Original Author's
+ honor and reputation, the Licensor will waive or not assert, as
+ appropriate, this Section, to the fullest extent permitted by the
+ applicable national law, to enable You to reasonably exercise
+ Your right under Section 3(b) of this License (right to make
+ Adaptations) but not otherwise.
+
+ 5. Representations, Warranties and Disclaimer
+
+ UNLESS OTHERWISE MUTUALLY AGREED TO BY THE PARTIES IN WRITING,
+ LICENSOR OFFERS THE WORK AS-IS AND MAKES NO REPRESENTATIONS OR
+ WARRANTIES OF ANY KIND CONCERNING THE WORK, EXPRESS, IMPLIED,
+ STATUTORY OR OTHERWISE, INCLUDING, WITHOUT LIMITATION, WARRANTIES OF
+ TITLE, MERCHANTIBILITY, FITNESS FOR A PARTICULAR PURPOSE,
+ NONINFRINGEMENT, OR THE ABSENCE OF LATENT OR OTHER DEFECTS, ACCURACY,
+ OR THE PRESENCE OF ABSENCE OF ERRORS, WHETHER OR NOT DISCOVERABLE.
+ SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OF IMPLIED WARRANTIES,
+ SO SUCH EXCLUSION MAY NOT APPLY TO YOU.
+
+ 6. Limitation on Liability. EXCEPT TO THE EXTENT REQUIRED BY
+ APPLICABLE LAW, IN NO EVENT WILL LICENSOR BE LIABLE TO YOU ON ANY
+ LEGAL THEORY FOR ANY SPECIAL, INCIDENTAL, CONSEQUENTIAL, PUNITIVE OR
+ EXEMPLARY DAMAGES ARISING OUT OF THIS LICENSE OR THE USE OF THE WORK,
+ EVEN IF LICENSOR HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+ 7. Termination
+
+ a. This License and the rights granted hereunder will terminate
+ automatically upon any breach by You of the terms of this
+ License. Individuals or entities who have received Adaptations or
+ Collections from You under this License, however, will not have
+ their licenses terminated provided such individuals or entities
+ remain in full compliance with those licenses. Sections 1, 2, 5,
+ 6, 7, and 8 will survive any termination of this License.
+ b. Subject to the above terms and conditions, the license granted
+ here is perpetual (for the duration of the applicable copyright
+ in the Work). Notwithstanding the above, Licensor reserves the
+ right to release the Work under different license terms or to
+ stop distributing the Work at any time; provided, however that
+ any such election will not serve to withdraw this License (or any
+ other license that has been, or is required to be, granted under
+ the terms of this License), and this License will continue in
+ full force and effect unless terminated as stated above.
+
+ 8. Miscellaneous
+
+ a. Each time You Distribute or Publicly Perform the Work or a
+ Collection, the Licensor offers to the recipient a license to the
+ Work on the same terms and conditions as the license granted to
+ You under this License.
+ b. Each time You Distribute or Publicly Perform an Adaptation,
+ Licensor offers to the recipient a license to the original Work
+ on the same terms and conditions as the license granted to You
+ under this License.
+ c. If any provision of this License is invalid or unenforceable
+ under applicable law, it shall not affect the validity or
+ enforceability of the remainder of the terms of this License, and
+ without further action by the parties to this agreement, such
+ provision shall be reformed to the minimum extent necessary to
+ make such provision valid and enforceable.
+ d. No term or provision of this License shall be deemed waived and
+ no breach consented to unless such waiver or consent shall be in
+ writing and signed by the party to be charged with such waiver or
+ consent.
+ e. This License constitutes the entire agreement between the parties
+ with respect to the Work licensed here. There are no
+ understandings, agreements or representations with respect to the
+ Work not specified here. Licensor shall not be bound by any
+ additional provisions that may appear in any communication from
+ You. This License may not be modified without the mutual written
+ agreement of the Licensor and You.
+ f. The rights granted under, and the subject matter referenced, in
+ this License were drafted utilizing the terminology of the Berne
+ Convention for the Protection of Literary and Artistic Works (as
+ amended on September 28, 1979), the Rome Convention of 1961, the
+ WIPO Copyright Treaty of 1996, the WIPO Performances and
+ Phonograms Treaty of 1996 and the Universal Copyright Convention
+ (as revised on July 24, 1971). These rights and subject matter
+ take effect in the relevant jurisdiction in which the License
+ terms are sought to be enforced according to the corresponding
+ provisions of the implementation of those treaty provisions in
+ the applicable national law. If the standard suite of rights
+ granted under applicable copyright law includes additional rights
+ not granted under this License, such additional rights are deemed
+ to be included in the License; this License is not intended to
+ restrict the license of any rights under applicable law.
+
+ Creative Commons Notice
+
+ Creative Commons is not a party to this License, and makes no
+ warranty whatsoever in connection with the Work. Creative Commons
+ will not be liable to You or any party on any legal theory for
+ any damages whatsoever, including without limitation any general,
+ special, incidental or consequential damages arising in
+ connection to this license. Notwithstanding the foregoing two (2)
+ sentences, if Creative Commons has expressly identified itself as
+ the Licensor hereunder, it shall have all rights and obligations
+ of Licensor.
+
+ Except for the limited purpose of indicating to the public that
+ the Work is licensed under the CCPL, Creative Commons does not
+ authorize the use by either party of the trademark "Creative
+ Commons" or any related trademark or logo of Creative Commons
+ without the prior written consent of Creative Commons. Any
+ permitted use will be in compliance with Creative Commons'
+ then-current trademark usage guidelines, as may be published on
+ its website or otherwise made available upon request from time to
+ time. For the avoidance of doubt, this trademark restriction does
+ not form part of the License.
+
+ Creative Commons may be contacted at http://creativecommons.org/.
diff -Nru brewtarget-1.2.4/debian/changelog brewtarget-1.2.5/debian/changelog
--- brewtarget-1.2.4/debian/changelog 2011-11-05 01:33:57.000000000 +0000
+++ brewtarget-1.2.5/debian/changelog 2012-07-14 18:49:41.000000000 +0100
@@ -1,7 +1,13 @@
+brewtarget (1.2.5-1) unstable; urgency=medium
+
+ * closes: bug#679437
+ * closes: bug#679350
+
+ -- Philip G. Lee <rocketman768@gmail.com> Sat, 14 Jul 2012 08:34:18 -0500
+
brewtarget (1.2.4-1) unstable; urgency=low
* New upstream release
- * Added build-dep on libqtwebkit-dev
-- Philip G. Lee <rocketman768@gmail.com> Sun, 02 Oct 2011 12:23:44 -0500
diff -Nru brewtarget-1.2.4/debian/control brewtarget-1.2.5/debian/control
--- brewtarget-1.2.4/debian/control 2011-11-02 23:33:24.000000000 +0000
+++ brewtarget-1.2.5/debian/control 2012-07-14 18:49:41.000000000 +0100
@@ -2,8 +2,8 @@
Section: misc
Priority: optional
Maintainer: Philip G. Lee <rocketman768@gmail.com>
-Build-Depends: cmake (>= 2.8), debhelper (>= 7.0.50), autotools-dev, libqt4-dev, qt4-qmake, libphonon-dev, libqtwebkit-dev
-Standards-Version: 3.9.2
+Build-Depends: cmake (>= 2.8), debhelper (>= 7.0.50), autotools-dev, libqt4-dev, qt4-qmake, libphonon-dev, hardening-includes, hardening-wrapper
+Standards-Version: 3.9.3
Homepage: http://brewtarget.sourceforge.net
Package: brewtarget
diff -Nru brewtarget-1.2.4/debian/copyright brewtarget-1.2.5/debian/copyright
--- brewtarget-1.2.4/debian/copyright 2011-10-31 21:37:21.000000000 +0000
+++ brewtarget-1.2.5/debian/copyright 2012-07-14 18:49:41.000000000 +0100
@@ -12,12 +12,12 @@
The Debian packaging is:
- Copyright (C) 2009-2011, Philip G. Lee <rocketman768@gmail.com>
+ Copyright (C) 2009-2012, Philip G. Lee <rocketman768@gmail.com>
and is licensed under the GPL-3.
Files: *
-Copyright: 2009-2011, Philip G. Lee <rocketman768@gmail.com>
+Copyright: 2009-2012, Philip G. Lee <rocketman768@gmail.com>
License: GPL-3
Files: data/sounds/*
@@ -29,23 +29,19 @@
2009-2010, Eric Tamme
License: WTFPL-2
-Files: images/flag*.png
-Copyright: 2009-2010, A68 Freelance Graphics Designs <a68designs@gmail.com>
-License: CC-BY-NC-ND-3.0
+Files: images/flag*.png images/restore.svg
+Copyright: 2012, Philip G. Lee <rocketman768@gmail.com>
+License: WTFPL-2
Files: images/edit-copy.png images/document-print-preview.png
images/merge.png images/printer.png images/server-database.png
Copyright: David Vignoni et al. <www.oxygen-icons.org>
-License: CC-BY-SA-3.0
+License: CC-BY-SA-3.0 or LGPL-3.0
Files: images/backup.png
Copyright: David Vignoni <www.icon-king.com/projects/nuvola>
License: LGPL-2.1
-Files: images/restore.png
-Copyright: FatCow Web Hosting <www.fatcow.com/free-icons>
-License: CC-BY-3.0
-
License: GPL-3
This package is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -77,3 +73,375 @@
0. You just DO WHAT THE FUCK YOU WANT TO.
+License: CC-BY-SA-3.0
+ THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS
+ CREATIVE COMMONS PUBLIC LICENSE ("CCPL" OR "LICENSE"). THE WORK IS
+ PROTECTED BY COPYRIGHT AND/OR OTHER APPLICABLE LAW. ANY USE OF THE
+ WORK OTHER THAN AS AUTHORIZED UNDER THIS LICENSE OR COPYRIGHT LAW IS
+ PROHIBITED.
+
+ BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND
+ AGREE TO BE BOUND BY THE TERMS OF THIS LICENSE. TO THE EXTENT THIS
+ LICENSE MAY BE CONSIDERED TO BE A CONTRACT, THE LICENSOR GRANTS YOU
+ THE RIGHTS CONTAINED HERE IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH
+ TERMS AND CONDITIONS.
+
+ 1. Definitions
+
+ a. "Adaptation" means a work based upon the Work, or upon the Work
+ and other pre-existing works, such as a translation, adaptation,
+ derivative work, arrangement of music or other alterations of a
+ literary or artistic work, or phonogram or performance and
+ includes cinematographic adaptations or any other form in which
+ the Work may be recast, transformed, or adapted including in any
+ form recognizably derived from the original, except that a work
+ that constitutes a Collection will not be considered an
+ Adaptation for the purpose of this License. For the avoidance of
+ doubt, where the Work is a musical work, performance or
+ phonogram, the synchronization of the Work in timed-relation with
+ a moving image ("synching") will be considered an Adaptation for
+ the purpose of this License.
+ b. "Collection" means a collection of literary or artistic works,
+ such as encyclopedias and anthologies, or performances,
+ phonograms or broadcasts, or other works or subject matter other
+ than works listed in Section 1(f) below, which, by reason of the
+ selection and arrangement of their contents, constitute
+ intellectual creations, in which the Work is included in its
+ entirety in unmodified form along with one or more other
+ contributions, each constituting separate and independent works
+ in themselves, which together are assembled into a collective
+ whole. A work that constitutes a Collection will not be
+ considered an Adaptation (as defined below) for the purposes of
+ this License.
+ c. "Creative Commons Compatible License" means a license that is
+ listed at http://creativecommons.org/compatiblelicenses that has
+ been approved by Creative Commons as being essentially equivalent
+ to this License, including, at a minimum, because that license:
+ (i) contains terms that have the same purpose, meaning and effect
+ as the License Elements of this License; and, (ii) explicitly
+ permits the relicensing of adaptations of works made available
+ under that license under this License or a Creative Commons
+ jurisdiction license with the same License Elements as this
+ License.
+ d. "Distribute" means to make available to the public the original
+ and copies of the Work or Adaptation, as appropriate, through
+ sale or other transfer of ownership.
+ e. "License Elements" means the following high-level license
+ attributes as selected by Licensor and indicated in the title of
+ this License: Attribution, ShareAlike.
+ f. "Licensor" means the individual, individuals, entity or entities
+ that offer(s) the Work under the terms of this License.
+ g. "Original Author" means, in the case of a literary or artistic
+ work, the individual, individuals, entity or entities who created
+ the Work or if no individual or entity can be identified, the
+ publisher; and in addition (i) in the case of a performance the
+ actors, singers, musicians, dancers, and other persons who act,
+ sing, deliver, declaim, play in, interpret or otherwise perform
+ literary or artistic works or expressions of folklore; (ii) in
+ the case of a phonogram the producer being the person or legal
+ entity who first fixes the sounds of a performance or other
+ sounds; and, (iii) in the case of broadcasts, the organization
+ that transmits the broadcast.
+ h. "Work" means the literary and/or artistic work offered under the
+ terms of this License including without limitation any production
+ in the literary, scientific and artistic domain, whatever may be
+ the mode or form of its expression including digital form, such
+ as a book, pamphlet and other writing; a lecture, address, sermon
+ or other work of the same nature; a dramatic or dramatico-musical
+ work; a choreographic work or entertainment in dumb show; a
+ musical composition with or without words; a cinematographic work
+ to which are assimilated works expressed by a process analogous
+ to cinematography; a work of drawing, painting, architecture,
+ sculpture, engraving or lithography; a photographic work to which
+ are assimilated works expressed by a process analogous to
+ photography; a work of applied art; an illustration, map, plan,
+ sketch or three-dimensional work relative to geography,
+ topography, architecture or science; a performance; a broadcast;
+ a phonogram; a compilation of data to the extent it is protected
+ as a copyrightable work; or a work performed by a variety or
+ circus performer to the extent it is not otherwise considered a
+ literary or artistic work.
+ i. "You" means an individual or entity exercising rights under this
+ License who has not previously violated the terms of this License
+ with respect to the Work, or who has received express permission
+ from the Licensor to exercise rights under this License despite a
+ previous violation.
+ j. "Publicly Perform" means to perform public recitations of the
+ Work and to communicate to the public those public recitations,
+ by any means or process, including by wire or wireless means or
+ public digital performances; to make available to the public
+ Works in such a way that members of the public may access these
+ Works from a place and at a place individually chosen by them; to
+ perform the Work to the public by any means or process and the
+ communication to the public of the performances of the Work,
+ including by public digital performance; to broadcast and
+ rebroadcast the Work by any means including signs, sounds or
+ images.
+ k. "Reproduce" means to make copies of the Work by any means
+ including without limitation by sound or visual recordings and
+ the right of fixation and reproducing fixations of the Work,
+ including storage of a protected performance or phonogram in
+ digital form or other electronic medium.
+
+ 2. Fair Dealing Rights. Nothing in this License is intended to
+ reduce, limit, or restrict any uses free from copyright or rights
+ arising from limitations or exceptions that are provided for in
+ connection with the copyright protection under copyright law or other
+ applicable laws.
+
+ 3. License Grant. Subject to the terms and conditions of this
+ License, Licensor hereby grants You a worldwide, royalty-free,
+ non-exclusive, perpetual (for the duration of the applicable
+ copyright) license to exercise the rights in the Work as stated
+ below:
+
+ a. to Reproduce the Work, to incorporate the Work into one or more
+ Collections, and to Reproduce the Work as incorporated in the
+ Collections;
+ b. to create and Reproduce Adaptations provided that any such
+ Adaptation, including any translation in any medium, takes
+ reasonable steps to clearly label, demarcate or otherwise
+ identify that changes were made to the original Work. For
+ example, a translation could be marked "The original work was
+ translated from English to Spanish," or a modification could
+ indicate "The original work has been modified.";
+ c. to Distribute and Publicly Perform the Work including as
+ incorporated in Collections; and,
+ d. to Distribute and Publicly Perform Adaptations.
+ e. For the avoidance of doubt:
+
+ i. Non-waivable Compulsory License Schemes. In those
+ jurisdictions in which the right to collect royalties through
+ any statutory or compulsory licensing scheme cannot be
+ waived, the Licensor reserves the exclusive right to collect
+ such royalties for any exercise by You of the rights granted
+ under this License;
+ ii. Waivable Compulsory License Schemes. In those jurisdictions
+ in which the right to collect royalties through any statutory
+ or compulsory licensing scheme can be waived, the Licensor
+ waives the exclusive right to collect such royalties for any
+ exercise by You of the rights granted under this License;
+ and,
+ iii. Voluntary License Schemes. The Licensor waives the right to
+ collect royalties, whether individually or, in the event that
+ the Licensor is a member of a collecting society that
+ administers voluntary licensing schemes, via that society,
+ from any exercise by You of the rights granted under this
+ License.
+
+ The above rights may be exercised in all media and formats whether
+ now known or hereafter devised. The above rights include the right to
+ make such modifications as are technically necessary to exercise the
+ rights in other media and formats. Subject to Section 8(f), all
+ rights not expressly granted by Licensor are hereby reserved.
+
+ 4. Restrictions. The license granted in Section 3 above is expressly
+ made subject to and limited by the following restrictions:
+
+ a. You may Distribute or Publicly Perform the Work only under the
+ terms of this License. You must include a copy of, or the Uniform
+ Resource Identifier (URI) for, this License with every copy of
+ the Work You Distribute or Publicly Perform. You may not offer or
+ impose any terms on the Work that restrict the terms of this
+ License or the ability of the recipient of the Work to exercise
+ the rights granted to that recipient under the terms of the
+ License. You may not sublicense the Work. You must keep intact
+ all notices that refer to this License and to the disclaimer of
+ warranties with every copy of the Work You Distribute or Publicly
+ Perform. When You Distribute or Publicly Perform the Work, You
+ may not impose any effective technological measures on the Work
+ that restrict the ability of a recipient of the Work from You to
+ exercise the rights granted to that recipient under the terms of
+ the License. This Section 4(a) applies to the Work as
+ incorporated in a Collection, but this does not require the
+ Collection apart from the Work itself to be made subject to the
+ terms of this License. If You create a Collection, upon notice
+ from any Licensor You must, to the extent practicable, remove
+ from the Collection any credit as required by Section 4(c), as
+ requested. If You create an Adaptation, upon notice from any
+ Licensor You must, to the extent practicable, remove from the
+ Adaptation any credit as required by Section 4(c), as requested.
+ b. You may Distribute or Publicly Perform an Adaptation only under
+ the terms of: (i) this License; (ii) a later version of this
+ License with the same License Elements as this License; (iii) a
+ Creative Commons jurisdiction license (either this or a later
+ license version) that contains the same License Elements as this
+ License (e.g., Attribution-ShareAlike 3.0 US)); (iv) a Creative
+ Commons Compatible License. If you license the Adaptation under
+ one of the licenses mentioned in (iv), you must comply with the
+ terms of that license. If you license the Adaptation under the
+ terms of any of the licenses mentioned in (i), (ii) or (iii) (the
+ "Applicable License"), you must comply with the terms of the
+ Applicable License generally and the following provisions: (I)
+ You must include a copy of, or the URI for, the Applicable
+ License with every copy of each Adaptation You Distribute or
+ Publicly Perform; (II) You may not offer or impose any terms on
+ the Adaptation that restrict the terms of the Applicable License
+ or the ability of the recipient of the Adaptation to exercise the
+ rights granted to that recipient under the terms of the
+ Applicable License; (III) You must keep intact all notices that
+ refer to the Applicable License and to the disclaimer of
+ warranties with every copy of the Work as included in the
+ Adaptation You Distribute or Publicly Perform; (IV) when You
+ Distribute or Publicly Perform the Adaptation, You may not impose
+ any effective technological measures on the Adaptation that
+ restrict the ability of a recipient of the Adaptation from You to
+ exercise the rights granted to that recipient under the terms of
+ the Applicable License. This Section 4(b) applies to the
+ Adaptation as incorporated in a Collection, but this does not
+ require the Collection apart from the Adaptation itself to be
+ made subject to the terms of the Applicable License.
+ c. If You Distribute, or Publicly Perform the Work or any
+ Adaptations or Collections, You must, unless a request has been
+ made pursuant to Section 4(a), keep intact all copyright notices
+ for the Work and provide, reasonable to the medium or means You
+ are utilizing: (i) the name of the Original Author (or pseudonym,
+ if applicable) if supplied, and/or if the Original Author and/or
+ Licensor designate another party or parties (e.g., a sponsor
+ institute, publishing entity, journal) for attribution
+ ("Attribution Parties") in Licensor's copyright notice, terms of
+ service or by other reasonable means, the name of such party or
+ parties; (ii) the title of the Work if supplied; (iii) to the
+ extent reasonably practicable, the URI, if any, that Licensor
+ specifies to be associated with the Work, unless such URI does
+ not refer to the copyright notice or licensing information for
+ the Work; and (iv) , consistent with Ssection 3(b), in the case
+ of an Adaptation, a credit identifying the use of the Work in the
+ Adaptation (e.g., "French translation of the Work by Original
+ Author," or "Screenplay based on original Work by Original
+ Author"). The credit required by this Section 4(c) may be
+ implemented in any reasonable manner; provided, however, that in
+ the case of a Adaptation or Collection, at a minimum such credit
+ will appear, if a credit for all contributing authors of the
+ Adaptation or Collection appears, then as part of these credits
+ and in a manner at least as prominent as the credits for the
+ other contributing authors. For the avoidance of doubt, You may
+ only use the credit required by this Section for the purpose of
+ attribution in the manner set out above and, by exercising Your
+ rights under this License, You may not implicitly or explicitly
+ assert or imply any connection with, sponsorship or endorsement
+ by the Original Author, Licensor and/or Attribution Parties, as
+ appropriate, of You or Your use of the Work, without the
+ separate, express prior written permission of the Original
+ Author, Licensor and/or Attribution Parties.
+ d. Except as otherwise agreed in writing by the Licensor or as may
+ be otherwise permitted by applicable law, if You Reproduce,
+ Distribute or Publicly Perform the Work either by itself or as
+ part of any Adaptations or Collections, You must not distort,
+ mutilate, modify or take other derogatory action in relation to
+ the Work which would be prejudicial to the Original Author's
+ honor or reputation. Licensor agrees that in those jurisdictions
+ (e.g. Japan), in which any exercise of the right granted in
+ Section 3(b) of this License (the right to make Adaptations)
+ would be deemed to be a distortion, mutilation, modification or
+ other derogatory action prejudicial to the Original Author's
+ honor and reputation, the Licensor will waive or not assert, as
+ appropriate, this Section, to the fullest extent permitted by the
+ applicable national law, to enable You to reasonably exercise
+ Your right under Section 3(b) of this License (right to make
+ Adaptations) but not otherwise.
+
+ 5. Representations, Warranties and Disclaimer
+
+ UNLESS OTHERWISE MUTUALLY AGREED TO BY THE PARTIES IN WRITING,
+ LICENSOR OFFERS THE WORK AS-IS AND MAKES NO REPRESENTATIONS OR
+ WARRANTIES OF ANY KIND CONCERNING THE WORK, EXPRESS, IMPLIED,
+ STATUTORY OR OTHERWISE, INCLUDING, WITHOUT LIMITATION, WARRANTIES OF
+ TITLE, MERCHANTIBILITY, FITNESS FOR A PARTICULAR PURPOSE,
+ NONINFRINGEMENT, OR THE ABSENCE OF LATENT OR OTHER DEFECTS, ACCURACY,
+ OR THE PRESENCE OF ABSENCE OF ERRORS, WHETHER OR NOT DISCOVERABLE.
+ SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OF IMPLIED WARRANTIES,
+ SO SUCH EXCLUSION MAY NOT APPLY TO YOU.
+
+ 6. Limitation on Liability. EXCEPT TO THE EXTENT REQUIRED BY
+ APPLICABLE LAW, IN NO EVENT WILL LICENSOR BE LIABLE TO YOU ON ANY
+ LEGAL THEORY FOR ANY SPECIAL, INCIDENTAL, CONSEQUENTIAL, PUNITIVE OR
+ EXEMPLARY DAMAGES ARISING OUT OF THIS LICENSE OR THE USE OF THE WORK,
+ EVEN IF LICENSOR HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+ 7. Termination
+
+ a. This License and the rights granted hereunder will terminate
+ automatically upon any breach by You of the terms of this
+ License. Individuals or entities who have received Adaptations or
+ Collections from You under this License, however, will not have
+ their licenses terminated provided such individuals or entities
+ remain in full compliance with those licenses. Sections 1, 2, 5,
+ 6, 7, and 8 will survive any termination of this License.
+ b. Subject to the above terms and conditions, the license granted
+ here is perpetual (for the duration of the applicable copyright
+ in the Work). Notwithstanding the above, Licensor reserves the
+ right to release the Work under different license terms or to
+ stop distributing the Work at any time; provided, however that
+ any such election will not serve to withdraw this License (or any
+ other license that has been, or is required to be, granted under
+ the terms of this License), and this License will continue in
+ full force and effect unless terminated as stated above.
+
+ 8. Miscellaneous
+
+ a. Each time You Distribute or Publicly Perform the Work or a
+ Collection, the Licensor offers to the recipient a license to the
+ Work on the same terms and conditions as the license granted to
+ You under this License.
+ b. Each time You Distribute or Publicly Perform an Adaptation,
+ Licensor offers to the recipient a license to the original Work
+ on the same terms and conditions as the license granted to You
+ under this License.
+ c. If any provision of this License is invalid or unenforceable
+ under applicable law, it shall not affect the validity or
+ enforceability of the remainder of the terms of this License, and
+ without further action by the parties to this agreement, such
+ provision shall be reformed to the minimum extent necessary to
+ make such provision valid and enforceable.
+ d. No term or provision of this License shall be deemed waived and
+ no breach consented to unless such waiver or consent shall be in
+ writing and signed by the party to be charged with such waiver or
+ consent.
+ e. This License constitutes the entire agreement between the parties
+ with respect to the Work licensed here. There are no
+ understandings, agreements or representations with respect to the
+ Work not specified here. Licensor shall not be bound by any
+ additional provisions that may appear in any communication from
+ You. This License may not be modified without the mutual written
+ agreement of the Licensor and You.
+ f. The rights granted under, and the subject matter referenced, in
+ this License were drafted utilizing the terminology of the Berne
+ Convention for the Protection of Literary and Artistic Works (as
+ amended on September 28, 1979), the Rome Convention of 1961, the
+ WIPO Copyright Treaty of 1996, the WIPO Performances and
+ Phonograms Treaty of 1996 and the Universal Copyright Convention
+ (as revised on July 24, 1971). These rights and subject matter
+ take effect in the relevant jurisdiction in which the License
+ terms are sought to be enforced according to the corresponding
+ provisions of the implementation of those treaty provisions in
+ the applicable national law. If the standard suite of rights
+ granted under applicable copyright law includes additional rights
+ not granted under this License, such additional rights are deemed
+ to be included in the License; this License is not intended to
+ restrict the license of any rights under applicable law.
+
+ Creative Commons Notice
+
+ Creative Commons is not a party to this License, and makes no
+ warranty whatsoever in connection with the Work. Creative Commons
+ will not be liable to You or any party on any legal theory for
+ any damages whatsoever, including without limitation any general,
+ special, incidental or consequential damages arising in
+ connection to this license. Notwithstanding the foregoing two (2)
+ sentences, if Creative Commons has expressly identified itself as
+ the Licensor hereunder, it shall have all rights and obligations
+ of Licensor.
+
+ Except for the limited purpose of indicating to the public that
+ the Work is licensed under the CCPL, Creative Commons does not
+ authorize the use by either party of the trademark "Creative
+ Commons" or any related trademark or logo of Creative Commons
+ without the prior written consent of Creative Commons. Any
+ permitted use will be in compliance with Creative Commons'
+ then-current trademark usage guidelines, as may be published on
+ its website or otherwise made available upon request from time to
+ time. For the avoidance of doubt, this trademark restriction does
+ not form part of the License.
+
+ Creative Commons may be contacted at http://creativecommons.org/.
diff -Nru brewtarget-1.2.4/debian/rules brewtarget-1.2.5/debian/rules
--- brewtarget-1.2.4/debian/rules 2011-10-31 21:37:21.000000000 +0000
+++ brewtarget-1.2.5/debian/rules 2012-07-14 18:49:41.000000000 +0100
@@ -1,5 +1,13 @@
#!/usr/bin/make -f
install-dir = "$(shell pwd)/debian/brewtarget"
+export DEB_BUILD_HARDENING=1
+include /usr/share/hardening-includes/hardening.make
+#CPPFLAGS:=$(shell dpkg-buildflags --get CPPFLAGS)
+#CFLAGS:=$(shell dpkg-buildflags --get CFLAGS) $(CPPFLAGS)
+#CXXFLAGS:=$(shell dpkg-buildflags --get CXXFLAGS) $(CPPFLAGS)
+#LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS)
+CXXFLAGS:=$(HARDENING_CFLAGS)
+LDFLAGS:=$(HARDENING_LDFLAGS)
override_dh_auto_configure:
if ! test -d build; then mkdir build; fi
diff -Nru brewtarget-1.2.4/deb-scripts/createorig.sh brewtarget-1.2.5/deb-scripts/createorig.sh
--- brewtarget-1.2.4/deb-scripts/createorig.sh 2011-10-31 21:37:21.000000000 +0000
+++ brewtarget-1.2.5/deb-scripts/createorig.sh 2012-07-14 18:49:41.000000000 +0100
@@ -1,8 +1,8 @@
#!/bin/bash
-SVNDIR="trunk"
+SVNDIR="1.2.5"
NAME="brewtarget"
-VERSION="1.2.4"
+VERSION="1.2.5"
TARDIR="$NAME-$VERSION"
TARFILE="${NAME}_${VERSION}.orig.tar"
diff -Nru brewtarget-1.2.4/doc/manual/index.html brewtarget-1.2.5/doc/manual/index.html
--- brewtarget-1.2.4/doc/manual/index.html 2011-10-31 21:37:21.000000000 +0000
+++ brewtarget-1.2.5/doc/manual/index.html 2012-07-14 18:49:41.000000000 +0100
@@ -1,10 +1,10 @@
<html>
<head>
- <title>Brewtarget 1.2.4 Manual</title>
+ <title>Brewtarget 1.2.5 Manual</title>
</head>
<body>
-<h1>Brewtarget 1.2.4 Manual</h1>
+<h1>Brewtarget 1.2.5 Manual</h1>
<h2>A Walkthrough</h2>
<p>
Binary files /tmp/U_W2YR3Mnb/brewtarget-1.2.4/images/btFlagCatalonia.png and /tmp/YOP8NxZwyP/brewtarget-1.2.5/images/btFlagCatalonia.png differ
diff -Nru brewtarget-1.2.4/images/flagCatalonia.svg brewtarget-1.2.5/images/flagCatalonia.svg
--- brewtarget-1.2.4/images/flagCatalonia.svg 1970-01-01 01:00:00.000000000 +0100
+++ brewtarget-1.2.5/images/flagCatalonia.svg 2012-07-14 18:49:41.000000000 +0100
@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/";
+ xmlns:cc="http://creativecommons.org/ns#";
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";
+ xmlns:svg="http://www.w3.org/2000/svg";
+ xmlns="http://www.w3.org/2000/svg";
+ xmlns:xlink="http://www.w3.org/1999/xlink";
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd";
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape";
+ width="65"
+ height="65"
+ id="svg2"
+ version="1.1"
+ inkscape:version="0.47 r22583"
+ sodipodi:docname="flagCatalonia.svg">
+ <defs
+ id="defs4">
+ <inkscape:perspective
+ sodipodi:type="inkscape:persp3d"
+ inkscape:vp_x="0 : 32.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_z="65 : 32.5 : 1"
+ inkscape:persp3d-origin="32.5 : 21.666667 : 1"
+ id="perspective2898" />
+ <linearGradient
+ id="linearGradient3803">
+ <stop
+ style="stop-color:#ffffff;stop-opacity:0.52252251;"
+ offset="0"
+ id="stop3805" />
+ <stop
+ style="stop-color:#ffffff;stop-opacity:0;"
+ offset="1"
+ id="stop3807" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3803"
+ id="linearGradient3809"
+ x1="155.63599"
+ y1="258.62933"
+ x2="155.63599"
+ y2="285.64468"
+ gradientUnits="userSpaceOnUse" />
+ <inkscape:perspective
+ id="perspective2898-0"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ </defs>
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="11.702174"
+ inkscape:cx="24.808688"
+ inkscape:cy="32.765508"
+ inkscape:document-units="px"
+ inkscape:current-layer="layer1"
+ showgrid="false"
+ fit-margin-top="0"
+ fit-margin-left="0"
+ fit-margin-right="0"
+ fit-margin-bottom="0"
+ inkscape:window-width="1680"
+ inkscape:window-height="1006"
+ inkscape:window-x="-4"
+ inkscape:window-y="-3"
+ inkscape:window-maximized="1" />
+ <metadata
+ id="metadata7">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage"; />
+ <dc:title />
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:label="Layer 1"
+ inkscape:groupmode="layer"
+ id="layer1"
+ transform="translate(-125.21875,-257.5625)">
+ <path
+ style="fill:#fcdd09"
+ d="M 4.5 0.5 C 2.284 0.5 0.5 2.284 0.5 4.5 L 0.5 60.5 C 0.5 62.716 2.284 64.5 4.5 64.5 L 60.5 64.5 C 62.716 64.5 64.5 62.716 64.5 60.5 L 64.5 4.5 C 64.5 2.284 62.716 0.5 60.5 0.5 L 4.5 0.5 z "
+ transform="translate(125.21875,257.5625)"
+ id="rect2874" />
+ <path
+ style="fill:#da121a"
+ d="M 0.5 7.625 L 0.5 14.75 L 64.5 14.75 L 64.5 7.625 L 0.5 7.625 z M 0.5 21.84375 L 0.5 28.96875 L 64.5 28.96875 L 64.5 21.84375 L 0.5 21.84375 z M 0.5 36.0625 L 0.5 43.1875 L 64.5 43.1875 L 64.5 36.0625 L 0.5 36.0625 z M 0.5 50.28125 L 0.5 57.40625 L 64.5 57.40625 L 64.5 50.28125 L 0.5 50.28125 z "
+ transform="translate(125.21875,257.5625)"
+ id="path2876" />
+ <rect
+ style="fill:url(#linearGradient3809);fill-opacity:1;stroke:#000000;stroke-linejoin:miter;stroke-opacity:1"
+ id="rect2985"
+ width="64"
+ height="64"
+ x="125.71429"
+ y="258.07648"
+ rx="4"
+ ry="4" />
+ </g>
+</svg>
Binary files /tmp/U_W2YR3Mnb/brewtarget-1.2.4/images/flagCzech.png and /tmp/YOP8NxZwyP/brewtarget-1.2.5/images/flagCzech.png differ
diff -Nru brewtarget-1.2.4/images/flagCzech.svg brewtarget-1.2.5/images/flagCzech.svg
--- brewtarget-1.2.4/images/flagCzech.svg 1970-01-01 01:00:00.000000000 +0100
+++ brewtarget-1.2.5/images/flagCzech.svg 2012-07-14 18:49:41.000000000 +0100
@@ -0,0 +1,113 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/";
+ xmlns:cc="http://creativecommons.org/ns#";
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";
+ xmlns:svg="http://www.w3.org/2000/svg";
+ xmlns="http://www.w3.org/2000/svg";
+ xmlns:xlink="http://www.w3.org/1999/xlink";
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd";
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape";
+ width="65"
+ height="65"
+ id="svg2"
+ version="1.1"
+ inkscape:version="0.47 r22583"
+ sodipodi:docname="flagCzech.svg">
+ <defs
+ id="defs4">
+ <inkscape:perspective
+ sodipodi:type="inkscape:persp3d"
+ inkscape:vp_x="0 : 32.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_z="65 : 32.5 : 1"
+ inkscape:persp3d-origin="32.5 : 21.666667 : 1"
+ id="perspective3486" />
+ <linearGradient
+ id="linearGradient3803">
+ <stop
+ style="stop-color:#ffffff;stop-opacity:0.52252251;"
+ offset="0"
+ id="stop3805" />
+ <stop
+ style="stop-color:#ffffff;stop-opacity:0;"
+ offset="1"
+ id="stop3807" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3803"
+ id="linearGradient3809"
+ x1="155.63599"
+ y1="258.62933"
+ x2="155.63599"
+ y2="285.64468"
+ gradientUnits="userSpaceOnUse" />
+ </defs>
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="11.702174"
+ inkscape:cx="39.164995"
+ inkscape:cy="32.765508"
+ inkscape:document-units="px"
+ inkscape:current-layer="layer1"
+ showgrid="false"
+ fit-margin-top="0"
+ fit-margin-left="0"
+ fit-margin-right="0"
+ fit-margin-bottom="0"
+ inkscape:window-width="1680"
+ inkscape:window-height="1006"
+ inkscape:window-x="-4"
+ inkscape:window-y="-3"
+ inkscape:window-maximized="1" />
+ <metadata
+ id="metadata7">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage"; />
+ <dc:title />
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:label="Layer 1"
+ inkscape:groupmode="layer"
+ id="layer1"
+ transform="translate(-125.21875,-257.5625)">
+ <path
+ style="fill:#d7141a"
+ d="M 4.5 0.5 C 2.284 0.5 0.5 2.284 0.5 4.5 L 0.5 60.5 C 0.5 62.716 2.284 64.5 4.5 64.5 L 60.5 64.5 C 62.0235 64.5 63.324209 63.653354 64 62.40625 L 64 2.625 C 63.324209 1.3778965 62.0235 0.5 60.5 0.5 L 4.5 0.5 z "
+ transform="translate(125.21875,257.5625)"
+ id="rect4" />
+ <path
+ style="fill:#ffffff"
+ d="M 4.5 0.5 C 2.284 0.5 0.5 2.284 0.5 4.5 L 0.5 32.5 L 64 32.5 L 64 2.625 C 63.324209 1.3778965 62.0235 0.5 60.5 0.5 L 4.5 0.5 z "
+ transform="translate(125.21875,257.5625)"
+ id="rect6" />
+ <path
+ style="fill:#11457e"
+ d="M 1.71875 1.65625 C 0.96762661 2.3825998 0.5 3.3677569 0.5 4.5 L 0.5 60.5 C 0.5 61.623713 0.94631325 62.649749 1.6875 63.375 L 48 32.5 L 1.71875 1.65625 z "
+ transform="translate(125.21875,257.5625)"
+ id="path8" />
+ <rect
+ style="fill:url(#linearGradient3809);fill-opacity:1;stroke:#000000;stroke-linejoin:miter;stroke-opacity:1"
+ id="rect2985"
+ width="64"
+ height="64"
+ x="125.71429"
+ y="258.07648"
+ rx="4"
+ ry="4" />
+ </g>
+</svg>
Binary files /tmp/U_W2YR3Mnb/brewtarget-1.2.4/images/flagFrance.png and /tmp/YOP8NxZwyP/brewtarget-1.2.5/images/flagFrance.png differ
diff -Nru brewtarget-1.2.4/images/flagFrance.svg brewtarget-1.2.5/images/flagFrance.svg
--- brewtarget-1.2.4/images/flagFrance.svg 1970-01-01 01:00:00.000000000 +0100
+++ brewtarget-1.2.5/images/flagFrance.svg 2012-07-14 18:49:41.000000000 +0100
@@ -0,0 +1,113 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/";
+ xmlns:cc="http://creativecommons.org/ns#";
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";
+ xmlns:svg="http://www.w3.org/2000/svg";
+ xmlns="http://www.w3.org/2000/svg";
+ xmlns:xlink="http://www.w3.org/1999/xlink";
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd";
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape";
+ width="65"
+ height="65"
+ id="svg2"
+ version="1.1"
+ inkscape:version="0.47 r22583"
+ sodipodi:docname="flagFrance.svg">
+ <defs
+ id="defs4">
+ <inkscape:perspective
+ sodipodi:type="inkscape:persp3d"
+ inkscape:vp_x="0 : 32.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_z="65 : 32.5 : 1"
+ inkscape:persp3d-origin="32.5 : 21.666667 : 1"
+ id="perspective3555" />
+ <linearGradient
+ id="linearGradient3803">
+ <stop
+ style="stop-color:#ffffff;stop-opacity:0.52252251;"
+ offset="0"
+ id="stop3805" />
+ <stop
+ style="stop-color:#ffffff;stop-opacity:0;"
+ offset="1"
+ id="stop3807" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3803"
+ id="linearGradient3809"
+ x1="155.63599"
+ y1="258.62933"
+ x2="155.63599"
+ y2="285.64468"
+ gradientUnits="userSpaceOnUse" />
+ </defs>
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="11.702174"
+ inkscape:cx="24.979597"
+ inkscape:cy="33.868723"
+ inkscape:document-units="px"
+ inkscape:current-layer="layer1"
+ showgrid="false"
+ fit-margin-top="0"
+ fit-margin-left="0"
+ fit-margin-right="0"
+ fit-margin-bottom="0"
+ inkscape:window-width="1680"
+ inkscape:window-height="1006"
+ inkscape:window-x="-4"
+ inkscape:window-y="-3"
+ inkscape:window-maximized="1" />
+ <metadata
+ id="metadata7">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage"; />
+ <dc:title />
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:label="Layer 1"
+ inkscape:groupmode="layer"
+ id="layer1"
+ transform="translate(-125.21875,-257.5625)">
+ <path
+ style="fill:#ed2939"
+ d="M 4.5 0.5 C 2.284 0.5 0.5 2.284 0.5 4.5 L 0.5 60.5 C 0.5 62.716 2.284 64.5 4.5 64.5 L 60.5 64.5 C 62.716 64.5 64.5 62.716 64.5 60.5 L 64.5 4.5 C 64.5 2.284 62.716 0.5 60.5 0.5 L 4.5 0.5 z "
+ transform="translate(125.21875,257.5625)"
+ id="rect4" />
+ <path
+ style="fill:#ffffff"
+ d="M 4.5 0.5 C 2.284 0.5 0.5 2.284 0.5 4.5 L 0.5 60.5 C 0.5 62.716 2.284 64.5 4.5 64.5 L 48.5 64.5 L 48.5 0.5 L 4.5 0.5 z "
+ transform="translate(125.21875,257.5625)"
+ id="rect6-1" />
+ <path
+ style="fill:#002395"
+ d="M 4.5 0.5 C 2.284 0.5 0.5 2.284 0.5 4.5 L 0.5 60.5 C 0.5 62.716 2.284 64.5 4.5 64.5 L 16.5 64.5 L 16.5 0.5 L 4.5 0.5 z "
+ transform="translate(125.21875,257.5625)"
+ id="rect8" />
+ <rect
+ style="fill:url(#linearGradient3809);fill-opacity:1;stroke:#000000;stroke-linejoin:miter;stroke-opacity:1"
+ id="rect2985"
+ width="64"
+ height="64"
+ x="125.71429"
+ y="258.07648"
+ rx="4"
+ ry="4" />
+ </g>
+</svg>
Binary files /tmp/U_W2YR3Mnb/brewtarget-1.2.4/images/flagGermany.png and /tmp/YOP8NxZwyP/brewtarget-1.2.5/images/flagGermany.png differ
diff -Nru brewtarget-1.2.4/images/flagGermany.svg brewtarget-1.2.5/images/flagGermany.svg
--- brewtarget-1.2.4/images/flagGermany.svg 1970-01-01 01:00:00.000000000 +0100
+++ brewtarget-1.2.5/images/flagGermany.svg 2012-07-14 18:49:41.000000000 +0100
@@ -0,0 +1,113 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/";
+ xmlns:cc="http://creativecommons.org/ns#";
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";
+ xmlns:svg="http://www.w3.org/2000/svg";
+ xmlns="http://www.w3.org/2000/svg";
+ xmlns:xlink="http://www.w3.org/1999/xlink";
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd";
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape";
+ width="65"
+ height="65"
+ id="svg2"
+ version="1.1"
+ inkscape:version="0.47 r22583"
+ sodipodi:docname="flagGermany.svg">
+ <defs
+ id="defs4">
+ <inkscape:perspective
+ sodipodi:type="inkscape:persp3d"
+ inkscape:vp_x="0 : 32.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_z="65 : 32.5 : 1"
+ inkscape:persp3d-origin="32.5 : 21.666667 : 1"
+ id="perspective2883" />
+ <linearGradient
+ id="linearGradient3803">
+ <stop
+ style="stop-color:#ffffff;stop-opacity:0.52252251;"
+ offset="0"
+ id="stop3805" />
+ <stop
+ style="stop-color:#ffffff;stop-opacity:0;"
+ offset="1"
+ id="stop3807" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3803"
+ id="linearGradient3809"
+ x1="155.63599"
+ y1="258.62933"
+ x2="155.63599"
+ y2="285.64468"
+ gradientUnits="userSpaceOnUse" />
+ </defs>
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="11.702174"
+ inkscape:cx="24.979597"
+ inkscape:cy="31.40395"
+ inkscape:document-units="px"
+ inkscape:current-layer="layer1"
+ showgrid="false"
+ fit-margin-top="0"
+ fit-margin-left="0"
+ fit-margin-right="0"
+ fit-margin-bottom="0"
+ inkscape:window-width="1680"
+ inkscape:window-height="1006"
+ inkscape:window-x="-4"
+ inkscape:window-y="-3"
+ inkscape:window-maximized="1" />
+ <metadata
+ id="metadata7">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage"; />
+ <dc:title />
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:label="Layer 1"
+ inkscape:groupmode="layer"
+ id="layer1"
+ transform="translate(-125.21875,-257.5625)">
+ <path
+ style="fill:#000000"
+ d="M 4.5 0.5 C 2.284 0.5 0.5 2.284 0.5 4.5 L 0.5 60.5 C 0.5 62.716 2.284 64.5 4.5 64.5 L 60.5 64.5 C 62.716 64.5 64.5 62.716 64.5 60.5 L 64.5 4.5 C 64.5 2.284 62.716 0.5 60.5 0.5 L 4.5 0.5 z "
+ transform="translate(125.21875,257.5625)"
+ id="black_stripe" />
+ <path
+ style="fill:#dd0000"
+ d="M 0.5 21.84375 L 0.5 60.5 C 0.5 62.716 2.284 64.5 4.5 64.5 L 60.5 64.5 C 62.716 64.5 64.5 62.716 64.5 60.5 L 64.5 21.84375 L 0.5 21.84375 z "
+ transform="translate(125.21875,257.5625)"
+ id="red_stripe" />
+ <path
+ style="fill:#ffce00"
+ d="M 0.5 43.1875 L 0.5 60.5 C 0.5 62.716 2.284 64.5 4.5 64.5 L 60.5 64.5 C 62.716 64.5 64.5 62.716 64.5 60.5 L 64.5 43.1875 L 0.5 43.1875 z "
+ transform="translate(125.21875,257.5625)"
+ id="gold_stripe" />
+ <rect
+ style="fill:url(#linearGradient3809);fill-opacity:1;stroke:#000000;stroke-linejoin:miter;stroke-opacity:1"
+ id="rect2985"
+ width="64"
+ height="64"
+ x="125.71429"
+ y="258.07648"
+ rx="4"
+ ry="4" />
+ </g>
+</svg>
Binary files /tmp/U_W2YR3Mnb/brewtarget-1.2.4/images/flagNetherlands.png and /tmp/YOP8NxZwyP/brewtarget-1.2.5/images/flagNetherlands.png differ
diff -Nru brewtarget-1.2.4/images/flagNetherlands.svg brewtarget-1.2.5/images/flagNetherlands.svg
--- brewtarget-1.2.4/images/flagNetherlands.svg 1970-01-01 01:00:00.000000000 +0100
+++ brewtarget-1.2.5/images/flagNetherlands.svg 2012-07-14 18:49:41.000000000 +0100
@@ -0,0 +1,113 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/";
+ xmlns:cc="http://creativecommons.org/ns#";
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";
+ xmlns:svg="http://www.w3.org/2000/svg";
+ xmlns="http://www.w3.org/2000/svg";
+ xmlns:xlink="http://www.w3.org/1999/xlink";
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd";
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape";
+ width="65"
+ height="65"
+ id="svg2"
+ version="1.1"
+ inkscape:version="0.47 r22583"
+ sodipodi:docname="flagNetherlands.svg">
+ <defs
+ id="defs4">
+ <inkscape:perspective
+ sodipodi:type="inkscape:persp3d"
+ inkscape:vp_x="0 : 32.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_z="65 : 32.5 : 1"
+ inkscape:persp3d-origin="32.5 : 21.666667 : 1"
+ id="perspective2952" />
+ <linearGradient
+ id="linearGradient3803">
+ <stop
+ style="stop-color:#ffffff;stop-opacity:0.52252251;"
+ offset="0"
+ id="stop3805" />
+ <stop
+ style="stop-color:#ffffff;stop-opacity:0;"
+ offset="1"
+ id="stop3807" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3803"
+ id="linearGradient3809"
+ x1="155.63599"
+ y1="258.62933"
+ x2="155.63599"
+ y2="285.64468"
+ gradientUnits="userSpaceOnUse" />
+ </defs>
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="11.702174"
+ inkscape:cx="24.979597"
+ inkscape:cy="30.310043"
+ inkscape:document-units="px"
+ inkscape:current-layer="layer1"
+ showgrid="false"
+ fit-margin-top="0"
+ fit-margin-left="0"
+ fit-margin-right="0"
+ fit-margin-bottom="0"
+ inkscape:window-width="1680"
+ inkscape:window-height="1006"
+ inkscape:window-x="-4"
+ inkscape:window-y="-3"
+ inkscape:window-maximized="1" />
+ <metadata
+ id="metadata7">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage"; />
+ <dc:title />
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:label="Layer 1"
+ inkscape:groupmode="layer"
+ id="layer1"
+ transform="translate(-125.21875,-257.5625)">
+ <path
+ style="fill:#21468b"
+ d="M 4.5 0.5 C 2.284 0.5 0.5 2.284 0.5 4.5 L 0.5 60.5 C 0.5 62.716 2.284 64.5 4.5 64.5 L 60.5 64.5 C 62.716 64.5 64.5 62.716 64.5 60.5 L 64.5 4.5 C 64.5 2.284 62.716 0.5 60.5 0.5 L 4.5 0.5 z "
+ transform="translate(125.21875,257.5625)"
+ id="rect4" />
+ <path
+ style="fill:#ffffff"
+ d="M 4.5 0.5 C 2.284 0.5 0.5 2.284 0.5 4.5 L 0.5 43.1875 L 64.5 43.1875 L 64.5 4.5 C 64.5 2.284 62.716 0.5 60.5 0.5 L 4.5 0.5 z "
+ transform="translate(125.21875,257.5625)"
+ id="rect6" />
+ <path
+ style="fill:#ae1c28"
+ d="M 4.5 0.5 C 2.284 0.5 0.5 2.284 0.5 4.5 L 0.5 21.84375 L 64.5 21.84375 L 64.5 4.5 C 64.5 2.284 62.716 0.5 60.5 0.5 L 4.5 0.5 z "
+ transform="translate(125.21875,257.5625)"
+ id="rect8" />
+ <rect
+ style="fill:url(#linearGradient3809);fill-opacity:1;stroke:#000000;stroke-linejoin:miter;stroke-opacity:1"
+ id="rect2985"
+ width="64"
+ height="64"
+ x="125.71429"
+ y="258.07648"
+ rx="4"
+ ry="4" />
+ </g>
+</svg>
Binary files /tmp/U_W2YR3Mnb/brewtarget-1.2.4/images/flagPoland.png and /tmp/YOP8NxZwyP/brewtarget-1.2.5/images/flagPoland.png differ
diff -Nru brewtarget-1.2.4/images/flagPoland.svg brewtarget-1.2.5/images/flagPoland.svg
--- brewtarget-1.2.4/images/flagPoland.svg 1970-01-01 01:00:00.000000000 +0100
+++ brewtarget-1.2.5/images/flagPoland.svg 2012-07-14 18:49:41.000000000 +0100
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/";
+ xmlns:cc="http://creativecommons.org/ns#";
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";
+ xmlns:svg="http://www.w3.org/2000/svg";
+ xmlns="http://www.w3.org/2000/svg";
+ xmlns:xlink="http://www.w3.org/1999/xlink";
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd";
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape";
+ width="65"
+ height="65"
+ id="svg2"
+ version="1.1"
+ inkscape:version="0.47 r22583"
+ sodipodi:docname="flagPoland.svg">
+ <defs
+ id="defs4">
+ <inkscape:perspective
+ sodipodi:type="inkscape:persp3d"
+ inkscape:vp_x="0 : 32.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_z="65 : 32.5 : 1"
+ inkscape:persp3d-origin="32.5 : 21.666667 : 1"
+ id="perspective3019" />
+ <linearGradient
+ id="linearGradient3803">
+ <stop
+ style="stop-color:#ffffff;stop-opacity:0.52252251;"
+ offset="0"
+ id="stop3805" />
+ <stop
+ style="stop-color:#ffffff;stop-opacity:0;"
+ offset="1"
+ id="stop3807" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3803"
+ id="linearGradient3809"
+ x1="155.63599"
+ y1="258.62933"
+ x2="155.63599"
+ y2="285.64468"
+ gradientUnits="userSpaceOnUse" />
+ </defs>
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="11.702174"
+ inkscape:cx="24.979597"
+ inkscape:cy="33.047489"
+ inkscape:document-units="px"
+ inkscape:current-layer="layer1"
+ showgrid="false"
+ fit-margin-top="0"
+ fit-margin-left="0"
+ fit-margin-right="0"
+ fit-margin-bottom="0"
+ inkscape:window-width="1680"
+ inkscape:window-height="1006"
+ inkscape:window-x="-4"
+ inkscape:window-y="-3"
+ inkscape:window-maximized="1" />
+ <metadata
+ id="metadata7">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage"; />
+ <dc:title />
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:label="Layer 1"
+ inkscape:groupmode="layer"
+ id="layer1"
+ transform="translate(-125.21875,-257.5625)">
+ <path
+ style="fill:#e9e8e7"
+ d="M 4.5 0.5 C 2.284 0.5 0.5 2.284 0.5 4.5 L 0.5 32.5 L 64.5 32.5 L 64.5 4.5 C 64.5 2.284 62.716 0.5 60.5 0.5 L 4.5 0.5 z "
+ transform="translate(125.21875,257.5625)"
+ id="rect3" />
+ <path
+ style="fill:#d4213d"
+ d="M 0.5 32.5 L 0.5 60.5 C 0.5 62.716 2.284 64.5 4.5 64.5 L 60.5 64.5 C 62.716 64.5 64.5 62.716 64.5 60.5 L 64.5 32.5 L 0.5 32.5 z "
+ transform="translate(125.21875,257.5625)"
+ id="rect5" />
+ <rect
+ style="fill:url(#linearGradient3809);fill-opacity:1;stroke:#000000;stroke-linejoin:miter;stroke-opacity:1"
+ id="rect2985"
+ width="64"
+ height="64"
+ x="125.71429"
+ y="258.07648"
+ rx="4"
+ ry="4" />
+ </g>
+</svg>
Binary files /tmp/U_W2YR3Mnb/brewtarget-1.2.4/images/flagPortugal.png and /tmp/YOP8NxZwyP/brewtarget-1.2.5/images/flagPortugal.png differ
diff -Nru brewtarget-1.2.4/images/flagPortugal.svg brewtarget-1.2.5/images/flagPortugal.svg
--- brewtarget-1.2.4/images/flagPortugal.svg 1970-01-01 01:00:00.000000000 +0100
+++ brewtarget-1.2.5/images/flagPortugal.svg 2012-07-14 18:49:41.000000000 +0100
@@ -0,0 +1,1324 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/";
+ xmlns:cc="http://creativecommons.org/ns#";
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";
+ xmlns:svg="http://www.w3.org/2000/svg";
+ xmlns="http://www.w3.org/2000/svg";
+ xmlns:xlink="http://www.w3.org/1999/xlink";
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd";
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape";
+ width="65"
+ height="65"
+ id="svg2"
+ version="1.1"
+ inkscape:version="0.47 r22583"
+ sodipodi:docname="flagPortugal.svg">
+ <defs
+ id="defs4">
+ <inkscape:perspective
+ sodipodi:type="inkscape:persp3d"
+ inkscape:vp_x="0 : 32.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_z="65 : 32.5 : 1"
+ inkscape:persp3d-origin="32.5 : 21.666667 : 1"
+ id="perspective3795" />
+ <linearGradient
+ id="linearGradient3803">
+ <stop
+ style="stop-color:#ffffff;stop-opacity:0.52252251;"
+ offset="0"
+ id="stop3805" />
+ <stop
+ style="stop-color:#ffffff;stop-opacity:0;"
+ offset="1"
+ id="stop3807" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3803"
+ id="linearGradient3809"
+ x1="155.63599"
+ y1="258.62933"
+ x2="155.63599"
+ y2="285.64468"
+ gradientUnits="userSpaceOnUse" />
+ </defs>
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="11.702174"
+ inkscape:cx="20.649845"
+ inkscape:cy="31.952511"
+ inkscape:document-units="px"
+ inkscape:current-layer="layer1"
+ showgrid="false"
+ fit-margin-top="0"
+ fit-margin-left="0"
+ fit-margin-right="0"
+ fit-margin-bottom="0"
+ inkscape:window-width="1680"
+ inkscape:window-height="1006"
+ inkscape:window-x="-4"
+ inkscape:window-y="-3"
+ inkscape:window-maximized="1" />
+ <metadata
+ id="metadata7">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage"; />
+ <dc:title></dc:title>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:label="Layer 1"
+ inkscape:groupmode="layer"
+ id="layer1"
+ transform="translate(-125.21875,-257.5625)">
+ <path
+ style="fill:#ff0000;fill-opacity:1"
+ d="M 32.0625 0.5 L 32.0625 47.65625 L 32.0625 64.5 L 60.5 64.5 C 62.716 64.5 64.5 62.716 64.5 60.5 L 64.5 4.5 C 64.5 2.284 62.716 0.5 60.5 0.5 L 32.0625 0.5 z "
+ transform="translate(125.21875,257.5625)"
+ id="path1339" />
+ <path
+ style="fill:#006600;fill-opacity:1"
+ d="M 4.5 0.5 C 2.284 0.5 0.5 2.284 0.5 4.5 L 0.5 60.5 C 0.5 62.716 2.284 64.5 4.5 64.5 L 32.0625 64.5 L 32.0625 0.5 L 4.5 0.5 z "
+ transform="translate(125.21875,257.5625)"
+ id="path1341" />
+ <path
+ d="m 170.63167,300.00233 c -5.15624,-0.14478 -28.79851,-13.98087 -28.96061,-16.18291 l 1.30554,-2.04117 c 2.34513,3.19461 26.51524,16.64942 28.88896,16.17247 l -1.23389,2.05161"
+ id="path1343"
+ style="fill:#ffff00;fill-rule:evenodd;stroke:none"
+ inkscape:connector-curvature="0" />
+ <path
+ d="m 142.70252,281.50124 c -0.46238,1.16699 6.16963,5.01086 14.14872,9.56057 7.97924,4.54971 14.85915,7.36093 15.36908,6.95777 0.031,-0.0521 0.2509,-0.40654 0.23074,-0.40358 -0.0957,0.13519 -0.32842,0.17752 -0.69146,0.0795 -2.15548,-0.58293 -7.77815,-3.00214 -14.74114,-6.96102 -6.96283,-3.95887 -13.02079,-7.60674 -13.96254,-9.15713 -0.0653,-0.10738 -0.11213,-0.3031 -0.1025,-0.4555 l -0.023,0 -0.20063,0.32822 -0.0274,0.0515 1.5e-4,-3.2e-4 z m 28.05151,18.56558 c -0.0876,0.14873 -0.25045,0.15395 -0.5602,0.12178 -1.92851,-0.2001 -7.78057,-2.86794 -14.70487,-6.754 -8.05751,-4.52191 -14.71209,-8.6418 -13.98918,-9.71904 l 0.19641,-0.32554 0.0387,0.0113 c -0.64916,1.82485 13.13247,9.21217 13.94373,9.68348 7.97427,4.63155 14.69674,7.33609 15.29186,6.63307 l -0.21644,0.34897"
+ id="path1345"
+ style="fill:#ffff00;fill-rule:evenodd;stroke:none"
+ inkscape:connector-curvature="0" />
+ <path
+ d="m 142.70252,281.50124 c -0.46253,1.16699 6.16948,5.01086 14.14872,9.56057 7.97909,4.54943 14.85915,7.36093 15.36908,6.95777 0.0312,-0.0521 0.2509,-0.40654 0.23074,-0.40372 -0.0956,0.13504 -0.32827,0.17766 -0.69131,0.0796 -2.15563,-0.58293 -7.77815,-3.00243 -14.74114,-6.96102 -6.96283,-3.95887 -13.02079,-7.60702 -13.96239,-9.15713 -0.0655,-0.10738 -0.11213,-0.30339 -0.10265,-0.45579 l -0.0229,-3.2e-4 -0.20048,0.32851 -0.0275,0.0515 -1.5e-4,0 z m 28.05136,18.56586 c -0.0874,0.14873 -0.25045,0.15367 -0.56005,0.12178 -1.92851,-0.20009 -7.78057,-2.86794 -14.70502,-6.754 -8.05751,-4.52219 -14.71209,-8.64179 -13.98918,-9.71904 l 0.19641,-0.32554 0.0387,0.0113 c -0.64916,1.82485 13.13246,9.21244 13.94373,9.68347 7.97427,4.63155 14.69689,7.33609 15.29186,6.63335 l -0.21644,0.34897 0,-3.2e-4 z"
+ id="path1347"
+ style="fill:none;stroke:#000000;stroke-width:0.09467521;stroke-linecap:round;stroke-linejoin:round"
+ inkscape:connector-curvature="0" />
+ <path
+ d="m 157.30729,285.15334 c 5.16046,-0.0382 11.52847,-0.6611 15.19328,-2.03045 l -0.78958,-1.20269 c -2.16617,1.12395 -8.56925,1.8631 -14.44734,1.97358 -6.9523,-0.06 -11.85959,-0.66689 -14.31851,-2.21361 l -0.74533,1.28073 c 4.51987,1.7931 9.15158,2.17396 15.10748,2.19244"
+ id="path1349"
+ style="fill:#ffff00;fill-rule:evenodd;stroke:none"
+ inkscape:connector-curvature="0" />
+ <path
+ d="m 172.71415,283.15055 c -0.12613,0.18909 -2.51626,0.96153 -6.03718,1.53176 -2.38712,0.34121 -5.50122,0.63289 -9.38743,0.63642 -3.69206,0.003 -6.70802,-0.24314 -8.99159,-0.53326 -3.69597,-0.54328 -5.60356,-1.29921 -6.30886,-1.56605 0.0674,-0.12574 0.11078,-0.21421 0.1758,-0.33162 2.03011,0.75805 3.94657,1.21497 6.19161,1.53882 2.26837,0.28801 5.24805,0.53792 8.9219,0.53439 3.868,-0.003 6.94763,-0.31722 9.32105,-0.64827 3.61048,-0.54624 5.58264,-1.24883 5.85973,-1.57508 l 0.25497,0.41261 0,3.2e-4 z m -0.69326,-1.2199 c -0.39133,0.29464 -2.34121,0.9429 -5.77183,1.45655 -2.28944,0.3079 -5.20064,0.58321 -8.91994,0.58659 -3.53342,0.003 -6.42039,-0.21999 -8.61621,-0.52013 -3.48405,-0.4263 -5.33806,-1.19578 -6.00693,-1.42014 0.0665,-0.10781 0.13426,-0.21506 0.20379,-0.32244 0.52032,0.24553 2.30976,0.92682 5.84137,1.39587 2.17099,0.28829 5.06202,0.50334 8.57798,0.49996 3.70184,-0.003 6.57978,-0.2842 8.85477,-0.58985 3.44838,-0.44478 5.30389,-1.27155 5.58565,-1.47884 l 0.25135,0.39243"
+ id="path1351"
+ style="fill:#ffff00;fill-rule:evenodd;stroke:none"
+ inkscape:connector-curvature="0" />
+ <path
+ d="m 172.714,283.15027 c -0.12613,0.18909 -2.51611,0.96181 -6.03703,1.53204 -2.38727,0.34121 -5.50122,0.63289 -9.38743,0.63642 -3.69206,0.003 -6.70802,-0.24314 -8.99144,-0.53326 -3.69597,-0.54328 -5.60356,-1.29921 -6.30871,-1.56634 0.0674,-0.12573 0.11078,-0.21392 0.1758,-0.33133 2.03011,0.75777 3.94657,1.21469 6.19161,1.53854 2.26837,0.28801 5.24805,0.53791 8.92175,0.53467 3.868,-0.004 6.94763,-0.3175 9.32105,-0.64855 3.61048,-0.54596 5.58264,-1.24855 5.85973,-1.5748 l 0.25497,0.41261 -3.4e-4,0 z m -0.69296,-1.21962 c -0.39133,0.29464 -2.34121,0.9429 -5.77183,1.45655 -2.28944,0.30762 -5.20064,0.58293 -8.91994,0.58631 -3.53342,0.003 -6.42039,-0.21999 -8.61606,-0.51985 -3.48405,-0.42658 -5.33821,-1.19606 -6.00678,-1.42043 0.0665,-0.10781 0.13426,-0.21477 0.20379,-0.32215 0.52017,0.24553 2.30961,0.92653 5.84122,1.39559 2.17084,0.28857 5.06217,0.50362 8.57798,0.50024 3.70184,-0.004 6.57978,-0.2842 8.85477,-0.59013 3.44838,-0.44478 5.30389,-1.27155 5.5855,-1.47856 l 0.25135,0.39214 0,3.2e-4 z"
+ id="path1353"
+ style="fill:none;stroke:#000000;stroke-width:0.09471282;stroke-linecap:round;stroke-linejoin:round"
+ inkscape:connector-curvature="0" />
+ <path
+ d="m 140.36236,290.98166 c 3.17399,1.60048 10.22382,2.40707 16.89497,2.46253 6.07421,0.009 13.98752,-0.88025 16.94674,-2.35035 l -0.0814,-1.60189 c -0.9258,1.35636 -9.40594,2.6574 -16.93109,2.60421 -7.52515,-0.0532 -14.51311,-1.14286 -16.84259,-2.55341 l 0.0135,1.43863"
+ id="path1355"
+ style="fill:#ffff00;fill-rule:evenodd;stroke:none"
+ inkscape:connector-curvature="0" />
+ <path
+ d="m 174.36632,290.75122 1.5e-4,0.38228 c -0.44476,0.49826 -3.23345,1.25179 -6.73044,1.78237 -2.66165,0.38255 -6.13171,0.67113 -10.45547,0.67113 -4.10777,0 -7.38336,-0.27432 -9.92385,-0.64023 -4.01551,-0.54793 -6.58415,-1.50791 -7.09965,-1.79451 l 0.002,-0.44534 c 1.54877,0.96506 5.74474,1.67118 7.15384,1.88736 2.52378,0.3635 5.78011,0.63599 9.86741,0.63599 4.30359,0 7.75407,-0.28688 10.39887,-0.66689 2.50904,-0.3398 6.08324,-1.22344 6.78689,-1.81187 l 0,-3.2e-4 z m 0.002,-1.35876 1.5e-4,0.38228 c -0.44476,0.49826 -3.23345,1.25179 -6.73045,1.78237 -2.66165,0.38255 -6.1317,0.67113 -10.45546,0.67113 -4.10777,0 -7.38351,-0.27432 -9.92385,-0.64023 -4.01551,-0.54793 -6.58415,-1.50791 -7.09965,-1.79479 l 0.002,-0.44535 c 1.54891,0.9652 5.74489,1.67147 7.15383,1.88737 2.52378,0.3635 5.78011,0.63613 9.86741,0.63613 4.30359,0 7.75408,-0.28674 10.39902,-0.66704 2.50904,-0.33979 6.08325,-1.22343 6.78689,-1.81187"
+ id="path1357"
+ style="fill:#ffff00;fill-rule:evenodd;stroke:none"
+ inkscape:connector-curvature="0" />
+ <path
+ d="m 174.36632,290.75151 1.5e-4,0.38199 c -0.44476,0.49854 -3.23345,1.25208 -6.73059,1.78265 -2.6615,0.38255 -6.13156,0.67113 -10.45532,0.67113 -4.10777,0 -7.38351,-0.2746 -9.924,-0.64022 -4.01566,-0.54822 -6.58415,-1.5082 -7.09965,-1.7948 l 0.002,-0.44563 c 1.54877,0.96535 5.74474,1.67147 7.15383,1.88765 2.52379,0.36322 5.78012,0.6357 9.86742,0.6357 4.30359,0 7.75407,-0.28659 10.39887,-0.6666 2.50904,-0.3398 6.08324,-1.22344 6.78689,-1.81187 l 1.5e-4,0 z m 0.002,-1.35876 1.5e-4,0.38199 c -0.44476,0.49826 -3.23345,1.25179 -6.7306,1.78237 -2.6615,0.38255 -6.13155,0.67113 -10.45531,0.67113 -4.10777,0 -7.38351,-0.27432 -9.924,-0.64023 -4.01566,-0.54793 -6.58415,-1.50791 -7.09965,-1.79451 l 0.002,-0.44563 c 1.54877,0.9652 5.74474,1.67147 7.15383,1.88737 2.52379,0.3635 5.78011,0.63613 9.86742,0.63613 4.30358,0 7.75407,-0.28674 10.39887,-0.66704 2.50903,-0.33979 6.08324,-1.22343 6.78688,-1.81187 l 1.5e-4,3.2e-4 z"
+ id="path1359"
+ style="fill:none;stroke:#000000;stroke-width:0.0946573;stroke-linecap:round;stroke-linejoin:round"
+ inkscape:connector-curvature="0" />
+ <path
+ d="m 157.24242,299.72773 c -7.29968,-0.0408 -13.5545,-1.86549 -14.87524,-2.16704 l 0.96312,1.41351 c 2.33309,0.92004 8.43499,2.29122 13.98226,2.13938 5.54727,-0.15169 10.39526,-0.55456 13.81173,-2.1137 l 0.98751,-1.46488 c -2.32827,1.028 -10.25152,2.18229 -14.86938,2.19273"
+ id="path1361"
+ style="fill:#ffff00;fill-rule:evenodd;stroke:none"
+ inkscape:connector-curvature="0" />
+ <path
+ d="m 171.49561,298.67166 c -0.1451,0.20757 -0.29305,0.41289 -0.44326,0.6127 -1.61138,0.53241 -4.15052,1.09164 -5.22186,1.25476 -2.18845,0.42305 -5.57467,0.73533 -8.57994,0.73674 -6.46644,-0.0888 -11.7598,-1.27578 -14.25002,-2.28812 l -0.20093,-0.32385 0.033,-0.0487 0.34076,0.1239 c 4.42851,1.48505 9.40218,2.07758 14.11366,2.18426 2.99308,0.01 5.98962,-0.3216 8.41241,-0.72786 3.71569,-0.69793 5.2181,-1.22399 5.67912,-1.46247 l 0.1171,-0.0617 0,3.2e-4 z m 0.85611,-1.32433 c 0.004,0.004 0.008,0.008 0.0111,0.0124 -0.10852,0.17173 -0.22035,0.34643 -0.33489,0.52197 -0.85957,0.28829 -3.1919,0.92795 -6.59784,1.37457 -2.24413,0.28631 -3.63893,0.56388 -8.10311,0.64544 -8.36546,-0.19953 -13.78148,-1.73313 -15.06805,-2.11145 l -0.1907,-0.34261 c 4.84799,1.18646 9.79983,2.01464 15.2589,2.09931 4.08414,-0.0816 5.82165,-0.36351 8.04697,-0.6477 3.97156,-0.57927 5.97262,-1.19225 6.57346,-1.36921 -0.008,-0.0102 -0.0165,-0.0209 -0.0265,-0.0317 l 0.43062,-0.1507"
+ id="path1363"
+ style="fill:#ffff00;fill-rule:evenodd;stroke:none"
+ inkscape:connector-curvature="0" />
+ <path
+ d="m 171.49546,298.67137 c -0.1451,0.20786 -0.29305,0.41318 -0.44311,0.61271 -1.61138,0.53269 -4.15052,1.09192 -5.22186,1.25504 -2.1886,0.42277 -5.57482,0.73505 -8.58009,0.73646 -6.46659,-0.0888 -11.7598,-1.2755 -14.25002,-2.28784 l -0.20093,-0.32385 0.0328,-0.0487 0.34076,0.1239 c 4.42851,1.48533 9.40218,2.07786 14.11381,2.18426 2.99308,0.01 5.98947,-0.3216 8.41256,-0.72786 3.71554,-0.69793 5.21795,-1.22399 5.67897,-1.46247 l 0.11725,-0.0617 -1.5e-4,0 z m 0.85626,-1.32404 c 0.004,0.004 0.008,0.008 0.0111,0.0124 -0.10852,0.17173 -0.22035,0.34643 -0.33489,0.52197 -0.85942,0.28801 -3.19175,0.92781 -6.59784,1.37428 -2.24413,0.2866 -3.63893,0.56417 -8.10311,0.64545 -8.3653,-0.19953 -13.78133,-1.73299 -15.06805,-2.11117 l -0.1907,-0.3429 c 4.84799,1.18647 9.79998,2.01465 15.2589,2.09931 4.08429,-0.0816 5.8218,-0.3635 8.04727,-0.64798 3.97156,-0.57898 5.97262,-1.19196 6.57331,-1.36892 -0.008,-0.0102 -0.0164,-0.0209 -0.0263,-0.0319 l 0.43062,-0.15085 -3.5e-4,3.2e-4 z"
+ id="path1365"
+ style="fill:none;stroke:#000000;stroke-width:0.0908616;stroke-linecap:round;stroke-linejoin:round"
+ inkscape:connector-curvature="0" />
+ <path
+ d="m 172.4399,289.71877 c 0.0237,4.50194 -2.43376,8.54171 -4.41305,10.32395 -2.80025,2.52147 -6.5132,4.14337 -10.84918,4.21804 -4.84183,0.0834 -9.40712,-2.87577 -10.63164,-4.17577 -2.39408,-2.54166 -4.34337,-5.76914 -4.40581,-10.11895 0.29655,-4.91345 2.35398,-8.33604 5.33639,-10.68304 2.98241,-2.34699 6.95352,-3.49006 10.26059,-3.40824 3.81575,0.0944 8.27306,1.84929 11.35295,5.33313 2.01786,2.28251 2.89166,4.75961 3.34975,8.51088 z m -15.22105,-15.41475 c 9.29886,0 16.94658,7.09415 16.94658,15.79249 0,8.6982 -7.64772,15.79263 -16.94658,15.79263 -9.29885,0 -16.88309,-7.09429 -16.88309,-15.79263 0,-8.69834 7.58424,-15.79249 16.88309,-15.79249"
+ id="path3966"
+ style="fill:#ffff00;fill-rule:evenodd;stroke:none"
+ inkscape:connector-curvature="0" />
+ <path
+ d="m 157.26289,274.24898 c 9.30706,0 16.89783,7.11722 16.89783,15.84354 0,8.72603 -7.59092,15.84326 -16.89783,15.84326 -9.30705,0 -16.89782,-7.11695 -16.89782,-15.84326 0,-8.72632 7.59092,-15.84354 16.89782,-15.84354 z m 0,0.34854 c 9.06173,0 16.52622,6.97315 16.52622,15.495 0,8.52156 -7.46434,15.49471 -16.52622,15.49471 -9.06172,0 -16.52606,-6.97315 -16.52606,-15.49471 0,-8.52157 7.46434,-15.495 16.52606,-15.495 z"
+ id="path1371"
+ style="fill:none;stroke:#000000;stroke-width:0.0946573;stroke-linecap:round;stroke-linejoin:round"
+ inkscape:connector-curvature="0" />
+ <path
+ d="m 157.2778,275.56582 c 8.48736,0 15.47834,6.53134 15.47834,14.51259 0,7.98139 -6.99098,14.51244 -15.47834,14.51244 -8.48722,0 -15.47835,-6.53105 -15.47835,-14.51244 0,-7.98125 6.99113,-14.51259 15.47835,-14.51259 z m 0,0.34855 c 8.28357,0 15.10658,6.37428 15.10658,14.16404 0,7.78962 -6.82316,14.16389 -15.10658,14.16389 -8.28343,0 -15.10659,-6.37427 -15.10659,-14.16389 0,-7.78976 6.82301,-14.16404 15.10659,-14.16404 z"
+ id="path1375"
+ style="fill:none;stroke:#000000;stroke-width:0.0946573;stroke-linecap:round;stroke-linejoin:round"
+ inkscape:connector-curvature="0" />
+ <path
+ d="m 157.81208,274.0015 0,0.175 -1.06666,0 0,-0.17 -0.368,0 0,32.195 0.368,0 0,-0.15 1.072,0 0,0.155 0.368,0 -0.005,-32.205 -0.368,0 z"
+ id="path1377"
+ style="fill:#ffff00;fill-rule:evenodd;stroke:none"
+ inkscape:connector-curvature="0" />
+ <path
+ d="m 156.77027,274.18576 1.02724,0"
+ id="path1379"
+ style="fill:none;stroke:#000000;stroke-width:0.0946573;stroke-linecap:round;stroke-linejoin:round"
+ inkscape:connector-curvature="0" />
+ <path
+ d="m 156.77208,306.0196 1.03221,0"
+ id="path1381"
+ style="fill:none;stroke:#000000;stroke-width:0.0946573;stroke-linecap:round;stroke-linejoin:round"
+ inkscape:connector-curvature="0" />
+ <path
+ d="m 157.81256,274.00387 0.36861,0 0.003,32.20016 -0.36891,0 -0.003,-32.20016 -1.5e-4,0 z m -1.43723,2.8e-4 0.37146,0 5.1e-4,32.1996 -0.37176,0 0,-32.1996 -1.5e-4,0 z"
+ id="path1385"
+ style="fill:none;stroke:#000000;stroke-width:0.0946796;stroke-linecap:round;stroke-linejoin:round"
+ inkscape:connector-curvature="0" />
+ <path
+ d="m 140.30456,289.41786 c 2.11906,-1.82894 9.9374,-3.01484 16.8742,-2.98407 6.93679,0.0306 15.15189,1.3668 16.93907,2.94513 l 0.0179,1.36398 c -1.49669,-1.31981 -7.87915,-2.89377 -16.94329,-2.91141 -9.06428,-0.0176 -15.64541,1.59964 -16.88819,2.94669 l 3.4e-4,-1.36032"
+ id="path1387"
+ style="fill:#ffff00;fill-rule:evenodd;stroke:none"
+ inkscape:connector-curvature="0" />
+ <path
+ d="m 140.30035,289.48122 0,1.17715"
+ id="path1389"
+ style="fill:none;stroke:#000000;stroke-width:0.09459215;stroke-linecap:round;stroke-linejoin:round"
+ inkscape:connector-curvature="0" />
+ <path
+ d="m 174.17337,289.52977 0,1.17686"
+ id="path1391"
+ style="fill:none;stroke:#000000;stroke-width:0.09459215;stroke-linecap:round;stroke-linejoin:round"
+ inkscape:connector-curvature="0" />
+ <path
+ d="m 157.27102,287.6393 c 3.99068,-0.007 7.86245,0.35475 10.93379,0.91511 3.16918,0.59421 5.39932,1.33717 6.16181,2.1717 l -8.5e-4,0.41289 c -0.91963,-1.03816 -3.92069,-1.79945 -6.2324,-2.23464 -3.04787,-0.55612 -6.8939,-0.91496 -10.86245,-0.90777 -4.18784,0.007 -8.08731,0.37917 -11.09062,0.92823 -2.40985,0.44831 -5.62373,1.33915 -6.025,2.21728 l 0,-0.43024 c 0.2205,-0.60777 2.61349,-1.51667 5.97081,-2.14673 3.02559,-0.55316 6.93243,-0.91835 11.14481,-0.92583 l 1.5e-4,0 z m 0.002,-1.35876 c 3.99067,-0.007 7.86244,0.35475 10.93379,0.91511 3.16918,0.59421 5.39932,1.33717 6.16181,2.1717 l -8.5e-4,0.41289 c -0.91963,-1.03816 -3.92069,-1.79945 -6.2324,-2.23464 -3.04787,-0.55612 -6.8939,-0.91496 -10.86245,-0.90777 -4.18785,0.007 -8.06865,0.37917 -11.07196,0.92823 -2.32556,0.41332 -5.67069,1.33915 -6.04366,2.21728 l 0,-0.43024 c 0.2205,-0.60142 2.66181,-1.54263 5.97096,-2.14673 3.02559,-0.55316 6.93243,-0.91835 11.14481,-0.92583"
+ id="path1393"
+ style="fill:#ffff00;fill-rule:evenodd;stroke:none"
+ inkscape:connector-curvature="0" />
+ <path
+ d="m 157.27102,287.6393 c 3.99068,-0.007 7.8626,0.35447 10.93379,0.91511 3.16918,0.59393 5.39932,1.33688 6.16196,2.17141 l -8.5e-4,0.41318 c -0.91963,-1.03844 -3.92068,-1.79973 -6.2324,-2.23492 -3.04771,-0.55584 -6.89375,-0.91468 -10.86245,-0.90777 -4.18784,0.007 -8.08731,0.37917 -11.09062,0.92851 -2.40985,0.44831 -5.62358,1.33887 -6.02484,2.21728 l 0,-0.43024 c 0.22034,-0.60805 2.61334,-1.51667 5.97065,-2.14673 3.02575,-0.55316 6.93243,-0.91863 11.14481,-0.92583 z m 0.002,-1.35876 c 3.99067,-0.007 7.86259,0.35475 10.93379,0.91511 3.16918,0.59421 5.39932,1.33688 6.16196,2.17141 l -8.5e-4,0.41318 c -0.91963,-1.03816 -3.92069,-1.79945 -6.2324,-2.23464 -3.04772,-0.55612 -6.89375,-0.91496 -10.86245,-0.90777 -4.18785,0.007 -8.0685,0.37917 -11.07196,0.92823 -2.32556,0.41332 -5.67054,1.33915 -6.04366,2.21756 l 0,-0.43052 c 0.22035,-0.60142 2.6618,-1.54263 5.97081,-2.14673 3.02574,-0.55316 6.93243,-0.91835 11.14481,-0.92583 z"
+ id="path1395"
+ style="fill:none;stroke:#000000;stroke-width:0.0946573;stroke-linecap:round;stroke-linejoin:round"
+ inkscape:connector-curvature="0" />
+ <path
+ d="m 157.18975,279.35043 c 6.28884,-0.0295 11.77425,0.82437 14.28388,2.0296 l 0.91542,1.48463 c -2.18122,-1.10208 -8.0992,-2.24804 -15.19027,-2.07659 -5.77771,0.0333 -11.95125,0.59633 -15.04879,2.14559 l 1.09287,-1.71351 c 2.54214,-1.23585 8.53703,-1.86281 13.94689,-1.86944"
+ id="path1397"
+ style="fill:#ffff00;fill-rule:evenodd;stroke:none"
+ inkscape:connector-curvature="0" />
+ <path
+ d="m 171.63287,281.61978 0.62297,0.93768"
+ id="path1399"
+ style="fill:none;stroke:#000000;stroke-width:0.09486745;stroke-linecap:round;stroke-linejoin:round"
+ inkscape:connector-curvature="0" />
+ <path
+ d="m 157.27298,280.5764 c 3.58685,-0.009 7.05299,0.18077 9.80947,0.647 2.56698,0.44788 5.01505,1.11986 5.36484,1.48195 l 0.27123,0.44958 c -0.8513,-0.52113 -2.9696,-1.10138 -5.68981,-1.58496 -2.73194,-0.48133 -6.19537,-0.64079 -9.76235,-0.63204 -4.04862,-0.013 -7.19387,0.18711 -9.89346,0.62837 -2.85476,0.50108 -4.83549,1.21623 -5.32436,1.55631 l 0.26611,-0.47512 c 0.94943,-0.4541 2.4559,-1.00147 4.98736,-1.42875 2.79155,-0.47808 5.97036,-0.62174 9.97082,-0.64234 l 1.5e-4,0 z m -0.002,-1.35721 c 3.43273,-0.009 6.82196,0.17061 9.46389,0.6161 2.08369,0.38001 4.14435,0.97394 4.89872,1.50198 l 0.3969,0.59154 c -0.6746,-0.70344 -3.21464,-1.36962 -5.45681,-1.74272 -2.62177,-0.4239 -5.87027,-0.59168 -9.3027,-0.61849 -3.60235,0.009 -6.93168,0.21604 -9.51506,0.65729 -2.46479,0.43971 -4.05509,0.96027 -4.72804,1.36653 l 0.34904,-0.49389 c 0.92866,-0.45833 2.42896,-0.87927 4.31834,-1.22316 2.60265,-0.44421 5.9523,-0.646 9.57572,-0.65518"
+ id="path1401"
+ style="fill:#ffff00;fill-rule:evenodd;stroke:none"
+ inkscape:connector-curvature="0" />
+ <path
+ d="m 157.27298,280.5764 c 3.58685,-0.009 7.05284,0.18077 9.80931,0.647 2.56699,0.44788 5.01506,1.12014 5.365,1.48166 l 0.27138,0.44958 c -0.8513,-0.52112 -2.96975,-1.10137 -5.68981,-1.58496 -2.73164,-0.48133 -6.19522,-0.64078 -9.7622,-0.63203 -4.04847,-0.013 -7.19402,0.18739 -9.8933,0.62865 -2.85492,0.5008 -4.83565,1.21623 -5.32437,1.55617 l 0.26596,-0.47526 c 0.94943,-0.4541 2.4559,-1.00147 4.98736,-1.42875 2.79155,-0.47809 5.97036,-0.62146 9.97082,-0.64206 l -1.5e-4,0 z m -0.002,-1.35749 c 3.43258,-0.008 6.82196,0.17089 9.46374,0.61609 2.08369,0.3803 4.14435,0.97395 4.89887,1.50227 l 0.3969,0.59126 c -0.67475,-0.70316 -3.21464,-1.36948 -5.45681,-1.74272 -2.62162,-0.4239 -5.87012,-0.59168 -9.3027,-0.61849 -3.60235,0.009 -6.93168,0.21632 -9.51506,0.65729 -2.46463,0.4397 -4.05509,0.96026 -4.72804,1.36681 l 0.34904,-0.49389 c 0.92866,-0.45833 2.42896,-0.87927 4.31834,-1.22344 2.6025,-0.44422 5.95215,-0.64572 9.57572,-0.65518 z"
+ id="path1403"
+ style="fill:none;stroke:#000000;stroke-width:0.09471282;stroke-linecap:round;stroke-linejoin:round"
+ inkscape:connector-curvature="0" />
+ <path
+ d="m 165.66688,296.67846 c -3.10913,-0.54412 -6.22412,-0.62315 -8.39962,-0.59916 -10.48015,0.11515 -13.86561,2.01747 -14.27877,2.59348 l -0.78326,-1.19704 c 2.66812,-1.81314 8.37508,-2.82985 15.11877,-2.72599 3.50166,0.0538 6.52349,0.27178 9.06564,0.73336 l -0.72291,1.19563"
+ id="path1405"
+ style="fill:#ffff00;fill-rule:evenodd;stroke:none"
+ inkscape:connector-curvature="0" />
+ <path
+ d="m 142.37922,297.6414 0.51415,0.82988"
+ id="path1407"
+ style="fill:none;stroke:#000000;stroke-width:0.0946573;stroke-linecap:round;stroke-linejoin:round"
+ inkscape:connector-curvature="0" />
+ <path
+ d="m 157.20736,295.91039 c 2.91526,0.0408 5.7771,0.15367 8.53899,0.63655 l -0.20003,0.33105 c -2.56533,-0.44393 -5.29998,-0.61383 -8.32903,-0.60029 -3.86771,-0.0281 -7.77981,0.31059 -11.1856,1.22697 -1.07465,0.2801 -2.8537,0.92808 -3.03522,1.46332 l -0.19883,-0.30791 c 0.0572,-0.31637 1.1326,-0.97268 3.14254,-1.50212 3.90112,-1.04733 7.55013,-1.22386 11.26733,-1.24785 l -1.5e-4,3.2e-4 z m 0.13229,-1.37541 c 3.02048,0.0529 6.13969,0.18387 9.1716,0.7469 l -0.20831,0.34488 c -2.73766,-0.5097 -5.35356,-0.67945 -8.94537,-0.73124 -3.88005,0.006 -7.9958,0.26599 -11.73813,1.28595 -1.20816,0.32991 -3.29335,1.04323 -3.36304,1.60768 l -0.19883,-0.33049 c 0.0452,-0.51294 1.8504,-1.18208 3.47442,-1.62489 3.77108,-1.02786 7.89767,-1.29216 11.80766,-1.29879"
+ id="path1409"
+ style="fill:#ffff00;fill-rule:evenodd;stroke:none"
+ inkscape:connector-curvature="0" />
+ <path
+ d="m 157.20736,295.91039 c 2.91526,0.0408 5.77695,0.15367 8.53899,0.63655 l -0.20003,0.33105 c -2.56533,-0.44393 -5.29998,-0.61383 -8.32903,-0.6 -3.86786,-0.0284 -7.77981,0.3103 -11.18575,1.22668 -1.07465,0.28038 -2.8537,0.92808 -3.03507,1.46332 l -0.19898,-0.30762 c 0.0573,-0.31638 1.1326,-0.97297 3.14269,-1.50241 3.90112,-1.04733 7.55013,-1.22386 11.26718,-1.24785 l 0,3.2e-4 z m 0.13229,-1.37541 c 3.02048,0.0529 6.13969,0.18387 9.1716,0.7469 l -0.20831,0.3446 c -2.73781,-0.50956 -5.35356,-0.67946 -8.94552,-0.73124 -3.88005,0.007 -7.99595,0.26599 -11.73813,1.28594 -1.20816,0.32992 -3.29335,1.04324 -3.36289,1.60797 l -0.19898,-0.33049 c 0.0453,-0.51294 1.8504,-1.18208 3.47442,-1.62489 3.77108,-1.02786 7.89767,-1.29216 11.80781,-1.29879 z"
+ id="path1411"
+ style="fill:none;stroke:#000000;stroke-width:0.0908616;stroke-linecap:round;stroke-linejoin:round"
+ inkscape:connector-curvature="0" />
+ <path
+ d="m 143.09611,281.19898 c 5.19145,-0.0632 29.16831,13.73577 29.2389,16.27676 l -1.4854,2.13459 c -0.66963,-2.94979 -24.99928,-16.37793 -29.01284,-16.12492 l 1.25934,-2.28643"
+ id="path1419"
+ style="fill:#ffff00;fill-rule:evenodd;stroke:none"
+ inkscape:connector-curvature="0" />
+ <path
+ d="m 172.22589,297.65692 -1.25933,1.83191"
+ id="path1421"
+ style="fill:none;stroke:#000000;stroke-width:0.09468295;stroke-linecap:round;stroke-linejoin:round"
+ inkscape:connector-curvature="0" />
+ <path
+ d="m 143.05758,281.31963 -1.17144,2.03511"
+ id="path1423"
+ style="fill:none;stroke:#000000;stroke-width:0.09468295;stroke-linecap:round;stroke-linejoin:round"
+ inkscape:connector-curvature="0" />
+ <path
+ d="m 141.68822,283.40385 c 0.96373,-0.61271 8.04501,2.34456 15.45472,6.53316 7.38998,4.2006 14.4517,8.94744 13.81429,9.83602 l -0.20982,0.30889 -0.0962,0.0714 c 0.0206,-0.0141 0.12689,-0.13561 -0.0104,-0.46496 -0.31487,-0.97127 -5.32391,-4.71862 -13.63518,-9.42326 -8.10236,-4.52967 -14.85493,-7.25933 -15.53012,-6.47927 l 0.21282,-0.38198 -1.5e-4,0 z m 30.7955,14.22796 c 0.60927,-1.12805 -5.95907,-5.76708 -14.10252,-10.28348 -8.33084,-4.42624 -14.33491,-7.03214 -15.43169,-6.25518 l -0.24383,0.41557 c -0.002,0.0231 0.009,-0.0281 0.0603,-0.0656 0.19958,-0.16313 0.52996,-0.15212 0.67911,-0.15466 1.88863,0.0265 7.28192,2.35345 14.84891,6.42056 3.31578,1.8106 14.00679,8.23849 13.96616,10.04627 0.003,0.15536 0.0137,0.18711 -0.0488,0.26402 l 0.27198,-0.38749"
+ id="path1425"
+ style="fill:#ffff00;fill-rule:evenodd;stroke:none"
+ inkscape:connector-curvature="0" />
+ <path
+ d="m 141.68822,283.40356 c 0.96358,-0.6127 8.04501,2.34485 15.45472,6.53345 7.38998,4.2006 14.45155,8.94744 13.81414,9.83574 l -0.20967,0.30917 -0.0962,0.0711 c 0.0206,-0.0138 0.12689,-0.13561 -0.0104,-0.46496 -0.31487,-0.97127 -5.32391,-4.71862 -13.63518,-9.42326 -8.10236,-4.52939 -14.85508,-7.25933 -15.53012,-6.47899 l 0.21282,-0.38227 -1.5e-4,0 z m 30.7955,14.22825 c 0.60927,-1.12833 -5.95907,-5.76708 -14.10252,-10.28348 -8.33069,-4.42652 -14.33491,-7.03214 -15.43169,-6.25518 l -0.24368,0.41586 c -0.002,0.0229 0.009,-0.0284 0.0603,-0.0656 0.19943,-0.16313 0.52996,-0.15212 0.67911,-0.15466 1.88848,0.0265 7.28177,2.35345 14.84906,6.42056 3.31563,1.81046 14.0068,8.2385 13.96601,10.04627 0.003,0.15536 0.0137,0.1874 -0.0486,0.2643 l 0.27198,-0.38777 0,-3.2e-4 z"
+ id="path1427"
+ style="fill:none;stroke:#000000;stroke-width:0.09468747;stroke-linecap:round;stroke-linejoin:round"
+ inkscape:connector-curvature="0" />
+ <path
+ d="m 147.14066,291.83764 c 0,2.60322 1.13712,4.95794 2.97954,6.67879 1.84588,1.72452 4.35416,2.81263 7.13532,2.81263 2.79576,0 5.33279,-1.0644 7.17069,-2.78229 1.8379,-1.7176 2.97713,-4.08813 2.97743,-6.70052 l -1.5e-4,0 0,-12.67024 -20.26493,-0.0226 0.002,12.6842"
+ id="path1429"
+ style="fill:#ffffff;fill-rule:evenodd;stroke:none"
+ inkscape:connector-curvature="0" />
+ <path
+ d="m 147.14051,291.83764 c 0,2.60336 1.13712,4.95794 2.97939,6.67879 1.84573,1.72452 4.35401,2.81263 7.13532,2.81263 2.79576,0 5.33279,-1.0644 7.17069,-2.78229 1.8379,-1.7176 2.97698,-4.08827 2.97743,-6.7008 l -3.4e-4,0 0,-12.67024 -20.26493,-0.0226 0.002,12.68449 3.4e-4,0 z"
+ id="path1431"
+ style="fill:none;stroke:#000000;stroke-width:0.11077714"
+ inkscape:connector-curvature="0" />
+ <path
+ d="m 147.51995,291.85556 0,0.007 0,0 c 0,2.48906 1.09949,4.75587 2.86304,6.40151 1.76701,1.64874 4.20079,2.67392 6.8632,2.67392 2.6761,0 5.10491,-1.0177 6.8644,-2.66009 1.75933,-1.64239 2.84964,-3.9092 2.84994,-6.4073 l -3.4e-4,0 0,-12.29191 -19.42839,-0.003 -0.0119,12.27992 m 15.53434,-8.59946 6.8e-4,7.82222 -0.007,0.82748 1.5e-4,0 c 0,0.21802 -0.014,0.46623 -0.0409,0.67733 -0.15803,1.23698 -0.76475,2.31465 -1.66315,3.15327 -1.05193,0.982 -2.50407,1.59061 -4.10401,1.59061 -1.59182,0 -3.01039,-0.63006 -4.06684,-1.61601 -1.08353,-1.01092 -1.71162,-2.39748 -1.71162,-3.83117 l -0.002,-8.64362 11.59529,0.0196"
+ id="path1433"
+ style="fill:#ff0000;fill-opacity:1;fill-rule:evenodd;stroke:none"
+ inkscape:connector-curvature="0" />
+ <path
+ d="m 147.5198,291.85556 0,0.007 0,0 c 0,2.48906 1.09934,4.75587 2.86289,6.40151 1.76701,1.64874 4.20079,2.67392 6.8632,2.67392 2.67625,0 5.10491,-1.0177 6.86455,-2.66009 1.75918,-1.64239 2.84964,-3.9092 2.84994,-6.40701 l -3.4e-4,0 0,-12.2922 -19.42839,-0.003 -0.0119,12.27964 m 15.53449,-8.59946 6.8e-4,7.8225 -0.007,0.82748 1.5e-4,0 c 0,0.21773 -0.014,0.46594 -0.0411,0.67733 -0.15789,1.2367 -0.7646,2.31465 -1.66316,3.15327 -1.05193,0.98171 -2.50392,1.59061 -4.10401,1.59061 -1.59181,0 -3.01039,-0.63007 -4.06683,-1.61601 -1.08369,-1.0112 -1.71178,-2.39776 -1.71178,-3.83145 l -0.002,-8.64363 11.59514,0.0196 3.4e-4,3.2e-4 z"
+ id="path1435"
+ style="fill:none;stroke:#000000;stroke-width:0.08383729"
+ inkscape:connector-curvature="0" />
+ <path
+ d="m 156.02102,286.29818 0,8e-4 c 0,0.35391 0.14494,0.67635 0.37749,0.91031 0.23299,0.23466 0.55388,0.38043 0.90487,0.38043 0.3528,0 0.67309,-0.14478 0.90503,-0.37846 0.23179,-0.2334 0.37583,-0.55555 0.37583,-0.91087 l 0,0 0,-1.72283 -2.55855,-0.002 -0.005,1.72254"
+ id="path1485"
+ style="fill:#003399;fill-opacity:1"
+ inkscape:connector-curvature="0" />
+ <use
+ transform="translate(-0.01151488,8.2879552)"
+ id="use3434"
+ x="0"
+ y="0"
+ width="600"
+ height="400"
+ xlink:href="#path1485" />
+ <use
+ transform="translate(3.5529848,-4.1188248)"
+ id="use3436"
+ x="0"
+ y="0"
+ width="600"
+ height="400"
+ xlink:href="#use3434" />
+ <use
+ transform="translate(-3.540492,-0.0064904)"
+ id="use3438"
+ x="0"
+ y="0"
+ width="600"
+ height="400"
+ xlink:href="#use3436" />
+ <use
+ transform="translate(-3.5496739,0.0081136)"
+ id="use3440"
+ x="0"
+ y="0"
+ width="600"
+ height="400"
+ xlink:href="#use3438" />
+ <g
+ id="g6250"
+ transform="matrix(0.17066667,0,0,0.16,116.31875,258.0765)">
+ <path
+ d="m 186.3022,139.04482 1.20027,0.002 0,0.87136 0.87662,0 0,-0.89077 1.22938,0.004 0,0.88724 0.87926,0 0,-0.89077 1.23025,0.002 -0.002,2.01171 c 0,0.31398 -0.2487,0.51859 -0.5362,0.51859 l -4.31693,0 c -0.29014,0 -0.55824,-0.23548 -0.55824,-0.52741 l -0.002,-1.98702"
+ id="path1535"
+ style="fill:#ffff00;fill-rule:evenodd;stroke:none"
+ inkscape:connector-curvature="0" />
+ <path
+ d="m 186.3022,139.04482 1.19939,0.003 0,0.87224 0.8775,0 0,-0.89253 1.22938,0.004 0,0.889 0.87926,0 0,-0.89253 1.23025,0.002 -0.002,2.01171 c 0,0.31398 -0.2487,0.51859 -0.5362,0.51859 l -4.31693,0 c -0.28926,0 -0.55824,-0.23548 -0.55913,-0.52564 l -0.003,-1.98879 8.8e-4,0 z"
+ id="path1537"
+ style="fill:none;stroke:#000000;stroke-width:0.50017256;stroke-opacity:1"
+ inkscape:connector-curvature="0" />
+ <path
+ d="m 190.93926,141.55925 0.13141,3.47751 -4.12644,0.002 0.11641,-3.47927 3.87862,0"
+ id="path1539"
+ style="fill:#ffff00;fill-rule:evenodd;stroke:none"
+ inkscape:connector-curvature="0" />
+ <path
+ d="m 190.94014,141.55925 0.13141,3.47751 -4.12556,0.002 0.11641,-3.47927 3.87863,0 -8.9e-4,0 z"
+ id="path1541"
+ style="fill:none;stroke:#000000;stroke-width:0.50127673"
+ inkscape:connector-curvature="0" />
+ <path
+ d="m 193.89806,140.61027 c -0.0265,-0.62706 0.87661,-0.63411 0.86603,0 l 0,1.53635 -0.86603,0 0,-1.53635"
+ id="path1543"
+ style="fill:#000000;fill-rule:evenodd;stroke:none"
+ inkscape:connector-curvature="0" />
+ <path
+ d="m 190.19141,154.43388 c 0.13493,-5.52098 4.05235,-6.82802 4.08057,-6.84742 0.0282,-0.0185 4.23139,1.40758 4.21728,6.89857 l -8.29785,-0.0512"
+ id="path1497"
+ style="fill:#ffff00;fill-rule:evenodd;stroke:none"
+ inkscape:connector-curvature="0" />
+ <path
+ d="m 186.8093,147.68435 -0.68172,6.34648 4.14055,0.009 c 0.0397,-5.24934 3.97475,-6.12246 4.07,-6.10306 0.0891,-0.005 3.98886,1.15888 4.09292,6.10306 l 4.15113,0 -0.7505,-6.39322 -15.0215,0.0379"
+ id="path1499"
+ style="fill:#ffff00;fill-rule:evenodd;stroke:none"
+ inkscape:connector-curvature="0" />
+ <path
+ d="m 186.8093,147.68612 -0.68172,6.34471 4.14055,0.009 c 0.0397,-5.24934 3.97387,-6.12246 4.06912,-6.10306 0.0891,-0.005 3.98886,1.16064 4.09292,6.10306 l 4.15113,0 -0.74962,-6.39322 -15.02238,0.0379 0,0.002 z"
+ id="path1501"
+ style="fill:none;stroke:#000000;stroke-width:0.49936473"
+ inkscape:connector-curvature="0" />
+ <path
+ d="m 185.85155,154.05994 16.94582,0 c 0.35629,0 0.6482,0.35277 0.6482,0.78404 0,0.42863 -0.29103,0.78141 -0.6482,0.78141 l -16.94582,0 c -0.35718,0 -0.64909,-0.35102 -0.64909,-0.78141 0,-0.43127 0.29191,-0.78404 0.64909,-0.78404"
+ id="path1503"
+ style="fill:#ffff00;fill-rule:evenodd;stroke:none"
+ inkscape:connector-curvature="0" />
+ <path
+ d="m 185.85066,154.05994 16.94583,0 c 0.35717,0 0.64908,0.35277 0.64908,0.78404 l 0,0 c 0,0.43039 -0.29191,0.78141 -0.64908,0.78141 l -16.94583,0 c -0.35717,0 -0.64908,-0.35102 -0.64908,-0.78141 l 0,0 c 0,-0.43127 0.29191,-0.78404 0.64908,-0.78404 z"
+ id="path1505"
+ style="fill:none;stroke:#000000;stroke-width:0.49943003"
+ inkscape:connector-curvature="0" />
+ <path
+ d="m 192.01431,154.02907 c 0.0185,-3.31259 2.26208,-4.2501 2.27355,-4.24833 8.8e-4,0 2.34146,0.96661 2.35998,4.24833 l -4.63353,0"
+ id="path1507"
+ style="fill:#ffff00;fill-rule:evenodd;stroke:none"
+ inkscape:connector-curvature="0" />
+ <path
+ d="m 192.01431,154.02907 c 0.0185,-3.31259 2.26208,-4.2501 2.27355,-4.24833 8.8e-4,0 2.34234,0.96661 2.36086,4.24833 l -4.63441,0"
+ id="path1509"
+ style="fill:none;stroke:#000000;stroke-width:0.49703202"
+ inkscape:connector-curvature="0" />
+ <path
+ d="m 186.20784,145.05616 16.2447,0 c 0.34218,0 0.62263,0.31662 0.62263,0.70467 0,0.38541 -0.28045,0.70468 -0.62263,0.70468 l -16.2447,0 c -0.34218,0 -0.62263,-0.3175 -0.62263,-0.70468 0,-0.38805 0.28045,-0.70467 0.62263,-0.70467"
+ id="path1511"
+ style="fill:#ffff00;fill-rule:evenodd;stroke:none"
+ inkscape:connector-curvature="0" />
+ <path
+ d="m 186.20784,145.05439 16.2447,0 c 0.34218,0 0.62263,0.31839 0.62263,0.70468 l 0,0 c 0,0.38717 -0.28045,0.70467 -0.62263,0.70467 l -16.2447,0 c -0.34218,0 -0.62263,-0.31573 -0.62263,-0.70467 l 0,0 c 0,-0.38629 0.28045,-0.70468 0.62263,-0.70468 z"
+ id="path1513"
+ style="fill:none;stroke:#000000;stroke-width:0.49901107"
+ inkscape:connector-curvature="0" />
+ <path
+ d="m 186.5509,146.46551 15.53918,0 c 0.32719,0 0.59617,0.31662 0.59617,0.70379 0,0.38805 -0.2681,0.70467 -0.59617,0.70467 l -15.53918,0 c -0.32719,0 -0.59529,-0.31662 -0.59529,-0.70467 0,-0.38717 0.2681,-0.70379 0.59529,-0.70379"
+ id="path1515"
+ style="fill:#ffff00;fill-rule:evenodd;stroke:none"
+ inkscape:connector-curvature="0" />
+ <path
+ d="m 186.5509,146.46551 15.5383,0 c 0.32719,0 0.59529,0.31662 0.59529,0.70379 l 0,0 c 0,0.38805 -0.2681,0.70467 -0.59529,0.70467 l -15.5383,0 c -0.32719,0 -0.59529,-0.31662 -0.59529,-0.70467 l 0,0 c 0,-0.38717 0.2681,-0.70379 0.59529,-0.70379 z"
+ id="path1517"
+ style="fill:none;stroke:#000000;stroke-width:0.49901107"
+ inkscape:connector-curvature="0" />
+ <path
+ d="m 191.57159,135.88217 1.22673,0.002 0,0.87136 0.89513,0 0,-0.89076 1.25672,0.004 0,0.88723 0.89778,0 0,-0.89076 1.2576,0 -0.002,2.01171 c 0,0.31574 -0.25398,0.52035 -0.54854,0.52035 l -4.41129,0 c -0.29633,0 -0.56972,-0.23724 -0.5706,-0.52652 l -0.003,-1.9879 8.8e-4,0 z"
+ id="path1521"
+ style="fill:none;stroke:#000000;stroke-width:0.50025284"
+ inkscape:connector-curvature="0" />
+ <path
+ d="m 196.19366,138.5721 0.27692,6.45319 -4.30282,-0.0159 0.28485,-6.45055 3.74193,0.015"
+ id="path1523"
+ style="fill:#ffff00;fill-rule:evenodd;stroke:none"
+ inkscape:connector-curvature="0" />
+ <path
+ d="m 196.19278,138.57386 0.27691,6.45143 -4.30282,-0.0159 0.28486,-6.45231 3.74105,0.0168"
+ id="path1525"
+ style="fill:none;stroke:#000000;stroke-width:0.49897757"
+ inkscape:connector-curvature="0" />
+ <path
+ d="m 188.56605,142.84424 c -0.003,-0.6059 0.83693,-0.61824 0.82635,0 l 0,1.1871 -0.82635,0 0,-1.1871"
+ id="path1547"
+ style="fill:#000000;fill-rule:evenodd;stroke:none"
+ inkscape:connector-curvature="0" />
+ <use
+ transform="translate(10.60844,0)"
+ id="use4364"
+ x="0"
+ y="0"
+ width="600"
+ height="400"
+ xlink:href="#path1539" />
+ <use
+ transform="translate(10.60845,0)"
+ id="use4656"
+ x="0"
+ y="0"
+ width="600"
+ height="400"
+ xlink:href="#path1535" />
+ <use
+ transform="translate(-5.27909,-3.162655)"
+ id="use4658"
+ x="0"
+ y="0"
+ width="600"
+ height="400"
+ xlink:href="#use4656" />
+ <use
+ transform="translate(10.60889,0)"
+ id="use4366"
+ x="0"
+ y="0"
+ width="600"
+ height="400"
+ xlink:href="#path1541" />
+ <use
+ transform="translate(10.60889,-0.010585)"
+ id="use4660"
+ x="0"
+ y="0"
+ width="600"
+ height="400"
+ xlink:href="#path1537" />
+ <use
+ transform="translate(10.64108,0)"
+ id="use4362"
+ x="0"
+ y="0"
+ width="600"
+ height="400"
+ xlink:href="#path1547" />
+ </g>
+ <g
+ transform="matrix(0.17066667,0,0,0.16,116.31875,265.48764)"
+ id="use4980">
+ <use
+ transform="translate(10.60844,0)"
+ id="use5166"
+ x="0"
+ y="0"
+ width="600"
+ height="400"
+ xlink:href="#path1539" />
+ <path
+ d="m 190.19141,154.43388 c 0.13493,-5.52098 4.05235,-6.82802 4.08057,-6.84742 0.0282,-0.0185 4.23139,1.40758 4.21728,6.89857 l -8.29785,-0.0512"
+ id="path5168"
+ style="fill:#ffff00;fill-rule:evenodd;stroke:none"
+ inkscape:connector-curvature="0" />
+ <path
+ d="m 186.8093,147.68435 -0.68172,6.34648 4.14055,0.009 c 0.0397,-5.24934 3.97475,-6.12246 4.07,-6.10306 0.0891,-0.005 3.98886,1.15888 4.09292,6.10306 l 4.15113,0 -0.7505,-6.39322 -15.0215,0.0379"
+ id="path5170"
+ style="fill:#ffff00;fill-rule:evenodd;stroke:none"
+ inkscape:connector-curvature="0" />
+ <path
+ d="m 186.8093,147.68612 -0.68172,6.34471 4.14055,0.009 c 0.0397,-5.24934 3.97387,-6.12246 4.06912,-6.10306 0.0891,-0.005 3.98886,1.16064 4.09292,6.10306 l 4.15113,0 -0.74962,-6.39322 -15.02238,0.0379 0,0.002 z"
+ id="path5172"
+ style="fill:none;stroke:#000000;stroke-width:0.49936473"
+ inkscape:connector-curvature="0" />
+ <path
+ d="m 185.85155,154.05994 16.94582,0 c 0.35629,0 0.6482,0.35277 0.6482,0.78404 0,0.42863 -0.29103,0.78141 -0.6482,0.78141 l -16.94582,0 c -0.35718,0 -0.64909,-0.35102 -0.64909,-0.78141 0,-0.43127 0.29191,-0.78404 0.64909,-0.78404"
+ id="path5174"
+ style="fill:#ffff00;fill-rule:evenodd;stroke:none"
+ inkscape:connector-curvature="0" />
+ <path
+ d="m 185.85066,154.05994 16.94583,0 c 0.35717,0 0.64908,0.35277 0.64908,0.78404 l 0,0 c 0,0.43039 -0.29191,0.78141 -0.64908,0.78141 l -16.94583,0 c -0.35717,0 -0.64908,-0.35102 -0.64908,-0.78141 l 0,0 c 0,-0.43127 0.29191,-0.78404 0.64908,-0.78404 z"
+ id="path5176"
+ style="fill:none;stroke:#000000;stroke-width:0.49943003"
+ inkscape:connector-curvature="0" />
+ <path
+ d="m 192.01431,154.02907 c 0.0185,-3.31259 2.26208,-4.2501 2.27355,-4.24833 8.8e-4,0 2.34146,0.96661 2.35998,4.24833 l -4.63353,0"
+ id="path5178"
+ style="fill:#ffff00;fill-rule:evenodd;stroke:none"
+ inkscape:connector-curvature="0" />
+ <path
+ d="m 192.01431,154.02907 c 0.0185,-3.31259 2.26208,-4.2501 2.27355,-4.24833 8.8e-4,0 2.34234,0.96661 2.36086,4.24833 l -4.63441,0"
+ id="path5180"
+ style="fill:none;stroke:#000000;stroke-width:0.49703202"
+ inkscape:connector-curvature="0" />
+ <path
+ d="m 186.20784,145.05616 16.2447,0 c 0.34218,0 0.62263,0.31662 0.62263,0.70467 0,0.38541 -0.28045,0.70468 -0.62263,0.70468 l -16.2447,0 c -0.34218,0 -0.62263,-0.3175 -0.62263,-0.70468 0,-0.38805 0.28045,-0.70467 0.62263,-0.70467"
+ id="path5182"
+ style="fill:#ffff00;fill-rule:evenodd;stroke:none"
+ inkscape:connector-curvature="0" />
+ <path
+ d="m 186.20784,145.05439 16.2447,0 c 0.34218,0 0.62263,0.31839 0.62263,0.70468 l 0,0 c 0,0.38717 -0.28045,0.70467 -0.62263,0.70467 l -16.2447,0 c -0.34218,0 -0.62263,-0.31573 -0.62263,-0.70467 l 0,0 c 0,-0.38629 0.28045,-0.70468 0.62263,-0.70468 z"
+ id="path5184"
+ style="fill:none;stroke:#000000;stroke-width:0.49901107"
+ inkscape:connector-curvature="0" />
+ <path
+ d="m 186.5509,146.46551 15.53918,0 c 0.32719,0 0.59617,0.31662 0.59617,0.70379 0,0.38805 -0.2681,0.70467 -0.59617,0.70467 l -15.53918,0 c -0.32719,0 -0.59529,-0.31662 -0.59529,-0.70467 0,-0.38717 0.2681,-0.70379 0.59529,-0.70379"
+ id="path5186"
+ style="fill:#ffff00;fill-rule:evenodd;stroke:none"
+ inkscape:connector-curvature="0" />
+ <path
+ d="m 186.5509,146.46551 15.5383,0 c 0.32719,0 0.59529,0.31662 0.59529,0.70379 l 0,0 c 0,0.38805 -0.2681,0.70467 -0.59529,0.70467 l -15.5383,0 c -0.32719,0 -0.59529,-0.31662 -0.59529,-0.70467 l 0,0 c 0,-0.38717 0.2681,-0.70379 0.59529,-0.70379 z"
+ id="path5188"
+ style="fill:none;stroke:#000000;stroke-width:0.49901107"
+ inkscape:connector-curvature="0" />
+ <use
+ transform="translate(-5.27909,-3.162655)"
+ id="use5190"
+ x="0"
+ y="0"
+ width="600"
+ height="400"
+ xlink:href="#use4656" />
+ <path
+ d="m 191.57159,135.88217 1.22673,0.002 0,0.87136 0.89513,0 0,-0.89076 1.25672,0.004 0,0.88723 0.89778,0 0,-0.89076 1.2576,0 -0.002,2.01171 c 0,0.31574 -0.25398,0.52035 -0.54854,0.52035 l -4.41129,0 c -0.29633,0 -0.56972,-0.23724 -0.5706,-0.52652 l -0.003,-1.9879 8.8e-4,0 z"
+ id="path5192"
+ style="fill:none;stroke:#000000;stroke-width:0.50025284"
+ inkscape:connector-curvature="0" />
+ <path
+ d="m 196.19366,138.5721 0.27692,6.45319 -4.30282,-0.0159 0.28485,-6.45055 3.74193,0.015"
+ id="path5194"
+ style="fill:#ffff00;fill-rule:evenodd;stroke:none"
+ inkscape:connector-curvature="0" />
+ <path
+ d="m 196.19278,138.57386 0.27691,6.45143 -4.30282,-0.0159 0.28486,-6.45231 3.74105,0.0168"
+ id="path5196"
+ style="fill:none;stroke:#000000;stroke-width:0.49897757"
+ inkscape:connector-curvature="0" />
+ <use
+ transform="translate(10.60845,0)"
+ id="use5198"
+ x="0"
+ y="0"
+ width="600"
+ height="400"
+ xlink:href="#path1535" />
+ <use
+ transform="translate(10.60889,0)"
+ id="use5200"
+ x="0"
+ y="0"
+ width="600"
+ height="400"
+ xlink:href="#path1541" />
+ <use
+ transform="translate(10.60889,-0.010585)"
+ id="use5202"
+ x="0"
+ y="0"
+ width="600"
+ height="400"
+ xlink:href="#path1537" />
+ <path
+ d="m 186.3022,139.04482 1.20027,0.002 0,0.87136 0.87662,0 0,-0.89077 1.22938,0.004 0,0.88724 0.87926,0 0,-0.89077 1.23025,0.002 -0.002,2.01171 c 0,0.31398 -0.2487,0.51859 -0.5362,0.51859 l -4.31693,0 c -0.29014,0 -0.55824,-0.23548 -0.55824,-0.52741 l -0.002,-1.98702"
+ id="path5204"
+ style="fill:#ffff00;fill-rule:evenodd;stroke:none"
+ inkscape:connector-curvature="0" />
+ <path
+ d="m 186.3022,139.04482 1.19939,0.003 0,0.87224 0.8775,0 0,-0.89253 1.22938,0.004 0,0.889 0.87926,0 0,-0.89253 1.23025,0.002 -0.002,2.01171 c 0,0.31398 -0.2487,0.51859 -0.5362,0.51859 l -4.31693,0 c -0.28926,0 -0.55824,-0.23548 -0.55913,-0.52564 l -0.003,-1.98879 8.8e-4,0 z"
+ id="path5206"
+ style="fill:none;stroke:#000000;stroke-width:0.50017256;stroke-opacity:1"
+ inkscape:connector-curvature="0" />
+ <path
+ d="m 190.93926,141.55925 0.13141,3.47751 -4.12644,0.002 0.11641,-3.47927 3.87862,0"
+ id="path5208"
+ style="fill:#ffff00;fill-rule:evenodd;stroke:none"
+ inkscape:connector-curvature="0" />
+ <path
+ d="m 190.94014,141.55925 0.13141,3.47751 -4.12556,0.002 0.11641,-3.47927 3.87863,0 -8.9e-4,0 z"
+ id="path5210"
+ style="fill:none;stroke:#000000;stroke-width:0.50127673"
+ inkscape:connector-curvature="0" />
+ <path
+ d="m 193.89806,140.61027 c -0.0265,-0.62706 0.87661,-0.63411 0.86603,0 l 0,1.53635 -0.86603,0 0,-1.53635"
+ id="path5212"
+ style="fill:#000000;fill-rule:evenodd;stroke:none"
+ inkscape:connector-curvature="0" />
+ <use
+ transform="translate(10.64108,0)"
+ id="use5214"
+ x="0"
+ y="0"
+ width="600"
+ height="400"
+ xlink:href="#path1547" />
+ <path
+ d="m 188.56605,142.84424 c -0.003,-0.6059 0.83693,-0.61824 0.82635,0 l 0,1.1871 -0.82635,0 0,-1.1871"
+ id="path5216"
+ style="fill:#000000;fill-rule:evenodd;stroke:none"
+ inkscape:connector-curvature="0" />
+ </g>
+ <use
+ transform="translate(15.516805,-7.4111408)"
+ id="use4982"
+ x="0"
+ y="0"
+ width="600"
+ height="400"
+ xlink:href="#use4980" />
+ <use
+ transform="translate(-7.7149424,0)"
+ id="use4984"
+ x="0"
+ y="0"
+ width="600"
+ height="400"
+ xlink:href="#use4982" />
+ <g
+ transform="matrix(0.12067956,0.11313709,-0.12067956,0.11313709,157.35439,257.99725)"
+ id="use5132">
+ <use
+ transform="translate(10.60844,0)"
+ id="use5328"
+ x="0"
+ y="0"
+ width="600"
+ height="400"
+ xlink:href="#path1539" />
+ <path
+ d="m 190.19141,154.43388 c 0.13493,-5.52098 4.05235,-6.82802 4.08057,-6.84742 0.0282,-0.0185 4.23139,1.40758 4.21728,6.89857 l -8.29785,-0.0512"
+ id="path5330"
+ style="fill:#ffff00;fill-rule:evenodd;stroke:none"
+ inkscape:connector-curvature="0" />
+ <path
+ d="m 186.8093,147.68435 -0.68172,6.34648 4.14055,0.009 c 0.0397,-5.24934 3.97475,-6.12246 4.07,-6.10306 0.0891,-0.005 3.98886,1.15888 4.09292,6.10306 l 4.15113,0 -0.7505,-6.39322 -15.0215,0.0379"
+ id="path5332"
+ style="fill:#ffff00;fill-rule:evenodd;stroke:none"
+ inkscape:connector-curvature="0" />
+ <path
+ d="m 186.8093,147.68612 -0.68172,6.34471 4.14055,0.009 c 0.0397,-5.24934 3.97387,-6.12246 4.06912,-6.10306 0.0891,-0.005 3.98886,1.16064 4.09292,6.10306 l 4.15113,0 -0.74962,-6.39322 -15.02238,0.0379 0,0.002 z"
+ id="path5334"
+ style="fill:none;stroke:#000000;stroke-width:0.49936473"
+ inkscape:connector-curvature="0" />
+ <path
+ d="m 185.85155,154.05994 16.94582,0 c 0.35629,0 0.6482,0.35277 0.6482,0.78404 0,0.42863 -0.29103,0.78141 -0.6482,0.78141 l -16.94582,0 c -0.35718,0 -0.64909,-0.35102 -0.64909,-0.78141 0,-0.43127 0.29191,-0.78404 0.64909,-0.78404"
+ id="path5336"
+ style="fill:#ffff00;fill-rule:evenodd;stroke:none"
+ inkscape:connector-curvature="0" />
+ <path
+ d="m 185.85066,154.05994 16.94583,0 c 0.35717,0 0.64908,0.35277 0.64908,0.78404 l 0,0 c 0,0.43039 -0.29191,0.78141 -0.64908,0.78141 l -16.94583,0 c -0.35717,0 -0.64908,-0.35102 -0.64908,-0.78141 l 0,0 c 0,-0.43127 0.29191,-0.78404 0.64908,-0.78404 z"
+ id="path5338"
+ style="fill:none;stroke:#000000;stroke-width:0.49943003"
+ inkscape:connector-curvature="0" />
+ <path
+ d="m 192.01431,154.02907 c 0.0185,-3.31259 2.26208,-4.2501 2.27355,-4.24833 8.8e-4,0 2.34146,0.96661 2.35998,4.24833 l -4.63353,0"
+ id="path5340"
+ style="fill:#ffff00;fill-rule:evenodd;stroke:none"
+ inkscape:connector-curvature="0" />
+ <path
+ d="m 192.01431,154.02907 c 0.0185,-3.31259 2.26208,-4.2501 2.27355,-4.24833 8.8e-4,0 2.34234,0.96661 2.36086,4.24833 l -4.63441,0"
+ id="path5342"
+ style="fill:none;stroke:#000000;stroke-width:0.49703202"
+ inkscape:connector-curvature="0" />
+ <path
+ d="m 186.20784,145.05616 16.2447,0 c 0.34218,0 0.62263,0.31662 0.62263,0.70467 0,0.38541 -0.28045,0.70468 -0.62263,0.70468 l -16.2447,0 c -0.34218,0 -0.62263,-0.3175 -0.62263,-0.70468 0,-0.38805 0.28045,-0.70467 0.62263,-0.70467"
+ id="path5344"
+ style="fill:#ffff00;fill-rule:evenodd;stroke:none"
+ inkscape:connector-curvature="0" />
+ <path
+ d="m 186.20784,145.05439 16.2447,0 c 0.34218,0 0.62263,0.31839 0.62263,0.70468 l 0,0 c 0,0.38717 -0.28045,0.70467 -0.62263,0.70467 l -16.2447,0 c -0.34218,0 -0.62263,-0.31573 -0.62263,-0.70467 l 0,0 c 0,-0.38629 0.28045,-0.70468 0.62263,-0.70468 z"
+ id="path5346"
+ style="fill:none;stroke:#000000;stroke-width:0.49901107"
+ inkscape:connector-curvature="0" />
+ <path
+ d="m 186.5509,146.46551 15.53918,0 c 0.32719,0 0.59617,0.31662 0.59617,0.70379 0,0.38805 -0.2681,0.70467 -0.59617,0.70467 l -15.53918,0 c -0.32719,0 -0.59529,-0.31662 -0.59529,-0.70467 0,-0.38717 0.2681,-0.70379 0.59529,-0.70379"
+ id="path5348"
+ style="fill:#ffff00;fill-rule:evenodd;stroke:none"
+ inkscape:connector-curvature="0" />
+ <path
+ d="m 186.5509,146.46551 15.5383,0 c 0.32719,0 0.59529,0.31662 0.59529,0.70379 l 0,0 c 0,0.38805 -0.2681,0.70467 -0.59529,0.70467 l -15.5383,0 c -0.32719,0 -0.59529,-0.31662 -0.59529,-0.70467 l 0,0 c 0,-0.38717 0.2681,-0.70379 0.59529,-0.70379 z"
+ id="path5350"
+ style="fill:none;stroke:#000000;stroke-width:0.49901107"
+ inkscape:connector-curvature="0" />
+ <use
+ transform="translate(-5.27909,-3.162655)"
+ id="use5352"
+ x="0"
+ y="0"
+ width="600"
+ height="400"
+ xlink:href="#use4656" />
+ <path
+ d="m 191.57159,135.88217 1.22673,0.002 0,0.87136 0.89513,0 0,-0.89076 1.25672,0.004 0,0.88723 0.89778,0 0,-0.89076 1.2576,0 -0.002,2.01171 c 0,0.31574 -0.25398,0.52035 -0.54854,0.52035 l -4.41129,0 c -0.29633,0 -0.56972,-0.23724 -0.5706,-0.52652 l -0.003,-1.9879 8.8e-4,0 z"
+ id="path5354"
+ style="fill:none;stroke:#000000;stroke-width:0.50025284"
+ inkscape:connector-curvature="0" />
+ <path
+ d="m 196.19366,138.5721 0.27692,6.45319 -4.30282,-0.0159 0.28485,-6.45055 3.74193,0.015"
+ id="path5356"
+ style="fill:#ffff00;fill-rule:evenodd;stroke:none"
+ inkscape:connector-curvature="0" />
+ <path
+ d="m 196.19278,138.57386 0.27691,6.45143 -4.30282,-0.0159 0.28486,-6.45231 3.74105,0.0168"
+ id="path5358"
+ style="fill:none;stroke:#000000;stroke-width:0.49897757"
+ inkscape:connector-curvature="0" />
+ <use
+ transform="translate(10.60845,0)"
+ id="use5360"
+ x="0"
+ y="0"
+ width="600"
+ height="400"
+ xlink:href="#path1535" />
+ <use
+ transform="translate(10.60889,0)"
+ id="use5362"
+ x="0"
+ y="0"
+ width="600"
+ height="400"
+ xlink:href="#path1541" />
+ <use
+ transform="translate(10.60889,-0.010585)"
+ id="use5364"
+ x="0"
+ y="0"
+ width="600"
+ height="400"
+ xlink:href="#path1537" />
+ <path
+ d="m 186.3022,139.04482 1.20027,0.002 0,0.87136 0.87662,0 0,-0.89077 1.22938,0.004 0,0.88724 0.87926,0 0,-0.89077 1.23025,0.002 -0.002,2.01171 c 0,0.31398 -0.2487,0.51859 -0.5362,0.51859 l -4.31693,0 c -0.29014,0 -0.55824,-0.23548 -0.55824,-0.52741 l -0.002,-1.98702"
+ id="path5366"
+ style="fill:#ffff00;fill-rule:evenodd;stroke:none"
+ inkscape:connector-curvature="0" />
+ <path
+ d="m 186.3022,139.04482 1.19939,0.003 0,0.87224 0.8775,0 0,-0.89253 1.22938,0.004 0,0.889 0.87926,0 0,-0.89253 1.23025,0.002 -0.002,2.01171 c 0,0.31398 -0.2487,0.51859 -0.5362,0.51859 l -4.31693,0 c -0.28926,0 -0.55824,-0.23548 -0.55913,-0.52564 l -0.003,-1.98879 8.8e-4,0 z"
+ id="path5368"
+ style="fill:none;stroke:#000000;stroke-width:0.50017256;stroke-opacity:1"
+ inkscape:connector-curvature="0" />
+ <path
+ d="m 190.93926,141.55925 0.13141,3.47751 -4.12644,0.002 0.11641,-3.47927 3.87862,0"
+ id="path5370"
+ style="fill:#ffff00;fill-rule:evenodd;stroke:none"
+ inkscape:connector-curvature="0" />
+ <path
+ d="m 190.94014,141.55925 0.13141,3.47751 -4.12556,0.002 0.11641,-3.47927 3.87863,0 -8.9e-4,0 z"
+ id="path5372"
+ style="fill:none;stroke:#000000;stroke-width:0.50127673"
+ inkscape:connector-curvature="0" />
+ <path
+ d="m 193.89806,140.61027 c -0.0265,-0.62706 0.87661,-0.63411 0.86603,0 l 0,1.53635 -0.86603,0 0,-1.53635"
+ id="path5374"
+ style="fill:#000000;fill-rule:evenodd;stroke:none"
+ inkscape:connector-curvature="0" />
+ <use
+ transform="translate(10.64108,0)"
+ id="use5376"
+ x="0"
+ y="0"
+ width="600"
+ height="400"
+ xlink:href="#path1547" />
+ <path
+ d="m 188.56605,142.84424 c -0.003,-0.6059 0.83693,-0.61824 0.82635,0 l 0,1.1871 -0.82635,0 0,-1.1871"
+ id="path5378"
+ style="fill:#000000;fill-rule:evenodd;stroke:none"
+ inkscape:connector-curvature="0" />
+ </g>
+ <g
+ transform="matrix(0.17066667,0,0,0.16,131.82382,265.4878)"
+ id="use5100">
+ <use
+ transform="translate(10.60844,0)"
+ id="use5220"
+ x="0"
+ y="0"
+ width="600"
+ height="400"
+ xlink:href="#path1539" />
+ <path
+ d="m 190.19141,154.43388 c 0.13493,-5.52098 4.05235,-6.82802 4.08057,-6.84742 0.0282,-0.0185 4.23139,1.40758 4.21728,6.89857 l -8.29785,-0.0512"
+ id="path5222"
+ style="fill:#ffff00;fill-rule:evenodd;stroke:none"
+ inkscape:connector-curvature="0" />
+ <path
+ d="m 186.8093,147.68435 -0.68172,6.34648 4.14055,0.009 c 0.0397,-5.24934 3.97475,-6.12246 4.07,-6.10306 0.0891,-0.005 3.98886,1.15888 4.09292,6.10306 l 4.15113,0 -0.7505,-6.39322 -15.0215,0.0379"
+ id="path5224"
+ style="fill:#ffff00;fill-rule:evenodd;stroke:none"
+ inkscape:connector-curvature="0" />
+ <path
+ d="m 186.8093,147.68612 -0.68172,6.34471 4.14055,0.009 c 0.0397,-5.24934 3.97387,-6.12246 4.06912,-6.10306 0.0891,-0.005 3.98886,1.16064 4.09292,6.10306 l 4.15113,0 -0.74962,-6.39322 -15.02238,0.0379 0,0.002 z"
+ id="path5226"
+ style="fill:none;stroke:#000000;stroke-width:0.49936473"
+ inkscape:connector-curvature="0" />
+ <path
+ d="m 185.85155,154.05994 16.94582,0 c 0.35629,0 0.6482,0.35277 0.6482,0.78404 0,0.42863 -0.29103,0.78141 -0.6482,0.78141 l -16.94582,0 c -0.35718,0 -0.64909,-0.35102 -0.64909,-0.78141 0,-0.43127 0.29191,-0.78404 0.64909,-0.78404"
+ id="path5228"
+ style="fill:#ffff00;fill-rule:evenodd;stroke:none"
+ inkscape:connector-curvature="0" />
+ <path
+ d="m 185.85066,154.05994 16.94583,0 c 0.35717,0 0.64908,0.35277 0.64908,0.78404 l 0,0 c 0,0.43039 -0.29191,0.78141 -0.64908,0.78141 l -16.94583,0 c -0.35717,0 -0.64908,-0.35102 -0.64908,-0.78141 l 0,0 c 0,-0.43127 0.29191,-0.78404 0.64908,-0.78404 z"
+ id="path5230"
+ style="fill:none;stroke:#000000;stroke-width:0.49943003"
+ inkscape:connector-curvature="0" />
+ <path
+ d="m 192.01431,154.02907 c 0.0185,-3.31259 2.26208,-4.2501 2.27355,-4.24833 8.8e-4,0 2.34146,0.96661 2.35998,4.24833 l -4.63353,0"
+ id="path5232"
+ style="fill:#ffff00;fill-rule:evenodd;stroke:none"
+ inkscape:connector-curvature="0" />
+ <path
+ d="m 192.01431,154.02907 c 0.0185,-3.31259 2.26208,-4.2501 2.27355,-4.24833 8.8e-4,0 2.34234,0.96661 2.36086,4.24833 l -4.63441,0"
+ id="path5234"
+ style="fill:none;stroke:#000000;stroke-width:0.49703202"
+ inkscape:connector-curvature="0" />
+ <path
+ d="m 186.20784,145.05616 16.2447,0 c 0.34218,0 0.62263,0.31662 0.62263,0.70467 0,0.38541 -0.28045,0.70468 -0.62263,0.70468 l -16.2447,0 c -0.34218,0 -0.62263,-0.3175 -0.62263,-0.70468 0,-0.38805 0.28045,-0.70467 0.62263,-0.70467"
+ id="path5236"
+ style="fill:#ffff00;fill-rule:evenodd;stroke:none"
+ inkscape:connector-curvature="0" />
+ <path
+ d="m 186.20784,145.05439 16.2447,0 c 0.34218,0 0.62263,0.31839 0.62263,0.70468 l 0,0 c 0,0.38717 -0.28045,0.70467 -0.62263,0.70467 l -16.2447,0 c -0.34218,0 -0.62263,-0.31573 -0.62263,-0.70467 l 0,0 c 0,-0.38629 0.28045,-0.70468 0.62263,-0.70468 z"
+ id="path5238"
+ style="fill:none;stroke:#000000;stroke-width:0.49901107"
+ inkscape:connector-curvature="0" />
+ <path
+ d="m 186.5509,146.46551 15.53918,0 c 0.32719,0 0.59617,0.31662 0.59617,0.70379 0,0.38805 -0.2681,0.70467 -0.59617,0.70467 l -15.53918,0 c -0.32719,0 -0.59529,-0.31662 -0.59529,-0.70467 0,-0.38717 0.2681,-0.70379 0.59529,-0.70379"
+ id="path5240"
+ style="fill:#ffff00;fill-rule:evenodd;stroke:none"
+ inkscape:connector-curvature="0" />
+ <path
+ d="m 186.5509,146.46551 15.5383,0 c 0.32719,0 0.59529,0.31662 0.59529,0.70379 l 0,0 c 0,0.38805 -0.2681,0.70467 -0.59529,0.70467 l -15.5383,0 c -0.32719,0 -0.59529,-0.31662 -0.59529,-0.70467 l 0,0 c 0,-0.38717 0.2681,-0.70379 0.59529,-0.70379 z"
+ id="path5242"
+ style="fill:none;stroke:#000000;stroke-width:0.49901107"
+ inkscape:connector-curvature="0" />
+ <use
+ transform="translate(-5.27909,-3.162655)"
+ id="use5244"
+ x="0"
+ y="0"
+ width="600"
+ height="400"
+ xlink:href="#use4656" />
+ <path
+ d="m 191.57159,135.88217 1.22673,0.002 0,0.87136 0.89513,0 0,-0.89076 1.25672,0.004 0,0.88723 0.89778,0 0,-0.89076 1.2576,0 -0.002,2.01171 c 0,0.31574 -0.25398,0.52035 -0.54854,0.52035 l -4.41129,0 c -0.29633,0 -0.56972,-0.23724 -0.5706,-0.52652 l -0.003,-1.9879 8.8e-4,0 z"
+ id="path5246"
+ style="fill:none;stroke:#000000;stroke-width:0.50025284"
+ inkscape:connector-curvature="0" />
+ <path
+ d="m 196.19366,138.5721 0.27692,6.45319 -4.30282,-0.0159 0.28485,-6.45055 3.74193,0.015"
+ id="path5248"
+ style="fill:#ffff00;fill-rule:evenodd;stroke:none"
+ inkscape:connector-curvature="0" />
+ <path
+ d="m 196.19278,138.57386 0.27691,6.45143 -4.30282,-0.0159 0.28486,-6.45231 3.74105,0.0168"
+ id="path5250"
+ style="fill:none;stroke:#000000;stroke-width:0.49897757"
+ inkscape:connector-curvature="0" />
+ <use
+ transform="translate(10.60845,0)"
+ id="use5252"
+ x="0"
+ y="0"
+ width="600"
+ height="400"
+ xlink:href="#path1535" />
+ <use
+ transform="translate(10.60889,0)"
+ id="use5254"
+ x="0"
+ y="0"
+ width="600"
+ height="400"
+ xlink:href="#path1541" />
+ <use
+ transform="translate(10.60889,-0.010585)"
+ id="use5256"
+ x="0"
+ y="0"
+ width="600"
+ height="400"
+ xlink:href="#path1537" />
+ <path
+ d="m 186.3022,139.04482 1.20027,0.002 0,0.87136 0.87662,0 0,-0.89077 1.22938,0.004 0,0.88724 0.87926,0 0,-0.89077 1.23025,0.002 -0.002,2.01171 c 0,0.31398 -0.2487,0.51859 -0.5362,0.51859 l -4.31693,0 c -0.29014,0 -0.55824,-0.23548 -0.55824,-0.52741 l -0.002,-1.98702"
+ id="path5258"
+ style="fill:#ffff00;fill-rule:evenodd;stroke:none"
+ inkscape:connector-curvature="0" />
+ <path
+ d="m 186.3022,139.04482 1.19939,0.003 0,0.87224 0.8775,0 0,-0.89253 1.22938,0.004 0,0.889 0.87926,0 0,-0.89253 1.23025,0.002 -0.002,2.01171 c 0,0.31398 -0.2487,0.51859 -0.5362,0.51859 l -4.31693,0 c -0.28926,0 -0.55824,-0.23548 -0.55913,-0.52564 l -0.003,-1.98879 8.8e-4,0 z"
+ id="path5260"
+ style="fill:none;stroke:#000000;stroke-width:0.50017256;stroke-opacity:1"
+ inkscape:connector-curvature="0" />
+ <path
+ d="m 190.93926,141.55925 0.13141,3.47751 -4.12644,0.002 0.11641,-3.47927 3.87862,0"
+ id="path5262"
+ style="fill:#ffff00;fill-rule:evenodd;stroke:none"
+ inkscape:connector-curvature="0" />
+ <path
+ d="m 190.94014,141.55925 0.13141,3.47751 -4.12556,0.002 0.11641,-3.47927 3.87863,0 -8.9e-4,0 z"
+ id="path5264"
+ style="fill:none;stroke:#000000;stroke-width:0.50127673"
+ inkscape:connector-curvature="0" />
+ <path
+ d="m 193.89806,140.61027 c -0.0265,-0.62706 0.87661,-0.63411 0.86603,0 l 0,1.53635 -0.86603,0 0,-1.53635"
+ id="path5266"
+ style="fill:#000000;fill-rule:evenodd;stroke:none"
+ inkscape:connector-curvature="0" />
+ <use
+ transform="translate(10.64108,0)"
+ id="use5268"
+ x="0"
+ y="0"
+ width="600"
+ height="400"
+ xlink:href="#path1547" />
+ <path
+ d="m 188.56605,142.84424 c -0.003,-0.6059 0.83693,-0.61824 0.82635,0 l 0,1.1871 -0.82635,0 0,-1.1871"
+ id="path5270"
+ style="fill:#000000;fill-rule:evenodd;stroke:none"
+ inkscape:connector-curvature="0" />
+ </g>
+ <use
+ transform="matrix(0.12067956,-0.11313709,0.12067956,0.11313709,111.54606,300.75782)"
+ id="use5274"
+ x="0"
+ y="0"
+ width="600"
+ height="400"
+ xlink:href="#path1539" />
+ <path
+ d="m 151.85507,297.91252 c -0.64999,-0.63989 -0.33497,-1.23097 -0.3339,-1.23636 0.001,-0.005 0.68051,-0.31947 1.34145,0.30336 l -1.00755,0.933"
+ id="path5276"
+ style="fill:#ffff00;fill-rule:evenodd;stroke:none"
+ inkscape:connector-curvature="0" />
+ <path
+ d="m 150.63239,297.53154 0.68362,0.79515 0.50074,-0.46745 c -0.62869,-0.59838 -0.25918,-1.14237 -0.24535,-1.15095 0.0101,-0.0107 0.62123,-0.32017 1.23045,0.22742 l 0.50096,-0.46964 -0.8621,-0.63841 -1.80821,1.70378"
+ id="path5278"
+ style="fill:#ffff00;fill-rule:evenodd;stroke:none"
+ inkscape:connector-curvature="0" />
+ <path
+ d="m 150.6326,297.53174 0.68341,0.79495 0.50074,-0.46745 c -0.62869,-0.59838 -0.25929,-1.14227 -0.24545,-1.15085 0.0101,-0.0107 0.62144,-0.31998 1.23045,0.22742 l 0.50095,-0.46964 -0.86199,-0.63851 -1.80832,1.70388 1.7e-4,1.6e-4 z"
+ id="path5280"
+ style="fill:none;stroke:#000000;stroke-width:0.08251867"
+ inkscape:connector-curvature="0" />
+ <path
+ d="m 151.28621,298.36122 2.04502,-1.9172 c 0.043,-0.0403 0.12079,-0.0334 0.17284,0.0154 0.0517,0.0485 0.0592,0.12133 0.0161,0.16174 l -2.04502,1.9172 c -0.0431,0.0404 -0.12069,0.0337 -0.17263,-0.015 -0.0521,-0.0488 -0.0594,-0.12173 -0.0163,-0.16214"
+ id="path5282"
+ style="fill:#ffff00;fill-rule:evenodd;stroke:none"
+ inkscape:connector-curvature="0" />
+ <path
+ d="m 151.2861,298.36132 2.04502,-1.91721 c 0.0431,-0.0404 0.1209,-0.0335 0.17295,0.0153 l 0,0 c 0.0519,0.0487 0.0591,0.12143 0.016,0.16184 l -2.04501,1.9172 c -0.0431,0.0404 -0.12069,0.0337 -0.17263,-0.015 l 0,0 c -0.0521,-0.0488 -0.0594,-0.12173 -0.0163,-0.16214 z"
+ id="path5284"
+ style="fill:none;stroke:#000000;stroke-width:0.08252946"
+ inkscape:connector-curvature="0" />
+ <path
+ d="m 152.02621,297.66049 c -0.39753,-0.37687 -0.23992,-0.73677 -0.23832,-0.73787 1.1e-4,-10e-5 0.39922,-0.15555 0.79749,0.21364 l -0.55917,0.52423"
+ id="path5286"
+ style="fill:#ffff00;fill-rule:evenodd;stroke:none"
+ inkscape:connector-curvature="0" />
+ <path
+ d="m 152.02621,297.66049 c -0.39753,-0.37687 -0.23992,-0.73677 -0.23832,-0.73787 1.1e-4,-10e-5 0.39932,-0.15565 0.79759,0.21354 l -0.55927,0.52433"
+ id="path5288"
+ style="fill:none;stroke:#000000;stroke-width:0.0821332"
+ inkscape:connector-curvature="0" />
+ <path
+ d="m 150.24264,297.30225 1.9604,-1.83788 c 0.0413,-0.0387 0.11335,-0.0346 0.16018,0.009 0.0465,0.0436 0.0512,0.11145 0.01,0.15017 l -1.96041,1.83787 c -0.0413,0.0387 -0.11345,0.0345 -0.16018,-0.009 -0.0468,-0.0439 -0.0512,-0.11145 -0.01,-0.15016"
+ id="path5290"
+ style="fill:#ffff00;fill-rule:evenodd;stroke:none"
+ inkscape:connector-curvature="0" />
+ <path
+ d="m 150.24242,297.30205 1.96041,-1.83788 c 0.0413,-0.0387 0.11356,-0.0344 0.16017,0.009 l 0,0 c 0.0467,0.0438 0.0512,0.11145 0.01,0.15016 l -1.9604,1.83788 c -0.0413,0.0387 -0.11324,0.0347 -0.16018,-0.009 l 0,0 c -0.0466,-0.0437 -0.0512,-0.11145 -0.01,-0.15017 z"
+ id="path5292"
+ style="fill:none;stroke:#000000;stroke-width:0.08246022"
+ inkscape:connector-curvature="0" />
+ <path
+ d="m 150.45412,297.42288 1.87526,-1.75806 c 0.0395,-0.037 0.11015,-0.0316 0.15688,0.0122 0.0468,0.0439 0.0527,0.11006 0.0131,0.14717 l -1.87526,1.75806 c -0.0395,0.037 -0.11005,0.0315 -0.15688,-0.0124 -0.0467,-0.0438 -0.0526,-0.10995 -0.0131,-0.14697"
+ id="path5294"
+ style="fill:#ffff00;fill-rule:evenodd;stroke:none"
+ inkscape:connector-curvature="0" />
+ <path
+ d="m 150.45412,297.42288 1.87515,-1.75796 c 0.0395,-0.037 0.11005,-0.0315 0.15677,0.0123 l 0,0 c 0.0468,0.0439 0.0527,0.11005 0.0132,0.14707 l -1.87516,1.75796 c -0.0395,0.037 -0.11005,0.0315 -0.15688,-0.0124 l 0,0 c -0.0467,-0.0438 -0.0526,-0.10996 -0.0131,-0.14697 z"
+ id="path5296"
+ style="fill:none;stroke:#000000;stroke-width:0.08246022"
+ inkscape:connector-curvature="0" />
+ <use
+ transform="matrix(0.12067956,-0.11313709,0.12067956,0.11313709,109.2471,302.19747)"
+ id="use5298"
+ x="0"
+ y="0"
+ width="600"
+ height="400"
+ xlink:href="#use4656" />
+ <path
+ d="m 149.78282,295.65749 0.14825,-0.13859 0.10516,0.0986 0.10802,-0.10127 -0.1075,-0.10078 0.15209,-0.14178 0.10707,0.10038 0.10834,-0.10157 -0.10749,-0.10078 0.15177,-0.14228 0.24255,0.22779 c 0.0381,0.0357 0.0322,0.0876 -0.003,0.12094 l -0.53236,0.49908 c -0.0358,0.0335 -0.0974,0.0376 -0.1324,0.005 l -0.24021,-0.22461 1e-4,-1e-4 z"
+ id="path5300"
+ style="fill:none;stroke:#000000;stroke-width:0.08266543"
+ inkscape:connector-curvature="0" />
+ <path
+ d="m 150.66523,295.43889 0.81218,0.69877 -0.52117,0.48501 -0.74408,-0.76202 0.45339,-0.42166"
+ id="path5302"
+ style="fill:#ffff00;fill-rule:evenodd;stroke:none"
+ inkscape:connector-curvature="0" />
+ <path
+ d="m 150.66533,295.43919 0.81198,0.69857 -0.52118,0.48501 -0.74429,-0.76222 0.45349,-0.42136"
+ id="path5304"
+ style="fill:none;stroke:#000000;stroke-width:0.08245469"
+ inkscape:connector-curvature="0" />
+ <use
+ transform="matrix(0.12067956,-0.11313709,0.12067956,0.11313709,111.54606,300.75782)"
+ id="use5306"
+ x="0"
+ y="0"
+ width="600"
+ height="400"
+ xlink:href="#path1535" />
+ <use
+ transform="matrix(0.12067956,-0.11313709,0.12067956,0.11313709,111.54612,300.75777)"
+ id="use5308"
+ x="0"
+ y="0"
+ width="600"
+ height="400"
+ xlink:href="#path1541" />
+ <use
+ transform="matrix(0.12067956,-0.11313709,0.12067956,0.11313709,111.54484,300.75657)"
+ id="use5310"
+ x="0"
+ y="0"
+ width="600"
+ height="400"
+ xlink:href="#path1537" />
+ <path
+ d="m 149.52858,296.61146 0.14506,-0.13559 0.10516,0.0986 0.10578,-0.0992 -0.10749,-0.10077 0.14878,-0.13869 0.10708,0.10038 0.1061,-0.0995 -0.10749,-0.10078 0.14868,-0.13899 0.24256,0.2278 c 0.0379,0.0355 0.0326,0.0868 -0.002,0.11934 l -0.52096,0.4884 c -0.035,0.0328 -0.0958,0.0365 -0.13102,0.003 l -0.24001,-0.22461"
+ id="path5312"
+ style="fill:#ffff00;fill-rule:evenodd;stroke:none"
+ inkscape:connector-curvature="0" />
+ <path
+ d="m 149.52858,296.61146 0.14506,-0.13539 0.10526,0.0987 0.1059,-0.0993 -0.10771,-0.10097 0.14878,-0.13869 0.10729,0.10057 0.10611,-0.0995 -0.10771,-0.10098 0.14868,-0.13899 0.24256,0.2278 c 0.0379,0.0355 0.0326,0.0868 -0.002,0.11934 l -0.52096,0.4884 c -0.0349,0.0327 -0.0958,0.0365 -0.13091,0.004 l -0.24033,-0.2247 1.1e-4,-10e-5 z"
+ id="path5314"
+ style="fill:none;stroke:#000000;stroke-width:0.08265216;stroke-opacity:1"
+ inkscape:connector-curvature="0" />
+ <path
+ d="m 150.39162,296.37132 0.43552,0.37856 -0.49777,0.46706 -0.40582,-0.40681 0.46807,-0.43881"
+ id="path5316"
+ style="fill:#ffff00;fill-rule:evenodd;stroke:none"
+ inkscape:connector-curvature="0" />
+ <path
+ d="m 150.39172,296.37122 0.43553,0.37856 -0.49766,0.46696 -0.40583,-0.40681 0.46807,-0.43881 -1.1e-4,10e-5 z"
+ id="path5318"
+ style="fill:none;stroke:#000000;stroke-width:0.08283462"
+ inkscape:connector-curvature="0" />
+ <path
+ d="m 150.63416,295.9292 c -0.0789,-0.0679 0.0293,-0.17092 0.10451,-0.098 l 0.18541,0.17382 -0.10451,0.098 -0.18541,-0.17382"
+ id="path5320"
+ style="fill:#000000;fill-rule:evenodd;stroke:none"
+ inkscape:connector-curvature="0" />
+ <use
+ transform="matrix(0.12067956,-0.11313709,0.12067956,0.11313709,111.55,300.75413)"
+ id="use5322"
+ x="0"
+ y="0"
+ width="600"
+ height="400"
+ xlink:href="#path1547" />
+ <path
+ d="m 150.26029,296.78519 c -0.0734,-0.0682 0.0264,-0.16463 0.0997,-0.0935 l 0.14326,0.13431 -0.0997,0.0935 -0.14326,-0.13431"
+ id="path5324"
+ style="fill:#000000;fill-rule:evenodd;stroke:none"
+ inkscape:connector-curvature="0" />
+ <path
+ d="m 161.56693,290.46935 c -0.13967,0 -0.25361,0.10669 -0.25361,0.23764 0,0.13067 0.11394,0.23763 0.25361,0.23763 0.13968,0 0.25362,-0.10668 0.25362,-0.23763 0,-0.13095 -0.11394,-0.23764 -0.25362,-0.23764"
+ id="use5944"
+ style="fill:#ffffff"
+ inkscape:connector-curvature="0" />
+ <use
+ transform="translate(-3.5531359,4.1189664)"
+ id="use6358"
+ x="0"
+ y="0"
+ width="600"
+ height="400"
+ xlink:href="#use5944" />
+ <use
+ transform="translate(-4.9588408,4.1205888)"
+ id="use6360"
+ x="0"
+ y="0"
+ width="600"
+ height="400"
+ xlink:href="#use5944" />
+ <use
+ transform="translate(-4.2626493,3.452004)"
+ id="use6356"
+ x="0"
+ y="0"
+ width="600"
+ height="400"
+ xlink:href="#use5944" />
+ <use
+ transform="translate(-3.5516306,2.8129112)"
+ id="use6352"
+ x="0"
+ y="0"
+ width="600"
+ height="400"
+ xlink:href="#use5944" />
+ <use
+ transform="translate(-1.3845598,0.0019752)"
+ id="use5946"
+ x="0"
+ y="0"
+ width="600"
+ height="400"
+ xlink:href="#use5944" />
+ <use
+ transform="translate(0.67504641,-0.6687968)"
+ id="use5948"
+ x="0"
+ y="0"
+ width="600"
+ height="400"
+ xlink:href="#use5946" />
+ <use
+ transform="translate(0.71101868,-0.6391632)"
+ id="use5950"
+ x="0"
+ y="0"
+ width="600"
+ height="400"
+ xlink:href="#use5948" />
+ <use
+ transform="translate(-1.3890748,-0.001128)"
+ id="use5952"
+ x="0"
+ y="0"
+ width="600"
+ height="400"
+ xlink:href="#use5950" />
+ <use
+ transform="translate(-2.1532237,1.3007624)"
+ id="use5954"
+ x="0"
+ y="0"
+ width="600"
+ height="400"
+ xlink:href="#use5952" />
+ <use
+ transform="translate(-1.4180475,0.0016936)"
+ id="use5956"
+ x="0"
+ y="0"
+ width="600"
+ height="400"
+ xlink:href="#use5954" />
+ <use
+ transform="translate(0.70853326,-0.6689376)"
+ id="use5958"
+ x="0"
+ y="0"
+ width="600"
+ height="400"
+ xlink:href="#use5956" />
+ <use
+ transform="translate(0.71116972,-0.6388808)"
+ id="use5960"
+ x="0"
+ y="0"
+ width="600"
+ height="400"
+ xlink:href="#use5958" />
+ <use
+ transform="translate(-1.419703,-0.0011992)"
+ id="use5962"
+ x="0"
+ y="0"
+ width="600"
+ height="400"
+ xlink:href="#use5960" />
+ <use
+ transform="translate(-2.1314762,1.3156496)"
+ id="use5964"
+ x="0"
+ y="0"
+ width="600"
+ height="400"
+ xlink:href="#use5962" />
+ <use
+ transform="translate(-1.3845598,0.0016232)"
+ id="use5966"
+ x="0"
+ y="0"
+ width="600"
+ height="400"
+ xlink:href="#use5964" />
+ <use
+ transform="translate(0.67504641,-0.668796)"
+ id="use5968"
+ x="0"
+ y="0"
+ width="600"
+ height="400"
+ xlink:href="#use5966" />
+ <use
+ transform="translate(0.71116887,-0.638952)"
+ id="use5970"
+ x="0"
+ y="0"
+ width="600"
+ height="400"
+ xlink:href="#use5968" />
+ <use
+ transform="translate(-4.9588408,2.8117824)"
+ id="use6354"
+ x="0"
+ y="0"
+ width="600"
+ height="400"
+ xlink:href="#use5944" />
+ <path
+ d="m 153.0892,289.16408 c -0.13968,0 -0.25362,0.10668 -0.25362,0.23763 0,0.13067 0.11394,0.23763 0.25362,0.23763 0.13967,0 0.25361,-0.10668 0.25361,-0.23763 0,-0.13095 -0.11394,-0.23763 -0.25361,-0.23763"
+ id="use6320"
+ style="fill:#ffff00"
+ inkscape:connector-curvature="0" />
+ <use
+ transform="translate(-4.9588408,-5.4761728)"
+ id="use6346"
+ x="0"
+ y="0"
+ width="600"
+ height="400"
+ xlink:href="#use5944" />
+ <use
+ transform="translate(-3.5697668,-5.4761744)"
+ id="use6332"
+ x="0"
+ y="0"
+ width="600"
+ height="400"
+ xlink:href="#use5944" />
+ <use
+ transform="translate(-4.2809357,-4.8359512)"
+ id="use6334"
+ x="0"
+ y="0"
+ width="600"
+ height="400"
+ xlink:href="#use5944" />
+ <use
+ transform="translate(-3.5712721,-4.1689896)"
+ id="use6336"
+ x="0"
+ y="0"
+ width="600"
+ height="400"
+ xlink:href="#use5944" />
+ <use
+ transform="translate(-4.9588408,-4.1671552)"
+ id="use6338"
+ x="0"
+ y="0"
+ width="600"
+ height="400"
+ xlink:href="#use5944" />
+ <use
+ transform="translate(-8.4777371,-1.3052784)"
+ id="use6340"
+ x="0"
+ y="0"
+ width="600"
+ height="400"
+ xlink:href="#use5944" />
+ <rect
+ style="fill:url(#linearGradient3809);fill-opacity:1;stroke:#000000;stroke-linejoin:miter;stroke-opacity:1"
+ id="rect2985"
+ width="64"
+ height="64"
+ x="125.71429"
+ y="258.07648"
+ rx="4"
+ ry="4" />
+ </g>
+</svg>
Binary files /tmp/U_W2YR3Mnb/brewtarget-1.2.4/images/flagSpain.png and /tmp/YOP8NxZwyP/brewtarget-1.2.5/images/flagSpain.png differ
diff -Nru brewtarget-1.2.4/images/flagSpain.svg brewtarget-1.2.5/images/flagSpain.svg
--- brewtarget-1.2.4/images/flagSpain.svg 1970-01-01 01:00:00.000000000 +0100
+++ brewtarget-1.2.5/images/flagSpain.svg 2012-07-14 18:49:41.000000000 +0100
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/";
+ xmlns:cc="http://creativecommons.org/ns#";
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";
+ xmlns:svg="http://www.w3.org/2000/svg";
+ xmlns="http://www.w3.org/2000/svg";
+ xmlns:xlink="http://www.w3.org/1999/xlink";
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd";
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape";
+ width="65"
+ height="65"
+ id="svg2"
+ version="1.1"
+ inkscape:version="0.47 r22583"
+ sodipodi:docname="flagSpain.svg">
+ <defs
+ id="defs4">
+ <inkscape:perspective
+ sodipodi:type="inkscape:persp3d"
+ inkscape:vp_x="0 : 32.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_z="65 : 32.5 : 1"
+ inkscape:persp3d-origin="32.5 : 21.666667 : 1"
+ id="perspective3569" />
+ <linearGradient
+ id="linearGradient3803">
+ <stop
+ style="stop-color:#ffffff;stop-opacity:0.52252251;"
+ offset="0"
+ id="stop3805" />
+ <stop
+ style="stop-color:#ffffff;stop-opacity:0;"
+ offset="1"
+ id="stop3807" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3803"
+ id="linearGradient3809"
+ x1="155.63599"
+ y1="258.62933"
+ x2="155.63599"
+ y2="285.64468"
+ gradientUnits="userSpaceOnUse" />
+ </defs>
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="11.702174"
+ inkscape:cx="24.979597"
+ inkscape:cy="32.765508"
+ inkscape:document-units="px"
+ inkscape:current-layer="layer1"
+ showgrid="false"
+ fit-margin-top="0"
+ fit-margin-left="0"
+ fit-margin-right="0"
+ fit-margin-bottom="0"
+ inkscape:window-width="1680"
+ inkscape:window-height="1006"
+ inkscape:window-x="-4"
+ inkscape:window-y="-3"
+ inkscape:window-maximized="1" />
+ <metadata
+ id="metadata7">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage"; />
+ <dc:title />
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:label="Layer 1"
+ inkscape:groupmode="layer"
+ id="layer1"
+ transform="translate(-125.21875,-257.5625)">
+ <path
+ style="fill:#c60b1e"
+ d="M 4.5 0.5 C 2.284 0.5 0.5 2.284 0.5 4.5 L 0.5 60.5 C 0.5 62.716 2.284 64.5 4.5 64.5 L 60.5 64.5 C 62.716 64.5 64.5 62.716 64.5 60.5 L 64.5 4.5 C 64.5 2.284 62.716 0.5 60.5 0.5 L 4.5 0.5 z "
+ transform="translate(125.21875,257.5625)"
+ id="rect4" />
+ <path
+ style="fill:#ffc400"
+ d="M 0.5 16.5 L 0.5 48.5 L 64.5 48.5 L 64.5 16.5 L 0.5 16.5 z "
+ transform="translate(125.21875,257.5625)"
+ id="rect6" />
+ <rect
+ style="fill:url(#linearGradient3809);fill-opacity:1;stroke:#000000;stroke-linejoin:miter;stroke-opacity:1"
+ id="rect2985"
+ width="64"
+ height="64"
+ x="125.71429"
+ y="258.07648"
+ rx="4"
+ ry="4" />
+ </g>
+</svg>
Binary files /tmp/U_W2YR3Mnb/brewtarget-1.2.4/images/flagUK.png and /tmp/YOP8NxZwyP/brewtarget-1.2.5/images/flagUK.png differ
diff -Nru brewtarget-1.2.4/images/flagUK.svg brewtarget-1.2.5/images/flagUK.svg
--- brewtarget-1.2.4/images/flagUK.svg 1970-01-01 01:00:00.000000000 +0100
+++ brewtarget-1.2.5/images/flagUK.svg 2012-07-14 18:49:41.000000000 +0100
@@ -0,0 +1,174 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/";
+ xmlns:cc="http://creativecommons.org/ns#";
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";
+ xmlns:svg="http://www.w3.org/2000/svg";
+ xmlns="http://www.w3.org/2000/svg";
+ xmlns:xlink="http://www.w3.org/1999/xlink";
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd";
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape";
+ width="65"
+ height="65"
+ id="svg2"
+ version="1.1"
+ inkscape:version="0.47 r22583"
+ sodipodi:docname="flagUK.svg">
+ <defs
+ id="defs4">
+ <inkscape:perspective
+ sodipodi:type="inkscape:persp3d"
+ inkscape:vp_x="0 : 32.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_z="65 : 32.5 : 1"
+ inkscape:persp3d-origin="32.5 : 21.666667 : 1"
+ id="perspective3658" />
+ <linearGradient
+ id="linearGradient3803">
+ <stop
+ style="stop-color:#ffffff;stop-opacity:0.52252251;"
+ offset="0"
+ id="stop3805" />
+ <stop
+ style="stop-color:#ffffff;stop-opacity:0;"
+ offset="1"
+ id="stop3807" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3803"
+ id="linearGradient3809"
+ x1="155.63599"
+ y1="258.62933"
+ x2="155.63599"
+ y2="285.64468"
+ gradientUnits="userSpaceOnUse" />
+ <clipPath
+ id="t">
+ <path
+ d="m 30,15 h 30 v 15 z m 0,0 V 30 H 0 z m 0,0 H 0 V 0 z m 0,0 V 0 h 30 z"
+ id="path5"
+ inkscape:connector-curvature="0" />
+ </clipPath>
+ </defs>
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="5.851087"
+ inkscape:cx="17.46419"
+ inkscape:cy="57.56561"
+ inkscape:document-units="px"
+ inkscape:current-layer="layer1"
+ showgrid="false"
+ fit-margin-top="0"
+ fit-margin-left="0"
+ fit-margin-right="0"
+ fit-margin-bottom="0"
+ inkscape:window-width="1680"
+ inkscape:window-height="1006"
+ inkscape:window-x="-4"
+ inkscape:window-y="-3"
+ inkscape:window-maximized="1" />
+ <metadata
+ id="metadata7">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage"; />
+ <dc:title />
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:label="Layer 1"
+ inkscape:groupmode="layer"
+ id="layer1"
+ transform="translate(-125.21875,-257.5625)">
+ <path
+ style="fill:#00247d"
+ d="M 4.5 0.5 C 2.284 0.5 0.5 2.284 0.5 4.5 L 0.5 60.5 C 0.5 62.716 2.284 64.5 4.5 64.5 L 60.5 64.5 C 62.716 64.5 64.5 62.716 64.5 60.5 L 64.5 4.5 C 64.5 2.284 62.716 0.5 60.5 0.5 L 4.5 0.5 z "
+ transform="translate(125.21875,257.5625)"
+ id="path7" />
+ <path
+ style="fill:#ffffff;fill-opacity:1;stroke:none"
+ d="M 0.5 9.1875 L 0.5 23.53125 L 64.5 55.8125 L 64.5 41.46875 L 0.5 9.1875 z "
+ transform="translate(125.21875,257.5625)"
+ id="rect3772" />
+ <path
+ style="fill:#cf142b;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1"
+ d="m 11.109047,21.802898 -10.55359465,-5.23407 0,4.721345 1.04681405,0.555452 z"
+ id="path3808"
+ inkscape:connector-curvature="0"
+ transform="translate(125.21875,257.5625)" />
+ <path
+ style="fill:#ffffff;fill-opacity:1;stroke:none"
+ d="M 64.5 9.53125 L 0.5 41.21875 L 0.5 55.46875 L 64.5 23.8125 L 64.5 9.53125 z "
+ transform="translate(125.21875,257.5625)"
+ id="rect3774" />
+ <path
+ style="fill:#ffffff;fill-opacity:1;stroke:none"
+ d="M 0.5 21.84375 L 0.5 43.1875 L 64.5 43.1875 L 64.5 21.84375 L 0.5 21.84375 z "
+ transform="translate(125.21875,257.5625)"
+ id="rect3782" />
+ <rect
+ style="fill:#ffffff;fill-opacity:1;stroke:none"
+ id="rect3784"
+ width="21.333332"
+ height="64"
+ x="147.04762"
+ y="258.07648"
+ rx="0.0001021958"
+ ry="2.6933433e-006" />
+ <path
+ style="fill:#cf142b;fill-opacity:1;stroke:none"
+ d="M 0.5 26.125 L 0.5 38.90625 L 64.5 38.90625 L 64.5 26.125 L 0.5 26.125 z "
+ transform="translate(125.21875,257.5625)"
+ id="rect2998" />
+ <rect
+ style="fill:#cf142b;fill-opacity:1;stroke:none"
+ id="rect3768"
+ width="12.624655"
+ height="63.824654"
+ x="151.40196"
+ y="258.16415"
+ rx="0.095433816"
+ ry="0.0011542951" />
+ <path
+ style="fill:#cf142b;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1"
+ d="m 44.297325,21.834944 20.113784,-10.051552 -0.01068,4.764073 -10.574958,5.29816 z"
+ id="path3810"
+ inkscape:connector-curvature="0"
+ transform="translate(125.21875,257.5625)" />
+ <path
+ style="fill:#cf142b;fill-opacity:1;stroke:none"
+ d="m 53.846832,43.177132 9.528144,0.01068 1.089542,0.534088 0.01068,4.785436 z"
+ id="path3812"
+ inkscape:connector-curvature="0"
+ transform="translate(125.21875,257.5625)"
+ sodipodi:nodetypes="ccccc" />
+ <path
+ style="fill:#cf142b;fill-opacity:1;stroke:none"
+ d="M 20.669236,43.187814 0.82249675,53.132547 0.80113319,48.368475 11.151774,43.177132 z"
+ id="path3814"
+ inkscape:connector-curvature="0"
+ transform="translate(125.21875,257.5625)"
+ sodipodi:nodetypes="ccccc" />
+ <rect
+ style="fill:url(#linearGradient3809);fill-opacity:1;stroke:#000000;stroke-linejoin:miter;stroke-opacity:1"
+ id="rect2985"
+ width="64"
+ height="64"
+ x="125.71429"
+ y="258.07648"
+ rx="4"
+ ry="4" />
+ </g>
+</svg>
Binary files /tmp/U_W2YR3Mnb/brewtarget-1.2.4/images/restore.png and /tmp/YOP8NxZwyP/brewtarget-1.2.5/images/restore.png differ
diff -Nru brewtarget-1.2.4/images/restore.svg brewtarget-1.2.5/images/restore.svg
--- brewtarget-1.2.4/images/restore.svg 1970-01-01 01:00:00.000000000 +0100
+++ brewtarget-1.2.5/images/restore.svg 2012-07-14 18:49:41.000000000 +0100
@@ -0,0 +1,193 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/";
+ xmlns:cc="http://creativecommons.org/ns#";
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";
+ xmlns:svg="http://www.w3.org/2000/svg";
+ xmlns="http://www.w3.org/2000/svg";
+ xmlns:xlink="http://www.w3.org/1999/xlink";
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd";
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape";
+ width="64"
+ height="64"
+ id="svg2"
+ version="1.1"
+ inkscape:version="0.47 r22583"
+ sodipodi:docname="restore.svg">
+ <defs
+ id="defs4">
+ <linearGradient
+ id="linearGradient3637">
+ <stop
+ style="stop-color:#464646;stop-opacity:1;"
+ offset="0"
+ id="stop3639" />
+ <stop
+ style="stop-color:#a8a8a8;stop-opacity:1;"
+ offset="1"
+ id="stop3641" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient3629">
+ <stop
+ style="stop-color:#b4b4b4;stop-opacity:1;"
+ offset="0"
+ id="stop3631" />
+ <stop
+ style="stop-color:#ffffff;stop-opacity:1;"
+ offset="1"
+ id="stop3633" />
+ </linearGradient>
+ <inkscape:perspective
+ sodipodi:type="inkscape:persp3d"
+ inkscape:vp_x="0 : 526.18109 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_z="744.09448 : 526.18109 : 1"
+ inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+ id="perspective10" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3629"
+ id="linearGradient3635"
+ x1="0.0501872"
+ y1="1028.3119"
+ x2="63.949814"
+ y2="1003.4123"
+ gradientUnits="userSpaceOnUse" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3637"
+ id="linearGradient3643"
+ x1="32"
+ y1="1009.8621"
+ x2="32"
+ y2="1021.8621"
+ gradientUnits="userSpaceOnUse" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3637"
+ id="linearGradient3651"
+ x1="32"
+ y1="1028.3119"
+ x2="32"
+ y2="1003.4123"
+ gradientUnits="userSpaceOnUse" />
+ <filter
+ id="filter3671"
+ inkscape:label="Drop shadow"
+ width="1.5"
+ height="1.5"
+ x="-.25"
+ y="-.25">
+ <feGaussianBlur
+ id="feGaussianBlur3673"
+ in="SourceAlpha"
+ stdDeviation="2.000000"
+ result="blur" />
+ <feColorMatrix
+ id="feColorMatrix3675"
+ result="bluralpha"
+ type="matrix"
+ values="1 0 0 0 0 0 1 0 0 0 0 0 1 0 0 0 0 0 0.500000 0 " />
+ <feOffset
+ id="feOffset3677"
+ in="bluralpha"
+ dx="-2.000000"
+ dy="0.000000"
+ result="offsetBlur" />
+ <feMerge
+ id="feMerge3679">
+ <feMergeNode
+ id="feMergeNode3681"
+ in="offsetBlur" />
+ <feMergeNode
+ id="feMergeNode3683"
+ in="SourceGraphic" />
+ </feMerge>
+ </filter>
+ </defs>
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="8"
+ inkscape:cx="27.343172"
+ inkscape:cy="36.772748"
+ inkscape:document-units="px"
+ inkscape:current-layer="layer1"
+ showgrid="false"
+ inkscape:window-width="1280"
+ inkscape:window-height="969"
+ inkscape:window-x="-4"
+ inkscape:window-y="-3"
+ inkscape:window-maximized="1" />
+ <metadata
+ id="metadata7">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage"; />
+ <dc:title></dc:title>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:label="Layer 1"
+ inkscape:groupmode="layer"
+ id="layer1"
+ transform="translate(0,-988.36218)">
+ <path
+ id="path2841"
+ transform="translate(0,988.36218)"
+ style="fill:#e3e3e3;stroke:#a2a2a2;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1"
+ d="M 0.44194174,15.512678 15.752066,0.6 l 32.324882,0 15.373259,14.912678"
+ sodipodi:nodetypes="cccc" />
+ <rect
+ style="fill:url(#linearGradient3635);stroke:url(#linearGradient3651);stroke-width:0.89200000000000002;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;fill-opacity:1"
+ id="rect2816"
+ width="63.007626"
+ height="24.007626"
+ x="0.49618721"
+ y="1003.8583" />
+ <rect
+ style="fill:none;stroke:url(#linearGradient3643);stroke-width:0.95005423000000000;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+ id="rect3625"
+ width="47.049946"
+ height="11.049946"
+ x="8.4750271"
+ y="1010.3371" />
+ <path
+ style="fill:none;stroke:#747474;stroke-width:0.97014248000000003px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="m 14.470588,1015.8621 35.058824,0"
+ id="path3627" />
+ <g
+ id="g3653"
+ style="filter:url(#filter3671)">
+ <path
+ sodipodi:open="true"
+ sodipodi:end="4.712389"
+ sodipodi:start="0"
+ transform="matrix(0.95302143,0,0,-0.95302143,-2.4958644,1065.8095)"
+ d="M 67.175146,39.251263 A 16.28871,16.28871 0 1 1 50.886437,22.962553"
+ sodipodi:ry="16.28871"
+ sodipodi:rx="16.28871"
+ sodipodi:cy="39.251263"
+ sodipodi:cx="50.886436"
+ id="path2844"
+ style="fill:none;stroke:#2f7abf;stroke-width:5.24647174;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+ sodipodi:type="arc" />
+ <path
+ sodipodi:nodetypes="cccc"
+ d="m 45.982143,1036.7145 7.209821,7.2048 -7.209821,7.2048 0,-14.4096 z"
+ style="fill:#2f7abf;stroke:#2f7abf;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1"
+ id="use3620" />
+ </g>
+ </g>
+</svg>
diff -Nru brewtarget-1.2.4/src/brewtarget.cpp brewtarget-1.2.5/src/brewtarget.cpp
--- brewtarget-1.2.4/src/brewtarget.cpp 2011-10-31 21:37:21.000000000 +0000
+++ brewtarget-1.2.5/src/brewtarget.cpp 2012-07-14 18:49:41.000000000 +0100
@@ -56,6 +56,7 @@
#include "CelsiusTempUnitSystem.h"
#include "ImperialVolumeUnitSystem.h"
#include "BtSplashScreen.h"
+#include "MainWindow.h"
QApplication* Brewtarget::app;
MainWindow* Brewtarget::mainWindow;
@@ -127,7 +128,7 @@
return true;
}
-void Brewtarget::checkForNewVersion()
+void Brewtarget::checkForNewVersion(MainWindow* mw)
{
// Don't do anything if the checkVersion flag was set false
@@ -135,53 +136,10 @@
return;
QNetworkAccessManager manager;
- QEventLoop loop;
QUrl url("http://brewtarget.sourceforge.net/version";);
- QSharedPointer<QNetworkReply> reply = QSharedPointer<QNetworkReply>(manager.get( QNetworkRequest(url) ));
- QObject::connect( reply.data(), SIGNAL(finished()), &loop, SLOT(quit()));
+ QNetworkReply* reply = manager.get( QNetworkRequest(url) );
+ QObject::connect( reply, SIGNAL(finished()), mw, SLOT(finishCheckingVersion()));
- loop.exec(); // Waits until the reply comes back.
-
- QString remoteVersion(reply->readAll());
-
- // If there is an error, just return.
- if( reply->error() != QNetworkReply::NoError )
- return;
-
- // If the remote version is newer...
- if( !remoteVersion.startsWith(VERSIONSTRING) )
- {
- // ...and the user wants to download the new version...
- if( QMessageBox::information(mainWindow,
- QObject::tr("New Version"),
- QObject::tr("Version %1 is now available. Download it?").arg(remoteVersion),
- QMessageBox::Yes | QMessageBox::No,
- QMessageBox::Yes) == QMessageBox::Yes )
- {
- // ...take them to the website.
- QDesktopServices::openUrl(QUrl("http://brewtarget.sourceforge.net";));
- }
- else // ... and the user does NOT want to download the new version...
- {
- // ... and they want us to stop bothering them...
- if( QMessageBox::question(mainWindow,
- QObject::tr("New Version"),
- QObject::tr("Stop bothering you about new versions?"),
- QMessageBox::Yes | QMessageBox::No,
- QMessageBox::Yes) == QMessageBox::Yes)
- {
- // ... tell brewtarget to stop bothering the user about the new version.
- checkVersion = false;
- }
- }
- }
- else // The current version is newest so...
- {
- // ...tell brewtarget to bother users about future new versions.
- // This means that when a user downloads the new version, this
- // variable will always get reset to true.
- checkVersion = true;
- }
}
bool Brewtarget::copyDataFiles(QString newPath)
@@ -544,7 +502,7 @@
splashScreen.finish(mainWindow);
- checkForNewVersion();
+ checkForNewVersion(mainWindow);
ret = app->exec();
savePersistentOptions();
diff -Nru brewtarget-1.2.4/src/brewtarget.h brewtarget-1.2.5/src/brewtarget.h
--- brewtarget-1.2.4/src/brewtarget.h 2011-10-31 21:37:21.000000000 +0000
+++ brewtarget-1.2.5/src/brewtarget.h 2012-07-14 18:49:41.000000000 +0100
@@ -40,6 +40,7 @@
friend class RecipeFormatter;
friend class Unit;
friend class Database;
+ friend class MainWindow;
public:
Brewtarget();
@@ -137,7 +138,7 @@
//! Load translation files.
static void loadTranslations();
//! Checks for a newer version and prompts user to download.
- static void checkForNewVersion();
+ static void checkForNewVersion(MainWindow* mw);
//! If this option is false, do not bother the user about new versions.
static bool checkVersion;
diff -Nru brewtarget-1.2.4/src/MainWindow.cpp brewtarget-1.2.5/src/MainWindow.cpp
--- brewtarget-1.2.4/src/MainWindow.cpp 2011-10-31 21:37:21.000000000 +0000
+++ brewtarget-1.2.5/src/MainWindow.cpp 2012-07-14 18:49:41.000000000 +0100
@@ -69,6 +69,7 @@
#include <QDesktopServices>
#include "FermentableTableModel.h"
#include "BrewNoteWidget.h"
+#include <QNetworkReply>
MainWindow::MainWindow(QWidget* parent)
: QMainWindow(parent)
@@ -2058,3 +2059,51 @@
dbFile.close();
otherDbFile.close();
}
+
+void MainWindow::finishCheckingVersion()
+{
+ QNetworkReply* reply = qobject_cast<QNetworkReply*>(sender());
+ if( reply == 0 )
+ return;
+
+ QString remoteVersion(reply->readAll());
+
+ // If there is an error, just return.
+ if( reply->error() != QNetworkReply::NoError )
+ return;
+
+ // If the remote version is newer...
+ if( !remoteVersion.startsWith(VERSIONSTRING) && !remoteVersion.startsWith("1.2.4") )
+ {
+ // ...and the user wants to download the new version...
+ if( QMessageBox::information(this,
+ QObject::tr("New Version"),
+ QObject::tr("Version %1 is now available. Download it?").arg(remoteVersion),
+ QMessageBox::Yes | QMessageBox::No,
+ QMessageBox::Yes) == QMessageBox::Yes )
+ {
+ // ...take them to the website.
+ QDesktopServices::openUrl(QUrl("http://brewtarget.sourceforge.net";));
+ }
+ else // ... and the user does NOT want to download the new version...
+ {
+ // ... and they want us to stop bothering them...
+ if( QMessageBox::question(this,
+ QObject::tr("New Version"),
+ QObject::tr("Stop bothering you about new versions?"),
+ QMessageBox::Yes | QMessageBox::No,
+ QMessageBox::Yes) == QMessageBox::Yes)
+ {
+ // ... tell brewtarget to stop bothering the user about the new version.
+ Brewtarget::checkVersion = false;
+ }
+ }
+ }
+ else // The current version is newest so...
+ {
+ // ...tell brewtarget to bother users about future new versions.
+ // This means that when a user downloads the new version, this
+ // variable will always get reset to true.
+ Brewtarget::checkVersion = true;
+ }
+}
diff -Nru brewtarget-1.2.4/src/MainWindow.h brewtarget-1.2.5/src/MainWindow.h
--- brewtarget-1.2.4/src/MainWindow.h 2011-10-31 21:37:21.000000000 +0000
+++ brewtarget-1.2.5/src/MainWindow.h 2012-07-14 18:49:41.000000000 +0100
@@ -147,6 +147,8 @@
void dragEnterEvent(QDragEnterEvent *event);
void dropEvent( QDropEvent *event);
+
+ void finishCheckingVersion();
protected:
virtual void closeEvent(QCloseEvent* event);
diff -Nru brewtarget-1.2.4/ui/aboutDialog.ui brewtarget-1.2.5/ui/aboutDialog.ui
--- brewtarget-1.2.4/ui/aboutDialog.ui 2011-10-31 21:37:21.000000000 +0000
+++ brewtarget-1.2.5/ui/aboutDialog.ui 2012-07-14 18:49:41.000000000 +0100
@@ -23,7 +23,7 @@
</style></head><body style=" font-family:'DejaVu Sans'; font-size:9pt; font-weight:400; font-style:normal;">
<p align="center" style=" margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:20pt;">Brewtarget %1</span></p>
<p style=" margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New,courier';">Brewtarget, for developing beer recipes.</span></p>
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New,courier';">Copyright 2009-2011 by the developers below.</span></p>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New,courier';">Copyright 2009-2012 by the developers below.</span></p>
<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Courier New,courier';"></p>
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New,courier'; font-weight:600; text-decoration: underline;">Developers</span></p>
<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Courier New,courier';"></p>
@@ -58,10 +58,8 @@
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New,courier';">Randy Brace (alpha tester)</span></p>
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="http://finalgravitypodcast.com"><span style=" font-family:'Sans Serif'; text-decoration: underline; color:#0057ae;">Final Gravity Podcasts</span></a></p>
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New,courier';">Glenn Tinseth &lt;</span><a href="http://www.realbeer.com/hops"><span style=" text-decoration: underline; color:#0000ff;">http://www.realbeer.com/hops</span></a><span style=" font-family:'Courier New,courier';">&gt;</span></p>
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New,courier';">A68 - Freelance Graphics Design (flag images)</span></p>
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New,courier';">server, printer, edit-copy, document-print-preview and merge images from Oxygen theme (CC license)</span></p>
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New,courier';">backup image from Nuvola theme (LGPL)</span></p>
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New,courier';">restore image from Fatcow Web Hosting &quot;Farm Fresh Icons&quot; (CC license)</span></p></body></html></string>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New,courier';">backup image from Nuvola theme (LGPL)</span></p></body></html></string>
</property>
</widget>
</item>
diff -Nru brewtarget-1.2.4/ui/mainWindow.ui brewtarget-1.2.5/ui/mainWindow.ui
--- brewtarget-1.2.4/ui/mainWindow.ui 2011-10-31 21:37:21.000000000 +0000
+++ brewtarget-1.2.5/ui/mainWindow.ui 2012-07-14 18:49:41.000000000 +0100
@@ -1673,6 +1673,33 @@
<addaction name="actionAbout_BrewTarget"/>
<addaction name="actionManual"/>
</widget>
+ <widget class="QMenu" name="menuView">
+ <property name="title">
+ <string>&View</string>
+ </property>
+ <addaction name="actionEquipments"/>
+ <addaction name="actionStyles"/>
+ <addaction name="separator"/>
+ <addaction name="actionFermentables"/>
+ <addaction name="actionHops"/>
+ <addaction name="actionMiscs"/>
+ <addaction name="actionYeasts"/>
+ </widget>
+ <widget class="QMenu" name="menuTools">
+ <property name="title">
+ <string>&Tools</string>
+ </property>
+ <addaction name="actionConvert_Units"/>
+ <addaction name="actionOG_Correction_Help"/>
+ <addaction name="actionPitch_Rate_Calculator"/>
+ <addaction name="actionPriming_Calculator"/>
+ <addaction name="action_recipeToTextClipboard"/>
+ <addaction name="actionRefractometer_Tools"/>
+ <addaction name="actionScale_Recipe"/>
+ <addaction name="actionTimers"/>
+ <addaction name="separator"/>
+ <addaction name="actionOptions"/>
+ </widget>
<widget class="QMenu" name="menuFile">
<property name="title">
<string>&File</string>
@@ -1718,33 +1745,6 @@
<addaction name="separator"/>
<addaction name="actionExit"/>
</widget>
- <widget class="QMenu" name="menuView">
- <property name="title">
- <string>&View</string>
- </property>
- <addaction name="actionEquipments"/>
- <addaction name="actionStyles"/>
- <addaction name="separator"/>
- <addaction name="actionFermentables"/>
- <addaction name="actionHops"/>
- <addaction name="actionMiscs"/>
- <addaction name="actionYeasts"/>
- </widget>
- <widget class="QMenu" name="menuTools">
- <property name="title">
- <string>&Tools</string>
- </property>
- <addaction name="actionConvert_Units"/>
- <addaction name="actionOG_Correction_Help"/>
- <addaction name="actionPitch_Rate_Calculator"/>
- <addaction name="actionPriming_Calculator"/>
- <addaction name="action_recipeToTextClipboard"/>
- <addaction name="actionRefractometer_Tools"/>
- <addaction name="actionScale_Recipe"/>
- <addaction name="actionTimers"/>
- <addaction name="separator"/>
- <addaction name="actionOptions"/>
- </widget>
<addaction name="menuFile"/>
<addaction name="menuView"/>
<addaction name="menuTools"/>
@@ -2058,7 +2058,7 @@
<action name="actionRestore_Database">
<property name="icon">
<iconset resource="../brewtarget.qrc">
- <normaloff>:/images/restore.png</normaloff>:/images/restore.png</iconset>
+ <normaloff>:/images/restore.svg</normaloff>:/images/restore.svg</iconset>
</property>
<property name="text">
<string>&Restore</string>
diff -Nru brewtarget-1.2.4/ui/optionsDialog.ui brewtarget-1.2.5/ui/optionsDialog.ui
--- brewtarget-1.2.4/ui/optionsDialog.ui 2011-10-31 21:37:21.000000000 +0000
+++ brewtarget-1.2.5/ui/optionsDialog.ui 2012-07-14 18:49:41.000000000 +0100
@@ -390,7 +390,7 @@
</property>
<property name="icon">
<iconset resource="../brewtarget.qrc">
- <normaloff>:/images/flagCzech.png</normaloff>:/images/flagCzech.png</iconset>
+ <normaloff>:/images/flagCzech.svg</normaloff>:/images/flagCzech.svg</iconset>
</property>
<property name="iconSize">
<size>
@@ -413,7 +413,7 @@
</property>
<property name="icon">
<iconset resource="../brewtarget.qrc">
- <normaloff>:/images/flagGermany.png</normaloff>:/images/flagGermany.png</iconset>
+ <normaloff>:/images/flagGermany.svg</normaloff>:/images/flagGermany.svg</iconset>
</property>
<property name="iconSize">
<size>
@@ -436,7 +436,7 @@
</property>
<property name="icon">
<iconset resource="../brewtarget.qrc">
- <normaloff>:/images/flagUK.png</normaloff>:/images/flagUK.png</iconset>
+ <normaloff>:/images/flagUK.svg</normaloff>:/images/flagUK.svg</iconset>
</property>
<property name="iconSize">
<size>
@@ -466,7 +466,7 @@
</property>
<property name="icon">
<iconset resource="../brewtarget.qrc">
- <normaloff>:/images/flagSpain.png</normaloff>:/images/flagSpain.png</iconset>
+ <normaloff>:/images/flagSpain.svg</normaloff>:/images/flagSpain.svg</iconset>
</property>
<property name="iconSize">
<size>
@@ -489,7 +489,7 @@
</property>
<property name="icon">
<iconset resource="../brewtarget.qrc">
- <normaloff>:/images/flagFrance.png</normaloff>:/images/flagFrance.png</iconset>
+ <normaloff>:/images/flagFrance.svg</normaloff>:/images/flagFrance.svg</iconset>
</property>
<property name="iconSize">
<size>
@@ -512,7 +512,7 @@
</property>
<property name="icon">
<iconset resource="../brewtarget.qrc">
- <normaloff>:/images/flagNetherlands.png</normaloff>:/images/flagNetherlands.png</iconset>
+ <normaloff>:/images/flagNetherlands.svg</normaloff>:/images/flagNetherlands.svg</iconset>
</property>
<property name="iconSize">
<size>
@@ -542,7 +542,7 @@
</property>
<property name="icon">
<iconset resource="../brewtarget.qrc">
- <normaloff>:/images/btFlagCatalonia.png</normaloff>:/images/btFlagCatalonia.png</iconset>
+ <normaloff>:/images/flagCatalonia.svg</normaloff>:/images/flagCatalonia.svg</iconset>
</property>
<property name="iconSize">
<size>
@@ -562,7 +562,7 @@
</property>
<property name="icon">
<iconset resource="../brewtarget.qrc">
- <normaloff>:/images/flagPoland.png</normaloff>:/images/flagPoland.png</iconset>
+ <normaloff>:/images/flagPoland.svg</normaloff>:/images/flagPoland.svg</iconset>
</property>
<property name="iconSize">
<size>
@@ -585,7 +585,7 @@
</property>
<property name="icon">
<iconset resource="../brewtarget.qrc">
- <normaloff>:/images/flagPortugal.png</normaloff>:/images/flagPortugal.png</iconset>
+ <normaloff>:/images/flagPortugal.svg</normaloff>:/images/flagPortugal.svg</iconset>
</property>
<property name="iconSize">
<size>
Reply to: