1.1 --- a/src/zh_CN/cnd/cnd-debugger-common2/cnd-debugger-common2/org/netbeans/modules/cnd/debugger/common2/debugger/io/Bundle_zh_CN.properties Thu Mar 31 15:42:33 2011 +0900
1.2 +++ b/src/zh_CN/cnd/cnd-debugger-common2/cnd-debugger-common2/org/netbeans/modules/cnd/debugger/common2/debugger/io/Bundle_zh_CN.properties Thu Mar 31 23:09:47 2011 +0900
1.3 @@ -64,5 +64,4 @@
1.4
1.5 # Gdb Helper used by ExternalTerminal. The only part which should be translated is
1.6 # the prompt at the end of the script.
1.7 -#GdbHelperScript=#! /bin/sh\n\nif [ -x /bin/uname ]\nthen\nsysname=`/bin/uname -s`\nelif [ -x /usr/bin/uname ]\nthen\nsysname=`/usr/bin/uname -s`\nelse\nsysname=`uname -s`\nfi\n\nif [ -x /bin/echo ]\nthen\nECHO=/bin/echo\nelif [ -x /usr/bin/echo ]\nthen\nECHO=/usr/bin/echo\nelse\nECHO=echo\nfi\nif [ -x /bin/tty ]\nthen\nTTY=/bin/tty\nelif [ -x /usr/bin/tty ]\nthen\nTTY=/usr/bin/tty\nelse\nTTY=tty\nfi\n\nif [ "$sysname" = "Darwin" -o "$sysname" = "SunOS" ]\nthen\nNOPT=\nENDOPT="\\c"\nelse\nNOPT="-n"\nENDOPT=\nfi\n\ntrap \"exit 0\" 15\nPATH=/bin:/usr/bin:$PATH\nGDB_HELPER_LOG={0}\n$TTY > $GDB_HELPER_LOG\n$ECHO $$ >> $GDB_HELPER_LOG\n\nwhile [ -r "$GDB_HELPER_LOG" ]\ndo\nsleep 1\ndone\n\n
1.8
2.1 --- a/src/zh_CN/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/profiler/Bundle_zh_CN.properties Thu Mar 31 15:42:33 2011 +0900
2.2 +++ b/src/zh_CN/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/profiler/Bundle_zh_CN.properties Thu Mar 31 23:09:47 2011 +0900
2.3 @@ -57,4 +57,3 @@
2.4
2.5 #cnbs=org.netbeans.modules.profiler
2.6
2.7 -
3.1 --- a/src/zh_CN/ide/glassfish-common/glassfish-common/org/netbeans/modules/glassfish/common/Bundle_zh_CN.properties Thu Mar 31 15:42:33 2011 +0900
3.2 +++ b/src/zh_CN/ide/glassfish-common/glassfish-common/org/netbeans/modules/glassfish/common/Bundle_zh_CN.properties Thu Mar 31 23:09:47 2011 +0900
3.3 @@ -63,7 +63,7 @@
3.4 MSG_START_SERVER_FAILED={0} \u542f\u52a8\u5931\u8d25
3.5 MSG_START_SERVER_FAILED2=\u65e0\u6cd5\u8fde\u63a5\u5230 {0} \u7684\u7ba1\u7406\u4fa6\u542c\u7a0b\u5e8f\u3002\n\u8bf7\u9a8c\u8bc1 NetBeans \u662f\u5426\u53ef\u4ee5\u5efa\u7acb\u5230 {1}:{2} \u7684\u51fa\u7ad9\u8fde\u63a5
3.6
3.7 -MSG_STOP_SERVER_FAILED_FNF={0} \u670d\u52a1\u5668\u65e0\u6cd5\u505c\u6b62\u3002
3.8 +MSG_STOP_SERVER_FAILED_FNF={0} \u670d\u52a1\u5668\u65e0\u6cd5\u505c\u6b62\u3002
3.9 MSG_STOP_SERVER_FAILED_PD={0} \u670d\u52a1\u5668\u505c\u6b62\u5931\u8d25\u3002\u65e0\u6cd5\u521b\u5efa\u505c\u6b62\u8fdb\u7a0b\u3002
3.10 MSG_STOP_SERVER_IN_PROGRESS=\u6b63\u5728\u505c\u6b62\u670d\u52a1\u5668 {0}
3.11 MSG_SERVER_STOPPED=\u5df2\u505c\u6b62 {0}\u3002
3.12 @@ -132,3 +132,10 @@
3.13 MSG_SELECTED_PORT=<html>\u4f7f\u7528 {0} \u5c06\u8c03\u8bd5\u5668\u8fde\u63a5\u5230 GlassFish \u5b9e\u4f8b</html>
3.14 TITLE_MESSAGE=\u7aef\u53e3\u9009\u62e9\u901a\u77e5
3.15
3.16 +# ServerDetails.java
3.17 +#STR_3_SERVER_NAME=GlassFish Server 3.0
3.18 +#STR_31_SERVER_NAME=GlassFish Server 3.1
3.19 +
3.20 +# StartTask.java
3.21 +MSG_DOMAIN_UPGRADE_FAILED=<html>\u81ea\u52a8\u57df\u5347\u7ea7\u5931\u8d25\u3002<br/><br/>\u4f7f\u7528 <strong>asadmin start-domain --upgrade</strong> \u547d\u4ee4\u6765\u5b8c\u6210\u6240\u9700\u7684\u5347\u7ea7\u3002</html>
3.22 +
4.1 --- a/src/zh_CN/ide/xml-text/xml-text/org/netbeans/modules/xml/text/completion/Bundle_zh_CN.properties Thu Mar 31 15:42:33 2011 +0900
4.2 +++ b/src/zh_CN/ide/xml-text/xml-text/org/netbeans/modules/xml/text/completion/Bundle_zh_CN.properties Thu Mar 31 23:09:47 2011 +0900
4.3 @@ -57,6 +57,6 @@
4.4 ## NodeSelector.java
4.5 BK0001=<\u65e0\u6cd5\u8bbf\u95ee\u8be5\u503c>
4.6
4.7 -## ---
4.8 +## XMLCompletionProvider.java
4.9 +MSG_loading_dtd=\u6b63\u5728\u4e0b\u8f7d...
4.10
4.11 -
5.1 --- a/src/zh_CN/java/java-hints/java-hints/org/netbeans/modules/java/hints/jdk/Bundle_zh_CN.properties Thu Mar 31 15:42:33 2011 +0900
5.2 +++ b/src/zh_CN/java/java-hints/java-hints/org/netbeans/modules/java/hints/jdk/Bundle_zh_CN.properties Thu Mar 31 23:09:47 2011 +0900
5.3 @@ -63,7 +63,7 @@
5.4 ERR_UseSpecificCatch=\u53ef\u4ee5\u66ff\u6362\u4e3a multicatch \u4ee5\u6355\u83b7\u7279\u5b9a\u7684\u5f02\u5e38
5.5 FIX_UseSpecificCatch=\u66ff\u6362\u4e3a multicatch \u4ee5\u6355\u83b7\u7279\u5b9a\u7684\u5f02\u5e38
5.6
5.7 -DN_org.netbeans.modules.java.hints.jdk.ConvertToARM=\u8f6c\u6362\u4e3a\u81ea\u52a8\u8d44\u6e90\u7ba1\u7406
5.8 -DESC_org.netbeans.modules.java.hints.jdk.ConvertToARM=\u5c06 try finally \u5757\u8f6c\u6362\u4e3a\u81ea\u52a8\u8d44\u6e90\u7ba1\u7406
5.9 -TXT_ConvertToARM=\u8f6c\u6362\u4e3a\u81ea\u52a8\u8d44\u6e90\u7ba1\u7406
5.10 +DN_org.netbeans.modules.java.hints.jdk.ConvertToARM=\u8f6c\u6362\u4e3a try-with-resources
5.11 +DESC_org.netbeans.modules.java.hints.jdk.ConvertToARM=\u5c06 try finally \u5757\u8f6c\u6362\u4e3a try-with-resources
5.12 +TXT_ConvertToARM=\u8f6c\u6362\u4e3a try-with-resources
5.13
6.1 --- a/src/zh_CN/mobility/vmd-componentssupport/vmd-componentssupport/org/netbeans/modules/vmd/componentssupport/options/Bundle_zh_CN.properties Thu Mar 31 15:42:33 2011 +0900
6.2 +++ b/src/zh_CN/mobility/vmd-componentssupport/vmd-componentssupport/org/netbeans/modules/vmd/componentssupport/options/Bundle_zh_CN.properties Thu Mar 31 23:09:47 2011 +0900
6.3 @@ -45,4 +45,3 @@
6.4 ComponentssupportPanel.jCheckBox1.text=\u6fc0\u6d3b\u53ef\u89c6 Mobile \u8bbe\u8ba1\u5668\u8c03\u8bd5\u89c6\u56fe
6.5 ComponentssupportPanel.jLabel1.text=\u6ce8\u610f\uff1a\u5fc5\u987b\u91cd\u65b0\u6253\u5f00 Visual MIDlet \u624d\u80fd\u67e5\u770b\u6240\u505a\u7684\u66f4\u6539\u3002
6.6 ComponentssupportPanel.jCheckBox2.text=\u5728\u53ef\u89c6 Mobile \u8bbe\u8ba1\u5668\u4e2d\u4f7f\u7528\u76f4\u63a5\u8def\u7531\uff08\u66f4\u5feb\uff09
6.7 -
7.1 --- a/src/zh_CN/nb/updatecenters/updatecenters/org/netbeans/modules/updatecenters/resources/Bundle_zh_CN.properties Thu Mar 31 15:42:33 2011 +0900
7.2 +++ b/src/zh_CN/nb/updatecenters/updatecenters/org/netbeans/modules/updatecenters/resources/Bundle_zh_CN.properties Thu Mar 31 23:09:47 2011 +0900
7.3 @@ -55,3 +55,4 @@
7.4 #URL_Distribution=http://updates.netbeans.org/netbeans/updates/7.0/uc/final/distribution/catalog.xml.gz?{$netbeans.hash.code}
7.5 #URL_Certified=http://updates.netbeans.org/netbeans/updates/7.0/uc/final/certified/catalog.xml.gz?{$netbeans.hash.code}
7.6 #URL_PluginPortal=http://plugins.netbeans.org/nbpluginportal/updates/7.0/catalog.xml.gz
7.7 +
8.1 --- a/src/zh_CN/nb/welcome/welcome/org/netbeans/modules/welcome/resources/Bundle_zh_CN.properties Thu Mar 31 15:42:33 2011 +0900
8.2 +++ b/src/zh_CN/nb/welcome/welcome/org/netbeans/modules/welcome/resources/Bundle_zh_CN.properties Thu Mar 31 23:09:47 2011 +0900
8.3 @@ -14,7 +14,7 @@
8.4
8.5 WelcomePage/GettingStartedLinks/sampleproject.instance=\u8bd5\u7528\u6837\u4f8b\u9879\u76ee
8.6
8.7 -WelcomePage/TutorialsLinks/tutorial1.url=Java \u548c JavaFX GUI
8.8 +WelcomePage/TutorialsLinks/tutorial1.url=Java SE \u5e94\u7528\u7a0b\u5e8f
8.9 WelcomePage/TutorialsLinks/tutorial2.url=Java EE \u548c Java Web \u5e94\u7528\u7a0b\u5e8f
8.10 WelcomePage/TutorialsLinks/tutorial3.url=C/C++ \u5e94\u7528\u7a0b\u5e8f
8.11 WelcomePage/TutorialsLinks/tutorial4.url=PHP \u5e94\u7528\u7a0b\u5e8f
9.1 --- a/src/zh_CN/other/installer/components/products/glassfish-mod/data/Bundle_zh_CN.properties Thu Mar 31 15:42:33 2011 +0900
9.2 +++ b/src/zh_CN/other/installer/components/products/glassfish-mod/data/Bundle_zh_CN.properties Thu Mar 31 23:09:47 2011 +0900
9.3 @@ -38,5 +38,5 @@
9.4 #
9.5
9.6 #product.display.name=GlassFish Server Open Source Edition {display-version}
9.7 -product.description=GlassFish Server Open Source Edition {display-version} \u662f GlassFish \u5e94\u7528\u670d\u52a1\u5668\u7684\u4e0b\u4e00\u4e2a\u4e3b\u8981\u53d1\u884c\u7248\uff0c\u76ee\u524d\u6b63\u5728\u7531 GlassFish \u793e\u533a\u8fdb\u884c\u5f00\u53d1\u3002GlassFish \u5177\u6709\u53ef\u6269\u5c55\u7684\u8f7b\u91cf\u7ea7\u6a21\u5757\u5316\u4f53\u7cfb\u7ed3\u6784\u3002
9.8 +product.description=GlassFish Server Open Source Edition {display-version} \u662f Glassfish \u5e94\u7528\u670d\u52a1\u5668\u7684\u6700\u65b0\u7248\u672c\uff0c\u5b83\u662f\u4e00\u4e2a\u5b9e\u73b0\u4e86 Java EE 6 \u7684\u517c\u5bb9\u5e73\u53f0\uff0c\u5176\u4f53\u7cfb\u7ed3\u6784\u7684\u7279\u70b9\u662f\u6a21\u5757\u5316\u3001\u8f7b\u91cf\u7ea7\u5e76\u4e14\u53ef\u6269\u5c55\u3002
9.9
10.1 --- a/src/zh_CN/other/installer/components/products/nb-base/src/org/netbeans/installer/products/nb/base/Bundle_zh_CN.properties Thu Mar 31 15:42:33 2011 +0900
10.2 +++ b/src/zh_CN/other/installer/components/products/nb-base/src/org/netbeans/installer/products/nb/base/Bundle_zh_CN.properties Thu Mar 31 23:09:47 2011 +0900
10.3 @@ -80,12 +80,12 @@
10.4
10.5 # OS Integration ###############################################################
10.6 #CL.desktop.shortcut.name=NetBeans IDE {display-version}
10.7 -#CL.desktop.shortcut.description=The Smart Way to Code
10.8 +#CL.desktop.shortcut.description=The Smarter Way to Code
10.9 #CL.desktop.shortcut.path=NetBeans {display-version}
10.10
10.11 #CL.start.menu.shortcut.name=NetBeans IDE {display-version}
10.12 #CL.start.menu.shortcut.name.macosx=NetBeans IDE {display-version}
10.13 -#CL.start.menu.shortcut.description=The Smart Way to Code
10.14 +#CL.start.menu.shortcut.description=The Smarter Way to Code
10.15 #CL.start.menu.shortcut.path=NetBeans
10.16
10.17 #CL.system.display.name=NetBeans IDE {display-version}
11.1 --- a/src/zh_CN/other/installer/mac/newbuild/Bundle_zh_CN.properties Thu Mar 31 15:42:33 2011 +0900
11.2 +++ b/src/zh_CN/other/installer/mac/newbuild/Bundle_zh_CN.properties Thu Mar 31 23:09:47 2011 +0900
11.3 @@ -14,7 +14,7 @@
11.4 sjsas-tooltip=Sun GlassFish Enterprise Server
11.5
11.6 glassfish-v3-title=GlassFish Server Open Source Edition ${glassfish.v3.display.version}
11.7 -glassfish-v3-description=GlassFish Server Open Source Edition ${glassfish.v3.display.version} \u662f GlassFish \u5e94\u7528\u670d\u52a1\u5668\u7684\u4e0b\u4e00\u4e2a\u4e3b\u8981\u53d1\u884c\u7248\uff0c\u76ee\u524d\u6b63\u5728\u7531 GlassFish \u793e\u533a\u8fdb\u884c\u5f00\u53d1\u3002GlassFish \u5177\u6709\u53ef\u6269\u5c55\u7684\u8f7b\u91cf\u7ea7\u6a21\u5757\u5316\u4f53\u7cfb\u7ed3\u6784\u3002
11.8 +glassfish-v3-description=GlassFish Server Open Source Edition ${glassfish.v3.display.version} \u662f Glassfish \u5e94\u7528\u670d\u52a1\u5668\u7684\u6700\u65b0\u7248\u672c\uff0c\u5b83\u662f\u4e00\u4e2a\u5b9e\u73b0\u4e86 Java EE 6 \u7684\u517c\u5bb9\u5e73\u53f0\uff0c\u5176\u4f53\u7cfb\u7ed3\u6784\u7684\u7279\u70b9\u662f\u6a21\u5757\u5316\u3001\u8f7b\u91cf\u7ea7\u5e76\u4e14\u53ef\u6269\u5c55\u3002
11.9 glassfish-v3-tooltip=GlassFish Server Open Source Edition ${glassfish.v3.display.version}
11.10
11.11 glassfish-v3-sun-title=Oracle GlassFish Server ${glassfish.v3.sun.display.version}