Index: src/org/netbeans/modules/welcome/ContentPanel.java
===================================================================
RCS file: /cvs/ui/welcome/src/org/netbeans/modules/welcome/ContentPanel.java,v
retrieving revision 1.11
diff -u -B -b -r1.11 ContentPanel.java
--- src/org/netbeans/modules/welcome/ContentPanel.java	20 Jul 2002 09:27:52 -0000	1.11
+++ src/org/netbeans/modules/welcome/ContentPanel.java	2 Jan 2003 13:09:32 -0000
@@ -34,10 +34,8 @@
     private ResourceBundle bundle;
     private JButton button;
     private String page = null;
-    private String language = null;
     
     public ContentPanel() {
-        language = Locale.getDefault().getLanguage();
         bundle = NbBundle.getBundle(HelpPanel.class);
         TipPanel tipPanel = new TipPanel();
         setLayout(new BorderLayout());
@@ -45,49 +43,21 @@
         setMinimumSize(new java.awt.Dimension(300, 300));
         setPreferredSize(new java.awt.Dimension(300, 300));
         jEditorPane1.setEditable(false);
+        page = "welcome.html";   // NOI18N
         if(System.getProperty("java.vm.version").startsWith("1.3")){
             if(System.getProperty("os.name").indexOf("Linux") != -1){
-                if(!language.equals("en")){
-                    page = "/org/netbeans/modules/welcome/pages/welcome_1_3_lin_"+language+".html";   // NOI18N
+                page= "welcome_1_3_lin.html";   // NOI18N                
                 }else{
-                    page= "pages/welcome_1_3_lin.html";   // NOI18N
+                page = "welcome_1_3.html"; //NOI18N
                 }
-            }else{
-                if(!language.equals("en")){
-                    page = "/org/netbeans/modules/welcome/pages/welcome_1_3_"+language+".html";   // NOI18N
-                }else{
-                    page= "pages/welcome.html";   // NOI18N
-                }
-            }
-        }else {
-            if(!language.equals("en"))
-                page = "/org/netbeans/modules/welcome/pages/welcome_"+language+".html";   // NOI18N
-            else
-                page= "pages/welcome.html";   // NOI18N
         }
         try{
+            URL url = new URL("nbresloc:/org/netbeans/modules/welcome/pages/"+page);
             jEditorPane1.setEditorKit(new javax.swing.text.html.HTMLEditorKit());
-            jEditorPane1.setPage(getClass().getResource(page));
-        }catch(Exception e){    //try to use default page
-            //default page was used
-            if(page.equals("pages/welcome_1_3_lin.html") || page.equals("pages/welcome_1_3.html") || page.equals("pages/welcome.html"))  // NOI18N
+            jEditorPane1.setPage(url);
+        }catch(Exception e){
                 ErrorManager.getDefault().notify(e);
-            else{
-                if(System.getProperty("java.vm.version").startsWith("1.3")){    // NOI18N
-                    if(System.getProperty("os.name").indexOf("Linux") != -1)    // NOI18N
-                        page= "pages/welcome_1_3_lin.html";     // NOI18N
-                    else
-                        page= "pages/welcome_1_3.html";         // NOI18N
-                }else
-                    page = "pages/welcome.html";                // NOI18N
-                try{
-                    jEditorPane1.setPage(getClass().getResource(page));
-                }catch(Exception en){
-                    ErrorManager.getDefault().notify(en);
-                }
             }
-        }
-        
         ControlPanel ctrlPanel = new ControlPanel();
         add(jEditorPane1,BorderLayout.CENTER);
         add(ctrlPanel,BorderLayout.EAST);
Index: src/org/netbeans/modules/welcome/HelpPanel.java
===================================================================
RCS file: /cvs/ui/welcome/src/org/netbeans/modules/welcome/HelpPanel.java,v
retrieving revision 1.7
diff -u -B -b -r1.7 HelpPanel.java
--- src/org/netbeans/modules/welcome/HelpPanel.java	8 Jul 2002 12:43:09 -0000	1.7
+++ src/org/netbeans/modules/welcome/HelpPanel.java	2 Jan 2003 13:09:32 -0000
@@ -36,31 +36,15 @@
         bundle = NbBundle.getBundle(HelpPanel.class);
         setEditable(false);
         setEditorKit(new javax.swing.text.html.HTMLEditorKit());         
-        String language = Locale.getDefault().getLanguage();        
-        if(!language.equals("en")){            
-            page = "/org/netbeans/modules/welcome/pages/Help_"+language+".html";   // NOI18N   
-            
-        }else{
-            page = "pages/Help.html";   // NOI18N                         
-        }
         try{              
-            setPage(getClass().getResource(page));            
+            URL pageURL = new URL("nbresloc:/org/netbeans/modules/welcome/pages/Help.html");   // NOI18N
+            setPage(pageURL);
         }catch(Exception e){
-            if(page.equals("pages/Help.html"))    // NOI18N
                 ErrorManager.getDefault().notify(e);
-            else{
-                page = "pages/Help.html";   // NOI18N
-                try{
-                    setPage(getClass().getResource(page));
-                }catch(Exception ep){
-                    ErrorManager.getDefault().notify(ep);
-                }
-            }
-                    
         }  
         HyperlinkListener hpl = new HyperlinkListener() {
             public void hyperlinkUpdate(HyperlinkEvent e) {
-                if (e.getEventType () == HyperlinkEvent.EventType.ACTIVATED) {
+                if (e.getEventType() == HyperlinkEvent.EventType.ACTIVATED) {
                     TopManager tom = TopManager.getDefault();
                     tom.setStatusText(bundle.getString("CTL_OpeningBrowser"));// NOI18N
                     URL url = e.getURL();