sikkienl/dash
1
0
Fork 0
mirror of https://github.com/dashpay/dash.git synced 2024-12-28 13:32:47 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/bitcoin/bitcoin

Browse Source
This commit is contained in:
Wladimir J. van der Laan 2011-07-22 21:41:24 +02:00
commit 7beada58cd
6 changed files with 561 additions and 449 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

Binary file not shown.

994
locale/de/LC_MESSAGES/bitcoin.po
View File

File diff suppressed because it is too large Load Diff

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

Binary file not shown.

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

@ -3,8 +3,8 @@ msgstr ""
"Project-Id-Version: \n" "Project-Id-Version: \n"
"Report-Msgid-Bugs-To: m0Ray <m0ray@nm.ru>\n" "Report-Msgid-Bugs-To: m0Ray <m0ray@nm.ru>\n"
"POT-Creation-Date: 2011-05-15 18:24+0100\n" "POT-Creation-Date: 2011-05-15 18:24+0100\n"
"PO-Revision-Date: 2011-05-23 07:06+0500\n" "PO-Revision-Date: 2011-07-17 04:18+0100\n"
"Last-Translator: m0Ray <m0ray@nm.ru>\n" "Last-Translator: Michael Bemmerl <mail@mx-server.de>\n"
"Language-Team: \n" "Language-Team: \n"
"Language: \n" "Language: \n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
@ -448,7 +448,7 @@ msgstr "&Открыть Bitcoin"
#: ../../../src/ui.cpp:2682 #: ../../../src/ui.cpp:2682
msgid "&Send Bitcoins" msgid "&Send Bitcoins"
msgstr "&Открыть Bitcoin" msgstr "&Отправить Bitcoins"
#: ../../../src/ui.cpp:2683 #: ../../../src/ui.cpp:2683
msgid "O&ptions..." msgid "O&ptions..."

1
src/main.cpp
View File

@ -2574,6 +2574,7 @@ bool SendMessages(CNode* pto, bool fSendTrickle)
vGetData.clear(); vGetData.clear();
} }
} }
mapAlreadyAskedFor[inv] = nNow;
pto->mapAskFor.erase(pto->mapAskFor.begin()); pto->mapAskFor.erase(pto->mapAskFor.begin());
} }
if (!vGetData.empty()) if (!vGetData.empty())

9
src/makefile.vc
View File

@ -41,12 +41,12 @@ DEFS=$(DEFS) /DUSE_UPNP=$(USE_UPNP)
!ENDIF !ENDIF
LIBS=$(LIBS) \ LIBS=$(LIBS) \
kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib ws2_32.lib shlwapi.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib ws2_32.lib shlwapi.lib iphlpapi.lib
DEBUGFLAGS=/Os DEBUGFLAGS=/Os
CFLAGS=/MD /c /nologo /EHsc /GR /Zm300 $(DEBUGFLAGS) $(DEFS) $(INCLUDEPATHS) CFLAGS=/MD /c /nologo /EHsc /GR /Zm300 $(DEBUGFLAGS) $(DEFS) $(INCLUDEPATHS)
HEADERS=headers.h strlcpy.h serialize.h uint256.h util.h key.h bignum.h base58.h \ HEADERS=headers.h strlcpy.h serialize.h uint256.h util.h key.h bignum.h base58.h \
script.h db.h net.h irc.h main.h rpc.h uibase.h ui.h noui.h init.h wallet.h keystore.h script.h db.h net.h irc.h main.h rpc.h uibase.h ui.h noui.h init.h wallet.h keystore.h crypter.h
OBJS= \ OBJS= \
obj\util.obj \ obj\util.obj \
@ -58,7 +58,8 @@ OBJS= \
obj\main.obj \ obj\main.obj \
obj\wallet.obj \ obj\wallet.obj \
obj\rpc.obj \ obj\rpc.obj \
obj\init.obj obj\init.obj \
obj\crypter.obj
CRYPTOPP_OBJS= \ CRYPTOPP_OBJS= \
cryptopp\obj\sha.obj \ cryptopp\obj\sha.obj \
@ -93,6 +94,8 @@ obj\rpc.obj: $(HEADERS)
obj\init.obj: $(HEADERS) obj\init.obj: $(HEADERS)
obj\crypter.obj: $(HEADERS)
obj\ui.obj: $(HEADERS) obj\ui.obj: $(HEADERS)
obj\uibase.obj: $(HEADERS) obj\uibase.obj: $(HEADERS)