1.1 --- a/src/zh_CN/enterprise/websvc-rest/websvc-rest/org/netbeans/modules/websvc/rest/client/Bundle_zh_CN.properties	Tue Jun 01 18:34:57 2010 +0900
     1.2 +++ b/src/zh_CN/enterprise/websvc-rest/websvc-rest/org/netbeans/modules/websvc/rest/client/Bundle_zh_CN.properties	Tue Jun 01 19:01:38 2010 +0900
     1.3 @@ -51,7 +51,7 @@
     1.4  RESTResourcesPanel.jRadioButton1_hint=\u201c\u9879\u76ee\u201d\u89c6\u56fe\u4e2d\u5df2\u6ce8\u518c\u7684\u670d\u52a1\u3002
     1.5  RESTResourcesPanel.jButton1.text=\u6d4f\u89c8(&B)...
     1.6  RESTResourcesPanel.jLabel3.text=&REST \u8d44\u6e90\u540d\u79f0\uff1a
     1.7 -RESTResourcesPanel.jRadioButton2.text=&IDE \u5df2\u6ce8\u518c
     1.8 +RESTResourcesPanel.jRadioButton2.text=&IDE \u4e2d\u7684\u5df2\u6ce8\u518c\u670d\u52a1
     1.9  RESTResourcesPanel.jRadioButton2_hint=\u201c\u670d\u52a1\u201d\u89c6\u56fe\u4e2d\u5df2\u6ce8\u518c\u7684\u670d\u52a1\uff08\u4f4d\u4e8e\u201cWeb \u670d\u52a1\u201d\u8282\u70b9\u4e0b\uff09\u3002
    1.10  LBL_SelectRestResource=\u9009\u62e9 REST \u8d44\u6e90\u3002
    1.11  

     2.1 --- a/src/zh_CN/ide/derby/derby/org/netbeans/modules/derby/spi/support/Bundle_zh_CN.properties	Tue Jun 01 18:34:57 2010 +0900
     2.2 +++ b/src/zh_CN/ide/derby/derby/org/netbeans/modules/derby/spi/support/Bundle_zh_CN.properties	Tue Jun 01 19:01:38 2010 +0900
     2.3 @@ -38,5 +38,5 @@
     2.4  # made subject to such option by the copyright holder.
     2.5  
     2.6  #NOI18N
     2.7 -LBL_DerbyDatabaseDirectory=.netbeans-derby
     2.8 +#LBL_DerbyDatabaseDirectory=.netbeans-derby
     2.9  

     3.1 --- a/src/zh_CN/ide/dlight-nativeexecution/dlight-nativeexecution/org/netbeans/modules/nativeexecution/Bundle_zh_CN.properties	Tue Jun 01 18:34:57 2010 +0900
     3.2 +++ b/src/zh_CN/ide/dlight-nativeexecution/dlight-nativeexecution/org/netbeans/modules/nativeexecution/Bundle_zh_CN.properties	Tue Jun 01 19:01:38 2010 +0900
     3.3 @@ -46,5 +46,5 @@
     3.4  NativeProcess.shellNotFound.text=\u627e\u4e0d\u5230 shell\uff08\u8bf7\u5728\u7cfb\u7edf\u4e2d\u5b89\u88c5 CYGWIN \u6216 MSYS\uff09...
     3.5  NativeProcess.noSuchDirectoryError.text=\u76ee\u5f55 {0} \u4e0d\u5b58\u5728
     3.6  NativeProcess.exceptionOccured.text=\u51fa\u73b0\u9519\u8bef\uff1a{0}
     3.7 -LocalNativeProcess.windowsProcessStartFailed.1073741515.text=\u5e94\u7528\u7a0b\u5e8f\u5931\u8d25\uff0c\u9000\u51fa\u4ee3\u7801\u4e3a 1073741515 (0xc0000135)\u3002\n\u8fd9\u53ef\u80fd\u6307\u793a\u5728 PATH \u73af\u5883\u53d8\u91cf\u4e2d\u627e\u4e0d\u5230\u6240\u9700\u7684 .dll\u3002\n\u8bf7\u5c1d\u8bd5\u901a\u8fc7\u547d\u4ee4 shell (cmd.exe) \u542f\u52a8\u4ee5\u4e0b\u547d\u4ee4\u3002\n\u8be5\u64cd\u4f5c\u53ef\u63d0\u4f9b\u4e00\u4e9b\u5176\u4ed6\u4fe1\u606f\u3002\n\n{0}\n
     3.8 +LocalNativeProcess.windowsProcessStartFailed.1073741515.text=\u5e94\u7528\u7a0b\u5e8f\u5931\u8d25\uff0c\u9000\u51fa\u4ee3\u7801\u4e3a 1073741515 (0xc0000135)\u3002\n\u8fd9\u53ef\u80fd\u8868\u793a\u5728 PATH \u73af\u5883\u53d8\u91cf\u4e2d\u627e\u4e0d\u5230\u6240\u9700\u7684 .dll\u3002\n\u8bf7\u5c1d\u8bd5\u901a\u8fc7\u547d\u4ee4 shell (cmd.exe) \u542f\u52a8\u4ee5\u4e0b\u547d\u4ee4\u3002\n\u8be5\u64cd\u4f5c\u53ef\u63d0\u4f9b\u4e00\u4e9b\u5176\u4ed6\u4fe1\u606f\u3002\n\n{0}\n
     3.9  

     4.1 --- a/src/zh_CN/java/form/form/org/netbeans/modules/form/editors/Bundle_zh_CN.properties	Tue Jun 01 18:34:57 2010 +0900
     4.2 +++ b/src/zh_CN/java/form/form/org/netbeans/modules/form/editors/Bundle_zh_CN.properties	Tue Jun 01 19:01:38 2010 +0900
     4.3 @@ -205,12 +205,12 @@
     4.4  LBL_FormatSelector_Category_percent=\u767e\u5206\u6bd4
     4.5  LBL_FormatSelector_Category_currency=\u8d27\u5e01
     4.6  LBL_FormatSelector_Category_mask=\u63a9\u7801
     4.7 -LBL_FormatSelector_default=default
     4.8 +LBL_FormatSelector_default=\u7f3a\u7701
     4.9  LBL_FormatSelector_default_integer=\u6574\u6570\u7f3a\u7701\u503c
    4.10  LBL_FormatSelector_custom=\u5b9a\u5236
    4.11 -LBL_FormatSelector_short=short
    4.12 +LBL_FormatSelector_short=\u77ed
    4.13  LBL_FormatSelector_medium=\u4e2d
    4.14 -LBL_FormatSelector_long=long
    4.15 +LBL_FormatSelector_long=\u957f
    4.16  LBL_FormatSelector_full=\u5b8c\u6574
    4.17  LBL_FormatSelector_Example=\u793a\u4f8b
    4.18  

     5.1 --- a/src/zh_CN/java/maven/maven/org/netbeans/modules/maven/api/customizer/support/Bundle_zh_CN.properties	Tue Jun 01 18:34:57 2010 +0900
     5.2 +++ b/src/zh_CN/java/maven/maven/org/netbeans/modules/maven/api/customizer/support/Bundle_zh_CN.properties	Tue Jun 01 19:01:38 2010 +0900
     5.3 @@ -38,7 +38,7 @@
     5.4  #
     5.5  # Portions Copyrighted 2008 Sun Microsystems, Inc.
     5.6  
     5.7 -MSG_Value_Inherited=\u4ece\u7236 POM \u6216\u8005\u9ed8\u8ba4\u7ee7\u627f\u503c\u3002
     5.8 +MSG_Value_Inherited=\u4ece\u7236 POM \u6216\u8005\u7f3a\u7701\u7ee7\u627f\u503c\u3002
     5.9  HINT_inherited=\u4ece\u7236 POM \u7ee7\u627f\u503c\u3002
    5.10  
    5.11  

     6.1 --- a/src/zh_CN/java/maven/maven/org/netbeans/modules/maven/options/Bundle_zh_CN.properties	Tue Jun 01 18:34:57 2010 +0900
     6.2 +++ b/src/zh_CN/java/maven/maven/org/netbeans/modules/maven/options/Bundle_zh_CN.properties	Tue Jun 01 19:01:38 2010 +0900
     6.3 @@ -64,7 +64,7 @@
     6.4  SettingsPanel.lblExternalVersion.text=
     6.5  LBL_ExMavenVersion1=\uff08\u7248\u672c\uff1a\u5728{1}\u4e0a\u751f\u6210\u7684 {0} \uff09
     6.6  LBL_ExMavenVersion2=\uff08\u7248\u672c\uff1a{0} \uff09
     6.7 -LBL_ExMavenVersion3=\u4f7f\u7528\u9ed8\u8ba4 Maven \u7248\u672c\uff1a{0} \uff08\u50cf\u5728PATH\u4e0a\u53d1\u73b0\u7684\uff09
     6.8 +LBL_ExMavenVersion3=\u4f7f\u7528\u7f3a\u7701 Maven \u7248\u672c\uff1a{0} \uff08\u50cf\u5728PATH\u4e0a\u53d1\u73b0\u7684\uff09
     6.9  ERR_NoValidInstallation=<html>Maven \u5b89\u88c5\u76ee\u5f55\u65e0\u6548\u3002</html>
    6.10  FREQ_weekly=\u4e00\u5468\u4e00\u6b21
    6.11  FREQ_Daily=\u4e00\u5929\u4e00\u6b21

     7.1 --- a/src/zh_CN/php/php-editor/php-editor/org/netbeans/modules/php/editor/indent/ui/Bundle_zh_CN.properties	Tue Jun 01 18:34:57 2010 +0900
     7.2 +++ b/src/zh_CN/php/php-editor/php-editor/org/netbeans/modules/php/editor/indent/ui/Bundle_zh_CN.properties	Tue Jun 01 19:01:38 2010 +0900
     7.3 @@ -332,7 +332,7 @@
     7.4  FmtBlankLines.aOpenPHPTagLebel.AccessibleContext.accessibleDescription=\u5728\u6253\u5f00\u6807\u8bb0\u4e4b\u540e
     7.5  FmtBlankLines.aOpenPHPTagField.AccessibleContext.accessibleDescription=\u201c\u5728 php \u6253\u5f00\u6807\u8bb0\u4e4b\u540e\u201d\u5b57\u6bb5
     7.6  FmtBlankLines.aOpenPHPTagField.AccessibleContext.accessibleName=\u201c\u5728 php \u6253\u5f00\u6807\u8bb0\u4e4b\u540e\u201d\u5b57\u6bb5
     7.7 -FmtBlankLines.bUseField.AccessibleContext.accessibleDescription=\u201c\u5728 'use' \u4e4b\u524d\u201d\u5b57\u6bb5
     7.8 +FmtBlankLines.bUseField.AccessibleContext.accessibleDescription=\u201c\u5728\u2018\u4f7f\u7528\u2019\u4e4b\u524d\u201d\u5b57\u6bb5
     7.9  FmtBlankLines.aFieldsField.AccessibleContext.accessibleDescription=\u201c\u5728\u5b57\u6bb5\u4e4b\u540e\u201d\u5b57\u6bb5
    7.10  FmtBlankLines.jPanel1.AccessibleContext.accessibleDescription=\u9009\u62e9\u60a8\u7684\u7a7a\u884c\u683c\u5f0f\u8bbe\u7f6e
    7.11  FmtBlankLines.jPanel1.AccessibleContext.accessibleName=\u7a7a\u884c\u683c\u5f0f\u8bbe\u7f6e\u6807\u7b7e
    7.12 @@ -346,7 +346,7 @@
    7.13  FmtBlankLines.AccessibleContext.accessibleName=\u7a7a\u884c\u683c\u5f0f\u8bbe\u7f6e\u7a97\u4f53
    7.14  FmtBlankLines.bClosePHPTagLabel.AccessibleContext.accessibleDescription=\u201c\u5728 php \u5173\u95ed\u6807\u8bb0\u4e4b\u524d\u201d\u6807\u7b7e
    7.15  FmtBlankLines.aClassHeaderField.AccessibleContext.accessibleDescription=\u201c\u5728\u7c7b\u5934\u4e4b\u540e\u201d\u5b57\u6bb5
    7.16 -FmtBlankLines.bUseLabel.AccessibleContext.accessibleDescription=\u201c\u5728 use \u4e4b\u524d\u201d\u6807\u7b7e
    7.17 +FmtBlankLines.bUseLabel.AccessibleContext.accessibleDescription=\u201c\u5728\u4f7f\u7528\u4e4b\u524d\u201d\u6807\u7b7e
    7.18  FmtBlankLines.aClassHeaderLabel.AccessibleContext.accessibleDescription=\u201c\u5728\u7c7b\u5934\u4e4b\u540e\u201d\u6807\u7b7e
    7.19  FmtBlankLines.bClosePHPTagField.AccessibleContext.accessibleDescription=\u201c\u5728 php \u5173\u95ed\u6807\u8bb0\u4e4b\u524d\u201d\u6807\u7b7e
    7.20  FmtBlankLines.bClosePHPTagField.AccessibleContext.accessibleName=\u201c\u5728 php \u5173\u95ed\u6807\u8bb0\u4e4b\u524d\u201d\u6807\u7b7e
    7.21 @@ -356,8 +356,8 @@
    7.22  FmtBlankLines.aOpenPHPTagHTMLLabel.AccessibleContext.accessibleDescription=\u201c\u5728 html \u4e2d\u7684 php \u6253\u5f00\u6807\u8bb0\u4e4b\u540e\u201d\u6807\u7b7e
    7.23  FmtBlankLines.bMethodsField.AccessibleContext.accessibleDescription=\u201c\u5728\u65b9\u6cd5\u4e4b\u524d\u201d\u5b57\u6bb5
    7.24  FmtBlankLines.aNamespaceLabel.AccessibleContext.accessibleDescription=\u201c\u5728\u540d\u79f0\u7a7a\u95f4\u4e4b\u540e\u201d\u5b57\u6bb5
    7.25 -FmtBlankLines.aUseField.AccessibleContext.accessibleDescription=\u201c\u5728 use \u4e4b\u540e\u201d\u5b57\u6bb5
    7.26 -FmtBlankLines.aUseLabel.AccessibleContext.accessibleDescription=\u201c\u5728 use \u4e4b\u540e\u201d\u6807\u7b7e
    7.27 +FmtBlankLines.aUseField.AccessibleContext.accessibleDescription=\u201c\u5728\u4f7f\u7528\u4e4b\u540e\u201d\u5b57\u6bb5
    7.28 +FmtBlankLines.aUseLabel.AccessibleContext.accessibleDescription=\u201c\u5728\u4f7f\u7528\u4e4b\u540e\u201d\u6807\u7b7e
    7.29  FmtBlankLines.bFieldsLabel.AccessibleContext.accessibleDescription=\u201c\u5728\u5b57\u6bb5\u4e4b\u524d\u201d\u6807\u7b7e
    7.30  FmtBlankLines.aClassField.AccessibleContext.accessibleDescription=\u201c\u5728\u7c7b\u4e4b\u540e\u201d\u6807\u7b7e
    7.31  FmtBlankLines.bMethodsLabel.AccessibleContext.accessibleDescription=\u201c\u5728\u65b9\u6cd5\u4e4b\u524d\u201d\u6807\u7b7e
    7.32 @@ -371,12 +371,12 @@
    7.33  FmtBlankLines.bClassLabel.AccessibleContext.accessibleName=\u5728\u7c7b\u4e4b\u524d
    7.34  FmtBlankLines.aFieldsLabel.AccessibleContext.accessibleName=\u5728\u5b57\u6bb5\u4e4b\u540e
    7.35  FmtBlankLines.bClosePHPTagLabel.AccessibleContext.accessibleName=\u5728\u5173\u95ed\u6807\u8bb0\u4e4b\u524d
    7.36 -FmtBlankLines.bUseLabel.AccessibleContext.accessibleName=\u5728 Use \u4e4b\u524d
    7.37 +FmtBlankLines.bUseLabel.AccessibleContext.accessibleName=\u5728\u4f7f\u7528\u4e4b\u524d
    7.38  FmtBlankLines.aClassHeaderLabel.AccessibleContext.accessibleName=\u5728\u7c7b\u5934\u4e4b\u540e
    7.39  FmtBlankLines.aClassLabel.AccessibleContext.accessibleName=\u5728\u7c7b\u4e4b\u540e
    7.40  FmtBlankLines.aOpenPHPTagHTMLLabel.AccessibleContext.accessibleName=\u5728 HTML \u4e2d\u7684\u6253\u5f00\u6807\u8bb0\u4e4b\u540e
    7.41  FmtBlankLines.aNamespaceLabel.AccessibleContext.accessibleName=\u5728\u540d\u79f0\u7a7a\u95f4\u4e4b\u540e
    7.42 -FmtBlankLines.aUseLabel.AccessibleContext.accessibleName=\u5728 Use \u4e4b\u540e
    7.43 +FmtBlankLines.aUseLabel.AccessibleContext.accessibleName=\u5728\u4f7f\u7528\u4e4b\u540e
    7.44  FmtBlankLines.bFieldsLabel.AccessibleContext.accessibleName=\u5728\u5b57\u6bb5\u4e4b\u524d
    7.45  FmtBlankLines.bMethodsLabel.AccessibleContext.accessibleName=\u5728\u51fd\u6570\u4e4b\u524d
    7.46  FmtBlankLines.aMethodsLabel.AccessibleContext.accessibleName=\u5728\u51fd\u6570\u4e4b\u540e

     8.1 --- a/src/zh_CN/platform/org-netbeans-core-ui/org-netbeans-core-ui/org/netbeans/core/ui/warmup/Bundle_zh_CN.properties	Tue Jun 01 18:34:57 2010 +0900
     8.2 +++ b/src/zh_CN/platform/org-netbeans-core-ui/org-netbeans-core-ui/org/netbeans/core/ui/warmup/Bundle_zh_CN.properties	Tue Jun 01 19:01:38 2010 +0900
     8.3 @@ -44,10 +44,10 @@
     8.4  MEMORY=\u603b\u7269\u7406\u5185\u5b58 {0}
     8.5  
     8.6  
     8.7 -LOG_WINDOW_ACTIVATED=\u5df2\u6fc0\u6d3b\u4e3b\u7a97\u53e3\uff0c\u5237\u65b0\u7528\u4e86 {0} \u6beb\u79d2
     8.8 -LOG_WINDOW_DEACTIVATED=\u5df2\u53d6\u6d88\u6fc0\u6d3b\u4e3b\u7a97\u53e3
     8.9 -LOG_WINDOW_REFRESH_CANCEL=\u5df2\u53d6\u6d88\u5237\u65b0 {0} \u6b21
    8.10 -LOG_WINDOW_REFRESH_OFF=\u83b7\u5f97\u7126\u70b9\u65f6\u5173\u95ed\u5237\u65b0
    8.11 +#LOG_WINDOW_ACTIVATED=\u5df2\u6fc0\u6d3b\u4e3b\u7a97\u53e3\uff0c\u5237\u65b0\u7528\u4e86 {0} \u6beb\u79d2
    8.12 +#LOG_WINDOW_DEACTIVATED=\u5df2\u53d6\u6d88\u6fc0\u6d3b\u4e3b\u7a97\u53e3
    8.13 +#LOG_WINDOW_REFRESH_CANCEL=\u7b2c {0} \u6b21\u53d6\u6d88\u5237\u65b0
    8.14 +#LOG_WINDOW_REFRESH_OFF=\u83b7\u5f97\u7126\u70b9\u65f6\u5173\u95ed\u5237\u65b0
    8.15  
    8.16  MSG_Refresh=\u68c0\u67e5\u5916\u90e8\u66f4\u6539
    8.17  # default delay is 10s. Increase to Integer.MAX_VALUE to effectively disable