# HG changeset patch
# User Jaroslav Tulach <jtulach@netbeans.org>
# Date 1523967263 -7200
# Node ID 147c8984ddd21143f46abb5006b3e1e603dab70f
# Parent  b7c1c51ac6f990a6da607b674cf5c06b14d3dbeb# Parent  a495151de3fbade09fad38b13c23bdd891f79827
Bringing changes on the master branch into the donation review one

diff -r b7c1c51ac6f9 -r 147c8984ddd2 src/af/other/installer/infra/build/web/js/start_strings_af.js
--- a/src/af/other/installer/infra/build/web/js/start_strings_af.js	Mon Dec 19 12:18:33 2016 +0100
+++ b/src/af/other/installer/infra/build/web/js/start_strings_af.js	Tue Apr 17 14:14:23 2018 +0200
@@ -59,9 +59,9 @@
 var SUPPORT_LABEL        = "Support";
 var SUPPORT_DESCRIPTION  = "Flexible support options to help you stay focused on innovation.";
 
-// $PRODUCT_NAME $TYPE (Installer for $PLATFORM/Zip)/$Language ($Language_ID) $filename ($SIZE) MD5: $MD5
-var INFO_MESSAGE = "{0}{1} {2}/{3} ({4})<br>{5} ({6} MB)<br>MD5: {7}";
-var INFO_MESSAGE_OTHER = "{0} ({1} MB)<br>MD5: {2}";
+// $PRODUCT_NAME $TYPE (Installer for $PLATFORM/Zip)/$Language ($Language_ID) $filename ($SIZE) SHA-256: $MD5
+var INFO_MESSAGE = "{0}{1} {2}/{3} ({4})<br>{5} ({6} MB)<br>SHA-256: {7}";
+var INFO_MESSAGE_OTHER = "{0} ({1} MB)<br>SHA-256: {2}";
 
 //DO NOT TRANSLATE
 var SUBSCRIPTION_PHP_URL = "http://services.netbeans.org/sub.php";
diff -r b7c1c51ac6f9 -r 147c8984ddd2 src/ar_EG/other/installer/infra/build/web/js/start_strings_ar_EG.js
--- a/src/ar_EG/other/installer/infra/build/web/js/start_strings_ar_EG.js	Mon Dec 19 12:18:33 2016 +0100
+++ b/src/ar_EG/other/installer/infra/build/web/js/start_strings_ar_EG.js	Tue Apr 17 14:14:23 2018 +0200
@@ -59,9 +59,9 @@
 var SUPPORT_LABEL        = "Support";
 var SUPPORT_DESCRIPTION  = "Flexible support options to help you stay focused on innovation.";
 
-// $PRODUCT_NAME $TYPE (Installer for $PLATFORM/Zip)/$Language ($Language_ID) $filename ($SIZE) MD5: $MD5
-var INFO_MESSAGE = "{0}{1} {2}/{3} ({4})<br>{5} ({6} MB)<br>MD5: {7}";
-var INFO_MESSAGE_OTHER = "{0} ({1} MB)<br>MD5: {2}";
+// $PRODUCT_NAME $TYPE (Installer for $PLATFORM/Zip)/$Language ($Language_ID) $filename ($SIZE) SHA-256: $MD5
+var INFO_MESSAGE = "{0}{1} {2}/{3} ({4})<br>{5} ({6} MB)<br>SHA-256: {7}";
+var INFO_MESSAGE_OTHER = "{0} ({1} MB)<br>SHA-256: {2}";
 
 //DO NOT TRANSLATE
 var SUBSCRIPTION_PHP_URL = "http://services.netbeans.org/sub.php";
diff -r b7c1c51ac6f9 -r 147c8984ddd2 src/ar_SA/other/installer/infra/build/web/js/start_strings_ar_SA.js
--- a/src/ar_SA/other/installer/infra/build/web/js/start_strings_ar_SA.js	Mon Dec 19 12:18:33 2016 +0100
+++ b/src/ar_SA/other/installer/infra/build/web/js/start_strings_ar_SA.js	Tue Apr 17 14:14:23 2018 +0200
@@ -59,9 +59,9 @@
 var SUPPORT_LABEL        = "Support";
 var SUPPORT_DESCRIPTION  = "Flexible support options to help you stay focused on innovation.";
 
-// $PRODUCT_NAME $TYPE (Installer for $PLATFORM/Zip)/$Language ($Language_ID) $filename ($SIZE) MD5: $MD5
-var INFO_MESSAGE = "{0}{1} {2}/{3} ({4})<br>{5} ({6} MB)<br>MD5: {7}";
-var INFO_MESSAGE_OTHER = "{0} ({1} MB)<br>MD5: {2}";
+// $PRODUCT_NAME $TYPE (Installer for $PLATFORM/Zip)/$Language ($Language_ID) $filename ($SIZE) SHA-256: $MD5
+var INFO_MESSAGE = "{0}{1} {2}/{3} ({4})<br>{5} ({6} MB)<br>SHA-256: {7}";
+var INFO_MESSAGE_OTHER = "{0} ({1} MB)<br>SHA-256: {2}";
 
 //DO NOT TRANSLATE
 var SUBSCRIPTION_PHP_URL = "http://services.netbeans.org/sub.php";
diff -r b7c1c51ac6f9 -r 147c8984ddd2 src/bg/other/installer/infra/build/web/js/start_strings_bg.js
--- a/src/bg/other/installer/infra/build/web/js/start_strings_bg.js	Mon Dec 19 12:18:33 2016 +0100
+++ b/src/bg/other/installer/infra/build/web/js/start_strings_bg.js	Tue Apr 17 14:14:23 2018 +0200
@@ -59,9 +59,9 @@
 var SUPPORT_LABEL        = "Support";
 var SUPPORT_DESCRIPTION  = "Flexible support options to help you stay focused on innovation.";
 
-// $PRODUCT_NAME $TYPE (Installer for $PLATFORM/Zip)/$Language ($Language_ID) $filename ($SIZE) MD5: $MD5
-var INFO_MESSAGE = "{0}{1} {2}/{3} ({4})<br>{5} ({6} MB)<br>MD5: {7}";
-var INFO_MESSAGE_OTHER = "{0} ({1} MB)<br>MD5: {2}";
+// $PRODUCT_NAME $TYPE (Installer for $PLATFORM/Zip)/$Language ($Language_ID) $filename ($SIZE) SHA-256: $MD5
+var INFO_MESSAGE = "{0}{1} {2}/{3} ({4})<br>{5} ({6} MB)<br>SHA-256: {7}";
+var INFO_MESSAGE_OTHER = "{0} ({1} MB)<br>SHA-256: {2}";
 
 //DO NOT TRANSLATE
 var SUBSCRIPTION_PHP_URL = "http://services.netbeans.org/sub.php";
diff -r b7c1c51ac6f9 -r 147c8984ddd2 src/ca/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/resources/samples/fractal_ca.html
--- 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
+++ 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
@@ -1,9 +1,44 @@
- <!--
- - Copyright 2006-2007 Sun Microsystems, Inc. All rights reserved.
- - SUN PROPRIETARY/CONFIDENTIAL.
- - Use is subject to license terms.
- -->
-
+<!--
+   - DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+   -
+   - Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
+   -
+   - The contents of this file are subject to the terms of either the GNU
+   - General Public License Version 2 only ("GPL") or the Common
+   - Development and Distribution License("CDDL") (collectively, the
+   - "License"). You may not use this file except in compliance with the
+   - License. You can obtain a copy of the License at
+   - http://www.netbeans.org/cddl-gplv2.html
+   - or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+   - specific language governing permissions and limitations under the
+   - License.  When distributing the software, include this License Header
+   - Notice in each file and include the License file at
+   - nbbuild/licenses/CDDL-GPL-2-CP.  Sun designates this
+   - particular file as subject to the "Classpath" exception as provided
+   - by Sun in the GPL Version 2 section of the License file that
+   - accompanied this code. If applicable, add the following below the
+   - License Header, with the fields enclosed by brackets [] replaced by
+   - your own identifying information:
+   - "Portions Copyrighted [year] [name of copyright owner]"
+   -
+   - Contributor(s):
+   -
+   - The Original Software is NetBeans. The Initial Developer of the Original
+   - Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
+   - Microsystems, Inc. All Rights Reserved.
+   -
+   - If you wish your version of this file to be governed by only the CDDL
+   - or only the GPL Version 2, indicate your decision by adding
+   - "[Contributor] elects to include this software in this distribution
+   - under the [CDDL or GPL Version 2] license." If you do not indicate a
+   - single choice of license, a recipient has the option to distribute
+   - your version of this file under either the CDDL, the GPL Version 2 or
+   - to extend the choice of license to its licensees as provided above.
+   - However, if you add GPL Version 2 code and therefore, elected the GPL
+   - Version 2 license, then the option applies only if the new code is
+   - made subject to such option by the copyright holder.
+  -->
+  
 <HTML>
 <head>
   <meta http-equiv="content-type" content="text/html; charset=UTF-8">
diff -r b7c1c51ac6f9 -r 147c8984ddd2 src/ca/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/resources/samples/hello_ca.html
--- 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
+++ 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
@@ -1,9 +1,44 @@
- <!--
- - Copyright 2006-2007 Sun Microsystems, Inc. All rights reserved.
- - SUN PROPRIETARY/CONFIDENTIAL.
- - Use is subject to license terms.
- -->
-
+<!--
+   - DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+   -
+   - Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
+   -
+   - The contents of this file are subject to the terms of either the GNU
+   - General Public License Version 2 only ("GPL") or the Common
+   - Development and Distribution License("CDDL") (collectively, the
+   - "License"). You may not use this file except in compliance with the
+   - License. You can obtain a copy of the License at
+   - http://www.netbeans.org/cddl-gplv2.html
+   - or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+   - specific language governing permissions and limitations under the
+   - License.  When distributing the software, include this License Header
+   - Notice in each file and include the License file at
+   - nbbuild/licenses/CDDL-GPL-2-CP.  Sun designates this
+   - particular file as subject to the "Classpath" exception as provided
+   - by Sun in the GPL Version 2 section of the License file that
+   - accompanied this code. If applicable, add the following below the
+   - License Header, with the fields enclosed by brackets [] replaced by
+   - your own identifying information:
+   - "Portions Copyrighted [year] [name of copyright owner]"
+   -
+   - Contributor(s):
+   -
+   - The Original Software is NetBeans. The Initial Developer of the Original
+   - Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
+   - Microsystems, Inc. All Rights Reserved.
+   -
+   - If you wish your version of this file to be governed by only the CDDL
+   - or only the GPL Version 2, indicate your decision by adding
+   - "[Contributor] elects to include this software in this distribution
+   - under the [CDDL or GPL Version 2] license." If you do not indicate a
+   - single choice of license, a recipient has the option to distribute
+   - your version of this file under either the CDDL, the GPL Version 2 or
+   - to extend the choice of license to its licensees as provided above.
+   - However, if you add GPL Version 2 code and therefore, elected the GPL
+   - Version 2 license, then the option applies only if the new code is
+   - made subject to such option by the copyright holder.
+  -->
+  
 <HTML>
 <head>
   <meta http-equiv="content-type" content="text/html; charset=UTF-8">
diff -r b7c1c51ac6f9 -r 147c8984ddd2 src/ca/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/resources/samples/lexyacc_ca.html
--- 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
+++ 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
@@ -1,9 +1,44 @@
- <!--
- - Copyright 2006-2007 Sun Microsystems, Inc. All rights reserved.
- - SUN PROPRIETARY/CONFIDENTIAL.
- - Use is subject to license terms.
- -->
-
+<!--
+   - DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+   -
+   - Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
+   -
+   - The contents of this file are subject to the terms of either the GNU
+   - General Public License Version 2 only ("GPL") or the Common
+   - Development and Distribution License("CDDL") (collectively, the
+   - "License"). You may not use this file except in compliance with the
+   - License. You can obtain a copy of the License at
+   - http://www.netbeans.org/cddl-gplv2.html
+   - or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+   - specific language governing permissions and limitations under the
+   - License.  When distributing the software, include this License Header
+   - Notice in each file and include the License file at
+   - nbbuild/licenses/CDDL-GPL-2-CP.  Sun designates this
+   - particular file as subject to the "Classpath" exception as provided
+   - by Sun in the GPL Version 2 section of the License file that
+   - accompanied this code. If applicable, add the following below the
+   - License Header, with the fields enclosed by brackets [] replaced by
+   - your own identifying information:
+   - "Portions Copyrighted [year] [name of copyright owner]"
+   -
+   - Contributor(s):
+   -
+   - The Original Software is NetBeans. The Initial Developer of the Original
+   - Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
+   - Microsystems, Inc. All Rights Reserved.
+   -
+   - If you wish your version of this file to be governed by only the CDDL
+   - or only the GPL Version 2, indicate your decision by adding
+   - "[Contributor] elects to include this software in this distribution
+   - under the [CDDL or GPL Version 2] license." If you do not indicate a
+   - single choice of license, a recipient has the option to distribute
+   - your version of this file under either the CDDL, the GPL Version 2 or
+   - to extend the choice of license to its licensees as provided above.
+   - However, if you add GPL Version 2 code and therefore, elected the GPL
+   - Version 2 license, then the option applies only if the new code is
+   - made subject to such option by the copyright holder.
+  -->
+  
 <HTML>
 <head>
   <meta http-equiv="content-type" content="text/html; charset=UTF-8">
diff -r b7c1c51ac6f9 -r 147c8984ddd2 src/ca/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/resources/samples/pi_ca.html
--- 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
+++ 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
@@ -1,9 +1,44 @@
- <!--
- - Copyright 2006-2007 Sun Microsystems, Inc. All rights reserved.
- - SUN PROPRIETARY/CONFIDENTIAL.
- - Use is subject to license terms.
- -->
-
+<!--
+   - DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+   -
+   - Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
+   -
+   - The contents of this file are subject to the terms of either the GNU
+   - General Public License Version 2 only ("GPL") or the Common
+   - Development and Distribution License("CDDL") (collectively, the
+   - "License"). You may not use this file except in compliance with the
+   - License. You can obtain a copy of the License at
+   - http://www.netbeans.org/cddl-gplv2.html
+   - or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+   - specific language governing permissions and limitations under the
+   - License.  When distributing the software, include this License Header
+   - Notice in each file and include the License file at
+   - nbbuild/licenses/CDDL-GPL-2-CP.  Sun designates this
+   - particular file as subject to the "Classpath" exception as provided
+   - by Sun in the GPL Version 2 section of the License file that
+   - accompanied this code. If applicable, add the following below the
+   - License Header, with the fields enclosed by brackets [] replaced by
+   - your own identifying information:
+   - "Portions Copyrighted [year] [name of copyright owner]"
+   -
+   - Contributor(s):
+   -
+   - The Original Software is NetBeans. The Initial Developer of the Original
+   - Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
+   - Microsystems, Inc. All Rights Reserved.
+   -
+   - If you wish your version of this file to be governed by only the CDDL
+   - or only the GPL Version 2, indicate your decision by adding
+   - "[Contributor] elects to include this software in this distribution
+   - under the [CDDL or GPL Version 2] license." If you do not indicate a
+   - single choice of license, a recipient has the option to distribute
+   - your version of this file under either the CDDL, the GPL Version 2 or
+   - to extend the choice of license to its licensees as provided above.
+   - However, if you add GPL Version 2 code and therefore, elected the GPL
+   - Version 2 license, then the option applies only if the new code is
+   - made subject to such option by the copyright holder.
+  -->
+  
 <HTML>
 <head>
   <meta http-equiv="content-type" content="text/html; charset=UTF-8">
diff -r b7c1c51ac6f9 -r 147c8984ddd2 src/ca/enterprise/j2eeserver/j2eeserver/org/netbeans/modules/j2ee/deployment/impl/ui/actions/Bundle_ca.properties
--- 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
+++ 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
@@ -40,12 +40,6 @@
 # Version 2 license, then the option applies only if the new code is
 # made subject to such option by the copyright holder.
 
-## SUN PROPRIETARY/CONFIDENTIAL:  INTERNAL USE ONLY.
-
-## Copyright 2001 Sun Microsystems, Inc. All rights reserved. Use is
-## subject to license terms.
-
-
 MSG_Server_Instance_Added=Server instance "{0}" was added successfully.
 
 #StartServerAction
diff -r b7c1c51ac6f9 -r 147c8984ddd2 src/ca/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-makeproject-ui-resources-samples-fractal_ca.html
--- 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
+++ 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
@@ -1,9 +1,44 @@
- <!--
- - Copyright 2006-2007 Sun Microsystems, Inc. All rights reserved.
- - SUN PROPRIETARY/CONFIDENTIAL.
- - Use is subject to license terms.
- -->
-
+<!--
+   - DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+   -
+   - Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
+   -
+   - The contents of this file are subject to the terms of either the GNU
+   - General Public License Version 2 only ("GPL") or the Common
+   - Development and Distribution License("CDDL") (collectively, the
+   - "License"). You may not use this file except in compliance with the
+   - License. You can obtain a copy of the License at
+   - http://www.netbeans.org/cddl-gplv2.html
+   - or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+   - specific language governing permissions and limitations under the
+   - License.  When distributing the software, include this License Header
+   - Notice in each file and include the License file at
+   - nbbuild/licenses/CDDL-GPL-2-CP.  Sun designates this
+   - particular file as subject to the "Classpath" exception as provided
+   - by Sun in the GPL Version 2 section of the License file that
+   - accompanied this code. If applicable, add the following below the
+   - License Header, with the fields enclosed by brackets [] replaced by
+   - your own identifying information:
+   - "Portions Copyrighted [year] [name of copyright owner]"
+   -
+   - Contributor(s):
+   -
+   - The Original Software is NetBeans. The Initial Developer of the Original
+   - Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
+   - Microsystems, Inc. All Rights Reserved.
+   -
+   - If you wish your version of this file to be governed by only the CDDL
+   - or only the GPL Version 2, indicate your decision by adding
+   - "[Contributor] elects to include this software in this distribution
+   - under the [CDDL or GPL Version 2] license." If you do not indicate a
+   - single choice of license, a recipient has the option to distribute
+   - your version of this file under either the CDDL, the GPL Version 2 or
+   - to extend the choice of license to its licensees as provided above.
+   - However, if you add GPL Version 2 code and therefore, elected the GPL
+   - Version 2 license, then the option applies only if the new code is
+   - made subject to such option by the copyright holder.
+  -->
+  
 <HTML>
 <head>
   <meta http-equiv="content-type" content="text/html; charset=UTF-8">
diff -r b7c1c51ac6f9 -r 147c8984ddd2 src/ca/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-makeproject-ui-resources-samples-hello_ca.html
--- 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
+++ 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
@@ -1,9 +1,44 @@
- <!--
- - Copyright 2006-2007 Sun Microsystems, Inc. All rights reserved.
- - SUN PROPRIETARY/CONFIDENTIAL.
- - Use is subject to license terms.
- -->
-
+<!--
+   - DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+   -
+   - Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
+   -
+   - The contents of this file are subject to the terms of either the GNU
+   - General Public License Version 2 only ("GPL") or the Common
+   - Development and Distribution License("CDDL") (collectively, the
+   - "License"). You may not use this file except in compliance with the
+   - License. You can obtain a copy of the License at
+   - http://www.netbeans.org/cddl-gplv2.html
+   - or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+   - specific language governing permissions and limitations under the
+   - License.  When distributing the software, include this License Header
+   - Notice in each file and include the License file at
+   - nbbuild/licenses/CDDL-GPL-2-CP.  Sun designates this
+   - particular file as subject to the "Classpath" exception as provided
+   - by Sun in the GPL Version 2 section of the License file that
+   - accompanied this code. If applicable, add the following below the
+   - License Header, with the fields enclosed by brackets [] replaced by
+   - your own identifying information:
+   - "Portions Copyrighted [year] [name of copyright owner]"
+   -
+   - Contributor(s):
+   -
+   - The Original Software is NetBeans. The Initial Developer of the Original
+   - Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
+   - Microsystems, Inc. All Rights Reserved.
+   -
+   - If you wish your version of this file to be governed by only the CDDL
+   - or only the GPL Version 2, indicate your decision by adding
+   - "[Contributor] elects to include this software in this distribution
+   - under the [CDDL or GPL Version 2] license." If you do not indicate a
+   - single choice of license, a recipient has the option to distribute
+   - your version of this file under either the CDDL, the GPL Version 2 or
+   - to extend the choice of license to its licensees as provided above.
+   - However, if you add GPL Version 2 code and therefore, elected the GPL
+   - Version 2 license, then the option applies only if the new code is
+   - made subject to such option by the copyright holder.
+  -->
+  
 <HTML>
 <head>
   <meta http-equiv="content-type" content="text/html; charset=UTF-8">
diff -r b7c1c51ac6f9 -r 147c8984ddd2 src/ca/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-makeproject-ui-resources-samples-lexyacc_ca.html
--- 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
+++ 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
@@ -1,9 +1,44 @@
- <!--
- - Copyright 2006-2007 Sun Microsystems, Inc. All rights reserved.
- - SUN PROPRIETARY/CONFIDENTIAL.
- - Use is subject to license terms.
- -->
-
+<!--
+   - DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+   -
+   - Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
+   -
+   - The contents of this file are subject to the terms of either the GNU
+   - General Public License Version 2 only ("GPL") or the Common
+   - Development and Distribution License("CDDL") (collectively, the
+   - "License"). You may not use this file except in compliance with the
+   - License. You can obtain a copy of the License at
+   - http://www.netbeans.org/cddl-gplv2.html
+   - or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+   - specific language governing permissions and limitations under the
+   - License.  When distributing the software, include this License Header
+   - Notice in each file and include the License file at
+   - nbbuild/licenses/CDDL-GPL-2-CP.  Sun designates this
+   - particular file as subject to the "Classpath" exception as provided
+   - by Sun in the GPL Version 2 section of the License file that
+   - accompanied this code. If applicable, add the following below the
+   - License Header, with the fields enclosed by brackets [] replaced by
+   - your own identifying information:
+   - "Portions Copyrighted [year] [name of copyright owner]"
+   -
+   - Contributor(s):
+   -
+   - The Original Software is NetBeans. The Initial Developer of the Original
+   - Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
+   - Microsystems, Inc. All Rights Reserved.
+   -
+   - If you wish your version of this file to be governed by only the CDDL
+   - or only the GPL Version 2, indicate your decision by adding
+   - "[Contributor] elects to include this software in this distribution
+   - under the [CDDL or GPL Version 2] license." If you do not indicate a
+   - single choice of license, a recipient has the option to distribute
+   - your version of this file under either the CDDL, the GPL Version 2 or
+   - to extend the choice of license to its licensees as provided above.
+   - However, if you add GPL Version 2 code and therefore, elected the GPL
+   - Version 2 license, then the option applies only if the new code is
+   - made subject to such option by the copyright holder.
+  -->
+  
 <HTML>
 <head>
   <meta http-equiv="content-type" content="text/html; charset=UTF-8">
diff -r b7c1c51ac6f9 -r 147c8984ddd2 src/ca/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-makeproject-ui-resources-samples-pi_ca.html
--- 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
+++ 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
@@ -1,9 +1,44 @@
- <!--
- - Copyright 2006-2007 Sun Microsystems, Inc. All rights reserved.
- - SUN PROPRIETARY/CONFIDENTIAL.
- - Use is subject to license terms.
- -->
-
+<!--
+   - DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+   -
+   - Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
+   -
+   - The contents of this file are subject to the terms of either the GNU
+   - General Public License Version 2 only ("GPL") or the Common
+   - Development and Distribution License("CDDL") (collectively, the
+   - "License"). You may not use this file except in compliance with the
+   - License. You can obtain a copy of the License at
+   - http://www.netbeans.org/cddl-gplv2.html
+   - or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+   - specific language governing permissions and limitations under the
+   - License.  When distributing the software, include this License Header
+   - Notice in each file and include the License file at
+   - nbbuild/licenses/CDDL-GPL-2-CP.  Sun designates this
+   - particular file as subject to the "Classpath" exception as provided
+   - by Sun in the GPL Version 2 section of the License file that
+   - accompanied this code. If applicable, add the following below the
+   - License Header, with the fields enclosed by brackets [] replaced by
+   - your own identifying information:
+   - "Portions Copyrighted [year] [name of copyright owner]"
+   -
+   - Contributor(s):
+   -
+   - The Original Software is NetBeans. The Initial Developer of the Original
+   - Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
+   - Microsystems, Inc. All Rights Reserved.
+   -
+   - If you wish your version of this file to be governed by only the CDDL
+   - or only the GPL Version 2, indicate your decision by adding
+   - "[Contributor] elects to include this software in this distribution
+   - under the [CDDL or GPL Version 2] license." If you do not indicate a
+   - single choice of license, a recipient has the option to distribute
+   - your version of this file under either the CDDL, the GPL Version 2 or
+   - to extend the choice of license to its licensees as provided above.
+   - However, if you add GPL Version 2 code and therefore, elected the GPL
+   - Version 2 license, then the option applies only if the new code is
+   - made subject to such option by the copyright holder.
+  -->
+  
 <HTML>
 <head>
   <meta http-equiv="content-type" content="text/html; charset=UTF-8">
diff -r b7c1c51ac6f9 -r 147c8984ddd2 src/ca/javacard/javacard-project/javacard-project/org/netbeans/modules/javacard/project/ui/Bundle_ca.properties
--- 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
+++ 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
@@ -42,7 +42,7 @@
 CLASSIC_LIBRARY_PROJECT=ClassicLibrary
 EXTENSION_LIBRARY_PROJECT=ExtensionLibrary
 Get_Sources_From_=Get Sources From
-#DEFAULT_URL=http://192.168.253.1/jc3bot/src.tgz
+
 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.
 ADD_NEW_SERVER=Add New Server [Real Card]
 Hello_Application=Hello Application
diff -r b7c1c51ac6f9 -r 147c8984ddd2 src/ca/other/installer/infra/build/web/js/start_strings_ca.js
--- a/src/ca/other/installer/infra/build/web/js/start_strings_ca.js	Mon Dec 19 12:18:33 2016 +0100
+++ b/src/ca/other/installer/infra/build/web/js/start_strings_ca.js	Tue Apr 17 14:14:23 2018 +0200
@@ -59,9 +59,9 @@
 var SUPPORT_LABEL        = "Support";
 var SUPPORT_DESCRIPTION  = "Flexible support options to help you stay focused on innovation.";
 
-// $PRODUCT_NAME $TYPE (Installer for $PLATFORM/Zip)/$Language ($Language_ID) $filename ($SIZE) MD5: $MD5
-var INFO_MESSAGE = "{0}{1} {2}/{3} ({4})<br>{5} ({6} MB)<br>MD5: {7}";
-var INFO_MESSAGE_OTHER = "{0} ({1} MB)<br>MD5: {2}";
+// $PRODUCT_NAME $TYPE (Installer for $PLATFORM/Zip)/$Language ($Language_ID) $filename ($SIZE) SHA-256: $MD5
+var INFO_MESSAGE = "{0}{1} {2}/{3} ({4})<br>{5} ({6} MB)<br>SHA-256: {7}";
+var INFO_MESSAGE_OTHER = "{0} ({1} MB)<br>SHA-256: {2}";
 
 //DO NOT TRANSLATE
 var SUBSCRIPTION_PHP_URL = "http://services.netbeans.org/sub.php";
diff -r b7c1c51ac6f9 -r 147c8984ddd2 src/ca/ruby/ruby/ruby/org/netbeans/modules/ruby/Bundle_ca.properties
--- a/src/ca/ruby/ruby/ruby/org/netbeans/modules/ruby/Bundle_ca.properties	Mon Dec 19 12:18:33 2016 +0100
+++ b/src/ca/ruby/ruby/ruby/org/netbeans/modules/ruby/Bundle_ca.properties	Tue Apr 17 14:14:23 2018 +0200
@@ -266,9 +266,6 @@
 
 InstalledVersions=Installed version(s): {0}
 
-# HTTP status codes for code completion,
-# 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
-
 SC_100=100 (Continue)
 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.
 SC_101=101 (Switching protocols)
diff -r b7c1c51ac6f9 -r 147c8984ddd2 src/cs/other/installer/infra/build/web/js/start_strings_cs.js
--- a/src/cs/other/installer/infra/build/web/js/start_strings_cs.js	Mon Dec 19 12:18:33 2016 +0100
+++ b/src/cs/other/installer/infra/build/web/js/start_strings_cs.js	Tue Apr 17 14:14:23 2018 +0200
@@ -59,9 +59,9 @@
 var SUPPORT_LABEL        = "Support";
 var SUPPORT_DESCRIPTION  = "Flexible support options to help you stay focused on innovation.";
 
-// $PRODUCT_NAME $TYPE (Installer for $PLATFORM/Zip)/$Language ($Language_ID) $filename ($SIZE) MD5: $MD5
-var INFO_MESSAGE = "{0}{1} {2}/{3} ({4})<br>{5} ({6} MB)<br>MD5: {7}";
-var INFO_MESSAGE_OTHER = "{0} ({1} MB)<br>MD5: {2}";
+// $PRODUCT_NAME $TYPE (Installer for $PLATFORM/Zip)/$Language ($Language_ID) $filename ($SIZE) SHA-256: $MD5
+var INFO_MESSAGE = "{0}{1} {2}/{3} ({4})<br>{5} ({6} MB)<br>SHA-256: {7}";
+var INFO_MESSAGE_OTHER = "{0} ({1} MB)<br>SHA-256: {2}";
 
 //DO NOT TRANSLATE
 var SUBSCRIPTION_PHP_URL = "http://services.netbeans.org/sub.php";
diff -r b7c1c51ac6f9 -r 147c8984ddd2 src/de/other/installer/infra/build/web/js/start_strings_de.js
--- a/src/de/other/installer/infra/build/web/js/start_strings_de.js	Mon Dec 19 12:18:33 2016 +0100
+++ b/src/de/other/installer/infra/build/web/js/start_strings_de.js	Tue Apr 17 14:14:23 2018 +0200
@@ -59,9 +59,9 @@
 var SUPPORT_LABEL        = "Support";
 var SUPPORT_DESCRIPTION  = "Flexible support options to help you stay focused on innovation.";
 
-// $PRODUCT_NAME $TYPE (Installer for $PLATFORM/Zip)/$Language ($Language_ID) $filename ($SIZE) MD5: $MD5
-var INFO_MESSAGE = "{0}{1} {2}/{3} ({4})<br>{5} ({6} MB)<br>MD5: {7}";
-var INFO_MESSAGE_OTHER = "{0} ({1} MB)<br>MD5: {2}";
+// $PRODUCT_NAME $TYPE (Installer for $PLATFORM/Zip)/$Language ($Language_ID) $filename ($SIZE) SHA-256: $MD5
+var INFO_MESSAGE = "{0}{1} {2}/{3} ({4})<br>{5} ({6} MB)<br>SHA-256: {7}";
+var INFO_MESSAGE_OTHER = "{0} ({1} MB)<br>SHA-256: {2}";
 
 //DO NOT TRANSLATE
 var SUBSCRIPTION_PHP_URL = "http://services.netbeans.org/sub.php";
diff -r b7c1c51ac6f9 -r 147c8984ddd2 src/el/other/installer/infra/build/web/js/start_strings_el.js
--- a/src/el/other/installer/infra/build/web/js/start_strings_el.js	Mon Dec 19 12:18:33 2016 +0100
+++ b/src/el/other/installer/infra/build/web/js/start_strings_el.js	Tue Apr 17 14:14:23 2018 +0200
@@ -59,9 +59,9 @@
 var SUPPORT_LABEL        = "Support";
 var SUPPORT_DESCRIPTION  = "Flexible support options to help you stay focused on innovation.";
 
-// $PRODUCT_NAME $TYPE (Installer for $PLATFORM/Zip)/$Language ($Language_ID) $filename ($SIZE) MD5: $MD5
-var INFO_MESSAGE = "{0}{1} {2}/{3} ({4})<br>{5} ({6} MB)<br>MD5: {7}";
-var INFO_MESSAGE_OTHER = "{0} ({1} MB)<br>MD5: {2}";
+// $PRODUCT_NAME $TYPE (Installer for $PLATFORM/Zip)/$Language ($Language_ID) $filename ($SIZE) SHA-256: $MD5
+var INFO_MESSAGE = "{0}{1} {2}/{3} ({4})<br>{5} ({6} MB)<br>SHA-256: {7}";
+var INFO_MESSAGE_OTHER = "{0} ({1} MB)<br>SHA-256: {2}";
 
 //DO NOT TRANSLATE
 var SUBSCRIPTION_PHP_URL = "http://services.netbeans.org/sub.php";
diff -r b7c1c51ac6f9 -r 147c8984ddd2 src/es/other/installer/infra/build/web/js/start_strings_es.js
--- a/src/es/other/installer/infra/build/web/js/start_strings_es.js	Mon Dec 19 12:18:33 2016 +0100
+++ b/src/es/other/installer/infra/build/web/js/start_strings_es.js	Tue Apr 17 14:14:23 2018 +0200
@@ -59,9 +59,9 @@
 var SUPPORT_LABEL        = "Support";
 var SUPPORT_DESCRIPTION  = "Flexible support options to help you stay focused on innovation.";
 
-// $PRODUCT_NAME $TYPE (Installer for $PLATFORM/Zip)/$Language ($Language_ID) $filename ($SIZE) MD5: $MD5
-var INFO_MESSAGE = "{0}{1} {2}/{3} ({4})<br>{5} ({6} MB)<br>MD5: {7}";
-var INFO_MESSAGE_OTHER = "{0} ({1} MB)<br>MD5: {2}";
+// $PRODUCT_NAME $TYPE (Installer for $PLATFORM/Zip)/$Language ($Language_ID) $filename ($SIZE) SHA-256: $MD5
+var INFO_MESSAGE = "{0}{1} {2}/{3} ({4})<br>{5} ({6} MB)<br>SHA-256: {7}";
+var INFO_MESSAGE_OTHER = "{0} ({1} MB)<br>SHA-256: {2}";
 
 //DO NOT TRANSLATE
 var SUBSCRIPTION_PHP_URL = "http://services.netbeans.org/sub.php";
diff -r b7c1c51ac6f9 -r 147c8984ddd2 src/es_CO/other/installer/infra/build/web/js/start_strings_es_CO.js
--- a/src/es_CO/other/installer/infra/build/web/js/start_strings_es_CO.js	Mon Dec 19 12:18:33 2016 +0100
+++ b/src/es_CO/other/installer/infra/build/web/js/start_strings_es_CO.js	Tue Apr 17 14:14:23 2018 +0200
@@ -59,9 +59,9 @@
 var SUPPORT_LABEL        = "Support";
 var SUPPORT_DESCRIPTION  = "Flexible support options to help you stay focused on innovation.";
 
-// $PRODUCT_NAME $TYPE (Installer for $PLATFORM/Zip)/$Language ($Language_ID) $filename ($SIZE) MD5: $MD5
-var INFO_MESSAGE = "{0}{1} {2}/{3} ({4})<br>{5} ({6} MB)<br>MD5: {7}";
-var INFO_MESSAGE_OTHER = "{0} ({1} MB)<br>MD5: {2}";
+// $PRODUCT_NAME $TYPE (Installer for $PLATFORM/Zip)/$Language ($Language_ID) $filename ($SIZE) SHA-256: $MD5
+var INFO_MESSAGE = "{0}{1} {2}/{3} ({4})<br>{5} ({6} MB)<br>SHA-256: {7}";
+var INFO_MESSAGE_OTHER = "{0} ({1} MB)<br>SHA-256: {2}";
 
 //DO NOT TRANSLATE
 var SUBSCRIPTION_PHP_URL = "http://services.netbeans.org/sub.php";
diff -r b7c1c51ac6f9 -r 147c8984ddd2 src/fil_PH/other/installer/infra/build/web/js/start_strings_fil_PH.js
--- a/src/fil_PH/other/installer/infra/build/web/js/start_strings_fil_PH.js	Mon Dec 19 12:18:33 2016 +0100
+++ b/src/fil_PH/other/installer/infra/build/web/js/start_strings_fil_PH.js	Tue Apr 17 14:14:23 2018 +0200
@@ -59,9 +59,9 @@
 var SUPPORT_LABEL        = "Support";
 var SUPPORT_DESCRIPTION  = "Flexible support options to help you stay focused on innovation.";
 
-// $PRODUCT_NAME $TYPE (Installer for $PLATFORM/Zip)/$Language ($Language_ID) $filename ($SIZE) MD5: $MD5
-var INFO_MESSAGE = "{0}{1} {2}/{3} ({4})<br>{5} ({6} MB)<br>MD5: {7}";
-var INFO_MESSAGE_OTHER = "{0} ({1} MB)<br>MD5: {2}";
+// $PRODUCT_NAME $TYPE (Installer for $PLATFORM/Zip)/$Language ($Language_ID) $filename ($SIZE) SHA-256: $MD5
+var INFO_MESSAGE = "{0}{1} {2}/{3} ({4})<br>{5} ({6} MB)<br>SHA-256: {7}";
+var INFO_MESSAGE_OTHER = "{0} ({1} MB)<br>SHA-256: {2}";
 
 //DO NOT TRANSLATE
 var SUBSCRIPTION_PHP_URL = "http://services.netbeans.org/sub.php";
diff -r b7c1c51ac6f9 -r 147c8984ddd2 src/fr/other/installer/infra/build/web/js/start_strings_fr.js
--- a/src/fr/other/installer/infra/build/web/js/start_strings_fr.js	Mon Dec 19 12:18:33 2016 +0100
+++ b/src/fr/other/installer/infra/build/web/js/start_strings_fr.js	Tue Apr 17 14:14:23 2018 +0200
@@ -59,9 +59,9 @@
 var SUPPORT_LABEL        = "Support";
 var SUPPORT_DESCRIPTION  = "Flexible support options to help you stay focused on innovation.";
 
