Detail diff diff -r 1016//baseide/db/drivers/src/org/netbeans/modules/db/drivers/Bundle.properties 1115//baseide/db/drivers/src/org/netbeans/modules/db/drivers/Bundle.properties 39a40 > MySQLDriver=MySQL JDBC Driver 49a51 > PostgreSQLDriver=PostgreSQL JDBC Driver diff -r 1016//baseide/db/src/org/netbeans/modules/db/resources/Bundle.properties 1115//baseide/db/src/org/netbeans/modules/db/resources/Bundle.properties 779a780,784 > # ConnectProgressDialog > > ConnectingDialogTitle = Connecting to Database > LBL_Connecting=Connecting to database, please wait... > diff -r 1016//baseide/editor/bracesmatching/src/org/netbeans/modules/editor/bracesmatching/Bundle.properties 1115//baseide/editor/bracesmatching/src/org/netbeans/modules/editor/bracesmatching/Bundle.properties 40a41 > OpenIDE-Module-Short-Description=Support for highlighting matching braces 52d52 < OpenIDE-Module-Short-Description=Support for highlighting matching braces diff -r 1016//baseide/editor/completion/src/org/netbeans/modules/editor/completion/Bundle.properties 1115//baseide/editor/completion/src/org/netbeans/modules/editor/completion/Bundle.properties 43c43 < OpenIDE-Module-Long-Description=Code Completion is a submodule of Editor containing API, SPI and infrastructure for Code Completion/ The module is generic and can be used with any Swing based editor/ --- > OpenIDE-Module-Long-Description=Code Completion is a submodule of Editor containing API, SPI and infrastructure for Code Completion./ The module is generic and can be used with any Swing based editor/ 70,72c70,72 < completion-show-main_menu_item=Complete Code... < documentation-show-main_menu_item=Show Documentation < tooltip-show-main_menu_item=Show Method Parameters --- > completion-show-main_menu_item=Complete &Code... > documentation-show-main_menu_item=Show &Documentation > tooltip-show-main_menu_item=&Show Method Parameters diff -r 1016//baseide/editor/errorstripe/api/src/org/netbeans/modules/editor/errorstripe/apimodule/resources/Bundle.properties 1115//baseide/editor/errorstripe/api/src/org/netbeans/modules/editor/errorstripe/apimodule/resources/Bundle.properties 46c46 < OpenIDE-Module-Name=Error Stripe API --- > OpenIDE-Module-Name=Editor Error Stripe 48,49c48,50 < OpenIDE-Module-Short-Description=Module providing API for the right side bar with overview of errors < OpenIDE-Module-Long-Description=Module providing API for the right side bar with overview of errors --- > OpenIDE-Module-Short-Description=The API for the right hand side bar showing errors, hints, etc. > OpenIDE-Module-Long-Description=\ > The API for the right hand side bar showing errors, hints and other editor annotations. diff -r 1016//baseide/editor/errorstripe/src/org/netbeans/modules/editor/errorstripe/resources/Bundle.properties 1115//baseide/editor/errorstripe/src/org/netbeans/modules/editor/errorstripe/resources/Bundle.properties 46c46 < OpenIDE-Module-Name=Error Stripe Core --- > OpenIDE-Module-Name=Editor Error Stripe Impl 48,49c48,50 < OpenIDE-Module-Short-Description=Module providing a right side bar with overview of errors < OpenIDE-Module-Long-Description=Module providing a right side bar with overview of errors --- > OpenIDE-Module-Short-Description=The right hand side bar showing errors, hints, etc. > OpenIDE-Module-Long-Description=\ > The implementation of the right hand side bar showing errors, hints and other editor annotations. diff -r 1016//baseide/editor/hints/src/org/netbeans/modules/editor/hints/Bundle.properties 1115//baseide/editor/hints/src/org/netbeans/modules/editor/hints/Bundle.properties 42c42 < NM_FixAction=Fix Code... --- > NM_FixAction=Fi&x Code... diff -r 1016//baseide/editor/hints/src/org/netbeans/modules/editor/hints/resources/Bundle.properties 1115//baseide/editor/hints/src/org/netbeans/modules/editor/hints/resources/Bundle.properties 40c40 < OpenIDE-Module-Name=Experimental Editor Hints SPI --- > OpenIDE-Module-Name=Editor Hints (Experimental) 42,43c42,44 < OpenIDE-Module-Short-Description=Editor Hints module < OpenIDE-Module-Long-Description=Editor Hints module --- > OpenIDE-Module-Short-Description=Editor Hints Infrastructure > OpenIDE-Module-Long-Description=\ > The infrastructure and API for working with editor hints. diff -r 1016//baseide/editor/options/src/org/netbeans/modules/options/editor/Bundle.properties 1115//baseide/editor/options/src/org/netbeans/modules/options/editor/Bundle.properties 40,42c40,42 < OpenIDE-Module-Name=General Options Dialog Panels < OpenIDE-Module-Display-Category=Infrastructure < OpenIDE-Module-Short-Description=Provides the most common panels in the Options dialog. --- > OpenIDE-Module-Name=Editor Options > OpenIDE-Module-Display-Category=Editing > OpenIDE-Module-Short-Description=Provides the editor related panels in the Options dialog. 44c44 < Provides Tools | Options dialog panels such as General, Editor, Fonts and Colors, and Keymap. --- > Provides Tools | Options dialog panels such as Editor, Fonts and Colors, and Keymap. diff -r 1016//baseide/editor/settings/storage/src/org/netbeans/modules/editor/settings/storage/Bundle.properties 1115//baseide/editor/settings/storage/src/org/netbeans/modules/editor/settings/storage/Bundle.properties 48c48 < Services/MIMEResolver/org-netbeans-modules-editor-settings-storage-mime-resolver.xml=Netbeans Editor Settings Files --- > Services/MIMEResolver/org-netbeans-modules-editor-settings-storage-mime-resolver.xml=NetBeans Editor Settings Files diff -r 1016//baseide/editor/src/org/netbeans/modules/editor/Bundle.properties 1115//baseide/editor/src/org/netbeans/modules/editor/Bundle.properties 78a79 > select_identifier_main_menu_item=Select &Identifier 84c85 < remove_trailing_spaces_main_menu_item=Remove Trailing Spaces --- > remove_trailing_spaces_main_menu_item=Remove &Trailing Spaces 115a117,170 > # Coloring profile names > Editors/FontsColors/NetBeans=NetBeans > > # Syntax Colorings > default=Default > identifier=Identifier > keyword=Keyword > operator=Operator > string=String > comment=Comment > number=Number > whitespace=Whitespace > error=Error > char=Character > separator=Separator > > markup-element=Markup Element (Tag) > markup-attribute=Markup Attribute > markup-attribute-value=Markup Attribute Value > entity-reference=Entity Reference > > # Semantic Colorings > constructor=Constructor > method=Method > field=Field > local-variable=Local Variable > method-parameter=Method Parameter > class=Class > interface=Interface > enum=Enum > unused=Unused Element > deprecated=Deprecated Element > abstract=Abstract Class or Method > static=Static Element > private=Private Element > protected=Protected Element > public=Public Element > > # Highlights > selection=Selected Text > guarded=Guarded Block > block-search=Search Block > status-bar=Status Bar > status-bar-bold=Status Bar (highlighted) > inc-search=Incremental Search > line-number=Line Number > code-folding-bar=Code Folding Bar > code-folding=Code Folding > highlight-search=Highlight Search > highlight-caret-row=Highlight Caret Row > caret-color-insert-mode=Caret Color > text-limit-line-color=Text Limit Line > hyperlinks=Hyperlinks > synchronized-text-blocks=Synchronized text blocks diff -r 1016//baseide/editor/src/org/netbeans/modules/editor/impl/actions/Bundle.properties 1115//baseide/editor/src/org/netbeans/modules/editor/impl/actions/Bundle.properties 51,54c51,54 < move-selection-else-line-up-main_menu_item=Move Up < move-selection-else-line-down-main_menu_item=Move Down < copy-selection-else-line-up-main_menu_item=Duplicate Up < copy-selection-else-line-down-main_menu_item=Duplicate Down --- > move-selection-else-line-up-main_menu_item=Mo&ve Up > move-selection-else-line-down-main_menu_item=Move Do&wn > copy-selection-else-line-up-main_menu_item=Dup&licate Up > copy-selection-else-line-down-main_menu_item=Duplic&ate Down diff -r 1016//baseide/html/editor/src/org/netbeans/modules/html/editor/resources/Bundle.properties 1115//baseide/html/editor/src/org/netbeans/modules/html/editor/resources/Bundle.properties 52a53,54 > css-embedded=Css Embedded in HTML > javascript-embedded=Javascript Embedded in HTML diff -r 1016//baseide/ide/branding/core/startup/src/org/netbeans/core/startup/Bundle_nb.properties 1115//baseide/ide/branding/core/startup/src/org/netbeans/core/startup/Bundle_nb.properties 74c74 < currentVersion=NetBeans IDE Dev (Build {0}) --- > currentVersion=NetBeans IDE 6.0 (Build {0}) diff -r 1016//baseide/ide/branding/core/windows/src/org/netbeans/core/windows/view/ui/Bundle_nb.properties 1115//baseide/ide/branding/core/windows/src/org/netbeans/core/windows/view/ui/Bundle_nb.properties 43,44c43,44 < CTL_MainWindow_Title={1} - NetBeans IDE Dev {0} < CTL_MainWindow_Title_No_Project=NetBeans IDE Dev {0} --- > CTL_MainWindow_Title={1} - NetBeans IDE 6.0 > CTL_MainWindow_Title_No_Project=NetBeans IDE 6.0 diff -r 1016//baseide/ide/branding/release/README.html 1115//baseide/ide/branding/release/README.html 104,107c104,106 < Windows systems, this directory is found at \Documents < and Settings\user-id\netbeans_user. < On Solaris and Linux, this directory is found at --- > Windows systems, this directory is found at \Documents > and Settings\user-id\.netbeans\version. > On Solaris and Linux, this directory is found at diff -r 1016//baseide/ide/defaults/src/org/netbeans/modules/defaults/Bundle.properties 1115//baseide/ide/defaults/src/org/netbeans/modules/defaults/Bundle.properties 52d51 < Editors/FontsColors/NetBeans=NetBeans 57,109d55 < < # Syntax Colorings < default=Default < identifier=Identifier < keyword=Keyword < operator=Operator < string=String < comment=Comment < number=Number < whitespace=Whitespace < error=Error < char=Character < separator=Separator < < markup-element=Markup Element (Tag) < markup-attribute=Markup Attribute < markup-attribute-value=Markup Attribute Value < entity-reference=Entity Reference < < # Semantic Colorings < constructor=Constructor < method=Method < field=Field < local-variable=Local Variable < method-parameter=Method Parameter < class=Class < interface=Interface < enum=Enum < unused=Unused Element < deprecated=Deprecated Element < abstract=Abstract Class or Method < static=Static Element < private=Private Element < protected=Protected Element < public=Public Element < < < selection=Selected Text < guarded=Guarded Block < block-search=Search Block < status-bar=Status Bar < status-bar-bold=Bold Status Bar < inc-search=Incremental Search < line-number=Line Number < code-folding-bar=Code Folding Bar < code-folding=Code Folding < highlight-search=Highlight Search < highlight-match-brace=Highlight Match Brace < highlight-caret-row=Highlight Caret Row < caret-color-insert-mode=Caret Color < text-limit-line-color=Text Limit Line < caret-color=Caret < text-limit-line=Text Limit Line diff -r 1016//baseide/ide/updatecenters/src/org/netbeans/modules/updatecenters/resources/Bundle.properties 1115//baseide/ide/updatecenters/src/org/netbeans/modules/updatecenters/resources/Bundle.properties 50,51c50,53 < Services/AutoupdateType/dev-update-provider.instance=Development Updates < Services/AutoupdateType/standard-update-provider.instance=Standard Features --- > Services/AutoupdateType/standard-update-provider.instance=NetBeans > Services/AutoupdateType/beta-update-provider.instance=NetBeans Beta > Services/AutoupdateType/thirdparty-update-provider.instance=3rd Party Plugins > Services/AutoupdateType/pluginportal-update-provider.instance=Plugin Portal 53,54c55,58 < URL_au_110566=http://deadlock.netbeans.org/hudson/job/javadoc-nbms/lastSuccessfulBuild/artifact/nbbuild/nbms/updates.xml.gz < URL_Default_N=http://www.netbeans.org/updates/dev_{$netbeans.autoupdate.version}_{$netbeans.autoupdate.regnum}.xml.gz?{$netbeans.hash.code} --- > URL_Standard=http://updates.netbeans.org/netbeans/updates/6.0/uc/final/stable/catalog.xml.gz?{$netbeans.hash.code} > URL_Beta=http://updates.netbeans.org/netbeans/updates/6.0/uc/final/beta/catalog.xml.gz?{$netbeans.hash.code} > URL_ThirdParty=http://updates.netbeans.org/netbeans/updates/6.0/uc/final/thirdparty/catalog.xml.gz?{$netbeans.hash.code} > URL_PluginPortal=http://plugins.netbeans.org/nbpluginportal/updates/6.0/catalog.xml.gz diff -r 1016//baseide/ide/welcome/src/org/netbeans/modules/welcome/resources/Bundle.properties 1115//baseide/ide/welcome/src/org/netbeans/modules/welcome/resources/Bundle.properties 31c31 < URL_MoreTutorials=http://www.netbeans.org/kb/60/index.html --- > URL_MoreTutorials=http://www.netbeans.org/kb/index.html 124a125 > MouseOverTabColor=0xE5E5E5 diff -r 1016//baseide/ide/welcome/src/org/netbeans/modules/welcome/resources/tour.url 1115//baseide/ide/welcome/src/org/netbeans/modules/welcome/resources/tour.url 1c1 < http://www.netbeans.org/download/flash/netbeans-6-overview/player.html --- > http://www.netbeans.org/kb/60/intro-screencasts.html diff -r 1016//baseide/languages/css/src/org/netbeans/modules/languages/css/Bundle.properties 1115//baseide/languages/css/src/org/netbeans/modules/languages/css/Bundle.properties 1,3c1 < # The contents of this file are subject to the terms of the Common Development < # and Distribution License (the License). You may not use this file except in < # compliance with the License. --- > # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. 5,6c3 < # You can obtain a copy of the License at http://www.netbeans.org/cddl.html < # or http://www.netbeans.org/cddl.txt. --- > # Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved. 8,11c5,20 < # When distributing Covered Code, include this CDDL Header Notice in each file < # and include the License file at http://www.netbeans.org/cddl.txt. < # If applicable, add the following below the CDDL Header, with the fields < # enclosed by brackets [] replaced by your own identifying information: --- > # 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: 13a23,24 > # Contributor(s): > # 16a28,38 > # > # 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. 38a61,62 > escaped_css_number=Escaped Number > error=Error diff -r 1016//baseide/languages/diff/src/org/netbeans/modules/languages/diff/Bundle.properties 1115//baseide/languages/diff/src/org/netbeans/modules/languages/diff/Bundle.properties 1,3c1 < # The contents of this file are subject to the terms of the Common Development < # and Distribution License (the License). You may not use this file except in < # compliance with the License. --- > # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. 5,6c3 < # You can obtain a copy of the License at http://www.netbeans.org/cddl.html < # or http://www.netbeans.org/cddl.txt. --- > # Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved. 8,11c5,20 < # When distributing Covered Code, include this CDDL Header Notice in each file < # and include the License file at http://www.netbeans.org/cddl.txt. < # If applicable, add the following below the CDDL Header, with the fields < # enclosed by brackets [] replaced by your own identifying information: --- > # 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: 13a23,24 > # Contributor(s): > # 16a28,38 > # > # 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. 31a54 > error=Error diff -r 1016//baseide/languages/engine/src/org/netbeans/modules/languages/resources/Bundle.properties 1115//baseide/languages/engine/src/org/netbeans/modules/languages/resources/Bundle.properties 46c46 < comment=Commnet --- > comment=Comment 50a51,52 > error=Error > whitespace=Whitespace diff -r 1016//baseide/languages/manifest/src/org/netbeans/modules/languages/manifest/Bundle.properties 1115//baseide/languages/manifest/src/org/netbeans/modules/languages/manifest/Bundle.properties 1,3c1 < # The contents of this file are subject to the terms of the Common Development < # and Distribution License (the License). You may not use this file except in < # compliance with the License. --- > # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. 5,6c3 < # You can obtain a copy of the License at http://www.netbeans.org/cddl.html < # or http://www.netbeans.org/cddl.txt. --- > # Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved. 8,11c5,20 < # When distributing Covered Code, include this CDDL Header Notice in each file < # and include the License file at http://www.netbeans.org/cddl.txt. < # If applicable, add the following below the CDDL Header, with the fields < # enclosed by brackets [] replaced by your own identifying information: --- > # 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: 13a23,24 > # Contributor(s): > # 16a28,38 > # > # 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. diff -r 1016//baseide/lexer/nbbridge/src/org/netbeans/modules/lexer/nbbridge/Bundle.properties 1115//baseide/lexer/nbbridge/src/org/netbeans/modules/lexer/nbbridge/Bundle.properties 0a1,3 > OpenIDE-Module-Display-Category=Editing > OpenIDE-Module-Long-Description=\ > Provides LanguageProvider implementation that gets the language descriptions from MimeLookup so the languages can be registered in xml-layer. 1a5 > OpenIDE-Module-Short-Description=Allows to search for language descriptions by using MimeLookup diff -r 1016//baseide/nbi/engine/native/launcher/unix/i18n/launcher.properties 1115//baseide/nbi/engine/native/launcher/unix/i18n/launcher.properties 43a44,46 > nlu.cannot.extract.bundled.jvm=Cannot extract bundled JVM > nlu.cannot.unpack.jvm.file=Cannot unpack file {0} > nlu.error.verify.bundled.jvm=Cannot verify bundled JVM, try to search JVM on the system 47a51 > nlu.prepare.jvm=Preparing bundled JVM ... diff -r 1016//baseide/nbi/engine/native/launcher/windows/i18n/launcher.properties 1115//baseide/nbi/engine/native/launcher/windows/i18n/launcher.properties 45a46,47 > nlw.bundled.jvm.extract.error=Cannot prepare bundled JVM to run the installer.\nMost probably the bundled JVM is not compatible with the current platform. > nlw.bundled.jvm.verify.error=An error occured while verifying bundled JVM.\nMost probably the bundled JVM is not compatible with the current platform. diff -r 1016//baseide/nbi/engine/src/org/netbeans/installer/wizard/components/actions/Bundle.properties 1115//baseide/nbi/engine/src/org/netbeans/installer/wizard/components/actions/Bundle.properties 70c70 < DCLA.description=Please wait while the wizard prepares the configuration logic for selected components. --- > DCLA.description=Please wait while the wizard prepares the configuration logic. 79c79 < DIDA.description=Please wait while the wizard prepares the installation data for selected components. --- > DIDA.description=Please wait while the wizard prepares the installation data. diff -r 1016//baseide/properties/src/org/netbeans/modules/properties/Bundle.properties 1115//baseide/properties/src/org/netbeans/modules/properties/Bundle.properties 73c73 < ACS_CTL_NameText=N/A --- > ACS_CTL_BundleName=name of the property resource bundle 128c128 < ACS_CTL_NameText=N/A --- > ACS_CTL_LocaleName=N/A diff -r 1016//baseide/refactoring/api/src/org/netbeans/modules/refactoring/spi/impl/Bundle.properties 1115//baseide/refactoring/api/src/org/netbeans/modules/refactoring/spi/impl/Bundle.properties 87,88c87,88 < HINT_nextMatch=Next Occurence - F12 < HINT_prevMatch=Previous Occurence - Shift+F12 --- > HINT_nextMatch=Next Occurence - Ctrl+Period > HINT_prevMatch=Previous Occurence - Ctrl+Comma 105c105 < LBL_NotAvailable=TODO: Missing description. See issue 92451 --- > LBL_NotAvailable=Update diff -r 1016//baseide/scripting/bat/src/org/netbeans/modules/languages/bat/Bundle.properties 1115//baseide/scripting/bat/src/org/netbeans/modules/languages/bat/Bundle.properties 55a56 > error=Error diff -r 1016//baseide/scripting/javascript/src/org/netbeans/modules/languages/javascript/Bundle.properties 1115//baseide/scripting/javascript/src/org/netbeans/modules/languages/javascript/Bundle.properties 67c67 < text/x-string=String --- > text/x-string=JavaScript Strings 86c86,89 < s_string=String --- > s_string=String > error=Error > > diff -r 1016//baseide/utilities/jumpto/src/org/netbeans/modules/jumpto/resources/Bundle.properties 1115//baseide/utilities/jumpto/src/org/netbeans/modules/jumpto/resources/Bundle.properties 49c49 < navigate to a file in an open project by entering its name, or a type --- > navigate to a file in an open project by entering its name, or a type \ diff -r 1016//baseide/utilities/src/org/netbeans/modules/search/Bundle.properties 1115//baseide/utilities/src/org/netbeans/modules/search/Bundle.properties 186a187,192 > # Displays number of nodes selected if 2 or more nodes are selected. > # In English language, this template is simple. For some other languages, > # multiple variants of word "node" may be used depending on the number of nodes. > # E.g. for Czech, use the following template: {0,choice,1<{0} uzly|4<{0} uzlu} > SearchScopeSelectionAddInfo={0} nodes > diff -r 1016//baseide/web/css/src/org/netbeans/modules/css/actions/Bundle.properties 1115//baseide/web/css/src/org/netbeans/modules/css/actions/Bundle.properties 56c56 < RULE_PREVIEW_LABEL=Preview --- > RULE_PREVIEW_LABEL=&Preview diff -r 1016//baseide/web/css/src/org/netbeans/modules/css/visual/ui/Bundle.properties 1115//baseide/web/css/src/org/netbeans/modules/css/visual/ui/Bundle.properties 40c40 < CTL_CSSStyleBuilderAction=Css Style Builder --- > CTL_CSSStyleBuilderAction=Css Style &Builder 58,59c58 < OK=OK < CANCEL=Cancel --- > Close_Button_Label=Close 196c195 < MNE_CLIP_TOP=o --- > MNE_CLIP_TOP=p 198c197 < MNE_CLIP_BOTTOM=m --- > MNE_CLIP_BOTTOM=o diff -r 1016//baseide/web/css/src/org/netbeans/modules/css/visual/ui/preview/Bundle.properties 1115//baseide/web/css/src/org/netbeans/modules/css/visual/ui/preview/Bundle.properties 40c40 < CTL_CssPreviewAction=Css Preview --- > CTL_CssPreviewAction=C&ss Preview diff -r 1016//baseide/xml/core/src/org/netbeans/modules/xml/api/Bundle.properties 1115//baseide/xml/core/src/org/netbeans/modules/xml/api/Bundle.properties 41a42 > Null_Encoding=File encoding query could not find encoding for the file. UTF-8 encoding will be used. diff -r 1016//cnd/cnd/antlr/src/org/netbeans/modules/cnd/antlr/Bundle.properties 1115//cnd/cnd/antlr/src/org/netbeans/modules/cnd/antlr/Bundle.properties 1,16c1,20 < # This module is part of NetBeans and is open-source. < # You can see http://www.netbeans.org/about/legal/index.html for details. < # < # You may use the binary however you like. The source file license is: < # < # The contents of this file are subject to the terms of the Common Development < # and Distribution License (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.html < # or http://www.netbeans.org/cddl.txt. < # < # When distributing Covered Code, include this CDDL Header Notice in each file < # and include the License file at http://www.netbeans.org/cddl.txt. < # If applicable, add the following below the CDDL Header, with the fields < # enclosed by brackets [] replaced by your own identifying information: --- > # 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: 18c22,24 < # --- > # > # Contributor(s): > # 21a28,38 > # > # 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. diff -r 1016//cnd/cnd/gotodeclaration/src/org/netbeans/modules/cnd/gotodeclaration/element/ui/Bundle.properties 1115//cnd/cnd/gotodeclaration/src/org/netbeans/modules/cnd/gotodeclaration/element/ui/Bundle.properties 50c50 < AN_GoToElement=Go To c Dialog --- > AN_GoToElement=Go to Function or Variable diff -r 1016//javase/ant/debugger/src/org/netbeans/modules/ant/debugger/Bundle.properties 1115//javase/ant/debugger/src/org/netbeans/modules/ant/debugger/Bundle.properties 47c47 < Toolbars/Debug=Debug --- > Toolbars/Debug=&Debug diff -r 1016//javase/apisupport/project/src/org/netbeans/modules/apisupport/project/ui/wizard/glf/Bundle.properties 1115//javase/apisupport/project/src/org/netbeans/modules/apisupport/project/ui/wizard/glf/Bundle.properties 40d39 < CTL_Step1=Name and Location 42d40 < CTL_Invalid_Name_Prefix=Name Prefix is invalid. 48,53d45 < CTL_File_Name=&File Name: < CTL_Project=Project: < CTL_Package=&Package: < CTL_Created_Files=Created Files: < CTL_Modified_Files=Modified Files: < diff -r 1016//javase/apisupport/project/src/org/netbeans/modules/apisupport/project/ui/wizard/javahelp/template_myplugin-about.html 1115//javase/apisupport/project/src/org/netbeans/modules/apisupport/project/ui/wizard/javahelp/template_myplugin-about.html 1c1,17 < --- > <#assign licenseFirst = ""> > <#include "../Licenses/license-${project.license}.txt"> > > > About ${DISPLAY_NAME} > > > > >

