diff -r 0508/apisupport/apisupport-kit/apisupport-kit/org/netbeans/modules/apisupport/kit/Bundle.properties 0609/apisupport/apisupport-kit/apisupport-kit/org/netbeans/modules/apisupport/kit/Bundle.properties 2a3,5 > For the list of included fixed bugs please check http://wiki.netbeans.org/NetBeans6.1PatchesInfo. \ >
\ >
\ diff -r 0508/cnd/cnd/cnd/org/netbeans/modules/cnd/ui/options/Bundle.properties 0609/cnd/cnd/cnd/org/netbeans/modules/cnd/ui/options/Bundle.properties 193a194 > TP_ErrorMessage_UnsupportedMake={0} is incompatible and is not supported. Use make from MSYS. diff -r 0508/cnd/cnd-kit/cnd-kit/org/netbeans/modules/cnd/kit/Bundle.properties 0609/cnd/cnd-kit/cnd-kit/org/netbeans/modules/cnd/kit/Bundle.properties 2a3,5 > For the list of included fixed bugs please check http://wiki.netbeans.org/NetBeans6.1PatchesInfo. \ >
\ >
\ diff -r 0508/enterprise/j2ee-jboss4/j2ee-jboss4/org/netbeans/modules/j2ee/jboss4/resources/Bundle.properties 0609/enterprise/j2ee-jboss4/j2ee-jboss4/org/netbeans/modules/j2ee/jboss4/resources/Bundle.properties 4c4,8 < OpenIDE-Module-Long-Description=The plugin enables J2EE development modules to configure and deploy J2EE components on JBoss Application Server. --- > OpenIDE-Module-Long-Description=\ > For the list of included fixed bugs please check http://wiki.netbeans.org/NetBeans6.1PatchesInfo. \ >
\ >
\ > The plugin enables J2EE development modules to configure and deploy J2EE components on JBoss Application Server. diff -r 0508/enterprise/j2ee-kit/j2ee-kit/org/netbeans/modules/j2ee/kit/Bundle.properties 0609/enterprise/j2ee-kit/j2ee-kit/org/netbeans/modules/j2ee/kit/Bundle.properties 4c4,8 < OpenIDE-Module-Long-Description=Provides support for developing J2EE / Java EE applications: managing projects for the Java EE module types, creating and editing Enterprise JavaBeans, refactoring, deploying and debugging. --- > OpenIDE-Module-Long-Description=\ > For the list of included fixed bugs please check http://wiki.netbeans.org/NetBeans6.1PatchesInfo. \ >
\ >
\ > Provides support for developing J2EE / Java EE applications: managing projects for the Java EE module types, creating and editing Enterprise JavaBeans, refactoring, deploying and debugging. diff -r 0508/enterprise/spring-webmvc/spring-webmvc/org/netbeans/modules/spring/webmvc/Bundle.properties 0609/enterprise/spring-webmvc/spring-webmvc/org/netbeans/modules/spring/webmvc/Bundle.properties 20d19 < MSG_WELCOME_PAGE_TEXT=Hello! This is the default welcome page for a Spring Web MVC project.


