diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/PluginResources.properties b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/PluginResources.properties index 31ea502a629..f3f104d4f7b 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/PluginResources.properties +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/PluginResources.properties @@ -28,8 +28,8 @@ ManagedMakeBuilder.message.error.refresh = Error refreshing project ManagedMakeBuilder.message.finished = Build complete for project {0} ManagedMakeBuilder.message.cancelled = Build cancelled ManagedMakeBuilder.message.finished.with.errs = Build completed with errors -ManagedMakeBuilder.message.internal.builder.error = Build failed: Internal builder error occured -ManagedMakeBuilder.message.stopped.error=Build error occured, build is stopped +ManagedMakeBuilder.message.internal.builder.error = Build failed: Internal builder error occurred +ManagedMakeBuilder.message.stopped.error=Build error occurred, build is stopped ManagedMakeBuilder.message.clean.deleting.output=Removing build artifacts from {0} ManagedMakeBuilder.message.clean.build.clean=Trying a make clean in {0} ManagedMakeBuilder.type.clean = Clean-only build @@ -67,7 +67,7 @@ MakefileGenerator.message.finish.file=Finished building: MakefileGenerator.message.start.build=Building target: MakefileGenerator.message.finish.build=Finished building target: MakefileGenerator.message.start.dependency=Regenerating dependency file: -MakefileGenerator.message.no.target=No tool found that can build the extension specified with the build arrtifact name +MakefileGenerator.message.no.target=No tool found that can build the extension specified with the build artifact name MakefileGenerator.message.adding.source.folder=Adding folder {0} to sources MakefileGenerator.message.gen.source.makefile=Generating makefile for source folder {0} MakefileGenerator.message.calc.delta=Calculating the delta for project {0} @@ -109,14 +109,14 @@ UserDefinedMacroSupplier.storeOutputStream.wrong.arguments=Failed to persist mac # BuildMacroStatus messages BuildMacroStatus.status.macro.undefined=Macro {0} is undefined BuildFilesAction.buildingSelectedFiles=Building Selected Files -BuildDescriptionGnuMakefileGenerator.0=IO exception occured: -BuildDescriptionGnuMakefileGenerator.1=IO exception occured: +BuildDescriptionGnuMakefileGenerator.0=IO exception occurred: +BuildDescriptionGnuMakefileGenerator.1=IO exception occurred: BuildFilesAction.buildSelectedFile=Build the selected file. BuildMacroStatus.status.reference.eachother=Macros {0} and {1} reference each other BuildMacroStatus.status.reference.incorrect=Macro {0} reference is incorrect BuildMacroStatus.status.macro.not.string=Macro {0} is not of String type BuildMacroStatus.status.macro.not.stringlist=Macro {0} is not of String-list type -BuildMacroStatus.status.error=Error occured +BuildMacroStatus.status.error=Error occurred BuildMacroStatus.value.undefined= BuildInfoFactory.Missing_Builder=Missing Builder: @@ -156,7 +156,7 @@ CommonBuilder.16=can not clean programmatically: build workspace path is not the CommonBuilder.12=can not clean programmatically: build workspace path is not folder CommonBuilder.13=can not clean programmatically: build folder is not accessible CommonBuilder.22=Building referenced configurations.. -CommonBuilder.23=Buildfile generation error occured.. +CommonBuilder.23=Buildfile generation error occurred.. CommonBuilder.24=Build stopped.. MakeBuilder.buildError= ResourceChangeHandler2.0=project build settings update job diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/messages.properties b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/messages.properties index 074e9049441..20eb8f6c0a3 100644 --- a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/messages.properties +++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/messages.properties @@ -85,17 +85,17 @@ WizardDefaultsTab.0=Show only supported toolchains, by default WizardDefaultsTab.1=Group old-style toolchains to folder PreferredToolchainsTab.0=Preferred toolchain will be selected by default in Wizard PreferredToolchainsTab.1=Make toolchain(s) preferred -PreferredToolchainsTab.2=Make toolchain(s) unpreferred +PreferredToolchainsTab.2=Make toolchain(s) not preferred StdProjectTypeHandler.0=-- Other Toolchain -- StdProjectTypeHandler.2=Default StdProjectTypeHandler.3=creation Make project: IBuilder is null CNewWizard.0=Others CWizardHandler.0=Toolchain: -CWizardHandler.1=Tool chain is a set of tools\n +CWizardHandler.1=A Toolchain is a set of tools\n CWizardHandler.2=(compiler, linker, assembler)\n CWizardHandler.3=intended to build your project.\n -CWizardHandler.4=Additional tools, like debugger,\n -CWizardHandler.5=can be assotiated with tool chain. +CWizardHandler.4=Additional tools, like a debugger,\n +CWizardHandler.5=can be associated with a toolchain. CWizardHandler.6=Cannot create managed project with NULL configuration StdBuildWizard.0=Makefile project MBSWizardHandler.0=At least one toolchain should be selected diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/PluginResources.properties b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/PluginResources.properties index d1c86f68760..db243069521 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/PluginResources.properties +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/PluginResources.properties @@ -45,7 +45,7 @@ MBSCustomPageManager.error6=Missing nature ID # ----------- Managed Build Preference Page ----------- BuildPreferencePage.label.Settings=Workspace Settings BuildPreferencePage.job.rebuild=Rebuilding the Managed Projects -BuildPreferencePage.apply.internal.error=An Internal error has occured please check error log. +BuildPreferencePage.apply.internal.error=An Internal error has occurred. Please check error log. #--------------- Resource Configuration Selection Page -------------- ResourceBuildPropertyPage.defaults.title=Reset Resource Configuration Tool @@ -75,7 +75,7 @@ BuildSettingsBlock.label.internal.builder.parallel.head=Parallel build BuildSettingsBlock.label.internal.builder.parallel.use=Enable parallel build BuildSettingsBlock.label.internal.builder.parallel.default=Use optimal jobs number BuildSettingsBlock.label.internal.builder.parallel.number=Use parallel jobs: -BuildSettingsBlock.label.internal.builder.parallel.tooltip=Select number of jobs really used for build +BuildSettingsBlock.label.internal.builder.parallel.tooltip=Select the number of jobs to be used for the build # ----------- Build Steps Block ----------- BuildStepSettingsBlock.label.Settings=Build Steps @@ -278,7 +278,7 @@ ManageConfigDialog.0=Manage configurations... ManageConfig.tip.conversionTarget=A list of conversion targets available for the selected configuration # Toolchain Conversion Target confirmation Dialog -ConfigurationConvert.confirmdialog.message=Currently the "{0}" Configuration uses "{1}" tool-chain. After conversion it will use "{2}" tool-chain. Do you want to proceed? +ConfigurationConvert.confirmdialog.message=Currently the "{0}" Configuration uses "{1}" toolchain. After conversion it will use "{2}" toolchain. Do you want to proceed? ConfigurationConvert.confirmdialog.title=Confirm Configuration Conversion # ----------- Build Property Common ----------- @@ -320,7 +320,7 @@ FileListControl.button.fs=File system... # ----------- Property Page ---------- MngMakeProjectPropertyPage.closedproject=Project Closed -MngMakeProjectPropertyPage.internalError=An Internal error has occur please check error log. +MngMakeProjectPropertyPage.internalError=An Internal error has occurred. Please check error log. # Copies from org.eclipse.ui.workbench showAdvanced = &Advanced >> @@ -332,7 +332,7 @@ ProjectConvert.confirmdialog.title=Confirm Project Conversion ProjectConvert.confirmdialog.message=The selected project {0} will be converted. Do you want to proceed ? ProjectConvert.conversionErrordialog.title=Project Conversion Error -ProjectConvert.conversionErrordialog.message=Error has occured during the conversion of the project {0} . +ProjectConvert.conversionErrordialog.message=Error has occurred during the conversion of the project {0} . ProjectConvert.noConverterErrordialog.title=Project Conversion Error ProjectConvert.noConverterErrordialog.message=There are no converters available to convert the project {0} . @@ -349,8 +349,8 @@ PropertyPageDefsTab.15=Center dialogs on screen PropertyPageDefsTab.2=Enable multiple configurations setting PropertyPageDefsTab.4=Display "Tool chain editor" tab PropertyPageDefsTab.5=Discovery profiles naming rule -PropertyPageDefsTab.6=Show disc. page names if they're unique. Else names + profile IDs. -PropertyPageDefsTab.7=Show disc. page names if they're unique. Else show profile IDs. +PropertyPageDefsTab.6=Show disc. page names if they are unique. Else names + profile IDs. +PropertyPageDefsTab.7=Show disc. page names if they are unique. Else show profile IDs. PropertyPageDefsTab.8=Always show names + profile IDs PropertyPageDefsTab.9=Always show profile IDs only ProjectConvert.convertersList=Converters List @@ -414,7 +414,7 @@ AbstractLangsListTab.1=Languages AbstractLangsListTab.2=Export AbstractLangsListTab.3=\ [exp] AbstractLangsListTab.4=Unexport -AbstractPrefPage.0=\ Preference settings will be applied to new projects \n only in case when there was no toolchains selected. +AbstractPrefPage.0=\ Preference settings will be applied to new projects \n only when there were no toolchains selected. AbstractExportTab.0=[All] AbstractExportTab.1=[List] AbstractExportTab.2=Create