diff --git a/contrib/debian/copyright b/contrib/debian/copyright index 546ffc6e1..2da146198 100644 --- a/contrib/debian/copyright +++ b/contrib/debian/copyright @@ -33,19 +33,21 @@ Files: src/qt/res/icons/clock*.png, src/qt/res/icons/tx*.png, Copyright: Wladimir van der Laan License: CC-BY-3 -Files: src/qt/res/icons/send.png -Copyright: Icons Land -License: Freeware Non-commercial -Comment: Icon Pack: Vista Style Arrow - Site: http://findicons.com/icon/231371/right3green +Files: src/qt/res/icons/address-book.png, src/qt/res/icons/export.png, + src/qt/res/icons/history.png, src/qt/res/icons/key.png, + src/qt/res/icons/lock_*.png, src/qt/res/icons/overview.png, + src/qt/res/icons/receive.png, src/qt/res/icons/send.png, + src/qt/res/icons/synced.png +Copyright: David Vignoni (david@icon-king.com) + ICON KING - www.icon-king.com +License: LGPL +Comment: NUVOLA ICON THEME for KDE 3.x + Original icons: kaddressbook, klipper_dock, view-list-text, + key-password, encrypted/decrypted, go-home, go-down, + go-next, dialog-ok + Site: http://www.icon-king.com/projects/nuvola/ -Files: src/qt/res/icons/address-book.png -Copyright: FatCow Web Hosting -License: CC-BY-3 -Comment: Icon Pack: Farm-Fresh Web - Site: http://findicons.com/icon/163938/book_open - -Files: src/qt/res/icons/connect*.png, src/qt/res/icons/synced.png, src/qt/res/icons/lock_*.png +Files: src/qt/res/icons/connect*.png Copyright: schollidesign License: GPL-3+ Comment: Icon Pack: Human-O2 @@ -65,24 +67,11 @@ Copyright: http://www.everaldo.com License: LGPL Comment: Icon Pack: Crystal SVG -Files: src/qt/res/icons/receive.png, src/qt/res/icons/history.png, - src/qt/res/icons/export.png -Copyright: Oxygen team -License: CC-BY-SA-3 -Comment: Icon Pack: Oxygen - Site: http://www.oxygen-icons.org/ - Files: src/qt/res/icons/bitcoin.png, src/qt/res/icons/toolbar.png Copyright: Bitboy (optimized for 16x16 by Wladimir van der Laan) License: PUB-DOM Comment: Site: http://forum.bitcoin.org/?topic=1756.0 -Files: src/qt/res/icons/overview.png -Copyright: Jack Cai -License: CC-BY-ND-3 -Comment: Icon Pack: Primo - Site: http://findicons.com/icon/175944/home?id=176221# - Files: scripts/img/reload.xcf, src/qt/res/movies/update_spinner.mng Copyright: Everaldo (Everaldo Coelho) License: GPL-3+ @@ -94,12 +83,6 @@ License: PUB-DOM Copyright: Crobbo (forum) Comment: Site: https://bitcointalk.org/index.php?topic=32273.0 -Files: src/qt/res/icons/key.png -Copyright: VisualPharm (Ivan Boyko) -License: CC-BY-3 -Comment: Icon Pack: Must Have - Site: http://findicons.com/icon/51009/key?id=51009 - License: Expat Permission is hereby granted, free of charge, to any person obtaining a @@ -170,20 +153,6 @@ Comment: You can get a full copy of the license at . -License: CC-BY-ND-3 - This work is licensed under a Creative Commons Attribution-NoDerivs 3.0 - Unported License. -Comment: - You can get a full copy of the license at - . - -License: CC-BY-ND-3 - This work is licensed under a Creative Commons Attribution-ShareAlike - 3.0 Unported License. -Comment: - You can get a full copy of the license at - . - License: LGPL 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 diff --git a/doc/assets-attribution.txt b/doc/assets-attribution.txt index 91d2e6580..8d23f7e59 100644 --- a/doc/assets-attribution.txt +++ b/doc/assets-attribution.txt @@ -3,19 +3,18 @@ Icon: src/qt/res/icons/clock*.png, src/qt/res/icons/tx*.png, Designer: Wladimir van der Laan License: Creative Commons Attribution -Icon: src/qt/res/icons/send.png -Icon Pack: Vista Style Arrow -Designer: Icons Land -License: Freeware Non-commercial -Site: http://findicons.com/icon/231371/right3green +Icon: src/qt/res/icons/address-book.png, src/qt/res/icons/export.png, + src/qt/res/icons/history.png, src/qt/res/icons/key.png, + src/qt/res/icons/lock_*.png, src/qt/res/icons/overview.png, + src/qt/res/icons/receive.png, src/qt/res/icons/send.png, + src/qt/res/icons/synced.png +Icon Pack: NUVOLA ICON THEME for KDE 3.x +Designer: David Vignoni (david@icon-king.com) + ICON KING - www.icon-king.com +License: LGPL +Site: http://www.icon-king.com/projects/nuvola/ -Icon: src/qt/res/icons/address-book.png -Icon Pack: Farm-Fresh Web -Designer: FatCow Web Hosting -License: Creative Commons Attribution (by) -Site: http://findicons.com/icon/163938/book_open - -Icon: src/qt/res/icons/connect*.png, src/qt/res/icons/synced.png, src/qt/res/icons/lock_*.png +Icon: src/qt/res/icons/connect*.png Icon Pack: Human-O2 Designer: schollidesign License: GNU/GPL @@ -35,24 +34,11 @@ Designer: http://www.everaldo.com Icon Pack: Crystal SVG License: LGPL -Icon: src/qt/res/icons/receive.png, src/qt/res/icons/history.png, - src/qt/res/icons/export.png -Designer: Oxygen team -Icon Pack: Oxygen -License: Creative Common Attribution-ShareAlike 3.0 License or LGPL -Site: http://www.oxygen-icons.org/ - Icon: src/qt/res/icons/bitcoin.png, src/qt/res/icons/toolbar.png Designer: Bitboy (optimized for 16x16 by Wladimir van der Laan) License: Public Domain Site: http://forum.bitcoin.org/?topic=1756.0 -Icon: src/qt/res/icons/overview.png -Icon Pack: Primo -Designer: Jack Cai -License: Creative Commons Attribution No Derivatives (by-nd) -Site: http://findicons.com/icon/175944/home?id=176221# - Icon: scripts/img/reload.xcf (modified),src/qt/res/movies/update_spinner.mng Icon Pack: Kids Designer: Everaldo (Everaldo Coelho) @@ -64,10 +50,3 @@ Designer: Crobbo (forum) Site: https://bitcointalk.org/index.php?topic=32273.0 License: Public domain -Icon: src/qt/res/icons/key.png -Designer: VisualPharm (Ivan Boyko) -Icon Pack: Must Have -Site: http://findicons.com/icon/51009/key?id=51009 -License: Creative Commons Attribution (by) - - diff --git a/src/qt/res/icons/address-book.png b/src/qt/res/icons/address-book.png index 1086fbeb6..dbfc28ab3 100644 Binary files a/src/qt/res/icons/address-book.png and b/src/qt/res/icons/address-book.png differ diff --git a/src/qt/res/icons/export.png b/src/qt/res/icons/export.png index 69d59a38d..1df9c2398 100644 Binary files a/src/qt/res/icons/export.png and b/src/qt/res/icons/export.png differ diff --git a/src/qt/res/icons/history.png b/src/qt/res/icons/history.png index 60f135178..10ac0e159 100644 Binary files a/src/qt/res/icons/history.png and b/src/qt/res/icons/history.png differ diff --git a/src/qt/res/icons/key.png b/src/qt/res/icons/key.png index 757cad47e..ece0164f7 100644 Binary files a/src/qt/res/icons/key.png and b/src/qt/res/icons/key.png differ diff --git a/src/qt/res/icons/lock_closed.png b/src/qt/res/icons/lock_closed.png index ce8da0bec..c566510c4 100644 Binary files a/src/qt/res/icons/lock_closed.png and b/src/qt/res/icons/lock_closed.png differ diff --git a/src/qt/res/icons/lock_open.png b/src/qt/res/icons/lock_open.png index 6a3a8edb2..c98ca8663 100644 Binary files a/src/qt/res/icons/lock_open.png and b/src/qt/res/icons/lock_open.png differ diff --git a/src/qt/res/icons/overview.png b/src/qt/res/icons/overview.png index 6b94b43a2..3b90fe556 100644 Binary files a/src/qt/res/icons/overview.png and b/src/qt/res/icons/overview.png differ diff --git a/src/qt/res/icons/receive.png b/src/qt/res/icons/receive.png index e8f418a4f..53ad1d156 100644 Binary files a/src/qt/res/icons/receive.png and b/src/qt/res/icons/receive.png differ diff --git a/src/qt/res/icons/send.png b/src/qt/res/icons/send.png index 55ce550b4..ceb91ea66 100644 Binary files a/src/qt/res/icons/send.png and b/src/qt/res/icons/send.png differ diff --git a/src/qt/res/icons/synced.png b/src/qt/res/icons/synced.png index 8e428b6a7..4d7e0e882 100644 Binary files a/src/qt/res/icons/synced.png and b/src/qt/res/icons/synced.png differ