Merge #8911: qt: Translate all files, even if wallet disabled

8aed5f6 qt: Translate all files, even if wallet disabled (Wladimir J. van der Laan)
This commit is contained in:
Wladimir J. van der Laan 2016-10-13 10:30:31 +02:00 committed by Alexander Block
parent 75668f3fe4
commit dcc63e6e9f

View File

@ -394,7 +394,7 @@ RES_ICONS = \
qt/res/icons/trad/fontsmaller.png \ qt/res/icons/trad/fontsmaller.png \
qt/res/icons/trad/network_disabled.png qt/res/icons/trad/network_disabled.png
BITCOIN_QT_CPP = \ BITCOIN_QT_BASE_CPP = \
qt/bantablemodel.cpp \ qt/bantablemodel.cpp \
qt/bitcoinaddressvalidator.cpp \ qt/bitcoinaddressvalidator.cpp \
qt/bitcoinamountfield.cpp \ qt/bitcoinamountfield.cpp \
@ -419,12 +419,9 @@ BITCOIN_QT_CPP = \
qt/trafficgraphwidget.cpp \ qt/trafficgraphwidget.cpp \
qt/utilitydialog.cpp qt/utilitydialog.cpp
if TARGET_WINDOWS BITCOIN_QT_WINDOWS_CPP = qt/winshutdownmonitor.cpp
BITCOIN_QT_CPP += qt/winshutdownmonitor.cpp
endif
if ENABLE_WALLET BITCOIN_QT_WALLET_CPP = \
BITCOIN_QT_CPP += \
qt/addressbookpage.cpp \ qt/addressbookpage.cpp \
qt/addresstablemodel.cpp \ qt/addresstablemodel.cpp \
qt/askpassphrasedialog.cpp \ qt/askpassphrasedialog.cpp \
@ -453,6 +450,13 @@ BITCOIN_QT_CPP += \
qt/walletmodel.cpp \ qt/walletmodel.cpp \
qt/walletmodeltransaction.cpp \ qt/walletmodeltransaction.cpp \
qt/walletview.cpp qt/walletview.cpp
BITCOIN_QT_CPP = $(BITCOIN_QT_BASE_CPP)
if TARGET_WINDOWS
BITCOIN_QT_CPP += $(BITCOIN_QT_WINDOWS_CPP)
endif
if ENABLE_WALLET
BITCOIN_QT_CPP += $(BITCOIN_QT_WALLET_CPP)
endif endif
RES_IMAGES = \ RES_IMAGES = \
@ -578,7 +582,7 @@ $(srcdir)/qt/dashstrings.cpp: $(libbitcoin_server_a_SOURCES) $(libbitcoin_wallet
@test -n $(XGETTEXT) || echo "xgettext is required for updating translations" @test -n $(XGETTEXT) || echo "xgettext is required for updating translations"
$(AM_V_GEN) cd $(srcdir); XGETTEXT=$(XGETTEXT) PACKAGE_NAME="$(PACKAGE_NAME)" COPYRIGHT_HOLDERS="$(COPYRIGHT_HOLDERS)" COPYRIGHT_HOLDERS_SUBSTITUTION="$(COPYRIGHT_HOLDERS_SUBSTITUTION)" $(PYTHON) ../share/qt/extract_strings_qt.py $^ $(AM_V_GEN) cd $(srcdir); XGETTEXT=$(XGETTEXT) PACKAGE_NAME="$(PACKAGE_NAME)" COPYRIGHT_HOLDERS="$(COPYRIGHT_HOLDERS)" COPYRIGHT_HOLDERS_SUBSTITUTION="$(COPYRIGHT_HOLDERS_SUBSTITUTION)" $(PYTHON) ../share/qt/extract_strings_qt.py $^
translate: $(srcdir)/qt/dashstrings.cpp $(QT_FORMS_UI) $(QT_FORMS_UI) $(BITCOIN_QT_CPP) $(srcdir)/qt/dash.cpp $(BITCOIN_QT_H) $(BITCOIN_MM) translate: $(srcdir)/qt/dashstrings.cpp $(QT_FORMS_UI) $(QT_FORMS_UI) $(BITCOIN_QT_BASE_CPP) $(BITCOIN_QT_WINDOWS_CPP) $(BITCOIN_QT_WALLET_CPP) $(srcdir)/qt/dash.cpp $(BITCOIN_QT_H) $(BITCOIN_MM)
@test -n $(LUPDATE) || echo "lupdate is required for updating translations" @test -n $(LUPDATE) || echo "lupdate is required for updating translations"
$(AM_V_GEN) QT_SELECT=$(QT_SELECT) $(LUPDATE) $^ -locations relative -no-obsolete -ts $(srcdir)/qt/locale/dash_en.ts $(AM_V_GEN) QT_SELECT=$(QT_SELECT) $(LUPDATE) $^ -locations relative -no-obsolete -ts $(srcdir)/qt/locale/dash_en.ts