From 3521d8b3e64a02ef6a213516cd9f5691e453209f Mon Sep 17 00:00:00 2001
From: "Eric J. Korpela" <korpela@ssl.berkeley.edu>
Date: Tue, 27 Jan 2009 23:00:19 +0000
Subject: [PATCH] - fixes to allow compilation on compilers that don't allow
 string concatenation within the _() macro.

svn path=/trunk/boinc/; revision=17053
---
 clientgui/ProxyInfoPage.cpp | 15 +--------------
 clientgui/WelcomePage.cpp   | 14 ++------------
 2 files changed, 3 insertions(+), 26 deletions(-)

diff --git a/clientgui/ProxyInfoPage.cpp b/clientgui/ProxyInfoPage.cpp
index 1c64de8f2f..b1b5223704 100644
--- a/clientgui/ProxyInfoPage.cpp
+++ b/clientgui/ProxyInfoPage.cpp
@@ -214,20 +214,7 @@ void CErrProxyInfoPage::OnPageChanged( wxWizardExEvent& event ) {
     );
 #else
     m_pDescriptionStaticCtrl->SetLabel(
-        _("BOINC failed to communicate on the Internet.\n"
-            "The most likely reasons are:\n"
-            "\n"
-            "1) Connectivity problem.  Check your network\n"
-            "or modem connection and then click Back to try again.\n"
-            "\n"
-            "2) Personal firewall software is blocking BOINC.\n"
-            "Configure your personal firewall to let BOINC and\n"
-            "BOINC Manager communicate on port 80,\n"
-            "then click Back to try again.\n"
-            "\n"
-            "3) You are using a proxy server.\n"
-            "Click Next to configure BOINC's proxy settings."
-        )
+        _("BOINC failed to communicate on the Internet.\nThe most likely reasons are:\n\n1) Connectivity problem.  Check your network\nor modem connection and then click Back to try again.\n\n2) Personal firewall software is blocking BOINC.\nConfigure your personal firewall to let BOINC and\nBOINC Manager communicate on port 80,\nthen click Back to try again.\n\n3) You are using a proxy server.\nClick Next to configure BOINC's proxy settings.")
     );
 #endif
 
diff --git a/clientgui/WelcomePage.cpp b/clientgui/WelcomePage.cpp
index be8d2997a2..14a47b73a2 100644
--- a/clientgui/WelcomePage.cpp
+++ b/clientgui/WelcomePage.cpp
@@ -347,21 +347,11 @@ void CWelcomePage::OnPageChanged( wxWizardExEvent& event ) {
             );
             if (!wcg) {
                 m_pDescriptionStaticCtrl->SetLabel(
-                    _("We'll now guide you through the process of attaching\n"
-                    "to a project.")
+                    _("We'll now guide you through the process of attaching\nto a project.")
                 );
             } else {
                 m_pDescriptionStaticCtrl->SetLabel(
-                    _("You have selected to attach to a new BOINC project.  Attaching to a new\n"
-                    "project means that you will be connecting your computer to a new website\n"
-                    "and organization.  If this is what you wanted to do, then please click on\n"
-                    "the 'Next' button below.\n\n"
-                    "Some projects like World Community Grid run multiple research applications.\n"
-                    "If you want to change which research applications are sent to your computer\n"
-                    "to run, then you should visit the project's website and modify your\n"
-                    "preferences there.\n\n"
-                    "To change which research applications are sent to you from\n"
-                    "World Community Grid then please click on the following button:")
+                    _("You have selected to attach to a new BOINC project.  Attaching to a new\nproject means that you will be connecting your computer to a new website\nand organization.  If this is what you wanted to do, then please click on\nthe 'Next' button below.\n\nSome projects like World Community Grid run multiple research applications.\nIf you want to change which research applications are sent to your computer\nto run, then you should visit the project's website and modify your\npreferences there.\n\nTo change which research applications are sent to you from\nWorld Community Grid then please click on the following button:")
                 );
             }
         }