diff -r o/apisupport1/apisupport-paintapp/apisupport-paintapp/org/netbeans/modules/apisupport/paintapp/PaintAppDescription.html n/apisupport1/apisupport-paintapp/apisupport-paintapp/org/netbeans/modules/apisupport/paintapp/PaintAppDescription.html 47c47 < --- > diff -r o/apisupport1/apisupport-project/apisupport-project/org/netbeans/modules/apisupport/project/ui/Bundle.properties n/apisupport1/apisupport-project/apisupport-project/org/netbeans/modules/apisupport/project/ui/Bundle.properties 181a182 > MSG_Missing_Source_Root=Missing source root in project diff -r o/apisupport1/apisupport-project/apisupport-project/org/netbeans/modules/apisupport/project/ui/customizer/Bundle.properties n/apisupport1/apisupport-project/apisupport-project/org/netbeans/modules/apisupport/project/ui/customizer/Bundle.properties 368d367 < ACSD_EnableFloating=Enables floating windows diff -r o/apisupport1/apisupport-project/apisupport-project/org/netbeans/modules/apisupport/project/ui/resources/GLFTemplate.html n/apisupport1/apisupport-project/apisupport-project/org/netbeans/modules/apisupport/project/ui/resources/GLFTemplate.html 2,4c2,4 < < < --- > > > diff -r o/apisupport1/apisupport-project/apisupport-project/org/netbeans/modules/apisupport/project/ui/resources/newAction.html n/apisupport1/apisupport-project/apisupport-project/org/netbeans/modules/apisupport/project/ui/resources/newAction.html 47,48c47,48 < Makes a NetBeans action (CallableSystemAction or CookieAction) which < can be added to a menu, context menu, toolbar, etc. --- > Makes a NetBeans action (ActionListener or CookieAction) which > can be invoked from a menu, context menu, toolbar, etc. diff -r o/apisupport1/apisupport-project/apisupport-project/org/netbeans/modules/apisupport/project/ui/wizard/Bundle.properties n/apisupport1/apisupport-project/apisupport-project/org/netbeans/modules/apisupport/project/ui/wizard/Bundle.properties 66d65 < MSG_ChooseRegularSuite=Regular suite must be chosen 79a79 > MSG_ProjectFolderInvalidCharacters=Project name may not contain following characters on your platform: %s 83c83 < ACS_BasicInfoVisualPanel= --- > ACS_BasicInfoVisualPanel=Basic Information panel diff -r o/apisupport1/apisupport-project/apisupport-project/org/netbeans/modules/apisupport/project/ui/wizard/action/Bundle.properties n/apisupport1/apisupport-project/apisupport-project/org/netbeans/modules/apisupport/project/ui/wizard/action/Bundle.properties 45c45 < CTL_AlwaysEnabled=&Always Enabled (use CallableSystemAction) --- > CTL_AlwaysEnabled=&Always Enabled (use ActionListener) diff -r o/apisupport1/apisupport-project/apisupport-project/org/netbeans/modules/apisupport/project/ui/wizard/javahelp/template_myplugin-about.html n/apisupport1/apisupport-project/apisupport-project/org/netbeans/modules/apisupport/project/ui/wizard/javahelp/template_myplugin-about.html 1,2c1 < < < < < "> 20d4 < --> 22,23c6 < < --- > 25a9 > 33a18,29 > diff -r o/apisupport1/apisupport-project/apisupport-project/org/netbeans/modules/apisupport/project/ui/wizard/project/templateDescription.html n/apisupport1/apisupport-project/apisupport-project/org/netbeans/modules/apisupport/project/ui/wizard/project/templateDescription.html 1,2c1 < < < < "> 8d4 < --> 10,11c6,7 < < --- > > Only in n/apisupport1/apisupport-project/apisupport-project/org/netbeans/modules/apisupport/project/ui/wizard: spi diff -r o/apisupport1/apisupport-project/apisupport-project/org/netbeans/modules/apisupport/project/ui/wizard/wizard/wizardDescription.html n/apisupport1/apisupport-project/apisupport-project/org/netbeans/modules/apisupport/project/ui/wizard/wizard/wizardDescription.html 1,2c1 < < < < "> 8d4 < --> 10,11c6,7 < < --- > > 13,16c9,12 < < Replace this with a description what your wizard is supposed to do. This < information will be displayed in the New Wizard Description area. < --- > > Replace this with a description what your wizard is supposed to do. This > information will be displayed in the New Wizard Description area. > diff -r o/cnd2/cnd/cnd/org/netbeans/modules/cnd/editor/filecreation/Bundle.properties n/cnd2/cnd/cnd/org/netbeans/modules/cnd/editor/filecreation/Bundle.properties 105c105 < AD_SimpleTargetChooserPanelGUI_1=Create New File Panle --- > AD_SimpleTargetChooserPanelGUI_1=Create New File Panel 109a110 > LBL_TargetChooser_HeaderFile_Label=Header File: diff -r o/cnd2/cnd/cnd/org/netbeans/modules/cnd/loaders/Bundle.properties n/cnd2/cnd/cnd/org/netbeans/modules/cnd/loaders/Bundle.properties 66a67 > FortranDataLoader_Name_ForExtList=Fortran File diff -r o/cnd2/cnd/cnd/org/netbeans/modules/cnd/resources/bashShell.html n/cnd2/cnd/cnd/org/netbeans/modules/cnd/resources/bashShell.html 44c44 < --- > diff -r o/cnd2/cnd/cnd/org/netbeans/modules/cnd/resources/cFiles.html n/cnd2/cnd/cnd/org/netbeans/modules/cnd/resources/cFiles.html 44c44 < --- > diff -r o/cnd2/cnd/cnd/org/netbeans/modules/cnd/resources/class.html n/cnd2/cnd/cnd/org/netbeans/modules/cnd/resources/class.html 44c44 < --- > diff -r o/cnd2/cnd/cnd/org/netbeans/modules/cnd/resources/cmdline.html n/cnd2/cnd/cnd/org/netbeans/modules/cnd/resources/cmdline.html 44c44 < --- > diff -r o/cnd2/cnd/cnd/org/netbeans/modules/cnd/resources/complexMakefile.html n/cnd2/cnd/cnd/org/netbeans/modules/cnd/resources/complexMakefile.html 44c44 < --- > diff -r o/cnd2/cnd/cnd/org/netbeans/modules/cnd/resources/cppFiles.html n/cnd2/cnd/cnd/org/netbeans/modules/cnd/resources/cppFiles.html 44c44 < --- > diff -r o/cnd2/cnd/cnd/org/netbeans/modules/cnd/resources/cshShell.html n/cnd2/cnd/cnd/org/netbeans/modules/cnd/resources/cshShell.html 44c44 < --- > diff -r o/cnd2/cnd/cnd/org/netbeans/modules/cnd/resources/empty-c.html n/cnd2/cnd/cnd/org/netbeans/modules/cnd/resources/empty-c.html 44c44 < --- > diff -r o/cnd2/cnd/cnd/org/netbeans/modules/cnd/resources/empty-cc.html n/cnd2/cnd/cnd/org/netbeans/modules/cnd/resources/empty-cc.html 44c44 < --- > diff -r o/cnd2/cnd/cnd/org/netbeans/modules/cnd/resources/empty-f90.html n/cnd2/cnd/cnd/org/netbeans/modules/cnd/resources/empty-f90.html 44c44 < --- > diff -r o/cnd2/cnd/cnd/org/netbeans/modules/cnd/resources/executableMakefile.html n/cnd2/cnd/cnd/org/netbeans/modules/cnd/resources/executableMakefile.html 44c44 < --- > diff -r o/cnd2/cnd/cnd/org/netbeans/modules/cnd/resources/fixed-fortran-f.html n/cnd2/cnd/cnd/org/netbeans/modules/cnd/resources/fixed-fortran-f.html 44c44 < --- > diff -r o/cnd2/cnd/cnd/org/netbeans/modules/cnd/resources/fortranFiles.html n/cnd2/cnd/cnd/org/netbeans/modules/cnd/resources/fortranFiles.html 44c44 < --- > diff -r o/cnd2/cnd/cnd/org/netbeans/modules/cnd/resources/free-fortran-f90.html n/cnd2/cnd/cnd/org/netbeans/modules/cnd/resources/free-fortran-f90.html 44c44 < --- > diff -r o/cnd2/cnd/cnd/org/netbeans/modules/cnd/resources/intervals.html n/cnd2/cnd/cnd/org/netbeans/modules/cnd/resources/intervals.html 44c44 < --- > diff -r o/cnd2/cnd/cnd/org/netbeans/modules/cnd/resources/intgen.html n/cnd2/cnd/cnd/org/netbeans/modules/cnd/resources/intgen.html 44c44 < --- > diff -r o/cnd2/cnd/cnd/org/netbeans/modules/cnd/resources/intmat.html n/cnd2/cnd/cnd/org/netbeans/modules/cnd/resources/intmat.html 44c44 < --- > diff -r o/cnd2/cnd/cnd/org/netbeans/modules/cnd/resources/jni.html n/cnd2/cnd/cnd/org/netbeans/modules/cnd/resources/jni.html 44c44 < --- > diff -r o/cnd2/cnd/cnd/org/netbeans/modules/cnd/resources/jniFiles.html n/cnd2/cnd/cnd/org/netbeans/modules/cnd/resources/jniFiles.html 44c44 < --- > diff -r o/cnd2/cnd/cnd/org/netbeans/modules/cnd/resources/kshShell.html n/cnd2/cnd/cnd/org/netbeans/modules/cnd/resources/kshShell.html 44c44 < --- > diff -r o/cnd2/cnd/cnd/org/netbeans/modules/cnd/resources/makefiles.html n/cnd2/cnd/cnd/org/netbeans/modules/cnd/resources/makefiles.html 44c44 < --- > diff -r o/cnd2/cnd/cnd/org/netbeans/modules/cnd/resources/module-f90.html n/cnd2/cnd/cnd/org/netbeans/modules/cnd/resources/module-f90.html 44c44 < --- > diff -r o/cnd2/cnd/cnd/org/netbeans/modules/cnd/resources/motif.html n/cnd2/cnd/cnd/org/netbeans/modules/cnd/resources/motif.html 44c44 < --- > diff -r o/cnd2/cnd/cnd/org/netbeans/modules/cnd/resources/shShell.html n/cnd2/cnd/cnd/org/netbeans/modules/cnd/resources/shShell.html 44c44 < --- > diff -r o/cnd2/cnd/cnd/org/netbeans/modules/cnd/resources/sharedLibMakefile.html n/cnd2/cnd/cnd/org/netbeans/modules/cnd/resources/sharedLibMakefile.html 44c44 < --- > diff -r o/cnd2/cnd/cnd/org/netbeans/modules/cnd/resources/shells.html n/cnd2/cnd/cnd/org/netbeans/modules/cnd/resources/shells.html 44c44 < --- > diff -r o/cnd2/cnd/cnd/org/netbeans/modules/cnd/resources/simple-c-h.html n/cnd2/cnd/cnd/org/netbeans/modules/cnd/resources/simple-c-h.html 44c44 < --- > diff -r o/cnd2/cnd/cnd/org/netbeans/modules/cnd/resources/simple-c.html n/cnd2/cnd/cnd/org/netbeans/modules/cnd/resources/simple-c.html 44c44 < --- > diff -r o/cnd2/cnd/cnd/org/netbeans/modules/cnd/resources/simple-cc-h.html n/cnd2/cnd/cnd/org/netbeans/modules/cnd/resources/simple-cc-h.html 44c44 < --- > diff -r o/cnd2/cnd/cnd/org/netbeans/modules/cnd/resources/simple-cc.html n/cnd2/cnd/cnd/org/netbeans/modules/cnd/resources/simple-cc.html 44c44 < --- > diff -r o/cnd2/cnd/cnd/org/netbeans/modules/cnd/resources/simpleMakefiles.html n/cnd2/cnd/cnd/org/netbeans/modules/cnd/resources/simpleMakefiles.html 44c44 < --- > diff -r o/cnd2/cnd/cnd/org/netbeans/modules/cnd/resources/solarisPrograms.html n/cnd2/cnd/cnd/org/netbeans/modules/cnd/resources/solarisPrograms.html 44c44 < --- > diff -r o/cnd2/cnd/cnd/org/netbeans/modules/cnd/resources/staticLibMakefile.html n/cnd2/cnd/cnd/org/netbeans/modules/cnd/resources/staticLibMakefile.html 44c44 < --- > diff -r o/cnd2/cnd/cnd/org/netbeans/modules/cnd/resources/zshShell.html n/cnd2/cnd/cnd/org/netbeans/modules/cnd/resources/zshShell.html 44c44 < --- > diff -r o/cnd2/cnd/cnd/org/netbeans/modules/cnd/ui/options/Bundle.properties n/cnd2/cnd/cnd/org/netbeans/modules/cnd/ui/options/Bundle.properties 245c245 < TP_ErrorMessage_BadDevHost=Host {0} is not Online --- > TP_ErrorMessage_BadDevHost=Host {0} is Offline, connect it in Edit Host List dialog 252a253 > AddCompilerSetPanel.btBaseDirectoryRemoteMode.text=Check 293a295 > NEW_TOOL_SET_TITLE_REMOTE=Add New Tool Collection for {0} 302a305 > REMOTEBASE_INVALID=No compiler sets were found for this Base Directory 318c321 < ToolsPanel.lblErrors.text=Errors area --- > ToolsPanel.lblErrors.text= 319a323,325 > > TITLE_Configure=Configuring > MSG_Configure_Compiler_Sets=Detecting tools collections on {0} Only in n/cnd2/cnd-completion/cnd-completion/org/netbeans/modules/cnd/completion/cplusplus: hyperlink diff -r o/cnd2/cnd-debugger-gdb/cnd-debugger-gdb/org/netbeans/modules/cnd/debugger/gdb/Bundle.properties n/cnd2/cnd-debugger-gdb/cnd-debugger-gdb/org/netbeans/modules/cnd/debugger/gdb/Bundle.properties 61a62 > CTL_Debugger_stopped_by_signal = User program stopped by signal ({0}) diff -r o/cnd2/cnd-discovery/cnd-discovery/org/netbeans/modules/cnd/discovery/project/Bundle.properties n/cnd2/cnd-discovery/cnd-discovery/org/netbeans/modules/cnd/discovery/project/Bundle.properties 44,46c44,48 < CREATING_COMMANDS=Creating project "{0}"/commands... < CREATING_LIBRARIES=Creating project "{0}"/libraries... < CREATING_SOURCES=Creating project "{0}"/sources... --- > #For three keys below, those slashes are meant to symbolize project paths structure. > #So words "commands", "libraries" and "sources" should NOT be translated > CREATING_COMMANDS=Creating project "{0}/commands"... > CREATING_LIBRARIES=Creating project "{0}/libraries"... > CREATING_SOURCES=Creating project "{0}/sources"... diff -r o/cnd2/cnd-discovery/cnd-discovery/org/netbeans/modules/cnd/discovery/wizard/Bundle.properties n/cnd2/cnd-discovery/cnd-discovery/org/netbeans/modules/cnd/discovery/wizard/Bundle.properties 142a143,149 > > OUTPUT_LOG_ACTION_TEXT=Configure Code Assistance > OUTPUT_LOG_DILOG_TITLE_TEXT=Configure Project Using Build Output > OUTPUT_LOG_DILOG_COMTENT_TEXT=Output log can be used as a source for configuring your project\ > \nonly if it was not an incremental build.\ > \nWe advice to use only output of Clean & Build action.\ > \nDo you want to continue? diff -r o/cnd2/cnd-editor/cnd-editor/org/netbeans/modules/cnd/editor/options/Bundle.properties n/cnd2/cnd-editor/cnd-editor/org/netbeans/modules/cnd/editor/options/Bundle.properties 46a47,48 > LBL_tabSize=Tab Size > HINT_tabSize=Tab Size 48a51,52 > LBL_constructorListContinuationIndent=Constructor Continuation Initializer List Indent > HINT_constructorListContinuationIndent=Shift for second and subsequent lines in a constructor initializer list 253a258,259 > AN_Preview=Preview > AD_Preview=Preview diff -r o/cnd2/cnd-highlight/cnd-highlight/org/netbeans/modules/cnd/highlight/error/Bundle.properties n/cnd2/cnd-highlight/cnd-highlight/org/netbeans/modules/cnd/highlight/error/Bundle.properties 37,56d36 < < ErrorIncludeDialog_Title=Failed #include Directives < ErrorIncludeDialog_AccessibleName=View failed include directives < ErrorIncludeDialog_AccessibleDescription=View failed include directives that were found at parsing time. < < ErrorIncludeDialog_TitleInclides=#include &Directives: < ErrorIncludeDialog_AccessibleNameInclides=List of failed include directives < ErrorIncludeDialog_AccessibleDescriptionInclides=List of failed include directives that were found at parsing time. < < ErrorIncludeDialog_TitleFiles=&Source Files: < ErrorIncludeDialog_AccessibleNameFiles=List of source files where selected failed include directive was found < ErrorIncludeDialog_AccessibleDescriptionFiles=List of source files where selected failed include directive was found. < < ErrorIncludeDialog_TitleGuess=Source's Related &Files: < ErrorIncludeDialog_AccessibleNameGuess=Related header and object files for selected source file < ErrorIncludeDialog_AccessibleDescriptionGuess=List of header files whose names are the same as selected failed include directive. List of object files related to selected source file. < < HeaderFromBinary=\tBinary file was compiled in "{0}" folder\n\tfrom source file "{1}".\n\tInclude path is "{2}". < < ErrorIncludeMenu_Title=Show Failed #include Directives... diff -r o/cnd2/cnd-highlight/cnd-highlight/org/netbeans/modules/cnd/highlight/error/includes/Bundle.properties n/cnd2/cnd-highlight/cnd-highlight/org/netbeans/modules/cnd/highlight/error/includes/Bundle.properties 34,35d33 < CppParserAnnotationInclide=Cannot find include file {0} < 52a51,54 > PathToHeader=Path to header from source file: > PathToHeaderLine=: (line {0}) > SourceUserPaths=User include paths for source file: > SourceSystemPaths=System include paths for source file: diff -r o/cnd2/cnd-highlight/cnd-highlight/org/netbeans/modules/cnd/highlight/semantic/options/Bundle.properties n/cnd2/cnd-highlight/cnd-highlight/org/netbeans/modules/cnd/highlight/semantic/options/Bundle.properties 40c40 < TAB_SemanticHighlightingTab=Semantic Highlighting --- > TAB_SemanticHighlightingTab=Highlighting 70,71c70,82 < SemanticHighlightingOptionsPanel_AN=Semantic Highlighting Options < SemanticHighlightingOptionsPanel_AD=On this panel you can set up which types of Semantic Highlighting you will see in the editor --- > SemanticHighlightingOptionsPanel_AN=Highlighting Options > SemanticHighlightingOptionsPanel_AD=On this panel you can set up which types of Highlighting you will see in the editor > > #error hl > Show-syntax-error=Highlight Syntax Errors > Show-syntax-error-mnemonic=r > Show-syntax-error-AD=N/A > Show-unresolved-identifier=Highlight Unresolved Identifiers (Experimental Feature) > Show-unresolved-identifier-mnemonic=g > Show-unresolved-identifier-AD=N/A > Show-include-errors=Highlight Unresolved Include Files > Show-include-errors-mnemonic=o > Show-include-errors-AD=N/A diff -r o/cnd2/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/Bundle.properties n/cnd2/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/Bundle.properties 104c104 < extensions with C/C++ header object type? --- > extension with C/C++ header object type? 122c122 < extensions with C++ source object type? --- > extension with C++ source object type? 125d124 < ConfigureHostPanel.lblHost.text= diff -r o/cnd2/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/api/actions/Bundle.properties n/cnd2/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/api/actions/Bundle.properties 53c53 < BatchBuildActionName=Ba&tch Build {0,choice,-1#Main Project|0#Project|1#Project ({1})|1<{0} Projects} --- > BatchBuildActionName=Batch Build {0,choice,-1#Main Pro&ject...|0#Pro&ject...|1#Pro&ject... ({1})|1<{0} Pro&jects...} diff -r o/cnd2/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/api/configurations/Bundle.properties n/cnd2/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/api/configurations/Bundle.properties 62c62 < OutputHint=Name of output file. --- > OutputHint=Name of output file or output directory. 85d84 < VerboseHint=Verbose output 94a94,96 > RPM=RPM Package > Debian=Debian Package > 96d97 < PackageTypeHint=Package Type... 248c249,250 < NOT_FOUND=not found --- > NOT_FOUND={0} - not found > NOT_CONFIGURED={0} - Offline 256a259 > DefaultArchictureValue=Architecture... diff -r o/cnd2/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/api/runprofiles/Bundle.properties n/cnd2/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/api/runprofiles/Bundle.properties 45c45 < ConsoleType_Output=Output Window (output only) --- > ConsoleType_Output=Output Window diff -r o/cnd2/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/configurations/ui/Bundle.properties n/cnd2/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/configurations/ui/Bundle.properties 56d55 < ADD_BUTTON_TXT=Add Project 134a134,136 > # DevelopmentHostNodeProp's customizer > DLG_TITLE_Connect=Broken Connection > 245,246c247,248 < The Solaris operating environment supports the run lev- \ < els s, S, 0, 1, 2, 3, 5, and 6. Applicable run levels \ --- > The Solaris operating environment supports the run levels \ > s, S, 0, 1, 2, 3, 5, and 6. Applicable run levels \ 344,345c346,347 < string in the base package specified (see VERSION param- \ < eter in this manual page). When in use, SUNW_PKGLIST \ --- > string in the base package specified (see VERSION parameter \ > in this manual page). When in use, SUNW_PKGLIST \ 373c375 < where has the form x.y[.z] and x, \ --- > where has the form x.y[.z] and x, \ 405d406 < PackagingFilesOuterPanel.topDirectoryTextField.text=MyPackage 423d423 < DefaultArchictureValue=Architecture... 431c431 < PackagingPanel.tabbedPane.AccessibleContext.accessibleName=FilesSndInfoPanel --- > PackagingPanel.tabbedPane.AccessibleContext.accessibleName=FilesAndInfoPanel 461c461 < PackagingFilesOuterPanel.eLabel3.text=e --- > PackagingFilesOuterPanel.eLabel3.text=x 464c464 < PackagingFilesOuterPanel.eLabel1.text=e --- > PackagingFilesOuterPanel.eLabel1.text=x 467c467 < PackagingFilesOuterPanel.eLabel2.text=e --- > PackagingFilesOuterPanel.eLabel2.text=x diff -r o/cnd2/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/customizer/Bundle.properties n/cnd2/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/customizer/Bundle.properties 83a84 > ALL_CONFIGURATIONS_TOOLTIP=General category applies to all configurations 89a91,94 > > # DevelopmentHostCustomizer > ERR_NeedToInitializeRemoteHost=Needed connection {0} is not available.\nDo you want to reconnect? > ERR_NothingToDo=The connection to {0} is online. diff -r o/cnd2/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/resources/desktop.html n/cnd2/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/resources/desktop.html 42c42 < --- > 44c44 < --- > diff -r o/cnd2/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/resources/makefile.html n/cnd2/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/resources/makefile.html 42c42 < --- > 44c44 < --- > diff -r o/cnd2/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/resources/newApplication.html n/cnd2/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/resources/newApplication.html 42c42 < --- > 44c44 < --- > diff -r o/cnd2/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/resources/newDynamicLibrary.html n/cnd2/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/resources/newDynamicLibrary.html 42c42 < --- > 44c44 < --- > diff -r o/cnd2/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/resources/newStaticLibrary.html n/cnd2/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/resources/newStaticLibrary.html 42c42 < --- > 44c44 < --- > diff -r o/cnd2/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/resources/samples/args.html n/cnd2/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/resources/samples/args.html 42c42 < --- > 44c44 < --- > Only in n/cnd2/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/resources/samples: fractal.html diff -r o/cnd2/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/resources/samples/freeway.html n/cnd2/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/resources/samples/freeway.html 42c42 < --- > 44c44 < --- > Only in n/cnd2/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/resources/samples: hello.html diff -r o/cnd2/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/resources/samples/helloapp.html n/cnd2/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/resources/samples/helloapp.html 42c42 < --- > 44c44 < --- > diff -r o/cnd2/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/resources/samples/io.html n/cnd2/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/resources/samples/io.html 42c42 < --- > 44c44 < --- > Only in n/cnd2/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/resources/samples: lexyacc.html diff -r o/cnd2/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/resources/samples/mp.html n/cnd2/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/resources/samples/mp.html 42c42 < --- > 44c44 < --- > Only in n/cnd2/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/resources/samples: pi.html diff -r o/cnd2/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/resources/samples/quote.html n/cnd2/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/resources/samples/quote.html 42c42 < --- > 44c44 < --- > diff -r o/cnd2/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/resources/samples/welcome.html n/cnd2/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/resources/samples/welcome.html 42c42 < --- > 44c44 < --- > diff -r o/cnd2/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/utils/Bundle.properties n/cnd2/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/utils/Bundle.properties 116d115 < EDIT_DIALOG_TITLE_TXT=Edit diff -r o/cnd2/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/wizards/Bundle.properties n/cnd2/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/wizards/Bundle.properties 91a92,95 > Templates/Project/Samples/Native/LexYacc=Lex/Yacc based Application > Templates/Project/Samples/Native/Fractal=Fractal > Templates/Project/Samples/Native/Hello=Fortran Hello World Application > Templates/Project/Samples/Native/Pi=Pi Only in n/cnd2/cnd-modelutil/cnd-modelutil/org/netbeans/modules/cnd/modelutil: Bundle.properties diff -r o/cnd2/cnd-remote/cnd-remote/org/netbeans/modules/cnd/remote/support/Bundle.properties n/cnd2/cnd-remote/cnd-remote/org/netbeans/modules/cnd/remote/support/Bundle.properties 63a64,68 > PasswordDlg.cbRememberPwd.text=&Remember Password (Low security) > DESC_Password=Password field > AN_Password=Password > AN_RememberPassword=Remember Password > DESC_RememberPassword=Remember password between IDE sessions. Low security diff -r o/cnd2/cnd-remote/cnd-remote/org/netbeans/modules/cnd/remote/ui/Bundle.properties n/cnd2/cnd-remote/cnd-remote/org/netbeans/modules/cnd/remote/ui/Bundle.properties 91a92,94 > AddServerDialog.cbRememberPwd.text=&Remember Password (Low security) > DESC_RememberPassword=Remember password between IDE sessions. Low security > AN_RememberPassword=Remember password diff -r o/enterprise5/glassfish-javaee/glassfish-javaee/org/netbeans/modules/glassfish/javaee/Bundle.properties n/enterprise5/glassfish-javaee/glassfish-javaee/org/netbeans/modules/glassfish/javaee/Bundle.properties 60a61,62 > MSG_SERVER_PROFILING_IN_PROGRESS=Server profiling in progress. > 71c73 < MSG_SERVER_PROFILING_IN_PROGRESS=Server profiling in progress. \ No newline at end of file --- > ERR_WrongTarget=Target {0} is not an instance of Hk2Target. diff -r o/enterprise5/glassfish-javaee/glassfish-javaee/org/netbeans/modules/glassfish/javaee/ide/Bundle.properties n/enterprise5/glassfish-javaee/glassfish-javaee/org/netbeans/modules/glassfish/javaee/ide/Bundle.properties 63a64 > MSG_RedeployUnneeded=Skipping unnecessary redeploy operation \ No newline at end of file diff -r o/enterprise5/j2ee-archive/j2ee-archive/org/netbeans/modules/j2ee/archive/wizard/DeployableDescription.html n/enterprise5/j2ee-archive/j2ee-archive/org/netbeans/modules/j2ee/archive/wizard/DeployableDescription.html 3c3 < --- > diff -r o/enterprise5/j2ee-clientproject/j2ee-clientproject/org/netbeans/modules/j2ee/clientproject/ui/Bundle.properties n/enterprise5/j2ee-clientproject/j2ee-clientproject/org/netbeans/modules/j2ee/clientproject/ui/Bundle.properties 53c53 < LBL_RedeployAction_Name=Undeploy and Deploy --- > LBL_RedeployAction_Name=Deploy diff -r o/enterprise5/j2ee-clientproject/j2ee-clientproject/org/netbeans/modules/j2ee/clientproject/ui/customizer/Bundle.properties n/enterprise5/j2ee-clientproject/j2ee-clientproject/org/netbeans/modules/j2ee/clientproject/ui/customizer/Bundle.properties 56d55 < TXT_Encoding=&Encoding\: diff -r o/enterprise5/j2ee-clientproject/j2ee-clientproject/org/netbeans/modules/j2ee/clientproject/ui/resources/desktop.html n/enterprise5/j2ee-clientproject/j2ee-clientproject/org/netbeans/modules/j2ee/clientproject/ui/resources/desktop.html 42c42 < --- > 44c44 < --- > diff -r o/enterprise5/j2ee-clientproject/j2ee-clientproject/org/netbeans/modules/j2ee/clientproject/ui/resources/emptyProject.html n/enterprise5/j2ee-clientproject/j2ee-clientproject/org/netbeans/modules/j2ee/clientproject/ui/resources/emptyProject.html 42c42 < --- > 44c44 < --- > diff -r o/enterprise5/j2ee-clientproject/j2ee-clientproject/org/netbeans/modules/j2ee/clientproject/ui/resources/importProject.html n/enterprise5/j2ee-clientproject/j2ee-clientproject/org/netbeans/modules/j2ee/clientproject/ui/resources/importProject.html 42c42 < --- > 44c44 < --- > diff -r o/enterprise5/j2ee-common/j2ee-common/org/netbeans/modules/j2ee/common/project/ui/Bundle.properties n/enterprise5/j2ee-common/j2ee-common/org/netbeans/modules/j2ee/common/project/ui/Bundle.properties 213d212 < MSG_RecommendationSetJdk14=Recommendation: JDK 1.4 and Source Level 1.4 should be used in J2EE 1.4 projects. 287a287,299 > > > LBL_ProjectBuiltAutomatically=Files in this project are automatically redeployed to the server when you save them.
\ > You do not need to build the project to run or debug the project in the IDE.
\ >
\ > If you need to build or rebuild the project's distributables,
\ > such as JAR files and WAR files, use Clean and Build.
\ > To disable the automatic deployment feature and activate the Build command,
\ > go to Project Properties and disable Deploy on Save. > BTN_ProjectProperties=Project Properties... > BTN_CleanAndBuild=Clean and Build > BTN_OK=OK > TITLE_BuildProjectWarning=Build Project ({0}) diff -r o/enterprise5/j2ee-ddloaders/j2ee-ddloaders/org/netbeans/modules/j2ee/ddloaders/web/multiview/Bundle.properties n/enterprise5/j2ee-ddloaders/j2ee-ddloaders/org/netbeans/modules/j2ee/ddloaders/web/multiview/Bundle.properties 54c54 < TXT_EmptyInitParamValue=Missing ParamValue --- > TXT_EmptyInitParamValue=Missing Param Value 755c755 < ACSD_description=Servlet Filter Description \ No newline at end of file --- > ACSD_filterDescription=Servlet Filter Description \ No newline at end of file diff -r o/enterprise5/j2ee-earproject/j2ee-earproject/org/netbeans/modules/j2ee/earproject/ui/Bundle.properties n/enterprise5/j2ee-earproject/j2ee-earproject/org/netbeans/modules/j2ee/earproject/ui/Bundle.properties 49c49 < LBL_DeployAction_Name=Undeploy and Deploy --- > LBL_DeployAction_Name=Deploy diff -r o/enterprise5/j2ee-earproject/j2ee-earproject/org/netbeans/modules/j2ee/earproject/ui/customizer/Bundle.properties n/enterprise5/j2ee-earproject/j2ee-earproject/org/netbeans/modules/j2ee/earproject/ui/customizer/Bundle.properties 153c153 < LBL_CustomizeRun_DeployOnSave_JCheckBox=&Deploy on Change --- > LBL_CustomizeRun_DeployOnSave_JCheckBox=&Deploy on Save diff -r o/enterprise5/j2ee-earproject/j2ee-earproject/org/netbeans/modules/j2ee/earproject/ui/resources/completeProject.html n/enterprise5/j2ee-earproject/j2ee-earproject/org/netbeans/modules/j2ee/earproject/ui/resources/completeProject.html 43c43 < --- > 45c45 < --- > diff -r o/enterprise5/j2ee-earproject/j2ee-earproject/org/netbeans/modules/j2ee/earproject/ui/resources/ear.html n/enterprise5/j2ee-earproject/j2ee-earproject/org/netbeans/modules/j2ee/earproject/ui/resources/ear.html 42c42 < --- > 44c44 < --- > diff -r o/enterprise5/j2ee-earproject/j2ee-earproject/org/netbeans/modules/j2ee/earproject/ui/resources/emptyProject.html n/enterprise5/j2ee-earproject/j2ee-earproject/org/netbeans/modules/j2ee/earproject/ui/resources/emptyProject.html 43c43 < --- > 45c45 < --- > diff -r o/enterprise5/j2ee-earproject/j2ee-earproject/org/netbeans/modules/j2ee/earproject/ui/resources/importProject.html n/enterprise5/j2ee-earproject/j2ee-earproject/org/netbeans/modules/j2ee/earproject/ui/resources/importProject.html 43c43 < --- > 45c45 < --- > diff -r o/enterprise5/j2ee-earproject/j2ee-earproject/org/netbeans/modules/j2ee/earproject/ui/wizards/Bundle.properties n/enterprise5/j2ee-earproject/j2ee-earproject/org/netbeans/modules/j2ee/earproject/ui/wizards/Bundle.properties 43d42 < Templates/J2EE=Enterprise 146d144 < MSG_ModuleLocationAlreadyExists=The location of one or more modules already exists in the project folder. 148a147 > MSG_ModuleNotJavaEEModule=Module {0} is not a valid Java EE module. diff -r o/enterprise5/j2ee-earproject/j2ee-earproject/org/netbeans/modules/j2ee/earproject/ui/wizards/dd/applicationXml.html n/enterprise5/j2ee-earproject/j2ee-earproject/org/netbeans/modules/j2ee/earproject/ui/wizards/dd/applicationXml.html 3c3 < --- > 5c5 < --- > diff -r o/enterprise5/j2ee-ejbcore/j2ee-ejbcore/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/Bundle.properties n/enterprise5/j2ee-ejbcore/j2ee-ejbcore/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/Bundle.properties 55a56 > ERR_JavaTargetChooser_InvalidRootFolder=The Location is not valid diff -r o/enterprise5/j2ee-ejbcore/j2ee-ejbcore/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/dd/ejbJarXml.html n/enterprise5/j2ee-ejbcore/j2ee-ejbcore/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/dd/ejbJarXml.html 3c3 < --- > 5c5 < --- > diff -r o/enterprise5/j2ee-ejbcore/j2ee-ejbcore/org/netbeans/modules/j2ee/ejbcore/resources/Bundle.properties n/enterprise5/j2ee-ejbcore/j2ee-ejbcore/org/netbeans/modules/j2ee/ejbcore/resources/Bundle.properties 43c43 < Templates/J2EE=Enterprise --- > Templates/J2EE=Java EE diff -r o/enterprise5/j2ee-ejbcore/j2ee-ejbcore/org/netbeans/modules/j2ee/ejbcore/resources/CMPDatabase.html n/enterprise5/j2ee-ejbcore/j2ee-ejbcore/org/netbeans/modules/j2ee/ejbcore/resources/CMPDatabase.html 43c43 < --- > 45,46c45,47 < < --- > > > diff -r o/enterprise5/j2ee-ejbcore/j2ee-ejbcore/org/netbeans/modules/j2ee/ejbcore/resources/CachingServiceLocator.html n/enterprise5/j2ee-ejbcore/j2ee-ejbcore/org/netbeans/modules/j2ee/ejbcore/resources/CachingServiceLocator.html 43c43 < --- > 45,46c45,47 < < --- > > > diff -r o/enterprise5/j2ee-ejbcore/j2ee-ejbcore/org/netbeans/modules/j2ee/ejbcore/resources/EntityEJB.html n/enterprise5/j2ee-ejbcore/j2ee-ejbcore/org/netbeans/modules/j2ee/ejbcore/resources/EntityEJB.html 43c43 < --- > 45,46c45,47 < < --- > > > diff -r o/enterprise5/j2ee-ejbcore/j2ee-ejbcore/org/netbeans/modules/j2ee/ejbcore/resources/MessageEJB.html n/enterprise5/j2ee-ejbcore/j2ee-ejbcore/org/netbeans/modules/j2ee/ejbcore/resources/MessageEJB.html 43c43 < --- > 45,46c45,47 < < --- > > > diff -r o/enterprise5/j2ee-ejbcore/j2ee-ejbcore/org/netbeans/modules/j2ee/ejbcore/resources/ServiceLocator.html n/enterprise5/j2ee-ejbcore/j2ee-ejbcore/org/netbeans/modules/j2ee/ejbcore/resources/ServiceLocator.html 43c43 < --- > 45,46c45,47 < < --- > > > diff -r o/enterprise5/j2ee-ejbcore/j2ee-ejbcore/org/netbeans/modules/j2ee/ejbcore/resources/SessionEJB.html n/enterprise5/j2ee-ejbcore/j2ee-ejbcore/org/netbeans/modules/j2ee/ejbcore/resources/SessionEJB.html 43c43 < --- > 45,46c45,47 < < --- > > > diff -r o/enterprise5/j2ee-ejbjarproject/j2ee-ejbjarproject/org/netbeans/modules/j2ee/ejbjarproject/Bundle.properties n/enterprise5/j2ee-ejbjarproject/j2ee-ejbjarproject/org/netbeans/modules/j2ee/ejbjarproject/Bundle.properties 103,107d102 < # UI Logging < #{0} server type id < #{1} server instance id < UI_EJB_PROJECT_OPENED=An ejb application was opened with target server {0}. < diff -r o/enterprise5/j2ee-ejbjarproject/j2ee-ejbjarproject/org/netbeans/modules/j2ee/ejbjarproject/ui/Bundle.properties n/enterprise5/j2ee-ejbjarproject/j2ee-ejbjarproject/org/netbeans/modules/j2ee/ejbjarproject/ui/Bundle.properties 47c47 < LBL_RedeployAction_Name=Undeploy and Deploy --- > LBL_RedeployAction_Name=Deploy diff -r o/enterprise5/j2ee-ejbjarproject/j2ee-ejbjarproject/org/netbeans/modules/j2ee/ejbjarproject/ui/customizer/Bundle.properties n/enterprise5/j2ee-ejbjarproject/j2ee-ejbjarproject/org/netbeans/modules/j2ee/ejbjarproject/ui/customizer/Bundle.properties 124c124 < LBL_CustomizeRun_DeployOnSave_JCheckBox=&Deploy on Change --- > LBL_CustomizeRun_DeployOnSave_JCheckBox=&Deploy on Save diff -r o/enterprise5/j2ee-ejbjarproject/j2ee-ejbjarproject/org/netbeans/modules/j2ee/ejbjarproject/ui/resources/ejbjar.html n/enterprise5/j2ee-ejbjarproject/j2ee-ejbjarproject/org/netbeans/modules/j2ee/ejbjarproject/ui/resources/ejbjar.html 42c42 < --- > 44c44 < --- > diff -r o/enterprise5/j2ee-ejbjarproject/j2ee-ejbjarproject/org/netbeans/modules/j2ee/ejbjarproject/ui/resources/emptyProject.html n/enterprise5/j2ee-ejbjarproject/j2ee-ejbjarproject/org/netbeans/modules/j2ee/ejbjarproject/ui/resources/emptyProject.html 44c44 < --- > 46c46 < --- > diff -r o/enterprise5/j2ee-ejbjarproject/j2ee-ejbjarproject/org/netbeans/modules/j2ee/ejbjarproject/ui/resources/importProject.html n/enterprise5/j2ee-ejbjarproject/j2ee-ejbjarproject/org/netbeans/modules/j2ee/ejbjarproject/ui/resources/importProject.html 44c44 < --- > 46c46 < --- > diff -r o/enterprise5/j2ee-jboss4/j2ee-jboss4/org/netbeans/modules/j2ee/jboss4/ide/ui/Bundle.properties n/enterprise5/j2ee-jboss4/j2ee-jboss4/org/netbeans/modules/j2ee/jboss4/ide/ui/Bundle.properties 57a58,59 > MSG_SpecifyServerLocation=Please specify JBoss Application Server 4 or 5 Installation Location > 87a90,91 > MSG_SpecifyDomainPath=Please specify domain path. > diff -r o/enterprise5/j2ee-samples/j2ee-samples/org/netbeans/modules/j2ee/samples/descriptions/JsfJpa.html n/enterprise5/j2ee-samples/j2ee-samples/org/netbeans/modules/j2ee/samples/descriptions/JsfJpa.html 8c8 < in conjunction with JavaServer Faces that creates --- > in conjunction with JavaServer Faces. The sample creates diff -r o/enterprise5/j2ee-samples/j2ee-samples/org/netbeans/modules/j2ee/samples/descriptions/JsfJpaCrud.html n/enterprise5/j2ee-samples/j2ee-samples/org/netbeans/modules/j2ee/samples/descriptions/JsfJpaCrud.html 8c8 < in conjunction with JavaServer Faces that creates --- > in conjunction with JavaServer Faces. The sample creates Only in n/enterprise5/j2ee-sun-appsrv/j2ee-sun-appsrv/org/netbeans/modules/j2ee/sun: api diff -r o/enterprise5/j2ee-sun-appsrv/j2ee-sun-appsrv/org/netbeans/modules/j2ee/sun/ide/sunresources/wizards/Bundle.properties n/enterprise5/j2ee-sun-appsrv/j2ee-sun-appsrv/org/netbeans/modules/j2ee/sun/ide/sunresources/wizards/Bundle.properties 77,83c77,79 < LBL_datasource-classname=Datasource Classname: < LBL_res-type=Resource Type: < LBL_properties=Properties: < < LBL_res-type_Mnemonic=T < LBL_datasource-classname_Mnemonic=C < LBL_properties_Mnemonic=P --- > LBL_datasource-classname=Datasource &Classname: > LBL_res-type=Resource &Type: > LBL_properties=&Properties: 92,93c88 < LBL_Add=Add < LBL_Add_Mnemonic=A --- > LBL_Add=&Add 95,96c90 < LBL_Remove=Remove < LBL_Remove_Mnemonic=R --- > LBL_Remove=&Remove 147,173c141,153 < LBL_steady-pool-size=Steady Pool Size: < LBL_max-pool-size=Max Pool Size: < LBL_max-wait-time-in-millis=Max Wait time: < LBL_pool-resize-quantity=Pool Resize Quantity: < LBL_idle-timeout-in-seconds=Idle Timeout (secs): < LBL_transaction-isolation-level=Transaction Isolation: < LBL_is-isolation-level-guaranteed=Guarantee Isolation Level: < LBL_is-connection-validation-required=Connection Validation Required: < LBL_connection-validation-method=Validation Method: < LBL_validation-table-name=Table Name: < LBL_fail-all-connections=Fail All Connections: < LBL_non-transactional-connections=Non Transactional Connections: < LBL_allow-non-component-callers=Allow Non Component Callers: < < LBL_steady-pool-size_Mnemonic=S < LBL_max-pool-size_Mnemonic=M < LBL_max-wait-time-in-millis_Mnemonic=W < LBL_pool-resize-quantity_Mnemonic=P < LBL_idle-timeout-in-seconds_Mnemonic=I < LBL_transaction-isolation-level_Mnemonic=T < LBL_is-isolation-level-guaranteed_Mnemonic=G < LBL_is-connection-validation-required_Mnemonic=R < LBL_connection-validation-method_Mnemonic=V < LBL_validation-table-name_Mnemonic=a < LBL_fail-all-connections_Mnemonic=o < LBL_non-transactional-connections_Mnemonic=N < LBL_allow-non-component-callers_Mnemonic=C --- > LBL_steady-pool-size=&Steady Pool Size: > LBL_max-pool-size=&Max Pool Size: > LBL_max-wait-time-in-millis=Max &Wait time: > LBL_pool-resize-quantity=&Pool Resize Quantity: > LBL_idle-timeout-in-seconds=&Idle Timeout (secs): > LBL_transaction-isolation-level=&Transaction Isolation: > LBL_is-isolation-level-guaranteed=&Guarantee Isolation Level: > LBL_is-connection-validation-required=Connection Validation &Required: > LBL_connection-validation-method=&Validation Method: > LBL_validation-table-name=T&able Name: > LBL_fail-all-connections=Fail All C&onnections: > LBL_non-transactional-connections=&Non Transactional Connections: > LBL_allow-non-component-callers=Allow Non &Component Callers: 202,205c182,185 < ExistingResource_DS=Use Existing JDBC Connection Pool < ExistingResource_PM=Use Existing JDBC Resource < NewResource_DS=Create New JDBC Connection Pool < NewResource_PM=Create New JDBC Resource --- > ExistingResource_DS=&Use Existing JDBC Connection Pool > ExistingResource_PM=&Use Existing JDBC Resource > NewResource_DS=Create Ne&w JDBC Connection Pool > NewResource_PM=Create Ne&w JDBC Resource 209,211d188 < ExistingResource_Default_Mnemonic=U < NewResource_Default_Mnemonic=W < 217,218c194 < LBL_jndi-name=JNDI Name:* < LBL_jndi-name_Mnemonic=J --- > LBL_jndi-name=&JNDI Name:* 220,225c196,198 < LBL_enabled=Enabled: < LBL_enabled_Mnemonic=E < LBL_object-type=Object Type: < LBL_object-type_Mnemonic=O < LBL_description=Description: < LBL_description_Mnemonic=D --- > LBL_enabled=&Enabled: > LBL_object-type=&Object Type: > LBL_description=&Description: 234,235c207 < LBL_jms-provider=JMS Provider: < LBL_jms-provider_Mnemonic=M --- > LBL_jms-provider=J&MS Provider: 239,248c211,215 < LBL_AdminObject_Queue=javax.jms.Queue < LBL_AdminObject_Topic=javax.jms.Topic < LBL_Connector_QueueConnectionFactory=javax.jms.QueueConnectionFactory < LBL_Connector_TopicConnectionFactory=javax.jms.TopicConnectionFactory < LBL_Connector_ConnectionFactory=javax.jms.ConnectionFactory < LBL_AdminObject_Queue_Mnemonic=Q < LBL_AdminObject_Topic_Mnemonic=T < LBL_Connector_QueueConnectionFactory_Mnemonic=C < LBL_Connector_TopicConnectionFactory_Mnemonic=o < LBL_Connector_ConnectionFactory_Mnemonic=n --- > LBL_AdminObject_Queue=javax.jms.&Queue > LBL_AdminObject_Topic=javax.jms.&Topic > LBL_Connector_QueueConnectionFactory=javax.jms.Queue&ConnectionFactory > LBL_Connector_TopicConnectionFactory=javax.jms.T&opicConnectionFactory > LBL_Connector_ConnectionFactory=javax.jms.Co&nnectionFactory 268,284c235,242 < LBL_host=Mail Host:* < LBL_user=Default User:* < LBL_from=Default Return Address:* < LBL_debug=Debug Enabled: < LBL_store-protocol=Store Protocol: < LBL_store-protocol-class=Store Protocol Class: < LBL_transport-protocol=Transport Protocol: < LBL_transport-protocol-class=Transport Protocol Class: < < LBL_host_Mnemonic=M < LBL_user_Mnemonic=U < LBL_from_Mnemonic=A < LBL_debug_Mnemonic=G < LBL_store-protocol_Mnemonic=S < LBL_store-protocol-class_Mnemonic=P < LBL_transport-protocol_Mnemonic=T < LBL_transport-protocol-class_Mnemonic=r --- > LBL_host=&Mail Host:* > LBL_user=Default &User:* > LBL_from=Default Return &Address:* > LBL_debug=Debu&g Enabled: > LBL_store-protocol=&Store Protocol: > LBL_store-protocol-class=Store &Protocol Class: > LBL_transport-protocol=&Transport Protocol: > LBL_transport-protocol-class=T&ransport Protocol Class: 302,306c260,261 < LBL_factory-class=Factory Class: < LBL_jdbc-resource-jndi-name=JDBC Resource JNDI Name: < < LBL_factory-class_Mnemonic=a < LBL_jdbc-resource-jndi-name_Mnemonic=C --- > LBL_factory-class=F&actory Class: > LBL_jdbc-resource-jndi-name=JDB&C Resource JNDI Name: diff -r o/enterprise5/j2ee-sun-appsrv/j2ee-sun-appsrv/org/netbeans/modules/j2ee/sun/ide/sunresources/wizards/ConnectionPoolWizardInfo.html n/enterprise5/j2ee-sun-appsrv/j2ee-sun-appsrv/org/netbeans/modules/j2ee/sun/ide/sunresources/wizards/ConnectionPoolWizardInfo.html 44,45c44,45 < < --- > > diff -r o/enterprise5/j2ee-sun-appsrv/j2ee-sun-appsrv/org/netbeans/modules/j2ee/sun/ide/sunresources/wizards/DataSourceWizardInfo.html n/enterprise5/j2ee-sun-appsrv/j2ee-sun-appsrv/org/netbeans/modules/j2ee/sun/ide/sunresources/wizards/DataSourceWizardInfo.html 44,45c44,45 < < --- > > diff -r o/enterprise5/j2ee-sun-appsrv/j2ee-sun-appsrv/org/netbeans/modules/j2ee/sun/ide/sunresources/wizards/JavaMailWizardInfo.html n/enterprise5/j2ee-sun-appsrv/j2ee-sun-appsrv/org/netbeans/modules/j2ee/sun/ide/sunresources/wizards/JavaMailWizardInfo.html 44,45c44,45 < < --- > > diff -r o/enterprise5/j2ee-sun-appsrv/j2ee-sun-appsrv/org/netbeans/modules/j2ee/sun/ide/sunresources/wizards/JavaMessageWizardInfo.html n/enterprise5/j2ee-sun-appsrv/j2ee-sun-appsrv/org/netbeans/modules/j2ee/sun/ide/sunresources/wizards/JavaMessageWizardInfo.html 44,45c44,45 < < --- > > diff -r o/enterprise5/j2ee-sun-appsrv/j2ee-sun-appsrv/org/netbeans/modules/j2ee/sun/ide/sunresources/wizards/PersistenceWizardInfo.html n/enterprise5/j2ee-sun-appsrv/j2ee-sun-appsrv/org/netbeans/modules/j2ee/sun/ide/sunresources/wizards/PersistenceWizardInfo.html 44,45c44,45 < < --- > > diff -r o/enterprise5/j2ee-sun-appsrv/j2ee-sun-appsrv/org/netbeans/modules/j2ee/sun/ide/sunresources/wizards/WizardInformation.html n/enterprise5/j2ee-sun-appsrv/j2ee-sun-appsrv/org/netbeans/modules/j2ee/sun/ide/sunresources/wizards/WizardInformation.html 43c43 < --- > 45c45 < --- > Only in o/enterprise5/j2ee-sun-appsrv/j2ee-sun-appsrv/org/netbeans/modules/j2ee/sun: share diff -r o/enterprise5/j2ee-sun-appsrv81/j2ee-sun-appsrv81/org/netbeans/modules/j2ee/sun/ide/j2ee/Bundle.properties n/enterprise5/j2ee-sun-appsrv81/j2ee-sun-appsrv81/org/netbeans/modules/j2ee/sun/ide/j2ee/Bundle.properties 232c232,234 < WARN_LOCALE_SWITCHED=Server started in English locale. \ No newline at end of file --- > WARN_LOCALE_SWITCHED=Server started in English locale. > > LBL_ZeroTimeoutForStartingServer=Zero Startup Timeout prevented the server from starting \ No newline at end of file diff -r o/enterprise5/j2ee-sun-appsrv81/j2ee-sun-appsrv81/org/netbeans/modules/j2ee/sun/ide/j2ee/incrdeploy/Bundle.properties n/enterprise5/j2ee-sun-appsrv81/j2ee-sun-appsrv81/org/netbeans/modules/j2ee/sun/ide/j2ee/incrdeploy/Bundle.properties 42,63c42 < enterprise.deployapi.actions.deployactions.cannot_connect_to_server=Cannot connect to server {0} < enterprise.deployapi.actions.deployactions.completed=Completed < enterprise.deployapi.actions.deployactions.running=Deploy action running... < enterprise.deployapi.actions.modulestateaction.cannot_connect_to_server=Cannot connect to server < enterprise.deployapi.actions.modulestateaction.completed=Completed < enterprise.deployapi.actions.modulestateaction.running=Running... < enterprise.deployapi.actions.modulestateaction.unknown_command=Unknown ModuleStateAction command {0} < # < < enterprise.deployapi.actions.clientconfigurationimpl.nomoduleid=No module ID for deployed application found < < enterprise.deployapi.actions.clientconfigurationimpl.exception=Exception while invoking application client {0} < < enterprise.deployapi.actions.modulestateaction.unknown_moduleType=Unknown module type {0} < < enterprise.deployapi.actions.modulestateaction.deploy_failed=Deployment failed on target {0} : {1} < < enterprise.deployapi.actions.modulestateaction.cannot_load_module=Cannot load module ID {0} < < enterprise.deployapi.actions.modulestateaction.undeploy_failed=Deployment failed on server {0} : {1}\ < < enterprise.deployapi.actions.illegaloperationonmodule=Operation is only permitted for application {0}, not for its sub module {1} --- > MESS_NO_DEPLOY_NECESSARY=No deployment operation necessary \ No newline at end of file diff -r o/enterprise5/j2ee-sun-appsrv81/j2ee-sun-appsrv81/org/netbeans/modules/j2ee/sun/ide/j2ee/ui/Bundle.properties n/enterprise5/j2ee-sun-appsrv81/j2ee-sun-appsrv81/org/netbeans/modules/j2ee/sun/ide/j2ee/ui/Bundle.properties 132a133 > Msg_EnterSomeInstallPath=Please provide Application Server Installation Location 337c338,339 < Msg_EneterValidDomainDir=Specify location value. --- > Msg_EneterValidDomainDir=Specify valid domain value. > Msg_EnterSomeDomainDir=Please specify domain value. diff -r o/enterprise5/j2ee-sun-ddui/j2ee-sun-ddui/org/netbeans/modules/j2ee/sun/share/configbean/templates/sunDD.html n/enterprise5/j2ee-sun-ddui/j2ee-sun-ddui/org/netbeans/modules/j2ee/sun/share/configbean/templates/sunDD.html 3c3 < --- > 5c5 < --- > diff -r o/enterprise5/j2ee-weblogic9/j2ee-weblogic9/org/netbeans/modules/j2ee/weblogic9/ui/wizard/Bundle.properties n/enterprise5/j2ee-weblogic9/j2ee-weblogic9/org/netbeans/modules/j2ee/weblogic9/ui/wizard/Bundle.properties 44a45 > ERR_EMPTY_SERVER_ROOT=Please enter installation directory of BEA WebLogic Server. 53c54 < ERR_INVALID_HOST=Please enter a valid host. --- > ERR_INVALID_HOST=Please enter host name. 54a56 > ERR_EMPTY_PORT=Please enter port number. diff -r o/enterprise5/j2ee-websphere6/j2ee-websphere6/org/netbeans/modules/j2ee/websphere6/ui/wizard/Bundle.properties n/enterprise5/j2ee-websphere6/j2ee-websphere6/org/netbeans/modules/j2ee/websphere6/ui/wizard/Bundle.properties 44a45 > ERR_SPECIFY_SERVER_ROOT=Please enter installation directory of IBM WebSphere Application Server. 51c52 < ERR_INVALID_HOST=Please enter a valid host. --- > ERR_INVALID_HOST=Please enter host name. 52a54 > ERR_EMPTY_PORT=Please enter port number. diff -r o/enterprise5/j2eeserver/j2eeserver/org/netbeans/modules/j2ee/deployment/devmodules/api/Bundle.properties n/enterprise5/j2eeserver/j2eeserver/org/netbeans/modules/j2ee/deployment/devmodules/api/Bundle.properties 42a43 > MSG_UndeployFailed=Undeployment error:\n{0}\n\nSee the server log for details. 47a49 > LBL_Undeploying=Undeploying {0} diff -r o/enterprise5/j2eeserver/j2eeserver/org/netbeans/modules/j2ee/deployment/impl/ui/wizard/Bundle.properties n/enterprise5/j2eeserver/j2eeserver/org/netbeans/modules/j2ee/deployment/impl/ui/wizard/Bundle.properties 67c67,73 < ACSD_Add_Server_Instance=Add server instance wizard \ No newline at end of file --- > ACSD_Add_Server_Instance=Add server instance wizard > > LBL_NoServerPlugins_Title=Add Server > LBL_NoServerPlugins_Text=No server plugins are installed in the IDE
\ > The IDE needs a server plugin (e.g. GlassFish plugin) to enable registering
\ > and using a server. Use Plugins Manager to install server plugins. > LBL_NoServerPlugins_Close=Close \ No newline at end of file diff -r o/enterprise5/spring-webmvc/spring-webmvc/org/netbeans/modules/spring/webmvc/resources/abstractController.html n/enterprise5/spring-webmvc/spring-webmvc/org/netbeans/modules/spring/webmvc/resources/abstractController.html 46c46 < --- > diff -r o/enterprise5/spring-webmvc/spring-webmvc/org/netbeans/modules/spring/webmvc/resources/simpleFormController.html n/enterprise5/spring-webmvc/spring-webmvc/org/netbeans/modules/spring/webmvc/resources/simpleFormController.html 46c46 < --- > diff -r o/enterprise5/web-core/web-core/org/netbeans/modules/web/core/resources/ConnectionFailurePage.html n/enterprise5/web-core/web-core/org/netbeans/modules/web/core/resources/ConnectionFailurePage.html 44,45c44,45 < < --- > > diff -r o/enterprise5/web-core/web-core/org/netbeans/modules/web/core/resources/JSP.html n/enterprise5/web-core/web-core/org/netbeans/modules/web/core/resources/JSP.html 43c43 < --- > 45,46c45,47 < < --- > > > diff -r o/enterprise5/web-core/web-core/org/netbeans/modules/web/core/resources/Servlet.html n/enterprise5/web-core/web-core/org/netbeans/modules/web/core/resources/Servlet.html 43c43 < --- > 45,46c45,47 < < --- > > > diff -r o/enterprise5/web-core/web-core/org/netbeans/modules/web/core/resources/ServletListener.html n/enterprise5/web-core/web-core/org/netbeans/modules/web/core/resources/ServletListener.html 43c43 < --- > 45,46c45,47 < < --- > > > diff -r o/enterprise5/web-core/web-core/org/netbeans/modules/web/core/resources/SimpleFilter.html n/enterprise5/web-core/web-core/org/netbeans/modules/web/core/resources/SimpleFilter.html 43c43 < --- > 45,46c45,47 < < --- > > > diff -r o/enterprise5/web-core/web-core/org/netbeans/modules/web/core/resources/TagFile.html n/enterprise5/web-core/web-core/org/netbeans/modules/web/core/resources/TagFile.html 43c43 < --- > 45,46c45,47 < < --- > > > diff -r o/enterprise5/web-core/web-core/org/netbeans/modules/web/core/resources/TagHandler.html n/enterprise5/web-core/web-core/org/netbeans/modules/web/core/resources/TagHandler.html 43c43 < --- > 45,46c45,47 < < --- > > > diff -r o/enterprise5/web-core/web-core/org/netbeans/modules/web/core/resources/TagLibrary.html n/enterprise5/web-core/web-core/org/netbeans/modules/web/core/resources/TagLibrary.html 43c43 < --- > 45,46c45,47 < < --- > > > diff -r o/enterprise5/web-core/web-core/org/netbeans/modules/web/core/resources/Web.html n/enterprise5/web-core/web-core/org/netbeans/modules/web/core/resources/Web.html 45c45 < --- > diff -r o/enterprise5/web-core/web-core/org/netbeans/modules/web/wizards/Bundle.properties n/enterprise5/web-core/web-core/org/netbeans/modules/web/wizards/Bundle.properties 351a352 > TTT_requestListener_short=A ServletRequestListener can be implemented by the developer interested in being notified of requests coming in and out of scope in a web component. 353a355 > TTT_requestAttrListener_short=A ServletRequestAttributeListener can be implemented by the developer interested in being notified of request attribute changes. diff -r o/enterprise5/web-freeform/web-freeform/org/netbeans/modules/web/freeform/resources/freeform-project-web.html n/enterprise5/web-freeform/web-freeform/org/netbeans/modules/web/freeform/resources/freeform-project-web.html 44c44 < --- > 46c46 < --- > Only in o/enterprise5/web-jsf: ext diff -r o/enterprise5/web-jsf/web-jsf/org/netbeans/modules/web/jsf/resources/JSFManagedBean.html n/enterprise5/web-jsf/web-jsf/org/netbeans/modules/web/jsf/resources/JSFManagedBean.html 43c43 < --- > 45,46c45,47 < < --- > > > diff -r o/enterprise5/web-jsf/web-jsf/org/netbeans/modules/web/jsf/resources/JsfFromDB.html n/enterprise5/web-jsf/web-jsf/org/netbeans/modules/web/jsf/resources/JsfFromDB.html 43c43 < --- > 45,46c45,47 < < --- > > > diff -r o/enterprise5/web-jsf/web-jsf/org/netbeans/modules/web/jsf/wizards/Bundle.properties n/enterprise5/web-jsf/web-jsf/org/netbeans/modules/web/jsf/wizards/Bundle.properties 106,107c106 < MNE_Browse=B < --- > MNE_Browse=o 109d107 < 111d108 < 113,115c110 < < MNE_lJSFVer=V < --- > MNE_lJSFVer=L 125,126d119 < MNE_Browse=r < MNE_Browse2=o 209c202,206 < TITLE_Progress_Jsf_Pages=Generating JSF Pages and Classes \ No newline at end of file --- > TITLE_Progress_Jsf_Pages=Generating JSF Pages and Classes > LBL_JSF_Config_CRUD=JavaServer Faces Configuration > > ACS_JSF_Config_CRUD_Panel_A11YDesc=JavaServer Faces Configuration Panel > LBL_JSF_Config_CRUD_instruction=Specify JavaServer Faces configuration and library information. diff -r o/enterprise5/web-jsf-navigation/web-jsf-navigation/org/netbeans/modules/web/jsf/navigation/Bundle.properties n/enterprise5/web-jsf-navigation/web-jsf-navigation/org/netbeans/modules/web/jsf/navigation/Bundle.properties 46,47d45 < Services/navigationsettings.settings=Navigation Editor < Only in o/enterprise5/web-jspparser: ext diff -r o/enterprise5/web-monitor/web-monitor/org/netbeans/modules/web/monitor/client/Bundle.properties n/enterprise5/web-monitor/web-monitor/org/netbeans/modules/web/monitor/client/Bundle.properties 392c392 < ACS_MON_SendA11yDesc=Send HTTP request --- > ACS_MON_SendA11yDesc=Send HTTP Request diff -r o/enterprise5/web-project/web-project/org/netbeans/modules/web/project/ui/Bundle.properties n/enterprise5/web-project/web-project/org/netbeans/modules/web/project/ui/Bundle.properties 47c47 < LBL_RedeployAction_Name=Undeploy and Deploy --- > LBL_RedeployAction_Name=Deploy diff -r o/enterprise5/web-project/web-project/org/netbeans/modules/web/project/ui/customizer/Bundle.properties n/enterprise5/web-project/web-project/org/netbeans/modules/web/project/ui/customizer/Bundle.properties 228c228 < LBL_CustomizeRun_DeployOnSave_JCheckBox=&Deploy on Change --- > LBL_CustomizeRun_DeployOnSave_JCheckBox=&Deploy on Save diff -r o/enterprise5/web-project/web-project/org/netbeans/modules/web/project/ui/resources/emptyProject.html n/enterprise5/web-project/web-project/org/netbeans/modules/web/project/ui/resources/emptyProject.html 44c44 < --- > 46c46 < --- > diff -r o/enterprise5/web-project/web-project/org/netbeans/modules/web/project/ui/resources/importProject.html n/enterprise5/web-project/web-project/org/netbeans/modules/web/project/ui/resources/importProject.html 44c44 < --- > 46c46 < --- > diff -r o/enterprise5/web-project/web-project/org/netbeans/modules/web/project/ui/resources/web.html n/enterprise5/web-project/web-project/org/netbeans/modules/web/project/ui/resources/web.html 42c42 < --- > 44c44 < --- > diff -r o/enterprise5/web-project/web-project/org/netbeans/modules/web/project/ui/wizards/Bundle.properties n/enterprise5/web-project/web-project/org/netbeans/modules/web/project/ui/wizards/Bundle.properties 166a167 > ACSD_WebInf=Provide path to the web inf folder 169a171 > ACSD_BrowseWebInf=Click to browse for the web inf folder diff -r o/enterprise5/web-struts/web-struts/org/netbeans/modules/web/struts/resources/StrutsAction.html n/enterprise5/web-struts/web-struts/org/netbeans/modules/web/struts/resources/StrutsAction.html 43c43 < --- > 45,46c45,47 < < --- > > > diff -r o/enterprise5/web-struts/web-struts/org/netbeans/modules/web/struts/resources/StrutsFormBean.html n/enterprise5/web-struts/web-struts/org/netbeans/modules/web/struts/resources/StrutsFormBean.html 43c43 < --- > 45,46c45,47 < < --- > > > diff -r o/enterprise5/websvc-core/websvc-core/org/netbeans/modules/websvc/core/client/resources/WebServiceClient.html n/enterprise5/websvc-core/websvc-core/org/netbeans/modules/websvc/core/client/resources/WebServiceClient.html 43c43 < --- > 45,46c45,47 < < --- > > > diff -r o/enterprise5/websvc-core/websvc-core/org/netbeans/modules/websvc/core/dev/resources/LogicalHandler.html n/enterprise5/websvc-core/websvc-core/org/netbeans/modules/websvc/core/dev/resources/LogicalHandler.html 43c43 < --- > 45,46c45,47 < < --- > > > diff -r o/enterprise5/websvc-core/websvc-core/org/netbeans/modules/websvc/core/dev/resources/MessageHandler.html n/enterprise5/websvc-core/websvc-core/org/netbeans/modules/websvc/core/dev/resources/MessageHandler.html 43c43 < --- > 45,46c45,47 < < --- > > > diff -r o/enterprise5/websvc-core/websvc-core/org/netbeans/modules/websvc/core/dev/resources/WebService.html n/enterprise5/websvc-core/websvc-core/org/netbeans/modules/websvc/core/dev/resources/WebService.html 43c43 < --- > 45,46c45,47 < < --- > > > diff -r o/enterprise5/websvc-core/websvc-core/org/netbeans/modules/websvc/core/dev/resources/WebServiceFromWSDL.html n/enterprise5/websvc-core/websvc-core/org/netbeans/modules/websvc/core/dev/resources/WebServiceFromWSDL.html 43c43 < --- > 45,46c45,47 < < --- > > > diff -r o/enterprise5/websvc-core/websvc-core/org/netbeans/modules/websvc/core/jaxws/nodes/Bundle.properties n/enterprise5/websvc-core/websvc-core/org/netbeans/modules/websvc/core/jaxws/nodes/Bundle.properties 59a60 > MSG_RefreshWithReplaceWsdl=Please, call Refresh action with "Replace Local WSDL File" checkbox selected. diff -r o/enterprise5/websvc-core/websvc-core/org/netbeans/modules/websvc/core/jaxws/saas/Bundle.properties n/enterprise5/websvc-core/websvc-core/org/netbeans/modules/websvc/core/jaxws/saas/Bundle.properties 39a40,42 > MSG_GENERATING_REST_RESOURCE=Generating REST resource > MSG_GENERATING_CLIENT_ARTIFACTS=Generating web service client... > MSG_GENERATING_RESOURCE_FILE=Generating REST resource class file Only in n/enterprise5/websvc-design/websvc-design/org/netbeans/modules/websvc/design: javamodel diff -r o/enterprise5/websvc-rest/websvc-rest/org/netbeans/modules/websvc/rest/codegen/Bundle.properties n/enterprise5/websvc-rest/websvc-rest/org/netbeans/modules/websvc/rest/codegen/Bundle.properties 55c55 < MSG_TestPage=Test Page --- > MSG_TestPage=Test 107c107 < creation of the client stubs. You can this file to other developers who want to \n \ --- > creation of the client stubs. You can give this file to other developers who want to \n \ diff -r o/enterprise5/websvc-rest/websvc-rest/org/netbeans/modules/websvc/rest/wizard/Bundle.properties n/enterprise5/websvc-rest/websvc-rest/org/netbeans/modules/websvc/rest/wizard/Bundle.properties 55,62d54 < LBL_EntityClasses=Entity Classes < LBL_Add=Add > < LBL_Remove=< Remove < LBL_AddAll=Add All >> < LBL_RemoveAll=<< RemoveAll < LBL_AvailableEntities=Available Entity Classes\: < LBL_SelectedEntities=Selected Entity Classes\: < diff -r o/enterprise5/websvc-rest/websvc-rest/org/netbeans/modules/websvc/rest/wizard/resources/ClientStubs.html n/enterprise5/websvc-rest/websvc-rest/org/netbeans/modules/websvc/rest/wizard/resources/ClientStubs.html 3c3 < --- > diff -r o/enterprise5/websvc-rest/websvc-rest/org/netbeans/modules/websvc/rest/wizard/resources/DatabaseResource.html n/enterprise5/websvc-rest/websvc-rest/org/netbeans/modules/websvc/rest/wizard/resources/DatabaseResource.html 5c5 < --- > diff -r o/enterprise5/websvc-rest/websvc-rest/org/netbeans/modules/websvc/rest/wizard/resources/EntityResources.html n/enterprise5/websvc-rest/websvc-rest/org/netbeans/modules/websvc/rest/wizard/resources/EntityResources.html 5c5 < --- > diff -r o/enterprise5/websvc-rest/websvc-rest/org/netbeans/modules/websvc/rest/wizard/resources/PatternResources.html n/enterprise5/websvc-rest/websvc-rest/org/netbeans/modules/websvc/rest/wizard/resources/PatternResources.html 5c5 < --- > diff -r o/enterprise5/websvc-restapi/websvc-restapi/org/netbeans/modules/websvc/rest/spi/Bundle.properties n/enterprise5/websvc-restapi/websvc-restapi/org/netbeans/modules/websvc/rest/spi/Bundle.properties 95c95 < MSG_TEST_RESBEANS_RequestFailed=failed: Server returned --- > MSG_TEST_RESBEANS_RequestFailed= diff -r o/enterprise5/websvc-wsitconf/websvc-wsitconf/org/netbeans/modules/websvc/wsitconf/resources/STSWizard.html n/enterprise5/websvc-wsitconf/websvc-wsitconf/org/netbeans/modules/websvc/wsitconf/resources/STSWizard.html 1c1 < --- > 3,4c3,5 < < --- > > > diff -r o/enterprise5/websvc-wsitconf/websvc-wsitconf/org/netbeans/modules/websvc/wsitconf/ui/service/Bundle.properties n/enterprise5/websvc-wsitconf/websvc-wsitconf/org/netbeans/modules/websvc/wsitconf/ui/service/Bundle.properties 161a162,169 > > TXT_UnsupportedProfileDetected=Configuration file for this web service already exists \ > but is in a version which is not supported by the server selected for the project. Do you wish to \ > leave the configuration version and edit properties anyway, or would you like to convert the configuration file to the version \ > supported by the server? > > LBL_Convert=&Convert > LBL_LeaveIntact=&Edit Anyway diff -r o/groovy1/groovy-grails/groovy-grails/org/netbeans/modules/groovy/grails/settings/Bundle.properties n/groovy1/groovy-grails/groovy-grails/org/netbeans/modules/groovy/grails/settings/Bundle.properties 47c47 < LBL_Not_grails_home=This directory seems to be no Grails home directory --- > LBL_Not_grails_home=This directory does not seem to be the Grails home directory diff -r o/groovy1/groovy-grailsproject/groovy-grailsproject/org/netbeans/modules/groovy/grailsproject/plugins/Bundle.properties n/groovy1/groovy-grailsproject/groovy-grailsproject/org/netbeans/modules/groovy/grailsproject/plugins/Bundle.properties 4c4,5 < CTL_Cancel=Cancel \ No newline at end of file --- > CTL_Cancel=Cancel > InstallingPluginPanel.plugin=Plugin diff -r o/groovy1/groovy-grailsproject/groovy-grailsproject/org/netbeans/modules/groovy/grailsproject/resources/Controller.html n/groovy1/groovy-grailsproject/groovy-grailsproject/org/netbeans/modules/groovy/grailsproject/resources/Controller.html 27,28c27,29 < < --- > > > diff -r o/groovy1/groovy-grailsproject/groovy-grailsproject/org/netbeans/modules/groovy/grailsproject/resources/DomainClass.html n/groovy1/groovy-grailsproject/groovy-grailsproject/org/netbeans/modules/groovy/grailsproject/resources/DomainClass.html 27,28c27,29 < < --- > > > diff -r o/groovy1/groovy-grailsproject/groovy-grailsproject/org/netbeans/modules/groovy/grailsproject/resources/GantScript.html n/groovy1/groovy-grailsproject/groovy-grailsproject/org/netbeans/modules/groovy/grailsproject/resources/GantScript.html 27,28c27,29 < < --- > > > diff -r o/groovy1/groovy-grailsproject/groovy-grailsproject/org/netbeans/modules/groovy/grailsproject/resources/IntegrationTest.html n/groovy1/groovy-grailsproject/groovy-grailsproject/org/netbeans/modules/groovy/grailsproject/resources/IntegrationTest.html 27,28c27,29 < < --- > > > diff -r o/groovy1/groovy-grailsproject/groovy-grailsproject/org/netbeans/modules/groovy/grailsproject/resources/Service.html n/groovy1/groovy-grailsproject/groovy-grailsproject/org/netbeans/modules/groovy/grailsproject/resources/Service.html 27,28c27,29 < < --- > > > diff -r o/groovy1/groovy-grailsproject/groovy-grailsproject/org/netbeans/modules/groovy/grailsproject/resources/TagLib.html n/groovy1/groovy-grailsproject/groovy-grailsproject/org/netbeans/modules/groovy/grailsproject/resources/TagLib.html 27,28c27,29 < < --- > > > diff -r o/groovy1/groovy-grailsproject/groovy-grailsproject/org/netbeans/modules/groovy/grailsproject/resources/UnitTest.html n/groovy1/groovy-grailsproject/groovy-grailsproject/org/netbeans/modules/groovy/grailsproject/resources/UnitTest.html 27,28c27,29 < < --- > > > diff -r o/groovy1/groovy-grailsproject/groovy-grailsproject/org/netbeans/modules/groovy/grailsproject/resources/desktop.html n/groovy1/groovy-grailsproject/groovy-grailsproject/org/netbeans/modules/groovy/grailsproject/resources/desktop.html 25c25 < --- > 27c27 < --- > diff -r o/groovy1/groovy-grailsproject/groovy-grailsproject/org/netbeans/modules/groovy/grailsproject/resources/emptyProject.html n/groovy1/groovy-grailsproject/groovy-grailsproject/org/netbeans/modules/groovy/grailsproject/resources/emptyProject.html 25c25 < --- > 27c27 < --- > diff -r o/groovy1/groovy-grailsproject/groovy-grailsproject/org/netbeans/modules/groovy/grailsproject/ui/Bundle.properties n/groovy1/groovy-grailsproject/groovy-grailsproject/org/netbeans/modules/groovy/grailsproject/ui/Bundle.properties 43c43 < GeneralCustomizerPanel.activeGrailsEnvironmentLabel.text=Active Grails Enviroment: --- > GeneralCustomizerPanel.activeGrailsEnvironmentLabel.text=Active Grails Environment: 67,68c67,68 < GrailsPluginPanel.availablePlugins.accessibleDescription=Plugins availeble for the project < GrailsPluginPanel.reloadInstalledButton.accessibleDescription=Reload isntalled plugins --- > GrailsPluginPanel.availablePlugins.accessibleDescription=Plugins available for the project > GrailsPluginPanel.reloadInstalledButton.accessibleDescription=Reload installed plugins 74a75,77 > GrailsPluginPanel.newPlugins=New plugins > GrailsPluginPanel.installed=Installed > 87c90 < DebugCustomizerPanel.firefoxRadioButton.text=&Firefox (version 2.0.0.x only) --- > DebugCustomizerPanel.firefoxRadioButton.text=&Firefox diff -r o/groovy1/groovy-grailsproject/groovy-grailsproject/org/netbeans/modules/groovy/grailsproject/ui/wizards/Bundle.properties n/groovy1/groovy-grailsproject/groovy-grailsproject/org/netbeans/modules/groovy/grailsproject/ui/wizards/Bundle.properties 49a50 > TXT_NewGrailsApp=Grails Application 60a62,72 > WIZARD_TITLE_INTEGRATION=Integration Test Name > WIZARD_TITLE_UNIT=Unit Test Name > > TXT_NewDomain=Domain Class > TXT_NewController=Controller > TXT_NewService=Service > TXT_NewView=View > TXT_NewTaglib=Tag Library > TXT_NewScript=Script > TXT_NewIntegrationTest=Integration Test > TXT_NewUnitTest=Unit Test 75,76c87,88 < GetDomainClassNamePanel.projectNameLabel.text=Class Name: < GetDomainClassNamePanel.projectFolderLabel.text=Project: --- > GetDomainClassNamePanel.projectNameLabel.text=Class &Name: > GetDomainClassNamePanel.projectFolderLabel.text=&Project: 80c92 < GetArtifactNamePanel.createdFileLabel.text=Created File: --- > GetArtifactNamePanel.createdFileLabel.text=&Created File: diff -r o/groovy1/groovy-gsp/groovy-gsp/org/netbeans/modules/groovy/gsp/resources/Bundle.properties n/groovy1/groovy-gsp/groovy-gsp/org/netbeans/modules/groovy/gsp/resources/Bundle.properties 110c110 < jsp-scriptlet-delimiter=Scriplet Delimitier --- > jsp-scriptlet-delimiter=Scriptlet Delimiter diff -r o/groovy1/groovy-gsp/groovy-gsp/org/netbeans/modules/groovy/gsp/resources/GspTemplate.html n/groovy1/groovy-gsp/groovy-gsp/org/netbeans/modules/groovy/gsp/resources/GspTemplate.html 6c6 < --- > diff -r o/groovy1/groovy-support/groovy-support/org/netbeans/modules/groovy/support/Bundle.properties n/groovy1/groovy-support/groovy-support/org/netbeans/modules/groovy/support/Bundle.properties 73d72 < CTL_ExecScriptAction=Execute Script diff -r o/groovy1/groovy-support/groovy-support/org/netbeans/modules/groovy/support/customizer/Bundle.properties n/groovy1/groovy-support/groovy-support/org/netbeans/modules/groovy/support/customizer/Bundle.properties 42c42 < GroovyCustomizerPanel.jTextArea1.text=Adds groovy-all jar on classpath, modifies build script with groovyc and excludes .groovy files from result jar. --- > GroovyCustomizerPanel.jTextArea1.text=Adds the groovy-all JAR file to the classpath, modifies the build script with groovyc, and excludes .groovy files from the resulting JAR file. diff -r o/groovy1/groovy-support/groovy-support/org/netbeans/modules/groovy/support/options/Bundle.properties n/groovy1/groovy-support/groovy-support/org/netbeans/modules/groovy/support/options/Bundle.properties 2d1 < SupportPanel.groovyHomeTextField.text= 11d9 < SupportPanel.chooseHomeButton.text=Choose... 51,89d48 < SupportPanel.homeLabel.text=Groovy Home: < # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. < < # Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved. < < # The contents of this file are subject to the terms of either the GNU < # General Public License Version 2 only ("GPL") or the Common < # Development and Distribution License("CDDL") (collectively, the < # "License"). You may not use this file except in compliance with the < # License. You can obtain a copy of the License at < # http://www.netbeans.org/cddl-gplv2.html < # or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the < # specific language governing permissions and limitations under the < # License. When distributing the software, include this License Header < # Notice in each file and include the License file at < # nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this < # particular file as subject to the "Classpath" exception as provided < # by Sun in the GPL Version 2 section of the License file that < # accompanied this code. If applicable, add the following below the < # License Header, with the fields enclosed by brackets [] replaced by < # your own identifying information: < # "Portions Copyrighted [year] [name of copyright owner]" < < # Contributor(s): < < # The Original Software is NetBeans. The Initial Developer of the Original < # Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun < # Microsystems, Inc. All Rights Reserved. < < # If you wish your version of this file to be governed by only the CDDL < # or only the GPL Version 2, indicate your decision by adding < # "[Contributor] elects to include this software in this distribution < # under the [CDDL or GPL Version 2] license." If you do not indicate a < # single choice of license, a recipient has the option to distribute < # your version of this file under either the CDDL, the GPL Version 2 or < # to extend the choice of license to its licensees as provided above. < # However, if you add GPL Version 2 code and therefore, elected the GPL < # Version 2 license, then the option applies only if the new code is < # made subject to such option by the copyright holder. 90a50 > SupportPanel.jLabel1.text=Your projects will use groovy-all.jar set in Library Manager diff -r o/groovy1/groovy-support/groovy-support/org/netbeans/modules/groovy/support/resources/GroovyClass.html n/groovy1/groovy-support/groovy-support/org/netbeans/modules/groovy/support/resources/GroovyClass.html 6c6 < --- > diff -r o/groovy1/groovy-support/groovy-support/org/netbeans/modules/groovy/support/resources/GroovyScript.html n/groovy1/groovy-support/groovy-support/org/netbeans/modules/groovy/support/resources/GroovyScript.html 6c6 < --- > Only in n/gsf1/css-editor/css-editor/org/netbeans/modules/css: parser diff -r o/gsf1/css-editor/css-editor/org/netbeans/modules/css/resources/CSS_template.html n/gsf1/css-editor/css-editor/org/netbeans/modules/css/resources/CSS_template.html 43c43 < --- > 45c45 < --- > diff -r o/gsf1/gsf/gsf/org/netbeans/modules/gsf/Bundle.properties n/gsf1/gsf/gsf/org/netbeans/modules/gsf/Bundle.properties 3c3 < OpenIDE-Module-Short-Description=Generic Support for language integration in the IDE --- > OpenIDE-Module-Short-Description=Generic support for language integration in the IDE 28a29 > Editors/text/x-groovy/Popup/goto=Navigate diff -r o/gsf1/gsf/gsf/org/netbeans/modules/gsfret/hints/infrastructure/Bundle.properties n/gsf1/gsf/gsf/org/netbeans/modules/gsfret/hints/infrastructure/Bundle.properties 1c1 < DisableHint=Disable this hint --- > DisableHint=Disable this Hint 7c7 < Ok=Ok --- > Ok=OK diff -r o/gsf1/html/html/org/netbeans/modules/html/TemplateHelp.html n/gsf1/html/html/org/netbeans/modules/html/TemplateHelp.html 43c43 < --- > 45,46c45,47 < < --- > > > diff -r o/gsf1/html/html/org/netbeans/modules/html/XhtmlTemplateHelp.html n/gsf1/html/html/org/netbeans/modules/html/XhtmlTemplateHelp.html 42c42 < --- > 44,45c44,46 < < --- > > > 47c48 < You can validate against the DTD using the context menu. --- > Only in o/gsf1/html-editor/html-editor/org/netbeans/modules: editor Only in o/gsf1/html-editor/html-editor/org/netbeans/modules/html/editor: Bundle.properties Only in o/gsf1/html-editor/html-editor/org/netbeans/modules/html/editor: options diff -r o/gsf1/html-editor/html-editor/org/netbeans/modules/html/editor/resources/Bundle.properties n/gsf1/html-editor/html-editor/org/netbeans/modules/html/editor/resources/Bundle.properties 39a40,44 > OpenIDE-Module-Name=HTML Editor > OpenIDE-Module-Display-Category=Editing > OpenIDE-Module-Short-Description=Contains HTML editor implementation > OpenIDE-Module-Long-Description=HTML Editor contains editing support for HTML files > diff -r o/gsf1/javascript-editing/javascript-editing/org/netbeans/modules/javascript/editing/javascript.html n/gsf1/javascript-editing/javascript-editing/org/netbeans/modules/javascript/editing/javascript.html 43c43 < --- > 45,46c45,47 < < --- > > > diff -r o/gsf1/javascript-editing/javascript-editing/org/netbeans/modules/javascript/editing/json.html n/gsf1/javascript-editing/javascript-editing/org/netbeans/modules/javascript/editing/json.html 43c43 < --- > 45,46c45,47 < < --- > > > diff -r o/gsf1/javascript-hints/javascript-hints/org/netbeans/modules/javascript/hints/Bundle.properties n/gsf1/javascript-hints/javascript-hints/org/netbeans/modules/javascript/hints/Bundle.properties 40c40 < OpenIDE-Module-Display-Category=Ruby --- > OpenIDE-Module-Display-Category=JavaScript 46c46 < EditorHints/org-netbeans-modules-javascript-hints.err=Ruby Compiler Errors --- > EditorHints/org-netbeans-modules-javascript-hints.err=JavaScript Compiler Errors 67c67 < AccidentalAssignment=Accidental Assignment? (if x = y instead of x == y) --- > AccidentalAssignment=Accidental assignment? (if x = y instead of x == y) diff -r o/gsf1/javascript-hints/javascript-hints/org/netbeans/modules/javascript/hints/infrastructure/Bundle.properties n/gsf1/javascript-hints/javascript-hints/org/netbeans/modules/javascript/hints/infrastructure/Bundle.properties 2c2 < CTL_Hints_ToolTip=Hints And Warinings for Ruby Code --- > CTL_Hints_ToolTip=Hints And Warnings for JavaScript Code Only in n/gsf1: languages-yaml Only in n/gsf1: org-netbeans-libs-bytelist Only in n/gsf1: org-netbeans-libs-jvyamlb diff -r o/ide10/db/db/org/netbeans/modules/db/explorer/Bundle.properties n/ide10/db/db/org/netbeans/modules/db/explorer/Bundle.properties 37a38,39 > MSG_TestFailed = The connection {0} does not appear to have a valid connection to the database: {1} > EXC_DerbyCreateDatabaseUnicode=Unable to create the database because the Derby network driver does not support multibyte characters. diff -r o/ide10/db/db/org/netbeans/modules/db/resources/Bundle.properties n/ide10/db/db/org/netbeans/modules/db/resources/Bundle.properties 367c367 < NewConnectionPassword = Pa&ssword: --- > NewConnectionPassword = Pass&word: 370c370 < NewConnectionHost = &Host: --- > NewConnectionHost = Hos&t: 372c372 < NewConnectionServerName = &Server name: --- > NewConnectionServerName = &Server Name: 374c374 < NewConnectionShowJDBCURL=&Show JDBC URL --- > NewConnectionShowJDBCURL=Show &JDBC URL 379c379 < NewConnectionInstanceName=Instance name: --- > NewConnectionInstanceName=Instance Name: 805c805,806 < MSG_SchemaPanelComment=Select a database schema to use. --- > MSG_SchemaPanelComment=For each database connection, the Services window only displays objects from one database schema. \nSelect the \ > schema of the tables to be displayed. diff -r o/ide10/db/db/org/netbeans/modules/db/util/Bundle.properties n/ide10/db/db/org/netbeans/modules/db/util/Bundle.properties 71,72c71,72 < < \ No newline at end of file --- > ErrorInfoPanel.iconLabel.text= > ErrorInfoPanel.msgLabel.text= Only in n/ide10/db-core/db-core/org/netbeans/modules/db: api diff -r o/ide10/db-core/db-core/org/netbeans/modules/db/sql/execute/ui/Bundle.properties n/ide10/db-core/db-core/org/netbeans/modules/db/sql/execute/ui/Bundle.properties 84d83 < LBL_Insert=Insert 96a96,97 > > LBL_ErrorParsingSQLHistory=Error retrieving SQL statements, History reset. diff -r o/ide10/db-core/db-core/org/netbeans/modules/db/sql/history/Bundle.properties n/ide10/db-core/db-core/org/netbeans/modules/db/sql/history/Bundle.properties 44a45,47 > MSG_ErrorParsingHistoryFile=Error retrieving SQL History.\n > > diff -r o/ide10/db-dataview/db-dataview/org/netbeans/modules/db/dataview/output/Bundle.properties n/ide10/db-dataview/db-dataview/org/netbeans/modules/db/dataview/output/Bundle.properties 102,103d101 < MSG_execution_success=Executed successfully < 132c130 < MSG_connection_failure=Unable to Connect to database --- > MSG_connection_failure=Unable to Connect to database : {0} diff -r o/ide10/db-mysql/db-mysql/org/netbeans/modules/db/mysql/Bundle.properties n/ide10/db-mysql/db-mysql/org/netbeans/modules/db/mysql/Bundle.properties 70c70 < MSG_UnableToStart=Error stopping the MySQL server --- > MSG_UnableToStopServer=Error stopping the MySQL server 86,88c86,87 < LBL_StartOutputTab=MySQL Server < LBL_StopOutputTab=MySQL Server Stop Command < LBL_AdminOutputTab=MySQL Server Admin Command --- > LBL_MySQLOutputTab=MySQL Server Commands > LBL_StoppingMySQLServer=Stopping the MySQL Server \ No newline at end of file Only in n/ide10/db-mysql/db-mysql/org/netbeans/modules/db/mysql: actions diff -r o/ide10/db-mysql/db-mysql/org/netbeans/modules/db/mysql/impl/Bundle.properties n/ide10/db-mysql/db-mysql/org/netbeans/modules/db/mysql/impl/Bundle.properties 38c38,44 < MSG_SampleNotSupported=Can not create sample: sample {0} is not supported \ No newline at end of file --- > MSG_SampleNotSupported=Can not create sample: sample "{0}" is not supported > MSG_CreatingSampleDBProgressLabel=Creating MySQL database {0} > MSG_TestFailed=Test to see if MySQL connection is valid failed: {0} > MSG_ConnectionLost=The connection to the MySQL Server was lost. The connection may have timed out, the network connection may have been lost, or the server may have been shut down. > MSG_ServerStillRunning=It appears the stop command did not succeed, as the connection to the server is still working. You may need to adjust your settings for the stop command, or you may need to stop the server manually.\n\nDo you want to edit your settings for the stop command? > MSG_ConnectFailedAfterStart=Unable to connect to the MySQL server after starting it. It is possible the server did not start correctly, or that it is still starting up. Try to connect after a minute or two and if it still fails, see if the server is running. If it is not, you may need to start it manually. > MSG_DatabaseCommandFailed=The database command {0} failed with the following exception: \ No newline at end of file diff -r o/ide10/db-mysql/db-mysql/org/netbeans/modules/db/mysql/ui/Bundle.properties n/ide10/db-mysql/db-mysql/org/netbeans/modules/db/mysql/ui/Bundle.properties 37,51c37,54 < CreateDatabasePanel.LBL_CreateDatabaseTitle=Create MySQL Database < CreateDatabasePanel.ACSD_CreateDatabasePanel=Create MySQL Database < CreateDatabasePanel.jLabel1.text=&Database Name: < CreateDatabasePanel.MSG_SpecifyDatabase=Please choose or enter a database name < CreateDatabasePanel.STR_SampleDatabase=Sample database < CreateDatabasePanel.MSG_UnableToGetUsers=Unable to get the list of users from the MySQL server < CreateDatabasePanel.MSG_CreateFailed=An error was encountered while creating the database < CreateDatabasePanel.MSG_DatabaseAlreadyExists=The database {0} already exists < CreateDatabasePanel.STR_DatabaseExistsTitle=Database Exists < CreateDatabasePanel.MSG_DeleteFailed=Unable to delete database {0} < CreateDatabasePanel.MSG_DeleteCreatedDatabase=An error occurred after creating the database. Would you like to delete the database? < CreateDatabasePanel.STR_DeleteCreatedDatabaseTitle=Confirm Delete Newly Created Database < CreateDatabasePanel.chkGrantAccess.text=&Grant full access to user: < CreateDatabasePanel.messageLabel.AccessibleContext.accessibleName= < CreateDatabasePanel.messageLabel.text=message --- > CreateNewDatabasePanel.LBL_CreateDatabaseTitle=Create MySQL Database > CreateNewDatabasePanel.ACSD_CreateNewDatabasePanel=Create MySQL Database > CreateNewDatabasePanel.MSG_SpecifyDatabase=Please choose or enter a database name > CreateNewDatabasePanel.STR_SampleDatabase=Sample database > CreateNewDatabasePanel.MSG_UnableToGetUsers=Unable to get the list of users from the MySQL server > CreateNewDatabasePanel.MSG_CreateFailed=An error was encountered while creating the database > CreateNewDatabasePanel.MSG_DatabaseAlreadyExists=The database {0} already exists > CreateNewDatabasePanel.STR_DatabaseExistsTitle=Database Exists > CreateNewDatabasePanel.MSG_DeleteFailed=Unable to delete database {0} > CreateNewDatabasePanel.MSG_DeleteCreatedDatabase=An error occurred after creating the database. Would you like to delete the database? > CreateNewDatabasePanel.STR_DeleteCreatedDatabaseTitle=Confirm Delete Newly Created Database > CreateNewDatabasePanel.messageLabel.AccessibleContext.accessibleName= > CreateNewDatabasePanel.chkGrantAccess.AccessibleContext.accessibleDescription=Grant full access to a database user for this new database > CreateNewDatabasePanel.comboDatabaseName.AccessibleContext.accessibleDescription=Select or enter a name for this new database > CreateNewDatabasePanel.comboUsers.AccessibleContext.accessibleDescription=Select the user to grant full access for this new database > CreateNewDatabasePanel.comboDatabaseName.AccessibleContext.accessibleName=Database name > CreateNewDatabasePanel.comboUsers.AccessibleContext.accessibleDescription=Select an existing user for this database > CreateNewDatabasePanel.comboUsers.AccessibleContext.accessibleName=Username 53,61d55 < AdminPropertiesPanel.jLabel1.text=Path/URL to &admin tool: < AdminPropertiesPanel.jLabel2.text= < AdminPropertiesPanel.jLabel3.text=Path to &start command: < AdminPropertiesPanel.jLabel4.text=Path to sto&p command: < AdminPropertiesPanel.txtStop.text= < AdminPropertiesPanel.txtAdmin.text= < AdminPropertiesPanel.btnAdminBrowse.text=Browse... < AdminPropertiesPanel.btnStartBrowse.text=Browse... < AdminPropertiesPanel.btnStopBrowse.text=Browse... 65a60,73 > AdminPropertiesPanel.txtAdmin.text= > AdminPropertiesPanel.txtAdminArgs.text= > AdminPropertiesPanel.btnAdminBrowse.text=&Browse... > AdminPropertiesPanel.labelAdmin.text=Path/URL to &admin tool: > AdminPropertiesPanel.labelAdminArgs.text=Argument&s: > AdminPropertiesPanel.labelStart.text=Path to s&tart command: > AdminPropertiesPanel.labelStartArgs.text=Argu&ments: > AdminPropertiesPanel.btnStartBrowse.text=B&rowse... > AdminPropertiesPanel.labelStop.text=Path to sto&p command: > AdminPropertiesPanel.txtStop.text= > AdminPropertiesPanel.btnStopBrowse.text=Br&owse... > AdminPropertiesPanel.txtStopArgs.text= > AdminPropertiesPanel.labelStopArgs.text=Ar&guments: > AdminPropertiesPanel.txtStartArgs.text= 72,74c80,82 < BasePropertiesPanel.txtUser.text=root < BasePropertiesPanel.jLabel1.text=Server &host name: < BasePropertiesPanel.jLabel4.text=Administrator &password: --- > BasePropertiesPanel.labelUser.text=Administrator &User Name: > BasePropertiesPanel.txtUser.text= > BasePropertiesPanel.labelHost.text=&Server Host Name: 77,80c85,88 < BasePropertiesPanel.jLabel2.text=Server &port number: < BasePropertiesPanel.txtPort.text=3306 < BasePropertiesPanel.chkSavePassword.text=&Save password (see Help for security risks) < BasePropertiesPanel.jLabel3.text=Administrator &user name: --- > BasePropertiesPanel.labelPort.text=Server Port &Number: > BasePropertiesPanel.txtPort.text= > BasePropertiesPanel.chkSavePassword.text=Sa&ve Password (see Help for security risks) > BasePropertiesPanel.labelPassword.text=Administrator &Password: 95,102d102 < AdminPropertiesPanel.jLabel5.text=A&rguments: < AdminPropertiesPanel.txtAdminArgs.text= < AdminPropertiesPanel.jLabel6.text=Ar&guments: < AdminPropertiesPanel.txtStart.text= < AdminPropertiesPanel.txtStartArgs.text= < AdminPropertiesPanel.txtStopArgs.text= < AdminPropertiesPanel.jLabel7.text=Argu&ments: < CreateDatabasePanel.chkGrantAccess.AccessibleContext.accessibleDescription=Grant full access to a database user for this new database 116a117,127 > BasePropertiesPanel.txtPassword.text= > AdminPropertiesPanel.txtStart.text= > CreateDatabasePanel.chkGrantAccess.text=&Grant Full Access To: > CreateDatabasePanel.nameLabel.text=New &Database Name: > CreateDatabasePanel.messageLabel.text=message > CreateDatabasePanel.MSG_ConfirmDeleteDatabase=The database "{0}" has already been created. Do you want to delete it? > CreateDatabasePanel.MSG_ConfirmCreateSample=The database name "{0}" is the name of a sample database. Do you want to create the tables, objects and data for this sample? > CreateDatabasePanel.MSG_CreatingSample=Creating the sample tables, objects and data... > CreateDatabasePanel.CTL_OKButton=OK > CreateDatabasePanel.CTL_CancelButton=Cancel > CreateDatabasePanel.progressLabel.text=Creating the database... diff -r o/ide10/db-sql-editor/db-sql-editor/org/netbeans/modules/db/sql/editor/completion/Bundle.properties n/ide10/db-sql-editor/db-sql-editor/org/netbeans/modules/db/sql/editor/completion/Bundle.properties 41a42 > MSG_Alias=alias to {0} diff -r o/ide10/db-sql-editor/db-sql-editor/org/netbeans/modules/db/sql/editor/ui/actions/Bundle.properties n/ide10/db-sql-editor/db-sql-editor/org/netbeans/modules/db/sql/editor/ui/actions/Bundle.properties 60a61,63 > > # ToggleKeepOldResultTabsAction > LBL_ToggleKeepOldResultTabsAction=Keep Prior Tabs Only in n/ide10/editor-bookmarks/editor-bookmarks/org/netbeans/lib/editor/bookmarks: api diff -r o/ide10/editor-bookmarks/editor-bookmarks/org/netbeans/modules/editor/bookmarks/Bundle.properties n/ide10/editor-bookmarks/editor-bookmarks/org/netbeans/modules/editor/bookmarks/Bundle.properties 45,47c45 < # {0} - line number < Bookmark_Tooltip=Bookmark < HINT_BOOKMARK=Bookmark --- > HINT_BOOKMARK=Bookmark \ No newline at end of file diff -r o/ide10/editor-highlights/editor-highlights/org/netbeans/modules/editor/highlights/resources/Bundle.properties n/ide10/editor-highlights/editor-highlights/org/netbeans/modules/editor/highlights/resources/Bundle.properties 43c43 < OpenIDE-Module-Deprecation-Message=Use org.netbeans.spi.highlighting (Editor Library 2) instead. --- > OpenIDE-Module-Deprecation-Message=Use org.netbeans.spi.editor.highlighting from org.netbeans.modules.editor.lib2 instead. diff -r o/ide10/glassfish-common/glassfish-common/org/netbeans/modules/glassfish/common/Bundle.properties n/ide10/glassfish-common/glassfish-common/org/netbeans/modules/glassfish/common/Bundle.properties 71a72 > MSG_ServerCmdException={0} failed on {1} : {2} 90a92,93 > > MSG_LocaleSwitched=GlassFish V3 cannot operate current Locale. Locale switched to en_US for the processs. \ No newline at end of file diff -r o/ide10/glassfish-common/glassfish-common/org/netbeans/modules/glassfish/common/actions/Bundle.properties n/ide10/glassfish-common/glassfish-common/org/netbeans/modules/glassfish/common/actions/Bundle.properties 78d77 < LBL_Profiling=Starting {0} in Profile Mode 87c86 < MSG_QueryInstallUpdateCenter=Update Center has not been run for {0} before. Do you wish to download and install it now?\n\nDepending on the speed of your connection, this could take a while, but you will be able to continue working during the download process. --- > MSG_QueryInstallUpdateCenter=Update Center is not installed for {0}. Do you wish to download and install it now?\n\nDepending on the speed of your connection, this could take a while, but you will be able to continue working during the download process. 89a89 > MSG_UpdateCenterNoPermission=Update Center is not installed for {0}, but the current user does not have write permissions for {1}.\n\nPlease either retry this action as the owner of that folder or change the permissions so the current user can install the software. diff -r o/ide10/glassfish-common/glassfish-common/org/netbeans/modules/glassfish/common/ui/Bundle.properties n/ide10/glassfish-common/glassfish-common/org/netbeans/modules/glassfish/common/ui/Bundle.properties 53c53 < JdbcResourceCustomizer.poolNameField.text=fetching data... --- > MSG_FETCHING_DATA=fetching data.... 63c63 < TITLE_WARNING_HTTP_MONITOR_ON=HTTP Monitor Effects \ No newline at end of file --- > TITLE_WARNING_HTTP_MONITOR_ON=HTTP Monitor Effects diff -r o/ide10/glassfish-common/glassfish-common/org/netbeans/modules/glassfish/common/wizards/Bundle.properties n/ide10/glassfish-common/glassfish-common/org/netbeans/modules/glassfish/common/wizards/Bundle.properties 85c85,86 < ERR_InstallDirInvalid={0} is not a valid GlassFish V3 installation. --- > ERR_InstallDirInvalid={0} is not an acceptable folder name. > ERR_InstallationInvalid={0} is not a valid GlassFish V3 installation. 87a89 > MSG_DefaultDomainExists={1} is already registered for this installation. Choose a different domain on the next tab. 91a94 > ERR_DomainAlreadyRegistered=Domain {0} is already registered for this installation. 96c99,116 < ERR_CannotCreateDomain=Cannot create domain at {0} \ No newline at end of file --- > ERR_CannotCreateDomain=Cannot create domain at {0} > MSG_MustHaveName=The domain name cannot be blank. > MSG_EnterDomainDirectory=Enter the path to a directory that will contain a new domain. > AddDomainLocationVisualPanel.explanationLabel.text=To select an existing domain, select its name from the drop-down list. If the domain's name does not appear in the list, you can type the path to the domain directly.

\nTo create a new domain, type the name in the field or type the name of a nonexistent directory. > > ERR_TargetExists=Target {0} already exists. Terminating archive installation. > ERR_FolderCreationFailed=Failed to create folder: {0}. Terminating archive installation. > ERR_FolderMoveFailed=Unable to move existing folder {0} out of the way. > ERR_FileMoveFailed=Unable to move existing file {0} out of the way. > ERR_TooManyBackups=Unable to backup {0}. Too many GlassFish V3 backups already. > ERR_ChmodFailed=Could not run {0} : Exit value={1} > > # MSG_Installing - {0} = path, {1} = size string, from MSG_SizeXX below > # example: Installing glassfish/bin/updatetool.bat (798 bytes)) > MSG_Installing=Installing {0} ({1}) > MSG_SizeBytes={0} bytes > MSG_SizeKb={0}k > MSG_SizeMb={0}.{1}m diff -r o/ide10/jumpto/jumpto/org/netbeans/modules/jumpto/symbol/Bundle.properties n/ide10/jumpto/jumpto/org/netbeans/modules/jumpto/symbol/Bundle.properties 38c38 < TXT_GoToSymbol=Go to Symbol... --- > TXT_GoToSymbol=Go to S&ymbol... diff -r o/ide10/localhistory/localhistory/org/netbeans/modules/localhistory/options/Bundle.properties n/ide10/localhistory/localhistory/org/netbeans/modules/localhistory/options/Bundle.properties 9a10 > LocalHistoryOptionsPanel.warningLabel.text=Must be a number diff -r o/ide10/mercurial/mercurial/org/netbeans/modules/mercurial/ui/diff/Bundle.properties n/ide10/mercurial/mercurial/org/netbeans/modules/mercurial/ui/diff/Bundle.properties 107d106 < MSG_EXPORT_NOTHING = Nothing comitted, so nothing to Export. 153d151 < BK3005=Replace existing {0} file?. diff -r o/ide10/options-editor/options-editor/org/netbeans/modules/options/colors/Bundle.properties n/ide10/options-editor/options-editor/org/netbeans/modules/options/colors/Bundle.properties 87c87 < CTL_Foreground_label=Fo®round: --- > CTL_Foreground_label=For&eground: diff -r o/ide10/options-editor/options-editor/org/netbeans/modules/options/generaleditor/Bundle.properties n/ide10/options-editor/options-editor/org/netbeans/modules/options/generaleditor/Bundle.properties 94a95,100 > CTL_Javadoc_Next_To_CC=Display Documentation Next to Completion > AN_Javadoc_Next_To_CC=Documentation Next To Completion Checkbox > AD_Javadoc_Next_To_CC=Display Documentation Next To Completion > CTL_Camel_Case_Behavior_Example=Example: Caret stops at J, T, N in "JavaTypeName" when using next/previous word actions > AN_Camel_Case_Behavior_Example=Example: Caret stops at J, T, N in "JavaTypeName" when using next/previous word actions > AD_Camel_Case_Behavior_Example=Example: Caret stops at J, T, N in "JavaTypeName" when using next/previous word actions diff -r o/ide10/options-editor/options-editor/org/netbeans/modules/options/indentation/Bundle.properties n/ide10/options-editor/options-editor/org/netbeans/modules/options/indentation/Bundle.properties 41,45c41,46 < #IndentationPanel < Indentation_Tab=Tabs And Indents < CTL_Indentation=Tabs And Indents < CTL_Indentation_Title=Tabs And Indents < CTL_Indentation_Description=Tabs And Indents --- > #Tools-Options -> Editor -> Formatting customizer > indentation-customizer-display-name=Tabs And Indents > #Indentation_Tab=Tabs And Indents > #CTL_Indentation=Tabs And Indents > #CTL_Indentation_Title=Tabs And Indents > #CTL_Indentation_Description=Tabs And Indents 46a48,51 > #The basic formatting settings customizer > CTL_Override_Global_Options=Override Global Options > AN_Override_Global_Options=Override Global Options > AD_Override_Global_Options=Override Global Options 68a74 > MSG_no_preview_available=Preview not available 78,81c84,87 < LBL_ExpandTabToSpaces=&Expand Tab to Spaces < LBL_TabSize=&Tab Size: < LBL_IndentSize=&Indentation Size: < LBL_RightMargin=&Right Margin: --- > #LBL_ExpandTabToSpaces=&Expand Tab to Spaces > #LBL_TabSize=&Tab Size: > #LBL_IndentSize=&Indentation Size: > #LBL_RightMargin=&Right Margin: 83c89 < LBL_TabsAndIndents=Tabs and Indents --- > #LBL_TabsAndIndents=Tabs and Indents Only in o/ide10/org-netbeans-libs-svnClientAdapter: ext diff -r o/ide10/org-netbeans-spi-debugger-ui/org-netbeans-spi-debugger-ui/org/netbeans/modules/debugger/ui/actions/Bundle.properties n/ide10/org-netbeans-spi-debugger-ui/org-netbeans-spi-debugger-ui/org/netbeans/modules/debugger/ui/actions/Bundle.properties 44c44 < ACSD_ConnectorPanel=Connects debugger to some currently running process --- > ACSD_ConnectorPanel=Connects debugger to a currently running process. 66,67c66,67 < LBL_DebugSingleAction_Name=&Debug {0,choice,0#File|1#"{1}"|1 LBL_DebugSingleAction_Name=Debu&g {0,choice,0#File|1#"{1}"|1 LBL_DebugTestSingleAction_Name=Debug Test fo&r {0,choice,0#File|1#"{1}"|1 CTL_Fix_action_name=Appl&y Code Changes 216a217,218 > # {0} Breakpoint > ACSD_Breakpoint_Customizer=Properties of {0} 222c224 < USG_DEBUG_ATTACH=Connecting via connect type {0} \ No newline at end of file --- > USG_DEBUG_ATTACH=Connecting via connect type {0} diff -r o/ide10/org-netbeans-spi-debugger-ui/org-netbeans-spi-debugger-ui/org/netbeans/modules/debugger/ui/models/Bundle.properties n/ide10/org-netbeans-spi-debugger-ui/org-netbeans-spi-debugger-ui/org/netbeans/modules/debugger/ui/models/Bundle.properties 83c83 < CTL_SessionsView_Column_HostName_Desc = Computer name this session is running on --- > CTL_SessionsView_Column_HostName_Desc = Name of computer this session is running on 100c100 < CTL_ThreadsView_Column_Suspended_Desc = Is thread suspended by debugger --- > CTL_ThreadsView_Column_Suspended_Desc = Thread suspended by debugger diff -r o/ide10/org-netbeans-spi-debugger-ui/org-netbeans-spi-debugger-ui/org/netbeans/modules/debugger/ui/views/Bundle.properties n/ide10/org-netbeans-spi-debugger-ui/org-netbeans-spi-debugger-ui/org/netbeans/modules/debugger/ui/views/Bundle.properties 50c50 < HINT_location_name=A name of computer this session is running on. --- > HINT_location_name=Name of computer this session is running on. 123c123 < HINT_show_messages=Whether the debugger shows information messages. --- > HINT_show_messages=Enable display of debugging information messages 125c125 < HINT_show_in_editor=Whether the class the debugger is stopped at is shown in the Editor. --- > HINT_show_in_editor=Show class where debugger is stopped in editor. 164c164 < HINT_group_name=Name of this thread group --- > HINT_group_name=Name of thread group 210c210 < HINT_session_name_column_name=A name used to identify the session. --- > HINT_session_name_column_name=Name used to identify the session. 212c212 < HINT_session_state_column_name=A description of the current state of the session. --- > HINT_session_state_column_name=Description of the current state of the session. 214c214 < HINT_session_location_column_name=A name of computer this session is running on. --- > HINT_session_location_column_name=Name of computer this session is running on. 219c219 < HINT_threads_column_name=A name used to identify the thread. --- > HINT_threads_column_name=Name used to identify the thread. 221c221 < HINT_threads_column_state=A description of the current state of the thread. --- > HINT_threads_column_state=Description of the current state of the thread. 225c225 < HINT_threads_column_class=The qualified name of the class that execution is within on the thread. --- > HINT_threads_column_class=Qualified name of the class that execution is within on the thread. 230c230 < HINT_watches_column_inner_type=The type as it is known to the runtime system. --- > HINT_watches_column_inner_type=Type as it is known to the runtime system. 232c232 < HINT_watches_column_value=The current value of the watch. --- > HINT_watches_column_value=Current value of the watch. 246c246 < HINT_callstack_column_name=An identifier of the function or method corresponding to the frame. --- > HINT_callstack_column_name=Identifier of the function or method corresponding to the frame. 248c248 < HINT_callstack_column_location=The file and line number of the source code corresponding to the current instruction. --- > HINT_callstack_column_location=File name and line number of the source code corresponding to the current instruction. 251c251 < HINT_locals_column_name=The name of the variable --- > HINT_locals_column_name=Name of the variable 253c253 < HINT_locals_column_inner_type=The type as it is known to the runtime system. --- > HINT_locals_column_inner_type=Type as it is known to the runtime system. 255c255 < HINT_locals_column_value=The current value of the variable. --- > HINT_locals_column_value=Current value of the variable. diff -r o/ide10/print/print/org/netbeans/modules/print/ui/Bundle.properties n/ide10/print/print/org/netbeans/modules/print/ui/Bundle.properties 85c85 < # Option --- > # Attribute 99a100 > LBL_Selection=Print &Selection 128a130 > TLT_Selection=Print Selection diff -r o/ide10/print/print/org/netbeans/modules/print/util/Bundle.properties n/ide10/print/print/org/netbeans/modules/print/util/Bundle.properties 55c55 < COUNT=The count of all pages --- > COUNT=The count of pages diff -r o/ide10/project-ant/project-ant/org/netbeans/modules/project/ant/Bundle.properties n/ide10/project-ant/project-ant/org/netbeans/modules/project/ant/Bundle.properties 58c58 < FileChooserAccessory.rbRelative.text=Use &Relative Path: --- > FileChooserAccessory.rbRelative.text=&Relative Path: 60c60 < FileChooserAccessory.rbAbsolute.text=Use &Absolute Path: --- > FileChooserAccessory.rbAbsolute.text=&Absolute Path: 68c68 < FileChooserAccessory.rbVariable.text=Use &Variable Path: --- > FileChooserAccessory.rbVariable.text=Path from &Variable: 94a95 > FileChooserAccessory.lblReference.text=Reference as diff -r o/ide10/projectui/projectui/org/netbeans/modules/project/ui/actions/Bundle.properties n/ide10/projectui/projectui/org/netbeans/modules/project/ui/actions/Bundle.properties 74,76c74,76 < LBL_JavadocProjectAction_Name=&Generate Javadoc {0,choice,0#|1#({1})|1<{0} Projects} < LBL_TestProjectAction_Name=Test {0,choice,0#Project|1#Project ({1})|1<{0} Projects} < LBL_CompileSingleAction_Name=Co&mpile {0,choice,0#File|1#"{1}"|1 LBL_JavadocProjectAction_Name=&Generate Javadoc{0,choice,0#|1# ({1})|1< {0} Projects} > LBL_TestProjectAction_Name=&Test {0,choice,0#Project|1#Project ({1})|1<{0} Projects} > LBL_CompileSingleAction_Name=Compi&le {0,choice,0#File|1#"{1}"|1 LBL_NoneMainProject_Name=&None 97c97 < LBL_RunSingleAction_Name=&Run File --- > LBL_RunSingleAction_Name=Run &File 99c99 < LBL_TestSingleAction_Name=&Test File --- > LBL_TestSingleAction_Name=T&est File 111c111 < ActiveConfigAction.label=Set Project Con&figuration --- > ActiveConfigAction.label=Set Project Co&nfiguration diff -r o/ide10/projectui/projectui/org/netbeans/modules/project/ui/resources/ProjectTemplates.html n/ide10/projectui/projectui/org/netbeans/modules/project/ui/resources/ProjectTemplates.html 44c44 < --- > diff -r o/ide10/projectui/projectui/org/netbeans/modules/project/ui/resources/import.html n/ide10/projectui/projectui/org/netbeans/modules/project/ui/resources/import.html 42c42 < --- > 44c44 < --- > diff -r o/ide10/projectui/projectui/org/netbeans/modules/project/ui/resources/templatesFolder.html n/ide10/projectui/projectui/org/netbeans/modules/project/ui/resources/templatesFolder.html 42c42 < --- > 44,45c44,46 < < --- > > > diff -r o/ide10/properties/properties/org/netbeans/modules/properties/TemplateHelp.html n/ide10/properties/properties/org/netbeans/modules/properties/TemplateHelp.html 43c43 < --- > 45,46c45,47 < < --- > > > diff -r o/ide10/server/server/org/netbeans/modules/server/ui/wizard/Bundle.properties n/ide10/server/server/org/netbeans/modules/server/ui/wizard/Bundle.properties 67c67,73 < ACSD_Add_Server_Instance=Add server instance wizard \ No newline at end of file --- > ACSD_Add_Server_Instance=Add server instance wizard > > LBL_NoServerPlugins_Title=Add Server > LBL_NoServerPlugins_Text=No server plugins are installed in the IDE
\ > The IDE needs a server plugin (e.g. GlassFish plugin) to enable registering
\ > and using a server. Use Plugins Manager to install server plugins. > LBL_NoServerPlugins_Close=Close diff -r o/ide10/subversion/subversion/org/netbeans/modules/subversion/client/Bundle.properties n/ide10/subversion/subversion/org/netbeans/modules/subversion/client/Bundle.properties 109,110c109,110 < MissingSvnClientPanel.cliRadioButton.text=Install svn 1.5 Comandline Client < MissingSvnClientPanel.bundledRadioButton.text=Get bundled Subversion 1.5 binaries for Windows from UC (Recommended) --- > MissingSvnClientPanel.cliRadioButton.text=&Install Subversion 1.5 Commandline Client > MissingSvnClientPanel.bundledRadioButton.text=Get &bundled Subversion 1.5 binaries for Windows from UC (Recommended) 123c123 < MSG_LookingForJavahl=Loking for bundled Subversion Client... --- > MSG_LookingForJavahl=Looking for bundled Subversion Client... 131c131,139 < MissingClientPanel.forceGlobalCheckBox.text=Force install into shared directories --- > MissingClientPanel.forceGlobalCheckBox.text=&Force install into shared directories > MissingClientPanel.textPane.AccessibleContext.accessibleName=Downloadl > MissingClientPanel.textPane.AccessibleContext.accessibleDescription=Download subversion > MissingClientPanel.downloadRadioButton.AccessibleContext.accessibleDescription=Choose to get the bundled Subversion 1.5 binaries for Windows from UC (Recommended) > MissingClientPanel.downloadRadioButton.AccessibleContext.accessibleName=Bundled Svn > MissingClientPanel.cliRadioButton.AccessibleContext.accessibleName=Install SVN > MissingClientPanel.cliRadioButton.AccessibleContext.accessibleDescription=Choose to install Subversion 1.5 Comandline Client > MissingClientPanel.AccessibleContext.accessibleName=Svn commad failed > MissingClientPanel.AccessibleContext.accessibleDescription=Svn commad failed diff -r o/ide10/subversion/subversion/org/netbeans/modules/subversion/options/Bundle.properties n/ide10/subversion/subversion/org/netbeans/modules/subversion/options/Bundle.properties 94,95c94,99 < SvnOptionsPanel.jTextPane1.text=Use this Button to manage the Connection Settings for all previously used URLs: < SvnOptionsPanel.jTextPane2.text=To define the Folder variable content (Branch/Tag name) press: --- > SvnOptionsPanel.jLabel6.text=Use this Button to manage the Connection Settings for all previously used URLs: > SvnOptionsPanel.jLabel7.text=To define the Folder variable content (Branch/Tag name) press: > SvnOptionsPanel.jLabel6.AccessibleContext.accessibleDescription=Lets you to manage the connection settings > SvnOptionsPanel.jLabel6.AccessibleContext.accessibleName=Manage connections > SvnOptionsPanel.jLabel7.AccessibleContext.accessibleName=Define Folder variable > SvnOptionsPanel.jLabel7.AccessibleContext.accessibleDescription=Lets you to define the folder variable diff -r o/ide10/tasklist-projectint/tasklist-projectint/org/netbeans/modules/tasklist/projectint/Bundle.properties n/ide10/tasklist-projectint/tasklist-projectint/org/netbeans/modules/tasklist/projectint/Bundle.properties 12a13,18 > > LBL_OpenedProjectsStatusBar=in all opened projects > LBL_NoProjectStatusBar= > LBL_MainProjectStatusBar=in the main project and in the opened projects on which it depends > LBL_CurrentProjectStatusBar=in {0} > HINT_CurrentProjectScope=Show tasks in {0} \ No newline at end of file diff -r o/ide10/tasklist-ui/tasklist-ui/org/netbeans/modules/tasklist/impl/Bundle.properties n/ide10/tasklist-ui/tasklist-ui/org/netbeans/modules/tasklist/impl/Bundle.properties 3a4 > LBL_CurrentFileStatusMessage=in currently edited file \ No newline at end of file diff -r o/ide10/tasklist-ui/tasklist-ui/org/netbeans/modules/tasklist/ui/Bundle.properties n/ide10/tasklist-ui/tasklist-ui/org/netbeans/modules/tasklist/ui/Bundle.properties 27c27 < LBL_NoTasks= --- > LBL_NoTasks= diff -r o/ide10/xml/xml/org/netbeans/modules/xml/resources/XMLWizard.html n/ide10/xml/xml/org/netbeans/modules/xml/resources/XMLWizard.html 43c43 < --- > 45,46c45,47 < < --- > > > diff -r o/ide10/xml/xml/org/netbeans/modules/xml/resources/emptyDTD.html n/ide10/xml/xml/org/netbeans/modules/xml/resources/emptyDTD.html 43c43 < --- > 45,46c45,47 < < --- > > > diff -r o/ide10/xml/xml/org/netbeans/modules/xml/resources/xhtml.html n/ide10/xml/xml/org/netbeans/modules/xml/resources/xhtml.html 43c43 < --- > 45,46c45,47 < < --- > > > diff -r o/ide10/xml/xml/org/netbeans/modules/xml/resources/xml_entity.html n/ide10/xml/xml/org/netbeans/modules/xml/resources/xml_entity.html 43c43 < --- > 45,46c45,47 < < --- > > > diff -r o/ide10/xml-catalog/xml-catalog/org/netbeans/modules/xml/catalog/resources/templates/XMLCatalog.html n/ide10/xml-catalog/xml-catalog/org/netbeans/modules/xml/catalog/resources/templates/XMLCatalog.html 43c43 < --- > 45,46c45,47 < < --- > > > diff -r o/ide10/xml-tools/xml-tools/org/netbeans/modules/xml/tools/actions/Bundle.properties n/ide10/xml-tools/xml-tools/org/netbeans/modules/xml/tools/actions/Bundle.properties 53c53 < NAME_Check_File=Check File --- > NAME_Check_File=Chec&k File 64c64 < NAME_Validate_File=Validate File --- > NAME_Validate_File=&Validate File diff -r o/ide10/xml-tools/xml-tools/org/netbeans/modules/xml/tools/generator/Bundle.properties n/ide10/xml-tools/xml-tools/org/netbeans/modules/xml/tools/generator/Bundle.properties 40,83d39 < ## a11y - SelectFileDialog < ACSD_fileField=n/a < ACSD_SelectFileDialog=Select File < < ## a11y - SAXGeneratorFilePanel < ACSD_interfaceTextField=n/a < ACSD_handlerImplTextField=n/a < ACSD_stubTextField=n/a < ACSD_parsletTextField=n/a < ACSD_parsletImplTextField=n/a < ACSD_saveTextField=n/a < ACSD_saveCheckBox=Save setting for next wizard session with the same DTD. < ACSN_saveCheckBox=Save Settings < < # a11y - SAXGeneratorVersionPanel < ACSD_propagateSAXCheckBox=Propagate original SAX events < ACSN_propagateSAXCheckBox=n/a < ACSD_jaxpVersionComboBox=n/a < ACSD_versionComboBox=n/a < < ## a11y - SAXGeneratorParsletPanel < ACSN_ParsletsTable=Data Convertors < ACSD_ParsletsTable=Table contains DTD element declaration to convertor method mapping. < < ## a11y - SAXGeneratorMethodPanel < ACSD_table=Table contains DTD element declaration to handling method mapping. < ACSN_table=Element Mappings < < ## ElementBindings.java < DELIMITER_HANDLING=Container < DATA_HANDLING=Data < IGNORE_HANDLING=Ignore < MIXED_HANDLING=Mixed Container < EMPTY_HANDLING=Empty < < ## GenerateDOMScannerSupport.java < NAME_SUFFIX_Scanner=Scanner < MSG_DOM_1=Generating DOM scanner... < MSG_DOM_ERR_1=Cannot proceed. DTD is not well formed! Check it first and then try again. < MSG_DOM_ERR_2=Cannot proceed. I/O problem occured. < PROP_rootElementNameTitle=Select Root Element Name < PROP_rootElementNameMne=R < PROP_rootElementName=Root Element: < 93,149c49,51 < ## SAXGeneratorFilePanel.java < MSG_file_err_1=Valid Java class name expected. < SAXGeneratorFilePanel.Form.name=Output File Names < SAXGeneratorCustomizer.interfaceLabel.text=Handler &Interface\: < SAXGeneratorCustomizer.stubLabel.text=Generated &Parser\: < SAXGeneratorCustomizer.parsletLabel.text=Da&ta Convertor Interface: < SAXGeneratorFilePanel.parsletImplLabel.text=Data &Convertor Implementation: < PROP_save_it=&Save Customized Bindings < PROP_bindings_label=&Location: < ACSD_SAXGeneratorFilePanel=Specify the names of the generated files. To save your customizations to the handler code generation for this DTD file, select the checkbox below. The bindings will be reloaded each time you run the wizard on this DTD file. < DESC_saxw_files=Specify the names of the generated files. To save your customizations to the handler code generation for this DTD file, select the checkbox below. The bindings will be reloaded each time you run the wizard on this DTD file. < < ## SAXGeneratorMethodPanel.java < SAXGeneratorMethodPanel.table.column1=Element (QName) < SAXGeneratorMethodPanel.table.column2=Handler Type < SAXGeneratorMethodPanel.table.column3=Handler Method < MSG_method_err_1=Valid part of Java identifier required. < SAXGeneratorMethodPanel.Form.name=Element Mappings < ACSD_SAXGeneratorMethodPanel=Customize your document handler interface here. For each element, specify a handler type in the Handler Type column and specify the name of the handler method in the Handler Method column. To exclude an element from the handler interface, set its Handler Type to Ignore. < DESC_saxw_methods=Customize your document handler interface here. For each element, specify a handler type in the Handler Type column and specify the name of the handler method in the Handler Method column. To exclude an element from the handler interface, set its Handler Type to Ignore. < < ## SAXGeneratorParsletPanel.java < SAXGeneratorParsletPanel.table.column1=Element (QName) < SAXGeneratorParsletPanel.table.column2=Convertor Method < SAXGeneratorParsletPanel.table.column3=Return Type < MSG_parslet_err_1=Valid Java return type required. < MSG_parslet_err_2=Valid Java method name required. < SAXGeneratorParsletPanel.Form.name=Data Convertors (Optional) < ACSD_SAXGeneratorParsletPanel=Configure your data convertor interface here (optional). Specify the name for each element's data convertor method in the Convertor Method column. If you don't want to generate a convertor method for an element, leave its Convertor Method set to [none].\nSpecify the method's return type in the Return Type column. If you select one of the IDE's preloaded return types, the conversion logic is generated for you. < DESC_saxw_convertors=Configure your data convertor interface here (optional). Specify the name for each element's data convertor method in the Convertor Method column. If you don't want to generate a convertor method for an element, leave its Convertor Method set to [none].\nSpecify the method's return type in the Return Type column. If you select one of the IDE's preloaded return types, the conversion logic is generated for you. < < ## SAXGeneratorSupport.java < SAXGeneratorSupport.title=SAX Document Handler Wizard < SAXGeneratorVersionPanel.step=API Versions < SAXGeneratorMethodPanel.step=Element Mappings < SAXGeneratorParsletPanel.step=Data Convertors < SAXGeneratorFilePanel.step=Output Files < SAXGeneratorSupport.subtitle={1} - {0} < MSG_sax_progress_1=Preparing SAX handler generator... < MSG_sax_progress_1_5=Generating SAX handler... < MSG_sax_progress_2=Writing down generated SAX handler files... < MSG_sax_progress_3=Opening generated SAX handler files in editor... < # {0} holds non-localized exception text < MSG_wizard_fail=Code generation failed. ({0}) < < ## SAXGeneratorVersionPanel.java < SAXGeneratorVersionPanel.Form.name=API Versions < SAXGeneratorVersionPanel.jaxpLabel.text=JAXP Version: < SAXGeneratorVersionPanel.jaxpLabel.mne=J < SAXGeneratorCustomizer.versionLabel.text=SAX Parser Version: < SAXGeneratorCustomizer.versionLabel.mne=S < SAXGeneratorVersionPanel.propagateSAXCheckBox.text=\ Propagate SAX Events to Generated Handler < SAXGeneratorVersionPanel.propagateSAXCheckBox.mne=P < ACSD_SAXGeneratorVersionPanel=Specify the versions of JAXP and of the SAX parser you want to use. If you want to include all of the original SAX parser events in the handler interface, select the checkbox below. < DESC_saxw_versions=Specify the versions of JAXP and of the SAX parser you want to use. If you want to include all of the original SAX parser events in the handler interface, select the checkbox below. < < --- > ## a11y - SelectFileDialog > ACSD_fileField=n/a > ACSD_SelectFileDialog=Select File 165a68 > MSG_action_failed=Action failed due to internal error! 169,174d71 < < MSG_invalid_dtd=The DTD is not in good shape. Aborting generation. < < MSG_sax_progress_done=SAX parser handler generation finished. < MSG_action_failed=Action failed due to internal error! < diff -r o/ide10/xsl/xsl/org/netbeans/modules/xsl/resources/templates/stylesheet.html n/ide10/xsl/xsl/org/netbeans/modules/xsl/resources/templates/stylesheet.html 43c43 < --- > 45,46c45,47 < < --- > > > diff -r o/java2/beans/beans/org/netbeans/modules/beans/Bundle.properties n/java2/beans/beans/org/netbeans/modules/beans/Bundle.properties 0a1,40 > # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. > # > # Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved. > # > # The contents of this file are subject to the terms of either the GNU > # General Public License Version 2 only ("GPL") or the Common > # Development and Distribution License("CDDL") (collectively, the > # "License"). You may not use this file except in compliance with the > # License. You can obtain a copy of the License at > # http://www.netbeans.org/cddl-gplv2.html > # or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the > # specific language governing permissions and limitations under the > # License. When distributing the software, include this License Header > # Notice in each file and include the License file at > # nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this > # particular file as subject to the "Classpath" exception as provided > # by Sun in the GPL Version 2 section of the License file that > # accompanied this code. If applicable, add the following below the > # License Header, with the fields enclosed by brackets [] replaced by > # your own identifying information: > # "Portions Copyrighted [year] [name of copyright owner]" > # > # Contributor(s): > # > # The Original Software is NetBeans. The Initial Developer of the Original > # Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun > # Microsystems, Inc. All Rights Reserved. > # > # If you wish your version of this file to be governed by only the CDDL > # or only the GPL Version 2, indicate your decision by adding > # "[Contributor] elects to include this software in this distribution > # under the [CDDL or GPL Version 2] license." If you do not indicate a > # single choice of license, a recipient has the option to distribute > # your version of this file under either the CDDL, the GPL Version 2 or > # to extend the choice of license to its licensees as provided above. > # However, if you add GPL Version 2 code and therefore, elected the GPL > # Version 2 license, then the option applies only if the new code is > # made subject to such option by the copyright holder. > > # Nodes 7a48 > # CONTROLS - PatternGroupNode menu Items 13a55 > # CONTROLS - PropertyPatternPanel 51a94 > # CONTROLS - IdxPropertyPatternPanel 100a144 > # CONTROLS - EventSetPatternPanel 127a172 > # CONTROLS - UEventPatternPanel 151a197 > # Properties names 153a200 > # Hints for nodes 164a212,213 > # Default comments for bean pattern methods and fields > 215a265 > # Element properties 241a292 > # Message from node element 243a295 > # {0} = Propertyname 244a297 > # {0} = EventSet type 248a302 > # {0} = Propertyname 249a304 > # {0} = Propertyname 250a306 > # {0} = Field name 251a308 > # {0} = Field name 252a310 > # {0} = Field name 253a312 > # Message from deleting an event 254a314 > # {0} = Event source name 255a316 > # {0} = Event source name 257a319 > # Property editors 264a327 > # New types of the ClassElement 269a333 > #unable to create field for property 276a341 > #found InheritanceEvent 278a344 > #Property names for option settings 286a353 > #localized manifest 292a360 > # Human-readable names for Bean templates: 299a368,369 > #brandable types > ## filling for Types combo 300a371 > ## selected type of the Types combo 301a373 > ## filling for Types combo 302a375 > ## selected type of the Types combo diff -r o/java2/beans/beans/org/netbeans/modules/beans/beaninfo/Bundle.properties n/java2/beans/beans/org/netbeans/modules/beans/beaninfo/Bundle.properties 0a1,41 > # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. > # > # Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved. > # > # The contents of this file are subject to the terms of either the GNU > # General Public License Version 2 only ("GPL") or the Common > # Development and Distribution License("CDDL") (collectively, the > # "License"). You may not use this file except in compliance with the > # License. You can obtain a copy of the License at > # http://www.netbeans.org/cddl-gplv2.html > # or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the > # specific language governing permissions and limitations under the > # License. When distributing the software, include this License Header > # Notice in each file and include the License file at > # nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this > # particular file as subject to the "Classpath" exception as provided > # by Sun in the GPL Version 2 section of the License file that > # accompanied this code. If applicable, add the following below the > # License Header, with the fields enclosed by brackets [] replaced by > # your own identifying information: > # "Portions Copyrighted [year] [name of copyright owner]" > # > # Contributor(s): > # > # The Original Software is NetBeans. The Initial Developer of the Original > # Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun > # Microsystems, Inc. All Rights Reserved. > # > # If you wish your version of this file to be governed by only the CDDL > # or only the GPL Version 2, indicate your decision by adding > # "[Contributor] elects to include this software in this distribution > # under the [CDDL or GPL Version 2] license." If you do not indicate a > # single choice of license, a recipient has the option to distribute > # your version of this file under either the CDDL, the GPL Version 2 or > # to extend the choice of license to its licensees as provided above. > # However, if you add GPL Version 2 code and therefore, elected the GPL > # Version 2 license, then the option applies only if the new code is > # made subject to such option by the copyright holder. > > > 3a45 > #nodes 5a48 > #controls 9a53 > HINT_NODE_Descriptor=BeanDescriptor provides global information about the "bean". 21a66 > #editing icons 54a100,101 > #Bean info features properties and hints > 118a166 > #Messages 127a176 > #BeanInfo comments 140a190 > # BeanInfo editor diff -r o/java2/beans/beans/org/netbeans/modules/beans/resources/Bean.html n/java2/beans/beans/org/netbeans/modules/beans/resources/Bean.html 42c42 < --- > 44,45c44,47 < < --- > > > > diff -r o/java2/beans/beans/org/netbeans/modules/beans/resources/BeanInfo.html n/java2/beans/beans/org/netbeans/modules/beans/resources/BeanInfo.html 42c42 < --- > 44,45c44,46 < < --- > > > diff -r o/java2/beans/beans/org/netbeans/modules/beans/resources/Beans.html n/java2/beans/beans/org/netbeans/modules/beans/resources/Beans.html 42c42 < --- > 44,45c44,46 < < --- > > > diff -r o/java2/beans/beans/org/netbeans/modules/beans/resources/Customizer.html n/java2/beans/beans/org/netbeans/modules/beans/resources/Customizer.html 42c42 < --- > 44,45c44,46 < < --- > > > diff -r o/java2/beans/beans/org/netbeans/modules/beans/resources/PropertyEditor.html n/java2/beans/beans/org/netbeans/modules/beans/resources/PropertyEditor.html 42c42 < --- > 44,45c44,46 < < --- > > > diff -r o/java2/dbschema/dbschema/org/netbeans/modules/dbschema/jdbcimpl/resources/DBSchema.html n/java2/dbschema/dbschema/org/netbeans/modules/dbschema/jdbcimpl/resources/DBSchema.html 43c43 < --- > 45,46c45,47 < < --- > > > diff -r o/java2/dbschema/dbschema/org/netbeans/modules/dbschema/jdbcimpl/resources/Databases.html n/java2/dbschema/dbschema/org/netbeans/modules/dbschema/jdbcimpl/resources/Databases.html 43c43 < --- > 45,46c45,47 < < --- > > > diff -r o/java2/debugger-jpda/debugger-jpda/org/netbeans/modules/debugger/jpda/Bundle.properties n/java2/debugger-jpda/debugger-jpda/org/netbeans/modules/debugger/jpda/Bundle.properties 52c52 < RememberDecision=Remember this decision for the rest of the debugging session --- > RememberDecision=Remember this decision for the rest of the debugging session. diff -r o/java2/debugger-jpda/debugger-jpda/org/netbeans/modules/debugger/jpda/actions/Bundle.properties n/java2/debugger-jpda/debugger-jpda/org/netbeans/modules/debugger/jpda/actions/Bundle.properties 49c49 < CTL_CheckDeadlocks=Chec&k for Deadlocks --- > CTL_CheckDeadlocks=Chec&k for Deadlock diff -r o/java2/debugger-jpda/debugger-jpda/org/netbeans/modules/debugger/jpda/breakpoints/Bundle.properties n/java2/debugger-jpda/debugger-jpda/org/netbeans/modules/debugger/jpda/breakpoints/Bundle.properties 41c41 < MSG_jdi_internal_error=An internal error occurred in the debugged virtual machine. Debugging session may be unstable now, restart of debugger is recommended. --- > MSG_jdi_internal_error=An internal error occurred in the debugged virtual machine. The current debugging session may be unstable and it is recommended that you restart the debugger. 46c46 < MSG_NoSourceRoot=No source root found for URL ''{0}'', verify the setup of project sources. --- > MSG_NoSourceRoot=No source root found for URL ''{0}''. Verify the setup of project sources. 56,68d55 < < MSG_StepThreadInterruptedByBR=Step was interrupted by {0}\ < \nShould this breakpoint be ignored and step completed? < # Thread ''{1}'' has reached {0} during step in thread ''{2}''\ < #MSG_StepInterruptedByBR=Step was interrupted by {0} in thread ''{1}''\ < #\nShould this breakpoint be ignored and step completed? < #RememberDecision=Remember this decision for the rest of the debugging session < MSG_StepInterruptedByBR=Step interrupted by a breakpoint in another thread ("{1}"). < #Continue debugging in "{1}" thread or click "Ignore Breakpoint" to finish the interrupted step. < StepInterruptedByBR_Btn1=Ignore Breakpoint < StepInterruptedByBR_Btn1_TIP=Ignore this breakpoint hit. < StepInterruptedByBR_Btn2=Ignore All Such Breakpoints < StepInterruptedByBR_Btn2_TIP=Ignore all interrupting breakpoints in this session. diff -r o/java2/debugger-jpda/debugger-jpda/org/netbeans/modules/debugger/jpda/expr/Bundle.properties n/java2/debugger-jpda/debugger-jpda/org/netbeans/modules/debugger/jpda/expr/Bundle.properties 44c44 < CTL_EvalError_invalidArrayInitializer = Value \"{0}\" cannot be used inside an array initializer --- > CTL_EvalError_invalidArrayInitializer = Value \"{0}\" cannot be used inside an array initializer. 48,50c48,50 < CTL_EvalError_instantiateInterface = Type \"{0}\" cannot be instantiated, it is not a concrete class < CTL_EvalError_castToBooleanRequired = Cannot cast \"{0}\" to anything else than a boolean < CTL_EvalError_castFromBooleanRequired = Cannot cast \"{0}\" to a boolean --- > CTL_EvalError_instantiateInterface = Type \"{0}\" cannot be instantiated, it is not a concrete class. > CTL_EvalError_castToBooleanRequired = Cannot cast \"{0}\" to anything other than a boolean. > CTL_EvalError_castFromBooleanRequired = Cannot cast \"{0}\" to a boolean. 52c52 < CTL_EvalError_badOperandForPostfixOperator = Operand \"{0}\" to the postfix operator is not numeric --- > CTL_EvalError_badOperandForPostfixOperator = Operand \"{0}\" to the postfix operator is not numeric. 54c54 < CTL_EvalError_badOperandForPrefixOperator = Operand \"{0}\" to the prefix operator is not numeric --- > CTL_EvalError_badOperandForPrefixOperator = Operand \"{0}\" to the prefix operator is not numeric. 56c56 < CTL_EvalError_badOperandForUnaryOperator = Operand \"{0}\" to the unary operator is not numeric --- > CTL_EvalError_badOperandForUnaryOperator = Operand \"{0}\" to the unary operator is not numeric. 60,64c60,64 < CTL_EvalError_instanceOfLeftOperandNotAReference = Illegal type of left operand for instanceof: \"{0}\" Only reference types are allowed < CTL_EvalError_conditionalOrAndBooleanOperandRequired = Illegal type for && or || operator: \"{0}\" Only boolean type is allowed < CTL_EvalError_conditionalQuestionMarkBooleanOperandRequired = Illegal type for ?: operator: \"{0}\" Only boolean type is allowed < CTL_EvalError_thisObjectUnavailable = \"this\" object is not available in a static context < CTL_EvalError_objectReferenceRequiredOnDereference = Cannot dereference \"{0}\". An object reference is required --- > CTL_EvalError_instanceOfLeftOperandNotAReference = Illegal type of left operand for instanceof: \"{0}\" Only reference types are allowed. > CTL_EvalError_conditionalOrAndBooleanOperandRequired = Illegal type for && or || operator: \"{0}\" Only boolean type is allowed. > CTL_EvalError_conditionalQuestionMarkBooleanOperandRequired = Illegal type for ?: operator: \"{0}\" Only boolean type is allowed. > CTL_EvalError_thisObjectUnavailable = \"this\" object is not available in a static context. > CTL_EvalError_objectReferenceRequiredOnDereference = Cannot dereference \"{0}\". An object reference is required. 67c67 < CTL_EvalError_ambigousMethod = Cannot call method \"{1}\" in class \"{0}\". The call is ambigous. --- > CTL_EvalError_ambigousMethod = Cannot call method \"{1}\" in class \"{0}\". The call is ambiguous. 73,75c73,75 < CTL_EvalError_identifierNotAReference = Cannot dereference \"{0}\". An object reference is required < CTL_EvalError_notarray = \"{0}\" is not an array, cannot index its value < CTL_EvalError_arrayIndexNAN = Array index \"{0}\" is not numeric --- > CTL_EvalError_identifierNotAReference = Cannot dereference \"{0}\". An object reference is required. > CTL_EvalError_notarray = \"{0}\" is not an array, cannot index its value. > CTL_EvalError_arrayIndexNAN = Array index \"{0}\" is not numeric. 77,78c77,78 < CTL_EvalError_unknownVariable = \"{0}\" is not a known variable in current context < CTL_EvalError_integerLiteralTooBig = Integer literal \"{0}\" is too big. Use the L suffix for long values --- > CTL_EvalError_unknownVariable = \"{0}\" is not a known variable in the current context. > CTL_EvalError_integerLiteralTooBig = Integer literal \"{0}\" is too big. Use the L suffix for long values. 82,84c82,84 < CTL_EvalError_evaluateError = Unable to apply operator \"{0}\" to \"{1}\" and \"{2}\" < CTL_EvalError_accessInstanceVariableFromStaticContext = Cannot access instance variable \"{0}\" from static context < CTL_EvalError_methodCallOnNull = Method \"{0}\" is called on null object --- > CTL_EvalError_evaluateError = Unable to apply operator \"{0}\" to \"{1}\" and \"{2}\". > CTL_EvalError_accessInstanceVariableFromStaticContext = Cannot access instance variable \"{0}\" from static context. > CTL_EvalError_methodCallOnNull = Method \"{0}\" is called on null object. 86,87c86,87 < CTL_EvalError_fieldOnNull = Field \"{0}\" is referenced on null object < CTL_EvalError_arrayIsNull = Array \"{0}\" is null object --- > CTL_EvalError_fieldOnNull = Field \"{0}\" is referenced on null object. > CTL_EvalError_arrayIsNull = Array \"{0}\" is null object. 89c89 < CTL_EvalError_collected = The object was collected --- > CTL_EvalError_collected = The object was collected. 94,95c94,95 < CTL_EvalError_notExpression = Not an expression to evaluate < CTL_EvalError_methOnArray = Can not call any method on arrays. --- > CTL_EvalError_notExpression = No expression to evaluate. > CTL_EvalError_methOnArray = Cannot call any method on arrays. diff -r o/java2/debugger-jpda/debugger-jpda/org/netbeans/modules/debugger/jpda/models/Bundle.properties n/java2/debugger-jpda/debugger-jpda/org/netbeans/modules/debugger/jpda/models/Bundle.properties 43c43 < MSG_NativeMethodPop=One of the frames, that are to be popped off the stack, represents a native method.\ --- > MSG_NativeMethodPop=One of the frames that are to be popped off the stack represents a native method.\ 46c46 < MSG_CanNotSetValue=Can not set value to ''{0}'', unknown variable. --- > MSG_CanNotSetValue=Cannot set value to ''{0}'', unknown variable. diff -r o/java2/debugger-jpda-ant/debugger-jpda-ant/org/netbeans/modules/debugger/jpda/ant/Bundle.properties n/java2/debugger-jpda-ant/debugger-jpda-ant/org/netbeans/modules/debugger/jpda/ant/Bundle.properties 46,47c46,47 < and . Both tasks can only be run inside the NetBeans IDE. The \ < task, when run, it will ask the NetBeans JPDA debugger to \ --- > and . Both tasks can only be run inside the NetBeans IDE. When \ > run the task will ask the NetBeans JPDA debugger to \ 55,67d54 < # Apply code changes: < MSG_NoDebug=No debugging sessions was found. < MSG_NoJPDADebugger=Current debugger is not Java one. < MSG_CanNotFix=The debugger does not support Hot Fix action. < # {0} contains detailed info < MSG_FixUnsupported=The debugger does not support Hot Fix action, details: {0} < MSG_FixMismatch=The bytes don't correspond to the class type (the names don't match): {0} < MSG_FixVerifierProblems=A "verifier" detects that a class, though well formed, contains an internal inconsistency or security problem: {0} < MSG_FixUnsupportedVersion=The major and minor version numbers in bytes are not supported by the VM. {0} < MSG_FixNotValid=The bytes do not represent a valid class. {0} < MSG_FixCircularity=A circularity has been detected while initializing a class: {0} < MSG_FixSuccess=Code updated < diff -r o/java2/debugger-jpda-projects/debugger-jpda-projects/org/netbeans/modules/debugger/jpda/projects/Bundle.properties n/java2/debugger-jpda-projects/debugger-jpda-projects/org/netbeans/modules/debugger/jpda/projects/Bundle.properties 46c46 < and other classes, that need an access to the Java project system. --- > and other classes, that need to access the Java project system. 54c54 < TOOLTIP_BREAKPOINT_BROKEN=Broken breakpoint - it's not possible to stop on this line. --- > TOOLTIP_BREAKPOINT_BROKEN=Broken breakpoint - it is not possible to stop on this line. 72a73,85 > > # Apply code changes: > MSG_NoDebug=No debugging sessions was found. > MSG_NoJPDADebugger=Current debugger is not Java debugger. > MSG_CanNotFix=The debugger does not support Hot Fix action. > # {0} contains detailed info > MSG_FixUnsupported=The debugger does not support Hot Fix action, details: {0} > MSG_FixMismatch=The bytes do not correspond to the class type (the names don't match): {0} > MSG_FixVerifierProblems=A "verifier" detects that a class, though well formed, contains an internal inconsistency or security problem: {0} > MSG_FixUnsupportedVersion=Major and minor version numbers in bytes are not supported by the VM. {0} > MSG_FixNotValid=The bytes do not represent a valid class. {0} > MSG_FixCircularity=A circularity has been detected while initializing a class: {0} > MSG_FixSuccess=Code updated diff -r o/java2/debugger-jpda-ui/debugger-jpda-ui/org/netbeans/modules/debugger/jpda/ui/actions/Bundle.properties n/java2/debugger-jpda-ui/debugger-jpda-ui/org/netbeans/modules/debugger/jpda/ui/actions/Bundle.properties 99c99,102 < CTL_GoToBreakpointHit=Go to Breakpoint Hit \ No newline at end of file --- > CTL_GoToBreakpointHit=Go to Breakpoint Hit > > # SetCurrentThreadFromHistoryAction > CTL_SetCurrentThreadFromHistoryAction=Set Current T&hread... diff -r o/java2/debugger-jpda-ui/debugger-jpda-ui/org/netbeans/modules/debugger/jpda/ui/breakpoints/Bundle.properties n/java2/debugger-jpda-ui/debugger-jpda-ui/org/netbeans/modules/debugger/jpda/ui/breakpoints/Bundle.properties 62c62 < TTT_TF_Actions_Panel_Print_Text=Text to be printed when breakpoint occurres. --- > TTT_TF_Actions_Panel_Print_Text=Text to be printed when breakpoint occurs. 84c84 < TTT_CB_Class_Breakpoint_Exclusion_Filter=Hit all classes but these matching the filter. --- > TTT_CB_Class_Breakpoint_Exclusion_Filter=Hit all classes except those matching the filter. 246c246 < TTT_TF_Line_Breakpoint_Condition=Breakpoint hits if the expression evaluates to true --- > TTT_TF_Line_Breakpoint_Condition=Breakpoint is hit if the expression evaluates to true. 265c265 < TTT_Use_As_Default_Option=Use the selected suspend mode to be default for all new breakpoints. --- > TTT_Use_As_Default_Option=Use the selected suspend mode as default for all new breakpoints. 288c288 < ConditionsPanel.tfCondition.toolTipText=The conditional expression, that cause the break when it evaluates to true. --- > ConditionsPanel.tfCondition.toolTipText=Conditional expression that triggers break when it evaluates to true. 292,294c292,294 < TTT_CB_Classes_Filter_Throwing=Allows to restrict this breakpoint on specific classes that throw the exception. < TTT_CB_Classes_Matched=Restrict this breakpoint on specific classes. < TTT_CB_Classes_Excluded=Restrict this breakpoint on all but these excluded classes. --- > TTT_CB_Classes_Filter_Throwing=Enables restricting this breakpoint to specific classes that throw the exception. > TTT_CB_Classes_Matched=Restrict this breakpoint to specified classes. > TTT_CB_Classes_Excluded=Breakpoint applied to all classes except these excluded classes. 297c297 < TTT_Class_Pattern_Help_2=More patterns should be separated by commas. --- > TTT_Class_Pattern_Help_2=Multiple patterns should be separated by commas. 300c300 < TTT_TF_Hit_Count=Break only when the hit count matches the selected condition. --- > TTT_TF_Hit_Count=Break triggered only when the hit count matches the selected condition. diff -r o/java2/debugger-jpda-ui/debugger-jpda-ui/org/netbeans/modules/debugger/jpda/ui/debugging/Bundle.properties n/java2/debugger-jpda-ui/debugger-jpda-ui/org/netbeans/modules/debugger/jpda/ui/debugging/Bundle.properties 79a80 > CTL_Session=Session {0} 88,90c89,95 < InfoPanel.debuggerDeadlocksLabel.text=Step is blocked by other suspended thread(s). < InfoPanel.debuggerDeadlocksLabel.Method.text=Method invocation is blocked by other suspended thread(s). < InfoPanel.resumeDebuggerDeadlockLabel.text=Resume these thread(s) to proceed? --- > InfoPanel.debuggerDeadlocksLabelThread.text=Step is blocked by suspended thread ''{0}''. > InfoPanel.debuggerDeadlocksLabel.Method.text=Method invocation is blocked by other suspended threads. > InfoPanel.debuggerDeadlocksLabel.MethodThread.text=Method invocation is blocked by suspended thread ''{0}''. > InfoPanel.debuggerDeadlocksLabel.text=Step is blocked by other suspended threads. > InfoPanel.debuggerDeadlocksLabel.tooltip=Blocking threads are: {0}. > InfoPanel.resumeDebuggerDeadlockLabelThread.text=Resume this thread to proceed? > InfoPanel.resumeDebuggerDeadlockLabel.text=Resume these threads to proceed? 91a97,100 > InfoPanel.resumeDebuggerDeadlockButton.tooltip=Resume threads {0} to complete the step. > InfoPanel.resumeDebuggerDeadlockButton.Method.tooltip=Resume threads {0} to complete the method evaluation. > InfoPanel.resumeDebuggerDeadlockButtonThread.tooltip=Resume thread ''{0}'' to complete the step. > InfoPanel.resumeDebuggerDeadlockButtonThread.Method.tooltip=Resume thread ''{0}'' to complete the method evaluation. 95c104,108 < DebuggingView.treeView.AccessibleContext.accessibleDescription=Tree structure of threads in debugged VM. \ No newline at end of file --- > DebuggingView.treeView.AccessibleContext.accessibleDescription=Tree structure of threads in debugged VM. > InfoPanel.infoIcon3.text= > InfoPanel.stepBrkpLabel.text=Step interrupted by a breakpoint in another thread ''{0}''. > InfoPanel.stepBrkpIgnoreButton.text=Ignore Breakpoint > InfoPanel.stepBrkpIgnoreButton.tooltip=Ignore this breakpoint and complete the step. diff -r o/java2/debugger-jpda-ui/debugger-jpda-ui/org/netbeans/modules/debugger/jpda/ui/models/Bundle.properties n/java2/debugger-jpda-ui/debugger-jpda-ui/org/netbeans/modules/debugger/jpda/ui/models/Bundle.properties 69c69 < CTL_WatchAction_AddNew = New watch ... --- > CTL_WatchAction_AddNew = New Watch... 74c74 < CTL_New_Watch_Dialog_Title=New watch expression --- > CTL_New_Watch_Dialog_Title=New Watch 94,101c94,101 < #ThreadsTableModel < CTL_Thread_State_OnMonitor = On Monitor < CTL_Thread_State_NotStarted = Not Started < CTL_Thread_State_Running = Running < CTL_Thread_State_Sleeping = Sleeping < CTL_Thread_State_Unknown = Unknown < CTL_Thread_State_Waiting = Waiting < CTL_Thread_State_Zombie = Zombie --- > #ThreadsTableModel - old Threads view > CTL_Thread_Status_OnMonitor = On Monitor > CTL_Thread_Status_NotStarted = Not Started > CTL_Thread_Status_Running = Running > CTL_Thread_Status_Sleeping = Sleeping > CTL_Thread_Status_Unknown = Unknown > CTL_Thread_Status_Waiting = Waiting > CTL_Thread_Status_Zombie = Zombie 106c106 < NoCurrentThread=There is no current thread to display the call stack for. --- > NoCurrentThread=No call stack to display because there is no current thread. 151c151 < CTL_SourcesModel_Column_Debugging_Desc = Should this source root be used for debugging? --- > CTL_SourcesModel_Column_Debugging_Desc = Use this source root for debugging? 167c167 < CTL_ThreadsModel_Column_Name_Desc = Displayes all threads for current session --- > CTL_ThreadsModel_Column_Name_Desc = Displays all threads for current session 224c224 < NoCurrentThreadVar=There is no current thread to display the variables for. --- > NoCurrentThreadVar=No variables to display because there is no current thread. diff -r o/java2/derby/derby/org/netbeans/modules/derby/ui/Bundle.properties n/java2/derby/derby/org/netbeans/modules/derby/ui/Bundle.properties 47c47 < LBL_Properties=Properties... --- > LBL_Properties=Proper&ties... 67d66 < 69d67 < 71d68 < 73d69 < 75d70 < 77d71 < 78a73,82 > ACSD_CreateDatabasePanel_propertiesButton=Properties > > ACSN_DerbySystemHomePanel_derbyInstallInfoTextField=Database Install Info > ACSN_DerbySystemHomePanel_derbySystemHomeTextField=Database Home > ACSN_CreateDatabasePanel_databaseNameTextField=Database Name > ACSN_CreateDatabasePanel_databaseLocationTextField=Database Location > ACSN_DerbySystemHomePanel_messageLabel=Set Database Location > ACSN_CreateDatabasePanel_propertiesButton=Properties > > diff -r o/java2/form/form/org/netbeans/modules/form/Bundle.properties n/java2/form/form/org/netbeans/modules/form/Bundle.properties 183a184,186 > # title of the loading errors dialog > CTL_FormLoadingErrors=Errors Occured While Loading Form > 334,339c337,342 < FMT_ERR_LoadingComponent=Error in loading component:\n{0} < FMT_ERR_LoadingComponentProperty=Error in loading component property:\n{0} < FMT_ERR_LoadingLayout=Error in loading layout:\n{0} < FMT_ERR_LoadingLayoutProperty=Error in loading container layout property:\n{0} < FMT_ERR_LoadingLayoutConstraints=Error in loading layout constraints:\n{0} < FMT_ERR_LoadingLayoutConstraintsProperty=Error in loading layout constraint property:\n{0} --- > FMT_ERR_LoadingComponent=Error in loading component: {0} > FMT_ERR_LoadingComponentProperty=Error in loading component property: {0} > FMT_ERR_LoadingLayout=Error in loading layout: {0} > FMT_ERR_LoadingLayoutProperty=Error in loading container layout property: {0} > FMT_ERR_LoadingLayoutConstraints=Error in loading layout constraints: {0} > FMT_ERR_LoadingLayoutConstraintsProperty=Error in loading layout constraint property: {0} 634,641d636 < FMT_LAB_MenuItem=Item < FMT_LAB_CheckboxMenuItem=CheckBox < FMT_LAB_Menu=Menu < FMT_LAB_PopupMenu=PopupMenu < FMT_LAB_JMenuItem=Item < FMT_LAB_JCheckBoxMenuItem=CheckBox < FMT_LAB_JMenu=Menu < FMT_LAB_JRadioButtonMenuItem=RadioButton 733a729 > KW_FormOptions=GUI Builder,Swing Components diff -r o/java2/form/form/org/netbeans/modules/form/editors/Bundle.properties n/java2/form/form/org/netbeans/modules/form/editors/Bundle.properties 113a114 > LBL_ModifierPanel_Modifier_Default= diff -r o/java2/form/form/org/netbeans/modules/form/resources/AWTForms.html n/java2/form/form/org/netbeans/modules/form/resources/AWTForms.html 42c42 < --- > 44,45c44,46 < < --- > > > diff -r o/java2/form/form/org/netbeans/modules/form/resources/Applet.html n/java2/form/form/org/netbeans/modules/form/resources/Applet.html 42c42 < --- > 44,45c44,46 < < --- > > > diff -r o/java2/form/form/org/netbeans/modules/form/resources/Application.html n/java2/form/form/org/netbeans/modules/form/resources/Application.html 42c42 < --- > 44,45c44,46 < < --- > > > diff -r o/java2/form/form/org/netbeans/modules/form/resources/BeanForm.html n/java2/form/form/org/netbeans/modules/form/resources/BeanForm.html 42c42 < --- > 44,45c44,46 < < --- > > > diff -r o/java2/form/form/org/netbeans/modules/form/resources/Dialog.html n/java2/form/form/org/netbeans/modules/form/resources/Dialog.html 42c42 < --- > 44,45c44,46 < < --- > > > diff -r o/java2/form/form/org/netbeans/modules/form/resources/Dialogs.html n/java2/form/form/org/netbeans/modules/form/resources/Dialogs.html 42c42 < --- > 44,45c44,46 < < --- > > > diff -r o/java2/form/form/org/netbeans/modules/form/resources/Forms.html n/java2/form/form/org/netbeans/modules/form/resources/Forms.html 42c42 < --- > 44,45c44,46 < < --- > > > diff -r o/java2/form/form/org/netbeans/modules/form/resources/Frame.html n/java2/form/form/org/netbeans/modules/form/resources/Frame.html 42c42 < --- > 44,45c44,46 < < --- > > > diff -r o/java2/form/form/org/netbeans/modules/form/resources/JApplet.html n/java2/form/form/org/netbeans/modules/form/resources/JApplet.html 42c42 < --- > 44,45c44,46 < < --- > > > diff -r o/java2/form/form/org/netbeans/modules/form/resources/JDialog.html n/java2/form/form/org/netbeans/modules/form/resources/JDialog.html 42c42 < --- > 44,45c44,46 < < --- > > > diff -r o/java2/form/form/org/netbeans/modules/form/resources/JFrame.html n/java2/form/form/org/netbeans/modules/form/resources/JFrame.html 42c42 < --- > 44,45c44,46 < < --- > > > diff -r o/java2/form/form/org/netbeans/modules/form/resources/JInternalFrame.html n/java2/form/form/org/netbeans/modules/form/resources/JInternalFrame.html 42c42 < --- > 44,45c44,46 < < --- > > > diff -r o/java2/form/form/org/netbeans/modules/form/resources/JPanel.html n/java2/form/form/org/netbeans/modules/form/resources/JPanel.html 42c42 < --- > 44,45c44,46 < < --- > > > diff -r o/java2/form/form/org/netbeans/modules/form/resources/MDIApplication.html n/java2/form/form/org/netbeans/modules/form/resources/MDIApplication.html 42c42 < --- > 44,45c44,46 < < --- > > > diff -r o/java2/form/form/org/netbeans/modules/form/resources/OKCancelDialog.html n/java2/form/form/org/netbeans/modules/form/resources/OKCancelDialog.html 42c42 < --- > 44,45c44,46 < < --- > > > diff -r o/java2/form/form/org/netbeans/modules/form/resources/Panel.html n/java2/form/form/org/netbeans/modules/form/resources/Panel.html 42c42 < --- > 44,45c44,46 < < --- > > > diff -r o/java2/form-j2ee/form-j2ee/org/netbeans/modules/form/j2ee/wizard/Bundle.properties n/java2/form-j2ee/form-j2ee/org/netbeans/modules/form/j2ee/wizard/Bundle.properties 72a73 > MSG_MasterNoProvider=Creation of a form based on Java Persistence is not possible in this project. diff -r o/java2/hibernate/hibernate/org/netbeans/modules/hibernate/completion/Bundle.properties n/java2/hibernate/hibernate/org/netbeans/modules/hibernate/completion/Bundle.properties 57,58c57,58 < ASSIGNED_GENERATOR_DESC=Lets the application to assign an identifier to the object before save() is called. \ < This is the default strategy if no <generator>> element is specified. --- > ASSIGNED_GENERATOR_DESC=Allows the application assign an identifier to the object before save() is called. \ > This is the default strategy if no <generator> element is specified. 62c62 < with a primary key association. --- > with a <one-to-one> primary key association. 66c66 < This strategy is only known to be supported on Oracle 10g drivers targetted for JDK 1.4. \ --- > This strategy is only known to be supported on Oracle 10g drivers targeted for JDK 1.4. \ 72c72 < BINARY_DESC=Type mapping from byte[] to an appropriate SQL binary type --- > BINARY_DESC=Type mapping from byte[] to an appropriate SQL binary type. 120c120 < BATCH_VERSIONED_DATA_DESC=Should versioned data be included in batching? --- > BATCH_VERSIONED_DATA_DESC=Include versioned data in batching? 134c134 < DATASOURCE_DESC=java.sql.Datasource JNDI name --- > DATASOURCE_DESC=java.sql.Datasource JNDI name. 136c136 < DEFAULT_CATALOG_DESC=A default database catalog name to use for unqualified tablenames. --- > DEFAULT_CATALOG_DESC=A default database catalog name to use for unqualified table names. 138c138 < DEFAULT_SCHEMA_DESC=A default database schema (owner) name to use for unqualified tablenames. --- > DEFAULT_SCHEMA_DESC=A default database schema (owner) name to use for unqualified table names. 167c167 < QUERY_STARTUP_CHECKING_DESC=Should named queries be checked during startup (the default is enabled). \ --- > QUERY_STARTUP_CHECKING_DESC=Check named queries during startup (enabled by default). \ 186c186 < ie. the user is supplying JDBC connections. --- > i.e. the user is supplying JDBC connections. diff -r o/java2/hibernate/hibernate/org/netbeans/modules/hibernate/hqleditor/ui/Bundle.properties n/java2/hibernate/hibernate/org/netbeans/modules/hibernate/hqleditor/ui/Bundle.properties 41a42,46 > CTL_RUN_HQL_COMMAND=Run HQL > CTL_CUT_COMMAND = Cut > CTL_COPY_COMMAND = Copy > CTL_PASTE_COMMAND = Paste > CTL_SELECT_ALL_COMMAND = Select All diff -r o/java2/hibernate/hibernate/org/netbeans/modules/hibernate/loaders/cfg/Bundle.properties n/java2/hibernate/hibernate/org/netbeans/modules/hibernate/loaders/cfg/Bundle.properties 68c68 < EventPanel.jLabel1.text=PlaceHoder for Event stuff --- > EventPanel.jLabel1.text=PlaceHolder for Event stuff diff -r o/java2/hibernate/hibernate/org/netbeans/modules/hibernate/loaders/cfg/multiview/Bundle.properties n/java2/hibernate/hibernate/org/netbeans/modules/hibernate/loaders/cfg/multiview/Bundle.properties 90c90 < ACSD_Entity_Name=Specify Entiy Name --- > ACSD_Entity_Name=Specify Entity Name 99c99 < TXT_Entity_Name_Empty=Missing enity name --- > TXT_Entity_Name_Empty=Missing entity name diff -r o/java2/hibernate/hibernate/org/netbeans/modules/hibernate/resources/HibernateConfigurationFile.html n/java2/hibernate/hibernate/org/netbeans/modules/hibernate/resources/HibernateConfigurationFile.html 43c43 < --- > 45c45 < --- > 48c48,49 < Creates a hibernate configuration file with an extension .cfg.xml. --- > Creates a hibernate configuration file with an extension .cfg.xml.
> Also registers Hibernate Library with the project, if its not registered already. diff -r o/java2/hibernate/hibernate/org/netbeans/modules/hibernate/resources/HibernateMappingFile.html n/java2/hibernate/hibernate/org/netbeans/modules/hibernate/resources/HibernateMappingFile.html 43c43 < --- > 45c45 < --- > diff -r o/java2/hibernate/hibernate/org/netbeans/modules/hibernate/resources/HibernateRevengFile.html n/java2/hibernate/hibernate/org/netbeans/modules/hibernate/resources/HibernateRevengFile.html 43c43 < --- > 45c45 < --- > diff -r o/java2/hibernate/hibernate/org/netbeans/modules/hibernate/resources/HibernateUtilFile.html n/java2/hibernate/hibernate/org/netbeans/modules/hibernate/resources/HibernateUtilFile.html 43c43 < --- > 45c45 < --- > diff -r o/java2/hibernate/hibernate/org/netbeans/modules/hibernate/wizards/Bundle.properties n/java2/hibernate/hibernate/org/netbeans/modules/hibernate/wizards/Bundle.properties 39c39 < Unsupported_Project_Message=Unsupported Project type. (Currently only Web and J2SE
non freeform types are supported, #142626). --- > Unsupported_Project_Message=Unsupported Project type. (Currently only non-freeform Web and J2SE
types are supported, #142626). 61c61 < Templates/Hibernate/HibernateReveng=Hibernate Reverse Engineering Wizard --- > Templates/Hibernate/HibernateReveng=Hibernate Mapping Files and POJOs from Database 70a71 > TXT_HibernateRevengDatabaseTablesPanel_IncludeRelatedTables=Include Related Tables 79,80c80,81 < HibernateRevengCodeGenerationPanel.chkJava.text=&Java5 Syntax < HibernateRevengCodeGenerationPanel.chkEjb.text=&EJB3 Annotations --- > HibernateRevengCodeGenerationPanel.chkJava.text=&JDK 5 Language Features > HibernateRevengCodeGenerationPanel.chkEjb.text=&EJB 3 Annotations 91c92 < ERR_Include_DBJars=The db drivers are not added to the project classpath. Go to project properties add db library. --- > ERR_Include_DBJars=The database drivers are not added to the project classpath. Go to project properties to add database library. diff -r o/java2/hibernatelib/hibernatelib/org/netbeans/modules/hibernatelib/resources/Bundle.properties n/java2/hibernatelib/hibernatelib/org/netbeans/modules/hibernatelib/resources/Bundle.properties 41a42 > hibernate-persistence=Hibernate JPA diff -r o/java2/i18n-form/i18n-form/org/netbeans/modules/i18n/form/Bundle.properties n/java2/i18n-form/i18n-form/org/netbeans/modules/i18n/form/Bundle.properties 3c3 < # Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved. --- > # Copyright 1997-2008 Sun Microsystems, Inc. All rights reserved. 26c26 < # Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun --- > # Software is Sun Microsystems, Inc. Portions Copyright 1997-2008 Sun 56a57,60 > MSG_BundleNotSpecified=Resource bundle is not specified. > MSG_KeyNotSpecified=Key is not specified. > MSG_MnemonicIndexNotSpecified=Value (position of the mnemonic) is not specified. > MSG_MnemonicIndexIsInvalid=Value (position of the mnemonic) must be a non-negative integer number. diff -r o/java2/j2ee-persistence/j2ee-persistence/org/netbeans/modules/j2ee/persistence/ui/resources/EntityDatabase.html n/java2/j2ee-persistence/j2ee-persistence/org/netbeans/modules/j2ee/persistence/ui/resources/EntityDatabase.html 43c43 < --- > 45,46c45,47 < < --- > > > diff -r o/java2/j2ee-persistence/j2ee-persistence/org/netbeans/modules/j2ee/persistence/ui/resources/EntityEJB.html n/java2/j2ee-persistence/j2ee-persistence/org/netbeans/modules/j2ee/persistence/ui/resources/EntityEJB.html 43c43 < --- > 45,46c45,47 < < --- > > > diff -r o/java2/j2ee-persistence/j2ee-persistence/org/netbeans/modules/j2ee/persistence/ui/resources/JpaController.html n/java2/j2ee-persistence/j2ee-persistence/org/netbeans/modules/j2ee/persistence/ui/resources/JpaController.html 43c43 < --- > 45,46c45,47 < < --- > > > diff -r o/java2/j2ee-persistence/j2ee-persistence/org/netbeans/modules/j2ee/persistence/ui/resources/PersistenceUnit.html n/java2/j2ee-persistence/j2ee-persistence/org/netbeans/modules/j2ee/persistence/ui/resources/PersistenceUnit.html 43c43 < --- > 45c45 < --- > diff -r o/java2/j2ee-persistence/j2ee-persistence/org/netbeans/modules/j2ee/persistence/wizard/dao/ejbFacade.html n/java2/j2ee-persistence/j2ee-persistence/org/netbeans/modules/j2ee/persistence/wizard/dao/ejbFacade.html 3c3 < --- > 5c5 < --- > diff -r o/java2/j2ee-persistence/j2ee-persistence/org/netbeans/modules/j2ee/persistence/wizard/fromdb/Bundle.properties n/java2/j2ee-persistence/j2ee-persistence/org/netbeans/modules/j2ee/persistence/wizard/fromdb/Bundle.properties 72a73 > TXT_IncludeRelatedTables=Include Related Tables diff -r o/java2/j2ee-persistence/j2ee-persistence/org/netbeans/modules/j2ee/persistence/wizard/jpacontroller/Bundle.properties n/java2/j2ee-persistence/j2ee-persistence/org/netbeans/modules/j2ee/persistence/wizard/jpacontroller/Bundle.properties 123d122 < MNE_Browse=r diff -r o/java2/java-debug/java-debug/org/netbeans/modules/java/debug/Bundle.properties n/java2/java-debug/java-debug/org/netbeans/modules/java/debug/Bundle.properties 45c45 < NM_Trees=Trees --- > NM_Trees=Trees (NetBeans Development) 47c47 < NM_Elements=Elements --- > NM_Elements=Elements (NetBeans Development) 49c49 < NM_Errors=Errors --- > NM_Errors=Errors (NetBeans Development) 50a51,73 > > # Classpath panel: > NM_Classpath=Classpath (NetBeans Development) > SD_Classpath=Classpath View > LBL_JavaNode_sheet_classpaths=Classpaths > HINT_JavaNode_sheet_classpaths=Effective classpaths used by the IDE for this source file, for example as reported by a project. Sources displayed where applicable. > PROP_JavaNode_compile_classpath=Compile Classpath > HINT_JavaNode_compile_classpath=What this class is expected to be compiled against. Affects code completion and more. > PROP_JavaNode_source_classpath=Source Classpath > HINT_JavaNode_source_classpath=Source Classpath > PROP_JavaNode_execute_classpath=Runtime Classpath > HINT_JavaNode_execute_classpath=What classes are expected to be available to this class at runtime. > PROP_JavaNode_boot_classpath=Boot Classpath > HINT_JavaNode_boot_classpath=What Java platform (JRE) classes this class is expected to be compiled and run against. > PROP_JavaNode_compile_classpath_tr=Compile Translated > HINT_JavaNode_compile_classpath_tr=What this class is expected to be compiled against. Affects code completion and more. Translated. > PROP_JavaNode_source_classpath_tr=Source Translated > HINT_JavaNode_source_classpath_tr=Source Translated > PROP_JavaNode_execute_classpath_tr=Runtime Translated > HINT_JavaNode_execute_classpath_tr=What classes are expected to be available to this class at runtime. Translated. > PROP_JavaNode_boot_classpath_tr=Boot Translated > HINT_JavaNode_boot_classpath_tr=What Java platform (JRE) classes this class is expected to be compiled and run against. Translated. > LBL_JavaNode_classpath_unknown= diff -r o/java2/java-editor/java-editor/org/netbeans/modules/java/editor/imports/Bundle.properties n/java2/java-editor/java-editor/org/netbeans/modules/java/editor/imports/Bundle.properties 45a46 > MSG_CannotFixImports=Cannot perform Fix Imports on a source which is not on classpath. diff -r o/java2/java-freeform/java-freeform/org/netbeans/modules/java/freeform/resources/freeform-project-java.html n/java2/java-freeform/java-freeform/org/netbeans/modules/java/freeform/resources/freeform-project-java.html 42c42 < --- > 44c44 < --- > diff -r o/java2/java-hints/java-hints/org/netbeans/modules/java/hints/Bundle.properties n/java2/java-hints/java-hints/org/netbeans/modules/java/hints/Bundle.properties 176,180c176,178 < < < ForbiddenImportsCustomizer.btnAdd.text=Add < ForbiddenImportsCustomizer.btnEdit.text=Edit < ForbiddenImportsCustomizer.btnRemove.text=Remove --- > ForbiddenImportsCustomizer.btnAdd.text=&Add > ForbiddenImportsCustomizer.btnEdit.text=&Edit > ForbiddenImportsCustomizer.btnRemove.text=&Remove 274a273,279 > ForbiddenImportsCustomizer.listItems.AccessibleContext.accessibleDescription=List of forbidden packages > ForbiddenImportsCustomizer.listItems.AccessibleContext.accessibleName=Forbidden packages list > ForbiddenImportsCustomizer.jScrollPane1.AccessibleContext.accessibleDescription=Forbidden packages pane > ForbiddenImportsCustomizer.jScrollPane1.AccessibleContext.accessibleName=Forbidden packages pane > ForbiddenImportsCustomizer.AccessibleContext.accessibleDescription=Forbidden packages customiser > ForbiddenImportsCustomizer.AccessibleContext.accessibleName=Forbidden packages customiser > ForbiddenImportsCustomizer.btnAdd.AccessibleContext.accessibleDescription=Adds new forbidden package to the list diff -r o/java2/java-hints/java-hints/org/netbeans/modules/java/hints/errors/Bundle.properties n/java2/java-hints/java-hints/org/netbeans/modules/java/hints/errors/Bundle.properties 105a106 > FIX_CreateClassAndCtorInPackage=Create {2,choice,0#class|1#interface|2#enum|3#annotation type} "{0}" with constructor "{0}({3})" in package {1} 144a146 > LBL_FIX_Create_Enum_Constant=Create Enum Constant {0} in {1} diff -r o/java2/java-hints/java-hints/org/netbeans/modules/java/hints/options/Bundle.properties n/java2/java-hints/java-hints/org/netbeans/modules/java/hints/options/Bundle.properties 15a16,17 > AN_Show_As_Combo=Show As Combobox > AD_Show_As_Combo=Customise hint severity combobox diff -r o/java2/java-j2seplatform/java-j2seplatform/org/netbeans/modules/java/j2seplatform/resources/templates/javaplatformdefinition.html n/java2/java-j2seplatform/java-j2seplatform/org/netbeans/modules/java/j2seplatform/resources/templates/javaplatformdefinition.html 1c1 < --- > 3,4c3,5 < < --- > > > diff -r o/java2/java-j2seproject/java-j2seproject/org/netbeans/modules/java/j2seproject/Bundle.properties n/java2/java-j2seproject/java-j2seproject/org/netbeans/modules/java/j2seproject/Bundle.properties 109a110,120 > > LBL_ProjectBuiltAutomatically=This project's source files are compiled automatically when you save them.
\ > You do not need to build the project to run or debug the project in the IDE.
\ >
\ > If you need to build or rebuild the project's JAR file, use Clean and Build.
\ > To disable the automatic compiling feature and activate the Build command,
\ > go to Project Properties and disable Compile on Save. > BTN_ProjectProperties=Project Properties... > BTN_CleanAndBuild=Clean and Build > BTN_OK=OK > TITLE_BuildProjectWarning=Build Project ({0}) diff -r o/java2/java-j2seproject/java-j2seproject/org/netbeans/modules/java/j2seproject/ui/customizer/Bundle.properties n/java2/java-j2seproject/java-j2seproject/org/netbeans/modules/java/j2seproject/ui/customizer/Bundle.properties 512a513 > CustomizerRun.input.empty=Configuration name cannot be empty. diff -r o/java2/java-j2seproject/java-j2seproject/org/netbeans/modules/java/j2seproject/ui/resources/desktop.html n/java2/java-j2seproject/java-j2seproject/org/netbeans/modules/java/j2seproject/ui/resources/desktop.html 42c42 < --- > 44c44 < --- > diff -r o/java2/java-j2seproject/java-j2seproject/org/netbeans/modules/java/j2seproject/ui/resources/emptyLibrary.html n/java2/java-j2seproject/java-j2seproject/org/netbeans/modules/java/j2seproject/ui/resources/emptyLibrary.html 43c43 < --- > 45c45 < --- > diff -r o/java2/java-j2seproject/java-j2seproject/org/netbeans/modules/java/j2seproject/ui/resources/emptyProject.html n/java2/java-j2seproject/java-j2seproject/org/netbeans/modules/java/j2seproject/ui/resources/emptyProject.html 43c43 < --- > 45c45 < --- > diff -r o/java2/java-j2seproject/java-j2seproject/org/netbeans/modules/java/j2seproject/ui/resources/existingProject.html n/java2/java-j2seproject/java-j2seproject/org/netbeans/modules/java/j2seproject/ui/resources/existingProject.html 42c42 < --- > 44c44 < --- > diff -r o/java2/java-navigation/java-navigation/org/netbeans/modules/java/navigation/actions/Bundle.properties n/java2/java-navigation/java-navigation/org/netbeans/modules/java/navigation/actions/Bundle.properties 56,57c56,57 < CTL_DeclarationAction=&Declaration View < CTL_JavadocAction=&Javadoc View --- > CTL_DeclarationAction=&Declaration > CTL_JavadocAction=&Javadoc diff -r o/java2/java-platform/java-platform/org/netbeans/modules/java/platform/ui/Bundle.properties n/java2/java-platform/java-platform/org/netbeans/modules/java/platform/ui/Bundle.properties 71a72 > TXT_PlatformsHint=Use the Javadoc tab to register the API documentation for your JDK in the IDE.
Click Add Platform to register other Java SE and Java ME platform versions. diff -r o/java2/java-project/java-project/org/netbeans/modules/java/project/resources/AnnotationType.html n/java2/java-project/java-project/org/netbeans/modules/java/project/resources/AnnotationType.html 43c43 < --- > 45,46c45,47 < < --- > > > diff -r o/java2/java-project/java-project/org/netbeans/modules/java/project/resources/Applet.html n/java2/java-project/java-project/org/netbeans/modules/java/project/resources/Applet.html 43c43 < --- > 45,46c45,47 < < --- > > > diff -r o/java2/java-project/java-project/org/netbeans/modules/java/project/resources/Class.html n/java2/java-project/java-project/org/netbeans/modules/java/project/resources/Class.html 43c43 < --- > 45,46c45,47 < < --- > > > diff -r o/java2/java-project/java-project/org/netbeans/modules/java/project/resources/Classes.html n/java2/java-project/java-project/org/netbeans/modules/java/project/resources/Classes.html 43c43 < --- > 45,46c45,47 < < --- > > > diff -r o/java2/java-project/java-project/org/netbeans/modules/java/project/resources/Empty.html n/java2/java-project/java-project/org/netbeans/modules/java/project/resources/Empty.html 43c43 < --- > 45,46c45,47 < < --- > > > diff -r o/java2/java-project/java-project/org/netbeans/modules/java/project/resources/Enum.html n/java2/java-project/java-project/org/netbeans/modules/java/project/resources/Enum.html 43c43 < --- > 45,46c45,47 < < --- > > > diff -r o/java2/java-project/java-project/org/netbeans/modules/java/project/resources/Exception.html n/java2/java-project/java-project/org/netbeans/modules/java/project/resources/Exception.html 43c43 < --- > 45,46c45,47 < < --- > > > diff -r o/java2/java-project/java-project/org/netbeans/modules/java/project/resources/Interface.html n/java2/java-project/java-project/org/netbeans/modules/java/project/resources/Interface.html 43c43 < --- > 45,46c45,47 < < --- > > > diff -r o/java2/java-project/java-project/org/netbeans/modules/java/project/resources/JApplet.html n/java2/java-project/java-project/org/netbeans/modules/java/project/resources/JApplet.html 43c43 < --- > 45,46c45,47 < < --- > > > diff -r o/java2/java-project/java-project/org/netbeans/modules/java/project/resources/Main.html n/java2/java-project/java-project/org/netbeans/modules/java/project/resources/Main.html 43c43 < --- > 45,46c45,47 < < --- > > > diff -r o/java2/java-project/java-project/org/netbeans/modules/java/project/resources/Package.html n/java2/java-project/java-project/org/netbeans/modules/java/project/resources/Package.html 43c43 < --- > 45,46c45,47 < < --- > > > diff -r o/java2/java-project/java-project/org/netbeans/modules/java/project/resources/package-info.html n/java2/java-project/java-project/org/netbeans/modules/java/project/resources/package-info.html 45c45 < --- > diff -r o/java2/java-source/java-source/org/netbeans/modules/java/source/usages/Bundle.properties n/java2/java-source/java-source/org/netbeans/modules/java/source/usages/Bundle.properties 6a7,11 > ContainsErrorsWarning.jLabel1.text=One or more projects were compiled with errors.
Application you are running may end unexpectedly. > ContainsErrorsWarning.doNotAskAgain.text=Always run without asking > BTN_RunAnyway=Run Anyway > BTN_Cancel=Cancel > TITLE_ContainsErrorsWarning=Run Project diff -r o/java2/java-source/java-source/org/netbeans/modules/java/ui/Bundle.properties n/java2/java-source/java-source/org/netbeans/modules/java/ui/Bundle.properties 342a343,350 > > > > nlFinallyCheckBox1.text="finall&y" > > > AN_Preview=Preview > AD_Preview=Preview diff -r o/java2/javawebstart/javawebstart/org/netbeans/modules/javawebstart/resources/launch.html n/java2/javawebstart/javawebstart/org/netbeans/modules/javawebstart/resources/launch.html 5c5 < --- > diff -r o/java2/junit/junit/org/netbeans/modules/junit/Bundle.properties n/java2/junit/junit/org/netbeans/modules/junit/Bundle.properties 97c97 < Usually this means that you have to first activate JUnit testing in the project \ --- > Usually this means that you must first activate JUnit testing in the project \ 248c248 < JUnitCfgOfCreate.chkAfterClass.AD=Generate finalizer method annotated with the BeforeClass annotation --- > JUnitCfgOfCreate.chkAfterClass.AD=Generate finalizer method annotated with the AfterClass annotation 397c397 < junit_4=JUnit 4.1 --- > junit_4=JUnit 4.5 diff -r o/java2/junit/junit/org/netbeans/modules/junit/output/Bundle.properties n/java2/junit/junit/org/netbeans/modules/junit/output/Bundle.properties 42c42 < ACSD_TestResults=Displays information about passed and failed tests and output generated by them --- > ACSD_TestResults=Displays information about passed and failed tests and output generated by the tests 55c55 < ACSD_ResultPanelTree=Displays information about passed, failed and errorneous tests in a tree structure --- > ACSD_ResultPanelTree=Displays information about passed, failed and erroneous tests in a tree structure diff -r o/java2/junit/junit/org/netbeans/modules/junit/resources/templates/EmptyJUnitTest.html n/java2/junit/junit/org/netbeans/modules/junit/resources/templates/EmptyJUnitTest.html 43c43 < --- > 45,46c45,47 < < --- > > > diff -r o/java2/junit/junit/org/netbeans/modules/junit/resources/templates/JUnitFolder.html n/java2/junit/junit/org/netbeans/modules/junit/resources/templates/JUnitFolder.html 43c43 < --- > 45,46c45,47 < < --- > > > diff -r o/java2/junit/junit/org/netbeans/modules/junit/resources/templates/SimpleJUnitTest.html n/java2/junit/junit/org/netbeans/modules/junit/resources/templates/SimpleJUnitTest.html 43c43 < --- > 45,46c45,47 < < --- > > > diff -r o/java2/junit/junit/org/netbeans/modules/junit/resources/templates/TestSuite.html n/java2/junit/junit/org/netbeans/modules/junit/resources/templates/TestSuite.html 43c43 < --- > 45,46c45,47 < < --- > > > diff -r o/java2/junit/junit/org/netbeans/modules/junit/wizards/Bundle.properties n/java2/junit/junit/org/netbeans/modules/junit/wizards/Bundle.properties 75c75 < AD_Descr_Test_class_template=Template the test class will be created from --- > AD_Descr_Test_class_template=Template for creating test class diff -r o/java2/org-apache-tools-ant-module/org-apache-tools-ant-module/org/apache/tools/ant/module/run/Bundle.properties n/java2/org-apache-tools-ant-module/org-apache-tools-ant-module/org/apache/tools/ant/module/run/Bundle.properties 93c93 < LBL_RunLastTargetAction_general=&Repeat Build/Run --- > LBL_RunLastTargetAction_general=Re&peat Build/Run 97c97 < LBL_RunLastTargetAction_specific=&Repeat Build/Run: {0} --- > LBL_RunLastTargetAction_specific=Re&peat Build/Run: {0} diff -r o/java2/projectimport-eclipse-core/projectimport-eclipse-core/org/netbeans/modules/projectimport/eclipse/core/Bundle.properties n/java2/projectimport-eclipse-core/projectimport-eclipse-core/org/netbeans/modules/projectimport/eclipse/core/Bundle.properties 48,49c48,49 < MSG_JRECannotBeUsed=Eclipse platform for project "{0}" can''t be used. It is a JRE and the NetBeans project requires a JDK. NetBeans will use the default platform. < MSG_JDKDoesnExistUseDefault=Eclipse project "{0}" claims to use JDK from the "{1}" directory. But this directory doesn''t exist. NetBeans will use the default platform. --- > MSG_JRECannotBeUsed=Eclipse platform for project "{0}" cannot be used. It is a JRE and the NetBeans project requires a JDK. NetBeans will use the default platform. > MSG_JDKDoesnExistUseDefault=Eclipse project "{0}" claims to use JDK from the "{1}" directory. But this directory does not exist. NetBeans will use the default platform. 60c60 < UpdateProjectAction.already-in-synch=Projects are already in synch and there is nothing to update. --- > UpdateProjectAction.already-in-synch=The projects are already in synch and there is nothing to update. 62,63c62,63 < UpdateProjectAction.problems-occurred=Following problems occured during sychronization with Eclipse project {0}: < UpdateProjectAction.problems-occurred-2=Following problems occured during sychronization with Eclipse: --- > UpdateProjectAction.problems-occurred=The following problems occurred during sychronization with Eclipse project {0}: > UpdateProjectAction.problems-occurred-2=The following problems occurred during sychronization with Eclipse: 66c66 < UpdateEclipseReferencePanel.jLabel3.text=Original Eclipse project {0} cannot be found. --- > UpdateEclipseReferencePanel.jLabel3.text=The original Eclipse project {0} cannot be found. 69c69 < MSG_NoSourceRootsFound=No source roots found and therefore no classpath will be configured. --- > MSG_NoSourceRootsFound=No source roots have been found and therefore no classpath will be configured. 82,83c82,83 < MSG_ExcludesWarning2=NetBeans does not support source includes/excludes per source root as Eclipse does. They were merged and it is recommended you double check them in project's properties in Source panel. < MSG_UnsupportedContainer=Unsupported classpath container found. It will be ignored and you may need to update NetBeans project classpath by hand. Internal name of this container is: ''{0}'' --- > MSG_ExcludesWarning2=NetBeans does not support source includes/excludes per source root as Eclipse does. They were merged and it is recommended that you double check them in project's properties in Source panel. > MSG_UnsupportedContainer=Unsupported classpath container found. It will be ignored and you may need to update NetBeans project classpath by hand. The internal name of this container is: ''{0}'' 88c88 < MSG_UnsupportedProtocol=Javadoc location contains unsupported URL protocol which will be ignored: ''{0}'' --- > MSG_UnsupportedProtocol=Javadoc location contains an unsupported URL protocol which will be ignored: ''{0}'' 106,107d105 < MSG_SourceRootOwned=The Eclipse project ''{0}'' has a source root ({1}) which is already owned by an existing NetBeans project ''{2}''. \ < The Eclipse project will not be imported and you should instead open existing NetBeans project which manages the sources. 109a108 > MSG_InvalidSourceRoot=Eclipse project source root does not seem to exist and will be ignore: ''{0}'' diff -r o/java2/projectimport-eclipse-core/projectimport-eclipse-core/org/netbeans/modules/projectimport/eclipse/core/wizard/Bundle.properties n/java2/projectimport-eclipse-core/projectimport-eclipse-core/org/netbeans/modules/projectimport/eclipse/core/wizard/Bundle.properties 62,63c62,63 < MSG_NotRegularWorkspace="{0}" doesn''t contain a regular Eclipse workspace. < MSG_NotRegularProject="{0}" doesn''t contain a regular Eclipse project. --- > MSG_NotRegularWorkspace="{0}" does not contain a regular Eclipse workspace. > MSG_NotRegularProject="{0}" does not contain a regular Eclipse project. 65,67c65,67 < MSG_CannotImportNonJavaProject=The project cannot be imported because it doesn't have Java nature. < MSG_CycleDependencies=Cycle project dependencies were detected. Importer will try to import projects appropriately. However, the best way to get rid of this Eclipse Project discrepancy is to correct dependencies directly in Eclipse or in NetBeans after the project import is completed.\n\nDetected cycle:\n{0} < MSG_CreatedByPlugin=The following project(s) have likely been created by external Eclipse Java plug-ins. The Project Importer will try to import these project(s) as best as it can. After importing, please verify and modify these projects manually if necessary. --- > MSG_CannotImportNonJavaProject=The project cannot be imported because it doesn't have the Java nature. > MSG_CycleDependencies=Cyclical project dependencies were detected. The importer will try to import projects appropriately. However, the best way to get rid of this Eclipse Project discrepancy is to correct dependencies directly in Eclipse or in NetBeans after the project import is completed.\n\nDetected cycle:\n{0} > MSG_CreatedByPlugin=The following project(s) have likely been created by external Eclipse Java plugins. The Project Importer will try to import these project(s) as well as possible. After importing, please verify and modify these projects manually if necessary. 74c74 < MSG_NonJavaProject="{0}" is not regular java project. --- > MSG_NonJavaProject="{0}" is not a regular java project. 77c77 < MSG_WorkspaceIsEmpty=The workspace in the "{0}" directory doesn''t contain any project. --- > MSG_WorkspaceIsEmpty=The workspace in the "{0}" directory does not contain any project. 81c81 < MSG_Project_Location_Note=Note: Select Eclipse workspace location to create NetBeans projects along side of Eclipse projects. --- > MSG_Project_Location_Note=Note: Select Eclipse workspace location to create NetBeans projects next to Eclipse projects. 86c86 < MSG_AlreadyImportedProjects=Some of the projects seem to already be imported in destination directory. They will be skipped. --- > MSG_AlreadyImportedProjects=Some of the projects seem to already be imported in the destination directory. They will be skipped. diff -r o/java2/spring-beans/spring-beans/org/netbeans/modules/spring/beans/resources/newSpringXMLConfig.html n/java2/spring-beans/spring-beans/org/netbeans/modules/spring/beans/resources/newSpringXMLConfig.html 44c44 < --- > diff -r o/java2/swingapp/swingapp/org/netbeans/modules/swingapp/resources/BasicShellApp.html n/java2/swingapp/swingapp/org/netbeans/modules/swingapp/resources/BasicShellApp.html 42c42 < --- > 44,45c44,46 < < --- > > > diff -r o/java2/swingapp/swingapp/org/netbeans/modules/swingapp/resources/CRUDShellApp.html n/java2/swingapp/swingapp/org/netbeans/modules/swingapp/resources/CRUDShellApp.html 42c42 < --- > 44,45c44,46 < < --- > > > diff -r o/java2/swingapp/swingapp/org/netbeans/modules/swingapp/resources/JavaDesktopApp.html n/java2/swingapp/swingapp/org/netbeans/modules/swingapp/resources/JavaDesktopApp.html 42c42 < --- > 44,45c44,46 < < --- > > > diff -r o/java2/xml-jaxb/xml-jaxb/org/netbeans/modules/xml/jaxb/resources/JAXBWiz.html n/java2/xml-jaxb/xml-jaxb/org/netbeans/modules/xml/jaxb/resources/JAXBWiz.html 4c4 < --- > diff -r o/java2/xml-tools-java/xml-tools-java/org/netbeans/modules/xml/tools/java/generator/Bundle.properties n/java2/xml-tools-java/xml-tools-java/org/netbeans/modules/xml/tools/java/generator/Bundle.properties 40,67d39 < ## a11y - SelectFileDialog < ACSD_fileField=n/a < ACSD_SelectFileDialog=Select File < < ## a11y - SAXGeneratorFilePanel < ACSD_interfaceTextField=n/a < ACSD_handlerImplTextField=n/a < ACSD_stubTextField=n/a < ACSD_parsletTextField=n/a < ACSD_parsletImplTextField=n/a < ACSD_saveTextField=n/a < ACSD_saveCheckBox=Save setting for next wizard session with the same DTD. < ACSN_saveCheckBox=Save Settings < < # a11y - SAXGeneratorVersionPanel < ACSD_propagateSAXCheckBox=Propagate original SAX events < ACSN_propagateSAXCheckBox=n/a < ACSD_jaxpVersionComboBox=n/a < ACSD_versionComboBox=n/a < < ## a11y - SAXGeneratorParsletPanel < ACSN_ParsletsTable=Data Convertors < ACSD_ParsletsTable=Table contains DTD element declaration to convertor method mapping. < < ## a11y - SAXGeneratorMethodPanel < ACSD_table=Table contains DTD element declaration to handling method mapping. < ACSN_table=Element Mappings < 84,92d55 < ## GenerateDTDSupport.java < MSG_use_dtd_as_document_type?=Do you want to use generated DTD as external document type? < FMT_DTDDoc=Put your DTDDoc comment here. < BK0009=Cannot proceed! The document contains syntax errors: < BK0010=An example how to use this DTD from your XML document: < # PARTIAL translate only text between TODO and first \n < # {0} dtd file name < TODO=TODO define vocabulary identification\n PUBLIC ID: -//vendor//vocabulary//EN\n SYSTEM ID: http://server/path/{0} < 96a60 > SAXGeneratorCustomizer.implementationLabel.text=Handler Imp&lementation\: 103a68,76 > ## a11y - SAXGeneratorFilePanel > ACSD_interfaceTextField=n/a > ACSD_handlerImplTextField=n/a > ACSD_stubTextField=n/a > ACSD_parsletTextField=n/a > ACSD_parsletImplTextField=n/a > ACSD_saveTextField=n/a > ACSD_saveCheckBox=Save setting for next wizard session with the same DTD. > ACSN_saveCheckBox=Save Settings 111d83 < ACSD_SAXGeneratorMethodPanel=Customize your document handler interface here. For each element, specify a handler type in the Handler Type column and specify the name of the handler method in the Handler Method column. To exclude an element from the handler interface, set its Handler Type to Ignore. 112a85,88 > ## a11y - SAXGeneratorMethodPanel > ACSD_table=Table contains DTD element declaration to handling method mapping. > ACSN_table=Element Mappings > ACSD_SAXGeneratorMethodPanel=Customize your document handler interface here. For each element, specify a handler type in the Handler Type column and specify the name of the handler method in the Handler Method column. To exclude an element from the handler interface, set its Handler Type to Ignore. 121d96 < ACSD_SAXGeneratorParsletPanel=Configure your data convertor interface here (optional). Specify the name for each element's data convertor method in the Convertor Method column. If you don't want to generate a convertor method for an element, leave its Convertor Method set to [none].\nSpecify the method's return type in the Return Type column. If you select one of the IDE's preloaded return types, the conversion logic is generated for you. 122a98,101 > ## a11y - SAXGeneratorParsletPanel > ACSN_ParsletsTable=Data Convertors > ACSD_ParsletsTable=Table contains DTD element declaration to convertor method mapping. > ACSD_SAXGeneratorParsletPanel=Configure your data convertor interface here (optional). Specify the name for each element's data convertor method in the Convertor Method column. If you don't want to generate a convertor method for an element, leave its Convertor Method set to [none].\nSpecify the method's return type in the Return Type column. If you select one of the IDE's preloaded return types, the conversion logic is generated for you. 136a116,117 > MSG_invalid_dtd=The DTD is not in good shape. Aborting generation. > MSG_sax_progress_done=SAX parser handler generation finished. 146d126 < ACSD_SAXGeneratorVersionPanel=Specify the versions of JAXP and of the SAX parser you want to use. If you want to include all of the original SAX parser events in the handler interface, select the checkbox below. 148,173c128,133 < < < ## SelectFileDialog.java < PROP_fileNameTitle=Select File Name < PROP_fileName_mne=F < PROP_fileName=File: < # {0} - file name < # {1} - file extension < PROP_replaceMsg=File {0}.{1} already exists.\n Do you want to replace it? < # {0} - file name (including extension) < MSG_cannot_create_data=Cannot create {0}.\nSpecify a valid file name. Do not enter path to a different directory. < BK0001=Target file is modified. Save it please before reinvoking this action. < BK0002=Select < < ## ValidatingTextField.java < MSG_invalid=Invalid value entered. < < ## XMLGenerateAction.java < PROP_GenerateDTD=Generate DTD... < PROP_GenerateSAXHandler=SAX Document Handler Wizard... < PROP_GenerateDOMScanner=Generate DOM Tree Scanner... < < MSG_invalid_dtd=The DTD is not in good shape. Aborting generation. < < MSG_sax_progress_done=SAX parser handler generation finished. < MSG_action_failed=Action failed due to internal error! --- > # a11y - SAXGeneratorVersionPanel > ACSD_SAXGeneratorVersionPanel=Specify the versions of JAXP and of the SAX parser you want to use. If you want to include all of the original SAX parser events in the handler interface, select the checkbox below. > ACSD_propagateSAXCheckBox=Propagate original SAX events > ACSN_propagateSAXCheckBox=n/a > ACSD_jaxpVersionComboBox=n/a > ACSD_versionComboBox=n/a diff -r o/mobility8/j2me-cdc-platform/j2me-cdc-platform/org/netbeans/modules/j2me/cdc/platform/resources/templates/cdcplatformdefinition.html n/mobility8/j2me-cdc-platform/j2me-cdc-platform/org/netbeans/modules/j2me/cdc/platform/resources/templates/cdcplatformdefinition.html 1c1 < --- > 3,4c3,5 < < --- > > > diff -r o/mobility8/j2me-cdc-project/j2me-cdc-project/org/netbeans/modules/j2me/cdc/project/resources/AGUIXlet.html n/mobility8/j2me-cdc-project/j2me-cdc-project/org/netbeans/modules/j2me/cdc/project/resources/AGUIXlet.html 5c5 < --- > diff -r o/mobility8/j2me-cdc-project/j2me-cdc-project/org/netbeans/modules/j2me/cdc/project/resources/AWTXlet.html n/mobility8/j2me-cdc-project/j2me-cdc-project/org/netbeans/modules/j2me/cdc/project/resources/AWTXlet.html 5c5 < --- > diff -r o/mobility8/j2me-cdc-project/j2me-cdc-project/org/netbeans/modules/j2me/cdc/project/resources/JFrame.html n/mobility8/j2me-cdc-project/j2me-cdc-project/org/netbeans/modules/j2me/cdc/project/resources/JFrame.html 42c42 < --- > 44,45c44,46 < < --- > > > diff -r o/mobility8/j2me-cdc-project/j2me-cdc-project/org/netbeans/modules/j2me/cdc/project/resources/Xlet.html n/mobility8/j2me-cdc-project/j2me-cdc-project/org/netbeans/modules/j2me/cdc/project/resources/Xlet.html 5c5 < --- > diff -r o/mobility8/j2me-cdc-project/j2me-cdc-project/org/netbeans/modules/j2me/cdc/project/resources/emptyLibrary.html n/mobility8/j2me-cdc-project/j2me-cdc-project/org/netbeans/modules/j2me/cdc/project/resources/emptyLibrary.html 42c42 < --- > 44c44 < --- > diff -r o/mobility8/j2me-cdc-project/j2me-cdc-project/org/netbeans/modules/j2me/cdc/project/resources/emptyProject.html n/mobility8/j2me-cdc-project/j2me-cdc-project/org/netbeans/modules/j2me/cdc/project/resources/emptyProject.html 42c42 < --- > 44c44 < --- > diff -r o/mobility8/j2me-cdc-project/j2me-cdc-project/org/netbeans/modules/j2me/cdc/project/resources/existingProject.html n/mobility8/j2me-cdc-project/j2me-cdc-project/org/netbeans/modules/j2me/cdc/project/resources/existingProject.html 42c42 < --- > 44c44 < --- > diff -r o/mobility8/j2me-cdc-project/j2me-cdc-project/org/netbeans/modules/j2me/cdc/project/resources/freeform-project-cdc.html n/mobility8/j2me-cdc-project/j2me-cdc-project/org/netbeans/modules/j2me/cdc/project/resources/freeform-project-cdc.html 42c42 < --- > 44c44 < --- > diff -r o/mobility8/j2me-cdc-project/j2me-cdc-project/org/netbeans/modules/j2me/cdc/project/resources/importProject.html n/mobility8/j2me-cdc-project/j2me-cdc-project/org/netbeans/modules/j2me/cdc/project/resources/importProject.html 42c42 < --- > 44c44 < --- > diff -r o/mobility8/j2me-cdc-project/j2me-cdc-project/org/netbeans/modules/j2me/cdc/project/resources/importToolkitProject.html n/mobility8/j2me-cdc-project/j2me-cdc-project/org/netbeans/modules/j2me/cdc/project/resources/importToolkitProject.html 42c42 < --- > 44c44 < --- > diff -r o/mobility8/j2me-cdc-project-bdj/j2me-cdc-project-bdj/org/netbeans/modules/j2me/cdc/project/bdj/resources/TVXlet.html n/mobility8/j2me-cdc-project-bdj/j2me-cdc-project-bdj/org/netbeans/modules/j2me/cdc/project/bdj/resources/TVXlet.html 5c5 < --- > diff -r o/mobility8/j2me-cdc-project-bdj/j2me-cdc-project-bdj/org/netbeans/modules/j2me/cdc/project/bdj/resources/samples/GunBunny.html n/mobility8/j2me-cdc-project-bdj/j2me-cdc-project-bdj/org/netbeans/modules/j2me/cdc/project/bdj/resources/samples/GunBunny.html 5c5 < --- > diff -r o/mobility8/j2me-cdc-project-ricoh/j2me-cdc-project-ricoh/org/netbeans/modules/j2me/cdc/project/ricoh/resources/RicohXlet.html n/mobility8/j2me-cdc-project-ricoh/j2me-cdc-project-ricoh/org/netbeans/modules/j2me/cdc/project/ricoh/resources/RicohXlet.html 5c5 < --- > diff -r o/mobility8/j2me-cdc-project-ricoh/j2me-cdc-project-ricoh/org/netbeans/modules/j2me/cdc/project/ricoh/resources/samples/ButtonTest.html n/mobility8/j2me-cdc-project-ricoh/j2me-cdc-project-ricoh/org/netbeans/modules/j2me/cdc/project/ricoh/resources/samples/ButtonTest.html 3c3 < --- > diff -r o/mobility8/j2me-cdc-project-ricoh/j2me-cdc-project-ricoh/org/netbeans/modules/j2me/cdc/project/ricoh/resources/samples/FormBrowser.html n/mobility8/j2me-cdc-project-ricoh/j2me-cdc-project-ricoh/org/netbeans/modules/j2me/cdc/project/ricoh/resources/samples/FormBrowser.html 3c3 < --- > diff -r o/mobility8/j2me-cdc-project-ricoh/j2me-cdc-project-ricoh/org/netbeans/modules/j2me/cdc/project/ricoh/resources/samples/HardKey.html n/mobility8/j2me-cdc-project-ricoh/j2me-cdc-project-ricoh/org/netbeans/modules/j2me/cdc/project/ricoh/resources/samples/HardKey.html 3c3 < --- > diff -r o/mobility8/j2me-cdc-project-ricoh/j2me-cdc-project-ricoh/org/netbeans/modules/j2me/cdc/project/ricoh/resources/samples/Puzzle15Xlet.html n/mobility8/j2me-cdc-project-ricoh/j2me-cdc-project-ricoh/org/netbeans/modules/j2me/cdc/project/ricoh/resources/samples/Puzzle15Xlet.html 3c3 < --- > diff -r o/mobility8/j2me-cdc-project-ricoh/j2me-cdc-project-ricoh/org/netbeans/modules/j2me/cdc/project/ricoh/resources/samples/SampleLockControl.html n/mobility8/j2me-cdc-project-ricoh/j2me-cdc-project-ricoh/org/netbeans/modules/j2me/cdc/project/ricoh/resources/samples/SampleLockControl.html 3c3 < --- > diff -r o/mobility8/j2me-cdc-project-ricoh/j2me-cdc-project-ricoh/org/netbeans/modules/j2me/cdc/project/ricoh/resources/samples/TimeSet.html n/mobility8/j2me-cdc-project-ricoh/j2me-cdc-project-ricoh/org/netbeans/modules/j2me/cdc/project/ricoh/resources/samples/TimeSet.html 3c3 < --- > diff -r o/mobility8/j2me-cdc-project-ricoh/j2me-cdc-project-ricoh/org/netbeans/modules/j2me/cdc/project/ricoh/resources/samples/WidgetsDemoXlet.html n/mobility8/j2me-cdc-project-ricoh/j2me-cdc-project-ricoh/org/netbeans/modules/j2me/cdc/project/ricoh/resources/samples/WidgetsDemoXlet.html 3c3 < --- > diff -r o/mobility8/mobility-cldcplatform/mobility-cldcplatform/org/netbeans/modules/mobility/cldcplatform/Bundle.properties n/mobility8/mobility-cldcplatform/mobility-cldcplatform/org/netbeans/modules/mobility/cldcplatform/Bundle.properties 245,246c245,246 < OpenIDE-Module-Short-Description=Java Mobile Edition CLDC Platform < OpenIDE-Module-Long-Description=Java Mobile Edition CLDC Platform --- > OpenIDE-Module-Short-Description=Java Micro Edition CLDC Platform > OpenIDE-Module-Long-Description=Java Micro Edition CLDC Platform diff -r o/mobility8/mobility-cldcplatform/mobility-cldcplatform/org/netbeans/modules/mobility/cldcplatform/customwizard/debuggerinfo.html n/mobility8/mobility-cldcplatform/mobility-cldcplatform/org/netbeans/modules/mobility/cldcplatform/customwizard/debuggerinfo.html 3c3,6 < --- > > > > 5c8 < Debugger Command Line
--- > Debugger Command Line
diff -r o/mobility8/mobility-cldcplatform/mobility-cldcplatform/org/netbeans/modules/mobility/cldcplatform/customwizard/executioninfo.html n/mobility8/mobility-cldcplatform/mobility-cldcplatform/org/netbeans/modules/mobility/cldcplatform/customwizard/executioninfo.html 3c3,6 < --- > > > > 5c8 < Execution Command Line
--- > Execution Command Line
diff -r o/mobility8/mobility-cldcplatform/mobility-cldcplatform/org/netbeans/modules/mobility/cldcplatform/customwizard/preverifyinfo.html n/mobility8/mobility-cldcplatform/mobility-cldcplatform/org/netbeans/modules/mobility/cldcplatform/customwizard/preverifyinfo.html 3c3,6 < --- > > > > 5c8 < Preverify Command Line
--- > Preverify Command Line
diff -r o/mobility8/mobility-cldcplatform/mobility-cldcplatform/org/netbeans/modules/mobility/cldcplatform/resources/templates/kjavaplatformdefinition.html n/mobility8/mobility-cldcplatform/mobility-cldcplatform/org/netbeans/modules/mobility/cldcplatform/resources/templates/kjavaplatformdefinition.html 1c1 < --- > 3,4c3,5 < < --- > > > diff -r o/mobility8/mobility-cldcplatform/mobility-cldcplatform/org/netbeans/modules/mobility/cldcplatform/wizard/Bundle.properties n/mobility8/mobility-cldcplatform/mobility-cldcplatform/org/netbeans/modules/mobility/cldcplatform/wizard/Bundle.properties 59c59 < Title_InstallIterator_Add_Mobile_Platforms=Add Mobile Platforms --- > Title_InstallIterator_Add_Mobile_Platforms=Add Java ME Platforms diff -r o/mobility8/mobility-deployment-ftpscp/mobility-deployment-ftpscp/org/netbeans/modules/mobility/deployment/ftpscp/Bundle.properties n/mobility8/mobility-deployment-ftpscp/mobility-deployment-ftpscp/org/netbeans/modules/mobility/deployment/ftpscp/Bundle.properties 107,108c107,108 < OpenIDE-Module-Short-Description=FTP/SCP Deployment of J2ME Project < OpenIDE-Module-Long-Description=FTP/SCP Deployment of J2ME Project --- > OpenIDE-Module-Short-Description=FTP/SCP Deployment of Java ME Project > OpenIDE-Module-Long-Description=FTP/SCP Deployment of Java ME Project diff -r o/mobility8/mobility-deployment-ricoh/mobility-deployment-ricoh/org/netbeans/modules/mobility/deployment/ricoh/Bundle.properties n/mobility8/mobility-deployment-ricoh/mobility-deployment-ricoh/org/netbeans/modules/mobility/deployment/ricoh/Bundle.properties 43c43 < Deployment of Ricoh CDC projects on CDC devices using SD nebo http access --- > Deployment of Ricoh CDC projects on CDC devices using SD or http access 382a383,384 > > DSPL_NAME_RicohDeployment=Ricoh Deployment diff -r o/mobility8/mobility-deployment-sonyericsson/mobility-deployment-sonyericsson/org/netbeans/modules/mobility/deployment/sonyericsson/Bundle.properties n/mobility8/mobility-deployment-sonyericsson/mobility-deployment-sonyericsson/org/netbeans/modules/mobility/deployment/sonyericsson/Bundle.properties 61,62c61,62 < OpenIDE-Module-Short-Description=Sony Ericsson Deployment of J2ME Project < OpenIDE-Module-Long-Description=Sony Ericsson Deployment of J2ME Project --- > OpenIDE-Module-Short-Description=Sony Ericsson Deployment of Java ME Project > OpenIDE-Module-Long-Description=Sony Ericsson Deployment of Java ME Project diff -r o/mobility8/mobility-deployment-webdav/mobility-deployment-webdav/org/netbeans/modules/mobility/deployment/webdav/Bundle.properties n/mobility8/mobility-deployment-webdav/mobility-deployment-webdav/org/netbeans/modules/mobility/deployment/webdav/Bundle.properties 72,73c72,73 < OpenIDE-Module-Short-Description=WebDAV Deployment of J2ME Project < OpenIDE-Module-Long-Description=WebDAV Deployment of J2ME Project --- > OpenIDE-Module-Short-Description=WebDAV Deployment of Java ME Project > OpenIDE-Module-Long-Description=WebDAV Deployment of Java ME Project diff -r o/mobility8/mobility-editor/mobility-editor/org/netbeans/modules/mobility/editor/Bundle.properties n/mobility8/mobility-editor/mobility-editor/org/netbeans/modules/mobility/editor/Bundle.properties 79,80c79,80 < OpenIDE-Module-Short-Description=Java Mobile Edition Editor Support module < OpenIDE-Module-Long-Description=Java Mobile Edition Editor Support module --- > OpenIDE-Module-Short-Description=Java Micro Edition Editor Support module > OpenIDE-Module-Long-Description=Java Micro Edition Editor Support module diff -r o/mobility8/mobility-end2end/mobility-end2end/org/netbeans/modules/mobility/end2end/Bundle.properties n/mobility8/mobility-end2end/mobility-end2end/org/netbeans/modules/mobility/end2end/Bundle.properties 66,67c66,67 < OpenIDE-Module-Name=Mobile Client to Web Application Generator < OpenIDE-Module-Short-Description=Mobile Client to Web Application Generator --- > OpenIDE-Module-Name=Java ME Client to Web Application Generator > OpenIDE-Module-Short-Description=Java ME Client to Web Application Generator diff -r o/mobility8/mobility-end2end/mobility-end2end/org/netbeans/modules/mobility/end2end/resources/descriptions/MIDP/E2EWebApplication_wsclient.html n/mobility8/mobility-end2end/mobility-end2end/org/netbeans/modules/mobility/end2end/resources/descriptions/MIDP/E2EWebApplication_wsclient.html 7c7 < --- > 9,10c9,11 < < --- > > > diff -r o/mobility8/mobility-end2end/mobility-end2end/org/netbeans/modules/mobility/end2end/ui/wizard/Bundle.properties n/mobility8/mobility-end2end/mobility-end2end/org/netbeans/modules/mobility/end2end/ui/wizard/Bundle.properties 54c54 < LBL_ClassClient=Mobile client to Web Application --- > LBL_ClassClient=Java ME client to Web Application 56c56 < LBL_WebServiceClient=Mobile Client to Web Application --- > LBL_WebServiceClient=Java ME Client to Web Application 111c111 < Templates/MIDP/E2EWebApplication.wsclient=Mobile Client to Web Application --- > Templates/MIDP/E2EWebApplication.wsclient=Java ME Client to Web Application 125c125 < LBL_Title=Specify name of new servlet that will perform communication between mobile client and web application. --- > LBL_Title=Specify name of new servlet that will perform communication between Java ME client and web application. 150,151c150,151 < ERR_WebServiceNotCompiled=Web project must be built before using Mobile Client to Web Application for Web Services < LBL_ServiceTypeSelection=Mobile Client Uses\: --- > ERR_WebServiceNotCompiled=Web project must be built before using Java ME Client to Web Application for Web Services > LBL_ServiceTypeSelection=Java ME Client Uses\: diff -r o/mobility8/mobility-end2end/mobility-end2end/org/netbeans/modules/mobility/end2end/util/Bundle.properties n/mobility8/mobility-end2end/mobility-end2end/org/netbeans/modules/mobility/end2end/util/Bundle.properties 49c49 < TXT_servletElementDescription=Generated servlet for Mobile Client to Web Application --- > TXT_servletElementDescription=Generated servlet for Java ME Client to Web Application diff -r o/mobility8/mobility-end2end-kit/mobility-end2end-kit/org/netbeans/modules/mobility/end2end/kit/Bundle.properties n/mobility8/mobility-end2end-kit/mobility-end2end-kit/org/netbeans/modules/mobility/end2end/kit/Bundle.properties 3c3 < OpenIDE-Module-Short-Description=Support for mobility end-to-end such as mobile web services or mobile to web --- > OpenIDE-Module-Short-Description=Support for mobile end-to-end applications such as Java ME web services or mobile to web 5c5 < Support for mobility end-to-end such as mobile web services or mobile to web --- > Support for mobile end-to-end applications such as Java ME web services or mobile to web diff -r o/mobility8/mobility-j2meunit/mobility-j2meunit/org/netbeans/modules/mobility/j2meunit/resources/templates/EmptyJ2MEUnitTest.html n/mobility8/mobility-j2meunit/mobility-j2meunit/org/netbeans/modules/mobility/j2meunit/resources/templates/EmptyJ2MEUnitTest.html 43c43 < --- > 45,46c45,47 < < --- > > > diff -r o/mobility8/mobility-javahelp/mobility-javahelp/org/netbeans/modules/mobility/javahelp/Bundle.properties n/mobility8/mobility-javahelp/mobility-javahelp/org/netbeans/modules/mobility/javahelp/Bundle.properties 46c46 < OpenIDE-Module-Short-Description=Online documentation for the Mobility Pack. --- > OpenIDE-Module-Short-Description=Online documentation for Java ME. 48,49c48,49 < The Mobility Pack Online Help module provides online and context-sensitive \ < documentation for Mobility Pack related features of the IDE. --- > Java ME Online Help module provides online and context-sensitive \ > documentation for the Java ME related features of the IDE. diff -r o/mobility8/mobility-jsr172/mobility-jsr172/org/netbeans/modules/mobility/jsr172/Bundle.properties n/mobility8/mobility-jsr172/mobility-jsr172/org/netbeans/modules/mobility/jsr172/Bundle.properties 47,49c47,49 < Stub generator for Java ME Web Services Clients (JSR 172) < OpenIDE-Module-Name=Java ME Web Services Clients (JSR 172) < OpenIDE-Module-Short-Description=Stub generator for Java ME Web Services Clients (JSR 172) --- > Stub generator for Java ME Web Service Clients (JSR 172) > OpenIDE-Module-Name=Java ME Web Service Clients (JSR 172) > OpenIDE-Module-Short-Description=Stub generator for Java ME Web Service Clients (JSR 172) diff -r o/mobility8/mobility-jsr172/mobility-jsr172/org/netbeans/modules/mobility/jsr172/resources/descriptions/MIDP/JSR172_wsclient.html n/mobility8/mobility-jsr172/mobility-jsr172/org/netbeans/modules/mobility/jsr172/resources/descriptions/MIDP/JSR172_wsclient.html 42c42 < --- > 44,45c44,46 < < --- > > > diff -r o/mobility8/mobility-midpexamples/mobility-midpexamples/org/netbeans/modules/mobility/midpexamples/descriptions/AdvancedMultimediaSupplements.html n/mobility8/mobility-midpexamples/mobility-midpexamples/org/netbeans/modules/mobility/midpexamples/descriptions/AdvancedMultimediaSupplements.html 4c4,7 < --- > > > > 6d8 < diff -r o/mobility8/mobility-midpexamples/mobility-midpexamples/org/netbeans/modules/mobility/midpexamples/descriptions/AudioSamples.html n/mobility8/mobility-midpexamples/mobility-midpexamples/org/netbeans/modules/mobility/midpexamples/descriptions/AudioSamples.html 4c4,7 < --- > > > > 6d8 < diff -r o/mobility8/mobility-midpexamples/mobility-midpexamples/org/netbeans/modules/mobility/midpexamples/descriptions/BluetoothDemo.html n/mobility8/mobility-midpexamples/mobility-midpexamples/org/netbeans/modules/mobility/midpexamples/descriptions/BluetoothDemo.html 4c4,7 < --- > > > > 6d8 < diff -r o/mobility8/mobility-midpexamples/mobility-midpexamples/org/netbeans/modules/mobility/midpexamples/descriptions/CityGuide.html n/mobility8/mobility-midpexamples/mobility-midpexamples/org/netbeans/modules/mobility/midpexamples/descriptions/CityGuide.html 4c4,7 < --- > > > > 6d8 < diff -r o/mobility8/mobility-midpexamples/mobility-midpexamples/org/netbeans/modules/mobility/midpexamples/descriptions/GameBuilderDemo.html n/mobility8/mobility-midpexamples/mobility-midpexamples/org/netbeans/modules/mobility/midpexamples/descriptions/GameBuilderDemo.html 4c4,7 < --- > > > > 6d8 < diff -r o/mobility8/mobility-midpexamples/mobility-midpexamples/org/netbeans/modules/mobility/midpexamples/descriptions/I18nDemo.html n/mobility8/mobility-midpexamples/mobility-midpexamples/org/netbeans/modules/mobility/midpexamples/descriptions/I18nDemo.html 4c4,7 < --- > > > > 6d8 < diff -r o/mobility8/mobility-midpexamples/mobility-midpexamples/org/netbeans/modules/mobility/midpexamples/descriptions/JSR172Demo.html n/mobility8/mobility-midpexamples/mobility-midpexamples/org/netbeans/modules/mobility/midpexamples/descriptions/JSR172Demo.html 4c4,7 < --- > > > > 6d8 < diff -r o/mobility8/mobility-midpexamples/mobility-midpexamples/org/netbeans/modules/mobility/midpexamples/descriptions/LocalizationDemo.html n/mobility8/mobility-midpexamples/mobility-midpexamples/org/netbeans/modules/mobility/midpexamples/descriptions/LocalizationDemo.html 4c4,7 < --- > > > > 6d8 < diff -r o/mobility8/mobility-midpexamples/mobility-midpexamples/org/netbeans/modules/mobility/midpexamples/descriptions/MMAPIDemos.html n/mobility8/mobility-midpexamples/mobility-midpexamples/org/netbeans/modules/mobility/midpexamples/descriptions/MMAPIDemos.html 4c4,7 < --- > > > > 6d8 < diff -r o/mobility8/mobility-midpexamples/mobility-midpexamples/org/netbeans/modules/mobility/midpexamples/descriptions/NetworkDemo.html n/mobility8/mobility-midpexamples/mobility-midpexamples/org/netbeans/modules/mobility/midpexamples/descriptions/NetworkDemo.html 4c4,7 < --- > > > > 6d8 < diff -r o/mobility8/mobility-midpexamples/mobility-midpexamples/org/netbeans/modules/mobility/midpexamples/descriptions/ObexDemo.html n/mobility8/mobility-midpexamples/mobility-midpexamples/org/netbeans/modules/mobility/midpexamples/descriptions/ObexDemo.html 4c4,7 < --- > > > > 6d8 < diff -r o/mobility8/mobility-midpexamples/mobility-midpexamples/org/netbeans/modules/mobility/midpexamples/descriptions/OpenGLESDemo.html n/mobility8/mobility-midpexamples/mobility-midpexamples/org/netbeans/modules/mobility/midpexamples/descriptions/OpenGLESDemo.html 4c4,7 < --- > > > > 6d8 < diff -r o/mobility8/mobility-midpexamples/mobility-midpexamples/org/netbeans/modules/mobility/midpexamples/descriptions/PDAPDemo.html n/mobility8/mobility-midpexamples/mobility-midpexamples/org/netbeans/modules/mobility/midpexamples/descriptions/PDAPDemo.html 4c4,7 < --- > > > > 6d8 < diff -r o/mobility8/mobility-midpexamples/mobility-midpexamples/org/netbeans/modules/mobility/midpexamples/descriptions/PhotoAlbum.html n/mobility8/mobility-midpexamples/mobility-midpexamples/org/netbeans/modules/mobility/midpexamples/descriptions/PhotoAlbum.html 4c4,7 < --- > > > > 6d8 < diff -r o/mobility8/mobility-midpexamples/mobility-midpexamples/org/netbeans/modules/mobility/midpexamples/descriptions/SIPDemo.html n/mobility8/mobility-midpexamples/mobility-midpexamples/org/netbeans/modules/mobility/midpexamples/descriptions/SIPDemo.html 4c4,7 < --- > > > > 6d8 < diff -r o/mobility8/mobility-midpexamples/mobility-midpexamples/org/netbeans/modules/mobility/midpexamples/descriptions/SVGContactList.html n/mobility8/mobility-midpexamples/mobility-midpexamples/org/netbeans/modules/mobility/midpexamples/descriptions/SVGContactList.html 4c4,7 < --- > > > > 6d8 < diff -r o/mobility8/mobility-midpexamples/mobility-midpexamples/org/netbeans/modules/mobility/midpexamples/descriptions/SVGDemo.html n/mobility8/mobility-midpexamples/mobility-midpexamples/org/netbeans/modules/mobility/midpexamples/descriptions/SVGDemo.html 4c4,7 < --- > > > > 6d8 < diff -r o/mobility8/mobility-midpexamples/mobility-midpexamples/org/netbeans/modules/mobility/midpexamples/descriptions/SunSamples-Demos.html n/mobility8/mobility-midpexamples/mobility-midpexamples/org/netbeans/modules/mobility/midpexamples/descriptions/SunSamples-Demos.html 4c4,7 < --- > > > > 6d8 < diff -r o/mobility8/mobility-midpexamples/mobility-midpexamples/org/netbeans/modules/mobility/midpexamples/descriptions/UIDemo.html n/mobility8/mobility-midpexamples/mobility-midpexamples/org/netbeans/modules/mobility/midpexamples/descriptions/UIDemo.html 4c4,7 < --- > > > > 6d8 < diff -r o/mobility8/mobility-midpexamples/mobility-midpexamples/org/netbeans/modules/mobility/midpexamples/descriptions/VisualDesignerCustomComponents.html n/mobility8/mobility-midpexamples/mobility-midpexamples/org/netbeans/modules/mobility/midpexamples/descriptions/VisualDesignerCustomComponents.html 4c4,7 < --- > > > > 6d8 < diff -r o/mobility8/mobility-midpexamples/mobility-midpexamples/org/netbeans/modules/mobility/midpexamples/descriptions/WMADemo.html n/mobility8/mobility-midpexamples/mobility-midpexamples/org/netbeans/modules/mobility/midpexamples/descriptions/WMADemo.html 4c4,7 < --- > > > > 6d8 < diff -r o/mobility8/mobility-midpexamples/mobility-midpexamples/org/netbeans/modules/mobility/midpexamples/descriptions/converter.html n/mobility8/mobility-midpexamples/mobility-midpexamples/org/netbeans/modules/mobility/midpexamples/descriptions/converter.html 4c4,7 < --- > > > > 6d8 < diff -r o/mobility8/mobility-midpexamples/mobility-midpexamples/org/netbeans/modules/mobility/midpexamples/descriptions/j2meSamplesCategory.html n/mobility8/mobility-midpexamples/mobility-midpexamples/org/netbeans/modules/mobility/midpexamples/descriptions/j2meSamplesCategory.html 3c3 < --- > 5,7c5 < < The Mobile Sample Application Projects. < --- > The Mobile Sample Application Projects. diff -r o/mobility8/mobility-midpexamples/mobility-midpexamples/org/netbeans/modules/mobility/midpexamples/descriptions/midp.html n/mobility8/mobility-midpexamples/mobility-midpexamples/org/netbeans/modules/mobility/midpexamples/descriptions/midp.html 3c3 < --- > 5,7c5 < < The Mobile Application Projects based on MIDP < --- > The Mobile Application Projects based on MIDP diff -r o/mobility8/mobility-project/mobility-project/org/netbeans/modules/mobility/project/ui/resources/descriptions/MIDP/Class_java.html n/mobility8/mobility-project/mobility-project/org/netbeans/modules/mobility/project/ui/resources/descriptions/MIDP/Class_java.html 42c42 < --- > 44,45c44,46 < < --- > > > diff -r o/mobility8/mobility-project/mobility-project/org/netbeans/modules/mobility/project/ui/resources/descriptions/MIDP/LocalizationSupport.html n/mobility8/mobility-project/mobility-project/org/netbeans/modules/mobility/project/ui/resources/descriptions/MIDP/LocalizationSupport.html 42c42 < --- > 44,45c44,46 < < --- > > > diff -r o/mobility8/mobility-project/mobility-project/org/netbeans/modules/mobility/project/ui/resources/descriptions/MIDP/MIDP.html n/mobility8/mobility-project/mobility-project/org/netbeans/modules/mobility/project/ui/resources/descriptions/MIDP/MIDP.html 42c42 < --- > 44,45c44,46 < < --- > > > diff -r o/mobility8/mobility-project/mobility-project/org/netbeans/modules/mobility/project/ui/resources/descriptions/MIDP/MIDPCanvas_java.html n/mobility8/mobility-project/mobility-project/org/netbeans/modules/mobility/project/ui/resources/descriptions/MIDP/MIDPCanvas_java.html 42c42 < --- > 44,45c44,46 < < --- > > > diff -r o/mobility8/mobility-project/mobility-project/org/netbeans/modules/mobility/project/ui/resources/descriptions/MIDP/MIDlet_java.html n/mobility8/mobility-project/mobility-project/org/netbeans/modules/mobility/project/ui/resources/descriptions/MIDP/MIDlet_java.html 42c42 < --- > 44,45c44,46 < < --- > > > diff -r o/mobility8/mobility-project/mobility-project/org/netbeans/modules/mobility/project/ui/resources/emptyLibrary.html n/mobility8/mobility-project/mobility-project/org/netbeans/modules/mobility/project/ui/resources/emptyLibrary.html 42c42 < --- > 44c44 < --- > diff -r o/mobility8/mobility-project/mobility-project/org/netbeans/modules/mobility/project/ui/resources/emptyProject.html n/mobility8/mobility-project/mobility-project/org/netbeans/modules/mobility/project/ui/resources/emptyProject.html 42c42 < --- > 44c44 < --- > diff -r o/mobility8/mobility-project/mobility-project/org/netbeans/modules/mobility/project/ui/resources/j2me-sources.html n/mobility8/mobility-project/mobility-project/org/netbeans/modules/mobility/project/ui/resources/j2me-sources.html 42c42 < --- > 44c44 < --- > diff -r o/mobility8/mobility-project/mobility-project/org/netbeans/modules/mobility/project/ui/resources/j2me-wtk.html n/mobility8/mobility-project/mobility-project/org/netbeans/modules/mobility/project/ui/resources/j2me-wtk.html 42c42 < --- > 44c44 < --- > diff -r o/mobility8/mobility-project/mobility-project/org/netbeans/modules/mobility/project/ui/resources/j2meProjectCategory.html n/mobility8/mobility-project/mobility-project/org/netbeans/modules/mobility/project/ui/resources/j2meProjectCategory.html 3c3 < --- > 5,7c5 < < The Mobile Application Projects. < --- > The Mobile Application Projects. diff -r o/mobility8/mobility-project/mobility-project/org/netbeans/modules/mobility/project/ui/wizard/Bundle.properties n/mobility8/mobility-project/mobility-project/org/netbeans/modules/mobility/project/ui/wizard/Bundle.properties 196c196 < TXT_SampleProject=Sample Mobility Project --- > TXT_SampleProject=Sample Java ME Project diff -r o/mobility8/mobility-svgcore/mobility-svgcore/org/netbeans/modules/mobility/svgcore/Bundle.properties n/mobility8/mobility-svgcore/mobility-svgcore/org/netbeans/modules/mobility/svgcore/Bundle.properties 48c48 < LBL_MULVIEW_TITLE_VIEW=View --- > LBL_MULVIEW_TITLE_VIEW=Preview diff -r o/mobility8/mobility-svgcore/mobility-svgcore/org/netbeans/modules/mobility/svgcore/SVGTemplateHelp.html n/mobility8/mobility-svgcore/mobility-svgcore/org/netbeans/modules/mobility/svgcore/SVGTemplateHelp.html 13c13 < --- > 15,16c15,17 < < --- > > > diff -r o/mobility8/mobility-svgcore/mobility-svgcore/org/netbeans/modules/mobility/svgcore/palette/Bundle.properties n/mobility8/mobility-svgcore/mobility-svgcore/org/netbeans/modules/mobility/svgcore/palette/Bundle.properties 43c43 < CTL_SVGPaletteManagerAction=SVG Visual Composer --- > CTL_SVGPaletteManagerAction=SV&G Shapes diff -r o/mobility8/mobility-svgcore/mobility-svgcore/org/netbeans/modules/mobility/svgcore/resources/Bundle.properties n/mobility8/mobility-svgcore/mobility-svgcore/org/netbeans/modules/mobility/svgcore/resources/Bundle.properties 38c38,39 < SVGXMLPalette/BasicShapes=Basic Shapes \ No newline at end of file --- > SVGXMLPalette/BasicShapes=Basic Shapes > SVGXMLPalette/FormComponents=Form Components diff -r o/mobility8/mobility-svgcore/mobility-svgcore/org/netbeans/modules/mobility/svgcore/view/svg/Bundle.properties n/mobility8/mobility-svgcore/mobility-svgcore/org/netbeans/modules/mobility/svgcore/view/svg/Bundle.properties 195a196,197 > > ERR_UnableRender= \ No newline at end of file diff -r o/mobility8/vmd-componentssupport/vmd-componentssupport/org/netbeans/modules/vmd/componentssupport/Bundle.properties n/mobility8/vmd-componentssupport/vmd-componentssupport/org/netbeans/modules/vmd/componentssupport/Bundle.properties 45c45 < Templates/Project/J2ME/CustomComponentProject.zip=Mobile Designer Components --- > Templates/Project/J2ME/CustomComponentProject=Mobile Designer Components diff -r o/mobility8/vmd-componentssupport/vmd-componentssupport/org/netbeans/modules/vmd/componentssupport/options/Bundle.properties n/mobility8/vmd-componentssupport/vmd-componentssupport/org/netbeans/modules/vmd/componentssupport/options/Bundle.properties 40,42c40,42 < AdvancedOption_DisplayName_Componentssupport=Mobility < AdvancedOption_Tooltip_Componentssupport=Mobility Panel < ComponentssupportPanel.jCheckBox1.text=Activate Mobility Visual Designer Debugging Views --- > AdvancedOption_DisplayName_Componentssupport=Java ME > AdvancedOption_Tooltip_Componentssupport=Java ME Panel > ComponentssupportPanel.jCheckBox1.text=Activate Visual Mobile Designer Debugging Views diff -r o/mobility8/vmd-componentssupport/vmd-componentssupport/org/netbeans/modules/vmd/componentssupport/ui/wizard/Bundle.properties n/mobility8/vmd-componentssupport/vmd-componentssupport/org/netbeans/modules/vmd/componentssupport/ui/wizard/Bundle.properties 87a88,89 > CTL_GenerateLayer=&Generate XML Layer > LBL_CodeNameBaseHint=(e.g. "org.yourorg.modulename") 92a95 > ACS_CTL_GenerateLayer=Generate XML Layer 101a105 > BasicConfVisualPanel_err_wrong_nborg_name=For this code name base, module must be in a directory named "{0}". diff -r o/mobility8/vmd-game/vmd-game/org/netbeans/modules/vmd/game/integration/res/Bundle.properties n/mobility8/vmd-game/vmd-game/org/netbeans/modules/vmd/game/integration/res/Bundle.properties 40c40 < Templates/MIDP/GameDesign.java=Visual Game Design --- > Templates/MIDP/GameDesign.java=Game Builder diff -r o/mobility8/vmd-game/vmd-game/org/netbeans/modules/vmd/game/integration/res/emptygame.html n/mobility8/vmd-game/vmd-game/org/netbeans/modules/vmd/game/integration/res/emptygame.html 42c42 < --- > 44,45c44,46 < < --- > > > diff -r o/mobility8/vmd-io-javame/vmd-io-javame/org/netbeans/modules/vmd/io/javame/Bundle.properties n/mobility8/vmd-io-javame/vmd-io-javame/org/netbeans/modules/vmd/io/javame/Bundle.properties 42c42 < MSG_ProjectMissing=It is not possible to open Visual Designer Midlet outside of the Mobility Project --- > MSG_ProjectMissing=It is not possible to open Visual Designer Midlets outside of a Java ME Project diff -r o/mobility8/vmd-kit/vmd-kit/org/netbeans/modules/vmd/kit/Bundle.properties n/mobility8/vmd-kit/vmd-kit/org/netbeans/modules/vmd/kit/Bundle.properties 2,3c2,3 < OpenIDE-Module-Name=Visual Mobility Designer < OpenIDE-Module-Long-Description=The Visual Mobile Designer enables drag and drop visual design of the mobile application flow and GUI. The VMD automatically creates the Java code to implement your design. --- > OpenIDE-Module-Name=Visual Mobile Designer > OpenIDE-Module-Long-Description=The Visual Mobile Designer enables drag and drop visual design of a Java ME application flow and GUI. The VMD automatically creates Java code to implement your design. diff -r o/mobility8/vmd-midp/vmd-midp/org/netbeans/modules/vmd/midp/components/items/Bundle.properties n/mobility8/vmd-midp/vmd-midp/org/netbeans/modules/vmd/midp/components/items/Bundle.properties 95c95 < DISP_Spacer_Minimum_size=Minimum size --- > #DISP_Spacer_Minimum_size=Minimum size diff -r o/mobility8/vmd-midp/vmd-midp/org/netbeans/modules/vmd/midp/components/resources/Bundle.properties n/mobility8/vmd-midp/vmd-midp/org/netbeans/modules/vmd/midp/components/resources/Bundle.properties 41,42c41,42 < DISP_Font_Kind_RB_LABEL=&Kind: < DISP_Font_Kind_UCLABEL=Kind --- > #DISP_Font_Kind_RB_LABEL=&Kind: > #DISP_Font_Kind_UCLABEL=Kind diff -r o/mobility8/vmd-midp/vmd-midp/org/netbeans/modules/vmd/midp/palette/wizard/Bundle.properties n/mobility8/vmd-midp/vmd-midp/org/netbeans/modules/vmd/midp/palette/wizard/Bundle.properties 70c70 < MSG_ERR_NoOpenedProjects=Have no opened mobile projects \ No newline at end of file --- > MSG_ERR_NoOpenedProjects=No Java ME Projects are Open \ No newline at end of file diff -r o/mobility8/vmd-midp/vmd-midp/org/netbeans/modules/vmd/midp/propertyeditors/Bundle.properties n/mobility8/vmd-midp/vmd-midp/org/netbeans/modules/vmd/midp/propertyeditors/Bundle.properties 69c69 < LBL_GOTO_STR=Edit Source Code --- > #LBL_GOTO_STR=Edit Source Code 118,119c118,119 < LBL_FONTRESOURCEPE_NONE= < LBL_FONTRESOURCEPE_NEW= --- > #LBL_FONTRESOURCEPE_NONE= > #LBL_FONTRESOURCEPE_NEW= 122,123c122,123 < LBL_IMAGERESOURCEPE_NONE= < LBL_IMAGERESOURCEPE_NEW= --- > #LBL_IMAGERESOURCEPE_NONE= > #LBL_IMAGERESOURCEPE_NEW= 126,127c126,127 < LBL_TICKERRESOURCEPE_NONE= < LBL_TICKERRESOURCEPE_NEW= --- > #LBL_TICKERRESOURCEPE_NONE= > #LBL_TICKERRESOURCEPE_NEW= 136,137c136,137 < LBL_STRING_NULL= < LBL_STRING_USER_CODE= --- > #LBL_STRING_NULL= > #LBL_STRING_USER_CODE= 141c141 < LBL_STRING_NONE = [None] --- > #LBL_STRING_NONE = [None] 144,145c144,145 < LBL_TIMEOUTPE_LABEL=Timeout: < MNM_TIMEOUTPE_TEXTLABEL=T --- > #LBL_TIMEOUTPE_LABEL=Timeout: > #MNM_TIMEOUTPE_TEXTLABEL=T 147c147 < MNM_TIMEOUTPE_FOREVER=F --- > #MNM_TIMEOUTPE_FOREVER=F 171c171 < LBL_TEXTFIELDPE_ANY=Any --- > #LBL_TEXTFIELDPE_ANY=Any 173c173 < LBL_TEXTFIELDPE_PASSWORD=Password --- > #LBL_TEXTFIELDPE_PASSWORD=Password 175c175 < LBL_TEXTFIELDPE_NUMERIC=Numeric --- > #LBL_TEXTFIELDPE_NUMERIC=Numeric 177c177 < LBL_TEXTFIELDPE_UNDEDITABLE=Uneditable --- > #LBL_TEXTFIELDPE_UNDEDITABLE=Uneditable 179c179 < LBL_TEXTFIELDPE_EMAIL=E-mail Address --- > #LBL_TEXTFIELDPE_EMAIL=E-mail Address 181c181 < LBL_TEXTFIELDPE_SENSITIVE=Sensitive --- > #LBL_TEXTFIELDPE_SENSITIVE=Sensitive 183c183 < LBL_TEXTFIELDPE_PHONE=Phone Number --- > #LBL_TEXTFIELDPE_PHONE=Phone Number 185c185 < LBL_TEXTFIELDPE_NONPREDICTIVE=Non Predictive --- > #LBL_TEXTFIELDPE_NONPREDICTIVE=Non Predictive 187c187 < LBL_TEXTFIELDPE_DECIMAL=Decimal --- > #LBL_TEXTFIELDPE_DECIMAL=Decimal 190c190 < ACSN_ContraintAny=Selects any input --- > ACSD_ContraintAny=Selects any input 230c230 < ACSD_ITEMLAYOUTPE_GEN_MIDP2=Selects general MIDP 2 layout --- > #ACSD_ITEMLAYOUTPE_GEN_MIDP2=Selects general MIDP 2 layout 236c236 < ACSN_ITEMLAYOUTPE_HOR_NONE=Selects None Horizontal Alignment --- > ACSD_ITEMLAYOUTPE_HOR_NONE=Selects None Horizontal Alignment 296c296 < ACSN_ITEMLAYOUTPE_EX_VERTICAL=Selects Vertical Expand --- > ACSD_ITEMLAYOUTPE_EX_VERTICAL=Selects Vertical Expand 299,315c299,315 < LBL_IMAGERESOURCEPE_SELECT_IMG=Select image: < MNM_IMAGERESOURCEPE_SELECT_IMG=S < LBL_IMAGERESOURCEPE_SHOW_IMG=Show image preview. < LBL_IMAGERESOURCEPE_FILE_SIZE=File size: < LBL_IMAGERESOURCEPE_DIMENSION=Dimension: < LBL_IMAGERESOURCEPE_FILE_NAME=File name: < TXT_IMAGERESOURCEPE_FILE_SIZE_RESULT={0} bytes < TXT_IMAGERESOURCEPE_DIMENSION_RESULT={0}x{1} < LBL_IMAGERESOURCEPE_OTHER_EXTENSIONS=Show also GIF and JPEG images < MNM_IMAGERESOURCEPE_OTHER_EXTENSIONS=O < TTIP_IMAGERESOURCEPE_OTHER_EXTENSIONS=Also shows non-PNG image types. Please note, not all devices support image types other than PNG. < AD_IMAGERESOURCEPE_OTHER_EXTENSIONS=Also shows non-PNG image types. Please note, not all devices support image types other than PNG. < LBL_IMAGERESOURCEPE_NOTE=Note: Images must be placed under the source folder or added to libraries/resources

of current project.

< LBL_RESOURCE_PATH_EMPTY = < LBL_BUTTON_ADD_IMAGE_TO_RESOURCES = Add image to the resources < LBL_IMAGECHOOSER_ADD_BUTTON = Add < MNM_IMAGECHOOSER_ADD_BUTTON = A --- > #LBL_IMAGERESOURCEPE_SELECT_IMG=Select image: > #MNM_IMAGERESOURCEPE_SELECT_IMG=S > #LBL_IMAGERESOURCEPE_SHOW_IMG=Show image preview. > #LBL_IMAGERESOURCEPE_FILE_SIZE=File size: > #LBL_IMAGERESOURCEPE_DIMENSION=Dimension: > #LBL_IMAGERESOURCEPE_FILE_NAME=File name: > #TXT_IMAGERESOURCEPE_FILE_SIZE_RESULT={0} bytes > #TXT_IMAGERESOURCEPE_DIMENSION_RESULT={0}x{1} > #LBL_IMAGERESOURCEPE_OTHER_EXTENSIONS=Show also GIF and JPEG images > #MNM_IMAGERESOURCEPE_OTHER_EXTENSIONS=O > #TTIP_IMAGERESOURCEPE_OTHER_EXTENSIONS=Also shows non-PNG image types. Please note, not all devices support image types other than PNG. > #AD_IMAGERESOURCEPE_OTHER_EXTENSIONS=Also shows non-PNG image types. Please note, not all devices support image types other than PNG. > #LBL_IMAGERESOURCEPE_NOTE=Note: Images must be placed under the source folder or added to libraries/resources

of current project.

> #LBL_RESOURCE_PATH_EMPTY = > #LBL_BUTTON_ADD_IMAGE_TO_RESOURCES = Add image to the resources > #LBL_IMAGECHOOSER_ADD_BUTTON = Add > #MNM_IMAGECHOOSER_ADD_BUTTON = A 318c318 < LBL_FONTPE_TYPE=Type --- > #LBL_FONTPE_TYPE=Type 320,329c320,329 < LBL_FONTPE_TEXT_CUSTOM_FONT=Custom Font < LBL_FONTPE_TEXT_DEFAULT_FONT=Default Font < LBL_FONTPE_TEXT_SYSTEM_FONT=System Font < < LBL_FONTPE_RB_DEFAULT=Default < MNM_FONTPE_RB_DEFAULT=D < LBL_FONTPE_RB_SYSTEM=System < MNM_FONTPE_RB_SYSTEM=S < LBL_FONTPE_RB_CUSTOM=Custom < MNM_FONTPE_RB_CUSTOM=C --- > #LBL_FONTPE_TEXT_CUSTOM_FONT=Custom Font > #LBL_FONTPE_TEXT_DEFAULT_FONT=Default Font > #LBL_FONTPE_TEXT_SYSTEM_FONT=System Font > > #LBL_FONTPE_RB_DEFAULT=Default > #MNM_FONTPE_RB_DEFAULT=D > #LBL_FONTPE_RB_SYSTEM=System > #MNM_FONTPE_RB_SYSTEM=S > #LBL_FONTPE_RB_CUSTOM=Custom > #MNM_FONTPE_RB_CUSTOM=C 331c331 < PNL_FONTPE_SYSTEM=System Font --- > #PNL_FONTPE_SYSTEM=System Font 334,361c334,361 < LBL_FONTPE_RB_INPUT_TEXT=INPUT_TEXT < MNM_FONTPE_RB_INPUT_TEXT=N < LBL_FONTPE_RB_STATIC_TEXT=STATIC_TEXT < MNM_FONTPE_RB_STATIC_TEXT=T < < PNL_FONTPE_FACE=Face < LBL_FONTPE_RB_FACE_MONOSPACE=Monospace < MNM_FONTPE_RB_FACE_MONOSPACE=M < LBL_FONTPE_RB_FACE_PROPORTIONAL=Proportional < MNM_FONTPE_RB_FACE_PROPORTIONAL=P < LBL_FONTPE_RB_FACE_SYSTEM=System < MNM_FONTPE_RB_FACE_SYSTEM=Y < < PNL_FONTPE_STYLE=Style < LBL_FONTPE_CHB_BOLD=Bold < MNM_FONTPE_CHB_BOLD=O < LBL_FONTPE_CHB_ITALIC=Italic < MNM_FONTPE_CHB_ITALIC=I < LBL_FONTPE_CHB_UNDERLINED=Underlined < MNM_FONTPE_CHB_UNDERLINED=U < < PNL_FONTPE_SIZE=Size < LBL_FONTPE_RB_LARGE=Large < MNM_FONTPE_RB_LARGE=L < LBL_FONTPE_RB_MEDIUM=Medium < MNM_FONTPE_RB_MEDIUM=E < LBL_FONTPE_RB_SMALL=Small < MNM_FONTPE_RB_SMALL=A --- > #LBL_FONTPE_RB_INPUT_TEXT=INPUT_TEXT > #MNM_FONTPE_RB_INPUT_TEXT=N > #LBL_FONTPE_RB_STATIC_TEXT=STATIC_TEXT > #MNM_FONTPE_RB_STATIC_TEXT=T > > #PNL_FONTPE_FACE=Face > #LBL_FONTPE_RB_FACE_MONOSPACE=Monospace > #MNM_FONTPE_RB_FACE_MONOSPACE=M > #LBL_FONTPE_RB_FACE_PROPORTIONAL=Proportional > #MNM_FONTPE_RB_FACE_PROPORTIONAL=P > #LBL_FONTPE_RB_FACE_SYSTEM=System > #MNM_FONTPE_RB_FACE_SYSTEM=Y > > #PNL_FONTPE_STYLE=Style > #LBL_FONTPE_CHB_BOLD=Bold > #MNM_FONTPE_CHB_BOLD=O > #LBL_FONTPE_CHB_ITALIC=Italic > #MNM_FONTPE_CHB_ITALIC=I > #LBL_FONTPE_CHB_UNDERLINED=Underlined > #MNM_FONTPE_CHB_UNDERLINED=U > > #PNL_FONTPE_SIZE=Size > #LBL_FONTPE_RB_LARGE=Large > #MNM_FONTPE_RB_LARGE=L > #LBL_FONTPE_RB_MEDIUM=Medium > #MNM_FONTPE_RB_MEDIUM=E > #LBL_FONTPE_RB_SMALL=Small > #MNM_FONTPE_RB_SMALL=A 363c363 < LBL_TEXTFIELDPE_CAPS_WORD=INITIAL_CAPS_WORD --- > #LBL_TEXTFIELDPE_CAPS_WORD=INITIAL_CAPS_WORD 365c365 < LBL_TEXTFIELDPE_CAPS_SENTENCE=INITIAL_CAPS_SENTENCE --- > #LBL_TEXTFIELDPE_CAPS_SENTENCE=INITIAL_CAPS_SENTENCE 367c367 < LBL_TEXTFIELDPE_URL=URL --- > #LBL_TEXTFIELDPE_URL=URL 371c371 < LBL_COLOR_CHOOSER_RADIO_BUTTON=Color --- > #LBL_COLOR_CHOOSER_RADIO_BUTTON=Color 379,387c379,387 < DataSetElementUI.jLabel3.text=Expression: < DataSetElementUI.jLabel1.text=Dataset: < DataSetElementUI.jTextFieldExpression.text= < DataSetElementUI.jLabelExpression.text=. < DataSetElementUI.jLabel2.text=Command: < DatabindingElementUI.jLabel4.text=Preview: < DatabindingElementUI.jLabelPreview.text= < DataSetElementUI.jPanel2.border.title=Push Data < DataSetElementUI.jPanel1.border.title=DataSet Configuration --- > #DataSetElementUI.jLabel3.text=Expression: > #DataSetElementUI.jLabel1.text=Dataset: > #DataSetElementUI.jTextFieldExpression.text= > #DataSetElementUI.jLabelExpression.text=. > #DataSetElementUI.jLabel2.text=Command: > #DatabindingElementUI.jLabel4.text=Preview: > #DatabindingElementUI.jLabelPreview.text= > #DataSetElementUI.jPanel2.border.title=Push Data > #DataSetElementUI.jPanel1.border.title=DataSet Configuration 407c407 < DatabindingElementUI.jPanel8.AccessibleContext.accessibleName=Next/Previous Iteration Index --- > #DatabindingElementUI.jPanel8.AccessibleContext.accessibleName=Next/Previous Iteration Index 442,444c442,444 < LBL_Dataset_not_Selected=Dataset not Selected < LBL_WARNING_and_= and < LBL_WARNING_Empty_expression= Empty expression --- > LBL_Dataset_not_Selected=Dataset not selected > LBL_WARNING_and_=\ and > LBL_WARNING_Empty_expression= empty expression 452c452 < LBL_GoToSource=&Go To Source --- > #LBL_GoToSource=&Go To Source diff -r o/mobility8/vmd-midp/vmd-midp/org/netbeans/modules/vmd/midp/propertyeditors/api/usercode/Bundle.properties n/mobility8/vmd-midp/vmd-midp/org/netbeans/modules/vmd/midp/propertyeditors/api/usercode/Bundle.properties 40c40 < LBL_PREDEFINED=&Predefined: --- > #LBL_PREDEFINED=&Predefined: diff -r o/mobility8/vmd-midp/vmd-midp/org/netbeans/modules/vmd/midp/propertyeditors/eventhandler/Bundle.properties n/mobility8/vmd-midp/vmd-midp/org/netbeans/modules/vmd/midp/propertyeditors/eventhandler/Bundle.properties 57c57 < LBL_VALUE=jRadioButton1 --- > #LBL_VALUE=jRadioButton1 diff -r o/mobility8/vmd-midp/vmd-midp/org/netbeans/modules/vmd/midp/propertyeditors/timezone/Bundle.properties n/mobility8/vmd-midp/vmd-midp/org/netbeans/modules/vmd/midp/propertyeditors/timezone/Bundle.properties 40c40 < LBL_VALUE=&Value: --- > #LBL_VALUE=&Value: 42c42 < LBL_RESULT=Result: --- > #LBL_RESULT=Result: diff -r o/mobility8/vmd-midp/vmd-midp/org/netbeans/modules/vmd/midp/resources/templates/emptyvisualdesign.html n/mobility8/vmd-midp/vmd-midp/org/netbeans/modules/vmd/midp/resources/templates/emptyvisualdesign.html 42c42 < --- > 44,45c44,47 < < --- > > > > diff -r o/mobility8/vmd-midp/vmd-midp/org/netbeans/modules/vmd/midp/resources/templates/emptyvisualmidlet.html n/mobility8/vmd-midp/vmd-midp/org/netbeans/modules/vmd/midp/resources/templates/emptyvisualmidlet.html 42c42 < --- > 44,45c44,46 < < --- > > > diff -r o/mobility8/vmd-midpnb/vmd-midpnb/org/netbeans/modules/vmd/midpnb/components/displayables/Bundle.properties n/mobility8/vmd-midpnb/vmd-midpnb/org/netbeans/modules/vmd/midpnb/components/displayables/Bundle.properties 49,50c49,50 < LBL_SMSComposer_phoneNumberLabel=Phone Number: < LBL_SMSComposer_messageLabel=Message: --- > #LBL_SMSComposer_phoneNumberLabel=Phone Number: > #LBL_SMSComposer_messageLabel=Message: 66c66 < LBL_LoginScreen_UsernameLabel=Username &Label: --- > #LBL_LoginScreen_UsernameLabel=Username &Label: 68c68 < LBL_LoginScreen_PasswordLabel=Password &Label: --- > #LBL_LoginScreen_PasswordLabel=Password &Label: diff -r o/mobility8/vmd-midpnb/vmd-midpnb/org/netbeans/modules/vmd/midpnb/components/svg/form/Bundle.properties n/mobility8/vmd-midpnb/vmd-midpnb/org/netbeans/modules/vmd/midpnb/components/svg/form/Bundle.properties 40,41c40,42 < DISP_SVGFormComponent_id=Id < LBL_SVGFormComponent_id=&Id: --- > #DISP_SVGFormComponent_id=Id > #LBL_SVGFormComponent_id=&Id: > DISP_FlowCategory_SVGButtons=SVG Buttons diff -r o/mobility8/vmd-midpnb/vmd-midpnb/org/netbeans/modules/vmd/midpnb/flow/Bundle.properties n/mobility8/vmd-midpnb/vmd-midpnb/org/netbeans/modules/vmd/midpnb/flow/Bundle.properties 41c41 < DISP_FlowOrder_SVGFormElement=SVG Form Element --- > #DISP_FlowOrder_SVGFormElement=SVG Form Element diff -r o/mobility8/vmd-midpnb/vmd-midpnb/org/netbeans/modules/vmd/midpnb/producers/Bundle.properties n/mobility8/vmd-midpnb/vmd-midpnb/org/netbeans/modules/vmd/midpnb/producers/Bundle.properties 85,86c85,86 < DISP_SVG_FormComponent=SVG Form component < TTIP_SVG_FormComponent=org.netbeans.microedition.svg.SVGComponent --- > #DISP_SVG_FormComponent=SVG Form component > #TTIP_SVG_FormComponent=org.netbeans.microedition.svg.SVGComponent diff -r o/mobility8/vmd-midpnb/vmd-midpnb/org/netbeans/modules/vmd/midpnb/propertyeditors/Bundle.properties n/mobility8/vmd-midpnb/vmd-midpnb/org/netbeans/modules/vmd/midpnb/propertyeditors/Bundle.properties 69,76c69,76 < DISP_Table=TableItem < NAME_Table_title=Title < NAME_Table_selectionColor=Selection Color < NAME_Table_model=Table Model < NAME_Table_borders=Show Borders < NAME_Table_titleFont=Title Font < NAME_Table_headersFont=Headers Font < NAME_Table_valuesFont=Values Font --- > #DISP_Table=TableItem > #NAME_Table_title=Title > #NAME_Table_selectionColor=Selection Color > #NAME_Table_model=Table Model > #NAME_Table_borders=Show Borders > #NAME_Table_titleFont=Title Font > #NAME_Table_headersFont=Headers Font > #NAME_Table_valuesFont=Values Font 79,83c79,83 < DISP_AbstractInfoScreen=AbstractInfoScreen < NAME_AbstractInfoScreen_text=Text < NAME_AbstractInfoScreen_textFont=Text Font < NAME_AbstractInfoScreen_image=Image < NAME_AbstractInfoScreen_nextDisplayableAction=Default Action --- > #DISP_AbstractInfoScreen=AbstractInfoScreen > #NAME_AbstractInfoScreen_text=Text > #NAME_AbstractInfoScreen_textFont=Text Font > #NAME_AbstractInfoScreen_image=Image > #NAME_AbstractInfoScreen_nextDisplayableAction=Default Action 86c86 < DISP_InfoScreenAction=Action --- > #DISP_InfoScreenAction=Action 88,106c88,106 < LBL_InfoScreenActionPE_None= < LBL_InfoScreenActionPE_Switch=Switch to < LBL_InfoScreenActionPE_ForwardAppend=, then to < < LBL_InfoScreenActionPEP_nothing=Do Nothing < MNM_InfoScreenActionPEP_nothing=N < LBL_InfoScreenActionPEP_nothingComment=Note: This action will not do anything. < < LBL_InfoScreenActionPEP_switch=Switch to screen < MNM_InfoScreenActionPEP_switch=S < LBL_InfoScreenActionPEP_targetLabel=Target screen: < MNM_InfoScreenActionPEP_targetLabel=T < LBL_InfoScreenActionPEP_targetForwardLabel=Alert Forward screen: < MNM_InfoScreenActionPEP_targetForwardLabel=F < LBL_InfoScreenActionPEP_switchComment=Note: Alert Forward screen is only available to Alerts targets. < < LBL_InfoScreen_success=Success < LBL_InfoScreen_failure=Failure < LBL_InfoScreen_dismiss=Dismiss --- > #LBL_InfoScreenActionPE_None= > #LBL_InfoScreenActionPE_Switch=Switch to > #LBL_InfoScreenActionPE_ForwardAppend=, then to > > #LBL_InfoScreenActionPEP_nothing=Do Nothing > #MNM_InfoScreenActionPEP_nothing=N > #LBL_InfoScreenActionPEP_nothingComment=Note: This action will not do anything. > > #LBL_InfoScreenActionPEP_switch=Switch to screen > #MNM_InfoScreenActionPEP_switch=S > #LBL_InfoScreenActionPEP_targetLabel=Target screen: > #MNM_InfoScreenActionPEP_targetLabel=T > #LBL_InfoScreenActionPEP_targetForwardLabel=Alert Forward screen: > #MNM_InfoScreenActionPEP_targetForwardLabel=F > #LBL_InfoScreenActionPEP_switchComment=Note: Alert Forward screen is only available to Alerts targets. > > #LBL_InfoScreen_success=Success > #LBL_InfoScreen_failure=Failure > #LBL_InfoScreen_dismiss=Dismiss 109,114c109,114 < DISP_WaitScreen=WaitScreen < NAME_WaitScreen_successAction=Success Action < DISP_WaitScreen_successCommand=Success < NAME_WaitScreen_failureAction=Failure Action < DISP_WaitScreen_failureCommand=Failure < NAME_WaitScreen_task=Task --- > #DISP_WaitScreen=WaitScreen > #NAME_WaitScreen_successAction=Success Action > #DISP_WaitScreen_successCommand=Success > #NAME_WaitScreen_failureAction=Failure Action > #DISP_WaitScreen_failureCommand=Failure > #NAME_WaitScreen_task=Task 117,122c117,122 < DISP_SplashScreen=SplashScreen < NAME_SplashScreen_timeout=Timeout < NAME_SplashScreen_allowTimeoutInterrupt=Allow Timeout Interrupt < TTIP_SplashScreen_allowTimeoutInterrupt=When assigned value=true, user can dismiss the screen manually regardless of the timeout value. < NAME_SplashScreen_dismissAction=Dismiss Action < DISP_SplashScreen_dismissCommand=Dismiss --- > #DISP_SplashScreen=SplashScreen > #NAME_SplashScreen_timeout=Timeout > #NAME_SplashScreen_allowTimeoutInterrupt=Allow Timeout Interrupt > #TTIP_SplashScreen_allowTimeoutInterrupt=When assigned value=true, user can dismiss the screen manually regardless of the timeout value. > #NAME_SplashScreen_dismissAction=Dismiss Action > #DISP_SplashScreen_dismissCommand=Dismiss 125,127c125,127 < DISP_CancellableTask=CancellableTask < DISP_SimpleCancellableTask=SimpleCancellableTask < NAME_SimpleCancellableTask_executableMethodBody=Executable Method Body --- > #DISP_CancellableTask=CancellableTask > #DISP_SimpleCancellableTask=SimpleCancellableTask > #NAME_SimpleCancellableTask_executableMethodBody=Executable Method Body 129,130c129,130 < LBL_CANCELLABLETASK_PE_DEFAULT= < LBL_CANCELLABLETASK_PE_NEW= --- > #LBL_CANCELLABLETASK_PE_DEFAULT= > #LBL_CANCELLABLETASK_PE_NEW= 133,138c133,138 < DISP_TableModel=TableModel < DISP_SimpleTableModel=SimpleTableModel < LBL_TABLEMODEL_PE_DEFAULT= < LBL_TABLEMODEL_PE_NEW= < DISP_PE_TableModel_GetAsText=Table Model < TITLE_PE_TableModel=Table Model - {0} --- > #DISP_TableModel=TableModel > #DISP_SimpleTableModel=SimpleTableModel > #LBL_TABLEMODEL_PE_DEFAULT= > #LBL_TABLEMODEL_PE_NEW= > #DISP_PE_TableModel_GetAsText=Table Model > #TITLE_PE_TableModel=Table Model - {0} 141,149c141,149 < LBL_SimpleTableModelPE_Columns=&Columns: < LBL_SimpleTableModelPE_Rows=&Rows: < LBL_SimpleTableModelPE_UseHeaders=Use &Headers < < NAME_SimpleTableModelPE_Table=Table Model < DESC_SimpleTableModelPE_AddColumn=Add Column < DESC_SimpleTableModelPE_RemoveColumn=Remove Column < DESC_SimpleTableModelPE_AddRow=Add Row < DESC_SimpleTableModelPE_RemoveRow=Remove Row --- > #LBL_SimpleTableModelPE_Columns=&Columns: > #LBL_SimpleTableModelPE_Rows=&Rows: > #LBL_SimpleTableModelPE_UseHeaders=Use &Headers > > #NAME_SimpleTableModelPE_Table=Table Model > #DESC_SimpleTableModelPE_AddColumn=Add Column > #DESC_SimpleTableModelPE_RemoveColumn=Remove Column > #DESC_SimpleTableModelPE_AddRow=Add Row > #DESC_SimpleTableModelPE_RemoveRow=Remove Row 155c155 < NetBeans\ MIDP\ Components=NetBeans MIDP Components --- > #NetBeans\ MIDP\ Components=NetBeans MIDP Components 178a179,183 > SVGFormEditorElement.jButton1.text=jButton1 > Move_Up_Action=Move Up > Move_Down_Action=Move Down > SVG_Component_Type_Column=SVG Component Type > SVG_Component_ID_Column=SVG Component ID diff -r o/mobility8/vmd-midpnb/vmd-midpnb/org/netbeans/modules/vmd/midpnb/propertyeditors/table/Bundle.properties n/mobility8/vmd-midpnb/vmd-midpnb/org/netbeans/modules/vmd/midpnb/propertyeditors/table/Bundle.properties 48c48 < LBL_TABLE_MODEL_STR=&Table Model: --- > #LBL_TABLE_MODEL_STR=&Table Model: diff -r o/mobility8/vmd-midpnb/vmd-midpnb/org/netbeans/modules/vmd/midpnb/screen/display/Bundle.properties n/mobility8/vmd-midpnb/vmd-midpnb/org/netbeans/modules/vmd/midpnb/screen/display/Bundle.properties 54c54 < DISP_empty_table_model= --- > #DISP_empty_table_model= diff -r o/nb6.5/ide-branding/netbeans/core/locale/core_nb/org/netbeans/core/startup/Bundle_nb.properties n/nb6.5/ide-branding/netbeans/core/locale/core_nb/org/netbeans/core/startup/Bundle_nb.properties 42c42 < SPLASH_WIDTH=473 --- > #SPLASH_WIDTH=473 44c44 < SPLASH_HEIGHT=300 --- > #SPLASH_HEIGHT=300 47c47 < SplashShowProgressBar=true --- > #SplashShowProgressBar=true 51c51 < SplashRunningTextBounds=10, 235, 450, 12 --- > #SplashRunningTextBounds=10, 235, 450, 12 53c53 < SplashProgressBarBounds=0, 249, 473, 3 --- > #SplashProgressBarBounds=0, 249, 473, 3 56c56 < SplashRunningTextFontSize=11 --- > #SplashRunningTextFontSize=11 59c59 < SplashRunningTextColor=0xFFFFFF --- > #SplashRunningTextColor=0xFFFFFF 61c61 < SplashProgressBarColor=0xE00000 --- > #SplashProgressBarColor=0xE00000 63c63 < SplashProgressBarEdgeColor=0xC5646F --- > #SplashProgressBarEdgeColor=0xC5646F 65c65 < SplashProgressBarCornerColor=0xB4A2B5 --- > #SplashProgressBarCornerColor=0xB4A2B5 68c68 < AboutTextBounds=78, 60, 362, 20 --- > #AboutTextBounds=78, 60, 362, 20 71c71 < AboutTextColor=0x000000 --- > #AboutTextColor=0x000000 diff -r o/nb6.5/reglib/reglib/org/netbeans/modules/reglib/Bundle.properties n/nb6.5/reglib/reglib/org/netbeans/modules/reglib/Bundle.properties 46,50c46,49 < #For NB 6.0 < servicetag.nb.urn=urn:uuid:5a381dd1-a4f2-11dc-8f02-080020a9ed93 < servicetag.nb.name=NetBeans Integrated Development Environment 6.1 < servicetag.nb.version=6.1 < #servicetag.parent.urn=urn:uuid:32dcfb52-224e-11d6-8935-9117368824fa --- > #For NB 6.5 > servicetag.nb.urn=urn:uuid:4f402a90-68b4-11dd-938b-080020a9ed93 > servicetag.nb.name=NetBeans Integrated Development Environment 6.5 > servicetag.nb.version=6.5 53a53,60 > #For NB CND 6.5 > servicetag.cnd.urn=urn:uuid:d00bbb1c-7abd-11dd-938b-080020a9ed93 > servicetag.cnd.name=NetBeans C++ Pack 6.5 > servicetag.cnd.version=6.5 > servicetag.cnd.parent.urn=urn:uuid:bc76c157-8a3c-4da7-97d2-41d561ffe234 > servicetag.cnd.parent.name=Development Tools > > diff -r o/nb6.5/uihandler/uihandler/org/netbeans/modules/uihandler/Bundle.properties n/nb6.5/uihandler/uihandler/org/netbeans/modules/uihandler/Bundle.properties 137a138,160 > > Metrics_title=Usage Statistics > LBL_BottomText1=Help us improve the NetBeans IDE by providing anonymous usage data. > LBL_BottomText2=If you agree to participate, the IDE will send anonymous \ > information about the high-level features that you use to a database at netbeans.org. > LBL_BottomText3=The usage statistics help us better understand user \ > requirements and prioritize improvements in future releases. We will never \ > reverse-engineer the collected data to find specific details about your projects. > > LBL_MetricsEnable=I Agree > ACSN_MetricsEnable=Enable usage statistics > ACSD_MetricsEnable=Enable usage statistics > > LBL_MetricsCancel=No, Thank You > ACSN_MetricsCancel=Disable usage statistics > ACSD_MetricsCancel=Disable usage statistics > > #NOI18N > METRICS_INFO_URL=http://www.netbeans.org/about/usage-tracking.html > > LBL_LearnMore=Learn more > ACSN_LearnMore=Learn more > ACSD_LearnMore=Learn more diff -r o/nb6.5/uihandler/uihandler/org/netbeans/modules/uihandler/Connecting.html n/nb6.5/uihandler/uihandler/org/netbeans/modules/uihandler/Connecting.html 3,4c3,4 < < --- > > diff -r o/nb6.5/uihandler/uihandler/org/netbeans/modules/uihandler/UnknownHostException.html n/nb6.5/uihandler/uihandler/org/netbeans/modules/uihandler/UnknownHostException.html 3,4c3,4 < < --- > > diff -r o/nb6.5/updatecenters/updatecenters/org/netbeans/modules/updatecenters/resources/Bundle.properties n/nb6.5/updatecenters/updatecenters/org/netbeans/modules/updatecenters/resources/Bundle.properties 53c53 < #URL_LatestBuild=http://deadlock.netbeans.org/hudson/job/nbms-and-javadoc/lastSuccessfulBuild/artifact/nbbuild/nbms/updates.xml.gz --- > #URL_LatestBuild=http://deadlock.netbeans.org/hudson/job/nbms-and-javadoc/lastStableBuild/artifact/nbbuild/nbms/updates.xml.gz diff -r o/nb6.5/welcome/welcome/org/netbeans/modules/welcome/resources/Bundle.properties n/nb6.5/welcome/welcome/org/netbeans/modules/welcome/resources/Bundle.properties 110c110 < LBL_PluginsContent=Add more tools into NetBeans IDE delivered by NetBeans team for Desktop, Web, Enterprise, Mobile Java development and Ruby, C/C++, SOA, UML development. Plus many third party plugins for enhanced productivity. --- > LBL_PluginsContent=Add any IDE plugins that you have not yet installed and look for other features provided by the NetBeans team and other developers. diff -r o/other/installer/components/products/glassfish/src/org/netbeans/installer/products/glassfish/wizard/panels/Bundle.properties n/other/installer/components/products/glassfish/src/org/netbeans/installer/products/glassfish/wizard/panels/Bundle.properties 84,92d83 < GFP.minimum.jdk.version=1.5.0 < #NOI18N < GFP.maximum.jdk.version=1.6.99 < #NOI18N < GFP.vendor.jdk.allowed=Sun Microsystems.* < #NOI18N < GFP.vendor.jdk.allowed.macosx=Apple.* < < #NOI18N diff -r o/other/installer/components/products/glassfish-mod/src/org/netbeans/installer/products/glassfish/mod/wizard/panels/Bundle.properties n/other/installer/components/products/glassfish-mod/src/org/netbeans/installer/products/glassfish/mod/wizard/panels/Bundle.properties 85,93d84 < GFP.minimum.jdk.version=1.5.0 < #NOI18N < GFP.maximum.jdk.version=1.6.99 < #NOI18N < GFP.vendor.jdk.allowed=Sun Microsystems.* < #NOI18N < GFP.vendor.jdk.allowed.macosx=Apple.* < < #NOI18N diff -r o/other/installer/components/products/nb-base/src/org/netbeans/installer/products/nb/base/wizard/panels/Bundle.properties n/other/installer/components/products/nb-base/src/org/netbeans/installer/products/nb/base/wizard/panels/Bundle.properties 40c40,41 < NBP.description=Choose the installation folder and JDK\u2122 for the NetBeans IDE. --- > NBP.description=Choose the installation folder and JDK\u2122. > NBP.description.java=Choose the installation folder and Java\u2122 environment. 45a47 > NBP.java.location.label.text=&Java\u2122 environment for the NetBeans IDE: 47,51d48 < < #NOI18N < NBP.minimum.jdk.version=1.5.0.6 < #NOI18N < NBP.maximum.jdk.version=10.0.0 diff -r o/other/installer/components/products/tomcat/data/Bundle.properties n/other/installer/components/products/tomcat/data/Bundle.properties 38c38 < product.description=Free, open source web server that is the reference implementation for Java servlet and JSP specifications. --- > product.description=Open source web container for Java Servlet and JSP specifications. diff -r o/other/installer/engine/branding/jdk/src/data/engine.properties n/other/installer/engine/branding/jdk/src/data/engine.properties 102a103,107 > #NOI18N > nbi.wizard.ui.swing.frame.width.nimbus=624 > #NOI18N > nbi.wizard.ui.swing.frame.height.nimbus=472 > 131a137,141 > #NOI18N > nbi.wizard.ui.swing.frame.minimum.width.nimbus=624 > #NOI18N > nbi.wizard.ui.swing.frame.minimum.height.nimbus=472 > diff -r o/other/installer/engine/branding/jtb/src/data/engine.properties n/other/installer/engine/branding/jtb/src/data/engine.properties 105a106,110 > #NOI18N > nbi.wizard.ui.swing.frame.width.nimbus=624 > #NOI18N > nbi.wizard.ui.swing.frame.height.nimbus=529 > 134a140,143 > #NOI18N > nbi.wizard.ui.swing.frame.minimum.width.nimbus=624 > #NOI18N > nbi.wizard.ui.swing.frame.minimum.height.nimbus=529 diff -r o/other/installer/engine/branding/mysql/src/data/engine.properties n/other/installer/engine/branding/mysql/src/data/engine.properties 106a107,111 > #NOI18N > nbi.wizard.ui.swing.frame.width.nimbus=624 > #NOI18N > nbi.wizard.ui.swing.frame.height.nimbus=529 > 135a141,144 > #NOI18N > nbi.wizard.ui.swing.frame.minimum.width.nimbus=624 > #NOI18N > nbi.wizard.ui.swing.frame.minimum.height.nimbus=529 diff -r o/other/installer/engine/src/data/engine.properties n/other/installer/engine/src/data/engine.properties 102a103,107 > #NOI18N > nbi.wizard.ui.swing.frame.width.nimbus=624 > #NOI18N > nbi.wizard.ui.swing.frame.height.nimbus=512 > 131a137,140 > #NOI18N > nbi.wizard.ui.swing.frame.minimum.width.nimbus=624 > #NOI18N > nbi.wizard.ui.swing.frame.minimum.height.nimbus=512 diff -r o/other/installer/engine/src/org/netbeans/installer/wizard/components/panels/netbeans/Bundle.properties n/other/installer/engine/src/org/netbeans/installer/wizard/components/panels/netbeans/Bundle.properties 73c73 < NPoISP.message.text.warnings=Warnings were encountered during the installation.

For more details consult the installation log file:
{0} --- > NPoISP.message.text.warnings=Installation completed successfully but some warnings were encountered during the installation of {1}.

For more details consult the installation log file:
{0} 77c77 < NPoISP.message.text.errors=Errors were encountered during the installation.

For more details consult the installation log file:
{0} --- > NPoISP.message.text.errors=Installation of {1} was not completed.

Try to run installer again or consult the installation log file for more details:
{0} 128c128 < NPoISP.message.text.warnings.uninstall=Warnings were encountered during the uninstallation.

For more details consult the installation log file:
{0} --- > NPoISP.message.text.warnings.uninstall=Uninstallation completed successfully but some warnings were encountered during uninstallation of {1}.

For more details consult the installation log file:
{0} 132c132 < NPoISP.message.text.errors.uninstall=Errors were encountered during the uninstallation.

For more details consult the installation log file:
{0} --- > NPoISP.message.text.errors.uninstall=Uninstallation of {1} was not completed.

Try to run uninstaller again or consult the uninstallation log file for more details:
{0} 222c222,223 < --- > NWP.warning.no.compatible.jdk.found=No compatible JDK was found. > NWP.warning.no.compatible.java.found=No compatible Java environment was found. diff -r o/other/installer/infra/build/web/language.properties n/other/installer/infra/build/web/language.properties 0a1 > #To localize, change this value to the name of the language in that language (e.g. "Japanese" in the Japanese language) 1a3 > #To localize, change this value to the name of the language in English (e.g. Japanese) 2a5 > #To localize, change this value to the current localization locale (e.g. ja) diff -r o/other/installer/mac/newbuild/Bundle.properties n/other/installer/mac/newbuild/Bundle.properties 1c1 < netbeans-Title=NetBeans Development Version ${buildnumber} --- > netbeans-Title=NetBeans IDE 6.5 4c4 < netbeans-title=NetBeans Dev --- > netbeans-title=NetBeans IDE 6.5 18c18 < tomcat-description=Free, open source web server that is the reference implementation for Java servlet and JSP specifications. --- > tomcat-description=Open source web container for Java Servlet and JSP specifications. 70c70 < ERR_INVALID_VERSION_MSG=This software can be installed only on Mac OS X v10.4-based system and later. \ No newline at end of file --- > ERR_INVALID_VERSION_MSG=This software can be installed only on Mac OS X v10.4-based system and later. diff -r o/other/nbi/engine/src/org/netbeans/installer/wizard/components/panels/Bundle.properties n/other/nbi/engine/src/org/netbeans/installer/wizard/components/panels/Bundle.properties 108c108,109 < JLP.location.label.text=&JDK Home Folder: --- > JLP.location.label.text=&JDK\u2122 home folder: > JLP.location.label.text.java=&Java\u2122 environment home folder: 110c111,112 < JLP.list.label.text=&List of suitable JDKs found on this machine: --- > JLP.list.label.text=&List of suitable JDK\u2122 found on this machine: > JLP.list.label.text.java=&List of suitable Java\u2122 environments found on this machine: 112a115 > JLP.error.null.java=The path to the Java environment cannot be empty. 113a117 > JLP.error.not.valid.path.java=The specified Java environment folder {0} is invalid. 114a119 > JLP.error.path.not.exists.java=The specified Java environment folder {0} does not exist. 115a121 > JLP.error.not.javahome.java=The specified Java environment folder {0} does not contain Java environment. 117,118c123,126 < JLP.error.wrong.version.older=The specified JDK folder {0} contains JDK version "{1}", while the minimum is JDK "{2}". < JLP.error.wrong.version.newer=The specified JDK folder {0} contains JDK version "{1}", while the maximum is JDK "{2}". --- > JLP.error.wrong.version.older=The specified JDK folder {0} contains JDK version "{1}", while the minimum is "{2}". > JLP.error.wrong.version.older.java=The specified Java environment folder {0} contains Java version "{1}", while the minimum is "{2}". > JLP.error.wrong.version.newer=The specified JDK folder {0} contains JDK version "{1}", while the maximum is "{2}". > JLP.error.wrong.version.newer.java=The specified Java environment folder {0} contains Java version "{1}", while the maximum is "{2}". 119a128 > JLP.error.wrong.vendor.java=The specified Java environment folder {0} contains Java from the unsupported vendor ({1}). The supported vendors are "{2}". 121a131 > JLP.error.nothing.found.java=The installer could not find a compatible Java environment. The minimum required version is {0}. Specify Java environment folder manually. diff -r o/php1/php-editor/php-editor/org/netbeans/modules/php/editor/codegen/ui/Bundle.properties n/php1/php-editor/php-editor/org/netbeans/modules/php/editor/codegen/ui/Bundle.properties 71a72 > 72a74,76 > > ACSD_SelectConnection=Select the database connection to generate connection code for > ACSD_SelectColumns=Select the columns to generate a SELECT statement for diff -r o/php1/php-project/php-project/org/netbeans/modules/php/project/Bundle.properties n/php1/php-project/php-project/org/netbeans/modules/php/project/Bundle.properties 50,84c50,51 < # PhpActionProvider < LBL_ImportFile=Import Files < LBL_FilesImported=Files are successfully imported < LBL_DebugProject=Debug Project < LBL_RunLocal=Run in Command Line < < #LBL_MalformedUrl={0} is not valid URL < #LBL_AbsentHost=Couldn't find host {0} < < # abstract action < # output tab for command. < #{0} - command name < LBL_OutputTabTitle = {0} < < < # ImportCommand < LBL_ChooseFiles=Choose files for import < LBL_ImportWarningMsg=Warning: {0} < < < # RunLocalCommandImpl values < LBL_RunLocalOutputTabTitle = {0} - {1} < LBL_ScriptNotSavedWarn=Warning: {0} can not be saved before running. < LBL_ProjectNotSavedWarn=Warning: can not save project {0} before running. < LBL_ScriptExecCancelledMsg={0} was cancelled by user. < LBL_PhpInterpreterMsg=\nWill use Php Interpreter: {0} < LBL_CantFindInterpreter=Can not find Php Language Interpreter.\n\ < Set up interpreter in Project Properties. < LBL_MalformedUrl = {0} is not valid URL < LBL_ScriptExecErrorMsg=Error: {0} < LBL_ScriptExecExitValueMsg=exit value = {0} < LBL_NoIndexFile=Nothing to run.\n\ < Can not find selected files or "{0}" inside selected folders.\n\n < # Do not I18N < LBL_InterpretedPhpExt=.html --- > MSG_SourcesFolderRestored=Source folder {0} has been restored. > MSG_SourcesFolderTemporaryToProjectDirectory=The Source folder {0} cannot be restored.\nPlease, fix the problem and reopen the project. diff -r o/php1/php-project/php-project/org/netbeans/modules/php/project/connections/Bundle.properties n/php1/php-project/php-project/org/netbeans/modules/php/project/connections/Bundle.properties 44c44 < ## remote connections --- > # remote connections 46,59d45 < LBL_ConnectionName=Connection Name < LBL_Ftp=FTP < LBL_Add=&Add... < LBL_Remove=Re&move < LBL_Type=&Type: < LBL_HostName=&Host Name: < LBL_Port=Po&rt: < LBL_ConnectionName=Connection Name: < LBL_UserName=&User Name: < LBL_AnonymousLogin=Anon&ymous Login < LBL_Password=&Password: < LBL_InitialDirectory=&Initial Directory: < LBL_Timeout=Tim&eout (s): < LBL_PassiveMode=Pa&ssive Mode 61,62c47,49 < LBL_EnterPassword=Enter password for "{0}" < TXT_PasswordInfo=Leave the field empty to be prompted. --- > LBL_ConnectionName=Connection Name: > LBL_Ftp=FTP > LBL_TestConnection=Test 74,129c61,63 < RemoteConnectionsPanel.connectionLabel.AccessibleContext.accessibleDescription=Label for connection name. < RemoteConnectionsPanel.removeButton.AccessibleContext.accessibleDescription=Button which removes currently selected connection. < RemoteConnectionsPanel.timeoutTextField.AccessibleContext.accessibleDescription=Connection timeout, in seconds. < RemoteConnectionsPanel.timeoutTextField.AccessibleContext.accessibleName=Connection Timeout < RemoteConnectionsPanel.detailsPanel.AccessibleContext.accessibleDescription=Panel with details of the selected connection. < RemoteConnectionsPanel.detailsPanel.AccessibleContext.accessibleName=Connection Details < RemoteConnectionsPanel.passiveModeCheckBox.AccessibleContext.accessibleDescription=Active/passive mode selector. < RemoteConnectionsPanel.initialDirectoryLabel.AccessibleContext.accessibleName=Initial Directory < RemoteConnectionsPanel.passwordLabel.AccessibleContext.accessibleName=Password < RemoteConnectionsPanel.anonymousCheckBox.AccessibleContext.accessibleName=Anonymous Login < RemoteConnectionsPanel.userLabel.AccessibleContext.accessibleName=User Name < RemoteConnectionsPanel.portLabel.AccessibleContext.accessibleName=Port < RemoteConnectionsPanel.hostLabel.AccessibleContext.accessibleName=Host Name < RemoteConnectionsPanel.errorLabel.AccessibleContext.accessibleName=Connection Errors < RemoteConnectionsPanel.warningLabel.AccessibleContext.accessibleName=Connection Warnings < RemoteConnectionsPanel.typeLabel.AccessibleContext.accessibleName=Type < RemoteConnectionsPanel.passwordLabelInfo.AccessibleContext.accessibleName=Password Information < RemoteConnectionsPanel.timeoutLabel.AccessibleContext.accessibleName=Timeout < RemoteConnectionsPanel.addButton.AccessibleContext.accessibleName=Add Connection < RemoteConnectionsPanel.passiveModeCheckBox.AccessibleContext.accessibleName=Passive Mode < RemoteConnectionsPanel.removeButton.AccessibleContext.accessibleName=Remove Connection < RemoteConnectionsPanel.connectionLabel.AccessibleContext.accessibleName=Connection Name < RemoteConnectionsPanel.configList.AccessibleContext.accessibleDescription=List with all the remote connections. < RemoteConnectionsPanel.configList.AccessibleContext.accessibleName=List of Connections < RemoteConnectionsPanel.initialDirectoryTextField.AccessibleContext.accessibleDescription=The initial remote directory. < RemoteConnectionsPanel.initialDirectoryTextField.AccessibleContext.accessibleName=Initial Remote Directory < RemoteConnectionsPanel.addButton.AccessibleContext.accessibleDescription=Button for adding new remote connection. < RemoteConnectionsPanel.timeoutLabel.AccessibleContext.accessibleDescription=Label for timeout. < RemoteConnectionsPanel.passwordLabelInfo.AccessibleContext.accessibleDescription=Information for password, it can be left empty to be prompted for it. < RemoteConnectionsPanel.AccessibleContext.accessibleDescription=Panel for managing all the remote connections. < RemoteConnectionsPanel.AccessibleContext.accessibleName=Remote Connection Manager < RemoteConnectionsPanel.configScrollPane.AccessibleContext.accessibleDescription=Scroll pane for the list of connections. < RemoteConnectionsPanel.configScrollPane.AccessibleContext.accessibleName=Connection List Scroll Pane < RemoteConnectionsPanel.separator.AccessibleContext.accessibleDescription=n/a < RemoteConnectionsPanel.separator.AccessibleContext.accessibleName=Separator < RemoteConnectionsPanel.warningLabel.AccessibleContext.accessibleDescription=Warning for connection, if any. < RemoteConnectionsPanel.typeLabel.AccessibleContext.accessibleDescription=Connection Type < RemoteConnectionsPanel.connectionTextField.AccessibleContext.accessibleDescription=The identifier of the connection. < RemoteConnectionsPanel.connectionTextField.AccessibleContext.accessibleName=Connection Name < RemoteConnectionsPanel.errorLabel.AccessibleContext.accessibleDescription=Error of the connection, if any. < RemoteConnectionsPanel.typeComboBox.AccessibleContext.accessibleDescription=The type of the remote connection. < RemoteConnectionsPanel.typeComboBox.AccessibleContext.accessibleName=Connection Type < RemoteConnectionsPanel.hostLabel.AccessibleContext.accessibleDescription=Label for host Name. < RemoteConnectionsPanel.hostTextField.AccessibleContext.accessibleDescription=Connection host. < RemoteConnectionsPanel.hostTextField.AccessibleContext.accessibleName=Host Name < RemoteConnectionsPanel.portLabel.AccessibleContext.accessibleDescription=Label for connection port. < RemoteConnectionsPanel.portTextField.AccessibleContext.accessibleDescription=Connection port, default 21. < RemoteConnectionsPanel.portTextField.AccessibleContext.accessibleName=Connection Port < RemoteConnectionsPanel.userLabel.AccessibleContext.accessibleDescription=Label for user name. < RemoteConnectionsPanel.userTextField.AccessibleContext.accessibleDescription=User name. < RemoteConnectionsPanel.userTextField.AccessibleContext.accessibleName=User Name < RemoteConnectionsPanel.anonymousCheckBox.AccessibleContext.accessibleDescription=Select this for anonymous login. < RemoteConnectionsPanel.passwordLabel.AccessibleContext.accessibleDescription=Label for password. < RemoteConnectionsPanel.initialDirectoryLabel.AccessibleContext.accessibleDescription=Label for initial directory. < RemoteConnectionsPanel.passwordTextField.AccessibleContext.accessibleDescription=Password. < RemoteConnectionsPanel.passwordTextField.AccessibleContext.accessibleName=Password --- > MSG_TestingConnection=Testing connection to {0} > MSG_TestConnectionFailed={0}\n(Server response: {1}) > MSG_TestConnectionSucceeded=Connection succeeded. 131a66 > LBL_EnterPassword=Enter password for "{0}" diff -r o/php1/php-project/php-project/org/netbeans/modules/php/project/connections/ui/Bundle.properties n/php1/php-project/php-project/org/netbeans/modules/php/project/connections/ui/Bundle.properties 88a89,160 > > ## remote connections > LBL_Ftp=FTP > LBL_Add=&Add... > LBL_Remove=Re&move > LBL_Type=&Type: > LBL_HostName=&Host Name: > LBL_Port=Po&rt: > LBL_ConnectionName=Connection Name: > LBL_UserName=&User Name: > LBL_AnonymousLogin=Anon&ymous Login > LBL_Password=&Password: > LBL_InitialDirectory=&Initial Directory: > LBL_Timeout=Tim&eout (s): > LBL_PassiveMode=Pa&ssive Mode > TXT_PasswordInfo=Leave the field empty to be prompted. > RemoteConnectionsPanel.connectionLabel.AccessibleContext.accessibleDescription=Label for connection name. > RemoteConnectionsPanel.removeButton.AccessibleContext.accessibleDescription=Button which removes currently selected connection. > RemoteConnectionsPanel.timeoutTextField.AccessibleContext.accessibleDescription=Connection timeout, in seconds. > RemoteConnectionsPanel.timeoutTextField.AccessibleContext.accessibleName=Connection Timeout > RemoteConnectionsPanel.detailsPanel.AccessibleContext.accessibleDescription=Panel with details of the selected connection. > RemoteConnectionsPanel.detailsPanel.AccessibleContext.accessibleName=Connection Details > RemoteConnectionsPanel.passiveModeCheckBox.AccessibleContext.accessibleDescription=Active/passive mode selector. > RemoteConnectionsPanel.initialDirectoryLabel.AccessibleContext.accessibleName=Initial Directory > RemoteConnectionsPanel.passwordLabel.AccessibleContext.accessibleName=Password > RemoteConnectionsPanel.anonymousCheckBox.AccessibleContext.accessibleName=Anonymous Login > RemoteConnectionsPanel.userLabel.AccessibleContext.accessibleName=User Name > RemoteConnectionsPanel.portLabel.AccessibleContext.accessibleName=Port > RemoteConnectionsPanel.hostLabel.AccessibleContext.accessibleName=Host Name > RemoteConnectionsPanel.errorLabel.AccessibleContext.accessibleName=Connection Errors > RemoteConnectionsPanel.warningLabel.AccessibleContext.accessibleName=Connection Warnings > RemoteConnectionsPanel.typeLabel.AccessibleContext.accessibleName=Type > RemoteConnectionsPanel.passwordLabelInfo.AccessibleContext.accessibleName=Password Information > RemoteConnectionsPanel.timeoutLabel.AccessibleContext.accessibleName=Timeout > RemoteConnectionsPanel.addButton.AccessibleContext.accessibleName=Add Connection > RemoteConnectionsPanel.passiveModeCheckBox.AccessibleContext.accessibleName=Passive Mode > RemoteConnectionsPanel.removeButton.AccessibleContext.accessibleName=Remove Connection > RemoteConnectionsPanel.connectionLabel.AccessibleContext.accessibleName=Connection Name > RemoteConnectionsPanel.configList.AccessibleContext.accessibleDescription=List with all the remote connections. > RemoteConnectionsPanel.configList.AccessibleContext.accessibleName=List of Connections > RemoteConnectionsPanel.initialDirectoryTextField.AccessibleContext.accessibleDescription=The initial remote directory. > RemoteConnectionsPanel.initialDirectoryTextField.AccessibleContext.accessibleName=Initial Remote Directory > RemoteConnectionsPanel.addButton.AccessibleContext.accessibleDescription=Button for adding new remote connection. > RemoteConnectionsPanel.timeoutLabel.AccessibleContext.accessibleDescription=Label for timeout. > RemoteConnectionsPanel.passwordLabelInfo.AccessibleContext.accessibleDescription=Information for password, it can be left empty to be prompted for it. > RemoteConnectionsPanel.AccessibleContext.accessibleDescription=Panel for managing all the remote connections. > RemoteConnectionsPanel.AccessibleContext.accessibleName=Remote Connection Manager > RemoteConnectionsPanel.configScrollPane.AccessibleContext.accessibleDescription=Scroll pane for the list of connections. > RemoteConnectionsPanel.configScrollPane.AccessibleContext.accessibleName=Connection List Scroll Pane > RemoteConnectionsPanel.separator.AccessibleContext.accessibleDescription=n/a > RemoteConnectionsPanel.separator.AccessibleContext.accessibleName=Separator > RemoteConnectionsPanel.warningLabel.AccessibleContext.accessibleDescription=Warning for connection, if any. > RemoteConnectionsPanel.typeLabel.AccessibleContext.accessibleDescription=Connection Type > RemoteConnectionsPanel.connectionTextField.AccessibleContext.accessibleDescription=The identifier of the connection. > RemoteConnectionsPanel.connectionTextField.AccessibleContext.accessibleName=Connection Name > RemoteConnectionsPanel.errorLabel.AccessibleContext.accessibleDescription=Error of the connection, if any. > RemoteConnectionsPanel.typeComboBox.AccessibleContext.accessibleDescription=The type of the remote connection. > RemoteConnectionsPanel.typeComboBox.AccessibleContext.accessibleName=Connection Type > RemoteConnectionsPanel.hostLabel.AccessibleContext.accessibleDescription=Label for host Name. > RemoteConnectionsPanel.hostTextField.AccessibleContext.accessibleDescription=Connection host. > RemoteConnectionsPanel.hostTextField.AccessibleContext.accessibleName=Host Name > RemoteConnectionsPanel.portLabel.AccessibleContext.accessibleDescription=Label for connection port. > RemoteConnectionsPanel.portTextField.AccessibleContext.accessibleDescription=Connection port, default 21. > RemoteConnectionsPanel.portTextField.AccessibleContext.accessibleName=Connection Port > RemoteConnectionsPanel.userLabel.AccessibleContext.accessibleDescription=Label for user name. > RemoteConnectionsPanel.userTextField.AccessibleContext.accessibleDescription=User name. > RemoteConnectionsPanel.userTextField.AccessibleContext.accessibleName=User Name > RemoteConnectionsPanel.anonymousCheckBox.AccessibleContext.accessibleDescription=Select this for anonymous login. > RemoteConnectionsPanel.passwordLabel.AccessibleContext.accessibleDescription=Label for password. > RemoteConnectionsPanel.initialDirectoryLabel.AccessibleContext.accessibleDescription=Label for initial directory. > RemoteConnectionsPanel.passwordTextField.AccessibleContext.accessibleDescription=Password. > RemoteConnectionsPanel.passwordTextField.AccessibleContext.accessibleName=Password diff -r o/php1/php-project/php-project/org/netbeans/modules/php/project/resources/Bundle.properties n/php1/php-project/php-project/org/netbeans/modules/php/project/resources/Bundle.properties 40a41 > Loaders/text/x-php5/Factories/org-netbeans-modules-gsf-GsfDataLoader.instance=PHP Files diff -r o/php1/php-project/php-project/org/netbeans/modules/php/project/ui/customizer/Bundle.properties n/php1/php-project/php-project/org/netbeans/modules/php/project/ui/customizer/Bundle.properties 50a51 > MSG_ConfigurationNameBlank=Configuration name cannot be blank. 72c73,74 < MSG_IllegalIndexName=Index File is not a valid file name. --- > MSG_NoIndexFile=Index File must be specified. > MSG_IndexFileInvalid=Index File must be a valid file. 114c116 < LBL_Manage=&Manage ... --- > LBL_Manage=&Manage... diff -r o/php1/php-project/php-project/org/netbeans/modules/php/project/ui/resources/emptyPHPClassDescription.html n/php1/php-project/php-project/org/netbeans/modules/php/project/ui/resources/emptyPHPClassDescription.html 43c43 < --- > 45,46c45,47 < < --- > > > diff -r o/php1/php-project/php-project/org/netbeans/modules/php/project/ui/resources/emptyPHPFileDescription.html n/php1/php-project/php-project/org/netbeans/modules/php/project/ui/resources/emptyPHPFileDescription.html 43c43 < --- > 45,46c45,47 < < --- > > > diff -r o/php1/php-project/php-project/org/netbeans/modules/php/project/ui/resources/emptyPHPInterfaceDescription.html n/php1/php-project/php-project/org/netbeans/modules/php/project/ui/resources/emptyPHPInterfaceDescription.html 43c43 < --- > 45,46c45,47 < < --- > > > diff -r o/php1/php-project/php-project/org/netbeans/modules/php/project/ui/resources/emptyPHPWebPageDescription.html n/php1/php-project/php-project/org/netbeans/modules/php/project/ui/resources/emptyPHPWebPageDescription.html 43c43 < --- > 45,46c45,47 < < --- > > > diff -r o/php1/php-project/php-project/org/netbeans/modules/php/project/ui/resources/emptyPhpProject.html n/php1/php-project/php-project/org/netbeans/modules/php/project/ui/resources/emptyPhpProject.html 44c44 < --- > diff -r o/php1/php-project/php-project/org/netbeans/modules/php/project/ui/resources/existingPhpProject.html n/php1/php-project/php-project/org/netbeans/modules/php/project/ui/resources/existingPhpProject.html 44c44 < --- > diff -r o/php1/php-project/php-project/org/netbeans/modules/php/project/ui/resources/phpDescription.html n/php1/php-project/php-project/org/netbeans/modules/php/project/ui/resources/phpDescription.html 44c44 < --- > diff -r o/php1/php-project/php-project/org/netbeans/modules/php/project/ui/wizards/Bundle.properties n/php1/php-project/php-project/org/netbeans/modules/php/project/ui/wizards/Bundle.properties 118c118 < TXT_MetadataInfo=In order to correctly run, debug project etc., NetBeans needs to store project metadata. --- > TXT_MetadataInfo=Warning: If Sources folder is not underneath or the same as NetBeans metadata directory, there could be problems with versioning of the project. 142d141 < MSG_IllegalIndexName=Index File is not a valid file name. 149c148 < MSG_IndexFileNotExists=Index File does not exist. --- > MSG_SourcesAndProjectCannotBeRelativized=Project and Source directories cannot be relativized. 152,153c151,152 < LBL_RunConfigurationInfo1=Specify the way that this project's files will primary be deployed. < LBL_RunConfigurationInfo2=Configurations can be added and modified later in the project properties. --- > LBL_RunConfigurationInfo1=Specify the way this project's files will be deployed. > LBL_RunConfigurationInfo2=Configuration settings can be added and modified later in the Project Properties dialog box. 162c161 < LBL_Manage=&Manage ... --- > LBL_Manage=&Manage... diff -r o/php1/php-refactoring/php-refactoring/org/netbeans/modules/refactoring/php/findusages/Bundle.properties n/php1/php-refactoring/php-refactoring/org/netbeans/modules/refactoring/php/findusages/Bundle.properties 49d48 < LBL_WhereUsed=Find Usages diff -r o/platform9/autoupdate-services/ext/updater/org/netbeans/updater/Bundle.properties n/platform9/autoupdate-services/ext/updater/org/netbeans/updater/Bundle.properties 3c3 < # Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved. --- > # Copyright 1997-2008 Sun Microsystems, Inc. All rights reserved. 26c26 < # Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun --- > # Software is Sun Microsystems, Inc. Portions Copyright 1997-2008 Sun 46a47 > UpdaterFrame.textLabel.fontName=Dialog diff -r o/platform9/autoupdate-ui/autoupdate-ui/org/netbeans/modules/autoupdate/ui/Bundle.properties n/platform9/autoupdate-ui/autoupdate-ui/org/netbeans/modules/autoupdate/ui/Bundle.properties 17a18 > UnitTab_PrepareReloadAction=Please wait a while reloading catalog diff -r o/platform9/autoupdate-ui/autoupdate-ui/org/netbeans/modules/autoupdate/ui/actions/Bundle.properties n/platform9/autoupdate-ui/autoupdate-ui/org/netbeans/modules/autoupdate/ui/actions/Bundle.properties 1c1 < CTL_CheckForUpdatesAction=Check For &Updates --- > CTL_CheckForUpdatesAction=Check for &Updates diff -r o/platform9/autoupdate-ui/autoupdate-ui/org/netbeans/modules/autoupdate/ui/wizards/Bundle.properties n/platform9/autoupdate-ui/autoupdate-ui/org/netbeans/modules/autoupdate/ui/wizards/Bundle.properties 165,168c165,168 < OperationDescriptionStep_BrokenModuleNameDep=The plugin named {0} was needed and not found. < OperationDescriptionStep_BrokenModuleVersionDep=The plugin {0} was requested in version >= {1} but only {2} was found. < OperationDescriptionStep_BrokenModuleOnlyVersionDep=The plugin {0} was requested in version {1}. < OperationDescriptionStep_BrokenModuleImplDep=The plugin {0} was requested in implementation version {1}. --- > OperationDescriptionStep_BrokenModuleNameDep=The plugin named {0} is needed and not found. > OperationDescriptionStep_BrokenModuleVersionDep=The plugin {0} is requested in version >= {1} but only {2} was found. > OperationDescriptionStep_BrokenModuleOnlyVersionDep=The plugin {0} is requested in version {1}. > OperationDescriptionStep_BrokenModuleImplDep=The plugin {0} is requested in implementation version {1}. diff -r o/platform9/favorites/favorites/org/netbeans/modules/favorites/resources/templatesFile.html n/platform9/favorites/favorites/org/netbeans/modules/favorites/resources/templatesFile.html 42c42 < --- > 44,45c44,46 < < --- > > > diff -r o/platform9/favorites/favorites/org/netbeans/modules/favorites/resources/templatesFolder.html n/platform9/favorites/favorites/org/netbeans/modules/favorites/resources/templatesFolder.html 42c42 < --- > 44,45c44,46 < < --- > > > diff -r o/platform9/javahelp/javahelp/org/netbeans/modules/javahelp/resources/masterHelpPage.html n/platform9/javahelp/javahelp/org/netbeans/modules/javahelp/resources/masterHelpPage.html 43,44c43,44 < < --- > > diff -r o/platform9/javahelp/javahelp/org/netbeans/modules/javahelp/resources/notEnabledModule.html n/platform9/javahelp/javahelp/org/netbeans/modules/javahelp/resources/notEnabledModule.html 3c3 < --- > diff -r o/platform9/javahelp/javahelp/org/netbeans/modules/javahelp/resources/notInstalledModule.html n/platform9/javahelp/javahelp/org/netbeans/modules/javahelp/resources/notInstalledModule.html 3c3 < --- > diff -r o/platform9/org-netbeans-core/org-netbeans-core/org/netbeans/beaninfo/editors/Bundle.properties n/platform9/org-netbeans-core/org-netbeans-core/org/netbeans/beaninfo/editors/Bundle.properties 42a43,45 > CTL_InvalidValueWithParam=Invalid value {0} entered > CTL_InvalidValueWithExc=Invalid value entered. \n\ > Cause: {0} 279a283,284 > # will be same as CTL_OK in openide.explorer/src/org/openide/explorer/propertysheet/Bundle.properties > CTL_OK=OK diff -r o/platform9/org-netbeans-core-startup/netbeans/core/core/org/netbeans/core/startup/Bundle.properties n/platform9/org-netbeans-core-startup/netbeans/core/core/org/netbeans/core/startup/Bundle.properties 55c55,57 < ERR_user_directory_is_inside_home=Your user directory (userdir) cannot reside inside your NetBeans installation directory. --- > # {0} - userdir full path > # {1} - inst full path > ERR_user_dir_is_inside_home=Your user directory ({0}) cannot reside inside your NetBeans installation directory ({1}). diff -r o/platform9/org-netbeans-core-ui/org-netbeans-core-ui/org/netbeans/core/ui/options/general/Bundle.properties n/platform9/org-netbeans-core-ui/org-netbeans-core-ui/org/netbeans/core/ui/options/general/Bundle.properties 59c59 < CTL_Usage_Check=Help us improve the NetBeans IDE by providing anonymous usage data --- > CTL_Usage_Check=Hel&p us improve the NetBeans IDE by providing anonymous usage data diff -r o/platform9/templates/templates/org/netbeans/modules/templates/Bundle.properties n/platform9/templates/templates/org/netbeans/modules/templates/Bundle.properties 6a7 > ERR_Switch_To_Java_6=Unable to fill the template, trying to use scripting engine from JDK 1.6 or newer.\n\nPlease run NetBeans under JDK 1.6 to resolve the problem.\nSee http://wiki.netbeans.org/FaqNetbeansConf how to do that. diff -r o/profiler3/debugger-jpda-heapwalk/debugger-jpda-heapwalk/org/netbeans/modules/debugger/jpda/heapwalk/Bundle.properties n/profiler3/debugger-jpda-heapwalk/debugger-jpda-heapwalk/org/netbeans/modules/debugger/jpda/heapwalk/Bundle.properties 44,45c44,45 < OpenIDE-Module-Short-Description=Provides heap walking functionality into Java Debugger. < OpenIDE-Module-Long-Description=Provides heap walking functionality into Java Debugger. --- > OpenIDE-Module-Short-Description=Provides heap walking functionality in Java Debugger. > OpenIDE-Module-Long-Description=Provides heap walking functionality in Java Debugger. diff -r o/profiler3/org-netbeans-lib-profiler-common/org-netbeans-lib-profiler-common/org/netbeans/lib/profiler/common/integration/Bundle.properties n/profiler3/org-netbeans-lib-profiler-common/org-netbeans-lib-profiler-common/org/netbeans/lib/profiler/common/integration/Bundle.properties 40,46d39 < # Sample ResourceBundle properties file < < AbstractIntegrationProvider_WorkingDirectoryHint=Working directory is the directory from which the {0} will be started < IntegrationProvider_TargetTypeApplication=Application < IntegrationProvider_TargetTypeApplet=Applet < IntegrationProvider_TargetTypeJ2SeApplication=J2EE Web/App Server < IntegrationProvider_TargetTypeDatabase=Database 50a44 > IntegrationUtils_PlatformJavaCvm=CVM 76a71 > IntegrationUtils_JdkCvmName=CVM diff -r o/profiler3/org-netbeans-lib-profiler-ui/org-netbeans-lib-profiler-ui/org/netbeans/lib/profiler/ui/memory/Bundle.properties n/profiler3/org-netbeans-lib-profiler-ui/org-netbeans-lib-profiler-ui/org/netbeans/lib/profiler/ui/memory/Bundle.properties 87a88 > MemoryResUserActionsHandler_CannotShowReflectionSrcMsg=Cannot show source for objects allocated by reflection. diff -r o/profiler3/profiler/profiler/org/netbeans/modules/profiler/actions/Bundle.properties n/profiler3/profiler/profiler/org/netbeans/modules/profiler/actions/Bundle.properties 50a51 > AntActions_InvalidJavaplatformMsg=Failed to determine overriden platform\: {0} diff -r o/profiler3/profiler/profiler/org/netbeans/modules/profiler/ppoints/Bundle.properties n/profiler3/profiler/profiler/org/netbeans/modules/profiler/ppoints/Bundle.properties 114c114 < StopwatchProfilingPointFactory_PpDescr=Reports hit time or measures execution time of a method fragment. You may use this Profiling Point instead of calling System.currentTimeMillis() or for measuring single method run time. --- > StopwatchProfilingPointFactory_PpDescr=You may use this profiling point to obtain a timestamp instead of calling System.currentTimeMillis(). You can also measure the time between start and end locations to obtain the execution time of a method fragment. 213c213,214 < Utils_CannotOpenSourceMsg=Cannot show profiling point in source.\nCheck profiling point location. \ No newline at end of file --- > Utils_CannotOpenSourceMsg=Cannot show profiling point in source.\nCheck profiling point location. > Utils_InvalidPPLocationMsg=Invalid location of {0}.

Location of the profiling point does not seem to be valid.
Make sure it points inside method definition, otherwise
the profiling point will not be hit during profiling. \ No newline at end of file diff -r o/profiler3/profiler/profiler/org/netbeans/modules/profiler/ppoints/ui/Bundle.properties n/profiler3/profiler/profiler/org/netbeans/modules/profiler/ppoints/ui/Bundle.properties 161a162 > ToggleProfilingPointAction_InvalidShortcutMsg=Invalid shortcut assigned to {0} action.

Make sure that exactly one shortcut is assigned to the action
and at least one modifier key is used in the shortcut. diff -r o/profiler3/profiler-attach/profiler-attach/org/netbeans/modules/profiler/attach/panels/Bundle.properties n/profiler3/profiler-attach/profiler-attach/org/netbeans/modules/profiler/attach/panels/Bundle.properties 78c78 < AttachWizard_ReviewAdditionalStepsMsg=&Please review additional steps\: --- > AttachWizard_ReviewAdditionalStepsMsg=Please review additional steps\: 93c93 < ManualIntegrationStepsWizardPanelUI_ManualIntegrationHintMsg=F&ollow these instructions to manually integrate the Profiler with {0} --- > ManualIntegrationStepsWizardPanelUI_ManualIntegrationHintMsg=Follow these instructions to manually integrate the Profiler with {0} 96c96 < PerformIntegrationWizardPanelUI_PerformedStepsString=&These steps will be performed by the Integration Wizard\: --- > PerformIntegrationWizardPanelUI_PerformedStepsString=These steps will be performed by the Integration Wizard\: 113c113 < TargetJVMWizardPanelUI_SelectJvmString=&Select the Java platform that will run your {0} --- > TargetJVMWizardPanelUI_SelectJvmString=Select the Java platform that will run your {0} 116,117d115 < < # HTML-formatted 192a191,192 > NewJPanel.generateRemotePack.text=Generate Remote Pack ... > NewJPanel.label.text=&Select the Java platform that will run your {0} diff -r o/profiler3/profiler-attach/profiler-attach/org/netbeans/modules/profiler/attach/panels/components/Bundle.properties n/profiler3/profiler-attach/profiler-attach/org/netbeans/modules/profiler/attach/panels/components/Bundle.properties 55,56d54 < StepsPanelComponent.label.text=Here comes the label < 95,96c93 < DirectorySelector.labelHint.contentType=text/html < ComboSelector.labelHint.contentType=text/html --- > StepsPanelComponent.label.text=Here comes the label diff -r o/profiler3/profiler-j2ee-tomcat/profiler-j2ee-tomcat/org/netbeans/modules/profiler/j2ee/tomcat/Bundle.properties n/profiler3/profiler-j2ee-tomcat/profiler-j2ee-tomcat/org/netbeans/modules/profiler/j2ee/tomcat/Bundle.properties 49a50 > TomcatIntegrationProvider_Tomcat6String=Tomcat 6.x diff -r o/profiler3/profiler-j2se/profiler-j2se/org/netbeans/modules/profiler/j2se/Bundle.properties n/profiler3/profiler-j2se/profiler-j2se/org/netbeans/modules/profiler/j2se/Bundle.properties 100a101,102 > JavaAppletIntegrationProvider_ManualDirectStep2MacMessage=Open the Java Preferences.app located in /Applications/Utilities/Java directory. Open the General tab and click in the Java Applet Runtime Parameters area and insert following string\:
{0}
Click the Save button and quit the Java Preferences application. > # HTML-formatted Only in o/ruby2: languages-yaml Only in n/ruby2/org-jruby/org-jruby/org/jruby: nb diff -r o/ruby2/org-jruby-distro/org-jruby-distro/org/jruby/distro/Bundle.properties n/ruby2/org-jruby-distro/org-jruby-distro/org/jruby/distro/Bundle.properties 5c5 < Bundled distribution of JRuby 1.1.3 and Ruby on Rails 2.0.2 --- > Bundled distribution of JRuby 1.1.4 and Ruby on Rails 2.0.2 diff -r o/ruby2/ruby/ruby/org/netbeans/modules/ruby/Bundle.properties n/ruby2/ruby/ruby/org/netbeans/modules/ruby/Bundle.properties 30c30 < FLOAT_LITERAL=Floating point number --- > FLOAT_LITERAL=Floating Point Number diff -r o/ruby2/ruby/ruby/org/netbeans/modules/ruby/options/Bundle.properties n/ruby2/ruby/ruby/org/netbeans/modules/ruby/options/Bundle.properties 0a1,39 > # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. > # > # Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved. > # > # The contents of this file are subject to the terms of either the GNU > # General Public License Version 2 only ("GPL") or the Common > # Development and Distribution License("CDDL") (collectively, the > # "License"). You may not use this file except in compliance with the > # License. You can obtain a copy of the License at > # http://www.netbeans.org/cddl-gplv2.html > # or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the > # specific language governing permissions and limitations under the > # License. When distributing the software, include this License Header > # Notice in each file and include the License file at > # nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this > # particular file as subject to the "Classpath" exception as provided > # by Sun in the GPL Version 2 section of the License file that > # accompanied this code. If applicable, add the following below the > # License Header, with the fields enclosed by brackets [] replaced by > # your own identifying information: > # "Portions Copyrighted [year] [name of copyright owner]" > # > # Contributor(s): > # > # The Original Software is NetBeans. The Initial Developer of the Original > # Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun > # Microsystems, Inc. All Rights Reserved. > # > # If you wish your version of this file to be governed by only the CDDL > # or only the GPL Version 2, indicate your decision by adding > # "[Contributor] elects to include this software in this distribution > # under the [CDDL or GPL Version 2] license." If you do not indicate a > # single choice of license, a recipient has the option to distribute > # your version of this file under either the CDDL, the GPL Version 2 or > # to extend the choice of license to its licensees as provided above. > # However, if you add GPL Version 2 code and therefore, elected the GPL > # Version 2 license, then the option applies only if the new code is > # made subject to such option by the copyright holder. > 40,42c79,81 < FmtTabsIndents.tabSizeLabel.text=&Tab Size: < FmtTabsIndents.rightMarginLabel.text=&Right Margin: < FmtTabsIndents.expandTabCheckBox.text=&Expand Tab to Spaces --- > > AN_Preview=Preview > AD_Preview=Preview diff -r o/ruby2/ruby-debugger/ruby-debugger/org/netbeans/modules/ruby/debugger/Bundle.properties n/ruby2/ruby-debugger/ruby-debugger/org/netbeans/modules/ruby/debugger/Bundle.properties 45d44 < TOOLTIP_CONDITIONAL_BREAKPOINT=Conditional Breakpoint 47d45 < TOOLTIP_CURRENT_LINE_2=Current Target 49,58d46 < TOOLTIP_DISABLED_CONDITIONAL_BREAKPOINT=Disabled Conditional Breakpoint < < # RubyDebuggerPanel < RubyDebuggerPanel.browse.rdebug.text=Browse rdebug executable < RubyDebuggerPanel.classicDebuggerEngine.text=&Classic Debugger < RubyDebuggerPanel.debuggerLabel.text=Ruby Debugger < RubyDebuggerPanel.engineLabel.text=Debugger engine\: < RubyDebuggerPanel.rdebug-ide.used=Note: The Fast Debugger cannot be used with JRuby interpreter. < RubyDebuggerPanel.rubyDebugEngine.text=&Fast Debugger (ruby-debug-ide) < RubyDebuggerPanel.wrong.rdebug-ide=You have to select executable named {0} 92,96d79 < # A11Y Descriptions < AD_ClassicDebugger=Slow debugger engine < AD_FastDebugger=Fast debugger engine < AD_InstallFastButton=Install fast debugger gem < AD_VerboseCheckbox=N/A diff -r o/ruby2/ruby-debugger/ruby-debugger/org/netbeans/modules/ruby/debugger/model/Bundle.properties n/ruby2/ruby-debugger/ruby-debugger/org/netbeans/modules/ruby/debugger/model/Bundle.properties 3c3 < # Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved. --- > # Copyright 1997-2008 Sun Microsystems, Inc. All rights reserved. 26c26 < # Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun --- > # Software is Sun Microsystems, Inc. Portions Copyright 1997-2008 Sun 60,61d59 < CTL_WatchesModel.Column.Name.Name = Name < CTL_WatchesModel.Column.Name.Desc = Watch expression diff -r o/ruby2/ruby-hints/ruby-hints/org/netbeans/modules/ruby/hints/Bundle.properties n/ruby2/ruby-hints/ruby-hints/org/netbeans/modules/ruby/hints/Bundle.properties 99c99 < CamelCaseNamesDesc=Check method names to find camelCase names instead of the preferred method_name style --- > CamelCaseNamesDesc=Check method names to find CamelCase names instead of the preferred method_name style 135c135 < AccidentalAssignment=Accidental Assignment? (if x = y instead of x == y) --- > AccidentalAssignment=Accidental assignment? (if x = y instead of x == y) diff -r o/ruby2/ruby-hints/ruby-hints/org/netbeans/modules/ruby/hints/infrastructure/Bundle.properties n/ruby2/ruby-hints/ruby-hints/org/netbeans/modules/ruby/hints/infrastructure/Bundle.properties 2c2 < CTL_Hints_ToolTip=Hints And Warinings for Ruby Code --- > CTL_Hints_ToolTip=Hints And Warnings for Ruby Code diff -r o/ruby2/ruby-hints/ruby-hints/org/netbeans/modules/ruby/hints/introduce/Bundle.properties n/ruby2/ruby-hints/ruby-hints/org/netbeans/modules/ruby/hints/introduce/Bundle.properties 66c66 < LBL_Ok=Ok --- > LBL_Ok=OK 77c77 < AD_IntrFld_Dialog=Introuce Filed Dialog --- > AD_IntrFld_Dialog=Introduce Field Dialog diff -r o/ruby2/ruby-javaint/ruby-javaint/org/netbeans/modules/ruby/javaint/Bundle.properties n/ruby2/ruby-javaint/ruby-javaint/org/netbeans/modules/ruby/javaint/Bundle.properties 42c42 < OpenIDE-Module-Short-Description= Support for accessing Java Libraries via JRuby in Ruby projects --- > OpenIDE-Module-Short-Description=Support for accessing Java libraries using JRuby in Ruby projects 44c44 < Support for accessing Java Libraries via JRuby in Ruby projects --- > Support for accessing Java libraries using JRuby in Ruby projects 81c81 < LBL_CustomizeLibraries_LibrariesTab=JRuby Class Path --- > LBL_CustomizeLibraries_LibrariesTab=JRuby Classpath 89c89 < LBL_CustomizeLibraries_LibrariesC_JLabel=Run-&time Libraries: --- > LBL_CustomizeLibraries_LibrariesC_JLabel=Run&time Libraries: diff -r o/ruby2/ruby-platform/ruby-platform/org/netbeans/api/ruby/platform/Bundle.properties n/ruby2/ruby-platform/ruby-platform/org/netbeans/api/ruby/platform/Bundle.properties 49c49 < BuiltinRuby=Built-in JRuby (1.1.3) --- > BuiltinRuby=Built-in JRuby (1.1.4) 61c61 < RubyPlatformProvider.RubyPlatformAutoDetection=Ruby Platform AutoDetection... --- > RubyPlatformProvider.RubyPlatformAutoDetection=Ruby Platform Autodetection... diff -r o/ruby2/ruby-platform/ruby-platform/org/netbeans/modules/ruby/platform/Bundle.properties n/ruby2/ruby-platform/ruby-platform/org/netbeans/modules/ruby/platform/Bundle.properties 101a102 > PlatformComponentFactory.select.valid.platform= diff -r o/ruby2/ruby-platform/ruby-platform/org/netbeans/modules/ruby/platform/gems/Bundle.properties n/ruby2/ruby-platform/ruby-platform/org/netbeans/modules/ruby/platform/gems/Bundle.properties 1,5d0 < Version=Version: < Versions=Versions: < Description=Description: < InstalledVersion=Installed Version < AvailableVersion=Available Version 29c24 < GemProgressPanel.outputToggle.text=&Show gem output --- > GemProgressPanel.outputToggle.text=&Show gem Command Output 50a46,47 > GemPanel.allVersionsCheckbox.text=Fetch All Gem &Versions (-a, --all) > GemPanel.descriptionCheckbox.text=Fetch Detailed Gem &Description (-d, --details) 53a51 > GemPanel.oldRubyGems.warning=Warning: Old version of RubyGems detected: {0}. Newer one should be installed. 59c57 < GemPanel.reloadReposButton.text=&Reload Gems --- > GemPanel.reloadUpdatedButton.text=&Reload Gems 61a60 > GemPanel.select.valid.platform= 134c133 < Install one with the Gem Manager or choose a different Ruby platform. --- > Install one with the Ruby Gems Manager (Tools > Ruby Gems) or choose a different Ruby platform. 136c135 < is not writable as this user and "gksu", "kdesu", ... like tool was not found.\n\ --- > is not writable for this user and "gksu", "kdesu", or a similar tool was not found.\n\ 138c137 < Manager to an alternative (and writable) repository or run as root, or manually\n\ --- > Manager to an alternative (and writable) repository, run as root, manually\n\ 147c146 < This Ruby installation does not have Ruby Gems \n\ --- > This Ruby installation does not have RubyGems \n\ 152,154c151,158 < Cannot find "gem" command either in the interpreter's folder or on the system path. < GemPanel.allVersionsCheckbox.text=Fetch all Gem &versions (-a, --all) < GemPanel.descriptionCheckbox.text=Fetch detailed Gem &description (-d, --details) --- > Cannot find the "gem" command either in the interpreter's folder or on the system path. > > # GemUISupport > GemUISupport.Version=Version: > GemUISupport.Versions=Versions: > GemUISupport.Description=Description: > GemUISupport.InstalledVersion=Installed Version > GemUISupport.AvailableVersion=Available Version diff -r o/ruby2/ruby-project/ruby-project/org/netbeans/modules/ruby/rubyproject/Bundle.properties n/ruby2/ruby-project/ruby-project/org/netbeans/modules/ruby/rubyproject/Bundle.properties 43c43 < HINT_IrbTopComponent=This is a Irb window --- > HINT_IrbTopComponent=This is an IRB window 68a69 > USG_PROJECT_CREATE_RUBY=New Ruby Application created [Platform kind: {0}, Platform version: {1}, RubyGems version: {2}] 102d102 < popup-run-focused-spec=Run Focused Test 104d103 < popup-debug-focused-test=Debug Focused Test 126a126,135 > > # SharedRubyProjectProperties > AD_RegenerateButton=N/A > CTL_RegenerateButton=Regenerate > TXT_ModifiedTitle=Edit Project Properties > TXT_Regenerate=

The "build-impl.xml" file was modified externally.

\ >

The IDE automatically generates this file whenever you edit project
\ > properties. If you proceed, "build-impl.xml" will be regenerated and
\ > any changes you have made manually will be lost.

\ >

Do you want to regenerate "build-impl.xml"?

diff -r o/ruby2/ruby-project/ruby-project/org/netbeans/modules/ruby/rubyproject/rake/Bundle.properties n/ruby2/ruby-project/ruby-project/org/netbeans/modules/ruby/rubyproject/rake/Bundle.properties 50a51 > RakeTaskChooser.rakeTaskHint.text=(part of task name, wildcards: "?", "*") 56a58,60 > RakeTaskChooser.showAllCheckbox.text=Show &Undocumented Tasks > RakeTaskChooser.taskParamLabel.text=&Parameters: > RakeTaskChooser.taskParamsField.text= 60c64 < RakeSupport.RerunRakeWithTrace=Click here to re-run task with tracing enabled --- > RakeSupport.RerunRakeWithTrace=Click here to rerun the task with tracing enabled 65,68c69,72 < RakeTaskChooser.taskParamsField.text= < RakeTaskChooser.taskParamLabel.text=&Parameters: < RakeTaskChooser.showAllCheckbox.text=Show &Undocumented Tasks < RakeTaskChooser.rakeTaskHint.text=(part of task name, wildcards: "?", "*") --- > > # RakeRunnerAction > RakeRunnerAction.no.platform.for.project=There is not a Ruby platform selected for the "{0}" project. > diff -r o/ruby2/ruby-project/ruby-project/org/netbeans/modules/ruby/rubyproject/ui/Bundle.properties n/ruby2/ruby-project/ruby-project/org/netbeans/modules/ruby/rubyproject/ui/Bundle.properties 49c49 < LBL_AutoTest=Auto Test --- > LBL_AutoTest=AutoTest diff -r o/ruby2/ruby-project/ruby-project/org/netbeans/modules/ruby/rubyproject/ui/customizer/Bundle.properties n/ruby2/ruby-project/ruby-project/org/netbeans/modules/ruby/rubyproject/ui/customizer/Bundle.properties 58,60c58,60 < CTL_AvaialableMainClasses=&Main scripts\: < LBL_ChooseMainClass_OK=Select Main Class < LBL_ChooseMainClass_Title=Browse Main Classes --- > CTL_AvaialableMainClasses=&Main Scripts\: > LBL_ChooseMainClass_OK=Select Main Script > LBL_ChooseMainClass_Title=Browse Main Scripts 65,67c65,67 < Following folders you selected are already used in this or another\n\ < project. One package folder can only be used in one project in one\n\ < package folder list (source packages or test packages). --- > The following folders that you selected are already used in this or another\n\ > project. A source folder can only be used in one project, and in only one\n\ > source folder list (source folders or test folders) in that project. 114,121d113 < TXT_Regenerate=

The "build-impl.xml" file was modified externally.

\ <

The IDE automatically generates this file whenever you edit project
\ < properties. If you proceed, "build-impl.xml" will be regenerated and
\ < any changes you have made manually will be lost.

\ <

Do you want to regenerate "build-impl.xml"?

< CTL_RegenerateButton=Regenerate < AD_RegenerateButton=N/A < TXT_ModifiedTitle=Edit Project Properties 134,136d125 < CustomizerRun.input.duplicate=Configuration {0} already exists. < CustomizerRun.input.prompt=Profile Name: < CustomizerRun.input.title=Create New Profile 139a129,134 > # CustomizerSupport > CustomizerSupport.config.blank=Configuration name cannot be blank. > CustomizerSupport.config.duplicate=Configuration {0} already exists. > CustomizerSupport.config.prompt=Profile Name: > CustomizerSupport.config.title=Create New Profile > 154,155c149,153 < CustomizerRun.jrubyPropsLabel.text=JRuby Properties: < CustomizerRun.jrubyPropsExample.text=-Djruby.objectspace.enabled=true --- > CustomizerRun.jrubyPropsLabel.text=&JVM Arguments: > CustomizerRun.jrubyPropsExample.text=-Xmx1024m -Djruby.objectspace.enabled=true > > # RubyProjectProperties > USG_PROJECT_CONFIG_RUBY=Ruby Application customized [Platform kind: {0}, Platform version: {1}, RubyGems version: {2}] diff -r o/ruby2/ruby-project/ruby-project/org/netbeans/modules/ruby/rubyproject/ui/resources/application.html n/ruby2/ruby-project/ruby-project/org/netbeans/modules/ruby/rubyproject/ui/resources/application.html 42c42 < --- > 44c44 < --- > diff -r o/ruby2/ruby-project/ruby-project/org/netbeans/modules/ruby/rubyproject/ui/resources/desktop.html n/ruby2/ruby-project/ruby-project/org/netbeans/modules/ruby/rubyproject/ui/resources/desktop.html 42c42 < --- > 44c44 < --- > diff -r o/ruby2/ruby-project/ruby-project/org/netbeans/modules/ruby/rubyproject/ui/resources/existingProject.html n/ruby2/ruby-project/ruby-project/org/netbeans/modules/ruby/rubyproject/ui/resources/existingProject.html 42c42 < --- > 44c44 < --- > diff -r o/ruby2/ruby-project/ruby-project/org/netbeans/modules/ruby/rubyproject/ui/resources/rakefile.html n/ruby2/ruby-project/ruby-project/org/netbeans/modules/ruby/rubyproject/ui/resources/rakefile.html 6c6 < --- > diff -r o/ruby2/ruby-project/ruby-project/org/netbeans/modules/ruby/rubyproject/ui/resources/rubyclass.html n/ruby2/ruby-project/ruby-project/org/netbeans/modules/ruby/rubyproject/ui/resources/rubyclass.html 6c6 < --- > diff -r o/ruby2/ruby-project/ruby-project/org/netbeans/modules/ruby/rubyproject/ui/resources/rubyfile.html n/ruby2/ruby-project/ruby-project/org/netbeans/modules/ruby/rubyproject/ui/resources/rubyfile.html 6c6 < --- > diff -r o/ruby2/ruby-project/ruby-project/org/netbeans/modules/ruby/rubyproject/ui/resources/rubymodule.html n/ruby2/ruby-project/ruby-project/org/netbeans/modules/ruby/rubyproject/ui/resources/rubymodule.html 6c6 < --- > diff -r o/ruby2/ruby-project/ruby-project/org/netbeans/modules/ruby/rubyproject/ui/resources/rubyspec.html n/ruby2/ruby-project/ruby-project/org/netbeans/modules/ruby/rubyproject/ui/resources/rubyspec.html 6c6 < --- > diff -r o/ruby2/ruby-project/ruby-project/org/netbeans/modules/ruby/rubyproject/ui/resources/rubytest.html n/ruby2/ruby-project/ruby-project/org/netbeans/modules/ruby/rubyproject/ui/resources/rubytest.html 6c6 < --- > diff -r o/ruby2/ruby-project/ruby-project/org/netbeans/modules/ruby/rubyproject/ui/resources/rubytestsuite.html n/ruby2/ruby-project/ruby-project/org/netbeans/modules/ruby/rubyproject/ui/resources/rubytestsuite.html 6c6 < --- > diff -r o/ruby2/ruby-project/ruby-project/org/netbeans/modules/ruby/rubyproject/ui/wizards/Bundle.properties n/ruby2/ruby-project/ruby-project/org/netbeans/modules/ruby/rubyproject/ui/wizards/Bundle.properties 57,58c57,58 < ACSD_NewJavaApp=Creates new Java Application project < ACSD_JavaExtSourcesProjectLocation=Creates new Java Project with Existing Sources --- > ACSD_NewJavaApp=Creates new Ruby Application project > ACSD_JavaExtSourcesProjectLocation=Creates new Ruby Project with Existing Sources 114d113 < ACSD_setAsMainCheckBox=N/A 119d117 < LBL_setAsMainCheckBox=Set as &Main Project diff -r o/ruby2/ruby-railsprojects/ruby-railsprojects/org/netbeans/modules/ruby/railsprojects/Bundle.properties n/ruby2/ruby-railsprojects/ruby-railsprojects/org/netbeans/modules/ruby/railsprojects/Bundle.properties 56d55 < Tests=Tests 67d65 < ViewNotFound=View not found 69d66 < goto=Navigate 74d70 < LBL_No_Main_Classs_Found=Class "{0}" does not have a main method. 82,88d77 < COMMENT_dist.dir=This directory is removed when the project is cleaned: < COMMENT_build.dir=This directory is removed when the project is cleaned: < COMMENT_run.jvmargs=Space-separated list of JVM arguments used when running the project < COMMENT_run.jvmargs_2=(you may also define separate properties like run-sys-prop.name=value instead of -Dname=value < COMMENT_run.jvmargs_3=or test-sys-prop.name=value to set system properties for unit tests): < COMMENT_build.sysclasspath=Only compile against the classpath explicitly listed here: < COMMENT_javac.compilerargs=Space-separated list of extra javac options 91,100c80,83 < < #UpdateHelper < TXT_ProjectUpdate=Project Needs Upgrading\n\ < This project was created in an earlier version of NetBeans IDE. If you\n\ < edit its properties in NetBeans IDE {0}, the project will be upgraded and\n\ < will no longer work in earlier versions of the IDE.\n\n\ < Do you want to upgrade your project to version {0}? < TXT_ProjectUpdateTitle=Change Project Properties < CTL_UpdateOption=Upgrade Project < AD_UpdateOption=N/A --- > USG_PROJECT_CREATE_RAILS=New Rails Application created [Platform kind: {0},\ > Platform version: {1}, RubyGems version: {2}, Server: {3}, Database: {4}, Rails version: {5}] > USG_PROJECT_CONFIG_RAILS=Rails Application customized [Platform kind: {0},\ > Platform version: {1}, RubyGems version: {2}, Server: {3}, Database: {4}, Rails version: {5}] diff -r o/ruby2/ruby-railsprojects/ruby-railsprojects/org/netbeans/modules/ruby/railsprojects/application.html n/ruby2/ruby-railsprojects/ruby-railsprojects/org/netbeans/modules/ruby/railsprojects/application.html 42c42 < --- > 44c44 < --- > diff -r o/ruby2/ruby-railsprojects/ruby-railsprojects/org/netbeans/modules/ruby/railsprojects/plugins/Bundle.properties n/ruby2/ruby-railsprojects/ruby-railsprojects/org/netbeans/modules/ruby/railsprojects/plugins/Bundle.properties 17,19c17,19 < UseCheckout=Use svn &checkout to grab the plugin < UseExternals=Use svn:&externals to grab the plugin < SpecificRev=Specific &revision: --- > UseCheckout=Use svn &checkout to Grab the Plugin > UseExternals=Use svn:&externals to Grab the Plugin > SpecificRev=Specific &Revision: 28c28 < SelectRepos=Select One Or More Repository --- > SelectRepos=Select One Or More Repositories 95c95 < InstallationSettingsPanel.revisionField.AccessibleContext.accessibleName=Specific revision --- > InstallationSettingsPanel.revisionField.AccessibleContext.accessibleName=Specific Revision 103c103 < PluginProgressPanel.outputToggle.text=&Show script/plugin output --- > PluginProgressPanel.outputToggle.text=&Show Script/Plugin Output diff -r o/ruby2/ruby-railsprojects/ruby-railsprojects/org/netbeans/modules/ruby/railsprojects/server/Bundle.properties n/ruby2/ruby-railsprojects/ruby-railsprojects/org/netbeans/modules/ruby/railsprojects/server/Bundle.properties 50,55d49 < WEBrickTab=WEBrick for {0} on {1} < WEBrick=WEBrick Web Server < MongrelTab=Mongrel for {0} on {1} < Mongrel=Mongrel Web Server < LighttpdTab=LightTPD for {0} on {1} < Lighttpd=LightTPD Web Server diff -r o/ruby2/ruby-railsprojects/ruby-railsprojects/org/netbeans/modules/ruby/railsprojects/ui/Bundle.properties n/ruby2/ruby-railsprojects/ruby-railsprojects/org/netbeans/modules/ruby/railsprojects/ui/Bundle.properties 50c50 < LBL_AutoTest=Auto Test --- > LBL_AutoTest=AutoTest 55d54 < LBL_Fix_Broken_Links_Action=Resolve Reference Problems... diff -r o/ruby2/ruby-railsprojects/ruby-railsprojects/org/netbeans/modules/ruby/railsprojects/ui/customizer/Bundle.properties n/ruby2/ruby-railsprojects/ruby-railsprojects/org/netbeans/modules/ruby/railsprojects/ui/customizer/Bundle.properties 3c3 < # Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved. --- > # Copyright 1997-2008 Sun Microsystems, Inc. All rights reserved. 26c26 < # Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun --- > # Software is Sun Microsystems, Inc. Portions Copyright 1997-2008 Sun 44,46d43 < Projects/org-netbeans-modules-ruby-railsprojects/Customizer/BuildCategory=Build < Projects/org-netbeans-modules-ruby-railsprojects/Customizer/WebServiceCategory=Web Services < LBL_Config_Sources=Sources 49,53d45 < LBL_AdditionalCompilerOptions=Additional Compiler Options: < AD_AdditionalCompilerOptions=N/A < LBL_AdditionalCompilerOptionsExample=(e.g. -b -- see available flags below) < LBL_CustomizeRun_Run_MainClass_JLabel=Port Number\: < LBL_CustomizeRun_Run_MainClass_JButton=&Browse... 55,80d46 < LBL_CustomizeRun_Run_Working_Directory=&Working Directory: < LBL_CustomizeRun_Run_Working_Directory_Browse=Brow&se... < LBL_CustomizeRun_Run_Working_Directory_Browse_Title=Browse Working Directory < LBL_CustomizeRun_Run_VM_Options=&Ruby Options\: < LBL_CustomizeRun_Run_VM_Options_Example=(e.g. -b) < < #MainClassChooser < CTL_SelectAvaialableMainClasses=&Select the main script: < CTL_AvaialableMainClasses=&Main scripts\: < LBL_ChooseMainClass_OK=Select Main Class < LBL_ChooseMainClass_Title=Browse Main Classes < LBL_ChooseMainClass_NO_CLASSES_NODE= < < #CustomizerSources < CTL_ProjectFolder=Project Folder\: < TITLE_InvalidRoot=Add Folder < MSG_InvalidRoot=Folder Already Used in Project\n\ < Following folders you selected are already used in this or another\n\ < project. One package folder can only be used in one project in one\n\ < package folder list (source packages or test packages). < LBL_InvalidRoot=Package folders already in use: < MSG_InvalidRoot2=Those folders cannot be added to the project. < AD_InvalidRoot=N/A < AD_InvalidRootDlg=N/A < CTL_RailsSourceRootsUi_Close=Close < AD_RailsSourceRootsUi_Close=N/A 83,128d48 < LBL_SourceFolder_DialogTitle=Add Source Folder < LBL_TestFolder_DialogTitle=Add Test Folder < TXT_RootOwnedByProject={0} (owned by {1}) < LBL_ChooseMainClass_WARMUP_MESSAGE=Initializing view, please wait ... < LBL_ChooseMainClass_SCANNING_MESSAGE=Scanning in progress, please wait ... < AD_jTextFieldMainClass=N/A < AD_jButtonMainClass=N/A < AD_jTextFieldArgs=N/A < AD_jMainClassList=N/A < AD_MainClassChooser=N/A < AD_MainClassWarning=N/A < CTL_PackageFolders=Folder < CTL_PackageLabels=Label < CTL_AddSourceRoot=Add Folder... < CTL_RemoveSourceRoot=Remove < CTL_UpSourceRoot=Move Up < CTL_DownSourceRoot=Move Down < CTL_SourceRoots=Source Folders\: < CTL_TestRoots=Test Folders\: < CTL_AddTestRoot=Add Folder... < CTL_RemoveTestRoot=Remove < CTL_UpTestRoot=Move Up < CTL_DownTestRoot=Move Down < AD_CustomizeRun_Run_Working_Directory=N/A < AD_CustomizeRun_Run_Working_Directory_Browse=N/A < AD_CustomizeRun_Run_VM_Options=N/A < AD_CustomizerSources_addSourceRoot=N/A < AD_CustomizerSources_testRoots=N/A < AD_CustomizerSources_sourceRoots=N/A < AD_CustomizerSources_downTestRoot=N/A < AD_CustomizerSources_upTestRoot=N/A < AD_CustomizerSources_removeTestRoot=N/A < AD_CustomizerSources_addTestRoot=N/A < AD_CustomizerSources_downSourceRoot=N/A < AD_CustomizerSources_upSourceRoot=N/A < AD_CustomizerSources_removeSourceRoot=N/A < AD_CustomizerSources_projectLocation=N/A < AD_ChooseMainClass_OK=N/A < TXT_Regenerate=

The "build-impl.xml" file was modified externally.

\ <

The IDE automatically generates this file whenever you edit project
\ < properties. If you proceed, "build-impl.xml" will be regenerated and
\ < any changes you have made manually will be lost.

\ <

Do you want to regenerate "build-impl.xml"?

< CTL_RegenerateButton=Regenerate < AD_RegenerateButton=N/A < TXT_ModifiedTitle=Edit Project Properties 133,134d52 < CustomizerRun.input.prompt=Profile Name: < CustomizerRun.input.title=Create New Profile 138d55 < CustomizerRun.input.duplicate=Configuration {0} already exists. 140,143d56 < RailsEnv=Environment\: < Development=Development < Testing=Testing < Production=Production 155c68 < AD_RubyHomeBrowse=Manage Ruby platforms --- > AD_RubyHomeBrowse=Manage Ruby Platforms 159d71 < ServerEnvironment=&Server: 161,166c73 < AD_ServerPort=Server port < < # CustomizerDebug < LBL_Config_Debug=Debug < LBL_CustomizeDebug_ServerDebug_JCheckBox=Debug Rails Application (&Server side) < LBL_CustomizeDebug_ClientDebug_JCheckBox=Debug Rails Application (&Client side - Firefox browser only) --- > AD_ServerPort=Server Port diff -r o/ruby2/ruby-railsprojects/ruby-railsprojects/org/netbeans/modules/ruby/railsprojects/ui/resources/application.html n/ruby2/ruby-railsprojects/ruby-railsprojects/org/netbeans/modules/ruby/railsprojects/ui/resources/application.html 42c42 < --- > 44c44 < --- > diff -r o/ruby2/ruby-railsprojects/ruby-railsprojects/org/netbeans/modules/ruby/railsprojects/ui/resources/existingApplication.html n/ruby2/ruby-railsprojects/ruby-railsprojects/org/netbeans/modules/ruby/railsprojects/ui/resources/existingApplication.html 42c42 < --- > 44c44 < --- > diff -r o/ruby2/ruby-railsprojects/ruby-railsprojects/org/netbeans/modules/ruby/railsprojects/ui/resources/rjs.html n/ruby2/ruby-railsprojects/ruby-railsprojects/org/netbeans/modules/ruby/railsprojects/ui/resources/rjs.html 6c6 < --- > diff -r o/ruby2/ruby-railsprojects/ruby-railsprojects/org/netbeans/modules/ruby/railsprojects/ui/wizards/Bundle.properties n/ruby2/ruby-railsprojects/ruby-railsprojects/org/netbeans/modules/ruby/railsprojects/ui/wizards/Bundle.properties 58d57 < TXT_RailsInstallation=Ruby on Rails Installation 61c60 < NoRuby=Ruby is not configured correctly; check options | Ruby | Platform --- > NoRuby=Ruby is not configured correctly. Check Tools > Ruby Platforms. 80,82d78 < #NOI18N < #TXT_ClassName={0}/main.rb < TXT_ClassName=main.rb 85d80 < TXT_PackageNameSuffix={0}pkg 88d82 < LAB_ConfigureSourceRoots=Existing Sources 90d83 < ERROR_IllegalMainClassName=Main Class name is not valid. 95,97d87 < CTL_AddSourceRoot=Browse Source Packages Folder < CTL_AddTestRoot=Browse Test Packages Folder < LBL_SourceDirectoriesLabel=Specify the folders containing the source folders and Ruby unit test folders 105d94 < MSG_ProjectFolderHasDeletedProject=Project Folder was just in use. Please restart the IDE to reuse folder. 107,113d95 < TXT_BuildXML="build.xml" file < TXT_BuildFolder="build" folder < TXT_DistFolder="dist" folder < TXT_Manifest="manifest.mf" file < MSG_IllegalSources=Source Packages Folder {0} does not exist. < MSG_IllegalTests=Test Packages Folder {0} does not exist. < MSG_IllegalProjectFolder=Project Folder has to be located outside of the folder containing packages. 118,133d99 < CTL_SourceRoots=Source Folders: < AD_SourceRoots=N/A < CTL_TestRoots=Test Folders: < AD_TestRoots=N/A < AD_AddSourceFolder=N/A < AD_RemoveSourceFolder=N/A < AD_AddTestFolder=N/A < AD_RemoveTestFolder=N/A < AN_PanelSourceFolders=N/A < AD_PanelSourceFolders=N/A < ACSD_setAsMainCheckBox=N/A < ACSN_createMainCheckBox=Create Main Class < ACSD_createMainCheckBox=Select checkbox to create main class in project. < LBL_createMainCheckBox=&Create Main File < ASCD_mainClassTextFiled=N/A < LBL_setAsMainCheckBox=Set as &Main Project 135d100 < ASCD_jPanel1=N/A 144,145d108 < ACSN_jLabel3=Select the folders that contain existing Java packages. < ACSD_jLabel3=N/A 154d116 < ASCN_mainClassTextFiled=Specify the name of project's Main Class. 161,174d122 < MSG_FoundClassFiles=

The specified package folder contains compiled class files (*.class).

\ <

Because the IDE generates compiled class files in

\ <

the "build" folder, it is recommended that you delete

\ <

the existing compiled class files.

\ <

Do you want do delete the class files now?

< MSG_FoundClassFiles_Title=New Java Project with Existing Sources < TXT_DeleteOption=Delete < TXT_KeepOption=Ignore < TXT_CancelOption=Cancel < AD_DeleteOption=N/A < AD_KeepOption=N/A < AD_CancelOption=N/A < CTL_AddFolder=Add Folder... < CTL_RemoveFolder=Remove 185,187d132 < RailsVersion=Installed version: {0} < Server=&Server: < Database=&Database: 190d134 < JRubyRequired=JDBC or WAR deployment requires JRuby as the selected Ruby interpreter 193,195d136 < JavaDB=JavaDB < OtherJDBC=Other (JDBC) < JdbcRequired={0} requires "Access Database Using JDBC" to be selected 227d167 < ASCD_DatabaseConfigPanel=N/A diff -r o/ruby2/ruby-rhtml/ruby-rhtml/org/netbeans/modules/ruby/rhtml/resources/Bundle.properties n/ruby2/ruby-rhtml/ruby-rhtml/org/netbeans/modules/ruby/rhtml/resources/Bundle.properties 6a7 > Loaders/application/x-httpd-eruby/Factories/org-netbeans-modules-ruby-rhtml-loaders-RhtmlDataLoader.instance=ERb and RHTML Files 160c161 < GSF_FLOAT_LITERAL=Ruby Floating point number --- > GSF_FLOAT_LITERAL=Ruby Floating Point Number diff -r o/ruby2/ruby-rhtml/ruby-rhtml/org/netbeans/modules/ruby/rhtml/resources/templatedesc.html n/ruby2/ruby-rhtml/ruby-rhtml/org/netbeans/modules/ruby/rhtml/resources/templatedesc.html 6c6 < --- > diff -r o/ruby2/ruby-testrunner/ruby-testrunner/org/netbeans/modules/ruby/testrunner/Bundle.properties n/ruby2/ruby-testrunner/ruby-testrunner/org/netbeans/modules/ruby/testrunner/Bundle.properties 5a6,8 > > # {0} - project name > AutoTest=AutoTest ({0}) \ No newline at end of file diff -r o/ruby2/ruby-testrunner/ruby-testrunner/org/netbeans/modules/ruby/testrunner/ui/Bundle.properties n/ruby2/ruby-testrunner/ruby-testrunner/org/netbeans/modules/ruby/testrunner/ui/Bundle.properties 43,50d42 < COMPOUND_SUITE= < UNNKOWN_NAME=??? < MSG_NoTestExecuted=No test was executed. < MSG_TestInterruptedNoResults=The test run was interrupted, no results available. < LBL_resultTreeView=Statistics < LBL_resultOutputView=Output < TTP_resultTreeView=Show statistics from the test < TTP_resultOutputView=Show output from the test 52,53c44 < ACSN_SplitOrientationButton = Switch orientation < ACSN_RerunButton = Re-run --- > ACSN_RerunButton = Rerun 55c46 < ACSD_ResultPanelTree=Displays information about passed, failed and errorneous tests in a tree structure --- > ACSD_ResultPanelTree=Displays in a tree structure information about passed, failed and erroneous tests 57d47 < ACSN_VerticalScrollbar=Vertical scrollbar of the results panel 78,83d67 < MSG_ProgressMessage=Running unit tests... < # "foo.bar.baz.MyClassTest (3/8)" < MSG_ProgressStepMessage={0} ({1}/{2}) < # "test suite 3/8" (running third suite out of eight suites) < MSG_ProgressStepMessageAnonymous=test suite {1}/{2} < 126c110 < MultiviewPanel.btnFilter.showFailures.tooltip=Show Failures only --- > MultiviewPanel.btnFilter.showFailures.tooltip=Show Failures Only 128,130c112 < MultiviewPanel.splitOrientation.vertical.tooltip=Switch to horizontal orientation < MultiviewPanel.splitOrientation.horizontal.tooltip=Switch to vertical orientation < MultiviewPanel.rerunButton.tooltip=Re-run --- > MultiviewPanel.rerunButton.tooltip=Rerun 137,138c119,124 < MSG_NextFailure = Next failure - Ctrl+Period < MSG_PreviousFailure = Previous failure - Ctrl+Comma \ No newline at end of file --- > MSG_NextFailure = Next Failure - Ctrl+Period > MSG_PreviousFailure = Previous Failure - Ctrl+Comma > # test results summary > MSG_TestSessionStarting = Running {0}... > MSG_TestSessionFinished = Finished in {0,number,0.0##} seconds. > MSG_TestSessionFinishedSummary = {0} tests, {1} failures, {2} errors diff -r o/soa2/bpel-core/bpel-core/org/netbeans/modules/bpel/core/wizard/createBpelFile.html n/soa2/bpel-core/bpel-core/org/netbeans/modules/bpel/core/wizard/createBpelFile.html 3,6c3,6 < < < < --- > > > > diff -r o/soa2/bpel-editors/bpel-editors/org/netbeans/modules/bpel/design/resources/errormessage.html n/soa2/bpel-editors/bpel-editors/org/netbeans/modules/bpel/design/resources/errormessage.html 3c3 < --- > diff -r o/soa2/bpel-editors-api/bpel-editors-api/org/netbeans/modules/bpel/editors/api/nodes/Bundle.properties n/soa2/bpel-editors-api/bpel-editors-api/org/netbeans/modules/bpel/editors/api/nodes/Bundle.properties 103c103 < SYSTEM_FAULTS_FOLDER=Standard Faults --- > STANDARD_FAULTS_FOLDER=Standard Faults diff -r o/soa2/bpel-project/bpel-project/org/netbeans/modules/bpel/project/resources/category.html n/soa2/bpel-project/bpel-project/org/netbeans/modules/bpel/project/resources/category.html 21,22c21,23 < < --- > > > diff -r o/soa2/bpel-project/bpel-project/org/netbeans/modules/bpel/project/resources/emptyProject.html n/soa2/bpel-project/bpel-project/org/netbeans/modules/bpel/project/resources/emptyProject.html 21,22c21,23 < < --- > > > diff -r o/soa2/bpel-project/bpel-project/org/netbeans/modules/bpel/project/ui/resources/emptyProject.html n/soa2/bpel-project/bpel-project/org/netbeans/modules/bpel/project/ui/resources/emptyProject.html 21c21 < --- > 23c23 < --- > diff -r o/soa2/bpel-project/bpel-project/org/netbeans/modules/bpel/project/ui/resources/icanpro.html n/soa2/bpel-project/bpel-project/org/netbeans/modules/bpel/project/ui/resources/icanpro.html 20c20 < --- > 22c22 < --- > diff -r o/soa2/bpel-validation/bpel-validation/org/netbeans/modules/bpel/validation/xpath/Bundle.properties n/soa2/bpel-validation/bpel-validation/org/netbeans/modules/bpel/validation/xpath/Bundle.properties 52c52 < FIX_To_PartnerLink=It is not allowed to make an Assign to a partnerlink that was defined only with myRole. --- > FIX_To_PartnerLink=It is not allowed to make an Assign to a partnerLink that was defined only with myRole. diff -r o/soa2/compapp-projects-base/compapp-projects-base/org/netbeans/modules/compapp/projects/base/ui/resources/emptyProject.html n/soa2/compapp-projects-base/compapp-projects-base/org/netbeans/modules/compapp/projects/base/ui/resources/emptyProject.html 21c21 < --- > 23c23 < --- > diff -r o/soa2/compapp-projects-base/compapp-projects-base/org/netbeans/modules/compapp/projects/base/ui/resources/icanpro.html n/soa2/compapp-projects-base/compapp-projects-base/org/netbeans/modules/compapp/projects/base/ui/resources/icanpro.html 20c20 < --- > 22c22 < --- > diff -r o/soa2/compapp-projects-jbi/compapp-projects-jbi/org/netbeans/modules/compapp/projects/jbi/ui/resources/emptyProject.html n/soa2/compapp-projects-jbi/compapp-projects-jbi/org/netbeans/modules/compapp/projects/jbi/ui/resources/emptyProject.html 44c44 < --- > 46c46 < --- > diff -r o/soa2/compapp-projects-jbi/compapp-projects-jbi/org/netbeans/modules/compapp/projects/jbi/ui/resources/jbi.html n/soa2/compapp-projects-jbi/compapp-projects-jbi/org/netbeans/modules/compapp/projects/jbi/ui/resources/jbi.html 42c42 < --- > 44c44 < --- > diff -r o/soa2/sql-project/sql-project/org/netbeans/modules/sql/project/ui/resources/emptyProject.html n/soa2/sql-project/sql-project/org/netbeans/modules/sql/project/ui/resources/emptyProject.html 15c15 < --- > 17c17 < --- > diff -r o/soa2/sql-project/sql-project/org/netbeans/modules/sql/project/ui/resources/sqlpro.html n/soa2/sql-project/sql-project/org/netbeans/modules/sql/project/ui/resources/sqlpro.html 14c14 < --- > 16c16 < --- > Only in n/soa2/xslt-core/xslt-core/org/netbeans/modules/xslt/core/text/completion: support diff -r o/soa2/xslt-project/xslt-project/org/netbeans/modules/xslt/project/resources/ejbjar.html n/soa2/xslt-project/xslt-project/org/netbeans/modules/xslt/project/resources/ejbjar.html 20c20 < --- > 22c22 < --- > diff -r o/soa2/xslt-project/xslt-project/org/netbeans/modules/xslt/project/resources/emptyProject.html n/soa2/xslt-project/xslt-project/org/netbeans/modules/xslt/project/resources/emptyProject.html 15c15 < --- > 17c17 < --- > diff -r o/soa2/xslt-project/xslt-project/org/netbeans/modules/xslt/project/resources/xslt.html n/soa2/xslt-project/xslt-project/org/netbeans/modules/xslt/project/resources/xslt.html 3,4c3,5 < < --- > > > diff -r o/vw2/vw-dataconnectivity/vw-dataconnectivity/org/netbeans/modules/visualweb/dataconnectivity/naming/Bundle.properties n/vw2/vw-dataconnectivity/vw-dataconnectivity/org/netbeans/modules/visualweb/dataconnectivity/naming/Bundle.properties 44a45 > REGISTERING_JAVADB_DATABASES=Registering JavaDB sample databases diff -r o/vw2/vw-dataconnectivity/vw-dataconnectivity/org/netbeans/modules/visualweb/dataconnectivity/sql/Bundle.properties n/vw2/vw-dataconnectivity/vw-dataconnectivity/org/netbeans/modules/visualweb/dataconnectivity/sql/Bundle.properties 54a55 > MSG_NameNotFoundMessage=Data source name was not found. Ensure the JDBC connection pool information saved in the project is correct. \ No newline at end of file diff -r o/vw2/vw-project-jsf/vw-project-jsf/org/netbeans/modules/visualweb/project/jsf/framework/Bundle.properties n/vw2/vw-project-jsf/vw-project-jsf/org/netbeans/modules/visualweb/project/jsf/framework/Bundle.properties 185a186,188 > > JSF_MAX_SIZE=The maximum allowed upload size in bytes. If this is set to a negative value, there is no maximum. The default value is 1000000. > JSF_SIZE_THRESHOLD=The size (in bytes) of an uploaded file which, if it is exceeded, will cause the file to be written directly to disk instead of stored in memory. Files smaller than or equal to this size will be stored in memory. The default value is 4096. diff -r o/vw2/vw-project-jsf/vw-project-jsf/org/netbeans/modules/visualweb/project/jsf/resources/templates/descriptions/WebFormTemplateHelp.html n/vw2/vw-project-jsf/vw-project-jsf/org/netbeans/modules/visualweb/project/jsf/resources/templates/descriptions/WebFormTemplateHelp.html 45c45 < --- > 47c47 < --- > diff -r o/vw2/vw-project-jsf/vw-project-jsf/org/netbeans/modules/visualweb/project/jsf/resources/templates/descriptions/applicationBeanTemplateHelp.html n/vw2/vw-project-jsf/vw-project-jsf/org/netbeans/modules/visualweb/project/jsf/resources/templates/descriptions/applicationBeanTemplateHelp.html 45c45 < --- > 47c47 < --- > diff -r o/vw2/vw-project-jsf/vw-project-jsf/org/netbeans/modules/visualweb/project/jsf/resources/templates/descriptions/pageJavaTemplateHelp.html n/vw2/vw-project-jsf/vw-project-jsf/org/netbeans/modules/visualweb/project/jsf/resources/templates/descriptions/pageJavaTemplateHelp.html 45c45 < --- > 47c47 < --- > diff -r o/vw2/vw-project-jsf/vw-project-jsf/org/netbeans/modules/visualweb/project/jsf/resources/templates/descriptions/requestBeanTemplateHelp.html n/vw2/vw-project-jsf/vw-project-jsf/org/netbeans/modules/visualweb/project/jsf/resources/templates/descriptions/requestBeanTemplateHelp.html 45c45 < --- > 47c47 < --- > diff -r o/vw2/vw-project-jsf/vw-project-jsf/org/netbeans/modules/visualweb/project/jsf/resources/templates/descriptions/sessionBeanTemplateHelp.html n/vw2/vw-project-jsf/vw-project-jsf/org/netbeans/modules/visualweb/project/jsf/resources/templates/descriptions/sessionBeanTemplateHelp.html 45c45 < --- > 47c47 < --- > diff -r o/vw2/vw-project-jsf/vw-project-jsf/org/netbeans/modules/visualweb/project/jsf/resources/templates/descriptions/stylesheetTemplateHelp.html n/vw2/vw-project-jsf/vw-project-jsf/org/netbeans/modules/visualweb/project/jsf/resources/templates/descriptions/stylesheetTemplateHelp.html 45c45 < --- > 47c47 < --- > diff -r o/vw2/vw-project-jsf/vw-project-jsf/org/netbeans/modules/visualweb/project/jsf/resources/templates/descriptions/webappsTemplateHelp.html n/vw2/vw-project-jsf/vw-project-jsf/org/netbeans/modules/visualweb/project/jsf/resources/templates/descriptions/webappsTemplateHelp.html 45c45 < --- > 47c47 < --- > diff -r o/webcommon1/web-client-tools-firefox/web-client-tools-firefox/org/netbeans/modules/web/client/tools/firefox/Bundle.properties n/webcommon1/web-client-tools-firefox/web-client-tools-firefox/org/netbeans/modules/web/client/tools/firefox/Bundle.properties 42a43 > DO_NOT_INSTALL_BUTTON=&Do Not Install diff -r o/webcommon1/web-client-tools-impl/web-client-tools-impl/org/netbeans/modules/web/client/javascript/debugger/api/Bundle.properties n/webcommon1/web-client-tools-impl/web-client-tools-impl/org/netbeans/modules/web/client/javascript/debugger/api/Bundle.properties 21c21,23 < MSG_CONSOLE_CLOSE_JAVASCRIPT_DEBUGGER=Closing JavaScript Debugger Session \ No newline at end of file --- > MSG_CONSOLE_CLOSE_JAVASCRIPT_DEBUGGER=Closing JavaScript Debugger Session > > MSG_TASK_INITIALIZING_JAVASCRIPT_DEBUGGER=Starting JavaScript Debugger Session diff -r o/webcommon1/web-client-tools-impl/web-client-tools-impl/org/netbeans/modules/web/client/javascript/debugger/attach/Bundle.properties n/webcommon1/web-client-tools-impl/web-client-tools-impl/org/netbeans/modules/web/client/javascript/debugger/attach/Bundle.properties 1c1 < CTL_URLAttachPanel_name=Web Page Debugger (Javascript) --- > CTL_URLAttachPanel_name=Web Page Debugger (JavaScript) 3c3 < URLAttachPanel.firefoxRadioButton.text=&Firefox (version 2.0.0.x only) --- > URLAttachPanel.firefoxRadioButton.text=&Firefox 10c10,12 < URLAttachPanel_noSupportedBrowserMsg=No supported client-side debugging browsers are configured in the IDE \ No newline at end of file --- > URLAttachPanel_noSupportedBrowserMsg=No supported client-side debugging browsers are configured in the IDE > URLAttachPanel.jButton1.AccessibleContext.accessibleDescription=Browse the local file system for web pages > URLAttachPanel.browseButton.text=&Browse diff -r o/webcommon1/web-client-tools-impl/web-client-tools-impl/org/netbeans/modules/web/client/javascript/debugger/ui/breakpoints/customizer/Bundle.properties n/webcommon1/web-client-tools-impl/web-client-tools-impl/org/netbeans/modules/web/client/javascript/debugger/ui/breakpoints/customizer/Bundle.properties 48c48 < ACSD_L_Line_Breakpoint_Line_Number=Line number --- > ACSD_L_Line_Breakpoint_Line_Number=&Line number 59a60,61 > MSG_NotAFILE=Please enter a valid file name. > 111a114,118 > > LBL_CategoryName=JavaScript > LBL_URLBreakpointType=URL > LBL_FileBreakpointType=File > diff -r o/webcommon1/web-client-tools-impl/web-client-tools-impl/org/netbeans/modules/web/client/javascript/debugger/ui/options/Bundle.properties n/webcommon1/web-client-tools-impl/web-client-tools-impl/org/netbeans/modules/web/client/javascript/debugger/ui/options/Bundle.properties 52a53,57 > NbJSPreferencesPanelProvider.ffProfileLabel.text=Firefox &Profile Location: > NbJSPreferencesPanelProvider.ffProfileBrowseButton.text=&Browse > NbJSPreferencesPanelProvider.errorLabel.text=Location must be a directory > NbJSPreferencesPanelProvider.ffProfileTextField.AccessibleContext.accessibleDescription=Set the Firefox profile location > NbJSPreferencesPanelProvider.ffProfileBrowseButton.AccessibleContext.accessibleDescription=Select a Firefox browser profile directory diff -r o/webcommon1/web-client-tools-impl/web-client-tools-impl/org/netbeans/modules/web/client/tools/impl/Bundle.properties n/webcommon1/web-client-tools-impl/web-client-tools-impl/org/netbeans/modules/web/client/tools/impl/Bundle.properties 54c54 < DEBUG_CONFIG_TITLE=Client Side Debugging --- > DEBUG_CONFIG_TITLE=Client Side JavaScript Debugging diff -r o/webcommon1/web-client-tools-impl/web-client-tools-impl/org/netbeans/modules/web/client/tools/impl/projects/Bundle.properties n/webcommon1/web-client-tools-impl/web-client-tools-impl/org/netbeans/modules/web/client/tools/impl/projects/Bundle.properties 43c43 < ACS_CustomizeDebug_ClientDebug_A11YDesc=Debug Client side on debug checkbox --- > ACS_CustomizeDebug_ClientDebug_A11YDesc=Debug Client side JavaScript on debug checkbox 46,47c46,47 < LBL_Web_CustomizeDebug_ServerDebug_JCheckBox=Debug Web Application (&Server side) < LBL_Web_CustomizeDebug_ClientDebug_JCheckBox=Debug Web Application (&Client side) --- > LBL_Web_CustomizeDebug_ServerDebug_JCheckBox=Debug Web Application (&Server side Java) > LBL_Web_CustomizeDebug_ClientDebug_JCheckBox=Debug Web Application (&Client side JavaScript) 50,51c50,51 < LBL_Rails_CustomizeDebug_ServerDebug_JCheckBox=Debug Rails Application (&Server side) < LBL_Rails_CustomizeDebug_ClientDebug_JCheckBox=Debug Rails Application (&Client side) --- > LBL_Rails_CustomizeDebug_ServerDebug_JCheckBox=Debug Rails Application (&Server side Ruby) > LBL_Rails_CustomizeDebug_ClientDebug_JCheckBox=Debug Rails Application (&Client side JavaScript) 57c57 < CustomizerDebug.firefoxRadioButton.text=&Firefox (version 2.0.0.x only) --- > CustomizerDebug.firefoxRadioButton.text=&Firefox 61c61 < ACSD_FF_RadioButton=Select Firefox version 2.0.0.x only. --- > ACSD_FF_RadioButton=Select Firefox. diff -r o/webcommon1/web-client-tools-impl/web-client-tools-impl/org/netbeans/modules/web/client/tools/impl/ui/Bundle.properties n/webcommon1/web-client-tools-impl/web-client-tools-impl/org/netbeans/modules/web/client/tools/impl/ui/Bundle.properties 37,38c37,38 < DebugConfigPanel.debugCheckBox.text=Enable Client-Side &Debugging < DebugConfigPanel.firefoxRadioButton.text=&Firefox (version 2.0.0.x only) --- > DebugConfigPanel.debugCheckBox.text=Enable Client-Side JavaScript &Debugging > DebugConfigPanel.firefoxRadioButton.text=&Firefox diff -r o/websvccommon1/websvc-saas-api/websvc-saas-api/org/netbeans/modules/websvc/saas/model/Bundle.properties n/websvccommon1/websvc-saas-api/websvc-saas-api/org/netbeans/modules/websvc/saas/model/Bundle.properties 57a58 > MSG_FailedToRetrieve=Failed to retrieved diff -r o/xml2/xml-schema/xml-schema/org/netbeans/modules/xml/schema/resources/retrieveSchemaResource.html n/xml2/xml-schema/xml-schema/org/netbeans/modules/xml/schema/resources/retrieveSchemaResource.html 3c3 < --- > 5c5 < --- > diff -r o/xml2/xml-schema/xml-schema/org/netbeans/modules/xml/schema/resources/retrieveWSDLResource.html n/xml2/xml-schema/xml-schema/org/netbeans/modules/xml/schema/resources/retrieveWSDLResource.html 3c3 < --- > 5c5 < --- > diff -r o/xml2/xml-schema/xml-schema/org/netbeans/modules/xml/schema/wizard/templates/LoanApplication.html n/xml2/xml-schema/xml-schema/org/netbeans/modules/xml/schema/wizard/templates/LoanApplication.html 43c43 < --- > 45,46c45,47 < < --- > > > diff -r o/xml2/xml-schema/xml-schema/org/netbeans/modules/xml/schema/wizard/templates/PurchaseOrder.html n/xml2/xml-schema/xml-schema/org/netbeans/modules/xml/schema/wizard/templates/PurchaseOrder.html 43c43 < --- > 45,46c45,47 < < --- > > > diff -r o/xml2/xml-schema/xml-schema/org/netbeans/modules/xml/schema/wizard/templates/XMLSchema.html n/xml2/xml-schema/xml-schema/org/netbeans/modules/xml/schema/wizard/templates/XMLSchema.html 43c43 < --- > 45,46c45,47 < < --- > > > diff -r o/xml2/xml-wsdlui/xml-wsdlui/org/netbeans/modules/xml/wsdl/ui/netbeans/module/resources/template.html n/xml2/xml-wsdlui/xml-wsdlui/org/netbeans/modules/xml/wsdl/ui/netbeans/module/resources/template.html 1c1 < --- > 3c3 < --- > diff -r o/xml2/xml-wsdlui/xml-wsdlui/org/netbeans/modules/xml/wsdl/ui/wizard/newWSDL.html n/xml2/xml-wsdlui/xml-wsdlui/org/netbeans/modules/xml/wsdl/ui/wizard/newWSDL.html 5c5 < --- >