1.1 --- a/src/ja/other/installer/infra/build/web/js/download_strings_ja.js Mon Feb 23 19:09:55 2015 -0800
1.2 +++ b/src/ja/other/installer/infra/build/web/js/download_strings_ja.js Mon Feb 23 19:33:03 2015 -0800
1.3 @@ -48,7 +48,8 @@
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 \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.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_ALL = "HTML/JS\u3001PHP \u304a\u3088\u3073 C/C++ \u306e NetBeans \u306b\u306f JRE \u304c\u542b\u307e\u308c\u3066\u304a\u308a Java \u3092\u5225\u9014\u30a4\u30f3\u30b9\u30c8\u30fc\u30eb\u3059\u308b\u5fc5\u8981\u306f\u3042\u308a\u307e\u305b\u3093\u3002<br> <br>Java SE\u3001Java EE \u304a\u3088\u3073\u3059\u3079\u3066\u306e\u30d0\u30f3\u30c9\u30eb\u3092\u5b9f\u884c\u3059\u308b\u306b\u306f JDK 7 \u4ee5\u4e0a\u306e\u30d0\u30fc\u30b8\u30e7\u30f3\u304c\u5fc5\u8981\u3067\u3059\u3002<a href=\"{1}\">\u6700\u65b0\u306e JDK</a> \u304b\u3089\u30c0\u30a6\u30f3\u30ed\u30fc\u30c9\u3067\u304d\u307e\u3059\u3002\u307e\u305f\u306f <a href=\"{2}\">JDK \u3068 NetBeans IDE Java SE \u30d0\u30f3\u30c9\u30eb</a> \u3092\u30c0\u30a6\u30f3\u30ed\u30fc\u30c9\u3067\u304d\u307e\u3059\u3002<br><br>";
1.10 //var JDK_NOTE_MACOSX = "JDK 5.0 is required for installing and running the NetBeans IDE.";
1.11 var JDK_NOTE_MACOSX = "";
1.12
2.1 --- a/src/pt_BR/other/installer/infra/build/web/js/download_strings_pt_BR.js Mon Feb 23 19:09:55 2015 -0800
2.2 +++ b/src/pt_BR/other/installer/infra/build/web/js/download_strings_pt_BR.js Mon Feb 23 19:33:03 2015 -0800
2.3 @@ -48,7 +48,8 @@
2.4
2.5 var JAVA_COM_LINK = "http://java.com";
2.6
2.7 -var JDK_NOTE_ALL = "O Java 6 e vers\u00f5es posteriores s\u00e3o necess\u00e1rios para instalar e executar pacotes do NetBeans PHP e C/C++. Voc\u00ea pode fazer download da <a href=\"{0}\">vers\u00e3o mais recente do Java em java.com</a>.<br><br>O JDK 6 e vers\u00f5es posteriores s\u00e3o necess\u00e1rios para instalar e executar o Java SE, o Java EE e todos os pacotes do NetBeans. Voc\u00ea pode fazer download do <a href=\"{1}\">JDK stand-alone</a> ou da vers\u00e3o mais recente do <a href=\"{2}\">JDK com o pacote do NetBeans IDE Java SE</a>.<br><br>";
2.8 +// var JDK_NOTE_ALL = "O Java 6 e vers\u00f5es posteriores s\u00e3o necess\u00e1rios para instalar e executar pacotes do NetBeans PHP e C/C++. Voc\u00ea pode fazer download da <a href=\"{0}\">vers\u00e3o mais recente do Java em java.com</a>.<br><br>O JDK 6 e vers\u00f5es posteriores s\u00e3o necess\u00e1rios para instalar e executar o Java SE, o Java EE e todos os pacotes do NetBeans. Voc\u00ea pode fazer download do <a href=\"{1}\">JDK stand-alone</a> ou da vers\u00e3o mais recente do <a href=\"{2}\">JDK com o pacote do NetBeans IDE Java SE</a>.<br><br>";
2.9 +var JDK_NOTE_ALL = "HTML/JS, PHP and C/C++ NetBeans bundles include Java Runtime Environment and do not require a separate Java installation.<br><br>JDK 7 and later versions are required for installing and running the Java SE, Java EE and All NetBeans Bundles. You can download <a href=\"{1}\">standalone JDK</a> or download the latest <a href=\"{2}\">JDK with NetBeans IDE Java SE bundle</a>.<br><br>";
2.10 //var JDK_NOTE_MACOSX = "JDK 5.0 is required for installing and running the NetBeans IDE.";
2.11 var JDK_NOTE_MACOSX = "";
2.12
3.1 --- a/src/ru/other/installer/infra/build/web/js/download_strings_ru.js Mon Feb 23 19:09:55 2015 -0800
3.2 +++ b/src/ru/other/installer/infra/build/web/js/download_strings_ru.js Mon Feb 23 19:33:03 2015 -0800
3.3 @@ -48,7 +48,8 @@
3.4
3.5 var JAVA_COM_LINK = "http://java.com/";
3.6
3.7 -var JDK_NOTE_ALL = "\u0414\u043b\u044f \u0443\u0441\u0442\u0430\u043d\u043e\u0432\u043a\u0438 \u0438 \u0438\u0441\u043f\u043e\u043b\u043d\u0435\u043d\u0438\u044f \u0441\u0431\u043e\u0440\u043e\u043a NetBeans \u0434\u043b\u044f PHP \u0438 C/C++ \u043d\u0435\u043e\u0431\u0445\u043e\u0434\u0438\u043c\u0430 \u0432\u0435\u0440\u0441\u0438\u044f Java 6 \u0438\u043b\u0438 \u0432\u044b\u0448\u0435. <a href=\"{0}\">\u0422\u0435\u043a\u0443\u0449\u0443\u044e \u0432\u0435\u0440\u0441\u0438\u044e \u043c\u043e\u0436\u043d\u043e \u0437\u0430\u0433\u0440\u0443\u0437\u0438\u0442\u044c \u0441 \u0441\u0430\u0439\u0442\u0430 java.com</a>.<br><br>\u0414\u043b\u044f \u0443\u0441\u0442\u0430\u043d\u043e\u0432\u043a\u0438 \u0438 \u0438\u0441\u043f\u043e\u043b\u043d\u0435\u043d\u0438\u044f \u0441\u0431\u043e\u0440\u043e\u043a NetBeans \u0434\u043b\u044f Java SE, Java EE \u0438 \u0441\u0431\u043e\u0440\u043a\u0438 \u0441 \u043f\u043e\u0434\u0434\u0435\u0440\u0436\u043a\u043e\u0439 \u0432\u0441\u0435\u0445 \u0442\u0435\u0445\u043d\u043e\u043b\u043e\u0433\u0438\u0439 \u043d\u0435\u043e\u0431\u0445\u043e\u0434\u0438\u043c JDK 6 \u0438\u043b\u0438 \u0432\u044b\u0448\u0435. \u0412\u044b \u043c\u043e\u0436\u0435\u0442\u0435 \u0437\u0430\u0433\u0440\u0443\u0437\u0438\u0442\u044c <a href=\"{1}\">\u043e\u0442\u0434\u0435\u043b\u044c\u043d\u0443\u044e \u0441\u0431\u043e\u0440\u043a\u0443 JDK</a> \u0438\u043b\u0438 \u0442\u0435\u043a\u0443\u0449\u0443\u044e \u0432\u0435\u0440\u0441\u0438\u044e <a href=\"{2}\">\u0441\u0431\u043e\u0440\u043a\u0438 JDK \u0432\u043c\u0435\u0441\u0442\u0435 \u0441\u043e \u0441\u0440\u0435\u0434\u043e\u0439 NetBeans \u0434\u043b\u044f Java SE</a>.<br><br>";
3.8 +// var JDK_NOTE_ALL = "\u0414\u043b\u044f \u0443\u0441\u0442\u0430\u043d\u043e\u0432\u043a\u0438 \u0438 \u0438\u0441\u043f\u043e\u043b\u043d\u0435\u043d\u0438\u044f \u0441\u0431\u043e\u0440\u043e\u043a NetBeans \u0434\u043b\u044f PHP \u0438 C/C++ \u043d\u0435\u043e\u0431\u0445\u043e\u0434\u0438\u043c\u0430 \u0432\u0435\u0440\u0441\u0438\u044f Java 6 \u0438\u043b\u0438 \u0432\u044b\u0448\u0435. <a href=\"{0}\">\u0422\u0435\u043a\u0443\u0449\u0443\u044e \u0432\u0435\u0440\u0441\u0438\u044e \u043c\u043e\u0436\u043d\u043e \u0437\u0430\u0433\u0440\u0443\u0437\u0438\u0442\u044c \u0441 \u0441\u0430\u0439\u0442\u0430 java.com</a>.<br><br>\u0414\u043b\u044f \u0443\u0441\u0442\u0430\u043d\u043e\u0432\u043a\u0438 \u0438 \u0438\u0441\u043f\u043e\u043b\u043d\u0435\u043d\u0438\u044f \u0441\u0431\u043e\u0440\u043e\u043a NetBeans \u0434\u043b\u044f Java SE, Java EE \u0438 \u0441\u0431\u043e\u0440\u043a\u0438 \u0441 \u043f\u043e\u0434\u0434\u0435\u0440\u0436\u043a\u043e\u0439 \u0432\u0441\u0435\u0445 \u0442\u0435\u0445\u043d\u043e\u043b\u043e\u0433\u0438\u0439 \u043d\u0435\u043e\u0431\u0445\u043e\u0434\u0438\u043c JDK 6 \u0438\u043b\u0438 \u0432\u044b\u0448\u0435. \u0412\u044b \u043c\u043e\u0436\u0435\u0442\u0435 \u0437\u0430\u0433\u0440\u0443\u0437\u0438\u0442\u044c <a href=\"{1}\">\u043e\u0442\u0434\u0435\u043b\u044c\u043d\u0443\u044e \u0441\u0431\u043e\u0440\u043a\u0443 JDK</a> \u0438\u043b\u0438 \u0442\u0435\u043a\u0443\u0449\u0443\u044e \u0432\u0435\u0440\u0441\u0438\u044e <a href=\"{2}\">\u0441\u0431\u043e\u0440\u043a\u0438 JDK \u0432\u043c\u0435\u0441\u0442\u0435 \u0441\u043e \u0441\u0440\u0435\u0434\u043e\u0439 NetBeans \u0434\u043b\u044f Java SE</a>.<br><br>";
3.9 +var JDK_NOTE_ALL = "HTML/JS, PHP and C/C++ NetBeans bundles include Java Runtime Environment and do not require a separate Java installation.<br><br>JDK 7 and later versions are required for installing and running the Java SE, Java EE and All NetBeans Bundles. You can download <a href=\"{1}\">standalone JDK</a> or download the latest <a href=\"{2}\">JDK with NetBeans IDE Java SE bundle</a>.<br><br>";
3.10 //var JDK_NOTE_MACOSX = "JDK 5.0 is required for installing and running the NetBeans IDE.";
3.11 var JDK_NOTE_MACOSX = "";
3.12
4.1 --- a/src/zh_CN/other/installer/infra/build/web/js/download_strings_zh_CN.js Mon Feb 23 19:09:55 2015 -0800
4.2 +++ b/src/zh_CN/other/installer/infra/build/web/js/download_strings_zh_CN.js Mon Feb 23 19:33:03 2015 -0800
4.3 @@ -48,7 +48,10 @@
4.4
4.5 var JAVA_COM_LINK = "http://java.com/";
4.6
4.7 -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>";
4.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>";
4.9 +var JDK_NOTE_ALL = "HTML/JS, PHP and C/C++ NetBeans bundles include Java Runtime Environment and do not require a separate Java installation.<br><br>JDK 7 and later versions are required for installing and running the Java SE, Java EE and All NetBeans Bundles. You can download <a href=\"{1}\">standalone JDK</a> or download the latest <a href=\"{2}\">JDK with NetBeans IDE Java SE bundle</a>.<br><br>";
4.10 +
4.11 +
4.12 //var JDK_NOTE_MACOSX = "JDK 5.0 is required for installing and running the NetBeans IDE.";
4.13 var JDK_NOTE_MACOSX = "";
4.14