twisterarmy
/
twister-core
mirror of https://github.com/twisterarmy/twister-core.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Merge remote branch 'refs/remotes/svn/trunk' into svn

miguelfreitas
Gavin Andresen 14 years ago
parent
9c17a685bd fc73ad644f
commit
bc530fe89f
22 changed files with 38 additions and 38 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      build-osx.txt
  2. 2
      license.txt
  3. BIN
      locale/de/LC_MESSAGES/bitcoin.mo
  4. 8
      locale/de/LC_MESSAGES/bitcoin.po
  5. BIN
      locale/es/LC_MESSAGES/bitcoin.mo
  6. 8
      locale/es/LC_MESSAGES/bitcoin.po
  7. BIN
      locale/fr/LC_MESSAGES/bitcoin.mo
  8. 8
      locale/fr/LC_MESSAGES/bitcoin.po
  9. BIN
      locale/it/LC_MESSAGES/bitcoin.mo
  10. 8
      locale/it/LC_MESSAGES/bitcoin.po
  11. BIN
      locale/nl/LC_MESSAGES/bitcoin.mo
  12. 8
      locale/nl/LC_MESSAGES/bitcoin.po
  13. BIN
      locale/pt/LC_MESSAGES/bitcoin.mo
  14. 8
      locale/pt/LC_MESSAGES/bitcoin.po
  15. BIN
      locale/ru/LC_MESSAGES/bitcoin.mo
  16. 6
      locale/ru/LC_MESSAGES/bitcoin.po
  17. 2
      makefile.osx
  18. 2
      serialize.h
  19. 6
      setup.nsi
  20. 2
      ui.cpp
  21. 2
      uibase.cpp
  22. 4
      uiproject.fbp

2
build-osx.txt
Unescape View File

@ -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 Distributed under the MIT/X11 software license, see the accompanying
file license.txt or http://www.opensource.org/licenses/mit-license.php. file license.txt or http://www.opensource.org/licenses/mit-license.php.
This product includes software developed by the OpenSSL Project for use in This product includes software developed by the OpenSSL Project for use in

2
license.txt
Unescape View File

@ -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 Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal of this software and associated documentation files (the "Software"), to deal

BIN
locale/de/LC_MESSAGES/bitcoin.mo
View File

Binary file not shown.

8
locale/de/LC_MESSAGES/bitcoin.po
Unescape View File

@ -321,8 +321,8 @@ msgstr "Beim schließen &Minimieren"
#: ../../../ui.cpp:1595 #: ../../../ui.cpp:1595
#, c-format #, c-format
msgid "version %s%s beta" msgid "version %s%s BETA"
msgstr "Version %s%s Beta" msgstr "Version %s%s BETA"
#: ../../../ui.cpp:1681 #: ../../../ui.cpp:1681
msgid "Will appear as \"From: Unknown\"" msgid "Will appear as \"From: Unknown\""
@ -698,7 +698,7 @@ msgstr "Version"
#: ../../../uibase.cpp:563 #: ../../../uibase.cpp:563
msgid "" msgid ""
"Copyright (c) 2009-2010 Satoshi Nakamoto.\n" "Copyright (c) 2009-2010 Bitcoin Developers\n"
"\n" "\n"
"This is experimental software.\n" "This is experimental software.\n"
"\n" "\n"
@ -709,7 +709,7 @@ msgid ""
"OpenSSL Toolkit (http://www.openssl.org/) and cryptographic software written by \n" "OpenSSL Toolkit (http://www.openssl.org/) and cryptographic software written by \n"
"Eric Young (eay@cryptsoft.com)." "Eric Young (eay@cryptsoft.com)."
msgstr "" msgstr ""
"Copyright (c) 2009-2010 Satoshi Nakamoto.\n" "Copyright (c) 2009-2010 Bitcoin Developers\n"
"\n" "\n"
"Dies ist experimentelle Software.\n" "Dies ist experimentelle Software.\n"
"\n" "\n"

BIN
locale/es/LC_MESSAGES/bitcoin.mo
View File

Binary file not shown.

8
locale/es/LC_MESSAGES/bitcoin.po
Unescape View File