-// $PRODUCT_NAME $TYPE (Installer for $PLATFORM/Zip)/$Language ($Language_ID) $filename ($SIZE) MD5: $MD5
-var INFO_MESSAGE = "{0}{1} {2}/{3} ({4})<br>{5} ({6} MB)<br>MD5: {7}";
-var INFO_MESSAGE_OTHER = "{0} ({1} MB)<br>MD5: {2}";
+// $PRODUCT_NAME $TYPE (Installer for $PLATFORM/Zip)/$Language ($Language_ID) $filename ($SIZE) SHA-256: $MD5
+var INFO_MESSAGE = "{0}{1} {2}/{3} ({4})<br>{5} ({6} MB)<br>SHA-256: {7}";
+var INFO_MESSAGE_OTHER = "{0} ({1} MB)<br>SHA-256: {2}";
 
 //DO NOT TRANSLATE
 var SUBSCRIPTION_PHP_URL = "http://services.netbeans.org/sub.php";
diff -r b7c1c51ac6f9 -r 147c8984ddd2 src/gl_ES/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/resources/samples/fractal_gl_ES.html
--- 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
+++ 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
@@ -1,9 +1,44 @@
- <!--
- - Copyright 2006-2007 Sun Microsystems, Inc. All rights reserved.
- - SUN PROPRIETARY/CONFIDENTIAL.
- - Use is subject to license terms.
- -->
-
+<!--
+   - DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+   -
+   - Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
+   -
+   - The contents of this file are subject to the terms of either the GNU
+   - General Public License Version 2 only ("GPL") or the Common
+   - Development and Distribution License("CDDL") (collectively, the
+   - "License"). You may not use this file except in compliance with the
+   - License. You can obtain a copy of the License at
+   - http://www.netbeans.org/cddl-gplv2.html
+   - or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+   - specific language governing permissions and limitations under the
+   - License.  When distributing the software, include this License Header
+   - Notice in each file and include the License file at
+   - nbbuild/licenses/CDDL-GPL-2-CP.  Sun designates this
+   - particular file as subject to the "Classpath" exception as provided
+   - by Sun in the GPL Version 2 section of the License file that
+   - accompanied this code. If applicable, add the following below the
+   - License Header, with the fields enclosed by brackets [] replaced by
+   - your own identifying information:
+   - "Portions Copyrighted [year] [name of copyright owner]"
+   -
+   - Contributor(s):
+   -
+   - The Original Software is NetBeans. The Initial Developer of the Original
+   - Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
+   - Microsystems, Inc. All Rights Reserved.
+   -
+   - If you wish your version of this file to be governed by only the CDDL
+   - or only the GPL Version 2, indicate your decision by adding
+   - "[Contributor] elects to include this software in this distribution
+   - under the [CDDL or GPL Version 2] license." If you do not indicate a
+   - single choice of license, a recipient has the option to distribute
+   - your version of this file under either the CDDL, the GPL Version 2 or
+   - to extend the choice of license to its licensees as provided above.
+   - However, if you add GPL Version 2 code and therefore, elected the GPL
+   - Version 2 license, then the option applies only if the new code is
+   - made subject to such option by the copyright holder.
+  -->
+  
 <HTML>
 <head>
   <meta http-equiv="content-type" content="text/html; charset=UTF-8">
diff -r b7c1c51ac6f9 -r 147c8984ddd2 src/gl_ES/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/resources/samples/hello_gl_ES.html
--- 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
+++ 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
@@ -1,9 +1,44 @@
- <!--
- - Copyright 2006-2007 Sun Microsystems, Inc. All rights reserved.
- - SUN PROPRIETARY/CONFIDENTIAL.
- - Use is subject to license terms.
- -->
-
+<!--
+   - DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+   -
+   - Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
+   -
+   - The contents of this file are subject to the terms of either the GNU
+   - General Public License Version 2 only ("GPL") or the Common
+   - Development and Distribution License("CDDL") (collectively, the
+   - "License"). You may not use this file except in compliance with the
+   - License. You can obtain a copy of the License at
+   - http://www.netbeans.org/cddl-gplv2.html
+   - or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+   - specific language governing permissions and limitations under the
+   - License.  When distributing the software, include this License Header
+   - Notice in each file and include the License file at
+   - nbbuild/licenses/CDDL-GPL-2-CP.  Sun designates this
+   - particular file as subject to the "Classpath" exception as provided
+   - by Sun in the GPL Version 2 section of the License file that
+   - accompanied this code. If applicable, add the following below the
+   - License Header, with the fields enclosed by brackets [] replaced by
+   - your own identifying information:
+   - "Portions Copyrighted [year] [name of copyright owner]"
+   -
+   - Contributor(s):
+   -
+   - The Original Software is NetBeans. The Initial Developer of the Original
+   - Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
+   - Microsystems, Inc. All Rights Reserved.
+   -
+   - If you wish your version of this file to be governed by only the CDDL
+   - or only the GPL Version 2, indicate your decision by adding
+   - "[Contributor] elects to include this software in this distribution
+   - under the [CDDL or GPL Version 2] license." If you do not indicate a
+   - single choice of license, a recipient has the option to distribute
+   - your version of this file under either the CDDL, the GPL Version 2 or
+   - to extend the choice of license to its licensees as provided above.
+   - However, if you add GPL Version 2 code and therefore, elected the GPL
+   - Version 2 license, then the option applies only if the new code is
+   - made subject to such option by the copyright holder.
+  -->
+  
 <HTML>
 <head>
   <meta http-equiv="content-type" content="text/html; charset=UTF-8">
diff -r b7c1c51ac6f9 -r 147c8984ddd2 src/gl_ES/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/resources/samples/lexyacc_gl_ES.html
--- 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
+++ 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
@@ -1,9 +1,44 @@
- <!--
- - Copyright 2006-2007 Sun Microsystems, Inc. All rights reserved.
- - SUN PROPRIETARY/CONFIDENTIAL.
- - Use is subject to license terms.
- -->
-
+<!--
+   - DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+   -
+   - Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
+   -
+   - The contents of this file are subject to the terms of either the GNU
+   - General Public License Version 2 only ("GPL") or the Common
+   - Development and Distribution License("CDDL") (collectively, the
+   - "License"). You may not use this file except in compliance with the
+   - License. You can obtain a copy of the License at
+   - http://www.netbeans.org/cddl-gplv2.html
+   - or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+   - specific language governing permissions and limitations under the
+   - License.  When distributing the software, include this License Header
+   - Notice in each file and include the License file at
+   - nbbuild/licenses/CDDL-GPL-2-CP.  Sun designates this
+   - particular file as subject to the "Classpath" exception as provided
+   - by Sun in the GPL Version 2 section of the License file that
+   - accompanied this code. If applicable, add the following below the
+   - License Header, with the fields enclosed by brackets [] replaced by
+   - your own identifying information:
+   - "Portions Copyrighted [year] [name of copyright owner]"
+   -
+   - Contributor(s):
+   -
+   - The Original Software is NetBeans. The Initial Developer of the Original
+   - Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
+   - Microsystems, Inc. All Rights Reserved.
+   -
+   - If you wish your version of this file to be governed by only the CDDL
+   - or only the GPL Version 2, indicate your decision by adding
+   - "[Contributor] elects to include this software in this distribution
+   - under the [CDDL or GPL Version 2] license." If you do not indicate a
+   - single choice of license, a recipient has the option to distribute
+   - your version of this file under either the CDDL, the GPL Version 2 or
+   - to extend the choice of license to its licensees as provided above.
+   - However, if you add GPL Version 2 code and therefore, elected the GPL
+   - Version 2 license, then the option applies only if the new code is
+   - made subject to such option by the copyright holder.
+  -->
+  
 <HTML>
 <head>
   <meta http-equiv="content-type" content="text/html; charset=UTF-8">
diff -r b7c1c51ac6f9 -r 147c8984ddd2 src/gl_ES/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/resources/samples/pi_gl_ES.html
--- 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
+++ 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
@@ -1,9 +1,44 @@
- <!--
- - Copyright 2006-2007 Sun Microsystems, Inc. All rights reserved.
- - SUN PROPRIETARY/CONFIDENTIAL.
- - Use is subject to license terms.
- -->
-
+<!--
+   - DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+   -
+   - Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
+   -
+   - The contents of this file are subject to the terms of either the GNU
+   - General Public License Version 2 only ("GPL") or the Common
+   - Development and Distribution License("CDDL") (collectively, the
+   - "License"). You may not use this file except in compliance with the
+   - License. You can obtain a copy of the License at
+   - http://www.netbeans.org/cddl-gplv2.html
+   - or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+   - specific language governing permissions and limitations under the
+   - License.  When distributing the software, include this License Header
+   - Notice in each file and include the License file at
+   - nbbuild/licenses/CDDL-GPL-2-CP.  Sun designates this
+   - particular file as subject to the "Classpath" exception as provided
+   - by Sun in the GPL Version 2 section of the License file that
+   - accompanied this code. If applicable, add the following below the
+   - License Header, with the fields enclosed by brackets [] replaced by
+   - your own identifying information:
+   - "Portions Copyrighted [year] [name of copyright owner]"
+   -
+   - Contributor(s):
+   -
+   - The Original Software is NetBeans. The Initial Developer of the Original
+   - Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
+   - Microsystems, Inc. All Rights Reserved.
+   -
+   - If you wish your version of this file to be governed by only the CDDL
+   - or only the GPL Version 2, indicate your decision by adding
+   - "[Contributor] elects to include this software in this distribution
+   - under the [CDDL or GPL Version 2] license." If you do not indicate a
+   - single choice of license, a recipient has the option to distribute
+   - your version of this file under either the CDDL, the GPL Version 2 or
+   - to extend the choice of license to its licensees as provided above.
+   - However, if you add GPL Version 2 code and therefore, elected the GPL
+   - Version 2 license, then the option applies only if the new code is
+   - made subject to such option by the copyright holder.
+  -->
+  
 <HTML>
 <head>
   <meta http-equiv="content-type" content="text/html; charset=UTF-8">
diff -r b7c1c51ac6f9 -r 147c8984ddd2 src/gl_ES/enterprise/j2eeserver/j2eeserver/org/netbeans/modules/j2ee/deployment/impl/ui/actions/Bundle_gl_ES.properties
--- 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
+++ 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
@@ -40,12 +40,6 @@
 # Version 2 license, then the option applies only if the new code is
 # made subject to such option by the copyright holder.
 
-## SUN PROPRIETARY/CONFIDENTIAL:  INTERNAL USE ONLY.
-
-## Copyright 2001 Sun Microsystems, Inc. All rights reserved. Use is
-## subject to license terms.
-
-
 MSG_Server_Instance_Added=Engadiuse correctamente a instancia do servidor "{0}".
 
 #StartServerAction
diff -r b7c1c51ac6f9 -r 147c8984ddd2 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
--- 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
+++ 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
@@ -1,9 +1,44 @@
- <!--
- - Copyright 2006-2007 Sun Microsystems, Inc. All rights reserved.
- - SUN PROPRIETARY/CONFIDENTIAL.
- - Use is subject to license terms.
- -->
-
+<!--
+   - DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+   -
+   - Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
+   -
+   - The contents of this file are subject to the terms of either the GNU
+   - General Public License Version 2 only ("GPL") or the Common
+   - Development and Distribution License("CDDL") (collectively, the
+   - "License"). You may not use this file except in compliance with the
+   - License. You can obtain a copy of the License at
+   - http://www.netbeans.org/cddl-gplv2.html
+   - or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+   - specific language governing permissions and limitations under the
+   - License.  When distributing the software, include this License Header
+   - Notice in each file and include the License file at
+   - nbbuild/licenses/CDDL-GPL-2-CP.  Sun designates this
+   - particular file as subject to the "Classpath" exception as provided
+   - by Sun in the GPL Version 2 section of the License file that
+   - accompanied this code. If applicable, add the following below the
+   - License Header, with the fields enclosed by brackets [] replaced by
+   - your own identifying information:
+   - "Portions Copyrighted [year] [name of copyright owner]"
+   -
+   - Contributor(s):
+   -
+   - The Original Software is NetBeans. The Initial Developer of the Original
+   - Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
+   - Microsystems, Inc. All Rights Reserved.
+   -
+   - If you wish your version of this file to be governed by only the CDDL
+   - or only the GPL Version 2, indicate your decision by adding
+   - "[Contributor] elects to include this software in this distribution
+   - under the [CDDL or GPL Version 2] license." If you do not indicate a
+   - single choice of license, a recipient has the option to distribute
+   - your version of this file under either the CDDL, the GPL Version 2 or
+   - to extend the choice of license to its licensees as provided above.
+   - However, if you add GPL Version 2 code and therefore, elected the GPL
+   - Version 2 license, then the option applies only if the new code is
+   - made subject to such option by the copyright holder.
+  -->
+  
 <HTML>
 <head>
   <meta http-equiv="content-type" content="text/html; charset=UTF-8">
diff -r b7c1c51ac6f9 -r 147c8984ddd2 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
--- 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
+++ 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
@@ -1,9 +1,44 @@
- <!--
- - Copyright 2006-2007 Sun Microsystems, Inc. All rights reserved.
- - SUN PROPRIETARY/CONFIDENTIAL.
- - Use is subject to license terms.
- -->
-
+<!--
+   - DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+   -
+   - Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
+   -
+   - The contents of this file are subject to the terms of either the GNU
+   - General Public License Version 2 only ("GPL") or the Common
+   - Development and Distribution License("CDDL") (collectively, the
+   - "License"). You may not use this file except in compliance with the
+   - License. You can obtain a copy of the License at
+   - http://www.netbeans.org/cddl-gplv2.html
+   - or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+   - specific language governing permissions and limitations under the
+   - License.  When distributing the software, include this License Header
+   - Notice in each file and include the License file at
+   - nbbuild/licenses/CDDL-GPL-2-CP.  Sun designates this
+   - particular file as subject to the "Classpath" exception as provided
+   - by Sun in the GPL Version 2 section of the License file that
+   - accompanied this code. If applicable, add the following below the
+   - License Header, with the fields enclosed by brackets [] replaced by
+   - your own identifying information:
+   - "Portions Copyrighted [year] [name of copyright owner]"
+   -
+   - Contributor(s):
+   -
+   - The Original Software is NetBeans. The Initial Developer of the Original
+   - Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
+   - Microsystems, Inc. All Rights Reserved.
+   -
+   - If you wish your version of this file to be governed by only the CDDL
+   - or only the GPL Version 2, indicate your decision by adding
+   - "[Contributor] elects to include this software in this distribution
+   - under the [CDDL or GPL Version 2] license." If you do not indicate a
+   - single choice of license, a recipient has the option to distribute
+   - your version of this file under either the CDDL, the GPL Version 2 or
+   - to extend the choice of license to its licensees as provided above.
+   - However, if you add GPL Version 2 code and therefore, elected the GPL
+   - Version 2 license, then the option applies only if the new code is
+   - made subject to such option by the copyright holder.
+  -->
+  
 <HTML>
 <head>
   <meta http-equiv="content-type" content="text/html; charset=UTF-8">
diff -r b7c1c51ac6f9 -r 147c8984ddd2 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
--- 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
+++ 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
@@ -1,9 +1,44 @@
- <!--
- - Copyright 2006-2007 Sun Microsystems, Inc. All rights reserved.
- - SUN PROPRIETARY/CONFIDENTIAL.
- - Use is subject to license terms.
- -->
-
+<!--
+   - DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+   -
+   - Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
+   -
+   - The contents of this file are subject to the terms of either the GNU
+   - General Public License Version 2 only ("GPL") or the Common
+   - Development and Distribution License("CDDL") (collectively, the
+   - "License"). You may not use this file except in compliance with the
+   - License. You can obtain a copy of the License at
+   - http://www.netbeans.org/cddl-gplv2.html
+   - or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+   - specific language governing permissions and limitations under the
+   - License.  When distributing the software, include this License Header
+   - Notice in each file and include the License file at
+   - nbbuild/licenses/CDDL-GPL-2-CP.  Sun designates this
+   - particular file as subject to the "Classpath" exception as provided
+   - by Sun in the GPL Version 2 section of the License file that
+   - accompanied this code. If applicable, add the following below the
+   - License Header, with the fields enclosed by brackets [] replaced by
+   - your own identifying information:
+   - "Portions Copyrighted [year] [name of copyright owner]"
+   -
+   - Contributor(s):
+   -
+   - The Original Software is NetBeans. The Initial Developer of the Original
+   - Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
+   - Microsystems, Inc. All Rights Reserved.
+   -
+   - If you wish your version of this file to be governed by only the CDDL
+   - or only the GPL Version 2, indicate your decision by adding
+   - "[Contributor] elects to include this software in this distribution
+   - under the [CDDL or GPL Version 2] license." If you do not indicate a
+   - single choice of license, a recipient has the option to distribute
+   - your version of this file under either the CDDL, the GPL Version 2 or
+   - to extend the choice of license to its licensees as provided above.
+   - However, if you add GPL Version 2 code and therefore, elected the GPL
+   - Version 2 license, then the option applies only if the new code is
+   - made subject to such option by the copyright holder.
+  -->
+  
 <HTML>
 <head>
   <meta http-equiv="content-type" content="text/html; charset=UTF-8">
diff -r b7c1c51ac6f9 -r 147c8984ddd2 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
--- 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
+++ 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
@@ -1,9 +1,44 @@
- <!--
- - Copyright 2006-2007 Sun Microsystems, Inc. All rights reserved.
- - SUN PROPRIETARY/CONFIDENTIAL.
- - Use is subject to license terms.
- -->
-
+<!--
+   - DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+   -
+   - Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
+   -
+   - The contents of this file are subject to the terms of either the GNU
+   - General Public License Version 2 only ("GPL") or the Common
+   - Development and Distribution License("CDDL") (collectively, the
+   - "License"). You may not use this file except in compliance with the
+   - License. You can obtain a copy of the License at
+   - http://www.netbeans.org/cddl-gplv2.html
+   - or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+   - specific language governing permissions and limitations under the
+   - License.  When distributing the software, include this License Header
+   - Notice in each file and include the License file at
+   - nbbuild/licenses/CDDL-GPL-2-CP.  Sun designates this
+   - particular file as subject to the "Classpath" exception as provided
+   - by Sun in the GPL Version 2 section of the License file that
+   - accompanied this code. If applicable, add the following below the
+   - License Header, with the fields enclosed by brackets [] replaced by
+   - your own identifying information:
+   - "Portions Copyrighted [year] [name of copyright owner]"
+   -
+   - Contributor(s):
+   -
+   - The Original Software is NetBeans. The Initial Developer of the Original
+   - Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
+   - Microsystems, Inc. All Rights Reserved.
+   -
+   - If you wish your version of this file to be governed by only the CDDL
+   - or only the GPL Version 2, indicate your decision by adding
+   - "[Contributor] elects to include this software in this distribution
+   - under the [CDDL or GPL Version 2] license." If you do not indicate a
+   - single choice of license, a recipient has the option to distribute
+   - your version of this file under either the CDDL, the GPL Version 2 or
+   - to extend the choice of license to its licensees as provided above.
+   - However, if you add GPL Version 2 code and therefore, elected the GPL
+   - Version 2 license, then the option applies only if the new code is
+   - made subject to such option by the copyright holder.
+  -->
+  
 <HTML>
 <head>
   <meta http-equiv="content-type" content="text/html; charset=UTF-8">
diff -r b7c1c51ac6f9 -r 147c8984ddd2 src/gl_ES/other/installer/infra/build/web/js/start_strings_gl_ES.js
--- a/src/gl_ES/other/installer/infra/build/web/js/start_strings_gl_ES.js	Mon Dec 19 12:18:33 2016 +0100
+++ b/src/gl_ES/other/installer/infra/build/web/js/start_strings_gl_ES.js	Tue Apr 17 14:14:23 2018 +0200
@@ -59,9 +59,9 @@
 var SUPPORT_LABEL        = "Support";
 var SUPPORT_DESCRIPTION  = "Flexible support options to help you stay focused on innovation.";
 
-// $PRODUCT_NAME $TYPE (Installer for $PLATFORM/Zip)/$Language ($Language_ID) $filename ($SIZE) MD5: $MD5
-var INFO_MESSAGE = "{0}{1} {2}/{3} ({4})<br>{5} ({6} MB)<br>MD5: {7}";
-var INFO_MESSAGE_OTHER = "{0} ({1} MB)<br>MD5: {2}";
+// $PRODUCT_NAME $TYPE (Installer for $PLATFORM/Zip)/$Language ($Language_ID) $filename ($SIZE) SHA-256: $MD5
+var INFO_MESSAGE = "{0}{1} {2}/{3} ({4})<br>{5} ({6} MB)<br>SHA-256: {7}";
+var INFO_MESSAGE_OTHER = "{0} ({1} MB)<br>SHA-256: {2}";
 
 //DO NOT TRANSLATE
 var SUBSCRIPTION_PHP_URL = "http://services.netbeans.org/sub.php";
diff -r b7c1c51ac6f9 -r 147c8984ddd2 src/gl_ES/ruby/ruby/ruby/org/netbeans/modules/ruby/Bundle_gl_ES.properties
--- a/src/gl_ES/ruby/ruby/ruby/org/netbeans/modules/ruby/Bundle_gl_ES.properties	Mon Dec 19 12:18:33 2016 +0100
+++ b/src/gl_ES/ruby/ruby/ruby/org/netbeans/modules/ruby/Bundle_gl_ES.properties	Tue Apr 17 14:14:23 2018 +0200
@@ -266,9 +266,6 @@
 
 InstalledVersions=Versi\u00f3n(s) instaladas: {0}
 
-# HTTP status codes for code completion,
-# 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
-
 SC_100=100 (Continuar)
 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.
 SC_101=101 (Conmutando protocolos)
diff -r b7c1c51ac6f9 -r 147c8984ddd2 src/hi_IN/other/installer/infra/build/web/js/start_strings_hi_IN.js
--- a/src/hi_IN/other/installer/infra/build/web/js/start_strings_hi_IN.js	Mon Dec 19 12:18:33 2016 +0100
+++ b/src/hi_IN/other/installer/infra/build/web/js/start_strings_hi_IN.js	Tue Apr 17 14:14:23 2018 +0200
@@ -59,9 +59,9 @@
 var SUPPORT_LABEL        = "Support";
 var SUPPORT_DESCRIPTION  = "Flexible support options to help you stay focused on innovation.";
 
-// $PRODUCT_NAME $TYPE (Installer for $PLATFORM/Zip)/$Language ($Language_ID) $filename ($SIZE) MD5: $MD5
-var INFO_MESSAGE = "{0}{1} {2}/{3} ({4})<br>{5} ({6} MB)<br>MD5: {7}";
-var INFO_MESSAGE_OTHER = "{0} ({1} MB)<br>MD5: {2}";
+// $PRODUCT_NAME $TYPE (Installer for $PLATFORM/Zip)/$Language ($Language_ID) $filename ($SIZE) SHA-256: $MD5
+var INFO_MESSAGE = "{0}{1} {2}/{3} ({4})<br>{5} ({6} MB)<br>SHA-256: {7}";
+var INFO_MESSAGE_OTHER = "{0} ({1} MB)<br>SHA-256: {2}";
 
 //DO NOT TRANSLATE
 var SUBSCRIPTION_PHP_URL = "http://services.netbeans.org/sub.php";
diff -r b7c1c51ac6f9 -r 147c8984ddd2 src/in_ID/other/installer/infra/build/web/js/start_strings_in_ID.js
--- a/src/in_ID/other/installer/infra/build/web/js/start_strings_in_ID.js	Mon Dec 19 12:18:33 2016 +0100
+++ b/src/in_ID/other/installer/infra/build/web/js/start_strings_in_ID.js	Tue Apr 17 14:14:23 2018 +0200
@@ -59,9 +59,9 @@
 var SUPPORT_LABEL        = "Support";
 var SUPPORT_DESCRIPTION  = "Flexible support options to help you stay focused on innovation.";
 
-// $PRODUCT_NAME $TYPE (Installer for $PLATFORM/Zip)/$Language ($Language_ID) $filename ($SIZE) MD5: $MD5
-var INFO_MESSAGE = "{0}{1} {2}/{3} ({4})<br>{5} ({6} MB)<br>MD5: {7}";
-var INFO_MESSAGE_OTHER = "{0} ({1} MB)<br>MD5: {2}";
+// $PRODUCT_NAME $TYPE (Installer for $PLATFORM/Zip)/$Language ($Language_ID) $filename ($SIZE) SHA-256: $MD5
+var INFO_MESSAGE = "{0}{1} {2}/{3} ({4})<br>{5} ({6} MB)<br>SHA-256: {7}";
+var INFO_MESSAGE_OTHER = "{0} ({1} MB)<br>SHA-256: {2}";
 
 //DO NOT TRANSLATE
 var SUBSCRIPTION_PHP_URL = "http://services.netbeans.org/sub.php";
diff -r b7c1c51ac6f9 -r 147c8984ddd2 src/it/other/installer/infra/build/web/js/start_strings_it.js
--- a/src/it/other/installer/infra/build/web/js/start_strings_it.js	Mon Dec 19 12:18:33 2016 +0100
+++ b/src/it/other/installer/infra/build/web/js/start_strings_it.js	Tue Apr 17 14:14:23 2018 +0200
@@ -59,9 +59,9 @@
 var SUPPORT_LABEL        = "Support";
 var SUPPORT_DESCRIPTION  = "Flexible support options to help you stay focused on innovation.";
 
-// $PRODUCT_NAME $TYPE (Installer for $PLATFORM/Zip)/$Language ($Language_ID) $filename ($SIZE) MD5: $MD5
-var INFO_MESSAGE = "{0}{1} {2}/{3} ({4})<br>{5} ({6} MB)<br>MD5: {7}";
-var INFO_MESSAGE_OTHER = "{0} ({1} MB)<br>MD5: {2}";
+// $PRODUCT_NAME $TYPE (Installer for $PLATFORM/Zip)/$Language ($Language_ID) $filename ($SIZE) SHA-256: $MD5
+var INFO_MESSAGE = "{0}{1} {2}/{3} ({4})<br>{5} ({6} MB)<br>SHA-256: {7}";
+var INFO_MESSAGE_OTHER = "{0} ({1} MB)<br>SHA-256: {2}";
 
 //DO NOT TRANSLATE
 var SUBSCRIPTION_PHP_URL = "http://services.netbeans.org/sub.php";
diff -r b7c1c51ac6f9 -r 147c8984ddd2 src/ja/cnd/cnd-completion/cnd-completion/org/netbeans/modules/cnd/completion/cplusplus/Bundle_ja.properties
--- 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
+++ 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
@@ -68,3 +68,6 @@
 goto-implementation=\u30aa\u30fc\u30d0\u30fc\u30e9\u30a4\u30c9/\u30aa\u30fc\u30d0\u30fc\u30e9\u30a4\u30c9\u6e08\u3078\u79fb\u52d5
 goto-implementation-text=\u30aa\u30fc\u30d0\u30fc\u30e9\u30a4\u30c9/\u30aa\u30fc\u30d0\u30fc\u30e9\u30a4\u30c9\u6e08\u3078\u79fb\u52d5(&I)
 
+DocProvider.source-code=\u30bd\u30fc\u30b9\u30fb\u30b3\u30fc\u30c9
+DocProvider.manual=\u30de\u30cb\u30e5\u30a2\u30eb\u30fb\u30da\u30fc\u30b8
+
diff -r b7c1c51ac6f9 -r 147c8984ddd2 src/ja/cnd/cnd-completion/cnd-completion/org/netbeans/modules/cnd/completion/options/Bundle_ja.properties
--- 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
+++ 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,4 +39,8 @@
 CodeCompletionPanel.autoCompletionTriggersLabel.text=C/C++\u8b58\u5225\u5b50\u3067\u306e\u81ea\u52d5\u30dd\u30c3\u30d7\u30a2\u30c3\u30d7\u306e\u30c8\u30ea\u30ac\u30fc(&A):
 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)
 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)
+CodeCompletionPanel.docimentationListLabel.text=\u30c9\u30ad\u30e5\u30e1\u30f3\u30c8\u306e\u53d6\u5f97\u5143
+CodeCompletionPanel.documentationCheckBox.text=\u30c9\u30ad\u30e5\u30e1\u30f3\u30c8\u8a2d\u5b9a
+CodeCompletionPanel.upButton.text=\u4e0a
+CodeCompletionPanel.downButton.text=\u4e0b
 
diff -r b7c1c51ac6f9 -r 147c8984ddd2 src/ja/cnd/cnd-debugger-common2/cnd-debugger-common2/org/netbeans/modules/cnd/debugger/common2/debugger/Bundle_ja.properties
--- 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
+++ 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
@@ -264,6 +264,7 @@
 HINT_address=\u5909\u6570\u306e\u30a2\u30c9\u30ec\u30b9
 ACT_Variable_Watch=\u30a6\u30a9\u30c3\u30c1
 MSG_Show_More_Message=\u8868\u793a\u306e\u8ffd\u52a0
+CTL_WatchAction_ShowPinned=\u56fa\u5b9a\u30a6\u30a9\u30c3\u30c1\u306e\u8868\u793a
 
 #
 # Error messages
diff -r b7c1c51ac6f9 -r 147c8984ddd2 src/ja/cnd/cnd-debugger-common2/cnd-debugger-common2/org/netbeans/modules/cnd/debugger/common2/debugger/actions/Bundle_ja.properties
--- 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
+++ 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
@@ -68,10 +68,10 @@
 HostName=\u30db\u30b9\u30c8\u540d
 FromProcess=<\u30d7\u30ed\u30bb\u30b9\u304b\u3089>
 
-All_Processes_Lab=\u3059\u3079\u3066\u306e\u30e6\u30fc\u30b6\u30fc\u306e\u30d7\u30ed\u30bb\u30b9
-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
+All_Processes_Lab=\u30e6\u30fc\u30b6\u30fc\u30fb\u30d7\u30ed\u30bb\u30b9\u306e\u307f
+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
 
-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
+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
 
 
 ACSD_EditHosts=\u30db\u30b9\u30c8\u4e00\u89a7\u3092\u7de8\u96c6
diff -r b7c1c51ac6f9 -r 147c8984ddd2 src/ja/cnd/cnd-debugger-common2/cnd-debugger-common2/org/netbeans/modules/cnd/debugger/common2/debugger/assembly/Bundle_ja.properties
--- 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
+++ 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
@@ -60,6 +60,7 @@
 Reg_ACT_Show_All_Registers=\u3059\u3079\u3066\u306e\u30ec\u30b8\u30b9\u30bf\u3092\u8868\u793a
 Reg_ACT_Hide=\u9078\u629e\u3057\u305f\u30ec\u30b8\u30b9\u30bf\u3092\u975e\u8868\u793a
 Reg_ACT_More_Info=\u8a73\u7d30\u60c5\u5831
+Reg_ACT_Data_Presentation=\u30c7\u30fc\u30bf\u8868\u73fe
 
 #
 # OW: Memory window, Evaluation window
diff -r b7c1c51ac6f9 -r 147c8984ddd2 src/ja/cnd/cnd-debugger-common2/cnd-debugger-common2/org/netbeans/modules/cnd/debugger/common2/debugger/options/Bundle_ja.properties
--- 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
+++ 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
@@ -326,6 +326,13 @@
 ACSD_balloon_eval_on=\u30d0\u30eb\u30fc\u30f3\u5f0f\u8a55\u4fa1\u3092\u6709\u52b9\u5316
 ACSD_balloon_eval_off=\u30d0\u30eb\u30fc\u30f3\u5f0f\u8a55\u4fa1\u3092\u7121\u52b9\u5316
 
+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
+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
+
+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
+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
+
+
 LABEL_save_breakpoints=\u30d6\u30ec\u30fc\u30af\u30dd\u30a4\u30f3\u30c8\u306e\u4fdd\u5b58\u3068\u5fa9\u5143
 ACSD_save_breakpoints=\u30d6\u30ec\u30fc\u30af\u30dd\u30a4\u30f3\u30c8\u306e\u4fdd\u5b58\u3068\u5fa9\u5143
 
