diff --git a/build-osx.txt b/build-osx.txt index 5858a2a50..2f8b53321 100644 --- a/build-osx.txt +++ b/build-osx.txt @@ -1,4 +1,4 @@ -Copyright (c) 2009-2010 Satoshi Nakamoto +Copyright (c) 2010 Laszlo Hanyecz Distributed under the MIT/X11 software license, see the accompanying file license.txt or http://www.opensource.org/licenses/mit-license.php. This product includes software developed by the OpenSSL Project for use in diff --git a/license.txt b/license.txt index ed7435014..c27d7b053 100644 --- a/license.txt +++ b/license.txt @@ -1,4 +1,4 @@ -Copyright (c) 2009-2010 Satoshi Nakamoto +Copyright (c) 2009-2010 Bitcoin Developers Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/locale/de/LC_MESSAGES/bitcoin.mo b/locale/de/LC_MESSAGES/bitcoin.mo index a9ead65cc..eb0ca5ddf 100644 Binary files a/locale/de/LC_MESSAGES/bitcoin.mo and b/locale/de/LC_MESSAGES/bitcoin.mo differ diff --git a/locale/de/LC_MESSAGES/bitcoin.po b/locale/de/LC_MESSAGES/bitcoin.po index 91c79f99a..058a3ce9b 100644 --- a/locale/de/LC_MESSAGES/bitcoin.po +++ b/locale/de/LC_MESSAGES/bitcoin.po @@ -321,8 +321,8 @@ msgstr "Beim schließen &Minimieren" #: ../../../ui.cpp:1595 #, c-format -msgid "version %s%s beta" -msgstr "Version %s%s Beta" +msgid "version %s%s BETA" +msgstr "Version %s%s BETA" #: ../../../ui.cpp:1681 msgid "Will appear as \"From: Unknown\"" @@ -698,7 +698,7 @@ msgstr "Version" #: ../../../uibase.cpp:563 msgid "" -"Copyright (c) 2009-2010 Satoshi Nakamoto.\n" +"Copyright (c) 2009-2010 Bitcoin Developers\n" "\n" "This is experimental software.\n" "\n" @@ -709,7 +709,7 @@ msgid "" "OpenSSL Toolkit (http://www.openssl.org/) and cryptographic software written by \n" "Eric Young (eay@cryptsoft.com)." msgstr "" -"Copyright (c) 2009-2010 Satoshi Nakamoto.\n" +"Copyright (c) 2009-2010 Bitcoin Developers\n" "\n" "Dies ist experimentelle Software.\n" "\n" diff --git a/locale/es/LC_MESSAGES/bitcoin.mo b/locale/es/LC_MESSAGES/bitcoin.mo index 5df54f4aa..f4e41a2cf 100644 Binary files a/locale/es/LC_MESSAGES/bitcoin.mo and b/locale/es/LC_MESSAGES/bitcoin.mo differ diff --git a/locale/es/LC_MESSAGES/bitcoin.po b/locale/es/LC_MESSAGES/bitcoin.po index 239f63bd3..23c485b81 100644 --- a/locale/es/LC_MESSAGES/bitcoin.po +++ b/locale/es/LC_MESSAGES/bitcoin.po @@ -350,8 +350,8 @@ msgstr "&Minimizar al cerrar" #: ../../../ui.cpp:1610 #, c-format -msgid "version %s%s beta" -msgstr "version %s%s beta" +msgid "version %s%s BETA" +msgstr "version %s%s BETA" #: ../../../ui.cpp:1696 msgid "Will appear as \"From: Unknown\"" @@ -727,7 +727,7 @@ msgstr "version" #: ../../../uibase.cpp:557 msgid "" -"Copyright (c) 2009-2010 Satoshi Nakamoto.\n" +"Copyright (c) 2009-2010 Bitcoin Developers\n" "\n" "This is experimental software.\n" "\n" @@ -738,7 +738,7 @@ msgid "" "OpenSSL Toolkit (http://www.openssl.org/) and cryptographic software written by \n" "Eric Young (eay@cryptsoft.com)." msgstr "" -"Copyright (c) 2009-2010 Satoshi Nakamoto.\n" +"Copyright (c) 2009-2010 Bitcoin Developers\n" "\n" "Este es un software experimental.\n" "\n" diff --git a/locale/fr/LC_MESSAGES/bitcoin.mo b/locale/fr/LC_MESSAGES/bitcoin.mo index 137e0bdf1..6e97eff7d 100644 Binary files a/locale/fr/LC_MESSAGES/bitcoin.mo and b/locale/fr/LC_MESSAGES/bitcoin.mo differ diff --git a/locale/fr/LC_MESSAGES/bitcoin.po b/locale/fr/LC_MESSAGES/bitcoin.po index 09b7e37ae..5bc28575e 100644 --- a/locale/fr/LC_MESSAGES/bitcoin.po +++ b/locale/fr/LC_MESSAGES/bitcoin.po @@ -351,8 +351,8 @@ msgstr "&Réduire à la fermeture" #: ../../../ui.cpp:1610 #, c-format -msgid "version %s%s beta" -msgstr "version %s%s beta" +msgid "version %s%s BETA" +msgstr "version %s%s BETA" #: ../../../ui.cpp:1696 msgid "Will appear as \"From: Unknown\"" @@ -730,7 +730,7 @@ msgstr "version" #: ../../../uibase.cpp:557 msgid "" -"Copyright (c) 2009-2010 Satoshi Nakamoto.\n" +"Copyright (c) 2009-2010 Bitcoin Developers\n" "\n" "This is experimental software.\n" "\n" @@ -741,7 +741,7 @@ msgid "" "OpenSSL Toolkit (http://www.openssl.org/) and cryptographic software written by \n" "Eric Young (eay@cryptsoft.com)." msgstr "" -"Copyright (c) 2009-2010 Satoshi Nakamoto.\n" +"Copyright (c) 2009-2010 Bitcoin Developers\n" "\n" "Ceci est un logiciel expérimental.\n" "\n" diff --git a/locale/it/LC_MESSAGES/bitcoin.mo b/locale/it/LC_MESSAGES/bitcoin.mo index 73979c78c..706386487 100644 Binary files a/locale/it/LC_MESSAGES/bitcoin.mo and b/locale/it/LC_MESSAGES/bitcoin.mo differ diff --git a/locale/it/LC_MESSAGES/bitcoin.po b/locale/it/LC_MESSAGES/bitcoin.po index 42f913a67..2b6f45deb 100644 --- a/locale/it/LC_MESSAGES/bitcoin.po +++ b/locale/it/LC_MESSAGES/bitcoin.po @@ -319,8 +319,8 @@ msgstr "&Minimizza se chiuso" #: ../../../ui.cpp:1595 #, c-format -msgid "version %s%s beta" -msgstr "versione %s%s beta" +msgid "version %s%s BETA" +msgstr "versione %s%s BETA" #: ../../../ui.cpp:1681 msgid "Will appear as \"From: Unknown\"" @@ -696,7 +696,7 @@ msgstr "versione" #: ../../../uibase.cpp:563 msgid "" -"Copyright (c) 2009-2010 Satoshi Nakamoto.\n" +"Copyright (c) 2009-2010 Bitcoin Developers\n" "\n" "This is experimental software.\n" "\n" @@ -707,7 +707,7 @@ msgid "" "OpenSSL Toolkit (http://www.openssl.org/) and cryptographic software written by \n" "Eric Young (eay@cryptsoft.com)." msgstr "" -"Copyright (c) 2009-2010 Satoshi Nakamoto.\n" +"Copyright (c) 2009-2010 Bitcoin Developers\n" "\n" "Questo è un software sperimentale.\n" "\n" diff --git a/locale/nl/LC_MESSAGES/bitcoin.mo b/locale/nl/LC_MESSAGES/bitcoin.mo index 05c03ab14..f7a3b485b 100644 Binary files a/locale/nl/LC_MESSAGES/bitcoin.mo and b/locale/nl/LC_MESSAGES/bitcoin.mo differ diff --git a/locale/nl/LC_MESSAGES/bitcoin.po b/locale/nl/LC_MESSAGES/bitcoin.po index 20e8de1d5..135ffad0c 100644 --- a/locale/nl/LC_MESSAGES/bitcoin.po +++ b/locale/nl/LC_MESSAGES/bitcoin.po @@ -320,8 +320,8 @@ msgstr "&Minimalizeer bij sluiten" #: ../../../ui.cpp:1595 #, c-format -msgid "version %s%s beta" -msgstr "versie %s%s beta" +msgid "version %s%s BETA" +msgstr "versie %s%s BETA" #: ../../../ui.cpp:1681 msgid "Will appear as \"From: Unknown\"" @@ -697,7 +697,7 @@ msgstr "versie" #: ../../../uibase.cpp:563 msgid "" -"Copyright (c) 2009-2010 Satoshi Nakamoto.\n" +"Copyright (c) 2009-2010 Bitcoin Developers\n" "\n" "This is experimental software.\n" "\n" @@ -708,7 +708,7 @@ msgid "" "OpenSSL Toolkit (http://www.openssl.org/) and cryptographic software written by \n" "Eric Young (eay@cryptsoft.com)." msgstr "" -"Copyright (c) 2009-2010 Satoshi Nakamoto.\n" +"Copyright (c) 2009-2010 Bitcoin Developers\n" "\n" "Dit is experimentele software.\n" "\n" diff --git a/locale/pt/LC_MESSAGES/bitcoin.mo b/locale/pt/LC_MESSAGES/bitcoin.mo index e432d97ee..7c662c154 100644 Binary files a/locale/pt/LC_MESSAGES/bitcoin.mo and b/locale/pt/LC_MESSAGES/bitcoin.mo differ diff --git a/locale/pt/LC_MESSAGES/bitcoin.po b/locale/pt/LC_MESSAGES/bitcoin.po index 2e5ec5305..f37fef20f 100644 --- a/locale/pt/LC_MESSAGES/bitcoin.po +++ b/locale/pt/LC_MESSAGES/bitcoin.po @@ -319,8 +319,8 @@ msgstr "&Minimizar ao fechar" #: ../../../ui.cpp:1595 #, c-format -msgid "version %s%s beta" -msgstr "versão %s%s beta" +msgid "version %s%s BETA" +msgstr "versão %s%s BETA" #: ../../../ui.cpp:1681 msgid "Will appear as \"From: Unknown\"" @@ -696,7 +696,7 @@ msgstr "versão" #: ../../../uibase.cpp:563 msgid "" -"Copyright (c) 2009-2010 Satoshi Nakamoto.\n" +"Copyright (c) 2009-2010 Bitcoin Developers\n" "\n" "This is experimental software.\n" "\n" @@ -707,7 +707,7 @@ msgid "" "OpenSSL Toolkit (http://www.openssl.org/) and cryptographic software written by \n" "Eric Young (eay@cryptsoft.com)." msgstr "" -"Copyright (c) 2009-2010 Satoshi Nakamoto.\n" +"Copyright (c) 2009-2010 Bitcoin Developers\n" "\n" "Este software é experimental.\n" "\n" diff --git a/locale/ru/LC_MESSAGES/bitcoin.mo b/locale/ru/LC_MESSAGES/bitcoin.mo index 010e17493..4af3e0dfa 100644 Binary files a/locale/ru/LC_MESSAGES/bitcoin.mo and b/locale/ru/LC_MESSAGES/bitcoin.mo differ diff --git a/locale/ru/LC_MESSAGES/bitcoin.po b/locale/ru/LC_MESSAGES/bitcoin.po index b9ddd15af..1b893bfc4 100644 --- a/locale/ru/LC_MESSAGES/bitcoin.po +++ b/locale/ru/LC_MESSAGES/bitcoin.po @@ -383,7 +383,7 @@ msgstr "&Сворачивать при закрытии" #: ../../../ui.cpp:1798 #, c-format -msgid "version %s%s beta" +msgid "version %s%s BETA" msgstr "версия %s%s бета" #: ../../../ui.cpp:1884 @@ -760,7 +760,7 @@ msgstr "версия" #: ../../../uibase.cpp:557 msgid "" -"Copyright (c) 2009-2010 Satoshi Nakamoto.\n" +"Copyright (c) 2009-2010 Bitcoin Developers\n" "\n" "This is experimental software.\n" "\n" @@ -771,7 +771,7 @@ msgid "" "OpenSSL Toolkit (http://www.openssl.org/) and cryptographic software written by \n" "Eric Young (eay@cryptsoft.com)." msgstr "" -"Все права защищены (c) 2009-2010 Satoshi Nakamoto.\n" +"Все права защищены (c) 2009-2010 Bitcoin Developers\n" "\n" "Это экспериментальное ПО.\n" "\n" diff --git a/makefile.osx b/makefile.osx index 892417220..5c1ca6fba 100644 --- a/makefile.osx +++ b/makefile.osx @@ -1,4 +1,4 @@ -# Copyright (c) 2009-2010 Satoshi Nakamoto +# Copyright (c) 2010 Laszlo Hanyecz # Distributed under the MIT/X11 software license, see the accompanying # file license.txt or http://www.opensource.org/licenses/mit-license.php. diff --git a/serialize.h b/serialize.h index ad9fb9faa..e4c3bb0dd 100644 --- a/serialize.h +++ b/serialize.h @@ -25,7 +25,7 @@ class CDataStream; class CAutoFile; static const unsigned int MAX_SIZE = 0x02000000; -static const int VERSION = 31801; +static const int VERSION = 31900; static const char* pszSubVer = ""; diff --git a/setup.nsi b/setup.nsi index aee4a528a..a015bcb23 100644 --- a/setup.nsi +++ b/setup.nsi @@ -7,7 +7,7 @@ RequestExecutionLevel highest # General Symbol Definitions !define REGKEY "SOFTWARE\$(^Name)" -!define VERSION 0.3.18 +!define VERSION 0.3.19 !define COMPANY "Bitcoin project" !define URL http://www.bitcoin.org/ @@ -42,12 +42,12 @@ Var StartMenuGroup !insertmacro MUI_LANGUAGE English # Installer attributes -OutFile bitcoin-0.3.18-win32-setup.exe +OutFile bitcoin-0.3.19-win32-setup.exe InstallDir $PROGRAMFILES\Bitcoin CRCCheck on XPStyle on ShowInstDetails show -VIProductVersion 0.3.18.0 +VIProductVersion 0.3.19.0 VIAddVersionKey ProductName Bitcoin VIAddVersionKey ProductVersion "${VERSION}" VIAddVersionKey CompanyName "${COMPANY}" diff --git a/ui.cpp b/ui.cpp index bf436444b..677e6c2a7 100644 --- a/ui.cpp +++ b/ui.cpp @@ -1796,7 +1796,7 @@ void COptionsDialog::OnButtonApply(wxCommandEvent& event) CAboutDialog::CAboutDialog(wxWindow* parent) : CAboutDialogBase(parent) { - m_staticTextVersion->SetLabel(strprintf(_("version %s%s beta"), FormatVersion(VERSION).c_str(), pszSubVer)); + m_staticTextVersion->SetLabel(strprintf(_("version %s%s BETA"), FormatVersion(VERSION).c_str(), pszSubVer)); // Change (c) into UTF-8 or ANSI copyright symbol wxString str = m_staticTextMain->GetLabel(); diff --git a/uibase.cpp b/uibase.cpp index 7c889818d..9fe98993e 100644 --- a/uibase.cpp +++ b/uibase.cpp @@ -551,7 +551,7 @@ CAboutDialogBase::CAboutDialogBase( wxWindow* parent, wxWindowID id, const wxStr bSizer631->Add( 0, 4, 0, wxEXPAND, 5 ); - m_staticTextMain = new wxStaticText( this, wxID_ANY, _("Copyright (c) 2009-2010 Satoshi Nakamoto.\n\nThis is experimental software.\n\nDistributed under the MIT/X11 software license, see the accompanying file \nlicense.txt or http://www.opensource.org/licenses/mit-license.php.\n\nThis product includes software developed by the OpenSSL Project for use in the \nOpenSSL Toolkit (http://www.openssl.org/) and cryptographic software written by \nEric Young (eay@cryptsoft.com)."), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticTextMain = new wxStaticText( this, wxID_ANY, _("Copyright (c) 2009-2010 Bitcoin Developers\n\nThis is experimental software.\n\nDistributed under the MIT/X11 software license, see the accompanying file \nlicense.txt or http://www.opensource.org/licenses/mit-license.php.\n\nThis product includes software developed by the OpenSSL Project for use in the \nOpenSSL Toolkit (http://www.openssl.org/) and cryptographic software written by \nEric Young (eay@cryptsoft.com)."), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextMain->Wrap( -1 ); bSizer631->Add( m_staticTextMain, 0, wxALL, 5 ); diff --git a/uiproject.fbp b/uiproject.fbp index 976c5a72c..f3f9dc9fd 100644 --- a/uiproject.fbp +++ b/uiproject.fbp @@ -1488,7 +1488,7 @@ - + @@ -3140,7 +3140,7 @@ 0 wxID_ANY - Copyright (c) 2009-2010 Satoshi Nakamoto. This is experimental software. Distributed under the MIT/X11 software license, see the accompanying file license.txt or http://www.opensource.org/licenses/mit-license.php. This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit (http://www.openssl.org/) and cryptographic software written by Eric Young (eay@cryptsoft.com). + Copyright (c) 2009-2010 Bitcoin Developers This is experimental software. Distributed under the MIT/X11 software license, see the accompanying file license.txt or http://www.opensource.org/licenses/mit-license.php. This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit (http://www.openssl.org/) and cryptographic software written by Eric Young (eay@cryptsoft.com). m_staticTextMain