1.1 --- a/src/zh_CN/cnd/cnd-script/cnd-script/org/netbeans/modules/cnd/makefile/wizard/Bundle_zh_CN.properties	Tue Aug 20 08:47:58 2013 +0900
     1.2 +++ b/src/zh_CN/cnd/cnd-script/cnd-script/org/netbeans/modules/cnd/makefile/wizard/Bundle_zh_CN.properties	Tue May 03 18:56:54 2016 -0700
     1.3 @@ -128,9 +128,9 @@
     1.4  
     1.5  # PlatformTypePanel
     1.6  LBL_PlatformTypePanel=\u9009\u62e9 Makefile \u7c7b\u578b\u548c\u5e73\u53f0
     1.7 -TXT_PlatformTypeMsg1=Oracle Solaris Studio \u7f16\u8bd1\u5668\u4e0e GNU \u7f16\u8bd1\u5668\u4e4b\u95f4\u5b58\u5728\u8bb8\u591a\u4e0d\u540c\u3002\u4f7f\u7528\u6b64\u5411\u5bfc\u53ef\u4ee5\u521b\u5efa\u4e0e Oracle Solaris Studio \u6216 GNU \u7684\u7f16\u8bd1\u5668\u96c6\u5408\u76f8\u517c\u5bb9\u7684 makefile\u3002
     1.8 +TXT_PlatformTypeMsg1=Oracle Developer Studio \u7f16\u8bd1\u5668\u4e0e GNU \u7f16\u8bd1\u5668\u4e4b\u95f4\u5b58\u5728\u8bf8\u591a\u4e0d\u540c\u3002\u4f7f\u7528\u6b64\u5411\u5bfc\u53ef\u4ee5\u521b\u5efa\u4e0e Oracle Developer Studio \u7f16\u8bd1\u5668\u96c6\u6216 GNU \u7f16\u8bd1\u5668\u96c6\u76f8\u517c\u5bb9\u7684 makefile\u3002
     1.9  LBL_CompilerType=\u9009\u62e9\u8981\u4f7f\u7528\u7684\u7f16\u8bd1\u5668\u96c6\u5408: 
    1.10 -RB_CompilerTypeSun=Oracle Solaris Studio \u7f16\u8bd1\u5668
    1.11 +RB_CompilerTypeSun=Oracle Developer Studio \u7f16\u8bd1\u5668
    1.12  
    1.13  RB_CompilerTypeGNU=GNU \u7f16\u8bd1\u5668
    1.14  
    1.15 @@ -147,8 +147,8 @@
    1.16  
    1.17  # CompilerTypePanel and PlatformTypePanel
    1.18  LBL_CompilerTypePanel=\u9009\u62e9 Makefile \u7c7b\u578b
    1.19 -TXT_CompilerTypeMsg1=Oracle Solaris Studio \u7684 make \u5b9e\u7528\u7a0b\u5e8f\u548c\u7f16\u8bd1\u5668\u4e0e GNU \u7684 make \u5b9e\u7528\u7a0b\u5e8f\u548c\u7f16\u8bd1\u5668\u4e4b\u95f4\u5b58\u5728\u8bb8\u591a\u4e0d\u540c\u3002\u4f7f\u7528\u6b64\u5411\u5bfc\u53ef\u4ee5\u521b\u5efa\u4e0e Oracle Solaris Studio \u6216 GNU \u7684\u5de5\u5177\u96c6 (make \u5b9e\u7528\u7a0b\u5e8f\u548c\u7f16\u8bd1\u5668) \u76f8\u517c\u5bb9\u7684 makefile, \u6216\u8005\u4e5f\u53ef\u4ee5\u521b\u5efa\u4e00\u4e2a\u9002\u7528\u4e24\u79cd\u5de5\u5177\u96c6\u7684\u901a\u7528\u4e14\u7a0d\u5fae\u590d\u6742\u7684 makefile\u3002
    1.20 -RB_CompilerTypeBoth=Oracle Solaris Studio \u548c GNU \u7f16\u8bd1\u5668
    1.21 +TXT_CompilerTypeMsg1=Oracle Developer Studio \u7684 make \u5b9e\u7528\u7a0b\u5e8f\u548c\u7f16\u8bd1\u5668\u4e0e GNU \u7684 make \u5b9e\u7528\u7a0b\u5e8f\u548c\u7f16\u8bd1\u5668\u4e4b\u95f4\u5b58\u5728\u8bf8\u591a\u4e0d\u540c\u3002\u4f7f\u7528\u6b64\u5411\u5bfc\u53ef\u4ee5\u521b\u5efa\u4e0e Oracle Developer Studio \u5de5\u5177\u96c6\u6216 GNU \u5de5\u5177\u96c6 (make \u5b9e\u7528\u7a0b\u5e8f\u548c\u7f16\u8bd1\u5668) \u76f8\u517c\u5bb9\u7684 makefile, \u4e5f\u53ef\u4ee5\u521b\u5efa\u4e00\u4e2a\u9002\u7528\u4e8e\u4e24\u79cd\u5de5\u5177\u96c6\u7684\u901a\u7528\u4e14\u7a0d\u5fae\u590d\u6742\u7684 makefile\u3002
    1.22 +RB_CompilerTypeBoth=Oracle Developer Studio \u548c GNU \u7f16\u8bd1\u5668
    1.23  
    1.24  
    1.25  
    1.26 @@ -200,7 +200,7 @@
    1.27  TB_DynamicLib=\u52a8\u6001\u94fe\u63a5 (-ldl)
    1.28  TB_Curses=Curses: CRT \u5c4f\u5e55\u5904\u7406 (-lcurses)
    1.29  TB_RWTools=RW Tools++ (-library=rwtools7,iostream)
    1.30 -TB_PerfLib=Oracle Solaris Studio \u6027\u80fd\u5e93 (-xlic_lib=sunperf)
    1.31 +TB_PerfLib=Oracle Developer Studio \u6027\u80fd\u5e93 (-xlic_lib=sunperf)
    1.32  
    1.33  
    1.34