From d436fbbec213f76e13f5f3805ecb29e132d91291 Mon Sep 17 00:00:00 2001 From: lars Date: Mon, 5 Feb 2007 23:50:43 +0000 Subject: [PATCH] removed obsolete creative-commons logo added "ur" (Urdu) to the configuration file added remaining graphics to copyright.graphics added hint to bin/run_webserver.sh --- bin/run_webserver.sh | 3 + conf-examples/cryptobox.conf | 2 +- copyright.graphics | 118 ++++++++++++++++++++++++++++++++--- www-data/somerights20.gif | Bin 1835 -> 0 bytes 4 files changed, 113 insertions(+), 10 deletions(-) delete mode 100644 www-data/somerights20.gif 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 0860fa98decdcb79a368723e5ebdb05f93918c0e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1835 zcmV+`2h{jSNk%w1VORhk0OkMy00021v8w<7|E#jBKtMo%fPk&Dtgp4MvbV9Ww5_nV zuOJ{Gx4gEsy0o;pv$?*w-{0S^v#k&i5V5zg&(h9taB#T2x1XP%FfcH?z`D-S&BMpS zue7ej$irY@V9n6Xw!5|O@9)CK!OhXk#>&OX&B(L3vX76CzrVk+wy;o8P{_>3$IHjR z#J|15y~WAJ(bUk(&dScx&bz?7y1%*1&&$BYz_Yos%FfELwXeLvywKCn%+Slr&&s~S zy}ZG@#mU6L#lOnU$-%|I$IHgh)X=`ey}rY~&(qJz&B@Qt&&0{ZudlDNxUtC0$ic?J zy1%-=#J#<4bjxm8XFq9zPU9vHBL`Xw7Rp> z)zK&@D5|Zh#mK~UcXg4IkZEgazr(&LC?~?j!9qhqTwYvucXdxtPPn?awz;)-cXon= zf`f&FH8nM7X=hGQPIPv3TwPqYxwdF(Xo7@+wYao|g@ZvuL0w*4A^8LV00000EC2ui z09XJY000O7fC2!6goTEOh>41ejE#wc00EMdlmP>mmj(t290v*rCJqe@4;eZ~K_VR_ zL?uEoHC7)ZBOg39F+xr(Bpo6)M>-h~79b8L2nsnI37Q6&mz9%*(v{Eynh^<}DF~tr z7BoLbS*j!~B{)1I8Zs2`6fznkxJkUeK}J6`77Psz2qq{vkRXC4XqKu47^G0rHEaeV zbovwugoRQrT0B|BB1sP`8u)zCLWqkUI21H|=pkf9FA-5(3@dgl*#Qm)pIuYPu%RVP z&N$`hc4JhyA4hC#0Me?*2N`t+Ngz;xfP_JMkjNO(BMFfg8-@hq=kErB6axz$L|Cn- z!fV<8wkep<~kQy590KgDJuxkhl0F*(Zfk#UqVfFDdhHN0twU{t#-Yn4*f}-G{ z=s+`MRf!lQ)R0u-y1EhoTCPwSp}5zRC_11NYk(}p&1O1-x6M2})20JMkB=%<1@Dqp zsP_P-CoAb+Hsw9|U+0Tq!a6L>RU20mml z1rRJy!GjEb06-lEegROxRT4-50SW-HQ3M4%P{9HaQv~6{43Pa3P+Gu6gJFh2ap)oc zDIf;1!3!(k@Bsx_03ZO3{QU<26G{Xq2pup`@Bt1hfE9!fKr&#=kd*YRQ!O5PSo7w3A2&Ck> zCv<*75JHR<06@TMDgXch1OTj&Xbet(WrGoE3OQ+!a~}B?G@L1ESDsEnDJ2DE000;Y zDi9E80R#}hga9W15J#9}mbrlqXa*^1T9#c{Nt~Fv_ugE0X5c~)BbIn#9sn%RT6Kbj z5ZfC?$dKcXQ)Ka2WM?VB46eC;d#N?V!AI1G^@(s_5~%Hf2LLL-D_E+3Y_VYf4J8oq zU<*}9*nn9nROpPilz>aHhMXMGjR_4{q+Aruk?>rfSEOO8p@Kocq8Mb{$ek0t3;`Y# zLH2eYuEJ#qQE_usWI-3>46)P-Lhzsg5?6>Zhzcj5P(Z2xctHjXwACO43$p4~3>YR% zY9U*e`t(q*bJfM^T?*?J!&5uJ&;}QVaM4E?Ff3>V4o)xzVaM7|#x2si%1I|g@5P5) zIHyQmS_w|cfJ6~nj4{UWu-tJ$bfQa-p#VKtl$Ca9JTJKnr8&!x*k6Fc@H<{Qx5X zz^G4x>E2z+wXX)4%kkQ2<#ypaA-Jfhnf1iiD5=1~71e0oibltKtt2 zDOiC5UC@CVB%&bp*vAC!?*d9>q#qsG#rZ+N14_hW0_&&6B%Uvbf)jk<4>fp5MK;id zNCYAUISGkW0-!bMqhKrtu>dY!vNbD|APSW5!}Ey}lw2gEDQ$T|PX?xzf$`%fT_lJd z?(dj_8B`t%85<82072vPfCm;Zs4`A)d=hvOIIp=)OmeebgOUI>X*nniRDhcVT7Wvo Zr>uCkvs6?;r#<8Oy?*-hpN$9v06Vt#9ijjL