About ${DISPLAY_NAME}

>

> >

> > 13,25c29 < --> < < About @@DISPLAY_NAME@@ < < < < <

About @@DISPLAY_NAME@@

<

< <

< < --- > --> diff -r 1016//javase/db/derby/src/org/netbeans/modules/derby/Bundle.properties 1115//javase/db/derby/src/org/netbeans/modules/derby/Bundle.properties 51,52c51,53 < LBL_StartAction=Start Server < LBL_StopAction=Stop Server --- > LBL_DerbyDatabaseAction=Java D&B Database > LBL_StartAction=&Start Server > LBL_StopAction=Sto&p Server 55c56,58 < LBL_CreateDBAction=Create Database... --- > LBL_CreateDBAction=&Create Database... > LBL_SettingsAction=Se&ttings... > 57d59 < LBL_Settings=Settings... diff -r 1016//javase/debuggerjpda/ui/src/org/netbeans/modules/debugger/jpda/ui/breakpoints/Bundle.properties 1115//javase/debuggerjpda/ui/src/org/netbeans/modules/debugger/jpda/ui/breakpoints/Bundle.properties 294a295,313 > ACSN_CB_Method_Breakpoint_Type=When to stop on this method. > ACSN_CB_HitCount=Hit count condition. > ACSD_CB_HitCount=Specify the hit count condition. > > ACSN_Method_Breakpoint_ClassName=Class Name > ACSD_Method_Breakpoint_ClassName=Enter the class name the method is defined in. > ACSN_ConditionTF=The condition expression. > ACSN_HitCountTF=The hit count number. > ACSN_MethodBreakpointPanel=Method Breakpoint Settings > ACSD_ExcludeClasses_LBL=The classes to exclude > ACSD_IncludeClasses_LBL=The classes to match > ACSD_PrintText=The text to print when the breakpoint is hit. > ACSD_StopOn_LBL=The event type this breakpoint should stop on. > ACSD_Actions=Actions performed when the breakpoint is hit. > ACSD_Conditions=Conditions determining when the breakpoint is hit. > ACSN_LineBreakpoint=Line Breakpoint properties > ACSN_FieldBreakpoint=Field Breakpoint properties > ACSN_ExceptionBreakpoint=Exception Breakpoint properties > TTT_ExceptionClassName=The class name representing the exception. diff -r 1016//javase/form/src/org/netbeans/modules/form/Bundle.properties 1115//javase/form/src/org/netbeans/modules/form/Bundle.properties 74,75c74,78 < HINT_AUTO_RESOURCE_LOCAL=If turned on, all string properties in the form are automatically internationalized. \ < If turned off, all automatically internationalized properties are changed back to hard-coded strings. --- > HINT_AUTO_RESOURCE_LOCAL=Select Internationalization to generate String property values \ > in a resource bundle. Select All Resources to generate string, icon, color, and \ > font values in a resource bundle. Select Resources + Injection to generate \ > runtime resource injection code for resources instead of property setters. Select Off to have all \ > property values generated directly in the Java file. diff -r 1016//javase/form/src/org/netbeans/modules/form/assistant/Bundle.properties 1115//javase/form/src/org/netbeans/modules/form/assistant/Bundle.properties 87,90c87,90 < boxLayout=Place the component at {0}. position. < flowLayout=Place the component at {0}. position. < gridLayout=Place the component at {0}. position. < toolbarLayout=Place the component at {0}. position. --- > boxLayout=Place the component at position {0}. > flowLayout=Place the component at position {0}. > gridLayout=Place the component at position {0}. > toolbarLayout=Place the component at position {0}. diff -r 1016//javase/form/src/org/netbeans/modules/form/editors2/Bundle.properties 1115//javase/form/src/org/netbeans/modules/form/editors2/Bundle.properties 133c133 < CTL_TableModelEditor_DisplayName=Table customizer --- > CTL_TableModelEditor_DisplayName=Table model customizer diff -r 1016//javase/form/swingapp/src/org/netbeans/modules/swingapp/Bundle.properties 1115//javase/form/swingapp/src/org/netbeans/modules/swingapp/Bundle.properties 122a123,125 > ActionPropertyEditorPanel.actionToEdit.text=Action: > ActionPropertyEditorPanel.jLabel9.text=Action's Class: > ActionPropertyEditorPanel.jLabel12.text=Action's Method: 124,149d126 < < ActionPropertyEditorPanel.actionToEdit.text=Action to edit\: < < classField.text=jTextField1 < < tooltipField.text=Save the current document < < methodLabel.text=Method() < acceleratorText.text=S < < methodField.text=jTextField1 < < blockingDialogText.text=jTextField2 < < blockingDialogTitle.text=jTextField1 < < textField.text=Save < < actionsLabel.text=jLabel10 < < ActionPropertyEditorPanel.jLabel9.text=Class\: < < ActionPropertyEditorPanel.jLabel12.text=Method\: < < ActionPropertyEditorPanel.jLabel14.text=Background Task\: < 157c134 < ActionPropertyEditorPanel.jLabel5.text=Small Icon\: --- > ActionPropertyEditorPanel.jLabel5.text=Icon: 167a145 > ActionPropertyEditorPanel.jLabel6.text=Blocking Dialog Message: 169,170d146 < ActionPropertyEditorPanel.jLabel6.text=Blocking Dialog Text\: < 175,180d150 < ActionPropertyEditorPanel.classLabel.text=package.package.class < < ActionPropertyEditorPanel.targetClassButton.text=Choose Class < < ActionPropertyEditorPanel.backgroundTaskLabel.text=not selected < 195,197c165,166 < jLabel10.text=Large Icon\: < jButton1.text=Set Icon... < jButton2.text=Set Icon... --- > ActionPropertyEditorPanel.jButton1.text=Small Icon... > ActionPropertyEditorPanel.jButton2.text=Large Icon... 241a211,213 > ActionPropertyEditorPanel.backgroundTaskCheckbox.toolTipText=If checked, the action will create a task and run on background > ActionPropertyEditorPanel.targetClassButton.text=Choose Class > ActionPropertyEditorPanel.backgroundTaskCheckbox.text=Background Task diff -r 1016//javase/form/swingapp/src/org/netbeans/modules/swingapp/templates/Bundle.properties 1115//javase/form/swingapp/src/org/netbeans/modules/swingapp/templates/Bundle.properties 69a70 > MSG_InvalidDefaultPackage=Cannot use default package, please specify a package name for the application class. diff -r 1016//javase/j2ee/persistence/verification/src/org/netbeans/modules/j2ee/jpa/verification/fixes/Bundle.properties 1115//javase/j2ee/persistence/verification/src/org/netbeans/modules/j2ee/jpa/verification/fixes/Bundle.properties 57a58 > LBL_CreateUnidirOneToManyRelationship=Create unidirectional OneToMany relationship diff -r 1016//javase/java/editor/src/org/netbeans/modules/editor/java/Bundle.properties 1115//javase/java/editor/src/org/netbeans/modules/editor/java/Bundle.properties 112c112 < fix-imports-main-menu-source-item=Fix Imports... --- > fix-imports-main-menu-source-item=Fix Imp&orts... 134a135,139 > > #JavaCompletionItem > override_Lbl=override > implement_Lbl=implement > generate_Lbl=generate diff -r 1016//javase/java/editor/src/org/netbeans/modules/java/editor/codegen/Bundle.properties 1115//javase/java/editor/src/org/netbeans/modules/java/editor/codegen/Bundle.properties 43c43,45 < generate-code-main-menu-source-item=Insert Code... --- > generate-code-main-menu-source-item=&Insert Code... > complete-line-newline=Complete Line and Create New Line > complete-line=Complete Line diff -r 1016//javase/java/editor/src/org/netbeans/modules/java/editor/resources/Bundle.properties 1115//javase/java/editor/src/org/netbeans/modules/java/editor/resources/Bundle.properties 98a99,101 > > # Options > Actions/Source=Source diff -r 1016//javase/java/editor/src/org/netbeans/modules/java/editor/semantic/Bundle.properties 1115//javase/java/editor/src/org/netbeans/modules/java/editor/semantic/Bundle.properties 53a54,56 > > LBL_ES_TOOLTIP=Mark Occurrences > diff -r 1016//javase/java/navigation/src/org/netbeans/modules/java/navigation/Bundle.properties 1115//javase/java/navigation/src/org/netbeans/modules/java/navigation/Bundle.properties 94,95c94,95 < TITLE_Hierarchy=Hierarchy < TITLE_Members=Members --- > TITLE_Hierarchy=Hierarchy - {0} > TITLE_Members=Members - {0} 140c140 < Menu/GoTo/Inspect/org-netbeans-modules-java-navigation-actions-InspectMembersAction=To je ale co --- > 150c150 < HINT_EnlargeJavaDocToolip=Press Ctrl+F1 to enlarge --- > HINT_EnlargeJavaDocToolip=Press {0} to enlarge diff -r 1016//javase/java/source/debug/src/org/netbeans/modules/java/debug/Bundle.properties 1115//javase/java/source/debug/src/org/netbeans/modules/java/debug/Bundle.properties 43c43 < NM_Preceding_Comments=Precending Comments --- > NM_Preceding_Comments=Preceding Comments diff -r 1016//javase/java/source/src/org/netbeans/modules/java/ui/Bundle.properties 1115//javase/java/source/src/org/netbeans/modules/java/ui/Bundle.properties 70c70 < LBL_spaceBeforeElse="else"" --- > LBL_spaceBeforeElse="else" 228c228,229 < text = "empty";\ --- > text = number == 2 ? "empty" : "nonempty";\ > number = ((op3() + 2) * op4);\ 238a240 > try {\ 239a242,248 > }\ > catch ( Throwable t ) {\ > log();\ > }\ > finally {\ > close();\ > }\ diff -r 1016//javase/javadoc/src/org/netbeans/modules/javadoc/search/Bundle.properties 1115//javase/javadoc/src/org/netbeans/modules/javadoc/search/Bundle.properties 40,45d39 < < # localizing for xml-layer < Services/JavadocSearchType=Javadoc Search Types < Services/JavadocSearchType/org-netbeans-modules-javadoc-search-Jdk12SearchType.settings=JDK 1.2/1.3 Search Engine < Services/JavadocSearchType/javadoc_japan_search.settings=Japanese JDK 1.2/1.3 Search Engine < 77,80d70 < #names of service types < PROP_Jdk12SearchType=JDK 1.2/1.3 Search Engine < PROP_Jdk12SearchTypeJapan=Japanese JDK 1.2/1.3 Search Engine < 107,112d96 < CTL_JavadocSearchType=Javadoc Search Engines < HINT_JavadocSearchType=Javadoc Search Engines < < CTL_Jdk12_search_eng=JDK 1.2/1.3 Search Engine < HINT_Jdk12_search_eng=JDK 1.2/1.3 Search Engine < 116,117d99 < CTL_Jdk12_search_eng_ja=Japanese JDK 1.2/1.3 Search Engine < HINT_Jdk12_search_eng_ja=Japanese JDK 1.2/1.3 Search Engine 119,122d100 < PROP_JaEncoding=Encoding < HINT_JaEncoding=Encoding for Japanese Javadoc. < < diff -r 1016//javase/javadoc/src/org/netbeans/modules/javadoc/settings/Bundle.properties 1115//javase/javadoc/src/org/netbeans/modules/javadoc/settings/Bundle.properties 26c26 < # Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun --- > # Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun 40,42d39 < # localizing for xml-layer < Services/org-netbeans-modules-javadoc-settings-DocumentationSettings.settings=Documentation < 45,48d41 < < #general documentation properties and hints < PROP_SetDefaultSearchEngine=Default Search Engine < HINT_SetDefaultSearchEngine=Default search engine that is set to the filesystem diff -r 1016//javase/profiler/libs/common/src/org/netbeans/lib/profiler/common/Bundle.properties 1115//javase/profiler/libs/common/src/org/netbeans/lib/profiler/common/Bundle.properties 45c45,46 < OpenIDE-Module-Name=NetBeans Profiler - Common --- > OpenIDE-Module-Display-Category=Profiling > OpenIDE-Module-Name=Java Profiler (Common) diff -r 1016//javase/profiler/libs/common/src/org/netbeans/lib/profiler/common/integration/Bundle.properties 1115//javase/profiler/libs/common/src/org/netbeans/lib/profiler/common/integration/Bundle.properties 48,50c48,50 < IntegrationUtils_PlatformJava50=Java 5.0_04 and newer < IntegrationUtils_PlatformJava60=Java 6.0 < IntegrationUtils_PlatformJava70=Java 7.0 --- > IntegrationUtils_PlatformJava50=Java SE 5.0_04 and newer > IntegrationUtils_PlatformJava60=Java SE 6.0 > IntegrationUtils_PlatformJava70=Java SE 7.0 74,76c74,76 < IntegrationUtils_Jdk50Name=JDK 5.0 < IntegrationUtils_Jdk60Name=JDK 6.0 < IntegrationUtils_Jdk70Name=JDK 7.0 --- > IntegrationUtils_Jdk50Name=Java SE 5 (JRE or JDK) > IntegrationUtils_Jdk60Name=Java SE 6 (JRE or JDK) > IntegrationUtils_Jdk70Name=Java SE 7 (JRE or JDK) diff -r 1016//javase/profiler/libs/jfluid/src/org/netbeans/lib/profiler/Bundle.properties 1115//javase/profiler/libs/jfluid/src/org/netbeans/lib/profiler/Bundle.properties 39c39,40 < OpenIDE-Module-Name=JFluid --- > OpenIDE-Module-Display-Category=Profiling > OpenIDE-Module-Name=Java Profiler (JFluid) diff -r 1016//javase/profiler/libs/jfluid-ui/src/org/netbeans/lib/profiler/ui/Bundle.properties 1115//javase/profiler/libs/jfluid-ui/src/org/netbeans/lib/profiler/ui/Bundle.properties 39c39,40 < OpenIDE-Module-Name=JFluid-UI --- > OpenIDE-Module-Display-Category=Profiling > OpenIDE-Module-Name=Java Profiler (JFluid-UI) diff -r 1016//javase/profiler/modules/freeform/src/org/netbeans/modules/profiler/freeform/Bundle.properties 1115//javase/profiler/modules/freeform/src/org/netbeans/modules/profiler/freeform/Bundle.properties 42c42 < OpenIDE-Module-Name=NetBeans Profiler (Freeform Projects) --- > OpenIDE-Module-Name=Java Profiler (Java Freeform Projects Support) 54c54 < FreeFormProjectTypeProfiler_CreateNewTargetMsg=Please note that you have to create a new target for profiling, similar to the \"run\" target.
Read how to write the profiling targets in Profiler Help. --- > FreeFormProjectTypeProfiler_CreateNewTargetMsg=Please note that you have to create a new target for profiling, similar to the \"run\" target.
Click Help to get information about how to write the profiling targets. diff -r 1016//javase/profiler/modules/j2ee/src/org/netbeans/modules/profiler/j2ee/Bundle.properties 1115//javase/profiler/modules/j2ee/src/org/netbeans/modules/profiler/j2ee/Bundle.properties 42c42 < OpenIDE-Module-Name=NetBeans Profiler (J2EE Projects) --- > OpenIDE-Module-Name=Java Profiler (Java EE Projects Support) 62c62,63 < J2EEProjectTypeProfiler_ModifyBuildScriptMsg=This is the first time this project is to be profiled. The profiler needs to modify the project build script to enable profiling.\nA simple import will be created in the project {0}, the original will be backed up as {1}\nDo you wish to perform this change and continue?\n\nIf you have not performed custom edits to your project's build script, click \"OK\" --- > J2EEProjectTypeProfiler_ModifyBuildScriptCaption=Enable Profiling of {0} > J2EEProjectTypeProfiler_ModifyBuildScriptMsg=Profiler is not integrated with project {0}.
Click OK to perform the integration.

