diff --git a/checkin_notes b/checkin_notes index 1f7b1e85da..f63009e5a2 100755 --- a/checkin_notes +++ b/checkin_notes @@ -13248,3 +13248,24 @@ David 20 Oct 2005 client/ scheduler_op.C + +Rom 20 Oct 2005 + - Bug Fix: use strLink instead of strBuffer when describing the URL to + go to on Linux when a browser cannot be detected. + - Bug Fix: Change missing browser message box text. + + clientgui/ + hyperlink.cpp + +Rom 20 Oct 2005 + - Include localization files in the Linux sea. + + sea/ + Makefile.am + make-tar.sh + make-tar_debug.sh + +Rom 20 Oct 2005 (stable) + - Tag for 5.2.3 release, all platforms + boinc_core_release_5_2_3 + diff --git a/clientgui/hyperlink.cpp b/clientgui/hyperlink.cpp index e12dc7f148..b4c67fae78 100644 --- a/clientgui/hyperlink.cpp +++ b/clientgui/hyperlink.cpp @@ -216,18 +216,17 @@ void wxHyperLink::ExecuteLink (const wxString &strLink) { if(cmd.IsEmpty()) { 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. Please open a browser window to the following URL:\n\n" - "%s"), - strBuffer.c_str() + _("BOINC tried to display the web page\n" + "\t%s\n" + "but couldn't find a web browser.\n" + "To fix this, set the environment variable\n" + "BROWSER to the path of your web browser,\n" + "then restart BOINC."), + strLink.c_str() ); ::wxMessageBox( strBuffer, - _("BOINC Manager"), + _("BOINC Manager - Can't find web browser"), wxOK | wxICON_INFORMATION ); } else { diff --git a/sea/Makefile.am b/sea/Makefile.am index d0b4ad515a..8cf7794ee6 100644 --- a/sea/Makefile.am +++ b/sea/Makefile.am @@ -23,10 +23,10 @@ $(sea_debug): sea_debug.tar make-sea.sh Makefile ./make-sea.sh sea_debug.tar $(sea_debug) BOINC_debug/binstall.sh sea.tar: $(tarfiles) - tar cf sea.tar $(tarfiles) + ./make-tar.sh sea_debug.tar: $(tarfiles_debug) - tar cf sea_debug.tar $(tarfiles_debug) + ./make-tar_debug.sh BOINC/boinc: ../client/boinc BOINC cp ../client/boinc BOINC/boinc diff --git a/sea/make-tar.sh b/sea/make-tar.sh new file mode 100755 index 0000000000..88280306fb --- /dev/null +++ b/sea/make-tar.sh @@ -0,0 +1,9 @@ +#!/bin/sh + +rm -fr BOINC/.CVS +mkdir BOINC +mkdir BOINC/locale +find ../locale/client -name '*.mo' | cut -d '/' -f 4 | awk '{print "BOINC/locale/"$0}' | xargs mkdir +find ../locale/client -name '*.mo' | cut -d '/' -f 4,5 | awk '{print "cp \"../locale/client/"$0"\" \"BOINC/locale/"$0"\""}' | bash +tar cvvf sea.tar BOINC/ + diff --git a/sea/make-tar_debug.sh b/sea/make-tar_debug.sh new file mode 100755 index 0000000000..7b3b6cd0f2 --- /dev/null +++ b/sea/make-tar_debug.sh @@ -0,0 +1,9 @@ +#!/bin/sh + +rm -fr BOINC_debug/.CVS +mkdir BOINC_debug +mkdir BOINC_debug/locale +find ../locale/client -name '*.mo' | cut -d '/' -f 4 | awk '{print "BOINC_debug/locale/"$0}' | xargs mkdir +find ../locale/client -name '*.mo' | cut -d '/' -f 4,5 | awk '{print "cp \"../locale/client/"$0"\" \"BOINC_debug/locale/"$0"\""}' | bash +tar cvvf sea_debug.tar BOINC_debug/ +