1.1 --- a/src/af/other/installer/infra/build/web/js/start_strings_af.js Mon Dec 19 12:18:33 2016 +0100
1.2 +++ b/src/af/other/installer/infra/build/web/js/start_strings_af.js Tue Apr 17 14:14:23 2018 +0200
1.3 @@ -59,9 +59,9 @@
1.4 var SUPPORT_LABEL = "Support";
1.5 var SUPPORT_DESCRIPTION = "Flexible support options to help you stay focused on innovation.";
1.6
1.7 -// $PRODUCT_NAME $TYPE (Installer for $PLATFORM/Zip)/$Language ($Language_ID) $filename ($SIZE) MD5: $MD5
1.8 -var INFO_MESSAGE = "{0}{1} {2}/{3} ({4})<br>{5} ({6} MB)<br>MD5: {7}";
1.9 -var INFO_MESSAGE_OTHER = "{0} ({1} MB)<br>MD5: {2}";
1.10 +// $PRODUCT_NAME $TYPE (Installer for $PLATFORM/Zip)/$Language ($Language_ID) $filename ($SIZE) SHA-256: $MD5
1.11 +var INFO_MESSAGE = "{0}{1} {2}/{3} ({4})<br>{5} ({6} MB)<br>SHA-256: {7}";
1.12 +var INFO_MESSAGE_OTHER = "{0} ({1} MB)<br>SHA-256: {2}";
1.13
1.14 //DO NOT TRANSLATE
1.15 var SUBSCRIPTION_PHP_URL = "http://services.netbeans.org/sub.php";
2.1 --- a/src/ar_EG/other/installer/infra/build/web/js/start_strings_ar_EG.js Mon Dec 19 12:18:33 2016 +0100
2.2 +++ b/src/ar_EG/other/installer/infra/build/web/js/start_strings_ar_EG.js Tue Apr 17 14:14:23 2018 +0200
2.3 @@ -59,9 +59,9 @@
2.4 var SUPPORT_LABEL = "Support";
2.5 var SUPPORT_DESCRIPTION = "Flexible support options to help you stay focused on innovation.";
2.6
2.7 -// $PRODUCT_NAME $TYPE (Installer for $PLATFORM/Zip)/$Language ($Language_ID) $filename ($SIZE) MD5: $MD5
2.8 -var INFO_MESSAGE = "{0}{1} {2}/{3} ({4})<br>{5} ({6} MB)<br>MD5: {7}";
2.9 -var INFO_MESSAGE_OTHER = "{0} ({1} MB)<br>MD5: {2}";
2.10 +// $PRODUCT_NAME $TYPE (Installer for $PLATFORM/Zip)/$Language ($Language_ID) $filename ($SIZE) SHA-256: $MD5
2.11 +var INFO_MESSAGE = "{0}{1} {2}/{3} ({4})<br>{5} ({6} MB)<br>SHA-256: {7}";
2.12 +var INFO_MESSAGE_OTHER = "{0} ({1} MB)<br>SHA-256: {2}";
2.13
2.14 //DO NOT TRANSLATE
2.15 var SUBSCRIPTION_PHP_URL = "http://services.netbeans.org/sub.php";
3.1 --- a/src/ar_SA/other/installer/infra/build/web/js/start_strings_ar_SA.js Mon Dec 19 12:18:33 2016 +0100
3.2 +++ b/src/ar_SA/other/installer/infra/build/web/js/start_strings_ar_SA.js Tue Apr 17 14:14:23 2018 +0200
3.3 @@ -59,9 +59,9 @@
3.4 var SUPPORT_LABEL = "Support";
3.5 var SUPPORT_DESCRIPTION = "Flexible support options to help you stay focused on innovation.";
3.6
3.7 -// $PRODUCT_NAME $TYPE (Installer for $PLATFORM/Zip)/$Language ($Language_ID) $filename ($SIZE) MD5: $MD5
3.8 -var INFO_MESSAGE = "{0}{1} {2}/{3} ({4})<br>{5} ({6} MB)<br>MD5: {7}";
3.9 -var INFO_MESSAGE_OTHER = "{0} ({1} MB)<br>MD5: {2}";
3.10 +// $PRODUCT_NAME $TYPE (Installer for $PLATFORM/Zip)/$Language ($Language_ID) $filename ($SIZE) SHA-256: $MD5
3.11 +var INFO_MESSAGE = "{0}{1} {2}/{3} ({4})<br>{5} ({6} MB)<br>SHA-256: {7}";
3.12 +var INFO_MESSAGE_OTHER = "{0} ({1} MB)<br>SHA-256: {2}";
3.13
3.14 //DO NOT TRANSLATE
3.15 var SUBSCRIPTION_PHP_URL = "http://services.netbeans.org/sub.php";
4.1 --- a/src/bg/other/installer/infra/build/web/js/start_strings_bg.js Mon Dec 19 12:18:33 2016 +0100
4.2 +++ b/src/bg/other/installer/infra/build/web/js/start_strings_bg.js Tue Apr 17 14:14:23 2018 +0200
4.3 @@ -59,9 +59,9 @@
4.4 var SUPPORT_LABEL = "Support";
4.5 var SUPPORT_DESCRIPTION = "Flexible support options to help you stay focused on innovation.";
4.6
4.7 -// $PRODUCT_NAME $TYPE (Installer for $PLATFORM/Zip)/$Language ($Language_ID) $filename ($SIZE) MD5: $MD5
4.8 -var INFO_MESSAGE = "{0}{1} {2}/{3} ({4})<br>{5} ({6} MB)<br>MD5: {7}";
4.9 -var INFO_MESSAGE_OTHER = "{0} ({1} MB)<br>MD5: {2}";
4.10 +// $PRODUCT_NAME $TYPE (Installer for $PLATFORM/Zip)/$Language ($Language_ID) $filename ($SIZE) SHA-256: $MD5
4.11 +var INFO_MESSAGE = "{0}{1} {2}/{3} ({4})<br>{5} ({6} MB)<br>SHA-256: {7}";
4.12 +var INFO_MESSAGE_OTHER = "{0} ({1} MB)<br>SHA-256: {2}";
4.13
4.14 //DO NOT TRANSLATE
4.15 var SUBSCRIPTION_PHP_URL = "http://services.netbeans.org/sub.php";
5.1 --- a/src/ca/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/resources/samples/fractal_ca.html Mon Dec 19 12:18:33 2016 +0100
5.2 +++ b/src/ca/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/resources/samples/fractal_ca.html Tue Apr 17 14:14:23 2018 +0200
5.3 @@ -1,9 +1,44 @@
5.4 - <!--
5.5 - - Copyright 2006-2007 Sun Microsystems, Inc. All rights reserved.
5.6 - - SUN PROPRIETARY/CONFIDENTIAL.
5.7 - - Use is subject to license terms.
5.8 - -->
5.9 -
5.10 +<!--
5.11 + - DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
5.12 + -
5.13 + - Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
5.14 + -
5.15 + - The contents of this file are subject to the terms of either the GNU
5.16 + - General Public License Version 2 only ("GPL") or the Common
5.17 + - Development and Distribution License("CDDL") (collectively, the
5.18 + - "License"). You may not use this file except in compliance with the
5.19 + - License. You can obtain a copy of the License at
5.20 + - http://www.netbeans.org/cddl-gplv2.html
5.21 + - or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
5.22 + - specific language governing permissions and limitations under the
5.23 + - License. When distributing the software, include this License Header
5.24 + - Notice in each file and include the License file at
5.25 + - nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
5.26 + - particular file as subject to the "Classpath" exception as provided
5.27 + - by Sun in the GPL Version 2 section of the License file that
5.28 + - accompanied this code. If applicable, add the following below the
5.29 + - License Header, with the fields enclosed by brackets [] replaced by
5.30 + - your own identifying information:
5.31 + - "Portions Copyrighted [year] [name of copyright owner]"
5.32 + -
5.33 + - Contributor(s):
5.34 + -
5.35 + - The Original Software is NetBeans. The Initial Developer of the Original
5.36 + - Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
5.37 + - Microsystems, Inc. All Rights Reserved.
5.38 + -
5.39 + - If you wish your version of this file to be governed by only the CDDL
5.40 + - or only the GPL Version 2, indicate your decision by adding
5.41 + - "[Contributor] elects to include this software in this distribution
5.42 + - under the [CDDL or GPL Version 2] license." If you do not indicate a
5.43 + - single choice of license, a recipient has the option to distribute
5.44 + - your version of this file under either the CDDL, the GPL Version 2 or
5.45 + - to extend the choice of license to its licensees as provided above.
5.46 + - However, if you add GPL Version 2 code and therefore, elected the GPL
5.47 + - Version 2 license, then the option applies only if the new code is
5.48 + - made subject to such option by the copyright holder.
5.49 + -->
5.50 +
5.51 <HTML>
5.52 <head>
5.53 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
6.1 --- a/src/ca/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/resources/samples/hello_ca.html Mon Dec 19 12:18:33 2016 +0100
6.2 +++ b/src/ca/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/resources/samples/hello_ca.html Tue Apr 17 14:14:23 2018 +0200
6.3 @@ -1,9 +1,44 @@
6.4 - <!--
6.5 - - Copyright 2006-2007 Sun Microsystems, Inc. All rights reserved.
6.6 - - SUN PROPRIETARY/CONFIDENTIAL.
6.7 - - Use is subject to license terms.
6.8 - -->
6.9 -
6.10 +<!--
6.11 + - DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
6.12 + -
6.13 + - Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
6.14 + -
6.15 + - The contents of this file are subject to the terms of either the GNU
6.16 + - General Public License Version 2 only ("GPL") or the Common
6.17 + - Development and Distribution License("CDDL") (collectively, the
6.18 + - "License"). You may not use this file except in compliance with the
6.19 + - License. You can obtain a copy of the License at
6.20 + - http://www.netbeans.org/cddl-gplv2.html
6.21 + - or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
6.22 + - specific language governing permissions and limitations under the
6.23 + - License. When distributing the software, include this License Header
6.24 + - Notice in each file and include the License file at
6.25 + - nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
6.26 + - particular file as subject to the "Classpath" exception as provided
6.27 + - by Sun in the GPL Version 2 section of the License file that
6.28 + - accompanied this code. If applicable, add the following below the
6.29 + - License Header, with the fields enclosed by brackets [] replaced by
6.30 + - your own identifying information:
6.31 + - "Portions Copyrighted [year] [name of copyright owner]"
6.32 + -
6.33 + - Contributor(s):
6.34 + -
6.35 + - The Original Software is NetBeans. The Initial Developer of the Original
6.36 + - Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
6.37 + - Microsystems, Inc. All Rights Reserved.
6.38 + -
6.39 + - If you wish your version of this file to be governed by only the CDDL
6.40 + - or only the GPL Version 2, indicate your decision by adding
6.41 + - "[Contributor] elects to include this software in this distribution
6.42 + - under the [CDDL or GPL Version 2] license." If you do not indicate a
6.43 + - single choice of license, a recipient has the option to distribute
6.44 + - your version of this file under either the CDDL, the GPL Version 2 or
6.45 + - to extend the choice of license to its licensees as provided above.
6.46 + - However, if you add GPL Version 2 code and therefore, elected the GPL
6.47 + - Version 2 license, then the option applies only if the new code is
6.48 + - made subject to such option by the copyright holder.
6.49 + -->
6.50 +
6.51 <HTML>
6.52 <head>
6.53 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
7.1 --- a/src/ca/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/resources/samples/lexyacc_ca.html Mon Dec 19 12:18:33 2016 +0100
7.2 +++ b/src/ca/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/resources/samples/lexyacc_ca.html Tue Apr 17 14:14:23 2018 +0200
7.3 @@ -1,9 +1,44 @@
7.4 - <!--
7.5 - - Copyright 2006-2007 Sun Microsystems, Inc. All rights reserved.
7.6 - - SUN PROPRIETARY/CONFIDENTIAL.
7.7 - - Use is subject to license terms.
7.8 - -->
7.9 -
7.10 +<!--
7.11 + - DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
7.12 + -
7.13 + - Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
7.14 + -
7.15 + - The contents of this file are subject to the terms of either the GNU
7.16 + - General Public License Version 2 only ("GPL") or the Common
7.17 + - Development and Distribution License("CDDL") (collectively, the
7.18 + - "License"). You may not use this file except in compliance with the
7.19 + - License. You can obtain a copy of the License at
7.20 + - http://www.netbeans.org/cddl-gplv2.html
7.21 + - or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
7.22 + - specific language governing permissions and limitations under the
7.23 + - License. When distributing the software, include this License Header
7.24 + - Notice in each file and include the License file at
7.25 + - nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
7.26 + - particular file as subject to the "Classpath" exception as provided
7.27 + - by Sun in the GPL Version 2 section of the License file that
7.28 + - accompanied this code. If applicable, add the following below the
7.29 + - License Header, with the fields enclosed by brackets [] replaced by
7.30 + - your own identifying information:
7.31 + - "Portions Copyrighted [year] [name of copyright owner]"
7.32 + -
7.33 + - Contributor(s):
7.34 + -
7.35 + - The Original Software is NetBeans. The Initial Developer of the Original
7.36 + - Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
7.37 + - Microsystems, Inc. All Rights Reserved.
7.38 + -
7.39 + - If you wish your version of this file to be governed by only the CDDL
7.40 + - or only the GPL Version 2, indicate your decision by adding
7.41 + - "[Contributor] elects to include this software in this distribution
7.42 + - under the [CDDL or GPL Version 2] license." If you do not indicate a
7.43 + - single choice of license, a recipient has the option to distribute
7.44 + - your version of this file under either the CDDL, the GPL Version 2 or
7.45 + - to extend the choice of license to its licensees as provided above.
7.46 + - However, if you add GPL Version 2 code and therefore, elected the GPL
7.47 + - Version 2 license, then the option applies only if the new code is
7.48 + - made subject to such option by the copyright holder.
7.49 + -->
7.50 +
7.51 <HTML>
7.52 <head>
7.53 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
8.1 --- a/src/ca/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/resources/samples/pi_ca.html Mon Dec 19 12:18:33 2016 +0100
8.2 +++ b/src/ca/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/resources/samples/pi_ca.html Tue Apr 17 14:14:23 2018 +0200
8.3 @@ -1,9 +1,44 @@
8.4 - <!--
8.5 - - Copyright 2006-2007 Sun Microsystems, Inc. All rights reserved.
8.6 - - SUN PROPRIETARY/CONFIDENTIAL.
8.7 - - Use is subject to license terms.
8.8 - -->
8.9 -
8.10 +<!--
8.11 + - DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
8.12 + -
8.13 + - Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
8.14 + -
8.15 + - The contents of this file are subject to the terms of either the GNU
8.16 + - General Public License Version 2 only ("GPL") or the Common
8.17 + - Development and Distribution License("CDDL") (collectively, the
8.18 + - "License"). You may not use this file except in compliance with the
8.19 + - License. You can obtain a copy of the License at
8.20 + - http://www.netbeans.org/cddl-gplv2.html
8.21 + - or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
8.22 + - specific language governing permissions and limitations under the
8.23 + - License. When distributing the software, include this License Header
8.24 + - Notice in each file and include the License file at
8.25 + - nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
8.26 + - particular file as subject to the "Classpath" exception as provided
8.27 + - by Sun in the GPL Version 2 section of the License file that
8.28 + - accompanied this code. If applicable, add the following below the
8.29 + - License Header, with the fields enclosed by brackets [] replaced by
8.30 + - your own identifying information:
8.31 + - "Portions Copyrighted [year] [name of copyright owner]"
8.32 + -
8.33 + - Contributor(s):
8.34 + -
8.35 + - The Original Software is NetBeans. The Initial Developer of the Original
8.36 + - Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
8.37 + - Microsystems, Inc. All Rights Reserved.
8.38 + -
8.39 + - If you wish your version of this file to be governed by only the CDDL
8.40 + - or only the GPL Version 2, indicate your decision by adding
8.41 + - "[Contributor] elects to include this software in this distribution
8.42 + - under the [CDDL or GPL Version 2] license." If you do not indicate a
8.43 + - single choice of license, a recipient has the option to distribute
8.44 + - your version of this file under either the CDDL, the GPL Version 2 or
8.45 + - to extend the choice of license to its licensees as provided above.
8.46 + - However, if you add GPL Version 2 code and therefore, elected the GPL
8.47 + - Version 2 license, then the option applies only if the new code is
8.48 + - made subject to such option by the copyright holder.
8.49 + -->
8.50 +
8.51 <HTML>
8.52 <head>
8.53 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
9.1 --- a/src/ca/enterprise/j2eeserver/j2eeserver/org/netbeans/modules/j2ee/deployment/impl/ui/actions/Bundle_ca.properties Mon Dec 19 12:18:33 2016 +0100
9.2 +++ b/src/ca/enterprise/j2eeserver/j2eeserver/org/netbeans/modules/j2ee/deployment/impl/ui/actions/Bundle_ca.properties Tue Apr 17 14:14:23 2018 +0200
9.3 @@ -40,12 +40,6 @@
9.4 # Version 2 license, then the option applies only if the new code is
9.5 # made subject to such option by the copyright holder.
9.6
9.7 -## SUN PROPRIETARY/CONFIDENTIAL: INTERNAL USE ONLY.
9.8 -
9.9 -## Copyright 2001 Sun Microsystems, Inc. All rights reserved. Use is
9.10 -## subject to license terms.
9.11 -
9.12 -
9.13 MSG_Server_Instance_Added=Server instance "{0}" was added successfully.
9.14
9.15 #StartServerAction
10.1 --- a/src/ca/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-makeproject-ui-resources-samples-fractal_ca.html Mon Dec 19 12:18:33 2016 +0100
10.2 +++ b/src/ca/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-makeproject-ui-resources-samples-fractal_ca.html Tue Apr 17 14:14:23 2018 +0200
10.3 @@ -1,9 +1,44 @@
10.4 - <!--
10.5 - - Copyright 2006-2007 Sun Microsystems, Inc. All rights reserved.
10.6 - - SUN PROPRIETARY/CONFIDENTIAL.
10.7 - - Use is subject to license terms.
10.8 - -->
10.9 -
10.10 +<!--
10.11 + - DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
10.12 + -
10.13 + - Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
10.14 + -
10.15 + - The contents of this file are subject to the terms of either the GNU
10.16 + - General Public License Version 2 only ("GPL") or the Common
10.17 + - Development and Distribution License("CDDL") (collectively, the
10.18 + - "License"). You may not use this file except in compliance with the
10.19 + - License. You can obtain a copy of the License at
10.20 + - http://www.netbeans.org/cddl-gplv2.html
10.21 + - or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
10.22 + - specific language governing permissions and limitations under the
10.23 + - License. When distributing the software, include this License Header
10.24 + - Notice in each file and include the License file at
10.25 + - nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
10.26 + - particular file as subject to the "Classpath" exception as provided
10.27 + - by Sun in the GPL Version 2 section of the License file that
10.28 + - accompanied this code. If applicable, add the following below the
10.29 + - License Header, with the fields enclosed by brackets [] replaced by
10.30 + - your own identifying information:
10.31 + - "Portions Copyrighted [year] [name of copyright owner]"
10.32 + -
10.33 + - Contributor(s):
10.34 + -
10.35 + - The Original Software is NetBeans. The Initial Developer of the Original
10.36 + - Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
10.37 + - Microsystems, Inc. All Rights Reserved.
10.38 + -
10.39 + - If you wish your version of this file to be governed by only the CDDL
10.40 + - or only the GPL Version 2, indicate your decision by adding
10.41 + - "[Contributor] elects to include this software in this distribution
10.42 + - under the [CDDL or GPL Version 2] license." If you do not indicate a
10.43 + - single choice of license, a recipient has the option to distribute
10.44 + - your version of this file under either the CDDL, the GPL Version 2 or
10.45 + - to extend the choice of license to its licensees as provided above.
10.46 + - However, if you add GPL Version 2 code and therefore, elected the GPL
10.47 + - Version 2 license, then the option applies only if the new code is
10.48 + - made subject to such option by the copyright holder.
10.49 + -->
10.50 +
10.51 <HTML>
10.52 <head>
10.53 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
11.1 --- a/src/ca/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-makeproject-ui-resources-samples-hello_ca.html Mon Dec 19 12:18:33 2016 +0100
11.2 +++ b/src/ca/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-makeproject-ui-resources-samples-hello_ca.html Tue Apr 17 14:14:23 2018 +0200
11.3 @@ -1,9 +1,44 @@
11.4 - <!--
11.5 - - Copyright 2006-2007 Sun Microsystems, Inc. All rights reserved.
11.6 - - SUN PROPRIETARY/CONFIDENTIAL.
11.7 - - Use is subject to license terms.
11.8 - -->
11.9 -
11.10 +<!--
11.11 + - DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
11.12 + -
11.13 + - Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
11.14 + -
11.15 + - The contents of this file are subject to the terms of either the GNU
11.16 + - General Public License Version 2 only ("GPL") or the Common
11.17 + - Development and Distribution License("CDDL") (collectively, the
11.18 + - "License"). You may not use this file except in compliance with the
11.19 + - License. You can obtain a copy of the License at
11.20 + - http://www.netbeans.org/cddl-gplv2.html
11.21 + - or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
11.22 + - specific language governing permissions and limitations under the
11.23 + - License. When distributing the software, include this License Header
11.24 + - Notice in each file and include the License file at
11.25 + - nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
11.26 + - particular file as subject to the "Classpath" exception as provided
11.27 + - by Sun in the GPL Version 2 section of the License file that
11.28 + - accompanied this code. If applicable, add the following below the
11.29 + - License Header, with the fields enclosed by brackets [] replaced by
11.30 + - your own identifying information:
11.31 + - "Portions Copyrighted [year] [name of copyright owner]"
11.32 + -
11.33 + - Contributor(s):
11.34 + -
11.35 + - The Original Software is NetBeans. The Initial Developer of the Original
11.36 + - Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
11.37 + - Microsystems, Inc. All Rights Reserved.
11.38 + -
11.39 + - If you wish your version of this file to be governed by only the CDDL
11.40 + - or only the GPL Version 2, indicate your decision by adding
11.41 + - "[Contributor] elects to include this software in this distribution
11.42 + - under the [CDDL or GPL Version 2] license." If you do not indicate a
11.43 + - single choice of license, a recipient has the option to distribute
11.44 + - your version of this file under either the CDDL, the GPL Version 2 or
11.45 + - to extend the choice of license to its licensees as provided above.
11.46 + - However, if you add GPL Version 2 code and therefore, elected the GPL
11.47 + - Version 2 license, then the option applies only if the new code is
11.48 + - made subject to such option by the copyright holder.
11.49 + -->
11.50 +
11.51 <HTML>
11.52 <head>
11.53 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
12.1 --- a/src/ca/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-makeproject-ui-resources-samples-lexyacc_ca.html Mon Dec 19 12:18:33 2016 +0100
12.2 +++ b/src/ca/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-makeproject-ui-resources-samples-lexyacc_ca.html Tue Apr 17 14:14:23 2018 +0200
12.3 @@ -1,9 +1,44 @@
12.4 - <!--
12.5 - - Copyright 2006-2007 Sun Microsystems, Inc. All rights reserved.
12.6 - - SUN PROPRIETARY/CONFIDENTIAL.
12.7 - - Use is subject to license terms.
12.8 - -->
12.9 -
12.10 +<!--
12.11 + - DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
12.12 + -
12.13 + - Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
12.14 + -
12.15 + - The contents of this file are subject to the terms of either the GNU
12.16 + - General Public License Version 2 only ("GPL") or the Common
12.17 + - Development and Distribution License("CDDL") (collectively, the
12.18 + - "License"). You may not use this file except in compliance with the
12.19 + - License. You can obtain a copy of the License at
12.20 + - http://www.netbeans.org/cddl-gplv2.html
12.21 + - or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
12.22 + - specific language governing permissions and limitations under the
12.23 + - License. When distributing the software, include this License Header
12.24 + - Notice in each file and include the License file at
12.25 + - nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
12.26 + - particular file as subject to the "Classpath" exception as provided
12.27 + - by Sun in the GPL Version 2 section of the License file that
12.28 + - accompanied this code. If applicable, add the following below the
12.29 + - License Header, with the fields enclosed by brackets [] replaced by
12.30 + - your own identifying information:
12.31 + - "Portions Copyrighted [year] [name of copyright owner]"
12.32 + -
12.33 + - Contributor(s):
12.34 + -
12.35 + - The Original Software is NetBeans. The Initial Developer of the Original
12.36 + - Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
12.37 + - Microsystems, Inc. All Rights Reserved.
12.38 + -
12.39 + - If you wish your version of this file to be governed by only the CDDL
12.40 + - or only the GPL Version 2, indicate your decision by adding
12.41 + - "[Contributor] elects to include this software in this distribution
12.42 + - under the [CDDL or GPL Version 2] license." If you do not indicate a
12.43 + - single choice of license, a recipient has the option to distribute
12.44 + - your version of this file under either the CDDL, the GPL Version 2 or
12.45 + - to extend the choice of license to its licensees as provided above.
12.46 + - However, if you add GPL Version 2 code and therefore, elected the GPL
12.47 + - Version 2 license, then the option applies only if the new code is
12.48 + - made subject to such option by the copyright holder.
12.49 + -->
12.50 +
12.51 <HTML>
12.52 <head>
12.53 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
13.1 --- a/src/ca/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-makeproject-ui-resources-samples-pi_ca.html Mon Dec 19 12:18:33 2016 +0100
13.2 +++ b/src/ca/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-makeproject-ui-resources-samples-pi_ca.html Tue Apr 17 14:14:23 2018 +0200
13.3 @@ -1,9 +1,44 @@
13.4 - <!--
13.5 - - Copyright 2006-2007 Sun Microsystems, Inc. All rights reserved.
13.6 - - SUN PROPRIETARY/CONFIDENTIAL.
13.7 - - Use is subject to license terms.
13.8 - -->
13.9 -
13.10 +<!--
13.11 + - DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
13.12 + -
13.13 + - Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
13.14 + -
13.15 + - The contents of this file are subject to the terms of either the GNU
13.16 + - General Public License Version 2 only ("GPL") or the Common
13.17 + - Development and Distribution License("CDDL") (collectively, the
13.18 + - "License"). You may not use this file except in compliance with the
13.19 + - License. You can obtain a copy of the License at
13.20 + - http://www.netbeans.org/cddl-gplv2.html
13.21 + - or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
13.22 + - specific language governing permissions and limitations under the
13.23 + - License. When distributing the software, include this License Header
13.24 + - Notice in each file and include the License file at
13.25 + - nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
13.26 + - particular file as subject to the "Classpath" exception as provided
13.27 + - by Sun in the GPL Version 2 section of the License file that
13.28 + - accompanied this code. If applicable, add the following below the
13.29 + - License Header, with the fields enclosed by brackets [] replaced by
13.30 + - your own identifying information:
13.31 + - "Portions Copyrighted [year] [name of copyright owner]"
13.32 + -
13.33 + - Contributor(s):
13.34 + -
13.35 + - The Original Software is NetBeans. The Initial Developer of the Original
13.36 + - Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
13.37 + - Microsystems, Inc. All Rights Reserved.
13.38 + -
13.39 + - If you wish your version of this file to be governed by only the CDDL
13.40 + - or only the GPL Version 2, indicate your decision by adding
13.41 + - "[Contributor] elects to include this software in this distribution
13.42 + - under the [CDDL or GPL Version 2] license." If you do not indicate a
13.43 + - single choice of license, a recipient has the option to distribute
13.44 + - your version of this file under either the CDDL, the GPL Version 2 or
13.45 + - to extend the choice of license to its licensees as provided above.
13.46 + - However, if you add GPL Version 2 code and therefore, elected the GPL
13.47 + - Version 2 license, then the option applies only if the new code is
13.48 + - made subject to such option by the copyright holder.
13.49 + -->
13.50 +
13.51 <HTML>
13.52 <head>
13.53 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
14.1 --- a/src/ca/javacard/javacard-project/javacard-project/org/netbeans/modules/javacard/project/ui/Bundle_ca.properties Mon Dec 19 12:18:33 2016 +0100
14.2 +++ b/src/ca/javacard/javacard-project/javacard-project/org/netbeans/modules/javacard/project/ui/Bundle_ca.properties Tue Apr 17 14:14:23 2018 +0200
14.3 @@ -42,7 +42,7 @@
14.4 CLASSIC_LIBRARY_PROJECT=ClassicLibrary
14.5 EXTENSION_LIBRARY_PROJECT=ExtensionLibrary
14.6 Get_Sources_From_=Get Sources From
14.7 -#DEFAULT_URL=http://192.168.253.1/jc3bot/src.tgz
14.8 +
14.9 SPECIFY_URL=Specify the URL of src file that was already available on the Card/Server to work with the same Source you deployed earlier.
14.10 ADD_NEW_SERVER=Add New Server [Real Card]
14.11 Hello_Application=Hello Application
15.1 --- a/src/ca/other/installer/infra/build/web/js/start_strings_ca.js Mon Dec 19 12:18:33 2016 +0100
15.2 +++ b/src/ca/other/installer/infra/build/web/js/start_strings_ca.js Tue Apr 17 14:14:23 2018 +0200
15.3 @@ -59,9 +59,9 @@
15.4 var SUPPORT_LABEL = "Support";
15.5 var SUPPORT_DESCRIPTION = "Flexible support options to help you stay focused on innovation.";
15.6
15.7 -// $PRODUCT_NAME $TYPE (Installer for $PLATFORM/Zip)/$Language ($Language_ID) $filename ($SIZE) MD5: $MD5
15.8 -var INFO_MESSAGE = "{0}{1} {2}/{3} ({4})<br>{5} ({6} MB)<br>MD5: {7}";
15.9 -var INFO_MESSAGE_OTHER = "{0} ({1} MB)<br>MD5: {2}";
15.10 +// $PRODUCT_NAME $TYPE (Installer for $PLATFORM/Zip)/$Language ($Language_ID) $filename ($SIZE) SHA-256: $MD5
15.11 +var INFO_MESSAGE = "{0}{1} {2}/{3} ({4})<br>{5} ({6} MB)<br>SHA-256: {7}";
15.12 +var INFO_MESSAGE_OTHER = "{0} ({1} MB)<br>SHA-256: {2}";
15.13
15.14 //DO NOT TRANSLATE
15.15 var SUBSCRIPTION_PHP_URL = "http://services.netbeans.org/sub.php";
16.1 --- a/src/ca/ruby/ruby/ruby/org/netbeans/modules/ruby/Bundle_ca.properties Mon Dec 19 12:18:33 2016 +0100
16.2 +++ b/src/ca/ruby/ruby/ruby/org/netbeans/modules/ruby/Bundle_ca.properties Tue Apr 17 14:14:23 2018 +0200
16.3 @@ -266,9 +266,6 @@
16.4
16.5 InstalledVersions=Installed version(s): {0}
16.6
16.7 -# HTTP status codes for code completion,
16.8 -# descriptions taken from http://www.google.com/support/webmasters/bin/answer.py?hl=en&answer=40132 and http://www.w3.org/Protocols/rfc2616/rfc2616-sec10.html
16.9 -
16.10 SC_100=100 (Continue)
16.11 SC_100_DESC=The requestor should continue with the request. The server returns this code to indicate that it has received the first part of a request and is waiting for the rest.
16.12 SC_101=101 (Switching protocols)
17.1 --- a/src/cs/other/installer/infra/build/web/js/start_strings_cs.js Mon Dec 19 12:18:33 2016 +0100
17.2 +++ b/src/cs/other/installer/infra/build/web/js/start_strings_cs.js Tue Apr 17 14:14:23 2018 +0200
17.3 @@ -59,9 +59,9 @@
17.4 var SUPPORT_LABEL = "Support";
17.5 var SUPPORT_DESCRIPTION = "Flexible support options to help you stay focused on innovation.";
17.6
17.7 -// $PRODUCT_NAME $TYPE (Installer for $PLATFORM/Zip)/$Language ($Language_ID) $filename ($SIZE) MD5: $MD5
17.8 -var INFO_MESSAGE = "{0}{1} {2}/{3} ({4})<br>{5} ({6} MB)<br>MD5: {7}";
17.9 -var INFO_MESSAGE_OTHER = "{0} ({1} MB)<br>MD5: {2}";
17.10 +// $PRODUCT_NAME $TYPE (Installer for $PLATFORM/Zip)/$Language ($Language_ID) $filename ($SIZE) SHA-256: $MD5
17.11 +var INFO_MESSAGE = "{0}{1} {2}/{3} ({4})<br>{5} ({6} MB)<br>SHA-256: {7}";
17.12 +var INFO_MESSAGE_OTHER = "{0} ({1} MB)<br>SHA-256: {2}";
17.13
17.14 //DO NOT TRANSLATE
17.15 var SUBSCRIPTION_PHP_URL = "http://services.netbeans.org/sub.php";
18.1 --- a/src/de/other/installer/infra/build/web/js/start_strings_de.js Mon Dec 19 12:18:33 2016 +0100
18.2 +++ b/src/de/other/installer/infra/build/web/js/start_strings_de.js Tue Apr 17 14:14:23 2018 +0200
18.3 @@ -59,9 +59,9 @@
18.4 var SUPPORT_LABEL = "Support";
18.5 var SUPPORT_DESCRIPTION = "Flexible support options to help you stay focused on innovation.";
18.6
18.7 -// $PRODUCT_NAME $TYPE (Installer for $PLATFORM/Zip)/$Language ($Language_ID) $filename ($SIZE) MD5: $MD5
18.8 -var INFO_MESSAGE = "{0}{1} {2}/{3} ({4})<br>{5} ({6} MB)<br>MD5: {7}";
18.9 -var INFO_MESSAGE_OTHER = "{0} ({1} MB)<br>MD5: {2}";
18.10 +// $PRODUCT_NAME $TYPE (Installer for $PLATFORM/Zip)/$Language ($Language_ID) $filename ($SIZE) SHA-256: $MD5
18.11 +var INFO_MESSAGE = "{0}{1} {2}/{3} ({4})<br>{5} ({6} MB)<br>SHA-256: {7}";
18.12 +var INFO_MESSAGE_OTHER = "{0} ({1} MB)<br>SHA-256: {2}";
18.13
18.14 //DO NOT TRANSLATE
18.15 var SUBSCRIPTION_PHP_URL = "http://services.netbeans.org/sub.php";
19.1 --- a/src/el/other/installer/infra/build/web/js/start_strings_el.js Mon Dec 19 12:18:33 2016 +0100
19.2 +++ b/src/el/other/installer/infra/build/web/js/start_strings_el.js Tue Apr 17 14:14:23 2018 +0200
19.3 @@ -59,9 +59,9 @@
19.4 var SUPPORT_LABEL = "Support";
19.5 var SUPPORT_DESCRIPTION = "Flexible support options to help you stay focused on innovation.";
19.6
19.7 -// $PRODUCT_NAME $TYPE (Installer for $PLATFORM/Zip)/$Language ($Language_ID) $filename ($SIZE) MD5: $MD5
19.8 -var INFO_MESSAGE = "{0}{1} {2}/{3} ({4})<br>{5} ({6} MB)<br>MD5: {7}";
19.9 -var INFO_MESSAGE_OTHER = "{0} ({1} MB)<br>MD5: {2}";
19.10 +// $PRODUCT_NAME $TYPE (Installer for $PLATFORM/Zip)/$Language ($Language_ID) $filename ($SIZE) SHA-256: $MD5
19.11 +var INFO_MESSAGE = "{0}{1} {2}/{3} ({4})<br>{5} ({6} MB)<br>SHA-256: {7}";
19.12 +var INFO_MESSAGE_OTHER = "{0} ({1} MB)<br>SHA-256: {2}";
19.13
19.14 //DO NOT TRANSLATE
19.15 var SUBSCRIPTION_PHP_URL = "http://services.netbeans.org/sub.php";
20.1 --- a/src/es/other/installer/infra/build/web/js/start_strings_es.js Mon Dec 19 12:18:33 2016 +0100
20.2 +++ b/src/es/other/installer/infra/build/web/js/start_strings_es.js Tue Apr 17 14:14:23 2018 +0200
20.3 @@ -59,9 +59,9 @@
20.4 var SUPPORT_LABEL = "Support";
20.5 var SUPPORT_DESCRIPTION = "Flexible support options to help you stay focused on innovation.";
20.6
20.7 -// $PRODUCT_NAME $TYPE (Installer for $PLATFORM/Zip)/$Language ($Language_ID) $filename ($SIZE) MD5: $MD5
20.8 -var INFO_MESSAGE = "{0}{1} {2}/{3} ({4})<br>{5} ({6} MB)<br>MD5: {7}";
20.9 -var INFO_MESSAGE_OTHER = "{0} ({1} MB)<br>MD5: {2}";
20.10 +// $PRODUCT_NAME $TYPE (Installer for $PLATFORM/Zip)/$Language ($Language_ID) $filename ($SIZE) SHA-256: $MD5
20.11 +var INFO_MESSAGE = "{0}{1} {2}/{3} ({4})<br>{5} ({6} MB)<br>SHA-256: {7}";
20.12 +var INFO_MESSAGE_OTHER = "{0} ({1} MB)<br>SHA-256: {2}";
20.13
20.14 //DO NOT TRANSLATE
20.15 var SUBSCRIPTION_PHP_URL = "http://services.netbeans.org/sub.php";
21.1 --- a/src/es_CO/other/installer/infra/build/web/js/start_strings_es_CO.js Mon Dec 19 12:18:33 2016 +0100
21.2 +++ b/src/es_CO/other/installer/infra/build/web/js/start_strings_es_CO.js Tue Apr 17 14:14:23 2018 +0200
21.3 @@ -59,9 +59,9 @@
21.4 var SUPPORT_LABEL = "Support";
21.5 var SUPPORT_DESCRIPTION = "Flexible support options to help you stay focused on innovation.";
21.6
21.7 -// $PRODUCT_NAME $TYPE (Installer for $PLATFORM/Zip)/$Language ($Language_ID) $filename ($SIZE) MD5: $MD5
21.8 -var INFO_MESSAGE = "{0}{1} {2}/{3} ({4})<br>{5} ({6} MB)<br>MD5: {7}";
21.9 -var INFO_MESSAGE_OTHER = "{0} ({1} MB)<br>MD5: {2}";
21.10 +// $PRODUCT_NAME $TYPE (Installer for $PLATFORM/Zip)/$Language ($Language_ID) $filename ($SIZE) SHA-256: $MD5
21.11 +var INFO_MESSAGE = "{0}{1} {2}/{3} ({4})<br>{5} ({6} MB)<br>SHA-256: {7}";
21.12 +var INFO_MESSAGE_OTHER = "{0} ({1} MB)<br>SHA-256: {2}";
21.13
21.14 //DO NOT TRANSLATE
21.15 var SUBSCRIPTION_PHP_URL = "http://services.netbeans.org/sub.php";
22.1 --- a/src/fil_PH/other/installer/infra/build/web/js/start_strings_fil_PH.js Mon Dec 19 12:18:33 2016 +0100
22.2 +++ b/src/fil_PH/other/installer/infra/build/web/js/start_strings_fil_PH.js Tue Apr 17 14:14:23 2018 +0200
22.3 @@ -59,9 +59,9 @@
22.4 var SUPPORT_LABEL = "Support";
22.5 var SUPPORT_DESCRIPTION = "Flexible support options to help you stay focused on innovation.";
22.6
22.7 -// $PRODUCT_NAME $TYPE (Installer for $PLATFORM/Zip)/$Language ($Language_ID) $filename ($SIZE) MD5: $MD5
22.8 -var INFO_MESSAGE = "{0}{1} {2}/{3} ({4})<br>{5} ({6} MB)<br>MD5: {7}";
22.9 -var INFO_MESSAGE_OTHER = "{0} ({1} MB)<br>MD5: {2}";
22.10 +// $PRODUCT_NAME $TYPE (Installer for $PLATFORM/Zip)/$Language ($Language_ID) $filename ($SIZE) SHA-256: $MD5
22.11 +var INFO_MESSAGE = "{0}{1} {2}/{3} ({4})<br>{5} ({6} MB)<br>SHA-256: {7}";
22.12 +var INFO_MESSAGE_OTHER = "{0} ({1} MB)<br>SHA-256: {2}";
22.13
22.14 //DO NOT TRANSLATE
22.15 var SUBSCRIPTION_PHP_URL = "http://services.netbeans.org/sub.php";
23.1 --- a/src/fr/other/installer/infra/build/web/js/start_strings_fr.js Mon Dec 19 12:18:33 2016 +0100
23.2 +++ b/src/fr/other/installer/infra/build/web/js/start_strings_fr.js Tue Apr 17 14:14:23 2018 +0200
23.3 @@ -59,9 +59,9 @@
23.4 var SUPPORT_LABEL = "Support";
23.5 var SUPPORT_DESCRIPTION = "Flexible support options to help you stay focused on innovation.";
23.6
23.7 -// $PRODUCT_NAME $TYPE (Installer for $PLATFORM/Zip)/$Language ($Language_ID) $filename ($SIZE) MD5: $MD5
23.8 -var INFO_MESSAGE = "{0}{1} {2}/{3} ({4})<br>{5} ({6} MB)<br>MD5: {7}";
23.9 -var INFO_MESSAGE_OTHER = "{0} ({1} MB)<br>MD5: {2}";
23.10 +// $PRODUCT_NAME $TYPE (Installer for $PLATFORM/Zip)/$Language ($Language_ID) $filename ($SIZE) SHA-256: $MD5
23.11 +var INFO_MESSAGE = "{0}{1} {2}/{3} ({4})<br>{5} ({6} MB)<br>SHA-256: {7}";
23.12 +var INFO_MESSAGE_OTHER = "{0} ({1} MB)<br>SHA-256: {2}";
23.13
23.14 //DO NOT TRANSLATE
23.15 var SUBSCRIPTION_PHP_URL = "http://services.netbeans.org/sub.php";
24.1 --- a/src/gl_ES/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/resources/samples/fractal_gl_ES.html Mon Dec 19 12:18:33 2016 +0100
24.2 +++ b/src/gl_ES/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/resources/samples/fractal_gl_ES.html Tue Apr 17 14:14:23 2018 +0200
24.3 @@ -1,9 +1,44 @@
24.4 - <!--
24.5 - - Copyright 2006-2007 Sun Microsystems, Inc. All rights reserved.
24.6 - - SUN PROPRIETARY/CONFIDENTIAL.
24.7 - - Use is subject to license terms.
24.8 - -->
24.9 -
24.10 +<!--
24.11 + - DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
24.12 + -
24.13 + - Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
24.14 + -
24.15 + - The contents of this file are subject to the terms of either the GNU
24.16 + - General Public License Version 2 only ("GPL") or the Common
24.17 + - Development and Distribution License("CDDL") (collectively, the
24.18 + - "License"). You may not use this file except in compliance with the
24.19 + - License. You can obtain a copy of the License at
24.20 + - http://www.netbeans.org/cddl-gplv2.html
24.21 + - or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
24.22 + - specific language governing permissions and limitations under the
24.23 + - License. When distributing the software, include this License Header
24.24 + - Notice in each file and include the License file at
24.25 + - nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
24.26 + - particular file as subject to the "Classpath" exception as provided
24.27 + - by Sun in the GPL Version 2 section of the License file that
24.28 + - accompanied this code. If applicable, add the following below the
24.29 + - License Header, with the fields enclosed by brackets [] replaced by
24.30 + - your own identifying information:
24.31 + - "Portions Copyrighted [year] [name of copyright owner]"
24.32 + -
24.33 + - Contributor(s):
24.34 + -
24.35 + - The Original Software is NetBeans. The Initial Developer of the Original
24.36 + - Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
24.37 + - Microsystems, Inc. All Rights Reserved.
24.38 + -
24.39 + - If you wish your version of this file to be governed by only the CDDL
24.40 + - or only the GPL Version 2, indicate your decision by adding
24.41 + - "[Contributor] elects to include this software in this distribution
24.42 + - under the [CDDL or GPL Version 2] license." If you do not indicate a
24.43 + - single choice of license, a recipient has the option to distribute
24.44 + - your version of this file under either the CDDL, the GPL Version 2 or
24.45 + - to extend the choice of license to its licensees as provided above.
24.46 + - However, if you add GPL Version 2 code and therefore, elected the GPL
24.47 + - Version 2 license, then the option applies only if the new code is
24.48 + - made subject to such option by the copyright holder.
24.49 + -->
24.50 +
24.51 <HTML>
24.52 <head>
24.53 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
25.1 --- a/src/gl_ES/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/resources/samples/hello_gl_ES.html Mon Dec 19 12:18:33 2016 +0100
25.2 +++ b/src/gl_ES/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/resources/samples/hello_gl_ES.html Tue Apr 17 14:14:23 2018 +0200
25.3 @@ -1,9 +1,44 @@
25.4 - <!--
25.5 - - Copyright 2006-2007 Sun Microsystems, Inc. All rights reserved.
25.6 - - SUN PROPRIETARY/CONFIDENTIAL.
25.7 - - Use is subject to license terms.
25.8 - -->
25.9 -
25.10 +<!--
25.11 + - DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
25.12 + -
25.13 + - Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
25.14 + -
25.15 + - The contents of this file are subject to the terms of either the GNU
25.16 + - General Public License Version 2 only ("GPL") or the Common
25.17 + - Development and Distribution License("CDDL") (collectively, the
25.18 + - "License"). You may not use this file except in compliance with the
25.19 + - License. You can obtain a copy of the License at
25.20 + - http://www.netbeans.org/cddl-gplv2.html
25.21 + - or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
25.22 + - specific language governing permissions and limitations under the
25.23 + - License. When distributing the software, include this License Header
25.24 + - Notice in each file and include the License file at
25.25 + - nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
25.26 + - particular file as subject to the "Classpath" exception as provided
25.27 + - by Sun in the GPL Version 2 section of the License file that
25.28 + - accompanied this code. If applicable, add the following below the
25.29 + - License Header, with the fields enclosed by brackets [] replaced by
25.30 + - your own identifying information:
25.31 + - "Portions Copyrighted [year] [name of copyright owner]"
25.32 + -
25.33 + - Contributor(s):
25.34 + -
25.35 + - The Original Software is NetBeans. The Initial Developer of the Original
25.36 + - Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
25.37 + - Microsystems, Inc. All Rights Reserved.
25.38 + -
25.39 + - If you wish your version of this file to be governed by only the CDDL
25.40 + - or only the GPL Version 2, indicate your decision by adding
25.41 + - "[Contributor] elects to include this software in this distribution
25.42 + - under the [CDDL or GPL Version 2] license." If you do not indicate a
25.43 + - single choice of license, a recipient has the option to distribute
25.44 + - your version of this file under either the CDDL, the GPL Version 2 or
25.45 + - to extend the choice of license to its licensees as provided above.
25.46 + - However, if you add GPL Version 2 code and therefore, elected the GPL
25.47 + - Version 2 license, then the option applies only if the new code is
25.48 + - made subject to such option by the copyright holder.
25.49 + -->
25.50 +
25.51 <HTML>
25.52 <head>
25.53 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
26.1 --- a/src/gl_ES/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/resources/samples/lexyacc_gl_ES.html Mon Dec 19 12:18:33 2016 +0100
26.2 +++ b/src/gl_ES/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/resources/samples/lexyacc_gl_ES.html Tue Apr 17 14:14:23 2018 +0200
26.3 @@ -1,9 +1,44 @@
26.4 - <!--
26.5 - - Copyright 2006-2007 Sun Microsystems, Inc. All rights reserved.
26.6 - - SUN PROPRIETARY/CONFIDENTIAL.
26.7 - - Use is subject to license terms.
26.8 - -->
26.9 -
26.10 +<!--
26.11 + - DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
26.12 + -
26.13 + - Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
26.14 + -
26.15 + - The contents of this file are subject to the terms of either the GNU
26.16 + - General Public License Version 2 only ("GPL") or the Common
26.17 + - Development and Distribution License("CDDL") (collectively, the
26.18 + - "License"). You may not use this file except in compliance with the
26.19 + - License. You can obtain a copy of the License at
26.20 + - http://www.netbeans.org/cddl-gplv2.html
26.21 + - or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
26.22 + - specific language governing permissions and limitations under the
26.23 + - License. When distributing the software, include this License Header
26.24 + - Notice in each file and include the License file at
26.25 + - nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
26.26 + - particular file as subject to the "Classpath" exception as provided
26.27 + - by Sun in the GPL Version 2 section of the License file that
26.28 + - accompanied this code. If applicable, add the following below the
26.29 + - License Header, with the fields enclosed by brackets [] replaced by
26.30 + - your own identifying information:
26.31 + - "Portions Copyrighted [year] [name of copyright owner]"
26.32 + -
26.33 + - Contributor(s):
26.34 + -
26.35 + - The Original Software is NetBeans. The Initial Developer of the Original
26.36 + - Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
26.37 + - Microsystems, Inc. All Rights Reserved.
26.38 + -
26.39 + - If you wish your version of this file to be governed by only the CDDL
26.40 + - or only the GPL Version 2, indicate your decision by adding
26.41 + - "[Contributor] elects to include this software in this distribution
26.42 + - under the [CDDL or GPL Version 2] license." If you do not indicate a
26.43 + - single choice of license, a recipient has the option to distribute
26.44 + - your version of this file under either the CDDL, the GPL Version 2 or
26.45 + - to extend the choice of license to its licensees as provided above.
26.46 + - However, if you add GPL Version 2 code and therefore, elected the GPL
26.47 + - Version 2 license, then the option applies only if the new code is
26.48 + - made subject to such option by the copyright holder.
26.49 + -->
26.50 +
26.51 <HTML>
26.52 <head>
26.53 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
27.1 --- a/src/gl_ES/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/resources/samples/pi_gl_ES.html Mon Dec 19 12:18:33 2016 +0100
27.2 +++ b/src/gl_ES/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/resources/samples/pi_gl_ES.html Tue Apr 17 14:14:23 2018 +0200
27.3 @@ -1,9 +1,44 @@
27.4 - <!--
27.5 - - Copyright 2006-2007 Sun Microsystems, Inc. All rights reserved.
27.6 - - SUN PROPRIETARY/CONFIDENTIAL.
27.7 - - Use is subject to license terms.
27.8 - -->
27.9 -
27.10 +<!--
27.11 + - DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
27.12 + -
27.13 + - Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
27.14 + -
27.15 + - The contents of this file are subject to the terms of either the GNU
27.16 + - General Public License Version 2 only ("GPL") or the Common
27.17 + - Development and Distribution License("CDDL") (collectively, the
27.18 + - "License"). You may not use this file except in compliance with the
27.19 + - License. You can obtain a copy of the License at
27.20 + - http://www.netbeans.org/cddl-gplv2.html
27.21 + - or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
27.22 + - specific language governing permissions and limitations under the
27.23 + - License. When distributing the software, include this License Header
27.24 + - Notice in each file and include the License file at
27.25 + - nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
27.26 + - particular file as subject to the "Classpath" exception as provided
27.27 + - by Sun in the GPL Version 2 section of the License file that
27.28 + - accompanied this code. If applicable, add the following below the
27.29 + - License Header, with the fields enclosed by brackets [] replaced by
27.30 + - your own identifying information:
27.31 + - "Portions Copyrighted [year] [name of copyright owner]"
27.32 + -
27.33 + - Contributor(s):
27.34 + -
27.35 + - The Original Software is NetBeans. The Initial Developer of the Original
27.36 + - Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
27.37 + - Microsystems, Inc. All Rights Reserved.
27.38 + -
27.39 + - If you wish your version of this file to be governed by only the CDDL
27.40 + - or only the GPL Version 2, indicate your decision by adding
27.41 + - "[Contributor] elects to include this software in this distribution
27.42 + - under the [CDDL or GPL Version 2] license." If you do not indicate a
27.43 + - single choice of license, a recipient has the option to distribute
27.44 + - your version of this file under either the CDDL, the GPL Version 2 or
27.45 + - to extend the choice of license to its licensees as provided above.
27.46 + - However, if you add GPL Version 2 code and therefore, elected the GPL
27.47 + - Version 2 license, then the option applies only if the new code is
27.48 + - made subject to such option by the copyright holder.
27.49 + -->
27.50 +
27.51 <HTML>
27.52 <head>
27.53 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
28.1 --- a/src/gl_ES/enterprise/j2eeserver/j2eeserver/org/netbeans/modules/j2ee/deployment/impl/ui/actions/Bundle_gl_ES.properties Mon Dec 19 12:18:33 2016 +0100
28.2 +++ b/src/gl_ES/enterprise/j2eeserver/j2eeserver/org/netbeans/modules/j2ee/deployment/impl/ui/actions/Bundle_gl_ES.properties Tue Apr 17 14:14:23 2018 +0200
28.3 @@ -40,12 +40,6 @@
28.4 # Version 2 license, then the option applies only if the new code is
28.5 # made subject to such option by the copyright holder.
28.6
28.7 -## SUN PROPRIETARY/CONFIDENTIAL: INTERNAL USE ONLY.
28.8 -
28.9 -## Copyright 2001 Sun Microsystems, Inc. All rights reserved. Use is
28.10 -## subject to license terms.
28.11 -
28.12 -
28.13 MSG_Server_Instance_Added=Engadiuse correctamente a instancia do servidor "{0}".
28.14
28.15 #StartServerAction
29.1 --- a/src/gl_ES/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-makeproject-ui-resources-samples-fractal_gl_ES.html Mon Dec 19 12:18:33 2016 +0100
29.2 +++ b/src/gl_ES/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-makeproject-ui-resources-samples-fractal_gl_ES.html Tue Apr 17 14:14:23 2018 +0200
29.3 @@ -1,9 +1,44 @@
29.4 - <!--
29.5 - - Copyright 2006-2007 Sun Microsystems, Inc. All rights reserved.
29.6 - - SUN PROPRIETARY/CONFIDENTIAL.
29.7 - - Use is subject to license terms.
29.8 - -->
29.9 -
29.10 +<!--
29.11 + - DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
29.12 + -
29.13 + - Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
29.14 + -
29.15 + - The contents of this file are subject to the terms of either the GNU
29.16 + - General Public License Version 2 only ("GPL") or the Common
29.17 + - Development and Distribution License("CDDL") (collectively, the
29.18 + - "License"). You may not use this file except in compliance with the
29.19 + - License. You can obtain a copy of the License at
29.20 + - http://www.netbeans.org/cddl-gplv2.html
29.21 + - or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
29.22 + - specific language governing permissions and limitations under the
29.23 + - License. When distributing the software, include this License Header
29.24 + - Notice in each file and include the License file at
29.25 + - nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
29.26 + - particular file as subject to the "Classpath" exception as provided
29.27 + - by Sun in the GPL Version 2 section of the License file that
29.28 + - accompanied this code. If applicable, add the following below the
29.29 + - License Header, with the fields enclosed by brackets [] replaced by
29.30 + - your own identifying information:
29.31 + - "Portions Copyrighted [year] [name of copyright owner]"
29.32 + -
29.33 + - Contributor(s):
29.34 + -
29.35 + - The Original Software is NetBeans. The Initial Developer of the Original
29.36 + - Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
29.37 + - Microsystems, Inc. All Rights Reserved.
29.38 + -
29.39 + - If you wish your version of this file to be governed by only the CDDL
29.40 + - or only the GPL Version 2, indicate your decision by adding
29.41 + - "[Contributor] elects to include this software in this distribution
29.42 + - under the [CDDL or GPL Version 2] license." If you do not indicate a
29.43 + - single choice of license, a recipient has the option to distribute
29.44 + - your version of this file under either the CDDL, the GPL Version 2 or
29.45 + - to extend the choice of license to its licensees as provided above.
29.46 + - However, if you add GPL Version 2 code and therefore, elected the GPL
29.47 + - Version 2 license, then the option applies only if the new code is
29.48 + - made subject to such option by the copyright holder.
29.49 + -->
29.50 +
29.51 <HTML>
29.52 <head>
29.53 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
30.1 --- a/src/gl_ES/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-makeproject-ui-resources-samples-hello_gl_ES.html Mon Dec 19 12:18:33 2016 +0100
30.2 +++ b/src/gl_ES/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-makeproject-ui-resources-samples-hello_gl_ES.html Tue Apr 17 14:14:23 2018 +0200
30.3 @@ -1,9 +1,44 @@
30.4 - <!--
30.5 - - Copyright 2006-2007 Sun Microsystems, Inc. All rights reserved.
30.6 - - SUN PROPRIETARY/CONFIDENTIAL.
30.7 - - Use is subject to license terms.
30.8 - -->
30.9 -
30.10 +<!--
30.11 + - DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
30.12 + -
30.13 + - Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
30.14 + -
30.15 + - The contents of this file are subject to the terms of either the GNU
30.16 + - General Public License Version 2 only ("GPL") or the Common
30.17 + - Development and Distribution License("CDDL") (collectively, the
30.18 + - "License"). You may not use this file except in compliance with the
30.19 + - License. You can obtain a copy of the License at
30.20 + - http://www.netbeans.org/cddl-gplv2.html
30.21 + - or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
30.22 + - specific language governing permissions and limitations under the
30.23 + - License. When distributing the software, include this License Header
30.24 + - Notice in each file and include the License file at
30.25 + - nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
30.26 + - particular file as subject to the "Classpath" exception as provided
30.27 + - by Sun in the GPL Version 2 section of the License file that
30.28 + - accompanied this code. If applicable, add the following below the
30.29 + - License Header, with the fields enclosed by brackets [] replaced by
30.30 + - your own identifying information:
30.31 + - "Portions Copyrighted [year] [name of copyright owner]"
30.32 + -
30.33 + - Contributor(s):
30.34 + -
30.35 + - The Original Software is NetBeans. The Initial Developer of the Original
30.36 + - Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
30.37 + - Microsystems, Inc. All Rights Reserved.
30.38 + -
30.39 + - If you wish your version of this file to be governed by only the CDDL
30.40 + - or only the GPL Version 2, indicate your decision by adding
30.41 + - "[Contributor] elects to include this software in this distribution
30.42 + - under the [CDDL or GPL Version 2] license." If you do not indicate a
30.43 + - single choice of license, a recipient has the option to distribute
30.44 + - your version of this file under either the CDDL, the GPL Version 2 or
30.45 + - to extend the choice of license to its licensees as provided above.
30.46 + - However, if you add GPL Version 2 code and therefore, elected the GPL
30.47 + - Version 2 license, then the option applies only if the new code is
30.48 + - made subject to such option by the copyright holder.
30.49 + -->
30.50 +
30.51 <HTML>
30.52 <head>
30.53 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
31.1 --- a/src/gl_ES/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-makeproject-ui-resources-samples-lexyacc_gl_ES.html Mon Dec 19 12:18:33 2016 +0100
31.2 +++ b/src/gl_ES/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-makeproject-ui-resources-samples-lexyacc_gl_ES.html Tue Apr 17 14:14:23 2018 +0200
31.3 @@ -1,9 +1,44 @@
31.4 - <!--
31.5 - - Copyright 2006-2007 Sun Microsystems, Inc. All rights reserved.
31.6 - - SUN PROPRIETARY/CONFIDENTIAL.
31.7 - - Use is subject to license terms.
31.8 - -->
31.9 -
31.10 +<!--
31.11 + - DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
31.12 + -
31.13 + - Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
31.14 + -
31.15 + - The contents of this file are subject to the terms of either the GNU
31.16 + - General Public License Version 2 only ("GPL") or the Common
31.17 + - Development and Distribution License("CDDL") (collectively, the
31.18 + - "License"). You may not use this file except in compliance with the
31.19 + - License. You can obtain a copy of the License at
31.20 + - http://www.netbeans.org/cddl-gplv2.html
31.21 + - or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
31.22 + - specific language governing permissions and limitations under the
31.23 + - License. When distributing the software, include this License Header
31.24 + - Notice in each file and include the License file at
31.25 + - nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
31.26 + - particular file as subject to the "Classpath" exception as provided
31.27 + - by Sun in the GPL Version 2 section of the License file that
31.28 + - accompanied this code. If applicable, add the following below the
31.29 + - License Header, with the fields enclosed by brackets [] replaced by
31.30 + - your own identifying information:
31.31 + - "Portions Copyrighted [year] [name of copyright owner]"
31.32 + -
31.33 + - Contributor(s):
31.34 + -
31.35 + - The Original Software is NetBeans. The Initial Developer of the Original
31.36 + - Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
31.37 + - Microsystems, Inc. All Rights Reserved.
31.38 + -
31.39 + - If you wish your version of this file to be governed by only the CDDL
31.40 + - or only the GPL Version 2, indicate your decision by adding
31.41 + - "[Contributor] elects to include this software in this distribution
31.42 + - under the [CDDL or GPL Version 2] license." If you do not indicate a
31.43 + - single choice of license, a recipient has the option to distribute
31.44 + - your version of this file under either the CDDL, the GPL Version 2 or
31.45 + - to extend the choice of license to its licensees as provided above.
31.46 + - However, if you add GPL Version 2 code and therefore, elected the GPL
31.47 + - Version 2 license, then the option applies only if the new code is
31.48 + - made subject to such option by the copyright holder.
31.49 + -->
31.50 +
31.51 <HTML>
31.52 <head>
31.53 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
32.1 --- a/src/gl_ES/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-makeproject-ui-resources-samples-pi_gl_ES.html Mon Dec 19 12:18:33 2016 +0100
32.2 +++ b/src/gl_ES/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-makeproject-ui-resources-samples-pi_gl_ES.html Tue Apr 17 14:14:23 2018 +0200
32.3 @@ -1,9 +1,44 @@
32.4 - <!--
32.5 - - Copyright 2006-2007 Sun Microsystems, Inc. All rights reserved.
32.6 - - SUN PROPRIETARY/CONFIDENTIAL.
32.7 - - Use is subject to license terms.
32.8 - -->
32.9 -
32.10 +<!--
32.11 + - DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
32.12 + -
32.13 + - Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
32.14 + -
32.15 + - The contents of this file are subject to the terms of either the GNU
32.16 + - General Public License Version 2 only ("GPL") or the Common
32.17 + - Development and Distribution License("CDDL") (collectively, the
32.18 + - "License"). You may not use this file except in compliance with the
32.19 + - License. You can obtain a copy of the License at
32.20 + - http://www.netbeans.org/cddl-gplv2.html
32.21 + - or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
32.22 + - specific language governing permissions and limitations under the
32.23 + - License. When distributing the software, include this License Header
32.24 + - Notice in each file and include the License file at
32.25 + - nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
32.26 + - particular file as subject to the "Classpath" exception as provided
32.27 + - by Sun in the GPL Version 2 section of the License file that
32.28 + - accompanied this code. If applicable, add the following below the
32.29 + - License Header, with the fields enclosed by brackets [] replaced by
32.30 + - your own identifying information:
32.31 + - "Portions Copyrighted [year] [name of copyright owner]"
32.32 + -
32.33 + - Contributor(s):
32.34 + -
32.35 + - The Original Software is NetBeans. The Initial Developer of the Original
32.36 + - Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
32.37 + - Microsystems, Inc. All Rights Reserved.
32.38 + -
32.39 + - If you wish your version of this file to be governed by only the CDDL
32.40 + - or only the GPL Version 2, indicate your decision by adding
32.41 + - "[Contributor] elects to include this software in this distribution
32.42 + - under the [CDDL or GPL Version 2] license." If you do not indicate a
32.43 + - single choice of license, a recipient has the option to distribute
32.44 + - your version of this file under either the CDDL, the GPL Version 2 or
32.45 + - to extend the choice of license to its licensees as provided above.
32.46 + - However, if you add GPL Version 2 code and therefore, elected the GPL
32.47 + - Version 2 license, then the option applies only if the new code is
32.48 + - made subject to such option by the copyright holder.
32.49 + -->
32.50 +
32.51 <HTML>
32.52 <head>
32.53 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
33.1 --- a/src/gl_ES/other/installer/infra/build/web/js/start_strings_gl_ES.js Mon Dec 19 12:18:33 2016 +0100
33.2 +++ b/src/gl_ES/other/installer/infra/build/web/js/start_strings_gl_ES.js Tue Apr 17 14:14:23 2018 +0200
33.3 @@ -59,9 +59,9 @@
33.4 var SUPPORT_LABEL = "Support";
33.5 var SUPPORT_DESCRIPTION = "Flexible support options to help you stay focused on innovation.";
33.6
33.7 -// $PRODUCT_NAME $TYPE (Installer for $PLATFORM/Zip)/$Language ($Language_ID) $filename ($SIZE) MD5: $MD5
33.8 -var INFO_MESSAGE = "{0}{1} {2}/{3} ({4})<br>{5} ({6} MB)<br>MD5: {7}";
33.9 -var INFO_MESSAGE_OTHER = "{0} ({1} MB)<br>MD5: {2}";
33.10 +// $PRODUCT_NAME $TYPE (Installer for $PLATFORM/Zip)/$Language ($Language_ID) $filename ($SIZE) SHA-256: $MD5
33.11 +var INFO_MESSAGE = "{0}{1} {2}/{3} ({4})<br>{5} ({6} MB)<br>SHA-256: {7}";
33.12 +var INFO_MESSAGE_OTHER = "{0} ({1} MB)<br>SHA-256: {2}";
33.13
33.14 //DO NOT TRANSLATE
33.15 var SUBSCRIPTION_PHP_URL = "http://services.netbeans.org/sub.php";
34.1 --- a/src/gl_ES/ruby/ruby/ruby/org/netbeans/modules/ruby/Bundle_gl_ES.properties Mon Dec 19 12:18:33 2016 +0100
34.2 +++ b/src/gl_ES/ruby/ruby/ruby/org/netbeans/modules/ruby/Bundle_gl_ES.properties Tue Apr 17 14:14:23 2018 +0200
34.3 @@ -266,9 +266,6 @@
34.4
34.5 InstalledVersions=Versi\u00f3n(s) instaladas: {0}
34.6
34.7 -# HTTP status codes for code completion,
34.8 -# descriptions taken from http://www.google.com/support/webmasters/bin/answer.py?hl=en&answer=40132 and http://www.w3.org/Protocols/rfc2616/rfc2616-sec10.html
34.9 -
34.10 SC_100=100 (Continuar)
34.11 SC_100_DESC=O solicitante deber\u00eda continuar coa solicitude O servidor devolve este c\u00f3digo para indicar que recibiu a primeira parte dunha solicitude e est\u00e1 agardando o resto.
34.12 SC_101=101 (Conmutando protocolos)
35.1 --- a/src/hi_IN/other/installer/infra/build/web/js/start_strings_hi_IN.js Mon Dec 19 12:18:33 2016 +0100
35.2 +++ b/src/hi_IN/other/installer/infra/build/web/js/start_strings_hi_IN.js Tue Apr 17 14:14:23 2018 +0200
35.3 @@ -59,9 +59,9 @@
35.4 var SUPPORT_LABEL = "Support";
35.5 var SUPPORT_DESCRIPTION = "Flexible support options to help you stay focused on innovation.";
35.6
35.7 -// $PRODUCT_NAME $TYPE (Installer for $PLATFORM/Zip)/$Language ($Language_ID) $filename ($SIZE) MD5: $MD5
35.8 -var INFO_MESSAGE = "{0}{1} {2}/{3} ({4})<br>{5} ({6} MB)<br>MD5: {7}";
35.9 -var INFO_MESSAGE_OTHER = "{0} ({1} MB)<br>MD5: {2}";
35.10 +// $PRODUCT_NAME $TYPE (Installer for $PLATFORM/Zip)/$Language ($Language_ID) $filename ($SIZE) SHA-256: $MD5
35.11 +var INFO_MESSAGE = "{0}{1} {2}/{3} ({4})<br>{5} ({6} MB)<br>SHA-256: {7}";
35.12 +var INFO_MESSAGE_OTHER = "{0} ({1} MB)<br>SHA-256: {2}";
35.13
35.14 //DO NOT TRANSLATE
35.15 var SUBSCRIPTION_PHP_URL = "http://services.netbeans.org/sub.php";
36.1 --- a/src/in_ID/other/installer/infra/build/web/js/start_strings_in_ID.js Mon Dec 19 12:18:33 2016 +0100
36.2 +++ b/src/in_ID/other/installer/infra/build/web/js/start_strings_in_ID.js Tue Apr 17 14:14:23 2018 +0200
36.3 @@ -59,9 +59,9 @@
36.4 var SUPPORT_LABEL = "Support";
36.5 var SUPPORT_DESCRIPTION = "Flexible support options to help you stay focused on innovation.";
36.6
36.7 -// $PRODUCT_NAME $TYPE (Installer for $PLATFORM/Zip)/$Language ($Language_ID) $filename ($SIZE) MD5: $MD5
36.8 -var INFO_MESSAGE = "{0}{1} {2}/{3} ({4})<br>{5} ({6} MB)<br>MD5: {7}";
36.9 -var INFO_MESSAGE_OTHER = "{0} ({1} MB)<br>MD5: {2}";
36.10 +// $PRODUCT_NAME $TYPE (Installer for $PLATFORM/Zip)/$Language ($Language_ID) $filename ($SIZE) SHA-256: $MD5
36.11 +var INFO_MESSAGE = "{0}{1} {2}/{3} ({4})<br>{5} ({6} MB)<br>SHA-256: {7}";
36.12 +var INFO_MESSAGE_OTHER = "{0} ({1} MB)<br>SHA-256: {2}";
36.13
36.14 //DO NOT TRANSLATE
36.15 var SUBSCRIPTION_PHP_URL = "http://services.netbeans.org/sub.php";
37.1 --- a/src/it/other/installer/infra/build/web/js/start_strings_it.js Mon Dec 19 12:18:33 2016 +0100
37.2 +++ b/src/it/other/installer/infra/build/web/js/start_strings_it.js Tue Apr 17 14:14:23 2018 +0200
37.3 @@ -59,9 +59,9 @@
37.4 var SUPPORT_LABEL = "Support";
37.5 var SUPPORT_DESCRIPTION = "Flexible support options to help you stay focused on innovation.";
37.6
37.7 -// $PRODUCT_NAME $TYPE (Installer for $PLATFORM/Zip)/$Language ($Language_ID) $filename ($SIZE) MD5: $MD5
37.8 -var INFO_MESSAGE = "{0}{1} {2}/{3} ({4})<br>{5} ({6} MB)<br>MD5: {7}";
37.9 -var INFO_MESSAGE_OTHER = "{0} ({1} MB)<br>MD5: {2}";
37.10 +// $PRODUCT_NAME $TYPE (Installer for $PLATFORM/Zip)/$Language ($Language_ID) $filename ($SIZE) SHA-256: $MD5
37.11 +var INFO_MESSAGE = "{0}{1} {2}/{3} ({4})<br>{5} ({6} MB)<br>SHA-256: {7}";
37.12 +var INFO_MESSAGE_OTHER = "{0} ({1} MB)<br>SHA-256: {2}";
37.13
37.14 //DO NOT TRANSLATE
37.15 var SUBSCRIPTION_PHP_URL = "http://services.netbeans.org/sub.php";
38.1 --- a/src/ja/cnd/cnd-completion/cnd-completion/org/netbeans/modules/cnd/completion/cplusplus/Bundle_ja.properties Mon Dec 19 12:18:33 2016 +0100
38.2 +++ b/src/ja/cnd/cnd-completion/cnd-completion/org/netbeans/modules/cnd/completion/cplusplus/Bundle_ja.properties Tue Apr 17 14:14:23 2018 +0200
38.3 @@ -68,3 +68,6 @@
38.4 goto-implementation=\u30aa\u30fc\u30d0\u30fc\u30e9\u30a4\u30c9/\u30aa\u30fc\u30d0\u30fc\u30e9\u30a4\u30c9\u6e08\u3078\u79fb\u52d5
38.5 goto-implementation-text=\u30aa\u30fc\u30d0\u30fc\u30e9\u30a4\u30c9/\u30aa\u30fc\u30d0\u30fc\u30e9\u30a4\u30c9\u6e08\u3078\u79fb\u52d5(&I)
38.6
38.7 +DocProvider.source-code=\u30bd\u30fc\u30b9\u30fb\u30b3\u30fc\u30c9
38.8 +DocProvider.manual=\u30de\u30cb\u30e5\u30a2\u30eb\u30fb\u30da\u30fc\u30b8
38.9 +
39.1 --- a/src/ja/cnd/cnd-completion/cnd-completion/org/netbeans/modules/cnd/completion/options/Bundle_ja.properties Mon Dec 19 12:18:33 2016 +0100
39.2 +++ b/src/ja/cnd/cnd-completion/cnd-completion/org/netbeans/modules/cnd/completion/options/Bundle_ja.properties Tue Apr 17 14:14:23 2018 +0200
39.3 @@ -39,4 +39,8 @@
39.4 CodeCompletionPanel.autoCompletionTriggersLabel.text=C/C++\u8b58\u5225\u5b50\u3067\u306e\u81ea\u52d5\u30dd\u30c3\u30d7\u30a2\u30c3\u30d7\u306e\u30c8\u30ea\u30ac\u30fc(&A):
39.5 CodeCompletionPanel.autoInclude.text=\u88dc\u5b8c\u3055\u308c\u305f\u8b58\u5225\u5b50\u306e\u305f\u3081\u306b#include\u30c7\u30a3\u30ec\u30af\u30c6\u30a3\u30d6\u3092\u81ea\u52d5\u633f\u5165(&D)
39.6 CodeCompletionPanel.autoCompletionTriggersPreprocLabel.text=#include\u30c7\u30a3\u30ec\u30af\u30c6\u30a3\u30d6\u3067\u306e\u81ea\u52d5\u30dd\u30c3\u30d7\u30a2\u30c3\u30d7\u306e\u30c8\u30ea\u30ac\u30fc(&P)
39.7 +CodeCompletionPanel.docimentationListLabel.text=\u30c9\u30ad\u30e5\u30e1\u30f3\u30c8\u306e\u53d6\u5f97\u5143
39.8 +CodeCompletionPanel.documentationCheckBox.text=\u30c9\u30ad\u30e5\u30e1\u30f3\u30c8\u8a2d\u5b9a
39.9 +CodeCompletionPanel.upButton.text=\u4e0a
39.10 +CodeCompletionPanel.downButton.text=\u4e0b
39.11
40.1 --- a/src/ja/cnd/cnd-debugger-common2/cnd-debugger-common2/org/netbeans/modules/cnd/debugger/common2/debugger/Bundle_ja.properties Mon Dec 19 12:18:33 2016 +0100
40.2 +++ b/src/ja/cnd/cnd-debugger-common2/cnd-debugger-common2/org/netbeans/modules/cnd/debugger/common2/debugger/Bundle_ja.properties Tue Apr 17 14:14:23 2018 +0200
40.3 @@ -264,6 +264,7 @@
40.4 HINT_address=\u5909\u6570\u306e\u30a2\u30c9\u30ec\u30b9
40.5 ACT_Variable_Watch=\u30a6\u30a9\u30c3\u30c1
40.6 MSG_Show_More_Message=\u8868\u793a\u306e\u8ffd\u52a0
40.7 +CTL_WatchAction_ShowPinned=\u56fa\u5b9a\u30a6\u30a9\u30c3\u30c1\u306e\u8868\u793a
40.8
40.9 #
40.10 # Error messages
41.1 --- a/src/ja/cnd/cnd-debugger-common2/cnd-debugger-common2/org/netbeans/modules/cnd/debugger/common2/debugger/actions/Bundle_ja.properties Mon Dec 19 12:18:33 2016 +0100
41.2 +++ b/src/ja/cnd/cnd-debugger-common2/cnd-debugger-common2/org/netbeans/modules/cnd/debugger/common2/debugger/actions/Bundle_ja.properties Tue Apr 17 14:14:23 2018 +0200
41.3 @@ -68,10 +68,10 @@
41.4 HostName=\u30db\u30b9\u30c8\u540d
41.5 FromProcess=<\u30d7\u30ed\u30bb\u30b9\u304b\u3089>
41.6
41.7 -All_Processes_Lab=\u3059\u3079\u3066\u306e\u30e6\u30fc\u30b6\u30fc\u306e\u30d7\u30ed\u30bb\u30b9
41.8 -All_Processes=\u5168\u30e6\u30fc\u30b6\u30fc\u306e\u3059\u3079\u3066\u306e\u30d7\u30ed\u30bb\u30b9\u3092\u53d6\u5f97\u3059\u308b\u5834\u5408\u306f\u30c1\u30a7\u30c3\u30af
41.9 +All_Processes_Lab=\u30e6\u30fc\u30b6\u30fc\u30fb\u30d7\u30ed\u30bb\u30b9\u306e\u307f
41.10 +All_Processes=\u30e6\u30fc\u30b6\u30fc\u30fb\u30d7\u30ed\u30bb\u30b9\u306e\u307f\u3092\u53d6\u5f97\u3059\u308b\u5834\u5408\u306f\u30c1\u30a7\u30c3\u30af
41.11
41.12 -ACSD_All_Processes=\u5168\u30e6\u30fc\u30b6\u30fc\u306e\u3059\u3079\u3066\u306e\u30d7\u30ed\u30bb\u30b9\u3092\u53d6\u5f97\u3059\u308b\u5834\u5408\u306f\u30c1\u30a7\u30c3\u30af
41.13 +ACSD_All_Processes=\u73fe\u5728\u306e\u30e6\u30fc\u30b6\u30fc\u30fb\u30d7\u30ed\u30bb\u30b9\u306e\u307f\u3092\u53d6\u5f97\u3059\u308b\u5834\u5408\u306f\u30c1\u30a7\u30c3\u30af
41.14
41.15
41.16 ACSD_EditHosts=\u30db\u30b9\u30c8\u4e00\u89a7\u3092\u7de8\u96c6
42.1 --- a/src/ja/cnd/cnd-debugger-common2/cnd-debugger-common2/org/netbeans/modules/cnd/debugger/common2/debugger/assembly/Bundle_ja.properties Mon Dec 19 12:18:33 2016 +0100
42.2 +++ b/src/ja/cnd/cnd-debugger-common2/cnd-debugger-common2/org/netbeans/modules/cnd/debugger/common2/debugger/assembly/Bundle_ja.properties Tue Apr 17 14:14:23 2018 +0200
42.3 @@ -60,6 +60,7 @@
42.4 Reg_ACT_Show_All_Registers=\u3059\u3079\u3066\u306e\u30ec\u30b8\u30b9\u30bf\u3092\u8868\u793a
42.5 Reg_ACT_Hide=\u9078\u629e\u3057\u305f\u30ec\u30b8\u30b9\u30bf\u3092\u975e\u8868\u793a
42.6 Reg_ACT_More_Info=\u8a73\u7d30\u60c5\u5831
42.7 +Reg_ACT_Data_Presentation=\u30c7\u30fc\u30bf\u8868\u73fe
42.8
42.9 #
42.10 # OW: Memory window, Evaluation window
43.1 --- a/src/ja/cnd/cnd-debugger-common2/cnd-debugger-common2/org/netbeans/modules/cnd/debugger/common2/debugger/options/Bundle_ja.properties Mon Dec 19 12:18:33 2016 +0100
43.2 +++ b/src/ja/cnd/cnd-debugger-common2/cnd-debugger-common2/org/netbeans/modules/cnd/debugger/common2/debugger/options/Bundle_ja.properties Tue Apr 17 14:14:23 2018 +0200
43.3 @@ -326,6 +326,13 @@
43.4 ACSD_balloon_eval_on=\u30d0\u30eb\u30fc\u30f3\u5f0f\u8a55\u4fa1\u3092\u6709\u52b9\u5316
43.5 ACSD_balloon_eval_off=\u30d0\u30eb\u30fc\u30f3\u5f0f\u8a55\u4fa1\u3092\u7121\u52b9\u5316
43.6
43.7 +LABEL_args_values_in_stack=\u300c\u547c\u51fa\u3057\u30b9\u30bf\u30c3\u30af\u300d\u30a6\u30a3\u30f3\u30c9\u30a6\u3068\u300c\u30c7\u30d0\u30c3\u30b0\u8868\u793a\u300d\u30a6\u30a3\u30f3\u30c9\u30a6\u306b\u5f15\u6570\u306e\u5024\u3092\u8868\u793a
43.8 +ACSD_args_values_in_stack=\u300c\u547c\u51fa\u3057\u30b9\u30bf\u30c3\u30af\u300d\u30a6\u30a3\u30f3\u30c9\u30a6\u3068\u300c\u30c7\u30d0\u30c3\u30b0\u8868\u793a\u300d\u30a6\u30a3\u30f3\u30c9\u30a6\u306b\u5f15\u6570\u306e\u5024\u3092\u8868\u793a
43.9 +
43.10 +ACSD_args_values_in_stack_on=\u300c\u300c\u547c\u51fa\u3057\u30b9\u30bf\u30c3\u30af\u300d\u30a6\u30a3\u30f3\u30c9\u30a6\u3068\u300c\u30c7\u30d0\u30c3\u30b0\u8868\u793a\u300d\u30a6\u30a3\u30f3\u30c9\u30a6\u306b\u5f15\u6570\u306e\u5024\u3092\u8868\u793a\u300d\u3092\u6709\u52b9\u5316
43.11 +ACSD_args_values_in_stack_off=\u300c\u300c\u547c\u51fa\u3057\u30b9\u30bf\u30c3\u30af\u300d\u30a6\u30a3\u30f3\u30c9\u30a6\u3068\u300c\u30c7\u30d0\u30c3\u30b0\u8868\u793a\u300d\u30a6\u30a3\u30f3\u30c9\u30a6\u306b\u5f15\u6570\u306e\u5024\u3092\u8868\u793a\u300d\u3092\u7121\u52b9\u5316
43.12 +
43.13 +
43.14 LABEL_save_breakpoints=\u30d6\u30ec\u30fc\u30af\u30dd\u30a4\u30f3\u30c8\u306e\u4fdd\u5b58\u3068\u5fa9\u5143
43.15 ACSD_save_breakpoints=\u30d6\u30ec\u30fc\u30af\u30dd\u30a4\u30f3\u30c8\u306e\u4fdd\u5b58\u3068\u5fa9\u5143
43.16
44.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
44.2 +++ b/src/ja/cnd/cnd-debugger-common2/cnd-debugger-common2/org/netbeans/modules/cnd/debugger/common2/ui/Bundle_ja.properties Tue Apr 17 14:14:23 2018 +0200
44.3 @@ -0,0 +1,151 @@
44.4 +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
44.5 +#
44.6 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
44.7 +#
44.8 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
44.9 +# Other names may be trademarks of their respective owners.
44.10 +#
44.11 +# The contents of this file are subject to the terms of either the GNU
44.12 +# General Public License Version 2 only ("GPL") or the Common
44.13 +# Development and Distribution License("CDDL") (collectively, the
44.14 +# "License"). You may not use this file except in compliance with the
44.15 +# License. You can obtain a copy of the License at
44.16 +# http://www.netbeans.org/cddl-gplv2.html
44.17 +# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
44.18 +# specific language governing permissions and limitations under the
44.19 +# License. When distributing the software, include this License Header
44.20 +# Notice in each file and include the License file at
44.21 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
44.22 +# particular file as subject to the "Classpath" exception as provided
44.23 +# by Oracle in the GPL Version 2 section of the License file that
44.24 +# accompanied this code. If applicable, add the following below the
44.25 +# License Header, with the fields enclosed by brackets [] replaced by
44.26 +# your own identifying information:
44.27 +# "Portions Copyrighted [year] [name of copyright owner]"
44.28 +#
44.29 +# Contributor(s):
44.30 +#
44.31 +# The Original Software is NetBeans. The Initial Developer of the Original
44.32 +# Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
44.33 +# Microsystems, Inc. All Rights Reserved.
44.34 +#
44.35 +# If you wish your version of this file to be governed by only the CDDL
44.36 +# or only the GPL Version 2, indicate your decision by adding
44.37 +# "[Contributor] elects to include this software in this distribution
44.38 +# under the [CDDL or GPL Version 2] license." If you do not indicate a
44.39 +# single choice of license, a recipient has the option to distribute
44.40 +# your version of this file under either the CDDL, the GPL Version 2 or
44.41 +# to extend the choice of license to its licensees as provided above.
44.42 +# However, if you add GPL Version 2 code and therefore, elected the GPL
44.43 +# Version 2 license, then the option applies only if the new code is
44.44 +# made subject to such option by the copyright holder.
44.45 +
44.46 +# OLD #
44.47 +# OLD # AttachDialogAction
44.48 +# OLD #
44.49 +# OLD ATTACHDIALOG_ACTION_NAME=&Attach...
44.50 +
44.51 +ACSD_OK=OK
44.52 +ACSD_Cancel=\u53d6\u6d88
44.53 +
44.54 +#
44.55 +# AttachPanel
44.56 +#
44.57 +Refresh=\u30ea\u30d5\u30ec\u30c3\u30b7\u30e5
44.58 +
44.59 +ACSD_Refresh=\u30d7\u30ed\u30bb\u30b9\u30fb\u30ea\u30b9\u30c8\u3092\u30ea\u30d5\u30ec\u30c3\u30b7\u30e5
44.60 +
44.61 +CTL_Attach=\u30c7\u30d0\u30c3\u30ac\u3092\u30a2\u30bf\u30c3\u30c1
44.62 +ACSD_CTL_AttachToProcess=\u5b9f\u884c\u4e2d\u306e\u4efb\u610f\u306e\u30d7\u30ed\u30bb\u30b9\u3078\u306e\u30a2\u30bf\u30c3\u30c1\u3092\u8a31\u53ef\u3057\u307e\u3059
44.63 +AttachProcDiag_FilterColon=\u30d5\u30a3\u30eb\u30bf:
44.64 +
44.65 +AttachProcDiag_HostColon=\u30db\u30b9\u30c8:
44.66 +
44.67 +AttachProcDiag_Table=\u30a2\u30bf\u30c3\u30c1\u3059\u308b\u30d7\u30ed\u30bb\u30b9:
44.68 +
44.69 +ACSD_AttachProcDiag_Table=\u4f7f\u7528\u53ef\u80fd\u306a\u30d7\u30ed\u30bb\u30b9\u306e\u4e00\u89a7
44.70 +RegExp=\u6b63\u898f\u8868\u73fe
44.71 +HostName=\u30db\u30b9\u30c8\u540d
44.72 +FromProcess=<\u30d7\u30ed\u30bb\u30b9\u304b\u3089>
44.73 +
44.74 +All_Processes_Lab=\u30e6\u30fc\u30b6\u30fc\u30fb\u30d7\u30ed\u30bb\u30b9\u306e\u307f
44.75 +All_Processes=\u30e6\u30fc\u30b6\u30fc\u30fb\u30d7\u30ed\u30bb\u30b9\u306e\u307f\u3092\u53d6\u5f97\u3059\u308b\u5834\u5408\u306f\u30c1\u30a7\u30c3\u30af
44.76 +
44.77 +ACSD_All_Processes=\u73fe\u5728\u306e\u30e6\u30fc\u30b6\u30fc\u30fb\u30d7\u30ed\u30bb\u30b9\u306e\u307f\u3092\u53d6\u5f97\u3059\u308b\u5834\u5408\u306f\u30c1\u30a7\u30c3\u30af
44.78 +
44.79 +
44.80 +ACSD_EditHosts=\u30db\u30b9\u30c8\u4e00\u89a7\u3092\u7de8\u96c6
44.81 +
44.82 +ACSD_Engine=\u30c7\u30d0\u30c3\u30b0\u30fb\u30a8\u30f3\u30b8\u30f3
44.83 +ACSD_Debugging_Engine=\u30c7\u30d0\u30c3\u30b0\u30fb\u30a8\u30f3\u30b8\u30f3
44.84 +ASSOCIATED_ENGINE_LBL=\u30c7\u30d0\u30c3\u30b0\u30fb\u30a8\u30f3\u30b8\u30f3:
44.85 +
44.86 +ERROR_WRONG_FAMILY=\u8b66\u544a: \u9078\u629e\u3057\u305f\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u306f\u3001\u3053\u306e\u30c7\u30d0\u30c3\u30ac\u7528\u306b\u69cb\u6210\u3055\u308c\u3066\u3044\u307e\u305b\u3093
44.87 +MSG_Uninitialized_Process_Table=\u30d7\u30ed\u30bb\u30b9\u8868\u306f\u307e\u3060\u521d\u671f\u5316\u3055\u308c\u3066\u3044\u307e\u305b\u3093
44.88 +
44.89 +MSG_Gathering_Data=\u30c7\u30fc\u30bf\u3092\u53ce\u96c6\u3057\u3066\u3044\u307e\u3059...
44.90 +MSG_PS_Failed=ps\u304c\u5931\u6557\u3057\u307e\u3057\u305f\u3002\u8a73\u7d30\u306f\u30ed\u30b0\u3092\u53c2\u7167\u3057\u3066\u304f\u3060\u3055\u3044
44.91 +
44.92 +#
44.93 +# DebugCorePanel & ExecutableProjectPanel (used in AttachDialog)
44.94 +#
44.95 +
44.96 +ACSD_ExecutableBrowse=\u5b9f\u884c\u53ef\u80fd\u30d5\u30a1\u30a4\u30eb\u3092\u53c2\u7167
44.97 +
44.98 +
44.99 +RUN_PROFILE_LBL=\u5b9f\u884c\u30d7\u30ed\u30d5\u30a1\u30a4\u30eb:
44.100 +
44.101 +RUN_PROFILES_BUTTON_TXT=\u7de8\u96c6...
44.102 +CHOOSER_BUTTON=\u9078\u629e
44.103 +DEFAULT_SET_TITLE=\u30c7\u30d5\u30a9\u30eb\u30c8\u30fb\u30bb\u30c3\u30c8
44.104 +NEW_PROJECT=<\u65b0\u898f\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u3092\u4f5c\u6210>
44.105 +NO_PROJECT=<\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u304c\u3042\u308a\u307e\u305b\u3093>
44.106 +DBG_ERROR_DONTEXIST=\u9078\u629e\u3057\u305f\u5b9f\u884c\u53ef\u80fd\u30d5\u30a1\u30a4\u30eb\u306f\u5b58\u5728\u3057\u307e\u305b\u3093\u3002\u3053\u306e\u30c7\u30d0\u30c3\u30ac\u306b\u306f\u30a2\u30bf\u30c3\u30c1\u5148\u3068\u3057\u3066\u6709\u52b9\u306a\u5b9f\u884c\u53ef\u80fd\u30d5\u30a1\u30a4\u30eb\u304c\u5fc5\u8981\u3067\u3059
44.107 +// OLD GDB_ERROR_DONTAPPLY=dbxtool does not allow gdb debugger
44.108 +ERROR_NEED_EXEC=\u3053\u306e\u30c7\u30d0\u30c3\u30ac\u306b\u306f\u30a2\u30bf\u30c3\u30c1\u5148\u3068\u3057\u3066\u5b9f\u884c\u53ef\u80fd\u30d5\u30a1\u30a4\u30eb\u540d\u304c\u5fc5\u8981\u3067\u3059
44.109 +ERROR_DONTAPPLY=\u3053\u306e\u30c7\u30d0\u30c3\u30ac\u306f\u30b5\u30dd\u30fc\u30c8\u3055\u308c\u3066\u3044\u307e\u305b\u3093
44.110 +DBX_ERROR_DONTAPPLY=gdbtool\u3067\u306fdbx\u30c7\u30d0\u30c3\u30ac\u3092\u4f7f\u7528\u3067\u304d\u307e\u305b\u3093
44.111 +ERROR_DONTEXIST=\u9078\u629e\u3057\u305f\u5b9f\u884c\u53ef\u80fd\u30d5\u30a1\u30a4\u30eb\u306f\u5b58\u5728\u3057\u307e\u305b\u3093
44.112 +ERROR_NOTAEXEFILE=\u9078\u629e\u3057\u305f\u30d5\u30a1\u30a4\u30eb\u306f\u5b9f\u884c\u53ef\u80fd\u30d5\u30a1\u30a4\u30eb\u3067\u306f\u3042\u308a\u307e\u305b\u3093
44.113 +ProgramPathname=\u3053\u306e\u30c7\u30d0\u30c3\u30ac\u3067\u306f\u3001\u4ee5\u524d\u306e\u30bb\u30c3\u30b7\u30e7\u30f3\u3067\u4fdd\u5b58\u3057\u305f\u30d6\u30ec\u30fc\u30af\u30dd\u30a4\u30f3\u30c8\u3092\u5fa9\u5143\u3067\u304d\u307e\u3059
44.114 +
44.115 +#
44.116 +# DebugProjectAction
44.117 +#
44.118 +# LBL_LoadProgram=Load program
44.119 +LBL_LoadProgram=\u30d7\u30ed\u30b0\u30e9\u30e0\u3092\u30ed\u30fc\u30c9\u3059\u308b...
44.120 +LBL_Start=\u30e1\u30a4\u30f3\u30fb\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u3092\u30c7\u30d0\u30c3\u30b0
44.121 +LBL_Continue=\u7d9a\u884c(&C)
44.122 +CoreExeChooser=\u5b9f\u884c\u53ef\u80fd\u30d5\u30a1\u30a4\u30eb\u3092\u9078\u629e
44.123 +
44.124 +#
44.125 +# DebuggingOptionsAction
44.126 +#
44.127 +CTL_DebuggingOptions=\u30c7\u30d0\u30c3\u30b0\u30fb\u30aa\u30d7\u30b7\u30e7\u30f3(&D)...
44.128 +
44.129 +#
44.130 +# DetachAction
44.131 +#
44.132 +LBL_Detach=\u30c7\u30d0\u30c3\u30ac\u306e\u30c7\u30bf\u30c3\u30c1(&D)
44.133 +
44.134 +#
44.135 +
44.136 +OUTPUT_ATTACH_ACTION_TEXT=\u30c7\u30d0\u30c3\u30ac\u3092\u30a2\u30bf\u30c3\u30c1
44.137 +
44.138 +ATTACH_HISTORY_MESSAGE=\u30d7\u30ed\u30bb\u30b9{0}@{1}\u306b\u30a2\u30bf\u30c3\u30c1
44.139 +
44.140 +
44.141 +PROGRESS_PREPARE_TARGET=\u30a2\u30bf\u30c3\u30c1\u3059\u308b\u30bf\u30fc\u30b2\u30c3\u30c8\u306e\u6e96\u5099\u4e2d...
44.142 +DebugCorePanel.Validating=\u691c\u67fb\u4e2d...
44.143 +DebugCorePanel.HOST_IS_NOT_VALID=\u30db\u30b9\u30c8\u304c\u63a5\u7d9a\u3055\u308c\u3066\u3044\u307e\u305b\u3093
44.144 +
44.145 +ACSD_Project=\u4f7f\u7528\u3059\u308b\u30d7\u30ed\u30b8\u30a7\u30af\u30c8
44.146 +
44.147 +#
44.148 +# DebugFileAction
44.149 +#
44.150 +TITLE_Hosts=\u30db\u30b9\u30c8...
44.151 +
44.152 +HOST_LBL=\u30db\u30b9\u30c8:
44.153 +ExecutableProjectPanel.commandLine_N_A.text=<\u4f7f\u7528\u4e0d\u53ef>
44.154 +
45.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
45.2 +++ b/src/ja/cnd/cnd-debugger-common2/cnd-debugger-common2/org/netbeans/modules/cnd/debugger/common2/ui/processlist/Bundle_ja.properties Tue Apr 17 14:14:23 2018 +0200
45.3 @@ -0,0 +1,88 @@
45.4 +ProcessListPanel.filterLabel.text=\u30d5\u30a3\u30eb\u30bf(&F):
45.5 +ProcessListPanel.refreshBtn.text=\u30ea\u30d5\u30ec\u30c3\u30b7\u30e5(&R)
45.6 +ProcessListPanel.refreshBtn.toolTipText=\u30d7\u30ed\u30bb\u30b9\u30fb\u30ea\u30b9\u30c8\u3092\u30ea\u30d5\u30ec\u30c3\u30b7\u30e5
45.7 +ProcessInfoPanel.jLabel1.text=\u30b3\u30de\u30f3\u30c9\u884c:
45.8 +ProcessInfoPanel.commandLine_N_A.text=<\u4f7f\u7528\u4e0d\u53ef>
45.9 +WaitNode.displayName=\u5f85\u6a5f\u4e2d...
45.10 +ProcessListPanel.jToggleButton1.text=jToggleButton1
45.11 +ProcessListPanel.label=\u30c4\u30ea\u30fc
45.12 +ProcessListPanel.toolTipText=\u30c4\u30ea\u30fc\u30fb\u30e2\u30fc\u30c9
45.13 +
45.14 +ProcessListPanel.listTogleButton.toolTipText=\u30ea\u30b9\u30c8\u30fb\u30e2\u30fc\u30c9
45.15 +
45.16 +ProcessListPanel.outlineHeaderName=PID
45.17 +ProcessListPanel.userProcessesOnlyCheckBox.text=\u30e6\u30fc\u30b6\u30fc\u30fb\u30d7\u30ed\u30bb\u30b9\u306e\u307f\u3092\u8868\u793a
45.18 +
45.19 +#
45.20 +# DebugExecutableNodeAction
45.21 +#
45.22 +DEBUG_DIALOG_TITLE=\u5b9f\u884c\u53ef\u80fd\u30d5\u30a1\u30a4\u30eb\u3092\u30c7\u30d0\u30c3\u30b0
45.23 +DEBUG_ACTION_NAME=\u30c7\u30d0\u30c3\u30b0
45.24 +
45.25 +#
45.26 +# DebugFileAction
45.27 +#
45.28 +TITLE_Hosts=\u30db\u30b9\u30c8...
45.29 +
45.30 +HOST_LBL=\u30db\u30b9\u30c8:
45.31 +
45.32 +#
45.33 +# AttachPanel
45.34 +#
45.35 +Refresh=\u30ea\u30d5\u30ec\u30c3\u30b7\u30e5
45.36 +
45.37 +ACSD_Refresh=\u30d7\u30ed\u30bb\u30b9\u30fb\u30ea\u30b9\u30c8\u3092\u30ea\u30d5\u30ec\u30c3\u30b7\u30e5
45.38 +
45.39 +CTL_Attach=\u30c7\u30d0\u30c3\u30ac\u3092\u30a2\u30bf\u30c3\u30c1
45.40 +ACSD_CTL_AttachToProcess=\u5b9f\u884c\u4e2d\u306e\u4efb\u610f\u306e\u30d7\u30ed\u30bb\u30b9\u3078\u306e\u30a2\u30bf\u30c3\u30c1\u3092\u8a31\u53ef\u3057\u307e\u3059
45.41 +AttachProcDiag_FilterColon=\u30d5\u30a3\u30eb\u30bf:
45.42 +
45.43 +AttachProcDiag_HostColon=\u30db\u30b9\u30c8:
45.44 +
45.45 +AttachProcDiag_Table=\u30a2\u30bf\u30c3\u30c1\u3059\u308b\u30d7\u30ed\u30bb\u30b9:
45.46 +
45.47 +ACSD_AttachProcDiag_Table=\u4f7f\u7528\u53ef\u80fd\u306a\u30d7\u30ed\u30bb\u30b9\u306e\u4e00\u89a7
45.48 +RegExp=\u6b63\u898f\u8868\u73fe
45.49 +HostName=\u30db\u30b9\u30c8\u540d
45.50 +FromProcess=<\u30d7\u30ed\u30bb\u30b9\u304b\u3089>
45.51 +
45.52 +All_Processes_Lab=\u30e6\u30fc\u30b6\u30fc\u30fb\u30d7\u30ed\u30bb\u30b9\u306e\u307f
45.53 +All_Processes=\u30e6\u30fc\u30b6\u30fc\u30fb\u30d7\u30ed\u30bb\u30b9\u306e\u307f\u3092\u53d6\u5f97\u3059\u308b\u5834\u5408\u306f\u30c1\u30a7\u30c3\u30af
45.54 +
45.55 +ACSD_All_Processes=\u73fe\u5728\u306e\u30e6\u30fc\u30b6\u30fc\u30fb\u30d7\u30ed\u30bb\u30b9\u306e\u307f\u3092\u53d6\u5f97\u3059\u308b\u5834\u5408\u306f\u30c1\u30a7\u30c3\u30af
45.56 +
45.57 +
45.58 +ACSD_EditHosts=\u30db\u30b9\u30c8\u4e00\u89a7\u3092\u7de8\u96c6
45.59 +
45.60 +ACSD_Engine=\u30c7\u30d0\u30c3\u30b0\u30fb\u30a8\u30f3\u30b8\u30f3
45.61 +ACSD_Debugging_Engine=\u30c7\u30d0\u30c3\u30b0\u30fb\u30a8\u30f3\u30b8\u30f3
45.62 +ASSOCIATED_ENGINE_LBL=\u30c7\u30d0\u30c3\u30b0\u30fb\u30a8\u30f3\u30b8\u30f3:
45.63 +
45.64 +ERROR_WRONG_FAMILY=\u8b66\u544a: \u9078\u629e\u3057\u305f\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u306f\u3001\u3053\u306e\u30c7\u30d0\u30c3\u30ac\u7528\u306b\u69cb\u6210\u3055\u308c\u3066\u3044\u307e\u305b\u3093
45.65 +MSG_Uninitialized_Process_Table=\u30d7\u30ed\u30bb\u30b9\u8868\u306f\u307e\u3060\u521d\u671f\u5316\u3055\u308c\u3066\u3044\u307e\u305b\u3093
45.66 +
45.67 +MSG_Gathering_Data=\u30c7\u30fc\u30bf\u3092\u53ce\u96c6\u3057\u3066\u3044\u307e\u3059...
45.68 +MSG_PS_Failed=ps\u304c\u5931\u6557\u3057\u307e\u3057\u305f\u3002\u8a73\u7d30\u306f\u30ed\u30b0\u3092\u53c2\u7167\u3057\u3066\u304f\u3060\u3055\u3044
45.69 +
45.70 +
45.71 +# OLD #
45.72 +# OLD # Debug->Windows menu stuff
45.73 +# OLD #
45.74 +# OLD
45.75 +# OLD CTL_DebugWindowsMenuAction=Windows
45.76 +# OLD MNEM_DebugWindowsMenuAction=W
45.77 +
45.78 +OUTPUT_ATTACH_ACTION_TEXT=\u30c7\u30d0\u30c3\u30ac\u3092\u30a2\u30bf\u30c3\u30c1
45.79 +
45.80 +ATTACH_HISTORY_MESSAGE=\u30d7\u30ed\u30bb\u30b9{0}@{1}\u306b\u30a2\u30bf\u30c3\u30c1
45.81 +
45.82 +Dis_ACT_Go_To_Source=\u30bd\u30fc\u30b9\u30fb\u30b3\u30fc\u30c9\u3078\u79fb\u52d5
45.83 +Dis_ACT_Show_Current_Statement=\u73fe\u5728\u306e\u6587\u3092\u8868\u793a
45.84 +
45.85 +PROGRESS_PREPARE_TARGET=\u30a2\u30bf\u30c3\u30c1\u3059\u308b\u30bf\u30fc\u30b2\u30c3\u30c8\u306e\u6e96\u5099\u4e2d...
45.86 +DebugCorePanel.Validating=\u691c\u67fb\u4e2d...
45.87 +DebugCorePanel.HOST_IS_NOT_VALID=\u30db\u30b9\u30c8\u304c\u63a5\u7d9a\u3055\u308c\u3066\u3044\u307e\u305b\u3093
45.88 +
45.89 +Tree_Loading=\u30ed\u30fc\u30c9\u4e2d...
45.90 +
45.91 +
46.1 --- a/src/ja/cnd/cnd-debugger-common2/cnd-debugger-common2/org/netbeans/modules/cnd/debugger/common2/utils/Bundle_ja.properties Mon Dec 19 12:18:33 2016 +0100
46.2 +++ b/src/ja/cnd/cnd-debugger-common2/cnd-debugger-common2/org/netbeans/modules/cnd/debugger/common2/utils/Bundle_ja.properties Tue Apr 17 14:14:23 2018 +0200
46.3 @@ -110,6 +110,12 @@
46.4
46.5 # PsProvider
46.6 # Should not be translated
46.7 +PS_HDR_ZONE=ZONE
46.8 +# Should not be translated
46.9 +
46.10 +# Should not be translated
46.11 +PS_HDR_USER=USER
46.12 +# Should not be translated
46.13
46.14 # Should not be translated
46.15
46.16 @@ -122,7 +128,7 @@
46.17 # Should not be translated
46.18
46.19 # Should not be translated
46.20 -
46.21 +PS_HDR_COMM=COMMAND
46.22 # Should not be translated
46.23
46.24 # Should not be translated
47.1 --- a/src/ja/cnd/cnd-debugger-gdb2/cnd-debugger-gdb2/org/netbeans/modules/cnd/debugger/gdb2/Bundle_ja.properties Mon Dec 19 12:18:33 2016 +0100
47.2 +++ b/src/ja/cnd/cnd-debugger-gdb2/cnd-debugger-gdb2/org/netbeans/modules/cnd/debugger/gdb2/Bundle_ja.properties Tue Apr 17 14:14:23 2018 +0200
47.3 @@ -76,7 +76,7 @@
47.4 MSG_GdbUnexpectedlyStopped=GDB\u304c\u4e88\u671f\u305b\u305a\u623b\u308a\u5024{0}\u3067\u505c\u6b62\u3057\u307e\u3057\u305f
47.5 MSG_InvalidLocation = "\u30d6\u30ec\u30fc\u30af\u30dd\u30a4\u30f3\u30c8\u306e\u5834\u6240\u306f\u5b58\u5728\u3057\u307e\u305b\u3093\u3002"
47.6 MSG_OldGdbVersion=\u30c7\u30d0\u30c3\u30b0\u8868\u793a\u3092\u4f7f\u7528\u3059\u308b\u3088\u3046\u306bGDB\u3092\u30a2\u30c3\u30d7\u30b0\u30ec\u30fc\u30c9\u3057\u307e\u3059
47.7 -MSG_OldGdbVersionConsole=GDB\u3092\u30a2\u30c3\u30d7\u30b0\u30ec\u30fc\u30c9\u3057\u3066\u30c7\u30d0\u30c3\u30ac\u30fb\u30b3\u30f3\u30bd\u30fc\u30eb\u3092\u4f7f\u7528\u3057\u307e\u3059
47.8 +MSG_OldGdbVersionConsole=\u30c7\u30d0\u30c3\u30ac\u30fb\u30b3\u30f3\u30bd\u30fc\u30eb\u3092\u5b8c\u5168\u306b\u30b5\u30dd\u30fc\u30c8\u3059\u308b\u306b\u306f\u3001\u73fe\u5728\u306e\u30c7\u30d0\u30c3\u30ac\u306e\u30d0\u30fc\u30b8\u30e7\u30f3\u3092\u66f4\u65b0\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002 \n\u305d\u308c\u307e\u3067\u306bIDE UI\u3092\u66f4\u65b0\u3059\u308b\u3053\u3068\u306f\u3067\u304d\u307e\u305b\u3093\u304c\u3001\u5236\u9650\u4ed8\u304d\u306e\u6a5f\u80fd\u304c\u30b5\u30dd\u30fc\u30c8\u3055\u308c\u3066\u3044\u307e\u3059\u3002
47.9 MSG_NonExistentWorkDir=\u4f5c\u696d\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u306f\u5b58\u5728\u3057\u306a\u3044\u30d1\u30b9\u3092\u53c2\u7167\u3057\u3066\u3044\u307e\u3059: {0}
47.10
47.11 #
47.12 @@ -125,6 +125,10 @@
47.13
47.14 ERR_UnsupportedVersion=Gdb\u30d0\u30fc\u30b8\u30e7\u30f3{0}\u306f\u3053\u306e\u30d7\u30e9\u30c3\u30c8\u30d5\u30a9\u30fc\u30e0\u3067\u306f\u30b5\u30dd\u30fc\u30c8\u3055\u308c\u3066\u3044\u307e\u305b\u3093\u3002\u81ea\u8eab\u306e\u8cac\u4efb\u306b\u304a\u3044\u3066\u7d9a\u884c\u3057\u3066\u304f\u3060\u3055\u3044\u3002\u30b5\u30dd\u30fc\u30c8\u3055\u308c\u3066\u3044\u308bgdb\u306e\u30d0\u30fc\u30b8\u30e7\u30f3\u306e\u30ea\u30b9\u30c8\u306b\u3064\u3044\u3066\u306f\u3001\nhttp://wiki.netbeans.org/FaqCPlusPlusGdbVersionInfo\n\u3092\u53c2\u7167\u3057\u3066\u304f\u3060\u3055\u3044\u3002
47.15 MSG_Do_Not_Show_Again_In_Session=\u73fe\u5728\u306eIDE\u30bb\u30c3\u30b7\u30e7\u30f3\u3067\u306f\u3001\u4eca\u5f8c\u3053\u306e\u30e1\u30c3\u30bb\u30fc\u30b8\u3092\u8868\u793a\u3057\u306a\u3044
47.16 +#
47.17 +# For error (dialog) stuff
47.18 +#
47.19 +INFORMATION=\u60c5\u5831
47.20
47.21 MSG_Reverse_Debugging_Option=\u30ea\u30d0\u30fc\u30b9\u30fb\u30c7\u30d0\u30c3\u30b0\u30fb\u30aa\u30d7\u30b7\u30e7\u30f3\u3092\u6709\u52b9\u306b\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002
47.22
48.1 --- a/src/ja/cnd/cnd-debugger-gdb2/cnd-debugger-gdb2/org/netbeans/modules/cnd/debugger/gdb2/actions/Bundle_ja.properties Mon Dec 19 12:18:33 2016 +0100
48.2 +++ b/src/ja/cnd/cnd-debugger-gdb2/cnd-debugger-gdb2/org/netbeans/modules/cnd/debugger/gdb2/actions/Bundle_ja.properties Tue Apr 17 14:14:23 2018 +0200
48.3 @@ -40,7 +40,7 @@
48.4 # Version 2 license, then the option applies only if the new code is
48.5 # made subject to such option by the copyright holder.
48.6
48.7 -GdbDebuggerEngine=Gdb\u30c7\u30d0\u30c3\u30ac\u3092\u4f7f\u7528
48.8 +GdbDebuggerEngine=Gdb\u30c7\u30d0\u30c3\u30ac
48.9
48.10
48.11
49.1 --- a/src/ja/cnd/cnd-highlight/cnd-highlight/org/netbeans/modules/cnd/highlight/semantic/Bundle_ja.properties Mon Dec 19 12:18:33 2016 +0100
49.2 +++ b/src/ja/cnd/cnd-highlight/cnd-highlight/org/netbeans/modules/cnd/highlight/semantic/Bundle_ja.properties Tue Apr 17 14:14:23 2018 +0200
49.3 @@ -46,14 +46,14 @@
49.4 Show-fast-class-fields=\u30af\u30e9\u30b9\u306e\u30d5\u30a3\u30fc\u30eb\u30c9\u306e\u5ba3\u8a00\u306e\u5f37\u8abf\u8868\u793a(&S)
49.5 Show-fast-class-fields-AD=\u5f37\u8abf\u8868\u793a\u3067\u30af\u30e9\u30b9\u306e\u30d5\u30a3\u30fc\u30eb\u30c9\u306e\u5ba3\u8a00\u3092\u8868\u793a
49.6
49.7 -Show-class-fields=\u30af\u30e9\u30b9\u306e\u30d5\u30a3\u30fc\u30eb\u30c9\u306e\u5f37\u8abf\u8868\u793a(&F)
49.8 -Show-class-fields-AD=\u5f37\u8abf\u8868\u793a\u3067\u30af\u30e9\u30b9\u306e\u30d5\u30a3\u30fc\u30eb\u30c9\u3092\u8868\u793a
49.9 +Show-class-fields=\u30af\u30e9\u30b9\u306e\u30d5\u30a3\u30fc\u30eb\u30c9\u306e\u4f7f\u7528\u72b6\u6cc1\u306e\u5f37\u8abf\u8868\u793a(&F)
49.10 +Show-class-fields-AD=\u5f37\u8abf\u8868\u793a\u3067\u30af\u30e9\u30b9\u306e\u30d5\u30a3\u30fc\u30eb\u30c9\u306e\u4f7f\u7528\u72b6\u6cc1\u3092\u8868\u793a
49.11
49.12 -Show-fast-functions-names=\u95a2\u6570\u540d\u306e\u5ba3\u8a00\u3068\u5b9a\u7fa9\u306e\u5f37\u8abf\u8868\u793a(&D)
49.13 -Show-fast-functions-names-AD=\u5f37\u8abf\u8868\u793a\u3067\u95a2\u6570\u540d\u306e\u5ba3\u8a00\u3068\u5b9a\u7fa9\u3092\u8868\u793a
49.14 +Show-fast-functions-names=\u95a2\u6570\u306e\u5ba3\u8a00\u306e\u5f37\u8abf\u8868\u793a(&D)
49.15 +Show-fast-functions-names-AD=\u5f37\u8abf\u8868\u793a\u3067\u95a2\u6570\u306e\u5ba3\u8a00\u3092\u8868\u793a
49.16
49.17 -Show-functions-names=\u95a2\u6570\u540d\u306e\u5f37\u8abf\u8868\u793a(&N)
49.18 -Show-functions-names-AD=\u5f37\u8abf\u8868\u793a\u3067\u95a2\u6570\u540d\u3092\u8868\u793a
49.19 +Show-functions-names=\u95a2\u6570\u306e\u4f7f\u7528\u72b6\u6cc1\u306e\u5f37\u8abf\u8868\u793a(&N)
49.20 +Show-functions-names-AD=\u5f37\u8abf\u8868\u793a\u3067\u95a2\u6570\u306e\u4f7f\u7528\u72b6\u6cc1\u3092\u8868\u793a
49.21
49.22 Show-macros=\u30de\u30af\u30ed\u306e\u5f37\u8abf\u8868\u793a(&M)
49.23 Show-macros-AD=\u5f37\u8abf\u8868\u793a\u3067\u30de\u30af\u30ed\u3092\u8868\u793a
49.24 @@ -64,5 +64,21 @@
49.25 Show-unused-variables=\u672a\u4f7f\u7528\u306e\u5909\u6570\u306e\u5f37\u8abf\u8868\u793a(&V)
49.26 Show-unused-variables-AD=\u5f37\u8abf\u8868\u793a\u3067\u672a\u4f7f\u7528\u306e\u5909\u6570\u3092\u8868\u793a
49.27
49.28 +Show-fast-enums-names=\u5217\u6319\u306e\u5ba3\u8a00\u306e\u5f37\u8abf\u8868\u793a
49.29 +Show-fast-enums-names-AD=\u5f37\u8abf\u8868\u793a\u3067\u5217\u6319\u306e\u5ba3\u8a00\u3092\u8868\u793a
49.30
49.31 +Show-enums-names=\u5217\u6319\u306e\u4f7f\u7528\u72b6\u6cc1\u306e\u5f37\u8abf\u8868\u793a
49.32 +Show-enums-names-AD=\u5f37\u8abf\u8868\u793a\u3067\u5217\u6319\u306e\u4f7f\u7528\u72b6\u6cc1\u3092\u8868\u793a
49.33
49.34 +Show-fast-classes-names=\u30af\u30e9\u30b9\u306e\u5ba3\u8a00\u306e\u5f37\u8abf\u8868\u793a
49.35 +Show-fast-classes-names-AD=\u5f37\u8abf\u8868\u793a\u3067\u30af\u30e9\u30b9\u306e\u5ba3\u8a00\u3092\u8868\u793a
49.36 +
49.37 +Show-classes-names=\u30af\u30e9\u30b9\u306e\u4f7f\u7528\u72b6\u6cc1\u306e\u5f37\u8abf\u8868\u793a
49.38 +Show-classes-names-AD=\u5f37\u8abf\u8868\u793a\u3067\u30af\u30e9\u30b9\u306e\u4f7f\u7528\u72b6\u6cc1\u3092\u8868\u793a
49.39 +
49.40 +Show-fast-enumerators-names=\u5217\u6319\u5b50\u306e\u5ba3\u8a00\u306e\u5f37\u8abf\u8868\u793a
49.41 +Show-fast-enumerators-names-AD=\u5f37\u8abf\u8868\u793a\u3067\u5217\u6319\u5b50\u306e\u5ba3\u8a00\u3092\u8868\u793a
49.42 +
49.43 +Show-enumerators-names=\u5217\u6319\u5b50\u306e\u4f7f\u7528\u72b6\u6cc1\u306e\u5f37\u8abf\u8868\u793a
49.44 +Show-enumerators-names-AD=\u5f37\u8abf\u8868\u793a\u3067\u5217\u6319\u5b50\u306e\u4f7f\u7528\u72b6\u6cc1\u3092\u8868\u793a
49.45 +
50.1 --- a/src/ja/cnd/cnd-makeproject-ui/cnd-makeproject-ui/org/netbeans/modules/cnd/makeproject/ui/launchers/actions/Bundle_ja.properties Mon Dec 19 12:18:33 2016 +0100
50.2 +++ b/src/ja/cnd/cnd-makeproject-ui/cnd-makeproject-ui/org/netbeans/modules/cnd/makeproject/ui/launchers/actions/Bundle_ja.properties Tue Apr 17 14:14:23 2018 +0200
50.3 @@ -65,7 +65,7 @@
50.4 PublicToolTip=<html>\u30d1\u30d6\u30ea\u30c3\u30af\u8d77\u52d5\u30c4\u30fc\u30eb\u306f\u30d5\u30a1\u30a4\u30ebnbproject/launcher.properties\u306b\u683c\u7d0d\u3055\u308c\u3066\u3044\u307e\u3059<br>\n\u30d7\u30e9\u30a4\u30d9\u30fc\u30c8 - nbroject/private/launcher.properties</html>
50.5 LaunchersPanel.hideCheckBox.text=\u975e\u8868\u793a(&I)
50.6 HideTooltip=\u30dd\u30c3\u30d7\u30a2\u30c3\u30d7\u30fb\u30e1\u30cb\u30e5\u30fc\u3067\u8d77\u52d5\u30c4\u30fc\u30eb\u3092\u975e\u8868\u793a\u306b\u3057\u307e\u3059\u3002
50.7 -LaunchersPanel.runInOwnTabCheckBox.text=\u72ec\u81ea\u306e\u51fa\u529b\u30bf\u30d6\u3067\u5b9f\u884c(&T)
50.8 +LaunchersPanel.runInOwnTabCheckBox.text=\u72ec\u81ea\u306e\u51fa\u529b\u30bf\u30d6\u3067\u5b9f\u884c(&U)
50.9
50.10 LBL_BuildAsAction_Name=\u30d3\u30eb\u30c9
50.11 LBL_RunAsAction_Name=\u5b9f\u884c
51.1 --- a/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/api/Bundle_ja.properties Mon Dec 19 12:18:33 2016 +0100
51.2 +++ b/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/api/Bundle_ja.properties Tue Apr 17 14:14:23 2018 +0200
51.3 @@ -66,6 +66,7 @@
51.4 TXT_Auto=\u81ea\u52d5
51.5 TXT_AlwaysRelative=\u5e38\u6642\u76f8\u5bfe
51.6 TXT_AlwaysAbsolute=\u5e38\u6642\u7d76\u5bfe
51.7 +NO_PROJECT=\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u306a\u3057
51.8
51.9
51.10
52.1 --- a/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/resources/samples/fractal_ja.html Mon Dec 19 12:18:33 2016 +0100
52.2 +++ b/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/resources/samples/fractal_ja.html Tue Apr 17 14:14:23 2018 +0200
52.3 @@ -1,9 +1,44 @@
52.4 - <!--
52.5 - - Copyright 2006-2007 Sun Microsystems, Inc. All rights reserved.
52.6 - - SUN PROPRIETARY/CONFIDENTIAL.
52.7 - - Use is subject to license terms.
52.8 - -->
52.9 -
52.10 +<!--
52.11 + - DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
52.12 + -
52.13 + - Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
52.14 + -
52.15 + - The contents of this file are subject to the terms of either the GNU
52.16 + - General Public License Version 2 only ("GPL") or the Common
52.17 + - Development and Distribution License("CDDL") (collectively, the
52.18 + - "License"). You may not use this file except in compliance with the
52.19 + - License. You can obtain a copy of the License at
52.20 + - http://www.netbeans.org/cddl-gplv2.html
52.21 + - or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
52.22 + - specific language governing permissions and limitations under the
52.23 + - License. When distributing the software, include this License Header
52.24 + - Notice in each file and include the License file at
52.25 + - nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
52.26 + - particular file as subject to the "Classpath" exception as provided
52.27 + - by Sun in the GPL Version 2 section of the License file that
52.28 + - accompanied this code. If applicable, add the following below the
52.29 + - License Header, with the fields enclosed by brackets [] replaced by
52.30 + - your own identifying information:
52.31 + - "Portions Copyrighted [year] [name of copyright owner]"
52.32 + -
52.33 + - Contributor(s):
52.34 + -
52.35 + - The Original Software is NetBeans. The Initial Developer of the Original
52.36 + - Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
52.37 + - Microsystems, Inc. All Rights Reserved.
52.38 + -
52.39 + - If you wish your version of this file to be governed by only the CDDL
52.40 + - or only the GPL Version 2, indicate your decision by adding
52.41 + - "[Contributor] elects to include this software in this distribution
52.42 + - under the [CDDL or GPL Version 2] license." If you do not indicate a
52.43 + - single choice of license, a recipient has the option to distribute
52.44 + - your version of this file under either the CDDL, the GPL Version 2 or
52.45 + - to extend the choice of license to its licensees as provided above.
52.46 + - However, if you add GPL Version 2 code and therefore, elected the GPL
52.47 + - Version 2 license, then the option applies only if the new code is
52.48 + - made subject to such option by the copyright holder.
52.49 + -->
52.50 +
52.51 <HTML>
52.52 <head>
52.53 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
53.1 --- a/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/resources/samples/hello_ja.html Mon Dec 19 12:18:33 2016 +0100
53.2 +++ b/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/resources/samples/hello_ja.html Tue Apr 17 14:14:23 2018 +0200
53.3 @@ -1,9 +1,44 @@
53.4 - <!--
53.5 - - Copyright 2006-2007 Sun Microsystems, Inc. All rights reserved.
53.6 - - SUN PROPRIETARY/CONFIDENTIAL.
53.7 - - Use is subject to license terms.
53.8 - -->
53.9 -
53.10 +<!--
53.11 + - DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
53.12 + -
53.13 + - Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
53.14 + -
53.15 + - The contents of this file are subject to the terms of either the GNU
53.16 + - General Public License Version 2 only ("GPL") or the Common
53.17 + - Development and Distribution License("CDDL") (collectively, the
53.18 + - "License"). You may not use this file except in compliance with the
53.19 + - License. You can obtain a copy of the License at
53.20 + - http://www.netbeans.org/cddl-gplv2.html
53.21 + - or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
53.22 + - specific language governing permissions and limitations under the
53.23 + - License. When distributing the software, include this License Header
53.24 + - Notice in each file and include the License file at
53.25 + - nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
53.26 + - particular file as subject to the "Classpath" exception as provided
53.27 + - by Sun in the GPL Version 2 section of the License file that
53.28 + - accompanied this code. If applicable, add the following below the
53.29 + - License Header, with the fields enclosed by brackets [] replaced by
53.30 + - your own identifying information:
53.31 + - "Portions Copyrighted [year] [name of copyright owner]"
53.32 + -
53.33 + - Contributor(s):
53.34 + -
53.35 + - The Original Software is NetBeans. The Initial Developer of the Original
53.36 + - Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
53.37 + - Microsystems, Inc. All Rights Reserved.
53.38 + -
53.39 + - If you wish your version of this file to be governed by only the CDDL
53.40 + - or only the GPL Version 2, indicate your decision by adding
53.41 + - "[Contributor] elects to include this software in this distribution
53.42 + - under the [CDDL or GPL Version 2] license." If you do not indicate a
53.43 + - single choice of license, a recipient has the option to distribute
53.44 + - your version of this file under either the CDDL, the GPL Version 2 or
53.45 + - to extend the choice of license to its licensees as provided above.
53.46 + - However, if you add GPL Version 2 code and therefore, elected the GPL
53.47 + - Version 2 license, then the option applies only if the new code is
53.48 + - made subject to such option by the copyright holder.
53.49 + -->
53.50 +
53.51 <HTML>
53.52 <head>
53.53 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
54.1 --- a/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/resources/samples/lexyacc_ja.html Mon Dec 19 12:18:33 2016 +0100
54.2 +++ b/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/resources/samples/lexyacc_ja.html Tue Apr 17 14:14:23 2018 +0200
54.3 @@ -1,9 +1,44 @@
54.4 - <!--
54.5 - - Copyright 2006-2007 Sun Microsystems, Inc. All rights reserved.
54.6 - - SUN PROPRIETARY/CONFIDENTIAL.
54.7 - - Use is subject to license terms.
54.8 - -->
54.9 -
54.10 +<!--
54.11 + - DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
54.12 + -
54.13 + - Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
54.14 + -
54.15 + - The contents of this file are subject to the terms of either the GNU
54.16 + - General Public License Version 2 only ("GPL") or the Common
54.17 + - Development and Distribution License("CDDL") (collectively, the
54.18 + - "License"). You may not use this file except in compliance with the
54.19 + - License. You can obtain a copy of the License at
54.20 + - http://www.netbeans.org/cddl-gplv2.html
54.21 + - or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
54.22 + - specific language governing permissions and limitations under the
54.23 + - License. When distributing the software, include this License Header
54.24 + - Notice in each file and include the License file at
54.25 + - nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
54.26 + - particular file as subject to the "Classpath" exception as provided
54.27 + - by Sun in the GPL Version 2 section of the License file that
54.28 + - accompanied this code. If applicable, add the following below the
54.29 + - License Header, with the fields enclosed by brackets [] replaced by
54.30 + - your own identifying information:
54.31 + - "Portions Copyrighted [year] [name of copyright owner]"
54.32 + -
54.33 + - Contributor(s):
54.34 + -
54.35 + - The Original Software is NetBeans. The Initial Developer of the Original
54.36 + - Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
54.37 + - Microsystems, Inc. All Rights Reserved.
54.38 + -
54.39 + - If you wish your version of this file to be governed by only the CDDL
54.40 + - or only the GPL Version 2, indicate your decision by adding
54.41 + - "[Contributor] elects to include this software in this distribution
54.42 + - under the [CDDL or GPL Version 2] license." If you do not indicate a
54.43 + - single choice of license, a recipient has the option to distribute
54.44 + - your version of this file under either the CDDL, the GPL Version 2 or
54.45 + - to extend the choice of license to its licensees as provided above.
54.46 + - However, if you add GPL Version 2 code and therefore, elected the GPL
54.47 + - Version 2 license, then the option applies only if the new code is
54.48 + - made subject to such option by the copyright holder.
54.49 + -->
54.50 +
54.51 <HTML>
54.52 <head>
54.53 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
55.1 --- a/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/resources/samples/pi_ja.html Mon Dec 19 12:18:33 2016 +0100
55.2 +++ b/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/resources/samples/pi_ja.html Tue Apr 17 14:14:23 2018 +0200
55.3 @@ -1,9 +1,44 @@
55.4 - <!--
55.5 - - Copyright 2006-2007 Sun Microsystems, Inc. All rights reserved.
55.6 - - SUN PROPRIETARY/CONFIDENTIAL.
55.7 - - Use is subject to license terms.
55.8 - -->
55.9 -
55.10 +<!--
55.11 + - DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
55.12 + -
55.13 + - Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
55.14 + -
55.15 + - The contents of this file are subject to the terms of either the GNU
55.16 + - General Public License Version 2 only ("GPL") or the Common
55.17 + - Development and Distribution License("CDDL") (collectively, the
55.18 + - "License"). You may not use this file except in compliance with the
55.19 + - License. You can obtain a copy of the License at
55.20 + - http://www.netbeans.org/cddl-gplv2.html
55.21 + - or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
55.22 + - specific language governing permissions and limitations under the
55.23 + - License. When distributing the software, include this License Header
55.24 + - Notice in each file and include the License file at
55.25 + - nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
55.26 + - particular file as subject to the "Classpath" exception as provided
55.27 + - by Sun in the GPL Version 2 section of the License file that
55.28 + - accompanied this code. If applicable, add the following below the
55.29 + - License Header, with the fields enclosed by brackets [] replaced by
55.30 + - your own identifying information:
55.31 + - "Portions Copyrighted [year] [name of copyright owner]"
55.32 + -
55.33 + - Contributor(s):
55.34 + -
55.35 + - The Original Software is NetBeans. The Initial Developer of the Original
55.36 + - Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
55.37 + - Microsystems, Inc. All Rights Reserved.
55.38 + -
55.39 + - If you wish your version of this file to be governed by only the CDDL
55.40 + - or only the GPL Version 2, indicate your decision by adding
55.41 + - "[Contributor] elects to include this software in this distribution
55.42 + - under the [CDDL or GPL Version 2] license." If you do not indicate a
55.43 + - single choice of license, a recipient has the option to distribute
55.44 + - your version of this file under either the CDDL, the GPL Version 2 or
55.45 + - to extend the choice of license to its licensees as provided above.
55.46 + - However, if you add GPL Version 2 code and therefore, elected the GPL
55.47 + - Version 2 license, then the option applies only if the new code is
55.48 + - made subject to such option by the copyright holder.
55.49 + -->
55.50 +
55.51 <HTML>
55.52 <head>
55.53 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
56.1 --- a/src/ja/cnd/cnd-modelui/cnd-modelui/org/netbeans/modules/cnd/modelui/actions/Bundle_ja.properties Mon Dec 19 12:18:33 2016 +0100
56.2 +++ b/src/ja/cnd/cnd-modelui/cnd-modelui/org/netbeans/modules/cnd/modelui/actions/Bundle_ja.properties Tue Apr 17 14:14:23 2018 +0200
56.3 @@ -37,4 +37,5 @@
56.4 CTL_ReparseProject=\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u3092\u518d\u89e3\u6790
56.5 CTL_ReparseProjects={0}\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u3092\u518d\u89e3\u6790
56.6 CTL_CodeModelDiagnostic=C/C++\u30b3\u30fc\u30c9\u30fb\u30e2\u30c7\u30eb\u8a3a\u65ad\u3092\u30c0\u30f3\u30d7
56.7 +CTL_ForceReparseProject=C/C++\u30ad\u30e3\u30c3\u30b7\u30e5\u3092\u6d88\u53bb\u3057\u3066IDE\u3092\u518d\u8d77\u52d5
56.8
57.1 --- a/src/ja/cnd/cnd-modelutil/cnd-modelutil/org/netbeans/modules/cnd/modelutil/resources/Bundle_ja.properties Mon Dec 19 12:18:33 2016 +0100
57.2 +++ b/src/ja/cnd/cnd-modelutil/cnd-modelutil/org/netbeans/modules/cnd/modelutil/resources/Bundle_ja.properties Tue Apr 17 14:14:23 2018 +0200
57.3 @@ -44,8 +44,14 @@
57.4 cc-highlighting-macros-system=\u4e8b\u524d\u5b9a\u7fa9\u30de\u30af\u30ed
57.5 cc-highlighting-macros-user=\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u306e\u30de\u30af\u30ed\u5b9a\u7fa9
57.6 cc-highlighting-class-fields=\u30d5\u30a3\u30fc\u30eb\u30c9
57.7 -cc-highlighting-typedefs=typedef
57.8 +cc-highlighting-typedefs=Typedef
57.9 cc-highlighting-unused-variables=\u672a\u4f7f\u7528\u306e\u5909\u6570
57.10 cc-highlighting-function=\u95a2\u6570\u5ba3\u8a00
57.11 -cc-highlighting-function-usage=\u95a2\u6570\u306e\u4f7f\u7528\u6cd5
57.12 +cc-highlighting-function-usage=\u95a2\u6570\u306e\u4f7f\u7528\u72b6\u6cc1
57.13 +cc-highlighting-enum=\u5217\u6319\u5ba3\u8a00
57.14 +cc-highlighting-enum-usage=\u5217\u6319\u306e\u4f7f\u7528\u72b6\u6cc1
57.15 +cc-highlighting-enumerator=\u5217\u6319\u5b50\u5ba3\u8a00
57.16 +cc-highlighting-enumerator-usage=\u5217\u6319\u5b50\u306e\u4f7f\u7528\u72b6\u6cc1
57.17 +cc-highlighting-class=\u30af\u30e9\u30b9\u5ba3\u8a00
57.18 +cc-highlighting-class-usage=\u30af\u30e9\u30b9\u306e\u4f7f\u7528\u72b6\u6cc1
57.19
58.1 --- a/src/ja/cnd/cnd-refactoring/cnd-refactoring/org/netbeans/modules/cnd/refactoring/plugins/Bundle_ja.properties Mon Dec 19 12:18:33 2016 +0100
58.2 +++ b/src/ja/cnd/cnd-refactoring/cnd-refactoring/org/netbeans/modules/cnd/refactoring/plugins/Bundle_ja.properties Tue Apr 17 14:14:23 2018 +0200
58.3 @@ -266,6 +266,9 @@
58.4 #Find Usages Filters
58.5 TXT_Filter_Comments=\u30b3\u30e1\u30f3\u30c8\u30fb\u30d5\u30a3\u30eb\u30bf
58.6 TXT_Filter_DeadCode=\u30c7\u30c3\u30c9\u30fb\u30b3\u30fc\u30c9\u30fb\u30d5\u30a3\u30eb\u30bf
58.7 +TXT_Filter_Read=\u6392\u4ed6\u7684\u8aad\u53d6\u308a\u30d5\u30a3\u30eb\u30bf
58.8 +TXT_Filter_Write=\u6392\u4ed6\u7684\u66f8\u8fbc\u307f\u30d5\u30a3\u30eb\u30bf
58.9 +TXT_Filter_ReadWrite=\u8aad\u53d6\u308a/\u66f8\u8fbc\u307f\u30d5\u30a3\u30eb\u30bf
58.10 TXT_Filter_Declarations=\u5ba3\u8a00\u3068\u5b9a\u7fa9\u306e\u30d5\u30a3\u30eb\u30bf
58.11 TXT_Filter_Macros=\u30de\u30af\u30ed\u30fb\u30d5\u30a3\u30eb\u30bf
58.12 TXT_Filter_Scope=\u4fee\u98fe\u540d\u30d5\u30a3\u30eb\u30bf\u5185\u306e\u30af\u30e9\u30b9\u540d
59.1 --- a/src/ja/cnd/cnd-toolchain-ui/cnd-toolchain-ui/org/netbeans/modules/cnd/api/toolchain/ui/Bundle_ja.properties Mon Dec 19 12:18:33 2016 +0100
59.2 +++ b/src/ja/cnd/cnd-toolchain-ui/cnd-toolchain-ui/org/netbeans/modules/cnd/api/toolchain/ui/Bundle_ja.properties Tue Apr 17 14:14:23 2018 +0200
59.3 @@ -56,7 +56,7 @@
59.4
59.5 MODIFY_PATH_VARIABLE=\u30d1\u30b9\u5909\u6570
59.6
59.7 -PathEnvVariables.addLabel.text=PATH\u74b0\u5883\u5909\u6570\u306b\u30c4\u30fc\u30eb\u30fb\u30b3\u30ec\u30af\u30b7\u30e7\u30f3\u30fb\u30d1\u30b9\u3092\u8ffd\u52a0\u3057\u307e\u3059
59.8 +PathEnvVariables.addLabel.text=PATH\u74b0\u5883\u5909\u6570\u306b\u30c4\u30fc\u30eb\u30fb\u30b3\u30ec\u30af\u30b7\u30e7\u30f3\u30fb\u30d1\u30b9\u3092\u8ffd\u52a0
59.9
59.10 PathEnvVariables.toolsVariableTextField.text=TOOLS_PATH
59.11 PathEnvVariables.utilitiesVariableTextField.text=UTILITIES_PATH
60.1 --- a/src/ja/cnd/org-netbeans-libs-clank/ext/org-clang-analysis/org/clang/analysis/resources/Bundle_ja.properties Mon Dec 19 12:18:33 2016 +0100
60.2 +++ b/src/ja/cnd/org-netbeans-libs-clank/ext/org-clang-analysis/org/clang/analysis/resources/Bundle_ja.properties Tue Apr 17 14:14:23 2018 +0200
60.3 @@ -1,4 +1,4 @@
60.4 OpenIDE-Module-Long-Description=clang/Analysis
60.5 -OpenIDE-Module-Name=Clank clang/Analysis
60.6 +OpenIDE-Module-Name=Clank clang/Analysis (3.9 NO_BODY)
60.7 OpenIDE-Module-Short-Description=clang/Analysis
60.8
61.1 --- a/src/ja/cnd/org-netbeans-libs-clank/ext/org-clang-ast/org/clang/ast/resources/Bundle_ja.properties Mon Dec 19 12:18:33 2016 +0100
61.2 +++ b/src/ja/cnd/org-netbeans-libs-clank/ext/org-clang-ast/org/clang/ast/resources/Bundle_ja.properties Tue Apr 17 14:14:23 2018 +0200
61.3 @@ -1,4 +1,4 @@
61.4 OpenIDE-Module-Long-Description=clang/AST
61.5 -OpenIDE-Module-Name=Clank clang/AST
61.6 +OpenIDE-Module-Name=Clank clang/AST (3.9 NO_BODY)
61.7 OpenIDE-Module-Short-Description=clang/AST
61.8
62.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
62.2 +++ b/src/ja/cnd/org-netbeans-libs-clank/ext/org-clang-astmatchers/org/clang/astmatchers/resources/Bundle_ja.properties Tue Apr 17 14:14:23 2018 +0200
62.3 @@ -0,0 +1,2 @@
62.4 +OpenIDE-Module-Name=Clank clang/ASTMatchers (3.9 NO_BODY)
62.5 +
63.1 --- a/src/ja/cnd/org-netbeans-libs-clank/ext/org-clang-basic/org/clang/basic/resources/Bundle_ja.properties Mon Dec 19 12:18:33 2016 +0100
63.2 +++ b/src/ja/cnd/org-netbeans-libs-clank/ext/org-clang-basic/org/clang/basic/resources/Bundle_ja.properties Tue Apr 17 14:14:23 2018 +0200
63.3 @@ -1,4 +1,4 @@
63.4 OpenIDE-Module-Long-Description=clang/Basic
63.5 -OpenIDE-Module-Name=Clank clang/Basic
63.6 +OpenIDE-Module-Name=Clank clang/Basic (3.9 DONE)
63.7 OpenIDE-Module-Short-Description=clang/Basic
63.8
64.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
64.2 +++ b/src/ja/cnd/org-netbeans-libs-clank/ext/org-clang-clangc/org/clang/clangc/resources/Bundle_ja.properties Tue Apr 17 14:14:23 2018 +0200
64.3 @@ -0,0 +1,2 @@
64.4 +OpenIDE-Module-Name=Clank clang/Clang-C (libClang API) (3.9 DONE)
64.5 +
65.1 --- a/src/ja/cnd/org-netbeans-libs-clank/ext/org-clang-driver/org/clang/driver/resources/Bundle_ja.properties Mon Dec 19 12:18:33 2016 +0100
65.2 +++ b/src/ja/cnd/org-netbeans-libs-clank/ext/org-clang-driver/org/clang/driver/resources/Bundle_ja.properties Tue Apr 17 14:14:23 2018 +0200
65.3 @@ -1,4 +1,4 @@
65.4 OpenIDE-Module-Long-Description=clang/Driver
65.5 -OpenIDE-Module-Name=Clank clang/Driver
65.6 +OpenIDE-Module-Name=Clank clang/Driver (3.9 DONE)
65.7 OpenIDE-Module-Short-Description=clang/Driver
65.8
66.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
66.2 +++ b/src/ja/cnd/org-netbeans-libs-clank/ext/org-clang-edit/org/clang/edit/Bundle_ja.properties Tue Apr 17 14:14:23 2018 +0200
66.3 @@ -0,0 +1,4 @@
66.4 +OpenIDE-Module-Long-Description=clang/Edit
66.5 +OpenIDE-Module-Name=Clank clang/Edit (3.9 DONE)
66.6 +OpenIDE-Module-Short-Description=clang/Edit
66.7 +
67.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
67.2 +++ b/src/ja/cnd/org-netbeans-libs-clank/ext/org-clang-format/org/clang/format/resources/Bundle_ja.properties Tue Apr 17 14:14:23 2018 +0200
67.3 @@ -0,0 +1,2 @@
67.4 +OpenIDE-Module-Name=Clank clang/Format (3.9 NO_BODY)
67.5 +
68.1 --- a/src/ja/cnd/org-netbeans-libs-clank/ext/org-clang-frontend/org/clang/frontend/resources/Bundle_ja.properties Mon Dec 19 12:18:33 2016 +0100
68.2 +++ b/src/ja/cnd/org-netbeans-libs-clank/ext/org-clang-frontend/org/clang/frontend/resources/Bundle_ja.properties Tue Apr 17 14:14:23 2018 +0200
68.3 @@ -1,4 +1,4 @@
68.4 OpenIDE-Module-Long-Description=clang/Frontend
68.5 -OpenIDE-Module-Name=Clank clang/Frontend
68.6 +OpenIDE-Module-Name=Clank clang/Frontend (3.9 DONE)
68.7 OpenIDE-Module-Short-Description=clang/Frontend
68.8
69.1 --- a/src/ja/cnd/org-netbeans-libs-clank/ext/org-clang-frontendtool/org/clang/frontendtool/resources/Bundle_ja.properties Mon Dec 19 12:18:33 2016 +0100
69.2 +++ b/src/ja/cnd/org-netbeans-libs-clank/ext/org-clang-frontendtool/org/clang/frontendtool/resources/Bundle_ja.properties Tue Apr 17 14:14:23 2018 +0200
69.3 @@ -1,4 +1,4 @@
69.4 OpenIDE-Module-Long-Description=clang/FrontendTool
69.5 -OpenIDE-Module-Name=Clank clang/FrontendTool
69.6 +OpenIDE-Module-Name=Clank clang/FrontendTool (3.9 DONE)
69.7 OpenIDE-Module-Short-Description=clang/FrontendTool
69.8
70.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
70.2 +++ b/src/ja/cnd/org-netbeans-libs-clank/ext/org-clang-index/org/clang/index/resources/Bundle_ja.properties Tue Apr 17 14:14:23 2018 +0200
70.3 @@ -0,0 +1,2 @@
70.4 +OpenIDE-Module-Name=Clank clang/Index
70.5 +
71.1 --- a/src/ja/cnd/org-netbeans-libs-clank/ext/org-clang-lex/org/clang/lex/resources/Bundle_ja.properties Mon Dec 19 12:18:33 2016 +0100
71.2 +++ b/src/ja/cnd/org-netbeans-libs-clank/ext/org-clang-lex/org/clang/lex/resources/Bundle_ja.properties Tue Apr 17 14:14:23 2018 +0200
71.3 @@ -1,4 +1,4 @@
71.4 OpenIDE-Module-Long-Description=clang/Lex
71.5 -OpenIDE-Module-Name=Clank clang/Lex
71.6 +OpenIDE-Module-Name=Clank clang/Lex (3.9 DONE)
71.7 OpenIDE-Module-Short-Description=clang/Lex
71.8
72.1 --- a/src/ja/cnd/org-netbeans-libs-clank/ext/org-clang-parse/org/clang/parse/resources/Bundle_ja.properties Mon Dec 19 12:18:33 2016 +0100
72.2 +++ b/src/ja/cnd/org-netbeans-libs-clank/ext/org-clang-parse/org/clang/parse/resources/Bundle_ja.properties Tue Apr 17 14:14:23 2018 +0200
72.3 @@ -1,4 +1,4 @@
72.4 OpenIDE-Module-Long-Description=clang/Parse
72.5 -OpenIDE-Module-Name=Clank clang/Parse
72.6 +OpenIDE-Module-Name=Clank clang/Parse (3.9 DOING BODY)
72.7 OpenIDE-Module-Short-Description=clang/Parse
72.8
73.1 --- a/src/ja/cnd/org-netbeans-libs-clank/ext/org-clang-rewrite/org/clang/rewrite/resources/Bundle_ja.properties Mon Dec 19 12:18:33 2016 +0100
73.2 +++ b/src/ja/cnd/org-netbeans-libs-clank/ext/org-clang-rewrite/org/clang/rewrite/resources/Bundle_ja.properties Tue Apr 17 14:14:23 2018 +0200
73.3 @@ -1,2 +1,2 @@
73.4 -OpenIDE-Module-Name=Clank clang/Rewrite
73.5 +OpenIDE-Module-Name=Clank clang/Rewrite (3.9 DONE)
73.6
74.1 --- a/src/ja/cnd/org-netbeans-libs-clank/ext/org-clang-sema/org/clang/sema/resources/Bundle_ja.properties Mon Dec 19 12:18:33 2016 +0100
74.2 +++ b/src/ja/cnd/org-netbeans-libs-clank/ext/org-clang-sema/org/clang/sema/resources/Bundle_ja.properties Tue Apr 17 14:14:23 2018 +0200
74.3 @@ -1,4 +1,4 @@
74.4 OpenIDE-Module-Long-Description=clang/Sema
74.5 -OpenIDE-Module-Name=Clank clang/Sema
74.6 +OpenIDE-Module-Name=Clank clang/Sema (3.9 NO_BODY)
74.7 OpenIDE-Module-Short-Description=clang/Sema
74.8
75.1 --- a/src/ja/cnd/org-netbeans-libs-clank/ext/org-clang-serialization/org/clang/serialization/resources/Bundle_ja.properties Mon Dec 19 12:18:33 2016 +0100
75.2 +++ b/src/ja/cnd/org-netbeans-libs-clank/ext/org-clang-serialization/org/clang/serialization/resources/Bundle_ja.properties Tue Apr 17 14:14:23 2018 +0200
75.3 @@ -1,4 +1,4 @@
75.4 OpenIDE-Module-Long-Description=clang/Serialization
75.5 -OpenIDE-Module-Name=Clank clang/Serialization
75.6 +OpenIDE-Module-Name=Clank clang/Serialization (3.9 NO_BODY)
75.7 OpenIDE-Module-Short-Description=clang/Serialization
75.8
76.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
76.2 +++ b/src/ja/cnd/org-netbeans-libs-clank/ext/org-clang-tidy/org/clang/tidy/resources/Bundle_ja.properties Tue Apr 17 14:14:23 2018 +0200
76.3 @@ -0,0 +1,2 @@
76.4 +OpenIDE-Module-Name=Clank clang/Tidy
76.5 +
77.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
77.2 +++ b/src/ja/cnd/org-netbeans-libs-clank/ext/org-clang-tooling/org/clang/tooling/resources/Bundle_ja.properties Tue Apr 17 14:14:23 2018 +0200
77.3 @@ -0,0 +1,2 @@
77.4 +OpenIDE-Module-Name=Clank clang/Tooling (3.9 NO_BODY)
77.5 +
78.1 --- a/src/ja/cnd/org-netbeans-libs-clank/ext/org-clang-tools-driver/org/clang/tools/driver/resources/Bundle_ja.properties Mon Dec 19 12:18:33 2016 +0100
78.2 +++ b/src/ja/cnd/org-netbeans-libs-clank/ext/org-clang-tools-driver/org/clang/tools/driver/resources/Bundle_ja.properties Tue Apr 17 14:14:23 2018 +0200
78.3 @@ -1,3 +1,3 @@
78.4 -OpenIDE-Module-Name=Clank clang/tools/driver
78.5 +OpenIDE-Module-Name=Clank clang/tools/driver (3.9 DONE)
78.6 OpenIDE-Module-Short-Description=clang/tools/driver
78.7
79.1 --- a/src/ja/cnd/org-netbeans-libs-clank/ext/org-clang-tools-services/org/clang/tools/services/resources/Bundle_ja.properties Mon Dec 19 12:18:33 2016 +0100
79.2 +++ b/src/ja/cnd/org-netbeans-libs-clank/ext/org-clang-tools-services/org/clang/tools/services/resources/Bundle_ja.properties Tue Apr 17 14:14:23 2018 +0200
79.3 @@ -1,2 +1,2 @@
79.4 -OpenIDE-Module-Name=Clank clang\u30d9\u30fc\u30b9\u306e\u30b5\u30fc\u30d3\u30b9
79.5 +OpenIDE-Module-Name=Clank clang\u30d9\u30fc\u30b9\u306e\u30b5\u30fc\u30d3\u30b9(JAVA)
79.6
80.1 --- a/src/ja/cnd/org-netbeans-libs-clank/ext/org-clank-java/org/clank/java/resources/Bundle_ja.properties Mon Dec 19 12:18:33 2016 +0100
80.2 +++ b/src/ja/cnd/org-netbeans-libs-clank/ext/org-clank-java/org/clank/java/resources/Bundle_ja.properties Tue Apr 17 14:14:23 2018 +0200
80.3 @@ -1,4 +1,4 @@
80.4 OpenIDE-Module-Long-Description=C\u69cb\u9020\u7528Java\u30af\u30e9\u30b9
80.5 -OpenIDE-Module-Name=Java\u3067\u306eClank C\u30e9\u30c3\u30d1\u30fc
80.6 +OpenIDE-Module-Name=Java\u3067\u306eClank C\u30e9\u30c3\u30d1\u30fc(JAVA)
80.7 OpenIDE-Module-Short-Description=C\u69cb\u9020\u7528Java\u30af\u30e9\u30b9
80.8
81.1 --- a/src/ja/cnd/org-netbeans-libs-clank/ext/org-llvm-adtsupport/org/llvm/adtsupport/resources/Bundle_ja.properties Mon Dec 19 12:18:33 2016 +0100
81.2 +++ b/src/ja/cnd/org-netbeans-libs-clank/ext/org-llvm-adtsupport/org/llvm/adtsupport/resources/Bundle_ja.properties Tue Apr 17 14:14:23 2018 +0200
81.3 @@ -1,4 +1,4 @@
81.4 OpenIDE-Module-Long-Description=llvm/ADT\u3001llvm/Support\u3001llvm/MC
81.5 -OpenIDE-Module-Name=Clank llvm ADT/Support/MC
81.6 +OpenIDE-Module-Name=Clank llvm ADT/Support/MC (3.9/3.8/3.6/3.4 ON DEMAND)
81.7 OpenIDE-Module-Short-Description=llvm ADT\u3001Support\u3001MC
81.8
82.1 --- a/src/ja/cnd/org-netbeans-libs-clank/ext/org-llvm-bitcode/org/llvm/bitcode/resources/Bundle_ja.properties Mon Dec 19 12:18:33 2016 +0100
82.2 +++ b/src/ja/cnd/org-netbeans-libs-clank/ext/org-llvm-bitcode/org/llvm/bitcode/resources/Bundle_ja.properties Tue Apr 17 14:14:23 2018 +0200
82.3 @@ -1,2 +1,2 @@
82.4 -OpenIDE-Module-Name=Clank llvm/Bitcode
82.5 +OpenIDE-Module-Name=Clank llvm/Bitcode (3.9 NO_BODY)
82.6
83.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
83.2 +++ b/src/ja/cnd/org-netbeans-libs-clank/ext/org-llvm-ir/org/llvm/ir/resources/Bundle_ja.properties Tue Apr 17 14:14:23 2018 +0200
83.3 @@ -0,0 +1,2 @@
83.4 +OpenIDE-Module-Name=Clank llvm/IR
83.5 +
84.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
84.2 +++ b/src/ja/cnd/org-netbeans-libs-clank/ext/org-llvm-linker/org/llvm/linker/resources/Bundle_ja.properties Tue Apr 17 14:14:23 2018 +0200
84.3 @@ -0,0 +1,2 @@
84.4 +OpenIDE-Module-Name=Clank llvm/Linker
84.5 +
85.1 --- a/src/ja/cnd/org-netbeans-libs-clank/ext/org-llvm-option/org/llvm/option/resources/Bundle_ja.properties Mon Dec 19 12:18:33 2016 +0100
85.2 +++ b/src/ja/cnd/org-netbeans-libs-clank/ext/org-llvm-option/org/llvm/option/resources/Bundle_ja.properties Tue Apr 17 14:14:23 2018 +0200
85.3 @@ -1,4 +1,4 @@
85.4 OpenIDE-Module-Long-Description=llvm/Option
85.5 -OpenIDE-Module-Name=Clank llvm/Option
85.6 +OpenIDE-Module-Name=Clank llvm/Option (3.9 DONE)
85.7 OpenIDE-Module-Short-Description=llvm/Option
85.8
86.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
86.2 +++ b/src/ja/cnd/org-netbeans-libs-clank/ext/org-llvm-passes/org/llvm/passes/resources/Bundle_ja.properties Tue Apr 17 14:14:23 2018 +0200
86.3 @@ -0,0 +1,2 @@
86.4 +OpenIDE-Module-Name=Clank llvm/Passes
86.5 +
87.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
87.2 +++ b/src/ja/cnd/org-netbeans-libs-clank/ext/org-llvm-profiledata/org/llvm/profiledata/resources/Bundle_ja.properties Tue Apr 17 14:14:23 2018 +0200
87.3 @@ -0,0 +1,2 @@
87.4 +OpenIDE-Module-Name=Clank llvm/ProfileData
87.5 +
88.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
88.2 +++ b/src/ja/cnd/org-netbeans-libs-clank/ext/org-llvm-target/org/llvm/target/resources/Bundle_ja.properties Tue Apr 17 14:14:23 2018 +0200
88.3 @@ -0,0 +1,2 @@
88.4 +OpenIDE-Module-Name=Clank llvm/Target
88.5 +
89.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
89.2 +++ b/src/ja/cnd/org-netbeans-libs-clank/ext/org-llvm/org/llvm/resources/Bundle_ja.properties Tue Apr 17 14:14:23 2018 +0200
89.3 @@ -0,0 +1,2 @@
89.4 +OpenIDE-Module-Name=Clank llvm/LLVM
89.5 +
90.1 --- a/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-makeproject-ui-resources-samples-fractal_ja.html Mon Dec 19 12:18:33 2016 +0100
90.2 +++ b/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-makeproject-ui-resources-samples-fractal_ja.html Tue Apr 17 14:14:23 2018 +0200
90.3 @@ -1,9 +1,44 @@
90.4 - <!--
90.5 - - Copyright 2006-2007 Sun Microsystems, Inc. All rights reserved.
90.6 - - SUN PROPRIETARY/CONFIDENTIAL.
90.7 - - Use is subject to license terms.
90.8 - -->
90.9 -
90.10 +<!--
90.11 + - DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
90.12 + -
90.13 + - Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
90.14 + -
90.15 + - The contents of this file are subject to the terms of either the GNU
90.16 + - General Public License Version 2 only ("GPL") or the Common
90.17 + - Development and Distribution License("CDDL") (collectively, the
90.18 + - "License"). You may not use this file except in compliance with the
90.19 + - License. You can obtain a copy of the License at
90.20 + - http://www.netbeans.org/cddl-gplv2.html
90.21 + - or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
90.22 + - specific language governing permissions and limitations under the
90.23 + - License. When distributing the software, include this License Header
90.24 + - Notice in each file and include the License file at
90.25 + - nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
90.26 + - particular file as subject to the "Classpath" exception as provided
90.27 + - by Sun in the GPL Version 2 section of the License file that
90.28 + - accompanied this code. If applicable, add the following below the
90.29 + - License Header, with the fields enclosed by brackets [] replaced by
90.30 + - your own identifying information:
90.31 + - "Portions Copyrighted [year] [name of copyright owner]"
90.32 + -
90.33 + - Contributor(s):
90.34 + -
90.35 + - The Original Software is NetBeans. The Initial Developer of the Original
90.36 + - Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
90.37 + - Microsystems, Inc. All Rights Reserved.
90.38 + -
90.39 + - If you wish your version of this file to be governed by only the CDDL
90.40 + - or only the GPL Version 2, indicate your decision by adding
90.41 + - "[Contributor] elects to include this software in this distribution
90.42 + - under the [CDDL or GPL Version 2] license." If you do not indicate a
90.43 + - single choice of license, a recipient has the option to distribute
90.44 + - your version of this file under either the CDDL, the GPL Version 2 or
90.45 + - to extend the choice of license to its licensees as provided above.
90.46 + - However, if you add GPL Version 2 code and therefore, elected the GPL
90.47 + - Version 2 license, then the option applies only if the new code is
90.48 + - made subject to such option by the copyright holder.
90.49 + -->
90.50 +
90.51 <HTML>
90.52 <head>
90.53 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
91.1 --- a/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-makeproject-ui-resources-samples-hello_ja.html Mon Dec 19 12:18:33 2016 +0100
91.2 +++ b/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-makeproject-ui-resources-samples-hello_ja.html Tue Apr 17 14:14:23 2018 +0200
91.3 @@ -1,9 +1,44 @@
91.4 - <!--
91.5 - - Copyright 2006-2007 Sun Microsystems, Inc. All rights reserved.
91.6 - - SUN PROPRIETARY/CONFIDENTIAL.
91.7 - - Use is subject to license terms.
91.8 - -->
91.9 -
91.10 +<!--
91.11 + - DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
91.12 + -
91.13 + - Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
91.14 + -
91.15 + - The contents of this file are subject to the terms of either the GNU
91.16 + - General Public License Version 2 only ("GPL") or the Common
91.17 + - Development and Distribution License("CDDL") (collectively, the
91.18 + - "License"). You may not use this file except in compliance with the
91.19 + - License. You can obtain a copy of the License at
91.20 + - http://www.netbeans.org/cddl-gplv2.html
91.21 + - or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
91.22 + - specific language governing permissions and limitations under the
91.23 + - License. When distributing the software, include this License Header
91.24 + - Notice in each file and include the License file at
91.25 + - nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
91.26 + - particular file as subject to the "Classpath" exception as provided
91.27 + - by Sun in the GPL Version 2 section of the License file that
91.28 + - accompanied this code. If applicable, add the following below the
91.29 + - License Header, with the fields enclosed by brackets [] replaced by
91.30 + - your own identifying information:
91.31 + - "Portions Copyrighted [year] [name of copyright owner]"
91.32 + -
91.33 + - Contributor(s):
91.34 + -
91.35 + - The Original Software is NetBeans. The Initial Developer of the Original
91.36 + - Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
91.37 + - Microsystems, Inc. All Rights Reserved.
91.38 + -
91.39 + - If you wish your version of this file to be governed by only the CDDL
91.40 + - or only the GPL Version 2, indicate your decision by adding
91.41 + - "[Contributor] elects to include this software in this distribution
91.42 + - under the [CDDL or GPL Version 2] license." If you do not indicate a
91.43 + - single choice of license, a recipient has the option to distribute
91.44 + - your version of this file under either the CDDL, the GPL Version 2 or
91.45 + - to extend the choice of license to its licensees as provided above.
91.46 + - However, if you add GPL Version 2 code and therefore, elected the GPL
91.47 + - Version 2 license, then the option applies only if the new code is
91.48 + - made subject to such option by the copyright holder.
91.49 + -->
91.50 +
91.51 <HTML>
91.52 <head>
91.53 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
92.1 --- a/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-makeproject-ui-resources-samples-lexyacc_ja.html Mon Dec 19 12:18:33 2016 +0100
92.2 +++ b/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-makeproject-ui-resources-samples-lexyacc_ja.html Tue Apr 17 14:14:23 2018 +0200
92.3 @@ -1,9 +1,44 @@
92.4 - <!--
92.5 - - Copyright 2006-2007 Sun Microsystems, Inc. All rights reserved.
92.6 - - SUN PROPRIETARY/CONFIDENTIAL.
92.7 - - Use is subject to license terms.
92.8 - -->
92.9 -
92.10 +<!--
92.11 + - DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
92.12 + -
92.13 + - Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
92.14 + -
92.15 + - The contents of this file are subject to the terms of either the GNU
92.16 + - General Public License Version 2 only ("GPL") or the Common
92.17 + - Development and Distribution License("CDDL") (collectively, the
92.18 + - "License"). You may not use this file except in compliance with the
92.19 + - License. You can obtain a copy of the License at
92.20 + - http://www.netbeans.org/cddl-gplv2.html
92.21 + - or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
92.22 + - specific language governing permissions and limitations under the
92.23 + - License. When distributing the software, include this License Header
92.24 + - Notice in each file and include the License file at
92.25 + - nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
92.26 + - particular file as subject to the "Classpath" exception as provided
92.27 + - by Sun in the GPL Version 2 section of the License file that
92.28 + - accompanied this code. If applicable, add the following below the
92.29 + - License Header, with the fields enclosed by brackets [] replaced by
92.30 + - your own identifying information:
92.31 + - "Portions Copyrighted [year] [name of copyright owner]"
92.32 + -
92.33 + - Contributor(s):
92.34 + -
92.35 + - The Original Software is NetBeans. The Initial Developer of the Original
92.36 + - Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
92.37 + - Microsystems, Inc. All Rights Reserved.
92.38 + -
92.39 + - If you wish your version of this file to be governed by only the CDDL
92.40 + - or only the GPL Version 2, indicate your decision by adding
92.41 + - "[Contributor] elects to include this software in this distribution
92.42 + - under the [CDDL or GPL Version 2] license." If you do not indicate a
92.43 + - single choice of license, a recipient has the option to distribute
92.44 + - your version of this file under either the CDDL, the GPL Version 2 or
92.45 + - to extend the choice of license to its licensees as provided above.
92.46 + - However, if you add GPL Version 2 code and therefore, elected the GPL
92.47 + - Version 2 license, then the option applies only if the new code is
92.48 + - made subject to such option by the copyright holder.
92.49 + -->
92.50 +
92.51 <HTML>
92.52 <head>
92.53 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
93.1 --- a/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-makeproject-ui-resources-samples-pi_ja.html Mon Dec 19 12:18:33 2016 +0100
93.2 +++ b/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-makeproject-ui-resources-samples-pi_ja.html Tue Apr 17 14:14:23 2018 +0200
93.3 @@ -1,9 +1,44 @@
93.4 - <!--
93.5 - - Copyright 2006-2007 Sun Microsystems, Inc. All rights reserved.
93.6 - - SUN PROPRIETARY/CONFIDENTIAL.
93.7 - - Use is subject to license terms.
93.8 - -->
93.9 -
93.10 +<!--
93.11 + - DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
93.12 + -
93.13 + - Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
93.14 + -
93.15 + - The contents of this file are subject to the terms of either the GNU
93.16 + - General Public License Version 2 only ("GPL") or the Common
93.17 + - Development and Distribution License("CDDL") (collectively, the
93.18 + - "License"). You may not use this file except in compliance with the
93.19 + - License. You can obtain a copy of the License at
93.20 + - http://www.netbeans.org/cddl-gplv2.html
93.21 + - or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
93.22 + - specific language governing permissions and limitations under the
93.23 + - License. When distributing the software, include this License Header
93.24 + - Notice in each file and include the License file at
93.25 + - nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
93.26 + - particular file as subject to the "Classpath" exception as provided
93.27 + - by Sun in the GPL Version 2 section of the License file that
93.28 + - accompanied this code. If applicable, add the following below the
93.29 + - License Header, with the fields enclosed by brackets [] replaced by
93.30 + - your own identifying information:
93.31 + - "Portions Copyrighted [year] [name of copyright owner]"
93.32 + -
93.33 + - Contributor(s):
93.34 + -
93.35 + - The Original Software is NetBeans. The Initial Developer of the Original
93.36 + - Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
93.37 + - Microsystems, Inc. All Rights Reserved.
93.38 + -
93.39 + - If you wish your version of this file to be governed by only the CDDL
93.40 + - or only the GPL Version 2, indicate your decision by adding
93.41 + - "[Contributor] elects to include this software in this distribution
93.42 + - under the [CDDL or GPL Version 2] license." If you do not indicate a
93.43 + - single choice of license, a recipient has the option to distribute
93.44 + - your version of this file under either the CDDL, the GPL Version 2 or
93.45 + - to extend the choice of license to its licensees as provided above.
93.46 + - However, if you add GPL Version 2 code and therefore, elected the GPL
93.47 + - Version 2 license, then the option applies only if the new code is
93.48 + - made subject to such option by the copyright holder.
93.49 + -->
93.50 +
93.51 <HTML>
93.52 <head>
93.53 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
94.1 --- a/src/ja/ide/dlight-nativeexecution/dlight-nativeexecution/org/netbeans/modules/nativeexecution/support/Bundle_ja.properties Mon Dec 19 12:18:33 2016 +0100
94.2 +++ b/src/ja/ide/dlight-nativeexecution/dlight-nativeexecution/org/netbeans/modules/nativeexecution/support/Bundle_ja.properties Tue Apr 17 14:14:23 2018 +0200
94.3 @@ -44,9 +44,8 @@
94.4 USER_AUTH_CANCELED=\u30e6\u30fc\u30b6\u30fc\u306b\u3088\u3063\u3066SSH\u8a8d\u8a3c\u304c\u53d6\u308a\u6d88\u3055\u308c\u307e\u3057\u305f
94.5 JSCHReceivedMessageIsTooLong.error.title=\u30db\u30b9\u30c8{0}\u3078\u306e\u63a5\u7d9a\u4e2d\u306b\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f
94.6 JSCHReceivedMessageIsTooLong.error.shorttext=\u4e00\u90e8\u306eSSH\u30b5\u30fc\u30d0\u30fc\u306e\u65e2\u77e5\u306e\u554f\u984c\u304c\u767a\u751f\u3057\u305f\u3068\u63a8\u6e2c\u3055\u308c\u307e\u3059\u3002
94.7 -JSCHReceivedMessageIsTooLong.error.text=\u4e00\u90e8\u306eSSH\u30b5\u30fc\u30d0\u30fc\u306e\u65e2\u77e5\u306e\u554f\u984c\u304c\u767a\u751f\u3057\u305f\u3068\u63a8\u6e2c\u3055\u308c\u307e\u3059\u3002\u30ea\u30e2\u30fc\u30c8\u30fb\u30db\u30b9\u30c8\u4e0a\u306e\u4e00\u90e8\u306e\u8d77\u52d5\u30b9\u30af\u30ea\u30d7\u30c8(~/.bashrc\u306a\u3069)\u304c\u3001\u30ed\u30b0\u30a4\u30f3\u6642\u306b\u4f55\u3089\u304b\u306e\u30c6\u30ad\u30b9\u30c8\u3092\u767a\u884c\u3057\u3066\u3044\u308b\u53ef\u80fd\u6027\u304c\u3042\u308a\u307e\u3059\u3002\u3053\u306e\u5834\u5408\u306f\u3001\u51fa\u529b\u3092\u751f\u6210\u3057\u3066\u3044\u308b\u30b3\u30fc\u30c9\u3092\n\n if [ ${TERM} != "dumb" ]; then\n...\n fi\n\n\u306a\u3069\u3067\u56f2\u307f\u3001\u3082\u3046\u4e00\u5ea6\u3084\u308a\u76f4\u3057\u3066\u304f\u3060\u3055\u3044\u3002
94.8 +JSCHReceivedMessageIsTooLong.error.text=\u4e00\u90e8\u306eSSH\u30b5\u30fc\u30d0\u30fc\u306e\u65e2\u77e5\u306e\u554f\u984c\u304c\u767a\u751f\u3057\u305f\u3068\u63a8\u6e2c\u3055\u308c\u307e\u3059\u3002<br>\u30ea\u30e2\u30fc\u30c8\u30fb\u30db\u30b9\u30c8\u4e0a\u306e\u4e00\u90e8\u306e\u8d77\u52d5\u30b9\u30af\u30ea\u30d7\u30c8(~/.bashrc\u306a\u3069)\u304c\u3001<br>\u30ed\u30b0\u30a4\u30f3\u6642\u306b\u306a\u3093\u3089\u304b\u306e\u30c6\u30ad\u30b9\u30c8\u3092\u51fa\u529b\u3057\u3066\u3044\u308b\u53ef\u80fd\u6027\u304c\u3042\u308a\u307e\u3059\u3002<br>\u3053\u306e\u5834\u5408\u306f\u3001\u51fa\u529b\u3092\u751f\u6210\u3057\u3066\u3044\u308b\u30b3\u30fc\u30c9\u3092<br><br> if [ ${TERM} != "dumb" ]; then <br> ...<br> fi<br><br>\u306a\u3069\u3067\u56f2\u307f\u3001\u3082\u3046\u4e00\u5ea6\u3084\u308a\u76f4\u3057\u3066\u304f\u3060\u3055\u3044\u3002
94.9
94.10 -#TITLE_Message=From {0}:
94.11 TITLE_Message_Ex={0}\u304b\u3089: {1}
94.12
94.13
95.1 --- a/src/ja/ide/dlight-nativeexecution/dlight-nativeexecution/org/netbeans/modules/nativeexecution/support/hostinfo/impl/Bundle_ja.properties Mon Dec 19 12:18:33 2016 +0100
95.2 +++ b/src/ja/ide/dlight-nativeexecution/dlight-nativeexecution/org/netbeans/modules/nativeexecution/support/hostinfo/impl/Bundle_ja.properties Tue Apr 17 14:14:23 2018 +0200
95.3 @@ -40,5 +40,5 @@
95.4
95.5 TITLE_PermissionDenied=\u4e00\u6642\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u306e\u4f7f\u7528\u306b\u5931\u6557\u3057\u307e\u3057\u305f
95.6 SHORTMSG_PermissionDenied={1}({0})
95.7 -MSG_PermissionDenied={1}\u3067\u4e00\u6642\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u3068\u3057\u3066\u306e{0}\u306e\u4f7f\u7528\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002<br>-J-Dcnd.tmpbase="other base location"\u30d5\u30e9\u30b0\u3092\u4f7f\u7528\u3057\u3066\u3001\u66f8\u8fbc\u307f<br>\u304a\u3088\u3073\u5b9f\u884c\u6a29\u9650\u306e\u3042\u308b\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u3092\u6307\u5b9a\u3057\u3066\u304f\u3060\u3055\u3044\u3002
95.8 +MSG_PermissionDenied={1}\u3067{0}\u3092\u4e00\u6642\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u3068\u3057\u3066\u4f7f\u7528\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f\u3002<br>-J-Dcnd.tmpbase="other base location"\u30d5\u30e9\u30b0\u3092\u6307\u5b9a\u3057\u3066IDE\u3092\u5b9f\u884c\u3057\u3001\u5341\u5206\u306a\u9818\u57df\u3068<br>\u66f8\u8fbc\u307f\u304a\u3088\u3073\u5b9f\u884c\u6a29\u9650\u306e\u3042\u308b\u30ea\u30e2\u30fc\u30c8\u30fb\u30db\u30b9\u30c8\u4e0a\u306e\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u3092\u6307\u5b9a\u3057\u3066\u304f\u3060\u3055\u3044\u3002
95.9
96.1 --- a/src/ja/ide/docker-ui/docker-ui/org/netbeans/modules/docker/ui/build2/Bundle_ja.properties Mon Dec 19 12:18:33 2016 +0100
96.2 +++ b/src/ja/ide/docker-ui/docker-ui/org/netbeans/modules/docker/ui/build2/Bundle_ja.properties Tue Apr 17 14:14:23 2018 +0200
96.3 @@ -52,6 +52,13 @@
96.4 BuildOptionsVisual.pullCheckBox.text=\u5e38\u306b\u6700\u65b0\u30d0\u30fc\u30b8\u30e7\u30f3\u306e\u30a4\u30e1\u30fc\u30b8\u3092\u30d7\u30eb(&A)
96.5 BuildInstanceVisual.addButton.text=\u8ffd\u52a0(&A)...
96.6 BuildInstanceVisual.instanceLabel.text=\u30a4\u30f3\u30b9\u30bf\u30f3\u30b9\u3092\u30d3\u30eb\u30c9(&I):
96.7 +BuildContextVisual.fileChooser.button=\u958b\u304f
96.8 +BuildContextVisual.fileChooser.dialogTitle=Docker\u30a4\u30e1\u30fc\u30b8\u30fb\u30b3\u30f3\u30c6\u30ad\u30b9\u30c8\u306e\u9078\u629e
96.9 +BuildOptionsVisual.jLabel1.text=\u30d3\u30eb\u30c9\u6642\u306e\u5909\u6570:
96.10 +BuildOptionsVisual.addVariableButton.text=\u8ffd\u52a0
96.11 +BuildOptionsVisual.deleteVariableButton.text=\u524a\u9664
96.12 +BuildOptionsVisual.buildargsTable.columnModel.title1=\u5024
96.13 +BuildOptionsVisual.buildargsTable.columnModel.title0=\u540d\u524d
96.14 LBL_Build=\u30d3\u30eb\u30c9...
96.15 LBL_BuildContext=\u30b3\u30f3\u30c6\u30ad\u30b9\u30c8\u3092\u30d3\u30eb\u30c9
96.16 LBL_BuildImage=\u30a4\u30e1\u30fc\u30b8\u3092\u30d3\u30eb\u30c9
97.1 --- a/src/ja/ide/docker-ui/docker-ui/org/netbeans/modules/docker/ui/node/Bundle_ja.properties Mon Dec 19 12:18:33 2016 +0100
97.2 +++ b/src/ja/ide/docker-ui/docker-ui/org/netbeans/modules/docker/ui/node/Bundle_ja.properties Tue Apr 17 14:14:23 2018 +0200
97.3 @@ -42,14 +42,17 @@
97.4
97.5 Docker_Root_Node_Name=Docker
97.6 Docker_Root_Node_Short_Description=IDE\u306b\u767b\u9332\u3055\u308c\u3066\u3044\u308bDocker\u30de\u30b7\u30f3
97.7 -
97.8 -
97.9 LBL_AttachContainerAction=\u30a2\u30bf\u30c3\u30c1
97.10 LBL_Containers=\u30b3\u30f3\u30c6\u30ca
97.11 LBL_CopyIdAction=ID\u3092\u30b3\u30d4\u30fc
97.12 +LBL_GetPortMappingsAction=\u30dd\u30fc\u30c8\u30fb\u30d0\u30a4\u30f3\u30c7\u30a3\u30f3\u30b0\u306e\u8868\u793a
97.13 +LBL_HostAddress=\u30db\u30b9\u30c8\u30fb\u30a2\u30c9\u30ec\u30b9
97.14 +LBL_HostPort=\u30db\u30b9\u30c8\u30fb\u30dd\u30fc\u30c8
97.15 # {0} - instance name
97.16 LBL_Offline={0} [\u30aa\u30d5\u30e9\u30a4\u30f3]
97.17 LBL_PauseContainerAction=\u4e00\u6642\u505c\u6b62
97.18 +LBL_Port=\u30dd\u30fc\u30c8
97.19 +LBL_PortBindings=\u30dd\u30fc\u30c8\u30fb\u30d0\u30a4\u30f3\u30c7\u30a3\u30f3\u30b0
97.20 LBL_PushTagAction=\u30d7\u30c3\u30b7\u30e5...
97.21 LBL_RefreshAction=\u30ea\u30d5\u30ec\u30c3\u30b7\u30e5
97.22 LBL_RemoveContainerAction=\u9664\u53bb
97.23 @@ -59,12 +62,15 @@
97.24 LBL_ShowLogAction=\u30ed\u30b0\u306e\u8868\u793a
97.25 LBL_StartContainerAction=\u8d77\u52d5
97.26 LBL_StopContainerAction=\u505c\u6b62
97.27 +LBL_Type=\u30bf\u30a4\u30d7
97.28 LBL_UnpauseContainerAction=\u4e00\u6642\u505c\u6b62\u89e3\u9664
97.29 # {0} - container id
97.30 MSG_AttachingContainer=\u30b3\u30f3\u30c6\u30ca{0}\u306b\u30a2\u30bf\u30c3\u30c1\u4e2d
97.31 MSG_CouldNotCopy=ID\u3092\u30b3\u30d4\u30fc\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f
97.32 MSG_EditCredentials=\u8a8d\u8a3c\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002\u30ec\u30b8\u30b9\u30c8\u30ea\u306e\u8cc7\u683c\u8a3c\u660e\u3092\u69cb\u6210\u3057\u3066\u518d\u8a66\u884c\u3057\u307e\u3059\u304b\u3002
97.33 # {0} - container id
97.34 +MSG_GettingPortMappings=\u30b3\u30f3\u30c6\u30ca{0}\u306e\u30dd\u30fc\u30c8\u30fb\u30d0\u30a4\u30f3\u30c7\u30a3\u30f3\u30b0\u3092\u53d6\u5f97\u4e2d
97.35 +# {0} - container id
97.36 MSG_PausingContainer=\u30b3\u30f3\u30c6\u30ca{0}\u3092\u4e00\u6642\u505c\u6b62\u4e2d
97.37 # {0} - image name
97.38 MSG_Pushing={0}\u3092\u30d7\u30c3\u30b7\u30e5\u4e2d
98.1 --- a/src/ja/ide/docker-ui/docker-ui/org/netbeans/modules/docker/ui/run/Bundle_ja.properties Mon Dec 19 12:18:33 2016 +0100
98.2 +++ b/src/ja/ide/docker-ui/docker-ui/org/netbeans/modules/docker/ui/run/Bundle_ja.properties Tue Apr 17 14:14:23 2018 +0200
98.3 @@ -69,4 +69,10 @@
98.4 RunContainerPropertiesVisual.interactiveCheckBox.text=\u30a2\u30bf\u30c3\u30c1\u3055\u308c\u3066\u3044\u306a\u3044\u5834\u5408\u3067\u3082STDIN\u3092\u30aa\u30fc\u30d7\u30f3\u306b\u3057\u7d9a\u3051\u308b(&K)
98.5 RunContainerPropertiesVisual.commandLabel.text=\u30b3\u30de\u30f3\u30c9(&C):
98.6 RunContainerPropertiesVisual.userLabel.text=\u30e6\u30fc\u30b6\u30fc(&U):
98.7 +RunContainerPropertiesVisual.privilegedCheckBox.text=\u6a29\u9650\u30e2\u30fc\u30c9\u3067\u5b9f\u884c(&R)
98.8 +RunContainerPropertiesVisual.mountVolumesCheckBox.text=\u30dc\u30ea\u30e5\u30fc\u30e0\u306e\u30de\u30a6\u30f3\u30c8(&M)
98.9 +RunContainerPropertiesVisual.addButton.text=\u8ffd\u52a0(&A)
98.10 +RunContainerPropertiesVisual.deleteButton.text=\u524a\u9664(&D)
98.11 +RunContainerPropertiesVisual.volumesTable.columnModel.title1=\u30bd\u30fc\u30b9
98.12 +RunContainerPropertiesVisual.volumesTable.columnModel.title0=\u30bf\u30fc\u30b2\u30c3\u30c8
98.13
99.1 --- a/src/ja/ide/editor-indent/editor-indent/org/netbeans/modules/editor/indent/Bundle_ja.properties Mon Dec 19 12:18:33 2016 +0100
99.2 +++ b/src/ja/ide/editor-indent/editor-indent/org/netbeans/modules/editor/indent/Bundle_ja.properties Tue Apr 17 14:14:23 2018 +0200
99.3 @@ -46,4 +46,3 @@
99.4 OpenIDE-Module-Short-Description=\u30a4\u30f3\u30c7\u30f3\u30c8API\u304a\u3088\u3073SPI\u3092\u542b\u307f\u307e\u3059\u3002
99.5 OpenIDE-Module-Long-Description=\u30e2\u30b8\u30e5\u30fc\u30eb\u306b\u306f\u30a4\u30f3\u30c7\u30f3\u30c8\u3001\u30b3\u30fc\u30c9\u30d5\u30a9\u30fc\u30de\u30c3\u30c8API\u3001\u304a\u3088\u3073\u30a4\u30f3\u30d5\u30e9\u30b9\u30c8\u30e9\u30af\u30c1\u30e3\u304c\u542b\u307e\u308c\u307e\u3059\u3002
99.6
99.7 -
100.1 --- a/src/ja/ide/editor-lib/editor-lib/org/netbeans/modules/editor/lib/Bundle_ja.properties Mon Dec 19 12:18:33 2016 +0100
100.2 +++ b/src/ja/ide/editor-lib/editor-lib/org/netbeans/modules/editor/lib/Bundle_ja.properties Tue Apr 17 14:14:23 2018 +0200
100.3 @@ -43,6 +43,6 @@
100.4 OpenIDE-Module-Name=\u30a8\u30c7\u30a3\u30bf\u30fb\u30e9\u30a4\u30d6\u30e9\u30ea
100.5 OpenIDE-Module-Display-Category=\u7de8\u96c6
100.6 OpenIDE-Module-Short-Description=IDE\u304b\u3089\u72ec\u7acb\u3057\u305f\u30a8\u30c7\u30a3\u30bf\u6a5f\u80fd\u3092\u542b\u3080
100.7 -OpenIDE-Module-Long-Description=\u30a8\u30c7\u30a3\u30bf\u30fb\u30e9\u30a4\u30d6\u30e9\u30ea\u306b\u306f\u3001NetBeans IDE\u304b\u3089\u72ec\u7acb\u3057\u305f\u4e00\u822c\u7684\u306a\u30a8\u30c7\u30a3\u30bf\u6a5f\u80fd\u304c\u542b\u307e\u308c\u307e\u3059\u3002\u30b9\u30bf\u30f3\u30c9\u30a2\u30ed\u30f3\u306e\u30a8\u30c7\u30a3\u30bf\u3068\u3057\u3066\u4f7f\u7528\u3067\u304d\u307e\u3059\u3002
100.8 +OpenIDE-Module-Long-Description=\u30a8\u30c7\u30a3\u30bf\u30fb\u30e9\u30a4\u30d6\u30e9\u30ea\u306b\u306f\u3001NetBeans IDE\u304b\u3089\u307b\u307c\u72ec\u7acb\u3057\u305f\u30a8\u30c7\u30a3\u30bf\u6a5f\u80fd\u304c\u542b\u307e\u308c\u3066\u3044\u307e\u3059\u3002\u3053\u308c\u306f\u30b9\u30bf\u30f3\u30c9\u30a2\u30ed\u30f3\u306e\u30a8\u30c7\u30a3\u30bf\u3067\u518d\u5229\u7528\u3067\u304d\u307e\u3059\u3002\u542b\u307e\u308c\u3066\u3044\u308b\u4fee\u6b63\u6e08\u4e0d\u5177\u5408\u306e\u30ea\u30b9\u30c8\u306b\u3064\u3044\u3066\u306f\u3001http://wiki.netbeans.org/NetBeans8.2PatchesInfo\u3092\u78ba\u8a8d\u3057\u3066\u304f\u3060\u3055\u3044\u3002
100.9
100.10
101.1 --- a/src/ja/ide/editor-lib2/editor-lib2/org/netbeans/modules/editor/lib2/Bundle_ja.properties Mon Dec 19 12:18:33 2016 +0100
101.2 +++ b/src/ja/ide/editor-lib2/editor-lib2/org/netbeans/modules/editor/lib2/Bundle_ja.properties Tue Apr 17 14:14:23 2018 +0200
101.3 @@ -43,7 +43,7 @@
101.4 OpenIDE-Module-Name=\u30a8\u30c7\u30a3\u30bf\u30fb\u30e9\u30a4\u30d6\u30e9\u30ea2
101.5 OpenIDE-Module-Display-Category=\u7de8\u96c6
101.6 OpenIDE-Module-Short-Description=\u30b3\u30a2\u30fb\u30a8\u30c7\u30a3\u30bfAPI\u304a\u3088\u3073SPI\u3092\u542b\u307f\u307e\u3059\u3002
101.7 -OpenIDE-Module-Long-Description=\u30e9\u30a4\u30d6\u30e9\u30ea\u306b\u306f\u3001\u30c6\u30ad\u30b9\u30c8\u30fb\u30c9\u30ad\u30e5\u30e1\u30f3\u30c8\u3001\u30d3\u30e5\u30fc\u968e\u5c64\u3001\u304a\u3088\u3073\u5f37\u8abf\u8868\u793a\u306e\u5b9f\u88c5\u304c\u542b\u307e\u308c\u307e\u3059\u3002\u30e9\u30a4\u30d6\u30e9\u30ea\u306fNetBeans IDE\u4e0a\u3067\u72ec\u7acb\u3057\u3066\u3044\u307e\u3059\u3002
101.8 +OpenIDE-Module-Long-Description=\u30e9\u30a4\u30d6\u30e9\u30ea\u306b\u306f\u3001\u30c6\u30ad\u30b9\u30c8\u30fb\u30c9\u30ad\u30e5\u30e1\u30f3\u30c8\u3001\u30d3\u30e5\u30fc\u968e\u5c64\u3001\u304a\u3088\u3073\u5f37\u8abf\u8868\u793a\u306e\u5b9f\u88c5\u304c\u542b\u307e\u308c\u307e\u3059\u3002\u30e9\u30a4\u30d6\u30e9\u30ea\u306fNetBeans IDE\u304b\u3089\u72ec\u7acb\u3057\u3066\u3044\u307e\u3059\u3002 \u542b\u307e\u308c\u3066\u3044\u308b\u4fee\u6b63\u6e08\u4e0d\u5177\u5408\u306e\u30ea\u30b9\u30c8\u306b\u3064\u3044\u3066\u306f\u3001http://wiki.netbeans.org/NetBeans8.2PatchesInfo\u3092\u78ba\u8a8d\u3057\u3066\u304f\u3060\u3055\u3044\u3002
101.9
101.10 #DocUtils.debugPosition
101.11 wrong_position=\u4f4d\u7f6e\u304c\u6b63\u3057\u304f\u3042\u308a\u307e\u305b\u3093
102.1 --- a/src/ja/ide/projectui/projectui/org/netbeans/modules/project/ui/zip/Bundle_ja.properties Mon Dec 19 12:18:33 2016 +0100
102.2 +++ b/src/ja/ide/projectui/projectui/org/netbeans/modules/project/ui/zip/Bundle_ja.properties Tue Apr 17 14:14:23 2018 +0200
102.3 @@ -79,6 +79,10 @@
102.4 MSG_created={0}\u3092\u4f5c\u6210\u3057\u307e\u3057\u305f
102.5 # {0} - ZIP entry name
102.6 MSG_creating={0}\u3092\u4f5c\u6210\u3057\u3066\u3044\u307e\u3059
102.7 +# {0} - unpacked file
102.8 +# {1} - folder
102.9 +MSG_OutsideRoot=\u30d5\u30a1\u30a4\u30eb{0}\u3092\u66f8\u304d\u8fbc\u307f\u307e\u3059\u304b\u3002\u3053\u306e\u30d5\u30a1\u30a4\u30eb\u306f\u30a4\u30f3\u30dd\u30fc\u30c8\u3055\u308c\u305f\u30eb\u30fc\u30c8{1}\u306e\u5916\u90e8\u306b\u3042\u308a\u307e\u3059
102.10 +MSG_OutsideRootTitle=\u30a4\u30f3\u30dd\u30fc\u30c8\u30fb\u30d5\u30a9\u30eb\u30c0\u306e\u5916\u90e8\u306b\u3042\u308b\u30d5\u30a1\u30a4\u30eb
102.11 # {0} - ZIP entry name
102.12 MSG_packed=\u5727\u7e2e\u3057\u307e\u3057\u305f: {0}
102.13 # {0} - subdirectory
103.1 --- a/src/ja/ide/web-common/web-common/org/netbeans/modules/web/common/Bundle_ja.properties Mon Dec 19 12:18:33 2016 +0100
103.2 +++ b/src/ja/ide/web-common/web-common/org/netbeans/modules/web/common/Bundle_ja.properties Tue Apr 17 14:14:23 2018 +0200
103.3 @@ -41,6 +41,7 @@
103.4 # made subject to such option by the copyright holder.
103.5
103.6 OpenIDE-Module-Display-Category=Web
103.7 +OpenIDE-Module-Long-Description=\u542b\u307e\u308c\u3066\u3044\u308b\u4fee\u6b63\u6e08\u4e0d\u5177\u5408\u306e\u30ea\u30b9\u30c8\u306b\u3064\u3044\u3066\u306f\u3001http://wiki.netbeans.org/NetBeans8.2PatchesInfo\u3092\u78ba\u8a8d\u3057\u3066\u304f\u3060\u3055\u3044\u3002
103.8 OpenIDE-Module-Name=Web\u5171\u901a
103.9 OpenIDE-Module-Short-Description=\u69d8\u3005\u306a"Web\u95a2\u9023"\u5171\u901a\u6a5f\u80fd\u3092\u63d0\u4f9b\u3057\u307e\u3059
103.10
104.1 --- a/src/ja/other/installer/infra/build/web/js/start_strings_ja.js Mon Dec 19 12:18:33 2016 +0100
104.2 +++ b/src/ja/other/installer/infra/build/web/js/start_strings_ja.js Tue Apr 17 14:14:23 2018 +0200
104.3 @@ -59,9 +59,9 @@
104.4 var SUPPORT_LABEL = "\u30b5\u30dd\u30fc\u30c8";
104.5 var SUPPORT_DESCRIPTION = "\u3042\u306a\u305f\u306e\u30a4\u30ce\u30d9\u30fc\u30b7\u30e7\u30f3\u3092\u624b\u52a9\u3051\u3059\u308b\u67d4\u8edf\u306a\u30b5\u30dd\u30fc\u30c8\u30aa\u30d7\u30b7\u30e7\u30f3\u3002";
104.6
104.7 -// $PRODUCT_NAME $TYPE (Installer for $PLATFORM/Zip)/$Language ($Language_ID) $filename ($SIZE) MD5: $MD5
104.8 -var INFO_MESSAGE = "{0}{1} {2}/{3} ({4})<br>{5} ({6} MB)<br>MD5: {7}";
104.9 -var INFO_MESSAGE_OTHER = "{0} ({1} MB)<br>MD5: {2}";
104.10 +// $PRODUCT_NAME $TYPE (Installer for $PLATFORM/Zip)/$Language ($Language_ID) $filename ($SIZE) SHA-256: $MD5
104.11 +var INFO_MESSAGE = "{0}{1} {2}/{3} ({4})<br>{5} ({6} MB)<br>SHA-256: {7}";
104.12 +var INFO_MESSAGE_OTHER = "{0} ({1} MB)<br>SHA-256: {2}";
104.13
104.14 //DO NOT TRANSLATE
104.15 var SUBSCRIPTION_PHP_URL = "http://services.netbeans.org/sub.php";
105.1 --- a/src/ja/ruby/ruby-platform/ruby-platform/org/netbeans/modules/ruby/platform/execution/Bundle_ja.properties Mon Dec 19 12:18:33 2016 +0100
105.2 +++ b/src/ja/ruby/ruby-platform/ruby-platform/org/netbeans/modules/ruby/platform/execution/Bundle_ja.properties Tue Apr 17 14:14:23 2018 +0200
105.3 @@ -48,5 +48,5 @@
105.4
105.5 # ExecutionService
105.6 Running=\u5b9f\u884c\u4e2d
105.7 -#NOI18N_WILL_BE_REMOVED Uniquified={0} #{1}
105.8
105.9 +
106.1 --- a/src/ja/ruby/ruby-project/ruby-project/org/netbeans/modules/ruby/rubyproject/Bundle_ja.properties Mon Dec 19 12:18:33 2016 +0100
106.2 +++ b/src/ja/ruby/ruby-project/ruby-project/org/netbeans/modules/ruby/rubyproject/Bundle_ja.properties Tue Apr 17 14:14:23 2018 +0200
106.3 @@ -144,9 +144,9 @@
106.4 RubyTestingOptionsPanel.autospec.text=AutoSpec
106.5 RunFilePanel.platformLabel.text=Ruby \u30d7\u30e9\u30c3\u30c8\u30d5\u30a9\u30fc\u30e0(&P):
106.6 RunFilePanel.runArgsLabel.text=\u5b9f\u884c\u5f15\u6570(&A):
106.7 -#NOI18N_WILL_BE_REMOVED RunFilePanel.runArgsField.text=
106.8 +
106.9 RunFilePanel.jvmArgsLabel.text=JVM \u5f15\u6570(&V):
106.10 -#NOI18N_WILL_BE_REMOVED RunFilePanel.jvmArgsField.text=
106.11 +
106.12 RunFilePanel.managePlatformsButton.text=\u7ba1\u7406(&M)
106.13 RunFilePanel.displayDialog.text=\u8a2d\u5b9a\u3092\u8a18\u61b6\u3057\u3001\u3053\u306e\u30d5\u30a1\u30a4\u30eb\u3067\u3053\u306e\u30c0\u30a4\u30a2\u30ed\u30b0\u3092\u8868\u793a\u3057\u306a\u3044(&R)
106.14
106.15 @@ -154,9 +154,9 @@
106.16 DebugFile=\u30d5\u30a1\u30a4\u30eb "{0}" \u3092\u30c7\u30d0\u30c3\u30b0
106.17 ACSD_RunFile=\u30d5\u30a1\u30a4\u30eb "{0}" \u306e\u5b9f\u884c\u30aa\u30d7\u30b7\u30e7\u30f3\u3092\u6307\u5b9a
106.18 ACSD_DebugFile=\u30d5\u30a1\u30a4\u30eb "{0}" \u306e\u30c7\u30d0\u30c3\u30b0\u30aa\u30d7\u30b7\u30e7\u30f3\u3092\u6307\u5b9a
106.19 -#NOI18N_WILL_BE_REMOVED RunFilePanel.rubyOptionsField.text=
106.20 +
106.21 RunFilePanel.rubyOptionsLabel.text=Ruby \u306e\u30aa\u30d7\u30b7\u30e7\u30f3(&I):
106.22 -#NOI18N_WILL_BE_REMOVED RunFilePanel.workDirField.text=
106.23 +
106.24 RunFilePanel.workDirLabel.text=\u4f5c\u696d\u7528\u30c7\u30a3\u30ec\u30af\u30c8\u30ea(&W):
106.25 AD_Options_StandardLogging=Ruby \u306e\u30ed\u30b0\u3092\u6709\u52b9\u5316
106.26 AD_Options_DebuggerLogging=Ruby \u30c7\u30d0\u30c3\u30ac\u306e\u30ed\u30b0\u3092\u6709\u52b9\u5316
107.1 --- a/src/ja/ruby/ruby-project/ruby-project/org/netbeans/modules/ruby/rubyproject/rake/Bundle_ja.properties Mon Dec 19 12:18:33 2016 +0100
107.2 +++ b/src/ja/ruby/ruby-project/ruby-project/org/netbeans/modules/ruby/rubyproject/rake/Bundle_ja.properties Tue Apr 17 14:14:23 2018 +0200
107.3 @@ -50,7 +50,7 @@
107.4 RakeTaskChooser.debugCheckbox.text=\u30c7\u30d0\u30c3\u30b0(&D)
107.5 RakeTaskChooser.matchingTaskLabel.text=\u4e00\u81f4\u3059\u308b\u30bf\u30b9\u30af(&M):
107.6 RakeTaskChooser.no.matching.task=<\u73fe\u5728\u306e\u30d5\u30a3\u30eb\u30bf\u306b\u4e00\u81f4\u3059\u308b\u30bf\u30b9\u30af\u306f\u3042\u308a\u307e\u305b\u3093>
107.7 -#NOI18N_WILL_BE_REMOVED RakeTaskChooser.rakeTaskField.text=
107.8 +
107.9 RakeTaskChooser.rakeTaskHint.text=(\u30bf\u30b9\u30af\u540d\u306e\u4e00\u90e8\u3001\u30ef\u30a4\u30eb\u30c9\u30ab\u30fc\u30c9: "?"\u3001"*")
107.10 RakeTaskChooser.rakeTaskLabel.text=\u30d5\u30a3\u30eb\u30bf(&F):
107.11 RakeTaskChooser.refreshButton.accessibleDescription=Rake \u30bf\u30b9\u30af\u3092\u66f4\u65b0
108.1 --- a/src/ja/ruby/ruby-project/ruby-project/org/netbeans/modules/ruby/rubyproject/ui/wizards/Bundle_ja.properties Mon Dec 19 12:18:33 2016 +0100
108.2 +++ b/src/ja/ruby/ruby-project/ruby-project/org/netbeans/modules/ruby/rubyproject/ui/wizards/Bundle_ja.properties Tue Apr 17 14:14:23 2018 +0200
108.3 @@ -61,15 +61,15 @@
108.4 ACSD_JavaExtSourcesProjectLocation=\u65e2\u5b58\u306e\u30bd\u30fc\u30b9\u3092\u4f7f\u7528\u3059\u308b Ruby \u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u3092\u65b0\u898f\u4f5c\u6210\u3057\u307e\u3059
108.5 ProbablyRails=Rails \u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u306e\u3088\u3046\u3067\u3059 - \u4ee3\u308f\u308a\u306b Rails \u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u3092\u4f7f\u7528\u3057\u3066\u304f\u3060\u3055\u3044
108.6
108.7 -#NOI18N
108.8 +
108.9 #TXT_ClassName={0}/main.rb
108.10 #TXT_ClassName=main.rb
108.11
108.12 -#NOI18N
108.13 +
108.14 #TXT_PackageNameSuffix={0}pkg
108.15 LAB_ConfigureProject=\u540d\u524d\u3068\u5834\u6240
108.16 LAB_ConfigureSourceRoots=\u65e2\u5b58\u306e\u30bd\u30fc\u30b9
108.17 -#NOI18N_WILL_BE_REMOVED LAB_IteratorName={0} / {1}
108.18 +
108.19 ERROR_IllegalMainClassName=\u4e3b\u30af\u30e9\u30b9\u540d\u304c\u4e0d\u6b63\u3067\u3059\u3002
108.20 MSG_IllegalProjectLocation=\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u30d5\u30a9\u30eb\u30c0\u304c\u6709\u52b9\u306a\u30d1\u30b9\u3067\u306f\u3042\u308a\u307e\u305b\u3093\u3002
108.21 MSG_ProjectInRootNotSupported=\u30d5\u30a1\u30a4\u30eb\u30b7\u30b9\u30c6\u30e0\u306e\u30eb\u30fc\u30c8\u30d5\u30a9\u30eb\u30c0\u306b\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u3092\u4f5c\u6210\u3059\u308b\u3053\u3068\u306f\u30b5\u30dd\u30fc\u30c8\u3055\u308c\u3066\u3044\u307e\u305b\u3093\u3002
108.22 @@ -93,13 +93,13 @@
108.23 MSG_IllegalTests=\u30c6\u30b9\u30c8\u30d1\u30c3\u30b1\u30fc\u30b8\u30d5\u30a9\u30eb\u30c0 {0} \u304c\u5b58\u5728\u3057\u307e\u305b\u3093\u3002
108.24 MSG_IllegalProjectFolder=\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u30d5\u30a9\u30eb\u30c0\u306f\u3001\u30d1\u30c3\u30b1\u30fc\u30b8\u3092\u542b\u3080\u30d5\u30a9\u30eb\u30c0\u306e\u5916\u306b\u5b58\u5728\u3057\u3066\u3044\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002
108.25
108.26 -#NOI18N
108.27 +
108.28 #TXT_JavaApplication=RubyApplication{0}
108.29
108.30 -#NOI18N
108.31 +
108.32 #TXT_JavaLibrary=RubyLibrary{0}
108.33
108.34 -#NOI18N
108.35 +
108.36 #TXT_JavaProject=RubyProject{0}
108.37 LBL_ProjectNameAndLocationLabel=\u65b0\u898f\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u306e\u540d\u524d\u3068\u5834\u6240\u3092\u6307\u5b9a\u3057\u307e\u3059\u3002
108.38 CTL_SourceRoots=\u30bd\u30fc\u30b9\u30d5\u30a9\u30eb\u30c0:
109.1 --- a/src/ja/ruby/ruby-railsprojects/ruby-railsprojects/org/netbeans/modules/ruby/railsprojects/ui/wizards/Bundle_ja.properties Mon Dec 19 12:18:33 2016 +0100
109.2 +++ b/src/ja/ruby/ruby-railsprojects/ruby-railsprojects/org/netbeans/modules/ruby/railsprojects/ui/wizards/Bundle_ja.properties Tue Apr 17 14:14:23 2018 +0200
109.3 @@ -82,7 +82,7 @@
109.4
109.5 LAB_ConfigureProject=\u540d\u524d\u3068\u5834\u6240
109.6 LAB_ConfigureDatabase=\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u69cb\u6210
109.7 -#NOI18N_WILL_BE_REMOVED LAB_IteratorName={0} / {1}
109.8 +
109.9 MSG_IllegalProjectLocation=\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u30d5\u30a9\u30eb\u30c0\u304c\u6709\u52b9\u306a\u30d1\u30b9\u3067\u306f\u3042\u308a\u307e\u305b\u3093\u3002
109.10 MSG_ProjectInRootNotSupported=\u30d5\u30a1\u30a4\u30eb\u30b7\u30b9\u30c6\u30e0\u306e\u30eb\u30fc\u30c8\u30d5\u30a9\u30eb\u30c0\u306b\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u3092\u4f5c\u6210\u3059\u308b\u3053\u3068\u306f\u30b5\u30dd\u30fc\u30c8\u3055\u308c\u3066\u3044\u307e\u305b\u3093\u3002
109.11 MSG_ProjectAlreadyProject=\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u306f\u3059\u3067\u306b NetBeans \u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u3067\u3059 (\u30e1\u30e2\u30ea\u30fc\u5185\u306b\u306e\u307f\u3042\u308b\u53ef\u80fd\u6027\u3042\u308a)\u3002
109.12 @@ -97,7 +97,7 @@
109.13 # (should not be an error in the future: see #42422)
109.14 TXT_NetBeansProject=NetBeans \u30d7\u30ed\u30b8\u30a7\u30af\u30c8
109.15
109.16 -#NOI18N
109.17 +
109.18 #TXT_RailsApplication=RailsApplication{0}
109.19 LBL_ProjectNameAndLocationLabel=\u65e2\u5b58\u306e Rails \u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u306e\u540d\u524d\u3068\u5834\u6240\u3092\u6307\u5b9a
109.20 # ACSN_jPanel1=N/A
109.21 @@ -111,7 +111,7 @@
109.22 # ACSD_createdFolderLabel=N/A
109.23 ACSN_jLabel4=\u65b0\u898f\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u306e\u540d\u524d\u3068\u5834\u6240\u3092\u6307\u5b9a\u3057\u307e\u3059\u3002
109.24 # ACSD_jLabel4=N/A
109.25 -#NOI18N_WILL_BE_REMOVED ACSD_jPanel1=
109.26 +
109.27 # ACSN_optionsContainer=N/A
109.28 # ACSD_optionsContainer=N/A
109.29 # ACSN_locationContainer=N/A
110.1 --- a/src/ja/ruby/ruby-refactoring/ruby-refactoring/org/netbeans/modules/refactoring/ruby/ui/Bundle_ja.properties Mon Dec 19 12:18:33 2016 +0100
110.2 +++ b/src/ja/ruby/ruby-refactoring/ruby-refactoring/org/netbeans/modules/refactoring/ruby/ui/Bundle_ja.properties Tue Apr 17 14:14:23 2018 +0200
110.3 @@ -55,7 +55,7 @@
110.4 DSC_WhereUsedFindDirectSubTypes=<b>{0}</b> \u306e\u76f4\u63a5\u7684\u30b5\u30d6\u30bf\u30a4\u30d7\u3092\u691c\u7d22
110.5 DSC_WhereUsedWarningInDevelopment=Ruby \u30ea\u30d5\u30a1\u30af\u30bf\u30ea\u30f3\u30b0\u306f\u5927\u51e1\u306e\u3082\u306e\u3067\u3059\u3002\u3059\u3079\u3066\u306e\u5909\u66f4\u3092\u78ba\u8a8d\u3057\u3066\u304f\u3060\u3055\u3044\u3002
110.6 DSC_WhereUsedOf=(<b>{0}</b>)
110.7 -#NOI18N_WILL_BE_REMOVED DSC_And=&
110.8 +
110.9 LBL_EncapsulateFieldsAction=\u30d5\u30a3\u30fc\u30eb\u30c9\u3092\u30ab\u30d7\u30bb\u30eb\u5316(&F)...
110.10 LBL_EncapsulateFields=\u30d5\u30a3\u30fc\u30eb\u30c9\u3092\u30ab\u30d7\u30bb\u30eb\u5316
110.11 DSC_EncapsulateFields=\u30af\u30e9\u30b9 <b>{0}</b> \u5185\u306e\u30d5\u30a3\u30fc\u30eb\u30c9\u3092\u30ab\u30d7\u30bb\u30eb\u5316
110.12 @@ -233,7 +233,7 @@
110.13
110.14 # --- GENERAL ------------------------------------------------------------------
110.15 # "Selected" column label
110.16 -#NOI18N_WILL_BE_REMOVED LBL_Selected=
110.17 +
110.18 LBL_NotAvailable=<\u306a\u3057>
110.19
110.20 # --- SAFE DELETE REFACTORING --------------------------------------------------
110.21 @@ -288,7 +288,7 @@
110.22 # Supertype combobox label
110.23 LBL_PullUp_Supertype=\u9001\u308a\u5148\u30b9\u30fc\u30d1\u30fc\u30bf\u30a4\u30d7(&S)\:
110.24 # "Selected" column label
110.25 -#NOI18N_WILL_BE_REMOVED LBL_PullUp_Selected=
110.26 +
110.27 # "Member" column label
110.28 LBL_PullUp_Member=\u30e1\u30f3\u30d0\u30fc
110.29 # "Make Abstract" column label
110.30 @@ -340,7 +340,7 @@
110.31
110.32 # *** Refactoring panel ***
110.33
110.34 -#NOI18N_WILL_BE_REMOVED LBL_DeclareFinal=
110.35 +
110.36 LBL_CopyClass=\u30af\u30e9\u30b9\u3092\u30b3\u30d4\u30fc
110.37 DSC_CopyClass=\u30af\u30e9\u30b9 <b>{0}</b> \u3092\u30b3\u30d4\u30fc
110.38
111.1 --- a/src/ja/ruby/ruby/ruby/org/netbeans/modules/ruby/Bundle_ja.properties Mon Dec 19 12:18:33 2016 +0100
111.2 +++ b/src/ja/ruby/ruby/ruby/org/netbeans/modules/ruby/Bundle_ja.properties Tue Apr 17 14:14:23 2018 +0200
111.3 @@ -266,9 +266,6 @@
111.4
111.5 InstalledVersions=\u30a4\u30f3\u30b9\u30c8\u30fc\u30eb\u3055\u308c\u3066\u3044\u308b\u30d0\u30fc\u30b8\u30e7\u30f3: {0}
111.6
111.7 -# HTTP status codes for code completion,
111.8 -# descriptions taken from http://www.google.com/support/webmasters/bin/answer.py?hl=en&answer=40132 and http://www.w3.org/Protocols/rfc2616/rfc2616-sec10.html
111.9 -
111.10 SC_100=100 (\u7d99\u7d9a)
111.11 SC_100_DESC=\u8981\u6c42\u5074\u306f\u8981\u6c42\u3092\u7d9a\u884c\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002\u30b5\u30fc\u30d0\u30fc\u306f\u8981\u6c42\u306e\u6700\u521d\u306e\u90e8\u5206\u3092\u53d7\u4fe1\u3057\u3001\u6b8b\u308a\u306e\u90e8\u5206\u3092\u5f85\u3063\u3066\u3044\u308b\u3053\u3068\u3092\u793a\u3059\u305f\u3081\u306b\u3053\u306e\u30b3\u30fc\u30c9\u3092\u8fd4\u3057\u307e\u3059\u3002
111.12 SC_101=101 (\u30d7\u30ed\u30c8\u30b3\u30eb\u5207\u308a\u66ff\u3048)
112.1 --- a/src/ko/other/installer/infra/build/web/js/start_strings_ko.js Mon Dec 19 12:18:33 2016 +0100
112.2 +++ b/src/ko/other/installer/infra/build/web/js/start_strings_ko.js Tue Apr 17 14:14:23 2018 +0200
112.3 @@ -59,9 +59,9 @@
112.4 var SUPPORT_LABEL = "Support";
112.5 var SUPPORT_DESCRIPTION = "Flexible support options to help you stay focused on innovation.";
112.6
112.7 -// $PRODUCT_NAME $TYPE (Installer for $PLATFORM/Zip)/$Language ($Language_ID) $filename ($SIZE) MD5: $MD5
112.8 -var INFO_MESSAGE = "{0}{1} {2}/{3} ({4})<br>{5} ({6} MB)<br>MD5: {7}";
112.9 -var INFO_MESSAGE_OTHER = "{0} ({1} MB)<br>MD5: {2}";
112.10 +// $PRODUCT_NAME $TYPE (Installer for $PLATFORM/Zip)/$Language ($Language_ID) $filename ($SIZE) SHA-256: $MD5
112.11 +var INFO_MESSAGE = "{0}{1} {2}/{3} ({4})<br>{5} ({6} MB)<br>SHA-256: {7}";
112.12 +var INFO_MESSAGE_OTHER = "{0} ({1} MB)<br>SHA-256: {2}";
112.13
112.14 //DO NOT TRANSLATE
112.15 var SUBSCRIPTION_PHP_URL = "http://services.netbeans.org/sub.php";
113.1 --- a/src/lt/other/installer/infra/build/web/js/start_strings_lt.js Mon Dec 19 12:18:33 2016 +0100
113.2 +++ b/src/lt/other/installer/infra/build/web/js/start_strings_lt.js Tue Apr 17 14:14:23 2018 +0200
113.3 @@ -59,9 +59,9 @@
113.4 var SUPPORT_LABEL = "Support";
113.5 var SUPPORT_DESCRIPTION = "Flexible support options to help you stay focused on innovation.";
113.6
113.7 -// $PRODUCT_NAME $TYPE (Installer for $PLATFORM/Zip)/$Language ($Language_ID) $filename ($SIZE) MD5: $MD5
113.8 -var INFO_MESSAGE = "{0}{1} {2}/{3} ({4})<br>{5} ({6} MB)<br>MD5: {7}";
113.9 -var INFO_MESSAGE_OTHER = "{0} ({1} MB)<br>MD5: {2}";
113.10 +// $PRODUCT_NAME $TYPE (Installer for $PLATFORM/Zip)/$Language ($Language_ID) $filename ($SIZE) SHA-256: $MD5
113.11 +var INFO_MESSAGE = "{0}{1} {2}/{3} ({4})<br>{5} ({6} MB)<br>SHA-256: {7}";
113.12 +var INFO_MESSAGE_OTHER = "{0} ({1} MB)<br>SHA-256: {2}";
113.13
113.14 //DO NOT TRANSLATE
113.15 var SUBSCRIPTION_PHP_URL = "http://services.netbeans.org/sub.php";
114.1 --- a/src/nl_BE/other/installer/infra/build/web/js/start_strings_nl_BE.js Mon Dec 19 12:18:33 2016 +0100
114.2 +++ b/src/nl_BE/other/installer/infra/build/web/js/start_strings_nl_BE.js Tue Apr 17 14:14:23 2018 +0200
114.3 @@ -59,9 +59,9 @@
114.4 var SUPPORT_LABEL = "Support";
114.5 var SUPPORT_DESCRIPTION = "Flexible support options to help you stay focused on innovation.";
114.6
114.7 -// $PRODUCT_NAME $TYPE (Installer for $PLATFORM/Zip)/$Language ($Language_ID) $filename ($SIZE) MD5: $MD5
114.8 -var INFO_MESSAGE = "{0}{1} {2}/{3} ({4})<br>{5} ({6} MB)<br>MD5: {7}";
114.9 -var INFO_MESSAGE_OTHER = "{0} ({1} MB)<br>MD5: {2}";
114.10 +// $PRODUCT_NAME $TYPE (Installer for $PLATFORM/Zip)/$Language ($Language_ID) $filename ($SIZE) SHA-256: $MD5
114.11 +var INFO_MESSAGE = "{0}{1} {2}/{3} ({4})<br>{5} ({6} MB)<br>SHA-256: {7}";
114.12 +var INFO_MESSAGE_OTHER = "{0} ({1} MB)<br>SHA-256: {2}";
114.13
114.14 //DO NOT TRANSLATE
114.15 var SUBSCRIPTION_PHP_URL = "http://services.netbeans.org/sub.php";
115.1 --- a/src/nl_NL/other/installer/infra/build/web/js/start_strings_nl_NL.js Mon Dec 19 12:18:33 2016 +0100
115.2 +++ b/src/nl_NL/other/installer/infra/build/web/js/start_strings_nl_NL.js Tue Apr 17 14:14:23 2018 +0200
115.3 @@ -59,9 +59,9 @@
115.4 var SUPPORT_LABEL = "Support";
115.5 var SUPPORT_DESCRIPTION = "Flexible support options to help you stay focused on innovation.";
115.6
115.7 -// $PRODUCT_NAME $TYPE (Installer for $PLATFORM/Zip)/$Language ($Language_ID) $filename ($SIZE) MD5: $MD5
115.8 -var INFO_MESSAGE = "{0}{1} {2}/{3} ({4})<br>{5} ({6} MB)<br>MD5: {7}";
115.9 -var INFO_MESSAGE_OTHER = "{0} ({1} MB)<br>MD5: {2}";
115.10 +// $PRODUCT_NAME $TYPE (Installer for $PLATFORM/Zip)/$Language ($Language_ID) $filename ($SIZE) SHA-256: $MD5
115.11 +var INFO_MESSAGE = "{0}{1} {2}/{3} ({4})<br>{5} ({6} MB)<br>SHA-256: {7}";
115.12 +var INFO_MESSAGE_OTHER = "{0} ({1} MB)<br>SHA-256: {2}";
115.13
115.14 //DO NOT TRANSLATE
115.15 var SUBSCRIPTION_PHP_URL = "http://services.netbeans.org/sub.php";
116.1 --- a/src/pl/other/installer/infra/build/web/js/start_strings_pl.js Mon Dec 19 12:18:33 2016 +0100
116.2 +++ b/src/pl/other/installer/infra/build/web/js/start_strings_pl.js Tue Apr 17 14:14:23 2018 +0200
116.3 @@ -59,9 +59,9 @@
116.4 var SUPPORT_LABEL = "Support";
116.5 var SUPPORT_DESCRIPTION = "Flexible support options to help you stay focused on innovation.";
116.6
116.7 -// $PRODUCT_NAME $TYPE (Installer for $PLATFORM/Zip)/$Language ($Language_ID) $filename ($SIZE) MD5: $MD5
116.8 -var INFO_MESSAGE = "{0}{1} {2}/{3} ({4})<br>{5} ({6} MB)<br>MD5: {7}";
116.9 -var INFO_MESSAGE_OTHER = "{0} ({1} MB)<br>MD5: {2}";
116.10 +// $PRODUCT_NAME $TYPE (Installer for $PLATFORM/Zip)/$Language ($Language_ID) $filename ($SIZE) SHA-256: $MD5
116.11 +var INFO_MESSAGE = "{0}{1} {2}/{3} ({4})<br>{5} ({6} MB)<br>SHA-256: {7}";
116.12 +var INFO_MESSAGE_OTHER = "{0} ({1} MB)<br>SHA-256: {2}";
116.13
116.14 //DO NOT TRANSLATE
116.15 var SUBSCRIPTION_PHP_URL = "http://services.netbeans.org/sub.php";
117.1 --- a/src/pt_BR/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/resources/samples/fractal_pt_BR.html Mon Dec 19 12:18:33 2016 +0100
117.2 +++ b/src/pt_BR/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/resources/samples/fractal_pt_BR.html Tue Apr 17 14:14:23 2018 +0200
117.3 @@ -1,9 +1,44 @@
117.4 - <!--
117.5 - - Copyright 2006-2007 Sun Microsystems, Inc. All rights reserved.
117.6 - - SUN PROPRIETARY/CONFIDENTIAL.
117.7 - - Use is subject to license terms.
117.8 - -->
117.9 -
117.10 +<!--
117.11 + - DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
117.12 + -
117.13 + - Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
117.14 + -
117.15 + - The contents of this file are subject to the terms of either the GNU
117.16 + - General Public License Version 2 only ("GPL") or the Common
117.17 + - Development and Distribution License("CDDL") (collectively, the
117.18 + - "License"). You may not use this file except in compliance with the
117.19 + - License. You can obtain a copy of the License at
117.20 + - http://www.netbeans.org/cddl-gplv2.html
117.21 + - or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
117.22 + - specific language governing permissions and limitations under the
117.23 + - License. When distributing the software, include this License Header
117.24 + - Notice in each file and include the License file at
117.25 + - nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
117.26 + - particular file as subject to the "Classpath" exception as provided
117.27 + - by Sun in the GPL Version 2 section of the License file that
117.28 + - accompanied this code. If applicable, add the following below the
117.29 + - License Header, with the fields enclosed by brackets [] replaced by
117.30 + - your own identifying information:
117.31 + - "Portions Copyrighted [year] [name of copyright owner]"
117.32 + -
117.33 + - Contributor(s):
117.34 + -
117.35 + - The Original Software is NetBeans. The Initial Developer of the Original
117.36 + - Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
117.37 + - Microsystems, Inc. All Rights Reserved.
117.38 + -
117.39 + - If you wish your version of this file to be governed by only the CDDL
117.40 + - or only the GPL Version 2, indicate your decision by adding
117.41 + - "[Contributor] elects to include this software in this distribution
117.42 + - under the [CDDL or GPL Version 2] license." If you do not indicate a
117.43 + - single choice of license, a recipient has the option to distribute
117.44 + - your version of this file under either the CDDL, the GPL Version 2 or
117.45 + - to extend the choice of license to its licensees as provided above.
117.46 + - However, if you add GPL Version 2 code and therefore, elected the GPL
117.47 + - Version 2 license, then the option applies only if the new code is
117.48 + - made subject to such option by the copyright holder.
117.49 + -->
117.50 +
117.51 <HTML>
117.52 <head>
117.53 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
118.1 --- a/src/pt_BR/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/resources/samples/hello_pt_BR.html Mon Dec 19 12:18:33 2016 +0100
118.2 +++ b/src/pt_BR/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/resources/samples/hello_pt_BR.html Tue Apr 17 14:14:23 2018 +0200
118.3 @@ -1,9 +1,44 @@
118.4 - <!--
118.5 - - Copyright 2006-2007 Sun Microsystems, Inc. All rights reserved.
118.6 - - SUN PROPRIETARY/CONFIDENTIAL.
118.7 - - Use is subject to license terms.
118.8 - -->
118.9 -
118.10 +<!--
118.11 + - DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
118.12 + -
118.13 + - Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
118.14 + -
118.15 + - The contents of this file are subject to the terms of either the GNU
118.16 + - General Public License Version 2 only ("GPL") or the Common
118.17 + - Development and Distribution License("CDDL") (collectively, the
118.18 + - "License"). You may not use this file except in compliance with the
118.19 + - License. You can obtain a copy of the License at
118.20 + - http://www.netbeans.org/cddl-gplv2.html
118.21 + - or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
118.22 + - specific language governing permissions and limitations under the
118.23 + - License. When distributing the software, include this License Header
118.24 + - Notice in each file and include the License file at
118.25 + - nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
118.26 + - particular file as subject to the "Classpath" exception as provided
118.27 + - by Sun in the GPL Version 2 section of the License file that
118.28 + - accompanied this code. If applicable, add the following below the
118.29 + - License Header, with the fields enclosed by brackets [] replaced by
118.30 + - your own identifying information:
118.31 + - "Portions Copyrighted [year] [name of copyright owner]"
118.32 + -
118.33 + - Contributor(s):
118.34 + -
118.35 + - The Original Software is NetBeans. The Initial Developer of the Original
118.36 + - Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
118.37 + - Microsystems, Inc. All Rights Reserved.
118.38 + -
118.39 + - If you wish your version of this file to be governed by only the CDDL
118.40 + - or only the GPL Version 2, indicate your decision by adding
118.41 + - "[Contributor] elects to include this software in this distribution
118.42 + - under the [CDDL or GPL Version 2] license." If you do not indicate a
118.43 + - single choice of license, a recipient has the option to distribute
118.44 + - your version of this file under either the CDDL, the GPL Version 2 or
118.45 + - to extend the choice of license to its licensees as provided above.
118.46 + - However, if you add GPL Version 2 code and therefore, elected the GPL
118.47 + - Version 2 license, then the option applies only if the new code is
118.48 + - made subject to such option by the copyright holder.
118.49 + -->
118.50 +
118.51 <HTML>
118.52 <head>
118.53 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
119.1 --- a/src/pt_BR/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/resources/samples/lexyacc_pt_BR.html Mon Dec 19 12:18:33 2016 +0100
119.2 +++ b/src/pt_BR/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/resources/samples/lexyacc_pt_BR.html Tue Apr 17 14:14:23 2018 +0200
119.3 @@ -1,9 +1,44 @@
119.4 - <!--
119.5 - - Copyright 2006-2007 Sun Microsystems, Inc. All rights reserved.
119.6 - - SUN PROPRIETARY/CONFIDENTIAL.
119.7 - - Use is subject to license terms.
119.8 - -->
119.9 -
119.10 +<!--
119.11 + - DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
119.12 + -
119.13 + - Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
119.14 + -
119.15 + - The contents of this file are subject to the terms of either the GNU
119.16 + - General Public License Version 2 only ("GPL") or the Common
119.17 + - Development and Distribution License("CDDL") (collectively, the
119.18 + - "License"). You may not use this file except in compliance with the
119.19 + - License. You can obtain a copy of the License at
119.20 + - http://www.netbeans.org/cddl-gplv2.html
119.21 + - or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
119.22 + - specific language governing permissions and limitations under the
119.23 + - License. When distributing the software, include this License Header
119.24 + - Notice in each file and include the License file at
119.25 + - nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
119.26 + - particular file as subject to the "Classpath" exception as provided
119.27 + - by Sun in the GPL Version 2 section of the License file that
119.28 + - accompanied this code. If applicable, add the following below the
119.29 + - License Header, with the fields enclosed by brackets [] replaced by
119.30 + - your own identifying information:
119.31 + - "Portions Copyrighted [year] [name of copyright owner]"
119.32 + -
119.33 + - Contributor(s):
119.34 + -
119.35 + - The Original Software is NetBeans. The Initial Developer of the Original
119.36 + - Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
119.37 + - Microsystems, Inc. All Rights Reserved.
119.38 + -
119.39 + - If you wish your version of this file to be governed by only the CDDL
119.40 + - or only the GPL Version 2, indicate your decision by adding
119.41 + - "[Contributor] elects to include this software in this distribution
119.42 + - under the [CDDL or GPL Version 2] license." If you do not indicate a
119.43 + - single choice of license, a recipient has the option to distribute
119.44 + - your version of this file under either the CDDL, the GPL Version 2 or
119.45 + - to extend the choice of license to its licensees as provided above.
119.46 + - However, if you add GPL Version 2 code and therefore, elected the GPL
119.47 + - Version 2 license, then the option applies only if the new code is
119.48 + - made subject to such option by the copyright holder.
119.49 + -->
119.50 +
119.51 <HTML>
119.52 <head>
119.53 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
120.1 --- a/src/pt_BR/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/resources/samples/pi_pt_BR.html Mon Dec 19 12:18:33 2016 +0100
120.2 +++ b/src/pt_BR/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/resources/samples/pi_pt_BR.html Tue Apr 17 14:14:23 2018 +0200
120.3 @@ -1,9 +1,44 @@
120.4 - <!--
120.5 - - Copyright 2006-2007 Sun Microsystems, Inc. All rights reserved.
120.6 - - SUN PROPRIETARY/CONFIDENTIAL.
120.7 - - Use is subject to license terms.
120.8 - -->
120.9 -
120.10 +<!--
120.11 + - DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
120.12 + -
120.13 + - Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
120.14 + -
120.15 + - The contents of this file are subject to the terms of either the GNU
120.16 + - General Public License Version 2 only ("GPL") or the Common
120.17 + - Development and Distribution License("CDDL") (collectively, the
120.18 + - "License"). You may not use this file except in compliance with the
120.19 + - License. You can obtain a copy of the License at
120.20 + - http://www.netbeans.org/cddl-gplv2.html
120.21 + - or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
120.22 + - specific language governing permissions and limitations under the
120.23 + - License. When distributing the software, include this License Header
120.24 + - Notice in each file and include the License file at
120.25 + - nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
120.26 + - particular file as subject to the "Classpath" exception as provided
120.27 + - by Sun in the GPL Version 2 section of the License file that
120.28 + - accompanied this code. If applicable, add the following below the
120.29 + - License Header, with the fields enclosed by brackets [] replaced by
120.30 + - your own identifying information:
120.31 + - "Portions Copyrighted [year] [name of copyright owner]"
120.32 + -
120.33 + - Contributor(s):
120.34 + -
120.35 + - The Original Software is NetBeans. The Initial Developer of the Original
120.36 + - Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
120.37 + - Microsystems, Inc. All Rights Reserved.
120.38 + -
120.39 + - If you wish your version of this file to be governed by only the CDDL
120.40 + - or only the GPL Version 2, indicate your decision by adding
120.41 + - "[Contributor] elects to include this software in this distribution
120.42 + - under the [CDDL or GPL Version 2] license." If you do not indicate a
120.43 + - single choice of license, a recipient has the option to distribute
120.44 + - your version of this file under either the CDDL, the GPL Version 2 or
120.45 + - to extend the choice of license to its licensees as provided above.
120.46 + - However, if you add GPL Version 2 code and therefore, elected the GPL
120.47 + - Version 2 license, then the option applies only if the new code is
120.48 + - made subject to such option by the copyright holder.
120.49 + -->
120.50 +
120.51 <HTML>
120.52 <head>
120.53 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
121.1 --- a/src/pt_BR/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-makeproject-ui-resources-samples-fractal_pt_BR.html Mon Dec 19 12:18:33 2016 +0100
121.2 +++ b/src/pt_BR/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-makeproject-ui-resources-samples-fractal_pt_BR.html Tue Apr 17 14:14:23 2018 +0200
121.3 @@ -1,9 +1,44 @@
121.4 - <!--
121.5 - - Copyright 2006-2007 Sun Microsystems, Inc. All rights reserved.
121.6 - - SUN PROPRIETARY/CONFIDENTIAL.
121.7 - - Use is subject to license terms.
121.8 - -->
121.9 -
121.10 +<!--
121.11 + - DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
121.12 + -
121.13 + - Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
121.14 + -
121.15 + - The contents of this file are subject to the terms of either the GNU
121.16 + - General Public License Version 2 only ("GPL") or the Common
121.17 + - Development and Distribution License("CDDL") (collectively, the
121.18 + - "License"). You may not use this file except in compliance with the
121.19 + - License. You can obtain a copy of the License at
121.20 + - http://www.netbeans.org/cddl-gplv2.html
121.21 + - or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
121.22 + - specific language governing permissions and limitations under the
121.23 + - License. When distributing the software, include this License Header
121.24 + - Notice in each file and include the License file at
121.25 + - nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
121.26 + - particular file as subject to the "Classpath" exception as provided
121.27 + - by Sun in the GPL Version 2 section of the License file that
121.28 + - accompanied this code. If applicable, add the following below the
121.29 + - License Header, with the fields enclosed by brackets [] replaced by
121.30 + - your own identifying information:
121.31 + - "Portions Copyrighted [year] [name of copyright owner]"
121.32 + -
121.33 + - Contributor(s):
121.34 + -
121.35 + - The Original Software is NetBeans. The Initial Developer of the Original
121.36 + - Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
121.37 + - Microsystems, Inc. All Rights Reserved.
121.38 + -
121.39 + - If you wish your version of this file to be governed by only the CDDL
121.40 + - or only the GPL Version 2, indicate your decision by adding
121.41 + - "[Contributor] elects to include this software in this distribution
121.42 + - under the [CDDL or GPL Version 2] license." If you do not indicate a
121.43 + - single choice of license, a recipient has the option to distribute
121.44 + - your version of this file under either the CDDL, the GPL Version 2 or
121.45 + - to extend the choice of license to its licensees as provided above.
121.46 + - However, if you add GPL Version 2 code and therefore, elected the GPL
121.47 + - Version 2 license, then the option applies only if the new code is
121.48 + - made subject to such option by the copyright holder.
121.49 + -->
121.50 +
121.51 <HTML>
121.52 <head>
121.53 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
122.1 --- a/src/pt_BR/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-makeproject-ui-resources-samples-hello_pt_BR.html Mon Dec 19 12:18:33 2016 +0100
122.2 +++ b/src/pt_BR/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-makeproject-ui-resources-samples-hello_pt_BR.html Tue Apr 17 14:14:23 2018 +0200
122.3 @@ -1,9 +1,44 @@
122.4 - <!--
122.5 - - Copyright 2006-2007 Sun Microsystems, Inc. All rights reserved.
122.6 - - SUN PROPRIETARY/CONFIDENTIAL.
122.7 - - Use is subject to license terms.
122.8 - -->
122.9 -
122.10 +<!--
122.11 + - DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
122.12 + -
122.13 + - Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
122.14 + -
122.15 + - The contents of this file are subject to the terms of either the GNU
122.16 + - General Public License Version 2 only ("GPL") or the Common
122.17 + - Development and Distribution License("CDDL") (collectively, the
122.18 + - "License"). You may not use this file except in compliance with the
122.19 + - License. You can obtain a copy of the License at
122.20 + - http://www.netbeans.org/cddl-gplv2.html
122.21 + - or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
122.22 + - specific language governing permissions and limitations under the
122.23 + - License. When distributing the software, include this License Header
122.24 + - Notice in each file and include the License file at
122.25 + - nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
122.26 + - particular file as subject to the "Classpath" exception as provided
122.27 + - by Sun in the GPL Version 2 section of the License file that
122.28 + - accompanied this code. If applicable, add the following below the
122.29 + - License Header, with the fields enclosed by brackets [] replaced by
122.30 + - your own identifying information:
122.31 + - "Portions Copyrighted [year] [name of copyright owner]"
122.32 + -
122.33 + - Contributor(s):
122.34 + -
122.35 + - The Original Software is NetBeans. The Initial Developer of the Original
122.36 + - Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
122.37 + - Microsystems, Inc. All Rights Reserved.
122.38 + -
122.39 + - If you wish your version of this file to be governed by only the CDDL
122.40 + - or only the GPL Version 2, indicate your decision by adding
122.41 + - "[Contributor] elects to include this software in this distribution
122.42 + - under the [CDDL or GPL Version 2] license." If you do not indicate a
122.43 + - single choice of license, a recipient has the option to distribute
122.44 + - your version of this file under either the CDDL, the GPL Version 2 or
122.45 + - to extend the choice of license to its licensees as provided above.
122.46 + - However, if you add GPL Version 2 code and therefore, elected the GPL
122.47 + - Version 2 license, then the option applies only if the new code is
122.48 + - made subject to such option by the copyright holder.
122.49 + -->
122.50 +
122.51 <HTML>
122.52 <head>
122.53 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
123.1 --- a/src/pt_BR/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-makeproject-ui-resources-samples-lexyacc_pt_BR.html Mon Dec 19 12:18:33 2016 +0100
123.2 +++ b/src/pt_BR/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-makeproject-ui-resources-samples-lexyacc_pt_BR.html Tue Apr 17 14:14:23 2018 +0200
123.3 @@ -1,9 +1,44 @@
123.4 - <!--
123.5 - - Copyright 2006-2007 Sun Microsystems, Inc. All rights reserved.
123.6 - - SUN PROPRIETARY/CONFIDENTIAL.
123.7 - - Use is subject to license terms.
123.8 - -->
123.9 -
123.10 +<!--
123.11 + - DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
123.12 + -
123.13 + - Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
123.14 + -
123.15 + - The contents of this file are subject to the terms of either the GNU
123.16 + - General Public License Version 2 only ("GPL") or the Common
123.17 + - Development and Distribution License("CDDL") (collectively, the
123.18 + - "License"). You may not use this file except in compliance with the
123.19 + - License. You can obtain a copy of the License at
123.20 + - http://www.netbeans.org/cddl-gplv2.html
123.21 + - or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
123.22 + - specific language governing permissions and limitations under the
123.23 + - License. When distributing the software, include this License Header
123.24 + - Notice in each file and include the License file at
123.25 + - nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
123.26 + - particular file as subject to the "Classpath" exception as provided
123.27 + - by Sun in the GPL Version 2 section of the License file that
123.28 + - accompanied this code. If applicable, add the following below the
123.29 + - License Header, with the fields enclosed by brackets [] replaced by
123.30 + - your own identifying information:
123.31 + - "Portions Copyrighted [year] [name of copyright owner]"
123.32 + -
123.33 + - Contributor(s):
123.34 + -
123.35 + - The Original Software is NetBeans. The Initial Developer of the Original
123.36 + - Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
123.37 + - Microsystems, Inc. All Rights Reserved.
123.38 + -
123.39 + - If you wish your version of this file to be governed by only the CDDL
123.40 + - or only the GPL Version 2, indicate your decision by adding
123.41 + - "[Contributor] elects to include this software in this distribution
123.42 + - under the [CDDL or GPL Version 2] license." If you do not indicate a
123.43 + - single choice of license, a recipient has the option to distribute
123.44 + - your version of this file under either the CDDL, the GPL Version 2 or
123.45 + - to extend the choice of license to its licensees as provided above.
123.46 + - However, if you add GPL Version 2 code and therefore, elected the GPL
123.47 + - Version 2 license, then the option applies only if the new code is
123.48 + - made subject to such option by the copyright holder.
123.49 + -->
123.50 +
123.51 <HTML>
123.52 <head>
123.53 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
124.1 --- a/src/pt_BR/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-makeproject-ui-resources-samples-pi_pt_BR.html Mon Dec 19 12:18:33 2016 +0100
124.2 +++ b/src/pt_BR/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-makeproject-ui-resources-samples-pi_pt_BR.html Tue Apr 17 14:14:23 2018 +0200
124.3 @@ -1,9 +1,44 @@
124.4 - <!--
124.5 - - Copyright 2006-2007 Sun Microsystems, Inc. All rights reserved.
124.6 - - SUN PROPRIETARY/CONFIDENTIAL.
124.7 - - Use is subject to license terms.
124.8 - -->
124.9 -
124.10 +<!--
124.11 + - DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
124.12 + -
124.13 + - Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
124.14 + -
124.15 + - The contents of this file are subject to the terms of either the GNU
124.16 + - General Public License Version 2 only ("GPL") or the Common
124.17 + - Development and Distribution License("CDDL") (collectively, the
124.18 + - "License"). You may not use this file except in compliance with the
124.19 + - License. You can obtain a copy of the License at
124.20 + - http://www.netbeans.org/cddl-gplv2.html
124.21 + - or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
124.22 + - specific language governing permissions and limitations under the
124.23 + - License. When distributing the software, include this License Header
124.24 + - Notice in each file and include the License file at
124.25 + - nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
124.26 + - particular file as subject to the "Classpath" exception as provided
124.27 + - by Sun in the GPL Version 2 section of the License file that
124.28 + - accompanied this code. If applicable, add the following below the
124.29 + - License Header, with the fields enclosed by brackets [] replaced by
124.30 + - your own identifying information:
124.31 + - "Portions Copyrighted [year] [name of copyright owner]"
124.32 + -
124.33 + - Contributor(s):
124.34 + -
124.35 + - The Original Software is NetBeans. The Initial Developer of the Original
124.36 + - Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
124.37 + - Microsystems, Inc. All Rights Reserved.
124.38 + -
124.39 + - If you wish your version of this file to be governed by only the CDDL
124.40 + - or only the GPL Version 2, indicate your decision by adding
124.41 + - "[Contributor] elects to include this software in this distribution
124.42 + - under the [CDDL or GPL Version 2] license." If you do not indicate a
124.43 + - single choice of license, a recipient has the option to distribute
124.44 + - your version of this file under either the CDDL, the GPL Version 2 or
124.45 + - to extend the choice of license to its licensees as provided above.
124.46 + - However, if you add GPL Version 2 code and therefore, elected the GPL
124.47 + - Version 2 license, then the option applies only if the new code is
124.48 + - made subject to such option by the copyright holder.
124.49 + -->
124.50 +
124.51 <HTML>
124.52 <head>
124.53 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
125.1 --- a/src/pt_BR/other/installer/infra/build/web/js/start_strings_pt_BR.js Mon Dec 19 12:18:33 2016 +0100
125.2 +++ b/src/pt_BR/other/installer/infra/build/web/js/start_strings_pt_BR.js Tue Apr 17 14:14:23 2018 +0200
125.3 @@ -59,9 +59,9 @@
125.4 var SUPPORT_LABEL = "Suporte";
125.5 var SUPPORT_DESCRIPTION = "Op\u00e7\u00f5es de suporte flex\u00edveis para ajud\u00e1-lo a ficar focado em inova\u00e7\u00f5es.";
125.6
125.7 -// $PRODUCT_NAME $TYPE (Installer for $PLATFORM/Zip)/$Language ($Language_ID) $filename ($SIZE) MD5: $MD5
125.8 -var INFO_MESSAGE = "{0}{1} {2}/{3} ({4})<br>{5} ({6} MB)<br>MD5: {7}";
125.9 -var INFO_MESSAGE_OTHER = "{0} ({1} MB)<br>MD5: {2}";
125.10 +// $PRODUCT_NAME $TYPE (Installer for $PLATFORM/Zip)/$Language ($Language_ID) $filename ($SIZE) SHA-256: $MD5
125.11 +var INFO_MESSAGE = "{0}{1} {2}/{3} ({4})<br>{5} ({6} MB)<br>SHA-256: {7}";
125.12 +var INFO_MESSAGE_OTHER = "{0} ({1} MB)<br>SHA-256: {2}";
125.13
125.14 //DO NOT TRANSLATE
125.15 var SUBSCRIPTION_PHP_URL = "http://services.netbeans.org/sub.php";
126.1 --- a/src/pt_BR/ruby/ruby/ruby/org/netbeans/modules/ruby/Bundle_pt_BR.properties Mon Dec 19 12:18:33 2016 +0100
126.2 +++ b/src/pt_BR/ruby/ruby/ruby/org/netbeans/modules/ruby/Bundle_pt_BR.properties Tue Apr 17 14:14:23 2018 +0200
126.3 @@ -266,9 +266,6 @@
126.4
126.5 InstalledVersions=Vers\u00e3o(\u00f5es) instalada(s): {0}
126.6
126.7 -# HTTP status codes for code completion,
126.8 -# descriptions taken from http://www.google.com/support/webmasters/bin/answer.py?hl=en&answer=40132 and http://www.w3.org/Protocols/rfc2616/rfc2616-sec10.html
126.9 -
126.10 SC_100=100 (Continuar)
126.11 SC_100_DESC=O solicitante deve continuar com a solicita\u00e7\u00e3o. O servidor retorna este c\u00f3digo para indicar que recebeu a primeira parte de uma solicita\u00e7\u00e3o e est\u00e1 esperando o restante.
126.12 SC_101=101 (Alternando protocolos)
127.1 --- a/src/pt_PT/other/installer/infra/build/web/js/start_strings_pt_PT.js Mon Dec 19 12:18:33 2016 +0100
127.2 +++ b/src/pt_PT/other/installer/infra/build/web/js/start_strings_pt_PT.js Tue Apr 17 14:14:23 2018 +0200
127.3 @@ -59,9 +59,9 @@
127.4 var SUPPORT_LABEL = "Support";
127.5 var SUPPORT_DESCRIPTION = "Flexible support options to help you stay focused on innovation.";
127.6
127.7 -// $PRODUCT_NAME $TYPE (Installer for $PLATFORM/Zip)/$Language ($Language_ID) $filename ($SIZE) MD5: $MD5
127.8 -var INFO_MESSAGE = "{0}{1} {2}/{3} ({4})<br>{5} ({6} MB)<br>MD5: {7}";
127.9 -var INFO_MESSAGE_OTHER = "{0} ({1} MB)<br>MD5: {2}";
127.10 +// $PRODUCT_NAME $TYPE (Installer for $PLATFORM/Zip)/$Language ($Language_ID) $filename ($SIZE) SHA-256: $MD5
127.11 +var INFO_MESSAGE = "{0}{1} {2}/{3} ({4})<br>{5} ({6} MB)<br>SHA-256: {7}";
127.12 +var INFO_MESSAGE_OTHER = "{0} ({1} MB)<br>SHA-256: {2}";
127.13
127.14 //DO NOT TRANSLATE
127.15 var SUBSCRIPTION_PHP_URL = "http://services.netbeans.org/sub.php";
128.1 --- a/src/ro/other/installer/infra/build/web/js/start_strings_ro.js Mon Dec 19 12:18:33 2016 +0100
128.2 +++ b/src/ro/other/installer/infra/build/web/js/start_strings_ro.js Tue Apr 17 14:14:23 2018 +0200
128.3 @@ -59,9 +59,9 @@
128.4 var SUPPORT_LABEL = "Support";
128.5 var SUPPORT_DESCRIPTION = "Flexible support options to help you stay focused on innovation.";
128.6
128.7 -// $PRODUCT_NAME $TYPE (Installer for $PLATFORM/Zip)/$Language ($Language_ID) $filename ($SIZE) MD5: $MD5
128.8 -var INFO_MESSAGE = "{0}{1} {2}/{3} ({4})<br>{5} ({6} MB)<br>MD5: {7}";
128.9 -var INFO_MESSAGE_OTHER = "{0} ({1} MB)<br>MD5: {2}";
128.10 +// $PRODUCT_NAME $TYPE (Installer for $PLATFORM/Zip)/$Language ($Language_ID) $filename ($SIZE) SHA-256: $MD5
128.11 +var INFO_MESSAGE = "{0}{1} {2}/{3} ({4})<br>{5} ({6} MB)<br>SHA-256: {7}";
128.12 +var INFO_MESSAGE_OTHER = "{0} ({1} MB)<br>SHA-256: {2}";
128.13
128.14 //DO NOT TRANSLATE
128.15 var SUBSCRIPTION_PHP_URL = "http://services.netbeans.org/sub.php";
129.1 --- a/src/ru/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/resources/samples/fractal_ru.html Mon Dec 19 12:18:33 2016 +0100
129.2 +++ b/src/ru/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/resources/samples/fractal_ru.html Tue Apr 17 14:14:23 2018 +0200
129.3 @@ -1,9 +1,44 @@
129.4 - <!--
129.5 - - Copyright 2006-2007 Sun Microsystems, Inc. All rights reserved.
129.6 - - SUN PROPRIETARY/CONFIDENTIAL.
129.7 - - Use is subject to license terms.
129.8 - -->
129.9 -
129.10 +<!--
129.11 + - DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
129.12 + -
129.13 + - Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
129.14 + -
129.15 + - The contents of this file are subject to the terms of either the GNU
129.16 + - General Public License Version 2 only ("GPL") or the Common
129.17 + - Development and Distribution License("CDDL") (collectively, the
129.18 + - "License"). You may not use this file except in compliance with the
129.19 + - License. You can obtain a copy of the License at
129.20 + - http://www.netbeans.org/cddl-gplv2.html
129.21 + - or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
129.22 + - specific language governing permissions and limitations under the
129.23 + - License. When distributing the software, include this License Header
129.24 + - Notice in each file and include the License file at
129.25 + - nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
129.26 + - particular file as subject to the "Classpath" exception as provided
129.27 + - by Sun in the GPL Version 2 section of the License file that
129.28 + - accompanied this code. If applicable, add the following below the
129.29 + - License Header, with the fields enclosed by brackets [] replaced by
129.30 + - your own identifying information:
129.31 + - "Portions Copyrighted [year] [name of copyright owner]"
129.32 + -
129.33 + - Contributor(s):
129.34 + -
129.35 + - The Original Software is NetBeans. The Initial Developer of the Original
129.36 + - Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
129.37 + - Microsystems, Inc. All Rights Reserved.
129.38 + -
129.39 + - If you wish your version of this file to be governed by only the CDDL
129.40 + - or only the GPL Version 2, indicate your decision by adding
129.41 + - "[Contributor] elects to include this software in this distribution
129.42 + - under the [CDDL or GPL Version 2] license." If you do not indicate a
129.43 + - single choice of license, a recipient has the option to distribute
129.44 + - your version of this file under either the CDDL, the GPL Version 2 or
129.45 + - to extend the choice of license to its licensees as provided above.
129.46 + - However, if you add GPL Version 2 code and therefore, elected the GPL
129.47 + - Version 2 license, then the option applies only if the new code is
129.48 + - made subject to such option by the copyright holder.
129.49 + -->
129.50 +
129.51 <HTML>
129.52 <head>
129.53 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
130.1 --- a/src/ru/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/resources/samples/hello_ru.html Mon Dec 19 12:18:33 2016 +0100
130.2 +++ b/src/ru/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/resources/samples/hello_ru.html Tue Apr 17 14:14:23 2018 +0200
130.3 @@ -1,9 +1,44 @@
130.4 - <!--
130.5 - - Copyright 2006-2007 Sun Microsystems, Inc. All rights reserved.
130.6 - - SUN PROPRIETARY/CONFIDENTIAL.
130.7 - - Use is subject to license terms.
130.8 - -->
130.9 -
130.10 +<!--
130.11 + - DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
130.12 + -
130.13 + - Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
130.14 + -
130.15 + - The contents of this file are subject to the terms of either the GNU
130.16 + - General Public License Version 2 only ("GPL") or the Common
130.17 + - Development and Distribution License("CDDL") (collectively, the
130.18 + - "License"). You may not use this file except in compliance with the
130.19 + - License. You can obtain a copy of the License at
130.20 + - http://www.netbeans.org/cddl-gplv2.html
130.21 + - or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
130.22 + - specific language governing permissions and limitations under the
130.23 + - License. When distributing the software, include this License Header
130.24 + - Notice in each file and include the License file at
130.25 + - nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
130.26 + - particular file as subject to the "Classpath" exception as provided
130.27 + - by Sun in the GPL Version 2 section of the License file that
130.28 + - accompanied this code. If applicable, add the following below the
130.29 + - License Header, with the fields enclosed by brackets [] replaced by
130.30 + - your own identifying information:
130.31 + - "Portions Copyrighted [year] [name of copyright owner]"
130.32 + -
130.33 + - Contributor(s):
130.34 + -
130.35 + - The Original Software is NetBeans. The Initial Developer of the Original
130.36 + - Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
130.37 + - Microsystems, Inc. All Rights Reserved.
130.38 + -
130.39 + - If you wish your version of this file to be governed by only the CDDL
130.40 + - or only the GPL Version 2, indicate your decision by adding
130.41 + - "[Contributor] elects to include this software in this distribution
130.42 + - under the [CDDL or GPL Version 2] license." If you do not indicate a
130.43 + - single choice of license, a recipient has the option to distribute
130.44 + - your version of this file under either the CDDL, the GPL Version 2 or
130.45 + - to extend the choice of license to its licensees as provided above.
130.46 + - However, if you add GPL Version 2 code and therefore, elected the GPL
130.47 + - Version 2 license, then the option applies only if the new code is
130.48 + - made subject to such option by the copyright holder.
130.49 + -->
130.50 +
130.51 <HTML>
130.52 <head>
130.53 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
131.1 --- a/src/ru/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/resources/samples/lexyacc_ru.html Mon Dec 19 12:18:33 2016 +0100
131.2 +++ b/src/ru/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/resources/samples/lexyacc_ru.html Tue Apr 17 14:14:23 2018 +0200
131.3 @@ -1,9 +1,44 @@
131.4 - <!--
131.5 - - Copyright 2006-2007 Sun Microsystems, Inc. All rights reserved.
131.6 - - SUN PROPRIETARY/CONFIDENTIAL.
131.7 - - Use is subject to license terms.
131.8 - -->
131.9 -
131.10 +<!--
131.11 + - DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
131.12 + -
131.13 + - Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
131.14 + -
131.15 + - The contents of this file are subject to the terms of either the GNU
131.16 + - General Public License Version 2 only ("GPL") or the Common
131.17 + - Development and Distribution License("CDDL") (collectively, the
131.18 + - "License"). You may not use this file except in compliance with the
131.19 + - License. You can obtain a copy of the License at
131.20 + - http://www.netbeans.org/cddl-gplv2.html
131.21 + - or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
131.22 + - specific language governing permissions and limitations under the
131.23 + - License. When distributing the software, include this License Header
131.24 + - Notice in each file and include the License file at
131.25 + - nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
131.26 + - particular file as subject to the "Classpath" exception as provided
131.27 + - by Sun in the GPL Version 2 section of the License file that
131.28 + - accompanied this code. If applicable, add the following below the
131.29 + - License Header, with the fields enclosed by brackets [] replaced by
131.30 + - your own identifying information:
131.31 + - "Portions Copyrighted [year] [name of copyright owner]"
131.32 + -
131.33 + - Contributor(s):
131.34 + -
131.35 + - The Original Software is NetBeans. The Initial Developer of the Original
131.36 + - Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
131.37 + - Microsystems, Inc. All Rights Reserved.
131.38 + -
131.39 + - If you wish your version of this file to be governed by only the CDDL
131.40 + - or only the GPL Version 2, indicate your decision by adding
131.41 + - "[Contributor] elects to include this software in this distribution
131.42 + - under the [CDDL or GPL Version 2] license." If you do not indicate a
131.43 + - single choice of license, a recipient has the option to distribute
131.44 + - your version of this file under either the CDDL, the GPL Version 2 or
131.45 + - to extend the choice of license to its licensees as provided above.
131.46 + - However, if you add GPL Version 2 code and therefore, elected the GPL
131.47 + - Version 2 license, then the option applies only if the new code is
131.48 + - made subject to such option by the copyright holder.
131.49 + -->
131.50 +
131.51 <HTML>
131.52 <head>
131.53 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
132.1 --- a/src/ru/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/resources/samples/pi_ru.html Mon Dec 19 12:18:33 2016 +0100
132.2 +++ b/src/ru/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/resources/samples/pi_ru.html Tue Apr 17 14:14:23 2018 +0200
132.3 @@ -1,9 +1,44 @@
132.4 - <!--
132.5 - - Copyright 2006-2007 Sun Microsystems, Inc. All rights reserved.
132.6 - - SUN PROPRIETARY/CONFIDENTIAL.
132.7 - - Use is subject to license terms.
132.8 - -->
132.9 -
132.10 +<!--
132.11 + - DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
132.12 + -
132.13 + - Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
132.14 + -
132.15 + - The contents of this file are subject to the terms of either the GNU
132.16 + - General Public License Version 2 only ("GPL") or the Common
132.17 + - Development and Distribution License("CDDL") (collectively, the
132.18 + - "License"). You may not use this file except in compliance with the
132.19 + - License. You can obtain a copy of the License at
132.20 + - http://www.netbeans.org/cddl-gplv2.html
132.21 + - or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
132.22 + - specific language governing permissions and limitations under the
132.23 + - License. When distributing the software, include this License Header
132.24 + - Notice in each file and include the License file at
132.25 + - nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
132.26 + - particular file as subject to the "Classpath" exception as provided
132.27 + - by Sun in the GPL Version 2 section of the License file that
132.28 + - accompanied this code. If applicable, add the following below the
132.29 + - License Header, with the fields enclosed by brackets [] replaced by
132.30 + - your own identifying information:
132.31 + - "Portions Copyrighted [year] [name of copyright owner]"
132.32 + -
132.33 + - Contributor(s):
132.34 + -
132.35 + - The Original Software is NetBeans. The Initial Developer of the Original
132.36 + - Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
132.37 + - Microsystems, Inc. All Rights Reserved.
132.38 + -
132.39 + - If you wish your version of this file to be governed by only the CDDL
132.40 + - or only the GPL Version 2, indicate your decision by adding
132.41 + - "[Contributor] elects to include this software in this distribution
132.42 + - under the [CDDL or GPL Version 2] license." If you do not indicate a
132.43 + - single choice of license, a recipient has the option to distribute
132.44 + - your version of this file under either the CDDL, the GPL Version 2 or
132.45 + - to extend the choice of license to its licensees as provided above.
132.46 + - However, if you add GPL Version 2 code and therefore, elected the GPL
132.47 + - Version 2 license, then the option applies only if the new code is
132.48 + - made subject to such option by the copyright holder.
132.49 + -->
132.50 +
132.51 <HTML>
132.52 <head>
132.53 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
133.1 --- a/src/ru/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-makeproject-ui-resources-samples-fractal_ru.html Mon Dec 19 12:18:33 2016 +0100
133.2 +++ b/src/ru/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-makeproject-ui-resources-samples-fractal_ru.html Tue Apr 17 14:14:23 2018 +0200
133.3 @@ -1,9 +1,44 @@
133.4 - <!--
133.5 - - Copyright 2006-2007 Sun Microsystems, Inc. All rights reserved.
133.6 - - SUN PROPRIETARY/CONFIDENTIAL.
133.7 - - Use is subject to license terms.
133.8 - -->
133.9 -
133.10 +<!--
133.11 + - DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
133.12 + -
133.13 + - Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
133.14 + -
133.15 + - The contents of this file are subject to the terms of either the GNU
133.16 + - General Public License Version 2 only ("GPL") or the Common
133.17 + - Development and Distribution License("CDDL") (collectively, the
133.18 + - "License"). You may not use this file except in compliance with the
133.19 + - License. You can obtain a copy of the License at
133.20 + - http://www.netbeans.org/cddl-gplv2.html
133.21 + - or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
133.22 + - specific language governing permissions and limitations under the
133.23 + - License. When distributing the software, include this License Header
133.24 + - Notice in each file and include the License file at
133.25 + - nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
133.26 + - particular file as subject to the "Classpath" exception as provided
133.27 + - by Sun in the GPL Version 2 section of the License file that
133.28 + - accompanied this code. If applicable, add the following below the
133.29 + - License Header, with the fields enclosed by brackets [] replaced by
133.30 + - your own identifying information:
133.31 + - "Portions Copyrighted [year] [name of copyright owner]"
133.32 + -
133.33 + - Contributor(s):
133.34 + -
133.35 + - The Original Software is NetBeans. The Initial Developer of the Original
133.36 + - Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
133.37 + - Microsystems, Inc. All Rights Reserved.
133.38 + -
133.39 + - If you wish your version of this file to be governed by only the CDDL
133.40 + - or only the GPL Version 2, indicate your decision by adding
133.41 + - "[Contributor] elects to include this software in this distribution
133.42 + - under the [CDDL or GPL Version 2] license." If you do not indicate a
133.43 + - single choice of license, a recipient has the option to distribute
133.44 + - your version of this file under either the CDDL, the GPL Version 2 or
133.45 + - to extend the choice of license to its licensees as provided above.
133.46 + - However, if you add GPL Version 2 code and therefore, elected the GPL
133.47 + - Version 2 license, then the option applies only if the new code is
133.48 + - made subject to such option by the copyright holder.
133.49 + -->
133.50 +
133.51 <HTML>
133.52 <head>
133.53 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
134.1 --- a/src/ru/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-makeproject-ui-resources-samples-hello_ru.html Mon Dec 19 12:18:33 2016 +0100
134.2 +++ b/src/ru/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-makeproject-ui-resources-samples-hello_ru.html Tue Apr 17 14:14:23 2018 +0200
134.3 @@ -1,9 +1,44 @@
134.4 - <!--
134.5 - - Copyright 2006-2007 Sun Microsystems, Inc. All rights reserved.
134.6 - - SUN PROPRIETARY/CONFIDENTIAL.
134.7 - - Use is subject to license terms.
134.8 - -->
134.9 -
134.10 +<!--
134.11 + - DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
134.12 + -
134.13 + - Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
134.14 + -
134.15 + - The contents of this file are subject to the terms of either the GNU
134.16 + - General Public License Version 2 only ("GPL") or the Common
134.17 + - Development and Distribution License("CDDL") (collectively, the
134.18 + - "License"). You may not use this file except in compliance with the
134.19 + - License. You can obtain a copy of the License at
134.20 + - http://www.netbeans.org/cddl-gplv2.html
134.21 + - or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
134.22 + - specific language governing permissions and limitations under the
134.23 + - License. When distributing the software, include this License Header
134.24 + - Notice in each file and include the License file at
134.25 + - nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
134.26 + - particular file as subject to the "Classpath" exception as provided
134.27 + - by Sun in the GPL Version 2 section of the License file that
134.28 + - accompanied this code. If applicable, add the following below the
134.29 + - License Header, with the fields enclosed by brackets [] replaced by
134.30 + - your own identifying information:
134.31 + - "Portions Copyrighted [year] [name of copyright owner]"
134.32 + -
134.33 + - Contributor(s):
134.34 + -
134.35 + - The Original Software is NetBeans. The Initial Developer of the Original
134.36 + - Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
134.37 + - Microsystems, Inc. All Rights Reserved.
134.38 + -
134.39 + - If you wish your version of this file to be governed by only the CDDL
134.40 + - or only the GPL Version 2, indicate your decision by adding
134.41 + - "[Contributor] elects to include this software in this distribution
134.42 + - under the [CDDL or GPL Version 2] license." If you do not indicate a
134.43 + - single choice of license, a recipient has the option to distribute
134.44 + - your version of this file under either the CDDL, the GPL Version 2 or
134.45 + - to extend the choice of license to its licensees as provided above.
134.46 + - However, if you add GPL Version 2 code and therefore, elected the GPL
134.47 + - Version 2 license, then the option applies only if the new code is
134.48 + - made subject to such option by the copyright holder.
134.49 + -->
134.50 +
134.51 <HTML>
134.52 <head>
134.53 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
135.1 --- a/src/ru/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-makeproject-ui-resources-samples-lexyacc_ru.html Mon Dec 19 12:18:33 2016 +0100
135.2 +++ b/src/ru/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-makeproject-ui-resources-samples-lexyacc_ru.html Tue Apr 17 14:14:23 2018 +0200
135.3 @@ -1,9 +1,44 @@
135.4 - <!--
135.5 - - Copyright 2006-2007 Sun Microsystems, Inc. All rights reserved.
135.6 - - SUN PROPRIETARY/CONFIDENTIAL.
135.7 - - Use is subject to license terms.
135.8 - -->
135.9 -
135.10 +<!--
135.11 + - DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
135.12 + -
135.13 + - Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
135.14 + -
135.15 + - The contents of this file are subject to the terms of either the GNU
135.16 + - General Public License Version 2 only ("GPL") or the Common
135.17 + - Development and Distribution License("CDDL") (collectively, the
135.18 + - "License"). You may not use this file except in compliance with the
135.19 + - License. You can obtain a copy of the License at
135.20 + - http://www.netbeans.org/cddl-gplv2.html
135.21 + - or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
135.22 + - specific language governing permissions and limitations under the
135.23 + - License. When distributing the software, include this License Header
135.24 + - Notice in each file and include the License file at
135.25 + - nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
135.26 + - particular file as subject to the "Classpath" exception as provided
135.27 + - by Sun in the GPL Version 2 section of the License file that
135.28 + - accompanied this code. If applicable, add the following below the
135.29 + - License Header, with the fields enclosed by brackets [] replaced by
135.30 + - your own identifying information:
135.31 + - "Portions Copyrighted [year] [name of copyright owner]"
135.32 + -
135.33 + - Contributor(s):
135.34 + -
135.35 + - The Original Software is NetBeans. The Initial Developer of the Original
135.36 + - Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
135.37 + - Microsystems, Inc. All Rights Reserved.
135.38 + -
135.39 + - If you wish your version of this file to be governed by only the CDDL
135.40 + - or only the GPL Version 2, indicate your decision by adding
135.41 + - "[Contributor] elects to include this software in this distribution
135.42 + - under the [CDDL or GPL Version 2] license." If you do not indicate a
135.43 + - single choice of license, a recipient has the option to distribute
135.44 + - your version of this file under either the CDDL, the GPL Version 2 or
135.45 + - to extend the choice of license to its licensees as provided above.
135.46 + - However, if you add GPL Version 2 code and therefore, elected the GPL
135.47 + - Version 2 license, then the option applies only if the new code is
135.48 + - made subject to such option by the copyright holder.
135.49 + -->
135.50 +
135.51 <HTML>
135.52 <head>
135.53 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
136.1 --- a/src/ru/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-makeproject-ui-resources-samples-pi_ru.html Mon Dec 19 12:18:33 2016 +0100
136.2 +++ b/src/ru/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-makeproject-ui-resources-samples-pi_ru.html Tue Apr 17 14:14:23 2018 +0200
136.3 @@ -1,9 +1,44 @@
136.4 - <!--
136.5 - - Copyright 2006-2007 Sun Microsystems, Inc. All rights reserved.
136.6 - - SUN PROPRIETARY/CONFIDENTIAL.
136.7 - - Use is subject to license terms.
136.8 - -->
136.9 -
136.10 +<!--
136.11 + - DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
136.12 + -
136.13 + - Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
136.14 + -
136.15 + - The contents of this file are subject to the terms of either the GNU
136.16 + - General Public License Version 2 only ("GPL") or the Common
136.17 + - Development and Distribution License("CDDL") (collectively, the
136.18 + - "License"). You may not use this file except in compliance with the
136.19 + - License. You can obtain a copy of the License at
136.20 + - http://www.netbeans.org/cddl-gplv2.html
136.21 + - or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
136.22 + - specific language governing permissions and limitations under the
136.23 + - License. When distributing the software, include this License Header
136.24 + - Notice in each file and include the License file at
136.25 + - nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
136.26 + - particular file as subject to the "Classpath" exception as provided
136.27 + - by Sun in the GPL Version 2 section of the License file that
136.28 + - accompanied this code. If applicable, add the following below the
136.29 + - License Header, with the fields enclosed by brackets [] replaced by
136.30 + - your own identifying information:
136.31 + - "Portions Copyrighted [year] [name of copyright owner]"
136.32 + -
136.33 + - Contributor(s):
136.34 + -
136.35 + - The Original Software is NetBeans. The Initial Developer of the Original
136.36 + - Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
136.37 + - Microsystems, Inc. All Rights Reserved.
136.38 + -
136.39 + - If you wish your version of this file to be governed by only the CDDL
136.40 + - or only the GPL Version 2, indicate your decision by adding
136.41 + - "[Contributor] elects to include this software in this distribution
136.42 + - under the [CDDL or GPL Version 2] license." If you do not indicate a
136.43 + - single choice of license, a recipient has the option to distribute
136.44 + - your version of this file under either the CDDL, the GPL Version 2 or
136.45 + - to extend the choice of license to its licensees as provided above.
136.46 + - However, if you add GPL Version 2 code and therefore, elected the GPL
136.47 + - Version 2 license, then the option applies only if the new code is
136.48 + - made subject to such option by the copyright holder.
136.49 + -->
136.50 +
136.51 <HTML>
136.52 <head>
136.53 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
137.1 --- a/src/ru/other/installer/infra/build/web/js/start_strings_ru.js Mon Dec 19 12:18:33 2016 +0100
137.2 +++ b/src/ru/other/installer/infra/build/web/js/start_strings_ru.js Tue Apr 17 14:14:23 2018 +0200
137.3 @@ -59,9 +59,9 @@
137.4 var SUPPORT_LABEL = "\u041f\u043e\u0434\u0434\u0435\u0440\u0436\u043a\u0430";
137.5 var SUPPORT_DESCRIPTION = "\u0413\u0438\u0431\u043a\u0438\u0435 \u0443\u0441\u043b\u043e\u0432\u0438\u044f \u043f\u043e\u0434\u0434\u0435\u0440\u0436\u043a\u0438 \u0434\u043b\u044f \u0442\u043e\u0433\u043e, \u0447\u0442\u043e\u0431\u044b \u0432\u044b \u0440\u0430\u0437\u0432\u0438\u0432\u0430\u043b\u0438 \u0441\u0432\u043e\u0438 \u043f\u0440\u0438\u043b\u043e\u0436\u0435\u043d\u0438\u044f.";
137.6
137.7 -// $PRODUCT_NAME $TYPE (Installer for $PLATFORM/Zip)/$Language ($Language_ID) $filename ($SIZE) MD5: $MD5
137.8 -var INFO_MESSAGE = "{0}{1} {2}/{3} ({4})<br>{5} ({6} \u041c\u0431)<br>MD5: {7}";
137.9 -var INFO_MESSAGE_OTHER = "{0} ({1} \u041c\u0431)<br>MD5: {2}";
137.10 +// $PRODUCT_NAME $TYPE (Installer for $PLATFORM/Zip)/$Language ($Language_ID) $filename ($SIZE) SHA-256: $MD5
137.11 +var INFO_MESSAGE = "{0}{1} {2}/{3} ({4})<br>{5} ({6} \u041c\u0431)<br>SHA-256: {7}";
137.12 +var INFO_MESSAGE_OTHER = "{0} ({1} \u041c\u0431)<br>SHA-256: {2}";
137.13
137.14 //DO NOT TRANSLATE
137.15 var SUBSCRIPTION_PHP_URL = "http://services.netbeans.org/sub.php";
138.1 --- a/src/ru/ruby/ruby/ruby/org/netbeans/modules/ruby/Bundle_ru.properties Mon Dec 19 12:18:33 2016 +0100
138.2 +++ b/src/ru/ruby/ruby/ruby/org/netbeans/modules/ruby/Bundle_ru.properties Tue Apr 17 14:14:23 2018 +0200
138.3 @@ -266,9 +266,6 @@
138.4
138.5 InstalledVersions=\u0423\u0441\u0442\u0430\u043d\u043e\u0432\u043b\u0435\u043d\u043d\u044b\u0435 \u0432\u0435\u0440\u0441\u0438\u0438: {0}
138.6
138.7 -# HTTP status codes for code completion,
138.8 -# descriptions taken from http://www.google.com/support/webmasters/bin/answer.py?hl=en&answer=40132 and http://www.w3.org/Protocols/rfc2616/rfc2616-sec10.html
138.9 -
138.10 SC_100=100 (\u041f\u0440\u043e\u0434\u043e\u043b\u0436\u0438\u0442\u044c)
138.11 SC_100_DESC=\u0418\u043d\u0438\u0446\u0438\u0430\u0442\u043e\u0440 \u0437\u0430\u043f\u0440\u043e\u0441\u0430 \u0434\u043e\u043b\u0436\u0435\u043d \u043f\u0440\u043e\u0434\u043e\u043b\u0436\u0438\u0442\u044c \u0435\u0433\u043e \u0441\u043e\u0437\u0434\u0430\u043d\u0438\u0435. \u0412\u043e\u0437\u0432\u0440\u0430\u0442 \u043a\u043e\u0434\u0430 \u0441\u0435\u0440\u0432\u0435\u0440\u043e\u043c \u0443\u043a\u0430\u0437\u044b\u0432\u0430\u0435\u0442 \u043d\u0430 \u043f\u043e\u043b\u0443\u0447\u0435\u043d\u0438\u0435 \u043f\u0435\u0440\u0432\u043e\u0439 \u0447\u0430\u0441\u0442\u0438 \u0437\u0430\u043f\u0440\u043e\u0441\u0430 \u0438 \u043e\u0436\u0438\u0434\u0430\u043d\u0438\u0435 \u043e\u0441\u0442\u0430\u043b\u044c\u043d\u044b\u0445 \u0447\u0430\u0441\u0442\u0435\u0439.
138.12 SC_101=101 (\u041f\u0435\u0440\u0435\u043a\u043b\u044e\u0447\u0435\u043d\u0438\u0435 \u043f\u0440\u043e\u0442\u043e\u043a\u043e\u043b\u043e\u0432)
139.1 --- a/src/si/other/installer/infra/build/web/js/start_strings_si.js Mon Dec 19 12:18:33 2016 +0100
139.2 +++ b/src/si/other/installer/infra/build/web/js/start_strings_si.js Tue Apr 17 14:14:23 2018 +0200
139.3 @@ -59,9 +59,9 @@
139.4 var SUPPORT_LABEL = "Support";
139.5 var SUPPORT_DESCRIPTION = "Flexible support options to help you stay focused on innovation.";
139.6
139.7 -// $PRODUCT_NAME $TYPE (Installer for $PLATFORM/Zip)/$Language ($Language_ID) $filename ($SIZE) MD5: $MD5
139.8 -var INFO_MESSAGE = "{0}{1} {2}/{3} ({4})<br>{5} ({6} MB)<br>MD5: {7}";
139.9 -var INFO_MESSAGE_OTHER = "{0} ({1} MB)<br>MD5: {2}";
139.10 +// $PRODUCT_NAME $TYPE (Installer for $PLATFORM/Zip)/$Language ($Language_ID) $filename ($SIZE) SHA-256: $MD5
139.11 +var INFO_MESSAGE = "{0}{1} {2}/{3} ({4})<br>{5} ({6} MB)<br>SHA-256: {7}";
139.12 +var INFO_MESSAGE_OTHER = "{0} ({1} MB)<br>SHA-256: {2}";
139.13
139.14 //DO NOT TRANSLATE
139.15 var SUBSCRIPTION_PHP_URL = "http://services.netbeans.org/sub.php";
140.1 --- a/src/sq/other/installer/infra/build/web/js/start_strings_sq.js Mon Dec 19 12:18:33 2016 +0100
140.2 +++ b/src/sq/other/installer/infra/build/web/js/start_strings_sq.js Tue Apr 17 14:14:23 2018 +0200
140.3 @@ -59,9 +59,9 @@
140.4 var SUPPORT_LABEL = "Support";
140.5 var SUPPORT_DESCRIPTION = "Flexible support options to help you stay focused on innovation.";
140.6
140.7 -// $PRODUCT_NAME $TYPE (Installer for $PLATFORM/Zip)/$Language ($Language_ID) $filename ($SIZE) MD5: $MD5
140.8 -var INFO_MESSAGE = "{0}{1} {2}/{3} ({4})<br>{5} ({6} MB)<br>MD5: {7}";
140.9 -var INFO_MESSAGE_OTHER = "{0} ({1} MB)<br>MD5: {2}";
140.10 +// $PRODUCT_NAME $TYPE (Installer for $PLATFORM/Zip)/$Language ($Language_ID) $filename ($SIZE) SHA-256: $MD5
140.11 +var INFO_MESSAGE = "{0}{1} {2}/{3} ({4})<br>{5} ({6} MB)<br>SHA-256: {7}";
140.12 +var INFO_MESSAGE_OTHER = "{0} ({1} MB)<br>SHA-256: {2}";
140.13
140.14 //DO NOT TRANSLATE
140.15 var SUBSCRIPTION_PHP_URL = "http://services.netbeans.org/sub.php";
141.1 --- a/src/sr/other/installer/infra/build/web/js/start_strings_sr.js Mon Dec 19 12:18:33 2016 +0100
141.2 +++ b/src/sr/other/installer/infra/build/web/js/start_strings_sr.js Tue Apr 17 14:14:23 2018 +0200
141.3 @@ -59,9 +59,9 @@
141.4 var SUPPORT_LABEL = "Support";
141.5 var SUPPORT_DESCRIPTION = "Flexible support options to help you stay focused on innovation.";
141.6
141.7 -// $PRODUCT_NAME $TYPE (Installer for $PLATFORM/Zip)/$Language ($Language_ID) $filename ($SIZE) MD5: $MD5
141.8 -var INFO_MESSAGE = "{0}{1} {2}/{3} ({4})<br>{5} ({6} MB)<br>MD5: {7}";
141.9 -var INFO_MESSAGE_OTHER = "{0} ({1} MB)<br>MD5: {2}";
141.10 +// $PRODUCT_NAME $TYPE (Installer for $PLATFORM/Zip)/$Language ($Language_ID) $filename ($SIZE) SHA-256: $MD5
141.11 +var INFO_MESSAGE = "{0}{1} {2}/{3} ({4})<br>{5} ({6} MB)<br>SHA-256: {7}";
141.12 +var INFO_MESSAGE_OTHER = "{0} ({1} MB)<br>SHA-256: {2}";
141.13
141.14 //DO NOT TRANSLATE
141.15 var SUBSCRIPTION_PHP_URL = "http://services.netbeans.org/sub.php";
142.1 --- a/src/sv/other/installer/infra/build/web/js/start_strings_sv.js Mon Dec 19 12:18:33 2016 +0100
142.2 +++ b/src/sv/other/installer/infra/build/web/js/start_strings_sv.js Tue Apr 17 14:14:23 2018 +0200
142.3 @@ -59,9 +59,9 @@
142.4 var SUPPORT_LABEL = "Support";
142.5 var SUPPORT_DESCRIPTION = "Flexible support options to help you stay focused on innovation.";
142.6
142.7 -// $PRODUCT_NAME $TYPE (Installer for $PLATFORM/Zip)/$Language ($Language_ID) $filename ($SIZE) MD5: $MD5
142.8 -var INFO_MESSAGE = "{0}{1} {2}/{3} ({4})<br>{5} ({6} MB)<br>MD5: {7}";
142.9 -var INFO_MESSAGE_OTHER = "{0} ({1} MB)<br>MD5: {2}";
142.10 +// $PRODUCT_NAME $TYPE (Installer for $PLATFORM/Zip)/$Language ($Language_ID) $filename ($SIZE) SHA-256: $MD5
142.11 +var INFO_MESSAGE = "{0}{1} {2}/{3} ({4})<br>{5} ({6} MB)<br>SHA-256: {7}";
142.12 +var INFO_MESSAGE_OTHER = "{0} ({1} MB)<br>SHA-256: {2}";
142.13
142.14 //DO NOT TRANSLATE
142.15 var SUBSCRIPTION_PHP_URL = "http://services.netbeans.org/sub.php";
143.1 --- a/src/ta_IN/other/installer/infra/build/web/js/start_strings_ta_IN.js Mon Dec 19 12:18:33 2016 +0100
143.2 +++ b/src/ta_IN/other/installer/infra/build/web/js/start_strings_ta_IN.js Tue Apr 17 14:14:23 2018 +0200
143.3 @@ -59,9 +59,9 @@
143.4 var SUPPORT_LABEL = "Support";
143.5 var SUPPORT_DESCRIPTION = "Flexible support options to help you stay focused on innovation.";
143.6
143.7 -// $PRODUCT_NAME $TYPE (Installer for $PLATFORM/Zip)/$Language ($Language_ID) $filename ($SIZE) MD5: $MD5
143.8 -var INFO_MESSAGE = "{0}{1} {2}/{3} ({4})<br>{5} ({6} MB)<br>MD5: {7}";
143.9 -var INFO_MESSAGE_OTHER = "{0} ({1} MB)<br>MD5: {2}";
143.10 +// $PRODUCT_NAME $TYPE (Installer for $PLATFORM/Zip)/$Language ($Language_ID) $filename ($SIZE) SHA-256: $MD5
143.11 +var INFO_MESSAGE = "{0}{1} {2}/{3} ({4})<br>{5} ({6} MB)<br>SHA-256: {7}";
143.12 +var INFO_MESSAGE_OTHER = "{0} ({1} MB)<br>SHA-256: {2}";
143.13
143.14 //DO NOT TRANSLATE
143.15 var SUBSCRIPTION_PHP_URL = "http://services.netbeans.org/sub.php";
144.1 --- a/src/tr/other/installer/infra/build/web/js/start_strings_tr.js Mon Dec 19 12:18:33 2016 +0100
144.2 +++ b/src/tr/other/installer/infra/build/web/js/start_strings_tr.js Tue Apr 17 14:14:23 2018 +0200
144.3 @@ -59,9 +59,9 @@
144.4 var SUPPORT_LABEL = "Support";
144.5 var SUPPORT_DESCRIPTION = "Flexible support options to help you stay focused on innovation.";
144.6
144.7 -// $PRODUCT_NAME $TYPE (Installer for $PLATFORM/Zip)/$Language ($Language_ID) $filename ($SIZE) MD5: $MD5
144.8 -var INFO_MESSAGE = "{0}{1} {2}/{3} ({4})<br>{5} ({6} MB)<br>MD5: {7}";
144.9 -var INFO_MESSAGE_OTHER = "{0} ({1} MB)<br>MD5: {2}";
144.10 +// $PRODUCT_NAME $TYPE (Installer for $PLATFORM/Zip)/$Language ($Language_ID) $filename ($SIZE) SHA-256: $MD5
144.11 +var INFO_MESSAGE = "{0}{1} {2}/{3} ({4})<br>{5} ({6} MB)<br>SHA-256: {7}";
144.12 +var INFO_MESSAGE_OTHER = "{0} ({1} MB)<br>SHA-256: {2}";
144.13
144.14 //DO NOT TRANSLATE
144.15 var SUBSCRIPTION_PHP_URL = "http://services.netbeans.org/sub.php";
145.1 --- a/src/vi/other/installer/infra/build/web/js/start_strings_vi.js Mon Dec 19 12:18:33 2016 +0100
145.2 +++ b/src/vi/other/installer/infra/build/web/js/start_strings_vi.js Tue Apr 17 14:14:23 2018 +0200
145.3 @@ -59,9 +59,9 @@
145.4 var SUPPORT_LABEL = "Support";
145.5 var SUPPORT_DESCRIPTION = "Flexible support options to help you stay focused on innovation.";
145.6
145.7 -// $PRODUCT_NAME $TYPE (Installer for $PLATFORM/Zip)/$Language ($Language_ID) $filename ($SIZE) MD5: $MD5
145.8 -var INFO_MESSAGE = "{0}{1} {2}/{3} ({4})<br>{5} ({6} MB)<br>MD5: {7}";
145.9 -var INFO_MESSAGE_OTHER = "{0} ({1} MB)<br>MD5: {2}";
145.10 +// $PRODUCT_NAME $TYPE (Installer for $PLATFORM/Zip)/$Language ($Language_ID) $filename ($SIZE) SHA-256: $MD5
145.11 +var INFO_MESSAGE = "{0}{1} {2}/{3} ({4})<br>{5} ({6} MB)<br>SHA-256: {7}";
145.12 +var INFO_MESSAGE_OTHER = "{0} ({1} MB)<br>SHA-256: {2}";
145.13
145.14 //DO NOT TRANSLATE
145.15 var SUBSCRIPTION_PHP_URL = "http://services.netbeans.org/sub.php";
146.1 --- a/src/zh_CN/cnd/cnd-completion/cnd-completion/org/netbeans/modules/cnd/completion/cplusplus/Bundle_zh_CN.properties Mon Dec 19 12:18:33 2016 +0100
146.2 +++ b/src/zh_CN/cnd/cnd-completion/cnd-completion/org/netbeans/modules/cnd/completion/cplusplus/Bundle_zh_CN.properties Tue Apr 17 14:14:23 2018 +0200
146.3 @@ -68,3 +68,6 @@
146.4 goto-implementation=\u8f6c\u81f3\u8986\u76d6/\u5df2\u8986\u76d6
146.5 goto-implementation-text=\u8f6c\u81f3\u8986\u76d6/\u5df2\u8986\u76d6(&I)
146.6
146.7 +DocProvider.source-code=\u6e90\u4ee3\u7801
146.8 +DocProvider.manual=\u624b\u518c\u9875
146.9 +
147.1 --- a/src/zh_CN/cnd/cnd-completion/cnd-completion/org/netbeans/modules/cnd/completion/options/Bundle_zh_CN.properties Mon Dec 19 12:18:33 2016 +0100
147.2 +++ b/src/zh_CN/cnd/cnd-completion/cnd-completion/org/netbeans/modules/cnd/completion/options/Bundle_zh_CN.properties Tue Apr 17 14:14:23 2018 +0200
147.3 @@ -39,4 +39,8 @@
147.4 CodeCompletionPanel.autoCompletionTriggersLabel.text=C/C++ \u6807\u8bc6\u7b26\u7684\u81ea\u52a8\u5f39\u51fa\u5f0f\u89e6\u53d1\u5668(&A):
147.5 CodeCompletionPanel.autoInclude.text=\u4e3a\u5b8c\u6210\u7684\u6807\u8bc6\u7b26\u81ea\u52a8\u63d2\u5165 #include \u6307\u4ee4(&D)
147.6 CodeCompletionPanel.autoCompletionTriggersPreprocLabel.text=#include \u6307\u4ee4\u7684\u81ea\u52a8\u5f39\u51fa\u5f0f\u89e6\u53d1\u5668(&P)
147.7 +CodeCompletionPanel.docimentationListLabel.text=\u6587\u6863\u83b7\u53d6\u6765\u6e90
147.8 +CodeCompletionPanel.documentationCheckBox.text=\u6587\u6863\u8bbe\u7f6e
147.9 +CodeCompletionPanel.upButton.text=\u4e0a\u79fb
147.10 +CodeCompletionPanel.downButton.text=\u4e0b\u79fb
147.11
148.1 --- a/src/zh_CN/cnd/cnd-debugger-common2/cnd-debugger-common2/org/netbeans/modules/cnd/debugger/common2/debugger/Bundle_zh_CN.properties Mon Dec 19 12:18:33 2016 +0100
148.2 +++ b/src/zh_CN/cnd/cnd-debugger-common2/cnd-debugger-common2/org/netbeans/modules/cnd/debugger/common2/debugger/Bundle_zh_CN.properties Tue Apr 17 14:14:23 2018 +0200
148.3 @@ -264,6 +264,7 @@
148.4 HINT_address=\u53d8\u91cf\u7684\u5730\u5740
148.5 ACT_Variable_Watch=\u76d1\u89c6
148.6 MSG_Show_More_Message=\u663e\u793a\u66f4\u591a
148.7 +CTL_WatchAction_ShowPinned=\u663e\u793a\u56fa\u5b9a\u7684\u76d1\u89c6
148.8
148.9 #
148.10 # Error messages
149.1 --- a/src/zh_CN/cnd/cnd-debugger-common2/cnd-debugger-common2/org/netbeans/modules/cnd/debugger/common2/debugger/actions/Bundle_zh_CN.properties Mon Dec 19 12:18:33 2016 +0100
149.2 +++ b/src/zh_CN/cnd/cnd-debugger-common2/cnd-debugger-common2/org/netbeans/modules/cnd/debugger/common2/debugger/actions/Bundle_zh_CN.properties Tue Apr 17 14:14:23 2018 +0200
149.3 @@ -68,10 +68,10 @@
149.4 HostName=\u4e3b\u673a\u540d
149.5 FromProcess=<\u6765\u81ea\u8fdb\u7a0b>
149.6
149.7 -All_Processes_Lab=\u6240\u6709\u7528\u6237\u7684\u8fdb\u7a0b
149.8 -All_Processes=\u9009\u4e2d\u53ef\u83b7\u53d6\u6240\u6709\u7528\u6237\u7684\u6240\u6709\u8fdb\u7a0b
149.9 +All_Processes_Lab=\u4ec5\u7528\u6237\u8fdb\u7a0b
149.10 +All_Processes=\u9009\u4e2d\u4ee5\u4ec5\u83b7\u53d6\u7528\u6237\u8fdb\u7a0b
149.11
149.12 -ACSD_All_Processes=\u9009\u4e2d\u53ef\u83b7\u53d6\u6240\u6709\u7528\u6237\u7684\u6240\u6709\u8fdb\u7a0b
149.13 +ACSD_All_Processes=\u9009\u4e2d\u4ee5\u4ec5\u83b7\u53d6\u5f53\u524d\u7528\u6237\u8fdb\u7a0b
149.14
149.15
149.16 ACSD_EditHosts=\u7f16\u8f91\u4e3b\u673a\u5217\u8868
150.1 --- a/src/zh_CN/cnd/cnd-debugger-common2/cnd-debugger-common2/org/netbeans/modules/cnd/debugger/common2/debugger/assembly/Bundle_zh_CN.properties Mon Dec 19 12:18:33 2016 +0100
150.2 +++ b/src/zh_CN/cnd/cnd-debugger-common2/cnd-debugger-common2/org/netbeans/modules/cnd/debugger/common2/debugger/assembly/Bundle_zh_CN.properties Tue Apr 17 14:14:23 2018 +0200
150.3 @@ -60,6 +60,7 @@
150.4 Reg_ACT_Show_All_Registers=\u663e\u793a\u6240\u6709\u5bc4\u5b58\u5668
150.5 Reg_ACT_Hide=\u9690\u85cf\u9009\u5b9a\u7684\u5bc4\u5b58\u5668
150.6 Reg_ACT_More_Info=\u8be6\u7ec6\u4fe1\u606f
150.7 +Reg_ACT_Data_Presentation=\u6570\u636e\u8868\u793a\u5f62\u5f0f
150.8
150.9 #
150.10 # OW: Memory window, Evaluation window
151.1 --- a/src/zh_CN/cnd/cnd-debugger-common2/cnd-debugger-common2/org/netbeans/modules/cnd/debugger/common2/debugger/options/Bundle_zh_CN.properties Mon Dec 19 12:18:33 2016 +0100
151.2 +++ b/src/zh_CN/cnd/cnd-debugger-common2/cnd-debugger-common2/org/netbeans/modules/cnd/debugger/common2/debugger/options/Bundle_zh_CN.properties Tue Apr 17 14:14:23 2018 +0200
151.3 @@ -326,6 +326,13 @@
151.4 ACSD_balloon_eval_on=\u6253\u5f00\u6c14\u7403\u8868\u8fbe\u5f0f\u6c42\u503c
151.5 ACSD_balloon_eval_off=\u5173\u95ed\u6c14\u7403\u8868\u8fbe\u5f0f\u6c42\u503c
151.6
151.7 +LABEL_args_values_in_stack=\u5728\u201c\u8c03\u7528\u5806\u6808\u201d\u548c\u201c\u8c03\u8bd5\u89c6\u56fe\u201d\u7a97\u53e3\u4e2d\u663e\u793a\u53c2\u6570\u503c
151.8 +ACSD_args_values_in_stack=\u5728\u201c\u8c03\u7528\u5806\u6808\u201d\u548c\u201c\u8c03\u8bd5\u89c6\u56fe\u201d\u7a97\u53e3\u4e2d\u663e\u793a\u53c2\u6570\u503c
151.9 +
151.10 +ACSD_args_values_in_stack_on=\u5141\u8bb8\u5728\u201c\u8c03\u7528\u5806\u6808\u201d\u548c\u201c\u8c03\u8bd5\u89c6\u56fe\u201d\u7a97\u53e3\u4e2d\u663e\u793a\u53c2\u6570\u503c
151.11 +ACSD_args_values_in_stack_off=\u7981\u6b62\u5728\u201c\u8c03\u7528\u5806\u6808\u201d\u548c\u201c\u8c03\u8bd5\u89c6\u56fe\u201d\u7a97\u53e3\u4e2d\u663e\u793a\u53c2\u6570\u503c
151.12 +
151.13 +
151.14 LABEL_save_breakpoints=\u4fdd\u5b58\u5e76\u6062\u590d\u65ad\u70b9
151.15 ACSD_save_breakpoints=\u4fdd\u5b58\u5e76\u6062\u590d\u65ad\u70b9
151.16
152.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
152.2 +++ b/src/zh_CN/cnd/cnd-debugger-common2/cnd-debugger-common2/org/netbeans/modules/cnd/debugger/common2/ui/Bundle_zh_CN.properties Tue Apr 17 14:14:23 2018 +0200
152.3 @@ -0,0 +1,151 @@
152.4 +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
152.5 +#
152.6 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
152.7 +#
152.8 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
152.9 +# Other names may be trademarks of their respective owners.
152.10 +#
152.11 +# The contents of this file are subject to the terms of either the GNU
152.12 +# General Public License Version 2 only ("GPL") or the Common
152.13 +# Development and Distribution License("CDDL") (collectively, the
152.14 +# "License"). You may not use this file except in compliance with the
152.15 +# License. You can obtain a copy of the License at
152.16 +# http://www.netbeans.org/cddl-gplv2.html
152.17 +# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
152.18 +# specific language governing permissions and limitations under the
152.19 +# License. When distributing the software, include this License Header
152.20 +# Notice in each file and include the License file at
152.21 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
152.22 +# particular file as subject to the "Classpath" exception as provided
152.23 +# by Oracle in the GPL Version 2 section of the License file that
152.24 +# accompanied this code. If applicable, add the following below the
152.25 +# License Header, with the fields enclosed by brackets [] replaced by
152.26 +# your own identifying information:
152.27 +# "Portions Copyrighted [year] [name of copyright owner]"
152.28 +#
152.29 +# Contributor(s):
152.30 +#
152.31 +# The Original Software is NetBeans. The Initial Developer of the Original
152.32 +# Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
152.33 +# Microsystems, Inc. All Rights Reserved.
152.34 +#
152.35 +# If you wish your version of this file to be governed by only the CDDL
152.36 +# or only the GPL Version 2, indicate your decision by adding
152.37 +# "[Contributor] elects to include this software in this distribution
152.38 +# under the [CDDL or GPL Version 2] license." If you do not indicate a
152.39 +# single choice of license, a recipient has the option to distribute
152.40 +# your version of this file under either the CDDL, the GPL Version 2 or
152.41 +# to extend the choice of license to its licensees as provided above.
152.42 +# However, if you add GPL Version 2 code and therefore, elected the GPL
152.43 +# Version 2 license, then the option applies only if the new code is
152.44 +# made subject to such option by the copyright holder.
152.45 +
152.46 +# OLD #
152.47 +# OLD # AttachDialogAction
152.48 +# OLD #
152.49 +# OLD ATTACHDIALOG_ACTION_NAME=&Attach...
152.50 +
152.51 +ACSD_OK=\u786e\u5b9a
152.52 +ACSD_Cancel=\u53d6\u6d88
152.53 +
152.54 +#
152.55 +# AttachPanel
152.56 +#
152.57 +Refresh=\u5237\u65b0
152.58 +
152.59 +ACSD_Refresh=\u5237\u65b0\u8fdb\u7a0b\u5217\u8868
152.60 +
152.61 +CTL_Attach=\u8fde\u63a5\u8c03\u8bd5\u5668
152.62 +ACSD_CTL_AttachToProcess=\u5141\u8bb8\u8fde\u63a5\u5230\u4efb\u610f\u6b63\u5728\u8fd0\u884c\u7684\u8fdb\u7a0b
152.63 +AttachProcDiag_FilterColon=\u8fc7\u6ee4\u5668:
152.64 +
152.65 +AttachProcDiag_HostColon=\u4e3b\u673a:
152.66 +
152.67 +AttachProcDiag_Table=\u8981\u8fde\u63a5\u7684\u8fdb\u7a0b:
152.68 +
152.69 +ACSD_AttachProcDiag_Table=\u53ef\u7528\u8fdb\u7a0b\u7684\u5217\u8868
152.70 +RegExp=\u6b63\u5219\u8868\u8fbe\u5f0f
152.71 +HostName=\u4e3b\u673a\u540d
152.72 +FromProcess=<\u6765\u81ea\u8fdb\u7a0b>
152.73 +
152.74 +All_Processes_Lab=\u4ec5\u7528\u6237\u8fdb\u7a0b
152.75 +All_Processes=\u9009\u4e2d\u4ee5\u4ec5\u83b7\u53d6\u7528\u6237\u8fdb\u7a0b
152.76 +
152.77 +ACSD_All_Processes=\u9009\u4e2d\u4ee5\u4ec5\u83b7\u53d6\u5f53\u524d\u7528\u6237\u8fdb\u7a0b
152.78 +
152.79 +
152.80 +ACSD_EditHosts=\u7f16\u8f91\u4e3b\u673a\u5217\u8868
152.81 +
152.82 +ACSD_Engine=\u8c03\u8bd5\u5f15\u64ce
152.83 +ACSD_Debugging_Engine=\u8c03\u8bd5\u5f15\u64ce
152.84 +ASSOCIATED_ENGINE_LBL=\u8c03\u8bd5\u5f15\u64ce:
152.85 +
152.86 +ERROR_WRONG_FAMILY=\u8b66\u544a: \u9009\u5b9a\u7684\u9879\u76ee\u672a\u9488\u5bf9\u6b64\u8c03\u8bd5\u5668\u8fdb\u884c\u914d\u7f6e
152.87 +MSG_Uninitialized_Process_Table=\u8fdb\u7a0b\u8868\u5c1a\u672a\u521d\u59cb\u5316
152.88 +
152.89 +MSG_Gathering_Data=\u6b63\u5728\u6536\u96c6\u6570\u636e...
152.90 +MSG_PS_Failed=ps \u5931\u8d25, \u8bf7\u53c2\u89c1\u65e5\u5fd7\u4ee5\u4e86\u89e3\u66f4\u591a\u4fe1\u606f
152.91 +
152.92 +#
152.93 +# DebugCorePanel & ExecutableProjectPanel (used in AttachDialog)
152.94 +#
152.95 +
152.96 +ACSD_ExecutableBrowse=\u6d4f\u89c8\u53ef\u6267\u884c\u6587\u4ef6
152.97 +
152.98 +
152.99 +RUN_PROFILE_LBL=\u8fd0\u884c\u914d\u7f6e\u6587\u4ef6:
152.100 +
152.101 +RUN_PROFILES_BUTTON_TXT=\u7f16\u8f91...
152.102 +CHOOSER_BUTTON=\u9009\u62e9
152.103 +DEFAULT_SET_TITLE=\u9ed8\u8ba4\u8bbe\u7f6e
152.104 +NEW_PROJECT=<\u65b0\u5efa\u9879\u76ee>
152.105 +NO_PROJECT=<\u65e0\u9879\u76ee>
152.106 +DBG_ERROR_DONTEXIST=\u9009\u5b9a\u7684\u53ef\u6267\u884c\u6587\u4ef6\u4e0d\u5b58\u5728, \u6b64\u8c03\u8bd5\u5668\u9700\u8981\u8fde\u63a5\u6709\u6548\u7684\u53ef\u6267\u884c\u6587\u4ef6
152.107 +// OLD GDB_ERROR_DONTAPPLY=dbxtool does not allow gdb debugger
152.108 +ERROR_NEED_EXEC=\u6b64\u8c03\u8bd5\u5668\u9700\u8981\u9644\u52a0\u53ef\u6267\u884c\u6587\u4ef6\u540d
152.109 +ERROR_DONTAPPLY=\u6b64\u8c03\u8bd5\u5668\u4e0d\u53d7\u652f\u6301
152.110 +DBX_ERROR_DONTAPPLY=gdbtool \u4e0d\u5141\u8bb8\u4f7f\u7528 dbx \u8c03\u8bd5\u5668
152.111 +ERROR_DONTEXIST=\u9009\u5b9a\u7684\u53ef\u6267\u884c\u6587\u4ef6\u4e0d\u5b58\u5728
152.112 +ERROR_NOTAEXEFILE=\u9009\u5b9a\u7684\u6587\u4ef6\u4e0d\u662f\u53ef\u6267\u884c\u6587\u4ef6
152.113 +ProgramPathname=\u8c03\u8bd5\u5668\u53ef\u4ee5\u5229\u7528\u6b64\u8def\u5f84\u540d\u6062\u590d\u524d\u4e00\u4f1a\u8bdd\u4e2d\u4fdd\u5b58\u7684\u65ad\u70b9
152.114 +
152.115 +#
152.116 +# DebugProjectAction
152.117 +#
152.118 +# LBL_LoadProgram=Load program
152.119 +LBL_LoadProgram=\u52a0\u8f7d\u7a0b\u5e8f...
152.120 +LBL_Start=\u8c03\u8bd5\u4e3b\u9879\u76ee
152.121 +LBL_Continue=\u7ee7\u7eed(&C)
152.122 +CoreExeChooser=\u9009\u62e9\u53ef\u6267\u884c\u6587\u4ef6
152.123 +
152.124 +#
152.125 +# DebuggingOptionsAction
152.126 +#
152.127 +CTL_DebuggingOptions=\u8c03\u8bd5\u9009\u9879(&D)...
152.128 +
152.129 +#
152.130 +# DetachAction
152.131 +#
152.132 +LBL_Detach=\u4e2d\u65ad\u8c03\u8bd5\u5668\u8fde\u63a5(&D)
152.133 +
152.134 +#
152.135 +
152.136 +OUTPUT_ATTACH_ACTION_TEXT=\u8fde\u63a5\u8c03\u8bd5\u5668
152.137 +
152.138 +ATTACH_HISTORY_MESSAGE=\u8fde\u63a5\u5230 {0}@{1} \u8fdb\u7a0b
152.139 +
152.140 +
152.141 +PROGRESS_PREPARE_TARGET=\u6b63\u5728\u51c6\u5907\u8981\u8fde\u63a5\u5230\u7684\u76ee\u6807...
152.142 +DebugCorePanel.Validating=\u6b63\u5728\u9a8c\u8bc1...
152.143 +DebugCorePanel.HOST_IS_NOT_VALID=\u672a\u8fde\u63a5\u4e3b\u673a
152.144 +
152.145 +ACSD_Project=\u8981\u4f7f\u7528\u7684\u9879\u76ee
152.146 +
152.147 +#
152.148 +# DebugFileAction
152.149 +#
152.150 +TITLE_Hosts=\u4e3b\u673a...
152.151 +
152.152 +HOST_LBL=\u4e3b\u673a:
152.153 +ExecutableProjectPanel.commandLine_N_A.text=<\u4e0d\u53ef\u7528>
152.154 +
153.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
153.2 +++ b/src/zh_CN/cnd/cnd-debugger-common2/cnd-debugger-common2/org/netbeans/modules/cnd/debugger/common2/ui/processlist/Bundle_zh_CN.properties Tue Apr 17 14:14:23 2018 +0200
153.3 @@ -0,0 +1,88 @@
153.4 +ProcessListPanel.filterLabel.text=\u8fc7\u6ee4\u5668(&F):
153.5 +ProcessListPanel.refreshBtn.text=\u5237\u65b0(&R)
153.6 +ProcessListPanel.refreshBtn.toolTipText=\u5237\u65b0\u8fdb\u7a0b\u5217\u8868
153.7 +ProcessInfoPanel.jLabel1.text=\u547d\u4ee4\u884c:
153.8 +ProcessInfoPanel.commandLine_N_A.text=<\u4e0d\u53ef\u7528>
153.9 +WaitNode.displayName=\u6b63\u5728\u7b49\u5f85...
153.10 +ProcessListPanel.jToggleButton1.text=jToggleButton1
153.11 +ProcessListPanel.label=\u6811
153.12 +ProcessListPanel.toolTipText=\u6811\u6a21\u5f0f
153.13 +
153.14 +ProcessListPanel.listTogleButton.toolTipText=\u5217\u8868\u6a21\u5f0f
153.15 +
153.16 +ProcessListPanel.outlineHeaderName=PID
153.17 +ProcessListPanel.userProcessesOnlyCheckBox.text=\u4ec5\u663e\u793a\u7528\u6237\u8fdb\u7a0b
153.18 +
153.19 +#
153.20 +# DebugExecutableNodeAction
153.21 +#
153.22 +DEBUG_DIALOG_TITLE=\u8c03\u8bd5\u53ef\u6267\u884c\u6587\u4ef6
153.23 +DEBUG_ACTION_NAME=\u8c03\u8bd5
153.24 +
153.25 +#
153.26 +# DebugFileAction
153.27 +#
153.28 +TITLE_Hosts=\u4e3b\u673a...
153.29 +
153.30 +HOST_LBL=\u4e3b\u673a:
153.31 +
153.32 +#
153.33 +# AttachPanel
153.34 +#
153.35 +Refresh=\u5237\u65b0
153.36 +
153.37 +ACSD_Refresh=\u5237\u65b0\u8fdb\u7a0b\u5217\u8868
153.38 +
153.39 +CTL_Attach=\u8fde\u63a5\u8c03\u8bd5\u5668
153.40 +ACSD_CTL_AttachToProcess=\u5141\u8bb8\u8fde\u63a5\u5230\u4efb\u610f\u6b63\u5728\u8fd0\u884c\u7684\u8fdb\u7a0b
153.41 +AttachProcDiag_FilterColon=\u8fc7\u6ee4\u5668:
153.42 +
153.43 +AttachProcDiag_HostColon=\u4e3b\u673a:
153.44 +
153.45 +AttachProcDiag_Table=\u8981\u8fde\u63a5\u7684\u8fdb\u7a0b:
153.46 +
153.47 +ACSD_AttachProcDiag_Table=\u53ef\u7528\u8fdb\u7a0b\u7684\u5217\u8868
153.48 +RegExp=\u6b63\u5219\u8868\u8fbe\u5f0f
153.49 +HostName=\u4e3b\u673a\u540d
153.50 +FromProcess=<\u6765\u81ea\u8fdb\u7a0b>
153.51 +
153.52 +All_Processes_Lab=\u4ec5\u7528\u6237\u8fdb\u7a0b
153.53 +All_Processes=\u9009\u4e2d\u4ee5\u4ec5\u83b7\u53d6\u7528\u6237\u8fdb\u7a0b
153.54 +
153.55 +ACSD_All_Processes=\u9009\u4e2d\u4ee5\u4ec5\u83b7\u53d6\u5f53\u524d\u7528\u6237\u8fdb\u7a0b
153.56 +
153.57 +
153.58 +ACSD_EditHosts=\u7f16\u8f91\u4e3b\u673a\u5217\u8868
153.59 +
153.60 +ACSD_Engine=\u8c03\u8bd5\u5f15\u64ce
153.61 +ACSD_Debugging_Engine=\u8c03\u8bd5\u5f15\u64ce
153.62 +ASSOCIATED_ENGINE_LBL=\u8c03\u8bd5\u5f15\u64ce:
153.63 +
153.64 +ERROR_WRONG_FAMILY=\u8b66\u544a: \u9009\u5b9a\u7684\u9879\u76ee\u672a\u9488\u5bf9\u6b64\u8c03\u8bd5\u5668\u8fdb\u884c\u914d\u7f6e
153.65 +MSG_Uninitialized_Process_Table=\u8fdb\u7a0b\u8868\u5c1a\u672a\u521d\u59cb\u5316
153.66 +
153.67 +MSG_Gathering_Data=\u6b63\u5728\u6536\u96c6\u6570\u636e...
153.68 +MSG_PS_Failed=ps \u5931\u8d25, \u8bf7\u53c2\u89c1\u65e5\u5fd7\u4ee5\u4e86\u89e3\u66f4\u591a\u4fe1\u606f
153.69 +
153.70 +
153.71 +# OLD #
153.72 +# OLD # Debug->Windows menu stuff
153.73 +# OLD #
153.74 +# OLD
153.75 +# OLD CTL_DebugWindowsMenuAction=Windows
153.76 +# OLD MNEM_DebugWindowsMenuAction=W
153.77 +
153.78 +OUTPUT_ATTACH_ACTION_TEXT=\u8fde\u63a5\u8c03\u8bd5\u5668
153.79 +
153.80 +ATTACH_HISTORY_MESSAGE=\u8fde\u63a5\u5230 {0}@{1} \u8fdb\u7a0b
153.81 +
153.82 +Dis_ACT_Go_To_Source=\u8f6c\u81f3\u6e90\u4ee3\u7801
153.83 +Dis_ACT_Show_Current_Statement=\u663e\u793a\u5f53\u524d\u8bed\u53e5
153.84 +
153.85 +PROGRESS_PREPARE_TARGET=\u6b63\u5728\u51c6\u5907\u8981\u8fde\u63a5\u5230\u7684\u76ee\u6807...
153.86 +DebugCorePanel.Validating=\u6b63\u5728\u9a8c\u8bc1...
153.87 +DebugCorePanel.HOST_IS_NOT_VALID=\u672a\u8fde\u63a5\u4e3b\u673a
153.88 +
153.89 +Tree_Loading=\u6b63\u5728\u52a0\u8f7d...
153.90 +
153.91 +
154.1 --- a/src/zh_CN/cnd/cnd-debugger-common2/cnd-debugger-common2/org/netbeans/modules/cnd/debugger/common2/utils/Bundle_zh_CN.properties Mon Dec 19 12:18:33 2016 +0100
154.2 +++ b/src/zh_CN/cnd/cnd-debugger-common2/cnd-debugger-common2/org/netbeans/modules/cnd/debugger/common2/utils/Bundle_zh_CN.properties Tue Apr 17 14:14:23 2018 +0200
154.3 @@ -110,6 +110,12 @@
154.4
154.5 # PsProvider
154.6 # Should not be translated
154.7 +PS_HDR_ZONE=ZONE
154.8 +# Should not be translated
154.9 +
154.10 +# Should not be translated
154.11 +PS_HDR_USER=USER
154.12 +# Should not be translated
154.13
154.14 # Should not be translated
154.15
154.16 @@ -122,7 +128,7 @@
154.17 # Should not be translated
154.18
154.19 # Should not be translated
154.20 -
154.21 +PS_HDR_COMM=COMMAND
154.22 # Should not be translated
154.23
154.24 # Should not be translated
155.1 --- a/src/zh_CN/cnd/cnd-debugger-gdb2/cnd-debugger-gdb2/org/netbeans/modules/cnd/debugger/gdb2/Bundle_zh_CN.properties Mon Dec 19 12:18:33 2016 +0100
155.2 +++ b/src/zh_CN/cnd/cnd-debugger-gdb2/cnd-debugger-gdb2/org/netbeans/modules/cnd/debugger/gdb2/Bundle_zh_CN.properties Tue Apr 17 14:14:23 2018 +0200
155.3 @@ -76,7 +76,7 @@
155.4 MSG_GdbUnexpectedlyStopped=GDB \u5df2\u610f\u5916\u505c\u6b62\u5e76\u8fd4\u56de{0}
155.5 MSG_InvalidLocation = "\u65ad\u70b9\u4f4d\u7f6e\u4e0d\u5b58\u5728\u3002"
155.6 MSG_OldGdbVersion=\u5347\u7ea7 GDB \u4ee5\u4f7f\u7528\u8c03\u8bd5\u89c6\u56fe
155.7 -MSG_OldGdbVersionConsole=\u5347\u7ea7 GDB \u4ee5\u4f7f\u7528\u8c03\u8bd5\u5668\u63a7\u5236\u53f0
155.8 +MSG_OldGdbVersionConsole=\u9700\u8981\u66f4\u65b0\u5f53\u524d\u8c03\u8bd5\u5668\u7248\u672c\u4ee5\u5b8c\u5168\u652f\u6301\u8c03\u8bd5\u5668\u63a7\u5236\u53f0\u3002\n\u65e0\u6cd5\u53ca\u65f6\u66f4\u65b0 IDE UI, \u4f46\u652f\u6301\u53d7\u9650\u529f\u80fd\u3002
155.9 MSG_NonExistentWorkDir=\u5de5\u4f5c\u76ee\u5f55\u5f15\u7528\u4e86\u4e0d\u5b58\u5728\u7684\u8def\u5f84: {0}
155.10
155.11 #
155.12 @@ -125,6 +125,10 @@
155.13
155.14 ERR_UnsupportedVersion=\u6b64\u5e73\u53f0\u4e0a\u4e0d\u652f\u6301 Gdb \u7248\u672c {0}, \u5982\u679c\u7ee7\u7eed\u64cd\u4f5c, \u5219\u4ea7\u751f\u7684\u540e\u679c\u7531\u60a8\u81ea\u5df1\u627f\u62c5\u3002\u6709\u5173\u652f\u6301\u7684 gdb \u7248\u672c\u5217\u8868, \n\u8bf7\u8bbf\u95ee\nhttp://wiki.netbeans.org/FaqCPlusPlusGdbVersionInfo\u3002
155.15 MSG_Do_Not_Show_Again_In_Session=\u5728\u5f53\u524d IDE \u4f1a\u8bdd\u671f\u95f4\u4e0d\u518d\u663e\u793a
155.16 +#
155.17 +# For error (dialog) stuff
155.18 +#
155.19 +INFORMATION=\u4fe1\u606f
155.20
155.21 MSG_Reverse_Debugging_Option=\u4e0d\u5e94\u542f\u7528\u9006\u5411\u8c03\u8bd5\u9009\u9879!
155.22
156.1 --- a/src/zh_CN/cnd/cnd-debugger-gdb2/cnd-debugger-gdb2/org/netbeans/modules/cnd/debugger/gdb2/actions/Bundle_zh_CN.properties Mon Dec 19 12:18:33 2016 +0100
156.2 +++ b/src/zh_CN/cnd/cnd-debugger-gdb2/cnd-debugger-gdb2/org/netbeans/modules/cnd/debugger/gdb2/actions/Bundle_zh_CN.properties Tue Apr 17 14:14:23 2018 +0200
156.3 @@ -40,7 +40,7 @@
156.4 # Version 2 license, then the option applies only if the new code is
156.5 # made subject to such option by the copyright holder.
156.6
156.7 -GdbDebuggerEngine=\u4f7f\u7528 Gdb \u8c03\u8bd5\u5668
156.8 +GdbDebuggerEngine=Gdb \u8c03\u8bd5\u5668
156.9
156.10
156.11
157.1 --- a/src/zh_CN/cnd/cnd-highlight/cnd-highlight/org/netbeans/modules/cnd/highlight/semantic/Bundle_zh_CN.properties Mon Dec 19 12:18:33 2016 +0100
157.2 +++ b/src/zh_CN/cnd/cnd-highlight/cnd-highlight/org/netbeans/modules/cnd/highlight/semantic/Bundle_zh_CN.properties Tue Apr 17 14:14:23 2018 +0200
157.3 @@ -46,14 +46,14 @@
157.4 Show-fast-class-fields=\u7a81\u51fa\u663e\u793a\u7c7b\u5b57\u6bb5\u58f0\u660e(&S)
157.5 Show-fast-class-fields-AD=\u91c7\u7528\u7a81\u51fa\u663e\u793a\u683c\u5f0f\u663e\u793a\u7c7b\u5b57\u6bb5\u58f0\u660e
157.6
157.7 -Show-class-fields=\u7a81\u51fa\u663e\u793a\u7c7b\u5b57\u6bb5(&F)
157.8 -Show-class-fields-AD=\u91c7\u7528\u7a81\u51fa\u663e\u793a\u683c\u5f0f\u663e\u793a\u7c7b\u5b57\u6bb5
157.9 +Show-class-fields=\u7a81\u51fa\u663e\u793a\u7c7b\u5b57\u6bb5\u7528\u6cd5(&F)
157.10 +Show-class-fields-AD=\u91c7\u7528\u7a81\u51fa\u663e\u793a\u683c\u5f0f\u663e\u793a\u7c7b\u5b57\u6bb5\u7528\u6cd5
157.11
157.12 -Show-fast-functions-names=\u7a81\u51fa\u663e\u793a\u51fd\u6570\u540d\u79f0\u58f0\u660e\u548c\u5b9a\u4e49(&D)
157.13 -Show-fast-functions-names-AD=\u91c7\u7528\u7a81\u51fa\u663e\u793a\u683c\u5f0f\u663e\u793a\u51fd\u6570\u540d\u79f0\u58f0\u660e\u548c\u5b9a\u4e49
157.14 +Show-fast-functions-names=\u7a81\u51fa\u663e\u793a\u51fd\u6570\u58f0\u660e(&D)
157.15 +Show-fast-functions-names-AD=\u91c7\u7528\u7a81\u51fa\u663e\u793a\u683c\u5f0f\u663e\u793a\u51fd\u6570\u58f0\u660e
157.16
157.17 -Show-functions-names=\u7a81\u51fa\u663e\u793a\u51fd\u6570\u540d(&N)
157.18 -Show-functions-names-AD=\u91c7\u7528\u7a81\u51fa\u663e\u793a\u683c\u5f0f\u663e\u793a\u51fd\u6570\u540d
157.19 +Show-functions-names=\u7a81\u51fa\u663e\u793a\u51fd\u6570\u7528\u6cd5(&N)
157.20 +Show-functions-names-AD=\u91c7\u7528\u7a81\u51fa\u663e\u793a\u683c\u5f0f\u663e\u793a\u51fd\u6570\u7528\u6cd5
157.21
157.22 Show-macros=\u7a81\u51fa\u663e\u793a\u5b8f(&M)
157.23 Show-macros-AD=\u91c7\u7528\u7a81\u51fa\u663e\u793a\u683c\u5f0f\u663e\u793a\u5b8f
157.24 @@ -64,5 +64,21 @@
157.25 Show-unused-variables=\u7a81\u51fa\u663e\u793a\u672a\u4f7f\u7528\u7684\u53d8\u91cf(&V)
157.26 Show-unused-variables-AD=\u91c7\u7528\u7a81\u51fa\u663e\u793a\u683c\u5f0f\u663e\u793a\u672a\u4f7f\u7528\u7684\u53d8\u91cf
157.27
157.28 +Show-fast-enums-names=\u7a81\u51fa\u663e\u793a\u679a\u4e3e\u58f0\u660e
157.29 +Show-fast-enums-names-AD=\u91c7\u7528\u7a81\u51fa\u663e\u793a\u683c\u5f0f\u663e\u793a\u679a\u4e3e\u58f0\u660e
157.30
157.31 +Show-enums-names=\u7a81\u51fa\u663e\u793a\u679a\u4e3e\u7528\u6cd5
157.32 +Show-enums-names-AD=\u91c7\u7528\u7a81\u51fa\u663e\u793a\u683c\u5f0f\u663e\u793a\u679a\u4e3e\u7528\u6cd5
157.33
157.34 +Show-fast-classes-names=\u7a81\u51fa\u663e\u793a\u7c7b\u58f0\u660e
157.35 +Show-fast-classes-names-AD=\u91c7\u7528\u7a81\u51fa\u663e\u793a\u683c\u5f0f\u663e\u793a\u7c7b\u58f0\u660e
157.36 +
157.37 +Show-classes-names=\u7a81\u51fa\u663e\u793a\u7c7b\u7528\u6cd5
157.38 +Show-classes-names-AD=\u91c7\u7528\u7a81\u51fa\u663e\u793a\u683c\u5f0f\u663e\u793a\u7c7b\u7528\u6cd5
157.39 +
157.40 +Show-fast-enumerators-names=\u7a81\u51fa\u663e\u793a\u679a\u4e3e\u5668\u58f0\u660e
157.41 +Show-fast-enumerators-names-AD=\u91c7\u7528\u7a81\u51fa\u663e\u793a\u683c\u5f0f\u663e\u793a\u679a\u4e3e\u5668\u58f0\u660e
157.42 +
157.43 +Show-enumerators-names=\u7a81\u51fa\u663e\u793a\u679a\u4e3e\u5668\u7528\u6cd5
157.44 +Show-enumerators-names-AD=\u91c7\u7528\u7a81\u51fa\u663e\u793a\u683c\u5f0f\u663e\u793a\u679a\u4e3e\u5668\u7528\u6cd5
157.45 +
158.1 --- a/src/zh_CN/cnd/cnd-makeproject-ui/cnd-makeproject-ui/org/netbeans/modules/cnd/makeproject/ui/launchers/actions/Bundle_zh_CN.properties Mon Dec 19 12:18:33 2016 +0100
158.2 +++ b/src/zh_CN/cnd/cnd-makeproject-ui/cnd-makeproject-ui/org/netbeans/modules/cnd/makeproject/ui/launchers/actions/Bundle_zh_CN.properties Tue Apr 17 14:14:23 2018 +0200
158.3 @@ -65,7 +65,7 @@
158.4 PublicToolTip=<html>\u516c\u5171\u542f\u52a8\u7a0b\u5e8f\u5b58\u50a8\u5728 nbproject/launcher.properties \u6587\u4ef6\u4e2d<br>\n\u79c1\u6709 - nbroject/private/launcher.properties</html>
158.5 LaunchersPanel.hideCheckBox.text=\u9690\u85cf(&I)
158.6 HideTooltip=\u5728\u5f39\u51fa\u83dc\u5355\u4e2d\u9690\u85cf\u542f\u52a8\u7a0b\u5e8f\u3002
158.7 -LaunchersPanel.runInOwnTabCheckBox.text=\u5728\u81ea\u5df1\u7684\u8f93\u51fa\u6807\u7b7e\u4e2d\u8fd0\u884c(&T)
158.8 +LaunchersPanel.runInOwnTabCheckBox.text=\u5728\u81ea\u5df1\u7684\u8f93\u51fa\u6807\u7b7e\u4e2d\u8fd0\u884c(&U)
158.9
158.10 LBL_BuildAsAction_Name=\u6784\u5efa
158.11 LBL_RunAsAction_Name=\u8fd0\u884c
159.1 --- a/src/zh_CN/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/api/Bundle_zh_CN.properties Mon Dec 19 12:18:33 2016 +0100
159.2 +++ b/src/zh_CN/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/api/Bundle_zh_CN.properties Tue Apr 17 14:14:23 2018 +0200
159.3 @@ -66,6 +66,7 @@
159.4 TXT_Auto=\u81ea\u52a8
159.5 TXT_AlwaysRelative=\u59cb\u7ec8\u76f8\u5bf9\u8def\u5f84
159.6 TXT_AlwaysAbsolute=\u59cb\u7ec8\u7edd\u5bf9\u8def\u5f84
159.7 +NO_PROJECT=\u65e0\u9879\u76ee
159.8
159.9
159.10
160.1 --- a/src/zh_CN/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/resources/samples/fractal_zh_CN.html Mon Dec 19 12:18:33 2016 +0100
160.2 +++ b/src/zh_CN/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/resources/samples/fractal_zh_CN.html Tue Apr 17 14:14:23 2018 +0200
160.3 @@ -1,9 +1,44 @@
160.4 - <!--
160.5 - - Copyright 2006-2007 Sun Microsystems, Inc. All rights reserved.
160.6 - - SUN PROPRIETARY/CONFIDENTIAL.
160.7 - - Use is subject to license terms.
160.8 - -->
160.9 -
160.10 +<!--
160.11 + - DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
160.12 + -
160.13 + - Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
160.14 + -
160.15 + - The contents of this file are subject to the terms of either the GNU
160.16 + - General Public License Version 2 only ("GPL") or the Common
160.17 + - Development and Distribution License("CDDL") (collectively, the
160.18 + - "License"). You may not use this file except in compliance with the
160.19 + - License. You can obtain a copy of the License at
160.20 + - http://www.netbeans.org/cddl-gplv2.html
160.21 + - or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
160.22 + - specific language governing permissions and limitations under the
160.23 + - License. When distributing the software, include this License Header
160.24 + - Notice in each file and include the License file at
160.25 + - nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
160.26 + - particular file as subject to the "Classpath" exception as provided
160.27 + - by Sun in the GPL Version 2 section of the License file that
160.28 + - accompanied this code. If applicable, add the following below the
160.29 + - License Header, with the fields enclosed by brackets [] replaced by
160.30 + - your own identifying information:
160.31 + - "Portions Copyrighted [year] [name of copyright owner]"
160.32 + -
160.33 + - Contributor(s):
160.34 + -
160.35 + - The Original Software is NetBeans. The Initial Developer of the Original
160.36 + - Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
160.37 + - Microsystems, Inc. All Rights Reserved.
160.38 + -
160.39 + - If you wish your version of this file to be governed by only the CDDL
160.40 + - or only the GPL Version 2, indicate your decision by adding
160.41 + - "[Contributor] elects to include this software in this distribution
160.42 + - under the [CDDL or GPL Version 2] license." If you do not indicate a
160.43 + - single choice of license, a recipient has the option to distribute
160.44 + - your version of this file under either the CDDL, the GPL Version 2 or
160.45 + - to extend the choice of license to its licensees as provided above.
160.46 + - However, if you add GPL Version 2 code and therefore, elected the GPL
160.47 + - Version 2 license, then the option applies only if the new code is
160.48 + - made subject to such option by the copyright holder.
160.49 + -->
160.50 +
160.51 <HTML>
160.52 <head>
160.53 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
161.1 --- a/src/zh_CN/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/resources/samples/hello_zh_CN.html Mon Dec 19 12:18:33 2016 +0100
161.2 +++ b/src/zh_CN/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/resources/samples/hello_zh_CN.html Tue Apr 17 14:14:23 2018 +0200
161.3 @@ -1,9 +1,44 @@
161.4 - <!--
161.5 - - Copyright 2006-2007 Sun Microsystems, Inc. All rights reserved.
161.6 - - SUN PROPRIETARY/CONFIDENTIAL.
161.7 - - Use is subject to license terms.
161.8 - -->
161.9 -
161.10 +<!--
161.11 + - DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
161.12 + -
161.13 + - Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
161.14 + -
161.15 + - The contents of this file are subject to the terms of either the GNU
161.16 + - General Public License Version 2 only ("GPL") or the Common
161.17 + - Development and Distribution License("CDDL") (collectively, the
161.18 + - "License"). You may not use this file except in compliance with the
161.19 + - License. You can obtain a copy of the License at
161.20 + - http://www.netbeans.org/cddl-gplv2.html
161.21 + - or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
161.22 + - specific language governing permissions and limitations under the
161.23 + - License. When distributing the software, include this License Header
161.24 + - Notice in each file and include the License file at
161.25 + - nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
161.26 + - particular file as subject to the "Classpath" exception as provided
161.27 + - by Sun in the GPL Version 2 section of the License file that
161.28 + - accompanied this code. If applicable, add the following below the
161.29 + - License Header, with the fields enclosed by brackets [] replaced by
161.30 + - your own identifying information:
161.31 + - "Portions Copyrighted [year] [name of copyright owner]"
161.32 + -
161.33 + - Contributor(s):
161.34 + -
161.35 + - The Original Software is NetBeans. The Initial Developer of the Original
161.36 + - Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
161.37 + - Microsystems, Inc. All Rights Reserved.
161.38 + -
161.39 + - If you wish your version of this file to be governed by only the CDDL
161.40 + - or only the GPL Version 2, indicate your decision by adding
161.41 + - "[Contributor] elects to include this software in this distribution
161.42 + - under the [CDDL or GPL Version 2] license." If you do not indicate a
161.43 + - single choice of license, a recipient has the option to distribute
161.44 + - your version of this file under either the CDDL, the GPL Version 2 or
161.45 + - to extend the choice of license to its licensees as provided above.
161.46 + - However, if you add GPL Version 2 code and therefore, elected the GPL
161.47 + - Version 2 license, then the option applies only if the new code is
161.48 + - made subject to such option by the copyright holder.
161.49 + -->
161.50 +
161.51 <HTML>
161.52 <head>
161.53 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
162.1 --- a/src/zh_CN/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/resources/samples/lexyacc_zh_CN.html Mon Dec 19 12:18:33 2016 +0100
162.2 +++ b/src/zh_CN/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/resources/samples/lexyacc_zh_CN.html Tue Apr 17 14:14:23 2018 +0200
162.3 @@ -1,9 +1,44 @@
162.4 - <!--
162.5 - - Copyright 2006-2007 Sun Microsystems, Inc. All rights reserved.
162.6 - - SUN PROPRIETARY/CONFIDENTIAL.
162.7 - - Use is subject to license terms.
162.8 - -->
162.9 -
162.10 +<!--
162.11 + - DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
162.12 + -
162.13 + - Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
162.14 + -
162.15 + - The contents of this file are subject to the terms of either the GNU
162.16 + - General Public License Version 2 only ("GPL") or the Common
162.17 + - Development and Distribution License("CDDL") (collectively, the
162.18 + - "License"). You may not use this file except in compliance with the
162.19 + - License. You can obtain a copy of the License at
162.20 + - http://www.netbeans.org/cddl-gplv2.html
162.21 + - or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
162.22 + - specific language governing permissions and limitations under the
162.23 + - License. When distributing the software, include this License Header
162.24 + - Notice in each file and include the License file at
162.25 + - nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
162.26 + - particular file as subject to the "Classpath" exception as provided
162.27 + - by Sun in the GPL Version 2 section of the License file that
162.28 + - accompanied this code. If applicable, add the following below the
162.29 + - License Header, with the fields enclosed by brackets [] replaced by
162.30 + - your own identifying information:
162.31 + - "Portions Copyrighted [year] [name of copyright owner]"
162.32 + -
162.33 + - Contributor(s):
162.34 + -
162.35 + - The Original Software is NetBeans. The Initial Developer of the Original
162.36 + - Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
162.37 + - Microsystems, Inc. All Rights Reserved.
162.38 + -
162.39 + - If you wish your version of this file to be governed by only the CDDL
162.40 + - or only the GPL Version 2, indicate your decision by adding
162.41 + - "[Contributor] elects to include this software in this distribution
162.42 + - under the [CDDL or GPL Version 2] license." If you do not indicate a
162.43 + - single choice of license, a recipient has the option to distribute
162.44 + - your version of this file under either the CDDL, the GPL Version 2 or
162.45 + - to extend the choice of license to its licensees as provided above.
162.46 + - However, if you add GPL Version 2 code and therefore, elected the GPL
162.47 + - Version 2 license, then the option applies only if the new code is
162.48 + - made subject to such option by the copyright holder.
162.49 + -->
162.50 +
162.51 <HTML>
162.52 <head>
162.53 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
163.1 --- a/src/zh_CN/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/resources/samples/pi_zh_CN.html Mon Dec 19 12:18:33 2016 +0100
163.2 +++ b/src/zh_CN/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/resources/samples/pi_zh_CN.html Tue Apr 17 14:14:23 2018 +0200
163.3 @@ -1,9 +1,44 @@
163.4 - <!--
163.5 - - Copyright 2006-2007 Sun Microsystems, Inc. All rights reserved.
163.6 - - SUN PROPRIETARY/CONFIDENTIAL.
163.7 - - Use is subject to license terms.
163.8 - -->
163.9 -
163.10 +<!--
163.11 + - DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
163.12 + -
163.13 + - Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
163.14 + -
163.15 + - The contents of this file are subject to the terms of either the GNU
163.16 + - General Public License Version 2 only ("GPL") or the Common
163.17 + - Development and Distribution License("CDDL") (collectively, the
163.18 + - "License"). You may not use this file except in compliance with the
163.19 + - License. You can obtain a copy of the License at
163.20 + - http://www.netbeans.org/cddl-gplv2.html
163.21 + - or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
163.22 + - specific language governing permissions and limitations under the
163.23 + - License. When distributing the software, include this License Header
163.24 + - Notice in each file and include the License file at
163.25 + - nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
163.26 + - particular file as subject to the "Classpath" exception as provided
163.27 + - by Sun in the GPL Version 2 section of the License file that
163.28 + - accompanied this code. If applicable, add the following below the
163.29 + - License Header, with the fields enclosed by brackets [] replaced by
163.30 + - your own identifying information:
163.31 + - "Portions Copyrighted [year] [name of copyright owner]"
163.32 + -
163.33 + - Contributor(s):
163.34 + -
163.35 + - The Original Software is NetBeans. The Initial Developer of the Original
163.36 + - Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
163.37 + - Microsystems, Inc. All Rights Reserved.
163.38 + -
163.39 + - If you wish your version of this file to be governed by only the CDDL
163.40 + - or only the GPL Version 2, indicate your decision by adding
163.41 + - "[Contributor] elects to include this software in this distribution
163.42 + - under the [CDDL or GPL Version 2] license." If you do not indicate a
163.43 + - single choice of license, a recipient has the option to distribute
163.44 + - your version of this file under either the CDDL, the GPL Version 2 or
163.45 + - to extend the choice of license to its licensees as provided above.
163.46 + - However, if you add GPL Version 2 code and therefore, elected the GPL
163.47 + - Version 2 license, then the option applies only if the new code is
163.48 + - made subject to such option by the copyright holder.
163.49 + -->
163.50 +
163.51 <HTML>
163.52 <head>
163.53 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
164.1 --- a/src/zh_CN/cnd/cnd-modelui/cnd-modelui/org/netbeans/modules/cnd/modelui/actions/Bundle_zh_CN.properties Mon Dec 19 12:18:33 2016 +0100
164.2 +++ b/src/zh_CN/cnd/cnd-modelui/cnd-modelui/org/netbeans/modules/cnd/modelui/actions/Bundle_zh_CN.properties Tue Apr 17 14:14:23 2018 +0200
164.3 @@ -37,4 +37,5 @@
164.4 CTL_ReparseProject=\u91cd\u65b0\u89e3\u6790\u9879\u76ee
164.5 CTL_ReparseProjects=\u91cd\u65b0\u89e3\u6790 {0} \u4e2a\u9879\u76ee
164.6 CTL_CodeModelDiagnostic=\u8f6c\u50a8 C/C++ \u4ee3\u7801\u6a21\u578b\u8bca\u65ad
164.7 +CTL_ForceReparseProject=\u6e05\u7406 C/C++ \u9ad8\u901f\u7f13\u5b58\u5e76\u91cd\u65b0\u542f\u52a8 IDE
164.8
165.1 --- a/src/zh_CN/cnd/cnd-modelutil/cnd-modelutil/org/netbeans/modules/cnd/modelutil/resources/Bundle_zh_CN.properties Mon Dec 19 12:18:33 2016 +0100
165.2 +++ b/src/zh_CN/cnd/cnd-modelutil/cnd-modelutil/org/netbeans/modules/cnd/modelutil/resources/Bundle_zh_CN.properties Tue Apr 17 14:14:23 2018 +0200
165.3 @@ -41,11 +41,17 @@
165.4
165.5 cc-highlighting-inactive=\u4e0d\u6d3b\u52a8\u7684\u9884\u5904\u7406\u7a0b\u5e8f\u5757
165.6 cc-highlighting-macros=\u4ee3\u7801\u4e2d\u5b9a\u4e49\u7684\u5b8f
165.7 -cc-highlighting-macros-system=\u9884\u5b9a\u4e49\u7684\u5b8f
165.8 +cc-highlighting-macros-system=\u9884\u5b9a\u4e49\u5b8f
165.9 cc-highlighting-macros-user=\u9879\u76ee\u4e2d\u5b9a\u4e49\u7684\u5b8f
165.10 cc-highlighting-class-fields=\u5b57\u6bb5
165.11 cc-highlighting-typedefs=\u7c7b\u578b\u5b9a\u4e49
165.12 cc-highlighting-unused-variables=\u672a\u4f7f\u7528\u7684\u53d8\u91cf
165.13 cc-highlighting-function=\u51fd\u6570\u58f0\u660e
165.14 cc-highlighting-function-usage=\u51fd\u6570\u7528\u6cd5
165.15 +cc-highlighting-enum=\u679a\u4e3e\u58f0\u660e
165.16 +cc-highlighting-enum-usage=\u679a\u4e3e\u7528\u6cd5
165.17 +cc-highlighting-enumerator=\u679a\u4e3e\u5668\u58f0\u660e
165.18 +cc-highlighting-enumerator-usage=\u679a\u4e3e\u5668\u7528\u6cd5
165.19 +cc-highlighting-class=\u7c7b\u58f0\u660e
165.20 +cc-highlighting-class-usage=\u7c7b\u7528\u6cd5
165.21
166.1 --- a/src/zh_CN/cnd/cnd-refactoring/cnd-refactoring/org/netbeans/modules/cnd/refactoring/plugins/Bundle_zh_CN.properties Mon Dec 19 12:18:33 2016 +0100
166.2 +++ b/src/zh_CN/cnd/cnd-refactoring/cnd-refactoring/org/netbeans/modules/cnd/refactoring/plugins/Bundle_zh_CN.properties Tue Apr 17 14:14:23 2018 +0200
166.3 @@ -266,6 +266,9 @@
166.4 #Find Usages Filters
166.5 TXT_Filter_Comments=\u6ce8\u91ca\u8fc7\u6ee4\u5668
166.6 TXT_Filter_DeadCode=\u505c\u7528\u7684\u4ee3\u7801\u8fc7\u6ee4\u5668
166.7 +TXT_Filter_Read=\u72ec\u5360\u8bfb\u53d6\u8fc7\u6ee4\u5668
166.8 +TXT_Filter_Write=\u72ec\u5360\u5199\u5165\u8fc7\u6ee4\u5668
166.9 +TXT_Filter_ReadWrite=\u8bfb\u53d6/\u5199\u5165\u8fc7\u6ee4\u5668
166.10 TXT_Filter_Declarations=\u58f0\u660e\u548c\u5b9a\u4e49\u8fc7\u6ee4\u5668
166.11 TXT_Filter_Macros=\u5b8f\u8fc7\u6ee4\u5668
166.12 TXT_Filter_Scope=\u9650\u5b9a\u540d\u79f0\u8fc7\u6ee4\u5668\u4e2d\u7684\u7c7b\u540d
167.1 --- a/src/zh_CN/cnd/cnd-toolchain-ui/cnd-toolchain-ui/org/netbeans/modules/cnd/api/toolchain/ui/Bundle_zh_CN.properties Mon Dec 19 12:18:33 2016 +0100
167.2 +++ b/src/zh_CN/cnd/cnd-toolchain-ui/cnd-toolchain-ui/org/netbeans/modules/cnd/api/toolchain/ui/Bundle_zh_CN.properties Tue Apr 17 14:14:23 2018 +0200
167.3 @@ -56,7 +56,7 @@
167.4
167.5 MODIFY_PATH_VARIABLE=\u8def\u5f84\u53d8\u91cf
167.6
167.7 -PathEnvVariables.addLabel.text=\u5728 PATH \u73af\u5883\u53d8\u91cf\u4e2d\u6dfb\u52a0\u5de5\u5177\u96c6\u5408\u8def\u5f84
167.8 +PathEnvVariables.addLabel.text=\u5c06\u5de5\u5177\u96c6\u5408\u8def\u5f84\u6dfb\u52a0\u5230 PATH \u73af\u5883\u53d8\u91cf
167.9
167.10 PathEnvVariables.toolsVariableTextField.text=TOOLS_PATH
167.11 PathEnvVariables.utilitiesVariableTextField.text=UTILITIES_PATH
168.1 --- a/src/zh_CN/cnd/org-netbeans-libs-clank/ext/org-clang-analysis/org/clang/analysis/resources/Bundle_zh_CN.properties Mon Dec 19 12:18:33 2016 +0100
168.2 +++ b/src/zh_CN/cnd/org-netbeans-libs-clank/ext/org-clang-analysis/org/clang/analysis/resources/Bundle_zh_CN.properties Tue Apr 17 14:14:23 2018 +0200
168.3 @@ -1,4 +1,4 @@
168.4 OpenIDE-Module-Long-Description=clang/\u5206\u6790
168.5 -OpenIDE-Module-Name=Clank clang/\u5206\u6790
168.6 +OpenIDE-Module-Name=Clank clang/\u5206\u6790 (3.9 NO_BODY)
168.7 OpenIDE-Module-Short-Description=clang/\u5206\u6790
168.8
169.1 --- a/src/zh_CN/cnd/org-netbeans-libs-clank/ext/org-clang-ast/org/clang/ast/resources/Bundle_zh_CN.properties Mon Dec 19 12:18:33 2016 +0100
169.2 +++ b/src/zh_CN/cnd/org-netbeans-libs-clank/ext/org-clang-ast/org/clang/ast/resources/Bundle_zh_CN.properties Tue Apr 17 14:14:23 2018 +0200
169.3 @@ -1,4 +1,4 @@
169.4 OpenIDE-Module-Long-Description=clang/AST
169.5 -OpenIDE-Module-Name=Clank clang/AST
169.6 +OpenIDE-Module-Name=Clank clang/AST (3.9 NO_BODY)
169.7 OpenIDE-Module-Short-Description=clang/AST
169.8
170.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
170.2 +++ b/src/zh_CN/cnd/org-netbeans-libs-clank/ext/org-clang-astmatchers/org/clang/astmatchers/resources/Bundle_zh_CN.properties Tue Apr 17 14:14:23 2018 +0200
170.3 @@ -0,0 +1,2 @@
170.4 +OpenIDE-Module-Name=Clank clang/ASTMatchers (3.9 NO_BODY)
170.5 +
171.1 --- a/src/zh_CN/cnd/org-netbeans-libs-clank/ext/org-clang-basic/org/clang/basic/resources/Bundle_zh_CN.properties Mon Dec 19 12:18:33 2016 +0100
171.2 +++ b/src/zh_CN/cnd/org-netbeans-libs-clank/ext/org-clang-basic/org/clang/basic/resources/Bundle_zh_CN.properties Tue Apr 17 14:14:23 2018 +0200
171.3 @@ -1,4 +1,4 @@
171.4 OpenIDE-Module-Long-Description=clang/\u57fa\u672c
171.5 -OpenIDE-Module-Name=Clank clang/\u57fa\u672c
171.6 +OpenIDE-Module-Name=Clank clang/\u57fa\u672c (3.9 DONE)
171.7 OpenIDE-Module-Short-Description=clang/\u57fa\u672c
171.8
172.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
172.2 +++ b/src/zh_CN/cnd/org-netbeans-libs-clank/ext/org-clang-clangc/org/clang/clangc/resources/Bundle_zh_CN.properties Tue Apr 17 14:14:23 2018 +0200
172.3 @@ -0,0 +1,2 @@
172.4 +OpenIDE-Module-Name=Clank clang/Clang-C (libClang API) (3.9 DONE)
172.5 +
173.1 --- a/src/zh_CN/cnd/org-netbeans-libs-clank/ext/org-clang-driver/org/clang/driver/resources/Bundle_zh_CN.properties Mon Dec 19 12:18:33 2016 +0100
173.2 +++ b/src/zh_CN/cnd/org-netbeans-libs-clank/ext/org-clang-driver/org/clang/driver/resources/Bundle_zh_CN.properties Tue Apr 17 14:14:23 2018 +0200
173.3 @@ -1,4 +1,4 @@
173.4 OpenIDE-Module-Long-Description=clang/\u9a71\u52a8\u7a0b\u5e8f
173.5 -OpenIDE-Module-Name=Clank clang/\u9a71\u52a8\u7a0b\u5e8f
173.6 +OpenIDE-Module-Name=Clank clang/\u9a71\u52a8\u7a0b\u5e8f (3.9 DONE)
173.7 OpenIDE-Module-Short-Description=clang/\u9a71\u52a8\u7a0b\u5e8f
173.8
174.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
174.2 +++ b/src/zh_CN/cnd/org-netbeans-libs-clank/ext/org-clang-edit/org/clang/edit/Bundle_zh_CN.properties Tue Apr 17 14:14:23 2018 +0200
174.3 @@ -0,0 +1,4 @@
174.4 +OpenIDE-Module-Long-Description=clang/\u7f16\u8f91
174.5 +OpenIDE-Module-Name=Clank clang/\u7f16\u8f91 (3.9 DONE)
174.6 +OpenIDE-Module-Short-Description=clang/\u7f16\u8f91
174.7 +
175.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
175.2 +++ b/src/zh_CN/cnd/org-netbeans-libs-clank/ext/org-clang-format/org/clang/format/resources/Bundle_zh_CN.properties Tue Apr 17 14:14:23 2018 +0200
175.3 @@ -0,0 +1,2 @@
175.4 +OpenIDE-Module-Name=Clank clang/\u683c\u5f0f (3.9 NO_BODY)
175.5 +
176.1 --- a/src/zh_CN/cnd/org-netbeans-libs-clank/ext/org-clang-frontend/org/clang/frontend/resources/Bundle_zh_CN.properties Mon Dec 19 12:18:33 2016 +0100
176.2 +++ b/src/zh_CN/cnd/org-netbeans-libs-clank/ext/org-clang-frontend/org/clang/frontend/resources/Bundle_zh_CN.properties Tue Apr 17 14:14:23 2018 +0200
176.3 @@ -1,4 +1,4 @@
176.4 OpenIDE-Module-Long-Description=clang/\u524d\u7aef
176.5 -OpenIDE-Module-Name=Clank clang/\u524d\u7aef
176.6 +OpenIDE-Module-Name=Clank clang/\u524d\u7aef (3.9 DONE)
176.7 OpenIDE-Module-Short-Description=clang/\u524d\u7aef
176.8
177.1 --- a/src/zh_CN/cnd/org-netbeans-libs-clank/ext/org-clang-frontendtool/org/clang/frontendtool/resources/Bundle_zh_CN.properties Mon Dec 19 12:18:33 2016 +0100
177.2 +++ b/src/zh_CN/cnd/org-netbeans-libs-clank/ext/org-clang-frontendtool/org/clang/frontendtool/resources/Bundle_zh_CN.properties Tue Apr 17 14:14:23 2018 +0200
177.3 @@ -1,4 +1,4 @@
177.4 OpenIDE-Module-Long-Description=clang/\u524d\u7aef\u5de5\u5177
177.5 -OpenIDE-Module-Name=Clank clang/\u524d\u7aef\u5de5\u5177
177.6 +OpenIDE-Module-Name=Clank clang/\u524d\u7aef\u5de5\u5177 (3.9 DONE)
177.7 OpenIDE-Module-Short-Description=clang/\u524d\u7aef\u5de5\u5177
177.8
178.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
178.2 +++ b/src/zh_CN/cnd/org-netbeans-libs-clank/ext/org-clang-index/org/clang/index/resources/Bundle_zh_CN.properties Tue Apr 17 14:14:23 2018 +0200
178.3 @@ -0,0 +1,2 @@
178.4 +OpenIDE-Module-Name=Clank clang/\u7d22\u5f15
178.5 +
179.1 --- a/src/zh_CN/cnd/org-netbeans-libs-clank/ext/org-clang-lex/org/clang/lex/resources/Bundle_zh_CN.properties Mon Dec 19 12:18:33 2016 +0100
179.2 +++ b/src/zh_CN/cnd/org-netbeans-libs-clank/ext/org-clang-lex/org/clang/lex/resources/Bundle_zh_CN.properties Tue Apr 17 14:14:23 2018 +0200
179.3 @@ -1,4 +1,4 @@
179.4 OpenIDE-Module-Long-Description=clang/Lex
179.5 -OpenIDE-Module-Name=Clank clang/Lex
179.6 +OpenIDE-Module-Name=Clank clang/Lex (3.9 DONE)
179.7 OpenIDE-Module-Short-Description=clang/Lex
179.8
180.1 --- a/src/zh_CN/cnd/org-netbeans-libs-clank/ext/org-clang-parse/org/clang/parse/resources/Bundle_zh_CN.properties Mon Dec 19 12:18:33 2016 +0100
180.2 +++ b/src/zh_CN/cnd/org-netbeans-libs-clank/ext/org-clang-parse/org/clang/parse/resources/Bundle_zh_CN.properties Tue Apr 17 14:14:23 2018 +0200
180.3 @@ -1,4 +1,4 @@
180.4 OpenIDE-Module-Long-Description=clang/\u89e3\u6790
180.5 -OpenIDE-Module-Name=Clank clang/\u89e3\u6790
180.6 +OpenIDE-Module-Name=Clank clang/\u89e3\u6790 (3.9 DOING BODY)
180.7 OpenIDE-Module-Short-Description=clang/\u89e3\u6790
180.8
181.1 --- a/src/zh_CN/cnd/org-netbeans-libs-clank/ext/org-clang-rewrite/org/clang/rewrite/resources/Bundle_zh_CN.properties Mon Dec 19 12:18:33 2016 +0100
181.2 +++ b/src/zh_CN/cnd/org-netbeans-libs-clank/ext/org-clang-rewrite/org/clang/rewrite/resources/Bundle_zh_CN.properties Tue Apr 17 14:14:23 2018 +0200
181.3 @@ -1,2 +1,2 @@
181.4 -OpenIDE-Module-Name=Clank clang/\u91cd\u5199
181.5 +OpenIDE-Module-Name=Clank clang/\u91cd\u5199 (3.9 DONE)
181.6
182.1 --- a/src/zh_CN/cnd/org-netbeans-libs-clank/ext/org-clang-sema/org/clang/sema/resources/Bundle_zh_CN.properties Mon Dec 19 12:18:33 2016 +0100
182.2 +++ b/src/zh_CN/cnd/org-netbeans-libs-clank/ext/org-clang-sema/org/clang/sema/resources/Bundle_zh_CN.properties Tue Apr 17 14:14:23 2018 +0200
182.3 @@ -1,4 +1,4 @@
182.4 OpenIDE-Module-Long-Description=clang/Sema
182.5 -OpenIDE-Module-Name=Clank clang/Sema
182.6 +OpenIDE-Module-Name=Clank clang/Sema (3.9 NO_BODY)
182.7 OpenIDE-Module-Short-Description=clang/Sema
182.8
183.1 --- a/src/zh_CN/cnd/org-netbeans-libs-clank/ext/org-clang-serialization/org/clang/serialization/resources/Bundle_zh_CN.properties Mon Dec 19 12:18:33 2016 +0100
183.2 +++ b/src/zh_CN/cnd/org-netbeans-libs-clank/ext/org-clang-serialization/org/clang/serialization/resources/Bundle_zh_CN.properties Tue Apr 17 14:14:23 2018 +0200
183.3 @@ -1,4 +1,4 @@
183.4 OpenIDE-Module-Long-Description=clang/\u4e32\u884c\u5316
183.5 -OpenIDE-Module-Name=Clank clang/\u4e32\u884c\u5316
183.6 +OpenIDE-Module-Name=Clank clang/\u4e32\u884c\u5316 (3.9 NO_BODY)
183.7 OpenIDE-Module-Short-Description=clang/\u4e32\u884c\u5316
183.8
184.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
184.2 +++ b/src/zh_CN/cnd/org-netbeans-libs-clank/ext/org-clang-tidy/org/clang/tidy/resources/Bundle_zh_CN.properties Tue Apr 17 14:14:23 2018 +0200
184.3 @@ -0,0 +1,2 @@
184.4 +OpenIDE-Module-Name=Clank clang/Tidy
184.5 +
185.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
185.2 +++ b/src/zh_CN/cnd/org-netbeans-libs-clank/ext/org-clang-tooling/org/clang/tooling/resources/Bundle_zh_CN.properties Tue Apr 17 14:14:23 2018 +0200
185.3 @@ -0,0 +1,2 @@
185.4 +OpenIDE-Module-Name=Clank clang/\u5de5\u5177 (3.9 NO_BODY)
185.5 +
186.1 --- a/src/zh_CN/cnd/org-netbeans-libs-clank/ext/org-clang-tools-driver/org/clang/tools/driver/resources/Bundle_zh_CN.properties Mon Dec 19 12:18:33 2016 +0100
186.2 +++ b/src/zh_CN/cnd/org-netbeans-libs-clank/ext/org-clang-tools-driver/org/clang/tools/driver/resources/Bundle_zh_CN.properties Tue Apr 17 14:14:23 2018 +0200
186.3 @@ -1,3 +1,3 @@
186.4 -OpenIDE-Module-Name=Clank clang/\u5de5\u5177/\u9a71\u52a8\u7a0b\u5e8f
186.5 +OpenIDE-Module-Name=Clank clang/\u5de5\u5177/\u9a71\u52a8\u7a0b\u5e8f (3.9 DONE)
186.6 OpenIDE-Module-Short-Description=clang/\u5de5\u5177/\u9a71\u52a8\u7a0b\u5e8f
186.7
187.1 --- a/src/zh_CN/cnd/org-netbeans-libs-clank/ext/org-clang-tools-services/org/clang/tools/services/resources/Bundle_zh_CN.properties Mon Dec 19 12:18:33 2016 +0100
187.2 +++ b/src/zh_CN/cnd/org-netbeans-libs-clank/ext/org-clang-tools-services/org/clang/tools/services/resources/Bundle_zh_CN.properties Tue Apr 17 14:14:23 2018 +0200
187.3 @@ -1,2 +1,2 @@
187.4 -OpenIDE-Module-Name=\u57fa\u4e8e Clank clang \u7684\u670d\u52a1
187.5 +OpenIDE-Module-Name=\u57fa\u4e8e Clank clang \u7684\u670d\u52a1 (JAVA)
187.6
188.1 --- a/src/zh_CN/cnd/org-netbeans-libs-clank/ext/org-clank-java/org/clank/java/resources/Bundle_zh_CN.properties Mon Dec 19 12:18:33 2016 +0100
188.2 +++ b/src/zh_CN/cnd/org-netbeans-libs-clank/ext/org-clank-java/org/clank/java/resources/Bundle_zh_CN.properties Tue Apr 17 14:14:23 2018 +0200
188.3 @@ -1,4 +1,4 @@
188.4 OpenIDE-Module-Long-Description=C \u7ed3\u6784\u7684 Java \u7c7b
188.5 -OpenIDE-Module-Name=Java \u4e2d\u7684 Clank C \u5305\u88c5
188.6 +OpenIDE-Module-Name=Java \u4e2d\u7684 Clank C \u5305\u88c5 (JAVA)
188.7 OpenIDE-Module-Short-Description=C \u7ed3\u6784\u7684 Java \u7c7b
188.8
189.1 --- a/src/zh_CN/cnd/org-netbeans-libs-clank/ext/org-llvm-adtsupport/org/llvm/adtsupport/resources/Bundle_zh_CN.properties Mon Dec 19 12:18:33 2016 +0100
189.2 +++ b/src/zh_CN/cnd/org-netbeans-libs-clank/ext/org-llvm-adtsupport/org/llvm/adtsupport/resources/Bundle_zh_CN.properties Tue Apr 17 14:14:23 2018 +0200
189.3 @@ -1,4 +1,4 @@
189.4 OpenIDE-Module-Long-Description=llvm/ADT, llvm/\u652f\u6301, llvm/MC
189.5 -OpenIDE-Module-Name=Clank llvm ADT/\u652f\u6301/MC
189.6 +OpenIDE-Module-Name=Clank llvm ADT/\u652f\u6301/MC (3.9/3.8/3.6/3.4 ON DEMAND)
189.7 OpenIDE-Module-Short-Description=llvm ADT, \u652f\u6301, MC
189.8
190.1 --- a/src/zh_CN/cnd/org-netbeans-libs-clank/ext/org-llvm-bitcode/org/llvm/bitcode/resources/Bundle_zh_CN.properties Mon Dec 19 12:18:33 2016 +0100
190.2 +++ b/src/zh_CN/cnd/org-netbeans-libs-clank/ext/org-llvm-bitcode/org/llvm/bitcode/resources/Bundle_zh_CN.properties Tue Apr 17 14:14:23 2018 +0200
190.3 @@ -1,2 +1,2 @@
190.4 -OpenIDE-Module-Name=Clank llvm/\u4f4d\u7801
190.5 +OpenIDE-Module-Name=Clank llvm/\u4f4d\u7801 (3.9 NO_BODY)
190.6
191.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
191.2 +++ b/src/zh_CN/cnd/org-netbeans-libs-clank/ext/org-llvm-ir/org/llvm/ir/resources/Bundle_zh_CN.properties Tue Apr 17 14:14:23 2018 +0200
191.3 @@ -0,0 +1,2 @@
191.4 +OpenIDE-Module-Name=Clank llvm/IR
191.5 +
192.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
192.2 +++ b/src/zh_CN/cnd/org-netbeans-libs-clank/ext/org-llvm-linker/org/llvm/linker/resources/Bundle_zh_CN.properties Tue Apr 17 14:14:23 2018 +0200
192.3 @@ -0,0 +1,2 @@
192.4 +OpenIDE-Module-Name=Clank llvm/\u94fe\u63a5\u5668
192.5 +
193.1 --- a/src/zh_CN/cnd/org-netbeans-libs-clank/ext/org-llvm-option/org/llvm/option/resources/Bundle_zh_CN.properties Mon Dec 19 12:18:33 2016 +0100
193.2 +++ b/src/zh_CN/cnd/org-netbeans-libs-clank/ext/org-llvm-option/org/llvm/option/resources/Bundle_zh_CN.properties Tue Apr 17 14:14:23 2018 +0200
193.3 @@ -1,4 +1,4 @@
193.4 OpenIDE-Module-Long-Description=llvm/\u9009\u9879
193.5 -OpenIDE-Module-Name=Clank llvm/\u9009\u9879
193.6 +OpenIDE-Module-Name=Clank llvm/\u9009\u9879 (3.9 DONE)
193.7 OpenIDE-Module-Short-Description=llvm/\u9009\u9879
193.8
194.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
194.2 +++ b/src/zh_CN/cnd/org-netbeans-libs-clank/ext/org-llvm-passes/org/llvm/passes/resources/Bundle_zh_CN.properties Tue Apr 17 14:14:23 2018 +0200
194.3 @@ -0,0 +1,2 @@
194.4 +OpenIDE-Module-Name=Clank llvm/\u4f20\u9012
194.5 +
195.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
195.2 +++ b/src/zh_CN/cnd/org-netbeans-libs-clank/ext/org-llvm-profiledata/org/llvm/profiledata/resources/Bundle_zh_CN.properties Tue Apr 17 14:14:23 2018 +0200
195.3 @@ -0,0 +1,2 @@
195.4 +OpenIDE-Module-Name=Clank llvm/ProfileData
195.5 +
196.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
196.2 +++ b/src/zh_CN/cnd/org-netbeans-libs-clank/ext/org-llvm-target/org/llvm/target/resources/Bundle_zh_CN.properties Tue Apr 17 14:14:23 2018 +0200
196.3 @@ -0,0 +1,2 @@
196.4 +OpenIDE-Module-Name=Clank llvm/\u76ee\u6807
196.5 +
197.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
197.2 +++ b/src/zh_CN/cnd/org-netbeans-libs-clank/ext/org-llvm/org/llvm/resources/Bundle_zh_CN.properties Tue Apr 17 14:14:23 2018 +0200
197.3 @@ -0,0 +1,2 @@
197.4 +OpenIDE-Module-Name=Clank llvm/LLVM
197.5 +
198.1 --- a/src/zh_CN/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-makeproject-ui-resources-samples-fractal_zh_CN.html Mon Dec 19 12:18:33 2016 +0100
198.2 +++ b/src/zh_CN/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-makeproject-ui-resources-samples-fractal_zh_CN.html Tue Apr 17 14:14:23 2018 +0200
198.3 @@ -1,9 +1,44 @@
198.4 - <!--
198.5 - - Copyright 2006-2007 Sun Microsystems, Inc. All rights reserved.
198.6 - - SUN PROPRIETARY/CONFIDENTIAL.
198.7 - - Use is subject to license terms.
198.8 - -->
198.9 -
198.10 +<!--
198.11 + - DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
198.12 + -
198.13 + - Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
198.14 + -
198.15 + - The contents of this file are subject to the terms of either the GNU
198.16 + - General Public License Version 2 only ("GPL") or the Common
198.17 + - Development and Distribution License("CDDL") (collectively, the
198.18 + - "License"). You may not use this file except in compliance with the
198.19 + - License. You can obtain a copy of the License at
198.20 + - http://www.netbeans.org/cddl-gplv2.html
198.21 + - or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
198.22 + - specific language governing permissions and limitations under the
198.23 + - License. When distributing the software, include this License Header
198.24 + - Notice in each file and include the License file at
198.25 + - nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
198.26 + - particular file as subject to the "Classpath" exception as provided
198.27 + - by Sun in the GPL Version 2 section of the License file that
198.28 + - accompanied this code. If applicable, add the following below the
198.29 + - License Header, with the fields enclosed by brackets [] replaced by
198.30 + - your own identifying information:
198.31 + - "Portions Copyrighted [year] [name of copyright owner]"
198.32 + -
198.33 + - Contributor(s):
198.34 + -
198.35 + - The Original Software is NetBeans. The Initial Developer of the Original
198.36 + - Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
198.37 + - Microsystems, Inc. All Rights Reserved.
198.38 + -
198.39 + - If you wish your version of this file to be governed by only the CDDL
198.40 + - or only the GPL Version 2, indicate your decision by adding
198.41 + - "[Contributor] elects to include this software in this distribution
198.42 + - under the [CDDL or GPL Version 2] license." If you do not indicate a
198.43 + - single choice of license, a recipient has the option to distribute
198.44 + - your version of this file under either the CDDL, the GPL Version 2 or
198.45 + - to extend the choice of license to its licensees as provided above.
198.46 + - However, if you add GPL Version 2 code and therefore, elected the GPL
198.47 + - Version 2 license, then the option applies only if the new code is
198.48 + - made subject to such option by the copyright holder.
198.49 + -->
198.50 +
198.51 <HTML>
198.52 <head>
198.53 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
199.1 --- a/src/zh_CN/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-makeproject-ui-resources-samples-hello_zh_CN.html Mon Dec 19 12:18:33 2016 +0100
199.2 +++ b/src/zh_CN/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-makeproject-ui-resources-samples-hello_zh_CN.html Tue Apr 17 14:14:23 2018 +0200
199.3 @@ -1,9 +1,44 @@
199.4 - <!--
199.5 - - Copyright 2006-2007 Sun Microsystems, Inc. All rights reserved.
199.6 - - SUN PROPRIETARY/CONFIDENTIAL.
199.7 - - Use is subject to license terms.
199.8 - -->
199.9 -
199.10 +<!--
199.11 + - DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
199.12 + -
199.13 + - Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
199.14 + -
199.15 + - The contents of this file are subject to the terms of either the GNU
199.16 + - General Public License Version 2 only ("GPL") or the Common
199.17 + - Development and Distribution License("CDDL") (collectively, the
199.18 + - "License"). You may not use this file except in compliance with the
199.19 + - License. You can obtain a copy of the License at
199.20 + - http://www.netbeans.org/cddl-gplv2.html
199.21 + - or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
199.22 + - specific language governing permissions and limitations under the
199.23 + - License. When distributing the software, include this License Header
199.24 + - Notice in each file and include the License file at
199.25 + - nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
199.26 + - particular file as subject to the "Classpath" exception as provided
199.27 + - by Sun in the GPL Version 2 section of the License file that
199.28 + - accompanied this code. If applicable, add the following below the
199.29 + - License Header, with the fields enclosed by brackets [] replaced by
199.30 + - your own identifying information:
199.31 + - "Portions Copyrighted [year] [name of copyright owner]"
199.32 + -
199.33 + - Contributor(s):
199.34 + -
199.35 + - The Original Software is NetBeans. The Initial Developer of the Original
199.36 + - Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
199.37 + - Microsystems, Inc. All Rights Reserved.
199.38 + -
199.39 + - If you wish your version of this file to be governed by only the CDDL
199.40 + - or only the GPL Version 2, indicate your decision by adding
199.41 + - "[Contributor] elects to include this software in this distribution
199.42 + - under the [CDDL or GPL Version 2] license." If you do not indicate a
199.43 + - single choice of license, a recipient has the option to distribute
199.44 + - your version of this file under either the CDDL, the GPL Version 2 or
199.45 + - to extend the choice of license to its licensees as provided above.
199.46 + - However, if you add GPL Version 2 code and therefore, elected the GPL
199.47 + - Version 2 license, then the option applies only if the new code is
199.48 + - made subject to such option by the copyright holder.
199.49 + -->
199.50 +
199.51 <HTML>
199.52 <head>
199.53 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
200.1 --- a/src/zh_CN/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-makeproject-ui-resources-samples-lexyacc_zh_CN.html Mon Dec 19 12:18:33 2016 +0100
200.2 +++ b/src/zh_CN/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-makeproject-ui-resources-samples-lexyacc_zh_CN.html Tue Apr 17 14:14:23 2018 +0200
200.3 @@ -1,9 +1,44 @@
200.4 - <!--
200.5 - - Copyright 2006-2007 Sun Microsystems, Inc. All rights reserved.
200.6 - - SUN PROPRIETARY/CONFIDENTIAL.
200.7 - - Use is subject to license terms.
200.8 - -->
200.9 -
200.10 +<!--
200.11 + - DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
200.12 + -
200.13 + - Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
200.14 + -
200.15 + - The contents of this file are subject to the terms of either the GNU
200.16 + - General Public License Version 2 only ("GPL") or the Common
200.17 + - Development and Distribution License("CDDL") (collectively, the
200.18 + - "License"). You may not use this file except in compliance with the
200.19 + - License. You can obtain a copy of the License at
200.20 + - http://www.netbeans.org/cddl-gplv2.html
200.21 + - or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
200.22 + - specific language governing permissions and limitations under the
200.23 + - License. When distributing the software, include this License Header
200.24 + - Notice in each file and include the License file at
200.25 + - nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
200.26 + - particular file as subject to the "Classpath" exception as provided
200.27 + - by Sun in the GPL Version 2 section of the License file that
200.28 + - accompanied this code. If applicable, add the following below the
200.29 + - License Header, with the fields enclosed by brackets [] replaced by
200.30 + - your own identifying information:
200.31 + - "Portions Copyrighted [year] [name of copyright owner]"
200.32 + -
200.33 + - Contributor(s):
200.34 + -
200.35 + - The Original Software is NetBeans. The Initial Developer of the Original
200.36 + - Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
200.37 + - Microsystems, Inc. All Rights Reserved.
200.38 + -
200.39 + - If you wish your version of this file to be governed by only the CDDL
200.40 + - or only the GPL Version 2, indicate your decision by adding
200.41 + - "[Contributor] elects to include this software in this distribution
200.42 + - under the [CDDL or GPL Version 2] license." If you do not indicate a
200.43 + - single choice of license, a recipient has the option to distribute
200.44 + - your version of this file under either the CDDL, the GPL Version 2 or
200.45 + - to extend the choice of license to its licensees as provided above.
200.46 + - However, if you add GPL Version 2 code and therefore, elected the GPL
200.47 + - Version 2 license, then the option applies only if the new code is
200.48 + - made subject to such option by the copyright holder.
200.49 + -->
200.50 +
200.51 <HTML>
200.52 <head>
200.53 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
201.1 --- a/src/zh_CN/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-makeproject-ui-resources-samples-pi_zh_CN.html Mon Dec 19 12:18:33 2016 +0100
201.2 +++ b/src/zh_CN/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-makeproject-ui-resources-samples-pi_zh_CN.html Tue Apr 17 14:14:23 2018 +0200
201.3 @@ -1,9 +1,44 @@
201.4 - <!--
201.5 - - Copyright 2006-2007 Sun Microsystems, Inc. All rights reserved.
201.6 - - SUN PROPRIETARY/CONFIDENTIAL.
201.7 - - Use is subject to license terms.
201.8 - -->
201.9 -
201.10 +<!--
201.11 + - DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
201.12 + -
201.13 + - Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
201.14 + -
201.15 + - The contents of this file are subject to the terms of either the GNU
201.16 + - General Public License Version 2 only ("GPL") or the Common
201.17 + - Development and Distribution License("CDDL") (collectively, the
201.18 + - "License"). You may not use this file except in compliance with the
201.19 + - License. You can obtain a copy of the License at
201.20 + - http://www.netbeans.org/cddl-gplv2.html
201.21 + - or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
201.22 + - specific language governing permissions and limitations under the
201.23 + - License. When distributing the software, include this License Header
201.24 + - Notice in each file and include the License file at
201.25 + - nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
201.26 + - particular file as subject to the "Classpath" exception as provided
201.27 + - by Sun in the GPL Version 2 section of the License file that
201.28 + - accompanied this code. If applicable, add the following below the
201.29 + - License Header, with the fields enclosed by brackets [] replaced by
201.30 + - your own identifying information:
201.31 + - "Portions Copyrighted [year] [name of copyright owner]"
201.32 + -
201.33 + - Contributor(s):
201.34 + -
201.35 + - The Original Software is NetBeans. The Initial Developer of the Original
201.36 + - Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
201.37 + - Microsystems, Inc. All Rights Reserved.
201.38 + -
201.39 + - If you wish your version of this file to be governed by only the CDDL
201.40 + - or only the GPL Version 2, indicate your decision by adding
201.41 + - "[Contributor] elects to include this software in this distribution
201.42 + - under the [CDDL or GPL Version 2] license." If you do not indicate a
201.43 + - single choice of license, a recipient has the option to distribute
201.44 + - your version of this file under either the CDDL, the GPL Version 2 or
201.45 + - to extend the choice of license to its licensees as provided above.
201.46 + - However, if you add GPL Version 2 code and therefore, elected the GPL
201.47 + - Version 2 license, then the option applies only if the new code is
201.48 + - made subject to such option by the copyright holder.
201.49 + -->
201.50 +
201.51 <HTML>
201.52 <head>
201.53 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
202.1 --- a/src/zh_CN/ide/dlight-nativeexecution/dlight-nativeexecution/org/netbeans/modules/nativeexecution/support/Bundle_zh_CN.properties Mon Dec 19 12:18:33 2016 +0100
202.2 +++ b/src/zh_CN/ide/dlight-nativeexecution/dlight-nativeexecution/org/netbeans/modules/nativeexecution/support/Bundle_zh_CN.properties Tue Apr 17 14:14:23 2018 +0200
202.3 @@ -44,9 +44,8 @@
202.4 USER_AUTH_CANCELED=\u7528\u6237\u5df2\u53d6\u6d88 SSH \u9a8c\u8bc1
202.5 JSCHReceivedMessageIsTooLong.error.title=\u8fde\u63a5\u5230\u4e3b\u673a{0}\u65f6\u51fa\u9519
202.6 JSCHReceivedMessageIsTooLong.error.shorttext=\u60a8\u4f3c\u4e4e\u9047\u5230\u4e86\u4e0e\u67d0\u4e9b ssh \u670d\u52a1\u5668\u76f8\u5173\u7684\u5df2\u77e5\u95ee\u9898\u3002
202.7 -JSCHReceivedMessageIsTooLong.error.text=\u60a8\u4f3c\u4e4e\u9047\u5230\u4e86\u4e0e\u67d0\u4e9b ssh \u670d\u52a1\u5668\u76f8\u5173\u7684\u5df2\u77e5\u95ee\u9898\u3002\u8fdc\u7a0b\u4e3b\u673a\u4e0a\u7684\u67d0\u4e9b\u542f\u52a8\u811a\u672c (~/.bashrc \u7b49) \u53ef\u80fd\u4f1a\u5728\u767b\u5f55\u65f6\u8f93\u51fa\u4e00\u4e9b\u6587\u672c\u3002\u5982\u679c\u51fa\u73b0\u8fd9\u79cd\u60c5\u51b5, \u8bf7\u6309\u4ee5\u4e0b\u65b9\u5f0f\u5c01\u88c5\u751f\u6210\u8f93\u51fa\u7684\u4ee3\u7801:\n\n if [ ${TERM} != "dumb" ]; then\n ...\n fi\n\n\u7136\u540e\u91cd\u8bd5\u3002
202.8 +JSCHReceivedMessageIsTooLong.error.text=\u60a8\u4f3c\u4e4e\u9047\u5230\u4e86\u4e0e\u67d0\u4e9b ssh \u670d\u52a1\u5668\u76f8\u5173\u7684\u5df2\u77e5\u95ee\u9898\u3002<br> \u8fdc\u7a0b\u4e3b\u673a\u4e0a\u7684\u67d0\u4e9b\u542f\u52a8\u811a\u672c (~/.bashrc \u7b49)<br> \u53ef\u80fd\u4f1a\u5728\u767b\u5f55\u65f6\u8f93\u51fa\u4e00\u4e9b\u6587\u672c\u3002<br> \u5982\u679c\u51fa\u73b0\u8fd9\u79cd\u60c5\u51b5, \u8bf7\u6309\u4ee5\u4e0b\u65b9\u5f0f\u5c01\u88c5\u751f\u6210\u8f93\u51fa\u7684\u4ee3\u7801: <br><br> if [ ${TERM} != "dumb" ]; then <br> ...<br> fi<br><br> \u7136\u540e\u91cd\u8bd5\u3002
202.9
202.10 -#TITLE_Message=From {0}:
202.11 TITLE_Message_Ex=\u6765\u81ea{0}: {1}
202.12
202.13
203.1 --- a/src/zh_CN/ide/dlight-nativeexecution/dlight-nativeexecution/org/netbeans/modules/nativeexecution/support/hostinfo/impl/Bundle_zh_CN.properties Mon Dec 19 12:18:33 2016 +0100
203.2 +++ b/src/zh_CN/ide/dlight-nativeexecution/dlight-nativeexecution/org/netbeans/modules/nativeexecution/support/hostinfo/impl/Bundle_zh_CN.properties Tue Apr 17 14:14:23 2018 +0200
203.3 @@ -40,5 +40,5 @@
203.4
203.5 TITLE_PermissionDenied=\u65e0\u6cd5\u4f7f\u7528\u4e34\u65f6\u76ee\u5f55
203.6 SHORTMSG_PermissionDenied={1}\u4e0a\u7684{0}
203.7 -MSG_PermissionDenied=\u65e0\u6cd5\u5c06{0}\u7528\u4f5c{1}\u4e0a\u7684\u4e34\u65f6\u76ee\u5f55\u3002<br> \u8bf7\u4f7f\u7528 -J-Dcnd.tmpbase="other base location" \u6807\u5fd7\u6765\u6307\u5b9a<br>\u60a8\u5177\u6709\u5199\u5165\u548c\u6267\u884c\u6743\u9650\u7684\u76ee\u5f55\u3002
203.8 +MSG_PermissionDenied=\u65e0\u6cd5\u5c06 {0} \u7528\u4f5c {1} \u4e0a\u7684\u4e34\u65f6\u76ee\u5f55\u3002<br> \u8bf7\u5728\u8fd0\u884c IDE \u65f6\u4f7f\u7528 -J-Dcnd.tmpbase="other base location" \u6807\u5fd7\u6765\u6307\u5b9a<br> \u8fdc\u7a0b\u4e3b\u673a\u4e0a\u5177\u6709\u8db3\u591f\u7a7a\u95f4\u5e76\u4e14\u60a8\u5177\u6709\u5199\u5165\u548c\u6267\u884c\u6743\u9650\u7684\u76ee\u5f55\u3002
203.9
204.1 --- a/src/zh_CN/ide/docker-ui/docker-ui/org/netbeans/modules/docker/ui/build2/Bundle_zh_CN.properties Mon Dec 19 12:18:33 2016 +0100
204.2 +++ b/src/zh_CN/ide/docker-ui/docker-ui/org/netbeans/modules/docker/ui/build2/Bundle_zh_CN.properties Tue Apr 17 14:14:23 2018 +0200
204.3 @@ -52,6 +52,13 @@
204.4 BuildOptionsVisual.pullCheckBox.text=\u59cb\u7ec8\u5c1d\u8bd5\u63d0\u53d6\u8f83\u65b0\u7684\u6620\u50cf\u7248\u672c(&A)
204.5 BuildInstanceVisual.addButton.text=\u6dfb\u52a0(&A)...
204.6 BuildInstanceVisual.instanceLabel.text=\u6784\u5efa\u5b9e\u4f8b(&I):
204.7 +BuildContextVisual.fileChooser.button=\u6253\u5f00
204.8 +BuildContextVisual.fileChooser.dialogTitle=\u9009\u62e9 Docker \u6620\u50cf\u4e0a\u4e0b\u6587
204.9 +BuildOptionsVisual.jLabel1.text=\u6784\u5efa\u65f6\u53d8\u91cf:
204.10 +BuildOptionsVisual.addVariableButton.text=\u6dfb\u52a0
204.11 +BuildOptionsVisual.deleteVariableButton.text=\u5220\u9664
204.12 +BuildOptionsVisual.buildargsTable.columnModel.title1=\u503c
204.13 +BuildOptionsVisual.buildargsTable.columnModel.title0=\u540d\u79f0
204.14 LBL_Build=\u6784\u5efa...
204.15 LBL_BuildContext=\u6784\u5efa\u4e0a\u4e0b\u6587
204.16 LBL_BuildImage=\u6784\u5efa\u6620\u50cf
205.1 --- a/src/zh_CN/ide/docker-ui/docker-ui/org/netbeans/modules/docker/ui/node/Bundle_zh_CN.properties Mon Dec 19 12:18:33 2016 +0100
205.2 +++ b/src/zh_CN/ide/docker-ui/docker-ui/org/netbeans/modules/docker/ui/node/Bundle_zh_CN.properties Tue Apr 17 14:14:23 2018 +0200
205.3 @@ -42,14 +42,17 @@
205.4
205.5 Docker_Root_Node_Name=Docker
205.6 Docker_Root_Node_Short_Description=\u5728 IDE \u4e2d\u6ce8\u518c\u7684 Docker \u8ba1\u7b97\u673a
205.7 -
205.8 -
205.9 LBL_AttachContainerAction=\u8fde\u63a5
205.10 LBL_Containers=\u5bb9\u5668
205.11 LBL_CopyIdAction=\u526f\u672c ID
205.12 +LBL_GetPortMappingsAction=\u67e5\u770b\u7aef\u53e3\u7ed1\u5b9a
205.13 +LBL_HostAddress=\u4e3b\u673a\u5730\u5740
205.14 +LBL_HostPort=\u4e3b\u673a\u7aef\u53e3
205.15 # {0} - instance name
205.16 LBL_Offline={0} [\u8131\u673a]
205.17 LBL_PauseContainerAction=\u6682\u505c
205.18 +LBL_Port=\u7aef\u53e3
205.19 +LBL_PortBindings=\u7aef\u53e3\u7ed1\u5b9a
205.20 LBL_PushTagAction=\u63a8\u5165...
205.21 LBL_RefreshAction=\u5237\u65b0
205.22 LBL_RemoveContainerAction=\u5220\u9664
205.23 @@ -59,12 +62,15 @@
205.24 LBL_ShowLogAction=\u663e\u793a\u65e5\u5fd7
205.25 LBL_StartContainerAction=\u542f\u52a8
205.26 LBL_StopContainerAction=\u505c\u6b62
205.27 +LBL_Type=\u7c7b\u578b
205.28 LBL_UnpauseContainerAction=\u53d6\u6d88\u6682\u505c
205.29 # {0} - container id
205.30 MSG_AttachingContainer=\u6b63\u5728\u8fde\u63a5\u5230\u5bb9\u5668 {0}
205.31 MSG_CouldNotCopy=\u65e0\u6cd5\u590d\u5236 ID
205.32 MSG_EditCredentials=\u9a8c\u8bc1\u5931\u8d25\u3002\u662f\u5426\u8981\u4e3a\u6ce8\u518c\u8868\u914d\u7f6e\u8eab\u4efd\u8bc1\u660e\u5e76\u91cd\u8bd5?
205.33 # {0} - container id
205.34 +MSG_GettingPortMappings=\u83b7\u53d6\u5bb9\u5668 {0} \u7684\u7aef\u53e3\u7ed1\u5b9a
205.35 +# {0} - container id
205.36 MSG_PausingContainer=\u6b63\u5728\u6682\u505c\u5bb9\u5668 {0}
205.37 # {0} - image name
205.38 MSG_Pushing=\u6b63\u5728\u63a8\u5165{0}
206.1 --- a/src/zh_CN/ide/docker-ui/docker-ui/org/netbeans/modules/docker/ui/run/Bundle_zh_CN.properties Mon Dec 19 12:18:33 2016 +0100
206.2 +++ b/src/zh_CN/ide/docker-ui/docker-ui/org/netbeans/modules/docker/ui/run/Bundle_zh_CN.properties Tue Apr 17 14:14:23 2018 +0200
206.3 @@ -69,4 +69,10 @@
206.4 RunContainerPropertiesVisual.interactiveCheckBox.text=\u5373\u4f7f\u672a\u8fde\u63a5\u4e5f\u4fdd\u6301 STDIN \u6253\u5f00(&K)
206.5 RunContainerPropertiesVisual.commandLabel.text=\u547d\u4ee4(&C):
206.6 RunContainerPropertiesVisual.userLabel.text=\u7528\u6237(&U):
206.7 +RunContainerPropertiesVisual.privilegedCheckBox.text=\u5728\u6388\u6743\u6a21\u5f0f\u4e0b\u8fd0\u884c(&R)
206.8 +RunContainerPropertiesVisual.mountVolumesCheckBox.text=\u88c5\u8f7d\u5377(&M)
206.9 +RunContainerPropertiesVisual.addButton.text=\u6dfb\u52a0(&A)
206.10 +RunContainerPropertiesVisual.deleteButton.text=\u5220\u9664(&D)
206.11 +RunContainerPropertiesVisual.volumesTable.columnModel.title1=\u6e90
206.12 +RunContainerPropertiesVisual.volumesTable.columnModel.title0=\u76ee\u6807
206.13
207.1 --- a/src/zh_CN/ide/editor-bookmarks/editor-bookmarks/org/netbeans/modules/editor/bookmarks/ui/Bundle_zh_CN.properties Mon Dec 19 12:18:33 2016 +0100
207.2 +++ b/src/zh_CN/ide/editor-bookmarks/editor-bookmarks/org/netbeans/modules/editor/bookmarks/ui/Bundle_zh_CN.properties Tue Apr 17 14:14:23 2018 +0200
207.3 @@ -70,7 +70,7 @@
207.4
207.5 CTL_keyChooserTitle=\u6309\u4e66\u7b7e\u952e
207.6 CTL_keyChooserCloseButton=\u5173\u95ed
207.7 -CTL_keyChooserUnoccupiedBookmarkKey=\u4e66\u7b7e\u952e\u4e3a\u7a7a\u3002\u8bf7\u4f7f\u7528 Window->Navigating->Bookmarks \u6307\u5b9a\u952e\u3002
207.8 +CTL_keyChooserUnoccupiedBookmarkKey=\u4e66\u7b7e\u952e\u4e3a\u7a7a\u3002\u8bf7\u4f7f\u7528 Window\u2023Navigating\u2023Bookmarks \u6307\u5b9a\u952e\u3002
207.9 LBL_keyChooserNoActiveKeys=\u6ca1\u6709\u6d3b\u52a8\u7684\u4e66\u7b7e\u952e\u3002
207.10 -LBL_keyChooserNoActiveKeysHelp=\u4f7f\u7528 Window->Navigating->Bookmarks \u6307\u5b9a\u952e\u3002
207.11 +LBL_keyChooserNoActiveKeysHelp=\u4f7f\u7528 Window\u2023Navigating\u2023Bookmarks \u6307\u5b9a\u952e\u3002
207.12
208.1 --- a/src/zh_CN/ide/editor-indent/editor-indent/org/netbeans/modules/editor/indent/Bundle_zh_CN.properties Mon Dec 19 12:18:33 2016 +0100
208.2 +++ b/src/zh_CN/ide/editor-indent/editor-indent/org/netbeans/modules/editor/indent/Bundle_zh_CN.properties Tue Apr 17 14:14:23 2018 +0200
208.3 @@ -46,4 +46,3 @@
208.4 OpenIDE-Module-Short-Description=\u5305\u542b\u7f29\u8fdb API \u548c SPI\u3002
208.5 OpenIDE-Module-Long-Description=\u6b64\u6a21\u5757\u5305\u542b\u7f29\u8fdb\u548c\u4ee3\u7801\u683c\u5f0f\u8bbe\u7f6e API \u4ee5\u53ca\u57fa\u7840\u7ed3\u6784\u3002
208.6
208.7 -
209.1 --- a/src/zh_CN/ide/editor-lib/editor-lib/org/netbeans/modules/editor/lib/Bundle_zh_CN.properties Mon Dec 19 12:18:33 2016 +0100
209.2 +++ b/src/zh_CN/ide/editor-lib/editor-lib/org/netbeans/modules/editor/lib/Bundle_zh_CN.properties Tue Apr 17 14:14:23 2018 +0200
209.3 @@ -43,6 +43,6 @@
209.4 OpenIDE-Module-Name=\u7f16\u8f91\u5668\u5e93
209.5 OpenIDE-Module-Display-Category=\u7f16\u8f91
209.6 OpenIDE-Module-Short-Description=\u5305\u542b\u72ec\u7acb\u4e8e IDE \u7684\u7f16\u8f91\u5668\u529f\u80fd
209.7 -OpenIDE-Module-Long-Description=\u7f16\u8f91\u5668\u5e93\u5305\u542b\u901a\u5e38\u72ec\u7acb\u4e8e NetBeans IDE \u7684\u7f16\u8f91\u5668\u529f\u80fd\u3002\u5b83\u53ef\u7531\u72ec\u7acb\u7f16\u8f91\u5668\u91cd\u590d\u4f7f\u7528\u3002
209.8 +OpenIDE-Module-Long-Description=\u7f16\u8f91\u5668\u5e93\u5305\u542b\u901a\u5e38\u72ec\u7acb\u4e8e NetBeans IDE \u7684\u7f16\u8f91\u5668\u529f\u80fd\u3002\u5b83\u53ef\u7531\u72ec\u7acb\u7f16\u8f91\u5668\u91cd\u590d\u4f7f\u7528\u3002\u6709\u5173\u5305\u542b\u7684\u5df2\u4fee\u590d\u9519\u8bef\u7684\u5217\u8868, \u8bf7\u67e5\u770bhttp://wiki.netbeans.org/NetBeans8.2PatchesInfo\u3002
209.9
209.10
210.1 --- a/src/zh_CN/ide/editor-lib2/editor-lib2/org/netbeans/modules/editor/lib2/Bundle_zh_CN.properties Mon Dec 19 12:18:33 2016 +0100
210.2 +++ b/src/zh_CN/ide/editor-lib2/editor-lib2/org/netbeans/modules/editor/lib2/Bundle_zh_CN.properties Tue Apr 17 14:14:23 2018 +0200
210.3 @@ -43,7 +43,7 @@
210.4 OpenIDE-Module-Name=\u7f16\u8f91\u5668\u5e93 2
210.5 OpenIDE-Module-Display-Category=\u7f16\u8f91
210.6 OpenIDE-Module-Short-Description=\u5305\u542b\u6838\u5fc3\u7f16\u8f91\u5668 API \u548c SPI\u3002
210.7 -OpenIDE-Module-Long-Description=\u8be5\u5e93\u5305\u542b\u6587\u672c\u6587\u6863, \u89c6\u56fe\u5206\u5c42\u7ed3\u6784\u548c\u7a81\u51fa\u663e\u793a\u7684\u5b9e\u73b0\u3002\u8be5\u5e93\u72ec\u7acb\u4e8e NetBeans IDE\u3002
210.8 +OpenIDE-Module-Long-Description=\u8be5\u5e93\u5305\u542b\u6587\u672c\u6587\u6863, \u89c6\u56fe\u5206\u5c42\u7ed3\u6784\u548c\u7a81\u51fa\u663e\u793a\u7684\u5b9e\u73b0\u3002\u8be5\u5e93\u72ec\u7acb\u4e8e NetBeans IDE\u3002\u6709\u5173\u5305\u542b\u7684\u5df2\u4fee\u590d\u9519\u8bef\u7684\u5217\u8868, \u8bf7\u67e5\u770b http://wiki.netbeans.org/NetBeans8.2PatchesInfo\u3002
210.9
210.10 #DocUtils.debugPosition
210.11 wrong_position=\u9519\u8bef\u7684\u4f4d\u7f6e
211.1 --- a/src/zh_CN/ide/projectui/projectui/org/netbeans/modules/project/ui/zip/Bundle_zh_CN.properties Mon Dec 19 12:18:33 2016 +0100
211.2 +++ b/src/zh_CN/ide/projectui/projectui/org/netbeans/modules/project/ui/zip/Bundle_zh_CN.properties Tue Apr 17 14:14:23 2018 +0200
211.3 @@ -79,6 +79,10 @@
211.4 MSG_created=\u5df2\u521b\u5efa{0}
211.5 # {0} - ZIP entry name
211.6 MSG_creating=\u6b63\u5728\u521b\u5efa{0}
211.7 +# {0} - unpacked file
211.8 +# {1} - folder
211.9 +MSG_OutsideRoot=\u662f\u5426\u8981\u5199\u5165\u5df2\u5bfc\u5165\u6839\u76ee\u5f55 {1} \u5916\u90e8\u7684\u6587\u4ef6 {0}
211.10 +MSG_OutsideRootTitle=\u6587\u4ef6\u4f4d\u4e8e\u5bfc\u5165\u6587\u4ef6\u5939\u5916\u90e8
211.11 # {0} - ZIP entry name
211.12 MSG_packed=\u5df2\u6253\u5305: {0}
211.13 # {0} - subdirectory
212.1 --- a/src/zh_CN/ide/web-common/web-common/org/netbeans/modules/web/common/Bundle_zh_CN.properties Mon Dec 19 12:18:33 2016 +0100
212.2 +++ b/src/zh_CN/ide/web-common/web-common/org/netbeans/modules/web/common/Bundle_zh_CN.properties Tue Apr 17 14:14:23 2018 +0200
212.3 @@ -41,6 +41,7 @@
212.4 # made subject to such option by the copyright holder.
212.5
212.6 OpenIDE-Module-Display-Category=Web
212.7 +OpenIDE-Module-Long-Description=\u6709\u5173\u5305\u542b\u7684\u5df2\u4fee\u590d\u9519\u8bef\u7684\u5217\u8868, \u8bf7\u67e5\u770b http://wiki.netbeans.org/NetBeans8.2PatchesInfo\u3002
212.8 OpenIDE-Module-Name=Web \u901a\u7528
212.9 OpenIDE-Module-Short-Description=\u63d0\u4f9b\u5404\u79cd "\u4e0e Web \u76f8\u5173\u7684" \u901a\u7528\u529f\u80fd
212.10
213.1 --- a/src/zh_CN/other/installer/infra/build/web/js/start_strings_zh_CN.js Mon Dec 19 12:18:33 2016 +0100
213.2 +++ b/src/zh_CN/other/installer/infra/build/web/js/start_strings_zh_CN.js Tue Apr 17 14:14:23 2018 +0200
213.3 @@ -59,9 +59,9 @@
213.4 var SUPPORT_LABEL = "\u652f\u6301";
213.5 var SUPPORT_DESCRIPTION = "\u7075\u6d3b\u7684\u652f\u6301\u65b9\u6848\u9009\u62e9\u8ba9\u60a8\u80fd\u591f\u59cb\u7ec8\u4e13\u6ce8\u4e8e\u521b\u65b0\u3002";
213.6
213.7 -// $PRODUCT_NAME $TYPE (Installer for $PLATFORM/Zip)/$Language ($Language_ID) $filename ($SIZE) MD5: $MD5
213.8 -var INFO_MESSAGE = "{0}{1} {2}/{3} ({4})<br>{5} ({6} MB)<br>MD5: {7}";
213.9 -var INFO_MESSAGE_OTHER = "{0} ({1} MB)<br>MD5: {2}";
213.10 +// $PRODUCT_NAME $TYPE (Installer for $PLATFORM/Zip)/$Language ($Language_ID) $filename ($SIZE) SHA-256: $MD5
213.11 +var INFO_MESSAGE = "{0}{1} {2}/{3} ({4})<br>{5} ({6} MB)<br>SHA-256: {7}";
213.12 +var INFO_MESSAGE_OTHER = "{0} ({1} MB)<br>SHA-256: {2}";
213.13
213.14 //DO NOT TRANSLATE
213.15 var SUBSCRIPTION_PHP_URL = "http://services.netbeans.org/sub.php";
214.1 --- a/src/zh_CN/ruby/ruby-project/ruby-project/org/netbeans/modules/ruby/rubyproject/ui/wizards/Bundle_zh_CN.properties Mon Dec 19 12:18:33 2016 +0100
214.2 +++ b/src/zh_CN/ruby/ruby-project/ruby-project/org/netbeans/modules/ruby/rubyproject/ui/wizards/Bundle_zh_CN.properties Tue Apr 17 14:14:23 2018 +0200
214.3 @@ -61,11 +61,11 @@
214.4 ACSD_JavaExtSourcesProjectLocation=\u521b\u5efa\u65b0\u7684\u57fa\u4e8e\u73b0\u6709\u6e90\u4ee3\u7801\u7684 Ruby \u9879\u76ee
214.5 ProbablyRails=\u7c7b\u4f3c\u4e8e Rails \u76ee\u5f55 - \u8bf7\u6539\u7528 Rails \u9879\u76ee
214.6
214.7 -#NOI18N
214.8 +
214.9 #TXT_ClassName={0}/main.rb
214.10 #TXT_ClassName=main.rb
214.11
214.12 -#NOI18N
214.13 +
214.14 #TXT_PackageNameSuffix={0}pkg
214.15 LAB_ConfigureProject=\u540d\u79f0\u548c\u4f4d\u7f6e
214.16 LAB_ConfigureSourceRoots=\u73b0\u6709\u6e90\u4ee3\u7801
214.17 @@ -93,13 +93,13 @@
214.18 MSG_IllegalTests=\u6d4b\u8bd5\u5305\u6587\u4ef6\u5939 {0} \u4e0d\u5b58\u5728\u3002
214.19 MSG_IllegalProjectFolder=\u9879\u76ee\u6587\u4ef6\u5939\u5fc5\u987b\u4f4d\u4e8e\u5305\u6240\u5728\u7684\u6587\u4ef6\u5939\u4e4b\u5916\u3002
214.20
214.21 -#NOI18N
214.22 +
214.23 #TXT_JavaApplication=RubyApplication{0}
214.24
214.25 -#NOI18N
214.26 +
214.27 #TXT_JavaLibrary=RubyLibrary{0}
214.28
214.29 -#NOI18N
214.30 +
214.31 #TXT_JavaProject=RubyProject{0}
214.32 LBL_ProjectNameAndLocationLabel=\u6307\u5b9a\u65b0\u9879\u76ee\u7684\u540d\u79f0\u548c\u4f4d\u7f6e\u3002
214.33 CTL_SourceRoots=\u6e90\u6587\u4ef6\u5939\uff1a
215.1 --- a/src/zh_CN/ruby/ruby-railsprojects/ruby-railsprojects/org/netbeans/modules/ruby/railsprojects/ui/wizards/Bundle_zh_CN.properties Mon Dec 19 12:18:33 2016 +0100
215.2 +++ b/src/zh_CN/ruby/ruby-railsprojects/ruby-railsprojects/org/netbeans/modules/ruby/railsprojects/ui/wizards/Bundle_zh_CN.properties Tue Apr 17 14:14:23 2018 +0200
215.3 @@ -97,7 +97,7 @@
215.4 # (should not be an error in the future: see #42422)
215.5 TXT_NetBeansProject=NetBeans \u9879\u76ee
215.6
215.7 -#NOI18N
215.8 +
215.9 #TXT_RailsApplication=RailsApplication{0}
215.10 LBL_ProjectNameAndLocationLabel=\u4e3a\u73b0\u6709 Rails \u5e94\u7528\u7a0b\u5e8f\u6307\u5b9a\u540d\u79f0\u548c\u4f4d\u7f6e
215.11 ACSN_jPanel1=N/A
216.1 --- a/src/zh_CN/ruby/ruby/ruby/org/netbeans/modules/ruby/Bundle_zh_CN.properties Mon Dec 19 12:18:33 2016 +0100
216.2 +++ b/src/zh_CN/ruby/ruby/ruby/org/netbeans/modules/ruby/Bundle_zh_CN.properties Tue Apr 17 14:14:23 2018 +0200
216.3 @@ -266,9 +266,6 @@
216.4
216.5 InstalledVersions=\u5b89\u88c5\u7684\u7248\u672c\uff1a{0}
216.6
216.7 -# HTTP status codes for code completion,
216.8 -# descriptions taken from http://www.google.com/support/webmasters/bin/answer.py?hl=en&answer=40132 and http://www.w3.org/Protocols/rfc2616/rfc2616-sec10.html
216.9 -
216.10 SC_100=100\uff08\u7ee7\u7eed\uff09
216.11 SC_100_DESC=\u8bf7\u6c42\u8005\u5e94\u7ee7\u7eed\u8bf7\u6c42\u3002\u670d\u52a1\u5668\u8fd4\u56de\u6b64\u4ee3\u7801\u4ee5\u6307\u793a\u5b83\u5df2\u6536\u5230\u8bf7\u6c42\u7684\u7b2c\u4e00\u90e8\u5206\uff0c\u5e76\u5728\u7b49\u5f85\u5176\u4f59\u90e8\u5206\u3002
216.12 SC_101=101\uff08\u4ea4\u6362\u534f\u8bae\uff09
217.1 --- a/src/zh_TW/enterprise/j2eeserver/j2eeserver/org/netbeans/modules/j2ee/deployment/impl/ui/actions/Bundle_zh_TW.properties Mon Dec 19 12:18:33 2016 +0100
217.2 +++ b/src/zh_TW/enterprise/j2eeserver/j2eeserver/org/netbeans/modules/j2ee/deployment/impl/ui/actions/Bundle_zh_TW.properties Tue Apr 17 14:14:23 2018 +0200
217.3 @@ -37,11 +37,6 @@
217.4 # Version 2 license, then the option applies only if the new code is
217.5 # made subject to such option by the copyright holder.
217.6
217.7 -## SUN PROPRIETARY/CONFIDENTIAL: INTERNAL USE ONLY.
217.8 -
217.9 -## Copyright 2001 Sun Microsystems, Inc. All rights reserved. Use is
217.10 -## subject to license terms.
217.11 -
217.12
217.13 MSG_Server_Instance_Added=\u5df2\u6210\u529f\u52a0\u5165\u4f3a\u670d\u5668\u5be6\u9ad4\u300c{0}\u300d\u3002
217.14
218.1 --- a/src/zh_TW/other/installer/infra/build/web/js/start_strings_zh_TW.js Mon Dec 19 12:18:33 2016 +0100
218.2 +++ b/src/zh_TW/other/installer/infra/build/web/js/start_strings_zh_TW.js Tue Apr 17 14:14:23 2018 +0200
218.3 @@ -59,9 +59,9 @@
218.4 var SUPPORT_LABEL = "Support";
218.5 var SUPPORT_DESCRIPTION = "Flexible support options to help you stay focused on innovation.";
218.6
218.7 -// $PRODUCT_NAME $TYPE (Installer for $PLATFORM/Zip)/$Language ($Language_ID) $filename ($SIZE) MD5: $MD5
218.8 -var INFO_MESSAGE = "{0}{1} {2}/{3} ({4})<br>{5} ({6} MB)<br>MD5: {7}";
218.9 -var INFO_MESSAGE_OTHER = "{0} ({1} MB)<br>MD5: {2}";
218.10 +// $PRODUCT_NAME $TYPE (Installer for $PLATFORM/Zip)/$Language ($Language_ID) $filename ($SIZE) SHA-256: $MD5
218.11 +var INFO_MESSAGE = "{0}{1} {2}/{3} ({4})<br>{5} ({6} MB)<br>SHA-256: {7}";
218.12 +var INFO_MESSAGE_OTHER = "{0} ({1} MB)<br>SHA-256: {2}";
218.13
218.14 //DO NOT TRANSLATE
218.15 var SUBSCRIPTION_PHP_URL = "http://services.netbeans.org/sub.php";