1.1 --- a/src/zh_CN/cnd3/cnd-editor/cnd-editor/org/netbeans/modules/cnd/editor/fortran/Bundle_zh_CN.properties	Thu Nov 26 18:39:56 2009 +0900
     1.2 +++ b/src/zh_CN/cnd3/cnd-editor/cnd-editor/org/netbeans/modules/cnd/editor/fortran/Bundle_zh_CN.properties	Thu Nov 26 21:52:27 2009 +0900
     1.3 @@ -181,7 +181,7 @@
     1.4  #LAB_KW_existEqual        =exist=
     1.5  #LAB_KW_exit              =exit
     1.6  #LAB_KW_external          =external
     1.7 -#LAB_KW_file              =\u6587\u4ef6
     1.8 +#LAB_KW_file              =file
     1.9  #LAB_KW_fileEqual         =file=
    1.10  #LAB_KW_forall            =forall
    1.11  #LAB_KW_formEqual         =form=
    1.12 @@ -204,7 +204,7 @@
    1.13  #LAB_KW_kind              =kind
    1.14  #LAB_KW_len               =len
    1.15  #LAB_KW_logical           =logical
    1.16 -#LAB_KW_module            =\u6a21\u5757
    1.17 +#LAB_KW_module            =module
    1.18  #LAB_KW_nameEqual         =name=
    1.19  #LAB_KW_namedEqual        =named=
    1.20  #LAB_KW_nameList          =namelist
    1.21 @@ -297,4 +297,3 @@
    1.22  #EXAMPLE_coloring_fortran-special-characters=(=.,:'\!%?$&)
    1.23  #EXAMPLE_coloring_fortran-string-literal="string literal"
    1.24  #EXAMPLE_coloring_fortran-whitespace=
    1.25 -

     2.1 --- a/src/zh_CN/cnd3/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/Bundle_zh_CN.properties	Thu Nov 26 18:39:56 2009 +0900
     2.2 +++ b/src/zh_CN/cnd3/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/Bundle_zh_CN.properties	Thu Nov 26 21:52:27 2009 +0900
     2.3 @@ -106,10 +106,11 @@
     2.4  HINT_project_root_node={0} \u4e2d\u7684 C/C++ \u9879\u76ee
     2.5  HINT_project_root_node_on_host=\u4f4d\u4e8e {1} \u7684 {0} \u4e2d\u7684 C/C++ \u9879\u76ee
     2.6  
     2.7 -LBL_RemoteSyncAction_Name_0=\u4e0e\u8fdc\u7a0b\u4e3b\u673a\u540c\u6b65
     2.8 -LBL_RemoteSyncAction_Name_1=\u4e0e {0} \u540c\u6b65
     2.9 -LBL_DownloadAction_Name=\u4ece {0} \u4e0b\u8f7d
    2.10 -LBL_UploadAction_Name=\u4e0a\u8f7d\u81f3 {0}
    2.11 +LBL_DownloadAction_Name_0=\u4ece\u8fdc\u7a0b\u4e3b\u673a\u4e0b\u8f7d
    2.12 +LBL_DownloadAction_Name_1=\u4ece {0} \u4e0b\u8f7d
    2.13 +
    2.14 +LBL_UploadAction_Name_0=\u4e0a\u8f7d\u81f3\u8fdc\u7a0b\u4e3b\u673a
    2.15 +LBL_UploadAction_Name_1=\u4e0a\u8f7d\u81f3 {0}
    2.16  
    2.17  LBL_DownloadTab_Name=\u4ece {0} \u4e0b\u8f7d
    2.18  LBL_UploadTab_Name=\u4e0a\u8f7d\u81f3 {0}
    2.19 @@ -122,7 +123,7 @@
    2.20  
    2.21  # {0} is "user@host" string
    2.22  PROGRESS_TITLE_UPLOAD=\u4e0a\u8f7d\u81f3 {0}
    2.23 -PROGRESS_TITLE_DOWNLOAD=\u4e0b\u8f7d\u81f3 {0}
    2.24 +PROGRESS_TITLE_DOWNLOAD=\u6b63\u5728\u4ece {0} \u4e0b\u8f7d
    2.25  
    2.26  # {0}: file path, {1} brief error description
    2.27  ERR_FILE=\u590d\u5236\u6587\u4ef6 {0} \u65f6\u51fa\u9519\uff1a{1}
    2.28 @@ -132,4 +133,4 @@
    2.29  
    2.30  SUMMARY_SUCCESS=\u6210\u529f\u3002\u5df2\u590d\u5236 {0} \u4e2a\u6587\u4ef6\u3002
    2.31  SUMMARY_ERROR=\u5931\u8d25\u3002\u5df2\u590d\u5236 {0} \u4e2a\u6587\u4ef6\u3002
    2.32 -
    2.33 +SUMMARY_CANCELLED=\u5df2\u53d6\u6d88\u3002\u5df2\u590d\u5236 {0} \u4e2a\u6587\u4ef6\u3002

     3.1 --- a/src/zh_CN/dlight2/dlight-nativeexecution/dlight-nativeexecution/org/netbeans/modules/nativeexecution/Bundle_zh_CN.properties	Thu Nov 26 18:39:56 2009 +0900
     3.2 +++ b/src/zh_CN/dlight2/dlight-nativeexecution/dlight-nativeexecution/org/netbeans/modules/nativeexecution/Bundle_zh_CN.properties	Thu Nov 26 21:52:27 2009 +0900
     3.3 @@ -38,9 +38,9 @@
     3.4  TerminalLocalNativeProcess.ProcessStarted.text=\u5df2\u5728\u5916\u90e8\u7ec8\u7aef\u4e2d\u542f\u52a8\u8fdb\u7a0b...
     3.5  TerminalLocalNativeProcess.dorunNotFound.text=\u65e0\u6cd5\u5728\u5916\u90e8\u7ec8\u7aef\u4e2d\u542f\u52a8\u8fdb\u7a0b - \u627e\u4e0d\u5230 dorun.sh \u811a\u672c...
     3.6  TerminalLocalNativeProcess.terminalFailed.text=\u65e0\u6cd5\u542f\u52a8\u5916\u90e8\u7ec8\u7aef...
     3.7 +TerminalLocalNativeProcess.terminalRunCancelled.text=\u5df2\u53d6\u6d88\u6267\u884c\u5916\u90e8\u7ec8\u7aef
     3.8  TerminalLocalNativeProcess.terminalRunFailed.text=\u65e0\u6cd5\u5728\u5916\u90e8\u7ec8\u7aef\u4e2d\u542f\u52a8\u5e94\u7528\u7a0b\u5e8f...
     3.9  NativeProcess.shellNotFound.text=\u627e\u4e0d\u5230 shell\uff08\u8bf7\u5728\u7cfb\u7edf\u4e2d\u5b89\u88c5 CYGWIN \u6216 MSYS\uff09...
    3.10  NativeProcess.noSuchDirectoryError.text=\u76ee\u5f55 {0} \u4e0d\u5b58\u5728
    3.11  NativeProcess.exceptionOccured.text=\u51fa\u73b0\u9519\u8bef\uff1a{0}
    3.12  
    3.13 -

     4.1 --- a/src/zh_CN/dlight2/dlight-visualizers/dlight-visualizers/org/netbeans/modules/dlight/visualizers/Bundle_zh_CN.properties	Thu Nov 26 18:39:56 2009 +0900
     4.2 +++ b/src/zh_CN/dlight2/dlight-visualizers/dlight-visualizers/org/netbeans/modules/dlight/visualizers/Bundle_zh_CN.properties	Thu Nov 26 21:52:27 2009 +0900
     4.3 @@ -25,4 +25,5 @@
     4.4  
     4.5  Refresh.Tooltip=\u5237\u65b0\u663e\u793a
     4.6  NotDefined=N/A
     4.7 -
     4.8 +FunctionCallNode.prefix.withLine=at
     4.9 +FunctionCallNode.prefix.withoutLine=in

     5.1 --- a/src/zh_CN/enterprise6/web-jsf-editor/web-jsf-editor/org/netbeans/modules/web/jsf/editor/facelets/Bundle_zh_CN.properties	Thu Nov 26 18:39:56 2009 +0900
     5.2 +++ b/src/zh_CN/enterprise6/web-jsf-editor/web-jsf-editor/org/netbeans/modules/web/jsf/editor/facelets/Bundle_zh_CN.properties	Thu Nov 26 21:52:27 2009 +0900
     5.3 @@ -1,4 +1,4 @@
     5.4 -MSG_COMPOSITE_COMPONENT_SOURCE=\u65e0\u53ef\u7528\u6807\u8bb0\u5e93\u63cf\u8ff0\u7b26
     5.5 +MSG_COMPOSITE_COMPONENT_SOURCE=\u6e90\uff1a
     5.6  MSG_TAG_ATTRS=\u6807\u8bb0\u5c5e\u6027
     5.7 -
     5.8 -
     5.9 +MSG_NO_TAG_ATTRS=\u8be5\u6807\u8bb0\u672a\u58f0\u660e\u4efb\u4f55\u5c5e\u6027
    5.10 +MSG_NO_DESCRIPTOR=\u6ca1\u6709\u53ef\u7528\u7684\u5e93\u63cf\u8ff0\u7b26

     6.1 --- a/src/zh_CN/enterprise6/websvc-editor-hints/websvc-editor-hints/org/netbeans/modules/websvc/editor/hints/rules/Bundle_zh_CN.properties	Thu Nov 26 18:39:56 2009 +0900
     6.2 +++ b/src/zh_CN/enterprise6/websvc-editor-hints/websvc-editor-hints/org/netbeans/modules/websvc/editor/hints/rules/Bundle_zh_CN.properties	Thu Nov 26 21:52:27 2009 +0900
     6.3 @@ -46,9 +46,12 @@
     6.4  MSG_HandlerChain_SoapMessageHandlers_Exclusive=\u4e0d\u5141\u8bb8\u5c06 @HandlerChain \u6807\u6ce8\u4e0e @SOAPMessageHandlers \u6807\u6ce8\u7ed3\u5408\u4f7f\u7528\u3002
     6.5  MSG_WebParam_HolderRequired=\u5982\u679c\u53c2\u6570\u7c7b\u578b\u4e0d\u662f javax.xml.ws.Holder \u7c7b\u578b\uff0c\u5219\u4e0d\u5141\u8bb8\u4f7f\u7528 @WebParam.mode=Mode.OUT/INOUT\u3002
     6.6  MSG_Invalid_JSR181Annotation=\u6b64\u670d\u52a1\u5b9e\u73b0 Bean \u4e0d\u80fd\u5305\u542b @WebService \u548c @HandlerChain \u4ee5\u5916\u7684\u4efb\u4f55 JSR-181 \u6807\u6ce8\u3002
     6.7 -MSG_NameAttributeNotAllowed=@WebService \u6807\u6ce8\u4e0d\u80fd\u5305\u542b\u540d\u79f0\u6807\u6ce8\u5143\u7d20\u3002
     6.8 +MSG_NameAttributeNotAllowed=@WebService \u6807\u6ce8\u4e0d\u80fd\u5305\u542b name \u5c5e\u6027\u3002
     6.9  MSG_AddTargetNamespace=\u5fc5\u987b\u4e3a\u4e0d\u5728\u4efb\u4f55\u5305\u4e2d\u7684 Web \u670d\u52a1\u6307\u5b9a\u76ee\u6807\u540d\u79f0\u7a7a\u95f4\u3002
    6.10 -MSG_WebMethod_ExcludeNotAllowed=@WebMethod \u4e0d\u80fd\u5c06 exclude \u5143\u7d20\u8bbe\u7f6e\u4e3a true\u3002
    6.11 +MSG_WebMethod_ExcludeNotAllowed=\u670d\u52a1\u7aef\u70b9\u63a5\u53e3\u4e2d\u7684 @WebMethod \u4e0d\u80fd\u5c06 exclude \u5c5e\u6027\u8bbe\u7f6e\u4e3a true\u3002
    6.12 +MSG_WebMethod_OperationNameNotAllowed=\u5982\u679c\u5c06 exclude \u5c5e\u6027\u8bbe\u7f6e\u4e3a true\uff0c\u5219 @WebMethod \u4e0d\u80fd\u5177\u6709 operationName \u5c5e\u6027\u3002
    6.13 +MSG_WebMethod_ActionNotAllowed=\u5982\u679c\u5c06 exclude \u5c5e\u6027\u8bbe\u7f6e\u4e3a true\uff0c\u5219 @WebMethod \u4e0d\u80fd\u5177\u6709 action \u5c5e\u6027\u3002
    6.14 +MSG_WebMethod_NotAllowed=\u5982\u679c\u6307\u5b9a\u4e86 @WebService:endpointInterface \u5c5e\u6027\uff0c\u5219\u4e0d\u5141\u8bb8\u4f7f\u7528 @WebMethod \u6807\u6ce8\u3002
    6.15  MSG_RPCStyle_ParameterStyleWrapped=\u4f7f\u7528 RPC \u6837\u5f0f\u65f6\uff0c\u8981\u6c42\u4f7f\u7528 WRAPPED \u53c2\u6570\u6837\u5f0f\u3002
    6.16  MSG_InconsistentPortType=\u6b64\u670d\u52a1\u5b9e\u73b0 Bean \u4e0e portType \u4e0d\u4e00\u81f4\u3002
    6.17  MSG_AddOperation=Web \u670d\u52a1\u81f3\u5c11\u9700\u8981\u4e00\u4e2a\u64cd\u4f5c\u3002

     7.1 --- a/src/zh_CN/enterprise6/websvc-rest/websvc-rest/org/netbeans/modules/websvc/rest/wizard/Bundle_zh_CN.properties	Thu Nov 26 18:39:56 2009 +0900
     7.2 +++ b/src/zh_CN/enterprise6/websvc-rest/websvc-rest/org/netbeans/modules/websvc/rest/wizard/Bundle_zh_CN.properties	Thu Nov 26 21:52:27 2009 +0900
     7.3 @@ -301,6 +301,7 @@
     7.4  MSG_InvalidConverterPackageName=\u8f6c\u6362\u5668\u5305\u540d\u65e0\u6548
     7.5  
     7.6  MSG_EmptyUriTemplate=\u8def\u5f84\u4e0d\u80fd\u4e3a\u7a7a
     7.7 +MSG_IncorrectUriTemplate=\u8def\u5f84\u5fc5\u987b\u5305\u542b\u4e00\u7cfb\u5217\u7528\u82b1\u62ec\u53f7\u62ec\u4f4f\u7684\u552f\u4e00 java \u6807\u8bc6\u7b26\u6216\u5b57\u7b26\u4e32\u6587\u5b57\uff0c\u8fd9\u4e9b\u6807\u8bc6\u7b26\u548c\u5b57\u7b26\u4e32\u6587\u5b57\u9700\u8981\u7528\u6b63\u659c\u6760\u9694\u5f00\u3002
     7.8  
     7.9  MSG_EmptyContainerUriTemplate=\u5bb9\u5668\u8def\u5f84\u4e0d\u80fd\u4e3a\u7a7a
    7.10  
    7.11 @@ -312,4 +313,3 @@
    7.12  MNE_RestAptOptions=A
    7.13  
    7.14  MSG_NotSupportedProjectType=\u5411\u5bfc\u4e0d\u652f\u6301\u6b64\u9879\u76ee\u7c7b\u578b\u3002
    7.15 -

     8.1 --- a/src/zh_CN/ergonomics2/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/apisupport/Bundle_zh_CN.properties	Thu Nov 26 18:39:56 2009 +0900
     8.2 +++ b/src/zh_CN/ergonomics2/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/apisupport/Bundle_zh_CN.properties	Thu Nov 26 21:52:27 2009 +0900
     8.3 @@ -62,6 +62,5 @@
     8.4  
     8.5  
     8.6  
     8.7 -#cnbs=org.netbeans.modules.apisupport.kit,org.netbeans.modules.timers
     8.8 +#cnbs=org.netbeans.modules.apisupport.kit
     8.9  
    8.10 -

     9.1 --- a/src/zh_CN/ide12/bugtracking/bugtracking/org/netbeans/modules/bugtracking/jira/Bundle_zh_CN.properties	Thu Nov 26 18:39:56 2009 +0900
     9.2 +++ b/src/zh_CN/ide12/bugtracking/bugtracking/org/netbeans/modules/bugtracking/jira/Bundle_zh_CN.properties	Thu Nov 26 21:52:27 2009 +0900
     9.3 @@ -53,6 +53,7 @@
     9.4  LBL_FakeJiraName=JIRA
     9.5  LBL_Error=\u9519\u8bef
     9.6  MSG_LookingForJira=\u67e5\u627e JIRA \u63d2\u4ef6
     9.7 +LBL_MissingClient_UC_Unavailable=\u66f4\u65b0\u4e2d\u5fc3\u4e0d\u53ef\u7528\u3002
     9.8  MSG_MissingClient_UC_Unavailable=\u65e0\u6cd5\u5b89\u88c5 JIRA \u63d2\u4ef6\uff0c\u56e0\u4e3a\u66f4\u65b0\u4e2d\u5fc3\u5f53\u524d\u4e0d\u53ef\u7528\u3002\n\u8bf7\u7a0d\u540e\u518d\u8bd5\u3002
     9.9  MissingJiraSupportPanel.forceGlobalCheckBox.text=\u5f3a\u5236\u5b89\u88c5\u5230\u5171\u4eab\u76ee\u5f55(&F)
    9.10  MissingJiraSupportPanel.jLabel1.text=jLabel1
    9.11 @@ -74,4 +75,3 @@
    9.12  LBL_NotAvailableTooltip=\u5355\u51fb\u53ef\u5b89\u88c5 JIRA \u652f\u6301
    9.13  LBL_AllIssues=\u6240\u6709\u95ee\u9898
    9.14  LBL_MyIssues=\u6211\u7684\u95ee\u9898
    9.15 -

    10.1 --- a/src/zh_CN/ide12/bugzilla/bugzilla/org/netbeans/modules/bugzilla/query/Bundle_zh_CN.properties	Thu Nov 26 18:39:56 2009 +0900
    10.2 +++ b/src/zh_CN/ide12/bugzilla/bugzilla/org/netbeans/modules/bugzilla/query/Bundle_zh_CN.properties	Thu Nov 26 21:52:27 2009 +0900
    10.3 @@ -179,4 +179,4 @@
    10.4  QueryPanel.whiteboardLabel.text=\u767d\u677f(&H)\uff1a
    10.5  QueryPanel.whiteboardTextField.text=
    10.6  QueryPanel.issueTypeLabel.text=\u95ee\u9898\u7c7b\u578b(&S)
    10.7 -
    10.8 +QueryPanel.tmTypeLabel.text=\u76ee\u6807 &Milestone

    11.1 --- a/src/zh_CN/ide12/db/db/org/netbeans/modules/db/explorer/node/Bundle_zh_CN.properties	Thu Nov 26 18:39:56 2009 +0900
    11.2 +++ b/src/zh_CN/ide12/db/db/org/netbeans/modules/db/explorer/node/Bundle_zh_CN.properties	Thu Nov 26 21:52:27 2009 +0900
    11.3 @@ -79,3 +79,6 @@
    11.4  
    11.5  StoredProcedure=\u5b58\u50a8\u7684\u8fc7\u7a0b
    11.6  
    11.7 +#NodeRegistry
    11.8 +NodeRegistry_CloseBrokenConnection=\u6570\u636e\u5e93\u8fde\u63a5 {0} \u4f3c\u4e4e\u5df2\u4e2d\u65ad\u3002\n\u539f\u56e0\uff1a{1}
    11.9 +NodeRegistry_CloseBrokenConnectionMore=...

    12.1 --- a/src/zh_CN/ide12/glassfish-common/glassfish-common/org/netbeans/modules/glassfish/common/Bundle_zh_CN.properties	Thu Nov 26 18:39:56 2009 +0900
    12.2 +++ b/src/zh_CN/ide12/glassfish-common/glassfish-common/org/netbeans/modules/glassfish/common/Bundle_zh_CN.properties	Thu Nov 26 21:52:27 2009 +0900
    12.3 @@ -53,7 +53,7 @@
    12.4  MSG_START_SERVER_FAILED_FNF=\u65e0\u6cd5\u542f\u52a8 {0} \u670d\u52a1\u5668\u3002\u627e\u4e0d\u5230\u542f\u52a8 jar\u3002
    12.5  MSG_START_SERVER_FAILED_DOMAIN_FNF=\u670d\u52a1\u5668\u65e0\u6cd5\u542f\u52a8\u3002\u7f3a\u5c11 domain.xml \u6587\u4ef6\u6216\u8be5\u6587\u4ef6\u5df2\u635f\u574f\u3002
    12.6  MSG_START_SERVER_FAILED_PD={0} \u670d\u52a1\u5668\u542f\u52a8\u5931\u8d25\u3002\u65e0\u6cd5\u521b\u5efa\u542f\u52a8\u8fdb\u7a0b\u3002
    12.7 -MSG_START_SERVER_FAILED_JDK_ERROR=<html>{0} \u670d\u52a1\u5668\u65e0\u6cd5\u542f\u52a8\u3002\u8bf7\u4f7f\u7528\u670d\u52a1\u5668\u5c5e\u6027\u7684 "Java" \u6807\u7b7e\u8f93\u5165 JDK 6 \u53ef\u6267\u884c\u6587\u4ef6\u7684\u8def\u5f84\u3002</html>
    12.8 +MSG_START_SERVER_FAILED_JDK_ERROR=<html>\u65e0\u6cd5\u542f\u52a8 {0} \u670d\u52a1\u5668\u3002GlassFish v3 \u9700\u8981 JDK 6 \u5e73\u53f0\u3002<br>\u8981\u8fd0\u884c GlassFish v3\uff0c\u60a8\u9700\u8981\u5728\u670d\u52a1\u5668\u7ba1\u7406\u5668\u4e2d\u6307\u5b9a JDK 6 \u53ef\u6267\u884c\u6587\u4ef6\u7684\u4f4d\u7f6e\u3002</html>
    12.9  MSG_START_SERVER_NOT_INITIALIZED= \u672a\u521d\u59cb\u5316 {0} \u670d\u52a1\u5668\u3002
   12.10  MSG_START_SERVER_IN_PROGRESS=\u542f\u52a8 {0}
   12.11  MSG_SERVER_STARTED=\u6b63\u5728\u8fd0\u884c {0}\u3002
   12.12 @@ -108,4 +108,3 @@
   12.13  
   12.14  MSG_see_successful_results=<html>\u57df\u521b\u5efa\u6210\u529f\u3002<br/><br/>\u662f\u5426\u67e5\u770b\u7ed3\u679c\uff1f</html>
   12.15  MSG_see_failure_results=<html>\u57df\u521b\u5efa\u5931\u8d25\u3002<br/><br/>\u662f\u5426\u8981\u67e5\u770b\u8be6\u7ec6\u4fe1\u606f\uff1f</html>
   12.16 -

    13.1 --- a/src/zh_CN/nb6.8/ide-branding/locale/autoupdate-ui_nb/org/netbeans/modules/autoupdate/ui/Bundle_nb_zh_CN.properties	Thu Nov 26 18:39:56 2009 +0900
    13.2 +++ b/src/zh_CN/nb6.8/ide-branding/locale/autoupdate-ui_nb/org/netbeans/modules/autoupdate/ui/Bundle_nb_zh_CN.properties	Thu Nov 26 21:52:27 2009 +0900
    13.3 @@ -1,6 +1,6 @@
    13.4 -#AvailableTab_SourceCategory_Tooltip_STANDARD=NetBeans Development Plugin
    13.5 +#AvailableTab_SourceCategory_Tooltip_STANDARD=NetBeans Certified Plugin
    13.6  #AvailableTab_SourceCategory_Tooltip_BETA=NetBeans Beta Plugin
    13.7 -#AvailableTab_SourceCategory_Tooltip_COMMUNITY=External Development Plugin
    13.8 +#AvailableTab_SourceCategory_Tooltip_COMMUNITY=Community Contributed Plugin
    13.9  
   13.10  InstallTab_PendingForInstall_Tooltip=\u9700\u8981\u91cd\u65b0\u542f\u52a8 IDE \u4ee5\u5b8c\u6210\u5b89\u88c5
   13.11  InstallTab_PendingForDeactivate_Tooltip=\u9700\u8981\u91cd\u65b0\u542f\u52a8 IDE \u4ee5\u5b8c\u6210\u53d6\u6d88\u6fc0\u6d3b
   13.12 @@ -10,4 +10,3 @@
   13.13  PluginManagerUI_UnitTab_Update_ToolTip=\u60a8\u7684 IDE \u662f\u6700\u65b0\u7684\uff01
   13.14  
   13.15  SettingsTab.cbSharedInstall.ReadOnlyMessage=\u60a8\u6ca1\u6709\u5728\u5171\u4eab\u76ee\u5f55\u4e2d\u5b89\u88c5\u63d2\u4ef6\u7684\u6743\u9650\uff1a\n{0}\n\u8981\u5728\u5171\u4eab\u76ee\u5f55\u4e2d\u6267\u884c\u5b89\u88c5\uff0c\u5e94\u4ee5\u5177\u6709\u7ba1\u7406\u6743\u9650\u7684\u7528\u6237\u8eab\u4efd\u8fd0\u884c IDE\u3002
   13.16 -

    14.1 --- a/src/zh_CN/nb6.8/ide-branding/netbeans/core/locale/core_nb/org/netbeans/core/startup/Bundle_nb_zh_CN.properties	Thu Nov 26 18:39:56 2009 +0900
    14.2 +++ b/src/zh_CN/nb6.8/ide-branding/netbeans/core/locale/core_nb/org/netbeans/core/startup/Bundle_nb_zh_CN.properties	Thu Nov 26 21:52:27 2009 +0900
    14.3 @@ -71,8 +71,7 @@
    14.4  #AboutTextColor=0x000000
    14.5  
    14.6  LBL_splash_window_title=\u542f\u52a8 NetBeans IDE
    14.7 -#currentVersion=NetBeans IDE Dev (Build {0})
    14.8 +#currentVersion=NetBeans IDE 6.8 RC1 (Build {0})
    14.9  
   14.10  MSG_warning=NetBeans IDE - \u8b66\u544a
   14.11  MSG_info=NetBeans IDE - \u4fe1\u606f
   14.12 -

    15.1 --- a/src/zh_CN/nb6.8/reglib/reglib/org/netbeans/modules/reglib/Bundle_zh_CN.properties	Thu Nov 26 18:39:56 2009 +0900
    15.2 +++ b/src/zh_CN/nb6.8/reglib/reglib/org/netbeans/modules/reglib/Bundle_zh_CN.properties	Thu Nov 26 21:52:27 2009 +0900
    15.3 @@ -62,14 +62,14 @@
    15.4  #For JavaFX Plug-in for NetBeans
    15.5  #servicetag.javafx.urn=urn:uuid:f57eecf2-9485-11dd-a2a2-080020a9ed93
    15.6  #servicetag.javafx.name=JavaFX Plug-in for NetBeans
    15.7 -#servicetag.javafx.version=6.5
    15.8 +#servicetag.javafx.version=6.8
    15.9  #servicetag.javafx.parent.urn=urn:uuid:bc76c157-8a3c-4da7-97d2-41d561ffe234
   15.10  #servicetag.javafx.parent.name=Development Tools
   15.11  
   15.12 -#For JavaFX 1.0 SDK
   15.13 +#For JavaFX 1.2.1 SDK
   15.14  #servicetag.javafxsdk.urn=urn:uuid:dc4d3ab5-9486-11dd-a2a2-080020a9ed93
   15.15 -#servicetag.javafxsdk.name=JavaFX 1.0 SDK
   15.16 -#servicetag.javafxsdk.version=1.0
   15.17 +#servicetag.javafxsdk.name=JavaFX 1.2.1 SDK
   15.18 +#servicetag.javafxsdk.version=1.2.1
   15.19  #servicetag.javafxsdk.parent.urn=urn:uuid:bc76c157-8a3c-4da7-97d2-41d561ffe234
   15.20  #servicetag.javafxsdk.parent.name=Development Tools
   15.21  

    16.1 --- a/src/zh_CN/nb6.8/updatecenters/updatecenters/org/netbeans/modules/updatecenters/resources/Bundle_zh_CN.properties	Thu Nov 26 18:39:56 2009 +0900
    16.2 +++ b/src/zh_CN/nb6.8/updatecenters/updatecenters/org/netbeans/modules/updatecenters/resources/Bundle_zh_CN.properties	Thu Nov 26 21:52:27 2009 +0900
    16.3 @@ -47,11 +47,15 @@
    16.4  
    16.5  # Service types
    16.6  Services/AutoupdateType=\u81ea\u52a8\u66f4\u65b0\u7c7b\u578b
    16.7 -#Services/AutoupdateType/dev-update-provider.instance=Additional Development Plugins
    16.8 -#Services/AutoupdateType/standard-update-provider.instance=Latest Development Build
    16.9 +#Services/AutoupdateType/standard-update-provider.instance=NetBeans
   16.10 +Services/AutoupdateType/beta-update-provider.instance=NetBeans Beta
   16.11 +Services/AutoupdateType/thirdparty-update-provider.instance=\u7b2c\u4e09\u65b9\u63d2\u4ef6
   16.12 +Services/AutoupdateType/pluginportal-update-provider.instance=\u63d2\u4ef6\u95e8\u6237
   16.13  #NOI18N
   16.14 -#URL_LatestBuild=http://deadlock.netbeans.org/hudson/job/nbms-and-javadoc/lastStableBuild/artifact/nbbuild/nbms/updates.xml.gz
   16.15 -#URL_Default_N=http://updates.netbeans.org/netbeans/updates/dev/uc/final/main/catalog.xml.gz?{$netbeans.hash.code}
   16.16 +URL_Standard=http://updates.netbeans.org/netbeans/updates/6.8/uc/final/stable/catalog.xml.gz?{$netbeans.hash.code}
   16.17 +#URL_Beta=http://updates.netbeans.org/netbeans/updates/6.8/uc/final/beta/catalog.xml.gz?{$netbeans.hash.code}
   16.18 +#URL_ThirdParty=http://updates.netbeans.org/netbeans/updates/6.8/uc/final/thirdparty/catalog.xml.gz?{$netbeans.hash.code}
   16.19 +#URL_PluginPortal=http://plugins.netbeans.org/nbpluginportal/updates/6.8/catalog.xml.gz
   16.20  
   16.21  Services/AutoupdateType/beta-update-provider.instance=NetBeans Beta
   16.22  Services/AutoupdateType/thirdparty-update-provider.instance=\u7b2c\u4e09\u65b9\u63d2\u4ef6

    17.1 --- a/src/zh_CN/other/installer/components/products/glassfish-mod-sun/data/Bundle_zh_CN.properties	Thu Nov 26 18:39:56 2009 +0900
    17.2 +++ b/src/zh_CN/other/installer/components/products/glassfish-mod-sun/data/Bundle_zh_CN.properties	Thu Nov 26 21:52:27 2009 +0900
    17.3 @@ -35,5 +35,4 @@
    17.4  # 
    17.5  
    17.6  product.display.name=Sun GlassFish Enterprise Server {display-version}
    17.7 -product.description=Sun GlassFish Enterprise Server {display-version} \u662f\u4e00\u6b3e\u9002\u7528\u4e8e GlassFish v3 Prelude \u7684\u5546\u4e1a\u652f\u6301\u4ea7\u54c1\uff0c\u540e\u8005\u662f\u4e00\u4e2a\u5f00\u6e90\u7684\u8f7b\u91cf\u7ea7 Web 2.0 \u5f00\u53d1\u548c\u90e8\u7f72\u5e73\u53f0\u3002GlassFish Enterprise Server v3 Prelude \u975e\u5e38\u9002\u5408\u90e8\u7f72\u53d7 Java \u6216\u52a8\u6001\u8bed\u8a00\uff08\u5982 JRuby\uff09\u652f\u6301\u7684\u5bcc Internet \u5e94\u7528\u7a0b\u5e8f\u3002
    17.8 -
    17.9 +product.description=Sun GlassFish Enterprise Server {display-version} \u662f\u4e00\u6b3e\u9002\u7528\u4e8e GlassFish v3 \u7684\u5546\u4e1a\u652f\u6301\u4ea7\u54c1\uff0c\u540e\u8005\u662f\u4e00\u4e2a\u5f00\u6e90\u7684\u8f7b\u91cf\u7ea7 Web 2.0 \u5f00\u53d1\u548c\u90e8\u7f72\u5e73\u53f0\u3002GlassFish Enterprise Server v3 \u975e\u5e38\u9002\u5408\u90e8\u7f72\u53d7 Java \u6216\u52a8\u6001\u8bed\u8a00\uff08\u5982 JRuby\uff09\u652f\u6301\u7684\u5bcc Internet \u5e94\u7528\u7a0b\u5e8f\u3002

    18.1 --- a/src/zh_CN/other/installer/components/products/glassfish/src/org/netbeans/installer/products/glassfish/wizard/panels/Bundle_zh_CN.properties	Thu Nov 26 18:39:56 2009 +0900
    18.2 +++ b/src/zh_CN/other/installer/components/products/glassfish/src/org/netbeans/installer/products/glassfish/wizard/panels/Bundle_zh_CN.properties	Thu Nov 26 21:52:27 2009 +0900
    18.3 @@ -91,4 +91,3 @@
    18.4  GFP.default.https.port=8181
    18.5  #NOI18N
    18.6  GFP.default.admin.port=4848
    18.7 -

    19.1 --- a/src/zh_CN/other/installer/components/products/sjsas/src/org/netbeans/installer/products/sjsas/wizard/panels/Bundle_zh_CN.properties	Thu Nov 26 18:39:56 2009 +0900
    19.2 +++ b/src/zh_CN/other/installer/components/products/sjsas/src/org/netbeans/installer/products/sjsas/wizard/panels/Bundle_zh_CN.properties	Thu Nov 26 21:52:27 2009 +0900
    19.3 @@ -101,4 +101,3 @@
    19.4  AS.default.https.port=8181
    19.5  #NOI18N
    19.6  AS.default.admin.port=4848
    19.7 -

    20.1 --- a/src/zh_CN/other/installer/engine/src/org/netbeans/installer/wizard/components/panels/netbeans/Bundle_zh_CN.properties	Thu Nov 26 18:39:56 2009 +0900
    20.2 +++ b/src/zh_CN/other/installer/engine/src/org/netbeans/installer/wizard/components/panels/netbeans/Bundle_zh_CN.properties	Thu Nov 26 21:52:27 2009 +0900
    20.3 @@ -108,7 +108,7 @@
    20.4  NPoISP.message.metrics.list=<html><ul><li>\u5982\u679c\u60a8\u540c\u610f\u53c2\u4e0e\uff0cIDE \u5c06\u8ddf\u8e2a\u60a8\u4f7f\u7528\u7684\u9ad8\u7ea7\u529f\u80fd</li><li>\u6536\u96c6\u7684\u533f\u540d\u6570\u636e\u5c06\u63d0\u4ea4\u5230 netbeans.org \u670d\u52a1\u5668\u4e0a\u7684\u4f7f\u7528\u60c5\u51b5\u7edf\u8ba1\u4fe1\u606f\u6570\u636e\u5e93</li></ul>                            
    20.5  #NOI18N
    20.6  NPoISP.message.metrics.text.content.type=text/html
    20.7 -NPoISP.message.metrics.text=<html>\u4f7f\u7528\u60c5\u51b5\u7edf\u8ba1\u4fe1\u606f\u53ef\u5e2e\u52a9\u5f00\u53d1\u56e2\u961f\u66f4\u597d\u5730\u4e86\u89e3\u7528\u6237\u7684\u9700\u6c42\uff0c\u5e76\u4f1a\u5728\u5c06\u6765\u7684\u53d1\u884c\u7248\u4e2d\u4f18\u5148\u6539\u8fdb\u3002\u6211\u4eec\u51b3\u4e0d\u4f1a\u5bf9\u6536\u96c6\u7684\u6570\u636e\u6267\u884c\u9006\u5411\u5de5\u7a0b\u4ee5\u4e86\u89e3\u6709\u5173\u60a8\u7684\u9879\u76ee\u7684\u7279\u5b9a\u8be6\u7ec6\u4fe1\u606f\u3002\u8bf7\u53c2\u89c1<a href="http://www.netbeans.org/about/usage-tracking.html">\u66f4\u591a\u4fe1\u606f</a>\u3002
    20.8 +NPoISP.message.metrics.text=<html>\u4f7f\u7528\u60c5\u51b5\u7edf\u8ba1\u4fe1\u606f\u53ef\u5e2e\u52a9\u5f00\u53d1\u56e2\u961f\u66f4\u597d\u5730\u4e86\u89e3\u7528\u6237\u7684\u9700\u6c42\uff0c\u5e76\u4f1a\u5728\u5c06\u6765\u7684\u53d1\u884c\u7248\u4e2d\u4f18\u5148\u6539\u8fdb\u3002\u6211\u4eec\u4e0d\u4f1a\u5bf9\u6536\u96c6\u7684\u6570\u636e\u6267\u884c\u9006\u5411\u5de5\u7a0b\u64cd\u4f5c\uff0c\u4ee5\u67e5\u627e\u6709\u5173\u60a8\u9879\u76ee\u7684\u7279\u5b9a\u8be6\u7ec6\u4fe1\u606f\u3002\u8bf7\u53c2\u89c1<a href="http://www.netbeans.org/about/usage-tracking.html">\u66f4\u591a\u4fe1\u606f</a>\u3002
    20.9  
   20.10  NPoISP.message.text.success.uninstall=<html>\u5df2\u6210\u529f\u5b8c\u6210\u5378\u8f7d\u3002</html>
   20.11  #NOI18N
   20.12 @@ -217,4 +217,3 @@
   20.13  # NbCustomizeSelectionDialog.java
   20.14  NCSD.feature.description.title=\u63cf\u8ff0
   20.15  NCSD.list.product.installed={0}\uff08\u5df2\u5b89\u88c5\uff09
   20.16 -

    21.1 --- a/src/zh_CN/other/installer/mac/newbuild/Bundle_zh_CN.properties	Thu Nov 26 18:39:56 2009 +0900
    21.2 +++ b/src/zh_CN/other/installer/mac/newbuild/Bundle_zh_CN.properties	Thu Nov 26 21:52:27 2009 +0900
    21.3 @@ -18,7 +18,7 @@
    21.4  glassfish-v3-tooltip=GlassFish v3
    21.5  
    21.6  glassfish-v3-sun-title=Sun GlassFish Enterprise Server ${glassfish.v3.sun.display.version}
    21.7 -glassfish-v3-sun-description=Sun GlassFish Enterprise Server ${glassfish.v3.sun.display.version} \u662f\u4e00\u6b3e\u9002\u7528\u4e8e GlassFish v3 Prelude \u7684\u5546\u4e1a\u652f\u6301\u4ea7\u54c1\uff0c\u540e\u8005\u662f\u4e00\u4e2a\u5f00\u6e90\u7684\u8f7b\u91cf\u7ea7 Web 2.0 \u5f00\u53d1\u548c\u90e8\u7f72\u5e73\u53f0\u3002GlassFish Enterprise Server v3 Prelude \u975e\u5e38\u9002\u5408\u90e8\u7f72\u53d7 Java \u6216\u52a8\u6001\u8bed\u8a00\uff08\u5982 JRuby\uff09\u652f\u6301\u7684\u5bcc Internet \u5e94\u7528\u7a0b\u5e8f\u3002
    21.8 +glassfish-v3-sun-description=Sun GlassFish Enterprise Server ${glassfish.v3.sun.display.version} \u662f\u4e00\u6b3e\u9002\u7528\u4e8e GlassFish v3 \u7684\u5546\u4e1a\u652f\u6301\u4ea7\u54c1\uff0c\u540e\u8005\u662f\u4e00\u4e2a\u5f00\u6e90\u7684\u8f7b\u91cf\u7ea7 Web 2.0 \u5f00\u53d1\u548c\u90e8\u7f72\u5e73\u53f0\u3002GlassFish Enterprise Server v3 \u975e\u5e38\u9002\u5408\u90e8\u7f72\u53d7 Java \u6216\u52a8\u6001\u8bed\u8a00\uff08\u5982 JRuby\uff09\u652f\u6301\u7684\u5bcc Internet \u5e94\u7528\u7a0b\u5e8f\u3002
    21.9  glassfish-v3-sun-tooltip=Sun GlassFish Enterprise Server v3
   21.10  
   21.11  

    22.1 --- a/src/zh_CN/platform11/org-netbeans-core-startup/netbeans/core/core/org/netbeans/core/startup/Bundle_zh_CN.properties	Thu Nov 26 18:39:56 2009 +0900
    22.2 +++ b/src/zh_CN/platform11/org-netbeans-core-startup/netbeans/core/core/org/netbeans/core/startup/Bundle_zh_CN.properties	Thu Nov 26 21:52:27 2009 +0900
    22.3 @@ -45,7 +45,7 @@
    22.4  
    22.5  # VERSIONING (TopLogging, MainWindow)
    22.6  # {0} - build number
    22.7 -#currentVersion=NetBeans Platform Dev (Build {0})
    22.8 +#currentVersion=NetBeans Platform 6.8 RC1 (Build {0})
    22.9  
   22.10  # TopManager properties
   22.11  ERR_no_user_directory=\u672a\u8bbe\u7f6e netbeans.user\u3002\n\u8bf7\u68c0\u67e5 NetBeans \u7684\u542f\u52a8\u811a\u672c\u3002
   22.12 @@ -225,4 +225,3 @@
   22.13  # {3} - line #
   22.14  EXC_sax_parse_col_line=\u6587\u4ef6 {1} \u7b2c {3} \u884c\u7b2c {2} \u5217\u5b58\u5728\u89e3\u6790\u9519\u8bef (PUBLIC {0})
   22.15  
   22.16 -

    23.1 --- a/src/zh_CN/platform11/org-netbeans-core-ui/org-netbeans-core-ui/org/netbeans/core/ui/resources/Bundle_zh_CN.properties	Thu Nov 26 18:39:56 2009 +0900
    23.2 +++ b/src/zh_CN/platform11/org-netbeans-core-ui/org-netbeans-core-ui/org/netbeans/core/ui/resources/Bundle_zh_CN.properties	Thu Nov 26 21:52:27 2009 +0900
    23.3 @@ -45,7 +45,6 @@
    23.4  Actions=\u64cd\u4f5c
    23.5  Actions/Edit=\u7f16\u8f91
    23.6  Actions/Help=\u5e2e\u52a9
    23.7 -Actions/Other=\u5176\u4ed6
    23.8  Actions/System=\u7cfb\u7edf
    23.9  Actions/Tools=\u5de5\u5177
   23.10  Actions/View=\u89c6\u56fe
   23.11 @@ -71,4 +70,3 @@
   23.12  UI/Services=\u9009\u9879
   23.13  
   23.14  ProgressDisplayName_FileSystemRefresh=\u5237\u65b0\u6587\u4ef6
   23.15 -

    24.1 --- a/src/zh_CN/platform11/org-netbeans-core-windows/org-netbeans-core-windows/org/netbeans/core/windows/view/ui/Bundle_zh_CN.properties	Thu Nov 26 18:39:56 2009 +0900
    24.2 +++ b/src/zh_CN/platform11/org-netbeans-core-windows/org-netbeans-core-windows/org/netbeans/core/windows/view/ui/Bundle_zh_CN.properties	Thu Nov 26 21:52:27 2009 +0900
    24.3 @@ -46,8 +46,8 @@
    24.4  # {0} build number
    24.5  # {1} project name
    24.6  # {2} name of main project
    24.7 -#CTL_MainWindow_Title=NetBeans Platform {0}
    24.8 -#CTL_MainWindow_Title_No_Project=NetBeans Platform {0}
    24.9 +#CTL_MainWindow_Title=NetBeans Platform 6.8 RC1
   24.10 +#CTL_MainWindow_Title_No_Project=NetBeans Platform 6.8 RC1
   24.11  
   24.12  # DocumentsDlg
   24.13  LBL_Documents=\u6587\u6863(&D)\uff1a
   24.14 @@ -84,4 +84,3 @@
   24.15  ACSN_PropertiesSheet=\u5c5e\u6027\u8868\u5355
   24.16  ACSD_PropertiesSheet=\u7528\u6765\u663e\u793a\u7ed9\u5b9a\u8282\u70b9\u7684\u5c5e\u6027\u7684\u89c6\u56fe\u3002
   24.17  EXC_CannotLoadNodes=\u65e0\u6cd5\u5c06\u8282\u70b9\u88c5\u5165\u5c5e\u6027\u8868\u5355\u3002\u5b83\u4eec\u53ef\u80fd\u5df2\u4e0d\u5b58\u5728\u3002
   24.18 -

    25.1 --- a/src/zh_CN/ruby2/ruby-project/ruby-project/org/netbeans/modules/ruby/rubyproject/ui/wizards/Bundle_zh_CN.properties	Thu Nov 26 18:39:56 2009 +0900
    25.2 +++ b/src/zh_CN/ruby2/ruby-project/ruby-project/org/netbeans/modules/ruby/rubyproject/ui/wizards/Bundle_zh_CN.properties	Thu Nov 26 21:52:27 2009 +0900
    25.3 @@ -70,6 +70,7 @@
    25.4  ERROR_IllegalMainClassName=\u4e3b\u7c7b\u540d\u65e0\u6548\u3002
    25.5  MSG_IllegalProjectLocation=\u9879\u76ee\u6587\u4ef6\u5939\u4e0d\u662f\u6709\u6548\u7684\u8def\u5f84\u3002
    25.6  MSG_ProjectInRootNotSupported=\u4e0d\u652f\u6301\u5728\u6587\u4ef6\u7cfb\u7edf\u6839\u6587\u4ef6\u5939\u4e2d\u521b\u5efa\u9879\u76ee\u3002
    25.7 +MSG_ProjectAlreadyProject=\u9879\u76ee\u76ee\u5f55\u5df2\u662f NetBeans \u9879\u76ee\u76ee\u5f55\uff08\u53ef\u80fd\u4ec5\u5728\u5185\u5b58\u4e2d\uff09\u3002
    25.8  
    25.9  #PanelSourceFolders
   25.10  CTL_AddSourceRoot=\u6d4f\u89c8\u6e90\u5305\u6587\u4ef6\u5939
   25.11 @@ -84,9 +85,6 @@
   25.12  CTL_AddTestFolder=\u6dfb\u52a0\u6587\u4ef6\u5939(&D)
   25.13  CTL_RemoveTestFolder=\u5220\u9664(&E)
   25.14  
   25.15 -# #47611: old project metadata was deleted, but the IDE still has a "live" project there
   25.16 -# (should not be an error in the future: see #42422)
   25.17 -MSG_ProjectFolderHasDeletedProject=\u6b64\u9879\u76ee\u6587\u4ef6\u5939\u66fe\u88ab\u4f7f\u7528\u3002\u8bf7\u91cd\u65b0\u542f\u52a8 IDE \u4ee5\u91cd\u7528\u6b64\u6587\u4ef6\u5939\u3002
   25.18  TXT_NetBeansProject=NetBeans \u9879\u76ee
   25.19  MSG_IllegalSources=\u6e90\u5305\u6587\u4ef6\u5939 {0} \u4e0d\u5b58\u5728\u3002
   25.20  MSG_IllegalTests=\u6d4b\u8bd5\u5305\u6587\u4ef6\u5939 {0} \u4e0d\u5b58\u5728\u3002

    26.1 --- a/src/zh_CN/ruby2/ruby-railsprojects/ruby-railsprojects/org/netbeans/modules/ruby/railsprojects/ui/wizards/Bundle_zh_CN.properties	Thu Nov 26 18:39:56 2009 +0900
    26.2 +++ b/src/zh_CN/ruby2/ruby-railsprojects/ruby-railsprojects/org/netbeans/modules/ruby/railsprojects/ui/wizards/Bundle_zh_CN.properties	Thu Nov 26 21:52:27 2009 +0900
    26.3 @@ -82,6 +82,7 @@
    26.4  LAB_IteratorName={0}/{1}
    26.5  MSG_IllegalProjectLocation=\u9879\u76ee\u6587\u4ef6\u5939\u4e0d\u662f\u6709\u6548\u7684\u8def\u5f84\u3002
    26.6  MSG_ProjectInRootNotSupported=\u4e0d\u652f\u6301\u5728\u6587\u4ef6\u7cfb\u7edf\u6839\u6587\u4ef6\u5939\u4e2d\u521b\u5efa\u9879\u76ee\u3002
    26.7 +MSG_ProjectAlreadyProject=\u9879\u76ee\u76ee\u5f55\u5df2\u662f NetBeans \u9879\u76ee\u76ee\u5f55\uff08\u53ef\u80fd\u4ec5\u5728\u5185\u5b58\u4e2d\uff09\u3002
    26.8  
    26.9  #PanelSourceFolders
   26.10  MSG_IllegalProjectName=\u9879\u76ee\u540d\u79f0\u4e0d\u662f\u6709\u6548\u7684\u6587\u4ef6\u5939\u540d\u79f0\u3002