To display a different welcome page for this project, modify index.jsp , or
create your own welcome page then change the redirection in
redirect.jsp to point to the new welcome page
and also update the welcome-file setting in
web.xml. diff -r 0508/enterprise/spring-webmvc/spring-webmvc/org/netbeans/modules/spring/webmvc/resources/Bundle.properties 0609/enterprise/spring-webmvc/spring-webmvc/org/netbeans/modules/spring/webmvc/resources/Bundle.properties 4c4,8 < OpenIDE-Module-Long-Description=Provides support for extending a web project with the Spring Web MVC framework. --- > OpenIDE-Module-Long-Description=\ > For the list of included fixed bugs please check http://wiki.netbeans.org/NetBeans6.1PatchesInfo. \ >
\ >
\ > Provides support for extending a web project with the Spring Web MVC framework. diff -r 0508/enterprise/web-jsf-kit/web-jsf-kit/org/netbeans/modules/web/jsf/kit/Bundle.properties 0609/enterprise/web-jsf-kit/web-jsf-kit/org/netbeans/modules/web/jsf/kit/Bundle.properties 4a5,7 > For the list of included fixed bugs please check http://wiki.netbeans.org/NetBeans6.1PatchesInfo. \ >
\ >
\ diff -r 0508/enterprise/web-kit/web-kit/org/netbeans/modules/web/kit/Bundle.properties 0609/enterprise/web-kit/web-kit/org/netbeans/modules/web/kit/Bundle.properties 4c4,8 < OpenIDE-Module-Long-Description=Provides support for developing web applications in Java: \ --- > OpenIDE-Module-Long-Description=\ > For the list of included fixed bugs please check http://wiki.netbeans.org/NetBeans6.1PatchesInfo. \ >
\ >
\ > Provides support for developing web applications in Java: \ diff -r 0508/enterprise/websvc-kit/websvc-kit/org/netbeans/modules/websvc/kit/Bundle.properties 0609/enterprise/websvc-kit/websvc-kit/org/netbeans/modules/websvc/kit/Bundle.properties 4c4,8 < OpenIDE-Module-Long-Description=Provides generic support for development and consumption of web services. --- > OpenIDE-Module-Long-Description=\ > For the list of included fixed bugs please check http://wiki.netbeans.org/NetBeans6.1PatchesInfo. \ >
\ >
\ > Provides generic support for development and consumption of web services. diff -r 0508/enterprise/websvc-restkit/websvc-restkit/org/netbeans/modules/websvc/restkit/Bundle.properties 0609/enterprise/websvc-restkit/websvc-restkit/org/netbeans/modules/websvc/restkit/Bundle.properties 2a3,5 > For the list of included fixed bugs please check http://wiki.netbeans.org/NetBeans6.1PatchesInfo. \ >
\ >
\ diff -r 0508/gsf/editor-kit/editor-kit/org/netbeans/modules/editor/kit/Bundle.properties 0609/gsf/editor-kit/editor-kit/org/netbeans/modules/editor/kit/Bundle.properties 2a3,5 > For the list of included fixed bugs please check http://wiki.netbeans.org/NetBeans6.1PatchesInfo. \ >
\ >
\ diff -r 0508/gsf/javascript-editing/javascript-editing/org/netbeans/modules/javascript/editing/Bundle.properties 0609/gsf/javascript-editing/javascript-editing/org/netbeans/modules/javascript/editing/Bundle.properties 92a93 > RenameOnlyParams=Can only rename @param parameter values 93a95,96 > UnsafeIdentifierName=Only a-z, A-Z, digits and underscore are safe in identifiers > diff -r 0508/ide/db-kit/db-kit/org/netbeans/modules/db/kit/Bundle.properties 0609/ide/db-kit/db-kit/org/netbeans/modules/db/kit/Bundle.properties 2a3,5 > For the list of included fixed bugs please check http://wiki.netbeans.org/NetBeans6.1PatchesInfo. \ >
\ >
\ diff -r 0508/ide/ide-kit/ide-kit/org/netbeans/modules/ide/kit/Bundle.properties 0609/ide/ide-kit/ide-kit/org/netbeans/modules/ide/kit/Bundle.properties 2a3,5 > For the list of included fixed bugs please check http://wiki.netbeans.org/NetBeans6.1PatchesInfo. \ >
\ >
\ diff -r 0508/ide/mercurial/mercurial/org/netbeans/modules/mercurial/Bundle.properties 0609/ide/mercurial/mercurial/org/netbeans/modules/mercurial/Bundle.properties 2a3,5 > For the list of included fixed bugs please check http://wiki.netbeans.org/NetBeans6.1PatchesInfo. \ >
\ >
\ diff -r 0508/ide/mercurial/mercurial/org/netbeans/modules/mercurial/options/Bundle.properties 0609/ide/mercurial/mercurial/org/netbeans/modules/mercurial/options/Bundle.properties 52c52 < MSG_WARN_USER_NAME_TEXT = The text specified in the Mercurial User Name is not a valid email address. --- > MSG_WARN_USER_NAME_TEXT = The specified username is not a valid email address.\n\nThe username has not been changed. 62c62 < PropertiesPanel.btnAdd.text=&Add --- > PropertiesPanel.btnAdd.text=&Add/ Change diff -r 0508/ide/mercurial/mercurial/org/netbeans/modules/mercurial/ui/properties/Bundle.properties 0609/ide/mercurial/mercurial/org/netbeans/modules/mercurial/ui/properties/Bundle.properties 16a17,19 > > MSG_WARN_FIELD_TITLE = Invalid Property > MSG_WARN_USER_NAME_TEXT = The specified username is not a valid email address.\n\nThe username has not been changed. diff -r 0508/ide/mercurial/mercurial/org/netbeans/modules/mercurial/ui/pull/Bundle.properties 0609/ide/mercurial/mercurial/org/netbeans/modules/mercurial/ui/pull/Bundle.properties 2,3c2,5 < MSG_PULL_FROM = INFO Pull From: {0} - {1} < MSG_PULL_FROM_NONAME = INFO Pull From: {0} --- > MSG_PULL_FROM = INFO Pulled From: {0} - {1} > MSG_PULLING_FROM = INFO Pulling From: {0} - {1} ... > MSG_PULL_FROM_NONAME = INFO Pulled From: {0} > MSG_PULLING_FROM_NONAME = INFO Pulling From: {0} ... diff -r 0508/ide/mercurial/mercurial/org/netbeans/modules/mercurial/ui/push/Bundle.properties 0609/ide/mercurial/mercurial/org/netbeans/modules/mercurial/ui/push/Bundle.properties 2c2,3 < MSG_PUSH_TO = INFO Push To: {0} - {1} --- > MSG_PUSH_TO = INFO Pushed To: {0} - {1} > MSG_PUSHING_TO = INFO Pushing To: {0} - {1} ... 5c6,7 < MSG_PUSH_TO_NONAME = INFO Push To: {0} --- > MSG_PUSH_TO_NONAME = INFO Pushed To: {0} > MSG_PUSHING_TO_NONAME = INFO Pushing To: {0} ... diff -r 0508/java/debugger-jpda-ui/debugger-jpda-ui/org/netbeans/modules/debugger/jpda/ui/Bundle.properties 0609/java/debugger-jpda-ui/debugger-jpda-ui/org/netbeans/modules/debugger/jpda/ui/Bundle.properties 4c4,8 < OpenIDE-Module-Long-Description=Contains UI for Java Debugger implementation. --- > OpenIDE-Module-Long-Description=\ > For the list of included fixed bugs please check http://wiki.netbeans.org/NetBeans6.1PatchesInfo. \ >
\ >
\ > Contains UI for Java Debugger implementation. diff -r 0508/java/form-kit/form-kit/org/netbeans/modules/form/kit/Bundle.properties 0609/java/form-kit/form-kit/org/netbeans/modules/form/kit/Bundle.properties 4c4,8 < OpenIDE-Module-Long-Description=The GUI Builder enables you to visually design Java desktop (AWT and Swing) applications. It includes special support for GroupLayout, the Swing Application Framework (JSR 296), and the Beans Binding specification (JSR 295). --- > OpenIDE-Module-Long-Description=\ > For the list of included fixed bugs please check http://wiki.netbeans.org/NetBeans6.1PatchesInfo. \ >
\ >
\ > The GUI Builder enables you to visually design Java desktop (AWT and Swing) applications. It includes special support for GroupLayout, the Swing Application Framework (JSR 296), and the Beans Binding specification (JSR 295). diff -r 0508/java/j2ee-jpa-verification/j2ee-jpa-verification/org/netbeans/modules/j2ee/jpa/verification/rules/attribute/Bundle.properties 0609/java/j2ee-jpa-verification/j2ee-jpa-verification/org/netbeans/modules/j2ee/jpa/verification/rules/attribute/Bundle.properties 12,13c12,13 < MSG_EntityRelationNotDefined=The entity relation is not defined. < MSG_MVEntityRelationNotDefined=The multi-valued entity relation is not defined. --- > MSG_EntityRelationNotDefined=The entity relationship is not defined. > MSG_MVEntityRelationNotDefined=The multi-valued entity relationship is not defined. diff -r 0508/java/j2ee-persistence-kit/j2ee-persistence-kit/org/netbeans/modules/j2ee/persistence/kit/Bundle.properties 0609/java/j2ee-persistence-kit/j2ee-persistence-kit/org/netbeans/modules/j2ee/persistence/kit/Bundle.properties 4c4,8 < OpenIDE-Module-Long-Description=Provides support for developing applications using the Java Persistence API: generating entity classes from a database or from scratch, hints and refactoring. --- > OpenIDE-Module-Long-Description=\ > For the list of included fixed bugs please check http://wiki.netbeans.org/NetBeans6.1PatchesInfo. \ >
\ >
\ > Provides support for developing applications using the Java Persistence API: generating entity classes from a database or from scratch, hints and refactoring. diff -r 0508/java/java-kit/java-kit/org/netbeans/modules/java/kit/Bundle.properties 0609/java/java-kit/java-kit/org/netbeans/modules/java/kit/Bundle.properties 3c3,7 < OpenIDE-Module-Long-Description=Provides the general infrastructure for handling Java code in the IDE. Includes features such as syntax highlighting, error marking, code completion, code templates, refactoring, and other coding productivity features. --- > OpenIDE-Module-Long-Description=\ > For the list of included fixed bugs please check http://wiki.netbeans.org/NetBeans6.1PatchesInfo. \ >
\ >
\ > Provides the general infrastructure for handling Java code in the IDE. Includes features such as syntax highlighting, error marking, code completion, code templates, refactoring, and other coding productivity features. diff -r 0508/mobility/mobility-kit/mobility-kit/org/netbeans/modules/mobility/kit/Bundle.properties 0609/mobility/mobility-kit/mobility-kit/org/netbeans/modules/mobility/kit/Bundle.properties 4a5,7 > For the list of included fixed bugs please check http://wiki.netbeans.org/NetBeans6.1PatchesInfo. \ >
\ >
\ diff -r 0508/mobility/vmd-kit/vmd-kit/org/netbeans/modules/vmd/kit/Bundle.properties 0609/mobility/vmd-kit/vmd-kit/org/netbeans/modules/vmd/kit/Bundle.properties 3c3,7 < 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-Long-Description=\ > For the list of included fixed bugs please check http://wiki.netbeans.org/NetBeans6.1PatchesInfo. \ >
\ >
\ > 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. diff -r 0508/nb/ide-branding-kit/ide-branding-kit/org/netbeans/modules/ide/branding/kit/Bundle.properties 0609/nb/ide-branding-kit/ide-branding-kit/org/netbeans/modules/ide/branding/kit/Bundle.properties 2a3,5 > For the list of included fixed bugs please check http://wiki.netbeans.org/NetBeans6.1PatchesInfo. \ >
\ >
\ diff -r 0508/profiler/profiler/profiler/org/netbeans/modules/profiler/Bundle.properties 0609/profiler/profiler/profiler/org/netbeans/modules/profiler/Bundle.properties 3c3,7 < OpenIDE-Module-Long-Description=NetBeans Profiler is a full-featured Java profiler adding CPU, Memory and Thread profiling functionality to the NetBeans IDE. --- > OpenIDE-Module-Long-Description=\ > For the list of included fixed bugs please check http://wiki.netbeans.org/NetBeans6.1PatchesInfo. \ >
\ >
\ > NetBeans Profiler is a full-featured Java profiler adding CPU, Memory and Thread profiling functionality to the NetBeans IDE. diff -r 0508/profiler/profiler-attach/profiler-attach/org/netbeans/modules/profiler/attach/panels/components/Bundle.properties 0609/profiler/profiler-attach/profiler-attach/org/netbeans/modules/profiler/attach/panels/components/Bundle.properties 42a43,53 > SELECT_PLATFORM=Select JVM Platform > MANAGE_PLATFORMS=&Manage platforms... > PLATFORMS_HINT=Only Java platforms supported by the Profiler are listed in the combo. You can add another Java platform using the "Manage platforms..." button. > > SELECT_JVM= > > STEP=Step {0}: > WARNING=Warning: > WARNINGS=Warnings: > NOTES=Notes: > NOTE=Hint: diff -r 0508/ruby/ruby-kit/ruby-kit/org/netbeans/modules/ruby/kit/Bundle.properties 0609/ruby/ruby-kit/ruby-kit/org/netbeans/modules/ruby/kit/Bundle.properties 4a5,7 > For the list of included fixed bugs please check http://wiki.netbeans.org/NetBeans6.1PatchesInfo. \ >
\ >
\ diff -r 0508/soa/bpel-kit/bpel-kit/org/netbeans/modules/bpel/kit/Bundle.properties 0609/soa/bpel-kit/bpel-kit/org/netbeans/modules/bpel/kit/Bundle.properties 2a3,5 > For the list of included fixed bugs please check http://wiki.netbeans.org/NetBeans6.1PatchesInfo. \ >
\ >
\ diff -r 0508/soa/bpel-validation/bpel-validation/org/netbeans/modules/bpel/validation/runtime/Bundle.properties 0609/soa/bpel-validation/bpel-validation/org/netbeans/modules/bpel/validation/runtime/Bundle.properties 8a9,10 > FIX_Compare_Time=Currently runtime does not support the equality or comparison operators for time and duration types. > diff -r 0508/soa/bpel-validation/bpel-validation/org/netbeans/modules/bpel/validation/statics/Bundle.properties 0609/soa/bpel-validation/bpel-validation/org/netbeans/modules/bpel/validation/statics/Bundle.properties 66c66 < FIX_DifferentPortTypes=If the portType attribute is included for readability, \ --- > FIX_SA00005=If the portType attribute is included for readability, \ 69c69,70 < of the specified partnerLink and the role implicitly specified by the activity. --- > of the specified partnerLink and the role implicitly specified by the activity. \ > It means that Invoke requires partnerRole, another - myRole. diff -r 0508/soa/bpel-validation/bpel-validation/org/netbeans/modules/bpel/validation/xpath/Bundle.properties 0609/soa/bpel-validation/bpel-validation/org/netbeans/modules/bpel/validation/xpath/Bundle.properties 1a2,3 > FIX_Time_in_copy=Assigment of duration literal to xsd:time type is not allowed. > 6a9,14 > FIX_Positive_Negative_Copy=You can not assign from a positive to a negative number. > FIX_Positive_NonPositive_Copy=You can not assign from a positive to a non positive number. > FIX_Negative_Positive_Copy=You can not assign from a negative to a positive number. > FIX_NonPositive_Positive_Copy=You can not assign from a non positive to a positive number. > FIX_NonPositive_NonNegative_Copy=You are trying to assign from a non positive to a non negative number. > FIX_NonNegative_NonPositive_Copy=You are trying to assign from a non negative to a non positive number. diff -r 0508/soa/soa-kit/soa-kit/org/netbeans/modules/soa/kit/Bundle.properties 0609/soa/soa-kit/soa-kit/org/netbeans/modules/soa/kit/Bundle.properties 3a4,6 > For the list of included fixed bugs please check http://wiki.netbeans.org/NetBeans6.1PatchesInfo. \ >
\ >
\ diff -r 0508/soa/sql-wizard/sql-wizard/org/netbeans/modules/jdbcwizard/wizards/Bundle.properties 0609/soa/sql-wizard/sql-wizard/org/netbeans/modules/jdbcwizard/wizards/Bundle.properties 236c236 < LBL_DS=Data Source --- > LBL_DS=Data Source: 262a263,265 > TITLE_COLUMN_SELECT_ERROR=Column Selection > MSG_COLUMN_SELECT_ERROR=Please select the table to select additional properties > diff -r 0508/uml/uml-kit/uml-kit/org/netbeans/modules/uml/kit/Bundle.properties 0609/uml/uml-kit/uml-kit/org/netbeans/modules/uml/kit/Bundle.properties 4a5,7 > For the list of included fixed bugs please check http://wiki.netbeans.org/NetBeans6.1PatchesInfo. \ >
\ >
\ diff -r 0508/vw/vw-kit/vw-kit/org/netbeans/modules/visualweb/kit/Bundle.properties 0609/vw/vw-kit/vw-kit/org/netbeans/modules/visualweb/kit/Bundle.properties 4c4,8 < OpenIDE-Module-Long-Description=The Visual Web JSF Framework, based on drag and drop functionality, provides a visual approach to web application design. --- > OpenIDE-Module-Long-Description=\ > For the list of included fixed bugs please check http://wiki.netbeans.org/NetBeans6.1PatchesInfo. \ >
\ >
\ > The Visual Web JSF Framework, based on drag and drop functionality, provides a visual approach to web application design. diff -r 0508/xml/xml-kit/xml-kit/org/netbeans/modules/xml/kit/Bundle.properties 0609/xml/xml-kit/xml-kit/org/netbeans/modules/xml/kit/Bundle.properties 4c4,8 < OpenIDE-Module-Long-Description=Provides advanced tools and support for creating and editing various \ --- > OpenIDE-Module-Long-Description=\ > For the list of included fixed bugs please check http://wiki.netbeans.org/NetBeans6.1PatchesInfo. \ >
\ >
\ > Provides advanced tools and support for creating and editing various \ diff -r 0508/xml/xml-wsdl-kit/xml-wsdl-kit/org/netbeans/modules/xml/wsdl/kit/Bundle.properties 0609/xml/xml-wsdl-kit/xml-wsdl-kit/org/netbeans/modules/xml/wsdl/kit/Bundle.properties 2a3,5 > For the list of included fixed bugs please check http://wiki.netbeans.org/NetBeans6.1PatchesInfo. \ >
\ >
\