1.1 --- a/src/zh_CN/apisupport/apisupport-ant/apisupport-ant/org/netbeans/modules/apisupport/project/ui/customizer/Bundle_zh_CN.properties Wed Feb 26 18:44:50 2014 -0800
1.2 +++ b/src/zh_CN/apisupport/apisupport-ant/apisupport-ant/org/netbeans/modules/apisupport/project/ui/customizer/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
1.3 @@ -184,10 +184,10 @@
1.4
1.5 # {0} - module code name base
1.6 # {1} - module short description
1.7 -SuiteCustomizerLibraries.HINT_module_desc=[{0}] {1}
1.8 +
1.9
1.10 # {0} - module code name base
1.11 -SuiteCustomizerLibraries.HINT_module_no_desc=[{0}]
1.12 +
1.13 LBL_AddProject=\u6dfb\u52a0\u9879\u76ee(&A)...
1.14 LBL_AddCluster=\u6dfb\u52a0\u96c6\u7fa4(&C)...
1.15 LBL_PlatformOrigin=\u5e73\u53f0
1.16 @@ -356,7 +356,7 @@
1.17 LAB_ClusterizeAction_EAGER=\u6025\u6027
1.18 MSG_ClusterizeCodeNameBase=\u4ee3\u7801\u540d\u79f0
1.19 MSG_ClusterizeActivateAs=\u6fc0\u6d3b\u4e3a
1.20 -MSG_ClusterizeNumberOfModules=#
1.21 +
1.22
1.23 EditClusterPanel.clusterDir.text=\u96c6\u7fa4\u76ee\u5f55(&C):
1.24 EditClusterPanel.AccessibleContext.accessibleDescription=\u6dfb\u52a0\u6216\u7f16\u8f91\u5916\u90e8\u96c6\u7fa4
2.1 --- a/src/zh_CN/apisupport/apisupport-wizards/apisupport-wizards/org/netbeans/modules/apisupport/project/ui/wizard/loader/Bundle_zh_CN.properties Wed Feb 26 18:44:50 2014 -0800
2.2 +++ b/src/zh_CN/apisupport/apisupport-wizards/apisupport-wizards/org/netbeans/modules/apisupport/project/ui/wizard/loader/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
2.3 @@ -90,7 +90,16 @@
2.4
2.5
2.6
2.7 -MSG_NotValidMimeType=MIME \u7c7b\u578b\u65e0\u6548\u3002
2.8 +# {0} - mime type
2.9 +MSG_Empty_String_After_Slash="{0}" \u4e2d\u7684 ''/'' \u540e\u4e3a\u7a7a\u5b57\u7b26\u4e32
2.10 +# {0} - mime type
2.11 +MSG_Invalid_MimeType=Mime \u7c7b\u578b="{0}" \u65e0\u6548
2.12 +# {0} - mime type
2.13 +MSG_Mime_Not_Contain_Slash=Mime \u7c7b\u578b "{0}" \u4e0d\u5305\u542b ''/''\u3002
2.14 +# {0} - mime type
2.15 +MSG_More_Slashes="{0}" \u4e2d\u5305\u542b\u591a\u4e2a\u6b63\u659c\u6760
2.16 +# {0} - mime type
2.17 +MSG_More_Successive_Slashes="{0}" \u4e2d\u5305\u542b\u591a\u4e2a\u8fde\u7eed\u6b63\u659c\u6760
2.18 MSG_NoNamespace=\u8bf7\u6307\u5b9a\u540d\u79f0\u7a7a\u95f4\u3002
2.19 MSG_NoExtension=\u8bf7\u81f3\u5c11\u6307\u5b9a\u4e00\u4e2a\u6587\u4ef6\u6269\u5c55\u540d\u3002
2.20 MSG_BadExtensionPattern=\u6269\u5c55\u540d\u6a21\u5f0f\u65e0\u6548\u3002\u8bf7\u8f93\u5165\u4ee5\u7a7a\u683c\u6216\u9017\u53f7\u5206\u9694\u7684\u6269\u5c55\u540d\u5217\u8868\u3002
3.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 Feb 26 18:44:50 2014 -0800
3.2 +++ b/src/zh_CN/cnd/cnd-debugger-common2/cnd-debugger-common2/org/netbeans/modules/cnd/debugger/common2/debugger/options/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
3.3 @@ -338,7 +338,7 @@
3.4 ACSD_session_reuse_off=\u5173\u95ed
3.5
3.6
3.7 -ACSD_option_pattern={0}: {1}
3.8 +
3.9 ACSD_run_pty=\u8f93\u5165\u7a0b\u5e8f\u8f93\u51fa\u7684 pty \u540d\u79f0
3.10 ACSD_suppress_startup_message=\u8f93\u5165\u8981\u7981\u6b62\u542f\u52a8\u6d88\u606f\u7684 dbx \u7248\u672c\u3002\n\u5426\u5219, \u4ee5\u4e0b\u6240\u6709\u7248\u672c\u90fd\u5c06\u7981\u6b62\u542f\u52a8\u6d88\u606f\u3002
3.11 ACSD_overload_function=\u81ea\u52a8\u8ba1\u7b97\u8fc7\u8f7d\u51fd\u6570\u7684\u503c\u3002
4.1 --- a/src/zh_CN/cnd/cnd-gotodeclaration/cnd-gotodeclaration/org/netbeans/modules/cnd/gotodeclaration/type/Bundle_zh_CN.properties Wed Feb 26 18:44:50 2014 -0800
4.2 +++ b/src/zh_CN/cnd/cnd-gotodeclaration/cnd-gotodeclaration/org/netbeans/modules/cnd/gotodeclaration/type/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
4.3 @@ -41,6 +41,6 @@
4.4 # made subject to such option by the copyright holder.
4.5 #
4.6 TYPE_PROVIDER_DISPLAY_NAME="C/C++ \u7c7b"
4.7 -#CONTEXT_NAME_FORMAT= ({0})
4.8 +
4.9 TYPE_NAME_FORMAT= {0} / {1}
4.10
5.1 --- a/src/zh_CN/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/Bundle_zh_CN.properties Wed Feb 26 18:44:50 2014 -0800
5.2 +++ b/src/zh_CN/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
5.3 @@ -128,3 +128,5 @@
5.4 NOT_FOUND=\u5728 PATH \u4e2d\u627e\u4e0d\u5230 "{0}" \u547d\u4ee4\u3002
5.5 HOST_OFFLINE=\u8fdc\u7a0b\u4e3b\u673a{0}\u5904\u4e8e\u8131\u673a\u72b6\u6001\u3002
5.6
5.7 +EnvResolver_connection_text=IDE \u9700\u8981\u83b7\u53d6\u4e3b\u673a\u73af\u5883\u53d8\u91cf
5.8 +
6.1 --- a/src/zh_CN/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/api/configurations/Bundle_zh_CN.properties Wed Feb 26 18:44:50 2014 -0800
6.2 +++ b/src/zh_CN/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/api/configurations/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
6.3 @@ -115,6 +115,10 @@
6.4 IncludeFlagTxt=\u9644\u52a0\u6e90\u6587\u4ef6
6.5 IncludeFlagHint=\u5c06\u6784\u5efa\u4e2d\u672a\u5305\u62ec\u7684\u6e90\u6587\u4ef6\u6dfb\u52a0\u5230\u4ee3\u7801\u5e2e\u52a9\u4e2d\u3002
6.6
6.7 +ExcludePatternTxt=\u6392\u9664\u6a21\u5f0f
6.8 +ExcludePatternHint=\u201c\u4ece\u4ee3\u7801\u5e2e\u52a9\u4e2d\u6392\u9664\u201d\u6a21\u5f0f\u3002<br>\u4f8b\u5982, \u8981\u4ece\u6587\u4ef6\u5939 lnk \u4e2d\u6392\u9664\u6240\u6709\u6e90\u6587\u4ef6, \u8bf7\u4f7f\u7528:<br><pre>/lnk/</pre>
6.9 +InvalidPattern=\u201c\u4ece\u4ee3\u7801\u5e2e\u52a9\u4e2d\u6392\u9664\u201d\u6a21\u5f0f\u65e0\u6548\u3002
6.10 +
6.11 # Basic Compiler Configuration
6.12 FastBuildTxt=\u65e0\u6807\u5fd7
6.13 DebugTxt=\u8c03\u8bd5
6.14 @@ -165,8 +169,10 @@
6.15 DefaultTxt=\u9ed8\u8ba4
6.16 ModernTxt=\u65b0
6.17 AllTxt=\u5168\u90e8
6.18 -IncludeDirectoriesTxt=\u5305\u542b\u76ee\u5f55\u548c\u5934\u6587\u4ef6
6.19 -IncludeDirectoriesHint=\u5305\u542b\u76ee\u5f55 (\u901a\u8fc7 -I \u9009\u9879\u5305\u542b) \u548c\u5305\u542b\u5934\u6587\u4ef6 (\u901a\u8fc7 -include \u9009\u9879\u5305\u542b)\u3002
6.20 +IncludeDirectoriesTxt=\u5305\u542b\u76ee\u5f55
6.21 +IncludeDirectoriesHint=\u5305\u542b\u76ee\u5f55 (\u901a\u8fc7 -I \u9009\u9879\u5305\u542b)\u3002
6.22 +IncludeFilesTxt=\u5305\u542b\u5934\u6587\u4ef6
6.23 +IncludeFilesHint=\u5305\u542b\u5934\u6587\u4ef6 (\u5305\u542b -include \u9009\u9879)\u3002
6.24 PreprocessorDefinitionsTxt=\u9884\u5904\u7406\u7a0b\u5e8f\u5b9a\u4e49
6.25 PreprocessorDefinitionsHint=\u9884\u5904\u7406\u7a0b\u5e8f\u5b9a\u4e49
6.26 PreprocessorDefinitionsLbl=\u9884\u5904\u7406\u7a0b\u5e8f\u5b9a\u4e49(&O):
7.1 --- a/src/zh_CN/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/configurations/ui/Bundle_zh_CN.properties Wed Feb 26 18:44:50 2014 -0800
7.2 +++ b/src/zh_CN/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/configurations/ui/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
7.3 @@ -250,7 +250,7 @@
7.4 PackagingFilesOuterPanel.ownerTextField.AccessibleContext.accessibleDescription=\u6587\u4ef6\u6240\u6709\u8005
7.5 PackagingFilesOuterPanel.groupTextField.AccessibleContext.accessibleDescription=\u6587\u4ef6\u7ec4
7.6 PackagingNewLinkPanel.nameLabel.text=\u94fe\u63a5\u540d\u79f0(&N):
7.7 -PackagingNewLinkPanel.linkLabel.text=->
7.8 +
7.9
7.10
7.11 PackagingNewLinkPanel.link.text=\u94fe\u63a5\u5230\u7684\u9879(&W):
8.1 --- a/src/zh_CN/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/Bundle_zh_CN.properties Wed Feb 26 18:44:50 2014 -0800
8.2 +++ b/src/zh_CN/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
8.3 @@ -171,10 +171,11 @@
8.4
8.5 #Resolve env vars problem...
8.6 env_var_resolve_name=\u672a\u5b9a\u4e49\u7684\u73af\u5883\u53d8\u91cf
8.7 -env_var_resolve_description=\u8be5\u9879\u76ee\u4f7f\u7528\u73af\u5883\u53d8\u91cf\u3002\u5e76\u975e\u6240\u6709\u6240\u9700\u7684\u73af\u5883\u53d8\u91cf\u5747\u5df2\u8bbe\u7f6e\u3002
8.8 +env_var_resolve_description=\u8be5\u9879\u76ee\u4f7f\u7528\u73af\u5883\u53d8\u91cf\u3002\u672a\u8bbe\u7f6e\u67d0\u4e9b\u5fc5\u9700\u7684\u73af\u5883\u53d8\u91cf\u3002
8.9 env_var_fix_title=\u201c\u73af\u5883\u53d8\u91cf\u672a\u5b9a\u4e49\u201d\u8b66\u544a
8.10 env_var_fix.label.text=\u9879\u76ee\u4f7f\u7528\u4e86\u672a\u5b9a\u4e49\u7684\u73af\u5883\u53d8\u91cf:
8.11 -env_var_fix.solution.text=\u8981\u4fee\u590d\u95ee\u9898, \u8bf7\u6267\u884c\u4ee5\u4e0b\u64cd\u4f5c:\n 1. \u4ece IDE \u4e2d\u9000\u51fa;\n 2. \u8bbe\u7f6e\u73af\u5883\u53d8\u91cf;\n 3. \u91cd\u65b0\u542f\u52a8 IDE\u3002\n\u60a8\u53ef\u4ee5\u4e34\u65f6\u6307\u5b9a\u53d8\u91cf\u7684\u503c\u3002\nIDE \u5c06\u5728\u5f53\u524d\u4f1a\u8bdd\u4e2d\u4f7f\u7528\u8fd9\u4e9b\u503c\u3002
8.12 +env_var_fix.solution.local.text=\u8981\u4fee\u590d\u95ee\u9898, \u8bf7\u6267\u884c\u4ee5\u4e0b\u64cd\u4f5c:\n 1. \u9000\u51fa IDE;\n 2. \u8bbe\u7f6e\u73af\u5883\u53d8\u91cf;\n 3. \u91cd\u65b0\u542f\u52a8 IDE\u3002\n\u60a8\u53ef\u4ee5\u4e34\u65f6\u6307\u5b9a\u53d8\u91cf\u7684\u503c\u3002\nIDE \u5c06\u5728\u5f53\u524d\u4f1a\u8bdd\u4e2d\u4f7f\u7528\u8fd9\u4e9b\u503c\u3002
8.13 +env_var_fix.solution.remote.text=\u8981\u4fee\u590d\u95ee\u9898, \u8bf7\u6267\u884c\u4ee5\u4e0b\u64cd\u4f5c:\n 1. \u5728\u8fdc\u7a0b\u4e3b\u673a\u767b\u5f55 shell \u914d\u7f6e\u6587\u4ef6\u4e2d\u8bbe\u7f6e\u73af\u5883\u53d8\u91cf;\n 2. \u91cd\u65b0\u8fde\u63a5\u4e3b\u673a\u3002\n\u60a8\u53ef\u4ee5\u4e34\u65f6\u6307\u5b9a\u53d8\u91cf\u7684\u503c\u3002\nIDE \u5c06\u5728\u5f53\u524d\u4f1a\u8bdd\u4e2d\u4f7f\u7528\u8fd9\u4e9b\u503c\u3002
8.14
8.15 #Resolve style problem...
8.16 style_resolve_name=\u672a\u5b9a\u4e49\u7684\u683c\u5f0f\u6837\u5f0f
8.17 @@ -183,3 +184,6 @@
8.18 style_cpp=C++
8.19 style_header=C/C++ \u5934
8.20
8.21 +paste_operation_copy=\u65e0\u6cd5\u590d\u5236{0}
8.22 +paste_operation_move=\u65e0\u6cd5\u79fb\u52a8 {0}
8.23 +
9.1 --- a/src/zh_CN/cnd/cnd-refactoring/cnd-refactoring/org/netbeans/modules/cnd/refactoring/ui/Bundle_zh_CN.properties Wed Feb 26 18:44:50 2014 -0800
9.2 +++ b/src/zh_CN/cnd/cnd-refactoring/cnd-refactoring/org/netbeans/modules/cnd/refactoring/ui/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
9.3 @@ -292,7 +292,7 @@
9.4
9.5 # --- GENERAL ------------------------------------------------------------------
9.6 # "Selected" column label
9.7 -LBL_Selected=
9.8 +
9.9 LBL_NotAvailable=<\u4e0d\u53ef\u7528>
9.10
9.11 # --- SAFE DELETE REFACTORING --------------------------------------------------
9.12 @@ -347,7 +347,7 @@
9.13 # Supertype combobox label
9.14 LBL_PullUp_Supertype=\u76ee\u6807\u8d85\u7c7b\u578b(&S):
9.15 # "Selected" column label
9.16 -LBL_PullUp_Selected=
9.17 +
9.18 # "Member" column label
9.19 LBL_PullUp_Member=\u6210\u5458
9.20 # "Make Abstract" column label
10.1 --- a/src/zh_CN/cnd/cnd-remote/cnd-remote/org/netbeans/modules/cnd/remote/actions/Bundle_zh_CN.properties Wed Feb 26 18:44:50 2014 -0800
10.2 +++ b/src/zh_CN/cnd/cnd-remote/cnd-remote/org/netbeans/modules/cnd/remote/actions/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
10.3 @@ -47,14 +47,14 @@
10.4 OpenRemoteProjectAction.submenu.title=\u6253\u5f00\u8fdc\u7a0b C/C++ \u9879\u76ee
10.5
10.6 # {0} is host display name
10.7 -OpenRemoteProjectAction.item.title={0} ...
10.8 +
10.9
10.10 LBL_ManagePlatforms_Name=\u7ba1\u7406\u4e3b\u673a...
10.11
10.12 OpenRemoteFileAction.submenu.title=\u6253\u5f00\u8fdc\u7a0b\u6587\u4ef6
10.13
10.14 # {0} is host display name
10.15 -OpenRemoteFileAction.item.title={0} ...
10.16 +
10.17
10.18 ErrorConnectingHost=\u8fde\u63a5\u4e3b\u673a{0}\u65f6\u51fa\u9519: {1}
10.19 OpenProjectButtonText=\u6253\u5f00\u9879\u76ee
11.1 --- a/src/zh_CN/cnd/cnd-remote/cnd-remote/org/netbeans/modules/cnd/remote/server/Bundle_zh_CN.properties Wed Feb 26 18:44:50 2014 -0800
11.2 +++ b/src/zh_CN/cnd/cnd-remote/cnd-remote/org/netbeans/modules/cnd/remote/server/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
11.3 @@ -66,3 +66,5 @@
11.4 DLG_TITLE_DeletedConnection=\u5220\u9664\u7684\u8fde\u63a5
11.5 ERR_RequestingDeletedConnection=\u8bf7\u6c42\u7684\u64cd\u4f5c\u4f7f\u7528\u7684\u662f\u5df2\u5220\u9664\u7684{0}\u8fde\u63a5\u3002\n\u662f\u5426\u8981\u91cd\u65b0\u8fde\u63a5?
11.6
11.7 +ERR_ConnectingToHost=\u8fde\u63a5\u5230{0}\u65f6\u51fa\u9519: {1}
11.8 +
12.1 --- a/src/zh_CN/cnd/cnd-remote/cnd-remote/org/netbeans/modules/cnd/remote/support/Bundle_zh_CN.properties Wed Feb 26 18:44:50 2014 -0800
12.2 +++ b/src/zh_CN/cnd/cnd-remote/cnd-remote/org/netbeans/modules/cnd/remote/support/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
12.3 @@ -39,7 +39,7 @@
12.4 # Portions Copyrighted 2008 Sun Microsystems, Inc.
12.5
12.6 TITLE_YN_Warning=\u8b66\u544a
12.7 -TITLE_KeyboardInteractive={0}: {1}
12.8 +
12.9
12.10 # RemoteConnectionSupport's authentication failure dialog
12.11 TITLE_AuthFailedRetryDialog=\u91cd\u8bd5\u9a8c\u8bc1\u5bf9\u8bdd\u6846
13.1 --- a/src/zh_CN/cnd/cnd-remote/cnd-remote/org/netbeans/modules/cnd/remote/sync/Bundle_zh_CN.properties Wed Feb 26 18:44:50 2014 -0800
13.2 +++ b/src/zh_CN/cnd/cnd-remote/cnd-remote/org/netbeans/modules/cnd/remote/sync/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
13.3 @@ -82,7 +82,7 @@
13.4 FS_Skew_Slower=\u6587\u4ef6\u7cfb\u7edf\u65f6\u95f4\u6162\u4e86 {0}
13.5
13.6 # separator in the phrselike "4 hours, 5 minutes and 4 seconds"
13.7 -FS_Skew_Comma=,
13.8 +
13.9
13.10 # to replace comma before the last element, e.g. "4 hours, 5 minutes and 4 seconds"
13.11 FS_Skew_And= \u548c
13.12 @@ -96,3 +96,34 @@
13.13 FS_Skew_Second=\u79d2
13.14 FS_Skew_Seconds=\u79d2
13.15
13.16 +FTP_Msg_Err_NewFilesDiscovery=\u521d\u59cb\u5316\u65b0\u6587\u4ef6\u53d1\u73b0\u65f6\u51fa\u9519
13.17 +FTP_Msg_Err_CheckDirs=\u65e0\u6cd5\u68c0\u67e5\u8fdc\u7a0b\u76ee\u5f55\u3002{0}
13.18 +FTP_Msg_Err_CheckLinks=\u65e0\u6cd5\u68c0\u67e5\u8fdc\u7a0b\u94fe\u63a5\u3002{0}
13.19 +FTP_Msg_Err_UploadFile=\u5df2\u5b8c\u6210\u5c06{0}\u4e0a\u8f7d\u5230{1}:{2}, \u4f46\u51fa\u73b0\u9519\u8bef\u4ee3\u7801{3}
13.20 +FTP_Msg_Err_Canceled=\u5df2\u53d6\u6d88
13.21 +
13.22 +FTP_Progress_CheckDirs=\u6b63\u5728\u68c0\u67e5\u76ee\u5f55\u7ed3\u6784
13.23 +FTP_Message_CheckDirs=\u6b63\u5728\u68c0\u67e5\u76ee\u5f55\u7ed3\u6784...
13.24 +
13.25 +FTP_Progress_CheckLinks=\u6b63\u5728\u68c0\u67e5\u94fe\u63a5
13.26 +FTP_Message_CheckLinks=\u6b63\u5728\u68c0\u67e5\u94fe\u63a5...
13.27 +
13.28 +FTP_Progress_UploadFiles=\u6b63\u5728\u4e0a\u8f7d\u5df2\u66f4\u6539\u7684\u6587\u4ef6
13.29 +FTP_Message_UploadFilesPlain=\u6b63\u5728\u4e0a\u8f7d\u5df2\u66f4\u6539\u7684\u6587\u4ef6...
13.30 +FTP_Message_UploadFilesInZip=\u6b63\u5728\u4e0a\u8f7d\u5df2\u66f4\u6539\u7684\u6587\u4ef6:
13.31 +
13.32 +FTP_Message_Zipping=\t\u6b63\u5728\u538b\u7f29\u5df2\u66f4\u6539\u7684\u6587\u4ef6...
13.33 +FTP_Progress_Zipping=\u6b63\u5728\u538b\u7f29\u5df2\u66f4\u6539\u7684\u6587\u4ef6
13.34 +
13.35 +FTP_Message_UploadingZip=\t\u6b63\u5728\u5c06 zip \u4e0a\u8f7d\u5230{0}...
13.36 +FTP_Progress_UploadingZip=\t\u6b63\u5728\u4e0a\u8f7d zip...
13.37 +
13.38 +FTP_Message_Unzipping=\t\u6b63\u5728\u89e3\u538b\u7f29\u5df2\u66f4\u6539\u7684\u6587\u4ef6...
13.39 +FTP_Progress_Unzipping=\u6b63\u5728\u89e3\u538b\u7f29\u5df2\u66f4\u6539\u7684\u6587\u4ef6
13.40 +
13.41 +FTP_Message_GatherFiles=\u6b63\u5728\u6784\u5efa\u9879\u76ee\u6587\u4ef6\u5217\u8868...
13.42 +FTP_Message_Done=\u4e0a\u8f7d\u5df2\u66f4\u6539\u7684\u6587\u4ef6\u5df2\u6210\u529f\u5b8c\u6210\u3002
13.43 +
13.44 +FTP_Err_CantMap=\u627e\u4e0d\u5230{0}\u7684\u8fdc\u7a0b\u8def\u5f84
13.45 +FTP_Err_Unzip=\u5df2\u5b8c\u6210\u5728{1}\u5904\u89e3\u538b\u7f29{0}, \u4f46\u51fa\u73b0\u9519\u8bef\u4ee3\u7801{2}
13.46 +
14.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
14.2 +++ b/src/zh_CN/cnd/cnd-script/cnd-script/org/netbeans/modules/cnd/cmake/editor/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
14.3 @@ -0,0 +1,53 @@
14.4 +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
14.5 +#
14.6 +# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
14.7 +#
14.8 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
14.9 +# Other names may be trademarks of their respective owners.
14.10 +#
14.11 +# The contents of this file are subject to the terms of either the GNU
14.12 +# General Public License Version 2 only ("GPL") or the Common
14.13 +# Development and Distribution License("CDDL") (collectively, the
14.14 +# "License"). You may not use this file except in compliance with the
14.15 +# License. You can obtain a copy of the License at
14.16 +# http://www.netbeans.org/cddl-gplv2.html
14.17 +# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
14.18 +# specific language governing permissions and limitations under the
14.19 +# License. When distributing the software, include this License Header
14.20 +# Notice in each file and include the License file at
14.21 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
14.22 +# particular file as subject to the "Classpath" exception as provided
14.23 +# by Oracle in the GPL Version 2 section of the License file that
14.24 +# accompanied this code. If applicable, add the following below the
14.25 +# License Header, with the fields enclosed by brackets [] replaced by
14.26 +# your own identifying information:
14.27 +# "Portions Copyrighted [year] [name of copyright owner]"
14.28 +#
14.29 +# If you wish your version of this file to be governed by only the CDDL
14.30 +# or only the GPL Version 2, indicate your decision by adding
14.31 +# "[Contributor] elects to include this software in this distribution
14.32 +# under the [CDDL or GPL Version 2] license." If you do not indicate a
14.33 +# single choice of license, a recipient has the option to distribute
14.34 +# your version of this file under either the CDDL, the GPL Version 2 or
14.35 +# to extend the choice of license to its licensees as provided above.
14.36 +# However, if you add GPL Version 2 code and therefore, elected the GPL
14.37 +# Version 2 license, then the option applies only if the new code is
14.38 +# made subject to such option by the copyright holder.
14.39 +#
14.40 +# Contributor(s):
14.41 +#
14.42 +# Portions Copyrighted 2010 Sun Microsystems, Inc.
14.43 +
14.44 +error=\u9519\u8bef
14.45 +keyword=\u5173\u952e\u5b57
14.46 +whitespace=\u7a7a\u767d
14.47 +number=\u6570\u503c
14.48 +label=\u6807\u7b7e
14.49 +operator=\u8fd0\u7b97\u7b26
14.50 +character=\u5b57\u7b26
14.51 +line_comment=\u884c\u6ce8\u91ca
14.52 +comment=\u6ce8\u91ca
14.53 +command=\u547d\u4ee4
14.54 +identifier=\u6807\u8bc6\u7b26
14.55 +string=\u5b57\u7b26\u4e32
14.56 +
15.1 --- a/src/zh_CN/cnd/cnd-testrunner/cnd-testrunner/org/netbeans/modules/cnd/testrunner/ui/Bundle_zh_CN.properties Wed Feb 26 18:44:50 2014 -0800
15.2 +++ b/src/zh_CN/cnd/cnd-testrunner/cnd-testrunner/org/netbeans/modules/cnd/testrunner/ui/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
15.3 @@ -65,9 +65,9 @@
15.4 # The result summary can be a combination of passed, pending, failed and error
15.5 # causing tests. The keys below are for all combinations of these, the preferred
15.6 # order is passed, pending, failed, error.
15.7 -MSG_TestResultSummary1 = {0}, {1}.
15.8 -MSG_TestResultSummary2 = {0}, {1}, {2}.
15.9 -MSG_TestResultSummary3 = {0}, {1}, {2}, {3}.
15.10 +
15.11 +
15.12 +
15.13
15.14 # {0} .. name of the test class
15.15 MSG_TestsuiteNoname=\u6d4b\u8bd5\u5957\u4ef6
16.1 --- a/src/zh_CN/cnd/cnd-toolchain/cnd-toolchain/org/netbeans/modules/cnd/toolchain/ui/options/Bundle_zh_CN.properties Wed Feb 26 18:44:50 2014 -0800
16.2 +++ b/src/zh_CN/cnd/cnd-toolchain/cnd-toolchain/org/netbeans/modules/cnd/toolchain/ui/options/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
16.3 @@ -156,7 +156,7 @@
16.4 MSG_MissingCompilerSet=\u4ee5\u524d\u9009\u5b9a\u7684\u7f16\u8bd1\u5668\u96c6\u5408\u4e0d\u518d\u9002\u7528
16.5
16.6 #VersionCommand and dialog
16.7 -LBL_VersionInfo={1}: {2}
16.8 +
16.9 LBL_VersionInfo_Title=\u7248\u672c\u4fe1\u606f
16.10 LBL_VersionInfo_Progress=\u6b63\u5728\u68c0\u7d22\u5de5\u5177\u7248\u672c
16.11
16.12 @@ -236,35 +236,35 @@
16.13 AddCompilerSetPanel.taInfo.text=\u8f93\u5165\u65b0\u5de5\u5177\u96c6\u5408\u7684\u57fa\u76ee\u5f55, \u7cfb\u5217\u548c\u540d\u79f0\u3002
16.14 cb=C
16.15
16.16 -MNEM_CppCompiler_CB=+
16.17
16.18
16.19
16.20 -ToolsPanel.lstDirlist.AccessibleContext.accessibleName=""
16.21 -ToolsPanel.lstDirlist.AccessibleContext.accessibleDescription=""
16.22 -ToolsPanel.errorTextArea.AccessibleContext.accessibleName=""
16.23 -ToolsPanel.errorTextArea.AccessibleContext.accessibleDescription=""
16.24 +
16.25 +
16.26 +
16.27 +
16.28 +
16.29 ToolsPanel.tfGdbPath.AccessibleContext.accessibleDescription=\u952e\u5165 gdb \u547d\u4ee4\u7684\u540d\u79f0\u3002
16.30 ToolsPanel.btRestore.AccessibleContext.accessibleDescription=\u6062\u590d\u9ed8\u8ba4\u8bbe\u7f6e
16.31 ToolsPanel.btVersions.AccessibleContext.accessibleDescription=\u663e\u793a\u5de5\u5177\u7248\u672c
16.32 ToolsPanel.tfBaseDirectory.AccessibleContext.accessibleDescription=\u57fa\u76ee\u5f55
16.33 -ToolsPanel.btBaseDirectory.AccessibleContext.accessibleDescription=""
16.34 -ToolsPanel.btCVersion.AccessibleContext.accessibleDescription=""
16.35 -ToolsPanel.btCppVersion.AccessibleContext.accessibleDescription=""
16.36 -ToolsPanel.btFortranVersion.AccessibleContext.accessibleDescription=""
16.37 -ToolsPanel.btMakeVersion.AccessibleContext.accessibleDescription=""
16.38 -ToolsPanel.btGdbVersion.AccessibleContext.accessibleDescription=""
16.39 +
16.40 +
16.41 +
16.42 +
16.43 +
16.44 +
16.45
16.46
16.47
16.48 btBrowse=B
16.49
16.50 -AddCompilerSetPanel.btBaseDirectory.AccessibleContext.accessibleDescription=""
16.51 -AddCompilerSetPanel.taInfo.AccessibleContext.accessibleDescription=""
16.52 +
16.53 +
16.54 AddCompilerSetPanel.tfBaseDirectory.AccessibleContext.accessibleDescription=\u57fa\u76ee\u5f55
16.55 AddCompilerSetPanel.tfName.AccessibleContext.accessibleDescription=\u5de5\u5177\u96c6\u5408\u540d\u79f0
16.56 AddCompilerSetPanel.AccessibleContext.accessibleDescription=\u6dfb\u52a0\u6216\u590d\u5236\u5de5\u5177\u96c6\u5408\u5bf9\u8bdd\u6846
16.57 -AddCompilerSetPanel.taInfo.AccessibleContext.accessibleName=""
16.58 +
16.59 ToolsPanel.tfMakePath.AccessibleContext.accessibleDescription=\u952e\u5165 make \u547d\u4ee4\u7684\u540d\u79f0\u3002
16.60 NEW_TOOL_SET_TITLE=\u6dfb\u52a0\u65b0\u5de5\u5177\u96c6\u5408
16.61 NEW_TOOL_SET_TITLE_REMOTE=\u4e3a{0}\u6dfb\u52a0\u65b0\u5de5\u5177\u96c6\u5408
17.1 --- a/src/zh_CN/cnd/cnd/cnd/org/netbeans/modules/cnd/builds/Bundle_zh_CN.properties Wed Feb 26 18:44:50 2014 -0800
17.2 +++ b/src/zh_CN/cnd/cnd/cnd/org/netbeans/modules/cnd/builds/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
17.3 @@ -62,25 +62,25 @@
17.4 # {0} - file name where error occurred
17.5 # {1} - text of error
17.6 # {2} - line number
17.7 -MSG_err_line={0} [{2}] {1}
17.8 +
17.9 # {0} - file name where error occurred
17.10 # {1} - text of error
17.11 # {2} - line number
17.12 # {3} - column number
17.13 -MSG_err_line_col={0} [{2}:{3}] {1}
17.14 +
17.15 # {0} - file name where error occurred
17.16 # {1} - text of error
17.17 # {2} - line number
17.18 # {3} - start column number
17.19 # {4} - end column number
17.20 -MSG_err_line_col_col={0} [{2}:{3}-{4}] {1}
17.21 +
17.22 # {0} - file name where error occurred
17.23 # {1} - text of error
17.24 # {2} - start line number
17.25 # {3} - start column number
17.26 # {4} - end line number
17.27 # {5} - end column number
17.28 -MSG_err_line_col_line_col={0} [{2}:{3}-{4}:{5}] {1}
17.29 +
17.30
17.31 # ErrorExpressionPanel strings
17.32 CTL_Error_description_name=\u9519\u8bef\u8bf4\u660e\u540d\u79f0
18.1 --- a/src/zh_CN/dlight/dlight-libs-common/dlight-libs-common/org/netbeans/modules/dlight/libs/common/resources/Bundle_zh_CN.properties Wed Feb 26 18:44:50 2014 -0800
18.2 +++ b/src/zh_CN/dlight/dlight-libs-common/dlight-libs-common/org/netbeans/modules/dlight/libs/common/resources/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
18.3 @@ -1,3 +1,2 @@
18.4 OpenIDE-Module-Display-Category=\u6570\u636e\u5e93
18.5 OpenIDE-Module-Name=DLight \u516c\u5171\u5e93
18.6 -
19.1 --- a/src/zh_CN/enterprise/cloud-amazon/cloud-amazon/org/netbeans/modules/cloud/amazon/ui/serverplugin/Bundle_zh_CN.properties Wed Feb 26 18:44:50 2014 -0800
19.2 +++ b/src/zh_CN/enterprise/cloud-amazon/cloud-amazon/org/netbeans/modules/cloud/amazon/ui/serverplugin/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
19.3 @@ -1,5 +1,5 @@
19.4 AmazonJ2EEServerWizardComponent.endNameLabel.text=\u73af\u5883\u540d\u79f0:
19.5 -AmazonJ2EEServerWizardComponent.envFullURLLabel.text=\
19.6 +
19.7 AmazonJ2EEServerWizardComponent.containerLabel.text=\u5bb9\u5668\u7c7b\u578b:
19.8
19.9 AmazonJ2EEServerWizardComponent.name=\u521b\u5efa\u65b0\u865a\u62df\u5e94\u7528\u7a0b\u5e8f\u6216\u73af\u5883
20.1 --- a/src/zh_CN/enterprise/glassfish-common/glassfish-common/org/netbeans/modules/glassfish/common/Bundle_zh_CN.properties Wed Feb 26 18:44:50 2014 -0800
20.2 +++ b/src/zh_CN/enterprise/glassfish-common/glassfish-common/org/netbeans/modules/glassfish/common/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
20.3 @@ -121,7 +121,7 @@
20.4 # in a particular Locale and should remain as technical as possible.
20.5 MSG_LocaleSwitched=<html>\u670d\u52a1\u5668\u65e0\u6cd5\u5728\u5f53\u524d\u7684\u8bed\u8a00\u73af\u5883\u4e2d\u8fd0\u884c\u3002\u8fdb\u7a0b\u7684\u8bed\u8a00\u73af\u5883\u5df2\u5207\u6362\u5230 en_US\u3002</html>
20.6
20.7 -STR_SERVER_NAME=GlassFish Server {0}
20.8 +
20.9 STR_V3_AUTO_REGISTERED_NAME=GlassFish Server 3 \u57df
20.10 STR_V3_AUTO_CREATED_NAME=\u4e2a\u4eba GlassFish Server 3 \u57df
20.11 STR_PRELUDE_SERVER_NAME=GlassFish v3 Prelude
20.12 @@ -152,14 +152,14 @@
20.13 WARN_UNREADABLE_LOG_STREAM=\u65e0\u6cd5\u8fde\u63a5\u5230\u5b9e\u4f8b{0}\u7684\u65e5\u5fd7
20.14
20.15 # ServerDetails.java
20.16 -STR_3_SERVER_NAME=GlassFish Server 3.0
20.17 -STR_301_SERVER_NAME=GlassFish Server 3.0.1
20.18 -STR_31_SERVER_NAME=GlassFish Server 3.1
20.19 -STR_311_SERVER_NAME=GlassFish Server 3.1.1
20.20 -STR_312_SERVER_NAME=GlassFish Server 3.1.2
20.21 -STR_3122_SERVER_NAME=GlassFish Server 3.1.2.2
20.22 -STR_40_SERVER_NAME=GlassFish Server 4.0
20.23 -STR_401_SERVER_NAME=GlassFish Server 4.0.1
20.24 +
20.25 +
20.26 +
20.27 +
20.28 +
20.29 +
20.30 +
20.31 +
20.32
20.33 # CommonServerSupport.java
20.34 MSG_FLAKEY_NETWORK=<html>\u7f51\u7edc\u901a\u4fe1\u95ee\u9898<br/>\u65e0\u6cd5\u4e0e\u4ee5\u4e0b\u9879\u5efa\u7acb\u53ef\u9760\u8fde\u63a5:<br/> {0}:{1}<br/>\\\u9519\u8bef\u6d88\u606f:<br/> {2}
21.1 --- a/src/zh_CN/enterprise/glassfish-common/glassfish-common/org/netbeans/modules/glassfish/common/wizards/Bundle_zh_CN.properties Wed Feb 26 18:44:50 2014 -0800
21.2 +++ b/src/zh_CN/enterprise/glassfish-common/glassfish-common/org/netbeans/modules/glassfish/common/wizards/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
21.3 @@ -126,7 +126,7 @@
21.4 STATUS_Connecting=\u6b63\u5728\u8fde\u63a5...
21.5 STATUS_Downloading=\u6b63\u5728\u4e0b\u8f7d...
21.6
21.7 -STATUS_Failed={0}: {1}
21.8 +
21.9
21.10 STATUS_InvalidWsdl=\u6765\u81ea\u8be5 URL \u7684\u54cd\u5e94\u4e0d\u662f\u6709\u6548\u7684 WSDL \u6587\u4ef6\u3002
21.11
21.12 @@ -136,10 +136,10 @@
21.13 TIME_MINUTES={0,choice, 1#{0} \u5206\u949f|2#{0} \u5206\u949f}
21.14 TIME_SECONDS={0,choice, 1#{0} \u79d2|2#{0} \u79d2}
21.15 TIME_MILISECONDS={0} \u6beb\u79d2
21.16 -TIME_SEPARATOR=,
21.17 +
21.18 LBL_InstallLocation=\u5b89\u88c5\u4f4d\u7f6e(&L):
21.19 V3_PRELUDE_NAME=GlassFish v3 Prelude
21.20 -V3_EE6_NAME=GlassFish Server 3
21.21 +
21.22
21.23 MSG_CheckNetworkConfig=\u68c0\u67e5\u7f51\u7edc\u914d\u7f6e
21.24 MSG_InvalidUrl=URL \u65e0\u6548: {0}
21.25 @@ -161,9 +161,9 @@
21.26 TIP_ADMIN_IN_USE=\u9ed8\u8ba4\u7ba1\u7406\u7aef\u53e3 (4848) \u5df2\u5728\u4f7f\u7528
21.27 TIP_HTTP_IN_USE=\u9ed8\u8ba4 HTTP \u7aef\u53e3 (8080) \u5df2\u5728\u4f7f\u7528
21.28
21.29 -STR_V3_FAMILY_NAME=GlassFish Server
21.30 -STR_3_SERVER_NAME=GlassFish Server 3.0
21.31 -STR_31_SERVER_NAME=GlassFish Server 3.1
21.32 +
21.33 +
21.34 +
21.35
21.36 LBL_SELECT_BITS=\u9009\u62e9
21.37 LBL_ChooseOne=\u9009\u62e9\u8981\u4e0b\u8f7d\u7684\u670d\u52a1\u5668:
21.38 @@ -179,7 +179,7 @@
21.39 AddServerLocationVisualPanel.remoteDomainRadioButton=\u8fdc\u7a0b\u57df
21.40 AddServerLocationVisualPanel.localDomainRadioButton=\u672c\u5730\u57df
21.41 AddDomainLocationVisualPanel.targetValueLabel.text=\u76ee\u6807(&T):
21.42 -AddDomainLocationVisualPanel.targetValueField.text=\
21.43 +
21.44 AddDomainLocationVisualPanel.userNameLabel.text=\u7528\u6237\u540d(&U):
21.45 AddDomainLocationVisualPanel.passwordLabel.text=\u53e3\u4ee4(&W):
21.46 AddDomainLocationVisualPanel.httpPortFieldLabel.text=HTTP \u7aef\u53e3:
22.1 --- a/src/zh_CN/enterprise/glassfish-javaee/glassfish-javaee/org/netbeans/modules/glassfish/javaee/Bundle_zh_CN.properties Wed Feb 26 18:44:50 2014 -0800
22.2 +++ b/src/zh_CN/enterprise/glassfish-javaee/glassfish-javaee/org/netbeans/modules/glassfish/javaee/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
22.3 @@ -45,7 +45,7 @@
22.4 OpenIDE-Module-Name=GlassFish Server - Java EE
22.5
22.6 OpenIDE-Module-Short-Description=JavaEE \u9879\u76ee\u7684 GlassFish Server \u670d\u52a1\u5668\u652f\u6301\u3002
22.7 -TXT_FactoryDisplayName=GlassFish Server
22.8 +
22.9
22.10 MSG_START_SERVER_FAILED_FNF=\u65e0\u6cd5\u542f\u52a8{0}\u670d\u52a1\u5668\u3002\u627e\u4e0d\u5230\u542f\u52a8 jar\u3002
22.11 MSG_START_SERVER_FAILED_PD=\u672a\u80fd\u542f\u52a8{0}\u670d\u52a1\u5668\u3002\u65e0\u6cd5\u521b\u5efa\u542f\u52a8\u8fdb\u7a0b\u3002
23.1 --- a/src/zh_CN/enterprise/j2ee-clientproject/j2ee-clientproject/org/netbeans/modules/j2ee/clientproject/Bundle_zh_CN.properties Wed Feb 26 18:44:50 2014 -0800
23.2 +++ b/src/zh_CN/enterprise/j2ee-clientproject/j2ee-clientproject/org/netbeans/modules/j2ee/clientproject/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
23.3 @@ -69,7 +69,7 @@
23.4
23.5 MSG_BrokenPlatform_Title=\u4e2d\u65ad\u7684\u5e73\u53f0\u5f15\u7528
23.6 TEXT_BrokenPlatform=<html><p><strong>\u9879\u76ee{0}\u7684\u5e73\u53f0\u5f15\u7528\u4e2d\u65ad\u3002</strong></p><br><p>\u60a8\u9700\u8981\u4fee\u590d\u4e2d\u65ad\u7684\u5f15\u7528\u5e76\u91cd\u65b0\u8c03\u7528\u64cd\u4f5c\u3002</p>
23.7 -TEXT_BrokenPlatform_UnknownProjectName=???
23.8 +
23.9 MSG_Server_State_Question=\u670d\u52a1\u5668\u662f\u5426\u5728\u8c03\u8bd5\u6a21\u5f0f\u4e0b\u8fd0\u884c?
23.10 MSG_Server_State=\u8bf7\u505c\u6b62\u670d\u52a1\u5668, \u6216\u8005\u5728\u8fd0\u884c\u6a21\u5f0f\u4e0b\u91cd\u65b0\u542f\u52a8\u670d\u52a1\u5668\u3002
23.11
24.1 --- a/src/zh_CN/enterprise/j2ee-clientproject/j2ee-clientproject/org/netbeans/modules/j2ee/clientproject/ui/Bundle_zh_CN.properties Wed Feb 26 18:44:50 2014 -0800
24.2 +++ b/src/zh_CN/enterprise/j2ee-clientproject/j2ee-clientproject/org/netbeans/modules/j2ee/clientproject/ui/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
24.3 @@ -70,7 +70,7 @@
24.4 TXT_BrokenPlatform=\u4e2d\u65ad\u7684\u5e73\u53f0
24.5
24.6 #ProjectNode
24.7 -TXT_UnknownProjectName=???
24.8 +
24.9
24.10 CTL_OpenProject=\u6253\u5f00\u9879\u76ee
24.11
25.1 --- a/src/zh_CN/enterprise/j2ee-clientproject/j2ee-clientproject/org/netbeans/modules/j2ee/clientproject/ui/customizer/Bundle_zh_CN.properties Wed Feb 26 18:44:50 2014 -0800
25.2 +++ b/src/zh_CN/enterprise/j2ee-clientproject/j2ee-clientproject/org/netbeans/modules/j2ee/clientproject/ui/customizer/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
25.3 @@ -129,9 +129,9 @@
25.4
25.5 LBL_CustomizeJavadoc_Tags_JLabel=\u8bb0\u5f55\u5176\u4ed6\u6807\u8bb0:
25.6
25.7 -LBL_CustomizeJavadoc_Author_JCheckBox=@author(&A)
25.8
25.9 -LBL_CustomizeJavadoc_Version_JCheckBox=@version(&V)
25.10 +
25.11 +
25.12
25.13 LBL_CustomizeJavadoc_WinTitle_JLabel=\u6d4f\u89c8\u5668\u7a97\u53e3\u6807\u9898(&B):
25.14
26.1 --- a/src/zh_CN/enterprise/j2ee-clientproject/j2ee-clientproject/org/netbeans/modules/j2ee/clientproject/ui/wizards/Bundle_zh_CN.properties Wed Feb 26 18:44:50 2014 -0800
26.2 +++ b/src/zh_CN/enterprise/j2ee-clientproject/j2ee-clientproject/org/netbeans/modules/j2ee/clientproject/ui/wizards/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
26.3 @@ -62,7 +62,7 @@
26.4 #ImportBuildFile
26.5 ACS_IW_BuildFileDialog_A11YDesc=\u6784\u5efa\u6587\u4ef6\u5bf9\u8bdd\u6846
26.6 LBL_IW_BuildfileDesc_Label=<html>{0}\u4e2d\u5305\u542b\u73b0\u6709\u7684 build.xml\u3002<br>\u5c06\u521b\u5efa\u4ee5\u4e0b ANT \u6784\u5efa\u6587\u4ef6\u4f9b\u9879\u76ee\u4f7f\u7528\u3002</html>
26.7 -LBL_IW_ProposedName_TextField=nbbuild.xml
26.8 +
26.9 LBL_IW_BuildFilename_Label=\u6784\u5efa\u6587\u4ef6\u540d\u79f0:
26.10
26.11 ACS_LBL_IW_BuildFilename_A11YDesc=\u6784\u5efa\u6587\u4ef6\u540d\u79f0
27.1 --- a/src/zh_CN/enterprise/j2ee-common/j2ee-common/org/netbeans/modules/j2ee/common/Bundle_zh_CN.properties Wed Feb 26 18:44:50 2014 -0800
27.2 +++ b/src/zh_CN/enterprise/j2ee-common/j2ee-common/org/netbeans/modules/j2ee/common/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
27.3 @@ -82,8 +82,8 @@
27.4 MSG_retrievingDS=\u6b63\u5728\u68c0\u7d22\u6570\u636e\u6e90...
27.5
27.6 #J2EE specification version labels
27.7 -LBL_J2EESpec_13=J2EE 1.3
27.8 -LBL_J2EESpec_14=J2EE 1.4
27.9 +
27.10 +
27.11 LBL_JavaEESpec_5=Java EE 5
27.12
27.13
28.1 --- a/src/zh_CN/enterprise/j2ee-ddloaders/j2ee-ddloaders/org/netbeans/modules/j2ee/ddloaders/common/xmlutils/Bundle_zh_CN.properties Wed Feb 26 18:44:50 2014 -0800
28.2 +++ b/src/zh_CN/enterprise/j2ee-ddloaders/j2ee-ddloaders/org/netbeans/modules/j2ee/ddloaders/common/xmlutils/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
28.3 @@ -45,7 +45,7 @@
28.4
28.5 # Messages for invalid xml file
28.6 TXT_errorOnLine={0} \u884c\u51fa\u73b0\u9519\u8bef
28.7 -TXT_errorMessage={0} [{1},{2}]
28.8 +
28.9 MSG_invalidXmlWarning=\u5728\u9a8c\u8bc1 XML \u6587\u6863\u65f6\u53d1\u73b0\u9519\u8bef\u3002\n\u6709\u5173\u9519\u8bef\u6d88\u606f, \u8bf7\u67e5\u770b\u201c\u8f93\u51fa\u201d\u7a97\u53e3\u3002\n\u662f\u5426\u4ecd\u8981\u4fdd\u5b58?
28.10 TTL_invalidXmlWarning=XML \u6587\u4ef6\u65e0\u6548
28.11 # {0} = name of file
29.1 --- a/src/zh_CN/enterprise/j2ee-ddloaders/j2ee-ddloaders/org/netbeans/modules/j2ee/ddloaders/web/multiview/Bundle_zh_CN.properties Wed Feb 26 18:44:50 2014 -0800
29.2 +++ b/src/zh_CN/enterprise/j2ee-ddloaders/j2ee-ddloaders/org/netbeans/modules/j2ee/ddloaders/web/multiview/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
29.3 @@ -133,10 +133,10 @@
29.4 LBL_goToSources_2=\u8f6c\u81f3\u6e90(&O)
29.5 LBL_goToSources_3=\u8f6c\u81f3\u6e90(&T)
29.6
29.7 -TTL_JSP_GROUP={0} -> {1}
29.8 +
29.9 NODE_JSP_GROUP=JSP \u7ec4
29.10
29.11 -TTL_servletPanel={0} -> {1}
29.12 +
29.13
29.14 TTL_ContextParam=\u4e0a\u4e0b\u6587\u53c2\u6570
29.15
29.16 @@ -163,7 +163,7 @@
29.17
29.18
29.19 TTL_filters=Servlet \u8fc7\u6ee4\u5668
29.20 -TTL_filterPanel={0} -> {1}
29.21 +
29.22 TXT_EmptyFilterName=\u7f3a\u5c11\u8fc7\u6ee4\u5668\u540d\u3002
29.23 TXT_FilterNameExists=\u8fc7\u6ee4\u5668\u540d "{0}" \u5df2\u5b58\u5728\u3002
29.24 TXT_EmptyFilterClass=\u7f3a\u5c11\u8fc7\u6ee4\u5668\u7c7b
30.1 --- a/src/zh_CN/enterprise/j2ee-earproject/j2ee-earproject/org/netbeans/modules/j2ee/earproject/ui/customizer/Bundle_zh_CN.properties Wed Feb 26 18:44:50 2014 -0800
30.2 +++ b/src/zh_CN/enterprise/j2ee-earproject/j2ee-earproject/org/netbeans/modules/j2ee/earproject/ui/customizer/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
30.3 @@ -118,8 +118,8 @@
30.4 LBL_CustomizeJavadoc_Index_JCheckBox=\u7d22\u5f15(&I)
30.5 LBL_CustomizeJavadoc_SplitIndex_JCheckBox=\u6309\u5b57\u6bcd\u5206\u9694\u7d22\u5f15(&L)
30.6 LBL_CustomizeJavadoc_Tags_JLabel=\u8bb0\u5f55\u5176\u4ed6\u6807\u8bb0:
30.7 -LBL_CustomizeJavadoc_Author_JCheckBox=@author(&A)
30.8 -LBL_CustomizeJavadoc_Version_JCheckBox=@version(&V)
30.9 +
30.10 +
30.11 LBL_CustomizeJavadoc_WinTitle_JLabel=\u6d4f\u89c8\u5668\u7a97\u53e3\u6807\u9898(&B):
30.12 LBL_CustomizeJavadoc_Encoding_JLabel=\u7f16\u7801(&E):
30.13 LBL_CustomizeJavadoc_Preview_JCheckBox=\u9884\u89c8\u751f\u6210\u7684 Javadoc(&G)
31.1 --- a/src/zh_CN/enterprise/j2ee-ejbcore/j2ee-ejbcore/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/jpa/dao/Bundle_zh_CN.properties Wed Feb 26 18:44:50 2014 -0800
31.2 +++ b/src/zh_CN/enterprise/j2ee-ejbcore/j2ee-ejbcore/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/jpa/dao/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
31.3 @@ -86,4 +86,6 @@
31.4 ERR_MissingServer=<html>\u9879\u76ee\u672a\u6b63\u786e\u8bbe\u7f6e\u76ee\u6807\u670d\u52a1\u5668\u3002<br>Java \u6301\u4e45\u6027\u529f\u80fd\u4e0e\u670d\u52a1\u5668\u76f8\u5173\u3002</html>
31.5 ERR_J2ee6AndNotSufficientJ2eeServer=<html>\u5982\u679c\u670d\u52a1\u5668\u6ca1\u6709\u63d0\u4f9b\u5b8c\u5168 Java EE 6 Web \u914d\u7f6e\u6587\u4ef6\u652f\u6301 (\u81f3\u5c11 EJB Lite \u652f\u6301), <br>\u5219\u65e0\u6cd5\u4e3a Java EE 6 \u6e90\u6587\u4ef6\u8fdb\u884c\u751f\u6210\u3002</html>
31.6 ERR_NoEjbLiteClassesOnProjectClasspath=<html>\u7531\u4e8e EJB Lite \u7c7b\u5728\u9879\u76ee\u7c7b\u8def\u5f84\u4e2d\u4e0d\u53ef\u7528, \u56e0\u6b64\u65e0\u6cd5\u751f\u6210\u3002</html>
31.7 +ERR_LocationNotValid=\u672a\u627e\u5230\u6709\u6548\u7684\u4f4d\u7f6e\u3002\u9879\u76ee\u81f3\u5c11\u9700\u8981\u5177\u6709\u4e00\u4e2a\u6709\u6548\u7684\u6e90\u76ee\u5f55\u3002
31.8 +ERR_InvalidPackage=\u5305\u540d\u65e0\u6548
31.9
32.1 --- a/src/zh_CN/enterprise/j2ee-ejbcore/j2ee-ejbcore/org/netbeans/modules/j2ee/ejbcore/resources/Bundle_zh_CN.properties Wed Feb 26 18:44:50 2014 -0800
32.2 +++ b/src/zh_CN/enterprise/j2ee-ejbcore/j2ee-ejbcore/org/netbeans/modules/j2ee/ejbcore/resources/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
32.3 @@ -44,7 +44,7 @@
32.4
32.5 #System file system
32.6 Templates/J2EE=Enterprise JavaBeans
32.7 -Templates/J2EE/EJB21=EJB 2.1
32.8 +
32.9 Templates/J2EE/EJB30=EJB 3.0
32.10 Templates/J2EE/EJB31=EJB 3.1
32.11
33.1 --- a/src/zh_CN/enterprise/j2ee-ejbjarproject/j2ee-ejbjarproject/org/netbeans/modules/j2ee/ejbjarproject/ui/customizer/Bundle_zh_CN.properties Wed Feb 26 18:44:50 2014 -0800
33.2 +++ b/src/zh_CN/enterprise/j2ee-ejbjarproject/j2ee-ejbjarproject/org/netbeans/modules/j2ee/ejbjarproject/ui/customizer/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
33.3 @@ -125,8 +125,8 @@
33.4 LBL_CustomizeJavadoc_Index_JCheckBox=\u7d22\u5f15(&I)
33.5 LBL_CustomizeJavadoc_SplitIndex_JCheckBox=\u6309\u5b57\u6bcd\u5206\u9694\u7d22\u5f15(&L)
33.6 LBL_CustomizeJavadoc_Tags_JLabel=\u8bb0\u5f55\u5176\u4ed6\u6807\u8bb0:
33.7 -LBL_CustomizeJavadoc_Author_JCheckBox=@author(&A)
33.8 -LBL_CustomizeJavadoc_Version_JCheckBox=@version(&V)
33.9 +
33.10 +
33.11 LBL_CustomizeJavadoc_WinTitle_JLabel=\u6d4f\u89c8\u5668\u7a97\u53e3\u6807\u9898(&B):
33.12 LBL_CustomizeJavadoc_Encoding_JLabel=\u7f16\u7801(&E):
33.13 LBL_CustomizeJavadoc_Preview_JCheckBox=\u9884\u89c8\u751f\u6210\u7684 Javadoc(&G)
34.1 --- a/src/zh_CN/enterprise/j2ee-ejbjarproject/j2ee-ejbjarproject/org/netbeans/modules/j2ee/ejbjarproject/ui/wizards/Bundle_zh_CN.properties Wed Feb 26 18:44:50 2014 -0800
34.2 +++ b/src/zh_CN/enterprise/j2ee-ejbjarproject/j2ee-ejbjarproject/org/netbeans/modules/j2ee/ejbjarproject/ui/wizards/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
34.3 @@ -187,7 +187,7 @@
34.4 LBL_IW_BuildfileDesc_Label=<html>{0}\u4e2d\u5305\u542b\u73b0\u6709\u7684 build.xml\u3002<br>\u5c06\u521b\u5efa\u4ee5\u4e0b ANT \u6784\u5efa\u6587\u4ef6\u4f9b\u9879\u76ee\u4f7f\u7528\u3002</html>
34.5 LBL_IW_BuildFilename_Label=\u6784\u5efa\u6587\u4ef6\u540d\u79f0:
34.6 LBL_IW_CreatedFile_Label=\u521b\u5efa\u7684\u6587\u4ef6:
34.7 -LBL_IW_ProposedName_TextField=nbbuild.xml
34.8 +
34.9 LBL_IW_Buildfile_OK=\u786e\u5b9a
34.10 LBL_IW_Buildfile_Cancel=\u53d6\u6d88
34.11 LBL_IW_Buildfile_CancelConfirmation=\u6267\u884c\u53d6\u6d88\u4f1a\u5bfc\u81f4\u7cfb\u7edf\u9000\u51fa\u201c\u65b0\u5efa\u9879\u76ee\u201d\u5411\u5bfc\u3002\u662f\u5426\u786e\u5b9e\u8981\u53d6\u6d88?
35.1 --- a/src/zh_CN/enterprise/j2ee-sun-ddui/j2ee-sun-ddui/org/netbeans/modules/j2ee/sun/ddloaders/multiview/tables/Bundle_zh_CN.properties Wed Feb 26 18:44:50 2014 -0800
35.2 +++ b/src/zh_CN/enterprise/j2ee-sun-ddui/j2ee-sun-ddui/org/netbeans/modules/j2ee/sun/ddloaders/multiview/tables/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
35.3 @@ -6,5 +6,5 @@
35.4
35.5 jTextField3.text=\u672a\u77e5
35.6
35.7 -jLabel1.text=*
35.8
35.9 +
36.1 --- a/src/zh_CN/enterprise/j2ee-sun-ddui/j2ee-sun-ddui/org/netbeans/modules/j2ee/sun/ddloaders/multiview/web/Bundle_zh_CN.properties Wed Feb 26 18:44:50 2014 -0800
36.2 +++ b/src/zh_CN/enterprise/j2ee-sun-ddui/j2ee-sun-ddui/org/netbeans/modules/j2ee/sun/ddloaders/multiview/web/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
36.3 @@ -114,7 +114,7 @@
36.4 ACSD_Description=\u5173\u4e8e\u6b64\u5c5e\u6027\u7528\u9014\u7684\u63cf\u8ff0\u3002
36.5
36.6 # For the 'required mark' that the popups will have to designate required fields.
36.7 -LBL_RequiredMark=*
36.8 +
36.9 LBL_RequiredMessage=* \u8868\u793a\u5fc5\u586b\u5b57\u6bb5
36.10 ACSN_RequiredMark=\u5fc5\u9700\u6807\u8bb0
36.11 ACSD_RequiredMark=\u5fc5\u987b\u586b\u5199\u4f7f\u7528\u6b64\u6807\u7b7e\u6807\u8bb0\u7684\u5b57\u6bb5\u3002
37.1 --- a/src/zh_CN/enterprise/j2ee-sun-ddui/j2ee-sun-ddui/org/netbeans/modules/j2ee/sun/share/configbean/Bundle_zh_CN.properties Wed Feb 26 18:44:50 2014 -0800
37.2 +++ b/src/zh_CN/enterprise/j2ee-sun-ddui/j2ee-sun-ddui/org/netbeans/modules/j2ee/sun/share/configbean/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
37.3 @@ -61,7 +61,7 @@
37.4
37.5 LBL_BeanDisplayNameBroken={0} [\u9519\u8bef]
37.6
37.7 -LBL_BeanDisplayNameWithComponentName={1} [{0}]
37.8 +
37.9 LBL_BeanDisplayNameBrokenWithComponentName={1} [\u9519\u8bef, {0}]
37.10
37.11 BDN_BaseEjb=EJB
38.1 --- a/src/zh_CN/enterprise/j2ee-sun-ddui/j2ee-sun-ddui/org/netbeans/modules/j2ee/sun/share/configbean/customizers/common/Bundle_zh_CN.properties Wed Feb 26 18:44:50 2014 -0800
38.2 +++ b/src/zh_CN/enterprise/j2ee-sun-ddui/j2ee-sun-ddui/org/netbeans/modules/j2ee/sun/share/configbean/customizers/common/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
38.3 @@ -99,7 +99,7 @@
38.4 ACSD_Description=\u5173\u4e8e\u6b64\u5c5e\u6027\u7528\u9014\u7684\u63cf\u8ff0\u3002
38.5
38.6 # For the 'required mark' that the popups will have to designate required fields.
38.7 -LBL_RequiredMark=*
38.8 +
38.9 LBL_RequiredMessage=* \u8868\u793a\u5fc5\u586b\u5b57\u6bb5
38.10 ACSN_RequiredMark=\u5fc5\u9700\u6807\u8bb0
38.11 ACSD_RequiredMark=\u5fc5\u987b\u586b\u5199\u4f7f\u7528\u6b64\u6807\u7b7e\u6807\u8bb0\u7684\u5b57\u6bb5\u3002
38.12 @@ -138,7 +138,7 @@
38.13 ERR_CustomizerHelpNotFound=CustomizerTitlePanel \u4e0d\u662f\u5b9e\u73b0 HelpCtx.Provider \u7684\u9762\u677f\u7684\u5b50\u9762\u677f\u3002
38.14
38.15 # Message format for error messages
38.16 -MSG_ErrorDisplayFormat={0} : {1}
38.17 +
38.18
38.19 #Format used for marked labels. Marked labels are used for manadatory fields.
38.20
39.1 --- a/src/zh_CN/enterprise/j2ee-sun-ddui/j2ee-sun-ddui/org/netbeans/modules/j2ee/sun/validation/Bundle_zh_CN.properties Wed Feb 26 18:44:50 2014 -0800
39.2 +++ b/src/zh_CN/enterprise/j2ee-sun-ddui/j2ee-sun-ddui/org/netbeans/modules/j2ee/sun/validation/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
39.3 @@ -100,7 +100,7 @@
39.4
39.5
39.6
39.7 -Name_Value_Pair_Format={0} : {1}
39.8 +
39.9
39.10 MSG_No_definition_for=\u6ca1\u6709\u4e3a <{1}> \u5b9a\u4e49{0}
39.11
40.1 --- a/src/zh_CN/enterprise/j2eeserver/j2eeserver/org/netbeans/modules/j2ee/deployment/impl/ui/Bundle_zh_CN.properties Wed Feb 26 18:44:50 2014 -0800
40.2 +++ b/src/zh_CN/enterprise/j2eeserver/j2eeserver/org/netbeans/modules/j2ee/deployment/impl/ui/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
40.3 @@ -93,7 +93,7 @@
40.4
40.5 LBL_Deploy_Progress_Monitor=\u90e8\u7f72\u8fdb\u5ea6\u76d1\u89c6\u5668
40.6
40.7 -LBL_Progress_Title={0}...
40.8 +
40.9
40.10 LBL_Distribute=\u5206\u53d1
40.11
41.1 --- a/src/zh_CN/enterprise/javaee-beanvalidation/javaee-beanvalidation/org/netbeans/modules/javaee/beanvalidation/Bundle_zh_CN.properties Wed Feb 26 18:44:50 2014 -0800
41.2 +++ b/src/zh_CN/enterprise/javaee-beanvalidation/javaee-beanvalidation/org/netbeans/modules/javaee/beanvalidation/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
41.3 @@ -45,5 +45,5 @@
41.4 ERR_Empty_validator_class=\u9a8c\u8bc1\u5668\u7c7b\u540d\u4e3a\u7a7a
41.5 ERR_wrong_type=\u4e0d\u662f\u6709\u6548\u7684\u7c7b\u578b
41.6 ERR_Empty_validator_type=\u9a8c\u8bc1\u5668\u7c7b\u578b\u4e3a\u7a7a
41.7 -ERR_Wrong_JavaEE=\u4e0d\u662f Java EE 6
41.8 +ERR_Wrong_JavaEE=\u53ea\u80fd\u5c06\u6b64\u5de5\u4ef6\u751f\u6210\u5230\u9762\u5411 Java EE 6 \u6216\u66f4\u9ad8\u7248\u672c\u7684\u9879\u76ee\u3002
41.9
42.1 --- a/src/zh_CN/enterprise/javaee-project/javaee-project/org/netbeans/modules/javaee/project/api/ant/ui/wizard/Bundle_zh_CN.properties Wed Feb 26 18:44:50 2014 -0800
42.2 +++ b/src/zh_CN/enterprise/javaee-project/javaee-project/org/netbeans/modules/javaee/project/api/ant/ui/wizard/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
42.3 @@ -133,6 +133,7 @@
42.4 MSG_EjbJarXMLNotSupported=<html>\u5df2\u5c06 J2EE \u7248\u672c\u8bbe\u7f6e\u4e3a 1.4, \u4f46\u8981\u5bfc\u5165\u7684 EJB \u6a21\u5757\u4f7f\u7528\u7684\u662f J2EE 1.3 \u6216\u66f4\u65e7\u7684\u7248\u672c\u3002\u90e8\u7f72\u63cf\u8ff0\u7b26\u5c06\u66f4\u65b0\u4e3a J2EE 1.4\u3002</html>
42.5
42.6 ERROR_IllegalMainClassName=\u4e3b\u7c7b\u540d\u65e0\u6548\u3002
42.7 +ERROR_EnterpriseLevelOfYourServerIsNotSupported=\u60a8\u5df2\u9009\u62e9\u7684\u670d\u52a1\u5668\u7684 EE \u7ea7\u522b (\u5f88\u53ef\u80fd\u4f4e\u4e8e Java EE 5) \u4e0d\u518d\u53d7\u652f\u6301\u3002\u8bf7\u4f7f\u7528\u8f83\u65b0\u7248\u672c\u7684\u5e94\u7528\u7a0b\u5e8f\u670d\u52a1\u5668\u6765\u521b\u5efa\u65b0\u9879\u76ee\u3002
42.8
42.9
42.10
42.11 @@ -193,7 +194,7 @@
42.12 LBL_IW_BuildfileDesc_Label=<html>\u5728{0}\u4e0a\u5b58\u5728\u73b0\u6709\u7684 Ant \u6784\u5efa\u811a\u672c\u3002<br>\u8bf7\u4e3a\u5373\u5c06\u521b\u5efa\u7684 Ant \u6784\u5efa\u811a\u672c\u8f93\u5165\u4e00\u4e2a\u65b0\u540d\u79f0\u4ee5\u4f9b\u9879\u76ee\u4f7f\u7528\u3002<br>\u8be5\u6587\u4ef6\u4e0d\u80fd\u5b58\u5728\u4e8e\u9879\u76ee\u6587\u4ef6\u5939\u4e2d\u3002</html>
42.13 LBL_IW_BuildFilename_Label=\u6784\u5efa\u6587\u4ef6\u540d\u79f0:
42.14 LBL_IW_CreatedFile_Label=\u521b\u5efa\u7684\u6587\u4ef6:
42.15 -LBL_IW_ProposedName_TextField=nbbuild.xml
42.16 +
42.17 LBL_IW_Buildfile_OK=\u786e\u5b9a
42.18 LBL_IW_Buildfile_Cancel=\u53d6\u6d88
42.19 LBL_IW_Buildfile_CancelConfirmation=\u53d6\u6d88\u5b83\u5c06\u9000\u51fa\u201c\u65b0\u5efa\u9879\u76ee\u201d\u5411\u5bfc\u3002\u662f\u5426\u786e\u5b9e\u8981\u53d6\u6d88?
43.1 --- a/src/zh_CN/enterprise/maven-jaxws/maven-jaxws/org/netbeans/modules/maven/jaxws/nodes/Bundle_zh_CN.properties Wed Feb 26 18:44:50 2014 -0800
43.2 +++ b/src/zh_CN/enterprise/maven-jaxws/maven-jaxws/org/netbeans/modules/maven/jaxws/nodes/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
43.3 @@ -43,7 +43,7 @@
43.4 LBL_WebServices=Web \u670d\u52a1
43.5 LBL_ServiceReferences=Web \u670d\u52a1\u5f15\u7528
43.6 MSG_MissingServer=\u5c1a\u672a\u8bbe\u7f6e\u6216\u5df2\u5220\u9664\u76ee\u6807\u670d\u52a1\u5668\u3002\n\n\u8bf7\u5148\u4fee\u590d\u6b64\u670d\u52a1\u5668\u95ee\u9898\u3002
43.7 -TXT_operationDesc ={0} {1}({2});
43.8 +
43.9 ERR_missingLocalWsdl=\u9519\u8bef: \u7f3a\u5c11 WSDL \u6587\u4ef6\u7684\u672c\u5730\u526f\u672c
43.10 MSG_RefreshClient=<html>\u6b64\u64cd\u4f5c\u5c06\u5237\u65b0\u5ba2\u6237\u7aef\u8282\u70b9, \u5e76\u4e14\u53ef\u4ee5\u901a\u8fc7 WSDL \u91cd\u65b0\u751f\u6210 Java \u7c7b\u3002<br>\u53ef\u80fd\u9700\u8981\u8c03\u6574\u4f7f\u7528\u8fd9\u4e9b\u7c7b\u7684\u7528\u6237\u4ee3\u7801\u3002</html>
43.11
44.1 --- a/src/zh_CN/enterprise/org-netbeans-libs-jstl/org-netbeans-libs-jstl/org/netbeans/libs/jstl/Bundle_zh_CN.properties Wed Feb 26 18:44:50 2014 -0800
44.2 +++ b/src/zh_CN/enterprise/org-netbeans-libs-jstl/org-netbeans-libs-jstl/org/netbeans/libs/jstl/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
44.3 @@ -47,5 +47,5 @@
44.4 OpenIDE-Module-Long-Description=\u5b89\u88c5 JSP \u6807\u51c6\u6807\u8bb0\u5e93 1.2.2\u3002
44.5
44.6 # library display name
44.7 -jstl=JSTL 1.2.2
44.8
44.9 +
45.1 --- a/src/zh_CN/enterprise/spring-webmvc/spring-webmvc/org/netbeans/modules/spring/webmvc/resources/Bundle_zh_CN.properties Wed Feb 26 18:44:50 2014 -0800
45.2 +++ b/src/zh_CN/enterprise/spring-webmvc/spring-webmvc/org/netbeans/modules/spring/webmvc/resources/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
45.3 @@ -48,6 +48,6 @@
45.4 Templates/SpringFramework/AbstractController.java=\u62bd\u8c61\u63a7\u5236\u5668
45.5 Templates/SpringFramework/SimpleFormController.java=\u7b80\u5355\u7a97\u4f53\u63a7\u5236\u5668
45.6 Templates/SpringFramework/index.jsp=\u67e5\u770b\u9875\u9762
45.7 -spring-webmvc4=Spring Web MVC 4.0.0
45.8
45.9
45.10 +
46.1 --- a/src/zh_CN/enterprise/tomcat5/tomcat5/org/netbeans/modules/tomcat5/ui/nodes/Bundle_zh_CN.properties Wed Feb 26 18:44:50 2014 -0800
46.2 +++ b/src/zh_CN/enterprise/tomcat5/tomcat5/org/netbeans/modules/tomcat5/ui/nodes/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
46.3 @@ -41,7 +41,7 @@
46.4 # made subject to such option by the copyright holder.
46.5
46.6
46.7 -LBL_TomcatInstanceNode=http://localhost:{0}/
46.8 +
46.9 LBL_Stopped=\u5df2\u505c\u6b62
46.10 LBL_WebApps=Web \u5e94\u7528\u7a0b\u5e8f
46.11 LBL_WaitNode_DisplayName=\u8bf7\u7a0d\u5019...
47.1 --- a/src/zh_CN/enterprise/web-core/web-core/org/netbeans/modules/web/core/palette/items/resources/Bundle_zh_CN.properties Wed Feb 26 18:44:50 2014 -0800
47.2 +++ b/src/zh_CN/enterprise/web-core/web-core/org/netbeans/modules/web/core/palette/items/resources/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
47.3 @@ -44,29 +44,29 @@
47.4
47.5 #Palette Category: JSP
47.6 NAME_jsp-UseBean=\u4f7f\u7528 Bean
47.7 -HINT_jsp-UseBean=<jsp:useBean id="" scope="page" class="" />
47.8 +
47.9 NAME_jsp-GetProperty=\u83b7\u53d6 Bean \u5c5e\u6027
47.10 -HINT_jsp-GetProperty=<jsp:getProperty name="" property="" />
47.11 +
47.12 NAME_jsp-SetProperty=\u8bbe\u7f6e Bean \u5c5e\u6027
47.13 -HINT_jsp-SetProperty=<jsp:setProperty name="" property="" value="" />
47.14 +
47.15 NAME_jsp-Choose=JSTL \u9009\u62e9
47.16 -HINT_jsp-Choose=<html><c:choose><br> <c:when test=""><br> </c:when><br> <c:otherwise><br> </c:otherwise><br></c:choose></html>
47.17 +
47.18 NAME_jsp-If=JSTL If
47.19 -HINT_jsp-If=<html><c:if test=""><br></c:if></html>
47.20 +
47.21 NAME_jsp-ForEach=JSTL For Each
47.22 -HINT_jsp-ForEach=<html><c:forEach var="" items=""><br></c:forEach></html>
47.23 +
47.24
47.25 #Palette Category: Database
47.26 NAME_jsp-Query=\u6570\u636e\u5e93\u67e5\u8be2
47.27 -HINT_jsp-Query=<html><sql:query var=""><br> SELECT column_name(s) FROM table_name<br></sql:query></html>
47.28 +
47.29 NAME_jsp-Report=\u6570\u636e\u5e93\u62a5\u544a
47.30 -HINT_jsp-Report=<html><sql:query var="result"><br></sql:query><br><table><br> <!-- column headers --><br> <tr><br> <c:forEach var="columnName" items="${result.columnNames}"><br> <th><c:out value="${columnName}"/></th><br> </c:forEach><br> </tr><br> <!-- column data --><br> <c:forEach var="row" items="${result.rowsByIndex}"><br> <tr><br> <c:forEach var="column" items="${row}"><br> <td><c:out value="${column}"/></td><br> </c:forEach><br> </tr><br> </c:forEach><br></table></html>
47.31 +
47.32 NAME_jsp-Insert=\u6570\u636e\u5e93\u63d2\u5165
47.33 -HINT_jsp-Insert=<html><sql:update><br> INSERT INTO table_name (column1, column2,...)<br> VALUES (value1, value2,....)<br></sql:update></html>
47.34 +
47.35 NAME_jsp-Update=\u6570\u636e\u5e93\u66f4\u65b0
47.36 -HINT_jsp-Update=<html><sql:update><br> UPDATE table_name<br> SET column_name = new_value<br> WHERE column_name = some_value<br></sql:update></html>
47.37 +
47.38 NAME_jsp-Delete=\u6570\u636e\u5e93\u5220\u9664
47.39 -HINT_jsp-Delete=<html><sql:update><br> DELETE FROM table_name<br> WHERE column_name = some_value<br></sql:update></html>
47.40 +
47.41
47.42 #Palette Category: Enterprise
47.43
48.1 --- a/src/zh_CN/enterprise/web-jsf/web-jsf/org/netbeans/modules/web/jsf/Bundle_zh_CN.properties Wed Feb 26 18:44:50 2014 -0800
48.2 +++ b/src/zh_CN/enterprise/web-jsf/web-jsf/org/netbeans/modules/web/jsf/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
48.3 @@ -54,7 +54,7 @@
48.4 TEXT_SAVE_AS_UTF=\u4e0d\u652f\u6301\u9009\u5b9a\u7684\u7f16\u7801{0}\u3002\u662f\u5426\u8981\u5c06\u5176\u53e6\u5b58\u4e3a UTF-8?
48.5
48.6 #Message for invalid xml file
48.7 -TXT_errorMessage={0} [{1},{2}]
48.8 +
48.9 MSG_invalidXmlWarning=\u9a8c\u8bc1 XML \u6587\u6863\u65f6\u53d1\u73b0\u9519\u8bef\u3002\n\u662f\u5426\u4ecd\u8981\u4fdd\u5b58?
48.10 TTL_invalidXmlWarning=XML \u6587\u4ef6\u65e0\u6548
48.11
49.1 --- a/src/zh_CN/enterprise/web-jsf/web-jsf/org/netbeans/modules/web/jsf/palette/items/resources/Bundle_zh_CN.properties Wed Feb 26 18:44:50 2014 -0800
49.2 +++ b/src/zh_CN/enterprise/web-jsf/web-jsf/org/netbeans/modules/web/jsf/palette/items/resources/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
49.3 @@ -55,5 +55,5 @@
49.4 HINT_jsp-JsfTableFromEntity=<html>\u901a\u8fc7\u5b9e\u4f53\u751f\u6210 JSF \u6570\u636e\u8868\u3002</html>
49.5
49.6 NAME_jsp-JsfMetadata = \u5143\u6570\u636e
49.7 -HINT_jsp-JsfMetadata=<html><h:metadata><h:viewParam id="" value=""/></h:metadata></html>
49.8
49.9 +
50.1 --- a/src/zh_CN/enterprise/web-jsf/web-jsf/org/netbeans/modules/web/jsf/resources/Bundle_zh_CN.properties Wed Feb 26 18:44:50 2014 -0800
50.2 +++ b/src/zh_CN/enterprise/web-jsf/web-jsf/org/netbeans/modules/web/jsf/resources/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
50.3 @@ -52,9 +52,9 @@
50.4 Templates/JSF=JavaServer Faces
50.5 Templates/JSF/JSF_From_Entity_Wizard=\u901a\u8fc7\u5b9e\u4f53\u751f\u6210 JSF
50.6 Templates/JSF/JSF_From_Entity_Wizard/StandardJSF=\u6807\u51c6 JavaServer Faces
50.7 -Templates/JSF/JSF_From_Entity_Wizard/StandardJSF/PaginationHelper.ftl=PaginationHelper.java
50.8 -Templates/JSF/JSF_From_Entity_Wizard/StandardJSF/JsfUtil.ftl=JsfUtil.java
50.9 -Templates/JSF/JSF_From_Entity_Wizard/StandardJSF/controller.ftl=Controller.java
50.10 +
50.11 +
50.12 +
50.13 Templates/JSF/JSF_From_Entity_Wizard/StandardJSF/create.ftl=Create.xhtml
50.14 Templates/JSF/JSF_From_Entity_Wizard/StandardJSF/edit.ftl=Edit.xhtml
50.15 Templates/JSF/JSF_From_Entity_Wizard/StandardJSF/view.ftl=View.xhtml
51.1 --- a/src/zh_CN/enterprise/web-jsf12/web-jsf12/org/netbeans/modules/web/jsf12/Bundle_zh_CN.properties Wed Feb 26 18:44:50 2014 -0800
51.2 +++ b/src/zh_CN/enterprise/web-jsf12/web-jsf12/org/netbeans/modules/web/jsf12/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
51.3 @@ -47,5 +47,5 @@
51.4 OpenIDE-Module-Long-Description=\u5b89\u88c5 JavaServer Faces 1.2 \u5e93
51.5
51.6 # library display name
51.7 -jsf12=JSF 1.2
51.8
51.9 +
52.1 --- a/src/zh_CN/enterprise/web-jsf20/web-jsf20/org/netbeans/modules/web/jsf20/Bundle_zh_CN.properties Wed Feb 26 18:44:50 2014 -0800
52.2 +++ b/src/zh_CN/enterprise/web-jsf20/web-jsf20/org/netbeans/modules/web/jsf20/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
52.3 @@ -47,6 +47,6 @@
52.4 OpenIDE-Module-Long-Description=\u5b89\u88c5 JavaServer Faces 2.2 \u5e93
52.5
52.6 # library display name
52.7 -jsf20=JSF 2.2
52.8
52.9
52.10 +
53.1 --- a/src/zh_CN/enterprise/web-primefaces/web-primefaces/org/netbeans/modules/web/primefaces/resources/Bundle_zh_CN.properties Wed Feb 26 18:44:50 2014 -0800
53.2 +++ b/src/zh_CN/enterprise/web-primefaces/web-primefaces/org/netbeans/modules/web/primefaces/resources/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
53.3 @@ -8,16 +8,16 @@
53.4
53.5 # PrimeFaces templates
53.6 Templates/JSF/JSF_From_Entity_Wizard/PrimeFaces=PrimeFaces
53.7 -Templates/JSF/JSF_From_Entity_Wizard/PrimeFaces/JsfUtil.ftl=JsfUtil.java
53.8 -Templates/JSF/JSF_From_Entity_Wizard/PrimeFaces/controller.ftl=Controller.java
53.9 +
53.10 +
53.11 Templates/JSF/JSF_From_Entity_Wizard/PrimeFaces/create.ftl=Create.xhtml
53.12 Templates/JSF/JSF_From_Entity_Wizard/PrimeFaces/edit.ftl=Edit.xhtml
53.13 Templates/JSF/JSF_From_Entity_Wizard/PrimeFaces/view.ftl=View.xhtml
53.14 Templates/JSF/JSF_From_Entity_Wizard/PrimeFaces/list.ftl=List.xhtml
53.15 Templates/JSF/JSF_From_Entity_Wizard/PrimeFaces/bundle.ftl=Bundle.properties
53.16 Templates/JSF/JSF_From_Entity_Wizard/PrimeFaces/jsfcrud.css=jsfcrud.css
53.17 -Templates/JSF/JSF_From_Entity_Wizard/PrimeFaces/jsfcrud.js=jsfcrud.js
53.18 -Templates/JSF/JSF_From_Entity_Wizard/PrimeFaces/template.ftl=template.js
53.19 +
53.20 +
53.21
53.22 # PrimeFaces snippets
53.23 Templates/JSF/JSF_From_Entity_Snippets/PrimeFaces=PrimeFaces
54.1 --- a/src/zh_CN/enterprise/web-project/web-project/org/netbeans/modules/web/project/ui/customizer/Bundle_zh_CN.properties Wed Feb 26 18:44:50 2014 -0800
54.2 +++ b/src/zh_CN/enterprise/web-project/web-project/org/netbeans/modules/web/project/ui/customizer/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
54.3 @@ -199,8 +199,8 @@
54.4 LBL_CustomizeJavadoc_Index_JCheckBox=\u7d22\u5f15(&I)
54.5 LBL_CustomizeJavadoc_SplitIndex_JCheckBox=\u6309\u5b57\u6bcd\u5206\u9694\u7d22\u5f15(&L)
54.6 LBL_CustomizeJavadoc_Tags_JLabel=\u8bb0\u5f55\u5176\u4ed6\u6807\u8bb0:
54.7 -LBL_CustomizeJavadoc_Author_JCheckBox=@author(&A)
54.8 -LBL_CustomizeJavadoc_Version_JCheckBox=@version(&V)
54.9 +
54.10 +
54.11 LBL_CustomizeJavadoc_WinTitle_JLabel=\u6d4f\u89c8\u5668\u7a97\u53e3\u6807\u9898(&B):
54.12 LBL_CustomizeJavadoc_Encoding_JLabel=\u7f16\u7801:
54.13 LBL_CustomizeJavadoc_Preview_JCheckBox=\u9884\u89c8\u751f\u6210\u7684 Javadoc(&G)
55.1 --- a/src/zh_CN/enterprise/web-struts/web-struts/org/netbeans/modules/web/struts/Bundle_zh_CN.properties Wed Feb 26 18:44:50 2014 -0800
55.2 +++ b/src/zh_CN/enterprise/web-struts/web-struts/org/netbeans/modules/web/struts/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
55.3 @@ -56,7 +56,7 @@
55.4 LBL_STRUTS_WELCOME_PAGE=Struts \u6b22\u8fce\u9875
55.5
55.6 #Message for invalid xml file
55.7 -TXT_errorMessage={0} [{1},{2}]
55.8 +
55.9 MSG_invalidXmlWarning=\u9a8c\u8bc1 XML \u6587\u6863\u65f6\u53d1\u73b0\u9519\u8bef\u3002\n\u662f\u5426\u4ecd\u8981\u4fdd\u5b58?
55.10 TTL_invalidXmlWarning=XML \u6587\u4ef6\u65e0\u6548
55.11
56.1 --- a/src/zh_CN/enterprise/websvc-core/websvc-core/org/netbeans/modules/websvc/core/Bundle_zh_CN.properties Wed Feb 26 18:44:50 2014 -0800
56.2 +++ b/src/zh_CN/enterprise/websvc-core/websvc-core/org/netbeans/modules/websvc/core/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
56.3 @@ -54,7 +54,7 @@
56.4 LBL_Connecting=\u6b63\u5728\u8fde\u63a5...
56.5 LBL_Downloading=\u6b63\u5728\u4e0b\u8f7d...
56.6 LBL_Complete=\u5b8c\u6210
56.7 -LBL_Exception={0}: {1}
56.8 +
56.9 LBL_Terminated=\u7ec8\u6b62\u3002
56.10 LBL_UnknownFileType=\u6765\u81ea\u8be5 URL \u7684\u54cd\u5e94\u4e0d\u662f\u6709\u6548\u7684 WSDL \u6587\u4ef6\u3002
56.11 ERR_Connection=\u8fde\u63a5\u5f02\u5e38\u9519\u8bef
57.1 --- a/src/zh_CN/enterprise/websvc-core/websvc-core/org/netbeans/modules/websvc/core/jaxws/nodes/Bundle_zh_CN.properties Wed Feb 26 18:44:50 2014 -0800
57.2 +++ b/src/zh_CN/enterprise/websvc-core/websvc-core/org/netbeans/modules/websvc/core/jaxws/nodes/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
57.3 @@ -56,10 +56,10 @@
57.4
57.5
57.6 MSG_ConnectionProblem=\u670d\u52a1\u5668\u8fde\u63a5\u51fa\u73b0\u95ee\u9898, \u6216\u8005 WSDL \u7684\u539f\u59cb\u4f4d\u7f6e\u53d1\u751f\u4e86\u6539\u53d8\u3002
57.7 -LBL_serviceNodeName={0}[{1}]
57.8 +
57.9 MSG_CannotFindDDDirectory=\u627e\u4e0d\u5230\u5305\u542b\u90e8\u7f72\u63cf\u8ff0\u7b26\u7684\u76ee\u5f55\u3002
57.10 MSG_CONFIRM_DELETE=\u662f\u5426\u786e\u5b9e\u8981\u5220\u9664 "{0}"?
57.11 -TXT_operationDesc ={0} {1}({2});
57.12 +
57.13 MSG_RefreshWithReplaceWsdl=\u8bf7\u5728\u9009\u4e2d "\u66ff\u6362\u672c\u5730 WSDL \u6587\u4ef6" \u590d\u9009\u6846\u7684\u60c5\u51b5\u4e0b\u8c03\u7528\u201c\u5237\u65b0\u201d\u64cd\u4f5c\u3002
57.14
57.15
58.1 --- a/src/zh_CN/enterprise/websvc-design/websvc-design/org/netbeans/modules/websvc/design/view/Bundle_zh_CN.properties Wed Feb 26 18:44:50 2014 -0800
58.2 +++ b/src/zh_CN/enterprise/websvc-design/websvc-design/org/netbeans/modules/websvc/design/view/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
58.3 @@ -42,19 +42,19 @@
58.4 # made subject to such option by the copyright holder.
58.5 #
58.6
58.7 -IMG_FitDiagramAction = org/netbeans/modules/websvc/design/view/resources/fit_diagram.png
58.8 +
58.9 LBL_FitDiagramAction = \u9002\u5f53\u5730\u8c03\u6574\u56fe\u5927\u5c0f
58.10
58.11 -IMG_FitWidthAction = org/netbeans/modules/websvc/design/view/resources/fit_width.png
58.12 +
58.13 LBL_FitWidthAction = \u9002\u5408\u5bbd\u5ea6
58.14
58.15 -IMG_ZoomDefaultAction = org/netbeans/modules/websvc/design/view/resources/normal_size.png
58.16 -LBL_ZoomDefaultAction = 100%
58.17
58.18 -IMG_ZoomInAction = org/netbeans/modules/websvc/design/view/resources/zoom_in.png
58.19 +
58.20 +
58.21 +
58.22 LBL_ZoomInAction = \u653e\u5927
58.23
58.24 -IMG_ZoomOutAction = org/netbeans/modules/websvc/design/view/resources/zoom_out.png
58.25 +
58.26 LBL_ZoomOutAction = \u7f29\u5c0f
58.27
58.28 LBL_Wsit=\u670d\u52a1\u8d28\u91cf
59.1 --- a/src/zh_CN/enterprise/websvc-jaxwsmodel/websvc-jaxwsmodel/org/netbeans/modules/websvc/api/jaxws/wsdlmodel/Bundle_zh_CN.properties Wed Feb 26 18:44:50 2014 -0800
59.2 +++ b/src/zh_CN/enterprise/websvc-jaxwsmodel/websvc-jaxwsmodel/org/netbeans/modules/websvc/api/jaxws/wsdlmodel/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
59.3 @@ -42,7 +42,7 @@
59.4
59.5 TXT_asyncPolling=\u5f02\u6b65\u8f6e\u8be2
59.6 TXT_asyncCallback=\u5f02\u6b65\u56de\u8c03
59.7 -TXT_operationName={0} [{1}]
59.8 +
59.9
59.10 ERR_CannotGenerateModel=\u65e0\u6cd5\u4e3a{0}\u751f\u6210 WSDL \u6a21\u578b\u3002\n\u5176\u539f\u56e0\u53ef\u80fd\u662f:\n-WSDL \u6587\u4ef6\u65e0\u6548\n-WSDL \u6587\u4ef6\u4e0d\u5b8c\u6574 (\u7f3a\u5c11 <wsdl:service> \u6216 <wsdl:binding> \u7b49\u5143\u7d20)
59.11
60.1 --- a/src/zh_CN/enterprise/websvc-metro-lib/websvc-metro-lib/org/netbeans/modules/websvc/metro/lib/Bundle_zh_CN.properties Wed Feb 26 18:44:50 2014 -0800
60.2 +++ b/src/zh_CN/enterprise/websvc-metro-lib/websvc-metro-lib/org/netbeans/modules/websvc/metro/lib/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
60.3 @@ -46,5 +46,5 @@
60.4 OpenIDE-Module-Short-Description=\u5b89\u88c5 Metro 2.0 \u5e93
60.5 OpenIDE-Module-Long-Description=\u5b89\u88c5 Metro 2.0 \u5e93
60.6 # library display name
60.7 -metro=METRO 2.0
60.8
60.9 +
61.1 --- a/src/zh_CN/enterprise/websvc-metro-model/websvc-metro-model/org/netbeans/modules/websvc/metro/model/ui/Bundle_zh_CN.properties Wed Feb 26 18:44:50 2014 -0800
61.2 +++ b/src/zh_CN/enterprise/websvc-metro-model/websvc-metro-model/org/netbeans/modules/websvc/metro/model/ui/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
61.3 @@ -46,7 +46,7 @@
61.4 LBL_Config_TubelinesClientConfig=\u5ba2\u6237\u7aef
61.5
61.6 TUBES_EDITOR_TITLE=\u7ba1\u9053
61.7 -TUBES_CONFIG_DESC=
61.8 +
61.9
61.10 HEADING_TUBES=\u7ba1\u9053\u5de5\u5382
61.11 LBL_Add=\u6dfb\u52a0(&A)...
62.1 --- a/src/zh_CN/enterprise/websvc-restlib/websvc-restlib/org/netbeans/modules/websvc/swdp/Bundle_zh_CN.properties Wed Feb 26 18:44:50 2014 -0800
62.2 +++ b/src/zh_CN/enterprise/websvc-restlib/websvc-restlib/org/netbeans/modules/websvc/swdp/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
62.3 @@ -47,5 +47,5 @@
62.4 OpenIDE-Module-Long-Description=\u5b89\u88c5\u5305\u542b JAX-RS API \u548c\u5f15\u7528\u5b9e\u73b0\u7684 JAR \u6587\u4ef6\u3002
62.5 # library display name
62.6
62.7 -restapi=JAX-RS 2.0
62.8
62.9 +
63.1 --- a/src/zh_CN/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/Bundle_zh_CN.properties Wed Feb 26 18:44:50 2014 -0800
63.2 +++ b/src/zh_CN/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
63.3 @@ -43,10 +43,10 @@
63.4
63.5
63.6
63.7 -jstl=JSTL 1.2.2
63.8 +
63.9 Templates/Project/Samples/ApiSupport/RESTSampleProject.zip=REST \u6837\u4f8b\u5e94\u7528\u7a0b\u5e8f
63.10 Amazon_Node_Name=Amazon Beanstalk
63.11 -STR_V3_FAMILY_NAME=GlassFish Server
63.12 +
63.13 SunResourcesFolder=GlassFish
63.14 Templates/WebLogicResources=WebLogic
63.15 Templates/WebLogicResources/weblogicDD=WebLogic \u63cf\u8ff0\u7b26
63.16 @@ -92,7 +92,7 @@
63.17 Templates/JSP_Servlet/CachingServiceLocator.java=\u9ad8\u901f\u7f13\u5b58\u670d\u52a1\u5b9a\u4f4d\u5668
63.18 Templates/JSP_Servlet/ServiceLocator.java=\u670d\u52a1\u5b9a\u4f4d\u5668
63.19 Templates/J2EE=Enterprise JavaBeans
63.20 -Templates/J2EE/EJB21=EJB 2.1
63.21 +
63.22 Templates/J2EE/EJB30=EJB 3.0
63.23 AnnotationPostContruct.description=\u68c0\u67e5 @PostConstruct \u6807\u6ce8\u7684\u7528\u6cd5\u3002\u5b83\u7684\u8fd4\u56de\u503c, \u6bcf\u4e2a\u7c7b\u7684\u5355\u4e00\u6027, \u53c2\u6570\u7b49\u3002
63.24 AnnotationPostContruct.display.name=\u6807\u6ce8 @PostConstruct
63.25 @@ -247,9 +247,9 @@
63.26 Templates/JSF=JavaServer Faces
63.27 Templates/JSF/JSF_From_Entity_Wizard=\u901a\u8fc7\u5b9e\u4f53\u751f\u6210 JSF
63.28 Templates/JSF/JSF_From_Entity_Wizard/StandardJSF=\u6807\u51c6 JavaServer Faces
63.29 -Templates/JSF/JSF_From_Entity_Wizard/StandardJSF/PaginationHelper.ftl=PaginationHelper.java
63.30 -Templates/JSF/JSF_From_Entity_Wizard/StandardJSF/JsfUtil.ftl=JsfUtil.java
63.31 -Templates/JSF/JSF_From_Entity_Wizard/StandardJSF/controller.ftl=Controller.java
63.32 +
63.33 +
63.34 +
63.35 Templates/JSF/JSF_From_Entity_Wizard/StandardJSF/create.ftl=Create.xhtml
63.36 Templates/JSF/JSF_From_Entity_Wizard/StandardJSF/edit.ftl=Edit.xhtml
63.37 Templates/JSF/JSF_From_Entity_Wizard/StandardJSF/view.ftl=View.xhtml
63.38 @@ -273,20 +273,20 @@
63.39 Templates/JSF/JsfFromDB=\u901a\u8fc7\u5b9e\u4f53\u7c7b\u521b\u5efa JSF \u9875
63.40 Templates/JSF/ResourceLibraryContract=JSF \u8d44\u6e90\u5e93\u5408\u540c
63.41 Templates/JSF/FacesComponent=JSF Faces \u7ec4\u4ef6
63.42 -jsf12=JSF 1.2
63.43 -jsf20=JSF 2.2
63.44 +
63.45 +
63.46
63.47 Templates/JSF/JSF_From_Entity_Wizard/PrimeFaces=PrimeFaces
63.48 -Templates/JSF/JSF_From_Entity_Wizard/PrimeFaces/JsfUtil.ftl=JsfUtil.java
63.49 -Templates/JSF/JSF_From_Entity_Wizard/PrimeFaces/controller.ftl=Controller.java
63.50 +
63.51 +
63.52 Templates/JSF/JSF_From_Entity_Wizard/PrimeFaces/create.ftl=Create.xhtml
63.53 Templates/JSF/JSF_From_Entity_Wizard/PrimeFaces/edit.ftl=Edit.xhtml
63.54 Templates/JSF/JSF_From_Entity_Wizard/PrimeFaces/view.ftl=View.xhtml
63.55 Templates/JSF/JSF_From_Entity_Wizard/PrimeFaces/list.ftl=List.xhtml
63.56 Templates/JSF/JSF_From_Entity_Wizard/PrimeFaces/bundle.ftl=Bundle.properties
63.57 Templates/JSF/JSF_From_Entity_Wizard/PrimeFaces/jsfcrud.css=jsfcrud.css
63.58 -Templates/JSF/JSF_From_Entity_Wizard/PrimeFaces/jsfcrud.js=jsfcrud.js
63.59 -Templates/JSF/JSF_From_Entity_Wizard/PrimeFaces/template.ftl=template.js
63.60 +
63.61 +
63.62 Templates/JSF/JSF_From_Entity_Snippets/PrimeFaces=PrimeFaces
63.63 Templates/JSF/JSF_From_Entity_Snippets/PrimeFaces/table.ftl=\u901a\u8fc7\u5b9e\u4f53\u751f\u6210 PrimeFaces \u6570\u636e\u8868
63.64 Templates/JSF/JSF_From_Entity_Snippets/PrimeFaces/view.ftl=\u901a\u8fc7\u5b9e\u4f53\u751f\u6210 PrimeFaces \u7a97\u4f53 (\u67e5\u770b)
63.65 @@ -305,7 +305,7 @@
63.66 Templates/WebServices/MessageHandler.java=\u6d88\u606f\u5904\u7406\u7a0b\u5e8f
63.67 Templates/WebServices/SOAPMessageHandler.java=\u6d88\u606f\u5904\u7406\u7a0b\u5e8f
63.68 Templates/WebServices/LogicalHandler.java=\u903b\u8f91\u5904\u7406\u7a0b\u5e8f
63.69 -metro=METRO 2.0
63.70 +
63.71 Templates/Project/Samples/Metro=Web \u670d\u52a1
63.72 Templates/Project/Samples/Metro/SecureCalculator=\u5b89\u5168\u8ba1\u7b97\u5668 (Java EE 6)
63.73 Templates/Project/Samples/Metro/Calculator=\u8ba1\u7b97\u5668 (Java EE 6)
63.74 @@ -324,7 +324,7 @@
63.75 Templates/Persistence/RestServicesFromEntities=\u901a\u8fc7\u5b9e\u4f53\u7c7b\u521b\u5efa REST \u98ce\u683c\u7684 Web \u670d\u52a1
63.76 Templates/Persistence/RestServicesFromDatabase=\u901a\u8fc7\u6570\u636e\u5e93\u521b\u5efa REST \u98ce\u683c\u7684 Web \u670d\u52a1
63.77
63.78 -restapi=JAX-RS 2.0
63.79 +
63.80 Templates/SaaSServices=SaaS \u670d\u52a1
63.81 Templates/WebServices/STSWizard.java=\u5b89\u5168\u6807\u8bb0\u670d\u52a1 (STS)
63.82 CTL_Hints_DisplayName=\u63d0\u793a
64.1 --- a/src/zh_CN/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/extide/Bundle_zh_CN.properties Wed Feb 26 18:44:50 2014 -0800
64.2 +++ b/src/zh_CN/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/extide/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
64.3 @@ -49,8 +49,8 @@
64.4
64.5
64.6
64.7 -cnbs=org.apache.tools.ant.module
64.8
64.9
64.10
64.11
64.12 +
65.1 --- a/src/zh_CN/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/fod/Bundle_zh_CN.properties Wed Feb 26 18:44:50 2014 -0800
65.2 +++ b/src/zh_CN/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/fod/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
65.3 @@ -99,7 +99,7 @@
65.4 MSG_BrokenActionInfo=\u89e3\u51b3\u95ee\u9898...
65.5
65.6
65.7 -ConfigurationPanel.errorLabel.text=\u4f2a
65.8 +
65.9
65.10
65.11
66.1 --- a/src/zh_CN/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/Bundle_zh_CN.properties Wed Feb 26 18:44:50 2014 -0800
66.2 +++ b/src/zh_CN/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
66.3 @@ -46,7 +46,7 @@
66.4 CTL_Hints_DisplayName=\u63d0\u793a
66.5 javac-api=Java \u6811 API
66.6
66.7 -spring-framework400=Spring Framework 4.0.0
66.8 +spring-framework400=Spring Framework 4.0.1
66.9 Templates/Beans=JavaBeans \u5bf9\u8c61
66.10 Templates/Beans/Bean.java=JavaBeans \u7ec4\u4ef6
66.11 Templates/Beans/BeanInfo.java=BeanInfo
66.12 @@ -103,10 +103,10 @@
66.13 Templates/Hibernate/Hibernate.cfg.xml=Hibernate \u914d\u7f6e\u5411\u5bfc
66.14 Templates/Hibernate/Hibernate.reveng.xml=Hibernate \u9006\u5411\u5de5\u7a0b\u5411\u5bfc
66.15 Templates/Hibernate/Hibernate.CodeGen=\u901a\u8fc7\u6570\u636e\u5e93\u751f\u6210 Hibernate \u6620\u5c04\u6587\u4ef6\u548c POJO
66.16 -hibernate4-support=Hibernate 4.x
66.17 +
66.18 jpa2-persistence=\u6301\u4e45\u6027 JPA 2.0
66.19 -hibernate4-persistence=Hibernate 4.x (JPA 2.0)
66.20 -hibernate4-persistencemodelgen=Hibernate 4.x Modelgen
66.21 +
66.22 +
66.23
66.24 jpa20-persistence=\u6301\u4e45\u6027 (JPA 2.1)
66.25
66.26 @@ -301,7 +301,7 @@
66.27 DESC_org.netbeans.modules.java.hints.bugs.Unbalanced.Array=\u6570\u7ec4\u5177\u6709\u4e0d\u5bf9\u79f0\u7684\u8bfb\u53d6/\u5199\u5165
66.28 DN_org.netbeans.modules.java.hints.bugs.Unbalanced.Collection=\u96c6\u5408\u5177\u6709\u4e0d\u5bf9\u79f0\u7684\u8bfb\u53d6/\u5199\u5165
66.29 DESC_org.netbeans.modules.java.hints.bugs.Unbalanced.Collection=\u96c6\u5408\u5177\u6709\u4e0d\u5bf9\u79f0\u7684\u8bfb\u53d6/\u5199\u5165
66.30 -DN_org.netbeans.modules.java.hints.bugs.CheckReturnValueHint=@CheckReturnValue
66.31 +
66.32 DESC_org.netbeans.modules.java.hints.bugs.CheckReturnValueHint=\u9a8c\u8bc1\u662f\u5426\u786e\u5b9e\u9009\u4e2d\u4e86\u6807\u6709 @CheckReturnValue \u7684\u65b9\u6cd5\u7684\u7ed3\u679c\u3002
66.33 DN_NPECheck=\u7a7a\u503c\u6307\u9488\u89e3\u9664\u5f15\u7528
66.34 DESC_NPECheck=\u68c0\u67e5\u4e0e\u89e3\u9664\u5f15\u7528\u7a7a\u503c\u76f8\u5173\u7684\u5404\u79cd\u95ee\u9898
66.35 @@ -347,7 +347,7 @@
66.36 DESC_DN_CreatedThrowableNotThrown=\u6b64\u63d0\u793a\u68c0\u6d4b Throwable \u521b\u5efa, \u7136\u540e\u653e\u5f03\u3002Throwable \u521b\u5efa\u76f8\u5f53\u6602\u8d35, \u4e0d\u4f7f\u7528\u521b\u5efa\u7684 Throwable \u53ef\u80fd\u6307\u793a\u672a\u5b8c\u6210\u7684\u9519\u8bef\u5904\u7406\u4ee3\u7801\u3002\u5982\u679c\u5f15\u53d1 Throwable, \u4f5c\u4e3a\u53c2\u6570\u4f20\u9012\u7ed9\u65b9\u6cd5, \u4f5c\u4e3a\u65b9\u6cd5\u7ed3\u679c\u8fd4\u56de\u6216\u5206\u914d\u81f3\u5b57\u6bb5, \u5219\u5c06\u5176\u89c6\u4e3a<i>\u5df2\u4f7f\u7528</i>\u3002\u4e5f\u4f1a\u68c0\u67e5\u901a\u8fc7\u672c\u5730\u53d8\u91cf\u7684\u53ef\u80fd\u5206\u914d\u4ee5\u786e\u5b9a\u662f\u5426\u5c06\u6700\u7ec8<i>\u4f7f\u7528</i>\u6b64\u503c\u3002
66.37 DN_ThrowableMethodResultIgnored=\u5ffd\u7565 Throwable \u65b9\u6cd5\u7ed3\u679c
66.38 DESC_ThrowableMethodResultIgnored=\u5982\u679c\u4ece\u65b9\u6cd5\u8c03\u7528\u4f5c\u4e3a<i>\u8fd4\u56de\u503c</i>\u8fd4\u56de Throwable (\u76f8\u5bf9\u4e8e\u5f15\u53d1), \u5219\u901a\u5e38\u4f1a\u4ee5\u67d0\u79cd\u65b9\u5f0f\u8fdb\u884c\u8bb0\u5f55 (\u5206\u914d), \u8fdb\u4e00\u6b65\u5904\u7406 (\u4f20\u9012\u5230\u5176\u4ed6\u65b9\u6cd5\u8c03\u7528) \u6216\u5f15\u53d1\u3002\u5ffd\u7565\u6b64\u7c7b Throwable \u6216\u5728\u67d0\u79cd\u7b80\u5355\u6bd4\u8f83\u4e2d\u4f7f\u7528\u5219\u6307\u793a\u9519\u8bef\u5904\u7406\u7f3a\u9677, \u6216\u65b9\u6cd5\u5e94\u8fd4\u56de\u5176\u4ed6\u503c\u4ee5\u8282\u7701 Throwable \u7684\u5806\u6808\u8ddf\u8e2a\u521b\u5efa\u65f6\u95f4\u3002
66.39 -DN_MissingSwitchcase=\u53ef\u80fd\u7f3a\u5c11 switch `case'' \u8bed\u53e5
66.40 +DN_MissingSwitchcase=\u53ef\u80fd\u7f3a\u5c11 switch "case" \u8bed\u53e5
66.41 DESC_MissingSwitchcase=\u6b64\u63d0\u793a\u68c0\u6d4b <b>switch \u8bed\u53e5</b> (\u4e0d\u5e26 <b>case</b> \u8bed\u53e5\u7684\u6807\u7b7e) \u4e2d\u7684\u8f93\u5165\u9519\u8bef\u3002<p/>\u5982\u679c\u662f\u4ee5\u4e0b\u8bed\u53e5\u7684\u9884\u671f\u6807\u7b7e, \u5219\u4e5f\u53ef\u4ee5\u662f\u5fd8\u8bb0\u4e86\u5173\u952e\u5b57\u7684\u9884\u671f <b>case</b> \u5206\u652f\u3002
66.42 DESC_org.netbeans.modules.java.hints.RemoveUnnecessaryReturn=\u5220\u9664\u4e0d\u9700\u8981\u7684 return \u8bed\u53e5
66.43 DESC_redundantConditional=\u591a\u4f59\u7684\u6761\u4ef6\u8bed\u53e5
66.44 @@ -642,6 +642,8 @@
66.45 LBL_Maven_Quickstart_Archetype=Java \u5e94\u7528\u7a0b\u5e8f
66.46 TIT_Maven_Category=Maven
66.47 KW_MavenOptions=Maven \u7248\u672c,Maven \u9009\u9879,Maven \u8d44\u6e90\u5e93\u9009\u9879
66.48 +LBL_JavaScript=JavaScript
66.49 +KW_JavaScript=JavaScript,Nashorn
66.50 CTL_MenuItem=Eclipse \u9879\u76ee(&E)...
66.51 Templates/SpringFramework=Spring \u6846\u67b6
66.52 Templates/SpringFramework/SpringXMLConfig.xml=Spring XML \u914d\u7f6e\u6587\u4ef6
67.1 --- a/src/zh_CN/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/mobility/Bundle_zh_CN.properties Wed Feb 26 18:44:50 2014 -0800
67.2 +++ b/src/zh_CN/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/mobility/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
67.3 @@ -44,8 +44,12 @@
67.4 Templates/Project/JavaME=Java ME \u5d4c\u5165\u5f0f
67.5 Templates/javame=Java ME \u5d4c\u5165\u5f0f
67.6 Templates/javame/MEEPlet.java=MIDlet
67.7 +Templates/Project/Samples/JavaME=Java ME \u5d4c\u5165\u5f0f
67.8 template_app=Java ME \u5d4c\u5165\u5f0f\u5e94\u7528\u7a0b\u5e8f
67.9 Templates/Services/Platforms/org-netbeans-api-java-Platform/j2meplatform.xml=Java ME \u4eff\u771f\u5668
67.10 +DataBindingME=NetBeans DataBindingME
67.11 +DataBindingME-PIM=NetBeans DataBindingME PIM
67.12 +DataBindingME-SVG=NetBeans DataBindingME SVG
67.13
67.14
67.15
68.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
68.2 +++ b/src/zh_CN/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/mobility/org-netbeans-modules-j2me-project-templates-samples_zh_CN.html Thu Feb 27 00:43:29 2014 -0800
68.3 @@ -0,0 +1,52 @@
68.4 +<!DOCTYPE html>
68.5 +<!--
68.6 +DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
68.7 +
68.8 +Copyright 2014 Oracle and/or its affiliates. All rights reserved.
68.9 +
68.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
68.11 +Other names may be trademarks of their respective owners.
68.12 +
68.13 +The contents of this file are subject to the terms of either the GNU
68.14 +General Public License Version 2 only ("GPL") or the Common
68.15 +Development and Distribution License("CDDL") (collectively, the
68.16 +"License"). You may not use this file except in compliance with the
68.17 +License. You can obtain a copy of the License at
68.18 +http://www.netbeans.org/cddl-gplv2.html
68.19 +or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
68.20 +specific language governing permissions and limitations under the
68.21 +License. When distributing the software, include this License Header
68.22 +Notice in each file and include the License file at
68.23 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
68.24 +particular file as subject to the "Classpath" exception as provided
68.25 +by Oracle in the GPL Version 2 section of the License file that
68.26 +accompanied this code. If applicable, add the following below the
68.27 +License Header, with the fields enclosed by brackets [] replaced by
68.28 +your own identifying information:
68.29 +"Portions Copyrighted [year] [name of copyright owner]"
68.30 +
68.31 +If you wish your version of this file to be governed by only the CDDL
68.32 +or only the GPL Version 2, indicate your decision by adding
68.33 +"[Contributor] elects to include this software in this distribution
68.34 +under the [CDDL or GPL Version 2] license." If you do not indicate a
68.35 +single choice of license, a recipient has the option to distribute
68.36 +your version of this file under either the CDDL, the GPL Version 2 or
68.37 +to extend the choice of license to its licensees as provided above.
68.38 +However, if you add GPL Version 2 code and therefore, elected the GPL
68.39 +Version 2 license, then the option applies only if the new code is
68.40 +made subject to such option by the copyright holder.
68.41 +
68.42 +Contributor(s):
68.43 +
68.44 +Portions Copyrighted 2014 Sun Microsystems, Inc.
68.45 +-->
68.46 +<!DOCTYPE html>
68.47 +<html>
68.48 + <head>
68.49 + <title></title>
68.50 +<meta http-equiv="content-type" content="text/html; charset=UTF-8">
68.51 + </head>
68.52 + <body>
68.53 + <div>Java ME 嵌入式样例</div>
68.54 + </body>
68.55 +</html>
69.1 --- a/src/zh_CN/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/newproject/Bundle_zh_CN.properties Wed Feb 26 18:44:50 2014 -0800
69.2 +++ b/src/zh_CN/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/newproject/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
69.3 @@ -56,16 +56,16 @@
69.4 DescriptionStep_DisabledModulesFound={1} {0,choice,1#\u662f|2<\u662f}\u53ef\u7528\u7684\u3002\u662f\u5426\u8981\u6fc0\u6d3b{0,choice,1#\u5b83|2<\u5b83\u4eec}?
69.5 LicenseApprovalPanel_taTitle_Text=\u8981\u7ee7\u7eed\u8fdb\u884c\u5b89\u88c5, \u60a8\u9700\u8981\u63a5\u53d7\u4e0e\u7279\u5b9a\u63d2\u4ef6\u6709\u5173\u7684\u6240\u6709\u8bb8\u53ef\u8bc1\u534f\u8bae\u3002\n\n
69.6 LicenseApprovalPanel_tpLicense_Head={0}\u8bb8\u53ef\u8bc1\u534f\u8bae
69.7 -LicenseApprovalPanel_tpLicense_Delimeter=,
69.8 -LicenseApprovalPanel_tpLicense_Separator=_______________________________________\n
69.9 +
69.10 +
69.11 LicenseApprovalPanel_rbAccept_Text=\u6211\u63a5\u53d7\u6240\u6709\u8bb8\u53ef\u8bc1\u534f\u8bae\u4e2d\u7684\u6761\u6b3e(&A)\u3002
69.12 LicenseApprovalPanel_rbDismis_Text=\u6211\u4e0d\u63a5\u53d7\u6240\u6709\u8bb8\u53ef\u8bc1\u534f\u8bae\u4e2d\u7684\u6761\u6b3e(&D)\u3002
69.13 -InstallStep_PluginDisplay={0} [{1}/{2}]
69.14
69.15
69.16
69.17
69.18 -InstallStep_InstallDescription_Plugin={0} [{1}]:
69.19 +
69.20 +
69.21 InstallStep_Downloading=\u6b63\u5728\u4e0b\u8f7d{0}
69.22 InstallStep_Verifing=\u6b63\u5728\u9a8c\u8bc1{0}
69.23 InstallStep_Installing=\u5b89\u88c5{0}
70.1 --- a/src/zh_CN/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/php/Bundle_zh_CN.properties Wed Feb 26 18:44:50 2014 -0800
70.2 +++ b/src/zh_CN/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/php/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
70.3 @@ -90,6 +90,7 @@
70.4 Templates/Project/Samples/PHP/RentAFlat-Zend=Rent a Flat - Zend \u6846\u67b6\u6837\u4f8b\u5e94\u7528\u7a0b\u5e8f
70.5 Templates/Project/Samples/PHP/Calculator-PHPUnit=\u8ba1\u7b97\u5668 - PHPUnit \u6837\u4f8b\u5e94\u7528\u7a0b\u5e8f
70.6 Templates/Project/Samples/PHP/Calculator-atoum=\u8ba1\u7b97\u5668 - Atoum \u6837\u4f8b\u5e94\u7528\u7a0b\u5e8f
70.7 +Templates/Project/Samples/PHP/Calculator-Nette-Tester=\u8ba1\u7b97\u5668 - Nette Tester \u6837\u4f8b\u5e94\u7528\u7a0b\u5e8f
70.8 TPLResolver=TPL \u6587\u4ef6
70.9 Templates/Scripting/SmartyTemplate.tpl=Smarty \u6a21\u677f
70.10 SmartyOptionsPanel.keywords.framework=\u6846\u67b6
71.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
71.2 +++ b/src/zh_CN/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/php/org-netbeans-modules-php-samples-descriptions-Calculator-Nette-Tester_zh_CN.html Thu Feb 27 00:43:29 2014 -0800
71.3 @@ -0,0 +1,50 @@
71.4 +<!--
71.5 +DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
71.6 +
71.7 +Copyright 2013 Oracle and/or its affiliates. All rights reserved.
71.8 +
71.9 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
71.10 +Other names may be trademarks of their respective owners.
71.11 +
71.12 +The contents of this file are subject to the terms of either the GNU
71.13 +General Public License Version 2 only ("GPL") or the Common
71.14 +Development and Distribution License("CDDL") (collectively, the
71.15 +"License"). You may not use this file except in compliance with the
71.16 +License. You can obtain a copy of the License at
71.17 +http://www.netbeans.org/cddl-gplv2.html
71.18 +or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
71.19 +specific language governing permissions and limitations under the
71.20 +License. When distributing the software, include this License Header
71.21 +Notice in each file and include the License file at
71.22 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
71.23 +particular file as subject to the "Classpath" exception as provided
71.24 +by Oracle in the GPL Version 2 section of the License file that
71.25 +accompanied this code. If applicable, add the following below the
71.26 +License Header, with the fields enclosed by brackets [] replaced by
71.27 +your own identifying information:
71.28 +"Portions Copyrighted [year] [name of copyright owner]"
71.29 +
71.30 +If you wish your version of this file to be governed by only the CDDL
71.31 +or only the GPL Version 2, indicate your decision by adding
71.32 +"[Contributor] elects to include this software in this distribution
71.33 +under the [CDDL or GPL Version 2] license." If you do not indicate a
71.34 +single choice of license, a recipient has the option to distribute
71.35 +your version of this file under either the CDDL, the GPL Version 2 or
71.36 +to extend the choice of license to its licensees as provided above.
71.37 +However, if you add GPL Version 2 code and therefore, elected the GPL
71.38 +Version 2 license, then the option applies only if the new code is
71.39 +made subject to such option by the copyright holder.
71.40 +
71.41 +Contributor(s):
71.42 +
71.43 +Portions Copyrighted 2013 Sun Microsystems, Inc.
71.44 +-->
71.45 +<!DOCTYPE html>
71.46 +<html>
71.47 + <head>
71.48 +<meta http-equiv="content-type" content="text/html; charset=UTF-8">
71.49 + </head>
71.50 + <body>
71.51 + “计算器”是一个支持基本算术运算的简单计算器。已创建项目来演示 NetBeans 中的 Nette Tester 测试框架支持。<br><br> 要求: Nette Tester
71.52 + </body>
71.53 +</html>
72.1 --- a/src/zh_CN/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/webcommon/Bundle_zh_CN.properties Wed Feb 26 18:44:50 2014 -0800
72.2 +++ b/src/zh_CN/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/webcommon/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
72.3 @@ -65,7 +65,7 @@
72.4 Templates/ClientSide/javascript.js=JavaScript \u6587\u4ef6
72.5 Templates/ClientSide/css.css=\u7ea7\u8054\u6837\u5f0f\u8868
72.6 Templates/ClientSide/json.json=JSON \u6587\u4ef6
72.7 -Templates.gruntfile.js=Gruntfile.js
72.8 +
72.9 ClientSideProjectWizardIterator.existingProject.displayName=\u57fa\u4e8e\u73b0\u6709\u6e90\u4ee3\u7801\u7684 HTML5 \u5e94\u7528\u7a0b\u5e8f
72.10 ClientSideProjectWizardIterator.newProject.displayName=HTML5 \u5e94\u7528\u7a0b\u5e8f
72.11
73.1 --- a/src/zh_CN/extide/org-apache-tools-ant-module/org-apache-tools-ant-module/org/apache/tools/ant/module/loader/Bundle_zh_CN.properties Wed Feb 26 18:44:50 2014 -0800
73.2 +++ b/src/zh_CN/extide/org-apache-tools-ant-module/org-apache-tools-ant-module/org/apache/tools/ant/module/loader/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
73.3 @@ -48,6 +48,6 @@
73.4 # AntProjectDataEditor
73.5 # {0} - regular file name (w/ or w/o ext) for editor tabs
73.6 # {1} - Ant project name
73.7 -LBL_editor_tab={0} [{1}]
73.8
73.9
73.10 +
74.1 --- a/src/zh_CN/extide/org-apache-tools-ant-module/org-apache-tools-ant-module/org/apache/tools/ant/module/run/Bundle_zh_CN.properties Wed Feb 26 18:44:50 2014 -0800
74.2 +++ b/src/zh_CN/extide/org-apache-tools-ant-module/org-apache-tools-ant-module/org/apache/tools/ant/module/run/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
74.3 @@ -46,11 +46,11 @@
74.4 # {2} - target name(s)
74.5
74.6 # CAUTION: space at end of next line intentional!
74.7 -SEP_output_target=,
74.8 +
74.9 # {0] - project name
74.10 # {1} - file name
74.11
74.12 -LBL_unparseable_proj_name=???
74.13 +
74.14 EXC_non_local_proj_file=\u53ea\u80fd\u6267\u884c\u78c1\u76d8\u4e0a\u7684 Ant \u811a\u672c\u3002
74.15 TargetExecutor.StopAction.stop=\u505c\u6b62
74.16 TargetExecutor.RerunAction.rerun=\u91cd\u65b0\u8fd0\u884c
74.17 @@ -58,7 +58,7 @@
74.18 TargetExecutor.OptionsAction=Ant \u8bbe\u7f6e
74.19 # {0} - regular tab name
74.20 # {1} - count (2, 3, ...)
74.21 -TargetExecutor.uniquified={0} #{1}
74.22 +
74.23
74.24 # RunTargetsAction
74.25 LBL_run_targets_action=\u8fd0\u884c\u76ee\u6807
74.26 @@ -94,7 +94,7 @@
74.27 # {1} seconds
74.28 FMT_target_failed_printed=\u6784\u5efa\u5931\u8d25 (\u603b\u65f6\u95f4: {0, choice, 0#| 1#1 \u5206\u949f | 2#{0} \u5206\u949f }{1, choice, 0#0 \u79d2| 1#1 \u79d2| 2#{1} \u79d2})
74.29 # {0} - target name
74.30 -MSG_target_started_printed={0}:
74.31 +
74.32 # {0} - display name of process, e.g. "myapp (jar)"
74.33 FMT_target_failed_status={0} \u6784\u5efa\u5931\u8d25\u3002
74.34 # {0} minutes
75.1 --- a/src/zh_CN/groovy/groovy-grailsproject/groovy-grailsproject/org/netbeans/modules/groovy/grailsproject/ui/wizards/impl/Bundle_zh_CN.properties Wed Feb 26 18:44:50 2014 -0800
75.2 +++ b/src/zh_CN/groovy/groovy-grailsproject/groovy-grailsproject/org/netbeans/modules/groovy/grailsproject/ui/wizards/impl/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
75.3 @@ -50,7 +50,7 @@
75.4 LBL_GrailsTargetChooserPanelGUI_CreatedFolder_Label=\u521b\u5efa\u7684\u6587\u4ef6\u5939(&C):
75.5 LBL_GrailsTargetChooserPanelGUI_jLabel5=\u9879\u76ee(&P):
75.6
75.7 -LBL_GrailsTargetChooserPanelGUI_NewArtifactPrefix=\u65b0\u5efa
75.8 +
75.9
75.10 ERR_GrailsTargetChooser_InvalidPackage=\u5305\u540d\u65e0\u6548
75.11 ERR_GrailsTargetChooser_InvalidArtifactName=\u5de5\u4ef6\u540d\u79f0\u65e0\u6548
76.1 --- a/src/zh_CN/groovy/groovy-refactoring/groovy-refactoring/org/netbeans/modules/groovy/refactoring/ui/Bundle_zh_CN.properties Wed Feb 26 18:44:50 2014 -0800
76.2 +++ b/src/zh_CN/groovy/groovy-refactoring/groovy-refactoring/org/netbeans/modules/groovy/refactoring/ui/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
76.3 @@ -223,7 +223,7 @@
76.4 MoveMembersPanel.btnJavadocUpdate.text=\u66f4\u65b0
76.5
76.6 # *** Refactoring panel ***
76.7 -IntroduceLocalExtensionPanel.newNameField.text=\u65b0\u7c7b
76.8 +
76.9 IntroduceLocalExtensionPanel.labelNewName.text=\u65b0\u540d\u79f0(&N):
76.10 IntroduceLocalExtensionPanel.labelProject.text=\u9879\u76ee(&O):
76.11 IntroduceLocalExtensionPanel.labelPackage.text=\u76ee\u6807\u5305(&T):
77.1 --- a/src/zh_CN/harness/org-netbeans-libs-nbi-engine/ext/nbi-engine/org/netbeans/installer/wizard/components/panels/Bundle_zh_CN.properties Wed Feb 26 18:44:50 2014 -0800
77.2 +++ b/src/zh_CN/harness/org-netbeans-libs-nbi-engine/ext/nbi-engine/org/netbeans/installer/wizard/components/panels/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
77.3 @@ -255,10 +255,10 @@
77.4
77.5
77.6 PrISP.components.to.install.label.text=\u60a8\u9009\u62e9\u5b89\u88c5\u4ee5\u4e0b\u7ec4\u4ef6:
77.7 -PrISP.components.to.install.text={0}.
77.8 +
77.9
77.10 PrISP.components.to.uninstall.label.text=\u60a8\u9009\u62e9\u5378\u8f7d\u4ee5\u4e0b\u7ec4\u4ef6:
77.11 -PrISP.components.to.uninstall.text={0}.
77.12 +
77.13
77.14
77.15
78.1 --- a/src/zh_CN/ide/bugtracking/bugtracking/org/netbeans/modules/bugtracking/tasks/actions/Bundle_zh_CN.properties Wed Feb 26 18:44:50 2014 -0800
78.2 +++ b/src/zh_CN/ide/bugtracking/bugtracking/org/netbeans/modules/bugtracking/tasks/actions/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
78.3 @@ -45,6 +45,7 @@
78.4 CTL_ActivateTask=\u6fc0\u6d3b
78.5 CTL_DeactivateTask=\u505c\u7528
78.6 CTL_Edit=\u7f16\u8f91
78.7 +CTL_AutoRefresh=\u81ea\u52a8\u5237\u65b0
78.8 CTL_ShowResult=\u641c\u7d22\u7ed3\u679c\u89c6\u56fe
78.9 CTL_Delete=\u5220\u9664
78.10 CTL_Rename=\u91cd\u547d\u540d
79.1 --- a/src/zh_CN/ide/bugtracking/bugtracking/org/netbeans/modules/bugtracking/tasks/dashboard/Bundle_zh_CN.properties Wed Feb 26 18:44:50 2014 -0800
79.2 +++ b/src/zh_CN/ide/bugtracking/bugtracking/org/netbeans/modules/bugtracking/tasks/dashboard/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
79.3 @@ -41,6 +41,7 @@
79.4 # made subject to such option by the copyright holder.
79.5
79.6
79.7 +CTL_AutoRefreshOff=\u81ea\u52a8\u5237\u65b0\u5df2\u5173\u95ed
79.8 LBL_Closed=\u5df2\u5173\u95ed
79.9 LBL_Categories=\u7c7b\u522b
79.10 LBL_Repositories=\u8d44\u6e90\u5e93
80.1 --- a/src/zh_CN/ide/bugzilla/bugzilla/org/netbeans/modules/bugzilla/repository/Bundle_zh_CN.properties Wed Feb 26 18:44:50 2014 -0800
80.2 +++ b/src/zh_CN/ide/bugzilla/bugzilla/org/netbeans/modules/bugzilla/repository/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
80.3 @@ -120,9 +120,9 @@
80.4 RepositoryPanel.cancelButton.text=\u53d6\u6d88
80.5
80.6 # {repositoryName} : {user}@{url}
80.7 -LBL_RepositoryTooltip="{0} : {1}@{2}
80.8 +
80.9 # {repositoryName} : {url}
80.10 -LBL_RepositoryTooltipNoUser="{0} : {1}
80.11 +
80.12
80.13
80.14 NBLoginPanel.passwordField.text=jPasswordField1
81.1 --- a/src/zh_CN/ide/code-analysis/code-analysis/org/netbeans/modules/analysis/Bundle_zh_CN.properties Wed Feb 26 18:44:50 2014 -0800
81.2 +++ b/src/zh_CN/ide/code-analysis/code-analysis/org/netbeans/modules/analysis/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
81.3 @@ -3,6 +3,8 @@
81.4 CTL_RunAnalysisAction=\u68c0\u67e5...
81.5 # {0} - file display name
81.6 DN_CurrentFile=\u5f53\u524d\u6587\u4ef6 ({0})
81.7 +# {0} - folder display name
81.8 +DN_CurrentFolder=\u5f53\u524d\u6587\u4ef6\u5939 ({0})
81.9 # {0} - package display name
81.10 DN_CurrentPackage=\u5f53\u524d\u5305 ({0})
81.11 # {0} - project display name
82.1 --- a/src/zh_CN/ide/code-analysis/code-analysis/org/netbeans/modules/analysis/ui/Bundle_zh_CN.properties Wed Feb 26 18:44:50 2014 -0800
82.2 +++ b/src/zh_CN/ide/code-analysis/code-analysis/org/netbeans/modules/analysis/ui/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
82.3 @@ -55,7 +55,7 @@
82.4 #{0}: the list of missing plugins
82.5 DESC_MissingPlugins=<html>\u7f3a\u5c11\u4ee5\u4e0b\u63d2\u4ef6, \u8fd9\u4e9b\u63d2\u4ef6\u662f\u5b8c\u5168\u5206\u6790\u9009\u5b9a\u8303\u56f4\u6240\u5fc5\u9700\u7684:<ul>{0}</ul>
82.6 DN_MissingPlugins=\u7f3a\u5c11\u6240\u9700\u63d2\u4ef6
82.7 -ERR_AnalyzerError={0}: {1}
82.8 +
82.9 ERR_CannotOpen=\u65e0\u6cd5\u6253\u5f00\u76ee\u6807\u6587\u4ef6
82.10 #{0} - the project's name
82.11 ERR_ProjectNotSupported=\u4e0d\u652f\u6301\u9879\u76ee\u7c7b\u578b ({0})
83.1 --- a/src/zh_CN/ide/css-editor/css-editor/org/netbeans/modules/css/editor/actions/Bundle_zh_CN.properties Wed Feb 26 18:44:50 2014 -0800
83.2 +++ b/src/zh_CN/ide/css-editor/css-editor/org/netbeans/modules/css/editor/actions/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
83.3 @@ -71,13 +71,13 @@
83.4 REMOVE_RULE_TOOL_TIP=\u5220\u9664\u89c4\u5219
83.5
83.6
83.7 -REMOVE_RULE_LBL=<
83.8 +
83.9
83.10
83.11 ADD_RULE_TOOL_TIP=\u6dfb\u52a0\u89c4\u5219
83.12
83.13
83.14 -ADD_RULE_LBL=>
83.15 +
83.16
83.17
83.18 MOVE_RULE_DOWN_LBL=\u4e0b\u79fb
84.1 --- a/src/zh_CN/ide/css-editor/css-editor/org/netbeans/modules/css/editor/ui/Bundle_zh_CN.properties Wed Feb 26 18:44:50 2014 -0800
84.2 +++ b/src/zh_CN/ide/css-editor/css-editor/org/netbeans/modules/css/editor/ui/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
84.3 @@ -71,13 +71,13 @@
84.4 REMOVE_RULE_TOOL_TIP=\u5220\u9664\u89c4\u5219
84.5
84.6
84.7 -REMOVE_RULE_LBL=<
84.8 +
84.9
84.10
84.11 ADD_RULE_TOOL_TIP=\u6dfb\u52a0\u89c4\u5219
84.12
84.13
84.14 -ADD_RULE_LBL=>
84.15 +
84.16
84.17
84.18 MOVE_RULE_DOWN_LBL=\u4e0b\u79fb
85.1 --- a/src/zh_CN/ide/css-prep/css-prep/org/netbeans/modules/css/prep/problems/Bundle_zh_CN.properties Wed Feb 26 18:44:50 2014 -0800
85.2 +++ b/src/zh_CN/ide/css-prep/css-prep/org/netbeans/modules/css/prep/problems/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
85.3 @@ -1,6 +1,6 @@
85.4 # {0} - preprocessor name
85.5 # {1} - message
85.6 -BaseProjectProblemsProvider.error={0}: {1}
85.7 +
85.8 LessProjectProblemsProvider.displayName=LESS
85.9 LessProjectProblemsProvider.invalidCompiler.description=\u63d0\u4f9b\u7684 LESS \u7f16\u8bd1\u5668\u65e0\u6548\u3002
85.10 LessProjectProblemsProvider.invalidCompiler.title=\u65e0\u6548\u7684 LESS \u7f16\u8bd1\u5668
86.1 --- a/src/zh_CN/ide/db-core/db-core/org/netbeans/modules/db/sql/loader/Bundle_zh_CN.properties Wed Feb 26 18:44:50 2014 -0800
86.2 +++ b/src/zh_CN/ide/db-core/db-core/org/netbeans/modules/db/sql/loader/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
86.3 @@ -85,7 +85,7 @@
86.4 CLOSE_ALL_TABS_ACTION=\u5168\u90e8\u5173\u95ed
86.5 CLOSE_PREVIOUS_TABS_ACTION=\u5173\u95ed\u4ee5\u524d\u6267\u884c\u7684\u6807\u7b7e
86.6
86.7 -LBL_ConsoleWithConnection={0} [{1}]
86.8 +
86.9
86.10 MSG_SaveModified=\u5df2\u4fee\u6539\u6587\u4ef6{0}\u3002\u662f\u5426\u4fdd\u5b58?
86.11 Source=\u6e90(&S)
87.1 --- a/src/zh_CN/ide/db-dataview/db-dataview/org/netbeans/modules/db/dataview/output/Bundle_zh_CN.properties Wed Feb 26 18:44:50 2014 -0800
87.2 +++ b/src/zh_CN/ide/db-dataview/db-dataview/org/netbeans/modules/db/dataview/output/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
87.3 @@ -184,5 +184,5 @@
87.4 InsertRecordDialog.addBtn.toolTipText=\u6dfb\u52a0\u8981\u63d2\u5165\u7684\u884c
87.5 InsertRecordDialog.addBtn.text_1=\u6dfb\u52a0\u884c(&A)
87.6
87.7 -DataViewUI_TrimmedTabName={0}...
87.8
87.9 +
88.1 --- a/src/zh_CN/ide/derby/derby/org/netbeans/modules/derby/Bundle_zh_CN.properties Wed Feb 26 18:44:50 2014 -0800
88.2 +++ b/src/zh_CN/ide/derby/derby/org/netbeans/modules/derby/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
88.3 @@ -105,4 +105,5 @@
88.4 ConnectDatabaseAction_ConnectAction=\u8fde\u63a5...
88.5
88.6 JAVADB_DRIVER_LABEL=Java DB \u9a71\u52a8\u7a0b\u5e8f
88.7 +TTL_SecurityBug=JavaDB - \u5b89\u5168\u7ba1\u7406\u5668\u95ee\u9898
88.8
89.1 --- a/src/zh_CN/ide/derby/derby/org/netbeans/modules/derby/ui/Bundle_zh_CN.properties Wed Feb 26 18:44:50 2014 -0800
89.2 +++ b/src/zh_CN/ide/derby/derby/org/netbeans/modules/derby/ui/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
89.3 @@ -95,4 +95,8 @@
89.4
89.5 LBL_Install=Java \u6570\u636e\u5e93\u5b89\u88c5:
89.6 LBL_InstallationInfo=\u8bf7\u6307\u5b9a Java \u6570\u636e\u5e93\u7684\u5b89\u88c5\u6587\u4ef6\u5939\u4ee5\u53ca\u5b58\u653e\u6570\u636e\u5e93\u7684\u6587\u4ef6\u5939\u3002\u6570\u636e\u5e93\u4f4d\u7f6e\u6587\u4ef6\u5939\u5c06\u7528\u4f5c derby.system.home \u5c5e\u6027\u7684\u503c\u3002
89.7 +SecurityManagerBugPanel.disableSecurityManagerButton.text=\u7981\u7528 SecurityManager
89.8 +SecurityManagerBugPanel.info1Label.text=JavaDB \u4f3c\u4e4e\u9047\u5230\u4e86\u4e0e\u5b89\u5168\u7ba1\u7406\u5668\u76f8\u5173\u7684\u95ee\u9898\u3002
89.9 +SecurityManagerBugPanel.info2Label.text=<html>\u53ef\u4ee5\u7981\u7528\u5b89\u5168\u7ba1\u7406\u5668, \u4f46\u786e\u4fdd\u8fd9\u4e0d\u4f1a\u7ed9\u60a8\u5e26\u6765\u4efb\u4f55\u5b89\u5168\u98ce\u9669\u3002\u5426\u5219\u8bf7\u624b\u52a8\u914d\u7f6e JavaDB\u3002</html>
89.10 +SecurityManagerBugPanel.doNotShowAgainButton.text=<html><a href="">\u4e0d\u518d\u663e\u793a</a></html>
89.11
90.1 --- a/src/zh_CN/ide/dlight-nativeexecution/dlight-nativeexecution/org/netbeans/modules/nativeexecution/api/util/Bundle_zh_CN.properties Wed Feb 26 18:44:50 2014 -0800
90.2 +++ b/src/zh_CN/ide/dlight-nativeexecution/dlight-nativeexecution/org/netbeans/modules/nativeexecution/api/util/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
90.3 @@ -55,5 +55,4 @@
90.4 ShellValidationSupport.ValidationWarning.Cygwin32OnJDK64=\u4f7f\u7528\u4e86 32 \u4f4d cygwin, \u4f46\u60a8\u8fd0\u884c\u7684\u662f 64 \u4f4d netbeans\u3002\n\u8fd9\u53ef\u80fd\u4f1a\u5728\u6267\u884c\u65f6\u5bfc\u81f4\u95ee\u9898\u3002\n\u8bf7\u542f\u52a8 32 \u4f4d netbeans \u6216\u5b89\u88c5 64 \u4f4d cygwin\u3002
90.5 ShellValidationSupport.ValidationWarning.Cygwin64OnJDK32=\u4f7f\u7528\u4e86 64 \u4f4d cygwin, \u4f46\u60a8\u8fd0\u884c\u7684\u662f 32 \u4f4d netbeans\u3002\n\u8fd9\u53ef\u80fd\u4f1a\u5728\u6267\u884c\u65f6\u5bfc\u81f4\u95ee\u9898\u3002\n\u8bf7\u542f\u52a8 64 \u4f4d netbeans \u6216\u5b89\u88c5 32 \u4f4d cygwin\u3002
90.6 PasswordManagerPasswordFor={0}\u7684\u53e3\u4ee4
90.7 -SftpConnectionReceivedMessageIsTooLong.error.text=\u60a8\u4f3c\u4e4e\u9047\u5230\u4e86\u4e0e\u67d0\u4e9b ssh \u670d\u52a1\u5668\u76f8\u5173\u7684\u5df2\u77e5\u95ee\u9898\u3002\u8fdc\u7a0b\u4e3b\u673a\u4e0a\u7684\u67d0\u4e9b\u542f\u52a8\u811a\u672c (~/.bashrc \u7b49) \u53ef\u80fd\u4f1a\u5728\u767b\u5f55\u65f6\u8f93\u51fa\u4e00\u4e9b\u6587\u672c\u3002\u5982\u679c\u51fa\u73b0\u8fd9\u79cd\u60c5\u51b5, \u8bf7\u6309\u4ee5\u4e0b\u65b9\u5f0f\u5c01\u88c5\u751f\u6210\u8f93\u51fa\u7684\u4ee3\u7801:\n\n if [ ${TERM} != "dumb" ]; then\n ...\n fi\n\n\u7136\u540e\u91cd\u8bd5\u3002
90.8
91.1 --- a/src/zh_CN/ide/dlight-nativeexecution/dlight-nativeexecution/org/netbeans/modules/nativeexecution/support/Bundle_zh_CN.properties Wed Feb 26 18:44:50 2014 -0800
91.2 +++ b/src/zh_CN/ide/dlight-nativeexecution/dlight-nativeexecution/org/netbeans/modules/nativeexecution/support/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
91.3 @@ -39,7 +39,10 @@
91.4 # Portions Copyrighted 2009 Sun Microsystems, Inc.
91.5
91.6 TITLE_YN_Warning=\u8b66\u544a
91.7 -TITLE_KeyboardInteractive={0}: {1}
91.8 +
91.9
91.10 USER_AUTH_CANCELED=\u7528\u6237\u5df2\u53d6\u6d88 SSH \u9a8c\u8bc1
91.11 +JSCHReceivedMessageIsTooLong.error.title=\u8fde\u63a5\u5230\u4e3b\u673a{0}\u65f6\u51fa\u9519
91.12 +JSCHReceivedMessageIsTooLong.error.shorttext=\u60a8\u4f3c\u4e4e\u9047\u5230\u4e86\u4e0e\u67d0\u4e9b ssh \u670d\u52a1\u5668\u76f8\u5173\u7684\u5df2\u77e5\u95ee\u9898...
91.13 +JSCHReceivedMessageIsTooLong.error.text=\u60a8\u4f3c\u4e4e\u9047\u5230\u4e86\u4e0e\u67d0\u4e9b ssh \u670d\u52a1\u5668\u76f8\u5173\u7684\u5df2\u77e5\u95ee\u9898\u3002\u8fdc\u7a0b\u4e3b\u673a\u4e0a\u7684\u67d0\u4e9b\u542f\u52a8\u811a\u672c (~/.bashrc \u7b49) \u53ef\u80fd\u4f1a\u5728\u767b\u5f55\u65f6\u8f93\u51fa\u4e00\u4e9b\u6587\u672c\u3002\u5982\u679c\u51fa\u73b0\u8fd9\u79cd\u60c5\u51b5, \u8bf7\u6309\u4ee5\u4e0b\u65b9\u5f0f\u5c01\u88c5\u751f\u6210\u8f93\u51fa\u7684\u4ee3\u7801:\n\n if [ ${TERM} != "dumb" ]; then\n ...\n fi\n\n\u7136\u540e\u91cd\u8bd5\u3002
91.14
92.1 --- a/src/zh_CN/ide/dlight-nativeexecution/dlight-nativeexecution/org/netbeans/modules/nativeexecution/support/ui/Bundle_zh_CN.properties Wed Feb 26 18:44:50 2014 -0800
92.2 +++ b/src/zh_CN/ide/dlight-nativeexecution/dlight-nativeexecution/org/netbeans/modules/nativeexecution/support/ui/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
92.3 @@ -71,7 +71,7 @@
92.4 CertPassphraseDlg.jLabel0.text=\u7528\u6237:
92.5 CertPassphraseDlg.jLabel1.text=\u4e3b\u673a:
92.6 CertPassphraseDlg.title.text=\u9a8c\u8bc1
92.7 -CertPassphraseDlg.promptLabel.text={0}:
92.8 +
92.9 PasswordPanel.jLabel2.text=\u53e3\u4ee4(&P):
92.10 PasswordPanel.cbRememberPwd.text=\u8bb0\u4f4f\u53e3\u4ee4(&R)
92.11 SSHKeysPanel.jLabel1.text=SSH \u8eab\u4efd\u9a8c\u8bc1\u6587\u4ef6(&I):
93.1 --- a/src/zh_CN/ide/editor-fold-nbui/editor-fold-nbui/org/netbeans/modules/editor/fold/ui/Bundle_zh_CN.properties Wed Feb 26 18:44:50 2014 -0800
93.2 +++ b/src/zh_CN/ide/editor-fold-nbui/editor-fold-nbui/org/netbeans/modules/editor/fold/ui/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
93.3 @@ -65,9 +65,9 @@
93.4 TITLE_ElementsToCollapse=\u9ed8\u8ba4\u60c5\u51b5\u4e0b\u6298\u53e0
93.5 DefaultFoldingOptions.useDefaults.text=\u8986\u76d6\u9ed8\u8ba4\u8bbe\u7f6e
93.6 Title_FoldDisplayOptions=\u663e\u793a\u9009\u9879
93.7 -FMT_ContentPlaceholder_1={0}...
93.8 -FMT_ContentPlaceholder_2=...{1}
93.9 -FMT_ContentPlaceholder_3={0} ...{1}
93.10 +
93.11 +
93.12 +
93.13 DefaultFoldingOptions.collapseContainer.border.title=\u9ed8\u8ba4\u60c5\u51b5\u4e0b\u6298\u53e0
93.14 FoldOptionsPanel.useDefaults.text=\u4f7f\u7528\u9ed8\u8ba4\u8bbe\u7f6e
93.15 FoldOptionsPanel.foldedSummary.text=\u663e\u793a\u6982\u8981
94.1 --- a/src/zh_CN/ide/editor-fold/editor-fold/org/netbeans/api/editor/fold/Bundle_zh_CN.properties Wed Feb 26 18:44:50 2014 -0800
94.2 +++ b/src/zh_CN/ide/editor-fold/editor-fold/org/netbeans/api/editor/fold/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
94.3 @@ -1,8 +1,8 @@
94.4 -FT_DefaultBlockTemplate={...}
94.5
94.6 -FT_display_code-block={...}
94.7
94.8 -FT_display_tag=<.../>
94.9 +
94.10 +
94.11 +
94.12 FT_Label_code-block=\u4ee3\u7801\u5757
94.13 FT_Label_comment=\u6ce8\u91ca
94.14 FT_Label_import=\u5bfc\u5165\u548c\u5305\u62ec
95.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
95.2 +++ b/src/zh_CN/ide/editor/editor/org/netbeans/modules/editor/impl/actions/clipboardhistory/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
95.3 @@ -0,0 +1,45 @@
95.4 +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
95.5 +#
95.6 +# Copyright 1997-2010 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 +# Contributor(s):
95.30 +#
95.31 +# The Original Software is NetBeans. The Initial Developer of the Original
95.32 +# Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
95.33 +# Microsystems, Inc. All Rights Reserved.
95.34 +#
95.35 +# If you wish your version of this file to be governed by only the CDDL
95.36 +# or only the GPL Version 2, indicate your decision by adding
95.37 +# "[Contributor] elects to include this software in this distribution
95.38 +# under the [CDDL or GPL Version 2] license." If you do not indicate a
95.39 +# single choice of license, a recipient has the option to distribute
95.40 +# your version of this file under either the CDDL, the GPL Version 2 or
95.41 +# to extend the choice of license to its licensees as provided above.
95.42 +# However, if you add GPL Version 2 code and therefore, elected the GPL
95.43 +# Version 2 license, then the option applies only if the new code is
95.44 +# made subject to such option by the copyright holder.
95.45 +
95.46 +clipboard-history-oom=\u4ece\u526a\u8d34\u677f\u5386\u53f2\u8bb0\u5f55\u5f15\u53d1\u4e86 "\u5185\u5b58\u4e0d\u8db3" \u5f02\u5e38\u9519\u8bef
95.47 +clipboard-history-oom-details=\u60a8\u5c06\u5927\u5185\u5bb9\u590d\u5236\u5230\u526a\u8d34\u677f\u3002Netbeans \u65e0\u6cd5\u5c06\u6b64\u6570\u636e\u4fdd\u5b58\u5230\u526a\u8d34\u677f\u5386\u53f2\u8bb0\u5f55\u3002Netbeans \u53ef\u80fd\u4e0d\u7a33\u5b9a, \u5efa\u8bae\u91cd\u65b0\u542f\u52a8 Netbeans\u3002
95.48 +
96.1 --- a/src/zh_CN/ide/extexecution/extexecution/org/netbeans/modules/extexecution/Bundle_zh_CN.properties Wed Feb 26 18:44:50 2014 -0800
96.2 +++ b/src/zh_CN/ide/extexecution/extexecution/org/netbeans/modules/extexecution/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
96.3 @@ -43,6 +43,6 @@
96.4 Stop=\u505c\u6b62
96.5 Rerun=\u91cd\u65b0\u8fd0\u884c
96.6 Options=\u9009\u9879
96.7 -Uniquified={0} #{1}
96.8
96.9
96.10 +
97.1 --- a/src/zh_CN/ide/git/git/org/netbeans/modules/git/Bundle_zh_CN.properties Wed Feb 26 18:44:50 2014 -0800
97.2 +++ b/src/zh_CN/ide/git/git/org/netbeans/modules/git/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
97.3 @@ -72,6 +72,7 @@
97.4 CTL_FileInfoStatus_Modified=\u5728\u5de5\u4f5c\u6811\u4e2d\u4fee\u6539
97.5 CTL_FileInfoStatus_Removed=\u5728\u5de5\u4f5c\u6811\u4e2d\u5220\u9664
97.6 CTL_FileInfoStatus_Conflict=\u51b2\u7a81
97.7 +CTL_FileInfoStatus_TextAnnotation=\u5176\u4ed6\u6587\u672c\u6807\u6ce8
97.8
97.9 CTL_FileInfoStatus_Excluded_Short=\u5df2\u5ffd\u7565
97.10 CTL_FileInfoStatus_Added_Short=\u5df2\u6dfb\u52a0
98.1 --- a/src/zh_CN/ide/git/git/org/netbeans/modules/git/client/Bundle_zh_CN.properties Wed Feb 26 18:44:50 2014 -0800
98.2 +++ b/src/zh_CN/ide/git/git/org/netbeans/modules/git/client/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
98.3 @@ -39,7 +39,7 @@
98.4 # Portions Copyrighted 2010 Sun Microsystems, Inc.
98.5
98.6 LBL_Queued = {0} - \u5df2\u6392\u961f
98.7 -LBL_Progress = {0} - {1}
98.8 +
98.9 LBL_RepositoryBlocked = \u5df2\u5728{0}\u4e0a\u6392\u961f
98.10 MSG_Progress_Finished= \u5b8c\u6210\u3002
98.11 MSG_Progress_Canceled= \u53d6\u6d88\u3002
99.1 --- a/src/zh_CN/ide/git/git/org/netbeans/modules/git/ui/checkout/Bundle_zh_CN.properties Wed Feb 26 18:44:50 2014 -0800
99.2 +++ b/src/zh_CN/ide/git/git/org/netbeans/modules/git/ui/checkout/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
99.3 @@ -52,6 +52,7 @@
99.4 CTL_RevertChanges.title.file=\u6587\u4ef6{0}
99.5 CTL_RevertChanges.title.dir=\u76ee\u5f55{0}
99.6 CTL_RevertChanges.title.files={0} \u4e2a\u6587\u4ef6
99.7 +MSG_GitAction.savingFiles.progress=\u6b63\u5728\u51c6\u5907 Git \u64cd\u4f5c
99.8 RevertChangesPanel.revertWTRadioButton.text=\u5c06\u5de5\u4f5c\u6811\u4e2d\u7684\u672a\u63d0\u4ea4\u66f4\u6539\u8fd8\u539f\u4e3a\u7d22\u5f15\u4e2d\u7684\u72b6\u6001(&K)
99.9 RevertChangesPanel.revertAllRadioButton.text=\u8fd8\u539f\u5de5\u4f5c\u6811\u548c\u7d22\u5f15\u4e2d\u7684\u672a\u63d0\u4ea4\u66f4\u6539(&W)
99.10 # translation hint - HEAD is a git specific term for last revisition in repository, do not translate this word
100.1 --- a/src/zh_CN/ide/git/git/org/netbeans/modules/git/ui/commit/Bundle_zh_CN.properties Wed Feb 26 18:44:50 2014 -0800
100.2 +++ b/src/zh_CN/ide/git/git/org/netbeans/modules/git/ui/commit/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
100.3 @@ -56,7 +56,7 @@
100.4
100.5 MSG_COMMIT_DONE=\u4fe1\u606f: \u63d0\u4ea4\u7ed3\u675f
100.6 MSG_COMMIT_TITLE=Git \u63d0\u4ea4
100.7 -MSG_COMMIT_TITLE_SEP=----------
100.8 +
100.9 MSG_COMMIT_INIT_SEP_ONE=\u5c06 {0} \u4e2a\u6587\u4ef6\u63d0\u4ea4\u5230\u8d44\u6e90\u5e93:
100.10 MSG_COMMIT_INIT_SEP=\u5c06 {0} \u4e2a\u6587\u4ef6\u63d0\u4ea4\u5230\u8d44\u6e90\u5e93:
100.11
101.1 --- a/src/zh_CN/ide/git/git/org/netbeans/modules/git/ui/diff/Bundle_zh_CN.properties Wed Feb 26 18:44:50 2014 -0800
101.2 +++ b/src/zh_CN/ide/git/git/org/netbeans/modules/git/ui/diff/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
101.3 @@ -74,7 +74,7 @@
101.4 # {0} - revision
101.5 MSG_No_Changes_RevisionWorking=<{0}\u548c\u5de5\u4f5c\u6811\u4e4b\u95f4\u6ca1\u6709\u4efb\u4f55\u66f4\u6539>
101.6 MSG_Revision_Select=\u9009\u62e9...
101.7 -MSG_Revision_Select_Separator=----------------------
101.8 +
101.9 MSG_Revision_Select_Tooltip=\u4ece\u9009\u53d6\u5668\u4e2d\u9009\u62e9\u4e00\u4e2a\u4fee\u8ba2\u7248\u672c
101.10 #MultiDiffPanel
101.11 MultiDiffPanel.btnCommit.toolTipText=\u63d0\u4ea4\u66f4\u6539
102.1 --- a/src/zh_CN/ide/git/git/org/netbeans/modules/git/ui/repository/Bundle_zh_CN.properties Wed Feb 26 18:44:50 2014 -0800
102.2 +++ b/src/zh_CN/ide/git/git/org/netbeans/modules/git/ui/repository/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
102.3 @@ -40,6 +40,8 @@
102.4
102.5 #GitRepositoryTopComponent
102.6 CTL_Repository_TopComponent_Title=Git \u8d44\u6e90\u5e93\u6d4f\u89c8\u5668
102.7 +# {0} - branch name
102.8 +LBL_DiffToTrackedBranchAction_PopupName=\u4e0e "{0}" \u6bd4\u8f83
102.9 LBL_RepositoryBrowserAction_Name=\u8d44\u6e90\u5e93\u6d4f\u89c8\u5668(&Y)
102.10 LBL_RepositoryBrowserAction_PopupName=\u8d44\u6e90\u5e93\u6d4f\u89c8\u5668
102.11 #RepositoryPanel
102.12 @@ -86,11 +88,11 @@
102.13 RevisionListPanel.jLabel1.text=\u663e\u793a\u4e0b\u4e00\u4e2a:
102.14 #RevisionList
102.15 LBL_RevisionList.LoadingRevisions=\u6b63\u5728\u52a0\u8f7d\u4fee\u8ba2\u7248\u672c...
102.16 -RevisionListPanel.btnNext10.text=&10
102.17 +
102.18 RevisionListPanel.btnAll.text=\u5168\u90e8(&A)
102.19 RevisionListPanel.btnNext10.TTtext=\u663e\u793a\u4e0b 10 \u4e2a\u4fee\u8ba2\u7248\u672c
102.20 RevisionListPanel.btnAll.TTtext=\u663e\u793a\u6240\u6709\u4fee\u8ba2\u7248\u672c
102.21 -RevisionListPanel.jLabel2.text=|
102.22 +
102.23 RevisionListPanel.btnRefresh.toolTipText=\u5237\u65b0\u663e\u793a\u7684\u4fee\u8ba2\u7248\u672c
102.24 RevisionListPanel.btnRefresh.text=\u5237\u65b0(&R)
102.25 RevisionDialog.lblRevision.text=\u4fee\u8ba2(&V):
103.1 --- a/src/zh_CN/ide/git/git/org/netbeans/modules/git/ui/repository/remote/Bundle_zh_CN.properties Wed Feb 26 18:44:50 2014 -0800
103.2 +++ b/src/zh_CN/ide/git/git/org/netbeans/modules/git/ui/repository/remote/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
103.3 @@ -53,7 +53,7 @@
103.4 SelectUriPanel.rbCreateNew.toolTipText=\u5176\u4ed6\u8fdc\u7a0b\u8d44\u6e90\u5e93\u7684\u8bbe\u7f6e URI
103.5 SelectUriPanel.rbCreateNew.text=\u6307\u5b9a Git \u8d44\u6e90\u5e93\u4f4d\u7f6e(&S):
103.6 SelectUriPanel.cmbConfiguredRepositories.TTtext=\u9009\u62e9\u8fdc\u7a0b URI
103.7 -SelectUriPanel.configuredRepository.uri={0}:{1}
103.8 +
103.9 MSG_SelectUriStep.errorEmptySelection=\u9009\u62e9\u914d\u7f6e\u7684\u8fdc\u7a0b\u8d44\u6e90\u5e93\u4f4d\u7f6e
103.10 MSG_SelectUriStep.errorEmptyRemoteName=\u8f93\u5165\u6709\u6548\u7684\u8fdc\u7a0b\u540d\u79f0
103.11 LBL_SelectUriStep.progressName=\u6b63\u5728\u8fde\u63a5\u5230\u8d44\u6e90\u5e93
104.1 --- a/src/zh_CN/ide/gsf-testrunner/gsf-testrunner/org/netbeans/modules/gsf/testrunner/api/Bundle_zh_CN.properties Wed Feb 26 18:44:50 2014 -0800
104.2 +++ b/src/zh_CN/ide/gsf-testrunner/gsf-testrunner/org/netbeans/modules/gsf/testrunner/api/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
104.3 @@ -27,29 +27,29 @@
104.4 MSG_SomePassedNotDisplayed=\u672a\u663e\u793a\u67d0\u4e9b\u901a\u8fc7\u7684\u6d4b\u8bd5\u7684\u76f8\u5173\u4fe1\u606f\u3002
104.5 # {0} - info about tests in one state
104.6 # {1} - info about tests in another state
104.7 -MSG_TestResultSummary1={0}, {1}.
104.8 +
104.9 # {0} - info about tests in one state
104.10 # {1} - info about tests in another state
104.11 # {2} - info about tests in yet another state
104.12 -MSG_TestResultSummary2={0}, {1}, {2}.
104.13 +
104.14 # {0} - info about passed tests
104.15 # {1} - info about pending tests
104.16 # {2} - info about failed tests
104.17 # {3} - info about erroneous tests
104.18 -MSG_TestResultSummary3={0}, {1}, {2}, {3}.
104.19 +
104.20 # {0} - info about passed tests
104.21 # {1} - info about pending tests
104.22 # {2} - info about failed tests
104.23 # {3} - info about erroneous tests
104.24 # {4} - info about skipped tests
104.25 -MSG_TestResultSummary4={0}, {1}, {2}, {3}, {4}.
104.26 +
104.27 # {0} - info about passed tests
104.28 # {1} - info about pending tests
104.29 # {2} - info about failed tests
104.30 # {3} - info about erroneous tests
104.31 # {4} - info about skipped tests
104.32 # {5} - info about aborted tests
104.33 -MSG_TestResultSummary5={0}, {1}, {2}, {3}, {4}, {5}.
104.34 +
104.35 # e.g.: 'All 58 tests passed.'
104.36 # {0} - number of tests
104.37 MSG_TestsInfoAllOK={0,choice,1#\u6d4b\u8bd5|2#\u4e24\u4e2a\u6d4b\u8bd5|2<\u6240\u6709 {0,number,integer} \u4e2a\u6d4b\u8bd5}\u901a\u8fc7\u3002
104.38 @@ -172,7 +172,7 @@
104.39
104.40 # displayed in tooltip of a test case / suite when there is no output for it
104.41 MSG_NoOutput=\u65e0\u8f93\u51fa\u3002
104.42 -MSG_MoreOutput={0} \u884c\u672a\u663e\u793a\u3002
104.43 +MSG_MoreOutput=\u67d0\u4e9b\u884c\u672a\u663e\u793a\u3002
104.44 MSG_CharsOmitted=... (\u5ffd\u7565\u4e86 {0} \u4e2a\u5b57\u7b26)
104.45
104.46 LBL_CloseWindow=\u5173\u95ed\u6807\u7b7e
105.1 --- a/src/zh_CN/ide/html-editor/html-editor/org/netbeans/modules/html/editor/resources/Bundle_zh_CN.properties Wed Feb 26 18:44:50 2014 -0800
105.2 +++ b/src/zh_CN/ide/html-editor/html-editor/org/netbeans/modules/html/editor/resources/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
105.3 @@ -62,6 +62,7 @@
105.4 javascript-embedded=\u5d4c\u5165 HTML \u4e2d\u7684 Javascript
105.5 el-delimiter=\u8868\u8fbe\u5f0f\u5206\u9694\u7b26
105.6 el-content=\u8868\u8fbe\u5f0f\u5185\u5bb9
105.7 +xml-pi=XML \u5904\u7406\u6307\u4ee4
105.8
105.9 #xhtml
105.10 mod-method=\u975e HTML \u6807\u8bb0
105.11 @@ -79,7 +80,7 @@
105.12
105.13 LBL_Expand_HTML_Tag=\u5c55\u5f00 HTML \u6807\u8bb0
105.14 LBL_Collapse_HTML_Tag=\u6298\u53e0 HTML \u6807\u8bb0
105.15 -LBL_HTML_Comment=<!-- -->
105.16 +
105.17 LBL_Expand_HTML_Comment=\u5c55\u5f00 HTML \u6ce8\u91ca
105.18 LBL_Collapse_HTML_Comment=\u6298\u53e0 HTML \u6ce8\u91ca
105.19
106.1 --- a/src/zh_CN/ide/javascript2-editor/javascript2-editor/org/netbeans/modules/javascript2/editor/options/ui/Bundle_zh_CN.properties Wed Feb 26 18:44:50 2014 -0800
106.2 +++ b/src/zh_CN/ide/javascript2-editor/javascript2-editor/org/netbeans/modules/javascript2/editor/options/ui/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
106.3 @@ -51,4 +51,5 @@
106.4 CodeCompletionPanel.autoCompletionFullRadioButton.text=\u6240\u6709\u53ef\u80fd\u60c5\u51b5(&A)
106.5 CodeCompletionPanel.enableAutocompletionLabel.text=\u4e3a\u4ee5\u4e0b\u9879\u542f\u7528\u81ea\u52a8\u5f39\u51fa\u5b8c\u6210\u7a97\u53e3(&E):
106.6 CodeCompletionPanel.autoCompletionAfterDotCheckBox.text=\u5728 "." \u4e4b\u540e(&A)
106.7 +CodeCompletionPanel.codeCompletionSignatureWidthLabel.text=\u4ee3\u7801\u5b8c\u6210\u9879\u7b7e\u540d\u5b57\u7b26\u5bbd\u5ea6(&W):
106.8
107.1 --- a/src/zh_CN/ide/localtasks/localtasks/org/netbeans/modules/localtasks/task/Bundle_zh_CN.properties Wed Feb 26 18:44:50 2014 -0800
107.2 +++ b/src/zh_CN/ide/localtasks/localtasks/org/netbeans/modules/localtasks/task/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
107.3 @@ -51,7 +51,7 @@
107.4 LBL_LocalTask.copyAttToCentralStorage.title=\u590d\u5236\u9644\u4ef6
107.5 # {0} - task id
107.6 # {1} - task summary
107.7 -LBL_LocalTask.displayName=#{0} - {1}
107.8 +
107.9 LBL_SelectSubtask_title=\u9009\u62e9\u4efb\u52a1
107.10 LBL_Task.tooltip.status.completed=\u5df2\u5b8c\u6210
107.11 LBL_Task.tooltip.status.open=\u6253\u5f00
108.1 --- a/src/zh_CN/ide/mercurial/mercurial/org/netbeans/modules/mercurial/Bundle_zh_CN.properties Wed Feb 26 18:44:50 2014 -0800
108.2 +++ b/src/zh_CN/ide/mercurial/mercurial/org/netbeans/modules/mercurial/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
108.3 @@ -50,7 +50,7 @@
108.4 CTL_Mercurial_DisplayName = Mercurial
108.5
108.6 ## Annotator.java
108.7 -MercurialAnnotator.defaultFormat = [{0}]
108.8 +
108.9
108.10 CTL_FileInfoStatus_Unknown = \u672a\u77e5
108.11 CTL_FileInfoStatus_Excluded = \u5df2\u5ffd\u7565
108.12 @@ -67,6 +67,7 @@
108.13 CTL_FileInfoStatus_ModifiedInRepository = \u5df2\u5728\u8d44\u6e90\u5e93\u4e2d\u4fee\u6539
108.14 CTL_FileInfoStatus_NewInRepository = \u5df2\u5728\u8d44\u6e90\u5e93\u4e2d\u65b0\u5efa
108.15 CTL_FileInfoStatus_Merge = \u5408\u5e76
108.16 +CTL_FileInfoStatus_TextAnnotation=\u5176\u4ed6\u6587\u672c\u6807\u6ce8
108.17
108.18 CTL_FileInfoStatus_Excluded_Short = \u5df2\u5ffd\u7565
108.19 CTL_FileInfoStatus_NewLocally_Short = \u65b0\u5efa
108.20 @@ -77,8 +78,6 @@
108.21 CTL_FileInfoStatus_DeletedLocally_Short = \u5df2\u5220\u9664
108.22 CTL_FileInfoStatus_Conflict_Short = \u51b2\u7a81
108.23
108.24 -textAnnotation = <font color="#999999">{0}</font>
108.25 -
108.26 CTL_PopupMenuItem_Status=\u663e\u793a\u66f4\u6539
108.27 CTL_PopupMenuItem_Diff=\u4e0e Base \u8fdb\u884c\u6bd4\u8f83
108.28 CTL_PopupMenuItem_Update=\u66f4\u65b0...
109.1 --- a/src/zh_CN/ide/mercurial/mercurial/org/netbeans/modules/mercurial/ui/add/Bundle_zh_CN.properties Wed Feb 26 18:44:50 2014 -0800
109.2 +++ b/src/zh_CN/ide/mercurial/mercurial/org/netbeans/modules/mercurial/ui/add/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
109.3 @@ -46,7 +46,7 @@
109.4 MSG_Add_Progress_Init=\u6b63\u5728\u51c6\u5907\u6dfb\u52a0...
109.5
109.6 MSG_ADD_TITLE=Mercurial \u6dfb\u52a0
109.7 -MSG_ADD_TITLE_SEP=----------------
109.8 +
109.9 MSG_ADD_FILES=\u5728 Mercurial \u63a7\u5236\u4e0b\u6dfb\u52a0\u7684\u6587\u4ef6:
109.10 # Capitalized letters used intentionally to emphasize the words in an output window, should be translated
109.11 MSG_ADD_DONE=\u4fe1\u606f: \u6dfb\u52a0\u7ed3\u675f
110.1 --- a/src/zh_CN/ide/mercurial/mercurial/org/netbeans/modules/mercurial/ui/annotate/Bundle_zh_CN.properties Wed Feb 26 18:44:50 2014 -0800
110.2 +++ b/src/zh_CN/ide/mercurial/mercurial/org/netbeans/modules/mercurial/ui/annotate/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
110.3 @@ -57,7 +57,7 @@
110.4 MSG_Annotation_Progress=\u6b63\u5728\u6807\u6ce8...
110.5
110.6 MSG_ANNOTATE_TITLE=Mercurial \u6807\u6ce8
110.7 -MSG_ANNOTATE_TITLE_SEP=------------------
110.8 +
110.9 # Capitalized letters used intentionally to emphasize the words in an output window, should be translated
110.10 MSG_ANNOTATE_DONE=\u4fe1\u606f: \u6807\u6ce8\u7ed3\u675f
110.11
111.1 --- a/src/zh_CN/ide/mercurial/mercurial/org/netbeans/modules/mercurial/ui/branch/Bundle_zh_CN.properties Wed Feb 26 18:44:50 2014 -0800
111.2 +++ b/src/zh_CN/ide/mercurial/mercurial/org/netbeans/modules/mercurial/ui/branch/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
111.3 @@ -53,7 +53,7 @@
111.4 MSG_SwitchBranch_Progress=\u6b63\u5728\u5207\u6362\u5230{0}...
111.5
111.6 MSG_SWITCH_TITLE=Mercurial \u5207\u6362\u5206\u652f
111.7 -MSG_SWITCH_TITLE_SEP=----------------
111.8 +
111.9 MSG_SWITCH_INFO_SEP=\u5207\u6362\u5230\u4ee5\u4e0b\u4f4d\u7f6e\u4e2d\u7684\u5206\u652f{0}:\n{1}
111.10 # Capitalized letters used intentionally to emphasize the words in an output window, should be translated
111.11 MSG_SWITCH_DONE=\u4fe1\u606f: \u5207\u6362\u7ed3\u675f
111.12 @@ -87,7 +87,7 @@
111.13 BranchSelectorPanel.infoLabel.text=\u4ece\u5206\u652f\u5217\u8868\u4e2d\u9009\u62e9\u5206\u652f
111.14
111.15 MSG_CREATE_TITLE=Mercurial \u521b\u5efa\u5206\u652f
111.16 -MSG_CREATE_TITLE_SEP=----------------
111.17 +
111.18 MSG_CREATE_INFO_SEP=\u5728\u4ee5\u4e0b\u4f4d\u7f6e\u521b\u5efa\u5206\u652f{0}:\n{1}
111.19 # Capitalized letters used intentionally to emphasize the words in an output window, should be translated
111.20 MSG_CREATE_DONE=\u4fe1\u606f: \u521b\u5efa\u7ed3\u675f
112.1 --- a/src/zh_CN/ide/mercurial/mercurial/org/netbeans/modules/mercurial/ui/clone/Bundle_zh_CN.properties Wed Feb 26 18:44:50 2014 -0800
112.2 +++ b/src/zh_CN/ide/mercurial/mercurial/org/netbeans/modules/mercurial/ui/clone/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
112.3 @@ -45,7 +45,7 @@
112.4 CTL_MenuItem_CloneLocal=\u514b\u9686 - {0}(&C)
112.5 CTL_MenuItem_CloneRepository=\u514b\u9686 - \u9009\u5b9a\u7684\u8d44\u6e90\u5e93(&C)...
112.6 MSG_CLONE_TITLE=Mercurial \u514b\u9686
112.7 -MSG_CLONE_TITLE_SEP=---------------
112.8 +
112.9 # Capitalized letters used intentionally to emphasize the words in an output window, should be translated
112.10 MSG_CLONE_FROM=\u4fe1\u606f: \u514b\u9686\u81ea: {0} - {1}
112.11 # Capitalized letters used intentionally to emphasize the words in an output window, should be translated
113.1 --- a/src/zh_CN/ide/mercurial/mercurial/org/netbeans/modules/mercurial/ui/commit/Bundle_zh_CN.properties Wed Feb 26 18:44:50 2014 -0800
113.2 +++ b/src/zh_CN/ide/mercurial/mercurial/org/netbeans/modules/mercurial/ui/commit/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
113.3 @@ -46,7 +46,7 @@
113.4 CTL_MenuItem_ExcludeFromCommit=\u4ece\u63d0\u4ea4\u4e2d\u6392\u9664(&C)
113.5 CTL_MenuItem_IncludeInCommit=\u5305\u542b\u5728\u63d0\u4ea4\u4e2d(&C)
113.6 MSG_COMMIT_TITLE=Mercurial \u63d0\u4ea4
113.7 -MSG_COMMIT_TITLE_SEP=----------------
113.8 +
113.9 MSG_COMMIT_INIT_SEP_ONE=\u5c06 {0} \u4e2a\u6587\u4ef6\u63d0\u4ea4\u5230\u8d44\u6e90\u5e93:
113.10 MSG_COMMIT_INIT_SEP=\u5c06 {0} \u4e2a\u6587\u4ef6\u63d0\u4ea4\u5230\u8d44\u6e90\u5e93:
113.11 # Capitalized letters used intentionally to emphasize the words in an output window, should be translated
114.1 --- a/src/zh_CN/ide/mercurial/mercurial/org/netbeans/modules/mercurial/ui/create/Bundle_zh_CN.properties Wed Feb 26 18:44:50 2014 -0800
114.2 +++ b/src/zh_CN/ide/mercurial/mercurial/org/netbeans/modules/mercurial/ui/create/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
114.3 @@ -51,7 +51,7 @@
114.4 MSG_Create_Add_Progress=\u6b63\u5728\u6dfb\u52a0...
114.5
114.6 MSG_CREATE_TITLE=Mercurial \u521d\u59cb\u5316
114.7 -MSG_CREATE_TITLE_SEP=--------------------
114.8 +
114.9 MSG_CREATE_INIT=\u521d\u59cb\u5316\u8d44\u6e90\u5e93\n\u6b63\u5728\u521b\u5efa Mercurial {0}/.hg \u76ee\u5f55
114.10 MSG_CREATE_ADD=\u4e0b\u6b21\u63d0\u4ea4\u65f6\u4f1a\u5c06 {0} \u4e2a\u6587\u4ef6\u6dfb\u52a0\u5230\u8d44\u6e90\u5e93\u4e2d:
114.11 # Capitalized letters used intentionally to emphasize the words in an output window, should be translated
115.1 --- a/src/zh_CN/ide/mercurial/mercurial/org/netbeans/modules/mercurial/ui/diff/Bundle_zh_CN.properties Wed Feb 26 18:44:50 2014 -0800
115.2 +++ b/src/zh_CN/ide/mercurial/mercurial/org/netbeans/modules/mercurial/ui/diff/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
115.3 @@ -70,7 +70,7 @@
115.4 CTL_CommitDiff_Tooltip=\u5168\u90e8\u63d0\u4ea4
115.5
115.6 MSG_Revision_Select=\u9009\u62e9...
115.7 -MSG_Revision_Select_Separator=----------------------
115.8 +
115.9 MSG_Revision_Select_Tooltip=\u4ece\u9009\u53d6\u5668\u4e2d\u9009\u62e9\u4e00\u4e2a\u4fee\u8ba2\u7248\u672c
115.10 MSG_UpdateDiff_Tooltip=\u66f4\u65b0 "{0}"
115.11 MSG_CommitDiff_Tooltip=\u63d0\u4ea4 "{0}"
115.12 @@ -123,16 +123,16 @@
115.13 ExportDiffPanel.browseButtonl.text=\u6d4f\u89c8(&B)...
115.14
115.15 MSG_EXPORT_TITLE=Mercurial \u5bfc\u51fa\u5dee\u5f02
115.16 -MSG_EXPORT_TITLE_SEP=---------------------
115.17 +
115.18 MSG_EXPORT_FILE_TITLE=Mercurial \u5bfc\u51fa\u6587\u4ef6\u5dee\u5f02
115.19 -MSG_EXPORT_FILE_TITLE_SEP=--------------------------
115.20 +
115.21 # Capitalized letters used intentionally to emphasize the words in an output window, should be translated
115.22 MSG_EXPORT_FILE_DONE=\u4fe1\u606f: \u5bfc\u51fa\u6587\u4ef6\u5dee\u5f02\u7ed3\u675f
115.23 # Capitalized letters used intentionally to emphasize the words in an output window, should be translated
115.24 MSG_EXPORT_DONE=\u4fe1\u606f: \u5bfc\u51fa\u5dee\u5f02\u7ed3\u675f
115.25
115.26 MSG_EXPORT_BUNDLE_TITLE=Mercurial \u5bfc\u51fa\u66f4\u6539\u96c6\u5305
115.27 -MSG_EXPORT_BUNDLE_TITLE_SEP=---------------------
115.28 +
115.29 # Capitalized letters used intentionally to emphasize the words in an output window, should be translated
115.30 MSG_EXPORT_BUNDLE_DONE=\u4fe1\u606f: \u5bfc\u51fa\u66f4\u6539\u96c6\u5305\u7ed3\u675f
115.31 MSG_EXPORT_BUNDLE_PROGRESS=\u6b63\u5728\u5c06\u4fee\u8ba2\u5bfc\u51fa\u5230{0} (\u57fa\u672c\u4fee\u8ba2\u7248\u672c\u4e3a {1} \u81f3 {2})
115.32 @@ -149,14 +149,14 @@
115.33 ACSD_ExportBundleDialog=\u5bfc\u51fa\u66f4\u6539\u96c6
115.34
115.35 MSG_IMPORT_TITLE=Mercurial \u5bfc\u5165
115.36 -MSG_IMPORT_TITLE_SEP=----------------
115.37 +
115.38 # Capitalized letters used intentionally to emphasize the words in an output window, should be translated
115.39 MSG_IMPORT_DONE=\u4fe1\u606f: \u5bfc\u5165\u7ed3\u675f
115.40 CTL_Import_BundleOption=\u4f5c\u4e3a\u66f4\u6539\u96c6\u5305\u5bfc\u5165(&B)
115.41 CTL_Import_PatchOption=\u4f5c\u4e3a\u8865\u4e01\u7a0b\u5e8f\u5bfc\u5165(&P)
115.42
115.43 MSG_UNBUNDLE_TITLE=Mercurial \u89e3\u5305
115.44 -MSG_UNBUNDLE_TITLE_SEP=--------------
115.45 +
115.46 MSG_UNBUNDLE_MERGE_CONFIRM_TITLE=\u786e\u8ba4\u89e3\u5305\u540e\u6267\u884c\u5408\u5e76
115.47 MSG_UNBUNDLE_MERGE_CONFIRM_QUERY=\u89e3\u5305\u5df2\u5b8c\u6210, \u9700\u8981\u6267\u884c\u5408\u5e76\u3002\n\u662f\u5426\u7acb\u5373\u5408\u5e76\u89e3\u5305\u7684\u66f4\u6539?
115.48 MSG_UNBUNDLE_MERGE_UNCOMMITTED_CONFIRM_QUERY=\u89e3\u5305\u5df2\u5b8c\u6210, \u4e14\u5b58\u5728\u672a\u63d0\u4ea4\u7684\u5408\u5e76\u5185\u5bb9\u3002\n\u9700\u8981\u6267\u884c\u5408\u5e76\u3002\n\u662f\u5426\u7acb\u5373\u5408\u5e76\u89e3\u5305\u7684\u66f4\u6539?
115.49 @@ -166,7 +166,7 @@
115.50 MSG_UNBUNDLE_DONE=\u4fe1\u606f: Mercurial \u89e3\u5305\u7ed3\u675f
115.51
115.52 MSG_DIFF_TITLE=Mercurial \u6bd4\u8f83
115.53 -MSG_DIFF_TITLE_SEP=--------------
115.54 +
115.55 # Capitalized letters used intentionally to emphasize the words in an output window, should be translated
115.56 MSG_DIFF_NOT_SUPPORTED_INVIEW_INFO=\u4fe1\u606f: \u6b64\u89c6\u56fe\u4e0d\u652f\u6301\u6bd4\u8f83\u64cd\u4f5c
115.57 MSG_DIFF_NOT_SUPPORTED_INVIEW=\u6b64\u89c6\u56fe\u4e0d\u652f\u6301\u6bd4\u8f83\u64cd\u4f5c\u3002
115.58 @@ -190,7 +190,7 @@
115.59 ExportDiffPanel.jLabel1.text=\u5bfc\u51fa\u9009\u5b9a\u4fee\u8ba2\u7248\u672c\u4e2d\u7684\u6240\u6709\u6587\u4ef6\u5dee\u5f02
115.60
115.61 MSG_EXPORT_CHANGES_TITLE=Mercurial \u5bfc\u51fa\u66f4\u6539
115.62 -MSG_EXPORT_CHANGES_TITLE_SEP=------------------------
115.63 +
115.64 # Capitalized letters used intentionally to emphasize the words in an output window, should be translated
115.65 MSG_EXPORT_CHANGES_DONE=\u4fe1\u606f: \u5bfc\u51fa\u66f4\u6539\u7ed3\u675f
115.66 MSG_EXPORT_CHANGES=\u5c06\u672a\u63d0\u4ea4\u7684\u66f4\u6539\u5bfc\u51fa\u5230\n{0}
116.1 --- a/src/zh_CN/ide/mercurial/mercurial/org/netbeans/modules/mercurial/ui/ignore/Bundle_zh_CN.properties Wed Feb 26 18:44:50 2014 -0800
116.2 +++ b/src/zh_CN/ide/mercurial/mercurial/org/netbeans/modules/mercurial/ui/ignore/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
116.3 @@ -45,12 +45,12 @@
116.4 LBL_Ignore_Progress=\u6b63\u5728\u5ffd\u7565...
116.5
116.6 MSG_IGNORE_TITLE=Mercurial \u5ffd\u7565
116.7 -MSG_IGNORE_TITLE_SEP=----------------
116.8 +
116.9 MSG_IGNORE_INIT_SEP=\u5ffd\u7565\u8d44\u6e90\u5e93{0}\u4e2d\u7684\u4ee5\u4e0b\u5185\u5bb9:
116.10 # Capitalized letters used intentionally to emphasize the words in an output window, should be translated
116.11 MSG_IGNORE_DONE=\u4fe1\u606f: \u5ffd\u7565\u7ed3\u675f
116.12 MSG_UNIGNORE_TITLE=Mercurial \u53d6\u6d88\u5ffd\u7565
116.13 -MSG_UNIGNORE_TITLE_SEP=------------------
116.14 +
116.15 MSG_UNIGNORE_INIT_SEP=\u53d6\u6d88\u5ffd\u7565\u8d44\u6e90\u5e93{0}\u4e2d\u7684\u4ee5\u4e0b\u5185\u5bb9:
116.16 # Capitalized letters used intentionally to emphasize the words in an output window, should be translated
116.17 MSG_UNIGNORE_DONE=\u4fe1\u606f: \u53d6\u6d88\u5ffd\u7565\u7ed3\u675f
117.1 --- a/src/zh_CN/ide/mercurial/mercurial/org/netbeans/modules/mercurial/ui/log/Bundle_zh_CN.properties Wed Feb 26 18:44:50 2014 -0800
117.2 +++ b/src/zh_CN/ide/mercurial/mercurial/org/netbeans/modules/mercurial/ui/log/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
117.3 @@ -67,7 +67,7 @@
117.4 MSG_Log_Title=Mercurial \u5386\u53f2\u8bb0\u5f55
117.5 MSG_LogIncoming_Title=Mercurial \u4f20\u5165
117.6 MSG_LogOut_Title=Mercurial \u4f20\u51fa
117.7 -MSG_Log_Title_Sep=------------------
117.8 +
117.9 MSG_LOG_CONTEXT_SEP=\u5728\u9009\u5b9a\u7684\u4e0a\u4e0b\u6587\u4e2d\u6267\u884c\u641c\u7d22:\n
117.10 MSG_LOG_ROOT_CONTEXT_SEP=\u5728\u8d44\u6e90\u5e93\u4e2d\u6267\u884c\u641c\u7d22:\n
117.11 MSG_LOG_EXEC_CONTEXT_SEP=\u5bf9\u4ee5\u4e0b\u5185\u5bb9\u6267\u884c\u641c\u7d22:\n
118.1 --- a/src/zh_CN/ide/mercurial/mercurial/org/netbeans/modules/mercurial/ui/merge/Bundle_zh_CN.properties Wed Feb 26 18:44:50 2014 -0800
118.2 +++ b/src/zh_CN/ide/mercurial/mercurial/org/netbeans/modules/mercurial/ui/merge/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
118.3 @@ -44,7 +44,7 @@
118.4 ##MergeAction.java
118.5 MSG_MERGE_PROGRESS=\u6b63\u5728\u5408\u5e76...
118.6 MSG_MERGE_TITLE=Mercurial \u5408\u5e76
118.7 -MSG_MERGE_TITLE_SEP=---------------
118.8 +
118.9 # Capitalized letters used intentionally to emphasize the words in an output window, should be translated
118.10 MSG_MERGE_NOT_SUPPORTED_INVIEW_INFO=\u4fe1\u606f: \u6b64\u89c6\u56fe\u4e0d\u652f\u6301\u5408\u5e76\u64cd\u4f5c
118.11 MSG_MERGE_NOT_SUPPORTED_INVIEW_TITLE=Mercurial \u5408\u5e76
119.1 --- a/src/zh_CN/ide/mercurial/mercurial/org/netbeans/modules/mercurial/ui/pull/Bundle_zh_CN.properties Wed Feb 26 18:44:50 2014 -0800
119.2 +++ b/src/zh_CN/ide/mercurial/mercurial/org/netbeans/modules/mercurial/ui/pull/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
119.3 @@ -99,7 +99,7 @@
119.4 # Capitalized letters used intentionally to emphasize the words in an output window, should be translated
119.5 MSG_PULL_TO=\u4fe1\u606f: \u590d\u5236\u81f3: {0} - {1}
119.6 MSG_PULL_TITLE=Mercurial \u63d0\u53d6
119.7 -MSG_PULL_TITLE_SEP=--------------
119.8 +
119.9 # Capitalized letters used intentionally to emphasize the words in an output window, should be translated
119.10 MSG_PULL_DONE=\u4fe1\u606f: Mercurial \u63d0\u53d6\u7ed3\u675f
119.11 # Capitalized letters used intentionally to emphasize the words in an output window, should be translated
119.12 @@ -130,7 +130,7 @@
119.13 MSG_PULL_OVERWRITE_LOCAL=\u8b66\u544a: \u63d0\u53d6\u64cd\u4f5c\u5c06\u8986\u76d6\u4ee5\u4e0b\u51b2\u7a81\u6587\u4ef6/\u672c\u5730\u4fee\u6539\u7684\u6587\u4ef6/\u65b0\u6587\u4ef6:
119.14
119.15 MSG_FETCH_TITLE=Mercurial \u83b7\u53d6
119.16 -MSG_FETCH_TITLE_SEP=---------------
119.17 +
119.18 # Capitalized letters used intentionally to emphasize the words in an output window, should be translated
119.19 MSG_FETCH_LAUNCH_INFO=\u4fe1\u606f: \u5bf9{0}\u6267\u884c\u83b7\u53d6\u64cd\u4f5c
119.20 MSG_FETCH_PROGRESS=\u6b63\u5728\u83b7\u53d6...
120.1 --- a/src/zh_CN/ide/mercurial/mercurial/org/netbeans/modules/mercurial/ui/push/Bundle_zh_CN.properties Wed Feb 26 18:44:50 2014 -0800
120.2 +++ b/src/zh_CN/ide/mercurial/mercurial/org/netbeans/modules/mercurial/ui/push/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
120.3 @@ -65,7 +65,7 @@
120.4 # Capitalized letters used intentionally to emphasize the words in an output window, should be translated
120.5 MSG_PUSHING_TO_NONAME=\u4fe1\u606f: \u6b63\u5728\u63a8\u5165\u81f3: {0}...
120.6 MSG_PUSH_TITLE=Mercurial \u63a8\u5165
120.7 -MSG_PUSH_TITLE_SEP=--------------
120.8 +
120.9 # Capitalized letters used intentionally to emphasize the words in an output window, should be translated
120.10 MSG_PUSH_DONE=\u4fe1\u606f: Mercurial \u63a8\u5165\u7ed3\u675f
120.11 # Capitalized letters used intentionally to emphasize the words in an output window, should be translated
121.1 --- a/src/zh_CN/ide/mercurial/mercurial/org/netbeans/modules/mercurial/ui/queues/Bundle_zh_CN.properties Wed Feb 26 18:44:50 2014 -0800
121.2 +++ b/src/zh_CN/ide/mercurial/mercurial/org/netbeans/modules/mercurial/ui/queues/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
121.3 @@ -72,7 +72,7 @@
121.4 PatchSeriesPanel.jLabel1.text=\u8865\u4e01\u7a0b\u5e8f(&P):
121.5 PatchSeriesPanel.jLabel1.TTtext=\u53ef\u8f6c\u81f3\u7684\u8865\u4e01\u7a0b\u5e8f\u3002
121.6 MSG_GOTO_TITLE=Mercurial \u961f\u5217 - \u8f6c\u81f3\u8865\u4e01\u7a0b\u5e8f
121.7 -MSG_GOTO_TITLE_SEP=----------------
121.8 +
121.9 MSG_GOTO_INFO_SEP=\u8f6c\u81f3{1}\u4e2d\u7684\u8865\u4e01\u7a0b\u5e8f{0}
121.10 MSG_GOTO_EMPTY_INFO_SEP=\u5f39\u51fa{0}\u4e2d\u7684\u6240\u6709\u8865\u4e01\u7a0b\u5e8f
121.11 # Capitalized letters used intentionally to emphasize the words in an output window, should be translated
121.12 @@ -82,7 +82,7 @@
121.13
121.14 LBL_QPushAllPatchesAction.progress=\u6b63\u5728\u63a8\u5165\u8865\u4e01\u7a0b\u5e8f...
121.15 MSG_PUSH_TITLE=Mercurial \u961f\u5217 - \u63a8\u5165\u6240\u6709\u8865\u4e01\u7a0b\u5e8f
121.16 -MSG_PUSH_TITLE_SEP=----------------
121.17 +
121.18 MSG_PUSH_INFO_SEP=\u63a8\u5165{0}\u4e2d\u7684\u6240\u6709\u8865\u4e01\u7a0b\u5e8f
121.19 # Capitalized letters used intentionally to emphasize the words in an output window, should be translated
121.20 MSG_PUSH_DONE=\u4fe1\u606f: \u63a8\u5165\u6240\u6709\u8865\u4e01\u7a0b\u5e8f\u7ed3\u675f
121.21 @@ -104,7 +104,7 @@
121.22 LBL_CreateRefreshAction.preparing.progress=\u6b63\u5728\u51c6\u5907...
121.23 CTL_RefreshPatchDialog_Title.create=\u521b\u5efa\u8865\u4e01\u7a0b\u5e8f - {0}
121.24 MSG_CREATE_REFRESH_TITLE.create=Mercurial \u961f\u5217 - \u521b\u5efa\u8865\u4e01\u7a0b\u5e8f
121.25 -MSG_CREATE_REFRESH_TITLE_SEP.create=----------------
121.26 +
121.27 MSG_CREATE_REFRESH_INFO_SEP.create=\u5728{1}\u4e2d\u521b\u5efa\u8865\u4e01\u7a0b\u5e8f{0}
121.28 # Capitalized letters used intentionally to emphasize the words in an output window, should be translated
121.29 MSG_CREATE_REFRESH_DONE.create=\u4fe1\u606f: \u521b\u5efa\u8865\u4e01\u7a0b\u5e8f\u7ed3\u675f
121.30 @@ -115,7 +115,7 @@
121.31 LBL_CreateRefreshAction.progress.refresh=\u6b63\u5728\u5237\u65b0\u8865\u4e01\u7a0b\u5e8f...
121.32 CTL_RefreshPatchDialog_Title.refresh=\u5237\u65b0\u8865\u4e01\u7a0b\u5e8f - {0}
121.33 MSG_CREATE_REFRESH_TITLE.refresh=Mercurial \u961f\u5217 - \u5237\u65b0\u8865\u4e01\u7a0b\u5e8f
121.34 -MSG_CREATE_REFRESH_TITLE_SEP.refresh=----------------
121.35 +
121.36 MSG_CREATE_REFRESH_INFO_SEP.refresh=\u5237\u65b0{1}\u4e2d\u7684\u8865\u4e01\u7a0b\u5e8f{0}
121.37 # Capitalized letters used intentionally to emphasize the words in an output window, should be translated
121.38 MSG_CREATE_REFRESH_DONE.refresh=\u4fe1\u606f: \u5237\u65b0\u8865\u4e01\u7a0b\u5e8f\u7ed3\u675f
121.39 @@ -177,7 +177,7 @@
121.40 LBL_QFinishPatchAction.progress=\u6b63\u5728\u5b8c\u6210\u8865\u4e01\u7a0b\u5e8f...
121.41 MSG_QFinishPatchesAction.progress.hooks=\u8c03\u7528\u961f\u5217\u6302\u94a9
121.42 MSG_FINISH_TITLE=Mercurial \u961f\u5217 - \u5b8c\u6210\u8865\u4e01\u7a0b\u5e8f
121.43 -MSG_FINISH_TITLE_SEP=----------------
121.44 +
121.45 MSG_FINISH_INFO_SEP=\u5b8c\u6210{1}\u4e2d\u7684\u8865\u4e01\u7a0b\u5e8f{0}
121.46 # Capitalized letters used intentionally to emphasize the words in an output window, should be translated
121.47 MSG_FINISH_DONE=\u4fe1\u606f: \u5b8c\u6210\u8865\u4e01\u7a0b\u5e8f\u7ed3\u675f
122.1 --- a/src/zh_CN/ide/mercurial/mercurial/org/netbeans/modules/mercurial/ui/rebase/Bundle_zh_CN.properties Wed Feb 26 18:44:50 2014 -0800
122.2 +++ b/src/zh_CN/ide/mercurial/mercurial/org/netbeans/modules/mercurial/ui/rebase/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
122.3 @@ -73,7 +73,7 @@
122.4 MSG_Rebase_Progress=\u6b63\u5728\u91cd\u5b9a\u57fa\u5740...
122.5 MSG_Rebase_Started=\u5f00\u59cb\u91cd\u5b9a\u57fa\u5740
122.6 MSG_Rebase_Title=Mercurial \u91cd\u5b9a\u57fa\u5740
122.7 -MSG_Rebase_Title_Sep=----------------
122.8 +
122.9 MSG_RebaseAction.progress.preparingChangesets=\u6b63\u5728\u51c6\u5907\u8981\u91cd\u5b9a\u57fa\u5740\u7684\u66f4\u6539\u96c6
122.10 MSG_RebaseAction.progress.rebasingChangesets=\u6b63\u5728\u5c06\u66f4\u6539\u96c6\u91cd\u5b9a\u57fa\u5740
122.11 MSG_RebaseAction.progress.refreshingFiles=\u6b63\u5728\u5237\u65b0\u6587\u4ef6
123.1 --- a/src/zh_CN/ide/mercurial/mercurial/org/netbeans/modules/mercurial/ui/rollback/Bundle_zh_CN.properties Wed Feb 26 18:44:50 2014 -0800
123.2 +++ b/src/zh_CN/ide/mercurial/mercurial/org/netbeans/modules/mercurial/ui/rollback/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
123.3 @@ -55,7 +55,7 @@
123.4 # Capitalized letters used intentionally to emphasize the words in an output window, should be translated
123.5 MSG_ROLLBACK_INFO = \u4fe1\u606f: \u56de\u9000\u64cd\u4f5c\u662f\u5bf9\u6b64\u8d44\u6e90\u5e93\u4e2d\u7684\u6700\u540e\u4e00\u4e2a\u4e8b\u52a1\u6267\u884c\u56de\u9000, \u4e14\u53ea\u80fd\u56de\u9000\u4e00\u7ea7\u3002
123.6 MSG_ROLLBACK_TITLE = Mercurial \u56de\u9000
123.7 -MSG_ROLLBACK_TITLE_SEP = --------------------
123.8 +
123.9 MSG_ROLLBACK_INFO_SEP = \u5728\u4ee5\u4e0b\u4f4d\u7f6e\u56de\u9000:\n{0}
123.10 # Capitalized letters used intentionally to emphasize the words in an output window, should be translated
123.11 MSG_ROLLBACK_CANCELED = \u4fe1\u606f: \u7528\u6237\u5df2\u53d6\u6d88\u56de\u9000\u64cd\u4f5c
123.12 @@ -72,7 +72,7 @@
123.13 MSG_Refreshing_Strip_Versions = \u5237\u65b0\u53bb\u9664\u7248\u672c
123.14
123.15 MSG_STRIP_TITLE = Mercurial \u53bb\u9664
123.16 -MSG_STRIP_TITLE_SEP = ---------------
123.17 +
123.18 MSG_STRIP_INFO_SEP = \u53bb\u9664\u4f4d\u4e8e\u4ee5\u4e0b\u4f4d\u7f6e\u7684\u4fee\u8ba2\u7248\u672c {0} \u53ca\u5176\u6d3e\u751f\u7248\u672c:\n{1}
123.19 # Capitalized letters used intentionally to emphasize the words in an output window, should be translated
123.20 MSG_NO_REV_STRIP = \n\u4fe1\u606f: \u65e0\u6cd5\u53bb\u9664\u6b64\u4fee\u8ba2\u7248\u672c {0}
123.21 @@ -89,7 +89,7 @@
123.22 MSG_STRIP_REVISION_PARENT = \u5de5\u4f5c\u526f\u672c\u7684\u7236\u526f\u672c
123.23
123.24 MSG_BACKOUT_TITLE = Mercurial \u56de\u9000
123.25 -MSG_BACKOUT_TITLE_SEP = -----------------
123.26 +
123.27 MSG_BACKOUT_INFO_SEP = \u56de\u9000\u4f4d\u4e8e\u4ee5\u4e0b\u4f4d\u7f6e\u7684\u4fee\u8ba2\u7248\u672c {0}:\n{1}
123.28 # Capitalized letters used intentionally to emphasize the words in an output window, should be translated
123.29 MSG_NO_REV_BACKOUT = \n\u4fe1\u606f: \u65e0\u6cd5\u56de\u9000\u6b64\u4fee\u8ba2\u7248\u672c {0}
123.30 @@ -106,7 +106,7 @@
123.31 MSG_BACKOUT_MERGE_DO = \u4fe1\u606f: \u5408\u5e76: \u5bf9\u56de\u9000\u66f4\u6539\u96c6\u6267\u884c\u5408\u5e76
123.32
123.33 MSG_VERIFY_TITLE = Mercurial \u9a8c\u8bc1
123.34 -MSG_VERIFY_TITLE_SEP = ----------------
123.35 +
123.36 MSG_VERIFY_INFO = \u6b63\u5728\u9a8c\u8bc1\u8d44\u6e90\u5e93{0}...
123.37 MSG_VERIFY_PROGRESS = \u6b63\u5728\u9a8c\u8bc1...
123.38 # Capitalized letters used intentionally to emphasize the words in an output window, should be translated
124.1 --- a/src/zh_CN/ide/mercurial/mercurial/org/netbeans/modules/mercurial/ui/tag/Bundle_zh_CN.properties Wed Feb 26 18:44:50 2014 -0800
124.2 +++ b/src/zh_CN/ide/mercurial/mercurial/org/netbeans/modules/mercurial/ui/tag/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
124.3 @@ -45,7 +45,7 @@
124.4 CTL_PopupMenuItem_CreateTag=\u521b\u5efa\u6807\u8bb0...
124.5 CTL_PopupMenuItem_ManageTags=\u7ba1\u7406\u6807\u8bb0...
124.6 MSG_CREATE_TITLE=Mercurial \u521b\u5efa\u6807\u8bb0
124.7 -MSG_CREATE_TITLE_SEP=----------------
124.8 +
124.9 MSG_CREATE_INFO_SEP=\u5728\u4ee5\u4e0b\u4f4d\u7f6e\u521b\u5efa\u6807\u8bb0{0}:\n{1}
124.10 # Capitalized letters used intentionally to emphasize the words in an output window, should be translated
124.11 MSG_CREATE_DONE=\u4fe1\u606f: \u521b\u5efa\u7ed3\u675f
124.12 @@ -97,7 +97,7 @@
124.13 CTL_TagManagerPanel.removeTagPanel.text=\u662f\u5426\u8981\u5220\u9664\u6807\u8bb0 "{0}"?
124.14 MSG_TagManagerPanel.removing.progressName=\u6b63\u5728\u5220\u9664\u6807\u8bb0{0}...
124.15 MSG_DELETE_TAG_TITLE=Mercurial \u5220\u9664\u6807\u8bb0
124.16 -MSG_DELETE_TAG_TITLE_SEP=----------------
124.17 +
124.18 MSG_DELETE_TAG_INFO_SEP=\u5728\u4ee5\u4e0b\u4f4d\u7f6e\u5220\u9664\u6807\u8bb0{0}:\n{1}
124.19 # Capitalized letters used intentionally to emphasize the words in an output window, should be translated
124.20 MSG_DELETE_TAG_DONE=\u4fe1\u606f: \u5220\u9664\u7ed3\u675f
125.1 --- a/src/zh_CN/ide/mercurial/mercurial/org/netbeans/modules/mercurial/ui/update/Bundle_zh_CN.properties Wed Feb 26 18:44:50 2014 -0800
125.2 +++ b/src/zh_CN/ide/mercurial/mercurial/org/netbeans/modules/mercurial/ui/update/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
125.3 @@ -75,13 +75,13 @@
125.4 ACSD_UpdateDialog=\u66f4\u65b0\u8d44\u6e90\u5e93 - {0}
125.5
125.6 MSG_UPDATE_TITLE=Mercurial \u66f4\u65b0
125.7 -MSG_UPDATE_TITLE_SEP=----------------
125.8 +
125.9 MSG_UPDATE_INFO_SEP=\u66f4\u65b0\u81f3\u4ee5\u4e0b\u4f4d\u7f6e\u7684\u4fee\u8ba2\u7248\u672c {0}:\n{1}
125.10 # Capitalized letters used intentionally to emphasize the words in an output window, should be translated
125.11 MSG_UPDATE_DONE=\u4fe1\u606f: \u66f4\u65b0\u7ed3\u675f
125.12
125.13 MSG_REVERT_TITLE=Mercurial \u8fd8\u539f
125.14 -MSG_REVERT_TITLE_SEP=----------------
125.15 +
125.16 MSG_REVERT_REVISION_STR=\u8fd8\u539f\u81f3\u4fee\u8ba2\u7248\u672c {0}
125.17 MSG_REVERT_REVISION_PARENT=\u6b63\u5728\u8fd8\u539f\u4e3a\u5de5\u4f5c\u526f\u672c\u7684\u7236\u526f\u672c
125.18 # Capitalized letters used intentionally to emphasize the words in an output window, should be translated
126.1 --- a/src/zh_CN/ide/mercurial/mercurial/org/netbeans/modules/mercurial/ui/view/Bundle_zh_CN.properties Wed Feb 26 18:44:50 2014 -0800
126.2 +++ b/src/zh_CN/ide/mercurial/mercurial/org/netbeans/modules/mercurial/ui/view/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
126.3 @@ -44,7 +44,7 @@
126.4 CTL_MenuItem_View = \u89c6\u56fe(&V)...
126.5
126.6 MSG_VIEW_TITLE = Mercurial \u89c6\u56fe
126.7 -MSG_VIEW_TITLE_SEP = --------------
126.8 +
126.9 # Capitalized letters used intentionally to emphasize the words in an output window, should be translated
126.10 MSG_VIEW_LAUNCH_INFO = \u4fe1\u606f: \u4e3a{0}\u542f\u52a8 Hgk
126.11
127.1 --- a/src/zh_CN/ide/org-netbeans-spi-debugger-ui/org-netbeans-spi-debugger-ui/org/netbeans/modules/debugger/ui/actions/Bundle_zh_CN.properties Wed Feb 26 18:44:50 2014 -0800
127.2 +++ b/src/zh_CN/ide/org-netbeans-spi-debugger-ui/org-netbeans-spi-debugger-ui/org/netbeans/modules/debugger/ui/actions/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
127.3 @@ -55,6 +55,7 @@
127.4 CTL_WatchesAction=\u76d1\u89c6(&W)
127.5 CTL_BreakpointsAction=\u65ad\u70b9(&B)
127.6 CTL_SourcesAction=\u6e90(&S)
127.7 +CTL_DebuggingViewAction=\u8c03\u8bd5(&D)
127.8
127.9
127.10 # DebugMainProjectAction
127.11 @@ -230,3 +231,9 @@
127.12 # {0} Attach type
127.13 USG_DEBUG_ATTACH=\u901a\u8fc7\u8fde\u63a5\u7c7b\u578b{0}\u8fdb\u884c\u8fde\u63a5
127.14
127.15 +#GoToHitAction
127.16 +CTL_GoToBreakpointHit=\u8f6c\u81f3\u9047\u5230\u7684\u65ad\u70b9
127.17 +
127.18 +# SetCurrentThreadFromHistoryAction
127.19 +CTL_SetCurrentThreadFromHistoryAction=\u8bbe\u7f6e\u5f53\u524d\u7ebf\u7a0b(&H)...
127.20 +
128.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
128.2 +++ b/src/zh_CN/ide/org-netbeans-spi-debugger-ui/org-netbeans-spi-debugger-ui/org/netbeans/modules/debugger/ui/views/debugging/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
128.3 @@ -0,0 +1,111 @@
128.4 +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
128.5 +#
128.6 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
128.7 +#
128.8 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
128.9 +# Other names may be trademarks of their respective owners.
128.10 +#
128.11 +# The contents of this file are subject to the terms of either the GNU
128.12 +# General Public License Version 2 only ("GPL") or the Common
128.13 +# Development and Distribution License("CDDL") (collectively, the
128.14 +# "License"). You may not use this file except in compliance with the
128.15 +# License. You can obtain a copy of the License at
128.16 +# http://www.netbeans.org/cddl-gplv2.html
128.17 +# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
128.18 +# specific language governing permissions and limitations under the
128.19 +# License. When distributing the software, include this License Header
128.20 +# Notice in each file and include the License file at
128.21 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
128.22 +# particular file as subject to the "Classpath" exception as provided
128.23 +# by Oracle in the GPL Version 2 section of the License file that
128.24 +# accompanied this code. If applicable, add the following below the
128.25 +# License Header, with the fields enclosed by brackets [] replaced by
128.26 +# your own identifying information:
128.27 +# "Portions Copyrighted [year] [name of copyright owner]"
128.28 +#
128.29 +# Contributor(s):
128.30 +#
128.31 +# The Original Software is NetBeans. The Initial Developer of the Original
128.32 +# Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
128.33 +# Microsystems, Inc. All Rights Reserved.
128.34 +#
128.35 +# If you wish your version of this file to be governed by only the CDDL
128.36 +# or only the GPL Version 2, indicate your decision by adding
128.37 +# "[Contributor] elects to include this software in this distribution
128.38 +# under the [CDDL or GPL Version 2] license." If you do not indicate a
128.39 +# single choice of license, a recipient has the option to distribute
128.40 +# your version of this file under either the CDDL, the GPL Version 2 or
128.41 +# to extend the choice of license to its licensees as provided above.
128.42 +# However, if you add GPL Version 2 code and therefore, elected the GPL
128.43 +# Version 2 license, then the option applies only if the new code is
128.44 +# made subject to such option by the copyright holder.
128.45 +
128.46 +#DebuggingView
128.47 +CTL_Debugging_view=\u8c03\u8bd5
128.48 +CTL_Debugging_tooltip=\u8c03\u8bd5\u89c6\u56fe
128.49 +LBL_No_Session_Running=\u672a\u8fd0\u884c\u4f1a\u8bdd
128.50 +
128.51 +LBL_THREAD_GROUPS_TIP=\u663e\u793a\u7ebf\u7a0b\u7ec4
128.52 +LBL_SUSPEND_TABLE_TIP=\u663e\u793a\u6302\u8d77/\u6062\u590d\u8868
128.53 +LBL_SYSTEM_THREADS_TIP=\u663e\u793a\u7cfb\u7edf\u7ebf\u7a0b
128.54 +LBL_SUPSENDED_THREADS_ONLY_TIP=\u663e\u793a\u8f83\u5c11\u7ebf\u7a0b (\u4ec5\u5305\u62ec\u6302\u8d77\u7ebf\u7a0b\u548c\u5f53\u524d\u7ebf\u7a0b)
128.55 +LBL_MONITORS_TIP=\u663e\u793a\u76d1\u89c6\u5668
128.56 +LBL_QUALIFIED_NAMES_TIP=\u663e\u793a\u9650\u5b9a\u540d\u79f0
128.57 +LBL_SUSPEND_SORT_TIP=\u6309\u6302\u8d77/\u6062\u590d\u72b6\u6001\u6392\u5e8f
128.58 +LBL_ALPHABETIC_SORT_TIP=\u6309\u540d\u79f0\u6392\u5e8f
128.59 +LBL_NATURAL_SORT_TIP=\u6309\u9ed8\u8ba4\u503c\u6392\u5e8f
128.60 +
128.61 +LBL_THREAD_GROUPS=\u663e\u793a\u7ebf\u7a0b\u7ec4(&G)
128.62 +LBL_SUSPEND_TABLE=\u663e\u793a\u6302\u8d77/\u6062\u590d\u8868(&T)
128.63 +LBL_SYSTEM_THREADS=\u663e\u793a\u7cfb\u7edf\u7ebf\u7a0b(&S)
128.64 +LBL_SUPSENDED_THREADS_ONLY=\u663e\u793a\u8f83\u5c11\u7ebf\u7a0b(&L)
128.65 +LBL_MONITORS=\u663e\u793a\u76d1\u89c6\u5668(&M)
128.66 +LBL_QUALIFIED_NAMES=\u663e\u793a\u9650\u5b9a\u540d\u79f0(&N)
128.67 +LBL_SUSPEND_SORT=\u6309\u72b6\u6001\u6392\u5e8f(&T)
128.68 +LBL_ALPHABETIC_SORT=\u6309\u540d\u79f0\u6392\u5e8f(&N)
128.69 +LBL_NATURAL_SORT=\u9ed8\u8ba4\u6392\u5e8f(&D)
128.70 +
128.71 +LBL_FilterSubmenu=\u9009\u9879(&O)
128.72 +
128.73 +LBL_CURRENT_BAR_TIP=\u5f53\u524d\u7ebf\u7a0b (\u4e3a\u9010\u6b65\u6267\u884c\u548c\u8bc4\u4f30\u9009\u62e9\u7684)
128.74 +LBL_CURRENT_DEADLOCKED_TIP=\u5904\u4e8e\u6b7b\u9501\u72b6\u6001\u7684\u5f53\u524d\u7ebf\u7a0b
128.75 +LBL_BREAKPOINT_HIT_TIP=\u9047\u5230\u65b0\u65ad\u70b9
128.76 +LBL_DEADLOCKED_THREAD_TIP=\u5904\u4e8e\u6b7b\u9501\u72b6\u6001\u7684\u7ebf\u7a0b
128.77 +
128.78 +LBL_SUSPEND_THREAD=\u6302\u8d77\u7ebf\u7a0b{0}
128.79 +LBL_RESUME_THREAD=\u6062\u590d\u7ebf\u7a0b{0}
128.80 +
128.81 +#InfoPanel
128.82 +LBL_OneNewHit=\u9047\u5230\u65b0\u65ad\u70b9
128.83 +LBL_NewHits=\u9047\u5230\u65b0\u65ad\u70b9 ({0})
128.84 +
128.85 +#Threads History action
128.86 +CTL_ThreadsHistoryAction=\u7ebf\u7a0b\u5386\u53f2\u8bb0\u5f55
128.87 +CTL_THREADS_CHOOSER=\u5f53\u524d\u7ebf\u7a0b\u9009\u62e9\u5668
128.88 +
128.89 +InfoPanel.hitsLabel.text=\u9047\u5230\u65b0\u65ad\u70b9
128.90 +
128.91 +
128.92 +InfoPanel.deadlocksLabel.text=\u68c0\u6d4b\u5230\u6b7b\u9501
128.93 +
128.94 +InfoPanel.debuggerDeadlocksLabelThread.text=\u6267\u884c\u7684\u6b65\u9aa4\u7531\u6302\u8d77\u7ebf\u7a0b ''{0}'' \u963b\u6b62\u3002
128.95 +InfoPanel.debuggerDeadlocksLabel.Method.text=\u65b9\u6cd5\u8c03\u7528\u7531\u5176\u4ed6\u6302\u8d77\u7ebf\u7a0b\u963b\u6b62\u3002
128.96 +InfoPanel.debuggerDeadlocksLabelThread.Method.text=\u65b9\u6cd5\u8c03\u7528\u7531\u6302\u8d77\u7ebf\u7a0b ''{0}'' \u963b\u6b62\u3002
128.97 +InfoPanel.debuggerDeadlocksLabel.text=\u6267\u884c\u7684\u6b65\u9aa4\u7531\u5176\u4ed6\u6302\u8d77\u7ebf\u7a0b\u963b\u6b62\u3002
128.98 +InfoPanel.debuggerDeadlocksLabel.tooltip=\u963b\u6b62\u7ebf\u7a0b\u662f: {0}\u3002
128.99 +InfoPanel.resumeDebuggerDeadlockLabelThread.text=\u662f\u5426\u6062\u590d\u6b64\u7ebf\u7a0b\u4ee5\u7ee7\u7eed?
128.100 +InfoPanel.resumeDebuggerDeadlockLabel.text=\u662f\u5426\u6062\u590d\u8fd9\u4e9b\u7ebf\u7a0b\u4ee5\u7ee7\u7eed?
128.101 +InfoPanel.resumeDebuggerDeadlockButton.text=\u6062\u590d
128.102 +InfoPanel.resumeDebuggerDeadlockButton.tooltip=\u6062\u590d\u7ebf\u7a0b{0}\u4ee5\u5b8c\u6210\u8be5\u6b65\u9aa4\u3002
128.103 +InfoPanel.resumeDebuggerDeadlockButton.Method.tooltip=\u6062\u590d\u7ebf\u7a0b{0}\u4ee5\u5b8c\u6210\u65b9\u6cd5\u8ba1\u7b97\u3002
128.104 +InfoPanel.resumeDebuggerDeadlockButtonThread.tooltip=\u6062\u590d\u7ebf\u7a0b ''{0}'' \u4ee5\u5b8c\u6210\u8be5\u6b65\u9aa4\u3002
128.105 +InfoPanel.resumeDebuggerDeadlockButtonThread.Method.tooltip=\u6062\u590d\u7ebf\u7a0b ''{0}'' \u4ee5\u5b8c\u6210\u65b9\u6cd5\u8ba1\u7b97\u3002
128.106 +DebuggingViewComponent.sessionComboBox.AccessibleContext.accessibleName=\u4f1a\u8bdd
128.107 +DebuggingViewComponent.sessionComboBox.AccessibleContext.accessibleDescription=\u8fd0\u884c\u7684\u4f1a\u8bdd\u5217\u8868\u3002
128.108 +DebuggingViewComponent.treeView.AccessibleContext.accessibleName=\u8c03\u8bd5\u6811
128.109 +DebuggingViewComponent.treeView.AccessibleContext.accessibleDescription=\u8c03\u8bd5\u7684 VM \u4e2d\u7684\u7ebf\u7a0b\u7684\u6811\u7ed3\u6784\u3002
128.110 +
128.111 +InfoPanel.stepBrkpLabel.text=\u6267\u884c\u7684\u6b65\u9aa4\u7531\u53e6\u4e00\u4e2a\u7ebf\u7a0b ''{0}'' \u4e2d\u7684\u65ad\u70b9\u4e2d\u65ad\u3002
128.112 +InfoPanel.stepBrkpIgnoreButton.text=\u5ffd\u7565\u65ad\u70b9
128.113 +InfoPanel.stepBrkpIgnoreButton.tooltip=\u8bf7\u5ffd\u7565\u6b64\u65ad\u70b9, \u5e76\u5b8c\u6210\u8be5\u6b65\u9aa4\u3002
128.114 +
129.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
129.2 +++ b/src/zh_CN/ide/project-ant/project-ant/org/netbeans/spi/project/support/ant/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
129.3 @@ -0,0 +1,51 @@
129.4 +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
129.5 +#
129.6 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
129.7 +#
129.8 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
129.9 +# Other names may be trademarks of their respective owners.
129.10 +#
129.11 +# The contents of this file are subject to the terms of either the GNU
129.12 +# General Public License Version 2 only ("GPL") or the Common
129.13 +# Development and Distribution License("CDDL") (collectively, the
129.14 +# "License"). You may not use this file except in compliance with the
129.15 +# License. You can obtain a copy of the License at
129.16 +# http://www.netbeans.org/cddl-gplv2.html
129.17 +# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
129.18 +# specific language governing permissions and limitations under the
129.19 +# License. When distributing the software, include this License Header
129.20 +# Notice in each file and include the License file at
129.21 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
129.22 +# particular file as subject to the "Classpath" exception as provided
129.23 +# by Oracle in the GPL Version 2 section of the License file that
129.24 +# accompanied this code. If applicable, add the following below the
129.25 +# License Header, with the fields enclosed by brackets [] replaced by
129.26 +# your own identifying information:
129.27 +# "Portions Copyrighted [year] [name of copyright owner]"
129.28 +#
129.29 +# Contributor(s):
129.30 +#
129.31 +# The Original Software is NetBeans. The Initial Developer of the Original
129.32 +# Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
129.33 +# Microsystems, Inc. All Rights Reserved.
129.34 +#
129.35 +# If you wish your version of this file to be governed by only the CDDL
129.36 +# or only the GPL Version 2, indicate your decision by adding
129.37 +# "[Contributor] elects to include this software in this distribution
129.38 +# under the [CDDL or GPL Version 2] license." If you do not indicate a
129.39 +# single choice of license, a recipient has the option to distribute
129.40 +# your version of this file under either the CDDL, the GPL Version 2 or
129.41 +# to extend the choice of license to its licensees as provided above.
129.42 +# However, if you add GPL Version 2 code and therefore, elected the GPL
129.43 +# Version 2 license, then the option applies only if the new code is
129.44 +# made subject to such option by the copyright holder.
129.45 +
129.46 +# GeneratedFilesHelper
129.47 +# NOTE TO TRANSLATORS:
129.48 +# This comment text will be in a *.properties file.
129.49 +# If you use non-ISO-8859-1 characters, they will be escaped and unreadable.
129.50 +
129.51 +
129.52 +# {0} - broken file
129.53 +DESC_Problem_Broken_Config={0}\u6587\u4ef6\u591a\u6b21\u5305\u542b\u4e86\u67d0\u4e9b\u5143\u7d20\u3002\u4e3e\u4f8b\u800c\u8a00, \u5728\u7248\u672c\u63a7\u5236\u5408\u5e76\u4e86\u5e76\u53d1\u66f4\u6539\u65f6\u53ef\u80fd\u4f1a\u53d1\u751f\u8fd9\u79cd\u60c5\u51b5\u3002\u4f46\u662f, IDE \u65e0\u6cd5\u786e\u5b9a\u4f7f\u7528\u54ea\u4e00\u4e2a\u3002\u56e0\u6b64, \u5728\u624b\u52a8\u89e3\u51b3\u95ee\u9898\u4e4b\u524d, \u5c06\u5ffd\u7565\u53d7\u5f71\u54cd\u7684\u914d\u7f6e\u3002
129.54 +
130.1 --- a/src/zh_CN/ide/projectui/projectui/org/netbeans/modules/project/ui/Bundle_zh_CN.properties Wed Feb 26 18:44:50 2014 -0800
130.2 +++ b/src/zh_CN/ide/projectui/projectui/org/netbeans/modules/project/ui/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
130.3 @@ -63,6 +63,7 @@
130.4 LBL_ProjectsLogicalTabAction_Name=\u9879\u76ee(&J)
130.5 LBL_ProjectsPhysicalTabAction_Name=\u6587\u4ef6(&F)
130.6 LBL_SimpleTargetChooserPanel_Name=\u540d\u79f0\u548c\u4f4d\u7f6e
130.7 +# 0 - original template name
130.8
130.9 LBL_TargetChooser_CreatedFile_Label=\u521b\u5efa\u7684\u6587\u4ef6(&C):
130.10 LBL_TargetChooser_CreatedFolder_Label=\u521b\u5efa\u7684\u6587\u4ef6\u5939(&C):
130.11 @@ -197,7 +198,7 @@
130.12 LBL_TargetChooser_Browse_Button=\u6d4f\u89c8(&W)...
130.13 LBL_TargetChooser_Location_Label=\u4f4d\u7f6e(&T):
130.14 # 0 - name of group, 1 - name of project
130.15 -FMT_TargetChooser_GroupProjectNameBadge={0} [{1}]
130.16 +
130.17
130.18 #NewFileWizard
130.19 LBL_NewFileWizard_Title=\u65b0\u5efa\u6587\u4ef6
131.1 --- a/src/zh_CN/ide/projectui/projectui/org/netbeans/modules/project/ui/actions/Bundle_zh_CN.properties Wed Feb 26 18:44:50 2014 -0800
131.2 +++ b/src/zh_CN/ide/projectui/projectui/org/netbeans/modules/project/ui/actions/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
131.3 @@ -47,7 +47,7 @@
131.4 LBL_NewFileAction_Name=\u65b0\u5efa\u6587\u4ef6(&N)...
131.5 LBL_NewFileAction_PopupName=\u65b0\u5efa
131.6 # {0} - Name of the template
131.7 -LBL_NewFileAction_Template_PopupName={0}...
131.8 +
131.9 LBL_NewFileAction_Tooltip=\u65b0\u5efa\u6587\u4ef6...
131.10 LBL_NewProjectAction_Name=\u65b0\u5efa\u9879\u76ee(&W)...
131.11 LBL_NewProjectAction_Tooltip=\u65b0\u5efa\u9879\u76ee...
132.1 --- a/src/zh_CN/ide/subversion/subversion/org/netbeans/modules/subversion/Bundle_zh_CN.properties Wed Feb 26 18:44:50 2014 -0800
132.2 +++ b/src/zh_CN/ide/subversion/subversion/org/netbeans/modules/subversion/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
132.3 @@ -77,6 +77,7 @@
132.4 CTL_FileInfoStatus_Merge=\u672c\u5730/\u8fdc\u7a0b\u4fee\u6539
132.5 CTL_FileInfoStatus_LockedLocally=\u5df2\u9501\u5b9a
132.6 CTL_FileInfoStatus_LockedRemotely=\u7531\u5176\u4ed6\u4eba\u9501\u5b9a
132.7 +CTL_FileInfoStatus_TextAnnotation=\u5176\u4ed6\u6587\u672c\u6807\u6ce8
132.8
132.9 CTL_FileInfoStatus_Excluded_Short=\u5df2\u5ffd\u7565
132.10 CTL_FileInfoStatus_NewLocally_Short=\u65b0\u5efa
132.11 @@ -88,8 +89,6 @@
132.12 CTL_FileInfoStatus_Conflict_Short=\u51b2\u7a81
132.13 CTL_FileInfoStatus_TreeConflict_Short=\u51b2\u7a81
132.14
132.15 -
132.16 -
132.17 CTL_PopupMenuItem_Import=\u5bfc\u5165\u5230 Subversion \u8d44\u6e90\u5e93...
132.18 CTL_PopupMenuItem_Status=\u663e\u793a\u66f4\u6539
132.19 CTL_PopupMenuItem_Diff=\u6bd4\u8f83
133.1 --- a/src/zh_CN/ide/subversion/subversion/org/netbeans/modules/subversion/ui/copy/Bundle_zh_CN.properties Wed Feb 26 18:44:50 2014 -0800
133.2 +++ b/src/zh_CN/ide/subversion/subversion/org/netbeans/modules/subversion/ui/copy/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
133.3 @@ -138,7 +138,7 @@
133.4 CTL_Merge_TwoFoldersDesc=\u5c06\u4e24\u4e2a\u8d44\u6e90\u5e93\u6587\u4ef6\u5939\u4e4b\u95f4\u7684\u66f4\u6539\u5408\u5e76\u5230\u672c\u5730\u6587\u4ef6\u5939\u3002
133.5 CTL_Merge_OneRepositoryFolder=\u4e00\u4e2a\u8d44\u6e90\u5e93\u6587\u4ef6\u5939
133.6 CTL_Merge_OneRepositoryFolderDesc=\u5c06\u4e00\u4e2a\u8d44\u6e90\u5e93\u6587\u4ef6\u5939\u7684\u66f4\u6539\u5408\u5e76\u5230\u672c\u5730\u6587\u4ef6\u5939\u3002
133.7 -/=/
133.8 +
133.9 CTL_Merge_OneRepositoryFolderSinceOrigin=\u4e00\u4e2a\u8d44\u6e90\u5e93\u6587\u4ef6\u5939, \u81ea\u521b\u5efa\u65f6\u7684\u7248\u672c\u5f00\u59cb\u5408\u5e76
133.10 CTL_Merge_OneRepositoryFolderSinceOriginDesc=\u5c06\u4e00\u4e2a\u8d44\u6e90\u5e93\u6587\u4ef6\u5939\u81ea\u521b\u5efa\u4ee5\u6765\u7684\u6240\u6709\u66f4\u6539\u5408\u5e76\u5230\u672c\u5730\u6587\u4ef6\u5939\u3002
133.11 CTL_MergeOneFolder_Message=\u6d88\u606f
134.1 --- a/src/zh_CN/ide/subversion/subversion/org/netbeans/modules/subversion/ui/diff/Bundle_zh_CN.properties Wed Feb 26 18:44:50 2014 -0800
134.2 +++ b/src/zh_CN/ide/subversion/subversion/org/netbeans/modules/subversion/ui/diff/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
134.3 @@ -124,7 +124,7 @@
134.4
134.5 MSG_RefreshDiff_Tooltip=\u5237\u65b0\u5dee\u5f02
134.6 MSG_Revision_Select=\u9009\u62e9...
134.7 -MSG_Revision_Select_Separator=----------------------
134.8 +
134.9 MSG_Revision_Select_Tooltip=\u9009\u62e9\u8981\u6bd4\u8f83\u7684\u6811
134.10 MSG_UpdateDiff_Tooltip=\u66f4\u65b0 "{0}"
134.11 MSG_CommitDiff_Tooltip=\u63d0\u4ea4 "{0}"
135.1 --- a/src/zh_CN/ide/versioning-util/versioning-util/org/netbeans/modules/versioning/history/Bundle_zh_CN.properties Wed Feb 26 18:44:50 2014 -0800
135.2 +++ b/src/zh_CN/ide/versioning-util/versioning-util/org/netbeans/modules/versioning/history/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
135.3 @@ -46,6 +46,7 @@
135.4 CTL_Action_Diff = \u6bd4\u8f83
135.5 MSG_LoadingEvents=\u6b63\u5728\u52a0\u8f7d\u4e8b\u4ef6...
135.6 MSG_ShowAllFiles=\u663e\u793a\u6240\u6709\u6587\u4ef6
135.7 +MSG_ShowMoreFiles=\u663e\u793a\u63a5\u4e0b\u6765 {0} \u4e2a\u6587\u4ef6
135.8 MSG_ShowLessFiles=\u663e\u793a\u8f83\u5c11\u6587\u4ef6
135.9 MSG_ShowMore=\u663e\u793a\u66f4\u591a...
135.10 MSG_AllRevisions=\u6240\u6709\u4fee\u8ba2
136.1 --- a/src/zh_CN/ide/web-common/web-common/org/netbeans/modules/web/common/cssprep/Bundle_zh_CN.properties Wed Feb 26 18:44:50 2014 -0800
136.2 +++ b/src/zh_CN/ide/web-common/web-common/org/netbeans/modules/web/common/cssprep/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
136.3 @@ -44,5 +44,5 @@
136.4 CssPreprocessorsCustomizerPanel.configureButton.text=\u914d\u7f6e\u53ef\u6267\u884c\u6587\u4ef6(&F)...
136.5 # {0} - customizer name
136.6 # {1} - message
136.7 -CssPreprocessorsCustomizerPanel.message={0}: {1}
136.8
136.9 +
137.1 --- a/src/zh_CN/ide/xml-core/xml-core/org/netbeans/modules/xml/api/Bundle_zh_CN.properties Wed Feb 26 18:44:50 2014 -0800
137.2 +++ b/src/zh_CN/ide/xml-core/xml-core/org/netbeans/modules/xml/api/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
137.3 @@ -46,33 +46,33 @@
137.4
137.5 # Encoding display names taken from TAx library
137.6 NAME_ISO-8859-1=ISO-8859-1 (\u62c9\u4e01\u8bed 1)
137.7 -NAME_IBM870=IBM870
137.8 -NAME_ISO-2022-JP=ISO-2022-JP
137.9 -NAME_ISO-8859-3=ISO-8859-3
137.10 -NAME_IBM424=IBM424
137.11 +
137.12 +
137.13 +
137.14 +
137.15 NAME_KOI8-R=KOI8-R (\u4fc4\u8bed)
137.16 -NAME_IBM280=IBM280
137.17 -NAME_ISO-8859-4=ISO-8859-4
137.18 -NAME_IBM285=IBM285
137.19 -NAME_EUC-JP=EUC-JP
137.20 +
137.21 +
137.22 +
137.23 +
137.24 NAME_UTF-8=UTF-8 (\u63a8\u8350)
137.25 -NAME_IBM297=IBM297
137.26 +
137.27 NAME_ASCII=ASCII (7 \u4f4d)
137.28 -NAME_ISO-8859-2=ISO-8859-2
137.29 +
137.30 NAME_UTF-16=UTF-16 (\u63a8\u8350)
137.31 -NAME_IBM500=IBM500
137.32 -NAME_IBM277=IBM277
137.33 -NAME_GB2312=GB2312
137.34 -NAME_ISO-8859-9=ISO-8859-9
137.35 -NAME_IBM871=IBM871
137.36 -NAME_ISO-8859-7=ISO-8859-7
137.37 -NAME_IBM037=IBM037
137.38 -NAME_IBM918=IBM918
137.39 -NAME_IBM284=IBM284
137.40 -NAME_ISO-2022-KR=ISO-2022-KR
137.41 -NAME_EUC-KR=EUC-KR
137.42 -NAME_ISO-8859-6=ISO-8859-6
137.43 -NAME_ISO-8859-8=ISO-8859-8
137.44 -NAME_BIG5=BIG5
137.45 -NAME_ISO-8859-5=ISO-8859-5
137.46
137.47 +
137.48 +
137.49 +
137.50 +
137.51 +
137.52 +
137.53 +
137.54 +
137.55 +
137.56 +
137.57 +
137.58 +
137.59 +
137.60 +
137.61 +
138.1 --- a/src/zh_CN/ide/xml-core/xml-core/org/netbeans/modules/xml/core/lib/Bundle_zh_CN.properties Wed Feb 26 18:44:50 2014 -0800
138.2 +++ b/src/zh_CN/ide/xml-core/xml-core/org/netbeans/modules/xml/core/lib/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
138.3 @@ -42,33 +42,33 @@
138.4
138.5 # Encoding display names taken from TAx library
138.6 NAME_ISO-8859-1=ISO-8859-1 (\u62c9\u4e01\u8bed 1)
138.7 -NAME_IBM870=IBM870
138.8 -NAME_ISO-2022-JP=ISO-2022-JP
138.9 -NAME_ISO-8859-3=ISO-8859-3
138.10 -NAME_IBM424=IBM424
138.11 +
138.12 +
138.13 +
138.14 +
138.15 NAME_KOI8-R=KOI8-R (\u4fc4\u8bed)
138.16 -NAME_IBM280=IBM280
138.17 -NAME_ISO-8859-4=ISO-8859-4
138.18 -NAME_IBM285=IBM285
138.19 -NAME_EUC-JP=EUC-JP
138.20 +
138.21 +
138.22 +
138.23 +
138.24 NAME_UTF-8=UTF-8 (\u63a8\u8350)
138.25 -NAME_IBM297=IBM297
138.26 +
138.27 NAME_ASCII=ASCII (7 \u4f4d)
138.28 -NAME_ISO-8859-2=ISO-8859-2
138.29 +
138.30 NAME_UTF-16=UTF-16 (\u63a8\u8350)
138.31 -NAME_IBM500=IBM500
138.32 -NAME_IBM277=IBM277
138.33 -NAME_GB2312=GB2312
138.34 -NAME_ISO-8859-9=ISO-8859-9
138.35 -NAME_IBM871=IBM871
138.36 -NAME_ISO-8859-7=ISO-8859-7
138.37 -NAME_IBM037=IBM037
138.38 -NAME_IBM918=IBM918
138.39 -NAME_IBM284=IBM284
138.40 -NAME_ISO-2022-KR=ISO-2022-KR
138.41 -NAME_EUC-KR=EUC-KR
138.42 -NAME_ISO-8859-6=ISO-8859-6
138.43 -NAME_ISO-8859-8=ISO-8859-8
138.44 -NAME_BIG5=BIG5
138.45 -NAME_ISO-8859-5=ISO-8859-5
138.46
138.47 +
138.48 +
138.49 +
138.50 +
138.51 +
138.52 +
138.53 +
138.54 +
138.55 +
138.56 +
138.57 +
138.58 +
138.59 +
138.60 +
138.61 +
139.1 --- a/src/zh_CN/ide/xml-tax/ext/org-netbeans-tax/org/netbeans/tax/Bundle_zh_CN.properties Wed Feb 26 18:44:50 2014 -0800
139.2 +++ b/src/zh_CN/ide/xml-tax/ext/org-netbeans-tax/org/netbeans/tax/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
139.3 @@ -46,35 +46,35 @@
139.4
139.5 ## Encoding display names
139.6 NAME_ISO-8859-1=ISO-8859-1 (\u62c9\u4e01\u8bed 1)
139.7 -NAME_IBM870=IBM870
139.8 -NAME_ISO-2022-JP=ISO-2022-JP
139.9 -NAME_ISO-8859-3=ISO-8859-3
139.10 -NAME_IBM424=IBM424
139.11 +
139.12 +
139.13 +
139.14 +
139.15 NAME_KOI8-R=KOI8-R (\u4fc4\u8bed)
139.16 -NAME_IBM280=IBM280
139.17 -NAME_ISO-8859-4=ISO-8859-4
139.18 -NAME_IBM285=IBM285
139.19 -NAME_EUC-JP=EUC-JP
139.20 +
139.21 +
139.22 +
139.23 +
139.24 NAME_UTF-8=UTF-8 (\u63a8\u8350)
139.25 -NAME_IBM297=IBM297
139.26 +
139.27 NAME_ASCII=ASCII (7 \u4f4d)
139.28 -NAME_ISO-8859-2=ISO-8859-2
139.29 +
139.30 NAME_UTF-16=UTF-16 (\u63a8\u8350)
139.31 -NAME_IBM500=IBM500
139.32 -NAME_IBM277=IBM277
139.33 -NAME_GB2312=GB2312
139.34 -NAME_ISO-8859-9=ISO-8859-9
139.35 -NAME_IBM871=IBM871
139.36 -NAME_ISO-8859-7=ISO-8859-7
139.37 -NAME_IBM037=IBM037
139.38 -NAME_IBM918=IBM918
139.39 -NAME_IBM284=IBM284
139.40 -NAME_ISO-2022-KR=ISO-2022-KR
139.41 -NAME_EUC-KR=EUC-KR
139.42 -NAME_ISO-8859-6=ISO-8859-6
139.43 -NAME_ISO-8859-8=ISO-8859-8
139.44 -NAME_BIG5=BIG5
139.45 -NAME_ISO-8859-5=ISO-8859-5
139.46 +
139.47 +
139.48 +
139.49 +
139.50 +
139.51 +
139.52 +
139.53 +
139.54 +
139.55 +
139.56 +
139.57 +
139.58 +
139.59 +
139.60 +
139.61
139.62 #{0} violating character
139.63 PROP_invalid_first_char=\u4e0d\u80fd\u4ee5 "{0}" \u5b57\u7b26\u5f00\u5934\u3002\u8bf7\u52a1\u5fc5\u4f7f\u7528 ASCII \u5b57\u6bcd\u3002
140.1 --- a/src/zh_CN/ide/xml-xdm/xml-xdm/org/netbeans/modules/xml/xdm/nodes/Bundle_zh_CN.properties Wed Feb 26 18:44:50 2014 -0800
140.2 +++ b/src/zh_CN/ide/xml-xdm/xml-xdm/org/netbeans/modules/xml/xdm/nodes/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
140.3 @@ -43,33 +43,33 @@
140.4 ## Convertors.java
140.5 # Encoding display names taken from TAX library
140.6 NAME_ISO-8859-1=ISO-8859-1 (\u62c9\u4e01\u8bed 1)
140.7 -NAME_IBM870=IBM870
140.8 -NAME_ISO-2022-JP=ISO-2022-JP
140.9 -NAME_ISO-8859-3=ISO-8859-3
140.10 -NAME_IBM424=IBM424
140.11 +
140.12 +
140.13 +
140.14 +
140.15 NAME_KOI8-R=KOI8-R (\u4fc4\u8bed)
140.16 -NAME_IBM280=IBM280
140.17 -NAME_ISO-8859-4=ISO-8859-4
140.18 -NAME_IBM285=IBM285
140.19 -NAME_EUC-JP=EUC-JP
140.20 +
140.21 +
140.22 +
140.23 +
140.24 NAME_UTF-8=UTF-8 (\u63a8\u8350)
140.25 -NAME_IBM297=IBM297
140.26 +
140.27 NAME_ASCII=ASCII (7 \u4f4d)
140.28 -NAME_ISO-8859-2=ISO-8859-2
140.29 +
140.30 NAME_UTF-16=UTF-16 (\u63a8\u8350)
140.31 -NAME_IBM500=IBM500
140.32 -NAME_IBM277=IBM277
140.33 -NAME_GB2312=GB2312
140.34 -NAME_ISO-8859-9=ISO-8859-9
140.35 -NAME_IBM871=IBM871
140.36 -NAME_ISO-8859-7=ISO-8859-7
140.37 -NAME_IBM037=IBM037
140.38 -NAME_IBM918=IBM918
140.39 -NAME_IBM284=IBM284
140.40 -NAME_ISO-2022-KR=ISO-2022-KR
140.41 -NAME_EUC-KR=EUC-KR
140.42 -NAME_ISO-8859-6=ISO-8859-6
140.43 -NAME_ISO-8859-8=ISO-8859-8
140.44 -NAME_BIG5=BIG5
140.45 -NAME_ISO-8859-5=ISO-8859-5
140.46
140.47 +
140.48 +
140.49 +
140.50 +
140.51 +
140.52 +
140.53 +
140.54 +
140.55 +
140.56 +
140.57 +
140.58 +
140.59 +
140.60 +
140.61 +
141.1 --- a/src/zh_CN/ide/xml/xml/org/netbeans/modules/xml/util/Bundle_zh_CN.properties Wed Feb 26 18:44:50 2014 -0800
141.2 +++ b/src/zh_CN/ide/xml/xml/org/netbeans/modules/xml/util/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
141.3 @@ -52,33 +52,33 @@
141.4 ## Convertors.java
141.5 # Encoding display names taken from TAx library
141.6 NAME_ISO-8859-1=ISO-8859-1 (\u62c9\u4e01\u8bed 1)
141.7 -NAME_IBM870=IBM870
141.8 -NAME_ISO-2022-JP=ISO-2022-JP
141.9 -NAME_ISO-8859-3=ISO-8859-3
141.10 -NAME_IBM424=IBM424
141.11 +
141.12 +
141.13 +
141.14 +
141.15 NAME_KOI8-R=KOI8-R (\u4fc4\u8bed)
141.16 -NAME_IBM280=IBM280
141.17 -NAME_ISO-8859-4=ISO-8859-4
141.18 -NAME_IBM285=IBM285
141.19 -NAME_EUC-JP=EUC-JP
141.20 +
141.21 +
141.22 +
141.23 +
141.24 NAME_UTF-8=UTF-8 (\u63a8\u8350)
141.25 -NAME_IBM297=IBM297
141.26 +
141.27 NAME_ASCII=ASCII (7 \u4f4d)
141.28 -NAME_ISO-8859-2=ISO-8859-2
141.29 +
141.30 NAME_UTF-16=UTF-16 (\u63a8\u8350)
141.31 -NAME_IBM500=IBM500
141.32 -NAME_IBM277=IBM277
141.33 -NAME_GB2312=GB2312
141.34 -NAME_ISO-8859-9=ISO-8859-9
141.35 -NAME_IBM871=IBM871
141.36 -NAME_ISO-8859-7=ISO-8859-7
141.37 -NAME_IBM037=IBM037
141.38 -NAME_IBM918=IBM918
141.39 -NAME_IBM284=IBM284
141.40 -NAME_ISO-2022-KR=ISO-2022-KR
141.41 -NAME_EUC-KR=EUC-KR
141.42 -NAME_ISO-8859-6=ISO-8859-6
141.43 -NAME_ISO-8859-8=ISO-8859-8
141.44 -NAME_BIG5=BIG5
141.45 -NAME_ISO-8859-5=ISO-8859-5
141.46
141.47 +
141.48 +
141.49 +
141.50 +
141.51 +
141.52 +
141.53 +
141.54 +
141.55 +
141.56 +
141.57 +
141.58 +
141.59 +
141.60 +
141.61 +
142.1 --- a/src/zh_CN/ide/xml/xml/org/netbeans/modules/xml/wizard/impl/Bundle_zh_CN.properties Wed Feb 26 18:44:50 2014 -0800
142.2 +++ b/src/zh_CN/ide/xml/xml/org/netbeans/modules/xml/wizard/impl/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
142.3 @@ -58,8 +58,8 @@
142.4 PROP_schema_rootLabel_desc=\u6587\u6863\u6839\u5143\u7d20\u7684\u540d\u79f0
142.5
142.6 PROP_schema_rootComboBox_desc=\u4f7f\u7528\u63d0\u4f9b\u7684\u540d\u79f0\u6216\u8f93\u5165\u81ea\u5df1\u7684\u6839\u5143\u7d20\u540d\u79f0\u3002
142.7 -IMG_FolderNode_Closed = org/netbeans/modules/xml/wizard/impl/folder_closed.png
142.8 -IMG_FolderNode_Opened = org/netbeans/modules/xml/wizard/impl/folder_opened.png
142.9 +
142.10 +
142.11 LBL_WaitNode_Wait = \u8bf7\u7a0d\u5019...
142.12 CTL_SchemaPanel_Column_Name_name = \u6587\u4ef6
142.13 CTL_SchemaPanel_Column_Desc_name = \u5916\u90e8\u5f15\u7528\u540d\u79f0\u3002
143.1 --- a/src/zh_CN/java/ant-freeform/ant-freeform/org/netbeans/modules/ant/freeform/ui/Bundle_zh_CN.properties Wed Feb 26 18:44:50 2014 -0800
143.2 +++ b/src/zh_CN/java/ant-freeform/ant-freeform/org/netbeans/modules/ant/freeform/ui/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
143.3 @@ -131,7 +131,7 @@
143.4 # {0} - action name
143.5 UTA_LBL_intro=\u6ca1\u6709\u4e0e{0}\u64cd\u4f5c\u5173\u8054\u7684\u6784\u5efa\u76ee\u6807\u3002
143.6 # {0} - action name
143.7 -UTA_LBL_select={0}:
143.8 +
143.9 # {0} - action name
143.10 UTA_TEXT_explanation=\u81ea\u7531\u683c\u5f0f\u7684\u9879\u76ee\u8981\u6c42\u5728 Ant \u811a\u672c\u4e2d\u8c03\u7528\u8868\u793a{0}\u64cd\u4f5c\u7684\u76ee\u6807\u3002\u9009\u62e9\u8981\u8c03\u7528\u7684\u76ee\u6807\u3002
143.11 # {0} - action name
144.1 --- a/src/zh_CN/java/beans/beans/org/netbeans/modules/beans/Bundle_zh_CN.properties Wed Feb 26 18:44:50 2014 -0800
144.2 +++ b/src/zh_CN/java/beans/beans/org/netbeans/modules/beans/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
144.3 @@ -206,9 +206,9 @@
144.4 HINT_IndexedProperty=\u7d22\u5f15\u5c5e\u6027\u6a21\u5f0f
144.5 HINT_UnicastEventSet=\u5355\u70b9\u4f20\u9001\u4e8b\u4ef6\u6e90\u6a21\u5f0f
144.6 HINT_MulticastEventSet=\u591a\u70b9\u4f20\u9001\u4e8b\u4ef6\u6e90\u6a21\u5f0f
144.7 -HINT_ReadWriteProperty=(r/w)
144.8 -HINT_ReadOnlyProperty=(r/-)
144.9 -HINT_WriteOnlyProperty=(-/w)
144.10 +
144.11 +
144.12 +
144.13
144.14 HINT_initializerElementFormat=\u663e\u793a\u521d\u59cb\u5316\u7a0b\u5e8f\u7684\u540d\u79f0\u683c\u5f0f\u3002
144.15
144.16 @@ -357,13 +357,13 @@
144.17
144.18 #brandable types
144.19 ## filling for Types combo
144.20 -PropertyPatternPanel_Types=boolean|char|byte|short|int|long|float|double|String
144.21 +
144.22 ## selected type of the Types combo
144.23 -PropertyPatternPanel_SelectedType=\u5b57\u7b26\u4e32
144.24 +
144.25 ## filling for Types combo
144.26 -IdxPropertyPatternPanel_Types=boolean|char|byte|short|int|long|float|double|String
144.27 +
144.28 ## selected type of the Types combo
144.29 -IdxPropertyPatternPanel_SelectedType=\u5b57\u7b26\u4e32
144.30 +
144.31
144.32 org.netbeans.modules.java.codestyle/AddProperty.freemarker=\u6dfb\u52a0\u5c5e\u6027
144.33
145.1 --- a/src/zh_CN/java/beans/beans/org/netbeans/modules/beans/addproperty/Bundle_zh_CN.properties Wed Feb 26 18:44:50 2014 -0800
145.2 +++ b/src/zh_CN/java/beans/beans/org/netbeans/modules/beans/addproperty/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
145.3 @@ -7,7 +7,7 @@
145.4 AddPropertyPanel.generateJavadocCheckBox.text=\u751f\u6210 Javadoc(&J)
145.5 AddPropertyPanel.previewLabel.text=\u9884\u89c8(&W):
145.6 AddPropertyPanel.indexedCheckBox.text=\u7d22\u5f15(&I)
145.7 -AddPropertyPanel.previewEditorPane.text=
145.8 +
145.9
145.10
145.11
145.12 @@ -35,8 +35,8 @@
145.13 WARN_FinalPropertyRequiresInitilizer=\u4e3a\u6700\u7ec8\u5c5e\u6027\u6307\u5b9a\u521d\u59cb\u5316\u7a0b\u5e8f\u8868\u8fbe\u5f0f
145.14 WARN_CannotPCS=\u65e0\u6cd5\u4e3a\u9759\u6001\u5c5e\u6027\u751f\u6210\u5c5e\u6027\u66f4\u6539\u652f\u6301
145.15 WARN_CannotVCS=\u65e0\u6cd5\u4e3a\u9759\u6001\u5c5e\u6027\u751f\u6210\u53ef\u5426\u51b3\u5c5e\u6027\u66f4\u6539\u652f\u6301
145.16 -AddPropertyPanel.equalsLabel.text=&=
145.17 -AddPropertyPanel.semicolonLabel.text=;
145.18 +
145.19 +
145.20 AddPropertyPanel.AccessibleContext.accessibleName=\u6dfb\u52a0\u5c5e\u6027
145.21 AddPropertyPanel.AccessibleContext.accessibleDescription=\u6dfb\u52a0\u5c5e\u6027
145.22
146.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
146.2 +++ b/src/zh_CN/java/debugger-jpda-js/debugger-jpda-js/org/netbeans/modules/debugger/jpda/js/frames/models/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
146.3 @@ -0,0 +1,3 @@
146.4 +LBL_DisplayAllJavaFrames=\u663e\u793a\u6240\u6709 Java \u6846\u67b6
146.5 +MSG_NoSourceInfo=\u6ca1\u6709\u53ef\u7528\u7684\u6e90\u4fe1\u606f\u3002
146.6 +
147.1 --- a/src/zh_CN/java/debugger-jpda-projects/debugger-jpda-projects/org/netbeans/modules/debugger/jpda/projects/Bundle_zh_CN.properties Wed Feb 26 18:44:50 2014 -0800
147.2 +++ b/src/zh_CN/java/debugger-jpda-projects/debugger-jpda-projects/org/netbeans/modules/debugger/jpda/projects/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
147.3 @@ -72,7 +72,7 @@
147.4 TOOLTIP_HITCOUNT_MULTIPLE=\u547d\u4e2d\u8ba1\u6570\u662f {0} \u7684\u500d\u6570
147.5
147.6 #SourcesNodeModel
147.7 -CTL_SourcesModel_Column_Name_LibrarySources = {0}
147.8 +
147.9 CTL_SourcesModel_Column_Name_ProjectSources = {0} (\u9879\u76ee {1})
147.10 CTL_SourcesModel_Column_Name_DescExclusion = \u7c7b\u6392\u4ed6\u8fc7\u6ee4\u5668
147.11 CTL_SourcesModel_Column_Name_DescRoot = \u6e90\u8def\u5f84\u6839\u76ee\u5f55
148.1 --- a/src/zh_CN/java/debugger-jpda-ui/debugger-jpda-ui/org/netbeans/modules/debugger/jpda/ui/actions/Bundle_zh_CN.properties Wed Feb 26 18:44:50 2014 -0800
148.2 +++ b/src/zh_CN/java/debugger-jpda-ui/debugger-jpda-ui/org/netbeans/modules/debugger/jpda/ui/actions/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
148.3 @@ -49,9 +49,6 @@
148.4 #classesViewAction
148.5 CTL_ClassesAction=\u7c7b(&C)
148.6
148.7 -#DebuggingViewAction
148.8 -CTL_DebuggingViewAction=\u8c03\u8bd5(&D)
148.9 -
148.10 #SwitchOnAction
148.11 CTL_SwitchOn=\u6fc0\u6d3b
148.12
148.13 @@ -100,9 +97,3 @@
148.14 CTL_setAsCurrentThread=\u8bbe\u7f6e\u4e3a\u5f53\u524d\u7ebf\u7a0b
148.15
148.16
148.17 -#GoToHitAction
148.18 -CTL_GoToBreakpointHit=\u8f6c\u81f3\u9047\u5230\u7684\u65ad\u70b9
148.19 -
148.20 -# SetCurrentThreadFromHistoryAction
148.21 -CTL_SetCurrentThreadFromHistoryAction=\u8bbe\u7f6e\u5f53\u524d\u7ebf\u7a0b(&H)...
148.22 -
149.1 --- a/src/zh_CN/java/debugger-jpda-ui/debugger-jpda-ui/org/netbeans/modules/debugger/jpda/ui/debugging/Bundle_zh_CN.properties Wed Feb 26 18:44:50 2014 -0800
149.2 +++ b/src/zh_CN/java/debugger-jpda-ui/debugger-jpda-ui/org/netbeans/modules/debugger/jpda/ui/debugging/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
149.3 @@ -40,73 +40,8 @@
149.4 # Version 2 license, then the option applies only if the new code is
149.5 # made subject to such option by the copyright holder.
149.6
149.7 -#DebuggingView
149.8 -CTL_Debugging_view=\u8c03\u8bd5
149.9 -CTL_Debugging_tooltip=\u8c03\u8bd5\u89c6\u56fe
149.10 -LBL_No_Session_Running=\u672a\u8fd0\u884c\u4f1a\u8bdd
149.11 +# DebuggingViewSupportImpl
149.12
149.13 -LBL_THREAD_GROUPS_TIP=\u663e\u793a\u7ebf\u7a0b\u7ec4
149.14 -LBL_SUSPEND_TABLE_TIP=\u663e\u793a\u6302\u8d77/\u6062\u590d\u8868
149.15 -LBL_SYSTEM_THREADS_TIP=\u663e\u793a\u7cfb\u7edf\u7ebf\u7a0b
149.16 -LBL_SUPSENDED_THREADS_ONLY_TIP=\u663e\u793a\u8f83\u5c11\u7ebf\u7a0b (\u4ec5\u5305\u62ec\u6302\u8d77\u7ebf\u7a0b\u548c\u5f53\u524d\u7ebf\u7a0b)
149.17 -LBL_MONITORS_TIP=\u663e\u793a\u76d1\u89c6\u5668
149.18 -LBL_QUALIFIED_NAMES_TIP=\u663e\u793a\u9650\u5b9a\u540d\u79f0
149.19 -LBL_SUSPEND_SORT_TIP=\u6309\u6302\u8d77/\u6062\u590d\u72b6\u6001\u6392\u5e8f
149.20 -LBL_ALPHABETIC_SORT_TIP=\u6309\u540d\u79f0\u6392\u5e8f
149.21 -LBL_NATURAL_SORT_TIP=\u6309\u9ed8\u8ba4\u503c\u6392\u5e8f
149.22 +CTL_Session=\u4f1a\u8bdd{0}
149.23
149.24 -LBL_THREAD_GROUPS=\u663e\u793a\u7ebf\u7a0b\u7ec4(&G)
149.25 -LBL_SUSPEND_TABLE=\u663e\u793a\u6302\u8d77/\u6062\u590d\u8868(&T)
149.26 -LBL_SYSTEM_THREADS=\u663e\u793a\u7cfb\u7edf\u7ebf\u7a0b(&S)
149.27 -LBL_SUPSENDED_THREADS_ONLY=\u663e\u793a\u8f83\u5c11\u7ebf\u7a0b(&L)
149.28 -LBL_MONITORS=\u663e\u793a\u76d1\u89c6\u5668(&M)
149.29 -LBL_QUALIFIED_NAMES=\u663e\u793a\u9650\u5b9a\u540d\u79f0(&N)
149.30 -LBL_SUSPEND_SORT=\u6309\u72b6\u6001\u6392\u5e8f(&T)
149.31 -LBL_ALPHABETIC_SORT=\u6309\u540d\u79f0\u6392\u5e8f(&N)
149.32 -LBL_NATURAL_SORT=\u9ed8\u8ba4\u6392\u5e8f(&D)
149.33
149.34 -LBL_FilterSubmenu=\u9009\u9879(&O)
149.35 -
149.36 -LBL_CURRENT_BAR_TIP=\u5f53\u524d\u7ebf\u7a0b (\u4e3a\u9010\u6b65\u6267\u884c\u548c\u8bc4\u4f30\u9009\u62e9\u7684)
149.37 -LBL_CURRENT_DEADLOCKED_TIP=\u5904\u4e8e\u6b7b\u9501\u72b6\u6001\u7684\u5f53\u524d\u7ebf\u7a0b
149.38 -LBL_BREAKPOINT_HIT_TIP=\u9047\u5230\u65b0\u65ad\u70b9
149.39 -LBL_DEADLOCKED_THREAD_TIP=\u5904\u4e8e\u6b7b\u9501\u72b6\u6001\u7684\u7ebf\u7a0b
149.40 -
149.41 -LBL_SUSPEND_THREAD=\u6302\u8d77\u7ebf\u7a0b{0}
149.42 -LBL_RESUME_THREAD=\u6062\u590d\u7ebf\u7a0b{0}
149.43 -
149.44 -#InfoPanel
149.45 -LBL_OneNewHit=\u9047\u5230\u65b0\u65ad\u70b9
149.46 -LBL_NewHits=\u9047\u5230\u65b0\u65ad\u70b9 ({0})
149.47 -
149.48 -#Threads History action
149.49 -CTL_Session=\u4f1a\u8bdd{0}
149.50 -CTL_ThreadsHistoryAction=\u7ebf\u7a0b\u5386\u53f2\u8bb0\u5f55
149.51 -CTL_THREADS_CHOOSER=\u5f53\u524d\u7ebf\u7a0b\u9009\u62e9\u5668
149.52 -
149.53 -InfoPanel.hitsLabel.text=\u9047\u5230\u65b0\u65ad\u70b9
149.54 -
149.55 -
149.56 -InfoPanel.deadlocksLabel.text=\u68c0\u6d4b\u5230\u6b7b\u9501
149.57 -
149.58 -InfoPanel.debuggerDeadlocksLabelThread.text=\u6267\u884c\u7684\u6b65\u9aa4\u7531\u6302\u8d77\u7ebf\u7a0b ''{0}'' \u963b\u6b62\u3002
149.59 -InfoPanel.debuggerDeadlocksLabel.Method.text=\u65b9\u6cd5\u8c03\u7528\u7531\u5176\u4ed6\u6302\u8d77\u7ebf\u7a0b\u963b\u6b62\u3002
149.60 -InfoPanel.debuggerDeadlocksLabelThread.Method.text=\u65b9\u6cd5\u8c03\u7528\u7531\u6302\u8d77\u7ebf\u7a0b ''{0}'' \u963b\u6b62\u3002
149.61 -InfoPanel.debuggerDeadlocksLabel.text=\u6267\u884c\u7684\u6b65\u9aa4\u7531\u5176\u4ed6\u6302\u8d77\u7ebf\u7a0b\u963b\u6b62\u3002
149.62 -InfoPanel.debuggerDeadlocksLabel.tooltip=\u963b\u6b62\u7ebf\u7a0b\u662f: {0}\u3002
149.63 -InfoPanel.resumeDebuggerDeadlockLabelThread.text=\u662f\u5426\u6062\u590d\u6b64\u7ebf\u7a0b\u4ee5\u7ee7\u7eed?
149.64 -InfoPanel.resumeDebuggerDeadlockLabel.text=\u662f\u5426\u6062\u590d\u8fd9\u4e9b\u7ebf\u7a0b\u4ee5\u7ee7\u7eed?
149.65 -InfoPanel.resumeDebuggerDeadlockButton.text=\u6062\u590d
149.66 -InfoPanel.resumeDebuggerDeadlockButton.tooltip=\u6062\u590d\u7ebf\u7a0b{0}\u4ee5\u5b8c\u6210\u8be5\u6b65\u9aa4\u3002
149.67 -InfoPanel.resumeDebuggerDeadlockButton.Method.tooltip=\u6062\u590d\u7ebf\u7a0b{0}\u4ee5\u5b8c\u6210\u65b9\u6cd5\u8ba1\u7b97\u3002
149.68 -InfoPanel.resumeDebuggerDeadlockButtonThread.tooltip=\u6062\u590d\u7ebf\u7a0b ''{0}'' \u4ee5\u5b8c\u6210\u8be5\u6b65\u9aa4\u3002
149.69 -InfoPanel.resumeDebuggerDeadlockButtonThread.Method.tooltip=\u6062\u590d\u7ebf\u7a0b ''{0}'' \u4ee5\u5b8c\u6210\u65b9\u6cd5\u8ba1\u7b97\u3002
149.70 -DebuggingView.sessionComboBox.AccessibleContext.accessibleName=\u4f1a\u8bdd
149.71 -DebuggingView.sessionComboBox.AccessibleContext.accessibleDescription=\u8fd0\u884c\u7684\u4f1a\u8bdd\u5217\u8868\u3002
149.72 -DebuggingView.treeView.AccessibleContext.accessibleName=\u8c03\u8bd5\u6811
149.73 -DebuggingView.treeView.AccessibleContext.accessibleDescription=\u8c03\u8bd5\u7684 VM \u4e2d\u7684\u7ebf\u7a0b\u7684\u6811\u7ed3\u6784\u3002
149.74 -
149.75 -InfoPanel.stepBrkpLabel.text=\u6267\u884c\u7684\u6b65\u9aa4\u7531\u53e6\u4e00\u4e2a\u7ebf\u7a0b ''{0}'' \u4e2d\u7684\u65ad\u70b9\u4e2d\u65ad\u3002
149.76 -InfoPanel.stepBrkpIgnoreButton.text=\u5ffd\u7565\u65ad\u70b9
149.77 -InfoPanel.stepBrkpIgnoreButton.tooltip=\u8bf7\u5ffd\u7565\u6b64\u65ad\u70b9, \u5e76\u5b8c\u6210\u8be5\u6b65\u9aa4\u3002
149.78 -
150.1 --- a/src/zh_CN/java/debugger-jpda-ui/debugger-jpda-ui/org/netbeans/modules/debugger/jpda/ui/models/Bundle_zh_CN.properties Wed Feb 26 18:44:50 2014 -0800
150.2 +++ b/src/zh_CN/java/debugger-jpda-ui/debugger-jpda-ui/org/netbeans/modules/debugger/jpda/ui/models/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
150.3 @@ -214,7 +214,7 @@
150.4 CTL_Debugging_Column_Suspend_Name=\u5df2\u6302\u8d77(&S)
150.5 CTL_Debugging_Column_Suspend_Desc=\u6302\u8d77\u72b6\u6001
150.6
150.7 -CTL_Thread_State_Unknown=''{0}''
150.8 +
150.9 CTL_Thread_State_Monitor=''{0}'' \u6b63\u5728\u76d1\u89c6\u5668\u4e0a\u7b49\u5f85
150.10 CTL_Thread_State_Monitor_At=''{0}'' \u6b63\u5728\u76d1\u89c6\u5668\u4e0a\u7684 ''{1}'' \u5904\u7b49\u5f85
150.11 CTL_Thread_State_NotStarted=''{0}'' \u5c1a\u672a\u542f\u52a8
150.12 @@ -246,7 +246,7 @@
150.13 #VariablesNodeModel
150.14 CTL_LocalsModel_Column_Name_Desc=\u672c\u5730\u6839
150.15 CTL_LocalsModel_Column_Name_Name=\u540d\u79f0
150.16 -CTL_LocalsModel_Column_Name_SubArray=[{0} - {1}]
150.17 +
150.18 CTL_LocalsModel_Column_Descr_SubArray=\u6570\u7ec4\u5143\u7d20{0}\u5230{1}\u3002
150.19 NoCurrentThreadVar=\u6ca1\u6709\u8981\u663e\u793a\u7684\u53d8\u91cf, \u56e0\u4e3a\u4e0d\u5b58\u5728\u5f53\u524d\u7ebf\u7a0b\u3002
150.20 CTL_No_Info=\u65e0\u6cd5\u83b7\u53d6\u53d8\u91cf\u4fe1\u606f, \u672a\u4f7f\u7528 -g \u9009\u9879\u7f16\u8bd1\u6e90\u4ee3\u7801\u3002
151.1 --- a/src/zh_CN/java/debugger-jpda-visual/debugger-jpda-visual/org/netbeans/modules/debugger/jpda/visual/ui/Bundle_zh_CN.properties Wed Feb 26 18:44:50 2014 -0800
151.2 +++ b/src/zh_CN/java/debugger-jpda-visual/debugger-jpda-visual/org/netbeans/modules/debugger/jpda/visual/ui/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
151.3 @@ -56,7 +56,7 @@
151.4 TLTP_ZoomOut=\u7f29\u5c0f
151.5 LBL_ZoomOutA11yDescr=\u7f29\u5c0f\u5feb\u7167\u3002
151.6
151.7 -LBL_ZoomOrig=1:1
151.8 +
151.9 TLTP_ZoomOrig=\u7f29\u653e\u5230\u539f\u59cb\u5927\u5c0f
151.10 LBL_ZoomOrigA11yDescr=\u5c06\u5feb\u7167\u7f29\u653e\u5230\u539f\u59cb\u5927\u5c0f\u3002
151.11
152.1 --- a/src/zh_CN/java/debugger-jpda/debugger-jpda/org/netbeans/modules/debugger/jpda/breakpoints/Bundle_zh_CN.properties Wed Feb 26 18:44:50 2014 -0800
152.2 +++ b/src/zh_CN/java/debugger-jpda/debugger-jpda/org/netbeans/modules/debugger/jpda/breakpoints/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
152.3 @@ -53,7 +53,11 @@
152.4 MSG_NoField=\u7c7b{0}\u4e2d\u4e0d\u5b58\u5728\u5b57\u6bb5 ''{1}''\u3002
152.5 MSG_NoMethod=\u7c7b{0}\u4e2d\u4e0d\u5b58\u5728\u65b9\u6cd5 ''{1}''\u3002
152.6 MSG_NoMethodSign=\u7c7b{0}\u4e2d\u4e0d\u5b58\u5728\u5177\u6709\u7b7e\u540d ''{2}'' \u7684\u65b9\u6cd5 ''{1}''\u3002
152.7 +MSG_NoMethodEntry=\u76ee\u6807 VM \u4e0d\u652f\u6301\u65b9\u6cd5\u8fdb\u5165\u65ad\u70b9\u3002
152.8 +MSG_NoMethodExit=\u76ee\u6807 VM \u4e0d\u652f\u6301\u65b9\u6cd5\u9000\u51fa\u65ad\u70b9\u3002
152.9
152.10 MSG_NoFieldAccess=\u76ee\u6807 VM \u4e0d\u652f\u6301\u5b57\u6bb5\u8bbf\u95ee\u65ad\u70b9\u3002
152.11 MSG_NoFieldModification=\u76ee\u6807 VM \u4e0d\u652f\u6301\u5b57\u6bb5\u4fee\u6539\u65ad\u70b9\u3002
152.12
152.13 +MSG_RequestNotSupported=\u5728\u76ee\u6807 VM \u4e2d\u4e0d\u53d7\u652f\u6301\u3002
152.14 +
153.1 --- a/src/zh_CN/java/debugger-jpda/debugger-jpda/org/netbeans/modules/debugger/jpda/expr/Bundle_zh_CN.properties Wed Feb 26 18:44:50 2014 -0800
153.2 +++ b/src/zh_CN/java/debugger-jpda/debugger-jpda/org/netbeans/modules/debugger/jpda/expr/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
153.3 @@ -79,6 +79,7 @@
153.4 CTL_EvalError_arrayIndexNAN = \u6570\u7ec4\u7d22\u5f15 "{0}" \u4e0d\u662f\u6570\u5b57\u3002
153.5 CTL_EvalError_arrayIndexOutOfBounds = \u6570\u7ec4\u7d22\u5f15 "{0}" \u8d85\u51fa\u4e86\u8303\u56f4 <0,{1}>
153.6 CTL_EvalError_unknownVariable = "{0}" \u5728\u5f53\u524d\u4e0a\u4e0b\u6587\u4e2d\u4e0d\u662f\u5df2\u77e5\u53d8\u91cf\u3002
153.7 +CTL_EvalError_unknownVarNoDebugInfo = \u65e0\u6cd5\u83b7\u53d6\u53d8\u91cf\u4fe1\u606f, \u672a\u4f7f\u7528 -g \u9009\u9879\u7f16\u8bd1\u6e90\u4ee3\u7801\u3002"{0}" \u7684\u503c\u672a\u77e5\u3002
153.8 CTL_EvalError_integerLiteralTooBig = \u6574\u6570\u6587\u5b57 "{0}" \u8fc7\u957f\u3002\u8bf7\u4e3a\u957f\u503c\u4f7f\u7528 L \u540e\u7f00\u3002
153.9 CTL_EvalError_badFormatOfIntegerLiteral = \u65e0\u6cd5\u89e3\u6790\u6570\u5b57\u5b57\u7b26\u4e32 "{0}" (\u662f\u5426\u8fc7\u957f?)
153.10 CTL_EvalError_unknownLiteralType = \u65e0\u6cd5\u89e3\u6790\u6587\u5b57 "{0}"
154.1 --- a/src/zh_CN/java/debugger-jpda/debugger-jpda/org/netbeans/modules/debugger/jpda/models/Bundle_zh_CN.properties Wed Feb 26 18:44:50 2014 -0800
154.2 +++ b/src/zh_CN/java/debugger-jpda/debugger-jpda/org/netbeans/modules/debugger/jpda/models/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
154.3 @@ -79,13 +79,13 @@
154.4 # {0} and {1} represent two numbers.
154.5 # {0} - breakpoint hit count,
154.6 # {1} - break count (how many times the breakpoint actually broke the execution)
154.7 -MSG_HitCountWithBreakCount={0} / {1}
154.8 +
154.9 # {0}, {1} and {2} represent numbers:
154.10 # {0} - breakpoint hit count,
154.11 # {1} - break count (how many times the breakpoint actually broke the execution),
154.12 # {2} - remaining number of hits till the execution is broken.
154.13 MSG_HitCountWithBreakCountToBreak={0}/{1}, {2} (\u5230\u4e2d\u65ad\u4e3a\u6b62\u5269\u4f59\u7684\u547d\u4e2d\u6b21\u6570)
154.14 -MSG_HitCountUnknown=?
154.15 +
154.16 # {0} and {1} represent two numbers.
154.17 # {0} - breakpoint hit count,
154.18 # {1} - break count (how many times the breakpoint actually broke the execution)
155.1 --- a/src/zh_CN/java/form-j2ee/form-j2ee/org/netbeans/modules/form/j2ee/wizard/Bundle_zh_CN.properties Wed Feb 26 18:44:50 2014 -0800
155.2 +++ b/src/zh_CN/java/form-j2ee/form-j2ee/org/netbeans/modules/form/j2ee/wizard/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
155.3 @@ -56,13 +56,13 @@
155.4
155.5 LBL_ColumnsToInclude=\u8981\u5305\u542b\u7684\u5217(&I)
155.6
155.7 -LBL_MasterAddAll=>>
155.8
155.9 -LBL_MasterAdd=>
155.10
155.11 -LBL_MasterRemove=<
155.12
155.13 -LBL_MasterRemoveAll=<<
155.14 +
155.15 +
155.16 +
155.17 +
155.18
155.19 LBL_MasterUp=\u4e0a\u79fb(&U)
155.20
155.21 @@ -85,13 +85,13 @@
155.22 LBL_DetailColumnsToInclude=\u8981\u5305\u542b\u7684\u5217(&I)
155.23 LBL_DetailFieldsToInclude=\u8981\u5305\u542b\u7684\u5b57\u6bb5(&I)
155.24
155.25 -LBL_DetailAddAll=>>
155.26
155.27 -LBL_DetailAdd=>
155.28
155.29 -LBL_DetailRemove=<
155.30
155.31 -LBL_DetailRemoveAll=<<
155.32 +
155.33 +
155.34 +
155.35 +
155.36
155.37 LBL_DetailUp=\u4e0a\u79fb(&U)
155.38
156.1 --- a/src/zh_CN/java/form/form/org/netbeans/modules/form/Bundle_zh_CN.properties Wed Feb 26 18:44:50 2014 -0800
156.2 +++ b/src/zh_CN/java/form/form/org/netbeans/modules/form/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
156.3 @@ -110,12 +110,12 @@
156.4
156.5 # value type displayed as tooltip in property sheet for properties without description
156.6 # {0} = property value type name
156.7 -HINT_PropertyType=({0})
156.8 +
156.9
156.10 # value type displayed as tooltip in property sheet for properties having some description
156.11 # {0} = property value type name
156.12 # {1} = the original short description of the property
156.13 -HINT_PropertyTypeWithDescription=({0}) {1}
156.14 +
156.15
156.16 # RADComponent PropertySets
156.17 CTL_PropertiesTab=\u5c5e\u6027
156.18 @@ -330,7 +330,7 @@
156.19
156.20 # string used as chain link when building a location description in the tree,
156.21 # e.g. [JFrame]->container1->component1
156.22 -CTL_PathLink=->
156.23 +
156.24
156.25 # formatting of Error message when a layout initialization fails
156.26 # {0} = layout class name
156.27 @@ -389,11 +389,11 @@
156.28 # formatting of component node display name
156.29 # {0} = name of the component (typically variable name)
156.30 # {1} = short name of component class (without package)
156.31 -FMT_ComponentNodeName={0} [{1}]
156.32 +
156.33
156.34 # formatting of component node display name for a component without a name
156.35 # {0} = short name of component class (without package)
156.36 -FMT_UnnamedComponentNodeName=[{0}]
156.37 +
156.38
156.39 # formatting of form root node display name
156.40 # {0} = name of the form (class name)
156.41 @@ -435,7 +435,7 @@
156.42 # {0} = current designer width
156.43 # {1} = current designer height
156.44 FMT_HINT_DesignerResizing=[{0}, {1}] \u8981\u66f4\u6539\u8bbe\u8ba1\u5668\u7684\u5927\u5c0f, \u8bf7\u62d6\u52a8\u6216\u53cc\u51fb\u8fb9\u6846\u3002
156.45 -FMT_HINT_DesignerSize=[{0}, {1}]
156.46 +
156.47 CTL_SetDesignerSize_Title=\u8bbe\u7f6e\u7a97\u4f53\u8bbe\u8ba1\u5668\u5927\u5c0f
156.48 CTL_SetDesignerSize_Label=\u65b0\u5927\u5c0f (\u5bbd\u5ea6, \u9ad8\u5ea6)(&N):
156.49
156.50 @@ -596,16 +596,16 @@
156.51 # Formatting of display value for connection to property
156.52 # {0} = name of the component to obtain the property from
156.53 # {1} = name of the property
156.54 -FMT_PROPERTY_CONN=<{0}.{1}>
156.55 +
156.56
156.57 # Formatting of display value for connection to bean
156.58 # {0} = name of the component to obtain the property from
156.59 -FMT_BEAN_CONN=<{0}>
156.60 +
156.61
156.62 # Formatting of display value for connection to property
156.63 # {0} = name of the component to call the method on
156.64 # {1} = name of the method
156.65 -FMT_METHOD_CONN=<{0}.{1}>
156.66 +
156.67
156.68 # Formatting of display value for connection to value
156.69 # {0} = the value string
156.70 @@ -880,13 +880,13 @@
156.71
156.72 MSG_ListSelector_Down=\u4e0b\u79fb(&D)
156.73
156.74 -MSG_ListSelector_Add=>
156.75
156.76 -MSG_ListSelector_AddAll=>>
156.77
156.78 -MSG_ListSelector_Remove=<
156.79
156.80 -MSG_ListSelector_RemoveAll=<<
156.81 +
156.82 +
156.83 +
156.84 +
156.85
156.86
156.87 # Form Connection custom property editor
157.1 --- a/src/zh_CN/java/form/form/org/netbeans/modules/form/actions/Bundle_zh_CN.properties Wed Feb 26 18:44:50 2014 -0800
157.2 +++ b/src/zh_CN/java/form/form/org/netbeans/modules/form/actions/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
157.3 @@ -106,7 +106,7 @@
157.4 # Formatting od event popup menu item, if it has exactly one handler
157.5 # {0}=name of event
157.6 # {1}=name of event handler
157.7 -FMT_CTL_EventOneHandler={0} [{1}]
157.8 +
157.9
157.10 # Formatting od event popup menu item, if it has more than one handler
157.11 # {0}=name of event
158.1 --- a/src/zh_CN/java/hibernate/hibernate/org/netbeans/modules/hibernate/wizards/Bundle_zh_CN.properties Wed Feb 26 18:44:50 2014 -0800
158.2 +++ b/src/zh_CN/java/hibernate/hibernate/org/netbeans/modules/hibernate/wizards/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
158.3 @@ -45,7 +45,7 @@
158.4 HibernateMappingWizardPanel.jLabel1.text=\u8981\u6620\u5c04\u7684\u7c7b(&M):
158.5 LBL_PrimaryKeyClass=\u8981\u6620\u5c04\u7684\u7c7b:
158.6 LBL_HibernateMappingPanel_Name=\u9009\u62e9\u6620\u5c04\u7c7b
158.7 -HibernateMappingWizardPanel.browseButton.text=&...
158.8 +
158.9 HibernateMappingWizardPanel.jLabel2.text=\u914d\u7f6e\u6587\u4ef6(&C):
158.10 HibernateMappingWizardPanel.jLabel3.text=\u6570\u636e\u5e93\u8868(&D):
158.11
159.1 --- a/src/zh_CN/java/hibernate/hibernate/org/netbeans/modules/hibernate/wizards/support/Bundle_zh_CN.properties Wed Feb 26 18:44:50 2014 -0800
159.2 +++ b/src/zh_CN/java/hibernate/hibernate/org/netbeans/modules/hibernate/wizards/support/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
159.3 @@ -70,7 +70,7 @@
159.4 # {1} = a table name
159.5 LBL_TableList={0}\u548c{1}
159.6 # note the space after the comma
159.7 -LBL_TableListSep=,
159.8 +
159.9 # {0] = a list of tables
159.10 LBL_RelatedTableRefBy={0}\u5f15\u7528\u7684\u8868
159.11 # {0] = a list of tables
160.1 --- a/src/zh_CN/java/hibernate4lib/hibernate4lib/org/netbeans/modules/hibernate4lib/resources/Bundle_zh_CN.properties Wed Feb 26 18:44:50 2014 -0800
160.2 +++ b/src/zh_CN/java/hibernate4lib/hibernate4lib/org/netbeans/modules/hibernate4lib/resources/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
160.3 @@ -40,8 +40,8 @@
160.4 # Version 2 license, then the option applies only if the new code is
160.5 # made subject to such option by the copyright holder.
160.6
160.7 -hibernate4-support=Hibernate 4.x
160.8 +
160.9 jpa2-persistence=\u6301\u4e45\u6027 JPA 2.0
160.10 -hibernate4-persistence=Hibernate 4.x (JPA 2.0)
160.11 -hibernate4-persistencemodelgen=Hibernate 4.x Modelgen
160.12
160.13 +
160.14 +
161.1 --- a/src/zh_CN/java/j2ee-persistence/j2ee-persistence/org/netbeans/modules/j2ee/persistence/wizard/fromdb/Bundle_zh_CN.properties Wed Feb 26 18:44:50 2014 -0800
161.2 +++ b/src/zh_CN/java/j2ee-persistence/j2ee-persistence/org/netbeans/modules/j2ee/persistence/wizard/fromdb/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
161.3 @@ -72,7 +72,7 @@
161.4 TXT_GenerateFinderMethods=\u4e3a CMP \u5b57\u6bb5\u751f\u6210 finder \u65b9\u6cd5(&G)
161.5 # {0} = a source group name, like Source Packages or Configuration Files
161.6 # {1} = the relative path of the dbschema file
161.7 -LBL_SchemaLocation={0}: {1}
161.8 +
161.9 LBL_IncludeRelatedTables=\u5305\u62ec\u76f8\u5173\u8868(&I)
161.10 TXT_IncludeRelatedTables=\u5305\u62ec\u76f8\u5173\u8868
161.11 ERR_MissingServer=<html>\u672a\u6b63\u786e\u8bbe\u7f6e\u9879\u76ee\u7684\u76ee\u6807\u670d\u52a1\u5668\u3002Java \u6301\u4e45\u6027\u529f\u80fd<br>\u4f9d\u8d56\u4e8e\u670d\u52a1\u5668; \u5982\u679c\u672a\u6307\u5b9a\u76ee\u6807\u670d\u52a1\u5668, <br>IDE \u4e2d\u7684\u67d0\u4e9b\u5411\u5bfc\u53ef\u80fd\u65e0\u6cd5\u6309\u9884\u671f\u65b9\u5f0f\u5de5\u4f5c\u3002</html>
161.12 @@ -152,7 +152,7 @@
161.13 # {1} = a table name
161.14 LBL_TableList={0}\u548c{1}
161.15 # note the space after the comma
161.16 -LBL_TableListSep=,
161.17 +
161.18 # {0] = a list of tables
161.19 LBL_RelatedTableRefBy={0}\u5f15\u7528\u7684\u8868
161.20 # {0] = a list of tables
162.1 --- a/src/zh_CN/java/java-api-common/java-api-common/org/netbeans/modules/java/api/common/project/ui/Bundle_zh_CN.properties Wed Feb 26 18:44:50 2014 -0800
162.2 +++ b/src/zh_CN/java/java-api-common/java-api-common/org/netbeans/modules/java/api/common/project/ui/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
162.3 @@ -61,7 +61,7 @@
162.4 TXT_UnknownPlatform=\u6b63\u5728\u52a0\u8f7d...
162.5
162.6 #ProjectNode
162.7 -TXT_UnknownProjectName=???
162.8 +
162.9
162.10 CTL_OpenProject=\u6253\u5f00\u9879\u76ee
162.11
163.1 --- a/src/zh_CN/java/java-hints-ui/java-hints-ui/org/netbeans/modules/java/hints/spiimpl/refactoring/Bundle_zh_CN.properties Wed Feb 26 18:44:50 2014 -0800
163.2 +++ b/src/zh_CN/java/java-hints-ui/java-hints-ui/org/netbeans/modules/java/hints/spiimpl/refactoring/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
163.3 @@ -68,10 +68,10 @@
163.4 ScopesPanel.add.text=\u6dfb\u52a0
163.5 ScopesPanel.jLabel2.text=\u4f5c\u7528\u57df(&S):
163.6 FindDuplicatesRefactoringPanel.verify.text=\u5982\u679c\u53ef\u80fd, \u5219\u68c0\u67e5\u5b9e\u4f8b (\u8f83\u6162)
163.7 -FindDuplicatesRefactoringPanel.removeAllHints.text=<<
163.8 -FindDuplicatesRefactoringPanel.removeHint.text=<
163.9 -FindDuplicatesRefactoringPanel.addAllHints.text=>>
163.10 -FindDuplicatesRefactoringPanel.addHint.text=>
163.11 +
163.12 +
163.13 +
163.14 +
163.15 FindDuplicatesRefactoringPanel.selectedHintsLabel.text=\u9009\u5b9a\u7684\u63d0\u793a
163.16 FindDuplicatesRefactoringPanel.allHintsLabel.text=\u6240\u6709\u63d0\u793a:
163.17 FindDuplicatesRefactoringPanel.customPattern.text=\u5b9a\u5236\u6a21\u5f0f(&C)
164.1 --- a/src/zh_CN/java/java-hints/java-hints/org/netbeans/modules/java/hints/bugs/Bundle_zh_CN.properties Wed Feb 26 18:44:50 2014 -0800
164.2 +++ b/src/zh_CN/java/java-hints/java-hints/org/netbeans/modules/java/hints/bugs/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
164.3 @@ -165,7 +165,7 @@
164.4 TEXT_BroadCatchExceptionListEnd={0}\u548c{1}
164.5 # {0} - preceding items as text
164.6 # {1} - next item
164.7 -TEXT_BroadCatchExceptionListMiddle={0}, {1}
164.8 +
164.9 # {0} - starting item
164.10
164.11 # {0} - the catched exception type
164.12 @@ -177,7 +177,7 @@
164.13 TEXT_CloneableWithoutClone=Cloneable \u7c7b\u672a\u5b9e\u73b0 clone()
164.14 TEXT_CloneWithoutCloneable=clone() \u5728\u975e Cloneable \u7c7b\u4e2d
164.15 TEXT_CloneWithoutCloneNotSupported=clone() \u672a\u629b\u51fa CloneNotSupportedException
164.16 -TEXT_CloneWithoutSuperClone=clone() \u8c03\u7528 super.clone()
164.17 +TEXT_CloneWithoutSuperClone=clone() \u672a\u8c03\u7528 super.clone()
164.18 # {0} - parameter name
164.19 TEXT_ComparatorParameterNotUsed=Comparator.comparable \u4e0d\u4f7f\u7528\u53c2\u6570 ''{0}''
164.20 TEXT_ConfusingNullPassedToVararg=\u4f20\u9012\u5230 vararg \u65b9\u6cd5\u7684\u6df7\u4e71\u7684 null
164.21 @@ -225,7 +225,7 @@
164.22 ERR_UnbalancedCollectionREAD=\u4ece\u672a\u6dfb\u52a0\u5230\u96c6\u5408\u4e2d
164.23 ERR_UnbalancedCollectionWRITE=\u4ec5\u6dfb\u52a0\u5230\u96c6\u5408\u4e2d, \u4ece\u672a\u4ece\u96c6\u5408\u4e2d\u8bfb\u53d6
164.24
164.25 -DN_org.netbeans.modules.java.hints.bugs.CheckReturnValueHint=@CheckReturnValue
164.26 +
164.27 DESC_org.netbeans.modules.java.hints.bugs.CheckReturnValueHint=\u9a8c\u8bc1\u662f\u5426\u786e\u5b9e\u9009\u4e2d\u4e86\u6807\u6709 @CheckReturnValue \u7684\u65b9\u6cd5\u7684\u7ed3\u679c\u3002
164.28 ERR_org.netbeans.modules.java.hints.bugs.CheckReturnValueHint=\u5e94\u8be5\u68c0\u67e5\u65b9\u6cd5\u8fd4\u56de\u503c
164.29
164.30 @@ -324,6 +324,6 @@
164.31 DN_ThrowableMethodResultIgnored=\u5ffd\u7565 Throwable \u65b9\u6cd5\u7ed3\u679c
164.32 DESC_ThrowableMethodResultIgnored=\u5982\u679c\u4ece\u65b9\u6cd5\u8c03\u7528\u4f5c\u4e3a<i>\u8fd4\u56de\u503c</i>\u8fd4\u56de Throwable (\u76f8\u5bf9\u4e8e\u5f15\u53d1), \u5219\u901a\u5e38\u4f1a\u4ee5\u67d0\u79cd\u65b9\u5f0f\u8fdb\u884c\u8bb0\u5f55 (\u5206\u914d), \u8fdb\u4e00\u6b65\u5904\u7406 (\u4f20\u9012\u5230\u5176\u4ed6\u65b9\u6cd5\u8c03\u7528) \u6216\u5f15\u53d1\u3002\u5ffd\u7565\u6b64\u7c7b Throwable \u6216\u5728\u67d0\u79cd\u7b80\u5355\u6bd4\u8f83\u4e2d\u4f7f\u7528\u5219\u6307\u793a\u9519\u8bef\u5904\u7406\u7f3a\u9677, \u6216\u65b9\u6cd5\u5e94\u8fd4\u56de\u5176\u4ed6\u503c\u4ee5\u8282\u7701 Throwable \u7684\u5806\u6808\u8ddf\u8e2a\u521b\u5efa\u65f6\u95f4\u3002
164.33
164.34 -DN_MissingSwitchcase=\u53ef\u80fd\u7f3a\u5c11 switch `case'' \u8bed\u53e5
164.35 +DN_MissingSwitchcase=\u53ef\u80fd\u7f3a\u5c11 switch "case" \u8bed\u53e5
164.36 DESC_MissingSwitchcase=\u6b64\u63d0\u793a\u68c0\u6d4b <b>switch \u8bed\u53e5</b> (\u4e0d\u5e26 <b>case</b> \u8bed\u53e5\u7684\u6807\u7b7e) \u4e2d\u7684\u8f93\u5165\u9519\u8bef\u3002<p/>\u5982\u679c\u662f\u4ee5\u4e0b\u8bed\u53e5\u7684\u9884\u671f\u6807\u7b7e, \u5219\u4e5f\u53ef\u4ee5\u662f\u5fd8\u8bb0\u4e86\u5173\u952e\u5b57\u7684\u9884\u671f <b>case</b> \u5206\u652f\u3002
164.37
165.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
165.2 +++ b/src/zh_CN/java/java-hints/java-hints/org/netbeans/modules/java/hints/resources/default_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
165.3 @@ -0,0 +1,2 @@
165.4 +display.name=\u9ed8\u8ba4
165.5 +
166.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
166.2 +++ b/src/zh_CN/java/java-hints/java-hints/org/netbeans/modules/java/hints/resources/jdk5_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
166.3 @@ -0,0 +1,2 @@
166.4 +display.name=\u8fc1\u79fb\u81f3 JDK 5
166.5 +
167.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
167.2 +++ b/src/zh_CN/java/java-hints/java-hints/org/netbeans/modules/java/hints/resources/jdk7_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
167.3 @@ -0,0 +1,2 @@
167.4 +display.name=\u8fc1\u79fb\u81f3 JDK 7
167.5 +
168.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
168.2 +++ b/src/zh_CN/java/java-hints/java-hints/org/netbeans/modules/java/hints/resources/jdk8_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
168.3 @@ -0,0 +1,3 @@
168.4 +# Default properties of 'Convert to JDK8' configuration
168.5 +display.name=\u8fc1\u79fb\u81f3 JDK 8
168.6 +
169.1 --- a/src/zh_CN/java/java-hints/java-hints/org/netbeans/modules/java/hints/suggestions/Bundle_zh_CN.properties Wed Feb 26 18:44:50 2014 -0800
169.2 +++ b/src/zh_CN/java/java-hints/java-hints/org/netbeans/modules/java/hints/suggestions/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
169.3 @@ -171,7 +171,7 @@
169.4 TEXT_TooStrongCastListLast={0}\u6216{1}
169.5 # {0} - the preceding portion of list
169.6 # {1} - the type name
169.7 -TEXT_TooStrongCastListMiddle={0}, {1}
169.8 +
169.9 # {0} - the type simple name
169.10 TEXT_UnnecessaryCast=\u4e0d\u5fc5\u8981\u7684\u8f6c\u6362\u5230{0}
169.11
170.1 --- a/src/zh_CN/java/java-j2seproject/java-j2seproject/org/netbeans/modules/java/j2seproject/ui/Bundle_zh_CN.properties Wed Feb 26 18:44:50 2014 -0800
170.2 +++ b/src/zh_CN/java/java-j2seproject/java-j2seproject/org/netbeans/modules/java/j2seproject/ui/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
170.3 @@ -80,7 +80,7 @@
170.4 TXT_BrokenPlatform=\u4e2d\u65ad\u7684\u5e73\u53f0
170.5
170.6 #ProjectNode
170.7 -TXT_UnknownProjectName=???
170.8 +
170.9
170.10 CTL_OpenProject=\u6253\u5f00\u9879\u76ee
170.11
171.1 --- a/src/zh_CN/java/java-source/java-source/org/netbeans/modules/java/ui/Bundle_zh_CN.properties Wed Feb 26 18:44:50 2014 -0800
171.2 +++ b/src/zh_CN/java/java-source/java-source/org/netbeans/modules/java/ui/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
171.3 @@ -258,7 +258,7 @@
171.4 LBL_imp_separateGroups=\u5355\u72ec\u7684\u7ec4
171.5 LBL_imp_allOtherImports=<\u6240\u6709\u5176\u4ed6\u5bfc\u5165>
171.6 LBL_imp_Package=\u5305
171.7 -LBL_imp_WithSub=*
171.8 +
171.9 LBL_imp_Static=\u9759\u6001
171.10
171.11
172.1 --- a/src/zh_CN/java/java-sourceui/java-sourceui/org/netbeans/modules/java/source/ui/Bundle_zh_CN.properties Wed Feb 26 18:44:50 2014 -0800
172.2 +++ b/src/zh_CN/java/java-sourceui/java-sourceui/org/netbeans/modules/java/source/ui/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
172.3 @@ -51,5 +51,5 @@
172.4 MSG_JavaSymbols=Java \u7b26\u53f7
172.5
172.6 LBL_FastJavaIndex=Java \u7c7b\u578b\u7684\u521d\u59cb\u7d22\u5f15
172.7 -FMT_TypeContextName= ( {0} )
172.8
172.9 +
173.1 --- a/src/zh_CN/java/junit/junit/org/netbeans/modules/junit/Bundle_zh_CN.properties Wed Feb 26 18:44:50 2014 -0800
173.2 +++ b/src/zh_CN/java/junit/junit/org/netbeans/modules/junit/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
173.3 @@ -277,9 +277,9 @@
173.4 PROP_generate_tearDown=\u751f\u6210\u6d4b\u8bd5\u7ec8\u7ed3\u65b9\u6cd5
173.5 HINT_generate_tearDown=tearDown() \u6216 @After
173.6 PROP_generate_class_setUp=\u751f\u6210\u6d4b\u8bd5\u7c7b\u521d\u59cb\u5316\u7a0b\u5e8f
173.7 -HINT_generate_class_setUp=@BeforeClass
173.8 +
173.9 PROP_generate_class_tearDown=\u751f\u6210\u6d4b\u8bd5\u7c7b\u7ec8\u7ed3\u65b9\u6cd5
173.10 -HINT_generate_class_tearDown=@AfterClass
173.11 +
173.12
173.13
173.14
173.15 @@ -417,7 +417,7 @@
173.16
173.17 # separators used between reasons in a report about skipped classes
173.18 # the " " are stripped, they are included to correctly represent spaces
173.19 -COMMA=", "
173.20 +
173.21
173.22 # used to separate the last reason in a disjunctive sentence like:
173.23 # Some classes were skipped because they were abstract OR package private
174.1 --- a/src/zh_CN/java/junit/junit/org/netbeans/modules/junit/output/Bundle_zh_CN.properties Wed Feb 26 18:44:50 2014 -0800
174.2 +++ b/src/zh_CN/java/junit/junit/org/netbeans/modules/junit/output/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
174.3 @@ -46,7 +46,7 @@
174.4 ACSN_TestResults=JUnit \u6d4b\u8bd5\u7ed3\u679c
174.5 ACSD_TestResults=\u663e\u793a\u901a\u8fc7\u7684\u6d4b\u8bd5\u548c\u5931\u8d25\u7684\u6d4b\u8bd5\u53ca\u5176\u751f\u6210\u7684\u8f93\u51fa\u7684\u76f8\u5173\u4fe1\u606f
174.6 COMPOUND_SUITE=<\u590d\u5408\u5957\u4ef6>
174.7 -UNNKOWN_NAME=???
174.8 +
174.9 MSG_NoTestExecuted=\u6ca1\u6709\u6267\u884c\u4efb\u4f55\u6d4b\u8bd5\u3002
174.10 MSG_TestInterruptedNoResults=\u8fd0\u884c\u7684\u6d4b\u8bd5\u5df2\u4e2d\u65ad\u3002\u65e0\u53ef\u7528\u7ed3\u679c\u3002
174.11 LBL_resultTreeView=\u7edf\u8ba1\u4fe1\u606f
174.12 @@ -77,7 +77,7 @@
174.13
174.14 MSG_ProgressMessage=\u6b63\u5728\u8fd0\u884c JUnit \u6d4b\u8bd5...
174.15 # "foo.bar.baz.MyClassTest (3/8)"
174.16 -MSG_ProgressStepMessage={0} ({1}/{2})
174.17 +
174.18 # "test suite 3/8" (running third suite out of eight suites)
174.19 MSG_ProgressStepMessageAnonymous=\u6d4b\u8bd5\u5957\u4ef6 {1}/{2}
174.20
175.1 --- a/src/zh_CN/java/maven-repository/maven-repository/org/netbeans/modules/maven/repository/Bundle_zh_CN.properties Wed Feb 26 18:44:50 2014 -0800
175.2 +++ b/src/zh_CN/java/maven-repository/maven-repository/org/netbeans/modules/maven/repository/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
175.3 @@ -82,6 +82,7 @@
175.4 TXT_ArtifactId=ArtifactId:
175.5 TXT_Partial_result=<\u65e0\u7ed3\u679c, \u6b63\u5728\u5904\u7406\u7d22\u5f15...>
175.6 TXT_Version=\u7248\u672c:
175.7 +TXT_Repository=\u8d44\u6599\u6863\u6848\u5e93:
175.8 TXT_Packaging=\u6253\u5305:
175.9 TXT_Name=\u540d\u79f0:
175.10 TXT_HasJavadoc=\u6709 Javadoc:
176.1 --- a/src/zh_CN/java/maven/maven/org/netbeans/modules/maven/nodes/Bundle_zh_CN.properties Wed Feb 26 18:44:50 2014 -0800
176.2 +++ b/src/zh_CN/java/maven/maven/org/netbeans/modules/maven/nodes/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
176.3 @@ -189,7 +189,7 @@
176.4 ICON_SourceBadge=\u4f9d\u8d56\u5173\u7cfb\u5177\u6709\u672c\u5730\u53ef\u7528\u7684\u6e90 JAR
176.5 ICON_MissingBadge=\u5c1a\u672a\u4e0b\u8f7d\u4f9d\u8d56\u5173\u7cfb\u3002\u8bf7\u6784\u5efa\u9879\u76ee\u4ee5\u66f4\u6b63\u9519\u8bef\u3002
176.6 ICON_ManagedBadge=\u4f9d\u8d56\u5173\u7cfb\u7684\u7248\u672c\u5c06\u8fdb\u884c\u7ba1\u7406
176.7 -ICON_PreferSourcesBadge=\u6700\u7ec8\u5de5\u4ef6\u5305\u542b\u7b2c\u4e09\u65b9\u7c7b\u6587\u4ef6, NetBeans \u65e0\u6cd5\u5c06\u9879\u76ee\u94fe\u63a5\u5728\u4e00\u8d77\u3002\u50cf\u91cd\u6784\u8fd9\u6837\u7684\u4e00\u4e9b\u529f\u80fd\u5c06\u53d7\u5230\u9650\u5236\u3002
176.8 +ICON_PreferSourcesBadge=NetBeans \u65e0\u6cd5\u5c06\u9879\u76ee\u94fe\u63a5\u5728\u4e00\u8d77, \u672a\u76f4\u63a5\u4f7f\u7528\u4f9d\u8d56\u5173\u7cfb\u9879\u76ee\u6e90\u3002\u6700\u7ec8\u5de5\u4ef6\u53ef\u80fd\u5305\u542b\u7b2c\u4e09\u65b9\u7c7b\u6587\u4ef6 (\u5e26\u6709\u7c7b\u5143, maven-shade-plugin, osgi \u5305\u7b49\u7684\u5de5\u4ef6)\u3002\u50cf\u91cd\u6784\u8fd9\u6837\u7684\u4e00\u4e9b\u529f\u80fd\u5c06\u53d7\u5230\u9650\u5236\u3002
176.9
176.10
176.11
177.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
177.2 +++ b/src/zh_CN/java/nashorn-execution/nashorn-execution/org/netbeans/modules/nashorn/execution/options/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
177.3 @@ -0,0 +1,53 @@
177.4 +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
177.5 +#
177.6 +# Copyright 1997-2013 Oracle and/or its affiliates. All rights reserved.
177.7 +#
177.8 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
177.9 +# Other names may be trademarks of their respective owners.
177.10 +#
177.11 +# The contents of this file are subject to the terms of either the GNU
177.12 +# General Public License Version 2 only ("GPL") or the Common
177.13 +# Development and Distribution License("CDDL") (collectively, the
177.14 +# "License"). You may not use this file except in compliance with the
177.15 +# License. You can obtain a copy of the License at
177.16 +# http://www.netbeans.org/cddl-gplv2.html
177.17 +# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
177.18 +# specific language governing permissions and limitations under the
177.19 +# License. When distributing the software, include this License Header
177.20 +# Notice in each file and include the License file at
177.21 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
177.22 +# particular file as subject to the "Classpath" exception as provided
177.23 +# by Oracle in the GPL Version 2 section of the License file that
177.24 +# accompanied this code. If applicable, add the following below the
177.25 +# License Header, with the fields enclosed by brackets [] replaced by
177.26 +# your own identifying information:
177.27 +# "Portions Copyrighted [year] [name of copyright owner]"
177.28 +#
177.29 +# Contributor(s):
177.30 +#
177.31 +# The Original Software is NetBeans. The Initial Developer of the Original
177.32 +# Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
177.33 +# Microsystems, Inc. All Rights Reserved.
177.34 +#
177.35 +# If you wish your version of this file to be governed by only the CDDL
177.36 +# or only the GPL Version 2, indicate your decision by adding
177.37 +# "[Contributor] elects to include this software in this distribution
177.38 +# under the [CDDL or GPL Version 2] license." If you do not indicate a
177.39 +# single choice of license, a recipient has the option to distribute
177.40 +# your version of this file under either the CDDL, the GPL Version 2 or
177.41 +# to extend the choice of license to its licensees as provided above.
177.42 +# However, if you add GPL Version 2 code and therefore, elected the GPL
177.43 +# Version 2 license, then the option applies only if the new code is
177.44 +# made subject to such option by the copyright holder.
177.45 +
177.46 +LBL_JavaScript=JavaScript
177.47 +KW_JavaScript=JavaScript,Nashorn
177.48 +JavaScriptNashornPanel.platformsLabel.text=Java \u5e73\u53f0(&P):
177.49 +JavaScriptNashornPanel.platformManageButton.text=\u7ba1\u7406\u5e73\u53f0(&M)...
177.50 +JavaScriptNashornPanel.platformHintLabel.text=\u9700\u8981 Java 8 \u6216\u66f4\u9ad8\u7248\u672c\u3002
177.51 +JavaScriptNashornPanel.engineOptionsLabel.text=\u5f15\u64ce\u9009\u9879(&O):
177.52 +
177.53 +JavaScriptNashornPanel.argumentsLabel.text=\u53c2\u6570(&A):
177.54 +
177.55 +JavaScriptNashornPanel.infoLabel.text=\u901a\u8fc7 Java \u5e73\u53f0 (Nashorn \u5f15\u64ce) \u6267\u884c JavaScript \u6587\u4ef6:
177.56 +
178.1 --- a/src/zh_CN/java/refactoring-java/refactoring-java/org/netbeans/modules/refactoring/java/plugins/Bundle_zh_CN.properties Wed Feb 26 18:44:50 2014 -0800
178.2 +++ b/src/zh_CN/java/refactoring-java/refactoring-java/org/netbeans/modules/refactoring/java/plugins/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
178.3 @@ -77,6 +77,8 @@
178.4 ERR_ReplaceWrongType=\u65e0\u6cd5\u4f7f\u7528\u6b64\u5bf9\u8c61\u7684\u5de5\u5382\u66ff\u6362\u6784\u9020\u51fd\u6570\u3002\u5fc5\u987b\u9009\u62e9\u6784\u9020\u51fd\u6570\u3002
178.5 # --- SAFE DELETE REFACTORING ------------------------------------------------------
178.6 ERR_SafeDel=\u5220\u9664<b>{0}</b>\u65f6\u51fa\u73b0\u9519\u8bef
178.7 +# {0} - VariableName
178.8 +ERR_VarNotInBlockOrMethod=\u53d8\u91cf "{0}" \u4e0d\u5728\u5757\u6216\u65b9\u6cd5\u58f0\u660e\u5185\u90e8\u3002
178.9 # {0} - Shortcut text
178.10 INFO_PressAgain=\u518d\u6b21\u6309{0}\u4ee5\u663e\u793a\u201c\u91cd\u6784\u201d\u5bf9\u8bdd\u6846
178.11 LBL_ParametersCheck=\u6b63\u5728\u68c0\u67e5\u53c2\u6570...
179.1 --- a/src/zh_CN/java/testng/testng/org/netbeans/modules/testng/output/Bundle_zh_CN.properties Wed Feb 26 18:44:50 2014 -0800
179.2 +++ b/src/zh_CN/java/testng/testng/org/netbeans/modules/testng/output/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
179.3 @@ -40,5 +40,5 @@
179.4 LBL_GotoSource=\u8f6c\u81f3\u6e90
179.5 LBL_RerunTest=\u91cd\u65b0\u8fd0\u884c
179.6 LBL_DebugTest=\u8c03\u8bd5
179.7 -UNKNOWN_NAME=???
179.8
179.9 +
180.1 --- a/src/zh_CN/java/testng/testng/org/netbeans/modules/testng/ui/Bundle_zh_CN.properties Wed Feb 26 18:44:50 2014 -0800
180.2 +++ b/src/zh_CN/java/testng/testng/org/netbeans/modules/testng/ui/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
180.3 @@ -1,5 +1,5 @@
180.4 AND=\ \u4e0e
180.5 -COMMA=,
180.6 +
180.7 # {0} - class name
180.8 FMT_generator_status_creating=\u6b63\u5728\u521b\u5efa: {0}...
180.9 # {0} - source folder
181.1 --- a/src/zh_CN/javacard/javacard-project/javacard-project/org/netbeans/modules/javacard/options/Bundle_zh_CN.properties Wed Feb 26 18:44:50 2014 -0800
181.2 +++ b/src/zh_CN/javacard/javacard-project/javacard-project/org/netbeans/modules/javacard/options/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
181.3 @@ -45,7 +45,7 @@
181.4 JavaCardOptionsCategory_Title=Java Card
181.5 KW_JavaCardOptions=Java,Card,JavaCard,Java Card,SmartCard,\u667a\u80fd
181.6
181.7 -JavacardOptions.problemLabel.text=
181.8 +
181.9 JavacardOptions.jLabel1.text=\u9ed8\u8ba4 RID
181.10 JavacardOptions.jLabel2.text=<html>RID \u662f\u7531\u56fd\u9645\u6807\u51c6\u5316\u7ec4\u7ec7 (International Standards Organization, ISO) \u63d0\u4f9b\u7684\u56fd\u5bb6/\u5730\u533a\u6ce8\u518c\u5e94\u7528\u7a0b\u5e8f\u63d0\u4f9b\u5546 ID\u3002\u5b83\u662f\u4e00\u4e2a 5 \u4e2a\u5b57\u8282\u7684\u6570\u503c\u3002\u5728\u7528\u4e8e\u5f00\u53d1\u65f6, \u53ef\u5c06\u5176\u8bbe\u7f6e\u4e3a\u4efb\u610f\u6240\u9700\u503c\u3002\u8981\u83b7\u53d6\u4e00\u4e2a RID \u4ee5\u4fbf\u6267\u884c\u90e8\u7f72, \u8bf7\u8054\u7cfb ISO\u3002<p> <p>\u5728\u751f\u6210\u9879\u76ee\u7684\u90e8\u7f72 ID \u65f6, \u5c06\u4f7f\u7528\u6b64\u503c\u3002\u521d\u59cb\u503c\u662f\u968f\u673a\u7684\u3002\u53ef\u8f93\u5165\u5341\u516d\u8fdb\u5236\u503c\u3002
181.11
182.1 --- a/src/zh_CN/javacard/javacard-project/javacard-project/org/netbeans/modules/javacard/wizard/Bundle_zh_CN.properties Wed Feb 26 18:44:50 2014 -0800
182.2 +++ b/src/zh_CN/javacard/javacard-project/javacard-project/org/netbeans/modules/javacard/wizard/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
182.3 @@ -51,7 +51,7 @@
182.4 PROJECT_LOCATION=\u9879\u76ee\u4f4d\u7f6e(&L)
182.5 BROWSE=\u6d4f\u89c8(&O)...
182.6 PROJECT_FOLDER=\u9879\u76ee\u6587\u4ef6\u5939(&F)
182.7 -yourpackagename=com.foo.yourproject
182.8 +
182.9 WEB_CONTEXT_PATH=Web \u4e0a\u4e0b\u6587\u8def\u5f84
182.10 APPLET_AID=\u5c0f\u5e94\u7528\u7a0b\u5e8f AID
182.11 INITIAL_PATH=/hello
183.1 --- a/src/zh_CN/javacard/javacard-ri-platform/javacard-ri-platform/org/netbeans/modules/javacard/ri/platform/installer/Bundle_zh_CN.properties Wed Feb 26 18:44:50 2014 -0800
183.2 +++ b/src/zh_CN/javacard/javacard-ri-platform/javacard-ri-platform/org/netbeans/modules/javacard/ri/platform/installer/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
183.3 @@ -112,7 +112,7 @@
183.4 MSG_UNKNOWN_VENDOR=\u4f9b\u5e94\u5546\u672a\u77e5
183.5 MSG_PLATFORM_EXISTS=\u5177\u6709\u6b64\u540d\u79f0\u7684\u5e73\u53f0\u5df2\u5b58\u5728
183.6 ERR_MISSING_REQUIRED_PROPERTIES={0} \u4e2d\u7f3a\u5c11\u6240\u9700\u7684\u5c5e\u6027{1}
183.7 -COMMA=,
183.8 +
183.9 NewDevicePanel.jLabel1.text=\u663e\u793a\u540d\u79f0
183.10 ERR_EMPTY_NAME=\u672a\u8bbe\u7f6e\u8bbe\u5907\u540d\u79f0
183.11 ERR_ILLEGAL_CHARS=\u8bbe\u5907\u540d\u79f0\u4e2d\u5b58\u5728\u975e\u6cd5\u5b57\u7b26
184.1 --- a/src/zh_CN/javafx/javafx2-editor/javafx2-editor/org/netbeans/modules/javafx2/editor/codegen/Bundle_zh_CN.properties Wed Feb 26 18:44:50 2014 -0800
184.2 +++ b/src/zh_CN/javafx/javafx2-editor/javafx2-editor/org/netbeans/modules/javafx2/editor/codegen/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
184.3 @@ -43,7 +43,7 @@
184.4 AddPropertyPanel.typeLabel.text=\u7c7b\u578b(&T):
184.5 AddPropertyPanel.browseTypeButton.text=\u6d4f\u89c8(&B)...
184.6 AddPropertyPanel.generateJavadocCheckBox.text=\u751f\u6210 Javadoc(&J)
184.7 -AddPropertyPanel.previewEditorPane.contentType=\u6587\u672c/x-java
184.8 +
184.9 AddPropertyPanel.privateRadioButton.text=\u79c1\u6709(&P)
184.10 AddPropertyPanel.protectedRadioButton.text=\u53d7\u4fdd\u62a4(&O)
184.11 AddPropertyPanel.publicRadioButton.text=\u516c\u5171(&U)
184.12 @@ -63,11 +63,11 @@
184.13 WARN_FinalPropertyRequiresInitilizer=\u4e3a\u6700\u7ec8\u5c5e\u6027\u6307\u5b9a\u521d\u59cb\u5316\u7a0b\u5e8f\u8868\u8fbe\u5f0f
184.14 WARN_CannotPCS=\u65e0\u6cd5\u4e3a\u9759\u6001\u5c5e\u6027\u751f\u6210\u5c5e\u6027\u66f4\u6539\u652f\u6301
184.15 WARN_CannotVCS=\u65e0\u6cd5\u4e3a\u9759\u6001\u5c5e\u6027\u751f\u6210\u53ef\u5426\u51b3\u5c5e\u6027\u66f4\u6539\u652f\u6301
184.16 -AddPropertyPanel.equalsLabel.text== \u65b0\u5efa
184.17 -AddPropertyPanel.semicolonLabel.text=);
184.18 +
184.19 +
184.20 AddPropertyPanel.AccessibleContext.accessibleName=\u6dfb\u52a0\u5c5e\u6027
184.21 AddPropertyPanel.AccessibleContext.accessibleDescription=\u6dfb\u52a0\u5c5e\u6027
184.22 -AddPropertyPanel.jLabel1.text=(
184.23 +
184.24 AddPropertyPanel.writableRadioButton.text=\u53ef\u5199\u5165(&W)
184.25 AddPropertyPanel.readonlyRadioButton.text=\u53ea\u8bfb(&R)
184.26
185.1 --- a/src/zh_CN/javafx/javafx2-project/javafx2-project/org/netbeans/modules/javafx2/project/Bundle_zh_CN.properties Wed Feb 26 18:44:50 2014 -0800
185.2 +++ b/src/zh_CN/javafx/javafx2-project/javafx2-project/org/netbeans/modules/javafx2/project/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
185.3 @@ -311,3 +311,5 @@
185.4 ChooseOtherPlatformPanel.jLabel1.text=Java \u5e73\u53f0(&J):
185.5 ChooseOtherPlatformPanel.managePlatforms.text=\u7ba1\u7406\u5e73\u53f0(&M)...
185.6
185.7 +TXT_ActionInProgress=\u6b63\u5728\u6267\u884c\u64cd\u4f5c...
185.8 +
186.1 --- a/src/zh_CN/javafx/javafx2-project/javafx2-project/org/netbeans/modules/javafx2/project/ui/Bundle_zh_CN.properties Wed Feb 26 18:44:50 2014 -0800
186.2 +++ b/src/zh_CN/javafx/javafx2-project/javafx2-project/org/netbeans/modules/javafx2/project/ui/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
186.3 @@ -348,7 +348,7 @@
186.4
186.5 MSG_runtime_none=<\u65e0>
186.6 MSG_runtime_default=\u9ed8\u8ba4
186.7 -MSG_runtime_predefined=2.0+;2.1+;2.2+;8.0+
186.8 +
186.9 MSG_runtime_other=\u5176\u4ed6...
186.10 JFXDeploymentPanel.labelCommon.text=\u901a\u7528\u90e8\u7f72\u5c5e\u6027
186.11 LBL_runtime_dialog_label=\u6307\u5b9a\u6240\u9700\u7684 JavaFX RT \u7248\u672c:
187.1 --- a/src/zh_CN/javafx/javafx2-scenebuilder/javafx2-scenebuilder/org/netbeans/modules/javafx2/scenebuilder/options/Bundle_zh_CN.properties Wed Feb 26 18:44:50 2014 -0800
187.2 +++ b/src/zh_CN/javafx/javafx2-scenebuilder/javafx2-scenebuilder/org/netbeans/modules/javafx2/scenebuilder/options/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
187.3 @@ -12,3 +12,4 @@
187.4 SBOptionsPanel.saveAllModified.text=\u8fd0\u884c\u573a\u666f\u6784\u5efa\u5668\u524d\u4fdd\u5b58\u6240\u6709\u4fee\u6539\u7684\u6587\u4ef6(&A)
187.5 SBOptionsPanel.sbHomeInfo.text=\u573a\u666f\u6784\u5efa\u5668\u4e3b\u76ee\u5f55\u4fe1\u606f
187.6 SBOptionsPanel.sepLabel.text=JavaFX \u573a\u666f\u6784\u5efa\u5668\u96c6\u6210
187.7 +
188.1 --- a/src/zh_CN/mobility/j2me-common-ant/j2me-common-ant/org/netbeans/modules/j2me/common/ant/Bundle_zh_CN.properties Wed Feb 26 18:44:50 2014 -0800
188.2 +++ b/src/zh_CN/mobility/j2me-common-ant/j2me-common-ant/org/netbeans/modules/j2me/common/ant/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
188.3 @@ -79,23 +79,23 @@
188.4 MSG_SkippingPathElement=\u6b63\u5728\u8df3\u8fc7\u6df7\u6dc6\u7c7b\u8def\u5f84\u4e2d\u7684\u8def\u5f84\u5143\u7d20{0}\u3002\u627e\u4e0d\u5230\u8be5\u5143\u7d20\u3002
188.5
188.6 # configuration strings, do not localize !!!
188.7 -CMD_Run_UEI-1.0="{platformhome}{/}bin{/}emulator" {device|-Xdevice:"{device}"} {jadfile|-Xdescriptor:"{jadfile}"} {securitydomain|-Xdomain:{securitydomain}} {debug|-Xdebug -Xrunjdwp:transport={debugtransport},server={debugserver},suspend={debugsuspend},address={debugaddress}} {cmdoptions}
188.8 -CMD_Run_UEI-1.0.1="{platformhome}{/}bin{/}emulator" {device|-Xdevice:"{device}"} {jadfile|-Xdescriptor:"{jadfile}"} {securitydomain|-Xdomain:{securitydomain}} {debug|-Xdebug -Xrunjdwp:transport={debugtransport},server={debugserver},suspend={debugsuspend},address={debugaddress}} {cmdoptions}
188.9 -CMD_Run_UEI-1.0_OTA="{platformhome}{/}bin{/}emulator" {device|-Xdevice:"{device}"} {jadurl|-Xjam:install={jadurl} -Xjam:force} {securitydomain|-Xdomain:{securitydomain}} {debug|-Xdebug -Xrunjdwp:transport={debugtransport},server={debugserver},suspend={debugsuspend},address={debugaddress}} {cmdoptions}
188.10 -CMD_Run_UEI-1.0.1_OTA="{platformhome}{/}bin{/}emulator" {device|-Xdevice:"{device}"} {jadurl|-Xjam:install={jadurl} -Xjam:force} {securitydomain|-Xdomain:{securitydomain}} {debug|-Xdebug -Xrunjdwp:transport={debugtransport},server={debugserver},suspend={debugsuspend},address={debugaddress}} {cmdoptions}
188.11 -CMD_Run_UEI-1.0_OTA_List="{platformhome}{/}bin{/}emulator" {device|-Xdevice:"{device}"} -Xjam:list {cmdoptions}
188.12 -CMD_Run_UEI-1.0.1_OTA_List="{platformhome}{/}bin{/}emulator" {device|-Xdevice:"{device}"} -Xjam:list {cmdoptions}
188.13 -CMD_Run_UEI-1.0_OTA_Run="{platformhome}{/}bin{/}emulator" {device|-Xdevice:"{device}"} -Xjam:run={storagenum} {cmdoptions}
188.14 -CMD_Run_UEI-1.0.1_OTA_Run="{platformhome}{/}bin{/}emulator" {device|-Xdevice:"{device}"} -Xjam:run={storagenum} {cmdoptions}
188.15 +
188.16 +
188.17 +
188.18 +
188.19 +
188.20 +
188.21 +
188.22 +
188.23 WARN_InvalidMIDletAttributeFormat={0} \u5c5e\u6027\u683c\u5f0f ({1}) \u65e0\u6548\u3002
188.24 ERR_ManifestIsMissing=\u7f3a\u5c11 "\u6e05\u5355" ({0})\u3002
188.25 ERR_JadFileIsMissing=\u7f3a\u5c11 "jadFile" ({0})\u3002
188.26 ERR_ObfuscationFailedReadLog=\u6df7\u6dc6\u5931\u8d25\u3002\u6709\u5173\u8be6\u7ec6\u4fe1\u606f, \u8bf7\u53c2\u89c1\u65e5\u5fd7\u6587\u4ef6 ({0})\u3002
188.27 WARN_NoMIDletNoObfuscation=\u6ca1\u6709\u6307\u5b9a\u7684\u5165\u53e3\u70b9 (MIDlet \u7c7b)\u3002\u4e0d\u6267\u884c\u4efb\u4f55\u6df7\u6dc6\u3002
188.28 SCR_ExcludeClasses_PROGUARD=-keep class {classname} {leftbrace} public <methods>; {rightbrace}
188.29 -CMD_PROGUARD="{javahome}{/}bin{/}java" {obfuscatorclasspath|-cp "{obfuscatorclasspath}"} proguard.ProGuard {quotedclasspath|-libraryjars "{quotedclasspath}"} -injars "'{srcjar}'" -outjar "'{destjar}'" {script|-include "'{script}'"}
188.30 -COND_PROGUARD=proguard/ProGuard.class
188.31 -LIST_Obfuscators=PROGUARD,NONELIST_ExecMethods=STANDARD,OTA
188.32 +
188.33 +
188.34 +
188.35
188.36
188.37 ERR_KeyIsNotPrivateKey=\u522b\u540d ({0}) \u7684\u5bc6\u94a5\u4e0d\u662f\u79c1\u6709\u5bc6\u94a5\u3002
189.1 --- a/src/zh_CN/mobility/j2me-project/j2me-project/org/netbeans/modules/j2me/project/resources/Bundle_zh_CN.properties Wed Feb 26 18:44:50 2014 -0800
189.2 +++ b/src/zh_CN/mobility/j2me-project/j2me-project/org/netbeans/modules/j2me/project/resources/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
189.3 @@ -41,3 +41,5 @@
189.4 Templates/javame=Java ME \u5d4c\u5165\u5f0f
189.5 Templates/javame/MEEPlet.java=MIDlet
189.6
189.7 +Templates/Project/Samples/JavaME=Java ME \u5d4c\u5165\u5f0f
189.8 +
190.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
190.2 +++ b/src/zh_CN/mobility/j2me-project/j2me-project/org/netbeans/modules/j2me/project/templates/samples_zh_CN.html Thu Feb 27 00:43:29 2014 -0800
190.3 @@ -0,0 +1,52 @@
190.4 +<!DOCTYPE html>
190.5 +<!--
190.6 +DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
190.7 +
190.8 +Copyright 2014 Oracle and/or its affiliates. All rights reserved.
190.9 +
190.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
190.11 +Other names may be trademarks of their respective owners.
190.12 +
190.13 +The contents of this file are subject to the terms of either the GNU
190.14 +General Public License Version 2 only ("GPL") or the Common
190.15 +Development and Distribution License("CDDL") (collectively, the
190.16 +"License"). You may not use this file except in compliance with the
190.17 +License. You can obtain a copy of the License at
190.18 +http://www.netbeans.org/cddl-gplv2.html
190.19 +or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
190.20 +specific language governing permissions and limitations under the
190.21 +License. When distributing the software, include this License Header
190.22 +Notice in each file and include the License file at
190.23 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
190.24 +particular file as subject to the "Classpath" exception as provided
190.25 +by Oracle in the GPL Version 2 section of the License file that
190.26 +accompanied this code. If applicable, add the following below the
190.27 +License Header, with the fields enclosed by brackets [] replaced by
190.28 +your own identifying information:
190.29 +"Portions Copyrighted [year] [name of copyright owner]"
190.30 +
190.31 +If you wish your version of this file to be governed by only the CDDL
190.32 +or only the GPL Version 2, indicate your decision by adding
190.33 +"[Contributor] elects to include this software in this distribution
190.34 +under the [CDDL or GPL Version 2] license." If you do not indicate a
190.35 +single choice of license, a recipient has the option to distribute
190.36 +your version of this file under either the CDDL, the GPL Version 2 or
190.37 +to extend the choice of license to its licensees as provided above.
190.38 +However, if you add GPL Version 2 code and therefore, elected the GPL
190.39 +Version 2 license, then the option applies only if the new code is
190.40 +made subject to such option by the copyright holder.
190.41 +
190.42 +Contributor(s):
190.43 +
190.44 +Portions Copyrighted 2014 Sun Microsystems, Inc.
190.45 +-->
190.46 +<!DOCTYPE html>
190.47 +<html>
190.48 + <head>
190.49 + <title></title>
190.50 +<meta http-equiv="content-type" content="text/html; charset=UTF-8">
190.51 + </head>
190.52 + <body>
190.53 + <div>Java ME 嵌入式样例</div>
190.54 + </body>
190.55 +</html>
191.1 --- a/src/zh_CN/mobility/j2me-project/j2me-project/org/netbeans/modules/j2me/project/ui/customizer/Bundle_zh_CN.properties Wed Feb 26 18:44:50 2014 -0800
191.2 +++ b/src/zh_CN/mobility/j2me-project/j2me-project/org/netbeans/modules/j2me/project/ui/customizer/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
191.3 @@ -130,8 +130,8 @@
191.4 LBL_CustomizeJavadoc_Index_JCheckBox=\u7d22\u5f15(&I)
191.5 LBL_CustomizeJavadoc_SplitIndex_JCheckBox=\u6309\u5b57\u6bcd\u5206\u9694\u7d22\u5f15(&L)
191.6 LBL_CustomizeJavadoc_Tags_JLabel=\u8bb0\u5f55\u5176\u4ed6\u6807\u8bb0:
191.7 -LBL_CustomizeJavadoc_Author_JCheckBox=@author(&A)
191.8 -LBL_CustomizeJavadoc_Version_JCheckBox=@version(&V)
191.9 +
191.10 +
191.11 LBL_CustomizeJavadoc_WinTitle_JLabel=\u6d4f\u89c8\u5668\u7a97\u53e3\u6807\u9898(&B):
191.12 LBL_CustomizeJavadoc_Encoding_JLabel=\u7f16\u7801:
191.13 LBL_CustomizeJavadoc_Preview_JCheckBox=\u9884\u89c8\u751f\u6210\u7684 Javadoc(&G)
191.14 @@ -652,8 +652,8 @@
191.15 LBL_CustomizeJavadoc_Index_JCheckBox=\u7d22\u5f15(&I)
191.16 LBL_CustomizeJavadoc_SplitIndex_JCheckBox=\u6309\u5b57\u6bcd\u5206\u9694\u7d22\u5f15(&L)
191.17 LBL_CustomizeJavadoc_Tags_JLabel=\u8bb0\u5f55\u5176\u4ed6\u6807\u8bb0:
191.18 -LBL_CustomizeJavadoc_Author_JCheckBox=@author(&A)
191.19 -LBL_CustomizeJavadoc_Version_JCheckBox=@version(&V)
191.20 +
191.21 +
191.22 LBL_CustomizeJavadoc_WinTitle_JLabel=\u6d4f\u89c8\u5668\u7a97\u53e3\u6807\u9898(&B):
191.23 LBL_CustomizeJavadoc_Encoding_JLabel=\u7f16\u7801:
191.24 LBL_CustomizeJavadoc_Preview_JCheckBox=\u9884\u89c8\u751f\u6210\u7684 Javadoc(&G)
191.25 @@ -703,8 +703,8 @@
191.26
191.27 # API Permissions
191.28 J2MEAPIPermissionsPanel.lTable.text=\u8bf7\u6c42\u7684\u6743\u9650(&P):
191.29 -J2MEAPIPermissionsPanel.lError.text=MIDP-1.0 \u7b80\u8868\u4e0d\u652f\u6301 API \u6743\u9650\u3002
191.30 J2MEAPIPermissionsPanel.bRemove.text=\u5220\u9664(&R)
191.31 +J2MEAPIPermissionsPanel.bEdit.text=\u7f16\u8f91(&E)...
191.32 LBL_Attr_Key=\u540d\u79f0(&N):
191.33 LBL_Attr_Value=\u503c(&V):
191.34 ERR_AddAttr_MIDlet=\u60a8\u4e0d\u80fd\u5728\u6b64\u6dfb\u52a0\u8be5\u5c5e\u6027\u3002\u8bf7\u4f7f\u7528\u7c7b\u522b "MIDlet"\u3002
191.35 @@ -736,7 +736,6 @@
191.36 LBL_Push_Column_Class=MIDlet \u7c7b
191.37 LBL_Push_Column_Sender=\u53d1\u9001\u8005 IP
191.38 LBL_Push_Column_String=\u8fde\u63a5\u5b57\u7b26\u4e32
191.39 -ERR_Push_NotUsed=MIDP-1.0 \u7b80\u8868\u4e0d\u652f\u6301\u63a8\u5165\u6ce8\u518c\u3002
191.40 ACSN_Push=\u63a8\u5165\u6ce8\u518c\u5b9a\u5236\u5668
191.41 ACSD_Push=\u5b9a\u5236\u63a8\u5165\u6ce8\u518c\u9879
191.42
191.43 @@ -760,6 +759,7 @@
191.44
191.45 # Add API Panel
191.46 TITLE_AddAPI=\u6dfb\u52a0 API \u6743\u9650
191.47 +TITLE_EditAPI=\u7f16\u8f91 API \u7684\u6743\u9650
191.48
191.49 ###############################
191.50 #Resources found in the file: CustomizerMIDlets.java
192.1 --- a/src/zh_CN/mobility/j2me-project/j2me-project/org/netbeans/modules/j2me/project/wizard/Bundle_zh_CN.properties Wed Feb 26 18:44:50 2014 -0800
192.2 +++ b/src/zh_CN/mobility/j2me-project/j2me-project/org/netbeans/modules/j2me/project/wizard/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
192.3 @@ -53,7 +53,7 @@
192.4
192.5
192.6 #PanelOptionsVisual
192.7 -TXT_PackageNamePrefix=pkg
192.8 +
192.9 WARN_PanelOptionsVisual.absolutePath=<html>\u8bf7\u786e\u4fdd\u201c\u5e93\u6587\u4ef6\u5939\u201d\u5b57\u6bb5\u4e2d\u7684\u7edd\u5bf9\u8def\u5f84\u5bf9\u6240\u6709\u7528\u6237\u90fd\u6709\u6548\u3002</html>
192.10 WARN_PanelOptionsVisual.relativePath=<html>\u8bf7\u786e\u4fdd\u201c\u5e93\u6587\u4ef6\u5939\u201d\u5b57\u6bb5\u4e2d\u7684\u76f8\u5bf9\u8def\u5f84\u5bf9\u6240\u6709\u7528\u6237\u90fd\u6709\u6548\u3002</html>
192.11 WARN_PanelOptionsVisual.noMEPlatform=<html>\u672a\u627e\u5230 Java ME \u5e73\u53f0\u3002\u8bf7\u81f3\u5c11\u6dfb\u52a0\u4e00\u4e2a\u3002</html>
192.12 @@ -165,8 +165,8 @@
192.13 LBL_JavaTargetChooserPanelGUI_CreatedFile_Label=\u521b\u5efa\u7684\u6587\u4ef6(&C):
192.14 LBL_JavaTargetChooserPanelGUI_CreatedFolder_Label=\u521b\u5efa\u7684\u6587\u4ef6\u5939(&C):
192.15 LBL_JavaTargetChooserPanelGUI_jLabel5=\u9879\u76ee(&P):
192.16 -LBL_JavaTargetChooserPanelGUI_DefaultNewPackageName=newpackage
192.17 -LBL_JavaTargetChooserPanelGUI_NewJavaClassPrefix=\u65b0\u5efa
192.18 +
192.19 +
192.20 ERR_JavaTargetChooser_InvalidPackage=\u5305\u540d\u65e0\u6548
192.21 ERR_JavaTargetChooser_InvalidClass=\u7c7b\u540d\u65e0\u6548
192.22 ERR_JavaTargetChooser_DefaultPackage=\u8b66\u544a: \u5f3a\u70c8\u5efa\u8bae\u60a8\u4e0d\u8981\u5c06 Java \u7c7b\u653e\u5165\u9ed8\u8ba4\u5305\u4e2d\u3002
192.23 @@ -185,3 +185,6 @@
192.24
192.25
192.26
192.27 +#J2MESampleProjectIterator
192.28 +LBL_NWP1_ProjectTitleName=\u9879\u76ee\u6807\u9898
192.29 +
193.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
193.2 +++ b/src/zh_CN/mobility/mobility-databindingme/mobility-databindingme/org/netbeans/modules/mobility/databindingme/resources/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
193.3 @@ -0,0 +1,57 @@
193.4 +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
193.5 +#
193.6 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
193.7 +#
193.8 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
193.9 +# Other names may be trademarks of their respective owners.
193.10 +#
193.11 +# The contents of this file are subject to the terms of either the GNU
193.12 +# General Public License Version 2 only ("GPL") or the Common
193.13 +# Development and Distribution License("CDDL") (collectively, the
193.14 +# "License"). You may not use this file except in compliance with the
193.15 +# License. You can obtain a copy of the License at
193.16 +# http://www.netbeans.org/cddl-gplv2.html
193.17 +# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
193.18 +# specific language governing permissions and limitations under the
193.19 +# License. When distributing the software, include this License Header
193.20 +# Notice in each file and include the License file at
193.21 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
193.22 +# particular file as subject to the "Classpath" exception as provided
193.23 +# by Oracle in the GPL Version 2 section of the License file that
193.24 +# accompanied this code. If applicable, add the following below the
193.25 +# License Header, with the fields enclosed by brackets [] replaced by
193.26 +# your own identifying information:
193.27 +# "Portions Copyrighted [year] [name of copyright owner]"
193.28 +#
193.29 +# Contributor(s):
193.30 +#
193.31 +# The Original Software is NetBeans. The Initial Developer of the Original
193.32 +# Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
193.33 +# Microsystems, Inc. All Rights Reserved.
193.34 +#
193.35 +# If you wish your version of this file to be governed by only the CDDL
193.36 +# or only the GPL Version 2, indicate your decision by adding
193.37 +# "[Contributor] elects to include this software in this distribution
193.38 +# under the [CDDL or GPL Version 2] license." If you do not indicate a
193.39 +# single choice of license, a recipient has the option to distribute
193.40 +# your version of this file under either the CDDL, the GPL Version 2 or
193.41 +# to extend the choice of license to its licensees as provided above.
193.42 +# However, if you add GPL Version 2 code and therefore, elected the GPL
193.43 +# Version 2 license, then the option applies only if the new code is
193.44 +# made subject to such option by the copyright holder.
193.45 +
193.46 +
193.47 +
193.48 +###################################
193.49 +#Resources not used in the package
193.50 +###################################
193.51 +OpenIDE-Module-Name=NetBeans Mobility \u6570\u636e\u7ed1\u5b9a\u5e93
193.52 +OpenIDE-Module-Display-Category=Java ME
193.53 +OpenIDE-Module-Short-Description=\u4e3a\u79fb\u52a8\u8bbe\u5907\u4e0a\u7684\u6570\u636e\u7ed1\u5b9a\u63d0\u4f9b\u8fd0\u884c\u65f6\u5e93\u3002
193.54 +OpenIDE-Module-Long-Description=\u4e3a\u79fb\u52a8\u8bbe\u5907\u4e0a\u7684\u6570\u636e\u7ed1\u5b9a\u63d0\u4f9b\u8fd0\u884c\u65f6\u5e93\u3002
193.55 +
193.56 +#Library definition
193.57 +DataBindingME=NetBeans DataBindingME
193.58 +DataBindingME-PIM=NetBeans DataBindingME PIM
193.59 +DataBindingME-SVG=NetBeans DataBindingME SVG
193.60 +
194.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
194.2 +++ b/src/zh_CN/mobility/mobility-end2end/mobility-end2end/org/netbeans/modules/mobility/e2e/mapping/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
194.3 @@ -0,0 +1,74 @@
194.4 +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
194.5 +#
194.6 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
194.7 +#
194.8 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
194.9 +# Other names may be trademarks of their respective owners.
194.10 +#
194.11 +# The contents of this file are subject to the terms of either the GNU
194.12 +# General Public License Version 2 only ("GPL") or the Common
194.13 +# Development and Distribution License("CDDL") (collectively, the
194.14 +# "License"). You may not use this file except in compliance with the
194.15 +# License. You can obtain a copy of the License at
194.16 +# http://www.netbeans.org/cddl-gplv2.html
194.17 +# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
194.18 +# specific language governing permissions and limitations under the
194.19 +# License. When distributing the software, include this License Header
194.20 +# Notice in each file and include the License file at
194.21 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
194.22 +# particular file as subject to the "Classpath" exception as provided
194.23 +# by Oracle in the GPL Version 2 section of the License file that
194.24 +# accompanied this code. If applicable, add the following below the
194.25 +# License Header, with the fields enclosed by brackets [] replaced by
194.26 +# your own identifying information:
194.27 +# "Portions Copyrighted [year] [name of copyright owner]"
194.28 +#
194.29 +# Contributor(s):
194.30 +#
194.31 +# The Original Software is NetBeans. The Initial Developer of the Original
194.32 +# Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
194.33 +# Microsystems, Inc. All Rights Reserved.
194.34 +#
194.35 +# If you wish your version of this file to be governed by only the CDDL
194.36 +# or only the GPL Version 2, indicate your decision by adding
194.37 +# "[Contributor] elects to include this software in this distribution
194.38 +# under the [CDDL or GPL Version 2] license." If you do not indicate a
194.39 +# single choice of license, a recipient has the option to distribute
194.40 +# your version of this file under either the CDDL, the GPL Version 2 or
194.41 +# to extend the choice of license to its licensees as provided above.
194.42 +# However, if you add GPL Version 2 code and therefore, elected the GPL
194.43 +# Version 2 license, then the option applies only if the new code is
194.44 +# made subject to such option by the copyright holder.
194.45 +
194.46 +MSG_Client=\u751f\u6210\u5ba2\u6237\u7aef
194.47 +MSG_Bean_Generation=\u751f\u6210 Bean
194.48 +
194.49 +MSG_Servlet=\u751f\u6210 Servlet \u7c7b
194.50 +MSG_Invocation=\u751f\u6210\u8c03\u7528\u7c7b
194.51 +MSG_Gateways=\u751f\u6210\u7f51\u5173\u7c7b
194.52 +MSG_Utility=\u751f\u6210\u5b9e\u7528\u7a0b\u5e8f\u7c7b
194.53 +
194.54 +MSG_DestinationFolderCreation=\u521b\u5efa\u76ee\u6807\u6587\u4ef6\u5939 {0}...
194.55 +MSG_FailFolderCreation=\u65e0\u6cd5\u521b\u5efa\u6587\u4ef6\u5939 {0}\u3002
194.56 +MSG_BeanFileCreation=\u521b\u5efa Bean Java \u6587\u4ef6{0}...
194.57 +MSG_FailBeanCreation=\u65e0\u6cd5\u521b\u5efa Bean \u6587\u4ef6{0}\u3002
194.58 +MSG_GenerateBean=\u751f\u6210 Bean \u6587\u4ef6{0}...
194.59 +MSG_ConfigureBindings=\u914d\u7f6e\u7ed1\u5b9a...
194.60 +MSG_FailGenerateBean=\u672a\u80fd\u751f\u6210 Bean \u7c7b{0}\u3002
194.61 +MSG_RegisterDatabindingLibrary=\u6ce8\u518c\u6570\u636e\u7ed1\u5b9a\u5e93...
194.62 +MSG_BeanGenerated=\u5df2\u6210\u529f\u751f\u6210 Bean \u6587\u4ef6{0}\u3002
194.63 +MSG_InvalidField=\u4e32\u884c\u5668\u4e0d\u652f\u6301 Bean "{0}" \u5305\u542b\u7684\u7c7b\u578b\u4e3a "{2}" \u7684\u5b57\u6bb5 "{1}", \u5c06\u5728\u751f\u6210\u7684\u7c7b\u4e2d\u5ffd\u7565\u8be5\u5b57\u6bb5\u3002
194.64 +MSG_ClientJavonCreation=\u521b\u5efa\u5ba2\u6237\u7aef Java \u6587\u4ef6{0}...
194.65 +MSG_FailClientJavonCreation=\u65e0\u6cd5\u521b\u5efa\u5ba2\u6237\u7aef Java \u6587\u4ef6{0}\u3002
194.66 +MSG_FailJavonClientGeneration=\u672a\u80fd\u751f\u6210\u5ba2\u6237\u7aef\u7c7b{0}\u3002
194.67 +MSG_GenerateJavonClient=\u751f\u6210\u5ba2\u6237\u7aef Java \u6587\u4ef6{0}...
194.68 +MSG_ClientGenerated=\u5df2\u6210\u529f\u751f\u6210\u5ba2\u6237\u7aef\u6587\u4ef6{0}\u3002
194.69 +MSG_ServerFolderCreation=\u521b\u5efa\u670d\u52a1\u5668\u6587\u4ef6\u5939 {0}...
194.70 +MSG_FailServerFolderCreation=\u65e0\u6cd5\u521b\u5efa\u670d\u52a1\u5668\u6587\u4ef6\u5939 {0}\u3002
194.71 +MSG_FailGenerateServerFile=\u672a\u80fd\u751f\u6210\u670d\u52a1\u5668\u6587\u4ef6{0}\u3002
194.72 +MSG_ServerFileCreation=\u521b\u5efa\u670d\u52a1\u5668\u6587\u4ef6{0}...
194.73 +MSG_FailServerFileCreation=\u65e0\u6cd5\u521b\u5efa\u670d\u52a1\u5668\u6587\u4ef6{0}\u3002
194.74 +MSG_GenerateServerFile=\u751f\u6210\u670d\u52a1\u5668\u6587\u4ef6{0}...
194.75 +MSG_AddServlet=\u5c06 Servlet {0} \u6dfb\u52a0\u5230 Web \u9879\u76ee{1}\u4e2d\u3002
194.76 +MSG_ServerFileGenerated=\u5df2\u6210\u529f\u751f\u6210\u670d\u52a1\u5668\u6587\u4ef6{0}\u3002
194.77 +
195.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
195.2 +++ b/src/zh_CN/mobility/mobility-end2end/mobility-end2end/org/netbeans/modules/mobility/end2end/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
195.3 @@ -0,0 +1,77 @@
195.4 +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
195.5 +#
195.6 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
195.7 +#
195.8 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
195.9 +# Other names may be trademarks of their respective owners.
195.10 +#
195.11 +# The contents of this file are subject to the terms of either the GNU
195.12 +# General Public License Version 2 only ("GPL") or the Common
195.13 +# Development and Distribution License("CDDL") (collectively, the
195.14 +# "License"). You may not use this file except in compliance with the
195.15 +# License. You can obtain a copy of the License at
195.16 +# http://www.netbeans.org/cddl-gplv2.html
195.17 +# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
195.18 +# specific language governing permissions and limitations under the
195.19 +# License. When distributing the software, include this License Header
195.20 +# Notice in each file and include the License file at
195.21 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
195.22 +# particular file as subject to the "Classpath" exception as provided
195.23 +# by Oracle in the GPL Version 2 section of the License file that
195.24 +# accompanied this code. If applicable, add the following below the
195.25 +# License Header, with the fields enclosed by brackets [] replaced by
195.26 +# your own identifying information:
195.27 +# "Portions Copyrighted [year] [name of copyright owner]"
195.28 +#
195.29 +# Contributor(s):
195.30 +#
195.31 +# The Original Software is NetBeans. The Initial Developer of the Original
195.32 +# Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
195.33 +# Microsystems, Inc. All Rights Reserved.
195.34 +#
195.35 +# If you wish your version of this file to be governed by only the CDDL
195.36 +# or only the GPL Version 2, indicate your decision by adding
195.37 +# "[Contributor] elects to include this software in this distribution
195.38 +# under the [CDDL or GPL Version 2] license." If you do not indicate a
195.39 +# single choice of license, a recipient has the option to distribute
195.40 +# your version of this file under either the CDDL, the GPL Version 2 or
195.41 +# to extend the choice of license to its licensees as provided above.
195.42 +# However, if you add GPL Version 2 code and therefore, elected the GPL
195.43 +# Version 2 license, then the option applies only if the new code is
195.44 +# made subject to such option by the copyright holder.
195.45 +
195.46 +
195.47 +
195.48 +CTL_SourceTabCaption=\u6e90
195.49 +###############################
195.50 +#Resources found in the file: E2EDataObject.java
195.51 +###############################
195.52 +ERR_ConfigurationFileCorrupted=\u914d\u7f6e\u6587\u4ef6\u5df2\u635f\u574f
195.53 +ERR_ServerProjectNotOpened=\u672a\u6253\u5f00\u670d\u52a1\u5668\u9879\u76ee{0}\u3002
195.54 +MSG_GeneratingStubs=\u6b63\u5728\u751f\u6210\u6869\u6a21\u5757\u7c7b...
195.55 +MSG_OpeningConfigFile=\u6b63\u5728\u6253\u5f00\u914d\u7f6e\u6587\u4ef6...
195.56 +MSG_SampleNotGenerated=\u672a\u751f\u6210\u6837\u4f8b MIDlet\u3002
195.57 +
195.58 +###############################
195.59 +#Resources found in the file: E2EDataLoader.java
195.60 +###############################
195.61 +
195.62 +# E2EDataLoader.class
195.63 +TYPE_WSClient=\u7aef\u5230\u7aef\u7684\u5ba2\u6237\u7aef\u914d\u7f6e\u6587\u4ef6
195.64 +
195.65 +###################################
195.66 +#Resources not used in the package
195.67 +###################################
195.68 +
195.69 +# Module data
195.70 +OpenIDE-Module-Display-Category=Java ME
195.71 +OpenIDE-Module-Long-Description=\u751f\u6210\u5668\u6a21\u5757, \u7528\u4e8e\u521b\u5efa\u6865\u63a5 Java EE \u540e\u7aef\u7684 Java ME \u5ba2\u6237\u7aef\u3002
195.72 +OpenIDE-Module-Name=Web \u5e94\u7528\u7a0b\u5e8f\u7684 Java ME \u5ba2\u6237\u7aef\u751f\u6210\u5668
195.73 +OpenIDE-Module-Short-Description=Web \u5e94\u7528\u7a0b\u5e8f\u7684 Java ME \u5ba2\u6237\u7aef\u751f\u6210\u5668
195.74 +
195.75 +Loaders/text/x-wsclient/Factories/org-netbeans-modules-mobility-end2end-E2EDataLoader.instance=\u7aef\u5230\u7aef\u7684\u5ba2\u6237\u7aef\u914d\u7f6e\u6587\u4ef6
195.76 +
195.77 +Templates/Server=\u670d\u52a1\u5668
195.78 +Templates/Client=\u5ba2\u6237\u7aef
195.79 +WSClientResolver=Mobility \u7aef\u5230\u7aef\u6587\u4ef6
195.80 +
196.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
196.2 +++ b/src/zh_CN/mobility/mobility-end2end/mobility-end2end/org/netbeans/modules/mobility/end2end/codegenerator/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
196.3 @@ -0,0 +1,74 @@
196.4 +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
196.5 +#
196.6 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
196.7 +#
196.8 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
196.9 +# Other names may be trademarks of their respective owners.
196.10 +#
196.11 +# The contents of this file are subject to the terms of either the GNU
196.12 +# General Public License Version 2 only ("GPL") or the Common
196.13 +# Development and Distribution License("CDDL") (collectively, the
196.14 +# "License"). You may not use this file except in compliance with the
196.15 +# License. You can obtain a copy of the License at
196.16 +# http://www.netbeans.org/cddl-gplv2.html
196.17 +# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
196.18 +# specific language governing permissions and limitations under the
196.19 +# License. When distributing the software, include this License Header
196.20 +# Notice in each file and include the License file at
196.21 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
196.22 +# particular file as subject to the "Classpath" exception as provided
196.23 +# by Oracle in the GPL Version 2 section of the License file that
196.24 +# accompanied this code. If applicable, add the following below the
196.25 +# License Header, with the fields enclosed by brackets [] replaced by
196.26 +# your own identifying information:
196.27 +# "Portions Copyrighted [year] [name of copyright owner]"
196.28 +#
196.29 +# Contributor(s):
196.30 +#
196.31 +# The Original Software is NetBeans. The Initial Developer of the Original
196.32 +# Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
196.33 +# Microsystems, Inc. All Rights Reserved.
196.34 +#
196.35 +# If you wish your version of this file to be governed by only the CDDL
196.36 +# or only the GPL Version 2, indicate your decision by adding
196.37 +# "[Contributor] elects to include this software in this distribution
196.38 +# under the [CDDL or GPL Version 2] license." If you do not indicate a
196.39 +# single choice of license, a recipient has the option to distribute
196.40 +# your version of this file under either the CDDL, the GPL Version 2 or
196.41 +# to extend the choice of license to its licensees as provided above.
196.42 +# However, if you add GPL Version 2 code and therefore, elected the GPL
196.43 +# Version 2 license, then the option applies only if the new code is
196.44 +# made subject to such option by the copyright holder.
196.45 +
196.46 +
196.47 +
196.48 +###############################
196.49 +#Global resources found in the package: ./end2end/src/org/netbeans/modules/mobility/end2end/codegenerator
196.50 +###############################
196.51 +
196.52 +# ProxyGenerator.class
196.53 +MSG_WebProjectNotBuilt=\u5fc5\u987b\u5728\u4f7f\u7528 Web \u5e94\u7528\u7a0b\u5e8f\u7684 Mobile \u5ba2\u6237\u7aef\u751f\u6210\u5668\u4e4b\u524d\u751f\u6210 Web \u9879\u76ee!
196.54 +
196.55 +###############################
196.56 +#Resources found in the file: ConnectionGenerator.java
196.57 +###############################
196.58 +
196.59 +# ConnectionGenerator.class
196.60 +MSG_GeneratingJavonBridge=\u751f\u6210 Web \u5e94\u7528\u7a0b\u5e8f\u7684 Mobile \u5ba2\u6237\u7aef
196.61 +MSG_GeneratingProxyStubs=\u751f\u6210\u4ee3\u7406\u6869\u6a21\u5757
196.62 +MSG_ScanningDataStructures=\u626b\u63cf\u6570\u636e\u7ed3\u6784
196.63 +MSG_CreatingJavaFiles=\u521b\u5efa java \u6587\u4ef6
196.64 +MSG_SuccessGenerated=\u5df2\u6210\u529f\u751f\u6210 Web \u5e94\u7528\u7a0b\u5e8f\u7684 Mobile \u5ba2\u6237\u7aef\u3002
196.65 +MSG_Failure=\u672a\u80fd\u751f\u6210 Web \u5e94\u7528\u7a0b\u5e8f\u7684 Mobile \u5ba2\u6237\u7aef\u3002\u6709\u5173\u8be6\u7ec6\u4fe1\u606f, \u8bf7\u53c2\u89c1\u201c\u8f93\u51fa\u201d\u6807\u7b7e!
196.66 +LBL_JavonTab=Web \u5e94\u7528\u7a0b\u5e8f\u7684 Mobile \u5ba2\u6237\u7aef
196.67 +
196.68 +TXT_CreatingFolder=\u6b63\u5728\u521b\u5efa\u6587\u4ef6\u5939 {0}...
196.69 +TXT_FailedFolderCreation=\u65e0\u6cd5\u521b\u5efa\u6587\u4ef6\u5939 {0}
196.70 +TXT_CreatingProxyClass=\u6b63\u5728\u521b\u5efa\u4ee3\u7406\u7c7b{0}...
196.71 +TXT_FailedProxyClassCreation=\u65e0\u6cd5\u521b\u5efa\u4ee3\u7406\u7c7b{0}
196.72 +TXT_ConfigureBindings=\u4e3a\u4ee3\u7406\u7c7b\u914d\u7f6e\u7ed1\u5b9a...
196.73 +TXT_GenerateProxyClass=\u751f\u6210\u4ee3\u7406\u7c7b...
196.74 +TXT_FailProxyGeneration=\u4ee3\u7406\u7c7b\u751f\u6210\u5931\u8d25\u3002
196.75 +TXT_GenerationSuccess=\u5df2\u6210\u529f\u5b8c\u6210\u751f\u6210\u64cd\u4f5c\u3002
196.76 +TXT_GenerationUnsuccess=\u751f\u6210\u64cd\u4f5c\u5df2\u5b8c\u6210, \u4f46\u51fa\u73b0\u9519\u8bef\u3002
196.77 +
197.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
197.2 +++ b/src/zh_CN/mobility/mobility-end2end/mobility-end2end/org/netbeans/modules/mobility/end2end/multiview/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
197.3 @@ -0,0 +1,129 @@
197.4 +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
197.5 +#
197.6 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
197.7 +#
197.8 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
197.9 +# Other names may be trademarks of their respective owners.
197.10 +#
197.11 +# The contents of this file are subject to the terms of either the GNU
197.12 +# General Public License Version 2 only ("GPL") or the Common
197.13 +# Development and Distribution License("CDDL") (collectively, the
197.14 +# "License"). You may not use this file except in compliance with the
197.15 +# License. You can obtain a copy of the License at
197.16 +# http://www.netbeans.org/cddl-gplv2.html
197.17 +# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
197.18 +# specific language governing permissions and limitations under the
197.19 +# License. When distributing the software, include this License Header
197.20 +# Notice in each file and include the License file at
197.21 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
197.22 +# particular file as subject to the "Classpath" exception as provided
197.23 +# by Oracle in the GPL Version 2 section of the License file that
197.24 +# accompanied this code. If applicable, add the following below the
197.25 +# License Header, with the fields enclosed by brackets [] replaced by
197.26 +# your own identifying information:
197.27 +# "Portions Copyrighted [year] [name of copyright owner]"
197.28 +#
197.29 +# Contributor(s):
197.30 +#
197.31 +# The Original Software is NetBeans. The Initial Developer of the Original
197.32 +# Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
197.33 +# Microsystems, Inc. All Rights Reserved.
197.34 +#
197.35 +# If you wish your version of this file to be governed by only the CDDL
197.36 +# or only the GPL Version 2, indicate your decision by adding
197.37 +# "[Contributor] elects to include this software in this distribution
197.38 +# under the [CDDL or GPL Version 2] license." If you do not indicate a
197.39 +# single choice of license, a recipient has the option to distribute
197.40 +# your version of this file under either the CDDL, the GPL Version 2 or
197.41 +# to extend the choice of license to its licensees as provided above.
197.42 +# However, if you add GPL Version 2 code and therefore, elected the GPL
197.43 +# Version 2 license, then the option applies only if the new code is
197.44 +# made subject to such option by the copyright holder.
197.45 +
197.46 +
197.47 +
197.48 +###############################
197.49 +#Global resources found in the package: ./end2end/src/org/netbeans/modules/mobility/end2end/multiview
197.50 +###############################
197.51 +
197.52 +CTL_ClientTabCaption=\u5ba2\u6237\u7aef
197.53 +CTL_ServerTabCaption=\u670d\u52a1\u5668
197.54 +LBL_Generate=\u751f\u6210\u6869\u6a21\u5757(&G)
197.55 +MSG_WaitComputingWebServices=\u8bf7\u7a0d\u5019, \u6b63\u5728\u51c6\u5907 Web \u670d\u52a1...
197.56 +ERR_ServiceMethodNotFound=config \u6587\u4ef6\u4e2d\u6307\u5b9a\u7684\u670d\u52a1\u4e0d\u5728 J2EE \u9879\u76ee\u4e2d
197.57 +
197.58 +###############################
197.59 +#Resources found in the file: ClientMultiViewElement.java
197.60 +###############################
197.61 +
197.62 +# ClientMultiViewElement.class
197.63 +TTL_ServicesSection=\u5bfc\u51fa\u7684\u670d\u52a1
197.64 +TTL_ClientGeneralInfoSection=\u5ba2\u6237\u7aef\u4fe1\u606f
197.65 +TTL_ClientOptionsSection=\u5ba2\u6237\u7aef\u9009\u9879
197.66 +
197.67 +###############################
197.68 +#Resources found in the file: ServerGeneralInfoPanel.java
197.69 +###############################
197.70 +
197.71 +# ServerViewFactory.class
197.72 +LABEL_Server_Package=\u5305(&K):
197.73 +LABEL_Servlet_Name=Servlet \u540d\u79f0(&S):
197.74 +LABEL_Server_Project=\u9879\u76ee(&P):
197.75 +LABEL_Server_Tracking=\u751f\u6210\u8ddf\u8e2a\u4ee3\u7801(&G)
197.76 +
197.77 +###############################
197.78 +#Resources found in the file: ServerMultiViewElement.java
197.79 +###############################
197.80 +
197.81 +
197.82 +# ServerGeneralInfoPanel.class
197.83 +# ServerMultiViewElement.class
197.84 +TTL_Server_Information=\u670d\u52a1\u5668\u4fe1\u606f
197.85 +
197.86 +###############################
197.87 +#Resources found in the file: ClientOptionsPanel.java
197.88 +###############################
197.89 +
197.90 +# ClientOptionsPanel.class
197.91 +LBL_Generate_Stubs=\u751f\u6210\u6869\u6a21\u5757(&N)
197.92 +LABEL_Generate_Grouped_Calls=\u751f\u6210\u5206\u7ec4\u8c03\u7528
197.93 +
197.94 +LABEL_Floating_Point=\u5141\u8bb8\u6d6e\u70b9(&F)
197.95 +LABEL_Client_Tracing=\u751f\u6210\u8ddf\u8e2a\u4ee3\u7801
197.96 +
197.97 +###############################
197.98 +#Resources found in the file: ClientGeneralInfoPanel.java
197.99 +###############################
197.100 +
197.101 +# ClientGeneralInfoPanel.class
197.102 +LABEL_Package=\u5305(&K):
197.103 +LABEL_Client_Name=\u5ba2\u6237\u7aef\u540d\u79f0(&C):
197.104 +LABEL_Project=\u9879\u76ee(&P):
197.105 +
197.106 +###############################
197.107 +#Resources found in the file: ServicesPanel.java
197.108 +###############################
197.109 +
197.110 +# ServicesPanel.class
197.111 +
197.112 +LBL_Methods=\u65b9\u6cd5(&S):
197.113 +LBL_Operations=\u64cd\u4f5c(&S):
197.114 +MSG_WaitComputingMethods=\u8bf7\u7a0d\u5019, \u6b63\u5728\u8ba1\u7b97\u53ef\u7528\u7684\u65b9\u6cd5...
197.115 +ERR_MissingServiceSelection=\u81f3\u5c11\u8981\u9009\u62e9\u4e00\u4e2a\u670d\u52a1\u64cd\u4f5c
197.116 +MSG_NoMethodAvailable=\u8be5\u9879\u76ee\u4e2d\u65e0\u6709\u6548\u7684\u65b9\u6cd5
197.117 +MSG_WebProjectNotBuilt=\u5fc5\u987b\u5728\u751f\u6210 Web \u670d\u52a1\u5ba2\u6237\u7aef\u4e4b\u524d\u751f\u6210 Web \u9879\u76ee!
197.118 +
197.119 +###################################
197.120 +#Resources not used in the package
197.121 +###################################
197.122 +
197.123 +#LABEL_CreateSampleMidlet=Create sample MIDlet
197.124 +#MNM_Sample_MIDlet=D
197.125 +ERR_File_AlreadyExists=\u6587\u4ef6\u5df2\u5728\u9009\u5b9a\u7684\u76ee\u5f55\u4e2d\u5b58\u5728
197.126 +
197.127 +
197.128 +LABEL_Client_DataBinding=\u751f\u6210\u6570\u636e\u7ed1\u5b9a\u7ed3\u6784(&T)
197.129 +
197.130 +TXT_InvalidOperation=\u5728\u7aef\u53e3\u5b9a\u4e49\u4e2d\u627e\u4e0d\u5230\u5e26\u6709\u53c2\u6570{1}\u7684\u64cd\u4f5c{0}
197.131 +TXT_InvalidOperationNoParam=\u5728\u7aef\u53e3\u5b9a\u4e49\u4e2d\u627e\u4e0d\u5230\u64cd\u4f5c{0}
197.132 +
198.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
198.2 +++ b/src/zh_CN/mobility/mobility-end2end/mobility-end2end/org/netbeans/modules/mobility/end2end/output/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
198.3 @@ -0,0 +1,46 @@
198.4 +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
198.5 +#
198.6 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
198.7 +#
198.8 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
198.9 +# Other names may be trademarks of their respective owners.
198.10 +#
198.11 +# The contents of this file are subject to the terms of either the GNU
198.12 +# General Public License Version 2 only ("GPL") or the Common
198.13 +# Development and Distribution License("CDDL") (collectively, the
198.14 +# "License"). You may not use this file except in compliance with the
198.15 +# License. You can obtain a copy of the License at
198.16 +# http://www.netbeans.org/cddl-gplv2.html
198.17 +# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
198.18 +# specific language governing permissions and limitations under the
198.19 +# License. When distributing the software, include this License Header
198.20 +# Notice in each file and include the License file at
198.21 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
198.22 +# particular file as subject to the "Classpath" exception as provided
198.23 +# by Oracle in the GPL Version 2 section of the License file that
198.24 +# accompanied this code. If applicable, add the following below the
198.25 +# License Header, with the fields enclosed by brackets [] replaced by
198.26 +# your own identifying information:
198.27 +# "Portions Copyrighted [year] [name of copyright owner]"
198.28 +#
198.29 +# Contributor(s):
198.30 +#
198.31 +# The Original Software is NetBeans. The Initial Developer of the Original
198.32 +# Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
198.33 +# Microsystems, Inc. All Rights Reserved.
198.34 +#
198.35 +# If you wish your version of this file to be governed by only the CDDL
198.36 +# or only the GPL Version 2, indicate your decision by adding
198.37 +# "[Contributor] elects to include this software in this distribution
198.38 +# under the [CDDL or GPL Version 2] license." If you do not indicate a
198.39 +# single choice of license, a recipient has the option to distribute
198.40 +# your version of this file under either the CDDL, the GPL Version 2 or
198.41 +# to extend the choice of license to its licensees as provided above.
198.42 +# However, if you add GPL Version 2 code and therefore, elected the GPL
198.43 +# Version 2 license, then the option applies only if the new code is
198.44 +# made subject to such option by the copyright holder.
198.45 +
198.46 +# for translators: the text [WARNING] is used in textual log files to mark warning messages.
198.47 +# Can be translated if there is a policy to translate log file contents.
198.48 +TXT_Warning=[WARNING]
198.49 +
199.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
199.2 +++ b/src/zh_CN/mobility/mobility-end2end/mobility-end2end/org/netbeans/modules/mobility/end2end/resources/descriptions/MIDP/E2EWebApplication_wsclient_zh_CN.html Thu Feb 27 00:43:29 2014 -0800
199.3 @@ -0,0 +1,13 @@
199.4 +<!--
199.5 + * Copyright � 2002 Sun Microsystems, Inc. All rights reserved.
199.6 + * SUN PROPRIETARY/CONFIDENTIAL
199.7 + * Use is subject to license terms.
199.8 +-->
199.9 +
199.10 +<html>
199.11 +<head>
199.12 +<meta http-equiv="content-type" content="text/html; charset=UTF-8">
199.13 +</head>
199.14 +<BODY>
199.15 +创建 Mobile 客户端以连接到服务器。<br> 生成 Java ME 类, 该类通过自动生成的 Servlet 中间件连接到现有的 Java EE 应用程序或 Web 服务提供器。
199.16 +</BODY></HTML>
200.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
200.2 +++ b/src/zh_CN/mobility/mobility-end2end/mobility-end2end/org/netbeans/modules/mobility/end2end/ui/editor/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
200.3 @@ -0,0 +1,51 @@
200.4 +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
200.5 +#
200.6 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
200.7 +#
200.8 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
200.9 +# Other names may be trademarks of their respective owners.
200.10 +#
200.11 +# The contents of this file are subject to the terms of either the GNU
200.12 +# General Public License Version 2 only ("GPL") or the Common
200.13 +# Development and Distribution License("CDDL") (collectively, the
200.14 +# "License"). You may not use this file except in compliance with the
200.15 +# License. You can obtain a copy of the License at
200.16 +# http://www.netbeans.org/cddl-gplv2.html
200.17 +# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
200.18 +# specific language governing permissions and limitations under the
200.19 +# License. When distributing the software, include this License Header
200.20 +# Notice in each file and include the License file at
200.21 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
200.22 +# particular file as subject to the "Classpath" exception as provided
200.23 +# by Oracle in the GPL Version 2 section of the License file that
200.24 +# accompanied this code. If applicable, add the following below the
200.25 +# License Header, with the fields enclosed by brackets [] replaced by
200.26 +# your own identifying information:
200.27 +# "Portions Copyrighted [year] [name of copyright owner]"
200.28 +#
200.29 +# Contributor(s):
200.30 +#
200.31 +# The Original Software is NetBeans. The Initial Developer of the Original
200.32 +# Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
200.33 +# Microsystems, Inc. All Rights Reserved.
200.34 +#
200.35 +# If you wish your version of this file to be governed by only the CDDL
200.36 +# or only the GPL Version 2, indicate your decision by adding
200.37 +# "[Contributor] elects to include this software in this distribution
200.38 +# under the [CDDL or GPL Version 2] license." If you do not indicate a
200.39 +# single choice of license, a recipient has the option to distribute
200.40 +# your version of this file under either the CDDL, the GPL Version 2 or
200.41 +# to extend the choice of license to its licensees as provided above.
200.42 +# However, if you add GPL Version 2 code and therefore, elected the GPL
200.43 +# Version 2 license, then the option applies only if the new code is
200.44 +# made subject to such option by the copyright holder.
200.45 +
200.46 +
200.47 +
200.48 +###############################
200.49 +#Resources found in the file: GenerateAction.java
200.50 +###############################
200.51 +
200.52 +# GenerateAction.class
200.53 +GENERATE_ACTION_LABEL=\u751f\u6210...
200.54 +
201.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
201.2 +++ b/src/zh_CN/mobility/mobility-end2end/mobility-end2end/org/netbeans/modules/mobility/end2end/ui/wizard/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
201.3 @@ -0,0 +1,165 @@
201.4 +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
201.5 +#
201.6 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
201.7 +#
201.8 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
201.9 +# Other names may be trademarks of their respective owners.
201.10 +#
201.11 +# The contents of this file are subject to the terms of either the GNU
201.12 +# General Public License Version 2 only ("GPL") or the Common
201.13 +# Development and Distribution License("CDDL") (collectively, the
201.14 +# "License"). You may not use this file except in compliance with the
201.15 +# License. You can obtain a copy of the License at
201.16 +# http://www.netbeans.org/cddl-gplv2.html
201.17 +# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
201.18 +# specific language governing permissions and limitations under the
201.19 +# License. When distributing the software, include this License Header
201.20 +# Notice in each file and include the License file at
201.21 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
201.22 +# particular file as subject to the "Classpath" exception as provided
201.23 +# by Oracle in the GPL Version 2 section of the License file that
201.24 +# accompanied this code. If applicable, add the following below the
201.25 +# License Header, with the fields enclosed by brackets [] replaced by
201.26 +# your own identifying information:
201.27 +# "Portions Copyrighted [year] [name of copyright owner]"
201.28 +#
201.29 +# Contributor(s):
201.30 +#
201.31 +# The Original Software is NetBeans. The Initial Developer of the Original
201.32 +# Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
201.33 +# Microsystems, Inc. All Rights Reserved.
201.34 +#
201.35 +# If you wish your version of this file to be governed by only the CDDL
201.36 +# or only the GPL Version 2, indicate your decision by adding
201.37 +# "[Contributor] elects to include this software in this distribution
201.38 +# under the [CDDL or GPL Version 2] license." If you do not indicate a
201.39 +# single choice of license, a recipient has the option to distribute
201.40 +# your version of this file under either the CDDL, the GPL Version 2 or
201.41 +# to extend the choice of license to its licensees as provided above.
201.42 +# However, if you add GPL Version 2 code and therefore, elected the GPL
201.43 +# Version 2 license, then the option applies only if the new code is
201.44 +# made subject to such option by the copyright holder.
201.45 +
201.46 +
201.47 +
201.48 +###############################
201.49 +#Global resources found in the package: ./end2end/src/org/netbeans/modules/mobility/end2end/ui/wizard
201.50 +###############################
201.51 +TITLE_clientTypeStep=Servlet \u548c\u5ba2\u6237\u7aef\u7c7b\u578b
201.52 +TITLE_serviceSelectionStep=Web \u9879\u76ee\u4e2d\u7684\u65b9\u6cd5
201.53 +TITLE_clientOptionsStep=\u5ba2\u6237\u7aef\u9009\u9879
201.54 +
201.55 +
201.56 +ERR_JavaTargetChooser_InvalidClass=\u7c7b\u540d\u65e0\u6548
201.57 +ERR_JavaTargetChooser_InvalidPackage=\u5305\u540d\u65e0\u6548
201.58 +ERR_NoWebServiceCombo=\u65e0\u53ef\u7528\u7684 Web \u670d\u52a1\u5f15\u7528
201.59 +ERR_NoWebService=\u6b64\u9879\u76ee\u4e0d\u5305\u542b\u4efb\u4f55 Web \u670d\u52a1\u5f15\u7528
201.60 +LBL_ClassClient=Web \u5e94\u7528\u7a0b\u5e8f\u7684 Java ME \u5ba2\u6237\u7aef
201.61 +LBL_ClassClientType=Web \u5e94\u7528\u7a0b\u5e8f\u4e2d\u7684\u65b9\u6cd5(&A)
201.62 +LBL_WebServiceClient=Web \u5e94\u7528\u7a0b\u5e8f\u7684 Java ME \u5ba2\u6237\u7aef
201.63 +
201.64 +###############################
201.65 +#Resources found in the file: ClientOptionsPanelGUI.java
201.66 +###############################
201.67 +
201.68 +# ClientOptionsPanelGUI.class
201.69 +
201.70 +
201.71 +LBL_MIDPTargetChooserPanelGUI_DefaultPackage=<\u9ed8\u8ba4\u5305>
201.72 +LBL_ClientName=\u5ba2\u6237\u7aef\u540d\u79f0(&C):
201.73 +
201.74 +LBL_Client_Project=\u9879\u76ee(&J):
201.75 +
201.76 +LBL_Client_Package=\u5305(&P):
201.77 +
201.78 +LBL_Client_Created_File=\u521b\u5efa\u7684\u6587\u4ef6(&R):
201.79 +
201.80 +LBL_Generate_Stubs=\u751f\u6210\u6869\u6a21\u5757(&G)
201.81 +
201.82 +LBL_Generate_Grouped_Calls=\u751f\u6210\u5206\u7ec4\u8c03\u7528
201.83 +
201.84 +
201.85 +LBL_Floating_Point=\u5141\u8bb8\u6d6e\u70b9(&L)
201.86 +
201.87 +LBL_Client_Tracing_Code=\u751f\u6210\u8ddf\u8e2a\u4ee3\u7801
201.88 +
201.89 +
201.90 +LBL_Create_Sample_MIDlet=\u521b\u5efa\u6570\u636e\u7ed1\u5b9a\u7ed3\u6784(&D)
201.91 +
201.92 +
201.93 +###############################
201.94 +#Resources found in the file: ClientOptionsPanel.java
201.95 +###############################
201.96 +
201.97 +# ClientOptionsPanel.class
201.98 +ERR_File_AlreadyExists=\u6587\u4ef6{0}\u5df2\u5b58\u5728\u3002
201.99 +ERR_File_InvalidClassName=\u7c7b\u540d\u65e0\u6548\u3002
201.100 +ERR_File_InvalidPackageName=\u5305\u540d\u65e0\u6548\u3002
201.101 +MSG_NoGroupedCallMidlet=\u5728\u6837\u4f8b MIDlet \u4e2d\u5c06\u4e0d\u751f\u6210\u5206\u7ec4\u8c03\u7528\u7684\u65b9\u6cd5\u3002
201.102 +MSG_NoGroupedSampleMidlet=\u5c06\u4e0d\u751f\u6210\u5206\u7ec4\u8c03\u7528\u7684\u6837\u4f8b MIDlet\u3002
201.103 +ERR_File_NoClassName=\u5e94\u8be5\u6307\u5b9a\u5ba2\u6237\u7aef\u7c7b\u540d\u79f0
201.104 +
201.105 +# Ungroupped
201.106 +ERR_File_NoGUI=\u65e0\u6cd5\u5b9e\u4f8b\u5316 GUI
201.107 +
201.108 +###############################
201.109 +#Resources found in the file: GenericServiceIterator.java
201.110 +###############################
201.111 +
201.112 +# GenericServiceIterator.class
201.113 +TITLE_firstStep=\u9009\u62e9\u6587\u4ef6\u7c7b\u578b
201.114 +TITLE_operationSelectionStep=Web \u670d\u52a1\u64cd\u4f5c
201.115 +
201.116 +# Template values
201.117 +Templates/j2me/E2EWebApplication.wsclient=Web \u5e94\u7528\u7a0b\u5e8f\u7684 Java ME \u5ba2\u6237\u7aef
201.118 +
201.119 +###############################
201.120 +#Resources found in the file: ServiceSelectionPanel.java
201.121 +###############################
201.122 +
201.123 +# ServiceSelectionPanel.class
201.124 +ERR_NoService=\u81f3\u5c11\u8981\u9009\u62e9\u4e00\u4e2a\u670d\u52a1
201.125 +
201.126 +###############################
201.127 +#Resources found in the file: WebApplicationPanel.java
201.128 +###############################
201.129 +
201.130 +# WebApplicationPanel.class
201.131 +LBL_Title=\u6307\u5b9a\u65b0 Servlet \u7684\u540d\u79f0, \u8be5 Servlet \u5c06\u6267\u884c Java ME \u5ba2\u6237\u7aef\u548c Web \u5e94\u7528\u7a0b\u5e8f\u4e4b\u95f4\u7684\u901a\u4fe1\u3002
201.132 +ACSN_Web_Application_Panel=Web \u5e94\u7528\u7a0b\u5e8f\u9762\u677f
201.133 +LBL_Open_WebProject=\u6253\u5f00 Web \u9879\u76ee...
201.134 +LBL_No_WebProject=<\u65e0 Web \u9879\u76ee>
201.135 +
201.136 +LBL_Web_Application=Web \u5e94\u7528\u7a0b\u5e8f(&W):
201.137 +LBL_Servlet_Name=Servlet \u540d\u79f0(&S):
201.138 +
201.139 +LBL_Location=\u4f4d\u7f6e(&L):
201.140 +
201.141 +LBL_Server_Package=\u5305(&P):
201.142 +
201.143 +LBL_Server_Created_File=\u521b\u5efa\u7684\u6587\u4ef6(&F):
201.144 +
201.145 +ERR_NoProject=\u5fc5\u987b\u6307\u5b9a Web \u9879\u76ee\u3002
201.146 +ERR_NoWebProject=\u5fc5\u987b\u6307\u5b9a Web \u9879\u76ee\u3002
201.147 +ERR_File_NoTargetName=\u5e94\u8be5\u6307\u5b9a Servlet \u7c7b\u540d\u79f0
201.148 +MSG_fs_or_folder_does_not_exist=\u6587\u4ef6\u5939\u4e0d\u5b58\u5728
201.149 +MSG_fs_is_readonly=\u6587\u4ef6\u5939\u662f\u53ea\u8bfb\u7684
201.150 +MSG_file_already_exist=\u6587\u4ef6{0}\u5df2\u5b58\u5728\u3002
201.151 +MSG_ComputingWebServices=\u6b63\u5728\u8ba1\u7b97 Web \u670d\u52a1\u5ba2\u6237\u7aef...
201.152 +ERR_NoWebServiceInProject=\u9879\u76ee\u4e2d\u65e0\u53ef\u7528\u7684 Web \u670d\u52a1\u5ba2\u6237\u7aef
201.153 +LBL_JavaTargetChooserPanelGUI_DefaultPackage=<\u9ed8\u8ba4\u5305>
201.154 +ERR_JavaTargetChooser_DefaultPackage=\u8b66\u544a: \u5f3a\u70c8\u5efa\u8bae\u60a8\u4ece JDK 1.4 \u7248\u672c\u8d77<b>\u4e0d</b>\u8981\u5c06 Java \u7c7b\u653e\u5165\u9ed8\u8ba4\u5305\u4e2d\u3002
201.155 +ERR_Unselected_Client_Type=\u8bf7\u9009\u62e9\u5ba2\u6237\u7aef\u7c7b\u578b\u9009\u9879
201.156 +ERR_WebServiceNotCompiled=\u5fc5\u987b\u5728\u4f7f\u7528 Web \u670d\u52a1\u5e94\u7528\u7a0b\u5e8f\u7684 Java ME \u5ba2\u6237\u7aef\u4e4b\u524d\u751f\u6210 Web \u9879\u76ee
201.157 +LBL_ServiceTypeSelection=Java ME \u5ba2\u6237\u7aef\u4f7f\u7528:
201.158 +LBL_WebServiceClientType=Web \u5e94\u7528\u7a0b\u5e8f\u4e2d\u7684 Web \u670d\u52a1\u5ba2\u6237\u7aef(&N):
201.159 +
201.160 +
201.161 +ERR_Project_Missing_Source_Folders=\u9879\u76ee\u6ca1\u6709\u6709\u6548\u7684\u6e90\u76ee\u5f55\u7ed3\u6784\u3002
201.162 +
201.163 +###################################
201.164 +#Resources not used in the package
201.165 +###################################
201.166 +LBL_ServiceCombo=Web \u670d\u52a1\u5f15\u7528:
201.167 +
201.168 +
202.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
202.2 +++ b/src/zh_CN/mobility/mobility-end2end/mobility-end2end/org/netbeans/modules/mobility/end2end/util/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
202.3 @@ -0,0 +1,63 @@
202.4 +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
202.5 +#
202.6 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
202.7 +#
202.8 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
202.9 +# Other names may be trademarks of their respective owners.
202.10 +#
202.11 +# The contents of this file are subject to the terms of either the GNU
202.12 +# General Public License Version 2 only ("GPL") or the Common
202.13 +# Development and Distribution License("CDDL") (collectively, the
202.14 +# "License"). You may not use this file except in compliance with the
202.15 +# License. You can obtain a copy of the License at
202.16 +# http://www.netbeans.org/cddl-gplv2.html
202.17 +# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
202.18 +# specific language governing permissions and limitations under the
202.19 +# License. When distributing the software, include this License Header
202.20 +# Notice in each file and include the License file at
202.21 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
202.22 +# particular file as subject to the "Classpath" exception as provided
202.23 +# by Oracle in the GPL Version 2 section of the License file that
202.24 +# accompanied this code. If applicable, add the following below the
202.25 +# License Header, with the fields enclosed by brackets [] replaced by
202.26 +# your own identifying information:
202.27 +# "Portions Copyrighted [year] [name of copyright owner]"
202.28 +#
202.29 +# Contributor(s):
202.30 +#
202.31 +# The Original Software is NetBeans. The Initial Developer of the Original
202.32 +# Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
202.33 +# Microsystems, Inc. All Rights Reserved.
202.34 +#
202.35 +# If you wish your version of this file to be governed by only the CDDL
202.36 +# or only the GPL Version 2, indicate your decision by adding
202.37 +# "[Contributor] elects to include this software in this distribution
202.38 +# under the [CDDL or GPL Version 2] license." If you do not indicate a
202.39 +# single choice of license, a recipient has the option to distribute
202.40 +# your version of this file under either the CDDL, the GPL Version 2 or
202.41 +# to extend the choice of license to its licensees as provided above.
202.42 +# However, if you add GPL Version 2 code and therefore, elected the GPL
202.43 +# Version 2 license, then the option applies only if the new code is
202.44 +# made subject to such option by the copyright holder.
202.45 +
202.46 +
202.47 +
202.48 +###############################
202.49 +#Resources found in the file: Util.java
202.50 +###############################
202.51 +
202.52 +# Sample ResourceBundle properties file
202.53 +ERR_NoWebProject=\u9009\u5b9a\u7684\u9879\u76ee\u4e0d\u662f\u6709\u6548\u7684 Web \u9879\u76ee\u3002
202.54 +MSG_notProjectDir=\u4e0d\u662f\u9879\u76ee\u76ee\u5f55
202.55 +TXT_servletElementDescription=\u4e3a Web \u5e94\u7528\u7a0b\u5e8f\u7684 Java ME \u5ba2\u6237\u7aef\u751f\u6210\u7684 Servlet
202.56 +LBL_DefaultPackage=<\u9ed8\u8ba4\u5305>
202.57 +
202.58 +HTML_Notification=<html><font color=red>{0}</font></html>
202.59 +TXT_InvalidTypeOperation=\u64cd\u4f5c\u5305\u542b\u4e0d\u652f\u6301\u7684\u7c7b\u578b:
202.60 +TXT_InvalidTypesOperation=\u64cd\u4f5c\u5305\u542b\u4e0d\u652f\u6301\u7684\u7c7b\u578b:
202.61 +TXT_InvalidReturnType=\u8fd4\u56de\u7c7b\u578b{0}
202.62 +TXT_InvalidParameterType=\u53c2\u6570\u7c7b\u578b
202.63 +TXT_InvalidParameterTypes=\u53c2\u6570\u7c7b\u578b
202.64 +
202.65 +ERR_NoDeploymentDescriptor=\u5728 Servlet \u6ce8\u518c\u671f\u95f4\u51fa\u73b0\u9519\u8bef: \u627e\u4e0d\u5230\u90e8\u7f72\u63cf\u8ff0, \u65e0\u6cd5\u521b\u5efa\u65b0\u7684\u90e8\u7f72\u63cf\u8ff0
202.66 +
203.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
203.2 +++ b/src/zh_CN/mobility/mobility-jsr172/mobility-jsr172/org/netbeans/modules/e2e/wsdl/wsdl2java/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
203.3 @@ -0,0 +1,28 @@
203.4 +# Error messages
203.5 +0001= \u64cd\u4f5c{0}\u6837\u5f0f\u5fc5\u987b\u4e3a DOCUMENT
203.6 +0002= \u64cd\u4f5c{0}\u4e3b\u4f53{1}\u4f7f\u7528\u5fc5\u987b\u4e3a LITERAL
203.7 +0003= \u57fa\u672c\u7c7b\u578b{0}\u65e0\u6548
203.8 +0004= \u5143\u7d20 {0} \u4e2d\u5b58\u5728\u4e0d\u652f\u6301\u7684\u6807\u8bb0
203.9 +0005= \u5143\u7d20 {0} \u4e2d\u5b58\u5728\u65e0\u6548\u7684\u5b50\u7ed3\u6784
203.10 +0006= \u64cd\u4f5c{0}\u4e0d\u80fd\u5305\u542b\u591a\u4e2a\u6d88\u606f\u90e8\u4ef6
203.11 +0007= \u64cd\u4f5c\u5fc5\u987b\u4e3a\u8bf7\u6c42-\u54cd\u5e94\u3002\u64cd\u4f5c{0}\u7f3a\u5c11 <ouput>
203.12 +0008= \u64cd\u4f5c "{1}" \u7684\u6d88\u606f "{0}" \u5f15\u7528\u7684\u90e8\u4ef6 "{2}" \u7f3a\u5c11 "element" \u5c5e\u6027\u3002
203.13 +0009= \u64cd\u4f5c\u5fc5\u987b\u4e3a\u8bf7\u6c42-\u54cd\u5e94\u3002\u64cd\u4f5c{0}\u7f3a\u5c11 <input>
203.14 +0010= \u53c2\u6570\u7c7b\u578b\u5305\u542b\u5faa\u73af\u5f15\u7528\u3002\u65e0\u6cd5\u4e3a\u8be5\u7c7b\u578b\u751f\u6210\u6869\u6a21\u5757\u3002
203.15 +0011= \u4e0d\u5141\u8bb8\u5728\u7ed1\u5b9a{0}\u4e2d\u5305\u542b\u591a\u4e2a soap:operation\u3002
203.16 +0012= \u64cd\u4f5c\u7ed1\u5b9a{0}\u4e2d\u7f3a\u5c11\u7ed1\u5b9a\u8f93\u5165\u6807\u8bb0
203.17 +0013= \u64cd\u4f5c\u7ed1\u5b9a{0}\u4e2d\u7f3a\u5c11\u7ed1\u5b9a\u8f93\u51fa\u6807\u8bb0
203.18 +0014= \u6d88\u606f{0}\u4e2d\u7f3a\u5c11\u90e8\u4ef6\u6807\u8bb0
203.19 +0015= QName \u7c7b\u578b\u9700\u8981\u7528\u6237\u5b9e\u73b0\u3002\u8bf7\u53c2\u89c1\u6e90\u4ee3\u7801\u4e2d\u7684 TODO\u3002
203.20 +0016= \u7ed1\u5b9a "{0}" \u5305\u542b\u672a\u89e3\u6790\u7684\u7aef\u53e3\u7c7b\u578b\u5f15\u7528{1}\u3002\u8bf7\u68c0\u67e5 "type" \u7ed1\u5b9a\u5c5e\u6027\u6216 "targetNamespace" \u5b9a\u4e49\u5c5e\u6027\u3002
203.21 +0017 = \u64cd\u4f5c "{0}" \u5305\u542b\u672a\u89e3\u6790\u7684\u8f93\u51fa\u6d88\u606f\u5f15\u7528{1}\u3002\u8bf7\u68c0\u67e5 "message" \u8f93\u51fa\u5c5e\u6027\u6216 "targetNamespace" \u5b9a\u4e49\u5c5e\u6027\u3002
203.22 +0018 = \u64cd\u4f5c "{0}" \u5305\u542b\u672a\u89e3\u6790\u7684\u8f93\u5165\u6d88\u606f\u5f15\u7528{1}\u3002\u8bf7\u68c0\u67e5 "message" \u8f93\u5165\u5c5e\u6027\u6216 "targetNamespace" \u5b9a\u4e49\u5c5e\u6027\u3002
203.23 +0019 = \u64cd\u4f5c "{1}" \u7684\u8f93\u51fa\u6d88\u606f "{0}" \u5f15\u7528\u7684\u90e8\u4ef6 "{2}" \u7684 "element" \u5c5e\u6027\u65e0\u6cd5\u89e3\u6790\u4e3a\u65b9\u6848\u5143\u7d20\u3002
203.24 +0020 = \u64cd\u4f5c "{1}" \u7684\u8f93\u5165\u6d88\u606f "{0}" \u5f15\u7528\u7684\u90e8\u4ef6 "{2}" \u7684 "element" \u5c5e\u6027\u65e0\u6cd5\u89e3\u6790\u4e3a\u65b9\u6848\u5143\u7d20\u3002
203.25 +0021 = \u64cd\u4f5c "{1}" \u7684\u8f93\u51fa\u6d88\u606f "{0}" \u5f15\u7528\u7684\u90e8\u4ef6 "{2}" \u7684 "type" \u5c5e\u6027\u65e0\u6cd5\u89e3\u6790\u4e3a\u65b9\u6848\u7c7b\u578b\u3002
203.26 +0022 = \u64cd\u4f5c "{1}" \u7684\u8f93\u5165\u6d88\u606f "{0}" \u5f15\u7528\u7684\u90e8\u4ef6 "{2}" \u7684 "type" \u5c5e\u6027\u65e0\u6cd5\u89e3\u6790\u4e3a\u7c7b\u578b\u5143\u7d20\u3002
203.27 +0023 = \u64cd\u4f5c "{1}" \u7684\u8f93\u51fa\u6d88\u606f "{0}" \u540c\u65f6\u5305\u542b "element" \u548c "type" \u5c5e\u6027\u3002
203.28 +0024 = \u64cd\u4f5c "{1}" \u7684\u8f93\u5165\u6d88\u606f "{0}" \u540c\u65f6\u5305\u542b "element" \u548c "type" \u5c5e\u6027\u3002
203.29 +0025= \u7c7b\u578b{0}\u4e2d\u5b58\u5728\u65e0\u6548\u7684\u5b50\u7ed3\u6784
203.30 +0026= \u7c7b\u578b{0}\u4e2d\u5b58\u5728\u4e0d\u652f\u6301\u7684\u6807\u8bb0
203.31 +
204.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
204.2 +++ b/src/zh_CN/mobility/mobility-jsr172/mobility-jsr172/org/netbeans/modules/mobility/jsr172/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
204.3 @@ -0,0 +1,52 @@
204.4 +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
204.5 +#
204.6 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
204.7 +#
204.8 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
204.9 +# Other names may be trademarks of their respective owners.
204.10 +#
204.11 +# The contents of this file are subject to the terms of either the GNU
204.12 +# General Public License Version 2 only ("GPL") or the Common
204.13 +# Development and Distribution License("CDDL") (collectively, the
204.14 +# "License"). You may not use this file except in compliance with the
204.15 +# License. You can obtain a copy of the License at
204.16 +# http://www.netbeans.org/cddl-gplv2.html
204.17 +# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
204.18 +# specific language governing permissions and limitations under the
204.19 +# License. When distributing the software, include this License Header
204.20 +# Notice in each file and include the License file at
204.21 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
204.22 +# particular file as subject to the "Classpath" exception as provided
204.23 +# by Oracle in the GPL Version 2 section of the License file that
204.24 +# accompanied this code. If applicable, add the following below the
204.25 +# License Header, with the fields enclosed by brackets [] replaced by
204.26 +# your own identifying information:
204.27 +# "Portions Copyrighted [year] [name of copyright owner]"
204.28 +#
204.29 +# Contributor(s):
204.30 +#
204.31 +# The Original Software is NetBeans. The Initial Developer of the Original
204.32 +# Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
204.33 +# Microsystems, Inc. All Rights Reserved.
204.34 +#
204.35 +# If you wish your version of this file to be governed by only the CDDL
204.36 +# or only the GPL Version 2, indicate your decision by adding
204.37 +# "[Contributor] elects to include this software in this distribution
204.38 +# under the [CDDL or GPL Version 2] license." If you do not indicate a
204.39 +# single choice of license, a recipient has the option to distribute
204.40 +# your version of this file under either the CDDL, the GPL Version 2 or
204.41 +# to extend the choice of license to its licensees as provided above.
204.42 +# However, if you add GPL Version 2 code and therefore, elected the GPL
204.43 +# Version 2 license, then the option applies only if the new code is
204.44 +# made subject to such option by the copyright holder.
204.45 +
204.46 +
204.47 +
204.48 +###################################
204.49 +#Resources not used in the package
204.50 +###################################
204.51 +OpenIDE-Module-Display-Category=Java ME
204.52 +OpenIDE-Module-Long-Description=Java ME Web \u670d\u52a1\u5ba2\u6237\u7aef (JSR 172) \u7684\u6869\u6a21\u5757\u751f\u6210\u5668
204.53 +OpenIDE-Module-Name=Java ME Web \u670d\u52a1\u5ba2\u6237\u7aef (JSR 172)
204.54 +OpenIDE-Module-Short-Description=Java ME Web \u670d\u52a1\u5ba2\u6237\u7aef (JSR 172) \u7684\u6869\u6a21\u5757\u751f\u6210\u5668
204.55 +
205.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
205.2 +++ b/src/zh_CN/mobility/mobility-jsr172/mobility-jsr172/org/netbeans/modules/mobility/jsr172/generator/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
205.3 @@ -0,0 +1,56 @@
205.4 +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
205.5 +#
205.6 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
205.7 +#
205.8 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
205.9 +# Other names may be trademarks of their respective owners.
205.10 +#
205.11 +# The contents of this file are subject to the terms of either the GNU
205.12 +# General Public License Version 2 only ("GPL") or the Common
205.13 +# Development and Distribution License("CDDL") (collectively, the
205.14 +# "License"). You may not use this file except in compliance with the
205.15 +# License. You can obtain a copy of the License at
205.16 +# http://www.netbeans.org/cddl-gplv2.html
205.17 +# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
205.18 +# specific language governing permissions and limitations under the
205.19 +# License. When distributing the software, include this License Header
205.20 +# Notice in each file and include the License file at
205.21 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
205.22 +# particular file as subject to the "Classpath" exception as provided
205.23 +# by Oracle in the GPL Version 2 section of the License file that
205.24 +# accompanied this code. If applicable, add the following below the
205.25 +# License Header, with the fields enclosed by brackets [] replaced by
205.26 +# your own identifying information:
205.27 +# "Portions Copyrighted [year] [name of copyright owner]"
205.28 +#
205.29 +# Contributor(s):
205.30 +#
205.31 +# The Original Software is NetBeans. The Initial Developer of the Original
205.32 +# Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
205.33 +# Microsystems, Inc. All Rights Reserved.
205.34 +#
205.35 +# If you wish your version of this file to be governed by only the CDDL
205.36 +# or only the GPL Version 2, indicate your decision by adding
205.37 +# "[Contributor] elects to include this software in this distribution
205.38 +# under the [CDDL or GPL Version 2] license." If you do not indicate a
205.39 +# single choice of license, a recipient has the option to distribute
205.40 +# your version of this file under either the CDDL, the GPL Version 2 or
205.41 +# to extend the choice of license to its licensees as provided above.
205.42 +# However, if you add GPL Version 2 code and therefore, elected the GPL
205.43 +# Version 2 license, then the option applies only if the new code is
205.44 +# made subject to such option by the copyright holder.
205.45 +
205.46 +
205.47 +
205.48 +###############################
205.49 +#Resources found in the file: Jsr172Generator.java
205.50 +###############################
205.51 +
205.52 +#Jsr172Generator.java
205.53 +MSG_GeneratingJsr172=\u6b63\u5728\u751f\u6210 Java ME Web \u670d\u52a1\u5ba2\u6237\u7aef...
205.54 +MSG_GeneratingTempJsr172=\u6b63\u5728\u751f\u6210\u8bbe\u7f6e\u6587\u4ef6...
205.55 +MSG_GeneratingStubs172=\u6b63\u5728\u751f\u6210 Java ME Web \u670d\u52a1\u6869\u6a21\u5757...
205.56 +MSG_file_disapeared={0}\u6587\u4ef6\u4e0d\u5b58\u5728!
205.57 +MSG_Success=\u5df2\u6210\u529f\u751f\u6210 Java ME Web \u670d\u52a1\u5ba2\u6237\u7aef
205.58 +MSG_Failure=Java ME Web \u670d\u52a1\u5ba2\u6237\u7aef\u6869\u6a21\u5757\u751f\u6210\u5931\u8d25!
205.59 +
206.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
206.2 +++ b/src/zh_CN/mobility/mobility-jsr172/mobility-jsr172/org/netbeans/modules/mobility/jsr172/multiview/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
206.3 @@ -0,0 +1,117 @@
206.4 +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
206.5 +#
206.6 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
206.7 +#
206.8 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
206.9 +# Other names may be trademarks of their respective owners.
206.10 +#
206.11 +# The contents of this file are subject to the terms of either the GNU
206.12 +# General Public License Version 2 only ("GPL") or the Common
206.13 +# Development and Distribution License("CDDL") (collectively, the
206.14 +# "License"). You may not use this file except in compliance with the
206.15 +# License. You can obtain a copy of the License at
206.16 +# http://www.netbeans.org/cddl-gplv2.html
206.17 +# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
206.18 +# specific language governing permissions and limitations under the
206.19 +# License. When distributing the software, include this License Header
206.20 +# Notice in each file and include the License file at
206.21 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
206.22 +# particular file as subject to the "Classpath" exception as provided
206.23 +# by Oracle in the GPL Version 2 section of the License file that
206.24 +# accompanied this code. If applicable, add the following below the
206.25 +# License Header, with the fields enclosed by brackets [] replaced by
206.26 +# your own identifying information:
206.27 +# "Portions Copyrighted [year] [name of copyright owner]"
206.28 +#
206.29 +# Contributor(s):
206.30 +#
206.31 +# The Original Software is NetBeans. The Initial Developer of the Original
206.32 +# Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
206.33 +# Microsystems, Inc. All Rights Reserved.
206.34 +#
206.35 +# If you wish your version of this file to be governed by only the CDDL
206.36 +# or only the GPL Version 2, indicate your decision by adding
206.37 +# "[Contributor] elects to include this software in this distribution
206.38 +# under the [CDDL or GPL Version 2] license." If you do not indicate a
206.39 +# single choice of license, a recipient has the option to distribute
206.40 +# your version of this file under either the CDDL, the GPL Version 2 or
206.41 +# to extend the choice of license to its licensees as provided above.
206.42 +# However, if you add GPL Version 2 code and therefore, elected the GPL
206.43 +# Version 2 license, then the option applies only if the new code is
206.44 +# made subject to such option by the copyright holder.
206.45 +
206.46 +
206.47 +
206.48 +CTL_ClientTabCaption=\u5ba2\u6237\u7aef
206.49 +###############################
206.50 +#Global resources found in the package: ./end2end/jsr172/src/org/netbeans/modules/mobility/jsr172/multiview
206.51 +###############################
206.52 +ERR_UrlIsNotValid=WSDL URL \u65e0\u6548
206.53 +MSG_Refreshing=\u6b63\u5728\u5237\u65b0 wsdl...
206.54 +MSG_WSDL_Changed=Wsdl \u6587\u4ef6\u5df2\u66f4\u6539, \u662f\u5426\u8981\u66ff\u6362\u672c\u5730\u7248\u672c?
206.55 +
206.56 +###############################
206.57 +#Resources found in the file: WsdlUpdater.java
206.58 +###############################
206.59 +
206.60 +#WsdlUpdater
206.61 +MSG_RefreshingWsdl=\u6b63\u5728\u66f4\u65b0 wsdl \u6587\u4ef6...
206.62 +MSG_WSDL_Unchanged=\u66f4\u65b0\u5df2\u5b8c\u6210, \u672a\u66f4\u6539 wsdl \u6587\u4ef6\u3002
206.63 +MSG_WSDL_ChangedTitle=Wsdl \u6587\u4ef6\u5df2\u66f4\u6539\u3002
206.64 +MSG_Stopping=\u6b63\u5728\u505c\u6b62\u4e0b\u8f7d...
206.65 +
206.66 +###############################
206.67 +#Resources found in the file: Jsr172ClientOptionsPanel.java
206.68 +###############################
206.69 +LABEL_Floating_Point=\u6d6e\u70b9
206.70 +LABEL_Floating_Point_To_String=\u5c06\u6d6e\u70b9\u8f6c\u6362\u4e3a\u5b57\u7b26\u4e32
206.71 +LABLE_DataBinding=\u751f\u6210\u6570\u636e\u7ed1\u5b9a\u7ed3\u6784
206.72 +
206.73 +###############################
206.74 +#Resources found in the file: JSR172ServicePanel.java
206.75 +###############################
206.76 +WSDL_URL_Label=WSDL URL:
206.77 +LBL_Generate=\u751f\u6210\u6869\u6a21\u5757(&G)
206.78 +Label_Refresh_WSDL=\u5237\u65b0 WSDL
206.79 +
206.80 +###############################
206.81 +#Resources found in the file: ClientGeneralInfoPanel.java
206.82 +###############################
206.83 +LABEL_Package=\u5305:
206.84 +LABEL_Client_Name=\u5ba2\u6237\u7aef\u540d\u79f0:
206.85 +LABEL_Project=\u9879\u76ee:
206.86 +ERR_ProjectNameIsNotValid=\u9879\u76ee\u540d\u79f0\u65e0\u6548
206.87 +ERR_ClientNameIsNotValid=\u5ba2\u6237\u7aef\u540d\u79f0\u65e0\u6548
206.88 +
206.89 +###############################
206.90 +#Resources found in the file: Jsr172ClientMultiViewElement.java
206.91 +###############################
206.92 +TTL_ServicesSection=\u5bfc\u51fa\u7684\u670d\u52a1
206.93 +TTL_ClientGeneralInfoSection=\u5ba2\u6237\u7aef\u4fe1\u606f
206.94 +TTL_ClientOptionsSection=\u5ba2\u6237\u7aef\u9009\u9879
206.95 +
206.96 +###################################
206.97 +#Resources not used in the package
206.98 +###################################
206.99 +TTL_ServerConfig=\u670d\u52a1\u5668\u4fe1\u606f
206.100 +LABEL_Generate_Grouped_Calls=\u751f\u6210\u5206\u7ec4\u8c03\u7528
206.101 +LABEL_Synchronous=\u540c\u6b65
206.102 +LABEL_Generate_Stubs=\u751f\u6210\u6869\u6a21\u5757
206.103 +LABEL_Client_Tracing=\u751f\u6210\u8ddf\u8e2a\u4ee3\u7801
206.104 +LABEL_Protocol=\u901a\u4fe1\u534f\u8bae:
206.105 +LABEL_Exported_Services=\u5bfc\u51fa\u7684\u670d\u52a1:
206.106 +LABEL_Update=\u66f4\u65b0
206.107 +LABEL_Refresh=\u5237\u65b0
206.108 +LABEL_Servlet_Name=Servlet \u540d\u79f0:
206.109 +LABEL_Server_Tracking=\u751f\u6210\u8ddf\u8e2a\u4ee3\u7801
206.110 +LABEL_CreateSampleMidlet=\u521b\u5efa\u6837\u4f8b MIDlet
206.111 +ERR_ServiceMethodNotFound=config \u6587\u4ef6\u4e2d\u6307\u5b9a\u7684\u670d\u52a1\u4e0d\u5728 J2EE \u9879\u76ee\u4e2d
206.112 +ERR_MissingServiceSelection=\u81f3\u5c11\u8981\u9009\u62e9\u4e00\u4e2a\u670d\u52a1\u64cd\u4f5c
206.113 +LBL_Services=\u670d\u52a1:
206.114 +
206.115 +ERR_File_AlreadyExists=\u6587\u4ef6\u5df2\u5728\u9009\u5b9a\u7684\u76ee\u5f55\u4e2d\u5b58\u5728
206.116 +MSG_WaitComputingServices=\u8bf7\u7a0d\u5019, \u6b63\u5728\u8ba1\u7b97\u670d\u52a1...
206.117 +MSG_WaitComputingWebServices=\u8bf7\u7a0d\u5019, \u6b63\u5728\u51c6\u5907 Web \u670d\u52a1...
206.118 +TTL_ClientConfig=\u5ba2\u6237\u7aef
206.119 +TTL_ServicesConfig=\u670d\u52a1
206.120 +
207.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
207.2 +++ b/src/zh_CN/mobility/mobility-jsr172/mobility-jsr172/org/netbeans/modules/mobility/jsr172/resources/descriptions/MIDP/JSR172_wsclient_zh_CN.html Thu Feb 27 00:43:29 2014 -0800
207.3 @@ -0,0 +1,48 @@
207.4 +<!--
207.5 + -- DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
207.6 + --
207.7 + -- Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
207.8 + --
207.9 + -- The contents of this file are subject to the terms of either the GNU
207.10 + -- General Public License Version 2 only ("GPL") or the Common
207.11 + -- Development and Distribution License("CDDL") (collectively, the
207.12 + -- "License"). You may not use this file except in compliance with the
207.13 + -- License. You can obtain a copy of the License at
207.14 + -- http://www.netbeans.org/cddl-gplv2.html
207.15 + -- or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
207.16 + -- specific language governing permissions and limitations under the
207.17 + -- License. When distributing the software, include this License Header
207.18 + -- Notice in each file and include the License file at
207.19 + -- nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
207.20 + -- particular file as subject to the "Classpath" exception as provided
207.21 + -- by Sun in the GPL Version 2 section of the License file that
207.22 + -- accompanied this code. If applicable, add the following below the
207.23 + -- License Header, with the fields enclosed by brackets [] replaced by
207.24 + -- your own identifying information:
207.25 + -- "Portions Copyrighted [year] [name of copyright owner]"
207.26 + --
207.27 + -- Contributor(s):
207.28 + --
207.29 + -- The Original Software is NetBeans. The Initial Developer of the Original
207.30 + -- Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
207.31 + -- Microsystems, Inc. All Rights Reserved.
207.32 + --
207.33 + -- If you wish your version of this file to be governed by only the CDDL
207.34 + -- or only the GPL Version 2, indicate your decision by adding
207.35 + -- "[Contributor] elects to include this software in this distribution
207.36 + -- under the [CDDL or GPL Version 2] license." If you do not indicate a
207.37 + -- single choice of license, a recipient has the option to distribute
207.38 + -- your version of this file under either the CDDL, the GPL Version 2 or
207.39 + -- to extend the choice of license to its licensees as provided above.
207.40 + -- However, if you add GPL Version 2 code and therefore, elected the GPL
207.41 + -- Version 2 license, then the option applies only if the new code is
207.42 + -- made subject to such option by the copyright holder.
207.43 + -->
207.44 +
207.45 +<html>
207.46 +<head>
207.47 +<meta http-equiv="content-type" content="text/html; charset=UTF-8">
207.48 +</head>
207.49 +<BODY>
207.50 +创建新的 Java ME Web 服务 (JSR 172) 客户端。
207.51 +</BODY></HTML>
208.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
208.2 +++ b/src/zh_CN/mobility/mobility-jsr172/mobility-jsr172/org/netbeans/modules/mobility/jsr172/wizard/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
208.3 @@ -0,0 +1,182 @@
208.4 +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
208.5 +#
208.6 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
208.7 +#
208.8 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
208.9 +# Other names may be trademarks of their respective owners.
208.10 +#
208.11 +# The contents of this file are subject to the terms of either the GNU
208.12 +# General Public License Version 2 only ("GPL") or the Common
208.13 +# Development and Distribution License("CDDL") (collectively, the
208.14 +# "License"). You may not use this file except in compliance with the
208.15 +# License. You can obtain a copy of the License at
208.16 +# http://www.netbeans.org/cddl-gplv2.html
208.17 +# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
208.18 +# specific language governing permissions and limitations under the
208.19 +# License. When distributing the software, include this License Header
208.20 +# Notice in each file and include the License file at
208.21 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
208.22 +# particular file as subject to the "Classpath" exception as provided
208.23 +# by Oracle in the GPL Version 2 section of the License file that
208.24 +# accompanied this code. If applicable, add the following below the
208.25 +# License Header, with the fields enclosed by brackets [] replaced by
208.26 +# your own identifying information:
208.27 +# "Portions Copyrighted [year] [name of copyright owner]"
208.28 +#
208.29 +# Contributor(s):
208.30 +#
208.31 +# The Original Software is NetBeans. The Initial Developer of the Original
208.32 +# Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
208.33 +# Microsystems, Inc. All Rights Reserved.
208.34 +#
208.35 +# If you wish your version of this file to be governed by only the CDDL
208.36 +# or only the GPL Version 2, indicate your decision by adding
208.37 +# "[Contributor] elects to include this software in this distribution
208.38 +# under the [CDDL or GPL Version 2] license." If you do not indicate a
208.39 +# single choice of license, a recipient has the option to distribute
208.40 +# your version of this file under either the CDDL, the GPL Version 2 or
208.41 +# to extend the choice of license to its licensees as provided above.
208.42 +# However, if you add GPL Version 2 code and therefore, elected the GPL
208.43 +# Version 2 license, then the option applies only if the new code is
208.44 +# made subject to such option by the copyright holder.
208.45 +
208.46 +
208.47 +
208.48 +###############################
208.49 +#Global resources found in the package: ./end2end/jsr172/src/org/netbeans/modules/mobility/jsr172/wizard
208.50 +###############################
208.51 +LBL_WsdlSource=\u9009\u62e9\u8981\u6dfb\u52a0\u5230\u8be5\u9879\u76ee\u4e2d\u7684 Web \u670d\u52a1\u7684 WSDL \u63cf\u8ff0\u7684\u6e90\u6587\u4ef6\u3002
208.52 +LBL_WebServiceClient=Java ME Web \u670d\u52a1\u5ba2\u6237\u7aef
208.53 +LBL_Unknown=\u672a\u77e5
208.54 +ERR_DownloadFailed=\u4e0b\u8f7d\u5931\u8d25\u3002{0} (\u8bf7\u68c0\u67e5\u4ee3\u7406\u8bbe\u7f6e\u3002)
208.55 +ERR_WsdlDoesNotExist=WSDL \u6587\u4ef6\u4e0d\u5b58\u5728\u3002
208.56 +MSG_Validating=\u6b63\u5728\u9a8c\u8bc1...
208.57 +ACSD_WsdlSourceUrl=\u6307\u5b9a\u6b63\u5728\u8fd0\u884c\u7684\u670d\u52a1\u7684 URL
208.58 +ACSD_WsdlSourceFile=\u6307\u5b9a WSDL \u6587\u4ef6\u7684\u8def\u5f84
208.59 +MSG_NotWSI={0} \u4e0d\u7b26\u5408 Java ME Web \u670d\u52a1\u89c4\u8303 (JSR-172)\u3002
208.60 +
208.61 +###############################
208.62 +#Resources found in the file: ProxySettingsDlg.java
208.63 +###############################
208.64 +LBL_HttpProxyDlgTitle=\u4ee3\u7406\u8bbe\u7f6e
208.65 +LBL_HttpProxyHost=\u4ee3\u7406\u4e3b\u673a(&H):
208.66 +LBL_HttpProxyPort=\u7aef\u53e3(&P):
208.67 +ACSN_HttpProxyHost=\u4ee3\u7406\u670d\u52a1\u5668\u4e3b\u673a\u540d\u6216 IP
208.68 +ACSD_HttpProxyHost=\u6307\u5b9a\u4ee3\u7406\u670d\u52a1\u5668\u7684\u4e3b\u673a\u540d\u6216 IP
208.69 +ACSN_HttpProxyPort=\u4ee3\u7406\u670d\u52a1\u5668\u7aef\u53e3\u53f7
208.70 +ACSD_HttpProxyPort=\u6307\u5b9a\u4ee3\u7406\u670d\u52a1\u5668\u7684\u7aef\u53e3\u53f7
208.71 +ERR_PortSpecifiedWithoutHost=\u5982\u679c\u5c1a\u672a\u6307\u5b9a\u4ee3\u7406\u4e3b\u673a, \u5219\u4e5f\u4e0d\u5e94\u5f53\u6307\u5b9a\u4ee3\u7406\u7aef\u53e3\u3002
208.72 +ERR_MalformedProxyURL=\u4ee3\u7406\u670d\u52a1\u5668 URL \u7684\u683c\u5f0f\u9519\u8bef: {0}
208.73 +ERR_HostSpecifiedWithoutPort=\u73b0\u5728\u8bf7\u6307\u5b9a\u8fd0\u884c\u6b64\u4ee3\u7406\u4e3b\u673a\u7684\u7aef\u53e3\u3002
208.74 +ERR_PortNumberNegative=\u4ee3\u7406\u7aef\u53e3\u4e0d\u80fd\u4e3a\u8d1f\u503c\u3002
208.75 +ERR_PortNumberTooLarge=\u4ee3\u7406\u7aef\u53e3\u4e0d\u80fd\u5927\u4e8e {0}\u3002
208.76 +ERR_PortNumberInvalid=''{0}'' \u4e0d\u662f\u6709\u6548\u7684\u6574\u6570\u3002
208.77 +
208.78 +###############################
208.79 +#Resources found in the file: WsdlRetriever.java
208.80 +###############################
208.81 +
208.82 +#ERR_WsdlParseFailure=Unable to parse WSDL file for client: {0}
208.83 +#ERR_CannotOpenWsdlFile=Failed to retrieve File instance for ''{0}''.
208.84 +#ERR_NoBuildScript=Unable to locate build script to create client interfaces.
208.85 +#ERR_WsCompileFailed=WsCompile script failed during initial client generation.
208.86 +#ERR_NoWebServiceClientSupport=No web service client support found in selected project.
208.87 +#ERR_WsdlFileNotFound=Failed to retrieve FileObject instance for ''{0}''.
208.88 +#ERR_UnableToCreateTempFile=Unable to create temporary WSDL file ''{0}'' for client.
208.89 +#ERR_TempFileLocked=Temporary WSDL file ''{0}'' is locked and cannot be deleted.
208.90 +#ERR_TempFileNotDeleted=Temporary WSDL file ''{0}'' cannot be deleted. Error: {1}
208.91 +#MSG_WizCreateClient=Creating web service client.
208.92 +#MSG_WizAddToRegistry=Adding test client to registry...
208.93 +#MSG_WizCopyingWSDL=Processing WSDL and wscompile config files...
208.94 +#MSG_WizParsingWSDL=Extracting service information from WSDL...
208.95 +#MSG_WizUpdatingDD=Adding service-ref entry to deployment descriptor...
208.96 +#MSG_WizUpdatingBuildScript=Updating project build script...
208.97 +#MSG_WizGenerateClient=Running client generation script...
208.98 +#MSG_WizDone=Done.
208.99 +LBL_Ready=\u51c6\u5907\u5c31\u7eea\u3002
208.100 +LBL_Connecting=\u6b63\u5728\u8fde\u63a5...
208.101 +LBL_Downloading=\u6b63\u5728\u4e0b\u8f7d...
208.102 +LBL_Complete=\u5b8c\u6210
208.103 +
208.104 +LBL_Terminated=\u7ec8\u6b62\u3002
208.105 +LBL_UnknownFileType=\u6765\u81ea\u8be5 URL \u7684\u54cd\u5e94\u4e0d\u662f\u6709\u6548\u7684 WSDL \u6587\u4ef6\u3002
208.106 +ERR_Connection=\u8fde\u63a5\u5f02\u5e38\u9519\u8bef
208.107 +ERR_BadUrl=URL \u683c\u5f0f\u9519\u8bef
208.108 +ERR_IOException=I/O \u5f02\u5e38\u9519\u8bef
208.109 +MSG_SecureURL=\u6b63\u5728\u8bd5\u56fe\u8bbf\u95ee\u5b89\u5168\u7ad9\u70b9\u3002\u662f\u5426\u8981\u7ee7\u7eed\u6267\u884c?
208.110 +MSG_NoHttpsAccess=\u4e0d\u5141\u8bb8\u8fdb\u884c\u5b89\u5168\u8bbf\u95ee\u3002
208.111 +
208.112 +###############################
208.113 +#Resources found in the file: ClientInfo.java
208.114 +###############################
208.115 +TITLE_WebServiceClientWizard=Java ME Web \u670d\u52a1\u5ba2\u6237\u7aef\u4fe1\u606f
208.116 +
208.117 +
208.118 +LBL_WsdlSourceUrl=\u8fd0\u884c Web \u670d\u52a1(&S)
208.119 +LBL_RetrieveWsdl=\u68c0\u7d22 WSDL(&W)
208.120 +LBL_ProxySettings=\u4ee3\u7406\u8bbe\u7f6e(&P)...
208.121 +LBL_LocalFNDescription=\u6307\u5b9a\u68c0\u7d22\u7684 WSDL \u7684\u672c\u5730\u6587\u4ef6\u540d\u3002
208.122 +LBL_WsdlUrl=WSDL &URL:
208.123 +LBL_LocalFilename=\u672c\u5730\u6587\u4ef6\u540d(&L):
208.124 +
208.125 +LBL_WsdlSourceFilesystem=\u73b0\u6709 WSDL \u6587\u4ef6(&E)
208.126 +
208.127 +LBL_WsdlFilename=WSDL \u6587\u4ef6\u540d(&M):
208.128 +LBL_Project=\u9879\u76ee(&O):
208.129 +
208.130 +LBL_PackageName=\u5305(&A):
208.131 +LBL_Browse=\u6d4f\u89c8(&R)...
208.132 +
208.133 +LBL_ClientName=\u5ba2\u6237\u7aef\u540d\u79f0(&C):
208.134 +LBL_CreatedFile=\u521b\u5efa\u7684\u6587\u4ef6(&R):
208.135 +
208.136 +
208.137 +
208.138 +#ERR_WsCompileNotSupportedByTargetServer=The current target server for this project does not support JAXRPC so no web service clients can be created.
208.139 +#ERR_NoStubsDefined=The current project does not define any web service client stub types.
208.140 +MSG_EnterURL=\u8bf7\u8f93\u5165\u60a8\u8981\u4f7f\u7528\u7684\u670d\u52a1\u7684 URL\u3002
208.141 +MSG_RetrieveWSDL=\u5355\u51fb\u201c\u68c0\u7d22 WSDL\u201d\u53ef\u4ee5\u4e0b\u8f7d\u8be5\u670d\u52a1\u7684 WSDL \u6587\u4ef6\u3002
208.142 +MSG_DownloadProgress=\u6b63\u5728\u4e0b\u8f7d\u3002\u72b6\u6001: {0}
208.143 +ERR_DownloadFailedUnknown=\u7531\u4e8e\u4e0d\u660e\u539f\u56e0\u5bfc\u81f4\u4e0b\u8f7d\u5931\u8d25\u3002
208.144 +MSG_EnterFilename=\u8f93\u5165 WSDL \u6587\u4ef6\u7684\u540d\u79f0, \u8be5\u6587\u4ef6\u7528\u4e8e\u8868\u793a\u8981\u4f7f\u7528\u7684\u670d\u52a1\u3002
208.145 +ERR_WsdlInvalid=WSDL \u6587\u4ef6\u65e0\u6548\u3002
208.146 +ERR_WrongWsdl=WSDL \u6587\u4ef6\u4e0d\u5305\u542b\u7aef\u53e3\u4fe1\u606f\u3002
208.147 +MSG_EnterJavaPackageName=\u8f93\u5165\u5e94\u8be5\u751f\u6210\u670d\u52a1\u7aef\u53e3\u7684 Java \u5305\u3002
208.148 +ERR_PackageInvalid=\u5305\u540d\u65e0\u6548\u3002
208.149 +LBL_SampleMidlet=\u751f\u6210\u6570\u636e\u7ed1\u5b9a\u7ed3\u6784(&D)
208.150 +LBL_WsdlFilterDescription=Web \u670d\u52a1\u63cf\u8ff0\u7b26\u6587\u4ef6 (*.wsdl)
208.151 +ACSN_WsdlSourceUrl=\u6b63\u5728\u8fd0\u884c\u7684\u670d\u52a1\u7684 URL
208.152 +ACSN_WsdlSourceFilesystem=WSDL \u6587\u4ef6\u7684\u540d\u79f0
208.153 +ACSN_ClientName=\u5ba2\u6237\u7aef\u540d\u79f0
208.154 +ACSD_ClientName=\u6307\u5b9a\u5ba2\u6237\u7aef\u540d\u79f0
208.155 +MSG_InvalidName=\u8be5\u540d\u79f0\u4e0d\u662f\u6709\u6548\u7684 Java \u6807\u8bc6\u7b26\u3002
208.156 +MSG_NoName=\u63d2\u5165\u6709\u6548\u7684\u5ba2\u6237\u7aef\u540d\u79f0\u3002
208.157 +MSG_AlreadyExists=\u6587\u4ef6{0}\u5df2\u5b58\u5728\u3002
208.158 +ERR_NotWSI=<html><b>Web \u670d\u52a1\u4e0d\u662f Java ME Web \u670d\u52a1\u89c4\u8303\u6240\u8981\u6c42\u7684\u7b26\u5408 WS-I \u7684\u670d\u52a1!</b></html>\n\u539f\u56e0:\n{0}\n<html>\u4f7f\u7528 <b>Web \u5e94\u7528\u7a0b\u5e8f\u7684 Mobile \u5ba2\u6237\u7aef</b>\u5904\u7406 Web \u5e94\u7528\u7a0b\u5e8f\u4e2d\u4e0d\u7b26\u5408 WS-I \u89c4\u8303\u7684 Web \u670d\u52a1\u3002</html>
208.159 +
208.160 +###############################
208.161 +#Resources found in the file: ValidationNotifier.java
208.162 +###############################
208.163 +LBL_Validation_Results=\u9a8c\u8bc1\u7ed3\u679c:
208.164 +ACSD_Validation_Results=\u9a8c\u8bc1\u7ed3\u679c\u5217\u8868
208.165 +
208.166 +
208.167 +###############################
208.168 +#Resources found in the file: WebServiceClientWizardDescriptor.java
208.169 +###############################
208.170 +MSG_InvalidProjectPath=\u9879\u76ee\u8def\u5f84 {0} \u65e0\u6548\u3002\u5b83\u5305\u542b\u4ee5\u4e0b\u975e\u6cd5\u5b57\u7b26: {1}
208.171 +## This key is present in file but never used by logic
208.172 +
208.173 +
208.174 +###################################
208.175 +#Resources not used in the package
208.176 +###################################
208.177 +
208.178 +# Web Service Client resource bundle
208.179 +Templates/j2me/Jsr172Application.wsclient=Java ME Web \u670d\u52a1\u5ba2\u6237\u7aef
208.180 +LBL_ClientType=\u5ba2\u6237\u7aef\u7c7b\u578b:
208.181 +
208.182 +LBL_PackageDescription=\u6307\u5b9a\u751f\u6210 Web \u670d\u52a1\u5ba2\u6237\u7aef\u63a5\u53e3 (\u548c\u6869\u6a21\u5757, \u5982\u679c\u9002\u7528) \u7684\u5305:
208.183 +ACSN_GenDatabinding=\u751f\u6210\u6570\u636e\u7ed1\u5b9a\u7ed3\u6784
208.184 +ACSD_GenDatabinding=\u9009\u62e9 "\u751f\u6210\u6570\u636e\u7ed1\u5b9a\u7ed3\u6784" \u64cd\u4f5c
208.185 +
209.1 --- a/src/zh_CN/nb/autoupdate-pluginimporter/autoupdate-pluginimporter/org/netbeans/modules/autoupdate/pluginimporter/Bundle_zh_CN.properties Wed Feb 26 18:44:50 2014 -0800
209.2 +++ b/src/zh_CN/nb/autoupdate-pluginimporter/autoupdate-pluginimporter/org/netbeans/modules/autoupdate/pluginimporter/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
209.3 @@ -22,5 +22,5 @@
209.4 ImportManager.Progress.Name=\u6b63\u5728\u5bfc\u5165\u63d2\u4ef6...
209.5 PluginImporter.Importing.Plugin=\u6b63\u5728\u5bfc\u5165{0}...
209.6 #Blacklist codeNameBase of dangerous plugins which cannot be imported like: org.dangerous.plugin,com.nextdangerous.module,... etc.
209.7 -plugin.import.blacklist=org.netbeans.shorcuts,org.jmarsault.shortcuts
209.8
209.9 +
210.1 --- a/src/zh_CN/nb/ide-branding/locale/autoupdate-ui_nb/org/netbeans/modules/autoupdate/ui/wizards/Bundle_nb_zh_CN.properties Wed Feb 26 18:44:50 2014 -0800
210.2 +++ b/src/zh_CN/nb/ide-branding/locale/autoupdate-ui_nb/org/netbeans/modules/autoupdate/ui/wizards/Bundle_nb_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
210.3 @@ -14,12 +14,15 @@
210.4 UninstallStep_UninstallDone_Text=NetBeans IDE \u5b89\u88c5\u7a0b\u5e8f\u5df2\u6210\u529f\u5378\u8f7d\u4e86\u4ee5\u4e0b\u63d2\u4ef6:
210.5 UninstallStep_ActivateDone_Text=NetBeans IDE \u5b89\u88c5\u7a0b\u5e8f\u5df2\u6210\u529f\u6fc0\u6d3b\u4e86\u4ee5\u4e0b\u63d2\u4ef6:
210.6 UninstallStep_DeactivateDone_Text=NetBeans IDE \u5b89\u88c5\u7a0b\u5e8f\u5df2\u6210\u529f\u53d6\u6d88\u6fc0\u6d3b\u4e86\u4ee5\u4e0b\u63d2\u4ef6:
210.7 +UninstallStep_ActivateLater_Text=NetBeans IDE \u5b89\u88c5\u7a0b\u5e8f\u5df2\u6210\u529f\u6fc0\u6d3b\u4e86\u4ee5\u4e0b\u63d2\u4ef6:
210.8 +UninstallStep_UninstallLater_Text=NetBeans IDE \u5b89\u88c5\u7a0b\u5e8f\u5df2\u6210\u529f\u5378\u8f7d\u4e86\u4ee5\u4e0b\u63d2\u4ef6:
210.9 +UninstallStep_DeactivateLater_Text=NetBeans IDE \u5b89\u88c5\u7a0b\u5e8f\u5df2\u6210\u529f\u505c\u7528\u4e86\u4ee5\u4e0b\u63d2\u4ef6:
210.10 UninstallStep_Header_UninstallDone_Content=\u5355\u51fb\u201c\u5b8c\u6210\u201d\u9000\u51fa NetBeans IDE \u5b89\u88c5\u7a0b\u5e8f\u3002
210.11 UninstallStep_Header_DeactivateDone_Content=\u5355\u51fb\u201c\u5b8c\u6210\u201d\u9000\u51fa NetBeans IDE \u5b89\u88c5\u7a0b\u5e8f\u3002
210.12 UninstallStep_Header_ActivateDone_Content=\u5355\u51fb\u201c\u5b8c\u6210\u201d\u9000\u51fa NetBeans IDE \u5b89\u88c5\u7a0b\u5e8f\u3002
210.13 -UninstallStep_Header_UninstallFailed_Content=\u5355\u51fb\u201c\u5b8c\u6210\u201d\u9000\u51fa NetBeans IDE \u5b89\u88c5\u7a0b\u5e8f\u3002
210.14 -UninstallStep_Header_DeactivateFailed_Content=\u5355\u51fb\u201c\u5b8c\u6210\u201d\u9000\u51fa NetBeans IDE \u5b89\u88c5\u7a0b\u5e8f\u3002
210.15 -UninstallStep_Header_ActivateFailed_Content=\u5355\u51fb\u201c\u5b8c\u6210\u201d\u9000\u51fa NetBeans IDE \u5b89\u88c5\u7a0b\u5e8f\u3002
210.16 +UninstallStep_Header_UninstallFailed_Content=\u5355\u51fb\u201c\u53d6\u6d88\u201d\u9000\u51fa NetBeans IDE \u5b89\u88c5\u7a0b\u5e8f\u3002
210.17 +UninstallStep_Header_DeactivateFailed_Content=\u5355\u51fb\u201c\u53d6\u6d88\u201d\u9000\u51fa NetBeans IDE \u5b89\u88c5\u7a0b\u5e8f\u3002
210.18 +UninstallStep_Header_ActivateFailed_Content=\u5355\u51fb\u201c\u53d6\u6d88\u201d\u9000\u51fa NetBeans IDE \u5b89\u88c5\u7a0b\u5e8f\u3002
210.19 CustomHandleStep_Header_InstallDone_Content=\u5355\u51fb\u201c\u4e0b\u4e00\u6b65\u201d\u4ee5\u7ee7\u7eed\u4f7f\u7528 NetBeans IDE \u5b89\u88c5\u7a0b\u5e8f\u5b89\u88c5\u5269\u4f59\u7684\u9009\u5b9a\u63d2\u4ef6\u3002
210.20 CustomHandleStep_Header_InstallFail_Content=\u5355\u51fb\u201c\u53d6\u6d88\u201d\u9000\u51fa NetBeans IDE \u5b89\u88c5\u7a0b\u5e8f\u3002
210.21 CustomHandleStep_Header_UninstallFail_Content=\u5355\u51fb\u201c\u53d6\u6d88\u201d\u9000\u51fa NetBeans IDE \u5b89\u88c5\u7a0b\u5e8f\u3002
211.1 --- a/src/zh_CN/nb/ide-branding/locale/org-netbeans-core_nb/org/netbeans/core/Bundle_nb_zh_CN.properties Wed Feb 26 18:44:50 2014 -0800
211.2 +++ b/src/zh_CN/nb/ide-branding/locale/org-netbeans-core_nb/org/netbeans/core/Bundle_nb_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
211.3 @@ -44,3 +44,5 @@
211.4 # {1} - path to system folder
211.5 NTF_ExceptionalException=\u51fa\u73b0{0}\u5f02\u5e38\u9519\u8bef\u3002\n\u8bf7\u8bbf\u95ee http://www.netbeans.org/community/issues.html \u4ee5\u62a5\u544a\u6b64\u5f02\u5e38\u9519\u8bef, \n\u8bf7\u5305\u542b messages.log \u6587\u4ef6\u7684\u526f\u672c\u3002\nmessages.log \u6587\u4ef6\u4f4d\u4e8e {1} \u6587\u4ef6\u5939\u4e2d\u3002
211.6
211.7 +NTF_ExceptionalExceptionReport=\u5411 NetBeans \u56e2\u961f\u663e\u793a\u5e76\u62a5\u544a\u95ee\u9898
211.8 +
212.1 --- a/src/zh_CN/nb/ide-branding/locale/uihandler_nb/org/netbeans/modules/exceptions/Bundle_nb_zh_CN.properties Wed Feb 26 18:44:50 2014 -0800
212.2 +++ b/src/zh_CN/nb/ide-branding/locale/uihandler_nb/org/netbeans/modules/exceptions/Bundle_nb_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
212.3 @@ -41,16 +41,16 @@
212.4 # made subject to such option by the copyright holder.
212.5
212.6
212.7 -userNameURL=http://statistics.netbeans.org/analytics/nbfeedback_69.do?userName=
212.8
212.9 -userIdURL=http://statistics.netbeans.org/analytics/nbfeedback_69.do?userId=
212.10 +
212.11 +
212.12
212.13 ReportPanel.loginField.AccessibleContext.accessibleName=Netbeans \u7528\u6237\u540d
212.14
212.15 ReportPanel.loginField.AccessibleContext.accessibleDescription=Netbeans \u7528\u6237\u540d\u3002\u5982\u679c\u60a8\u662f\u6ce8\u518c\u7528\u6237, \u5e94\u586b\u5199\u6b64\u5b57\u6bb5\u3002
212.16
212.17
212.18 -REGISTRATION_URL=https://www.netbeans.org/people/new
212.19 +
212.20
212.21 ReportPanel.jLabel11.text=(\u60a8\u7684 NetBeans.org \u7528\u6237\u540d)
212.22 ReportPanel.jPasswordField1.AccessibleContext.accessibleDescription=\u952e\u5165\u60a8\u7684 NetBeans.org \u53e3\u4ee4
213.1 --- a/src/zh_CN/nb/ide-branding/locale/uihandler_nb/org/netbeans/modules/uihandler/Bundle_nb_zh_CN.properties Wed Feb 26 18:44:50 2014 -0800
213.2 +++ b/src/zh_CN/nb/ide-branding/locale/uihandler_nb/org/netbeans/modules/uihandler/Bundle_nb_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
213.3 @@ -40,37 +40,37 @@
213.4 # Version 2 license, then the option applies only if the new code is
213.5 # made subject to such option by the copyright holder.
213.6
213.7 -METRICS_LOGGER_NAME=org.netbeans.ui.metrics
213.8 -UI_LOGGER_NAME=org.netbeans.ui
213.9 -UI_PERFORMANCE_LOGGER_NAME=org.netbeans.ui.performance
213.10 +
213.11 +
213.12 +
213.13
213.14 UI_USER_CONFIGURATION=\u64cd\u4f5c\u7cfb\u7edf\u4e3a{0}, \u865a\u62df\u673a\u4e3a{1}, NetBeans \u7248\u672c\u4e3a {2}, \u7528\u6237\u540d\u4e3a {3}\u3002
213.15
213.16 # A resource bundle the application version is read from
213.17
213.18 -ApplicationVersionResourceBundle=org.netbeans.core.startup.Bundle
213.19 +
213.20 # A key with the application version number
213.21
213.22 -ApplicationVersionResourceKey=currentVersion
213.23 +
213.24 # A system property, that is used as an argument to the application version number key
213.25
213.26 -ApplicationVersionSysPropertyResourceArg=netbeans.buildnumber
213.27 +
213.28
213.29
213.30 # URL to display to as a welcome text
213.31
213.32 -WELCOME_URL=https://netbeans.org/nonav/uigestures/index3.html
213.33
213.34
213.35 -METRICS_URL=https://netbeans.org/nonav/uigestures/index4.html
213.36 +
213.37 +
213.38
213.39 # URL to display to as a welcome text in case of error
213.40
213.41 -ERROR_URL=https://netbeans.org/nonav/uigestures/error2.html
213.42
213.43
213.44 -CHECKING_SERVER_URL=http://statistics.netbeans.org/analytics/authenticate?username={0}&secur_passwd={1}
213.45 -LOG_FILE=var/log/messages.log
213.46 +
213.47 +
213.48 +
213.49 # {0} - host
213.50 # {1} - url of upload
213.51 # {2} - the absolute path to the IDE's log file (defined by the LOG_FILE key above)
213.52 @@ -100,7 +100,7 @@
213.53 LBL_BottomText3=<html>\u4f7f\u7528\u60c5\u51b5\u7edf\u8ba1\u4fe1\u606f\u53ef\u5e2e\u52a9\u6211\u4eec\u66f4\u597d\u5730\u4e86\u89e3\u7528\u6237\u7684\u9700\u6c42, \u5e76\u4f1a\u5728\u5c06\u6765\u7684\u53d1\u884c\u7248\u4e2d\u4f18\u5148\u6539\u8fdb\u3002\u6211\u4eec\u51b3\u4e0d\u4f1a\u5bf9\u6536\u96c6\u7684\u6570\u636e\u6267\u884c\u9006\u5411\u5de5\u7a0b\u4ee5\u4e86\u89e3\u6709\u5173\u60a8\u9879\u76ee\u7684\u7279\u5b9a\u8be6\u7ec6\u4fe1\u606f\u3002</html>
213.54
213.55
213.56 -METRICS_INFO_URL=http://netbeans.org/about/usage-tracking.html
213.57 +
213.58
213.59 IDE_LOG_TAB_TITLE=IDE \u65e5\u5fd7
213.60
214.1 --- a/src/zh_CN/nb/ide-branding/netbeans/core/locale/core_nb/org/netbeans/core/startup/Bundle_nb_zh_CN.properties Wed Feb 26 18:44:50 2014 -0800
214.2 +++ b/src/zh_CN/nb/ide-branding/netbeans/core/locale/core_nb/org/netbeans/core/startup/Bundle_nb_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
214.3 @@ -1,6 +1,6 @@
214.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
214.5 #
214.6 -# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
214.7 +# Copyright 1997-2014 Oracle and/or its affiliates. All rights reserved.
214.8 #
214.9 # Oracle and Java are registered trademarks of Oracle and/or its affiliates.
214.10 # Other names may be trademarks of their respective owners.
215.1 --- a/src/zh_CN/other/installer/engine/src/org/netbeans/installer/wizard/components/panels/netbeans/Bundle_zh_CN.properties Wed Feb 26 18:44:50 2014 -0800
215.2 +++ b/src/zh_CN/other/installer/engine/src/org/netbeans/installer/wizard/components/panels/netbeans/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
215.3 @@ -256,7 +256,7 @@
215.4 NLP.deny.rbutton.text=\u4e0d\u5b89\u88c5 JUnit(&D)
215.5 NLP.error.cannot.get.logic=\u65e0\u6cd5\u8bbf\u95ee\u914d\u7f6e\u903b\u8f91
215.6
215.7 -NLP.append.license.format=-------------------------------------------------\n{0}:\n\n{1}\n\n
215.8
215.9
215.10
215.11 +
216.1 --- a/src/zh_CN/other/installer/mac/newbuild/Bundle_zh_CN.properties Wed Feb 26 18:44:50 2014 -0800
216.2 +++ b/src/zh_CN/other/installer/mac/newbuild/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
216.3 @@ -1,6 +1,6 @@
216.4 netbeans-Title=NetBeans ${nb.display.version.long}
216.5
216.6 -jdk7-netbeans-Title=Oracle JDK \u548c NetBeans IDE
216.7 +jdk-netbeans-Title=Oracle JDK \u548c NetBeans IDE
216.8
216.9 netbeans-title=NetBeans ${nb.display.version.short}
216.10 netbeans-tooltip=NetBeans IDE
216.11 @@ -8,7 +8,7 @@
216.12
216.13 glassfish-title=GlassFish Server Open Source Edition ${glassfish.display.version}
216.14 glassfish-description=GlassFish Server Open Source Edition ${glassfish.display.version} \u662f Glassfish \u5e94\u7528\u670d\u52a1\u5668\u7684\u6700\u65b0\u7248\u672c, \u5b83\u662f\u4e00\u4e2a\u5b9e\u73b0\u4e86 Java EE 6 \u7684\u517c\u5bb9\u5e73\u53f0, \u5176\u4f53\u7cfb\u7ed3\u6784\u7684\u7279\u70b9\u662f\u6a21\u5757\u5316, \u5c0f\u578b\u5e76\u4e14\u53ef\u6269\u5c55\u3002
216.15 -glassfish-tooltip=GlassFish Server Open Source Edition ${glassfish.display.version}
216.16 +
216.17
216.18 tomcat-title=Apache Tomcat ${tomcat.version}
216.19 tomcat-description=Java Servlet \u548c JSP \u89c4\u8303\u7684\u5f00\u6e90 Web \u5bb9\u5668\u3002
217.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
217.2 +++ b/src/zh_CN/other/installer/mac/newbuild/dmg/Resources/Welcome-jdk_noupdate_zh_CN.html Thu Feb 27 00:43:29 2014 -0800
217.3 @@ -0,0 +1,12 @@
217.4 +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
217.5 +<html>
217.6 + <head>
217.7 + <title>欢迎使用</title>
217.8 +<meta http-equiv="content-type" content="text/html; charset=UTF-8">
217.9 + </head>
217.10 + <body>
217.11 +
217.12 +<h3>系统将指导您完成安装 JDK @JDK_VERSION_NUMBER@ 和 NetBeans IDE 所必需的步骤。</h3>
217.13 +
217.14 + </body>
217.15 +</html>
218.1 --- a/src/zh_CN/other/nbi/engine/src/org/netbeans/installer/wizard/components/panels/Bundle_zh_CN.properties Wed Feb 26 18:44:50 2014 -0800
218.2 +++ b/src/zh_CN/other/nbi/engine/src/org/netbeans/installer/wizard/components/panels/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
218.3 @@ -239,7 +239,7 @@
218.4
218.5
218.6 PrCBSPcomponents.to.bundle.label.text=\u60a8\u9009\u62e9\u521b\u5efa\u5177\u6709\u4ee5\u4e0b\u7ec4\u4ef6\u7684\u5305:
218.7 -PrCBSPcomponents.to.bundle.text={0}.
218.8 +
218.9
218.10
218.11
218.12 @@ -255,10 +255,10 @@
218.13
218.14
218.15 PrISP.components.to.install.label.text=\u60a8\u9009\u62e9\u5b89\u88c5\u4ee5\u4e0b\u7ec4\u4ef6:
218.16 -PrISP.components.to.install.text={0}.
218.17 +
218.18
218.19 PrISP.components.to.uninstall.label.text=\u60a8\u9009\u62e9\u5378\u8f7d\u4ee5\u4e0b\u7ec4\u4ef6:
218.20 -PrISP.components.to.uninstall.text={0}.
218.21 +
218.22
218.23
218.24
218.25 @@ -282,7 +282,7 @@
218.26 LP.accept.checkbox.text=\u6211\u63a5\u53d7\u8bb8\u53ef\u8bc1\u534f\u8bae\u4e2d\u7684\u6761\u6b3e(&A)
218.27 LP.error.cannot.get.logic=\u65e0\u6cd5\u8bbf\u95ee\u914d\u7f6e\u903b\u8f91
218.28
218.29 -LP.append.license.format=-------------------------------------------------\n{0}:\n\n{1}\n\n
218.30 +
218.31
218.32
218.33
219.1 --- a/src/zh_CN/php/hudson-php/hudson-php/org/netbeans/modules/hudson/php/Bundle_zh_CN.properties Wed Feb 26 18:44:50 2014 -0800
219.2 +++ b/src/zh_CN/php/hudson-php/hudson-php/org/netbeans/modules/hudson/php/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
219.3 @@ -1,11 +1,9 @@
219.4 +HudsonJobCreator.buildXml.exist=\u5728\u9879\u76ee\u4e2d\u627e\u5230\u4e86\u6784\u5efa\u811a\u672c, \u8bf7\u9a8c\u8bc1\u5176\u5185\u5bb9\u3002
219.5 HudsonJobCreator.button.a11y=\u6253\u5f00 Hudson PHP \u9009\u9879\u3002
219.6 HudsonJobCreator.button.labelWithMnemonics=Hudson \u9009\u9879(&H)...
219.7 -# {0} - Ant target name
219.8 -HudsonJobCreator.checkbox.a11y=\u8fd0\u884c Ant \u76ee\u6807: {0}
219.9 -HudsonJobCreator.error.buildXmlExists=\u6b64\u9879\u76ee\u5df2\u5177\u6709 build.xml \u6587\u4ef6\u3002
219.10 -HudsonJobCreator.error.config=\u4f5c\u4e1a\u914d\u7f6e\u5931\u8d25\u3002
219.11 HudsonJobCreator.error.invalidHudsonOptions=PHP Hudson \u9009\u9879\u65e0\u6548\u3002
219.12 HudsonJobCreator.error.noTests=\u6b64\u9879\u76ee\u6ca1\u6709\u4efb\u4f55\u6d4b\u8bd5\u3002
219.13 -HudsonJobCreator.error.phpUnitConfigExists=\u6b64\u9879\u76ee\u5df2\u5177\u6709 phpunit.xml.dist \u6587\u4ef6\u3002
219.14 -HudsonJobCreator.error.ppw=\u9879\u76ee\u6587\u4ef6\u4e0d\u662f PPW \u811a\u672c\u751f\u6210\u7684\u3002
219.15 +HudsonJobCreator.phpUnitConfig.exist=\u5728\u9879\u76ee\u4e2d\u627e\u5230\u4e86 PHPUnit \u914d\u7f6e\u6587\u4ef6, \u8bf7\u9a8c\u8bc1\u5176\u5185\u5bb9\u3002
219.16 +# {0} - file name
219.17 +HudsonJobCreator.warning.fileExists=\u5c06\u4f7f\u7528\u73b0\u6709\u7684\u9879\u76ee\u6587\u4ef6{0}\u3002
219.18
220.1 --- a/src/zh_CN/php/hudson-php/hudson-php/org/netbeans/modules/hudson/php/options/Bundle_zh_CN.properties Wed Feb 26 18:44:50 2014 -0800
220.2 +++ b/src/zh_CN/php/hudson-php/hudson-php/org/netbeans/modules/hudson/php/options/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
220.3 @@ -1,3 +1,7 @@
220.4 +HudsonOptionsValidator.error.buildXml.file=\u6784\u5efa\u811a\u672c
220.5 +HudsonOptionsValidator.error.buildXml.name=\u5fc5\u987b\u9009\u62e9\u6587\u4ef6 'build.xml'\u3002
220.6 HudsonOptionsValidator.error.jobConfig.file=\u4f5c\u4e1a\u914d\u7f6e
220.7 HudsonOptionsValidator.error.jobConfig.name=\u5fc5\u987b\u9009\u62e9\u6587\u4ef6 'config.xml'\u3002
220.8 +HudsonOptionsValidator.error.phpUnitConfig.file=PHPUnit \u914d\u7f6e
220.9 +HudsonOptionsValidator.error.phpUnitConfig.name=\u5fc5\u987b\u9009\u62e9\u6587\u4ef6 'phpunit.xml' \u6216 'phpunit.xml.dist'\u3002
220.10
221.1 --- a/src/zh_CN/php/hudson-php/hudson-php/org/netbeans/modules/hudson/php/ui/options/Bundle_zh_CN.properties Wed Feb 26 18:44:50 2014 -0800
221.2 +++ b/src/zh_CN/php/hudson-php/hudson-php/org/netbeans/modules/hudson/php/ui/options/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
221.3 @@ -38,34 +38,35 @@
221.4 #
221.5 # Portions Copyrighted 2011 Sun Microsystems, Inc.
221.6
221.7 +# {0} - file name
221.8 +HudsonOptionsPanel.buildXml.browse.filter=\u9879\u76ee\u6784\u5efa\u811a\u672c\u6587\u4ef6 ({0})
221.9 +# {0} - file name
221.10 +HudsonOptionsPanel.buildXml.browse.title=\u9009\u62e9\u6784\u5efa\u811a\u672c ({0})
221.11 +# {0} - file name
221.12 +HudsonOptionsPanel.jobConfig.browse.filter=Hudson \u4f5c\u4e1a\u914d\u7f6e\u6587\u4ef6 ({0})
221.13 +# {0} - file name
221.14 +HudsonOptionsPanel.jobConfig.browse.title=\u9009\u62e9\u4f5c\u4e1a\u914d\u7f6e ({0})
221.15 HudsonOptionsPanel.keywords.build=\u6784\u5efa
221.16 HudsonOptionsPanel.keywords.job=\u4f5c\u4e1a
221.17 +HudsonOptionsPanel.note.config=<html>PHP \u9879\u76ee\u7684 Jenkins \u4f5c\u4e1a\u6a21\u677f\u53ef\u7528\u4e8e\u6267\u884c\u65b0\u4f5c\u4e1a\u914d\u7f6e\u3002</html>
221.18 +# {0} - file name 1
221.19 +# {1} - file name 2
221.20 +HudsonOptionsPanel.phpUnitConfig.browse.filter=PHPUnit \u914d\u7f6e\u6587\u4ef6 ({0}\u6216{1})
221.21 +# {0} - file name 1
221.22 +# {1} - file name 2
221.23 +HudsonOptionsPanel.phpUnitConfig.browse.title=\u9009\u62e9 PHPUnit \u914d\u7f6e ({0}\u6216{1})
221.24 +HudsonOptionsPanelController.warning.existingFiles=\u5982\u679c\u6784\u5efa\u811a\u672c\u6216 PHPUnit \u914d\u7f6e\u6587\u4ef6\u5b58\u5728\u4e8e\u9879\u76ee\u4e2d, \u5219\u5c06\u9996\u9009\u5b83\u3002
221.25 LBL_HudsonPHPOptionsName=Hudson
221.26 -HudsonOptionsPanel.ppwLabel.text=PPW \u811a\u672c(&P):
221.27 -HudsonOptionsPanel.note1Label.text=<html><i>\u6ce8:</i></html>
221.28 -HudsonOptionsPanel.ppwBrowseButton.text=\u6d4f\u89c8(&B)...
221.29 -HudsonOptionsPanel.ppwSearchButton.text=\u641c\u7d22(&S)...
221.30 -HudsonOptionsPanel.ppwInstallationInfoLabel.text=\u53ef\u5728 PPW \u7684 Web \u7ad9\u70b9\u4e0a\u627e\u5230\u5b89\u88c5\u8bf4\u660e\u3002
221.31 -HudsonOptionsPanel.ppwLearnMoreLabel.text=<html><a href="#">\u4e86\u89e3\u66f4\u591a\u4fe1\u606f</a>
221.32 HudsonOptionsPanel.jobConfigLabel.text=\u4f5c\u4e1a\u914d\u7f6e(&J):
221.33 -HudsonOptionsPanel.note2Label.text=<html><i>\u6ce8:</i></html>
221.34 -HudsonOptionsPanel.jobConfigBrowseButton.text=\u6d4f\u89c8(&R)...
221.35 -HudsonOptionsPanel.jobConfigDefaultButton.text=\u9ed8\u8ba4(&D)
221.36 -HudsonOptionsPanel.jobConfigInstallationInfoLabel.text=\u53ef\u5728 Web \u7ad9\u70b9\u4e0a\u627e\u5230\u5b89\u88c5\u8bf4\u660e\u3002
221.37 -HudsonOptionsPanel.jobConfigLearnMoreLabel.text=<html><a href="#">\u4e86\u89e3\u66f4\u591a\u4fe1\u606f</a>
221.38 -HudsonOptionsPanel.jobConfigDownloadLabel.text=<html><a href="#">\u4e0b\u8f7d\u4f5c\u4e1a\u914d\u7f6e\u7684\u6700\u65b0\u7248\u672c</a>
221.39 -# {0} - path separator
221.40 -LBL_JobConfigHint=\u4f5c\u4e1a\u914d\u7f6e\u7684\u5b8c\u6574\u8def\u5f84 (\u901a\u5e38\u662f <some-directory>{0}php-template{0}config.xml)\u3002
221.41 -LBL_NoPpwScriptsFound=\u627e\u4e0d\u5230 PPW \u811a\u672c\u3002
221.42 -# {0} - short script name
221.43 -# {1} - long script name
221.44 -LBL_PpwHint=PPW \u811a\u672c\u7684\u5b8c\u6574\u8def\u5f84 (\u901a\u5e38\u4e3a {0} \u6216 {1})\u3002
221.45 -LBL_PpwScripts=PPW \u811a\u672c(&P):
221.46 -LBL_PpwScriptsPleaseWaitPart=PPW \u811a\u672c
221.47 -LBL_PpwScriptsTitle=PPW \u811a\u672c
221.48 -LBL_SelectJobConfig=\u9009\u62e9\u4f5c\u4e1a\u914d\u7f6e (config.xml)
221.49 -LBL_SelectPpw=\u9009\u62e9 PPW \u811a\u672c
221.50 -TXT_JobConfigDesciption=Hudson \u4f5c\u4e1a\u914d\u7f6e\u6587\u4ef6 (config.xml)
221.51 -TXT_JobConfigNote=<html>PHP \u9879\u76ee\u7684 Jenkins \u4f5c\u4e1a\u6a21\u677f\u53ef\u7528\u4e8e\u6267\u884c\u65b0\u4f5c\u4e1a\u914d\u7f6e\u3002</html>
221.52 -TXT_PpwNote=<html>PHP \u9879\u76ee\u5411\u5bfc (PPW) \u53ef\u7528\u4e8e\u751f\u6210\u6784\u5efa\u81ea\u52a8\u5316\u6240\u9700\u7684\u811a\u672c\u548c\u914d\u7f6e\u3002</html>
221.53 +HudsonOptionsPanel.jobConfigBrowseButton.text=\u6d4f\u89c8(&W)...
221.54 +HudsonOptionsPanel.jobConfigDownloadLabel.text=<html><a href="#">\u67e5\u770b\u4f5c\u4e1a\u914d\u7f6e\u7684\u6700\u65b0\u7248\u672c</a>
221.55 +HudsonOptionsPanel.buildXmlLabel.text=\u6784\u5efa\u811a\u672c(&B):
221.56 +HudsonOptionsPanel.buildXmlViewLabel.text=<html><a href="#">\u67e5\u770b\u6784\u5efa\u811a\u672c\u7684\u6700\u65b0\u7248\u672c</a>
221.57 +HudsonOptionsPanel.phpUnitConfigLabel.text=PHPUnit \u914d\u7f6e(&P):
221.58 +HudsonOptionsPanel.phpUnitConfigBrowseButton.text=\u6d4f\u89c8(&S)...
221.59 +HudsonOptionsPanel.phpUnitConfigViewLabel.text=<html><a href="#">\u67e5\u770b PHPUnit \u914d\u7f6e\u7684\u6700\u65b0\u7248\u672c</a>
221.60 +HudsonOptionsPanel.buildXmlBrowseButton.text=\u6d4f\u89c8(&R)...
221.61 +HudsonOptionsPanel.noteLabel.text=<html><i>\u6ce8:</i></html>
221.62 +HudsonOptionsPanel.installationInfoLabel.text=\u53ef\u5728 Web \u7ad9\u70b9\u4e0a\u627e\u5230\u5b89\u88c5\u8bf4\u660e\u3002
221.63 +HudsonOptionsPanel.learnMoreLabel.text=<html><a href="#">\u4e86\u89e3\u66f4\u591a\u4fe1\u606f</a>
221.64
222.1 --- a/src/zh_CN/php/php-composer/php-composer/org/netbeans/modules/php/composer/Bundle_zh_CN.properties Wed Feb 26 18:44:50 2014 -0800
222.2 +++ b/src/zh_CN/php/php-composer/php-composer/org/netbeans/modules/php/composer/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
222.3 @@ -1,2 +1,4 @@
222.4 PhpModuleExtenderImpl.displayName=\u7f16\u5199\u5668
222.5 +# {0} - error message
222.6 +PhpModuleExtenderImpl.error.composer=\u7f16\u5199\u5668\u9009\u9879: {0}
222.7
223.1 --- a/src/zh_CN/php/php-composer/php-composer/org/netbeans/modules/php/composer/options/Bundle_zh_CN.properties Wed Feb 26 18:44:50 2014 -0800
223.2 +++ b/src/zh_CN/php/php-composer/php-composer/org/netbeans/modules/php/composer/options/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
223.3 @@ -1,5 +1,5 @@
223.4 -ComposerOptionsValidator.error.authorNameNumber=\u4f5c\u8005\u59d3\u540d\u4e0d\u80fd\u5305\u542b\u6570\u5b57\u3002
223.5 -ComposerOptionsValidator.error.invalidAuthorEmail=\u4f5c\u8005\u7535\u5b50\u90ae\u4ef6\u65e0\u6548\u3002
223.6 -ComposerOptionsValidator.error.invalidVendor=\u4f9b\u5e94\u5546\u65e0\u6548 (\u53ea\u5141\u8bb8\u4f7f\u7528\u5c0f\u5199\u5b57\u6bcd\u548c "-")\u3002
223.7 -ComposerOptionsValidator.error.noAuthorName=\u4f5c\u8005\u59d3\u540d\u4e0d\u80fd\u4e3a\u7a7a\u3002
223.8 +ComposerOptionsValidator.warning.authorNameNumber=\u4f5c\u8005\u59d3\u540d\u4e0d\u80fd\u5305\u542b\u6570\u5b57\u3002
223.9 +ComposerOptionsValidator.warning.invalidAuthorEmail=\u4f5c\u8005\u7535\u5b50\u90ae\u4ef6\u65e0\u6548\u3002
223.10 +ComposerOptionsValidator.warning.invalidVendor=\u4f9b\u5e94\u5546\u65e0\u6548 (\u53ea\u5141\u8bb8\u4f7f\u7528\u5c0f\u5199\u5b57\u6bcd\u548c "-")\u3002
223.11 +ComposerOptionsValidator.warning.noAuthorName=\u4f5c\u8005\u59d3\u540d\u4e0d\u80fd\u4e3a\u7a7a\u3002
223.12
224.1 --- a/src/zh_CN/php/php-dbgp/php-dbgp/org/netbeans/modules/php/dbgp/Bundle_zh_CN.properties Wed Feb 26 18:44:50 2014 -0800
224.2 +++ b/src/zh_CN/php/php-dbgp/php-dbgp/org/netbeans/modules/php/dbgp/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
224.3 @@ -53,4 +53,7 @@
224.4 LBL_Progress_Suspend=\u8fd0\u884c
224.5 MSG_SocketError=<html><b>\u51fa\u73b0\u5957\u63a5\u5b57\u5f02\u5e38\u9519\u8bef</b>\n\u5982\u679c\u6709\u4efb\u4f55\u76d1\u89c6, \u8bf7\u5c1d\u8bd5\u5220\u9664\u8fd9\u4e9b\u76d1\u89c6\u5e76\u91cd\u65b0\u542f\u52a8\u8c03\u8bd5\u5668\u3002\u5982\u679c\u5220\u9664\u76d1\u89c6\n\u4ecd\u65e0\u6cd5\u89e3\u51b3\u95ee\u9898\u6216\u8005\u60a8\u6ca1\u6709\u4efb\u4f55\u76d1\u89c6, \u8bf7\u8bb0\u5f55\u95ee\u9898\u5e76\u63d0\u4f9b\n\u91cd\u73b0\u95ee\u9898\u7684\u5177\u4f53\u6b65\u9aa4\u3002\u8bf7\u9644\u52a0 IDE \u65e5\u5fd7\u3002\u9644\u52a0\u60a8\u7684\u9879\u76ee\u4e5f\u4f1a\n\u975e\u5e38\u6709\u5e2e\u52a9\u3002
224.6 MSG_SocketErrorTitle=\u5957\u63a5\u5b57\u5f02\u5e38\u9519\u8bef
224.7 +# {0} - Error code
224.8 +# {1} - Error message
224.9 +XdebugError=\u6765\u81ea XDebug \u7684\u54cd\u5e94\u5305\u542b\u9519\u8bef:\n\n \u4ee3\u7801: {0}\n \u6d88\u606f: {1}
224.10
225.1 --- a/src/zh_CN/php/php-editor/php-editor/org/netbeans/modules/php/editor/resources/Bundle_zh_CN.properties Wed Feb 26 18:44:50 2014 -0800
225.2 +++ b/src/zh_CN/php/php-editor/php-editor/org/netbeans/modules/php/editor/resources/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
225.3 @@ -73,6 +73,7 @@
225.4 constant=Magic \u5e38\u91cf
225.5 heredocdelimiter=HereDoc \u5206\u9694\u7b26
225.6 number=\u6570\u503c
225.7 +htmltag=HTML \u6807\u8bb0
225.8
225.9 mod-unused=\u672a\u4f7f\u7528\u7684\u5143\u7d20
225.10 mod-field=\u5b57\u6bb5
226.1 --- a/src/zh_CN/php/php-latte/php-latte/org/netbeans/modules/php/latte/resources/Bundle_zh_CN.properties Wed Feb 26 18:44:50 2014 -0800
226.2 +++ b/src/zh_CN/php/php-latte/php-latte/org/netbeans/modules/php/latte/resources/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
226.3 @@ -48,7 +48,7 @@
226.4 Templates/Scripting/LatteTemplate.latte=Latte \u6a21\u677f
226.5 Editors/text/x-latte=Latte \u6a21\u677f
226.6 Editors/text/x-latte-markup=Latte \u6807\u8bb0
226.7 -Editors/text/x-latte-markup/CodeTemplates/Defaults/org-netbeans-modules-php-latte-resources-codetemplates.xml=code-templates.xml
226.8 +
226.9
226.10 latte-comment=\u6ce8\u91ca
226.11 latte-delimiter=\u5206\u9694\u7b26
227.1 --- a/src/zh_CN/php/php-project/php-project/org/netbeans/modules/php/project/connections/sync/Bundle_zh_CN.properties Wed Feb 26 18:44:50 2014 -0800
227.2 +++ b/src/zh_CN/php/php-project/php-project/org/netbeans/modules/php/project/connections/sync/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
227.3 @@ -109,7 +109,7 @@
227.4 SyncPanel.info.status={0} \u4e2a\u4e0b\u8f7d, {1} \u4e2a\u4e0a\u8f7d, {2} \u4e2a\u5220\u9664, {3} \u4e2a\u65e0\u64cd\u4f5c, {4} \u4e2a\u9519\u8bef, {5} \u4e2a\u8b66\u544a\u3002
227.5 SyncPanel.info.warning=\u8bf7\u5148\u590d\u67e5\u6240\u6709\u5efa\u8bae\u7684\u64cd\u4f5c, \u7136\u540e\u7ee7\u7eed\u3002\u8bf7\u6ce8\u610f\u8fdc\u7a0b\u65f6\u95f4\u6233\u53ef\u80fd\u4e0d\u6b63\u786e\u3002
227.6 # {0} - file name
227.7 -SyncPanel.localFile.modified.mark={0}*
227.8 +
227.9 # {0} - operation
227.10 SyncPanel.operation.tooltip={0} (\u5355\u51fb\u4ee5\u66f4\u6539)
227.11 SyncPanel.popupMenu.diffItem=\u6bd4\u8f83...
228.1 --- a/src/zh_CN/php/php-project/php-project/org/netbeans/modules/php/project/connections/ui/Bundle_zh_CN.properties Wed Feb 26 18:44:50 2014 -0800
228.2 +++ b/src/zh_CN/php/php-project/php-project/org/netbeans/modules/php/project/connections/ui/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
228.3 @@ -43,7 +43,7 @@
228.4
228.5 # {0} - connection name
228.6 # {1} - connection type (FTP/SFTP)
228.7 -ConfigListRenderer.item.label={0} [{1}]
228.8 +
228.9 ## remote connections
228.10 LBL_ManageRemoteConnections=\u7ba1\u7406\u8fdc\u7a0b\u8fde\u63a5
228.11 LBL_TestConnection=\u6d4b\u8bd5\u8fde\u63a5(&T)
229.1 --- a/src/zh_CN/php/php-project/php-project/org/netbeans/modules/php/project/ui/options/Bundle_zh_CN.properties Wed Feb 26 18:44:50 2014 -0800
229.2 +++ b/src/zh_CN/php/php-project/php-project/org/netbeans/modules/php/project/ui/options/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
229.3 @@ -40,7 +40,7 @@
229.4
229.5 PhpAnnotationsPanel.table.column.for.title=For
229.6 PhpAnnotationsPanel.table.column.name.title=\u540d\u79f0
229.7 -PhpAnnotationsPanel.value.delimiter=,
229.8 +
229.9 PHPOptionsCategory_name=PHP
229.10 PHPOptionsCategory_title=PHP
229.11 LBL_GeneralOptions=\u5e38\u89c4
229.12 @@ -210,4 +210,5 @@
229.13
229.14 PhpAnnotationsPanel.warningLabel.text=<html><b>\u8b66\u544a:
229.15 PhpAnnotationsPanel.warningText.text=<html><em>\u6b64\u8bbe\u7f6e\u53ef\u80fd\u4f1a\u660e\u663e\u964d\u4f4e IDE \u7684\u901f\u5ea6!
229.16 +PhpAnnotationsPanel.unknownAsTypeCheckBox.text=\u5c06\u672a\u77e5\u6807\u6ce8\u89c6\u4e3a\u7c7b\u578b\u6807\u6ce8 (\u4f8b\u5982 Symfony2 \u5b9a\u5236\u9a8c\u8bc1\u5668)(&T)
229.17
230.1 --- a/src/zh_CN/php/php-project/php-project/org/netbeans/modules/php/project/ui/testrunner/Bundle_zh_CN.properties Wed Feb 26 18:44:50 2014 -0800
230.2 +++ b/src/zh_CN/php/php-project/php-project/org/netbeans/modules/php/project/ui/testrunner/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
230.3 @@ -44,7 +44,7 @@
230.4 LBL_GoToSource=\u8f6c\u81f3\u6e90(&G)
230.5 # {0} - provider name
230.6 # {1} - suite name
230.7 -TestSessionImpl.suite.name=[{0}] {1}
230.8 +
230.9 # {0} - testing probider
230.10 UnitTestRunner.error.coverage=\u6d4b\u8bd5\u63d0\u4f9b\u5668{0}\u4e0d\u652f\u6301\u4ee3\u7801\u8986\u76d6\u3002
230.11 UnitTestRunner.error.running=\u53ef\u80fd\u51fa\u73b0\u4e86\u9519\u8bef, \u8bf7\u5728\u201c\u8f93\u51fa\u201d\u7a97\u53e3\u4e2d\u8fdb\u884c\u9a8c\u8bc1\u3002
231.1 --- a/src/zh_CN/php/php-refactoring/php-refactoring/org/netbeans/modules/refactoring/php/Bundle_zh_CN.properties Wed Feb 26 18:44:50 2014 -0800
231.2 +++ b/src/zh_CN/php/php-refactoring/php-refactoring/org/netbeans/modules/refactoring/php/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
231.3 @@ -1,4 +1,5 @@
231.4 ERR_CannotRefactorLoc=\u65e0\u6cd5\u5728\u6b64\u5904\u91cd\u6784
231.5 +ERR_ElementNotInUsersFile=\u65e0\u6cd5\u91cd\u6784 - \u5143\u7d20\u5728\u5305\u542b\u8def\u5f84\u4e0a\u6216\u7b7e\u540d\u6587\u4ef6\u4e2d
231.6 ERR_ParsingInProgress=\u65e0\u6cd5\u91cd\u6784 - \u6b63\u5728\u89e3\u6790\u3002
231.7 OpenIDE-Module-Display-Category=PHP
231.8 OpenIDE-Module-Name=PHP \u91cd\u6784
232.1 --- a/src/zh_CN/php/php-samples/php-samples/org/netbeans/modules/php/samples/Bundle_zh_CN.properties Wed Feb 26 18:44:50 2014 -0800
232.2 +++ b/src/zh_CN/php/php-samples/php-samples/org/netbeans/modules/php/samples/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
232.3 @@ -74,6 +74,7 @@
232.4 Templates/Project/Samples/PHP/RentAFlat-Zend=Rent a Flat - Zend \u6846\u67b6\u6837\u4f8b\u5e94\u7528\u7a0b\u5e8f
232.5 Templates/Project/Samples/PHP/Calculator-PHPUnit=\u8ba1\u7b97\u5668 - PHPUnit \u6837\u4f8b\u5e94\u7528\u7a0b\u5e8f
232.6 Templates/Project/Samples/PHP/Calculator-atoum=\u8ba1\u7b97\u5668 - Atoum \u6837\u4f8b\u5e94\u7528\u7a0b\u5e8f
232.7 +Templates/Project/Samples/PHP/Calculator-Nette-Tester=\u8ba1\u7b97\u5668 - Nette Tester \u6837\u4f8b\u5e94\u7528\u7a0b\u5e8f
232.8
232.9 # title for New PHP Sample wizard
232.10 LBL_TXT_NewPHPSample=PHP \u6837\u4f8b\u9879\u76ee
233.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
233.2 +++ b/src/zh_CN/php/php-samples/php-samples/org/netbeans/modules/php/samples/descriptions/Calculator-Nette-Tester_zh_CN.html Thu Feb 27 00:43:29 2014 -0800
233.3 @@ -0,0 +1,50 @@
233.4 +<!--
233.5 +DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
233.6 +
233.7 +Copyright 2013 Oracle and/or its affiliates. All rights reserved.
233.8 +
233.9 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
233.10 +Other names may be trademarks of their respective owners.
233.11 +
233.12 +The contents of this file are subject to the terms of either the GNU
233.13 +General Public License Version 2 only ("GPL") or the Common
233.14 +Development and Distribution License("CDDL") (collectively, the
233.15 +"License"). You may not use this file except in compliance with the
233.16 +License. You can obtain a copy of the License at
233.17 +http://www.netbeans.org/cddl-gplv2.html
233.18 +or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
233.19 +specific language governing permissions and limitations under the
233.20 +License. When distributing the software, include this License Header
233.21 +Notice in each file and include the License file at
233.22 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
233.23 +particular file as subject to the "Classpath" exception as provided
233.24 +by Oracle in the GPL Version 2 section of the License file that
233.25 +accompanied this code. If applicable, add the following below the
233.26 +License Header, with the fields enclosed by brackets [] replaced by
233.27 +your own identifying information:
233.28 +"Portions Copyrighted [year] [name of copyright owner]"
233.29 +
233.30 +If you wish your version of this file to be governed by only the CDDL
233.31 +or only the GPL Version 2, indicate your decision by adding
233.32 +"[Contributor] elects to include this software in this distribution
233.33 +under the [CDDL or GPL Version 2] license." If you do not indicate a
233.34 +single choice of license, a recipient has the option to distribute
233.35 +your version of this file under either the CDDL, the GPL Version 2 or
233.36 +to extend the choice of license to its licensees as provided above.
233.37 +However, if you add GPL Version 2 code and therefore, elected the GPL
233.38 +Version 2 license, then the option applies only if the new code is
233.39 +made subject to such option by the copyright holder.
233.40 +
233.41 +Contributor(s):
233.42 +
233.43 +Portions Copyrighted 2013 Sun Microsystems, Inc.
233.44 +-->
233.45 +<!DOCTYPE html>
233.46 +<html>
233.47 + <head>
233.48 +<meta http-equiv="content-type" content="text/html; charset=UTF-8">
233.49 + </head>
233.50 + <body>
233.51 + “计算器”是一个支持基本算术运算的简单计算器。已创建项目来演示 NetBeans 中的 Nette Tester 测试框架支持。<br><br> 要求: Nette Tester
233.52 + </body>
233.53 +</html>
234.1 --- a/src/zh_CN/php/php-twig/php-twig/org/netbeans/modules/php/twig/editor/completion/Bundle_zh_CN.properties Wed Feb 26 18:44:50 2014 -0800
234.2 +++ b/src/zh_CN/php/php-twig/php-twig/org/netbeans/modules/php/twig/editor/completion/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
234.3 @@ -70,6 +70,8 @@
234.4
234.5
234.6
234.7 +TAG_verbatim=<p style="font-weight: bold; font-size: 1.2em">verbatim</p><p><code>verbatim</code> \u6807\u8bb0\u7528\u4e8e\u5c06\u5404\u90e8\u5206\u6807\u8bb0\u4e3a\u4e0d\u5e94\u89e3\u6790\u7684 verbatim \u6587\u672c\u3002\u4f8b\u5982, \u8981\u5c06 Twig \u8bed\u6cd5\u4f5c\u4e3a\u793a\u4f8b\u653e\u5165\u6a21\u677f\u4e2d, \u60a8\u53ef\u4ee5\u4f7f\u7528\u4ee5\u4e0b\u7247\u6bb5:</p><p style="font-weight: bold; font-size: 1.1em">\u793a\u4f8b</p><pre><code>\n{% verbatim %}\n <ul>\n {% for item in seq %}\n <li>{{ item }}</li>\n {% endfor %}\n </ul>\n{% endverbatim %}\n</code></pre>
234.8 +
234.9
234.10
234.11
235.1 --- a/src/zh_CN/php/php-twig/php-twig/org/netbeans/modules/php/twig/resources/Bundle_zh_CN.properties Wed Feb 26 18:44:50 2014 -0800
235.2 +++ b/src/zh_CN/php/php-twig/php-twig/org/netbeans/modules/php/twig/resources/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
235.3 @@ -44,14 +44,17 @@
235.4 OpenIDE-Module-Short-Description=\u652f\u6301 PHP \u7684 Twig \u6a21\u677f\u5f15\u64ce
235.5
235.6 text/x-twig=Twig \u6587\u4ef6
235.7 -Editors/text/x-twig-markup=Twig \u6807\u8bb0
235.8 +Editors/text/x-twig-block=Twig \u5757
235.9 +Editors/text/x-twig-variable=Twig \u53d8\u91cf
235.10 Loaders/text/x-twig/Factories/TwigDataLoader.instance=Twig \u6587\u4ef6
235.11 Templates/Scripting/TwigTemplate.html.twig=Twig HTML \u6587\u4ef6
235.12 -
235.13 +Editors/text/x-twig-block/CodeTemplates/Defaults/org-netbeans-modules-php-twig-resources-codetemplates.xml=code-templates.xml
235.14 +Editors/text/x-twig-variable/CodeTemplates/Defaults/org-netbeans-modules-php-twig-resources-codetemplates.xml=code-templates.xml
235.15
235.16 twig_comment=\u6ce8\u91ca
235.17 -twig_block=\u5757
235.18 -twig_var=\u53d8\u91cf
235.19 +twig_block_delimiter=\u5757\u5206\u9694\u7b26
235.20 +twig_var_delimiter=\u53d8\u91cf\u5206\u9694\u7b26
235.21 +twig_other=\u9519\u8bef
235.22 twig_operator=\u8fd0\u7b97\u7b26
235.23 twig_name=\u540d\u79f0
235.24 twig_number=\u6570\u503c
235.25 @@ -59,5 +62,4 @@
235.26 twig_interpolation=\u63d2\u503c
235.27 twig_tag=\u6807\u8bb0
235.28 twig_punctuation=\u6807\u70b9\u7b26\u53f7
235.29 -twig_other=\u9519\u8bef
235.30
236.1 --- a/src/zh_CN/platform/autoupdate-ui/autoupdate-ui/org/netbeans/modules/autoupdate/ui/wizards/Bundle_zh_CN.properties Wed Feb 26 18:44:50 2014 -0800
236.2 +++ b/src/zh_CN/platform/autoupdate-ui/autoupdate-ui/org/netbeans/modules/autoupdate/ui/wizards/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
236.3 @@ -23,11 +23,11 @@
236.4 UninstallDependenciesResolutionStep_Table_Title=\u9700\u8981\u53d6\u6d88\u6fc0\u6d3b\u4ee5\u4e0b\u63d2\u4ef6, \u56e0\u4e3a\u5b83\u4eec\u9700\u8981\u4e00\u4e2a\u6216\u591a\u4e2a\u5c06\u8981\u53d6\u6d88\u6fc0\u6d3b\u7684\u63d2\u4ef6:
236.5 LicenseApprovalPanel_taTitle_Text=\u8981\u7ee7\u7eed\u8fdb\u884c\u5b89\u88c5, \u60a8\u9700\u8981\u63a5\u53d7\u4e0e\u7279\u5b9a\u63d2\u4ef6\u6709\u5173\u7684\u6240\u6709\u8bb8\u53ef\u8bc1\u534f\u8bae\u3002\n\n
236.6 LicenseApprovalPanel_tpLicense_Head={0}\u8bb8\u53ef\u8bc1\u534f\u8bae
236.7 -LicenseApprovalPanel_tpLicense_Delimeter=,
236.8 -LicenseApprovalPanel_tpLicense_Separator=_______________________________________\n
236.9 +
236.10 +
236.11 LicenseApprovalPanel_Header_Head=\u8bb8\u53ef\u8bc1\u534f\u8bae
236.12 LicenseApprovalPanel_Header_Content=\u8bf7\u4ed4\u7ec6\u9605\u8bfb\u6240\u6709\u4ee5\u4e0b\u8bb8\u53ef\u8bc1\u534f\u8bae\u3002
236.13 -LicenseApprovalPanel_cbPlugins_ItemFormat={0} [{1}]
236.14 +
236.15 InstallUnitWizard_Title=\u63d2\u4ef6\u5b89\u88c5\u7a0b\u5e8f
236.16 InstallStep_Header_Download_Head=\u4e0b\u8f7d
236.17 InstallStep_Header_Download_Content=\u8bf7\u7a0d\u5019, \u76f4\u81f3\u5b89\u88c5\u7a0b\u5e8f\u4e0b\u8f7d\u5b8c\u8bf7\u6c42\u7684\u63d2\u4ef6\u3002
236.18 @@ -41,8 +41,6 @@
236.19 InstallStep_Header_InstallUnsuccessful_Content=\u5355\u51fb\u201c\u5b8c\u6210\u201d\u9000\u51fa\u5b89\u88c5\u7a0b\u5e8f, \u7136\u540e\u5c1d\u8bd5\u91cd\u65b0\u542f\u52a8\u5e94\u7528\u7a0b\u5e8f\u3002
236.20 InstallStep_Header_Restart_Head=\u91cd\u65b0\u542f\u52a8\u5e94\u7528\u7a0b\u5e8f\u4ee5\u5b8c\u6210\u5b89\u88c5
236.21 InstallStep_Header_Restart_Content=\u91cd\u65b0\u542f\u52a8\u5e94\u7528\u7a0b\u5e8f\u4ee5\u5b8c\u6210\u63d2\u4ef6\u5b89\u88c5\u3002
236.22 -UninstallStep_Header_Restart_Head=\u91cd\u65b0\u542f\u52a8\u5e94\u7528\u7a0b\u5e8f\u4ee5\u5b8c\u6210\u53d6\u6d88\u6fc0\u6d3b
236.23 -UninstallStep_Header_Restart_Content=\u91cd\u65b0\u542f\u52a8\u5e94\u7528\u7a0b\u5e8f\u4ee5\u5b8c\u6210\u63d2\u4ef6\u7684\u53d6\u6d88\u6fc0\u6d3b\u3002
236.24 CustomHandleStep_Header_Install_Restart_Head=\u91cd\u65b0\u542f\u52a8\u5e94\u7528\u7a0b\u5e8f\u4ee5\u5b8c\u6210\u5b89\u88c5
236.25 CustomHandleStep_Header_Install_Restart_Content=\u91cd\u65b0\u542f\u52a8\u5e94\u7528\u7a0b\u5e8f\u4ee5\u5b8c\u6210\u63d2\u4ef6\u5b89\u88c5\u3002
236.26 CustomHandleStep_Header_Uninstall_Restart_Head=\u91cd\u65b0\u542f\u52a8\u5e94\u7528\u7a0b\u5e8f\u4ee5\u5b8c\u6210\u5378\u8f7d
236.27 @@ -56,41 +54,54 @@
236.28 InstallUnitWizardModel_Buttons_Update=\u66f4\u65b0(&U)
236.29 InstallUnitWizardModel_Buttons_Close=\u5b8c\u6210(&F)
236.30 InstallUnitWizardModel_Buttons_Next=\u4e0b\u4e00\u6b65
236.31 -InstallUnitWizardModel_Buttons_MnemonicNext=&{0} >
236.32 +
236.33 +UninstallStep_ActivateDone_Text=\u63d2\u4ef6\u5b89\u88c5\u7a0b\u5e8f\u5df2\u6210\u529f\u6fc0\u6d3b\u4e86\u4ee5\u4e0b\u63d2\u4ef6:
236.34 +# {0} - An error message
236.35 +UninstallStep_ActivateFailed_Text=\u6fc0\u6d3b\u5931\u8d25: {0}
236.36 +UninstallStep_ActivateLater_Text=\u63d2\u4ef6\u5b89\u88c5\u7a0b\u5e8f\u5df2\u6210\u529f\u6fc0\u6d3b\u4e86\u4ee5\u4e0b\u63d2\u4ef6:
236.37 +UninstallStep_DeactivateDone_Text=\u63d2\u4ef6\u5b89\u88c5\u7a0b\u5e8f\u5df2\u6210\u529f\u53d6\u6d88\u6fc0\u6d3b\u4e86\u4ee5\u4e0b\u63d2\u4ef6:
236.38 +# {0} - An error message
236.39 +UninstallStep_DeactivateFailed_Text=\u53d6\u6d88\u6fc0\u6d3b\u5931\u8d25: {0}
236.40 +UninstallStep_DeactivateLater_Text=\u63d2\u4ef6\u5b89\u88c5\u7a0b\u5e8f\u5df2\u6210\u529f\u53d6\u6d88\u6fc0\u6d3b\u4e86\u4ee5\u4e0b\u63d2\u4ef6:
236.41 +UninstallStep_Done=\u5b8c\u6210\u3002
236.42 +# {0} - A error message
236.43 +UninstallStep_Failed=\u5931\u8d25\u3002{0}
236.44 +UninstallStep_Header_Activate_Content=\u8bf7\u7a0d\u5019, \u76f4\u81f3\u5b89\u88c5\u7a0b\u5e8f\u5b8c\u6210\u6240\u6709\u9009\u5b9a\u63d2\u4ef6\u7684\u6fc0\u6d3b\u3002
236.45 +UninstallStep_Header_Activate_Head=\u6fc0\u6d3b
236.46 +UninstallStep_Header_ActivateDone_Content=\u5355\u51fb\u201c\u5b8c\u6210\u201d\u9000\u51fa\u63d2\u4ef6\u5b89\u88c5\u7a0b\u5e8f\u3002
236.47 +UninstallStep_Header_ActivateDone_Head=\u5df2\u6210\u529f\u5b8c\u6210\u6fc0\u6d3b
236.48 +UninstallStep_Header_ActivateFailed_Content=\u5355\u51fb\u201c\u53d6\u6d88\u201d\u9000\u51fa\u63d2\u4ef6\u5b89\u88c5\u7a0b\u5e8f\u3002
236.49 +UninstallStep_Header_ActivateFailed_Head=\u6fc0\u6d3b\u5931\u8d25
236.50 +UninstallStep_Header_Deactivate_Content=\u8bf7\u7a0d\u5019, \u76f4\u81f3\u5b89\u88c5\u7a0b\u5e8f\u5b8c\u6210\u6240\u6709\u9009\u5b9a\u63d2\u4ef6\u7684\u53d6\u6d88\u6fc0\u6d3b\u3002
236.51 +UninstallStep_Header_Deactivate_Head=\u53d6\u6d88\u6fc0\u6d3b
236.52 +UninstallStep_Header_DeactivateDone_Content=\u5355\u51fb\u201c\u5b8c\u6210\u201d\u9000\u51fa\u63d2\u4ef6\u5b89\u88c5\u7a0b\u5e8f\u3002
236.53 +UninstallStep_Header_DeactivateDone_Head=\u5df2\u6210\u529f\u5b8c\u6210\u53d6\u6d88\u6fc0\u6d3b
236.54 +UninstallStep_Header_DeactivateFailed_Content=\u5355\u51fb\u201c\u53d6\u6d88\u201d\u9000\u51fa\u63d2\u4ef6\u5b89\u88c5\u7a0b\u5e8f\u3002
236.55 +UninstallStep_Header_DeactivateFailed_Head=\u53d6\u6d88\u6fc0\u6d3b\u5931\u8d25
236.56 +UninstallStep_Header_Restart_Content=\u91cd\u65b0\u542f\u52a8\u5e94\u7528\u7a0b\u5e8f\u4ee5\u5b8c\u6210\u63d2\u4ef6\u7684\u53d6\u6d88\u6fc0\u6d3b\u3002
236.57 +UninstallStep_Header_Restart_Head=\u91cd\u65b0\u542f\u52a8\u5e94\u7528\u7a0b\u5e8f\u4ee5\u5b8c\u6210\u53d6\u6d88\u6fc0\u6d3b
236.58 +UninstallStep_Header_Uninstall_Content=\u8bf7\u7a0d\u5019, \u76f4\u81f3\u5b89\u88c5\u7a0b\u5e8f\u5b8c\u6210\u6240\u6709\u9009\u5b9a\u63d2\u4ef6\u7684\u5378\u8f7d\u3002
236.59 +UninstallStep_Header_Uninstall_Head=\u5378\u8f7d
236.60 +UninstallStep_Header_UninstallDone_Content=\u5355\u51fb\u201c\u5b8c\u6210\u201d\u9000\u51fa\u63d2\u4ef6\u5b89\u88c5\u7a0b\u5e8f\u3002
236.61 +UninstallStep_Header_UninstallDone_Head=\u5df2\u6210\u529f\u5b8c\u6210\u5378\u8f7d
236.62 +UninstallStep_Header_UninstallFailed_Content=\u5355\u51fb\u201c\u53d6\u6d88\u201d\u9000\u51fa\u63d2\u4ef6\u5b89\u88c5\u7a0b\u5e8f\u3002
236.63 +UninstallStep_Header_UninstallFailed_Head=\u5378\u8f7d\u5931\u8d25
236.64 +# {0} - invalid elements
236.65 +UninstallStep_NullSupport_InvalidElements=\u53d1\u73b0\u8be5\u64cd\u4f5c\u7684\u65e0\u6548\u5143\u7d20 {0}\u3002
236.66 +UninstallStep_NullSupport_NullElements=\u672a\u627e\u5230\u8be5\u64cd\u4f5c\u7684\u4efb\u4f55\u5143\u7d20\u3002
236.67 +UninstallStep_ProgressName_Activate=\u6b63\u5728\u6fc0\u6d3b\u63d2\u4ef6
236.68 +UninstallStep_ProgressName_Deactivate=\u6b63\u5728\u53d6\u6d88\u6fc0\u6d3b\u63d2\u4ef6
236.69 +UninstallStep_ProgressName_Uninstall=\u6b63\u5728\u5378\u8f7d\u63d2\u4ef6
236.70 +UninstallStep_UninstallDone_Text=\u63d2\u4ef6\u5b89\u88c5\u7a0b\u5e8f\u5df2\u6210\u529f\u5378\u8f7d\u4e86\u4ee5\u4e0b\u63d2\u4ef6:
236.71 +# {0} - An error message
236.72 +UninstallStep_UninstallFailed_Text=\u5378\u8f7d\u5931\u8d25: {0}
236.73 +UninstallStep_UninstallLater_Text=\u63d2\u4ef6\u5b89\u88c5\u7a0b\u5e8f\u5df2\u6210\u529f\u5378\u8f7d\u4e86\u4ee5\u4e0b\u63d2\u4ef6:
236.74 +UninstallSupport_RestartNeeded=\u91cd\u65b0\u542f\u52a8\u5e94\u7528\u7a0b\u5e8f\u4ee5\u5b8c\u6210\u53d6\u6d88\u6fc0\u6d3b\u3002
236.75 UninstallUnitWizardModel_Buttons_Uninstall=\u5378\u8f7d(&U)
236.76 UninstallUnitWizardModel_Buttons_TurnOn=\u6fc0\u6d3b(&A)
236.77 UninstallUnitWizardModel_Buttons_TurnOff=\u53d6\u6d88\u6fc0\u6d3b(&D)
236.78 InstallStep_InstallDone_Text=\u63d2\u4ef6\u5b89\u88c5\u7a0b\u5e8f\u5df2\u6210\u529f\u5b89\u88c5\u4e86\u4ee5\u4e0b\u63d2\u4ef6:
236.79 InstallStep_InstallUnsuccessful_Text=\u63d2\u4ef6\u5b89\u88c5\u7a0b\u5e8f\u5728\u5b89\u88c5\u4ee5\u4e0b\u63d2\u4ef6\u65f6\u51fa\u73b0\u95ee\u9898{0}:
236.80 -UninstallStep_UninstallDone_Text=\u63d2\u4ef6\u5b89\u88c5\u7a0b\u5e8f\u5df2\u6210\u529f\u5378\u8f7d\u4e86\u4ee5\u4e0b\u63d2\u4ef6:
236.81 -UninstallStep_ActivateDone_Text=\u63d2\u4ef6\u5b89\u88c5\u7a0b\u5e8f\u5df2\u6210\u529f\u6fc0\u6d3b\u4e86\u4ee5\u4e0b\u63d2\u4ef6:
236.82 -UninstallStep_DeactivateDone_Text=\u63d2\u4ef6\u5b89\u88c5\u7a0b\u5e8f\u5df2\u6210\u529f\u53d6\u6d88\u6fc0\u6d3b\u4e86\u4ee5\u4e0b\u63d2\u4ef6:
236.83 -UninstallStep_UninstallFailed_Text=\u5378\u8f7d\u5931\u8d25: {0}
236.84 -UninstallStep_ActivateFailed_Text=\u6fc0\u6d3b\u5931\u8d25: {0}
236.85 -UninstallStep_DeactivateFailed_Text=\u53d6\u6d88\u6fc0\u6d3b\u5931\u8d25: {0}
236.86 -UninstallStep_Done=\u5b8c\u6210\u3002
236.87 -UninstallStep_Failed=\u5931\u8d25\u3002{0}
236.88 -UninstallStep_Header_Uninstall_Head=\u5378\u8f7d
236.89 -UninstallStep_Header_Uninstall_Content=\u8bf7\u7a0d\u5019, \u76f4\u81f3\u5b89\u88c5\u7a0b\u5e8f\u5b8c\u6210\u6240\u6709\u9009\u5b9a\u63d2\u4ef6\u7684\u5378\u8f7d\u3002
236.90 -UninstallStep_Header_Deactivate_Head=\u53d6\u6d88\u6fc0\u6d3b
236.91 -UninstallStep_Header_Deactivate_Content=\u8bf7\u7a0d\u5019, \u76f4\u81f3\u5b89\u88c5\u7a0b\u5e8f\u5b8c\u6210\u6240\u6709\u9009\u5b9a\u63d2\u4ef6\u7684\u53d6\u6d88\u6fc0\u6d3b\u3002
236.92 -UninstallStep_Header_Activate_Head=\u6fc0\u6d3b
236.93 -UninstallStep_Header_Activate_Content=\u8bf7\u7a0d\u5019, \u76f4\u81f3\u5b89\u88c5\u7a0b\u5e8f\u5b8c\u6210\u6240\u6709\u9009\u5b9a\u63d2\u4ef6\u7684\u6fc0\u6d3b\u3002
236.94 -UninstallStep_Header_UninstallDone_Head=\u5df2\u6210\u529f\u5b8c\u6210\u5378\u8f7d
236.95 -UninstallStep_Header_UninstallDone_Content=\u5355\u51fb\u201c\u5b8c\u6210\u201d\u9000\u51fa\u63d2\u4ef6\u5b89\u88c5\u7a0b\u5e8f\u3002
236.96 -UninstallStep_Header_DeactivateDone_Head=\u5df2\u6210\u529f\u5b8c\u6210\u53d6\u6d88\u6fc0\u6d3b
236.97 -UninstallStep_Header_DeactivateDone_Content=\u5355\u51fb\u201c\u5b8c\u6210\u201d\u9000\u51fa\u63d2\u4ef6\u5b89\u88c5\u7a0b\u5e8f\u3002
236.98 -UninstallStep_Header_ActivateDone_Head=\u5df2\u6210\u529f\u5b8c\u6210\u6fc0\u6d3b
236.99 -UninstallStep_Header_ActivateDone_Content=\u5355\u51fb\u201c\u5b8c\u6210\u201d\u9000\u51fa\u63d2\u4ef6\u5b89\u88c5\u7a0b\u5e8f\u3002
236.100 -UninstallStep_Header_UninstallFailed_Head=\u5378\u8f7d\u5931\u8d25
236.101 -UninstallStep_Header_UninstallFailed_Content=\u5355\u51fb\u201c\u5b8c\u6210\u201d\u9000\u51fa\u63d2\u4ef6\u5b89\u88c5\u7a0b\u5e8f\u3002
236.102 -UninstallStep_Header_DeactivateFailed_Head=\u53d6\u6d88\u6fc0\u6d3b\u5931\u8d25
236.103 -UninstallStep_Header_DeactivateFailed_Content=\u5355\u51fb\u201c\u5b8c\u6210\u201d\u9000\u51fa\u63d2\u4ef6\u5b89\u88c5\u7a0b\u5e8f\u3002
236.104 -UninstallStep_Header_ActivateFailed_Head=\u6fc0\u6d3b\u5931\u8d25
236.105 -UninstallStep_Header_ActivateFailed_Content=\u5355\u51fb\u201c\u5b8c\u6210\u201d\u9000\u51fa\u63d2\u4ef6\u5b89\u88c5\u7a0b\u5e8f\u3002
236.106 -UninstallStep_ProgressName_Uninstall=\u6b63\u5728\u5378\u8f7d\u63d2\u4ef6
236.107 -UninstallStep_ProgressName_Activate=\u6b63\u5728\u6fc0\u6d3b\u63d2\u4ef6
236.108 -UninstallStep_ProgressName_Deactivate=\u6b63\u5728\u53d6\u6d88\u6fc0\u6d3b\u63d2\u4ef6
236.109 ValidationWarningPanel_ShowCertificateButton=\u663e\u793a\u8bc1\u4e66(&S)
236.110 ValidationWarningPanel_ShowCertificateFormat={0}\n{1}\n
236.111 ValidationWarningPanel_Title=\u9a8c\u8bc1\u8b66\u544a
236.112 @@ -103,8 +114,8 @@
236.113 InstallStep_Download_DownloadingPlugins=\u6b63\u5728\u4e0b\u8f7d\u63d2\u4ef6...
236.114 InstallStep_Validate_ValidatingPlugins=\u6b63\u5728\u9a8c\u8bc1\u63d2\u4ef6...
236.115 InstallStep_Install_InstallingPlugins=\u6b63\u5728\u5b89\u88c5\u63d2\u4ef6...
236.116 -OperationDescriptionStep_PluginVersionFormat=[{0}]
236.117 -OperationDescriptionStep_UpdatePluginVersionFormat=[{0} -> {1}]
236.118 +
236.119 +
236.120 OperationWizardModel_MoreBrokenPlugins=<br>\u672a\u5b89\u88c5\u67d0\u4e9b\u63d2\u4ef6\u4ee5\u907f\u514d\u53ef\u80fd\u51fa\u73b0\u5b89\u88c5\u95ee\u9898\u3002
236.121 CustomHandleStep_Header_Install_Head=\u5b89\u88c5
236.122 CustomHandleStep_Header_Install_Content=\u8bf7\u7a0d\u5019, \u76f4\u81f3\u5b89\u88c5\u7a0b\u5e8f\u5b8c\u6210\u5b89\u88c5\u3002
236.123 @@ -132,7 +143,6 @@
236.124 InstallSupport_InBackground_NetworkError_Details=\u8be6\u7ec6\u4fe1\u606f
236.125 LicenseApprovalPanel.cbAccept.text=\u6211\u63a5\u53d7\u6240\u6709\u8bb8\u53ef\u8bc1\u534f\u8bae\u4e2d\u7684\u6761\u6b3e(&A)\u3002
236.126 InstallSupport_RestartNeeded=\u91cd\u65b0\u542f\u52a8\u5e94\u7528\u7a0b\u5e8f\u4ee5\u5b8c\u6210\u5b89\u88c5\u3002
236.127 -UninstallSupport_RestartNeeded=\u91cd\u65b0\u542f\u52a8\u5e94\u7528\u7a0b\u5e8f\u4ee5\u5b8c\u6210\u53d6\u6d88\u6fc0\u6d3b\u3002
236.128 CustomHandleStep_Install_RestartNeeded=\u91cd\u65b0\u542f\u52a8\u5e94\u7528\u7a0b\u5e8f\u4ee5\u5b8c\u6210\u5b89\u88c5\u3002
236.129 CustomHandleStep_Uninstall_RestartNeeded=\u91cd\u65b0\u542f\u52a8\u5e94\u7528\u7a0b\u5e8f\u4ee5\u5b8c\u6210\u5378\u8f7d\u3002
236.130
237.1 --- a/src/zh_CN/platform/favorites/favorites/org/netbeans/modules/favorites/Bundle_zh_CN.properties Wed Feb 26 18:44:50 2014 -0800
237.2 +++ b/src/zh_CN/platform/favorites/favorites/org/netbeans/modules/favorites/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
237.3 @@ -49,8 +49,8 @@
237.4 Favorites=\u6536\u85cf\u5939
237.5
237.6 #name [display name]
237.7 -CTL_DisplayNameTemplate ={0} [{1}]
237.8 -CTL_DisplayNameTemplateHtml={0} <font color=''!controlShadow''>[{1}]
237.9 +
237.10 +
237.11
237.12 # Tab
237.13 ACSN_ExplorerBeanTree=\u8d44\u6e90\u7ba1\u7406\u5668\u6811
238.1 --- a/src/zh_CN/platform/masterfs-windows/masterfs-windows/org/netbeans/modules/masterfs/watcher/windows/Bundle_zh_CN.properties Wed Feb 26 18:44:50 2014 -0800
238.2 +++ b/src/zh_CN/platform/masterfs-windows/masterfs-windows/org/netbeans/modules/masterfs/watcher/windows/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
238.3 @@ -1,2 +1,1 @@
238.4 OpenIDE-Module-Name=\u4e3b\u6587\u4ef6\u7cfb\u7edf @ Windows
238.5 -
239.1 --- a/src/zh_CN/platform/options-api/options-api/org/netbeans/modules/options/classic/Bundle_zh_CN.properties Wed Feb 26 18:44:50 2014 -0800
239.2 +++ b/src/zh_CN/platform/options-api/options-api/org/netbeans/modules/options/classic/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
239.3 @@ -66,9 +66,9 @@
239.4
239.5
239.6 LBL_computing=\u6b63\u5728\u521d\u59cb\u5316\u8bbe\u7f6e...
239.7 -LBL_IndicatorProperty_Name=<<
239.8 +
239.9 LBL_IndicatorProperty_Description=\u663e\u793a\u7ea7\u522b (\u6309 +)
239.10 -LBL_IndicatorProperty_Name_Expanded=>>
239.11 +
239.12 LBL_IndicatorProperty_Description_Expanded=\u9690\u85cf\u7ea7\u522b (\u6309 +)
239.13 CTL_Templates_name=\u6a21\u677f
239.14
240.1 --- a/src/zh_CN/platform/org-netbeans-api-search/org-netbeans-api-search/org/netbeans/modules/search/Bundle_zh_CN.properties Wed Feb 26 18:44:50 2014 -0800
240.2 +++ b/src/zh_CN/platform/org-netbeans-api-search/org-netbeans-api-search/org/netbeans/modules/search/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
240.3 @@ -124,8 +124,8 @@
240.4 TEXT_LABEL_RemoveFromSearchActionName=\u4ece\u641c\u7d22\u4e2d\u5220\u9664
240.5
240.6 #Result view texts
240.7 -TEXT_MSG_RESULTS_FOR_X="{0}"
240.8 -TEXT_MSG_RESULTS_FOR_FILE_PATTERN="*"
240.9 +
240.10 +
240.11 # {0} search string
240.12 TEXT_MSG_NO_NODE_FOUND=\u627e\u4e0d\u5230\u5339\u914d\u6587\u4ef6\u3002
240.13 # {0} number of files. Please do not translate "choice".
241.1 --- a/src/zh_CN/platform/org-netbeans-core-startup/netbeans/core/core/org/netbeans/core/startup/Bundle_zh_CN.properties Wed Feb 26 18:44:50 2014 -0800
241.2 +++ b/src/zh_CN/platform/org-netbeans-core-startup/netbeans/core/core/org/netbeans/core/startup/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
241.3 @@ -1,6 +1,6 @@
241.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
241.5 #
241.6 -# Copyright 1997-2012 Oracle and/or its affiliates. All rights reserved.
241.7 +# Copyright 1997-2014 Oracle and/or its affiliates. All rights reserved.
241.8 #
241.9 # Oracle and Java are registered trademarks of Oracle and/or its affiliates.
241.10 # Other names may be trademarks of their respective owners.
242.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 Feb 26 18:44:50 2014 -0800
242.2 +++ b/src/zh_CN/platform/org-netbeans-core-windows/org-netbeans-core-windows/org/netbeans/core/windows/view/ui/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
242.3 @@ -1,6 +1,6 @@
242.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
242.5 #
242.6 -# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
242.7 +# Copyright 1997-2014 Oracle and/or its affiliates. All rights reserved.
242.8 #
242.9 # Oracle and Java are registered trademarks of Oracle and/or its affiliates.
242.10 # Other names may be trademarks of their respective owners.
242.11 @@ -86,4 +86,7 @@
242.12 ACSN_PropertiesSheet=\u5c5e\u6027\u8868\u5355
242.13 ACSD_PropertiesSheet=\u7528\u6765\u663e\u793a\u7ed9\u5b9a\u8282\u70b9\u7684\u5c5e\u6027\u7684\u89c6\u56fe\u3002
242.14 EXC_CannotLoadNodes=\u65e0\u6cd5\u5c06\u8282\u70b9\u52a0\u8f7d\u5c5e\u6027\u8868\u5355\u3002\u5b83\u4eec\u53ef\u80fd\u5df2\u4e0d\u5b58\u5728\u3002
242.15 +Lbl_OrderBy=\u6392\u5e8f\u65b9\u5f0f
242.16 +Lbl_OrderByName=\u540d\u79f0(&N)
242.17 +Lbl_OrderByUsage=\u6700\u8fd1\u4f7f\u7528\u60c5\u51b5(&R)
242.18
243.1 --- a/src/zh_CN/platform/org-netbeans-core/org-netbeans-core/org/netbeans/core/Bundle_zh_CN.properties Wed Feb 26 18:44:50 2014 -0800
243.2 +++ b/src/zh_CN/platform/org-netbeans-core/org-netbeans-core/org/netbeans/core/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
243.3 @@ -182,5 +182,5 @@
243.4
243.5
243.6
243.7 -NTF_ExceptionalExceptionReport=\u5411 NetBeans \u56e2\u961f\u663e\u793a\u5e76\u62a5\u544a\u95ee\u9898
243.8 +NTF_ExceptionalExceptionReport=\u663e\u793a\u5e76\u62a5\u544a\u95ee\u9898
243.9
244.1 --- a/src/zh_CN/platform/org-netbeans-core/org-netbeans-core/org/netbeans/core/ui/Bundle_zh_CN.properties Wed Feb 26 18:44:50 2014 -0800
244.2 +++ b/src/zh_CN/platform/org-netbeans-core/org-netbeans-core/org/netbeans/core/ui/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
244.3 @@ -43,7 +43,7 @@
244.4 check_for_updates=\u68c0\u67e5\u66f4\u65b0
244.5 # Product Information panel
244.6
244.7 -LBL_AddOnCopyright=<div style="font-size: {1}pt; font-family: Verdana, ''Verdana CE'', Arial, ''Arial CE'', ''Lucida Grande CE'', lucida, ''Helvetica CE'', sans-serif;">{0} </div>
244.8 +
244.9
244.10 # {0} - product version
244.11 # {1} - Java version
245.1 --- a/src/zh_CN/platform/org-netbeans-libs-jna-platform/org-netbeans-libs-jna-platform/org/netbeans/libs/jna/platform/Bundle_zh_CN.properties Wed Feb 26 18:44:50 2014 -0800
245.2 +++ b/src/zh_CN/platform/org-netbeans-libs-jna-platform/org-netbeans-libs-jna-platform/org/netbeans/libs/jna/platform/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
245.3 @@ -45,3 +45,4 @@
245.4 OpenIDE-Module-Display-Category=\u5e93
245.5 OpenIDE-Module-Short-Description=\u6346\u7ed1 JNA \u5e73\u53f0\u5e93\u3002
245.6 OpenIDE-Module-Long-Description=\u6b64\u6a21\u5757\u6346\u7ed1\u4e86 JNA \u5e73\u53f0\u5e93\u3002
245.7 +
246.1 --- a/src/zh_CN/platform/org-openide-awt/org-openide-awt/org/openide/awt/Bundle_zh_CN.properties Wed Feb 26 18:44:50 2014 -0800
246.2 +++ b/src/zh_CN/platform/org-openide-awt/org-openide-awt/org/openide/awt/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
246.3 @@ -93,7 +93,7 @@
246.4 #Title if html doesn't contain title tags
246.5 LBL_Untitled=\u65e0\u6807\u9898
246.6 #Truncated title if > 80 characters
246.7 -LBL_Title={0}...
246.8 +
246.9 FMT_UnknownHost=\u672a\u77e5\u7684\u4e3b\u673a: {0}
246.10 FMT_InvalidURL=\u65e0\u6548\u7684 URL: {0}
246.11 FMT_NoRouteToHost=\u6ca1\u6709\u8fde\u63a5\u5230\u4e3b\u673a\u7684\u8def\u7531: {0}
247.1 --- a/src/zh_CN/platform/org-openide-explorer/org-openide-explorer/org/openide/explorer/propertysheet/Bundle_zh_CN.properties Wed Feb 26 18:44:50 2014 -0800
247.2 +++ b/src/zh_CN/platform/org-openide-explorer/org-openide-explorer/org/openide/explorer/propertysheet/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
247.3 @@ -53,11 +53,11 @@
247.4 #PropertySheet
247.5 CTL_NoPropertyEditor=(\u65e0\u5c5e\u6027\u7f16\u8f91\u5668)
247.6 CTL_NoProperties=<\u65e0\u5c5e\u6027>
247.7 -CTL_Property_Read_Yes=(r/
247.8 -CTL_Property_Read_No=(-/
247.9 +
247.10 +
247.11 CTL_PropertiesNoMnemonic=\u5c5e\u6027
247.12 -CTL_Property_Write_Yes=w)
247.13 -CTL_Property_Write_No=-)
247.14 +
247.15 +
247.16
247.17 # tooltips and accessible names on buttons in the PropertySheet
247.18 CTL_NoSort=\u6309\u7c7b\u522b\u6392\u5e8f
247.19 @@ -117,7 +117,7 @@
247.20 # {1} value shown in a sheet button
247.21 ACS_SheetButton={0,choice,0#\u65e0\u6548\u503c {1}|1#{1}}
247.22 # {0} property name
247.23 -ACS_PropertyPanel={0}:
247.24 +
247.25 # {0} property panel tooltip
247.26
247.27 # {0} property panel acessible name
247.28 @@ -133,7 +133,7 @@
247.29 # {0} property panel accessible name
247.30
247.31 # WARNING: trailing space intentional here:
247.32 -ACSD_BeanListDelimiter=,
247.33 +
247.34
247.35 #IndexedEditorPanel
247.36 CTL_Properties=\u5c5e\u6027(&P)
247.37 @@ -181,8 +181,8 @@
247.38
247.39 #Text to prepend and append to boolean values to dissociate the
247.40 #text value of the checkbox.
247.41 -BOOLEAN_PREPEND=(
247.42 -BOOLEAN_APPEND=)
247.43 +
247.44 +
247.45
247.46
247.47 #Property sheet controls
247.48 @@ -207,7 +207,7 @@
247.49 #Custom editor button tooltip
247.50 CTL_EDBUTTON_TIP=\u5355\u51fb, \u6216\u9009\u62e9\u5e76\u6309\u4e0b Ctrl-\u7a7a\u683c\u952e\u53ef\u6253\u5f00\u5b9a\u5236\u7f16\u8f91\u5668; \u53f3\u952e\u5355\u51fb\u53ef\u5f39\u51fa\u83dc\u5355
247.51 #Delimiter for lists of node names when multiple nodes are selected
247.52 -CTL_List_Delimiter=,
247.53 +
247.54 CTL_ShowDescription=\u663e\u793a\u63cf\u8ff0\u533a\u57df
247.55 CTL_HideDescription=\u9690\u85cf\u63cf\u8ff0\u533a\u57df
247.56 CTL_RestoreDefaultValue=\u6062\u590d\u9ed8\u8ba4\u503c
248.1 --- a/src/zh_CN/platform/org-openide-explorer/org-openide-explorer/org/openide/explorer/view/Bundle_zh_CN.properties Wed Feb 26 18:44:50 2014 -0800
248.2 +++ b/src/zh_CN/platform/org-openide-explorer/org-openide-explorer/org/openide/explorer/view/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
248.3 @@ -79,7 +79,7 @@
248.4 ACSD_NullPanel=\u65e0\u5c5e\u6027\u3002Bean: {0}
248.5 # {0} - property name
248.6 # {1} - property value
248.7 -ACS_PropertyPanelRenderer={0}: {1}
248.8 +
248.9 # {0} - property description
248.10 # {1} - property type
248.11 # {2} - bean
248.12 @@ -116,7 +116,7 @@
248.13 CTL_ColumnsSelector=\u66f4\u6539\u53ef\u89c6\u5217
248.14 ACN_ColumnsSelector=\u5217\u9009\u62e9\u5668
248.15 ACD_ColumnsSelector=\u9009\u62e9\u53ef\u89c6\u5217
248.16 -OutlineViewOutline_NameAndDesc={0}: {1}
248.17 +
248.18 ColumnsSelectorHint=\u9009\u62e9\u8981\u5728\u5217\u8868\u4e2d\u663e\u793a\u7684\u5217
248.19 NodeOutlineModel_NodesColumnLabel=\u8282\u70b9
248.20
249.1 --- a/src/zh_CN/platform/org-openide-loaders/org-openide-loaders/org/openide/loaders/Bundle_zh_CN.properties Wed Feb 26 18:44:50 2014 -0800
249.2 +++ b/src/zh_CN/platform/org-openide-loaders/org-openide-loaders/org/openide/loaders/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
249.3 @@ -316,7 +316,7 @@
249.4 # {0} simple name of file
249.5 # {1} full name of file
249.6 # {2} line number
249.7 -FMT_LineDisplayName2={1}:{2}
249.8 +
249.9
249.10 # DataEditorSupport
249.11 # Cases when modified source file was changed to [read-only]
250.1 --- a/src/zh_CN/platform/org-openide-text/org-openide-text/org/openide/text/Bundle_zh_CN.properties Wed Feb 26 18:44:50 2014 -0800
250.2 +++ b/src/zh_CN/platform/org-openide-text/org-openide-text/org/openide/text/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
250.3 @@ -125,7 +125,7 @@
250.4 # format to create default display name for a line
250.5 # {0} name of the editor support
250.6 # {1} line number
250.7 -FMT_CESLineDisplayName={0}:{1}
250.8 +
250.9
250.10 CTL_Bad_File=\u60a8\u6307\u5b9a\u4e86\u65e0\u6548\u7684\u6587\u4ef6\u3002\u8bf7\u68c0\u67e5\u8def\u5f84\u3002
250.11
251.1 --- a/src/zh_CN/platform/print/print/org/netbeans/modules/print/util/Bundle_zh_CN.properties Wed Feb 26 18:44:50 2014 -0800
251.2 +++ b/src/zh_CN/platform/print/print/org/netbeans/modules/print/util/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
251.3 @@ -48,7 +48,7 @@
251.4
251.5 # {0} - row number
251.6 # {1} - column number
251.7 -LBL_Row_Column={0}.{1}
251.8 +
251.9
251.10 # Macro
251.11 NAME=\u6253\u5370\u7ec4\u4ef6\u7684\u540d\u79f0
252.1 --- a/src/zh_CN/profiler/org-netbeans-lib-profiler/org-netbeans-lib-profiler/org/netbeans/lib/profiler/Bundle_zh_CN.properties Wed Feb 26 18:44:50 2014 -0800
252.2 +++ b/src/zh_CN/profiler/org-netbeans-lib-profiler/org-netbeans-lib-profiler/org/netbeans/lib/profiler/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
252.3 @@ -48,7 +48,7 @@
252.4 ProfilerClient_OutOfMemoryMsg=\u6536\u96c6\u7684\u6570\u636e\u592a\u591a - \u5206\u6790\u5668\u5185\u5b58\u4e0d\u8db3\u3002\n\u5df2\u5220\u9664\u4e86\u6536\u96c6\u7684\u6027\u80fd\u5206\u6790\u6570\u636e, \u5e76\u7ee7\u7eed\u8fdb\u884c\u6027\u80fd\u5206\u6790\u3002\n\u8981\u907f\u514d\u5c06\u6765\u51fa\u73b0\u8be5\u9519\u8bef, \u8bf7\u5728\u5df2\u5b89\u88c5\u7684 \nNetBeans \u7684 etc/netbeans.conf \u6587\u4ef6\u4e2d\u589e\u52a0 -Xmx \u503c, \n\u6216\u8005\u51cf\u5c11\u6027\u80fd\u5206\u6790\u8bbe\u7f6e\u7684\u7ec6\u8282\u5185\u5bb9\u3002
252.5 ProfilerClient_IncorrectAgentVersionMsg=\u8b66\u544a: \u8981\u8fde\u63a5\u5230\u7684\u5206\u6790\u5668\u4ee3\u7406\u4e0e\u6b64\u5206\u6790\u5668\u7684\u7248\u672c\u4e0d\u540c\u3002\n\u53ef\u80fd\u4f1a\u9047\u5230\u9519\u8bef\u548c\u610f\u5916\u884c\u4e3a\u3002
252.6 ProfilerClient_ErrorGettingCalibrationDataMsg=\u4e3a\u76ee\u6807 JVM \u68c0\u7d22\u4fdd\u5b58\u7684\u6821\u51c6\u6570\u636e\u65f6\u51fa\u9519:\n{0}
252.7 -ProfilerClient_MustCalibrateFirstMsg=\u7531\u4e8e\u6b64\u524d\u6ca1\u6709\u5728\u6b64\u8ba1\u7b97\u673a\u6216\u76ee\u6807 JVM \u4e0a\u8fd0\u884c\u5206\u6790\u5668, \n\u5220\u9664\u4e86\u4fdd\u5b58\u7684\u6821\u51c6\u6570\u636e, \u6216\u8005\u6b64\u6570\u636e\u88ab\u635f\u574f, \u73b0\u5728\u5c06\u505c\u6b62\u6027\u80fd\u5206\u6790\u3002\n\n\u91cd\u65b0\u4f7f\u7528\u76ee\u6807 JVM \u8fd0\u884c\u5206\u6790\u5668\u4e4b\u524d, \n\u5fc5\u987b\u4e3a\u76ee\u6807 JVM \u8fd0\u884c\u6821\u51c6\u547d\u4ee4\u3002\n\u5c06\u4fdd\u5b58\u83b7\u53d6\u7684\u6821\u51c6\u6570\u636e, \u5e76\u5728\u968f\u540e\u8fd0\u884c\u65f6\n\u91cd\u65b0\u4f7f\u7528\u5b83, \u8fd9\u6837\u60a8\u4e0d\u4f1a\u518d\u770b\u5230\u6b64\u6d88\u606f\u3002\n\n\u8981\u6267\u884c\u6821\u51c6, \u8bf7\u786e\u4fdd\u6027\u80fd\u5206\u6790\u6240\u7528\u7684 Java \u5e73\u53f0\n\u5df2\u6ce8\u518c\u5230 IDE \u4e2d\u5e76\u8c03\u7528 "\u8fd0\u884c\u5206\u6790\u5668\u6821\u51c6" \u547d\u4ee4\u3002\n\n
252.8 +ProfilerClient_MustCalibrateFirstMsg=\u7531\u4e8e\u6b64\u524d\u6ca1\u6709\u5728\u6b64\u8ba1\u7b97\u673a\u6216\u76ee\u6807 JVM \u4e0a\u8fd0\u884c\u5206\u6790\u5668,\n\u5220\u9664\u4e86\u4fdd\u5b58\u7684\u6821\u51c6\u6570\u636e, \u6216\u8005\u6b64\u6570\u636e\u5df2\u635f\u574f, \u73b0\u5728\u5c06\u505c\u6b62\u6027\u80fd\u5206\u6790\u3002\n\n\u91cd\u65b0\u4f7f\u7528\u76ee\u6807 JVM \u8fd0\u884c\u5206\u6790\u5668\u4e4b\u524d,\n\u5fc5\u987b\u4e3a\u76ee\u6807 JVM \u8fd0\u884c\u6821\u51c6\u547d\u4ee4\u3002\n\u5c06\u4fdd\u5b58\u83b7\u53d6\u7684\u6821\u51c6\u6570\u636e, \u5e76\u5728\u968f\u540e\u8fd0\u884c\u65f6\n\u91cd\u65b0\u4f7f\u7528\u5b83, \u8fd9\u6837\u60a8\u4e0d\u4f1a\u518d\u770b\u5230\u6b64\u6d88\u606f\u3002\n\n\u8981\u6267\u884c\u6821\u51c6, \u8bf7\u786e\u4fdd\u6027\u80fd\u5206\u6790\u6240\u7528\u7684 Java \u5e73\u53f0\n\u5df2\u6ce8\u518c\u5230 IDE \u4e2d\u5e76\u8c03\u7528 "\u7ba1\u7406\u6821\u51c6\u6570\u636e" \u547d\u4ee4\u3002\n\n
252.9 # HTML-formatted
252.10 ProfilerClient_MustCalibrateFirstShortMsg=<html><b>\u7f3a\u5c11\u6821\u51c6\u6570\u636e\u3002</b><br><br>\u65e0\u6cd5\u5728\u6b64 JDK \u4e0a\u542f\u52a8\u6027\u80fd\u5206\u6790\u3002\u8bf7\u5148\u6267\u884c<br>\u5206\u6790\u5668\u6821\u51c6, \u7136\u540e\u518d\u542f\u52a8\u6027\u80fd\u5206\u6790\u3002</html>
252.11 # HTML-formatted
253.1 --- a/src/zh_CN/profiler/profiler/profiler/org/netbeans/modules/profiler/Bundle_zh_CN.properties Wed Feb 26 18:44:50 2014 -0800
253.2 +++ b/src/zh_CN/profiler/profiler/profiler/org/netbeans/modules/profiler/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
253.3 @@ -154,10 +154,10 @@
253.4 NetBeansProfiler_ErrorSavingFilterSetsMessage=\u5728\u4fdd\u5b58\u5b9a\u4e49\u7684\u8fc7\u6ee4\u5668\u96c6\u65f6\u9047\u5230\u9519\u8bef: {0}
253.5 NetBeansProfiler_ErrorSavingGlobalSettingsMessage=\u5728\u4fdd\u5b58\u5168\u5c40\u8bbe\u7f6e\u65f6\u9047\u5230\u9519\u8bef: {0}
253.6 NetBeansProfiler_ErrorSavingProfilingSettingsMessage=\u5728\u4fdd\u5b58\u5168\u5c40\u8fc7\u6ee4\u5668\u65f6\u9047\u5230\u9519\u8bef: {0}
253.7 -NetBeansProfiler_InitialCalibrationMsg=\u5206\u6790\u5668\u73b0\u5728\u5c06\u6267\u884c\u8ba1\u7b97\u673a\u548c\u76ee\u6807 JVM \u7684\u521d\u59cb\u6821\u51c6\u3002\n\n\u9700\u8981\u5728\u7b2c\u4e00\u6b21\u8fd0\u884c\u5206\u6790\u5668\u65f6\u6267\u884c\u6b64\u6821\u51c6\n\u4ee5\u786e\u4fdd\u5e94\u7528\u7a0b\u5e8f\u6027\u80fd\u5206\u6790\u7684\u8ba1\u65f6\u7ed3\u679c\u51c6\u786e\u65e0\u8bef\u3002\u4e3a\u4e86\u8ba9\u6821\u51c6\u6570\u636e\u51c6\u786e\u65e0\u8bef, \n\u8bf7\u786e\u4fdd\u6b64\u65f6\u8ba1\u7b97\u673a\u4e0a\u6ca1\u6709\n\u5176\u4ed6\u5e94\u7528\u7a0b\u5e8f\u7684\u663e\u8457\u8d1f\u8f7d\u3002\n\n\u53ef\u901a\u8fc7\u9009\u62e9\n\u201c\u6027\u80fd\u5206\u6790\u201d|\u201c\u9ad8\u7ea7\u547d\u4ee4\u201d|\u201c\u8fd0\u884c\u5206\u6790\u5668\u6821\u51c6\u201d, \u91cd\u65b0\u8fd0\u884c\u6821\u51c6\n\n\u8b66\u544a: \u5982\u679c\u8ba1\u7b97\u673a\u4f7f\u7528\u52a8\u6001\u7684 CPU \u9891\u7387\u5207\u6362, \n\u8bf7\u5c06\u5176\u7981\u7528, \u5e76\u4e14\u5728\u6027\u80fd\u5206\u6790\u671f\u95f4\u4e0d\u8981\u4f7f\u7528\u5b83\u3002
253.8 +NetBeansProfiler_InitialCalibrationMsg=\u5206\u6790\u5668\u73b0\u5728\u5c06\u6267\u884c\u8ba1\u7b97\u673a\u548c\u76ee\u6807 JVM \u7684\u521d\u59cb\u6821\u51c6\u3002\n\n\u9700\u8981\u5728\u7b2c\u4e00\u6b21\u8fd0\u884c\u5206\u6790\u5668\u65f6\u6267\u884c\u6b64\u6821\u51c6\n\u4ee5\u786e\u4fdd\u5e94\u7528\u7a0b\u5e8f\u6027\u80fd\u5206\u6790\u7684\u8ba1\u65f6\u7ed3\u679c\u51c6\u786e\u65e0\u8bef\u3002\u4e3a\u4e86\u8ba9\u6821\u51c6\u6570\u636e\u51c6\u786e\u65e0\u8bef,\n\u8bf7\u786e\u4fdd\u6b64\u65f6\u8ba1\u7b97\u673a\u4e0a\u6ca1\u6709\n\u5176\u4ed6\u5e94\u7528\u7a0b\u5e8f\u7684\u663e\u8457\u8d1f\u8f7d\u3002\n\n\u53ef\u901a\u8fc7\u9009\u62e9\n\u201c\u6027\u80fd\u5206\u6790\u201d|\u201c\u9ad8\u7ea7\u547d\u4ee4\u201d|\u201c\u7ba1\u7406\u6821\u51c6\u6570\u636e\u201d, \u91cd\u65b0\u8fd0\u884c\u6821\u51c6\n\n\u8b66\u544a: \u5982\u679c\u8ba1\u7b97\u673a\u4f7f\u7528\u52a8\u6001\u7684 CPU \u9891\u7387\u5207\u6362, \n\u8bf7\u5c06\u5176\u7981\u7528, \u5e76\u4e14\u5728\u6027\u80fd\u5206\u6790\u671f\u95f4\u4e0d\u8981\u4f7f\u7528\u5b83\u3002
253.9 NetBeansProfiler_MemorySamplingJava5=<html><b>Java 5 \u4e0d\u652f\u6301\u5185\u5b58\u91c7\u6837\u3002</b><br><br>\u8bf7\u4f7f\u7528 Java 6+ \u8fd0\u884c\u6240\u5206\u6790\u7684\u5e94\u7528\u7a0b\u5e8f\u6216\u4f7f\u7528\u201c\u5185\u5b58\u5206\u6790\u201d\u3002</html>
253.10 NetBeansProfiler_ModifyingInstrumentationMsg=\u6b63\u5728\u4fee\u6539\u5206\u6790\u8bbe\u7f6e...
253.11 -NetBeansProfiler_MustCalibrateFirstMsg=\u5982\u679c\u7f3a\u5c11\u6821\u51c6\u6570\u636e\u6216\u8be5\u6570\u636e\u5df2\u635f\u574f, \u5219\u4f1a\u7acb\u5373\u505c\u6b62\u6027\u80fd\u5206\u6790\u3002\n\n\u5982\u679c\u60a8\u662f\u7b2c\u4e00\u6b21\u5728\u6b64\u8ba1\u7b97\u673a\u4e0a\u4f7f\u7528\u5206\u6790\u5668\u6216\u76ee\u6807 JVM, \n\u5219\u9700\u8981\u9996\u5148\u8fd0\u884c\u76ee\u6807 JVM \u6821\u51c6\u3002\n\u6b64\u65f6\u5c06\u4fdd\u5b58\u83b7\u53d6\u7684\u6821\u51c6\u6570\u636e, \n\u5e76\u5728\u968f\u540e\u8fd0\u884c\u65f6\u91cd\u65b0\u4f7f\u7528, \u56e0\u6b64\u60a8\u5c06\u4e0d\u518d\u770b\u5230\u6b64\u6d88\u606f\u3002\n\n\u8981\u6267\u884c\u6821\u51c6, \u8bf7\u9009\u62e9\n\u201c\u6027\u80fd\u5206\u6790\u201d|\u201c\u9ad8\u7ea7\u547d\u4ee4\u201d|\u201c\u8fd0\u884c\u5206\u6790\u5668\u6821\u51c6\u201d\u3002\n\n
253.12 +NetBeansProfiler_MustCalibrateFirstMsg=\u5982\u679c\u7f3a\u5c11\u6821\u51c6\u6570\u636e\u6216\u8be5\u6570\u636e\u5df2\u635f\u574f, \u5219\u4f1a\u7acb\u5373\u505c\u6b62\u6027\u80fd\u5206\u6790\u3002\n\n\u5982\u679c\u60a8\u662f\u7b2c\u4e00\u6b21\u5728\u6b64\u8ba1\u7b97\u673a\u4e0a\u4f7f\u7528\u5206\u6790\u5668\u6216\u76ee\u6807 JVM,\n\u5219\u9700\u8981\u9996\u5148\u8fd0\u884c\u76ee\u6807 JVM \u6821\u51c6\u3002\n\u5c06\u4fdd\u5b58\u83b7\u53d6\u7684\u6821\u51c6\u6570\u636e, \u5e76\u5728\u968f\u540e\u8fd0\u884c\u65f6\n\u91cd\u65b0\u4f7f\u7528\u5b83, \u8fd9\u6837\u60a8\u4e0d\u4f1a\u518d\u770b\u5230\u6b64\u6d88\u606f\u3002\n\n\u8981\u6267\u884c\u6821\u51c6, \u8bf7\u9009\u62e9\n\u201c\u6027\u80fd\u5206\u6790\u201d|\u201c\u9ad8\u7ea7\u547d\u4ee4\u201d|\u201c\u7ba1\u7406\u6821\u51c6\u6570\u636e\u201d\u3002\n\n
253.13 NetBeansProfiler_MustCalibrateFirstShortMsg=<html><b>\u7f3a\u5c11\u6821\u51c6\u6570\u636e\u3002</b><br><br>\u65e0\u6cd5\u5728\u6b64 JDK \u4e0a\u542f\u52a8\u6027\u80fd\u5206\u6790\u3002\u8bf7\u5148\u6267\u884c<br>\u5206\u6790\u5668\u6821\u51c6, \u7136\u540e\u518d\u542f\u52a8\u6027\u80fd\u5206\u6790\u4f1a\u8bdd\u3002</html>
253.14 NetBeansProfiler_ProgressDialogCaption=\u8fdb\u5ea6...
253.15 NetBeansProfiler_StartingSession=\u6b63\u5728\u542f\u52a8\u6027\u80fd\u5206\u6790\u4f1a\u8bdd...
254.1 --- a/src/zh_CN/profiler/profiler/profiler/org/netbeans/modules/profiler/ui/panels/Bundle_zh_CN.properties Wed Feb 26 18:44:50 2014 -0800
254.2 +++ b/src/zh_CN/profiler/profiler/profiler/org/netbeans/modules/profiler/ui/panels/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
254.3 @@ -90,9 +90,9 @@
254.4 SelectRootMethodsPanel_SelectAllItemText=\u5168\u9009
254.5
254.6 ProgressPanel.jButton1.text=\u53d6\u6d88
254.7 -ProjectSelectorPanel.addButton.text=>
254.8 -ProjectSelectorPanel.removeButton.actionCommand=<
254.9 -ProjectSelectorPanel.removeButton.text=<
254.10 +
254.11 +
254.12 +
254.13 ProjectSelectorPanel.lblAvailable.text=\u53ef\u7528\u7684\u9879\u76ee:
254.14 ProjectSelectorPanel.lblSelected.text=\u9009\u5b9a\u7684\u9879\u76ee:
254.15 ProjectSelectorPanel.jLabel1.text=\u63d0\u793a: \u4f7f\u7528 SPACE \u6765\u9009\u62e9/\u53d6\u6d88\u9009\u62e9\u9879\u76ee
255.1 --- a/src/zh_CN/webcommon/cordova/cordova/org/netbeans/modules/cordova/project/Bundle_zh_CN.properties Wed Feb 26 18:44:50 2014 -0800
255.2 +++ b/src/zh_CN/webcommon/cordova/cordova/org/netbeans/modules/cordova/project/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
255.3 @@ -81,8 +81,8 @@
255.4 CordovaNotFound.jLabel1.text=<html><body>\nNetBeans \u5728\u60a8\u7684 PATH \u4e0a\u627e\u4e0d\u5230 <b>cordova</b> \u6216 <b>git</b>\u3002\u8bf7\u5b89\u88c5 <b>cordova</b> \u548c <b>git</b>\u3002<br>\nNetBeans \u53ef\u80fd\u9700\u8981\u91cd\u65b0\u542f\u52a8\u4ee5\u4f7f\u66f4\u6539\u751f\u6548\u3002\n</body>\n</html>\n
255.5 CordovaCustomizerPanel.cordovaPanel.TabConstraints.tabTitle=\u5e94\u7528\u7a0b\u5e8f
255.6 LBL_InitializeCordovaPanel=\u6b63\u5728\u521d\u59cb\u5316 Cordova \u7c7b\u522b\u3002\u8bf7\u7a0d\u5019...
255.7 -PluginsPanel.selectSelectedButton.text=>
255.8 -PluginsPanel.deselectSelectedButton.text=<
255.9 +
255.10 +
255.11 PluginsPanel.generalInfoLabel.text=<html>\u9009\u62e9 cordova \u63d2\u4ef6\u5e76\u5c06\u5176\u79fb\u52a8\u5230\u201c\u9009\u5b9a\u201d\u5217\u8868\u4ee5\u5c06\u5176\u6dfb\u52a0\u5230\u60a8\u7684\u9879\u76ee\u4e2d\u3002*</html>
255.12 PluginsPanel.selectedLabel.text=\u9009\u5b9a(&S):
255.13 PluginsPanel.librariesLabel.text=\u53ef\u7528(&V):
256.1 --- a/src/zh_CN/webcommon/javascript-karma/javascript-karma/org/netbeans/modules/javascript/karma/run/Bundle_zh_CN.properties Wed Feb 26 18:44:50 2014 -0800
256.2 +++ b/src/zh_CN/webcommon/javascript-karma/javascript-karma/org/netbeans/modules/javascript/karma/run/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
256.3 @@ -4,7 +4,7 @@
256.4 TestRunner.runner.title={0} (Karma)
256.5 # {0} - browser name
256.6 # {1} - suite name
256.7 -TestRunner.suite.name=[{0}] {1}
256.8 +
256.9 TestRunner.tests.none.1=\u672a\u6267\u884c\u6d4b\u8bd5 - \u53ef\u80fd\u51fa\u73b0\u9519\u8bef?
256.10 TestRunner.tests.none.2=\u53ef\u4ee5\u5728\u201c\u8f93\u51fa\u201d\u7a97\u53e3\u4e2d\u9a8c\u8bc1\u5b8c\u6574\u8f93\u51fa\u3002
256.11
257.1 --- a/src/zh_CN/webcommon/web-clientproject-api/web-clientproject-api/org/netbeans/modules/web/clientproject/api/jslibs/Bundle_zh_CN.properties Wed Feb 26 18:44:50 2014 -0800
257.2 +++ b/src/zh_CN/webcommon/web-clientproject-api/web-clientproject-api/org/netbeans/modules/web/clientproject/api/jslibs/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
257.3 @@ -56,11 +56,11 @@
257.4 JavaScriptLibrarySelectionPanel.jsLibsFolder.browse=\u9009\u62e9 JS \u5e93\u76ee\u5f55
257.5 JavaScriptLibrarySelectionPanel.librariesFolderLabel.text=\u5e93\u6587\u4ef6\u5939(&I):
257.6 JavaScriptLibrarySelectionPanel.selectedLabel.text=\u9009\u5b9a(&S):
257.7 -JavaScriptLibrarySelectionPanel.deselectSelectedButton.text=<
257.8 +
257.9 # {0} - library name or filename
257.10 # {1} - library version or file path
257.11
257.12 -JavaScriptLibrarySelectionPanel.selectSelectedButton.text=>
257.13 +
257.14 JavaScriptLibrarySelectionPanel.librariesLabel.text=\u53ef\u7528(&V):
257.15 JavaScriptLibrarySelectionPanel.librariesFolderBrowseButton.text=\u6d4f\u89c8(&B)...
257.16 JavaScriptLibraryCustomizerPanel.loadingLabel.text=\u6b63\u5728\u68c0\u6d4b JavaScript \u6587\u4ef6...
258.1 --- a/src/zh_CN/webcommon/web-clientproject/web-clientproject/org/netbeans/modules/web/clientproject/grunt/Bundle_zh_CN.properties Wed Feb 26 18:44:50 2014 -0800
258.2 +++ b/src/zh_CN/webcommon/web-clientproject/web-clientproject/org/netbeans/modules/web/clientproject/grunt/Bundle_zh_CN.properties Thu Feb 27 00:43:29 2014 -0800
258.3 @@ -44,7 +44,7 @@
258.4 LBL_plugins.properties=Cordova \u63d2\u4ef6
258.5 LBL_run_targets_action=\u8fd0\u884c\u4efb\u52a1
258.6 LBL_important_files=\u91cd\u8981\u6587\u4ef6
258.7 -Templates.gruntfile.js=Gruntfile.js
258.8 +
258.9
258.10 # {0} - Project Name
258.11 # {1} - Task Name