1.1 --- a/src/af/other/installer/infra/build/web/js/common_strings_af.js Thu Sep 20 09:23:41 2012 +0200
1.2 +++ b/src/af/other/installer/infra/build/web/js/common_strings_af.js Fri Sep 21 09:40:40 2012 +0900
1.3 @@ -81,9 +81,7 @@
1.4
1.5 var LEGAL_INFO_HEADER = "Important Legal Information:";
1.6
1.7 -var CDDL_GPLV2_LINK = "http://netbeans.org/cddl-gplv2.html";
1.8 -var LICENSE_FILES_LINK = "http://netbeans.org/about/legal/product-licences.html";
1.9 +var CDDL_GPLV2_LINK = "http://www.netbeans.org/cddl-gplv2.html";
1.10 +var LICENSE_3RD_PARTY_LINK = "http://www.netbeans.info/downloads/licence/netbeans-3rd-party.txt";
1.11
1.12 -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.";
1.13 -
1.14 -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.";
1.15 +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>. See the <a href=\"{1}\">third-party readme</a> for external components included in NetBeans and their associated licenses.";
2.1 --- a/src/ar_EG/other/installer/infra/build/web/js/common_strings_ar_EG.js Thu Sep 20 09:23:41 2012 +0200
2.2 +++ b/src/ar_EG/other/installer/infra/build/web/js/common_strings_ar_EG.js Fri Sep 21 09:40:40 2012 +0900
2.3 @@ -81,9 +81,7 @@
2.4
2.5 var LEGAL_INFO_HEADER = "Important Legal Information:";
2.6
2.7 -var CDDL_GPLV2_LINK = "http://netbeans.org/cddl-gplv2.html";
2.8 -var LICENSE_FILES_LINK = "http://netbeans.org/about/legal/product-licences.html";
2.9 +var CDDL_GPLV2_LINK = "http://www.netbeans.org/cddl-gplv2.html";
2.10 +var LICENSE_3RD_PARTY_LINK = "http://www.netbeans.info/downloads/licence/netbeans-3rd-party.txt";
2.11
2.12 -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.";
2.13 -
2.14 -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.";
2.15 +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>. See the <a href=\"{1}\">third-party readme</a> for external components included in NetBeans and their associated licenses.";
3.1 --- a/src/ar_SA/other/installer/infra/build/web/js/common_strings_ar_SA.js Thu Sep 20 09:23:41 2012 +0200
3.2 +++ b/src/ar_SA/other/installer/infra/build/web/js/common_strings_ar_SA.js Fri Sep 21 09:40:40 2012 +0900
3.3 @@ -81,9 +81,7 @@
3.4
3.5 var LEGAL_INFO_HEADER = "Important Legal Information:";
3.6
3.7 -var CDDL_GPLV2_LINK = "http://netbeans.org/cddl-gplv2.html";
3.8 -var LICENSE_FILES_LINK = "http://netbeans.org/about/legal/product-licences.html";
3.9 +var CDDL_GPLV2_LINK = "http://www.netbeans.org/cddl-gplv2.html";
3.10 +var LICENSE_3RD_PARTY_LINK = "http://www.netbeans.info/downloads/licence/netbeans-3rd-party.txt";
3.11
3.12 -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.";
3.13 -
3.14 -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.";
3.15 +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>. See the <a href=\"{1}\">third-party readme</a> for external components included in NetBeans and their associated licenses.";
4.1 --- a/src/bg/other/installer/infra/build/web/js/common_strings_bg.js Thu Sep 20 09:23:41 2012 +0200
4.2 +++ b/src/bg/other/installer/infra/build/web/js/common_strings_bg.js Fri Sep 21 09:40:40 2012 +0900
4.3 @@ -81,9 +81,7 @@
4.4
4.5 var LEGAL_INFO_HEADER = "Important Legal Information:";
4.6
4.7 -var CDDL_GPLV2_LINK = "http://netbeans.org/cddl-gplv2.html";
4.8 -var LICENSE_FILES_LINK = "http://netbeans.org/about/legal/product-licences.html";
4.9 +var CDDL_GPLV2_LINK = "http://www.netbeans.org/cddl-gplv2.html";
4.10 +var LICENSE_3RD_PARTY_LINK = "http://www.netbeans.info/downloads/licence/netbeans-3rd-party.txt";
4.11
4.12 -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.";
4.13 -
4.14 -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.";
4.15 +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>. See the <a href=\"{1}\">third-party readme</a> for external components included in NetBeans and their associated licenses.";
5.1 --- a/src/ca/other/installer/infra/build/web/js/common_strings_ca.js Thu Sep 20 09:23:41 2012 +0200
5.2 +++ b/src/ca/other/installer/infra/build/web/js/common_strings_ca.js Fri Sep 21 09:40:40 2012 +0900
5.3 @@ -79,9 +79,7 @@
5.4
5.5 var LEGAL_INFO_HEADER = "Informaci\u00F3 legal important:";
5.6
5.7 -var CDDL_GPLV2_LINK = "http://netbeans.org/cddl-gplv2.html";
5.8 -var LICENSE_FILES_LINK = "http://netbeans.org/about/legal/product-licences.html";
5.9 +var CDDL_GPLV2_LINK = "http://www.netbeans.org/cddl-gplv2.html";
5.10 +var LICENSE_3RD_PARTY_LINK = "http://www.netbeans.info/downloads/licence/netbeans-3rd-party.txt";
5.11
5.12 -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.";
5.13 -
5.14 -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.";
5.15 +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>. See the <a href=\"{1}\">third-party readme</a> for external components included in NetBeans and their associated licenses.";
6.1 --- a/src/cs/other/installer/infra/build/web/js/common_strings_cs.js Thu Sep 20 09:23:41 2012 +0200
6.2 +++ b/src/cs/other/installer/infra/build/web/js/common_strings_cs.js Fri Sep 21 09:40:40 2012 +0900
6.3 @@ -81,9 +81,7 @@
6.4
6.5 var LEGAL_INFO_HEADER = "Important Legal Information:";
6.6
6.7 -var CDDL_GPLV2_LINK = "http://netbeans.org/cddl-gplv2.html";
6.8 -var LICENSE_FILES_LINK = "http://netbeans.org/about/legal/product-licences.html";
6.9 +var CDDL_GPLV2_LINK = "http://www.netbeans.org/cddl-gplv2.html";
6.10 +var LICENSE_3RD_PARTY_LINK = "http://www.netbeans.info/downloads/licence/netbeans-3rd-party.txt";
6.11
6.12 -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.";
6.13 -
6.14 -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.";
6.15 +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>. See the <a href=\"{1}\">third-party readme</a> for external components included in NetBeans and their associated licenses.";
7.1 --- a/src/de/other/installer/infra/build/web/js/common_strings_de.js Thu Sep 20 09:23:41 2012 +0200
7.2 +++ b/src/de/other/installer/infra/build/web/js/common_strings_de.js Fri Sep 21 09:40:40 2012 +0900
7.3 @@ -81,9 +81,7 @@
7.4
7.5 var LEGAL_INFO_HEADER = "Wichtige rechtliche Information:";
7.6
7.7 -var CDDL_GPLV2_LINK = "http://netbeans.org/cddl-gplv2.html";
7.8 -var LICENSE_FILES_LINK = "http://netbeans.org/about/legal/product-licences.html";
7.9 +var CDDL_GPLV2_LINK = "http://www.netbeans.org/cddl-gplv2.html";
7.10 +var LICENSE_3RD_PARTY_LINK = "http://www.netbeans.info/downloads/licence/netbeans-3rd-party.txt";
7.11
7.12 -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.";
7.13 -
7.14 -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.";
7.15 +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>. See the <a href=\"{1}\">third-party readme</a> for external components included in NetBeans and their associated licenses.";
8.1 --- a/src/el/other/installer/infra/build/web/js/common_strings_el.js Thu Sep 20 09:23:41 2012 +0200
8.2 +++ b/src/el/other/installer/infra/build/web/js/common_strings_el.js Fri Sep 21 09:40:40 2012 +0900
8.3 @@ -81,9 +81,7 @@
8.4
8.5 var LEGAL_INFO_HEADER = "Important Legal Information:";
8.6
8.7 -var CDDL_GPLV2_LINK = "http://netbeans.org/cddl-gplv2.html";
8.8 -var LICENSE_FILES_LINK = "http://netbeans.org/about/legal/product-licences.html";
8.9 +var CDDL_GPLV2_LINK = "http://www.netbeans.org/cddl-gplv2.html";
8.10 +var LICENSE_3RD_PARTY_LINK = "http://www.netbeans.info/downloads/licence/netbeans-3rd-party.txt";
8.11
8.12 -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.";
8.13 -
8.14 -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.";
8.15 +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>. See the <a href=\"{1}\">third-party readme</a> for external components included in NetBeans and their associated licenses.";
9.1 --- a/src/es/other/installer/infra/build/web/js/common_strings_es.js Thu Sep 20 09:23:41 2012 +0200
9.2 +++ b/src/es/other/installer/infra/build/web/js/common_strings_es.js Fri Sep 21 09:40:40 2012 +0900
9.3 @@ -80,9 +80,7 @@
9.4
9.5 var LEGAL_INFO_HEADER = "Informaci\u00f3n Legal:";
9.6
9.7 -var CDDL_GPLV2_LINK = "http://netbeans.org/cddl-gplv2.html";
9.8 -var LICENSE_FILES_LINK = "http://netbeans.org/about/legal/product-licences.html";
9.9 +var CDDL_GPLV2_LINK = "http://www.netbeans.org/cddl-gplv2.html";
9.10 +var LICENSE_3RD_PARTY_LINK = "http://www.netbeans.info/downloads/licence/netbeans-3rd-party.txt";
9.11
9.12 -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.";
9.13 -
9.14 -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.";
9.15 +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>. See the <a href=\"{1}\">third-party readme</a> for external components included in NetBeans and their associated licenses.";
10.1 --- a/src/es_CO/other/installer/infra/build/web/js/common_strings_es_CO.js Thu Sep 20 09:23:41 2012 +0200
10.2 +++ b/src/es_CO/other/installer/infra/build/web/js/common_strings_es_CO.js Fri Sep 21 09:40:40 2012 +0900
10.3 @@ -81,9 +81,7 @@
10.4
10.5 var LEGAL_INFO_HEADER = "Important Legal Information:";
10.6
10.7 -var CDDL_GPLV2_LINK = "http://netbeans.org/cddl-gplv2.html";
10.8 -var LICENSE_FILES_LINK = "http://netbeans.org/about/legal/product-licences.html";
10.9 +var CDDL_GPLV2_LINK = "http://www.netbeans.org/cddl-gplv2.html";
10.10 +var LICENSE_3RD_PARTY_LINK = "http://www.netbeans.info/downloads/licence/netbeans-3rd-party.txt";
10.11
10.12 -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.13 -
10.14 -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.";
10.15 +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>. See the <a href=\"{1}\">third-party readme</a> for external components included in NetBeans and their associated licenses.";
11.1 --- a/src/fil_PH/other/installer/infra/build/web/js/common_strings_fil_PH.js Thu Sep 20 09:23:41 2012 +0200
11.2 +++ b/src/fil_PH/other/installer/infra/build/web/js/common_strings_fil_PH.js Fri Sep 21 09:40:40 2012 +0900
11.3 @@ -81,9 +81,7 @@
11.4
11.5 var LEGAL_INFO_HEADER = "Important Legal Information:";
11.6
11.7 -var CDDL_GPLV2_LINK = "http://netbeans.org/cddl-gplv2.html";
11.8 -var LICENSE_FILES_LINK = "http://netbeans.org/about/legal/product-licences.html";
11.9 +var CDDL_GPLV2_LINK = "http://www.netbeans.org/cddl-gplv2.html";
11.10 +var LICENSE_3RD_PARTY_LINK = "http://www.netbeans.info/downloads/licence/netbeans-3rd-party.txt";
11.11
11.12 -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.";
11.13 -
11.14 -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.15 +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>. See the <a href=\"{1}\">third-party readme</a> for external components included in NetBeans and their associated licenses.";
12.1 --- a/src/fr/other/installer/infra/build/web/js/common_strings_fr.js Thu Sep 20 09:23:41 2012 +0200
12.2 +++ b/src/fr/other/installer/infra/build/web/js/common_strings_fr.js Fri Sep 21 09:40:40 2012 +0900
12.3 @@ -105,9 +105,7 @@
12.4
12.5 var LEGAL_INFO_HEADER = "Important Legal Information:";
12.6
12.7 -var CDDL_GPLV2_LINK = "http://netbeans.org/cddl-gplv2.html";
12.8 -var LICENSE_FILES_LINK = "http://netbeans.org/about/legal/product-licences.html";
12.9 +var CDDL_GPLV2_LINK = "http://www.netbeans.org/cddl-gplv2.html";
12.10 +var LICENSE_3RD_PARTY_LINK = "http://www.netbeans.info/downloads/licence/netbeans-3rd-party.txt";
12.11
12.12 -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.";
12.13 -
12.14 -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.";
12.15 +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>. See the <a href=\"{1}\">third-party readme</a> for external components included in NetBeans and their associated licenses.";
13.1 --- a/src/gl_ES/other/installer/infra/build/web/js/common_strings_gl_ES.js Thu Sep 20 09:23:41 2012 +0200
13.2 +++ b/src/gl_ES/other/installer/infra/build/web/js/common_strings_gl_ES.js Fri Sep 21 09:40:40 2012 +0900
13.3 @@ -81,9 +81,7 @@
13.4
13.5 var LEGAL_INFO_HEADER = "Informaci\u00f3n legal importante:";
13.6
13.7 -var CDDL_GPLV2_LINK = "http://netbeans.org/cddl-gplv2.html";
13.8 -var LICENSE_FILES_LINK = "http://netbeans.org/about/legal/product-licences.html";
13.9 +var CDDL_GPLV2_LINK = "http://www.netbeans.org/cddl-gplv2.html";
13.10 +var LICENSE_3RD_PARTY_LINK = "http://www.netbeans.info/downloads/licence/netbeans-3rd-party.txt";
13.11
13.12 -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.";
13.13 -
13.14 -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.";
13.15 +var LEGAL_INFO_MESSAGE = "As distribucións da comunidade de NetBeans están dispoñíbeis baixo os termos da <a href=\"{0}\">Common Development and Distribution License (CDDL) v1.0 e a Licenza pública Xeral de GNU (GPL) v2</a>. Olle o ficheiro <a href=\"{1}\">léame de terceiros</a> para os compoñentes externos incluídos en NetBeans e as súas licenzas asociadas.";
14.1 --- a/src/hi_IN/other/installer/infra/build/web/js/common_strings_hi_IN.js Thu Sep 20 09:23:41 2012 +0200
14.2 +++ b/src/hi_IN/other/installer/infra/build/web/js/common_strings_hi_IN.js Fri Sep 21 09:40:40 2012 +0900
14.3 @@ -82,9 +82,7 @@
14.4
14.5 var LEGAL_INFO_HEADER = "Important Legal Information:";
14.6
14.7 -var CDDL_GPLV2_LINK = "http://netbeans.org/cddl-gplv2.html";
14.8 -var LICENSE_FILES_LINK = "http://netbeans.org/about/legal/product-licences.html";
14.9 +var CDDL_GPLV2_LINK = "http://www.netbeans.org/cddl-gplv2.html";
14.10 +var LICENSE_3RD_PARTY_LINK = "http://www.netbeans.info/downloads/licence/netbeans-3rd-party.txt";
14.11
14.12 -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.";
14.13 -
14.14 -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.";
14.15 +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>. See the <a href=\"{1}\">third-party readme</a> for external components included in NetBeans and their associated licenses.";
15.1 --- a/src/in_ID/other/installer/infra/build/web/js/common_strings_in_ID.js Thu Sep 20 09:23:41 2012 +0200
15.2 +++ b/src/in_ID/other/installer/infra/build/web/js/common_strings_in_ID.js Fri Sep 21 09:40:40 2012 +0900
15.3 @@ -82,9 +82,7 @@
15.4
15.5 var LEGAL_INFO_HEADER = "Important Legal Information:";
15.6
15.7 -var CDDL_GPLV2_LINK = "http://netbeans.org/cddl-gplv2.html";
15.8 -var LICENSE_FILES_LINK = "http://netbeans.org/about/legal/product-licences.html";
15.9 +var CDDL_GPLV2_LINK = "http://www.netbeans.org/cddl-gplv2.html";
15.10 +var LICENSE_3RD_PARTY_LINK = "http://www.netbeans.info/downloads/licence/netbeans-3rd-party.txt";
15.11
15.12 -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.";
15.13 -
15.14 -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.";
15.15 +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>. See the <a href=\"{1}\">third-party readme</a> for external components included in NetBeans and their associated licenses.";
16.1 --- a/src/it/other/installer/infra/build/web/js/common_strings_it.js Thu Sep 20 09:23:41 2012 +0200
16.2 +++ b/src/it/other/installer/infra/build/web/js/common_strings_it.js Fri Sep 21 09:40:40 2012 +0900
16.3 @@ -81,9 +81,7 @@
16.4
16.5 var LEGAL_INFO_HEADER = "Importanti informazioni legali:";
16.6
16.7 -var CDDL_GPLV2_LINK = "http://netbeans.org/cddl-gplv2.html";
16.8 -var LICENSE_FILES_LINK = "http://netbeans.org/about/legal/product-licences.html";
16.9 +var CDDL_GPLV2_LINK = "http://www.netbeans.org/cddl-gplv2.html";
16.10 +var LICENSE_3RD_PARTY_LINK = "http://www.netbeans.info/downloads/licence/netbeans-3rd-party.txt";
16.11
16.12 -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.";
16.13 -
16.14 -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.";
16.15 +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>. See the <a href=\"{1}\">third-party readme</a> for external components included in NetBeans and their associated licenses.";
17.1 --- a/src/ja/nb/updatecenters/updatecenters/org/netbeans/modules/updatecenters/resources/Bundle_ja.properties Thu Sep 20 09:23:41 2012 +0200
17.2 +++ b/src/ja/nb/updatecenters/updatecenters/org/netbeans/modules/updatecenters/resources/Bundle_ja.properties Fri Sep 21 09:40:40 2012 +0900
17.3 @@ -47,3 +47,10 @@
17.4 OpenIDE-Module-Display-Category=\u30a4\u30f3\u30d5\u30e9\u30b9\u30c8\u30e9\u30af\u30c1\u30e3
17.5 OpenIDE-Module-Long-Description=\u81ea\u52d5\u66f4\u65b0\u30e2\u30b8\u30e5\u30fc\u30eb\u306b\u95a2\u3059\u308bNetBeans\u30a2\u30c3\u30d7\u30c7\u30fc\u30c8\u30fb\u30bb\u30f3\u30bf\u30fc\u306e\u5ba3\u8a00\u3092\u542b\u3080\u30e2\u30b8\u30e5\u30fc\u30eb\u3067\u3059\u3002
17.6 OpenIDE-Module-Short-Description=NetBeans\u81ea\u52d5\u66f4\u65b0\u30bb\u30f3\u30bf\u30fc\u3092\u5ba3\u8a00\u3057\u307e\u3059\u3002
17.7 +
17.8 +#Services/AutoupdateType/distribution-update-provider.instance=\u914d\u5e03\u7528 NetBeans
17.9 +#Services/AutoupdateType/certified-update-provider.instance=\u8a8d\u5b9a\u30d7\u30e9\u30b0\u30a4\u30f3
17.10 +#Services/AutoupdateType/pluginportal-update-provider.instance=\u30d7\u30e9\u30b0\u30a4\u30f3\u30dd\u30fc\u30bf\u30eb
17.11 +
17.12 +#URL_Distribution=http://updates.netbeans.org/netbeans/updates/7.2/uc/final/distribution/catalog_ja.xml.gz?{$netbeans.hash.code}
17.13 +URL_Distribution=http://updates.netbeans.org/netbeans/updates/7.3/uc/beta/distribution/catalog_ja.xml.gz?{$netbeans.hash.code}
18.1 --- a/src/ja/other/installer/infra/build/web/js/common_strings_ja.js Thu Sep 20 09:23:41 2012 +0200
18.2 +++ b/src/ja/other/installer/infra/build/web/js/common_strings_ja.js Fri Sep 21 09:40:40 2012 +0900
18.3 @@ -80,9 +80,7 @@
18.4
18.5 var LEGAL_INFO_HEADER = "\u91cd\u8981\u306a\u8457\u4f5c\u6a29\u60c5\u5831:";
18.6
18.7 -var CDDL_GPLV2_LINK = "http://netbeans.org/cddl-gplv2.html";
18.8 -var LICENSE_FILES_LINK = "http://netbeans.org/about/legal/product-licences.html";
18.9 +var CDDL_GPLV2_LINK = "http://www.netbeans.org/cddl-gplv2.html";
18.10 +var LICENSE_3RD_PARTY_LINK = "http://www.netbeans.info/downloads/licence/netbeans-3rd-party.txt";
18.11
18.12 -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.";
18.13 -
18.14 -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.";
18.15 +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>. See the <a href=\"{1}\">third-party readme</a> for external components included in NetBeans and their associated licenses.";
19.1 --- a/src/ja/other/installer/mac/newbuild/dmg/Resources/Welcome-jdk_ja.html Thu Sep 20 09:23:41 2012 +0200
19.2 +++ b/src/ja/other/installer/mac/newbuild/dmg/Resources/Welcome-jdk_ja.html Fri Sep 21 09:40:40 2012 +0900
19.3 @@ -6,7 +6,7 @@
19.4 </head>
19.5 <body>
19.6
19.7 -<h3>JDK 7 Update 6とNetBeans IDEをインストールするために必要なステップを説明します。</h3>
19.8 +<h3>JDK 7 Update 7とNetBeans IDEをインストールするために必要なステップを説明します。</h3>
19.9
19.10 </body>
19.11 </html>
20.1 --- a/src/ko/other/installer/infra/build/web/js/common_strings_ko.js Thu Sep 20 09:23:41 2012 +0200
20.2 +++ b/src/ko/other/installer/infra/build/web/js/common_strings_ko.js Fri Sep 21 09:40:40 2012 +0900
20.3 @@ -80,9 +80,7 @@
20.4
20.5 var LEGAL_INFO_HEADER = " \uc911\uc694 \ubc95\ub960 \uc815\ubcf4 :";
20.6
20.7 -var CDDL_GPLV2_LINK = "http://netbeans.org/cddl-gplv2.html";
20.8 -var LICENSE_FILES_LINK = "http://netbeans.org/about/legal/product-licences.html";
20.9 +var CDDL_GPLV2_LINK = "http://www.netbeans.org/cddl-gplv2.html";
20.10 +var LICENSE_3RD_PARTY_LINK = "http://www.netbeans.info/downloads/licence/netbeans-3rd-party.txt";
20.11
20.12 -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.13 -
20.14 -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.";
20.15 +var LEGAL_INFO_MESSAGE = "\ub137\ube48\uc988 \ucee4\ubba4\ub2c8\ud2f0 \ubc30\ud3ec\ud310\uc740 <a href=\"{0}\">\uc77c\ubc18 \uac1c\ubc1c \ubc0f \ubc30\ud3ec \ub77c\uc774\uc13c\uc2a4 (CDDL) v1.0 \uacfc GNU \uc77c\ubc18 \uacf5\uc6a9 \ub77c\uc774\uc13c\uc2a4 (GPL) v2</a> \uc900\uc218 \ud558\uc5d0 \uc0ac\uc6a9 \uac00\ub2a5\ud569\ub2c8\ub2e4. \ub137\ube48\uc988\uc640 \uad00\ub828 \ub77c\uc774\uc13c\uc2a4\uc5d0 \ud3ec\ud568\ub41c \uc678\ubd80 \uad6c\uc131 \uc694\uc18c\ub97c \uc704\ud55c <a href=\"{1}\">\uc11c\ub4dc\ud30c\ud2f0 \ubb38\uc11c</a>\ub97c \uc0b4\ud3b4\ubcf4\uc2dc\uae30 \ubc14\ub78d\ub2c8\ub2e4.";
21.1 --- a/src/lt/other/installer/infra/build/web/js/common_strings_lt.js Thu Sep 20 09:23:41 2012 +0200
21.2 +++ b/src/lt/other/installer/infra/build/web/js/common_strings_lt.js Fri Sep 21 09:40:40 2012 +0900
21.3 @@ -80,9 +80,7 @@
21.4
21.5 var LEGAL_INFO_HEADER = "Important Legal Information:";
21.6
21.7 -var CDDL_GPLV2_LINK = "http://netbeans.org/cddl-gplv2.html";
21.8 -var LICENSE_FILES_LINK = "http://netbeans.org/about/legal/product-licences.html";
21.9 +var CDDL_GPLV2_LINK = "http://www.netbeans.org/cddl-gplv2.html";
21.10 +var LICENSE_3RD_PARTY_LINK = "http://www.netbeans.info/downloads/licence/netbeans-3rd-party.txt";
21.11
21.12 -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.";
21.13 -
21.14 -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.15 +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>. See the <a href=\"{1}\">third-party readme</a> for external components included in NetBeans and their associated licenses.";
22.1 --- a/src/nl_BE/other/installer/infra/build/web/js/common_strings_nl_BE.js Thu Sep 20 09:23:41 2012 +0200
22.2 +++ b/src/nl_BE/other/installer/infra/build/web/js/common_strings_nl_BE.js Fri Sep 21 09:40:40 2012 +0900
22.3 @@ -80,9 +80,7 @@
22.4
22.5 var LEGAL_INFO_HEADER = "Important Legal Information:";
22.6
22.7 -var CDDL_GPLV2_LINK = "http://netbeans.org/cddl-gplv2.html";
22.8 -var LICENSE_FILES_LINK = "http://netbeans.org/about/legal/product-licences.html";
22.9 +var CDDL_GPLV2_LINK = "http://www.netbeans.org/cddl-gplv2.html";
22.10 +var LICENSE_3RD_PARTY_LINK = "http://www.netbeans.info/downloads/licence/netbeans-3rd-party.txt";
22.11
22.12 -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.";
22.13 -
22.14 -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.";
22.15 +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>. See the <a href=\"{1}\">third-party readme</a> for external components included in NetBeans and their associated licenses.";
23.1 --- a/src/nl_NL/other/installer/infra/build/web/js/common_strings_nl_NL.js Thu Sep 20 09:23:41 2012 +0200
23.2 +++ b/src/nl_NL/other/installer/infra/build/web/js/common_strings_nl_NL.js Fri Sep 21 09:40:40 2012 +0900
23.3 @@ -80,9 +80,7 @@
23.4
23.5 var LEGAL_INFO_HEADER = "Belangrijke wettelijke informatie:";
23.6
23.7 -var CDDL_GPLV2_LINK = "http://netbeans.org/cddl-gplv2.html";
23.8 -var LICENSE_FILES_LINK = "http://netbeans.org/about/legal/product-licences.html";
23.9 +var CDDL_GPLV2_LINK = "http://www.netbeans.org/cddl-gplv2.html";
23.10 +var LICENSE_3RD_PARTY_LINK = "http://www.netbeans.info/downloads/licence/netbeans-3rd-party.txt";
23.11
23.12 -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.";
23.13 -
23.14 -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.";
23.15 +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>. See the <a href=\"{1}\">third-party readme</a> for external components included in NetBeans and their associated licenses.";
24.1 --- a/src/pl/other/installer/infra/build/web/js/common_strings_pl.js Thu Sep 20 09:23:41 2012 +0200
24.2 +++ b/src/pl/other/installer/infra/build/web/js/common_strings_pl.js Fri Sep 21 09:40:40 2012 +0900
24.3 @@ -81,9 +81,7 @@
24.4
24.5 var LEGAL_INFO_HEADER = "Wa\u017cna informacja prawna:";
24.6
24.7 -var CDDL_GPLV2_LINK = "http://netbeans.org/cddl-gplv2.html";
24.8 -var LICENSE_FILES_LINK = "http://netbeans.org/about/legal/product-licences.html";
24.9 +var CDDL_GPLV2_LINK = "http://www.netbeans.org/cddl-gplv2.html";
24.10 +var LICENSE_3RD_PARTY_LINK = "http://www.netbeans.info/downloads/licence/netbeans-3rd-party.txt";
24.11
24.12 -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.";
24.13 -
24.14 -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.";
24.15 +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>. See the <a href=\"{1}\">third-party readme</a> for external components included in NetBeans and their associated licenses.";
25.1 --- a/src/pt_BR/nb/updatecenters/updatecenters/org/netbeans/modules/updatecenters/resources/Bundle_pt_BR.properties Thu Sep 20 09:23:41 2012 +0200
25.2 +++ b/src/pt_BR/nb/updatecenters/updatecenters/org/netbeans/modules/updatecenters/resources/Bundle_pt_BR.properties Fri Sep 21 09:40:40 2012 +0900
25.3 @@ -47,3 +47,10 @@
25.4 OpenIDE-Module-Display-Category=Infraestrutura
25.5 OpenIDE-Module-Long-Description=Este \u00e9 o m\u00f3dulo que cont\u00e9m a declara\u00e7\u00e3o dos centros de atualiza\u00e7\u00e3o do NetBeans para o m\u00f3dulo de Atualiza\u00e7\u00f5es Autom\u00e1ticas.
25.6 OpenIDE-Module-Short-Description=Declara os centros de atualiza\u00e7\u00e3o autom\u00e1ticos do NetBeans.
25.7 +
25.8 +#Services/AutoupdateType/distribution-update-provider.instance=Distribui\u00e7\u00e3o do NetBeans
25.9 +#Services/AutoupdateType/certified-update-provider.instance=Plug-ins certificados
25.10 +#Services/AutoupdateType/pluginportal-update-provider.instance=Portal de plugins
25.11 +
25.12 +#URL_Distribution=http://updates.netbeans.org/netbeans/updates/7.2/uc/final/distribution/catalog_pt_BR.xml.gz?{$netbeans.hash.code}
25.13 +URL_Distribution=http://updates.netbeans.org/netbeans/updates/7.3/uc/beta/distribution/catalog_pt_BR.xml.gz?{$netbeans.hash.code}
26.1 --- a/src/pt_BR/other/installer/infra/build/web/js/common_strings_pt_BR.js Thu Sep 20 09:23:41 2012 +0200
26.2 +++ b/src/pt_BR/other/installer/infra/build/web/js/common_strings_pt_BR.js Fri Sep 21 09:40:40 2012 +0900
26.3 @@ -80,9 +80,7 @@
26.4
26.5 var LEGAL_INFO_HEADER = "Important Legal Information:";
26.6
26.7 -var CDDL_GPLV2_LINK = "http://netbeans.org/cddl-gplv2.html";
26.8 -var LICENSE_FILES_LINK = "http://netbeans.org/about/legal/product-licences.html";
26.9 +var CDDL_GPLV2_LINK = "http://www.netbeans.org/cddl-gplv2.html";
26.10 +var LICENSE_3RD_PARTY_LINK = "http://www.netbeans.info/downloads/licence/netbeans-3rd-party.txt";
26.11
26.12 -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.";
26.13 -
26.14 -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.";
26.15 +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>. See the <a href=\"{1}\">third-party readme</a> for external components included in NetBeans and their associated licenses.";
27.1 --- a/src/pt_BR/other/installer/mac/newbuild/Bundle_pt_BR.properties Thu Sep 20 09:23:41 2012 +0200
27.2 +++ b/src/pt_BR/other/installer/mac/newbuild/Bundle_pt_BR.properties Fri Sep 21 09:40:40 2012 +0900
27.3 @@ -1,7 +1,7 @@
27.4 netbeans-Title=NetBeans ${nb.display.version.long}
27.5 netbeans-mysql-Title=NetBeans IDE com GlassFish e MySQL
27.6
27.7 -jdk7-netbeans-Title=Java SE Development Kit e NetBeans IDE
27.8 +jdk7-netbeans-Title=Oracle JDK e NetBeans IDE
27.9
27.10 netbeans-title=NetBeans ${nb.display.version.short}
27.11 netbeans-tooltip=NetBeans IDE
28.1 --- a/src/pt_BR/other/installer/mac/newbuild/dmg/Resources/Welcome-jdk_pt_BR.html Thu Sep 20 09:23:41 2012 +0200
28.2 +++ b/src/pt_BR/other/installer/mac/newbuild/dmg/Resources/Welcome-jdk_pt_BR.html Fri Sep 21 09:40:40 2012 +0900
28.3 @@ -6,7 +6,7 @@
28.4 </head>
28.5 <body>
28.6
28.7 -<h3>Você será guiado pelas etapas básicas necessárias para instalar o JDK 7 Update 6 e o NetBeans IDE.</h3>
28.8 +<h3>Você será guiado pelas etapas básicas necessárias para instalar o JDK 7 Update 7 e o NetBeans IDE.</h3>
28.9
28.10 </body>
28.11 </html>
29.1 --- a/src/pt_PT/other/installer/infra/build/web/js/common_strings_pt_PT.js Thu Sep 20 09:23:41 2012 +0200
29.2 +++ b/src/pt_PT/other/installer/infra/build/web/js/common_strings_pt_PT.js Fri Sep 21 09:40:40 2012 +0900
29.3 @@ -81,9 +81,7 @@
29.4
29.5 var LEGAL_INFO_HEADER = "Important Legal Information:";
29.6
29.7 -var CDDL_GPLV2_LINK = "http://netbeans.org/cddl-gplv2.html";
29.8 -var LICENSE_FILES_LINK = "http://netbeans.org/about/legal/product-licences.html";
29.9 +var CDDL_GPLV2_LINK = "http://www.netbeans.org/cddl-gplv2.html";
29.10 +var LICENSE_3RD_PARTY_LINK = "http://www.netbeans.info/downloads/licence/netbeans-3rd-party.txt";
29.11
29.12 -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.";
29.13 -
29.14 -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.";
29.15 +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>. See the <a href=\"{1}\">third-party readme</a> for external components included in NetBeans and their associated licenses.";
30.1 --- a/src/ro/other/installer/infra/build/web/js/common_strings_ro.js Thu Sep 20 09:23:41 2012 +0200
30.2 +++ b/src/ro/other/installer/infra/build/web/js/common_strings_ro.js Fri Sep 21 09:40:40 2012 +0900
30.3 @@ -80,9 +80,7 @@
30.4
30.5 var LEGAL_INFO_HEADER = "Important Legal Information:";
30.6
30.7 -var CDDL_GPLV2_LINK = "http://netbeans.org/cddl-gplv2.html";
30.8 -var LICENSE_FILES_LINK = "http://netbeans.org/about/legal/product-licences.html";
30.9 +var CDDL_GPLV2_LINK = "http://www.netbeans.org/cddl-gplv2.html";
30.10 +var LICENSE_3RD_PARTY_LINK = "http://www.netbeans.info/downloads/licence/netbeans-3rd-party.txt";
30.11
30.12 -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.13 -
30.14 -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.";
30.15 +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>. See the <a href=\"{1}\">third-party readme</a> for external components included in NetBeans and their associated licenses.";
31.1 --- a/src/ru/nb/updatecenters/updatecenters/org/netbeans/modules/updatecenters/resources/Bundle_ru.properties Thu Sep 20 09:23:41 2012 +0200
31.2 +++ b/src/ru/nb/updatecenters/updatecenters/org/netbeans/modules/updatecenters/resources/Bundle_ru.properties Fri Sep 21 09:40:40 2012 +0900
31.3 @@ -47,3 +47,10 @@
31.4 OpenIDE-Module-Display-Category=\u0418\u043d\u0444\u0440\u0430\u0441\u0442\u0440\u0443\u043a\u0442\u0443\u0440\u0430
31.5 OpenIDE-Module-Long-Description=\u042d\u0442\u043e\u0442 \u043c\u043e\u0434\u0443\u043b\u044c \u0441\u043e\u0434\u0435\u0440\u0436\u0438\u0442 \u043e\u0431\u044a\u044f\u0432\u043b\u0435\u043d\u0438\u044f \u0446\u0435\u043d\u0442\u0440\u043e\u0432 \u043e\u0431\u043d\u043e\u0432\u043b\u0435\u043d\u0438\u044f NetBeans \u0434\u043b\u044f \u043c\u043e\u0434\u0443\u043b\u044f \u0430\u0432\u0442\u043e\u043e\u0431\u043d\u043e\u0432\u043b\u0435\u043d\u0438\u044f.
31.6 OpenIDE-Module-Short-Description=\u041e\u0431\u044a\u044f\u0432\u043b\u044f\u0435\u0442 \u0446\u0435\u043d\u0442\u0440\u044b \u0430\u0432\u0442\u043e\u043e\u0431\u043d\u043e\u0432\u043b\u0435\u043d\u0438\u044f NetBeans.
31.7 +
31.8 +#Services/AutoupdateType/distribution-update-provider.instance=\u0414\u0438\u0441\u0442\u0440\u0438\u0431\u0443\u0442\u0438\u0432 NetBeans
31.9 +#Services/AutoupdateType/certified-update-provider.instance=\u0421\u0435\u0440\u0442\u0438\u0444\u0438\u0446\u0438\u0440\u043e\u0432\u0430\u043d\u043d\u044b\u0435 \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0430\u0435\u043c\u044b\u0435 \u043c\u043e\u0434\u0443\u043b\u0438
31.10 +#Services/AutoupdateType/pluginportal-update-provider.instance=\u041f\u043e\u0440\u0442\u0430\u043b \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0430\u0435\u043c\u044b\u0445 \u043c\u043e\u0434\u0443\u043b\u0435\u0439
31.11 +
31.12 +#URL_Distribution=http://updates.netbeans.org/netbeans/updates/7.2/uc/final/distribution/catalog_ru.xml.gz?{$netbeans.hash.code}
31.13 +URL_Distribution=http://updates.netbeans.org/netbeans/updates/7.3/uc/beta/distribution/catalog_ru.xml.gz?{$netbeans.hash.code}
32.1 --- a/src/ru/other/installer/infra/build/web/js/common_strings_ru.js Thu Sep 20 09:23:41 2012 +0200
32.2 +++ b/src/ru/other/installer/infra/build/web/js/common_strings_ru.js Fri Sep 21 09:40:40 2012 +0900
32.3 @@ -81,9 +81,7 @@
32.4
32.5 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:";
32.6
32.7 -var CDDL_GPLV2_LINK = "http://netbeans.org/cddl-gplv2.html";
32.8 -var LICENSE_FILES_LINK = "http://netbeans.org/about/legal/product-licences.html";
32.9 +var CDDL_GPLV2_LINK = "http://www.netbeans.org/cddl-gplv2.html";
32.10 +var LICENSE_3RD_PARTY_LINK = "http://www.netbeans.info/downloads/licence/netbeans-3rd-party.txt";
32.11
32.12 -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.";
32.13 -
32.14 -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.";
32.15 +var LEGAL_INFO_MESSAGE = "\u0421\u0431\u043e\u0440\u043a\u0438 NetBeans \u0434\u043b\u044f \u0441\u043e\u043e\u0431\u0449\u0435\u0441\u0442\u0432\u0430 \u0434\u043e\u0441\u0442\u0443\u043f\u043d\u044b \u043f\u043e \u0434\u0432\u043e\u0439\u043d\u043e\u0439 \u043b\u0438\u0446\u0435\u043d\u0437\u0438\u0438, \u0441\u043e\u0441\u0442\u043e\u044f\u0449\u0435\u0439 \u0438\u0437 <a href=\"{0}\">Common Development and Distribution License (CDDL) v1.0 \u0438 GNU General Public License (GPL) v2</a>. \u0421\u043c\u043e\u0442\u0440\u0438\u0442\u0435 <a href=\"{1}\">\u0444\u0430\u0439\u043b third-party</a> \u0441 \u043e\u043f\u0438\u0441\u0430\u043d\u0438\u0435\u043c \u0441\u0442\u043e\u0440\u043e\u043d\u043d\u0438\u0445 \u043a\u043e\u043c\u043f\u043e\u043d\u0435\u043d\u0442\u043e\u0432, \u0432\u043a\u043b\u044e\u0447\u0435\u043d\u043d\u044b\u0445 \u0432 \u0441\u043e\u0441\u0442\u0430\u0432 NetBeans, \u0438 \u0438\u0445 \u043b\u0438\u0446\u0435\u043d\u0437\u0438\u0439.";
33.1 --- a/src/ru/other/installer/mac/newbuild/Bundle_ru.properties Thu Sep 20 09:23:41 2012 +0200
33.2 +++ b/src/ru/other/installer/mac/newbuild/Bundle_ru.properties Fri Sep 21 09:40:40 2012 +0900
33.3 @@ -1,7 +1,7 @@
33.4 netbeans-Title=NetBeans ${nb.display.version.long}
33.5 netbeans-mysql-Title=\u0421\u0440\u0435\u0434\u0430 IDE NetBeans \u0441 \u0441\u0435\u0440\u0432\u0435\u0440\u0430\u043c\u0438 GlassFish \u0438 MySQL
33.6
33.7 -jdk7-netbeans-Title=\u041f\u0430\u043a\u0435\u0442 \u0440\u0430\u0437\u0440\u0430\u0431\u043e\u0442\u0447\u0438\u043a\u0430 Java SE \u0438 \u0441\u0440\u0435\u0434\u0430 IDE NetBeans
33.8 +jdk7-netbeans-Title=Oracle JDK \u0438 \u0441\u0440\u0435\u0434\u0430 IDE NetBeans
33.9
33.10 netbeans-title=NetBeans ${nb.display.version.short}
33.11 netbeans-tooltip=\u0421\u0440\u0435\u0434\u0430 IDE NetBeans
34.1 --- a/src/ru/other/installer/mac/newbuild/dmg/Resources/Welcome-jdk_ru.html Thu Sep 20 09:23:41 2012 +0200
34.2 +++ b/src/ru/other/installer/mac/newbuild/dmg/Resources/Welcome-jdk_ru.html Fri Sep 21 09:40:40 2012 +0900
34.3 @@ -6,7 +6,7 @@
34.4 </head>
34.5 <body>
34.6
34.7 -<h3>Следуйте пошаговым инструкциям для установки обновления JDK 7 6 и NetBeans IDE.</h3>
34.8 +<h3>Следуйте пошаговым инструкциям для установки обновления JDK 7 7 и NetBeans IDE.</h3>
34.9
34.10 </body>
34.11 </html>
35.1 --- a/src/si/other/installer/infra/build/web/js/common_strings_si.js Thu Sep 20 09:23:41 2012 +0200
35.2 +++ b/src/si/other/installer/infra/build/web/js/common_strings_si.js Fri Sep 21 09:40:40 2012 +0900
35.3 @@ -81,9 +81,7 @@
35.4
35.5 var LEGAL_INFO_HEADER = "Important Legal Information:";
35.6
35.7 -var CDDL_GPLV2_LINK = "http://netbeans.org/cddl-gplv2.html";
35.8 -var LICENSE_FILES_LINK = "http://netbeans.org/about/legal/product-licences.html";
35.9 +var CDDL_GPLV2_LINK = "http://www.netbeans.org/cddl-gplv2.html";
35.10 +var LICENSE_3RD_PARTY_LINK = "http://www.netbeans.info/downloads/licence/netbeans-3rd-party.txt";
35.11
35.12 -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.";
35.13 -
35.14 -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.";
35.15 +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>. See the <a href=\"{1}\">third-party readme</a> for external components included in NetBeans and their associated licenses.";
36.1 --- a/src/sq/other/installer/infra/build/web/js/common_strings_sq.js Thu Sep 20 09:23:41 2012 +0200
36.2 +++ b/src/sq/other/installer/infra/build/web/js/common_strings_sq.js Fri Sep 21 09:40:40 2012 +0900
36.3 @@ -81,9 +81,7 @@
36.4
36.5 var LEGAL_INFO_HEADER = "Informate t\u00eb r\u00ebnd\u00ebsishme juridike:";
36.6
36.7 -var CDDL_GPLV2_LINK = "http://netbeans.org/cddl-gplv2.html";
36.8 -var LICENSE_FILES_LINK = "http://netbeans.org/about/legal/product-licences.html";
36.9 +var CDDL_GPLV2_LINK = "http://www.netbeans.org/cddl-gplv2.html";
36.10 +var LICENSE_3RD_PARTY_LINK = "http://www.netbeans.info/downloads/licence/netbeans-3rd-party.txt";
36.11
36.12 -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.";
36.13 -
36.14 -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.";
36.15 +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>. See the <a href=\"{1}\">third-party readme</a> for external components included in NetBeans and their associated licenses.";
37.1 --- a/src/sr/other/installer/infra/build/web/js/common_strings_sr.js Thu Sep 20 09:23:41 2012 +0200
37.2 +++ b/src/sr/other/installer/infra/build/web/js/common_strings_sr.js Fri Sep 21 09:40:40 2012 +0900
37.3 @@ -80,9 +80,7 @@
37.4
37.5 var LEGAL_INFO_HEADER = "Important Legal Information:";
37.6
37.7 -var CDDL_GPLV2_LINK = "http://netbeans.org/cddl-gplv2.html";
37.8 -var LICENSE_FILES_LINK = "http://netbeans.org/about/legal/product-licences.html";
37.9 +var CDDL_GPLV2_LINK = "http://www.netbeans.org/cddl-gplv2.html";
37.10 +var LICENSE_3RD_PARTY_LINK = "http://www.netbeans.info/downloads/licence/netbeans-3rd-party.txt";
37.11
37.12 -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.";
37.13 -
37.14 -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.";
37.15 +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>. See the <a href=\"{1}\">third-party readme</a> for external components included in NetBeans and their associated licenses.";
38.1 --- a/src/sv/other/installer/infra/build/web/js/common_strings_sv.js Thu Sep 20 09:23:41 2012 +0200
38.2 +++ b/src/sv/other/installer/infra/build/web/js/common_strings_sv.js Fri Sep 21 09:40:40 2012 +0900
38.3 @@ -80,9 +80,7 @@
38.4
38.5 var LEGAL_INFO_HEADER = "Important Legal Information:";
38.6
38.7 -var CDDL_GPLV2_LINK = "http://netbeans.org/cddl-gplv2.html";
38.8 -var LICENSE_FILES_LINK = "http://netbeans.org/about/legal/product-licences.html";
38.9 +var CDDL_GPLV2_LINK = "http://www.netbeans.org/cddl-gplv2.html";
38.10 +var LICENSE_3RD_PARTY_LINK = "http://www.netbeans.info/downloads/licence/netbeans-3rd-party.txt";
38.11
38.12 -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.";
38.13 -
38.14 -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.";
38.15 +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>. See the <a href=\"{1}\">third-party readme</a> for external components included in NetBeans and their associated licenses.";
39.1 --- a/src/tr/other/installer/infra/build/web/js/common_strings_tr.js Thu Sep 20 09:23:41 2012 +0200
39.2 +++ b/src/tr/other/installer/infra/build/web/js/common_strings_tr.js Fri Sep 21 09:40:40 2012 +0900
39.3 @@ -80,9 +80,7 @@
39.4
39.5 var LEGAL_INFO_HEADER = "Important Legal Information:";
39.6
39.7 -var CDDL_GPLV2_LINK = "http://netbeans.org/cddl-gplv2.html";
39.8 -var LICENSE_FILES_LINK = "http://netbeans.org/about/legal/product-licences.html";
39.9 +var CDDL_GPLV2_LINK = "http://www.netbeans.org/cddl-gplv2.html";
39.10 +var LICENSE_3RD_PARTY_LINK = "http://www.netbeans.info/downloads/licence/netbeans-3rd-party.txt";
39.11
39.12 -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.";
39.13 -
39.14 -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.";
39.15 +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>. See the <a href=\"{1}\">third-party readme</a> for external components included in NetBeans and their associated licenses.";
40.1 --- a/src/vi/other/installer/infra/build/web/js/common_strings_vi.js Thu Sep 20 09:23:41 2012 +0200
40.2 +++ b/src/vi/other/installer/infra/build/web/js/common_strings_vi.js Fri Sep 21 09:40:40 2012 +0900
40.3 @@ -80,9 +80,7 @@
40.4
40.5 var LEGAL_INFO_HEADER = "Important Legal Information:";
40.6
40.7 -var CDDL_GPLV2_LINK = "http://netbeans.org/cddl-gplv2.html";
40.8 -var LICENSE_FILES_LINK = "http://netbeans.org/about/legal/product-licences.html";
40.9 +var CDDL_GPLV2_LINK = "http://www.netbeans.org/cddl-gplv2.html";
40.10 +var LICENSE_3RD_PARTY_LINK = "http://www.netbeans.info/downloads/licence/netbeans-3rd-party.txt";
40.11
40.12 -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.13 -
40.14 -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.";
40.15 +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>. See the <a href=\"{1}\">third-party readme</a> for external components included in NetBeans and their associated licenses.";
41.1 --- a/src/zh_CN/nb/updatecenters/updatecenters/org/netbeans/modules/updatecenters/resources/Bundle_zh_CN.properties Thu Sep 20 09:23:41 2012 +0200
41.2 +++ b/src/zh_CN/nb/updatecenters/updatecenters/org/netbeans/modules/updatecenters/resources/Bundle_zh_CN.properties Fri Sep 21 09:40:40 2012 +0900
41.3 @@ -47,3 +47,10 @@
41.4 OpenIDE-Module-Display-Category=\u57fa\u7840\u7ed3\u6784
41.5 OpenIDE-Module-Long-Description=\u6b64\u6a21\u5757\u5305\u542b\u7528\u4e8e\u81ea\u52a8\u66f4\u65b0\u6a21\u5757\u7684 NetBeans \u66f4\u65b0\u4e2d\u5fc3\u58f0\u660e\u3002
41.6 OpenIDE-Module-Short-Description=\u58f0\u660e NetBeans \u81ea\u52a8\u66f4\u65b0\u4e2d\u5fc3\u3002
41.7 +
41.8 +#Services/AutoupdateType/distribution-update-provider.instance=NetBeans \u5206\u53d1
41.9 +#Services/AutoupdateType/certified-update-provider.instance=\u8ba4\u8bc1\u7684\u63d2\u4ef6
41.10 +#Services/AutoupdateType/pluginportal-update-provider.instance=\u63d2\u4ef6\u95e8\u6237
41.11 +
41.12 +#URL_Distribution=http://updates.netbeans.org/netbeans/updates/7.2/uc/final/distribution/catalog_zh_CN.xml.gz?{$netbeans.hash.code}
41.13 +URL_Distribution=http://updates.netbeans.org/netbeans/updates/7.3/uc/beta/distribution/catalog_zh_CN.xml.gz?{$netbeans.hash.code}
42.1 --- a/src/zh_CN/other/installer/infra/build/web/js/common_strings_zh_CN.js Thu Sep 20 09:23:41 2012 +0200
42.2 +++ b/src/zh_CN/other/installer/infra/build/web/js/common_strings_zh_CN.js Fri Sep 21 09:40:40 2012 +0900
42.3 @@ -80,9 +80,7 @@
42.4
42.5 var LEGAL_INFO_HEADER = "\u91CD\u8981\u7684\u6CD5\u5F8B\u4FE1\u606F\uFF1A";
42.6
42.7 -var CDDL_GPLV2_LINK = "http://netbeans.org/cddl-gplv2.html";
42.8 -var LICENSE_FILES_LINK = "http://netbeans.org/about/legal/product-licences.html";
42.9 +var CDDL_GPLV2_LINK = "http://www.netbeans.org/cddl-gplv2.html";
42.10 +var LICENSE_3RD_PARTY_LINK = "http://www.netbeans.info/downloads/licence/netbeans-3rd-party.txt";
42.11
42.12 -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.";
42.13 -
42.14 -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.";
42.15 +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>. See the <a href=\"{1}\">third-party readme</a> for external components included in NetBeans and their associated licenses.";
43.1 --- a/src/zh_CN/other/installer/mac/newbuild/dmg/Resources/Welcome-jdk_zh_CN.html Thu Sep 20 09:23:41 2012 +0200
43.2 +++ b/src/zh_CN/other/installer/mac/newbuild/dmg/Resources/Welcome-jdk_zh_CN.html Fri Sep 21 09:40:40 2012 +0900
43.3 @@ -6,7 +6,7 @@
43.4 </head>
43.5 <body>
43.6
43.7 -<h3>系统将指导您完成安装 JDK 7 Update 6 以及 NetBeans IDE 所必需的步骤。</h3>
43.8 +<h3>系统将指导您完成安装 JDK 7 Update 7 以及 NetBeans IDE 所必需的步骤。</h3>
43.9
43.10 </body>
43.11 </html>
44.1 --- a/src/zh_TW/other/installer/infra/build/web/js/common_strings_zh_TW.js Thu Sep 20 09:23:41 2012 +0200
44.2 +++ b/src/zh_TW/other/installer/infra/build/web/js/common_strings_zh_TW.js Fri Sep 21 09:40:40 2012 +0900
44.3 @@ -81,9 +81,7 @@
44.4
44.5 var LEGAL_INFO_HEADER = "\u91CD\u8981\u6CD5\u5F8B\u8A0A\u606F\uFF1A";
44.6
44.7 -var CDDL_GPLV2_LINK = "http://netbeans.org/cddl-gplv2.html";
44.8 -var LICENSE_FILES_LINK = "http://netbeans.org/about/legal/product-licences.html";
44.9 +var CDDL_GPLV2_LINK = "http://www.netbeans.org/cddl-gplv2.html";
44.10 +var LICENSE_3RD_PARTY_LINK = "http://www.netbeans.info/downloads/licence/netbeans-3rd-party.txt";
44.11
44.12 -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.";
44.13 -
44.14 -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.";
44.15 +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>. See the <a href=\"{1}\">third-party readme</a> for external components included in NetBeans and their associated licenses.";