1.1 Binary file src/ja/other/installer/infra/build/web/img/download_h_ja_i586.gif has changed
2.1 Binary file src/ja/other/installer/infra/build/web/img/download_h_ja_x64.gif has changed
3.1 Binary file src/ja/other/installer/infra/build/web/img/download_h_ja_x86.gif has changed
4.1 Binary file src/ja/other/installer/infra/build/web/img/download_ja_i586.gif has changed
5.1 Binary file src/ja/other/installer/infra/build/web/img/download_x64_h_ja.gif has changed
6.1 Binary file src/ja/other/installer/infra/build/web/img/download_x64_ja.gif has changed
7.1 Binary file src/ja/other/installer/infra/build/web/img/download_x86_h_ja.gif has changed
8.1 Binary file src/ja/other/installer/infra/build/web/img/download_x86_ja.gif has changed
9.1 --- a/src/ja/other/installer/infra/build/web/js/common_strings_ja.js Mon Feb 23 19:33:03 2015 -0800
9.2 +++ b/src/ja/other/installer/infra/build/web/js/common_strings_ja.js Wed Feb 25 07:48:50 2015 -0800
9.3 @@ -48,15 +48,18 @@
9.4
9.5 BUNDLE_SHORT_NAMES[0] = "Java SE";
9.6 BUNDLE_SHORT_NAMES[1] = "Java EE";
9.7 -BUNDLE_SHORT_NAMES[2] = "C/C++";
9.8 +BUNDLE_SHORT_NAMES[2] = "HTML5/JS";
9.9 BUNDLE_SHORT_NAMES[3] = "PHP";
9.10 -BUNDLE_SHORT_NAMES[4] = "";
9.11 +BUNDLE_SHORT_NAMES[4] = "C/C++";
9.12 +BUNDLE_SHORT_NAMES[5] = "";
9.13
9.14 BUNDLE_LONG_NAMES[0] = "Java SE";
9.15 BUNDLE_LONG_NAMES[1] = "Java EE";
9.16 -BUNDLE_LONG_NAMES[2] = "C/C++";
9.17 +BUNDLE_LONG_NAMES[2] = "HTML5/JavaScript";
9.18 BUNDLE_LONG_NAMES[3] = "PHP";
9.19 -BUNDLE_LONG_NAMES[4] = "\u3059\u3079\u3066";
9.20 +BUNDLE_LONG_NAMES[4] = "C/C++";
9.21 +BUNDLE_LONG_NAMES[5] = "\u3059\u3079\u3066";
9.22 +
9.23
9.24 var RELEASE_NOTES_LINK = "http://netbeans.org/community/releases/80/relnotes_ja.html";
9.25 var INSTALL_NOTES_LINK = "http://netbeans.org/community/releases/80/install_ja.html";
10.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
10.2 +++ b/src/ja/other/installer/infra/build/web/js/common_strings_ja.js~ Wed Feb 25 07:48:50 2015 -0800
10.3 @@ -0,0 +1,74 @@
10.4 +/*
10.5 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
10.6 + *
10.7 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
10.8 + *
10.9 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
10.10 + * Other names may be trademarks of their respective owners.
10.11 + *
10.12 + * The contents of this file are subject to the terms of either the GNU General
10.13 + * Public License Version 2 only ("GPL") or the Common Development and Distribution
10.14 + * License("CDDL") (collectively, the "License"). You may not use this file except in
10.15 + * compliance with the License. You can obtain a copy of the License at
10.16 + * http://www.netbeans.org/cddl-gplv2.html or nbbuild/licenses/CDDL-GPL-2-CP. See the
10.17 + * License for the specific language governing permissions and limitations under the
10.18 + * License. When distributing the software, include this License Header Notice in
10.19 + * each file and include the License file at nbbuild/licenses/CDDL-GPL-2-CP. Oracle
10.20 + * designates this particular file as subject to the "Classpath" exception as
10.21 + * provided by Oracle in the GPL Version 2 section of the License file that
10.22 + * accompanied this code. If applicable, add the following below the License Header,
10.23 + * with the fields enclosed by brackets [] replaced by your own identifying
10.24 + * information: "Portions Copyrighted [year] [name of copyright owner]"
10.25 + *
10.26 + * Contributor(s):
10.27 + *
10.28 + * The Original Software is NetBeans. The Initial Developer of the Original Software
10.29 + * is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun Microsystems, Inc. All
10.30 + * Rights Reserved.
10.31 + *
10.32 + * If you wish your version of this file to be governed by only the CDDL or only the
10.33 + * GPL Version 2, indicate your decision by adding "[Contributor] elects to include
10.34 + * this software in this distribution under the [CDDL or GPL Version 2] license." If
10.35 + * you do not indicate a single choice of license, a recipient has the option to
10.36 + * distribute your version of this file under either the CDDL, the GPL Version 2 or
10.37 + * to extend the choice of license to its licensees as provided above. However, if
10.38 + * you add GPL Version 2 code and therefore, elected the GPL Version 2 license, then
10.39 + * the option applies only if the new code is made subject to such option by the
10.40 + * copyright holder.
10.41 + */
10.42 +
10.43 +PLATFORM_LONG_NAMES [0] = "Windows";
10.44 +PLATFORM_SHORT_NAMES [0] = "Windows";
10.45 +PLATFORM_LONG_NAMES [1] = "Linux (x86/x64)";
10.46 +PLATFORM_SHORT_NAMES [1] = "Linux";
10.47 +PLATFORM_LONG_NAMES [2] = "Mac OS X";
10.48 +PLATFORM_SHORT_NAMES [2] = "Mac OS X";
10.49 +PLATFORM_LONG_NAMES [3] = "OS \u306b\u4f9d\u5b58\u3057\u306a\u3044 ZIP";
10.50 +PLATFORM_SHORT_NAMES [3] = "OS \u306b\u4f9d\u5b58\u3057\u306a\u3044 ZIP";
10.51 +
10.52 +BUNDLE_SHORT_NAMES[0] = "Java SE";
10.53 +BUNDLE_SHORT_NAMES[1] = "Java EE";
10.54 +BUNDLE_SHORT_NAMES[2] = "HTML5/JS";
10.55 +BUNDLE_SHORT_NAMES[3] = "PHP";
10.56 +BUNDLE_SHORT_NAMES[4] = "C/C++";
10.57 +BUNDLE_SHORT_NAMES[5] = "";
10.58 +
10.59 +BUNDLE_LONG_NAMES[0] = "Java SE";
10.60 +BUNDLE_LONG_NAMES[1] = "Java EE";
10.61 +BUNDLE_LONG_NAMES[2] = "HTML5/JavaScript";
10.62 +BUNDLE_LONG_NAMES[3] = "PHP";
10.63 +BUNDLE_LONG_NAMES[4] = "C/C++";
10.64 +BUNDLE_LONG_NAMES[5] = "\u3059\u3079\u3066";
10.65 +
10.66 +
10.67 +var RELEASE_NOTES_LINK = "http://netbeans.org/community/releases/80/relnotes_ja.html";
10.68 +var INSTALL_NOTES_LINK = "http://netbeans.org/community/releases/80/install_ja.html";
10.69 +
10.70 +var LEGAL_INFO_HEADER = "\u91cd\u8981\u306a\u8457\u4f5c\u6a29\u60c5\u5831:";
10.71 +
10.72 +var CDDL_GPLV2_LINK = "http://netbeans.org/cddl-gplv2.html";
10.73 +var LICENSE_FILES_LINK = "http://netbeans.org/about/legal/product-licences.html";
10.74 +
10.75 +var LEGAL_INFO_MESSAGE = "NetBeans Community Distributions are available under a Dual License consisting of the <a href=\"{0}\">Common Development and Distribution License (CDDL) v1.0 and GNU General Public License (GPL) v2</a>. Such distributions include additional components under separate licenses identified in the <a href=\"{1}\">License file</a>. See the <a href=\"{2}\">Third Party License file</a> for external components included in NetBeans and their associated licenses.";
10.76 +
10.77 +var LEGAL_WARNING_MESSAGE = "<b>WARNING:</b> These builds are still under development and could contain defects that lead to data loss. They are meant for evaluation of new features. As always, be sure to back up your changes if you use these builds on your production code.";
11.1 Binary file src/pt_BR/other/installer/infra/build/web/img/download_h_pt_BR_i586.gif has changed
12.1 Binary file src/pt_BR/other/installer/infra/build/web/img/download_h_pt_BR_x64.gif has changed
13.1 Binary file src/pt_BR/other/installer/infra/build/web/img/download_h_pt_BR_x86.gif has changed
14.1 Binary file src/pt_BR/other/installer/infra/build/web/img/download_pt_BR_i586.gif has changed
15.1 Binary file src/pt_BR/other/installer/infra/build/web/img/download_x64_h_pt_BR.gif has changed
16.1 Binary file src/pt_BR/other/installer/infra/build/web/img/download_x64_pt_BR.gif has changed
17.1 Binary file src/pt_BR/other/installer/infra/build/web/img/download_x86_h_pt_BR.gif has changed
18.1 Binary file src/pt_BR/other/installer/infra/build/web/img/download_x86_pt_BR.gif has changed
19.1 --- a/src/pt_BR/other/installer/infra/build/web/js/common_strings_pt_BR.js Mon Feb 23 19:33:03 2015 -0800
19.2 +++ b/src/pt_BR/other/installer/infra/build/web/js/common_strings_pt_BR.js Wed Feb 25 07:48:50 2015 -0800
19.3 @@ -48,15 +48,17 @@
19.4
19.5 BUNDLE_SHORT_NAMES[0] = "Java SE";
19.6 BUNDLE_SHORT_NAMES[1] = "Java EE";
19.7 -BUNDLE_SHORT_NAMES[2] = "C/C++";
19.8 +BUNDLE_SHORT_NAMES[2] = "HTML5/JS";
19.9 BUNDLE_SHORT_NAMES[3] = "PHP";
19.10 -BUNDLE_SHORT_NAMES[4] = "";
19.11 +BUNDLE_SHORT_NAMES[4] = "C/C++";
19.12 +BUNDLE_SHORT_NAMES[5] = "";
19.13
19.14 BUNDLE_LONG_NAMES[0] = "Java SE";
19.15 BUNDLE_LONG_NAMES[1] = "Java EE";
19.16 -BUNDLE_LONG_NAMES[2] = "C/C++";
19.17 +BUNDLE_LONG_NAMES[2] = "HTML5/JavaScript";
19.18 BUNDLE_LONG_NAMES[3] = "PHP";
19.19 -BUNDLE_LONG_NAMES[4] = "Tudo";
19.20 +BUNDLE_LONG_NAMES[4] = "C/C++";
19.21 +BUNDLE_LONG_NAMES[5] = "Tudo";
19.22
19.23 var RELEASE_NOTES_LINK = "http://netbeans.org/community/releases/80/relnotes_pt_BR.html";
19.24 var INSTALL_NOTES_LINK = "http://netbeans.org/community/releases/80/install_pt_BR.html";
20.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
20.2 +++ b/src/pt_BR/other/installer/infra/build/web/js/common_strings_pt_BR.js~ Wed Feb 25 07:48:50 2015 -0800
20.3 @@ -0,0 +1,73 @@
20.4 +/*
20.5 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
20.6 + *
20.7 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
20.8 + *
20.9 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
20.10 + * Other names may be trademarks of their respective owners.
20.11 + *
20.12 + * The contents of this file are subject to the terms of either the GNU General
20.13 + * Public License Version 2 only ("GPL") or the Common Development and Distribution
20.14 + * License("CDDL") (collectively, the "License"). You may not use this file except in
20.15 + * compliance with the License. You can obtain a copy of the License at
20.16 + * http://www.netbeans.org/cddl-gplv2.html or nbbuild/licenses/CDDL-GPL-2-CP. See the
20.17 + * License for the specific language governing permissions and limitations under the
20.18 + * License. When distributing the software, include this License Header Notice in
20.19 + * each file and include the License file at nbbuild/licenses/CDDL-GPL-2-CP. Oracle
20.20 + * designates this particular file as subject to the "Classpath" exception as
20.21 + * provided by Oracle in the GPL Version 2 section of the License file that
20.22 + * accompanied this code. If applicable, add the following below the License Header,
20.23 + * with the fields enclosed by brackets [] replaced by your own identifying
20.24 + * information: "Portions Copyrighted [year] [name of copyright owner]"
20.25 + *
20.26 + * Contributor(s):
20.27 + *
20.28 + * The Original Software is NetBeans. The Initial Developer of the Original Software
20.29 + * is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun Microsystems, Inc. All
20.30 + * Rights Reserved.
20.31 + *
20.32 + * If you wish your version of this file to be governed by only the CDDL or only the
20.33 + * GPL Version 2, indicate your decision by adding "[Contributor] elects to include
20.34 + * this software in this distribution under the [CDDL or GPL Version 2] license." If
20.35 + * you do not indicate a single choice of license, a recipient has the option to
20.36 + * distribute your version of this file under either the CDDL, the GPL Version 2 or
20.37 + * to extend the choice of license to its licensees as provided above. However, if
20.38 + * you add GPL Version 2 code and therefore, elected the GPL Version 2 license, then
20.39 + * the option applies only if the new code is made subject to such option by the
20.40 + * copyright holder.
20.41 + */
20.42 +
20.43 +PLATFORM_LONG_NAMES [0] = "Windows";
20.44 +PLATFORM_SHORT_NAMES [0] = "Windows";
20.45 +PLATFORM_LONG_NAMES [1] = "Linux (x86/x64)";
20.46 +PLATFORM_SHORT_NAMES [1] = "Linux";
20.47 +PLATFORM_LONG_NAMES [2] = "Mac OS X";
20.48 +PLATFORM_SHORT_NAMES [2] = "Mac OS X";
20.49 +PLATFORM_LONG_NAMES [3] = "SO Independente Zip";
20.50 +PLATFORM_SHORT_NAMES [3] = "SO Independente Zip";
20.51 +
20.52 +BUNDLE_SHORT_NAMES[0] = "Java SE";
20.53 +BUNDLE_SHORT_NAMES[1] = "Java EE";
20.54 +BUNDLE_SHORT_NAMES[2] = "HTML5/JS";
20.55 +BUNDLE_SHORT_NAMES[3] = "PHP";
20.56 +BUNDLE_SHORT_NAMES[4] = "C/C++";
20.57 +BUNDLE_SHORT_NAMES[5] = "";
20.58 +
20.59 +BUNDLE_LONG_NAMES[0] = "Java SE";
20.60 +BUNDLE_LONG_NAMES[1] = "Java EE";
20.61 +BUNDLE_LONG_NAMES[2] = "HTML5/JavaScript";
20.62 +BUNDLE_LONG_NAMES[3] = "PHP";
20.63 +BUNDLE_LONG_NAMES[4] = "C/C++";
20.64 +BUNDLE_LONG_NAMES[5] = "Tudo";
20.65 +
20.66 +var RELEASE_NOTES_LINK = "http://netbeans.org/community/releases/80/relnotes_pt_BR.html";
20.67 +var INSTALL_NOTES_LINK = "http://netbeans.org/community/releases/80/install_pt_BR.html";
20.68 +
20.69 +var LEGAL_INFO_HEADER = "Important Legal Information:";
20.70 +
20.71 +var CDDL_GPLV2_LINK = "http://netbeans.org/cddl-gplv2.html";
20.72 +var LICENSE_FILES_LINK = "http://netbeans.org/about/legal/product-licences.html";
20.73 +
20.74 +var LEGAL_INFO_MESSAGE = "NetBeans Community Distributions are available under a Dual License consisting of the <a href=\"{0}\">Common Development and Distribution License (CDDL) v1.0 and GNU General Public License (GPL) v2</a>. Such distributions include additional components under separate licenses identified in the <a href=\"{1}\">License file</a>. See the <a href=\"{2}\">Third Party License file</a> for external components included in NetBeans and their associated licenses.";
20.75 +
20.76 +var LEGAL_WARNING_MESSAGE = "<b>WARNING:</b> These builds are still under development and could contain defects that lead to data loss. They are meant for evaluation of new features. As always, be sure to back up your changes if you use these builds on your production code.";
21.1 Binary file src/ru/other/installer/infra/build/web/img/download_h_ru_i586.gif has changed
22.1 Binary file src/ru/other/installer/infra/build/web/img/download_h_ru_x64.gif has changed
23.1 Binary file src/ru/other/installer/infra/build/web/img/download_h_ru_x86.gif has changed
24.1 Binary file src/ru/other/installer/infra/build/web/img/download_ru_i586.gif has changed
25.1 Binary file src/ru/other/installer/infra/build/web/img/download_x64_h_ru.gif has changed
26.1 Binary file src/ru/other/installer/infra/build/web/img/download_x64_ru.gif has changed
27.1 Binary file src/ru/other/installer/infra/build/web/img/download_x86_h_ru.gif has changed
28.1 Binary file src/ru/other/installer/infra/build/web/img/download_x86_ru.gif has changed
29.1 --- a/src/ru/other/installer/infra/build/web/js/common_strings_ru.js Mon Feb 23 19:33:03 2015 -0800
29.2 +++ b/src/ru/other/installer/infra/build/web/js/common_strings_ru.js Wed Feb 25 07:48:50 2015 -0800
29.3 @@ -48,14 +48,16 @@
29.4
29.5 BUNDLE_SHORT_NAMES[0] = "Java SE";
29.6 BUNDLE_SHORT_NAMES[1] = "Java EE";
29.7 -BUNDLE_SHORT_NAMES[2] = "C/C++";
29.8 +BUNDLE_SHORT_NAMES[2] = "HTML5/JS";
29.9 BUNDLE_SHORT_NAMES[3] = "PHP";
29.10 -BUNDLE_SHORT_NAMES[4] = "";
29.11 +BUNDLE_SHORT_NAMES[4] = "C/C++";
29.12 +BUNDLE_SHORT_NAMES[5] = "";
29.13
29.14 BUNDLE_LONG_NAMES[0] = "Java SE";
29.15 BUNDLE_LONG_NAMES[1] = "Java EE";
29.16 -BUNDLE_LONG_NAMES[2] = "C/C++";
29.17 +BUNDLE_LONG_NAMES[2] = "HTML5/JavaScript";
29.18 BUNDLE_LONG_NAMES[3] = "PHP";
29.19 +BUNDLE_LONG_NAMES[4] = "C/C++";
29.20 BUNDLE_LONG_NAMES[5] = "\u0412\u0441\u0435";
29.21
29.22 var RELEASE_NOTES_LINK = "http://netbeans.org/community/releases/80/relnotes_ru.html";
30.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
30.2 +++ b/src/ru/other/installer/infra/build/web/js/common_strings_ru.js~ Wed Feb 25 07:48:50 2015 -0800
30.3 @@ -0,0 +1,73 @@
30.4 +/*
30.5 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
30.6 + *
30.7 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
30.8 + *
30.9 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
30.10 + * Other names may be trademarks of their respective owners.
30.11 + *
30.12 + * The contents of this file are subject to the terms of either the GNU General
30.13 + * Public License Version 2 only ("GPL") or the Common Development and Distribution
30.14 + * License("CDDL") (collectively, the "License"). You may not use this file except in
30.15 + * compliance with the License. You can obtain a copy of the License at
30.16 + * http://www.netbeans.org/cddl-gplv2.html or nbbuild/licenses/CDDL-GPL-2-CP. See the
30.17 + * License for the specific language governing permissions and limitations under the
30.18 + * License. When distributing the software, include this License Header Notice in
30.19 + * each file and include the License file at nbbuild/licenses/CDDL-GPL-2-CP. Oracle
30.20 + * designates this particular file as subject to the "Classpath" exception as
30.21 + * provided by Oracle in the GPL Version 2 section of the License file that
30.22 + * accompanied this code. If applicable, add the following below the License Header,
30.23 + * with the fields enclosed by brackets [] replaced by your own identifying
30.24 + * information: "Portions Copyrighted [year] [name of copyright owner]"
30.25 + *
30.26 + * Contributor(s):
30.27 + *
30.28 + * The Original Software is NetBeans. The Initial Developer of the Original Software
30.29 + * is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun Microsystems, Inc. All
30.30 + * Rights Reserved.
30.31 + *
30.32 + * If you wish your version of this file to be governed by only the CDDL or only the
30.33 + * GPL Version 2, indicate your decision by adding "[Contributor] elects to include
30.34 + * this software in this distribution under the [CDDL or GPL Version 2] license." If
30.35 + * you do not indicate a single choice of license, a recipient has the option to
30.36 + * distribute your version of this file under either the CDDL, the GPL Version 2 or
30.37 + * to extend the choice of license to its licensees as provided above. However, if
30.38 + * you add GPL Version 2 code and therefore, elected the GPL Version 2 license, then
30.39 + * the option applies only if the new code is made subject to such option by the
30.40 + * copyright holder.
30.41 + */
30.42 +
30.43 +PLATFORM_LONG_NAMES [0] = "Windows";
30.44 +PLATFORM_SHORT_NAMES [0] = "Windows";
30.45 +PLATFORM_LONG_NAMES [1] = "Linux (x86/x64)";
30.46 +PLATFORM_SHORT_NAMES [1] = "Linux";
30.47 +PLATFORM_LONG_NAMES [2] = "Mac OS X";
30.48 +PLATFORM_SHORT_NAMES [2] = "Mac OS X";
30.49 +PLATFORM_LONG_NAMES [3] = "\u041f\u043b\u0430\u0442\u0444\u043e\u0440\u043c\u0435\u043d\u043d\u043e-\u043d\u0435\u0437\u0430\u0432\u0438\u0441\u0438\u043c\u044b\u0439 Zip";
30.50 +PLATFORM_SHORT_NAMES [3] = "\u041f\u043b\u0430\u0442\u0444\u043e\u0440\u043c\u0435\u043d\u043d\u043e-\u043d\u0435\u0437\u0430\u0432\u0438\u0441\u0438\u043c\u044b\u0439 Zip";
30.51 +
30.52 +BUNDLE_SHORT_NAMES[0] = "Java SE";
30.53 +BUNDLE_SHORT_NAMES[1] = "Java EE";
30.54 +BUNDLE_SHORT_NAMES[2] = "HTML5/JS";
30.55 +BUNDLE_SHORT_NAMES[3] = "PHP";
30.56 +BUNDLE_SHORT_NAMES[4] = "C/C++";
30.57 +BUNDLE_SHORT_NAMES[5] = "";
30.58 +
30.59 +BUNDLE_LONG_NAMES[0] = "Java SE";
30.60 +BUNDLE_LONG_NAMES[1] = "Java EE";
30.61 +BUNDLE_LONG_NAMES[2] = "HTML5/JavaScript";
30.62 +BUNDLE_LONG_NAMES[3] = "PHP";
30.63 +BUNDLE_LONG_NAMES[4] = "C/C++";
30.64 +BUNDLE_LONG_NAMES[5] = "\u0412\u0441\u0435";
30.65 +
30.66 +var RELEASE_NOTES_LINK = "http://netbeans.org/community/releases/80/relnotes_ru.html";
30.67 +var INSTALL_NOTES_LINK = "http://netbeans.org/community/releases/80/install_ru.html";
30.68 +
30.69 +var LEGAL_INFO_HEADER = "\u0412\u0430\u0436\u043d\u0430\u044f \u044e\u0440\u0438\u0434\u0438\u0447\u0435\u0441\u043a\u0430\u044f \u0438\u043d\u0444\u043e\u0440\u043c\u0430\u0446\u0438\u044f:";
30.70 +
30.71 +var CDDL_GPLV2_LINK = "http://netbeans.org/cddl-gplv2.html";
30.72 +var LICENSE_FILES_LINK = "http://netbeans.org/about/legal/product-licences.html";
30.73 +
30.74 +var LEGAL_INFO_MESSAGE = "NetBeans Community Distributions are available under a Dual License consisting of the <a href=\"{0}\">Common Development and Distribution License (CDDL) v1.0 and GNU General Public License (GPL) v2</a>. Such distributions include additional components under separate licenses identified in the <a href=\"{1}\">License file</a>. See the <a href=\"{2}\">Third Party License file</a> for external components included in NetBeans and their associated licenses.";
30.75 +
30.76 +var LEGAL_WARNING_MESSAGE = "<b>WARNING:</b> These builds are still under development and could contain defects that lead to data loss. They are meant for evaluation of new features. As always, be sure to back up your changes if you use these builds on your production code.";
31.1 Binary file src/zh_CN/other/installer/infra/build/web/img/download_h_zh_CN_i586.gif has changed
32.1 Binary file src/zh_CN/other/installer/infra/build/web/img/download_h_zh_CN_x64.gif has changed
33.1 Binary file src/zh_CN/other/installer/infra/build/web/img/download_h_zh_CN_x86.gif has changed
34.1 Binary file src/zh_CN/other/installer/infra/build/web/img/download_x64_h_zh_CN.gif has changed
35.1 Binary file src/zh_CN/other/installer/infra/build/web/img/download_x64_zh_CN.gif has changed
36.1 Binary file src/zh_CN/other/installer/infra/build/web/img/download_x86_h_zh_CN.gif has changed
37.1 Binary file src/zh_CN/other/installer/infra/build/web/img/download_x86_zh_CN.gif has changed
38.1 Binary file src/zh_CN/other/installer/infra/build/web/img/download_zh_CN_i586.gif has changed
39.1 --- a/src/zh_CN/other/installer/infra/build/web/js/common_strings_zh_CN.js Mon Feb 23 19:33:03 2015 -0800
39.2 +++ b/src/zh_CN/other/installer/infra/build/web/js/common_strings_zh_CN.js Wed Feb 25 07:48:50 2015 -0800
39.3 @@ -48,15 +48,17 @@
39.4
39.5 BUNDLE_SHORT_NAMES[0] = "Java SE";
39.6 BUNDLE_SHORT_NAMES[1] = "Java EE";
39.7 -BUNDLE_SHORT_NAMES[2] = "C/C++";
39.8 +BUNDLE_SHORT_NAMES[2] = "HTML5/JS";
39.9 BUNDLE_SHORT_NAMES[3] = "PHP";
39.10 -BUNDLE_SHORT_NAMES[4] = "";
39.11 +BUNDLE_SHORT_NAMES[4] = "C/C++";
39.12 +BUNDLE_SHORT_NAMES[5] = "";
39.13
39.14 BUNDLE_LONG_NAMES[0] = "Java SE";
39.15 BUNDLE_LONG_NAMES[1] = "Java EE";
39.16 -BUNDLE_LONG_NAMES[2] = "C/C++";
39.17 +BUNDLE_LONG_NAMES[2] = "HTML5/JavaScript";
39.18 BUNDLE_LONG_NAMES[3] = "PHP";
39.19 -BUNDLE_LONG_NAMES[4] = "All";
39.20 +BUNDLE_LONG_NAMES[4] = "C/C++";
39.21 +BUNDLE_LONG_NAMES[5] = "All";
39.22
39.23 var RELEASE_NOTES_LINK = "http://netbeans.org/community/releases/80/relnotes_zh_CN.html";
39.24 var INSTALL_NOTES_LINK = "http://netbeans.org/community/releases/80/install_zh_CN.html";
40.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
40.2 +++ b/src/zh_CN/other/installer/infra/build/web/js/common_strings_zh_CN.js~ Wed Feb 25 07:48:50 2015 -0800
40.3 @@ -0,0 +1,73 @@
40.4 +/*
40.5 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
40.6 + *
40.7 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
40.8 + *
40.9 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
40.10 + * Other names may be trademarks of their respective owners.
40.11 + *
40.12 + * The contents of this file are subject to the terms of either the GNU General
40.13 + * Public License Version 2 only ("GPL") or the Common Development and Distribution
40.14 + * License("CDDL") (collectively, the "License"). You may not use this file except in
40.15 + * compliance with the License. You can obtain a copy of the License at
40.16 + * http://www.netbeans.org/cddl-gplv2.html or nbbuild/licenses/CDDL-GPL-2-CP. See the
40.17 + * License for the specific language governing permissions and limitations under the
40.18 + * License. When distributing the software, include this License Header Notice in
40.19 + * each file and include the License file at nbbuild/licenses/CDDL-GPL-2-CP. Oracle
40.20 + * designates this particular file as subject to the "Classpath" exception as
40.21 + * provided by Oracle in the GPL Version 2 section of the License file that
40.22 + * accompanied this code. If applicable, add the following below the License Header,
40.23 + * with the fields enclosed by brackets [] replaced by your own identifying
40.24 + * information: "Portions Copyrighted [year] [name of copyright owner]"
40.25 + *
40.26 + * Contributor(s):
40.27 + *
40.28 + * The Original Software is NetBeans. The Initial Developer of the Original Software
40.29 + * is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun Microsystems, Inc. All
40.30 + * Rights Reserved.
40.31 + *
40.32 + * If you wish your version of this file to be governed by only the CDDL or only the
40.33 + * GPL Version 2, indicate your decision by adding "[Contributor] elects to include
40.34 + * this software in this distribution under the [CDDL or GPL Version 2] license." If
40.35 + * you do not indicate a single choice of license, a recipient has the option to
40.36 + * distribute your version of this file under either the CDDL, the GPL Version 2 or
40.37 + * to extend the choice of license to its licensees as provided above. However, if
40.38 + * you add GPL Version 2 code and therefore, elected the GPL Version 2 license, then
40.39 + * the option applies only if the new code is made subject to such option by the
40.40 + * copyright holder.
40.41 + */
40.42 +
40.43 +PLATFORM_LONG_NAMES [0] = "Windows";
40.44 +PLATFORM_SHORT_NAMES [0] = "Windows";
40.45 +PLATFORM_LONG_NAMES [1] = "Linux (x86/x64)";
40.46 +PLATFORM_SHORT_NAMES [1] = "Linux";
40.47 +PLATFORM_LONG_NAMES [2] = "Mac OS X";
40.48 +PLATFORM_SHORT_NAMES [2] = "Mac OS X";
40.49 +PLATFORM_LONG_NAMES [3] = "\u4E0D\u53D7\u5E73\u53F0\u9650\u5236\u7684 Zip";
40.50 +PLATFORM_SHORT_NAMES [3] = "\u4E0D\u53D7\u5E73\u53F0\u9650\u5236\u7684 Zip";
40.51 +
40.52 +BUNDLE_SHORT_NAMES[0] = "Java SE";
40.53 +BUNDLE_SHORT_NAMES[1] = "Java EE";
40.54 +BUNDLE_SHORT_NAMES[2] = "HTML5/JS";
40.55 +BUNDLE_SHORT_NAMES[3] = "PHP";
40.56 +BUNDLE_SHORT_NAMES[4] = "C/C++";
40.57 +BUNDLE_SHORT_NAMES[5] = "";
40.58 +
40.59 +BUNDLE_LONG_NAMES[0] = "Java SE";
40.60 +BUNDLE_LONG_NAMES[1] = "Java EE";
40.61 +BUNDLE_LONG_NAMES[2] = "HTML5/JavaScript";
40.62 +BUNDLE_LONG_NAMES[3] = "PHP";
40.63 +BUNDLE_LONG_NAMES[4] = "C/C++";
40.64 +BUNDLE_LONG_NAMES[5] = "All";
40.65 +
40.66 +var RELEASE_NOTES_LINK = "http://netbeans.org/community/releases/80/relnotes_zh_CN.html";
40.67 +var INSTALL_NOTES_LINK = "http://netbeans.org/community/releases/80/install_zh_CN.html";
40.68 +
40.69 +var LEGAL_INFO_HEADER = "\u91CD\u8981\u7684\u6CD5\u5F8B\u4FE1\u606F\uFF1A";
40.70 +
40.71 +var CDDL_GPLV2_LINK = "http://netbeans.org/cddl-gplv2.html";
40.72 +var LICENSE_FILES_LINK = "http://netbeans.org/about/legal/product-licences.html";
40.73 +
40.74 +var LEGAL_INFO_MESSAGE = "NetBeans Community Distributions are available under a Dual License consisting of the <a href=\"{0}\">Common Development and Distribution License (CDDL) v1.0 and GNU General Public License (GPL) v2</a>. Such distributions include additional components under separate licenses identified in the <a href=\"{1}\">License file</a>. See the <a href=\"{2}\">Third Party License file</a> for external components included in NetBeans and their associated licenses.";
40.75 +
40.76 +var LEGAL_WARNING_MESSAGE = "<b>WARNING:</b> These builds are still under development and could contain defects that lead to data loss. They are meant for evaluation of new features. As always, be sure to back up your changes if you use these builds on your production code.";