diff -r b7c1c51ac6f9 -r 147c8984ddd2 src/ja/cnd/cnd-debugger-common2/cnd-debugger-common2/org/netbeans/modules/cnd/debugger/common2/ui/Bundle_ja.properties
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ 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
@@ -0,0 +1,151 @@
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+#
+# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#
+# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
+# Other names may be trademarks of their respective owners.
+#
+# The contents of this file are subject to the terms of either the GNU
+# General Public License Version 2 only ("GPL") or the Common
+# Development and Distribution License("CDDL") (collectively, the
+# "License"). You may not use this file except in compliance with the
+# License. You can obtain a copy of the License at
+# http://www.netbeans.org/cddl-gplv2.html
+# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+# specific language governing permissions and limitations under the
+# License.  When distributing the software, include this License Header
+# Notice in each file and include the License file at
+# nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the GPL Version 2 section of the License file that
+# accompanied this code. If applicable, add the following below the
+# License Header, with the fields enclosed by brackets [] replaced by
+# your own identifying information:
+# "Portions Copyrighted [year] [name of copyright owner]"
+#
+# Contributor(s):
+#
+# The Original Software is NetBeans. The Initial Developer of the Original
+# Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
+# Microsystems, Inc. All Rights Reserved.
+#
+# If you wish your version of this file to be governed by only the CDDL
+# or only the GPL Version 2, indicate your decision by adding
+# "[Contributor] elects to include this software in this distribution
+# under the [CDDL or GPL Version 2] license." If you do not indicate a
+# single choice of license, a recipient has the option to distribute
+# your version of this file under either the CDDL, the GPL Version 2 or
+# to extend the choice of license to its licensees as provided above.
+# However, if you add GPL Version 2 code and therefore, elected the GPL
+# Version 2 license, then the option applies only if the new code is
+# made subject to such option by the copyright holder.
+
+# OLD #
+# OLD # AttachDialogAction
+# OLD #
+# OLD ATTACHDIALOG_ACTION_NAME=&Attach...
+
+ACSD_OK=OK
+ACSD_Cancel=\u53d6\u6d88
+
+#
+# AttachPanel
+#
+Refresh=\u30ea\u30d5\u30ec\u30c3\u30b7\u30e5
+
+ACSD_Refresh=\u30d7\u30ed\u30bb\u30b9\u30fb\u30ea\u30b9\u30c8\u3092\u30ea\u30d5\u30ec\u30c3\u30b7\u30e5
+
+CTL_Attach=\u30c7\u30d0\u30c3\u30ac\u3092\u30a2\u30bf\u30c3\u30c1
+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
+AttachProcDiag_FilterColon=\u30d5\u30a3\u30eb\u30bf:
+
+AttachProcDiag_HostColon=\u30db\u30b9\u30c8:
+
+AttachProcDiag_Table=\u30a2\u30bf\u30c3\u30c1\u3059\u308b\u30d7\u30ed\u30bb\u30b9:
+
+ACSD_AttachProcDiag_Table=\u4f7f\u7528\u53ef\u80fd\u306a\u30d7\u30ed\u30bb\u30b9\u306e\u4e00\u89a7
+RegExp=\u6b63\u898f\u8868\u73fe
+HostName=\u30db\u30b9\u30c8\u540d
+FromProcess=<\u30d7\u30ed\u30bb\u30b9\u304b\u3089>
+
+All_Processes_Lab=\u30e6\u30fc\u30b6\u30fc\u30fb\u30d7\u30ed\u30bb\u30b9\u306e\u307f
+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
+
+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
+
+
+ACSD_EditHosts=\u30db\u30b9\u30c8\u4e00\u89a7\u3092\u7de8\u96c6
+
+ACSD_Engine=\u30c7\u30d0\u30c3\u30b0\u30fb\u30a8\u30f3\u30b8\u30f3
+ACSD_Debugging_Engine=\u30c7\u30d0\u30c3\u30b0\u30fb\u30a8\u30f3\u30b8\u30f3
+ASSOCIATED_ENGINE_LBL=\u30c7\u30d0\u30c3\u30b0\u30fb\u30a8\u30f3\u30b8\u30f3:
+
+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
+MSG_Uninitialized_Process_Table=\u30d7\u30ed\u30bb\u30b9\u8868\u306f\u307e\u3060\u521d\u671f\u5316\u3055\u308c\u3066\u3044\u307e\u305b\u3093
+
+MSG_Gathering_Data=\u30c7\u30fc\u30bf\u3092\u53ce\u96c6\u3057\u3066\u3044\u307e\u3059...
+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
+
+#
+# DebugCorePanel & ExecutableProjectPanel (used in AttachDialog)
+#
+
+ACSD_ExecutableBrowse=\u5b9f\u884c\u53ef\u80fd\u30d5\u30a1\u30a4\u30eb\u3092\u53c2\u7167
+
+
+RUN_PROFILE_LBL=\u5b9f\u884c\u30d7\u30ed\u30d5\u30a1\u30a4\u30eb:
+
+RUN_PROFILES_BUTTON_TXT=\u7de8\u96c6...
+CHOOSER_BUTTON=\u9078\u629e
+DEFAULT_SET_TITLE=\u30c7\u30d5\u30a9\u30eb\u30c8\u30fb\u30bb\u30c3\u30c8
+NEW_PROJECT=<\u65b0\u898f\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u3092\u4f5c\u6210>
+NO_PROJECT=<\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u304c\u3042\u308a\u307e\u305b\u3093>
+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
+// OLD GDB_ERROR_DONTAPPLY=dbxtool does not allow gdb debugger
+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
+ERROR_DONTAPPLY=\u3053\u306e\u30c7\u30d0\u30c3\u30ac\u306f\u30b5\u30dd\u30fc\u30c8\u3055\u308c\u3066\u3044\u307e\u305b\u3093
+DBX_ERROR_DONTAPPLY=gdbtool\u3067\u306fdbx\u30c7\u30d0\u30c3\u30ac\u3092\u4f7f\u7528\u3067\u304d\u307e\u305b\u3093
+ERROR_DONTEXIST=\u9078\u629e\u3057\u305f\u5b9f\u884c\u53ef\u80fd\u30d5\u30a1\u30a4\u30eb\u306f\u5b58\u5728\u3057\u307e\u305b\u3093
+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
+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
+
+#
+# DebugProjectAction
+#
+# LBL_LoadProgram=Load program
+LBL_LoadProgram=\u30d7\u30ed\u30b0\u30e9\u30e0\u3092\u30ed\u30fc\u30c9\u3059\u308b...
+LBL_Start=\u30e1\u30a4\u30f3\u30fb\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u3092\u30c7\u30d0\u30c3\u30b0
+LBL_Continue=\u7d9a\u884c(&C)
+CoreExeChooser=\u5b9f\u884c\u53ef\u80fd\u30d5\u30a1\u30a4\u30eb\u3092\u9078\u629e
+
+#
+# DebuggingOptionsAction
+#
+CTL_DebuggingOptions=\u30c7\u30d0\u30c3\u30b0\u30fb\u30aa\u30d7\u30b7\u30e7\u30f3(&D)...
+
+#
+# DetachAction
+#
+LBL_Detach=\u30c7\u30d0\u30c3\u30ac\u306e\u30c7\u30bf\u30c3\u30c1(&D)
+
+#
+
+OUTPUT_ATTACH_ACTION_TEXT=\u30c7\u30d0\u30c3\u30ac\u3092\u30a2\u30bf\u30c3\u30c1
+
+ATTACH_HISTORY_MESSAGE=\u30d7\u30ed\u30bb\u30b9{0}@{1}\u306b\u30a2\u30bf\u30c3\u30c1
+
+
+PROGRESS_PREPARE_TARGET=\u30a2\u30bf\u30c3\u30c1\u3059\u308b\u30bf\u30fc\u30b2\u30c3\u30c8\u306e\u6e96\u5099\u4e2d...
+DebugCorePanel.Validating=\u691c\u67fb\u4e2d...
+DebugCorePanel.HOST_IS_NOT_VALID=\u30db\u30b9\u30c8\u304c\u63a5\u7d9a\u3055\u308c\u3066\u3044\u307e\u305b\u3093
+
+ACSD_Project=\u4f7f\u7528\u3059\u308b\u30d7\u30ed\u30b8\u30a7\u30af\u30c8
+
+#
+# DebugFileAction
+#
+TITLE_Hosts=\u30db\u30b9\u30c8...
+
+HOST_LBL=\u30db\u30b9\u30c8:
+ExecutableProjectPanel.commandLine_N_A.text=<\u4f7f\u7528\u4e0d\u53ef>
+
diff -r b7c1c51ac6f9 -r 147c8984ddd2 src/ja/cnd/cnd-debugger-common2/cnd-debugger-common2/org/netbeans/modules/cnd/debugger/common2/ui/processlist/Bundle_ja.properties
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ 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
@@ -0,0 +1,88 @@
+ProcessListPanel.filterLabel.text=\u30d5\u30a3\u30eb\u30bf(&F):
+ProcessListPanel.refreshBtn.text=\u30ea\u30d5\u30ec\u30c3\u30b7\u30e5(&R)
+ProcessListPanel.refreshBtn.toolTipText=\u30d7\u30ed\u30bb\u30b9\u30fb\u30ea\u30b9\u30c8\u3092\u30ea\u30d5\u30ec\u30c3\u30b7\u30e5
+ProcessInfoPanel.jLabel1.text=\u30b3\u30de\u30f3\u30c9\u884c:
+ProcessInfoPanel.commandLine_N_A.text=<\u4f7f\u7528\u4e0d\u53ef>
+WaitNode.displayName=\u5f85\u6a5f\u4e2d...
+ProcessListPanel.jToggleButton1.text=jToggleButton1
+ProcessListPanel.label=\u30c4\u30ea\u30fc
+ProcessListPanel.toolTipText=\u30c4\u30ea\u30fc\u30fb\u30e2\u30fc\u30c9
+
+ProcessListPanel.listTogleButton.toolTipText=\u30ea\u30b9\u30c8\u30fb\u30e2\u30fc\u30c9
+
+ProcessListPanel.outlineHeaderName=PID
+ProcessListPanel.userProcessesOnlyCheckBox.text=\u30e6\u30fc\u30b6\u30fc\u30fb\u30d7\u30ed\u30bb\u30b9\u306e\u307f\u3092\u8868\u793a
+
+#
+# DebugExecutableNodeAction
+#
+DEBUG_DIALOG_TITLE=\u5b9f\u884c\u53ef\u80fd\u30d5\u30a1\u30a4\u30eb\u3092\u30c7\u30d0\u30c3\u30b0
+DEBUG_ACTION_NAME=\u30c7\u30d0\u30c3\u30b0
+
+#
+# DebugFileAction
+#
+TITLE_Hosts=\u30db\u30b9\u30c8...
+
+HOST_LBL=\u30db\u30b9\u30c8:
+
+#
+# AttachPanel
+#
+Refresh=\u30ea\u30d5\u30ec\u30c3\u30b7\u30e5
+
+ACSD_Refresh=\u30d7\u30ed\u30bb\u30b9\u30fb\u30ea\u30b9\u30c8\u3092\u30ea\u30d5\u30ec\u30c3\u30b7\u30e5
+
+CTL_Attach=\u30c7\u30d0\u30c3\u30ac\u3092\u30a2\u30bf\u30c3\u30c1
+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
+AttachProcDiag_FilterColon=\u30d5\u30a3\u30eb\u30bf:
+
+AttachProcDiag_HostColon=\u30db\u30b9\u30c8:
+
+AttachProcDiag_Table=\u30a2\u30bf\u30c3\u30c1\u3059\u308b\u30d7\u30ed\u30bb\u30b9:
+
+ACSD_AttachProcDiag_Table=\u4f7f\u7528\u53ef\u80fd\u306a\u30d7\u30ed\u30bb\u30b9\u306e\u4e00\u89a7
+RegExp=\u6b63\u898f\u8868\u73fe
+HostName=\u30db\u30b9\u30c8\u540d
+FromProcess=<\u30d7\u30ed\u30bb\u30b9\u304b\u3089>
+
+All_Processes_Lab=\u30e6\u30fc\u30b6\u30fc\u30fb\u30d7\u30ed\u30bb\u30b9\u306e\u307f
+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
+
+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
+
+
+ACSD_EditHosts=\u30db\u30b9\u30c8\u4e00\u89a7\u3092\u7de8\u96c6
+
+ACSD_Engine=\u30c7\u30d0\u30c3\u30b0\u30fb\u30a8\u30f3\u30b8\u30f3
+ACSD_Debugging_Engine=\u30c7\u30d0\u30c3\u30b0\u30fb\u30a8\u30f3\u30b8\u30f3
+ASSOCIATED_ENGINE_LBL=\u30c7\u30d0\u30c3\u30b0\u30fb\u30a8\u30f3\u30b8\u30f3:
+
+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
+MSG_Uninitialized_Process_Table=\u30d7\u30ed\u30bb\u30b9\u8868\u306f\u307e\u3060\u521d\u671f\u5316\u3055\u308c\u3066\u3044\u307e\u305b\u3093
+
+MSG_Gathering_Data=\u30c7\u30fc\u30bf\u3092\u53ce\u96c6\u3057\u3066\u3044\u307e\u3059...
+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
+
+
+# OLD #
+# OLD # Debug->Windows menu stuff
+# OLD #
+# OLD 
+# OLD CTL_DebugWindowsMenuAction=Windows
+# OLD MNEM_DebugWindowsMenuAction=W
+
+OUTPUT_ATTACH_ACTION_TEXT=\u30c7\u30d0\u30c3\u30ac\u3092\u30a2\u30bf\u30c3\u30c1
+
+ATTACH_HISTORY_MESSAGE=\u30d7\u30ed\u30bb\u30b9{0}@{1}\u306b\u30a2\u30bf\u30c3\u30c1
+
+Dis_ACT_Go_To_Source=\u30bd\u30fc\u30b9\u30fb\u30b3\u30fc\u30c9\u3078\u79fb\u52d5
+Dis_ACT_Show_Current_Statement=\u73fe\u5728\u306e\u6587\u3092\u8868\u793a
+
+PROGRESS_PREPARE_TARGET=\u30a2\u30bf\u30c3\u30c1\u3059\u308b\u30bf\u30fc\u30b2\u30c3\u30c8\u306e\u6e96\u5099\u4e2d...
+DebugCorePanel.Validating=\u691c\u67fb\u4e2d...
+DebugCorePanel.HOST_IS_NOT_VALID=\u30db\u30b9\u30c8\u304c\u63a5\u7d9a\u3055\u308c\u3066\u3044\u307e\u305b\u3093
+
+Tree_Loading=\u30ed\u30fc\u30c9\u4e2d...
+
+
diff -r b7c1c51ac6f9 -r 147c8984ddd2 src/ja/cnd/cnd-debugger-common2/cnd-debugger-common2/org/netbeans/modules/cnd/debugger/common2/utils/Bundle_ja.properties
--- 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
+++ 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
@@ -110,6 +110,12 @@
 
 # PsProvider
 # Should not be translated
+PS_HDR_ZONE=ZONE
+# Should not be translated
+
+# Should not be translated
+PS_HDR_USER=USER
+# Should not be translated
 
 # Should not be translated
 
@@ -122,7 +128,7 @@
 # Should not be translated
 
 # Should not be translated
-
+PS_HDR_COMM=COMMAND
 # Should not be translated
 
 # Should not be translated
diff -r b7c1c51ac6f9 -r 147c8984ddd2 src/ja/cnd/cnd-debugger-gdb2/cnd-debugger-gdb2/org/netbeans/modules/cnd/debugger/gdb2/Bundle_ja.properties
--- 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
+++ 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
@@ -76,7 +76,7 @@
 MSG_GdbUnexpectedlyStopped=GDB\u304c\u4e88\u671f\u305b\u305a\u623b\u308a\u5024{0}\u3067\u505c\u6b62\u3057\u307e\u3057\u305f
 MSG_InvalidLocation = "\u30d6\u30ec\u30fc\u30af\u30dd\u30a4\u30f3\u30c8\u306e\u5834\u6240\u306f\u5b58\u5728\u3057\u307e\u305b\u3093\u3002"
 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
-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
+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
 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}
 
 #
@@ -125,6 +125,10 @@
 
 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
 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
+#
+# For error (dialog) stuff
+#
+INFORMATION=\u60c5\u5831
 
 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
 
diff -r b7c1c51ac6f9 -r 147c8984ddd2 src/ja/cnd/cnd-debugger-gdb2/cnd-debugger-gdb2/org/netbeans/modules/cnd/debugger/gdb2/actions/Bundle_ja.properties
--- 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
+++ 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
@@ -40,7 +40,7 @@
 # Version 2 license, then the option applies only if the new code is
 # made subject to such option by the copyright holder.
 
-GdbDebuggerEngine=Gdb\u30c7\u30d0\u30c3\u30ac\u3092\u4f7f\u7528
+GdbDebuggerEngine=Gdb\u30c7\u30d0\u30c3\u30ac
 
 
 
diff -r b7c1c51ac6f9 -r 147c8984ddd2 src/ja/cnd/cnd-highlight/cnd-highlight/org/netbeans/modules/cnd/highlight/semantic/Bundle_ja.properties
--- 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
+++ 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
@@ -46,14 +46,14 @@
 Show-fast-class-fields=\u30af\u30e9\u30b9\u306e\u30d5\u30a3\u30fc\u30eb\u30c9\u306e\u5ba3\u8a00\u306e\u5f37\u8abf\u8868\u793a(&S)
 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
 
-Show-class-fields=\u30af\u30e9\u30b9\u306e\u30d5\u30a3\u30fc\u30eb\u30c9\u306e\u5f37\u8abf\u8868\u793a(&F)
-Show-class-fields-AD=\u5f37\u8abf\u8868\u793a\u3067\u30af\u30e9\u30b9\u306e\u30d5\u30a3\u30fc\u30eb\u30c9\u3092\u8868\u793a
+Show-class-fields=\u30af\u30e9\u30b9\u306e\u30d5\u30a3\u30fc\u30eb\u30c9\u306e\u4f7f\u7528\u72b6\u6cc1\u306e\u5f37\u8abf\u8868\u793a(&F)
+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
 
-Show-fast-functions-names=\u95a2\u6570\u540d\u306e\u5ba3\u8a00\u3068\u5b9a\u7fa9\u306e\u5f37\u8abf\u8868\u793a(&D)
-Show-fast-functions-names-AD=\u5f37\u8abf\u8868\u793a\u3067\u95a2\u6570\u540d\u306e\u5ba3\u8a00\u3068\u5b9a\u7fa9\u3092\u8868\u793a
+Show-fast-functions-names=\u95a2\u6570\u306e\u5ba3\u8a00\u306e\u5f37\u8abf\u8868\u793a(&D)
+Show-fast-functions-names-AD=\u5f37\u8abf\u8868\u793a\u3067\u95a2\u6570\u306e\u5ba3\u8a00\u3092\u8868\u793a
 
-Show-functions-names=\u95a2\u6570\u540d\u306e\u5f37\u8abf\u8868\u793a(&N)
-Show-functions-names-AD=\u5f37\u8abf\u8868\u793a\u3067\u95a2\u6570\u540d\u3092\u8868\u793a
+Show-functions-names=\u95a2\u6570\u306e\u4f7f\u7528\u72b6\u6cc1\u306e\u5f37\u8abf\u8868\u793a(&N)
+Show-functions-names-AD=\u5f37\u8abf\u8868\u793a\u3067\u95a2\u6570\u306e\u4f7f\u7528\u72b6\u6cc1\u3092\u8868\u793a
 
 Show-macros=\u30de\u30af\u30ed\u306e\u5f37\u8abf\u8868\u793a(&M)
 Show-macros-AD=\u5f37\u8abf\u8868\u793a\u3067\u30de\u30af\u30ed\u3092\u8868\u793a
@@ -64,5 +64,21 @@
 Show-unused-variables=\u672a\u4f7f\u7528\u306e\u5909\u6570\u306e\u5f37\u8abf\u8868\u793a(&V)
 Show-unused-variables-AD=\u5f37\u8abf\u8868\u793a\u3067\u672a\u4f7f\u7528\u306e\u5909\u6570\u3092\u8868\u793a
 
+Show-fast-enums-names=\u5217\u6319\u306e\u5ba3\u8a00\u306e\u5f37\u8abf\u8868\u793a
+Show-fast-enums-names-AD=\u5f37\u8abf\u8868\u793a\u3067\u5217\u6319\u306e\u5ba3\u8a00\u3092\u8868\u793a
 
+Show-enums-names=\u5217\u6319\u306e\u4f7f\u7528\u72b6\u6cc1\u306e\u5f37\u8abf\u8868\u793a
+Show-enums-names-AD=\u5f37\u8abf\u8868\u793a\u3067\u5217\u6319\u306e\u4f7f\u7528\u72b6\u6cc1\u3092\u8868\u793a
 
+Show-fast-classes-names=\u30af\u30e9\u30b9\u306e\u5ba3\u8a00\u306e\u5f37\u8abf\u8868\u793a
+Show-fast-classes-names-AD=\u5f37\u8abf\u8868\u793a\u3067\u30af\u30e9\u30b9\u306e\u5ba3\u8a00\u3092\u8868\u793a
+
+Show-classes-names=\u30af\u30e9\u30b9\u306e\u4f7f\u7528\u72b6\u6cc1\u306e\u5f37\u8abf\u8868\u793a
+Show-classes-names-AD=\u5f37\u8abf\u8868\u793a\u3067\u30af\u30e9\u30b9\u306e\u4f7f\u7528\u72b6\u6cc1\u3092\u8868\u793a
+
+Show-fast-enumerators-names=\u5217\u6319\u5b50\u306e\u5ba3\u8a00\u306e\u5f37\u8abf\u8868\u793a
+Show-fast-enumerators-names-AD=\u5f37\u8abf\u8868\u793a\u3067\u5217\u6319\u5b50\u306e\u5ba3\u8a00\u3092\u8868\u793a
+
+Show-enumerators-names=\u5217\u6319\u5b50\u306e\u4f7f\u7528\u72b6\u6cc1\u306e\u5f37\u8abf\u8868\u793a
+Show-enumerators-names-AD=\u5f37\u8abf\u8868\u793a\u3067\u5217\u6319\u5b50\u306e\u4f7f\u7528\u72b6\u6cc1\u3092\u8868\u793a
+
diff -r b7c1c51ac6f9 -r 147c8984ddd2 src/ja/cnd/cnd-makeproject-ui/cnd-makeproject-ui/org/netbeans/modules/cnd/makeproject/ui/launchers/actions/Bundle_ja.properties
--- 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
+++ 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
@@ -65,7 +65,7 @@
 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>
 LaunchersPanel.hideCheckBox.text=\u975e\u8868\u793a(&I)
 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
-LaunchersPanel.runInOwnTabCheckBox.text=\u72ec\u81ea\u306e\u51fa\u529b\u30bf\u30d6\u3067\u5b9f\u884c(&T)
+LaunchersPanel.runInOwnTabCheckBox.text=\u72ec\u81ea\u306e\u51fa\u529b\u30bf\u30d6\u3067\u5b9f\u884c(&U)
 
 LBL_BuildAsAction_Name=\u30d3\u30eb\u30c9
 LBL_RunAsAction_Name=\u5b9f\u884c
diff -r b7c1c51ac6f9 -r 147c8984ddd2 src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/api/Bundle_ja.properties
--- 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
+++ 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
@@ -66,6 +66,7 @@
 TXT_Auto=\u81ea\u52d5
 TXT_AlwaysRelative=\u5e38\u6642\u76f8\u5bfe
 TXT_AlwaysAbsolute=\u5e38\u6642\u7d76\u5bfe
+NO_PROJECT=\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u306a\u3057
 
 
 
diff -r b7c1c51ac6f9 -r 147c8984ddd2 src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/resources/samples/fractal_ja.html
--- 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
+++ 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
@@ -1,9 +1,44 @@
- <!--
- - Copyright 2006-2007 Sun Microsystems, Inc. All rights reserved.
- - SUN PROPRIETARY/CONFIDENTIAL.
- - Use is subject to license terms.
- -->
-
+<!--
+   - DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+   -
+   - Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
+   -
+   - The contents of this file are subject to the terms of either the GNU
+   - General Public License Version 2 only ("GPL") or the Common
+   - Development and Distribution License("CDDL") (collectively, the
+   - "License"). You may not use this file except in compliance with the
+   - License. You can obtain a copy of the License at
+   - http://www.netbeans.org/cddl-gplv2.html
+   - or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+   - specific language governing permissions and limitations under the
+   - License.  When distributing the software, include this License Header
+   - Notice in each file and include the License file at
+   - nbbuild/licenses/CDDL-GPL-2-CP.  Sun designates this
+   - particular file as subject to the "Classpath" exception as provided
+   - by Sun in the GPL Version 2 section of the License file that
+   - accompanied this code. If applicable, add the following below the
+   - License Header, with the fields enclosed by brackets [] replaced by
+   - your own identifying information:
+   - "Portions Copyrighted [year] [name of copyright owner]"
+   -
+   - Contributor(s):
+   -
+   - The Original Software is NetBeans. The Initial Developer of the Original
+   - Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
+   - Microsystems, Inc. All Rights Reserved.
+   -
+   - If you wish your version of this file to be governed by only the CDDL
+   - or only the GPL Version 2, indicate your decision by adding
+   - "[Contributor] elects to include this software in this distribution
+   - under the [CDDL or GPL Version 2] license." If you do not indicate a
+   - single choice of license, a recipient has the option to distribute
+   - your version of this file under either the CDDL, the GPL Version 2 or
+   - to extend the choice of license to its licensees as provided above.
+   - However, if you add GPL Version 2 code and therefore, elected the GPL
+   - Version 2 license, then the option applies only if the new code is
+   - made subject to such option by the copyright holder.
+  -->
+  
 <HTML>
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
diff -r b7c1c51ac6f9 -r 147c8984ddd2 src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/resources/samples/hello_ja.html
--- 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
+++ 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
@@ -1,9 +1,44 @@
- <!--
- - Copyright 2006-2007 Sun Microsystems, Inc. All rights reserved.
- - SUN PROPRIETARY/CONFIDENTIAL.
- - Use is subject to license terms.
- -->
-
+<!--
+   - DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+   -
+   - Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
+   -
+   - The contents of this file are subject to the terms of either the GNU
+   - General Public License Version 2 only ("GPL") or the Common
+   - Development and Distribution License("CDDL") (collectively, the
+   - "License"). You may not use this file except in compliance with the
+   - License. You can obtain a copy of the License at
+   - http://www.netbeans.org/cddl-gplv2.html
+   - or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+   - specific language governing permissions and limitations under the
+   - License.  When distributing the software, include this License Header
+   - Notice in each file and include the License file at
+   - nbbuild/licenses/CDDL-GPL-2-CP.  Sun designates this
+   - particular file as subject to the "Classpath" exception as provided
+   - by Sun in the GPL Version 2 section of the License file that
+   - accompanied this code. If applicable, add the following below the
+   - License Header, with the fields enclosed by brackets [] replaced by
+   - your own identifying information:
+   - "Portions Copyrighted [year] [name of copyright owner]"
+   -
+   - Contributor(s):
+   -
+   - The Original Software is NetBeans. The Initial Developer of the Original
+   - Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
+   - Microsystems, Inc. All Rights Reserved.
+   -
+   - If you wish your version of this file to be governed by only the CDDL
+   - or only the GPL Version 2, indicate your decision by adding
+   - "[Contributor] elects to include this software in this distribution
+   - under the [CDDL or GPL Version 2] license." If you do not indicate a
+   - single choice of license, a recipient has the option to distribute
+   - your version of this file under either the CDDL, the GPL Version 2 or
+   - to extend the choice of license to its licensees as provided above.
+   - However, if you add GPL Version 2 code and therefore, elected the GPL
+   - Version 2 license, then the option applies only if the new code is
+   - made subject to such option by the copyright holder.
+  -->
+  
 <HTML>
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
diff -r b7c1c51ac6f9 -r 147c8984ddd2 src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/resources/samples/lexyacc_ja.html
--- 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
+++ 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
@@ -1,9 +1,44 @@
- <!--
- - Copyright 2006-2007 Sun Microsystems, Inc. All rights reserved.
- - SUN PROPRIETARY/CONFIDENTIAL.
- - Use is subject to license terms.
- -->
-
+<!--
+   - DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+   -
+   - Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
+   -
+   - The contents of this file are subject to the terms of either the GNU
+   - General Public License Version 2 only ("GPL") or the Common
+   - Development and Distribution License("CDDL") (collectively, the
+   - "License"). You may not use this file except in compliance with the
+   - License. You can obtain a copy of the License at
+   - http://www.netbeans.org/cddl-gplv2.html
+   - or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+   - specific language governing permissions and limitations under the
+   - License.  When distributing the software, include this License Header
+   - Notice in each file and include the License file at
+   - nbbuild/licenses/CDDL-GPL-2-CP.  Sun designates this
+   - particular file as subject to the "Classpath" exception as provided
+   - by Sun in the GPL Version 2 section of the License file that
+   - accompanied this code. If applicable, add the following below the
+   - License Header, with the fields enclosed by brackets [] replaced by
+   - your own identifying information:
+   - "Portions Copyrighted [year] [name of copyright owner]"
+   -
+   - Contributor(s):
+   -
+   - The Original Software is NetBeans. The Initial Developer of the Original
+   - Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
+   - Microsystems, Inc. All Rights Reserved.
+   -
+   - If you wish your version of this file to be governed by only the CDDL
+   - or only the GPL Version 2, indicate your decision by adding
+   - "[Contributor] elects to include this software in this distribution
+   - under the [CDDL or GPL Version 2] license." If you do not indicate a
+   - single choice of license, a recipient has the option to distribute
+   - your version of this file under either the CDDL, the GPL Version 2 or
+   - to extend the choice of license to its licensees as provided above.
+   - However, if you add GPL Version 2 code and therefore, elected the GPL
+   - Version 2 license, then the option applies only if the new code is
+   - made subject to such option by the copyright holder.
+  -->
+  
 <HTML>
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
diff -r b7c1c51ac6f9 -r 147c8984ddd2 src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/resources/samples/pi_ja.html
--- 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
+++ 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
@@ -1,9 +1,44 @@
- <!--
- - Copyright 2006-2007 Sun Microsystems, Inc. All rights reserved.
- - SUN PROPRIETARY/CONFIDENTIAL.
- - Use is subject to license terms.
- -->
-
+<!--
+   - DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+   -
+   - Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
+   -
+   - The contents of this file are subject to the terms of either the GNU
+   - General Public License Version 2 only ("GPL") or the Common
+   - Development and Distribution License("CDDL") (collectively, the
+   - "License"). You may not use this file except in compliance with the
+   - License. You can obtain a copy of the License at
+   - http://www.netbeans.org/cddl-gplv2.html
+   - or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+   - specific language governing permissions and limitations under the
+   - License.  When distributing the software, include this License Header
+   - Notice in each file and include the License file at
+   - nbbuild/licenses/CDDL-GPL-2-CP.  Sun designates this
+   - particular file as subject to the "Classpath" exception as provided
+   - by Sun in the GPL Version 2 section of the License file that
+   - accompanied this code. If applicable, add the following below the
+   - License Header, with the fields enclosed by brackets [] replaced by
+   - your own identifying information:
+   - "Portions Copyrighted [year] [name of copyright owner]"
+   -
+   - Contributor(s):
+   -
+   - The Original Software is NetBeans. The Initial Developer of the Original
+   - Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
+   - Microsystems, Inc. All Rights Reserved.
+   -
+   - If you wish your version of this file to be governed by only the CDDL
+   - or only the GPL Version 2, indicate your decision by adding
+   - "[Contributor] elects to include this software in this distribution
+   - under the [CDDL or GPL Version 2] license." If you do not indicate a
+   - single choice of license, a recipient has the option to distribute
+   - your version of this file under either the CDDL, the GPL Version 2 or
+   - to extend the choice of license to its licensees as provided above.
+   - However, if you add GPL Version 2 code and therefore, elected the GPL
+   - Version 2 license, then the option applies only if the new code is
+   - made subject to such option by the copyright holder.
+  -->
+  
 <HTML>
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
diff -r b7c1c51ac6f9 -r 147c8984ddd2 src/ja/cnd/cnd-modelui/cnd-modelui/org/netbeans/modules/cnd/modelui/actions/Bundle_ja.properties
--- 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
+++ 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
@@ -37,4 +37,5 @@
 CTL_ReparseProject=\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u3092\u518d\u89e3\u6790
 CTL_ReparseProjects={0}\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u3092\u518d\u89e3\u6790
 CTL_CodeModelDiagnostic=C/C++\u30b3\u30fc\u30c9\u30fb\u30e2\u30c7\u30eb\u8a3a\u65ad\u3092\u30c0\u30f3\u30d7
+CTL_ForceReparseProject=C/C++\u30ad\u30e3\u30c3\u30b7\u30e5\u3092\u6d88\u53bb\u3057\u3066IDE\u3092\u518d\u8d77\u52d5
 
diff -r b7c1c51ac6f9 -r 147c8984ddd2 src/ja/cnd/cnd-modelutil/cnd-modelutil/org/netbeans/modules/cnd/modelutil/resources/Bundle_ja.properties
--- 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
+++ 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
@@ -44,8 +44,14 @@
 cc-highlighting-macros-system=\u4e8b\u524d\u5b9a\u7fa9\u30de\u30af\u30ed
 cc-highlighting-macros-user=\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u306e\u30de\u30af\u30ed\u5b9a\u7fa9
 cc-highlighting-class-fields=\u30d5\u30a3\u30fc\u30eb\u30c9
-cc-highlighting-typedefs=typedef
+cc-highlighting-typedefs=Typedef
 cc-highlighting-unused-variables=\u672a\u4f7f\u7528\u306e\u5909\u6570
 cc-highlighting-function=\u95a2\u6570\u5ba3\u8a00
-cc-highlighting-function-usage=\u95a2\u6570\u306e\u4f7f\u7528\u6cd5
+cc-highlighting-function-usage=\u95a2\u6570\u306e\u4f7f\u7528\u72b6\u6cc1
+cc-highlighting-enum=\u5217\u6319\u5ba3\u8a00
+cc-highlighting-enum-usage=\u5217\u6319\u306e\u4f7f\u7528\u72b6\u6cc1
+cc-highlighting-enumerator=\u5217\u6319\u5b50\u5ba3\u8a00
+cc-highlighting-enumerator-usage=\u5217\u6319\u5b50\u306e\u4f7f\u7528\u72b6\u6cc1
+cc-highlighting-class=\u30af\u30e9\u30b9\u5ba3\u8a00
+cc-highlighting-class-usage=\u30af\u30e9\u30b9\u306e\u4f7f\u7528\u72b6\u6cc1
 
diff -r b7c1c51ac6f9 -r 147c8984ddd2 src/ja/cnd/cnd-refactoring/cnd-refactoring/org/netbeans/modules/cnd/refactoring/plugins/Bundle_ja.properties
--- 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
+++ 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
@@ -266,6 +266,9 @@
 #Find Usages Filters
 TXT_Filter_Comments=\u30b3\u30e1\u30f3\u30c8\u30fb\u30d5\u30a3\u30eb\u30bf
 TXT_Filter_DeadCode=\u30c7\u30c3\u30c9\u30fb\u30b3\u30fc\u30c9\u30fb\u30d5\u30a3\u30eb\u30bf
+TXT_Filter_Read=\u6392\u4ed6\u7684\u8aad\u53d6\u308a\u30d5\u30a3\u30eb\u30bf
+TXT_Filter_Write=\u6392\u4ed6\u7684\u66f8\u8fbc\u307f\u30d5\u30a3\u30eb\u30bf
+TXT_Filter_ReadWrite=\u8aad\u53d6\u308a/\u66f8\u8fbc\u307f\u30d5\u30a3\u30eb\u30bf
 TXT_Filter_Declarations=\u5ba3\u8a00\u3068\u5b9a\u7fa9\u306e\u30d5\u30a3\u30eb\u30bf
 TXT_Filter_Macros=\u30de\u30af\u30ed\u30fb\u30d5\u30a3\u30eb\u30bf
 TXT_Filter_Scope=\u4fee\u98fe\u540d\u30d5\u30a3\u30eb\u30bf\u5185\u306e\u30af\u30e9\u30b9\u540d
diff -r b7c1c51ac6f9 -r 147c8984ddd2 src/ja/cnd/cnd-toolchain-ui/cnd-toolchain-ui/org/netbeans/modules/cnd/api/toolchain/ui/Bundle_ja.properties
--- 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
+++ 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
@@ -56,7 +56,7 @@
 
 MODIFY_PATH_VARIABLE=\u30d1\u30b9\u5909\u6570
 
-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
+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
 
 PathEnvVariables.toolsVariableTextField.text=TOOLS_PATH
 PathEnvVariables.utilitiesVariableTextField.text=UTILITIES_PATH
diff -r b7c1c51ac6f9 -r 147c8984ddd2 src/ja/cnd/org-netbeans-libs-clank/ext/org-clang-analysis/org/clang/analysis/resources/Bundle_ja.properties
--- 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
+++ 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
@@ -1,4 +1,4 @@
 OpenIDE-Module-Long-Description=clang/Analysis
-OpenIDE-Module-Name=Clank clang/Analysis
+OpenIDE-Module-Name=Clank clang/Analysis (3.9 NO_BODY)
 OpenIDE-Module-Short-Description=clang/Analysis
 
diff -r b7c1c51ac6f9 -r 147c8984ddd2 src/ja/cnd/org-netbeans-libs-clank/ext/org-clang-ast/org/clang/ast/resources/Bundle_ja.properties
--- 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
+++ 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
@@ -1,4 +1,4 @@
 OpenIDE-Module-Long-Description=clang/AST
-OpenIDE-Module-Name=Clank clang/AST
+OpenIDE-Module-Name=Clank clang/AST (3.9 NO_BODY)
 OpenIDE-Module-Short-Description=clang/AST
 
diff -r b7c1c51ac6f9 -r 147c8984ddd2 src/ja/cnd/org-netbeans-libs-clank/ext/org-clang-astmatchers/org/clang/astmatchers/resources/Bundle_ja.properties
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ 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
@@ -0,0 +1,2 @@
+OpenIDE-Module-Name=Clank clang/ASTMatchers (3.9 NO_BODY)
+
diff -r b7c1c51ac6f9 -r 147c8984ddd2 src/ja/cnd/org-netbeans-libs-clank/ext/org-clang-basic/org/clang/basic/resources/Bundle_ja.properties
--- 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
+++ 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
@@ -1,4 +1,4 @@
 OpenIDE-Module-Long-Description=clang/Basic
-OpenIDE-Module-Name=Clank clang/Basic
+OpenIDE-Module-Name=Clank clang/Basic (3.9 DONE)
 OpenIDE-Module-Short-Description=clang/Basic
 
diff -r b7c1c51ac6f9 -r 147c8984ddd2 src/ja/cnd/org-netbeans-libs-clank/ext/org-clang-clangc/org/clang/clangc/resources/Bundle_ja.properties
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ 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
@@ -0,0 +1,2 @@
+OpenIDE-Module-Name=Clank clang/Clang-C (libClang API) (3.9 DONE)
+
diff -r b7c1c51ac6f9 -r 147c8984ddd2 src/ja/cnd/org-netbeans-libs-clank/ext/org-clang-driver/org/clang/driver/resources/Bundle_ja.properties
--- 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
+++ 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
@@ -1,4 +1,4 @@
 OpenIDE-Module-Long-Description=clang/Driver
-OpenIDE-Module-Name=Clank clang/Driver
+OpenIDE-Module-Name=Clank clang/Driver (3.9 DONE)
 OpenIDE-Module-Short-Description=clang/Driver
 
diff -r b7c1c51ac6f9 -r 147c8984ddd2 src/ja/cnd/org-netbeans-libs-clank/ext/org-clang-edit/org/clang/edit/Bundle_ja.properties
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ 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
@@ -0,0 +1,4 @@
+OpenIDE-Module-Long-Description=clang/Edit
+OpenIDE-Module-Name=Clank clang/Edit (3.9 DONE)
+OpenIDE-Module-Short-Description=clang/Edit
+
diff -r b7c1c51ac6f9 -r 147c8984ddd2 src/ja/cnd/org-netbeans-libs-clank/ext/org-clang-format/org/clang/format/resources/Bundle_ja.properties
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ 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
@@ -0,0 +1,2 @@
+OpenIDE-Module-Name=Clank clang/Format (3.9 NO_BODY)
+
diff -r b7c1c51ac6f9 -r 147c8984ddd2 src/ja/cnd/org-netbeans-libs-clank/ext/org-clang-frontend/org/clang/frontend/resources/Bundle_ja.properties
--- 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
+++ 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
@@ -1,4 +1,4 @@
 OpenIDE-Module-Long-Description=clang/Frontend
-OpenIDE-Module-Name=Clank clang/Frontend
+OpenIDE-Module-Name=Clank clang/Frontend (3.9 DONE)
 OpenIDE-Module-Short-Description=clang/Frontend
 
diff -r b7c1c51ac6f9 -r 147c8984ddd2 src/ja/cnd/org-netbeans-libs-clank/ext/org-clang-frontendtool/org/clang/frontendtool/resources/Bundle_ja.properties
--- 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
+++ 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
@@ -1,4 +1,4 @@
 OpenIDE-Module-Long-Description=clang/FrontendTool
-OpenIDE-Module-Name=Clank clang/FrontendTool
+OpenIDE-Module-Name=Clank clang/FrontendTool (3.9 DONE)
 OpenIDE-Module-Short-Description=clang/FrontendTool
 
diff -r b7c1c51ac6f9 -r 147c8984ddd2 src/ja/cnd/org-netbeans-libs-clank/ext/org-clang-index/org/clang/index/resources/Bundle_ja.properties
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ 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
@@ -0,0 +1,2 @@
+OpenIDE-Module-Name=Clank clang/Index
+
diff -r b7c1c51ac6f9 -r 147c8984ddd2 src/ja/cnd/org-netbeans-libs-clank/ext/org-clang-lex/org/clang/lex/resources/Bundle_ja.properties
--- 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
+++ 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
@@ -1,4 +1,4 @@
 OpenIDE-Module-Long-Description=clang/Lex
-OpenIDE-Module-Name=Clank clang/Lex
+OpenIDE-Module-Name=Clank clang/Lex (3.9 DONE)
 OpenIDE-Module-Short-Description=clang/Lex
 
diff -r b7c1c51ac6f9 -r 147c8984ddd2 src/ja/cnd/org-netbeans-libs-clank/ext/org-clang-parse/org/clang/parse/resources/Bundle_ja.properties
--- 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
+++ 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
@@ -1,4 +1,4 @@
 OpenIDE-Module-Long-Description=clang/Parse
-OpenIDE-Module-Name=Clank clang/Parse
+OpenIDE-Module-Name=Clank clang/Parse (3.9 DOING BODY)
 OpenIDE-Module-Short-Description=clang/Parse
 
diff -r b7c1c51ac6f9 -r 147c8984ddd2 src/ja/cnd/org-netbeans-libs-clank/ext/org-clang-rewrite/org/clang/rewrite/resources/Bundle_ja.properties
--- 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
+++ 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
@@ -1,2 +1,2 @@
-OpenIDE-Module-Name=Clank clang/Rewrite
+OpenIDE-Module-Name=Clank clang/Rewrite (3.9 DONE)
 
