From a6084e73f3db9b7dd75cd929a172c93870cac6e1 Mon Sep 17 00:00:00 2001 From: Rom Walton Date: Mon, 17 Oct 2005 19:19:54 +0000 Subject: [PATCH] *** empty log message *** svn path=/trunk/boinc/; revision=8685 --- checkin_notes | 11 +++++++++++ clientgui/hyperlink.cpp | 10 ++++++++-- locale/client/en_US/BOINC Manager.mo | Bin 540 -> 540 bytes locale/client/en_US/BOINC Manager.po | 27 +++++++++++++++------------ 4 files changed, 34 insertions(+), 14 deletions(-) diff --git a/checkin_notes b/checkin_notes index 951aece59c..6e33b34f29 100755 --- a/checkin_notes +++ b/checkin_notes @@ -13186,3 +13186,14 @@ David 16 Oct 2005 util.inc ops/ update_profile_pages.php + +Rom 17 Oct 2005 (HEAD, staging, stable, boinc_core_release) + - Include the URL that a web browser needs to open up in the message + box if the default browser cannot be determined. + + clientgui/ + hyperlink.cpp + +Rom 17 Oct 2005 (stable) + - Tag for 5.2.2 release, all platforms + boinc_core_release_5_2_2 diff --git a/clientgui/hyperlink.cpp b/clientgui/hyperlink.cpp index 677604529f..e12dc7f148 100644 --- a/clientgui/hyperlink.cpp +++ b/clientgui/hyperlink.cpp @@ -214,13 +214,19 @@ void wxHyperLink::ExecuteLink (const wxString &strLink) { if (!mime_type_found) { cmd = ::wxGetenv(wxT("BROWSER")); if(cmd.IsEmpty()) { - ::wxMessageBox( + wxString strBuffer = wxEmptyString; + strBuffer.Printf( _("BOINC could not determine what your default browser is.\n" "Please verify that you have either the 'mailcap' package installed or\n" "'mime' package installed, and that the 'text/html' mime type is\n" "configured for your favorite browser. Another method is to set the\n" "BROWSER environment variable to point to whatever your favorite\n" - "web browser is."), + "web browser is. Please open a browser window to the following URL:\n\n" + "%s"), + strBuffer.c_str() + ); + ::wxMessageBox( + strBuffer, _("BOINC Manager"), wxOK | wxICON_INFORMATION ); diff --git a/locale/client/en_US/BOINC Manager.mo b/locale/client/en_US/BOINC Manager.mo index 0f552b2789f5996fb6d074f00f1d402753927e55..eef9127fc6a41cb66d7ed77320cff7c6d8153daf 100755 GIT binary patch delta 17 YcmbQkGKXbCADg*?p^=s0#wi_)05DMnSO5S3 delta 17 YcmbQkGKXbCADfYafrXXn#wi_)05DYrTmS$7 diff --git a/locale/client/en_US/BOINC Manager.po b/locale/client/en_US/BOINC Manager.po index 3daafe097c..a887bcf32f 100755 --- a/locale/client/en_US/BOINC Manager.po +++ b/locale/client/en_US/BOINC Manager.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: BOINC Manager 4.x\n" "POT-Creation-Date: \n" -"PO-Revision-Date: 2005-10-12 08:58-0800\n" +"PO-Revision-Date: 2005-10-17 12:18-0800\n" "Last-Translator: Rom Walton \n" "Language-Team: BOINC Development Team \n" "MIME-Version: 1.0\n" @@ -178,7 +178,7 @@ msgstr "" #: clientgui/BOINCTaskBar.cpp:68 #: clientgui/DlgAbout.cpp:103 -#: clientgui/hyperlink.cpp:224 +#: clientgui/hyperlink.cpp:230 msgid "BOINC Manager" msgstr "" @@ -460,14 +460,17 @@ msgstr "" msgid "Failed to create wxStaticText, needed by wxHyperLink!" msgstr "" -#: clientgui/hyperlink.cpp:218 +#: clientgui/hyperlink.cpp:219 +#, c-format msgid "" "BOINC could not determine what your default browser is.\n" "Please verify that you have either the 'mailcap' package installed or\n" "'mime' package installed, and that the 'text/html' mime type is\n" "configured for your favorite browser. Another method is to set the\n" "BROWSER environment variable to point to whatever your favorite\n" -"web browser is." +"web browser is. Please open a browser window to the following URL:\n" +"\n" +"%s" msgstr "" #: clientgui/Localization.cpp:31 @@ -526,37 +529,37 @@ msgstr "" msgid "View information about your team" msgstr "" -#: clientgui/MainDocument.cpp:159 +#: clientgui/MainDocument.cpp:180 msgid "BOINC Manager - Connection Error" msgstr "" -#: clientgui/MainDocument.cpp:160 +#: clientgui/MainDocument.cpp:181 msgid "The password you have provided is incorrect, please try again." msgstr "" -#: clientgui/MainDocument.cpp:178 +#: clientgui/MainDocument.cpp:199 msgid "BOINC Manager - Connection failed" msgstr "" -#: clientgui/MainDocument.cpp:179 +#: clientgui/MainDocument.cpp:200 #: clientgui/MainFrame.cpp:922 #: clientgui/MainFrame.cpp:923 msgid "Connection failed." msgstr "" -#: clientgui/MainDocument.cpp:285 +#: clientgui/MainDocument.cpp:306 msgid "Retrieving system state; please wait..." msgstr "" -#: clientgui/MainDocument.cpp:294 +#: clientgui/MainDocument.cpp:315 msgid "Retrieving host information; please wait..." msgstr "" -#: clientgui/MainDocument.cpp:848 +#: clientgui/MainDocument.cpp:869 msgid "BOINC error" msgstr "" -#: clientgui/MainDocument.cpp:858 +#: clientgui/MainDocument.cpp:879 msgid "BOINC info" msgstr ""