Skip to content

Commit

Permalink
-- version 0.3.19 release
Browse files Browse the repository at this point in the history
git-svn-id: https://bitcoin.svn.sourceforge.net/svnroot/bitcoin/trunk@201 1a98c847-1fd6-4fd8-948a-caf3550aa51b
  • Loading branch information
non-github-bitcoin committed Dec 13, 2010
1 parent 986b5e2 commit fc73ad6
Show file tree
Hide file tree
Showing 22 changed files with 38 additions and 38 deletions.
2 changes: 1 addition & 1 deletion build-osx.txt
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion license.txt
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Binary file modified locale/de/LC_MESSAGES/bitcoin.mo
Binary file not shown.
8 changes: 4 additions & 4 deletions locale/de/LC_MESSAGES/bitcoin.po
Original file line number Diff line number Diff line change
Expand Up @@ -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\""
Expand Down Expand Up @@ -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"
Expand All @@ -709,7 +709,7 @@ msgid ""
"OpenSSL Toolkit (http://www.openssl.org/) and cryptographic software written by \n"
"Eric Young ([email protected])."
msgstr ""
"Copyright (c) 2009-2010 Satoshi Nakamoto.\n"
"Copyright (c) 2009-2010 Bitcoin Developers\n"
"\n"
"Dies ist experimentelle Software.\n"
"\n"
Expand Down
Binary file modified locale/es/LC_MESSAGES/bitcoin.mo
Binary file not shown.
8 changes: 4 additions & 4 deletions locale/es/LC_MESSAGES/bitcoin.po
Original file line number Diff line number Diff line change
Expand Up @@ -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\""
Expand Down Expand Up @@ -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"
Expand All @@ -738,7 +738,7 @@ msgid ""
"OpenSSL Toolkit (http://www.openssl.org/) and cryptographic software written by \n"
"Eric Young ([email protected])."
msgstr ""
"Copyright (c) 2009-2010 Satoshi Nakamoto.\n"
"Copyright (c) 2009-2010 Bitcoin Developers\n"
"\n"
"Este es un software experimental.\n"
"\n"
Expand Down
Binary file modified locale/fr/LC_MESSAGES/bitcoin.mo
Binary file not shown.
8 changes: 4 additions & 4 deletions locale/fr/LC_MESSAGES/bitcoin.po
Original file line number Diff line number Diff line change
Expand Up @@ -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\""
Expand Down Expand Up @@ -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"
Expand All @@ -741,7 +741,7 @@ msgid ""
"OpenSSL Toolkit (http://www.openssl.org/) and cryptographic software written by \n"
"Eric Young ([email protected])."
msgstr ""
"Copyright (c) 2009-2010 Satoshi Nakamoto.\n"
"Copyright (c) 2009-2010 Bitcoin Developers\n"
"\n"
"Ceci est un logiciel expérimental.\n"
"\n"
Expand Down
Binary file modified locale/it/LC_MESSAGES/bitcoin.mo
Binary file not shown.
8 changes: 4 additions & 4 deletions locale/it/LC_MESSAGES/bitcoin.po
Original file line number Diff line number Diff line change
Expand Up @@ -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\""
Expand Down Expand Up @@ -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"
Expand All @@ -707,7 +707,7 @@ msgid ""
"OpenSSL Toolkit (http://www.openssl.org/) and cryptographic software written by \n"
"Eric Young ([email protected])."
msgstr ""
"Copyright (c) 2009-2010 Satoshi Nakamoto.\n"
"Copyright (c) 2009-2010 Bitcoin Developers\n"
"\n"
"Questo è un software sperimentale.\n"
"\n"
Expand Down
Binary file modified locale/nl/LC_MESSAGES/bitcoin.mo
Binary file not shown.
8 changes: 4 additions & 4 deletions locale/nl/LC_MESSAGES/bitcoin.po
Original file line number Diff line number Diff line change
Expand Up @@ -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\""
Expand Down Expand Up @@ -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"
Expand All @@ -708,7 +708,7 @@ msgid ""
"OpenSSL Toolkit (http://www.openssl.org/) and cryptographic software written by \n"
"Eric Young ([email protected])."
msgstr ""
"Copyright (c) 2009-2010 Satoshi Nakamoto.\n"
"Copyright (c) 2009-2010 Bitcoin Developers\n"
"\n"
"Dit is experimentele software.\n"
"\n"
Expand Down
Binary file modified locale/pt/LC_MESSAGES/bitcoin.mo
Binary file not shown.
8 changes: 4 additions & 4 deletions locale/pt/LC_MESSAGES/bitcoin.po
Original file line number Diff line number Diff line change
Expand Up @@ -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\""
Expand Down Expand Up @@ -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"
Expand All @@ -707,7 +707,7 @@ msgid ""
"OpenSSL Toolkit (http://www.openssl.org/) and cryptographic software written by \n"
"Eric Young ([email protected])."
msgstr ""
"Copyright (c) 2009-2010 Satoshi Nakamoto.\n"
"Copyright (c) 2009-2010 Bitcoin Developers\n"
"\n"
"Este software é experimental.\n"
"\n"
Expand Down
Binary file modified locale/ru/LC_MESSAGES/bitcoin.mo
Binary file not shown.
6 changes: 3 additions & 3 deletions locale/ru/LC_MESSAGES/bitcoin.po
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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"
Expand All @@ -771,7 +771,7 @@ msgid ""
"OpenSSL Toolkit (http://www.openssl.org/) and cryptographic software written by \n"
"Eric Young ([email protected])."
msgstr ""
"Все права защищены (c) 2009-2010 Satoshi Nakamoto.\n"
"Все права защищены (c) 2009-2010 Bitcoin Developers\n"
"\n"
"Это экспериментальное ПО.\n"
"\n"
Expand Down
2 changes: 1 addition & 1 deletion makefile.osx
Original file line number Diff line number Diff line change
@@ -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.