diff -r b7c1c51ac6f9 -r 147c8984ddd2 src/ja/cnd/org-netbeans-libs-clank/ext/org-clang-sema/org/clang/sema/resources/Bundle_ja.properties
--- 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
+++ 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
@@ -1,4 +1,4 @@
 OpenIDE-Module-Long-Description=clang/Sema
-OpenIDE-Module-Name=Clank clang/Sema
+OpenIDE-Module-Name=Clank clang/Sema (3.9 NO_BODY)
 OpenIDE-Module-Short-Description=clang/Sema
 
diff -r b7c1c51ac6f9 -r 147c8984ddd2 src/ja/cnd/org-netbeans-libs-clank/ext/org-clang-serialization/org/clang/serialization/resources/Bundle_ja.properties
--- 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
+++ 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
@@ -1,4 +1,4 @@
 OpenIDE-Module-Long-Description=clang/Serialization
-OpenIDE-Module-Name=Clank clang/Serialization
+OpenIDE-Module-Name=Clank clang/Serialization (3.9 NO_BODY)
 OpenIDE-Module-Short-Description=clang/Serialization
 
diff -r b7c1c51ac6f9 -r 147c8984ddd2 src/ja/cnd/org-netbeans-libs-clank/ext/org-clang-tidy/org/clang/tidy/resources/Bundle_ja.properties
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ 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
@@ -0,0 +1,2 @@
+OpenIDE-Module-Name=Clank clang/Tidy
+
diff -r b7c1c51ac6f9 -r 147c8984ddd2 src/ja/cnd/org-netbeans-libs-clank/ext/org-clang-tooling/org/clang/tooling/resources/Bundle_ja.properties
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ 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
@@ -0,0 +1,2 @@
+OpenIDE-Module-Name=Clank clang/Tooling (3.9 NO_BODY)
+
diff -r b7c1c51ac6f9 -r 147c8984ddd2 src/ja/cnd/org-netbeans-libs-clank/ext/org-clang-tools-driver/org/clang/tools/driver/resources/Bundle_ja.properties
--- 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
+++ 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
@@ -1,3 +1,3 @@
-OpenIDE-Module-Name=Clank clang/tools/driver
+OpenIDE-Module-Name=Clank clang/tools/driver (3.9 DONE)
 OpenIDE-Module-Short-Description=clang/tools/driver
 
diff -r b7c1c51ac6f9 -r 147c8984ddd2 src/ja/cnd/org-netbeans-libs-clank/ext/org-clang-tools-services/org/clang/tools/services/resources/Bundle_ja.properties
--- 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
+++ 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
@@ -1,2 +1,2 @@
-OpenIDE-Module-Name=Clank clang\u30d9\u30fc\u30b9\u306e\u30b5\u30fc\u30d3\u30b9
+OpenIDE-Module-Name=Clank clang\u30d9\u30fc\u30b9\u306e\u30b5\u30fc\u30d3\u30b9(JAVA)
 
diff -r b7c1c51ac6f9 -r 147c8984ddd2 src/ja/cnd/org-netbeans-libs-clank/ext/org-clank-java/org/clank/java/resources/Bundle_ja.properties
--- 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
+++ 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
@@ -1,4 +1,4 @@
 OpenIDE-Module-Long-Description=C\u69cb\u9020\u7528Java\u30af\u30e9\u30b9
-OpenIDE-Module-Name=Java\u3067\u306eClank C\u30e9\u30c3\u30d1\u30fc
+OpenIDE-Module-Name=Java\u3067\u306eClank C\u30e9\u30c3\u30d1\u30fc(JAVA)
 OpenIDE-Module-Short-Description=C\u69cb\u9020\u7528Java\u30af\u30e9\u30b9
 
diff -r b7c1c51ac6f9 -r 147c8984ddd2 src/ja/cnd/org-netbeans-libs-clank/ext/org-llvm-adtsupport/org/llvm/adtsupport/resources/Bundle_ja.properties
--- 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
+++ 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
@@ -1,4 +1,4 @@
 OpenIDE-Module-Long-Description=llvm/ADT\u3001llvm/Support\u3001llvm/MC
-OpenIDE-Module-Name=Clank llvm ADT/Support/MC
+OpenIDE-Module-Name=Clank llvm ADT/Support/MC (3.9/3.8/3.6/3.4 ON DEMAND)
 OpenIDE-Module-Short-Description=llvm ADT\u3001Support\u3001MC
 
diff -r b7c1c51ac6f9 -r 147c8984ddd2 src/ja/cnd/org-netbeans-libs-clank/ext/org-llvm-bitcode/org/llvm/bitcode/resources/Bundle_ja.properties
--- 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
+++ 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
@@ -1,2 +1,2 @@
-OpenIDE-Module-Name=Clank llvm/Bitcode
+OpenIDE-Module-Name=Clank llvm/Bitcode (3.9 NO_BODY)
 
diff -r b7c1c51ac6f9 -r 147c8984ddd2 src/ja/cnd/org-netbeans-libs-clank/ext/org-llvm-ir/org/llvm/ir/resources/Bundle_ja.properties
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ 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
@@ -0,0 +1,2 @@
+OpenIDE-Module-Name=Clank llvm/IR
+
diff -r b7c1c51ac6f9 -r 147c8984ddd2 src/ja/cnd/org-netbeans-libs-clank/ext/org-llvm-linker/org/llvm/linker/resources/Bundle_ja.properties
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ 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
@@ -0,0 +1,2 @@
+OpenIDE-Module-Name=Clank llvm/Linker
+
diff -r b7c1c51ac6f9 -r 147c8984ddd2 src/ja/cnd/org-netbeans-libs-clank/ext/org-llvm-option/org/llvm/option/resources/Bundle_ja.properties
--- 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
+++ 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
@@ -1,4 +1,4 @@
 OpenIDE-Module-Long-Description=llvm/Option
-OpenIDE-Module-Name=Clank llvm/Option
+OpenIDE-Module-Name=Clank llvm/Option (3.9 DONE)
 OpenIDE-Module-Short-Description=llvm/Option
 
diff -r b7c1c51ac6f9 -r 147c8984ddd2 src/ja/cnd/org-netbeans-libs-clank/ext/org-llvm-passes/org/llvm/passes/resources/Bundle_ja.properties
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ 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
@@ -0,0 +1,2 @@
+OpenIDE-Module-Name=Clank llvm/Passes
+
diff -r b7c1c51ac6f9 -r 147c8984ddd2 src/ja/cnd/org-netbeans-libs-clank/ext/org-llvm-profiledata/org/llvm/profiledata/resources/Bundle_ja.properties
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ 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
@@ -0,0 +1,2 @@
+OpenIDE-Module-Name=Clank llvm/ProfileData
+
diff -r b7c1c51ac6f9 -r 147c8984ddd2 src/ja/cnd/org-netbeans-libs-clank/ext/org-llvm-target/org/llvm/target/resources/Bundle_ja.properties
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ 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
@@ -0,0 +1,2 @@
+OpenIDE-Module-Name=Clank llvm/Target
+
diff -r b7c1c51ac6f9 -r 147c8984ddd2 src/ja/cnd/org-netbeans-libs-clank/ext/org-llvm/org/llvm/resources/Bundle_ja.properties
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ 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
@@ -0,0 +1,2 @@
+OpenIDE-Module-Name=Clank llvm/LLVM
+
diff -r b7c1c51ac6f9 -r 147c8984ddd2 src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-makeproject-ui-resources-samples-fractal_ja.html
--- 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
+++ 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
@@ -1,9 +1,44 @@
- <!--
- - Copyright 2006-2007 Sun Microsystems, Inc. All rights reserved.
- - SUN PROPRIETARY/CONFIDENTIAL.
- - Use is subject to license terms.
- -->
-
+<!--
+   - DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+   -
+   - Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
+   -
+   - The contents of this file are subject to the terms of either the GNU
+   - General Public License Version 2 only ("GPL") or the Common
+   - Development and Distribution License("CDDL") (collectively, the
+   - "License"). You may not use this file except in compliance with the
+   - License. You can obtain a copy of the License at
+   - http://www.netbeans.org/cddl-gplv2.html
+   - or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+   - specific language governing permissions and limitations under the
+   - License.  When distributing the software, include this License Header
+   - Notice in each file and include the License file at
+   - nbbuild/licenses/CDDL-GPL-2-CP.  Sun designates this
+   - particular file as subject to the "Classpath" exception as provided
+   - by Sun in the GPL Version 2 section of the License file that
+   - accompanied this code. If applicable, add the following below the
+   - License Header, with the fields enclosed by brackets [] replaced by
+   - your own identifying information:
+   - "Portions Copyrighted [year] [name of copyright owner]"
+   -
+   - Contributor(s):
+   -
+   - The Original Software is NetBeans. The Initial Developer of the Original
+   - Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
+   - Microsystems, Inc. All Rights Reserved.
+   -
+   - If you wish your version of this file to be governed by only the CDDL
+   - or only the GPL Version 2, indicate your decision by adding
+   - "[Contributor] elects to include this software in this distribution
+   - under the [CDDL or GPL Version 2] license." If you do not indicate a
+   - single choice of license, a recipient has the option to distribute
+   - your version of this file under either the CDDL, the GPL Version 2 or
+   - to extend the choice of license to its licensees as provided above.
+   - However, if you add GPL Version 2 code and therefore, elected the GPL
+   - Version 2 license, then the option applies only if the new code is
+   - made subject to such option by the copyright holder.
+  -->
+  
 <HTML>
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
diff -r b7c1c51ac6f9 -r 147c8984ddd2 src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-makeproject-ui-resources-samples-hello_ja.html
--- 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
+++ 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
@@ -1,9 +1,44 @@
- <!--
- - Copyright 2006-2007 Sun Microsystems, Inc. All rights reserved.
- - SUN PROPRIETARY/CONFIDENTIAL.
- - Use is subject to license terms.
- -->
-
+<!--
+   - DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+   -
+   - Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
+   -
+   - The contents of this file are subject to the terms of either the GNU
+   - General Public License Version 2 only ("GPL") or the Common
+   - Development and Distribution License("CDDL") (collectively, the
+   - "License"). You may not use this file except in compliance with the
+   - License. You can obtain a copy of the License at
+   - http://www.netbeans.org/cddl-gplv2.html
+   - or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+   - specific language governing permissions and limitations under the
+   - License.  When distributing the software, include this License Header
+   - Notice in each file and include the License file at
+   - nbbuild/licenses/CDDL-GPL-2-CP.  Sun designates this
+   - particular file as subject to the "Classpath" exception as provided
+   - by Sun in the GPL Version 2 section of the License file that
+   - accompanied this code. If applicable, add the following below the
+   - License Header, with the fields enclosed by brackets [] replaced by
+   - your own identifying information:
+   - "Portions Copyrighted [year] [name of copyright owner]"
+   -
+   - Contributor(s):
+   -
+   - The Original Software is NetBeans. The Initial Developer of the Original
+   - Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
+   - Microsystems, Inc. All Rights Reserved.
+   -
+   - If you wish your version of this file to be governed by only the CDDL
+   - or only the GPL Version 2, indicate your decision by adding
+   - "[Contributor] elects to include this software in this distribution
+   - under the [CDDL or GPL Version 2] license." If you do not indicate a
+   - single choice of license, a recipient has the option to distribute
+   - your version of this file under either the CDDL, the GPL Version 2 or
+   - to extend the choice of license to its licensees as provided above.
+   - However, if you add GPL Version 2 code and therefore, elected the GPL
+   - Version 2 license, then the option applies only if the new code is
+   - made subject to such option by the copyright holder.
+  -->
+  
 <HTML>
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
diff -r b7c1c51ac6f9 -r 147c8984ddd2 src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-makeproject-ui-resources-samples-lexyacc_ja.html
--- 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
+++ 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
@@ -1,9 +1,44 @@
- <!--
- - Copyright 2006-2007 Sun Microsystems, Inc. All rights reserved.
- - SUN PROPRIETARY/CONFIDENTIAL.
- - Use is subject to license terms.
- -->
-
+<!--
+   - DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+   -
+   - Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
+   -
+   - The contents of this file are subject to the terms of either the GNU
+   - General Public License Version 2 only ("GPL") or the Common
+   - Development and Distribution License("CDDL") (collectively, the
+   - "License"). You may not use this file except in compliance with the
+   - License. You can obtain a copy of the License at
+   - http://www.netbeans.org/cddl-gplv2.html
+   - or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+   - specific language governing permissions and limitations under the
+   - License.  When distributing the software, include this License Header
+   - Notice in each file and include the License file at
+   - nbbuild/licenses/CDDL-GPL-2-CP.  Sun designates this
+   - particular file as subject to the "Classpath" exception as provided
+   - by Sun in the GPL Version 2 section of the License file that
+   - accompanied this code. If applicable, add the following below the
+   - License Header, with the fields enclosed by brackets [] replaced by
+   - your own identifying information:
+   - "Portions Copyrighted [year] [name of copyright owner]"
+   -
+   - Contributor(s):
+   -
+   - The Original Software is NetBeans. The Initial Developer of the Original
+   - Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
+   - Microsystems, Inc. All Rights Reserved.
+   -
+   - If you wish your version of this file to be governed by only the CDDL
+   - or only the GPL Version 2, indicate your decision by adding
+   - "[Contributor] elects to include this software in this distribution
+   - under the [CDDL or GPL Version 2] license." If you do not indicate a
+   - single choice of license, a recipient has the option to distribute
+   - your version of this file under either the CDDL, the GPL Version 2 or
+   - to extend the choice of license to its licensees as provided above.
+   - However, if you add GPL Version 2 code and therefore, elected the GPL
+   - Version 2 license, then the option applies only if the new code is
+   - made subject to such option by the copyright holder.
+  -->
+  
 <HTML>
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
diff -r b7c1c51ac6f9 -r 147c8984ddd2 src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-makeproject-ui-resources-samples-pi_ja.html
--- 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
+++ 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
@@ -1,9 +1,44 @@
- <!--
- - Copyright 2006-2007 Sun Microsystems, Inc. All rights reserved.
- - SUN PROPRIETARY/CONFIDENTIAL.
- - Use is subject to license terms.
- -->
-
+<!--
+   - DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+   -
+   - Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
+   -
+   - The contents of this file are subject to the terms of either the GNU
+   - General Public License Version 2 only ("GPL") or the Common
+   - Development and Distribution License("CDDL") (collectively, the
+   - "License"). You may not use this file except in compliance with the
+   - License. You can obtain a copy of the License at
+   - http://www.netbeans.org/cddl-gplv2.html
+   - or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+   - specific language governing permissions and limitations under the
+   - License.  When distributing the software, include this License Header
+   - Notice in each file and include the License file at
+   - nbbuild/licenses/CDDL-GPL-2-CP.  Sun designates this
+   - particular file as subject to the "Classpath" exception as provided
+   - by Sun in the GPL Version 2 section of the License file that
+   - accompanied this code. If applicable, add the following below the
+   - License Header, with the fields enclosed by brackets [] replaced by
+   - your own identifying information:
+   - "Portions Copyrighted [year] [name of copyright owner]"
+   -
+   - Contributor(s):
+   -
+   - The Original Software is NetBeans. The Initial Developer of the Original
+   - Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
+   - Microsystems, Inc. All Rights Reserved.
+   -
+   - If you wish your version of this file to be governed by only the CDDL
+   - or only the GPL Version 2, indicate your decision by adding
+   - "[Contributor] elects to include this software in this distribution
+   - under the [CDDL or GPL Version 2] license." If you do not indicate a
+   - single choice of license, a recipient has the option to distribute
+   - your version of this file under either the CDDL, the GPL Version 2 or
+   - to extend the choice of license to its licensees as provided above.
+   - However, if you add GPL Version 2 code and therefore, elected the GPL
+   - Version 2 license, then the option applies only if the new code is
+   - made subject to such option by the copyright holder.
+  -->
+  
 <HTML>
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
diff -r b7c1c51ac6f9 -r 147c8984ddd2 src/ja/ide/dlight-nativeexecution/dlight-nativeexecution/org/netbeans/modules/nativeexecution/support/Bundle_ja.properties
--- a/src/ja/ide/dlight-nativeexecution/dlight-nativeexecution/org/netbeans/modules/nativeexecution/support/Bundle_ja.properties	Mon Dec 19 12:18:33 2016 +0100
+++ b/src/ja/ide/dlight-nativeexecution/dlight-nativeexecution/org/netbeans/modules/nativeexecution/support/Bundle_ja.properties	Tue Apr 17 14:14:23 2018 +0200
@@ -44,9 +44,8 @@
 USER_AUTH_CANCELED=\u30e6\u30fc\u30b6\u30fc\u306b\u3088\u3063\u3066SSH\u8a8d\u8a3c\u304c\u53d6\u308a\u6d88\u3055\u308c\u307e\u3057\u305f
 JSCHReceivedMessageIsTooLong.error.title=\u30db\u30b9\u30c8{0}\u3078\u306e\u63a5\u7d9a\u4e2d\u306b\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f
 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
-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
+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
 
-#TITLE_Message=From {0}:
 TITLE_Message_Ex={0}\u304b\u3089: {1}
 
 
diff -r b7c1c51ac6f9 -r 147c8984ddd2 src/ja/ide/dlight-nativeexecution/dlight-nativeexecution/org/netbeans/modules/nativeexecution/support/hostinfo/impl/Bundle_ja.properties
--- 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
+++ 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
@@ -40,5 +40,5 @@
 
 TITLE_PermissionDenied=\u4e00\u6642\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u306e\u4f7f\u7528\u306b\u5931\u6557\u3057\u307e\u3057\u305f
 SHORTMSG_PermissionDenied={1}({0})
-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
+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
 
diff -r b7c1c51ac6f9 -r 147c8984ddd2 src/ja/ide/docker-ui/docker-ui/org/netbeans/modules/docker/ui/build2/Bundle_ja.properties
--- 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
+++ 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
@@ -52,6 +52,13 @@
 BuildOptionsVisual.pullCheckBox.text=\u5e38\u306b\u6700\u65b0\u30d0\u30fc\u30b8\u30e7\u30f3\u306e\u30a4\u30e1\u30fc\u30b8\u3092\u30d7\u30eb(&A)
 BuildInstanceVisual.addButton.text=\u8ffd\u52a0(&A)...
 BuildInstanceVisual.instanceLabel.text=\u30a4\u30f3\u30b9\u30bf\u30f3\u30b9\u3092\u30d3\u30eb\u30c9(&I):
+BuildContextVisual.fileChooser.button=\u958b\u304f
+BuildContextVisual.fileChooser.dialogTitle=Docker\u30a4\u30e1\u30fc\u30b8\u30fb\u30b3\u30f3\u30c6\u30ad\u30b9\u30c8\u306e\u9078\u629e
+BuildOptionsVisual.jLabel1.text=\u30d3\u30eb\u30c9\u6642\u306e\u5909\u6570:
+BuildOptionsVisual.addVariableButton.text=\u8ffd\u52a0
+BuildOptionsVisual.deleteVariableButton.text=\u524a\u9664
+BuildOptionsVisual.buildargsTable.columnModel.title1=\u5024
+BuildOptionsVisual.buildargsTable.columnModel.title0=\u540d\u524d
 LBL_Build=\u30d3\u30eb\u30c9...
 LBL_BuildContext=\u30b3\u30f3\u30c6\u30ad\u30b9\u30c8\u3092\u30d3\u30eb\u30c9
 LBL_BuildImage=\u30a4\u30e1\u30fc\u30b8\u3092\u30d3\u30eb\u30c9
diff -r b7c1c51ac6f9 -r 147c8984ddd2 src/ja/ide/docker-ui/docker-ui/org/netbeans/modules/docker/ui/node/Bundle_ja.properties
--- 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
+++ 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
@@ -42,14 +42,17 @@
 
 Docker_Root_Node_Name=Docker
 Docker_Root_Node_Short_Description=IDE\u306b\u767b\u9332\u3055\u308c\u3066\u3044\u308bDocker\u30de\u30b7\u30f3
-
-
 LBL_AttachContainerAction=\u30a2\u30bf\u30c3\u30c1
 LBL_Containers=\u30b3\u30f3\u30c6\u30ca
 LBL_CopyIdAction=ID\u3092\u30b3\u30d4\u30fc
+LBL_GetPortMappingsAction=\u30dd\u30fc\u30c8\u30fb\u30d0\u30a4\u30f3\u30c7\u30a3\u30f3\u30b0\u306e\u8868\u793a
+LBL_HostAddress=\u30db\u30b9\u30c8\u30fb\u30a2\u30c9\u30ec\u30b9
+LBL_HostPort=\u30db\u30b9\u30c8\u30fb\u30dd\u30fc\u30c8
 # {0} - instance name
 LBL_Offline={0} [\u30aa\u30d5\u30e9\u30a4\u30f3]
 LBL_PauseContainerAction=\u4e00\u6642\u505c\u6b62
+LBL_Port=\u30dd\u30fc\u30c8
+LBL_PortBindings=\u30dd\u30fc\u30c8\u30fb\u30d0\u30a4\u30f3\u30c7\u30a3\u30f3\u30b0
 LBL_PushTagAction=\u30d7\u30c3\u30b7\u30e5...
 LBL_RefreshAction=\u30ea\u30d5\u30ec\u30c3\u30b7\u30e5
 LBL_RemoveContainerAction=\u9664\u53bb
@@ -59,12 +62,15 @@
 LBL_ShowLogAction=\u30ed\u30b0\u306e\u8868\u793a
 LBL_StartContainerAction=\u8d77\u52d5
 LBL_StopContainerAction=\u505c\u6b62
+LBL_Type=\u30bf\u30a4\u30d7
 LBL_UnpauseContainerAction=\u4e00\u6642\u505c\u6b62\u89e3\u9664
 # {0} - container id
 MSG_AttachingContainer=\u30b3\u30f3\u30c6\u30ca{0}\u306b\u30a2\u30bf\u30c3\u30c1\u4e2d
 MSG_CouldNotCopy=ID\u3092\u30b3\u30d4\u30fc\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f
 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
 # {0} - container id
+MSG_GettingPortMappings=\u30b3\u30f3\u30c6\u30ca{0}\u306e\u30dd\u30fc\u30c8\u30fb\u30d0\u30a4\u30f3\u30c7\u30a3\u30f3\u30b0\u3092\u53d6\u5f97\u4e2d
+# {0} - container id
 MSG_PausingContainer=\u30b3\u30f3\u30c6\u30ca{0}\u3092\u4e00\u6642\u505c\u6b62\u4e2d
 # {0} - image name
 MSG_Pushing={0}\u3092\u30d7\u30c3\u30b7\u30e5\u4e2d
diff -r b7c1c51ac6f9 -r 147c8984ddd2 src/ja/ide/docker-ui/docker-ui/org/netbeans/modules/docker/ui/run/Bundle_ja.properties
--- 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
+++ 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
@@ -69,4 +69,10 @@
 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)
 RunContainerPropertiesVisual.commandLabel.text=\u30b3\u30de\u30f3\u30c9(&C):
 RunContainerPropertiesVisual.userLabel.text=\u30e6\u30fc\u30b6\u30fc(&U):
+RunContainerPropertiesVisual.privilegedCheckBox.text=\u6a29\u9650\u30e2\u30fc\u30c9\u3067\u5b9f\u884c(&R)
+RunContainerPropertiesVisual.mountVolumesCheckBox.text=\u30dc\u30ea\u30e5\u30fc\u30e0\u306e\u30de\u30a6\u30f3\u30c8(&M)
+RunContainerPropertiesVisual.addButton.text=\u8ffd\u52a0(&A)
+RunContainerPropertiesVisual.deleteButton.text=\u524a\u9664(&D)
+RunContainerPropertiesVisual.volumesTable.columnModel.title1=\u30bd\u30fc\u30b9
+RunContainerPropertiesVisual.volumesTable.columnModel.title0=\u30bf\u30fc\u30b2\u30c3\u30c8
 
diff -r b7c1c51ac6f9 -r 147c8984ddd2 src/ja/ide/editor-indent/editor-indent/org/netbeans/modules/editor/indent/Bundle_ja.properties
--- a/src/ja/ide/editor-indent/editor-indent/org/netbeans/modules/editor/indent/Bundle_ja.properties	Mon Dec 19 12:18:33 2016 +0100
+++ b/src/ja/ide/editor-indent/editor-indent/org/netbeans/modules/editor/indent/Bundle_ja.properties	Tue Apr 17 14:14:23 2018 +0200
@@ -46,4 +46,3 @@
 OpenIDE-Module-Short-Description=\u30a4\u30f3\u30c7\u30f3\u30c8API\u304a\u3088\u3073SPI\u3092\u542b\u307f\u307e\u3059\u3002
 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
 
-
diff -r b7c1c51ac6f9 -r 147c8984ddd2 src/ja/ide/editor-lib/editor-lib/org/netbeans/modules/editor/lib/Bundle_ja.properties
--- a/src/ja/ide/editor-lib/editor-lib/org/netbeans/modules/editor/lib/Bundle_ja.properties	Mon Dec 19 12:18:33 2016 +0100
+++ b/src/ja/ide/editor-lib/editor-lib/org/netbeans/modules/editor/lib/Bundle_ja.properties	Tue Apr 17 14:14:23 2018 +0200
@@ -43,6 +43,6 @@
 OpenIDE-Module-Name=\u30a8\u30c7\u30a3\u30bf\u30fb\u30e9\u30a4\u30d6\u30e9\u30ea
 OpenIDE-Module-Display-Category=\u7de8\u96c6
 OpenIDE-Module-Short-Description=IDE\u304b\u3089\u72ec\u7acb\u3057\u305f\u30a8\u30c7\u30a3\u30bf\u6a5f\u80fd\u3092\u542b\u3080
-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
+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
 
 
diff -r b7c1c51ac6f9 -r 147c8984ddd2 src/ja/ide/editor-lib2/editor-lib2/org/netbeans/modules/editor/lib2/Bundle_ja.properties
--- a/src/ja/ide/editor-lib2/editor-lib2/org/netbeans/modules/editor/lib2/Bundle_ja.properties	Mon Dec 19 12:18:33 2016 +0100
+++ b/src/ja/ide/editor-lib2/editor-lib2/org/netbeans/modules/editor/lib2/Bundle_ja.properties	Tue Apr 17 14:14:23 2018 +0200
@@ -43,7 +43,7 @@
 OpenIDE-Module-Name=\u30a8\u30c7\u30a3\u30bf\u30fb\u30e9\u30a4\u30d6\u30e9\u30ea2
 OpenIDE-Module-Display-Category=\u7de8\u96c6
 OpenIDE-Module-Short-Description=\u30b3\u30a2\u30fb\u30a8\u30c7\u30a3\u30bfAPI\u304a\u3088\u3073SPI\u3092\u542b\u307f\u307e\u3059\u3002
-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
+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
 
 #DocUtils.debugPosition
 wrong_position=\u4f4d\u7f6e\u304c\u6b63\u3057\u304f\u3042\u308a\u307e\u305b\u3093
diff -r b7c1c51ac6f9 -r 147c8984ddd2 src/ja/ide/projectui/projectui/org/netbeans/modules/project/ui/zip/Bundle_ja.properties
--- a/src/ja/ide/projectui/projectui/org/netbeans/modules/project/ui/zip/Bundle_ja.properties	Mon Dec 19 12:18:33 2016 +0100
+++ b/src/ja/ide/projectui/projectui/org/netbeans/modules/project/ui/zip/Bundle_ja.properties	Tue Apr 17 14:14:23 2018 +0200
@@ -79,6 +79,10 @@
 MSG_created={0}\u3092\u4f5c\u6210\u3057\u307e\u3057\u305f
 # {0} - ZIP entry name
 MSG_creating={0}\u3092\u4f5c\u6210\u3057\u3066\u3044\u307e\u3059
+# {0} - unpacked file
+# {1} - folder
+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
+MSG_OutsideRootTitle=\u30a4\u30f3\u30dd\u30fc\u30c8\u30fb\u30d5\u30a9\u30eb\u30c0\u306e\u5916\u90e8\u306b\u3042\u308b\u30d5\u30a1\u30a4\u30eb
 # {0} - ZIP entry name
 MSG_packed=\u5727\u7e2e\u3057\u307e\u3057\u305f: {0}
 # {0} - subdirectory
diff -r b7c1c51ac6f9 -r 147c8984ddd2 src/ja/ide/web-common/web-common/org/netbeans/modules/web/common/Bundle_ja.properties
--- a/src/ja/ide/web-common/web-common/org/netbeans/modules/web/common/Bundle_ja.properties	Mon Dec 19 12:18:33 2016 +0100
+++ b/src/ja/ide/web-common/web-common/org/netbeans/modules/web/common/Bundle_ja.properties	Tue Apr 17 14:14:23 2018 +0200
@@ -41,6 +41,7 @@
 # made subject to such option by the copyright holder.
 
 OpenIDE-Module-Display-Category=Web
+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
 OpenIDE-Module-Name=Web\u5171\u901a
 OpenIDE-Module-Short-Description=\u69d8\u3005\u306a"Web\u95a2\u9023"\u5171\u901a\u6a5f\u80fd\u3092\u63d0\u4f9b\u3057\u307e\u3059
 
diff -r b7c1c51ac6f9 -r 147c8984ddd2 src/ja/other/installer/infra/build/web/js/start_strings_ja.js
--- a/src/ja/other/installer/infra/build/web/js/start_strings_ja.js	Mon Dec 19 12:18:33 2016 +0100
+++ b/src/ja/other/installer/infra/build/web/js/start_strings_ja.js	Tue Apr 17 14:14:23 2018 +0200
@@ -59,9 +59,9 @@
 var SUPPORT_LABEL        = "\u30b5\u30dd\u30fc\u30c8";
 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";
 
-// $PRODUCT_NAME $TYPE (Installer for $PLATFORM/Zip)/$Language ($Language_ID) $filename ($SIZE) MD5: $MD5
-var INFO_MESSAGE = "{0}{1} {2}/{3} ({4})<br>{5} ({6} MB)<br>MD5: {7}";
-var INFO_MESSAGE_OTHER = "{0} ({1} MB)<br>MD5: {2}";
+// $PRODUCT_NAME $TYPE (Installer for $PLATFORM/Zip)/$Language ($Language_ID) $filename ($SIZE) SHA-256: $MD5
+var INFO_MESSAGE = "{0}{1} {2}/{3} ({4})<br>{5} ({6} MB)<br>SHA-256: {7}";
+var INFO_MESSAGE_OTHER = "{0} ({1} MB)<br>SHA-256: {2}";
 
 //DO NOT TRANSLATE
 var SUBSCRIPTION_PHP_URL = "http://services.netbeans.org/sub.php";
diff -r b7c1c51ac6f9 -r 147c8984ddd2 src/ja/ruby/ruby-platform/ruby-platform/org/netbeans/modules/ruby/platform/execution/Bundle_ja.properties
--- 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
+++ 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
@@ -48,5 +48,5 @@
 
 # ExecutionService
 Running=\u5b9f\u884c\u4e2d
-#NOI18N_WILL_BE_REMOVED Uniquified={0} #{1}
 
+
diff -r b7c1c51ac6f9 -r 147c8984ddd2 src/ja/ruby/ruby-project/ruby-project/org/netbeans/modules/ruby/rubyproject/Bundle_ja.properties
--- a/src/ja/ruby/ruby-project/ruby-project/org/netbeans/modules/ruby/rubyproject/Bundle_ja.properties	Mon Dec 19 12:18:33 2016 +0100
+++ b/src/ja/ruby/ruby-project/ruby-project/org/netbeans/modules/ruby/rubyproject/Bundle_ja.properties	Tue Apr 17 14:14:23 2018 +0200
@@ -144,9 +144,9 @@
 RubyTestingOptionsPanel.autospec.text=AutoSpec
 RunFilePanel.platformLabel.text=Ruby \u30d7\u30e9\u30c3\u30c8\u30d5\u30a9\u30fc\u30e0(&P):
 RunFilePanel.runArgsLabel.text=\u5b9f\u884c\u5f15\u6570(&A):
-#NOI18N_WILL_BE_REMOVED RunFilePanel.runArgsField.text=
+
 RunFilePanel.jvmArgsLabel.text=JVM \u5f15\u6570(&V):
-#NOI18N_WILL_BE_REMOVED RunFilePanel.jvmArgsField.text=
+
 RunFilePanel.managePlatformsButton.text=\u7ba1\u7406(&M)
 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)
 
@@ -154,9 +154,9 @@
 DebugFile=\u30d5\u30a1\u30a4\u30eb "{0}" \u3092\u30c7\u30d0\u30c3\u30b0
 ACSD_RunFile=\u30d5\u30a1\u30a4\u30eb "{0}" \u306e\u5b9f\u884c\u30aa\u30d7\u30b7\u30e7\u30f3\u3092\u6307\u5b9a
 ACSD_DebugFile=\u30d5\u30a1\u30a4\u30eb "{0}" \u306e\u30c7\u30d0\u30c3\u30b0\u30aa\u30d7\u30b7\u30e7\u30f3\u3092\u6307\u5b9a
-#NOI18N_WILL_BE_REMOVED RunFilePanel.rubyOptionsField.text=
+
 RunFilePanel.rubyOptionsLabel.text=Ruby \u306e\u30aa\u30d7\u30b7\u30e7\u30f3(&I):
-#NOI18N_WILL_BE_REMOVED RunFilePanel.workDirField.text=
+
 RunFilePanel.workDirLabel.text=\u4f5c\u696d\u7528\u30c7\u30a3\u30ec\u30af\u30c8\u30ea(&W):
 AD_Options_StandardLogging=Ruby \u306e\u30ed\u30b0\u3092\u6709\u52b9\u5316
 AD_Options_DebuggerLogging=Ruby \u30c7\u30d0\u30c3\u30ac\u306e\u30ed\u30b0\u3092\u6709\u52b9\u5316
diff -r b7c1c51ac6f9 -r 147c8984ddd2 src/ja/ruby/ruby-project/ruby-project/org/netbeans/modules/ruby/rubyproject/rake/Bundle_ja.properties
--- 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
+++ 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
@@ -50,7 +50,7 @@
 RakeTaskChooser.debugCheckbox.text=\u30c7\u30d0\u30c3\u30b0(&D)
 RakeTaskChooser.matchingTaskLabel.text=\u4e00\u81f4\u3059\u308b\u30bf\u30b9\u30af(&M):
 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>
-#NOI18N_WILL_BE_REMOVED RakeTaskChooser.rakeTaskField.text=
+
 RakeTaskChooser.rakeTaskHint.text=(\u30bf\u30b9\u30af\u540d\u306e\u4e00\u90e8\u3001\u30ef\u30a4\u30eb\u30c9\u30ab\u30fc\u30c9: "?"\u3001"*")
 RakeTaskChooser.rakeTaskLabel.text=\u30d5\u30a3\u30eb\u30bf(&F):
 RakeTaskChooser.refreshButton.accessibleDescription=Rake \u30bf\u30b9\u30af\u3092\u66f4\u65b0
diff -r b7c1c51ac6f9 -r 147c8984ddd2 src/ja/ruby/ruby-project/ruby-project/org/netbeans/modules/ruby/rubyproject/ui/wizards/Bundle_ja.properties
--- 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
+++ 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
@@ -61,15 +61,15 @@
 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
 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
 
-#NOI18N
+
 #TXT_ClassName={0}/main.rb
 #TXT_ClassName=main.rb
 
-#NOI18N
+
 #TXT_PackageNameSuffix={0}pkg
 LAB_ConfigureProject=\u540d\u524d\u3068\u5834\u6240
 LAB_ConfigureSourceRoots=\u65e2\u5b58\u306e\u30bd\u30fc\u30b9
-#NOI18N_WILL_BE_REMOVED LAB_IteratorName={0} / {1}
+
 ERROR_IllegalMainClassName=\u4e3b\u30af\u30e9\u30b9\u540d\u304c\u4e0d\u6b63\u3067\u3059\u3002
 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
 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
@@ -93,13 +93,13 @@
 MSG_IllegalTests=\u30c6\u30b9\u30c8\u30d1\u30c3\u30b1\u30fc\u30b8\u30d5\u30a9\u30eb\u30c0 {0} \u304c\u5b58\u5728\u3057\u307e\u305b\u3093\u3002
 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
 
-#NOI18N
+
 #TXT_JavaApplication=RubyApplication{0}
 
-#NOI18N
+
 #TXT_JavaLibrary=RubyLibrary{0}
 
-#NOI18N
+
 #TXT_JavaProject=RubyProject{0}
 LBL_ProjectNameAndLocationLabel=\u65b0\u898f\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u306e\u540d\u524d\u3068\u5834\u6240\u3092\u6307\u5b9a\u3057\u307e\u3059\u3002
 CTL_SourceRoots=\u30bd\u30fc\u30b9\u30d5\u30a9\u30eb\u30c0:
diff -r b7c1c51ac6f9 -r 147c8984ddd2 src/ja/ruby/ruby-railsprojects/ruby-railsprojects/org/netbeans/modules/ruby/railsprojects/ui/wizards/Bundle_ja.properties
--- 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
+++ 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
@@ -82,7 +82,7 @@
 
 LAB_ConfigureProject=\u540d\u524d\u3068\u5834\u6240
 LAB_ConfigureDatabase=\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u69cb\u6210
-#NOI18N_WILL_BE_REMOVED LAB_IteratorName={0} / {1}
+
 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
 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
 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
@@ -97,7 +97,7 @@
 # (should not be an error in the future: see #42422)
 TXT_NetBeansProject=NetBeans \u30d7\u30ed\u30b8\u30a7\u30af\u30c8
 
-#NOI18N
+
 #TXT_RailsApplication=RailsApplication{0}
 LBL_ProjectNameAndLocationLabel=\u65e2\u5b58\u306e Rails \u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u306e\u540d\u524d\u3068\u5834\u6240\u3092\u6307\u5b9a
 # ACSN_jPanel1=N/A
