Merge pull request #66 from iglvzx/iglvzx

very proof reading
This commit is contained in:
dogecoin 2013-12-30 17:50:41 -08:00
commit cd8fc46ef6
16 changed files with 64 additions and 58 deletions

View file

@ -1,6 +1,6 @@
Copyright (c) 2009-2012 Bitcoin Developers
Copyright (c) 2011-2012 Litecoin Developers
Copyright (c) 2013 DogeCoin Developers
Copyright (c) 2013 Dogecoin 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

View file

@ -1,9 +1,9 @@
Building DogeCoin
Building Dogecoin
See doc/readme-qt.rst for instructions on building DogeCoin-QT,
See doc/readme-qt.rst for instructions on building Dogecoin-QT,
the intended-for-end-users, nice-graphical-interface, reference
implementation of DogeCoin.
implementation of Dogecoin.
See doc/build-*.txt for instructions on building dogecoind,
the intended-for-services, no-graphical-interface, reference
implementation of DogeCoin.
implementation of Dogecoin.

View file

@ -1,4 +1,4 @@
# DogeCoin [DOGE, Ð]
# Dogecoin [DOGE, Ð]
http://dogecoin.com/
![DogeCoin](http://static.tumblr.com/ppdj5y9/Ae9mxmxtp/300coin.png)
@ -27,17 +27,17 @@ Scrypt Proof of Work
Special reward system: Random block rewards
1-100,000: 0-1,000,000 DogeCoin Reward
1-100,000: 0-1,000,000 Dogecoin Reward
100,001 — 200,000: 0-500,000 DogeCoin Reward
100,001 — 200,000: 0-500,000 Dogecoin Reward
200,001 — 300,000: 0-250,000 DogeCoin Reward
200,001 — 300,000: 0-250,000 Dogecoin Reward
300,001 — 400,000: 0-125,000 DogeCoin Reward
300,001 — 400,000: 0-125,000 Dogecoin Reward
400,001 — 500,000: 0-62,500 DogeCoin Reward
400,001 — 500,000: 0-62,500 Dogecoin Reward
500,001 - 600,000: 0-31,250 DogeCoin Reward
500,001 - 600,000: 0-31,250 Dogecoin Reward
600,000+ — 10,000 Reward (flat)

View file

@ -1,8 +1,8 @@
DogeCoin 0.6.3 BETA
Dogecoin 0.6.3 BETA
Copyright (c) 2009-2012 Bitcoin Developers
Copyright (c) 2011-2012 Litecoin Developers
Copyright (c) 2013 DogeCoin Developers
Copyright (c) 2013 Dogecoin Developers
Distributed under the MIT/X11 software license, see the accompanying
file COPYING or http://www.opensource.org/licenses/mit-license.php.
@ -13,7 +13,7 @@ cryptographic software written by Eric Young (eay@cryptsoft.com).
Intro
-----
DogeCoin is a free open source peer-to-peer electronic cash system that is
Dogecoin is a free open source peer-to-peer electronic cash system that is
completely decentralized, without the need for a central server or trusted
parties. Users hold the crypto keys to their own money and transact directly
with each other, with the help of a P2P network to check for double-spending.

View file

@ -1,7 +1,9 @@
Litecoin 0.6 BETA
Dogecoin 0.6 BETA
Copyright (c) 2009-2012 Bitcoin Developers
Copyright (c) 2011-2012 Litecoin Developers
Copyright (c) 2013 Dogecoin Developers
Distributed under the MIT/X11 software license, see the accompanying
file COPYING or http://www.opensource.org/licenses/mit-license.php.
This product includes software developed by the OpenSSL Project for use in
@ -11,7 +13,7 @@ cryptographic software written by Eric Young (eay@cryptsoft.com).
Intro
-----
Litecoin is a free open source peer-to-peer electronic cash system that is
Dogecoin is a free open source peer-to-peer electronic cash system that is
completely decentralized, without the need for a central server or trusted
parties. Users hold the crypto keys to their own money and transact directly
with each other, with the help of a P2P network to check for double-spending.
@ -19,17 +21,17 @@ with each other, with the help of a P2P network to check for double-spending.
Setup
-----
Unpack the files into a directory and run litecoin-qt.exe.
Unpack the files into a directory and run dogecoin-qt.exe.
If you have Microsoft Security Essentials, you need to add litecoin-qt.exe to its
If you have Microsoft Security Essentials, you need to add dogecoin-qt.exe to its
"Excluded processes" list. Microsoft Security Essentials->Settings tab,
select Excluded processes, press Add, select litecoin-qt.exe, OK, Save changes.
select Excluded processes, press Add, select dogecoin-qt.exe, OK, Save changes.
The software automatically finds other nodes to connect to. You can
enable Universal Plug and Play using a menu entry or set your firewall
to forward port 9333 (TCP) to your computer so you can receive
incoming connections. Litecoin works without incoming connections,
but allowing incoming connections helps the Litecoin network.
incoming connections. Dogecoin works without incoming connections,
but allowing incoming connections helps the Dogecoin network.
See the bitcoin wiki at:
https://en.bitcoin.it/wiki/Main_Page

View file

@ -1,7 +1,7 @@
TOR SUPPORT IN BITCOIN
TOR SUPPORT IN DOGECOIN
======================
It is possible to run Bitcoin as a Tor hidden service, and connect to such services.
It is possible to run Dogecoin as a Tor hidden service, and connect to such services.
The following assumes you have a Tor proxy running on port 9050. Many distributions
default to having a SOCKS proxy listening on port 9050, but others may not.
@ -10,11 +10,11 @@ https://www.torproject.org/docs/faq.html.en#TBBSocksPort for how to properly
configure Tor.
1. Run bitcoin behind a Tor proxy
1. Run dogecoin behind a Tor proxy
---------------------------------
The first step is running Bitcoin behind a Tor proxy. This will already make all
outgoing connections be anonimized, but more is possible.
The first step is running Dogecoin behind a Tor proxy. This will already make all
outgoing connections be anonymized, but more is possible.
-socks=5 SOCKS5 supports connecting-to-hostname, which can be used instead
of doing a (leaking) local DNS lookup. SOCKS5 is the default,
@ -43,26 +43,26 @@ outgoing connections be anonimized, but more is possible.
In a typical situation, this suffices to run behind a Tor proxy:
./bitcoin -proxy=127.0.0.1:9050
./dogecoind -proxy=127.0.0.1:9050
2. Run a bitcoin hidden server
2. Run a dogecoin hidden server
------------------------------
If you configure your Tor system accordingly, it is possible to make your node also
reachable from the Tor network. Add these lines to your /etc/tor/torrc (or equivalent
config file):
HiddenServiceDir /var/lib/tor/bitcoin-service/
HiddenServiceDir /var/lib/tor/dogecoin-service/
HiddenServicePort 9333 127.0.0.1:9333
The directory can be different of course, but (both) 9333's should be equal to your
bitcoind's P2P listen port (9333 by default).
dogecoind's P2P listen port (9333 by default).
-externalip=X You can tell bitcoin about its publicly reachable address using
-externalip=X You can tell dogecoin about its publicly reachable address using
this option, and this can be a .onion address. Given the above
configuration, you can find your onion address in
/var/lib/tor/bitcoin-service/hostname. Onion addresses are given
/var/lib/tor/dogecoin-service/hostname. Onion addresses are given
preference for your node to advertize itself with, for connections
coming from unroutable addresses (such as 127.0.0.1, where the
Tor proxy typically runs).
@ -79,18 +79,17 @@ bitcoind's P2P listen port (9333 by default).
In a typical situation, where you're only reachable via Tor, this should suffice:
./bitcoind -proxy=127.0.0.1:9050 -externalip=57qr3yd1nyntf5k.onion -listen
./dogecoind -proxy=127.0.0.1:9050 -externalip=57qr3yd1nyntf5k.onion -listen
(obviously replace the Onion address with your own). If you don't care too much
about hiding your node, and want to be reachable on IPv4 as well, additionally
specify:
./bitcoind ... -discover
./dogecoind ... -discover
and open port 9333 on your firewall (or use -upnp).
If you only want to use Tor to reach onion addresses, but not use it as a proxy
for normal IPv4/IPv6 communication, use:
./bitcoin -tor=127.0.0.1:9050 -externalip=57qr3yd1nyntf5k.onion -discover
./dogecoind -tor=127.0.0.1:9050 -externalip=57qr3yd1nyntf5k.onion -discover

View file

@ -1,5 +1,7 @@
Copyright (c) 2009-2012 Bitcoin Developers
Copyright (c) 2011-2012 Litecoin Developers
Copyright (c) 2013 Dogecoin Developers
Distributed under the MIT/X11 software license, see the accompanying
file COPYING or http://www.opensource.org/licenses/mit-license.php.
This product includes software developed by the OpenSSL Project for use in
@ -8,7 +10,7 @@ cryptographic software written by Eric Young (eay@cryptsoft.com) and UPnP
software written by Thomas Bernard.
See readme-qt.rst for instructions on building Litecoin-QT, the
See readme-qt.rst for instructions on building Dogecoin-QT, the
graphical user interface.
WINDOWS BUILD NOTES
@ -77,9 +79,9 @@ make -f Makefile.mingw
mkdir miniupnpc
cp *.h miniupnpc/
Litecoin
Dogecoin
-------
DOS prompt:
cd \litecoin\src
cd \dogecoin\src
mingw32-make -f makefile.mingw
strip litecoind.exe
strip dogecoind.exe

View file

@ -1,5 +1,7 @@
Copyright (c) 2009-2012 Bitcoin Developers
Copyright (c) 2011-2012 Litecoin Developers
Copyright (c) 2013 Dogecoin Developers
Distributed under the MIT/X11 software license, see the accompanying
file COPYING or http://www.opensource.org/licenses/mit-license.php.
This product includes software developed by the OpenSSL Project for use in

View file

@ -1,6 +1,7 @@
Copyright (c) 2009-2012 Bitcoin Developers
Copyright (c) 2011-2012 Litecoin Developers
Copyright (c) 2013 Dogecoin Developers
Distributed under the MIT/X11 software license, see the accompanying
file COPYING or http://www.opensource.org/licenses/mit-license.php.
This product includes software developed by the OpenSSL Project for use in

View file

@ -90,7 +90,7 @@ in 500ms.
ThreadRPCServer : Remote procedure call handler, listens on port 9332
for connections and services them.
ThreadBitcoinMiner : Generates litecoins
ThreadBitcoinMiner : Generates dogecoins
ThreadMapPort : Universal plug-and-play startup/shutdown

View file

@ -7,7 +7,7 @@ handle those translations.
Files and Folders
-----------------
### bitcoin-qt.pro
### dogecoin-qt.pro
This file takes care of generating `.qm` files from `.ts` files. It is mostly
automated.

View file

@ -11,7 +11,7 @@
</rect>
</property>
<property name="windowTitle">
<string>About DogeCoin</string>
<string>About Dogecoin</string>
</property>
<layout class="QHBoxLayout" name="horizontalLayout_2">
<item>
@ -50,7 +50,7 @@
<cursorShape>IBeamCursor</cursorShape>
</property>
<property name="text">
<string>&lt;b&gt;DogeCoin&lt;/b&gt; version</string>
<string>&lt;b&gt;Dogecoin&lt;/b&gt; version</string>
</property>
<property name="textInteractionFlags">
<set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>
@ -97,7 +97,7 @@
<string>
Copyright © 2009-2012 Bitcoin Developers
Copyright © 2011-2012 Litecoin Developers
Copyright © 2013 DogeCoin Developers
Copyright © 2013 Dogecoin Developers
This is experimental software.

View file

@ -17,7 +17,7 @@
<item>
<widget class="QLabel" name="labelExplanation">
<property name="text">
<string>These are your DogeCoin addresses for receiving payments. You may want to give a different one to each sender so you can keep track of who is paying you.</string>
<string>These are your Dogecoin addresses for receiving payments. You may want to give a different one to each sender so you can keep track of who is paying you.</string>
</property>
<property name="textFormat">
<enum>Qt::PlainText</enum>

View file

@ -79,10 +79,10 @@
<item>
<widget class="QCheckBox" name="bitcoinAtStartup">
<property name="toolTip">
<string>Automatically start DogeCoin after logging in to the system.</string>
<string>Automatically start Dogecoin after logging in to the system.</string>
</property>
<property name="text">
<string>&amp;Start DogeCoin on system login</string>
<string>&amp;Start Dogecoin on system login</string>
</property>
</widget>
</item>
@ -119,7 +119,7 @@
<item>
<widget class="QCheckBox" name="mapPortUpnp">
<property name="toolTip">
<string>Automatically open the DogeCoin client port on the router. This only works when your router supports UPnP and it is enabled.</string>
<string>Automatically open the Dogecoin client port on the router. This only works when your router supports UPnP and it is enabled.</string>
</property>
<property name="text">
<string>Map port using &amp;UPnP</string>
@ -129,7 +129,7 @@
<item>
<widget class="QCheckBox" name="connectSocks">
<property name="toolTip">
<string>Connect to the DogeCoin network through a SOCKS proxy (e.g. when connecting through Tor).</string>
<string>Connect to the Dogecoin network through a SOCKS proxy (e.g. when connecting through Tor).</string>
</property>
<property name="text">
<string>&amp;Connect through SOCKS proxy:</string>
@ -303,7 +303,7 @@
<item>
<widget class="QValueComboBox" name="lang">
<property name="toolTip">
<string>The user interface language can be set here. This setting will take effect after restarting DogeCoin.</string>
<string>The user interface language can be set here. This setting will take effect after restarting Dogecoin.</string>
</property>
</widget>
</item>
@ -336,7 +336,7 @@
<item>
<widget class="QCheckBox" name="displayAddresses">
<property name="toolTip">
<string>Whether to show DogeCoin addresses in the transaction list or not.</string>
<string>Whether to show Dogecoin addresses in the transaction list or not.</string>
</property>
<property name="text">
<string>&amp;Display addresses in transaction list</string>

View file

@ -44,7 +44,7 @@
<item>
<widget class="QLabel" name="labelWalletStatus">
<property name="toolTip">
<string>The displayed information may be out of date. Your wallet automatically synchronizes with the DogeCoin network after a connection is established, but this process has not completed yet.</string>
<string>The displayed information may be out of date. Your wallet automatically synchronizes with the Dogecoin network after a connection is established, but this process has not completed yet.</string>
</property>
<property name="styleSheet">
<string notr="true">QLabel { color: red; }</string>
@ -253,7 +253,7 @@
<item>
<widget class="QLabel" name="labelTransactionsStatus">
<property name="toolTip">
<string>The displayed information may be out of date. Your wallet automatically synchronizes with the DogeCoin network after a connection is established, but this process has not completed yet.</string>
<string>The displayed information may be out of date. Your wallet automatically synchronizes with the Dogecoin network after a connection is established, but this process has not completed yet.</string>
</property>
<property name="styleSheet">
<string notr="true">QLabel { color: red; }</string>

View file

@ -11,7 +11,7 @@
</rect>
</property>
<property name="windowTitle">
<string>DogeCoin - Debug window</string>
<string>Dogecoin - Debug window</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_2">
<item>
@ -322,7 +322,7 @@
<item row="15" column="0">
<widget class="QPushButton" name="openDebugLogfileButton">
<property name="toolTip">
<string>Open the DogeCoin debug logfile from the current data directory. This can take a few seconds for large logfiles.</string>
<string>Open the Dogecoin debug logfile from the current data directory. This can take a few seconds for large logfiles.</string>
</property>
<property name="text">
<string>&amp;Open</string>
@ -348,7 +348,7 @@
<item row="17" column="0">
<widget class="QPushButton" name="showCLOptionsButton">
<property name="toolTip">
<string>Show the DogeCoin-Qt help message to get a list with possible DogeCoin command-line options.</string>
<string>Show the Dogecoin-Qt help message to get a list with possible Dogecoin command-line options.</string>
</property>
<property name="text">
<string>&amp;Show</string>