As part of the integration, the project build script will be modified.
The original file will be backed up as {1}.

Note: You can undo the profiler integration at any time by invoking
Profile | Advanced Commands | Unintegrate Profiler from the main menu. diff -r 1016//javase/profiler/modules/j2ee-jboss/src/org/netbeans/modules/profiler/j2ee/jboss/Bundle.properties 1115//javase/profiler/modules/j2ee-jboss/src/org/netbeans/modules/profiler/j2ee/jboss/Bundle.properties 42c42 < OpenIDE-Module-Name=NetBeans Profiler (J2EE Projects - JBoss Support) --- > OpenIDE-Module-Name=Java Profiler (Attach - JBoss Support) diff -r 1016//javase/profiler/modules/j2ee-sunas/src/org/netbeans/modules/profiler/j2ee/sunas/Bundle.properties 1115//javase/profiler/modules/j2ee-sunas/src/org/netbeans/modules/profiler/j2ee/sunas/Bundle.properties 42c42 < OpenIDE-Module-Name=NetBeans Profiler (J2EE Projects - SJSAS/GlassFish Support) --- > OpenIDE-Module-Name=Java Profiler (Attach - SJSAS/GlassFish Support) diff -r 1016//javase/profiler/modules/j2ee-tomcat/src/org/netbeans/modules/profiler/j2ee/tomcat/Bundle.properties 1115//javase/profiler/modules/j2ee-tomcat/src/org/netbeans/modules/profiler/j2ee/tomcat/Bundle.properties 42c42 < OpenIDE-Module-Name=NetBeans Profiler (J2EE Projects - Tomcat Support) --- > OpenIDE-Module-Name=Java Profiler (Attach - Tomcat Support) diff -r 1016//javase/profiler/modules/j2ee-weblogic/src/org/netbeans/modules/profiler/j2ee/weblogic/Bundle.properties 1115//javase/profiler/modules/j2ee-weblogic/src/org/netbeans/modules/profiler/j2ee/weblogic/Bundle.properties 42c42 < OpenIDE-Module-Name=NetBeans Profiler (J2EE Projects - WebLogic Support) --- > OpenIDE-Module-Name=Java Profiler (Attach - WebLogic Support) diff -r 1016//javase/profiler/modules/j2se/src/org/netbeans/modules/profiler/j2se/Bundle.properties 1115//javase/profiler/modules/j2se/src/org/netbeans/modules/profiler/j2se/Bundle.properties 42c42 < OpenIDE-Module-Name=NetBeans Profiler (J2SE Projects) --- > OpenIDE-Module-Name=Java Profiler (Java SE Projects Support) 45c45,46 < J2SEProjectTypeProfiler_ModifyBuildScriptMsg=This is the first time this project is to be profiled. The profiler needs to modify the project build script to enable profiling.\nA simple import will be created in the project {0}, the original will be backed up as {1}\nDo you wish to perform this change and continue?\n\nIf you have not performed custom edits to your project's build script, click \"OK\" --- > J2SEProjectTypeProfiler_ModifyBuildScriptCaption=Enable Profiling of {0} > J2SEProjectTypeProfiler_ModifyBuildScriptMsg=Profiler is not integrated with project {0}.
Click OK to perform the integration.

As part of the integration, the project build script will be modified.
The original file will be backed up as {1}.