@@ -111,7 +111,7 @@
 # ACSD_createdFolderLabel=N/A
 ACSN_jLabel4=\u65b0\u898f\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u306e\u540d\u524d\u3068\u5834\u6240\u3092\u6307\u5b9a\u3057\u307e\u3059\u3002
 # ACSD_jLabel4=N/A
-#NOI18N_WILL_BE_REMOVED ACSD_jPanel1=
+
 # ACSN_optionsContainer=N/A
 # ACSD_optionsContainer=N/A
 # ACSN_locationContainer=N/A
diff -r b7c1c51ac6f9 -r 147c8984ddd2 src/ja/ruby/ruby-refactoring/ruby-refactoring/org/netbeans/modules/refactoring/ruby/ui/Bundle_ja.properties
--- 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
+++ 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
@@ -55,7 +55,7 @@
 DSC_WhereUsedFindDirectSubTypes=<b>{0}</b> \u306e\u76f4\u63a5\u7684\u30b5\u30d6\u30bf\u30a4\u30d7\u3092\u691c\u7d22
 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
 DSC_WhereUsedOf=(<b>{0}</b>)
-#NOI18N_WILL_BE_REMOVED DSC_And=&
+
 LBL_EncapsulateFieldsAction=\u30d5\u30a3\u30fc\u30eb\u30c9\u3092\u30ab\u30d7\u30bb\u30eb\u5316(&F)...
 LBL_EncapsulateFields=\u30d5\u30a3\u30fc\u30eb\u30c9\u3092\u30ab\u30d7\u30bb\u30eb\u5316
 DSC_EncapsulateFields=\u30af\u30e9\u30b9 <b>{0}</b> \u5185\u306e\u30d5\u30a3\u30fc\u30eb\u30c9\u3092\u30ab\u30d7\u30bb\u30eb\u5316
@@ -233,7 +233,7 @@
 
 # --- GENERAL ------------------------------------------------------------------
 # "Selected" column label
-#NOI18N_WILL_BE_REMOVED LBL_Selected= 
+
 LBL_NotAvailable=&lt;\u306a\u3057&gt;
 
 # --- SAFE DELETE REFACTORING --------------------------------------------------
@@ -288,7 +288,7 @@
 # Supertype combobox label
 LBL_PullUp_Supertype=\u9001\u308a\u5148\u30b9\u30fc\u30d1\u30fc\u30bf\u30a4\u30d7(&S)\:
 # "Selected" column label
-#NOI18N_WILL_BE_REMOVED LBL_PullUp_Selected= 
+
 # "Member" column label
 LBL_PullUp_Member=\u30e1\u30f3\u30d0\u30fc
 # "Make Abstract" column label
@@ -340,7 +340,7 @@
 
 # *** Refactoring panel ***
 
-#NOI18N_WILL_BE_REMOVED LBL_DeclareFinal=
+
 LBL_CopyClass=\u30af\u30e9\u30b9\u3092\u30b3\u30d4\u30fc
 DSC_CopyClass=\u30af\u30e9\u30b9 <b>{0}</b> \u3092\u30b3\u30d4\u30fc
 
diff -r b7c1c51ac6f9 -r 147c8984ddd2 src/ja/ruby/ruby/ruby/org/netbeans/modules/ruby/Bundle_ja.properties
--- a/src/ja/ruby/ruby/ruby/org/netbeans/modules/ruby/Bundle_ja.properties	Mon Dec 19 12:18:33 2016 +0100
+++ b/src/ja/ruby/ruby/ruby/org/netbeans/modules/ruby/Bundle_ja.properties	Tue Apr 17 14:14:23 2018 +0200
@@ -266,9 +266,6 @@
 
 InstalledVersions=\u30a4\u30f3\u30b9\u30c8\u30fc\u30eb\u3055\u308c\u3066\u3044\u308b\u30d0\u30fc\u30b8\u30e7\u30f3: {0}
 
-# HTTP status codes for code completion,
-# 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
-
 SC_100=100 (\u7d99\u7d9a)
 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
 SC_101=101 (\u30d7\u30ed\u30c8\u30b3\u30eb\u5207\u308a\u66ff\u3048)
diff -r b7c1c51ac6f9 -r 147c8984ddd2 src/ko/other/installer/infra/build/web/js/start_strings_ko.js
--- a/src/ko/other/installer/infra/build/web/js/start_strings_ko.js	Mon Dec 19 12:18:33 2016 +0100
+++ b/src/ko/other/installer/infra/build/web/js/start_strings_ko.js	Tue Apr 17 14:14:23 2018 +0200
@@ -59,9 +59,9 @@
 var SUPPORT_LABEL        = "Support";
 var SUPPORT_DESCRIPTION  = "Flexible support options to help you stay focused on innovation.";
 
-// $PRODUCT_NAME $TYPE (Installer for $PLATFORM/Zip)/$Language ($Language_ID) $filename ($SIZE) MD5: $MD5
-var INFO_MESSAGE = "{0}{1} {2}/{3} ({4})<br>{5} ({6} MB)<br>MD5: {7}";
-var INFO_MESSAGE_OTHER = "{0} ({1} MB)<br>MD5: {2}";
+// $PRODUCT_NAME $TYPE (Installer for $PLATFORM/Zip)/$Language ($Language_ID) $filename ($SIZE) SHA-256: $MD5
+var INFO_MESSAGE = "{0}{1} {2}/{3} ({4})<br>{5} ({6} MB)<br>SHA-256: {7}";
+var INFO_MESSAGE_OTHER = "{0} ({1} MB)<br>SHA-256: {2}";
 
 //DO NOT TRANSLATE
 var SUBSCRIPTION_PHP_URL = "http://services.netbeans.org/sub.php";
diff -r b7c1c51ac6f9 -r 147c8984ddd2 src/lt/other/installer/infra/build/web/js/start_strings_lt.js
--- a/src/lt/other/installer/infra/build/web/js/start_strings_lt.js	Mon Dec 19 12:18:33 2016 +0100
+++ b/src/lt/other/installer/infra/build/web/js/start_strings_lt.js	Tue Apr 17 14:14:23 2018 +0200
@@ -59,9 +59,9 @@
 var SUPPORT_LABEL        = "Support";
 var SUPPORT_DESCRIPTION  = "Flexible support options to help you stay focused on innovation.";
 
-// $PRODUCT_NAME $TYPE (Installer for $PLATFORM/Zip)/$Language ($Language_ID) $filename ($SIZE) MD5: $MD5
-var INFO_MESSAGE = "{0}{1} {2}/{3} ({4})<br>{5} ({6} MB)<br>MD5: {7}";
-var INFO_MESSAGE_OTHER = "{0} ({1} MB)<br>MD5: {2}";
+// $PRODUCT_NAME $TYPE (Installer for $PLATFORM/Zip)/$Language ($Language_ID) $filename ($SIZE) SHA-256: $MD5
+var INFO_MESSAGE = "{0}{1} {2}/{3} ({4})<br>{5} ({6} MB)<br>SHA-256: {7}";
+var INFO_MESSAGE_OTHER = "{0} ({1} MB)<br>SHA-256: {2}";
 
 //DO NOT TRANSLATE
 var SUBSCRIPTION_PHP_URL = "http://services.netbeans.org/sub.php";
diff -r b7c1c51ac6f9 -r 147c8984ddd2 src/nl_BE/other/installer/infra/build/web/js/start_strings_nl_BE.js
--- a/src/nl_BE/other/installer/infra/build/web/js/start_strings_nl_BE.js	Mon Dec 19 12:18:33 2016 +0100
+++ b/src/nl_BE/other/installer/infra/build/web/js/start_strings_nl_BE.js	Tue Apr 17 14:14:23 2018 +0200
@@ -59,9 +59,9 @@
 var SUPPORT_LABEL        = "Support";
 var SUPPORT_DESCRIPTION  = "Flexible support options to help you stay focused on innovation.";
 
-// $PRODUCT_NAME $TYPE (Installer for $PLATFORM/Zip)/$Language ($Language_ID) $filename ($SIZE) MD5: $MD5
-var INFO_MESSAGE = "{0}{1} {2}/{3} ({4})<br>{5} ({6} MB)<br>MD5: {7}";
-var INFO_MESSAGE_OTHER = "{0} ({1} MB)<br>MD5: {2}";
+// $PRODUCT_NAME $TYPE (Installer for $PLATFORM/Zip)/$Language ($Language_ID) $filename ($SIZE) SHA-256: $MD5
+var INFO_MESSAGE = "{0}{1} {2}/{3} ({4})<br>{5} ({6} MB)<br>SHA-256: {7}";
+var INFO_MESSAGE_OTHER = "{0} ({1} MB)<br>SHA-256: {2}";
 
 //DO NOT TRANSLATE
 var SUBSCRIPTION_PHP_URL = "http://services.netbeans.org/sub.php";
diff -r b7c1c51ac6f9 -r 147c8984ddd2 src/nl_NL/other/installer/infra/build/web/js/start_strings_nl_NL.js
--- a/src/nl_NL/other/installer/infra/build/web/js/start_strings_nl_NL.js	Mon Dec 19 12:18:33 2016 +0100
+++ b/src/nl_NL/other/installer/infra/build/web/js/start_strings_nl_NL.js	Tue Apr 17 14:14:23 2018 +0200
@@ -59,9 +59,9 @@
 var SUPPORT_LABEL        = "Support";
 var SUPPORT_DESCRIPTION  = "Flexible support options to help you stay focused on innovation.";
 
-// $PRODUCT_NAME $TYPE (Installer for $PLATFORM/Zip)/$Language ($Language_ID) $filename ($SIZE) MD5: $MD5
-var INFO_MESSAGE = "{0}{1} {2}/{3} ({4})<br>{5} ({6} MB)<br>MD5: {7}";
-var INFO_MESSAGE_OTHER = "{0} ({1} MB)<br>MD5: {2}";
+// $PRODUCT_NAME $TYPE (Installer for $PLATFORM/Zip)/$Language ($Language_ID) $filename ($SIZE) SHA-256: $MD5
+var INFO_MESSAGE = "{0}{1} {2}/{3} ({4})<br>{5} ({6} MB)<br>SHA-256: {7}";
+var INFO_MESSAGE_OTHER = "{0} ({1} MB)<br>SHA-256: {2}";
 
 //DO NOT TRANSLATE
 var SUBSCRIPTION_PHP_URL = "http://services.netbeans.org/sub.php";
diff -r b7c1c51ac6f9 -r 147c8984ddd2 src/pl/other/installer/infra/build/web/js/start_strings_pl.js
--- a/src/pl/other/installer/infra/build/web/js/start_strings_pl.js	Mon Dec 19 12:18:33 2016 +0100
+++ b/src/pl/other/installer/infra/build/web/js/start_strings_pl.js	Tue Apr 17 14:14:23 2018 +0200
@@ -59,9 +59,9 @@
 var SUPPORT_LABEL        = "Support";
 var SUPPORT_DESCRIPTION  = "Flexible support options to help you stay focused on innovation.";
 
-// $PRODUCT_NAME $TYPE (Installer for $PLATFORM/Zip)/$Language ($Language_ID) $filename ($SIZE) MD5: $MD5
-var INFO_MESSAGE = "{0}{1} {2}/{3} ({4})<br>{5} ({6} MB)<br>MD5: {7}";
-var INFO_MESSAGE_OTHER = "{0} ({1} MB)<br>MD5: {2}";
+// $PRODUCT_NAME $TYPE (Installer for $PLATFORM/Zip)/$Language ($Language_ID) $filename ($SIZE) SHA-256: $MD5
+var INFO_MESSAGE = "{0}{1} {2}/{3} ({4})<br>{5} ({6} MB)<br>SHA-256: {7}";
+var INFO_MESSAGE_OTHER = "{0} ({1} MB)<br>SHA-256: {2}";
 
 //DO NOT TRANSLATE
 var SUBSCRIPTION_PHP_URL = "http://services.netbeans.org/sub.php";
diff -r b7c1c51ac6f9 -r 147c8984ddd2 src/pt_BR/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/resources/samples/fractal_pt_BR.html
--- 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
+++ 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
@@ -1,9 +1,44 @@
- <!--
- - Copyright 2006-2007 Sun Microsystems, Inc. All rights reserved.
- - SUN PROPRIETARY/CONFIDENTIAL.
- - Use is subject to license terms.
- -->
-
+<!--
+   - DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+   -
+   - Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
+   -
+   - The contents of this file are subject to the terms of either the GNU
+   - General Public License Version 2 only ("GPL") or the Common
+   - Development and Distribution License("CDDL") (collectively, the
+   - "License"). You may not use this file except in compliance with the
+   - License. You can obtain a copy of the License at
+   - http://www.netbeans.org/cddl-gplv2.html
+   - or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+   - specific language governing permissions and limitations under the
+   - License.  When distributing the software, include this License Header
+   - Notice in each file and include the License file at
+   - nbbuild/licenses/CDDL-GPL-2-CP.  Sun designates this
+   - particular file as subject to the "Classpath" exception as provided
+   - by Sun in the GPL Version 2 section of the License file that
+   - accompanied this code. If applicable, add the following below the
+   - License Header, with the fields enclosed by brackets [] replaced by
+   - your own identifying information:
+   - "Portions Copyrighted [year] [name of copyright owner]"
+   -
+   - Contributor(s):
+   -
+   - The Original Software is NetBeans. The Initial Developer of the Original
+   - Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
+   - Microsystems, Inc. All Rights Reserved.
+   -
+   - If you wish your version of this file to be governed by only the CDDL
+   - or only the GPL Version 2, indicate your decision by adding
+   - "[Contributor] elects to include this software in this distribution
+   - under the [CDDL or GPL Version 2] license." If you do not indicate a
+   - single choice of license, a recipient has the option to distribute
+   - your version of this file under either the CDDL, the GPL Version 2 or
+   - to extend the choice of license to its licensees as provided above.
+   - However, if you add GPL Version 2 code and therefore, elected the GPL
+   - Version 2 license, then the option applies only if the new code is
+   - made subject to such option by the copyright holder.
+  -->
+  
 <HTML>
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
diff -r b7c1c51ac6f9 -r 147c8984ddd2 src/pt_BR/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/resources/samples/hello_pt_BR.html
--- 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
+++ 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
@@ -1,9 +1,44 @@
- <!--
- - Copyright 2006-2007 Sun Microsystems, Inc. All rights reserved.
- - SUN PROPRIETARY/CONFIDENTIAL.
- - Use is subject to license terms.
- -->
-
+<!--
+   - DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+   -
+   - Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
+   -
+   - The contents of this file are subject to the terms of either the GNU
+   - General Public License Version 2 only ("GPL") or the Common
+   - Development and Distribution License("CDDL") (collectively, the
+   - "License"). You may not use this file except in compliance with the
+   - License. You can obtain a copy of the License at
+   - http://www.netbeans.org/cddl-gplv2.html
+   - or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+   - specific language governing permissions and limitations under the
+   - License.  When distributing the software, include this License Header
+   - Notice in each file and include the License file at
+   - nbbuild/licenses/CDDL-GPL-2-CP.  Sun designates this
+   - particular file as subject to the "Classpath" exception as provided
+   - by Sun in the GPL Version 2 section of the License file that
+   - accompanied this code. If applicable, add the following below the
+   - License Header, with the fields enclosed by brackets [] replaced by
+   - your own identifying information:
+   - "Portions Copyrighted [year] [name of copyright owner]"
+   -
+   - Contributor(s):
+   -
+   - The Original Software is NetBeans. The Initial Developer of the Original
+   - Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
+   - Microsystems, Inc. All Rights Reserved.
+   -
+   - If you wish your version of this file to be governed by only the CDDL
+   - or only the GPL Version 2, indicate your decision by adding
+   - "[Contributor] elects to include this software in this distribution
+   - under the [CDDL or GPL Version 2] license." If you do not indicate a
+   - single choice of license, a recipient has the option to distribute
+   - your version of this file under either the CDDL, the GPL Version 2 or
+   - to extend the choice of license to its licensees as provided above.
+   - However, if you add GPL Version 2 code and therefore, elected the GPL
+   - Version 2 license, then the option applies only if the new code is
+   - made subject to such option by the copyright holder.
+  -->
+  
 <HTML>
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
diff -r b7c1c51ac6f9 -r 147c8984ddd2 src/pt_BR/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/resources/samples/lexyacc_pt_BR.html
--- 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
+++ 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
@@ -1,9 +1,44 @@
- <!--
- - Copyright 2006-2007 Sun Microsystems, Inc. All rights reserved.
- - SUN PROPRIETARY/CONFIDENTIAL.
- - Use is subject to license terms.
- -->
-
+<!--
+   - DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+   -
+   - Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
+   -
+   - The contents of this file are subject to the terms of either the GNU
+   - General Public License Version 2 only ("GPL") or the Common
+   - Development and Distribution License("CDDL") (collectively, the
+   - "License"). You may not use this file except in compliance with the
+   - License. You can obtain a copy of the License at
+   - http://www.netbeans.org/cddl-gplv2.html
+   - or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+   - specific language governing permissions and limitations under the
+   - License.  When distributing the software, include this License Header
+   - Notice in each file and include the License file at
+   - nbbuild/licenses/CDDL-GPL-2-CP.  Sun designates this
+   - particular file as subject to the "Classpath" exception as provided
+   - by Sun in the GPL Version 2 section of the License file that
+   - accompanied this code. If applicable, add the following below the
+   - License Header, with the fields enclosed by brackets [] replaced by
+   - your own identifying information:
+   - "Portions Copyrighted [year] [name of copyright owner]"
+   -
+   - Contributor(s):
+   -
+   - The Original Software is NetBeans. The Initial Developer of the Original
+   - Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
+   - Microsystems, Inc. All Rights Reserved.
+   -
+   - If you wish your version of this file to be governed by only the CDDL
+   - or only the GPL Version 2, indicate your decision by adding
+   - "[Contributor] elects to include this software in this distribution
+   - under the [CDDL or GPL Version 2] license." If you do not indicate a
+   - single choice of license, a recipient has the option to distribute
+   - your version of this file under either the CDDL, the GPL Version 2 or
+   - to extend the choice of license to its licensees as provided above.
+   - However, if you add GPL Version 2 code and therefore, elected the GPL
+   - Version 2 license, then the option applies only if the new code is
+   - made subject to such option by the copyright holder.
+  -->
+  
 <HTML>
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
diff -r b7c1c51ac6f9 -r 147c8984ddd2 src/pt_BR/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/resources/samples/pi_pt_BR.html
--- 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
+++ 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
@@ -1,9 +1,44 @@
- <!--
- - Copyright 2006-2007 Sun Microsystems, Inc. All rights reserved.
- - SUN PROPRIETARY/CONFIDENTIAL.
- - Use is subject to license terms.
- -->
-
+<!--
+   - DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+   -
+   - Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
+   -
+   - The contents of this file are subject to the terms of either the GNU
+   - General Public License Version 2 only ("GPL") or the Common
+   - Development and Distribution License("CDDL") (collectively, the
+   - "License"). You may not use this file except in compliance with the
+   - License. You can obtain a copy of the License at
+   - http://www.netbeans.org/cddl-gplv2.html
+   - or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+   - specific language governing permissions and limitations under the
+   - License.  When distributing the software, include this License Header
+   - Notice in each file and include the License file at
+   - nbbuild/licenses/CDDL-GPL-2-CP.  Sun designates this
+   - particular file as subject to the "Classpath" exception as provided
+   - by Sun in the GPL Version 2 section of the License file that
+   - accompanied this code. If applicable, add the following below the
+   - License Header, with the fields enclosed by brackets [] replaced by
+   - your own identifying information:
+   - "Portions Copyrighted [year] [name of copyright owner]"
+   -
+   - Contributor(s):
+   -
+   - The Original Software is NetBeans. The Initial Developer of the Original
+   - Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
+   - Microsystems, Inc. All Rights Reserved.
+   -
+   - If you wish your version of this file to be governed by only the CDDL
+   - or only the GPL Version 2, indicate your decision by adding
+   - "[Contributor] elects to include this software in this distribution
+   - under the [CDDL or GPL Version 2] license." If you do not indicate a
+   - single choice of license, a recipient has the option to distribute
+   - your version of this file under either the CDDL, the GPL Version 2 or
+   - to extend the choice of license to its licensees as provided above.
+   - However, if you add GPL Version 2 code and therefore, elected the GPL
+   - Version 2 license, then the option applies only if the new code is
+   - made subject to such option by the copyright holder.
+  -->
+  
 <HTML>
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
diff -r b7c1c51ac6f9 -r 147c8984ddd2 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
--- 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
+++ 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
@@ -1,9 +1,44 @@
- <!--
- - Copyright 2006-2007 Sun Microsystems, Inc. All rights reserved.
- - SUN PROPRIETARY/CONFIDENTIAL.
- - Use is subject to license terms.
- -->
-
+<!--
+   - DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+   -
+   - Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
+   -
+   - The contents of this file are subject to the terms of either the GNU
+   - General Public License Version 2 only ("GPL") or the Common
+   - Development and Distribution License("CDDL") (collectively, the
+   - "License"). You may not use this file except in compliance with the
+   - License. You can obtain a copy of the License at
+   - http://www.netbeans.org/cddl-gplv2.html
+   - or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+   - specific language governing permissions and limitations under the
+   - License.  When distributing the software, include this License Header
+   - Notice in each file and include the License file at
+   - nbbuild/licenses/CDDL-GPL-2-CP.  Sun designates this
+   - particular file as subject to the "Classpath" exception as provided
+   - by Sun in the GPL Version 2 section of the License file that
+   - accompanied this code. If applicable, add the following below the
+   - License Header, with the fields enclosed by brackets [] replaced by
+   - your own identifying information:
+   - "Portions Copyrighted [year] [name of copyright owner]"
+   -
+   - Contributor(s):
+   -
+   - The Original Software is NetBeans. The Initial Developer of the Original
+   - Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
+   - Microsystems, Inc. All Rights Reserved.
+   -
+   - If you wish your version of this file to be governed by only the CDDL
+   - or only the GPL Version 2, indicate your decision by adding
+   - "[Contributor] elects to include this software in this distribution
+   - under the [CDDL or GPL Version 2] license." If you do not indicate a
+   - single choice of license, a recipient has the option to distribute
+   - your version of this file under either the CDDL, the GPL Version 2 or
+   - to extend the choice of license to its licensees as provided above.
+   - However, if you add GPL Version 2 code and therefore, elected the GPL
+   - Version 2 license, then the option applies only if the new code is
+   - made subject to such option by the copyright holder.
+  -->
+  
 <HTML>
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
diff -r b7c1c51ac6f9 -r 147c8984ddd2 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
--- 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
+++ 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
@@ -1,9 +1,44 @@
- <!--
- - Copyright 2006-2007 Sun Microsystems, Inc. All rights reserved.
- - SUN PROPRIETARY/CONFIDENTIAL.
- - Use is subject to license terms.
- -->
-
+<!--
+   - DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+   -
+   - Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
+   -
+   - The contents of this file are subject to the terms of either the GNU
+   - General Public License Version 2 only ("GPL") or the Common
+   - Development and Distribution License("CDDL") (collectively, the
+   - "License"). You may not use this file except in compliance with the
+   - License. You can obtain a copy of the License at
+   - http://www.netbeans.org/cddl-gplv2.html
+   - or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+   - specific language governing permissions and limitations under the
+   - License.  When distributing the software, include this License Header
+   - Notice in each file and include the License file at
+   - nbbuild/licenses/CDDL-GPL-2-CP.  Sun designates this
+   - particular file as subject to the "Classpath" exception as provided
+   - by Sun in the GPL Version 2 section of the License file that
+   - accompanied this code. If applicable, add the following below the
+   - License Header, with the fields enclosed by brackets [] replaced by
+   - your own identifying information:
+   - "Portions Copyrighted [year] [name of copyright owner]"
+   -
+   - Contributor(s):
+   -
+   - The Original Software is NetBeans. The Initial Developer of the Original
+   - Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
+   - Microsystems, Inc. All Rights Reserved.
+   -
+   - If you wish your version of this file to be governed by only the CDDL
+   - or only the GPL Version 2, indicate your decision by adding
+   - "[Contributor] elects to include this software in this distribution
+   - under the [CDDL or GPL Version 2] license." If you do not indicate a
+   - single choice of license, a recipient has the option to distribute
+   - your version of this file under either the CDDL, the GPL Version 2 or
+   - to extend the choice of license to its licensees as provided above.
+   - However, if you add GPL Version 2 code and therefore, elected the GPL
+   - Version 2 license, then the option applies only if the new code is
+   - made subject to such option by the copyright holder.
+  -->
+  
 <HTML>
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
diff -r b7c1c51ac6f9 -r 147c8984ddd2 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
--- 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
+++ 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
@@ -1,9 +1,44 @@
- <!--
- - Copyright 2006-2007 Sun Microsystems, Inc. All rights reserved.
- - SUN PROPRIETARY/CONFIDENTIAL.
- - Use is subject to license terms.
- -->
-
+<!--
+   - DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+   -
+   - Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
+   -
+   - The contents of this file are subject to the terms of either the GNU
+   - General Public License Version 2 only ("GPL") or the Common
+   - Development and Distribution License("CDDL") (collectively, the
+   - "License"). You may not use this file except in compliance with the
+   - License. You can obtain a copy of the License at
+   - http://www.netbeans.org/cddl-gplv2.html
+   - or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+   - specific language governing permissions and limitations under the
+   - License.  When distributing the software, include this License Header
+   - Notice in each file and include the License file at
+   - nbbuild/licenses/CDDL-GPL-2-CP.  Sun designates this
+   - particular file as subject to the "Classpath" exception as provided
+   - by Sun in the GPL Version 2 section of the License file that
+   - accompanied this code. If applicable, add the following below the
+   - License Header, with the fields enclosed by brackets [] replaced by
+   - your own identifying information:
+   - "Portions Copyrighted [year] [name of copyright owner]"
+   -
+   - Contributor(s):
+   -
+   - The Original Software is NetBeans. The Initial Developer of the Original
+   - Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
+   - Microsystems, Inc. All Rights Reserved.
+   -
+   - If you wish your version of this file to be governed by only the CDDL
+   - or only the GPL Version 2, indicate your decision by adding
+   - "[Contributor] elects to include this software in this distribution
+   - under the [CDDL or GPL Version 2] license." If you do not indicate a
+   - single choice of license, a recipient has the option to distribute
+   - your version of this file under either the CDDL, the GPL Version 2 or
+   - to extend the choice of license to its licensees as provided above.
+   - However, if you add GPL Version 2 code and therefore, elected the GPL
+   - Version 2 license, then the option applies only if the new code is
+   - made subject to such option by the copyright holder.
+  -->
+  
 <HTML>
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
diff -r b7c1c51ac6f9 -r 147c8984ddd2 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
--- 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
+++ 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
@@ -1,9 +1,44 @@
- <!--
- - Copyright 2006-2007 Sun Microsystems, Inc. All rights reserved.
- - SUN PROPRIETARY/CONFIDENTIAL.
- - Use is subject to license terms.
- -->
-
+<!--
+   - DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+   -
+   - Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
+   -
+   - The contents of this file are subject to the terms of either the GNU
+   - General Public License Version 2 only ("GPL") or the Common
+   - Development and Distribution License("CDDL") (collectively, the
+   - "License"). You may not use this file except in compliance with the
+   - License. You can obtain a copy of the License at
+   - http://www.netbeans.org/cddl-gplv2.html
+   - or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+   - specific language governing permissions and limitations under the
+   - License.  When distributing the software, include this License Header
+   - Notice in each file and include the License file at
+   - nbbuild/licenses/CDDL-GPL-2-CP.  Sun designates this
+   - particular file as subject to the "Classpath" exception as provided
+   - by Sun in the GPL Version 2 section of the License file that
+   - accompanied this code. If applicable, add the following below the
+   - License Header, with the fields enclosed by brackets [] replaced by
+   - your own identifying information:
+   - "Portions Copyrighted [year] [name of copyright owner]"
+   -
+   - Contributor(s):
+   -
+   - The Original Software is NetBeans. The Initial Developer of the Original
+   - Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
+   - Microsystems, Inc. All Rights Reserved.
+   -
+   - If you wish your version of this file to be governed by only the CDDL
+   - or only the GPL Version 2, indicate your decision by adding
+   - "[Contributor] elects to include this software in this distribution
+   - under the [CDDL or GPL Version 2] license." If you do not indicate a
+   - single choice of license, a recipient has the option to distribute
+   - your version of this file under either the CDDL, the GPL Version 2 or
+   - to extend the choice of license to its licensees as provided above.
+   - However, if you add GPL Version 2 code and therefore, elected the GPL
+   - Version 2 license, then the option applies only if the new code is
+   - made subject to such option by the copyright holder.
+  -->
+  
 <HTML>
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
diff -r b7c1c51ac6f9 -r 147c8984ddd2 src/pt_BR/other/installer/infra/build/web/js/start_strings_pt_BR.js
--- a/src/pt_BR/other/installer/infra/build/web/js/start_strings_pt_BR.js	Mon Dec 19 12:18:33 2016 +0100
+++ b/src/pt_BR/other/installer/infra/build/web/js/start_strings_pt_BR.js	Tue Apr 17 14:14:23 2018 +0200
@@ -59,9 +59,9 @@
 var SUPPORT_LABEL = "Suporte";
 var SUPPORT_DESCRIPTION = "Op\u00e7\u00f5es de suporte flex\u00edveis para ajud\u00e1-lo a ficar focado em inova\u00e7\u00f5es.";
 
-// $PRODUCT_NAME $TYPE (Installer for $PLATFORM/Zip)/$Language ($Language_ID) $filename ($SIZE) MD5: $MD5
-var INFO_MESSAGE = "{0}{1} {2}/{3} ({4})<br>{5} ({6} MB)<br>MD5: {7}";
-var INFO_MESSAGE_OTHER = "{0} ({1} MB)<br>MD5: {2}";
+// $PRODUCT_NAME $TYPE (Installer for $PLATFORM/Zip)/$Language ($Language_ID) $filename ($SIZE) SHA-256: $MD5
+var INFO_MESSAGE = "{0}{1} {2}/{3} ({4})<br>{5} ({6} MB)<br>SHA-256: {7}";
+var INFO_MESSAGE_OTHER = "{0} ({1} MB)<br>SHA-256: {2}";
 
 //DO NOT TRANSLATE
 var SUBSCRIPTION_PHP_URL = "http://services.netbeans.org/sub.php";
diff -r b7c1c51ac6f9 -r 147c8984ddd2 src/pt_BR/ruby/ruby/ruby/org/netbeans/modules/ruby/Bundle_pt_BR.properties
--- a/src/pt_BR/ruby/ruby/ruby/org/netbeans/modules/ruby/Bundle_pt_BR.properties	Mon Dec 19 12:18:33 2016 +0100
+++ b/src/pt_BR/ruby/ruby/ruby/org/netbeans/modules/ruby/Bundle_pt_BR.properties	Tue Apr 17 14:14:23 2018 +0200
@@ -266,9 +266,6 @@
 
 InstalledVersions=Vers\u00e3o(\u00f5es) instalada(s): {0}
 
-# HTTP status codes for code completion,
-# 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
-
 SC_100=100 (Continuar)
 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.
 SC_101=101 (Alternando protocolos)
diff -r b7c1c51ac6f9 -r 147c8984ddd2 src/pt_PT/other/installer/infra/build/web/js/start_strings_pt_PT.js
--- a/src/pt_PT/other/installer/infra/build/web/js/start_strings_pt_PT.js	Mon Dec 19 12:18:33 2016 +0100
+++ b/src/pt_PT/other/installer/infra/build/web/js/start_strings_pt_PT.js	Tue Apr 17 14:14:23 2018 +0200
@@ -59,9 +59,9 @@
 var SUPPORT_LABEL        = "Support";
 var SUPPORT_DESCRIPTION  = "Flexible support options to help you stay focused on innovation.";
 
-// $PRODUCT_NAME $TYPE (Installer for $PLATFORM/Zip)/$Language ($Language_ID) $filename ($SIZE) MD5: $MD5
-var INFO_MESSAGE = "{0}{1} {2}/{3} ({4})<br>{5} ({6} MB)<br>MD5: {7}";
-var INFO_MESSAGE_OTHER = "{0} ({1} MB)<br>MD5: {2}";
+// $PRODUCT_NAME $TYPE (Installer for $PLATFORM/Zip)/$Language ($Language_ID) $filename ($SIZE) SHA-256: $MD5
+var INFO_MESSAGE = "{0}{1} {2}/{3} ({4})<br>{5} ({6} MB)<br>SHA-256: {7}";
+var INFO_MESSAGE_OTHER = "{0} ({1} MB)<br>SHA-256: {2}";
 
 //DO NOT TRANSLATE
 var SUBSCRIPTION_PHP_URL = "http://services.netbeans.org/sub.php";
diff -r b7c1c51ac6f9 -r 147c8984ddd2 src/ro/other/installer/infra/build/web/js/start_strings_ro.js
--- a/src/ro/other/installer/infra/build/web/js/start_strings_ro.js	Mon Dec 19 12:18:33 2016 +0100
+++ b/src/ro/other/installer/infra/build/web/js/start_strings_ro.js	Tue Apr 17 14:14:23 2018 +0200
@@ -59,9 +59,9 @@
 var SUPPORT_LABEL        = "Support";
 var SUPPORT_DESCRIPTION  = "Flexible support options to help you stay focused on innovation.";
 
-// $PRODUCT_NAME $TYPE (Installer for $PLATFORM/Zip)/$Language ($Language_ID) $filename ($SIZE) MD5: $MD5
-var INFO_MESSAGE = "{0}{1} {2}/{3} ({4})<br>{5} ({6} MB)<br>MD5: {7}";
-var INFO_MESSAGE_OTHER = "{0} ({1} MB)<br>MD5: {2}";
+// $PRODUCT_NAME $TYPE (Installer for $PLATFORM/Zip)/$Language ($Language_ID) $filename ($SIZE) SHA-256: $MD5
+var INFO_MESSAGE = "{0}{1} {2}/{3} ({4})<br>{5} ({6} MB)<br>SHA-256: {7}";
+var INFO_MESSAGE_OTHER = "{0} ({1} MB)<br>SHA-256: {2}";
 
 //DO NOT TRANSLATE
 var SUBSCRIPTION_PHP_URL = "http://services.netbeans.org/sub.php";
