diff --git a/README b/README index 960b31e..d3a6ea3 100644 --- a/README +++ b/README @@ -179,7 +179,9 @@ We also want to thank the numerous developers of the Free Software, the CryptoBox depends on and that was used in development. -8) Licence -All scripts are GPL code (v2.0 or above). -The documentation is licenced under "Creative Commons 2.5 share-alike" (http://creativecommons.org/licenses/by-sa/2.5/). +8) License +The code is licensed under the GPL v2.0 or above. +The documentation and all graphics are licenced under "Creative Commons Attribution +Share-Alike 2.5" (http://creativecommons.org/licenses/by-sa/2.5/). +See the file 'copyright' for details. diff --git a/copyright b/copyright index 5441f59..3c331f2 100644 --- a/copyright +++ b/copyright @@ -1,18 +1,32 @@ -Copyright (c) 02005 sense.lab +Copyright (c) 02005-2007 sense.lab -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, version 2. +Documentation: + The documentation is licensed under the Creative Commons Attribution + ShareAlike 2.5 license (http://creativecommons.org/licenses/by-sa/2.5/). -This program is distributed in the hope that it will be useful, but -WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -General Public License for more details. -You should have received a copy of the GNU General Public License with -your Debian GNU/Linux system, in /usr/share/common-licenses/GPL, or with the -Debian GNU/Linux hello source package as the file COPYING. If not, -write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, -Boston, MA 02110-1301 USA +Graphics: + All graphics are licensed under the Creative Commons Attribution + ShareAlike 2.5 license (http://creativecommons.org/licenses/by-sa/2.5/). + + See detailed information for all pictures in 'copyright.pictures'. + + +Code: + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, version 2. + + This program is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + General Public License for more details. + + You should have received a copy of the GNU General Public License with + your Debian GNU/Linux system, in /usr/share/common-licenses/GPL, or with the + Debian GNU/Linux hello source package as the file COPYING. If not, + write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, + Boston, MA 02110-1301 USA $Id$ + diff --git a/copyright.graphics b/copyright.graphics new file mode 100644 index 0000000..5377a4a --- /dev/null +++ b/copyright.graphics @@ -0,0 +1,57 @@ +This file lists detailed information about the original authors of the graphics +that are used as a part of the CryptoBox. + +TODO: pixel based graphic files are still missing + +All graphics of the CryptoBox are licensed under the Creative Commons +Attribution ShareAlike 2.5 license +(http://creativecommons.org/licenses/by-sa/2.5/). + +1) Sense.Lab e.V. (http://senselab.org) + designs/cryptobox_backgrounds.svg + all pictures below designs/logo/ + all pictures below www-data/screenshots + +2) Tango Desktop Project (http://tango.freedesktop.org) + designs/icons/applications-system_tango.svg + designs/icons/computer_tango.svg + designs/icons/dialog-error_tango.svg + designs/icons/dialog-information_tango.svg + designs/icons/dialog-warning_tango.svg + designs/icons/drive-cdrom_tango.svg + designs/icons/drive-harddisk_tango.svg + designs/icons/drive-removable-media_tango.svg + designs/icons/go-down_tango.svg + designs/icons/go-up_tango.svg + designs/icons/inaccessible_tango_emblem-unreadable.svg + designs/icons/locked_tango-emblem-readonly.svg + designs/icons/multimedia-dell-dj-pocket_tango.svg + designs/icons/multimedia-player-ipod-mini-blue_tango.svg + designs/icons/multimedia-player-motorola-rokr_tango.svg + designs/icons/preferences-desktop-locale_tango.svg + designs/icons/preferences-system_tango.svg + designs/icons/system-log-out_tango.svg + designs/icons/face_smile_big.svg + designs/icons/help_browser.svg + designs/icons/help_browser_disable.svg [derived] + designs/icons/globe-lips.svg [derived] + designs/icons/network-transmit-receive_design.svg + designs/icons/unlocked-device_tango.svg [derived] + designs/icons/pile_of_devices.svg [derived] + +3) David Vignoni + designs/icons/gnome-dev-removable-usb_nuvola.svg + designs/icons/gnome-globe_nuvola.svg + designs/icons/gtk-ok_nuvola.svg + designs/icons/gtk-stop_nuvola.svg + designs/icons/gtk-zoom-in_nuvola.svg + +4) Andy Fitzsimon + designs/icons/pile_of_devices.svg [derived] + +5) Matthew McClintock + designs/icons/redhat-config-users_wasp.svg + +6) Nicu Buculei + designs/icons/globe-lips.svg [derived] + diff --git a/design/background_frame_corner.svg b/design/cryptobox_backgrounds.svg similarity index 100% rename from design/background_frame_corner.svg rename to design/cryptobox_backgrounds.svg diff --git a/design/icon_background_active.svg b/design/icon_background_active.svg deleted file mode 100644 index c6ee31a..0000000 --- a/design/icon_background_active.svg +++ /dev/null @@ -1,92 +0,0 @@ - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - diff --git a/design/icons/globe-lips.svg b/design/icons/globe-lips.svg index 8b700f9..c1cec26 100644 --- a/design/icons/globe-lips.svg +++ b/design/icons/globe-lips.svg @@ -15,7 +15,7 @@ inkscape:export-xdpi="90.000000" inkscape:export-ydpi="90.000000" inkscape:version="0.44.1" - sodipodi:docbase="/home/lars/subversion/cryptobox/branches/pythonrewrite/design" + sodipodi:docbase="/home/lars/subversion/cryptobox/trunk/design/icons" sodipodi:docname="globe-lips.svg" sodipodi:version="0.32" width="128.00000px"> @@ -24,12 +24,13 @@ - mouth - body part + GlobeLips bodypart mouth + globe @@ -48,22 +49,34 @@ Nicu Buculei - + 20.10.02007 image/svg+xml + rdf:resource="http://creativecommons.org/licenses/by-sa/2.5/" /> en + + + Lars Kruse +Clavdia Horvat + + + rdf:about="http://creativecommons.org/licenses/by-sa/2.5/"> + + + diff --git a/design/icons/help_contents.svg b/design/icons/help_contents.svg deleted file mode 100644 index c3beee8..0000000 --- a/design/icons/help_contents.svg +++ /dev/null @@ -1,701 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - Help Contents - - - help - index - contents - - - - - - Jakub Steiner - - - http://jimmac.musichall.cz - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/design/icons/language.png b/design/icons/language.png deleted file mode 100644 index 3334b5d..0000000 Binary files a/design/icons/language.png and /dev/null differ diff --git a/design/icons/pile_of_devices.png b/design/icons/pile_of_devices.png deleted file mode 100644 index 3591de9..0000000 Binary files a/design/icons/pile_of_devices.png and /dev/null differ diff --git a/design/icons/pile_of_devices.svg b/design/icons/pile_of_devices.svg index e00ddcc..b646e3b 100644 --- a/design/icons/pile_of_devices.svg +++ b/design/icons/pile_of_devices.svg @@ -14,7 +14,7 @@ id="svg2" sodipodi:version="0.32" inkscape:version="0.44.1" - sodipodi:docbase="/home/lars/subversion/cryptobox/branches/pythonrewrite/design/icons" + sodipodi:docbase="/home/lars/subversion/cryptobox/trunk/design/icons" sodipodi:docname="pile_of_devices.svg"> @@ -18722,8 +18722,8 @@ inkscape:cy="678.21984" inkscape:document-units="px" inkscape:current-layer="layer1" - inkscape:window-width="1024" - inkscape:window-height="693" + inkscape:window-width="1014" + inkscape:window-height="688" inkscape:window-x="0" inkscape:window-y="26" /> image/svg+xml + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + - + id="path101" + style="fill:url(#XMLID_20_)" + d="M 203.10742,60.404785 L 203.10742,60.404785 C 145.78125,62.774414 48.094727,128.58545 48.094727,128.58545 C 48.094727,128.58545 47.040527,133.91211 47.102539,134.09961 C 47.102539,135.19141 47.102539,142.70703 47.102539,142.94922 C 41.321777,145.81445 23.390625,154.70117 23.390625,154.70117 L 24.202637,164.44336 L 45.116211,195.67188 C 45.116211,195.67188 68.021484,182.37695 72.979004,179.5 C 74.930664,182.24609 77.301758,185.58203 77.589355,185.98438 C 77.810059,186.47266 80.031738,191.37305 80.031738,191.37305 L 83.674805,189.72266 C 84.022461,189.56445 118.85303,173.72461 154.19141,153.10547 C 202.43457,124.95459 228.67285,101.53418 232.17773,83.492676 C 233.53516,76.505371 231.68848,70.309082 226.69727,65.068359 C 226.69727,65.068359 223.83984,63.006348 223.36719,63.318848 C 218.67383,61.003418 212.02148,60.036621 203.10742,60.404785 z " /> + + + + + + + + - + id="path128" + style="fill:url(#XMLID_21_)" + d="M 82.023438,186.07812 C 82.023438,186.07812 259.74902,105.53174 223.80176,67.828613 L 73.476074,167.22656 L 82.023438,186.07812 z " /> - + id="path130" + style="fill:#336" + d="M 221.93262,69.064453 L 73.476074,167.22656 L 74.145508,168.70312 L 82.023438,179.75391 C 181.99707,138.79102 246.86621,82.0625 221.93262,69.064453 z " /> + + + + - + id="path145" + style="fill:url(#XMLID_22_)" + d="M 50.936035,132.95117 C 50.936035,132.95117 140.09082,67.012695 203.27246,64.401367 C 266.45313,61.790039 197.74219,130.33984 82.023438,177.75391 L 54.622559,139.31641 L 52.276367,137.0332 L 50.936035,132.95117 z " /> + + + + - + id="path160" + style="fill:url(#XMLID_23_)" + d="M 54.369141,138.62305 C 54.200195,138.6875 54.04834,138.77344 53.885254,138.84766 L 74.634766,167.95508 C 74.956543,167.78711 75.280273,167.625 75.584473,167.42578 C 81.762207,163.36328 81.216309,153.94727 75.243652,146.55273 C 69.662109,139.64453 60.658203,136.19531 54.369141,138.62305 z " /> + + + + + + + + - + id="path183" + style="fill:url(#XMLID_24_)" + d="M 56.038086,140.51953 C 55.891602,140.57617 55.759766,140.65039 55.618652,140.71484 L 73.611328,165.95508 C 73.890137,165.81055 74.170898,165.66992 74.43457,165.49609 C 79.791504,161.97461 79.318359,153.80859 74.13916,147.39648 C 69.299316,141.40625 61.491699,138.41406 56.038086,140.51953 z " /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/design/icons/spherecrystal_help.svg b/design/icons/spherecrystal_help.svg deleted file mode 100644 index dfa203c..0000000 --- a/design/icons/spherecrystal_help.svg +++ /dev/null @@ -1,60 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/design/icons/unlocked_lars.svg b/design/icons/unlocked-device_tango.svg similarity index 100% rename from design/icons/unlocked_lars.svg rename to design/icons/unlocked-device_tango.svg diff --git a/design/icons/unlocked_clavdia.svg b/design/icons/unlocked_clavdia.svg deleted file mode 100644 index ce5175e..0000000 --- a/design/icons/unlocked_clavdia.svg +++ /dev/null @@ -1,515 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - Jakub Steiner - - - http://jimmac.musichall.cz - - Read Only Emblem - - - emblem - read-only - nowrite - - - - - - - - - - - - - - - - - - - - - - - - - - -