diff --git a/bin/run_webserver.sh b/bin/run_webserver.sh index f8a498c..c097b42 100755 --- a/bin/run_webserver.sh +++ b/bin/run_webserver.sh @@ -8,6 +8,9 @@ # change your local settings in "cryptobox-local.conf" - if this file # does not exist, then "cryptobox.conf" is used # +# BEWARE: the super.tab entry must be named "CryptoBoxRootActionsLocal" instead of +# "CryptoBoxRootActions" (useful for development) +# BIN_DIR=$(dirname "$0") BIN_DIR=$(cd "$BIN_DIR"; pwd) diff --git a/conf-examples/cryptobox.conf b/conf-examples/cryptobox.conf index ed006e3..6ece189 100644 --- a/conf-examples/cryptobox.conf +++ b/conf-examples/cryptobox.conf @@ -68,7 +68,7 @@ Stylesheet = cryptobox-misc/cryptobox.css # comma seperated list of available languages for the web interface # the first language is the default # all other languages serve as fallbacks for an incomplete translation -# available languages: cs, da, de, en, es, fi, fr, hu, it, ja, nl, pl, pt, ru, sl, sv +# available languages: cs, da, de, en, es, fi, fr, hu, it, ja, nl, pl, pt, ru, sl, sv, ur # well supported languages: en, de # partly translated: sl Languages = en, de, sl diff --git a/copyright.graphics b/copyright.graphics index d8c00ba..eeac3c0 100644 --- a/copyright.graphics +++ b/copyright.graphics @@ -1,16 +1,17 @@ -This file lists detailed information about the original authors of the graphics -that are used as a part of the CryptoBox. +This file lists detailed information about the licenses and 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/). +******************** Creative Commons graphics ************************* + +The graphics listed below 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) design/cryptobox_backgrounds.svg - all pictures below design/logo/ - all pictures below www-data/screenshots + all graphics in the directory design/logo/ + all graphics in the directory www-data/screenshots + all graphics not listed below 2) Tango Desktop Project (http://tango.freedesktop.org) design/icons/applications-system_tango.svg @@ -29,7 +30,6 @@ Attribution ShareAlike 2.5 license design/icons/multimedia-player-ipod-mini-blue_tango.svg design/icons/multimedia-player-motorola-rokr_tango.svg design/icons/package-x-generic_tango.svg - design/icons/preferences-desktop-locale_tango.svg design/icons/preferences-system_tango.svg design/icons/system-log-out_tango.svg design/icons/face_smile_big.svg @@ -39,6 +39,75 @@ Attribution ShareAlike 2.5 license design/icons/network-transmit-receive_design.svg design/icons/unlocked-device_tango.svg [derived] design/icons/pile_of_devices.svg [derived] + www-data/dialog-error_tango.gif + www-data/dialog-error_tango.png + www-data/dialog-information_tango.gif + www-data/dialog-information_tango.png + www-data/dialog-warning_tango.gif + www-data/dialog-warning_tango.png + www-data/icon_get_help.gif + www-data/icon_get_help.png + www-data/icon_get_help_disable.gif [derived] + www-data/icon_get_help_disable.png [derived] + www-data/smile.gif + www-data/smile.png + www-data/smile4.gif + www-data/smile4.png + www-data/volume_active_crypto.gif [derived] + www-data/volume_active_crypto.png [derived] + www-data/volume_active_crypto_busy.gif [derived] + www-data/volume_active_crypto_busy.png [derived] + www-data/volume_active_plain.gif [derived] + www-data/volume_active_plain.png [derived] + www-data/volume_active_plain_busy.gif [derived] + www-data/volume_active_plain_busy.png [derived] + www-data/volume_passive_crypto.gif [derived] + www-data/volume_passive_crypto.png [derived] + www-data/volume_passive_crypto_busy.gif [derived] + www-data/volume_passive_crypto_busy.png [derived] + www-data/volume_passive_plain.gif [derived] + www-data/volume_passive_plain.png [derived] + www-data/volume_passive_plain_busy.gif [derived] + www-data/volume_passive_plain_busy.png [derived] + plugins/language_selection/list_marker_tango.gif + plugins/volume_format_fs/plugin_icon.gif + plugins/volume_format_fs/plugin_icon.png + plugins/disks/plugin_icon.gif [derived] + plugins/disks/plugin_icon.png [derived] + plugins/shutdown/plugin_icon.gif + plugins/shutdown/plugin_icon.png + plugins/volume_props/plugin_icon.gif + plugins/volume_props/plugin_icon.png + plugins/system_preferences/plugin_icon.gif + plugins/system_preferences/plugin_icon.png + plugins/network/plugin_icon.gif + plugins/network/plugin_icon.png + plugins/volume_mount/plugin_icon.gif + plugins/volume_mount/plugin_icon.png + plugins/plugin_manager/plugin_icon.gif + plugins/plugin_manager/plugin_icon.png + plugins/plugin_manager/tango-go-up.png + plugins/plugin_manager/tango-go-down.png + plugins/plugin_icon_unknown.gif + plugins/plugin_icon_unknown.png + + +3) David Vignoni + design/icons/gnome-dev-removable-usb_nuvola.svg + design/icons/gnome-globe_nuvola.svg + design/icons/gtk-ok_nuvola.svg + design/icons/gtk-stop_nuvola.svg + design/icons/gtk-zoom-in_nuvola.svg + plugins/volume_details/plugin_icon.gif + plugins/volume_details/plugin_icon.png + +4) Andy Fitzsimon + design/icons/pile_of_devices.svg [derived] + plugins/disks/plugin_icon.gif [derived] + plugins/disks/plugin_icon.png [derived] + +5) Matthew McClintock + design/icons/redhat-config-users_wasp.svg 3) David Vignoni design/icons/gnome-dev-removable-usb_nuvola.svg @@ -49,10 +118,41 @@ Attribution ShareAlike 2.5 license 4) Andy Fitzsimon design/icons/pile_of_devices.svg [derived] + plugins/disks/plugin_icon.gif [derived] + plugins/disks/plugin_icon.png [derived] 5) Matthew McClintock design/icons/redhat-config-users_wasp.svg + plugins/user_manager/plugin_icon.gif + plugins/user_manager/plugin_icon.png 6) Nicu Buculei design/icons/globe-lips.svg [derived] + plugins/language_selection/plugin_icon.gif [derived] + plugins/language_selection/plugin_icon.png [derived] + + +*********************** GPL graphics ****************************** + +The graphics listed below are licensed under the GNU General Public License (GPL) +v2.0 or later (http://www.gnu.org/licenses/gpl.html). + +1) Gnome Project (http://www.gnome.org/) + plugins/shutdown/gnome-reboot.gif + plugins/shutdown/gnome-reboot.png + plugins/shutdown/gnome-shutdown.gif + plugins/shutdown/gnome-shutdown.png + plugins/date/plugin_icon.gif + plugins/date/plugin_icon.png + plugins/partition/plugin_icon.gif + plugins/partition/plugin_icon.png + plugins/help/plugin_icon.gif + plugins/help/plugin_icon.png + + +********** Creative Commons Public Domain Dedications ************** + +1) http://openclipart.org + plugins/logs/plugin_icon.gif + plugins/logs/plugin_icon.png diff --git a/www-data/somerights20.gif b/www-data/somerights20.gif deleted file mode 100644 index 0860fa9..0000000 Binary files a/www-data/somerights20.gif and /dev/null differ