Note: You can undo the profiler integration at any time by invoking
Profile | Advanced Commands | Unintegrate Profiler from the main menu. diff -r 1016//javase/profiler/modules/main/src/org/netbeans/modules/profiler/Bundle.properties 1115//javase/profiler/modules/main/src/org/netbeans/modules/profiler/Bundle.properties 111c111 < LiveResultsWindow_RunGCTooltip=Run Garbage Collection in Profiled Application --- > LiveResultsWindow_RunGCTooltip=Run Garbage Collection in Profiled Application and Update Results 385a386,394 > > UI_PROFILER_ATTACH=Profiler Attach > UI_PROFILER_ATTACH_ICON_BASE=org/netbeans/modules/profiler/actions/resources/attach.png > UI_PROFILER_MODIFY=Profiler Modify Settings > UI_PROFILER_MODIFY_ICON_BASE=org/netbeans/modules/profiler/actions/resources/modifyProfiling.png > UI_PROFILER_PROFILE_APP=Profile Application > UI_PROFILER_PROFILE_APP_ICON_BASE=org/netbeans/modules/profiler/actions/resources/profile.png > UI_PROFILER_PROFILE_CLASS=Profile Single Class > UI_PROFILER_PROFILE_PROFILE_CLASS_ICON_BASE=org/netbeans/modules/profiler/actions/resources/profile.png diff -r 1016//javase/profiler/modules/main/src/org/netbeans/modules/profiler/actions/Bundle.properties 1115//javase/profiler/modules/main/src/org/netbeans/modules/profiler/actions/Bundle.properties 43,51d42 < # AboutProfilerAction_ProfilerVersionString is used for identifying the Profiler release version! < AboutProfilerAction_ProfilerVersionString=unknown < AboutProfilerAction_AboutDialogCaption=About Profiler < AboutProfilerAction_SmallTitleString=NetBeans < AboutProfilerAction_MainTitleString=Profiler < AboutProfilerAction_VersionTitleString=6.0 Development Version (Build {0}) < # HTML-formatted < AboutProfilerAction_BottomMessageString=For more information, to report a bug or join the user community,
visit http://profiler.netbeans.org < 174,175d164 < LBL_GlobalSettingsAction=Global Settings... < HINT_GlobalSettingsAction=Global Settings... 188,195d176 < LBL_AddCodeFragmentAction=Add As Profiling Code Fragment... < HINT_AddCodeFragmentAction=Add As Profiling Code Fragment... < LBL_ProfilerHelpAction=Profiler &Help... < HINT_ProfilerHelpAction=Profiler Help... < LBL_WhatsNewAction=&What's New in RC1 Release... < HINT_WhatsNewAction=What's New in RC1 Release... < LBL_ProfilerFeedbackAction=Send &Feedback... < HINT_ProfilerFeedbackAction=Send Feedback... 202,203d182 < LBL_AboutProfilerAction=&About Profiler... < HINT_AboutProfilerAction=About Profiler... 243,244d221 < GlobalSettingsAction_GlobalSettingsDialogCaption=Global Settings < diff -r 1016//javase/profiler/modules/main/src/org/netbeans/modules/profiler/heapwalk/Bundle.properties 1115//javase/profiler/modules/main/src/org/netbeans/modules/profiler/heapwalk/Bundle.properties 42a43,45 > AnalysisController_CannotResolveClassMsg=Cannot resolve class {0} > AnalysisController_CannotResolveInstanceMsg=Cannot resolve instance #{0} of class {1} > diff -r 1016//javase/profiler/modules/main/src/org/netbeans/modules/profiler/ppoints/Bundle.properties 1115//javase/profiler/modules/main/src/org/netbeans/modules/profiler/ppoints/Bundle.properties 211c211,213 < Utils_DayDateFormat=d MMM yyyy --- > Utils_DayDateFormat=d MMM yyyy > > Utils_CannotOpenSourceMsg=Cannot show profiling point in source.\nCheck profiling point location. diff -r 1016//javase/profiler/modules/main/src/org/netbeans/modules/profiler/ui/stp/Bundle.properties 1115//javase/profiler/modules/main/src/org/netbeans/modules/profiler/ui/stp/Bundle.properties 41c41 < AttachSettingsPanel_DefineSettingsString=No attach settings defined, define... --- > AttachSettingsPanel_DefineSettingsString=No attach settings defined, define... 45c45 < AttachSettingsPanel_RemoteAttachHintText=Remote {0} to {1} on {2}, change... --- > AttachSettingsPanel_RemoteAttachHintText=Remote {0} to {1} on {2}, change... 47c47 < AttachSettingsPanel_LocalAttachHintText=Local {0} to {1}, change... --- > AttachSettingsPanel_LocalAttachHintText=Local {0} to {1}, change... 61c61 < CPUSettingsAdvancedPanel_ProfileThreadsCheckboxText=Profile &threads started after entering any of root methods --- > CPUSettingsAdvancedPanel_ProfileThreadsCheckboxText=Profile new &Threads/Runnables 66c66 < CPUSettingsAdvancedPanel_MethodInvokeCheckboxText=Met&hod.invoke() --- > CPUSettingsAdvancedPanel_MethodInvokeCheckboxText=Method.in&voke() 78,80c78,80 < CPUSettingsBasicPanel_NoRootsString=No root methods, define... < CPUSettingsBasicPanel_OneRootString=1 root method, edit... < CPUSettingsBasicPanel_MoreRootsString={1} root methods, edit... --- > CPUSettingsBasicPanel_NoRootsString=No root methods, define... > CPUSettingsBasicPanel_OneRootString=1 root method, edit... > CPUSettingsBasicPanel_MoreRootsString={1} root methods, edit... 164a165 > SelectProfilingTask_WorkDirInvalidMsg=Overriden application working directory is invalid and will not be used. 200c201 < StpSpawnedTooltip=If selected, classes invoked from new threads created after entering any root method are automatically instrumented. --- > StpSpawnedTooltip=If selected, classes invoked from new Threads or Runnables are automatically instrumented. diff -r 1016//javase/profiler/modules/main/src/org/netbeans/modules/profiler/ui/wizards/panels/components/Bundle.properties 1115//javase/profiler/modules/main/src/org/netbeans/modules/profiler/ui/wizards/panels/components/Bundle.properties 49c49 < DirectorySelector.buttonBrowse.text=&... --- > DirectorySelector.buttonBrowse.text=... 62a63,64 > DirectorySelector.caption.text=Choose Directory > diff -r 1016//javase/profiler/modules/main/src/org/netbeans/modules/profiler/utils/Bundle.properties 1115//javase/profiler/modules/main/src/org/netbeans/modules/profiler/utils/Bundle.properties 67,68c67,68 < ProjectUtilities_ProfilerWillBeUnintegratedMsg=
Profiler integration will be removed from {0}.

Any customizations of modified build.xml will be lost by this process.
Do you want to continue? < ProjectUtilities_ProfilerIsntIntegratedMsg=
Profiler does not seem to be integrated with {0}.
Do you still want to perform the unintegration?

Note that any customizations of modified build.xml will be lost by this process. --- > ProjectUtilities_ProfilerWillBeUnintegratedMsg=
Profiler integration will be removed from {0}.

The backup of the original build script was created when the project was
modified to enable profiling. Modifications made to the build script after
the backup was created will be lost. Do you want to continue? > ProjectUtilities_ProfilerIsntIntegratedMsg=
Profiler does not seem to be integrated with {0}.
Do you still want to perform the unintegration?

The backup of the original build script was created when the project was
modified to enable profiling. Modifications made to the build script after
the backup was created may be lost. Do you want to continue? 100c100 < *** GENERATED applet HTML launcher - DO NOT EDIT IN 'BUILD' FOLDER  ***\n\n\ --- > *** GENERATED applet HTML launcher - DO NOT EDIT IN 'BUILD' FOLDER\u00a0 ***\n\n\ diff -r 1016//javase/profiler/modules/nbmodule/src/org/netbeans/modules/profiler/nbmodule/Bundle.properties 1115//javase/profiler/modules/nbmodule/src/org/netbeans/modules/profiler/nbmodule/Bundle.properties 42c42 < OpenIDE-Module-Name=NetBeans Profiler (NetBeans Module Projects) --- > OpenIDE-Module-Name=Java Profiler (NetBeans Module Projects Support) diff -r 1016//javase/refactoring/java/src/org/netbeans/modules/refactoring/java/plugins/Bundle.properties 1115//javase/refactoring/java/src/org/netbeans/modules/refactoring/java/plugins/Bundle.properties 49a50 > ERR_OverridesAbstractMethod=The selected method cannot be safely deleted since it implements an abstract method {0}. diff -r 1016//javase/usersguide/j2seexamples/src/org/netbeans/modules/java/examples/Bundle.properties 1115//javase/usersguide/j2seexamples/src/org/netbeans/modules/java/examples/Bundle.properties 2,4c2 < # The contents of this file are subject to the terms of the Common Development < # and Distribution License (the License). You may not use this file except in < # compliance with the License. --- > # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. 6,7c4 < # You can obtain a copy of the License at http://www.netbeans.org/cddl.html < # or http://www.netbeans.org/cddl.txt. --- > # Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved. 9,12c6,21 < # When distributing Covered Code, include this CDDL Header Notice in each file < # and include the License file at http://www.netbeans.org/cddl.txt. < # If applicable, add the following below the CDDL Header, with the fields < # enclosed by brackets [] replaced by your own identifying information: --- > # 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: 14a24,25 > # Contributor(s): > # 18a30,40 > # 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. > # 31a54 > Templates/Project/Samples/Standard/ClientEditor.zip=Client Editor diff -r 1016//mobility/mobility/cdcplugins/nsicom/src/org/netbeans/modules/j2me/cdc/project/nsicom/Bundle.properties 1115//mobility/mobility/cdcplugins/nsicom/src/org/netbeans/modules/j2me/cdc/project/nsicom/Bundle.properties 48c48 < LBL_Host_ip=Monitoring &host IP address\: --- > LBL_Host_ip=Monitoring host &IP address\: diff -r 1016//mobility/mobility/deployment/deviceanywhere/src/org/netbeans/modules/deployment/deviceanywhere/Bundle.properties 1115//mobility/mobility/deployment/deviceanywhere/src/org/netbeans/modules/deployment/deviceanywhere/Bundle.properties 70c70,72 < DA_url=http://www.deviceanywhere.com --- > DA_url=http://www.deviceanywhere.com/netbeans/signup.htm > DA_about_text=More info > DA_about=http://www.deviceanywhere.com/netbeans/overview.htm diff -r 1016//mobility/mobility/designer2/game/src/org/netbeans/modules/vmd/game/dialog/Bundle.properties 1115//mobility/mobility/designer2/game/src/org/netbeans/modules/vmd/game/dialog/Bundle.properties 39a40,42 > ImagePreview.accessible.name=Image preview > ImagePreview.accessible.description=Shows preview of the selected image cut into tiles according to width and height paramters > diff -r 1016//mobility/mobility/designer2/game/src/org/netbeans/modules/vmd/game/editor/scene/Bundle.properties 1115//mobility/mobility/designer2/game/src/org/netbeans/modules/vmd/game/editor/scene/Bundle.properties 42a43,45 > ScenePanel.accessible.name=Scene editor > ScenePanel.accessible.description=Allows user to manipulate layers and their attributes inside a scene > diff -r 1016//mobility/mobility/designer2/game/src/org/netbeans/modules/vmd/game/editor/sequece/Bundle.properties 1115//mobility/mobility/designer2/game/src/org/netbeans/modules/vmd/game/editor/sequece/Bundle.properties 39a40,42 > SequenceContainerEditor.accessible.name=Sequence container editor > SequenceContainerEditor.accessible.description=Allows user to manipulate sequences of a sprite or animated tile > diff -r 1016//mobility/mobility/designer2/game/src/org/netbeans/modules/vmd/game/editor/tiledlayer/Bundle.properties 1115//mobility/mobility/designer2/game/src/org/netbeans/modules/vmd/game/editor/tiledlayer/Bundle.properties 39a40,42 > TiledLayerEditor.accessible.name=Tiled layer editor > TiledLayerEditor.accessible.description=Allows user to manipulate tiles that compose a tiled layer > 45d47 < diff -r 1016//mobility/mobility/designer2/game/src/org/netbeans/modules/vmd/game/nbdialog/Bundle.properties 1115//mobility/mobility/designer2/game/src/org/netbeans/modules/vmd/game/nbdialog/Bundle.properties 39a40,44 > SpriteDialog.accessible.name=Create new Sprite dialog > SpriteDialog.accessible.description=Create new Sprite dialog > TiledLayerDialog.accessible.name=Create new Tiled Layer dialog > TiledLayerDialog.accessible.description=Create new Tiled Layer dialog > 43c48 < SpriteDialog.labelZoom.txt=Zoom --- > SpriteDialog.labelZoom.txt=&Zoom 46c51 < SpriteDialog.buttonImportImages.txt=Import sample images --- > SpriteDialog.buttonImportImages.txt=&Import sample images diff -r 1016//mobility/mobility/designer2/game/src/org/netbeans/modules/vmd/game/view/Bundle.properties 1115//mobility/mobility/designer2/game/src/org/netbeans/modules/vmd/game/view/Bundle.properties 39a40,42 > GameDesignOverViewPanel.accessible.name=Game design overview panel > GameDesignOverViewPanel.accessible.description=Contains previews of all game design components such as scenes and layers > 47d49 < # Sample ResourceBundle properties file diff -r 1016//mobility/mobility/designer2/io/src/org/netbeans/modules/vmd/io/Bundle.properties 1115//mobility/mobility/designer2/io/src/org/netbeans/modules/vmd/io/Bundle.properties 41,42c41,42 < If {0}the file still exists even after the IDE is closed, then the file is locked.
"\ < Deleting this {0} file unlocks the source file.
"\ --- > If the {0} file still exists even after the IDE is closed, then the file is locked.
\ > Deleting this {0} file unlocks the source file.
\ diff -r 1016//mobility/mobility/designer2/midp/src/org/netbeans/modules/vmd/midp/propertyeditors/resource/elements/Bundle.properties 1115//mobility/mobility/designer2/midp/src/org/netbeans/modules/vmd/midp/propertyeditors/resource/elements/Bundle.properties 2c2 < FontEditorElement.defaultRadioButton.text=&Default --- > FontEditorElement.defaultRadioButton.text=De&fault diff -r 1016//mobility/mobility/designer2/midpconverter/src/org/netbeans/modules/vmd/midp/converter/wizard/Bundle.properties 1115//mobility/mobility/designer2/midpconverter/src/org/netbeans/modules/vmd/midp/converter/wizard/Bundle.properties 33a34 > Convert.oldDesign.error=Unsupported version of the design file. The design has to be saved in NetBeans 5.5 or newer. diff -r 1016//mobility/mobility/end2end/jsr172/src/org/netbeans/modules/e2e/wsdl/wsdl2java/Bundle.properties 1115//mobility/mobility/end2end/jsr172/src/org/netbeans/modules/e2e/wsdl/wsdl2java/Bundle.properties 15a16 > 0015: QName type requires user implementations. See TODO in the code. diff -r 1016//platform/autoupdate/services/src/org/netbeans/modules/autoupdate/services/Bundle.properties 1115//platform/autoupdate/services/src/org/netbeans/modules/autoupdate/services/Bundle.properties 17,18d16 < < ModuleUpdateElementImpl_ModuleNotification={0} +

Note:

{1} diff -r 1016//platform/autoupdate/services/src/org/netbeans/modules/autoupdate/services/resources/Bundle.properties 1115//platform/autoupdate/services/src/org/netbeans/modules/autoupdate/services/resources/Bundle.properties 3c3 < The AutoUpdate feature provides several services: download and install available updates of installed modules, search and install new modules from subscribed Update Centers, view and manage the IDE modules. --- > The AutoUpdate feature provides several services: download and install available updates of installed modules, search and install new modules from subscribed Update Centers, view and manage the modules. 5c5 < OpenIDE-Module-Short-Description=Support for searching for module updates on Update Center and for downloading and installing IDE modules --- > OpenIDE-Module-Short-Description=Support for searching for module updates on Update Center and for downloading and installing modules diff -r 1016//platform/autoupdate/ui/src/org/netbeans/modules/autoupdate/ui/Bundle.properties 1115//platform/autoupdate/ui/src/org/netbeans/modules/autoupdate/ui/Bundle.properties 21,23c21,23 < AvailableTab_SourceCategory_Tooltip_STANDARD=NetBeans Plugin < AvailableTab_SourceCategory_Tooltip_BETA=NetBeans Beta Plugin < AvailableTab_SourceCategory_Tooltip_COMMUNITY=Community Plugin --- > AvailableTab_SourceCategory_Tooltip_STANDARD=Certified Plugin > AvailableTab_SourceCategory_Tooltip_BETA=Beta Plugin > AvailableTab_SourceCategory_Tooltip_COMMUNITY=Community Contributed Plugin 26,27c26,28 < InstallTab_PendingForInstall_Tooltip=IDE restart needed to complete installation < InstallTab_PendingForDeactivate_Tooltip=IDE restart needed to complete deactivation --- > InstallTab_PendingForInstall_Tooltip=Application restart needed to complete installation > InstallTab_PendingForDeactivate_Tooltip=Application restart needed to complete deactivation > InstallTab_ReadOnly_Tooltip={0} is in read-only mode and cannot be checked 41c42 < UnitTab_lWarning_Text=IDE needs to restart to complete the {0} operation --- > UnitTab_lWarning_Text={0} operation will require restart of the application 43c44 < PluginManagerUI_UnitTab_Update_ToolTip=Your IDE is up-to-date! --- > PluginManagerUI_UnitTab_Update_ToolTip=Your application is up-to-date! 49,50c50,51 < InstallUnitWizard_Title=NetBeans IDE Installer < UninstallUnitWizard_Title=NetBeans IDE Installer --- > InstallUnitWizard_Title=Plugin Installer > UninstallUnitWizard_Title=Plugin Installer 128a130 > UnitDetails_Plugin_Notification=Important note 146c148 < SettingsTab.cbSharedInstall.ReadOnlyTitle=Write Permisson --- > SettingsTab.cbSharedInstall.ReadOnlyTitle=Write Permission 151c153 < LocalDownloadSupport_BrokenNBM_Exception=Cannot read NBM {0} --- > LocalDownloadSupport_BrokenNBM_Exception=Cannot read NBM {0} because {1} 154a157,161 > ACN_UpdateCentersTable=List of Update Centers > ACD_UpdateCentersTable=List of Update Centers allowing to activate or decativate selected Update Center > ACN_DetailsPanel=Plugin's details > ACD_DetailsPanel=Panel contain name, version and description of selected plugin > ACN_DetailsPanel_Button=Invoke {0} action diff -r 1016//platform/autoupdate/ui/src/org/netbeans/modules/autoupdate/ui/actions/Bundle.properties 1115//platform/autoupdate/ui/src/org/netbeans/modules/autoupdate/ui/actions/Bundle.properties 5,6c5,6 < AutoupdateCheckScheduler_UpdatesFound_ToolTip={0} updates found. Click here to make your IDE up-to-date. < AutoupdateCheckScheduler_UpdateFound_ToolTip={0} update found. Click here to make your IDE up-to-date. --- > AutoupdateCheckScheduler_UpdatesFound_ToolTip={0} updates found. Click here to make your application up-to-date. > AutoupdateCheckScheduler_UpdateFound_ToolTip={0} update found. Click here to make your application up-to-date. diff -r 1016//platform/autoupdate/ui/src/org/netbeans/modules/autoupdate/ui/resources/Bundle.properties 1115//platform/autoupdate/ui/src/org/netbeans/modules/autoupdate/ui/resources/Bundle.properties 3c3 < The UI enables the IDE to browse the IDE installation and contents of registered Update Centers, to download updates or new modules and to automatically install IDE modules. --- > The UI allows to browse the installation and contents of registered Update Centers, to download updates or new modules and to automatically install modules. diff -r 1016//platform/autoupdate/ui/src/org/netbeans/modules/autoupdate/ui/wizards/Bundle.properties 1115//platform/autoupdate/ui/src/org/netbeans/modules/autoupdate/ui/wizards/Bundle.properties 1c1 < OperationDescriptionStep_Header_Head=Welcome to the NetBeans IDE Plugin Installer --- > OperationDescriptionStep_Header_Head=Welcome to the Plugin Installer 7c7 < OperationDescriptionStep_HeaderUninstall_Head=Welcome to the NetBeans IDE Plugin Installer --- > OperationDescriptionStep_HeaderUninstall_Head=Welcome to the Plugin Installer 11c11 < OperationDescriptionStep_HeaderActivate_Head=Welcome to the NetBeans IDE Plugin Installer --- > OperationDescriptionStep_HeaderActivate_Head=Welcome to the Plugin Installer 14c14 < OperationDescriptionStep_HeaderDeativate_Head=Welcome to the NetBeans IDE Plugin Installer --- > OperationDescriptionStep_HeaderDeativate_Head=Welcome to the Plugin Installer 19c19 < because one or more plugins you are about to install depend on them: --- > because one or more of the plugins you are about to install depend on them: 30c30 < InstallUnitWizard_Title=NetBeans IDE Installer --- > InstallUnitWizard_Title=Plugin Installer 38,42c38,42 < InstallStep_Header_InstallDone_Content=Click Finish to quit the NetBeans IDE installer. < InstallStep_Header_Restart_Head=Restart NetBeans IDE to complete installation < InstallStep_Header_Restart_Content=Restart NetBeans IDE to finish plugin installation. < UninstallStep_Header_Restart_Head=Restart NetBeans IDE to complete deactivation < UninstallStep_Header_Restart_Content=Restart NetBeans IDE to finish plugin deactivation. --- > InstallStep_Header_InstallDone_Content=Click Finish to quit the installer. > InstallStep_Header_Restart_Head=Restart application to complete installation > InstallStep_Header_Restart_Content=Restart application to finish plugin installation. > UninstallStep_Header_Restart_Head=Restart application to complete deactivation > UninstallStep_Header_Restart_Content=Restart application to finish plugin deactivation. 44,45c44,45 < InstallUnitWizardModel_Buttons_RestartNow=&Restart IDE Now < InstallUnitWizardModel_Buttons_RestartLater=Restart IDE &Later --- > InstallUnitWizardModel_Buttons_RestartNow=&Restart Now > InstallUnitWizardModel_Buttons_RestartLater=Restart &Later 54c54 < InstallStep_InstallDone_Text=The NetBeans IDE Installer has successfully \ --- > InstallStep_InstallDone_Text=The Plugin Installer has successfully \ 56c56 < UninstallStep_UninstallDone_Text=The NetBeans IDE Installer has successfully \ --- > UninstallStep_UninstallDone_Text=The Plugin Installer has successfully \ 58c58 < UninstallStep_ActivateDone_Text=The NetBeans IDE Installer has successfully \ --- > UninstallStep_ActivateDone_Text=The Plugin Installer has successfully \ 60c60 < UninstallStep_DeactivateDone_Text=The NetBeans IDE Installer has successfully \ --- > UninstallStep_DeactivateDone_Text=The Plugin Installer has successfully \ 74c74 < UninstallStep_Header_UninstallDone_Content=Click Finish to quit the NetBeans IDE installer. --- > UninstallStep_Header_UninstallDone_Content=Click Finish to quit the plugin installer. 76c76 < UninstallStep_Header_DeactivateDone_Content=Click Finish to quit the NetBeans IDE installer. --- > UninstallStep_Header_DeactivateDone_Content=Click Finish to quit the plugin installer. 78c78 < UninstallStep_Header_ActivateDone_Content=Click Finish to quit the NetBeans IDE installer. --- > UninstallStep_Header_ActivateDone_Content=Click Finish to quit the plugin installer. 80c80 < UninstallStep_Header_UninstallFailed_Content=Click Finish to quit the NetBeans IDE installer. --- > UninstallStep_Header_UninstallFailed_Content=Click Finish to quit the plugin installer. 82c82 < UninstallStep_Header_DeactivateFailed_Content=Click Finish to quit the NetBeans IDE installer. --- > UninstallStep_Header_DeactivateFailed_Content=Click Finish to quit the plugin installer. 84c84 < UninstallStep_Header_ActivateFailed_Content=Click Finish to quit the NetBeans IDE installer. --- > UninstallStep_Header_ActivateFailed_Content=Click Finish to quit the plugin installer. 99a100 > OperationDescriptionStep_PendingPluginNameFormat={0} is waiting for restart your application. 101a103 > OperationWizardModel_MoreBrokenPlugins=
More further plugins could not be installed due to avobe problems. 107c109 < CustomHandleStep_Header_InstallDone_Content=Click Next to continue installing the remaining selected plugins using the NetBeans IDE installer. --- > CustomHandleStep_Header_InstallDone_Content=Click Next to continue installing the remaining selected plugins using the plugin installer. 111c113 < CustomHandleStep_Header_InstallFail_Content=Click Cancel to quit the NetBeans IDE installer. --- > CustomHandleStep_Header_InstallFail_Content=Click Cancel to quit the plugin installer. 113c115 < CustomHandleStep_Header_UninstallFail_Content=Click Cancel to quit the NetBeans IDE installer. --- > CustomHandleStep_Header_UninstallFail_Content=Click Cancel to quit the plugin installer. 117c119 < CustomHandleStep_InstallDone_Text=The NetBeans IDE Installer has successfully finished the installation. --- > CustomHandleStep_InstallDone_Text=The Plugin Installer has successfully finished the installation. 119c121 < CustomHandleStep_UninstallDone_Text=The NetBeans IDE Installer has successfully finished the uninstallation. --- > CustomHandleStep_UninstallDone_Text=The Plugin Installer has successfully finished the uninstallation. diff -r 1016//platform/core/options/keymap/src/org/netbeans/modules/options/keymap/Bundle.properties 1115//platform/core/options/keymap/src/org/netbeans/modules/options/keymap/Bundle.properties 84c84 < Shortcut_Conflict=Shortcut already assigned to {0} Action. --- > Shortcut_Conflict=Shortcut already assigned to {0} Action. If you proceed the shortcut will be reassigned. diff -r 1016//platform/core/sendopts/src/org/netbeans/modules/sendopts/Bundle.properties 1115//platform/core/sendopts/src/org/netbeans/modules/sendopts/Bundle.properties 43c43 < GetOpts complient API to parse command line. It is focused on the case \ --- > GetOpts compliant API to parse command line. It is focused on the case \ diff -r 1016//platform/core/src/org/netbeans/core/ui/Bundle.properties 1115//platform/core/src/org/netbeans/core/ui/Bundle.properties 48a49,50 > LBL_AddOnCopyright=
\ > {0}
49a52 > URL_ON_IMG=http://www.netbeans.org/ 58d60 < diff -r 1016//platform/core/startup/src/org/netbeans/core/startup/Bundle.properties 1115//platform/core/startup/src/org/netbeans/core/startup/Bundle.properties 81c81 < SplashRunningTextBounds=268, 253, 205, 12 --- > SplashRunningTextBounds=23, 260, 160, 12 83c83 < SplashProgressBarBounds=0, 268, 472, 3 --- > SplashProgressBarBounds=0, 249, 473, 3 89c89 < SplashRunningTextColor=0xFFFF00 --- > SplashRunningTextColor=0xFFFFFF 91c91 < SplashProgressBarColor=0xFF7200 --- > SplashProgressBarColor=0xFF8E00 95c95 < SplashProgressBarCornerColor=0x8B452C --- > SplashProgressBarCornerColor=0xA5791C 195c195 < MSG_load_layers=Loading installed objects of modules... --- > MSG_load_layers=Loading installed objects... diff -r 1016//platform/core/startup/src/org/netbeans/core/startup/layers/Bundle.properties 1115//platform/core/startup/src/org/netbeans/core/startup/layers/Bundle.properties 43,46c43,46 < MSG_start_load_cache=Loading cached installed objects of modules... < MSG_end_load_cache=Loading cached installed objects of modules...done. < MSG_start_rewrite_cache=Recreating cache of installed objects of modules... < MSG_end_rewrite_cache=Recreating cache of installed objects of modules...done. --- > MSG_start_load_cache=Loading cached objects... > MSG_end_load_cache=Loading cached objects...done. > MSG_start_rewrite_cache=Recreating cache of objects... > MSG_end_rewrite_cache=Recreating cache of objects...done. diff -r 1016//platform/openide/fs/src/org/openide/filesystems/Bundle.properties 1115//platform/openide/fs/src/org/openide/filesystems/Bundle.properties 178c178 < EXC_FileOutsideModified=File not found. Another application may have moved the file or changed the name. --- > EXC_FileOutsideModified=File {0} not found. Another application may have moved the file or changed the name. diff -r 1016//platform/openide/loaders/src/org/openide/loaders/Bundle.properties 1115//platform/openide/loaders/src/org/openide/loaders/Bundle.properties 263c263 < CTL_SaveAsTemplate=Select the category in which the new template will appear: --- > CTL_SaveAsTemplate=&Select the category in which the new template will appear: diff -r 1016//platform/openide/masterfs/src/org/netbeans/modules/masterfs/Bundle.properties 1115//platform/openide/masterfs/src/org/netbeans/modules/masterfs/Bundle.properties 42c42 < MSG_UNC_PATH=; might be because your user directory is on a Windows UNC path (issue #46813)? If so, try using mapped drive letters. --- > MSG_UNC_PATH=might be because your user directory is on a Windows UNC path (issue #46813)? If so, try using mapped drive letters. diff -r 1016//ruby/languages/yaml/src/org/netbeans/modules/languages/yaml/Bundle.properties 1115//ruby/languages/yaml/src/org/netbeans/modules/languages/yaml/Bundle.properties 1,3c1 < # The contents of this file are subject to the terms of the Common Development < # and Distribution License (the License). You may not use this file except in < # compliance with the License. --- > # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. 5,6c3 < # You can obtain a copy of the License at http://www.netbeans.org/cddl.html < # or http://www.netbeans.org/cddl.txt. --- > # Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved. 8,11c5,20 < # When distributing Covered Code, include this CDDL Header Notice in each file < # and include the License file at http://www.netbeans.org/cddl.txt. < # If applicable, add the following below the CDDL Header, with the fields < # enclosed by brackets [] replaced by your own identifying information: --- > # 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: 13a23,24 > # Contributor(s): > # 16a28,38 > # > # 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. 25a48,57 > > text/x-yaml=Yaml > > key=Key > value=Value > whitespace=Whitespace > comment=Comment > sequence=Sequence > error=Error > diff -r 1016//ruby/languages/yaml/src/org/netbeans/modules/languages/yaml/EmptyYAMLFileDescription.html 1115//ruby/languages/yaml/src/org/netbeans/modules/languages/yaml/EmptyYAMLFileDescription.html 2,4c2 < The contents of this file are subject to the terms of the Common Development < and Distribution License (the License). You may not use this file except in < compliance with the License. --- > DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. 6,7c4 < You can obtain a copy of the License at http://www.netbeans.org/cddl.html < or http://www.netbeans.org/cddl.txt. --- > Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved. 9,12c6,22 < When distributing Covered Code, include this CDDL Header Notice in each file < and include the License file at http://www.netbeans.org/cddl.txt. < If applicable, add the following below the CDDL Header, with the fields < enclosed by brackets [] replaced by your own identifying information: --- > > 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: 14a25,26 > Contributor(s): > 17a30,40 > > 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. diff -r 1016//ruby/ruby/bundledjruby/src/org/jruby/distro/Bundle.properties 1115//ruby/ruby/bundledjruby/src/org/jruby/distro/Bundle.properties 5c5 < Bundled distribution of JRuby 1.0 and Ruby On Rails 1.2.3 --- > Bundled distribution of JRuby 1.0 and Ruby on Rails 1.2.3 diff -r 1016//ruby/ruby/editing/src/org/netbeans/modules/ruby/Bundle.properties 1115//ruby/ruby/editing/src/org/netbeans/modules/ruby/Bundle.properties 258a259,265 > Documented=(documented) > NoDoced=(:nodoc:) > RubyLib=Ruby Library > In=in > FileDeleted=The file cannot be found. Perhaps it has been deleted outside the IDE?\n\ > You can force an update of the index by removing the var/cache/gsf-index\n\ > directory in your user directory. diff -r 1016//ruby/ruby/help/src/org/netbeans/modules/ruby/help/Bundle.properties 1115//ruby/ruby/help/src/org/netbeans/modules/ruby/help/Bundle.properties 40c40 < OpenIDE-Module-Name=Ruby JavaHelp Content For Netbeans --- > OpenIDE-Module-Name=Ruby JavaHelp Content For NetBeans diff -r 1016//ruby/ruby/javaint/src/org/netbeans/modules/ruby/javaint/Bundle.properties 1115//ruby/ruby/javaint/src/org/netbeans/modules/ruby/javaint/Bundle.properties 89c89 < LBL_CustomizeLibraries_LibrariesC_JLabel=Compile-&time Libraries\: --- > LBL_CustomizeLibraries_LibrariesC_JLabel=Run-&time Libraries: 95d94 < MSG_CustomizerLibraries_CompileCpMessage=Compile-time libraries are propagated to all library categories. 97c96,97 < IncludeJava=&Include Java --- > IncludeJava=&Include Java (Requires Restart) > IncludeJavaTip=When selected, code completion, go to declaration etc. will include Java classes and Ruby to Java integration APIs diff -r 1016//ruby/ruby/platform/src/org/netbeans/api/ruby/platform/Bundle.properties 1115//ruby/ruby/platform/src/org/netbeans/api/ruby/platform/Bundle.properties 50c50,51 < JRuby=JRuby (bundled with the IDE) --- > JRuby=JRuby > JRubyBundled=JRuby (bundled with the IDE) 55c56 < BuiltinRuby=Built-in JRuby (1.0.1) --- > BuiltinRuby=Built-in JRuby (1.0.2) diff -r 1016//ruby/ruby/projects/src/org/netbeans/modules/ruby/rubyproject/gems/Bundle.properties 1115//ruby/ruby/projects/src/org/netbeans/modules/ruby/rubyproject/gems/Bundle.properties 29c29 < Installation=Installation --- > Installation=Gem Installation 35c35 < Uninstallation=Uninstallation --- > Uninstallation=Gem Uninstallation 38,40c38,40 < Update=Upgrade < UpdateFailed=Upgrade Failed < UpdateOk=Upgrade Succeeded --- > Update=Gem(s) Update > UpdateFailed=Update Failed > UpdateOk=Update Succeeded diff -r 1016//ruby/ruby/railsprojects/src/org/netbeans/modules/ruby/railsprojects/Bundle.properties 1115//ruby/ruby/railsprojects/src/org/netbeans/modules/ruby/railsprojects/Bundle.properties 68c68 < CTL_GenerateAction=Generate... --- > rails-generator=Generate... diff -r 1016//ruby/ruby/railsprojects/src/org/netbeans/modules/ruby/railsprojects/plugins/Bundle.properties 1115//ruby/ruby/railsprojects/src/org/netbeans/modules/ruby/railsprojects/plugins/Bundle.properties 13c13 < Installation=Installation --- > Installation=Rails Plugin Installation 28,29d27 < PluginProgressPanel.messageLabel.text=Plugin < PluginProgressPanel.outputToggle.text=&Show scriptin/plugin output 38c36 < Update=Upgrade --- > Update=Rails Plugin Upgrade 101a100,107 > > # PluginProgressPanel > PluginProgressPanel.messageLabel.text=Plugin > PluginProgressPanel.outputToggle.text=&Show script/plugin output > # PluginProgressPanel - Accessibility > PluginProgressPanel.outputArea.AccessibleContext.accessibleDescription=Output Area > PluginProgressPanel.outputArea.AccessibleContext.accessibleName=Output Area > diff -r 1016//ruby/ruby/railsprojects/src/org/netbeans/modules/ruby/railsprojects/ui/customizer/Bundle.properties 1115//ruby/ruby/railsprojects/src/org/netbeans/modules/ruby/railsprojects/ui/customizer/Bundle.properties 55c55 < LBL_CustomizeRun_Run_Args_JLabel=Server Port Number\: --- > LBL_CustomizeRun_Run_Args_JLabel=Server &Port Number: 156c156 < RakeArgs=Rake Arguments\: --- > RakeArgs=&Rake Arguments: 157a158,161 > AD_RakeArguments=Rake Arguments > AD_Encoding=Encoding > AD_NewConfiguration=New Configuration > AD_Configuration=Configuration diff -r 1016//ruby/ruby/railsprojects/src/org/netbeans/modules/ruby/railsprojects/ui/wizards/Bundle.properties 1115//ruby/ruby/railsprojects/src/org/netbeans/modules/ruby/railsprojects/ui/wizards/Bundle.properties 49a50,58 > RailsInstallationPanel.installedLabel.text=version 1.2.3 > RailsInstallationPanel.jrubyLabel.text=If using JRuby\: > RailsInstallationPanel.jrubySslLabel.text=JRuby does not bundle SSL support used by Rails. > RailsInstallationPanel.proxyButton.AccessibleContext.accessibleDescription=Proxy Settings... > RailsInstallationPanel.proxyButton.text=&Proxy Settings... > RailsInstallationPanel.railsButton.AccessibleContext.accessibleDescription=Install Rails > RailsInstallationPanel.railsDetailButton.text=&Details > RailsInstallationPanel.sslButton.AccessibleContext.accessibleDescription=Install JRuby OpenSSL Support > RailsInstallationPanel.sslButton.text=Install JRuby &OpenSSL Support 55c64 < InstallRails=Install Rails --- > InstallRails=Install &Rails 58,60d66 < RailsInstallationPanel.sslButton.text=Install JRuby OpenSSL Support < RailsInstallationPanel.jrubyLabel.text=If using JRuby\: < RailsInstallationPanel.jrubySslLabel.text=JRuby does not bundle SSL support used by Rails. 71,76c77,80 < TXT_NewJavaApp=Ruby Application < TXT_NewJavaLib=Ruby Class Library < TXT_JavaExtSourcesProjectLocation=Ruby Application with Existing Sources < ACSD_NewJavaApp=Creates new Java Application project < ACSD_NewJavaLib=Creates new Java Class Library project < ACSD_JavaExtSourcesProjectLocation=Creates new Java Project with Existing Sources --- > TXT_NewRoRApp=Ruby on Rails Application > TXT_RoRExtSourcesProjectLocation=Ruby on Rails Application with Existing Sources > ACSD_NewRoRApp=Creates new Ruby on Rails Application project > ACSD_RoRExtSourcesProjectLocation=Creates new Ruby on Rails Application with Existing Sources 113,119c117 < TXT_JavaApplication=RubyApplication{0} < < #NOI18N < TXT_JavaLibrary=RubyLibrary{0} < < #NOI18N < TXT_JavaApplication=RailsApplication{0} --- > TXT_RailsApplication=RailsApplication{0} 191,193d188 < < RailsInstallationPanel.proxyButton.text=Proxy Settings... < RailsInstallationPanel.installedLabel.text=version 1.2.3 195,196d189 < < RailsInstallationPanel.railsDetailButton.text=Details 212a206 > RailsInstallationPanel.railsDetailButton.AccessibleContext.accessibleDescription=Details diff -r 1016//ruby/ruby/refactoring/src/org/netbeans/modules/refactoring/ruby/plugins/Bundle.properties 1115//ruby/ruby/refactoring/src/org/netbeans/modules/refactoring/ruby/plugins/Bundle.properties 122,123d121 < ERR_MethodClash=Cannot rename. Method {0} with the same signature already exists in class {1}. < diff -r 1016//ruby/ruby/refactoring/src/org/netbeans/modules/refactoring/ruby/ui/Bundle.properties 1115//ruby/ruby/refactoring/src/org/netbeans/modules/refactoring/ruby/ui/Bundle.properties 53c53 < DSC_WhereUsedWarningInDevelopment=WARNING: This feature is in development and inaccurate!