diff -r b7c1c51ac6f9 -r 147c8984ddd2 src/ru/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/resources/samples/fractal_ru.html
--- 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
+++ 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
@@ -1,9 +1,44 @@
- <!--
- - Copyright 2006-2007 Sun Microsystems, Inc. All rights reserved.
- - SUN PROPRIETARY/CONFIDENTIAL.
- - Use is subject to license terms.
- -->
-
+<!--
+   - DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+   -
+   - Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
+   -
+   - The contents of this file are subject to the terms of either the GNU
+   - General Public License Version 2 only ("GPL") or the Common
+   - Development and Distribution License("CDDL") (collectively, the
+   - "License"). You may not use this file except in compliance with the
+   - License. You can obtain a copy of the License at
+   - http://www.netbeans.org/cddl-gplv2.html
+   - or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+   - specific language governing permissions and limitations under the
+   - License.  When distributing the software, include this License Header
+   - Notice in each file and include the License file at
+   - nbbuild/licenses/CDDL-GPL-2-CP.  Sun designates this
+   - particular file as subject to the "Classpath" exception as provided
+   - by Sun in the GPL Version 2 section of the License file that
+   - accompanied this code. If applicable, add the following below the
+   - License Header, with the fields enclosed by brackets [] replaced by
+   - your own identifying information:
+   - "Portions Copyrighted [year] [name of copyright owner]"
+   -
+   - Contributor(s):
+   -
+   - The Original Software is NetBeans. The Initial Developer of the Original
+   - Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
+   - Microsystems, Inc. All Rights Reserved.
+   -
+   - If you wish your version of this file to be governed by only the CDDL
+   - or only the GPL Version 2, indicate your decision by adding
+   - "[Contributor] elects to include this software in this distribution
+   - under the [CDDL or GPL Version 2] license." If you do not indicate a
+   - single choice of license, a recipient has the option to distribute
+   - your version of this file under either the CDDL, the GPL Version 2 or
+   - to extend the choice of license to its licensees as provided above.
+   - However, if you add GPL Version 2 code and therefore, elected the GPL
+   - Version 2 license, then the option applies only if the new code is
+   - made subject to such option by the copyright holder.
+  -->
+  
 <HTML>
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
diff -r b7c1c51ac6f9 -r 147c8984ddd2 src/ru/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/resources/samples/hello_ru.html
--- 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
+++ 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
@@ -1,9 +1,44 @@
- <!--
- - Copyright 2006-2007 Sun Microsystems, Inc. All rights reserved.
- - SUN PROPRIETARY/CONFIDENTIAL.
- - Use is subject to license terms.
- -->
-
+<!--
+   - DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+   -
+   - Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
+   -
+   - The contents of this file are subject to the terms of either the GNU
+   - General Public License Version 2 only ("GPL") or the Common
+   - Development and Distribution License("CDDL") (collectively, the
+   - "License"). You may not use this file except in compliance with the
+   - License. You can obtain a copy of the License at
+   - http://www.netbeans.org/cddl-gplv2.html
+   - or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+   - specific language governing permissions and limitations under the
+   - License.  When distributing the software, include this License Header
+   - Notice in each file and include the License file at
+   - nbbuild/licenses/CDDL-GPL-2-CP.  Sun designates this
+   - particular file as subject to the "Classpath" exception as provided
+   - by Sun in the GPL Version 2 section of the License file that
+   - accompanied this code. If applicable, add the following below the
+   - License Header, with the fields enclosed by brackets [] replaced by
+   - your own identifying information:
+   - "Portions Copyrighted [year] [name of copyright owner]"
+   -
+   - Contributor(s):
+   -
+   - The Original Software is NetBeans. The Initial Developer of the Original
+   - Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
+   - Microsystems, Inc. All Rights Reserved.
+   -
+   - If you wish your version of this file to be governed by only the CDDL
+   - or only the GPL Version 2, indicate your decision by adding
+   - "[Contributor] elects to include this software in this distribution
+   - under the [CDDL or GPL Version 2] license." If you do not indicate a
+   - single choice of license, a recipient has the option to distribute
+   - your version of this file under either the CDDL, the GPL Version 2 or
+   - to extend the choice of license to its licensees as provided above.
+   - However, if you add GPL Version 2 code and therefore, elected the GPL
+   - Version 2 license, then the option applies only if the new code is
+   - made subject to such option by the copyright holder.
+  -->
+  
 <HTML>
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
diff -r b7c1c51ac6f9 -r 147c8984ddd2 src/ru/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/resources/samples/lexyacc_ru.html
--- 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
+++ 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
@@ -1,9 +1,44 @@
- <!--
- - Copyright 2006-2007 Sun Microsystems, Inc. All rights reserved.
- - SUN PROPRIETARY/CONFIDENTIAL.
- - Use is subject to license terms.
- -->
-
+<!--
+   - DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+   -
+   - Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
+   -
+   - The contents of this file are subject to the terms of either the GNU
+   - General Public License Version 2 only ("GPL") or the Common
+   - Development and Distribution License("CDDL") (collectively, the
+   - "License"). You may not use this file except in compliance with the
+   - License. You can obtain a copy of the License at
+   - http://www.netbeans.org/cddl-gplv2.html
+   - or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+   - specific language governing permissions and limitations under the
+   - License.  When distributing the software, include this License Header
+   - Notice in each file and include the License file at
+   - nbbuild/licenses/CDDL-GPL-2-CP.  Sun designates this
+   - particular file as subject to the "Classpath" exception as provided
+   - by Sun in the GPL Version 2 section of the License file that
+   - accompanied this code. If applicable, add the following below the
+   - License Header, with the fields enclosed by brackets [] replaced by
+   - your own identifying information:
+   - "Portions Copyrighted [year] [name of copyright owner]"
+   -
+   - Contributor(s):
+   -
+   - The Original Software is NetBeans. The Initial Developer of the Original
+   - Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
+   - Microsystems, Inc. All Rights Reserved.
+   -
+   - If you wish your version of this file to be governed by only the CDDL
+   - or only the GPL Version 2, indicate your decision by adding
+   - "[Contributor] elects to include this software in this distribution
+   - under the [CDDL or GPL Version 2] license." If you do not indicate a
+   - single choice of license, a recipient has the option to distribute
+   - your version of this file under either the CDDL, the GPL Version 2 or
+   - to extend the choice of license to its licensees as provided above.
+   - However, if you add GPL Version 2 code and therefore, elected the GPL
+   - Version 2 license, then the option applies only if the new code is
+   - made subject to such option by the copyright holder.
+  -->
+  
 <HTML>
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
diff -r b7c1c51ac6f9 -r 147c8984ddd2 src/ru/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/resources/samples/pi_ru.html
--- 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
+++ 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
@@ -1,9 +1,44 @@
- <!--
- - Copyright 2006-2007 Sun Microsystems, Inc. All rights reserved.
- - SUN PROPRIETARY/CONFIDENTIAL.
- - Use is subject to license terms.
- -->
-
+<!--
+   - DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+   -
+   - Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
+   -
+   - The contents of this file are subject to the terms of either the GNU
+   - General Public License Version 2 only ("GPL") or the Common
+   - Development and Distribution License("CDDL") (collectively, the
+   - "License"). You may not use this file except in compliance with the
+   - License. You can obtain a copy of the License at
+   - http://www.netbeans.org/cddl-gplv2.html
+   - or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+   - specific language governing permissions and limitations under the
+   - License.  When distributing the software, include this License Header
+   - Notice in each file and include the License file at
+   - nbbuild/licenses/CDDL-GPL-2-CP.  Sun designates this
+   - particular file as subject to the "Classpath" exception as provided
+   - by Sun in the GPL Version 2 section of the License file that
+   - accompanied this code. If applicable, add the following below the
+   - License Header, with the fields enclosed by brackets [] replaced by
+   - your own identifying information:
+   - "Portions Copyrighted [year] [name of copyright owner]"
+   -
+   - Contributor(s):
+   -
+   - The Original Software is NetBeans. The Initial Developer of the Original
+   - Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
+   - Microsystems, Inc. All Rights Reserved.
+   -
+   - If you wish your version of this file to be governed by only the CDDL
+   - or only the GPL Version 2, indicate your decision by adding
+   - "[Contributor] elects to include this software in this distribution
+   - under the [CDDL or GPL Version 2] license." If you do not indicate a
+   - single choice of license, a recipient has the option to distribute
+   - your version of this file under either the CDDL, the GPL Version 2 or
+   - to extend the choice of license to its licensees as provided above.
+   - However, if you add GPL Version 2 code and therefore, elected the GPL
+   - Version 2 license, then the option applies only if the new code is
+   - made subject to such option by the copyright holder.
+  -->
+  
 <HTML>
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
diff -r b7c1c51ac6f9 -r 147c8984ddd2 src/ru/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-makeproject-ui-resources-samples-fractal_ru.html
--- 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
+++ 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
@@ -1,9 +1,44 @@
- <!--
- - Copyright 2006-2007 Sun Microsystems, Inc. All rights reserved.
- - SUN PROPRIETARY/CONFIDENTIAL.
- - Use is subject to license terms.
- -->
-
+<!--
+   - DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+   -
+   - Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
+   -
+   - The contents of this file are subject to the terms of either the GNU
+   - General Public License Version 2 only ("GPL") or the Common
+   - Development and Distribution License("CDDL") (collectively, the
+   - "License"). You may not use this file except in compliance with the
+   - License. You can obtain a copy of the License at
+   - http://www.netbeans.org/cddl-gplv2.html
+   - or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+   - specific language governing permissions and limitations under the
+   - License.  When distributing the software, include this License Header
+   - Notice in each file and include the License file at
+   - nbbuild/licenses/CDDL-GPL-2-CP.  Sun designates this
+   - particular file as subject to the "Classpath" exception as provided
+   - by Sun in the GPL Version 2 section of the License file that
+   - accompanied this code. If applicable, add the following below the
+   - License Header, with the fields enclosed by brackets [] replaced by
+   - your own identifying information:
+   - "Portions Copyrighted [year] [name of copyright owner]"
+   -
+   - Contributor(s):
+   -
+   - The Original Software is NetBeans. The Initial Developer of the Original
+   - Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
+   - Microsystems, Inc. All Rights Reserved.
+   -
+   - If you wish your version of this file to be governed by only the CDDL
+   - or only the GPL Version 2, indicate your decision by adding
+   - "[Contributor] elects to include this software in this distribution
+   - under the [CDDL or GPL Version 2] license." If you do not indicate a
+   - single choice of license, a recipient has the option to distribute
+   - your version of this file under either the CDDL, the GPL Version 2 or
+   - to extend the choice of license to its licensees as provided above.
+   - However, if you add GPL Version 2 code and therefore, elected the GPL
+   - Version 2 license, then the option applies only if the new code is
+   - made subject to such option by the copyright holder.
+  -->
+  
 <HTML>
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
diff -r b7c1c51ac6f9 -r 147c8984ddd2 src/ru/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-makeproject-ui-resources-samples-hello_ru.html
--- 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
+++ 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
@@ -1,9 +1,44 @@
- <!--
- - Copyright 2006-2007 Sun Microsystems, Inc. All rights reserved.
- - SUN PROPRIETARY/CONFIDENTIAL.
- - Use is subject to license terms.
- -->
-
+<!--
+   - DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+   -
+   - Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
+   -
+   - The contents of this file are subject to the terms of either the GNU
+   - General Public License Version 2 only ("GPL") or the Common
+   - Development and Distribution License("CDDL") (collectively, the
+   - "License"). You may not use this file except in compliance with the
+   - License. You can obtain a copy of the License at
+   - http://www.netbeans.org/cddl-gplv2.html
+   - or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+   - specific language governing permissions and limitations under the
+   - License.  When distributing the software, include this License Header
+   - Notice in each file and include the License file at
+   - nbbuild/licenses/CDDL-GPL-2-CP.  Sun designates this
+   - particular file as subject to the "Classpath" exception as provided
+   - by Sun in the GPL Version 2 section of the License file that
+   - accompanied this code. If applicable, add the following below the
+   - License Header, with the fields enclosed by brackets [] replaced by
+   - your own identifying information:
+   - "Portions Copyrighted [year] [name of copyright owner]"
+   -
+   - Contributor(s):
+   -
+   - The Original Software is NetBeans. The Initial Developer of the Original
+   - Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
+   - Microsystems, Inc. All Rights Reserved.
+   -
+   - If you wish your version of this file to be governed by only the CDDL
+   - or only the GPL Version 2, indicate your decision by adding
+   - "[Contributor] elects to include this software in this distribution
+   - under the [CDDL or GPL Version 2] license." If you do not indicate a
+   - single choice of license, a recipient has the option to distribute
+   - your version of this file under either the CDDL, the GPL Version 2 or
+   - to extend the choice of license to its licensees as provided above.
+   - However, if you add GPL Version 2 code and therefore, elected the GPL
+   - Version 2 license, then the option applies only if the new code is
+   - made subject to such option by the copyright holder.
+  -->
+  
 <HTML>
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
diff -r b7c1c51ac6f9 -r 147c8984ddd2 src/ru/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-makeproject-ui-resources-samples-lexyacc_ru.html
--- 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
+++ 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
@@ -1,9 +1,44 @@
- <!--
- - Copyright 2006-2007 Sun Microsystems, Inc. All rights reserved.
- - SUN PROPRIETARY/CONFIDENTIAL.
- - Use is subject to license terms.
- -->
-
+<!--
+   - DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+   -
+   - Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
+   -
+   - The contents of this file are subject to the terms of either the GNU
+   - General Public License Version 2 only ("GPL") or the Common
+   - Development and Distribution License("CDDL") (collectively, the
+   - "License"). You may not use this file except in compliance with the
+   - License. You can obtain a copy of the License at
+   - http://www.netbeans.org/cddl-gplv2.html
+   - or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+   - specific language governing permissions and limitations under the
+   - License.  When distributing the software, include this License Header
+   - Notice in each file and include the License file at
+   - nbbuild/licenses/CDDL-GPL-2-CP.  Sun designates this
+   - particular file as subject to the "Classpath" exception as provided
+   - by Sun in the GPL Version 2 section of the License file that
+   - accompanied this code. If applicable, add the following below the
+   - License Header, with the fields enclosed by brackets [] replaced by
+   - your own identifying information:
+   - "Portions Copyrighted [year] [name of copyright owner]"
+   -
+   - Contributor(s):
+   -
+   - The Original Software is NetBeans. The Initial Developer of the Original
+   - Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
+   - Microsystems, Inc. All Rights Reserved.
+   -
+   - If you wish your version of this file to be governed by only the CDDL
+   - or only the GPL Version 2, indicate your decision by adding
+   - "[Contributor] elects to include this software in this distribution
+   - under the [CDDL or GPL Version 2] license." If you do not indicate a
+   - single choice of license, a recipient has the option to distribute
+   - your version of this file under either the CDDL, the GPL Version 2 or
+   - to extend the choice of license to its licensees as provided above.
+   - However, if you add GPL Version 2 code and therefore, elected the GPL
+   - Version 2 license, then the option applies only if the new code is
+   - made subject to such option by the copyright holder.
+  -->
+  
 <HTML>
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
diff -r b7c1c51ac6f9 -r 147c8984ddd2 src/ru/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-makeproject-ui-resources-samples-pi_ru.html
--- 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
+++ 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
@@ -1,9 +1,44 @@
- <!--
- - Copyright 2006-2007 Sun Microsystems, Inc. All rights reserved.
- - SUN PROPRIETARY/CONFIDENTIAL.
- - Use is subject to license terms.
- -->
-
+<!--
+   - DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+   -
+   - Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
+   -
+   - The contents of this file are subject to the terms of either the GNU
+   - General Public License Version 2 only ("GPL") or the Common
+   - Development and Distribution License("CDDL") (collectively, the
+   - "License"). You may not use this file except in compliance with the
+   - License. You can obtain a copy of the License at
+   - http://www.netbeans.org/cddl-gplv2.html
+   - or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+   - specific language governing permissions and limitations under the
+   - License.  When distributing the software, include this License Header
+   - Notice in each file and include the License file at
+   - nbbuild/licenses/CDDL-GPL-2-CP.  Sun designates this
+   - particular file as subject to the "Classpath" exception as provided
+   - by Sun in the GPL Version 2 section of the License file that
+   - accompanied this code. If applicable, add the following below the
+   - License Header, with the fields enclosed by brackets [] replaced by
+   - your own identifying information:
+   - "Portions Copyrighted [year] [name of copyright owner]"
+   -
+   - Contributor(s):
+   -
+   - The Original Software is NetBeans. The Initial Developer of the Original
+   - Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
+   - Microsystems, Inc. All Rights Reserved.
+   -
+   - If you wish your version of this file to be governed by only the CDDL
+   - or only the GPL Version 2, indicate your decision by adding
+   - "[Contributor] elects to include this software in this distribution
+   - under the [CDDL or GPL Version 2] license." If you do not indicate a
+   - single choice of license, a recipient has the option to distribute
+   - your version of this file under either the CDDL, the GPL Version 2 or
+   - to extend the choice of license to its licensees as provided above.
+   - However, if you add GPL Version 2 code and therefore, elected the GPL
+   - Version 2 license, then the option applies only if the new code is
+   - made subject to such option by the copyright holder.
+  -->
+  
 <HTML>
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
diff -r b7c1c51ac6f9 -r 147c8984ddd2 src/ru/other/installer/infra/build/web/js/start_strings_ru.js
--- a/src/ru/other/installer/infra/build/web/js/start_strings_ru.js	Mon Dec 19 12:18:33 2016 +0100
+++ b/src/ru/other/installer/infra/build/web/js/start_strings_ru.js	Tue Apr 17 14:14:23 2018 +0200
@@ -59,9 +59,9 @@
 var SUPPORT_LABEL        = "\u041f\u043e\u0434\u0434\u0435\u0440\u0436\u043a\u0430";
 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.";
 
-// $PRODUCT_NAME $TYPE (Installer for $PLATFORM/Zip)/$Language ($Language_ID) $filename ($SIZE) MD5: $MD5
-var INFO_MESSAGE = "{0}{1} {2}/{3} ({4})<br>{5} ({6} \u041c\u0431)<br>MD5: {7}";
-var INFO_MESSAGE_OTHER = "{0} ({1} \u041c\u0431)<br>MD5: {2}";
+// $PRODUCT_NAME $TYPE (Installer for $PLATFORM/Zip)/$Language ($Language_ID) $filename ($SIZE) SHA-256: $MD5
+var INFO_MESSAGE = "{0}{1} {2}/{3} ({4})<br>{5} ({6} \u041c\u0431)<br>SHA-256: {7}";
+var INFO_MESSAGE_OTHER = "{0} ({1} \u041c\u0431)<br>SHA-256: {2}";
 
 //DO NOT TRANSLATE
 var SUBSCRIPTION_PHP_URL = "http://services.netbeans.org/sub.php";
diff -r b7c1c51ac6f9 -r 147c8984ddd2 src/ru/ruby/ruby/ruby/org/netbeans/modules/ruby/Bundle_ru.properties
--- a/src/ru/ruby/ruby/ruby/org/netbeans/modules/ruby/Bundle_ru.properties	Mon Dec 19 12:18:33 2016 +0100
+++ b/src/ru/ruby/ruby/ruby/org/netbeans/modules/ruby/Bundle_ru.properties	Tue Apr 17 14:14:23 2018 +0200
@@ -266,9 +266,6 @@
 
 InstalledVersions=\u0423\u0441\u0442\u0430\u043d\u043e\u0432\u043b\u0435\u043d\u043d\u044b\u0435 \u0432\u0435\u0440\u0441\u0438\u0438: {0}
 
-# HTTP status codes for code completion,
-# 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
-
 SC_100=100 (\u041f\u0440\u043e\u0434\u043e\u043b\u0436\u0438\u0442\u044c)
 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.
 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)
diff -r b7c1c51ac6f9 -r 147c8984ddd2 src/si/other/installer/infra/build/web/js/start_strings_si.js
--- a/src/si/other/installer/infra/build/web/js/start_strings_si.js	Mon Dec 19 12:18:33 2016 +0100
+++ b/src/si/other/installer/infra/build/web/js/start_strings_si.js	Tue Apr 17 14:14:23 2018 +0200
@@ -59,9 +59,9 @@
 var SUPPORT_LABEL        = "Support";
 var SUPPORT_DESCRIPTION  = "Flexible support options to help you stay focused on innovation.";
 
-// $PRODUCT_NAME $TYPE (Installer for $PLATFORM/Zip)/$Language ($Language_ID) $filename ($SIZE) MD5: $MD5
-var INFO_MESSAGE = "{0}{1} {2}/{3} ({4})<br>{5} ({6} MB)<br>MD5: {7}";
-var INFO_MESSAGE_OTHER = "{0} ({1} MB)<br>MD5: {2}";
+// $PRODUCT_NAME $TYPE (Installer for $PLATFORM/Zip)/$Language ($Language_ID) $filename ($SIZE) SHA-256: $MD5
+var INFO_MESSAGE = "{0}{1} {2}/{3} ({4})<br>{5} ({6} MB)<br>SHA-256: {7}";
+var INFO_MESSAGE_OTHER = "{0} ({1} MB)<br>SHA-256: {2}";
 
 //DO NOT TRANSLATE
 var SUBSCRIPTION_PHP_URL = "http://services.netbeans.org/sub.php";
diff -r b7c1c51ac6f9 -r 147c8984ddd2 src/sq/other/installer/infra/build/web/js/start_strings_sq.js
--- a/src/sq/other/installer/infra/build/web/js/start_strings_sq.js	Mon Dec 19 12:18:33 2016 +0100
+++ b/src/sq/other/installer/infra/build/web/js/start_strings_sq.js	Tue Apr 17 14:14:23 2018 +0200
@@ -59,9 +59,9 @@
 var SUPPORT_LABEL        = "Support";
 var SUPPORT_DESCRIPTION  = "Flexible support options to help you stay focused on innovation.";
 
-// $PRODUCT_NAME $TYPE (Installer for $PLATFORM/Zip)/$Language ($Language_ID) $filename ($SIZE) MD5: $MD5
-var INFO_MESSAGE = "{0}{1} {2}/{3} ({4})<br>{5} ({6} MB)<br>MD5: {7}";
-var INFO_MESSAGE_OTHER = "{0} ({1} MB)<br>MD5: {2}";
+// $PRODUCT_NAME $TYPE (Installer for $PLATFORM/Zip)/$Language ($Language_ID) $filename ($SIZE) SHA-256: $MD5
+var INFO_MESSAGE = "{0}{1} {2}/{3} ({4})<br>{5} ({6} MB)<br>SHA-256: {7}";
+var INFO_MESSAGE_OTHER = "{0} ({1} MB)<br>SHA-256: {2}";
 
 //DO NOT TRANSLATE
 var SUBSCRIPTION_PHP_URL = "http://services.netbeans.org/sub.php";
diff -r b7c1c51ac6f9 -r 147c8984ddd2 src/sr/other/installer/infra/build/web/js/start_strings_sr.js
--- a/src/sr/other/installer/infra/build/web/js/start_strings_sr.js	Mon Dec 19 12:18:33 2016 +0100
+++ b/src/sr/other/installer/infra/build/web/js/start_strings_sr.js	Tue Apr 17 14:14:23 2018 +0200
@@ -59,9 +59,9 @@
 var SUPPORT_LABEL        = "Support";
 var SUPPORT_DESCRIPTION  = "Flexible support options to help you stay focused on innovation.";
 
-// $PRODUCT_NAME $TYPE (Installer for $PLATFORM/Zip)/$Language ($Language_ID) $filename ($SIZE) MD5: $MD5
-var INFO_MESSAGE = "{0}{1} {2}/{3} ({4})<br>{5} ({6} MB)<br>MD5: {7}";
-var INFO_MESSAGE_OTHER = "{0} ({1} MB)<br>MD5: {2}";
+// $PRODUCT_NAME $TYPE (Installer for $PLATFORM/Zip)/$Language ($Language_ID) $filename ($SIZE) SHA-256: $MD5
+var INFO_MESSAGE = "{0}{1} {2}/{3} ({4})<br>{5} ({6} MB)<br>SHA-256: {7}";
+var INFO_MESSAGE_OTHER = "{0} ({1} MB)<br>SHA-256: {2}";
 
 //DO NOT TRANSLATE
 var SUBSCRIPTION_PHP_URL = "http://services.netbeans.org/sub.php";
diff -r b7c1c51ac6f9 -r 147c8984ddd2 src/sv/other/installer/infra/build/web/js/start_strings_sv.js
--- a/src/sv/other/installer/infra/build/web/js/start_strings_sv.js	Mon Dec 19 12:18:33 2016 +0100
+++ b/src/sv/other/installer/infra/build/web/js/start_strings_sv.js	Tue Apr 17 14:14:23 2018 +0200
@@ -59,9 +59,9 @@
 var SUPPORT_LABEL        = "Support";
 var SUPPORT_DESCRIPTION  = "Flexible support options to help you stay focused on innovation.";
 
-// $PRODUCT_NAME $TYPE (Installer for $PLATFORM/Zip)/$Language ($Language_ID) $filename ($SIZE) MD5: $MD5
-var INFO_MESSAGE = "{0}{1} {2}/{3} ({4})<br>{5} ({6} MB)<br>MD5: {7}";
-var INFO_MESSAGE_OTHER = "{0} ({1} MB)<br>MD5: {2}";
+// $PRODUCT_NAME $TYPE (Installer for $PLATFORM/Zip)/$Language ($Language_ID) $filename ($SIZE) SHA-256: $MD5
+var INFO_MESSAGE = "{0}{1} {2}/{3} ({4})<br>{5} ({6} MB)<br>SHA-256: {7}";
+var INFO_MESSAGE_OTHER = "{0} ({1} MB)<br>SHA-256: {2}";
 
 //DO NOT TRANSLATE
 var SUBSCRIPTION_PHP_URL = "http://services.netbeans.org/sub.php";
diff -r b7c1c51ac6f9 -r 147c8984ddd2 src/ta_IN/other/installer/infra/build/web/js/start_strings_ta_IN.js
--- a/src/ta_IN/other/installer/infra/build/web/js/start_strings_ta_IN.js	Mon Dec 19 12:18:33 2016 +0100
+++ b/src/ta_IN/other/installer/infra/build/web/js/start_strings_ta_IN.js	Tue Apr 17 14:14:23 2018 +0200
@@ -59,9 +59,9 @@
 var SUPPORT_LABEL        = "Support";
 var SUPPORT_DESCRIPTION  = "Flexible support options to help you stay focused on innovation.";
 
-// $PRODUCT_NAME $TYPE (Installer for $PLATFORM/Zip)/$Language ($Language_ID) $filename ($SIZE) MD5: $MD5
-var INFO_MESSAGE = "{0}{1} {2}/{3} ({4})<br>{5} ({6} MB)<br>MD5: {7}";
-var INFO_MESSAGE_OTHER = "{0} ({1} MB)<br>MD5: {2}";
+// $PRODUCT_NAME $TYPE (Installer for $PLATFORM/Zip)/$Language ($Language_ID) $filename ($SIZE) SHA-256: $MD5
+var INFO_MESSAGE = "{0}{1} {2}/{3} ({4})<br>{5} ({6} MB)<br>SHA-256: {7}";
+var INFO_MESSAGE_OTHER = "{0} ({1} MB)<br>SHA-256: {2}";
 
 //DO NOT TRANSLATE
 var SUBSCRIPTION_PHP_URL = "http://services.netbeans.org/sub.php";
diff -r b7c1c51ac6f9 -r 147c8984ddd2 src/tr/other/installer/infra/build/web/js/start_strings_tr.js
--- a/src/tr/other/installer/infra/build/web/js/start_strings_tr.js	Mon Dec 19 12:18:33 2016 +0100
+++ b/src/tr/other/installer/infra/build/web/js/start_strings_tr.js	Tue Apr 17 14:14:23 2018 +0200
@@ -59,9 +59,9 @@
 var SUPPORT_LABEL        = "Support";
 var SUPPORT_DESCRIPTION  = "Flexible support options to help you stay focused on innovation.";
 
-// $PRODUCT_NAME $TYPE (Installer for $PLATFORM/Zip)/$Language ($Language_ID) $filename ($SIZE) MD5: $MD5
-var INFO_MESSAGE = "{0}{1} {2}/{3} ({4})<br>{5} ({6} MB)<br>MD5: {7}";
-var INFO_MESSAGE_OTHER = "{0} ({1} MB)<br>MD5: {2}";
+// $PRODUCT_NAME $TYPE (Installer for $PLATFORM/Zip)/$Language ($Language_ID) $filename ($SIZE) SHA-256: $MD5
+var INFO_MESSAGE = "{0}{1} {2}/{3} ({4})<br>{5} ({6} MB)<br>SHA-256: {7}";
+var INFO_MESSAGE_OTHER = "{0} ({1} MB)<br>SHA-256: {2}";
 
 //DO NOT TRANSLATE
 var SUBSCRIPTION_PHP_URL = "http://services.netbeans.org/sub.php";
diff -r b7c1c51ac6f9 -r 147c8984ddd2 src/vi/other/installer/infra/build/web/js/start_strings_vi.js
--- a/src/vi/other/installer/infra/build/web/js/start_strings_vi.js	Mon Dec 19 12:18:33 2016 +0100
+++ b/src/vi/other/installer/infra/build/web/js/start_strings_vi.js	Tue Apr 17 14:14:23 2018 +0200
@@ -59,9 +59,9 @@
 var SUPPORT_LABEL        = "Support";
 var SUPPORT_DESCRIPTION  = "Flexible support options to help you stay focused on innovation.";
 
-// $PRODUCT_NAME $TYPE (Installer for $PLATFORM/Zip)/$Language ($Language_ID) $filename ($SIZE) MD5: $MD5
-var INFO_MESSAGE = "{0}{1} {2}/{3} ({4})<br>{5} ({6} MB)<br>MD5: {7}";
-var INFO_MESSAGE_OTHER = "{0} ({1} MB)<br>MD5: {2}";
+// $PRODUCT_NAME $TYPE (Installer for $PLATFORM/Zip)/$Language ($Language_ID) $filename ($SIZE) SHA-256: $MD5
+var INFO_MESSAGE = "{0}{1} {2}/{3} ({4})<br>{5} ({6} MB)<br>SHA-256: {7}";
+var INFO_MESSAGE_OTHER = "{0} ({1} MB)<br>SHA-256: {2}";
 
 //DO NOT TRANSLATE
 var SUBSCRIPTION_PHP_URL = "http://services.netbeans.org/sub.php";
diff -r b7c1c51ac6f9 -r 147c8984ddd2 src/zh_CN/cnd/cnd-completion/cnd-completion/org/netbeans/modules/cnd/completion/cplusplus/Bundle_zh_CN.properties
--- 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
+++ 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
@@ -68,3 +68,6 @@
 goto-implementation=\u8f6c\u81f3\u8986\u76d6/\u5df2\u8986\u76d6
 goto-implementation-text=\u8f6c\u81f3\u8986\u76d6/\u5df2\u8986\u76d6(&I)
 
+DocProvider.source-code=\u6e90\u4ee3\u7801
+DocProvider.manual=\u624b\u518c\u9875
+
diff -r b7c1c51ac6f9 -r 147c8984ddd2 src/zh_CN/cnd/cnd-completion/cnd-completion/org/netbeans/modules/cnd/completion/options/Bundle_zh_CN.properties
--- 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
+++ 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
@@ -39,4 +39,8 @@
 CodeCompletionPanel.autoCompletionTriggersLabel.text=C/C++ \u6807\u8bc6\u7b26\u7684\u81ea\u52a8\u5f39\u51fa\u5f0f\u89e6\u53d1\u5668(&A):
 CodeCompletionPanel.autoInclude.text=\u4e3a\u5b8c\u6210\u7684\u6807\u8bc6\u7b26\u81ea\u52a8\u63d2\u5165 #include \u6307\u4ee4(&D)
 CodeCompletionPanel.autoCompletionTriggersPreprocLabel.text=#include \u6307\u4ee4\u7684\u81ea\u52a8\u5f39\u51fa\u5f0f\u89e6\u53d1\u5668(&P)
+CodeCompletionPanel.docimentationListLabel.text=\u6587\u6863\u83b7\u53d6\u6765\u6e90
+CodeCompletionPanel.documentationCheckBox.text=\u6587\u6863\u8bbe\u7f6e
+CodeCompletionPanel.upButton.text=\u4e0a\u79fb
+CodeCompletionPanel.downButton.text=\u4e0b\u79fb
 
diff -r b7c1c51ac6f9 -r 147c8984ddd2 src/zh_CN/cnd/cnd-debugger-common2/cnd-debugger-common2/org/netbeans/modules/cnd/debugger/common2/debugger/Bundle_zh_CN.properties
--- 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
+++ 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
@@ -264,6 +264,7 @@
 HINT_address=\u53d8\u91cf\u7684\u5730\u5740
 ACT_Variable_Watch=\u76d1\u89c6
 MSG_Show_More_Message=\u663e\u793a\u66f4\u591a
+CTL_WatchAction_ShowPinned=\u663e\u793a\u56fa\u5b9a\u7684\u76d1\u89c6
 
 #
 # Error messages
diff -r b7c1c51ac6f9 -r 147c8984ddd2 src/zh_CN/cnd/cnd-debugger-common2/cnd-debugger-common2/org/netbeans/modules/cnd/debugger/common2/debugger/actions/Bundle_zh_CN.properties
--- 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
+++ 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
@@ -68,10 +68,10 @@
 HostName=\u4e3b\u673a\u540d
 FromProcess=<\u6765\u81ea\u8fdb\u7a0b>
 
-All_Processes_Lab=\u6240\u6709\u7528\u6237\u7684\u8fdb\u7a0b
-All_Processes=\u9009\u4e2d\u53ef\u83b7\u53d6\u6240\u6709\u7528\u6237\u7684\u6240\u6709\u8fdb\u7a0b
+All_Processes_Lab=\u4ec5\u7528\u6237\u8fdb\u7a0b
+All_Processes=\u9009\u4e2d\u4ee5\u4ec5\u83b7\u53d6\u7528\u6237\u8fdb\u7a0b
 
-ACSD_All_Processes=\u9009\u4e2d\u53ef\u83b7\u53d6\u6240\u6709\u7528\u6237\u7684\u6240\u6709\u8fdb\u7a0b
+ACSD_All_Processes=\u9009\u4e2d\u4ee5\u4ec5\u83b7\u53d6\u5f53\u524d\u7528\u6237\u8fdb\u7a0b
 
 
 ACSD_EditHosts=\u7f16\u8f91\u4e3b\u673a\u5217\u8868
diff -r b7c1c51ac6f9 -r 147c8984ddd2 src/zh_CN/cnd/cnd-debugger-common2/cnd-debugger-common2/org/netbeans/modules/cnd/debugger/common2/debugger/assembly/Bundle_zh_CN.properties
--- 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
+++ 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
@@ -60,6 +60,7 @@
 Reg_ACT_Show_All_Registers=\u663e\u793a\u6240\u6709\u5bc4\u5b58\u5668
 Reg_ACT_Hide=\u9690\u85cf\u9009\u5b9a\u7684\u5bc4\u5b58\u5668
 Reg_ACT_More_Info=\u8be6\u7ec6\u4fe1\u606f
+Reg_ACT_Data_Presentation=\u6570\u636e\u8868\u793a\u5f62\u5f0f
 
 #
 # OW: Memory window, Evaluation window
diff -r b7c1c51ac6f9 -r 147c8984ddd2 src/zh_CN/cnd/cnd-debugger-common2/cnd-debugger-common2/org/netbeans/modules/cnd/debugger/common2/debugger/options/Bundle_zh_CN.properties
--- 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
+++ 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
@@ -326,6 +326,13 @@
 ACSD_balloon_eval_on=\u6253\u5f00\u6c14\u7403\u8868\u8fbe\u5f0f\u6c42\u503c
 ACSD_balloon_eval_off=\u5173\u95ed\u6c14\u7403\u8868\u8fbe\u5f0f\u6c42\u503c
 
+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
+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
+
+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
+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
+
+
 LABEL_save_breakpoints=\u4fdd\u5b58\u5e76\u6062\u590d\u65ad\u70b9
 ACSD_save_breakpoints=\u4fdd\u5b58\u5e76\u6062\u590d\u65ad\u70b9
 
