From 411645bae55788d02cf0ce748ccc4e97feead6be Mon Sep 17 00:00:00 2001 From: John Mnemonick Date: Thu, 4 Oct 2018 10:13:41 +0500 Subject: [PATCH] translation fixes --- contrib/devtools/gen-manpages.sh | 20 ++++++++++---------- qa/pull-tester/rpc-tests.py | 10 +++++----- qa/pull-tester/run-bitcoind-for-test.sh | 8 ++++---- qa/pull-tester/run-bitcoind-for-test.sh.in | 8 ++++---- qa/pull-tester/tests_config.py.in | 4 ++-- src/m4/urals_subdir_to_include.m4 | 4 ++-- src/policy/fees.h | 6 +++--- src/policy/policy.h | 6 +++--- src/policy/rbf.h | 6 +++--- src/univalue/gen.cpp | 6 +++--- src/univalue/univalue.h | 6 +++--- src/univalue/univalue_escapes.h | 6 +++--- 12 files changed, 45 insertions(+), 45 deletions(-) diff --git a/contrib/devtools/gen-manpages.sh b/contrib/devtools/gen-manpages.sh index 4cb8037..465ef05 100644 --- a/contrib/devtools/gen-manpages.sh +++ b/contrib/devtools/gen-manpages.sh @@ -4,23 +4,23 @@ TOPDIR=${TOPDIR:-$(git rev-parse --show-toplevel)} SRCDIR=${SRCDIR:-$TOPDIR/src} MANDIR=${MANDIR:-$TOPDIR/doc/man} -BITSENDD=${BITSENDD:-$SRCDIR/bitsendd} -BITSENDCLI=${BITSENDCLI:-$SRCDIR/bitsend-cli} -BITSENDTX=${BITSENDTX:-$SRCDIR/bitsend-tx} -BITSENDQT=${BITSENDQT:-$SRCDIR/qt/bitsend-qt} +URALSD=${URALSD:-$SRCDIR/uralsd} +URALSCLI=${URALSCLI:-$SRCDIR/urals-cli} +URALSTX=${URALSTX:-$SRCDIR/urals-tx} +URALSQT=${URALSQT:-$SRCDIR/qt/urals-qt} -[ ! -x $BITSENDD ] && echo "$BITSENDD not found or not executable." && exit 1 +[ ! -x $URALSD ] && echo "$URALSD not found or not executable." && exit 1 # The autodetected version git tag can screw up manpage output a little bit -BSDVER=($($BITSENDCLI --version | head -n1 | awk -F'[ -]' '{ print $6, $7 }')) +BSDVER=($($URALSCLI --version | head -n1 | awk -F'[ -]' '{ print $6, $7 }')) # Create a footer file with copyright content. -# This gets autodetected fine for bitsendd if --version-string is not set, -# but has different outcomes for bitsend-qt and bitsend-cli. +# This gets autodetected fine for uralsd if --version-string is not set, +# but has different outcomes for urals-qt and urals-cli. echo "[COPYRIGHT]" > footer.h2m -$BITSENDD --version | sed -n '1!p' >> footer.h2m +$URALSD --version | sed -n '1!p' >> footer.h2m -for cmd in $BITSENDD $BITSENDCLI $BITSENDTX $BITSENDQT; do +for cmd in $URALSD $URALSCLI $URALSTX $URALSQT; do cmdname="${cmd##*/}" help2man -N --version-string=${BSDVER[0]} --include=footer.h2m -o ${MANDIR}/${cmdname}.1 ${cmd} sed -i "s/\\\-${BSDVER[1]}//g" ${MANDIR}/${cmdname}.1 diff --git a/qa/pull-tester/rpc-tests.py b/qa/pull-tester/rpc-tests.py index 60b26e8..9075639 100644 --- a/qa/pull-tester/rpc-tests.py +++ b/qa/pull-tester/rpc-tests.py @@ -43,8 +43,8 @@ #If imported values are not defined then set to zero (or disabled) if 'ENABLE_WALLET' not in vars(): ENABLE_WALLET=0 -if 'ENABLE_BITSENDD' not in vars(): - ENABLE_BITSENDD=0 +if 'ENABLE_URALSD' not in vars(): + ENABLE_URALSD=0 if 'ENABLE_UTILS' not in vars(): ENABLE_UTILS=0 if 'ENABLE_ZMQ' not in vars(): @@ -75,8 +75,8 @@ opts.add(arg) #Set env vars -if "BITSENDD" not in os.environ: - os.environ["BITSENDD"] = BUILDDIR + '/src/bitsendd' + EXEEXT +if "URALSD" not in os.environ: + os.environ["URALSD"] = BUILDDIR + '/src/bitsendd' + EXEEXT if EXEEXT == ".exe" and "-win" not in opts: # https://github.com/bitsend/bitsend/commit/d52802551752140cf41f0d9a225a43e84404d3e9 @@ -84,7 +84,7 @@ print("Win tests currently disabled by default. Use -win option to enable") sys.exit(0) -if not (ENABLE_WALLET == 1 and ENABLE_UTILS == 1 and ENABLE_BITSENDD == 1): +if not (ENABLE_WALLET == 1 and ENABLE_UTILS == 1 and ENABLE_URALSD == 1): print("No rpc tests to run. Wallet, utils, and bitsendd must all be enabled") sys.exit(0) diff --git a/qa/pull-tester/run-bitcoind-for-test.sh b/qa/pull-tester/run-bitcoind-for-test.sh index 2c2c0bc..c5c256b 100644 --- a/qa/pull-tester/run-bitcoind-for-test.sh +++ b/qa/pull-tester/run-bitcoind-for-test.sh @@ -11,10 +11,10 @@ tail -q -n 1 -F "$DATADIR/regtest/debug.log" | grep -m 1 -q "Done loading" & WAITER=$! PORT=`expr $BASHPID + 10000` "/c/projekt11/bitsend30/src/bitsendd.exe" -connect=0.0.0.0 -datadir="$DATADIR" -rpcuser=user -rpcpassword=pass -listen -keypool=3 -debug -debug=net -logtimestamps -port=$PORT -regtest -rpcport=`expr $PORT + 1` & -BITSENDD=$! +URALSD=$! #Install a watchdog. -(sleep 10 && kill -0 $WAITER 2>/dev/null && kill -9 $BITSENDD $$)& +(sleep 10 && kill -0 $WAITER 2>/dev/null && kill -9 $URALSD $$)& wait $WAITER if [ -n "$TIMEOUT" ]; then @@ -25,8 +25,8 @@ else RETURN=$? fi -(sleep 15 && kill -0 $BITSENDD 2>/dev/null && kill -9 $BITSENDD $$)& -kill $BITSENDD && wait $BITSENDD +(sleep 15 && kill -0 $URALSD 2>/dev/null && kill -9 $URALSD $$)& +kill $URALSD && wait $URALSD # timeout returns 124 on timeout, otherwise the return value of the child exit $RETURN diff --git a/qa/pull-tester/run-bitcoind-for-test.sh.in b/qa/pull-tester/run-bitcoind-for-test.sh.in index 74b3a1f..9f834f9 100644 --- a/qa/pull-tester/run-bitcoind-for-test.sh.in +++ b/qa/pull-tester/run-bitcoind-for-test.sh.in @@ -11,10 +11,10 @@ tail -q -n 1 -F "$DATADIR/regtest/debug.log" | grep -m 1 -q "Done loading" & WAITER=$! PORT=`expr $BASHPID + 10000` "@abs_top_builddir@/src/bitsendd@EXEEXT@" -connect=0.0.0.0 -datadir="$DATADIR" -rpcuser=user -rpcpassword=pass -listen -keypool=3 -debug -debug=net -logtimestamps -port=$PORT -regtest -rpcport=`expr $PORT + 1` & -BITSENDD=$! +URALSD=$! #Install a watchdog. -(sleep 10 && kill -0 $WAITER 2>/dev/null && kill -9 $BITSENDD $$)& +(sleep 10 && kill -0 $WAITER 2>/dev/null && kill -9 $URALSD $$)& wait $WAITER if [ -n "$TIMEOUT" ]; then @@ -25,8 +25,8 @@ else RETURN=$? fi -(sleep 15 && kill -0 $BITSENDD 2>/dev/null && kill -9 $BITSENDD $$)& -kill $BITSENDD && wait $BITSENDD +(sleep 15 && kill -0 $URALSD 2>/dev/null && kill -9 $URALSD $$)& +kill $URALSD && wait $URALSD # timeout returns 124 on timeout, otherwise the return value of the child exit $RETURN diff --git a/qa/pull-tester/tests_config.py.in b/qa/pull-tester/tests_config.py.in index 9c2df37..1b9aca1 100644 --- a/qa/pull-tester/tests_config.py.in +++ b/qa/pull-tester/tests_config.py.in @@ -9,6 +9,6 @@ EXEEXT="@EXEEXT@" # These will turn into comments if they were disabled when configuring. @ENABLE_WALLET_TRUE@ENABLE_WALLET=1 -@BUILD_BITSEND_UTILS_TRUE@ENABLE_UTILS=1 -@BUILD_BITSENDD_TRUE@ENABLE_BITSENDD=1 +@BUILD_URALS_UTILS_TRUE@ENABLE_UTILS=1 +@BUILD_URALSD_TRUE@ENABLE_URALSD=1 @ENABLE_ZMQ_TRUE@ENABLE_ZMQ=1 diff --git a/src/m4/urals_subdir_to_include.m4 b/src/m4/urals_subdir_to_include.m4 index 8761b42..0949e5e 100644 --- a/src/m4/urals_subdir_to_include.m4 +++ b/src/m4/urals_subdir_to_include.m4 @@ -1,6 +1,6 @@ -dnl BITSEND_SUBDIR_TO_INCLUDE([CPPFLAGS-VARIABLE-NAME],[SUBDIRECTORY-NAME],[HEADER-FILE]) +dnl URALS_SUBDIR_TO_INCLUDE([CPPFLAGS-VARIABLE-NAME],[SUBDIRECTORY-NAME],[HEADER-FILE]) dnl SUBDIRECTORY-NAME must end with a path separator -AC_DEFUN([BITSEND_SUBDIR_TO_INCLUDE],[ +AC_DEFUN([URALS_SUBDIR_TO_INCLUDE],[ if test "x$2" = "x"; then AC_MSG_RESULT([default]) else diff --git a/src/policy/fees.h b/src/policy/fees.h index fd0be1c..902fd50 100644 --- a/src/policy/fees.h +++ b/src/policy/fees.h @@ -4,8 +4,8 @@ // Copyright (c) 2015-2017 The Bitsend developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#ifndef BITSEND_POLICYESTIMATOR_H -#define BITSEND_POLICYESTIMATOR_H +#ifndef URALS_POLICYESTIMATOR_H +#define URALS_POLICYESTIMATOR_H #include "amount.h" #include "uint256.h" @@ -278,4 +278,4 @@ class FeeFilterRounder std::set feeset; FastRandomContext insecure_rand; }; -#endif /*BITSEND_POLICYESTIMATOR_H */ +#endif /*URALS_POLICYESTIMATOR_H */ diff --git a/src/policy/policy.h b/src/policy/policy.h index 226befe..d73ebb3 100644 --- a/src/policy/policy.h +++ b/src/policy/policy.h @@ -5,8 +5,8 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#ifndef BITSEND_POLICY_POLICY_H -#define BITSEND_POLICY_POLICY_H +#ifndef URALS_POLICY_POLICY_H +#define URALS_POLICY_POLICY_H #include "consensus/consensus.h" #include "script/interpreter.h" @@ -103,4 +103,4 @@ extern unsigned int nBytesPerSigOp; int64_t GetVirtualTransactionSize(int64_t nWeight, int64_t nSigOpCost); int64_t GetVirtualTransactionSize(const CTransaction& tx, int64_t nSigOpCost = 0); -#endif // BITSEND_POLICY_POLICY_H +#endif // URALS_POLICY_POLICY_H diff --git a/src/policy/rbf.h b/src/policy/rbf.h index 0b983e5..125b15a 100644 --- a/src/policy/rbf.h +++ b/src/policy/rbf.h @@ -2,8 +2,8 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#ifndef BITSEND_POLICY_RBF_H -#define BITSEND_POLICY_RBF_H +#ifndef URALS_POLICY_RBF_H +#define URALS_POLICY_RBF_H #include "txmempool.h" @@ -23,4 +23,4 @@ bool SignalsOptInRBF(const CTransaction &tx); // as the sequence numbers of all in-mempool ancestors. RBFTransactionState IsRBFOptIn(const CTransaction &tx, CTxMemPool &pool); -#endif // BITSEND_POLICY_RBF_H +#endif // URALS_POLICY_RBF_H diff --git a/src/univalue/gen.cpp b/src/univalue/gen.cpp index 2092acc..d55aa0a 100644 --- a/src/univalue/gen.cpp +++ b/src/univalue/gen.cpp @@ -35,8 +35,8 @@ static void initJsonEscape() static void outputEscape() { printf( "// Automatically generated file. Do not modify.\n" - "#ifndef BITSEND_UNIVALUE_UNIVALUE_ESCAPES_H\n" - "#define BITSEND_UNIVALUE_UNIVALUE_ESCAPES_H\n" + "#ifndef URALS_UNIVALUE_UNIVALUE_ESCAPES_H\n" + "#define URALS_UNIVALUE_UNIVALUE_ESCAPES_H\n" "static const char *escapes[256] = {\n"); for (unsigned int i = 0; i < 256; i++) { @@ -66,7 +66,7 @@ static void outputEscape() } printf( "};\n" - "#endif // BITSEND_UNIVALUE_UNIVALUE_ESCAPES_H\n"); + "#endif // URALS_UNIVALUE_UNIVALUE_ESCAPES_H\n"); } int main (int argc, char *argv[]) diff --git a/src/univalue/univalue.h b/src/univalue/univalue.h index 58355f2..af07b25 100644 --- a/src/univalue/univalue.h +++ b/src/univalue/univalue.h @@ -2,8 +2,8 @@ // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#ifndef BITSEND_UNIVALUE_UNIVALUE_H -#define BITSEND_UNIVALUE_UNIVALUE_H +#ifndef URALS_UNIVALUE_UNIVALUE_H +#define URALS_UNIVALUE_UNIVALUE_H #include #include @@ -152,4 +152,4 @@ extern enum jtokentype getJsonToken(std::string& tokenVal, unsigned int& consumed, const char *raw); extern const char *uvTypeName(UniValue::VType t); -#endif // BITSEND_UNIVALUE_UNIVALUE_H +#endif // URALS_UNIVALUE_UNIVALUE_H diff --git a/src/univalue/univalue_escapes.h b/src/univalue/univalue_escapes.h index 183201c..7b70fad 100644 --- a/src/univalue/univalue_escapes.h +++ b/src/univalue/univalue_escapes.h @@ -1,6 +1,6 @@ // Automatically generated file. Do not modify. -#ifndef BITSEND_UNIVALUE_UNIVALUE_ESCAPES_H -#define BITSEND_UNIVALUE_UNIVALUE_ESCAPES_H +#ifndef URALS_UNIVALUE_UNIVALUE_ESCAPES_H +#define URALS_UNIVALUE_UNIVALUE_ESCAPES_H static const char *escapes[256] = { NULL, NULL, @@ -259,4 +259,4 @@ static const char *escapes[256] = { NULL, NULL, }; -#endif // BITSEND_UNIVALUE_UNIVALUE_ESCAPES_H +#endif // URALS_UNIVALUE_UNIVALUE_ESCAPES_H