@ -350,8 +350,8 @@ msgstr "&Minimizar al cerrar"
#: ../../../ui.cpp:1610 #: ../../../ui.cpp:1610
#, c-format #, c-format
msgid "version %s%s beta" msgid "version %s%s BETA"
msgstr "version %s%s beta" msgstr "version %s%s BETA"
#: ../../../ui.cpp:1696 #: ../../../ui.cpp:1696
msgid "Will appear as \"From: Unknown\"" msgid "Will appear as \"From: Unknown\""
@ -727,7 +727,7 @@ msgstr "version"
#: ../../../uibase.cpp:557 #: ../../../uibase.cpp:557
msgid "" msgid ""
"Copyright (c) 2009-2010 Satoshi Nakamoto.\n" "Copyright (c) 2009-2010 Bitcoin Developers\n"
"\n" "\n"
"This is experimental software.\n" "This is experimental software.\n"
"\n" "\n"
@ -738,7 +738,7 @@ msgid ""
"OpenSSL Toolkit (http://www.openssl.org/) and cryptographic software written by \n" "OpenSSL Toolkit (http://www.openssl.org/) and cryptographic software written by \n"
"Eric Young (eay@cryptsoft.com)." "Eric Young (eay@cryptsoft.com)."
msgstr "" msgstr ""
"Copyright (c) 2009-2010 Satoshi Nakamoto.\n" "Copyright (c) 2009-2010 Bitcoin Developers\n"
"\n" "\n"
"Este es un software experimental.\n" "Este es un software experimental.\n"
"\n" "\n"

BIN
locale/fr/LC_MESSAGES/bitcoin.mo
View File

Binary file not shown.

8
locale/fr/LC_MESSAGES/bitcoin.po
Unescape View File

@ -351,8 +351,8 @@ msgstr "&Réduire à la fermeture"
#: ../../../ui.cpp:1610 #: ../../../ui.cpp:1610
#, c-format #, c-format
msgid "version %s%s beta" msgid "version %s%s BETA"
msgstr "version %s%s beta" msgstr "version %s%s BETA"
#: ../../../ui.cpp:1696 #: ../../../ui.cpp:1696
msgid "Will appear as \"From: Unknown\"" msgid "Will appear as \"From: Unknown\""
@ -730,7 +730,7 @@ msgstr "version"
#: ../../../uibase.cpp:557 #: ../../../uibase.cpp:557
msgid "" msgid ""
"Copyright (c) 2009-2010 Satoshi Nakamoto.\n" "Copyright (c) 2009-2010 Bitcoin Developers\n"
"\n" "\n"
"This is experimental software.\n" "This is experimental software.\n"
"\n" "\n"
@ -741,7 +741,7 @@ msgid ""
"OpenSSL Toolkit (http://www.openssl.org/) and cryptographic software written by \n" "OpenSSL Toolkit (http://www.openssl.org/) and cryptographic software written by \n"
"Eric Young (eay@cryptsoft.com)." "Eric Young (eay@cryptsoft.com)."
msgstr "" msgstr ""
"Copyright (c) 2009-2010 Satoshi Nakamoto.\n" "Copyright (c) 2009-2010 Bitcoin Developers\n"
"\n" "\n"
"Ceci est un logiciel expérimental.\n" "Ceci est un logiciel expérimental.\n"
"\n" "\n"

BIN
locale/it/LC_MESSAGES/bitcoin.mo
View File

Binary file not shown.

8
locale/it/LC_MESSAGES/bitcoin.po
Unescape View File

@ -319,8 +319,8 @@ msgstr "&Minimizza se chiuso"
#: ../../../ui.cpp:1595 #: ../../../ui.cpp:1595
#, c-format #, c-format
msgid "version %s%s beta" msgid "version %s%s BETA"
msgstr "versione %s%s beta" msgstr "versione %s%s BETA"
#: ../../../ui.cpp:1681 #: ../../../ui.cpp:1681
msgid "Will appear as \"From: Unknown\"" msgid "Will appear as \"From: Unknown\""
@ -696,7 +696,7 @@ msgstr "versione"
#: ../../../uibase.cpp:563 #: ../../../uibase.cpp:563
msgid "" msgid ""
"Copyright (c) 2009-2010 Satoshi Nakamoto.\n" "Copyright (c) 2009-2010 Bitcoin Developers\n"
"\n" "\n"
"This is experimental software.\n" "This is experimental software.\n"
"\n" "\n"
@ -707,7 +707,7 @@ msgid ""
"OpenSSL Toolkit (http://www.openssl.org/) and cryptographic software written by \n" "OpenSSL Toolkit (http://www.openssl.org/) and cryptographic software written by \n"
"Eric Young (eay@cryptsoft.com)." "Eric Young (eay@cryptsoft.com)."
msgstr "" msgstr ""
"Copyright (c) 2009-2010 Satoshi Nakamoto.\n" "Copyright (c) 2009-2010 Bitcoin Developers\n"
"\n" "\n"
"Questo è un software sperimentale.\n" "Questo è un software sperimentale.\n"
"\n" "\n"

