Attachment #1827 for bug #13422

This Bugzilla instance is a read-only archive of historic NetBeans bug reports. To report a bug in NetBeans please follow the project's instructions for reporting issues.

View | Details | Raw Unified | Return to bug 13422
Collapse All | Expand All

Lines 199-204 Link Here

(-)autoupdate/src/org/netbeans/modules/autoupdate/Bundle.properties (-21 / +3 lines)
199		199
200	################################### OLD	200	################################### OLD
201		201
		202	# XXX deleted unused keys!
		203
202	CTL_UpdateCheck=Checking for Update ...	204	CTL_UpdateCheck=Checking for Update ...
203	CTL_NewCheck=Checking for New Modules ...	205	CTL_NewCheck=Checking for New Modules ...
204	CTL_Download=Downloading	206	CTL_Download=Downloading
Lines 210-219 Link Here
210	CTL_CheckURLText=URL:	212	CTL_CheckURLText=URL:
211	CTL_CheckURLTitle=Check For New Modules	213	CTL_CheckURLTitle=Check For New Modules
212		214
213	CTL_CheckWebConfirmation=Update Check Confirmation
214	MSG_CheckWebConfirmation=\
215	The Update Center will now check the web for module updates and for new modules.
216
217	#Before Check Dialog	215	#Before Check Dialog
218	CTL_AutoCheck_Title=Automatic Update Check	216	CTL_AutoCheck_Title=Automatic Update Check
219	MSG_AutoCheck_Before=Do you want to check for new IDE updates?	217	MSG_AutoCheck_Before=Do you want to check for new IDE updates?
Lines 225-233 Link Here
225		223
226	#Formats of messages	224	#Formats of messages
227		225
228	CTL_DownloadFailed=Download Error
229	FMT_DownloadFailed=Download of module {0} failed.\nTry to download this module again?
230
231	FMT_InfoError=Downloading update information for the {0} module failed.	226	FMT_InfoError=Downloading update information for the {0} module failed.
232	FMT_UnpackFailed=Unpacking of file {0} failed.	227	FMT_UnpackFailed=Unpacking of file {0} failed.
233		228
Lines 386-397 Link Here
386	LAB_226=Module Size:	381	LAB_226=Module Size:
387	BTN_More=More	382	BTN_More=More
388	BTN_More_Mnem=M	383	BTN_More_Mnem=M
389	<<<<<<< Bundle.properties
390	LAB_227=To view any license agreements and then proceed with download, click Next.	384	LAB_227=To view any license agreements and then proceed with download, click Next.
391	LBL_LocalUpdate=Manually Downloaded Modules	385	LBL_LocalUpdate=Manually Downloaded Modules
392	=======
393	LAB_227=To view any license agreements and then proceed with the download, click Next.
394	>>>>>>> 1.71
395		386
396	# Panel 3	387	# Panel 3
397	LBL_Download=Download Modules	388	LBL_Download=Download Modules
Lines 415-421 Link Here
415	CTL_Connecting_Label=Connecting to the	406	CTL_Connecting_Label=Connecting to the
416	CTL_Connecting_Cancel=Cancel	407	CTL_Connecting_Cancel=Cancel
417	CTL_Connecting_Title=Connecting	408	CTL_Connecting_Title=Connecting
418	<<<<<<< Bundle.properties
419	CTL_Connecting_Cancel_ToolTip=Cancel connecting.	409	CTL_Connecting_Cancel_ToolTip=Cancel connecting.
420	CTL_Connecting_Skip=Skip	410	CTL_Connecting_Skip=Skip
421	CTL_Connecting_Skip_ToolTip=Skip connecting to current Update Center.	411	CTL_Connecting_Skip_ToolTip=Skip connecting to current Update Center.
Lines 431-439 Link Here
431	CTL_Duplicate_No_ToolTip=Don't overwrite this module.	421	CTL_Duplicate_No_ToolTip=Don't overwrite this module.
432	CTL_Duplicate_No_All=No to All	422	CTL_Duplicate_No_All=No to All
433	CTL_Duplicate_No_All_ToolTip=Don't overwrite any module.	423	CTL_Duplicate_No_All_ToolTip=Don't overwrite any module.
434	=======
435	CTL_Connecting_Cancel_ToolTip=Cancel connection.
436	>>>>>>> 1.71
437		424
438	# Error dialogs	425	# Error dialogs
439	CTL_Error_OK=OK	426	CTL_Error_OK=OK
Lines 444-456 Link Here
444	CTL_Invalid_titleLabel=Invalid Login or Password	431	CTL_Invalid_titleLabel=Invalid Login or Password
445	CTL_Invalid_textLabel=Re-enter the information, or click Account Maintenance to request the forgotten or new login and password.	432	CTL_Invalid_textLabel=Re-enter the information, or click Account Maintenance to request the forgotten or new login and password.
446	CTL_NoServer_Title=Error	433	CTL_NoServer_Title=Error
447	<<<<<<< Bundle.properties
448	CTL_NoServer_titleLabel=No Update Center Service Registered or Enabled	434	CTL_NoServer_titleLabel=No Update Center Service Registered or Enabled
449	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.	435	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.
450	=======
451	CTL_NoServer_titleLabel=No Update Center Service Registered
452	CTL_NoServer_textLabel=To check the web for available updates and new modules, choose Project \| Settings \| AutoupdateType and add the appropriate update center service.
453	>>>>>>> 1.71
454		436
455	# Warning: Download Incomplete dialog	437	# Warning: Download Incomplete dialog
456	CTL_Incomplete_Stop=Stop	438	CTL_Incomplete_Stop=Stop
Lines 480-483 Link Here
480		462
481	#Properties dialog	463	#Properties dialog
482	CTL_Properties_Title=PropertyEditor: Update Center	464	CTL_Properties_Title=PropertyEditor: Update Center
483	# End of file	465	# End of file

Lines 11-19 Link Here

(-)autoupdate/src/org/netbeans/modules/autoupdate/Bundle_ja.properties (-3 lines)
11		11
12	### Resource bundle for package org.netbeans.modules.autoupdate	12	### Resource bundle for package org.netbeans.modules.autoupdate
13		13
14	#Default URL update
15	URL_Default=http://www.netbeans.org/updates/40_{$netbeans.autoupdate.version}_{$netbeans.autoupdate.regnum}.xml
16
17	# display name of UpdateAction - displayed under the Help menu by default	14	# display name of UpdateAction - displayed under the Help menu by default
18	# CTL_Update=&Update Center...	15	# CTL_Update=&Update Center...
19	CTL_Update=\u30a2\u30c3\u30d7\u30c7\u30fc\u30c8\u30bb\u30f3\u30bf\u30fc(&U)...	16	CTL_Update=\u30a2\u30c3\u30d7\u30c7\u30fc\u30c8\u30bb\u30f3\u30bf\u30fc(&U)...

Return to bug 13422