1.1 --- a/src/ja/other/installer/infra/build/web/js/download_strings_ja.js	Tue Jul 17 08:41:32 2012 +0900
     1.2 +++ b/src/ja/other/installer/infra/build/web/js/download_strings_ja.js	Mon Aug 06 11:15:07 2012 +0900
     1.3 @@ -48,7 +48,7 @@
     1.4  
     1.5  var JAVA_COM_LINK        = "http://java.com/";
     1.6  
     1.7 -var JDK_NOTE_ALL      = "NetBeans \u3092\u30a4\u30f3\u30b9\u30c8\u30fc\u30eb\u3057 PHP\u3001C/C++ \u306e NetBeans \u30d0\u30f3\u30c9\u30eb\u3092\u5b9f\u884c\u3059\u308b\u306b\u306f Java 6 \u304c\u5fc5\u8981\u3067\u3059\u3002<a href=\"{0}\">\u6700\u65b0\u306e Java \u306e\u30c0\u30a6\u30f3\u30ed\u30fc\u30c9</a>\u304b\u3089\u53d6\u5f97\u3067\u304d\u307e\u3059\u3002<br><br>NetBeans \u3092\u30a4\u30f3\u30b9\u30c8\u30fc\u30eb\u3057 Java SE\u3001Java EE \u304a\u3088\u3073\u3059\u3079\u3066\u306e\u30d0\u30f3\u30c9\u30eb\u3092\u5b9f\u884c\u3059\u308b\u306b\u306f JDK 6 \u304c\u5fc5\u8981\u3067\u3059\u3002<a href=\"{1}\">\u6700\u65b0\u306e JDK \u306e\u30c0\u30a6\u30f3\u30ed\u30fc\u30c9</a>\u304b\u3089\u53d6\u5f97\u3067\u304d\u307e\u3059\u3002\u307e\u305f\u306f <a href=\"{2}\">JDK \u3068 NetBeans IDE \u306e Java SE \u30d0\u30f3\u30c9\u30eb</a> \u3092\u30c0\u30a6\u30f3\u30ed\u30fc\u30c9\u3067\u304d\u307e\u3059\u3002<br><br>";
     1.8 +var JDK_NOTE_ALL      = "NetBeans \u3092\u30a4\u30f3\u30b9\u30c8\u30fc\u30eb\u3057 PHP\u3001C/C++ \u306e NetBeans \u30d0\u30f3\u30c9\u30eb\u3092\u5b9f\u884c\u3059\u308b\u306b\u306f Java 6 \u4ee5\u964d\u306e\u30d0\u30fc\u30b8\u30e7\u30f3\u304c\u5fc5\u8981\u3067\u3059\u3002<a href=\"{0}\">\u6700\u65b0\u306e Java \u306e\u30c0\u30a6\u30f3\u30ed\u30fc\u30c9</a>\u304b\u3089\u53d6\u5f97\u3067\u304d\u307e\u3059\u3002<br><br>NetBeans \u3092\u30a4\u30f3\u30b9\u30c8\u30fc\u30eb\u3057 Java SE\u3001Java EE \u304a\u3088\u3073\u3059\u3079\u3066\u306e\u30d0\u30f3\u30c9\u30eb\u3092\u5b9f\u884c\u3059\u308b\u306b\u306f JDK 6 \u4ee5\u4e0a\u306e\u30d0\u30fc\u30b8\u30e7\u30f3\u304c\u5fc5\u8981\u3067\u3059\u3002<a href=\"{1}\">\u6700\u65b0\u306e JDK \u306e\u30c0\u30a6\u30f3\u30ed\u30fc\u30c9</a>\u304b\u3089\u53d6\u5f97\u3067\u304d\u307e\u3059\u3002\u307e\u305f\u306f <a href=\"{2}\">JDK \u3068 NetBeans IDE \u306e Java SE \u30d0\u30f3\u30c9\u30eb</a> \u3092\u30c0\u30a6\u30f3\u30ed\u30fc\u30c9\u3067\u304d\u307e\u3059\u3002<br><br>";
     1.9  //var JDK_NOTE_MACOSX   = "JDK 5.0 is required for installing and running the NetBeans IDE.";
    1.10  var JDK_NOTE_MACOSX   = "";
    1.11  

     2.1 --- a/src/ja/other/installer/mac/newbuild/Bundle_ja.properties	Tue Jul 17 08:41:32 2012 +0900
     2.2 +++ b/src/ja/other/installer/mac/newbuild/Bundle_ja.properties	Mon Aug 06 11:15:07 2012 +0900
     2.3 @@ -1,7 +1,7 @@
     2.4  netbeans-Title=NetBeans ${nb.display.version.long}
     2.5  netbeans-mysql-Title=NetBeans IDE\u3068GlassFish/MySQL
     2.6  
     2.7 -jdk7-netbeans-Title=Java SE Development Kit\u3068NetBeans IDE
     2.8 +jdk7-netbeans-Title=Oracle JDK\u3068NetBeans IDE
     2.9  
    2.10  netbeans-title=NetBeans ${nb.display.version.short}
    2.11  netbeans-tooltip=NetBeans IDE

     3.1 --- a/src/zh_CN/other/installer/infra/build/web/js/download_strings_zh_CN.js	Tue Jul 17 08:41:32 2012 +0900
     3.2 +++ b/src/zh_CN/other/installer/infra/build/web/js/download_strings_zh_CN.js	Mon Aug 06 11:15:07 2012 +0900
     3.3 @@ -48,7 +48,7 @@
     3.4  
     3.5  var JAVA_COM_LINK        = "http://java.com/";
     3.6  
     3.7 -var JDK_NOTE_ALL      = "\u5b89\u88c5\u548c\u8fd0\u884c PHP\u3001C/C++ \u8fd9\u4e9b NetBeans \u5305\u65f6\u9700\u8981 Java 6\u3002\u60a8\u53ef\u4ee5\u4e0b\u8f7d<a href=\"{0}\">java.com \u4e0a\u6700\u65b0\u7684 Java \u7248\u672c</a>\u3002<br><br>\u5b89\u88c5\u548c\u8fd0\u884c Java SE\u3001Java\u3001All \u8fd9\u4e9b NetBeans \u5305\u65f6\u9700\u8981 JDK 6\u3002 \u60a8\u53ef\u4ee5\u4e0b\u8f7d<a href=\"{1}\">\u5355\u72ec\u7684 JDK</a> \u6216\u8005\u4e0b\u8f7d\u6700\u65b0\u7684 <a href=\"{2}\">JDK \u548c NetBeans IDE Java SE \u5b89\u88c5\u5305</a>\u3002<br><br>";
     3.8 +var JDK_NOTE_ALL      = "\u5b89\u88c5\u548c\u8fd0\u884c PHP\u3001C/C++ \u8fd9\u4e9b NetBeans \u5305\u65f6\u9700\u8981 Java 6 \u53ca\u66f4\u9ad8\u7248\u672c\u3002\u60a8\u53ef\u4ee5\u4e0b\u8f7d<a href=\"{0}\">java.com \u4e0a\u6700\u65b0\u7684 Java \u7248\u672c</a>\u3002<br><br>\u5b89\u88c5\u548c\u8fd0\u884c Java SE\u3001Java\u3001All \u8fd9\u4e9b NetBeans \u5305\u65f6\u9700\u8981 JDK 6 \u53ca\u66f4\u9ad8\u7248\u672c\u3002 \u60a8\u53ef\u4ee5\u4e0b\u8f7d<a href=\"{1}\">\u5355\u72ec\u7684 JDK</a> \u6216\u8005\u4e0b\u8f7d\u6700\u65b0\u7684 <a href=\"{2}\">JDK \u548c NetBeans IDE Java SE \u5b89\u88c5\u5305</a>\u3002<br><br>";
     3.9  //var JDK_NOTE_MACOSX   = "JDK 5.0 is required for installing and running the NetBeans IDE.";
    3.10  var JDK_NOTE_MACOSX   = "";
    3.11  

     4.1 --- a/src/zh_CN/other/installer/mac/newbuild/Bundle_zh_CN.properties	Tue Jul 17 08:41:32 2012 +0900
     4.2 +++ b/src/zh_CN/other/installer/mac/newbuild/Bundle_zh_CN.properties	Mon Aug 06 11:15:07 2012 +0900
     4.3 @@ -1,7 +1,7 @@
     4.4  netbeans-Title=NetBeans ${nb.display.version.long}
     4.5  netbeans-mysql-Title=\u5e26\u6709 GlassFish \u548c MySQL \u7684 NetBeans IDE
     4.6  
     4.7 -jdk7-netbeans-Title=Java SE \u5f00\u53d1\u5de5\u5177\u5305\u548c NetBeans IDE
     4.8 +jdk7-netbeans-Title=Oracle JDK \u548c NetBeans IDE
     4.9  
    4.10  netbeans-title=NetBeans ${nb.display.version.short}
    4.11  netbeans-tooltip=NetBeans IDE