BIN
locale/nl/LC_MESSAGES/bitcoin.mo
View File

Binary file not shown.

8
locale/nl/LC_MESSAGES/bitcoin.po
Unescape View File

@ -320,8 +320,8 @@ msgstr "&Minimalizeer bij sluiten"
#: ../../../ui.cpp:1595 #: ../../../ui.cpp:1595
#, c-format #, c-format
msgid "version %s%s beta" msgid "version %s%s BETA"
msgstr "versie %s%s beta" msgstr "versie %s%s BETA"
#: ../../../ui.cpp:1681 #: ../../../ui.cpp:1681
msgid "Will appear as \"From: Unknown\"" msgid "Will appear as \"From: Unknown\""
@ -697,7 +697,7 @@ msgstr "versie"
#: ../../../uibase.cpp:563 #: ../../../uibase.cpp:563
msgid "" msgid ""
"Copyright (c) 2009-2010 Satoshi Nakamoto.\n" "Copyright (c) 2009-2010 Bitcoin Developers\n"
"\n" "\n"
"This is experimental software.\n" "This is experimental software.\n"
"\n" "\n"
@ -708,7 +708,7 @@ msgid ""
"OpenSSL Toolkit (http://www.openssl.org/) and cryptographic software written by \n" "OpenSSL Toolkit (http://www.openssl.org/) and cryptographic software written by \n"
"Eric Young (eay@cryptsoft.com)." "Eric Young (eay@cryptsoft.com)."
msgstr "" msgstr ""
"Copyright (c) 2009-2010 Satoshi Nakamoto.\n" "Copyright (c) 2009-2010 Bitcoin Developers\n"
"\n" "\n"
"Dit is experimentele software.\n" "Dit is experimentele software.\n"
"\n" "\n"

BIN
locale/pt/LC_MESSAGES/bitcoin.mo
View File

Binary file not shown.

8
locale/pt/LC_MESSAGES/bitcoin.po
Unescape View File

@ -319,8 +319,8 @@ msgstr "&Minimizar ao fechar"
#: ../../../ui.cpp:1595 #: ../../../ui.cpp:1595
#, c-format #, c-format
msgid "version %s%s beta" msgid "version %s%s BETA"
msgstr "versão %s%s beta" msgstr "versão %s%s BETA"
#: ../../../ui.cpp:1681 #: ../../../ui.cpp:1681
msgid "Will appear as \"From: Unknown\"" msgid "Will appear as \"From: Unknown\""
@ -696,7 +696,7 @@ msgstr "versão"
#: ../../../uibase.cpp:563 #: ../../../uibase.cpp:563
msgid "" msgid ""
"Copyright (c) 2009-2010 Satoshi Nakamoto.\n" "Copyright (c) 2009-2010 Bitcoin Developers\n"
"\n" "\n"
"This is experimental software.\n" "This is experimental software.\n"
"\n" "\n"
@ -707,7 +707,7 @@ msgid ""
"OpenSSL Toolkit (http://www.openssl.org/) and cryptographic software written by \n" "OpenSSL Toolkit (http://www.openssl.org/) and cryptographic software written by \n"
"Eric Young (eay@cryptsoft.com)." "Eric Young (eay@cryptsoft.com)."
msgstr "" msgstr ""
"Copyright (c) 2009-2010 Satoshi Nakamoto.\n" "Copyright (c) 2009-2010 Bitcoin Developers\n"
"\n" "\n"
"Este software é experimental.\n" "Este software é experimental.\n"
"\n" "\n"

BIN
locale/ru/LC_MESSAGES/bitcoin.mo
View File

Binary file not shown.

6
locale/ru/LC_MESSAGES/bitcoin.po
Unescape View File

@ -383,7 +383,7 @@ msgstr "&Сворачивать при закрытии"
#: ../../../ui.cpp:1798 #: ../../../ui.cpp:1798
#, c-format #, c-format
msgid "version %s%s beta" msgid "version %s%s BETA"
msgstr "версия %s%s бета" msgstr "версия %s%s бета"
#: ../../../ui.cpp:1884 #: ../../../ui.cpp:1884
@ -760,7 +760,7 @@ msgstr "версия"
#: ../../../uibase.cpp:557 #: ../../../uibase.cpp:557
msgid "" msgid ""
"Copyright (c) 2009-2010 Satoshi Nakamoto.\n" "Copyright (c) 2009-2010 Bitcoin Developers\n"
"\n" "\n"
"This is experimental software.\n" "This is experimental software.\n"
"\n" "\n"
@ -771,7 +771,7 @@ msgid ""
"OpenSSL Toolkit (http://www.openssl.org/) and cryptographic software written by \n" "OpenSSL Toolkit (http://www.openssl.org/) and cryptographic software written by \n"
"Eric Young (eay@cryptsoft.com)." "Eric Young (eay@cryptsoft.com)."
msgstr "" msgstr ""
"Все права защищены (c) 2009-2010 Satoshi Nakamoto.\n" "Все права защищены (c) 2009-2010 Bitcoin Developers\n"
"\n" "\n"
"Это экспериментальное ПО.\n" "Это экспериментальное ПО.\n"
"\n" "\n"

