1.1 --- a/src/zh_CN/apisupport/apisupport-ant/apisupport-ant/org/netbeans/modules/apisupport/project/ui/Bundle_zh_CN.properties Tue Jun 26 07:22:38 2012 +0900
1.2 +++ b/src/zh_CN/apisupport/apisupport-ant/apisupport-ant/org/netbeans/modules/apisupport/project/ui/Bundle_zh_CN.properties Tue Jun 26 07:28:03 2012 +0900
1.3 @@ -49,6 +49,7 @@
1.4 CTL_AddTestDependency_unit=\u6dfb\u52a0\u5355\u5143\u6d4b\u8bd5\u4f9d\u8d56\u5173\u7cfb
1.5 CTL_compile=\u7f16\u8bd1\u65f6\u4f9d\u8d56\u5173\u7cfb
1.6 CTL_EditDependency=\u7f16\u8f91...
1.7 +# {0} - module display name
1.8 CTL_EditModuleDependencyTitle=\u7f16\u8f91 "{0}" \u4f9d\u8d56\u5173\u7cfb
1.9 CTL_recursive=\u4ee5\u9012\u5f52\u65b9\u5f0f\u5305\u542b\u4f9d\u8d56\u5173\u7cfb
1.10 CTL_RemoveDependency=\u5220\u9664
1.11 @@ -62,7 +63,6 @@
1.12 ERR_module_already_running=\u5e94\u7528\u7a0b\u5e8f\u5df2\u5728\u6d4b\u8bd5\u7528\u6237\u76ee\u5f55\u4e2d\u8fd0\u884c\u3002\u5fc5\u987b\u5148\u5173\u95ed\u5e94\u7528\u7a0b\u5e8f, \u7136\u540e\u5c1d\u8bd5\u91cd\u65b0\u8fd0\u884c\u3002
1.13 ERR_ModuleIsBeingRun=\u5e94\u7528\u7a0b\u5e8f\u8fd0\u884c\u671f\u95f4\u65e0\u6cd5\u590d\u5236/\u79fb\u52a8/\u91cd\u547d\u540d/\u5220\u9664\u6a21\u5757\u6216\u5957\u4ef6; \u8bf7\u5148\u5173\u95ed\u5e94\u7528\u7a0b\u5e8f\u3002
1.14 HINT_missing_junit4=\u6d4b\u8bd5\u5e93\u4e0d\u5b8c\u6574\u3002\u4f7f\u7528\u4e0a\u4e0b\u6587\u83dc\u5355\u53ef\u89e3\u51b3\u8be5\u95ee\u9898\u3002
1.15 -# ModuleLogicalView
1.16 # {0} - folder
1.17 HINT_project_root_node={0}\u4e2d\u7684\u6a21\u5757\u9879\u76ee
1.18 LBL_also_add_nbjunit_question=\u6dfb\u52a0 JUnit 4\u3002\u662f\u5426\u540c\u65f6\u6dfb\u52a0 NB JUnit (\u548c\u4f9d\u8d56\u5173\u7cfb)?
2.1 --- a/src/zh_CN/apisupport/apisupport-ant/apisupport-ant/org/netbeans/modules/apisupport/project/universe/Bundle_zh_CN.properties Tue Jun 26 07:22:38 2012 +0900
2.2 +++ b/src/zh_CN/apisupport/apisupport-ant/apisupport-ant/org/netbeans/modules/apisupport/project/universe/Bundle_zh_CN.properties Tue Jun 26 07:28:03 2012 +0900
2.3 @@ -54,6 +54,7 @@
2.4 #LBL_harness_version_6.9=6.9
2.5 #LBL_harness_version_7.0=7.0
2.6 #LBL_harness_version_7.1=7.1
2.7 +# LBL_harness_version_7.2=7.2
2.8 LBL_harness_version_unknown=\u672a\u77e5
2.9 # {0} - folder location
2.10 MSG_InvalidPlatform=\u5e73\u53f0\u65e0\u6548 ({0})
3.1 --- a/src/zh_CN/apisupport/apisupport-project/apisupport-project/org/netbeans/modules/apisupport/project/layers/Bundle_zh_CN.properties Tue Jun 26 07:22:38 2012 +0900
3.2 +++ b/src/zh_CN/apisupport/apisupport-project/apisupport-project/org/netbeans/modules/apisupport/project/layers/Bundle_zh_CN.properties Tue Jun 26 07:28:03 2012 +0900
3.3 @@ -40,12 +40,8 @@
3.4 # Version 2 license, then the option applies only if the new code is
3.5 # made subject to such option by the copyright holder.
3.6
3.7 -# LayerNode
3.8 +
3.9 LayerNode_label=XML \u5c42
3.10 -LBL_this_layer=<\u6b64\u5c42>
3.11 -LBL_this_layer_in_context=<\u4e0a\u4e0b\u6587\u4e2d\u7684\u6b64\u5c42>
3.12 -LayerNode_please_wait=\u8bf7\u7a0d\u5019...
3.13 -
3.14 # BadgingSupport
3.15 # {0} - raw file name
3.16 # {1} - bundle name
3.17 @@ -58,6 +54,8 @@
3.18
3.19 # PickNameAction
3.20 LBL_pick_name=\u672c\u5730\u5316\u540d\u79f0...
3.21 +LBL_this_layer=<\u6b64\u5c42>
3.22 +LBL_this_layer_in_context=<\u4e0a\u4e0b\u6587\u4e2d\u7684\u6b64\u5c42>
3.23 PickNameAction_dialog_label=\u672c\u5730\u5316\u7684\u663e\u793a\u540d\u79f0:
3.24 PickNameAction_dialog_title=\u9009\u62e9\u672c\u5730\u5316\u7684\u663e\u793a\u540d\u79f0
3.25
4.1 --- a/src/zh_CN/apisupport/apisupport-wizards/apisupport-wizards/org/netbeans/modules/apisupport/project/ui/wizard/action/Bundle_zh_CN.properties Tue Jun 26 07:22:38 2012 +0900
4.2 +++ b/src/zh_CN/apisupport/apisupport-wizards/apisupport-wizards/org/netbeans/modules/apisupport/project/ui/wizard/action/Bundle_zh_CN.properties Tue Jun 26 07:28:03 2012 +0900
4.3 @@ -136,5 +136,5 @@
4.4 CTL_Clear=\u6e05\u9664(&L)
4.5 CTL_Remove=\u5220\u9664(&R)
4.6 ERR_ToBeCreateFileExists=\u6587\u4ef6{0}\u5df2\u5b58\u5728\u3002
4.7 -#template_action=Action
4.8 +template_action=\u64cd\u4f5c
4.9
5.1 --- a/src/zh_CN/apisupport/maven-apisupport/maven-apisupport/org/netbeans/modules/maven/apisupport/NbModuleDescription_zh_CN.html Tue Jun 26 07:22:38 2012 +0900
5.2 +++ b/src/zh_CN/apisupport/maven-apisupport/maven-apisupport/org/netbeans/modules/maven/apisupport/NbModuleDescription_zh_CN.html Tue Jun 26 07:28:03 2012 +0900
5.3 @@ -3,6 +3,6 @@
5.4 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
5.5 </head>
5.6 <body>
5.7 - 使用 Maven 生成的 NetBeans 平台格式的模块。可以作为依赖关系添加到基于平台的应用程序中。(还可以独立运行或在 "套件" 中运行, 在这种情况下, 必须配置 <code>${netbeans.installation}</code>; 此运行模式不应用于生产代码。)
5.8 + 使用 Maven 生成的 NetBeans 平台格式的模块。可以作为依赖关系添加到基于平台的应用程序中。(还可以独立运行或在“套件”中运行, 在这种情况下, 必须配置 <code>${netbeans.installation}</code>; 此运行模式不应用于生产代码。)
5.9 </body>
5.10 </html>
6.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
6.2 +++ b/src/zh_CN/cnd/cnd-classview/cnd-classview/org/netbeans/modules/cnd/classview/actions/Bundle_zh_CN.properties Tue Jun 26 07:28:03 2012 +0900
6.3 @@ -0,0 +1,43 @@
6.4 +# This module is part of NetBeans and is open-source.
6.5 +# You can see http://www.netbeans.org/about/legal/index.html for details.
6.6 +#
6.7 +# You may use the binary however you like. The source file license is:
6.8 +#
6.9 +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
6.10 +#
6.11 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
6.12 +#
6.13 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
6.14 +# Other names may be trademarks of their respective owners.
6.15 +#
6.16 +# The contents of this file are subject to the terms of either the GNU
6.17 +# General Public License Version 2 only ("GPL") or the Common
6.18 +# Development and Distribution License("CDDL") (collectively, the
6.19 +# "License"). You may not use this file except in compliance with the
6.20 +# License. You can obtain a copy of the License at
6.21 +# http://www.netbeans.org/cddl-gplv2.html
6.22 +# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
6.23 +# specific language governing permissions and limitations under the
6.24 +# License. When distributing the software, include this License Header
6.25 +# Notice in each file and include the License file at
6.26 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
6.27 +# particular file as subject to the "Classpath" exception as provided
6.28 +# by Sun in the GPL Version 2 section of the License file that
6.29 +# accompanied this code. If applicable, add the following below the
6.30 +# License Header, with the fields enclosed by brackets [] replaced by
6.31 +# your own identifying information:
6.32 +# "Portions Copyrighted [year] [name of copyright owner]"
6.33 +#
6.34 +# Contributor(s):
6.35 +#
6.36 +# The Original Software is NetBeans. The Initial Developer of the Original
6.37 +# Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
6.38 +# Microsystems, Inc. All Rights Reserved.
6.39 +
6.40 +CTL_SelectInClasses=\u7c7b
6.41 +CTL_NavigateSelectInClasses=\u5728\u7c7b\u4e2d\u9009\u62e9(&C)
6.42 +
6.43 +CTL_ClassViewAction=\u7c7b(&C)
6.44 +HINT_ClassViewAction=\u663e\u793a\u7c7b\u89c6\u56fe
6.45 +
6.46 +
7.1 --- a/src/zh_CN/cnd/cnd-classview/cnd-classview/org/netbeans/modules/cnd/classview/resources/Bundle_zh_CN.properties Tue Jun 26 07:22:38 2012 +0900
7.2 +++ b/src/zh_CN/cnd/cnd-classview/cnd-classview/org/netbeans/modules/cnd/classview/resources/Bundle_zh_CN.properties Tue Jun 26 07:28:03 2012 +0900
7.3 @@ -40,9 +40,6 @@
7.4
7.5 OpenIDE-Module-Long-Description=\u63d0\u4f9b\u7c7b\u89c6\u56fe - C \u548c C++ \u7c7b, \u51fd\u6570, \u53d8\u91cf\u7b49\u7684\u5206\u5c42\u7ed3\u6784\u89c6\u56fe\u3002
7.6
7.7 -CTL_ClassViewAction=\u7c7b(&C)
7.8 -HINT_ClassViewAction=\u663e\u793a\u7c7b\u89c6\u56fe
7.9 -
7.10 ClassViewTitle=\u7c7b
7.11 ClassViewTooltip=\u7c7b
7.12
7.13 @@ -57,6 +54,3 @@
7.14
7.15 LBL_MoreDeclarations=\u6240\u6709\u58f0\u660e
7.16
7.17 -CTL_SelectInClasses=\u7c7b
7.18 -CTL_NavigateSelectInClasses=\u5728\u7c7b\u4e2d\u9009\u62e9(&C)
7.19 -
8.1 --- a/src/zh_CN/cnd/cnd-debugger-common2/cnd-debugger-common2/org/netbeans/modules/cnd/debugger/common2/debugger/Bundle_zh_CN.properties Tue Jun 26 07:22:38 2012 +0900
8.2 +++ b/src/zh_CN/cnd/cnd-debugger-common2/cnd-debugger-common2/org/netbeans/modules/cnd/debugger/common2/debugger/Bundle_zh_CN.properties Tue Jun 26 07:28:03 2012 +0900
8.3 @@ -267,6 +267,7 @@
8.4 PROP_address=\u5730\u5740
8.5 HINT_address=\u53d8\u91cf\u7684\u5730\u5740
8.6 ACT_Variable_Watch=\u76d1\u89c6
8.7 +MSG_Show_More_Message=\u663e\u793a\u66f4\u591a
8.8
8.9 #
8.10 # Error messages
9.1 --- a/src/zh_CN/cnd/cnd-debugger-gdb2/cnd-debugger-gdb2/org/netbeans/modules/cnd/debugger/gdb2/Bundle_zh_CN.properties Tue Jun 26 07:22:38 2012 +0900
9.2 +++ b/src/zh_CN/cnd/cnd-debugger-gdb2/cnd-debugger-gdb2/org/netbeans/modules/cnd/debugger/gdb2/Bundle_zh_CN.properties Tue Jun 26 07:28:03 2012 +0900
9.3 @@ -73,6 +73,7 @@
9.4 MSG_UnknownFunction=<\u672a\u77e5>
9.5 MSG_UnknownFailure=\u672a\u77e5\u6545\u969c
9.6 MSG_NoSource=\"main\" \u6ca1\u6709\u7b26\u53f7\u4fe1\u606f\u3002\u8bf7\u4f7f\u7528 -g \u9009\u9879\u8fdb\u884c\u7f16\u8bd1\u3002\n\n(\u63d0\u793a: \u60a8\u53ef\u4ee5\u5728\u201c\u8c03\u8bd5\u9009\u9879\u201d\u5bf9\u8bdd\u6846\u4e2d\u7981\u7528\u6b64\u8b66\u544a\u3002)
9.7 +MSG_GdbUnexpectedlyStopped=GDB \u5df2\u610f\u5916\u505c\u6b62\u5e76\u8fd4\u56de{0}
9.8
9.9 #
9.10 # Program stoppage reasons
10.1 --- a/src/zh_CN/cnd/cnd-dwarfdiscovery/cnd-dwarfdiscovery/org/netbeans/modules/cnd/dwarfdiscovery/provider/Bundle_zh_CN.properties Tue Jun 26 07:22:38 2012 +0900
10.2 +++ b/src/zh_CN/cnd/cnd-dwarfdiscovery/cnd-dwarfdiscovery/org/netbeans/modules/cnd/dwarfdiscovery/provider/Bundle_zh_CN.properties Tue Jun 26 07:28:03 2012 +0900
10.3 @@ -89,4 +89,3 @@
10.4 NotFoundDebugInformation=\u5728\u4e8c\u8fdb\u5236\u6587\u4ef6{0}\u4e2d\u627e\u4e0d\u5230\u8c03\u8bd5\u4fe1\u606f
10.5 BadDebugInformation=\u627e\u4e0d\u5230\u6e90\u6839\u76ee\u5f55 {0}
10.6
10.7 -
11.1 --- a/src/zh_CN/cnd/cnd-editor/cnd-editor/org/netbeans/modules/cnd/editor/api/Bundle_zh_CN.properties Tue Jun 26 07:22:38 2012 +0900
11.2 +++ b/src/zh_CN/cnd/cnd-editor/cnd-editor/org/netbeans/modules/cnd/editor/api/Bundle_zh_CN.properties Tue Jun 26 07:28:03 2012 +0900
11.3 @@ -44,14 +44,14 @@
11.4
11.5 LBL_bp_SAME_LINE=\u540c\u4e00\u884c
11.6 LBL_bp_NEW_LINE=\u6362\u884c
11.7 -LBL_bp_NEW_LINE_HALF_INDENTED=\u6362\u884c\u90e8\u5206\u7f29\u6392
11.8 -LBL_bp_NEW_LINE_FULL_INDENTED=\u6362\u884c\u5b8c\u5168\u7f29\u6392
11.9 +LBL_bp_NEW_LINE_HALF_INDENTED=\u6362\u884c\u90e8\u5206\u7f29\u8fdb
11.10 +LBL_bp_NEW_LINE_FULL_INDENTED=\u6362\u884c\u5b8c\u5168\u7f29\u8fdb
11.11
11.12 LBL_pi_START_LINE=\u65e0
11.13 LBL_pi_CODE_INDENT=\u4ee3\u7801
11.14 LBL_pi_PREPROCESSOR_INDENT=\u9884\u5904\u7406\u7a0b\u5e8f
11.15
11.16 LBL_vi_NO_INDENT=\u65e0
11.17 -LBL_vi_HALF_INDENT=\u90e8\u5206\u7f29\u6392
11.18 +LBL_vi_HALF_INDENT=\u90e8\u5206\u7f29\u8fdb
11.19
11.20
12.1 --- a/src/zh_CN/cnd/cnd-editor/cnd-editor/org/netbeans/modules/cnd/editor/cplusplus/Bundle_zh_CN.properties Tue Jun 26 07:22:38 2012 +0900
12.2 +++ b/src/zh_CN/cnd/cnd-editor/cnd-editor/org/netbeans/modules/cnd/editor/cplusplus/Bundle_zh_CN.properties Tue Jun 26 07:28:03 2012 +0900
12.3 @@ -47,12 +47,12 @@
12.4 ############################################
12.5 # Indentation Engine properties
12.6
12.7 -Services/IndentEngine/org-netbeans-modules-cnd-editor-cplusplus-CCIndentEngine.settings=C++ \u7f29\u6392\u5f15\u64ce
12.8 -LAB_CCIndentEngine=C++ \u7f29\u6392\u5f15\u64ce
12.9 -HINT_CCIndentEngine=C++ \u7f29\u6392\u5f15\u64ce
12.10 -Services/IndentEngine/org-netbeans-modules-cnd-editor-cplusplus-CIndentEngine.settings=C \u7f29\u6392\u5f15\u64ce
12.11 -LAB_CIndentEngine=C \u7f29\u6392\u5f15\u64ce
12.12 -HINT_CIndentEngine=C \u7f29\u6392\u5f15\u64ce
12.13 +Services/IndentEngine/org-netbeans-modules-cnd-editor-cplusplus-CCIndentEngine.settings=C++ \u7f29\u8fdb\u5f15\u64ce
12.14 +LAB_CCIndentEngine=C++ \u7f29\u8fdb\u5f15\u64ce
12.15 +HINT_CCIndentEngine=C++ \u7f29\u8fdb\u5f15\u64ce
12.16 +Services/IndentEngine/org-netbeans-modules-cnd-editor-cplusplus-CIndentEngine.settings=C \u7f29\u8fdb\u5f15\u64ce
12.17 +LAB_CIndentEngine=C \u7f29\u8fdb\u5f15\u64ce
12.18 +HINT_CIndentEngine=C \u7f29\u8fdb\u5f15\u64ce
12.19
12.20 ############################################
12.21 # Formatting properties
12.22 @@ -67,10 +67,10 @@
12.23 HINT_indentEngine_CCFormatSpaceAfterComma=\u5982\u679c\u4e3a True, \u5728\u6240\u6709\u9017\u53f7\u540e\u6dfb\u52a0\u7a7a\u683c
12.24 PROP_indentEngine_CCFormatLeadingStarInComment=\u5728\u6ce8\u91ca\u4e2d\u6dfb\u52a0\u524d\u5bfc\u661f\u53f7
12.25 HINT_indentEngine_CCFormatLeadingStarInComment=\u5982\u679c\u4e3a True, \u5219\u5728\u5757\u6ce8\u91ca\u5185\u90e8\u7684\u6bcf\u884c\u8d77\u59cb\u5904\u6dfb\u52a0\u661f\u53f7
12.26 -PROP_indentEngine_CCFormatPreprocessorAtLineStart=\u7f29\u6392\u9884\u5904\u7406\u7a0b\u5e8f\u6307\u4ee4
12.27 -HINT_indentEngine_CCFormatPreprocessorAtLineStart=\u5982\u679c\u4e3a True, \u5219\u7f29\u6392\u4ee5\u5217 0 \u5f00\u59cb\u7684\u9884\u5904\u7406\u7a0b\u5e8f\u6307\u4ee4
12.28 -PROP_indentEngine_CCFormatStatementContinuationIndent=\u8bed\u53e5\u8fde\u7eed\u7f29\u6392
12.29 -HINT_indentEngine_CCFormatStatementContinuationIndent=\u5bf9\u591a\u884c\u8bed\u53e5\u4e2d\u7684\u7b2c\u4e8c\u884c\u53ca\u540e\u7eed\u884c\u8fdb\u884c\u7f29\u6392
12.30 +PROP_indentEngine_CCFormatPreprocessorAtLineStart=\u7f29\u8fdb\u9884\u5904\u7406\u7a0b\u5e8f\u6307\u4ee4
12.31 +HINT_indentEngine_CCFormatPreprocessorAtLineStart=\u5982\u679c\u4e3a True, \u5219\u7f29\u8fdb\u4ee5\u5217 0 \u5f00\u59cb\u7684\u9884\u5904\u7406\u7a0b\u5e8f\u6307\u4ee4
12.32 +PROP_indentEngine_CCFormatStatementContinuationIndent=\u8bed\u53e5\u8fde\u7eed\u7f29\u8fdb
12.33 +HINT_indentEngine_CCFormatStatementContinuationIndent=\u5bf9\u591a\u884c\u8bed\u53e5\u4e2d\u7684\u7b2c\u4e8c\u884c\u53ca\u540e\u7eed\u884c\u8fdb\u884c\u7f29\u8fdb
12.34 ############################################
12.35 # FormatSupport.java
12.36
13.1 --- a/src/zh_CN/cnd/cnd-editor/cnd-editor/org/netbeans/modules/cnd/editor/folding/Bundle_zh_CN.properties Tue Jun 26 07:22:38 2012 +0900
13.2 +++ b/src/zh_CN/cnd/cnd-editor/cnd-editor/org/netbeans/modules/cnd/editor/folding/Bundle_zh_CN.properties Tue Jun 26 07:28:03 2012 +0900
13.3 @@ -45,5 +45,5 @@
13.4 OpenIDE-Module-Name=C, C++ \u548c Fortran \u7f16\u8f91\u5668\u652f\u6301
13.5 OpenIDE-Module-Display-Category=\u7f16\u8f91
13.6 OpenIDE-Module-Short-Description=\u542f\u7528\u5728 IDE \u4e2d\u7f16\u8f91 C, C++ \u548c Fortran \u6587\u4ef6\u7684\u529f\u80fd\u3002
13.7 -OpenIDE-Module-Long-Description=\u7f16\u8f91\u5668\u6a21\u5757\u53ef\u8ba9\u60a8\u4ece IDE \u7f16\u8f91 C, C++ \u548c Fortran \u6e90\u6587\u4ef6\u3002\u5b83\u53ef\u5bf9\u8fd9\u4e9b\u6587\u4ef6\u8fdb\u884c\u8bed\u6cd5\u7a81\u51fa\u663e\u793a, \u6587\u5b57\u5339\u914d, \u4ee3\u7801\u7f29\u6392\u53ca\u5176\u4ed6\u57fa\u672c\u548c\u9ad8\u7ea7\u529f\u80fd\u3002
13.8 +OpenIDE-Module-Long-Description=\u7f16\u8f91\u5668\u6a21\u5757\u53ef\u8ba9\u60a8\u4ece IDE \u7f16\u8f91 C, C++ \u548c Fortran \u6e90\u6587\u4ef6\u3002\u5b83\u53ef\u5bf9\u8fd9\u4e9b\u6587\u4ef6\u8fdb\u884c\u8bed\u6cd5\u7a81\u51fa\u663e\u793a, \u6587\u5b57\u5339\u914d, \u4ee3\u7801\u7f29\u8fdb\u53ca\u5176\u4ed6\u57fa\u672c\u548c\u9ad8\u7ea7\u529f\u80fd\u3002
13.9
14.1 --- a/src/zh_CN/cnd/cnd-editor/cnd-editor/org/netbeans/modules/cnd/editor/fortran/Bundle_zh_CN.properties Tue Jun 26 07:22:38 2012 +0900
14.2 +++ b/src/zh_CN/cnd/cnd-editor/cnd-editor/org/netbeans/modules/cnd/editor/fortran/Bundle_zh_CN.properties Tue Jun 26 07:28:03 2012 +0900
14.3 @@ -45,9 +45,9 @@
14.4 ###################################################
14.5 # Indentation Engine properties
14.6
14.7 -Services/IndentEngine/org-netbeans-modules-cnd-editor-fortran-FIndentEngine.settings=Fortran \u7f29\u6392\u5f15\u64ce
14.8 -LAB_FortranIndentEngine=Fortran \u7f29\u6392\u5f15\u64ce
14.9 -HINT_FortranIndentEngine=Fortran \u7f29\u6392\u5f15\u64ce
14.10 +Services/IndentEngine/org-netbeans-modules-cnd-editor-fortran-FIndentEngine.settings=Fortran \u7f29\u8fdb\u5f15\u64ce
14.11 +LAB_FortranIndentEngine=Fortran \u7f29\u8fdb\u5f15\u64ce
14.12 +HINT_FortranIndentEngine=Fortran \u7f29\u8fdb\u5f15\u64ce
14.13 MSG_NoFortranReformatting=Fortran \u6587\u4ef6\u4e0d\u652f\u6301\u91cd\u65b0\u8bbe\u7f6e\u683c\u5f0f\u529f\u80fd
14.14 MSG_NoFortranShifting=Fortran \u6587\u4ef6\u4e0d\u652f\u6301 Shift \u529f\u80fd
14.15
15.1 --- a/src/zh_CN/cnd/cnd-editor/cnd-editor/org/netbeans/modules/cnd/editor/options/Bundle_zh_CN.properties Tue Jun 26 07:22:38 2012 +0900
15.2 +++ b/src/zh_CN/cnd/cnd-editor/cnd-editor/org/netbeans/modules/cnd/editor/options/Bundle_zh_CN.properties Tue Jun 26 07:28:03 2012 +0900
15.3 @@ -40,18 +40,18 @@
15.4
15.5 Tab_Name=\u683c\u5f0f\u5316\u6837\u5f0f
15.6 # Tab_Name_Mnemonic=S
15.7 -Filter_TabsAndIndents_name=\u5236\u8868\u7b26\u548c\u7f29\u6392
15.8 +Filter_TabsAndIndents_name=\u5236\u8868\u7b26\u548c\u7f29\u8fdb
15.9 Filter_Alignment_name=\u5bf9\u9f50
15.10 Filter_Braces_name=\u82b1\u62ec\u53f7
15.11 Filter_BlankLines_name=\u7a7a\u884c
15.12 Filter_Spaces_name=\u7a7a\u683c
15.13 Filter_All_name=\u683c\u5f0f\u5316\u6837\u5f0f
15.14
15.15 -LBL_TabsAndIndents=\u7f29\u6392
15.16 -HINT_TabsAndIndents=\u7f29\u6392
15.17 -LBL_indentSize=\u7f29\u6392\u5927\u5c0f
15.18 +LBL_TabsAndIndents=\u7f29\u8fdb
15.19 +HINT_TabsAndIndents=\u7f29\u8fdb
15.20 +LBL_indentSize=\u7f29\u8fdb\u5927\u5c0f
15.21 #LBL_indent-shift-width=Indent Size
15.22 -HINT_indentSize=\u6bcf\u6b21\u7f29\u6392\u7684\u7a7a\u683c\u6570
15.23 +HINT_indentSize=\u6bcf\u6b21\u7f29\u8fdb\u7684\u7a7a\u683c\u6570
15.24 #HINT_indent-shift-width=Number of spaces per indent
15.25 LBL_expandTabToSpaces=\u5c06\u5236\u8868\u7b26\u6269\u5c55\u4e3a\u7a7a\u683c
15.26 #LBL_expand-tabs=Expand Tabs to Spaces
15.27 @@ -61,22 +61,22 @@
15.28 #LBL_tab-size=Tab Size
15.29 HINT_tabSize=\u5236\u8868\u7b26\u5927\u5c0f
15.30 #HINT_tab-size=Tab Size
15.31 -LBL_statementContinuationIndent=\u8bed\u53e5\u8fde\u7eed\u7f29\u6392
15.32 -HINT_statementContinuationIndent=\u5bf9\u591a\u884c\u8bed\u53e5\u4e2d\u7684\u7b2c\u4e8c\u884c\u53ca\u540e\u7eed\u884c\u8fdb\u884c\u7f29\u6392
15.33 -LBL_constructorListContinuationIndent=\u6784\u9020\u51fd\u6570\u521d\u59cb\u5316\u7a0b\u5e8f\u5217\u8868\u8fde\u7eed\u7f29\u6392
15.34 -HINT_constructorListContinuationIndent=\u5bf9\u6784\u9020\u51fd\u6570\u521d\u59cb\u5316\u7a0b\u5e8f\u5217\u8868\u4e2d\u7684\u7b2c\u4e8c\u884c\u53ca\u540e\u7eed\u884c\u8fdb\u884c\u7f29\u6392
15.35 -LBL_indentPreprocessorDirectives=\u9884\u5904\u7406\u7a0b\u5e8f\u6307\u4ee4\u7f29\u6392
15.36 -HINT_indentPreprocessorDirectives=\u9884\u5904\u7406\u7a0b\u5e8f\u6307\u4ee4\u7f29\u6392
15.37 -LBL_indentVisibility=\u7f29\u6392\u53ef\u89c6\u6027
15.38 -HINT_indentVisibility=\u7f29\u6392\u53ef\u89c6\u6027
15.39 +LBL_statementContinuationIndent=\u8bed\u53e5\u8fde\u7eed\u7f29\u8fdb
15.40 +HINT_statementContinuationIndent=\u5bf9\u591a\u884c\u8bed\u53e5\u4e2d\u7684\u7b2c\u4e8c\u884c\u53ca\u540e\u7eed\u884c\u8fdb\u884c\u7f29\u8fdb
15.41 +LBL_constructorListContinuationIndent=\u6784\u9020\u51fd\u6570\u521d\u59cb\u5316\u7a0b\u5e8f\u5217\u8868\u8fde\u7eed\u7f29\u8fdb
15.42 +HINT_constructorListContinuationIndent=\u5bf9\u6784\u9020\u51fd\u6570\u521d\u59cb\u5316\u7a0b\u5e8f\u5217\u8868\u4e2d\u7684\u7b2c\u4e8c\u884c\u53ca\u540e\u7eed\u884c\u8fdb\u884c\u7f29\u8fdb
15.43 +LBL_indentPreprocessorDirectives=\u9884\u5904\u7406\u7a0b\u5e8f\u6307\u4ee4\u7f29\u8fdb
15.44 +HINT_indentPreprocessorDirectives=\u9884\u5904\u7406\u7a0b\u5e8f\u6307\u4ee4\u7f29\u8fdb
15.45 +LBL_indentVisibility=\u7f29\u8fdb\u53ef\u89c6\u6027
15.46 +HINT_indentVisibility=\u7f29\u8fdb\u53ef\u89c6\u6027
15.47 LBL_sharpAtStartLine=# \u4f4d\u4e8e\u8d77\u59cb\u884c
15.48 HINT_sharpAtStartLine=# \u4f4d\u4e8e\u8d77\u59cb\u884c
15.49 -LBL_indentNamespace=\u7f29\u6392\u540d\u79f0\u7a7a\u95f4
15.50 -HINT_indentNamespace=\u7f29\u6392\u540d\u79f0\u7a7a\u95f4
15.51 -LBL_indentCasesFromSwitch=\u5728 Switch \u4e2d\u8fdb\u884c Case \u8bed\u53e5\u7f29\u6392
15.52 -HINT_indentCasesFromSwitch=\u5728 switch \u4e2d\u8fdb\u884c Case \u8bed\u53e5\u7f29\u6392
15.53 -LBL_absoluteLabelIndent=\u7edd\u5bf9\u6807\u7b7e\u7f29\u6392
15.54 -HINT_absoluteLabelIndent=\u901a\u8fc7\u62ec\u8d77\u8bed\u53e5\u6765\u79fb\u52a8\u7b2c\u4e00\u5217\u6216\u7f29\u6392\u4e2d\u7684\u6807\u7b7e
15.55 +LBL_indentNamespace=\u7f29\u8fdb\u540d\u79f0\u7a7a\u95f4
15.56 +HINT_indentNamespace=\u7f29\u8fdb\u540d\u79f0\u7a7a\u95f4
15.57 +LBL_indentCasesFromSwitch=\u5728 Switch \u4e2d\u8fdb\u884c Case \u8bed\u53e5\u7f29\u8fdb
15.58 +HINT_indentCasesFromSwitch=\u5728 switch \u4e2d\u8fdb\u884c Case \u8bed\u53e5\u7f29\u8fdb
15.59 +LBL_absoluteLabelIndent=\u7edd\u5bf9\u6807\u7b7e\u7f29\u8fdb
15.60 +HINT_absoluteLabelIndent=\u901a\u8fc7\u62ec\u8d77\u8bed\u53e5\u6765\u79fb\u52a8\u7b2c\u4e00\u5217\u6216\u7f29\u8fdb\u4e2d\u7684\u6807\u7b7e
15.61 LBL_spaceKeepExtra=\u4fdd\u7559\u591a\u4f59\u7684\u7a7a\u683c
15.62 HINT_spaceKeepExtra=\u5982\u679c\u4e00\u884c\u5185\u6709\u591a\u4e2a\u7a7a\u683c, \u8bf7\u4fdd\u7559\u5b83\u4eec\u3002
15.63
15.64 @@ -249,8 +249,8 @@
15.65 HINT_Other=\u5176\u4ed6
15.66 LBL_addLeadingStarInComment=\u5728\u6ce8\u91ca\u4e2d\u6dfb\u52a0\u524d\u5bfc\u661f\u53f7
15.67 HINT_addLeadingStarInComment=\u5728\u6ce8\u91ca\u4e2d\u6dfb\u52a0\u524d\u5bfc\u661f\u53f7
15.68 -LBL_useBlockComment=\u63d2\u5165\u5757\u6ce8\u91ca
15.69 -HINT_useBlockComment=\u901a\u8fc7\u5f00\u542f/\u5173\u95ed\u6ce8\u91ca\u64cd\u4f5c\u4f7f\u7528\u5757\u6ce8\u91ca
15.70 +LBL_useBlockComment=\u5f00\u542f/\u5173\u95ed\u5757\u6ce8\u91ca
15.71 +HINT_useBlockComment=\u901a\u8fc7\u5f00\u542f/\u5173\u95ed\u6ce8\u91ca\u64cd\u4f5c\u4f7f\u7528\u5757\u6ce8\u91ca\u800c\u4e0d\u662f\u884c\u6ce8\u91ca
15.72 LBL_useInlineKeyword=\u63d2\u5165 'inline' \u5173\u952e\u5b57
15.73 HINT_useInlineKeyword=\u5728\u751f\u6210 getter \u548c setter \u65f6\u4f7f\u7528 'inline' \u5173\u952e\u5b57
15.74 LBL_Style_Name=\u6837\u5f0f(&S):
16.1 --- a/src/zh_CN/cnd/cnd-highlight/cnd-highlight/org/netbeans/modules/cnd/highlight/error/Bundle_zh_CN.properties Tue Jun 26 07:22:38 2012 +0900
16.2 +++ b/src/zh_CN/cnd/cnd-highlight/cnd-highlight/org/netbeans/modules/cnd/highlight/error/Bundle_zh_CN.properties Tue Jun 26 07:28:03 2012 +0900
16.3 @@ -44,3 +44,10 @@
16.4 HighlightProvider_DeclarationAfterUsage=\u5728\u58f0\u660e\u4e4b\u524d\u4f7f\u7528\u4e86{0}
16.5 HighlightProvider_FunDeclarationMissed=\u65b9\u6cd5{0}\u6ca1\u6709\u58f0\u660e
16.6
16.7 +#error hl
16.8 +Show-unresolved-identifier=\u7a81\u51fa\u663e\u793a\u672a\u89e3\u6790\u7684\u6807\u8bc6\u7b26(&G)
16.9 +Show-unresolved-identifier-AD=\u91c7\u7528\u7a81\u51fa\u663e\u793a\u683c\u5f0f\u663e\u793a\u627e\u4e0d\u5230\u58f0\u660e\u7684\u6807\u8bc6\u7b26
16.10 +
16.11 +Show-include-errors=\u7a81\u51fa\u663e\u793a\u672a\u89e3\u6790\u7684\u5305\u542b\u6587\u4ef6(&O)
16.12 +Show-include-errors-AD=\u91c7\u7528\u7a81\u51fa\u663e\u793a\u683c\u5f0f\u663e\u793a\u627e\u4e0d\u5230\u7684\u5305\u542b\u6587\u4ef6\u7684\u540d\u79f0
16.13 +
17.1 --- a/src/zh_CN/cnd/cnd-highlight/cnd-highlight/org/netbeans/modules/cnd/highlight/semantic/Bundle_zh_CN.properties Tue Jun 26 07:22:38 2012 +0900
17.2 +++ b/src/zh_CN/cnd/cnd-highlight/cnd-highlight/org/netbeans/modules/cnd/highlight/semantic/Bundle_zh_CN.properties Tue Jun 26 07:28:03 2012 +0900
17.3 @@ -40,3 +40,29 @@
17.4
17.5 UNUSED_VARIABLE_TOOLTIP=\u672a\u4f7f\u7528\u53d8\u91cf
17.6
17.7 +Show-inactive=\u7a81\u51fa\u663e\u793a\u4e0d\u6d3b\u52a8\u4ee3\u7801(&C)
17.8 +Show-inactive-AD=\u91c7\u7528\u7a81\u51fa\u663e\u793a\u683c\u5f0f\u663e\u793a\u4e0d\u6d3b\u52a8\u4ee3\u7801
17.9 +
17.10 +Show-fast-class-fields=\u7a81\u51fa\u663e\u793a\u7c7b\u5b57\u6bb5\u58f0\u660e(&S)
17.11 +Show-fast-class-fields-AD=\u91c7\u7528\u7a81\u51fa\u663e\u793a\u683c\u5f0f\u663e\u793a\u7c7b\u5b57\u6bb5\u58f0\u660e
17.12 +
17.13 +Show-class-fields=\u7a81\u51fa\u663e\u793a\u7c7b\u5b57\u6bb5(&F)
17.14 +Show-class-fields-AD=\u91c7\u7528\u7a81\u51fa\u663e\u793a\u683c\u5f0f\u663e\u793a\u7c7b\u5b57\u6bb5
17.15 +
17.16 +Show-fast-functions-names=\u7a81\u51fa\u663e\u793a\u51fd\u6570\u540d\u79f0\u58f0\u660e\u548c\u5b9a\u4e49(&D)
17.17 +Show-fast-functions-names-AD=\u91c7\u7528\u7a81\u51fa\u663e\u793a\u683c\u5f0f\u663e\u793a\u51fd\u6570\u540d\u79f0\u58f0\u660e\u548c\u5b9a\u4e49
17.18 +
17.19 +Show-functions-names=\u7a81\u51fa\u663e\u793a\u51fd\u6570\u540d(&N)
17.20 +Show-functions-names-AD=\u91c7\u7528\u7a81\u51fa\u663e\u793a\u683c\u5f0f\u663e\u793a\u51fd\u6570\u540d
17.21 +
17.22 +Show-macros=\u7a81\u51fa\u663e\u793a\u5b8f(&M)
17.23 +Show-macros-AD=\u91c7\u7528\u7a81\u51fa\u663e\u793a\u683c\u5f0f\u663e\u793a\u5b8f
17.24 +
17.25 +Show-typedefs=\u7a81\u51fa\u663e\u793a\u7c7b\u578b\u5b9a\u4e49(&L)
17.26 +Show-typedefs-AD=\u91c7\u7528\u7a81\u51fa\u663e\u793a\u683c\u5f0f\u663e\u793a\u7c7b\u578b\u5b9a\u4e49
17.27 +
17.28 +Show-unused-variables=\u7a81\u51fa\u663e\u793a\u672a\u4f7f\u7528\u7684\u53d8\u91cf(&V)
17.29 +Show-unused-variables-AD=\u91c7\u7528\u7a81\u51fa\u663e\u793a\u683c\u5f0f\u663e\u793a\u672a\u4f7f\u7528\u7684\u53d8\u91cf
17.30 +
17.31 +
17.32 +
18.1 --- a/src/zh_CN/cnd/cnd-highlight/cnd-highlight/org/netbeans/modules/cnd/highlight/semantic/options/Bundle_zh_CN.properties Tue Jun 26 07:22:38 2012 +0900
18.2 +++ b/src/zh_CN/cnd/cnd-highlight/cnd-highlight/org/netbeans/modules/cnd/highlight/semantic/options/Bundle_zh_CN.properties Tue Jun 26 07:28:03 2012 +0900
18.3 @@ -52,52 +52,6 @@
18.4 # EnableMacros_Mnemonic=s
18.5 EnableMacros_AD=\u7a81\u51fa\u663e\u793a\u5b8f
18.6
18.7 -Show-fast-class-fields=\u7a81\u51fa\u663e\u793a\u7c7b\u5b57\u6bb5\u58f0\u660e
18.8 -# Show-fast-class-fields-mnemonic=s
18.9 -Show-fast-class-fields-AD=\u91c7\u7528\u7a81\u51fa\u663e\u793a\u683c\u5f0f\u663e\u793a\u7c7b\u5b57\u6bb5\u58f0\u660e
18.10 -Show-class-fields=\u7a81\u51fa\u663e\u793a\u7c7b\u5b57\u6bb5
18.11 -# Show-class-fields-mnemonic=f
18.12 -Show-class-fields-AD=\u91c7\u7528\u7a81\u51fa\u663e\u793a\u683c\u5f0f\u663e\u793a\u7c7b\u5b57\u6bb5
18.13 -
18.14 -Show-fast-functions-names=\u7a81\u51fa\u663e\u793a\u51fd\u6570\u540d\u79f0\u58f0\u660e\u548c\u5b9a\u4e49
18.15 -# Show-fast-functions-names-mnemonic=d
18.16 -Show-fast-functions-names-AD=\u91c7\u7528\u7a81\u51fa\u663e\u793a\u683c\u5f0f\u663e\u793a\u51fd\u6570\u540d\u79f0\u58f0\u660e\u548c\u5b9a\u4e49
18.17 -Show-functions-names=\u7a81\u51fa\u663e\u793a\u51fd\u6570\u540d
18.18 -# Show-functions-names-mnemonic=n
18.19 -Show-functions-names-AD=\u91c7\u7528\u7a81\u51fa\u663e\u793a\u683c\u5f0f\u663e\u793a\u51fd\u6570\u540d
18.20 -
18.21 -Show-inactive=\u7a81\u51fa\u663e\u793a\u4e0d\u6d3b\u52a8\u4ee3\u7801
18.22 -# Show-inactive-mnemonic=c
18.23 -Show-inactive-AD=\u91c7\u7528\u7a81\u51fa\u663e\u793a\u683c\u5f0f\u663e\u793a\u4e0d\u6d3b\u52a8\u4ee3\u7801
18.24 -Show-macros=\u7a81\u51fa\u663e\u793a\u5b8f
18.25 -# Show-macros-mnemonic=m
18.26 -Show-macros-AD=\u91c7\u7528\u7a81\u51fa\u663e\u793a\u683c\u5f0f\u663e\u793a\u5b8f
18.27 -Show-typedefs=\u7a81\u51fa\u663e\u793a\u7c7b\u578b\u5b9a\u4e49
18.28 -# Show-typedefs-mnemonic=l
18.29 -Show-typedefs-AD=\u91c7\u7528\u7a81\u51fa\u663e\u793a\u683c\u5f0f\u663e\u793a\u7c7b\u578b\u5b9a\u4e49
18.30 -Show-unused-variables=\u7a81\u51fa\u663e\u793a\u672a\u4f7f\u7528\u7684\u53d8\u91cf
18.31 -# Show-unused-variables-mnemonic=v
18.32 -Show-unused-variables-AD=\u91c7\u7528\u7a81\u51fa\u663e\u793a\u683c\u5f0f\u663e\u793a\u672a\u4f7f\u7528\u7684\u53d8\u91cf
18.33 SemanticHighlightingOptionsPanel_AN=\u7a81\u51fa\u663e\u793a\u9009\u9879
18.34 SemanticHighlightingOptionsPanel_AD=\u5728\u6b64\u9762\u677f\u4e0a, \u53ef\u4ee5\u9009\u62e9\u5e94\u8be5\u5728\u7f16\u8f91\u5668\u4e2d\u91c7\u7528\u7a81\u51fa\u663e\u793a\u683c\u5f0f\u663e\u793a\u7684\u4ee3\u7801\u90e8\u5206\u3002\u8981\u66f4\u6539\u7a81\u51fa\u663e\u793a\u683c\u5f0f\u7684\u5916\u89c2, \u8bf7\u53c2\u89c1\u201c\u9009\u9879 > \u7f16\u8f91\u5668 > \u683c\u5f0f\u8bbe\u7f6e\u201d\u9762\u677f\u3002
18.35
18.36 -#error hl
18.37 -Show-syntax-error=\u7a81\u51fa\u663e\u793a\u8bed\u6cd5\u9519\u8bef
18.38 -# Show-syntax-error-mnemonic=r
18.39 -Show-syntax-error-AD=\u91c7\u7528\u7a81\u51fa\u663e\u793a\u683c\u5f0f\u663e\u793a\u8bed\u6cd5\u9519\u8bef
18.40 -Show-unresolved-identifier=\u7a81\u51fa\u663e\u793a\u672a\u89e3\u6790\u7684\u6807\u8bc6\u7b26
18.41 -# Show-unresolved-identifier-mnemonic=g
18.42 -Show-unresolved-identifier-AD=\u91c7\u7528\u7a81\u51fa\u663e\u793a\u683c\u5f0f\u663e\u793a\u627e\u4e0d\u5230\u58f0\u660e\u7684\u6807\u8bc6\u7b26
18.43 -Show-include-errors=\u7a81\u51fa\u663e\u793a\u672a\u89e3\u6790\u7684\u5305\u542b\u6587\u4ef6
18.44 -# Show-include-errors-mnemonic=o
18.45 -Show-include-errors-AD=\u91c7\u7528\u7a81\u51fa\u663e\u793a\u683c\u5f0f\u663e\u793a\u627e\u4e0d\u5230\u7684\u5305\u542b\u6587\u4ef6\u7684\u540d\u79f0
18.46 -
18.47 -#reparsing strategy
18.48 -Show-reparse-on-document-changed=\u91cd\u65b0\u89e3\u6790\u6587\u4ef6\u66f4\u6539
18.49 -# Show-reparse-on-document-changed-mnemonic=p
18.50 -Show-reparse-on-document-changed-AD=<html>\u5728\u7f16\u8f91\u6587\u4ef6\u65f6, \u6bcf\u6b21\u66f4\u6539\u540e\u90fd\u91cd\u65b0\u89e3\u6790\u6587\u4ef6\u4ee5\u68c0\u67e5\u8bed\u6cd5, <br>\u5bf9\u4e8e\u5927\u578b\u6587\u4ef6, \u8fd9\u4f1a\u5bfc\u81f4\u4e00\u5b9a\u7684\u5ef6\u8fdf\u3002<br>\u4ec5\u5f53\u4fdd\u5b58\u6587\u4ef6\u540e\u624d\u7981\u6b62\u91cd\u65b0\u89e3\u6790\u3002<br>\u7981\u6b62\u91cd\u65b0\u89e3\u6790\u53ef\u80fd\u4f1a\u5bfc\u81f4\u7a81\u51fa\u663e\u793a\u4e34\u65f6\u6027\u7684\u9519\u8bef\u3002</html>
18.51 -
18.52 -Show-overrides-annotations=\u663e\u793a\u8986\u76d6\u7684\u6807\u6ce8
18.53 -# Show-overrides-annotations-mnemonic=e
18.54 -Show-overrides-annotations-AD=\u663e\u793a\u8986\u76d6\u65b9\u6cd5\u7684\u6807\u6ce8
18.55 -
19.1 --- a/src/zh_CN/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/api/configurations/Bundle_zh_CN.properties Tue Jun 26 07:22:38 2012 +0900
19.2 +++ b/src/zh_CN/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/api/configurations/Bundle_zh_CN.properties Tue Jun 26 07:28:03 2012 +0900
19.3 @@ -131,6 +131,7 @@
19.4 CPPStandardHint=C++11 \u6216 C++98 C++ \u6807\u51c6
19.5 STANDARD_DEFAULT=<\u9ed8\u8ba4>
19.6 STANDARD_INHERITED=<\u7ee7\u627f>
19.7 +STANDARD_INHERITED_WITH_VALUE=<\u7ee7\u627f> ({0})
19.8 STANDARD_CPP98=C++98
19.9 STANDARD_CPP11=C++11
19.10 CStandardTxt=C \u6807\u51c6
20.1 --- a/src/zh_CN/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/wizards/Bundle_zh_CN.properties Tue Jun 26 07:22:38 2012 +0900
20.2 +++ b/src/zh_CN/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/wizards/Bundle_zh_CN.properties Tue Jun 26 07:28:03 2012 +0900
20.3 @@ -329,7 +329,7 @@
20.4 SelectModeLabelText=\u9009\u62e9\u914d\u7f6e\u6a21\u5f0f(&M)\:
20.5 SimpleModeButtonText=\u81ea\u52a8 (\u4f7f\u7528{0})(&A)
20.6 AdvancedModeButtonText=\u5b9a\u5236(&C)
20.7 -SelectModeSimpleInstructionText= \u9009\u62e9\u201c\u81ea\u52a8\u201d\u5141\u8bb8\u81ea\u52a8\u914d\u7f6e\u6e90\u6587\u4ef6\u5939\u7684\u73b0\u6709 makefile \u6216\u914d\u7f6e\u811a\u672c\u4e2d\u7684\u9879\u76ee\u8bbe\u7f6e\u3002\u5982\u679c\u6e90\u6587\u4ef6\u5939\u4e2d\u6ca1\u6709 makefile \u6216\u914d\u7f6e\u811a\u672c, \u6216\u8005\u8981\u5728\u521b\u5efa\u9879\u76ee\u4e4b\u524d\u67e5\u770b\u6216\u66f4\u6539\u9879\u76ee\u8bbe\u7f6e, \u8bf7\u9009\u62e9\u201c\u5b9a\u5236\u201d\u3002<p><b>\u91cd\u8981\u4fe1\u606f: </b><br>\u5c06\u8986\u76d6\u9879\u76ee\u6587\u4ef6\u5939\u4e2d\u7684 {0} \u4e2a\u5df2\u7f16\u8bd1\u4e8c\u8fdb\u5236\u6587\u4ef6\u3002\u8981\u7981\u7528\u6b64\u64cd\u4f5c, \u8bf7\u9009\u62e9\u201c\u5b9a\u5236\u201d\u6a21\u5f0f, \u7136\u540e\u53d6\u6d88\u9009\u62e9\u201c\u5b8c\u6210\u540e\u6e05\u7406\u5e76\u6784\u5efa\u201d\u3002
20.8 +SelectModeSimpleInstructionText= \u9009\u62e9\u201c\u81ea\u52a8\u201d\u5141\u8bb8\u81ea\u52a8\u914d\u7f6e\u6e90\u6587\u4ef6\u5939\u7684\u73b0\u6709 makefile \u6216\u914d\u7f6e\u811a\u672c\u4e2d\u7684\u9879\u76ee\u8bbe\u7f6e\u3002\u5982\u679c\u6e90\u6587\u4ef6\u5939\u4e2d\u6ca1\u6709 makefile \u6216\u914d\u7f6e\u811a\u672c, \u6216\u8005\u8981\u5728\u521b\u5efa\u9879\u76ee\u4e4b\u524d\u67e5\u770b\u6216\u66f4\u6539\u9879\u76ee\u8bbe\u7f6e, \u8bf7\u9009\u62e9\u201c\u5b9a\u5236\u201d\u3002<p><b>\u91cd\u8981\u4fe1\u606f: </b><br>{0} \u5c06\u8986\u76d6\u9879\u76ee\u6587\u4ef6\u5939\u4e2d\u5df2\u7f16\u8bd1\u7684\u4e8c\u8fdb\u5236\u6587\u4ef6\u3002\u8981\u7981\u7528\u6b64\u64cd\u4f5c, \u8bf7\u9009\u62e9\u201c\u5b9a\u5236\u201d\u6a21\u5f0f, \u7136\u540e\u53d6\u6d88\u9009\u62e9\u201c\u5b8c\u6210\u540e\u6e05\u7406\u5e76\u6784\u5efa\u201d\u3002
20.9 SelectModeAdvancedInstructionText=\u5728\u201c\u5b9a\u5236\u201d\u6a21\u5f0f\u4e0b, \u53ef\u4ee5\u67e5\u770b\u548c\u66f4\u6539\u7528\u4e8e\u914d\u7f6e\u9879\u76ee\u7684\u8bbe\u7f6e\u3002
20.10 SELECT_MODE_SOURCES_FOLDER=\u6307\u5b9a\u5305\u542b\u73b0\u6709\u6e90\u4ee3\u7801\u7684\u6587\u4ef6\u5939(&E):
20.11 SELECT_MODE_PROJECT_FOLDER=\u6307\u5b9a\u7528\u6765\u5b58\u50a8\u9879\u76ee\u5143\u6570\u636e\u7684\u6587\u4ef6\u5939(&P)
20.12 @@ -423,3 +423,5 @@
20.13 MSG_LocalProjectAlreadyExists=\u672c\u5730\u9879\u76ee{0}\u5df2\u5b58\u5728
20.14 SelectBinaryPanelVisual.cancelSearch.text=\u505c\u6b62\u641c\u7d22(&O)
20.15
20.16 +ERROR_FIND_PROJECT_CREATOR=\u521b\u5efa\u8fdc\u7a0b\u9879\u76ee\u9700\u8981\u4e3b\u673a{0}\u4e0a\u5177\u6709 Oracle Solaris Studio 12.3 \u6216\u66f4\u9ad8\u7248\u672c\u3002
20.17 +
21.1 --- a/src/zh_CN/cnd/cnd-modelimpl/cnd-modelimpl/org/netbeans/modules/cnd/modelimpl/csm/core/Bundle_zh_CN.properties Tue Jun 26 07:22:38 2012 +0900
21.2 +++ b/src/zh_CN/cnd/cnd-modelimpl/cnd-modelimpl/org/netbeans/modules/cnd/modelimpl/csm/core/Bundle_zh_CN.properties Tue Jun 26 07:28:03 2012 +0900
21.3 @@ -41,3 +41,8 @@
21.4 #ProjectDisplayName={0} [{1}]
21.5 #ProjectHtmlDisplayName={0} <font color=''!controlShadow''>[{1}]
21.6
21.7 +#reparsing strategy
21.8 +Show-reparse-on-document-changed=\u91cd\u65b0\u89e3\u6790\u6587\u4ef6\u66f4\u6539(&P)
21.9 +Show-reparse-on-document-changed-AD=<html>\u5728\u7f16\u8f91\u6587\u4ef6\u65f6, \u6bcf\u6b21\u66f4\u6539\u540e\u90fd\u91cd\u65b0\u89e3\u6790\u6587\u4ef6\u4ee5\u68c0\u67e5\u8bed\u6cd5, <br>\u5bf9\u4e8e\u5927\u578b\u6587\u4ef6, \u8fd9\u4f1a\u5bfc\u81f4\u4e00\u5b9a\u7684\u5ef6\u8fdf\u3002<br>\u4ec5\u5f53\u4fdd\u5b58\u6587\u4ef6\u540e\u624d\u7981\u6b62\u91cd\u65b0\u89e3\u6790\u3002<br>\u7981\u6b62\u91cd\u65b0\u89e3\u6790\u53ef\u80fd\u4f1a\u5bfc\u81f4\u7a81\u51fa\u663e\u793a\u4e34\u65f6\u6027\u7684\u9519\u8bef\u3002</html>
21.10 +
21.11 +
22.1 --- a/src/zh_CN/cnd/cnd-modelimpl/cnd-modelimpl/org/netbeans/modules/cnd/modelimpl/syntaxerr/Bundle_zh_CN.properties Tue Jun 26 07:22:38 2012 +0900
22.2 +++ b/src/zh_CN/cnd/cnd-modelimpl/cnd-modelimpl/org/netbeans/modules/cnd/modelimpl/syntaxerr/Bundle_zh_CN.properties Tue Jun 26 07:28:03 2012 +0900
22.3 @@ -42,3 +42,7 @@
22.4 MSG_PARSER_ERROR=\u672a\u77e5\u7684\u89e3\u6790\u5668\u9519\u8bef
22.5 MSG_UNEXPECTED_EOF=\u6587\u4ef6\u610f\u5916\u7ed3\u675f
22.6
22.7 +#error hl
22.8 +Show-syntax-error=\u7a81\u51fa\u663e\u793a\u8bed\u6cd5\u9519\u8bef(&R)
22.9 +Show-syntax-error-AD=\u91c7\u7528\u7a81\u51fa\u663e\u793a\u683c\u5f0f\u663e\u793a\u8bed\u6cd5\u9519\u8bef
22.10 +
23.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
23.2 +++ b/src/zh_CN/cnd/cnd-navigation/cnd-navigation/org/netbeans/modules/cnd/navigation/docview/Bundle_zh_CN.properties Tue Jun 26 07:28:03 2012 +0900
23.3 @@ -0,0 +1,4 @@
23.4 +CTL_DocViewTopComponent=C/C++ \u6587\u6863
23.5 +CTL_ShowDocViewAction=C/C++ \u6587\u6863
23.6 +HINT_DocViewTopComponent=C/C++ \u6587\u6863\u7a97\u53e3\u663e\u793a\u4f4d\u4e8e\u8131\u5b57\u53f7\u4e0b\u9762\u7684\u5143\u7d20\u7684\u6587\u6863\u3002
23.7 +
24.1 --- a/src/zh_CN/cnd/cnd-navigation/cnd-navigation/org/netbeans/modules/cnd/navigation/hierarchy/Bundle_zh_CN.properties Tue Jun 26 07:22:38 2012 +0900
24.2 +++ b/src/zh_CN/cnd/cnd-navigation/cnd-navigation/org/netbeans/modules/cnd/navigation/hierarchy/Bundle_zh_CN.properties Tue Jun 26 07:28:03 2012 +0900
24.3 @@ -42,6 +42,7 @@
24.4
24.5 CTL_HierarchyAction=\u5206\u5c42\u7ed3\u6784(&H)
24.6 CTL_HierarchyTopComponent=\u5206\u5c42\u7ed3\u6784
24.7 +CTL_HierarchyAction.warning=\u672a\u6253\u5f00\u4efb\u4f55 C/C++ \u9879\u76ee
24.8 HINT_HierarchyTopComponent=C/C++ \u5206\u5c42\u7ed3\u6784\u89c6\u56fe
24.9 HINT_TypeHierarchyTopComponent=C++ \u7c7b\u578b\u5206\u5c42\u7ed3\u6784\u89c6\u56fe
24.10 HINT_IncludeHierarchyTopComponent=C/C++ \u5305\u542b\u5206\u5c42\u7ed3\u6784\u89c6\u56fe
25.1 --- a/src/zh_CN/cnd/cnd-navigation/cnd-navigation/org/netbeans/modules/cnd/navigation/macroview/Bundle_zh_CN.properties Tue Jun 26 07:22:38 2012 +0900
25.2 +++ b/src/zh_CN/cnd/cnd-navigation/cnd-navigation/org/netbeans/modules/cnd/navigation/macroview/Bundle_zh_CN.properties Tue Jun 26 07:28:03 2012 +0900
25.3 @@ -42,6 +42,7 @@
25.4
25.5 CTL_MacroExpansionAction=\u5b8f\u6269\u5c55(&X)
25.6 CTL_MacroExpansionTopComponent=\u5b8f\u6269\u5c55
25.7 +CTL_MacroExpansionAction.warning=\u672a\u6253\u5f00\u4efb\u4f55 C/C++ \u9879\u76ee
25.8 HINT_MacroExpansionTopComponent=C/C++ \u5b8f\u6269\u5c55\u89c6\u56fe
25.9 #HINT_TypeHierarchyTopComponent=C++ Type Hierarchy view
25.10 #HINT_IncludeHierarchyTopComponent=C/C++ Include Hierarchy view
26.1 --- a/src/zh_CN/cnd/cnd-navigation/cnd-navigation/org/netbeans/modules/cnd/navigation/overrides/Bundle_zh_CN.properties Tue Jun 26 07:22:38 2012 +0900
26.2 +++ b/src/zh_CN/cnd/cnd-navigation/cnd-navigation/org/netbeans/modules/cnd/navigation/overrides/Bundle_zh_CN.properties Tue Jun 26 07:28:03 2012 +0900
26.3 @@ -62,3 +62,6 @@
26.4 LAB_ExtendedIsSpecializedAnnotation=\u662f\u7279\u5316\u7684\u8986\u76d6\u6807\u6ce8\u548c/\u6216\u5df2\u8986\u76d6
26.5 LAB_ExtendedSpecializesAnnotation=\u5c06\u8986\u76d6\u7684\u6a21\u677f\u6807\u6ce8\u7279\u5316\u548c/\u6216\u5df2\u8986\u76d6
26.6
26.7 +Show-overrides-annotations=\u663e\u793a\u8986\u76d6\u7684\u6807\u6ce8(&E)
26.8 +Show-overrides-annotations-AD=\u663e\u793a\u8986\u76d6\u65b9\u6cd5\u7684\u6807\u6ce8
26.9 +
27.1 --- a/src/zh_CN/cnd/cnd-qnavigator/cnd-qnavigator/org/netbeans/modules/cnd/qnavigator/navigator/Bundle_zh_CN.properties Tue Jun 26 07:22:38 2012 +0900
27.2 +++ b/src/zh_CN/cnd/cnd-qnavigator/cnd-qnavigator/org/netbeans/modules/cnd/qnavigator/navigator/Bundle_zh_CN.properties Tue Jun 26 07:28:03 2012 +0900
27.3 @@ -66,6 +66,6 @@
27.4 ExpandAll=\u5168\u90e8\u5c55\u5f00
27.5 FilterSubmenu=\u79cd\u7c7b\u8fc7\u6ee4\u5668
27.6
27.7 -StandAloneFile=\u5177\u6709\u6709\u9650\u4ee3\u7801\u5e2e\u52a9\u7684\u6587\u4ef6
27.8 +StandAloneFile=\u6709\u9650\u4ee3\u7801\u5e2e\u52a9 (\u65e0\u5173\u8054\u9879\u76ee)
27.9 UnopenedProject=\u53cc\u51fb\u4ee5\u6253\u5f00\u5305\u542b\u9879\u76ee ({0})
27.10
28.1 --- a/src/zh_CN/cnd/cnd-refactoring/cnd-refactoring/org/netbeans/modules/cnd/refactoring/ui/Bundle_zh_CN.properties Tue Jun 26 07:22:38 2012 +0900
28.2 +++ b/src/zh_CN/cnd/cnd-refactoring/cnd-refactoring/org/netbeans/modules/cnd/refactoring/ui/Bundle_zh_CN.properties Tue Jun 26 07:28:03 2012 +0900
28.3 @@ -441,5 +441,4 @@
28.4 # ACSD_inlineMethods=N/A
28.5 DSC_ElNotAvail=<html><font style=\"color: red\"><br>\u8981\u91cd\u6784\u7684\u539f\u59cb\u5143\u7d20\u4e0d\u53ef\u7528\u3002<br>\u65e0\u6cd5\u6536\u96c6{0}\u7684\u7528\u4f8b\u3002
28.6 ChangeParametersPanel.defaultsOnlyInFunDeclaration.text=\u4ec5\u5728\u58f0\u660e\u4e2d\u4f7f\u7528\u65b0\u53c2\u6570\u9ed8\u8ba4\u503c(&N)
28.7 -EncapsulateFieldPanel.jAddInlineKeyword.text=\u6dfb\u52a0 "inline" \u5173\u952e\u5b57
28.8
29.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
29.2 +++ b/src/zh_CN/cnd/cnd-remote-projectui/cnd-remote-projectui/org/netbeans/modules/cnd/remote/projectui/Bundle_zh_CN.properties Tue Jun 26 07:28:03 2012 +0900
29.3 @@ -0,0 +1,5 @@
29.4 +OpenIDE-Module-Display-Category=C/C++
29.5 +OpenIDE-Module-Long-Description=\u521b\u5efa\u8fdc\u7a0b\u9879\u76ee\u5411\u5bfc\u548c\u8fdc\u7a0b\u5de5\u5177\u680f
29.6 +OpenIDE-Module-Name=C/C++ \u8fdc\u7a0b\u9879\u76ee UI
29.7 +OpenIDE-Module-Short-Description=\u521b\u5efa\u8fdc\u7a0b\u9879\u76ee\u5411\u5bfc\u548c\u8fdc\u7a0b\u5de5\u5177\u680f
29.8 +
30.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
30.2 +++ b/src/zh_CN/cnd/cnd-remote-projectui/cnd-remote-projectui/org/netbeans/modules/cnd/remote/projectui/actions/Bundle_zh_CN.properties Tue Jun 26 07:28:03 2012 +0900
30.3 @@ -0,0 +1,28 @@
30.4 +OpenRemoteProjectAction.submenu.title=\u6253\u5f00\u8fdc\u7a0b C/C++ \u9879\u76ee
30.5 +ConnectionStatusAction.submenu.title=\u8fde\u63a5\u72b6\u6001
30.6 +
30.7 +# {0} is host display name
30.8 +#OpenRemoteProjectAction.item.title={0} ...
30.9 +
30.10 +LBL_ManagePlatforms_Name=\u7ba1\u7406\u4e3b\u673a...
30.11 +LBL_Remote=\u8fdc\u7a0b(&O)
30.12 +
30.13 +OpenRemoteFileAction.submenu.title=\u6253\u5f00\u6587\u4ef6\u81ea
30.14 +
30.15 +# {0} is host display name
30.16 +#OpenRemoteFileAction.item.title={0} ...
30.17 +
30.18 +ErrorConnectingHost=\u8fde\u63a5\u4e3b\u673a{0}\u65f6\u51fa\u9519: {1}
30.19 +OpenProjectButtonText=\u6253\u5f00\u9879\u76ee
30.20 +OpenProjectTitle=\u6253\u5f00{0}\u4e2d\u7684\u9879\u76ee
30.21 +
30.22 +OpenFileTitle=\u6253\u5f00{0}\u4e2d\u7684\u6587\u4ef6
30.23 +OpenFileButtonText=\u6253\u5f00
30.24 +Menu/Help/RemoteDevelopmentItem=C/C++ \u8fdc\u7a0b\u5f00\u53d1
30.25 +
30.26 +NewRemoteProjectAction.submenu.title=\u521b\u5efa\u8fdc\u7a0b C/C++ \u9879\u76ee
30.27 +
30.28 +# {0} is host display name
30.29 +#NewRemoteProjectAction.item.title={0} ...
30.30 +
30.31 +
31.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
31.2 +++ b/src/zh_CN/cnd/cnd-remote-projectui/cnd-remote-projectui/org/netbeans/modules/cnd/remote/projectui/toolbar/Bundle_zh_CN.properties Tue Jun 26 07:28:03 2012 +0900
31.3 @@ -0,0 +1,3 @@
31.4 +RemoteHostAction.label=\u9009\u62e9\u9ed8\u8ba4\u4e3b\u673a
31.5 +ActiveHost.customize=\u7ba1\u7406\u4e3b\u673a
31.6 +
32.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
32.2 +++ b/src/zh_CN/cnd/cnd-remote-projectui/cnd-remote-projectui/org/netbeans/modules/cnd/remote/projectui/wizard/cnd/Bundle_zh_CN.properties Tue Jun 26 07:28:03 2012 +0900
32.3 @@ -0,0 +1,97 @@
32.4 +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
32.5 +#
32.6 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
32.7 +#
32.8 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
32.9 +# Other names may be trademarks of their respective owners.
32.10 +#
32.11 +# The contents of this file are subject to the terms of either the GNU
32.12 +# General Public License Version 2 only ("GPL") or the Common
32.13 +# Development and Distribution License("CDDL") (collectively, the
32.14 +# "License"). You may not use this file except in compliance with the
32.15 +# License. You can obtain a copy of the License at
32.16 +# http://www.netbeans.org/cddl-gplv2.html
32.17 +# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
32.18 +# specific language governing permissions and limitations under the
32.19 +# License. When distributing the software, include this License Header
32.20 +# Notice in each file and include the License file at
32.21 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
32.22 +# particular file as subject to the "Classpath" exception as provided
32.23 +# by Oracle in the GPL Version 2 section of the License file that
32.24 +# accompanied this code. If applicable, add the following below the
32.25 +# License Header, with the fields enclosed by brackets [] replaced by
32.26 +# your own identifying information:
32.27 +# "Portions Copyrighted [year] [name of copyright owner]"
32.28 +#
32.29 +# Contributor(s):
32.30 +#
32.31 +# The Original Software is NetBeans. The Initial Developer of the Original
32.32 +# Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
32.33 +# Microsystems, Inc. All Rights Reserved.
32.34 +#
32.35 +# If you wish your version of this file to be governed by only the CDDL
32.36 +# or only the GPL Version 2, indicate your decision by adding
32.37 +# "[Contributor] elects to include this software in this distribution
32.38 +# under the [CDDL or GPL Version 2] license." If you do not indicate a
32.39 +# single choice of license, a recipient has the option to distribute
32.40 +# your version of this file under either the CDDL, the GPL Version 2 or
32.41 +# to extend the choice of license to its licensees as provided above.
32.42 +# However, if you add GPL Version 2 code and therefore, elected the GPL
32.43 +# Version 2 license, then the option applies only if the new code is
32.44 +# made subject to such option by the copyright holder.
32.45 +
32.46 +
32.47 +# Template Folders
32.48 +Templates/Project/Native=C/C++
32.49 +Templates/Project/Samples/Native=C/C++
32.50 +Templates/Project/Samples/Native/Applications=\u5e94\u7528\u7a0b\u5e8f
32.51 +Templates/Project/Samples/Native/Packaging=\u6253\u5305
32.52 +
32.53 +# Templates
32.54 +Templates/Project/Native/makefile.xml=\u57fa\u4e8e\u73b0\u6709\u6e90\u4ee3\u7801\u7684 C/C++ \u9879\u76ee
32.55 +Templates/Project/Native/binary.xml=\u57fa\u4e8e\u4e8c\u8fdb\u5236\u6587\u4ef6\u7684 C/C++ \u9879\u76ee
32.56 +Templates/Project/Native/newFullRemote.xml=\u57fa\u4e8e\u8fdc\u7a0b\u73b0\u6709\u6e90\u4ee3\u7801\u7684 C/C++ \u9879\u76ee
32.57 +Templates/Project/Native/newApplication.xml=C/C++ \u5e94\u7528\u7a0b\u5e8f
32.58 +Templates/Project/Native/newDynamicLibrary.xml=C/C++ \u52a8\u6001\u5e93
32.59 +Templates/Project/Native/newStaticLibrary.xml=C/C++ \u9759\u6001\u5e93
32.60 +Templates/Project/Native/newQtApplication.xml=C/C++ Qt \u5e94\u7528\u7a0b\u5e8f
32.61 +Templates/Project/Native/newQtDynamicLibrary.xml=C/C++ Qt \u52a8\u6001\u5e93
32.62 +Templates/Project/Native/newQtStaticLibrary.xml=C/C++ Qt \u9759\u6001\u5e93
32.63 +Templates/Project/Native/newDBApplication.xml=C/C++ \u6570\u636e\u5e93\u5e94\u7528\u7a0b\u5e8f
32.64 +Templates/Project/Samples/Native/Arguments=\u53c2\u6570
32.65 +Templates/Project/Samples/Native/Welcome=\u6b22\u8fce\u4f7f\u7528
32.66 +Templates/Project/Samples/Native/InputOutput=\u8f93\u5165\u8f93\u51fa\u5e94\u7528\u7a0b\u5e8f
32.67 +Templates/Project/Samples/Native/MP=\u591a\u5904\u7406\u5e94\u7528\u7a0b\u5e8f
32.68 +Templates/Project/Samples/Native/SubProjects=\u5b50\u9879\u76ee\u5e94\u7528\u7a0b\u5e8f
32.69 +Templates/Project/Samples/Native/Quote=\u62a5\u4ef7
32.70 +Templates/Project/Samples/Native/Freeway=\u9ad8\u901f\u516c\u8def\u6a21\u62df\u7a0b\u5e8f
32.71 +Templates/Project/Samples/Native/LexYacc=\u57fa\u4e8e Lex/Yacc \u7684\u5e94\u7528\u7a0b\u5e8f
32.72 +Templates/Project/Samples/Native/Fractal=\u5206\u5f62
32.73 +Templates/Project/Samples/Native/Hello=Fortran Hello World \u5e94\u7528\u7a0b\u5e8f
32.74 +Templates/Project/Samples/Native/Pi=Pi
32.75 +Templates/Project/Samples/Native/HelloQtWorld=Hello Qt World
32.76 +Templates/Project/Samples/Native/ProfilingDemo=\u6027\u80fd\u5206\u6790\u6f14\u793a
32.77 +Templates/Project/Samples/Native/RaceDetectionDemo=\u4e89\u7528\u68c0\u6d4b\u6f14\u793a
32.78 +
32.79 +NativeMakefileNameACSD=\u521b\u5efa\u57fa\u4e8e\u73b0\u6709\u4ee3\u7801\u9879\u76ee\u7684\u65b0\u9879\u76ee
32.80 +NativeBinaryNameACSD=\u521b\u5efa\u57fa\u4e8e\u4e8c\u8fdb\u5236\u6587\u4ef6\u7684\u65b0\u9879\u76ee
32.81 +NativeFullRemoteNameACSD=\u521b\u5efa\u57fa\u4e8e\u8fdc\u7a0b\u73b0\u6709\u4ee3\u7801\u7684\u65b0\u9879\u76ee
32.82 +NativeNewLibraryACSD=\u521b\u5efa\u65b0\u7684\u5e94\u7528\u7a0b\u5e8f\u9879\u76ee
32.83 +NativeNewDynamicLibraryACSD=\u521b\u5efa\u65b0\u7684\u52a8\u6001\u5e93\u9879\u76ee
32.84 +NativeNewStaticLibraryACSD=\u521b\u5efa\u65b0\u7684\u9759\u6001\u5e93\u9879\u76ee
32.85 +NativeNewQtApplicationACSD=\u521b\u5efa\u65b0\u7684 Qt \u5e94\u7528\u7a0b\u5e8f\u9879\u76ee
32.86 +NativeNewQtDynamicLibraryACSD=\u521b\u5efa\u65b0\u7684 Qt \u52a8\u6001\u5e93\u9879\u76ee
32.87 +NativeNewQtStaticLibraryACSD=\u521b\u5efa\u65b0\u7684 Qt \u9759\u6001\u5e93\u9879\u76ee
32.88 +NativeNewDBApplicationACSD=\u521b\u5efa\u65b0\u7684\u6570\u636e\u5e93\u5e94\u7528\u7a0b\u5e8f\u9879\u76ee
32.89 +
32.90 +SAMPLE_PROJECT=\u6837\u4f8b\u9879\u76ee -
32.91 +SAMPLE_PROJECT_ACSD=\u521b\u5efa\u65b0\u7684\u6837\u4f8b\u9879\u76ee
32.92 +
32.93 +# NewMakeProjectWizardIterator
32.94 +LAB_IteratorName={0}/{1}
32.95 +
32.96 +ERROR_FIND_PROJECT_CREATOR=\u5728\u4e3b\u673a{0}\u4e0a\u627e\u4e0d\u5230 Oracle Solaris Studio 12.3 \u6216\u66f4\u9ad8\u7248\u672c\u3002
32.97 +ERROR_RUN_PROJECT_CREATOR=\u65e0\u6cd5\u5728\u4e3b\u673a{0}\u4e0a\u8fd0\u884c Oracle Solaris Studio 12.3 \u6216\u66f4\u9ad8\u7248\u672c\u3002
32.98 +RUN_PROJECT_CREATOR=\u6b63\u5728\u4e3b\u673a{0}\u4e0a\u521b\u5efa\u9879\u76ee...
32.99 +CONFIGURING_PROJECT_CREATOR=\u6b63\u5728\u4e3b\u673a{0}\u4e0a\u914d\u7f6e\u9879\u76ee...
32.100 +
33.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
33.2 +++ b/src/zh_CN/cnd/cnd-remote-projectui/cnd-remote-projectui/org/netbeans/modules/cnd/remote/projectui/wizard/ide/Bundle_zh_CN.properties Tue Jun 26 07:28:03 2012 +0900
33.3 @@ -0,0 +1,151 @@
33.4 +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
33.5 +#
33.6 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
33.7 +#
33.8 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
33.9 +# Other names may be trademarks of their respective owners.
33.10 +#
33.11 +# The contents of this file are subject to the terms of either the GNU
33.12 +# General Public License Version 2 only ("GPL") or the Common
33.13 +# Development and Distribution License("CDDL") (collectively, the
33.14 +# "License"). You may not use this file except in compliance with the
33.15 +# License. You can obtain a copy of the License at
33.16 +# http://www.netbeans.org/cddl-gplv2.html
33.17 +# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
33.18 +# specific language governing permissions and limitations under the
33.19 +# License. When distributing the software, include this License Header
33.20 +# Notice in each file and include the License file at
33.21 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
33.22 +# particular file as subject to the "Classpath" exception as provided
33.23 +# by Oracle in the GPL Version 2 section of the License file that
33.24 +# accompanied this code. If applicable, add the following below the
33.25 +# License Header, with the fields enclosed by brackets [] replaced by
33.26 +# your own identifying information:
33.27 +# "Portions Copyrighted [year] [name of copyright owner]"
33.28 +#
33.29 +# Contributor(s):
33.30 +#
33.31 +# The Original Software is NetBeans. The Initial Developer of the Original
33.32 +# Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
33.33 +# Microsystems, Inc. All Rights Reserved.
33.34 +#
33.35 +# If you wish your version of this file to be governed by only the CDDL
33.36 +# or only the GPL Version 2, indicate your decision by adding
33.37 +# "[Contributor] elects to include this software in this distribution
33.38 +# under the [CDDL or GPL Version 2] license." If you do not indicate a
33.39 +# single choice of license, a recipient has the option to distribute
33.40 +# your version of this file under either the CDDL, the GPL Version 2 or
33.41 +# to extend the choice of license to its licensees as provided above.
33.42 +# However, if you add GPL Version 2 code and therefore, elected the GPL
33.43 +# Version 2 license, then the option applies only if the new code is
33.44 +# made subject to such option by the copyright holder.
33.45 +
33.46 +#ProjectOpenListSettings
33.47 +TXT_SelectTemplate=\u9009\u62e9\u9879\u76ee
33.48 +CTL_Categories=\u7c7b\u522b(&C)\:
33.49 +CTL_Projects=\u9879\u76ee(&P)\:
33.50 +CTL_Files=\u6587\u4ef6\u7c7b\u578b(&F)\:
33.51 +
33.52 +TXT_NoDescription=
33.53 +
33.54 +CTL_Description=\u63cf\u8ff0(&D)\:
33.55 +CTL_Templates=\u6a21\u677f(&T)\:
33.56 +
33.57 +#NewProjectWizard
33.58 +LBL_NewProjectWizard_Title=\u5728{0}\u4e2d\u65b0\u5efa\u9879\u76ee
33.59 +LBL_NewProjectWizard_Subtitle=\u65b0\u5efa
33.60 +# LBL_NewProjectWizard_MessageFormat={0} {1}
33.61 +ACSN_NewProjectWizard=\u201c\u65b0\u5efa\u9879\u76ee\u201d\u5411\u5bfc
33.62 +ACSD_NewProjectWizard=\u9009\u62e9\u65b0\u9879\u76ee\u7684\u7c7b\u578b
33.63 +LBL_NewProjectWizard_Name=\u9009\u62e9\u9879\u76ee
33.64 +# LBL_NewProjectWizard_Dots=...
33.65 +
33.66 +LBL_TemplatesPanel_Name=\u9009\u62e9\u6587\u4ef6\u7c7b\u578b
33.67 +# LBL_TemplatesPanel_Dots=...
33.68 +LBL_TemplatesPanel_PleaseWait=\u8bf7\u7a0d\u5019...
33.69 +
33.70 +
33.71 +#TemplatesPanelGUI
33.72 +ACSN_CategoriesPanel=\u65b0\u5bf9\u8c61\u7684\u7c7b\u522b
33.73 +ACSD_CategoriesPanel=\u53ef\u9009\u62e9\u7684\u65b0\u5bf9\u8c61\u7684\u7c7b\u522b\u5217\u8868
33.74 +ACSN_TemplatesPanel=\u65b0\u5bf9\u8c61\u7684\u7c7b\u578b
33.75 +ACSD_TemplatesPanel=\u53ef\u9009\u62e9\u7684\u65b0\u5bf9\u8c61\u7684\u7c7b\u578b\u5217\u8868
33.76 +
33.77 +ACSN_jLabel1=\u9879\u76ee
33.78 +
33.79 +ACSD_jLabel1=\u53ef\u7528\u9879\u76ee\u5217\u8868
33.80 +
33.81 +ACSN_BrowseFolders_jLabel1=\u6587\u4ef6\u5939\:
33.82 +ACSN_BrowseFolders_folderPanel=\u6587\u4ef6\u5939:
33.83 +ACSD_BrowseFolders_folderPanel=\u8be5\u6811\u5305\u542b\u9879\u76ee\u76ee\u5f55\u4e2d\u7684\u6587\u4ef6\u5939
33.84 +
33.85 +ACSN_BrowseFolders=\u6d4f\u89c8\u6587\u4ef6\u5939\u4ee5\u9009\u62e9\u76ee\u6807\u6587\u4ef6\u5939
33.86 +
33.87 +# ACSD_ProjectChooserAccessory_jCheckBoxMain=N/A
33.88 +ACSD_ProjectChooserAccessory_jCheckBoxSubprojects=\u540c\u65f6\u6253\u5f00\u9009\u5b9a\u9879\u76ee\u7684\u5b50\u9879\u76ee
33.89 +
33.90 +ACSN_ProjectChooserAccessory_jListSubprojects=\u5b50\u9879\u76ee\u5217\u8868
33.91 +
33.92 +ACSD_ProjectChooserAccessory_jListSubprojects=\u9009\u5b9a\u9879\u76ee\u7684\u5b50\u9879\u76ee\u5217\u8868
33.93 +
33.94 +# AD_SimpleTargetChooserPanelGUI=N/A
33.95 +
33.96 +# AD_documentNameTextField=N/A
33.97 +
33.98 +# AD_projectTextField=N/A
33.99 +
33.100 +# AD_locationComboBox=N/A
33.101 +
33.102 +# AD_folderTextField=N/A
33.103 +
33.104 +# AD_browseButton=N/A
33.105 +
33.106 +# AD_fileTextField=N/A
33.107 +
33.108 +# AN_ProjectChooserAccessory=N/A
33.109 +# AD_ProjectChooserAccessory=N/A
33.110 +
33.111 +# AN_ProjectName=N/A
33.112 +# AD_ProjectName=N/A
33.113 +
33.114 +# AD_NoMainProjectWarning_jList1=N/A
33.115 +
33.116 +# AD_NoMainProjectWarninig=N/A
33.117 +
33.118 +#localized folder name to show in toolbar customizer
33.119 +Actions/Window/SelectDocumentNode=\u5728\u6b64\u9009\u62e9\u6587\u6863
33.120 +#Open Project when select node failes
33.121 +MSG_openProject_confirm=<html>\u662f\u5426\u8981\u6253\u5f00\u9879\u76ee <b>{0}</b>?
33.122 +MSG_openProject_confirm_title=\u786e\u8ba4\u6253\u5f00\u9879\u76ee
33.123 +
33.124 +# NetBeans projects folder name
33.125 +#NOI18N
33.126 +#DIR_NetBeansProjects=NetBeansProjects
33.127 +
33.128 +
33.129 +# {0} = full name of class of the project
33.130 +# {1} = just the class name of the project without package
33.131 +# {2} = number of incarnations
33.132 +UI_OPEN_PROJECTS=\u6253\u5f00 {2} \u4e2a{1}\u9879\u76ee
33.133 +UI_CLOSED_PROJECTS=\u5173\u95ed {2} \u4e2a{1}\u9879\u76ee
33.134 +#UI_OPEN_PROJECTS_ICON_BASE=org/netbeans/modules/project/ui/resources/open.gif
33.135 +#UI_CLOSED_PROJECTS_ICON_BASE=org/netbeans/modules/project/ui/resources/close.gif
33.136 +UI_INIT_PROJECTS=\u521d\u59cb\u5316 {2} \u4e2a{1}\u9879\u76ee
33.137 +#UI_INIT_PROJECTS_ICON_BASE=org/netbeans/modules/project/ui/resources/open.gif
33.138 +
33.139 +OpeningProjectPanel.openingProjectLabel.text=\u6253\u5f00\u9879\u76ee\:
33.140 +
33.141 +MSG_ProjChInit=\u6b63\u5728\u521d\u59cb\u5316\u9879\u76ee...
33.142 +
33.143 +LBL_PageLayoutsPanel_Name=\u9009\u62e9\u9875\u9762\u5e03\u5c40
33.144 +NO_PREVIEW_TEXT=\u9884\u89c8\u4e0d\u53ef\u7528
33.145 +PREVIEW_TITLE=\u9884\u89c8
33.146 +NO_DESCRIPTION_TEXT=\u63cf\u8ff0\u4e0d\u53ef\u7528
33.147 +LBL_BROWSE_BUTTON=\u6d4f\u89c8
33.148 +LABEL_RESOURCE_OVER_WRITE=\u8986\u76d6\u73b0\u6709\u8d44\u6e90
33.149 +#DEFAULT_RESOURCE_FOLDER=resources
33.150 +
33.151 +NO_PROJECT_OPEN=<\u672a\u6253\u5f00\u4efb\u4f55\u9879\u76ee>
33.152 +
33.153 +CTL_SYNC_EDITOR_WITH_VIEWS=\u5c06\u7f16\u8f91\u5668\u4e0e\u89c6\u56fe\u540c\u6b65(&Y)
33.154 +
34.1 --- a/src/zh_CN/cnd/cnd-remote/cnd-remote/org/netbeans/modules/cnd/remote/actions/Bundle_zh_CN.properties Tue Jun 26 07:22:38 2012 +0900
34.2 +++ b/src/zh_CN/cnd/cnd-remote/cnd-remote/org/netbeans/modules/cnd/remote/actions/Bundle_zh_CN.properties Tue Jun 26 07:28:03 2012 +0900
34.3 @@ -44,4 +44,23 @@
34.4 BTN_OK=\u786e\u5b9a
34.5 TITLE_AddNewServer=\u6dfb\u52a0\u65b0\u670d\u52a1\u5668
34.6
34.7 +OpenRemoteProjectAction.submenu.title=\u6253\u5f00\u8fdc\u7a0b C/C++ \u9879\u76ee
34.8
34.9 +# {0} is host display name
34.10 +OpenRemoteProjectAction.item.title={0} ...
34.11 +
34.12 +LBL_ManagePlatforms_Name=\u7ba1\u7406\u4e3b\u673a...
34.13 +
34.14 +OpenRemoteFileAction.submenu.title=\u6253\u5f00\u8fdc\u7a0b\u6587\u4ef6
34.15 +
34.16 +# {0} is host display name
34.17 +OpenRemoteFileAction.item.title={0} ...
34.18 +
34.19 +ErrorConnectingHost=\u8fde\u63a5\u4e3b\u673a{0}\u65f6\u51fa\u9519: {1}
34.20 +OpenProjectButtonText=\u6253\u5f00\u9879\u76ee
34.21 +OpenProjectTitle=\u6253\u5f00\u9879\u76ee
34.22 +
34.23 +OpenFileTitle=\u6253\u5f00\u6587\u4ef6
34.24 +OpenFileButtonText=\u6253\u5f00
34.25 +Menu/Help/RemoteDevelopmentItem=C/C++ \u8fdc\u7a0b\u5f00\u53d1
34.26 +
35.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
35.2 +++ b/src/zh_CN/cnd/cnd-remote/cnd-remote/org/netbeans/modules/cnd/remote/actions/base/Bundle_zh_CN.properties Tue Jun 26 07:28:03 2012 +0900
35.3 @@ -0,0 +1,2 @@
35.4 +LBL_ManagePlatforms_Name=\u7ba1\u7406\u4e3b\u673a...
35.5 +
36.1 --- a/src/zh_CN/cnd/cnd-toolchain/cnd-toolchain/org/netbeans/modules/cnd/toolchain/Bundle_zh_CN.properties Tue Jun 26 07:22:38 2012 +0900
36.2 +++ b/src/zh_CN/cnd/cnd-toolchain/cnd-toolchain/org/netbeans/modules/cnd/toolchain/Bundle_zh_CN.properties Tue Jun 26 07:28:03 2012 +0900
36.3 @@ -27,4 +27,8 @@
36.4 CND/ToolChains/GNU_solaris=GNU Solaris \u7f16\u8bd1\u5668\u96c6\u5408
36.5 CND/ToolChains/GNU_mac=GNU Mac \u7f16\u8bd1\u5668\u96c6\u5408
36.6 CND/ToolChains/GNU=GNU \u7f16\u8bd1\u5668\u96c6\u5408
36.7 +CND/ToolChains/CLang_solaris=CLang Solaris \u7f16\u8bd1\u5668\u96c6\u5408
36.8 +CND/ToolChains/CLang_mac=CLang Mac \u7f16\u8bd1\u5668\u96c6\u5408
36.9 +CND/ToolChains/CLang=CLang \u7f16\u8bd1\u5668\u96c6\u5408
36.10 +CND/ToolChains/Intel=Intel \u7f16\u8bd1\u5668\u96c6\u5408
36.11
37.1 --- a/src/zh_CN/cnd/cnd/cnd/org/netbeans/modules/cnd/actions/Bundle_zh_CN.properties Tue Jun 26 07:22:38 2012 +0900
37.2 +++ b/src/zh_CN/cnd/cnd/cnd/org/netbeans/modules/cnd/actions/Bundle_zh_CN.properties Tue Jun 26 07:28:03 2012 +0900
37.3 @@ -45,6 +45,9 @@
37.4 BTN_Target=make \u76ee\u6807
37.5 BTN_Qmake=\u751f\u6210 Makefile
37.6 BTN_Cmake=\u751f\u6210 Makefile
37.7 +BTN_Compile_File=\u7f16\u8bd1\u6587\u4ef6
37.8 +BTN_CompileRun_File=\u7f16\u8bd1\u5e76\u8fd0\u884c\u6587\u4ef6
37.9 +BTN_CompileDebug_File=\u7f16\u8bd1\u5e76\u8c03\u8bd5\u6587\u4ef6
37.10 BTN_OK=\u786e\u5b9a
37.11
37.12 DEFAULT_TARGET=\u9ed8\u8ba4\u76ee\u6807
37.13 @@ -74,6 +77,12 @@
37.14 QMAKE_REMOTE_LABEL={0} (QMake) - {1}
37.15 CMAKE_LABEL={0} (CMake)
37.16 CMAKE_REMOTE_LABEL={0} (CMake) - {1}
37.17 +COMPILE_LABEL={0} (\u7f16\u8bd1)
37.18 +COMPILE_REMOTE_LABEL = {0} (\u7f16\u8bd1) - {1}
37.19 +COMPILE_RUN_LABEL={0} (\u7f16\u8bd1\u5e76\u8fd0\u884c)
37.20 +COMPILE_RUN_REMOTE_LABEL = {0} (\u7f16\u8bd1\u5e76\u8fd0\u884c) - {1}
37.21 +COMPILE_DEBUG_LABEL={0} (\u7f16\u8bd1\u5e76\u8c03\u8bd5)
37.22 +COMPILE_DEBUG_REMOTE_LABEL = {0} (\u7f16\u8bd1\u5e76\u8c03\u8bd5) - {1}
37.23
37.24 #Time.Millisecond=ms
37.25 #Time.Second=s
38.1 --- a/src/zh_CN/cnd/cnd/cnd/org/netbeans/modules/cnd/execution/Bundle_zh_CN.properties Tue Jun 26 07:22:38 2012 +0900
38.2 +++ b/src/zh_CN/cnd/cnd/cnd/org/netbeans/modules/cnd/execution/Bundle_zh_CN.properties Tue Jun 26 07:28:03 2012 +0900
38.3 @@ -82,3 +82,9 @@
38.4 # OutputWindowWriter
38.5 HINT_CompilerError=\u7f16\u8bd1\u5668\u9519\u8bef
38.6
38.7 +# CompileSupport
38.8 +PROP_COMPILE_FLAGS=\u7f16\u8bd1\u6807\u8bb0
38.9 +HINT_COMPILE_FLAGS=\u7f16\u8bd1\u6807\u8bb0
38.10 +PROP_LINK_FLAGS=\u94fe\u63a5\u6807\u8bb0
38.11 +HINT_LINK_FLAGS=\u94fe\u63a5\u6807\u8bb0
38.12 +
39.1 --- a/src/zh_CN/enterprise/glassfish-eecommon/glassfish-eecommon/org/netbeans/modules/glassfish/eecommon/api/Bundle_zh_CN.properties Tue Jun 26 07:22:38 2012 +0900
39.2 +++ b/src/zh_CN/enterprise/glassfish-eecommon/glassfish-eecommon/org/netbeans/modules/glassfish/eecommon/api/Bundle_zh_CN.properties Tue Jun 26 07:28:03 2012 +0900
39.3 @@ -126,7 +126,7 @@
39.4
39.5 All_Results=\u6240\u6709\u7ed3\u679c(&L)
39.6
39.7 -MSG_INSTALL_VERIFIER=<html>\u4f7f\u7528\u66f4\u65b0\u4e2d\u5fc3\u5b89\u88c5<br/>GlassFish \u9a8c\u8bc1\u5668\u5de5\u5177</html>
39.8 +MSG_INSTALL_VERIFIER=<html>\u4f7f\u7528 GlassFish \u66f4\u65b0\u4e2d\u5fc3\u5b89\u88c5<br/>GlassFish \u9a8c\u8bc1\u5668\u5de5\u5177</html>
39.9
39.10 ERR_PARSING_OUTPUT=\u65e0\u6cd5\u89e3\u6790\u9a8c\u8bc1\u5668\u7684\u8f93\u51fa
39.11 READ_OUTPUT_WINDOW=\u201c\u8f93\u51fa\u201d\u7a97\u53e3\u63d0\u4f9b\u4e86\u9a8c\u8bc1\u5668\u7684 "\u539f\u59cb" \u8f93\u51fa\u3002\n\u5176\u4e2d\u53ef\u80fd\u5305\u542b\u6709\u52a9\u4e8e\u89e3\u51b3\u6545\u969c\u7684\u4fe1\u606f\u3002
40.1 --- a/src/zh_CN/enterprise/j2ee-clientproject/j2ee-clientproject/org/netbeans/modules/j2ee/clientproject/api/Bundle_zh_CN.properties Tue Jun 26 07:22:38 2012 +0900
40.2 +++ b/src/zh_CN/enterprise/j2ee-clientproject/j2ee-clientproject/org/netbeans/modules/j2ee/clientproject/api/Bundle_zh_CN.properties Tue Jun 26 07:28:03 2012 +0900
40.3 @@ -52,9 +52,9 @@
40.4 # (The proper characters will be displayed only if the file is opened in the table editor.)
40.5 #COMMENT_dist.dir=This directory is removed when the project is cleaned:
40.6 #COMMENT_build.dir=This directory is removed when the project is cleaned:
40.7 -#COMMENT_run.jvmargs=Space-separated list of JVM arguments used when running the project
40.8 -#COMMENT_run.jvmargs_2=(you may also define separate properties like run-sys-prop.name=value instead of -Dname=value
40.9 -#COMMENT_run.jvmargs_3=or test-sys-prop.name=value to set system properties for unit tests):
40.10 +#COMMENT_run.jvmargs=Space-separated list of JVM arguments used when running the project.
40.11 +#COMMENT_run.jvmargs_2=You may also define separate properties like run-sys-prop.name=value instead of -Dname=value.
40.12 +#COMMENT_run.jvmargs_3=To set system properties for unit tests define test-sys-prop.name=value:
40.13 #COMMENT_build.sysclasspath=Only compile against the classpath explicitly listed here:
40.14 #COMMENT_javac.compilerargs=Space-separated list of extra javac options
40.15
41.1 --- a/src/zh_CN/enterprise/j2ee-earproject/j2ee-earproject/org/netbeans/modules/j2ee/earproject/ui/wizards/Bundle_zh_CN.properties Tue Jun 26 07:22:38 2012 +0900
41.2 +++ b/src/zh_CN/enterprise/j2ee-earproject/j2ee-earproject/org/netbeans/modules/j2ee/earproject/ui/wizards/Bundle_zh_CN.properties Tue Jun 26 07:28:03 2012 +0900
41.3 @@ -47,8 +47,8 @@
41.4 Templates/Project/J2EE/emptyEar.xml=\u4f01\u4e1a\u5e94\u7528\u7a0b\u5e8f
41.5 Templates/Project/J2EE/completeEar.xml=\u586b\u5145\u7684\u4f01\u4e1a\u5e94\u7528\u7a0b\u5e8f
41.6 Templates/Project/J2EE/importBlueprintEar.xml=\u57fa\u4e8e\u73b0\u6709\u6e90\u4ee3\u7801\u7684\u4f01\u4e1a\u5e94\u7528\u7a0b\u5e8f
41.7 -Templates/Project/J2EE/emptyEjbJar.xml=EJB JAR
41.8 -Templates/Project/J2EE/importEjbJar.xml=\u57fa\u4e8e\u73b0\u6709\u6e90\u4ee3\u7801\u7684 EJB JAR
41.9 +Templates/Project/J2EE/emptyEjbJar.xml=EJB \u6a21\u5757
41.10 +Templates/Project/J2EE/importEjbJar.xml=\u57fa\u4e8e\u73b0\u6709\u6e90\u4ee3\u7801\u7684 EJB \u6a21\u5757
41.11
41.12 #NewWebProjectWizardIterator
41.13 LBL_WizardStepsCount={0}/{1}
42.1 --- a/src/zh_CN/enterprise/j2ee-ejbcore/j2ee-ejbcore/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/jpa/dao/Bundle_zh_CN.properties Tue Jun 26 07:22:38 2012 +0900
42.2 +++ b/src/zh_CN/enterprise/j2ee-ejbcore/j2ee-ejbcore/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/jpa/dao/Bundle_zh_CN.properties Tue Jun 26 07:28:03 2012 +0900
42.3 @@ -63,7 +63,7 @@
42.4 ERR_EntityLocationWarning=\u627e\u4e0d\u5230 JPA \u5b9e\u4f53\u7c7b\u7684\u9879\u76ee\u3002\u5fc5\u987b\u624b\u52a8\u5c06\u5176\u6dfb\u52a0\u5230{0}\u7684\u7c7b\u8def\u5f84\u4e2d\u3002
42.5 ERR_NoRemoteInterfaceProject=<html>\u6ca1\u6709\u9002\u5408\u5b58\u50a8\u8fdc\u7a0b\u63a5\u53e3\u7684\u9879\u76ee\u3002\u9700\u8981\u6253\u5f00\u4e00\u4e2a\u57fa\u4e8e Ant \u7684 Java \u7c7b\u5e93\u9879\u76ee\u3002
42.6 ERR_NoRemoteInterfaceProjectMaven=<html>\u6ca1\u6709\u9002\u5408\u5b58\u50a8\u8fdc\u7a0b\u63a5\u53e3\u7684\u9879\u76ee\u3002\u9700\u8981\u6253\u5f00\u4e00\u4e2a\u57fa\u4e8e Maven \u7684 Java \u7c7b\u5e93\u9879\u76ee\u3002
42.7 -ERR_SessionIfaceNotOnProjectClasspath=<html>\u7c7b{0}\u5728\u9879\u76ee\u7c7b\u8def\u5f84\u4e2d\u4e0d\u53ef\u7528\u3002<br>\u8fd9\u53ef\u80fd\u610f\u5473\u7740\u7f3a\u5c11\u4f9d\u8d56\u5173\u7cfb\u6216\u4f7f\u7528\u4e86\u4e0d\u63d0\u4f9b EJB lite \u652f\u6301\u7684\u670d\u52a1\u5668\u3002</html>
42.8 +ERR_SessionIfaceNotOnProjectClasspath=<html>\u7c7b{0}\u5728\u9879\u76ee\u7c7b\u8def\u5f84\u4e2d\u4e0d\u53ef\u7528\u3002<br>\u8fd9\u53ef\u80fd\u610f\u5473\u7740\u7f3a\u5c11\u4f9d\u8d56\u5173\u7cfb\u6216\u76ee\u6807\u670d\u52a1\u5668\u4e0d\u652f\u6301 EJB Lite\u3002</html>
42.9 WARN_UpdateClassPath=IDE \u65e0\u6cd5\u4fee\u6539{0}\u9879\u76ee\u7684\u7c7b\u8def\u5f84\u3002\u5fc5\u987b\u5c06\u9879\u76ee{1}\u6dfb\u52a0\u5230\u5176\u7f16\u8bd1\u7c7b\u8def\u5f84\u4e2d\u3002
42.10
42.11 LBL_FacadeWizardTitle=\u901a\u8fc7\u5b9e\u4f53\u7c7b\u751f\u6210\u65b0\u7684\u4f1a\u8bdd Bean
42.12 @@ -84,6 +84,6 @@
42.13 MSG_GenSessionBean = \u751f\u6210...
42.14
42.15 ERR_MissingServer=<html>\u9879\u76ee\u672a\u6b63\u786e\u8bbe\u7f6e\u76ee\u6807\u670d\u52a1\u5668\u3002<br>Java \u6301\u4e45\u6027\u529f\u80fd\u4e0e\u670d\u52a1\u5668\u76f8\u5173\u3002</html>
42.16 -ERR_J2ee6AndNotSufficientJ2eeServer=<html>\u5982\u679c\u670d\u52a1\u5668\u6ca1\u6709\u63d0\u4f9b\u5b8c\u5168 Java EE 6 Web \u914d\u7f6e\u6587\u4ef6\u652f\u6301 (\u81f3\u5c11 EJB lite \u652f\u6301), <br>\u5219\u65e0\u6cd5\u4e3a Java EE 6 \u6e90\u6587\u4ef6\u8fdb\u884c\u751f\u6210\u3002</html>
42.17 -ERR_NoEjbLiteClassesOnProjectClasspath=<html>\u7531\u4e8e EJB lite \u7c7b\u5728\u9879\u76ee\u7c7b\u8def\u5f84\u4e2d\u4e0d\u53ef\u7528, \u56e0\u6b64\u65e0\u6cd5\u751f\u6210\u3002</html>
42.18 +ERR_J2ee6AndNotSufficientJ2eeServer=<html>\u5982\u679c\u670d\u52a1\u5668\u6ca1\u6709\u63d0\u4f9b\u5b8c\u5168 Java EE 6 Web \u914d\u7f6e\u6587\u4ef6\u652f\u6301 (\u81f3\u5c11 EJB Lite \u652f\u6301), <br>\u5219\u65e0\u6cd5\u4e3a Java EE 6 \u6e90\u6587\u4ef6\u8fdb\u884c\u751f\u6210\u3002</html>
42.19 +ERR_NoEjbLiteClassesOnProjectClasspath=<html>\u7531\u4e8e EJB Lite \u7c7b\u5728\u9879\u76ee\u7c7b\u8def\u5f84\u4e2d\u4e0d\u53ef\u7528, \u56e0\u6b64\u65e0\u6cd5\u751f\u6210\u3002</html>
42.20
43.1 --- a/src/zh_CN/enterprise/j2ee-ejbcore/j2ee-ejbcore/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/session/Bundle_zh_CN.properties Tue Jun 26 07:22:38 2012 +0900
43.2 +++ b/src/zh_CN/enterprise/j2ee-ejbcore/j2ee-ejbcore/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/session/Bundle_zh_CN.properties Tue Jun 26 07:28:03 2012 +0900
43.3 @@ -98,7 +98,7 @@
43.4 LBL_Schedule=\u65b9\u6cd5\u8ba1\u5212:
43.5 # MN_Schedule=M
43.6
43.7 -ERR_TO_ToMuchAttributes=\u65b9\u6cd5\u8ba1\u5212\u6700\u591a\u5e94\u5177\u6709 10 \u4e2a\u5c5e\u6027
43.8 +ERR_TO_ToMuchAttributes=\u65b9\u6cd5\u8ba1\u5212\u6700\u591a\u53ea\u80fd\u6709\u5341\u4e2a\u5c5e\u6027
43.9 ERR_TO_NotEnoughAttributes=\u5e94\u81f3\u5c11\u5728\u65b9\u6cd5\u8ba1\u5212\u4e2d\u6307\u5b9a\u4e00\u4e2a\u5c5e\u6027
43.10 ERR_TO_InvalidAtributes=\u65b9\u6cd5\u8ba1\u5212\u7684\u5c5e\u6027\u65e0\u6548: {0}
43.11 ERR_TO_UnparsableSchedule=\u65e0\u6cd5\u89e3\u6790\u65b9\u6cd5\u8ba1\u5212\u6587\u672c
44.1 --- a/src/zh_CN/enterprise/j2ee-ejbjarproject/j2ee-ejbjarproject/org/netbeans/modules/j2ee/ejbjarproject/Bundle_zh_CN.properties Tue Jun 26 07:22:38 2012 +0900
44.2 +++ b/src/zh_CN/enterprise/j2ee-ejbjarproject/j2ee-ejbjarproject/org/netbeans/modules/j2ee/ejbjarproject/Bundle_zh_CN.properties Tue Jun 26 07:28:03 2012 +0900
44.3 @@ -86,7 +86,7 @@
44.4
44.5 LBL_No_Build_XML_Found=\u9879\u76ee\u6ca1\u6709\u6784\u5efa\u811a\u672c\u3002
44.6
44.7 -MSG_MissingMetadata=\u7531\u4e8e\u90e8\u7f72\u63cf\u8ff0\u7b26\u6216\u6807\u6ce8\u4e2d\u7f3a\u5c11\u5143\u6570\u636e, \u56e0\u6b64\u65e0\u6cd5\u6210\u529f\u5199\u5165\u5230\u90e8\u7f72\u63cf\u8ff0\u7b26\u4e2d\u3002
44.8 +MSG_MissingMetadata=\u7531\u4e8e\u90e8\u7f72\u63cf\u8ff0\u7b26\u6216\u6807\u6ce8\u4e2d\u7f3a\u5c11\u5143\u6570\u636e, \u56e0\u6b64\u672a\u6210\u529f\u5199\u5165\u5230\u90e8\u7f72\u63cf\u8ff0\u7b26\u4e2d\u3002
44.9
44.10 # Usage Logging
44.11 #{0} server type id
45.1 --- a/src/zh_CN/enterprise/j2ee-ejbverification/j2ee-ejbverification/org/netbeans/modules/j2ee/ejbverification/rules/source/Bundle_zh_CN.properties Tue Jun 26 07:22:38 2012 +0900
45.2 +++ b/src/zh_CN/enterprise/j2ee-ejbverification/j2ee-ejbverification/org/netbeans/modules/j2ee/ejbverification/rules/source/Bundle_zh_CN.properties Tue Jun 26 07:28:03 2012 +0900
45.3 @@ -38,8 +38,8 @@
45.4 #
45.5 # Portions Copyrighted 2012 Sun Microsystems, Inc.
45.6
45.7 -DN_UseInjectionInsteadOfInstantion=\u53ef\u66ff\u6362\u4e3a @EJB \u6ce8\u5165\u7684\u5b9e\u4f8b
45.8 -DESC_UseInjectionInsteadOfInstantion=\u67e5\u627e\u53ef\u7531 @EJB \u6807\u6ce8\u6ce8\u5165\u7684 bean \u7684\u5b9e\u4f8b
45.9 -FIX_UseInjectionInsteadOfInstantion=\u4f7f\u7528 @EJB \u6ce8\u5165\u66ff\u6362 bean \u7684\u5b9e\u4f8b
45.10 -ERR_UseInjectionInsteadOfInstantion=bean \u7684\u5b9e\u4f8b\u53ef\u7531 @EJB \u6ce8\u5165\u66ff\u6362
45.11 +DN_UseInjectionInsteadOfInstantion=\u53ef\u66ff\u6362\u4e3a @EJB \u6ce8\u5165\u7684\u5b9e\u4f8b\u5316
45.12 +DESC_UseInjectionInsteadOfInstantion=\u67e5\u627e\u53ef\u7531 @EJB \u6807\u6ce8\u6ce8\u5165\u7684 bean \u7684\u5b9e\u4f8b\u5316
45.13 +FIX_UseInjectionInsteadOfInstantion=\u4f7f\u7528 @EJB \u6ce8\u5165\u66ff\u6362 bean \u7684\u5b9e\u4f8b\u5316
45.14 +ERR_UseInjectionInsteadOfInstantion=bean \u7684\u5b9e\u4f8b\u5316\u53ef\u7531 @EJB \u6ce8\u5165\u66ff\u6362
45.15
46.1 --- a/src/zh_CN/enterprise/j2ee-jboss4/j2ee-jboss4/org/netbeans/modules/j2ee/jboss4/config/Bundle_zh_CN.properties Tue Jun 26 07:22:38 2012 +0900
46.2 +++ b/src/zh_CN/enterprise/j2ee-jboss4/j2ee-jboss4/org/netbeans/modules/j2ee/jboss4/config/Bundle_zh_CN.properties Tue Jun 26 07:28:03 2012 +0900
46.3 @@ -48,7 +48,7 @@
46.4
46.5 MSG_jbossXmlCannotParse=\u914d\u7f6e\u6587\u4ef6{0}\u662f\u4e0d\u53ef\u89e3\u6790\u7684 - \u5b83\u65e0\u6cd5\u6267\u884c\u66f4\u6539\u3002
46.6 MSG_CannotReadContextRoot=\u65e0\u6cd5\u8bfb\u53d6\u6216\u521b\u5efa{0}\u914d\u7f6e\u6587\u4ef6\u3002\u8bf7\u786e\u4fdd\u60a8\u5177\u6709\u6b64\u6587\u4ef6\u7684\u8bfb\u53d6\u548c\u5199\u5165\u6743\u9650\u3002
46.7 -MSG_cannotSaveNotParseableConfFile=\u65e0\u6cd5\u4fdd\u5b58{0}\u914d\u7f6e\u6587\u4ef6, \u56e0\u4e3a\u8be5\u6587\u4ef6\u65e0\u6cd5\u89e3\u6790\u3002
46.8 +MSG_cannotSaveNotParseableConfFile=\u7531\u4e8e{0}\u914d\u7f6e\u6587\u4ef6\u4e0d\u53ef\u89e3\u6790, \u56e0\u6b64\u65e0\u6cd5\u4fdd\u5b58\u8be5\u6587\u4ef6\u3002
46.9 MSG_jbossXmlNotValid=\u5f53\u524d\u7f16\u8f91\u7684{0}\u914d\u7f6e\u6587\u4ef6\u5904\u4e8e\u4e0d\u4e00\u81f4\u7684\u72b6\u6001\u4e2d\u3002\u662f\u5426\u8981\u8986\u76d6\u8fd9\u4e9b\u66f4\u6539?
46.10 MSG_CannotReadContextPath=\u7531\u4e8e{0}\u914d\u7f6e\u6587\u4ef6\u4e0d\u53ef\u89e3\u6790, \u56e0\u6b64\u65e0\u6cd5\u8bfb\u53d6\u4e0a\u4e0b\u6587\u6839\u76ee\u5f55\u503c\u3002
46.11 MSG_CannotReadDatasources=\u65e0\u6cd5\u83b7\u53d6\u6570\u636e\u6e90\u5217\u8868\u3002\u8bf7\u786e\u4fdd{0}\u6587\u4ef6\u5177\u6709\u53ef\u8bfb\u5c5e\u6027\u3002
47.1 --- a/src/zh_CN/enterprise/j2ee-kit/j2ee-kit/org/netbeans/modules/j2ee/kit/Bundle_zh_CN.properties Tue Jun 26 07:22:38 2012 +0900
47.2 +++ b/src/zh_CN/enterprise/j2ee-kit/j2ee-kit/org/netbeans/modules/j2ee/kit/Bundle_zh_CN.properties Tue Jun 26 07:28:03 2012 +0900
47.3 @@ -1,5 +1,5 @@
47.4 OpenIDE-Module-Display-Category=Java Web \u548c Java EE
47.5 OpenIDE-Module-Name=EJB \u548c EAR
47.6 OpenIDE-Module-Short-Description=\u652f\u6301 EJB, \u5e94\u7528\u7a0b\u5e8f\u5ba2\u6237\u7aef\u548c EAR \u6587\u4ef6
47.7 -OpenIDE-Module-Long-Description=\u4e3a\u5f00\u53d1 Enterprise JavaBeans \u548c Java EE \u5e94\u7528\u7a0b\u5e8f\u5ba2\u6237\u7aef\u4ee5\u53ca\u7ec4\u5408\u548c\u90e8\u7f72\u4f01\u4e1a\u5f52\u6863\u6587\u4ef6\u63d0\u4f9b\u652f\u6301\u3002
47.8 +OpenIDE-Module-Long-Description=\u4e3a\u5f00\u53d1 Enterprise JavaBeans \u548c Java EE \u5e94\u7528\u7a0b\u5e8f\u5ba2\u6237\u7aef\u63d0\u4f9b\u652f\u6301, \u4ee5\u53ca\u4e3a\u7ec4\u5408\u548c\u90e8\u7f72\u4f01\u4e1a\u5f52\u6863\u6587\u4ef6\u63d0\u4f9b\u652f\u6301\u3002
47.9
48.1 --- a/src/zh_CN/enterprise/j2ee-samples/j2ee-samples/org/netbeans/modules/j2ee/samples/Bundle_zh_CN.properties Tue Jun 26 07:22:38 2012 +0900
48.2 +++ b/src/zh_CN/enterprise/j2ee-samples/j2ee-samples/org/netbeans/modules/j2ee/samples/Bundle_zh_CN.properties Tue Jun 26 07:28:03 2012 +0900
48.3 @@ -69,7 +69,7 @@
48.4 Templates/Project/Samples/Enterprise/AnnotOvdInterceptor=\u6807\u6ce8\u8986\u76d6\u62e6\u622a\u5668 (Java EE 5)
48.5 Templates/Project/Samples/Enterprise/ApplicationScopedResources=GlassFish \u4e2d\u7684\u5e94\u7528\u7a0b\u5e8f\u4f5c\u7528\u57df\u8d44\u6e90\u6837\u4f8b
48.6 Templates/Project/Samples/Enterprise/EjbContainer=GlassFish \u4e2d\u7684 EjbContainer \u6837\u4f8b
48.7 -Templates/Project/Samples/Enterprise/EmbeddedGlassfish=\u5d4c\u5165\u5f0f GlassFish \u6837\u4f8b
48.8 +Templates/Project/Samples/Enterprise/EmbeddedGlassfish=\u5d4c\u5165\u5f0f GlassFish \u6837\u4f8b
48.9 Templates/Project/Samples/Enterprise/JsfJpa.zip=JSF JPA (Java EE 6)
48.10 Templates/Project/Samples/Enterprise/JsfJpaCrud.zip=JSF JPA CRUD (Java EE 6)
48.11 Templates/Project/Samples/Enterprise/WebJpa.zip=Web JPA (Java EE 6)
49.1 --- a/src/zh_CN/enterprise/j2ee-weblogic9/j2ee-weblogic9/org/netbeans/modules/j2ee/weblogic9/config/Bundle_zh_CN.properties Tue Jun 26 07:22:38 2012 +0900
49.2 +++ b/src/zh_CN/enterprise/j2ee-weblogic9/j2ee-weblogic9/org/netbeans/modules/j2ee/weblogic9/config/Bundle_zh_CN.properties Tue Jun 26 07:28:03 2012 +0900
49.3 @@ -45,10 +45,10 @@
49.4 MSG_invalidCP=\u4fee\u590d\u65e0\u6548\u7684\u4e0a\u4e0b\u6587\u8def\u5f84\u503c\: {0}
49.5 MSG_descriptorNotValid=\u5f53\u524d\u7f16\u8f91\u7684{0}\u914d\u7f6e\u6587\u4ef6\u5904\u4e8e\u4e0d\u4e00\u81f4\u72b6\u6001\u3002\u662f\u5426\u8981\u8986\u76d6\u8fd9\u4e9b\u66f4\u6539?
49.6 MSG_CannotUpdateFile=\u65e0\u6cd5\u66f4\u65b0{0}\u914d\u7f6e\u6587\u4ef6\u3002\u8bf7\u786e\u4fdd\u60a8\u5177\u6709\u6b64\u6587\u4ef6\u7684\u5199\u5165\u6743\u9650\u3002
49.7 -MSG_cannotSaveNotParseableConfFile=\u65e0\u6cd5\u4fdd\u5b58{0}\u914d\u7f6e\u6587\u4ef6, \u56e0\u4e3a\u8be5\u6587\u4ef6\u65e0\u6cd5\u89e3\u6790\u3002
49.8 +MSG_cannotSaveNotParseableConfFile=\u7531\u4e8e{0}\u914d\u7f6e\u6587\u4ef6\u4e0d\u53ef\u89e3\u6790, \u56e0\u6b64\u65e0\u6cd5\u4fdd\u5b58\u8be5\u6587\u4ef6\u3002
49.9 MSG_configFileCannotParse=\u914d\u7f6e\u6587\u4ef6{0}\u662f\u4e0d\u53ef\u89e3\u6790\u7684 - \u5b83\u65e0\u6cd5\u6267\u884c\u66f4\u6539\u3002
49.10 -MSG_CannotReadContextRoot=\u65e0\u6cd5\u8bfb\u53d6\u4e0a\u4e0b\u6587\u6839\u76ee\u5f55\u503c, \u56e0\u4e3a{0}\u6587\u4ef6\u4e0d\u53ef\u89e3\u6790\u3002
49.11 -MSG_CannotReadReferenceName=\u65e0\u6cd5\u8bfb\u53d6\u5f15\u7528\u540d\u79f0, \u56e0\u4e3a{0}\u6587\u4ef6\u4e0d\u53ef\u89e3\u6790\u3002
49.12 +MSG_CannotReadContextRoot=\u7531\u4e8e{0}\u6587\u4ef6\u4e0d\u53ef\u89e3\u6790, \u56e0\u6b64\u65e0\u6cd5\u8bfb\u53d6\u4e0a\u4e0b\u6587\u6839\u76ee\u5f55\u503c\u3002
49.13 +MSG_CannotReadReferenceName=\u7531\u4e8e{0}\u6587\u4ef6\u4e0d\u53ef\u89e3\u6790, \u56e0\u6b64\u65e0\u6cd5\u8bfb\u53d6\u5f15\u7528\u540d\u79f0\u3002
49.14
49.15 MSG_CannotReadDatasources=\u65e0\u6cd5\u83b7\u53d6\u6570\u636e\u6e90\u5217\u8868\u3002\u8bf7\u786e\u4fdd{0}\u6587\u4ef6\u5177\u6709\u53ef\u8bfb\u5c5e\u6027\u3002
49.16 MSG_NotParseableDatasources=\u7531\u4e8e{0}\u6587\u4ef6\u4e0d\u53ef\u89e3\u6790, \u56e0\u6b64\u65e0\u6cd5\u83b7\u53d6\u6570\u636e\u6e90\u5217\u8868\u3002
49.17 @@ -63,10 +63,10 @@
49.18 MSG_FailedToDeployLibrary=\u65e0\u6cd5\u90e8\u7f72\u5176\u4e2d\u7684\u4e00\u4e2a\u6216\u591a\u4e2a\u5e93\u3002\u8bf7\u68c0\u67e5\u9879\u76ee\u914d\u7f6e\u3002
49.19 MSG_FailedToDeployJMS=\u65e0\u6cd5\u90e8\u7f72\u4e00\u4e2a\u6216\u591a\u4e2a JMS \u8d44\u6e90\u3002\u8bf7\u68c0\u67e5\u9879\u76ee\u914d\u7f6e\u3002
49.20
49.21 -MSG_CannotReadServerLibraries=\u65e0\u6cd5\u8bfb\u53d6\u670d\u52a1\u5668\u5e93\u503c, \u56e0\u4e3a{0}\u6587\u4ef6\u4e0d\u53ef\u89e3\u6790\u3002
49.22 +MSG_CannotReadServerLibraries=\u7531\u4e8e{0}\u6587\u4ef6\u4e0d\u53ef\u89e3\u6790, \u56e0\u6b64\u65e0\u6cd5\u8bfb\u53d6\u670d\u52a1\u5668\u5e93\u503c\u3002
49.23 MSG_DidNotFindServerLibraries=\u5728\u670d\u52a1\u5668\u4e0a\u627e\u4e0d\u5230\u67d0\u4e9b\u670d\u52a1\u5668\u5e93, \u6216\u8005\u672a\u90e8\u7f72\u8fd9\u4e9b\u5e93\u3002
49.24
49.25 -MSG_NotParseableMessages=\u7531\u4e8e\u65e0\u6cd5\u89e3\u6790{0}\u6587\u4ef6, \u65e0\u6cd5\u83b7\u53d6\u6d88\u606f\u670d\u52a1\u5217\u8868\u3002
49.26 +MSG_NotParseableMessages=\u7531\u4e8e{0}\u6587\u4ef6\u4e0d\u53ef\u89e3\u6790, \u56e0\u6b64\u65e0\u6cd5\u83b7\u53d6\u6d88\u606f\u670d\u52a1\u5217\u8868\u3002
49.27 MSG_CannotReadMessages=\u65e0\u6cd5\u83b7\u53d6\u6d88\u606f\u670d\u52a1\u5217\u8868\u3002\u8bf7\u786e\u4fdd{0}\u6587\u4ef6\u5177\u6709\u53ef\u8bfb\u5c5e\u6027\u3002
49.28 MSG_MessageDestinationAlreadyExists=\u5177\u6709\u76f8\u540c\u540d\u79f0\u7684\u6d88\u606f\u76ee\u6807\u5df2\u5b58\u5728\u3002
49.29
50.1 --- a/src/zh_CN/enterprise/web-core-syntax/web-core-syntax/org/netbeans/modules/web/core/syntax/Bundle_zh_CN.properties Tue Jun 26 07:22:38 2012 +0900
50.2 +++ b/src/zh_CN/enterprise/web-core-syntax/web-core-syntax/org/netbeans/modules/web/core/syntax/Bundle_zh_CN.properties Tue Jun 26 07:28:03 2012 +0900
50.3 @@ -73,8 +73,8 @@
50.4 CTL_JSP_Completion_Title=JSP \u5b8c\u6210
50.5
50.6 #IndentEngine
50.7 -LAB_JspIndentEngine=JSP \u7f29\u6392\u5f15\u64ce
50.8 -HINT_JspIndentEngine=\u7528\u4e8e JSP \u6587\u4ef6\u548c\u6807\u8bb0\u6587\u4ef6\u7684\u7f29\u6392\u5f15\u64ce\u3002
50.9 +LAB_JspIndentEngine=JSP \u7f29\u8fdb\u5f15\u64ce
50.10 +HINT_JspIndentEngine=\u7528\u4e8e JSP \u6587\u4ef6\u548c\u6807\u8bb0\u6587\u4ef6\u7684\u7f29\u8fdb\u5f15\u64ce\u3002
50.11
50.12 #Text which is used for help runtime generating (for the code compeltion)
50.13 LBL_TagName=\u6807\u8bb0\u540d\u79f0:
51.1 --- a/src/zh_CN/enterprise/web-core-syntax/web-core-syntax/org/netbeans/modules/web/core/syntax/resources/Bundle_zh_CN.properties Tue Jun 26 07:22:38 2012 +0900
51.2 +++ b/src/zh_CN/enterprise/web-core-syntax/web-core-syntax/org/netbeans/modules/web/core/syntax/resources/Bundle_zh_CN.properties Tue Jun 26 07:28:03 2012 +0900
51.3 @@ -92,17 +92,23 @@
51.4 #EXAMPLE_coloring_jsp-java-keywords=keyword
51.5 #EXAMPLE_coloring_jsp-java-identifier=id
51.6 #EXAMPLE_coloring_jsp-java-method=method()
51.7 +#NOI18N
51.8 #EXAMPLE_coloring_jsp-java-operators=+-*/&|
51.9 #EXAMPLE_coloring_jsp-java-line-comment=// line-comment
51.10 #EXAMPLE_coloring_jsp-java-block-comment=/* block comment */
51.11 #EXAMPLE_coloring_jsp-java-char-literal='\\n'
51.12 #EXAMPLE_coloring_jsp-java-string-literal="string"
51.13 +#NOI18N
51.14 #EXAMPLE_coloring_jsp-java-int-literal=1234567
51.15 #NOI18N
51.16 #EXAMPLE_coloring_jsp-java-hex-literal=0x9A
51.17 +#NOI18N
51.18 #EXAMPLE_coloring_jsp-java-octal-literal=057
51.19 +#NOI18N
51.20 #EXAMPLE_coloring_jsp-java-long-literal=12345L
51.21 +#NOI18N
51.22 #EXAMPLE_coloring_jsp-java-float-literal=1.02f
51.23 +#NOI18N
51.24 #EXAMPLE_coloring_jsp-java-double-literal=3.55d
51.25
51.26 NAME_coloring_jsp-java-whitespace=\u7a7a\u767d (Java)
51.27 @@ -138,13 +144,17 @@
51.28 #EXAMPLE_coloring_jsp-html-text=text
51.29 #EXAMPLE_coloring_jsp-html-ws=
51.30 #EXAMPLE_coloring_jsp-html-error=error
51.31 +#NOI18N
51.32 #EXAMPLE_coloring_jsp-html-tag=<TABLE>
51.33 +#NOI18N
51.34 #EXAMPLE_coloring_jsp-html-argument=href
51.35 #EXAMPLE_coloring_jsp-html-operator==
51.36 #EXAMPLE_coloring_jsp-html-value="value"
51.37 #EXAMPLE_coloring_jsp-html-block-comment=<!-- comment -->
51.38 #EXAMPLE_coloring_jsp-html-sgml-comment=-- comment --
51.39 +#NOI18N
51.40 #EXAMPLE_coloring_jsp-html-sgml-declaration=<!DOCTYPE ... >
51.41 +#NOI18N
51.42 #EXAMPLE_coloring_jsp-html-character=&
51.43
51.44 NAME_coloring_jsp-html-text=\u7eaf\u6587\u672c
51.45 @@ -163,6 +173,7 @@
51.46 #jsp
51.47 NAME_coloring_jsp-jsptag-tag-directive=JSP \u6807\u8bb0/\u6307\u4ee4
51.48 HINT_coloring_jsp-jsptag-tag-directive=JSP \u6807\u8bb0\u6216\u6307\u4ee4\u3002
51.49 +#NOI18N
51.50 #EXAMPLE_coloring_jsp-jsptag-tag-directive=<jsp:getProperty/>
51.51
51.52 NAME_coloring_jsp-jsptag-symbol=JSP \u7b26\u53f7
52.1 --- a/src/zh_CN/enterprise/web-jsf-editor/web-jsf-editor/org/netbeans/modules/web/jsf/editor/facelets/Bundle_zh_CN.properties Tue Jun 26 07:22:38 2012 +0900
52.2 +++ b/src/zh_CN/enterprise/web-jsf-editor/web-jsf-editor/org/netbeans/modules/web/jsf/editor/facelets/Bundle_zh_CN.properties Tue Jun 26 07:28:03 2012 +0900
52.3 @@ -41,6 +41,8 @@
52.4 # made subject to such option by the copyright holder.
52.5
52.6 MSG_COMPOSITE_COMPONENT_SOURCE=\u6e90:
52.7 +MSG_COMPOSITE_COMPONENT_DISPLAYNAME=\u663e\u793a\u540d\u79f0:
52.8 +MSG_COMPOSITE_COMPONENT_SHORTDESCRIPTION=\u7b80\u8981\u8bf4\u660e:
52.9 MSG_TAG_ATTRS=\u6807\u8bb0\u5c5e\u6027
52.10 MSG_NO_TAG_ATTRS=\u8be5\u6807\u8bb0\u672a\u58f0\u660e\u4efb\u4f55\u5c5e\u6027
52.11 MSG_NO_DESCRIPTOR=\u6ca1\u6709\u53ef\u7528\u7684\u5e93\u63cf\u8ff0\u7b26
53.1 --- a/src/zh_CN/enterprise/web-jsf-editor/web-jsf-editor/org/netbeans/modules/web/jsf/editor/hints/Bundle_zh_CN.properties Tue Jun 26 07:22:38 2012 +0900
53.2 +++ b/src/zh_CN/enterprise/web-jsf-editor/web-jsf-editor/org/netbeans/modules/web/jsf/editor/hints/Bundle_zh_CN.properties Tue Jun 26 07:28:03 2012 +0900
53.3 @@ -40,13 +40,13 @@
53.4 # Version 2 license, then the option applies only if the new code is
53.5 # made subject to such option by the copyright holder.
53.6
53.7 -MSG_UNKNOWN_CC_COMPONENT=\u7ec4\u4ef6\u5e93{0}\u4e0d\u5305\u542b\u6b64\u7ec4\u4ef6
53.8 +MSG_UNKNOWN_CC_COMPONENT=\u7ec4\u4ef6\u5e93{0}\u4e0d\u5305\u542b\u7ec4\u4ef6{1}
53.9 MSG_MISSING_REQUIRED_ATTRIBUTE=\u7f3a\u5c11\u5fc5\u9700\u7684\u5c5e\u6027{0}
53.10 -MSG_UNKNOWN_ATTRIBUTE=\u5728\u7ec4\u4ef6\u7684\u63a5\u53e3\u4e2d\u672a\u5b9a\u4e49\u5c5e\u6027{0}
53.11 +MSG_UNKNOWN_ATTRIBUTE=\u5728\u7ec4\u4ef6{1}\u4e2d\u672a\u5b9a\u4e49\u5c5e\u6027{0}
53.12
53.13 -MSG_MISSING_LIBRARY=\u627e\u4e0d\u5230\u6b64\u540d\u79f0\u7a7a\u95f4\u7684\u5e93
53.14 -MSG_UNDECLARED_COMPONENT=\u672a\u58f0\u660e\u7684\u7ec4\u4ef6
53.15 -MSG_UNUSED_LIBRARY_DECLARATION=\u672a\u4f7f\u7528\u7684\u5e93\u58f0\u660e
53.16 +MSG_MISSING_LIBRARY=\u627e\u4e0d\u5230\u540d\u79f0\u7a7a\u95f4{0}\u7684\u5e93
53.17 +MSG_UNDECLARED_COMPONENT=\u672a\u58f0\u660e\u7684\u7ec4\u4ef6{0}
53.18 +MSG_UNUSED_LIBRARY_DECLARATION=\u672a\u4f7f\u7528\u7684\u5e93\u58f0\u660e{0}
53.19
53.20 MSG_HINTFIX_REMOVE_UNUSED_LIBRARY_DECLARATION=\u5220\u9664\u672a\u4f7f\u7528\u7684\u5e93\u58f0\u660e
53.21 MSG_HINTFIX_REMOVE_ALL_UNUSED_LIBRARIES_DECLARATION=\u5220\u9664\u6240\u6709\u672a\u4f7f\u7528\u7684\u5e93\u58f0\u660e
54.1 --- a/src/zh_CN/enterprise/web-jsf/web-jsf/org/netbeans/modules/web/jsf/Bundle_zh_CN.properties Tue Jun 26 07:22:38 2012 +0900
54.2 +++ b/src/zh_CN/enterprise/web-jsf/web-jsf/org/netbeans/modules/web/jsf/Bundle_zh_CN.properties Tue Jun 26 07:28:03 2012 +0900
54.3 @@ -91,3 +91,6 @@
54.4 # {0} list of jsf suites included into JSF framework
54.5 USG_JSF_INCLUDED_SUITE=\u5305\u542b\u5728\u5177\u6709 JSF \u6846\u67b6\u7684 Web \u9879\u76ee\u4e2d\u7684\u65b0 JSF \u7ec4\u4ef6\u5e93 (JSF \u5957\u4ef6) [JSF \u5957\u4ef6: {0}]
54.6
54.7 +# {0} - the error message
54.8 +ERR_WRITE_FACES_CONFIG=\u65e0\u6cd5\u66f4\u65b0 faces-config.xml: {0}
54.9 +
55.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
55.2 +++ b/src/zh_CN/enterprise/web-jsf/web-jsf/org/netbeans/modules/web/jsf/impl/facesmodel/Bundle_zh_CN.properties Tue Jun 26 07:28:03 2012 +0900
55.3 @@ -0,0 +1,42 @@
55.4 +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
55.5 +#
55.6 +# Copyright 2012 Oracle and/or its affiliates. All rights reserved.
55.7 +#
55.8 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
55.9 +# Other names may be trademarks of their respective owners.
55.10 +#
55.11 +# The contents of this file are subject to the terms of either the GNU
55.12 +# General Public License Version 2 only ("GPL") or the Common
55.13 +# Development and Distribution License("CDDL") (collectively, the
55.14 +# "License"). You may not use this file except in compliance with the
55.15 +# License. You can obtain a copy of the License at
55.16 +# http://www.netbeans.org/cddl-gplv2.html
55.17 +# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
55.18 +# specific language governing permissions and limitations under the
55.19 +# License. When distributing the software, include this License Header
55.20 +# Notice in each file and include the License file at
55.21 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
55.22 +# particular file as subject to the "Classpath" exception as provided
55.23 +# by Oracle in the GPL Version 2 section of the License file that
55.24 +# accompanied this code. If applicable, add the following below the
55.25 +# License Header, with the fields enclosed by brackets [] replaced by
55.26 +# your own identifying information:
55.27 +# "Portions Copyrighted [year] [name of copyright owner]"
55.28 +#
55.29 +# If you wish your version of this file to be governed by only the CDDL
55.30 +# or only the GPL Version 2, indicate your decision by adding
55.31 +# "[Contributor] elects to include this software in this distribution
55.32 +# under the [CDDL or GPL Version 2] license." If you do not indicate a
55.33 +# single choice of license, a recipient has the option to distribute
55.34 +# your version of this file under either the CDDL, the GPL Version 2 or
55.35 +# to extend the choice of license to its licensees as provided above.
55.36 +# However, if you add GPL Version 2 code and therefore, elected the GPL
55.37 +# Version 2 license, then the option applies only if the new code is
55.38 +# made subject to such option by the copyright holder.
55.39 +#
55.40 +# Contributor(s):
55.41 +#
55.42 +# Portions Copyrighted 2012 Sun Microsystems, Inc.
55.43 +
55.44 +ERR_Save_FacesConfig=\u65e0\u6cd5\u4fdd\u5b58 Faces \u914d\u7f6e: {0}
55.45 +
56.1 --- a/src/zh_CN/enterprise/web-jsf/web-jsf/org/netbeans/modules/web/jsf/wizards/Bundle_zh_CN.properties Tue Jun 26 07:22:38 2012 +0900
56.2 +++ b/src/zh_CN/enterprise/web-jsf/web-jsf/org/netbeans/modules/web/jsf/wizards/Bundle_zh_CN.properties Tue Jun 26 07:28:03 2012 +0900
56.3 @@ -317,3 +317,6 @@
56.4
56.5 LBL_MoreButton=\u66f4\u591a...
56.6
56.7 +ERR_CreateFacesConfig=\u65e0\u6cd5\u521b\u5efa Faces \u914d\u7f6e: {0}
56.8 +ERR_UpdateFacesConfig=\u65e0\u6cd5\u66f4\u65b0 Faces \u914d\u7f6e: {0}
56.9 +
57.1 --- a/src/zh_CN/enterprise/websvc-core/websvc-core/org/netbeans/modules/websvc/core/jaxws/nodes/Bundle_zh_CN.properties Tue Jun 26 07:22:38 2012 +0900
57.2 +++ b/src/zh_CN/enterprise/websvc-core/websvc-core/org/netbeans/modules/websvc/core/jaxws/nodes/Bundle_zh_CN.properties Tue Jun 26 07:28:03 2012 +0900
57.3 @@ -69,4 +69,5 @@
57.4 MSG_MissingServer=\u5c1a\u672a\u8bbe\u7f6e\u6216\u5df2\u5220\u9664\u76ee\u6807\u670d\u52a1\u5668\u3002\n\n\u8bf7\u5148\u4fee\u590d\u6b64\u670d\u52a1\u5668\u95ee\u9898\u3002
57.5 MSG_ConfigureHandler=\u6b63\u5728\u914d\u7f6e\u6d88\u606f\u5904\u7406\u7a0b\u5e8f...
57.6 ERR_missingImplementationClass=\u627e\u4e0d\u5230\u6b64 Web \u670d\u52a1\u7684\u5b9e\u73b0\u7c7b\u3002
57.7 +ERR_writeHandler=\u5199\u5165\u7ed1\u5b9a\u5904\u7406\u7a0b\u5e8f\u65f6\u51fa\u9519: {0}
57.8
58.1 --- a/src/zh_CN/enterprise/websvc-jaxwsmodel/websvc-jaxwsmodel/org/netbeans/modules/websvc/api/jaxws/project/Bundle_zh_CN.properties Tue Jun 26 07:22:38 2012 +0900
58.2 +++ b/src/zh_CN/enterprise/websvc-jaxwsmodel/websvc-jaxwsmodel/org/netbeans/modules/websvc/api/jaxws/project/Bundle_zh_CN.properties Tue Jun 26 07:28:03 2012 +0900
58.3 @@ -48,3 +48,6 @@
58.4
58.5 USG_WEBSVC_DETECTED=\u68c0\u6d4b\u5230\u7684 Web \u670d\u52a1 [WS \u5806\u6808: {0}, \u9879\u76ee: {1}, \u5bf9\u8c61: {2}]
58.6
58.7 +ERR_ModifyCatalog=\u65e0\u6cd5\u4fee\u6539\u76ee\u5f55: {0}
58.8 +ERR_WsimportBadVersion=\u5df2\u77e5 wsimport ant \u4efb\u52a1\u7248\u672c {0} \u5728 JAX-WS \u4e2d\u5b58\u5728\u4e25\u91cd\u9519\u8bef\u3002\u6b64\u9519\u8bef\u53ef\u80fd\u4f1a\u5bfc\u81f4 NetBeans \u505c\u6b62\u54cd\u5e94\u3002\u8be5\u4efb\u52a1\u5728\u7c7b\u8def\u5f84{1}\u4e2d\u5b9a\u4e49\u3002\u8bf7\u5c06\u5176\u66f4\u65b0\u4e3a\u8f83\u65b0\u7248\u672c: \u6709\u5173\u8be6\u7ec6\u4fe1\u606f, \u8bf7\u53c2\u89c1 http://wiki.netbeans.org/MetroIssue\u3002
58.9 +
59.1 --- a/src/zh_CN/enterprise/websvc-rest-samples/websvc-rest-samples/org/netbeans/modules/websvc/rest/samples/resources/Bundle_zh_CN.properties Tue Jun 26 07:22:38 2012 +0900
59.2 +++ b/src/zh_CN/enterprise/websvc-rest-samples/websvc-rest-samples/org/netbeans/modules/websvc/rest/samples/resources/Bundle_zh_CN.properties Tue Jun 26 07:28:03 2012 +0900
59.3 @@ -47,7 +47,7 @@
59.4 OpenIDE-Module-Long-Description=REST \u98ce\u683c\u7684 Web \u670d\u52a1\u6837\u4f8b\u9879\u76ee
59.5
59.6 Templates/Project/Samples/Maven/RestRCPMvnAppSampleProject.zip=REST \u6837\u4f8b\u5e94\u7528\u7a0b\u5e8f (Maven)
59.7 -Templates/Project/Samples/Metro=Java Web \u670d\u52a1
59.8 +Templates/Project/Samples/Metro=Web \u670d\u52a1
59.9 Templates/Project/Samples/Metro/HelloWorldSampleProject=REST: Hello World (Java EE 6)
59.10 Templates/Project/Samples/Metro/CustomerDBSampleProject=REST: \u5ba2\u6237\u6570\u636e\u5e93 (Java EE 5)
59.11 Templates/Project/Samples/Metro/CustomerDBSpringSampleProject=REST: \u57fa\u4e8e Spring \u7684\u5ba2\u6237\u6570\u636e\u5e93 (Java EE 5)
60.1 --- a/src/zh_CN/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/apisupport/org-netbeans-modules-maven-apisupport-NbModuleDescription_zh_CN.html Tue Jun 26 07:22:38 2012 +0900
60.2 +++ b/src/zh_CN/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/apisupport/org-netbeans-modules-maven-apisupport-NbModuleDescription_zh_CN.html Tue Jun 26 07:28:03 2012 +0900
60.3 @@ -3,6 +3,6 @@
60.4 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
60.5 </head>
60.6 <body>
60.7 - 使用 Maven 生成的 NetBeans 平台格式的模块。可以作为依赖关系添加到基于平台的应用程序中。(还可以独立运行或在 "套件" 中运行, 在这种情况下, 必须配置 <code>${netbeans.installation}</code>; 此运行模式不应用于生产代码。)
60.8 + 使用 Maven 生成的 NetBeans 平台格式的模块。可以作为依赖关系添加到基于平台的应用程序中。(还可以独立运行或在“套件”中运行, 在这种情况下, 必须配置 <code>${netbeans.installation}</code>; 此运行模式不应用于生产代码。)
60.9 </body>
60.10 </html>
61.1 --- a/src/zh_CN/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/Bundle_zh_CN.properties Tue Jun 26 07:22:38 2012 +0900
61.2 +++ b/src/zh_CN/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/Bundle_zh_CN.properties Tue Jun 26 07:28:03 2012 +0900
61.3 @@ -87,7 +87,6 @@
61.4 Templates/ShellScripts/script.zsh=Z Shell \u811a\u672c (.zsh)
61.5 Templates/cFiles/CSimpleTest.c=C \u7b80\u5355\u6d4b\u8bd5
61.6 Templates/cppFiles/cppsimpletest.cc=C++ \u7b80\u5355\u6d4b\u8bd5
61.7 -Templates/testFiles=C/C++ \u6d4b\u8bd5
61.8 Templates/testFiles/simpletest.c=C \u7b80\u5355\u6d4b\u8bd5
61.9 Templates/testFiles/simpletest.cpp=C++ \u7b80\u5355\u6d4b\u8bd5
61.10 ExtResolver=C/C++/H/Fortran MIME \u89e3\u6790\u5668 (\u57fa\u4e8e\u6269\u5c55)
62.1 --- a/src/zh_CN/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/Bundle_zh_CN.properties Tue Jun 26 07:22:38 2012 +0900
62.2 +++ b/src/zh_CN/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/Bundle_zh_CN.properties Tue Jun 26 07:28:03 2012 +0900
62.3 @@ -55,8 +55,8 @@
62.4 Templates/Project/J2EE=Java EE
62.5 Templates/Project/J2EE/emptyEar.xml=\u4f01\u4e1a\u5e94\u7528\u7a0b\u5e8f
62.6 Templates/Project/J2EE/importBlueprintEar.xml=\u57fa\u4e8e\u73b0\u6709\u6e90\u4ee3\u7801\u7684\u4f01\u4e1a\u5e94\u7528\u7a0b\u5e8f
62.7 -Templates/Project/J2EE/emptyEjbJar.xml=EJB JAR
62.8 -Templates/Project/J2EE/importEjbJar.xml=\u57fa\u4e8e\u73b0\u6709\u6e90\u4ee3\u7801\u7684 EJB JAR
62.9 +Templates/Project/J2EE/emptyEjbJar.xml=EJB \u6a21\u5757
62.10 +Templates/Project/J2EE/importEjbJar.xml=\u57fa\u4e8e\u73b0\u6709\u6e90\u4ee3\u7801\u7684 EJB \u6a21\u5757
62.11 Templates/J2EE/ApplicationXml=\u6807\u51c6\u90e8\u7f72\u63cf\u8ff0\u7b26
62.12 Templates/J2EE/RelatedCMP=\u901a\u8fc7\u6570\u636e\u5e93\u751f\u6210 CMP \u5b9e\u4f53 Bean
62.13 Templates/J2EE/EJB21/CmpPrimaryKey.java=CMP \u4e3b\u952e\u7c7b
62.14 @@ -97,8 +97,6 @@
62.15 Templates/J2EE=Enterprise JavaBeans
62.16 Templates/J2EE/EJB21=EJB 2.1
62.17 Templates/J2EE/EJB30=EJB 3.0
62.18 -Templates/Project/J2EE/emptyEjbJar.xml=EJB \u6a21\u5757
62.19 -Templates/Project/J2EE/importEjbJar.xml=\u57fa\u4e8e\u73b0\u6709\u6e90\u4ee3\u7801\u7684 EJB \u6a21\u5757
62.20 SERVER_NAME=JBoss Application Server
62.21 Templates/Project/Samples/Enterprise=Java EE
62.22 Templates/Project/Samples/Enterprise/InterceptorStateless=\u62e6\u622a\u5668\u65e0\u72b6\u6001 (Java EE 5)
62.23 @@ -106,7 +104,7 @@
62.24 Templates/Project/Samples/Enterprise/AnnotOvdInterceptor=\u6807\u6ce8\u8986\u76d6\u62e6\u622a\u5668 (Java EE 5)
62.25 Templates/Project/Samples/Enterprise/ApplicationScopedResources=GlassFish \u4e2d\u7684\u5e94\u7528\u7a0b\u5e8f\u4f5c\u7528\u57df\u8d44\u6e90\u6837\u4f8b
62.26 Templates/Project/Samples/Enterprise/EjbContainer=GlassFish \u4e2d\u7684 EjbContainer \u6837\u4f8b
62.27 -Templates/Project/Samples/Enterprise/EmbeddedGlassfish=\u5d4c\u5165\u5f0f GlassFish \u6837\u4f8b
62.28 +Templates/Project/Samples/Enterprise/EmbeddedGlassfish=\u5d4c\u5165\u5f0f GlassFish \u6837\u4f8b
62.29 Templates/Project/Samples/Enterprise/JsfJpa.zip=JSF JPA (Java EE 6)
62.30 Templates/Project/Samples/Enterprise/JsfJpaCrud.zip=JSF JPA CRUD (Java EE 6)
62.31 Templates/Project/Samples/Enterprise/WebJpa.zip=Web JPA (Java EE 6)
62.32 @@ -219,14 +217,12 @@
62.33 Templates/Project/Samples/Metro/SecureCalculator=\u5b89\u5168\u8ba1\u7b97\u5668 (Java EE 6)
62.34 Templates/Project/Samples/Metro/Calculator=\u8ba1\u7b97\u5668 (Java EE 6)
62.35 Templates/Project/Samples/Maven/RestRCPMvnAppSampleProject.zip=REST \u6837\u4f8b\u5e94\u7528\u7a0b\u5e8f (Maven)
62.36 -Templates/Project/Samples/Metro=Java Web \u670d\u52a1
62.37 Templates/Project/Samples/Metro/HelloWorldSampleProject=REST: Hello World (Java EE 6)
62.38 Templates/Project/Samples/Metro/CustomerDBSampleProject=REST: \u5ba2\u6237\u6570\u636e\u5e93 (Java EE 5)
62.39 Templates/Project/Samples/Metro/CustomerDBSpringSampleProject=REST: \u57fa\u4e8e Spring \u7684\u5ba2\u6237\u6570\u636e\u5e93 (Java EE 5)
62.40 Templates/Project/Samples/Metro/MessageBoardSample=REST: \u7559\u8a00\u677f (Java EE 6)
62.41 Templates/Project/Samples/Enterprise/LeanServiceECBComponentWithAjax=\u5e26\u6709 Ajax \u7684 Lean \u670d\u52a1 ECB \u7ec4\u4ef6 (Java EE 6)
62.42 Templates/WebServices/JerseyClient=REST \u98ce\u683c\u7684 Java \u5ba2\u6237\u7aef
62.43 -Templates/WebServices=Web \u670d\u52a1
62.44 Templates/WebServices/RestServicesFromEntities=\u57fa\u4e8e\u5b9e\u4f53\u7c7b\u7684 REST \u98ce\u683c\u7684 Web \u670d\u52a1
62.45 Templates/WebServices/RestServicesFromPatterns=\u57fa\u4e8e\u6a21\u5f0f\u7684 REST \u98ce\u683c\u7684 Web \u670d\u52a1
62.46 Templates/WebServices/RestServicesFromDatabase=\u57fa\u4e8e\u6570\u636e\u5e93\u7684 REST \u98ce\u683c\u7684 Web \u670d\u52a1
62.47 @@ -236,7 +232,6 @@
62.48 #restlib=Jersey 1.8 (JAX-RS RI)
62.49 restapi=JAX-RS 1.1
62.50 Templates/SaaSServices=SaaS \u670d\u52a1
62.51 -Templates/WebServices=Web \u670d\u52a1
62.52 Templates/WebServices/STSWizard.java=\u5b89\u5168\u6807\u8bb0\u670d\u52a1 (STS)
62.53
62.54
63.1 --- a/src/zh_CN/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/Bundle_zh_CN.properties Tue Jun 26 07:22:38 2012 +0900
63.2 +++ b/src/zh_CN/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/Bundle_zh_CN.properties Tue Jun 26 07:28:03 2012 +0900
63.3 @@ -90,6 +90,7 @@
63.4 ejb3-persistence=\u6301\u4e45\u6027
63.5 #hibernate-persistence=Hibernate JPA
63.6 #eclipselink=EclipseLink (JPA 2.0)
63.7 +jpa20-persistence=\u6301\u4e45\u6027 (JPA 2.0)
63.8 #eclipselinkmodelgen=EclipseLink-ModelGen (JPA 2.0)
63.9 Templates/Persistence/Entity.java=\u5b9e\u4f53\u7c7b
63.10 Templates/Persistence/RelatedCMP=\u901a\u8fc7\u6570\u636e\u5e93\u751f\u6210\u5b9e\u4f53\u7c7b
63.11 @@ -152,7 +153,7 @@
63.12 suite.resolver=TestNGSuite \u6587\u4ef6
63.13 #testng=TestNG 6.5.1
63.14 TestNGSuite_displayName=TestNG \u6d4b\u8bd5\u5957\u4ef6
63.15 -#jaxws21=JAX-WS 2.2
63.16 +#jaxws21=JAX-WS 2.2.6
63.17 Templates/SaaSServices=SaaS \u670d\u52a1
63.18 Templates/XML/JavaXMLBinding=JAXB \u7ed1\u5b9a
63.19 JAXBResolver=JAXB \u7ed1\u5b9a
64.1 --- a/src/zh_CN/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/mobility/Bundle_zh_CN.properties Tue Jun 26 07:22:38 2012 +0900
64.2 +++ b/src/zh_CN/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/mobility/Bundle_zh_CN.properties Tue Jun 26 07:28:03 2012 +0900
64.3 @@ -56,7 +56,6 @@
64.4 Templates/CDC/AWTXlet.java=\u4e2a\u4eba\u914d\u7f6e\u6587\u4ef6 Xlet \u7a97\u4f53
64.5 Templates/CDC/AGUIXlet.java=AGUI Xlet \u7a97\u4f53
64.6 Templates/CDC/JFrame.java=CrEme JFrame \u7a97\u4f53
64.7 -#Templates/Project/J2ME=Mobile
64.8 Templates/Project/J2ME/emptyCDC=CDC \u5e94\u7528\u7a0b\u5e8f
64.9 Templates/Project/J2ME/emptyCDClibrary=CDC \u7c7b\u5e93
64.10 Templates/Project/J2ME/CDCimport=\u5bfc\u5165 CDC Pack 5.5 \u9879\u76ee
64.11 @@ -64,9 +63,6 @@
64.12 j2me_ant_ext=Java ME Ant \u6269\u5c55
64.13 ant-contrib=ANT Contrib
64.14 Templates/Services/Platforms/org-netbeans-api-java-Platform/j2meplatform.xml=Java ME \u4eff\u771f\u5668
64.15 -DataBindingME=NetBeans DataBindingME
64.16 -DataBindingME-PIM=NetBeans DataBindingME PIM
64.17 -DataBindingME-SVG=NetBeans DataBindingME SVG
64.18 nokiadeployment=Nokia \u90e8\u7f72\u5e93
64.19 jakarta_slide_ant_webdav=Jakarta Slide Ant WebDAV
64.20 Templates/Server=\u670d\u52a1\u5668
64.21 @@ -83,10 +79,8 @@
64.22 Templates/Project/Samples/JAVA_ME/BluetoothDemo.zip=\u84dd\u7259\u6f14\u793a (MIDP)
64.23 Templates/Project/Samples/JAVA_ME/CityGuide.zip=\u57ce\u5e02\u6307\u5357 (MIDP)
64.24 Templates/Project/Samples/JAVA_ME/CurrencyConverter.zip=\u8d27\u5e01\u8f6c\u6362\u5668 (MIDP)
64.25 -Templates/Project/Samples/JAVA_ME/GameBuilderDemo.zip=\u4f7f\u7528\u6e38\u620f\u6784\u5efa\u5668\u521b\u5efa\u7684\u7b80\u5355\u6e38\u620f (MIDP)
64.26 Templates/Project/Samples/JAVA_ME/I18nDemo.zip=I18n \u6f14\u793a (MIDP)
64.27 Templates/Project/Samples/JAVA_ME/JSR172Demo.zip=JSR172 \u6f14\u793a (MIDP)
64.28 -Templates/Project/Samples/JAVA_ME/LocalizationDemo.zip=\u672c\u5730\u5316\u652f\u6301\u793a\u4f8b (MIDP)
64.29 Templates/Project/Samples/JAVA_ME/MMAPIDemos.zip=MMAPI \u6f14\u793a (MIDP)
64.30 Templates/Project/Samples/JAVA_ME/NetworkDemo.zip=\u7f51\u7edc\u6f14\u793a (MIDP)
64.31 Templates/Project/Samples/JAVA_ME/ObexDemo.zip=Obex \u6f14\u793a (MIDP)
64.32 @@ -99,7 +93,6 @@
64.33 Templates/Project/Samples/JAVA_ME/SVGDemo.zip=SVG \u6f14\u793a (MIDP)
64.34 Templates/Project/Samples/JAVA_ME/UIDemo.zip=UI \u6f14\u793a (MIDP)
64.35 Templates/Project/Samples/JAVA_ME/WMADemo.zip=WMA \u6f14\u793a (MIDP)
64.36 -Templates/Project/Samples/JAVA_ME/VDCustomComponents.zip=\u53ef\u89c6\u8bbe\u8ba1\u5668\u5b9a\u5236\u7ec4\u4ef6 (MIDP)
64.37 Templates/Project/J2ME=Java ME
64.38 Templates/Project/J2ME/MobileApplication=Mobile \u5e94\u7528\u7a0b\u5e8f
64.39 Templates/Project/J2ME/MobileLibrary=Mobile \u7c7b\u5e93
64.40 @@ -112,20 +105,6 @@
64.41 SVGResolver=SVG \u6587\u4ef6
64.42 Templates/Other/Image.svg=SVG \u6587\u4ef6
64.43 SVGPaletteItemResolver=SVGPaletteItem \u6587\u4ef6
64.44 -NetBeansMIDPComponentsPDA=NetBeans MIDP \u7ec4\u4ef6 PDA
64.45 -NetBeansMIDPComponentsWMA=NetBeans MIDP \u7ec4\u4ef6 WMA
64.46 -NetBeansMIDPComponents=NetBeans MIDP \u7ec4\u4ef6
64.47 -nb_svg_midp_components=NetBeans MIDP \u7ec4\u4ef6 SVG
64.48 -Templates/Project/J2ME/CustomComponentProject=Mobile \u8bbe\u8ba1\u5668\u7ec4\u4ef6
64.49 -Templates/J2MEComponents=Mobile \u8bbe\u8ba1\u5668
64.50 -Templates/J2MEComponents/CustomComponent=Mobile \u8bbe\u8ba1\u5668\u7ec4\u4ef6
64.51 -Templates/MIDP/GameDesign.java=\u6e38\u620f\u6784\u5efa\u5668
64.52 -VMDResolver=VMD \u6587\u4ef6
64.53 -Templates/MIDP/ConverterVisualMIDlet.java=\u8f6c\u6362\u5668 Visual MIDlet
64.54 -Templates/MIDP/VisualMIDlet.java=\u53ef\u89c6 MIDlet
64.55 -Templates/MIDP/VisualDesign.java=\u53ef\u89c6\u8bbe\u8ba1
64.56 -Templates/MIDP/HelloMIDlet.java=Hello Visual MIDlet
64.57 -PaletteResolver=VMD \u7ec4\u4ef6\u9762\u677f\u6587\u4ef6
64.58
64.59
64.60
65.1 --- a/src/zh_CN/groovy/groovy-support/groovy-support/org/netbeans/modules/groovy/support/options/Bundle_zh_CN.properties Tue Jun 26 07:22:38 2012 +0900
65.2 +++ b/src/zh_CN/groovy/groovy-support/groovy-support/org/netbeans/modules/groovy/support/options/Bundle_zh_CN.properties Tue Jun 26 07:28:03 2012 +0900
65.3 @@ -40,6 +40,7 @@
65.4 # Version 2 license, then the option applies only if the new code is
65.5 # made subject to such option by the copyright holder.
65.6
65.7 +OptionsCategory_Groovy=Groovy
65.8 # Followed by a URL where Groovy can be downloaded
65.9 SupportPanel.jLabel2.text=\u5728\u4ee5\u4e0b\u7f51\u5740\u83b7\u53d6 Groovy: http://groovy.codehaus.org
65.10
66.1 --- a/src/zh_CN/harness/org-netbeans-libs-nbi-engine/ext/nbi-engine/org/netbeans/installer/product/Bundle_zh_CN.properties Tue Jun 26 07:22:38 2012 +0900
66.2 +++ b/src/zh_CN/harness/org-netbeans-libs-nbi-engine/ext/nbi-engine/org/netbeans/installer/product/Bundle_zh_CN.properties Tue Jun 26 07:28:03 2012 +0900
66.3 @@ -84,3 +84,5 @@
66.4
66.5 R.error.unknown.dependency=\u672a\u77e5\u7684\u4f9d\u8d56\u5173\u7cfb\u7c7b\u578b{0}
66.6
66.7 +R.registry.initialization.failed=\u65e0\u6cd5\u521d\u59cb\u5316\u6ce8\u518c\u8868
66.8 +
67.1 --- a/src/zh_CN/harness/org-netbeans-libs-nbi-engine/ext/nbi-engine/org/netbeans/installer/utils/Bundle_zh_CN.properties Tue Jun 26 07:22:38 2012 +0900
67.2 +++ b/src/zh_CN/harness/org-netbeans-libs-nbi-engine/ext/nbi-engine/org/netbeans/installer/utils/Bundle_zh_CN.properties Tue Jun 26 07:28:03 2012 +0900
67.3 @@ -47,6 +47,7 @@
67.4 EM.unexpected.error=\u51fa\u73b0\u672a\u77e5\u9519\u8bef\u3002
67.5 EM.exception.message=\n\n\u5f02\u5e38\u9519\u8bef:\n {0}:\n {1}
67.6 EM.exception.logfile.info=\n\n\u60a8\u53ef\u4ee5\u4ece\u5b89\u88c5\u7a0b\u5e8f\u65e5\u5fd7\u6587\u4ef6\u4e2d\u83b7\u53d6\u6709\u5173\u6b64\u95ee\u9898\u7684\u66f4\u591a\u8be6\u7ec6\u4fe1\u606f:\n {0}
67.7 +EM.exception.continue.question=\n\n\u662f\u5426\u7ee7\u7eed\u5b89\u88c5?
67.8
67.9 FU.error.output.file.entry=\u5b58\u5728\u6587\u4ef6\u6761\u76ee{0}, \u4f46\u8be5\u6761\u76ee\u4e0d\u662f\u6587\u4ef6
67.10 FU.error.output.dir.entry=\u5b58\u5728\u76ee\u5f55\u6761\u76ee{0}, \u4f46\u8be5\u6761\u76ee\u4e0d\u662f\u76ee\u5f55
68.1 --- a/src/zh_CN/ide/bugtracking/bugtracking/org/netbeans/modules/bugtracking/jira/Bundle_zh_CN.properties Tue Jun 26 07:22:38 2012 +0900
68.2 +++ b/src/zh_CN/ide/bugtracking/bugtracking/org/netbeans/modules/bugtracking/jira/Bundle_zh_CN.properties Tue Jun 26 07:28:03 2012 +0900
68.3 @@ -57,6 +57,10 @@
68.4 MSG_LookingForJira=\u67e5\u627e JIRA \u63d2\u4ef6
68.5 LBL_MissingClient_UC_Unavailable=\u66f4\u65b0\u4e2d\u5fc3\u4e0d\u53ef\u7528\u3002
68.6 MSG_MissingClient_UC_Unavailable=\u65e0\u6cd5\u5b89\u88c5 JIRA \u63d2\u4ef6, \u56e0\u4e3a\u66f4\u65b0\u4e2d\u5fc3\u5f53\u524d\u4e0d\u53ef\u7528\u3002\n\u8bf7\u7a0d\u540e\u518d\u8bd5\u3002
68.7 +LBL_MissingClient_InvalidOperation=\u5df2\u5b89\u88c5\u3002
68.8 +MSG_MissingClient_InvalidOperation=\u65e0\u6cd5\u5b89\u88c5 JIRA \u63d2\u4ef6, \u5b83\u53ef\u80fd\u5df2\u5b89\u88c5\u3002
68.9 +LBL_MissingClient_RestartNeeded=\u9700\u8981\u91cd\u65b0\u542f\u52a8\u3002
68.10 +MSG_MissingClient_RestartNeeded=\u5fc5\u987b\u5728\u5b89\u88c5\u63d2\u4ef6\u4e4b\u524d\u91cd\u65b0\u542f\u52a8 IDE\u3002
68.11 MissingJiraSupportPanel.forceGlobalCheckBox.text=\u5f3a\u5236\u5b89\u88c5\u5230\u5171\u4eab\u76ee\u5f55(&F)
68.12 MissingJiraSupportPanel.jLabel1.text=jLabel1
68.13
69.1 --- a/src/zh_CN/ide/bugzilla/bugzilla/org/netbeans/modules/bugzilla/Bundle_zh_CN.properties Tue Jun 26 07:22:38 2012 +0900
69.2 +++ b/src/zh_CN/ide/bugzilla/bugzilla/org/netbeans/modules/bugzilla/Bundle_zh_CN.properties Tue Jun 26 07:28:03 2012 +0900
69.3 @@ -41,7 +41,7 @@
69.4 # made subject to such option by the copyright holder.
69.5
69.6 OpenIDE-Module-Display-Category=\u57fa\u672c IDE
69.7 -OpenIDE-Module-Long-Description=\u6700\u591a\u652f\u6301 4.0 \u7248\u7684 Bugzilla \u95ee\u9898\u8ddf\u8e2a\u5668
69.8 +OpenIDE-Module-Long-Description=\u6700\u9ad8\u652f\u6301 4.0 \u7248\u7684 Bugzilla \u95ee\u9898\u8ddf\u8e2a\u5668
69.9 ## libs/jsch/manifest.mf
69.10 OpenIDE-Module-Name=Bugzilla
69.11 #HtmlPanel.pane.contentType=text/html
70.1 --- a/src/zh_CN/ide/bugzilla/bugzilla/org/netbeans/modules/bugzilla/issue/Bundle_zh_CN.properties Tue Jun 26 07:22:38 2012 +0900
70.2 +++ b/src/zh_CN/ide/bugzilla/bugzilla/org/netbeans/modules/bugzilla/issue/Bundle_zh_CN.properties Tue Jun 26 07:28:03 2012 +0900
70.3 @@ -84,36 +84,36 @@
70.4 CTL_Issue_Whiteboard_Desc=\u95ee\u9898\u72b6\u6001\u767d\u677f
70.5
70.6 # IssuePanel
70.7 -IssuePanel.productLabel.text=\u4ea7\u54c1(&U):
70.8 -IssuePanel.componentLabel.text=\u7ec4\u4ef6(&M):
70.9 -IssuePanel.versionLabel.text=\u7248\u672c(&V):
70.10 -IssuePanel.platformLabel.text=\u5e73\u53f0(&F):
70.11 -IssuePanel.statusLabel.text=\u72b6\u6001(&S):
70.12 -IssuePanel.resolutionLabel.text=\u89e3\u51b3\u65b9\u6848(&R):
70.13 -IssuePanel.priorityLabel.text=\u4f18\u5148\u7ea7(&P):
70.14 -IssuePanel.targetMilestoneLabel.text=\u76ee\u6807 Milestone(&T):
70.15 -IssuePanel.urlLabel.text=UR&L:
70.16 -IssuePanel.keywordsLabel.text=\u5173\u952e\u5b57(&W):
70.17 +IssuePanel.productLabel.text=\u4ea7\u54c1:
70.18 +IssuePanel.componentLabel.text=\u7ec4\u4ef6:
70.19 +IssuePanel.versionLabel.text=\u7248\u672c:
70.20 +IssuePanel.platformLabel.text=\u5e73\u53f0:
70.21 +IssuePanel.statusLabel.text=\u72b6\u6001:
70.22 +IssuePanel.resolutionLabel.text=\u89e3\u51b3\u65b9\u6848:
70.23 +IssuePanel.priorityLabel.text=\u4f18\u5148\u7ea7:
70.24 +IssuePanel.targetMilestoneLabel.text=\u76ee\u6807 Milestone:
70.25 +IssuePanel.urlLabel.text=URL:
70.26 +IssuePanel.keywordsLabel.text=\u5173\u952e\u5b57:
70.27 IssuePanel.reportedLabel.text=\u5df2\u62a5\u544a:
70.28 # {0} creation, {1} reporter
70.29 IssuePanel.reportedLabel.format={0}\u5df2\u7531{1}\u62a5\u544a
70.30 IssuePanel.modifiedLabel.text=\u5df2\u4fee\u6539:
70.31 -IssuePanel.assignedLabel.text=\u6307\u5b9a\u5904\u7406\u4eba(&A):
70.32 -IssuePanel.qaContactLabel.text=QA \u8054\u7cfb\u4eba(&Q):
70.33 -IssuePanel.ccLabel.text=\u6284\u9001(&C):
70.34 -IssuePanel.dependsLabel.text=\u4f9d\u8d56\u4e8e(&D):
70.35 -IssuePanel.blocksLabel.text=\u963b\u6b62(&K):
70.36 -IssuePanel.addCommentLabel.text=\u6dfb\u52a0\u6ce8\u91ca(&N):
70.37 -IssuePanel.submitButton.text=\u63d0\u4ea4\u66f4\u6539(&B)
70.38 -IssuePanel.submitButton.text.new=\u63d0\u4ea4\u95ee\u9898(&B)
70.39 -IssuePanel.cancelButton.text=\u53d6\u6d88\u66f4\u6539(&H)
70.40 +IssuePanel.assignedLabel.text=\u5206\u914d\u7ed9:
70.41 +IssuePanel.qaContactLabel.text=QA \u8054\u7cfb\u4eba:
70.42 +IssuePanel.ccLabel.text=\u6284\u9001:
70.43 +IssuePanel.dependsLabel.text=\u4f9d\u8d56\u4e8e:
70.44 +IssuePanel.blocksLabel.text=\u5757:
70.45 +IssuePanel.addCommentLabel.text=\u6dfb\u52a0\u60a8\u7684\u8bc4\u8bba:
70.46 +IssuePanel.submitButton.text=\u63d0\u4ea4\u66f4\u6539
70.47 +IssuePanel.submitButton.text.new=\u63d0\u4ea4\u95ee\u9898
70.48 +IssuePanel.cancelButton.text=\u53d6\u6d88\u66f4\u6539
70.49 IssuePanel.attachmentsLabel.text=\u9644\u4ef6:
70.50 # {0} id, {1} summary
70.51 IssuePanel.headerLabel.format=\u95ee\u9898\u7f16\u53f7 {0} - {1}
70.52 # {0} id
70.53 IssuePanel.submitMessage=\u63d0\u4ea4\u5bf9\u95ee\u9898{0}\u6240\u505a\u7684\u66f4\u6539
70.54 IssuePanel.submitNewMessage=\u63d0\u4ea4\u65b0\u95ee\u9898
70.55 -IssuePanel.refreshButton.text=\u5237\u65b0\u95ee\u9898(&E)
70.56 +IssuePanel.refreshButton.text=\u5237\u65b0\u95ee\u9898
70.57 IssuePanel.refreshMessage=\u5237\u65b0\u95ee\u9898{0}
70.58
70.59 IssuePanel.duplicateLabel.text=\u95ee\u9898
70.60 @@ -126,8 +126,8 @@
70.61 # IssuePanel.duplicateButton.text=...
70.62 IssuePanel.duplicateButton.message=\u9009\u62e9\u91cd\u590d\u95ee\u9898(&S)\u3002
70.63 IssuePanel.attachment.noDescription=<\u65e0\u63cf\u8ff0>
70.64 -IssuePanel.summaryLabel.text=\u6982\u8981(&Y):
70.65 -IssuePanel.description=\u63cf\u8ff0(&N):
70.66 +IssuePanel.summaryLabel.text=\u6982\u8981:
70.67 +IssuePanel.description=\u63cf\u8ff0:
70.68 IssuePanel.noSummary=\u7f3a\u5c11\u6982\u8981\u3002
70.69 IssuePanel.noComponent=\u7f3a\u5c11\u7ec4\u4ef6\u3002
70.70 IssuePanel.noTargetMilestone=\u7f3a\u5c11\u76ee\u6807 Milestone\u3002
71.1 --- a/src/zh_CN/ide/bugzilla/bugzilla/org/netbeans/modules/bugzilla/options/Bundle_zh_CN.properties Tue Jun 26 07:22:38 2012 +0900
71.2 +++ b/src/zh_CN/ide/bugzilla/bugzilla/org/netbeans/modules/bugzilla/options/Bundle_zh_CN.properties Tue Jun 26 07:28:03 2012 +0900
71.3 @@ -1,9 +1,9 @@
71.4
71.5 BugzillaOptions.displayName=Bugzilla
71.6 BugzillaOptions.toolTip=Bugzilla \u9009\u9879
71.7 -BugzillaOptionsPanel.jLabel1.text=\u5237\u65b0\u6253\u5f00\u7684\u95ee\u9898\u7684\u95f4\u9694
71.8 +BugzillaOptionsPanel.jLabel1.text=\u5237\u65b0\u672a\u89e3\u51b3\u95ee\u9898\u7684\u95f4\u9694
71.9 BugzillaOptionsPanel.jLabel2.text=\u5206\u949f\u3002
71.10 -BugzillaOptionsPanel.jLabel3.text=\u5237\u65b0\u6253\u5f00\u7684\u67e5\u8be2\u7684\u95f4\u9694
71.11 +BugzillaOptionsPanel.jLabel3.text=\u5237\u65b0\u672a\u89e3\u51b3\u67e5\u8be2\u7684\u95f4\u9694
71.12 BugzillaOptionsPanel.jLabel4.text=\u5206\u949f\u3002
71.13 BugzillaOptionsPanel.issuesTextField.text=
71.14 BugzillaOptionsPanel.queriesTextField.text=
72.1 --- a/src/zh_CN/ide/bugzilla/bugzilla/org/netbeans/modules/bugzilla/query/Bundle_zh_CN.properties Tue Jun 26 07:22:38 2012 +0900
72.2 +++ b/src/zh_CN/ide/bugzilla/bugzilla/org/netbeans/modules/bugzilla/query/Bundle_zh_CN.properties Tue Jun 26 07:28:03 2012 +0900
72.3 @@ -46,28 +46,28 @@
72.4 QueryPanel.jLabel1.text=\u540d\u79f0:
72.5 QueryPanel.nameField.text=
72.6 # QueryPanel.jLabel2.text=...
72.7 -QueryPanel.jLabel1.text_1=\u95ee\u9898 ID(&I):
72.8 +QueryPanel.jLabel1.text_1=\u95ee\u9898 ID:
72.9 QueryPanel.byTextLabel.text_1=\u6309\u6587\u672c\u67e5\u627e\u95ee\u9898
72.10 QueryPanel.byDetailsLabel.text=\u6309\u4ea7\u54c1\u8be6\u7ec6\u4fe1\u606f\u67e5\u627e
72.11 QueryPanel.byPeopleLabel.text=\u6309\u4eba\u5458\u67e5\u627e
72.12 QueryPanel.byLastChangeLabel.text=\u6309\u4e0a\u6b21\u66f4\u6539\u65f6\u95f4\u67e5\u627e
72.13 -QueryPanel.bugAssigneeCheckBox.text=\u6307\u5b9a\u5904\u7406\u4eba(&A)
72.14 -QueryPanel.reporterCheckBox.text=\u62a5\u544a\u8005(&R)
72.15 -QueryPanel.ccCheckBox.text=\u6284\u9001(&C)
72.16 -QueryPanel.commenterCheckBox.text=\u6ce8\u91ca\u8005(&N)
72.17 -QueryPanel.gotoIssueButton.text=\u8f6c\u81f3\u95ee\u9898(&G)
72.18 -QueryPanel.searchButton.text=\u641c\u7d22(&S)
72.19 +QueryPanel.bugAssigneeCheckBox.text=\u6307\u5b9a\u5904\u7406\u4eba
72.20 +QueryPanel.reporterCheckBox.text=\u62a5\u544a\u8005
72.21 +QueryPanel.ccCheckBox.text=\u6284\u9001
72.22 +QueryPanel.commenterCheckBox.text=\u6ce8\u91ca\u8005
72.23 +QueryPanel.gotoIssueButton.text=\u8f6c\u81f3\u95ee\u9898
72.24 +QueryPanel.searchButton.text=\u641c\u7d22
72.25 QueryPanel.tableSummaryLabel.text_1=jLabel2
72.26 QueryPanel.peopleLabel.text=\u4e0b\u5217\u4efb\u4e00\u4eba\u5458:
72.27 -QueryPanel.versionLabel.text=\u7248\u672c(&V)
72.28 -QueryPanel.statusLabel.text=\u72b6\u6001(&U)
72.29 -QueryPanel.resolutionLabel.text=\u89e3\u51b3\u65b9\u6848(&L)
72.30 -QueryPanel.priorityLabel.text=\u4f18\u5148\u7ea7(&P)
72.31 -QueryPanel.summaryLabel.text_1=\u6982\u8981(&Y):
72.32 -QueryPanel.commentLabel.text=\u6ce8\u91ca(&O):
72.33 -QueryPanel.keywordsLabel.text=\u5173\u952e\u5b57(&K):
72.34 -QueryPanel.productLabel.text=\u4ea7\u54c1(&D)
72.35 -QueryPanel.componentLabel.text=\u7ec4\u4ef6(&M)
72.36 +QueryPanel.versionLabel.text=\u7248\u672c
72.37 +QueryPanel.statusLabel.text=\u72b6\u6001
72.38 +QueryPanel.resolutionLabel.text=\u89e3\u51b3\u65b9\u6848
72.39 +QueryPanel.priorityLabel.text=\u4f18\u5148\u7ea7
72.40 +QueryPanel.summaryLabel.text_1=\u6982\u8981:
72.41 +QueryPanel.commentLabel.text=\u6ce8\u91ca:
72.42 +QueryPanel.keywordsLabel.text=\u5173\u952e\u5b57:
72.43 +QueryPanel.productLabel.text=\u4ea7\u54c1
72.44 +QueryPanel.componentLabel.text=\u7ec4\u4ef6
72.45
72.46 MSG_NoResults=\u672a\u627e\u5230\u95ee\u9898
72.47 MSG_Searching=\u6b63\u5728\u641c\u7d22...
72.48 @@ -80,7 +80,7 @@
72.49 MSG_RemoveQuery=\u662f\u5426\u8981\u5220\u9664\u67e5\u8be2 ''{0}''?
72.50 CTL_RemoveQuery=\u5220\u9664
72.51
72.52 -QueryPanel.jLabel2.text_1=\u67e5\u8be2 URL(&Q):
72.53 +QueryPanel.jLabel2.text_1=\u67e5\u8be2 URL:
72.54 QueryPanel.urlToggleButton.textForm=\u5728\u7a97\u4f53\u4e2d\u521b\u5efa\u67e5\u8be2
72.55 QueryPanel.urlToggleButton.textUrl=\u4ee5 URL \u5f62\u5f0f\u521b\u5efa\u67e5\u8be2
72.56
72.57 @@ -92,35 +92,35 @@
72.58 LBL_Never=\u4ece\u4e0d
72.59 QueryPanel.changedFromTextField.text=
72.60 QueryPanel.changedToTextField.text=
72.61 -QueryPanel.changedLabel.text_1=\u4ec5\u5728\u4ee5\u4e0b\u65f6\u95f4\u4e4b\u95f4\u66f4\u6539\u7684\u9519\u8bef(&B):
72.62 +QueryPanel.changedLabel.text_1=\u4ec5\u5728\u4ee5\u4e0b\u65f6\u95f4\u4e4b\u95f4\u66f4\u6539\u7684\u9519\u8bef:
72.63 QueryPanel.changedAndLabel.text=\u4e0e
72.64 QueryPanel.changedWhereLabel.text=\u5176\u4e2d
72.65 # {$an_attribute_given_by_name_and_picked_from_a_list} has changed, and the new value was {$value}
72.66 QueryPanel.changedBlaBlaLabel.text=\u5df2\u66f4\u6539, \u65b0\u503c\u662f
72.67 # YYYY-MM-DD is a date format
72.68 QueryPanel.changedHintLabel.text=YYYY-MM-DD \u6216\u76f8\u5bf9\u65e5\u671f
72.69 -QueryPanel.refreshButton.text=\u5237\u65b0(&R)
72.70 -QueryPanel.modifyButton.text=\u4fee\u6539\u67e5\u8be2(&M)
72.71 -QueryPanel.seenButton.text=\u5c06\u6240\u6709\u95ee\u9898\u6807\u8bb0\u4e3a\u5df2\u53d1\u73b0(&S)
72.72 -QueryPanel.removeButton.text=\u5220\u9664\u67e5\u8be2(&M)
72.73 +QueryPanel.refreshButton.text=\u5237\u65b0
72.74 +QueryPanel.modifyButton.text=\u4fee\u6539\u67e5\u8be2
72.75 +QueryPanel.seenButton.text=\u5c06\u6240\u6709\u95ee\u9898\u6807\u8bb0\u4e3a\u5df2\u53d1\u73b0
72.76 +QueryPanel.removeButton.text=\u79fb\u53bb\u67e5\u8be2
72.77 QueryPanel.saveButton.text=\u4fdd\u5b58\u6b64\u67e5\u8be2
72.78 QueryPanel.webButton.text=\u6253\u5f00 Web \u67e5\u8be2
72.79 LBL_MatchingIssues=\u6709 {0} \u4e2a\u95ee\u9898\u4e0e\u8be5\u67e5\u8be2\u5339\u914d\u3002
72.80 LBL_MatchingIssue=\u6709 1 \u4e2a\u95ee\u9898\u4e0e\u8be5\u67e5\u8be2\u5339\u914d\u3002
72.81 -QueryPanel.saveChangesButton.text=\u4fdd\u5b58\u66f4\u6539(&S)
72.82 -QueryPanel.cancelChangesButton.text=\u53d6\u6d88\u66f4\u6539(&E)
72.83 +QueryPanel.saveChangesButton.text=\u4fdd\u5b58\u66f4\u6539
72.84 +QueryPanel.cancelChangesButton.text=\u53d6\u6d88\u66f4\u6539
72.85 QueryPanel.jLabel4.text_1=
72.86 QueryPanel.jLabel5.text=
72.87 QueryPanel.jLabel6.text=
72.88 # QueryPanel.keywordsButton.text=...
72.89
72.90 LBL_SelectKeywords=\u9009\u62e9\u6216\u53d6\u6d88\u9009\u62e9\u5173\u952e\u5b57\u3002
72.91 -QueryPanel.severityLabel.text=\u4e25\u91cd\u6027(&T)
72.92 -QueryPanel.refreshCheckBox.text=\u81ea\u52a8\u5237\u65b0\u6b64\u67e5\u8be2(&H)
72.93 +QueryPanel.severityLabel.text=\u4e25\u91cd\u6027
72.94 +QueryPanel.refreshCheckBox.text=\u81ea\u52a8\u5237\u65b0\u6b64\u67e5\u8be2
72.95 QueryPanel.noContentLabel.text=jLabel9
72.96 QueryPanel.savePanel.AccessibleContext.accessibleDescription=\u4fdd\u5b58\u67e5\u8be2
72.97 QueryPanel.queryNameTextField.AccessibleContext.accessibleDescription=\u67e5\u8be2\u540d\u79f0
72.98 -QueryPanel.refreshConfigurationButton.text=\u91cd\u65b0\u52a0\u8f7d\u5c5e\u6027(&T)
72.99 +QueryPanel.refreshConfigurationButton.text=\u91cd\u65b0\u52a0\u8f7d\u5c5e\u6027
72.100 QueryPanel.summaryTextField.AccessibleContext.accessibleName=\u6982\u8981
72.101 QueryPanel.commentTextField.AccessibleContext.accessibleName=\u6ce8\u91ca
72.102 QueryPanel.keywordsTextField.AccessibleContext.accessibleName=\u5173\u952e\u5b57
72.103 @@ -170,11 +170,11 @@
72.104 QueryPanel.separatorLabel2.text=
72.105 QueryPanel.separatorLabel3.text=
72.106 QueryPanel.jLabel7.text=
72.107 -QueryPanel.findIssuesButton.text=\u67e5\u627e\u95ee\u9898(&F)
72.108 -QueryPanel.whiteboardLabel.text=\u767d\u677f(&H):
72.109 -QueryPanel.issueTypeLabel.text=\u95ee\u9898\u7c7b\u578b(&S)
72.110 -QueryPanel.tmLabel.text=\u76ee\u6807 Milestone(&M)
72.111 +QueryPanel.findIssuesButton.text=\u67e5\u627e\u95ee\u9898
72.112 +QueryPanel.whiteboardLabel.text=\u767d\u677f:
72.113 +QueryPanel.issueTypeLabel.text=\u95ee\u9898\u7c7b\u578b
72.114 +QueryPanel.tmLabel.text=\u76ee\u6807 Milestone
72.115 QueryPanel.jLabel8.text=
72.116 -QueryPanel.cloneQueryButton.text=\u514b\u9686\u67e5\u8be2(&C)
72.117 +QueryPanel.cloneQueryButton.text=\u514b\u9686\u67e5\u8be2
72.118 MSG_SAME_NAME=\u540c\u540d\u7684\u67e5\u8be2\u5df2\u5b58\u5728\u3002
72.119
73.1 --- a/src/zh_CN/ide/code-analysis/code-analysis/org/netbeans/modules/analysis/Bundle_zh_CN.properties Tue Jun 26 07:22:38 2012 +0900
73.2 +++ b/src/zh_CN/ide/code-analysis/code-analysis/org/netbeans/modules/analysis/Bundle_zh_CN.properties Tue Jun 26 07:28:03 2012 +0900
73.3 @@ -2,11 +2,19 @@
73.4 BN_Cancel=\u53d6\u6d88
73.5 BN_Inspect=\u68c0\u67e5
73.6 CTL_RunAnalysisAction=\u68c0\u67e5...
73.7 +# {0} - file display name
73.8 DN_CurrentFile=\u5f53\u524d\u6587\u4ef6 ({0})
73.9 +# {0} - package display name
73.10 DN_CurrentPackage=\u5f53\u524d\u5305 ({0})
73.11 +# {0} - project display name
73.12 DN_CurrentProject=\u5f53\u524d\u9879\u76ee ({0})
73.13 DN_OpenProjects=\u6253\u5f00\u7684\u9879\u76ee
73.14 +LBL_Browse=\u6d4f\u89c8\u68c0\u67e5
73.15 +LBL_Configurations=\u914d\u7f6e
73.16 +LBL_Custom=\u5b9a\u5236
73.17 +LBL_Predefined=\u9884\u5b9a\u4e49
73.18 LBL_RunAllAnalyzers=\u6240\u6709\u5206\u6790\u5668
73.19 +# {0} - the analyzer that should be run
73.20 # LBL_RunAnalyzer={0}
73.21 networkproblem_header=\u65e0\u6cd5\u8fde\u63a5\u5230 NetBeans \u63d2\u4ef6\u95e8\u6237
73.22 networkproblem_message=\u68c0\u67e5\u4ee3\u7406\u8bbe\u7f6e\u6216\u7a0d\u540e\u91cd\u8bd5\u3002\u76ee\u524d\u8be5\u670d\u52a1\u5668\u53ef\u80fd\u4e0d\u53ef\u7528\u3002\u60a8\u8fd8\u53ef\u80fd\u5e0c\u671b\u786e\u4fdd\u9632\u706b\u5899\u4e0d\u4f1a\u963b\u585e\u7f51\u7edc\u901a\u4fe1\u3002
74.1 --- a/src/zh_CN/ide/css-visual/css-visual/org/netbeans/modules/css/visual/ui/Bundle_zh_CN.properties Tue Jun 26 07:22:38 2012 +0900
74.2 +++ b/src/zh_CN/ide/css-visual/css-visual/org/netbeans/modules/css/visual/ui/Bundle_zh_CN.properties Tue Jun 26 07:28:03 2012 +0900
74.3 @@ -173,7 +173,7 @@
74.4 CLIP_TOP=\u4e0a
74.5 CLIP_RIGHT=\u53f3
74.6 CLIP_BOTTOM=\u4e0b
74.7 -TEXT_INDENTATION=\u7f29\u6392
74.8 +TEXT_INDENTATION=\u7f29\u8fdb
74.9 TEXT_DIRECTION=\u65b9\u5411
74.10 TEXT_HORIZ_ALIGN=\u6c34\u5e73\u5bf9\u9f50
74.11 TEXT_VERTICAL_ALIGN=\u5782\u76f4\u5bf9\u9f50
74.12 @@ -531,7 +531,7 @@
74.13 VERTICAL_ALIGN_ACCESS_DESC=\u7528\u4e8e\u9009\u62e9\u5782\u76f4\u5bf9\u9f50\u503c\u7684\u7ec4\u5408\u6846
74.14
74.15
74.16 -INDENT_ACCESS_DESC=\u7528\u4e8e\u9009\u62e9\u7f29\u6392\u503c\u7684\u7ec4\u5408\u6846
74.17 +INDENT_ACCESS_DESC=\u7528\u4e8e\u9009\u62e9\u7f29\u8fdb\u503c\u7684\u7ec4\u5408\u6846
74.18
74.19
74.20 DIRECTION_ACCESS_DESC=\u7528\u4e8e\u9009\u62e9\u6587\u672c\u65b9\u5411\u503c\u7684\u7ec4\u5408\u6846
74.21 @@ -552,10 +552,10 @@
74.22 VERTICAL_ALIGN_UNIT_ACCESS_DESC=\u7528\u4e8e\u9009\u62e9\u5782\u76f4\u5bf9\u9f50\u5355\u4f4d\u503c\u7684\u7ec4\u5408\u6846
74.23
74.24
74.25 -INDENT_UNIT_ACCESS_NAME=\u7f29\u6392\u5355\u4f4d\u9009\u62e9
74.26 +INDENT_UNIT_ACCESS_NAME=\u7f29\u8fdb\u5355\u4f4d\u9009\u62e9
74.27
74.28
74.29 -INDENT_UNIT_ACCESS_DESC=\u7528\u4e8e\u9009\u62e9\u7f29\u6392\u5355\u4f4d\u503c\u7684\u7ec4\u5408\u6846
74.30 +INDENT_UNIT_ACCESS_DESC=\u7528\u4e8e\u9009\u62e9\u7f29\u8fdb\u5355\u4f4d\u503c\u7684\u7ec4\u5408\u6846
74.31
74.32
74.33 WORD_SPACING_UNIT_ACCESS_NAME=\u6587\u5b57\u95f4\u8ddd\u5355\u4f4d\u9009\u62e9
74.34 @@ -610,7 +610,7 @@
74.35 VERTICAL_ALIGN_ACCESS_NAME= \u5782\u76f4\u5bf9\u9f50\u503c\u9009\u62e9
74.36
74.37
74.38 -INDENT_ACCESS_NAME=\u7f29\u6392\u503c\u9009\u62e9
74.39 +INDENT_ACCESS_NAME=\u7f29\u8fdb\u503c\u9009\u62e9
74.40
74.41
74.42 DIRECTION_ACCESS_NAME=\u6587\u672c\u65b9\u5411\u503c\u9009\u62e9
75.1 --- a/src/zh_CN/ide/db-sql-editor/db-sql-editor/org/netbeans/modules/db/sql/editor/Bundle_zh_CN.properties Tue Jun 26 07:22:38 2012 +0900
75.2 +++ b/src/zh_CN/ide/db-sql-editor/db-sql-editor/org/netbeans/modules/db/sql/editor/Bundle_zh_CN.properties Tue Jun 26 07:28:03 2012 +0900
75.3 @@ -42,10 +42,6 @@
75.4
75.5 OPTIONS_sql=SQL \u7f16\u8f91\u5668
75.6
75.7 -#SQLIndentEngineBeanInfo
75.8 -LBL_SQLIndentEngine=SQL \u7f29\u6392\u5f15\u64ce
75.9 -HINT_SQLIndentEngine=SQL \u6587\u4ef6\u7684\u7f29\u6392\u5f15\u64ce
75.10 -
75.11 #SQLEditorProviderImpl
75.12 #{0} = command number
75.13 #PARTI18N - only localize "SQL Command" and do not add anything after ".sql"
76.1 --- a/src/zh_CN/ide/db/db/org/netbeans/modules/db/explorer/action/Bundle_zh_CN.properties Tue Jun 26 07:22:38 2012 +0900
76.2 +++ b/src/zh_CN/ide/db/db/org/netbeans/modules/db/explorer/action/Bundle_zh_CN.properties Tue Jun 26 07:28:03 2012 +0900
76.3 @@ -80,6 +80,7 @@
76.4 ERR_UnableToGrabTable=\u65e0\u6cd5\u6293\u53d6\u8868\u3002
76.5 ERR_UnableToRecreateTable=\u65e0\u6cd5\u91cd\u65b0\u521b\u5efa\u8868\u3002
76.6 ERR_UnableObtainSchemas=\u65e0\u6cd5\u83b7\u53d6\u65b9\u6848\u3002\n\u6ca1\u6709\u8db3\u591f\u7684\u4fe1\u606f\u5efa\u7acb\u8fde\u63a5\u4ee5\u83b7\u53d6\u65b9\u6848\u5217\u8868\u3002\u8bf7\u68c0\u67e5\u6570\u636e\u5e93 URL, \u7528\u6237\u548c\u53e3\u4ee4\u3002\n\u9a71\u52a8\u7a0b\u5e8f\u6d88\u606f: {0}
76.7 +ERR_ConnectionToServerClosed=\u4e0e\u670d\u52a1\u5668\u7684\u8fde\u63a5\u5df2\u5173\u95ed\u3002\n\u6709\u5173\u8be6\u7ec6\u4fe1\u606f, \u8bf7\u53c2\u89c1 IDE \u65e5\u5fd7\u3002
76.8 ACS_ConnectingDialogTextA11yDesc=\u8fde\u63a5\u6570\u636e\u5e93\u8fdb\u5ea6\u5bf9\u8bdd\u6846\u3002
76.9
76.10 # ConnectProgressDialog
77.1 --- a/src/zh_CN/ide/db/db/org/netbeans/modules/db/explorer/dlg/Bundle_zh_CN.properties Tue Jun 26 07:22:38 2012 +0900
77.2 +++ b/src/zh_CN/ide/db/db/org/netbeans/modules/db/explorer/dlg/Bundle_zh_CN.properties Tue Jun 26 07:28:03 2012 +0900
77.3 @@ -367,7 +367,7 @@
77.4 #MySQLDriverClass=com.mysql.jdbc.Driver
77.5 #MySQLSampleUser=root
77.6 #MySQLSamplePassword=
77.7 -#MySQLSampleDatabaseUrl=jdbc:mysql://localhost:3306/mysql
77.8 +#MySQLSampleDatabaseUrl=jdbc:mysql://localhost:3306/mysql?zeroDateTimeBehavior=convertToNull
77.9 ChoosingDriverUI.lDrivers.text=\u9a71\u52a8\u7a0b\u5e8f(&D):
77.10 NewConnectionPanel.ConnectionPassed=\u8fde\u63a5\u6210\u529f\u3002
77.11 AddDriverDownloadMissingFile=<html>\u7f3a\u5c11\u9a71\u52a8\u7a0b\u5e8f\u6587\u4ef6\u3002\u53ef\u4ece <a href="{0}">{0}</a> \u4e0b\u8f7d\u3002<i>\u8bf7\u4f7f\u7528\u9996\u9009\u7684 </i>{1}\u3002</html>
78.1 --- a/src/zh_CN/ide/editor-bookmarks/editor-bookmarks/org/netbeans/modules/editor/bookmarks/Bundle_zh_CN.properties Tue Jun 26 07:22:38 2012 +0900
78.2 +++ b/src/zh_CN/ide/editor-bookmarks/editor-bookmarks/org/netbeans/modules/editor/bookmarks/Bundle_zh_CN.properties Tue Jun 26 07:28:03 2012 +0900
78.3 @@ -49,4 +49,5 @@
78.4 CTL_BookmarkFileAndLine={0}\u7b2c {1} \u884c
78.5 CTL_BookmarksWindowItem=<\u4e66\u7b7e>
78.6 CTL_BookmarksWindowDescription=\u6253\u5f00\u4e66\u7b7e\u7a97\u53e3
78.7 +LBL_NonExistentFile=<\u4e0d\u5b58\u5728\u7684\u6587\u4ef6>
78.8
79.1 --- a/src/zh_CN/ide/editor-codetemplates/editor-codetemplates/org/netbeans/lib/editor/codetemplates/storage/ui/Bundle_zh_CN.properties Tue Jun 26 07:22:38 2012 +0900
79.2 +++ b/src/zh_CN/ide/editor-codetemplates/editor-codetemplates/org/netbeans/lib/editor/codetemplates/storage/ui/Bundle_zh_CN.properties Tue Jun 26 07:28:03 2012 +0900
79.3 @@ -61,7 +61,7 @@
79.4 TAB=Tab
79.5 ENTER=Enter
79.6 FORMAT=\u91cd\u65b0\u8bbe\u7f6e\u6587\u672c\u683c\u5f0f
79.7 -INDENT=\u91cd\u65b0\u7f29\u6392\u6587\u672c
79.8 +INDENT=\u91cd\u65b0\u7f29\u8fdb\u6587\u672c
79.9 NOOP=\u4e0d\u6267\u884c\u4efb\u4f55\u64cd\u4f5c
79.10 CTL_Templates=\u6a21\u677f(&P):
79.11 CTL_Expanded_Text=\u5c55\u5f00\u7684\u6587\u672c(&X)
80.1 --- a/src/zh_CN/ide/editor-indent-project/editor-indent-project/org/netbeans/modules/editor/indent/project/Bundle_zh_CN.properties Tue Jun 26 07:22:38 2012 +0900
80.2 +++ b/src/zh_CN/ide/editor-indent-project/editor-indent-project/org/netbeans/modules/editor/indent/project/Bundle_zh_CN.properties Tue Jun 26 07:28:03 2012 +0900
80.3 @@ -1,4 +1,4 @@
80.4 -OpenIDE-Module-Name=\u9879\u76ee\u7684\u7f16\u8f91\u5668\u7f29\u6392
80.5 +OpenIDE-Module-Name=\u9879\u76ee\u7684\u7f16\u8f91\u5668\u7f29\u8fdb
80.6
80.7 #FormattingCustomizerPanel
80.8 LBL_CategoryFormatting=\u683c\u5f0f\u8bbe\u7f6e
81.1 --- a/src/zh_CN/ide/editor-indent/editor-indent/org/netbeans/modules/editor/indent/Bundle_zh_CN.properties Tue Jun 26 07:22:38 2012 +0900
81.2 +++ b/src/zh_CN/ide/editor-indent/editor-indent/org/netbeans/modules/editor/indent/Bundle_zh_CN.properties Tue Jun 26 07:28:03 2012 +0900
81.3 @@ -40,9 +40,9 @@
81.4 # Version 2 license, then the option applies only if the new code is
81.5 # made subject to such option by the copyright holder.
81.6
81.7 -OpenIDE-Module-Name=\u7f16\u8f91\u5668\u7f29\u6392
81.8 +OpenIDE-Module-Name=\u7f16\u8f91\u5668\u7f29\u8fdb
81.9 OpenIDE-Module-Display-Category=\u7f16\u8f91
81.10 -OpenIDE-Module-Short-Description=\u5305\u542b\u7f29\u6392 API \u548c SPI\u3002
81.11 -OpenIDE-Module-Long-Description=\u6b64\u6a21\u5757\u5305\u542b\u7f29\u6392\u548c\u4ee3\u7801\u683c\u5f0f\u8bbe\u7f6e API \u4ee5\u53ca\u57fa\u7840\u7ed3\u6784\u3002
81.12 +OpenIDE-Module-Short-Description=\u5305\u542b\u7f29\u8fdb API \u548c SPI\u3002
81.13 +OpenIDE-Module-Long-Description=\u6b64\u6a21\u5757\u5305\u542b\u7f29\u8fdb\u548c\u4ee3\u7801\u683c\u5f0f\u8bbe\u7f6e API \u4ee5\u53ca\u57fa\u7840\u7ed3\u6784\u3002
81.14
81.15
82.1 --- a/src/zh_CN/ide/editor-lib/editor-lib/org/netbeans/editor/Bundle_zh_CN.properties Tue Jun 26 07:22:38 2012 +0900
82.2 +++ b/src/zh_CN/ide/editor-lib/editor-lib/org/netbeans/editor/Bundle_zh_CN.properties Tue Jun 26 07:28:03 2012 +0900
82.3 @@ -125,7 +125,7 @@
82.4 paste-from-clipboard=\u7c98\u8d34
82.5 popup-remove-selection=\u5220\u9664
82.6 redo=\u91cd\u505a
82.7 -reindent-line=\u91cd\u65b0\u7f29\u6392\u5f53\u524d\u884c\u6216\u9009\u5b9a\u5185\u5bb9
82.8 +reindent-line=\u91cd\u65b0\u7f29\u8fdb\u5f53\u524d\u884c\u6216\u9009\u5b9a\u5185\u5bb9
82.9 reformat-line=\u91cd\u65b0\u8bbe\u7f6e\u5f53\u524d\u884c\u6216\u9009\u62e9\u5185\u5bb9\u7684\u683c\u5f0f
82.10 remove-line=\u5220\u9664\u884c
82.11 move-selection-else-line-up=\u4e0a\u79fb\u9009\u5b9a\u884c\u4e4b\u5916\u7684\u5176\u4ed6\u884c
82.12 @@ -180,6 +180,8 @@
82.13 smart-completion-show=\u663e\u793a\u667a\u80fd\u4ee3\u7801\u5b8c\u6210\u5f39\u51fa\u5f0f\u83dc\u5355
82.14 documentation-show=\u663e\u793a\u6587\u6863\u5f39\u51fa\u5f0f\u83dc\u5355
82.15 show-popup-menu=\u663e\u793a\u5f39\u51fa\u5f0f\u83dc\u5355
82.16 +# Alternate name key for show-popup-menu action
82.17 +org.openide.actions.PopupAction=\u663e\u793a\u5f39\u51fa\u5f0f\u83dc\u5355
82.18 tooltip-show=\u663e\u793a\u4ee3\u7801\u5b8c\u6210\u63d0\u793a\u5f39\u51fa\u5f0f\u83dc\u5355
82.19 run-macro=\u8fd0\u884c\u5b8f
82.20 split-line=\u62c6\u5206\u884c
83.1 --- a/src/zh_CN/ide/editor/editor/org/netbeans/modules/editor/Bundle_zh_CN.properties Tue Jun 26 07:22:38 2012 +0900
83.2 +++ b/src/zh_CN/ide/editor/editor/org/netbeans/modules/editor/Bundle_zh_CN.properties Tue Jun 26 07:28:03 2012 +0900
83.3 @@ -45,12 +45,12 @@
83.4 OpenIDE-Module-Short-Description=\u5728 IDE \u4e2d\u542f\u7528\u6587\u4ef6\u7f16\u8f91\u529f\u80fd\u3002
83.5 OpenIDE-Module-Long-Description=\u4f7f\u7528\u7f16\u8f91\u5668\u6a21\u5757\u53ef\u4ee5\u5728 IDE \u4e2d\u7f16\u8f91\u6e90\u6587\u4ef6\u3002\u5b83\u53ef\u5bf9 Java \u548c HTML \u6587\u4ef6\u8fdb\u884c\u8bed\u6cd5\u7a81\u51fa\u663e\u793a, \u6587\u5b57\u5339\u914d, \u4ee3\u7801\u5b8c\u6210\u53ca\u5176\u4ed6\u57fa\u672c\u548c\u9ad8\u7ea7\u529f\u80fd\u3002
83.6
83.7 -Services/IndentEngine/org-netbeans-modules-editor-java-JavaIndentEngine.settings=Java \u7f29\u6392\u5f15\u64ce
83.8 -Services/IndentEngine/org-netbeans-modules-editor-SimpleIndentEngine.settings=\u7b80\u5355\u7f29\u6392\u5f15\u64ce
83.9 -Services/IndentEngine/org-netbeans-modules-editor-html-LineWrapIndentEngine.settings=\u81ea\u52a8\u6362\u884c\u7f29\u6392\u5f15\u64ce
83.10 -Templates/Services/IndentEngine/org-netbeans-modules-editor-java-JavaIndentEngine.settings=Java \u7f29\u6392\u5f15\u64ce
83.11 -Templates/Services/IndentEngine/org-netbeans-modules-editor-SimpleIndentEngine.settings=\u7b80\u5355\u7f29\u6392\u5f15\u64ce
83.12 -Templates/Services/IndentEngine/org-netbeans-modules-editor-html-LineWrapIndentEngine.settings=\u81ea\u52a8\u6362\u884c\u7f29\u6392\u5f15\u64ce
83.13 +Services/IndentEngine/org-netbeans-modules-editor-java-JavaIndentEngine.settings=Java \u7f29\u8fdb\u5f15\u64ce
83.14 +Services/IndentEngine/org-netbeans-modules-editor-SimpleIndentEngine.settings=\u7b80\u5355\u7f29\u8fdb\u5f15\u64ce
83.15 +Services/IndentEngine/org-netbeans-modules-editor-html-LineWrapIndentEngine.settings=\u81ea\u52a8\u6362\u884c\u7f29\u8fdb\u5f15\u64ce
83.16 +Templates/Services/IndentEngine/org-netbeans-modules-editor-java-JavaIndentEngine.settings=Java \u7f29\u8fdb\u5f15\u64ce
83.17 +Templates/Services/IndentEngine/org-netbeans-modules-editor-SimpleIndentEngine.settings=\u7b80\u5355\u7f29\u8fdb\u5f15\u64ce
83.18 +Templates/Services/IndentEngine/org-netbeans-modules-editor-html-LineWrapIndentEngine.settings=\u81ea\u52a8\u6362\u884c\u7f29\u8fdb\u5f15\u64ce
83.19 Menu/Source=\u6e90(&S)
83.20 Menu/View/CodeFolds=\u4ee3\u7801\u6298\u53e0(&C)
83.21
84.1 --- a/src/zh_CN/ide/git/git/org/netbeans/modules/git/ui/history/Bundle_zh_CN.properties Tue Jun 26 07:22:38 2012 +0900
84.2 +++ b/src/zh_CN/ide/git/git/org/netbeans/modules/git/ui/history/Bundle_zh_CN.properties Tue Jun 26 07:28:03 2012 +0900
84.3 @@ -132,7 +132,7 @@
84.4
84.5 MSG_DiffPanel_NoRevisions = <\u6bd4\u8f83 - \u672a\u9009\u5b9a\u4fee\u8ba2\u7248>
84.6 MSG_DiffPanel_TooManyRevisions = <\u6bd4\u8f83 - \u9009\u62e9\u7684\u4fee\u8ba2\u7248\u592a\u591a>
84.7 -MSG_DiffPanel_IllegalSelection = <\u6bd4\u8f83 - \u975e\u6cd5\u9009\u62e9>
84.8 +MSG_DiffPanel_IllegalSelection = <\u6bd4\u8f83 - \u9009\u62e9\u65e0\u6548>
84.9 MSG_DiffPanel_LoadingDiff = <\u6bd4\u8f83 - \u8bf7\u7a0d\u5019, \u6b63\u5728\u68c0\u7d22\u6587\u4ef6...>
84.10 LBL_NumberOfChangedPaths = \ ({0} \u9879\u66f4\u6539)
84.11 CTL_expandCriteriaButton.text=\u641c\u7d22\u9009\u9879(&P)
85.1 --- a/src/zh_CN/ide/glassfish-common/glassfish-common/org/netbeans/modules/glassfish/common/actions/Bundle_zh_CN.properties Tue Jun 26 07:22:38 2012 +0900
85.2 +++ b/src/zh_CN/ide/glassfish-common/glassfish-common/org/netbeans/modules/glassfish/common/actions/Bundle_zh_CN.properties Tue Jun 26 07:28:03 2012 +0900
85.3 @@ -89,7 +89,7 @@
85.4 MSG_QueryInstallUpdateCenter=\u672a\u5b89\u88c5{0}\u7684\u66f4\u65b0\u4e2d\u5fc3\u3002\u662f\u5426\u8981\u7acb\u5373\u4e0b\u8f7d\u5e76\u8fdb\u884c\u5b89\u88c5? \n\n\u6839\u636e\u8fde\u63a5\u901f\u5ea6\u7684\u4e0d\u540c, \u8fd9\u53ef\u80fd\u9700\u8981\u4e00\u4e9b\u65f6\u95f4, \u4f46\u5728\u4e0b\u8f7d\u8fc7\u7a0b\u4e2d, \u60a8\u5c06\u80fd\u591f\u7ee7\u7eed\u5de5\u4f5c\u3002
85.5 MSG_UpdateCenterInstaller={0}\u7684\u66f4\u65b0\u4e2d\u5fc3\u5b89\u88c5\u7a0b\u5e8f
85.6 MSG_UpdateCenterDownloading={0}\u7684\u66f4\u65b0\u4e2d\u5fc3\u5b89\u88c5\u7a0b\u5e8f\u5df2\u5728\u8fd0\u884c\u3002
85.7 -MSG_UpdateCenterNoPermission=\u5df2\u5b89\u88c5{0}\u7684\u66f4\u65b0\u4e2d\u5fc3, \u4f46\u5f53\u524d\u7528\u6237\u4e0d\u5177\u6709{1}\u7684\u5199\u5165\u6743\u9650\u3002\n\n\u60a8\u5e94\u8be5\u4f7f\u7528\u8be5\u6587\u4ef6\u5939\u6240\u6709\u8005\u7684\u51ed\u8bc1\u91cd\u65b0\u542f\u52a8 IDE, \u7136\u540e\u91cd\u8bd5\u6b64\u64cd\u4f5c\u3002\n\n\u5982\u679c\u60a8\u8fd0\u884c\u7684\u662f\u67d0\u4e00\u7248\u672c\u7684 Windows \u64cd\u4f5c\u7cfb\u7edf, \u5219\u53ef\u4ee5\u4f7f\u7528\u201c\u4ee5\u7ba1\u7406\u5458\u8eab\u4efd\u8fd0\u884c\u201d\u83dc\u5355\u9879\u91cd\u65b0\u542f\u52a8 IDE\u3002
85.8 +MSG_UpdateCenterNoPermission=\u5df2\u5b89\u88c5{0}\u7684\u66f4\u65b0\u4e2d\u5fc3, \u4f46\u5f53\u524d\u7528\u6237\u4e0d\u5177\u6709{1}\u7684\u5199\u5165\u6743\u9650, \u8fd9\u662f\u5b89\u88c5\u6240\u5fc5\u9700\u7684\u3002\n\n\u60a8\u5e94\u8be5\u4f7f\u7528\u8be5\u6587\u4ef6\u5939\u6240\u6709\u8005\u7684\u51ed\u8bc1\u91cd\u65b0\u542f\u52a8 IDE, \u7136\u540e\u91cd\u8bd5\u6b64\u64cd\u4f5c\u3002\n\n\u5982\u679c\u60a8\u8fd0\u884c\u7684\u662f Windows Vista \u6216 Windows 7, \u5219\u53ef\u4ee5\u4f7f\u7528 ''\u4ee5\u7ba1\u7406\u5458\u8eab\u4efd\u8fd0\u884c'' \u83dc\u5355\u9879\u91cd\u65b0\u542f\u52a8 IDE\u3002
85.9
85.10 # View server log action
85.11 CTL_ViewServerLogAction=\u67e5\u770b\u57df\u670d\u52a1\u5668\u65e5\u5fd7(&L)
86.1 --- a/src/zh_CN/ide/mercurial/mercurial/org/netbeans/modules/mercurial/Bundle_zh_CN.properties Tue Jun 26 07:22:38 2012 +0900
86.2 +++ b/src/zh_CN/ide/mercurial/mercurial/org/netbeans/modules/mercurial/Bundle_zh_CN.properties Tue Jun 26 07:28:03 2012 +0900
86.3 @@ -165,3 +165,6 @@
86.4 # {1} - revision id
86.5 LBL_LookingUpAtRevision=\u67e5\u627e\u4fee\u8ba2{1}\u4e2d\u79fb\u52a8\u7684\u6587\u4ef6{0}
86.6
86.7 +MSG_MoveFailed = Hg \u65e0\u6cd5\u5c06{0}\u79fb\u5230{1}
86.8 +MSG_DeleteFailed = Hg \u65e0\u6cd5\u5220\u9664{0}
86.9 +
87.1 --- a/src/zh_CN/ide/mercurial/mercurial/org/netbeans/modules/mercurial/ui/log/Bundle_zh_CN.properties Tue Jun 26 07:22:38 2012 +0900
87.2 +++ b/src/zh_CN/ide/mercurial/mercurial/org/netbeans/modules/mercurial/ui/log/Bundle_zh_CN.properties Tue Jun 26 07:28:03 2012 +0900
87.3 @@ -164,7 +164,7 @@
87.4
87.5 MSG_DiffPanel_NoRevisions = <\u6bd4\u8f83 - \u672a\u9009\u5b9a\u4fee\u8ba2\u7248>
87.6 MSG_DiffPanel_TooManyRevisions = <\u6bd4\u8f83 - \u9009\u62e9\u7684\u4fee\u8ba2\u7248\u592a\u591a>
87.7 -MSG_DiffPanel_IllegalSelection = <\u6bd4\u8f83 - \u975e\u6cd5\u9009\u62e9>
87.8 +MSG_DiffPanel_IllegalSelection = <\u6bd4\u8f83 - \u9009\u62e9\u65e0\u6548>
87.9 MSG_DiffPanel_LoadingDiff = <\u6bd4\u8f83 - \u8bf7\u7a0d\u5019, \u6b63\u5728\u68c0\u7d22\u6587\u4ef6...>
87.10
87.11 # Do not replace "YYYY-MM-DD", used as a hint for an input field
88.1 --- a/src/zh_CN/ide/options-editor/options-editor/org/netbeans/modules/options/editor/Bundle_zh_CN.properties Tue Jun 26 07:22:38 2012 +0900
88.2 +++ b/src/zh_CN/ide/options-editor/options-editor/org/netbeans/modules/options/editor/Bundle_zh_CN.properties Tue Jun 26 07:28:03 2012 +0900
88.3 @@ -59,7 +59,7 @@
88.4 #Formatting Subcategory
88.5 CTL_Formating_DisplayName=\u683c\u5f0f\u8bbe\u7f6e
88.6 CTL_Formating_ToolTip=\u683c\u5f0f\u8bbe\u7f6e\u9009\u9879
88.7 -KW_Formatting=\u7f16\u8f91\u5668\u5bf9\u9f50,\u7f16\u8f91\u5668\u683c\u5f0f\u8bbe\u7f6e,\u7f16\u8f91\u5668\u5236\u8868\u7b26,\u7f16\u8f91\u5668\u7f29\u6392,\u7f16\u8f91\u5668\u82b1\u62ec\u53f7,\u7f16\u8f91\u5668\u7a7a\u884c,\u7f16\u8f91\u5668\u7a7a\u683c,\u7f16\u8f91\u5668\u81ea\u52a8\u6362\u884c,\u7f16\u8f91\u5668\u8fb9\u8ddd
88.8 +KW_Formatting=\u7f16\u8f91\u5668\u5bf9\u9f50,\u7f16\u8f91\u5668\u683c\u5f0f\u8bbe\u7f6e,\u7f16\u8f91\u5668\u5236\u8868\u7b26,\u7f16\u8f91\u5668\u7f29\u8fdb,\u7f16\u8f91\u5668\u82b1\u62ec\u53f7,\u7f16\u8f91\u5668\u7a7a\u884c,\u7f16\u8f91\u5668\u7a7a\u683c,\u7f16\u8f91\u5668\u81ea\u52a8\u6362\u884c,\u7f16\u8f91\u5668\u8fb9\u8ddd
88.9
88.10 #Hints Subcategory
88.11 CTL_Hints_DisplayName=\u63d0\u793a
88.12 @@ -67,9 +67,9 @@
88.13 KW_Hints=\u63d0\u793a,\u4fee\u590d,\u5efa\u8bae,\u8b66\u544a
88.14
88.15 #Mark Occurences Subcategory
88.16 -CTL_MarkOccurences_DisplayName=\u6807\u8bb0\u5b9e\u4f8b
88.17 -CTL_MarkOccurences_ToolTip=\u6807\u8bb0\u4f4d\u4e8e\u8131\u5b57\u53f7\u4e0b\u7684\u5143\u7d20\u5b9e\u4f8b
88.18 -KW_Mark=\u6807\u8bb0\u5b9e\u4f8b
88.19 +CTL_MarkOccurences_DisplayName=\u7a81\u51fa\u663e\u793a
88.20 +CTL_MarkOccurences_ToolTip=\u7a81\u51fa\u663e\u793a
88.21 +KW_Mark=\u6807\u8bb0\u5b9e\u4f8b, \u7a81\u51fa\u663e\u793a
88.22
88.23 #Tasklist Subcategory
88.24 CTL_Tasklist_DisplayName=\u4efb\u52a1\u5217\u8868
88.25 @@ -98,6 +98,7 @@
88.26
88.27 # Options Export
88.28 Editor.Options.Export.Category.displayName=\u7f16\u8f91\u5668
88.29 +Editor.Options.Export.General.displayName=\u5e38\u89c4
88.30 Editor.Options.Export.Macros.displayName=\u5b8f
88.31 Editor.Options.Export.CodeTemplates.displayName=\u4ee3\u7801\u6a21\u677f
88.32 Editor.Options.Export.Other.displayName=\u5176\u4ed6
89.1 --- a/src/zh_CN/ide/options-editor/options-editor/org/netbeans/modules/options/indentation/Bundle_zh_CN.properties Tue Jun 26 07:22:38 2012 +0900
89.2 +++ b/src/zh_CN/ide/options-editor/options-editor/org/netbeans/modules/options/indentation/Bundle_zh_CN.properties Tue Jun 26 07:28:03 2012 +0900
89.3 @@ -42,7 +42,7 @@
89.4
89.5
89.6 #Tools-Options -> Editor -> Formatting customizer
89.7 -indentation-customizer-display-name=\u5236\u8868\u7b26\u548c\u7f29\u6392
89.8 +indentation-customizer-display-name=\u5236\u8868\u7b26\u548c\u7f29\u8fdb
89.9 #Indentation_Tab=Tabs And Indents
89.10 #CTL_Indentation=Tabs And Indents
89.11 #CTL_Indentation_Title=Tabs And Indents
89.12 @@ -55,9 +55,9 @@
89.13 CTL_Expand_Tabs=\u5c06\u5236\u8868\u7b26\u6269\u5c55\u4e3a\u7a7a\u683c(&E)
89.14 AN_Expand_Tabs=\u5c06\u5236\u8868\u7b26\u6269\u5c55\u4e3a\u7a7a\u683c
89.15 AD_Expand_Tabs=\u5c06\u5236\u8868\u7b26\u6269\u5c55\u4e3a\u7a7a\u683c
89.16 -CTL_Indent=\u6bcf\u6b21\u7f29\u6392\u7684\u7a7a\u683c\u6570(&N):
89.17 -AN_Indent=\u6bcf\u6b21\u7f29\u6392\u7684\u7a7a\u683c\u6570
89.18 -AD_Indent=\u6bcf\u6b21\u7f29\u6392\u7684\u7a7a\u683c\u6570
89.19 +CTL_Indent=\u6bcf\u6b21\u7f29\u8fdb\u7684\u7a7a\u683c\u6570(&N):
89.20 +AN_Indent=\u6bcf\u6b21\u7f29\u8fdb\u7684\u7a7a\u683c\u6570
89.21 +AD_Indent=\u6bcf\u6b21\u7f29\u8fdb\u7684\u7a7a\u683c\u6570
89.22 CTL_TabSize=\u5236\u8868\u7b26\u5927\u5c0f(&B):
89.23 AD_TabSize=\u5236\u8868\u7b26\u5927\u5c0f
89.24 AN_TabSize=\u5236\u8868\u7b26\u5927\u5c0f
89.25 @@ -90,8 +90,8 @@
89.26 AD_Category=\u7c7b\u522b
89.27
89.28 #IdentationPanel
89.29 -AN_sNumberOfSpacesPerIndent=\u6bcf\u6b21\u7f29\u6392\u7684\u7a7a\u683c\u6570
89.30 -AD_sNumberOfSpacesPerIndent=\u6bcf\u6b21\u7f29\u6392\u7684\u7a7a\u683c\u6570
89.31 +AN_sNumberOfSpacesPerIndent=\u6bcf\u6b21\u7f29\u8fdb\u7684\u7a7a\u683c\u6570
89.32 +AD_sNumberOfSpacesPerIndent=\u6bcf\u6b21\u7f29\u8fdb\u7684\u7a7a\u683c\u6570
89.33 AN_sTabSize=\u5236\u8868\u7b26\u5927\u5c0f
89.34 AD_sTabSize=\u5236\u8868\u7b26\u5927\u5c0f
89.35 AN_sRightMargin=\u53f3\u8fb9\u8ddd
90.1 --- a/src/zh_CN/ide/org-netbeans-core-ide/org-netbeans-core-ide/org/netbeans/core/ide/resources/Bundle_zh_CN.properties Tue Jun 26 07:22:38 2012 +0900
90.2 +++ b/src/zh_CN/ide/org-netbeans-core-ide/org-netbeans-core-ide/org/netbeans/core/ide/resources/Bundle_zh_CN.properties Tue Jun 26 07:28:03 2012 +0900
90.3 @@ -48,5 +48,5 @@
90.4 UI/Runtime=\u670d\u52a1
90.5 Toolbars/Standard.xml=\u7f16\u7801
90.6 Toolbars/Debugging.xml=\u8c03\u8bd5
90.7 -Templates/Services/IndentEngine=\u7f29\u6392\u5f15\u64ce
90.8 +Templates/Services/IndentEngine=\u7f29\u8fdb\u5f15\u64ce
90.9
91.1 --- a/src/zh_CN/ide/org-netbeans-lib-terminalemulator/org-netbeans-lib-terminalemulator/org/netbeans/lib/terminalemulator/support/Bundle_zh_CN.properties Tue Jun 26 07:22:38 2012 +0900
91.2 +++ b/src/zh_CN/ide/org-netbeans-lib-terminalemulator/org-netbeans-lib-terminalemulator/org/netbeans/lib/terminalemulator/support/Bundle_zh_CN.properties Tue Jun 26 07:28:03 2012 +0900
91.3 @@ -17,7 +17,7 @@
91.4 # MNM_Font=F
91.5 LBL_FontStyle=\u5b57\u4f53\u6837\u5f0f:
91.6 # MNM_FontStyle=Y
91.7 -LBL_Size=\u5927\u5c0f:
91.8 +LBL_Size=\u5b57\u4f53\u5927\u5c0f:
91.9 # MNM_Size=S
91.10
91.11 CTL_Plain=\u666e\u901a
91.12 @@ -40,11 +40,16 @@
91.13 # {1}: name of font family we will fall back to
91.14 FMT_FontUnavailable={0}\u4e0d\u53ef\u7528\u3002\u4f7f\u7528{1}
91.15
91.16 -#MSG_Sample=The quick brown fox ...,
91.17 +# This phrase should be translated if applicable to the language.
91.18 +# This is pangram (http://en.wikipedia.org/wiki/Pangram) used to
91.19 +# demonstrate how the selected font looks like.
91.20 +#MSG_Sample=The quick brown fox jumps over the lazy dog
91.21
91.22 #
91.23 # TermOptonsPanel
91.24 #
91.25 +# This phrase is used to demonstrate how the font looks like.
91.26 +# It could be either tranlated or not, depending on language.
91.27 #MSG_Hello=Hello from Term
91.28 LBL_Title=\u9009\u62e9\u5b57\u4f53
91.29 LBL_ForegroundColor=\u524d\u666f\u8272:
91.30 @@ -57,7 +62,6 @@
91.31 CTL_Restore=\u6062\u590d
91.32 # MNM_Restore=R
91.33 # CTL_Ellipsis=...
91.34 -LBL_Size=\u5b57\u4f53\u5927\u5c0f:
91.35 LBL_FontSize=\u5b57\u4f53\u5927\u5c0f:
91.36 # MNM_FontSize=S
91.37 LBL_BackgroundColor=\u80cc\u666f\u8272:
92.1 --- a/src/zh_CN/ide/org-netbeans-libs-jaxb/org-netbeans-libs-jaxb/org/netbeans/libs/jaxb/Bundle_zh_CN.properties Tue Jun 26 07:22:38 2012 +0900
92.2 +++ b/src/zh_CN/ide/org-netbeans-libs-jaxb/org-netbeans-libs-jaxb/org/netbeans/libs/jaxb/Bundle_zh_CN.properties Tue Jun 26 07:28:03 2012 +0900
92.3 @@ -42,6 +42,6 @@
92.4 # Sample ResourceBundle properties file
92.5
92.6 OpenIDE-Module-Name=JAXB 2.2 \u5e93
92.7 -#jaxb=JAXB 2.2
92.8 +#jaxb=JAXB 2.2.5
92.9
92.10
93.1 --- a/src/zh_CN/ide/parsing-api/parsing-api/org/netbeans/modules/parsing/impl/indexing/Bundle_zh_CN.properties Tue Jun 26 07:22:38 2012 +0900
93.2 +++ b/src/zh_CN/ide/parsing-api/parsing-api/org/netbeans/modules/parsing/impl/indexing/Bundle_zh_CN.properties Tue Jun 26 07:28:03 2012 +0900
93.3 @@ -43,7 +43,8 @@
93.4 #
93.5
93.6 # RepositoryUpdater
93.7 -MSG_BackgroundCompileStart=\u6b63\u5728\u626b\u63cf\u9879\u76ee...
93.8 +MSG_BackgroundCompileStart=\u6b63\u5728\u540e\u53f0\u626b\u63cf\u9879\u76ee...
93.9 +MSG_OpeningProjects=\u6b63\u5728\u7b49\u5f85\u9879\u76ee\u6253\u5f00
93.10 MSG_ProjectDependencies=\u6b63\u5728\u6536\u96c6\u9879\u76ee\u4f9d\u8d56\u5173\u7cfb
93.11 MSG_RefreshingIndices=\u6b63\u5728\u5237\u65b0\u7d22\u5f15
93.12 ScanForExternalChanges_name=\u626b\u63cf\u5916\u90e8\u66f4\u6539
94.1 --- a/src/zh_CN/ide/project-ant/project-ant/org/netbeans/modules/project/ant/Bundle_zh_CN.properties Tue Jun 26 07:22:38 2012 +0900
94.2 +++ b/src/zh_CN/ide/project-ant/project-ant/org/netbeans/modules/project/ant/Bundle_zh_CN.properties Tue Jun 26 07:28:03 2012 +0900
94.3 @@ -40,6 +40,15 @@
94.4 # Version 2 license, then the option applies only if the new code is
94.5 # made subject to such option by the copyright holder.
94.6
94.7 +FileChooserAccessory.noSuitableVariable=<\u65e0\u5408\u9002\u7684\u53d8\u91cf>
94.8 +# {0} - sharable library location
94.9 +FileChooserAccessory.warning1=\u53ea\u80fd\u5c06\u6587\u4ef6\u590d\u5236\u5230\u53ef\u5171\u4eab\u7684\u5e93\u4f4d\u7f6e ({0}) \u6216\u5176\u5b50\u6587\u4ef6\u5939\u4e2d\u3002
94.10 +# {0} - folder location to be created
94.11 +FileChooserAccessory.warning2=\u662f\u5426\u786e\u5b9e\u8981\u521b\u5efa\u6587\u4ef6\u5939 {0}?
94.12 +FileChooserAccessory.warning3=\u76ee\u6807\u76ee\u5f55\u4e2d\u5df2\u5b58\u5728\u67d0\u4e9b\u6587\u4ef6\u3002\u662f\u5426\u786e\u5b9e\u8981\u8986\u76d6\u8fd9\u4e9b\u6587\u4ef6?
94.13 +FileChooserAccessory.warning4=\u67d0\u4e9b\u9009\u5b9a\u7684\u6587\u4ef6\u662f\u6587\u4ef6\u5939\u3002\u662f\u5426\u786e\u5b9e\u8981\u4ee5\u9012\u5f52\u65b9\u5f0f\u590d\u5236\u8be5\u6587\u4ef6\u5939\u53ca\u5176\u6240\u6709\u5b50\u6587\u4ef6\u5939?
94.14 +# {0} - file location
94.15 +FileChooserAccessory_no_such_file=\u65e0\u6cd5\u5c06\u4e0d\u5b58\u5728\u7684\u8def\u5f84{0}\u590d\u5236\u5230\u5e93\u6587\u4ef6\u5939\u3002
94.16 OpenIDE-Module-Name=\u57fa\u4e8e Ant \u7684\u9879\u76ee\u652f\u6301
94.17 OpenIDE-Module-Display-Category=\u57fa\u7840\u7ed3\u6784
94.18 OpenIDE-Module-Short-Description=\u652f\u6301\u6240\u6709\u57fa\u4e8e Ant \u6784\u5efa\u5de5\u5177\u7684\u9879\u76ee\u7c7b\u578b\u3002
94.19 @@ -59,16 +68,9 @@
94.20 FileChooserAccessory.rbRelative.text=\u76f8\u5bf9\u8def\u5f84(&R):
94.21 FileChooserAccessory.rbCopy.text=\u590d\u5236\u5230\u5e93\u6587\u4ef6\u5939(&C):
94.22 FileChooserAccessory.rbAbsolute.text=\u7edd\u5bf9\u8def\u5f84(&A):
94.23 -FileChooserAccessory.warning1=\u53ea\u80fd\u5c06\u6587\u4ef6\u590d\u5236\u5230\u53ef\u5171\u4eab\u7684\u5e93\u4f4d\u7f6e ({0}) \u6216\u5176\u5b50\u6587\u4ef6\u5939\u4e2d\u3002
94.24 -FileChooserAccessory.warning2=\u662f\u5426\u786e\u5b9e\u8981\u521b\u5efa\u6587\u4ef6\u5939 {0}?
94.25 -FileChooserAccessory.warning3=\u76ee\u6807\u76ee\u5f55\u4e2d\u5df2\u5b58\u5728\u67d0\u4e9b\u6587\u4ef6\u3002\u662f\u5426\u786e\u5b9e\u8981\u8986\u76d6\u8fd9\u4e9b\u6587\u4ef6?
94.26 -FileChooserAccessory.warning4=\u67d0\u4e9b\u9009\u5b9a\u7684\u6587\u4ef6\u662f\u6587\u4ef6\u5939\u3002\u662f\u5426\u786e\u5b9e\u8981\u4ee5\u9012\u5f52\u65b9\u5f0f\u590d\u5236\u8be5\u6587\u4ef6\u5939\u53ca\u5176\u6240\u6709\u5b50\u6587\u4ef6\u5939?
94.27 -RelativizeFilePathCustomizer.title=\u4e3a\u9879\u76ee\u6dfb\u52a0\u5de5\u4ef6
94.28 -RelativizeFilePathCustomizer.jLabel1.text=\u5982\u4f55\u5f15\u7528\u6587\u4ef6{0}?
94.29 # ACSD_FileChooserAccessory_NA=N/A
94.30 FileChooserAccessory.rbVariable.text=\u57fa\u4e8e\u53d8\u91cf\u7684\u8def\u5f84(&V):
94.31 # FileChooserAccessory.variablesButton.text=...
94.32 -FileChooserAccessory.noSuitableVariable=<\u65e0\u5408\u9002\u7684\u53d8\u91cf>
94.33
94.34 VariablesPanel.editButton.text=\u7f16\u8f91(&E)
94.35 VariablesPanel.removeButton.text=\u5220\u9664(&R)
95.1 --- a/src/zh_CN/ide/project-libraries/project-libraries/org/netbeans/api/project/libraries/Bundle_zh_CN.properties Tue Jun 26 07:22:38 2012 +0900
95.2 +++ b/src/zh_CN/ide/project-libraries/project-libraries/org/netbeans/api/project/libraries/Bundle_zh_CN.properties Tue Jun 26 07:28:03 2012 +0900
95.3 @@ -40,8 +40,9 @@
95.4 # Version 2 license, then the option applies only if the new code is
95.5 # made subject to such option by the copyright holder.
95.6
95.7 -TXT_LibrariesManager=\u5e93\u7ba1\u7406\u5668
95.8
95.9 +LibrariesCustomizer.createLibrary.title=\u521b\u5efa\u65b0\u5e93
95.10 +LibrariesCustomizer.customizeLibrary.title=\u5b9a\u5236\u5e93
95.11 LibraryChooserGUI.add.title=\u6dfb\u52a0\u5e93
95.12 LibraryChooserGUI.add.button=\u6dfb\u52a0\u5e93
95.13 LibraryChooserGUI.add.button.a11y.desc=\u6dfb\u52a0\u5e93
95.14 @@ -54,8 +55,6 @@
95.15 LibraryChooserGUI.createButton.text=\u521b\u5efa(&C)...
95.16 LibraryChooserGUI.importButton.text=\u5bfc\u5165(&I)...
95.17 LibraryChooserGUI.manageLibrariesButton.text=\u7ba1\u7406\u5e93(&M)...
95.18 -LibrariesCustomizer.createLibrary.title=\u521b\u5efa\u65b0\u5e93
95.19 -LibrariesCustomizer.customizeLibrary.title=\u5b9a\u5236\u5e93
95.20 LibraryChooserGUI.create.a11y.name=\u521b\u5efa...
95.21 LibraryChooserGUI.create.a11y.desc=\u521b\u5efa\u5e93
95.22 LibraryChooserGUI.import.a11y.name=\u5bfc\u5165...
95.23 @@ -64,4 +63,5 @@
95.24 ACSD_ManageLibraries=\u7ba1\u7406\u5e93
95.25 ACSD_AvailableLibraries=\u53ef\u7528\u7684\u5e93\u6807\u7b7e
95.26 ACSD_AvailableLibrariesTree=\u53ef\u7528\u5e93
95.27 +TXT_LibrariesManager=Ant \u5e93\u7ba1\u7406\u5668
95.28
96.1 --- a/src/zh_CN/ide/project-libraries/project-libraries/org/netbeans/modules/project/libraries/ui/Bundle_zh_CN.properties Tue Jun 26 07:22:38 2012 +0900
96.2 +++ b/src/zh_CN/ide/project-libraries/project-libraries/org/netbeans/modules/project/libraries/ui/Bundle_zh_CN.properties Tue Jun 26 07:28:03 2012 +0900
96.3 @@ -40,19 +40,22 @@
96.4 # Version 2 license, then the option applies only if the new code is
96.5 # made subject to such option by the copyright holder.
96.6
96.7 +# AD_Libraries=N/A
96.8 +CTL_CreateLibrary=\u65b0\u5efa\u5e93
96.9 +CTL_LibrariesManager=Ant \u5e93(&L)
96.10 CTL_NewLibrary=\u65b0\u5efa\u5e93(&N)...
96.11 CTL_DeleteLibrary=\u5220\u9664(&R)
96.12 CTL_LibraryName=\u5e93\u540d\u79f0(&N)\:
96.13 CTL_LibraryType=\u5e93\u7c7b\u578b(&T)\:
96.14 CTL_CustomizerLibraryName=\u5e93\u540d\u79f0(&B)\:
96.15 -CTL_CreateLibrary=\u65b0\u5efa\u5e93
96.16
96.17 +# {0} - library name
96.18 +ERR_ExistingName=\u5e93{0}\u5df2\u5b58\u5728\u3002
96.19 +ERR_InvalidName=\u5e93\u540d\u79f0\u65e0\u6548\u3002
96.20 +LABEL_Global_Libraries=\u5168\u5c40\u5e93
96.21 +TXT_LibrariesManager=Ant \u5e93\u7ba1\u7406\u5668
96.22 #TXT_NewLibrary=MyLibrary
96.23
96.24 -ERR_ExistingName=\u5e93{0}\u5df2\u5b58\u5728\u3002
96.25 -ERR_InvalidName=\u5e93\u540d\u79f0\u65e0\u6548\u3002
96.26 -
96.27 -CTL_LibrariesManager=Ant \u5e93(&L)
96.28
96.29 # AD_LibraryName=N/A
96.30 # AD_LibraryType=N/A
96.31 @@ -64,14 +67,11 @@
96.32 AN_LibrariesCustomizerProperties=\u5c5e\u6027
96.33 # AD_NewLibraryPanel=N/A
96.34 # AD_LibraryLocation=N/A
96.35 -# AD_Libraries=N/A
96.36
96.37 TXT_LibrariesPanel=\u5e93(&L)\:
96.38 LBL_global=\u5168\u5c40\u5e93
96.39
96.40 areaLabel.text=\u5b58\u50a8\u4f4d\u7f6e(&L)\:
96.41 -LABEL_Global_Libraries=\u5168\u5c40\u5e93
96.42 -TXT_LibrariesManager=Ant \u5e93\u7ba1\u7406\u5668
96.43 AllLibrariesCustomizer.jLabel1.text=\u5e93\u4f4d\u7f6e:
96.44 CTL_CustomizerLibraryLocationName=\u5e93\u4f4d\u7f6e(&I):
96.45
97.1 --- a/src/zh_CN/ide/projectui/projectui/org/netbeans/modules/project/ui/Bundle_zh_CN.properties Tue Jun 26 07:22:38 2012 +0900
97.2 +++ b/src/zh_CN/ide/projectui/projectui/org/netbeans/modules/project/ui/Bundle_zh_CN.properties Tue Jun 26 07:28:03 2012 +0900
97.3 @@ -58,6 +58,7 @@
97.4 HINT_project={0}\u4e2d\u7684\u9879\u76ee
97.5 # sample folder name
97.6 LBL_folder_name=\u6587\u4ef6\u5939
97.7 +LBL_MultipleProjects=\u591a\u4e2a\u9879\u76ee
97.8 LBL_ProjectsLogicalTabAction_Name=\u9879\u76ee(&J)
97.9 LBL_ProjectsPhysicalTabAction_Name=\u6587\u4ef6(&F)
97.10 LBL_SimpleTargetChooserPanel_Name=\u540d\u79f0\u548c\u4f4d\u7f6e
97.11 @@ -222,8 +223,6 @@
97.12
97.13 MSG_NodeNotFound_ProjectsTab=\u5728\u201c\u9879\u76ee\u201d\u6807\u7b7e\u4e2d\u627e\u4e0d\u5230\u6587\u6863\u8282\u70b9\u3002
97.14 MSG_NodeNotFound_FilesTab=\u5728\u201c\u6587\u4ef6\u201d\u6807\u7b7e\u4e2d\u627e\u4e0d\u5230\u6587\u6863\u8282\u70b9\u3002
97.15 -#Hacks
97.16 -LBL_MultipleProjects=\u591a\u4e2a\u9879\u76ee
97.17
97.18
97.19 ACSN_jLabel1=\u9879\u76ee
98.1 --- a/src/zh_CN/ide/projectui/projectui/org/netbeans/modules/project/ui/actions/Bundle_zh_CN.properties Tue Jun 26 07:22:38 2012 +0900
98.2 +++ b/src/zh_CN/ide/projectui/projectui/org/netbeans/modules/project/ui/actions/Bundle_zh_CN.properties Tue Jun 26 07:28:03 2012 +0900
98.3 @@ -54,15 +54,13 @@
98.4 LBL_OpenProjectAction_Name=\u6253\u5f00\u9879\u76ee(&E)...
98.5 LBL_OpenProjectAction_Tooltip=\u6253\u5f00\u9879\u76ee...
98.6 LBL_NodeOpenProjectAction_Name=\u6253\u5f00\u9879\u76ee...
98.7 -LBL_OpenSubprojectsAction_Name=\u6253\u5f00\u5fc5\u9700\u9879\u76ee
98.8 LBL_CloseProjectAction_Name=\u5173\u95ed{0,choice,0#\u9879\u76ee|1#\u9879\u76ee ({1})|1< {0} \u4e2a\u9879\u76ee}(&C)
98.9 LBL_CloseProjectAction_Popup_Name=\u5173\u95ed{0,choice,0#|1#|1< {0} \u4e2a\u9879\u76ee}
98.10 LBL_CustomizeProjectAction_Name=\u9879\u76ee{0,choice,0#\u5c5e\u6027|1#\u5c5e\u6027 ({1})|1<\u9879\u76ee}(&T)
98.11 LBL_CustomizeProjectAction_Popup_Name=\u5c5e\u6027
98.12 +LBL_OpenSubprojectsAction_Name=\u6253\u5f00\u5fc5\u9700\u9879\u76ee
98.13 LBL_RecentProjectsAction_Name=\u6253\u5f00\u8fd1\u671f\u7684\u9879\u76ee
98.14 LBL_SaveProjectAction_Name=\u4fdd\u5b58\u9879\u76ee
98.15 -LBL_SelectInProjectsAction_MainMenuName=\u5728\u9879\u76ee\u4e2d\u9009\u62e9(&J)
98.16 -LBL_SelectInFilesAction_MainMenuName=\u5728\u6587\u4ef6\u4e2d\u9009\u62e9(&C)
98.17
98.18 # {0} number of project
98.19 # {1} the first project name
98.20 @@ -76,6 +74,8 @@
98.21 LBL_JavadocProjectAction_Name_popup=\u751f\u6210 Javadoc
98.22 LBL_RunProjectAction_Name=\u8fd0\u884c{0,choice,0#\u9879\u76ee|1# "{1}" \u9879\u76ee|1< {0} \u4e2a\u9879\u76ee}
98.23 LBL_RunProjectAction_Name_popup=\u8fd0\u884c
98.24 +LBL_SelectInFilesAction_MainMenuName=\u5728\u6587\u4ef6\u4e2d\u9009\u62e9(&C)
98.25 +LBL_SelectInProjectsAction_MainMenuName=\u5728\u9879\u76ee\u4e2d\u9009\u62e9(&J)
98.26 LBL_SetAsMainProjectAction_Name=\u8bbe\u7f6e\u4e3a\u4e3b\u9879\u76ee
98.27 LBL_SetMainProjectAction_Name=\u8bbe\u7f6e\u4e3a\u4e3b\u9879\u76ee
98.28 LBL_TestProjectAction_Name=\u6d4b\u8bd5{0,choice,0#\u9879\u76ee|1#\u9879\u76ee ({1})|1< {0} \u4e2a\u9879\u76ee}(&T)
99.1 --- a/src/zh_CN/ide/subversion/subversion/org/netbeans/modules/subversion/ui/history/Bundle_zh_CN.properties Tue Jun 26 07:22:38 2012 +0900
99.2 +++ b/src/zh_CN/ide/subversion/subversion/org/netbeans/modules/subversion/ui/history/Bundle_zh_CN.properties Tue Jun 26 07:28:03 2012 +0900
99.3 @@ -124,7 +124,7 @@
99.4
99.5 MSG_DiffPanel_NoRevisions = <\u6bd4\u8f83 - \u672a\u9009\u5b9a\u4fee\u8ba2\u7248>
99.6 MSG_DiffPanel_TooManyRevisions = <\u6bd4\u8f83 - \u9009\u62e9\u7684\u4fee\u8ba2\u7248\u592a\u591a>
99.7 -MSG_DiffPanel_IllegalSelection = <\u6bd4\u8f83 - \u975e\u6cd5\u9009\u62e9>
99.8 +MSG_DiffPanel_IllegalSelection = <\u6bd4\u8f83 - \u9009\u62e9\u65e0\u6548>
99.9 MSG_DiffPanel_LoadingDiff = <\u6bd4\u8f83 - \u8bf7\u7a0d\u5019, \u6b63\u5728\u68c0\u7d22\u6587\u4ef6...>
99.10
99.11 # Do not replace "YYYY-MM-DD", it is a hint for an input field, leave it as is, just translate the rest of the key
100.1 --- a/src/zh_CN/ide/target-iterator/target-iterator/org/netbeans/modules/target/iterator/api/Bundle_zh_CN.properties Tue Jun 26 07:22:38 2012 +0900
100.2 +++ b/src/zh_CN/ide/target-iterator/target-iterator/org/netbeans/modules/target/iterator/api/Bundle_zh_CN.properties Tue Jun 26 07:28:03 2012 +0900
100.3 @@ -60,7 +60,6 @@
100.4 A11Y_DESC_Location=\u9009\u62e9\u6587\u4ef6\u5939\u6839\u76ee\u5f55\u3002
100.5 # A11Y_Folder_mnem=O
100.6 LBL_Folder=\u6587\u4ef6\u5939:
100.7 -A11Y_DESC_Project=\u8fd9\u662f\u5c06\u5728\u5176\u4e2d\u521b\u5efa\u6587\u4ef6\u7684\u9879\u76ee\u540d\u79f0 (\u4e0d\u53ef\u7f16\u8f91)\u3002
100.8 A11Y_DESC_Folder=\u5728\u6b64\u5904\u8f93\u5165\u6587\u4ef6\u5939\u8def\u5f84 (\u7528\u659c\u6746\u5b57\u7b26\u5206\u9694\u6587\u4ef6\u5939\u540d\u79f0)\u3002
100.9 # LBL_Browse_Mnemonic=R
100.10 LBL_Browse=\u6d4f\u89c8...
101.1 --- a/src/zh_CN/ide/web-indent/web-indent/org/netbeans/modules/web/indent/Bundle_zh_CN.properties Tue Jun 26 07:22:38 2012 +0900
101.2 +++ b/src/zh_CN/ide/web-indent/web-indent/org/netbeans/modules/web/indent/Bundle_zh_CN.properties Tue Jun 26 07:28:03 2012 +0900
101.3 @@ -1,4 +1,4 @@
101.4 OpenIDE-Module-Display-Category=\u7f16\u8f91
101.5 -OpenIDE-Module-Name=\u7f16\u8f91\u5668\u7f29\u6392\u6269\u5c55
101.6 -OpenIDE-Module-Short-Description=\u57fa\u672c\u7f16\u8f91\u5668\u7f29\u6392\u652f\u6301\u7684\u6269\u5c55
101.7 +OpenIDE-Module-Name=\u7f16\u8f91\u5668\u7f29\u8fdb\u6269\u5c55
101.8 +OpenIDE-Module-Short-Description=\u57fa\u672c\u7f16\u8f91\u5668\u7f29\u8fdb\u652f\u6301\u7684\u6269\u5c55
101.9
102.1 --- a/src/zh_CN/ide/xml-text/xml-text/org/netbeans/modules/xml/text/indent/Bundle_zh_CN.properties Tue Jun 26 07:22:38 2012 +0900
102.2 +++ b/src/zh_CN/ide/xml-text/xml-text/org/netbeans/modules/xml/text/indent/Bundle_zh_CN.properties Tue Jun 26 07:28:03 2012 +0900
102.3 @@ -42,11 +42,11 @@
102.4
102.5
102.6 ## XMLIndentEngineBeanInfo.java
102.7 -LAB_XMLIndentEngine=XML \u7f29\u6392\u5f15\u64ce
102.8 -HINT_XMLIndentEngine=XML \u7f29\u6392\u5f15\u64ce
102.9 +LAB_XMLIndentEngine=XML \u7f29\u8fdb\u5f15\u64ce
102.10 +HINT_XMLIndentEngine=XML \u7f29\u8fdb\u5f15\u64ce
102.11
102.12 -LAB_DTDIndentEngine=DTD \u7f29\u6392\u5f15\u64ce
102.13 -HINT_DTDIndentEngine=DTD \u7f29\u6392\u5f15\u64ce
102.14 +LAB_DTDIndentEngine=DTD \u7f29\u8fdb\u5f15\u64ce
102.15 +HINT_DTDIndentEngine=DTD \u7f29\u8fdb\u5f15\u64ce
102.16
102.17 MSG_code_reformat=\u91cd\u65b0\u8bbe\u7f6e\u4ee3\u7801\u683c\u5f0f
102.18
103.1 --- a/src/zh_CN/ide/xml-text/xml-text/org/netbeans/modules/xml/text/resources/Bundle_zh_CN.properties Tue Jun 26 07:22:38 2012 +0900
103.2 +++ b/src/zh_CN/ide/xml-text/xml-text/org/netbeans/modules/xml/text/resources/Bundle_zh_CN.properties Tue Jun 26 07:28:03 2012 +0900
103.3 @@ -44,7 +44,7 @@
103.4 OpenIDE-Module-Name=XML \u6587\u672c\u7f16\u8f91\u5668
103.5 OpenIDE-Module-Display-Category=XML
103.6 OpenIDE-Module-Short-Description=\u6b64\u6a21\u5757\u63d0\u4f9b\u6587\u672c\u7f16\u8f91\u529f\u80fd\u3002
103.7 -OpenIDE-Module-Long-Description=\u6b64\u6a21\u5757\u63d0\u4f9b\u6587\u672c\u7f16\u8f91\u529f\u80fd\u3002\u5b83\u5c06\u8bed\u6cd5\u7a81\u51fa\u663e\u793a, \u7b80\u5355\u4ee3\u7801\u5b8c\u6210, \u7f29\u5199\u652f\u6301\u4ee5\u53ca\u7b80\u5355\u7f29\u6392\u5f15\u64ce\u6dfb\u52a0\u5230 XML \u548c DTD \u6587\u6863\u7684\u6587\u672c\u7f16\u8f91\u4e2d\u3002
103.8 +OpenIDE-Module-Long-Description=\u6b64\u6a21\u5757\u63d0\u4f9b\u6587\u672c\u7f16\u8f91\u529f\u80fd\u3002\u5b83\u5c06\u8bed\u6cd5\u7a81\u51fa\u663e\u793a, \u7b80\u5355\u4ee3\u7801\u5b8c\u6210, \u7f29\u5199\u652f\u6301\u4ee5\u53ca\u7b80\u5355\u7f29\u8fdb\u5f15\u64ce\u6dfb\u52a0\u5230 XML \u548c DTD \u6587\u6863\u7684\u6587\u672c\u7f16\u8f91\u4e2d\u3002
103.9
103.10 Editors/text/xml=XML
103.11 text/xml=XML
104.1 --- a/src/zh_CN/java/dbschema/dbschema/org/netbeans/modules/dbschema/resources/Bundle_zh_CN.properties Tue Jun 26 07:22:38 2012 +0900
104.2 +++ b/src/zh_CN/java/dbschema/dbschema/org/netbeans/modules/dbschema/resources/Bundle_zh_CN.properties Tue Jun 26 07:28:03 2012 +0900
104.3 @@ -51,66 +51,6 @@
104.4 NulIndexes=\u65e0\u6cd5\u5c06\u7d22\u5f15\u5217\u8bbe\u7f6e\u4e3a\u7a7a\u503c\u3002
104.5 PreviousVersion={0}\u6570\u636e\u5e93\u65b9\u6848\u662f\u7531\u6570\u636e\u5e93\u65b9\u6848\u6a21\u5757\u7684\u65e9\u671f\u7248\u672c\u6355\u83b7\u7684, \u5b83\u4e0e\u5f53\u524d\u7248\u672c\u4e0d\u517c\u5bb9\u3002
104.6
104.7 -# Sql types
104.8 -#NOI18N
104.9 -#SQL_BIGINT=BIGINT
104.10 -#NOI18N
104.11 -#SQL_BINARY=BINARY
104.12 -#NOI18N
104.13 -#SQL_BIT=BIT
104.14 -#NOI18N
104.15 -#SQL_CHAR=CHAR
104.16 -#NOI18N
104.17 -#SQL_DATE=DATE
104.18 -#NOI18N
104.19 -#SQL_DECIMAL=DECIMAL
104.20 -#NOI18N
104.21 -#SQL_DOUBLE=DOUBLE
104.22 -#NOI18N
104.23 -#SQL_FLOAT=FLOAT
104.24 -#NOI18N
104.25 -#SQL_INTEGER=INTEGER
104.26 -#NOI18N
104.27 -#SQL_LONGVARBINARY=LONGVARBINARY
104.28 -#NOI18N
104.29 -#SQL_LONGVARCHAR=LONGVARCHAR
104.30 -#NOI18N
104.31 -#SQL_NULL=NULL
104.32 -#NOI18N
104.33 -#SQL_NUMERIC=NUMERIC
104.34 -#NOI18N
104.35 -#SQL_OTHER=OTHER
104.36 -#NOI18N
104.37 -#SQL_REAL=REAL
104.38 -#NOI18N
104.39 -#SQL_SMALLINT=SMALLINT
104.40 -#NOI18N
104.41 -#SQL_TIME=TIME
104.42 -#NOI18N
104.43 -#SQL_TIMESTAMP=TIMESTAMP
104.44 -#NOI18N
104.45 -#SQL_TINYINT=TINYINT
104.46 -#NOI18N
104.47 -#SQL_VARBINARY=VARBINARY
104.48 -#NOI18N
104.49 -#SQL_VARCHAR=VARCHAR
104.50 -#NOI18N
104.51 -#SQL_JAVA_OBJECT=JAVA_OBJECT
104.52 -#NOI18N
104.53 -#SQL_DISTINCT=DISTINCT
104.54 -#NOI18N
104.55 -#SQL_STRUCT=STRUCT
104.56 -#NOI18N
104.57 -#SQL_ARRAY=ARRAY
104.58 -#NOI18N
104.59 -#SQL_BLOB=BLOB
104.60 -#NOI18N
104.61 -#SQL_CLOB=CLOB
104.62 -#NOI18N
104.63 -#SQL_REF=REF
104.64 -#NOI18N
104.65 -#SQL_UNKNOWN=UNKNOWN
104.66 -
104.67 # Manifest
104.68 OpenIDE-Module-Name=\u6570\u636e\u5e93\u65b9\u6848 (JDBC \u5b9e\u73b0)
104.69 OpenIDE-Module-Display-Category=\u6570\u636e\u5e93
105.1 --- a/src/zh_CN/java/findbugs-installer/findbugs-installer/org/netbeans/modules/findbugs/installer/Bundle_zh_CN.properties Tue Jun 26 07:22:38 2012 +0900
105.2 +++ b/src/zh_CN/java/findbugs-installer/findbugs-installer/org/netbeans/modules/findbugs/installer/Bundle_zh_CN.properties Tue Jun 26 07:28:03 2012 +0900
105.3 @@ -1,4 +1,6 @@
105.4 active_handle=\u6b63\u5728\u6fc0\u6d3b{0}
105.5 +#DN_FindBugs=FindBugs
105.6 +DN_FindBugsIntegration=FindBugs \u96c6\u6210
105.7 FindBugs_Library=FindBugs \u5e93
105.8 networkproblem_header=\u65e0\u6cd5\u8fde\u63a5\u5230 NetBeans \u63d2\u4ef6\u95e8\u6237
105.9 networkproblem_message=\u68c0\u67e5\u4ee3\u7406\u8bbe\u7f6e\u6216\u7a0d\u540e\u91cd\u8bd5\u3002\u76ee\u524d\u8be5\u670d\u52a1\u5668\u53ef\u80fd\u4e0d\u53ef\u7528\u3002\u60a8\u8fd8\u53ef\u80fd\u5e0c\u671b\u786e\u4fdd\u9632\u706b\u5899\u4e0d\u4f1a\u963b\u585e\u7f51\u7edc\u901a\u4fe1\u3002
106.1 --- a/src/zh_CN/java/form/form/org/netbeans/modules/form/Bundle_zh_CN.properties Tue Jun 26 07:22:38 2012 +0900
106.2 +++ b/src/zh_CN/java/form/form/org/netbeans/modules/form/Bundle_zh_CN.properties Tue Jun 26 07:28:03 2012 +0900
106.3 @@ -120,8 +120,10 @@
106.4 # RADComponent PropertySets
106.5 CTL_PropertiesTab=\u5c5e\u6027
106.6 CTL_PropertiesTabHint=JavaBeans \u7ec4\u4ef6\u7684\u901a\u7528\u5c5e\u6027
106.7 +CTL_AlternatePropertiesTab=\u901a\u7528
106.8 CTL_Properties2Tab=\u5176\u4ed6\u5c5e\u6027
106.9 CTL_Properties2TabHint=JavaBeans \u7ec4\u4ef6\u7684\u5176\u4ed6\u5c5e\u6027
106.10 +CTL_AlternateProperties2Tab=\u9ad8\u7ea7
106.11 CTL_BindingTab=\u7ed1\u5b9a
106.12 CTL_BindingTab0=\u9996\u9009\u9879
106.13 CTL_BindingTabHint0=\u9996\u9009\u7ed1\u5b9a\u5c5e\u6027
106.14 @@ -467,7 +469,8 @@
106.15 CTL_AUTO_INJECTION=\u6240\u6709\u8d44\u6e90\u6ce8\u5165
106.16
106.17 PROP_FORM_BUNDLE=\u5c5e\u6027\u5305\u6587\u4ef6
106.18 -HINT_FORM_BUNDLE=\u5c5e\u6027\u5305\u7684\u8d44\u6e90\u540d\u79f0 (\u9ed8\u8ba4\u60c5\u51b5\u662f\u6ca1\u6709\u6269\u5c55\u540d\u7684\u6587\u4ef6)
106.19 +HINT_FORM_BUNDLE=\u5c5e\u6027\u5305\u7684\u8d44\u6e90\u540d\u79f0 (\u4f8b\u5982 my/pkg/Bundle)
106.20 +MSG_InvalidBundleFileName=\u5305\u6587\u4ef6\u540d\u65e0\u6548\u3002
106.21
106.22 PROP_DESIGN_LOCALE=\u8bbe\u8ba1\u8bed\u8a00\u73af\u5883
106.23 HINT_DESIGN_LOCALE=\u5728\u8bbe\u8ba1\u5668\u4e2d\u4f7f\u7528\u6216\u4fee\u6539\u7684\u7279\u5b9a\u8bed\u8a00\u73af\u5883
107.1 --- a/src/zh_CN/java/form/form/org/netbeans/modules/form/actions/Bundle_zh_CN.properties Tue Jun 26 07:22:38 2012 +0900
107.2 +++ b/src/zh_CN/java/form/form/org/netbeans/modules/form/actions/Bundle_zh_CN.properties Tue Jun 26 07:28:03 2012 +0900
107.3 @@ -46,7 +46,7 @@
107.4 ACT_CustomizeLayout=\u5b9a\u5236\u5e03\u5c40...
107.5 ACT_SelectLayout=\u8bbe\u7f6e\u5e03\u5c40
107.6 NAME_FreeDesign=\u81ea\u7531\u8bbe\u8ba1
107.7 -MSG_CannotSwitchToFreeDesign=\u65e0\u6cd5\u5728\u8bbe\u8ba1\u5668\u672a\u663e\u793a\u7684\u5bb9\u5668\u4e2d\u5c06\u5e03\u5c40\u66f4\u6539\u4e3a\u201c\u81ea\u7531\u8bbe\u8ba1\u201d\u3002\u5148\u5728\u6b64\u5bb9\u5668\u4e2d\u8c03\u7528\u201c\u8bbe\u8ba1\u6b64/\u7236\u7ea7\u201d\u64cd\u4f5c, \u7136\u540e\u518d\u5c1d\u8bd5\u66f4\u6539\u5e03\u5c40\u3002
107.8 +MSG_CannotSwitchToFreeDesign=\u65e0\u6cd5\u5728\u8bbe\u8ba1\u5668\u672a\u663e\u793a\u7684\u5bb9\u5668\u4e2d\u5c06\u5e03\u5c40\u66f4\u6539\u4e3a\u201c\u81ea\u7531\u8bbe\u8ba1\u201d\u3002\u5148\u5728\u6b64\u5bb9\u5668\u8282\u70b9\u4e0a\u8c03\u7528\u201c\u8bbe\u8ba1\u6b64\u5bb9\u5668\u201d\u64cd\u4f5c (\u53cc\u51fb\u8be5\u8282\u70b9\u5373\u53ef), \u7136\u540e\u518d\u5c1d\u8bd5\u66f4\u6539\u5e03\u5c40\u3002
107.9 ACT_TestMode=\u9884\u89c8\u8bbe\u8ba1
107.10 ACT_ReloadForm=\u91cd\u65b0\u52a0\u8f7d\u7a97\u4f53
107.11 ACT_InstallBean=Swing/AWT \u7ec4\u4ef6(&S)
108.1 --- a/src/zh_CN/java/form/form/org/netbeans/modules/form/assistant/Bundle_zh_CN.properties Tue Jun 26 07:22:38 2012 +0900
108.2 +++ b/src/zh_CN/java/form/form/org/netbeans/modules/form/assistant/Bundle_zh_CN.properties Tue Jun 26 07:28:03 2012 +0900
108.3 @@ -78,7 +78,7 @@
108.4 nextToRelatedVerticalTrailing=\u5df2\u79fb\u81f3\u8ddd\u4e0b\u65b9\u7ec4\u4ef6\u7684\u8f83\u5c0f\u9996\u9009\u4f4d\u7f6e\u3002
108.5 nextToUnrelatedVerticalTrailing=\u5df2\u79fb\u81f3\u8ddd\u4e0b\u65b9\u7ec4\u4ef6\u7684\u4e2d\u95f4\u9996\u9009\u4f4d\u7f6e\u3002
108.6 nextToSeparateVerticalTrailing=\u5df2\u79fb\u81f3\u8ddd\u4e0b\u65b9\u7ec4\u4ef6\u7684\u8f83\u5927\u9996\u9009\u4f4d\u7f6e\u3002
108.7 -indent=\u7f29\u6392\u7ec4\u4ef6\u3002
108.8 +indent=\u7f29\u8fdb\u7ec4\u4ef6\u3002
108.9 generalPosition=\u5c06\u7ec4\u4ef6\u79fb\u81f3\u5176\u4f4d\u7f6e\u3002
108.10 generalResizing=\u8c03\u6574\u7ec4\u4ef6\u5927\u5c0f\u3002
108.11 gapResizing=\u8c03\u6574\u95f4\u8ddd\u5927\u5c0f\u3002
109.1 --- a/src/zh_CN/java/form/form/org/netbeans/modules/form/editors2/Bundle_zh_CN.properties Tue Jun 26 07:22:38 2012 +0900
109.2 +++ b/src/zh_CN/java/form/form/org/netbeans/modules/form/editors2/Bundle_zh_CN.properties Tue Jun 26 07:28:03 2012 +0900
109.3 @@ -259,7 +259,7 @@
109.4
109.5 #TreeModelEditor
109.6 CTL_TreeModelEditor_DisplayName=\u6811\u6a21\u578b\u7f16\u8f91\u5668
109.7 -TreeModelCustomizer.label.text=<html>\u5728\u5de6\u4fa7\u6587\u672c\u533a\u57df\u4e2d\u8f93\u5165\u6811\u6a21\u578b\u7684\u6587\u672c\u8868\u793a(&E)\u3002\u6bcf\u4e2a\u975e\u7a7a\u884c\u5bf9\u5e94\u4e00\u4e2a\u6811\u8282\u70b9\u3002\u8282\u70b9\u5d4c\u5957\u57fa\u4e8e\u5404\u4e2a\u884c\u7684\u7f29\u6392\u65b9\u5f0f\u3002
109.8 +TreeModelCustomizer.label.text=<html>\u5728\u5de6\u4fa7\u6587\u672c\u533a\u57df\u4e2d\u8f93\u5165\u6811\u6a21\u578b\u7684\u6587\u672c\u8868\u793a(&E)\u3002\u6bcf\u4e2a\u975e\u7a7a\u884c\u5bf9\u5e94\u4e00\u4e2a\u6811\u8282\u70b9\u3002\u8282\u70b9\u5d4c\u5957\u57fa\u4e8e\u5404\u4e2a\u884c\u7684\u7f29\u8fdb\u65b9\u5f0f\u3002
109.9 TreeModelCustomizer.warningLabel.text=<html>\u8bf7\u6ce8\u610f, \u6bcf\u4e2a\u6811\u7ed3\u6784\u53ea\u80fd\u6709\u4e00\u4e2a\u6839\u8282\u70b9(&N)\u3002\u56e0\u6b64, \u5982\u679c\u6709\u4e24\u4e2a\u6216\u591a\u4e2a\u9876\u7ea7\u8282\u70b9, \u5219\u4f1a\u521b\u5efa\u4e00\u4e2a\u865a\u5047\u6839\u8282\u70b9\u3002\u53ef\u968f\u540e\u4f7f\u7528 rootVisible \u5c5e\u6027\u5c06\u5176\u9690\u85cf\u3002
109.10 ACSD_TreeModelEditor_TextArea=\u5728\u6b64\u533a\u57df\u4e2d, \u60a8\u53ef\u4ee5\u8f93\u5165\u6811\u7684\u6587\u672c\u8868\u793a\u3002
109.11 ACSD_TreeModelEditor_Tree=\u7f16\u8f91\u7684 TreeModel \u9884\u89c8\u3002
110.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
110.2 +++ b/src/zh_CN/java/form/form/org/netbeans/modules/form/layoutdesign/Bundle_zh_CN.properties Tue Jun 26 07:28:03 2012 +0900
110.3 @@ -0,0 +1,59 @@
110.4 +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
110.5 +#
110.6 +# Copyright 2012 Oracle and/or its affiliates. All rights reserved.
110.7 +#
110.8 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
110.9 +# Other names may be trademarks of their respective owners.
110.10 +#
110.11 +# The contents of this file are subject to the terms of either the GNU
110.12 +# General Public License Version 2 only ("GPL") or the Common
110.13 +# Development and Distribution License("CDDL") (collectively, the
110.14 +# "License"). You may not use this file except in compliance with the
110.15 +# License. You can obtain a copy of the License at
110.16 +# http://www.netbeans.org/cddl-gplv2.html
110.17 +# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
110.18 +# specific language governing permissions and limitations under the
110.19 +# License. When distributing the software, include this License Header
110.20 +# Notice in each file and include the License file at
110.21 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
110.22 +# particular file as subject to the "Classpath" exception as provided
110.23 +# by Oracle in the GPL Version 2 section of the License file that
110.24 +# accompanied this code. If applicable, add the following below the
110.25 +# License Header, with the fields enclosed by brackets [] replaced by
110.26 +# your own identifying information:
110.27 +# "Portions Copyrighted [year] [name of copyright owner]"
110.28 +#
110.29 +# If you wish your version of this file to be governed by only the CDDL
110.30 +# or only the GPL Version 2, indicate your decision by adding
110.31 +# "[Contributor] elects to include this software in this distribution
110.32 +# under the [CDDL or GPL Version 2] license." If you do not indicate a
110.33 +# single choice of license, a recipient has the option to distribute
110.34 +# your version of this file under either the CDDL, the GPL Version 2 or
110.35 +# to extend the choice of license to its licensees as provided above.
110.36 +# However, if you add GPL Version 2 code and therefore, elected the GPL
110.37 +# Version 2 license, then the option applies only if the new code is
110.38 +# made subject to such option by the copyright holder.
110.39 +#
110.40 +# Contributor(s):
110.41 +#
110.42 +# Portions Copyrighted 2012 Sun Microsystems, Inc.
110.43 +
110.44 +# names of various types (sizes) of default gaps
110.45 +DEFAULT_GAP_SMALL=\u9ed8\u8ba4\u5c0f
110.46 +DEFAULT_GAP_MEDIUM=\u9ed8\u8ba4\u4e2d\u7b49
110.47 +DEFAULT_GAP_LARGE=\u9ed8\u8ba4\u5927
110.48 +DEFAULT_GAP_UNSPECIFIED=\u9ed8\u8ba4
110.49 +INDENT_GAP=\u7f29\u8fdb
110.50 +
110.51 +# formatting for gap description
110.52 +# {0} = size of the gap, either one of the default names, or a number of pixels
110.53 +# {1} = actual size in pixels, used if different from the defined size (for resizing gaps)
110.54 +# example: Horizontal fixed gap: default small
110.55 +# example: Vertical resizable gap: default small / 50
110.56 +FMT_GAP_DESCRIPTION_HF=\u6c34\u5e73\u56fa\u5b9a\u95f4\u8ddd: {0}
110.57 +FMT_GAP_DESCRIPTION_HR=\u6c34\u5e73\u53ef\u8c03\u95f4\u8ddd: {0}
110.58 +FMT_GAP_DESCRIPTION_HR2=\u6c34\u5e73\u53ef\u8c03\u95f4\u8ddd: {0}/{1}
110.59 +FMT_GAP_DESCRIPTION_VF=\u5782\u76f4\u56fa\u5b9a\u95f4\u8ddd: {0}
110.60 +FMT_GAP_DESCRIPTION_VR=\u5782\u76f4\u53ef\u8c03\u95f4\u8ddd: {0}
110.61 +FMT_GAP_DESCRIPTION_VR2=\u5782\u76f4\u53ef\u8c03\u95f4\u8ddd: {0}/{1}
110.62 +
111.1 --- a/src/zh_CN/java/hibernate/hibernate/org/netbeans/modules/hibernate/wizards/Bundle_zh_CN.properties Tue Jun 26 07:22:38 2012 +0900
111.2 +++ b/src/zh_CN/java/hibernate/hibernate/org/netbeans/modules/hibernate/wizards/Bundle_zh_CN.properties Tue Jun 26 07:28:03 2012 +0900
111.3 @@ -95,6 +95,7 @@
111.4 ERR_JavaTargetChooser_InvalidPackage=\u5305\u540d\u65e0\u6548\u3002
111.5 ERR_JavaTargetChooser_UnwritablePackage=\u5305\u76ee\u5f55\u4e0d\u53ef\u5199\u3002
111.6 ERR_DatabaseError=\u65e0\u6cd5\u4e0e\u6570\u636e\u5e93\u5efa\u7acb\u8fde\u63a5\u3002
111.7 +ERR_HibernateError=Hibernate \u914d\u7f6e\u5931\u8d25\u5e76\u51fa\u73b0\u4ee5\u4e0b\u6d88\u606f:<br>{0}<br>\u6709\u5173\u5f02\u5e38\u9519\u8bef\u8be6\u7ec6\u4fe1\u606f, \u8bf7\u53c2\u89c1 message.log\u3002
111.8 HibernateCodeGenerationPanel.chkJava.text=JDK 5 \u8bed\u8a00\u529f\u80fd(&J)
111.9 HibernateCodeGenerationPanel.chkHbm.text=Hibernate XML \u6620\u5c04 (.hbm.xml)(&H)
111.10 HibernateCodeGenerationPanel.jLabel5.text=\u5e38\u89c4\u8bbe\u7f6e:
112.1 --- a/src/zh_CN/java/j2ee-eclipselink/j2ee-eclipselink/org/netbeans/modules/j2ee/eclipselink/Bundle_zh_CN.properties Tue Jun 26 07:22:38 2012 +0900
112.2 +++ b/src/zh_CN/java/j2ee-eclipselink/j2ee-eclipselink/org/netbeans/modules/j2ee/eclipselink/Bundle_zh_CN.properties Tue Jun 26 07:28:03 2012 +0900
112.3 @@ -46,4 +46,5 @@
112.4 OpenIDE-Module-Long-Description=Java \u6301\u4e45\u6027 API \u548c EclipseLink \u5e93
112.5
112.6 eclipselink=EclipseLink (JPA 2.0)
112.7 +jpa20-persistence=\u6301\u4e45\u6027 (JPA 2.0)
112.8
113.1 --- a/src/zh_CN/java/j2ee-persistence/j2ee-persistence/org/netbeans/modules/j2ee/persistence/editor/completion/Bundle_zh_CN.properties Tue Jun 26 07:22:38 2012 +0900
113.2 +++ b/src/zh_CN/java/j2ee-persistence/j2ee-persistence/org/netbeans/modules/j2ee/persistence/editor/completion/Bundle_zh_CN.properties Tue Jun 26 07:28:03 2012 +0900
113.3 @@ -86,12 +86,12 @@
113.4
113.5 eclipselink.jdbc.write-connections.min_DESC=<code>"eclipselink.jdbc.write-connections.min"</code> \u5c5e\u6027\u6307\u5b9a\u5185\u90e8\u5199\u8fde\u63a5\u6c60\u4e2d\u7684\u6700\u5c11\u8fde\u63a5\u6570\u3002\u8fde\u63a5\u6570\u8d85\u51fa\u6700\u5c0f\u503c\u65f6, \u8fde\u63a5\u8fd4\u56de\u5230\u6c60\u65f6\u5c06\u65ad\u5f00\u8fde\u63a5, \u56e0\u6b64\u6b64\u9879\u901a\u5e38\u5e94\u7b49\u4e8e\u6d3b\u52a8\u7ebf\u7a0b\u6570\u6216\u670d\u52a1\u5668\u7684\u7ebf\u7a0b\u6c60\u5927\u5c0f\u3002\u9ed8\u8ba4\u60c5\u51b5\u4e0b, \u4f7f\u7528\u7684\u5355\u4e2a\u5171\u4eab (\u72ec\u5360) \u8bfb/\u5199\u6c60\u5206\u522b\u6700\u5c11/\u6700\u591a\u5177\u6709 32 \u4e2a\u8fde\u63a5\u548c 1 \u4e2a\u521d\u59cb\u8fde\u63a5\u3002\u4f7f\u7528\u5916\u90e8\u8fde\u63a5\u6c60\u65f6\u5ffd\u7565\u6b64\u9879\u3002<p>\u6307\u5b9a\u7684\u503c\u5e94\u4e3a\u5305\u542b\u6b63\u6574\u6570\u503c\u7684\u5b57\u7b26\u4e32\u3002
113.6
113.7 -eclipselink.jdbc.write-connections.initial_DESC=<code>"eclipselink.jdbc.write-connections.initial"</code> \u5c5e\u6027\u914d\u7f6e\u5199\u8fde\u63a5\u6c60\u4e2d\u5728\u542f\u52a8\u65f6\u8fde\u63a5\u7684\u8fde\u63a5\u6570\u3002\u9ed8\u8ba4\u60c5\u51b5\u4e0b, \u4f7f\u7528\u7684\u5355\u4e2a\u5171\u4eab (\u72ec\u5360) \u8bfb/\u5199\u6c60\u5206\u522b\u6700\u5c11/\u6700\u591a\u5177\u6709 32 \u4e2a\u8fde\u63a5\u548c 1 \u4e2a\u521d\u59cb\u8fde\u63a5\u3002<p>\u4f7f\u7528\u5916\u90e8\u8fde\u63a5\u6c60\u65f6\u5ffd\u7565\u6b64\u5c5e\u6027\u3002<p>\u8be5\u503c\u5e94\u4e3a\u5305\u542b 0 \u6216\u66f4\u5927\u6574\u6570\u503c\u7684\u5b57\u7b26\u4e32\u3002
113.8 +eclipselink.jdbc.write-connections.initial_DESC=<code>"eclipselink.jdbc.write-connections.initial"</code> \u5c5e\u6027\u914d\u7f6e\u5199\u8fde\u63a5\u6c60\u4e2d\u5728\u542f\u52a8\u65f6\u8fde\u63a5\u7684\u8fde\u63a5\u6570\u3002\u9ed8\u8ba4\u60c5\u51b5\u4e0b, \u4f7f\u7528\u7684\u5355\u4e2a\u5171\u4eab (\u72ec\u5360) \u8bfb/\u5199\u6c60\u5206\u522b\u6700\u5c11/\u6700\u591a\u5177\u6709 32 \u4e2a\u8fde\u63a5\u548c 1 \u4e2a\u521d\u59cb\u8fde\u63a5\u3002<p>\u4f7f\u7528\u5916\u90e8\u8fde\u63a5\u6c60\u65f6\u5ffd\u7565\u6b64\u5c5e\u6027\u3002<p>\u8be5\u503c\u5e94\u8be5\u4e3a\u5305\u542b 0 \u6216\u66f4\u5927\u6574\u6570\u503c\u7684\u5b57\u7b26\u4e32\u3002
113.9
113.10 eclipselink.jdbc.read-connections.max_DESC=<code>"eclipselink.jdbc.read-connections.max"</code> \u5c5e\u6027\u914d\u7f6e\u8bfb\u8fde\u63a5\u6c60\u4e2d\u7684\u6700\u5927\u8fde\u63a5\u6570\u3002\u5982\u679c\u8fde\u63a5\u6570\u8fbe\u5230\u6700\u5927\u5927\u5c0f, \u5219\u9700\u8981\u8fde\u63a5\u7684\u7ebf\u7a0b\u5c06\u7b49\u5f85, \u76f4\u81f3\u6709\u8fde\u63a5\u91ca\u653e\u56de\u6c60\u4e2d (\u5728\u5e76\u975e\u5171\u4eab\u65f6)\u3002\u9ed8\u8ba4\u60c5\u51b5\u4e0b\u4e0d\u4f7f\u7528\u5355\u72ec\u7684\u8bfb\u8fde\u63a5\u6c60\u3002\u9ed8\u8ba4\u60c5\u51b5\u4e0b, \u4f7f\u7528\u7684\u5355\u4e2a\u5171\u4eab (\u72ec\u5360) \u8bfb/\u5199\u6c60\u5206\u522b\u6700\u5c11/\u6700\u591a\u5177\u6709 32 \u4e2a\u8fde\u63a5\u548c 1 \u4e2a\u521d\u59cb\u8fde\u63a5\u3002<p>\u4f7f\u7528\u5916\u90e8\u8fde\u63a5\u6c60\u65f6\u5ffd\u7565\u6b64\u5c5e\u6027\u3002<p>\u6307\u5b9a\u7684\u503c\u5e94\u4e3a\u5305\u542b 0 \u6216\u66f4\u5927\u6574\u6570\u503c\u7684\u5b57\u7b26\u4e32\u3002
113.11 eclipselink.jdbc.read-connections.min_DESC=<code>"eclipselink.jdbc.read-connections.min"</code> \u5c5e\u6027\u914d\u7f6e\u8bfb\u8fde\u63a5\u6c60\u4e2d\u7684\u6700\u5c11\u8fde\u63a5\u6570\u3002\u8fde\u63a5\u6570\u8d85\u51fa\u6700\u5c0f\u503c\u65f6, \u8fde\u63a5\u8fd4\u56de\u5230\u6c60\u65f6\u5c06\u65ad\u5f00\u8fde\u63a5, \u56e0\u6b64\u6b64\u9879\u901a\u5e38\u5e94\u7b49\u4e8e\u6d3b\u52a8\u7ebf\u7a0b\u6570\u6216\u670d\u52a1\u5668\u7684\u7ebf\u7a0b\u6c60\u5927\u5c0f\u3002\u9ed8\u8ba4\u60c5\u51b5\u4e0b\u4e0d\u4f7f\u7528\u5355\u72ec\u7684\u8bfb\u8fde\u63a5\u6c60\u3002\u9ed8\u8ba4\u60c5\u51b5\u4e0b, \u4f7f\u7528\u7684\u5355\u4e2a\u5171\u4eab (\u72ec\u5360) \u8bfb/\u5199\u6c60\u5206\u522b\u6700\u5c11/\u6700\u591a\u5177\u6709 32 \u4e2a\u8fde\u63a5\u548c 1 \u4e2a\u521d\u59cb\u8fde\u63a5\u3002<p>\u4f7f\u7528\u5916\u90e8\u8fde\u63a5\u6c60\u65f6\u5ffd\u7565\u6b64\u5c5e\u6027\u3002<p>\u6307\u5b9a\u7684\u503c\u5e94\u4e3a\u5305\u542b 0 \u6216\u66f4\u5927\u6574\u6570\u503c\u7684\u5b57\u7b26\u4e32\u3002
113.12
113.13 -eclipselink.jdbc.read-connections.initial_DESC=<code>"eclipselink.jdbc.read-connections.initial"</code> \u5c5e\u6027\u914d\u7f6e\u8bfb\u8fde\u63a5\u6c60\u4e2d\u5728\u542f\u52a8\u65f6\u8fde\u63a5\u7684\u8fde\u63a5\u6570\u3002\u9ed8\u8ba4\u60c5\u51b5\u4e0b, \u4f7f\u7528\u7684\u5355\u4e2a\u5171\u4eab (\u72ec\u5360) \u8bfb/\u5199\u6c60\u5206\u522b\u6700\u5c11/\u6700\u591a\u5177\u6709 32 \u4e2a\u8fde\u63a5\u548c 1 \u4e2a\u521d\u59cb\u8fde\u63a5\u3002<p>\u4f7f\u7528\u5916\u90e8\u8fde\u63a5\u6c60\u65f6\u5ffd\u7565\u6b64\u5c5e\u6027\u3002<p>\u8be5\u503c\u5e94\u4e3a\u5305\u542b 0 \u6216\u66f4\u5927\u6574\u6570\u503c\u7684\u5b57\u7b26\u4e32\u3002
113.14 +eclipselink.jdbc.read-connections.initial_DESC=<code>"eclipselink.jdbc.read-connections.initial"</code> \u5c5e\u6027\u914d\u7f6e\u8bfb\u8fde\u63a5\u6c60\u4e2d\u5728\u542f\u52a8\u65f6\u8fde\u63a5\u7684\u8fde\u63a5\u6570\u3002\u9ed8\u8ba4\u60c5\u51b5\u4e0b, \u4f7f\u7528\u7684\u5355\u4e2a\u5171\u4eab (\u72ec\u5360) \u8bfb/\u5199\u6c60\u5206\u522b\u6700\u5c11/\u6700\u591a\u5177\u6709 32 \u4e2a\u8fde\u63a5\u548c 1 \u4e2a\u521d\u59cb\u8fde\u63a5\u3002<p>\u4f7f\u7528\u5916\u90e8\u8fde\u63a5\u6c60\u65f6\u5ffd\u7565\u6b64\u9879\u3002<p>\u8be5\u503c\u5e94\u8be5\u4e3a\u5305\u542b 0 \u6216\u66f4\u5927\u6574\u6570\u503c\u7684\u5b57\u7b26\u4e32\u3002
113.15
113.16 eclipselink.jdbc.read-connections.shared_DESC=<code>"eclipselink.jdbc.read-connections.shared"</code> \u5c5e\u6027\u914d\u7f6e EclipseLink \u8bfb\u8fde\u63a5\u6c60\u4e2d\u7684\u8fde\u63a5\u662f\u5426\u5e94\u4e3a\u5171\u4eab (\u800c\u975e\u72ec\u5360)\u3002\u8fde\u63a5\u5171\u4eab\u610f\u5473\u7740\u5c06\u4e3a\u591a\u4e2a\u8bfb\u7ebf\u7a0b\u5e76\u884c\u4f7f\u7528\u76f8\u540c\u7684 JDBC \u8fde\u63a5\u3002<p>\u4f7f\u7528\u5916\u90e8\u8fde\u63a5\u6c60\u65f6\u5ffd\u7565\u6b64\u5c5e\u6027\u3002<p>\u503c (\u4e0d\u533a\u5206\u5927\u5c0f\u5199):<ul><li>"false" (\u9ed8\u8ba4): \u6307\u793a\u5c06\u4e0d\u5171\u4eab\u8fde\u63a5<li>"true": \u6307\u793a\u53ef\u4ee5\u5171\u4eab\u8bfb\u8fde\u63a5</ul>
113.17
114.1 --- a/src/zh_CN/java/java-api-common/java-api-common/org/netbeans/modules/java/api/common/applet/Bundle_zh_CN.properties Tue Jun 26 07:22:38 2012 +0900
114.2 +++ b/src/zh_CN/java/java-api-common/java-api-common/org/netbeans/modules/java/api/common/applet/Bundle_zh_CN.properties Tue Jun 26 07:28:03 2012 +0900
114.3 @@ -41,9 +41,9 @@
114.4 # made subject to such option by the copyright holder.
114.5
114.6 #generated HTML
114.7 -#GEN_title=\u5c0f\u5e94\u7528\u7a0b\u5e8f HTML \u9875
114.8 -#GEN_header=\u5c0f\u5e94\u7528\u7a0b\u5e8f HTML \u9875
114.9 -#GEN_copy=\u7531 NetBeans IDE \u751f\u6210
114.10 +#GEN_title=Applet HTML Page
114.11 +#GEN_header=Applet HTML Page
114.12 +#GEN_copy=Generated by NetBeans IDE
114.13
114.14 #GEN_warning=<!--\n*** GENERATED applet HTML launcher - DO NOT EDIT IN 'BUILD' FOLDER ***\n\nIf you need to modify this HTML launcher file (e.g., to add applet parameters), \ncopy it to where your applet class is found in the SRC folder. If you do this, \nthe IDE will use it when you run or debug the applet.\n\nTip: To exclude an HTML launcher from the JAR file, use exclusion filters in \nthe Packaging page in the Project Properties dialog.\n\nFor more information see the online help.\n-->\n\n
114.15
115.1 --- a/src/zh_CN/java/java-editor/java-editor/org/netbeans/modules/editor/java/Bundle_zh_CN.properties Tue Jun 26 07:22:38 2012 +0900
115.2 +++ b/src/zh_CN/java/java-editor/java-editor/org/netbeans/modules/editor/java/Bundle_zh_CN.properties Tue Jun 26 07:28:03 2012 +0900
115.3 @@ -55,16 +55,16 @@
115.4 goto_source_open_source_not_formatted=\u8f6c\u81f3\u6e90
115.5 goto_source_package_not_found=\u627e\u4e0d\u5230\u5305{0}\u3002
115.6 goto_source_source_not_found=\u627e\u4e0d\u5230{0}\u7684\u6e90\u6587\u4ef6\u3002
115.7 -LAB_JavaIndentEngine=Java \u7f29\u6392\u5f15\u64ce
115.8 -HINT_JavaIndentEngine=Java \u6587\u4ef6\u7684\u7f29\u6392\u5f15\u64ce\u3002
115.9 +LAB_JavaIndentEngine=Java \u7f29\u8fdb\u5f15\u64ce
115.10 +HINT_JavaIndentEngine=Java \u6587\u4ef6\u7684\u7f29\u8fdb\u5f15\u64ce\u3002
115.11 PROP_indentEngine_javaFormatNewlineBeforeBrace=\u5728\u82b1\u62ec\u53f7\u524d\u6362\u884c
115.12 HINT_indentEngine_javaFormatNewlineBeforeBrace=\u5982\u679c\u4e3a True, \u5219\u628a\u82b1\u62ec\u53f7\u79fb\u5230\u4e0b\u4e00\u884c\u3002
115.13 PROP_indentEngine_javaFormatSpaceBeforeParenthesis=\u5728\u5706\u62ec\u53f7\u524d\u6dfb\u52a0\u7a7a\u683c
115.14 HINT_indentEngine_javaFormatSpaceBeforeParenthesis=\u5982\u679c\u4e3a True, \u5219\u5728\u5de6\u5706\u62ec\u53f7\u524d\u52a0\u7a7a\u683c\u3002
115.15 PROP_indentEngine_javaFormatLeadingStarInComment=\u5728\u6ce8\u91ca\u4e2d\u6dfb\u52a0\u524d\u5bfc\u661f\u53f7
115.16 HINT_indentEngine_javaFormatLeadingStarInComment=\u5982\u679c\u4e3a True, \u5219\u5728\u5757\u6ce8\u91ca\u5185\u90e8\u7684\u6bcf\u884c\u8d77\u59cb\u5904\u6dfb\u52a0\u661f\u53f7\u3002
115.17 -PROP_indentEngine_javaFormatStatementContinuationIndent=\u8bed\u53e5\u8fde\u7eed\u7f29\u6392
115.18 -HINT_indentEngine_javaFormatStatementContinuationIndent=\u5bf9\u591a\u884c\u8bed\u53e5\u4e2d\u7684\u7b2c\u4e8c\u884c\u53ca\u540e\u7eed\u884c\u8fdb\u884c\u7f29\u6392\u3002
115.19 +PROP_indentEngine_javaFormatStatementContinuationIndent=\u8bed\u53e5\u8fde\u7eed\u7f29\u8fdb
115.20 +HINT_indentEngine_javaFormatStatementContinuationIndent=\u5bf9\u591a\u884c\u8bed\u53e5\u4e2d\u7684\u7b2c\u4e8c\u884c\u53ca\u540e\u7eed\u884c\u8fdb\u884c\u7f29\u8fdb\u3002
115.21
115.22 HINT_javadoc_browser_back_button=\u8f6c\u81f3\u4e0a\u4e00\u9875
115.23 HINT_javadoc_browser_forward_button=\u8f6c\u81f3\u4e0b\u4e00\u9875
115.24 @@ -144,6 +144,8 @@
115.25 override_Lbl=\u8986\u76d6
115.26 implement_Lbl=\u5b9e\u73b0
115.27 generate_Lbl=\u751f\u6210
115.28 +JCI-import_resolve=\u6b63\u5728\u5c1d\u8bd5\u81ea\u52a8\u89e3\u6790\u5bfc\u5165...
115.29 +JCI-find_semicolon_pos=\u6b63\u5728\u67e5\u627e\u5206\u53f7\u7684\u4f4d\u7f6e...
115.30
115.31 #go-to support (Go to Declaration, Go to Source, hyperlink)
115.32
115.33 @@ -164,7 +166,6 @@
115.34
115.35 JavaCodeTemplateFilter_action_name=Java \u4ee3\u7801\u6a21\u677f\u8fc7\u6ee4\u5668
115.36
115.37 -TP_OverriddenTooltipSugg={1}<br><br>{0,choice,0#Ctrl-Alt-\u5355\u51fb\u53ef\u5bfc\u822a\u5230\u5b9e\u73b0\u7c7b|1#Ctrl-Alt-\u5355\u51fb\u53ef\u5bfc\u822a\u5230\u5b50\u7c7b|2#Ctrl-Alt-\u5355\u51fb\u53ef\u5bfc\u822a\u5230\u5b9e\u73b0\u65b9\u6cd5|3#Ctrl-Alt-\u5355\u51fb\u53ef\u5bfc\u822a\u5230\u8986\u76d6\u65b9\u6cd5}
115.38 -TP_Mac_OverriddenTooltipSugg={1}<br><br>{0,choice,0#Cmd-Alt-\u5355\u51fb\u53ef\u5bfc\u822a\u5230\u5b9e\u73b0\u7c7b|1#Cmd-Alt-\u5355\u51fb\u53ef\u5bfc\u822a\u5230\u5b50\u7c7b|2#Cmd-Alt-\u5355\u51fb\u53ef\u5bfc\u822a\u5230\u5b9e\u73b0\u65b9\u6cd5|3#Cmd-Alt-\u5355\u51fb\u53ef\u5bfc\u822a\u5230\u8986\u76d6\u65b9\u6cd5}
115.39 +TP_OverriddenTooltipSugg={2}<br><br>{0}{1,choice,0#\u5355\u51fb\u53ef\u5bfc\u822a\u5230\u5b9e\u73b0\u7c7b|1#\u5355\u51fb\u53ef\u5bfc\u822a\u5230\u5b50\u7c7b|2#\u5355\u51fb\u53ef\u5bfc\u822a\u5230\u5b9e\u73b0\u65b9\u6cd5|3#\u5355\u51fb\u53ef\u5bfc\u822a\u5230\u8986\u76d6\u65b9\u6cd5}
115.40 TP_GoToOverriddenTooltipSugg={0,choice,0#\u7c7b\u8986\u76d6:|1#\u65b9\u6cd5\u8986\u76d6:}<br>{1}
115.41
116.1 --- a/src/zh_CN/java/java-freeform/java-freeform/org/netbeans/modules/java/freeform/Bundle_zh_CN.properties Tue Jun 26 07:22:38 2012 +0900
116.2 +++ b/src/zh_CN/java/java-freeform/java-freeform/org/netbeans/modules/java/freeform/Bundle_zh_CN.properties Tue Jun 26 07:28:03 2012 +0900
116.3 @@ -71,7 +71,7 @@
116.4 #COMMENT_set_main_class=TODO configure the main class for your project here:
116.5
116.6 ACTION_profile=\u5206\u6790\u9879\u76ee
116.7 -#COMMENT_more_info_profile=(more info: http://wiki.netbeans.org/FaqProfilerFreeForm72)
116.8 +#COMMENT_more_info_profile=(more info: http://netbeans.org/kb/articles/freeform-config.html#profilej2se)
116.9
116.10 CTL_SetOutput=\u8bbe\u7f6e\u8f93\u51fa
116.11 # AD_SetOutput=N/A
117.1 --- a/src/zh_CN/java/java-hints-declarative/java-hints-declarative/org/netbeans/modules/java/hints/declarative/debugging/Bundle_zh_CN.properties Tue Jun 26 07:22:38 2012 +0900
117.2 +++ b/src/zh_CN/java/java-hints-declarative/java-hints-declarative/org/netbeans/modules/java/hints/declarative/debugging/Bundle_zh_CN.properties Tue Jun 26 07:28:03 2012 +0900
117.3 @@ -38,5 +38,6 @@
117.4 #
117.5 CTL_DebugAction=Jackpot \u89c4\u5219
117.6 CTL_DebugTopComponent=Jackpot \u89c4\u5219\u8c03\u8bd5\u7a97\u53e3
117.7 +DN_Loading=\u6b63\u5728\u52a0\u8f7d...
117.8 HINT_DebugTopComponent=\u8fd9\u662f Jackpot \u89c4\u5219\u8c03\u8bd5\u7a97\u53e3
117.9
118.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
118.2 +++ b/src/zh_CN/java/java-hints-ui/java-hints-ui/org/netbeans/modules/java/hints/analysis/Bundle_zh_CN.properties Tue Jun 26 07:28:03 2012 +0900
118.3 @@ -0,0 +1,3 @@
118.4 +DN_JavaHints=NetBeans Java \u63d0\u793a
118.5 +DN_UnknownCategory=\u672a\u77e5
118.6 +
119.1 --- a/src/zh_CN/java/java-hints-ui/java-hints-ui/org/netbeans/modules/java/hints/spiimpl/refactoring/Bundle_zh_CN.properties Tue Jun 26 07:22:38 2012 +0900
119.2 +++ b/src/zh_CN/java/java-hints-ui/java-hints-ui/org/netbeans/modules/java/hints/spiimpl/refactoring/Bundle_zh_CN.properties Tue Jun 26 07:28:03 2012 +0900
119.3 @@ -103,4 +103,5 @@
119.4
119.5 MSG_WaitScan=\u8bf7\u7a0d\u5019, \u6b63\u5728\u626b\u63cf\u7c7b\u8def\u5f84...
119.6 LBL_CancelAction=\u53d6\u6d88{0}
119.7 +WARN_HasQueries=\u6240\u9009\u914d\u7f6e\u5305\u542b\u4e00\u4e9b\u672a\u63d0\u4f9b\u4efb\u4f55\u8f6c\u6362\u7684\u68c0\u67e5\u3002\u5c06\u4e0d\u4f1a\u5bf9\u6b64\u7c7b\u68c0\u67e5\u6240\u68c0\u6d4b\u7684\u4ee3\u7801\u63d0\u4f9b\u6bd4\u8f83\u3002\u8bf7\u4f7f\u7528\u201c\u6e90/\u68c0\u67e5...\u201d\u6267\u884c\u4ee3\u7801\u5206\u6790\u3002
119.8
120.1 --- a/src/zh_CN/java/java-hints/java-hints/org/netbeans/modules/java/hints/Bundle_zh_CN.properties Tue Jun 26 07:22:38 2012 +0900
120.2 +++ b/src/zh_CN/java/java-hints/java-hints/org/netbeans/modules/java/hints/Bundle_zh_CN.properties Tue Jun 26 07:28:03 2012 +0900
120.3 @@ -53,7 +53,7 @@
120.4 LBL_Braces_DoWhile=Do-While \u5faa\u73af\u5fc5\u987b\u4f7f\u7528\u82b1\u62ec\u53f7\u62ec\u4f4f
120.5 LBL_Braces_If=If-Else \u8bed\u53e5\u5fc5\u987b\u4f7f\u7528\u82b1\u62ec\u53f7\u62ec\u4f4f
120.6
120.7 -DSC_Braces_For=\u5982\u679c <CODE>for</CODE> \u5faa\u73af\u7684\u4e3b\u4f53<BR>\u6ca1\u6709\u4f7f\u7528\u82b1\u62ec\u53f7\u62ec\u4f4f, \u5219\u4f1a\u53d1\u51fa\u8b66\u544a\u3002<BR>
120.8 +DSC_Braces_For=\u5982\u679c <CODE>for</CODE> \u5faa\u73af\u7684\u4e3b\u4f53\u6ca1\u6709\u4f7f\u7528\u82b1\u62ec\u53f7\u62ec\u8d77, \u5219\u4f1a\u53d1\u51fa\u8b66\u544a\u3002<BR>
120.9 DSC_Braces_While=While \u5faa\u73af\u5fc5\u987b\u4f7f\u7528\u82b1\u62ec\u53f7\u62ec\u4f4f
120.10 DSC_Braces_DoWhile=Do-While \u5faa\u73af\u5fc5\u987b\u4f7f\u7528\u82b1\u62ec\u53f7\u62ec\u4f4f
120.11 DSC_Braces_If=If-Else \u8bed\u53e5\u5fc5\u987b\u4f7f\u7528\u82b1\u62ec\u53f7\u62ec\u4f4f
120.12 @@ -72,9 +72,18 @@
120.13
120.14 # Imports
120.15 DN_Imports_UNUSED=\u672a\u4f7f\u7528\u5bfc\u5165
120.16 +#Used in Source/Inspect:
120.17 +# {0} - the number of violating imports (never 0)
120.18 +DN_Imports_UNUSED_Multi={0,choice,1#\u672a\u4f7f\u7528\u5bfc\u5165|1<\u672a\u4f7f\u7528\u5bfc\u5165}
120.19 LBL_Imports_DUPLICATE=\u591a\u6b21\u5bfc\u5165
120.20 DN_Imports_SAME_PACKAGE=\u4ece\u76f8\u540c\u7684\u5305\u5bfc\u5165
120.21 +#Used in Source/Inspect:
120.22 +# {0} - the number of violating imports (never 0)
120.23 +DN_Imports_SAME_PACKAGE_Multi={0,choice,1#\u4ece\u76f8\u540c\u7684\u5305\u5bfc\u5165|1<\u4ece\u76f8\u540c\u7684\u5305\u5bfc\u5165}
120.24 DN_Imports_DEFAULT_PACKAGE=\u4ece java.lang \u5305\u5bfc\u5165
120.25 +#Used in Source/Inspect:
120.26 +# {0} - the number of violating imports (never 0)
120.27 +DN_Imports_DEFAULT_PACKAGE_Multi={0,choice,1#\u4ece java.lang \u5305\u5bfc\u5165|1<\u4ece java.lang \u5305\u5bfc\u5165}
120.28 DN_Imports_EXCLUDED=\u4ece\u5df2\u6392\u9664\u9879\u5bfc\u5165
120.29 DN_Imports_STAR=\u661f\u578b\u5bfc\u5165
120.30
120.31 @@ -151,7 +160,7 @@
120.32
120.33 # double check
120.34 DN_org.netbeans.modules.java.hints.DoubleCheck=\u53cc\u91cd\u68c0\u67e5\u9501\u5b9a
120.35 -DESC_org.netbeans.modules.java.hints.DoubleCheck=\u641c\u7d22\u6301\u6709\u53cc\u91cd\u68c0\u67e5\u9501\u7684\u793a\u4f8b - \u4f8b\u5982, \u67d0\u4e2a\u53d8\u91cf\u6b64\u524d\u5df2\u7ecf\u8fc7\u6d4b\u8bd5, \u7136\u540e\u53c8\u5728\u540c\u6b65\u7684\u7a0b\u5e8f\u5757\u4e2d\u7ee7\u7eed\u5bf9\u5176\u8fdb\u884c\u6d4b\u8bd5\u3002
120.36 +DESC_org.netbeans.modules.java.hints.DoubleCheck=\u641c\u7d22\u6301\u6709\u53cc\u91cd\u68c0\u67e5\u9501\u7684\u793a\u4f8b - \u4f8b\u5982, \u67d0\u4e2a\u53d8\u91cf\u6b64\u524d\u5df2\u7ecf\u8fc7\u6d4b\u8bd5, \u7136\u540e\u53c8\u5728\u540c\u6b65\u7684\u5757\u4e2d\u7ee7\u7eed\u5bf9\u5176\u8fdb\u884c\u6d4b\u8bd5\u3002
120.37 ERR_DoubleCheck=\u53cc\u91cd\u68c0\u67e5\u9501\u5b9a
120.38 FIX_DoubleCheck=\u5220\u9664\u5916\u90e8\u7684\u6761\u4ef6\u8bed\u53e5
120.39
120.40 @@ -402,7 +411,7 @@
120.41
120.42 #ThreadDumpStack hint
120.43 DN_org.netbeans.modules.java.hints.ThreadDumpStack=\u7ebf\u7a0b\u8f6c\u50a8\u5806\u6808
120.44 -DESC_org.netbeans.modules.java.hints.ThreadDumpStack=\u6b64\u68c0\u67e5\u62a5\u544a Thread.dumpStack() \u7684\u6240\u6709\u7528\u4f8b\u3002\u8fd9\u4e9b\u901a\u5e38\u662f\u4e34\u65f6\u8c03\u8bd5\u8bed\u53e5, \u5e76\u4e14\u53ef\u80fd\u5e94\u4ece\u751f\u4ea7\u4ee3\u7801\u4e2d\u5220\u9664, \u6216\u5e94\u88ab\u66f4\u7a33\u5b9a\u7684\u65e5\u5fd7\u8bb0\u5f55\u5de5\u5177\u6240\u66ff\u6362\u3002
120.45 +DESC_org.netbeans.modules.java.hints.ThreadDumpStack=\u6b64\u68c0\u67e5\u62a5\u544a Thread.dumpStack() \u7684\u6240\u6709\u7528\u4f8b\u3002\u8fd9\u4e9b\u901a\u5e38\u662f\u4e34\u65f6\u8c03\u8bd5\u8bed\u53e5, \u5e76\u4e14\u53ef\u80fd\u5e94\u5f53\u4ece\u751f\u4ea7\u4ee3\u7801\u4e2d\u5220\u9664, \u6216\u5e94\u88ab\u66f4\u7a33\u5b9a\u7684\u65e5\u5fd7\u8bb0\u5f55\u5de5\u5177\u6240\u66ff\u6362\u3002
120.46 MSG_ThreadDumpStack=\u7ebf\u7a0b\u8f6c\u50a8\u5806\u6808
120.47 MSG_ThreadDumpStack_fix=\u5e94\u5220\u9664 Thread.dumpStack()
120.48
121.1 --- a/src/zh_CN/java/java-j2seproject/java-j2seproject/org/netbeans/modules/java/j2seproject/Bundle_zh_CN.properties Tue Jun 26 07:22:38 2012 +0900
121.2 +++ b/src/zh_CN/java/java-j2seproject/java-j2seproject/org/netbeans/modules/java/j2seproject/Bundle_zh_CN.properties Tue Jun 26 07:28:03 2012 +0900
121.3 @@ -57,9 +57,9 @@
121.4 # (The proper characters will be displayed only if the file is opened in the table editor.)
121.5 #COMMENT_dist.dir=This directory is removed when the project is cleaned:
121.6 #COMMENT_build.dir=This directory is removed when the project is cleaned:
121.7 -#COMMENT_run.jvmargs=Space-separated list of JVM arguments used when running the project
121.8 -#COMMENT_run.jvmargs_2=(you may also define separate properties like run-sys-prop.name=value instead of -Dname=value
121.9 -#COMMENT_run.jvmargs_3=or test-sys-prop.name=value to set system properties for unit tests):
121.10 +#COMMENT_run.jvmargs=Space-separated list of JVM arguments used when running the project.
121.11 +#COMMENT_run.jvmargs_2=You may also define separate properties like run-sys-prop.name=value instead of -Dname=value.
121.12 +#COMMENT_run.jvmargs_3=To set system properties for unit tests define test-sys-prop.name=value:
121.13 #COMMENT_build.sysclasspath=Only compile against the classpath explicitly listed here:
121.14 #COMMENT_javac.compilerargs=Space-separated list of extra javac options
121.15 #COMMENT_debug.transport=Uncomment to specify the preferred debugger connection transport:
122.1 --- a/src/zh_CN/java/java-j2seproject/java-j2seproject/org/netbeans/modules/java/j2seproject/ui/customizer/Bundle_zh_CN.properties Tue Jun 26 07:22:38 2012 +0900
122.2 +++ b/src/zh_CN/java/java-j2seproject/java-j2seproject/org/netbeans/modules/java/j2seproject/ui/customizer/Bundle_zh_CN.properties Tue Jun 26 07:28:03 2012 +0900
122.3 @@ -95,7 +95,7 @@
122.4 # AD_CustomizeCompile_Remove_Processor_Option=N/A
122.5 LBL_AdditionalCompilerOptions=\u5176\u4ed6\u7f16\u8bd1\u5668\u9009\u9879(&L):
122.6 # AD_AdditionalCompilerOptions=N/A
122.7 -LBL_AdditionalCompilerOptionsExample=(\u4f8b\u5982 -Xlint:unchecked)
122.8 +LBL_AdditionalCompilerOptionsExample=<html>(e.g. -Xlint:unchecked)<br>"-J" \u9009\u9879\u4e0d\u80fd\u7528\u4e8e\u9ed8\u8ba4 Java \u5e73\u53f0\u3002
122.9 # MSG_ProjectArtifactFormat={0} - {1}
122.10 LBL_AddAnnotationProcessor_Title=\u6dfb\u52a0\u6807\u6ce8\u5904\u7406\u7a0b\u5e8f
122.11 LBL_AnnotationProcessorFQN=\u6807\u6ce8\u5904\u7406\u7a0b\u5e8f FQN(&A):
123.1 --- a/src/zh_CN/java/java-source/java-source/org/netbeans/modules/java/Bundle_zh_CN.properties Tue Jun 26 07:22:38 2012 +0900
123.2 +++ b/src/zh_CN/java/java-source/java-source/org/netbeans/modules/java/Bundle_zh_CN.properties Tue Jun 26 07:28:03 2012 +0900
123.3 @@ -52,7 +52,7 @@
123.4 FMT_Not_Valid_FileName=\u6307\u5b9a\u540d\u79f0\u4e0d\u9002\u7528 Java \u6e90\u6587\u4ef6: {0}
123.5
123.6 #IndentFileEntry
123.7 -EXMSG_IndentationEngineError=\u7f29\u6392\u5f15\u64ce\u9519\u8bef
123.8 +EXMSG_IndentationEngineError=\u7f29\u8fdb\u5f15\u64ce\u9519\u8bef
123.9
123.10 # JavaNode property sheet:
123.11 LBL_JavaNode_sheet_classpaths=\u7c7b\u8def\u5f84
124.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
124.2 +++ b/src/zh_CN/java/java-source/java-source/org/netbeans/modules/java/source/indexing/Bundle_zh_CN.properties Tue Jun 26 07:28:03 2012 +0900
124.3 @@ -0,0 +1,4 @@
124.4 +TITLE_LowMemory=\u5185\u5b58\u4e0d\u8db3
124.5 +MSG_LowMemory=\u5185\u5b58\u4e0d\u8db3, \u65e0\u6cd5\u7f16\u8bd1: {0}\u3002
124.6 +#URL_LowMemory=http://wiki.netbeans.org/InsufficientMemoryToIndexRoot
124.7 +
125.1 --- a/src/zh_CN/java/java-source/java-source/org/netbeans/modules/java/ui/Bundle_zh_CN.properties Tue Jun 26 07:22:38 2012 +0900
125.2 +++ b/src/zh_CN/java/java-source/java-source/org/netbeans/modules/java/ui/Bundle_zh_CN.properties Tue Jun 26 07:28:03 2012 +0900
125.3 @@ -1,4 +1,4 @@
125.4 -LBL_TabsAndIndents=\u5236\u8868\u7b26\u548c\u7f29\u6392
125.5 +LBL_TabsAndIndents=\u5236\u8868\u7b26\u548c\u7f29\u8fdb
125.6 LBL_CodeGeneration=\u4ee3\u7801\u751f\u6210
125.7 LBL_Alignment=\u5bf9\u9f50
125.8 LBL_Braces=\u82b1\u62ec\u53f7
125.9 @@ -9,8 +9,8 @@
125.10
125.11 LBL_bp_SAME_LINE=\u540c\u4e00\u884c
125.12 LBL_bp_NEW_LINE=\u6362\u884c
125.13 -LBL_bp_NEW_LINE_HALF_INDENTED=\u6362\u884c\u90e8\u5206\u7f29\u6392
125.14 -LBL_bp_NEW_LINE_INDENTED= \u6362\u884c\u7f29\u6392
125.15 +LBL_bp_NEW_LINE_HALF_INDENTED=\u6362\u884c\u90e8\u5206\u7f29\u8fdb
125.16 +LBL_bp_NEW_LINE_INDENTED= \u6362\u884c\u7f29\u8fdb
125.17
125.18 LBL_bg_GENERATE=\u751f\u6210
125.19 LBL_bg_LEAVE_ALONE=\u4fdd\u6301\u4e0d\u53d8
125.20 @@ -26,11 +26,11 @@
125.21
125.22 LBL_ExpandTabToSpaces=\u5c06\u5236\u8868\u7b26\u6269\u5c55\u4e3a\u7a7a\u683c(&E)
125.23 LBL_TabSize=\u5236\u8868\u7b26\u5927\u5c0f(&T):
125.24 -LBL_IndentSize=\u7f29\u6392\u5927\u5c0f(&I):
125.25 -LBL_ContinuationIndentSize=\u8fde\u7eed\u7f29\u6392\u5927\u5c0f(&C):
125.26 -LBL_LabelIndent=\u7f29\u6392\u6807\u7b7e(&L)\:
125.27 -LBL_AbsoluteLabelIndent=\u7edd\u5bf9\u6807\u7b7e\u7f29\u6392(&A)
125.28 -LBL_IndentTopLevelClassMemberts=\u7f29\u6392\u9876\u5c42\u7c7b\u6210\u5458(&I)
125.29 +LBL_IndentSize=\u7f29\u8fdb\u5927\u5c0f(&I):
125.30 +LBL_ContinuationIndentSize=\u8fde\u7eed\u7f29\u8fdb\u5927\u5c0f(&C):
125.31 +LBL_LabelIndent=\u7f29\u8fdb\u6807\u7b7e(&L)\:
125.32 +LBL_AbsoluteLabelIndent=\u7edd\u5bf9\u6807\u7b7e\u7f29\u8fdb(&A)
125.33 +LBL_IndentTopLevelClassMemberts=\u7f29\u8fdb\u9876\u5c42\u7c7b\u6210\u5458(&I)
125.34 LBL_AddLeadingStarInComment=\u5728\u6ce8\u91ca\u4e2d\u6dfb\u52a0\u524d\u5bfc\u661f\u53f7(&D)
125.35 LBL_RightMargin=\u53f3\u8fb9\u8ddd(&R):
125.36
125.37 @@ -203,7 +203,7 @@
125.38 LBL_am_TryResources=\u5c1d\u8bd5\u8d44\u6e90(&S)
125.39 LBL_am_MultiCatch=\u5206\u79bb\u5f0f\u6355\u83b7\u7c7b\u578b(&J)
125.40
125.41 -LBL_IndentCasesFromSwitch=\u5728 Switch \u4e2d\u8fdb\u884c Case \u8bed\u53e5\u7f29\u6392(&S)
125.42 +LBL_IndentCasesFromSwitch=\u5728 Switch \u4e2d\u8fdb\u884c Case \u8bed\u53e5\u7f29\u8fdb(&S)
125.43
125.44 LBL_Comments=\u6ce8\u91ca
125.45 LBL_doc_enableCommentFormat=\u542f\u7528\u6ce8\u91ca\u683c\u5f0f\u8bbe\u7f6e
125.46 @@ -266,10 +266,10 @@
125.47
125.48 AN_Preview=\u9884\u89c8
125.49 AD_Preview=\u9884\u89c8
125.50 -FmtTabsIndents.absoluteLabelIndentCheckBox.AccessibleContext.accessibleDescription=\u7edd\u5bf9\u6807\u7b7e\u7f29\u6392
125.51 +FmtTabsIndents.absoluteLabelIndentCheckBox.AccessibleContext.accessibleDescription=\u7edd\u5bf9\u6807\u7b7e\u7f29\u8fdb
125.52 FmtTabsIndents.addLeadingStarInCommentCheckBox.AccessibleContext.accessibleDescription=\u6ce8\u91ca\u884c\u4ee5\u524d\u5bfc\u661f\u53f7\u5f00\u5934
125.53 -FmtTabsIndents.indentCasesFromSwitchCheckBox.AccessibleContext.accessibleDescription=\u989d\u5916\u7f29\u6392 case \u8bed\u53e5
125.54 -FmtTabsIndents.indentTopLevelClassMembersCheckBox.AccessibleContext.accessibleDescription=\u7f29\u6392\u9876\u5c42\u7c7b\u6210\u5458
125.55 -FmtTabsIndents.continuationIndentSizeField.AccessibleContext.accessibleDescription=\u7f29\u6392\u7a7a\u683c\u5927\u5c0f
125.56 -FmtTabsIndents.labelIndentField.AccessibleContext.accessibleDescription=\u6807\u7b7e\u7f29\u6392\u7a7a\u683c\u5927\u5c0f
125.57 +FmtTabsIndents.indentCasesFromSwitchCheckBox.AccessibleContext.accessibleDescription=\u989d\u5916\u7f29\u8fdb case \u8bed\u53e5
125.58 +FmtTabsIndents.indentTopLevelClassMembersCheckBox.AccessibleContext.accessibleDescription=\u7f29\u8fdb\u9876\u5c42\u7c7b\u6210\u5458
125.59 +FmtTabsIndents.continuationIndentSizeField.AccessibleContext.accessibleDescription=\u7f29\u8fdb\u7a7a\u683c\u5927\u5c0f
125.60 +FmtTabsIndents.labelIndentField.AccessibleContext.accessibleDescription=\u6807\u7b7e\u7f29\u8fdb\u7a7a\u683c\u5927\u5c0f
125.61
126.1 --- a/src/zh_CN/java/maven-coverage/maven-coverage/org/netbeans/modules/maven/coverage/Bundle_zh_CN.properties Tue Jun 26 07:22:38 2012 +0900
126.2 +++ b/src/zh_CN/java/maven-coverage/maven-coverage/org/netbeans/modules/maven/coverage/Bundle_zh_CN.properties Tue Jun 26 07:28:03 2012 +0900
126.3 @@ -1,5 +1,5 @@
126.4 OpenIDE-Module-Display-Category=Java
126.5 -OpenIDE-Module-Long-Description=\u6dfb\u52a0\u652f\u6301\u4ee5\u663e\u793a Maven Cobertura \u63d2\u4ef6\u751f\u6210\u7684\u6d4b\u8bd5\u8986\u76d6\u62a5\u544a\u3002
126.6 +OpenIDE-Module-Long-Description=\u6dfb\u52a0\u652f\u6301\u4ee5\u663e\u793a Maven Cobertura \u6216 JaCoCo \u63d2\u4ef6\u751f\u6210\u7684\u6d4b\u8bd5\u8986\u76d6\u62a5\u544a\u3002
126.7 OpenIDE-Module-Name=Maven \u6d4b\u8bd5\u8986\u76d6
126.8 -OpenIDE-Module-Short-Description=Maven Cobertura \u6d4b\u8bd5\u8986\u76d6\u62a5\u544a\u3002
126.9 +OpenIDE-Module-Short-Description=\u4f7f\u7528 Maven \u7684 Cobertura \u548c JaCoCo \u6d4b\u8bd5\u8986\u76d6\u62a5\u544a\u3002
126.10
127.1 --- a/src/zh_CN/java/maven-grammar/maven-grammar/org/netbeans/modules/maven/codegen/Bundle_zh_CN.properties Tue Jun 26 07:22:38 2012 +0900
127.2 +++ b/src/zh_CN/java/maven-grammar/maven-grammar/org/netbeans/modules/maven/codegen/Bundle_zh_CN.properties Tue Jun 26 07:28:03 2012 +0900
127.3 @@ -1,4 +1,6 @@
127.4 +ERR_CannotWriteModel=\u65e0\u6cd5\u5199\u5165\u6a21\u578b: {0}
127.5 LBL_Incomplete=\u7ed3\u679c\u4e0d\u5b8c\u6574, \u4ecd\u5728\u5904\u7406\u7d22\u5f15...
127.6 +MSG_Cannot_Parse=\u65e0\u6cd5\u89e3\u6790\u6587\u6863\u3002\u65e0\u6cd5\u751f\u6210\u5185\u5bb9\u3002
127.7 NAME_Dependency=\u4f9d\u8d56\u5173\u7cfb...
127.8 NAME_Exclusion=\u4f9d\u8d56\u5173\u7cfb\u6392\u9664...
127.9 NAME_Mirror=\u955c\u50cf...
127.10 @@ -12,7 +14,6 @@
127.11 NewProfilePanel.cbDependencies.text=\u751f\u6210\u4f9d\u8d56\u5173\u7cfb\u7ba1\u7406(&D)
127.12
127.13
127.14 -MSG_Cannot_Parse=\u65e0\u6cd5\u89e3\u6790\u6587\u6863\u3002\u65e0\u6cd5\u751f\u6210\u5185\u5bb9\u3002
127.15 ERR_SameProfileId=\u6b64 POM \u4e2d\u5b58\u5728\u5177\u6709\u76f8\u540c id \u7684\u914d\u7f6e\u6587\u4ef6\u3002
127.16 ERR_SameMirrorId=\u6b64\u6587\u4ef6\u4e2d\u5b58\u5728\u5177\u6709\u76f8\u540c id \u7684\u955c\u50cf\u3002
127.17 NewMirrorPanel.lblMirrorOf.text=\u4ee5\u4e0b\u5bf9\u8c61\u7684\u955c\u50cf(&O):
127.18 @@ -31,6 +32,7 @@
127.19 NewPluginPanel.lblPlugins.text=\u63d2\u4ef6:
127.20 NewPluginPanel.lblGoals.text=\u6267\u884c\u76ee\u6807:
127.21 LBL_Node_Empty=\u65e0\u7ed3\u679c
127.22 +
127.23 NewProfilePanel_cbDependencies_text2=\u751f\u6210\u4f9d\u8d56\u5173\u7cfb\u90e8\u5206(&D)
127.24 NewProfilePanel_cbPlugins_text2=\u751f\u6210\u63d2\u4ef6\u90e8\u5206(&G)
127.25 TIT_Add_mirror=\u6dfb\u52a0\u65b0\u7684\u955c\u50cf
128.1 --- a/src/zh_CN/java/maven-graph/maven-graph/org/netbeans/modules/maven/graph/Bundle_zh_CN.properties Tue Jun 26 07:22:38 2012 +0900
128.2 +++ b/src/zh_CN/java/maven-graph/maven-graph/org/netbeans/modules/maven/graph/Bundle_zh_CN.properties Tue Jun 26 07:28:03 2012 +0900
128.3 @@ -68,6 +68,8 @@
128.4 FixVersionConflictPanel.fromDirectL.text=\u6765\u81ea\u76f4\u63a5\u4f9d\u8d56\u5173\u7cfb:
128.5 FixVersionConflictPanel.fixPossibL.text=\u4fee\u590d\u53ef\u80fd\u6027:
128.6 FixVersionConflictPanel.summaryL.text=\u4fee\u590d\u6982\u8981:
128.7 +
128.8 +ERR_UpdateModel=\u65e0\u6cd5\u66f4\u65b0 POM: {0}
128.9 TAB_Graph=\u56fe\u5f62
128.10 TIP_Artifact=<html><i>GroupId:</i><b> {0}</b><br><i>ArtifactId:</i><b> {1} </b><br><i>\u7248\u672c:</i><b> {2}</b><br><i>\u4f5c\u7528\u57df:</i><b> {3}</b><br><i>\u7c7b\u578b:</i><b> {4}</b><br>{5}</html>
128.11 TIP_ExcludeDep=\u5c06\u6b64\u5de5\u4ef6\u7684\u4f9d\u8d56\u5173\u7cfb\u6392\u9664\u6dfb\u52a0\u5230\u76f8\u5173\u7684\u76f4\u63a5\u4f9d\u8d56\u5173\u7cfb
129.1 --- a/src/zh_CN/java/maven-kit/maven-kit/org/netbeans/modules/maven/feature/Bundle_zh_CN.properties Tue Jun 26 07:22:38 2012 +0900
129.2 +++ b/src/zh_CN/java/maven-kit/maven-kit/org/netbeans/modules/maven/feature/Bundle_zh_CN.properties Tue Jun 26 07:28:03 2012 +0900
129.3 @@ -40,6 +40,6 @@
129.4
129.5 OpenIDE-Module-Display-Category=Java SE
129.6 OpenIDE-Module-Name=Maven
129.7 -OpenIDE-Module-Long-Description=NetBeans IDE \u652f\u6301 <a href="http://maven.apache.org">Apache Maven</a>\u3002<p>Maven \u662f\u4e00\u4e2a\u8f6f\u4ef6\u9879\u76ee\u7ba1\u7406\u548c\u7406\u89e3\u5de5\u5177\u3002\u57fa\u4e8e\u9879\u76ee\u5bf9\u8c61\u6a21\u5757 (POM) \u6982\u5ff5, Maven \u80fd\u7ba1\u7406\u9879\u76ee\u6784\u5efa, \u4ee5\u53ca\u6765\u81ea\u4e2d\u5fc3\u7247\u4fe1\u606f\u7684\u62a5\u544a\u548c\u6587\u6863\u3002\u60f3\u5b66\u4e60\u5230\u66f4\u591a\u6709\u5173 Apache Maven, \u8bf7\u8bbf\u95ee <a href="http://maven.apache.org/what-is-maven.html">Maven \u662f\u4ec0\u4e48?</a> \u9875\u9762\u3002<p>IDE \u5b8c\u5168\u652f\u6301\u57fa\u4e8e Maven \u7684 medatata \u5305\u62ec\u81ea\u8eab\u9879\u76ee\u7c7b\u578b, Maven \u9879\u76ee\u6587\u4ef6\u4ee3\u7801\u5b8c\u6210, \u5728 IDE \u4e2d\u96c6\u6210\u5176\u4ed6\u5de5\u5177\u7b49\u3002
129.8 +OpenIDE-Module-Long-Description=NetBeans IDE \u652f\u6301 <a href="http://maven.apache.org">Apache Maven</a>\u3002<p>Maven \u662f\u4e00\u4e2a\u8f6f\u4ef6\u9879\u76ee\u7ba1\u7406\u548c\u7406\u89e3\u5de5\u5177\u3002\u57fa\u4e8e\u9879\u76ee\u5bf9\u8c61\u6a21\u5757 (POM) \u6982\u5ff5, Maven \u80fd\u57fa\u4e8e\u6838\u5fc3\u4fe1\u606f\u6765\u7ba1\u7406\u9879\u76ee\u7684\u6784\u5efa,\u62a5\u544a\u548c\u6587\u6863\u3002\u60f3\u5b66\u4e60\u5230\u66f4\u591a\u6709\u5173 Apache Maven, \u8bf7\u8bbf\u95ee <a href="http://maven.apache.org/what-is-maven.html">Maven \u662f\u4ec0\u4e48?</a> \u9875\u9762\u3002<p>IDE\u652f\u6301\u5305\u62ec: \u5b8c\u5168\u57fa\u4e8e Maven \u7684 medatata \u7684\u81ea\u8eab\u9879\u76ee\u7c7b\u578b, Maven \u9879\u76ee\u6587\u4ef6\u4ee3\u7801\u5b8c\u6210, \u4ee5\u53ca\u4e0e IDE \u4e2d\u5176\u4ed6\u5de5\u5177\u7684\u96c6\u6210\u7b49\u3002
129.9 OpenIDE-Module-Short-Description=NetBeans Maven \u9879\u76ee\u7cfb\u7edf\u652f\u6301
129.10
130.1 --- a/src/zh_CN/java/maven/maven/org/netbeans/modules/maven/Bundle_zh_CN.properties Tue Jun 26 07:22:38 2012 +0900
130.2 +++ b/src/zh_CN/java/maven/maven/org/netbeans/modules/maven/Bundle_zh_CN.properties Tue Jun 26 07:28:03 2012 +0900
130.3 @@ -46,8 +46,6 @@
130.4 DESC_Problem_Broken_Config=\u65e0\u6cd5\u89e3\u6790 $project_basedir/nb-configuration.xml \u6587\u4ef6\u3002\u5728\u4fee\u590d\u4e4b\u524d\u5c06\u5ffd\u7565\u8be5\u6587\u4ef6\u4e2d\u5305\u542b\u7684\u4fe1\u606f\u3002\u8fd9\u4f1a\u5f71\u54cd IDE \u4e2d\u7684\u67d0\u4e9b\u529f\u80fd, \u6700\u7ec8\u4f7f\u5176\u65e0\u6cd5\u6b63\u5e38\u8fd0\u884c\u3002\n\n\u89e3\u6790\u5f02\u5e38\u9519\u8bef\u5982\u4e0b:\n{0}
130.5 LBL_Custom_Run=\u5b9a\u5236
130.6 LBL_Custom_run_goals=\u76ee\u6807...
130.7 -LBL_Incomplete_Project_Desc=\u90e8\u5206\u52a0\u8f7d\u4e86 Maven \u9879\u76ee; \u5c1d\u8bd5\u6784\u5efa\u8be5\u9879\u76ee\u3002
130.8 -LBL_Incomplete_Project_Name=<\u5bf9 Maven \u9879\u76ee\u8fdb\u884c\u4e86\u90e8\u5206\u52a0\u8f7d>
130.9 LBL_Loading=\u6b63\u5728\u52a0\u8f7d...
130.10 OpenIDE-Module-Display-Category=Maven
130.11 OpenIDE-Module-Name=Maven \u9879\u76ee
131.1 --- a/src/zh_CN/java/maven/maven/org/netbeans/modules/maven/actions/scm/Bundle_zh_CN.properties Tue Jun 26 07:22:38 2012 +0900
131.2 +++ b/src/zh_CN/java/maven/maven/org/netbeans/modules/maven/actions/scm/Bundle_zh_CN.properties Tue Jun 26 07:28:03 2012 +0900
131.3 @@ -38,8 +38,8 @@
131.4 #
131.5 # Portions Copyrighted 2008 Sun Microsystems, Inc.
131.6
131.7 +LBL_Checkout=\u68c0\u51fa\u6e90\u4ee3\u7801
131.8 LBL_SCM=SCM
131.9 -LBL_Checkout=\u68c0\u51fa\u6e90\u4ee3\u7801
131.10 LBL_OpenURL=\u5728\u7ebf\u6d4f\u89c8\u8d44\u6e90
131.11 ERR_Url=URL \u683c\u5f0f\u4e0d\u6b63\u786e: {0}
131.12
132.1 --- a/src/zh_CN/java/maven/maven/org/netbeans/modules/maven/actions/scm/ui/Bundle_zh_CN.properties Tue Jun 26 07:22:38 2012 +0900
132.2 +++ b/src/zh_CN/java/maven/maven/org/netbeans/modules/maven/actions/scm/ui/Bundle_zh_CN.properties Tue Jun 26 07:28:03 2012 +0900
132.3 @@ -41,21 +41,21 @@
132.4 BTN_Browse=\u6d4f\u89c8(&B)...
132.5 BTN_Checkout=\u68c0\u51fa
132.6 LBL_Checkout=\u68c0\u51fa{0}
132.7 -TIT_Choose=\u9009\u62e9\u8981\u68c0\u51fa\u7684\u76ee\u5f55
132.8 -LBL_Select=\u9009\u62e9
132.9 -LBL_Description=<html>\u4ece\u8d44\u6e90\u5e93\u4e2d\u68c0\u51fa{0}\u6e90\u4ee3\u7801</html>
132.10 LBL_Connection=\u6307\u5b9a\u4e0e SCM \u8d44\u6e90\u5e93\u7684\u8fde\u63a5\u3002
132.11 LBL_DefaultConnection=\u9ed8\u8ba4
132.12 +LBL_Description=<html>\u4ece\u8d44\u6e90\u5e93\u4e2d\u68c0\u51fa{0}\u6e90\u4ee3\u7801</html>
132.13 LBL_DeveloperConnection=\u5f00\u53d1\u8005
132.14 +LBL_Folder=\u672c\u5730\u5de5\u4f5c\u526f\u672c\u8def\u5f84
132.15 +LBL_Folder_Error=\u6587\u4ef6\u5939\u4e0d\u4e3a\u7a7a\u3002\u8981\u7ee7\u7eed\u6267\u884c\u64cd\u4f5c, \u8be5\u6587\u4ef6\u5939\u5fc5\u987b\u4e3a\u7a7a\u3002
132.16 LBL_LocalFolderDescription=\u6307\u5b9a\u8981\u5c06\u6587\u4ef6\u5939\u68c0\u51fa\u5230\u7684\u672c\u5730\u6587\u4ef6\u5939\u3002
132.17 LBL_LocalFolder=\u672c\u5730\u6587\u4ef6\u5939:
132.18 LBL_AuthenticationDescription=\u6307\u5b9a SCM \u8d44\u6e90\u5e93\u7684\u9a8c\u8bc1\u3002
132.19 +LBL_Select=\u9009\u62e9
132.20 LBL_User=\u7528\u6237:
132.21 LBL_Password=\u53e3\u4ee4:
132.22 LBL_ActhenticationHint=(\u7559\u7a7a\u533f\u540d\u8bbf\u95ee)
132.23 LBL_PrintDebugInfo=\u6253\u5370\u8c03\u8bd5\u4fe1\u606f
132.24 CheckoutUI.jLabel1.text=\u8d44\u6e90\u5e93 URL:
132.25 CheckoutUI.jLabel2.text=<html>SCM URL \u683c\u5f0f: <b>scm:{scm_provider}{delimiter}{provider_specific_part}</b></html>
132.26 -LBL_Folder_Error=\u6587\u4ef6\u5939\u4e0d\u4e3a\u7a7a\u3002\u8981\u7ee7\u7eed\u6267\u884c\u64cd\u4f5c, \u8be5\u6587\u4ef6\u5939\u5fc5\u987b\u4e3a\u7a7a\u3002
132.27 -LBL_Folder=\u672c\u5730\u5de5\u4f5c\u526f\u672c\u8def\u5f84
132.28 +TIT_Choose=\u9009\u62e9\u8981\u68c0\u51fa\u7684\u76ee\u5f55
132.29
133.1 --- a/src/zh_CN/java/maven/maven/org/netbeans/modules/maven/api/Bundle_zh_CN.properties Tue Jun 26 07:22:38 2012 +0900
133.2 +++ b/src/zh_CN/java/maven/maven/org/netbeans/modules/maven/api/Bundle_zh_CN.properties Tue Jun 26 07:28:03 2012 +0900
133.3 @@ -38,15 +38,15 @@
133.4 #
133.5 # Portions Copyrighted 2008 Sun Microsystems, Inc.
133.6
133.7 -Progress_Download=\u6b63\u5728\u4e0b\u8f7d Maven \u4f9d\u8d56\u5173\u7cfb
133.8 -MSG_Failed=\u4e0b\u8f7d\u5931\u8d25 - {0}
133.9 -MSG_Done=\u4ece\u8fdc\u7a0b\u8d44\u6e90\u5e93\u68c0\u7d22\u4f9d\u8d56\u5173\u7cfb\u7684\u64cd\u4f5c\u5df2\u5b8c\u6210\u3002
133.10 +
133.11
133.12 ACT_View_Details=\u67e5\u770b\u5de5\u4ef6\u8be6\u7ec6\u4fe1\u606f
133.13 -
133.14 +ERR_Coordinate_Invalid={0}\u5305\u542b\u65e0\u6548\u7684\u5b57\u7b26\u3002
133.15 +MSG_Checking_Javadoc=\u68c0\u67e5{0}\u7684 Javadoc
133.16 +MSG_Checking_Sources=\u68c0\u67e5{0}\u7684\u8d44\u6e90
133.17 +MSG_Done=\u4ece\u8fdc\u7a0b\u8d44\u6e90\u5e93\u68c0\u7d22\u4f9d\u8d56\u5173\u7cfb\u7684\u64cd\u4f5c\u5df2\u5b8c\u6210\u3002
133.18 +MSG_Failed=\u4e0b\u8f7d\u5931\u8d25 - {0}
133.19 +Progress_Download=\u6b63\u5728\u4e0b\u8f7d Maven \u4f9d\u8d56\u5173\u7cfb
133.20 Progress_Javadoc=\u6b63\u5728\u4e0b\u8f7d Javadoc
133.21 Progress_Source=\u6b63\u5728\u4e0b\u8f7d\u6e90
133.22 -MSG_Checking_Javadoc=\u68c0\u67e5{0}\u7684 Javadoc
133.23 -MSG_Checking_Sources=\u68c0\u67e5{0}\u7684\u8d44\u6e90
133.24 -ERR_Coordinate_Invalid={0}\u5305\u542b\u65e0\u6548\u7684\u5b57\u7b26\u3002
133.25
134.1 --- a/src/zh_CN/java/maven/maven/org/netbeans/modules/maven/api/customizer/support/Bundle_zh_CN.properties Tue Jun 26 07:22:38 2012 +0900
134.2 +++ b/src/zh_CN/java/maven/maven/org/netbeans/modules/maven/api/customizer/support/Bundle_zh_CN.properties Tue Jun 26 07:28:03 2012 +0900
134.3 @@ -38,7 +38,7 @@
134.4 #
134.5 # Portions Copyrighted 2008 Sun Microsystems, Inc.
134.6
134.7 +
134.8 +HINT_inherited=\u4ece\u7236 POM \u7ee7\u627f\u503c\u3002
134.9 MSG_Value_Inherited=\u4ece\u7236 POM \u6216\u8005\u9ed8\u8ba4\u7ee7\u627f\u503c\u3002
134.10 -HINT_inherited=\u4ece\u7236 POM \u7ee7\u627f\u503c\u3002
134.11
134.12 -
135.1 --- a/src/zh_CN/java/maven/maven/org/netbeans/modules/maven/configurations/Bundle_zh_CN.properties Tue Jun 26 07:22:38 2012 +0900
135.2 +++ b/src/zh_CN/java/maven/maven/org/netbeans/modules/maven/configurations/Bundle_zh_CN.properties Tue Jun 26 07:28:03 2012 +0900
135.3 @@ -1,17 +1,15 @@
135.4
135.5 -TIT_Configurations=\u914d\u7f6e
135.6 ConfigurationsPanel.lblConfigurations.text=\u914d\u7f6e(&C):
135.7 ConfigurationsPanel.btnAdd.text=\u6dfb\u52a0(&A)...
135.8 ConfigurationsPanel.btnEdit.text=\u7f16\u8f91(&E)...
135.9 ConfigurationsPanel.btnRemove.text=\u5220\u9664(&R)
135.10 ConfigurationsPanel.btnActivate.text=\u6fc0\u6d3b(&V)
135.11 NewConfigurationPanel.lblId.text=\u914d\u7f6e Id(&C):
135.12 -NewConfigurationPanel.cbShared.text=\u4fdd\u7559\u4ee5\u4f9b\u5176\u4ed6\u9879\u76ee\u91cd\u7528(&P)
135.13 NewConfigurationPanel.lblActivate.text=\u6fc0\u6d3b\u914d\u7f6e\u6587\u4ef6(&A):
135.14 NewConfigurationPanel.lblHint.text=<html>\u60a8\u53ef\u4ee5\u5728\u5176\u4ed6\u9762\u677f\u4e2d\u7f16\u8f91\u989d\u5916\u7684\u914d\u7f6e\u76f8\u5173\u5c5e\u6027\u3002</html>
135.15 TIT_Add_Config=\u6dfb\u52a0\u914d\u7f6e
135.16 +TIT_Configurations=\u914d\u7f6e
135.17 TIT_Edit_Config=\u7f16\u8f91\u914d\u7f6e
135.18 -TXT_DefaultConfig=<\u9ed8\u8ba4\u914d\u7f6e>
135.19 ConfigurationsPanel.btnActivate.AccessibleContext.accessibleDescription=\u6fc0\u6d3b\u914d\u7f6e
135.20 ConfigurationsPanel.btnAdd.AccessibleContext.accessibleDescription=\u6dfb\u52a0\u914d\u7f6e
135.21 ConfigurationsPanel.btnEdit.AccessibleContext.accessibleDescription=\u7f16\u8f91\u914d\u7f6e
135.22 @@ -19,11 +17,13 @@
135.23 ConfigurationsPanel.cbEnable.AccessibleContext.accessibleDescription=\u542f\u7528\u9879\u76ee\u914d\u7f6e
135.24 ConfigurationsPanel.cbProfiles.AccessibleContext.accessibleDescription=\u4f7f\u7528 Maven \u9879\u76ee\u914d\u7f6e\u6587\u4ef6\u4f5c\u4e3a\u914d\u7f6e
135.25 ConfigurationsPanel.lstConfigurations.AccessibleContext.accessibleDescription=\u914d\u7f6e\u5217\u8868
135.26 -NewConfigurationPanel.cbShared.AccessibleContext.accessibleDescription=\u4fdd\u7559\u4ee5\u4f9b\u5176\u4ed6\u9879\u76ee\u91cd\u7528
135.27 NewConfigurationPanel.txtId.AccessibleContext.accessibleDescription=\u914d\u7f6e Id
135.28 NewConfigurationPanel.txtActivate.AccessibleContext.accessibleDescription=\u6fc0\u6d3b\u914d\u7f6e\u6587\u4ef6
135.29
135.30 ACSD_Add_Config=\u6dfb\u52a0\u914d\u7f6e
135.31 ACSD_Edit_Config=\u7f16\u8f91\u914d\u7f6e
135.32 NewConfigurationPanel.lblProperties.text=\u8bbe\u7f6e\u5c5e\u6027(&S)
135.33 +NewConfigurationPanel.cbPrivate.AccessibleContext.accessibleDescription=\u4fdd\u7559\u4ee5\u4f9b\u5176\u4ed6\u9879\u76ee\u91cd\u7528
135.34 +NewConfigurationPanel.cbPrivate.text=\u4fdd\u6301\u5bf9\u6b64 IDE \u5b9e\u4f8b\u79c1\u6709(&P)
135.35 +TXT_DefaultConfig=<\u9ed8\u8ba4\u914d\u7f6e>
135.36
136.1 --- a/src/zh_CN/java/maven/maven/org/netbeans/modules/maven/customizer/Bundle_zh_CN.properties Tue Jun 26 07:22:38 2012 +0900
136.2 +++ b/src/zh_CN/java/maven/maven/org/netbeans/modules/maven/customizer/Bundle_zh_CN.properties Tue Jun 26 07:28:03 2012 +0900
136.3 @@ -71,29 +71,33 @@
136.4 ActinMappings.txtProfiles.hint=<html>\u4ee5\u7a7a\u683c\u6216\u8005\u9017\u53f7\u5206\u9694\u7684\u6267\u884c\u8fc7\u7a0b\u4e2d\u6d3b\u52a8\u7684\u914d\u7f6e\u5217\u8868\u3002</html>
136.5 ActinMappings.txtProperties.hint=<html>\u4ee5\u7a7a\u683c\u5206\u9694\u7684\u8bbe\u7f6e\u5728\u8868\u683c <key>=\"<value>\" \u4e2d\u6267\u884c\u5c5e\u6027\u5217\u8868\u3002\u5982\u679c\u503c\u4e0d\u5305\u542b\u7a7a\u683c, \u5219\u53ef\u4ee5\u5ffd\u7565 \"\u3002<br>\u9644\u52a0\u652f\u6301\u53d8\u91cf\u5305\u62ec (\u4e3b\u8981\u53ef\u7528\u4e8e\u8fd0\u884c/\u8c03\u8bd5/\u6d4b\u8bd5\u5355\u4e2a):<ul><li><b>className</b>: \u5df2\u9009\u5b9a\u7c7b\u7684\u540d\u79f0, \u4f8b\u5982 String</li><li><b>classNameWithExtension</b>: \u5e26\u6269\u5c55\u7684\u88ab\u9009\u5b9a\u7c7b\u7684\u540d\u79f0, \u4f8b\u5982 String.java</li><li><b>packageClassName</b>: \u5e26\u5305\u540d\u7684\u88ab\u9009\u5b9a\u7c7b\u7684\u540d\u79f0, \u4f8b\u5982 java.lang.String</li><li><b>webpagePath</b>: src/main/webapp \u4e2d\u6240\u9009\u7f51\u9875\u6587\u6863\u7684\u76f8\u5bf9\u8def\u5f84</li></ul></html>
136.6 customizer.Build=\u6784\u5efa
136.7 +DESC_Problem_Broken_Actions=\u65e0\u6cd5\u89e3\u6790 $project_basedir/nbactions.xml \u6587\u4ef6\u3002\u5728\u4fee\u590d\u4e4b\u524d\u5c06\u5ffd\u7565\u8be5\u6587\u4ef6\u4e2d\u5305\u542b\u7684\u4fe1\u606f\u3002\u8fd9\u4f1a\u5f71\u54cd IDE \u4e2d\u7684\u67d0\u4e9b\u529f\u80fd, \u6700\u7ec8\u4f7f\u5176\u65e0\u6cd5\u6b63\u5e38\u8fd0\u884c\u3002\n\n\u89e3\u6790\u5f02\u5e38\u9519\u8bef:\n{0}
136.8 ERR_Coord_breaks_pom=\u9519\u8bef: \u7ec4 Id \u6216\u5de5\u4ef6 Id \u5c06\u4f7f Maven POM xml \u6587\u4ef6\u65e0\u6548\u3002
136.9 ERR_MissingPOM=\u9879\u76ee\u7684 pom.xml \u6587\u4ef6\u5305\u542b\u65e0\u6548\u7684 xml \u5185\u5bb9\u3002\u8bf7\u5148\u4fee\u590d\u8be5\u6587\u4ef6, \u7136\u540e\u518d\u7ee7\u7eed\u64cd\u4f5c\u3002
136.10 ERR_multibyte=\u9519\u8bef: \u7981\u6b62\u5728\u7ec4 Id \u548c\u5de5\u4ef6 Id \u4e2d\u4f7f\u7528\u591a\u5b57\u8282\u5b57\u7b26\u3002
136.11 LBL_CategoryFormatting=\u683c\u5f0f\u8bbe\u7f6e
136.12 -TIT_Action_Mappings=\u64cd\u4f5c
136.13 +LBL_ChooseMainClass_NO_CLASSES_NODE=<\u627e\u4e0d\u5230\u4e3b\u7c7b>
136.14 +LBL_ChooseMainClass_WARMUP_MESSAGE=\u6b63\u5728\u521d\u59cb\u5316\u89c6\u56fe, \u8bf7\u7a0d\u5019...
136.15 LBL_GroupId=\u7ec4 ID(&G)\:
136.16 LBL_ArtifactId=\u5de5\u4ef6 ID(&A)\:
136.17 LBL_Version=\u7248\u672c(&V)\:
136.18 LBL_Packaging=\u6253\u5305(&P)\:
136.19 LBL_Name=\u540d\u79f0(&N)\:
136.20 LBL_Description=\u63cf\u8ff0(&D)\:
136.21 -TIT_Basic=\u5e38\u89c4
136.22 LBL_MainClass=\u4e3b\u7c7b(&M)\:
136.23 LBL_Arguments=\u53c2\u6570(&A)\:
136.24 LBL_WorkDir=\u5de5\u4f5c\u76ee\u5f55(&D)\:
136.25 LBL_VMOptions=VM \u9009\u9879(&V)\:
136.26 LBL_VMHint=(\u4f8b\u5982 -Xms10m)
136.27 BTN_Browse=\u6d4f\u89c8(&B)...
136.28 +TIT_Action_Mappings=\u64cd\u4f5c
136.29 +TIT_Basic=\u5e38\u89c4
136.30 +TIT_Compile=\u7f16\u8bd1
136.31 TIT_PLUGIN_EXPRESSION=\u6dfb\u52a0\u63d2\u4ef6\u8868\u8fbe\u5f0f\u5c5e\u6027
136.32 TIT_Project_Properties=\u9879\u76ee\u5c5e\u6027 - {0}
136.33 +TIT_Run=\u8fd0\u884c
136.34 TIT_SelectWorkingDirectory=\u9009\u62e9\u5de5\u4f5c\u76ee\u5f55
136.35 Err_CannotCreate=\u65e0\u6cd5\u5728{0}\u521b\u5efa\u7ec4\u5408\u4ef6\u6587\u4ef6
136.36 -TIT_Run=\u8fd0\u884c
136.37 TIT_ReactorDir=\u9009\u62e9\u53cd\u5e94\u5668\u9879\u76ee\u76ee\u5f55
136.38 BTN_ReactorDir=\u9009\u62e9
136.39
136.40 @@ -103,14 +107,13 @@
136.41 LBL_ChooseMainClass_OK=\u9009\u62e9\u4e3b\u7c7b
136.42 AD_ChooseMainClass_OK=\u786e\u5b9a
136.43 LBL_ChooseMainClass_Title=\u6d4f\u89c8\u4e3b\u7c7b
136.44 -LBL_ChooseMainClass_NO_CLASSES_NODE=<\u627e\u4e0d\u5230\u4e3b\u7c7b>
136.45 # AD_MainClassChooser=N/A
136.46 # AD_jMainClassList=N/A
136.47 -LBL_ChooseMainClass_WARMUP_MESSAGE=\u6b63\u5728\u521d\u59cb\u5316\u89c6\u56fe, \u8bf7\u7a0d\u5019...
136.48
136.49
136.50 +CTL_ProjectFolder=\u9879\u76ee\u6587\u4ef6\u5939(&F):
136.51 TIT_Sources=\u6e90
136.52 -CTL_ProjectFolder=\u9879\u76ee\u6587\u4ef6\u5939(&F):
136.53 +TXT_Problem_Broken_Actions=nbactions.xml \u6587\u4ef6\u5df2\u635f\u574f\u3002
136.54 TXT_SourceLevel=\u6e90\u4ee3\u7801/\u4e8c\u8fdb\u5236\u683c\u5f0f(&B):
136.55 TXT_Encoding=\u7f16\u7801(&E):
136.56 TIT_Add_action=\u64cd\u4f5c\u540d\:
136.57 @@ -125,7 +128,6 @@
136.58 CompilePanel.lblHint1.text=\u5982\u679c\u9009\u4e2d\u6b64\u9009\u9879, \u5728\u4fdd\u5b58\u6587\u4ef6\u65f6\u4f1a\u5bf9\u5176\u8fdb\u884c\u7f16\u8bd1\u3002
136.59 CompilePanel.lblHint2.text=\u5f53\u60a8\u5728 IDE \u4e2d\u8fd0\u884c\u6216\u8c03\u8bd5\u5e94\u7528\u7a0b\u5e8f\u6216\u6d4b\u8bd5\u65f6, \u6b64\u9009\u9879\u53ef\u8282\u7701\u65f6\u95f4\u3002
136.60
136.61 -TIT_Compile=\u7f16\u8bd1
136.62 COS_ALL=\u7528\u4e8e\u6267\u884c\u5e94\u7528\u7a0b\u5e8f\u548c\u6d4b\u8bd5
136.63 COS_APP=\u4ec5\u7528\u4e8e\u6267\u884c\u5e94\u7528\u7a0b\u5e8f
136.64 COS_TESTS=\u4ec5\u7528\u4e8e\u6267\u884c\u6d4b\u8bd5
136.65 @@ -166,8 +168,6 @@
136.66 WarnPanel.cbNextTime.AccessibleContext.accessibleDescription=\u5982\u679c\u9009\u4e2d, \u5c06\u5728\u4e0b\u6b21\u4ecd\u7136\u663e\u793a\u6b64\u8b66\u544a
136.67 WarnPanel.AccessibleContext.accessibleDescription=\u8b66\u544a\u6d88\u606f\u5bf9\u8bdd\u6846
136.68
136.69 -TXT_Problem_Broken_Actions=nbactions.xml \u6587\u4ef6\u5df2\u635f\u574f\u3002
136.70 -DESC_Problem_Broken_Actions=\u65e0\u6cd5\u89e3\u6790 $project_basedir/nbactions.xml \u6587\u4ef6\u3002\u5728\u4fee\u590d\u4e4b\u524d\u5c06\u5ffd\u7565\u8be5\u6587\u4ef6\u4e2d\u5305\u542b\u7684\u4fe1\u606f\u3002\u8fd9\u4f1a\u5f71\u54cd IDE \u4e2d\u7684\u67d0\u4e9b\u529f\u80fd, \u6700\u7ec8\u4f7f\u5176\u65e0\u6cd5\u6b63\u5e38\u8fd0\u884c\u3002\n\n\u89e3\u6790\u5f02\u5e38\u9519\u8bef:\n{0}
136.71 TXT_OPEN_FILE=\u6253\u5f00\u6587\u4ef6
136.72
136.73 TXT_PLUGIN_EXPRESSION=\u63d2\u4ef6\u8868\u8fbe\u5f0f\u5c5e\u6027
137.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
137.2 +++ b/src/zh_CN/java/maven/maven/org/netbeans/modules/maven/modelcache/Bundle_zh_CN.properties Tue Jun 26 07:28:03 2012 +0900
137.3 @@ -0,0 +1,5 @@
137.4 +LBL_Incomplete_Project_Desc=\u90e8\u5206\u52a0\u8f7d\u4e86 Maven \u9879\u76ee; \u5c1d\u8bd5\u6784\u5efa\u8be5\u9879\u76ee\u3002
137.5 +LBL_Incomplete_Project_Name=<\u5bf9 Maven \u9879\u76ee\u8fdb\u884c\u4e86\u90e8\u5206\u52a0\u8f7d>
137.6 +TXT_RuntimeException=\u52a0\u8f7d\u65f6, \u5728 Apache Maven \u5d4c\u5165\u7a0b\u5e8f\u4e2d\u51fa\u73b0 RuntimeException \u5f02\u5e38\u9519\u8bef
137.7 +TXT_RuntimeExceptionLong=\u52a0\u8f7d\u9879\u76ee\u65f6, \u5728 Apache Maven \u5d4c\u5165\u7a0b\u5e8f\u4e2d\u51fa\u73b0 RuntimeException \u5f02\u5e38\u9519\u8bef\u3002\n\u8fd9\u4f1a\u963b\u6b62\u6b63\u786e\u52a0\u8f7d\u9879\u76ee\u6a21\u578b\u3002\n\u8bf7\u53d1\u4e00\u4e2a\u9519\u8bef\u62a5\u544a, \u8be6\u7ec6\u63cf\u8ff0\u60a8\u7684\u9879\u76ee\u4ee5\u53ca IDE \u7684\u65e5\u5fd7\u6587\u4ef6\u3002\n\n
137.8 +
138.1 --- a/src/zh_CN/java/maven/maven/org/netbeans/modules/maven/nodes/Bundle_zh_CN.properties Tue Jun 26 07:22:38 2012 +0900
138.2 +++ b/src/zh_CN/java/maven/maven/org/netbeans/modules/maven/nodes/Bundle_zh_CN.properties Tue Jun 26 07:28:03 2012 +0900
138.3 @@ -51,12 +51,16 @@
138.4 BTN_add_module=\u6dfb\u52a0\u73b0\u6709\u6a21\u5757...
138.5 BTN_Add_sources=\u6dfb\u52a0\u672c\u5730\u6e90
138.6 BTN_Create_settings_xml=\u521b\u5efa settings.xml
138.7 +BTN_Deploy_Site=\u90e8\u7f72\u7ad9\u70b9
138.8 BTN_Exclude_Dependency=\u6392\u9664\u4f9d\u8d56\u5173\u7cfb
138.9 +BTN_Generate_Site=\u751f\u6210\u7ad9\u70b9
138.10 +BTN_Install_locally=\u672c\u5730\u5b89\u88c5
138.11 BTN_Manually_install=\u624b\u52a8\u5b89\u88c5\u5de5\u4ef6
138.12 BTN_OK=\u6dfb\u52a0
138.13 BTN_Open_Project=\u6253\u5f00\u9879\u76ee
138.14 BTN_Remove_Dependency=\u79fb\u9664\u4f9d\u8d56\u5173\u7cfb
138.15 BTN_Remove_Module=\u79fb\u9664\u6a21\u5757
138.16 +BTN_Select=\u9009\u62e9
138.17 BTN_Set_Dependency=\u58f0\u660e\u4e3a\u76f4\u63a5\u4f9d\u8d56\u5173\u7cfb
138.18 BTN_View_Javadoc=\u663e\u793a Javadoc
138.19 DESC_Dep1=GroupId:
138.20 @@ -73,6 +77,7 @@
138.21 DESC_Project7=\u95ee\u9898:
138.22 DESC_scope=\u8303\u56f4:
138.23 DESC_via=\u901a\u8fc7:
138.24 +ERR_No_Javadoc_Found=\u627e\u4e0d\u5230{0}\u7684 Javadoc\u3002
138.25 # {0} - label of source group
138.26 # {1} - project name
138.27 ERR_WrongSG={0} \u5f52\u5c5e\u4e8e\u9879\u76ee {1}, \u4e0d\u80fd\u88ab\u7528\u5728\u8fd9\u91cc, \u8981\u8be6\u7ec6\u4e86\u89e3, \u8bf7\u67e5\u770b\u95ee\u9898 #138310\u3002
138.28 @@ -84,14 +89,19 @@
138.29 LBL_Libraries=\u4f9d\u8d56\u5173\u7cfb
138.30 LBL_Modules=\u6a21\u5757
138.31 LBL_non_cp_libraries=\u975e\u7c7b\u8def\u5f84\u4f9d\u8d56\u5173\u7cfb
138.32 +LBL_Other_Sources=\u5176\u4ed6\u6e90
138.33 +LBL_Other_Test_Sources=\u5176\u4ed6\u6d4b\u8bd5\u6e90
138.34 LBL_Project_Files=\u9879\u76ee\u6587\u4ef6
138.35 LBL_Runtime_Libraries=\u8fd0\u884c\u65f6\u4f9d\u8d56\u5173\u7cfb
138.36 +LBL_ShowAsPackages=\u5c06\u8d44\u6e90\u663e\u793a\u4e3a\u5305
138.37 LBL_ShowManagedState=\u663e\u793a\u4f9d\u8d56\u5173\u7cfb\u7684\u53d7\u7ba1\u72b6\u6001
138.38 LBL_Site_Pages=\u9879\u76ee\u7ad9\u70b9
138.39 LBL_Test_Libraries=\u6d4b\u8bd5\u4f9d\u8d56\u5173\u7cfb
138.40 MSG_Checking_Javadoc=\u68c0\u67e5{0}\u7684 Javadoc
138.41 MSG_Checking_Sources=\u68c0\u67e5{0}\u7684\u8d44\u6e90
138.42 MSG_Checking=\u68c0\u67e5{0}
138.43 +MSG_ClassesExcluded=\u67e5\u8be2\u592a\u7b3c\u7edf\u3002\u5df2\u4ece\u641c\u7d22\u4e2d\u6392\u9664\u7c7b\u540d\u3002
138.44 +MSG_Instructions=<html>\u8bf7\u8f93\u5165\u8868\u793a\u4ee5\u4e0b\u4f9d\u8d56\u5173\u7cfb\u7684 JAR \u6587\u4ef6\u7684\u8def\u5f84:<br>groupId: <b>{0}</b>, <br>artifactId: <b>{1}</b> \u4ee5\u53ca<br>\u7248\u672c: <b>{2}</b><br>\u6b64 JAR \u5c06\u88ab\u590d\u5236\u5230\u60a8\u7684\u672c\u5730\u8d44\u6e90\u5e93\u4e2d\u3002<br>\u8bf7\u6ce8\u610f, \u5c06\u4e0d\u57fa\u4e8e\u8d44\u6e90\u5e93\u7684 JAR \u4f5c\u4e3a\u4f9d\u8d56\u5173\u7cfb\u4e0d\u5229\u4e8e\u91cd\u7528\u6784\u5efa\u7684\u5185\u5bb9\u3002</html>
138.45 MSG_Remove_Module=\u662f\u5426\u8981\u4ece\u7236 POM \u4e2d\u79fb\u9664\u6a21\u5757?
138.46 Progress_Javadoc=\u6b63\u5728\u4e0b\u8f7d Javadoc
138.47 Progress_Source=\u6b63\u5728\u4e0b\u8f7d\u6e90
138.48 @@ -111,38 +121,33 @@
138.49 MSG_Located_In_Parent=\u672a\u5220\u9664\u7236\u9879\u76ee\u4e2d\u58f0\u660e\u7684{0}\u4f9d\u8d56\u5173\u7cfb\u3002
138.50
138.51
138.52 -ERR_No_Javadoc_Found=\u627e\u4e0d\u5230{0}\u7684 Javadoc\u3002
138.53
138.54 +
138.55 +BTN_Browse=\u6d4f\u89c8(&B)...
138.56 +
138.57 +TIP_Resource1=<html>\u5728 POM \u4e2d\u5b9a\u4e49\u4e86\u8d44\u6e90\u76ee\u5f55\u3002<br><i>\u76ee\u5f55: </i><b>{0}</b><br>
138.58 +TIP_Resource2=<i>\u76ee\u6807\u8def\u5f84: </i><b>{0}</b><br>
138.59 +TIP_Resource3=<i>\u5305\u542b: </i><b>{0}</b><br>
138.60 +TIP_Resource4=<i>\u6392\u9664: </i><b>{0}</b><br>
138.61 +TIP_Resource5=<html>\u914d\u7f6e\u76ee\u5f55<br><i>\u76ee\u5f55: </i><b>{0}</b><br>
138.62 TIT_Add_Library=\u6dfb\u52a0\u5e93
138.63 TIT_Exclude=\u6392\u9664\u4f20\u9012\u4f9d\u8d56\u5173\u7cfb
138.64 -TXT_FailedProjectLoadingDesc=NetBeans \u96c6\u6210\u65e0\u6cd5\u52a0\u8f7d\u6b64\u9879\u76ee\u3002\u8fd9\u901a\u5e38\u8868\u793a\u60a8\u7684 pom.xml \u51fa\u73b0\u9519\u8bef\u6216\u7f3a\u5c11\u63d2\u4ef6\u3002\u8bf7\u4ece\u9879\u76ee\u7684\u4e0a\u4e0b\u6587\u83dc\u5355\u4e2d\u9009\u62e9\u201c\u663e\u793a\u5e76\u89e3\u51b3\u95ee\u9898\u201d\u4ee5\u4e86\u89e3\u5176\u4ed6\u4fe1\u606f\u3002
138.65 -TXT_Javadoc_Loc=Javadoc JAR/ZIP \u4f4d\u7f6e\:
138.66 -
138.67 -TXT_Sources_Loc=\u6e90 JAR/ZIP \u4f4d\u7f6e
138.68 -BTN_Browse=\u6d4f\u89c8(&B)...
138.69 -
138.70 +TIT_Install_locally=\u672c\u5730\u5b89\u88c5
138.71 TIT_Select_javadoc_zip=\u9009\u62e9\u5305\u542b Javadoc \u7684 ZIP/JAR \u6587\u4ef6
138.72 TIT_Select_source_zip=\u9009\u62e9\u5305\u542b\u6e90\u7684 ZIP/JAR \u6587\u4ef6
138.73 LBL_Select_javadoc_zip=\u5305\u542b Javadoc \u7684 JAR/ZIP \u6587\u4ef6
138.74 LBL_Select_source_zip=\u5305\u542b\u6e90\u7684 JAR/ZIP \u6587\u4ef6
138.75
138.76 -BTN_Select=\u9009\u62e9
138.77
138.78 -TIT_Use_local_docs=\u4f7f\u7528\u672c\u5730 Javadoc
138.79 -TIT_Use_local_source=\u4f7f\u7528\u672c\u5730\u6e90
138.80
138.81
138.82
138.83
138.84 -LBL_Other_Test_Sources=\u5176\u4ed6\u6d4b\u8bd5\u6e90
138.85
138.86 -LBL_Other_Sources=\u5176\u4ed6\u6e90
138.87
138.88
138.89
138.90 -BTN_Generate_Site=\u751f\u6210\u7ad9\u70b9
138.91
138.92 -BTN_Deploy_Site=\u90e8\u7f72\u7ad9\u70b9
138.93
138.94 InstallPanel.panel.accessibledesc=\u5c06 JAR \u6587\u4ef6\u5b89\u88c5\u5230\u672c\u5730 Maven \u8d44\u6e90\u5e93\u4e2d\u3002
138.95 InstallPanel.lblFile.text=\u8981\u5b89\u88c5\u7684\u5de5\u4ef6(&A)\:
138.96 @@ -152,15 +157,11 @@
138.97 InstallPanel.btnFile.accessibledesc=\u6d4f\u89c8 JAR \u6587\u4ef6\u3002
138.98 InstallPanel.lblHint.text=<html>\u8bf7\u8f93\u5165\u4f9d\u8d56\u5173\u7cfb\u8def\u5f84\u5230\u4e8c\u8fdb\u5236\:<p></html>
138.99
138.100 -MSG_Instructions=<html>\u8bf7\u8f93\u5165\u8868\u793a\u4ee5\u4e0b\u4f9d\u8d56\u5173\u7cfb\u7684 JAR \u6587\u4ef6\u7684\u8def\u5f84:<br>groupId: <b>{0}</b>, <br>artifactId: <b>{1}</b> \u4ee5\u53ca<br>\u7248\u672c: <b>{2}</b><br>\u6b64 JAR \u5c06\u88ab\u590d\u5236\u5230\u60a8\u7684\u672c\u5730\u8d44\u6e90\u5e93\u4e2d\u3002<br>\u8bf7\u6ce8\u610f, \u5c06\u4e0d\u57fa\u4e8e\u8d44\u6e90\u5e93\u7684 JAR \u4f5c\u4e3a\u4f9d\u8d56\u5173\u7cfb\u4e0d\u5229\u4e8e\u91cd\u7528\u6784\u5efa\u7684\u5185\u5bb9\u3002</html>
138.101
138.102
138.103 TIT_Select_Artifact=\u9009\u62e9\u4e8c\u8fdb\u5236\u5de5\u4ef6\u6765\u5b89\u88c5\u5230\u672c\u5730\u8d44\u6e90\u5e93\u3002
138.104 SEL_Jars=JAR \u6587\u4ef6
138.105 TIT_Select=\u9009\u62e9
138.106 -BTN_Install_locally=\u672c\u5730\u5b89\u88c5
138.107 -TIT_Install_locally=\u672c\u5730\u5b89\u88c5
138.108 -TXT_InstallTask=\u5b89\u88c5\u5de5\u4ef6
138.109 LBL_GroupId=\u7ec4 ID(&G):
138.110 LBL_ArtifactId=\u5de5\u4ef6 ID(&A):
138.111 LBL_Version=\u7248\u672c(&V):
138.112 @@ -190,14 +191,8 @@
138.113 AddDependencyPanel.jLabel2.text=\u63d0\u793a: \u952e\u5165\u524d\u7f00\u53ef\u5feb\u901f\u8fdb\u884c\u8bbf\u95ee
138.114 MSG_VersionConflict=\u5df2\u5728 "dependencyManagement" \u90e8\u5206\u4e2d\u8bbe\u7f6e\u4e86\u7248\u672c!
138.115 MSG_TooGeneral=\u8bf7\u5c06\u67e5\u8be2\u5b57\u7b26\u4e32\u4fee\u6539\u5f97\u66f4\u5177\u4f53\u4e9b\u3002
138.116 -MSG_ClassesExcluded=\u67e5\u8be2\u592a\u7b3c\u7edf\u3002\u5df2\u4ece\u641c\u7d22\u4e2d\u6392\u9664\u7c7b\u540d\u3002
138.117
138.118 -TIP_Resource1=<html>\u5728 POM \u4e2d\u5b9a\u4e49\u4e86\u8d44\u6e90\u76ee\u5f55\u3002<br><i>\u76ee\u5f55: </i><b>{0}</b><br>
138.119 -TIP_Resource2=<i>\u76ee\u6807\u8def\u5f84: </i><b>{0}</b><br>
138.120 -TIP_Resource3=<i>\u5305\u542b: </i><b>{0}</b><br>
138.121 -TIP_Resource4=<i>\u6392\u9664: </i><b>{0}</b><br>
138.122
138.123 -TIP_Resource5=<html>\u914d\u7f6e\u76ee\u5f55<br><i>\u76ee\u5f55: </i><b>{0}</b><br>
138.124
138.125
138.126 AddDependencyPanel.pnlDepMan.TabConstraints.tabTitle=\u4f9d\u8d56\u5173\u7cfb\u7ba1\u7406
138.127 @@ -211,7 +206,6 @@
138.128 AddDependencyPanel.searchField.AccessibleContext.accessibleDescription=\u67e5\u8be2
138.129 AddDependencyPanel.resultsLabel.AccessibleContext.accessibleDescription=\u641c\u7d22\u7ed3\u679c
138.130
138.131 -LBL_ShowAsPackages=\u5c06\u8d44\u6e90\u663e\u793a\u4e3a\u5305
138.132 AddDependencyPanel.chkNbOnly.toolTipText=\u4ec5\u641c\u7d22 NetBeans \u6a21\u5757\u3002
138.133 AddDependencyPanel.chkNbOnly.text=\u4ec5 NetBeans(&N)
138.134 AddDependencyPanel.searchPanel.TabConstraints.tabToolTip=\u5728\u5df2\u77e5\u7684\u8d44\u6e90\u5e93\u4e2d\u641c\u7d22\u4f9d\u8d56\u5173\u7cfb\u3002
138.135 @@ -219,4 +213,10 @@
138.136 AddDependencyPanel.pnlDepMan.TabConstraints.tabToolTip=\u4ece POM \u7684 <dependencyManagement> \u90e8\u5206\u9009\u62e9\u9884\u5148\u5b89\u6392\u7684\u4f9d\u8d56\u5173\u7cfb\u3002
138.137 AddDependencyPanel.lblType.text=\u7c7b\u578b(&T):
138.138 AddDependencyPanel.lblClassifier.text=\u7c7b\u5143(&C):
138.139 +TIT_Use_local_docs=\u4f7f\u7528\u672c\u5730 Javadoc
138.140 +TIT_Use_local_source=\u4f7f\u7528\u672c\u5730\u6e90
138.141 +TXT_FailedProjectLoadingDesc=NetBeans \u96c6\u6210\u65e0\u6cd5\u52a0\u8f7d\u6b64\u9879\u76ee\u3002\u8fd9\u901a\u5e38\u8868\u793a\u60a8\u7684 pom.xml \u51fa\u73b0\u9519\u8bef\u6216\u7f3a\u5c11\u63d2\u4ef6\u3002\u8bf7\u4ece\u9879\u76ee\u7684\u4e0a\u4e0b\u6587\u83dc\u5355\u4e2d\u9009\u62e9\u201c\u663e\u793a\u5e76\u89e3\u51b3\u95ee\u9898\u201d\u4ee5\u4e86\u89e3\u5176\u4ed6\u4fe1\u606f\u3002
138.142 +TXT_InstallTask=\u5b89\u88c5\u5de5\u4ef6
138.143 +TXT_Javadoc_Loc=Javadoc JAR/ZIP \u4f4d\u7f6e:
138.144 +TXT_Sources_Loc=\u6e90 JAR/ZIP \u4f4d\u7f6e
138.145
139.1 --- a/src/zh_CN/java/maven/maven/org/netbeans/modules/maven/operations/Bundle_zh_CN.properties Tue Jun 26 07:22:38 2012 +0900
139.2 +++ b/src/zh_CN/java/maven/maven/org/netbeans/modules/maven/operations/Bundle_zh_CN.properties Tue Jun 26 07:28:03 2012 +0900
139.3 @@ -38,12 +38,12 @@
139.4 #
139.5 # Portions Copyrighted 2008 Sun Microsystems, Inc.
139.6
139.7 +NAME_Artifact=ArtifactId
139.8 +NAME_Folder=\u6587\u4ef6\u5939\u540d\u79f0
139.9 NotifyDeleting.execute=\u5220\u9664\u9879\u76ee
139.10 -RenameProjectPanel.lblRename.text=\u91cd\u547d\u540d\u9879\u76ee
139.11 -RenameProjectPanel.lblRename.text2=\u91cd\u547d\u540d\u9879\u76ee "{0}"
139.12 RenameProjectPanel.cbDisplayName.text=\u66f4\u6539\u663e\u793a\u540d\u79f0(&D):
139.13 RenameProjectPanel.cbArtifactId.text=\u66f4\u6539 ArtifactID(&A):
139.14 RenameProjectPanel.cbFolder.text=\u91cd\u547d\u540d\u6587\u4ef6\u5939(&F):
139.15 -NAME_Artifact=ArtifactId
139.16 -NAME_Folder=\u6587\u4ef6\u5939\u540d\u79f0
139.17 +RenameProjectPanel.lblRename.text=\u91cd\u547d\u540d\u9879\u76ee
139.18 +RenameProjectPanel.lblRename.text2=\u91cd\u547d\u540d\u9879\u76ee "{0}"
139.19
140.1 --- a/src/zh_CN/java/maven/maven/org/netbeans/modules/maven/options/Bundle_zh_CN.properties Tue Jun 26 07:22:38 2012 +0900
140.2 +++ b/src/zh_CN/java/maven/maven/org/netbeans/modules/maven/options/Bundle_zh_CN.properties Tue Jun 26 07:28:03 2012 +0900
140.3 @@ -39,6 +39,9 @@
140.4 # Portions Copyrighted 2008 Sun Microsystems, Inc.
140.5
140.6
140.7 +MAVEN_RUNTIME_Browse=\u6d4f\u89c8...
140.8 +MAVEN_RUNTIME_Bundled=\u5df2\u6346\u7ed1
140.9 +# MAVEN_RUNTIME_External={0}
140.10 # {0} - proxy host
140.11 MSG_unset_proxy=<html>IDE \u4f3c\u4e4e\u8981\u4f7f\u7528\u7f51\u7edc\u4ee3\u7406 (<code>{0}</code>), \u4f46 Maven \u672a\u914d\u7f6e\u4e3a\u4f7f\u7528\u4efb\u4f55\u4ee3\u7406\u3002<br>\u5982\u679c\u9700\u8981\u4e0b\u8f7d\u8fdc\u7a0b\u5de5\u4ef6, \u8fd9\u53ef\u80fd\u5bfc\u81f4\u6784\u5efa\u5931\u8d25\u3002<br>\u901a\u5e38, \u60a8\u53ef\u80fd\u9700\u8981\u7f16\u8f91 <code>settings.xml</code> \u4e2d\u7684 <code><proxies></code> \u90e8\u5206:<br>http://wiki.netbeans.org/FaqMavenProxySettings<br>\u4f5c\u4e3a<em>\u5728\u67d0\u4e9b\u7cfb\u7edf\u4e0a</em>\u4f7f\u7528\u7684\u4e00\u79cd\u4fbf\u6377\u65b9\u6cd5, \u53ef\u4ee5\u5c06 <code>-Djava.net.useSystemProxies=true</code> \u4f20\u9012\u7ed9 Maven\u3002<br>\u662f\u5426\u7acb\u5373\u5c1d\u8bd5\u8be5\u65b9\u6cd5? (\u5982\u679c\u8fd9\u79cd\u65b9\u6cd5\u65e0\u6548, \u8bf7\u5c06\u5176\u4ece\u201c\u5168\u5c40\u6267\u884c\u9009\u9879\u201d\u4e2d\u5220\u9664\u3002)
140.12 TIT_Maven_Category=Maven
140.13 @@ -88,8 +91,5 @@
140.14 TIT_EVERY=\u5728\u6bcf\u4e2a\u9879\u76ee\u6253\u5f00\u65f6
140.15 TIT_FIRST=\u4ec5\u5728\u7b2c\u4e00\u4e2a\u9879\u76ee\u6253\u5f00\u65f6
140.16 SettingsPanel.cbSkipTests.text=\u5bf9\u4e0e\u6d4b\u8bd5\u6ca1\u6709\u76f4\u63a5\u5173\u7cfb\u7684\u4efb\u4f55\u6784\u5efa\u6267\u884c\u8df3\u8fc7\u6d4b\u8bd5(&T)
140.17 -MAVEN_RUNTIME_Bundled=\u5df2\u6346\u7ed1
140.18 -# MAVEN_RUNTIME_External={0}
140.19 -MAVEN_RUNTIME_Browse=\u6d4f\u89c8...
140.20 KW_MavenOptions=Maven \u7248\u672c,Maven \u9009\u9879,Maven \u8d44\u6e90\u5e93\u9009\u9879
140.21
141.1 --- a/src/zh_CN/java/maven/maven/org/netbeans/modules/maven/runjar/Bundle_zh_CN.properties Tue Jun 26 07:22:38 2012 +0900
141.2 +++ b/src/zh_CN/java/maven/maven/org/netbeans/modules/maven/runjar/Bundle_zh_CN.properties Tue Jun 26 07:28:03 2012 +0900
141.3 @@ -41,8 +41,8 @@
141.4
141.5
141.6 CTL_AvaialableMainClasses=\u53ef\u7528\u7684\u4e3b\u7c7b(&A):
141.7 +# AD_jMainClassList=N/A
141.8 LBL_ChooseMainClass_NO_CLASSES_NODE=<\u627e\u4e0d\u5230\u4e3b\u7c7b>
141.9 -# AD_jMainClassList=N/A
141.10 LBL_ChooseMainClass_OK=\u9009\u62e9\u4e3b\u7c7b
141.11 LBL_ChooseMainClass_Title=\u4e3a\u6267\u884c\u9009\u62e9\u4e3b\u7c7b
141.12 LBL_ChooseMainClass_WARMUP_MESSAGE=\u6b63\u5728\u521d\u59cb\u5316\u89c6\u56fe, \u8bf7\u7a0d\u5019...
142.1 --- a/src/zh_CN/java/refactoring-java/refactoring-java/org/netbeans/modules/refactoring/java/plugins/Bundle_zh_CN.properties Tue Jun 26 07:22:38 2012 +0900
142.2 +++ b/src/zh_CN/java/refactoring-java/refactoring-java/org/netbeans/modules/refactoring/java/plugins/Bundle_zh_CN.properties Tue Jun 26 07:28:03 2012 +0900
142.3 @@ -156,6 +156,7 @@
142.4 ERR_OuterNameAlreadyUsed=\u540d\u79f0 "{0}" \u5df2\u7528\u4f5c{1}\u4e2d\u5b57\u6bb5\u7684\u540d\u79f0\u3002
142.5 # {0} - File displayname : line number
142.6 WRN_NoAccessor=\u4ece\u4ee5\u4e0b\u9879\u8c03\u7528\u65b9\u6cd5\u65f6\u627e\u4e0d\u5230\u5b58\u53d6\u65b9\u6cd5: {0}
142.7 +WRN_NODEFAULT=\u53c2\u6570{0}\u7684 setter \u662f\u53ef\u9009\u7684, \u4f46\u6ca1\u6709\u9ed8\u8ba4\u503c\u3002
142.8 WRN_OuterNameAlreadyUsed=\u540d\u79f0 "{0}" \u5df2\u7528\u4f5c{1}\u4e2d\u5b57\u6bb5\u7684\u540d\u79f0\u3002
142.9
142.10 # --- USE SUPERTYPE REFACTORING ------------------------------------------------------
142.11 @@ -188,6 +189,7 @@
142.12 ERR_NameNotChanged=\u5c1a\u672a\u5bf9\u540d\u79f0\u8fdb\u884c\u4fee\u6539\u3002\u5c06\u4e0d\u6267\u884c\u4efb\u4f55\u66f4\u6539\u3002
142.13 ERR_InvalidIdentifier="{0}" \u4e0d\u662f\u6709\u6548\u7684 Java \u6807\u8bc6\u7b26\u3002
142.14 ERR_InvalidPackage="{0}" \u4e0d\u662f\u6709\u6548\u7684\u5305\u6807\u8bc6\u7b26\u3002
142.15 +ERR_InvalidFolder="{0}" \u4e0d\u662f\u6709\u6548\u7684\u6587\u4ef6\u5939\u540d\u79f0\u3002
142.16 ERR_PackageExists=\u5305 "{0}" \u5df2\u5b58\u5728\u3002
142.17 ERR_InnerClassClash=\u65e0\u6cd5\u91cd\u547d\u540d\u3002\u7c7b{1}\u4e2d\u5df2\u5b58\u5728\u5185\u90e8\u7c7b{0}\u3002
142.18 ERR_ClassClash=\u65e0\u6cd5\u91cd\u547d\u540d\u3002\u6587\u4ef6\u5939{1}\u4e2d\u5df2\u5b58\u5728\u7c7b{0}\u3002
142.19 @@ -250,6 +252,10 @@
142.20 ERR_EncapsulateInsideConstructor=\u5b57\u6bb5{0}\u7684\u53ef\u8bbf\u95ee\u6027\u662f\u79c1\u6709\u7684, \u4f46\u5374\u4ece\u7c7b{1}\u7684\u6784\u9020\u51fd\u6570\u4e2d\u5bf9\u5176\u8fdb\u884c\u4e86\u5f15\u7528\u3002
142.21 ERR_EncapsulateWrongGetter=getter {0} \u5df2\u5b58\u5728, \u4f46\u662f\u5177\u6709\u9519\u8bef\u7684\u8fd4\u56de\u7c7b\u578b{1}\u3002
142.22 ERR_EncapsulateWrongSetter=setter {0} \u5df2\u5b58\u5728, \u4f46\u662f\u5177\u6709\u9519\u8bef\u7684\u8fd4\u56de\u7c7b\u578b{1}\u3002
142.23 +ERR_EncapsulateAccessGetter=getter {0} \u5c06\u8986\u76d6\u7c7b{1}\u4e2d\u7684\u65b9\u6cd5, \u4f46\u5177\u6709\u8f83\u4f4e\u7684\u8bbf\u95ee\u6743\u9650\u3002
142.24 +ERR_EncapsulateAccessSetter=setter {0} \u5c06\u8986\u76d6\u7c7b{1}\u4e2d\u7684\u65b9\u6cd5, \u4f46\u5177\u6709\u8f83\u4f4e\u7684\u8bbf\u95ee\u6743\u9650\u3002
142.25 +ERR_EncapsulateAccessOverGetter=getter {0} \u5c06\u5728\u7c7b{1}\u4e2d\u4f7f\u7528\u8f83\u4f4e\u7684\u8bbf\u95ee\u6743\u9650\u8986\u76d6\u3002
142.26 +ERR_EncapsulateAccessOverSetter=setter {0} \u5c06\u5728\u7c7b{1}\u4e2d\u4f7f\u7528\u8f83\u4f4e\u7684\u8bbf\u95ee\u6743\u9650\u8986\u76d6\u3002
142.27 ERR_EncapsulateNothingSelected=\u6ca1\u6709\u8981\u5c01\u88c5\u7684\u5185\u5bb9\u3002\u5fc5\u987b\u9009\u62e9\u76f8\u5e94\u7684\u590d\u9009\u6846\u3002
142.28 ERR_EncapsulatePropertyVetoException=Setter \u65b9\u6cd5\u629b\u51fa PropertyVetoException, \u5fc5\u987b\u5bf9\u5176\u8fdb\u884c\u5904\u7406\u3002
142.29
143.1 --- a/src/zh_CN/java/websvc-jaxws21/websvc-jaxws21/org/netbeans/modules/websvc/jaxws21/Bundle_zh_CN.properties Tue Jun 26 07:22:38 2012 +0900
143.2 +++ b/src/zh_CN/java/websvc-jaxws21/websvc-jaxws21/org/netbeans/modules/websvc/jaxws21/Bundle_zh_CN.properties Tue Jun 26 07:28:03 2012 +0900
143.3 @@ -46,5 +46,5 @@
143.4 OpenIDE-Module-Short-Description=\u5b89\u88c5 JAX-WS 2.2 \u5ba2\u6237\u7aef\u5e93
143.5 OpenIDE-Module-Long-Description=\u5b89\u88c5 JAX-WS 2.2 \u5ba2\u6237\u7aef\u5e93
143.6 # library display name
143.7 -#jaxws21=JAX-WS 2.2
143.8 +#jaxws21=JAX-WS 2.2.6
143.9
144.1 --- a/src/zh_CN/javacard/javacard-apdufile/javacard-apdufile/org/netbeans/modules/javacard/apdufile/Bundle_zh_CN.properties Tue Jun 26 07:22:38 2012 +0900
144.2 +++ b/src/zh_CN/javacard/javacard-apdufile/javacard-apdufile/org/netbeans/modules/javacard/apdufile/Bundle_zh_CN.properties Tue Jun 26 07:28:03 2012 +0900
144.3 @@ -1,5 +1,5 @@
144.4 LBL_Apdu_loader_name=APDU \u6587\u4ef6
144.5 -#OpenIDE-Module-Display-Category=Java Card(TM)
144.6 +#OpenIDE-Module-Display-Category=Java Card\u2122
144.7 OpenIDE-Module-Long-Description=\u4e3a Java Card APDU \u811a\u672c (.scr) \u6587\u4ef6\u63d0\u4f9b\u7f16\u8f91\u5668\u652f\u6301
144.8 OpenIDE-Module-Name=Java Card APDU \u6587\u4ef6\u652f\u6301
144.9 OpenIDE-Module-Short-Description=\u4e3a Java Card APDU \u811a\u672c (.scr) \u6587\u4ef6\u63d0\u4f9b\u7f16\u8f91\u5668\u652f\u6301
145.1 --- a/src/zh_CN/javacard/javacard-common/javacard-common/org/netbeans/modules/javacard/common/Bundle_zh_CN.properties Tue Jun 26 07:22:38 2012 +0900
145.2 +++ b/src/zh_CN/javacard/javacard-common/javacard-common/org/netbeans/modules/javacard/common/Bundle_zh_CN.properties Tue Jun 26 07:28:03 2012 +0900
145.3 @@ -1,4 +1,4 @@
145.4 -AIDPanel.pixHint.text OpenIDE-Module-Display-Category=Java Card(TM)
145.5 +#OpenIDE-Module-Display-Category=Java Card\u2122
145.6 OpenIDE-Module-Long-Description=\u4e3a\u591a\u4e2a Java Card \u6a21\u5757\u63d0\u4f9b\u901a\u7528\u4ee3\u7801
145.7 OpenIDE-Module-Name=Java Card \u901a\u7528
145.8 OpenIDE-Module-Short-Description=\u4e3a\u591a\u4e2a Java Card \u6a21\u5757\u63d0\u4f9b\u901a\u7528\u4ee3\u7801
146.1 --- a/src/zh_CN/javacard/javacard-console/javacard-console/org/netbeans/modules/javacard/console/Bundle_zh_CN.properties Tue Jun 26 07:22:38 2012 +0900
146.2 +++ b/src/zh_CN/javacard/javacard-console/javacard-console/org/netbeans/modules/javacard/console/Bundle_zh_CN.properties Tue Jun 26 07:28:03 2012 +0900
146.3 @@ -1,4 +1,4 @@
146.4 -#OpenIDE-Module-Display-Category=Java Card(TM)
146.5 +#OpenIDE-Module-Display-Category=Java Card\u2122
146.6 OpenIDE-Module-Long-Description=\u63d0\u4f9b\u63a7\u5236\u53f0\u7a97\u53e3\u4ee5\u4fbf\u4e0e\u6b63\u8fd0\u884c\u7684 Java Card \u5b9e\u4f8b\u8fdb\u884c\u5b9e\u65f6\u4ea4\u4e92, \u8fd9\u6837\u4fbf\u53ef\u4ee5\u5728\u4e0d\u8fd0\u884c\u811a\u672c\u7684\u60c5\u51b5\u4e0b\u53d1\u9001\u548c\u63a5\u6536\u6570\u636e\u3002
146.7 OpenIDE-Module-Name=Java Card \u63a7\u5236\u53f0
146.8 ACTION_SHOW_CONSOLE=\u6253\u5f00\u63a7\u5236\u53f0
147.1 --- a/src/zh_CN/javacard/javacard-filemodels/javacard-filemodels/com/sun/javacard/Bundle_zh_CN.properties Tue Jun 26 07:22:38 2012 +0900
147.2 +++ b/src/zh_CN/javacard/javacard-filemodels/javacard-filemodels/com/sun/javacard/Bundle_zh_CN.properties Tue Jun 26 07:28:03 2012 +0900
147.3 @@ -52,7 +52,6 @@
147.4 PROBLEM_MAPPING_DOESNT_START_WITH_SLASH={0}\u7684 Servlet \u6620\u5c04\u672a\u4ee5\u5b57\u7b26 / \u5f00\u5934
147.5 PROBLEM_DISPLAY_NAME_NOT_SET=\u672a\u8bbe\u7f6e Web \u5e94\u7528\u7a0b\u5e8f\u663e\u793a\u540d\u79f0
147.6 Null_aid=AID \u4e3a\u7a7a\u6216\u4e3a\u7a7a\u503c
147.7 -Null_aid=AID \u4e3a\u7a7a\u503c
147.8 RID_does_not_have_an_even_number_of_characters=RID \u7684\u5b57\u7b26\u6570\u4e0d\u662f\u5076\u6570
147.9 PIX_does_not_have_an_even_number_of_characters=PIX \u7684\u5b57\u7b26\u6570\u4e0d\u662f\u5076\u6570
147.10 RID_is_not_5_bytes_long=RID \u7684\u957f\u5ea6\u4e0d\u662f 5 \u4e2a\u5b57\u8282
148.1 --- a/src/zh_CN/javacard/javacard-kit/javacard-kit/org/netbeans/modules/javacard/kit/Bundle_zh_CN.properties Tue Jun 26 07:22:38 2012 +0900
148.2 +++ b/src/zh_CN/javacard/javacard-kit/javacard-kit/org/netbeans/modules/javacard/kit/Bundle_zh_CN.properties Tue Jun 26 07:28:03 2012 +0900
148.3 @@ -1,5 +1,5 @@
148.4 -OpenIDE-Module-Display-Category=Java Card(TM)
148.5 +OpenIDE-Module-Display-Category=Java Card(tm)
148.6 OpenIDE-Module-Long-Description=\u4e3a Java Card \u6280\u672f\u63d0\u4f9b\u9879\u76ee\u7c7b\u578b\u548c\u5b8c\u5168\u652f\u6301\u3002
148.7 -#OpenIDE-Module-Name=Java Card(TM)
148.8 +#OpenIDE-Module-Name=Java Card\u2122
148.9 OpenIDE-Module-Short-Description=\u4e3a Java Card \u6280\u672f\u63d0\u4f9b\u652f\u6301
148.10
149.1 --- a/src/zh_CN/javacard/javacard-oberthur/javacard-oberthur/org/netbeans/modules/javacard/oberthur/Bundle_zh_CN.properties Tue Jun 26 07:22:38 2012 +0900
149.2 +++ b/src/zh_CN/javacard/javacard-oberthur/javacard-oberthur/org/netbeans/modules/javacard/oberthur/Bundle_zh_CN.properties Tue Jun 26 07:28:03 2012 +0900
149.3 @@ -1,4 +1,4 @@
149.4 -#OpenIDE-Module-Display-Category=Java Card(TM)
149.5 +#OpenIDE-Module-Display-Category=Java Card\u2122
149.6 OpenIDE-Module-Long-Description=\u53ef\u8ba9 NetBeans Java Card \u6a21\u5757\u5c06 Oberthur \u667a\u80fd\u5361 SDK \u8bc6\u522b\u4e3a Java Card \u5e73\u53f0, \u5e76\u5c06 Java Card \u9879\u76ee\u90e8\u7f72\u5230 Oberthur \u8bbe\u5907\u3002
149.7 OpenIDE-Module-Name=Oberthur Java Card \u5e73\u53f0
149.8 CARD_DISPLAY_NAME=Oberthur \u667a\u80fd\u5361
150.1 --- a/src/zh_CN/javacard/javacard-project/javacard-project/org/netbeans/modules/javacard/Bundle_zh_CN.properties Tue Jun 26 07:22:38 2012 +0900
150.2 +++ b/src/zh_CN/javacard/javacard-project/javacard-project/org/netbeans/modules/javacard/Bundle_zh_CN.properties Tue Jun 26 07:28:03 2012 +0900
150.3 @@ -90,7 +90,6 @@
150.4
150.5 MSG_UNPACKING_RUNTIME=\u5b89\u88c5\u6346\u7ed1\u7684 Java Card(tm) 3 \u8fd0\u884c\u65f6\u73af\u5883
150.6 BUNDLED_RUNTIME_NAME=\u6346\u7ed1\u7684 Java Card 3.0.2 \u8fd0\u884c\u65f6\u73af\u5883
150.7 -OpenIDE-Module-Short-Description=\u6346\u7ed1\u4e86 Java Card 3 \u5f15\u7528\u5b9e\u73b0
150.8 MSG_CHECKING_RUNTIME=\u68c0\u67e5\u662f\u5426\u5b89\u88c5\u4e86\u6346\u7ed1\u7684 Java Card \u8fd0\u884c\u65f6\u73af\u5883
150.9
150.10
151.1 --- a/src/zh_CN/javacard/javacard-project/javacard-project/org/netbeans/modules/javacard/project/customizer/Bundle_zh_CN.properties Tue Jun 26 07:22:38 2012 +0900
151.2 +++ b/src/zh_CN/javacard/javacard-project/javacard-project/org/netbeans/modules/javacard/project/customizer/Bundle_zh_CN.properties Tue Jun 26 07:28:03 2012 +0900
151.3 @@ -190,7 +190,6 @@
151.4 AD_CustomizerSources_projectLocation=\u9879\u76ee\u4f4d\u7f6e
151.5
151.6 WAIT=\u8bf7\u7a0d\u5019...
151.7 -TIP_SERVLET=\u8bbe\u7f6e\u5728\u9879\u76ee\u5c5e\u6027\u7684 Web \u9875\u4e0a\u6240\u4f7f\u7528\u7684 Servlet \u8def\u5f84
151.8 LBL_NO_PLATFORM_SELECTED=[\u672a\u9009\u62e9\u5e73\u53f0]
151.9 NO_DEVICE_SPECIFIED=[\u672a\u6307\u5b9a\u8bbe\u5907]
151.10 MISSING_DEVICE=\u8bbe\u5907\u65e0\u6548: {0}
152.1 --- a/src/zh_CN/javacard/javacard-project/javacard-project/org/netbeans/modules/javacard/project/deps/Bundle_zh_CN.properties Tue Jun 26 07:22:38 2012 +0900
152.2 +++ b/src/zh_CN/javacard/javacard-project/javacard-project/org/netbeans/modules/javacard/project/deps/Bundle_zh_CN.properties Tue Jun 26 07:28:03 2012 +0900
152.3 @@ -10,7 +10,6 @@
152.4 INCLUDE_IN_PROJECT_CLASSES=\u5305\u542b\u5728\u9879\u76ee\u4e2d
152.5 CLASSIC_LIB_JAR=\u4f20\u7edf\u5e93 (\u4ec5 JAR \u6587\u4ef6)
152.6 EXTENSION_LIB_JAR=\u6269\u5c55\u5e93 (\u4ec5 JAR \u6587\u4ef6)
152.7 -INCLUDE_IN_PROJECT_CLASSES=\u590d\u5236\u5230\u9879\u76ee\u7c7b
152.8 ALREADY_ON_CARD.desc=\u4ec5\u5c06\u6b64\u5e93\u7528\u4e8e\u7f16\u8bd1\u548c\u4ee3\u7801\u5b8c\u6210; \u4e0d\u5411\u5361\u4e2d\u90e8\u7f72\u6b64\u5e93\u7684\u4efb\u4f55\u5185\u5bb9\u3002\u53ef\u4ee5\u5c06\u6b64\u9009\u9879\u7528\u4e8e\u5df2\u5185\u7f6e\u5230\u5361\u4e2d\u7684 API
152.9 DEPLOY_TO_CARD.desc=\u5728\u90e8\u7f72\u9879\u76ee\u4e4b\u524d\u5c06\u6b64\u5e93\u90e8\u7f72\u5230\u5361\u4e2d
152.10 INCLUDE_IN_PROJECT_CLASSES.desc=\u5c06\u6b64 JAR \u7684\u7c7b\u5305\u542b\u5728\u9879\u76ee\u4e2d
153.1 --- a/src/zh_CN/javacard/javacard-ri-bundle/javacard-ri-bundle/org/netbeans/modules/javacard/ri/bundle/Bundle_zh_CN.properties Tue Jun 26 07:22:38 2012 +0900
153.2 +++ b/src/zh_CN/javacard/javacard-ri-bundle/javacard-ri-bundle/org/netbeans/modules/javacard/ri/bundle/Bundle_zh_CN.properties Tue Jun 26 07:28:03 2012 +0900
153.3 @@ -1,4 +1,4 @@
153.4 -#OpenIDE-Module-Display-Category=Java Card(TM)
153.5 +#OpenIDE-Module-Display-Category=Java Card\u2122
153.6 OpenIDE-Module-Long-Description=\u4e3a\u5f00\u53d1 Java Card \u9879\u76ee\u63d0\u4f9b\u4e86 Java Card 3.0.2 \u5f15\u7528\u5b9e\u73b0\u7684\u5185\u7f6e\u526f\u672c
153.7 OpenIDE-Module-Name=Java Card \u8fd0\u884c\u65f6\u5305
153.8 OpenIDE-Module-Short-Description=\u6346\u7ed1\u4e86 Java Card 3 \u5f15\u7528\u5b9e\u73b0
154.1 --- a/src/zh_CN/javacard/javacard-ri-platform/javacard-ri-platform/org/netbeans/modules/javacard/ri/platform/Bundle_zh_CN.properties Tue Jun 26 07:22:38 2012 +0900
154.2 +++ b/src/zh_CN/javacard/javacard-ri-platform/javacard-ri-platform/org/netbeans/modules/javacard/ri/platform/Bundle_zh_CN.properties Tue Jun 26 07:28:03 2012 +0900
154.3 @@ -1,4 +1,4 @@
154.4 -#OpenIDE-Module-Display-Category=Java Card(TM)
154.5 +#OpenIDE-Module-Display-Category=Java Card\u2122
154.6 OpenIDE-Module-Long-Description=\u4f7f\u60a8\u53ef\u4ee5\u5728\u201c\u5de5\u5177 > Java \u5e73\u53f0\u201d\u4e2d\u5c06 Java Card \u5f15\u7528\u5b9e\u73b0\u8bbe\u7f6e\u4e3a Java \u5e73\u53f0, \u5e76\u5728 Java Card \u9879\u76ee\u4e2d\u4f7f\u7528\u8be5\u5e73\u53f0\u3002
154.7 OpenIDE-Module-Name=Java Card RI \u5e73\u53f0
154.8 OpenIDE-Module-Short-Description=\u652f\u6301\u5c06 Java Card \u5f15\u7528\u5b9e\u73b0\u7528\u4f5c Java \u5e73\u53f0
155.1 --- a/src/zh_CN/javacard/javacard-ri-platform/javacard-ri-platform/org/netbeans/modules/javacard/ri/platform/loader/Bundle_zh_CN.properties Tue Jun 26 07:22:38 2012 +0900
155.2 +++ b/src/zh_CN/javacard/javacard-ri-platform/javacard-ri-platform/org/netbeans/modules/javacard/ri/platform/loader/Bundle_zh_CN.properties Tue Jun 26 07:28:03 2012 +0900
155.3 @@ -46,7 +46,6 @@
155.4 PlatformCustomizerPanel.javadocPanel.TabConstraints.tabTitle=Javadoc
155.5 PlatformCustomizerPanel.antNameLabel.text=Ant \u540d\u79f0
155.6 PlatformCustomizerPanel.antNameField.text=
155.7 -MSG_INVALID_PLATFORM=[\u5df2\u5220\u9664\u6216\u91cd\u547d\u540d\u5e73\u53f0\u6587\u4ef6]
155.8 PathPropertyForm.addJarButton.text=\u6dfb\u52a0 JAR/\u6587\u4ef6\u5939(&J)
155.9 PathPropertyForm.removeButton.text=\u5220\u9664(&R)
155.10 TTL_ADD_JAR_OR_FOLDER=\u6dfb\u52a0 Jar \u6216\u6587\u4ef6\u5939
156.1 --- a/src/zh_CN/javacard/javacard-spi/javacard-spi/org/netbeans/modules/javacard/spi/Bundle_zh_CN.properties Tue Jun 26 07:22:38 2012 +0900
156.2 +++ b/src/zh_CN/javacard/javacard-spi/javacard-spi/org/netbeans/modules/javacard/spi/Bundle_zh_CN.properties Tue Jun 26 07:28:03 2012 +0900
156.3 @@ -1,4 +1,4 @@
156.4 -#OpenIDE-Module-Display-Category=Java Card(TM)
156.5 +#OpenIDE-Module-Display-Category=Java Card\u2122
156.6 OpenIDE-Module-Long-Description=\u7528\u4e8e\u96c6\u6210 Java Card \u8fd0\u884c\u65f6\u73af\u5883\u7684 API
156.7 OpenIDE-Module-Name=Java Card SPI
156.8 MSG_UNKNOWN_VENDOR=\u4f9b\u5e94\u5546\u672a\u77e5
157.1 --- a/src/zh_CN/javafx/javafx2-project/javafx2-project/org/netbeans/modules/javafx2/project/Bundle_zh_CN.properties Tue Jun 26 07:22:38 2012 +0900
157.2 +++ b/src/zh_CN/javafx/javafx2-project/javafx2-project/org/netbeans/modules/javafx2/project/Bundle_zh_CN.properties Tue Jun 26 07:28:03 2012 +0900
157.3 @@ -251,14 +251,15 @@
157.4 #COMMENT_use_preloader=This project uses Preloader
157.5 #COMMENT_dontuse_preloader=This project does not use Preloader
157.6 #COMMENT_javafx=This is a JavaFX project
157.7 -#COMMENT_oldjnlp=Pre-JavaFX 2.0 WebStart is deactivated in JavaFX 2.0 projects
157.8 -#COMMENT_oldjar=Non-JavaFX 2.0 jar file creation is deactivated in JavaFX 2.0 projects
157.9 +#COMMENT_oldjnlp=Pre-JavaFX 2.0 WebStart is deactivated in JavaFX 2.0+ projects
157.10 +#COMMENT_oldjar=Non-JavaFX jar file creation is deactivated in JavaFX 2.0+ projects
157.11 #COMMENT_prepreloader=Preloader can not use a preloader
157.12 #COMMENT_updatemode=If true, application update mode is set to 'background', if false, update mode is set to 'eager'
157.13 #COMMENT_updatemode_swing=If true, application update mode is set to 'background', if false, update mode is set to 'always'
157.14 #COMMENT_app_args=Do not set application arguments here, this property is re-generated from javafx.param.* properties
157.15 #COMMENT_rebase_libs=Set true for GlassFish only. Rebases manifest classpaths of JARs in lib dir. Not usable with signed JARs.
157.16 #COMMENT_run_as_defaults=Do not modify this property in this configuration. It can be re-generated.
157.17 +COMMENT_endorsed_ant_classpath=\u9664\u975e\u6b63\u5728\u5b9a\u5236 JavaFX Ant \u4efb\u52a1\u57fa\u7840\u7ed3\u6784, \u5426\u5219\u65e0\u9700\u4fee\u6539\u6b64\u5c5e\u6027
157.18
157.19 NAME_src.dir=\u6e90\u5305
157.20 NAME_test.src.dir=\u6d4b\u8bd5\u5305
157.21 @@ -349,3 +350,8 @@
157.22 ConfigureFXMLCSSPanelVisual.chooseButton.AccessibleContext.accessibleDescription=\u6d4f\u89c8\u73b0\u6709\u7ea7\u8054\u6837\u5f0f\u8868
157.23 ConfigureFXMLCSSPanelVisual.fileLabel.AccessibleContext.accessibleDescription=\u6240\u9009\u7ea7\u8054\u6837\u5f0f\u8868\u6587\u4ef6\u7684\u5b8c\u6574\u8def\u5f84\u6587\u4ef6\u540d
157.24
157.25 +WARN_PreloaderExecutionUnsupported=JavaFX 2 \u9884\u52a0\u8f7d\u5668\u65e0\u6cd5\u76f4\u63a5\u6267\u884c\u3002\n\u8bf7\u6539\u4e3a\u6267\u884c\u4f7f\u7528\u6b64\u9884\u52a0\u8f7d\u5668\u7684 JavaFX \u5e94\u7528\u7a0b\u5e8f\u3002
157.26 +WARN_SingleFileExecutionUnsupportedDialogTitle=JavaFX \u542f\u52a8...
157.27 +WARN_SingleFileExecutionUnsupported=JavaFX 2 \u542f\u52a8\u6a21\u578b\u4e0d\u652f\u6301\u5355\u4e2a\u6587\u4ef6\u6267\u884c\u3002\n\u662f\u5426\u7ee7\u7eed\u6267\u884c\u9879\u76ee{0}?
157.28 +WARN_Issue204880=\u65e0\u6cd5\u521b\u5efa\u9879\u76ee\u3002\n\u53ef\u80fd\u7684\u539f\u56e0\u662f\u6309\u9700\u542f\u7528\u529f\u80fd\u521d\u59cb\u5316\u672a\u5b8c\u6210\u3002\u8bf7\u91cd\u8bd5\u521b\u5efa\u9879\u76ee\u3002
157.29 +
158.1 --- a/src/zh_CN/javafx/javafx2-project/javafx2-project/org/netbeans/modules/javafx2/project/ui/Bundle_zh_CN.properties Tue Jun 26 07:22:38 2012 +0900
158.2 +++ b/src/zh_CN/javafx/javafx2-project/javafx2-project/org/netbeans/modules/javafx2/project/ui/Bundle_zh_CN.properties Tue Jun 26 07:28:03 2012 +0900
158.3 @@ -2,7 +2,7 @@
158.4 LBL_Category_Run=\u8fd0\u884c
158.5 LBL_Select_Icon_Image=\u9009\u62e9\u56fe\u6807\u56fe\u50cf
158.6 LBL_Select_HTML_File=\u9009\u62e9 HTML \u6587\u4ef6
158.7 -LBL_ChooseMainClass_Title=\u6d4f\u89c8 JavaFX 2.0 \u5e94\u7528\u7a0b\u5e8f\u7c7b
158.8 +LBL_ChooseMainClass_Title=\u6d4f\u89c8 JavaFX \u5e94\u7528\u7a0b\u5e8f\u7c7b
158.9 LBL_ChooseMainClass_Title_Swing=\u6d4f\u89c8\u4e3b\u7c7b
158.10 LBL_ChooseMainClass_OK=\u9009\u62e9\u7c7b
158.11 LBL_ChooseMainClass_SCANNING_MESSAGE=\u6b63\u5728\u8fdb\u884c\u626b\u63cf, \u5df2\u663e\u793a\u90e8\u5206\u7ed3\u679c...
158.12 @@ -51,7 +51,7 @@
158.13
158.14 JFXRunPanel.applicationParams.name=\u540d\u79f0
158.15 JFXRunPanel.applicationParams.value=\u503c
158.16 -TITLE_ApplicationParameters=JavaFX 2.0 \u5e94\u7528\u7a0b\u5e8f\u53c2\u6570
158.17 +TITLE_ApplicationParameters=JavaFX \u5e94\u7528\u7a0b\u5e8f\u53c2\u6570
158.18 LBL_JFXApplicationParametersPanel.labelParams.text=\u5e94\u7528\u7a0b\u5e8f\u53c2\u6570(&P)
158.19 # AD_JFXApplicationParametersPanel.labelParams.text=N/A
158.20 AN_JFXApplicationParametersPanel.labelParams.text=\u5e94\u7528\u7a0b\u5e8f\u53c2\u6570(&P)
158.21 @@ -113,6 +113,9 @@
158.22 AN_JFXDeploymentPanel.buttonDownloadMode.text=\u7f16\u8f91(&T)...
158.23
158.24 JFXConfigurationProvider.default.label=<\u9ed8\u8ba4\u914d\u7f6e>
158.25 +JFXConfigurationProvider.standalone.label=\u72ec\u7acb\u8fd0\u884c
158.26 +JFXConfigurationProvider.webstart.label=\u4ee5 WebStart \u65b9\u5f0f\u8fd0\u884c
158.27 +JFXConfigurationProvider.browser.label=\u5728\u6d4f\u89c8\u5668\u4e2d\u8fd0\u884c
158.28 JFXConfigurationProvider.input.prompt=\u914d\u7f6e\u540d\u79f0(&N):
158.29 JFXConfigurationProvider.input.title=\u521b\u5efa\u65b0\u7684\u914d\u7f6e
158.30 # {0} - name of configuration
158.31 @@ -150,7 +153,7 @@
158.32 AN_JFXSigningPanel.labelKeyPassword.text=\u5bc6\u94a5\u53e3\u4ee4(&W):
158.33 JFXSigningPanel.passwordFieldKey.text=\u4f2a
158.34 TITLE_JFXSigningPanel=\u7b7e\u540d
158.35 -MSG_SigningGenerated=\u4f7f\u7528\u751f\u6210\u7684\u5bc6\u94a5\u81ea\u7b7e\u540d
158.36 +MSG_SigningGenerated=\u81ea\u7b7e\u540d
158.37 MSG_SigningKey=\u4f7f\u7528{0}\u7b7e\u540d
158.38 MSG_SigningUnsigned=\u672a\u7b7e\u540d
158.39 TITLE_KeystoreBrowser=\u6d4f\u89c8\u5bc6\u94a5\u5e93
158.40 @@ -169,7 +172,7 @@
158.41 LBL_JFXJavaScriptCallbacksPanel.labelCallbacks.text=JavaScript \u56de\u8c03(&C):
158.42 # AD_JFXJavaScriptCallbacksPanel.labelCallbacks.text=N/A
158.43 AN_JFXJavaScriptCallbacksPanel.labelCallbacks.text=JavaScript \u56de\u8c03(&C):
158.44 -TXT_JSCallbacks=\u7ba1\u7406 JavaFX 2.0 JavaScript \u56de\u8c03
158.45 +TXT_JSCallbacks=\u7ba1\u7406 JavaFX JavaScript \u56de\u8c03
158.46 JFXJavaScriptCallbacksPanel.tableCallbacks.columnModel.title0=\u56de\u8c03
158.47 JFXJavaScriptCallbacksPanel.tableCallbacks.columnModel.title1=\u5b9a\u4e49
158.48 MSG_CallbacksDefinedNone=\u672a\u5b9a\u4e49
159.1 --- a/src/zh_CN/javafx/javafx2-samples/javafx2-samples/org/netbeans/modules/javafx2/samples/Bundle_zh_CN.properties Tue Jun 26 07:22:38 2012 +0900
159.2 +++ b/src/zh_CN/javafx/javafx2-samples/javafx2-samples/org/netbeans/modules/javafx2/samples/Bundle_zh_CN.properties Tue Jun 26 07:28:03 2012 +0900
159.3 @@ -109,4 +109,5 @@
159.4 WARN_PanelOptionsVisual.creatingDefaultFXPlatform=<html><b>\u627e\u4e0d\u5230 JavaFX \u5e73\u53f0\u3002</b><br>\u6b63\u5728\u5c1d\u8bd5\u81ea\u52a8\u521b\u5efa\u9ed8\u8ba4 JavaFX \u5e73\u53f0, \u8bf7\u7a0d\u5019...<html>
159.5 WARN_PanelOptionsVisual.notFXPlatform=<html><b>\u627e\u4e0d\u5230 Java \u5e73\u53f0\u3002</b><br>\u8bf7\u521b\u5efa\u975e\u9ed8\u8ba4 Java SE \u5e73\u53f0, \u7136\u540e\u8f6c\u81f3 JavaFX \u6807\u7b7e,<br>\u542f\u7528 JavaFX \u5e76\u586b\u5199\u6307\u5411 JavaFX SDK \u548c JavaFX RT \u7684\u8def\u5f84\u3002<br>\u53ef\u4ee5\u4ece <a href='http://www.oracle.com/technetwork/java/javafx/downloads'>JavaFX Web \u7ad9\u70b9</a>\u4e0b\u8f7d JavaFX SDK\u3002<html>
159.6 LBL_PanelOptions_Manage_Button=\u7ba1\u7406\u5e73\u53f0...
159.7 +WARN_Issue204880=\u7531\u4e8e\u5411\u5bfc\u5c5e\u6027\u521d\u59cb\u5316\u5ef6\u8fdf, \u53ef\u80fd\u65e0\u6cd5\u521b\u5efa\u9879\u76ee\u3002\n\u8bf7\u91cd\u8bd5\u521b\u5efa\u9879\u76ee\u3002
159.8
160.1 --- a/src/zh_CN/mobility/mobility-cldcplatform/mobility-cldcplatform/org/netbeans/modules/mobility/cldcplatform/wizard/Bundle_zh_CN.properties Tue Jun 26 07:22:38 2012 +0900
160.2 +++ b/src/zh_CN/mobility/mobility-cldcplatform/mobility-cldcplatform/org/netbeans/modules/mobility/cldcplatform/wizard/Bundle_zh_CN.properties Tue Jun 26 07:28:03 2012 +0900
160.3 @@ -147,5 +147,4 @@
160.4 ###############################
160.5 TXT_PlatformFolder=Java ME \u5e73\u53f0
160.6 AD_LocationChooser=Java ME \u5e73\u53f0\u9009\u62e9\u5668
160.7 -LBL_FindPanel_Search=\u9009\u62e9
160.8
161.1 --- a/src/zh_CN/mobility/mobility-end2end/mobility-end2end/org/netbeans/modules/mobility/e2e/mapping/Bundle_zh_CN.properties Tue Jun 26 07:22:38 2012 +0900
161.2 +++ b/src/zh_CN/mobility/mobility-end2end/mobility-end2end/org/netbeans/modules/mobility/e2e/mapping/Bundle_zh_CN.properties Tue Jun 26 07:28:03 2012 +0900
161.3 @@ -51,7 +51,7 @@
161.4 MSG_DestinationFolderCreation=\u521b\u5efa\u76ee\u6807\u6587\u4ef6\u5939 {0}...
161.5 MSG_FailFolderCreation=\u65e0\u6cd5\u521b\u5efa\u6587\u4ef6\u5939 {0}\u3002
161.6 MSG_BeanFileCreation=\u521b\u5efa Bean Java \u6587\u4ef6{0}...
161.7 -MSG_BeanFileCreation=\u65e0\u6cd5\u521b\u5efa Bean \u6587\u4ef6{0}\u3002
161.8 +MSG_FailBeanCreation=\u65e0\u6cd5\u521b\u5efa Bean \u6587\u4ef6{0}\u3002
161.9 MSG_GenerateBean=\u751f\u6210 Bean \u6587\u4ef6{0}...
161.10 MSG_ConfigureBindings=\u914d\u7f6e\u7ed1\u5b9a...
161.11 MSG_FailGenerateBean=\u672a\u80fd\u751f\u6210 Bean \u7c7b{0}\u3002
162.1 --- a/src/zh_CN/mobility/mobility-midpexamples/mobility-midpexamples/org/netbeans/modules/mobility/midpexamples/Bundle_zh_CN.properties Tue Jun 26 07:22:38 2012 +0900
162.2 +++ b/src/zh_CN/mobility/mobility-midpexamples/mobility-midpexamples/org/netbeans/modules/mobility/midpexamples/Bundle_zh_CN.properties Tue Jun 26 07:28:03 2012 +0900
162.3 @@ -59,10 +59,8 @@
162.4 Templates/Project/Samples/JAVA_ME/BluetoothDemo.zip=\u84dd\u7259\u6f14\u793a (MIDP)
162.5 Templates/Project/Samples/JAVA_ME/CityGuide.zip=\u57ce\u5e02\u6307\u5357 (MIDP)
162.6 Templates/Project/Samples/JAVA_ME/CurrencyConverter.zip=\u8d27\u5e01\u8f6c\u6362\u5668 (MIDP)
162.7 -Templates/Project/Samples/JAVA_ME/GameBuilderDemo.zip=\u4f7f\u7528\u6e38\u620f\u6784\u5efa\u5668\u521b\u5efa\u7684\u7b80\u5355\u6e38\u620f (MIDP)
162.8 Templates/Project/Samples/JAVA_ME/I18nDemo.zip=I18n \u6f14\u793a (MIDP)
162.9 Templates/Project/Samples/JAVA_ME/JSR172Demo.zip=JSR172 \u6f14\u793a (MIDP)
162.10 -Templates/Project/Samples/JAVA_ME/LocalizationDemo.zip=\u672c\u5730\u5316\u652f\u6301\u793a\u4f8b (MIDP)
162.11 Templates/Project/Samples/JAVA_ME/MMAPIDemos.zip=MMAPI \u6f14\u793a (MIDP)
162.12 Templates/Project/Samples/JAVA_ME/NetworkDemo.zip=\u7f51\u7edc\u6f14\u793a (MIDP)
162.13 Templates/Project/Samples/JAVA_ME/ObexDemo.zip=Obex \u6f14\u793a (MIDP)
162.14 @@ -76,6 +74,4 @@
162.15 Templates/Project/Samples/JAVA_ME/SVGDemo.zip=SVG \u6f14\u793a (MIDP)
162.16 Templates/Project/Samples/JAVA_ME/UIDemo.zip=UI \u6f14\u793a (MIDP)
162.17 Templates/Project/Samples/JAVA_ME/WMADemo.zip=WMA \u6f14\u793a (MIDP)
162.18 -Templates/Project/Samples/JAVA_ME/VDCustomComponents.zip=\u53ef\u89c6\u8bbe\u8ba1\u5668\u5b9a\u5236\u7ec4\u4ef6 (MIDP)
162.19
162.20 -
163.1 --- a/src/zh_CN/mobility/mobility-project/mobility-project/org/netbeans/modules/mobility/project/Bundle_zh_CN.properties Tue Jun 26 07:22:38 2012 +0900
163.2 +++ b/src/zh_CN/mobility/mobility-project/mobility-project/org/netbeans/modules/mobility/project/Bundle_zh_CN.properties Tue Jun 26 07:28:03 2012 +0900
163.3 @@ -78,8 +78,6 @@
163.4 MSG_NO_BUILD_SCRIPT=\u7f3a\u5c11\u6784\u5efa\u811a\u672c
163.5
163.6 UserConfigurationTemplatesProvider=\u7528\u6237\u4fdd\u5b58\u7684\u9879\u76ee\u914d\u7f6e\u6a21\u677f
163.7 -#following suffix must be valid Java identifier (even localized) !!!
163.8 -#LBL_Cfg_TemplateSuffix=_template
163.9
163.10 EmptyConfigurationTemplate=<\u7a7a\u9879\u76ee\u914d\u7f6e>
163.11
164.1 --- a/src/zh_CN/nb/autoupdate-pluginimporter/autoupdate-pluginimporter/org/netbeans/modules/autoupdate/pluginimporter/libinstaller/Bundle_zh_CN.properties Tue Jun 26 07:22:38 2012 +0900
164.2 +++ b/src/zh_CN/nb/autoupdate-pluginimporter/autoupdate-pluginimporter/org/netbeans/modules/autoupdate/pluginimporter/libinstaller/Bundle_zh_CN.properties Tue Jun 26 07:28:03 2012 +0900
164.3 @@ -39,9 +39,15 @@
164.4 # Portions Copyrighted 2011 Sun Microsystems, Inc.
164.5
164.6 accept_button=\u4e0b\u8f7d\u5e76\u5b89\u88c5 JUnit
164.7 +cancel=\u53d6\u6d88
164.8 download_handle=\u4e0b\u8f7d JUnit
164.9 download_question=\u662f\u5426\u5e0c\u671b\u7acb\u5373\u4e0b\u8f7d\u5e76\u5b89\u88c5 JUnit \u6d4b\u8bd5\u5e93? \u5efa\u8bae\u5728\u8fdb\u884c Java \u5f00\u53d1\u65f6\u6267\u884c\u6b64\u64cd\u4f5c, \u4f46 JUnit \u4e0d\u4f1a\u968f NetBeans \u4e00\u8d77\u5206\u53d1\u3002
164.10 download_title=\u5b89\u88c5 JUnit \u5e93
164.11 install_handle=\u5b89\u88c5 JUnit
164.12 +installAnyway=\u4ecd\u8981\u5b89\u88c5
164.13 +showDetails=\u663e\u793a\u8be6\u7ec6\u4fe1\u606f
164.14 validate_handle=\u5b89\u88c5 JUnit
164.15 +warning=\u5199\u5165\u6743\u9650\u95ee\u9898
164.16 +writePermission=\u60a8\u6ca1\u6709\u5728\u5efa\u8bae\u7684\u5b89\u88c5\u76ee\u5f55\u4e2d\u5b89\u88c5 JUnit \u5e93\u7684\u6743\u9650\u3002
164.17 +writePermissionDetails=<html>\u60a8\u6ca1\u6709\u5728\u5efa\u8bae\u7684\u5b89\u88c5\u76ee\u5f55\u4e2d\u5b89\u88c5 JUnit \u5e93\u7684\u6743\u9650\u3002<br><br>\u8981\u5728\u5171\u4eab\u76ee\u5f55\u4e2d\u6267\u884c\u5b89\u88c5, \u5e94\u5f53\u4ee5\u5177\u6709\u7ba1\u7406<br>\u6743\u9650\u7684\u7528\u6237\u8eab\u4efd\u8fd0\u884c IDE, \u6216\u8005\u5c06 JUnit \u5e93\u5b89\u88c5\u5230\u7528\u6237\u76ee\u5f55\u4e2d\u3002
164.18
165.1 --- a/src/zh_CN/nb/org-netbeans-modules-welcome.nbm/netbeans/docs/GUIExamplesDescription_zh_CN.html Tue Jun 26 07:22:38 2012 +0900
165.2 +++ b/src/zh_CN/nb/org-netbeans-modules-welcome.nbm/netbeans/docs/GUIExamplesDescription_zh_CN.html Tue Jun 26 07:28:03 2012 +0900
165.3 @@ -26,7 +26,7 @@
165.4 <br>
165.5
165.6 <h2>联系人编辑器</h2>
165.7 -<p>此复杂窗体类似于通常用于显示和编缉数据库信息的 Windows 对话框。此示例说明了各种 GUI 构建器功能, 其中包括对齐, 锚点, 调整大小, 缩排以及运行时自动调整大小行为。要查看详细教程 (包括说明如何构建此窗体的动画演示), 请参见<a href="http://netbeans.org/kb/60/java/quickstart-gui.html">在 NetBeans IDE 中设计 Swing GUI</a>。</p>
165.8 +<p>此复杂窗体类似于通常用于显示和编缉数据库信息的 Windows 对话框。此示例说明了各种 GUI 构建器功能, 其中包括对齐, 锚点, 调整大小, 缩进以及运行时自动调整大小行为。要查看详细教程 (包括说明如何构建此窗体的动画演示), 请参见<a href="http://netbeans.org/kb/60/java/quickstart-gui.html">在 NetBeans IDE 中设计 Swing GUI</a>。</p>
165.9
165.10 <br>
165.11
166.1 --- a/src/zh_CN/nb/uihandler/uihandler/org/netbeans/modules/uihandler/Bundle_zh_CN.properties Tue Jun 26 07:22:38 2012 +0900
166.2 +++ b/src/zh_CN/nb/uihandler/uihandler/org/netbeans/modules/uihandler/Bundle_zh_CN.properties Tue Jun 26 07:28:03 2012 +0900
166.3 @@ -145,7 +145,7 @@
166.4 Metrics_title=\u4f7f\u7528\u60c5\u51b5\u7edf\u8ba1\u4fe1\u606f
166.5 LBL_BottomText1=<html>\u901a\u8fc7\u63d0\u4f9b\u533f\u540d\u4f7f\u7528\u6570\u636e, \u5e2e\u52a9\u6211\u4eec\u6539\u8fdb NetBeans IDE\u3002</html>
166.6 LBL_BottomText2=<html>\u5982\u679c\u60a8\u540c\u610f\u53c2\u4e0e, \u5219 IDE \u4f1a\u5c06\u6709\u5173\u60a8\u6240\u4f7f\u7528\u7684\u9ad8\u7ea7\u529f\u80fd\u7684\u533f\u540d\u4fe1\u606f\u53d1\u9001\u5230\u4f4d\u4e8e netbeans.org \u7684\u4e00\u4e2a\u6570\u636e\u5e93\u3002</html>
166.7 -LBL_BottomText3=<html>\u4f7f\u7528\u60c5\u51b5\u7edf\u8ba1\u4fe1\u606f\u53ef\u5e2e\u52a9\u6211\u4eec\u66f4\u597d\u5730\u4e86\u89e3\u7528\u6237\u7684\u9700\u6c42, \u5e76\u4f1a\u5728\u5c06\u6765\u7684\u53d1\u884c\u7248\u4e2d\u4f18\u5148\u6539\u8fdb\u3002\u6211\u4eec\u51b3\u4e0d\u4f1a\u5bf9\u6536\u96c6\u7684\u6570\u636e\u6267\u884c\u9006\u5411\u5de5\u7a0b\u4ee5\u4e86\u89e3\u6709\u5173\u60a8\u7684\u9879\u76ee\u7684\u7279\u5b9a\u8be6\u7ec6\u4fe1\u606f\u3002</html>
166.8 +LBL_BottomText3=<html>\u4f7f\u7528\u60c5\u51b5\u7edf\u8ba1\u4fe1\u606f\u53ef\u5e2e\u52a9\u6211\u4eec\u66f4\u597d\u5730\u4e86\u89e3\u7528\u6237\u7684\u9700\u6c42, \u5e76\u4f1a\u5728\u5c06\u6765\u7684\u53d1\u884c\u7248\u4e2d\u4f18\u5148\u6539\u8fdb\u3002\u6211\u4eec\u51b3\u4e0d\u4f1a\u5bf9\u6536\u96c6\u7684\u6570\u636e\u6267\u884c\u9006\u5411\u5de5\u7a0b\u4ee5\u4e86\u89e3\u6709\u5173\u60a8\u9879\u76ee\u7684\u7279\u5b9a\u8be6\u7ec6\u4fe1\u606f\u3002</html>
166.9
166.10 LBL_MetricsEnable=\u6211\u540c\u610f
166.11 ACSN_MetricsEnable=\u542f\u7528\u4f7f\u7528\u60c5\u51b5\u7edf\u8ba1\u4fe1\u606f
167.1 --- a/src/zh_CN/other/installer/components/products/nb-javacard/data/Bundle_zh_CN.properties Tue Jun 26 07:22:38 2012 +0900
167.2 +++ b/src/zh_CN/other/installer/components/products/nb-javacard/data/Bundle_zh_CN.properties Tue Jun 26 07:28:03 2012 +0900
167.3 @@ -37,6 +37,6 @@
167.4 # holder.
167.5 #
167.6
167.7 -product.display.name=Java Card(TM) 3 Connected
167.8 +product.display.name=Java Card(tm) 3 Connected
167.9 product.description=\u7528\u4e8e\u521b\u5efa Java Card Connected 3 Servlet, \u6269\u5c55\u5c0f\u5e94\u7528\u7a0b\u5e8f\u548c\u4f20\u7edf\u5c0f\u5e94\u7528\u7a0b\u5e8f\u7684\u7efc\u5408\u5de5\u5177\u96c6 (\u5411\u540e\u517c\u5bb9 Java Card 2.2.x \u548c Java Card Classic)\u3002\u5305\u62ec\u8c03\u8bd5\u529f\u80fd\u548c\u591a Java Card \u5e73\u53f0/\u8bbe\u5907\u521b\u5efa\u529f\u80fd, \u5e76\u4e14\u53ef\u4e0e\u516c\u5f00\u53d1\u5e03\u7684 Java Card \u5f15\u7528\u5b9e\u73b0\u5f88\u597d\u5730\u914d\u5408\u4f7f\u7528\u3002
167.10
168.1 --- a/src/zh_CN/other/installer/mac/newbuild/dmg/Resources/Welcome-jdk_zh_CN.html Tue Jun 26 07:22:38 2012 +0900
168.2 +++ b/src/zh_CN/other/installer/mac/newbuild/dmg/Resources/Welcome-jdk_zh_CN.html Tue Jun 26 07:28:03 2012 +0900
168.3 @@ -6,7 +6,7 @@
168.4 </head>
168.5 <body>
168.6
168.7 -<h3>系统将指导您完成安装 JDK 7 Update 4 以及 NetBeans IDE 所必需的步骤。</h3>
168.8 +<h3>系统将指导您完成安装 JDK 7 Update 5 以及 NetBeans IDE 所必需的步骤。</h3>
168.9
168.10 </body>
168.11 </html>
169.1 --- a/src/zh_CN/other/nbi/engine/native/launcher/windows/i18n/launcher_zh_CN.properties Tue Jun 26 07:22:38 2012 +0900
169.2 +++ b/src/zh_CN/other/nbi/engine/native/launcher/windows/i18n/launcher_zh_CN.properties Tue Jun 26 07:28:03 2012 +0900
169.3 @@ -37,7 +37,7 @@
169.4 # holder.
169.5 #
169.6
169.7 -nlw.jvm.notfoundmessage=\u5728\u6b64\u8ba1\u7b97\u673a\u4e2d\u627e\u4e0d\u5230 Java SE \u5f00\u53d1\u5de5\u5177\u5305 (JDK)\n\u9700\u8981 JDK 6 \u624d\u80fd\u5b89\u88c5 NetBeans IDE\u3002\u8bf7\u786e\u4fdd\u6b63\u786e\u5b89\u88c5\u4e86 JDK, \u7136\u540e\u91cd\u65b0\u8fd0\u884c\u5b89\u88c5\u7a0b\u5e8f\u3002\u60a8\u53ef\u4ee5\u4f7f\u7528{0}\u5b89\u88c5\u7a0b\u5e8f\u53c2\u6570\u6765\u6307\u5b9a\u6709\u6548\u7684 JDK \u4f4d\u7f6e\u3002\n\n\u8981\u4e0b\u8f7d JDK, \u8bf7\u8bbf\u95ee http://www.oracle.com/technetwork/java/javase/downloads
169.8 +nlw.jvm.notfoundmessage=\u5728\u6b64\u8ba1\u7b97\u673a\u4e2d\u627e\u4e0d\u5230 Java SE \u5f00\u53d1\u5de5\u5177\u5305 (JDK)\n\u9700\u8981 JDK 6 \u6216\u66f4\u9ad8\u7248\u672c\u624d\u80fd\u5b89\u88c5 NetBeans IDE\u3002\u8bf7\u786e\u4fdd\u6b63\u786e\u5b89\u88c5\u4e86 JDK, \u7136\u540e\u91cd\u65b0\u8fd0\u884c\u5b89\u88c5\u7a0b\u5e8f\u3002\u60a8\u53ef\u4ee5\u4f7f\u7528{0}\u5b89\u88c5\u7a0b\u5e8f\u53c2\u6570\u6765\u6307\u5b9a\u6709\u6548\u7684 JDK \u4f4d\u7f6e\u3002\n\n\u8981\u4e0b\u8f7d JDK, \u8bf7\u8bbf\u95ee http://www.oracle.com/technetwork/java/javase/downloads
169.9 nlw.jvm.usererror=\u672a\u627e\u5230 Java \u8fd0\u884c\u65f6\u73af\u5883 (JRE)\n\u5728\u6307\u5b9a\u7684\u4f4d\u7f6e {0} \u627e\u4e0d\u5230 JRE
169.10 nlw.jvm.unsupportedversion=\u4e0d\u652f\u6301\u7684 Java VM \u7248\u672c\n\u4f4d\u4e8e{0}\u7684 Java VM \u7248\u672c\u4e0d\u53d7\u652f\u6301
169.11 nlw.freespace=\u6ca1\u6709\u8db3\u591f\u7684\u53ef\u7528\u78c1\u76d8\u7a7a\u95f4\u6765\u89e3\u538b\u7f29\u5b89\u88c5\u6570\u636e\n\u4e34\u65f6\u6587\u4ef6\u5939\u4e2d\u9700\u8981 {0} MB \u7684\u53ef\u7528\u78c1\u76d8\u7a7a\u95f4\u3002\u8bf7\u6e05\u7406\u78c1\u76d8\u7a7a\u95f4, \u7136\u540e\u518d\u6b21\u8fd0\u884c\u5b89\u88c5\u7a0b\u5e8f\u3002\u60a8\u53ef\u4ee5\u4f7f\u7528{1}\u5b89\u88c5\u7a0b\u5e8f\u53c2\u6570\u6765\u6307\u5b9a\u4e00\u4e2a\u5177\u6709\u8db3\u591f\u78c1\u76d8\u7a7a\u95f4\u7684\u4e34\u65f6\u6587\u4ef6\u5939
170.1 --- a/src/zh_CN/other/nbi/engine/src/org/netbeans/installer/product/Bundle_zh_CN.properties Tue Jun 26 07:22:38 2012 +0900
170.2 +++ b/src/zh_CN/other/nbi/engine/src/org/netbeans/installer/product/Bundle_zh_CN.properties Tue Jun 26 07:28:03 2012 +0900
170.3 @@ -84,3 +84,5 @@
170.4
170.5 R.error.unknown.dependency=\u672a\u77e5\u7684\u4f9d\u8d56\u5173\u7cfb\u7c7b\u578b{0}
170.6
170.7 +R.registry.initialization.failed=\u65e0\u6cd5\u521d\u59cb\u5316\u6ce8\u518c\u8868
170.8 +
171.1 --- a/src/zh_CN/other/nbi/engine/src/org/netbeans/installer/utils/Bundle_zh_CN.properties Tue Jun 26 07:22:38 2012 +0900
171.2 +++ b/src/zh_CN/other/nbi/engine/src/org/netbeans/installer/utils/Bundle_zh_CN.properties Tue Jun 26 07:28:03 2012 +0900
171.3 @@ -47,6 +47,7 @@
171.4 EM.unexpected.error=\u51fa\u73b0\u672a\u77e5\u9519\u8bef\u3002
171.5 EM.exception.message=\n\n\u5f02\u5e38\u9519\u8bef:\n {0}:\n {1}
171.6 EM.exception.logfile.info=\n\n\u60a8\u53ef\u4ee5\u4ece\u5b89\u88c5\u7a0b\u5e8f\u65e5\u5fd7\u6587\u4ef6\u4e2d\u83b7\u53d6\u6709\u5173\u6b64\u95ee\u9898\u7684\u66f4\u591a\u8be6\u7ec6\u4fe1\u606f:\n {0}
171.7 +EM.exception.continue.question=\n\n\u662f\u5426\u7ee7\u7eed\u5b89\u88c5?
171.8
171.9 FU.error.output.file.entry=\u5b58\u5728\u6587\u4ef6\u6761\u76ee{0}, \u4f46\u8be5\u6761\u76ee\u4e0d\u662f\u6587\u4ef6
171.10 FU.error.output.dir.entry=\u5b58\u5728\u76ee\u5f55\u6761\u76ee{0}, \u4f46\u8be5\u6761\u76ee\u4e0d\u662f\u76ee\u5f55
172.1 --- a/src/zh_CN/php/php-apigen/php-apigen/org/netbeans/modules/php/apigen/ui/customizer/Bundle_zh_CN.properties Tue Jun 26 07:22:38 2012 +0900
172.2 +++ b/src/zh_CN/php/php-apigen/php-apigen/org/netbeans/modules/php/apigen/ui/customizer/Bundle_zh_CN.properties Tue Jun 26 07:28:03 2012 +0900
172.3 @@ -69,7 +69,7 @@
172.4 ApiGenPanel.tree.toolTip=\u751f\u6210\u7c7b, \u63a5\u53e3, \u7279\u6027\u548c\u5f02\u5e38\u9519\u8bef\u7684\u6811\u89c6\u56fe\u3002
172.5 ApiGenPanel.treeCheckBox.text=\u6811(&R)
172.6 ApiGenPanel.deprecatedCheckBox.text=\u8fc7\u65f6(&D)
172.7 -ApiGenPanel.todoCheckBox.text=TO&DO
172.8 +ApiGenPanel.todoCheckBox.text=ToDo(&D)
172.9 ApiGenPanel.downloadCheckBox.text=\u4e0b\u8f7d(&L)
172.10 ApiGenPanel.sourceCodeCheckBox.text=\u6e90\u4ee3\u7801(&S)
172.11 ApiGenPanel.noConfigRadioButton.text=\u624b\u52a8\u914d\u7f6e:
173.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
173.2 +++ b/src/zh_CN/php/php-editor/php-editor/org/netbeans/modules/php/editor/elements/Bundle_zh_CN.properties Tue Jun 26 07:28:03 2012 +0900
173.3 @@ -0,0 +1,3 @@
173.4 +# {0} - Class name
173.5 +IllegalArgument=\u53ea\u6709\u5168\u9650\u5b9a\u540d\u79f0\u624d\u80fd\u7531{0}\u89e3\u6790
173.6 +
174.1 --- a/src/zh_CN/php/php-editor/php-editor/org/netbeans/modules/php/editor/indent/Bundle_zh_CN.properties Tue Jun 26 07:22:38 2012 +0900
174.2 +++ b/src/zh_CN/php/php-editor/php-editor/org/netbeans/modules/php/editor/indent/Bundle_zh_CN.properties Tue Jun 26 07:28:03 2012 +0900
174.3 @@ -50,7 +50,7 @@
174.4
174.5 LBL_bp_SAMELINE=\u540c\u4e00\u884c
174.6 LBL_bp_NEWLINE=\u6362\u884c
174.7 -LBL_bp_NEWLINE_INDENTED= \u6362\u884c\u7f29\u6392
174.8 +LBL_bp_NEWLINE_INDENTED= \u6362\u884c\u7f29\u8fdb
174.9 LBL_bp_PRESERVE=\u4fdd\u7559\u73b0\u6709\u884c
174.10
174.11 LBL_bg_GENERATE=\u751f\u6210
174.12 @@ -63,11 +63,11 @@
174.13
174.14 LBL_ExpandTabToSpaces=\u5c06\u5236\u8868\u7b26\u6269\u5c55\u4e3a\u7a7a\u683c(&E)
174.15 LBL_TabSize=\u5236\u8868\u7b26\u5927\u5c0f(&T):
174.16 -LBL_IndentSize=\u7f29\u6392\u5927\u5c0f(&I):
174.17 -LBL_ContinuationIndentSize=\u8fde\u7eed\u7f29\u6392\u5927\u5c0f(&C):
174.18 -LBL_LabelIndent=\u7f29\u6392\u6807\u7b7e(&L)\:
174.19 -LBL_AbsoluteLabelIndent=\u7edd\u5bf9\u6807\u7b7e\u7f29\u6392(&A)
174.20 -LBL_IndentTopLevelClassMemberts=\u7f29\u6392\u9876\u5c42\u7c7b\u6210\u5458(&I)
174.21 +LBL_IndentSize=\u7f29\u8fdb\u5927\u5c0f(&I):
174.22 +LBL_ContinuationIndentSize=\u8fde\u7eed\u7f29\u8fdb\u5927\u5c0f(&C):
174.23 +LBL_LabelIndent=\u7f29\u8fdb\u6807\u7b7e(&L)\:
174.24 +LBL_AbsoluteLabelIndent=\u7edd\u5bf9\u6807\u7b7e\u7f29\u8fdb(&A)
174.25 +LBL_IndentTopLevelClassMemberts=\u7f29\u8fdb\u9876\u5c42\u7c7b\u6210\u5458(&I)
174.26 LBL_AddLeadingStarInComment=\u5728\u6ce8\u91ca\u4e2d\u6dfb\u52a0\u524d\u5bfc\u661f\u53f7
174.27 LBL_RightMargin=\u53f3\u8fb9\u8ddd(&R):
174.28
174.29 @@ -121,7 +121,7 @@
174.30 AN_Preview=\u9884\u89c8
174.31 AD_Preview=\u9884\u89c8
174.32 LBL_bp_ClassDecl=
174.33 -FmtTabsIndents.continuationIndentSizeField.AccessibleContext.accessibleDescription=\u8fde\u7eed\u7f29\u6392\u5b57\u6bb5
174.34 -FmtTabsIndents.continuationIndentSizeField.AccessibleContext.accessibleName=\u8fde\u7eed\u7f29\u6392\u6570
174.35 -FmtTabsIndents.initialIndentSizeField.AccessibleContext.accessibleDescription=\u521d\u59cb\u7f29\u6392\u5927\u5c0f\u5b57\u6bb5
174.36 +FmtTabsIndents.continuationIndentSizeField.AccessibleContext.accessibleDescription=\u8fde\u7eed\u7f29\u8fdb\u5b57\u6bb5
174.37 +FmtTabsIndents.continuationIndentSizeField.AccessibleContext.accessibleName=\u8fde\u7eed\u7f29\u8fdb\u6570
174.38 +FmtTabsIndents.initialIndentSizeField.AccessibleContext.accessibleDescription=\u521d\u59cb\u7f29\u8fdb\u5927\u5c0f\u5b57\u6bb5
174.39
175.1 --- a/src/zh_CN/php/php-editor/php-editor/org/netbeans/modules/php/editor/indent/ui/Bundle_zh_CN.properties Tue Jun 26 07:22:38 2012 +0900
175.2 +++ b/src/zh_CN/php/php-editor/php-editor/org/netbeans/modules/php/editor/indent/ui/Bundle_zh_CN.properties Tue Jun 26 07:28:03 2012 +0900
175.3 @@ -42,7 +42,7 @@
175.4
175.5 # Formating options
175.6
175.7 -LBL_TabsAndIndents=\u5236\u8868\u7b26\u548c\u7f29\u6392
175.8 +LBL_TabsAndIndents=\u5236\u8868\u7b26\u548c\u7f29\u8fdb
175.9 LBL_BlankLines=\u7a7a\u884c
175.10 LBL_Alignment=\u5bf9\u9f50
175.11 LBL_Braces=\u82b1\u62ec\u53f7
175.12 @@ -71,13 +71,13 @@
175.13 LBL_blBeforeClosePHPTag=\u5728\u5173\u95ed\u6807\u8bb0\u4e4b\u524d(&O):
175.14 LBL_blBeforeOpenTagInHTML=\u5728 HTML \u4e2d\u7684\u6253\u5f00\u6807\u8bb0\u4e4b\u540e(&H):
175.15
175.16 -FmtTabsIndents.initialIndentLabel.text=\u521d\u59cb\u7f29\u6392(&N):
175.17 -FmtTabsIndents.initialIndentSizeField.AccessibleContext.accessibleDescription=\u521d\u59cb\u7f29\u6392(&I):
175.18 -FmtTabsIndents.continuationIndentSizeField.AccessibleContext.accessibleName=\u8fde\u7eed\u7f29\u6392\u5927\u5c0f(&C):
175.19 -FmtTabsIndents.continuationIndentSizeField.AccessibleContext.accessibleDescription=\u8fde\u7eed\u7f29\u6392\u5927\u5c0f(&C):
175.20 -LBL_ContinuationIndentSize=\u8fde\u7eed\u7f29\u6392(&C):
175.21 +FmtTabsIndents.initialIndentLabel.text=\u521d\u59cb\u7f29\u8fdb(&N):
175.22 +FmtTabsIndents.initialIndentSizeField.AccessibleContext.accessibleDescription=\u521d\u59cb\u7f29\u8fdb(&I):
175.23 +FmtTabsIndents.continuationIndentSizeField.AccessibleContext.accessibleName=\u8fde\u7eed\u7f29\u8fdb\u5927\u5c0f(&C):
175.24 +FmtTabsIndents.continuationIndentSizeField.AccessibleContext.accessibleDescription=\u8fde\u7eed\u7f29\u8fdb\u5927\u5c0f(&C):
175.25 +LBL_ContinuationIndentSize=\u8fde\u7eed\u7f29\u8fdb(&C):
175.26 LBL_br_bracesPlacement=\u82b1\u62ec\u53f7\u4f4d\u7f6e:
175.27 -FmtTabsIndents.arrayItemsIndentationLabel.text=\u6570\u7ec4\u58f0\u660e\u7f29\u6392(&A):
175.28 +FmtTabsIndents.arrayItemsIndentationLabel.text=\u6570\u7ec4\u58f0\u660e\u7f29\u8fdb(&A):
175.29
175.30 LBL_BeforeKeywords=\u5728\u5173\u952e\u5b57\u4e4b\u524d
175.31 #LBL_spaceBeforeWhile="while"
175.32 @@ -204,9 +204,9 @@
175.33 FmtWrapping.jCheckBox1.text=jCheckBox1
175.34 cb_wrp_open_close_block_brace=Open \u548c Close \u5757\u82b1\u62ec\u53f7(&O)
175.35 cb_wrp_Statements=\u540c\u4e00\u884c\u4e2d\u7684\u8bed\u53e5(&S)
175.36 -FmtBraces.otherCombo.AccessibleContext.accessibleName="\u6362\u884c", "\u6362\u884c\u7f29\u6392", "\u540c\u4e00\u884c", "\u4fdd\u7559\u73b0\u6709\u884c"
175.37 -FmtBraces.methodDeclCombo.AccessibleContext.accessibleName="\u6362\u884c", "\u6362\u884c\u7f29\u6392", "\u540c\u4e00\u884c", "\u4fdd\u7559\u73b0\u6709\u884c"
175.38 -FmtBraces.classDeclCombo.AccessibleContext.accessibleName="\u6362\u884c", "\u6362\u884c\u7f29\u6392", "\u540c\u4e00\u884c", "\u4fdd\u7559\u73b0\u6709\u884c"
175.39 +FmtBraces.otherCombo.AccessibleContext.accessibleName="\u6362\u884c", "\u6362\u884c\u7f29\u8fdb", "\u540c\u4e00\u884c", "\u4fdd\u7559\u73b0\u6709\u884c"
175.40 +FmtBraces.methodDeclCombo.AccessibleContext.accessibleName="\u6362\u884c", "\u6362\u884c\u7f29\u8fdb", "\u540c\u4e00\u884c", "\u4fdd\u7559\u73b0\u6709\u884c"
175.41 +FmtBraces.classDeclCombo.AccessibleContext.accessibleName="\u6362\u884c", "\u6362\u884c\u7f29\u8fdb", "\u540c\u4e00\u884c", "\u4fdd\u7559\u73b0\u6709\u884c"
175.42 FmtBraces.AccessibleContext.accessibleName=PHP \u82b1\u62ec\u53f7\u4f4d\u7f6e\u683c\u5f0f\u8bbe\u7f6e\u9009\u9879\u9762\u677f
175.43 FmtBraces.AccessibleContext.accessibleDescription=PHP \u82b1\u62ec\u53f7\u4f4d\u7f6e\u683c\u5f0f\u8bbe\u7f6e\u9009\u9879\u9762\u677f
175.44 FmtBraces.bracesPlacementLabel.AccessibleContext.accessibleDescription=\u9009\u62e9\u4ee5\u4e0b\u4efb\u4e00\u89c4\u5219
175.45 @@ -216,15 +216,15 @@
175.46 FmtBraces.classDeclLabel.AccessibleContext.accessibleDescription=\u9009\u62e9\u7c7b\u58f0\u660e\u89c4\u5219
175.47 FmtBraces.classDeclCombo.AccessibleContext.accessibleDescription=\u7c7b\u58f0\u660e\u89c4\u5219 - \u9009\u62e9\u6846
175.48 FmtBraces.methodDeclCombo.AccessibleContext.accessibleDescription=\u65b9\u6cd5\u58f0\u660e\u89c4\u5219 - \u9009\u62e9\u6846
175.49 -FmtBraces.ifCombo.AccessibleContext.accessibleName="\u6362\u884c", "\u6362\u884c\u7f29\u6392", "\u540c\u4e00\u884c", "\u4fdd\u7559\u73b0\u6709\u884c"
175.50 +FmtBraces.ifCombo.AccessibleContext.accessibleName="\u6362\u884c", "\u6362\u884c\u7f29\u8fdb", "\u540c\u4e00\u884c", "\u4fdd\u7559\u73b0\u6709\u884c"
175.51 FmtBraces.ifCombo.AccessibleContext.accessibleDescription=\u6761\u4ef6\u89c4\u5219 - \u9009\u62e9\u6846
175.52 -FmtBraces.forCombo.AccessibleContext.accessibleName="\u6362\u884c", "\u6362\u884c\u7f29\u6392", "\u540c\u4e00\u884c", "\u4fdd\u7559\u73b0\u6709\u884c"
175.53 +FmtBraces.forCombo.AccessibleContext.accessibleName="\u6362\u884c", "\u6362\u884c\u7f29\u8fdb", "\u540c\u4e00\u884c", "\u4fdd\u7559\u73b0\u6709\u884c"
175.54 FmtBraces.forCombo.AccessibleContext.accessibleDescription=For, Foreach \u5faa\u73af\u89c4\u5219 - \u9009\u62e9\u6846
175.55 -FmtBraces.whileCombo.AccessibleContext.accessibleName="\u6362\u884c", "\u6362\u884c\u7f29\u6392", "\u540c\u4e00\u884c", "\u4fdd\u7559\u73b0\u6709\u884c"
175.56 +FmtBraces.whileCombo.AccessibleContext.accessibleName="\u6362\u884c", "\u6362\u884c\u7f29\u8fdb", "\u540c\u4e00\u884c", "\u4fdd\u7559\u73b0\u6709\u884c"
175.57 FmtBraces.whileCombo.AccessibleContext.accessibleDescription=while, do \u5faa\u73af\u89c4\u5219 - \u9009\u62e9\u6846
175.58 -FmtBraces.switchCombo.AccessibleContext.accessibleName="\u6362\u884c", "\u6362\u884c\u7f29\u6392", "\u540c\u4e00\u884c", "\u4fdd\u7559\u73b0\u6709\u884c"
175.59 +FmtBraces.switchCombo.AccessibleContext.accessibleName="\u6362\u884c", "\u6362\u884c\u7f29\u8fdb", "\u540c\u4e00\u884c", "\u4fdd\u7559\u73b0\u6709\u884c"
175.60 FmtBraces.switchCombo.AccessibleContext.accessibleDescription=Switch \u5faa\u73af\u89c4\u5219 - \u9009\u62e9\u6846
175.61 -FmtBraces.catchCombo.AccessibleContext.accessibleName="\u6362\u884c", "\u6362\u884c\u7f29\u6392", "\u540c\u4e00\u884c", "\u4fdd\u7559\u73b0\u6709\u884c"
175.62 +FmtBraces.catchCombo.AccessibleContext.accessibleName="\u6362\u884c", "\u6362\u884c\u7f29\u8fdb", "\u540c\u4e00\u884c", "\u4fdd\u7559\u73b0\u6709\u884c"
175.63 FmtBraces.catchCombo.AccessibleContext.accessibleDescription=try, catch \u5757\u89c4\u5219 - \u9009\u62e9\u6846
175.64 FmtBraces.otherCombo.AccessibleContext.accessibleDescription=\u5176\u4ed6\u9002\u7528\u89c4\u5219 - \u9009\u62e9\u6846
175.65 FmtBraces.methodDeclLabel.AccessibleContext.accessibleName=\u65b9\u6cd5\u58f0\u660e\u89c4\u5219
175.66 @@ -242,12 +242,12 @@
175.67 FmtBraces.forLabel.AccessibleContext.accessibleName=for, foreach \u89c4\u5219
175.68 FmtBraces.forLabel.AccessibleContext.accessibleDescription=\u9009\u62e9 for - foreach \u5757\u89c4\u5219
175.69 FmtBraces.bracesPlacementLabel.AccessibleContext.accessibleName=\u82b1\u62ec\u53f7\u4f4d\u7f6e
175.70 -FmtTabsIndents.initialIndentLabel.AccessibleContext.accessibleName=\u521d\u59cb\u7f29\u6392
175.71 -FmtTabsIndents.continuationIndentSizeLabel.AccessibleContext.accessibleName=\u8fde\u7eed\u7f29\u6392
175.72 -FmtTabsIndents.arrayItemsIndentationLabel.AccessibleContext.accessibleName=\u6570\u7ec4\u58f0\u660e\u7f29\u6392
175.73 -FmtTabsIndents.AccessibleContext.accessibleName=\u5236\u8868\u7b26\u548c\u7f29\u6392\u7a97\u4f53
175.74 -FmtTabsIndents.initialIndentSizeField.AccessibleContext.accessibleName=\u521d\u59cb\u7f29\u6392\u6570
175.75 -FmtTabsIndents.arrayItemsIndentationField.AccessibleContext.accessibleName=\u6570\u7ec4\u58f0\u660e\u7f29\u6392\u6570
175.76 +FmtTabsIndents.initialIndentLabel.AccessibleContext.accessibleName=\u521d\u59cb\u7f29\u8fdb
175.77 +FmtTabsIndents.continuationIndentSizeLabel.AccessibleContext.accessibleName=\u8fde\u7eed\u7f29\u8fdb
175.78 +FmtTabsIndents.arrayItemsIndentationLabel.AccessibleContext.accessibleName=\u6570\u7ec4\u58f0\u660e\u7f29\u8fdb
175.79 +FmtTabsIndents.AccessibleContext.accessibleName=\u5236\u8868\u7b26\u548c\u7f29\u8fdb\u7a97\u4f53
175.80 +FmtTabsIndents.initialIndentSizeField.AccessibleContext.accessibleName=\u521d\u59cb\u7f29\u8fdb\u6570
175.81 +FmtTabsIndents.arrayItemsIndentationField.AccessibleContext.accessibleName=\u6570\u7ec4\u58f0\u660e\u7f29\u8fdb\u6570
175.82 FmtWrapping.extendsImplemetsKeywordLabel.AccessibleContext.accessibleName=\u6269\u5c55/\u5b9e\u73b0\u5173\u952e\u5b57
175.83 FmtWrapping.extendsImplementsListLabel.AccessibleContext.accessibleName=\u6269\u5c55/\u5b9e\u73b0\u5217\u8868
175.84 FmtWrapping.methodParamsLabel.AccessibleContext.accessibleName=\u65b9\u6cd5\u53c2\u6570
175.85 @@ -316,11 +316,11 @@
175.86 FmtWrapping.forCombo.AccessibleContext.accessibleDescription=For \u7ec4\u5408\u6846
175.87 FmtWrapping.forStatementLabel.AccessibleContext.accessibleDescription=For \u8bed\u53e5\u6807\u7b7e
175.88 FmtWrapping.arrayInitLabel.AccessibleContext.accessibleDescription=\u6570\u7ec4\u521d\u59cb\u5316\u7a0b\u5e8f
175.89 -FmtTabsIndents.AccessibleContext.accessibleDescription=\u9009\u62e9\u60a8\u7684\u7f29\u6392\u683c\u5f0f\u8bbe\u7f6e\u9009\u9879
175.90 -FmtTabsIndents.continuationIndentSizeLabel.AccessibleContext.accessibleDescription=\u8fde\u7eed\u7f29\u6392
175.91 -FmtTabsIndents.initialIndentLabel.AccessibleContext.accessibleDescription=\u521d\u59cb\u7f29\u6392
175.92 -FmtTabsIndents.arrayItemsIndentationLabel.AccessibleContext.accessibleDescription=\u6570\u7ec4\u58f0\u660e\u7f29\u6392
175.93 -FmtTabsIndents.arrayItemsIndentationField.AccessibleContext.accessibleDescription=\u6570\u7ec4\u58f0\u660e\u7f29\u6392\u5927\u5c0f\u5b57\u6bb5
175.94 +FmtTabsIndents.AccessibleContext.accessibleDescription=\u9009\u62e9\u60a8\u7684\u7f29\u8fdb\u683c\u5f0f\u8bbe\u7f6e\u9009\u9879
175.95 +FmtTabsIndents.continuationIndentSizeLabel.AccessibleContext.accessibleDescription=\u8fde\u7eed\u7f29\u8fdb
175.96 +FmtTabsIndents.initialIndentLabel.AccessibleContext.accessibleDescription=\u521d\u59cb\u7f29\u8fdb
175.97 +FmtTabsIndents.arrayItemsIndentationLabel.AccessibleContext.accessibleDescription=\u6570\u7ec4\u58f0\u660e\u7f29\u8fdb
175.98 +FmtTabsIndents.arrayItemsIndentationField.AccessibleContext.accessibleDescription=\u6570\u7ec4\u58f0\u660e\u7f29\u8fdb\u5927\u5c0f\u5b57\u6bb5
175.99 FmtSpaces.AccessibleContext.accessibleDescription=\u9009\u62e9\u60a8\u7684\u7a7a\u683c\u683c\u5f0f\u8bbe\u7f6e
175.100 FmtSpaces.AccessibleContext.accessibleName=\u7a7a\u683c\u683c\u5f0f\u8bbe\u7f6e\u7a97\u4f53
175.101 FmtSpaces.jScrollPane1.AccessibleContext.accessibleDescription=\u7528\u4e8e\u9009\u62e9\u60a8\u7684\u7a7a\u683c\u683c\u5f0f\u8bbe\u7f6e\u7684\u9762\u677f
176.1 --- a/src/zh_CN/php/php-editor/php-editor/org/netbeans/modules/php/editor/nav/hierarchy/Bundle_zh_CN.properties Tue Jun 26 07:22:38 2012 +0900
176.2 +++ b/src/zh_CN/php/php-editor/php-editor/org/netbeans/modules/php/editor/nav/hierarchy/Bundle_zh_CN.properties Tue Jun 26 07:28:03 2012 +0900
176.3 @@ -56,4 +56,6 @@
176.4 ClassHierarchyPanel.supertypeButton.toolTipText=\u8d85\u7c7b\u578b
176.5 ClassHierarchyPanel.subtypeButton.menuText=\u5b50\u7c7b\u578b(&B)
176.6 ClassHierarchyPanel.subtypeButton.toolTipText=\u5b50\u7c7b\u578b
176.7 +# {0} - max number of childs
176.8 +TooManyChilds=\u68c0\u6d4b\u5230\u7684\u5b50\u7ea7\u8fc7\u591a (\u6700\u591a {0} \u4e2a)\u3002
176.9
177.1 --- a/src/zh_CN/php/php-editor/php-editor/org/netbeans/modules/php/editor/verification/Bundle_zh_CN.properties Tue Jun 26 07:22:38 2012 +0900
177.2 +++ b/src/zh_CN/php/php-editor/php-editor/org/netbeans/modules/php/editor/verification/Bundle_zh_CN.properties Tue Jun 26 07:28:03 2012 +0900
177.3 @@ -132,6 +132,9 @@
177.4 # {0} - Method name
177.5 # {1} - Modifier name
177.6 InvalidIfaceMethod=\u63a5\u53e3\u65b9\u6cd5 "{0}" \u4e0d\u80fd\u58f0\u660e\u4e3a{1}
177.7 +LoopOnlyKeywordsDesc=\u68c0\u67e5\u662f\u5426\u5728\u6b63\u786e\u7684\u63a7\u5236\u7ed3\u6784\u4e2d\u4f7f\u7528\u4e86\u5173\u952e\u5b57\u3002
177.8 +# {0} - name of keyword
177.9 +LoopOnlyKeywordsDisp={0} \u4e0d\u5728 for, foreach, while, do-while \u6216 switch \u8bed\u53e5\u4e2d\u3002
177.10 # {0} - Method name
177.11 MethodRedeclarationCustom=\u5df2\u7ecf\u58f0\u660e\u65b9\u6cd5\u6216\u51fd\u6570 "{0}"
177.12 MethodRedeclarationHintDesc=\u65b9\u6cd5\u540d\u79f0\u53ea\u80fd\u5728\u7c7b\u4e2d\u4f7f\u7528\u4e00\u6b21\u3002
178.1 --- a/src/zh_CN/php/php-project/php-project/org/netbeans/modules/php/project/Bundle_zh_CN.properties Tue Jun 26 07:22:38 2012 +0900
178.2 +++ b/src/zh_CN/php/php-project/php-project/org/netbeans/modules/php/project/Bundle_zh_CN.properties Tue Jun 26 07:28:03 2012 +0900
178.3 @@ -63,6 +63,8 @@
178.4 LBL_BrowseTests=\u9009\u62e9\u4e00\u4e2a\u5305\u542b\u9879\u76ee\u6d4b\u8bd5\u6587\u4ef6\u7684\u76ee\u5f55\u3002
178.5 LBL_BrowseSelenium=\u9009\u62e9\u4e00\u4e2a\u5305\u542b\u9879\u76ee Selenium \u6d4b\u8bd5\u6587\u4ef6\u7684\u76ee\u5f55\u3002
178.6
178.7 +# {0} - project name
178.8 +PhpProject.metadata.corrupted=<html><b>\u9879\u76ee{0}\u5305\u542b\u635f\u574f\u7684\u5143\u6570\u636e</b>\u3002<br><br>\u8bf7\u624b\u52a8\u4fee\u590d <i>nbproject/project.properties</i> \u4e2d\u7684 "src.dir" \u5c5e\u6027, \u7136\u540e\u91cd\u65b0\u6253\u5f00\u8be5\u9879\u76ee\u3002
178.9 # UI Logging - http://wiki.netbeans.org/UsageLoggingSpecification
178.10 # when a php project is opened
178.11 # {0} frameworks ["|" separated string]
179.1 --- a/src/zh_CN/php/php-project/php-project/org/netbeans/modules/php/project/connections/Bundle_zh_CN.properties Tue Jun 26 07:22:38 2012 +0900
179.2 +++ b/src/zh_CN/php/php-project/php-project/org/netbeans/modules/php/project/connections/Bundle_zh_CN.properties Tue Jun 26 07:28:03 2012 +0900
179.3 @@ -65,7 +65,11 @@
179.4 MSG_FolderNotEmpty=\u6587\u4ef6\u5939 {0} \u4e0d\u4e3a\u7a7a\u3002
179.5 MSG_Symlink=\u6587\u4ef6{0}\u662f\u4e00\u4e2a\u7b26\u53f7\u94fe\u63a5\u3002
179.6 MSG_ParentSymlink=\u6587\u4ef6{0}\u7684\u67d0\u4e2a\u7236\u6587\u4ef6\u662f\u4e00\u4e2a\u7b26\u53f7\u8fde\u63a5\u3002
179.7 +RemoteClient.download.ignored.byUser=\u7528\u6237\u5df2\u5ffd\u7565\u4e0b\u8f7d\u3002
179.8 # {0} - file name
179.9 RemoteClient.error.cannotOpenTmpLocalFile=\u65e0\u6cd5\u6253\u5f00\u672c\u5730\u4e34\u65f6\u6587\u4ef6{0}\u3002
179.10 RemoteClient.error.notFile=\u7ed9\u5b9a\u8fdc\u7a0b\u6587\u4ef6\u4e0d\u662f\u6587\u4ef6\u3002
179.11 +# {0} - file name
179.12 +RemoteClient.file.replaceUnsavedContent.question=\u662f\u5426\u5c06\u672a\u4fdd\u5b58\u7684\u6587\u4ef6 "{0}" \u66ff\u6362\u4e3a\u670d\u52a1\u5668\u4e2d\u7684\u5185\u5bb9?
179.13 +RemoteClient.file.replaceUnsavedContent.title=\u786e\u8ba4\u66ff\u6362
179.14
180.1 --- a/src/zh_CN/php/php-project/php-project/org/netbeans/modules/php/project/connections/sync/Bundle_zh_CN.properties Tue Jun 26 07:22:38 2012 +0900
180.2 +++ b/src/zh_CN/php/php-project/php-project/org/netbeans/modules/php/project/connections/sync/Bundle_zh_CN.properties Tue Jun 26 07:28:03 2012 +0900
180.3 @@ -117,6 +117,12 @@
180.4 SyncPanel.popupMenu.disable.download=\u7981\u7528\u4e0b\u8f7d
180.5 SyncPanel.popupMenu.disable.upload=\u7981\u7528\u4e0a\u8f7d
180.6 SyncPanel.popupMenu.resetItem=\u91cd\u7f6e\u64cd\u4f5c
180.7 +SyncPanel.popupMenu.sort.info=\u6309\u4fe1\u606f\u6392\u5e8f
180.8 +SyncPanel.popupMenu.sort.local.asc=\u6309\u672c\u5730\u8def\u5f84\u5347\u5e8f\u6392\u5e8f
180.9 +SyncPanel.popupMenu.sort.local.desc=\u6309\u672c\u5730\u8def\u5f84\u964d\u5e8f\u6392\u5e8f
180.10 +SyncPanel.popupMenu.sort.remote.asc=\u6309\u8fdc\u7a0b\u8def\u5f84\u5347\u5e8f\u6392\u5e8f
180.11 +SyncPanel.popupMenu.sort.remote.desc=\u6309\u8fdc\u7a0b\u8def\u5f84\u964d\u5e8f\u6392\u5e8f
180.12 +SyncPanel.popupMenu.swapPaths=\u4ea4\u6362\u672c\u5730\u5217\u548c\u8fdc\u7a0b\u5217
180.13 SyncPanel.resetButton.toolTip=\u91cd\u7f6e\u4e3a\u5efa\u8bae\u7684\u64cd\u4f5c (\u653e\u5f03\u5dee\u5f02\u66f4\u6539)
180.14 SyncPanel.showSummaryCheckBox.text=\u5f00\u59cb\u4e4b\u524d\u663e\u793a\u6982\u8981(&S)
180.15 SyncPanel.operationsPanel.title=\u663e\u793a\u8ba1\u5212\u7684\u64cd\u4f5c
180.16 @@ -124,6 +130,10 @@
180.17 SyncPanel.checkAllButton.text=\u5168\u90e8\u9009\u4e2d(&C)
180.18 SyncPanel.table.column.local.title=\u672c\u5730\u8def\u5f84
180.19 SyncPanel.table.column.remote.title=\u8fdc\u7a0b\u8def\u5f84
180.20 +SyncPanel.table.header.info.toolTip=\u5355\u51fb\u4ee5\u6309\u4fe1\u606f\u6392\u5e8f
180.21 +SyncPanel.table.header.localPath.toolTip=\u5355\u51fb\u4ee5\u6309\u672c\u5730\u8def\u5f84\u6392\u5e8f
180.22 +SyncPanel.table.header.operation.toolTip=\u5355\u51fb\u4ee5\u4ea4\u6362\u8fdc\u7a0b\u8def\u5f84\u548c\u672c\u5730\u8def\u5f84
180.23 +SyncPanel.table.header.remotePath.toolTip=\u5355\u51fb\u4ee5\u6309\u8fdc\u7a0b\u8def\u5f84\u6392\u5e8f
180.24 # {0} - project name
180.25 # {1} - remote configuration name
180.26 SyncPanel.title={0}\u7684\u8fdc\u7a0b\u540c\u6b65: {1}
181.1 --- a/src/zh_CN/php/php-project/php-project/org/netbeans/modules/php/project/copysupport/Bundle_zh_CN.properties Tue Jun 26 07:22:38 2012 +0900
181.2 +++ b/src/zh_CN/php/php-project/php-project/org/netbeans/modules/php/project/copysupport/Bundle_zh_CN.properties Tue Jun 26 07:28:03 2012 +0900
181.3 @@ -38,6 +38,9 @@
181.4 #
181.5 # Portions Copyrighted 2009 Sun Microsystems, Inc.
181.6
181.7 +# {0} - project name
181.8 +# {1} - source directory
181.9 +CopySupport.warn.invalidSources=<html>\u9879\u76ee "{0}" \u7684\u6e90\u6587\u4ef6\u4e0d\u5b58\u5728, \u6587\u4ef6\u66f4\u6539\u672a\u4f20\u64ad\u5230\u670d\u52a1\u5668\u3002<br><br>\u6062\u590d\u76ee\u5f55 "{1}" (\u5e76\u53ef\u80fd\u91cd\u65b0\u6253\u5f00\u8be5\u9879\u76ee)\u3002
181.10 # copy support
181.11 LBL_LocalSynchronization=\u672c\u5730\u540c\u6b65...
181.12 LBL_RemoteSynchronization=\u8fdc\u7a0b\u540c\u6b65...
182.1 --- a/src/zh_CN/php/php-project/php-project/org/netbeans/modules/php/project/internalserver/Bundle_zh_CN.properties Tue Jun 26 07:22:38 2012 +0900
182.2 +++ b/src/zh_CN/php/php-project/php-project/org/netbeans/modules/php/project/internalserver/Bundle_zh_CN.properties Tue Jun 26 07:28:03 2012 +0900
182.3 @@ -1,5 +1,8 @@
182.4 # {0} - project name
182.5 InternalWebServer.error.cancelProcess=\u65e0\u6cd5\u53d6\u6d88\u9879\u76ee{0}\u6b63\u5728\u8fd0\u884c\u7684\u5185\u90e8 Web \u670d\u52a1\u5668\u3002
182.6 +InternalWebServer.error.stop=\u505c\u6b62 PHP \u5185\u7f6e Web \u670d\u52a1\u5668\u671f\u95f4\u51fa\u73b0\u8d85\u65f6\u3002
182.7 # {0} - project name
182.8 InternalWebServer.output.title=\u5185\u90e8 Web \u670d\u52a1\u5668 [{0}]
182.9 +# {0} - project name
182.10 +InternalWebServer.stopping=\u6b63\u5728\u505c\u6b62\u9879\u76ee{0}\u7684 PHP \u5185\u7f6e Web \u670d\u52a1\u5668...
182.11
183.1 --- a/src/zh_CN/php/php-project/php-project/org/netbeans/modules/php/project/phpunit/ui/options/Bundle_zh_CN.properties Tue Jun 26 07:22:38 2012 +0900
183.2 +++ b/src/zh_CN/php/php-project/php-project/org/netbeans/modules/php/project/phpunit/ui/options/Bundle_zh_CN.properties Tue Jun 26 07:28:03 2012 +0900
183.3 @@ -48,7 +48,7 @@
183.4 PhpUnitOptionsPanel.phpunit.browse.title=\u9009\u62e9 PHPUnit
183.5 # {0} - short script name
183.6 # {1} - long script name
183.7 -PhpUnitOptionsPanel.phpUnit.hint=PHPUnit \u811a\u672c\u7684\u5b8c\u6574\u8def\u5f84 (\u901a\u5e38\u4e3a{0}\u6216{1})\u3002
183.8 +PhpUnitOptionsPanel.phpUnit.hint=PHPUnit \u811a\u672c\u7684\u5b8c\u6574\u8def\u5f84 (\u901a\u5e38\u4e3a {0} \u6216 {1})\u3002
183.9 PhpUnitOptionsPanel.phpUnitLabel.text=PHPUnit \u811a\u672c(&N):
183.10 PhpUnitOptionsPanel.phpUnitInfoLabel.text=<html>PHP \u5305\u542b\u8def\u5f84\u4e2d\u5e94\u63d0\u4f9b PHPUnit \u7c7b\u3002<br>(\u53ef\u5728\u201c\u5e38\u89c4\u201d\u6807\u7b7e\u4e2d\u8bbe\u7f6e\u4ee5\u7528\u4e8e\u6240\u6709 PHP \u9879\u76ee\u3002)
183.11 PhpUnitOptionsPanel.phpUnitPhp53InfoLabel.text=\u652f\u6301 PHPUnit 3.4.0 \u6216\u66f4\u9ad8\u7248\u672c\u3002
183.12 @@ -91,7 +91,7 @@
183.13 PhpUnitOptionsPanel.skelGen.browse=\u9009\u62e9\u6846\u67b6\u751f\u6210\u5668\u811a\u672c
183.14 # {0} - short script name
183.15 # {1} - long script name
183.16 -PhpUnitOptionsPanel.skelGen.hint=\u6846\u67b6\u751f\u6210\u5668\u811a\u672c\u7684\u5b8c\u6574\u8def\u5f84 (\u901a\u5e38\u4e3a{0}\u6216{1})\u3002
183.17 +PhpUnitOptionsPanel.skelGen.hint=\u6846\u67b6\u751f\u6210\u5668\u811a\u672c\u7684\u5b8c\u6574\u8def\u5f84 (\u901a\u5e38\u4e3a {0} \u6216 {1})\u3002
183.18 PhpUnitOptionsPanel.skelGen.search.notFound=\u627e\u4e0d\u5230\u6846\u67b6\u751f\u6210\u5668\u811a\u672c\u3002
183.19 PhpUnitOptionsPanel.skelGen.search.pleaseWaitPart=\u6846\u67b6\u751f\u6210\u5668\u811a\u672c
183.20 PhpUnitOptionsPanel.skelGen.search.scripts=\u6846\u67b6\u751f\u6210\u5668\u811a\u672c(&S):
184.1 --- a/src/zh_CN/php/php-project/php-project/org/netbeans/modules/php/project/ui/customizer/Bundle_zh_CN.properties Tue Jun 26 07:22:38 2012 +0900
184.2 +++ b/src/zh_CN/php/php-project/php-project/org/netbeans/modules/php/project/ui/customizer/Bundle_zh_CN.properties Tue Jun 26 07:28:03 2012 +0900
184.3 @@ -46,6 +46,8 @@
184.4 CustomizerPhpIncludePath.error.projectFile=\u8def\u5f84{0}\u5df2\u5c5e\u4e8e\u9879\u76ee\u3002
184.5 CustomizerPhpUnit.script.browse=\u9009\u62e9 PHPUnit \u811a\u672c
184.6 CustomizerPhpUnit.script.label=PHPUnit \u811a\u672c
184.7 +RunAsLocalWeb.webRoot.notFound=Web \u6839\u76ee\u5f55\u4e0d\u5b58\u5728 (\u8bf7\u67e5\u770b\u6e90)\u3002
184.8 +RunAsRemoteWeb.webRoot.notFound=Web \u6839\u76ee\u5f55\u4e0d\u5b58\u5728 (\u8bf7\u67e5\u770b\u6e90)\u3002
184.9 RunAsScript.interpreter.browse.title=\u9009\u62e9 PHP \u89e3\u91ca\u5668
184.10 RunAsType.internal.label=PHP \u5185\u7f6e Web \u670d\u52a1\u5668 (\u5728\u5185\u7f6e Web \u670d\u52a1\u5668\u4e0a\u8fd0\u884c)
184.11 RunAsType.local.label=\u672c\u5730 Web \u7ad9\u70b9 (\u5728\u672c\u5730 Web \u670d\u52a1\u5668\u4e0a\u8fd0\u884c)
185.1 --- a/src/zh_CN/php/php-smarty/php-smarty/org/netbeans/modules/php/smarty/resources/Bundle_zh_CN.properties Tue Jun 26 07:22:38 2012 +0900
185.2 +++ b/src/zh_CN/php/php-smarty/php-smarty/org/netbeans/modules/php/smarty/resources/Bundle_zh_CN.properties Tue Jun 26 07:28:03 2012 +0900
185.3 @@ -2,7 +2,7 @@
185.4 OpenIDE-Module-Name=PHP Smarty \u6846\u67b6
185.5 OpenIDE-Module-Display-Category=PHP
185.6 OpenIDE-Module-Short-Description=\u652f\u6301 SMARTY \u6a21\u677f\u7f16\u8f91
185.7 -OpenIDE-Module-Long-Description=\u201cPHP Smarty \u6846\u67b6\u201d\u6a21\u5757\u652f\u6301\u521b\u5efa\u548c\u4f7f\u7528 SMARTY \u6a21\u677f (TPL)\u3002\u529f\u80fd\u5305\u62ec SMARTY \u547d\u4ee4\u7684\u8bed\u6cd5\u7a81\u51fa\u663e\u793a\u548c\u4ee3\u7801\u5b8c\u6210\u4ee5\u53ca .tpl \u6587\u4ef6\u7684\u57fa\u672c HTML \u5bfc\u822a\u5668\u548c HTML \u4ee3\u7801\u6298\u53e0\u3002
185.8 +OpenIDE-Module-Long-Description=\u201cPHP Smarty \u6846\u67b6\u201d\u6a21\u5757\u652f\u6301\u521b\u5efa\u548c\u4f7f\u7528 SMARTY \u6a21\u677f (TPL)\u3002\u529f\u80fd\u5305\u62ec SMARTY \u547d\u4ee4\u7684\u8bed\u6cd5\u7a81\u51fa\u663e\u793a\u548c\u4ee3\u7801\u5b8c\u6210, \u4ee5\u53ca .tpl \u6587\u4ef6\u7684\u57fa\u672c HTML \u5bfc\u822a\u5668\u548c HTML \u4ee3\u7801\u6298\u53e0\u3002
185.9
185.10 # options export/import
185.11 LBL_SmartyExportName=Smarty
186.1 --- a/src/zh_CN/platform/autoupdate-ui/autoupdate-ui/org/netbeans/modules/autoupdate/ui/Bundle_zh_CN.properties Tue Jun 26 07:22:38 2012 +0900
186.2 +++ b/src/zh_CN/platform/autoupdate-ui/autoupdate-ui/org/netbeans/modules/autoupdate/ui/Bundle_zh_CN.properties Tue Jun 26 07:28:03 2012 +0900
186.3 @@ -1,5 +1,14 @@
186.4 +cbLocation_InstallDefault=\u9ed8\u8ba4
186.5 +cbLocation_InstallGlobal=\u5f3a\u5236\u5b89\u88c5\u5230\u5171\u4eab\u76ee\u5f55
186.6 +cbLocation_InstallLocal=\u5f3a\u5236\u5b89\u88c5\u5230\u7528\u6237\u76ee\u5f55
186.7 More_Command_Text={0}\u66f4\u591a...
186.8 Less_Command_Text={0}\u66f4\u5c11...
186.9 +proxy_taMessage_ErrorText=\u5e76\u975e\u5df2\u6210\u529f\u4e0b\u8f7d\u6240\u6709\u7684\u63d2\u4ef6\u3002\u5f53\u524d\u8be5\u670d\u52a1\u5668\u4e0d\u53ef\u7528\u3002\u8bf7\u7a0d\u540e\u91cd\u8bd5\u3002
186.10 +proxy_taMessage_WarningText=\u68c0\u67e5\u4ee3\u7406\u8bbe\u7f6e\u6216\u7a0d\u540e\u91cd\u8bd5\u3002\u5f53\u524d\u8be5\u670d\u52a1\u5668\u4e0d\u53ef\u7528\u3002\n\n\u60a8\u53ef\u80fd\u8fd8\u9700\u8981\u786e\u4fdd\u9632\u706b\u5899\u4e0d\u4f1a\u963b\u585e\u7f51\u7edc\u901a\u4fe1\u3002
186.11 +proxy_taMessage_WarningTextWithReload=\u68c0\u67e5\u4ee3\u7406\u8bbe\u7f6e\u6216\u7a0d\u540e\u91cd\u8bd5\u3002\u5f53\u524d\u8be5\u670d\u52a1\u5668\u4e0d\u53ef\u7528\u3002\n\n\u60a8\u53ef\u80fd\u8fd8\u9700\u8981\u786e\u4fdd\u9632\u706b\u5899\u4e0d\u4f1a\u963b\u585e\u7f51\u7edc\u901a\u4fe1\u3002\n\n\u60a8\u7684\u9ad8\u901f\u7f13\u5b58\u53ef\u80fd\u5df2\u8fc7\u671f\u3002\u8bf7\u5355\u51fb\u201c\u91cd\u65b0\u52a0\u8f7d\u76ee\u5f55\u201d\u4ee5\u5237\u65b0\u5185\u5bb9\u3002
186.12 +proxy_taTitle_Text=\u65e0\u6cd5\u8fde\u63a5\u5230\u66f4\u65b0\u4e2d\u5fc3
186.13 +# {0} - file path
186.14 +unit_already_installed=\u5df2\u5b89\u88c5\u63d2\u4ef6{0}\u3002
186.15 UnitTab_ReloadTime=\u4e0a\u6b21\u68c0\u67e5\u65f6\u95f4: {0}
186.16 UnitTab_ReloadTime_Never=\u4ece\u4e0d
186.17 UnitTab_LessAction=\u663e\u793a\u66f4\u5c11\u63d2\u4ef6
186.18 @@ -14,7 +23,7 @@
186.19 UnitTab_UncheckCategoryAction=\u53d6\u6d88\u9009\u4e2d\u7c7b\u522b
186.20 UnitTab_CheckAllAction=\u5168\u90e8\u9009\u4e2d
186.21 UnitTab_UncheckAllAction=\u5168\u90e8\u53d6\u6d88\u9009\u4e2d
186.22 -UnitTab_ReloadAction=\u91cd\u65b0\u52a0\u8f7d\u76ee\u5f55(&R)
186.23 +UnitTab_ReloadAction=\u68c0\u67e5\u66f4\u65b0(&F)
186.24 UnitTab_PrepareReloadAction=\u8bf7\u7a0d\u5019, \u6b63\u5728\u91cd\u65b0\u52a0\u8f7d\u76ee\u5f55
186.25 UnitTab_RemoveLocallyDownloadedAction=\u5220\u9664(&R)
186.26 UnitTab_ActivateAction=\u6fc0\u6d3b(&A)
186.27 @@ -59,10 +68,6 @@
186.28 #NotificationAlreadyPreparedToIntsall=Plugin {0}, specification version {1} is already prepared to install.
186.29 CTL_FileChooser_Title=\u6dfb\u52a0\u63d2\u4ef6
186.30 CTL_FileFilterDescription=\u63d2\u4ef6\u5206\u53d1\u6587\u4ef6 (*.nbm)
186.31 -NetworkProblemPanel_taTitle_Text=\u65e0\u6cd5\u8fde\u63a5\u5230\u66f4\u65b0\u4e2d\u5fc3
186.32 -NetworkProblemPanel_taMessage_WarningText=\u68c0\u67e5\u4ee3\u7406\u8bbe\u7f6e\u6216\u7a0d\u540e\u91cd\u8bd5\u3002\u5f53\u524d\u8be5\u670d\u52a1\u5668\u4e0d\u53ef\u7528\u3002\n\n\u60a8\u53ef\u80fd\u8fd8\u9700\u8981\u786e\u4fdd\u9632\u706b\u5899\u4e0d\u4f1a\u963b\u585e\u7f51\u7edc\u901a\u4fe1\u3002
186.33 -NetworkProblemPanel_taMessage_WarningTextWithReload=\u68c0\u67e5\u4ee3\u7406\u8bbe\u7f6e\u6216\u7a0d\u540e\u91cd\u8bd5\u3002\u5f53\u524d\u8be5\u670d\u52a1\u5668\u4e0d\u53ef\u7528\u3002\n\n\u60a8\u53ef\u80fd\u8fd8\u9700\u8981\u786e\u4fdd\u9632\u706b\u5899\u4e0d\u4f1a\u963b\u585e\u7f51\u7edc\u901a\u4fe1\u3002\n\n\u60a8\u7684\u9ad8\u901f\u7f13\u5b58\u53ef\u80fd\u5df2\u8fc7\u671f\u3002\u8bf7\u5355\u51fb\u201c\u91cd\u65b0\u52a0\u8f7d\u76ee\u5f55\u201d\u4ee5\u5237\u65b0\u5185\u5bb9\u3002
186.34 -NetworkProblemPanel_taMessage_ErrorText=\u5e76\u975e\u5df2\u6210\u529f\u4e0b\u8f7d\u6240\u6709\u7684\u63d2\u4ef6\u3002\u5f53\u524d\u8be5\u670d\u52a1\u5668\u4e0d\u53ef\u7528\u3002\u8bf7\u7a0d\u540e\u91cd\u8bd5\u3002
186.35 CTL_Warning=\u8b66\u544a
186.36 CTL_Error=\u7f51\u7edc\u95ee\u9898
186.37 CTL_ShowProxyOptions=\u4ee3\u7406\u914d\u7f6e(&P)...
186.38 @@ -156,12 +161,11 @@
186.39 CTL_Update_every_month=\u6bcf\u6708
186.40 CTL_Update_never=\u4ece\u4e0d
186.41 CTL_Update_custom=\u7528\u6237\u9ed8\u8ba4\u8bbe\u7f6e
186.42 -SettingsTab.cbSharedInstall.text=\u5f3a\u5236\u5b89\u88c5\u5230\u5171\u4eab\u76ee\u5f55(&F)
186.43 SettingsTab.cbSharedInstall.ReadOnlyTitle=\u5199\u5165\u6743\u9650
186.44 -SettingsTab.cbSharedInstall.ReadOnlyMessage=\u60a8\u6ca1\u6709\u5728\u5171\u4eab\u76ee\u5f55\u4e2d\u5b89\u88c5\u63d2\u4ef6\u7684\u6743\u9650:\n{0}\n\u8981\u5728\u5171\u4eab\u76ee\u5f55\u4e2d\u6267\u884c\u5b89\u88c5, \u5e94\u4ee5\u5177\u6709\u7ba1\u7406\u6743\u9650\u7684\u7528\u6237\u8eab\u4efd\u8fd0\u884c\u5e94\u7528\u7a0b\u5e8f\u3002
186.45 +SettingsTab.cbSharedInstall.ReadOnlyMessage=\u60a8\u6ca1\u6709\u5728\u5171\u4eab\u76ee\u5f55\u4e2d\u5b89\u88c5\u63d2\u4ef6\u7684\u6743\u9650:\n{0}\n\u8981\u5728\u5171\u4eab\u76ee\u5f55\u4e2d\u6267\u884c\u5b89\u88c5, \u5e94\u5f53\u4ee5\u5177\u6709\u7ba1\u7406\u6743\u9650\u7684\u7528\u6237\u8eab\u4efd\u8fd0\u884c\u5e94\u7528\u7a0b\u5e8f\u3002
186.46 SettingsTab.cbSharedInstall.NoSharedTitle=\u65e0\u5b89\u88c5\u76ee\u5f55
186.47 SettingsTab.cbSharedInstall.NoSharedMessage=\u627e\u4e0d\u5230\u5171\u4eab\u7684\u76ee\u5f55\u3002
186.48 -HeaderPanel.button2.text=jButton2
186.49 +# HeaderPanel.button2.text=N/A
186.50 LocalDownloadSupport_BrokenNBM_Exception=\u7531\u4e8e{1}\u800c\u65e0\u6cd5\u8bfb\u53d6 NBM {0}
186.51 PluginManagerUI.bHelp.text=\u5e2e\u52a9(&H)
186.52 ACN_UnitTable=\u63d2\u4ef6\u5217\u8868
186.53 @@ -190,4 +194,8 @@
186.54 #SettingsTab_Splitter_DefaultDividerLocation=390
186.55 Unit_InternalUpdates_Version=(\u5185\u90e8\u66f4\u65b0)
186.56 Unit_InternalUpdates_Title=\u5185\u90e8\u66f4\u65b0
186.57 +ProblemPanel.cbShowAgain.text=\u4e0d\u518d\u663e\u793a\u6b64\u6d88\u606f(&D)
186.58 +SettingsTab.lLocation.text=\u63d2\u4ef6\u5b89\u88c5\u4f4d\u7f6e(&I):
186.59 +write_taMessage_WarningText=\u8981\u5728\u5171\u4eab\u76ee\u5f55\u4e2d\u6267\u884c\u5b89\u88c5, \u60a8\u5e94\u5f53\u4ee5\u5177\u6709\u7ba1\u7406\u6743\u9650\u7684\u7528\u6237\u8eab\u4efd\u8fd0\u884c\u5e94\u7528\u7a0b\u5e8f\u6216\u8005\u5c06\u63d2\u4ef6\u5b89\u88c5\u5230\u7528\u6237\u76ee\u5f55\u4e2d\u3002<br>\u60a8\u4e5f\u53ef\u4ee5\u5728<i>\u5de5\u5177 | \u63d2\u4ef6</i>\u5bf9\u8bdd\u6846\u7684\u201c\u8bbe\u7f6e\u201d\u9009\u9879\u5361\u4e2d\u66f4\u6539<i>\u63d2\u4ef6\u5b89\u88c5\u4f4d\u7f6e</i>\u3002
186.60 +write_taTitle_Text=\u60a8\u6ca1\u6709\u5728\u5b89\u88c5\u76ee\u5f55\u4e2d\u5b89\u88c5\u63d2\u4ef6\u7684\u6743\u9650\u3002
186.61
187.1 --- a/src/zh_CN/platform/autoupdate-ui/autoupdate-ui/org/netbeans/modules/autoupdate/ui/wizards/Bundle_zh_CN.properties Tue Jun 26 07:22:38 2012 +0900
187.2 +++ b/src/zh_CN/platform/autoupdate-ui/autoupdate-ui/org/netbeans/modules/autoupdate/ui/wizards/Bundle_zh_CN.properties Tue Jun 26 07:28:03 2012 +0900
187.3 @@ -1,3 +1,7 @@
187.4 +cancel=\u53d6\u6d88
187.5 +inBackground_WritePermission=\u60a8\u6ca1\u6709\u5728\u5b89\u88c5\u76ee\u5f55\u4e2d\u5b89\u88c5\u63d2\u4ef6\u7684\u6743\u9650\u3002
187.6 +inBackground_WritePermission_Details=\u8be6\u7ec6\u4fe1\u606f
187.7 +install=\u4ecd\u8981\u5b89\u88c5
187.8 OperationDescriptionStep_Header_Head=\u6b22\u8fce\u4f7f\u7528\u63d2\u4ef6\u5b89\u88c5\u7a0b\u5e8f
187.9 OperationDescriptionStep_Header_Content=\u6b64\u5b89\u88c5\u7a0b\u5e8f\u5c06\u4e0b\u8f7d, \u9a8c\u8bc1\u5e76\u968f\u540e\u5b89\u88c5\u9009\u5b9a\u7684\u63d2\u4ef6\u3002
187.10 OperationDescriptionStep_TableInstall_Title=\u5c06\u5b89\u88c5\u4ee5\u4e0b\u63d2\u4ef6:
188.1 --- a/src/zh_CN/platform/masterfs/masterfs/org/netbeans/modules/masterfs/resources/Bundle_zh_CN.properties Tue Jun 26 07:22:38 2012 +0900
188.2 +++ b/src/zh_CN/platform/masterfs/masterfs/org/netbeans/modules/masterfs/resources/Bundle_zh_CN.properties Tue Jun 26 07:28:03 2012 +0900
188.3 @@ -46,18 +46,10 @@
188.4 OpenIDE-Module-Short-Description=\u5c06\u591a\u4e2a\u6587\u4ef6\u7cfb\u7edf\u63d0\u4f9b\u5668\u5408\u5e76\u5230\u4e00\u4e2a\u903b\u8f91\u6811\u4e2d\u3002
188.5 OpenIDE-Module-Long-Description=\u4e3a\u78c1\u76d8\u6839\u521b\u5efa\u63a5\u5165\u70b9, \u7136\u540e\u5728\u5176\u4ed6\u6587\u4ef6\u7cfb\u7edf (\u4f8b\u5982 VCS \u63a5\u5165\u70b9) \u4e2d\u8fdb\u884c\u8fde\u63a5, \u4ece\u800c\u4e3a\u6240\u6709\u63a5\u5165\u70b9\u63d0\u4f9b\u4e00\u4e2a\u5305\u88c5\u5668\u6587\u4ef6\u7cfb\u7edf\u3002
188.6
188.7 -LBL_loaderName=MasterFileSystem \u7684 FolderLoader
188.8 -
188.9 # {0} = name of FS
188.10 EXC_CannotRenameRoot=\u65e0\u6cd5\u91cd\u547d\u540d\u6587\u4ef6\u7cfb\u7edf{0}\u7684\u6839\u3002
188.11
188.12 # {0} = name of FS
188.13 -EXC_CannotCopyRoot=\u65e0\u6cd5\u590d\u5236\u6587\u4ef6\u7cfb\u7edf{0}\u7684\u6839\u3002
188.14 -
188.15 -# {0} = name of FS
188.16 -EXC_CannotMoveRoot=\u65e0\u6cd5\u79fb\u52a8\u6587\u4ef6\u7cfb\u7edf{0}\u7684\u6839\u3002
188.17 -
188.18 -# {0} = name of FS
188.19 EXC_CannotDeleteRoot=\u65e0\u6cd5\u5220\u9664\u6587\u4ef6\u7cfb\u7edf{0}\u7684\u6839\u3002
188.20
188.21 # {0} = original name of the file
188.22 @@ -65,19 +57,4 @@
188.23 # {2} = new name of the file (with extension)
188.24 EXC_CannotRename=\u65e0\u6cd5\u5c06 {1} \u4e2d\u7684\u6587\u4ef6{0}\u91cd\u547d\u540d\u4e3a{2}\u3002
188.25
188.26 -# {0} = display name of the filesystem
188.27 -EXC_FSisRO=\u6587\u4ef6\u7cfb\u7edf{0}\u662f\u53ea\u8bfb\u7684\u3002
188.28
188.29 -# {0} = display name of the filesystem
188.30 -# {1} = path of mountPoint
188.31 -# {2} = display name of the filesystem, that is already mounted
188.32 -EXC_AlreadyMounted=\u65e0\u6cd5\u5728\u6839{0}\u4e0a\u9644\u52a0\u6587\u4ef6\u7cfb\u7edf{1}, \u56e0\u4e3a\u5df2\u9644\u52a0\u4e86\u6587\u4ef6\u7cfb\u7edf{2}\u3002
188.33 -
188.34 -
188.35 -# {0} = display name of the filesystem
188.36 -# {1} = path of mountPoint
188.37 -EXC_CannotMount=\u65e0\u6cd5\u5728\u6839{0}\u4e0a\u9644\u52a0\u6587\u4ef6\u7cfb\u7edf{1}\u3002
188.38 -
188.39 -# {0} = display name of the filesystem
188.40 -EXC_CannotUnMount=\u65e0\u6cd5\u53d6\u6d88\u9644\u52a0\u6587\u4ef6\u7cfb\u7edf{0}\u3002
188.41 -
189.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
189.2 +++ b/src/zh_CN/platform/options-api/options-api/org/netbeans/api/options/Bundle_zh_CN.properties Tue Jun 26 07:28:03 2012 +0900
189.3 @@ -0,0 +1,2 @@
189.4 +CTL_Loading_Options_Waiting=\u52a0\u8f7d\u9009\u9879\u8bbe\u7f6e
189.5 +
190.1 --- a/src/zh_CN/platform/options-keymap/options-keymap/org/netbeans/modules/options/keymap/Bundle_zh_CN.properties Tue Jun 26 07:22:38 2012 +0900
190.2 +++ b/src/zh_CN/platform/options-keymap/options-keymap/org/netbeans/modules/options/keymap/Bundle_zh_CN.properties Tue Jun 26 07:28:03 2012 +0900
190.3 @@ -138,10 +138,10 @@
190.4 Alternative_Shortcut=(\u66ff\u4ee3\u5feb\u6377\u952e)
190.5
190.6 #Table columns
190.7 -Actions=\u64cd\u4f5c
190.8 -Shortcut=\u5feb\u6377\u952e
190.9 -Category=\u7c7b\u522b
190.10 -Scope=\u8303\u56f4
190.11 +ActionsColumnName=\u64cd\u4f5c
190.12 +ShortcutColumnName=\u5feb\u6377\u952e
190.13 +CategoryColumnName=\u7c7b\u522b
190.14 +ScopeColumnName=\u8303\u56f4
190.15
190.16 #Keymap Popup
190.17 Edit=\u7f16\u8f91...
190.18 @@ -194,3 +194,7 @@
190.19 SpecialkeyPanel.wheelUpButton.text_1=\u5411\u4e0a\u6eda\u52a8
190.20 SpecialkeyPanel.wheelDownButton.text_1=\u5411\u4e0b\u6eda\u52a8
190.21
190.22 +
190.23 +Import.failed.unknown.id=\u67d0\u4e9b\u64cd\u4f5c\u672a\u627e\u5230, \u56e0\u6b64\u672a\u5bfc\u5165\u5176\u7ed1\u5b9a, \u6709\u5173\u8be6\u7ec6\u4fe1\u606f, \u8bf7\u53c2\u89c1\u65e5\u5fd7
190.24 +Import.failed.title=\u5bfc\u5165\u5feb\u6377\u952e\u6620\u5c04\u914d\u7f6e\u6587\u4ef6
190.25 +
191.1 --- a/src/zh_CN/platform/org-netbeans-api-search/org-netbeans-api-search/org/netbeans/modules/search/Bundle_zh_CN.properties Tue Jun 26 07:22:38 2012 +0900
191.2 +++ b/src/zh_CN/platform/org-netbeans-api-search/org-netbeans-api-search/org/netbeans/modules/search/Bundle_zh_CN.properties Tue Jun 26 07:28:03 2012 +0900
191.3 @@ -197,14 +197,10 @@
191.4 #root node in the empty Search Results window
191.5 TEXT_Search_in_filesystems=\u5728\u9879\u76ee\u4e2d\u67e5\u627e
191.6
191.7 -LBL_Action_FindInFiles=\u5728\u6587\u4ef6\u4e2d\u67e5\u627e...
191.8 LBL_Action_FindInProjects=\u5728\u9879\u76ee\u4e2d\u67e5\u627e(&J)...
191.9 -LBL_Action_ReplaceInFiles=\u5728\u6587\u4ef6\u4e2d\u66ff\u6362...
191.10 LBL_Action_ReplaceInProjects=\u5728\u9879\u76ee\u4e2d\u66ff\u6362(&C)...
191.11
191.12 -LBL_FindInFiles=\u5728\u6587\u4ef6\u4e2d\u67e5\u627e
191.13 LBL_FindInProjects=\u5728\u9879\u76ee\u4e2d\u67e5\u627e
191.14 -LBL_ReplaceInFiles=\u5728\u6587\u4ef6\u4e2d\u66ff\u6362
191.15 LBL_ReplaceInProjects=\u5728\u9879\u76ee\u4e2d\u66ff\u6362
191.16
191.17 BasicSearchForm.tabText=\u9ed8\u8ba4\u641c\u7d22
192.1 --- a/src/zh_CN/platform/org-netbeans-core-multiview/org-netbeans-core-multiview/org/netbeans/core/multiview/Bundle_zh_CN.properties Tue Jun 26 07:22:38 2012 +0900
192.2 +++ b/src/zh_CN/platform/org-netbeans-core-multiview/org-netbeans-core-multiview/org/netbeans/core/multiview/Bundle_zh_CN.properties Tue Jun 26 07:28:03 2012 +0900
192.3 @@ -41,7 +41,9 @@
192.4 # made subject to such option by the copyright holder.
192.5
192.6 CTL_EditorsAction=\u7f16\u8f91\u5668(&E)
192.7 +CTL_EmptyViewName=\u7a7a
192.8 EditorsAction.source=\u6e90(&S)
192.9 +ERR_EmptyView=\u627e\u4e0d\u5230 mime \u7c7b\u578b "{0}" \u7684\u6ce8\u518c\u3002\u8bf7\u8003\u8651\u4f7f\u7528 @MultiViewElement.Registration!
192.10 GetLeftEditorAction.name=\u7f16\u8f91\u5668 - \u8f6c\u5411\u5de6\u4fa7
192.11
192.12 GetRightEditorAction.name=\u7f16\u8f91\u5668 - \u8f6c\u5411\u53f3\u4fa7
193.1 --- a/src/zh_CN/platform/org-netbeans-core-output2/org-netbeans-core-output2/org/netbeans/core/output2/Bundle_zh_CN.properties Tue Jun 26 07:22:38 2012 +0900
193.2 +++ b/src/zh_CN/platform/org-netbeans-core-output2/org-netbeans-core-output2/org/netbeans/core/output2/Bundle_zh_CN.properties Tue Jun 26 07:28:03 2012 +0900
193.3 @@ -133,7 +133,7 @@
193.4 #Macintosh popup menu accelerators
193.5 #ACTION_COPY.accel.mac=M-C
193.6 #ACTION_PASTE.accel.mac=M-V
193.7 -#ACTION_LARGER_FONT.accel.mac=M-PLUS
193.8 +#ACTION_LARGER_FONT.accel.mac=M-EQUALS
193.9 #ACTION_SMALLER_FONT.accel.mac=M-MINUS
193.10 #ACTION_FONT_TYPE.accel.mac=
193.11 #ACTION_WRAP.accel.mac=M-R
194.1 --- a/src/zh_CN/platform/org-netbeans-core-ui/org-netbeans-core-ui/org/netbeans/core/ui/options/general/Bundle_zh_CN.properties Tue Jun 26 07:22:38 2012 +0900
194.2 +++ b/src/zh_CN/platform/org-netbeans-core-ui/org-netbeans-core-ui/org/netbeans/core/ui/options/general/Bundle_zh_CN.properties Tue Jun 26 07:28:03 2012 +0900
194.3 @@ -62,9 +62,9 @@
194.4 CTL_Usage_Check=\u901a\u8fc7\u63d0\u4f9b\u533f\u540d\u4f7f\u7528\u6570\u636e, \u5e2e\u52a9\u6211\u4eec\u6539\u8fdb NetBeans IDE(&P)
194.5 AN_Usage_Check=\u901a\u8fc7\u63d0\u4f9b\u533f\u540d\u4f7f\u7528\u6570\u636e, \u5e2e\u52a9\u6211\u4eec\u6539\u8fdb NetBeans IDE
194.6 AD_Usage_Check=\u901a\u8fc7\u63d0\u4f9b\u533f\u540d\u4f7f\u7528\u6570\u636e, \u5e2e\u52a9\u6211\u4eec\u6539\u8fdb NetBeans IDE
194.7 -CTL_Usage_Info=<html>\u4f7f\u7528\u60c5\u51b5\u7edf\u8ba1\u4fe1\u606f\u53ef\u5e2e\u52a9\u6211\u4eec\u66f4\u597d\u5730\u4e86\u89e3\u7528\u6237\u7684\u9700\u6c42, \u5e76\u4f1a\u5728\u5c06\u6765\u7684\u53d1\u884c\u7248\u4e2d\u4f18\u5148\u6539\u8fdb\u3002\u6211\u4eec\u51b3\u4e0d\u4f1a\u5bf9\u6536\u96c6\u7684\u6570\u636e\u6267\u884c\u9006\u5411\u5de5\u7a0b\u4ee5\u4e86\u89e3\u6709\u5173\u60a8\u7684\u9879\u76ee\u7684\u7279\u5b9a\u8be6\u7ec6\u4fe1\u606f\u3002</html>
194.8 +CTL_Usage_Info=<html>\u4f7f\u7528\u60c5\u51b5\u7edf\u8ba1\u4fe1\u606f\u53ef\u5e2e\u52a9\u6211\u4eec\u66f4\u597d\u5730\u4e86\u89e3\u7528\u6237\u7684\u9700\u6c42, \u5e76\u4f1a\u5728\u5c06\u6765\u7684\u53d1\u884c\u7248\u4e2d\u4f18\u5148\u6539\u8fdb\u3002\u6211\u4eec\u51b3\u4e0d\u4f1a\u5bf9\u6536\u96c6\u7684\u6570\u636e\u6267\u884c\u9006\u5411\u5de5\u7a0b\u4ee5\u4e86\u89e3\u6709\u5173\u60a8\u9879\u76ee\u7684\u7279\u5b9a\u8be6\u7ec6\u4fe1\u606f\u3002</html>
194.9 AN_Usage_Info=\u4f7f\u7528\u60c5\u51b5\u7edf\u8ba1\u4fe1\u606f
194.10 -AD_Usage_Info=\u4f7f\u7528\u60c5\u51b5\u7edf\u8ba1\u4fe1\u606f\u53ef\u5e2e\u52a9\u6211\u4eec\u66f4\u597d\u5730\u4e86\u89e3\u7528\u6237\u7684\u9700\u6c42, \u5e76\u4f1a\u5728\u5c06\u6765\u7684\u53d1\u884c\u7248\u4e2d\u4f18\u5148\u6539\u8fdb\u3002\u6211\u4eec\u51b3\u4e0d\u4f1a\u5bf9\u6536\u96c6\u7684\u6570\u636e\u6267\u884c\u9006\u5411\u5de5\u7a0b\u4ee5\u4e86\u89e3\u6709\u5173\u60a8\u7684\u9879\u76ee\u7684\u7279\u5b9a\u8be6\u7ec6\u4fe1\u606f\u3002
194.11 +AD_Usage_Info=\u4f7f\u7528\u60c5\u51b5\u7edf\u8ba1\u4fe1\u606f\u53ef\u5e2e\u52a9\u6211\u4eec\u66f4\u597d\u5730\u4e86\u89e3\u7528\u6237\u7684\u9700\u6c42, \u5e76\u4f1a\u5728\u5c06\u6765\u7684\u53d1\u884c\u7248\u4e2d\u4f18\u5148\u6539\u8fdb\u3002\u6211\u4eec\u51b3\u4e0d\u4f1a\u5bf9\u6536\u96c6\u7684\u6570\u636e\u6267\u884c\u9006\u5411\u5de5\u7a0b\u4ee5\u4e86\u89e3\u6709\u5173\u60a8\u9879\u76ee\u7684\u7279\u5b9a\u8be6\u7ec6\u4fe1\u606f\u3002
194.12
194.13 CTL_Learn_More=<html><font color="#0000FF" <u>\u4e86\u89e3\u66f4\u591a\u4fe1\u606f</u></font></html>
194.14 AN_Learn_More=\u4e86\u89e3\u66f4\u591a\u4fe1\u606f
195.1 --- a/src/zh_CN/platform/org-netbeans-core-windows/org-netbeans-core-windows/org/netbeans/core/windows/Bundle_zh_CN.properties Tue Jun 26 07:22:38 2012 +0900
195.2 +++ b/src/zh_CN/platform/org-netbeans-core-windows/org-netbeans-core-windows/org/netbeans/core/windows/Bundle_zh_CN.properties Tue Jun 26 07:28:03 2012 +0900
195.3 @@ -89,5 +89,5 @@
195.4 #NOI18N
195.5 #WinSys.TabControl.SimpleTabs.MultiRow=true
195.6 #NOI18N
195.7 -#WinSys.CtrlTabSwitching.In.JTable.Enabled=true
195.8 +#WinSys.CtrlTabSwitching.In.JTable.Enabled=false
195.9
196.1 --- a/src/zh_CN/platform/org-netbeans-core-windows/org-netbeans-core-windows/org/netbeans/core/windows/options/Bundle_zh_CN.properties Tue Jun 26 07:22:38 2012 +0900
196.2 +++ b/src/zh_CN/platform/org-netbeans-core-windows/org-netbeans-core-windows/org/netbeans/core/windows/options/Bundle_zh_CN.properties Tue Jun 26 07:28:03 2012 +0900
196.3 @@ -63,7 +63,7 @@
196.4 WinSysPanel.isCloseActivatesMostRecentDocument.AccessibleContext.accessibleDescription=\u5173\u95ed\u6587\u6863\u65f6\u6fc0\u6d3b\u6700\u8fd1\u7684\u6587\u6863
196.5
196.6 KW_WindowOptions=\u7a97\u53e3\u9009\u9879,\u5916\u89c2
196.7 -WinSysPanel.isNewDocumentOpensNextToActiveTab.text=\u5c06\u6d3b\u52a8\u6587\u6863\u6807\u7b7e\u65c1\u8fb9\u6253\u5f00\u65b0\u6587\u6863
196.8 +WinSysPanel.isNewDocumentOpensNextToActiveTab.text=\u5728\u6d3b\u52a8\u6587\u6863\u6807\u7b7e\u65c1\u8fb9\u6253\u5f00\u65b0\u6587\u6863
196.9 WinSysPanel.jLabel1.text=\u6807\u7b7e\u4f4d\u7f6e:
196.10 WinSysPanel.jLabel2.text=\u6587\u6863\u6807\u7b7e
196.11 WinSysPanel.checkMultiRow.text=\u591a\u884c\u6807\u7b7e
197.1 --- a/src/zh_CN/platform/org-netbeans-core/org-netbeans-core/org/netbeans/core/ui/Bundle_zh_CN.properties Tue Jun 26 07:22:38 2012 +0900
197.2 +++ b/src/zh_CN/platform/org-netbeans-core/org-netbeans-core/org/netbeans/core/ui/Bundle_zh_CN.properties Tue Jun 26 07:28:03 2012 +0900
197.3 @@ -40,6 +40,7 @@
197.4 # Version 2 license, then the option applies only if the new code is
197.5 # made subject to such option by the copyright holder.
197.6
197.7 +check_for_updates=\u68c0\u67e5\u66f4\u65b0
197.8 # Product Information panel
197.9 LBL_Copyright=<div style="font-size: 12pt; font-family: Verdana, 'Verdana CE', Arial, 'Arial CE', 'Lucida Grande CE', lucida, 'Helvetica CE', sans-serif;">NetBeans IDE \u548c NetBeans \u5e73\u53f0\u4ee5 netbeans.org \u7684\u8f6f\u4ef6\u4e3a\u57fa\u7840\u5f00\u53d1, \u8be5\u8f6f\u4ef6\u5df2\u83b7\u5f97\u901a\u7528\u5f00\u53d1\u548c\u5206\u53d1\u8bb8\u53ef\u8bc1 (CDDL) \u4ee5\u53ca GNU \u901a\u7528\u516c\u5171\u8bb8\u53ef\u8bc1\u7b2c 2 \u7248\u7684\u53cc\u91cd\u8bb8\u53ef (\u7c7b\u8def\u5f84\u9664\u5916)\u3002\u6709\u5173\u8be6\u7ec6\u4fe1\u606f, \u8bf7\u8bbf\u95ee <a style="color: #1E2A60;" href="http://www.netbeans.org">www.netbeans.org</a>\u3002</div>
197.10 LBL_AddOnCopyright=<div style="font-size: 12pt; font-family: Verdana, ''Verdana CE'', Arial, ''Arial CE'', ''Lucida Grande CE'', lucida, ''Helvetica CE'', sans-serif;">{0} </div>
197.11 @@ -52,7 +53,13 @@
197.12 # {5} - locale
197.13 # {6} - user dir
197.14 # {7} - cache dir
197.15 -LBL_description=<div style="font-size: 12pt; font-family: Verdana, ''Verdana CE'', Arial, ''Arial CE'', ''Lucida Grande CE'', lucida, ''Helvetica CE'', sans-serif;"><p style="margin: 0"><b>\u4ea7\u54c1\u7248\u672c:</b> {0}</p>\n <p style="margin: 0"><b>Java:</b> {1}; {2}</p>\n <p style="margin: 0"><b>\u7cfb\u7edf:</b> {3}; {4}; {5}</p>\n <p style="margin: 0"><b>\u7528\u6237\u76ee\u5f55:</b> {6}</p>\n <p style="margin: 0"><b>\u9ad8\u901f\u7f13\u5b58\u76ee\u5f55:</b> {7}</p></div>
197.16 +# {8} - updates
197.17 +LBL_description=<div style="font-size: 12pt; font-family: Verdana, ''Verdana CE'', Arial, ''Arial CE'', ''Lucida Grande CE'', lucida, ''Helvetica CE'', sans-serif;"><p style="margin: 0"><b>Product Version:</b> {0}</p>\n {8}<p style="margin: 0"><b>Java:</b> {1}; {2}</p>\n <p style="margin: 0"><b>\u7cfb\u7edf:</b> {3}; {4}; {5}</p>\n <p style="margin: 0"><b>\u7528\u6237\u76ee\u5f55:</b> {6}</p>\n <p style="margin: 0"><b>\u9ad8\u901f\u7f13\u5b58\u76ee\u5f55:</b> {7}</p></div>
197.18 +to_version=\u81f3\u7248\u672c {0}
197.19 +# {0} - content description
197.20 +updates_found=<p style="margin: 0"><b>\u66f4\u65b0:</b> <a href="check-for-updates">\u6709\u53ef\u7528\u7684\u66f4\u65b0</a> {0}</p>\n
197.21 +# {0} - content description
197.22 +updates_not_found=<p style="margin: 0"><b>\u66f4\u65b0:</b> NetBeans IDE \u5df2\u66f4\u65b0\u5230\u7248\u672c {0}</p>\n
197.23 #NOI18N
197.24 #URL_ON_IMG=http://www.netbeans.org/
197.25
197.26 @@ -64,3 +71,4 @@
197.27 # MNE_Close=C
197.28 ACSN_Close=\u5173\u95ed
197.29 ACSD_Close=\u5173\u95ed
197.30 +
198.1 --- a/src/zh_CN/platform/org-netbeans-libs-felix/org-netbeans-libs-felix/org/netbeans/libs/felix/Bundle_zh_CN.properties Tue Jun 26 07:22:38 2012 +0900
198.2 +++ b/src/zh_CN/platform/org-netbeans-libs-felix/org-netbeans-libs-felix/org/netbeans/libs/felix/Bundle_zh_CN.properties Tue Jun 26 07:28:03 2012 +0900
198.3 @@ -41,4 +41,3 @@
198.4 # made subject to such option by the copyright holder.
198.5
198.6 OpenIDE-Module-Name=Apache \u7684 Felix OSGi \u5b9e\u73b0
198.7 -
199.1 --- a/src/zh_CN/platform/org-openide-loaders/org-openide-loaders/org/openide/loaders/Bundle_zh_CN.properties Tue Jun 26 07:22:38 2012 +0900
199.2 +++ b/src/zh_CN/platform/org-openide-loaders/org-openide-loaders/org/openide/loaders/Bundle_zh_CN.properties Tue Jun 26 07:28:03 2012 +0900
199.3 @@ -40,6 +40,7 @@
199.4 # Version 2 license, then the option applies only if the new code is
199.5 # made subject to such option by the copyright holder.
199.6
199.7 +CTL_SettingsFile=\u8bbe\u7f6e\u6587\u4ef6
199.8 EXC_NO_LONGER_VALID=\u590d\u5236\u7684\u6587\u4ef6{0}\u4e0d\u518d\u6709\u6548!
199.9 OpenIDE-Module-Name=\u6570\u636e\u7cfb\u7edf API
199.10 OpenIDE-Module-Short-Description=\u7528\u4e8e\u64cd\u4f5c\u6570\u636e\u5bf9\u8c61\u7684 NetBeans Open API\u3002
200.1 --- a/src/zh_CN/profiler/profiler-heapwalker/profiler-heapwalker/org/netbeans/modules/profiler/heapwalk/Bundle_zh_CN.properties Tue Jun 26 07:22:38 2012 +0900
200.2 +++ b/src/zh_CN/profiler/profiler-heapwalker/profiler-heapwalker/org/netbeans/modules/profiler/heapwalk/Bundle_zh_CN.properties Tue Jun 26 07:28:03 2012 +0900
200.3 @@ -44,6 +44,7 @@
200.4 AnalysisController_CannotResolveInstanceMsg=\u65e0\u6cd5\u89e3\u6790\u7c7b{1}\u7684\u5b9e\u4f8b #{0}
200.5 ClassesListController_AnalyzingClassesMsg=\u6b63\u5728\u5206\u6790\u7c7b...
200.6 ClassesListController_ArrayTypeString=\u6570\u7ec4\u7c7b\u578b
200.7 +ClassesListController_CompareFailed=\u65e0\u6cd5\u52a0\u8f7d\u8981\u6bd4\u8f83\u7684\u5806\u8f6c\u50a8\u3002
200.8 ClassesListController_GcRootString=\u5783\u573e\u56de\u6536\u6839\u8282\u70b9
200.9 ClassesListController_HeapWalkerDefaultName=\u5806\u67e5\u770b\u5668
200.10 ClassesListController_LoadingDumpMsg=\u6b63\u5728\u52a0\u8f7d\u5806\u8f6c\u50a8...
201.1 --- a/src/zh_CN/profiler/profiler-nbimpl/profiler-nbimpl/org/netbeans/modules/profiler/nbimpl/providers/Bundle_zh_CN.properties Tue Jun 26 07:22:38 2012 +0900
201.2 +++ b/src/zh_CN/profiler/profiler-nbimpl/profiler-nbimpl/org/netbeans/modules/profiler/nbimpl/providers/Bundle_zh_CN.properties Tue Jun 26 07:28:03 2012 +0900
201.3 @@ -45,7 +45,7 @@
201.4 # {0} - full target name Class.Method(Signature)
201.5 # {1} - line number
201.6 MSG_OpeningOnLine=\u6253\u5f00{0}, \u884c {1}
201.7 -MSG_ScanningInProgress=\u6b63\u5728\u626b\u63cf...
201.8 +MSG_ScanningInProgress=\u8bf7\u7a0d\u5019...
201.9 ProjectStorageProviderImpl_ErrorSavingAttachSettingsMessage=\u5728\u4fdd\u5b58\u8fde\u63a5\u8bbe\u7f6e\u65f6\u9047\u5230\u9519\u8bef: {0}
201.10 TXT_Question=\u95ee\u9898
201.11
202.1 --- a/src/zh_CN/profiler/profiler/profiler/org/netbeans/modules/profiler/Bundle_zh_CN.properties Tue Jun 26 07:22:38 2012 +0900
202.2 +++ b/src/zh_CN/profiler/profiler/profiler/org/netbeans/modules/profiler/Bundle_zh_CN.properties Tue Jun 26 07:28:03 2012 +0900
202.3 @@ -96,7 +96,7 @@
202.4 History_LoggingResetMsg=\u8fd9\u5c06\u91cd\u7f6e{0}\u7684\u5386\u53f2\u8bb0\u5f55\u3002\n\u662f\u5426\u8981\u7ee7\u7eed\u6267\u884c?
202.5 History_LoggingStopMsg=\u8fd9\u5c06\u505c\u6b62{0}\u7684\u5386\u53f2\u8bb0\u5f55\u3002\n\u662f\u5426\u8981\u7ee7\u7eed\u6267\u884c?
202.6 LAB_ControlPanelName=\u5206\u6790\u5668
202.7 -LAB_ResultsWindowName=\u5b9e\u65f6\u6027\u80fd\u5206\u6790\u7ed3\u679c
202.8 +LAB_ResultsWindowName=\u5b9e\u65f6\u7ed3\u679c
202.9 LAB_TelemetryOverviewPanelName=VM \u9065\u6d4b\u6982\u89c8
202.10 LAB_TelemetryWindowName=VM \u9065\u6d4b
202.11 LiveResultsWindow_ClassHistoryTabName={0}\u7684\u5386\u53f2\u8bb0\u5f55
202.12 @@ -184,6 +184,7 @@
202.13 ProfilerControlPanel2_DeleteButtonAccessDescr=\u5220\u9664\u9009\u5b9a\u7684\u5feb\u7167\u3002
202.14 ProfilerControlPanel2_DeleteButtonName=\u5220\u9664
202.15 ProfilerControlPanel2_DumpHeapButtonName=\u5806\u8f6c\u50a8
202.16 +ProfilerControlPanel2_EmptyNameMsg=\u5feb\u7167\u540d\u79f0\u4e0d\u80fd\u4e3a\u7a7a\u3002
202.17 ProfilerControlPanel2_EntireAppLabelString=\u6574\u4e2a\u5e94\u7528\u7a0b\u5e8f
202.18 ProfilerControlPanel2_ExportButtonAccessDescr=\u5c06\u9009\u5b9a\u7684\u5feb\u7167\u53e6\u5b58\u4e3a\u4e00\u4e2a\u5355\u72ec\u7684\u6587\u4ef6\u3002
202.19 ProfilerControlPanel2_ExportButtonName=\u53e6\u5b58\u4e3a...
202.20 @@ -385,7 +386,7 @@
202.21 SnapshotResultsWindow_MemorySnapshotAccessDescr=\u5177\u6709\u5185\u5b58\u5206\u6790\u7ed3\u679c\u7684\u5206\u6790\u5668\u5feb\u7167
202.22 SnapshotResultsWindow_SaveSnapshotDialogMsg=\u672a\u4fdd\u5b58\u7ed3\u679c\u5feb\u7167\u3002\u662f\u5426\u8981\u8fdb\u884c\u4fdd\u5b58?
202.23 Surviving_Generations=\u5b58\u6d3b\u7684\u5e74\u4ee3\u6570
202.24 -TelemetryOverviewPanel_TelemetryOverviewAccessDescr=\u5206\u6790\u5668\u9065\u6d4b\u6982\u89c8
202.25 +TelemetryOverviewPanel_TelemetryOverviewAccessDescr=VM \u9065\u6d4b\u6982\u89c8
202.26 TelemetryWindow_MemoryGCTabDescr=\u663e\u793a\u5b58\u6d3b\u7684\u5e74\u4ee3\u6570\u4ee5\u53ca\u5728\u5783\u573e\u56de\u6536\u4e0a\u82b1\u8d39\u7684\u65f6\u95f4\u7684\u56fe\u5f62
202.27 TelemetryWindow_MemoryGCTabName=\u5185\u5b58 (\u5783\u573e\u56de\u6536)
202.28 TelemetryWindow_MemoryHeapTabDescr=\u663e\u793a\u5806\u5927\u5c0f\u548c\u4f7f\u7528\u60c5\u51b5\u7684\u56fe\u5f62
203.1 --- a/src/zh_CN/profiler/profiler/profiler/org/netbeans/modules/profiler/actions/Bundle_zh_CN.properties Tue Jun 26 07:22:38 2012 +0900
203.2 +++ b/src/zh_CN/profiler/profiler/profiler/org/netbeans/modules/profiler/actions/Bundle_zh_CN.properties Tue Jun 26 07:28:03 2012 +0900
203.3 @@ -118,7 +118,7 @@
203.4 HINT_ShowTelemetryViewAction=\u663e\u793a VM \u9065\u6d4b\u89c6\u56fe
203.5 HINT_StopAction=\u505c\u6b62 (\u7ec8\u6b62) \u5206\u6790\u7684\u5e94\u7528\u7a0b\u5e8f
203.6 HINT_TakeSnapshotAction=\u751f\u6210\u6536\u96c6\u7ed3\u679c\u7684\u5feb\u7167
203.7 -HINT_TelemetryOverviewAction=\u9065\u6d4b\u6982\u89c8
203.8 +HINT_TelemetryOverviewAction=VM \u9065\u6d4b\u6982\u89c8
203.9 JavaPlatformSelector_CannotUsePlatform=\u8fd0\u884c\u6b64\u9879\u76ee\u7684 Java \u5e73\u53f0\u4e0d\u80fd\u7528\u4e8e\u6027\u80fd\u5206\u6790\u3002
203.10 JavaPlatformSelector_ListAccessName=\u53ef\u7528\u4e8e\u6027\u80fd\u5206\u6790\u7684 Java \u5e73\u53f0\u5217\u8868
203.11 JavaPlatformSelector_NoSupportedPlatformMsg=\u5b89\u88c5\u7684 Java \u5e73\u53f0\u5747\u4e0d\u80fd\u7528\u4e8e\u6027\u80fd\u5206\u6790\u3002\nNetBeans \u5206\u6790\u5668\u8981\u6c42 JDK 5.0 Update 4 \u53ca\u66f4\u9ad8\u7248\u672c\u3002\n\n\u8bf7\u5b89\u88c5\u5408\u9002\u7684 Java \u5e73\u53f0\u5e76\u91cd\u65b0\u8fd0\u884c\u6821\u51c6\u3002
203.12 @@ -130,7 +130,7 @@
203.13 JavaPlatformSelector_UseSelPlatformChckBoxName=\u59cb\u7ec8\u4f7f\u7528\u9009\u5b9a\u7684\u5e73\u53f0\u8fdb\u884c\u6027\u80fd\u5206\u6790
203.14 LBL_AddRootMethodAction=\u6dfb\u52a0\u4e3a\u6027\u80fd\u5206\u6790\u6839\u65b9\u6cd5...
203.15 LBL_AttachMainProjectAction=\u8fde\u63a5\u5206\u6790\u5668(&A)...
203.16 -LBL_ControlPanelAction=\u5206\u6790\u5668\u63a7\u5236\u9762\u677f(&C)
203.17 +LBL_ControlPanelAction=\u5206\u6790\u5668(&R)
203.18 LBL_DetachAction=\u4e2d\u65ad\u8fde\u63a5...
203.19 LBL_GetCmdLineArgumentsAction=\u67e5\u770b\u547d\u4ee4\u884c\u53c2\u6570(&V)
203.20 LBL_InternalStatsAction=\u663e\u793a\u5185\u90e8\u7edf\u8ba1\u4fe1\u606f(&D)
203.21 @@ -173,7 +173,7 @@
203.22 LBL_ShowTelemetryViewAction=VM \u9065\u6d4b(&V)
203.23 LBL_StopAction=\u505c\u6b62\u6027\u80fd\u5206\u6790\u4f1a\u8bdd(&S)
203.24 LBL_TakeSnapshotAction=\u751f\u6210\u6536\u96c6\u7ed3\u679c\u7684\u5feb\u7167(&T)
203.25 -LBL_TelemetryOverviewAction=\u9065\u6d4b\u6982\u89c8(&O)
203.26 +LBL_TelemetryOverviewAction=VM \u9065\u6d4b\u6982\u89c8(&O)
203.27 LoadSnapshotAction_ActionDescr=\u4ece\u78c1\u76d8\u52a0\u8f7d\u6027\u80fd\u5206\u6790\u7ed3\u679c\u5feb\u7167
203.28 LoadSnapshotAction_ActionName=\u52a0\u8f7d\u5feb\u7167(&L)...
203.29 LoadSnapshotAction_No_Snapshot_Selected=\u4e0d\u662f .nps \u5feb\u7167\u6587\u4ef6