Index: autoupdate/src/org/netbeans/modules/autoupdate/Bundle.properties
===================================================================
RCS file: /usr/local/tigris/data/helm/cvs/repository/autoupdate/src/org/netbeans/modules/autoupdate/Bundle.properties,v
retrieving revision 1.72
diff -u -t -r1.72 Bundle.properties
--- autoupdate/src/org/netbeans/modules/autoupdate/Bundle.properties	2001/06/18 11:39:38	1.72
+++ autoupdate/src/org/netbeans/modules/autoupdate/Bundle.properties	2001/07/09 12:07:13
@@ -199,6 +199,8 @@
 
 ################################### OLD
 
+# XXX deleted unused keys!
+
 CTL_UpdateCheck=Checking for Update ...
 CTL_NewCheck=Checking for New Modules ...
 CTL_Download=Downloading
@@ -210,10 +212,6 @@
 CTL_CheckURLText=URL: 
 CTL_CheckURLTitle=Check For New Modules 
 
-CTL_CheckWebConfirmation=Update Check Confirmation
-MSG_CheckWebConfirmation=\
-        The Update Center will now check the web for module updates and for new modules.
-
 #Before Check Dialog
 CTL_AutoCheck_Title=Automatic Update Check
 MSG_AutoCheck_Before=Do you want to check for new IDE updates?
@@ -225,9 +223,6 @@
 
 #Formats of messages
 
-CTL_DownloadFailed=Download Error
-FMT_DownloadFailed=Download of module {0} failed.\nTry to download this module again?
-
 FMT_InfoError=Downloading update information for the {0} module failed.
 FMT_UnpackFailed=Unpacking of file {0} failed.
 
@@ -386,12 +381,8 @@
 LAB_226=Module Size:
 BTN_More=More
 BTN_More_Mnem=M
-<<<<<<< Bundle.properties
 LAB_227=To view any license agreements and then proceed with download, click Next.
 LBL_LocalUpdate=Manually Downloaded Modules
-=======
-LAB_227=To view any license agreements and then proceed with the download, click Next.
->>>>>>> 1.71
 
 # Panel 3
 LBL_Download=Download Modules
@@ -415,7 +406,6 @@
 CTL_Connecting_Label=Connecting to the
 CTL_Connecting_Cancel=Cancel
 CTL_Connecting_Title=Connecting
-<<<<<<< Bundle.properties
 CTL_Connecting_Cancel_ToolTip=Cancel connecting.
 CTL_Connecting_Skip=Skip
 CTL_Connecting_Skip_ToolTip=Skip connecting to current Update Center.
@@ -431,9 +421,6 @@
 CTL_Duplicate_No_ToolTip=Don't overwrite this module.
 CTL_Duplicate_No_All=No to All
 CTL_Duplicate_No_All_ToolTip=Don't overwrite any module.
-=======
-CTL_Connecting_Cancel_ToolTip=Cancel connection.
->>>>>>> 1.71
 
 # Error dialogs
 CTL_Error_OK=OK
@@ -444,13 +431,8 @@
 CTL_Invalid_titleLabel=Invalid Login or Password
 CTL_Invalid_textLabel=Re-enter the information, or click Account Maintenance to request the forgotten or new login and password.
 CTL_NoServer_Title=Error
-<<<<<<< Bundle.properties
 CTL_NoServer_titleLabel=No Update Center Service Registered or Enabled
 CTL_NoServer_textLabel=To check the web for available updates and new modules you should go to Project -> Settings -> AutoupdateType, add the appropriate update center service and enable it.
-=======
-CTL_NoServer_titleLabel=No Update Center Service Registered
-CTL_NoServer_textLabel=To check the web for available updates and new modules, choose Project | Settings | AutoupdateType and add the appropriate update center service.
->>>>>>> 1.71
 
 # Warning: Download Incomplete dialog
 CTL_Incomplete_Stop=Stop
@@ -480,4 +462,4 @@
 
 #Properties dialog
 CTL_Properties_Title=PropertyEditor: Update Center
-# End of file
\ No newline at end of file
+# End of file
Index: autoupdate/src/org/netbeans/modules/autoupdate/Bundle_ja.properties
===================================================================
RCS file: /usr/local/tigris/data/helm/cvs/repository/autoupdate/src/org/netbeans/modules/autoupdate/Bundle_ja.properties,v
retrieving revision 1.17
diff -u -t -r1.17 Bundle_ja.properties
--- autoupdate/src/org/netbeans/modules/autoupdate/Bundle_ja.properties	2001/06/18 11:39:38	1.17
+++ autoupdate/src/org/netbeans/modules/autoupdate/Bundle_ja.properties	2001/07/09 12:07:13
@@ -11,9 +11,6 @@
 
 ### Resource bundle for package org.netbeans.modules.autoupdate
 
-#Default URL update
-URL_Default=http://www.netbeans.org/updates/40_{$netbeans.autoupdate.version}_{$netbeans.autoupdate.regnum}.xml
-
 # display name of UpdateAction - displayed under the Help menu by default
 # CTL_Update=&Update Center...
 CTL_Update=\u30a2\u30c3\u30d7\u30c7\u30fc\u30c8\u30bb\u30f3\u30bf\u30fc(&U)...