2
makefile.osx vendored
Unescape View File

@ -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 # Distributed under the MIT/X11 software license, see the accompanying
# file license.txt or http://www.opensource.org/licenses/mit-license.php. # file license.txt or http://www.opensource.org/licenses/mit-license.php.

2
serialize.h
Unescape View File

@ -25,7 +25,7 @@ class CDataStream;
class CAutoFile; class CAutoFile;
static const unsigned int MAX_SIZE = 0x02000000; static const unsigned int MAX_SIZE = 0x02000000;
static const int VERSION = 31801; static const int VERSION = 31900;
static const char* pszSubVer = ""; static const char* pszSubVer = "";

6
setup.nsi
Unescape View File

@ -7,7 +7,7 @@ RequestExecutionLevel highest
# General Symbol Definitions # General Symbol Definitions
!define REGKEY "SOFTWARE\$(^Name)" !define REGKEY "SOFTWARE\$(^Name)"
!define VERSION 0.3.18 !define VERSION 0.3.19
!define COMPANY "Bitcoin project" !define COMPANY "Bitcoin project"
!define URL http://www.bitcoin.org/ !define URL http://www.bitcoin.org/
@ -42,12 +42,12 @@ Var StartMenuGroup
!insertmacro MUI_LANGUAGE English !insertmacro MUI_LANGUAGE English
# Installer attributes # Installer attributes
OutFile bitcoin-0.3.18-win32-setup.exe OutFile bitcoin-0.3.19-win32-setup.exe
InstallDir $PROGRAMFILES\Bitcoin InstallDir $PROGRAMFILES\Bitcoin
CRCCheck on CRCCheck on
XPStyle on XPStyle on
ShowInstDetails show ShowInstDetails show
VIProductVersion 0.3.18.0 VIProductVersion 0.3.19.0
VIAddVersionKey ProductName Bitcoin VIAddVersionKey ProductName Bitcoin
VIAddVersionKey ProductVersion "${VERSION}" VIAddVersionKey ProductVersion "${VERSION}"
VIAddVersionKey CompanyName "${COMPANY}" VIAddVersionKey CompanyName "${COMPANY}"

2
ui.cpp
Unescape View File

@ -1796,7 +1796,7 @@ void COptionsDialog::OnButtonApply(wxCommandEvent& event)
CAboutDialog::CAboutDialog(wxWindow* parent) : CAboutDialogBase(parent) 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 // Change (c) into UTF-8 or ANSI copyright symbol
wxString str = m_staticTextMain->GetLabel(); wxString str = m_staticTextMain->GetLabel();

2
uibase.cpp
Unescape View File

@ -551,7 +551,7 @@ CAboutDialogBase::CAboutDialogBase( wxWindow* parent, wxWindowID id, const wxStr
bSizer631->Add( 0, 4, 0, wxEXPAND, 5 ); 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 ); m_staticTextMain->Wrap( -1 );
bSizer631->Add( m_staticTextMain, 0, wxALL, 5 ); bSizer631->Add( m_staticTextMain, 0, wxALL, 5 );

4
uiproject.fbp
Unescape View File

@ -1488,7 +1488,7 @@
</object> </object>
</object> </object>
</object> </object>
<object class="Dialog" expanded="1"> <object class="Dialog" expanded="0">
<property name="bg"></property> <property name="bg"></property>
<property name="center"></property> <property name="center"></property>
<property name="context_help"></property> <property name="context_help"></property>
@ -3140,7 +3140,7 @@
<property name="font"></property> <property name="font"></property>
<property name="hidden">0</property> <property name="hidden">0</property>
<property name="id">wxID_ANY</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 (eay@cryptsoft.com).</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 (eay@cryptsoft.com).</property>
<property name="maximum_size"></property> <property name="maximum_size"></property>
<property name="minimum_size"></property> <property name="minimum_size"></property>
<property name="name">m_staticTextMain</property> <property name="name">m_staticTextMain</property>

Write Preview
Loading…
Cancel
Save