diff -r b7c1c51ac6f9 -r 147c8984ddd2 src/zh_CN/cnd/cnd-debugger-common2/cnd-debugger-common2/org/netbeans/modules/cnd/debugger/common2/ui/Bundle_zh_CN.properties
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ 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
@@ -0,0 +1,151 @@
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+#
+# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#
+# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
+# Other names may be trademarks of their respective owners.
+#
+# The contents of this file are subject to the terms of either the GNU
+# General Public License Version 2 only ("GPL") or the Common
+# Development and Distribution License("CDDL") (collectively, the
+# "License"). You may not use this file except in compliance with the
+# License. You can obtain a copy of the License at
+# http://www.netbeans.org/cddl-gplv2.html
+# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+# specific language governing permissions and limitations under the
+# License.  When distributing the software, include this License Header
+# Notice in each file and include the License file at
+# nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the GPL Version 2 section of the License file that
+# accompanied this code. If applicable, add the following below the
+# License Header, with the fields enclosed by brackets [] replaced by
+# your own identifying information:
+# "Portions Copyrighted [year] [name of copyright owner]"
+#
+# Contributor(s):
+#
+# The Original Software is NetBeans. The Initial Developer of the Original
+# Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
+# Microsystems, Inc. All Rights Reserved.
+#
+# If you wish your version of this file to be governed by only the CDDL
+# or only the GPL Version 2, indicate your decision by adding
+# "[Contributor] elects to include this software in this distribution
+# under the [CDDL or GPL Version 2] license." If you do not indicate a
+# single choice of license, a recipient has the option to distribute
+# your version of this file under either the CDDL, the GPL Version 2 or
+# to extend the choice of license to its licensees as provided above.
+# However, if you add GPL Version 2 code and therefore, elected the GPL
+# Version 2 license, then the option applies only if the new code is
+# made subject to such option by the copyright holder.
+
+# OLD #
+# OLD # AttachDialogAction
+# OLD #
+# OLD ATTACHDIALOG_ACTION_NAME=&Attach...
+
+ACSD_OK=\u786e\u5b9a
+ACSD_Cancel=\u53d6\u6d88
+
+#
+# AttachPanel
+#
+Refresh=\u5237\u65b0
+
+ACSD_Refresh=\u5237\u65b0\u8fdb\u7a0b\u5217\u8868
+
+CTL_Attach=\u8fde\u63a5\u8c03\u8bd5\u5668
+ACSD_CTL_AttachToProcess=\u5141\u8bb8\u8fde\u63a5\u5230\u4efb\u610f\u6b63\u5728\u8fd0\u884c\u7684\u8fdb\u7a0b
+AttachProcDiag_FilterColon=\u8fc7\u6ee4\u5668:
+
+AttachProcDiag_HostColon=\u4e3b\u673a:
+
+AttachProcDiag_Table=\u8981\u8fde\u63a5\u7684\u8fdb\u7a0b: 
+
+ACSD_AttachProcDiag_Table=\u53ef\u7528\u8fdb\u7a0b\u7684\u5217\u8868
+RegExp=\u6b63\u5219\u8868\u8fbe\u5f0f
+HostName=\u4e3b\u673a\u540d
+FromProcess=<\u6765\u81ea\u8fdb\u7a0b>
+
+All_Processes_Lab=\u4ec5\u7528\u6237\u8fdb\u7a0b
+All_Processes=\u9009\u4e2d\u4ee5\u4ec5\u83b7\u53d6\u7528\u6237\u8fdb\u7a0b
+
+ACSD_All_Processes=\u9009\u4e2d\u4ee5\u4ec5\u83b7\u53d6\u5f53\u524d\u7528\u6237\u8fdb\u7a0b
+
+
+ACSD_EditHosts=\u7f16\u8f91\u4e3b\u673a\u5217\u8868
+
+ACSD_Engine=\u8c03\u8bd5\u5f15\u64ce
+ACSD_Debugging_Engine=\u8c03\u8bd5\u5f15\u64ce
+ASSOCIATED_ENGINE_LBL=\u8c03\u8bd5\u5f15\u64ce: 
+
+ERROR_WRONG_FAMILY=\u8b66\u544a: \u9009\u5b9a\u7684\u9879\u76ee\u672a\u9488\u5bf9\u6b64\u8c03\u8bd5\u5668\u8fdb\u884c\u914d\u7f6e
+MSG_Uninitialized_Process_Table=\u8fdb\u7a0b\u8868\u5c1a\u672a\u521d\u59cb\u5316
+
+MSG_Gathering_Data=\u6b63\u5728\u6536\u96c6\u6570\u636e...
+MSG_PS_Failed=ps \u5931\u8d25, \u8bf7\u53c2\u89c1\u65e5\u5fd7\u4ee5\u4e86\u89e3\u66f4\u591a\u4fe1\u606f
+
+#
+# DebugCorePanel & ExecutableProjectPanel (used in AttachDialog)
+#
+
+ACSD_ExecutableBrowse=\u6d4f\u89c8\u53ef\u6267\u884c\u6587\u4ef6
+
+
+RUN_PROFILE_LBL=\u8fd0\u884c\u914d\u7f6e\u6587\u4ef6: 
+
+RUN_PROFILES_BUTTON_TXT=\u7f16\u8f91...
+CHOOSER_BUTTON=\u9009\u62e9
+DEFAULT_SET_TITLE=\u9ed8\u8ba4\u8bbe\u7f6e
+NEW_PROJECT=<\u65b0\u5efa\u9879\u76ee>
+NO_PROJECT=<\u65e0\u9879\u76ee>
+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
+// OLD GDB_ERROR_DONTAPPLY=dbxtool does not allow gdb debugger
+ERROR_NEED_EXEC=\u6b64\u8c03\u8bd5\u5668\u9700\u8981\u9644\u52a0\u53ef\u6267\u884c\u6587\u4ef6\u540d
+ERROR_DONTAPPLY=\u6b64\u8c03\u8bd5\u5668\u4e0d\u53d7\u652f\u6301
+DBX_ERROR_DONTAPPLY=gdbtool \u4e0d\u5141\u8bb8\u4f7f\u7528 dbx \u8c03\u8bd5\u5668
+ERROR_DONTEXIST=\u9009\u5b9a\u7684\u53ef\u6267\u884c\u6587\u4ef6\u4e0d\u5b58\u5728
+ERROR_NOTAEXEFILE=\u9009\u5b9a\u7684\u6587\u4ef6\u4e0d\u662f\u53ef\u6267\u884c\u6587\u4ef6
+ProgramPathname=\u8c03\u8bd5\u5668\u53ef\u4ee5\u5229\u7528\u6b64\u8def\u5f84\u540d\u6062\u590d\u524d\u4e00\u4f1a\u8bdd\u4e2d\u4fdd\u5b58\u7684\u65ad\u70b9
+
+#
+# DebugProjectAction
+#
+# LBL_LoadProgram=Load program
+LBL_LoadProgram=\u52a0\u8f7d\u7a0b\u5e8f...
+LBL_Start=\u8c03\u8bd5\u4e3b\u9879\u76ee
+LBL_Continue=\u7ee7\u7eed(&C)
+CoreExeChooser=\u9009\u62e9\u53ef\u6267\u884c\u6587\u4ef6
+
+#
+# DebuggingOptionsAction
+#
+CTL_DebuggingOptions=\u8c03\u8bd5\u9009\u9879(&D)...
+
+#
+# DetachAction
+#
+LBL_Detach=\u4e2d\u65ad\u8c03\u8bd5\u5668\u8fde\u63a5(&D)
+
+#
+
+OUTPUT_ATTACH_ACTION_TEXT=\u8fde\u63a5\u8c03\u8bd5\u5668
+
+ATTACH_HISTORY_MESSAGE=\u8fde\u63a5\u5230 {0}@{1} \u8fdb\u7a0b
+
+
+PROGRESS_PREPARE_TARGET=\u6b63\u5728\u51c6\u5907\u8981\u8fde\u63a5\u5230\u7684\u76ee\u6807...
+DebugCorePanel.Validating=\u6b63\u5728\u9a8c\u8bc1...
+DebugCorePanel.HOST_IS_NOT_VALID=\u672a\u8fde\u63a5\u4e3b\u673a
+
+ACSD_Project=\u8981\u4f7f\u7528\u7684\u9879\u76ee
+
+#
+# DebugFileAction
+#
+TITLE_Hosts=\u4e3b\u673a...
+
+HOST_LBL=\u4e3b\u673a:
+ExecutableProjectPanel.commandLine_N_A.text=<\u4e0d\u53ef\u7528>
+
diff -r b7c1c51ac6f9 -r 147c8984ddd2 src/zh_CN/cnd/cnd-debugger-common2/cnd-debugger-common2/org/netbeans/modules/cnd/debugger/common2/ui/processlist/Bundle_zh_CN.properties
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ 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
@@ -0,0 +1,88 @@
+ProcessListPanel.filterLabel.text=\u8fc7\u6ee4\u5668(&F):
+ProcessListPanel.refreshBtn.text=\u5237\u65b0(&R)
+ProcessListPanel.refreshBtn.toolTipText=\u5237\u65b0\u8fdb\u7a0b\u5217\u8868
+ProcessInfoPanel.jLabel1.text=\u547d\u4ee4\u884c:
+ProcessInfoPanel.commandLine_N_A.text=<\u4e0d\u53ef\u7528>
+WaitNode.displayName=\u6b63\u5728\u7b49\u5f85...
+ProcessListPanel.jToggleButton1.text=jToggleButton1
+ProcessListPanel.label=\u6811
+ProcessListPanel.toolTipText=\u6811\u6a21\u5f0f
+
+ProcessListPanel.listTogleButton.toolTipText=\u5217\u8868\u6a21\u5f0f
+
+ProcessListPanel.outlineHeaderName=PID
+ProcessListPanel.userProcessesOnlyCheckBox.text=\u4ec5\u663e\u793a\u7528\u6237\u8fdb\u7a0b
+
+#
+# DebugExecutableNodeAction
+#
+DEBUG_DIALOG_TITLE=\u8c03\u8bd5\u53ef\u6267\u884c\u6587\u4ef6
+DEBUG_ACTION_NAME=\u8c03\u8bd5
+
+#
+# DebugFileAction
+#
+TITLE_Hosts=\u4e3b\u673a...
+
+HOST_LBL=\u4e3b\u673a:
+
+#
+# AttachPanel
+#
+Refresh=\u5237\u65b0
+
+ACSD_Refresh=\u5237\u65b0\u8fdb\u7a0b\u5217\u8868
+
+CTL_Attach=\u8fde\u63a5\u8c03\u8bd5\u5668
+ACSD_CTL_AttachToProcess=\u5141\u8bb8\u8fde\u63a5\u5230\u4efb\u610f\u6b63\u5728\u8fd0\u884c\u7684\u8fdb\u7a0b
+AttachProcDiag_FilterColon=\u8fc7\u6ee4\u5668:
+
+AttachProcDiag_HostColon=\u4e3b\u673a:
+
+AttachProcDiag_Table=\u8981\u8fde\u63a5\u7684\u8fdb\u7a0b: 
+
+ACSD_AttachProcDiag_Table=\u53ef\u7528\u8fdb\u7a0b\u7684\u5217\u8868
+RegExp=\u6b63\u5219\u8868\u8fbe\u5f0f
+HostName=\u4e3b\u673a\u540d
+FromProcess=<\u6765\u81ea\u8fdb\u7a0b>
+
+All_Processes_Lab=\u4ec5\u7528\u6237\u8fdb\u7a0b
+All_Processes=\u9009\u4e2d\u4ee5\u4ec5\u83b7\u53d6\u7528\u6237\u8fdb\u7a0b
+
+ACSD_All_Processes=\u9009\u4e2d\u4ee5\u4ec5\u83b7\u53d6\u5f53\u524d\u7528\u6237\u8fdb\u7a0b
+
+
+ACSD_EditHosts=\u7f16\u8f91\u4e3b\u673a\u5217\u8868
+
+ACSD_Engine=\u8c03\u8bd5\u5f15\u64ce
+ACSD_Debugging_Engine=\u8c03\u8bd5\u5f15\u64ce
+ASSOCIATED_ENGINE_LBL=\u8c03\u8bd5\u5f15\u64ce: 
+
+ERROR_WRONG_FAMILY=\u8b66\u544a: \u9009\u5b9a\u7684\u9879\u76ee\u672a\u9488\u5bf9\u6b64\u8c03\u8bd5\u5668\u8fdb\u884c\u914d\u7f6e
+MSG_Uninitialized_Process_Table=\u8fdb\u7a0b\u8868\u5c1a\u672a\u521d\u59cb\u5316
+
+MSG_Gathering_Data=\u6b63\u5728\u6536\u96c6\u6570\u636e...
+MSG_PS_Failed=ps \u5931\u8d25, \u8bf7\u53c2\u89c1\u65e5\u5fd7\u4ee5\u4e86\u89e3\u66f4\u591a\u4fe1\u606f
+
+
+# OLD #
+# OLD # Debug->Windows menu stuff
+# OLD #
+# OLD 
+# OLD CTL_DebugWindowsMenuAction=Windows
+# OLD MNEM_DebugWindowsMenuAction=W
+
+OUTPUT_ATTACH_ACTION_TEXT=\u8fde\u63a5\u8c03\u8bd5\u5668
+
+ATTACH_HISTORY_MESSAGE=\u8fde\u63a5\u5230 {0}@{1} \u8fdb\u7a0b
+
+Dis_ACT_Go_To_Source=\u8f6c\u81f3\u6e90\u4ee3\u7801
+Dis_ACT_Show_Current_Statement=\u663e\u793a\u5f53\u524d\u8bed\u53e5
+
+PROGRESS_PREPARE_TARGET=\u6b63\u5728\u51c6\u5907\u8981\u8fde\u63a5\u5230\u7684\u76ee\u6807...
+DebugCorePanel.Validating=\u6b63\u5728\u9a8c\u8bc1...
+DebugCorePanel.HOST_IS_NOT_VALID=\u672a\u8fde\u63a5\u4e3b\u673a
+
+Tree_Loading=\u6b63\u5728\u52a0\u8f7d...
+
+
diff -r b7c1c51ac6f9 -r 147c8984ddd2 src/zh_CN/cnd/cnd-debugger-common2/cnd-debugger-common2/org/netbeans/modules/cnd/debugger/common2/utils/Bundle_zh_CN.properties
--- 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
+++ 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
@@ -110,6 +110,12 @@
 
 # PsProvider
 # Should not be translated
+PS_HDR_ZONE=ZONE
+# Should not be translated
+
+# Should not be translated
+PS_HDR_USER=USER
+# Should not be translated
 
 # Should not be translated
 
@@ -122,7 +128,7 @@
 # Should not be translated
 
 # Should not be translated
-
+PS_HDR_COMM=COMMAND
 # Should not be translated
 
 # Should not be translated
diff -r b7c1c51ac6f9 -r 147c8984ddd2 src/zh_CN/cnd/cnd-debugger-gdb2/cnd-debugger-gdb2/org/netbeans/modules/cnd/debugger/gdb2/Bundle_zh_CN.properties
--- 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
+++ 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
@@ -76,7 +76,7 @@
 MSG_GdbUnexpectedlyStopped=GDB \u5df2\u610f\u5916\u505c\u6b62\u5e76\u8fd4\u56de{0}
 MSG_InvalidLocation = "\u65ad\u70b9\u4f4d\u7f6e\u4e0d\u5b58\u5728\u3002"
 MSG_OldGdbVersion=\u5347\u7ea7 GDB \u4ee5\u4f7f\u7528\u8c03\u8bd5\u89c6\u56fe
-MSG_OldGdbVersionConsole=\u5347\u7ea7 GDB \u4ee5\u4f7f\u7528\u8c03\u8bd5\u5668\u63a7\u5236\u53f0
+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
 MSG_NonExistentWorkDir=\u5de5\u4f5c\u76ee\u5f55\u5f15\u7528\u4e86\u4e0d\u5b58\u5728\u7684\u8def\u5f84: {0}
 
 #
@@ -125,6 +125,10 @@
 
 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
 MSG_Do_Not_Show_Again_In_Session=\u5728\u5f53\u524d IDE \u4f1a\u8bdd\u671f\u95f4\u4e0d\u518d\u663e\u793a
+#
+# For error (dialog) stuff
+#
+INFORMATION=\u4fe1\u606f
 
 MSG_Reverse_Debugging_Option=\u4e0d\u5e94\u542f\u7528\u9006\u5411\u8c03\u8bd5\u9009\u9879!
 
diff -r b7c1c51ac6f9 -r 147c8984ddd2 src/zh_CN/cnd/cnd-debugger-gdb2/cnd-debugger-gdb2/org/netbeans/modules/cnd/debugger/gdb2/actions/Bundle_zh_CN.properties
--- 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
+++ 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
@@ -40,7 +40,7 @@
 # Version 2 license, then the option applies only if the new code is
 # made subject to such option by the copyright holder.
 
-GdbDebuggerEngine=\u4f7f\u7528 Gdb \u8c03\u8bd5\u5668
+GdbDebuggerEngine=Gdb \u8c03\u8bd5\u5668
 
 
 
diff -r b7c1c51ac6f9 -r 147c8984ddd2 src/zh_CN/cnd/cnd-highlight/cnd-highlight/org/netbeans/modules/cnd/highlight/semantic/Bundle_zh_CN.properties
--- 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
+++ 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
@@ -46,14 +46,14 @@
 Show-fast-class-fields=\u7a81\u51fa\u663e\u793a\u7c7b\u5b57\u6bb5\u58f0\u660e(&S)
 Show-fast-class-fields-AD=\u91c7\u7528\u7a81\u51fa\u663e\u793a\u683c\u5f0f\u663e\u793a\u7c7b\u5b57\u6bb5\u58f0\u660e
 
-Show-class-fields=\u7a81\u51fa\u663e\u793a\u7c7b\u5b57\u6bb5(&F)
-Show-class-fields-AD=\u91c7\u7528\u7a81\u51fa\u663e\u793a\u683c\u5f0f\u663e\u793a\u7c7b\u5b57\u6bb5
+Show-class-fields=\u7a81\u51fa\u663e\u793a\u7c7b\u5b57\u6bb5\u7528\u6cd5(&F)
+Show-class-fields-AD=\u91c7\u7528\u7a81\u51fa\u663e\u793a\u683c\u5f0f\u663e\u793a\u7c7b\u5b57\u6bb5\u7528\u6cd5
 
-Show-fast-functions-names=\u7a81\u51fa\u663e\u793a\u51fd\u6570\u540d\u79f0\u58f0\u660e\u548c\u5b9a\u4e49(&D)
-Show-fast-functions-names-AD=\u91c7\u7528\u7a81\u51fa\u663e\u793a\u683c\u5f0f\u663e\u793a\u51fd\u6570\u540d\u79f0\u58f0\u660e\u548c\u5b9a\u4e49
+Show-fast-functions-names=\u7a81\u51fa\u663e\u793a\u51fd\u6570\u58f0\u660e(&D)
+Show-fast-functions-names-AD=\u91c7\u7528\u7a81\u51fa\u663e\u793a\u683c\u5f0f\u663e\u793a\u51fd\u6570\u58f0\u660e
 
-Show-functions-names=\u7a81\u51fa\u663e\u793a\u51fd\u6570\u540d(&N)
-Show-functions-names-AD=\u91c7\u7528\u7a81\u51fa\u663e\u793a\u683c\u5f0f\u663e\u793a\u51fd\u6570\u540d
+Show-functions-names=\u7a81\u51fa\u663e\u793a\u51fd\u6570\u7528\u6cd5(&N)
+Show-functions-names-AD=\u91c7\u7528\u7a81\u51fa\u663e\u793a\u683c\u5f0f\u663e\u793a\u51fd\u6570\u7528\u6cd5
 
 Show-macros=\u7a81\u51fa\u663e\u793a\u5b8f(&M)
 Show-macros-AD=\u91c7\u7528\u7a81\u51fa\u663e\u793a\u683c\u5f0f\u663e\u793a\u5b8f
@@ -64,5 +64,21 @@
 Show-unused-variables=\u7a81\u51fa\u663e\u793a\u672a\u4f7f\u7528\u7684\u53d8\u91cf(&V)
 Show-unused-variables-AD=\u91c7\u7528\u7a81\u51fa\u663e\u793a\u683c\u5f0f\u663e\u793a\u672a\u4f7f\u7528\u7684\u53d8\u91cf
 
+Show-fast-enums-names=\u7a81\u51fa\u663e\u793a\u679a\u4e3e\u58f0\u660e
+Show-fast-enums-names-AD=\u91c7\u7528\u7a81\u51fa\u663e\u793a\u683c\u5f0f\u663e\u793a\u679a\u4e3e\u58f0\u660e
 
+Show-enums-names=\u7a81\u51fa\u663e\u793a\u679a\u4e3e\u7528\u6cd5
+Show-enums-names-AD=\u91c7\u7528\u7a81\u51fa\u663e\u793a\u683c\u5f0f\u663e\u793a\u679a\u4e3e\u7528\u6cd5
 
+Show-fast-classes-names=\u7a81\u51fa\u663e\u793a\u7c7b\u58f0\u660e
+Show-fast-classes-names-AD=\u91c7\u7528\u7a81\u51fa\u663e\u793a\u683c\u5f0f\u663e\u793a\u7c7b\u58f0\u660e
+
+Show-classes-names=\u7a81\u51fa\u663e\u793a\u7c7b\u7528\u6cd5
+Show-classes-names-AD=\u91c7\u7528\u7a81\u51fa\u663e\u793a\u683c\u5f0f\u663e\u793a\u7c7b\u7528\u6cd5
+
+Show-fast-enumerators-names=\u7a81\u51fa\u663e\u793a\u679a\u4e3e\u5668\u58f0\u660e
+Show-fast-enumerators-names-AD=\u91c7\u7528\u7a81\u51fa\u663e\u793a\u683c\u5f0f\u663e\u793a\u679a\u4e3e\u5668\u58f0\u660e
+
+Show-enumerators-names=\u7a81\u51fa\u663e\u793a\u679a\u4e3e\u5668\u7528\u6cd5
+Show-enumerators-names-AD=\u91c7\u7528\u7a81\u51fa\u663e\u793a\u683c\u5f0f\u663e\u793a\u679a\u4e3e\u5668\u7528\u6cd5
+
diff -r b7c1c51ac6f9 -r 147c8984ddd2 src/zh_CN/cnd/cnd-makeproject-ui/cnd-makeproject-ui/org/netbeans/modules/cnd/makeproject/ui/launchers/actions/Bundle_zh_CN.properties
--- 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
+++ 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
@@ -65,7 +65,7 @@
 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>
 LaunchersPanel.hideCheckBox.text=\u9690\u85cf(&I)
 HideTooltip=\u5728\u5f39\u51fa\u83dc\u5355\u4e2d\u9690\u85cf\u542f\u52a8\u7a0b\u5e8f\u3002
-LaunchersPanel.runInOwnTabCheckBox.text=\u5728\u81ea\u5df1\u7684\u8f93\u51fa\u6807\u7b7e\u4e2d\u8fd0\u884c(&T)
+LaunchersPanel.runInOwnTabCheckBox.text=\u5728\u81ea\u5df1\u7684\u8f93\u51fa\u6807\u7b7e\u4e2d\u8fd0\u884c(&U)
 
 LBL_BuildAsAction_Name=\u6784\u5efa
 LBL_RunAsAction_Name=\u8fd0\u884c
diff -r b7c1c51ac6f9 -r 147c8984ddd2 src/zh_CN/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/api/Bundle_zh_CN.properties
--- 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
+++ 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
@@ -66,6 +66,7 @@
 TXT_Auto=\u81ea\u52a8
 TXT_AlwaysRelative=\u59cb\u7ec8\u76f8\u5bf9\u8def\u5f84
 TXT_AlwaysAbsolute=\u59cb\u7ec8\u7edd\u5bf9\u8def\u5f84
+NO_PROJECT=\u65e0\u9879\u76ee
 
 
 
diff -r b7c1c51ac6f9 -r 147c8984ddd2 src/zh_CN/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/resources/samples/fractal_zh_CN.html
--- 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
+++ 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
@@ -1,9 +1,44 @@
- <!--
- - Copyright 2006-2007 Sun Microsystems, Inc. All rights reserved.
- - SUN PROPRIETARY/CONFIDENTIAL.
- - Use is subject to license terms.
- -->
-
+<!--
+   - DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+   -
+   - Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
+   -
+   - The contents of this file are subject to the terms of either the GNU
+   - General Public License Version 2 only ("GPL") or the Common
+   - Development and Distribution License("CDDL") (collectively, the
+   - "License"). You may not use this file except in compliance with the
+   - License. You can obtain a copy of the License at
+   - http://www.netbeans.org/cddl-gplv2.html
+   - or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+   - specific language governing permissions and limitations under the
+   - License.  When distributing the software, include this License Header
+   - Notice in each file and include the License file at
+   - nbbuild/licenses/CDDL-GPL-2-CP.  Sun designates this
+   - particular file as subject to the "Classpath" exception as provided
+   - by Sun in the GPL Version 2 section of the License file that
+   - accompanied this code. If applicable, add the following below the
+   - License Header, with the fields enclosed by brackets [] replaced by
+   - your own identifying information:
+   - "Portions Copyrighted [year] [name of copyright owner]"
+   -
+   - Contributor(s):
+   -
+   - The Original Software is NetBeans. The Initial Developer of the Original
+   - Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
+   - Microsystems, Inc. All Rights Reserved.
+   -
+   - If you wish your version of this file to be governed by only the CDDL
+   - or only the GPL Version 2, indicate your decision by adding
+   - "[Contributor] elects to include this software in this distribution
+   - under the [CDDL or GPL Version 2] license." If you do not indicate a
+   - single choice of license, a recipient has the option to distribute
+   - your version of this file under either the CDDL, the GPL Version 2 or
+   - to extend the choice of license to its licensees as provided above.
+   - However, if you add GPL Version 2 code and therefore, elected the GPL
+   - Version 2 license, then the option applies only if the new code is
+   - made subject to such option by the copyright holder.
+  -->
+  
 <HTML>
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
diff -r b7c1c51ac6f9 -r 147c8984ddd2 src/zh_CN/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/resources/samples/hello_zh_CN.html
--- 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
+++ 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
@@ -1,9 +1,44 @@
- <!--
- - Copyright 2006-2007 Sun Microsystems, Inc. All rights reserved.
- - SUN PROPRIETARY/CONFIDENTIAL.
- - Use is subject to license terms.
- -->
-
+<!--
+   - DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+   -
+   - Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
+   -
+   - The contents of this file are subject to the terms of either the GNU
+   - General Public License Version 2 only ("GPL") or the Common
+   - Development and Distribution License("CDDL") (collectively, the
+   - "License"). You may not use this file except in compliance with the
+   - License. You can obtain a copy of the License at
+   - http://www.netbeans.org/cddl-gplv2.html
+   - or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+   - specific language governing permissions and limitations under the
+   - License.  When distributing the software, include this License Header
+   - Notice in each file and include the License file at
+   - nbbuild/licenses/CDDL-GPL-2-CP.  Sun designates this
+   - particular file as subject to the "Classpath" exception as provided
+   - by Sun in the GPL Version 2 section of the License file that
+   - accompanied this code. If applicable, add the following below the
+   - License Header, with the fields enclosed by brackets [] replaced by
+   - your own identifying information:
+   - "Portions Copyrighted [year] [name of copyright owner]"
+   -
+   - Contributor(s):
+   -
+   - The Original Software is NetBeans. The Initial Developer of the Original
+   - Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
+   - Microsystems, Inc. All Rights Reserved.
+   -
+   - If you wish your version of this file to be governed by only the CDDL
+   - or only the GPL Version 2, indicate your decision by adding
+   - "[Contributor] elects to include this software in this distribution
+   - under the [CDDL or GPL Version 2] license." If you do not indicate a
+   - single choice of license, a recipient has the option to distribute
+   - your version of this file under either the CDDL, the GPL Version 2 or
+   - to extend the choice of license to its licensees as provided above.
+   - However, if you add GPL Version 2 code and therefore, elected the GPL
+   - Version 2 license, then the option applies only if the new code is
+   - made subject to such option by the copyright holder.
+  -->
+  
 <HTML>
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
diff -r b7c1c51ac6f9 -r 147c8984ddd2 src/zh_CN/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/resources/samples/lexyacc_zh_CN.html
--- 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
+++ 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
@@ -1,9 +1,44 @@
- <!--
- - Copyright 2006-2007 Sun Microsystems, Inc. All rights reserved.
- - SUN PROPRIETARY/CONFIDENTIAL.
- - Use is subject to license terms.
- -->
-
+<!--
+   - DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+   -
+   - Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
+   -
+   - The contents of this file are subject to the terms of either the GNU
+   - General Public License Version 2 only ("GPL") or the Common
+   - Development and Distribution License("CDDL") (collectively, the
+   - "License"). You may not use this file except in compliance with the
+   - License. You can obtain a copy of the License at
+   - http://www.netbeans.org/cddl-gplv2.html
+   - or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+   - specific language governing permissions and limitations under the
+   - License.  When distributing the software, include this License Header
+   - Notice in each file and include the License file at
+   - nbbuild/licenses/CDDL-GPL-2-CP.  Sun designates this
+   - particular file as subject to the "Classpath" exception as provided
+   - by Sun in the GPL Version 2 section of the License file that
+   - accompanied this code. If applicable, add the following below the
+   - License Header, with the fields enclosed by brackets [] replaced by
+   - your own identifying information:
+   - "Portions Copyrighted [year] [name of copyright owner]"
+   -
+   - Contributor(s):
+   -
+   - The Original Software is NetBeans. The Initial Developer of the Original
+   - Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
+   - Microsystems, Inc. All Rights Reserved.
+   -
+   - If you wish your version of this file to be governed by only the CDDL
+   - or only the GPL Version 2, indicate your decision by adding
+   - "[Contributor] elects to include this software in this distribution
+   - under the [CDDL or GPL Version 2] license." If you do not indicate a
+   - single choice of license, a recipient has the option to distribute
+   - your version of this file under either the CDDL, the GPL Version 2 or
+   - to extend the choice of license to its licensees as provided above.
+   - However, if you add GPL Version 2 code and therefore, elected the GPL
+   - Version 2 license, then the option applies only if the new code is
+   - made subject to such option by the copyright holder.
+  -->
+  
 <HTML>
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
diff -r b7c1c51ac6f9 -r 147c8984ddd2 src/zh_CN/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/resources/samples/pi_zh_CN.html
--- 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
+++ 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
@@ -1,9 +1,44 @@
- <!--
- - Copyright 2006-2007 Sun Microsystems, Inc. All rights reserved.
- - SUN PROPRIETARY/CONFIDENTIAL.
- - Use is subject to license terms.
- -->
-
+<!--
+   - DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+   -
+   - Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
+   -
+   - The contents of this file are subject to the terms of either the GNU
+   - General Public License Version 2 only ("GPL") or the Common
+   - Development and Distribution License("CDDL") (collectively, the
+   - "License"). You may not use this file except in compliance with the
+   - License. You can obtain a copy of the License at
+   - http://www.netbeans.org/cddl-gplv2.html
+   - or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+   - specific language governing permissions and limitations under the
+   - License.  When distributing the software, include this License Header
+   - Notice in each file and include the License file at
+   - nbbuild/licenses/CDDL-GPL-2-CP.  Sun designates this
+   - particular file as subject to the "Classpath" exception as provided
+   - by Sun in the GPL Version 2 section of the License file that
+   - accompanied this code. If applicable, add the following below the
+   - License Header, with the fields enclosed by brackets [] replaced by
+   - your own identifying information:
+   - "Portions Copyrighted [year] [name of copyright owner]"
+   -
+   - Contributor(s):
+   -
+   - The Original Software is NetBeans. The Initial Developer of the Original
+   - Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
+   - Microsystems, Inc. All Rights Reserved.
+   -
+   - If you wish your version of this file to be governed by only the CDDL
+   - or only the GPL Version 2, indicate your decision by adding
+   - "[Contributor] elects to include this software in this distribution
+   - under the [CDDL or GPL Version 2] license." If you do not indicate a
+   - single choice of license, a recipient has the option to distribute
+   - your version of this file under either the CDDL, the GPL Version 2 or
+   - to extend the choice of license to its licensees as provided above.
+   - However, if you add GPL Version 2 code and therefore, elected the GPL
+   - Version 2 license, then the option applies only if the new code is
+   - made subject to such option by the copyright holder.
+  -->
+  
 <HTML>
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
diff -r b7c1c51ac6f9 -r 147c8984ddd2 src/zh_CN/cnd/cnd-modelui/cnd-modelui/org/netbeans/modules/cnd/modelui/actions/Bundle_zh_CN.properties
--- 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
+++ 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
@@ -37,4 +37,5 @@
 CTL_ReparseProject=\u91cd\u65b0\u89e3\u6790\u9879\u76ee
 CTL_ReparseProjects=\u91cd\u65b0\u89e3\u6790 {0} \u4e2a\u9879\u76ee
 CTL_CodeModelDiagnostic=\u8f6c\u50a8 C/C++ \u4ee3\u7801\u6a21\u578b\u8bca\u65ad
+CTL_ForceReparseProject=\u6e05\u7406 C/C++ \u9ad8\u901f\u7f13\u5b58\u5e76\u91cd\u65b0\u542f\u52a8 IDE
 
diff -r b7c1c51ac6f9 -r 147c8984ddd2 src/zh_CN/cnd/cnd-modelutil/cnd-modelutil/org/netbeans/modules/cnd/modelutil/resources/Bundle_zh_CN.properties
--- 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
+++ 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
@@ -41,11 +41,17 @@
 
 cc-highlighting-inactive=\u4e0d\u6d3b\u52a8\u7684\u9884\u5904\u7406\u7a0b\u5e8f\u5757
 cc-highlighting-macros=\u4ee3\u7801\u4e2d\u5b9a\u4e49\u7684\u5b8f
-cc-highlighting-macros-system=\u9884\u5b9a\u4e49\u7684\u5b8f
+cc-highlighting-macros-system=\u9884\u5b9a\u4e49\u5b8f
 cc-highlighting-macros-user=\u9879\u76ee\u4e2d\u5b9a\u4e49\u7684\u5b8f
 cc-highlighting-class-fields=\u5b57\u6bb5
 cc-highlighting-typedefs=\u7c7b\u578b\u5b9a\u4e49
 cc-highlighting-unused-variables=\u672a\u4f7f\u7528\u7684\u53d8\u91cf
 cc-highlighting-function=\u51fd\u6570\u58f0\u660e
 cc-highlighting-function-usage=\u51fd\u6570\u7528\u6cd5
+cc-highlighting-enum=\u679a\u4e3e\u58f0\u660e
+cc-highlighting-enum-usage=\u679a\u4e3e\u7528\u6cd5
+cc-highlighting-enumerator=\u679a\u4e3e\u5668\u58f0\u660e
+cc-highlighting-enumerator-usage=\u679a\u4e3e\u5668\u7528\u6cd5
+cc-highlighting-class=\u7c7b\u58f0\u660e
+cc-highlighting-class-usage=\u7c7b\u7528\u6cd5
 
diff -r b7c1c51ac6f9 -r 147c8984ddd2 src/zh_CN/cnd/cnd-refactoring/cnd-refactoring/org/netbeans/modules/cnd/refactoring/plugins/Bundle_zh_CN.properties
--- 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
+++ 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
@@ -266,6 +266,9 @@
 #Find Usages Filters
 TXT_Filter_Comments=\u6ce8\u91ca\u8fc7\u6ee4\u5668
 TXT_Filter_DeadCode=\u505c\u7528\u7684\u4ee3\u7801\u8fc7\u6ee4\u5668
+TXT_Filter_Read=\u72ec\u5360\u8bfb\u53d6\u8fc7\u6ee4\u5668
+TXT_Filter_Write=\u72ec\u5360\u5199\u5165\u8fc7\u6ee4\u5668
+TXT_Filter_ReadWrite=\u8bfb\u53d6/\u5199\u5165\u8fc7\u6ee4\u5668
 TXT_Filter_Declarations=\u58f0\u660e\u548c\u5b9a\u4e49\u8fc7\u6ee4\u5668
 TXT_Filter_Macros=\u5b8f\u8fc7\u6ee4\u5668
 TXT_Filter_Scope=\u9650\u5b9a\u540d\u79f0\u8fc7\u6ee4\u5668\u4e2d\u7684\u7c7b\u540d
diff -r b7c1c51ac6f9 -r 147c8984ddd2 src/zh_CN/cnd/cnd-toolchain-ui/cnd-toolchain-ui/org/netbeans/modules/cnd/api/toolchain/ui/Bundle_zh_CN.properties
--- 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
+++ 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
@@ -56,7 +56,7 @@
 
 MODIFY_PATH_VARIABLE=\u8def\u5f84\u53d8\u91cf
 
-PathEnvVariables.addLabel.text=\u5728 PATH \u73af\u5883\u53d8\u91cf\u4e2d\u6dfb\u52a0\u5de5\u5177\u96c6\u5408\u8def\u5f84
+PathEnvVariables.addLabel.text=\u5c06\u5de5\u5177\u96c6\u5408\u8def\u5f84\u6dfb\u52a0\u5230 PATH \u73af\u5883\u53d8\u91cf
 
 PathEnvVariables.toolsVariableTextField.text=TOOLS_PATH
 PathEnvVariables.utilitiesVariableTextField.text=UTILITIES_PATH
diff -r b7c1c51ac6f9 -r 147c8984ddd2 src/zh_CN/cnd/org-netbeans-libs-clank/ext/org-clang-analysis/org/clang/analysis/resources/Bundle_zh_CN.properties
--- 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
+++ 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
@@ -1,4 +1,4 @@
 OpenIDE-Module-Long-Description=clang/\u5206\u6790
-OpenIDE-Module-Name=Clank clang/\u5206\u6790
+OpenIDE-Module-Name=Clank clang/\u5206\u6790 (3.9 NO_BODY)
 OpenIDE-Module-Short-Description=clang/\u5206\u6790
 
diff -r b7c1c51ac6f9 -r 147c8984ddd2 src/zh_CN/cnd/org-netbeans-libs-clank/ext/org-clang-ast/org/clang/ast/resources/Bundle_zh_CN.properties
--- 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
+++ 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
@@ -1,4 +1,4 @@
 OpenIDE-Module-Long-Description=clang/AST
-OpenIDE-Module-Name=Clank clang/AST
+OpenIDE-Module-Name=Clank clang/AST (3.9 NO_BODY)
 OpenIDE-Module-Short-Description=clang/AST
 
diff -r b7c1c51ac6f9 -r 147c8984ddd2 src/zh_CN/cnd/org-netbeans-libs-clank/ext/org-clang-astmatchers/org/clang/astmatchers/resources/Bundle_zh_CN.properties
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ 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
@@ -0,0 +1,2 @@
+OpenIDE-Module-Name=Clank clang/ASTMatchers (3.9 NO_BODY)
+
diff -r b7c1c51ac6f9 -r 147c8984ddd2 src/zh_CN/cnd/org-netbeans-libs-clank/ext/org-clang-basic/org/clang/basic/resources/Bundle_zh_CN.properties
--- 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
+++ 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
@@ -1,4 +1,4 @@
 OpenIDE-Module-Long-Description=clang/\u57fa\u672c
-OpenIDE-Module-Name=Clank clang/\u57fa\u672c
+OpenIDE-Module-Name=Clank clang/\u57fa\u672c (3.9 DONE)
 OpenIDE-Module-Short-Description=clang/\u57fa\u672c
 
diff -r b7c1c51ac6f9 -r 147c8984ddd2 src/zh_CN/cnd/org-netbeans-libs-clank/ext/org-clang-clangc/org/clang/clangc/resources/Bundle_zh_CN.properties
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ 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
@@ -0,0 +1,2 @@
+OpenIDE-Module-Name=Clank clang/Clang-C (libClang API) (3.9 DONE)
+
diff -r b7c1c51ac6f9 -r 147c8984ddd2 src/zh_CN/cnd/org-netbeans-libs-clank/ext/org-clang-driver/org/clang/driver/resources/Bundle_zh_CN.properties
--- 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
+++ 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
@@ -1,4 +1,4 @@
 OpenIDE-Module-Long-Description=clang/\u9a71\u52a8\u7a0b\u5e8f
-OpenIDE-Module-Name=Clank clang/\u9a71\u52a8\u7a0b\u5e8f
+OpenIDE-Module-Name=Clank clang/\u9a71\u52a8\u7a0b\u5e8f (3.9 DONE)
 OpenIDE-Module-Short-Description=clang/\u9a71\u52a8\u7a0b\u5e8f
 
diff -r b7c1c51ac6f9 -r 147c8984ddd2 src/zh_CN/cnd/org-netbeans-libs-clank/ext/org-clang-edit/org/clang/edit/Bundle_zh_CN.properties
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ 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
@@ -0,0 +1,4 @@
+OpenIDE-Module-Long-Description=clang/\u7f16\u8f91
+OpenIDE-Module-Name=Clank clang/\u7f16\u8f91 (3.9 DONE)
+OpenIDE-Module-Short-Description=clang/\u7f16\u8f91
+
diff -r b7c1c51ac6f9 -r 147c8984ddd2 src/zh_CN/cnd/org-netbeans-libs-clank/ext/org-clang-format/org/clang/format/resources/Bundle_zh_CN.properties
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ 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
@@ -0,0 +1,2 @@
+OpenIDE-Module-Name=Clank clang/\u683c\u5f0f (3.9 NO_BODY)
+
diff -r b7c1c51ac6f9 -r 147c8984ddd2 src/zh_CN/cnd/org-netbeans-libs-clank/ext/org-clang-frontend/org/clang/frontend/resources/Bundle_zh_CN.properties
--- 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
+++ 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
@@ -1,4 +1,4 @@
 OpenIDE-Module-Long-Description=clang/\u524d\u7aef
-OpenIDE-Module-Name=Clank clang/\u524d\u7aef
+OpenIDE-Module-Name=Clank clang/\u524d\u7aef (3.9 DONE)
 OpenIDE-Module-Short-Description=clang/\u524d\u7aef
 
diff -r b7c1c51ac6f9 -r 147c8984ddd2 src/zh_CN/cnd/org-netbeans-libs-clank/ext/org-clang-frontendtool/org/clang/frontendtool/resources/Bundle_zh_CN.properties
--- 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
+++ 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
@@ -1,4 +1,4 @@
 OpenIDE-Module-Long-Description=clang/\u524d\u7aef\u5de5\u5177
-OpenIDE-Module-Name=Clank clang/\u524d\u7aef\u5de5\u5177
+OpenIDE-Module-Name=Clank clang/\u524d\u7aef\u5de5\u5177 (3.9 DONE)
 OpenIDE-Module-Short-Description=clang/\u524d\u7aef\u5de5\u5177
 
