Skip to content

Commit 53e5d57

Browse files
jamescowensjamescowens
committed
Merge branch 'development' into integrated_scraper_2
2 parents 96e128f + 4718a95 commit 53e5d57

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

68 files changed

+70
-68
lines changed

‎configure.ac‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -869,7 +869,9 @@ fi
869869
if test x$use_boost = xyes; then
870870

871871
BOOST_LIBS="$BOOST_LDFLAGS $BOOST_SYSTEM_LIB $BOOST_FILESYSTEM_LIB $BOOST_ZLIB_LIB $BOOST_IOSTREAMS_LIB $BOOST_PROGRAM_OPTIONS_LIB $BOOST_THREAD_LIB $BOOST_CHRONO_LIB $BOOST_ZLIB_LIB"
872-
872+
if test x$TARGET_OS = xdarwin; then
873+
BOOST_LIBS="$BOOST_LIBS -lboost_system-mt"
874+
fi
873875

874876
dnl If boost (prior to 1.57) was built without c++11, it emulated scoped enums
875877
dnl using c++98 constructs. Unfortunately, this implementation detail leaked into

‎src/qt/diagnosticsdialog.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -326,7 +326,7 @@ void DiagnosticsDialog::clkStateChanged(QAbstractSocket::SocketState state)
326326

327327
char NTPMessage[48] = {0x1b, 0, 0, 0 ,0, 0, 0, 0, 0};
328328

329-
udpSocket->writeDatagram(NTPMessage, sizeof(NTPMessage), udpSocket->peerAddress(), udpSocket->peerPort());
329+
udpSocket->write(NTPMessage, sizeof(NTPMessage));
330330
}
331331

332332
return;

‎src/qt/forms/optionsdialog.ui‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -413,7 +413,7 @@
413413
<string>Whether to show coin control features or not.</string>
414414
</property>
415415
<property name="text">
416-
<string>Display coin &amp;control features (experts only!)</string>
416+
<string>Display coin &amp;control features (advanced users only!)</string>
417417
</property>
418418
</widget>
419419
</item>

‎src/qt/locale/bitcoin_af_ZA.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1567,7 +1567,7 @@ Dit beteken dat &apos;n fooi van ten minste %2 word benodig.</translation>
15671567
</message>
15681568
<message>
15691569
<location line="+3"/>
1570-
<source>Display coin &amp;control features (experts only!)</source>
1570+
<source>Display coin &amp;control features (advanced users only!)</source>
15711571
<translation>Wys muntstuk &amp;control funksies (kenners net!)</translation>
15721572
</message>
15731573
<message>

‎src/qt/locale/bitcoin_ar.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1552,7 +1552,7 @@ This label turns red, if the priority is smaller than &quot;medium&quot;.
15521552
</message>
15531553
<message>
15541554
<location line="+3"/>
1555-
<source>Display coin &amp;control features (experts only!)</source>
1555+
<source>Display coin &amp;control features (advanced users only!)</source>
15561556
<translation type="unfinished"></translation>
15571557
</message>
15581558
<message>

‎src/qt/locale/bitcoin_be_BY.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1555,7 +1555,7 @@ This label turns red, if the priority is smaller than &quot;medium&quot;.
15551555
</message>
15561556
<message>
15571557
<location line="+3"/>
1558-
<source>Display coin &amp;control features (experts only!)</source>
1558+
<source>Display coin &amp;control features (advanced users only!)</source>
15591559
<translation type="unfinished"></translation>
15601560
</message>
15611561
<message>

‎src/qt/locale/bitcoin_bg.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1566,7 +1566,7 @@ This label turns red, if the priority is smaller than &quot;medium&quot;.
15661566
</message>
15671567
<message>
15681568
<location line="+10"/>
1569-
<source>Display coin &amp;control features (experts only!)</source>
1569+
<source>Display coin &amp;control features (advanced users only!)</source>
15701570
<translation type="unfinished"></translation>
15711571
</message>
15721572
<message>

‎src/qt/locale/bitcoin_bs.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1555,7 +1555,7 @@ This label turns red, if the priority is smaller than &quot;medium&quot;.
15551555
</message>
15561556
<message>
15571557
<location line="+3"/>
1558-
<source>Display coin &amp;control features (experts only!)</source>
1558+
<source>Display coin &amp;control features (advanced users only!)</source>
15591559
<translation type="unfinished"></translation>
15601560
</message>
15611561
<message>

‎src/qt/locale/bitcoin_ca.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1566,7 +1566,7 @@ This label turns red, if the priority is smaller than &quot;medium&quot;.
15661566
</message>
15671567
<message>
15681568
<location line="+10"/>
1569-
<source>Display coin &amp;control features (experts only!)</source>
1569+
<source>Display coin &amp;control features (advanced users only!)</source>
15701570
<translation type="unfinished"></translation>
15711571
</message>
15721572
<message>

‎src/qt/locale/[email protected]‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1566,7 +1566,7 @@ This label turns red, if the priority is smaller than &quot;medium&quot;.
15661566
</message>
15671567
<message>
15681568
<location line="+10"/>
1569-
<source>Display coin &amp;control features (experts only!)</source>
1569+
<source>Display coin &amp;control features (advanced users only!)</source>
15701570
<translation type="unfinished"></translation>
15711571
</message>
15721572
<message>

0 commit comments

Comments
 (0)