{0} --- > DSC_WhereUsedWarningInDevelopment=Ruby refactoring is approximate. Review all changes. 348,349c348 < LBL_NonAccurateRefactoringWarning=WARNING: Ruby refactoring is not accurate! Inspect everything manually! < --- > LBL_NonAccurateRefactoringWarning=Ruby refactoring is approximate. Review all changes. diff -r 1016//ruby/ruby/samples/depot-sample/src/org/netbeans/modules/ruby/samples/depot/Bundle.properties 1115//ruby/ruby/samples/depot-sample/src/org/netbeans/modules/ruby/samples/depot/Bundle.properties 6c6 < DepotPanelVisual.project.folder=Project &Folder: --- > DepotPanelVisual.project.folder=Project Fol&der: diff -r 1016//soa/enterprise/bpel/bpelapi/src/org/netbeans/modules/bpel/model/validation/custom/Bundle.properties 1115//soa/enterprise/bpel/bpelapi/src/org/netbeans/modules/bpel/model/validation/custom/Bundle.properties 43d42 < FIX_Replies=Two reply activites are not part of any if/switch and have the same partner link. diff -r 1016//soa/enterprise/bpel/core/src/org/netbeans/modules/bpel/core/resources/Bundle.properties 1115//soa/enterprise/bpel/core/src/org/netbeans/modules/bpel/core/resources/Bundle.properties 40d39 < # 42c41 < Services/MIMEResolver/org-netbeans-modules-bpel-dataobject-mime-resolver.xml=BPEL Process Definition Files --- > Services/MIMEResolver/org-netbeans-modules-bpel-core-mime-resolver.xml=BPEL Process Definition Files diff -r 1016//soa/enterprise/bpel/core/src/org/netbeans/modules/bpel/core/wizard/Bundle.properties 1115//soa/enterprise/bpel/core/src/org/netbeans/modules/bpel/core/wizard/Bundle.properties 41c41,42 < Templates/SOA/Process.bpel=BPEL Process --- > Templates/SOA_BPEL=SOA > Templates/SOA_BPEL/Process.bpel=BPEL Process diff -r 1016//soa/enterprise/bpel/debugger/src/org/netbeans/modules/bpel/debugger/Bundle.properties 1115//soa/enterprise/bpel/debugger/src/org/netbeans/modules/bpel/debugger/Bundle.properties 43a44,59 > > #BpelDebuggerImpl > ERR_UnableToStartSession=Unable to start a debug session > ERR_SessionTerminated=Debug session terminated > # {0} -- host, {1} -- port > ERR_AlreadyConnected=Already connected to {0}:{1} > # {0} -- host, {1} -- port > ERR_UnableToConnect=Unable to connect to {0}:{1} > > ERR_Separator= : > > MSG_StopConnecting=Stop connecting > MSG_SessionFinished=Debug session finished > # {0} -- host, {1} -- port > MSG_Connecting=Connecting to {0}:{1} > MSG_SessionStarted=Debug session started diff -r 1016//soa/enterprise/bpel/debuggerui/src/org/netbeans/modules/bpel/debugger/ui/source/Bundle.properties 1115//soa/enterprise/bpel/debuggerui/src/org/netbeans/modules/bpel/debugger/ui/source/Bundle.properties 50c50 < CTL_MORE_THAN_ONE_SOURCE_WARNING_TITLE=Warning - Select source file --- > CTL_MORE_THAN_ONE_SOURCE_WARNING_TITLE=Warning - Select Source File diff -r 1016//soa/enterprise/bpel/editors/src/org/netbeans/modules/bpel/design/Bundle.properties 1115//soa/enterprise/bpel/editors/src/org/netbeans/modules/bpel/design/Bundle.properties 66a67,77 > > LBL_PLACEHOLDER=Placeholder > LBL_PASTE_ACTION=Paste > TTT_PASTE_ACTION=Paste > > LBL_COPY_ACTION=Copy > TTT_COPY_ACTION=Copy > > LBL_CUT_ACTION=Cut > TTT_CUT_ACTION=Cut > diff -r 1016//soa/enterprise/bpel/editors/src/org/netbeans/modules/bpel/nodes/actions/Bundle.properties 1115//soa/enterprise/bpel/editors/src/org/netbeans/modules/bpel/nodes/actions/Bundle.properties 66c66 < CTL_DESC_AddEventHandlersAction=Add Event Handlers --- > CTL_DESC_AddEventHandlersAction=Add onEvent diff -r 1016//soa/enterprise/bpel/project/src/org/netbeans/modules/bpel/project/wizards/Bundle.properties 1115//soa/enterprise/bpel/project/src/org/netbeans/modules/bpel/project/wizards/Bundle.properties 66d65 < Templates/SOA=SOA diff -r 1016//soa/enterprise/bpel/search/src/org/netbeans/modules/bpel/search/impl/ui/Bundle.properties 1115//soa/enterprise/bpel/search/src/org/netbeans/modules/bpel/search/impl/ui/Bundle.properties 78c78 < TLT_Export=Export as HTML --- > TLT_Export=Export as HTML ... diff -r 1016//soa/enterprise/compapp/casaeditor/src/org/netbeans/modules/compapp/casaeditor/model/casa/Bundle.properties 1115//soa/enterprise/compapp/casaeditor/src/org/netbeans/modules/compapp/casaeditor/model/casa/Bundle.properties 8d7 < #MSG_CANNOT_CONNECT_BC_TO_BC=Cannot make binding component to binding component connection. 13a13,15 > MSG_CORRUPTED_MODEL_WITH_MISSING_WSDL_PORT=Cannot find the backing WSDL Port: {0}
Try deleting the WSDL Port in the "WSDL Ports" region first and then adding it back again. > MSG_CORRUPTED_MODEL_WITH_MISSING_SRC_WSDL_PORT=Cannot find the corresponding port in WSDL for the source endpoint.
Try deleting the WSDL Port in the "WSDL Ports" region first and then adding it back again. > MSG_CORRUPTED_MODEL_WITH_MISSING_DEST_WSDL_PORT=Cannot find the corresponding port in WSDL for the destination endpoint.
Try deleting the WSDL Port in the "WSDL Ports" region first and then adding it back again. 15a18,20 > MSG_INVALID_ENDPOINT_NAME={0} is not a valid endpoint name. The endpoint name needs to be a xsd:NCName. > MSG_INVALID_SERVICE_NAME={0} is not a valid service name. The service name needs to be a xsd:NCName. > MSG_INVALID_PREFIX_NAME={0} is not a valid prefix. The prefix needs to be a xsd:NCName. 16a22,24 > MSG_SETTING_SERVICE_QNAME_CAUSES_PORT_CONFLICT=Cannot set Service QName to ''{0}''. It would cause port conflict. > MSG_INVALID_SERVICE_NAMESPACE=The service should be defined in the WSDL''s target namespace ''{0}''. > MSG_INVALID_NAMESPACE_URI={0} is not a valid URI. diff -r 1016//soa/enterprise/compapp/projectjbi/src/org/netbeans/modules/compapp/projects/jbi/Bundle.properties 1115//soa/enterprise/compapp/projectjbi/src/org/netbeans/modules/compapp/projects/jbi/Bundle.properties 60a61,67 > > SERVICE_ASSEMBLY_DESCRIPTION=Represents the Service Assembly of {0} > DEFAULT_SERVICE_UNIT_DESCRIPTION=Represents this Service Unit > > FAIL_TO_DELETE_FILE=Failed to delete file {0} > CASA_LOCK_EXISTS=The casa file appears to be locked. This is probably due to previous failed builds or crashed IDE.
The lock file will be removed now in order for normal editing to take place. > COMPAPP_WSDL_LOCK_EXISTS=The CompApp WSDL file appears to be locked. This is probably due to previous failed builds or crashed IDE.
The lock file will be removed now in order for normal editing to take place. diff -r 1016//soa/enterprise/compapp/projectjbi/src/org/netbeans/modules/compapp/projects/jbi/jeese/ui/Bundle.properties 1115//soa/enterprise/compapp/projectjbi/src/org/netbeans/modules/compapp/projects/jbi/jeese/ui/Bundle.properties 44c44 < LBL_depThruCA=Deploy with Composite Application --- > LBL_depThruCA=&Deploy with Composite Application 46c46,48 < LBL_addJeeModule=Add JavaEE Modules... --- > LBL_addJeeModule=Add JavaEE Modules... > # > TT_depThruCA=If selected deploys the Java EE module along with Service assembly else only end-points are enabled, Java EE module must be installed separatly before SA. diff -r 1016//soa/enterprise/compapp/projectjbi/src/org/netbeans/modules/compapp/projects/jbi/ui/customizer/Bundle.properties 1115//soa/enterprise/compapp/projectjbi/src/org/netbeans/modules/compapp/projects/jbi/ui/customizer/Bundle.properties 32,34c32,35 < LBL_Config_Build=Compiling Sources < LBL_Config_Jar=Packaging Project < LBL_Config_Run=Running Project --- > LBL_Config_Build=Build > LBL_Config_Run=Run > LBL_Config_Package_Project=Packaging Project > LBL_Config_Run_Project=Running Project diff -r 1016//soa/enterprise/sql/jdbcwizard/src/org/netbeans/modules/jdbcwizard/builder/Bundle.properties 1115//soa/enterprise/sql/jdbcwizard/src/org/netbeans/modules/jdbcwizard/builder/Bundle.properties 41,45c41 < < # ------------------------------ < # ---- NO I18N ENTIRE FILE! ---- < # ------------------------------ < --- > #NOI18N 47,48c43,45 < ERROR_VALID_RS = Must supply valid ResultSet instance for parameter rs < ERROR_VALID_RULE = Must supply valid value for newRule --- > #NOI18N > ERROR_VALID_RS = Must supply valid ResultSet instance for parameter rs > ERROR_VALID_RULE = Must supply valid value for New Rule 50,52c47,51 < ERROR_PARAMETER_NAME = Must supply non-empty String for parameter colName. < ERROR_KEY = newList does not contain KeyColumn objects < ERROR_FK_KEY = newList does not contain ForeignKeyColumn objects! --- > ERROR_PARAMETER_NAME = Must supply non-empty String for parameter Column Name. > #NOI18N > ERROR_KEY = newList does not contain KeyColumn objects > #NOI18N > ERROR_FK_KEY = newList does not contain ForeignKeyColumn objects! diff -r 1016//soa/enterprise/sql/jdbcwizard/src/org/netbeans/modules/jdbcwizard/builder/dbmodel/Bundle.properties 1115//soa/enterprise/sql/jdbcwizard/src/org/netbeans/modules/jdbcwizard/builder/dbmodel/Bundle.properties 60c60 < ERROR_MISSING_TYPE=Missing atrribute ParameterType for parameter {0} --- > ERROR_MISSING_TYPE=Missing attribute ParameterType for parameter {0} 64c64 < ERROR_MISSING_ORDINAL=Missing oridinal position for parameter {0} --- > ERROR_MISSING_ORDINAL=Missing ordinal position for parameter {0} 100c100 < ERROR_INDEX_NAME="Must supply non-empty String ref for indexName param. --- > ERROR_INDEX_NAME=Must supply non-empty String ref for indexName param. diff -r 1016//soa/enterprise/sql/jdbcwizard/src/org/netbeans/modules/jdbcwizard/builder/dbmodel/impl/Bundle.properties 1115//soa/enterprise/sql/jdbcwizard/src/org/netbeans/modules/jdbcwizard/builder/dbmodel/impl/Bundle.properties 60c60 < ERROR_MISSING_TYPE=Missing atrribute ParameterType for parameter {0} --- > ERROR_MISSING_TYPE=Missing attribute ParameterType for parameter {0} 64c64 < ERROR_MISSING_ORDINAL=Missing oridinal position for parameter {0} --- > ERROR_MISSING_ORDINAL=Missing ordinal position for parameter {0} diff -r 1016//soa/enterprise/sql/jdbcwizard/src/org/netbeans/modules/jdbcwizard/resources/Bundle.properties 1115//soa/enterprise/sql/jdbcwizard/src/org/netbeans/modules/jdbcwizard/resources/Bundle.properties 47c47 < Templates/SOA/untitled.wsdl=WSDL From Database... --- > Templates/SOA_SQL/untitled.wsdl=WSDL From Database... diff -r 1016//soa/enterprise/sql/jdbcwizard/src/org/netbeans/modules/jdbcwizard/wizards/Bundle.properties 1115//soa/enterprise/sql/jdbcwizard/src/org/netbeans/modules/jdbcwizard/wizards/Bundle.properties 250c250 < FMT_PhysicalView_GroupName=GroupName --- > FMT_PhysicalView_GroupName=Group Name 328c328 < BTN_Advanced=Advanced.. --- > BTN_Advanced=Advanced... 332c332 < LBL_Col_PollRecords=PollRecords --- > LBL_Col_PollRecords=Poll Records 342a343 > #NOI18N 344c345 < --- > WARNING=Warning diff -r 1016//soa/enterprise/sql/project/src/org/netbeans/modules/sql/project/ui/resources/Bundle.properties 1115//soa/enterprise/sql/project/src/org/netbeans/modules/sql/project/ui/resources/Bundle.properties 4d3 < Services/MIMEResolver/SQLResolver.xml=SQL Files 6c5,7 < Templates/SOA/SQL.sql=SQL File --- > Services/MIMEResolver/SQLResolver.xml=SQL Files > Templates/SOA_SQL=SOA > Templates/SOA_SQL/SQL.sql=SQL File 8d8 < 10d9 < diff -r 1016//soa/enterprise/sql/project/src/org/netbeans/modules/sql/project/wsdl/Bundle.properties 1115//soa/enterprise/sql/project/src/org/netbeans/modules/sql/project/wsdl/Bundle.properties 3c3,5 < LBL_MSG=Problem in generating the message types for WSDL.Update the generated WSDL if needed.Please see the log for more details --- > LBL_MSG=Problem in generating the message types for WSDL. Update the generated WSDL if needed. Please see the log for more details > WARNING=Warning > INVALID_DATATYPE=Invalid datatype encountered diff -r 1016//soa/enterprise/xslt/core/src/org/netbeans/modules/xslt/core/resources/Bundle.properties 1115//soa/enterprise/xslt/core/src/org/netbeans/modules/xslt/core/resources/Bundle.properties 47c47 < Services/MIMEResolver/org-netbeans-modules-xslt-dataobject-mime-resolver.xml=XSL Files --- > Services/MIMEResolver/org-netbeans-modules-xslt-core-mime-resolver.xml=XSL Files diff -r 1016//soa/enterprise/xslt/project/src/org/netbeans/modules/xslt/project/resources/Bundle.properties 1115//soa/enterprise/xslt/project/src/org/netbeans/modules/xslt/project/resources/Bundle.properties 48c48,49 < Templates/SOA/xslt.service=XSLT Service --- > Templates/SOA_XSLT=SOA > Templates/SOA_XSLT/xslt.service=XSLT Service diff -r 1016//soa/enterprise/xslt/tmap/src/org/netbeans/modules/xslt/tmap/model/validation/Bundle.properties 1115//soa/enterprise/xslt/tmap/src/org/netbeans/modules/xslt/tmap/model/validation/Bundle.properties 49c49,51 < Msg_CantResolveTargetType=Cannot resolve output type for transformation ({0}) --- > Msg_CantResolveTargetType=Cannot resolve output type for transformation ({0}) > > MSG_Error_BadSchema=Cannot determine {0} schema: transformmap.xml may be broken or the schema file is not well-formed diff -r 1016//soa/enterprise/xslt/tmap/src/org/netbeans/modules/xslt/tmap/resources/Bundle.properties 1115//soa/enterprise/xslt/tmap/src/org/netbeans/modules/xslt/tmap/resources/Bundle.properties 40c40,41 < # --- > > # manifest 41a43,47 > OpenIDE-Module-Display-Category=SOA > OpenIDE-Module-Short-Description=Transformmap Core. > OpenIDE-Module-Long-Description=Transformmap Core. > > # layer 43d48 < ##Templates/Other/TMapTemplate.xml=Empty TMap file diff -r 1016//soa/identity/samples/src/org/netbeans/modules/identity/samples/resources/Bundle.properties 1115//soa/identity/samples/src/org/netbeans/modules/identity/samples/resources/Bundle.properties 46,49d45 < Templates/Project/Samples/Identity/StockClientSampleProject=Stock Client < Templates/Project/Samples/Identity/StockServerSampleProject=Stock Service < Templates/Project/Samples/Identity/CalendarClientSampleProject=Calendar Client < Templates/Project/Samples/Identity/CalendarServerSampleProject=Calendar Service diff -r 1016//soa/identity/samples/src/org/netbeans/modules/identity/samples/resources/StockSampleDescription.html 1115//soa/identity/samples/src/org/netbeans/modules/identity/samples/resources/StockSampleDescription.html 0a1,41 > diff -r 1016//soa/identity/samples/src/org/netbeans/modules/identity/samples/resources/category.html 1115//soa/identity/samples/src/org/netbeans/modules/identity/samples/resources/category.html 0a1,2 > diff -r 1016//soa/identity/samples/src/org/netbeans/modules/identity/samples/ui/Bundle.properties 1115//soa/identity/samples/src/org/netbeans/modules/identity/samples/ui/Bundle.properties 75,80d74 < MSG_CreateCalendarClientProject=Create a web project to use \ < Liberty Discovery Lookup by a web service client. < < MSG_CreateCalendarServerProject=Create a web project to use \ < Liberty token profile for a web service provider. < diff -r 1016//soa/print/src/org/netbeans/modules/print/impl/action/Bundle.properties 1115//soa/print/src/org/netbeans/modules/print/impl/action/Bundle.properties 46,50c46 < TLT_Print_Action=Print - Ctrl+P < < # PrintPreviewAction < LBL_Print_Preview_Action=P&rint Preview ... < TLT_Print_Preview_Action=Print Preview - Ctrl+Alt+Shift+P --- > TLT_Print_Action=Print Preview - Ctrl+Alt+Shift+P diff -r 1016//soa/xml/jaxb/src/org/netbeans/modules/xml/jaxb/ui/Bundle.properties 1115//soa/xml/jaxb/src/org/netbeans/modules/xml/jaxb/ui/Bundle.properties 9a10 > MSG_InvalidCharInPackageName=Invalid character(s) in the package name. (,\\/;:) diff -r 1016//uml/uml/codegen/src/org/netbeans/modules/uml/codegen/action/Bundle.properties 1115//uml/uml/codegen/src/org/netbeans/modules/uml/codegen/action/Bundle.properties 58c58 < ACSD_CodeGenDialog=An optons dialog for specifying how to generate code for the chosen model elements. --- > ACSD_CodeGenDialog=An options dialog for specifying how to generate code for the chosen model elements. diff -r 1016//uml/uml/codegen/src/org/netbeans/modules/uml/codegen/action/ui/Bundle.properties 1115//uml/uml/codegen/src/org/netbeans/modules/uml/codegen/action/ui/Bundle.properties 49c49,50 < MSG_NoSourceFolder=At least one valid target project must be open. --- > MSG_NoTargetJavaProject=A valid target project must be selected. > MSG_NoOpenTargets=At least one valid target project must be open. diff -r 1016//uml/uml/codegen/src/org/netbeans/modules/uml/codegen/java/Bundle.properties 1115//uml/uml/codegen/src/org/netbeans/modules/uml/codegen/java/Bundle.properties 43a44 > MSG_ShowGCDialog=Show Generate Code Dialog 45a47 > MSG_SkipNotClassifierElement=Skipping element, {0}, because it is not of type IClassifier 58a61,62 > MSG_EmptyTargetSourcePath=ERROR: The target source path was empty > MSG_TargetSourcePathNotValid=ERROR: The target source path {0} is not valid diff -r 1016//uml/uml/codegen/src/org/netbeans/modules/uml/codegen/ui/Bundle.properties 1115//uml/uml/codegen/src/org/netbeans/modules/uml/codegen/ui/Bundle.properties 101,106c101,106 < VAL_ElementType_SimpleState=Simple State < VAL_ElementType_UseCase=Use Case < VAL_ElementType_AbortedFinalState=Aborted Final State < VAL_ElementType_ActivityFinalNode=Activity Final Node < VAL_ElementType_ChoicePseudoState=Choice Pseudo State < VAL_ElementType_CombinedFragment=Combined Fragment --- > VAL_ElementType_SimpleState=SimpleState > VAL_ElementType_UseCase=UseCase > VAL_ElementType_AbortedFinalState=AbortedFinalState > VAL_ElementType_ActivityFinalNode=ActivityFinalNode > VAL_ElementType_ChoicePseudoState=ChoicePseudoState > VAL_ElementType_CombinedFragment=CombinedFragment 108,109c108,109 < VAL_ElementType_CompositeState=Composite State < VAL_ElementType_DataStore=Data Store --- > VAL_ElementType_CompositeState=CompositeState > VAL_ElementType_DataStore=DataStore 111,118c111,118 < VAL_ElementType_DeepHistoryState=Deep History State < VAL_ElementType_DeploymentSpecification=Deployment Specification < VAL_ElementType_DerivationClassifier=Derivation Classifier < VAL_ElementType_EntryPointState=Entry Point State < VAL_ElementType_FinalState=Final State < VAL_ElementType_FlowFinal=Flow Final < VAL_ElementType_InitialNode=Initial Node < VAL_ElementType_JunctionState=Junction State --- > VAL_ElementType_DeepHistoryState=DeepHistoryState > VAL_ElementType_DeploymentSpecification=DeploymentSpecification > VAL_ElementType_DerivationClassifier=DerivationClassifier > VAL_ElementType_EntryPointState=EntryPointState > VAL_ElementType_FinalState=FinalState > VAL_ElementType_FlowFinal=FlowFinal > VAL_ElementType_InitialNode=InitialNode > VAL_ElementType_JunctionState=JunctionState 120,121c120,121 < VAL_ElementType_ParameterUsage=Parameter Usage < VAL_ElementType_ShallowHistoryState=Shallow History State --- > VAL_ElementType_ParameterUsage=ParameterUsage > VAL_ElementType_ShallowHistoryState=ShallowHistoryState 123,124c123 < VAL_ElementType_SubmachineState=Submachine State < VAL_ElementType_TemplateClass=Template Class --- > VAL_ElementType_SubmachineState=SubmachineState 132c131 < ACSD_AddTemplateRowButton=Add a new row to the template output parameters table. A dialog will prompt for the four fields\: Filename Format, Extension and Template File. --- > ACSD_AddTemplateRowButton=Add a new row to the template output parameters table. A dialog will prompt for the four fields\: Filename Format, Extension, Folder Path and Template File. 134c133 < ACSD_EditTemplateRowButton=Edit the selected row in the template output parameters table. A dialog will prompt with the four fields populated with current data\: Filename Format, Extension and Template File. --- > ACSD_EditTemplateRowButton=Edit the selected row in the template output parameters table. A dialog will prompt with the four fields populated with current data\: Filename Format, Extension, Folder Path and Template File. diff -r 1016//uml/uml/core/src/org/netbeans/modules/uml/Bundle.properties 1115//uml/uml/core/src/org/netbeans/modules/uml/Bundle.properties 58a59 > Services/MIMEResolver/UMLMimeTypeResolver.xml=UML Diagram Files diff -r 1016//uml/uml/core/src/org/netbeans/modules/uml/core/metamodel/core/foundation/Bundle.properties 1115//uml/uml/core/src/org/netbeans/modules/uml/core/metamodel/core/foundation/Bundle.properties 41,88d40 < #NOI18N - This should not be localized - its the xmi header for ettm file. < XMIHeader.xml = \ < \ < \ < \ < \ < \ < \ < \ < Embarcadero's Describe \ < \ < \ < 6.0 \ < \ < \ < \ < \ < \ < < < # Aztec: TODO: Replace this with the real thing, once we get it. < #NOI18N - This should not be localized - its the xmi header for ettm file. < xmi_head.htm = \ < \ < \ < \ < \ < \ < \ < \ < Embarcadero's Describe \ < \ < \ < 6.0 \ < \ < \ < \ < \ < \ < < < # Aztec: TODO: Replace this with the real thing, once we get it. < #NOI18N - This should not be localized - its the xmi declaration for ettm file. < xml_decl.htm = \ < \ < \ < < diff -r 1016//uml/uml/core/src/org/netbeans/modules/uml/core/requirementsframework/Bundle.properties 1115//uml/uml/core/src/org/netbeans/modules/uml/core/requirementsframework/Bundle.properties 65c65 < IDS_XML_REQ_SOURCE_TITLE=Java Studio Enterprise's XML based requirements provider --- > IDS_XML_REQ_SOURCE_TITLE=XML based requirements provider diff -r 1016//uml/uml/core/src/org/netbeans/modules/uml/ui/support/Bundle.properties 1115//uml/uml/core/src/org/netbeans/modules/uml/ui/support/Bundle.properties 43a44 > ElementDeletePanel.jLabel1.text_unnamed=Are you sure you want to delete unnamed {0} from diagram? diff -r 1016//uml/uml/designpattern/src/org/netbeans/modules/uml/designpattern/Bundle.properties 1115//uml/uml/designpattern/src/org/netbeans/modules/uml/designpattern/Bundle.properties 51c51,52 < ImportRoseModel.Text=Importing a Rose model requires the creation of a new Sun ONE project. The current project will be closed. Are you sure you want to continue?Project.Title=Create New Project --- > ImportRoseModel.Text=Importing a Rose model requires the creation of a new Sun ONE project. The current project will be closed. Are you sure you want to continue? > Project.Title=Create New Project 236c237 < Dialog text --- > #Dialog text diff -r 1016//uml/uml/ideintegration/src/org/netbeans/modules/uml/integration/Bundle.properties 1115//uml/uml/ideintegration/src/org/netbeans/modules/uml/integration/Bundle.properties 492c492 < IDS_PROJNAME2=Find --- > IDS_PROJNAME2=Find Confirmation diff -r 1016//uml/uml/ideintegration/src/org/netbeans/modules/uml/integration/ide/actions/Bundle.properties 1115//uml/uml/ideintegration/src/org/netbeans/modules/uml/integration/ide/actions/Bundle.properties 45d44 < CTL_ReverseEngineerAction=Reverse Engineer... 47d45 < LBL_Title_ReverseEngineer=Reverse Engineer Java Project diff -r 1016//uml/uml/ideintegration/src/org/netbeans/modules/uml/integration/netbeans/actions/Bundle.properties 1115//uml/uml/ideintegration/src/org/netbeans/modules/uml/integration/netbeans/actions/Bundle.properties 40,45d39 < CTL_REAction=RE Action < CTL_REProjectAction=RE Project Action < CTL_RevEngAction=Rev Eng Action < CTL_SomeAction=SomeAction < CTL_UpdateModelAction=Update Model < CTL_ExportCodeActionName=Generate Code... 47,51d40 < < MSG_ExportCodeAction_ExportCodeFor=Generating code for {0} ... < Log_error_generating= Error generating {0} < Log_generating_report_for=generating code for {0} to {1} < Log_error_exporting_source=Error generating source file for {0} 53,63d41 < MSG_NoElementsFound=No Elements Found < MSG_DialogTitle_AuthorizeUMLProjectSave=Authorize UML Project Save < MSG_UMLProject=UML Project < MSG_Processing=processing... < < LBL_ExportCodeDialogTitle=Generate Code < < TXT_Project_sources_suffix=Sources < # do not localize < TXT_Project_src_folder=src < diff -r 1016//uml/uml/ideintegration/src/org/netbeans/modules/uml/integration/netbeans/actions/ui/Bundle.properties 1115//uml/uml/ideintegration/src/org/netbeans/modules/uml/integration/netbeans/actions/ui/Bundle.properties 46d45 < LBL_BackupSourcesCheckBox=&Backup Existing Source Files 48d46 < LBL_ExportLocationLabel=Folder &Location\: 52d49 < ACSD_BackupSourcesCheckBox=Enabling this checkbox will create backup files of existing source files when a name collision is detected during source code generation. 54d50 < ACSD_ExportFolder=The location of the folder to which the sources will be generated. 62d57 < ASCD_ExportCodePanel=Contains input fields for specifying where to generate the code. 72d66 < LBL_GenCodeSourceFolderChooseDialog_Title=Choose the Target Source Folder 75d68 < 77d69 < 80d71 < LBL_GenerateMarkersCheckBox=&Generate Markers for Source File Merging diff -r 1016//uml/uml/webreport/src/org/netbeans/modules/uml/reporting/Bundle.properties 1115//uml/uml/webreport/src/org/netbeans/modules/uml/reporting/Bundle.properties 72a73 > MSG_InvalidItem=Invalid Item: {0} {1} diff -r 1016//uml/uml/xmlrequirements/src/org/netbeans/modules/uml/requirements/xmlprovider/Bundle.properties 1115//uml/uml/xmlrequirements/src/org/netbeans/modules/uml/requirements/xmlprovider/Bundle.properties 52c52 < IDS_XML_REQ_SOURCE_TITLE=Java Studio Enterprise's XML based requirements provider --- > IDS_XML_REQ_SOURCE_TITLE=XML based requirements provider diff -r 1016//webjavaee/j2ee/archiveproject/src/org/netbeans/modules/j2ee/archive/wizard/Bundle.properties 1115//webjavaee/j2ee/archiveproject/src/org/netbeans/modules/j2ee/archive/wizard/Bundle.properties 63c63 < ERR_invalid_archive=Source archive is invalid. --- > ERR_invalid_archive=Provide a valid archive file. 65c65 < ERR_unsupported_archive=Source archive is unsupported. --- > ERR_unsupported_archive=Archive file is unsupported. diff -r 1016//webjavaee/j2ee/clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/Bundle.properties 1115//webjavaee/j2ee/clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/Bundle.properties 92a93 > HINT_project_root_node=Enterprise Application Client project in {0} diff -r 1016//webjavaee/j2ee/clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/customizer/Bundle.properties 1115//webjavaee/j2ee/clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/customizer/Bundle.properties 195c195 < Projects/org-netbeans-modules-j2ee-clientproject/Customizer/WebServiceCategory=JAX-RPC Web Services --- > LBL_Config_WebServiceCategory=JAX-RPC Web Services diff -r 1016//webjavaee/j2ee/earproject/src/org/netbeans/modules/j2ee/earproject/ui/Bundle.properties 1115//webjavaee/j2ee/earproject/src/org/netbeans/modules/j2ee/earproject/ui/Bundle.properties 113a114 > HINT_project_root_node=Enterprise Application project in {0} diff -r 1016//webjavaee/j2ee/earproject/src/org/netbeans/modules/j2ee/earproject/ui/wizards/dd/Bundle.properties 1115//webjavaee/j2ee/earproject/src/org/netbeans/modules/j2ee/earproject/ui/wizards/dd/Bundle.properties 41,45c41,44 < < LBL_Name=File Name\: < LBL_Project=Project\: < LBL_Location=Location\: < LBL_CreatedFile=Created File\: --- > LBL_Name=File Name: > LBL_Project=Project: > LBL_Location=Location: > LBL_CreatedFile=Created File: diff -r 1016//webjavaee/j2ee/ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/ui/Bundle.properties 1115//webjavaee/j2ee/ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/ui/Bundle.properties 78a79 > HINT_project_root_node=EJB Module project in {0} diff -r 1016//webjavaee/j2ee/ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/ui/customizer/Bundle.properties 1115//webjavaee/j2ee/ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/ui/customizer/Bundle.properties 45c45 < Projects/org-netbeans-modules-j2ee-ejbjarproject/Customizer/WebServiceCategory=JAX-RPC Web Services --- > LBL_Config_WebServiceCategory=JAX-RPC Web Services diff -r 1016//webjavaee/j2ee/ejbverification/src/org/netbeans/modules/j2ee/ejbverification/rules/Bundle.properties 1115//webjavaee/j2ee/ejbverification/src/org/netbeans/modules/j2ee/ejbverification/rules/Bundle.properties 55c55 < MSG_BeanImplementsBI=Tt is recommended that a bean class implements its business interface --- > MSG_BeanImplementsBI=It is recommended that a bean class implements its business interface diff -r 1016//webjavaee/j2ee/utilities/src/org/netbeans/modules/j2ee/common/method/impl/Bundle.properties 1115//webjavaee/j2ee/utilities/src/org/netbeans/modules/j2ee/common/method/impl/Bundle.properties 45a46 > ERROR_methodExists=Such method already exists 157a159,160 > MethodCustomizerPanel.jButton1.text=Browse... > ExceptionsPanel.editButton.text_1=Edit diff -r 1016//webjavaee/monitor/src/org/netbeans/modules/web/monitor/client/Bundle.properties 1115//webjavaee/monitor/src/org/netbeans/modules/web/monitor/client/Bundle.properties 340d339 < MON_No_headers=No HTTP headers were recorded diff -r 1016//webjavaee/serverplugins/sun/appsrv81/src/org/netbeans/modules/j2ee/sun/ide/dm/Bundle.properties 1115//webjavaee/serverplugins/sun/appsrv81/src/org/netbeans/modules/j2ee/sun/ide/dm/Bundle.properties 79c79,80 < MSG_DeployDriverComplete=Finished deploying JDBC Driver. Server will be restarted. --- > MSG_DeployDriverComplete=Finished deploying JDBC Driver. Server will be restarted. > ERR_DeployDriverFailed=Some required JDBC Drivers could not be deployed.\nDriver jars should be placed in appserver's classpath to run the application. diff -r 1016//webjavaee/serverplugins/sun/sunddui/src/org/netbeans/modules/j2ee/sun/share/configbean/customizers/common/Bundle.properties 1115//webjavaee/serverplugins/sun/sunddui/src/org/netbeans/modules/j2ee/sun/share/configbean/customizers/common/Bundle.properties 66,67c66 < LBL_Help=Help < MNE_Help=H --- > LBL_Help=&Help diff -r 1016//webjavaee/serverplugins/sun/sunddui/src/org/netbeans/modules/j2ee/sun/share/configbean/templates/Bundle.properties 1115//webjavaee/serverplugins/sun/sunddui/src/org/netbeans/modules/j2ee/sun/share/configbean/templates/Bundle.properties 42,43c42 < LBL_Name=File Name: < MNE_Name=N --- > LBL_Name=File &Name: 46,47c45 < LBL_Project=Project: < MNE_Project=P --- > LBL_Project=&Project: 50,51c48 < LBL_Location=Location: < MNE_Location=L --- > LBL_Location=&Location: 54,55c51 < LBL_CreatedFile=Created File: < MNE_CreatedFile=C --- > LBL_CreatedFile=&Created File: diff -r 1016//webjavaee/visualweb/designer/jsf/src/org/netbeans/modules/visualweb/designer/jsf/Bundle.properties 1115//webjavaee/visualweb/designer/jsf/src/org/netbeans/modules/visualweb/designer/jsf/Bundle.properties 92c92 < JsfDesignerAdvancedOptionsPanel.jLabel1.text=Default Font Size\: --- > JsfDesignerAdvancedOptionsPanel.jLabel1.text=&Default Font Size\: 94,98c94,98 < JsfDesignerAdvancedOptionsPanel.jLabel2.text=Grid Height\: < JsfDesignerAdvancedOptionsPanel.jLabel3.text=Grid Width\: < JsfDesignerAdvancedOptionsPanel.jLabel4.text=Target Browser Window\: < JsfDesignerAdvancedOptionsPanel.jLabel5.text=Suffix for Data Providers\: < JsfDesignerAdvancedOptionsPanel.jLabel6.text=Suffix for RowSets\: --- > JsfDesignerAdvancedOptionsPanel.jLabel2.text=&Grid Height\: > JsfDesignerAdvancedOptionsPanel.jLabel3.text=Grid &Width\: > JsfDesignerAdvancedOptionsPanel.jLabel4.text=&Target Browser Window\: > JsfDesignerAdvancedOptionsPanel.jLabel5.text=S&uffix for Data Providers\: > JsfDesignerAdvancedOptionsPanel.jLabel6.text=Suffi&x for RowSets\: 104,112c104,114 < JsfDesignerAdvancedOptionsPanel.showGrid.text=Show Grid < < JsfDesignerAdvancedOptionsPanel.snapToGrid.text=Snap To Grid < < JsfDesignerAdvancedOptionsPanel.rowsetInSession.text=Create RowSets in Session < < JsfDesignerAdvancedOptionsPanel.checkRowsetDuplicate.text=Check for Duplicate RowSets < < JsfDesignerAdvancedOptionsPanel.promptForName.text=Prompt for Data Source Name --- > JsfDesignerAdvancedOptionsPanel.showGrid.text=&Show Grid > JsfDesignerAdvancedOptionsPanel.showGrid.desc=Show Grids in Designer for positioning components > JsfDesignerAdvancedOptionsPanel.snapToGrid.text=S&nap To Grid > JsfDesignerAdvancedOptionsPanel.snapToGrid.desc=Snap components to grid for positioning > JsfDesignerAdvancedOptionsPanel.rowsetInSession.text=&Create RowSets in Session > JsfDesignerAdvancedOptionsPanel.rowsetInSession.desc=Create database rowsets in the Session Bean class > JsfDesignerAdvancedOptionsPanel.checkRowsetDuplicate.text=Ch&eck for Duplicate RowSets > JsfDesignerAdvancedOptionsPanel.checkRowsetDuplicate.desc=Check to see if rowset had been used > JsfDesignerAdvancedOptionsPanel.promptForName.text=&Prompt for Data Source Name > JsfDesignerAdvancedOptionsPanel.promptForName.desc=Support for data source naming > JsfDesignerAdvancedOptionsPanel.showGrid.actionCommand=&Show Grid diff -r 1016//webjavaee/web/core/src/org/netbeans/modules/web/wizards/Bundle.properties 1115//webjavaee/web/core/src/org/netbeans/modules/web/wizards/Bundle.properties 645,646c645,647 < TXT_wrongTagName=Incorrect or mising Tag Name \: {0} < TXT_wrongTagLibName=Incorrect or mising name for tag library \: {0} --- > TXT_missingTagName=Missing Tag Name > TXT_wrongTagName=Incorrect Tag Name \: {0} > TXT_wrongTagLibName=Incorrect or missing name for tag library \: {0} diff -r 1016//webjavaee/web/jsf/kit/src/org/netbeans/modules/web/jsf/kit/Bundle.properties 1115//webjavaee/web/jsf/kit/src/org/netbeans/modules/web/jsf/kit/Bundle.properties 3c3 < OpenIDE-Module-Short-Description=Java Server Faces support. --- > OpenIDE-Module-Short-Description=JavaServer Faces support. 5c5 < Provides support for developing JSF (Java Server Faces) applications: editing managed beans, navigation rules, refactoring. --- > Provides support for developing JavaServer Faces (JSF) applications: editing managed beans, navigation rules, refactoring. diff -r 1016//webjavaee/web/jsf/src/org/netbeans/modules/web/jsf/Bundle.properties 1115//webjavaee/web/jsf/src/org/netbeans/modules/web/jsf/Bundle.properties 41c41 < LBL_JSFCatalog=Java Server Faces Catalog --- > LBL_JSFCatalog=JavaServer Faces Catalog diff -r 1016//webjavaee/web/jsf/src/org/netbeans/modules/web/jsf/resources/Bundle.properties 1115//webjavaee/web/jsf/src/org/netbeans/modules/web/jsf/resources/Bundle.properties 48c48 < Templates/JSF=Java Server Faces --- > Templates/JSF=JavaServer Faces diff -r 1016//webjavaee/web/jspdebug/src/org/netbeans/modules/web/debug/Bundle.properties 1115//webjavaee/web/jspdebug/src/org/netbeans/modules/web/debug/Bundle.properties 48a49 > LBL_Settings=Settings diff -r 1016//webjavaee/web/jspdebug/src/org/netbeans/modules/web/debug/breakpoints/Bundle.properties 1115//webjavaee/web/jspdebug/src/org/netbeans/modules/web/debug/breakpoints/Bundle.properties 87a88,92 > > #Actions > LBL_Action_Go_To_Source=Go to Source > LBL_Action_Customize=Customize > LBL_Actions=Actions diff -r 1016//webjavaee/web/jspsyntax/src/org/netbeans/modules/web/core/syntax/resources/Bundle.properties 1115//webjavaee/web/jspsyntax/src/org/netbeans/modules/web/core/syntax/resources/Bundle.properties 48c48,49 < tag-directive=Tag Directive --- > tag-directiv