diff -r b7c1c51ac6f9 -r 147c8984ddd2 src/zh_CN/cnd/org-netbeans-libs-clank/ext/org-clang-index/org/clang/index/resources/Bundle_zh_CN.properties
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ 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
@@ -0,0 +1,2 @@
+OpenIDE-Module-Name=Clank clang/\u7d22\u5f15
+
diff -r b7c1c51ac6f9 -r 147c8984ddd2 src/zh_CN/cnd/org-netbeans-libs-clank/ext/org-clang-lex/org/clang/lex/resources/Bundle_zh_CN.properties
--- 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
+++ 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
@@ -1,4 +1,4 @@
 OpenIDE-Module-Long-Description=clang/Lex
-OpenIDE-Module-Name=Clank clang/Lex
+OpenIDE-Module-Name=Clank clang/Lex (3.9 DONE)
 OpenIDE-Module-Short-Description=clang/Lex
 
diff -r b7c1c51ac6f9 -r 147c8984ddd2 src/zh_CN/cnd/org-netbeans-libs-clank/ext/org-clang-parse/org/clang/parse/resources/Bundle_zh_CN.properties
--- 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
+++ 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
@@ -1,4 +1,4 @@
 OpenIDE-Module-Long-Description=clang/\u89e3\u6790
-OpenIDE-Module-Name=Clank clang/\u89e3\u6790
+OpenIDE-Module-Name=Clank clang/\u89e3\u6790 (3.9 DOING BODY)
 OpenIDE-Module-Short-Description=clang/\u89e3\u6790
 
diff -r b7c1c51ac6f9 -r 147c8984ddd2 src/zh_CN/cnd/org-netbeans-libs-clank/ext/org-clang-rewrite/org/clang/rewrite/resources/Bundle_zh_CN.properties
--- 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
+++ 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
@@ -1,2 +1,2 @@
-OpenIDE-Module-Name=Clank clang/\u91cd\u5199
+OpenIDE-Module-Name=Clank clang/\u91cd\u5199 (3.9 DONE)
 
diff -r b7c1c51ac6f9 -r 147c8984ddd2 src/zh_CN/cnd/org-netbeans-libs-clank/ext/org-clang-sema/org/clang/sema/resources/Bundle_zh_CN.properties
--- 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
+++ 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
@@ -1,4 +1,4 @@
 OpenIDE-Module-Long-Description=clang/Sema
-OpenIDE-Module-Name=Clank clang/Sema
+OpenIDE-Module-Name=Clank clang/Sema (3.9 NO_BODY)
 OpenIDE-Module-Short-Description=clang/Sema
 
diff -r b7c1c51ac6f9 -r 147c8984ddd2 src/zh_CN/cnd/org-netbeans-libs-clank/ext/org-clang-serialization/org/clang/serialization/resources/Bundle_zh_CN.properties
--- 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
+++ 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
@@ -1,4 +1,4 @@
 OpenIDE-Module-Long-Description=clang/\u4e32\u884c\u5316
-OpenIDE-Module-Name=Clank clang/\u4e32\u884c\u5316
+OpenIDE-Module-Name=Clank clang/\u4e32\u884c\u5316 (3.9 NO_BODY)
 OpenIDE-Module-Short-Description=clang/\u4e32\u884c\u5316
 
diff -r b7c1c51ac6f9 -r 147c8984ddd2 src/zh_CN/cnd/org-netbeans-libs-clank/ext/org-clang-tidy/org/clang/tidy/resources/Bundle_zh_CN.properties
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ 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
@@ -0,0 +1,2 @@
+OpenIDE-Module-Name=Clank clang/Tidy
+
diff -r b7c1c51ac6f9 -r 147c8984ddd2 src/zh_CN/cnd/org-netbeans-libs-clank/ext/org-clang-tooling/org/clang/tooling/resources/Bundle_zh_CN.properties
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ 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
@@ -0,0 +1,2 @@
+OpenIDE-Module-Name=Clank clang/\u5de5\u5177 (3.9 NO_BODY)
+
diff -r b7c1c51ac6f9 -r 147c8984ddd2 src/zh_CN/cnd/org-netbeans-libs-clank/ext/org-clang-tools-driver/org/clang/tools/driver/resources/Bundle_zh_CN.properties
--- 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
+++ 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
@@ -1,3 +1,3 @@
-OpenIDE-Module-Name=Clank clang/\u5de5\u5177/\u9a71\u52a8\u7a0b\u5e8f
+OpenIDE-Module-Name=Clank clang/\u5de5\u5177/\u9a71\u52a8\u7a0b\u5e8f (3.9 DONE)
 OpenIDE-Module-Short-Description=clang/\u5de5\u5177/\u9a71\u52a8\u7a0b\u5e8f
 
diff -r b7c1c51ac6f9 -r 147c8984ddd2 src/zh_CN/cnd/org-netbeans-libs-clank/ext/org-clang-tools-services/org/clang/tools/services/resources/Bundle_zh_CN.properties
--- 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
+++ 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
@@ -1,2 +1,2 @@
-OpenIDE-Module-Name=\u57fa\u4e8e Clank clang \u7684\u670d\u52a1
+OpenIDE-Module-Name=\u57fa\u4e8e Clank clang \u7684\u670d\u52a1 (JAVA)
 
diff -r b7c1c51ac6f9 -r 147c8984ddd2 src/zh_CN/cnd/org-netbeans-libs-clank/ext/org-clank-java/org/clank/java/resources/Bundle_zh_CN.properties
--- 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
+++ 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
@@ -1,4 +1,4 @@
 OpenIDE-Module-Long-Description=C \u7ed3\u6784\u7684 Java \u7c7b
-OpenIDE-Module-Name=Java \u4e2d\u7684 Clank C \u5305\u88c5
+OpenIDE-Module-Name=Java \u4e2d\u7684 Clank C \u5305\u88c5 (JAVA)
 OpenIDE-Module-Short-Description=C \u7ed3\u6784\u7684 Java \u7c7b
 
diff -r b7c1c51ac6f9 -r 147c8984ddd2 src/zh_CN/cnd/org-netbeans-libs-clank/ext/org-llvm-adtsupport/org/llvm/adtsupport/resources/Bundle_zh_CN.properties
--- 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
+++ 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
@@ -1,4 +1,4 @@
 OpenIDE-Module-Long-Description=llvm/ADT, llvm/\u652f\u6301, llvm/MC
-OpenIDE-Module-Name=Clank llvm ADT/\u652f\u6301/MC
+OpenIDE-Module-Name=Clank llvm ADT/\u652f\u6301/MC (3.9/3.8/3.6/3.4 ON DEMAND)
 OpenIDE-Module-Short-Description=llvm ADT, \u652f\u6301, MC
 
diff -r b7c1c51ac6f9 -r 147c8984ddd2 src/zh_CN/cnd/org-netbeans-libs-clank/ext/org-llvm-bitcode/org/llvm/bitcode/resources/Bundle_zh_CN.properties
--- 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
+++ 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
@@ -1,2 +1,2 @@
-OpenIDE-Module-Name=Clank llvm/\u4f4d\u7801
+OpenIDE-Module-Name=Clank llvm/\u4f4d\u7801 (3.9 NO_BODY)
 
diff -r b7c1c51ac6f9 -r 147c8984ddd2 src/zh_CN/cnd/org-netbeans-libs-clank/ext/org-llvm-ir/org/llvm/ir/resources/Bundle_zh_CN.properties
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ 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
@@ -0,0 +1,2 @@
+OpenIDE-Module-Name=Clank llvm/IR
+
diff -r b7c1c51ac6f9 -r 147c8984ddd2 src/zh_CN/cnd/org-netbeans-libs-clank/ext/org-llvm-linker/org/llvm/linker/resources/Bundle_zh_CN.properties
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ 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
@@ -0,0 +1,2 @@
+OpenIDE-Module-Name=Clank llvm/\u94fe\u63a5\u5668
+
diff -r b7c1c51ac6f9 -r 147c8984ddd2 src/zh_CN/cnd/org-netbeans-libs-clank/ext/org-llvm-option/org/llvm/option/resources/Bundle_zh_CN.properties
--- 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
+++ 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
@@ -1,4 +1,4 @@
 OpenIDE-Module-Long-Description=llvm/\u9009\u9879
-OpenIDE-Module-Name=Clank llvm/\u9009\u9879
+OpenIDE-Module-Name=Clank llvm/\u9009\u9879 (3.9 DONE)
 OpenIDE-Module-Short-Description=llvm/\u9009\u9879
 
diff -r b7c1c51ac6f9 -r 147c8984ddd2 src/zh_CN/cnd/org-netbeans-libs-clank/ext/org-llvm-passes/org/llvm/passes/resources/Bundle_zh_CN.properties
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ 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
@@ -0,0 +1,2 @@
+OpenIDE-Module-Name=Clank llvm/\u4f20\u9012
+
diff -r b7c1c51ac6f9 -r 147c8984ddd2 src/zh_CN/cnd/org-netbeans-libs-clank/ext/org-llvm-profiledata/org/llvm/profiledata/resources/Bundle_zh_CN.properties
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ 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
@@ -0,0 +1,2 @@
+OpenIDE-Module-Name=Clank llvm/ProfileData
+
diff -r b7c1c51ac6f9 -r 147c8984ddd2 src/zh_CN/cnd/org-netbeans-libs-clank/ext/org-llvm-target/org/llvm/target/resources/Bundle_zh_CN.properties
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ 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
@@ -0,0 +1,2 @@
+OpenIDE-Module-Name=Clank llvm/\u76ee\u6807
+
diff -r b7c1c51ac6f9 -r 147c8984ddd2 src/zh_CN/cnd/org-netbeans-libs-clank/ext/org-llvm/org/llvm/resources/Bundle_zh_CN.properties
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ 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
@@ -0,0 +1,2 @@
+OpenIDE-Module-Name=Clank llvm/LLVM
+
diff -r b7c1c51ac6f9 -r 147c8984ddd2 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
--- 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
+++ 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
@@ -1,9 +1,44 @@
- <!--
- - Copyright 2006-2007 Sun Microsystems, Inc. All rights reserved.
- - SUN PROPRIETARY/CONFIDENTIAL.
- - Use is subject to license terms.
- -->
-
+<!--
+   - DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+   -
+   - Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
+   -
+   - The contents of this file are subject to the terms of either the GNU
+   - General Public License Version 2 only ("GPL") or the Common
+   - Development and Distribution License("CDDL") (collectively, the
+   - "License"). You may not use this file except in compliance with the
+   - License. You can obtain a copy of the License at
+   - http://www.netbeans.org/cddl-gplv2.html
+   - or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+   - specific language governing permissions and limitations under the
+   - License.  When distributing the software, include this License Header
+   - Notice in each file and include the License file at
+   - nbbuild/licenses/CDDL-GPL-2-CP.  Sun designates this
+   - particular file as subject to the "Classpath" exception as provided
+   - by Sun in the GPL Version 2 section of the License file that
+   - accompanied this code. If applicable, add the following below the
+   - License Header, with the fields enclosed by brackets [] replaced by
+   - your own identifying information:
+   - "Portions Copyrighted [year] [name of copyright owner]"
+   -
+   - Contributor(s):
+   -
+   - The Original Software is NetBeans. The Initial Developer of the Original
+   - Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
+   - Microsystems, Inc. All Rights Reserved.
+   -
+   - If you wish your version of this file to be governed by only the CDDL
+   - or only the GPL Version 2, indicate your decision by adding
+   - "[Contributor] elects to include this software in this distribution
+   - under the [CDDL or GPL Version 2] license." If you do not indicate a
+   - single choice of license, a recipient has the option to distribute
+   - your version of this file under either the CDDL, the GPL Version 2 or
+   - to extend the choice of license to its licensees as provided above.
+   - However, if you add GPL Version 2 code and therefore, elected the GPL
+   - Version 2 license, then the option applies only if the new code is
+   - made subject to such option by the copyright holder.
+  -->
+  
 <HTML>
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
diff -r b7c1c51ac6f9 -r 147c8984ddd2 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
--- 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
+++ 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
@@ -1,9 +1,44 @@
- <!--
- - Copyright 2006-2007 Sun Microsystems, Inc. All rights reserved.
- - SUN PROPRIETARY/CONFIDENTIAL.
- - Use is subject to license terms.
- -->
-
+<!--
+   - DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+   -
+   - Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
+   -
+   - The contents of this file are subject to the terms of either the GNU
+   - General Public License Version 2 only ("GPL") or the Common
+   - Development and Distribution License("CDDL") (collectively, the
+   - "License"). You may not use this file except in compliance with the
+   - License. You can obtain a copy of the License at
+   - http://www.netbeans.org/cddl-gplv2.html
+   - or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+   - specific language governing permissions and limitations under the
+   - License.  When distributing the software, include this License Header
+   - Notice in each file and include the License file at
+   - nbbuild/licenses/CDDL-GPL-2-CP.  Sun designates this
+   - particular file as subject to the "Classpath" exception as provided
+   - by Sun in the GPL Version 2 section of the License file that
+   - accompanied this code. If applicable, add the following below the
+   - License Header, with the fields enclosed by brackets [] replaced by
+   - your own identifying information:
+   - "Portions Copyrighted [year] [name of copyright owner]"
+   -
+   - Contributor(s):
+   -
+   - The Original Software is NetBeans. The Initial Developer of the Original
+   - Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
+   - Microsystems, Inc. All Rights Reserved.
+   -
+   - If you wish your version of this file to be governed by only the CDDL
+   - or only the GPL Version 2, indicate your decision by adding
+   - "[Contributor] elects to include this software in this distribution
+   - under the [CDDL or GPL Version 2] license." If you do not indicate a
+   - single choice of license, a recipient has the option to distribute
+   - your version of this file under either the CDDL, the GPL Version 2 or
+   - to extend the choice of license to its licensees as provided above.
+   - However, if you add GPL Version 2 code and therefore, elected the GPL
+   - Version 2 license, then the option applies only if the new code is
+   - made subject to such option by the copyright holder.
+  -->
+  
 <HTML>
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
diff -r b7c1c51ac6f9 -r 147c8984ddd2 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
--- 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
+++ 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
@@ -1,9 +1,44 @@
- <!--
- - Copyright 2006-2007 Sun Microsystems, Inc. All rights reserved.
- - SUN PROPRIETARY/CONFIDENTIAL.
- - Use is subject to license terms.
- -->
-
+<!--
+   - DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+   -
+   - Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
+   -
+   - The contents of this file are subject to the terms of either the GNU
+   - General Public License Version 2 only ("GPL") or the Common
+   - Development and Distribution License("CDDL") (collectively, the
+   - "License"). You may not use this file except in compliance with the
+   - License. You can obtain a copy of the License at
+   - http://www.netbeans.org/cddl-gplv2.html
+   - or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+   - specific language governing permissions and limitations under the
+   - License.  When distributing the software, include this License Header
+   - Notice in each file and include the License file at
+   - nbbuild/licenses/CDDL-GPL-2-CP.  Sun designates this
+   - particular file as subject to the "Classpath" exception as provided
+   - by Sun in the GPL Version 2 section of the License file that
+   - accompanied this code. If applicable, add the following below the
+   - License Header, with the fields enclosed by brackets [] replaced by
+   - your own identifying information:
+   - "Portions Copyrighted [year] [name of copyright owner]"
+   -
+   - Contributor(s):
+   -
+   - The Original Software is NetBeans. The Initial Developer of the Original
+   - Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
+   - Microsystems, Inc. All Rights Reserved.
+   -
+   - If you wish your version of this file to be governed by only the CDDL
+   - or only the GPL Version 2, indicate your decision by adding
+   - "[Contributor] elects to include this software in this distribution
+   - under the [CDDL or GPL Version 2] license." If you do not indicate a
+   - single choice of license, a recipient has the option to distribute
+   - your version of this file under either the CDDL, the GPL Version 2 or
+   - to extend the choice of license to its licensees as provided above.
+   - However, if you add GPL Version 2 code and therefore, elected the GPL
+   - Version 2 license, then the option applies only if the new code is
+   - made subject to such option by the copyright holder.
+  -->
+  
 <HTML>
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
diff -r b7c1c51ac6f9 -r 147c8984ddd2 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
--- 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
+++ 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
@@ -1,9 +1,44 @@
- <!--
- - Copyright 2006-2007 Sun Microsystems, Inc. All rights reserved.
- - SUN PROPRIETARY/CONFIDENTIAL.
- - Use is subject to license terms.
- -->
-
+<!--
+   - DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+   -
+   - Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
+   -
+   - The contents of this file are subject to the terms of either the GNU
+   - General Public License Version 2 only ("GPL") or the Common
+   - Development and Distribution License("CDDL") (collectively, the
+   - "License"). You may not use this file except in compliance with the
+   - License. You can obtain a copy of the License at
+   - http://www.netbeans.org/cddl-gplv2.html
+   - or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+   - specific language governing permissions and limitations under the
+   - License.  When distributing the software, include this License Header
+   - Notice in each file and include the License file at
+   - nbbuild/licenses/CDDL-GPL-2-CP.  Sun designates this
+   - particular file as subject to the "Classpath" exception as provided
+   - by Sun in the GPL Version 2 section of the License file that
+   - accompanied this code. If applicable, add the following below the
+   - License Header, with the fields enclosed by brackets [] replaced by
+   - your own identifying information:
+   - "Portions Copyrighted [year] [name of copyright owner]"
+   -
+   - Contributor(s):
+   -
+   - The Original Software is NetBeans. The Initial Developer of the Original
+   - Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
+   - Microsystems, Inc. All Rights Reserved.
+   -
+   - If you wish your version of this file to be governed by only the CDDL
+   - or only the GPL Version 2, indicate your decision by adding
+   - "[Contributor] elects to include this software in this distribution
+   - under the [CDDL or GPL Version 2] license." If you do not indicate a
+   - single choice of license, a recipient has the option to distribute
+   - your version of this file under either the CDDL, the GPL Version 2 or
+   - to extend the choice of license to its licensees as provided above.
+   - However, if you add GPL Version 2 code and therefore, elected the GPL
+   - Version 2 license, then the option applies only if the new code is
+   - made subject to such option by the copyright holder.
+  -->
+  
 <HTML>
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
diff -r b7c1c51ac6f9 -r 147c8984ddd2 src/zh_CN/ide/dlight-nativeexecution/dlight-nativeexecution/org/netbeans/modules/nativeexecution/support/Bundle_zh_CN.properties
--- 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
+++ 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
@@ -44,9 +44,8 @@
 USER_AUTH_CANCELED=\u7528\u6237\u5df2\u53d6\u6d88 SSH \u9a8c\u8bc1
 JSCHReceivedMessageIsTooLong.error.title=\u8fde\u63a5\u5230\u4e3b\u673a{0}\u65f6\u51fa\u9519
 JSCHReceivedMessageIsTooLong.error.shorttext=\u60a8\u4f3c\u4e4e\u9047\u5230\u4e86\u4e0e\u67d0\u4e9b ssh \u670d\u52a1\u5668\u76f8\u5173\u7684\u5df2\u77e5\u95ee\u9898\u3002
-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
+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
 
-#TITLE_Message=From {0}:
 TITLE_Message_Ex=\u6765\u81ea{0}: {1}
 
 
diff -r b7c1c51ac6f9 -r 147c8984ddd2 src/zh_CN/ide/dlight-nativeexecution/dlight-nativeexecution/org/netbeans/modules/nativeexecution/support/hostinfo/impl/Bundle_zh_CN.properties
--- 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
+++ 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
@@ -40,5 +40,5 @@
 
 TITLE_PermissionDenied=\u65e0\u6cd5\u4f7f\u7528\u4e34\u65f6\u76ee\u5f55
 SHORTMSG_PermissionDenied={1}\u4e0a\u7684{0}
-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
+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
 
diff -r b7c1c51ac6f9 -r 147c8984ddd2 src/zh_CN/ide/docker-ui/docker-ui/org/netbeans/modules/docker/ui/build2/Bundle_zh_CN.properties
--- 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
+++ 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
@@ -52,6 +52,13 @@
 BuildOptionsVisual.pullCheckBox.text=\u59cb\u7ec8\u5c1d\u8bd5\u63d0\u53d6\u8f83\u65b0\u7684\u6620\u50cf\u7248\u672c(&A)
 BuildInstanceVisual.addButton.text=\u6dfb\u52a0(&A)...
 BuildInstanceVisual.instanceLabel.text=\u6784\u5efa\u5b9e\u4f8b(&I):
+BuildContextVisual.fileChooser.button=\u6253\u5f00
+BuildContextVisual.fileChooser.dialogTitle=\u9009\u62e9 Docker \u6620\u50cf\u4e0a\u4e0b\u6587
+BuildOptionsVisual.jLabel1.text=\u6784\u5efa\u65f6\u53d8\u91cf:
+BuildOptionsVisual.addVariableButton.text=\u6dfb\u52a0
+BuildOptionsVisual.deleteVariableButton.text=\u5220\u9664
+BuildOptionsVisual.buildargsTable.columnModel.title1=\u503c
+BuildOptionsVisual.buildargsTable.columnModel.title0=\u540d\u79f0
 LBL_Build=\u6784\u5efa...
 LBL_BuildContext=\u6784\u5efa\u4e0a\u4e0b\u6587
 LBL_BuildImage=\u6784\u5efa\u6620\u50cf
diff -r b7c1c51ac6f9 -r 147c8984ddd2 src/zh_CN/ide/docker-ui/docker-ui/org/netbeans/modules/docker/ui/node/Bundle_zh_CN.properties
--- 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
+++ 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
@@ -42,14 +42,17 @@
 
 Docker_Root_Node_Name=Docker
 Docker_Root_Node_Short_Description=\u5728 IDE \u4e2d\u6ce8\u518c\u7684 Docker \u8ba1\u7b97\u673a
-
-
 LBL_AttachContainerAction=\u8fde\u63a5
 LBL_Containers=\u5bb9\u5668
 LBL_CopyIdAction=\u526f\u672c ID
+LBL_GetPortMappingsAction=\u67e5\u770b\u7aef\u53e3\u7ed1\u5b9a
+LBL_HostAddress=\u4e3b\u673a\u5730\u5740
+LBL_HostPort=\u4e3b\u673a\u7aef\u53e3
 # {0} - instance name
 LBL_Offline={0} [\u8131\u673a]
 LBL_PauseContainerAction=\u6682\u505c
+LBL_Port=\u7aef\u53e3
+LBL_PortBindings=\u7aef\u53e3\u7ed1\u5b9a
 LBL_PushTagAction=\u63a8\u5165...
 LBL_RefreshAction=\u5237\u65b0
 LBL_RemoveContainerAction=\u5220\u9664
@@ -59,12 +62,15 @@
 LBL_ShowLogAction=\u663e\u793a\u65e5\u5fd7
 LBL_StartContainerAction=\u542f\u52a8
 LBL_StopContainerAction=\u505c\u6b62
+LBL_Type=\u7c7b\u578b
 LBL_UnpauseContainerAction=\u53d6\u6d88\u6682\u505c
 # {0} - container id
 MSG_AttachingContainer=\u6b63\u5728\u8fde\u63a5\u5230\u5bb9\u5668 {0}
 MSG_CouldNotCopy=\u65e0\u6cd5\u590d\u5236 ID
 MSG_EditCredentials=\u9a8c\u8bc1\u5931\u8d25\u3002\u662f\u5426\u8981\u4e3a\u6ce8\u518c\u8868\u914d\u7f6e\u8eab\u4efd\u8bc1\u660e\u5e76\u91cd\u8bd5?
 # {0} - container id
+MSG_GettingPortMappings=\u83b7\u53d6\u5bb9\u5668 {0} \u7684\u7aef\u53e3\u7ed1\u5b9a
+# {0} - container id
 MSG_PausingContainer=\u6b63\u5728\u6682\u505c\u5bb9\u5668 {0}
 # {0} - image name
 MSG_Pushing=\u6b63\u5728\u63a8\u5165{0}
diff -r b7c1c51ac6f9 -r 147c8984ddd2 src/zh_CN/ide/docker-ui/docker-ui/org/netbeans/modules/docker/ui/run/Bundle_zh_CN.properties
--- 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
+++ 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
@@ -69,4 +69,10 @@
 RunContainerPropertiesVisual.interactiveCheckBox.text=\u5373\u4f7f\u672a\u8fde\u63a5\u4e5f\u4fdd\u6301 STDIN \u6253\u5f00(&K)
 RunContainerPropertiesVisual.commandLabel.text=\u547d\u4ee4(&C):
 RunContainerPropertiesVisual.userLabel.text=\u7528\u6237(&U):
+RunContainerPropertiesVisual.privilegedCheckBox.text=\u5728\u6388\u6743\u6a21\u5f0f\u4e0b\u8fd0\u884c(&R)
+RunContainerPropertiesVisual.mountVolumesCheckBox.text=\u88c5\u8f7d\u5377(&M)
+RunContainerPropertiesVisual.addButton.text=\u6dfb\u52a0(&A)
+RunContainerPropertiesVisual.deleteButton.text=\u5220\u9664(&D)
+RunContainerPropertiesVisual.volumesTable.columnModel.title1=\u6e90
+RunContainerPropertiesVisual.volumesTable.columnModel.title0=\u76ee\u6807
 
diff -r b7c1c51ac6f9 -r 147c8984ddd2 src/zh_CN/ide/editor-bookmarks/editor-bookmarks/org/netbeans/modules/editor/bookmarks/ui/Bundle_zh_CN.properties
--- 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
+++ 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
@@ -70,7 +70,7 @@
 
 CTL_keyChooserTitle=\u6309\u4e66\u7b7e\u952e
 CTL_keyChooserCloseButton=\u5173\u95ed
-CTL_keyChooserUnoccupiedBookmarkKey=\u4e66\u7b7e\u952e\u4e3a\u7a7a\u3002\u8bf7\u4f7f\u7528 Window->Navigating->Bookmarks \u6307\u5b9a\u952e\u3002
+CTL_keyChooserUnoccupiedBookmarkKey=\u4e66\u7b7e\u952e\u4e3a\u7a7a\u3002\u8bf7\u4f7f\u7528 Window\u2023Navigating\u2023Bookmarks \u6307\u5b9a\u952e\u3002
 LBL_keyChooserNoActiveKeys=\u6ca1\u6709\u6d3b\u52a8\u7684\u4e66\u7b7e\u952e\u3002
-LBL_keyChooserNoActiveKeysHelp=\u4f7f\u7528 Window->Navigating->Bookmarks \u6307\u5b9a\u952e\u3002
+LBL_keyChooserNoActiveKeysHelp=\u4f7f\u7528 Window\u2023Navigating\u2023Bookmarks \u6307\u5b9a\u952e\u3002
 
diff -r b7c1c51ac6f9 -r 147c8984ddd2 src/zh_CN/ide/editor-indent/editor-indent/org/netbeans/modules/editor/indent/Bundle_zh_CN.properties
--- 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
+++ 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
@@ -46,4 +46,3 @@
 OpenIDE-Module-Short-Description=\u5305\u542b\u7f29\u8fdb API \u548c SPI\u3002
 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
 
-
diff -r b7c1c51ac6f9 -r 147c8984ddd2 src/zh_CN/ide/editor-lib/editor-lib/org/netbeans/modules/editor/lib/Bundle_zh_CN.properties
--- 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
+++ 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
@@ -43,6 +43,6 @@
 OpenIDE-Module-Name=\u7f16\u8f91\u5668\u5e93
 OpenIDE-Module-Display-Category=\u7f16\u8f91
 OpenIDE-Module-Short-Description=\u5305\u542b\u72ec\u7acb\u4e8e IDE \u7684\u7f16\u8f91\u5668\u529f\u80fd
-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
+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
 
 
diff -r b7c1c51ac6f9 -r 147c8984ddd2 src/zh_CN/ide/editor-lib2/editor-lib2/org/netbeans/modules/editor/lib2/Bundle_zh_CN.properties
--- 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
+++ 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
@@ -43,7 +43,7 @@
 OpenIDE-Module-Name=\u7f16\u8f91\u5668\u5e93 2
 OpenIDE-Module-Display-Category=\u7f16\u8f91
 OpenIDE-Module-Short-Description=\u5305\u542b\u6838\u5fc3\u7f16\u8f91\u5668 API \u548c SPI\u3002
-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
+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
 
 #DocUtils.debugPosition
 wrong_position=\u9519\u8bef\u7684\u4f4d\u7f6e
diff -r b7c1c51ac6f9 -r 147c8984ddd2 src/zh_CN/ide/projectui/projectui/org/netbeans/modules/project/ui/zip/Bundle_zh_CN.properties
--- 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
+++ 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
@@ -79,6 +79,10 @@
 MSG_created=\u5df2\u521b\u5efa{0}
 # {0} - ZIP entry name
 MSG_creating=\u6b63\u5728\u521b\u5efa{0}
+# {0} - unpacked file
+# {1} - folder
+MSG_OutsideRoot=\u662f\u5426\u8981\u5199\u5165\u5df2\u5bfc\u5165\u6839\u76ee\u5f55 {1} \u5916\u90e8\u7684\u6587\u4ef6 {0}
+MSG_OutsideRootTitle=\u6587\u4ef6\u4f4d\u4e8e\u5bfc\u5165\u6587\u4ef6\u5939\u5916\u90e8
 # {0} - ZIP entry name
 MSG_packed=\u5df2\u6253\u5305: {0}
 # {0} - subdirectory
diff -r b7c1c51ac6f9 -r 147c8984ddd2 src/zh_CN/ide/web-common/web-common/org/netbeans/modules/web/common/Bundle_zh_CN.properties
--- 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
+++ 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
@@ -41,6 +41,7 @@
 # made subject to such option by the copyright holder.
 
 OpenIDE-Module-Display-Category=Web
+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
 OpenIDE-Module-Name=Web \u901a\u7528
 OpenIDE-Module-Short-Description=\u63d0\u4f9b\u5404\u79cd "\u4e0e Web \u76f8\u5173\u7684" \u901a\u7528\u529f\u80fd
 
diff -r b7c1c51ac6f9 -r 147c8984ddd2 src/zh_CN/other/installer/infra/build/web/js/start_strings_zh_CN.js
--- a/src/zh_CN/other/installer/infra/build/web/js/start_strings_zh_CN.js	Mon Dec 19 12:18:33 2016 +0100
+++ b/src/zh_CN/other/installer/infra/build/web/js/start_strings_zh_CN.js	Tue Apr 17 14:14:23 2018 +0200
@@ -59,9 +59,9 @@
 var SUPPORT_LABEL        = "\u652f\u6301";
 var SUPPORT_DESCRIPTION  = "\u7075\u6d3b\u7684\u652f\u6301\u65b9\u6848\u9009\u62e9\u8ba9\u60a8\u80fd\u591f\u59cb\u7ec8\u4e13\u6ce8\u4e8e\u521b\u65b0\u3002";
 
-// $PRODUCT_NAME $TYPE (Installer for $PLATFORM/Zip)/$Language ($Language_ID) $filename ($SIZE) MD5: $MD5
-var INFO_MESSAGE = "{0}{1} {2}/{3} ({4})<br>{5} ({6} MB)<br>MD5: {7}";
-var INFO_MESSAGE_OTHER = "{0} ({1} MB)<br>MD5: {2}";
+// $PRODUCT_NAME $TYPE (Installer for $PLATFORM/Zip)/$Language ($Language_ID) $filename ($SIZE) SHA-256: $MD5
+var INFO_MESSAGE = "{0}{1} {2}/{3} ({4})<br>{5} ({6} MB)<br>SHA-256: {7}";
+var INFO_MESSAGE_OTHER = "{0} ({1} MB)<br>SHA-256: {2}";
 
 //DO NOT TRANSLATE
 var SUBSCRIPTION_PHP_URL = "http://services.netbeans.org/sub.php";
diff -r b7c1c51ac6f9 -r 147c8984ddd2 src/zh_CN/ruby/ruby-project/ruby-project/org/netbeans/modules/ruby/rubyproject/ui/wizards/Bundle_zh_CN.properties
--- 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
+++ 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
@@ -61,11 +61,11 @@
 ACSD_JavaExtSourcesProjectLocation=\u521b\u5efa\u65b0\u7684\u57fa\u4e8e\u73b0\u6709\u6e90\u4ee3\u7801\u7684 Ruby \u9879\u76ee
 ProbablyRails=\u7c7b\u4f3c\u4e8e Rails \u76ee\u5f55 - \u8bf7\u6539\u7528 Rails \u9879\u76ee
 
-#NOI18N
+
 #TXT_ClassName={0}/main.rb
 #TXT_ClassName=main.rb
 
-#NOI18N
+
 #TXT_PackageNameSuffix={0}pkg
 LAB_ConfigureProject=\u540d\u79f0\u548c\u4f4d\u7f6e
 LAB_ConfigureSourceRoots=\u73b0\u6709\u6e90\u4ee3\u7801
@@ -93,13 +93,13 @@
 MSG_IllegalTests=\u6d4b\u8bd5\u5305\u6587\u4ef6\u5939 {0} \u4e0d\u5b58\u5728\u3002
 MSG_IllegalProjectFolder=\u9879\u76ee\u6587\u4ef6\u5939\u5fc5\u987b\u4f4d\u4e8e\u5305\u6240\u5728\u7684\u6587\u4ef6\u5939\u4e4b\u5916\u3002
 
-#NOI18N
+
 #TXT_JavaApplication=RubyApplication{0}
 
-#NOI18N
+
 #TXT_JavaLibrary=RubyLibrary{0}
 
-#NOI18N
+
 #TXT_JavaProject=RubyProject{0}
 LBL_ProjectNameAndLocationLabel=\u6307\u5b9a\u65b0\u9879\u76ee\u7684\u540d\u79f0\u548c\u4f4d\u7f6e\u3002
 CTL_SourceRoots=\u6e90\u6587\u4ef6\u5939\uff1a
diff -r b7c1c51ac6f9 -r 147c8984ddd2 src/zh_CN/ruby/ruby-railsprojects/ruby-railsprojects/org/netbeans/modules/ruby/railsprojects/ui/wizards/Bundle_zh_CN.properties
--- 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
+++ 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
@@ -97,7 +97,7 @@
 # (should not be an error in the future: see #42422)
 TXT_NetBeansProject=NetBeans \u9879\u76ee
 
-#NOI18N
+
 #TXT_RailsApplication=RailsApplication{0}
 LBL_ProjectNameAndLocationLabel=\u4e3a\u73b0\u6709 Rails \u5e94\u7528\u7a0b\u5e8f\u6307\u5b9a\u540d\u79f0\u548c\u4f4d\u7f6e
 ACSN_jPanel1=N/A
diff -r b7c1c51ac6f9 -r 147c8984ddd2 src/zh_CN/ruby/ruby/ruby/org/netbeans/modules/ruby/Bundle_zh_CN.properties
--- a/src/zh_CN/ruby/ruby/ruby/org/netbeans/modules/ruby/Bundle_zh_CN.properties	Mon Dec 19 12:18:33 2016 +0100
+++ b/src/zh_CN/ruby/ruby/ruby/org/netbeans/modules/ruby/Bundle_zh_CN.properties	Tue Apr 17 14:14:23 2018 +0200
@@ -266,9 +266,6 @@
 
 InstalledVersions=\u5b89\u88c5\u7684\u7248\u672c\uff1a{0}
 
-# HTTP status codes for code completion,
-# 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
-
 SC_100=100\uff08\u7ee7\u7eed\uff09
 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
 SC_101=101\uff08\u4ea4\u6362\u534f\u8bae\uff09
diff -r b7c1c51ac6f9 -r 147c8984ddd2 src/zh_TW/enterprise/j2eeserver/j2eeserver/org/netbeans/modules/j2ee/deployment/impl/ui/actions/Bundle_zh_TW.properties
--- 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
+++ 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
@@ -37,11 +37,6 @@
 # Version 2 license, then the option applies only if the new code is
 # made subject to such option by the copyright holder.
 
-## SUN PROPRIETARY/CONFIDENTIAL:  INTERNAL USE ONLY.
-
-## Copyright 2001 Sun Microsystems, Inc. All rights reserved. Use is
-## subject to license terms.
-
 
 MSG_Server_Instance_Added=\u5df2\u6210\u529f\u52a0\u5165\u4f3a\u670d\u5668\u5be6\u9ad4\u300c{0}\u300d\u3002
 
diff -r b7c1c51ac6f9 -r 147c8984ddd2 src/zh_TW/other/installer/infra/build/web/js/start_strings_zh_TW.js
--- a/src/zh_TW/other/installer/infra/build/web/js/start_strings_zh_TW.js	Mon Dec 19 12:18:33 2016 +0100
+++ b/src/zh_TW/other/installer/infra/build/web/js/start_strings_zh_TW.js	Tue Apr 17 14:14:23 2018 +0200
@@ -59,9 +59,9 @@
 var SUPPORT_LABEL        = "Support";
 var SUPPORT_DESCRIPTION  = "Flexible support options to help you stay focused on innovation.";
 
-// $PRODUCT_NAME $TYPE (Installer for $PLATFORM/Zip)/$Language ($Language_ID) $filename ($SIZE) MD5: $MD5
-var INFO_MESSAGE = "{0}{1} {2}/{3} ({4})<br>{5} ({6} MB)<br>MD5: {7}";
-var INFO_MESSAGE_OTHER = "{0} ({1} MB)<br>MD5: {2}";
+// $PRODUCT_NAME $TYPE (Installer for $PLATFORM/Zip)/$Language ($Language_ID) $filename ($SIZE) SHA-256: $MD5
+var INFO_MESSAGE = "{0}{1} {2}/{3} ({4})<br>{5} ({6} MB)<br>SHA-256: {7}";
+var INFO_MESSAGE_OTHER = "{0} ({1} MB)<br>SHA-256: {2}";
 
 //DO NOT TRANSLATE
 var SUBSCRIPTION_PHP_URL = "http://services.netbeans.org/sub.php";