Expand Down
2 changes: 1 addition & 1 deletion serialize.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 = "";


Expand Down
6 changes: 3 additions & 3 deletions setup.nsi
Original file line number Diff line number Diff line change
Expand Up @@ -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/

Expand Down Expand Up @@ -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}"
Expand Down
2 changes: 1 addition & 1 deletion ui.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
2 changes: 1 addition & 1 deletion uibase.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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 ([email protected])."), 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 ([email protected])."), wxDefaultPosition, wxDefaultSize, 0 );
m_staticTextMain->Wrap( -1 );
bSizer631->Add( m_staticTextMain, 0, wxALL, 5 );

Expand Down
4 changes: 2 additions & 2 deletions uiproject.fbp
Original file line number Diff line number Diff line change
Expand Up @@ -1488,7 +1488,7 @@
</object>
</object>
</object>
<object class="Dialog" expanded="1">
<object class="Dialog" expanded="0">
<property name="bg"></property>
<property name="center"></property>
<property name="context_help"></property>
Expand Down Expand Up @@ -3140,7 +3140,7 @@
<property name="font"></property>
<property name="hidden">0</property>
<property name="id">wxID_ANY</property>
<property name="label">Copyright (c) 2009-2010 Satoshi Nakamoto.&#x0A;&#x0A;This is experimental software.&#x0A;&#x0A;Distributed under the MIT/X11 software license, see the accompanying file &#x0A;license.txt or http://www.opensource.org/licenses/mit-license.php.&#x0A;&#x0A;This product includes software developed by the OpenSSL Project for use in the &#x0A;OpenSSL Toolkit (http://www.openssl.org/) and cryptographic software written by &#x0A;Eric Young ([email protected]).</property>
<property name="label">Copyright (c) 2009-2010 Bitcoin Developers&#x0A;&#x0A;This is experimental software.&#x0A;&#x0A;Distributed under the MIT/X11 software license, see the accompanying file &#x0A;license.txt or http://www.opensource.org/licenses/mit-license.php.&#x0A;&#x0A;This product includes software developed by the OpenSSL Project for use in the &#x0A;OpenSSL Toolkit (http://www.openssl.org/) and cryptographic software written by &#x0A;Eric Young ([email protected]).</property>
<property name="maximum_size"></property>
<property name="minimum_size"></property>
<property name="name">m_staticTextMain</property>
Expand Down

0 comments on commit fc73ad6

Please sign in to comment.