1.1 --- a/src/zh_CN/apisupport/apisupport-ant/apisupport-ant/org/netbeans/modules/apisupport/project/queries/Bundle_zh_CN.properties Wed Jul 30 05:03:48 2014 -0700
1.2 +++ b/src/zh_CN/apisupport/apisupport-ant/apisupport-ant/org/netbeans/modules/apisupport/project/queries/Bundle_zh_CN.properties Wed Jul 30 05:12:06 2014 -0700
1.3 @@ -47,4 +47,6 @@
1.4 ERR_unsupported_library=\u65e0\u6cd5\u5c06\u5e93{0}\u6309\u539f\u6837\u6dfb\u52a0\u5230\u6b64\u6a21\u5757\u4e2d\u3002\u4e3a\u5176\u521b\u5efa\u5e93\u5305\u88c5\u6a21\u5757, \u5e76\u5c06\u5176\u6dfb\u52a0\u4e3a\u4f9d\u8d56\u5173\u7cfb\u3002
1.5 # {0} - JAR name
1.6 ERR_jar=\u65e0\u6cd5\u5c06 JAR {0} \u6309\u539f\u6837\u6dfb\u52a0\u5230\u6b64\u6a21\u5757\u4e2d\u3002\u4e3a\u5176\u521b\u5efa\u5e93\u5305\u88c5\u6a21\u5757, \u5e76\u5c06\u5176\u6dfb\u52a0\u4e3a\u4f9d\u8d56\u5173\u7cfb\u3002
1.7 +TITLE_getting_module_list=\u83b7\u53d6\u6a21\u5757\u5217\u8868
1.8 +WRN_problem_getting_module_list=\u83b7\u53d6\u6a21\u5757\u5217\u8868\u65f6\u51fa\u73b0\u95ee\u9898\u3002
1.9
2.1 --- a/src/zh_CN/apisupport/apisupport-wizards/apisupport-wizards/org/netbeans/modules/apisupport/project/ui/wizard/layer/Bundle_zh_CN.properties Wed Jul 30 05:03:48 2014 -0700
2.2 +++ b/src/zh_CN/apisupport/apisupport-wizards/apisupport-wizards/org/netbeans/modules/apisupport/project/ui/wizard/layer/Bundle_zh_CN.properties Wed Jul 30 05:12:06 2014 -0700
2.3 @@ -43,6 +43,7 @@
2.4 LBL_CreatedFiles=\u521b\u5efa\u7684\u6587\u4ef6(&C):
2.5 ACN_LayerPanel=\u5c42\u6ce8\u518c\u9762\u677f
2.6 ACD_LayerPanel=\u7528\u4e8e\u786e\u8ba4\u521b\u5efa XML \u5c42\u7684\u9762\u677f\u3002
2.7 +no\ manifest_exists=manifest.mf \u6587\u4ef6\u4e0d\u5b58\u5728\u3002
2.8 panel_name=\u5c42\u4f4d\u7f6e
2.9 panel_title=XML \u5c42
2.10 template_label=XML \u5c42
3.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
3.2 +++ b/src/zh_CN/cnd/cnd-analysis-api/cnd-analysis-api/org/netbeans/modules/cnd/analysis/api/Bundle_zh_CN.properties Wed Jul 30 05:12:06 2014 -0700
3.3 @@ -0,0 +1,5 @@
3.4 +OpenIDE-Module-Display-Category=C/C++
3.5 +OpenIDE-Module-Long-Description=C/C++ \u4ee3\u7801\u5206\u6790 API\u3002\n\u5305\u542b\u7528\u4e8e\u63d0\u793a\u548c\u5206\u6790\u5668\u7684\u63a5\u53e3\u3002
3.6 +OpenIDE-Module-Name=C/C++ \u4ee3\u7801\u5206\u6790 API
3.7 +OpenIDE-Module-Short-Description=C/C++ \u4ee3\u7801\u5206\u6790 API
3.8 +
4.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
4.2 +++ b/src/zh_CN/cnd/cnd-analysis-api/cnd-analysis-api/org/netbeans/modules/cnd/analysis/api/options/Bundle_zh_CN.properties Wed Jul 30 05:12:06 2014 -0700
4.3 @@ -0,0 +1,35 @@
4.4 +CTL_ShowAs_Label=\u663e\u793a\u4e3a(&W):
4.5 +CTL_Confidence_Label=\u7f6e\u4fe1\u5ea6(&C):
4.6 +CTL_InTasklist_CheckBox=\u5728\u201c\u95ee\u9898\u201d\u7a97\u53e3\u4e2d\u663e\u793a(&P)
4.7 +CTL_Scope_Label=\u4f5c\u7528\u57df(&S):
4.8 +
4.9 +CTL_Options_Border=\u9009\u9879\n
4.10 +CTL_Description_Border=\u63cf\u8ff0:
4.11 +
4.12 +CTL_AsError=\u9519\u8bef
4.13 +CTL_AsWarning=\u8b66\u544a
4.14 +CTL_WarningOnCurrentLine=\u5f53\u524d\u884c\u4e2d\u7684\u8b66\u544a
4.15 +CTL_DepScanning=\u4f9d\u8d56\u5173\u7cfb\u626b\u63cf
4.16 +CTL_AllProjects=\u6240\u6709\u9879\u76ee
4.17 +CTL_SrcRoot=\u6e90\u6839\u76ee\u5f55
4.18 +CTL_Project=\u4ec5\u9879\u76ee
4.19 +
4.20 +
4.21 +CTL_Scope_Desc=\u5982\u679c\u542f\u7528, IDE \u4f1a\u67e5\u627e\u5e76\u91cd\u65b0\u7f16\u8bd1\u6240\u6709\u7c7b, \u5177\u4f53\u53d6\u51b3\u4e8e\u4fee\u6539\u7684\u6587\u4ef6\u3002\u7136\u540e, IDE \u4f1a\u66f4\u65b0\u53d7\u4fee\u6539\u5f71\u54cd\u7684\u6587\u4ef6\u548c\u9879\u76ee\u4e2d\u7684\u9519\u8bef\u6807\u8bb0\u3002<br><br>\u5982\u679c\u7981\u7528, \u5219\u5728\u4fee\u6539\u6587\u4ef6\u65f6, IDE \u4e0d\u4f1a\u626b\u63cf\u4f9d\u8d56\u5173\u7cfb\u6216\u66f4\u65b0\u9519\u8bef\u6807\u8bb0\u3002<br><br>\u60a8\u53ef\u4ee5\u4f7f\u7528\u8303\u56f4\u9650\u5236 IDE \u626b\u63cf\u4f9d\u8d56\u5173\u7cfb\u7684\u7c7b\u6570\u76ee\u3002\u9ed8\u8ba4\u60c5\u51b5\u4e0b, IDE \u4f1a\u626b\u63cf\u6240\u6709\u6253\u5f00\u7684\u9879\u76ee\u3002
4.22 +
4.23 +HintsPanel.severityLabel.AccessibleContext.accessibleDescription=\u663e\u793a\u4e3a
4.24 +HintsPanel.errorTree.AccessibleContext.accessibleName=\u63d0\u793a
4.25 +HintsPanel.errorTree.AccessibleContext.accessibleDescription=\u63d0\u793a
4.26 +HintsPanel.AccessibleContext.accessibleName=\u63d0\u793a\u9009\u9879
4.27 +HintsPanel.AccessibleContext.accessibleDescription=\u63d0\u793a\u9009\u9879
4.28 +
4.29 +AN_Show_As_Combo=\u663e\u793a\u4e3a\u7ec4\u5408\u6846
4.30 +AD_Show_As_Combo=\u5b9a\u5236\u63d0\u793a\u4e25\u91cd\u6027\u7ec4\u5408\u6846
4.31 +HintsPanel.Confidence.Text=\u7f6e\u4fe1\u5ea6(&C):
4.32 +
4.33 +SURE_CONFIDENCE=\u786e\u4fe1
4.34 +HIGH_CONFIDENCE=\u9ad8
4.35 +MEDIUM_CONFIDENCE=\u4e2d
4.36 +LOW_CONFIDENCE=\u4f4e
4.37 +
4.38 +
5.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
5.2 +++ b/src/zh_CN/cnd/cnd-analysis-impl/cnd-analysis-impl/org/netbeans/modules/cnd/analysis/impl/resources/Bundle_zh_CN.properties Wed Jul 30 05:12:06 2014 -0700
5.3 @@ -0,0 +1,5 @@
5.4 +OpenIDE-Module-Display-Category=C/C++
5.5 +OpenIDE-Module-Long-Description=C/C++ \u4ee3\u7801\u5206\u6790\u5b9e\u73b0
5.6 +OpenIDE-Module-Name=C/C++ \u4ee3\u7801\u5206\u6790\u5b9e\u73b0
5.7 +OpenIDE-Module-Short-Description=C/C++ \u4ee3\u7801\u5206\u6790\u5b9e\u73b0
5.8 +
6.1 --- a/src/zh_CN/cnd/cnd-callgraph/cnd-callgraph/org/netbeans/modules/cnd/callgraph/impl/Bundle_zh_CN.properties Wed Jul 30 05:03:48 2014 -0700
6.2 +++ b/src/zh_CN/cnd/cnd-callgraph/cnd-callgraph/org/netbeans/modules/cnd/callgraph/impl/Bundle_zh_CN.properties Wed Jul 30 05:12:06 2014 -0700
6.3 @@ -45,4 +45,5 @@
6.4 HierarchicalLayout=\u5206\u5c42\u7ed3\u6784\u5e03\u5c40
6.5 HierarchicalInvertedLayout=\u5012\u7f6e\u5f0f\u5206\u5c42\u7ed3\u6784\u5e03\u5c40
6.6 HorizontalLayout=\u6c34\u5e73\u5e03\u5c40
6.7 +ExpandAll=\u5168\u90e8\u5c55\u5f00
6.8
7.1 --- a/src/zh_CN/cnd/cnd-completion/cnd-completion/org/netbeans/modules/cnd/completion/cplusplus/hyperlink/Bundle_zh_CN.properties Wed Jul 30 05:03:48 2014 -0700
7.2 +++ b/src/zh_CN/cnd/cnd-completion/cnd-completion/org/netbeans/modules/cnd/completion/cplusplus/hyperlink/Bundle_zh_CN.properties Wed Jul 30 05:12:06 2014 -0700
7.3 @@ -52,4 +52,5 @@
7.4 AltIncludeHyperlinkHintNoPaths={0}<p><i>\u6309\u4f4f {1} \u952e\u5e76\u5355\u51fb\u53ef\u6253\u5f00\u5305\u542b\u5206\u5c42\u7ed3\u6784</i>
7.5 AltIncludeHyperlinkHintBrokenIncludeFile={0}<p><i>\u4f7f\u7528{1}\u53ef\u663e\u793a\u5df2\u5206\u6790\u7684\u8def\u5f84</i><br><i>\u6309\u4f4f {1} \u952e\u5e76\u5355\u51fb\u53ef\u6253\u5f00\u5177\u6709\u5931\u8d25\u7684 include \u6307\u4ee4\u7684\u6587\u4ef6</i>
7.6 DSC_MacroParameterTooltip=<html>\u5b8f\u53c2\u6570<b>{0}</b>
7.7 +LineDirective={1}\u7684\u7b2c {0} \u884c
7.8
8.1 --- a/src/zh_CN/cnd/cnd-completion/cnd-completion/org/netbeans/modules/cnd/completion/options/Bundle_zh_CN.properties Wed Jul 30 05:03:48 2014 -0700
8.2 +++ b/src/zh_CN/cnd/cnd-completion/cnd-completion/org/netbeans/modules/cnd/completion/options/Bundle_zh_CN.properties Wed Jul 30 05:12:06 2014 -0700
8.3 @@ -1,5 +1,5 @@
8.4 CodeCompletionPanelName=C/C++
8.5 CodeCompletionPanel.autoCompletionTriggersLabel.text=C/C++ \u6807\u8bc6\u7b26\u7684\u81ea\u52a8\u5f39\u51fa\u5f0f\u89e6\u53d1\u5668(&A):
8.6 CodeCompletionPanel.autoInclude.text=\u4e3a\u5b8c\u6210\u7684\u6807\u8bc6\u7b26\u81ea\u52a8\u63d2\u5165 #include \u6307\u4ee4(&D)
8.7 -CodeCompletionPanel.autoCompletionTriggersPreprocLabel.text=#include \u6307\u4ee4\u7684\u81ea\u52a8\u5f39\u51fa\u5f0f\u89e6\u53d1\u5668(&A)
8.8 +CodeCompletionPanel.autoCompletionTriggersPreprocLabel.text=#include \u6307\u4ee4\u7684\u81ea\u52a8\u5f39\u51fa\u5f0f\u89e6\u53d1\u5668(&P)
8.9
9.1 --- a/src/zh_CN/cnd/cnd-debugger-common2/cnd-debugger-common2/org/netbeans/modules/cnd/debugger/common2/debugger/options/Bundle_zh_CN.properties Wed Jul 30 05:03:48 2014 -0700
9.2 +++ b/src/zh_CN/cnd/cnd-debugger-common2/cnd-debugger-common2/org/netbeans/modules/cnd/debugger/common2/debugger/options/Bundle_zh_CN.properties Wed Jul 30 05:12:06 2014 -0700
9.3 @@ -227,7 +227,7 @@
9.4 ACSD_session_log_file_name=\u6587\u4ef6\u540d
9.5
9.6
9.7 -LABEL_run_autostart=\u52a0\u8f7d\u7a0b\u5e8f\u540e\u81ea\u52a8\u542f\u52a8\u8fdb\u7a0b
9.8 +LABEL_autostart=\u52a0\u8f7d\u7a0b\u5e8f\u540e\u81ea\u52a8\u542f\u52a8\u8fdb\u7a0b
9.9
9.10 LABEL_run_io=\u7a0b\u5e8f\u8f93\u51fa
9.11 VALUE_run_io_window=\u201c\u7a0b\u5e8f I/O\u201d\u6807\u7b7e
9.12 @@ -375,7 +375,7 @@
9.13 ACSD_pop_auto_destruct=\u5728\u5f39\u51fa\u5806\u6808\u5e27\u65f6\u8c03\u7528\u6790\u6784\u51fd\u6570
9.14 ACSD_proc_exclusive_attach=dbx \u5c06\u68c0\u67e5\u5b83\u662f\u5426\u5bf9\u6240\u8c03\u8bd5\u7684\u7a0b\u5e8f\u5177\u6709\u72ec\u5360\u63a7\u5236\u6743
9.15
9.16 -ACSD_run_autostart=\u5141\u8bb8\u6b65\u5165\u542f\u52a8\u8fdb\u7a0b
9.17 +ACSD_autostart=\u52a0\u8f7d\u7a0b\u5e8f\u540e\u81ea\u52a8\u542f\u52a8\u8fdb\u7a0b
9.18 ACSD_run_io_window=\u5728\u201c\u7a0b\u5e8f I/O\u201d\u6807\u7b7e\u4e2d\u663e\u793a\u7a0b\u5e8f\u8f93\u51fa
9.19 ACSD_run_io_stdio=\u5728\u201cDbx \u547d\u4ee4\u201d\u6807\u7b7e\u4e2d\u663e\u793a\u7a0b\u5e8f\u8f93\u51fa
9.20 ACSD_run_io_pty=\u5c06\u7a0b\u5e8f\u8f93\u51fa\u91cd\u5b9a\u5411\u81f3 pty
9.21 @@ -421,7 +421,7 @@
9.22 # Path MAp Panel
9.23 #
9.24 PathMapping=\u8def\u5f84\u6620\u5c04
9.25 -ExistingPath=\u73b0\u6709\u8def\u5f84\u524d\u7f00
9.26 +ExistingPath=\u7f16\u8bd1\u65f6\u8def\u5f84\u524d\u7f00
9.27 ReplacementPath=\u66ff\u6362\u8def\u5f84\u524d\u7f00
9.28 Pathmap=\u8def\u5f84\u6620\u5c04:
9.29
10.1 --- a/src/zh_CN/cnd/cnd-debugger-gdb2/cnd-debugger-gdb2/org/netbeans/modules/cnd/debugger/gdb2/Bundle_zh_CN.properties Wed Jul 30 05:03:48 2014 -0700
10.2 +++ b/src/zh_CN/cnd/cnd-debugger-gdb2/cnd-debugger-gdb2/org/netbeans/modules/cnd/debugger/gdb2/Bundle_zh_CN.properties Wed Jul 30 05:12:06 2014 -0700
10.3 @@ -75,6 +75,7 @@
10.4 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)
10.5 MSG_GdbUnexpectedlyStopped=GDB \u5df2\u610f\u5916\u505c\u6b62\u5e76\u8fd4\u56de{0}
10.6 MSG_InvalidLocation = "\u65ad\u70b9\u4f4d\u7f6e\u4e0d\u5b58\u5728\u3002"
10.7 +MSG_OldGdbVersion=\u5347\u7ea7 GDB \u4ee5\u4f7f\u7528\u8c03\u8bd5\u89c6\u56fe
10.8
10.9 #
10.10 # Program stoppage reasons
11.1 --- a/src/zh_CN/cnd/cnd-editor/cnd-editor/org/netbeans/modules/cnd/editor/options/Bundle_zh_CN.properties Wed Jul 30 05:03:48 2014 -0700
11.2 +++ b/src/zh_CN/cnd/cnd-editor/cnd-editor/org/netbeans/modules/cnd/editor/options/Bundle_zh_CN.properties Wed Jul 30 05:12:06 2014 -0700
11.3 @@ -231,6 +231,8 @@
11.4 HINT_spaceAfterColon=\u5728\u5192\u53f7\u4e4b\u540e
11.5 LBL_spaceAfterTypeCast=\u5728\u5f3a\u5236\u7c7b\u578b\u8f6c\u6362\u4e4b\u540e
11.6 HINT_spaceAfterTypeCast=\u5728\u5f3a\u5236\u7c7b\u578b\u8f6c\u6362\u4e4b\u540e
11.7 +LBL_spaceAfterOperatorKeyword=\u5728\u8fd0\u7b97\u7b26\u5173\u952e\u5b57\u4e4b\u540e
11.8 +HINT_spaceAfterOperatorKeyword=\u5728\u8fd0\u7b97\u7b26\u5173\u952e\u5b57\u4e4b\u540e
11.9
11.10 LBL_BlankLines=\u7a7a\u884c
11.11 HINT_BlankLines=\u7a7a\u884c
12.1 --- a/src/zh_CN/cnd/cnd-highlight/cnd-highlight/org/netbeans/modules/cnd/highlight/error/Bundle_zh_CN.properties Wed Jul 30 05:03:48 2014 -0700
12.2 +++ b/src/zh_CN/cnd/cnd-highlight/cnd-highlight/org/netbeans/modules/cnd/highlight/error/Bundle_zh_CN.properties Wed Jul 30 05:12:06 2014 -0700
12.3 @@ -35,21 +35,38 @@
12.4 # Microsystems, Inc. All Rights Reserved.
12.5
12.6 LABL_CppParserAnnotationError=C/C++ \u89e3\u6790\u5668\u9519\u8bef
12.7 -HighlightProvider_IncludeMissed=\u627e\u4e0d\u5230\u5305\u542b\u6587\u4ef6{0}
12.8 -HighlightProvider_IncludeRecursive=\u9012\u5f52 include \u6307\u4ee4
12.9 -HighlightProvider_IncludeMissedWarning={0}\u4e2d\u6709\u672a\u89e3\u6790\u7684 include
12.10 -HighlightProvider_ErrorDirective=\u9884\u5904\u7406\u7a0b\u5e8f\u5728\u6b64 #error \u6307\u4ee4\u5904\u505c\u6b62
12.11 -HighlightProvider_IdentifierMissed=\u65e0\u6cd5\u89e3\u6790\u6807\u8bc6\u7b26 {0}
12.12 HighlightProvider_HyperlinkActionsHints={0}\n\u8981\u83b7\u53d6\u5176\u4ed6\u4fe1\u606f, \u8bf7\u6309\u4f4f {1} \u952e\u5e76\u5c06\u9f20\u6807\u79fb\u81f3 include \u6307\u4ee4\u4e0a
12.13 -HighlightProvider_DeclarationAfterUsage=\u5728\u58f0\u660e\u4e4b\u524d\u4f7f\u7528\u4e86{0}
12.14 -HighlightProvider_FunDeclarationMissed=\u65b9\u6cd5{0}\u6ca1\u6709\u58f0\u660e
12.15
12.16 -#error hl
12.17 -Show-unresolved-identifier=\u7a81\u51fa\u663e\u793a\u672a\u89e3\u6790\u7684\u6807\u8bc6\u7b26(&G)
12.18 -Show-unresolved-identifier-AD=\u91c7\u7528\u7a81\u51fa\u663e\u793a\u683c\u5f0f\u663e\u793a\u627e\u4e0d\u5230\u58f0\u660e\u7684\u6807\u8bc6\u7b26
12.19 +#IdentifierErrorProvider
12.20 +IdentifierErrorProvider.unresolved.name=\u672a\u89e3\u6790\u7684\u6807\u8bc6\u7b26
12.21 +IdentifierErrorProvider.unresolved.description=\u627e\u4e0d\u5230\u5176\u58f0\u660e\u7684\u6807\u8bc6\u7b26\u3002
12.22 +IdentifierErrorProvider.unresolved.message=\u65e0\u6cd5\u89e3\u6790\u6807\u8bc6\u7b26 {0}\u3002
12.23
12.24 -Show-include-errors=\u7a81\u51fa\u663e\u793a\u672a\u89e3\u6790\u7684\u5305\u542b\u6587\u4ef6(&O)
12.25 -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
12.26 +IdentifierErrorProvider.unresolvedTemplate.name=\u672a\u89e3\u6790\u7684\u57fa\u4e8e\u6a21\u677f\u7684\u6807\u8bc6\u7b26
12.27 +IdentifierErrorProvider.unresolvedTemplate.description=\u627e\u4e0d\u5230\u5176\u58f0\u660e\u7684\u57fa\u4e8e\u6a21\u677f\u7684\u6807\u8bc6\u7b26\u3002
12.28 +IdentifierErrorProvider.unresolvedTemplate.message=\u65e0\u6cd5\u89e3\u6790\u57fa\u4e8e\u6a21\u677f\u7684\u6807\u8bc6\u7b26 {0}\u3002
12.29
12.30 -DisableHint=\u7981\u7528\u672a\u89e3\u6790\u7684\u6807\u8bc6\u7b26\u7a81\u51fa\u663e\u793a
12.31 +IdentifierErrorProvider.unresolvedForward.name=\u672a\u89e3\u6790\u7684\u524d\u5411\u58f0\u660e
12.32 +IdentifierErrorProvider.unresolvedForward.description=\u627e\u4e0d\u5230\u5176\u58f0\u660e\u7684\u524d\u5411\u58f0\u660e\u3002
12.33 +IdentifierErrorProvider.unresolvedForward.message=\u65e0\u6cd5\u89e3\u6790\u524d\u5411\u58f0\u660e{0}\u3002
12.34
12.35 +#IncludeErrorProvider
12.36 +IncludeErrorProvider.unresolved.name=\u672a\u89e3\u6790\u7684\u5305\u542b\u6587\u4ef6
12.37 +IncludeErrorProvider.unresolved.description=\u672a\u89e3\u6790\u7684\u5305\u542b\u6587\u4ef6\u3002
12.38 +IncludeErrorProvider.unresolved.message=\u627e\u4e0d\u5230\u5305\u542b\u6587\u4ef6{0}\u3002
12.39 +
12.40 +IncludeErrorProvider.insideUnresolved.name=\u672a\u89e3\u6790\u7684\u5185\u90e8\u5305\u542b\u6587\u4ef6
12.41 +IncludeErrorProvider.insideUnresolved.description=\u672a\u89e3\u6790\u7684\u5185\u90e8\u5305\u542b\u6587\u4ef6\u3002
12.42 +IncludeErrorProvider.insideUnresolved.message={0}\u5185\u542b\u6709\u672a\u89e3\u6790\u7684\u5305\u542b\u6587\u4ef6\u3002
12.43 +
12.44 +IncludeErrorProvider.recursive.name=\u9012\u5f52 include \u6307\u4ee4
12.45 +IncludeErrorProvider.recursive.description=\u9012\u5f52 include \u6307\u4ee4\u3002
12.46 +IncludeErrorProvider.recursive.message=\u9012\u5f52 include \u6307\u4ee4\u3002
12.47 +
12.48 +IncludeErrorProvider.error.name=\u9519\u8bef\u6307\u4ee4
12.49 +IncludeErrorProvider.error.description=\u6d3b\u52a8\u9519\u8bef\u6307\u4ee4\u3002
12.50 +IncludeErrorProvider.error.message=\u9884\u5904\u7406\u7a0b\u5e8f\u5728\u6b64 #error \u6307\u4ee4\u5904\u505c\u6b62\u3002
12.51 +
12.52 +CA_NAME=\u53ef\u80fd\u51fa\u73b0\u7684\u7f16\u8bd1\u95ee\u9898
12.53 +CA_DESCRIPTION=\u5185\u90e8\u89e3\u6790\u5668\u68c0\u6d4b\u5230\u7684\u53ef\u80fd\u51fa\u73b0\u7684\u7f16\u8bd1\u95ee\u9898\u3002\n\u5982\u679c\u9879\u76ee\u7f16\u8bd1\u6b63\u5e38, \u4f46 IDE \u4ecd\u663e\u793a "\u53ef\u80fd\u51fa\u73b0\u7684\u7f16\u8bd1\u95ee\u9898",\n\u8be5\u9879\u76ee\u5f88\u53ef\u80fd\u914d\u7f6e\u4e0d\u6b63\u786e\u3002
12.54 +
13.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
13.2 +++ b/src/zh_CN/cnd/cnd-highlight/cnd-highlight/org/netbeans/modules/cnd/highlight/hints/Bundle_zh_CN.properties Wed Jul 30 05:12:06 2014 -0700
13.3 @@ -0,0 +1,67 @@
13.4 +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
13.5 +#
13.6 +# Copyright 2013 Oracle and/or its affiliates. All rights reserved.
13.7 +#
13.8 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
13.9 +# Other names may be trademarks of their respective owners.
13.10 +#
13.11 +# The contents of this file are subject to the terms of either the GNU
13.12 +# General Public License Version 2 only ("GPL") or the Common
13.13 +# Development and Distribution License("CDDL") (collectively, the
13.14 +# "License"). You may not use this file except in compliance with the
13.15 +# License. You can obtain a copy of the License at
13.16 +# http://www.netbeans.org/cddl-gplv2.html
13.17 +# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
13.18 +# specific language governing permissions and limitations under the
13.19 +# License. When distributing the software, include this License Header
13.20 +# Notice in each file and include the License file at
13.21 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
13.22 +# particular file as subject to the "Classpath" exception as provided
13.23 +# by Oracle in the GPL Version 2 section of the License file that
13.24 +# accompanied this code. If applicable, add the following below the
13.25 +# License Header, with the fields enclosed by brackets [] replaced by
13.26 +# your own identifying information:
13.27 +# "Portions Copyrighted [year] [name of copyright owner]"
13.28 +#
13.29 +# If you wish your version of this file to be governed by only the CDDL
13.30 +# or only the GPL Version 2, indicate your decision by adding
13.31 +# "[Contributor] elects to include this software in this distribution
13.32 +# under the [CDDL or GPL Version 2] license." If you do not indicate a
13.33 +# single choice of license, a recipient has the option to distribute
13.34 +# your version of this file under either the CDDL, the GPL Version 2 or
13.35 +# to extend the choice of license to its licensees as provided above.
13.36 +# However, if you add GPL Version 2 code and therefore, elected the GPL
13.37 +# Version 2 license, then the option applies only if the new code is
13.38 +# made subject to such option by the copyright holder.
13.39 +#
13.40 +# Contributor(s):
13.41 +#
13.42 +# Portions Copyrighted 2013 Sun Microsystems, Inc.
13.43 +
13.44 +General_NAME=\u5e38\u89c4
13.45 +General_DESCRIPTION=\u5e38\u89c4 C/C++ \u63d0\u793a\u3002
13.46 +DisableHint=\u914d\u7f6e\u63d0\u793a
13.47 +
13.48 +#NonVirtualDestructor
13.49 +NonVirtualDestructor.name=\u975e\u865a\u62df\u6790\u6784\u51fd\u6570
13.50 +NonVirtualDestructor.description=\u5728\u5177\u6709\u5b50\u7c7b\u7684\u7c7b\u4e2d\u6790\u6784\u51fd\u6570\u4e0d\u662f\u865a\u62df\u7684\u3002
13.51 +NonVirtualDestructor.message=\u6790\u6784\u51fd\u6570\u4e0d\u662f\u865a\u62df\u7684\u3002
13.52 +
13.53 +#MethodDeclarationMissed
13.54 +MethodDeclarationMissed.name=\u7f3a\u5c11\u65b9\u6cd5\u58f0\u660e
13.55 +MethodDeclarationMissed.description=\u65b9\u6cd5\u6ca1\u6709\u58f0\u660e\u3002
13.56 +MethodDeclarationMissed.message=\u65b9\u6cd5{0}\u6ca1\u6709\u58f0\u660e\u3002
13.57 +
13.58 +#FunctionUsedBeforDeclaration
13.59 +FunctionUsedBeforDeclaration.name=\u5728\u58f0\u660e\u4e4b\u524d\u4f7f\u7528\u4e86\u51fd\u6570
13.60 +FunctionUsedBeforDeclaration.description=\u5728\u58f0\u660e\u4e4b\u524d\u4f7f\u7528\u4e86\u51fd\u6570\u3002
13.61 +FunctionUsedBeforDeclaration.message=\u5728\u58f0\u660e\u4e4b\u524d\u4f7f\u7528\u4e86\u51fd\u6570 {0}\u3002
13.62 +
13.63 +#NonVirtualMethod
13.64 +NonVirtualMethod.name=\u975e\u865a\u62df\u65b9\u6cd5
13.65 +NonVirtualMethod.description=\u8d85\u7c7b\u6216\u5b50\u7c7b\u5177\u6709\u5e26\u6709\u76f8\u540c\u7b7e\u540d\u7684\u65b9\u6cd5\u3002\u57fa\u7c7b\u4e2d\u53ef\u80fd\u7f3a\u5c11\u65b9\u6cd5\u7684\u865a\u62df\u5173\u952e\u5b57\u3002
13.66 +NonVirtualMethod.message.super.class=\u8d85\u7c7b{0}\u5177\u6709\u5e26\u6709\u76f8\u540c\u7b7e\u540d\u7684\u65b9\u6cd5\u3002\u57fa\u7c7b\u4e2d\u53ef\u80fd\u7f3a\u5c11\u65b9\u6cd5\u7684\u865a\u62df\u5173\u952e\u5b57\u3002
13.67 +NonVirtualMethod.message.super.classes=\u8d85\u7c7b{0}\u5177\u6709\u5e26\u6709\u76f8\u540c\u7b7e\u540d\u7684\u65b9\u6cd5\u3002\u57fa\u7c7b\u4e2d\u53ef\u80fd\u7f3a\u5c11\u65b9\u6cd5\u7684\u865a\u62df\u5173\u952e\u5b57\u3002
13.68 +NonVirtualMethod.message.sub.class=\u5b50\u7c7b{0}\u5177\u6709\u5e26\u6709\u76f8\u540c\u7b7e\u540d\u7684\u65b9\u6cd5\u3002\u53ef\u80fd\u7f3a\u5c11\u65b9\u6cd5\u7684\u865a\u62df\u5173\u952e\u5b57\u3002
13.69 +NonVirtualMethod.message.sub.classes=\u5b50\u7c7b{0}\u5177\u6709\u5e26\u6709\u76f8\u540c\u7b7e\u540d\u7684\u65b9\u6cd5\u3002\u53ef\u80fd\u7f3a\u5c11\u65b9\u6cd5\u7684\u865a\u62df\u5173\u952e\u5b57\u3002
13.70 +
14.1 --- a/src/zh_CN/cnd/cnd-highlight/cnd-highlight/org/netbeans/modules/cnd/highlight/semantic/Bundle_zh_CN.properties Wed Jul 30 05:03:48 2014 -0700
14.2 +++ b/src/zh_CN/cnd/cnd-highlight/cnd-highlight/org/netbeans/modules/cnd/highlight/semantic/Bundle_zh_CN.properties Wed Jul 30 05:12:06 2014 -0700
14.3 @@ -58,7 +58,7 @@
14.4 Show-macros=\u7a81\u51fa\u663e\u793a\u5b8f(&M)
14.5 Show-macros-AD=\u91c7\u7528\u7a81\u51fa\u663e\u793a\u683c\u5f0f\u663e\u793a\u5b8f
14.6
14.7 -Show-typedefs=\u7a81\u51fa\u663e\u793a\u7c7b\u578b\u5b9a\u4e49(&L)
14.8 +Show-typedefs=\u7a81\u51fa\u663e\u793a\u7c7b\u578b\u5b9a\u4e49(&Y)
14.9 Show-typedefs-AD=\u91c7\u7528\u7a81\u51fa\u663e\u793a\u683c\u5f0f\u663e\u793a\u7c7b\u578b\u5b9a\u4e49
14.10
14.11 Show-unused-variables=\u7a81\u51fa\u663e\u793a\u672a\u4f7f\u7528\u7684\u53d8\u91cf(&V)
15.1 --- a/src/zh_CN/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/api/configurations/Bundle_zh_CN.properties Wed Jul 30 05:03:48 2014 -0700
15.2 +++ b/src/zh_CN/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/api/configurations/Bundle_zh_CN.properties Wed Jul 30 05:12:06 2014 -0700
15.3 @@ -149,6 +149,7 @@
15.4 STANDARD_INHERITED_WITH_VALUE=<\u7ee7\u627f> ({0})
15.5 STANDARD_CPP98=C++98
15.6 STANDARD_CPP11=C++11
15.7 +STANDARD_CPP14=C++14
15.8 CStandardTxt=C \u6807\u51c6
15.9 CStandardHint=C89 \u6216 C99 C \u6807\u51c6
15.10 STANDARD_C89=C89
15.11 @@ -228,6 +229,8 @@
15.12 IncludedInCodeAssistanceHint=\u5f3a\u5236\u89e3\u6790\u9879\u3002\u53ef\u7528\u4e8e\u89e3\u6790\u4efb\u4f55\u7f16\u8bd1\u5355\u5143\u90fd\u672a\u5305\u62ec\u7684\u9644\u52a0\u5934\u6587\u4ef6\u3002\u4e5f\u53ef\u7528\u4e8e\u624b\u52a8\u6dfb\u52a0\u6e90\u4f5c\u4e3a\u9644\u52a0\u7f16\u8bd1\u5355\u5143\u3002
15.13 CodeAssistanceTxt=\u5177\u6709\u4ee3\u7801\u5e2e\u52a9
15.14 CodeAssistanceHint=\u6b64\u5b57\u6bb5\u53cd\u6620\u4ee3\u7801\u5e2e\u52a9\u72b6\u6001\u3002\u4ee3\u7801\u5e2e\u52a9\u53ef\u7528\u4e8e\u7f16\u8bd1\u5355\u5143, \u7f16\u8bd1\u5355\u5143\u4e2d\u5305\u62ec\u7684\u5934\u6587\u4ef6\u548c\u9644\u52a0\u6e90\u6587\u4ef6\u3002
15.15 +ResolveSymbolicLinksTxt=\u89e3\u6790\u7b26\u53f7\u94fe\u63a5
15.16 +ResolveSymbolicLinksHint=\u5982\u679c\u6784\u5efa\u7cfb\u7edf\u4f7f\u7528\u5230\u6e90\u6587\u4ef6\u7684\u94fe\u63a5, \u5219\u5c06\u539f\u59cb\u6587\u4ef6 (\u800c\u975e\u94fe\u63a5) \u6dfb\u52a0\u5230\u9879\u76ee\u3002\u5728\u521b\u5efa\u9879\u76ee\u65f6, \u8be5\u5c5e\u6027\u6e90\u81ea<br><b>\u201c\u5de5\u5177\u201d/\u201c\u9009\u9879\u201d/"C/C++"/\u201c\u9879\u76ee\u9009\u9879\u201d/\u201c\u89e3\u6790\u7b26\u53f7\u94fe\u63a5\u201d</b>\u3002<br>
15.17
15.18 # Folder Configuration
15.19 FolderConfiguration=\u6587\u4ef6\u5939\u914d\u7f6e
16.1 --- a/src/zh_CN/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/options/Bundle_zh_CN.properties Wed Jul 30 05:03:48 2014 -0700
16.2 +++ b/src/zh_CN/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/options/Bundle_zh_CN.properties Wed Jul 30 05:12:06 2014 -0700
16.3 @@ -109,3 +109,7 @@
16.4 REBUILD_PROP_CHANGED_AD=\u201c\u9879\u76ee\u5c5e\u6027\u53d1\u751f\u66f4\u6539\u65f6\u91cd\u65b0\u6784\u5efa\u6574\u4e2a\u9879\u76ee\u201d\u590d\u9009\u6846
16.5 fixUnresolvedInclude=\u5c1d\u8bd5\u4fee\u590d\u672a\u89e3\u6790\u7684 include \u6307\u4ee4(&X)
16.6
16.7 +RESOLVE_SYMBOLIC_LINKS_CHECKBOX_TXT=\u89e3\u6790\u7b26\u53f7\u94fe\u63a5(&B)
16.8 +RESOLVE_SYMBOLIC_LINKS_CHECKBOX_NM=b
16.9 +RESOLVE_SYMBOLIC_LINKS_CHECKBOX_AD=\u5982\u679c\u6784\u5efa\u7cfb\u7edf\u4f7f\u7528\u5230\u6e90\u6587\u4ef6\u7684\u94fe\u63a5, \u5219\u5728\u521b\u5efa\u9879\u76ee\u65f6\u5c06\u539f\u59cb\u6587\u4ef6 (\u800c\u975e\u94fe\u63a5) \u6dfb\u52a0\u5230\u9879\u76ee
16.10 +
17.1 --- a/src/zh_CN/cnd/cnd-navigation/cnd-navigation/org/netbeans/modules/cnd/navigation/overrides/Bundle_zh_CN.properties Wed Jul 30 05:03:48 2014 -0700
17.2 +++ b/src/zh_CN/cnd/cnd-navigation/cnd-navigation/org/netbeans/modules/cnd/navigation/overrides/Bundle_zh_CN.properties Wed Jul 30 05:12:06 2014 -0700
17.3 @@ -42,6 +42,7 @@
17.4
17.5 CTL_IsOverriddenAnnotationAction=\u8986\u76d6\u7684\u6807\u6ce8
17.6 LAB_Overrides=\u8986\u76d6{0}
17.7 +LAB_OverridesAnnotation=\u8986\u76d6
17.8 LAB_IsOverriden=\u5df2\u8986\u76d6
17.9 LAB_OverridesAndIsOverriden=\u8986\u76d6\u548c\u5df2\u8986\u76d6
17.10
18.1 --- a/src/zh_CN/cnd/cnd-refactoring/cnd-refactoring/org/netbeans/modules/cnd/refactoring/codegen/Bundle_zh_CN.properties Wed Jul 30 05:03:48 2014 -0700
18.2 +++ b/src/zh_CN/cnd/cnd-refactoring/cnd-refactoring/org/netbeans/modules/cnd/refactoring/codegen/Bundle_zh_CN.properties Wed Jul 30 05:12:06 2014 -0700
18.3 @@ -45,22 +45,15 @@
18.4
18.5 LBL_constructor=\u6784\u9020\u51fd\u6570...
18.6 LBL_generate_constructor=\u751f\u6210\u6784\u9020\u51fd\u6570
18.7 -LBL_super_constructor_select=\u9009\u62e9\u8d85\u7ea7\u6784\u9020\u51fd\u6570:
18.8 -LBL_constructor_select=\u9009\u62e9\u5c06\u7531\u6784\u9020\u51fd\u6570\u521d\u59cb\u5316\u7684\u5b57\u6bb5:
18.9 +LBL_super_constructor_select=\u9009\u62e9\u8d85\u7ea7\u6784\u9020\u51fd\u6570(&C):
18.10 +LBL_constructor_select=\u9009\u62e9\u5c06\u7531\u6784\u9020\u51fd\u6570\u521d\u59cb\u5316\u7684\u5b57\u6bb5(&S):
18.11 +LBL_copy_constructor=\u590d\u5236\u6784\u9020\u51fd\u6570
18.12 LBL_getter=Getter...
18.13 LBL_getter_field_select=\u9009\u62e9\u8981\u751f\u6210 getter \u7684\u5b57\u6bb5(&S):
18.14 LBL_setter=Setter...
18.15 LBL_setter_field_select=\u9009\u62e9\u8981\u751f\u6210 setter \u7684\u5b57\u6bb5(&S):
18.16 LBL_getter_and_setter=getter \u548c setter...
18.17 LBL_getter_and_setter_field_select=\u9009\u62e9\u8981\u751f\u6210 getter \u548c setter \u7684\u5b57\u6bb5(&S):
18.18 -LBL_equals_and_hashcode=equals() \u548c hashCode()...
18.19 -LBL_equals=equals()...
18.20 -LBL_hashcode=hashCode()...
18.21 -LBL_generate_equals_and_hashcode=\u751f\u6210 equals() \u548c hashCode()
18.22 -LBL_generate_equals=\u751f\u6210 equals()
18.23 -LBL_generate_hashcode=\u751f\u6210 hashCode()
18.24 -LBL_equals_select=\u9009\u62e9\u8981\u5305\u542b\u5728 equals() \u4e2d\u7684\u5b57\u6bb5:
18.25 -LBL_hashcode_select=\u9009\u62e9\u8981\u5305\u542b\u5728 hashCode() \u4e2d\u7684\u5b57\u6bb5:
18.26 LBL_implement_method=\u5b9e\u73b0\u65b9\u6cd5...
18.27 LBL_generate_implement=\u751f\u6210\u5b9e\u73b0\u65b9\u6cd5
18.28 LBL_implement_method_select=\u9009\u62e9\u8981\u5b9e\u73b0\u7684\u65b9\u6cd5:
18.29 @@ -74,9 +67,68 @@
18.30
18.31 #A11Y Descriptions
18.32 A11Y_Generate_Constructor=\u751f\u6210\u6784\u9020\u51fd\u6570\u5bf9\u8bdd\u6846
18.33 +A11Y_Generate_Operators=\u751f\u6210\u8fd0\u7b97\u7b26\u5bf9\u8bdd\u6846
18.34 A11Y_Generate_Delegate=\u59d4\u6258\u65b9\u6cd5\u5bf9\u8bdd\u6846
18.35 -A11Y_Generate_EqualsHashCode=\u751f\u6210 equals \u548c hashCode \u65b9\u6cd5
18.36 A11Y_Generate_GetterSetter=\u751f\u6210 getter \u548c setter \u65b9\u6cd5
18.37 A11Y_Generate_ImplementOverride=\u5b9e\u73b0/\u8986\u76d6\u65b9\u6cd5\u5bf9\u8bdd\u6846
18.38
18.39 +#Operators
18.40 +LBL_operatorArithmetic=\u7b97\u672f\u8fd0\u7b97\u7b26...
18.41 +LBL_operatorRelational=\u5173\u7cfb\u8fd0\u7b97\u7b26..
18.42 +LBL_operatorAssignment=\u8d4b\u503c\u8fd0\u7b97\u7b26...
18.43 +LBL_operatorPointer=\u6307\u9488\u8fd0\u7b97\u7b26...
18.44 +LBL_operatorFriendStream=\u53cb\u5143\u6d41\u8fd0\u7b97\u7b26...
18.45 +LBL_operatorBitwise=\u6309\u4f4d\u8fd0\u7b97\u7b26...
18.46 +LBL_operatorLogical=\u903b\u8f91\u8fd0\u7b97\u7b26...
18.47
18.48 +LBL_generate_operator=\u751f\u6210\u8fd0\u7b97\u7b26
18.49 +LBL_operator_select=\u9009\u62e9\u8fd0\u7b97\u7b26(&S):
18.50 +
18.51 +
18.52 +MOD={0} result(*this); // \u590d\u5236\u81ea\u8eab\u3002\nresult *= right; // \u91cd\u7528\u590d\u5408\u8d4b\u503c\nreturn result;
18.53 +
18.54 +DIV={0} result(*this); // \u590d\u5236\u81ea\u8eab\u3002\nresult *= right; // \u91cd\u7528\u590d\u5408\u8d4b\u503c\nreturn result;
18.55 +
18.56 +MUL={0} result(*this); // \u590d\u5236\u81ea\u8eab\u3002\nresult *= right; // \u91cd\u7528\u590d\u5408\u8d4b\u503c\nreturn result;
18.57 +
18.58 +PLUS={0} result(*this); // \u590d\u5236\u81ea\u8eab\u3002\nresult += right; // \u91cd\u7528\u590d\u5408\u8d4b\u503c\nreturn result;
18.59 +
18.60 +MINUS={0} result(*this); // \u590d\u5236\u81ea\u8eab\u3002\nresult -= right; // \u91cd\u7528\u590d\u5408\u8d4b\u503c\nreturn result;
18.61 +
18.62 +PLUS_PLUS_POSTFIX={0} result(*this); // \u590d\u5236\u81ea\u8eab\u3002\noperator++(); // \u91cd\u7528\u524d\u7f00\u8fd0\u7b97\u7b26\nreturn result;
18.63 +
18.64 +MINUS_MINUS_POSTFIX={0} result(*this); // \u590d\u5236\u81ea\u8eab\u3002\noperator--(); // \u91cd\u7528\u524d\u7f00\u8fd0\u7b97\u7b26\nreturn result;
18.65 +
18.66 +
18.67 +
18.68 +AND={0} result(*this); // \u590d\u5236\u81ea\u8eab\u3002\nresult &= right; // \u91cd\u7528\u590d\u5408\u8d4b\u503c\nreturn result;
18.69 +
18.70 +OR={0} result(*this); // \u590d\u5236\u81ea\u8eab\u3002\nresult |= right; // \u91cd\u7528\u590d\u5408\u8d4b\u503c\nreturn result;
18.71 +
18.72 +XOR={0} result(*this); // \u590d\u5236\u81ea\u8eab\u3002\nresult ^= right; // \u91cd\u7528\u590d\u5408\u8d4b\u503c\nreturn result;
18.73 +
18.74 +EQ_EQ=bool result = false; // \u6bd4\u8f83\u6b64\u5904\u7684 right \u548c *this\nreturn result;
18.75 +NOT_EQ=bool result = !(*this == right); // \u91cd\u7528\u7b49\u4e8e\u8fd0\u7b97\u7b26\nreturn result;
18.76 +
18.77 +LESS=return right > *this; // \u91cd\u7528\u5927\u4e8e\u8fd0\u7b97\u7b26
18.78 +GREATER_EQ=return !(right > *this); // \u91cd\u7528\u5927\u4e8e\u8fd0\u7b97\u7b26
18.79 +LESS_EQ=return !(*this > right); // \u91cd\u7528\u5927\u4e8e\u8fd0\u7b97\u7b26
18.80 +
18.81 +
18.82 +
18.83 +
18.84 +
18.85 +
18.86 +
18.87 +
18.88 +
18.89 +
18.90 +
18.91 +
18.92 +
18.93 +
18.94 +
18.95 +
18.96 +
18.97 +
18.98 +
19.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
19.2 +++ b/src/zh_CN/cnd/cnd-refactoring/cnd-refactoring/org/netbeans/modules/cnd/refactoring/completion/delegate/Bundle_zh_CN.properties Wed Jul 30 05:12:06 2014 -0700
19.3 @@ -0,0 +1,3 @@
19.4 +GENERATE=\u751f\u6210...
19.5 +GENERATE_HINT=\u4e3a\u201c\u63d2\u5165\u4ee3\u7801...\u201d\u64cd\u4f5c\u59d4\u6258\u65b0\u65b9\u6cd5\u521b\u5efa\u64cd\u4f5c
19.6 +
20.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
20.2 +++ b/src/zh_CN/cnd/cnd-refactoring/cnd-refactoring/org/netbeans/modules/cnd/refactoring/completion/implmethod/Bundle_zh_CN.properties Wed Jul 30 05:12:06 2014 -0700
20.3 @@ -0,0 +1,3 @@
20.4 +implement.txt=\u5b9e\u73b0
20.5 +extract.txt=\u63d0\u53d6\u6b63\u6587
20.6 +
21.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
21.2 +++ b/src/zh_CN/cnd/cnd-refactoring/cnd-refactoring/org/netbeans/modules/cnd/refactoring/completion/overridemethod/Bundle_zh_CN.properties Wed Jul 30 05:12:06 2014 -0700
21.3 @@ -0,0 +1,3 @@
21.4 +override.txt=\u8986\u76d6
21.5 +destructor.txt=\u751f\u6210
21.6 +
22.1 --- a/src/zh_CN/cnd/cnd-refactoring/cnd-refactoring/org/netbeans/modules/cnd/refactoring/hints/Bundle_zh_CN.properties Wed Jul 30 05:03:48 2014 -0700
22.2 +++ b/src/zh_CN/cnd/cnd-refactoring/cnd-refactoring/org/netbeans/modules/cnd/refactoring/hints/Bundle_zh_CN.properties Wed Jul 30 05:12:06 2014 -0700
22.3 @@ -1,7 +1,14 @@
22.4 -HINT_AssignResultToVariable=\u5c06\u8fd4\u56de\u503c\u8d4b\u7ed9\u65b0\u53d8\u91cf
22.5 -DN_AssignResultToVariable=\u5c06\u8fd4\u56de\u503c\u8d4b\u7ed9\u65b0\u53d8\u91cf
22.6 -DESC_AssignResultToVariable=\u5c06\u8fd4\u56de\u503c\u8d4b\u7ed9\u65b0\u53d8\u91cf
22.7 -FIX_AssignResultToVariable=\u5c06\u8fd4\u56de\u503c\u8d4b\u7ed9\u65b0\u53d8\u91cf
22.8 -FIX_IntroduceVariable=\u5f15\u5165\u53d8\u91cf
22.9 HINT_IntroduceVariable=\u5f15\u5165\u53d8\u91cf
22.10
22.11 +Suggestion_NAME=\u5efa\u8bae
22.12 +Suggestion_DESCRIPTION=\u5efa\u8bae
22.13 +
22.14 +IntroduceVariable.name=\u5f15\u5165\u53d8\u91cf
22.15 +IntroduceVariable.description=\u5f15\u5165\u53d8\u91cf
22.16 +FIX_IntroduceVariable=\u5f15\u5165\u53d8\u91cf
22.17 +
22.18 +AssignVariable.name=\u5c06\u8fd4\u56de\u503c\u8d4b\u7ed9\u65b0\u53d8\u91cf
22.19 +AssignVariable.description=\u5c06\u8fd4\u56de\u503c\u8d4b\u7ed9\u65b0\u53d8\u91cf
22.20 +FIX_AssignResultToVariable=\u5c06\u8fd4\u56de\u503c\u8d4b\u7ed9\u65b0\u53d8\u91cf
22.21 +
22.22 +
23.1 --- a/src/zh_CN/cnd/cnd-refactoring/cnd-refactoring/org/netbeans/modules/cnd/refactoring/plugins/Bundle_zh_CN.properties Wed Jul 30 05:03:48 2014 -0700
23.2 +++ b/src/zh_CN/cnd/cnd-refactoring/cnd-refactoring/org/netbeans/modules/cnd/refactoring/plugins/Bundle_zh_CN.properties Wed Jul 30 05:12:06 2014 -0700
23.3 @@ -267,4 +267,5 @@
23.4 TXT_Filter_DeadCode=\u505c\u7528\u7684\u4ee3\u7801\u8fc7\u6ee4\u5668
23.5 TXT_Filter_Declarations=\u58f0\u660e\u548c\u5b9a\u4e49\u8fc7\u6ee4\u5668
23.6 TXT_Filter_Macros=\u5b8f\u8fc7\u6ee4\u5668
23.7 +TXT_Filter_Scope=\u9650\u5b9a\u540d\u79f0\u8fc7\u6ee4\u5668\u4e2d\u7684\u7c7b\u540d
23.8
24.1 --- a/src/zh_CN/cnd/cnd-remote-projectui/cnd-remote-projectui/org/netbeans/modules/cnd/remote/projectui/actions/Bundle_zh_CN.properties Wed Jul 30 05:03:48 2014 -0700
24.2 +++ b/src/zh_CN/cnd/cnd-remote-projectui/cnd-remote-projectui/org/netbeans/modules/cnd/remote/projectui/actions/Bundle_zh_CN.properties Wed Jul 30 05:12:06 2014 -0700
24.3 @@ -25,4 +25,134 @@
24.4 # {0} is host display name
24.5
24.6
24.7 +########## copied fromorg.netbeans.modules.project.uiapi - START ##########
24.8
24.9 +#Customizer dialog
24.10 +LBL_Customizer_Title=\u9879\u76ee\u5c5e\u6027
24.11 +LBL_Customizer_Ok_Option=\u786e\u5b9a
24.12 +LBL_Customizer_Cancel_Option=\u53d6\u6d88
24.13 +
24.14 +
24.15 +
24.16 +
24.17 +AN_ProjectCustomizer=\u9879\u76ee\u5c5e\u6027
24.18 +AD_ProjectCustomizer=\u6253\u5f00\u53ef\u4ee5\u4ece\u4e2d\u914d\u7f6e\u91cd\u8981\u9879\u76ee\u5c5e\u6027\u7684\u5bf9\u8bdd\u6846\u3002
24.19 +
24.20 +#Default customizer pane
24.21 +
24.22 +
24.23 +#Default category view
24.24 +AN_CatgoryView=\u5c5e\u6027\u7c7b\u522b
24.25 +
24.26 +
24.27 +
24.28 +LBL_Customizer_Categories=\u7c7b\u522b(&C):
24.29 +
24.30 +#DefaultAntProjectOperations:
24.31 +LBL_Progress_Cleaning_Project=\u6e05\u7406\u9879\u76ee
24.32 +LBL_Progress_Deleting_File=\u5220\u9664{0}
24.33 +LBL_Project_cannot_be_deleted.=\u65e0\u6cd5\u5220\u9664\u9879\u76ee{0}\u3002
24.34 +LBL_Delete_Project_Caption=\u5220\u9664\u9879\u76ee
24.35 +LBL_Deleting_Project=\u5220\u9664\u9879\u76ee:
24.36 +LBL_Yes_Button=\u662f(&Y)
24.37 +LBL_No_Button=\u5426
24.38 +LBL_Cancel_Button=\u53d6\u6d88
24.39 +LBL_Copy_Button=\u590d\u5236
24.40 +LBL_Move_Button=\u79fb\u52a8
24.41 +LBL_Rename_Button=\u91cd\u547d\u540d
24.42 +ACSD_Yes_Button=\u201c\u662f\u201d\u6309\u94ae
24.43 +ACSD_No_Button=\u201c\u5426\u201d\u6309\u94ae
24.44 +ACSD_Cancel_Button=\u201c\u53d6\u6d88\u201d\u6309\u94ae
24.45 +ACSD_Copy_Button=\u201c\u590d\u5236\u201d\u6309\u94ae
24.46 +ACSD_Move_Button=\u201c\u79fb\u52a8\u201d\u6309\u94ae
24.47 +ACSD_Rename_Button=\u201c\u91cd\u547d\u540d\u201d\u6309\u94ae
24.48 +#Error messages:
24.49 +#{0}: localized message of the original exception
24.50 +ERR_Cannot_Move=\u65e0\u6cd5\u79fb\u52a8\u9879\u76ee, \u539f\u56e0: {0}
24.51 +#{0}: localized message of the original exception
24.52 +ERR_Cannot_Copy=\u65e0\u6cd5\u590d\u5236\u9879\u76ee, \u539f\u56e0: {0}
24.53 +#{0}: localized message of the original exception
24.54 +ERR_Cannot_Rename=\u65e0\u6cd5\u91cd\u547d\u540d\u9879\u76ee, \u539f\u56e0: {0}
24.55 +
24.56 +#DefaultProjectDeletePanel:
24.57 +#{0}: project name
24.58 +LBL_Pre_Delete_Warning=\u6b64\u64cd\u4f5c\u5c06\u5220\u9664\u9879\u76ee "{0}", \u8fd9\u6837\u4fbf\u65e0\u6cd5\u5728 NetBeans IDE \u4e2d\u518d\u6b21\u6253\u5f00\u8be5\u9879\u76ee\u3002
24.59 +#{0}: project folder
24.60 +LBL_Delete_Also_Sources=\u540c\u65f6\u5220\u9664 "{0}" \u6587\u4ef6\u5939\u4e0b\u7684\u6e90\u6587\u4ef6(&A)\u3002
24.61 +ASCN_Pre_Delete_Warning=\u5220\u9664\u524d\u8b66\u544a
24.62 +#{0}: project name
24.63 +ACSD_Pre_Delete_Warning=\u662f\u5426\u786e\u5b9e\u8981\u5220\u9664\u9879\u76ee "{0}"?
24.64 +#{0}: project folder
24.65 +ACSN_Delete_Also_Sources=\u540c\u65f6\u5220\u9664 "{0}" \u6587\u4ef6\u5939\u4e0b\u7684\u6e90\u6587\u4ef6\u3002
24.66 +
24.67 +#accessible description for the whole dialog
24.68 +
24.69 +
24.70 +#ProjectCopyPanel:
24.71 +#{0}: Integer 0 or 1. 0 for copy project dialog, 1 for move project dialog
24.72 +#{1}: project's display name
24.73 +LBL_Copy_Move_Dialog_Text={0,choice,0#\u590d\u5236|1#\u79fb\u52a8} "{1}" \u5230:
24.74 +LBL_Project_Folder=\u9879\u76ee\u6587\u4ef6\u5939(&D):
24.75 +LBL_Project_Location=\u9879\u76ee\u4f4d\u7f6e(&L):
24.76 +LBL_Project_Name=\u9879\u76ee\u540d\u79f0(&N):
24.77 +LBL_Copying_Moving={0,choice,0#\u590d\u5236\u9879\u76ee|1#\u79fb\u52a8\u9879\u76ee}
24.78 +LBL_Browse=\u6d4f\u89c8(&O)...
24.79 +ACSD_Browse=\u201c\u6d4f\u89c8\u201d\u6309\u94ae
24.80 +ACSN_Project_Folder=\u9879\u76ee\u6587\u4ef6\u5939
24.81 +
24.82 +ACSN_Project_Location=\u9879\u76ee\u4f4d\u7f6e
24.83 +
24.84 +ACSN_Project_Name=\u9879\u76ee\u540d\u79f0
24.85 +
24.86 +#accessible description for the whole dialog
24.87 +#{0}: Integer 0 or 1. 0 for copy project dialog, 1 for move project dialog
24.88 +
24.89 +LBL_Copy_Project_Caption=\u590d\u5236\u9879\u76ee
24.90 +#progress' name:
24.91 +LBL_Copy_Project_Handle=\u590d\u5236\u9879\u76ee
24.92 +LBL_Move_Project_Caption=\u79fb\u52a8\u9879\u76ee
24.93 +#progress' name:
24.94 +LBL_Move_Project_Handle=\u79fb\u52a8\u9879\u76ee
24.95 +
24.96 +#ProjectCopyPanel's warning message:
24.97 +#temporary serves as an error:
24.98 +WRN_External_Sources=\u9879\u76ee\u5305\u542b\u4e00\u4e2a\u6216\u591a\u4e2a\u5916\u90e8\u6e90\u4ee3\u7801\u6839\u76ee\u5f55, \u65e0\u6cd5\u590d\u5236\u3002
24.99 +#the original warning message:
24.100 +#WRN_External_Sources=The project has one or more external source roots, which cannot be copied.
24.101 +
24.102 +#DefaultRenamePanel:
24.103 +#{0}: project's display name
24.104 +LBL_Rename_Dialog_Text=\u91cd\u547d\u540d "{0}":
24.105 +LBL_Also_Rename_Project_Folder=\u540c\u65f6\u91cd\u547d\u540d\u9879\u76ee\u6587\u4ef6\u5939(&A)
24.106 +LBL_Renaming_Project=\u91cd\u547d\u540d\u9879\u76ee
24.107 +ACSN_Also_Rename_Project_Folder=\u540c\u65f6\u91cd\u547d\u540d\u9879\u76ee\u6587\u4ef6\u5939
24.108 +
24.109 +#accessible description for the whole dialog:
24.110 +
24.111 +LBL_Rename_Project_Caption=\u91cd\u547d\u540d\u9879\u76ee
24.112 +#progress' name:
24.113 +LBL_Rename_Project_Handle=\u91cd\u547d\u540d\u9879\u76ee
24.114 +
24.115 +#Error messages for ProjectCopyPanel and DefaultRenamePanel:
24.116 +ERR_Location_Does_Not_Exist=\u9879\u76ee\u4f4d\u7f6e\u4e0d\u5b58\u5728\u3002
24.117 +ERR_Project_Folder_Exists=\u9879\u76ee\u6587\u4ef6\u5939\u5df2\u5b58\u5728\u3002
24.118 +ERR_Project_Name_Must_Entered=\u5fc5\u987b\u8f93\u5165\u9879\u76ee\u540d\u79f0\u3002
24.119 +ERR_Location_Read_Only=\u9879\u76ee\u4f4d\u7f6e\u662f\u53ea\u8bfb\u7684\u3002
24.120 +ERR_Not_Valid_Filename=\u9879\u76ee\u540d\u79f0 "{0}" \u4e0d\u662f\u6709\u6548\u7684\u6587\u4ef6\u540d\u3002
24.121 +
24.122 +LBL_savingDataLabel=\u6b63\u5728\u4fdd\u5b58\u9879\u76ee\u6570\u636e...
24.123 +LBL_Saving_Project_data=\u6b63\u5728\u4fdd\u5b58\u9879\u76ee\u6570\u636e
24.124 +LBL_Saving_Project_data_progress=\u6b63\u5728\u4fdd\u5b58\u9879\u76ee\u6570\u636e
24.125 +
24.126 +TITLE_BrowseProjectLocation=\u6d4f\u89c8\u9879\u76ee\u4f4d\u7f6e
24.127 +LBL_BrowseProjectLocation_OK_Button=\u786e\u5b9a
24.128 +VCSWarningMessage=\u8b66\u544a: \u8be5\u64cd\u4f5c\u5c06\u4e0d\u4f1a\u590d\u5236\u9690\u85cf\u7684\u6587\u4ef6\u3002\u5982\u679c\u6b64\u9879\u76ee\u5728\u7248\u672c\u63a7\u5236\u4e4b\u4e0b, \u5219\u526f\u672c\u53ef\u80fd\u4e0d\u53d7\u7248\u672c\u63a7\u5236\u3002
24.129 +LBL_Pre_Delete_Question=\u662f\u5426\u786e\u5b9e\u8981\u5220\u9664\u5b83?
24.130 +
24.131 +########## copied fromorg.netbeans.modules.project.uiapi - END ##########
24.132 +
24.133 +ProjectRenameAction.text=\u91cd\u547d\u540d...
24.134 +ProjectMoveAction.text=\u79fb\u52a8...
24.135 +ProjectCopyAction.text=\u590d\u5236...
24.136 +ProjectDeleteAction.text=\u5220\u9664
24.137 +
25.1 --- a/src/zh_CN/cnd/cnd-remote/cnd-remote/org/netbeans/modules/cnd/remote/sync/Bundle_zh_CN.properties Wed Jul 30 05:03:48 2014 -0700
25.2 +++ b/src/zh_CN/cnd/cnd-remote/cnd-remote/org/netbeans/modules/cnd/remote/sync/Bundle_zh_CN.properties Wed Jul 30 05:12:06 2014 -0700
25.3 @@ -109,10 +109,11 @@
25.4 FTP_Message_CheckLinks=\u6b63\u5728\u68c0\u67e5\u94fe\u63a5...
25.5
25.6 FTP_Progress_UploadFiles=\u6b63\u5728\u4e0a\u8f7d\u5df2\u66f4\u6539\u7684\u6587\u4ef6
25.7 -FTP_Message_UploadFilesPlain=\u6b63\u5728\u4e0a\u8f7d\u5df2\u66f4\u6539\u7684\u6587\u4ef6...
25.8 +FTP_Message_UploadFilesPlain=\u6b63\u5728\u4e0a\u8f7d {0} \u4e2a\u5df2\u66f4\u6539\u7684\u6587\u4ef6...
25.9 +FTP_Message_NoFilesToUpload=\u6ca1\u6709\u8981\u4e0a\u8f7d\u7684\u5df2\u66f4\u6539\u6587\u4ef6
25.10 FTP_Message_UploadFilesInZip=\u6b63\u5728\u4e0a\u8f7d\u5df2\u66f4\u6539\u7684\u6587\u4ef6:
25.11
25.12 -FTP_Message_Zipping=\t\u6b63\u5728\u538b\u7f29\u5df2\u66f4\u6539\u7684\u6587\u4ef6...
25.13 +FTP_Message_Zipping=\t\u6b63\u5728\u538b\u7f29 {0} \u4e2a\u5df2\u66f4\u6539\u7684\u6587\u4ef6...
25.14 FTP_Progress_Zipping=\u6b63\u5728\u538b\u7f29\u5df2\u66f4\u6539\u7684\u6587\u4ef6
25.15
25.16 FTP_Message_UploadingZip=\t\u6b63\u5728\u5c06 zip \u4e0a\u8f7d\u5230{0}...
25.17 @@ -125,5 +126,7 @@
25.18 FTP_Message_Done=\u4e0a\u8f7d\u5df2\u66f4\u6539\u7684\u6587\u4ef6\u5df2\u6210\u529f\u5b8c\u6210\u3002
25.19
25.20 FTP_Err_CantMap=\u627e\u4e0d\u5230{0}\u7684\u8fdc\u7a0b\u8def\u5f84
25.21 -FTP_Err_Unzip=\u5df2\u5b8c\u6210\u5728{1}\u5904\u89e3\u538b\u7f29{0}, \u4f46\u51fa\u73b0\u9519\u8bef\u4ee3\u7801{2}
25.22 +FTP_Err_Unzip=\u5df2\u5728{1}\u5904\u89e3\u538b\u7f29{0}, \n\u4f46\u51fa\u73b0\u9519\u8bef\u4ee3\u7801{2}
25.23
25.24 +FTP_Msg_TryingToRecoverViaPlainFiles=\u89e3\u538b\u7f29\u6587\u4ef6\u65f6\u51fa\u9519\u3002\u6b63\u5728\u5c1d\u8bd5\u4f7f\u7528\u666e\u901a\u6587\u4ef6\u6062\u590d...\n
25.25 +
26.1 --- a/src/zh_CN/cnd/cnd-toolchain/cnd-toolchain/org/netbeans/modules/cnd/toolchain/execution/Bundle_zh_CN.properties Wed Jul 30 05:03:48 2014 -0700
26.2 +++ b/src/zh_CN/cnd/cnd-toolchain/cnd-toolchain/org/netbeans/modules/cnd/toolchain/execution/Bundle_zh_CN.properties Wed Jul 30 05:12:06 2014 -0700
26.3 @@ -44,6 +44,7 @@
26.4 HINT_CompilerError=\u7f16\u8bd1\u5668\u9519\u8bef
26.5 HINT_CompilerWarning=\u7f16\u8bd1\u5668\u8b66\u544a
26.6 HINT_IncludedFrom=\u5728\u4ece\u4e2d\u5305\u542b\u7684\u6587\u4ef6\u4e2d
26.7 +HINT_InstantiatedFrom=\u5728\u5b9e\u4f8b\u5316\u4e2d
26.8
26.9 CompileErrorTasks=C/C++ \u4e0a\u6b21\u6784\u5efa\u9519\u8bef\u548c\u8b66\u544a
26.10 CompileErrorTasksDesc=C/C++ \u9879\u76ee\u7684\u6784\u5efa\u9519\u8bef\u548c\u8b66\u544a
27.1 --- a/src/zh_CN/cnd/cnd-toolchain/cnd-toolchain/org/netbeans/modules/cnd/toolchain/ui/compiler/Bundle_zh_CN.properties Wed Jul 30 05:03:48 2014 -0700
27.2 +++ b/src/zh_CN/cnd/cnd-toolchain/cnd-toolchain/org/netbeans/modules/cnd/toolchain/ui/compiler/Bundle_zh_CN.properties Wed Jul 30 05:12:06 2014 -0700
27.3 @@ -59,12 +59,16 @@
27.4 RESET_BUTTON_AD=\u91cd\u7f6e\u8bbe\u7f6e
27.5 SelectDirectoryTxt=\u9009\u62e9\u76ee\u5f55
27.6 SelectTxt=\u9009\u62e9
27.7 +AddDialogTitle=\u6dfb\u52a0
27.8 AddButtonTxt=\u6dfb\u52a0
27.9 -EditButtonTxt=\u7f16\u8f91
27.10 -EditDialogTitle=\u7f16\u8f91
27.11 +
27.12 +
27.13 +EditButtonTxt=\u4fee\u6539
27.14 +EditDialogTitle=\u4fee\u6539
27.15 +
27.16 +
27.17 EditDialogLabelDir=\u65b0\u5efa\u76ee\u5f55(&N):
27.18 EditDialogLabelDef=\u65b0\u5efa\u5b9a\u4e49(&N):
27.19 -AddDialogTitle=\u6dfb\u52a0
27.20 IncludeDirectoriesTxt=\u5305\u542b\u76ee\u5f55:
27.21
27.22
27.23 @@ -72,22 +76,14 @@
27.24
27.25
27.26
27.27 -
27.28 MacroDefinitionsTxt=\u5b8f\u5b9a\u4e49:
27.29
27.30
27.31 -
27.32 -
27.33 -
27.34 -
27.35 -
27.36 -
27.37 LBL_ParserSettigs=\u4f7f\u7528\u6b64\u6309\u94ae\u53ef\u4ee5\u7ba1\u7406\u5185\u7f6e\u89e3\u6790\u5668\u7684\u7f16\u8bd1\u5668\u8bbe\u7f6e:
27.38
27.39 BTN_ParserSettings=\u89e3\u6790\u5668\u8bbe\u7f6e...
27.40
27.41
27.42 -
27.43 CODE_ASSISTANCE_COMMENT=\u7528\u4e8e\u4ee3\u7801\u5e2e\u52a9\u529f\u80fd\u7684\u5185\u7f6e\u89e3\u6790\u5668\u8bbe\u7f6e
27.44
27.45 UserAdded.tooltip.text.include=\u7528\u6237\u6dfb\u52a0/\u66f4\u6539\u4e86\u7cfb\u7edf\u5305\u542b\u8def\u5f84 "{0}", \u5c06\u5728\u5de5\u5177\u96c6\u5408\u9a8c\u8bc1\u65f6\u4fdd\u7559\u8be5\u8def\u5f84
28.1 --- a/src/zh_CN/dlight/dlight-kit/dlight-kit/org/netbeans/modules/dlight/kit/Bundle_zh_CN.properties Wed Jul 30 05:03:48 2014 -0700
28.2 +++ b/src/zh_CN/dlight/dlight-kit/dlight-kit/org/netbeans/modules/dlight/kit/Bundle_zh_CN.properties Wed Jul 30 05:12:06 2014 -0700
28.3 @@ -1,4 +1,4 @@
28.4 -OpenIDE-Module-Display-Category=\u6027\u80fd\u5206\u6790
28.5 +OpenIDE-Module-Display-Category=\u672c\u673a\u652f\u6301\u5de5\u5177
28.6 OpenIDE-Module-Long-Description=DLight \u5de5\u5177\u5305
28.7 OpenIDE-Module-Name=DLight
28.8 OpenIDE-Module-Short-Description=DLight \u5de5\u5177\u5305
29.1 --- a/src/zh_CN/dlight/dlight-libs-common/dlight-libs-common/org/netbeans/modules/dlight/libs/common/resources/Bundle_zh_CN.properties Wed Jul 30 05:03:48 2014 -0700
29.2 +++ b/src/zh_CN/dlight/dlight-libs-common/dlight-libs-common/org/netbeans/modules/dlight/libs/common/resources/Bundle_zh_CN.properties Wed Jul 30 05:12:06 2014 -0700
29.3 @@ -1,2 +1,3 @@
29.4 -OpenIDE-Module-Display-Category=\u6570\u636e\u5e93
29.5 +OpenIDE-Module-Display-Category=\u672c\u673a\u652f\u6301\u5de5\u5177
29.6 OpenIDE-Module-Name=DLight \u516c\u5171\u5e93
29.7 +OpenIDE-Module-Short-Description=\u672c\u673a\u652f\u6301\u5de5\u5177\u516c\u5171\u5e93
30.1 --- a/src/zh_CN/dlight/dlight-remote-impl/dlight-remote-impl/org/netbeans/modules/remote/impl/resources/Bundle_zh_CN.properties Wed Jul 30 05:03:48 2014 -0700
30.2 +++ b/src/zh_CN/dlight/dlight-remote-impl/dlight-remote-impl/org/netbeans/modules/remote/impl/resources/Bundle_zh_CN.properties Wed Jul 30 05:12:06 2014 -0700
30.3 @@ -1,3 +1,5 @@
30.4 +OpenIDE-Module-Display-Category=\u672c\u673a\u652f\u6301\u5de5\u5177
30.5 OpenIDE-Module-Name=\u8fdc\u7a0b\u5b9e\u73b0
30.6
30.7 +OpenIDE-Module-Short-Description=\u8fdc\u7a0b\u6587\u4ef6\u7cfb\u7edf\u5b9e\u73b0
30.8
31.1 --- a/src/zh_CN/dlight/dlight-remote/dlight-remote/org/netbeans/modules/remote/resources/Bundle_zh_CN.properties Wed Jul 30 05:03:48 2014 -0700
31.2 +++ b/src/zh_CN/dlight/dlight-remote/dlight-remote/org/netbeans/modules/remote/resources/Bundle_zh_CN.properties Wed Jul 30 05:12:06 2014 -0700
31.3 @@ -1,3 +1,5 @@
31.4 +OpenIDE-Module-Display-Category=\u672c\u673a\u652f\u6301\u5de5\u5177
31.5 OpenIDE-Module-Name=\u8fdc\u7a0b API
31.6
31.7 +OpenIDE-Module-Short-Description=\u8fdc\u7a0b\u6587\u4ef6\u7cfb\u7edf API
31.8
32.1 --- a/src/zh_CN/enterprise/j2ee-earproject/j2ee-earproject/org/netbeans/modules/j2ee/earproject/ui/resources/completeProject_zh_CN.html Wed Jul 30 05:03:48 2014 -0700
32.2 +++ b/src/zh_CN/enterprise/j2ee-earproject/j2ee-earproject/org/netbeans/modules/j2ee/earproject/ui/resources/completeProject_zh_CN.html Wed Jul 30 05:12:06 2014 -0700
32.3 @@ -45,6 +45,6 @@
32.4 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
32.5 </head>
32.6 <BODY>
32.7 - 使用“填充的企业应用程序项目”可以在系统中创建包含附加 Web 模块和附加 EJB 模块的项目。此项目将根据企业应用程序的项目约定 [http://java.sun.com/blueprints/code/projectconventions.html] 进行布局。
32.8 + 使用“填充的企业应用程序项目”可以在系统中创建包含附加 Web 模块和附加 EJB 模块的项目。这些项目将根据企业应用程序的项目约定进行布局。
32.9 </BODY>
32.10 </HTML>
33.1 --- a/src/zh_CN/enterprise/j2ee-earproject/j2ee-earproject/org/netbeans/modules/j2ee/earproject/ui/resources/ear-importProject_zh_CN.html Wed Jul 30 05:03:48 2014 -0700
33.2 +++ b/src/zh_CN/enterprise/j2ee-earproject/j2ee-earproject/org/netbeans/modules/j2ee/earproject/ui/resources/ear-importProject_zh_CN.html Wed Jul 30 05:12:06 2014 -0700
33.3 @@ -45,6 +45,6 @@
33.4 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
33.5 </head>
33.6 <BODY>
33.7 - <b>将现有的企业应用程序导入</b>标准的 IDE 项目中。企业应用程序必须遵循 J2EE BluePrints 企业应用程序的项目约定 (请参见 http://java.sun.com/blueprints/code/projectconventions.html)。此向导还会导入在企业应用程序中嵌套的组件。标准项目使用 <b>IDE 生成的 Ant 构建脚本</b>来构建和运行项目。
33.8 + <b>将现有的企业应用程序导入</b>标准的 IDE 项目中。企业应用程序必须遵循 J2EE BluePrints 企业应用程序的项目约定。此向导还会导入在企业应用程序中嵌套的组件。标准项目使用 <b>IDE 生成的 Ant 构建脚本</b>来构建和运行项目。
33.9 </BODY>
33.10 </HTML>
34.1 --- a/src/zh_CN/enterprise/j2ee-ejbcore/j2ee-ejbcore/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/session/Bundle_zh_CN.properties Wed Jul 30 05:03:48 2014 -0700
34.2 +++ b/src/zh_CN/enterprise/j2ee-ejbcore/j2ee-ejbcore/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/session/Bundle_zh_CN.properties Wed Jul 30 05:12:06 2014 -0700
34.3 @@ -102,6 +102,7 @@
34.4 ERR_TO_NotEnoughAttributes=\u5e94\u81f3\u5c11\u5728\u65b9\u6cd5\u8ba1\u5212\u4e2d\u6307\u5b9a\u4e00\u4e2a\u5c5e\u6027
34.5 ERR_TO_InvalidAtributes=\u65b9\u6cd5\u8ba1\u5212\u7684\u5c5e\u6027\u65e0\u6548: {0}
34.6 ERR_TO_UnparsableSchedule=\u65e0\u6cd5\u89e3\u6790\u65b9\u6cd5\u8ba1\u5212\u6587\u672c
34.7 +ERR_TO_PersistentParameter=\u8bf7\u52ff\u5728\u65b9\u6cd5\u8ba1\u5212\u4e2d\u6307\u5b9a "persistent", \u8bf7\u4f7f\u7528 ''{0}'' \u590d\u9009\u6846
34.8
34.9 LBL_ExposeTimerMethod=\u5c06\u8ba1\u65f6\u5668\u65b9\u6cd5\u516c\u5f00\u5230\u63a5\u53e3(&E)
34.10 LBL_NonPersistentTimer=\u5c06\u8ba1\u65f6\u5668\u8bbe\u4e3a\u975e\u6301\u4e45(&A)
35.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
35.2 +++ b/src/zh_CN/enterprise/javaee-wildfly/javaee-wildfly/org/netbeans/modules/javaee/wildfly/Bundle_zh_CN.properties Wed Jul 30 05:12:06 2014 -0700
35.3 @@ -0,0 +1,66 @@
35.4 +#
35.5 +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
35.6 +#
35.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
35.8 +#
35.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
35.10 +# Other names may be trademarks of their respective owners.
35.11 +#
35.12 +# The contents of this file are subject to the terms of either the GNU
35.13 +# General Public License Version 2 only ("GPL") or the Common
35.14 +# Development and Distribution License("CDDL") (collectively, the
35.15 +# "License"). You may not use this file except in compliance with the
35.16 +# License. You can obtain a copy of the License at
35.17 +# http://www.netbeans.org/cddl-gplv2.html
35.18 +# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
35.19 +# specific language governing permissions and limitations under the
35.20 +# License. When distributing the software, include this License Header
35.21 +# Notice in each file and include the License file at
35.22 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
35.23 +# particular file as subject to the "Classpath" exception as provided
35.24 +# by Oracle in the GPL Version 2 section of the License file that
35.25 +# accompanied this code. If applicable, add the following below the
35.26 +# License Header, with the fields enclosed by brackets [] replaced by
35.27 +# your own identifying information:
35.28 +# "Portions Copyrighted [year] [name of copyright owner]"
35.29 +#
35.30 +# Contributor(s):
35.31 +#
35.32 +# The Original Software is NetBeans. The Initial Developer of the Original
35.33 +# Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
35.34 +# Microsystems, Inc. All Rights Reserved.
35.35 +#
35.36 +# If you wish your version of this file to be governed by only the CDDL
35.37 +# or only the GPL Version 2, indicate your decision by adding
35.38 +# "[Contributor] elects to include this software in this distribution
35.39 +# under the [CDDL or GPL Version 2] license." If you do not indicate a
35.40 +# single choice of license, a recipient has the option to distribute
35.41 +# your version of this file under either the CDDL, the GPL Version 2 or
35.42 +# to extend the choice of license to its licensees as provided above.
35.43 +# However, if you add GPL Version 2 code and therefore, elected the GPL
35.44 +# Version 2 license, then the option applies only if the new code is
35.45 +# made subject to such option by the copyright holder.
35.46 +#
35.47 +
35.48 +
35.49 +WILDFLY_SERVER_NAME=WildFly \u5e94\u7528\u670d\u52a1\u5668
35.50 +LBL_JBossFactoryVersion=WildFly \u63d2\u4ef6\u7684\u90e8\u7f72\u5de5\u5382
35.51 +
35.52 +MSG_DEPLOYING=\u90e8\u7f72{0}
35.53 +MSG_Waiting_For_Url=\u7b49\u5f85\u670d\u52a1\u5668\u542f\u52a8\u6a21\u5757{0}
35.54 +MSG_Loading_Config=\u4ece\u6587\u4ef6\u4e2d\u52a0\u8f7d\u914d\u7f6e\u65f6\u51fa\u73b0\u9519\u8bef\u3002
35.55 +
35.56 +MSG_FailedToCreateConfigFolder=\u65e0\u6cd5\u521b\u5efa{0}\u6587\u4ef6\u5939\u3002
35.57 +
35.58 +MSG_INVALID_URI=URI \u65e0\u6548: {0}
35.59 +MSG_ERROR_CREATING_DM=\u90e8\u7f72\u7ba1\u7406\u5668\u521b\u5efa\u671f\u95f4\u51fa\u9519\u3002
35.60 +
35.61 +MSG_TIMEOUT=\u5df2\u8d85\u8fc7\u90e8\u7f72\u8d85\u65f6\u7684\u9650\u5236
35.62 +MSG_FAILED=\u90e8\u7f72\u5931\u8d25
35.63 +MSG_DeployDirMissing=\u90e8\u7f72\u6587\u4ef6\u5939\u4e0d\u5b58\u5728: {0}
35.64 +MSG_DeployFileMissing=\u8981\u90e8\u7f72\u7684\u6587\u4ef6\u4e0d\u5b58\u5728: {0}
35.65 +
35.66 +MSG_CHANGES_TITLE=WildFly JEE \u63d2\u4ef6
35.67 +MSG_CHANGES_SUMMARY=WildFly JEE \u63d2\u4ef6\u66f4\u6539\u65e5\u5fd7
35.68 +MSG_CHANGES_DESC=<html>\u66f4\u6539\u65e5\u5fd7:<br/>\u7248\u672c 1.0.17:<ul><li>\u5982\u679c\u914d\u7f6e\u4e0e\u9884\u671f\u914d\u7f6e\u4e0d\u540c, \u5219\u4f1a\u751f\u6210\u8b66\u544a\u3002</li><li>\u4fee\u590d\u9879\u76ee\u540d\u4ee5 war \u7ed3\u5c3e\u7684\u90e8\u7f72\u95ee\u9898\u3002</li></ul>\u7248\u672c 1.0.16:<ul><li>\u4fee\u590d Netbeans Webapp \u9879\u76ee\u7684\u963b\u585e NPE\u3002</li></ul>\u7248\u672c 1.0.15:<ul><li>\u90e8\u7f72\u4e00\u4e2a webapp \u4e0d\u4f1a\u53d6\u6d88\u90e8\u7f72\u5176\u4ed6 webapp </li><li>\u5220\u9664\u4e0d\u652f\u6301\u7684\u57df Domain\u3002</li></ul>\u7248\u672c 1.0.14:<ul><li>\u914d\u7f6e\u6587\u4ef6\u53ef\u4f4d\u4e8e\u4efb\u610f\u4f4d\u7f6e</li><li>\u4fee\u590d Windows \u7684\u4ee3\u7406\u95ee\u9898</li></ul>\u7248\u672c 1.0.13:<ul><li>\u4fee\u590d JPA \u5b9e\u4f53\u751f\u6210\u5668</li><li>\u4fee\u590d\u201c\u5728\u4fdd\u5b58\u65f6\u90e8\u7f72\u201d\u4e2d\u7f3a\u5c11\u7684 EAR \u540d\u79f0</li></ul>\u7248\u672c 1.0.12:<ul><li>\u4fee\u590d 32 \u4f4d JVM \u4e2d\u7684\u9519\u8bef</li></ul>\u7248\u672c 1.0.11:<ul><li>\u4fee\u590d Windows \u975e\u4ee3\u7406\u4e3b\u673a\u4e2d\u7684\u9519\u8bef</li><li>\u4ec5\u5728\u6bcf\u6b21\u5347\u7ea7\u65f6\u663e\u793a\u901a\u77e5\u3002</li></ul>\u7248\u672c 1.0.10:<ul><li>\u4fee\u590d\u9519\u8bef</li><li>\u4f7f\u6a21\u5757\u4e0e Netbeans 8.0.RC1 \u517c\u5bb9</li></ul>\u7248\u672c 1.0.9:<ul><li>\u5bf9 nbm \u8fdb\u884c\u7b7e\u540d</li><li>\u63a8\u6d4b JDBC \u9a71\u52a8\u7a0b\u5e8f\u4ee5\u4fbf\u6267\u884c JPA \u751f\u6210</li><li>\u4fee\u590d\u9879\u76ee\u4e2d\u7f3a\u5c11\u7684\u5e93</li></ul>\u7248\u672c 1.0.8:<ul><li>\u4fee\u590d Maven EAR \u9879\u76ee</li><li>\u663e\u793a\u8d44\u6e90\u9002\u914d\u5668</li><li>\u5141\u8bb8\u7f16\u8f91\u914d\u7f6e\u6587\u4ef6</li><li>\u7f29\u77ed\u8fde\u63a5\u5230\u670d\u52a1\u5668\u7684\u8d85\u65f6\u65f6\u95f4</li></ul>\u7248\u672c 1.0.7:<ul><li>JPA 2.1 \u652f\u6301</li><li>\u4f18\u5316\u670d\u52a1\u5668\u521b\u5efa\u671f\u95f4\u7684\u9ed8\u8ba4\u8bbe\u7f6e</li><li>\u4f7f\u7528 Maven \u4fee\u590d\u589e\u91cf\u90e8\u7f72</li></ul>\u7248\u672c 1.0.6:<ul><li>\u63a7\u5236\u53f0\u663e\u793a\u5df2\u5728\u8fd0\u884c\u7684 Wildfly \u5b9e\u4f8b\u7684\u65e5\u5fd7</li><li>\u7b80\u5316\u7528\u4e8e\u6dfb\u52a0 WildFly \u5b9e\u4f8b\u7684\u6d41</li><li>\u663e\u793a\u7684\u66f4\u6539\u65e5\u5fd7</li><li>\u5728\u4fdd\u5b58\u65f6\u90e8\u7f72\u9002\u7528\u4e8e\u7b80\u5355 EJB \u548c WAR</li></ul>\u7248\u672c 1.0.5:<ul><li>\u663e\u793a\u7684\u90ae\u4ef6\u4f1a\u8bdd</li><li>\u663e\u793a\u7684\u8fde\u63a5\u5de5\u5382</li></ul></html>
35.69 +
36.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
36.2 +++ b/src/zh_CN/enterprise/javaee-wildfly/javaee-wildfly/org/netbeans/modules/javaee/wildfly/config/Bundle_zh_CN.properties Wed Jul 30 05:12:06 2014 -0700
36.3 @@ -0,0 +1,83 @@
36.4 +#
36.5 +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
36.6 +#
36.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
36.8 +#
36.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
36.10 +# Other names may be trademarks of their respective owners.
36.11 +#
36.12 +# The contents of this file are subject to the terms of either the GNU
36.13 +# General Public License Version 2 only ("GPL") or the Common
36.14 +# Development and Distribution License("CDDL") (collectively, the
36.15 +# "License"). You may not use this file except in compliance with the
36.16 +# License. You can obtain a copy of the License at
36.17 +# http://www.netbeans.org/cddl-gplv2.html
36.18 +# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
36.19 +# specific language governing permissions and limitations under the
36.20 +# License. When distributing the software, include this License Header
36.21 +# Notice in each file and include the License file at
36.22 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
36.23 +# particular file as subject to the "Classpath" exception as provided
36.24 +# by Oracle in the GPL Version 2 section of the License file that
36.25 +# accompanied this code. If applicable, add the following below the
36.26 +# License Header, with the fields enclosed by brackets [] replaced by
36.27 +# your own identifying information:
36.28 +# "Portions Copyrighted [year] [name of copyright owner]"
36.29 +#
36.30 +# Contributor(s):
36.31 +#
36.32 +# The Original Software is NetBeans. The Initial Developer of the Original
36.33 +# Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
36.34 +# Microsystems, Inc. All Rights Reserved.
36.35 +#
36.36 +# If you wish your version of this file to be governed by only the CDDL
36.37 +# or only the GPL Version 2, indicate your decision by adding
36.38 +# "[Contributor] elects to include this software in this distribution
36.39 +# under the [CDDL or GPL Version 2] license." If you do not indicate a
36.40 +# single choice of license, a recipient has the option to distribute
36.41 +# your version of this file under either the CDDL, the GPL Version 2 or
36.42 +# to extend the choice of license to its licensees as provided above.
36.43 +# However, if you add GPL Version 2 code and therefore, elected the GPL
36.44 +# Version 2 license, then the option applies only if the new code is
36.45 +# made subject to such option by the copyright holder.
36.46 +#
36.47 +
36.48 +MSG_invalidCP=\u4fee\u590d\u65e0\u6548\u7684\u4e0a\u4e0b\u6587\u8def\u5f84\u503c: {0}
36.49 +MSG_jbossWebXmlNotValid=\u5f53\u524d\u7f16\u8f91\u7684 jboss-web.xml \u914d\u7f6e\u6587\u4ef6\u5904\u4e8e\u4e0d\u4e00\u81f4\u7684\u72b6\u6001\u4e2d\u3002\u662f\u5426\u8981\u8986\u76d6\u8fd9\u4e9b\u66f4\u6539?
36.50 +MSG_jbossClientXmlNotValid=\u5f53\u524d\u7f16\u8f91\u7684 jboss-client.xml \u914d\u7f6e\u6587\u4ef6\u5904\u4e8e\u4e0d\u4e00\u81f4\u7684\u72b6\u6001\u4e2d\u3002\u662f\u5426\u8981\u8986\u76d6\u8fd9\u4e9b\u66f4\u6539?
36.51 +
36.52 +MSG_jbossXmlCannotParse=\u914d\u7f6e\u6587\u4ef6{0}\u662f\u4e0d\u53ef\u89e3\u6790\u7684 - \u5b83\u65e0\u6cd5\u6267\u884c\u66f4\u6539\u3002
36.53 +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
36.54 +MSG_cannotSaveNotParseableConfFile=\u7531\u4e8e{0}\u914d\u7f6e\u6587\u4ef6\u4e0d\u53ef\u89e3\u6790, \u56e0\u6b64\u65e0\u6cd5\u4fdd\u5b58\u8be5\u6587\u4ef6\u3002
36.55 +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?
36.56 +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
36.57 +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
36.58 +MSG_NotParseableDatasources=\u7531\u4e8e{0}\u6587\u4ef6\u4e0d\u53ef\u89e3\u6790, \u56e0\u6b64\u65e0\u6cd5\u83b7\u53d6\u6570\u636e\u6e90\u5217\u8868\u3002
36.59 +
36.60 +ERR_WRONG_DEPLOY_DIR=\u65e0\u6cd5\u8bfb\u53d6\u76ee\u6807\u670d\u52a1\u5668\u4e2d\u7684\u6570\u636e\u6e90\u3002\u90e8\u7f72\u76ee\u5f55\u662f\u672a\u77e5\u7684, \u6216\u8005\u4e0d\u5b58\u5728\u6216\u8005\u4e0d\u53ef\u8bfb\u3002
36.61 +ERR_WRONG_CONFIG_FILE=\u65e0\u6cd5\u8bfb\u53d6\u76ee\u6807\u670d\u52a1\u5668\u4e2d\u7684\u6570\u636e\u6e90\u3002\u914d\u7f6e XML \u662f\u672a\u77e5\u7684, \u4e0d\u5b58\u5728\u6216\u8005\u4e0d\u53ef\u8bfb\u3002
36.62 +
36.63 +ERR_WRONG_JMS_CONFIG_FILE=\u65e0\u6cd5\u8bfb\u53d6\u76ee\u6807\u670d\u52a1\u5668\u4e2d\u7684\u6d88\u606f\u76ee\u6807\u3002\u914d\u7f6e XML \u662f\u672a\u77e5\u7684, \u4e0d\u5b58\u5728\u6216\u8005\u4e0d\u53ef\u8bfb\u3002
36.64 +
36.65 +LBL_DS_JNDI=JNDI \u540d\u79f0
36.66 +LBL_DS_URL=\u6570\u636e\u5e93 URL
36.67 +LBL_DS_USER=\u7528\u6237
36.68 +LBL_DS_PASS=\u53e3\u4ee4
36.69 +LBL_DS_DRV=\u9a71\u52a8\u7a0b\u5e8f
36.70 +LBL_DS_MINPS=\u6700\u5c0f\u6c60\u5927\u5c0f
36.71 +LBL_DS_MAXPS=\u6700\u5927\u6c60\u5927\u5c0f
36.72 +LBL_DS_IDLE=\u7a7a\u95f2\u8d85\u65f6 (\u5206\u949f)
36.73 +
36.74 +LBL_DS_CONFLICT=\u53d1\u73b0\u6570\u636e\u6e90\u51b2\u7a81:
36.75 +
36.76 +LBL_MODULE=\u6a21\u5757
36.77 +LBL_SERVER=\u670d\u52a1\u5668
36.78 +
36.79 +ERR_CannotReadDSdotXml=\u65e0\u6cd5\u8bfb\u53d6\u670d\u52a1\u5668\u4e0a\u7684 jboss-ds.xml \u6587\u4ef6
36.80 +ERR_CannotCreateDSdotXml=\u65e0\u6cd5\u5728\u670d\u52a1\u5668\u4e0a\u521b\u5efa jboss-ds.xml \u6587\u4ef6
36.81 +
36.82 +MSG_NoPrefix=\u6d88\u606f\u76ee\u6807 JNDI \u540d\u79f0{0}\u4e0d\u4ee5 ''queue/'' \u6216 ''topic/'' \u524d\u7f00\u5f00\u5934
36.83 +
36.84 +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
36.85 +
36.86 +
37.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
37.2 +++ b/src/zh_CN/enterprise/javaee-wildfly/javaee-wildfly/org/netbeans/modules/javaee/wildfly/config/ds/Bundle_zh_CN.properties Wed Jul 30 05:12:06 2014 -0700
37.3 @@ -0,0 +1,50 @@
37.4 +#
37.5 +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
37.6 +#
37.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
37.8 +#
37.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
37.10 +# Other names may be trademarks of their respective owners.
37.11 +#
37.12 +# The contents of this file are subject to the terms of either the GNU
37.13 +# General Public License Version 2 only ("GPL") or the Common
37.14 +# Development and Distribution License("CDDL") (collectively, the
37.15 +# "License"). You may not use this file except in compliance with the
37.16 +# License. You can obtain a copy of the License at
37.17 +# http://www.netbeans.org/cddl-gplv2.html
37.18 +# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
37.19 +# specific language governing permissions and limitations under the
37.20 +# License. When distributing the software, include this License Header
37.21 +# Notice in each file and include the License file at
37.22 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
37.23 +# particular file as subject to the "Classpath" exception as provided
37.24 +# by Oracle in the GPL Version 2 section of the License file that
37.25 +# accompanied this code. If applicable, add the following below the
37.26 +# License Header, with the fields enclosed by brackets [] replaced by
37.27 +# your own identifying information:
37.28 +# "Portions Copyrighted [year] [name of copyright owner]"
37.29 +#
37.30 +# Contributor(s):
37.31 +#
37.32 +# The Original Software is NetBeans. The Initial Developer of the Original
37.33 +# Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
37.34 +# Microsystems, Inc. All Rights Reserved.
37.35 +#
37.36 +# If you wish your version of this file to be governed by only the CDDL
37.37 +# or only the GPL Version 2, indicate your decision by adding
37.38 +# "[Contributor] elects to include this software in this distribution
37.39 +# under the [CDDL or GPL Version 2] license." If you do not indicate a
37.40 +# single choice of license, a recipient has the option to distribute
37.41 +# your version of this file under either the CDDL, the GPL Version 2 or
37.42 +# to extend the choice of license to its licensees as provided above.
37.43 +# However, if you add GPL Version 2 code and therefore, elected the GPL
37.44 +# Version 2 license, then the option applies only if the new code is
37.45 +# made subject to such option by the copyright holder.
37.46 +#
37.47 +
37.48 +MSG_datasourcesXmlCannotParse=\u914d\u7f6e\u6587\u4ef6{0}\u662f\u4e0d\u53ef\u89e3\u6790\u7684 - \u5b83\u65e0\u6cd5\u6267\u884c\u66f4\u6539\u3002
37.49 +
37.50 +MSG_datasourcesXmlNotValid=\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?
37.51 +
37.52 +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
37.53 +
38.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
38.2 +++ b/src/zh_CN/enterprise/javaee-wildfly/javaee-wildfly/org/netbeans/modules/javaee/wildfly/config/mdb/Bundle_zh_CN.properties Wed Jul 30 05:12:06 2014 -0700
38.3 @@ -0,0 +1,52 @@
38.4 +#
38.5 +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
38.6 +#
38.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
38.8 +#
38.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
38.10 +# Other names may be trademarks of their respective owners.
38.11 +#
38.12 +# The contents of this file are subject to the terms of either the GNU
38.13 +# General Public License Version 2 only ("GPL") or the Common
38.14 +# Development and Distribution License("CDDL") (collectively, the
38.15 +# "License"). You may not use this file except in compliance with the
38.16 +# License. You can obtain a copy of the License at
38.17 +# http://www.netbeans.org/cddl-gplv2.html
38.18 +# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
38.19 +# specific language governing permissions and limitations under the
38.20 +# License. When distributing the software, include this License Header
38.21 +# Notice in each file and include the License file at
38.22 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
38.23 +# particular file as subject to the "Classpath" exception as provided
38.24 +# by Oracle in the GPL Version 2 section of the License file that
38.25 +# accompanied this code. If applicable, add the following below the
38.26 +# License Header, with the fields enclosed by brackets [] replaced by
38.27 +# your own identifying information:
38.28 +# "Portions Copyrighted [year] [name of copyright owner]"
38.29 +#
38.30 +# Contributor(s):
38.31 +#
38.32 +# The Original Software is NetBeans. The Initial Developer of the Original
38.33 +# Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
38.34 +# Microsystems, Inc. All Rights Reserved.
38.35 +#
38.36 +# If you wish your version of this file to be governed by only the CDDL
38.37 +# or only the GPL Version 2, indicate your decision by adding
38.38 +# "[Contributor] elects to include this software in this distribution
38.39 +# under the [CDDL or GPL Version 2] license." If you do not indicate a
38.40 +# single choice of license, a recipient has the option to distribute
38.41 +# your version of this file under either the CDDL, the GPL Version 2 or
38.42 +# to extend the choice of license to its licensees as provided above.
38.43 +# However, if you add GPL Version 2 code and therefore, elected the GPL
38.44 +# Version 2 license, then the option applies only if the new code is
38.45 +# made subject to such option by the copyright holder.
38.46 +#
38.47 +
38.48 +MSG_msgdestXmlCannotParse=\u914d\u7f6e\u6587\u4ef6{0}\u662f\u4e0d\u53ef\u89e3\u6790\u7684 - \u5b83\u65e0\u6cd5\u6267\u884c\u66f4\u6539\u3002
38.49 +
38.50 +MSG_msgdestXmlNotValid=\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?
38.51 +
38.52 +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
38.53 +
38.54 +MSG_CannotSaveFile=\u65e0\u6cd5\u4fdd\u5b58{0}\u914d\u7f6e\u6587\u4ef6\u3002\u8bf7\u786e\u4fdd\u60a8\u5177\u6709\u6b64\u6587\u4ef6\u7684\u5199\u5165\u6743\u9650\u3002
38.55 +
39.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
39.2 +++ b/src/zh_CN/enterprise/javaee-wildfly/javaee-wildfly/org/netbeans/modules/javaee/wildfly/customizer/Bundle_zh_CN.properties Wed Jul 30 05:12:06 2014 -0700
39.3 @@ -0,0 +1,142 @@
39.4 +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
39.5 +#
39.6 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
39.7 +#
39.8 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
39.9 +# Other names may be trademarks of their respective owners.
39.10 +#
39.11 +# The contents of this file are subject to the terms of either the GNU
39.12 +# General Public License Version 2 only ("GPL") or the Common
39.13 +# Development and Distribution License("CDDL") (collectively, the
39.14 +# "License"). You may not use this file except in compliance with the
39.15 +# License. You can obtain a copy of the License at
39.16 +# http://www.netbeans.org/cddl-gplv2.html
39.17 +# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
39.18 +# specific language governing permissions and limitations under the
39.19 +# License. When distributing the software, include this License Header
39.20 +# Notice in each file and include the License file at
39.21 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
39.22 +# particular file as subject to the "Classpath" exception as provided
39.23 +# by Oracle in the GPL Version 2 section of the License file that
39.24 +# accompanied this code. If applicable, add the following below the
39.25 +# License Header, with the fields enclosed by brackets [] replaced by
39.26 +# your own identifying information:
39.27 +# "Portions Copyrighted [year] [name of copyright owner]"
39.28 +#
39.29 +# Contributor(s):
39.30 +#
39.31 +# The Original Software is NetBeans. The Initial Developer of the Original
39.32 +# Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
39.33 +# Microsystems, Inc. All Rights Reserved.
39.34 +#
39.35 +# If you wish your version of this file to be governed by only the CDDL
39.36 +# or only the GPL Version 2, indicate your decision by adding
39.37 +# "[Contributor] elects to include this software in this distribution
39.38 +# under the [CDDL or GPL Version 2] license." If you do not indicate a
39.39 +# single choice of license, a recipient has the option to distribute
39.40 +# your version of this file under either the CDDL, the GPL Version 2 or
39.41 +# to extend the choice of license to its licensees as provided above.
39.42 +# However, if you add GPL Version 2 code and therefore, elected the GPL
39.43 +# Version 2 license, then the option applies only if the new code is
39.44 +# made subject to such option by the copyright holder.
39.45 +
39.46 +#Customizer
39.47 +TXT_Tab_Classes=\u7c7b
39.48 +TXT_Tab_Sources=\u6e90
39.49 +TXT_Tab_Javadoc=Javadoc
39.50 +
39.51 +TXT_JVM=Java \u5e73\u53f0(&J):
39.52 +TXT_ManagePlatforms=\u7ba1\u7406\u5e73\u53f0(&M)...
39.53 +TXT_NoteChangesTakeAffect=\u6ce8: \u66f4\u6539\u5c06\u5728\u4e0b\u6b21\u542f\u52a8\u670d\u52a1\u5668\u65f6\u751f\u6548
39.54 +TXT_Platform=\u5e73\u53f0
39.55 +TXT_VMOptions=VM \u9009\u9879(&V):
39.56 +TXT_VMOptionsEG=(\u4f8b\u5982 -Xms64m)
39.57 +
39.58 +
39.59 +ASCD_JavaPlatform=Java \u5e73\u53f0
39.60 +
39.61 +ASCN_JVM=Java \u5e73\u53f0
39.62 +
39.63 +ASCD_JVM=\u5c06\u8fd0\u884c\u670d\u52a1\u5668\u7684 Java \u865a\u62df\u673a
39.64 +
39.65 +ASCN_ManagerPlatform=\u7ba1\u7406\u5668 Java \u5e73\u53f0
39.66 +
39.67 +ASCD_ManagerPlatform=\u7ba1\u7406\u5668 Java \u5e73\u53f0
39.68 +
39.69 +ASCN_VMOpts=VM \u9009\u9879
39.70 +
39.71 +ASCD_VMOpts=Java \u865a\u62df\u673a\u9009\u9879
39.72 +
39.73 +ASCN_VMOptEG=(\u4f8b\u5982 -Xms64m)
39.74 +
39.75 +ASCD_VmOptsEG=VM \u9009\u9879\u793a\u4f8b
39.76 +
39.77 +
39.78 +ASCN_Note=\u6ce8: \u66f4\u6539\u5c06\u5728\u4e0b\u6b21\u542f\u52a8\u670d\u52a1\u5668\u65f6\u751f\u6548
39.79 +
39.80 +ASCD_Note=\u6ce8: \u66f4\u6539\u5c06\u5728\u4e0b\u6b21\u542f\u52a8\u670d\u52a1\u5668\u65f6\u751f\u6548
39.81 +
39.82 +
39.83 +
39.84 +
39.85 +LBL_ManagePlatforms=\u7ba1\u7406\u5668\u5e73\u53f0(&P)
39.86 +
39.87 +LBL_Proxy=\u4f7f\u7528 IDE \u4ee3\u7406\u8bbe\u7f6e
39.88 +
39.89 +ASCD_Proxy=\u4f7f\u7528 IDE \u4ee3\u7406\u8bbe\u7f6e
39.90 +
39.91 +ASCN_Proxy=\u4f7f\u7528 IDE \u4ee3\u7406\u8bbe\u7f6e
39.92 +
39.93 +ACS_Customizer=\u5b9a\u5236\u5668
39.94 +
39.95 +#CustomizerSupport
39.96 +TXT_Classes=\u7c7b
39.97 +TXT_Javadoc=Javadoc
39.98 +TXT_OpenJavadoc=\u6dfb\u52a0 ZIP/\u6587\u4ef6\u5939
39.99 +TXT_OpenSources=\u6dfb\u52a0 JAR/\u6587\u4ef6\u5939
39.100 +TXT_Sources=\u6e90
39.101 +
39.102 +
39.103 +AD_Classes=\u7c7b
39.104 +
39.105 +AD_Javadoc=Javadoc
39.106 +
39.107 +AD_Sources=\u6e90
39.108 +
39.109 +CTL_Add=\u6dfb\u52a0 JAR/\u6587\u4ef6\u5939...
39.110 +CTL_AddJavadocURLMessage=URL:
39.111 +CTL_AddJavadocURLTitle=\u6dfb\u52a0 URL
39.112 +CTL_AddURL=\u6dfb\u52a0 URL...
39.113 +CTL_AddZip=\u6dfb\u52a0 ZIP/\u6587\u4ef6\u5939...
39.114 +CTL_Cancel=\u53d6\u6d88
39.115 +CTL_Down=\u4e0b\u79fb
39.116 +CTL_InvalidURLFormat=URL \u683c\u5f0f\u65e0\u6548\u3002
39.117 +CTL_Remove=\u5220\u9664
39.118 +CTL_Up=\u4e0a\u79fb
39.119 +
39.120 +
39.121 +
39.122 +
39.123 +
39.124 +
39.125 +
39.126 +
39.127 +
39.128 +
39.129 +
39.130 +
39.131 +
39.132 +StepName_EnterDomainDirectory=\u9009\u62e9\u914d\u7f6e
39.133 +LBL_Chooser_Name=\u9009\u62e9\u914d\u7f6e\u6587\u4ef6
39.134 +LBL_Choose_Button=\u9009\u62e9
39.135 +
39.136 +LBL_Choose_Domain=\u9009\u62e9\u914d\u7f6e\u6587\u4ef6
39.137 +LBL_Choose_Install=\u9009\u62e9\u5e94\u7528\u670d\u52a1\u5668\u7684\u914d\u7f6e\u6587\u4ef6
39.138 +LBL_domainNameLabel=\u914d\u7f6e\u6587\u4ef6:
39.139 +LBL_ParentFolder=\u914d\u7f6e\u6587\u4ef6:
39.140 +LBL_openInstanceDirectorySelector=\u6d4f\u89c8(&O)...
39.141 +DSC_openInstanceDirectorySelector=\u6253\u5f00\u6587\u4ef6\u9009\u62e9\u5668\u4ee5\u5141\u8bb8\u9009\u62e9\u914d\u7f6e\u6587\u4ef6
39.142 +DSC_instanceDirectory=\u8f93\u5165\u8981\u6ce8\u518c\u7684\u57df\u7684\u8def\u5f84
39.143 +
39.144 +TXT_instanceDirectoryDescription2=\u6307\u5b9a WildFly \u5e94\u7528\u670d\u52a1\u5668\u7684\u914d\u7f6e\u6587\u4ef6\u3002
39.145 +
40.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
40.2 +++ b/src/zh_CN/enterprise/javaee-wildfly/javaee-wildfly/org/netbeans/modules/javaee/wildfly/ide/Bundle_zh_CN.properties Wed Jul 30 05:12:06 2014 -0700
40.3 @@ -0,0 +1,104 @@
40.4 +#
40.5 +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
40.6 +#
40.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
40.8 +#
40.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
40.10 +# Other names may be trademarks of their respective owners.
40.11 +#
40.12 +# The contents of this file are subject to the terms of either the GNU
40.13 +# General Public License Version 2 only ("GPL") or the Common
40.14 +# Development and Distribution License("CDDL") (collectively, the
40.15 +# "License"). You may not use this file except in compliance with the
40.16 +# License. You can obtain a copy of the License at
40.17 +# http://www.netbeans.org/cddl-gplv2.html
40.18 +# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
40.19 +# specific language governing permissions and limitations under the
40.20 +# License. When distributing the software, include this License Header
40.21 +# Notice in each file and include the License file at
40.22 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
40.23 +# particular file as subject to the "Classpath" exception as provided
40.24 +# by Oracle in the GPL Version 2 section of the License file that
40.25 +# accompanied this code. If applicable, add the following below the
40.26 +# License Header, with the fields enclosed by brackets [] replaced by
40.27 +# your own identifying information:
40.28 +# "Portions Copyrighted [year] [name of copyright owner]"
40.29 +#
40.30 +# Contributor(s):
40.31 +#
40.32 +# The Original Software is NetBeans. The Initial Developer of the Original
40.33 +# Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
40.34 +# Microsystems, Inc. All Rights Reserved.
40.35 +#
40.36 +# If you wish your version of this file to be governed by only the CDDL
40.37 +# or only the GPL Version 2, indicate your decision by adding
40.38 +# "[Contributor] elects to include this software in this distribution
40.39 +# under the [CDDL or GPL Version 2] license." If you do not indicate a
40.40 +# single choice of license, a recipient has the option to distribute
40.41 +# your version of this file under either the CDDL, the GPL Version 2 or
40.42 +# to extend the choice of license to its licensees as provided above.
40.43 +# However, if you add GPL Version 2 code and therefore, elected the GPL
40.44 +# Version 2 license, then the option applies only if the new code is
40.45 +# made subject to such option by the copyright holder.
40.46 +#
40.47 +
40.48 +TITLE_JBOSS_LIBRARY=WildFly JEE \u5e93
40.49 +
40.50 +TITLE_JBOSS_FACTORY=WildFly JEE \u5de5\u5382
40.51 +
40.52 +ACS_Customizer=WildFly \u5c5e\u6027
40.53 +
40.54 +MSG_START_SERVER_IN_PROGRESS=\u542f\u52a8{0}
40.55 +
40.56 +MSG_SERVER_STARTED=\u5df2\u542f\u52a8{0}
40.57 +
40.58 +MSG_START_SERVER_FAILED=\u672a\u80fd\u542f\u52a8{0}
40.59 +
40.60 +MSG_StartServerTimeout=IDE \u65e0\u6cd5\u786e\u5b9a\u670d\u52a1\u5668\u662f\u5426\u5df2\u542f\u52a8, \u8bf7\u4f7f\u7528\u201c\u5237\u65b0\u201d\u6309\u94ae\u6216\u4e0a\u4e0b\u6587\u83dc\u5355\u9879\u6765\u66f4\u65b0\u5176\u72b6\u6001\u3002
40.61 +
40.62 +MSG_StartServerInterrupted={0}\u542f\u52a8\u4e2d\u65ad\u3002
40.63 +
40.64 +MSG_STOP_SERVER_IN_PROGRESS=\u505c\u6b62{0}
40.65 +
40.66 +MSG_StopServerTimeout=IDE \u65e0\u6cd5\u786e\u5b9a\u670d\u52a1\u5668\u662f\u5426\u5df2\u505c\u6b62, \u8bf7\u4f7f\u7528\u201c\u5237\u65b0\u201d\u6309\u94ae\u6216\u4e0a\u4e0b\u6587\u83dc\u5355\u9879\u6765\u66f4\u65b0\u5176\u72b6\u6001\u3002
40.67 +
40.68 +MSG_StopServerInterrupted={0}\u505c\u6b62\u4e2d\u65ad\u3002
40.69 +
40.70 +MSG_SERVER_STOPPED=\u5df2\u505c\u6b62{0}
40.71 +
40.72 +MSG_STOP_SERVER_FAILED=\u672a\u80fd\u505c\u6b62{0}
40.73 +
40.74 +MSG_START_SERVER_FAILED_HTTP_PORT_IN_USE=\u672a\u80fd\u542f\u52a8{0}\u3002HTTP \u8fde\u63a5\u5668\u7aef\u53e3 {1} \u5df2\u5728\u4f7f\u7528\u3002
40.75 +MSG_START_SERVER_FAILED_JNP_PORT_IN_USE=\u672a\u80fd\u542f\u52a8{0}\u3002JNP \u670d\u52a1\u7aef\u53e3 {1} \u5df2\u5728\u4f7f\u7528\u3002
40.76 +MSG_START_SERVER_FAILED_RMI_PORT_IN_USE=\u672a\u80fd\u542f\u52a8{0}\u3002RMI \u547d\u540d\u670d\u52a1\u7aef\u53e3 {1} \u5df2\u5728\u4f7f\u7528\u3002
40.77 +MSG_START_SERVER_FAILED_INVOKER_PORT_IN_USE=\u672a\u80fd\u542f\u52a8{0}\u3002RMI/JRMP \u8c03\u7528\u5668\u7aef\u53e3 {1} \u5df2\u5728\u4f7f\u7528\u3002
40.78 +
40.79 +MSG_START_SERVER_FAILED_FNF=\u672a\u80fd\u542f\u52a8{0}\u3002\u627e\u4e0d\u5230\u8fd0\u884c\u811a\u672c\u3002
40.80 +
40.81 +MSG_START_SERVER_FAILED_PD=\u672a\u80fd\u542f\u52a8{0}\u3002\u8bf7\u68c0\u67e5{1}\u811a\u672c\u662f\u5426\u53ef\u4ee5\u6267\u884c\u3002
40.82 +
40.83 +MSG_STOP_SERVER_FAILED_FNF=\u672a\u80fd\u505c\u6b62{0}\u3002\u672a\u627e\u5230\u505c\u6b62\u811a\u672c\u6216\u6743\u9650\u906d\u5230\u62d2\u7edd
40.84 +
40.85 +MSG_STOP_SERVER_FAILED_PD=\u672a\u80fd\u505c\u6b62{0}\u3002\u8bf7\u68c0\u67e5{1}\u811a\u672c\u662f\u5426\u53ef\u4ee5\u6267\u884c\u3002
40.86 +
40.87 +MSG_STOP_SERVER_FAILED_MINIMAL=\u6700\u4f4e\u914d\u7f6e\u4e0d\u652f\u6301\u505c\u6b62\u64cd\u4f5c\u3002\n\u8bf7\u5c1d\u8bd5\u5728\u5916\u90e8\u505c\u6b62\u670d\u52a1\u5668 (\u7ec8\u6b62\u670d\u52a1\u5668\u8fdb\u7a0b)\u3002
40.88 +
40.89 +MSG_START_PROFILED_SERVER_IN_PROGRESS=\u6b63\u5728\u542f\u52a8{0}\u4ee5\u8fdb\u884c\u6027\u80fd\u5206\u6790
40.90 +MSG_PROFILED_SERVER_STARTED={0}\u5df2\u51c6\u5907\u8fdb\u884c\u6027\u80fd\u5206\u6790
40.91 +MSG_START_PROFILED_SERVER_FAILED=\u672a\u80fd\u542f\u52a8{0}\u4ee5\u8fdb\u884c\u6027\u80fd\u5206\u6790
40.92 +
40.93 +ERR_NonProxyHostParsingError=\u5728\u89e3\u6790 http.nonProxyHosts \u7cfb\u7edf\u5c5e\u6027\u65f6\u51fa\u73b0\u9519\u8bef\u3002\u8be5\u7cfb\u7edf\u5c5e\u6027\u5c06\u4e0d\u5305\u542b\u5728 JAVA_OPTS \u73af\u5883\u53d8\u91cf\u4e2d\u3002
40.94 +
40.95 +MSG_CheckingMissingDrivers=\u6b63\u5728\u68c0\u67e5\u6570\u636e\u6e90\u5b9a\u4e49\u662f\u5426\u7f3a\u5c11 JDBC \u9a71\u52a8\u7a0b\u5e8f...
40.96 +MSG_DeployingJDBCDrivers=\u5c06 JDBC \u9a71\u52a8\u7a0b\u5e8f\u90e8\u7f72\u5230{0}
40.97 +MSG_DeployingJDBCDriversFailed=\u8b66\u544a: \u65e0\u6cd5\u5c06 JDBC \u9a71\u52a8\u7a0b\u5e8f\u90e8\u7f72\u5230{0}\u3002\n\u8bf7\u68c0\u67e5\u60a8\u662f\u5426\u5177\u6709 {1} \u6587\u4ef6\u5939\u7684\u5199\u5165\u6743\u9650\u3002
40.98 +MSG_DeployingJDBCDriversInterrupted=\u8b66\u544a: JDBD \u9a71\u52a8\u7a0b\u5e8f\u90e8\u7f72\u5df2\u4e2d\u65ad\u3002
40.99 +
40.100 +ERR_ReadError=\u8fd0\u884c\u811a\u672c\u8bfb\u53d6\u9519\u8bef\u3002
40.101 +ERR_WriteError=\u4e34\u65f6\u8fd0\u884c\u811a\u672c\u521b\u5efa\u9519\u8bef\u3002
40.102 +MSG_SERVER_KILLED=\u5df2\u7ec8\u6b62\u670d\u52a1\u5668\u3002
40.103 +MSG_Deployment_Completed=\u5df2\u5b8c\u6210\u90e8\u7f72\u3002
40.104 +MSG_TIMEOUT=\u5df2\u8d85\u8fc7\u90e8\u7f72\u8d85\u65f6\u7684\u9650\u5236
40.105 +MSG_FAILED=\u90e8\u7f72\u5931\u8d25
40.106 +MSG_DEPLOYING=\u90e8\u7f72{0}
40.107 +
41.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
41.2 +++ b/src/zh_CN/enterprise/javaee-wildfly/javaee-wildfly/org/netbeans/modules/javaee/wildfly/ide/ui/Bundle_zh_CN.properties Wed Jul 30 05:12:06 2014 -0700
41.3 @@ -0,0 +1,110 @@
41.4 +#
41.5 +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
41.6 +#
41.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
41.8 +#
41.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
41.10 +# Other names may be trademarks of their respective owners.
41.11 +#
41.12 +# The contents of this file are subject to the terms of either the GNU
41.13 +# General Public License Version 2 only ("GPL") or the Common
41.14 +# Development and Distribution License("CDDL") (collectively, the
41.15 +# "License"). You may not use this file except in compliance with the
41.16 +# License. You can obtain a copy of the License at
41.17 +# http://www.netbeans.org/cddl-gplv2.html
41.18 +# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
41.19 +# specific language governing permissions and limitations under the
41.20 +# License. When distributing the software, include this License Header
41.21 +# Notice in each file and include the License file at
41.22 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
41.23 +# particular file as subject to the "Classpath" exception as provided
41.24 +# by Oracle in the GPL Version 2 section of the License file that
41.25 +# accompanied this code. If applicable, add the following below the
41.26 +# License Header, with the fields enclosed by brackets [] replaced by
41.27 +# your own identifying information:
41.28 +# "Portions Copyrighted [year] [name of copyright owner]"
41.29 +#
41.30 +# Contributor(s):
41.31 +#
41.32 +# The Original Software is NetBeans. The Initial Developer of the Original
41.33 +# Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
41.34 +# Microsystems, Inc. All Rights Reserved.
41.35 +#
41.36 +# If you wish your version of this file to be governed by only the CDDL
41.37 +# or only the GPL Version 2, indicate your decision by adding
41.38 +# "[Contributor] elects to include this software in this distribution
41.39 +# under the [CDDL or GPL Version 2] license." If you do not indicate a
41.40 +# single choice of license, a recipient has the option to distribute
41.41 +# your version of this file under either the CDDL, the GPL Version 2 or
41.42 +# to extend the choice of license to its licensees as provided above.
41.43 +# However, if you add GPL Version 2 code and therefore, elected the GPL
41.44 +# Version 2 license, then the option applies only if the new code is
41.45 +# made subject to such option by the copyright holder.
41.46 +#
41.47 +
41.48 +
41.49 +#title for wizard server location panel
41.50 +TITLE_ServerLocation=\u670d\u52a1\u5668\u4f4d\u7f6e
41.51 +
41.52 +STEP_ServerLocation=\u670d\u52a1\u5668\u4f4d\u7f6e
41.53 +
41.54 +STEP_Properties=\u5b9e\u4f8b\u5c5e\u6027
41.55 +
41.56 +LBL_InstallLocationInfo=\u8f93\u5165 WildFly \u672c\u5730\u5b9e\u4f8b\u7684\u5b89\u88c5\u76ee\u5f55\u3002
41.57 +
41.58 +LBL_InstallLocation=\u670d\u52a1\u5668\u4f4d\u7f6e(&S):
41.59 +
41.60 +LBL_ConfigurationLocation=\u670d\u52a1\u5668\u914d\u7f6e(&S):
41.61 +
41.62 +LBL_BrowseButton=\u6d4f\u89c8(&O)...
41.63 +
41.64 +MSG_InvalidServerLocation=\u63d0\u4f9b\u6709\u6548\u7684 WildFly \u4f4d\u7f6e
41.65 +
41.66 +MSG_SpecifyServerLocation=\u8bf7\u6307\u5b9a WildFly \u4f4d\u7f6e
41.67 +
41.68 +LBL_ChooserName=\u9009\u62e9 WildFly \u670d\u52a1\u5668\u4f4d\u7f6e
41.69 +
41.70 +LBL_ConfigChooserName=\u9009\u62e9 WildFly \u670d\u52a1\u5668\u914d\u7f6e
41.71 +
41.72 +LBL_ChooseButton=\u9009\u62e9
41.73 +
41.74 +TITLE_ServerProperties=\u5b9e\u4f8b\u5c5e\u6027
41.75 +
41.76 +LBL_Domain=\u57df(&D):
41.77 +
41.78 +LBL_DomainPath=\u57df\u8def\u5f84:
41.79 +
41.80 +LBL_Host=\u4e3b\u673a(&H):
41.81 +
41.82 +LBL_Port=\u7aef\u53e3(&P):
41.83 +
41.84 +LBL_User=\u7528\u6237
41.85 +
41.86 +LBL_Password=\u53e3\u4ee4
41.87 +
41.88 +LBL_Instance=\u5b9e\u4f8b
41.89 +
41.90 +MSG_EnterHost=\u8f93\u5165\u4e3b\u673a
41.91 +
41.92 +MSG_EnterPort=\u8f93\u5165\u7aef\u53e3
41.93 +
41.94 +MSG_EnterUser=\u8f93\u5165\u767b\u5f55\u540d
41.95 +
41.96 +MSG_EnterPassword=\u8f93\u5165\u53e3\u4ee4
41.97 +
41.98 +MSG_WrongDomainPath=\u57df\u8def\u5f84\u65e0\u6548\u6216\u8005\u57df\u4e0d\u7b26\u5408\u6700\u4f4e\u7684\u8981\u6c42\u3002
41.99 +
41.100 +MSG_SpecifyDomainPath=\u8bf7\u6307\u5b9a\u57df\u8def\u5f84\u3002
41.101 +
41.102 +MSG_NoServerInstance=\u6240\u9009\u7684\u57df\u6ca1\u6709\u5b9e\u4f8b, \u4f46 AdminServe \u9664\u5916\u3002\u8bf7\u9009\u62e9\u53e6\u4e00\u4e2a\u57df\u3002
41.103 +
41.104 +MSG_INSTANCE_REGISTRATION_FAILED=\u6ce8\u518c\u5931\u8d25
41.105 +
41.106 +TXT_PROPERTY_TEXT=\u9009\u62e9\u670d\u52a1\u5668\u914d\u7f6e
41.107 +
41.108 +MSG_InvalidPort=\u8bf7\u8f93\u5165\u4e00\u4e2a\u6709\u6548\u7684\u7aef\u53e3\u53f7
41.109 +
41.110 +MSG_InstanceExists=\u8981\u6dfb\u52a0\u7684\u57df\u5b9e\u4f8b\u5df2\u5b58\u5728\u3002
41.111 +
41.112 +MSG_WARN_INSTALLATION_DIFFERS_CONFIGURATION=\u914d\u7f6e\u6587\u4ef6\u4e0d\u5728\u5b89\u88c5\u76ee\u5f55\u4e2d\u3002
41.113 +
42.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
42.2 +++ b/src/zh_CN/enterprise/javaee-wildfly/javaee-wildfly/org/netbeans/modules/javaee/wildfly/nodes/Bundle_zh_CN.properties Wed Jul 30 05:12:06 2014 -0700
42.3 @@ -0,0 +1,98 @@
42.4 +#
42.5 +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
42.6 +#
42.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
42.8 +#
42.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
42.10 +# Other names may be trademarks of their respective owners.
42.11 +#
42.12 +# The contents of this file are subject to the terms of either the GNU
42.13 +# General Public License Version 2 only ("GPL") or the Common
42.14 +# Development and Distribution License("CDDL") (collectively, the
42.15 +# "License"). You may not use this file except in compliance with the
42.16 +# License. You can obtain a copy of the License at
42.17 +# http://www.netbeans.org/cddl-gplv2.html
42.18 +# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
42.19 +# specific language governing permissions and limitations under the
42.20 +# License. When distributing the software, include this License Header
42.21 +# Notice in each file and include the License file at
42.22 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
42.23 +# particular file as subject to the "Classpath" exception as provided
42.24 +# by Oracle in the GPL Version 2 section of the License file that
42.25 +# accompanied this code. If applicable, add the following below the
42.26 +# License Header, with the fields enclosed by brackets [] replaced by
42.27 +# your own identifying information:
42.28 +# "Portions Copyrighted [year] [name of copyright owner]"
42.29 +#
42.30 +# Contributor(s):
42.31 +#
42.32 +# The Original Software is NetBeans. The Initial Developer of the Original
42.33 +# Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
42.34 +# Microsystems, Inc. All Rights Reserved.
42.35 +#
42.36 +# If you wish your version of this file to be governed by only the CDDL
42.37 +# or only the GPL Version 2, indicate your decision by adding
42.38 +# "[Contributor] elects to include this software in this distribution
42.39 +# under the [CDDL or GPL Version 2] license." If you do not indicate a
42.40 +# single choice of license, a recipient has the option to distribute
42.41 +# your version of this file under either the CDDL, the GPL Version 2 or
42.42 +# to extend the choice of license to its licensees as provided above.
42.43 +# However, if you add GPL Version 2 code and therefore, elected the GPL
42.44 +# Version 2 license, then the option applies only if the new code is
42.45 +# made subject to such option by the copyright holder.
42.46 +#
42.47 +
42.48 +
42.49 +LBL_DISPLAY_NAME=\u663e\u793a\u540d\u79f0
42.50 +HINT_DISPLAY_NAME=\u5728 IDE \u4e2d\u8868\u793a\u6b64\u670d\u52a1\u5668\u7684\u663e\u793a\u540d\u79f0
42.51 +
42.52 +LBL_SERVER_NAME=\u670d\u52a1\u5668\u540d\u79f0
42.53 +HINT_SERVER_NAME=Wildlfy \u7684\u670d\u52a1\u5668\u540d
42.54 +LBL_SERVER_PATH=\u670d\u52a1\u5668\u8def\u5f84
42.55 +HINT_SERVER_PATH=Wildlfy \u7684\u670d\u52a1\u5668\u8def\u5f84
42.56 +LBL_HOST=\u4e3b\u673a
42.57 +HINT_HOST=Wildlfy \u7684\u4e3b\u673a
42.58 +LBL_PORT=\u7aef\u53e3
42.59 +HINT_PORT=Wildlfy \u7684\u7aef\u53e3
42.60 +LBL_Apps=\u5e94\u7528\u7a0b\u5e8f
42.61 +LBL_WaitNode_DisplayName=\u8bf7\u7a0d\u5019...
42.62 +LBL_InfoNode_DisplayName=<\u65e0\u7ba1\u7406\u652f\u6301>
42.63 +LBL_InfoNode_ToolTip=\u5728\u670d\u52a1\u5668\u7684\u5b89\u88c5\u8fc7\u7a0b\u4e2d\u672a\u5b89\u88c5\u7ba1\u7406\u652f\u6301
42.64 +
42.65 +LBL_EarApps=\u4f01\u4e1a\u5e94\u7528\u7a0b\u5e8f
42.66 +LBL_WebApps=Web \u5e94\u7528\u7a0b\u5e8f
42.67 +LBL_EjbModules=EJB \u6a21\u5757
42.68 +LBL_RefreshModulesAction=\u5237\u65b0
42.69 +
42.70 +LBL_Resources=\u8d44\u6e90
42.71 +LBL_Resources_Datasources=\u6570\u636e\u6e90
42.72 +LBL_Resources_ResourceAdapters=\u8d44\u6e90\u9002\u914d\u5668
42.73 +LBL_Resources_Destinations=JMS \u76ee\u6807
42.74 +LBL_Resources_MailSessions=\u90ae\u4ef6\u4f1a\u8bdd
42.75 +LBL_Resources_ConnectionFactories=\u8fde\u63a5\u5de5\u5382
42.76 +LBL_Resources_JMS=JMS \u8d44\u6e90
42.77 +
42.78 +
42.79 +
42.80 +LBL_Resources_MailSessions_Session_JndiName=JNDI \u540d\u79f0
42.81 +DESC_Resources_MailSessions_Session_JndiName=\u90ae\u4ef6\u4f1a\u8bdd\u7684 JNDI \u540d\u79f0
42.82 +LBL_Resources_MailSessions_Session_Server=\u670d\u52a1\u5668\u540d\u79f0
42.83 +DESC_Resources_MailSessions_Session_Server=\u90ae\u4ef6\u4f1a\u8bdd\u7684\u670d\u52a1\u5668\u540d\u79f0
42.84 +LBL_Resources_MailSessions_Session_Debug=\u8c03\u8bd5
42.85 +DESC_Resources_MailSessions_Session_Debug=\u662f\u5426\u6fc0\u6d3b\u90ae\u4ef6\u4f1a\u8bdd\u8c03\u8bd5\u6a21\u5f0f
42.86 +LBL_Resources_MailSessions_Session_Port=\u7aef\u53e3
42.87 +DESC_Resources_MailSessions_Session_Port=\u90ae\u4ef6\u4f1a\u8bdd\u7684\u7aef\u53e3
42.88 +
42.89 +
42.90 +
42.91 +LBL_Resources_Datasources_Datasource_Driver=\u9a71\u52a8\u7a0b\u5e8f
42.92 +DESC_Resources_Datasources_Datasource_Driver=JDBC \u9a71\u52a8\u7a0b\u5e8f\u7c7b
42.93 +LBL_Resources_Datasources_Datasource_JndiName=JNDI \u540d\u79f0
42.94 +DESC_Resources_Datasources_Datasource_JndiName=\u6570\u636e\u6e90\u7684 JNDI \u540d\u79f0
42.95 +LBL_Resources_Datasources_Datasource_Url=JDBC URL
42.96 +DESC_Resources_Datasources_Datasource_Url=\u6570\u636e\u5e93\u7684 JDBC \u8fde\u63a5 URL
42.97 +LBL_Resources_Datasources_Datasource_Username=\u7528\u6237\u540d
42.98 +DESC_Resources_Datasources_Datasource_Username=JDBC \u8fde\u63a5\u7684\u7528\u6237\u540d
42.99 +LBL_Resources_Datasources_Datasource_Password=\u53e3\u4ee4
42.100 +DESC_Resources_Datasources_Datasource_Password=JDBC \u8fde\u63a5\u7684\u53e3\u4ee4
42.101 +
43.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
43.2 +++ b/src/zh_CN/enterprise/javaee-wildfly/javaee-wildfly/org/netbeans/modules/javaee/wildfly/nodes/actions/Bundle_zh_CN.properties Wed Jul 30 05:12:06 2014 -0700
43.3 @@ -0,0 +1,57 @@
43.4 +#
43.5 +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
43.6 +#
43.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
43.8 +#
43.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
43.10 +# Other names may be trademarks of their respective owners.
43.11 +#
43.12 +# The contents of this file are subject to the terms of either the GNU
43.13 +# General Public License Version 2 only ("GPL") or the Common
43.14 +# Development and Distribution License("CDDL") (collectively, the
43.15 +# "License"). You may not use this file except in compliance with the
43.16 +# License. You can obtain a copy of the License at
43.17 +# http://www.netbeans.org/cddl-gplv2.html
43.18 +# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
43.19 +# specific language governing permissions and limitations under the
43.20 +# License. When distributing the software, include this License Header
43.21 +# Notice in each file and include the License file at
43.22 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
43.23 +# particular file as subject to the "Classpath" exception as provided
43.24 +# by Oracle in the GPL Version 2 section of the License file that
43.25 +# accompanied this code. If applicable, add the following below the
43.26 +# License Header, with the fields enclosed by brackets [] replaced by
43.27 +# your own identifying information:
43.28 +# "Portions Copyrighted [year] [name of copyright owner]"
43.29 +#
43.30 +# Contributor(s):
43.31 +#
43.32 +# The Original Software is NetBeans. The Initial Developer of the Original
43.33 +# Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
43.34 +# Microsystems, Inc. All Rights Reserved.
43.35 +#
43.36 +# If you wish your version of this file to be governed by only the CDDL
43.37 +# or only the GPL Version 2, indicate your decision by adding
43.38 +# "[Contributor] elects to include this software in this distribution
43.39 +# under the [CDDL or GPL Version 2] license." If you do not indicate a
43.40 +# single choice of license, a recipient has the option to distribute
43.41 +# your version of this file under either the CDDL, the GPL Version 2 or
43.42 +# to extend the choice of license to its licensees as provided above.
43.43 +# However, if you add GPL Version 2 code and therefore, elected the GPL
43.44 +# Version 2 license, then the option applies only if the new code is
43.45 +# made subject to such option by the copyright holder.
43.46 +#
43.47 +
43.48 +LBL_ShowAdminGUIAction=\u67e5\u770b\u7ba1\u7406\u63a7\u5236\u53f0(&A)
43.49 +LBL_ShowJMXConsoleAction=\u67e5\u770b JMX \u63a7\u5236\u53f0(&J)
43.50 +LBL_OpenServerLogAction=\u67e5\u770b\u670d\u52a1\u5668\u65e5\u5fd7(&L)
43.51 +LBL_UndeployAction=\u53d6\u6d88\u90e8\u7f72(&U)
43.52 +LBL_UndeployProgress=\u6b63\u5728\u53d6\u6d88\u90e8\u7f72{0}
43.53 +LBL_OpenInBrowserAction=\u5728\u6d4f\u89c8\u5668\u4e2d\u6253\u5f00(&O)
43.54 +LBL_StartAction=\u542f\u52a8\u5e94\u7528\u7a0b\u5e8f(&S)
43.55 +LBL_StartProgress=\u6b63\u5728\u542f\u52a8{0}
43.56 +LBL_StopAction=\u505c\u6b62\u5e94\u7528\u7a0b\u5e8f(&S)
43.57 +LBL_StopProgress=\u6b63\u5728\u505c\u6b62{0}
43.58 +LBL_EditConfigAction=\u7f16\u8f91\u914d\u7f6e
43.59 +LBL_KillServerGUIAction=\u7ec8\u6b62\u670d\u52a1\u5668
43.60 +
44.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
44.2 +++ b/src/zh_CN/enterprise/javaee-wildfly/javaee-wildfly/org/netbeans/modules/javaee/wildfly/resources/Bundle_zh_CN.properties Wed Jul 30 05:12:06 2014 -0700
44.3 @@ -0,0 +1,48 @@
44.4 +#
44.5 +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
44.6 +#
44.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
44.8 +#
44.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
44.10 +# Other names may be trademarks of their respective owners.
44.11 +#
44.12 +# The contents of this file are subject to the terms of either the GNU
44.13 +# General Public License Version 2 only ("GPL") or the Common
44.14 +# Development and Distribution License("CDDL") (collectively, the
44.15 +# "License"). You may not use this file except in compliance with the
44.16 +# License. You can obtain a copy of the License at
44.17 +# http://www.netbeans.org/cddl-gplv2.html
44.18 +# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
44.19 +# specific language governing permissions and limitations under the
44.20 +# License. When distributing the software, include this License Header
44.21 +# Notice in each file and include the License file at
44.22 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
44.23 +# particular file as subject to the "Classpath" exception as provided
44.24 +# by Oracle in the GPL Version 2 section of the License file that
44.25 +# accompanied this code. If applicable, add the following below the
44.26 +# License Header, with the fields enclosed by brackets [] replaced by
44.27 +# your own identifying information:
44.28 +# "Portions Copyrighted [year] [name of copyright owner]"
44.29 +#
44.30 +# Contributor(s):
44.31 +#
44.32 +# The Original Software is NetBeans. The Initial Developer of the Original
44.33 +# Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
44.34 +# Microsystems, Inc. All Rights Reserved.
44.35 +#
44.36 +# If you wish your version of this file to be governed by only the CDDL
44.37 +# or only the GPL Version 2, indicate your decision by adding
44.38 +# "[Contributor] elects to include this software in this distribution
44.39 +# under the [CDDL or GPL Version 2] license." If you do not indicate a
44.40 +# single choice of license, a recipient has the option to distribute
44.41 +# your version of this file under either the CDDL, the GPL Version 2 or
44.42 +# to extend the choice of license to its licensees as provided above.
44.43 +# However, if you add GPL Version 2 code and therefore, elected the GPL
44.44 +# Version 2 license, then the option applies only if the new code is
44.45 +# made subject to such option by the copyright holder.
44.46 +#
44.47 +OpenIDE-Module-Name=WildFly \u5e94\u7528\u670d\u52a1\u5668
44.48 +OpenIDE-Module-Display-Category=Java Web \u548c Java EE
44.49 +OpenIDE-Module-Short-Description=WildFly \u5e94\u7528\u670d\u52a1\u5668\u7684\u63d2\u4ef6
44.50 +OpenIDE-Module-Long-Description=<html>\u6b64\u63d2\u4ef6\u5141\u8bb8 JEE \u90e8\u7f72\u6a21\u5757\u5728 WildFly \u4e0a\u914d\u7f6e\u548c\u90e8\u7f72 JEE \u7ec4\u4ef6\u3002<br/>\u7248\u672c 1.0.17:<ul><li>\u5982\u679c\u914d\u7f6e\u4e0e\u9884\u671f\u914d\u7f6e\u4e0d\u540c, \u5219\u4f1a\u751f\u6210\u8b66\u544a\u3002</li><li>\u4fee\u590d\u9879\u76ee\u540d\u4ee5 war \u7ed3\u5c3e\u7684\u90e8\u7f72\u95ee\u9898\u3002</li></ul>\u7248\u672c 1.0.16:<ul><li>\u4fee\u590d Netbeans Webapp \u9879\u76ee\u7684\u963b\u585e NPE\u3002</li></ul>\u7248\u672c 1.0.15:<ul><li>\u90e8\u7f72\u4e00\u4e2a webapp \u4e0d\u4f1a\u53d6\u6d88\u90e8\u7f72\u5176\u4ed6 webapp </li><li>\u5220\u9664\u4e0d\u652f\u6301\u7684\u57df Domain\u3002</li></ul>\u7248\u672c 1.0.14:<ul><li>\u914d\u7f6e\u6587\u4ef6\u53ef\u4f4d\u4e8e\u4efb\u610f\u4f4d\u7f6e</li><li>\u4fee\u590d Windows \u7684\u4ee3\u7406\u95ee\u9898</li></ul>\u7248\u672c 1.0.13:<ul><li>\u4fee\u590d JPA \u5b9e\u4f53\u751f\u6210\u5668</li><li>\u4fee\u590d\u201c\u5728\u4fdd\u5b58\u65f6\u90e8\u7f72\u201d\u4e2d\u7f3a\u5c11\u7684 EAR \u540d\u79f0</li></ul>\u7248\u672c 1.0.12:<ul><li>\u4fee\u590d 32 \u4f4d JVM \u4e2d\u7684\u9519\u8bef</li></ul>\u7248\u672c 1.0.11:<ul><li>\u4fee\u590d Windows \u975e\u4ee3\u7406\u4e3b\u673a\u4e2d\u7684\u9519\u8bef</li><li>\u4ec5\u5728\u6bcf\u6b21\u5347\u7ea7\u65f6\u663e\u793a\u901a\u77e5\u3002</li></ul>\u7248\u672c 1.0.10:<ul><li>\u4fee\u590d\u9519\u8bef</li><li>\u4f7f\u6a21\u5757\u4e0e Netbeans 8.0.RC1 \u517c\u5bb9</li></ul>\u7248\u672c 1.0.9:<ul><li>\u5bf9 nbm \u8fdb\u884c\u7b7e\u540d</li><li>\u63a8\u6d4b JDBC \u9a71\u52a8\u7a0b\u5e8f\u4ee5\u4fbf\u6267\u884c JPA \u751f\u6210</li><li>\u4fee\u590d\u9879\u76ee\u4e2d\u7f3a\u5c11\u7684\u5e93</li></ul>\u7248\u672c 1.0.8:<ul><li>\u4fee\u590d Maven EAR \u9879\u76ee</li><li>\u663e\u793a\u8d44\u6e90\u9002\u914d\u5668</li><li>\u5141\u8bb8\u7f16\u8f91\u914d\u7f6e\u6587\u4ef6</li><li>\u7f29\u77ed\u8fde\u63a5\u5230\u670d\u52a1\u5668\u7684\u8d85\u65f6\u65f6\u95f4</li></ul>\u7248\u672c 1.0.7:<ul><li>JPA 2.1 \u652f\u6301</li><li>\u4f18\u5316\u670d\u52a1\u5668\u521b\u5efa\u671f\u95f4\u7684\u9ed8\u8ba4\u8bbe\u7f6e</li><li>\u4f7f\u7528 Maven \u4fee\u590d\u589e\u91cf\u90e8\u7f72</li></ul>\u7248\u672c 1.0.6:<ul><li>\u63a7\u5236\u53f0\u663e\u793a\u5df2\u5728\u8fd0\u884c\u7684 Wildfly \u5b9e\u4f8b\u7684\u65e5\u5fd7</li><li>\u7b80\u5316\u7528\u4e8e\u6dfb\u52a0 WildFly \u5b9e\u4f8b\u7684\u6d41</li><li>\u663e\u793a\u7684\u66f4\u6539\u65e5\u5fd7</li><li>\u5728\u4fdd\u5b58\u65f6\u90e8\u7f72\u9002\u7528\u4e8e\u7b80\u5355 EJB \u548c WAR</li></ul>\u7248\u672c 1.0.5:<ul><li>\u663e\u793a\u7684\u90ae\u4ef6\u4f1a\u8bdd</li><li>\u663e\u793a\u7684\u8fde\u63a5\u5de5\u5382</li></ul></html>
44.51 +
45.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
45.2 +++ b/src/zh_CN/enterprise/ko4j-debugging/ko4j-debugging/org/netbeans/modules/ko4j/debugging/Bundle_zh_CN.properties Wed Jul 30 05:12:06 2014 -0700
45.3 @@ -0,0 +1,5 @@
45.4 +OpenIDE-Module-Display-Category=HTML5
45.5 +OpenIDE-Module-Long-Description=\u91c7\u7528 Java \u6280\u672f\u7684\u7528\u4e8e HTML \u7684 Web \u68c0\u67e5\u5668\u3002\u6bcf\u5f53\u4ece NetBeans \u542f\u52a8 HTML+Java \u5e94\u7528\u7a0b\u5e8f\u65f6, \u7cfb\u7edf\u90fd\u4f1a\u6253\u5f00\u4e00\u4e2a\u5957\u63a5\u5b57\u8fde\u63a5, \u5e76\u5728 NetBeans IDE \u7684 DOM \u68c0\u67e5\u5668\u548c CSS \u6837\u5f0f\u5bfc\u822a\u5668\u5185\u663e\u793a\u5e94\u7528\u7a0b\u5e8f HTML \u9875\u3002
45.6 +OpenIDE-Module-Name=\u7528\u4e8e Java \u68c0\u67e5\u7684 KO
45.7 +OpenIDE-Module-Short-Description=\u91c7\u7528 Java \u7684\u7528\u4e8e HTML \u7684 Web \u68c0\u67e5\u5668
45.8 +
46.1 --- a/src/zh_CN/enterprise/maven-j2ee/maven-j2ee/org/netbeans/modules/maven/j2ee/execution/Bundle_zh_CN.properties Wed Jul 30 05:03:48 2014 -0700
46.2 +++ b/src/zh_CN/enterprise/maven-j2ee/maven-j2ee/org/netbeans/modules/maven/j2ee/execution/Bundle_zh_CN.properties Wed Jul 30 05:12:06 2014 -0700
46.3 @@ -1,4 +1,3 @@
46.4 -Choose_server=\u9009\u62e9\u670d\u52a1\u5668
46.5 MSG_Server_No_Debugging=<html>\u76ee\u6807\u670d\u52a1\u5668\u4e0d\u652f\u6301\u8c03\u8bd5\u3002<br>\u8bf7\u5728\u9879\u76ee\u5c5e\u6027\u4e2d<b>\u9009\u62e9\u5176\u4ed6\u670d\u52a1\u5668</b>\u3002</html>
46.6 MSG_Server_No_Profiling=<html>\u76ee\u6807\u670d\u52a1\u5668\u4e0d\u652f\u6301\u6027\u80fd\u5206\u6790\u3002<br>\u8bf7\u5728\u9879\u76ee\u5c5e\u6027\u4e2d<b>\u9009\u62e9\u5176\u4ed6\u670d\u52a1\u5668</b>\u3002</html>
46.7 ServerInstanceChooserPanel.jLabelTitle.text=\u9009\u62e9\u53ef\u7528\u670d\u52a1\u5668\u5b9e\u4f8b\u4e4b\u4e00:
47.1 --- a/src/zh_CN/enterprise/spring-webmvc/spring-webmvc/org/netbeans/modules/spring/webmvc/Bundle_zh_CN.properties Wed Jul 30 05:03:48 2014 -0700
47.2 +++ b/src/zh_CN/enterprise/spring-webmvc/spring-webmvc/org/netbeans/modules/spring/webmvc/Bundle_zh_CN.properties Wed Jul 30 05:12:06 2014 -0700
47.3 @@ -59,6 +59,7 @@
47.4 MSG_DispatcherMappingPatternIsEmpty=\u5fc5\u987b\u8f93\u5165\u5206\u6d3e\u7a0b\u5e8f\u6620\u5c04\u3002
47.5 MSG_DispatcherMappingPatternIsNotValid=\u5206\u6d3e\u7a0b\u5e8f\u6620\u5c04\u65e0\u6548\u3002
47.6 MSG_WebXmlIsNotValid=web.xml \u65e0\u6548\u3002
47.7 +MSG_NoValidSpringLibraryFound=\u627e\u4e0d\u5230\u6709\u6548\u7684 Spring Web MVC \u5e93
47.8 LOG_ServletErrorEncodingAttributes=\u5bf9 servlet \u540d\u79f0\u4e2d\u7684\u5b57\u7b26\u8fdb\u884c\u7f16\u7801\u65f6\u51fa\u73b0\u9519\u8bef
47.9 SpringConfigPanelVisual.includeJstlCheckBox.AccessibleContext.accessibleDescription=\u9009\u4e2d\u590d\u9009\u6846\u65f6\u4f1a\u6346\u7ed1 JSTL \u5e93
47.10
48.1 --- a/src/zh_CN/enterprise/web-jsf-navigation/web-jsf-navigation/org/netbeans/modules/web/jsf/navigation/Bundle_zh_CN.properties Wed Jul 30 05:03:48 2014 -0700
48.2 +++ b/src/zh_CN/enterprise/web-jsf-navigation/web-jsf-navigation/org/netbeans/modules/web/jsf/navigation/Bundle_zh_CN.properties Wed Jul 30 05:12:06 2014 -0700
48.3 @@ -47,6 +47,7 @@
48.4 OpenIDE-Module-Long-Description=\u5229\u7528\u9875\u9762\u6d41\u7f16\u8f91\u5668, \u60a8\u53ef\u4ee5\u7f16\u8f91\u9875\u9762\u6d41
48.5
48.6 NavigationView=\u9875\u9762\u5bfc\u822a
48.7 +PageFlowElement.lbl.saving.file=\u6b63\u5728\u4fdd\u5b58\u6587\u4ef6...
48.8 PageFlowView.lbl.graph.initialization=\u521d\u59cb\u5316 PageFlow \u56fe
48.9 ViewNavigation=\u5bfc\u822a
48.10 LBL_PageFlow=\u9875\u9762\u6d41
49.1 --- a/src/zh_CN/enterprise/web-primefaces/web-primefaces/org/netbeans/modules/web/primefaces/ui/Bundle_zh_CN.properties Wed Jul 30 05:03:48 2014 -0700
49.2 +++ b/src/zh_CN/enterprise/web-primefaces/web-primefaces/org/netbeans/modules/web/primefaces/ui/Bundle_zh_CN.properties Wed Jul 30 05:12:06 2014 -0700
49.3 @@ -1,3 +1,4 @@
49.4 +PrimefacesCustomizerPanel.lbl.searching=\u6b63\u5728\u641c\u7d22 Primefaces \u5e93...
49.5 PrimefacesCustomizerPanel.MissingLibraries.label=\u627e\u4e0d\u5230\u6709\u6548\u7684 PrimeFaces \u5e93\u3002
49.6 PrimefacesCustomizerPanel.primefacesLibraryLabel.text=Primefaces \u5e93:
49.7 PrimefacesCustomizerPanel.createLibraryButton.text=\u521b\u5efa\u5e93
50.1 --- a/src/zh_CN/enterprise/websvc-core/websvc-core/org/netbeans/modules/websvc/core/jaxws/actions/Bundle_zh_CN.properties Wed Jul 30 05:03:48 2014 -0700
50.2 +++ b/src/zh_CN/enterprise/websvc-core/websvc-core/org/netbeans/modules/websvc/core/jaxws/actions/Bundle_zh_CN.properties Wed Jul 30 05:12:06 2014 -0700
50.3 @@ -67,5 +67,5 @@
50.4 ACSN_SelectLbl=\u9009\u62e9\u7b56\u7565
50.5
50.6 MSG_GenerateMethod=\u6b63\u5728\u751f\u6210 "{0}" \u64cd\u4f5c\u65b9\u6cd5\u8c03\u7528
50.7 -WRN_WebServiceRef=// \u8bf7\u6ce8\u610f, \u6ce8\u5165\u7684 javax.xml.ws.Service \u5f15\u7528\u4ee5\u53ca\u7aef\u53e3\u5bf9\u8c61\u4e0d\u662f\u7ebf\u7a0b\u5b89\u5168\u7684\u3002\n// \u5982\u679c\u8c03\u7528\u7aef\u53e3\u64cd\u4f5c\u53ef\u80fd\u5bfc\u81f4\u4e89\u7528\u60c5\u51b5, \u5219\u9700\u8981\u8fdb\u884c\u67d0\u79cd\u540c\u6b65\u3002\n
50.8
50.9 +
51.1 --- a/src/zh_CN/enterprise/websvc-rest/websvc-rest/org/netbeans/modules/websvc/rest/support/Bundle_zh_CN.properties Wed Jul 30 05:03:48 2014 -0700
51.2 +++ b/src/zh_CN/enterprise/websvc-rest/websvc-rest/org/netbeans/modules/websvc/rest/support/Bundle_zh_CN.properties Wed Jul 30 05:12:06 2014 -0700
51.3 @@ -40,7 +40,7 @@
51.4
51.5 TestRestTargetPanel.myRemote.actionCommand=Web \u6d4b\u8bd5\u5ba2\u6237\u7aef(&W)
51.6 TTL_SelectTarget=\u914d\u7f6e REST \u6d4b\u8bd5\u5ba2\u6237\u7aef
51.7 -LBL_Local=\u672c\u5730\u751f\u6210\u7684\u6d4b\u8bd5\u5ba2\u6237\u7aef (\u9002\u7528\u4e8e Internet Explorer)(&L)
51.8 +LBL_Local=\u672c\u5730\u751f\u6210\u7684\u6d4b\u8bd5\u5ba2\u6237\u7aef (\u5728\u5df2\u542f\u7528\u5bf9 REST \u8d44\u6e90\u7684\u8de8\u57df\u8bbf\u95ee\u65f6\u9002\u7528)(&L)
51.9 ACSN_Local=\u672c\u5730\u751f\u6210\u7684\u6d4b\u8bd5\u5ba2\u6237\u7aef
51.10 ACSD_Local=\u9009\u62e9\u672c\u5730\u6587\u4ef6\u7cfb\u7edf\u4ee5\u751f\u6210\u6d4b\u8bd5\u5ba2\u6237\u7aef
51.11 LBL_Remote=\u9879\u76ee\u4e2d\u7684 Web \u6d4b\u8bd5\u5ba2\u6237\u7aef(&W)
51.12 @@ -49,7 +49,7 @@
51.13 ACSD_Remote=\u9009\u62e9\u5728 Web \u9879\u76ee\u4e2d\u751f\u6210\u6d4b\u8bd5\u5ba2\u6237\u7aef\u3002\u5fc5\u987b\u90e8\u7f72\u9879\u76ee
51.14 LBL_Target=\u76ee\u6807\u6587\u4ef6\u5939(&F):
51.15 LBL_Notion=\u6ce8\u610f(&N):
51.16 -TXT_Notice=<html>\u67d0\u4e9b\u6d4f\u89c8\u5668\u7684\u5b89\u5168\u9650\u5236\u53ef\u80fd\u963b\u6b62\u4ece\u672c\u5730\u6587\u4ef6\u7cfb\u7edf\u4e2d\u8bbf\u95ee\u8fdc\u7a0b (REST) \u8d44\u6e90\u3002\u8981\u5728\u8fd9\u4e9b\u60c5\u51b5\u4e0b\u8bbf\u95ee REST \u8d44\u6e90, \u8bf7\u5c06\u5305\u542b\u6d4b\u8bd5\u5ba2\u6237\u7aef\u7684\u9879\u76ee\u90e8\u7f72\u5230\u4e0e\u8d44\u6e90\u76f8\u540c\u7684\u57df\u4e2d\u3002\u5982\u679c\u60a8\u7684\u6d4f\u89c8\u5668\u5141\u8bb8\u8bbf\u95ee\u8fdc\u7a0b\u8d44\u6e90, \u60a8\u53ef\u4ee5\u9009\u62e9\u672c\u5730\u6587\u4ef6\u7cfb\u7edf\u4f5c\u4e3a\u76ee\u6807, \u800c\u4e0d\u9700\u8981\u5c06\u6d4b\u8bd5\u5ba2\u6237\u7aef\u90e8\u7f72\u5230\u670d\u52a1\u5668\u4e2d\u3002</html>
51.17 +TXT_Notice=<html>\u5b89\u5168\u9650\u5236\u53ef\u80fd\u4f1a\u963b\u6b62\u4ece\u672c\u5730\u6587\u4ef6\u7cfb\u7edf\u8bbf\u95ee\u8fdc\u7a0b\u8d44\u6e90\u3002<br>\u8981\u8bbf\u95ee REST \u8d44\u6e90, \u8bf7\u5c06\u6d4b\u8bd5\u5ba2\u6237\u7aef\u548c\u8d44\u6e90\u90e8\u7f72\u5230\u540c\u4e00\u57df\u4e2d (\u201c\u9879\u76ee\u4e2d\u7684 Web \u6d4b\u8bd5\u5ba2\u6237\u7aef\u201d\u9009\u9879)\u3002<br><br>\u5982\u679c\u6d4f\u89c8\u5668\u5141\u8bb8\u8bbf\u95ee\u8fdc\u7a0b\u8d44\u6e90, \u5219\u53ef\u4ee5\u9009\u62e9\u672c\u5730\u6587\u4ef6\u7cfb\u7edf<br>\u4f5c\u4e3a\u76ee\u6807 (\u201c\u672c\u5730\u751f\u6210\u7684\u6d4b\u8bd5\u5ba2\u6237\u7aef\u201d\u9009\u9879)\u3002<br>\u5728 Internet Explorer \u4e2d, \u53ef\u4ee5\u5728\u201cInternet \u9009\u9879\u201d\u5bf9\u8bdd\u6846\u4e2d\u542f\u7528\u8de8\u57df\u8bf7\u6c42\u3002<br>\u5bf9\u4e8e Web \u5e94\u7528\u7a0b\u5e8f\u63d0\u4f9b\u7684 REST \u8d44\u6e90, \u5141\u8bb8\u8de8\u57df\u8bf7\u6c42\u7684\u53e6\u4e00\u9009\u9879\u662f<br>\u8bbe\u7f6e\u8de8\u6e90\u8d44\u6e90\u5171\u4eab (CORS) \u8fc7\u6ee4\u5668\u3002<br>\u8981\u521b\u5efa CORS \u8fc7\u6ee4\u5668, \u53ef\u4ee5\u4f7f\u7528\u201cWeb \u670d\u52a1\u201d->\u201c\u8de8\u6e90\u8d44\u6e90\u5171\u4eab\u8fc7\u6ee4\u5668\u201d\u5411\u5bfc\u3002</html>
51.18 TTL_Projects=\u9009\u62e9\u9879\u76ee
51.19 ACSN_Browse=\u6d4f\u89c8
51.20 ACSD_Browse=\u6d4f\u89c8 Web \u9879\u76ee\u4ee5\u67e5\u627e REST \u98ce\u683c\u7684 WS \u6d4b\u8bd5\u5668
52.1 --- a/src/zh_CN/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/Bundle_zh_CN.properties Wed Jul 30 05:03:48 2014 -0700
52.2 +++ b/src/zh_CN/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/Bundle_zh_CN.properties Wed Jul 30 05:12:06 2014 -0700
52.3 @@ -160,6 +160,7 @@
52.4 Templates/J2EE/ApplicationXml=\u6807\u51c6\u90e8\u7f72\u63cf\u8ff0\u7b26
52.5 OptionalEE7APIsHint_Description=\u4ece\u6280\u672f\u7684\u89d2\u5ea6\u63d0\u9192\u7528\u6237, \u8fd9\u4e9b API \u5728 Java EE 7 \u89c4\u8303\u4e2d\u5c06\u662f\u53ef\u9009\u7684\u3002\u867d\u7136\u8fd9\u4e9b API \u5e76\u672a\u8fc7\u65f6, \u4ecd\u53ef\u4ee5\u4f7f\u7528, \u4f46\u662f\u7531\u4e8e\u5b83\u4eec\u662f\u53ef\u9009\u7684, \u56e0\u6b64\u6211\u4eec\u65e0\u6cd5\u786e\u5b9a\u5728\u4ee5\u540e\u7684 Java EE 7 \u517c\u5bb9\u5e73\u53f0\u4e2d\u662f\u5426\u4f1a\u63d0\u4f9b\u8fd9\u4e9b API\u3002
52.6 OptionalEE7APIsHint_DisplayName=\u8bf7\u6ce8\u610f, \u6b64 API \u5728 Java EE 7 \u5e73\u53f0\u4e2d\u662f\u53ef\u9009\u7684\u3002
52.7 +WILDFLY_SERVER_NAME=WildFly \u5e94\u7528\u670d\u52a1\u5668
52.8 javaee-api-7.0=Java EE 7 API \u5e93
52.9 javaee-web-api-7.0=Java EE Web 7 API \u5e93
52.10 javaee-endorsed-api-7.0=Java EE 7 \u652f\u6301\u7684 API \u5e93
53.1 --- a/src/zh_CN/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-j2ee-earproject-ui-resources-ear-importProject_zh_CN.html Wed Jul 30 05:03:48 2014 -0700
53.2 +++ b/src/zh_CN/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-j2ee-earproject-ui-resources-ear-importProject_zh_CN.html Wed Jul 30 05:12:06 2014 -0700
53.3 @@ -45,6 +45,6 @@
53.4 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
53.5 </head>
53.6 <BODY>
53.7 - <b>将现有的企业应用程序导入</b>标准的 IDE 项目中。企业应用程序必须遵循 J2EE BluePrints 企业应用程序的项目约定 (请参见 http://java.sun.com/blueprints/code/projectconventions.html)。此向导还会导入在企业应用程序中嵌套的组件。标准项目使用 <b>IDE 生成的 Ant 构建脚本</b>来构建和运行项目。
53.8 + <b>将现有的企业应用程序导入</b>标准的 IDE 项目中。企业应用程序必须遵循 J2EE BluePrints 企业应用程序的项目约定。此向导还会导入在企业应用程序中嵌套的组件。标准项目使用 <b>IDE 生成的 Ant 构建脚本</b>来构建和运行项目。
53.9 </BODY>
53.10 </HTML>
54.1 --- a/src/zh_CN/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/Bundle_zh_CN.properties Wed Jul 30 05:03:48 2014 -0700
54.2 +++ b/src/zh_CN/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/Bundle_zh_CN.properties Wed Jul 30 05:12:06 2014 -0700
54.3 @@ -104,7 +104,7 @@
54.4 Templates/Hibernate/Hibernate.reveng.xml=Hibernate \u9006\u5411\u5de5\u7a0b\u5411\u5bfc
54.5 Templates/Hibernate/Hibernate.CodeGen=\u901a\u8fc7\u6570\u636e\u5e93\u751f\u6210 Hibernate \u6620\u5c04\u6587\u4ef6\u548c POJO
54.6
54.7 -jpa2-persistence=\u6301\u4e45\u6027 JPA 2.0
54.8 +jpa2-persistence=\u6301\u4e45\u6027 JPA2.1
54.9
54.10
54.11
54.12 @@ -195,6 +195,16 @@
54.13 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
54.14 LBL_WrongStringComparison=\u4f7f\u7528 == \u6216 != \u6bd4\u8f83\u5b57\u7b26\u4e32
54.15 DSC_WrongStringComparison=\u68c0\u67e5\u4f7f\u7528 == \u6216 != \u8fd0\u7b97\u7b26\u6bd4\u8f83\u5b57\u7b26\u4e32\u7684\u60c5\u51b5\u3002<BR>\u901a\u5e38, \u5e94\u4f7f\u7528 equals() \u65b9\u6cd5\u6267\u884c\u5b57\u7b26\u4e32\u6bd4\u8f83\u3002
54.16 +LBL_Empty_FOR_LOOP='for' \u540e\u5b58\u5728\u7a7a\u8bed\u53e5
54.17 +LBL_Empty_WHILE_LOOP='while' \u540e\u5b58\u5728\u7a7a\u8bed\u53e5
54.18 +LBL_Empty_DO_WHILE_LOOP='do' \u540e\u5b58\u5728\u7a7a\u8bed\u53e5
54.19 +LBL_Empty_IF='if/else' \u540e\u5b58\u5728\u7a7a\u8bed\u53e5
54.20 +LBL_Empty_BLOCK=\u7a7a\u8bed\u53e5
54.21 +DSC_Empty_FOR_LOOP=\u68c0\u67e5\u4ee5\u4e0b\u5f62\u5f0f\u7684 'for' \u8bed\u53e5:<BR><CODE>for(...);</CODE>\u3002
54.22 +DSC_Empty_WHILE_LOOP=\u68c0\u67e5\u4ee5\u4e0b\u5f62\u5f0f\u7684 'while' \u8bed\u53e5:<BR><CODE>while(...);</CODE>\u3002
54.23 +DSC_Empty_DO_WHILE_LOOP=\u68c0\u67e5\u4ee5\u4e0b\u5f62\u5f0f\u7684 'do/while' \u8bed\u53e5:<BR><CODE>do;<BR>while</CODE>\u3002
54.24 +DSC_Empty_IF=\u68c0\u67e5\u4ee5\u4e0b\u5f62\u5f0f\u7684 'if/else' \u8bed\u53e5:<BR><CODE>if(...);<BR>else;</CODE>\u3002
54.25 +DSC_Empty_BLOCK=\u68c0\u67e5\u5757\u4e2d\u662f\u5426\u5b58\u5728\u7a7a\u8bed\u53e5, \u8fd9\u4e9b\u8bed\u53e5\u901a\u5e38\u8868\u793a\u4e3a\u591a\u4f59\u7684\u5206\u53f7\u3002
54.26 MSG_StaticAccessName=\u901a\u8fc7\u5f15\u7528\u8bbf\u95ee\u9759\u6001\u5b57\u6bb5
54.27 HINT_StaticAccess=Java \u8bed\u8a00\u5141\u8bb8\u901a\u8fc7\u5b9e\u4f8b\u53d8\u91cf\u8bbf\u95ee\u9759\u6001\u5b57\u6bb5, \u4f46\u662f, \u8fd9\u901a\u5e38\u4f1a\u4ea7\u751f\u8bef\u5bfc\u5e76\u4e14\u96be\u4ee5\u9605\u8bfb\u3002
54.28 DN_AddOverrideAnnotation=\u6dfb\u52a0 @Override \u6807\u6ce8
54.29 @@ -203,7 +213,7 @@
54.30 DESC_org.netbeans.modules.java.hints.EqualsMethodHint=.equals \u65b9\u6cd5\u5b9e\u73b0\u4e0d\u68c0\u67e5\u8f93\u5165\u53c2\u6570\u7c7b\u578b
54.31 DESC_org.netbeans.modules.java.hints.SyncOnNonFinal=\u5bf9\u975e\u6700\u7ec8\u5b57\u6bb5\u6267\u884c\u540c\u6b65
54.32 DN_org.netbeans.modules.java.hints.SyncOnNonFinal=\u5bf9\u975e\u6700\u7ec8\u5b57\u6bb5\u6267\u884c\u540c\u6b65
54.33 -DSC_StaticImport=\u5c06\u65b9\u6cd5\u8f6c\u6362\u4e3a\u9759\u6001\u5bfc\u5165\u3002\u5982\u6709\u53cd\u9988, \u53ef\u62a5\u544a\u81f3 http://www.netbeans.org/issues/show_bug.cgi?id=89258
54.34 +DSC_StaticImport=\u8f6c\u6362\u9759\u6001 method/field/enum-field \u5f15\u7528\u4ee5\u4f7f\u7528\u9759\u6001\u5bfc\u5165\u3002\u5982\u6709\u53cd\u9988, \u53ef\u62a5\u544a\u81f3 <a href="http://www.netbeans.org/issues/show_bug.cgi?id=89258">http://www.netbeans.org/issues/show_bug.cgi?id=89258</a>
54.35 DN_StaticImport=\u9759\u6001\u5bfc\u5165
54.36 DN_StringBuilderAppend=StringBuilder.append \u4e2d\u5b58\u5728\u5b57\u7b26\u4e32\u8fde\u63a5
54.37 DESC_StringBuilderAppend=\u5728\u8c03\u7528 StringBuilder \u6216 StringBuffer \u7684 append \u65b9\u6cd5\u7684\u53c2\u6570\u4e2d\u67e5\u627e\u5b57\u7b26\u4e32\u8fde\u63a5\u3002
55.1 --- a/src/zh_CN/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/webcommon/org-netbeans-modules-web-client-samples-resources-AngularJSPhoneCat_zh_CN.html Wed Jul 30 05:03:48 2014 -0700
55.2 +++ b/src/zh_CN/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/webcommon/org-netbeans-modules-web-client-samples-resources-AngularJSPhoneCat_zh_CN.html Wed Jul 30 05:12:06 2014 -0700
55.3 @@ -45,6 +45,6 @@
55.4 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
55.5 </head>
55.6 <body>
55.7 - AngularJS 框架教程中使用的应用程序, 大体上借鉴了 Google Phone Gallery。
55.8 + AngularJS 框架教程中使用的应用程序, 大体上借鉴了 Google Phone Gallery。<br>创建后运行 <b>npm install</b> 安装依赖关系。
55.9 </body>
55.10 </html>
56.1 --- a/src/zh_CN/ide/db-dataview/db-dataview/org/netbeans/modules/db/dataview/output/Bundle_zh_CN.properties Wed Jul 30 05:03:48 2014 -0700
56.2 +++ b/src/zh_CN/ide/db-dataview/db-dataview/org/netbeans/modules/db/dataview/output/Bundle_zh_CN.properties Wed Jul 30 05:12:06 2014 -0700
56.3 @@ -92,6 +92,10 @@
56.4
56.5 TOOLTIP_print_data=\u6253\u5370\u8868\u6570\u636e
56.6
56.7 +TOOLTIP_set_cell_to_null=\u8bbe\u7f6e\u4e3a\u7a7a\u503c
56.8 +
56.9 +TOOLTIP_set_cell_to_default=\u8bbe\u7f6e\u4e3a\u9ed8\u8ba4\u503c
56.10 +
56.11 MSG_cancel_printing=\u7528\u6237\u53d6\u6d88\u4e86\u6253\u5370
56.12
56.13 LBL_max_rows=\u9875\u9762\u5927\u5c0f:
57.1 --- a/src/zh_CN/ide/db-dataview/db-dataview/org/netbeans/modules/db/dataview/util/Bundle_zh_CN.properties Wed Jul 30 05:03:48 2014 -0700
57.2 +++ b/src/zh_CN/ide/db-dataview/db-dataview/org/netbeans/modules/db/dataview/util/Bundle_zh_CN.properties Wed Jul 30 05:12:06 2014 -0700
57.3 @@ -80,3 +80,35 @@
57.4
57.5 BinaryToStringConverter_InvalidBitFormat=\u5728\u5b57\u7b26 {1} \u5904\u627e\u5230\u4e86 {0}; \u5e94\u4e3a 0 \u6216 1\u3002
57.6
57.7 +# Encoding display names taken from TAx library
57.8 +NAME_ISO-8859-1=ISO-8859-1 (\u62c9\u4e01\u8bed 1)
57.9 +NAME_IBM870=IBM870
57.10 +NAME_ISO-2022-JP=ISO-2022-JP
57.11 +NAME_ISO-8859-3=ISO-8859-3
57.12 +NAME_IBM424=IBM424
57.13 +NAME_KOI8-R=KOI8-R (\u4fc4\u8bed)
57.14 +NAME_IBM280=IBM280
57.15 +NAME_ISO-8859-4=ISO-8859-4
57.16 +NAME_IBM285=IBM285
57.17 +NAME_EUC-JP=EUC-JP
57.18 +NAME_UTF-8=UTF-8 (\u63a8\u8350)
57.19 +NAME_IBM297=IBM297
57.20 +NAME_ASCII=ASCII (7 \u4f4d)
57.21 +NAME_ISO-8859-2=ISO-8859-2
57.22 +NAME_UTF-16=UTF-16 (\u63a8\u8350)
57.23 +NAME_IBM500=IBM500
57.24 +NAME_IBM277=IBM277
57.25 +NAME_GB2312=GB2312
57.26 +NAME_ISO-8859-9=ISO-8859-9
57.27 +NAME_IBM871=IBM871
57.28 +NAME_ISO-8859-7=ISO-8859-7
57.29 +NAME_IBM037=IBM037
57.30 +NAME_IBM918=IBM918
57.31 +NAME_IBM284=IBM284
57.32 +NAME_ISO-2022-KR=ISO-2022-KR
57.33 +NAME_EUC-KR=EUC-KR
57.34 +NAME_ISO-8859-6=ISO-8859-6
57.35 +NAME_ISO-8859-8=ISO-8859-8
57.36 +NAME_BIG5=BIG5
57.37 +NAME_ISO-8859-5=ISO-8859-5
57.38 +
58.1 --- a/src/zh_CN/ide/dlight-terminal/dlight-terminal/org/netbeans/modules/dlight/terminal/Bundle_zh_CN.properties Wed Jul 30 05:03:48 2014 -0700
58.2 +++ b/src/zh_CN/ide/dlight-terminal/dlight-terminal/org/netbeans/modules/dlight/terminal/Bundle_zh_CN.properties Wed Jul 30 05:12:06 2014 -0700
58.3 @@ -1,5 +1,5 @@
58.4 CTL_SomeAction=ttt
58.5 -OpenIDE-Module-Display-Category=C/C++
58.6 +OpenIDE-Module-Display-Category=\u672c\u673a\u652f\u6301\u5de5\u5177
58.7 OpenIDE-Module-Long-Description=\u8be5\u6a21\u5757\u63d0\u4f9b\u4e86\u5d4c\u5165\u5f0f\u7ec8\u7aef\u4eff\u771f\u5668 (\u201c\u7a97\u53e3 -> \u8f93\u51fa -> \u7ec8\u7aef\u548c\u7a97\u53e3 -> \u8f93\u51fa -> \u8fdc\u7a0b\u7ec8\u7aef\u201d\u64cd\u4f5c)\u3002
58.8 OpenIDE-Module-Name=\u672c\u673a\u7ec8\u7aef
58.9 OpenIDE-Module-Short-Description=\u5d4c\u5165\u5f0f\u7ec8\u7aef
59.1 --- a/src/zh_CN/ide/dlight-terminal/dlight-terminal/org/netbeans/modules/dlight/terminal/action/Bundle_zh_CN.properties Wed Jul 30 05:03:48 2014 -0700
59.2 +++ b/src/zh_CN/ide/dlight-terminal/dlight-terminal/org/netbeans/modules/dlight/terminal/action/Bundle_zh_CN.properties Wed Jul 30 05:12:06 2014 -0700
59.3 @@ -1,9 +1,10 @@
59.4 -CTL_LocalTerminal=\u7ec8\u7aef
59.5 +CTL_LocalTerminal=\u672c\u5730\u7ec8\u7aef
59.6 CTL_RemoteTerminalAction=\u8fdc\u7a0b\u7ec8\u7aef
59.7 RemoteConnectionTitle=SSH \u8fde\u63a5
59.8 TerminalAction.FailedToStart.text=\u65e0\u6cd5\u542f\u52a8\u7ec8\u7aef: {0}
59.9 RemoteTerminalShortDescr=\u7528\u4e8e\u521b\u5efa\u65b0\u7684\u8fdc\u7a0b\u7ec8\u7aef\u7684\u6807\u7b7e
59.10 LocalTerminalShortDescr=\u7528\u4e8e\u521b\u5efa\u65b0\u7684\u672c\u5730\u7ec8\u7aef\u7684\u6807\u7b7e
59.11 +TerminalOptionsShortDescr=\u6253\u5f00\u7ec8\u7aef\u9009\u9879
59.12 CTL_ShowTerminalAction=\u7ec8\u7aef(&E)
59.13 ShowTerminalShortDescr=\u6253\u5f00\u7ec8\u7aef\u7a97\u53e3
59.14 LocalTerminalNotSupported.error.nocygwin=\u672c\u5730\u7ec8\u7aef\u9700\u8981 cygwin\u3002\n\u8bf7\u5b89\u88c5 cygwin \u5e76\u91cd\u65b0\u542f\u52a8 IDE\u3002
60.1 --- a/src/zh_CN/ide/editor-search/editor-search/org/netbeans/modules/editor/search/Bundle_zh_CN.properties Wed Jul 30 05:03:48 2014 -0700
60.2 +++ b/src/zh_CN/ide/editor-search/editor-search/org/netbeans/modules/editor/search/Bundle_zh_CN.properties Wed Jul 30 05:12:06 2014 -0700
60.3 @@ -37,7 +37,7 @@
60.4 #{0} searched string - user input, {1} is position
60.5 find-found=\u5728{1}\u4e2d\u627e\u5230 ''{0}''
60.6 #{0} searched string - user input
60.7 -find-not-found=\u672a\u627e\u5230 ''{0}''
60.8 +find-not-found=\u627e\u4e0d\u5230 ''{0}'' \u6216\u641c\u7d22\u65f6\u95f4\u592a\u957f\u3002
60.9 find-wrap-start=\u5df2\u5230\u8fbe\u6587\u6863\u7ed3\u5c3e\u3002\u7ee7\u7eed\u4ece\u5934\u5f00\u59cb\u641c\u7d22\u3002
60.10 find-wrap-end=\u5df2\u5230\u8fbe\u6587\u6863\u5f00\u5934\u3002\u7ee7\u7eed\u4ece\u7ed3\u5c3e\u5f00\u59cb\u641c\u7d22\u3002
60.11 find-block-wrap-start=\u5df2\u5230\u8fbe\u9009\u5b9a\u5185\u5bb9\u7684\u7ed3\u5c3e\u3002\u7ee7\u7eed\u4ece\u5934\u5f00\u59cb\u641c\u7d22\u3002
60.12 @@ -47,3 +47,5 @@
60.13 pattern-error-dialog-content=\u6b63\u5219\u8868\u8fbe\u5f0f\u6a21\u5f0f\u8bed\u6cd5\u9519\u8bef:
60.14 pattern-error-missing-escape-hint=\u63d0\u793a: \u5728\u6b63\u5219\u8868\u8fbe\u5f0f\u4e2d, \u5982\u679c $ \u5b57\u7b26\u540e\u9762\u6ca1\u6709\u8ddf\u6570\u5b57\u5b57\u7b26, \u5219\u5fc5\u987b\u5c06\u5176\u8f6c\u4e49 (\\$)\u3002
60.15
60.16 +slow-search=\u641c\u7d22\u65f6\u95f4\u592a\u957f\u3002\u5c1d\u8bd5\u907f\u514d\u590d\u6742\u56de\u6eaf\u6b63\u5219\u8868\u8fbe\u5f0f\u3002
60.17 +
61.1 --- a/src/zh_CN/ide/git/git/org/netbeans/modules/git/Bundle_zh_CN.properties Wed Jul 30 05:03:48 2014 -0700
61.2 +++ b/src/zh_CN/ide/git/git/org/netbeans/modules/git/Bundle_zh_CN.properties Wed Jul 30 05:12:06 2014 -0700
61.3 @@ -54,6 +54,9 @@
61.4
61.5 LBL_Status.Description=\u6700\u65b0\u7684 Git \u72b6\u6001
61.6 LBL_Status.DisplayName=\u72b6\u6001
61.7 +# {0} - branch name
61.8 +MSG_Annotator.tooltip.branch=\u4f4d\u4e8e\u5206\u652f "{0}"\u3002
61.9 +MSG_Annotator.tooltip.nobranch=\u4e0d\u5728\u5206\u652f\u4e2d (\u5206\u79bb\u7684 HEAD \u72b6\u6001)\u3002
61.10 OpenIDE-Module-Display-Category=\u57fa\u672c IDE
61.11 OpenIDE-Module-Long-Description=\u5c06 Git \u529f\u80fd\u96c6\u6210\u5230 NetBeans IDE
61.12 OpenIDE-Module-Name=Git
62.1 --- a/src/zh_CN/ide/git/git/org/netbeans/modules/git/client/Bundle_zh_CN.properties Wed Jul 30 05:03:48 2014 -0700
62.2 +++ b/src/zh_CN/ide/git/git/org/netbeans/modules/git/client/Bundle_zh_CN.properties Wed Jul 30 05:12:06 2014 -0700
62.3 @@ -38,15 +38,18 @@
62.4 #
62.5 # Portions Copyrighted 2010 Sun Microsystems, Inc.
62.6
62.7 -LBL_Queued = {0} - \u5df2\u6392\u961f
62.8 +LBL_Queued={0} - \u5df2\u6392\u961f
62.9
62.10 -LBL_RepositoryBlocked = \u5df2\u5728{0}\u4e0a\u6392\u961f
62.11 -MSG_Progress_Finished= \u5b8c\u6210\u3002
62.12 -MSG_Progress_Canceled= \u53d6\u6d88\u3002
62.13 +LBL_RepositoryBlocked=\u5df2\u5728{0}\u4e0a\u6392\u961f
62.14 +# {0} - task title
62.15 +# {1} - task progress
62.16 +
62.17 +MSG_Progress_Finished=\u5b8c\u6210\u3002
62.18 +MSG_Progress_Canceled=\u53d6\u6d88\u3002
62.19
62.20 # GitClientExceptionHandler
62.21 MSG_SubversionCommandError=Git \u547d\u4ee4\u8fd4\u56de\u5e76\u51fa\u73b0\u4ee5\u4e0b\u9519\u8bef:
62.22 -MSG_CommandFailed_Title = Git \u547d\u4ee4\u5931\u8d25
62.23 +MSG_CommandFailed_Title=Git \u547d\u4ee4\u5931\u8d25
62.24 CTL_CommandReport_OK=\u786e\u5b9a
62.25
62.26 #CredentialsCallback
63.1 --- a/src/zh_CN/ide/git/git/org/netbeans/modules/git/ui/branch/Bundle_zh_CN.properties Wed Jul 30 05:03:48 2014 -0700
63.2 +++ b/src/zh_CN/ide/git/git/org/netbeans/modules/git/ui/branch/Bundle_zh_CN.properties Wed Jul 30 05:12:06 2014 -0700
63.3 @@ -40,6 +40,34 @@
63.4
63.5 BranchSelector.okButton.text=\u786e\u5b9a(&O)
63.6 BranchSelector.title=\u9009\u62e9\u5206\u652f
63.7 +# {0} - branch name
63.8 +CherryPickPanel.info.merged=\u5df2\u662f "{0}" \u7684\u4e00\u90e8\u5206!
63.9 +CTL_CherryPickAction_abortButton_text=\u4e2d\u6b62(&A)
63.10 +CTL_CherryPickAction_abortButton_TTtext=\u4e2d\u6b62\u4e2d\u65ad\u7684\u6311\u9009\u64cd\u4f5c\u5e76\u56de\u9000\u5230\u539f\u59cb\u63d0\u4ea4\u3002
63.11 +CTL_CherryPickAction_continueButton_text=\u7ee7\u7eed(&C)
63.12 +CTL_CherryPickAction_continueButton_TTtext=\u7ee7\u7eed\u6267\u884c\u6311\u9009\u8ba1\u5212\u7684\u63d0\u4ea4\u3002
63.13 +CTL_CherryPickAction_quitButton_text=\u9000\u51fa(&Q)
63.14 +CTL_CherryPickAction_quitButton_TTtext=\u5b8c\u6210\u5f53\u524d\u7684\u6311\u9009\u63d0\u4ea4, \u4f46\u4e0d\u5e94\u7528\u4efb\u4f55\u5176\u4ed6\u64cd\u4f5c\u3002
63.15 +LBL_CherryPick.OKButton.text=\u5e94\u7528(&A)
63.16 +# {0} - repository name
63.17 +LBL_CherryPick.title=\u6311\u9009 - {0}
63.18 +LBL_CherryPick_cherryPickingState_title=\u672a\u5b8c\u6210\u7684\u6311\u9009
63.19 +LBL_CherryPickAction_Name=\u6311\u9009(&H)...
63.20 +LBL_CherryPickAction_PopupName=\u6311\u9009...
63.21 +LBL_CherryPickResultProcessor.abortButton.text=\u4e2d\u6b62(&A)
63.22 +LBL_CherryPickResultProcessor.abortButton.TTtext=\u4e2d\u6b62\u4e2d\u65ad\u7684\u8fdb\u7a0b\u5e76\u91cd\u7f6e\u56de\u539f\u59cb\u63d0\u4ea4\u3002
63.23 +LBL_CherryPickResultProcessor.commit=\u9700\u8981\u63d0\u4ea4
63.24 +LBL_CherryPickResultProcessor.commit.commitButton.text=\u63d0\u4ea4(&C)
63.25 +LBL_CherryPickResultProcessor.commit.commitButton.TTtext=\u6253\u5f00\u63d0\u4ea4\u5bf9\u8bdd\u6846\u3002
63.26 +LBL_CherryPickResultProcessor.commit.reviewButton.text=\u67e5\u770b(&R)
63.27 +LBL_CherryPickResultProcessor.commit.reviewButton.TTtext=\u5728\u72b6\u6001\u7a97\u53e3\u4e2d\u67e5\u770b\u66f4\u6539\u3002
63.28 +LBL_CherryPickResultProcessor.resolveButton.text=\u89e3\u51b3(&R)
63.29 +LBL_CherryPickResultProcessor.resolveButton.TTtext=\u5c06\u5728\u201c\u89e3\u51b3\u51b2\u7a81\u201d\u5bf9\u8bdd\u6846\u4e2d\u6253\u5f00\u53d1\u751f\u51b2\u7a81\u7684\u6587\u4ef6\u3002
63.30 +LBL_CherryPickResultProcessor.resolveConflicts=\u89e3\u51b3\u51b2\u7a81
63.31 +LBL_CherryPickResultProcessor.revertButton.text=\u8fd8\u539f(&R)
63.32 +LBL_CherryPickResultProcessor.revertButton.TTtext=\u5c06\u672c\u5730\u66f4\u6539\u8fd8\u539f\u4e3a HEAD \u4e2d\u7684\u72b6\u6001\u5e76\u5220\u9664\u672a\u8fdb\u884c\u7248\u672c\u63a7\u5236\u7684\u6587\u4ef6\u3002
63.33 +LBL_CherryPickResultProcessor.reviewButton.text=\u67e5\u770b(&V)
63.34 +LBL_CherryPickResultProcessor.reviewButton.TTtext=\u6253\u5f00\u7248\u672c\u63a7\u5236\u89c6\u56fe\u5e76\u5217\u51fa\u53d1\u751f\u51b2\u7a81\u7684\u6587\u4ef6\u3002
63.35 LBL_CreateBranchAction.progressName=\u521b\u5efa\u5206\u652f
63.36 LBL_CreateBranchAction_Name=\u521b\u5efa\u5206\u652f(&B)...
63.37 LBL_CreateBranchAction_PopupName=\u521b\u5efa\u5206\u652f...
63.38 @@ -49,10 +77,31 @@
63.39
63.40 LBL_SetTrackingAction.progressName=\u6b63\u5728\u8bbe\u7f6e\u8ddf\u8e2a\u7684\u5206\u652f
63.41 LBL_SetTrackingAction_Name=\u8bbe\u7f6e\u8ddf\u8e2a\u7684\u5206\u652f(&C)...
63.42 +LBL_SyncBranchAction.progressName=\u6b63\u5728\u4e0e\u8ddf\u8e2a\u7684\u5206\u652f\u540c\u6b65
63.43 +MSG_CherryPick.resolving=\u6b63\u5728\u89e3\u51b3\u51b2\u7a81...
63.44 +# {0} - repository name
63.45 +MSG_CherryPick_cherryPickingScheduledState_text=\u8d44\u6e90\u5e93{0}\u4f3c\u4e4e\u6b63\u5728\u8fdb\u884c\u672a\u5b8c\u6210\u7684\u6311\u9009\u3002\n\n\u53ef\u4ee5\u7ee7\u7eed\u5e94\u7528\u6240\u6709\u8ba1\u5212\u7684\u63d0\u4ea4,\n\u4e2d\u6b62\u5e76\u56de\u9000\u5230\u5f00\u59cb\u6311\u9009\u524d\u7684\u72b6\u6001, \n\u4e5f\u53ef\u4ee5\u9000\u51fa\u6311\u9009\u5e76\u4fdd\u7559\u5df2\u5e94\u7528\u7684\u63d0\u4ea4\u3002
63.46 +# {0} - repository name
63.47 +MSG_CherryPick_cherryPickingState_text=\u8d44\u6e90\u5e93{0}\u4f3c\u4e4e\u6b63\u5728\u8fdb\u884c\u672a\u5b8c\u6210\u7684\u6311\u9009\u3002\n\n\u53ef\u4ee5\u7ee7\u7eed\u5e94\u7528\u6240\u6709\u8ba1\u5212\u7684\u63d0\u4ea4,\n\u4e5f\u53ef\u4ee5\u4e2d\u6b62\u5e76\u56de\u9000\u5230\u5f00\u59cb\u6311\u9009\u524d\u7684\u72b6\u6001\u3002
63.48 +# {0} - rebase status
63.49 +MSG_CherryPickAction.result=\u6311\u9009\u7ed3\u679c: {0}\n
63.50 +# {0} - head commit id
63.51 +MSG_CherryPickAction.result.aborted=\u6311\u9009\u64cd\u4f5c\u5df2\u4e2d\u6b62, \u5f53\u524d\u5206\u652f\u5df2\u91cd\u7f6e\u4e3a{0}\n
63.52 +MSG_CherryPickAction.result.conflict=\u6311\u9009\u64cd\u4f5c\u7531\u4e8e\u4ee5\u4e0b\u4f4d\u7f6e\u5b58\u5728\u51b2\u7a81\u800c\u4e2d\u65ad:\n
63.53 +MSG_CherryPickAction.result.failed=\u5de5\u4f5c\u6811\u4fee\u6539\u963b\u6b62\u4e86\u6311\u9009\u64cd\u4f5c:\n
63.54 +MSG_CherryPickAction.result.ok=\u6311\u9009\u64cd\u4f5c\u5df2\u6210\u529f\u5b8c\u6210\n
63.55 +# {0} - repository state
63.56 +MSG_CherryPickAction_notAllowed=\u6b64\u72b6\u6001\u4e0b\u4e0d\u5141\u8bb8\u6267\u884c\u6311\u9009\u64cd\u4f5c: "{0}"\u3002
63.57 +MSG_CherryPickAction_progress=\u6b63\u5728\u6311\u9009...
63.58 +MSG_CherryPickResultProcessor.commit=\u63d0\u4ea4\u66f4\u6539\u5df2\u5e94\u7528\u5230\u5f53\u524d\u5206\u652f\u4e2d, \n\u4f46\u9700\u8981\u624b\u52a8\u63d0\u4ea4\u624d\u80fd\u4f7f\u8fd9\u4e9b\u66f4\u6539\u6210\u4e3a\u6c38\u4e45\u66f4\u6539\u3002\n\n\u60a8\u662f\u8981\u7acb\u5373\u63d0\u4ea4\u66f4\u6539, \u8fd8\u662f\u8981\u5148\u67e5\u770b\u8fd9\u4e9b\u66f4\u6539?
63.59 +MSG_CherryPickResultProcessor.resolveConflicts=\u6311\u9009\u64cd\u4f5c\u4ea7\u751f\u4e86\u672a\u89e3\u51b3\u7684\u51b2\u7a81\u3002\n\u60a8\u53ef\u4ee5\u624b\u52a8\u89e3\u51b3\u8fd9\u4e9b\u51b2\u7a81, \u6216\u8005\u5728\u7248\u672c\u63a7\u5236\u89c6\u56fe\u4e2d\u67e5\u770b\u8fd9\u4e9b\u51b2\u7a81,\n\u4e5f\u53ef\u4ee5\u5b8c\u5168\u4e2d\u6b62\u8fdb\u7a0b\u5e76\u91cd\u7f6e\u56de\u539f\u59cb\u72b6\u6001\u3002
63.60 +MSG_CreateBranch.errorBranchExists=\u5177\u6709\u7ed9\u5b9a\u540d\u79f0\u7684\u5206\u652f\u5df2\u5b58\u5728\u3002
63.61 +MSG_CreateBranch.errorBranchNameEmpty=\u5206\u652f\u540d\u79f0\u4e0d\u80fd\u4e3a\u7a7a
63.62 +MSG_CreateBranch.errorInvalidBranchName=\u5206\u652f\u540d\u79f0\u65e0\u6548
63.63 +# {0} - branch name
63.64 +MSG_CreateBranch.errorParentExists=\u65e0\u6cd5\u4f7f\u7528\u5df2\u6709 "{0}" \u521b\u5efa\u5206\u652f
63.65 MSG_CreateBranchAction.branchCreated=\u521b\u5efa\u7684\u5206\u652f\n\u540d\u79f0: {0}\n\u6765\u6e90: {1}\nID: {2}
63.66 MSG_CreateBranch.errorRevision=\u9009\u62e9\u6709\u6548\u7684\u4fee\u8ba2\u7248\u672c
63.67 -MSG_CreateBranch.errorBranchExists=\u5177\u6709\u7ed9\u5b9a\u540d\u79f0\u7684\u5206\u652f\u5df2\u5b58\u5728\u3002
63.68 -MSG_CreateBranch.errorBranchNameEmpty=\u5206\u652f\u540d\u79f0\u65e0\u6548
63.69
63.70 LBL_DeleteBranchAction_Name=\u5220\u9664\u5206\u652f...
63.71 LBL_DeleteBranchAction_PopupName=\u5220\u9664\u5206\u652f...
63.72 @@ -69,10 +118,23 @@
63.73 # {1} - tracked branch name
63.74 MSG_SetTrackingAction.result=\u5206\u652f "{0}" \u6807\u8bb0\u4e3a\u8ddf\u8e2a\u5206\u652f "{1}"
63.75 # {0} - branch name
63.76 +# {1} - tracked branch name
63.77 +MSG_SyncBranchAction.result=\u6b63\u5728\u540c\u6b65\u5206\u652f{0}\u548c{1}\n
63.78 +# {0} - branch name
63.79 +MSG_SyncBranchAction.result.ff=\u5206\u652f "{0}" \u5feb\u901f\u5411\u524d\u5230:\n
63.80 +# {0} - branch name
63.81 +MSG_SyncBranchAction.result.notAttempted=\u540c\u6b65\u4e2d\u65ad, \u539f\u56e0\u5f88\u53ef\u80fd\u662f "{0}" \u662f\u4e0d\u652f\u6301\u7684\u5f15\u7528\u3002
63.82 +# {0} - branch name
63.83 +MSG_SyncBranchAction.result.notAttempted.pushNeeded=\u672a\u542f\u52a8\u540c\u6b65, \u5206\u652f "{0}" \u9700\u8981\u63a8\u5165\u3002
63.84 +MSG_SyncBranchAction.result.rejected=\u5df2\u62d2\u7edd - \u9700\u8981\u5b8c\u5168\u5408\u5e76\u3002
63.85 +# {0} - tracked branch name
63.86 +MSG_SyncBranchAction.result.upToDate=\u5df2\u4e0e{0}\u540c\u6b65
63.87 +# {0} - branch name
63.88 SelectTrackedBranchPanel.error.noselection=\u4e3a\u5206\u652f "{0}" \u9009\u62e9\u8ddf\u8e2a\u7684\u5206\u652f
63.89 # {0} - branch name
63.90 SelectTrackedBranchPanel.error.samerevision=\u9009\u62e9 "{0}" \u4e4b\u5916\u7684\u5206\u652f
63.91 SelectTrackedBranchPanel.errorLabel.text=jLabel1
63.92 +CherryPickPanel.jLabel1.text=\u9009\u62e9\u8981\u5e94\u7528 (\u6311\u9009) \u5230 HEAD \u7684\u4fee\u8ba2
63.93 # {0} - branch name
63.94 # {1} - tracked branch name
63.95 SelectTrackedBranchPanel.info=\u5206\u652f "{0}" \u5c06\u5f00\u59cb\u8ddf\u8e2a\u5206\u652f "{1}"
64.1 --- a/src/zh_CN/ide/git/git/org/netbeans/modules/git/ui/checkout/Bundle_zh_CN.properties Wed Jul 30 05:03:48 2014 -0700
64.2 +++ b/src/zh_CN/ide/git/git/org/netbeans/modules/git/ui/checkout/Bundle_zh_CN.properties Wed Jul 30 05:12:06 2014 -0700
64.3 @@ -52,6 +52,11 @@
64.4 CTL_RevertChanges.title.file=\u6587\u4ef6{0}
64.5 CTL_RevertChanges.title.dir=\u76ee\u5f55{0}
64.6 CTL_RevertChanges.title.files={0} \u4e2a\u6587\u4ef6
64.7 +MSG_CheckoutRevision.errorBranchExists=\u5177\u6709\u7ed9\u5b9a\u540d\u79f0\u7684\u5206\u652f\u5df2\u5b58\u5728
64.8 +MSG_CheckoutRevision.errorBranchNameEmpty=\u672a\u8f93\u5165\u5206\u652f\u540d\u79f0
64.9 +MSG_CheckoutRevision.errorInvalidBranchName=\u5206\u652f\u540d\u79f0\u65e0\u6548
64.10 +# {0} - branch name
64.11 +MSG_CheckoutRevision.errorParentExists=\u65e0\u6cd5\u4f7f\u7528\u5df2\u6709 "{0}" \u521b\u5efa\u5206\u652f
64.12 MSG_GitAction.savingFiles.progress=\u6b63\u5728\u51c6\u5907 Git \u64cd\u4f5c
64.13 RevertChangesPanel.revertWTRadioButton.text=\u5c06\u5de5\u4f5c\u6811\u4e2d\u7684\u672a\u63d0\u4ea4\u66f4\u6539\u8fd8\u539f\u4e3a\u7d22\u5f15\u4e2d\u7684\u72b6\u6001(&K)
64.14 RevertChangesPanel.revertAllRadioButton.text=\u8fd8\u539f\u5de5\u4f5c\u6811\u548c\u7d22\u5f15\u4e2d\u7684\u672a\u63d0\u4ea4\u66f4\u6539(&W)
64.15 @@ -80,8 +85,6 @@
64.16 LBL_CheckoutRevisionAction.reviewButton.text=\u67e5\u770b(&V)
64.17 LBL_CheckoutRevisionAction.reviewButton.TTtext=\u6253\u5f00\u7248\u672c\u63a7\u5236\u89c6\u56fe\u5e76\u5217\u51fa\u53d1\u751f\u51b2\u7a81\u7684\u6587\u4ef6\u3002
64.18 MSG_CheckoutRevision.errorRevision=\u9009\u62e9\u6709\u6548\u7684\u4fee\u8ba2\u7248\u672c
64.19 -MSG_CheckoutRevision.errorBranchExists=\u5177\u6709\u7ed9\u5b9a\u540d\u79f0\u7684\u5206\u652f\u5df2\u5b58\u5728\u3002
64.20 -MSG_CheckoutRevision.errorBranchNameEmpty=\u672a\u8f93\u5165\u5206\u652f\u540d\u79f0
64.21 MSG_CheckoutRevision.warningDetachedHead=\u5c06\u521b\u5efa\u5206\u79bb\u7684\u6807\u5934
64.22 #SwitchBranchAction
64.23 LBL_SwitchBranchAction_Name=\u5207\u6362\u5230\u5206\u652f(&S)...
65.1 --- a/src/zh_CN/ide/git/git/org/netbeans/modules/git/ui/clone/Bundle_zh_CN.properties Wed Jul 30 05:03:48 2014 -0700
65.2 +++ b/src/zh_CN/ide/git/git/org/netbeans/modules/git/ui/clone/Bundle_zh_CN.properties Wed Jul 30 05:12:06 2014 -0700
65.3 @@ -50,9 +50,21 @@
65.4 ACSD_BrowseFolder=\u7528\u4e8e\u6d4f\u89c8\u76ee\u6807\u76ee\u5f55\u3002
65.5 Browse_title=\u6d4f\u89c8\u7236\u76ee\u5f55
65.6 MSG_Clone.confirmSubmoduleInit.text=\u5728\u514b\u9686\u7684\u8d44\u6e90\u5e93\u4e2d\u627e\u5230\u672a\u521d\u59cb\u5316\u7684\u5b50\u6a21\u5757\u3002\n\n\u662f\u5426\u8981\u81ea\u52a8\u521d\u59cb\u5316\u5e76\u514b\u9686\u5b83\u4eec?
65.7 +MSG_Clone.progress.checkingForSubmodules=\u6b63\u5728\u68c0\u67e5\u5b50\u6a21\u5757
65.8 +# {0} - branch name
65.9 +MSG_Clone.progress.checkingoutBranch=\u6b63\u5728\u68c0\u51fa "{0}" \u5206\u652f
65.10 +# {0} - branch name
65.11 +MSG_Clone.progress.creatingBranch=\u6b63\u5728\u521b\u5efa "{0}" \u5206\u652f
65.12 +MSG_Clone.progress.fetchingCommits=\u6b63\u5728\u83b7\u53d6\u63d0\u4ea4
65.13 +MSG_Clone.progress.initializingRepository=\u6b63\u5728\u521d\u59cb\u5316\u8d44\u6e90\u5e93
65.14 MSG_Clone.progress.initializingSubmodules=\u6b63\u5728\u521d\u59cb\u5316\u5b50\u6a21\u5757
65.15 +MSG_Clone.progress.refreshingFiles=\u6b63\u5728\u5237\u65b0\u6587\u4ef6
65.16 +MSG_Clone.progress.scanningForProjects=\u6b63\u5728\u626b\u63cf NetBeans \u9879\u76ee
65.17 +# {0} - remote name
65.18 +MSG_Clone.progress.settingRemote=\u6b63\u5728\u8bbe\u7f6e "{0}" \u8fdc\u7a0b
65.19 # {0} - submodule folder
65.20 -MSG_Clone.progress.updatingingSubmodules=\u6b63\u5728\u514b\u9686\u5230\u5b50\u6a21\u5757{0}
65.21 +MSG_Clone.progress.updatingSubmodule=\u5b50\u6a21\u5757{0}
65.22 +MSG_Clone.progress.updatingSubmodules=\u6b63\u5728\u66f4\u65b0\u5b50\u6a21\u5757
65.23 MSG_FetchRefsPanel.errorNoBranchSelected=\u672a\u9009\u62e9\u5206\u652f
65.24 MSG_FetchRefsPanel.warningNoBranchInRepository=\u8d44\u6e90\u5e93\u4e2d\u5c1a\u65e0\u5206\u652f
65.25 # {0} - repository URL
65.26 @@ -90,7 +102,7 @@
65.27 MSG_VALIDATING_DESTINATION=\u6b63\u5728\u9a8c\u8bc1\u76ee\u6807...
65.28
65.29 LBL_FetchBranches.remoteBranches=\u8fdc\u7a0b\u5206\u652f
65.30 -LBL_CloneAction.progressName=\u6b63\u5728\u590d\u5236...
65.31 +LBL_CloneAction.progressName=\u6b63\u5728\u514b\u9686
65.32 MSG_CloneAction.updates.noChange=\u65e0\u66f4\u65b0
65.33 MSG_CloneAction.updates.updateBranch=\u5206\u652f: {0}\n\u65e7 ID: {1}\n\u65b0 ID: {2}\n\u7ed3\u679c: {3}\n
65.34 MSG_CloneAction.updates.updateTag=\u6807\u8bb0: {0}\n\u7ed3\u679c: {1}\n
66.1 --- a/src/zh_CN/ide/git/git/org/netbeans/modules/git/ui/fetch/Bundle_zh_CN.properties Wed Jul 30 05:03:48 2014 -0700
66.2 +++ b/src/zh_CN/ide/git/git/org/netbeans/modules/git/ui/fetch/Bundle_zh_CN.properties Wed Jul 30 05:12:06 2014 -0700
66.3 @@ -66,6 +66,7 @@
66.4 MSG_Err.noUri=\u6ca1\u6709\u4e3a\u8fdc\u7a0b\u5206\u652f{0}\u6307\u5b9a URI
66.5 # {0} - branch name
66.6 MSG_FetchAction.branchDeleted=\u5206\u652f{0}\u5df2\u5220\u9664\u3002
66.7 +MSG_FetchAction.progress.syncBranches=\u6b63\u5728\u540c\u6b65\u8ddf\u8e2a\u5206\u652f
66.8 #FetchBranchesPanel
66.9 MSG_FetchBranchesPanel.loadingBranches=\u6b63\u5728\u52a0\u8f7d\u8fdc\u7a0b\u5206\u652f...
66.10 MSG_FetchBranchesPanel.errorNoBranchSelected=\u672a\u9009\u62e9\u5206\u652f
66.11 @@ -85,6 +86,13 @@
66.12 LBL_PullFromUpstreamAction_PopupName=\u4ece\u4e0a\u6e38\u63d0\u53d6
66.13 # {0} - branch name
66.14 MSG_FetchBranchesStep.toBeDeletedBranch=\u5206\u652f{0}\u5c06\u88ab\u6c38\u4e45\u5220\u9664\u3002
66.15 +# {0} - repository name
66.16 +MSG_FetchFromUpstreamAction.error.noRemote=\u627e\u4e0d\u5230\u8d44\u6e90\u5e93 "{0}" \u7684\u8fdc\u7a0b\u914d\u7f6e\u3002
66.17 +MSG_FetchUtils.noRemoteConfig=\u627e\u4e0d\u5230\u8fdc\u7a0b\u914d\u7f6e
66.18 +# {0} - remote name
66.19 +MSG_FetchUtils.noRemoteUrl={0}\u6ca1\u6709\u8fdc\u7a0b URL
66.20 +# {0} - branch name
66.21 +MSG_FetchUtils.noTrackingBranch="{0}" \u6ca1\u6709\u8ddf\u8e2a\u5206\u652f
66.22 MSG_GetRemoteChangesAction.updates.noChange=\u65e0\u66f4\u65b0
66.23 # {0} - branch name
66.24 # {1} - previous branch head
66.25 @@ -98,9 +106,10 @@
66.26 MSG_PullAction.branchDeleted=\u5206\u652f{0}\u5df2\u5220\u9664\u3002
66.27 MSG_PullAction.fetching=\u83b7\u53d6\u8fdc\u7a0b\u66f4\u6539
66.28 MSG_PullAction.merging=\u5408\u5e76\u8fdc\u7a0b\u66f4\u6539
66.29 +MSG_PullAction.progress.syncBranches=\u6b63\u5728\u540c\u6b65\u8ddf\u8e2a\u5206\u652f
66.30 MSG_PullAction.rebasing=\u91cd\u5b9a\u57fa\u5740\u5230\u83b7\u53d6\u7684\u5934\u4e0a
66.31 # {0} - branch to merge
66.32 -MSG_PullAction_mergeNeeded_text=\u9700\u8981\u5408\u5e76\u63d0\u4ea4, \u624d\u80fd\u5c06\u5f53\u524d\u5206\u652f\u4e0e{0}\u540c\u6b65\u3002\n\n\u662f\u8981\u5c06\u5f53\u524d\u5206\u652f\u4e0e{0}\u5408\u5e76, \u8fd8\u662f\u8981\u5c06\u5176\u91cd\u5b9a\u57fa\u5740\u5230{0}\u4e0a?
66.33 +MSG_PullAction_mergeNeeded_text=\u9700\u8981\u5408\u5e76\u63d0\u4ea4, \u624d\u80fd\u5c06\u5f53\u524d\u5206\u652f\u4e0e{0}\u540c\u6b65\u3002\n\n\u662f\u8981\u5c06\u5f53\u524d\u5206\u652f\u91cd\u5b9a\u57fa\u5740\u5230{0}\u4e0a, \u8fd8\u662f\u8981\u5c06\u5176\u4e0e{0}\u5408\u5e76?
66.34 MSG_PullBranchesPanel.errorNoBranchSelected=\u672a\u9009\u62e9\u5206\u652f, \u8bf7\u9009\u62e9\u8981\u83b7\u53d6\u7684\u5206\u652f
66.35 MSG_PullBranchesPanel.warningMultipleCandidatesToMerge=\u4e0d\u80fd\u5408\u5e76\u591a\u4e2a\u5206\u652f\u3002\u6b63\u5728\u6539\u4e3a\u6267\u884c\u83b7\u53d6\u3002<br>\u8bf7\u6ce8\u610f, \u5c06\u4e0d\u6267\u884c\u5408\u5e76/\u91cd\u5b9a\u57fa\u5740\u3002
66.36 MSG_PullBranchesPanel.warningNoBranchToMerge=\u672a\u9009\u62e9\u8981\u5408\u5e76\u7684\u5206\u652f\u3002\u6b63\u5728\u6539\u4e3a\u6267\u884c\u83b7\u53d6\u3002<br>\u8bf7\u6ce8\u610f, \u5c06\u4e0d\u6267\u884c\u5408\u5e76/\u91cd\u5b9a\u57fa\u5740\u3002
67.1 --- a/src/zh_CN/ide/git/git/org/netbeans/modules/git/ui/history/Bundle_zh_CN.properties Wed Jul 30 05:03:48 2014 -0700
67.2 +++ b/src/zh_CN/ide/git/git/org/netbeans/modules/git/ui/history/Bundle_zh_CN.properties Wed Jul 30 05:12:06 2014 -0700
67.3 @@ -38,6 +38,10 @@
67.4 #
67.5 # Portions Copyrighted 2011 Sun Microsystems, Inc.
67.6
67.7 +ACSD_SearchIncomingT_Top_Component=\u641c\u7d22\u4f20\u5165
67.8 +ACSD_SearchOutgoingT_Top_Component=\u641c\u7d22\u4f20\u5165
67.9 +ACSN_SearchIncomingT_Top_Component=\u641c\u7d22\u4f20\u5165
67.10 +ACSN_SearchOutgoingT_Top_Component=\u641c\u7d22\u4f20\u5165
67.11 BranchSelector.okButton.text=\u786e\u5b9a(&O)
67.12 BranchSelector.title=\u9009\u62e9\u5206\u652f
67.13 CTL_Action.ViewCurrent.name=\u67e5\u770b\u5f53\u524d\u9879
67.14 @@ -52,13 +56,31 @@
67.15 LBL_SearchHistoryTopComponent.title=\u663e\u793a\u5386\u53f2\u8bb0\u5f55 - {0}
67.16
67.17 CTL_UseCommitMessage=\u6d88\u606f(&M):
67.18 +LBL_SearchIncomingAction_Name=\u663e\u793a\u4f20\u5165(&I)
67.19 +LBL_SearchIncomingAction_PopupName=\u663e\u793a\u4f20\u5165
67.20 +# {0} - context name
67.21 +# {1} - branch name
67.22 +LBL_SearchIncomingTopComponent.title=\u663e\u793a\u4f20\u5165 - {0}/{1}
67.23 +LBL_SearchOutgoingAction_Name=\u663e\u793a\u4f20\u51fa(&O)
67.24 +LBL_SearchOutgoingAction_PopupName=\u663e\u793a\u4f20\u51fa
67.25 +# {0} - context name
67.26 +# {1} - branch name
67.27 +LBL_SearchOutgoingTopComponent.title=\u663e\u793a\u4f20\u51fa - {0}/{1}
67.28 LBL_SummaryView.action.diffFiles=\u5728\u201c\u6bd4\u8f83\u201d\u6807\u7b7e\u4e2d\u6253\u5f00\u6240\u9009\u6587\u4ef6
67.29 LBL_SummaryView.action.diffRevisions=\u6bd4\u8f83\u6240\u9009\u4fee\u8ba2\u7248\u672c
67.30 # {0} - revision
67.31 MSG_CheckoutRevision.progress=\u6b63\u5728\u68c0\u51fa{0}
67.32 MSG_IllegalSearchArgument.bothBranchAndTo=\u65e0\u6cd5\u540c\u65f6\u8bbe\u7f6e\u201c\u5206\u652f\u201d\u548c\u201c\u5230\u201d\u53c2\u6570\u3002\n\u8bf7\u53ea\u9009\u62e9\u5176\u4e2d\u4e00\u4e2a\u53c2\u6570\u6216\u8005\u5c06\u201c\u5230\u201d\u6307\u5b9a\u4e3a\u65e5\u671f\u3002
67.33 # {0} - branch name
67.34 +MSG_SearchExecutor.err.branchDoesNotExist=\u5206\u652f "{0}" \u4e0d\u5b58\u5728\u3002
67.35 +# {0} - branch name
67.36 +MSG_SearchExecutor.err.noTrackedBranch=\u8bf7\u9996\u5148\u63a8\u5165\u5206\u652f "{0}", \u7136\u540e\u8bbe\u7f6e\u5176\u8fdc\u7a0b\u8ddf\u8e2a\u3002
67.37 +MSG_SearchExecutor.progress.fetching=\u6b63\u5728\u68c0\u67e5\u8fdc\u7a0b\u8d44\u6e90\u5e93
67.38 +MSG_SearchExecutor.progress.searching=\u6b63\u5728\u641c\u7d22\u63d0\u4ea4
67.39 +# {0} - branch name
67.40 MSG_SearchHistoryPanel.searchAllBranches.text=\u5c06\u5206\u652f\u8fc7\u6ee4\u5668\u66f4\u6539\u4e3a\u6b64\u503c\u6ca1\u6709\u5f71\u54cd, \n\u56e0\u4e3a\u60a8\u5f53\u524d\u4ec5\u5728\u641c\u7d22\u5206\u652f "{0}"\u3002\n\n\u662f\u5426\u8981\u91cd\u65b0\u542f\u52a8\u641c\u7d22\u4ee5\u67e5\u770b\u6240\u6709\u5206\u652f?
67.41 +MSG_SearchIncomingTopComponent.err.noBranch=\u65e0\u6cd5\u5f00\u59cb\u641c\u7d22, \u56e0\u4e3a\u60a8\u5f53\u524d\u4e0d\u5728\u5206\u652f\u4e2d\u3002
67.42 +MSG_SearchOutgoingTopComponent.err.noBranch=\u65e0\u6cd5\u5f00\u59cb\u641c\u7d22, \u56e0\u4e3a\u60a8\u5f53\u524d\u4e0d\u5728\u5206\u652f\u4e2d\u3002
67.43 RepositoryRevision.action.RevertTo=\u8fd8\u539f\u6587\u4ef6
67.44 RepositoryRevision.action.RevertTo.progress=\u6b63\u5728\u8fd8\u539f\u6587\u4ef6
67.45 RepositoryRevision.action.RevertTo.single=\u8fd8\u539f\u6587\u4ef6
68.1 --- a/src/zh_CN/ide/git/git/org/netbeans/modules/git/ui/menu/Bundle_zh_CN.properties Wed Jul 30 05:03:48 2014 -0700
68.2 +++ b/src/zh_CN/ide/git/git/org/netbeans/modules/git/ui/menu/Bundle_zh_CN.properties Wed Jul 30 05:12:06 2014 -0700
68.3 @@ -10,6 +10,8 @@
68.4 CTL_MenuItem_IgnoreMenu.popupName=\u5ffd\u7565
68.5 CTL_MenuItem_RemoteMenu=\u8fdc\u7a0b(&E)
68.6 CTL_MenuItem_RemoteMenu.popup=\u8fdc\u7a0b
68.7 +CTL_MenuItem_RepositoryMenu=\u8d44\u6e90\u5e93(&Y)
68.8 +CTL_MenuItem_RepositoryMenu.popup=\u8d44\u6e90\u5e93
68.9 CTL_MenuItem_RevertMenu=\u8fd8\u539f/\u6062\u590d(&V)
68.10 CTL_MenuItem_RevertMenu.popup=\u8fd8\u539f/\u6062\u590d
68.11 CTL_PopupName.PatchAction=\u5e94\u7528\u6bd4\u8f83\u8865\u4e01\u7a0b\u5e8f...
69.1 --- a/src/zh_CN/ide/git/git/org/netbeans/modules/git/ui/merge/Bundle_zh_CN.properties Wed Jul 30 05:03:48 2014 -0700
69.2 +++ b/src/zh_CN/ide/git/git/org/netbeans/modules/git/ui/merge/Bundle_zh_CN.properties Wed Jul 30 05:12:06 2014 -0700
69.3 @@ -38,9 +38,11 @@
69.4 #
69.5 # Portions Copyrighted 2010 Sun Microsystems, Inc.
69.6
69.7 +LBL_Merge.failed.title=\u65e0\u6cd5\u5408\u5e76
69.8 LBL_MergeRevisionAction_Name=\u5408\u5e76\u4fee\u8ba2(&M)...
69.9 LBL_MergeRevisionAction_PopupName=\u5408\u5e76\u4fee\u8ba2...
69.10 LBL_MergeRevisionAction.progressName=\u6b63\u5728\u5408\u5e76\u5230 HEAD
69.11 +MSG_Merge.failed.aborted.text=\u5408\u5e76\u9700\u8981\u5408\u5e76\u63d0\u4ea4, \u5e76\u4e14\u4e0d\u80fd\u662f\u5feb\u901f\u5411\u524d\u5408\u5e76\u3002\n\n\u662f\u5426\u8981\u91cd\u65b0\u542f\u52a8\u5408\u5e76\u4e14\u5141\u8bb8\u5408\u5e76\u63d0\u4ea4 (--ff \u9009\u9879)?
69.12 MSG_MergeRevisionAction.result=\u5408\u5e76\u7ed3\u679c: {0}\n
69.13 MSG_MergeRevisionAction.result.alreadyUpToDate=HEAD \u5df2\u5305\u542b\u4fee\u8ba2{0}
69.14 MSG_MergeRevisionAction.result.fastForward=\u5c06 HEAD \u4e0e{0}\u5408\u5e76:\n
69.15 @@ -48,8 +50,16 @@
69.16 MSG_MergeRevisionAction.result.conflict=\u5c06 HEAD \u4e0e{0}\u5408\u5e76\u65f6, \u5c06\u5728\u4ee5\u4e0b\u4f4d\u7f6e\u4ea7\u751f\u51b2\u7a81:\n
69.17 MSG_MergeRevisionAction.result.failed=\u65e0\u6cd5\u5c06 HEAD \u4e0e{0}\u5408\u5e76\u3002\u6709\u5173\u66f4\u591a\u4fe1\u606f, \u8bf7\u53c2\u89c1\u8f93\u51fa\u3002
69.18 MSG_MergeRevisionAction.result.failedFiles=\u7531\u4e8e\u4ee5\u4e0b\u6587\u4ef6, \u65e0\u6cd5\u5c06 HEAD \u4e0e{0}\u5408\u5e76:\n
69.19 +MSG_MergeRevisionAction.result.aborted=\u5408\u5e76 HEAD \u548c{0}\u5931\u8d25, \u56e0\u4e3a\u5b83\u9700\u8981\u5408\u5e76\u63d0\u4ea4, \u5e76\u4e14\u4ec5\u5141\u8bb8\u5feb\u901f\u5411\u524d\u5408\u5e76\u3002
69.20 MSG_MergeRevisionAction.result.unsupported=\u4e0d\u652f\u6301\u5408\u5e76\u3002
69.21 LBL_MergeRevision.OKButton.text=\u5408\u5e76(&G)
69.22 LBL_MergeRevision.title=\u5408\u5e76\u4fee\u8ba2
69.23 MergeRevisionPanel.jLabel1.text=\u9009\u62e9\u8981\u5408\u5e76\u5230 HEAD \u4e2d\u7684\u4fee\u8ba2\u7248\u672c
69.24 +MergeRevision.ffoption.ff=\u5982\u679c\u53ef\u80fd, \u8bf7\u4f7f\u7528\u5feb\u901f\u5411\u524d (--ff)
69.25 +MergeRevision.ffoption.ff.tt=\u5982\u679c\u53ef\u80fd, \u5408\u5e76\u5c06\u4e0d\u4f1a\u521b\u5efa\u65b0\u63d0\u4ea4, \u800c\u4f1a\u5c06\u5206\u652f\u79fb\u81f3\u5408\u5e76\u63d0\u4ea4\u3002
69.26 +MergeRevision.ffoption.ffonly=\u4ec5\u5feb\u901f\u5411\u524d (--ff-only)
69.27 +MergeRevision.ffoption.ffonly.tt=\u5982\u679c\u9700\u8981\u5408\u5e76\u63d0\u4ea4, \u5408\u5e76\u5c06\u5931\u8d25 (\u4e24\u4e2a\u5206\u652f\u5404\u6709\u81ea\u5df1\u7684\u63d0\u4ea4)
69.28 +MergeRevision.ffoption.noff=\u59cb\u7ec8\u521b\u5efa\u63d0\u4ea4 (--no-ff)
69.29 +MergeRevision.ffoption.noff.tt=\u5408\u5e76\u5c06\u59cb\u7ec8\u521b\u5efa\u5408\u5e76\u63d0\u4ea4, \u8fd9\u9002\u7528\u4e8e\u5408\u5e76\u529f\u80fd\u5206\u652f\u3002
69.30 +MergeRevisionPanel.ffModePanel.text=\u9009\u62e9\u5feb\u901f\u5411\u524d\u6a21\u5f0f
69.31
70.1 --- a/src/zh_CN/ide/git/git/org/netbeans/modules/git/ui/repository/Bundle_zh_CN.properties Wed Jul 30 05:03:48 2014 -0700
70.2 +++ b/src/zh_CN/ide/git/git/org/netbeans/modules/git/ui/repository/Bundle_zh_CN.properties Wed Jul 30 05:12:06 2014 -0700
70.3 @@ -40,8 +40,17 @@
70.4
70.5 #GitRepositoryTopComponent
70.6 CTL_Repository_TopComponent_Title=Git \u8d44\u6e90\u5e93\u6d4f\u89c8\u5668
70.7 +CTL_TagNode.deleteTag.action=\u5220\u9664\u6807\u8bb0...
70.8 +# {0} - branch name
70.9 +LBL_AutosyncBranchAction_PopupName=\u81ea\u52a8\u4e0e "{0}" \u540c\u6b65
70.10 +# {0} - tracked branch
70.11 +LBL_BranchNode.basedOn=\ (\u57fa\u4e8e{0})
70.12 +# {0} - tracking status
70.13 +
70.14 # {0} - branch name
70.15 LBL_DiffToTrackedBranchAction_PopupName=\u4e0e "{0}" \u6bd4\u8f83
70.16 +LBL_OpenConfigurationAction_Name=\u6253\u5f00\u914d\u7f6e(&G)
70.17 +LBL_OpenConfigurationAction_PopupName=\u6253\u5f00\u914d\u7f6e
70.18 LBL_RepositoryBrowserAction_Name=\u8d44\u6e90\u5e93\u6d4f\u89c8\u5668(&Y)
70.19 LBL_RepositoryBrowserAction_PopupName=\u8d44\u6e90\u5e93\u6d4f\u89c8\u5668
70.20 #RepositoryPanel
70.21 @@ -52,13 +61,26 @@
70.22 LBL_Revision.HEAD.name=HEAD
70.23 LBL_Revision.LOCAL.name=\u672c\u5730\u66f4\u6539
70.24 LBL_SetTrackedBranchAction_PopupName=\u8bbe\u7f6e\u8ddf\u8e2a\u7684\u5206\u652f
70.25 +# {0} - branch name
70.26 +LBL_SyncBranchAction_PopupName=\u4e0e "{0}" \u540c\u6b65
70.27 +LBL_TagNode.deleteTag.confirmation=\u5220\u9664\u6807\u8bb0
70.28 +# {0} - branch name
70.29 +# {1} - remote branch name
70.30 +MSG_AutosyncBranchAction_progress=\u6b63\u5728\u540c\u6b65 "{0}" \u548c "{1}"
70.31 MSG_BranchMergeStatus.merged=\ [\u5df2\u5408\u5e76]
70.32 +# {0} - tracked branch name
70.33 +MSG_BranchNode.trackingStatus.ahead=\u65e9\u4e8e "{0}"
70.34 +# {0} - tracked branch name
70.35 +MSG_BranchNode.trackingStatus.behind=\u665a\u4e8e "{0}"
70.36 +# {0} - tracked branch name
70.37 +MSG_BranchNode.trackingStatus.inSync=\u4e0e "{0}" \u540c\u6b65
70.38 +# {0} - tracked branch name
70.39 +MSG_BranchNode.trackingStatus.merge=\u4e0e "{0}" \u5408\u5e76
70.40 MSG_RepositoryPanel.refreshingBranches=\u6b63\u5728\u5237\u65b0\u5206\u652f
70.41 LBL_RepositoryPanel.TagsNode.name=\u6807\u8bb0
70.42 LBL_RepositoryPanel.RefreshTagsAction.name=\u5237\u65b0\u6807\u8bb0
70.43 MSG_RepositoryPanel.refreshingTags=\u6b63\u5728\u5237\u65b0\u6807\u8bb0
70.44 LBL_RepositoryBrowser.tagNode.showDetails=\u663e\u793a\u8be6\u7ec6\u4fe1\u606f
70.45 -LBL_BranchNode.basedOn=\ (\u57fa\u4e8e{0})
70.46 MSG_BranchNode.tracking.inSync=\u4e0e{0}\u540c\u6b65
70.47 MSG_BranchNode.tracking.behind.commit=\u7531{1}\u665a\u4e8e{0}\u63d0\u4ea4\u3002
70.48 MSG_BranchNode.tracking.behind.commits=\u7531{1}\u665a\u4e8e{0}\u63d0\u4ea4\u3002
70.49 @@ -70,8 +92,12 @@
70.50 MSG_RepositoryPanel.refreshingRemotes=\u6b63\u5728\u5237\u65b0 Remotes
70.51 LBL_RepositoryPanel.RemotesNode.refresh=\u5237\u65b0 Remotes
70.52 LBL_RepositoryPanel.RemoteNode.remove=\u5220\u9664
70.53 -MSG_RevisionDialog.selectBranch=\u9009\u62e9\u5206\u652f
70.54 +MSG_RevisionDialog.noBranches=\u65e0\u5206\u652f
70.55 MSG_RevisionMerged.status=\ [\u5df2\u5408\u5e76]
70.56 +# {0} - tag name
70.57 +MSG_TagNode.deleteTag.confirmation=\u662f\u5426\u786e\u5b9e\u8981\u5220\u9664\u6807\u8bb0{0}?
70.58 +MSG_TagNode.deleteTag.progress=\u6b63\u5728\u5220\u9664\u6807\u8bb0
70.59 +RepoBrowserPanel.DeleteAction.name=\u5220\u9664
70.60 RevisionDialogController.loadingBranches=\u6b63\u5728\u52a0\u8f7d\u5206\u652f...
70.61 #RevisionInfoPanel
70.62 RevisionInfoPanel.jLabel1.text=\u63d0\u4ea4 ID(&I):
71.1 --- a/src/zh_CN/ide/git/git/org/netbeans/modules/git/ui/status/Bundle_zh_CN.properties Wed Jul 30 05:03:48 2014 -0700
71.2 +++ b/src/zh_CN/ide/git/git/org/netbeans/modules/git/ui/status/Bundle_zh_CN.properties Wed Jul 30 05:12:06 2014 -0700
71.3 @@ -39,6 +39,7 @@
71.4 # Portions Copyrighted 2010 Sun Microsystems, Inc.
71.5
71.6 CTL_GitStatusTable.popup.initializing=\u6b63\u5728\u521d\u59cb\u5316...
71.7 +CTL_MenuItem_OpenStatusAction=\u6253\u5f00\u72b6\u6001\u7a97\u53e3
71.8 LBL_StatusAction.popupName=\u663e\u793a\u66f4\u6539
71.9 LBL_ScanningStatuses=\u6b63\u5728\u5237\u65b0\u72b6\u6001...
71.10
71.11 @@ -71,4 +72,6 @@
71.12 MSG_No_Changes_HeadIndex=<\u65e0 HEAD/\u7d22\u5f15\u66f4\u6539>
71.13 MSG_No_Changes_HeadWorking=<\u65e0 HEAD/\u5de5\u4f5c\u6811\u66f4\u6539>
71.14 MSG_No_Changes_IndexWorking=<\u65e0\u7d22\u5f15/\u5de5\u4f5c\u6811\u66f4\u6539>
71.15 +CTL_listButton.toolTipText=\u5c06\u7ed3\u679c\u663e\u793a\u4e3a\u8868
71.16 +CTL_treeButton.toolTipText=\u5c06\u7ed3\u679c\u663e\u793a\u4e3a\u6811
71.17
72.1 --- a/src/zh_CN/ide/gsf-codecoverage/gsf-codecoverage/org/netbeans/modules/gsf/codecoverage/Bundle_zh_CN.properties Wed Jul 30 05:03:48 2014 -0700
72.2 +++ b/src/zh_CN/ide/gsf-codecoverage/gsf-codecoverage/org/netbeans/modules/gsf/codecoverage/Bundle_zh_CN.properties Wed Jul 30 05:12:06 2014 -0700
72.3 @@ -29,8 +29,8 @@
72.4 CoverageSideBar.allTestsButton.text=\u6240\u6709\u6d4b\u8bd5
72.5 CoverageSideBar.testButton.text=\u6d4b\u8bd5
72.6 CoverageSideBar.reportButton.text=\u62a5\u544a...
72.7 -CoverageSideBar.jButton1.text=\u5b8c\u6210
72.8 -CoverageReportTopComponent.doneButton.text=\u5b8c\u6210(&O)
72.9 +CoverageSideBar.jButton1.text=\u7981\u7528
72.10 +CoverageReportTopComponent.doneButton.text=\u7981\u7528(&I)
72.11 CoverageReportTopComponent.allTestsButton.text=\u8fd0\u884c\u6240\u6709\u6d4b\u8bd5(&L)
72.12
72.13 CoverageAction.MenuName=\u4ee3\u7801\u8986\u76d6\u7387(&G)
73.1 --- a/src/zh_CN/ide/javascript2-editor/javascript2-editor/org/netbeans/modules/javascript2/editor/Bundle_zh_CN.properties Wed Jul 30 05:03:48 2014 -0700
73.2 +++ b/src/zh_CN/ide/javascript2-editor/javascript2-editor/org/netbeans/modules/javascript2/editor/Bundle_zh_CN.properties Wed Jul 30 05:12:06 2014 -0700
73.3 @@ -111,4 +111,5 @@
73.4 LBL_JsonEditorTab=\u6e90(&S)
73.5
73.6 MSG_DocNotAvailable=\u627e\u4e0d\u5230\u6587\u6863\u3002
73.7 +MSG_ItemFromUsageDoc=\u6b64\u9879\u53ef\u4ee5\u662f\u4e0d\u76f8\u5173\u7684\u3002\u5b83\u4ece\u5b8c\u6574\u9879\u76ee\u540d\u7528\u6cd5\u4e2d\u83b7\u53d6\u3002
73.8
74.1 --- a/src/zh_CN/ide/javascript2-editor/javascript2-editor/org/netbeans/modules/javascript2/editor/formatter/ui/Bundle_zh_CN.properties Wed Jul 30 05:03:48 2014 -0700
74.2 +++ b/src/zh_CN/ide/javascript2-editor/javascript2-editor/org/netbeans/modules/javascript2/editor/formatter/ui/Bundle_zh_CN.properties Wed Jul 30 05:12:06 2014 -0700
74.3 @@ -71,6 +71,7 @@
74.4
74.5
74.6 LBL_BeforeParentheses=\u5728\u5706\u62ec\u53f7\u4e4b\u524d
74.7 +LBL_spaceBeforeAnonMethodDeclParen=\u533f\u540d\u51fd\u6570\u58f0\u660e
74.8 LBL_spaceBeforeMethodDeclParen=\u51fd\u6570\u58f0\u660e
74.9 LBL_spaceBeforeMethodCallParen=\u51fd\u6570\u8c03\u7528
74.10
75.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
75.2 +++ b/src/zh_CN/ide/javascript2-prototypejs/javascript2-prototypejs/org/netbeans/modules/javascript2/prototypejs/Bundle_zh_CN.properties Wed Jul 30 05:12:06 2014 -0700
75.3 @@ -0,0 +1,5 @@
75.4 +OpenIDE-Module-Display-Category=JavaScript
75.5 +OpenIDE-Module-Long-Description=\u5bf9 PrototypeJs \u6846\u67b6\u7684\u7f16\u8f91\u5668\u652f\u6301\u3002\u6709\u5173\u6b64\u6846\u67b6\u7684\u8be6\u7ec6\u4fe1\u606f, \u8bf7\u8bbf\u95ee http://prototypejs.org/\u3002
75.6 +OpenIDE-Module-Name=JavaScript2 PrototypeJs
75.7 +OpenIDE-Module-Short-Description=PrototypeJs \u652f\u6301
75.8 +
76.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
76.2 +++ b/src/zh_CN/ide/javascript2-requirejs/javascript2-requirejs/org/netbeans/modules/javascript2/requirejs/Bundle_zh_CN.properties Wed Jul 30 05:12:06 2014 -0700
76.3 @@ -0,0 +1,9 @@
76.4 +doc.building=\u6b63\u5728\u52a0\u8f7d RequireJS \u6587\u6863
76.5 +# {0} - the documentation URL
76.6 +doc.cannotGet=\u65e0\u6cd5\u4ece "{0}" \u4e2d\u52a0\u8f7d RequireJS \u6587\u6863\u3002
76.7 +doc.notFound=\u627e\u4e0d\u5230\u6587\u6863\u3002
76.8 +OpenIDE-Module-Display-Category=JavaScript
76.9 +OpenIDE-Module-Long-Description=\u5bf9 RequireJs \u6846\u67b6\u7684\u7f16\u8f91\u5668\u652f\u6301
76.10 +OpenIDE-Module-Name=JavaScript2 RequiereJs
76.11 +OpenIDE-Module-Short-Description=RequireJs \u652f\u6301
76.12 +
77.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
77.2 +++ b/src/zh_CN/ide/javascript2-requirejs/javascript2-requirejs/org/netbeans/modules/javascript2/requirejs/editor/Bundle_zh_CN.properties Wed Jul 30 05:12:06 2014 -0700
77.3 @@ -0,0 +1,6 @@
77.4 +mappedFile=\u6587\u4ef6
77.5 +mappedFolder=\u6587\u4ef6\u5939
77.6 +mappedToVirtual=\u6620\u5c04\u5230\u4e0d\u5b58\u5728\u7684\u6587\u4ef6\u5939/\u6587\u4ef6\u3002
77.7 +mappingTo=\u6620\u5c04\u5230
77.8 +pluginNameDoc=\u52a0\u8f7d\u5668\u63d2\u4ef6
77.9 +
78.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
78.2 +++ b/src/zh_CN/ide/javascript2-requirejs/javascript2-requirejs/org/netbeans/modules/javascript2/requirejs/ui/Bundle_zh_CN.properties Wed Jul 30 05:12:06 2014 -0700
78.3 @@ -0,0 +1,63 @@
78.4 +
78.5 +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
78.6 +
78.7 +# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
78.8 +
78.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
78.10 +# Other names may be trademarks of their respective owners.
78.11 +
78.12 +# The contents of this file are subject to the terms of either the GNU
78.13 +# General Public License Version 2 only ("GPL") or the Common
78.14 +# Development and Distribution License("CDDL") (collectively, the
78.15 +# "License"). You may not use this file except in compliance with the
78.16 +# License. You can obtain a copy of the License at
78.17 +# http://www.netbeans.org/cddl-gplv2.html
78.18 +# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
78.19 +# specific language governing permissions and limitations under the
78.20 +# License. When distributing the software, include this License Header
78.21 +# Notice in each file and include the License file at
78.22 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
78.23 +# particular file as subject to the "Classpath" exception as provided
78.24 +# by Oracle in the GPL Version 2 section of the License file that
78.25 +# accompanied this code. If applicable, add the following below the
78.26 +# License Header, with the fields enclosed by brackets [] replaced by
78.27 +# your own identifying information:
78.28 +# "Portions Copyrighted [year] [name of copyright owner]"
78.29 +
78.30 +# If you wish your version of this file to be governed by only the CDDL
78.31 +# or only the GPL Version 2, indicate your decision by adding
78.32 +# "[Contributor] elects to include this software in this distribution
78.33 +# under the [CDDL or GPL Version 2] license." If you do not indicate a
78.34 +# single choice of license, a recipient has the option to distribute
78.35 +# your version of this file under either the CDDL, the GPL Version 2 or
78.36 +# to extend the choice of license to its licensees as provided above.
78.37 +# However, if you add GPL Version 2 code and therefore, elected the GPL
78.38 +# Version 2 license, then the option applies only if the new code is
78.39 +# made subject to such option by the copyright holder.
78.40 +
78.41 +# Contributor(s):
78.42 +
78.43 +# Portions Copyrighted 2011 Sun Microsystems, Inc.
78.44 +
78.45 +RequireJsCustomizer.displayName=RequireJs
78.46 +# customizer panel
78.47 +RequireJsPanel.enabledCheckBox.text=\u542f\u7528(&E)
78.48 +RequireJsPanel.enabledInfoLabel.text=\u5728\u6b64\u9879\u76ee\u4e2d\u542f\u7528\u5bf9 RequireJS \u7684\u652f\u6301
78.49 +RequireJsPanel.pathMappingInfoLabel.text=\u8def\u5f84\u6620\u5c04\u4ee5\u53ca\u672c\u5730\u6587\u4ef6\u548c\u6587\u4ef6\u5939\u7684\u5df2\u77e5\u7528\u4f8b
78.50 +RequireJsPanel.removePathMappingButton.text=\u5220\u9664(&R)
78.51 +RequireJsPanel.newPathMappingButton.text=\u65b0\u5efa(&N)
78.52 +RequireJsPanel.pathMappingLabel.text=\u8def\u5f84\u6620\u5c04(&M):
78.53 +
78.54 +LBL_Mapping=\u6a21\u5757
78.55 +LBL_LocalPath=\u672c\u5730\u8def\u5f84
78.56 +
78.57 +
78.58 +LocalPathCell.AccessibleContext.accessibleName=\u672c\u5730\u8def\u5f84\u7ec4\u4ef6
78.59 +LocalPathCell.AccessibleContext.accessibleDescription=\u8868\u793a\u672c\u5730\u8def\u5f84\u7684\u7ec4\u4ef6\u3002
78.60 +LocalPathCell.localPathTextField.AccessibleContext.accessibleDescription=\u6587\u4ef6\u8def\u5f84\u3002
78.61 +LocalPathCell.localPathTextField.AccessibleContext.accessibleName=\u6587\u4ef6\u8def\u5f84
78.62 +LocalPathCell.localPathBrowseButton.AccessibleContext.accessibleDescription=\u5355\u51fb\u53ef\u6d4f\u89c8\u672c\u5730\u8def\u5f84\u3002
78.63 +LocalPathCell.localPathBrowseButton.AccessibleContext.accessibleName=\u201c\u6d4f\u89c8\u201d\u6309\u94ae
78.64 +
78.65 +
78.66 +
79.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
79.2 +++ b/src/zh_CN/ide/jumpto/jumpto/org/netbeans/modules/jumpto/common/Bundle_zh_CN.properties Wed Jul 30 05:12:06 2014 -0700
79.3 @@ -0,0 +1,41 @@
79.4 +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
79.5 +#
79.6 +# Copyright 2014 Oracle and/or its affiliates. All rights reserved.
79.7 +#
79.8 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
79.9 +# Other names may be trademarks of their respective owners.
79.10 +#
79.11 +# The contents of this file are subject to the terms of either the GNU
79.12 +# General Public License Version 2 only ("GPL") or the Common
79.13 +# Development and Distribution License("CDDL") (collectively, the
79.14 +# "License"). You may not use this file except in compliance with the
79.15 +# License. You can obtain a copy of the License at
79.16 +# http://www.netbeans.org/cddl-gplv2.html
79.17 +# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
79.18 +# specific language governing permissions and limitations under the
79.19 +# License. When distributing the software, include this License Header
79.20 +# Notice in each file and include the License file at
79.21 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
79.22 +# particular file as subject to the "Classpath" exception as provided
79.23 +# by Oracle in the GPL Version 2 section of the License file that
79.24 +# accompanied this code. If applicable, add the following below the
79.25 +# License Header, with the fields enclosed by brackets [] replaced by
79.26 +# your own identifying information:
79.27 +# "Portions Copyrighted [year] [name of copyright owner]"
79.28 +#
79.29 +# If you wish your version of this file to be governed by only the CDDL
79.30 +# or only the GPL Version 2, indicate your decision by adding
79.31 +# "[Contributor] elects to include this software in this distribution
79.32 +# under the [CDDL or GPL Version 2] license." If you do not indicate a
79.33 +# single choice of license, a recipient has the option to distribute
79.34 +# your version of this file under either the CDDL, the GPL Version 2 or
79.35 +# to extend the choice of license to its licensees as provided above.
79.36 +# However, if you add GPL Version 2 code and therefore, elected the GPL
79.37 +# Version 2 license, then the option applies only if the new code is
79.38 +# made subject to such option by the copyright holder.
79.39 +#
79.40 +# Contributor(s):
79.41 +#
79.42 +# Portions Copyrighted 2014 Sun Microsystems, Inc.
79.43 +TXT_IllegalContent=\u975e\u6cd5\u5185\u5bb9
79.44 +
80.1 --- a/src/zh_CN/ide/jumpto/jumpto/org/netbeans/modules/jumpto/file/Bundle_zh_CN.properties Wed Jul 30 05:03:48 2014 -0700
80.2 +++ b/src/zh_CN/ide/jumpto/jumpto/org/netbeans/modules/jumpto/file/Bundle_zh_CN.properties Wed Jul 30 05:12:06 2014 -0700
80.3 @@ -62,6 +62,7 @@
80.4 TXT_NoTypesFound=<\u627e\u4e0d\u5230\u6587\u4ef6>
80.5 TXT_SyntaxError ={0}\u4f4d\u4e8e: {1}
80.6 TXT_SearchingOtherProjects=\u6b63\u5728\u641c\u7d22\u5176\u4ed6\u9879\u76ee...
80.7 +TXT_PartialResults=\u90e8\u5206\u7ed3\u679c, \u6b63\u5728\u641c\u7d22...
80.8
80.9 LBL_HiddenFiles=\u663e\u793a\u9690\u85cf\u6587\u4ef6(&H)
80.10 LBL_PreferMainProject=\u9996\u9009\u5f53\u524d\u9879\u76ee(&P)
81.1 --- a/src/zh_CN/ide/mercurial/mercurial/org/netbeans/modules/mercurial/ui/update/Bundle_zh_CN.properties Wed Jul 30 05:03:48 2014 -0700
81.2 +++ b/src/zh_CN/ide/mercurial/mercurial/org/netbeans/modules/mercurial/ui/update/Bundle_zh_CN.properties Wed Jul 30 05:12:06 2014 -0700
81.3 @@ -48,7 +48,6 @@
81.4 CTL_MenuItem_GetClean=\u8fd8\u539f\u4fee\u6539(&R)
81.5
81.6 Diff.titleWorkingFile=\u672c\u5730\u5de5\u4f5c\u6587\u4ef6
81.7 -Diff.titleRevision=\u4fee\u8ba2 {0}
81.8 Merge.titleResult=\u5408\u5e76\u540e\u7684\u7ed3\u679c
81.9
81.10 MSG_NoConflictsFound=\u672a\u53d1\u73b0\u51b2\u7a81!
82.1 --- a/src/zh_CN/ide/org-netbeans-libs-git/org-netbeans-libs-git/org/netbeans/libs/git/Bundle_zh_CN.properties Wed Jul 30 05:03:48 2014 -0700
82.2 +++ b/src/zh_CN/ide/org-netbeans-libs-git/org-netbeans-libs-git/org/netbeans/libs/git/Bundle_zh_CN.properties Wed Jul 30 05:12:06 2014 -0700
82.3 @@ -53,6 +53,8 @@
82.4 LBL_RepositoryInfo_Rebasing = \u91cd\u5b9a\u57fa\u5740
82.5 LBL_RepositoryInfo_Apply = \u5e94\u7528
82.6 LBL_RepositoryInfo_Bisecting = \u7b49\u5206
82.7 +LBL_RepositoryInfo_CherryPicking=\u6b63\u5728\u6311\u9009
82.8 +LBL_RepositoryInfo_CherryPickingResolved=\u5df2\u6311\u9009
82.9
82.10 #GitException
82.11 MSG_Exception_ObjectDoesNotExist = {0} [{1}] \u4e0d\u5b58\u5728
83.1 --- a/src/zh_CN/ide/org-netbeans-libs-git/org-netbeans-libs-git/org/netbeans/libs/git/jgit/commands/Bundle_zh_CN.properties Wed Jul 30 05:03:48 2014 -0700
83.2 +++ b/src/zh_CN/ide/org-netbeans-libs-git/org-netbeans-libs-git/org/netbeans/libs/git/jgit/commands/Bundle_zh_CN.properties Wed Jul 30 05:12:06 2014 -0700
83.3 @@ -54,7 +54,9 @@
83.4 MSG_Error_RepositoryExists = Git \u8d44\u6e90\u5e93\u5728{0}\u4e2d\u5df2\u5b58\u5728: {1}
83.5 MSG_Error_CannotCatRoot = \u65e0\u6cd5\u663e\u793a\u6839\u76ee\u5f55: {0}
83.6 MSG_Error_Commit_ConflictsInIndex = \u7d22\u5f15\u5305\u542b\u53d1\u751f\u51b2\u7a81\u7684\u6587\u4ef6, \u8bf7\u5728\u63d0\u4ea4\u4e4b\u524d\u89e3\u51b3\u8fd9\u4e9b\u51b2\u7a81
83.7 +MSG_Error_Commit_CannotAmend=\u65e0\u6cd5\u5728\u6b64\u8d44\u6e90\u5e93\u72b6\u6001\u4e0b\u4fee\u6539\u63d0\u4ea4\u3002
83.8 MSG_Error_Commit_PartialCommitAfterMerge = \u65e0\u6cd5\u5728\u5408\u5e76\u671f\u95f4\u6267\u884c\u90e8\u5206\u63d0\u4ea4\u3002
83.9 MSG_Error_Commit_NotAllowedInCurrentState = \u65e0\u6cd5\u5728\u5f53\u524d\u72b6\u6001\u4e0b\u63d0\u4ea4: {0}
83.10 MSG_Error_UpdateTracking_InvalidReference=\u5f15\u7528\u65e0\u6548: {0}
83.11 +MSG_Warning_FileMayBeSymlink = \u6587\u4ef6{0}\u53ef\u80fd\u662f\u7b26\u53f7\u94fe\u63a5, \u5c06\u5c1d\u8bd5\u89c4\u8303\u5316\u3002
83.12
84.1 --- a/src/zh_CN/ide/refactoring-api/refactoring-api/org/netbeans/modules/refactoring/plugins/Bundle_zh_CN.properties Wed Jul 30 05:03:48 2014 -0700
84.2 +++ b/src/zh_CN/ide/refactoring-api/refactoring-api/org/netbeans/modules/refactoring/plugins/Bundle_zh_CN.properties Wed Jul 30 05:12:06 2014 -0700
84.3 @@ -43,7 +43,8 @@
84.4 TXT_CopyFile=\u590d\u5236\u6587\u4ef6{0}
84.5 TXT_DeleteFile=\u5220\u9664\u6587\u4ef6{0}
84.6 TXT_MoveFile=\u79fb\u52a8\u6587\u4ef6{0}
84.7 -TXT_RenameFile=\u91cd\u547d\u540d\u6587\u4ef6{0}
84.8 TXT_DeletePackage=\u5220\u9664\u5305{0}
84.9 TXT_DeleteFolder=\u5220\u9664\u6587\u4ef6\u5939 {0}
84.10 +TXT_RenameFile=\u91cd\u547d\u540d\u6587\u4ef6{0}
84.11 +TXT_RenameFolder=\u91cd\u547d\u540d\u6587\u4ef6\u5939 {0}
84.12
85.1 --- a/src/zh_CN/ide/subversion/subversion/org/netbeans/modules/subversion/options/Bundle_zh_CN.properties Wed Jul 30 05:03:48 2014 -0700
85.2 +++ b/src/zh_CN/ide/subversion/subversion/org/netbeans/modules/subversion/options/Bundle_zh_CN.properties Wed Jul 30 05:12:06 2014 -0700
85.3 @@ -136,4 +136,5 @@
85.4 KW_Colors=\u989c\u8272
85.5 SvnOptionsPanel.jLabel6.TTtext=\u4f7f\u7528\u6b64\u6309\u94ae\u53ef\u7ba1\u7406\u4ee5\u524d\u4f7f\u7528\u7684\u6240\u6709 URL \u7684\u8fde\u63a5\u8bbe\u7f6e\u3002
85.6 SvnOptionsPanel.jLabel10.TTtext=\u9009\u62e9\u8981\u7528\u4e8e\u8fd0\u884c Subversion \u547d\u4ee4\u7684\u9996\u9009\u5ba2\u6237\u7aef
85.7 +SvnOptionsPanel.cbDetermineBranches.text=\u5141\u8bb8\u63a8\u6d4b\u6587\u4ef6\u6240\u5c5e\u7684\u5206\u652f\u6216\u6807\u8bb0\u3002
85.8
86.1 --- a/src/zh_CN/ide/team-ide/team-ide/org/netbeans/modules/team/ide/Bundle_zh_CN.properties Wed Jul 30 05:03:48 2014 -0700
86.2 +++ b/src/zh_CN/ide/team-ide/team-ide/org/netbeans/modules/team/ide/Bundle_zh_CN.properties Wed Jul 30 05:12:06 2014 -0700
86.3 @@ -58,6 +58,7 @@
86.4 LBL_Apply=\u5e94\u7528
86.5 LBL_ApplyPatch=\u5e94\u7528\u8865\u4e01\u7a0b\u5e8f
86.6 LBL_Cancel=\u53d6\u6d88
86.7 +LBL_Select=\u9009\u62e9
86.8
86.9 # {0} - name of the patch file
86.10 MSG_ApplyPatch.progress=\u6b63\u5728\u5e94\u7528\u8865\u4e01\u7a0b\u5e8f{0}
87.1 --- a/src/zh_CN/ide/terminal/terminal/org/netbeans/modules/terminal/Bundle_zh_CN.properties Wed Jul 30 05:03:48 2014 -0700
87.2 +++ b/src/zh_CN/ide/terminal/terminal/org/netbeans/modules/terminal/Bundle_zh_CN.properties Wed Jul 30 05:12:06 2014 -0700
87.3 @@ -82,7 +82,7 @@
87.4 TermOptionsPanel.previewLabel.text=\u9884\u89c8(&P):
87.5 TermOptionsPanel.lineWrapCheckBox.text=\u81ea\u52a8\u6362\u884c(&W)
87.6 TermOptionsPanel.restoreButton.text=\u6062\u590d(&R)
87.7 -TermOptionsPanel.scrollOnInputCheckBox.text=\u8f93\u5165\u65f6\u6eda\u52a8(&I)
87.8 +TermOptionsPanel.scrollOnInputCheckBox.text=\u8f93\u5165\u65f6\u6eda\u52a8(&L)
87.9 TermOptionsPanel.scrollOnOutputCheckBox.text=\u8f93\u51fa\u65f6\u6eda\u52a8(&O)
87.10 TermOptionsPanel.selectionLabel.text=\u9009\u533a\u80cc\u666f\u8272(&E):
87.11 TermOptionsPanel.tabSizeLabel.text=\u5236\u8868\u7b26\u5927\u5c0f(&A):
88.1 --- a/src/zh_CN/ide/terminal/terminal/org/netbeans/modules/terminal/ioprovider/Bundle_zh_CN.properties Wed Jul 30 05:03:48 2014 -0700
88.2 +++ b/src/zh_CN/ide/terminal/terminal/org/netbeans/modules/terminal/ioprovider/Bundle_zh_CN.properties Wed Jul 30 05:12:06 2014 -0700
88.3 @@ -4,6 +4,8 @@
88.4 CTL_Paste=\u7c98\u8d34
88.5 CTL_Find=\u67e5\u627e
88.6 CTL_Wrap=\u81ea\u52a8\u6362\u884c
88.7 +CTL_LargerFont=\u8f83\u5927\u5b57\u4f53
88.8 +CTL_SmallerFont=\u8f83\u5c0f\u5b57\u4f53
88.9 CTL_SetTitle=\u8bbe\u7f6e\u6807\u9898...
88.10 LBL_SetTitle=\u8bbe\u7f6e\u6807\u9898
88.11 LBL_Title=\u6807\u9898
89.1 --- a/src/zh_CN/ide/versioning-util/versioning-util/org/netbeans/modules/versioning/shelve/Bundle_zh_CN.properties Wed Jul 30 05:03:48 2014 -0700
89.2 +++ b/src/zh_CN/ide/versioning-util/versioning-util/org/netbeans/modules/versioning/shelve/Bundle_zh_CN.properties Wed Jul 30 05:12:06 2014 -0700
89.3 @@ -38,11 +38,12 @@
89.4 #
89.5 # Portions Copyrighted 2011 Sun Microsystems, Inc.
89.6
89.7 +# {0} - invalid character
89.8 +ShelveChangesPanel.lblError.invalidCharacters=\u8865\u4e01\u7a0b\u5e8f\u540d\u79f0\u4e0d\u80fd\u5305\u542b "{0}"\u3002
89.9 ShelveChangesPanel.lblPatchName.text=\u8865\u4e01\u7a0b\u5e8f\u540d\u79f0(&P):
89.10
89.11 ShelveChangesPanel.lblPatchName.TTtext=\u5305\u542b\u66f4\u6539\u7684\u8865\u4e01\u7a0b\u5e8f\u7684\u540d\u79f0
89.12 ShelveChangesPanel.lblError.text=\u5177\u6709\u9009\u5b9a\u540d\u79f0\u7684\u8865\u4e01\u7a0b\u5e8f\u5df2\u5b58\u5728\u3002
89.13 -ShelveChangesPanel.lblError.spaces=\u8865\u4e01\u7a0b\u5e8f\u540d\u79f0\u4e0d\u80fd\u5305\u542b\u7a7a\u5b57\u7b26\u3002
89.14 CTL_ShelveChangesPanel.okButton.text=\u6401\u7f6e(&S)
89.15 LBL_ShelveChangesPanel.title=\u6401\u7f6e\u66f4\u6539
89.16 ShelveChangesPanel.jLabel1.text=\u9009\u62e9\u5c06\u6807\u8bc6\u6401\u7f6e\u7684\u66f4\u6539\u7684\u552f\u4e00\u540d\u79f0\u3002
90.1 --- a/src/zh_CN/ide/versioning-util/versioning-util/org/netbeans/modules/versioning/util/common/Bundle_zh_CN.properties Wed Jul 30 05:03:48 2014 -0700
90.2 +++ b/src/zh_CN/ide/versioning-util/versioning-util/org/netbeans/modules/versioning/util/common/Bundle_zh_CN.properties Wed Jul 30 05:12:06 2014 -0700
90.3 @@ -99,4 +99,5 @@
90.4 CTL_MenuItem_Cut=\u526a\u5207(&T)
90.5 CTL_MenuItem_Copy=\u590d\u5236(&Y)
90.6 CTL_MenuItem_Paste=\u7c98\u8d34(&P)
90.7 +VCSCommitPanel.DiffTab.name=\u6bd4\u8f83
90.8
91.1 --- a/src/zh_CN/ide/web-common/web-common/org/netbeans/modules/web/common/api/Bundle_zh_CN.properties Wed Jul 30 05:03:48 2014 -0700
91.2 +++ b/src/zh_CN/ide/web-common/web-common/org/netbeans/modules/web/common/api/Bundle_zh_CN.properties Wed Jul 30 05:12:06 2014 -0700
91.3 @@ -45,3 +45,15 @@
91.4 # {2} browser family [string]
91.5 USG_PROJECT_BROWSER=\u5df2\u4f7f\u7528\u9879\u76ee\u6d4f\u89c8\u5668 [\u9879\u76ee\u7c7b\u578b: {0}, \u6d4f\u89c8\u5668 ID: {1}, \u6d4f\u89c8\u5668\u7cfb\u5217: {2}]\u3002
91.6
91.7 +# UI Logging - http://wiki.netbeans.org/UsageLoggingSpecification
91.8 +# when JS tests are run
91.9 +# {0} project type (identifier) [string]
91.10 +# {1} JS testing provider identifier [string]
91.11 +USG_TEST_RUN_JS=\u5df2\u8fd0\u884c JS \u6d4b\u8bd5 [\u9879\u76ee\u7c7b\u578b: {0}, JS \u6d4b\u8bd5\u63d0\u4f9b\u5668 ID: {1}]\u3002
91.12 +
91.13 +# UI Logging - http://wiki.netbeans.org/UsageLoggingSpecification
91.14 +# when JS testing provider is selected
91.15 +# {0} project type (class name) [string]
91.16 +# {1} selected JS testing provider identifier [string]
91.17 +USG_TEST_CONFIG_JS=\u5df2\u9009\u62e9 JS \u6d4b\u8bd5\u63d0\u4f9b\u5668 [\u9879\u76ee\u7c7b\u578b: {0}, JS \u6d4b\u8bd5\u63d0\u4f9b\u5668 ID: {1}]\u3002
91.18 +
92.1 --- a/src/zh_CN/java/debugger-jpda-ui/debugger-jpda-ui/org/netbeans/modules/debugger/jpda/ui/models/Bundle_zh_CN.properties Wed Jul 30 05:03:48 2014 -0700
92.2 +++ b/src/zh_CN/java/debugger-jpda-ui/debugger-jpda-ui/org/netbeans/modules/debugger/jpda/ui/models/Bundle_zh_CN.properties Wed Jul 30 05:12:06 2014 -0700
92.3 @@ -42,6 +42,7 @@
92.4
92.5
92.6
92.7 +BTN_SaveValueToFile=\u5c06\u503c\u4fdd\u5b58\u5230\u6587\u4ef6(&S)
92.8 CTL_ActivateAllBreakpoints=\u6fc0\u6d3b\u6240\u6709\u65ad\u70b9
92.9 #BreakpointActionsProvider
92.10 CTL_Breakpoint_Customizer_Title=\u65ad\u70b9\u5c5e\u6027
92.11 @@ -107,8 +108,12 @@
92.12 CTL_Thread_Status_Zombie=\u50f5\u6b7b
92.13 CTL_ThreadAction_Interrupt_Label=\u4e2d\u65ad
92.14
92.15 +DLG_SaveToFile=\u4fdd\u5b58\u5230\u6587\u4ef6
92.16 #CallStackTableModel
92.17 MSG_Callstack_NoInformation=\u65e0\u4fe1\u606f
92.18 +# {0} - number of displayed characters,
92.19 +# {1} - total number of characters in the string,
92.20 +MSG_TooLargeString=\u5b57\u7b26\u4e32\u503c\u592a\u5927\u3002\u663e\u793a {0} \u4e2a\u5b57\u7b26, \u5171 {1} \u4e2a\u5b57\u7b26\u3002
92.21 NoCurrentThread=\u6ca1\u6709\u8981\u663e\u793a\u7684\u8c03\u7528\u5806\u6808, \u56e0\u4e3a\u4e0d\u5b58\u5728\u5f53\u524d\u7ebf\u7a0b\u3002
92.22 ThreadIsRunning=\u5f53\u524d\u7ebf\u7a0b\u6b63\u5728\u8fd0\u884c - \u6ca1\u6709\u53ef\u7528\u7684\u8c03\u7528\u5806\u6808\u3002
92.23
93.1 --- a/src/zh_CN/java/hibernate4lib/hibernate4lib/org/netbeans/modules/hibernate4lib/Bundle_zh_CN.properties Wed Jul 30 05:03:48 2014 -0700
93.2 +++ b/src/zh_CN/java/hibernate4lib/hibernate4lib/org/netbeans/modules/hibernate4lib/Bundle_zh_CN.properties Wed Jul 30 05:12:06 2014 -0700
93.3 @@ -1,5 +1,5 @@
93.4 OpenIDE-Module-Display-Category=Java
93.5 -OpenIDE-Module-Long-Description=\u652f\u6301 Hibernate 4.x \u7684\u5e93
93.6 -OpenIDE-Module-Name=Hibernate 4.x \u5e93
93.7 -OpenIDE-Module-Short-Description=Hibernate 4.x jar \u7684\u5305\u88c5\u6a21\u5757
93.8 +OpenIDE-Module-Long-Description=\u652f\u6301 Hibernate 4.3.x \u7684\u5e93
93.9 +OpenIDE-Module-Name=Hibernate 4.3.x \u5e93
93.10 +OpenIDE-Module-Short-Description=Hibernate 4.3.x jar \u7684\u5305\u88c5\u6a21\u5757
93.11
94.1 --- a/src/zh_CN/java/hibernate4lib/hibernate4lib/org/netbeans/modules/hibernate4lib/resources/Bundle_zh_CN.properties Wed Jul 30 05:03:48 2014 -0700
94.2 +++ b/src/zh_CN/java/hibernate4lib/hibernate4lib/org/netbeans/modules/hibernate4lib/resources/Bundle_zh_CN.properties Wed Jul 30 05:12:06 2014 -0700
94.3 @@ -41,7 +41,7 @@
94.4 # made subject to such option by the copyright holder.
94.5
94.6
94.7 -jpa2-persistence=\u6301\u4e45\u6027 JPA 2.0
94.8 +jpa2-persistence=\u6301\u4e45\u6027 JPA2.1
94.9
94.10
94.11
95.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
95.2 +++ b/src/zh_CN/java/java-editor/java-editor/org/netbeans/modules/java/editor/fold/Bundle_zh_CN.properties Wed Jul 30 05:12:06 2014 -0700
95.3 @@ -0,0 +1,42 @@
95.4 +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
95.5 +#
95.6 +# Copyright 2014 Oracle and/or its affiliates. All rights reserved.
95.7 +#
95.8 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
95.9 +# Other names may be trademarks of their respective owners.
95.10 +#
95.11 +# The contents of this file are subject to the terms of either the GNU
95.12 +# General Public License Version 2 only ("GPL") or the Common
95.13 +# Development and Distribution License("CDDL") (collectively, the
95.14 +# "License"). You may not use this file except in compliance with the
95.15 +# License. You can obtain a copy of the License at
95.16 +# http://www.netbeans.org/cddl-gplv2.html
95.17 +# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
95.18 +# specific language governing permissions and limitations under the
95.19 +# License. When distributing the software, include this License Header
95.20 +# Notice in each file and include the License file at
95.21 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
95.22 +# particular file as subject to the "Classpath" exception as provided
95.23 +# by Oracle in the GPL Version 2 section of the License file that
95.24 +# accompanied this code. If applicable, add the following below the
95.25 +# License Header, with the fields enclosed by brackets [] replaced by
95.26 +# your own identifying information:
95.27 +# "Portions Copyrighted [year] [name of copyright owner]"
95.28 +#
95.29 +# If you wish your version of this file to be governed by only the CDDL
95.30 +# or only the GPL Version 2, indicate your decision by adding
95.31 +# "[Contributor] elects to include this software in this distribution
95.32 +# under the [CDDL or GPL Version 2] license." If you do not indicate a
95.33 +# single choice of license, a recipient has the option to distribute
95.34 +# your version of this file under either the CDDL, the GPL Version 2 or
95.35 +# to extend the choice of license to its licensees as provided above.
95.36 +# However, if you add GPL Version 2 code and therefore, elected the GPL
95.37 +# Version 2 license, then the option applies only if the new code is
95.38 +# made subject to such option by the copyright holder.
95.39 +#
95.40 +# Contributor(s):
95.41 +#
95.42 +# Portions Copyrighted 2014 Sun Microsystems, Inc.
95.43 +
95.44 +Fold_BundleString=\u8d44\u6e90\u5305\u4e2d\u7684\u5b57\u7b26\u4e32
95.45 +
96.1 --- a/src/zh_CN/java/java-hints/java-hints/org/netbeans/modules/java/hints/Bundle_zh_CN.properties Wed Jul 30 05:03:48 2014 -0700
96.2 +++ b/src/zh_CN/java/java-hints/java-hints/org/netbeans/modules/java/hints/Bundle_zh_CN.properties Wed Jul 30 05:12:06 2014 -0700
96.3 @@ -48,6 +48,7 @@
96.4
96.5
96.6 CAPTION_EditGroupOfCompatibleNames=\u66f4\u65b0\u540d\u79f0\u7ec4
96.7 +ERR_EmptyBLOCK=\u5220\u9664\u5206\u53f7
96.8 ERR_NameGroupCantBeEmpty=\u540d\u79f0\u7ec4\u4e0d\u80fd\u4e3a\u7a7a
96.9 # {0} - offending text
96.10 ERR_NotJavaIdentifier={0}\u4e0d\u662f\u6709\u6548\u7684 Java \u6807\u8bc6\u7b26
96.11 @@ -296,9 +297,9 @@
96.12 FieldForUnusedParamCustomizer.finalFields.text=<html>\u5b57\u6bb5\u4e3a<code>\u6700\u7ec8</code>\u5b57\u6bb5</html>
96.13 ACSD_Final_Fields=\u5c06\u6b64\u63d0\u793a\u521b\u5efa\u7684\u5b57\u6bb5\u4f5c\u4e3a\u6700\u7ec8\u5b57\u6bb5\u3002
96.14
96.15 -DSC_StaticImport=\u5c06\u65b9\u6cd5\u8f6c\u6362\u4e3a\u9759\u6001\u5bfc\u5165\u3002\u5982\u6709\u53cd\u9988, \u53ef\u62a5\u544a\u81f3 http://www.netbeans.org/issues/show_bug.cgi?id=89258
96.16 +DSC_StaticImport=\u8f6c\u6362\u9759\u6001 method/field/enum-field \u5f15\u7528\u4ee5\u4f7f\u7528\u9759\u6001\u5bfc\u5165\u3002\u5982\u6709\u53cd\u9988, \u53ef\u62a5\u544a\u81f3 <a href="http://www.netbeans.org/issues/show_bug.cgi?id=89258">http://www.netbeans.org/issues/show_bug.cgi?id=89258</a>
96.17 DN_StaticImport=\u9759\u6001\u5bfc\u5165
96.18 -ERR_StaticImport=\u5c06\u65b9\u6cd5\u8f6c\u6362\u4e3a\u9759\u6001\u5bfc\u5165
96.19 +ERR_StaticImport=\u8f6c\u6362\u4e3a\u9759\u6001\u5bfc\u5165
96.20 HINT_StaticImport=\u5c06{0}\u8f6c\u6362\u4e3a\u9759\u6001\u5bfc\u5165
96.21 HINT_StaticImport2=\u4e3a{0}\u6dfb\u52a0\u9759\u6001\u5bfc\u5165
96.22
97.1 --- a/src/zh_CN/java/java-hints/java-hints/org/netbeans/modules/java/hints/errors/Bundle_zh_CN.properties Wed Jul 30 05:03:48 2014 -0700
97.2 +++ b/src/zh_CN/java/java-hints/java-hints/org/netbeans/modules/java/hints/errors/Bundle_zh_CN.properties Wed Jul 30 05:12:06 2014 -0700
97.3 @@ -228,6 +228,8 @@
97.4 DN_ErrorFixesFakeHintCREATE_LOCAL_VARIABLE=\u521b\u5efa\u5c40\u90e8\u53d8\u91cf
97.5 DESC_ErrorFixesFakeHintCREATE_FINAL_FIELD_CTOR=\u8bbe\u7f6e\u901a\u8fc7\u521b\u5efa\u5b57\u6bb5\u6765\u4fee\u590d\u9519\u8bef
97.6 DN_ErrorFixesFakeHintCREATE_FINAL_FIELD_CTOR=\u521b\u5efa\u5b57\u6bb5
97.7 +DESC_ErrorFixesFakeHintIMPORT_CLASS=\u8bbe\u7f6e\u901a\u8fc7\u5bfc\u5165\u7c7b\u6765\u4fee\u590d\u9519\u8bef
97.8 +DN_ErrorFixesFakeHintIMPORT_CLASS=\u5bfc\u5165\u7c7b
97.9
97.10 ERR_CannotApplyGuarded=\u65e0\u6cd5\u5728\u53d7\u4fdd\u62a4\u7684\u5757\u4e2d\u5e94\u7528\u4fee\u590d
97.11
97.12 @@ -254,5 +256,6 @@
97.13 FIX_AccessError_PROTECTED=\u5c06{0}\u8bbe\u4e3a\u53d7\u4fdd\u62a4
97.14 # {0} - the display name of the element whose access should be upgraded to package private
97.15 FIX_AccessError_PACKAGE_PRIVATE=\u5c06{0}\u5305\u8bbe\u4e3a\u79c1\u6709
97.16 +ImportClassCustomizer.organizeImports.text=\u8bbe\u7f6e\u5bfc\u5165\u683c\u5f0f\u5e76\u6392\u5e8f
97.17 WRN_FileInvalid=\u65e0\u6cd5\u89e3\u6790\u6587\u4ef6 - \u5df2\u7ecf\u5220\u9664?
97.18
98.1 --- a/src/zh_CN/java/java-j2seembedded/java-j2seembedded/org/netbeans/modules/java/j2seembedded/platform/Bundle_zh_CN.properties Wed Jul 30 05:03:48 2014 -0700
98.2 +++ b/src/zh_CN/java/java-j2seembedded/java-j2seembedded/org/netbeans/modules/java/j2seembedded/platform/Bundle_zh_CN.properties Wed Jul 30 05:12:06 2014 -0700
98.3 @@ -76,4 +76,6 @@
98.4 DESC_VmExtensions=\u53ef\u9009\u7ec4\u4ef6
98.5 LBL_VmDebug=\u8c03\u8bd5
98.6 DESC_VmDebug=Java \u7ea7\u522b\u8c03\u8bd5\u652f\u6301
98.7 +LBL_ExecDecorator=\u6267\u884c\u524d\u7f00
98.8 +LBL_ExecDecoratorDesc=\u8fdc\u7a0b\u6267\u884c\u524d\u7f00, \u4f8b\u5982, sudo
98.9
99.1 --- a/src/zh_CN/java/java-navigation/java-navigation/org/netbeans/modules/java/stackanalyzer/Bundle_zh_CN.properties Wed Jul 30 05:03:48 2014 -0700
99.2 +++ b/src/zh_CN/java/java-navigation/java-navigation/org/netbeans/modules/java/stackanalyzer/Bundle_zh_CN.properties Wed Jul 30 05:12:06 2014 -0700
99.3 @@ -52,4 +52,5 @@
99.4 AnalyzeStackTopComponent.AccessibleContext.accessibleDescription=\u5206\u6790\u5806\u6808
99.5 AnalyzeStackTopComponent.sourceNotFound=\u627e\u4e0d\u5230\u6e90\u6587\u4ef6{0}
99.6 TXT_OpeningSource=\u6253\u5f00: {0}
99.7 +AnalyzeStackTopComponent.lineNotFound=\u627e\u4e0d\u5230\u884c{0}, \u6587\u6863\u53ef\u80fd\u5df2\u66f4\u6539\u3002
99.8
100.1 --- a/src/zh_CN/java/java-source/java-source/org/netbeans/modules/java/ui/Bundle_zh_CN.properties Wed Jul 30 05:03:48 2014 -0700
100.2 +++ b/src/zh_CN/java/java-source/java-source/org/netbeans/modules/java/ui/Bundle_zh_CN.properties Wed Jul 30 05:12:06 2014 -0700
100.3 @@ -148,6 +148,7 @@
100.4 LBL_spaceWithinAnnotationParens=\u6807\u6ce8
100.5 LBL_spaceWithinBraces=\u82b1\u62ec\u53f7
100.6 LBL_spaceWithinArrayInitBrackets=\u6570\u7ec4\u521d\u59cb\u5316\u7a0b\u5e8f\u65b9\u62ec\u53f7
100.7 +LBL_spaceWithinArrayIndexBrackets=\u6570\u7ec4\u7d22\u5f15\u62ec\u53f7
100.8 LBL_spaceWithinLambdaParens=Lambda \u53c2\u6570
100.9
100.10 LBL_Other=\u5176\u4ed6
101.1 --- a/src/zh_CN/java/maven/maven/org/netbeans/modules/maven/Bundle_zh_CN.properties Wed Jul 30 05:03:48 2014 -0700
101.2 +++ b/src/zh_CN/java/maven/maven/org/netbeans/modules/maven/Bundle_zh_CN.properties Wed Jul 30 05:12:06 2014 -0700
101.3 @@ -56,6 +56,8 @@
101.4 TIT_Run_Maven=\u8fd0\u884c Maven
101.5 TIT_Run_Single_method=\u529f\u80fd\u9700\u8981\u66f4\u65b0 POM
101.6 # {0} - artifactId
101.7 +TXT_ApplyCodeChanges=\u5e94\u7528\u4ee3\u7801\u66f4\u6539 ({0})
101.8 +# {0} - artifactId
101.9 TXT_Build=\u6784\u5efa ({0})
101.10 # {0} - artifactId
101.11 TXT_Debug=\u8c03\u8bd5 ({0})
102.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
102.2 +++ b/src/zh_CN/java/org-netbeans-api-maven/org-netbeans-api-maven/org/netbeans/api/maven/Bundle_zh_CN.properties Wed Jul 30 05:12:06 2014 -0700
102.3 @@ -0,0 +1,44 @@
102.4 +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
102.5 +#
102.6 +# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
102.7 +#
102.8 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
102.9 +# Other names may be trademarks of their respective owners.
102.10 +#
102.11 +# The contents of this file are subject to the terms of either the GNU
102.12 +# General Public License Version 2 only ("GPL") or the Common
102.13 +# Development and Distribution License("CDDL") (collectively, the
102.14 +# "License"). You may not use this file except in compliance with the
102.15 +# License. You can obtain a copy of the License at
102.16 +# http://www.netbeans.org/cddl-gplv2.html
102.17 +# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
102.18 +# specific language governing permissions and limitations under the
102.19 +# License. When distributing the software, include this License Header
102.20 +# Notice in each file and include the License file at
102.21 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
102.22 +# particular file as subject to the "Classpath" exception as provided
102.23 +# by Oracle in the GPL Version 2 section of the License file that
102.24 +# accompanied this code. If applicable, add the following below the
102.25 +# License Header, with the fields enclosed by brackets [] replaced by
102.26 +# your own identifying information:
102.27 +# "Portions Copyrighted [year] [name of copyright owner]"
102.28 +#
102.29 +# If you wish your version of this file to be governed by only the CDDL
102.30 +# or only the GPL Version 2, indicate your decision by adding
102.31 +# "[Contributor] elects to include this software in this distribution
102.32 +# under the [CDDL or GPL Version 2] license." If you do not indicate a
102.33 +# single choice of license, a recipient has the option to distribute
102.34 +# your version of this file under either the CDDL, the GPL Version 2 or
102.35 +# to extend the choice of license to its licensees as provided above.
102.36 +# However, if you add GPL Version 2 code and therefore, elected the GPL
102.37 +# Version 2 license, then the option applies only if the new code is
102.38 +# made subject to such option by the copyright holder.
102.39 +#
102.40 +# Contributor(s):
102.41 +#
102.42 +# Portions Copyrighted 2008 Sun Microsystems, Inc.
102.43 +
102.44 +OpenIDE-Module-Display-Category=Maven
102.45 +OpenIDE-Module-Name=Maven API
102.46 +OpenIDE-Module-Long-Description=\u4e0e Maven \u76f8\u5173\u7684 API\u3002
102.47 +
103.1 --- a/src/zh_CN/mobility/j2me-project/j2me-project/org/netbeans/modules/j2me/project/ui/Bundle_zh_CN.properties Wed Jul 30 05:03:48 2014 -0700
103.2 +++ b/src/zh_CN/mobility/j2me-project/j2me-project/org/netbeans/modules/j2me/project/ui/Bundle_zh_CN.properties Wed Jul 30 05:12:06 2014 -0700
103.3 @@ -49,3 +49,8 @@
103.4 #SourceLevelComboBoxModel
103.5 TXT_InvalidSourceLevel=\u975e\u6cd5\u7684\u6e90\u4ee3\u7801\u7ea7\u522b: {0}
103.6
103.7 +#LibletListCellRenderer
103.8 +TXT_Liblets_TypeJar=JAR
103.9 +TXT_Liblets_TypeProject=\u9879\u76ee
103.10 +TXT_Liblets_TypeUnknown=\u672a\u77e5
103.11 +
104.1 --- a/src/zh_CN/mobility/j2me-project/j2me-project/org/netbeans/modules/j2me/project/ui/customizer/Bundle_zh_CN.properties Wed Jul 30 05:03:48 2014 -0700
104.2 +++ b/src/zh_CN/mobility/j2me-project/j2me-project/org/netbeans/modules/j2me/project/ui/customizer/Bundle_zh_CN.properties Wed Jul 30 05:12:06 2014 -0700
104.3 @@ -428,6 +428,30 @@
104.4
104.5 LBL_CustomizeLibraries_Processors_Tab=\u5904\u7406\u7a0b\u5e8f
104.6
104.7 +#LIBlets
104.8 +LBL_CustomizeLibraries_LibletsTab=LIBlet
104.9 +LBL_CustomizeLibraries_libletLabel=LIBlet:
104.10 +LBL_CustomizeLibraries=\u53ef\u9009
104.11 +LBL_CustomizeLibraries_jRadioButtonRequired=\u5fc5\u9700
104.12 +LBL_CustomizeLibraries_jRadioButtonOptional=\u53ef\u9009
104.13 +LBL_CustomizeLibraries_labelLibletLevel=\u7ea7\u522b:
104.14 +LBL_CustomizeLibraries_labelLibletUrl=JAD URL:
104.15 +ACSD_CustomizeLibraries_jComboBoxLiblet=\u9879\u76ee\u4e2d\u6240\u6709\u53ef\u7528 LIBlet \u7684\u5217\u8868\u3002
104.16 +LBL_CustomizeLibraries_labelLibletName=LIBlet \u540d\u79f0:
104.17 +LBL_CustomizeLibraries_labelLibletVendor=LIBlet \u4f9b\u5e94\u5546:
104.18 +LBL_CustomizeLibraries_labelLibletVersion=LIBlet \u7248\u672c:
104.19 +
104.20 +
104.21 +
104.22 +TXT_CustomizeLibraries_labelLibletsNote=<html><b>liblet</b> \u7c7b\u578b\u7684 LIBlet \u5fc5\u987b\u4f5c\u4e3a<i>\u7f16\u8bd1\u65f6\u5e93</i>\u5728<i>\u7f16\u8bd1</i>\u9009\u9879\u5361\u4e0a\u6dfb\u52a0\u3002\u7136\u540e, \u5c06\u53ef\u4ee5\u5728\u6b64\u9762\u677f\u4e0a\u5b9a\u5236\u7279\u5b9a\u4e8e LIBlet \u7684\u9009\u9879\u3002</html>
104.23 +LBL_CustomizeLibraries_labelNoLiblet=\u6ca1\u6709\u53ef\u7528\u4e8e\u6b64\u9879\u76ee\u7684 LIBlet\u3002
104.24 +LBL_CustomizeLibraries_labelLibletInfo=<html><i>LIBlet \u4fe1\u606f:</i></html>
104.25 +LBL_CustomizeLibraries_buttonBrowseJad=\u76f8\u5bf9 URL...
104.26 +ACSD_CustomizeLibraries_buttonBrowseJad=\u6d4f\u89c8\u672c\u5730 JAD \u6587\u4ef6\u3002
104.27 +LBL_CustomizeLibraries_labelLibletLocalJad=<html><i>\u6ce8: JAD \u6587\u4ef6\u7684\u76f8\u5bf9 URL \u53ea\u80fd\u7528\u4e8e\u5f00\u53d1\u76ee\u7684\u3002</html>
104.28 +Title_Chooser_SelectJadFile=\u9009\u62e9 JAD \u6587\u4ef6
104.29 +J2MEAttributesPanel.jCheckBoxLibletJadUrl.text=\u5f3a\u5236\u672c\u5730 OTA JAD URL (\u4ec5\u9650 LIBlet)
104.30 +
104.31 LBL_CustomizeLibraries_Run_Tab=\u8fd0\u884c
104.32
104.33 LBL_CustomizeLibraries_RunTests_Tab=\u8fd0\u884c\u6d4b\u8bd5
104.34 @@ -627,6 +651,7 @@
104.35 J2MERunPanel.labelRunMethod.text=\u8fd0\u884c\u65b9\u6cd5:
104.36 J2MERunPanel.OTARadio.text=\u901a\u8fc7 OTA (Over The Air \u90e8\u7f72) \u6267\u884c(&E)
104.37 J2MERunPanel.standardRadio.text=\u5e38\u89c4\u6267\u884c(&R)
104.38 +J2MERunPanel.runNoteLabel.text=<html><i><b>\u6ce8:</b> \u6240\u9009\u8fd0\u884c\u65b9\u6cd5\u4ec5\u9002\u7528\u4e8e\u201c\u8fd0\u884c\u201d\u64cd\u4f5c\u3002\u5bf9\u4e8e\u8c03\u8bd5, \u59cb\u7ec8\u4f7f\u7528\u5e38\u89c4\u6267\u884c\u3002</i></html>
104.39
104.40 # Signing
104.41 ACSN_Sign=\u542f\u7528\u7b7e\u540d\u5b9a\u5236\u5668
104.42 @@ -675,6 +700,9 @@
104.43 J2MEMIDletsPanel.addButton.text=\u6dfb\u52a0(&A)...
104.44 ACSN_Jad=JAD \u548c Jar \u6e05\u5355\u5b9a\u5236\u5668\u7684\u5e38\u89c4\u5c5e\u6027
104.45 ACSD_Jad=\u5b9a\u5236 JAD \u548c Jar \u6e05\u5355\u7684\u5e38\u89c4\u5c5e\u6027
104.46 +J2MEAttributesPanel.configNew.text=\u65b0\u5efa(&N)...
104.47 +J2MEAttributesPanel.configLabel.text=\u914d\u7f6e(&C):
104.48 +J2MEAttributesPanel.configDel.text=\u5220\u9664(&D)
104.49
104.50 #Resources found in the file: CustomizerMIDlets.java
104.51
105.1 --- a/src/zh_CN/nb/ide-branding/netbeans/core/locale/core_nb/org/netbeans/core/startup/Bundle_nb_zh_CN.properties Wed Jul 30 05:03:48 2014 -0700
105.2 +++ b/src/zh_CN/nb/ide-branding/netbeans/core/locale/core_nb/org/netbeans/core/startup/Bundle_nb_zh_CN.properties Wed Jul 30 05:12:06 2014 -0700
105.3 @@ -1,6 +1,6 @@
105.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
105.5 #
105.6 -# Copyright 1997-2014 Oracle and/or its affiliates. All rights reserved.
105.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
105.8 #
105.9 # Oracle and Java are registered trademarks of Oracle and/or its affiliates.
105.10 # Other names may be trademarks of their respective owners.
106.1 --- a/src/zh_CN/other/installer/components/products/nb-javaee/data/Bundle_zh_CN.properties Wed Jul 30 05:03:48 2014 -0700
106.2 +++ b/src/zh_CN/other/installer/components/products/nb-javaee/data/Bundle_zh_CN.properties Wed Jul 30 05:12:06 2014 -0700
106.3 @@ -1,7 +1,7 @@
106.4 #
106.5 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
106.6 #
106.7 -# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
106.8 +# Copyright 1997-2014 Oracle and/or its affiliates. All rights reserved.
106.9 #
106.10 # Oracle and Java are registered trademarks of Oracle and/or its affiliates.
106.11 # Other names may be trademarks of their respective owners.
107.1 --- a/src/zh_CN/php/php-api-phpmodule/php-api-phpmodule/org/netbeans/modules/php/api/Bundle_zh_CN.properties Wed Jul 30 05:03:48 2014 -0700
107.2 +++ b/src/zh_CN/php/php-api-phpmodule/php-api-phpmodule/org/netbeans/modules/php/api/Bundle_zh_CN.properties Wed Jul 30 05:12:06 2014 -0700
107.3 @@ -2,4 +2,5 @@
107.4 PhpVersion.PHP_53=PHP 5.3
107.5 PhpVersion.PHP_54=PHP 5.4
107.6 PhpVersion.PHP_55=PHP 5.5
107.7 +PhpVersion.PHP_56=PHP 5.6
107.8
108.1 --- a/src/zh_CN/php/php-editor/php-editor/org/netbeans/modules/php/editor/codegen/ui/Bundle_zh_CN.properties Wed Jul 30 05:03:48 2014 -0700
108.2 +++ b/src/zh_CN/php/php-editor/php-editor/org/netbeans/modules/php/editor/codegen/ui/Bundle_zh_CN.properties Wed Jul 30 05:12:06 2014 -0700
108.3 @@ -106,4 +106,5 @@
108.4 TableGeneratorPanel.connVariableLabel.AccessibleContext.accessibleName=\u8fde\u63a5\u53d8\u91cf
108.5 LBL_Generate_Documentation=\u751f\u6210\u6587\u6863\u6869\u6a21\u5757
108.6 ConstructorPanel.fluentSetterCheckBox.text=Fluent Setter
108.7 +ConstructorPanel.publicModifierCheckBox.text=\u4f7f\u7528 Public \u4fee\u9970\u7b26
108.8
109.1 --- a/src/zh_CN/php/php-editor/php-editor/org/netbeans/modules/php/editor/verification/Bundle_zh_CN.properties Wed Jul 30 05:03:48 2014 -0700
109.2 +++ b/src/zh_CN/php/php-editor/php-editor/org/netbeans/modules/php/editor/verification/Bundle_zh_CN.properties Wed Jul 30 05:12:06 2014 -0700
109.3 @@ -70,6 +70,9 @@
109.4 AmbiguousComparisonHintCustom=\u53d1\u73b0\u53ef\u80fd\u7684\u610f\u5916\u6bd4\u8f83\u3002\u68c0\u67e5\u662f\u5426\u5e0c\u671b\u6539\u7528 '='\u3002
109.5 AmbiguousComparisonHintDescName=\u5c1d\u8bd5\u5728\u8d4b\u503c\u4e2d\u4f7f\u7528\u9519\u8bef\u7684\u62fc\u5199 (\u5177\u6709\u591a\u4e2a\u8d4b\u503c\u8fd0\u7b97\u7b26\u7684\u8d4b\u503c)\u3002
109.6 AmbiguousComparisonHintDispName=\u4e0d\u660e\u786e\u7684\u6bd4\u8f83
109.7 +ArraySyntaxDesc=\u53ef\u4f7f\u7528\u8f83\u77ed\u7684\u65b0\u6570\u7ec4\u521b\u5efa\u8bed\u6cd5
109.8 +ArraySyntaxDescName=\u5141\u8bb8\u5c06\u65e7\u6570\u7ec4\u8bed\u6cd5\u66f4\u6539\u4e3a\u66f4\u77ed\u7684\u65b0\u6570\u7ec4\u8bed\u6cd5\u3002
109.9 +ArraySyntaxDispName=\u6570\u7ec4\u8bed\u6cd5
109.10 AssignmentHintFixDisp=\u5c06\u6bd4\u8f83\u66f4\u6539\u4e3a\u8d4b\u503c
109.11 AssignVariableHintDesc=\u5c06\u8fd4\u56de\u503c\u8d4b\u7ed9\u65b0\u53d8\u91cf
109.12 AssignVariableHintDisplayName=\u5f15\u5165\u53d8\u91cf
109.13 @@ -81,6 +84,8 @@
109.14 CheckPHP54VerDisp=\u4e0e\u9879\u76ee\u8bbe\u7f6e\u4e2d\u6307\u5b9a\u7684 PHP \u7248\u672c\u4e0d\u517c\u5bb9\u7684\u8bed\u8a00\u529f\u80fd
109.15 CheckPHP55VerDesc=\u68c0\u6d4b\u4e0e\u9879\u76ee\u8bbe\u7f6e\u4e2d\u6307\u5b9a\u7684 PHP \u7248\u672c\u4e0d\u517c\u5bb9\u7684\u8bed\u8a00\u529f\u80fd
109.16 CheckPHP55VerDisp=\u4e0e\u9879\u76ee\u8bbe\u7f6e\u4e2d\u6307\u5b9a\u7684 PHP \u7248\u672c\u4e0d\u517c\u5bb9\u7684\u8bed\u8a00\u529f\u80fd
109.17 +CheckPHP56VerDesc=\u68c0\u6d4b\u4e0e\u9879\u76ee\u8bbe\u7f6e\u4e2d\u6307\u5b9a\u7684 PHP \u7248\u672c\u4e0d\u517c\u5bb9\u7684\u8bed\u8a00\u529f\u80fd
109.18 +CheckPHP56VerDisp=\u4e0e\u9879\u76ee\u8bbe\u7f6e\u4e2d\u6307\u5b9a\u7684 PHP \u7248\u672c\u4e0d\u517c\u5bb9\u7684\u8bed\u8a00\u529f\u80fd
109.19 ClassLinesHintDesc=\u6bcf\u4e2a\u7c7b\u58f0\u660e\u5141\u8bb8\u7684\u6700\u5927\u884c\u6570\u3002
109.20 ClassLinesHintDisp=\u7c7b\u58f0\u660e
109.21 # {0} - class length in lines
109.22 @@ -101,6 +106,7 @@
109.23 ErrorControlOperatorHintText=\u8bef\u7528\u7684\u9519\u8bef\u63a7\u5236\u8fd0\u7b97\u7b26
109.24 # {0} - Class name
109.25 FinalPossibleAbstractClass=\u7c7b "{0}" \u5305\u542b\u62bd\u8c61\u65b9\u6cd5, \u4e0d\u80fd\u58f0\u660e\u4e3a final
109.26 +FixDesc=\u4f7f\u7528\u65b0\u7684\u6570\u7ec4\u521b\u5efa\u8bed\u6cd5
109.27 ForBracesHintDesc=For \u5faa\u73af\u5fc5\u987b\u4f7f\u7528\u82b1\u62ec\u53f7\u62ec\u4f4f
109.28 ForBracesHintDisp=For \u5faa\u73af\u5fc5\u987b\u4f7f\u7528\u82b1\u62ec\u53f7\u62ec\u4f4f
109.29 ForBracesHintText=For \u5faa\u73af\u5fc5\u987b\u4f7f\u7528\u82b1\u62ec\u53f7\u62ec\u4f4f
109.30 @@ -197,6 +203,7 @@
109.31 PHP53VersionErrorHintDispName=\u4e0e\u9879\u76ee\u8bbe\u7f6e\u4e2d\u6307\u5b9a\u7684 PHP \u7248\u672c\u4e0d\u517c\u5bb9\u7684\u8bed\u8a00\u529f\u80fd
109.32 PHP54VersionErrorHintDispName=\u4e0e\u9879\u76ee\u8bbe\u7f6e\u4e2d\u6307\u5b9a\u7684 PHP \u7248\u672c\u4e0d\u517c\u5bb9\u7684\u8bed\u8a00\u529f\u80fd
109.33 PHP55VersionErrorHintDispName=\u4e0e\u9879\u76ee\u8bbe\u7f6e\u4e2d\u6307\u5b9a\u7684 PHP \u7248\u672c\u4e0d\u517c\u5bb9\u7684\u8bed\u8a00\u529f\u80fd
109.34 +PHP56VersionErrorHintDispName=\u4e0e\u9879\u76ee\u8bbe\u7f6e\u4e2d\u6307\u5b9a\u7684 PHP \u7248\u672c\u4e0d\u517c\u5bb9\u7684\u8bed\u8a00\u529f\u80fd
109.35 PhpVersionErrorDesc=\u68c0\u6d4b\u4e0e\u9879\u76ee\u8bbe\u7f6e\u4e2d\u6307\u5b9a\u7684 PHP \u7248\u672c\u4e0d\u517c\u5bb9\u7684\u8bed\u8a00\u529f\u80fd
109.36 PhpVersionErrorDisp=\u4e0e\u9879\u76ee\u8bbe\u7f6e\u4e2d\u6307\u5b9a\u7684 PHP \u7248\u672c\u4e0d\u517c\u5bb9\u7684\u8bed\u8a00\u529f\u80fd
109.37 # {0} - Class name
110.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
110.2 +++ b/src/zh_CN/php/php-latte/php-latte/org/netbeans/modules/php/latte/parser/Bundle_zh_CN.properties Wed Jul 30 05:12:06 2014 -0700
110.3 @@ -0,0 +1,5 @@
110.4 +# {0} - macro name
110.5 +ERR_UnclosedMacro=\u672a\u5173\u95ed\u7684\u5b8f: {0}
110.6 +# {0} - macro name
110.7 +ERR_UnopenendMacro=\u672a\u6253\u5f00\u7684\u5b8f: {0}
110.8 +
111.1 --- a/src/zh_CN/php/php-nette-tester/php-nette-tester/org/netbeans/modules/php/nette/tester/ui/customizer/Bundle_zh_CN.properties Wed Jul 30 05:03:48 2014 -0700
111.2 +++ b/src/zh_CN/php/php-nette-tester/php-nette-tester/org/netbeans/modules/php/nette/tester/ui/customizer/Bundle_zh_CN.properties Wed Jul 30 05:12:06 2014 -0700
111.3 @@ -47,5 +47,7 @@
111.4 CustomizerTester.testerCheckBox.text=\u4f7f\u7528\u5b9a\u5236 Tester \u6587\u4ef6(&T)
111.5 CustomizerTester.testerLabel.text=Tester \u6587\u4ef6(&E):
111.6 CustomizerTester.testerBrowseButton.text=\u6d4f\u89c8(&R)...
111.7 +CustomizerTester.binaryExecutableCheckBox.text=\u4f7f\u7528\u5b9a\u5236\u53ef\u6267\u884c\u6587\u4ef6(&X)
111.8 +CustomizerTester.binaryExecutableLabel.text=\u53ef\u6267\u884c\u6587\u4ef6(&B):
111.9 TesterCustomizer.name=Nette Tester
111.10
112.1 --- a/src/zh_CN/php/php-nette-tester/php-nette-tester/org/netbeans/modules/php/nette/tester/ui/options/Bundle_zh_CN.properties Wed Jul 30 05:03:48 2014 -0700
112.2 +++ b/src/zh_CN/php/php-nette-tester/php-nette-tester/org/netbeans/modules/php/nette/tester/ui/options/Bundle_zh_CN.properties Wed Jul 30 05:12:06 2014 -0700
112.3 @@ -58,4 +58,5 @@
112.4 TesterOptionsPanel.learnMoreLabel.text=<html><a href="#">\u4e86\u89e3\u6709\u5173 Nette Tester \u7684\u8be6\u7ec6\u4fe1\u606f</a></html>
112.5 TesterOptionsPanel.phpIniLabel.text=php.ini(&P):
112.6 TesterOptionsPanel.phpIniBrowseButton.text=\u6d4f\u89c8(&R)...
112.7 +TesterOptionsPanel.binaryExecutableLabel.text=\u53ef\u6267\u884c\u6587\u4ef6(&X):
112.8
113.1 --- a/src/zh_CN/php/php-phpunit/php-phpunit/org/netbeans/modules/php/phpunit/ui/options/Bundle_zh_CN.properties Wed Jul 30 05:03:48 2014 -0700
113.2 +++ b/src/zh_CN/php/php-phpunit/php-phpunit/org/netbeans/modules/php/phpunit/ui/options/Bundle_zh_CN.properties Wed Jul 30 05:12:06 2014 -0700
113.3 @@ -45,7 +45,8 @@
113.4 PhpUnitOptionsPanel.phpunit.browse.title=\u9009\u62e9 PHPUnit
113.5 # {0} - short script name
113.6 # {1} - long script name
113.7 -PhpUnitOptionsPanel.phpUnit.hint=PHPUnit \u811a\u672c\u7684\u5b8c\u6574\u8def\u5f84 (\u901a\u5e38\u4e3a {0} \u6216 {1})\u3002
113.8 +# {2} - PHAR script name
113.9 +PhpUnitOptionsPanel.phpUnit.hint=<html>PHPUnit \u811a\u672c\u7684\u5b8c\u6574\u8def\u5f84 (\u901a\u5e38\u4e3a {0}, {1} \u6216 {2})\u3002
113.10 PhpUnitOptionsPanel.phpUnit.search.notFound=\u627e\u4e0d\u5230 PHPUnit \u811a\u672c\u3002
113.11 PhpUnitOptionsPanel.phpUnit.search.pleaseWaitPart=PHPUnit \u811a\u672c
113.12 PhpUnitOptionsPanel.phpUnit.search.scripts=PHPUnit \u811a\u672c(&P):
113.13 @@ -93,7 +94,8 @@
113.14 PhpUnitOptionsPanel.skelGen.browse=\u9009\u62e9\u6846\u67b6\u751f\u6210\u5668\u811a\u672c
113.15 # {0} - short script name
113.16 # {1} - long script name
113.17 -PhpUnitOptionsPanel.skelGen.hint=\u6846\u67b6\u751f\u6210\u5668\u811a\u672c\u7684\u5b8c\u6574\u8def\u5f84 (\u901a\u5e38\u4e3a {0} \u6216 {1})\u3002
113.18 +# {2} - PHAR script name
113.19 +PhpUnitOptionsPanel.skelGen.hint=<html>\u6846\u67b6\u751f\u6210\u5668\u811a\u672c\u7684\u5b8c\u6574\u8def\u5f84 (\u901a\u5e38\u4e3a {0}, {1} \u6216 {2})\u3002
113.20 PhpUnitOptionsPanel.skelGen.search.notFound=\u627e\u4e0d\u5230\u6846\u67b6\u751f\u6210\u5668\u811a\u672c\u3002
113.21 PhpUnitOptionsPanel.skelGen.search.pleaseWaitPart=\u6846\u67b6\u751f\u6210\u5668\u811a\u672c
113.22 PhpUnitOptionsPanel.skelGen.search.scripts=\u6846\u67b6\u751f\u6210\u5668\u811a\u672c(&S):
114.1 --- a/src/zh_CN/php/php-project/php-project/org/netbeans/modules/php/project/ui/customizer/Bundle_zh_CN.properties Wed Jul 30 05:03:48 2014 -0700
114.2 +++ b/src/zh_CN/php/php-project/php-project/org/netbeans/modules/php/project/ui/customizer/Bundle_zh_CN.properties Wed Jul 30 05:12:06 2014 -0700
114.3 @@ -56,6 +56,8 @@
114.4 # {0} - file path
114.5 # {1} - project name
114.6 CustomizerPhpIncludePath.error.anotherProjectSubFile=\u8def\u5f84{0}\u5c5e\u4e8e\u9879\u76ee{1}\u3002\u662f\u5426\u5220\u9664\u5b83\u5e76\u6dfb\u52a0\u8be5\u9879\u76ee\u7684\u6e90\u6587\u4ef6?
114.7 +# {0} - project name
114.8 +CustomizerPhpIncludePath.error.brokenProject=\u9879\u76ee {0} \u5df2\u4e2d\u65ad, \u8bf7\u624b\u52a8\u6253\u5f00\u5e76\u4fee\u590d\u5b83\u3002
114.9 CustomizerTesting.error.none=\u8981\u8fd0\u884c\u6d4b\u8bd5, \u5fc5\u987b\u81f3\u5c11\u9009\u62e9\u4e00\u4e2a\u6d4b\u8bd5\u63d0\u4f9b\u5668\u3002
114.10 CustomizerTesting.testingProviders.noneInstalled=\u627e\u4e0d\u5230 PHP \u6d4b\u8bd5\u63d0\u4f9b\u5668, \u8bf7\u901a\u8fc7\u63d2\u4ef6\u5b89\u88c5\u4e00\u4e2a (\u4f8b\u5982 PHPUnit)\u3002
114.11 RunAsLocalWeb.webRoot.notFound=Web \u6839\u76ee\u5f55\u4e0d\u5b58\u5728 (\u8bf7\u67e5\u770b\u6e90)\u3002
115.1 --- a/src/zh_CN/php/php-project/php-project/org/netbeans/modules/php/project/util/Bundle_zh_CN.properties Wed Jul 30 05:03:48 2014 -0700
115.2 +++ b/src/zh_CN/php/php-project/php-project/org/netbeans/modules/php/project/util/Bundle_zh_CN.properties Wed Jul 30 05:12:06 2014 -0700
115.3 @@ -47,3 +47,13 @@
115.4 # {4} frameworks ["|" separated string]
115.5 USG_PROJECT_CREATE_PHP=\u5df2\u521b\u5efa\u65b0\u7684 PHP \u9879\u76ee [\u6e90\u4f4d\u4e8e\u9879\u76ee\u76ee\u5f55\u4e0b: {0}, \u8fd0\u884c\u65b9\u5f0f: {1}, \u8fd0\u884c\u914d\u7f6e\u6570: {2}, \u590d\u5236\u6e90: {3}, \u6846\u67b6: {4}]\u3002
115.6
115.7 +# UI Logging - http://wiki.netbeans.org/UsageLoggingSpecification
115.8 +# when PHP tests are run
115.9 +# {0} PHP testing provider identifier ["|" separated string]
115.10 +USG_TEST_RUN_PHP=\u5df2\u8fd0\u884c PHP \u6d4b\u8bd5 [PHP \u6d4b\u8bd5\u63d0\u4f9b\u5668 ID: {0}]\u3002
115.11 +
115.12 +# UI Logging - http://wiki.netbeans.org/UsageLoggingSpecification
115.13 +# when PHP testing providers are selected
115.14 +# {1} selected PHP testing provider identifiers ["|" separated string]
115.15 +USG_TEST_CONFIG_PHP=\u5df2\u9009\u62e9 PHP \u6d4b\u8bd5\u63d0\u4f9b\u5668 [PHP \u6d4b\u8bd5\u63d0\u4f9b\u5668 ID: {0}]\u3002
115.16 +
116.1 --- a/src/zh_CN/platform/org-netbeans-core-startup/netbeans/core/core/org/netbeans/core/startup/Bundle_zh_CN.properties Wed Jul 30 05:03:48 2014 -0700
116.2 +++ b/src/zh_CN/platform/org-netbeans-core-startup/netbeans/core/core/org/netbeans/core/startup/Bundle_zh_CN.properties Wed Jul 30 05:12:06 2014 -0700
116.3 @@ -1,6 +1,6 @@
116.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
116.5 #
116.6 -# Copyright 1997-2014 Oracle and/or its affiliates. All rights reserved.
116.7 +# Copyright 1997-2012 Oracle and/or its affiliates. All rights reserved.
116.8 #
116.9 # Oracle and Java are registered trademarks of Oracle and/or its affiliates.
116.10 # Other names may be trademarks of their respective owners.
117.1 --- a/src/zh_CN/platform/org-netbeans-core-ui/org-netbeans-core-ui/org/netbeans/core/ui/options/general/Bundle_zh_CN.properties Wed Jul 30 05:03:48 2014 -0700
117.2 +++ b/src/zh_CN/platform/org-netbeans-core-ui/org-netbeans-core-ui/org/netbeans/core/ui/options/general/Bundle_zh_CN.properties Wed Jul 30 05:12:06 2014 -0700
117.3 @@ -166,7 +166,7 @@
117.4
117.5 LBL_AdvancedProxyPanel_lSocksHost=SOCKS \u4ee3\u7406(&S):
117.6 LBL_AdvancedProxyPanel_lNonProxyHosts=\u6ca1\u6709\u4ee3\u7406\u4e3b\u673a(&X):
117.7 -LBL_AdvancedProxyPanel_cbUseProxyAuthentication=\u4ee3\u7406\u8981\u6c42\u9a8c\u8bc1(&Q)
117.8 +LBL_AdvancedProxyPanel_cbUseProxyAuthentication=\u4ee3\u7406\u8981\u6c42\u663e\u5f0f\u9a8c\u8bc1(&Q)
117.9
117.10 LBL_AdvancedProxyPanel_lUserName=\u7528\u6237\u540d(&U):
117.11
117.12 @@ -268,4 +268,5 @@
117.13
117.14 GeneralOptionsPanel.proxy.result.ok=\u8fde\u63a5\u901a\u8fc7
117.15 GeneralOptionsPanel.proxy.result.failed=\u8fde\u63a5\u5931\u8d25 ({0})
117.16 +AdvancedProxyPanel.cbUseProxyAuthentication.actionCommand=\u4ee3\u7406\u8981\u6c42\u663e\u5f0f\u9a8c\u8bc1(&Q)
117.17
118.1 --- a/src/zh_CN/platform/org-netbeans-core-windows/org-netbeans-core-windows/org/netbeans/core/windows/view/ui/Bundle_zh_CN.properties Wed Jul 30 05:03:48 2014 -0700
118.2 +++ b/src/zh_CN/platform/org-netbeans-core-windows/org-netbeans-core-windows/org/netbeans/core/windows/view/ui/Bundle_zh_CN.properties Wed Jul 30 05:12:06 2014 -0700
118.3 @@ -1,6 +1,6 @@
118.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
118.5 #
118.6 -# Copyright 1997-2014 Oracle and/or its affiliates. All rights reserved.
118.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
118.8 #
118.9 # Oracle and Java are registered trademarks of Oracle and/or its affiliates.
118.10 # Other names may be trademarks of their respective owners.
119.1 --- a/src/zh_CN/platform/org-openide-loaders/org-openide-loaders/org/openide/loaders/Bundle_zh_CN.properties Wed Jul 30 05:03:48 2014 -0700
119.2 +++ b/src/zh_CN/platform/org-openide-loaders/org-openide-loaders/org/openide/loaders/Bundle_zh_CN.properties Wed Jul 30 05:12:06 2014 -0700
119.3 @@ -41,6 +41,8 @@
119.4 # made subject to such option by the copyright holder.
119.5
119.6 CTL_SettingsFile=\u8bbe\u7f6e\u6587\u4ef6
119.7 +# {0} - the path
119.8 +EXC_FIND_4_INVALID=\u6587\u4ef6{0}\u4f3c\u4e4e\u4e0d\u518d\u6709\u6548!
119.9 EXC_NO_LONGER_VALID=\u590d\u5236\u7684\u6587\u4ef6{0}\u4e0d\u518d\u6709\u6548!
119.10 # {0} - File name
119.11 LBL_Copying=\u590d\u5236{0}
120.1 --- a/src/zh_CN/platform/templates/templates/org/netbeans/modules/templates/ui/Bundle_zh_CN.properties Wed Jul 30 05:03:48 2014 -0700
120.2 +++ b/src/zh_CN/platform/templates/templates/org/netbeans/modules/templates/ui/Bundle_zh_CN.properties Wed Jul 30 05:12:06 2014 -0700
120.3 @@ -70,6 +70,8 @@
120.4
120.5 ACD_TemplatesPanel_Delete=\u5220\u9664\u6a21\u677f
120.6
120.7 +# {0} - The file name
120.8 +MSG_FileIsLocked=\u6587\u4ef6{0}\u5df2\u5728\u4f7f\u7528\u4e2d\u3002
120.9 # {0} - file name
120.10 MSG_TemplatesPanel_Nonexistent_File=\u6587\u4ef6 ''{0}''\n\u4e0d\u5b58\u5728, \u8bf7\u6307\u5b9a\u4e00\u4e2a\u73b0\u6709\u6587\u4ef6\u3002
120.11 # {0} - prefix of the license file name
120.12 @@ -81,7 +83,7 @@
120.13 TemplatesPanel_TemplateNode_FileName=\u6587\u4ef6\u540d
120.14 TemplatesPanel_TemplateNode_FileName_Desc=\u6b64\u6a21\u677f\u8868\u793a\u7684\u6587\u4ef6\u7684\u540d\u79f0\u3002
120.15 TemplatesPanel_TemplateNode_License=\u8bb8\u53ef\u8bc1 URL
120.16 -TemplatesPanel_TemplateNode_License_Desc=\u6b64\u8bb8\u53ef\u8bc1\u7684\u6388\u6743 Web \u4f4d\u7f6e\u3002
120.17 +TemplatesPanel_TemplateNode_License_Desc=\u6b64\u8bb8\u53ef\u8bc1\u7684\u6388\u6743 Web \u4f4d\u7f6e (\u53ef\u5305\u542b\u591a\u4e2a\u7528\u7a7a\u683c\u5206\u9694\u7684\u4f4d\u7f6e)\u3002
120.18 TemplatesPanel_TemplateNode_ScriptEngine=\u811a\u672c\u5f15\u64ce
120.19 TemplatesPanel_TemplateNode_ScriptEngine_Desc=\u7528\u4e8e\u5904\u7406\u6b64\u6a21\u677f\u7684\u811a\u672c\u5f15\u64ce\u3002
120.20 TemplatesPanel_TemplateNode_TemplateCategories=\u6a21\u677f\u7c7b\u522b
121.1 --- a/src/zh_CN/profiler/org-netbeans-lib-profiler-common/org-netbeans-lib-profiler-common/org/netbeans/lib/profiler/common/integration/Bundle_zh_CN.properties Wed Jul 30 05:03:48 2014 -0700
121.2 +++ b/src/zh_CN/profiler/org-netbeans-lib-profiler-common/org-netbeans-lib-profiler-common/org/netbeans/lib/profiler/common/integration/Bundle_zh_CN.properties Wed Jul 30 05:12:06 2014 -0700
121.3 @@ -45,6 +45,7 @@
121.4
121.5
121.6
121.7 +IntegrationUtils_PlatformJava90=Java SE 9.0
121.8
121.9
121.10
121.11 @@ -77,6 +78,7 @@
121.12 IntegrationUtils_Jdk60Name=Java SE 6 (JRE \u6216 JDK)
121.13 IntegrationUtils_Jdk70Name=Java SE 7 (JRE \u6216 JDK)
121.14 IntegrationUtils_Jdk80Name=Java SE 8 (JRE \u6216 JDK)
121.15 +IntegrationUtils_Jdk90Name=Java SE 9 (JRE \u6216 JDK)
121.16 IntegrationUtils_JdkCvmName=CVM
121.17 IntegrationUtils_RemoteString=\u8fdc\u7a0b
121.18 # HTML-formatted
122.1 --- a/src/zh_CN/webcommon/cordova-platforms-android/cordova-platforms-android/org/netbeans/modules/cordova/platforms/android/Bundle_zh_CN.properties Wed Jul 30 05:03:48 2014 -0700
122.2 +++ b/src/zh_CN/webcommon/cordova-platforms-android/cordova-platforms-android/org/netbeans/modules/cordova/platforms/android/Bundle_zh_CN.properties Wed Jul 30 05:12:06 2014 -0700
122.3 @@ -40,12 +40,12 @@
122.4 build-ios=\u6784\u5efa iOS
122.5 build-android=\u6784\u5efa Android
122.6 ERR_AndroidNotConfigured=\u672a\u914d\u7f6e Android \u5e73\u53f0\u3002\n\u662f\u5426\u914d\u7f6e?
122.7 -ERR_ConnectAndroidDevice=\u8bf7\u8fde\u63a5 Android \u8bbe\u5907\u5e76\u786e\u4fdd:\n\u2022 \u5728\u60a8\u7684\u8bbe\u5907\u4e0a\u542f\u7528\u4e86 USB \u8c03\u8bd5\n\u2022 \u5728\u79fb\u52a8 Chrome \u4e0a\u542f\u7528\u4e86 USB Web \u8c03\u8bd5 (\u201c\u8bbe\u7f6e\u201d>\u201c\u9ad8\u7ea7\u201d>\u201c\u5f00\u53d1\u4eba\u5458\u5de5\u5177\u201d)\n\u2022 \u60a8\u7684\u8ba1\u7b97\u673a\u548c Android \u8bbe\u5907\u8fde\u63a5\u5230\u76f8\u540c\u7684 WiFi \u7f51\u7edc
122.8 +ERR_ConnectAndroidDevice=\u8bf7\u8fde\u63a5 Android \u8bbe\u5907\u5e76\u786e\u4fdd:\n\u2022 \u5728\u60a8\u7684\u8bbe\u5907\u4e0a\u542f\u7528\u4e86 USB \u8c03\u8bd5\n\u2022 \u60a8\u7684\u8ba1\u7b97\u673a\u548c Android \u8bbe\u5907\u8fde\u63a5\u5230\u76f8\u540c\u7684 WiFi \u7f51\u7edc
122.9 ERR_NO_Cordova=NetBeans \u5728\u60a8\u7684 PATH \u4e0a\u627e\u4e0d\u5230 cordova \u6216 git\u3002\u8bf7\u5b89\u88c5 cordova \u548c git\u3002<br>\nNetBeans \u53ef\u80fd\u9700\u8981\u91cd\u65b0\u542f\u52a8\u4ee5\u4f7f\u66f4\u6539\u751f\u6548\u3002\n
122.10 ERR_RunAndroidEmulator=\u8bf7\u8fd0\u884c Android \u4eff\u771f\u5668\u3002
122.11 ERR_Title=\u9519\u8bef
122.12 ERR_Unknown=\u672a\u77e5\u9519\u8bef\u3002
122.13 -ERR_WebDebug=\u65e0\u6cd5\u8fde\u63a5\u5230 Chrome\u3002\n\u8bf7\u786e\u4fdd:\n\u2022 \u5df2\u8fde\u63a5\u8bbe\u5907\n\u2022 \u5728\u60a8\u7684\u8bbe\u5907\u4e0a\u542f\u7528\u4e86 USB \u8c03\u8bd5\n\u2022 \u5728\u79fb\u52a8 Chrome \u4e0a\u542f\u7528\u4e86 USB Web \u8c03\u8bd5 (\u201c\u8bbe\u7f6e\u201d>\u201c\u9ad8\u7ea7\u201d>\u201c\u5f00\u53d1\u4eba\u5458\u5de5\u5177\u201d)\n\u2022 \u60a8\u7684\u8ba1\u7b97\u673a\u548c Android \u8bbe\u5907\u8fde\u63a5\u5230\u76f8\u540c\u7684 WiFi \u7f51\u7edc
122.14 +ERR_WebDebug=\u65e0\u6cd5\u8fde\u63a5\u5230 Chrome\u3002\n\u8bf7\u786e\u4fdd:\n\u2022 \u5df2\u8fde\u63a5\u8bbe\u5907\n\u2022 \u5728\u60a8\u7684\u8bbe\u5907\u4e0a\u542f\u7528\u4e86 USB \u8c03\u8bd5\n\u2022 \u60a8\u7684\u8ba1\u7b97\u673a\u548c Android \u8bbe\u5907\u8fde\u63a5\u5230\u76f8\u540c\u7684 WiFi \u7f51\u7edc
122.15 LBL_AndroidConnectedDevice=\u8fde\u63a5\u7684\u8bbe\u5907
122.16 LBL_AndroidEmulator=\u4eff\u771f\u5668
122.17 LBL_BrowserTitle=Android \u6d4f\u89c8\u5668
123.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
123.2 +++ b/src/zh_CN/webcommon/cordova-platforms/cordova-platforms/org/netbeans/modules/cordova/platforms/api/Bundle_zh_CN.properties Wed Jul 30 05:12:06 2014 -0700
123.3 @@ -0,0 +1,5 @@
123.4 +LBL_ConnectingIOSDevice=\u6b63\u5728\u8fde\u63a5\u5230 iOS \u8bbe\u5907...
123.5 +LBL_ConnectionAndroidDevice=\u6b63\u5728\u8fde\u63a5\u5230 Android \u8bbe\u5907...
123.6 +LBL_ConnectionAndroidEmulator=\u6b63\u5728\u8fde\u63a5\u5230 Android \u4eff\u771f\u5668...
123.7 +LBL_ConnectionIOSSimulator=\u6b63\u5728\u8fde\u63a5\u5230 iOS \u6a21\u62df\u7a0b\u5e8f...
123.8 +
124.1 --- a/src/zh_CN/webcommon/javascript-jstestdriver/javascript-jstestdriver/org/netbeans/modules/javascript/jstestdriver/Bundle_zh_CN.properties Wed Jul 30 05:03:48 2014 -0700
124.2 +++ b/src/zh_CN/webcommon/javascript-jstestdriver/javascript-jstestdriver/org/netbeans/modules/javascript/jstestdriver/Bundle_zh_CN.properties Wed Jul 30 05:12:06 2014 -0700
124.3 @@ -41,8 +41,9 @@
124.4 JsTestDriverResolver=js-test-driver \u914d\u7f6e\u6587\u4ef6
124.5 # {0} - project name
124.6 JsTestDriverSupport.runner.title={0} (JS \u6d4b\u8bd5\u9a71\u52a8\u7a0b\u5e8f)
124.7 +JsTestingProviderImpl.chooser.title=\u9009\u62e9 jsTestDriver.conf
124.8 JsTestingProviderImpl.displayName=JS \u6d4b\u8bd5\u9a71\u52a8\u7a0b\u5e8f
124.9 -JsTestingProviderImpl.error.config=\u65e0\u6cd5\u8fd0\u884c\u6d4b\u8bd5, \u672a\u627e\u5230 jsTestDriver.conf\u3002
124.10 +JsTestingProviderImpl.error.config=\u65e0\u6cd5\u8fd0\u884c\u6d4b\u8bd5, \u672a\u63d0\u4f9b jsTestDriver.conf\u3002
124.11 OpenIDE-Module-Name=js-test-driver \u652f\u6301
124.12
124.13 Templates/Html5Tests=\u5355\u5143\u6d4b\u8bd5
125.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
125.2 +++ b/src/zh_CN/webcommon/javascript-jstestdriver/javascript-jstestdriver/org/netbeans/modules/javascript/jstestdriver/preferences/Bundle_zh_CN.properties Wed Jul 30 05:12:06 2014 -0700
125.3 @@ -0,0 +1,12 @@
125.4 +JsTestDriverPreferencesValidator.config.name=\u914d\u7f6e
125.5 +# {0} - source
125.6 +JsTestDriverPreferencesValidator.validateFile.missing=\u5fc5\u987b\u9009\u62e9{0}\u3002
125.7 +# {0} - source
125.8 +JsTestDriverPreferencesValidator.validateFile.notAbsolute={0}\u5fc5\u987b\u4e3a\u7edd\u5bf9\u8def\u5f84\u3002
125.9 +# {0} - source
125.10 +JsTestDriverPreferencesValidator.validateFile.notFile={0}\u5fc5\u987b\u662f\u6709\u6548\u6587\u4ef6\u3002
125.11 +# {0} - source
125.12 +JsTestDriverPreferencesValidator.validateFile.notReadable={0}\u4e0d\u53ef\u8bfb\u3002
125.13 +# {0} - source
125.14 +JsTestDriverPreferencesValidator.validateFile.notWritable={0}\u4e0d\u53ef\u5199\u3002
125.15 +
126.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
126.2 +++ b/src/zh_CN/webcommon/javascript-jstestdriver/javascript-jstestdriver/org/netbeans/modules/javascript/jstestdriver/ui/customizer/Bundle_zh_CN.properties Wed Jul 30 05:12:06 2014 -0700
126.3 @@ -0,0 +1,46 @@
126.4 +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
126.5 +#
126.6 +# Copyright 2014 Oracle and/or its affiliates. All rights reserved.
126.7 +#
126.8 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
126.9 +# Other names may be trademarks of their respective owners.
126.10 +#
126.11 +# The contents of this file are subject to the terms of either the GNU
126.12 +# General Public License Version 2 only ("GPL") or the Common
126.13 +# Development and Distribution License("CDDL") (collectively, the
126.14 +# "License"). You may not use this file except in compliance with the
126.15 +# License. You can obtain a copy of the License at
126.16 +# http://www.netbeans.org/cddl-gplv2.html
126.17 +# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
126.18 +# specific language governing permissions and limitations under the
126.19 +# License. When distributing the software, include this License Header
126.20 +# Notice in each file and include the License file at
126.21 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
126.22 +# particular file as subject to the "Classpath" exception as provided
126.23 +# by Oracle in the GPL Version 2 section of the License file that
126.24 +# accompanied this code. If applicable, add the following below the
126.25 +# License Header, with the fields enclosed by brackets [] replaced by
126.26 +# your own identifying information:
126.27 +# "Portions Copyrighted [year] [name of copyright owner]"
126.28 +#
126.29 +# If you wish your version of this file to be governed by only the CDDL
126.30 +# or only the GPL Version 2, indicate your decision by adding
126.31 +# "[Contributor] elects to include this software in this distribution
126.32 +# under the [CDDL or GPL Version 2] license." If you do not indicate a
126.33 +# single choice of license, a recipient has the option to distribute
126.34 +# your version of this file under either the CDDL, the GPL Version 2 or
126.35 +# to extend the choice of license to its licensees as provided above.
126.36 +# However, if you add GPL Version 2 code and therefore, elected the GPL
126.37 +# Version 2 license, then the option applies only if the new code is
126.38 +# made subject to such option by the copyright holder.
126.39 +#
126.40 +# Contributor(s):
126.41 +#
126.42 +# Portions Copyrighted 2014 Sun Microsystems, Inc.
126.43 +
126.44 +CustomizerJsTestDriver.chooser.config=\u9009\u62e9 JS \u6d4b\u8bd5\u9a71\u52a8\u7a0b\u5e8f\u914d\u7f6e\u6587\u4ef6
126.45 +CustomizerJsTestDriver.config.none=\u627e\u4e0d\u5230 jsTestDriver.conf\u3002
126.46 +CustomizerJsTestDriver.configLabel.text=\u914d\u7f6e(&C):
126.47 +CustomizerJsTestDriver.configBrowseButton.text=\u6d4f\u89c8(&B)...
126.48 +CustomizerJsTestDriver.configSearchButton.text=\u641c\u7d22(&S)
126.49 +
127.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
127.2 +++ b/src/zh_CN/webcommon/javascript-karma/javascript-karma/org/netbeans/modules/javascript/karma/coverage/Bundle_zh_CN.properties Wed Jul 30 05:12:06 2014 -0700
127.3 @@ -0,0 +1,2 @@
127.4 +CoverageProcessor.warn.debugCoverage=\u5728 Karma \u8c03\u8bd5\u6a21\u5f0f\u4e0b\u81ea\u52a8\u7981\u7528\u8986\u76d6\u7387\u3002
127.5 +
128.1 --- a/src/zh_CN/webcommon/javascript-karma/javascript-karma/org/netbeans/modules/javascript/karma/preferences/Bundle_zh_CN.properties Wed Jul 30 05:03:48 2014 -0700
128.2 +++ b/src/zh_CN/webcommon/javascript-karma/javascript-karma/org/netbeans/modules/javascript/karma/preferences/Bundle_zh_CN.properties Wed Jul 30 05:12:06 2014 -0700
128.3 @@ -1,3 +1,4 @@
128.4 KarmaPreferencesValidator.config.name=\u914d\u7f6e
128.5 +KarmaPreferencesValidator.debug.browser=\u5fc5\u987b\u8bbe\u7f6e\u7528\u4e8e\u8c03\u8bd5\u7684\u6d4f\u89c8\u5668\u3002
128.6 KarmaPreferencesValidator.karma.name=Karma
128.7
129.1 --- a/src/zh_CN/webcommon/javascript-karma/javascript-karma/org/netbeans/modules/javascript/karma/run/Bundle_zh_CN.properties Wed Jul 30 05:03:48 2014 -0700
129.2 +++ b/src/zh_CN/webcommon/javascript-karma/javascript-karma/org/netbeans/modules/javascript/karma/run/Bundle_zh_CN.properties Wed Jul 30 05:12:06 2014 -0700
129.3 @@ -1,4 +1,5 @@
129.4 JumpToCallStackAction.name=\u8f6c\u81f3\u6e90(&G)
129.5 +TestRunner.noName=<\u6ca1\u6709\u540d\u79f0>
129.6 TestRunner.output.full=\u53ef\u4ee5\u5728\u201c\u8f93\u51fa\u201d\u7a97\u53e3\u4e2d\u627e\u5230\u5b8c\u6574\u8f93\u51fa\u3002
129.7 # {0} - project name
129.8 TestRunner.runner.title={0} (Karma)
130.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
130.2 +++ b/src/zh_CN/webcommon/javascript-karma/javascript-karma/org/netbeans/modules/javascript/karma/ui/Bundle_zh_CN.properties Wed Jul 30 05:12:06 2014 -0700
130.3 @@ -0,0 +1,2 @@
130.4 +KarmaErrorsDialog.message=\u67e5\u770b Karma \u8b66\u544a/\u9519\u8bef\u7684\u8f93\u51fa\u7a97\u53e3
130.5 +
131.1 --- a/src/zh_CN/webcommon/javascript-karma/javascript-karma/org/netbeans/modules/javascript/karma/ui/customizer/Bundle_zh_CN.properties Wed Jul 30 05:03:48 2014 -0700
131.2 +++ b/src/zh_CN/webcommon/javascript-karma/javascript-karma/org/netbeans/modules/javascript/karma/ui/customizer/Bundle_zh_CN.properties Wed Jul 30 05:12:06 2014 -0700
131.3 @@ -50,5 +50,13 @@
131.4 CustomizerKarma.karmaSearchButton.text=\u641c\u7d22(&S)
131.5 CustomizerKarma.configSearchButton.text=\u641c\u7d22(&E)
131.6 CustomizerKarma.autowatchCheckBox.text=\u89c2\u5bdf\u6587\u4ef6\u66f4\u6539\u5e76\u81ea\u52a8\u91cd\u65b0\u8fd0\u884c\u6d4b\u8bd5(&W)
131.7 -KarmaCustomizer.name=Karma
131.8 +CustomizerKarma.debugLabel.text=\u8c03\u8bd5:
131.9 +CustomizerKarma.debugCheckBox.text=\u542f\u7528(&E)
131.10 +CustomizerKarma.debugBrowserIdLabel.text=\u6d4f\u89c8\u5668(&B):
131.11 +CustomizerKarma.coverageLabel.text=\u8986\u76d6\u7387:
131.12 +CustomizerKarma.coverageInfoLabel.text=\u8986\u76d6\u7387\u4f7f\u7528\u63d2\u4ef6 karma-coverage\u3002
131.13 +CustomizerKarma.coverageLearnMoreLabel.text=<html><a href="#">\u4e86\u89e3\u66f4\u591a\u4fe1\u606f</a>
131.14 +CustomizerKarma.coverageIstanbulInfoLabel.text=(\u9700\u8981\u5176\u5e93\u4e3a Istanbul v0.2.5 \u6216\u66f4\u9ad8\u7248\u672c\u3002)
131.15 +CustomizerKarma.coverageConfigLabel.text=<html>\u786e\u4fdd\u5df2\u5728\u914d\u7f6e\u6587\u4ef6\u4e2d\u6b63\u786e\u5b9a\u4e49\u5c5e\u6027 <i>preprocessors</i>\u3002
131.16 +CustomizerKarma.coverageDebugLabel.text=\u5728 Karma \u8c03\u8bd5\u6a21\u5f0f\u4e0b\u81ea\u52a8\u7981\u7528\u8986\u76d6\u7387\u3002
131.17
132.1 --- a/src/zh_CN/webcommon/javascript-karma/javascript-karma/org/netbeans/modules/javascript/karma/ui/logicalview/Bundle_zh_CN.properties Wed Jul 30 05:03:48 2014 -0700
132.2 +++ b/src/zh_CN/webcommon/javascript-karma/javascript-karma/org/netbeans/modules/javascript/karma/ui/logicalview/Bundle_zh_CN.properties Wed Jul 30 05:12:06 2014 -0700
132.3 @@ -1,5 +1,7 @@
132.4 ActiveKarmaConfigAction.name=\u8bbe\u7f6e\u914d\u7f6e
132.5 CustomizeKarmaAction.name=\u5c5e\u6027
132.6 +DebugKarmaServerAction.browser.none=\u9996\u5148\u786e\u8ba4 Karma \u8c03\u8bd5\u5c5e\u6027
132.7 +DebugKarmaServerAction.name=\u8c03\u8bd5
132.8 KarmaNode.description=JavaScript \u6d4b\u8bd5\u8fd0\u884c\u5668
132.9 KarmaNode.displayName=Karma
132.10 RestartKarmaServerAction.name=\u91cd\u65b0\u542f\u52a8
133.1 --- a/src/zh_CN/webcommon/web-client-samples/web-client-samples/org/netbeans/modules/web/client/samples/resources/AngularJSPhoneCat_zh_CN.html Wed Jul 30 05:03:48 2014 -0700
133.2 +++ b/src/zh_CN/webcommon/web-client-samples/web-client-samples/org/netbeans/modules/web/client/samples/resources/AngularJSPhoneCat_zh_CN.html Wed Jul 30 05:12:06 2014 -0700
133.3 @@ -45,6 +45,6 @@
133.4 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
133.5 </head>
133.6 <body>
133.7 - AngularJS 框架教程中使用的应用程序, 大体上借鉴了 Google Phone Gallery。
133.8 + AngularJS 框架教程中使用的应用程序, 大体上借鉴了 Google Phone Gallery。<br>创建后运行 <b>npm install</b> 安装依赖关系。
133.9 </body>
133.10 </html>
134.1 --- a/src/zh_CN/webcommon/web-clientproject-api/web-clientproject-api/org/netbeans/modules/web/clientproject/jstesting/Bundle_zh_CN.properties Wed Jul 30 05:03:48 2014 -0700
134.2 +++ b/src/zh_CN/webcommon/web-clientproject-api/web-clientproject-api/org/netbeans/modules/web/clientproject/jstesting/Bundle_zh_CN.properties Wed Jul 30 05:12:06 2014 -0700
134.3 @@ -42,8 +42,9 @@
134.4 # testing customizer
134.5 CustomizerJsTesting.providerLabel.text=\u6d4b\u8bd5\u63d0\u4f9b\u5668(&T):
134.6
134.7 -CustomizerJsTesting.warning.restart.needed=\u786e\u8ba4\u5e76\u91cd\u65b0\u6253\u5f00\u6b64\u5bf9\u8bdd\u6846\u4ee5\u5e94\u7528\u66f4\u6539\u3002
134.8 JsTestingProviderRenderer.none=<\u65e0>
134.9 +# {0} - file name
134.10 +JsTestLocator.not.found=\u627e\u4e0d\u5230 {0} \u7684\u6d4b\u8bd5/\u5df2\u6d4b\u8bd5\u6587\u4ef6\u3002
134.11 SelectProviderPanel.noneSelected=\u672a\u9009\u62e9\u63d0\u4f9b\u5668\u3002
134.12 # select testing provider
134.13 SelectProviderPanel.providerLabel.text=\u9009\u62e9\u6d4b\u8bd5\u63d0\u4f9b\u5668(&S):
135.1 --- a/src/zh_CN/webcommon/web-clientproject/web-clientproject/org/netbeans/modules/web/clientproject/Bundle_zh_CN.properties Wed Jul 30 05:03:48 2014 -0700
135.2 +++ b/src/zh_CN/webcommon/web-clientproject/web-clientproject/org/netbeans/modules/web/clientproject/Bundle_zh_CN.properties Wed Jul 30 05:12:06 2014 -0700
135.3 @@ -39,7 +39,11 @@
135.4 # Portions Copyrighted 2012 Sun Microsystems, Inc.
135.5
135.6 # {0} - project name
135.7 +ClientSideProject.chooser.tests.title=\u9009\u62e9\u5355\u5143\u6d4b\u8bd5\u6587\u4ef6\u5939 ({0})
135.8 +ClientSideProject.props.saving=\u6b63\u5728\u4fdd\u5b58\u9879\u76ee\u5143\u6570\u636e...
135.9 +# {0} - project name
135.10 ClientSideProjectActionProvider.error.invalidSiteRoot=<html>\u9879\u76ee<b>{0}</b>\u7684\u7ad9\u70b9\u6839\u65e0\u6548, \u8bf7\u5148\u89e3\u51b3\u9879\u76ee\u95ee\u9898\u3002
135.11 +LBL_ConfigureGrunt=\u6b64\u914d\u7f6e\u4e0d\u652f\u6301\u8be5\u64cd\u4f5c\u3002\n\u662f\u5426\u8981\u914d\u7f6e\u9879\u76ee\u64cd\u4f5c\u4ee5\u8c03\u7528 Grunt \u4efb\u52a1?
135.12 OpenIDE-Module-Display-Category=HTML5
135.13 OpenIDE-Module-Long-Description=HTML5 \u5e94\u7528\u7a0b\u5e8f\u9759\u6001\u5ba2\u6237\u7aef\u9879\u76ee
135.14 OpenIDE-Module-Name=HTML5 \u9879\u76ee
135.15 @@ -53,7 +57,6 @@
135.16
135.17 SITE_ROOT=\u7ad9\u70b9\u6839
135.18 UNIT_TESTS=\u5355\u5143\u6d4b\u8bd5
135.19 -CONFIGURATION_FILES=\u914d\u7f6e\u6587\u4ef6
135.20
135.21 # UI Logging - http://wiki.netbeans.org/UsageLoggingSpecification
135.22 # when HTML5 project is opened
136.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
136.2 +++ b/src/zh_CN/webcommon/web-clientproject/web-clientproject/org/netbeans/modules/web/clientproject/bower/Bundle_zh_CN.properties Wed Jul 30 05:12:06 2014 -0700
136.3 @@ -0,0 +1,48 @@
136.4 +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
136.5 +#
136.6 +# Copyright 2013 Oracle and/or its affiliates. All rights reserved.
136.7 +#
136.8 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
136.9 +# Other names may be trademarks of their respective owners.
136.10 +#
136.11 +# The contents of this file are subject to the terms of either the GNU
136.12 +# General Public License Version 2 only ("GPL") or the Common
136.13 +# Development and Distribution License("CDDL") (collectively, the
136.14 +# "License"). You may not use this file except in compliance with the
136.15 +# License. You can obtain a copy of the License at
136.16 +# http://www.netbeans.org/cddl-gplv2.html
136.17 +# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
136.18 +# specific language governing permissions and limitations under the
136.19 +# License. When distributing the software, include this License Header
136.20 +# Notice in each file and include the License file at
136.21 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
136.22 +# particular file as subject to the "Classpath" exception as provided
136.23 +# by Oracle in the GPL Version 2 section of the License file that
136.24 +# accompanied this code. If applicable, add the following below the
136.25 +# License Header, with the fields enclosed by brackets [] replaced by
136.26 +# your own identifying information:
136.27 +# "Portions Copyrighted [year] [name of copyright owner]"
136.28 +#
136.29 +# If you wish your version of this file to be governed by only the CDDL
136.30 +# or only the GPL Version 2, indicate your decision by adding
136.31 +# "[Contributor] elects to include this software in this distribution
136.32 +# under the [CDDL or GPL Version 2] license." If you do not indicate a
136.33 +# single choice of license, a recipient has the option to distribute
136.34 +# your version of this file under either the CDDL, the GPL Version 2 or
136.35 +# to extend the choice of license to its licensees as provided above.
136.36 +# However, if you add GPL Version 2 code and therefore, elected the GPL
136.37 +# Version 2 license, then the option applies only if the new code is
136.38 +# made subject to such option by the copyright holder.
136.39 +#
136.40 +# Contributor(s):
136.41 +#
136.42 +# Portions Copyrighted 2013 Sun Microsystems, Inc.
136.43 +
136.44 +CTL_BowerInstallAction=Bower \u5b89\u88c5
136.45 +ERR_BowerInstall=\u7f3a\u5c11 Bower \u6a21\u5757
136.46 +ERR_BowerInstallResolved=\u5df2\u6210\u529f\u5b89\u88c5 Bower \u6a21\u5757\u3002
136.47 +ERR_BowerInstallUnresolved=\u672a\u6210\u529f\u5b89\u88c5 Bower \u6a21\u5757\u3002
136.48 +# {0} - project name
136.49 +TTL_bower_install=bower \u5b89\u88c5 ({0})
136.50 +TXT_BowerInstallDescription=\u6b64\u9879\u76ee\u4f7f\u7528 Bower \u6a21\u5757, \u4f46\u672a\u5b89\u88c5\u8fd9\u4e9b\u6a21\u5757\u3002
136.51 +
137.1 --- a/src/zh_CN/webcommon/web-clientproject/web-clientproject/org/netbeans/modules/web/clientproject/grunt/Bundle_zh_CN.properties Wed Jul 30 05:03:48 2014 -0700
137.2 +++ b/src/zh_CN/webcommon/web-clientproject/web-clientproject/org/netbeans/modules/web/clientproject/grunt/Bundle_zh_CN.properties Wed Jul 30 05:12:06 2014 -0700
137.3 @@ -38,14 +38,18 @@
137.4 #
137.5 # Portions Copyrighted 2013 Sun Microsystems, Inc.
137.6
137.7 -LBL_gruntfile.js=Gruntfile
137.8 LBL_LoadingTasks=\u6b63\u5728\u52a0\u8f7d\u4efb\u52a1...
137.9 -LBL_package.json=package.json
137.10 -LBL_plugins.properties=Cordova \u63d2\u4ef6
137.11 -LBL_run_targets_action=\u8fd0\u884c\u4efb\u52a1
137.12 -LBL_important_files=\u91cd\u8981\u6587\u4ef6
137.13 +LBL_RefreshTasks=\u91cd\u65b0\u52a0\u8f7d\u4efb\u52a1
137.14 +LBL_run_targets_action=Grunt \u4efb\u52a1
137.15
137.16 -
137.17 +ERR_NoGruntfile=\u627e\u4e0d\u5230 Gruntfile.js\u3002
137.18 +GruntCustomizerPanel.buildCheckBox.text=\u6784\u5efa\u9879\u76ee(&B)
137.19 +GruntCustomizerPanel.rebuildCheckBox.text=\u6e05\u7406\u5e76\u6784\u5efa\u9879\u76ee(&A)
137.20 +GruntCustomizerPanel.buildTextField.text=\u6784\u5efa
137.21 +GruntCustomizerPanel.cleanTextField.text=\u6e05\u7406
137.22 +GruntCustomizerPanel.rebuildTextField.text=\u6e05\u7406\u6784\u5efa
137.23 +GruntCustomizerPanel.label.text=\u4e3a Grunt \u4efb\u52a1\u5206\u914d IDE \u64cd\u4f5c\u3002
137.24 +GruntCustomizerPanel.cleanCheckBox.text=\u6e05\u7406\u9879\u76ee(&C)
137.25 # {0} - Project Name
137.26 # {1} - Task Name
137.27
138.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
138.2 +++ b/src/zh_CN/webcommon/web-clientproject/web-clientproject/org/netbeans/modules/web/clientproject/node/Bundle_zh_CN.properties Wed Jul 30 05:12:06 2014 -0700
138.3 @@ -0,0 +1,55 @@
138.4 +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
138.5 +#
138.6 +# Copyright 2013 Oracle and/or its affiliates. All rights reserved.
138.7 +#
138.8 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
138.9 +# Other names may be trademarks of their respective owners.
138.10 +#
138.11 +# The contents of this file are subject to the terms of either the GNU
138.12 +# General Public License Version 2 only ("GPL") or the Common
138.13 +# Development and Distribution License("CDDL") (collectively, the
138.14 +# "License"). You may not use this file except in compliance with the
138.15 +# License. You can obtain a copy of the License at
138.16 +# http://www.netbeans.org/cddl-gplv2.html
138.17 +# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
138.18 +# specific language governing permissions and limitations under the
138.19 +# License. When distributing the software, include this License Header
138.20 +# Notice in each file and include the License file at
138.21 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
138.22 +# particular file as subject to the "Classpath" exception as provided
138.23 +# by Oracle in the GPL Version 2 section of the License file that
138.24 +# accompanied this code. If applicable, add the following below the
138.25 +# License Header, with the fields enclosed by brackets [] replaced by
138.26 +# your own identifying information:
138.27 +# "Portions Copyrighted [year] [name of copyright owner]"
138.28 +#
138.29 +# If you wish your version of this file to be governed by only the CDDL
138.30 +# or only the GPL Version 2, indicate your decision by adding
138.31 +# "[Contributor] elects to include this software in this distribution
138.32 +# under the [CDDL or GPL Version 2] license." If you do not indicate a
138.33 +# single choice of license, a recipient has the option to distribute
138.34 +# your version of this file under either the CDDL, the GPL Version 2 or
138.35 +# to extend the choice of license to its licensees as provided above.
138.36 +# However, if you add GPL Version 2 code and therefore, elected the GPL
138.37 +# Version 2 license, then the option applies only if the new code is
138.38 +# made subject to such option by the copyright holder.
138.39 +#
138.40 +# Contributor(s):
138.41 +#
138.42 +# Portions Copyrighted 2013 Sun Microsystems, Inc.
138.43 +
138.44 +CTL_NpmInstall=Npm \u5b89\u88c5
138.45 +ERR_NpmInstall=\u7f3a\u5c11 Node.JS \u6a21\u5757
138.46 +ERR_NpmInstallResolved=\u5df2\u6210\u529f\u5b89\u88c5 Node.JS \u6a21\u5757\u3002
138.47 +ERR_NpmInstallUnresolved=\u672a\u6210\u529f\u5b89\u88c5 Node.JS \u6a21\u5757\u3002
138.48 +LBL_bower.json=bower.json
138.49 +LBL_bowerrc=.bowerrc
138.50 +LBL_gruntfile.js=Gruntfile
138.51 +LBL_important_files=\u91cd\u8981\u6587\u4ef6
138.52 +CTL_NpmInstallAction=npm install
138.53 +LBL_package.json=package.json
138.54 +LBL_plugins.properties=Cordova \u63d2\u4ef6
138.55 +# {0} - project name
138.56 +TTL_npm_install=npm \u5b89\u88c5 ({0})
138.57 +TXT_NpmInstallDescription=\u6b64\u9879\u76ee\u4f7f\u7528 Node.JS \u6a21\u5757, \u4f46\u672a\u5b89\u88c5\u8fd9\u4e9b\u6a21\u5757\u3002
138.58 +
139.1 --- a/src/zh_CN/webcommon/web-clientproject/web-clientproject/org/netbeans/modules/web/clientproject/problems/Bundle_zh_CN.properties Wed Jul 30 05:03:48 2014 -0700
139.2 +++ b/src/zh_CN/webcommon/web-clientproject/web-clientproject/org/netbeans/modules/web/clientproject/problems/Bundle_zh_CN.properties Wed Jul 30 05:12:06 2014 -0700
139.3 @@ -1,8 +1,3 @@
139.4 -# {0} - src dir path
139.5 -ProjectPropertiesProblemProvider.invalidConfigDir.description=\u76ee\u5f55 "{0}" \u4e0d\u5b58\u5728, \u65e0\u6cd5\u7528\u4e8e\u914d\u7f6e\u6587\u4ef6\u3002
139.6 -# {0} - project name
139.7 -ProjectPropertiesProblemProvider.invalidConfigDir.dialog.title=\u9009\u62e9{0}\u7684\u914d\u7f6e\u6587\u4ef6
139.8 -ProjectPropertiesProblemProvider.invalidConfigDir.title=\u914d\u7f6e\u6587\u4ef6\u65e0\u6548
139.9 # {0} - src dir path
139.10 ProjectPropertiesProblemProvider.invalidSiteRootDir.description=\u76ee\u5f55 "{0}" \u4e0d\u5b58\u5728, \u65e0\u6cd5\u7528\u4e8e\u7ad9\u70b9\u6839\u3002
139.11 ProjectPropertiesProblemProvider.invalidSiteRootDir.title=\u7ad9\u70b9\u6839\u65e0\u6548
140.1 --- a/src/zh_CN/webcommon/web-clientproject/web-clientproject/org/netbeans/modules/web/clientproject/sites/Bundle_zh_CN.properties Wed Jul 30 05:03:48 2014 -0700
140.2 +++ b/src/zh_CN/webcommon/web-clientproject/web-clientproject/org/netbeans/modules/web/clientproject/sites/Bundle_zh_CN.properties Wed Jul 30 05:12:06 2014 -0700
140.3 @@ -43,7 +43,7 @@
140.4 LBL_SiteZipPanel_Select=\u9009\u62e9
140.5 LBL_SiteZipPanel_Title=\u9009\u62e9\u6a21\u677f\u6863\u6848\u6587\u4ef6
140.6
140.7 -SiteAngularJsSeed.description=AngularJS \u9879\u76ee\u7684\u7ad9\u70b9\u6a21\u677f\u3002
140.8 +SiteAngularJsSeed.description=\u7528\u4e8e AngularJS \u9879\u76ee\u7684\u7ad9\u70b9\u6a21\u677f\u3002\n\n\u521b\u5efa\u540e, \u8fd0\u884c "npm install" \u5b89\u88c5\u4f9d\u8d56\u5173\u7cfb\u3002
140.9
140.10 SiteHtml5BoilerplateV4.description=\u6765\u81ea html5boilerplate.com \u7684\u7ad9\u70b9\u6a21\u677f\u3002\u7248\u672c: 4.2.0
140.11
141.1 --- a/src/zh_CN/webcommon/web-clientproject/web-clientproject/org/netbeans/modules/web/clientproject/ui/Bundle_zh_CN.properties Wed Jul 30 05:03:48 2014 -0700
141.2 +++ b/src/zh_CN/webcommon/web-clientproject/web-clientproject/org/netbeans/modules/web/clientproject/ui/Bundle_zh_CN.properties Wed Jul 30 05:12:06 2014 -0700
141.3 @@ -48,7 +48,6 @@
141.4
141.5 SITE_ROOT=\u7ad9\u70b9\u6839
141.6 UNIT_TESTS=\u5355\u5143\u6d4b\u8bd5
141.7 -CONFIGURATION_FILES=\u914d\u7f6e\u6587\u4ef6
141.8
141.9 # browse folders
141.10 LBL_Folders=\u6587\u4ef6\u5939(&F):
142.1 --- a/src/zh_CN/webcommon/web-clientproject/web-clientproject/org/netbeans/modules/web/clientproject/ui/customizer/Bundle_zh_CN.properties Wed Jul 30 05:03:48 2014 -0700
142.2 +++ b/src/zh_CN/webcommon/web-clientproject/web-clientproject/org/netbeans/modules/web/clientproject/ui/customizer/Bundle_zh_CN.properties Wed Jul 30 05:12:06 2014 -0700
142.3 @@ -45,7 +45,6 @@
142.4 CustomizerProviderImpl.title=\u9879\u76ee\u5c5e\u6027 - {0}
142.5 ProjectServer.external.title=\u5916\u90e8
142.6 ProjectServer.internal.title=\u5d4c\u5165\u5f0f\u5c0f\u578b
142.7 -SourcesPanel.browse.configFolder=\u9009\u62e9\u914d\u7f6e
142.8 SourcesPanel.browse.siteRootFolder=\u9009\u62e9\u7ad9\u70b9\u6839
142.9 SourcesPanel.browse.testFolder=\u9009\u62e9\u5355\u5143\u6d4b\u8bd5
142.10 # sources category
142.11 @@ -58,8 +57,6 @@
142.12 SourcesPanel.jLabel3.text=\u5355\u5143\u6d4b\u8bd5\u6587\u4ef6\u5939:
142.13 SourcesPanel.jLabel2.text=\u7ad9\u70b9\u6839\u6587\u4ef6\u5939:
142.14
142.15 -SourcesPanel.configLabel.text=\u914d\u7f6e\u6587\u4ef6\u5939:
142.16 -SourcesPanel.configBrowseButton.text=\u6d4f\u89c8...
142.17
142.18 # run category
142.19 RunPanel.jLabel2.text=Web \u670d\u52a1\u5668:
143.1 --- a/src/zh_CN/webcommon/web-clientproject/web-clientproject/org/netbeans/modules/web/clientproject/validation/Bundle_zh_CN.properties Wed Jul 30 05:03:48 2014 -0700
143.2 +++ b/src/zh_CN/webcommon/web-clientproject/web-clientproject/org/netbeans/modules/web/clientproject/validation/Bundle_zh_CN.properties Wed Jul 30 05:12:06 2014 -0700
143.3 @@ -1,8 +1,5 @@
143.4 -ProjectFoldersValidator.error.config.invalid=\u914d\u7f6e\u5fc5\u987b\u4e3a\u6709\u6548\u7684\u76ee\u5f55\u3002
143.5 -ProjectFoldersValidator.error.config.notUnderProjectDir=\u914d\u7f6e\u5fc5\u987b\u4f4d\u4e8e\u9879\u76ee\u76ee\u5f55\u4e0b\u3002
143.6 ProjectFoldersValidator.error.siteRoot.invalid=\u7ad9\u70b9\u6839\u5fc5\u987b\u4e3a\u6709\u6548\u7684\u76ee\u5f55\u3002
143.7 ProjectFoldersValidator.error.test.invalid=\u5355\u5143\u6d4b\u8bd5\u5fc5\u987b\u4e3a\u6709\u6548\u7684\u76ee\u5f55\u3002
143.8 -ProjectFoldersValidator.error.test.notUnderProjectDir=\u5355\u5143\u6d4b\u8bd5\u5fc5\u987b\u4f4d\u4e8e\u9879\u76ee\u76ee\u5f55\u4e0b\u3002
143.9 RunProjectValidator.error.projectUrl.invalid=\u9879\u76ee URL \u65e0\u6548\u3002
143.10 RunProjectValidator.error.projectUrl.invalidProtocol=\u9879\u76ee URL \u5fc5\u987b\u4ee5 http(s):// \u6216 file:// \u5f00\u5934\u3002
143.11 RunProjectValidator.error.projectUrl.missing=\u7f3a\u5c11\u9879\u76ee URL\u3002