aboutsummaryrefslogtreecommitdiff
path: root/src/uibase.cpp
diff options
context:
space:
mode:
authorWladimir J. van der Laan <[email protected]>2011-08-06 18:45:15 +0200
committerWladimir J. van der Laan <[email protected]>2011-08-06 18:45:15 +0200
commit330c190958a31a126de7a7b12124070300b1567b (patch)
treef5a43d970c66709ea15ed44b0b5a7e63f880c82c /src/uibase.cpp
parentreorganize transaction model data function, and transaction tooltip (diff)
parentMerge branch 'tmp2' (diff)
downloaddiscoin-330c190958a31a126de7a7b12124070300b1567b.tar.xz
discoin-330c190958a31a126de7a7b12124070300b1567b.zip
Merge branch 'master' of https://github.com/bitcoin/bitcoin
Diffstat (limited to 'src/uibase.cpp')
-rw-r--r--src/uibase.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/uibase.cpp b/src/uibase.cpp
index 18eec4413..6d219ad66 100644
--- a/src/uibase.cpp
+++ b/src/uibase.cpp
@@ -367,7 +367,7 @@ COptionsDialogBase::COptionsDialogBase( wxWindow* parent, wxWindowID id, const w
wxBoxSizer* bSizer102;
bSizer102 = new wxBoxSizer( wxHORIZONTAL );
- m_checkBoxUseProxy = new wxCheckBox( m_panelMain, wxID_ANY, _("&Connect through socks4 proxy: "), wxDefaultPosition, wxDefaultSize, 0 );
+ m_checkBoxUseProxy = new wxCheckBox( m_panelMain, wxID_ANY, _("&Connect through socks4 proxy (requires restart to apply): "), wxDefaultPosition, wxDefaultSize, 0 );
bSizer102->Add( m_checkBoxUseProxy, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
bSizer69->Add( bSizer102, 1, wxEXPAND, 5 );